diff options
| author | sbd <sbd@pkgsrc.org> | 2012-02-01 08:30:39 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-02-01 08:30:39 +0000 |
| commit | 7a780da5f0f12f5787501aa5813d47fb3a5ade5a (patch) | |
| tree | 921633feba091198d8c9ce2fdd97baf82917cf6c /net | |
| parent | b663ea57f7b765908e721045ed2692484b4b6992 (diff) | |
| download | pkgsrc-7a780da5f0f12f5787501aa5813d47fb3a5ade5a.tar.gz | |
nss module install fix-ups.
1) Correct the path to the nsswitch directory in the samba-nss-winbind-install
and samba-nss-wins-install targets so they work again.
2) Switch back to using the the above mentioned targets for installing
nss-winbind and nss_wins. (These targets work on all platforms.)
3) Switch back to using ${NSS_WINBIND} and ${NSS_WINS} in the PLIST as
these work on all platforms.
Bump PKGREVISION
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba/Makefile | 10 | ||||
| -rw-r--r-- | net/samba/PLIST | 4 | ||||
| -rw-r--r-- | net/samba/PLIST.NetBSD | 2 | ||||
| -rw-r--r-- | net/samba/options.mk | 6 |
4 files changed, 8 insertions, 14 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index 12d780822af..afcb4540046 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.215 2012/01/31 06:53:30 sbd Exp $ +# $NetBSD: Makefile,v 1.216 2012/02/01 08:30:39 sbd Exp $ .include "../../net/samba/Makefile.mirrors" DISTNAME= samba-${VERSION} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= net MASTER_SITES= ${SAMBA_MIRRORS:=stable/} @@ -158,12 +158,6 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/script/updatesmbpasswd.sh \ ${DESTDIR}${PREFIX}/${EGDIR} ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/*.h -.if ${OPSYS} == "NetBSD" -. if !empty(PKG_OPTIONS:Mwinbind) - ${INSTALL_LIB} ${WRKDIR}/${DISTNAME}/nsswitch/nss_winbind.${SAMBA_LIBEXT} \ - ${DESTDIR}${PREFIX}/lib/nss_winbind.${SAMBA_LIBEXT}.0 -. endif -.endif .if ${OPSYS} == "Linux" .include "../../devel/libuuid/buildlink3.mk" diff --git a/net/samba/PLIST b/net/samba/PLIST index 9edfa849e3a..356d04f034b 100644 --- a/net/samba/PLIST +++ b/net/samba/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.48 2012/01/30 15:44:02 adam Exp $ +@comment $NetBSD: PLIST,v 1.49 2012/02/01 08:30:39 sbd Exp $ bin/eventlogadm bin/findsmb bin/net @@ -45,6 +45,8 @@ lib/libtdb.${LIBEXT}.1 lib/libtdb.${LIBEXT}.1.2.9 ${PLIST.winbind}lib/libwbclient.${LIBEXT} ${PLIST.winbind}lib/libwbclient.${LIBEXT}.0 +${PLIST.winbind}${NSS_WINBIND} +${PLIST.winbind}${NSS_WINS} 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 deleted file mode 100644 index b9eca0dcd4b..00000000000 --- a/net/samba/PLIST.NetBSD +++ /dev/null @@ -1,2 +0,0 @@ -@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/options.mk b/net/samba/options.mk index a9bc3c2af56..c3035da2108 100644 --- a/net/samba/options.mk +++ b/net/samba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.28 2012/01/30 15:44:02 adam Exp $ +# $NetBSD: options.mk,v 1.29 2012/02/01 08:30:39 sbd Exp $ # Recommended package options for various setups: # @@ -149,7 +149,7 @@ NSS_WINBIND_cmd= \ .PHONY: samba-nss-winbind-install post-install: samba-nss-winbind-install samba-nss-winbind-install: - lib=${WRKSRC}/nsswitch/${NSS_WINBIND:T:Q}; \ + lib=${WRKDIR}/${DISTNAME}/nsswitch/${NSS_WINBIND:T:Q}; \ ${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${DESTDIR}${PREFIX}/lib # Install the NSS WINS module if it exists. @@ -167,7 +167,7 @@ NSS_WINS_cmd= \ .PHONY: samba-nss-wins-install post-install: samba-nss-wins-install samba-nss-wins-install: - lib=${WRKSRC}/nsswitch/${NSS_WINS:T:Q}; \ + lib=${WRKDIR}/${DISTNAME}/nsswitch/${NSS_WINS:T:Q}; \ ${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${DESTDIR}${PREFIX}/lib .else CONFIGURE_ARGS+= --without-winbind |