[pkgsrc/trunk]: pkgsrc bl3ify

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f1e4d3d2e9c
branches:  trunk
changeset: 466067:4f1e4d3d2e9c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Jan 11 00:33:03 2004 +0000

description:
bl3ify

diffstat:

 net/samba/Makefile            |  14 +++++++-------
 security/pam-smbpass/Makefile |  10 +++++-----
 security/winbind/Makefile     |  15 +++++++++------
 3 files changed, 21 insertions(+), 18 deletions(-)

diffs (141 lines):

diff -r c8c47e36036b -r 4f1e4d3d2e9c net/samba/Makefile
--- a/net/samba/Makefile        Sun Jan 11 00:32:34 2004 +0000
+++ b/net/samba/Makefile        Sun Jan 11 00:33:03 2004 +0000
@@ -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 @@
 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 @@
 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 @@
        ${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 -r c8c47e36036b -r 4f1e4d3d2e9c security/pam-smbpass/Makefile
--- a/security/pam-smbpass/Makefile     Sun Jan 11 00:32:34 2004 +0000
+++ b/security/pam-smbpass/Makefile     Sun Jan 11 00:33:03 2004 +0000
@@ -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 @@
 
 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} ${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 -r c8c47e36036b -r 4f1e4d3d2e9c security/winbind/Makefile
--- a/security/winbind/Makefile Sun Jan 11 00:32:34 2004 +0000
+++ b/security/winbind/Makefile Sun Jan 11 00:33:03 2004 +0000
@@ -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 @@
 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 @@
 
 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 @@
 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"