Different platforms expect different names for the NSS winbind and

WINS modules.  Fix from PR pkg/26640 by John Benninghoff with
modifications by me.

3 files changed, 42 insertions, 7 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 265c51ffed4..89348f0220e 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.127 2004/09/08 08:51:31 xtraeme Exp $
+# $NetBSD: Makefile,v 1.128 2004/09/12 05:00:53 jlam Exp $
 
 DISTNAME=		samba-3.0.5
 CATEGORIES=		net
@@ -79,6 +79,17 @@ MAKEFLAGS+=	PWD_MKDB=${PWD_MKDB:Q}
 FILES_SUBST+=	MKTEMP=${MKTEMP:Q}
 FILES_SUBST+=	PWD_MKDB=${PWD_MKDB:Q}
 
+.if !empty(NSS_WINBIND)
+PLIST_SUBST+=	NSS_WINBIND=lib/${NSS_WINBIND}
+.else
+PLIST_SUBST+=	NSS_WINBIND="@comment no NSS winbind module"
+.endif
+.if !empty(NSS_WINS)
+PLIST_SUBST+=	NSS_WINS=lib/${NSS_WINS}
+.else
+PLIST_SUBST+=	NSS_WINS="@comment no NSS WINS module"
+.endif
+
 DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 
@@ -106,8 +117,12 @@ post-install:
 	${RMDIR} ${SAMBA_LIBDIR}/${d}
 .endfor
 	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/libnss_winbind.so ${PREFIX}/lib
-	${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/libnss_wins.so ${PREFIX}/lib
+.if !empty(NSS_WINBIND)
+	${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/${NSS_WINBIND} ${PREFIX}/lib
+.endif
+.if !empty(NSS_WINS)
+	${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/${NSS_WINS} ${PREFIX}/lib
+.endif
 	cd ${WRKSRC}/../docs/registry; for file in *.reg; do		\
 		${INSTALL_DATA} $$file ${DOCDIR}/$$file;		\
 	done
diff --git a/net/samba/PLIST b/net/samba/PLIST
index fc7f0e489c4..788cc193437 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2004/07/30 21:05:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.23 2004/09/12 05:00:53 jlam Exp $
 bin/findsmb
 bin/net
 bin/nmblookup
@@ -24,8 +24,8 @@ bin/testparm
 bin/testprns
 bin/wbinfo
 include/libsmbclient.h
-lib/libnss_winbind.so
-lib/libnss_wins.so
+${NSS_WINBIND}
+${NSS_WINS}
 lib/libsmbclient.a
 lib/libsmbclient.so
 lib/libsmbclient.so.0
diff --git a/net/samba/options.mk b/net/samba/options.mk
index dd0d87bb015..146f78a45b1 100644
--- a/net/samba/options.mk
+++ b/net/samba/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2004/09/12 05:00:53 jlam Exp $
 
 # Global and legacy options
 .if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS])
@@ -85,3 +85,23 @@ PLIST_SUBST+=		SMBMOUNT=
 .else
 PLIST_SUBST+=		SMBMOUNT="@comment "
 .endif
+
+###
+### Determine the proper name for the winbind and WINS NSS modules.
+###
+NSS_WINBIND.${OPSYS}?=  libnss_winbind.so
+NSS_WINS.${OPSYS}?=     libnss_wins.so
+
+NSS_WINBIND.AIX=        WINBIND       
+NSS_WINS.AIX=           # empty       
+
+NSS_WINBIND.IRIX=       libns_winbind.so
+NSS_WINS.IRIX=          libns_wins.so 
+
+.if !empty(MACHINE_PLATFORM:MFreeBSD-5.*)
+NSS_WINBIND.FreeBSD=    nss_winbind.so
+NSS_WINS.FreeBSD=       nss_wins.so   
+.endif
+
+NSS_WINBIND=            ${NSS_WINBIND.${OPSYS}}
+NSS_WINS=               ${NSS_WINS.${OPSYS}}