Sun May 17 15:47:01 2015 UTC ()
Bump PKGREVISION again.

* Change CACHE directory.


(ryoon)
diff -r1.3 -r1.4 pkgsrc/net/samba4/Makefile
cvs diff -r1.3 -r1.4 pkgsrc/net/samba4/Makefile (switch to unified diff)

--- pkgsrc/net/samba4/Makefile 2015/05/17 13:46:27 1.3
+++ pkgsrc/net/samba4/Makefile 2015/05/17 15:47:01 1.4
@@ -1,191 +1,191 @@ @@ -1,191 +1,191 @@
1# $NetBSD: Makefile,v 1.3 2015/05/17 13:46:27 ryoon Exp $ 1# $NetBSD: Makefile,v 1.4 2015/05/17 15:47:01 ryoon Exp $
2 2
3DISTNAME= samba-${VERSION} 3DISTNAME= samba-${VERSION}
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= http://download.samba.org/pub/samba/ 6MASTER_SITES= http://download.samba.org/pub/samba/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.samba.org/ 9HOMEPAGE= http://www.samba.org/
10COMMENT= SMB/CIFS protocol server suite 10COMMENT= SMB/CIFS protocol server suite
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 13DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
14 14
15VERSION= 4.2.1 15VERSION= 4.2.1
16CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]* 16CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]*
17 17
18BUILD_DEFS+= VARBASE 18BUILD_DEFS+= VARBASE
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22SMB_LIB?= ${PREFIX}/lib 22SMB_LIB?= ${PREFIX}/lib
23 23
24PKG_SYSCONFSUBDIR= samba 24PKG_SYSCONFSUBDIR= samba
25SMB_SHAREDSTATE?= ${PREFIX}/com 25SMB_SHAREDSTATE?= ${PREFIX}/com
26SMB_LOCALSTATE?= ${VARBASE} 26SMB_LOCALSTATE?= ${VARBASE}
27SMB_INFO?= ${PREFIX}/info 27SMB_INFO?= ${PREFIX}/info
28SMB_MAN?= ${PREFIX}/${PKGMANDIR} 28SMB_MAN?= ${PREFIX}/${PKGMANDIR}
29SMB_STATE?= ${VARBASE}/run 29SMB_STATE?= ${VARBASE}/run
30SMB_PRIVATE?= ${SMB_LIB}/samba/private 30SMB_PRIVATE?= ${SMB_LIB}/samba/private
31SMB_PID?= ${VARBASE}/run 31SMB_PID?= ${VARBASE}/run
32SMB_CACHE?= ${VARBASE}/cache 32SMB_CACHE?= ${VARBASE}/run
33SMB_LOCK?= ${VARBASE}/run 33SMB_LOCK?= ${VARBASE}/run
34SMB_LOGFILEBASE?= ${VARBASE}/log 34SMB_LOGFILEBASE?= ${VARBASE}/log
35SMB_SOCKETS?= ${VARBASE}/run 35SMB_SOCKETS?= ${VARBASE}/run
36SMB_MODULES?= ${SMB_LIB}/samba 36SMB_MODULES?= ${SMB_LIB}/samba
37SMB_PRIVATELIB?= ${SMB_LIB}/samba/private 37SMB_PRIVATELIB?= ${SMB_LIB}/samba/private
38SMB_PRIVSOCKETS?= ${VARBASE}/run 38SMB_PRIVSOCKETS?= ${VARBASE}/run
39SMB_CONFIG?= ${PKG_SYSCONFDIR} 39SMB_CONFIG?= ${PKG_SYSCONFDIR}
40SMB_DATAROOT?= ${PREFIX}/share/samba 40SMB_DATAROOT?= ${PREFIX}/share/samba
41SMB_LOCALE?= ${PREFIX}/share/locale 41SMB_LOCALE?= ${PREFIX}/share/locale
42SMB_DOC?= ${PREFIX}/share/doc/samba 42SMB_DOC?= ${PREFIX}/share/doc/samba
43SMB_PAMMODULES?= ${SMB_LIB}/samba/security 43SMB_PAMMODULES?= ${SMB_LIB}/samba/security
44 44
45FILES_SUBST+= SMB_CONFIG=${SMB_CONFIG} 45FILES_SUBST+= SMB_CONFIG=${SMB_CONFIG}
46FILES_SUBST+= SMB_PID=${SMB_PID} 46FILES_SUBST+= SMB_PID=${SMB_PID}
47 47
48# mktemp is useful for the replacement adduser script, but don't require 48# mktemp is useful for the replacement adduser script, but don't require
49# a full dependency since it's not actually needed by samba. 49# a full dependency since it's not actually needed by samba.
50USE_TOOLS+= gmake mktemp perl:run 50USE_TOOLS+= gmake mktemp perl:run
51 51
52REPLACE_PERL= script/findsmb.in 52REPLACE_PERL= script/findsmb.in
53 53
54USE_GNU_ICONV= yes # FIXME: something doesn't work on NetBSD 54USE_GNU_ICONV= yes # FIXME: something doesn't work on NetBSD
55BROKEN_GETTEXT_DETECTION=yes 55BROKEN_GETTEXT_DETECTION=yes
56 56
57# Debugging 57# Debugging
58#CONFIGURE_ARGS+= -vvv 58#CONFIGURE_ARGS+= -vvv
59#CONFIGURE_ARGS+= --enable-developer 59#CONFIGURE_ARGS+= --enable-developer
60#CONFIGURE_ARGS+= --fatal-errors 60#CONFIGURE_ARGS+= --fatal-errors
61 61
62HAS_CONFIGURE= yes 62HAS_CONFIGURE= yes
63CONFIGURE_ENV+= XSLTPROC=${FALSE} # suppress generation of man pages 63CONFIGURE_ENV+= XSLTPROC=${FALSE} # suppress generation of man pages
64CONFIGURE_ARGS+= --libdir=${SAMBA_LIB} 64CONFIGURE_ARGS+= --libdir=${SAMBA_LIB}
65CONFIG_SHELL= ${PYTHONBIN} 65CONFIG_SHELL= ${PYTHONBIN}
66CONFIGURE_SCRIPT= ${WRKSRC}/buildtools/bin/waf 66CONFIGURE_SCRIPT= ${WRKSRC}/buildtools/bin/waf
67CONFIGURE_ARGS+= configure 67CONFIGURE_ARGS+= configure
68CONFIGURE_ARGS+= --prefix=${PREFIX} 68CONFIGURE_ARGS+= --prefix=${PREFIX}
69CONFIGURE_ARGS+= --infodir=${SMB_INFO} 69CONFIGURE_ARGS+= --infodir=${SMB_INFO}
70CONFIGURE_ARGS+= --mandir=${SMB_MAN} 70CONFIGURE_ARGS+= --mandir=${SMB_MAN}
71CONFIGURE_ARGS+= --datarootdir=${SMB_DATAROOT} 71CONFIGURE_ARGS+= --datarootdir=${SMB_DATAROOT}
72CONFIGURE_ARGS+= --localedir=${SMB_LOCALE} 72CONFIGURE_ARGS+= --localedir=${SMB_LOCALE}
73CONFIGURE_ARGS+= --docdir=${SMB_DOC} 73CONFIGURE_ARGS+= --docdir=${SMB_DOC}
74CONFIGURE_ARGS+= --with-statedir=${SMB_STATE} 74CONFIGURE_ARGS+= --with-statedir=${SMB_STATE}
75CONFIGURE_ARGS+= --with-privatedir=${SMB_PRIVATE} 75CONFIGURE_ARGS+= --with-privatedir=${SMB_PRIVATE}
76CONFIGURE_ARGS+= --with-piddir=${SMB_PID} 76CONFIGURE_ARGS+= --with-piddir=${SMB_PID}
77CONFIGURE_ARGS+= --with-cachedir=${SMB_CACHE} 77CONFIGURE_ARGS+= --with-cachedir=${SMB_CACHE}
78CONFIGURE_ARGS+= --with-lockdir=${SMB_LOCK} 78CONFIGURE_ARGS+= --with-lockdir=${SMB_LOCK}
79CONFIGURE_ARGS+= --with-logfilebase=${SMB_LOGFILEBASE} 79CONFIGURE_ARGS+= --with-logfilebase=${SMB_LOGFILEBASE}
80CONFIGURE_ARGS+= --with-sockets-dir=${SMB_SOCKETS} 80CONFIGURE_ARGS+= --with-sockets-dir=${SMB_SOCKETS}
81CONFIGURE_ARGS+= --with-modulesdir=${SMB_MODULES} 81CONFIGURE_ARGS+= --with-modulesdir=${SMB_MODULES}
82CONFIGURE_ARGS+= --with-privatelibdir=${SMB_PRIVATELIB} 82CONFIGURE_ARGS+= --with-privatelibdir=${SMB_PRIVATELIB}
83CONFIGURE_ARGS+= --with-privileged-socket-dir=${SMB_PRIVSOCKETS} 83CONFIGURE_ARGS+= --with-privileged-socket-dir=${SMB_PRIVSOCKETS}
84CONFIGURE_ARGS+= --with-configdir=${SMB_CONFIG} 84CONFIGURE_ARGS+= --with-configdir=${SMB_CONFIG}
85CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} 85CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv}
86CONFIGURE_ARGS+= --with-gettext=${BUILDLINK_PREFIX.gettext} 86CONFIGURE_ARGS+= --with-gettext=${BUILDLINK_PREFIX.gettext}
87#CONFIGURE_ARGS+= --bundled-libraries=com_err 87#CONFIGURE_ARGS+= --bundled-libraries=com_err
88CONFIGURE_ARGS+= --enable-gnutls 88CONFIGURE_ARGS+= --enable-gnutls
89CONFIGURE_ARGS+= --with-system-mitkrb5 89CONFIGURE_ARGS+= --with-system-mitkrb5
90CONFIGURE_ARGS+= --abi-check-disable 90CONFIGURE_ARGS+= --abi-check-disable
91#CONFIGURE_ARGS+= --bundled-libraries=!crypto,ldb,ntdb,talloc,tdb,tevent 91#CONFIGURE_ARGS+= --bundled-libraries=!crypto,ldb,ntdb,talloc,tdb,tevent
92.if defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO]) 92.if defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO])
93CONFIGURE_ARGS+= --jobs=1 93CONFIGURE_ARGS+= --jobs=1
94.else 94.else
95CONFIGURE_ARGS+= --jobs=${MAKE_JOBS} 95CONFIGURE_ARGS+= --jobs=${MAKE_JOBS}
96.endif 96.endif
97 97
98# for winbind option build. 98# for winbind option build.
99LDFLAGS+= -Wl,--allow-shlib-undefined 99LDFLAGS+= -Wl,--allow-shlib-undefined
100LDFLAGS+= ${COMPILER_RPATH_FLAG}${SMB_PRIVATELIB} 100LDFLAGS+= ${COMPILER_RPATH_FLAG}${SMB_PRIVATELIB}
101 101
102.include "options.mk" 102.include "options.mk"
103 103
104PLIST_VARS+= macosx 104PLIST_VARS+= macosx
105 105
106.if ${OPSYS} == "Darwin" 106.if ${OPSYS} == "Darwin"
107PLIST.macosx= yes 107PLIST.macosx= yes
108.endif 108.endif
109 109
110.if ${_OPSYS_SHLIB_TYPE} == "dylib" 110.if ${_OPSYS_SHLIB_TYPE} == "dylib"
111PLIST_SUBST+= LIBEXT=dylib 111PLIST_SUBST+= LIBEXT=dylib
112SAMBA_LIBEXT= dylib 112SAMBA_LIBEXT= dylib
113.else 113.else
114PLIST_SUBST+= LIBEXT=so 114PLIST_SUBST+= LIBEXT=so
115SAMBA_LIBEXT= so 115SAMBA_LIBEXT= so
116.endif 116.endif
117 117
118.if !defined(PWD_MKDB) 118.if !defined(PWD_MKDB)
119PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \ 119PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \
120 ${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }' 120 ${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }'
121MAKEFLAGS+= PWD_MKDB=${PWD_MKDB:Q} 121MAKEFLAGS+= PWD_MKDB=${PWD_MKDB:Q}
122.endif 122.endif
123FILES_SUBST+= MKTEMP=${MKTEMP:Q} 123FILES_SUBST+= MKTEMP=${MKTEMP:Q}
124FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q} 124FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q}
125 125
126INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} 126INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
127 127
128DOCDIR= share/doc/${PKGBASE} 128DOCDIR= share/doc/${PKGBASE}
129EGDIR= share/examples/${PKGBASE} 129EGDIR= share/examples/${PKGBASE}
130CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SMB_CONFIG}/smb.conf 130CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SMB_CONFIG}/smb.conf
131OWN_DIRS_PERMS= ${SMB_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 131OWN_DIRS_PERMS= ${SMB_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
132RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT} 132RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT}
133 133
134SUBST_CLASSES+= paths 134SUBST_CLASSES+= paths
135SUBST_MESSAGE.paths= Fixing paths. 135SUBST_MESSAGE.paths= Fixing paths.
136SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh 136SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh
137SUBST_STAGE.paths= post-patch 137SUBST_STAGE.paths= post-patch
138SUBST_SED.paths+= -e 's,@AWK@,${AWK},g' 138SUBST_SED.paths+= -e 's,@AWK@,${AWK},g'
139SUBST_SED.paths+= -e 's,@CAT@,${CAT},g' 139SUBST_SED.paths+= -e 's,@CAT@,${CAT},g'
140SUBST_SED.paths+= -e 's,@MKTEMP@,${MKTEMP},g' 140SUBST_SED.paths+= -e 's,@MKTEMP@,${MKTEMP},g'
141SUBST_SED.paths+= -e 's,@RM@,${RM},g' 141SUBST_SED.paths+= -e 's,@RM@,${RM},g'
142SUBST_SED.paths+= -e 's,@PWD_MKDB@,${PWD_MKDB},g' 142SUBST_SED.paths+= -e 's,@PWD_MKDB@,${PWD_MKDB},g'
143SUBST_SED.paths+= -e 's,@SH@,${SH},g' 143SUBST_SED.paths+= -e 's,@SH@,${SH},g'
144 144
145SUBST_CLASSES+= logpath 145SUBST_CLASSES+= logpath
146SUBST_MESSAGE.logpath= Fixing log path. 146SUBST_MESSAGE.logpath= Fixing log path.
147SUBST_FILES.logpath= examples/smb.conf.default 147SUBST_FILES.logpath= examples/smb.conf.default
148SUBST_STAGE.logpath= pre-configure 148SUBST_STAGE.logpath= pre-configure
149SUBST_SED.logpath+= -e 's,/usr/local/samba/var/log.%m,${SMB_LOGFILEBASE}/log.%m,g' 149SUBST_SED.logpath+= -e 's,/usr/local/samba/var/log.%m,${SMB_LOGFILEBASE}/log.%m,g'
150 150
151post-extract: 151post-extract:
152 ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR} 152 ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR}
153 153
154post-install: 154post-install:
155 set -e ; cd ${WRKSRC}/docs-xml/registry; for f in *.reg; do \ 155 set -e ; cd ${WRKSRC}/docs-xml/registry; for f in *.reg; do \
156 ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \ 156 ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \
157 done 157 done
158 ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh \ 158 ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh \
159 ${DESTDIR}${PREFIX}/${EGDIR}/adduser.sh 159 ${DESTDIR}${PREFIX}/${EGDIR}/adduser.sh
160 ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh \ 160 ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh \
161 ${DESTDIR}${PREFIX}/${EGDIR}/deluser.sh 161 ${DESTDIR}${PREFIX}/${EGDIR}/deluser.sh
162 ${INSTALL_DATA} ${WRKSRC}/examples/LDAP/samba.schema \ 162 ${INSTALL_DATA} ${WRKSRC}/examples/LDAP/samba.schema \
163 ${DESTDIR}${PREFIX}/${EGDIR} 163 ${DESTDIR}${PREFIX}/${EGDIR}
164 ${INSTALL_DATA} ${WRKSRC}/examples/smb.conf.default \ 164 ${INSTALL_DATA} ${WRKSRC}/examples/smb.conf.default \
165 ${DESTDIR}${PREFIX}/${EGDIR} 165 ${DESTDIR}${PREFIX}/${EGDIR}
166 166
167REPLACE_PERL= pidl/pidl 167REPLACE_PERL= pidl/pidl
168REPLACE_PYTHON= buildtools/bin/waf \ 168REPLACE_PYTHON= buildtools/bin/waf \
169 source4/setup/* \ 169 source4/setup/* \
170 source4/scripting/bin/* \ 170 source4/scripting/bin/* \
171 lib/subunit/python/subunit/run.py \ 171 lib/subunit/python/subunit/run.py \
172 lib/subunit/python/subunit/tests/sample-script.py \ 172 lib/subunit/python/subunit/tests/sample-script.py \
173 lib/subunit/python/subunit/tests/sample-two-script.py \ 173 lib/subunit/python/subunit/tests/sample-two-script.py \
174 lib/tevent/tevent.py 174 lib/tevent/tevent.py
175 175
176.include "../../lang/python/application.mk" 176.include "../../lang/python/application.mk"
177 177
178PY_PATCHPLIST= yes 178PY_PATCHPLIST= yes
179.include "../../lang/python/extension.mk" 179.include "../../lang/python/extension.mk"
180 180
181.if ${OPSYS} == "Linux" 181.if ${OPSYS} == "Linux"
182.include "../../devel/libuuid/buildlink3.mk" 182.include "../../devel/libuuid/buildlink3.mk"
183.endif 183.endif
184.include "../../converters/libiconv/buildlink3.mk" 184.include "../../converters/libiconv/buildlink3.mk"
185.include "../../devel/gettext-lib/buildlink3.mk" 185.include "../../devel/gettext-lib/buildlink3.mk"
186.include "../../devel/popt/buildlink3.mk" 186.include "../../devel/popt/buildlink3.mk"
187.include "../../devel/readline/buildlink3.mk" 187.include "../../devel/readline/buildlink3.mk"
188.include "../../devel/zlib/buildlink3.mk" 188.include "../../devel/zlib/buildlink3.mk"
189.include "../../security/gnutls/buildlink3.mk" 189.include "../../security/gnutls/buildlink3.mk"
190.include "../../security/mit-krb5/buildlink3.mk" 190.include "../../security/mit-krb5/buildlink3.mk"
191.include "../../mk/bsd.pkg.mk" 191.include "../../mk/bsd.pkg.mk"