pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc *: Remove per-package MESSAGE.{rcd, smf} handling.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d410a667d605
branches:  trunk
changeset: 396322:d410a667d605
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue May 28 13:35:54 2019 +0000

description:
*: Remove per-package MESSAGE.{rcd,smf} handling.

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

diffstat:

 net/samba4/Makefile      |  6 +-----
 net/tinc/Makefile        |  8 +-------
 security/spiped/Makefile |  9 +--------
 3 files changed, 3 insertions(+), 20 deletions(-)

diffs (66 lines):

diff -r a6b2b2c8c4f2 -r d410a667d605 net/samba4/Makefile
--- a/net/samba4/Makefile       Tue May 28 13:32:06 2019 +0000
+++ b/net/samba4/Makefile       Tue May 28 13:35:54 2019 +0000
@@ -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
@@ -168,10 +168,6 @@
 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
 
 CTF_FILES_SKIP+=       lib/libdcerpc-samr.so.* # empty
diff -r a6b2b2c8c4f2 -r d410a667d605 net/tinc/Makefile
--- a/net/tinc/Makefile Tue May 28 13:32:06 2019 +0000
+++ b/net/tinc/Makefile Tue May 28 13:35:54 2019 +0000
@@ -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}
diff -r a6b2b2c8c4f2 -r d410a667d605 security/spiped/Makefile
--- a/security/spiped/Makefile  Tue May 28 13:32:06 2019 +0000
+++ b/security/spiped/Makefile  Tue May 28 13:35:54 2019 +0000
@@ -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
@@ -29,13 +29,6 @@
 
 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
 



Home | Main Index | Thread Index | Old Index