Merge changes in the main trunk into the buildlink2 branch for thosebuildlink2

packages that have been converted to USE_BUILDLINK2.

11 files changed, 68 insertions, 95 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 12311e71ac2..42a841964c3 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.31.2.1 2002/07/01 17:45:08 jlam Exp $
+# $NetBSD: Makefile,v 1.31.2.2 2002/08/25 21:21:04 jlam Exp $
 #
 
 DISTNAME=	gnupg-1.0.7
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/gnupg/
 # don't remove this -- we may add idea.c to it below
diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST
index 2ab812a61e8..885eca6c41f 100644
--- a/security/gnupg/PLIST
+++ b/security/gnupg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/05/07 18:48:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3.2.1 2002/08/25 21:21:05 jlam Exp $
 bin/gpg
 bin/gpgkeys_mailto
 bin/gpgsplit
@@ -8,7 +8,7 @@ info/gpgv.info
 @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gpgv.info
 ${IDEA}lib/gnupg/idea
 lib/gnupg/rndegd
-lib/gnupg/rndlinux
+lib/gnupg/rndunix
 lib/gnupg/tiger
 man/man1/gpg.1
 man/man1/gpgv.1
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index a81e8e0cf70..8fa9272e48a 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/05/07 18:48:46 wiz Exp $
+$NetBSD: distinfo,v 1.8.2.1 2002/08/25 21:21:06 jlam Exp $
 
 SHA1 (gnupg-1.0.7.tar.gz) = 46da038c60143fa49abae2fae6fcbd0f58f7a46e
 Size (gnupg-1.0.7.tar.gz) = 2399025 bytes
@@ -7,3 +7,5 @@ Size (idea.c.20010605) = 15480 bytes
 SHA1 (patch-aa) = fffd3e55792bb27df002bacbc5d8bf9096d5dd64
 SHA1 (patch-ab) = ce3b5ff0331e51ca6cd11b969e8df3719ca5d547
 SHA1 (patch-ac) = 9e3d0c6a7b828e52f5a773591f87e4a9072ad698
