Fri Mar 18 12:28:21 2016 UTC ()
Don't create the /usr/lib symlinks on SmartOS, it is a read-only mount.


(jperkin)
diff -r1.35 -r1.36 pkgsrc/net/samba/options.mk
cvs diff -r1.35 -r1.36 pkgsrc/net/samba/options.mk (expand / switch to unified diff)

--- pkgsrc/net/samba/options.mk 2016/02/25 16:20:52 1.35
+++ pkgsrc/net/samba/options.mk 2016/03/18 12:28:21 1.36
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.35 2016/02/25 16:20:52 jperkin Exp $ 1# $NetBSD: options.mk,v 1.36 2016/03/18 12:28:21 jperkin Exp $
2 2
3# Recommended package options for various setups: 3# Recommended package options for various setups:
4# 4#
5# Standalone Samba server cups 5# Standalone Samba server cups
6# Domain Member server cups ldap winbind 6# Domain Member server cups ldap winbind
7# Active Directory Member server ads cups winbind 7# Active Directory Member server ads cups winbind
8# Domain Controller ldap winbind 8# Domain Controller ldap winbind
9# 9#
10PKG_OPTIONS_VAR= PKG_OPTIONS.samba 10PKG_OPTIONS_VAR= PKG_OPTIONS.samba
11PKG_SUPPORTED_OPTIONS= ads cups fam ldap pam winbind 11PKG_SUPPORTED_OPTIONS= ads cups fam ldap pam winbind
12PKG_SUGGESTED_OPTIONS= ldap pam winbind 12PKG_SUGGESTED_OPTIONS= ldap pam winbind
13 13
14.include "../../mk/bsd.fast.prefs.mk" 14.include "../../mk/bsd.fast.prefs.mk"
@@ -141,28 +141,30 @@ FILES_SUBST+= NSS_WINBIND=${NSS_WINBIND @@ -141,28 +141,30 @@ FILES_SUBST+= NSS_WINBIND=${NSS_WINBIND
141NSS_WINBIND= ${NSS_WINBIND_cmd:sh} 141NSS_WINBIND= ${NSS_WINBIND_cmd:sh}
142NSS_WINBIND_cmd= \ 142NSS_WINBIND_cmd= \
143 ${TEST} -x ${WRKSRC}/config.status || \ 143 ${TEST} -x ${WRKSRC}/config.status || \
144 { ${ECHO} "@comment no NSS winbind module" ; exit 0; }; \ 144 { ${ECHO} "@comment no NSS winbind module" ; exit 0; }; \
145 cd ${WRKDIR} && ${ECHO} @WINBIND_NSS@ | \ 145 cd ${WRKDIR} && ${ECHO} @WINBIND_NSS@ | \
146 ${WRKSRC}/config.status --file=-:- | \ 146 ${WRKSRC}/config.status --file=-:- | \
147 ${AWK} '/^$$/ { print "@comment no NSS winbind module"; exit 0; } \ 147 ${AWK} '/^$$/ { print "@comment no NSS winbind module"; exit 0; } \
148 { sub(".*/", "lib/"); print; }' && \ 148 { sub(".*/", "lib/"); print; }' && \
149 ${RM} -f config.log 149 ${RM} -f config.log
150 150
151# Install a /usr/lib/${NSS_WINBIND:T} -> ${PREFIX}/${NSS_WINBIND} symlink 151# Install a /usr/lib/${NSS_WINBIND:T} -> ${PREFIX}/${NSS_WINBIND} symlink
152# Unfortunately NSS_WINDIND_cmd can not be used to determine whether the 152# Unfortunately NSS_WINDIND_cmd can not be used to determine whether the
153# (de)install templates are needed or not. 153# (de)install templates are needed or not.
 154.if ${OS_VARIANT} != "SmartOS"
154INSTALL_TEMPLATES+= INSTALL.nss_winbind 155INSTALL_TEMPLATES+= INSTALL.nss_winbind
155DEINSTALL_TEMPLATES+= DEINSTALL.nss_winbind 156DEINSTALL_TEMPLATES+= DEINSTALL.nss_winbind
 157.endif
156 158
157.PHONY: samba-nss-winbind-install 159.PHONY: samba-nss-winbind-install
158post-install: samba-nss-winbind-install 160post-install: samba-nss-winbind-install
159samba-nss-winbind-install: 161samba-nss-winbind-install:
160 lib=${WRKDIR}/${DISTNAME}/nsswitch/${NSS_WINBIND:T:Q}; \ 162 lib=${WRKDIR}/${DISTNAME}/nsswitch/${NSS_WINBIND:T:Q}; \
161 ${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${DESTDIR}${PREFIX}/lib 163 ${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${DESTDIR}${PREFIX}/lib
162 164
163# Install the NSS WINS module if it exists. 165# Install the NSS WINS module if it exists.
164PLIST_SUBST+= NSS_WINS=${NSS_WINS:Q} 166PLIST_SUBST+= NSS_WINS=${NSS_WINS:Q}
165NSS_WINS= ${NSS_WINS_cmd:sh} 167NSS_WINS= ${NSS_WINS_cmd:sh}
166NSS_WINS_cmd= \ 168NSS_WINS_cmd= \
167 ${TEST} -x ${WRKSRC}/config.status || \ 169 ${TEST} -x ${WRKSRC}/config.status || \
168 { ${ECHO} "@comment no NSS WINS module" ; exit 0; }; \ 170 { ${ECHO} "@comment no NSS WINS module" ; exit 0; }; \