Merge packages from the buildlink2 branch back into the main trunk that

have been converted to USE_BUILDLINK2.

9 files changed, 18 insertions, 18 deletions

diff --git a/net/samba/MESSAGE.smbpasswd b/net/samba/MESSAGE.smbpasswd
index 795a34371b9..3537c25b3f4 100644
--- a/net/samba/MESSAGE.smbpasswd
+++ b/net/samba/MESSAGE.smbpasswd
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE.smbpasswd,v 1.2 2002/06/22 21:31:29 jlam Exp $
+$NetBSD: MESSAGE.smbpasswd,v 1.3 2002/08/25 21:50:10 jlam Exp $
 
                       *===* SECURITY NOTES *===*
 
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 8dfa81af3dc..ff7127755e7 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2002/08/01 02:40:05 jlam Exp $
-
-USE_BUILDLINK_ONLY=	# defined
+# $NetBSD: Makefile,v 1.87 2002/08/25 21:50:10 jlam Exp $
 
 .include "Makefile.common"
 
@@ -8,27 +6,29 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.samba.org/
 COMMENT=		SMB/CIFS protocol server suite for UNIX
 
+USE_BUILDLINK2=		# defined
+
 USE_GNU_READLINE=	# uses rl_event_hook interface to GNU readline
 CONFIGURE_ARGS+=	--with-readline
 
 CONFIGURE_ARGS+=	--with-ssl
-CONFIGURE_ARGS+=	--with-sslinc=${BUILDLINK_DIR}
-CFLAGS+=		-I${BUILDLINK_DIR}/include/openssl	# ssl.h, err.h
+CONFIGURE_ARGS+=	--with-sslinc=${SSLBASE}
+CFLAGS+=		-I${SSLBASE}/include/openssl	# ssl.h, err.h
 
 .if defined(USE_CUPS) && (${USE_CUPS} == "YES")
-.include "../../print/cups/buildlink.mk"
+.include "../../print/cups/buildlink2.mk"
 BUILD_DEFS+=		USE_CUPS
 CONFIGURE_ARGS+=	--enable-cups
 .endif
 
 .if defined(USE_PAM)
-.include "../../security/PAM/buildlink.mk"
+.include "../../security/PAM/buildlink2.mk"
 BUILD_DEFS+=		USE_PAM
 CONFIGURE_ARGS+=	--with-pam
 .endif
 
 .if defined(SAMBA_USE_LDAP) && ${SAMBA_USE_LDAP} == "YES"
-.include "../../databases/openldap/buildlink.mk"
+.include "../../databases/openldap/buildlink2.mk"
 BUILD_DEFS+=		SAMBA_USE_LDAP
 CONFIGURE_ARGS+=	--with-ldapsam
 PLIST_SUBST+=		SAMBA_LDAP=""
@@ -96,8 +96,8 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh		\
 		${PREFIX}/sbin/mksmbpasswd
 
-.include "../../devel/readline/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
+.include "../../devel/readline/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/samba/Makefile.common b/net/samba/Makefile.common
index 48e749e5fa4..d88046abf77 100644
--- a/net/samba/Makefile.common
+++ b/net/samba/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2002/07/30 23:05:12 jlam Exp $
+# $NetBSD: Makefile.common,v 1.2 2002/08/25 21:50:10 jlam Exp $
 
 DISTNAME=		samba-${SAMBA_DIST_VERS}
 SAMBA_DIST_VERS=	2.2.5
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 3de4016848b..4e7ebef5873 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2002/08/01 02:55:07 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2002/08/25 21:50:11 jlam Exp $
 bin/findsmb
 bin/make_printerdef
 bin/make_smbcodepage
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 1670587bd88..cf832a114e9 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2002/07/30 23:05:12 jlam Exp $
+$NetBSD: distinfo,v 1.21 2002/08/25 21:50:11 jlam Exp $
 
 SHA1 (samba-2.2.5.tar.bz2) = 67e1025a8d01ba51b8cea6f04176fdbc57b7c012
 Size (samba-2.2.5.tar.bz2) = 4343641 bytes
diff --git a/net/samba/files/samba.sh b/net/samba/files/samba.sh
index 1f94dc2aa59..ce2d3eaaa88 100644
--- a/net/samba/files/samba.sh
+++ b/net/samba/files/samba.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: samba.sh,v 1.11 2002/05/24 22:28:27 hubertf Exp $
+# $NetBSD: samba.sh,v 1.12 2002/08/25 21:50:12 jlam Exp $
 #
 # KEYWORD: nostart
 
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index 993ff06145a..cba80cf40cb 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.20 2002/07/30 23:05:13 jlam Exp $
+$NetBSD: patch-aa,v 1.21 2002/08/25 21:50:13 jlam Exp $
 
 --- configure.in.orig	Sun Jul 28 18:13:04 2002
 +++ configure.in
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
index 6a7184a46f6..4a87d72edbe 100644
--- a/net/samba/patches/patch-ab
+++ b/net/samba/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.16 2002/07/30 23:05:13 jlam Exp $
+$NetBSD: patch-ab,v 1.17 2002/08/25 21:50:13 jlam Exp $
 
 --- configure.orig	Sun Jul 28 18:13:04 2002
 +++ configure
diff --git a/net/samba/patches/patch-ad b/net/samba/patches/patch-ad
index 3ad1f393963..761f42324be 100644
--- a/net/samba/patches/patch-ad
+++ b/net/samba/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.9 2002/07/30 23:05:13 jlam Exp $
+$NetBSD: patch-ad,v 1.10 2002/08/25 21:50:14 jlam Exp $
 
 --- Makefile.in.orig	Sun Jul 28 18:13:04 2002
 +++ Makefile.in