diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 2001-06-25 05:11:41 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 2001-06-25 05:11:41 +0000 |
commit | 966c3a0792038381e9095c7461572d459fb92560 (patch) | |
tree | de2a924fa398235f95fdffaee8ea0457459f7463 /sysutils/screen | |
parent | Change master site. (diff) |
Upgrade to 3.9.9
Diffstat (limited to 'sysutils/screen')
-rw-r--r-- | sysutils/screen/Makefile | 6 | ||||
-rw-r--r-- | sysutils/screen/distinfo | 2 | ||||
-rw-r--r-- | sysutils/screen/files/patch-aa | 33 | ||||
-rw-r--r-- | sysutils/screen/files/patch-ab | 52 | ||||
-rw-r--r-- | sysutils/screen/files/patch-ad | 40 | ||||
-rw-r--r-- | sysutils/screen/files/patch-ae | 10 | ||||
-rw-r--r-- | sysutils/screen/files/patch-ag | 11 |
7 files changed, 61 insertions, 93 deletions
diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile index 81ef65b8828c..d43cfb135d83 100644 --- a/sysutils/screen/Makefile +++ b/sysutils/screen/Makefile @@ -6,8 +6,7 @@ # PORTNAME= screen -PORTVERSION= 3.9.8 -PORTREVISION= 5 +PORTVERSION= 3.9.9 CATEGORIES= misc MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \ ${MASTER_SITE_GNU} @@ -18,7 +17,4 @@ MAINTAINER= ache@FreeBSD.org GNU_CONFIGURE= yes MAN1= screen.1 -post-install: - @install-info ${PREFIX}/info/screen.info ${PREFIX}/info/dir - .include <bsd.port.mk> diff --git a/sysutils/screen/distinfo b/sysutils/screen/distinfo index f01bbd247962..6646acc9c98e 100644 --- a/sysutils/screen/distinfo +++ b/sysutils/screen/distinfo @@ -1 +1 @@ -MD5 (screen-3.9.8.tar.gz) = 8ddfebe32c2d45410ce89ea9779bb1cf +MD5 (screen-3.9.9.tar.gz) = 9a8b1d6c7438c64b884c4f7d7662afdc diff --git a/sysutils/screen/files/patch-aa b/sysutils/screen/files/patch-aa index d48e06506464..95b441f8bfd8 100644 --- a/sysutils/screen/files/patch-aa +++ b/sysutils/screen/files/patch-aa @@ -1,28 +1,19 @@ ---- Makefile.in.orig Fri Sep 1 09:07:26 2000 -+++ Makefile.in Sun Sep 17 18:29:18 2000 -@@ -21,7 +21,7 @@ - ETCSCREENRC = `sed < config.h -n -e '/define ETCSCREENRC/s/^.*"\([^"]*\)"/\1/p'` - - CC = @CC@ --CFLAGS = -O -+#CFLAGS = -O - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = - LIBS = @LIBS@ -@@ -68,14 +68,8 @@ +--- Makefile.in.orig Fri May 25 18:50:54 2001 ++++ Makefile.in Mon Jun 25 08:31:36 2001 +@@ -70,14 +70,8 @@ $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $< install_bin: .version screen -- -if [ -f $(bindir)/$(SCREEN) ] && [ ! -f $(bindir)/$(SCREEN).old ]; \ -- then mv $(bindir)/$(SCREEN) $(bindir)/$(SCREEN).old; fi -- $(INSTALL_PROGRAM) screen $(bindir)/$(SCREEN) -- -chown root $(bindir)/$(SCREEN) && chmod 4755 $(bindir)/$(SCREEN) +- -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) +- -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) -# This doesn't work if $(bindir)/screen is a symlink -- -if [ -f $(bindir)/screen ] && [ ! -f $(bindir)/screen.old ]; then mv $(bindir)/screen $(bindir)/screen.old; fi -- rm -f $(bindir)/screen -- ln -s $(SCREEN) $(bindir)/screen -+ $(INSTALL_PROGRAM) screen $(bindir)/screen -+ -chown root $(bindir)/screen && chmod 4755 $(bindir)/screen +- -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 -sf $(SCREEN) screen ++ $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/screen ++ -chown root:wheel $(DESTDIR)$(bindir)/screen && chmod 4755 $(DESTDIR)$(bindir)/screen ############################################################################### install: installdirs install_bin diff --git a/sysutils/screen/files/patch-ab b/sysutils/screen/files/patch-ab index 7d32efe4d433..ff1673015a5a 100644 --- a/sysutils/screen/files/patch-ab +++ b/sysutils/screen/files/patch-ab @@ -1,32 +1,20 @@ -*** doc/Makefile.in.orig Tue Jun 24 01:05:43 1997 ---- doc/Makefile.in Mon Sep 15 23:56:34 1997 -*************** -*** 20,26 **** - $(TEXI2DVI) $(srcdir)/screen.texinfo - - info screen.info: screen.texinfo -! $(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info - - install: installdirs - $(INSTALL_DATA) $(srcdir)/screen.1 $(mandir)/man1/screen.1 ---- 20,27 ---- - $(TEXI2DVI) $(srcdir)/screen.texinfo - - info screen.info: screen.texinfo -! rm -f ./screen.info* -! $(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info - - install: installdirs - $(INSTALL_DATA) $(srcdir)/screen.1 $(mandir)/man1/screen.1 -*************** -*** 28,36 **** - -if test -f screen.info; then d=.; else d=$(srcdir); fi; \ - if test -f $$d/screen.info; then \ - for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(infodir);done; \ -- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ -- install-info --info-dir=$(infodir) $$d/screen.info; \ -- else true; fi; \ - fi - - uninstall: ---- 29,34 ---- +--- doc/Makefile.in.orig Fri May 25 18:50:55 2001 ++++ doc/Makefile.in Mon Jun 25 08:42:08 2001 +@@ -27,7 +27,7 @@ + + info screen.info: screen.texinfo + @rm -f screen.info* +- $(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info ++ $(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info + + install: installdirs + $(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1 +@@ -36,7 +36,7 @@ + if test -f $$d/screen.info; then \ + for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(DESTDIR)$(infodir);done; \ + if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ +- install-info --info-dir=$(DESTDIR)$(infodir) $$d/screen.info; \ ++ install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \ + else true; fi; \ + fi + diff --git a/sysutils/screen/files/patch-ad b/sysutils/screen/files/patch-ad index 4c2627ecabbe..d9981af2f6f1 100644 --- a/sysutils/screen/files/patch-ad +++ b/sysutils/screen/files/patch-ad @@ -1,14 +1,14 @@ ---- configure.orig Wed Jun 14 18:04:30 2000 -+++ configure Mon Dec 11 05:52:29 2000 -@@ -2070,29 +2070,6 @@ +--- configure.orig Thu May 17 21:05:43 2001 ++++ configure Mon Jun 25 08:48:53 2001 +@@ -2158,29 +2158,6 @@ cat conftest.$ac_ext >&5 rm -rf conftest* olibs="$LIBS" -LIBS="-lcurses $olibs" -echo "checking libcurses" 1>&6 --echo "configure:2076: checking libcurses" >&5 +-echo "configure:2164: checking libcurses" >&5 -cat > conftest.$ac_ext <<EOF --#line 2078 "configure" +-#line 2166 "configure" -#include "confdefs.h" - -int main() { @@ -21,7 +21,7 @@ - -; return 0; } -EOF --if { (eval echo configure:2091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +-if { (eval echo configure:2179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - : -else - echo "configure: failed program was:" >&5 @@ -29,8 +29,8 @@ - rm -rf conftest* LIBS="-ltermcap $olibs" echo "checking libtermcap" 1>&6 - echo "configure:2099: checking libtermcap" >&5 -@@ -2153,8 +2130,6 @@ + echo "configure:2187: checking libtermcap" >&5 +@@ -2241,8 +2218,6 @@ rm -f conftest* fi rm -f conftest* @@ -39,7 +39,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -@@ -2165,7 +2140,7 @@ +@@ -2253,7 +2228,7 @@ main() { @@ -47,13 +47,27 @@ + exit(strcmp(tgoto("%d%d", 0, 1), "1") ? 0 : 1); } EOF - if { (eval echo configure:2172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null -@@ -2270,7 +2245,7 @@ - p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` - p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'` + if { (eval echo configure:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +@@ -2354,18 +2329,15 @@ + fi + rm -f conftest* + +-if test "$ptys" != "$pdir/pty??" ; then +-p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` +-p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'` ++# XXX: hardcoded, since port must be devfs and various setups independent ++ cat >> confdefs.h <<EOF -#define PTYRANGE0 "$p0" +#define PTYRANGE0 "pqrsPQRS" EOF cat >> confdefs.h <<EOF +-#define PTYRANGE1 "$p1" ++#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv" + EOF +- +-fi + + echo "checking default tty permissions/group" 1>&6 + echo "configure:2372: checking default tty permissions/group" >&5 diff --git a/sysutils/screen/files/patch-ae b/sysutils/screen/files/patch-ae deleted file mode 100644 index 820206d770c8..000000000000 --- a/sysutils/screen/files/patch-ae +++ /dev/null @@ -1,10 +0,0 @@ ---- teln.c.orig Wed Jul 28 15:50:22 1999 -+++ teln.c Thu Oct 21 01:15:50 1999 -@@ -28,6 +28,7 @@ - #include <sys/socket.h> - #include <fcntl.h> - #include <netdb.h> -+#include <netinet/in.h> - #include <arpa/inet.h> - - #include "config.h" diff --git a/sysutils/screen/files/patch-ag b/sysutils/screen/files/patch-ag deleted file mode 100644 index cce61671404d..000000000000 --- a/sysutils/screen/files/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ ---- display.c.orig Fri Nov 24 02:22:01 2000 -+++ display.c Fri Nov 24 02:19:13 2000 -@@ -896,7 +896,7 @@ - char *s; - int c; - { -- if (display && s) -+ if (display && s && *s) - { - ospeed = D_dospeed; - tputs(tgoto(s, 0, c), 1, DoAddChar); |