bl3ify

3 files changed, 21 insertions, 18 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 410dc846a3a..f74decc024f 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2004/01/03 18:49:50 reed Exp $
+# $NetBSD: Makefile,v 1.108 2004/01/11 00:33:03 jlam Exp $
 
 .include "Makefile.common"
 PKGREVISION=		6
@@ -7,7 +7,7 @@ MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://www.samba.org/
 COMMENT=		SMB/CIFS protocol server suite for UNIX
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
@@ -21,19 +21,19 @@ CFLAGS+=		-I${SSLBASE}/include/openssl	# ssl.h, err.h
 REPLACE_PERL+=		script/findsmb.in
 
 .if defined(USE_CUPS) && (${USE_CUPS} == "YES")
-.include "../../print/cups/buildlink2.mk"
+.include "../../print/cups/buildlink3.mk"
 BUILD_DEFS+=		USE_CUPS
 CONFIGURE_ARGS+=	--enable-cups
 .endif
 
 .if defined(USE_PAM)
-.include "../../security/PAM/buildlink2.mk"
+.include "../../security/PAM/buildlink3.mk"
 BUILD_DEFS+=		USE_PAM
 CONFIGURE_ARGS+=	--with-pam
 .endif
 
 .if defined(SAMBA_USE_LDAP) && ${SAMBA_USE_LDAP} == "YES"
-.include "../../databases/openldap/buildlink2.mk"
+.include "../../databases/openldap/buildlink3.mk"
 BUILD_DEFS+=		SAMBA_USE_LDAP
 CONFIGURE_ARGS+=	--with-ldapsam
 PLIST_SUBST+=		SAMBA_LDAP=""
@@ -114,7 +114,7 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh		\
 		${PREFIX}/sbin/mksmbpasswd
 
-.include "../../devel/readline/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pam-smbpass/Makefile b/security/pam-smbpass/Makefile
index a0ae1395f32..fa99b5f5590 100644
--- a/security/pam-smbpass/Makefile
+++ b/security/pam-smbpass/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:53:09 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/11 00:33:03 jlam Exp $
 
 .include "../../net/samba/Makefile.common"
 
@@ -10,12 +10,11 @@ COMMENT=		PAM authentication against a Samba password database
 
 DEPENDS+=		{samba>=2.0,ja-samba>=2.0}:../../net/samba
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		# defined
 CONFIGURE_ARGS+=	--with-pam
 
 ALL_TARGET=		pam_smbpass
 
-PAMDIR=			${PREFIX}/lib/security
 DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 
@@ -23,12 +22,13 @@ INSTALL_LIBRARY= \
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 
 do-install:
-	${INSTALL_LIBRARY} ${WRKSRC}/bin/pam_smbpass.so ${PAMDIR}
+	${INSTALL_DATA_DIR} ${PAM_INSTMODULEDIR}
+	${INSTALL_LIBRARY} ${WRKSRC}/bin/pam_smbpass.so ${PAM_INSTMODULEDIR}
 	${INSTALL_DATA_DIR} ${DOCDIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/pam_smbpass/README ${DOCDIR}
 	cd ${WRKSRC}/pam_smbpass/samples; for file in *; do		\
 		${INSTALL_DATA} $${file} ${EGDIR}/$${file};		\
 	done
 
-.include "../../security/PAM/buildlink2.mk"
+.include "../../security/PAM/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/winbind/Makefile b/security/winbind/Makefile
index b9b5acc3bbc..181393a65c9 100644
--- a/security/winbind/Makefile
+++ b/security/winbind/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2003/11/12 03:39:43 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/11 00:33:03 jlam Exp $
 
 PKGNAME=		winbind-${SAMBA_DIST_VERS}
 PKGREVISION=		1
 CATEGORIES=		security
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 
 .include "../../net/samba/Makefile.common"
@@ -13,6 +13,8 @@ MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://www.samba.org/
 COMMENT=		Unified logon information between UNIX and Windows NT
 
+CONFLICTS+=		samba>=3.0
+
 DEPENDS+=		{samba>=2.0,ja-samba>=2.0}:../../net/samba
 
 CONFIGURE_ARGS+=	--with-ssl
@@ -24,9 +26,9 @@ CONFIGURE_ARGS+=	--with-winbind
 
 ALL_TARGET=		nsswitch
 
-PAMDIR=			${PREFIX}/lib/security
 RCD_SCRIPTS=		winbindd
 
+INSTALLATION_DIRS=	bin lib sbin
 INSTALL_LIBRARY= \
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 
@@ -34,10 +36,11 @@ INSTALL_LIBRARY= \
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/wbinfo ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/winbindd ${PREFIX}/sbin
-	${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/pam_winbind.so ${PAMDIR}
+	${INSTALL_DATA_DIR} ${PAM_INSTMODULEDIR}
+	${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/pam_winbind.so ${PAM_INSTMODULEDIR}
 	${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/libnss_winbind.so ${PREFIX}/lib
 
-.include "../../security/PAM/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/PAM/module.mk"
+.include "../../security/openssl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"