pull and enable IPv6 patch.

5 files changed, 47 insertions, 146 deletions

diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index b89f15d15c1..666540392a8 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2001/03/04 01:08:01 assar Exp $
+# $NetBSD: Makefile,v 1.39 2001/04/13 05:33:16 itojun Exp $
 #
 
 DISTNAME=	cvs-1.11
@@ -7,6 +7,10 @@ CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cvshome.org/pub/${DISTNAME}/ \
 		${MASTER_SITE_GNU:=cvs/}
 
+PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
+PATCHFILES=	cvs-1.11-v6-20010413.diff.gz
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	http://www.cvshome.org/
 COMMENT=	Concurrent Versions System
@@ -14,8 +18,12 @@ COMMENT=	Concurrent Versions System
 GNU_CONFIGURE=	yes
 USE_GTEXINFO=	yes
 
+BUILD_DEPENDS+=	autoconf-*:../../devel/autoconf
+
 .include "../../mk/bsd.prefs.mk"
 
+BUILD_DEFS+=	USE_INET6
+
 .if (${OPSYS} == "SunOS")
 DEPENDS+=	zlib-*:../../devel/zlib
 CFLAGS+=	-I${PREFIX}/include		# zlib.h
@@ -31,8 +39,17 @@ pre-fetch:
 	@${ECHO} RCS_LOCALID is now replaced by the tag variable in CVSROOT/config.
 .endif
 
+.if ${USE_INET6} == "YES"
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
 CONFIGURE_ENV+=	perl_path=${PERL5}
 
 INFO_FILES=	cvs.info cvsclient.info
 
+post-patch:
+	(cd ${WRKSRC}; autoreconf)
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvs/files/md5 b/devel/cvs/files/md5
index 157e4edd175..87f9e694df1 100644
--- a/devel/cvs/files/md5
+++ b/devel/cvs/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.4 2000/10/18 03:31:15 hubertf Exp $
+$NetBSD: md5,v 1.5 2001/04/13 05:33:17 itojun Exp $
 
-MD5 (cvs-1.11.tar.gz) = fd67a990423a0e9fa2fa1c3cf10f4356
+SHA1 (cvs-1.11.tar.gz) = 809932302b085491bdb868e558b5474f61f68f8a
+SHA1 (cvs-1.11-v6-20010413.diff.gz) = b2629d71ccd330f1e1db716e9dec78cf001fcc8f
diff --git a/devel/cvs/files/patch-sum b/devel/cvs/files/patch-sum
index f38b20c36a5..609998ad57d 100644
--- a/devel/cvs/files/patch-sum
+++ b/devel/cvs/files/patch-sum
@@ -1,27 +1,26 @@
-$NetBSD: patch-sum,v 1.12 2001/03/04 01:08:01 assar Exp $
+$NetBSD: patch-sum,v 1.13 2001/04/13 05:33:17 itojun Exp $
 
