[pkgsrc/trunk]: pkgsrc/net/samba Move WINBINDD_RCD_SCRIPT fix entirely from o...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6a5d660fdd3f
branches:  trunk
changeset: 503175:6a5d660fdd3f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Nov 15 13:58:14 2005 +0000

description:
Move WINBINDD_RCD_SCRIPT fix entirely from options.mk to Makefile as the
last two revisions of options.mk and Makefile fixed the same problem.

diffstat:

 net/samba/Makefile   |  3 ++-
 net/samba/options.mk |  4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 7492a7c05e8b -r 6a5d660fdd3f net/samba/Makefile
--- a/net/samba/Makefile        Tue Nov 15 13:48:42 2005 +0000
+++ b/net/samba/Makefile        Tue Nov 15 13:58:14 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.149 2005/11/15 11:28:23 tron Exp $
+# $NetBSD: Makefile,v 1.150 2005/11/15 13:58:14 jlam Exp $
 
 .include "Makefile.mirrors"
 
@@ -36,6 +36,7 @@
 SAMBA_PRIVATE?=                ${SAMBA_ETCDIR}/private
 SAMBA_STATEDIR?=       ${SAMBA_VARDIR}/db/samba
 SAMBA_VARDIR?=         ${VARBASE}
+WINBINDD_RCD_SCRIPT=   # empty
 
 FILES_SUBST=           SAMBA_ETCDIR=${SAMBA_ETCDIR}
 FILES_SUBST+=          SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
diff -r 7492a7c05e8b -r 6a5d660fdd3f net/samba/options.mk
--- a/net/samba/options.mk      Tue Nov 15 13:48:42 2005 +0000
+++ b/net/samba/options.mk      Tue Nov 15 13:58:14 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2005/11/14 16:51:42 jlam Exp $
+# $NetBSD: options.mk,v 1.11 2005/11/15 13:58:14 jlam Exp $
 
 # Recommended package options for various setups:
 #
@@ -127,7 +127,6 @@
 .  endif
 
 WINBINDD_RCD_SCRIPT=   winbindd
-FILES_SUBST+=          WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT}
 PLIST_SUBST+=          WINBIND=
 
 # Determine the proper name for the winbind and WINS NSS modules.
@@ -189,7 +188,6 @@
 .  endif
 .else
 CONFIGURE_ARGS+=       --without-winbind
-FILES_SUBST+=          WINBINDD_RCD_SCRIPT=
 PLIST_SUBST+=          WINBIND="@comment "
 PLIST_SUBST+=          PAM_WINBIND="@comment no PAM winbind module"
 PLIST_SUBST+=          NSS_WINBIND="@comment no NSS winbind module"