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
--- 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,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2019/05/22 19:57:12 adam Exp $
+# $NetBSD: Makefile,v 1.69 2019/05/28 13:35:54 jperkin Exp $
DISTNAME= samba-4.10.4
CATEGORIES= net
@@ -167,10 +167,6 @@
SUBST_FILES.logpath= examples/smb.conf.default
SUBST_STAGE.logpath= pre-configure
SUBST_SED.logpath+= -e 's,/usr/local/samba/var/log.%m,${SMB_LOGFILEBASE}/log.%m,g'
-
-.if ${INIT_SYSTEM} == "rc.d"
-MESSAGE_SRC= ${PKGDIR}/MESSAGE.rcd
-.endif
SMF_INSTANCES= smbd nmbd
--- 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,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2018/09/30 15:55:25 jperkin Exp $
+# $NetBSD: Makefile,v 1.29 2019/05/28 13:35:54 jperkin Exp $
DISTNAME= tinc-1.0.32
PKGREVISION= 1
@@ -46,13 +46,7 @@
CONF_FILES_PERMS+= ${EGDIR}/tinc-down ${PKG_SYSCONFDIR}/default/tinc-down \
${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
-.include "../../mk/bsd.prefs.mk"
-
-.if ${INIT_SYSTEM} == "smf"
SMF_METHODS= tinc
-MESSAGE_SRC+= MESSAGE.smf
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-.endif
post-install:
${INSTALL_DATA} ${FILESDIR}/tinc.conf ${DESTDIR}${EGDIR}
--- 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,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/03/05 11:29:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2019/05/28 13:35:54 jperkin Exp $
DISTNAME= spiped-1.5.0
PKGREVISION= 1
@@ -28,13 +28,6 @@
MAKE_ENV+= LDADD_EXTRA="${LDADD_EXTRA}"
INSTALLATION_DIRS+= share/doc/spiped ${PKGMANDIR}/man1
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${INIT_SYSTEM} == "smf"
-MESSAGE_SRC+= MESSAGE.smf
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-.endif
post-install:
${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/spiped