CVS commit: pkgsrc

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue May 28 13:35:54 UTC 2019

Modified Files:
        pkgsrc/net/samba4: Makefile
        pkgsrc/net/tinc: Makefile
        pkgsrc/security/spiped: Makefile

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/net/tinc/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/spiped/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/samba4/Makefile
diff -u pkgsrc/net/samba4/Makefile:1.68 pkgsrc/net/samba4/Makefile:1.69
--- pkgsrc/net/samba4/Makefile:1.68     Wed May 22 19:57:12 2019
+++ pkgsrc/net/samba4/Makefile  Tue May 28 13:35:54 2019
@@ -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_FILES.logpath=       examples/smb.conf.d
 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

Index: pkgsrc/net/tinc/Makefile
diff -u pkgsrc/net/tinc/Makefile:1.28 pkgsrc/net/tinc/Makefile:1.29
--- pkgsrc/net/tinc/Makefile:1.28       Sun Sep 30 15:55:25 2018
+++ pkgsrc/net/tinc/Makefile    Tue May 28 13:35:54 2019
@@ -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-up ${PK
 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}

Index: pkgsrc/security/spiped/Makefile
diff -u pkgsrc/security/spiped/Makefile:1.16 pkgsrc/security/spiped/Makefile:1.17
--- pkgsrc/security/spiped/Makefile:1.16        Sat Mar  5 11:29:26 2016
+++ pkgsrc/security/spiped/Makefile     Tue May 28 13:35:54 2019
@@ -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 @@ 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