diff options
| author | cy <cy@FreeBSD.org> | 2017-08-26 11:50:33 +0800 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2017-08-26 11:50:33 +0800 |
| commit | 64c0af7704087cf235e8f73a2a44c765ea2bf231 (patch) | |
| tree | fe22f20230a0506a10dd054293cf75529f9f9a8d | |
| parent | 06b6f6986fe7c6bd4d5b8595dcda18245469cc81 (diff) | |
| download | freebsd-ports-gnome-64c0af7704087cf235e8f73a2a44c765ea2bf231.tar.gz freebsd-ports-gnome-64c0af7704087cf235e8f73a2a44c765ea2bf231.tar.zst freebsd-ports-gnome-64c0af7704087cf235e8f73a2a44c765ea2bf231.zip | |
Update 4.5.0 --> 4.6.1
| -rw-r--r-- | sysutils/screen/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/screen/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/screen/files/patch-Makefile.in | 8 | ||||
| -rw-r--r-- | sysutils/screen/files/patch-screen.c | 21 |
4 files changed, 11 insertions, 27 deletions
diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile index 4b8fe77f37e1..e05e390932dc 100644 --- a/sysutils/screen/Makefile +++ b/sysutils/screen/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= screen -PORTVERSION= 4.5.0 -PORTREVISION= 3 +PORTVERSION= 4.6.1 CATEGORIES= sysutils MASTER_SITES= http://ftp.gnu.org/gnu/screen/ \ ftp://ftp.gnu.org/gnu/screen/ \ diff --git a/sysutils/screen/distinfo b/sysutils/screen/distinfo index 5016e72edddd..5d0ee3093beb 100644 --- a/sysutils/screen/distinfo +++ b/sysutils/screen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484729092 -SHA256 (screen-4.5.0.tar.gz) = 01c3a7c362185f35d6a95dff52d64337076496acd034d717de3c263500cfefb0 -SIZE (screen-4.5.0.tar.gz) = 963233 +TIMESTAMP = 1503717242 +SHA256 (screen-4.6.1.tar.gz) = aba9af66cb626155d6abce4703f45cce0e30a5114a368bd6387c966cbbbb7c64 +SIZE (screen-4.6.1.tar.gz) = 848979 diff --git a/sysutils/screen/files/patch-Makefile.in b/sysutils/screen/files/patch-Makefile.in index d4400910fc03..101c1703295a 100644 --- a/sysutils/screen/files/patch-Makefile.in +++ b/sysutils/screen/files/patch-Makefile.in @@ -1,9 +1,9 @@ ---- Makefile.in.orig 2017-01-17 11:28:29.361404481 -0800 -+++ Makefile.in 2017-01-18 04:51:33.277671000 -0800 +--- Makefile.in.orig 2017-07-10 12:26:25.000000000 -0700 ++++ Makefile.in 2017-08-25 20:19:07.289437000 -0700 @@ -83,19 +83,13 @@ $(OPTIONS) $(CFLAGS) $< - install_bin: .version screen + install_bin: .version screen installdirs - -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ - then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi - $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) @@ -12,9 +12,9 @@ - -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi - rm -f $(DESTDIR)$(bindir)/screen - (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) + cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) + $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/screen + -chown root:wheel $(DESTDIR)$(bindir)/screen && chmod 4755 $(DESTDIR)$(bindir)/screen - cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) ############################################################################### install: installdirs install_bin diff --git a/sysutils/screen/files/patch-screen.c b/sysutils/screen/files/patch-screen.c index 141285c558cf..50b28c02a955 100644 --- a/sysutils/screen/files/patch-screen.c +++ b/sysutils/screen/files/patch-screen.c @@ -1,21 +1,6 @@ ---- screen.c.orig 2017-01-17 11:28:29.397404660 -0800 -+++ screen.c 2017-01-24 17:31:24.342944000 -0800 -@@ -674,11 +674,14 @@ - if (strlen(screenlogfile) > PATH_MAX) - Panic(0, "-L: logfile name too long. (max. %d char)", PATH_MAX); - -+#if 0 -+/* see https://lists.gnu.org/archive/html/screen-devel/2017-01/msg00025.html */ - FILE *w_check; - if ((w_check = fopen(screenlogfile, "w")) == NULL) - Panic(0, "-L: logfile name access problem"); - else - fclose(w_check); -+#endif - } - nwin_options.Lflag = 1; - break; -@@ -2222,7 +2225,7 @@ +--- screen.c.orig 2017-07-10 12:26:25.000000000 -0700 ++++ screen.c 2017-08-25 20:20:20.471073000 -0700 +@@ -2214,7 +2214,7 @@ pn2 = pn = p + padlen; r = winmsg_numrend; while (p >= buf) { |