diff options
author | jlam <jlam> | 2002-08-25 21:48:57 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-08-25 21:48:57 +0000 |
commit | 02526271b78c18a0c07b3ea8be04d2a61b0bf8e7 (patch) | |
tree | c8d09a03adeac7a950080d8040f6c9ceb10ef9d2 /security | |
parent | 521a29ec203c35a133d1b565a410d027176ebfc9 (diff) | |
download | pkgsrc-02526271b78c18a0c07b3ea8be04d2a61b0bf8e7.tar.gz |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'security')
-rw-r--r-- | security/gnupg/Makefile | 17 | ||||
-rw-r--r-- | security/gnupg/PLIST | 2 | ||||
-rw-r--r-- | security/gnupg/distinfo | 2 | ||||
-rw-r--r-- | security/gnupg/patches/patch-ad | 2 | ||||
-rw-r--r-- | security/gnupg/patches/patch-ae | 2 | ||||
-rw-r--r-- | security/gpa/Makefile | 9 | ||||
-rw-r--r-- | security/mcrypt/Makefile | 14 | ||||
-rw-r--r-- | security/mhash/Makefile | 2 | ||||
-rw-r--r-- | security/mhash/buildlink2.mk | 2 | ||||
-rw-r--r-- | security/pam-smbpass/Makefile | 11 | ||||
-rw-r--r-- | security/pks/Makefile | 7 | ||||
-rw-r--r-- | security/racoon/Makefile | 8 | ||||
-rw-r--r-- | security/racoon/distinfo | 2 | ||||
-rw-r--r-- | security/racoon/patches/patch-ag | 2 | ||||
-rw-r--r-- | security/rats/Makefile | 6 | ||||
-rw-r--r-- | security/sslwrap/Makefile | 6 | ||||
-rw-r--r-- | security/stunnel/Makefile | 7 | ||||
-rw-r--r-- | security/sudo/Makefile | 4 | ||||
-rw-r--r-- | security/sudo/distinfo | 2 | ||||
-rw-r--r-- | security/sudo/patches/patch-ac | 2 | ||||
-rw-r--r-- | security/zebedee/Makefile | 13 |
21 files changed, 64 insertions, 58 deletions
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 3dd44b887d5..f653a7e1d75 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2002/07/18 20:44:52 heinz Exp $ +# $NetBSD: Makefile,v 1.33 2002/08/25 21:50:36 jlam Exp $ # DISTNAME= gnupg-1.0.7 @@ -13,7 +13,7 @@ HOMEPAGE= http://www.gnupg.org/ COMMENT= Privacy Guard, a public-Key encryption and digital signature utility BUILD_USES_MSGFMT= yes -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes CRYPTO= yes GNU_CONFIGURE= yes @@ -36,19 +36,20 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PLIST_SUBST+= IDEA="" post-extract: - ${CP} ${_DISTDIR}/idea.c.20010605 ${WRKSRC}/idea.c + ${CP} ${_DISTDIR}/idea.c.20010605 ${WRKSRC}/idea.c post-build: - cd ${WRKSRC} && \ - ${CC} ${CFLAGS} -shared -Wl,-Bshareable -fPIC -o idea idea.c + cd ${WRKSRC} && \ + ${BUILDLINK_CC} ${CFLAGS} -shared -Wl,-Bshareable -fPIC -o idea idea.c post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/idea ${PREFIX}/lib/gnupg + ${INSTALL_PROGRAM} ${WRKSRC}/idea ${PREFIX}/lib/gnupg .else PLIST_SUBST+= IDEA="@comment " .endif -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/zlib/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/zlib/buildlink2.mk" + .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST index a0699516806..72bf5e6f92f 100644 --- a/security/gnupg/PLIST +++ b/security/gnupg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/07/18 20:44:52 heinz Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/08/25 21:50:36 jlam Exp $ bin/gpg bin/gpgkeys_mailto bin/gpgsplit diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo index c9bcfd9e59b..21f3c99d9dd 100644 --- a/security/gnupg/distinfo +++ b/security/gnupg/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2002/07/18 20:44:52 heinz Exp $ +$NetBSD: distinfo,v 1.10 2002/08/25 21:50:37 jlam Exp $ SHA1 (gnupg-1.0.7.tar.gz) = 46da038c60143fa49abae2fae6fcbd0f58f7a46e Size (gnupg-1.0.7.tar.gz) = 2399025 bytes diff --git a/security/gnupg/patches/patch-ad b/security/gnupg/patches/patch-ad index 2f9d074ae55..b2d69ed793d 100644 --- a/security/gnupg/patches/patch-ad +++ b/security/gnupg/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1 2002/07/18 20:44:53 heinz Exp $ +$NetBSD: patch-ad,v 1.2 2002/08/25 21:50:37 jlam Exp $ --- configure.orig Mon Apr 29 16:59:16 2002 +++ configure diff --git a/security/gnupg/patches/patch-ae b/security/gnupg/patches/patch-ae index 63da4075511..e7975763ee7 100644 --- a/security/gnupg/patches/patch-ae +++ b/security/gnupg/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1 2002/07/18 20:44:53 heinz Exp $ +$NetBSD: patch-ae,v 1.2 2002/08/25 21:50:38 jlam Exp $ --- configure.ac.orig Mon Apr 29 16:56:08 2002 +++ configure.ac diff --git a/security/gpa/Makefile b/security/gpa/Makefile index 8b1c70e392b..59069ad7491 100644 --- a/security/gpa/Makefile +++ b/security/gpa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/01/18 09:23:58 martin Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 21:50:38 jlam Exp $ # DISTNAME= gpa-0.4.3 @@ -11,8 +11,9 @@ COMMENT= GUI frontend to gnupg DEPENDS+= gnupg>=1.0.6:../../security/gnupg -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_X11= YES -.include "../../x11/gtk/buildlink.mk" +.include "../../x11/gtk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile index f686b43d10d..b9696eaa7e4 100644 --- a/security/mcrypt/Makefile +++ b/security/mcrypt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/09 19:40:54 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/25 21:50:39 jlam Exp $ DISTNAME= mcrypt-2.5.10 CATEGORIES= security devel @@ -9,11 +9,13 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://mcrypt.hellug.gr/ COMMENT= replacement to crypt(1), supports many crypto algorithms -USE_BUILDLINK_ONLY= YES -USE_LIBTOOL= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES +USE_LIBTOOL= YES +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool + +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../security/libmcrypt/buildlink2.mk" +.include "../../security/mhash/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../security/libmcrypt/buildlink.mk" -.include "../../security/mhash/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/mhash/Makefile b/security/mhash/Makefile index 0955f9dbc77..c2234e0c033 100644 --- a/security/mhash/Makefile +++ b/security/mhash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/08/25 18:39:55 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 21:50:39 jlam Exp $ DISTNAME= mhash-0.8.9 CATEGORIES= security devel diff --git a/security/mhash/buildlink2.mk b/security/mhash/buildlink2.mk index c126b491292..95caa3705a2 100644 --- a/security/mhash/buildlink2.mk +++ b/security/mhash/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:56 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2002/08/25 21:50:40 jlam Exp $ .if !defined(MHASH_BUILDLINK2_MK) MHASH_BUILDLINK2_MK= # defined diff --git a/security/pam-smbpass/Makefile b/security/pam-smbpass/Makefile index 2b9617b77d0..00903d9393f 100644 --- a/security/pam-smbpass/Makefile +++ b/security/pam-smbpass/Makefile @@ -1,17 +1,16 @@ -# $NetBSD: Makefile,v 1.3 2002/07/30 23:24:05 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/25 21:50:41 jlam Exp $ + +.include "../../net/samba/Makefile.common" PKGNAME= pam-smbpass-${SAMBA_DIST_VERS} CATEGORIES= security -USE_BUILDLINK_ONLY= # defined - -.include "../../net/samba/Makefile.common" - 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 @@ -31,5 +30,5 @@ do-install: ${INSTALL_DATA} $${file} ${EGDIR}/$${file}; \ done -.include "../../security/PAM/buildlink.mk" +.include "../../security/PAM/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/pks/Makefile b/security/pks/Makefile index 48322130c1d..7f8224c79cc 100644 --- a/security/pks/Makefile +++ b/security/pks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/12/02 06:56:44 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 21:50:41 jlam Exp $ DISTNAME= pks-0.9.4 CATEGORIES= security www @@ -15,7 +15,7 @@ MAINTAINER= burgess@neonramp.com HOMEPAGE= http://www.mit.edu/people/marc/pks/ COMMENT= PGP Public Key Server -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --datadir=${PREFIX}/share/pks CONFIGURE_ARGS+= --localstatedir=/var/pks @@ -37,6 +37,7 @@ pre-install: post-install: ${INSTALL_SCRIPT} ${WRKDIR}/pksd.sh ${PREFIX}/etc/rc.d/pksd -.include "../../databases/db/buildlink.mk" +.include "../../databases/db/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/racoon/Makefile b/security/racoon/Makefile index 42d0facce74..ee22f5946ab 100644 --- a/security/racoon/Makefile +++ b/security/racoon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2002/06/28 09:05:18 seb Exp $ +# $NetBSD: Makefile,v 1.53 2002/08/25 21:50:42 jlam Exp $ # DISTNAME= racoon-20020507a @@ -13,13 +13,13 @@ CRYPTO= yes # this is not compatible with cross build - there's no other way .if !exists(/usr/include/netinet6/ipsec.h) -IGNORE+= "${PKGNAME} requires ipsec-ready NetBSD" +IGNORE+= "${PKGNAME} requires ipsec-ready NetBSD" .endif BUILD_DEFS+= USE_INET6 .include "../../mk/bsd.prefs.mk" -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes CONFLICTS+= racoon-[0-9]* @@ -53,5 +53,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/samples/racoon.conf.sample \ ${PREFIX}/share/examples/racoon -.include "../../security/openssl/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/racoon/distinfo b/security/racoon/distinfo index c0b386e734b..7881f084082 100644 --- a/security/racoon/distinfo +++ b/security/racoon/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2002/05/20 13:25:16 itojun Exp $ +$NetBSD: distinfo,v 1.17 2002/08/25 21:50:42 jlam Exp $ SHA1 (racoon-20020507a.tar.gz) = 9ecf5fa5660362a967bf6e48499e834eab3a7181 Size (racoon-20020507a.tar.gz) = 620752 bytes diff --git a/security/racoon/patches/patch-ag b/security/racoon/patches/patch-ag index 5f3afdc79ba..f3c44a89ea3 100644 --- a/security/racoon/patches/patch-ag +++ b/security/racoon/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.5 2002/05/20 13:25:17 itojun Exp $ +$NetBSD: patch-ag,v 1.6 2002/08/25 21:50:43 jlam Exp $ --- algorithm.c.orig Thu Apr 25 18:48:32 2002 +++ algorithm.c Mon May 20 22:11:56 2002 diff --git a/security/rats/Makefile b/security/rats/Makefile index 92099aedb2f..6395bcdb28e 100644 --- a/security/rats/Makefile +++ b/security/rats/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/05/03 14:14:23 taca Exp $ +# $NetBSD: Makefile,v 1.8 2002/08/25 21:50:43 jlam Exp $ # DISTNAME= rats-1.4 @@ -9,10 +9,10 @@ MAINTAINER= tech-pkg-ja@jp.netbsd.org HOMEPAGE= http://www.securesw.com/rats/ COMMENT= Rough Auditing Tool for Security -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --libdir=${LOCALBASE}/share/rats ALL_TARGET= rats -.include "../../textproc/expat/buildlink.mk" +.include "../../textproc/expat/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/sslwrap/Makefile b/security/sslwrap/Makefile index 3b2908d500a..d7664d69b6c 100644 --- a/security/sslwrap/Makefile +++ b/security/sslwrap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/07/27 14:46:10 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 21:50:44 jlam Exp $ # DISTNAME= ${PKGNAME:S/-//} @@ -10,7 +10,7 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.rickk.com/sslwrap/ COMMENT= simple ssl wrapper -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES -.include "../../security/openssl/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index c2aaf0b9e72..f2978ed28f7 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2002/06/17 10:47:56 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2002/08/25 21:50:47 jlam Exp $ DISTNAME= stunnel-3.22 CATEGORIES= security @@ -10,12 +10,13 @@ MAINTAINER= martti@netbsd.org HOMEPAGE= http://www.stunnel.org/ COMMENT= Universal SSL tunnel -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-ssl=${SSLBASE} \ --with-cert-dir="${SSLCERTS}" \ --with-pem-dir="${SSLCERTS}" \ --with-tcp-wrappers -.include "../../security/openssl/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../security/tcp_wrappers/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/sudo/Makefile b/security/sudo/Makefile index 27c6ae30453..ca5773072e6 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2002/06/16 20:21:20 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2002/08/25 21:50:47 jlam Exp $ # DISTNAME= sudo-1.6.6 @@ -14,7 +14,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.courtesan.com/sudo/ COMMENT= Allow others to run commands as root -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined GNU_CONFIGURE= # defined .include "../../mk/bsd.prefs.mk" diff --git a/security/sudo/distinfo b/security/sudo/distinfo index 5bdc3966c03..799a154f935 100644 --- a/security/sudo/distinfo +++ b/security/sudo/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2002/06/16 20:20:18 wiz Exp $ +$NetBSD: distinfo,v 1.11 2002/08/25 21:50:48 jlam Exp $ SHA1 (sudo-1.6.6.tar.gz) = 6768cca950fc840857b01b0bd94dbd0ca756d324 Size (sudo-1.6.6.tar.gz) = 333074 bytes diff --git a/security/sudo/patches/patch-ac b/security/sudo/patches/patch-ac index b01a4f7d3b6..7840088fc3e 100644 --- a/security/sudo/patches/patch-ac +++ b/security/sudo/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.8 2002/06/16 20:20:19 wiz Exp $ +$NetBSD: patch-ac,v 1.9 2002/08/25 21:50:48 jlam Exp $ --- config.sub.old Mon Dec 31 14:02:47 2001 +++ config.sub Sun Jun 16 12:48:45 2002 diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile index 79957e5cf20..6dead0ba651 100644 --- a/security/zebedee/Makefile +++ b/security/zebedee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/07/24 19:45:27 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2002/08/25 21:50:49 jlam Exp $ # DISTNAME= zebedee-2.3.1 @@ -12,13 +12,14 @@ COMMENT= Simple tunneling program for TCP or UDP with encryption USE_PERL5= build USE_GMAKE= # defined -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined MAKE_ENV+= PERL5=${PERL5} MAKE_FLAGS= OS=${LOWER_OPSYS} -.include "../../archivers/bzip2/buildlink.mk" -.include "../../devel/zlib/buildlink.mk" -.include "../../lang/tcl/buildlink.mk" -.include "../../security/openssl/buildlink.mk" +.include "../../archivers/bzip2/buildlink2.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../lang/tcl/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" |