Convert to use bsd.options.mk. The relevant options variable to set

for each package can be determined by invoking:

	make show-var VARNAME=PKG_OPTIONS_VAR

The old options are still supported unless the variable named in
PKG_OPTIONS_VAR is set within make(1) (usually via /etc/mk.conf).

1 files changed, 3 insertions, 52 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 360f0a625a6..642c302e4a5 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2004/07/23 15:11:30 tron Exp $
+# $NetBSD: Makefile,v 1.124 2004/07/30 21:05:41 jlam Exp $
 
 DISTNAME=		samba-3.0.5
 CATEGORIES=		net
@@ -24,7 +24,6 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/source
 USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PERL="${PERL5}"
-PLIST_SRC=		# empty
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -65,48 +64,7 @@ USE_GNU_READLINE=	yes
 .include "../../devel/readline/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 
-.if defined(SAMBA_WITH_ADS) && !empty(SAMBA_WITH_ADS:M[yY][eE][sS])
-.  include "../../mk/krb5.buildlink3.mk"
-SAMBA_USE_LDAP=		# defined
-CONFIGURE_ARGS+=	--with-ads
-CONFIGURE_ARGS+=	--with-krb5=${KRB5BASE}
-.else
-CONFIGURE_ARGS+=	--without-ads
-CONFIGURE_ARGS+=	--without-krb5
-.endif
-BUILD_DEFS+=		SAMBA_WITH_ADS
-
-.if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS])
-.  include "../../print/cups/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-cups
-.else
-CONFIGURE_ARGS+=	--disable-cups
-.endif
-BUILD_DEFS+=		USE_CUPS
-
-.if defined(USE_PAM)
-.  include "../../security/PAM/module.mk"
-CONFIGURE_ARGS+=	--with-pam
-CONFIGURE_ARGS+=	--with-pam_smbpass
-PLIST_SRC+=		${PKGDIR}/PLIST.pam
-.endif
-BUILD_DEFS+=		USE_PAM
-
-.if defined(SAMBA_USE_LDAP) || (defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]))
-.  include "../../databases/openldap/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-ldap
-.  if defined(SAMBA_USE_LDAP_COMPAT) && \
-   !empty(SAMBA_USE_LDAP_COMPAT:M[yY][eE][sS])
-CONFIGURE_ARGS+=	--with-ldapsam
-.  endif
-.else
-CONFIGURE_ARGS+=	--without-ldap
-.endif
-BUILD_DEFS+=		USE_OPENLDAP
-BUILD_DEFS+=		SAMBA_USE_LDAP
-BUILD_DEFS+=		SAMBA_USE_LDAP_COMPAT
-
-PLIST_SRC+=		${PKGDIR}/PLIST
+.include "Makefile.options"
 
 .if !defined(MKTEMP)
 MKTEMP!=	${TYPE} mktemp 2>&1 | \
@@ -124,13 +82,6 @@ FILES_SUBST+=	PWD_MKDB=${PWD_MKDB:Q}
 DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 
-.if ${OPSYS} == "Linux"
-CONFIGURE_ARGS+=	--with-smbmount
-PLIST_SUBST+=		SMBMOUNT=
-.else
-PLIST_SUBST+=		SMBMOUNT="@comment "
-.endif
-
 USE_PKGINSTALL=		yes
 CONF_FILES=		${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
 SUPPORT_FILES_PERMS=	${EGDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser	\
@@ -169,7 +120,7 @@ post-install:
 	cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpwdtbl.sh ${EGDIR}
 	cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mksmbpasswd.sh ${EGDIR}
 	cd ${WRKSRC}/script; ${INSTALL_SCRIPT} updatesmbpasswd.sh ${EGDIR}
-.if defined(USE_PAM)
+.if !empty(PKG_OPTIONS:MPAM)
 	${INSTALL_DATA_DIR} ${PAM_INSTMODULEDIR}
 	${INSTALL_LIBRARY} ${WRKSRC}/bin/pam_smbpass.so ${PAM_INSTMODULEDIR}
 	${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/pam_winbind.so ${PAM_INSTMODULEDIR}