diff options
| author | sbd <sbd@pkgsrc.org> | 2012-02-01 08:32:01 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-02-01 08:32:01 +0000 |
| commit | bd942346b6c27bd9c3a65156cb349a12eaa8194e (patch) | |
| tree | 9cf90c6410f1017a658bc650d20ae75a7ad4eab7 /net/samba35 | |
| parent | 065234ac28dd7728c06a4565b77124370a0793d9 (diff) | |
| download | pkgsrc-bd942346b6c27bd9c3a65156cb349a12eaa8194e.tar.gz | |
nss module install fix-ups .
Now that samba-nss-winbind-install and samba-nss-wins-install work again.
1) Switch back to using the the above mentioned targets for installing
nss-winbind and nss_wins. (These targets work on all platforms.)
2) Switch back to using ${NSS_WINBIND} and ${NSS_WINS} in the PLIST as
these work on all platforms.
Bump PKGREVISION
Diffstat (limited to 'net/samba35')
| -rw-r--r-- | net/samba35/Makefile | 10 | ||||
| -rw-r--r-- | net/samba35/PLIST | 4 | ||||
| -rw-r--r-- | net/samba35/PLIST.NetBSD | 2 |
3 files changed, 5 insertions, 11 deletions
diff --git a/net/samba35/Makefile b/net/samba35/Makefile index f46c913c319..9c1831aae2c 100644 --- a/net/samba35/Makefile +++ b/net/samba35/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.16 2012/01/31 07:42:15 sbd Exp $ +# $NetBSD: Makefile,v 1.17 2012/02/01 08:32:01 sbd Exp $ .include "../../net/samba/Makefile.mirrors" DISTNAME= samba-${VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= net MASTER_SITES= ${SAMBA_MIRRORS:=stable/} @@ -165,12 +165,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 .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/net/samba35/PLIST b/net/samba35/PLIST index ca4451e7c36..c7f8bea10d2 100644 --- a/net/samba35/PLIST +++ b/net/samba35/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2012/01/27 14:32:02 adam Exp $ +@comment $NetBSD: PLIST,v 1.6 2012/02/01 08:32:01 sbd Exp $ bin/eventlogadm bin/findsmb bin/ldbadd @@ -48,6 +48,8 @@ lib/libtdb.${LIBEXT} lib/libtdb.${LIBEXT}.1 ${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/samba35/PLIST.NetBSD b/net/samba35/PLIST.NetBSD deleted file mode 100644 index eae3cec522c..00000000000 --- a/net/samba35/PLIST.NetBSD +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.NetBSD,v 1.1 2012/01/27 14:32:02 adam Exp $ -${PLIST.winbind}lib/nss_winbind.${LIBEXT}.0 |