Update to 3.7.6.

4 files changed, 21 insertions, 47 deletions

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index de670345f11..469ae834bb5 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.10 1998/06/21 02:22:17 tv Exp $
+# $NetBSD: Makefile,v 1.11 1998/11/30 17:45:17 tv Exp $
 # FreeBSD Id: Makefile,v 1.17 1997/06/16 06:39:51 max Exp
 #
 
-DISTNAME=       screen-3.7.4
+DISTNAME=       screen-3.7.6
 CATEGORIES=	misc
 MASTER_SITES=   ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
 		${MASTER_SITE_GNU}
 
 MAINTAINER=	hubertf@netbsd.org
 
+CONFLICTS=	screen-3.7.[24]
+
 GNU_CONFIGURE=	yes
 INFO_FILES=	screen.info
 
diff --git a/misc/screen/files/md5 b/misc/screen/files/md5
index ecc6a6f519e..de7666d768b 100644
--- a/misc/screen/files/md5
+++ b/misc/screen/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:25:08 agc Exp $
+$NetBSD: md5,v 1.4 1998/11/30 17:45:17 tv Exp $
 
-MD5 (screen-3.7.4.tar.gz) = c5ab40b068968075e41e25607dfce543
+MD5 (screen-3.7.6.tar.gz) = 9a353b828d79c3c143109265cae663a7
diff --git a/misc/screen/patches/patch-ad b/misc/screen/patches/patch-ad
index 56551055ab3..de2ad30a1e3 100644
--- a/misc/screen/patches/patch-ad
+++ b/misc/screen/patches/patch-ad
@@ -1,52 +1,24 @@
-$NetBSD: patch-ad,v 1.4 1998/08/16 21:53:15 tv Exp $
+$NetBSD: patch-ad,v 1.5 1998/11/30 17:45:18 tv Exp $
 
---- configure.orig	Fri May  2 10:37:26 1997
-+++ configure	Sun Aug 16 17:47:27 1998
-@@ -2096,36 +2096,9 @@
+--- configure.orig	Sun Oct 18 16:37:39 1998
++++ configure	Mon Nov 30 11:03:01 1998
+@@ -2163,7 +2163,7 @@
  
  _CUT_HERE_
  
--#if ((defined(hp300) && !defined(__hpux)) || defined(sun) || (defined(ultrix) && defined(mips)) || defined(_SEQUENT_) || defined(sgi) || defined(SVR4) || defined(sony_news) || defined(__alpha) || defined(_IBMR2) || defined(_AUX_SOURCE) || defined(AUX) || defined(m88k))
--loadtype=long
--# if defined(apollo) || defined(_IBMR2) || defined(_AUX_SOURCE) || defined(AUX)
--loadscale=65536
--# else
--#  if defined(FSCALE) && !defined(__osf__)
--#   undef FSCALE
--loadscale=FSCALE
--#  else
--#   ifdef sgi
--loadscale=1024
--loadtype=int
--#   else
--#    if defined(MIPS) || defined(SVR4) || defined(m88k)
--loadscale=256
--#    else /* not MIPS */
--loadscale=1000 	/* our default value */
--#    endif /* MIPS */
--#   endif /* sgi */
--#  endif /* not FSCALE */
--# endif /* not apollo */
--#else
- loadtype=double
- loadscale=1
--#endif
--#ifdef alliant
--loadnum=4
--#else
- loadnum=3
--#endif
- 
- EOF
- $CPP $DEFS conftest.c 2>/dev/null | sed -e '1,/_CUT_HERE_/d' > conftest.out
-@@ -2620,17 +2593,6 @@
+-#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(__osf__) && defined(__alpha)) || defined(_IBMR2) || defined(_AUX_SOURCE) || defined(AUX) || defined(m88k))) && !defined(__NetBSD__)
+ loadtype=long
+ # if defined(apollo) || defined(_IBMR2) || defined(_AUX_SOURCE) || defined(AUX)
+ loadscale=65536
+@@ -2702,17 +2702,6 @@
+ fi
  rm -f /tmp/conftest*
  
- test -n "$silent" || echo "checking for vsprintf"
+-test -n "$silent" || echo "checking for vsprintf"
 -cat > conftest.${ac_ext} <<EOF
 -#include "confdefs.h"
 -
--#include <stdio.h>
 -int main() { return 0; }
 -int t() { vsprintf(0,0,0);; return 0; }
 -EOF
@@ -57,7 +29,7 @@ $NetBSD: patch-ad,v 1.4 1998/08/16 21:53:15 tv Exp $
  test -n "$verbose" && \
  echo "	defining USEVARARGS"
  echo "#define" USEVARARGS "1" >> confdefs.h
-@@ -2639,12 +2601,6 @@
+@@ -2721,12 +2710,6 @@
  \${ac_uA}USEVARARGS\${ac_uB}USEVARARGS\${ac_uC}1\${ac_uD}
  \${ac_eA}USEVARARGS\${ac_eB}USEVARARGS\${ac_eC}1\${ac_eD}
  "
diff --git a/misc/screen/pkg/PLIST b/misc/screen/pkg/PLIST
index 45c28ddd65e..b09019432e6 100644
--- a/misc/screen/pkg/PLIST
+++ b/misc/screen/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 1998/02/16 08:52:59 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.7 1998/11/30 17:45:18 tv Exp $
 bin/screen
-bin/screen-3.7.4
+bin/screen-3.7.6
 man/man1/screen.1.gz
 @unexec %D/bin/install-info --delete %D/info/screen.info %D/info/dir
 info/screen.info