Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

26 files changed, 257 insertions, 45 deletions

diff --git a/security/PAM/Makefile b/security/PAM/Makefile
index 00e2add0018..0e1ceb41828 100644
--- a/security/PAM/Makefile
+++ b/security/PAM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/01/29 22:20:54 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/08/25 18:39:48 jlam Exp $
 #
 
 DISTNAME=	Linux-${PKGNAME}
@@ -11,7 +11,7 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.kernel.org/pub/linux/libs/pam/
 COMMENT=	Pluggable Authentication Modules
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 
 GNU_CONFIGURE=		yes
@@ -57,6 +57,6 @@ post-install:
 		${INSTALL_DATA} $${file} ${HTMLDIR};			\
 	done
 
-.include "../../security/libcrack/buildlink.mk"
+.include "../../security/libcrack/buildlink2.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/PAM/buildlink2.mk b/security/PAM/buildlink2.mk
new file mode 100644
index 00000000000..14cc2a7d512
--- /dev/null
+++ b/security/PAM/buildlink2.mk
@@ -0,0 +1,52 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:48 jlam Exp $
+
+.if !defined(PAM_BUILDLINK2_MK)
+PAM_BUILDLINK2_MK=	# defined
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILDLINK_DEPENDS.pam?=		PAM>=0.75
+BUILDLINK_PKGSRCDIR.pam?=	../../security/PAM
+
+.if exists(/usr/include/security/pam_appl.h)
+_NEED_PAM=		NO
+.else
+_NEED_PAM=		YES
+.endif
+
+.if ${_NEED_PAM} == "YES"
+
+BUILDLINK_PACKAGES+=	pam
+EVAL_PREFIX+=	BUILDLINK_PREFIX.pam=PAM
+BUILDLINK_PREFIX.pam_DEFAULT=	${LOCALBASE}
+
+BUILDLINK_FILES.pam=	include/security/*
+BUILDLINK_FILES.pam+=	lib/libpam.*
+BUILDLINK_FILES.pam+=	lib/libpamc.*
+BUILDLINK_FILES.pam+=	lib/libpam_misc.*
+
+BUILDLINK_TARGETS+=	pam-buildlink
+
+pam-buildlink: _BUILDLINK_USE
+
+.else
+
+# The PAM libraries are usually in /lib on Linux systems while the headers
+# are in /usr/include.
+#
+BUILDLINK_PREFIX.pam=		/usr
+BUILDLINK_PREFIX.pam-inc=	/usr
+BUILDLINK_FILES.pam-inc=	include/security/*
+BUILDLINK_PREFIX.pam-lib=	/
+BUILDLINK_FILES.pam-lib+=	lib/libpam.*
+BUILDLINK_FILES.pam-lib+=	lib/libpamc.*
+BUILDLINK_FILES.pam-lib+=	lib/libpam_misc.*
+
+BUILDLINK_TARGETS+=	pam-inc-buildlink
+BUILDLINK_TARGETS+=	pam-lib-buildlink
+
+pam-inc-buildlink: _BUILDLINK_USE
+pam-lib-buildlink: _BUILDLINK_USE
+
+.endif	# _NEED_PAM
+.endif	# PAM_BUILDLINK2_MK
diff --git a/security/cyrus-sasl/DEINSTALL b/security/cyrus-sasl/DEINSTALL
index 75d06a8612e..22d58fd1bfe 100644
--- a/security/cyrus-sasl/DEINSTALL
+++ b/security/cyrus-sasl/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.5 2002/07/31 03:23:06 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.6 2002/08/25 18:39:49 jlam Exp $
 
 SASLDB=@PKG_SYSCONFDIR@/sasldb.db
 SASLSOCKETDIR=@SASLSOCKETDIR@
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index c9f09bf7c12..45df43bdfc1 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2002/07/31 03:23:06 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2002/08/25 18:39:50 jlam Exp $
 
 DISTNAME=		cyrus-sasl-1.5.27
 SVR4_PKGNAME=		csasl
@@ -13,7 +13,7 @@ COMMENT=		Simple Authentication and Security Layer
 
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=	--with-saslauthd=${SASLSOCKETDIR}
 CONFIGURE_ARGS+=	--with-dblib=ndbm
 CONFIGURE_ARGS+=	--with-dbpath=${PKG_SYSCONFDIR}/sasldb
 CONFIGURE_ARGS+=	--with-plugindir=${PREFIX}/lib/sasl
-CONFIGURE_ARGS+=	--with-rc4=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-rc4=${BUILDLINK_PREFIX.openssl}
 
 # Authentication mechanisms
 CONFIGURE_ARGS+=	--enable-anon		# ANONYMOUS
@@ -66,9 +66,9 @@ CONFIGURE_ARGS+=	--disable-gssapi	# --- no GSSAPI
 PLIST_SRC+=		${.CURDIR}/PLIST.plugins
 
 .if defined(USE_PAM)
-.  include "../../security/PAM/buildlink.mk"
+.  include "../../security/PAM/buildlink2.mk"
 BUILD_DEFS+=		USE_PAM
-CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.pam}
 .else
 CONFIGURE_ARGS+=	--without-pam
 .endif
@@ -105,6 +105,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${HTMLDIR}
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt ${HTMLDIR}
 
-.include "../../security/openssl/buildlink.mk"
+.include "../../security/openssl/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/cyrus-sasl/PLIST.common b/security/cyrus-sasl/PLIST.common
index 56498d790e4..0854e1e0a21 100644
--- a/security/cyrus-sasl/PLIST.common
+++ b/security/cyrus-sasl/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.3 2002/07/31 03:23:06 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2002/08/25 18:39:50 jlam Exp $
 bin/sasl-config
 etc/rc.d/sasl_pwcheck
 etc/rc.d/saslauthd
diff --git a/security/cyrus-sasl/buildlink2.mk b/security/cyrus-sasl/buildlink2.mk
new file mode 100644
index 00000000000..38459f4ecad
--- /dev/null
+++ b/security/cyrus-sasl/buildlink2.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:50 jlam Exp $
+
+.if !defined(CYRUS_SASL_BUILDLINK2_MK)
+CYRUS_SASL_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			cyrus-sasl
+BUILDLINK_DEPENDS.cyrus-sasl?=		cyrus-sasl>=1.5.24nb2
+BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.cyrus-sasl=cyrus-sasl
+BUILDLINK_PREFIX.cyrus-sasl_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.cyrus-sasl=	include/hmac-md5.h
+BUILDLINK_FILES.cyrus-sasl+=	include/sasl.h
+BUILDLINK_FILES.cyrus-sasl+=	include/saslplug.h
+BUILDLINK_FILES.cyrus-sasl+=	include/saslutil.h
+BUILDLINK_FILES.cyrus-sasl+=	lib/libsasl.*
+
+.if defined(USE_PAM)
+.  include "../../security/PAM/buildlink2.mk"
+.endif
+
+BUILDLINK_TARGETS+=	cyrus-sasl-buildlink
+
+cyrus-sasl-buildlink: _BUILDLINK_USE
+
+.endif	# CYRUS_SASL_BUILDLINK2_MK
diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index 01828ee9826..d2bedb53cd0 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/07/31 03:23:07 jlam Exp $
+$NetBSD: distinfo,v 1.7 2002/08/25 18:39:51 jlam Exp $
 
 SHA1 (cyrus-sasl-1.5.27.tar.gz) = eedaec8355219b61e64236e3a5d9845d3af5a13d
 Size (cyrus-sasl-1.5.27.tar.gz) = 528252 bytes
diff --git a/security/cyrus-sasl/files/sasl_pwcheck.sh b/security/cyrus-sasl/files/sasl_pwcheck.sh
index aa2243707a4..32ea60034f9 100644
--- a/security/cyrus-sasl/files/sasl_pwcheck.sh
+++ b/security/cyrus-sasl/files/sasl_pwcheck.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: sasl_pwcheck.sh,v 1.8 2002/07/31 03:23:07 jlam Exp $
+# $NetBSD: sasl_pwcheck.sh,v 1.9 2002/08/25 18:39:51 jlam Exp $
 #
 # The pwcheck daemon allows UNIX password authentication with Cyrus SASL.
 #
diff --git a/security/cyrus-sasl/files/saslauthd.sh b/security/cyrus-sasl/files/saslauthd.sh
index 273c35f782a..16b77de72df 100644
--- a/security/cyrus-sasl/files/saslauthd.sh
+++ b/security/cyrus-sasl/files/saslauthd.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: saslauthd.sh,v 1.1 2002/07/31 03:23:07 jlam Exp $
+# $NetBSD: saslauthd.sh,v 1.2 2002/08/25 18:39:51 jlam Exp $
 #
 # The saslauthd daemon allows cleartext UNIX password authentication via
 # several authentication mechanisms with Cyrus SASL.
diff --git a/security/cyrus-sasl/patches/patch-aj b/security/cyrus-sasl/patches/patch-aj
index 2510133d45a..2b86eb5ffad 100644
--- a/security/cyrus-sasl/patches/patch-aj
+++ b/security/cyrus-sasl/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2002/07/31 03:23:07 jlam Exp $
+$NetBSD: patch-aj,v 1.2 2002/08/25 18:39:51 jlam Exp $
 
 --- saslauthd/Makefile.am.orig	Fri Mar 23 20:41:35 2001
 +++ saslauthd/Makefile.am
diff --git a/security/cyrus-sasl/patches/patch-ak b/security/cyrus-sasl/patches/patch-ak
index 242fb18bf86..adf8a601617 100644
--- a/security/cyrus-sasl/patches/patch-ak
+++ b/security/cyrus-sasl/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1 2002/07/31 03:23:07 jlam Exp $
+$NetBSD: patch-ak,v 1.2 2002/08/25 18:39:52 jlam Exp $
 
 --- lib/checkpw.c.orig	Sat Feb 17 00:06:48 2001
 +++ lib/checkpw.c
diff --git a/security/libcrack/Makefile b/security/libcrack/Makefile
index 09926995adf..e3c0038eb98 100644
--- a/security/libcrack/Makefile
+++ b/security/libcrack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/19 09:12:33 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 18:39:52 jlam Exp $
 #
 
 DISTNAME=	cracklib,2.7
@@ -11,8 +11,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.users.dircon.co.uk/~crypto/
 COMMENT=	password checking library
 
-USE_LIBTOOL=		YES
-USE_BUILDLINK_ONLY=	YES
+USE_LIBTOOL=	YES
+USE_BUILDLINK2=	YES
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/cracklib
diff --git a/security/libcrack/buildlink2.mk b/security/libcrack/buildlink2.mk
new file mode 100644
index 00000000000..75143df9ada
--- /dev/null
+++ b/security/libcrack/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:53 jlam Exp $
+
+.if !defined(LIBCRACK_BUILDLINK2_MK)
+LIBCRACK_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libcrack
+BUILDLINK_DEPENDS.libcrack?=	libcrack>=2.7
+BUILDLINK_PKGSRCDIR.libcrack?=	../../security/libcrack
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libcrack=libcrack
+BUILDLINK_PREFIX.libcrack_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libcrack=	include/cracklib/*
+BUILDLINK_FILES.libcrack+=	lib/libcrack.*
+
+BUILDLINK_TARGETS+=	libcrack-buildlink
+
+libcrack-buildlink: _BUILDLINK_USE
+
+.endif	# LIBCRACK_BUILDLINK2_MK
diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index 13e2c7af609..e46d7eb478b 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/05/09 22:31:07 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/25 18:39:53 jlam Exp $
 
 DISTNAME=	libmcrypt-2.4.22
 CATEGORIES=	security devel
@@ -10,7 +10,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://mcrypt.hellug.gr/
 COMMENT=	crypto algorithms library
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
@@ -18,5 +18,5 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 post-extract:
 	${RM} -rf ${WRKSRC}/libltdl
 
-.include "../../devel/libtool/buildlink.mk"
+.include "../../devel/libtool/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libmcrypt/PLIST b/security/libmcrypt/PLIST
index 74286d58577..6cb2cda8931 100644
--- a/security/libmcrypt/PLIST
+++ b/security/libmcrypt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/09 22:31:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:39:53 jlam Exp $
 bin/libmcrypt-config
 include/mcrypt.h
 lib/libmcrypt.a
diff --git a/security/libmcrypt/buildlink2.mk b/security/libmcrypt/buildlink2.mk
new file mode 100644
index 00000000000..43022583303
--- /dev/null
+++ b/security/libmcrypt/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:53 jlam Exp $
+
+.if !defined(LIBMCRYPT_BUILDLINK2_MK)
+LIBMCRYPT_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libmcrypt
+BUILDLINK_DEPENDS.libmcrypt?=	libmcrypt>=2.4.17
+BUILDLINK_PKGSRCDIR.libmcrypt?=	../../security/libmcrypt
+
+EVAL_PREFIX+=				BUILDLINK_PREFIX.libmcrypt=libmcrypt
+BUILDLINK_PREFIX.libmcrypt_DEFAULT=	${LOCALBASE}
+
+BUILDLINK_FILES.libmcrypt=	include/mcrypt.h
+BUILDLINK_FILES.libmcrypt+=	lib/libmcrypt.*
+
+.include "../../devel/libtool/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	libmcrypt-buildlink
+
+libmcrypt-buildlink: _BUILDLINK_USE
+
+.endif	# LIBMCRYPT_BUILDLINK2_MK
diff --git a/security/libmcrypt/distinfo b/security/libmcrypt/distinfo
index 98edd69a513..1478c4e42b9 100644
--- a/security/libmcrypt/distinfo
+++ b/security/libmcrypt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/05/09 22:31:08 wiz Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 18:39:54 jlam Exp $
 
 SHA1 (libmcrypt-2.4.22.tar.gz) = f462cbbcb0c220cb30dead2afa63452c1a5b21e5
 Size (libmcrypt-2.4.22.tar.gz) = 490383 bytes
diff --git a/security/libmcrypt/patches/patch-aa b/security/libmcrypt/patches/patch-aa
index 91c0dd27b65..212a2666291 100644
--- a/security/libmcrypt/patches/patch-aa
+++ b/security/libmcrypt/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/05/09 22:31:08 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2002/08/25 18:39:54 jlam Exp $
 
 --- configure.orig	Fri Feb  1 12:23:43 2002
 +++ configure
diff --git a/security/libmcrypt22/Makefile b/security/libmcrypt22/Makefile
index 1e5330309b3..43298e30e72 100644
--- a/security/libmcrypt22/Makefile
+++ b/security/libmcrypt22/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/04/12 18:59:36 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 18:39:55 jlam Exp $
 
 DISTNAME=	libmcrypt-2.2.7
 PKGNAME=	libmcrypt22-2.2.7
@@ -10,7 +10,7 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://mcrypt.hellug.gr/
 COMMENT=	crypto algorithms library (version 2.2.x)
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/libmcrypt22
 
diff --git a/security/libmcrypt22/buildlink2.mk b/security/libmcrypt22/buildlink2.mk
new file mode 100644
index 00000000000..92fbb2e31dd
--- /dev/null
+++ b/security/libmcrypt22/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:55 jlam Exp $
+
+.if !defined(LIBMCRYPT22_BUILDLINK2_MK)
+LIBMCRYPT22_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			libmcrypt22
+BUILDLINK_DEPENDS.libmcrypt22?=		libmcrypt22>=2.2.7
+BUILDLINK_PKGSRCDIR.libmcrypt22?=	../../security/libmcrypt22
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libmcrypt22=libmcrypt22
+BUILDLINK_PREFIX.libmcrypt22_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libmcrypt22=	include/libmcrypt22/mcrypt.h
+BUILDLINK_FILES.libmcrypt22+=	lib/libmcrypt22.*
+
+BUILDLINK_TRANSFORM.libmcrypt22=	-e "s|include/libmcrypt22/|include/|g"
+BUILDLINK_TRANSFORM+=			l:mcrypt:mcrypt22
+
+BUILDLINK_TARGETS+=	libmcrypt22-buildlink
+
+libmcrypt22-buildlink: _BUILDLINK_USE
+
+.endif	# LIBMCRYPT22_BUILDLINK2_MK
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index f2ea033ddc1..0955f9dbc77 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/09 19:20:33 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 18:39:55 jlam Exp $
 
 DISTNAME=	mhash-0.8.9
 CATEGORIES=	security devel
@@ -8,8 +8,10 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://mhash.sourceforge.net/
 COMMENT=	hash algorithms library
 
-USE_BUILDLINK_ONLY=	YES
-USE_LIBTOOL=		YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/mhash/buildlink2.mk b/security/mhash/buildlink2.mk
new file mode 100644
index 00000000000..c126b491292
--- /dev/null
+++ b/security/mhash/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:56 jlam Exp $
+
+.if !defined(MHASH_BUILDLINK2_MK)
+MHASH_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		mhash
+BUILDLINK_DEPENDS.mhash?=	mhash>=0.8.3
+BUILDLINK_PKGSRCDIR.mhash?=	../../security/mhash
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.mhash=mhash
+BUILDLINK_PREFIX.mhash_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.mhash=		include/mhash.h
+BUILDLINK_FILES.mhash+=		lib/libmhash.*
+
+BUILDLINK_TARGETS+=	mhash-buildlink
+
+mhash-buildlink: _BUILDLINK_USE
+
+.endif	# MHASH_BUILDLINK2_MK
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index 4a7f79f0bc3..983fb8fa4fe 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2002/08/01 02:37:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.26 2002/08/25 18:39:56 jlam Exp $
 #
 
 DISTNAME=		rsaref
@@ -14,7 +14,7 @@ COMMENT=		Encryption/authentication library, RSA/MDX/DES
 CRYPTO=			yes
 LICENSE=		no-commercial-use
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
 MAKEFILE=		unix/makefile
 ALL_TARGET=		librsaref.la
diff --git a/security/rsaref/buildlink2.mk b/security/rsaref/buildlink2.mk
new file mode 100644
index 00000000000..7d5a2a45213
--- /dev/null
+++ b/security/rsaref/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:57 jlam Exp $
+
+.if !defined(RSAREF_BUILDLINK2_MK)
+RSAREF_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		rsaref
+BUILDLINK_DEPENDS.rsaref?=	rsaref-2.0p3
+BUILDLINK_PKGSRCDIR.rsaref?=	../../security/rsaref
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.rsaref=rsaref
+BUILDLINK_PREFIX.rsaref_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.rsaref=		include/rsaref/*.h
+BUILDLINK_FILES.rsaref+=	lib/librsaref.*
+
+BUILDLINK_TARGETS+=	rsaref-buildlink
+
+rsaref-buildlink: _BUILDLINK_USE
+
+.endif	# RSAREF_BUILDLINK2_MK
diff --git a/security/tcp_wrappers/Makefile b/security/tcp_wrappers/Makefile
index 9a00522aed4..6970cbbbcce 100644
--- a/security/tcp_wrappers/Makefile
+++ b/security/tcp_wrappers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/29 01:12:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 18:39:57 jlam Exp $
 
 DISTNAME= 	tcp_wrappers_7.6-ipv6.1
 PKGNAME=	tcp_wrappers-7.6.1
@@ -12,7 +12,8 @@ COMMENT=	Monitor and filter incoming requests for network services
 
 ONLY_FOR_PLATFORM=	SunOS-*-*	# in NetBSD base system
 
-USE_LIBTOOL=	YES
+USE_BUILDLINK2=	# defined
+USE_LIBTOOL=	# defined
 
 ALL_TARGET=	sunos5
 
@@ -21,17 +22,16 @@ MAKE_ENV+=	IPV6=-DHAVE_IPV6
 .endif
 
 do-install:
+	cd ${WRKSRC}; ${PKGLIBTOOL} ${INSTALL_DATA} libwrap.la ${PREFIX}/lib
+	cd ${WRKSRC}; ${PKGLIBTOOL} ${INSTALL_PROGRAM} \
+		tcpdmatch try-from safe_finger tcpdchk ${PREFIX}/bin
+	cd ${WRKSRC}; ${INSTALL_DATA} tcpd.h ${PREFIX}/include
+	cd ${WRKSRC}; ${PKGLIBTOOL} ${INSTALL_PROGRAM} tcpd ${PREFIX}/libexec
+	cd ${WRKSRC}; ${INSTALL_DATA} *.3 ${PREFIX}/man/man3
+	cd ${WRKSRC}; ${INSTALL_DATA} *.5 ${PREFIX}/man/man5
+	cd ${WRKSRC}; ${INSTALL_DATA} *.8 ${PREFIX}/man/man8
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcp_wrappers
-	cd ${WRKSRC} && \
-	${LIBTOOL} ${INSTALL_DATA} libwrap.la ${PREFIX}/lib && \
-	${LIBTOOL} ${INSTALL_PROGRAM} tcpdmatch try-from safe_finger tcpdchk \
-	  ${PREFIX}/bin && \
-	${INSTALL_DATA} tcpd.h ${PREFIX}/include && \
-	${LIBTOOL} ${INSTALL_PROGRAM} tcpd ${PREFIX}/libexec && \
-	${INSTALL_DATA} *.3 ${PREFIX}/man/man3 && \
-	${INSTALL_DATA} *.5 ${PREFIX}/man/man5 && \
-	${INSTALL_DATA} *.8 ${PREFIX}/man/man8 && \
-	${INSTALL_DATA} README README.NIS README.ipv6 \
-	  ${PREFIX}/share/doc/tcp_wrappers
+	cd ${WRKSRC}; ${INSTALL_DATA} README README.NIS README.ipv6 \
+		${PREFIX}/share/doc/tcp_wrappers
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/tcp_wrappers/buildlink2.mk b/security/tcp_wrappers/buildlink2.mk
new file mode 100644
index 00000000000..ef0bac60f8e
--- /dev/null
+++ b/security/tcp_wrappers/buildlink2.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:58 jlam Exp $
+
+.if !defined(TCP_WRAPPERS_BUILDLINK2_MK)
+TCP_WRAPPERS_BUILDLINK2_MK=	# defined
+
+BUILDLINK_DEPENDS.tcp_wrappers?=	tcp_wrappers>=7.6.1nb1
+BUILDLINK_PKGSRCDIR.tcp_wrappers?=	../../security/tcp_wrappers
+
+.if exists(/usr/include/tcpd.h)
+_NEED_TCP_WRAPPERS=	NO
+.else
+_NEED_TCP_WRAPPERS=	YES
+.endif
+
+.if ${_NEED_TCP_WRAPPERS} == "YES"
+BUILDLINK_PACKAGES+=	tcp_wrappers
+EVAL_PREFIX+=	BUILDLINK_PREFIX.tcp_wrappers=tcp_wrappers
+BUILDLINK_PREFIX.tcp_wrappers_DEFAULT=	${LOCALBASE}
+.else
+BUILDLINK_PREFIX.tcp_wrappers=	/usr
+.endif
+
+BUILDLINK_FILES.tcp_wrappers=	include/tcpd.h
+BUILDLINK_FILES.tcp_wrappers+=	lib/libwrap.*
+
+BUILDLINK_TARGETS+=		tcp_wrappers-buildlink
+
+tcp_wrappers-buildlink: _BUILDLINK_USE
+
+.endif	# TCP_WRAPPERS_BUILDLINK2_MK