+SHA1 (patch-ad) = 55ca924c9aefe9eeca44b301ac523e7ebb2514e9
+SHA1 (patch-ae) = ff58490a6505e333f776efa7cafaa269c4833597
diff --git a/security/gnupg/patches/patch-ad b/security/gnupg/patches/patch-ad
new file mode 100644
index 00000000000..ca3844ef26f
--- /dev/null
+++ b/security/gnupg/patches/patch-ad
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.1.4.2 2002/08/25 21:21:07 jlam Exp $
+
+--- configure.orig	Mon Apr 29 16:59:16 2002
++++ configure
+@@ -3928,8 +3928,14 @@
+ NAME_OF_DEV_RANDOM="/dev/random"
+ NAME_OF_DEV_URANDOM="/dev/urandom"
+ case "${target}" in
+-    *-openbsd* | *-netbsd*)
++    *-openbsd*)
+         NAME_OF_DEV_RANDOM="/dev/srandom"
++        NAME_OF_DEV_URANDOM="/dev/urandom"
++        DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
++        ;;
++
++    *-netbsd*)
++        NAME_OF_DEV_RANDOM="/dev/random"
+         NAME_OF_DEV_URANDOM="/dev/urandom"
+         DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
+         ;;
diff --git a/security/gnupg/patches/patch-ae b/security/gnupg/patches/patch-ae
new file mode 100644
index 00000000000..bab4493f1fc
--- /dev/null
+++ b/security/gnupg/patches/patch-ae
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.1.4.2 2002/08/25 21:21:08 jlam Exp $
+
+--- configure.ac.orig	Mon Apr 29 16:56:08 2002
++++ configure.ac
+@@ -325,8 +325,14 @@
+ NAME_OF_DEV_RANDOM="/dev/random"
+ NAME_OF_DEV_URANDOM="/dev/urandom"
+ case "${target}" in
+-    *-openbsd* | *-netbsd*)
++    *-openbsd*)
+         NAME_OF_DEV_RANDOM="/dev/srandom"
++        NAME_OF_DEV_URANDOM="/dev/urandom"
++        DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
++        ;;
++
++    *-netbsd*)
++        NAME_OF_DEV_RANDOM="/dev/random"
+         NAME_OF_DEV_URANDOM="/dev/urandom"
+         DYNLINK_MOD_CFLAGS="-shared -rdynamic $CFLAGS_PIC -Wl,-Bshareable -Wl,-x"
+         ;;
diff --git a/security/pam-smbpass/Makefile b/security/pam-smbpass/Makefile
index 119f2d71222..cca3306d079 100644
--- a/security/pam-smbpass/Makefile
+++ b/security/pam-smbpass/Makefile
@@ -1,38 +1,17 @@
-# $NetBSD: Makefile,v 1.1.1.1.2.1 2002/07/01 17:45:09 jlam Exp $
-
-DISTNAME=	samba-2.2.2
-#
-# The pam-smbpass version number is found in the README file within the
-# Samba sources.
-#
-PKGNAME=	pam-smbpass-0.7.5
-CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.samba.org/pub/samba/ \
-		ftp://ring.asahi-net.or.jp/pub/net/samba/ \
-		ftp://samba.anu.edu.au/pub/samba/ \
-		ftp://de.samba.org/pub/mirror/samba/ \
-		ftp://se.samba.org/pub/samba/ \
-		ftp://ftp.sunet.se/pub/unix/utilities/samba/
-
-MAINTAINER=	jlam@netbsd.org
-COMMENT=	PAM authentication against a Samba password database
-
-DEPENDS+=	samba>=2.0:../../net/samba
-
-USE_BUILDLINK2=		yes
-WRKSRC=			${WRKDIR}/${DISTNAME}/source
-
-USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-
-SAMBA_ETCDIR?=		${PKG_SYSCONFDIR}/samba
-SAMBA_PRIVATE?=		${SAMBA_ETCDIR}/private
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-configdir=${SAMBA_ETCDIR}
-CONFIGURE_ARGS+=	--with-privatedir=${SAMBA_PRIVATE}
-CONFIGURE_ARGS+=	--with-pam_smbpass
-CONFIGURE_ENV+=		ac_cv_lib_curses_tgetent=no
+# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/08/25 21:21:10 jlam Exp $
+
+.include "../../net/samba/Makefile.common"
+
+PKGNAME=		pam-smbpass-${SAMBA_DIST_VERS}
+CATEGORIES=		security
+
+MAINTAINER=		jlam@netbsd.org
+COMMENT=		PAM authentication against a Samba password database
+
+DEPENDS+=		{samba>=2.0,ja-samba>=2.0}:../../net/samba
+
+USE_BUILDLINK2=		# defined
+CONFIGURE_ARGS+=	--with-pam
 
 ALL_TARGET=		pam_smbpass
 
