CVS commit: pkgsrc

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Sun May 21 06:49:09 UTC 2017

Modified Files:
        pkgsrc/net/openvmps: Makefile
        pkgsrc/net/rinetd: Makefile
        pkgsrc/security/isakmpd: Makefile

Log Message:
Remove unnecessary RCD_SCRIPT_WRK.<script> definitions.

RCD_SCRIPT_WRK.<script> was set previously to prevent a name conflict
with ${WRKSRC} because in the past, it defaulted to ${WRKDIR}/<script>.
This has since been changed to default to ${WRKDIR}/.rc.d/<script> to
prevent unintended name collisions, which makes this definition no longer
needed.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/openvmps/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/rinetd/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/security/isakmpd/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/openvmps/Makefile
diff -u pkgsrc/net/openvmps/Makefile:1.7 pkgsrc/net/openvmps/Makefile:1.8
--- pkgsrc/net/openvmps/Makefile:1.7    Tue Oct 23 17:18:44 2012
+++ pkgsrc/net/openvmps/Makefile        Sun May 21 06:49:09 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/23 17:18:44 asau Exp $
+# $NetBSD: Makefile,v 1.8 2017/05/21 06:49:09 jlam Exp $
 
 DISTNAME=      vmpsd-1.3
 PKGNAME=       openvmps-1.3
@@ -16,8 +16,6 @@ GNU_CONFIGURE=        YES
 
 EGDIR=         ${PREFIX}/share/examples/openvmps
 RCD_SCRIPTS=   vmpsd
-RCD_SCRIPT_WRK.vmpsd= ${WRKDIR}/vmpsd.rcd #conflict with ${WRKSRC}
-
 CONF_FILES=    ${EGDIR}/vlan.db ${PKG_SYSCONFDIR}/vlan.db
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/rinetd/Makefile
diff -u pkgsrc/net/rinetd/Makefile:1.16 pkgsrc/net/rinetd/Makefile:1.17
--- pkgsrc/net/rinetd/Makefile:1.16     Tue Dec 22 10:09:15 2015
+++ pkgsrc/net/rinetd/Makefile  Sun May 21 06:49:09 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2015/12/22 10:09:15 sborrill Exp $
+# $NetBSD: Makefile,v 1.17 2017/05/21 06:49:09 jlam Exp $
 #
 
 DISTNAME=              rinetd
@@ -19,7 +19,6 @@ CPPFLAGS+=            -DRINETD_CONF="\"${PKG_SYSCO
 INSTALLATION_DIRS=     sbin ${PKGMANDIR}/man8
 
 RCD_SCRIPTS=           rinetd
-RCD_SCRIPT_WRK.rinetd= ${WRKDIR}/rinetd.sh
 
 SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     rinetd.8

Index: pkgsrc/security/isakmpd/Makefile
diff -u pkgsrc/security/isakmpd/Makefile:1.52 pkgsrc/security/isakmpd/Makefile:1.53
--- pkgsrc/security/isakmpd/Makefile:1.52       Tue Apr 12 08:08:46 2016
+++ pkgsrc/security/isakmpd/Makefile    Sun May 21 06:49:09 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2016/04/12 08:08:46 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2017/05/21 06:49:09 jlam Exp $
 
 DISTNAME=              isakmpd-20030903
 PKGREVISION=           10
@@ -25,9 +25,7 @@ BUILD_TARGET=         depend all
 MAKE_ENV+=             BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/${PKGMANDIR}
 
 PKG_SYSCONFSUBDIR=     isakmpd
-
 RCD_SCRIPTS=           isakmpd
-RCD_SCRIPT_WRK.isakmpd=        ${WRKDIR}/isakmpd.sh
 
 SUBST_CLASSES+=                ssl
 SUBST_STAGE.ssl=       pre-configure