-MD5 (patch-aa) = 87ac7c35c0dfd74d274b6032cb11c3a3
-MD5 (patch-ab) = 1dd7ad9d9ab90c34d5c13fc2f076ff04
-MD5 (patch-ac) = e7ff730e87b13ba56af16e9db2334550
-MD5 (patch-ad) = a2d7df4269ad5e6cd5730c37bb354b8b
-MD5 (patch-ae) = 3bfdc675e8c59de4a9c4157d00048b0f
-MD5 (patch-af) = 86bcf13667e4c1866e397508e25d65cd
-MD5 (patch-ag) = 0b07944e7d3ae215325c2dc05ca0f191
-MD5 (patch-ah) = f69390d98ad36c7dad8016f62296f2f0
-MD5 (patch-ai) = 7f56ef76d75934c916675269b17233ce
-MD5 (patch-ak) = c4fce62d350decea0f0c20ee53e7b618
-MD5 (patch-al) = 7c374e30d426324f39423944edfd158d
-MD5 (patch-am) = 8f9938de2656c908abc9469ef86c5702
-MD5 (patch-an) = 2695c0b9c45c21fa004a750b69595697
-MD5 (patch-ao) = acb748a3058898cbb0cebc0d881c9361
-MD5 (patch-ap) = 94433b449faa5e468ecb25e58114e062
-MD5 (patch-aq) = f100cb527846b8ea5e9d5029e34f5881
-MD5 (patch-ar) = 88032cc13f9d9712e764dcf3572d55e0
-MD5 (patch-as) = 57bb4e77f01132eb20d0a66f6141540c
-MD5 (patch-at) = a3a3221012536f04c230f9cb5dabcabe
-MD5 (patch-au) = c8c6999a983456c1e09626c26aecb2bc
-MD5 (patch-av) = 6db3c465306ce160334b763acadb9764
-MD5 (patch-aw) = 62419b18ef25c27ab80a1cc6b01d858b
-MD5 (patch-ax) = d3e9dbd9a7563ebf8419cf77715b3952
-MD5 (patch-ay) = 582a67798f19e25bcfd5d6c6201bdc76
-MD5 (patch-az) = bc7e2eed182940b59bb4a839cc88d05b
+SHA1 (patch-aa) = 6952c772768280c4dc96037df77040f62007d06b
+SHA1 (patch-ab) = c011a08b223a68c0a9546462a064c99ef28691d4
+SHA1 (patch-ac) = f5b8e99ce02e1bb235a55cd2e7da2623b37014f1
+SHA1 (patch-ad) = 7fb003cff44208a0207ceca497b7288ad35d7273
+SHA1 (patch-ae) = fff731374c8dc049dbce41d861026af910877a3f
+SHA1 (patch-af) = 74eacddd452edbae91e8fbb41b554eb33b69788b
+SHA1 (patch-ag) = e301b54d193cef394ffbe482ceb1bbd0d5d73343
+SHA1 (patch-ah) = 0b00aad19f35ef81edcc980ec8ab6fb3707974da
+SHA1 (patch-ai) = 403eeda35a60d0f277fa6521dc7899c85f3ba25f
+SHA1 (patch-ak) = 11aee488226ecda4973bdf7ff6c3b22fcb7f3f5c
+SHA1 (patch-al) = f5ab4db1bec429b7fc3447a220e3611fd3041572
+SHA1 (patch-am) = f44f08fe620de49521ac34d9c002718da7a92e54
+SHA1 (patch-an) = a958e25814c514e276bf618a21be86d43f395345
+SHA1 (patch-ao) = d0888f49b884ba915d7c2f09a86b02ae0cdd8c9a
+SHA1 (patch-ap) = 1715267e59a78b0e510df79d206e9354864baab6
+SHA1 (patch-aq) = fd66be1c5395baf3a3ef5c81ac7a38f481e8eafa
+SHA1 (patch-ar) = 6e7c24d1827fed5d970e263e552d12f64a62b90d
+SHA1 (patch-as) = 166179f19af183b76f6a3336db494609c8d6dcc8
+SHA1 (patch-at) = 5a05259e267c002b91d6653602e9b5b49d55f8ce
+SHA1 (patch-au) = 0b63715fa19fda6dacac259bd4510479eaba5a67
+SHA1 (patch-av) = 34656e9372f51c9bdb9ca7e065b4391d9aede3ac
+SHA1 (patch-ax) = 972a7086e904be528c627934444a5ab6d587f720
+SHA1 (patch-ay) = c27da149c0144c0cbe2efadb4c770d08d4ab6c14
+SHA1 (patch-az) = 5e844a7abaa7fe4024c25c641d5b57edf0f35218
diff --git a/devel/cvs/patches/patch-af b/devel/cvs/patches/patch-af
index 6bef6a0fec3..9a681c8cbc2 100644
--- a/devel/cvs/patches/patch-af
+++ b/devel/cvs/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.4 2000/10/21 19:29:06 wiz Exp $
+$NetBSD: patch-af,v 1.5 2001/04/13 05:33:17 itojun Exp $
 
 --- src/update.c.orig	Wed Jul 26 21:29:01 2000
 +++ src/update.c
@@ -22,21 +22,3 @@ $NetBSD: patch-af,v 1.4 2000/10/21 19:29:06 wiz Exp $
  		}
  	    }
  
