Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.

6 files changed, 20 insertions, 18 deletions

diff --git a/security/PAM/Makefile b/security/PAM/Makefile
index d2767115607..cdf18643823 100644
--- a/security/PAM/Makefile
+++ b/security/PAM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/03/27 03:20:14 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/19 09:20:11 jlam Exp $
 #
 
 DISTNAME=	Linux-${PKGNAME}
@@ -11,9 +11,11 @@ HOMEPAGE=	http://www.kernel.org/pub/linux/libs/pam/
 COMMENT=	Pluggable Authentication Modules
 
 BUILD_DEPENDS+=	bison-*:../../devel/bison
-DEPENDS+=	libcrack-*:../../security/libcrack
 
-USE_GMAKE=	YES
+USE_GMAKE=		YES
+USE_BUILDLINK_ONLY=	YES
+
+.include "../../security/libcrack/buildlink.mk"
 
 MAKE_ENV+=	LOWER_OPSYS="${LOWER_OPSYS}"
 MAKE_ENV+=	MACHINE_GNU_ARCH="${MACHINE_GNU_ARCH}"
diff --git a/security/PAM/distinfo b/security/PAM/distinfo
index d3f6bc99b0a..b38ff48707f 100644
--- a/security/PAM/distinfo
+++ b/security/PAM/distinfo
@@ -1,24 +1,24 @@
-$NetBSD: distinfo,v 1.2 2001/04/29 06:56:25 rh Exp $
+$NetBSD: distinfo,v 1.3 2001/06/19 09:20:11 jlam Exp $
 
 SHA1 (Linux-PAM-0.72.tar.gz) = cb6433d02bb85af5d8462afec32d987d525484dc
 Size (Linux-PAM-0.72.tar.gz) = 395073 bytes
-SHA1 (patch-aa) = 0992a39ee27cf9630befed089839af5604d06927
+SHA1 (patch-aa) = aee63641f5d4bf22b826f124ef02c6d584675f4d
 SHA1 (patch-ab) = cb4c5a214dffbcaacda6a1da500aff3117592400
 SHA1 (patch-ac) = 1c5ca06e502ea8d540e317ca1dd598179648fb4e
 SHA1 (patch-ad) = 5b23bca4c833ea326f8cc9b2b3d0cabd23704818
 SHA1 (patch-ae) = c50ebe934e4c12038cdea11948432cb0816f4285
 SHA1 (patch-af) = 5071d16e505e936729f18281a814e69653eb3b84
 SHA1 (patch-ag) = b531062ee6ab8c9aed2155648ffb987a723b7ff6
-SHA1 (patch-ah) = cc389a87a951dd66a682653ed512a18fbef4486b
+SHA1 (patch-ah) = afe82eb4219799aeb0d8fcee75aa5b0b10ef2a5c
 SHA1 (patch-ai) = 7ed530b0d9beb6f9a720d66393bb00502d9285cf
 SHA1 (patch-aj) = e7b56a0eeed6906daf2eaabe7e8aceda486136a0
 SHA1 (patch-ak) = e60019fbb66c047da23a1dcaf330de9086cfc1c8
 SHA1 (patch-al) = 705dc4483890e6d0c35ed4728e88b11ce909164f
-SHA1 (patch-am) = 3eeac65973d47f5a5874b9370908021bfa5818a3
+SHA1 (patch-am) = 6de619faab8d7177d7ef57924681134e7262a8a9
 SHA1 (patch-an) = e27b1a0887bcd37568c445207930e4518d9ea844
 SHA1 (patch-ao) = 34835092260539faedfa6de3cf6d4f39c76c142c
 SHA1 (patch-ap) = 4c33633e957a2020f6d8f3fef2362b8cd594dc1c
-SHA1 (patch-aq) = 6330b4d6a04df03b51eb3c3c4b144ebcfa09a98e
+SHA1 (patch-aq) = b1f2ce9662759af7c05ec7054d441a2e7352c3a9
 SHA1 (patch-ar) = 57bdfddf5bd070ccfdd093f926eabc11ad1d1503
 SHA1 (patch-as) = 4fe20503e1755817e5d0c11c8bd5d062b05911f9
 SHA1 (patch-at) = 61eb909bbe7d461b4b67ac595610c6bcd5f7560c
