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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -158,30 +158,26 @@ SUBST_CLASSES+= paths @@ -158,30 +158,26 @@ SUBST_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
cvs diff -r1.28 -r1.29 pkgsrc/net/tinc/Makefile (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -36,32 +36,26 @@ OWN_DIRS+= ${VARBASE}/log/tinc @@ -36,32 +36,26 @@ OWN_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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -19,25 +19,18 @@ LDADD_EXTRA= ${COMPILER_RPATH_FLAG:Q}${B @@ -19,25 +19,18 @@ LDADD_EXTRA= ${COMPILER_RPATH_FLAG:Q}${B
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"