Upgrade

4 files changed, 24 insertions, 45 deletions

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 35defd9a5908..73b1e35f13df 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	screen
-# Version required:     3.6.0
+# Version required:     3.6.1
 # Date created:         25 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.4 1994/12/17 07:35:01 ache Exp $
+# $Id: Makefile,v 1.5 1994/12/22 06:46:32 ache Exp $
 #
 
-DISTNAME=       screen-3.6.0
+DISTNAME=       screen-3.6.1
 NCFTPFLAGS=     -PN
 MASTER_SITES=   ftp://ftp.uni-erlangen.de/pub/utilities/screen/
 GNU_CONFIGURE=	YES
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
new file mode 100644
index 000000000000..ba5e8e6b70e9
--- /dev/null
+++ b/misc/screen/distinfo
@@ -0,0 +1 @@
+MD5 (screen-3.6.1.tar.gz) = 80255677328f718c06bcb1032ca0a34c
diff --git a/misc/screen/files/patch-aa b/misc/screen/files/patch-aa
index 849f7951dbb1..b28623063f7c 100644
--- a/misc/screen/files/patch-aa
+++ b/misc/screen/files/patch-aa
@@ -1,56 +1,29 @@
-*** Makefile.in.bak	Tue Nov 29 00:07:26 1994
---- Makefile.in	Tue Nov 29 06:30:34 1994
+*** Makefile.in.bak	Mon Jan 16 17:59:20 1995
+--- Makefile.in	Wed Jan 18 04:13:40 1995
 ***************
-*** 19,33 ****
-  
+*** 20,26 ****
   ETCSCREENRC = `sed < config.h -n -e '/define ETCSCREENRC/s/^.*"\([^"]*\)"/\1/p'`
   
-! CC = @CC@
-! CFLAGS = -O
-! LDFLAGS =
-! LIBS = @LIBS@
-  
-  CPP_DEPEND=/lib/cpp -MM
-  
-! INSTALL = @INSTALL@
-! INSTALL_PROGRAM = @INSTALL_PROGRAM@
-  INSTALL_DATA = @INSTALL_DATA@
-  
-  AWK = @AWK@
---- 19,30 ----
-  
-  ETCSCREENRC = `sed < config.h -n -e '/define ETCSCREENRC/s/^.*"\([^"]*\)"/\1/p'`
+  CC = @CC@
+- CFLAGS = -O
+  LDFLAGS =
+  LIBS = @LIBS@
   
-! LIBS = -ltermcap -lutil -lcrypt
-  
-  CPP_DEPEND=/lib/cpp -MM
-  
-! INSTALL = @INSTALL@ -o bin -g bin
-! INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
-  INSTALL_DATA = @INSTALL_DATA@
-  
-  AWK = @AWK@
+--- 20,25 ----
 ***************
-*** 136,145 ****
+*** 79,85 ****
   
   install: install_bin
-  	-$(INSTALL_DATA) $(srcdir)/doc/screen.1 $(mandir)/man1/screen.1
+  	cd doc ; $(MAKE) install
 ! 	-tic ${srcdir}/terminfo/screeninfo.src
   # Better do this by hand. E.g. under RCS...
   #	cat ${srcdir}/terminfo/screencap >> /etc/termcap
-! 	@echo "termcap entry (${srcdir}/terminfo/screencap) should be installed manually."
-  
-  installdirs: mkinstalldirs
-  # Path leading to ETCSCREENRC and Socketdirectory not checked.
---- 133,143 ----
+  	@echo "termcap entry (${srcdir}/terminfo/screencap) should be installed manually."
+--- 78,84 ----
   
   install: install_bin
-  	-$(INSTALL_DATA) $(srcdir)/doc/screen.1 $(mandir)/man1/screen.1
+  	cd doc ; $(MAKE) install
 ! #       -tic ${srcdir}/terminfo/screeninfo.src
   # Better do this by hand. E.g. under RCS...
   #	cat ${srcdir}/terminfo/screencap >> /etc/termcap
-! #       @echo "termcap entry (${srcdir}/terminfo/screencap) should be installed manually."
-! 	@echo "look at global and local screenrc examples in etc subdir"
-  
-  installdirs: mkinstalldirs
-  # Path leading to ETCSCREENRC and Socketdirectory not checked.
+  	@echo "termcap entry (${srcdir}/terminfo/screencap) should be installed manually."
diff --git a/misc/screen/pkg-plist b/misc/screen/pkg-plist
index 0d0457c76347..49bad7dfcdab 100644
--- a/misc/screen/pkg-plist
+++ b/misc/screen/pkg-plist
@@ -1,4 +1,9 @@
 @cwd /usr/local
 bin/screen
-bin/screen-3.6.0
+bin/screen-3.6.1
 man/man1/screen.1
+info/screen.info
+info/screen.info-1
+info/screen.info-2
+info/screen.info-3
+info/screen.info-4