diff --git a/security/PAM/patches/patch-aa b/security/PAM/patches/patch-aa
index 7e41cf9e159..19b5b7139d5 100644
--- a/security/PAM/patches/patch-aa
+++ b/security/PAM/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $
+$NetBSD: patch-aa,v 1.2 2001/06/19 09:20:11 jlam Exp $
 
 --- Makefile.orig	Mon Nov 22 04:02:36 1999
 +++ Makefile
@@ -63,9 +63,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $
 -INCLUDEDIR=-I$(shell pwd)/include
 -PAMLIB=-L$(shell pwd)/libpam
 -PAMMISCLIB=-L$(shell pwd)/libpam_misc
-+INCLUDEDIR=-I$(shell pwd)/include -I${PREFIX}/include/cracklib
-+PAMLIB=-L$(shell pwd)/libpam -Wl,-R${PREFIX}/lib -L${PREFIX}/lib
-+PAMMISCLIB=-L$(shell pwd)/libpam_misc -Wl,-R${PREFIX}/lib -L${PREFIX}/lib
++INCLUDEDIR=-I$(shell pwd)/include -I${BUILDLINK_DIR}/include/cracklib
++PAMLIB=-L$(shell pwd)/libpam -Wl,-R${PREFIX}/lib -L${BUILDLINK_DIR}/lib
++PAMMISCLIB=-L$(shell pwd)/libpam_misc -Wl,-R${PREFIX}/lib -L${BUILDLINK_DIR}/lib
  ifeq ($(DEBUG_REL),yes)
   PAMLIB += -lpamd
   PAMMISCLIB += -lpamd_misc
diff --git a/security/PAM/patches/patch-ah b/security/PAM/patches/patch-ah
index 2afbe5b6d01..35cffeabb09 100644
--- a/security/PAM/patches/patch-ah
+++ b/security/PAM/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $
+$NetBSD: patch-ah,v 1.2 2001/06/19 09:20:11 jlam Exp $
 
 --- modules/pam_cracklib/Makefile.orig	Sat Oct  9 07:07:02 1999
 +++ modules/pam_cracklib/Makefile
@@ -7,7 +7,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $
  
  TITLE=pam_cracklib
 -CRACKLIB=-lcrack
-+CRACKLIB=-R${PREFIX}/lib -L${PREFIX}/lib -lcrack
++CRACKLIB=-R${PREFIX}/lib -L${BUILDLINK_DIR}/lib -lcrack
  ifeq ($(shell if [ -f /usr/lib/cracklib_dict.hwm ]; then echo yes ; fi),yes)
   CRACKLIB_DICTPATH=/usr/lib/cracklib_dict
  else
diff --git a/security/PAM/patches/patch-am b/security/PAM/patches/patch-am
index cab31000edb..c0107ce6eec 100644
--- a/security/PAM/patches/patch-am
+++ b/security/PAM/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $
+$NetBSD: patch-am,v 1.2 2001/06/19 09:20:11 jlam Exp $
 
 --- modules/pam_mkhomedir/Makefile.orig	Sat Oct 21 12:44:27 2000
 +++ modules/pam_mkhomedir/Makefile
@@ -7,7 +7,7 @@ $NetBSD: patch-am,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $
  
  $(LIBSHARED):	$(LIBOBJD)
 -		$(LD_D) -o $@ $(LIBOBJD) $(LINKLIBS) -lpam
-+		${LD_D} -o $@ ${LIBOBJD} -R${PREFIX}/lib -L../../libpam -L${PREFIX}/lib ${LINKLIBS} -lpam
++		${LD_D} -o $@ ${LIBOBJD} -R${PREFIX}/lib -L../../libpam -L${BUILDLINK_DIR}/lib ${LINKLIBS} -lpam
  endif
  
  ifdef STATIC
diff --git a/security/PAM/patches/patch-aq b/security/PAM/patches/patch-aq
index fa5d4e0502b..81f55e42c51 100644
--- a/security/PAM/patches/patch-aq
+++ b/security/PAM/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $
+$NetBSD: patch-aq,v 1.2 2001/06/19 09:20:11 jlam Exp $
 
 --- modules/pam_unix/Makefile.orig	Sat Oct 21 14:28:23 2000
 +++ modules/pam_unix/Makefile
@@ -11,7 +11,7 @@ $NetBSD: patch-aq,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $
  
  ifdef USE_CRACKLIB
 -CRACKLIB = -lcrack
-+CRACKLIB = -R${PREFIX}/lib -L${PREFIX}/lib -lcrack
++CRACKLIB = -R${PREFIX}/lib -L${BUILDLINK_DIR}/lib -lcrack
  endif