Upgrade to 3.9.8

5 files changed, 62 insertions, 24 deletions

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 1ce2ab5b4ae8..16b3b3337acf 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=       screen
-PORTVERSION=	3.9.5
+PORTVERSION=    3.9.8
 CATEGORIES=	misc
 MASTER_SITES=   ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
 		${MASTER_SITE_GNU}
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index d8d851488610..f01bbd247962 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1 +1 @@
-MD5 (screen-3.9.5.tar.gz) = ac7dd525b0920bc98e4af75b0f73c73e
+MD5 (screen-3.9.8.tar.gz) = 8ddfebe32c2d45410ce89ea9779bb1cf
diff --git a/misc/screen/files/patch-aa b/misc/screen/files/patch-aa
index 5aafec1c3088..c6f856c9ac65 100644
--- a/misc/screen/files/patch-aa
+++ b/misc/screen/files/patch-aa
@@ -1,12 +1,11 @@
-*** Makefile.in.bak	Mon Jan 16 17:59:20 1995
---- Makefile.in	Wed Jan 18 04:13:40 1995
-***************
-*** 21,27 ****
-  ETCSCREENRC = `sed < config.h -n -e '/define ETCSCREENRC/s/^.*"\([^"]*\)"/\1/p'`
-  
-  CC = @CC@
-- CFLAGS = -O
-  LDFLAGS =
-  LIBS = @LIBS@
-  
---- 21,26 ----
+--- Makefile.in.orig	Fri Sep  1 20:07:26 2000
++++ Makefile.in	Tue Sep  5 18:49:17 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@
diff --git a/misc/screen/files/patch-ad b/misc/screen/files/patch-ad
index a163bc02d66d..652b9565f0c2 100644
--- a/misc/screen/files/patch-ad
+++ b/misc/screen/files/patch-ad
@@ -1,11 +1,50 @@
---- configure.orig	Mon Aug  2 15:26:53 1999
-+++ configure	Thu Oct 21 01:08:47 1999
-@@ -2706,7 +2706,7 @@
+--- configure.old	Wed Jun 14 18:04:30 2000
++++ configure	Tue Sep  5 19:26:25 2000
+@@ -2070,29 +2070,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
+-cat > conftest.$ac_ext <<EOF
+-#line 2078 "configure"
+-#include "confdefs.h"
+-
+-int main() {
+-
+-#ifdef __hpux
+-__sorry_hpux_libcurses_is_totally_broken_in_10_10();
+-#else
+-tgetent((char *)0, (char *)0);
+-#endif
+-
+-; return 0; }
+-EOF
+-if { (eval echo configure:2091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+-  :
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+   LIBS="-ltermcap $olibs"
+ echo "checking libtermcap" 1>&6
+ echo "configure:2099: checking libtermcap" >&5
+@@ -2153,8 +2130,6 @@
+ rm -f conftest*
+ fi
+ rm -f conftest*
+-fi
+-rm -f conftest*
  
- _CUT_HERE_
+ 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 @@
  
--#if ((defined(hp300) && !defined(__hpux)) || defined(sun) || (defined(ultrix) && defined(mips)) || defined(_SEQUENT_) || defined(sgi) || defined(SVR4) || defined(sony_news) || !(defined(__osf__) && defined(__alpha)) || defined(_IBMR2) || defined(_AUX_SOURCE) || defined(AUX) || defined(m88k))
-+#if ((defined(hp300) && !defined(__hpux)) || defined(sun) || (defined(ultrix) && defined(mips)) || defined(_SEQUENT_) || defined(sgi) || defined(SVR4) || defined(sony_news) || defined(_IBMR2) || defined(_AUX_SOURCE) || defined(AUX) || defined(m88k))
- loadtype=long
- # if defined(apollo) || defined(_IBMR2) || defined(_AUX_SOURCE) || defined(AUX)
- loadscale=65536
+ main()
+ {
+- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
++ 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
diff --git a/misc/screen/pkg-plist b/misc/screen/pkg-plist
index f263d8963475..52f72c344f4f 100644
--- a/misc/screen/pkg-plist
+++ b/misc/screen/pkg-plist
@@ -1,5 +1,5 @@
 bin/screen
-bin/screen-3.9.5
+bin/screen-3.9.8
 @unexec install-info --delete %D/info/screen.info %D/info/dir
 info/screen.info
 @exec install-info %D/info/screen.info %D/info/dir