summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authortaca <taca>2007-02-19 05:53:37 +0000
committertaca <taca>2007-02-19 05:53:37 +0000
commit0b9c2f1c31814bc2c3c64929d4cf15147c32e73b (patch)
tree7b9dfe8c0df43e1b8b10059aa0ac5e9b348bd3e8 /net
parent2be429a45e3c879362a4102453a7e7ae56d714cd (diff)
downloadpkgsrc-0b9c2f1c31814bc2c3c64929d4cf15147c32e73b.tar.gz
Fix PLIST problem with samba-3.0.24 with "pam" option.
- Explictly specify PAM_INSTMODULEDIR with --with-pammodulesdir. (Now Samba itself install pam modules.) - Don't install pam modules in post-install process.
Diffstat (limited to 'net')
-rw-r--r--net/samba/options.mk11
1 files changed, 2 insertions, 9 deletions
diff --git a/net/samba/options.mk b/net/samba/options.mk
index 51431503fd5..0c6fe23f62a 100644
--- a/net/samba/options.mk
+++ b/net/samba/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2007/02/18 04:27:02 taca Exp $
+# $NetBSD: options.mk,v 1.20 2007/02/19 05:53:37 taca Exp $
# Recommended package options for various setups:
#
@@ -69,14 +69,13 @@ CONFIGURE_ARGS+= --without-ldap
. include "../../security/PAM/module.mk"
CONFIGURE_ARGS+= --with-pam
CONFIGURE_ARGS+= --with-pam_smbpass
+CONFIGURE_ARGS+= --with-pammodulesdir=${PAM_INSTMODULEDIR}
PLIST_SUBST+= PAM_SMBPASS=lib/security/pam_smbpass.so
PLIST_SUBST+= PAM=
.PHONY: samba-pam-smbpass-install
post-install: samba-pam-smbpass-install
samba-pam-smbpass-install:
- ${INSTALL_LIB_DIR} ${PAM_INSTMODULEDIR}
- ${INSTALL_LIB} ${WRKSRC}/bin/pam_smbpass.so ${PAM_INSTMODULEDIR}
${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/pam_smbpass/README \
${DOCDIR}/README.pam_smbpass
@@ -109,12 +108,6 @@ PLIST_SUBST+= WINBIND=
PLIST_SUBST+= PAM_WINBIND="@comment no PAM winbind module"
. else
PLIST_SUBST+= PAM_WINBIND=lib/security/pam_winbind.so
-
-.PHONY: samba-pam-winbind-install
-post-install: samba-pam-winbind-install
-samba-pam-winbind-install:
- ${INSTALL_LIB_DIR} ${PAM_INSTMODULEDIR}
- ${INSTALL_LIB} ${WRKSRC}/bin/pam_winbind.so ${PAM_INSTMODULEDIR}
. endif
# Install the NSS winbind module if it exists.