Sync net/samba35 with the below changes as it uses net/samba/options.mk.

Bump PKGREVISION

---
   Module Name:	pkgsrc
   Committed By:	sbd
   Date:		Sun Aug 19 07:28:36 UTC 2012

   Modified Files:
   	pkgsrc/net/samba: INSTALL.nss_winbind Makefile options.mk
   Added Files:
   	pkgsrc/net/samba: DEINSTALL.nss_winbind

   Log Message:
   NSS winbind option install script fixes:

     1) Move the INSTALL_TEMPLATES line to the 'winbind' option section.
     2) Enable the install script on all platforms.
     3) Use the value of ${NSS_WINBIND} in the script as the name of the
        library (should work on all platforms).
     4) In the install script only create the symlink if ${NSS_WINBIND} doesn't
        start with '@comment' (i.e. no nss winbind on this platform) and the
        target file exists and the symlink _doesn't_ already exist.
     5) Create a DEINSTALL_TEMPLATES to remove the nss winbind symlink if it
        exists and point to the correct target.

   Bump PKGREVISION.


   To generate a diff of this commit:
   cvs rdiff -u -r0 -r1.1 pkgsrc/net/samba/DEINSTALL.nss_winbind
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/samba/INSTALL.nss_winbind
   cvs rdiff -u -r1.220 -r1.221 pkgsrc/net/samba/Makefile
   cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/samba/options.mk

3 files changed, 33 insertions, 10 deletions

diff --git a/net/samba35/DEINSTALL.nss_winbind b/net/samba35/DEINSTALL.nss_winbind
new file mode 100644
index 00000000000..93857af77fa
--- /dev/null
+++ b/net/samba35/DEINSTALL.nss_winbind
@@ -0,0 +1,19 @@
+# $NetBSD: DEINSTALL.nss_winbind,v 1.1 2012/09/11 07:50:50 sbd Exp $
+
+case ${STAGE} in
+DEINSTALL)
+	NSS_WINBIND='@NSS_WINBIND@'
+	case $NSS_WINBIND in
+	"@comment *")	;;
+	*)
+		if ${TEST} -e /usr/lib/${NSS_WINBIND##*/} && \
+		   target=`${LS} -l /usr/lib/${NSS_WINBIND##*/} | \
+			${AWK} '{print $NF;}'` && \
+		   ${TEST} x"$target" = x"${PREFIX}/${NSS_WINBIND}" ;then
+			${ECHO} "Removeing /usr/lib/${NSS_WINBIND##*/} symlink."
+			${RM} -f /usr/lib/${NSS_WINBIND##*/}
+		fi
+		;;
+	esac
+	;;
+esac
diff --git a/net/samba35/INSTALL.nss_winbind b/net/samba35/INSTALL.nss_winbind
index 21018f44ab0..8bcbc2a8b06 100644
--- a/net/samba35/INSTALL.nss_winbind
+++ b/net/samba35/INSTALL.nss_winbind
@@ -1,7 +1,17 @@
-# $NetBSD: INSTALL.nss_winbind,v 1.1 2011/10/11 20:30:00 jmcneill Exp $
+# $NetBSD: INSTALL.nss_winbind,v 1.2 2012/09/11 07:50:50 sbd Exp $
 
 case ${STAGE} in
 POST-INSTALL)
-	ln -sf ${PREFIX}/lib/nss_winbind.so.0 /usr/lib/nss_winbind.so.0
+	NSS_WINBIND='@NSS_WINBIND@'
+	case $NSS_WINBIND in
+	"@comment *")	;;
+	*)
+		if ${TEST} -f ${PREFIX}/${NSS_WINBIND} && \
+		   ${TEST} ! -e /usr/lib/${NSS_WINBIND##*/} ;then
+			${ECHO} "Creating /usr/lib/${NSS_WINBIND##*/} symlink."
+			${LN} -sf ${PREFIX}/${NSS_WINBIND} /usr/lib/${NSS_WINBIND##*/}
+		fi
+		;;
+	esac
 	;;
 esac
diff --git a/net/samba35/Makefile b/net/samba35/Makefile
index 602dba0cad0..17e459662c9 100644
--- a/net/samba35/Makefile
+++ b/net/samba35/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2012/07/07 12:35:53 asau Exp $
+# $NetBSD: Makefile,v 1.22 2012/09/11 07:50:50 sbd Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
 DISTNAME=	samba-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${SAMBA_MIRRORS:=stable/}
 
@@ -102,13 +103,6 @@ MAKEFLAGS+=	PWD_MKDB=${PWD_MKDB:Q}
 FILES_SUBST+=	MKTEMP=${MKTEMP:Q}
 FILES_SUBST+=	PWD_MKDB=${PWD_MKDB:Q}
 
-.if ${OPSYS} == "NetBSD"
-.  if !empty(PKG_OPTIONS:Mwinbind)
-# Install a /usr/lib/nss_winbind.so.0 -> ${PREFIX}/lib/nss_winbind.so.0 symlink
-INSTALL_TEMPLATES+=	INSTALL.nss_winbind
-.  endif
-.endif
-
 INSTALLATION_DIRS+=	${DOCDIR} ${EGDIR}
 
 DOCDIR=		share/doc/${PKGBASE}