[pkgsrc/pkgsrc-2006Q4]: pkgsrc/net/samba Pullup ticket 2025 - requested by taca

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/08ed56e804a4
branches:  pkgsrc-2006Q4
changeset: 523018:08ed56e804a4
user:      salo <salo%pkgsrc.org@localhost>
date:      Mon Feb 19 11:07:52 2007 +0000

description:
Pullup ticket 2025 - requested by taca
build fix for samba

Revisions pulled up:
- pkgsrc/net/samba/options.mk                           1.19, 1.20

   Module Name:         pkgsrc
   Committed By:        taca
   Date:                Sun Feb 18 04:27:02 UTC 2007

   Modified Files:
        pkgsrc/net/samba: options.mk

   Log Message:
   Fix installing pam_winbind.so module.
---
   Module Name:         pkgsrc
   Committed By:        taca
   Date:                Mon Feb 19 05:53:38 UTC 2007

   Modified Files:
        pkgsrc/net/samba: options.mk

   Log Message:
   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:

 net/samba/options.mk |  11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diffs (38 lines):

diff -r 5a7463a196ac -r 08ed56e804a4 net/samba/options.mk
--- a/net/samba/options.mk      Sun Feb 18 12:16:33 2007 +0000
+++ b/net/samba/options.mk      Mon Feb 19 11:07:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16.6.2 2007/02/16 16:35:51 salo Exp $
+# $NetBSD: options.mk,v 1.16.6.3 2007/02/19 11:07:52 salo Exp $
 
 # Recommended package options for various setups:
 #
@@ -69,14 +69,13 @@
 .  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+=  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}/nsswitch/pam_winbind.so ${PAM_INSTMODULEDIR}
 .  endif
 
 # Install the NSS winbind module if it exists.