From 7e105347c95fe34b7c943069e219518f70736b52 Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 7 Feb 2005 11:35:41 +0000 Subject: Instantly deprecate USE_PAM from pkgsrc as its value is being set from within NetBSD-current's bsd.own.mk, which conflicts with its usage in pkgsrc. The package that use USE_PAM have been converted to use the bsd.options.mk framework. This should fix PR pkg/29257. --- net/ja-samba/Makefile | 33 ++++++--------------------------- net/ja-samba/options.mk | 38 ++++++++++++++++++++++++++++++++++++++ net/samba2/Makefile | 32 +++++--------------------------- net/samba2/options.mk | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 54 deletions(-) create mode 100644 net/ja-samba/options.mk create mode 100644 net/samba2/options.mk (limited to 'net') diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile index 732d6ff92b3..1a04b1dbfd8 100644 --- a/net/ja-samba/Makefile +++ b/net/ja-samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/01/14 05:15:39 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/02/07 11:35:45 jlam Exp $ .include "Makefile.common" @@ -30,29 +30,8 @@ CFLAGS+= -I${SSLBASE}/include/openssl # ssl.h, err.h # CONFIGURE_ARGS+= --with-included-gettext -.if defined(USE_CUPS) && (${USE_CUPS} == "YES") -. include "../../print/cups/buildlink3.mk" -BUILD_DEFS+= USE_CUPS -CONFIGURE_ARGS+= --enable-cups -.endif - -.if defined(USE_PAM) -. include "../../mk/pam.buildlink3.mk" -BUILD_DEFS+= USE_PAM -CONFIGURE_ARGS+= --with-pam -.endif - -.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == "YES" -. include "../../databases/openldap/buildlink3.mk" -BUILD_DEFS+= USE_OPENLDAP -CONFIGURE_ARGS+= --with-ldapsam -PLIST_SUBST+= SAMBA_LDAP="" -.else -PLIST_SUBST+= SAMBA_LDAP="@comment " -MESSAGE_SRC= ${.CURDIR}/MESSAGE.common ${.CURDIR}/MESSAGE.smbpasswd -SMBPASSWD_FILE= /dev/null ${SAMBA_PRIVATE}/smbpasswd \ - ${ROOT_USER} ${ROOT_GROUP} 0600 -.endif +.include "../../mk/bsd.prefs.mk" +.include "options.mk" # Microsoft DFS support CONFIGURE_ARGS+= --with-msdfs @@ -89,6 +68,9 @@ FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q} REPLACE_PERL= script/findsmb.in +.include "../../devel/readline/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" + # Remove irrelevant files for this package. post-extract: ${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print | \ @@ -127,7 +109,4 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \ ${PREFIX}/sbin/mksmbpasswd -.include "../../devel/readline/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/net/ja-samba/options.mk b/net/ja-samba/options.mk new file mode 100644 index 00000000000..afb0c3d7bf5 --- /dev/null +++ b/net/ja-samba/options.mk @@ -0,0 +1,38 @@ +# $NetBSD: options.mk,v 1.1 2005/02/07 11:35:45 jlam Exp $ + +# Global and legacy options + +PKG_OPTIONS_VAR= PKG_OPTIONS.ja-samba +PKG_SUPPORTED_OPTIONS= PAM cups ldap +.include "../../mk/bsd.options.mk" + +### +### Support PAM authentication. +### +.if !empty(PKG_OPTIONS:MPAM) +. include "../../mk/pam.buildlink3.mk" +CONFIGURE_ARGS+= --with-pam +.endif + +### +### Native CUPS support for printing +### +.if !empty(PKG_OPTIONS:Mcups) +. include "../../print/cups/buildlink3.mk" +CONFIGURE_ARGS+= --enable-cups +.endif + +### +### Support Samba-2.x LDAP password and account databases. +### +.if !empty(PKG_OPTIONS:Mldap-compat) +. include "../../databases/openldap/buildlink3.mk" +BUILD_DEFS+= USE_OPENLDAP +CONFIGURE_ARGS+= --with-ldapsam +PLIST_SUBST+= SAMBA_LDAP="" +.else +PLIST_SUBST+= SAMBA_LDAP="@comment " +MESSAGE_SRC= ${.CURDIR}/MESSAGE.common ${.CURDIR}/MESSAGE.smbpasswd +SMBPASSWD_FILE= /dev/null ${SAMBA_PRIVATE}/smbpasswd \ + ${ROOT_USER} ${ROOT_GROUP} 0600 +.endif diff --git a/net/samba2/Makefile b/net/samba2/Makefile index 07e6cc34aa5..a2da6aa98ae 100644 --- a/net/samba2/Makefile +++ b/net/samba2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/01/14 05:15:39 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/02/07 11:35:45 jlam Exp $ .include "Makefile.common" PKGREVISION= # empty1 @@ -21,29 +21,7 @@ CFLAGS+= -I${SSLBASE}/include/openssl # ssl.h, err.h REPLACE_PERL+= script/findsmb.in -.if defined(USE_CUPS) && (${USE_CUPS} == "YES") -.include "../../print/cups/buildlink3.mk" -BUILD_DEFS+= USE_CUPS -CONFIGURE_ARGS+= --enable-cups -.endif - -.if defined(USE_PAM) -.include "../../mk/pam.buildlink3.mk" -BUILD_DEFS+= USE_PAM -CONFIGURE_ARGS+= --with-pam -.endif - -.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == "YES" -.include "../../databases/openldap/buildlink3.mk" -BUILD_DEFS+= USE_OPENLDAP -CONFIGURE_ARGS+= --with-ldapsam -PLIST_SUBST+= SAMBA_LDAP="" -.else -PLIST_SUBST+= SAMBA_LDAP="@comment " -MESSAGE_SRC= ${.CURDIR}/MESSAGE.smbpasswd -SMBPASSWD_FILE= /dev/null ${SAMBA_PRIVATE}/smbpasswd \ - ${ROOT_USER} ${ROOT_GROUP} 0600 -.endif +.include "options.mk" # Microsoft DFS support CONFIGURE_ARGS+= --with-msdfs @@ -78,6 +56,9 @@ MAKEFLAGS+= PWD_MKDB=${PWD_MKDB:Q} FILES_SUBST+= MKTEMP=${MKTEMP:Q} FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q} +.include "../../devel/readline/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" + # Remove irrelevant files for this package. post-extract: ${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print | \ @@ -115,7 +96,4 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \ ${PREFIX}/sbin/mksmbpasswd -.include "../../devel/readline/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/net/samba2/options.mk b/net/samba2/options.mk new file mode 100644 index 00000000000..a23560c3c17 --- /dev/null +++ b/net/samba2/options.mk @@ -0,0 +1,40 @@ +# $NetBSD: options.mk,v 1.1 2005/02/07 11:35:46 jlam Exp $ + +# Global and legacy options +.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= ldap-compat +.endif + +PKG_OPTIONS_VAR= PKG_OPTIONS.samba2 +PKG_SUPPORTED_OPTIONS= PAM cups ldap-compat +.include "../../mk/bsd.options.mk" + +### +### Support PAM authentication. +### +.if !empty(PKG_OPTIONS:MPAM) +. include "../../mk/pam.buildlink3.mk" +CONFIGURE_ARGS+= --with-pam +.endif + +### +### Native CUPS support for printing +### +.if !empty(PKG_OPTIONS:Mcups) +. include "../../print/cups/buildlink3.mk" +CONFIGURE_ARGS+= --enable-cups +.endif + +### +### Support Samba-2.x LDAP password and account databases. +### +.if !empty(PKG_OPTIONS:Mldap-compat) +. include "../../databases/openldap/buildlink3.mk" +CONFIGURE_ARGS+= --with-ldapsam +PLIST_SUBST+= SAMBA_LDAP="" +.else +PLIST_SUBST+= SAMBA_LDAP="@comment " +MESSAGE_SRC= ${.CURDIR}/MESSAGE.smbpasswd +SMBPASSWD_FILE= /dev/null ${SAMBA_PRIVATE}/smbpasswd \ + ${ROOT_USER} ${ROOT_GROUP} 0600 +.endif -- cgit v1.2.3