Tue May 28 13:35:54 2019 UTC ()
*: Remove per-package MESSAGE.{rcd,smf} handling.

This is now centralised in mk/pkgformat so no need to do it manually.


(jperkin)
diff -r1.68 -r1.69 pkgsrc/net/samba4/Makefile
diff -r1.28 -r1.29 pkgsrc/net/tinc/Makefile
diff -r1.16 -r1.17 pkgsrc/security/spiped/Makefile
cvs diff -r1.68 -r1.69 pkgsrc/net/samba4/Makefile (switch to unified diff)

--- pkgsrc/net/samba4/Makefile 2019/05/22 19:57:12 1.68
+++ pkgsrc/net/samba4/Makefile 2019/05/28 13:35:54 1.69
@@ -1,227 +1,223 @@ @@ -1,227 +1,223 @@
1# $NetBSD: Makefile,v 1.68 2019/05/22 19:57:12 adam Exp $ 1# $NetBSD: Makefile,v 1.69 2019/05/28 13:35:54 jperkin Exp $
2 2
3DISTNAME= samba-4.10.4 3DISTNAME= samba-4.10.4
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= http://download.samba.org/pub/samba/stable/ 5MASTER_SITES= http://download.samba.org/pub/samba/stable/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.samba.org/ 8HOMEPAGE= http://www.samba.org/
9COMMENT= SMB/CIFS protocol server suite 9COMMENT= SMB/CIFS protocol server suite
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12CONFLICTS+= ja-samba-[0-9]* winbind-[0-9]* 12CONFLICTS+= ja-samba-[0-9]* winbind-[0-9]*
13 13
14PYTHON_VERSIONS_INCOMPATIBLE= 27 14PYTHON_VERSIONS_INCOMPATIBLE= 27
15 15
16GCC_REQD+= 4.4 16GCC_REQD+= 4.4
17BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 17BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
18BUILD_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml 18BUILD_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml
19BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 19BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
20DEPENDS+= p5-Parse-Yapp>=1.05:../../devel/p5-Parse-Yapp 20DEPENDS+= p5-Parse-Yapp>=1.05:../../devel/p5-Parse-Yapp
21DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns 21DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
22DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 22DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
23DEPENDS+= ${PYPKGPREFIX}-iso8601-[0-9]*:../../time/py-iso8601 23DEPENDS+= ${PYPKGPREFIX}-iso8601-[0-9]*:../../time/py-iso8601
24 24
25BUILD_DEFS+= VARBASE 25BUILD_DEFS+= VARBASE
26 26
27.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
28 28
29SMB_LIB?= ${PREFIX}/lib 29SMB_LIB?= ${PREFIX}/lib
30 30
31PKG_SYSCONFSUBDIR= samba 31PKG_SYSCONFSUBDIR= samba
32SMB_SHAREDSTATE?= ${PREFIX}/com 32SMB_SHAREDSTATE?= ${PREFIX}/com
33SMB_LOCALSTATE?= ${VARBASE} 33SMB_LOCALSTATE?= ${VARBASE}
34SMB_INFO?= ${PREFIX}/info 34SMB_INFO?= ${PREFIX}/info
35SMB_MAN?= ${PREFIX}/${PKGMANDIR} 35SMB_MAN?= ${PREFIX}/${PKGMANDIR}
36SMB_STATE?= ${VARBASE}/run 36SMB_STATE?= ${VARBASE}/run
37SMB_PRIVATE?= ${PKG_SYSCONFDIR}/private 37SMB_PRIVATE?= ${PKG_SYSCONFDIR}/private
38SMB_PID?= ${VARBASE}/run 38SMB_PID?= ${VARBASE}/run
39SMB_CACHE?= ${VARBASE}/run 39SMB_CACHE?= ${VARBASE}/run
40SMB_LOCK?= ${VARBASE}/run 40SMB_LOCK?= ${VARBASE}/run
41SMB_LOGFILEBASE?= ${VARBASE}/log 41SMB_LOGFILEBASE?= ${VARBASE}/log
42SMB_SOCKETS?= ${VARBASE}/run 42SMB_SOCKETS?= ${VARBASE}/run
43SMB_MODULES?= ${SMB_LIB}/samba 43SMB_MODULES?= ${SMB_LIB}/samba
44SMB_PRIVATELIB?= ${SMB_LIB}/samba/private 44SMB_PRIVATELIB?= ${SMB_LIB}/samba/private
45SMB_PRIVSOCKETS?= ${VARBASE}/run 45SMB_PRIVSOCKETS?= ${VARBASE}/run
46SMB_CONFIG?= ${PKG_SYSCONFDIR} 46SMB_CONFIG?= ${PKG_SYSCONFDIR}
47SMB_DATAROOT?= ${PREFIX}/share/samba 47SMB_DATAROOT?= ${PREFIX}/share/samba
48SMB_LOCALE?= ${PREFIX}/share/locale 48SMB_LOCALE?= ${PREFIX}/share/locale
49SMB_DOC?= ${PREFIX}/share/doc/samba 49SMB_DOC?= ${PREFIX}/share/doc/samba
50SMB_PAMMODULES?= ${SMB_LIB}/samba/security 50SMB_PAMMODULES?= ${SMB_LIB}/samba/security
51 51
52FILES_SUBST+= SMB_CONFIG=${SMB_CONFIG} 52FILES_SUBST+= SMB_CONFIG=${SMB_CONFIG}
53FILES_SUBST+= SMB_PID=${SMB_PID} 53FILES_SUBST+= SMB_PID=${SMB_PID}
54 54
55# mktemp is useful for the replacement adduser script, but don't require 55# mktemp is useful for the replacement adduser script, but don't require
56# a full dependency since it's not actually needed by samba. 56# a full dependency since it's not actually needed by samba.
57USE_TOOLS+= gmake mktemp perl:run pkg-config 57USE_TOOLS+= gmake mktemp perl:run pkg-config
58 58
59USE_GNU_ICONV= yes # FIXME: something doesn't work on NetBSD 59USE_GNU_ICONV= yes # FIXME: something doesn't work on NetBSD
60BROKEN_GETTEXT_DETECTION=yes 60BROKEN_GETTEXT_DETECTION=yes
61 61
62# Debugging 62# Debugging
63#CONFIGURE_ARGS+= -vvv 63#CONFIGURE_ARGS+= -vvv
64#CONFIGURE_ARGS+= --enable-developer 64#CONFIGURE_ARGS+= --enable-developer
65#CONFIGURE_ARGS+= --fatal-errors 65#CONFIGURE_ARGS+= --fatal-errors
66 66
67HAS_CONFIGURE= yes 67HAS_CONFIGURE= yes
68CONFIG_SHELL= ${PYTHONBIN} 68CONFIG_SHELL= ${PYTHONBIN}
69CONFIGURE_SCRIPT= ${WRKSRC}/buildtools/bin/waf 69CONFIGURE_SCRIPT= ${WRKSRC}/buildtools/bin/waf
70CONFIGURE_ARGS+= configure 70CONFIGURE_ARGS+= configure
71CONFIGURE_ARGS+= --prefix=${PREFIX} 71CONFIGURE_ARGS+= --prefix=${PREFIX}
72CONFIGURE_ARGS+= --infodir=${SMB_INFO} 72CONFIGURE_ARGS+= --infodir=${SMB_INFO}
73CONFIGURE_ARGS+= --mandir=${SMB_MAN} 73CONFIGURE_ARGS+= --mandir=${SMB_MAN}
74CONFIGURE_ARGS+= --datarootdir=${SMB_DATAROOT} 74CONFIGURE_ARGS+= --datarootdir=${SMB_DATAROOT}
75CONFIGURE_ARGS+= --libdir=${SAMBA_LIB} 75CONFIGURE_ARGS+= --libdir=${SAMBA_LIB}
76CONFIGURE_ARGS+= --localedir=${SMB_LOCALE} 76CONFIGURE_ARGS+= --localedir=${SMB_LOCALE}
77CONFIGURE_ARGS+= --docdir=${SMB_DOC} 77CONFIGURE_ARGS+= --docdir=${SMB_DOC}
78CONFIGURE_ARGS+= --with-statedir=${SMB_STATE} 78CONFIGURE_ARGS+= --with-statedir=${SMB_STATE}
79CONFIGURE_ARGS+= --with-privatedir=${SMB_PRIVATE} 79CONFIGURE_ARGS+= --with-privatedir=${SMB_PRIVATE}
80CONFIGURE_ARGS+= --with-piddir=${SMB_PID} 80CONFIGURE_ARGS+= --with-piddir=${SMB_PID}
81CONFIGURE_ARGS+= --with-cachedir=${SMB_CACHE} 81CONFIGURE_ARGS+= --with-cachedir=${SMB_CACHE}
82CONFIGURE_ARGS+= --with-lockdir=${SMB_LOCK} 82CONFIGURE_ARGS+= --with-lockdir=${SMB_LOCK}
83CONFIGURE_ARGS+= --with-logfilebase=${SMB_LOGFILEBASE} 83CONFIGURE_ARGS+= --with-logfilebase=${SMB_LOGFILEBASE}
84CONFIGURE_ARGS+= --with-sockets-dir=${SMB_SOCKETS} 84CONFIGURE_ARGS+= --with-sockets-dir=${SMB_SOCKETS}
85CONFIGURE_ARGS+= --with-modulesdir=${SMB_MODULES} 85CONFIGURE_ARGS+= --with-modulesdir=${SMB_MODULES}
86CONFIGURE_ARGS+= --with-privatelibdir=${SMB_PRIVATELIB} 86CONFIGURE_ARGS+= --with-privatelibdir=${SMB_PRIVATELIB}
87CONFIGURE_ARGS+= --with-privileged-socket-dir=${SMB_PRIVSOCKETS} 87CONFIGURE_ARGS+= --with-privileged-socket-dir=${SMB_PRIVSOCKETS}
88CONFIGURE_ARGS+= --with-configdir=${SMB_CONFIG} 88CONFIGURE_ARGS+= --with-configdir=${SMB_CONFIG}
89CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} 89CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv}
90#CONFIGURE_ARGS+= --bundled-libraries=com_err 90#CONFIGURE_ARGS+= --bundled-libraries=com_err
91CONFIGURE_ARGS+= --abi-check-disable 91CONFIGURE_ARGS+= --abi-check-disable
92CONFIGURE_ARGS+= --disable-symbol-versions 92CONFIGURE_ARGS+= --disable-symbol-versions
93CONFIGURE_ARGS+= --enable-gnutls 93CONFIGURE_ARGS+= --enable-gnutls
94.if defined(MAKE_JOBS) && !empty(MAKE_JOBS) && !(defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO])) 94.if defined(MAKE_JOBS) && !empty(MAKE_JOBS) && !(defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO]))
95CONFIGURE_ARGS+= --jobs=${MAKE_JOBS} 95CONFIGURE_ARGS+= --jobs=${MAKE_JOBS}
96.else 96.else
97CONFIGURE_ARGS+= --jobs=1 97CONFIGURE_ARGS+= --jobs=1
98.endif 98.endif
99CONFIGURE_ARGS+= --without-gpgme 99CONFIGURE_ARGS+= --without-gpgme
100 100
101# Depends on ncurses, explicitly disable for now. 101# Depends on ncurses, explicitly disable for now.
102CONFIGURE_ARGS+= --without-regedit 102CONFIGURE_ARGS+= --without-regedit
103 103
104PY_PATCHPLIST= yes 104PY_PATCHPLIST= yes
105MAKE_FLAGS+= WAF_BINARY=${PYTHONBIN}\ ${WRKSRC}/buildtools/bin/waf 105MAKE_FLAGS+= WAF_BINARY=${PYTHONBIN}\ ${WRKSRC}/buildtools/bin/waf
106 106
107# for winbind option build. 107# for winbind option build.
108.if "${OPSYS}" != "Darwin" && "${OPSYS}" != "SunOS" 108.if "${OPSYS}" != "Darwin" && "${OPSYS}" != "SunOS"
109LDFLAGS+= -Wl,--allow-shlib-undefined 109LDFLAGS+= -Wl,--allow-shlib-undefined
110.endif 110.endif
111LDFLAGS+= ${BUILDLINK_LDADD.gettext} 111LDFLAGS+= ${BUILDLINK_LDADD.gettext}
112LDFLAGS+= ${COMPILER_RPATH_FLAG}${SMB_PRIVATELIB} 112LDFLAGS+= ${COMPILER_RPATH_FLAG}${SMB_PRIVATELIB}
113 113
114CFLAGS.SunOS+= -DHAVE_SOLARIS_GETGRENT_R 114CFLAGS.SunOS+= -DHAVE_SOLARIS_GETGRENT_R
115# workaround https://bugzilla.samba.org/show_bug.cgi?id=12502 for now 115# workaround https://bugzilla.samba.org/show_bug.cgi?id=12502 for now
116CFLAGS.SunOS+= -DMSG_NOSIGNAL=0 116CFLAGS.SunOS+= -DMSG_NOSIGNAL=0
117LDFLAGS.SunOS+= -lsocket -lnsl 117LDFLAGS.SunOS+= -lsocket -lnsl
118 118
119.include "options.mk" 119.include "options.mk"
120 120
121.if ${SHLIB_TYPE} == "dylib" 121.if ${SHLIB_TYPE} == "dylib"
122PLIST_SUBST+= SOEXT=dylib 122PLIST_SUBST+= SOEXT=dylib
123.else 123.else
124PLIST_SUBST+= SOEXT=so 124PLIST_SUBST+= SOEXT=so
125.endif 125.endif
126 126
127.if !defined(PWD_MKDB) 127.if !defined(PWD_MKDB)
128PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \ 128PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \
129 ${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }' 129 ${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }'
130MAKEFLAGS+= PWD_MKDB=${PWD_MKDB:Q} 130MAKEFLAGS+= PWD_MKDB=${PWD_MKDB:Q}
131.endif 131.endif
132FILES_SUBST+= MKTEMP=${MKTEMP:Q} 132FILES_SUBST+= MKTEMP=${MKTEMP:Q}
133FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q} 133FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q}
134 134
135INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} 135INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
136 136
137DOCDIR= share/doc/${PKGBASE} 137DOCDIR= share/doc/${PKGBASE}
138EGDIR= share/examples/${PKGBASE} 138EGDIR= share/examples/${PKGBASE}
139CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SMB_CONFIG}/smb.conf 139CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SMB_CONFIG}/smb.conf
140OWN_DIRS_PERMS= ${SMB_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 140OWN_DIRS_PERMS= ${SMB_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
141RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT} 141RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT}
142 142
143SUBST_CLASSES+= docbook 143SUBST_CLASSES+= docbook
144SUBST_MESSAGE.docbook= Fixing docbook URLs. 144SUBST_MESSAGE.docbook= Fixing docbook URLs.
145SUBST_FILES.docbook+= buildtools/wafsamba/wafsamba.py 145SUBST_FILES.docbook+= buildtools/wafsamba/wafsamba.py
146SUBST_FILES.docbook+= ctdb/doc/*.xml 146SUBST_FILES.docbook+= ctdb/doc/*.xml
147SUBST_FILES.docbook+= docs-xml/build/DTD/samba-doc 147SUBST_FILES.docbook+= docs-xml/build/DTD/samba-doc
148SUBST_FILES.docbook+= docs-xml/xslt/*.xsl 148SUBST_FILES.docbook+= docs-xml/xslt/*.xsl
149SUBST_FILES.docbook+= lib/ldb/docs/builddocs.sh 149SUBST_FILES.docbook+= lib/ldb/docs/builddocs.sh
150SUBST_FILES.docbook+= librpc/tools/*.xml 150SUBST_FILES.docbook+= librpc/tools/*.xml
151SUBST_FILES.docbook+= */*/man/*.xml 151SUBST_FILES.docbook+= */*/man/*.xml
152SUBST_FILES.docbook+= */*/*/man/*.xml 152SUBST_FILES.docbook+= */*/*/man/*.xml
153SUBST_STAGE.docbook= pre-configure 153SUBST_STAGE.docbook= pre-configure
154SUBST_SED.docbook= -e 's,http://www.oasis-open.org/docbook/xml,${PREFIX}/share/xml/docbook,g' 154SUBST_SED.docbook= -e 's,http://www.oasis-open.org/docbook/xml,${PREFIX}/share/xml/docbook,g'
155SUBST_SED.docbook+= -e 's,http://docbook.sourceforge.net/release/xsl/current,${PREFIX}/share/xsl/docbook,g' 155SUBST_SED.docbook+= -e 's,http://docbook.sourceforge.net/release/xsl/current,${PREFIX}/share/xsl/docbook,g'
156 156
157SUBST_CLASSES+= paths 157SUBST_CLASSES+= paths
158SUBST_MESSAGE.paths= Fixing paths. 158SUBST_MESSAGE.paths= Fixing paths.
159SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh 159SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh
160SUBST_FILES.paths+= source3/script/findsmb.in source4/heimdal_build/roken.h 160SUBST_FILES.paths+= source3/script/findsmb.in source4/heimdal_build/roken.h
161SUBST_STAGE.paths= pre-configure 161SUBST_STAGE.paths= pre-configure
162SUBST_SED.paths+= -e 's,@PERL@,${PERL5},g' 162SUBST_SED.paths+= -e 's,@PERL@,${PERL5},g'
163SUBST_VARS.paths= AWK CAT MKTEMP RM PWD_MKDB SH PERL PKG_SYSCONFBASE 163SUBST_VARS.paths= AWK CAT MKTEMP RM PWD_MKDB SH PERL PKG_SYSCONFBASE
164 164
165SUBST_CLASSES+= logpath 165SUBST_CLASSES+= logpath
166SUBST_MESSAGE.logpath= Fixing log path. 166SUBST_MESSAGE.logpath= Fixing log path.
167SUBST_FILES.logpath= examples/smb.conf.default 167SUBST_FILES.logpath= examples/smb.conf.default
168SUBST_STAGE.logpath= pre-configure 168SUBST_STAGE.logpath= pre-configure
169SUBST_SED.logpath+= -e 's,/usr/local/samba/var/log.%m,${SMB_LOGFILEBASE}/log.%m,g' 169SUBST_SED.logpath+= -e 's,/usr/local/samba/var/log.%m,${SMB_LOGFILEBASE}/log.%m,g'
170 170
171.if ${INIT_SYSTEM} == "rc.d" 
172MESSAGE_SRC= ${PKGDIR}/MESSAGE.rcd 
173.endif 
174 
175SMF_INSTANCES= smbd nmbd 171SMF_INSTANCES= smbd nmbd
176 172
177CTF_FILES_SKIP+= lib/libdcerpc-samr.so.* # empty 173CTF_FILES_SKIP+= lib/libdcerpc-samr.so.* # empty
178 174
179post-extract: 175post-extract:
180 ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR} 176 ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR}
181 177
182post-install: 178post-install:
183 ${RUN} cd ${WRKSRC}/docs-xml/registry; for f in *.reg; do \ 179 ${RUN} cd ${WRKSRC}/docs-xml/registry; for f in *.reg; do \
184 ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \ 180 ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \
185 done 181 done
186 ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh \ 182 ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh \
187 ${DESTDIR}${PREFIX}/${EGDIR}/adduser.sh 183 ${DESTDIR}${PREFIX}/${EGDIR}/adduser.sh
188 ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh \ 184 ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh \
189 ${DESTDIR}${PREFIX}/${EGDIR}/deluser.sh 185 ${DESTDIR}${PREFIX}/${EGDIR}/deluser.sh
190 ${INSTALL_DATA} ${WRKSRC}/examples/LDAP/samba.schema \ 186 ${INSTALL_DATA} ${WRKSRC}/examples/LDAP/samba.schema \
191 ${DESTDIR}${PREFIX}/${EGDIR} 187 ${DESTDIR}${PREFIX}/${EGDIR}
192 ${INSTALL_DATA} ${WRKSRC}/examples/smb.conf.default \ 188 ${INSTALL_DATA} ${WRKSRC}/examples/smb.conf.default \
193 ${DESTDIR}${PREFIX}/${EGDIR} 189 ${DESTDIR}${PREFIX}/${EGDIR}
194 190
195REPLACE_PERL+= librpc/tables.pl 191REPLACE_PERL+= librpc/tables.pl
196REPLACE_PERL+= pidl/pidl 192REPLACE_PERL+= pidl/pidl
197REPLACE_PERL+= pidl/tests/*.pl 193REPLACE_PERL+= pidl/tests/*.pl
198REPLACE_PERL+= script/*.pl 194REPLACE_PERL+= script/*.pl
199REPLACE_PERL+= script/findsmb.in 195REPLACE_PERL+= script/findsmb.in
200REPLACE_PERL+= source3/script/*.pl 196REPLACE_PERL+= source3/script/*.pl
201REPLACE_PERL+= source4/build/pasn1/pasn1.pl 197REPLACE_PERL+= source4/build/pasn1/pasn1.pl
202REPLACE_PERL+= source4/script/*.pl 198REPLACE_PERL+= source4/script/*.pl
203REPLACE_PERL+= third_party/nss_wrapper/nss_wrapper.pl 199REPLACE_PERL+= third_party/nss_wrapper/nss_wrapper.pl
204REPLACE_PYTHON+= buildtools/bin/waf 200REPLACE_PYTHON+= buildtools/bin/waf
205REPLACE_PYTHON+= source4/setup/wscript_build 201REPLACE_PYTHON+= source4/setup/wscript_build
206REPLACE_PYTHON+= source4/scripting/bin/* 202REPLACE_PYTHON+= source4/scripting/bin/*
207 203
208.if "${OPSYS}" == "Linux" 204.if "${OPSYS}" == "Linux"
209.include "../../devel/libuuid/buildlink3.mk" 205.include "../../devel/libuuid/buildlink3.mk"
210.endif 206.endif
211.include "../../archivers/libarchive/buildlink3.mk" 207.include "../../archivers/libarchive/buildlink3.mk"
212.include "../../converters/libiconv/buildlink3.mk" 208.include "../../converters/libiconv/buildlink3.mk"
213.include "../../databases/ldb/buildlink3.mk" 209.include "../../databases/ldb/buildlink3.mk"
214.include "../../devel/cmocka/buildlink3.mk" 210.include "../../devel/cmocka/buildlink3.mk"
215.include "../../devel/gettext-lib/buildlink3.mk" 211.include "../../devel/gettext-lib/buildlink3.mk"
216.include "../../devel/popt/buildlink3.mk" 212.include "../../devel/popt/buildlink3.mk"
217.include "../../devel/readline/buildlink3.mk" 213.include "../../devel/readline/buildlink3.mk"
218BUILDLINK_API_DEPENDS.talloc+= talloc>=2.1.9 214BUILDLINK_API_DEPENDS.talloc+= talloc>=2.1.9
219.include "../../devel/talloc/buildlink3.mk" 215.include "../../devel/talloc/buildlink3.mk"
220.include "../../devel/tevent/buildlink3.mk" 216.include "../../devel/tevent/buildlink3.mk"
221.include "../../devel/zlib/buildlink3.mk" 217.include "../../devel/zlib/buildlink3.mk"
222.include "../../lang/python/application.mk" 218.include "../../lang/python/application.mk"
223.include "../../lang/python/extension.mk" 219.include "../../lang/python/extension.mk"
224.include "../../security/gnutls/buildlink3.mk" 220.include "../../security/gnutls/buildlink3.mk"
225.include "../../security/libgcrypt/buildlink3.mk" 221.include "../../security/libgcrypt/buildlink3.mk"
226.include "../../textproc/jansson/buildlink3.mk" 222.include "../../textproc/jansson/buildlink3.mk"
227.include "../../mk/bsd.pkg.mk" 223.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.29 pkgsrc/net/tinc/Makefile (switch to unified diff)

--- pkgsrc/net/tinc/Makefile 2018/09/30 15:55:25 1.28
+++ pkgsrc/net/tinc/Makefile 2019/05/28 13:35:54 1.29
@@ -1,67 +1,61 @@ @@ -1,67 +1,61 @@
1# $NetBSD: Makefile,v 1.28 2018/09/30 15:55:25 jperkin Exp $ 1# $NetBSD: Makefile,v 1.29 2019/05/28 13:35:54 jperkin Exp $
2 2
3DISTNAME= tinc-1.0.32 3DISTNAME= tinc-1.0.32
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= http://www.tinc-vpn.org/packages/ 6MASTER_SITES= http://www.tinc-vpn.org/packages/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.tinc-vpn.org/ 9HOMEPAGE= http://www.tinc-vpn.org/
10COMMENT= Virtual Private Network (VPN) daemon 10COMMENT= Virtual Private Network (VPN) daemon
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13BUILD_DEFS+= VARBASE 13BUILD_DEFS+= VARBASE
14 14
15INFO_FILES= yes 15INFO_FILES= yes
16USE_TOOLS+= msgfmt 16USE_TOOLS+= msgfmt
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18 18
19SUBST_CLASSES+= mdoc 19SUBST_CLASSES+= mdoc
20SUBST_FILES.mdoc= doc/tinc.conf.5.in 20SUBST_FILES.mdoc= doc/tinc.conf.5.in
21SUBST_SED.mdoc+= -e '/^$$/d' 21SUBST_SED.mdoc+= -e '/^$$/d'
22SUBST_STAGE.mdoc= pre-configure 22SUBST_STAGE.mdoc= pre-configure
23 23
24EGDIR= ${PREFIX}/share/examples/tinc 24EGDIR= ${PREFIX}/share/examples/tinc
25TINC_USER?= tinc 25TINC_USER?= tinc
26TINC_GROUP?= tinc 26TINC_GROUP?= tinc
27 27
28PKG_GROUPS_VARS+= TINC_GROUP 28PKG_GROUPS_VARS+= TINC_GROUP
29PKG_USERS_VARS+= TINC_USER 29PKG_USERS_VARS+= TINC_USER
30 30
31PKG_GROUPS= ${TINC_GROUP} 31PKG_GROUPS= ${TINC_GROUP}
32PKG_USERS= ${TINC_USER}:${TINC_GROUP} 32PKG_USERS= ${TINC_USER}:${TINC_GROUP}
33PKG_SHELL.${TINC_USER}= ${SH} 33PKG_SHELL.${TINC_USER}= ${SH}
34 34
35OWN_DIRS+= ${VARBASE}/log/tinc 35OWN_DIRS+= ${VARBASE}/log/tinc
36MAKE_DIRS+= ${PKG_SYSCONFDIR}/default 36MAKE_DIRS+= ${PKG_SYSCONFDIR}/default
37 37
38INSTALLATION_DIRS= share/examples/tinc 38INSTALLATION_DIRS= share/examples/tinc
39 39
40PKG_SYSCONFSUBDIR= tinc 40PKG_SYSCONFSUBDIR= tinc
41 41
42CONF_FILES_PERMS+= ${EGDIR}/tinc.conf ${PKG_SYSCONFDIR}/default/tinc.conf \ 42CONF_FILES_PERMS+= ${EGDIR}/tinc.conf ${PKG_SYSCONFDIR}/default/tinc.conf \
43 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644 43 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644
44CONF_FILES_PERMS+= ${EGDIR}/tinc-up ${PKG_SYSCONFDIR}/default/tinc-up \ 44CONF_FILES_PERMS+= ${EGDIR}/tinc-up ${PKG_SYSCONFDIR}/default/tinc-up \
45 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 45 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
46CONF_FILES_PERMS+= ${EGDIR}/tinc-down ${PKG_SYSCONFDIR}/default/tinc-down \ 46CONF_FILES_PERMS+= ${EGDIR}/tinc-down ${PKG_SYSCONFDIR}/default/tinc-down \
47 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 47 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
48 48
49.include "../../mk/bsd.prefs.mk" 
50 
51.if ${INIT_SYSTEM} == "smf" 
52SMF_METHODS= tinc 49SMF_METHODS= tinc
53MESSAGE_SRC+= MESSAGE.smf 
54MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} 
55.endif 
56 50
57post-install: 51post-install:
58 ${INSTALL_DATA} ${FILESDIR}/tinc.conf ${DESTDIR}${EGDIR} 52 ${INSTALL_DATA} ${FILESDIR}/tinc.conf ${DESTDIR}${EGDIR}
59 ${INSTALL_DATA} ${FILESDIR}/tinc-up ${DESTDIR}${EGDIR} 53 ${INSTALL_DATA} ${FILESDIR}/tinc-up ${DESTDIR}${EGDIR}
60 ${INSTALL_DATA} ${FILESDIR}/tinc-down ${DESTDIR}${EGDIR} 54 ${INSTALL_DATA} ${FILESDIR}/tinc-down ${DESTDIR}${EGDIR}
61 55
62.include "../../archivers/lzo/buildlink3.mk" 56.include "../../archivers/lzo/buildlink3.mk"
63.include "../../converters/libiconv/buildlink3.mk" 57.include "../../converters/libiconv/buildlink3.mk"
64.include "../../devel/gettext-lib/buildlink3.mk" 58.include "../../devel/gettext-lib/buildlink3.mk"
65.include "../../devel/zlib/buildlink3.mk" 59.include "../../devel/zlib/buildlink3.mk"
66.include "../../security/openssl/buildlink3.mk" 60.include "../../security/openssl/buildlink3.mk"
67.include "../../mk/bsd.pkg.mk" 61.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/security/spiped/Makefile (switch to unified diff)

--- pkgsrc/security/spiped/Makefile 2016/03/05 11:29:26 1.16
+++ pkgsrc/security/spiped/Makefile 2019/05/28 13:35:54 1.17
@@ -1,43 +1,36 @@ @@ -1,43 +1,36 @@
1# $NetBSD: Makefile,v 1.16 2016/03/05 11:29:26 jperkin Exp $ 1# $NetBSD: Makefile,v 1.17 2019/05/28 13:35:54 jperkin Exp $
2 2
3DISTNAME= spiped-1.5.0 3DISTNAME= spiped-1.5.0
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= net security 5CATEGORIES= net security
6MASTER_SITES= http://www.tarsnap.com/spiped/ 6MASTER_SITES= http://www.tarsnap.com/spiped/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.tarsnap.com/spiped/ 10HOMEPAGE= http://www.tarsnap.com/spiped/
11COMMENT= Tool for creating symmetrically encrypted and authenticated pipes 11COMMENT= Tool for creating symmetrically encrypted and authenticated pipes
12LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
13USE_LANGUAGES= c99 13USE_LANGUAGES= c99
14 14
15MAKE_FLAGS+= BINDIR=${DESTDIR}${PREFIX}/bin 15MAKE_FLAGS+= BINDIR=${DESTDIR}${PREFIX}/bin
16MAKE_FLAGS+= MAN1DIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 16MAKE_FLAGS+= MAN1DIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
17 17
18LDADD_EXTRA= ${COMPILER_RPATH_FLAG:Q}${BUILDLINK_PREFIX.openssl}/lib 18LDADD_EXTRA= ${COMPILER_RPATH_FLAG:Q}${BUILDLINK_PREFIX.openssl}/lib
19LDADD_EXTRA+= -L${BUILDLINK_PREFIX.openssl}/lib 19LDADD_EXTRA+= -L${BUILDLINK_PREFIX.openssl}/lib
20 20
21OPSYSVARS+= LDADD_EXTRA 21OPSYSVARS+= LDADD_EXTRA
22LDADD_EXTRA.SunOS+= -lsocket -lnsl 22LDADD_EXTRA.SunOS+= -lsocket -lnsl
23 23
24CFLAGS.SunOS+= -D__EXTENSIONS__ 24CFLAGS.SunOS+= -D__EXTENSIONS__
25 25
26SMF_METHODS= spiped 26SMF_METHODS= spiped
27 27
28MAKE_ENV+= LDADD_EXTRA="${LDADD_EXTRA}" 28MAKE_ENV+= LDADD_EXTRA="${LDADD_EXTRA}"
29 29
30INSTALLATION_DIRS+= share/doc/spiped ${PKGMANDIR}/man1 30INSTALLATION_DIRS+= share/doc/spiped ${PKGMANDIR}/man1
31 31
32.include "../../mk/bsd.prefs.mk" 
33 
34.if ${INIT_SYSTEM} == "smf" 
35MESSAGE_SRC+= MESSAGE.smf 
36MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} 
37.endif 
38 
39post-install: 32post-install:
40 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/spiped 33 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/spiped
41 34
42.include "../../security/openssl/buildlink3.mk" 35.include "../../security/openssl/buildlink3.mk"
43.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"