Moved NetBSD files into PLIST.NetBSD; fixed couple pkglint issues

5 files changed, 16 insertions, 15 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 64bcb9e2273..ae73e5ce1ac 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.210 2012/01/30 13:44:06 tron Exp $
+# $NetBSD: Makefile,v 1.211 2012/01/30 15:44:02 adam Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
@@ -97,10 +97,10 @@ FILES_SUBST+=	MKTEMP=${MKTEMP:Q}
 FILES_SUBST+=	PWD_MKDB=${PWD_MKDB:Q}
 
 .if ${OPSYS} == "NetBSD"
-.if !empty(PKG_OPTIONS:Mwinbind)
+.  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
 .endif
 
 INSTALLATION_DIRS+=	${DOCDIR} ${EGDIR}
@@ -159,10 +159,10 @@ post-install:
 		${DESTDIR}${PREFIX}/${EGDIR}
 	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/*.h
 .if ${OPSYS} == "NetBSD"
-.if !empty(PKG_OPTIONS:Mwinbind)
+.  if !empty(PKG_OPTIONS:Mwinbind)
 	${INSTALL_LIB} ${WRKDIR}/${DISTNAME}/nsswitch/nss_winbind.${SAMBA_LIBEXT} \
 		${DESTDIR}${PREFIX}/lib/nss_winbind.${SAMBA_LIBEXT}.0
-.endif
+.  endif
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 7d540b1804e..9edfa849e3a 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.47 2011/12/19 14:47:27 asau Exp $
+@comment $NetBSD: PLIST,v 1.48 2012/01/30 15:44:02 adam Exp $
 bin/eventlogadm
 bin/findsmb
 bin/net
@@ -45,7 +45,6 @@ lib/libtdb.${LIBEXT}.1
 lib/libtdb.${LIBEXT}.1.2.9
 ${PLIST.winbind}lib/libwbclient.${LIBEXT}
 ${PLIST.winbind}lib/libwbclient.${LIBEXT}.0
-${PLIST.winbind}lib/nss_winbind.${LIBEXT}.0
 lib/samba/auth/script.${LIBEXT}
 lib/samba/charset/CP437.${LIBEXT}
 lib/samba/charset/CP850.${LIBEXT}
diff --git a/net/samba/PLIST.NetBSD b/net/samba/PLIST.NetBSD
new file mode 100644
index 00000000000..b9eca0dcd4b
--- /dev/null
+++ b/net/samba/PLIST.NetBSD
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.NetBSD,v 1.1 2012/01/30 15:44:02 adam Exp $
+${PLIST.winbind}lib/nss_winbind.${LIBEXT}.0
diff --git a/net/samba/buildlink3.mk b/net/samba/buildlink3.mk
index a2373ccc785..2da55eeeee6 100644
--- a/net/samba/buildlink3.mk
+++ b/net/samba/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/05/20 00:58:26 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2012/01/30 15:44:02 adam Exp $
 
 BUILDLINK_TREE+=	samba
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	samba
 SAMBA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.samba+=	samba>=3.0.7
-BUILDLINK_ABI_DEPENDS.samba?=	samba>=3.0.34nb1
+BUILDLINK_ABI_DEPENDS.samba+=	samba>=3.0.34nb1
 BUILDLINK_PKGSRCDIR.samba?=	../../net/samba
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/net/samba/options.mk b/net/samba/options.mk
index 1fa1c6e0366..a9bc3c2af56 100644
--- a/net/samba/options.mk
+++ b/net/samba/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.27 2011/04/23 12:49:38 tron Exp $
+# $NetBSD: options.mk,v 1.28 2012/01/30 15:44:02 adam Exp $
 
 # Recommended package options for various setups:
 #
@@ -31,7 +31,7 @@ SAMBA_STATIC_MODULES:=	# empty
 PKG_OPTIONS+=		ldap
 .  endif
 CONFIGURE_ARGS+=	--with-ads
-CONFIGURE_ARGS+=	--with-krb5=${KRB5BASE:Q}
+CONFIGURE_ARGS+=	--with-krb5=${KRB5BASE}
 
 # Avoid build failures with recent version of Heimdal under NetBSD.
 .  if ${OPSYS} == "NetBSD"
@@ -149,8 +149,8 @@ NSS_WINBIND_cmd=	\
 .PHONY: samba-nss-winbind-install
 post-install: samba-nss-winbind-install
 samba-nss-winbind-install:
-	lib=${WRKSRC:Q}/nsswitch/${NSS_WINBIND:T:Q};			\
-	${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${DESTDIR}${PREFIX:Q}/lib
+	lib=${WRKSRC}/nsswitch/${NSS_WINBIND:T:Q};			\
+	${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${DESTDIR}${PREFIX}/lib
 
 # Install the NSS WINS module if it exists.
 PLIST_SUBST+=	NSS_WINS=${NSS_WINS:Q}
@@ -167,8 +167,8 @@ NSS_WINS_cmd=	\
 .PHONY: samba-nss-wins-install
 post-install: samba-nss-wins-install
 samba-nss-wins-install:
-	lib=${WRKSRC:Q}/nsswitch/${NSS_WINS:T:Q};			\
-	${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${DESTDIR}${PREFIX:Q}/lib
+	lib=${WRKSRC}/nsswitch/${NSS_WINS:T:Q};				\
+	${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${DESTDIR}${PREFIX}/lib
 .else
 CONFIGURE_ARGS+=	--without-winbind
 PLIST_SUBST+=		NSS_WINBIND="no NSS winbind module"