diff options
| author | sbd <sbd> | 2012-09-11 07:50:50 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2012-09-11 07:50:50 +0000 |
| commit | 3155f914a2e7c51071e0303404e289c56a1b0240 (patch) | |
| tree | 2527509ffb49564c71048d57af859ba47f736e02 /net/samba35/Makefile | |
| parent | a46bf8f011c51f1cf36908521b8040a8d2d9aa0d (diff) | |
| download | pkgsrc-3155f914a2e7c51071e0303404e289c56a1b0240.tar.gz | |
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
Diffstat (limited to 'net/samba35/Makefile')
| -rw-r--r-- | net/samba35/Makefile | 10 |
1 files changed, 2 insertions, 8 deletions
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} |