diff --git a/security/pam-smbpass/distinfo b/security/pam-smbpass/distinfo
deleted file mode 100644
index c89a18873e8..00000000000
--- a/security/pam-smbpass/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/01/29 22:35:59 jlam Exp $
-
-SHA1 (samba-2.2.2.tar.gz) = b7aa9159e9944d150391b697189adf0a48e6f890
-Size (samba-2.2.2.tar.gz) = 6622889 bytes
-SHA1 (patch-aa) = 153f83db6a0d81dfdb48e92efe62f20c808652d3
-SHA1 (patch-ab) = c6c1bc735b6e4fc62ab13f973ce20ca5e627d247
diff --git a/security/pam-smbpass/patches/patch-aa b/security/pam-smbpass/patches/patch-aa
deleted file mode 100644
index 212dd985b55..00000000000
--- a/security/pam-smbpass/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/01/29 22:35:59 jlam Exp $
-
---- Makefile.in.orig	Sat Oct 13 17:09:06 2001
-+++ Makefile.in
-@@ -619,7 +619,7 @@
- 
- bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ)
- 	@echo Linking shared library $@
--	$(LD) @LDSHFLAGS@ -symbolic -o $@ $(PAM_SMBPASS_OBJ) -lpam $(LIBS) -lc
-+	$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(LIBS) -lc
- 
- nsswitch/libnss_wins.so: $(NSS_OBJ)
- 	@echo "Linking $@"
diff --git a/security/pam-smbpass/patches/patch-ab b/security/pam-smbpass/patches/patch-ab
deleted file mode 100644
index b8cf9b66990..00000000000
--- a/security/pam-smbpass/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/01/29 22:35:59 jlam Exp $
-
---- configure.orig	Sat Oct 13 17:09:16 2001
-+++ configure
-@@ -8288,6 +8288,10 @@
- EOF
- 
- 		;;
-+		*netbsd*)
-+			LDSHFLAGS="-shared -Wl,--export-dynamic"
-+			PICFLAG="-fPIC"
-+		;;
- 		*bsd*) LDSHFLAGS="-shared -Bshareable"
- 		;;
- 		*irix*) cat >> confdefs.h <<\EOF
-@@ -8392,6 +8396,7 @@
- 			;;
- esac
- 
-+if test x$PICFLAG = x; then
- # try to work out how to produce pic code with this compiler
- echo $ac_n "checking whether ${CC-cc} accepts -fpic""... $ac_c" 1>&6
- echo "configure:8398: checking whether ${CC-cc} accepts -fpic" >&5
-@@ -8411,6 +8416,7 @@
- echo "$ac_t""$ac_cv_prog_cc_fpic" 1>&6
- if test $ac_cv_prog_cc_fpic = yes; then
-     PICFLAG="-fpic";
-+fi
- fi
- if test x$PICFLAG = x; then
-   echo $ac_n "checking whether ${CC-cc} accepts -KPIC""... $ac_c" 1>&6
diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index 9f7a2d05ce3..145393da5f5 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48.2.2 2002/06/30 06:24:08 jlam Exp $
+# $NetBSD: Makefile,v 1.48.2.3 2002/08/25 21:21:13 jlam Exp $
 #
 
 DISTNAME=	racoon-20020507a
@@ -16,8 +16,8 @@ CRYPTO=		yes
 IGNORE+=	"${PKGNAME} requires ipsec-ready NetBSD"
 .endif
 
-.include "../../mk/bsd.prefs.mk"
 BUILD_DEFS+=	USE_INET6
+.include "../../mk/bsd.prefs.mk"
 
 USE_BUILDLINK2=	yes
 
@@ -25,6 +25,8 @@ CONFLICTS+=	racoon-[0-9]*
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/racoon
 
+PKG_SYSCONFSUBDIR?=	racoon
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-debug
 .if defined(USE_INET6) && ${USE_INET6} == "YES"
@@ -32,7 +34,7 @@ CONFIGURE_ARGS+=--enable-ipv6
 .else
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
-CONFIGURE_ARGS+=--sysconfdir=/etc/racoon
+CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR}
 .if defined(PKGREVISION)
 CONFIGURE_ARGS+=--with-pkgversion=netbsd-pkgsrc-20020507anb${PKGREVISION}
 .else
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 9c1e491525e..e2eb8bebef6 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5.2.2 2002/06/30 06:24:12 jlam Exp $
+# $NetBSD: Makefile,v 1.5.2.3 2002/08/25 21:21:14 jlam Exp $
 #
 
 DISTNAME=		zebedee-2.3.1
@@ -10,8 +10,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.winton.org.uk/zebedee/
 COMMENT=		Simple tunneling program for TCP or UDP with encryption
 
-BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
-
+USE_PERL5=		build
 USE_GMAKE=		# defined
 USE_BUILDLINK2=		# defined