-@@ -2678,7 +2685,7 @@
- 	    else
- 	    {
- 		/* If the size of `ftype' changes, fix the sscanf call also */
--		char ftype[16];
-+		char ftype[16+1];
- 		if (sscanf (n->data, "%16s %lu", ftype,
- 			    &dev_long) < 2)
- 		    error (1, 0, "%s:%s has bad `special' newphrase %s",
-@@ -2756,7 +2763,7 @@
- 	    else
- 	    {
- 		/* If the size of `ftype' changes, fix the sscanf call also */
--		char ftype[16];
-+		char ftype[16+1];
- 		if (sscanf (n->data, "%16s %lu", ftype,
- 			    &dev_long) < 2)
- 		    error (1, 0, "%s:%s has bad `special' newphrase %s",
diff --git a/devel/cvs/patches/patch-aw b/devel/cvs/patches/patch-aw
deleted file mode 100644
index e75ca7a35e1..00000000000
--- a/devel/cvs/patches/patch-aw
+++ /dev/null
@@ -1,98 +0,0 @@
-$NetBSD: patch-aw,v 1.6 2001/03/04 01:08:02 assar Exp $
-
---- configure.orig	Sun Mar  4 00:31:24 2001
-+++ configure	Sun Mar  4 00:47:23 2001
-@@ -2820,19 +2820,22 @@
-   
- fi
- 
--KRB4=/usr/kerberos
-+KRB4=
- 
- # Check whether --with-krb4 or --without-krb4 was given.
- if test "${with_krb4+set}" = set; then
-   withval="$with_krb4"
--  KRB4=$withval
-+  if test X"$withval" != X"no"; then KRB4=$withval; fi
- fi
-+if test X"$KRB4" != X""; then
- echo "default place for krb4 is $KRB4"
-+fi
- 
- 
-+if test X"$KRB4" != X""; then
- krb_h=
- echo $ac_n "checking for krb.h""... $ac_c" 1>&6
--echo "configure:2836: checking for krb.h" >&5
-+echo "configure:2839: checking for krb.h" >&5
- if test "$cross_compiling" != yes && test -r $KRB4/include/krb.h; then
-    hold_cflags=$CFLAGS
-    CFLAGS="$CFLAGS -I$KRB4/include"
-@@ -2945,7 +2948,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lkrb  $LIBS"
-+LIBS="-lkrb -ldes -lcom_err -lroken -lcrypt  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2951 "configure"
- #include "confdefs.h"
-@@ -3070,7 +3073,7 @@
- EOF
- 
-     test -n "${krb_libdir}" && LIBS="${LIBS} -L${krb_libdir}"
--    LIBS="${LIBS} -lkrb"
-+    LIBS="${LIBS} -lkrb -ldes -lcom_err -lroken -lcrypt"
-     # Put -L${krb_libdir} in LDFLAGS temporarily so that it appears before
-     # -ldes in the command line.  Don't do it permanently so that we honor
-     # the user's setting for LDFLAGS
-@@ -3177,19 +3180,24 @@
- fi
- done
- 
-+fi	# KRB4 empty
-+
- 
--GSSAPI=/usr/cygnus/kerbnet
-+GSSAPI=
- 
- # Check whether --with-gssapi or --without-gssapi was given.
- if test "${with_gssapi+set}" = set; then
-   withval="$with_gssapi"
--  GSSAPI=$withval
-+  if test X"$withval" != X"no"; then GSSAPI=$withval; fi
- fi
-+if test X"$GSSAPI" != X""; then
- echo "default place for GSSAPI is $GSSAPI"
-+fi
- 
- 
-+if test X"$GSSAPI" != X""; then
- hold_cppflags=$CPPFLAGS
--CPPFLAGS="$CPPFLAGS -I$GSSAPI/include "
-+CPPFLAGS="$CPPFLAGS -I$GSSAPI/include -I$GSSAPI/include/krb5"
- for ac_hdr in krb5.h gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-@@ -3239,10 +3247,10 @@
- #define HAVE_GSSAPI 1
- EOF
- 
--  includeopt="${includeopt} -I$GSSAPI/include"
-+  includeopt="${includeopt} -I$GSSAPI/include -I$GSSAPI/include/krb5"
-   # FIXME: This is ugly, but these things don't seem to be standardized.
--  if test "$ac_cv_header_gssapi_h" = "yes"; then
--    LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -ldes -lroken"
-+  if test "$ac_cv_header_gssapi_gssapi_generic_h" = "no"; then
-+    LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -lcom_err -ldes -lroken"
-   else
-     LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
-   fi
-@@ -3332,6 +3340,7 @@
- fi
- 
- fi
-+fi	# GSSAPI empty
- 
- # Check whether --enable-encryption or --disable-encryption was given.
- if test "${enable_encryption+set}" = set; then