kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update 4.4.0 --> 4.5.0

Browse source
This commit is contained in:
Cy Schubert 2017-01-18 13:19:25 +00:00
parent 086e9b5804
commit bddf1289ef
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=431795
4 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sysutils/screen/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= screen PORTNAME= screen
PORTVERSION= 4.4.0 PORTVERSION= 4.5.0
PORTREVISION= 2
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= http://ftp.gnu.org/gnu/screen/ \ MASTER_SITES= http://ftp.gnu.org/gnu/screen/ \
ftp://ftp.gnu.org/gnu/screen/ \ ftp://ftp.gnu.org/gnu/screen/ \

6
sysutils/screen/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1466506261 TIMESTAMP = 1484729092
SHA256 (screen-4.4.0.tar.gz) = ef722a54759a3bf23aad272bbf33c414c1078cad6bcd982fada93c0d7917218b SHA256 (screen-4.5.0.tar.gz) = 01c3a7c362185f35d6a95dff52d64337076496acd034d717de3c263500cfefb0
SIZE (screen-4.4.0.tar.gz) = 846010 SIZE (screen-4.5.0.tar.gz) = 963233

16
sysutils/screen/files/patch-Makefile.in
View file

@ -1,6 +1,6 @@
--- Makefile.in.orig 2015-06-28 21:22:55 UTC --- Makefile.in.orig 2017-01-17 11:28:29.361404481 -0800
+++ Makefile.in +++ Makefile.in 2017-01-18 04:51:33.277671000 -0800
@@ -83,19 +83,13 @@ screen: $(OFILES) @@ -83,19 +83,13 @@
$(OPTIONS) $(CFLAGS) $< $(OPTIONS) $(CFLAGS) $<
install_bin: .version screen install_bin: .version screen
@ -20,10 +20,10 @@
install: installdirs install_bin install: installdirs install_bin
- cd doc ; $(MAKE) install - cd doc ; $(MAKE) install
+ cd doc ; $(MAKE) $(MAKE_ARGS) install + cd doc ; $(MAKE) $(MAKE_ARGS) install
-if [ -d /usr/lib/terminfo ]; then \ -if [ -d $(DESTDIR)/usr/lib/terminfo ]; then \
PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \ PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
chmod 644 /usr/lib/terminfo/s/screen*; \ chmod 644 $(DESTDIR)/usr/lib/terminfo/s/screen*; \
@@ -108,7 +102,7 @@ install: installdirs install_bin @@ -108,7 +102,7 @@
installdirs: installdirs:
# Path leading to ETCSCREENRC and Socketdirectory not checked. # Path leading to ETCSCREENRC and Socketdirectory not checked.
$(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS) $(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS)
@ -32,13 +32,13 @@
uninstall: .version uninstall: .version
rm -f $(DESTDIR)$(bindir)/$(SCREEN) rm -f $(DESTDIR)$(bindir)/$(SCREEN)
@@ -350,7 +344,10 @@ layout.o: layout.h viewport.h canvas.h l @@ -350,7 +344,10 @@
viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \ viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \
comm.h layer.h term.h image.h display.h window.h extern.h \ comm.h layer.h term.h image.h display.h window.h extern.h \
braille.h braille.h
-list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h -list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h
-list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h -list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h
-list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h -list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h
+list_generic.o: list_generic.h list_generic.c layer.h screen.h os.h osdef.h ansi.h acls.h \ +list_generic.o: list_generic.h list_generic.c layer.h screen.h os.h osdef.h ansi.h acls.h \
+ comm.h layer.h term.h image.h display.h window.h + comm.h layer.h term.h image.h display.h window.h
+list_display.o: list_generic.h list_display.c layer.h screen.h os.h osdef.h ansi.h acls.h \ +list_display.o: list_generic.h list_display.c layer.h screen.h os.h osdef.h ansi.h acls.h \

20
sysutils/screen/files/patch-screen.c
View file

@ -1,11 +1,11 @@
--- screen.c.orig 2014-04-26 09:22:09.000000000 -0700 --- screen.c.orig 2017-01-17 11:28:29.397404660 -0800
+++ screen.c 2014-04-30 23:34:47.613803805 -0700 +++ screen.c 2017-01-18 04:54:50.874421000 -0800
@@ -2257,7 +2257,7 @@ @@ -2222,7 +2222,7 @@
pn2 = pn = p + padlen;
r = winmsg_numrend; r = winmsg_numrend;
while (p >= buf) while (p >= buf) {
{ - if (r && *p != 127 && p - buf == winmsg_rendpos[r - 1]) {
- if (r && *p != 127 && p - buf == winmsg_rendpos[r - 1]) + if (r && p - buf == winmsg_rendpos[r - 1]) {
+ if (r && p - buf == winmsg_rendpos[r - 1]) winmsg_rendpos[--r] = pn - buf;
{ continue;
winmsg_rendpos[--r] = pn - buf; }
continue;