pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Remove unnecessary RCD_SCRIPT_WRK.<script> definitions.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ca57efc08c64
branches:  trunk
changeset: 362654:ca57efc08c64
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun May 21 06:49:09 2017 +0000

description:
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.

diffstat:

 net/openvmps/Makefile     |  4 +---
 net/rinetd/Makefile       |  3 +--
 security/isakmpd/Makefile |  4 +---
 3 files changed, 3 insertions(+), 8 deletions(-)

diffs (54 lines):

diff -r 04930ecb0f34 -r ca57efc08c64 net/openvmps/Makefile
--- a/net/openvmps/Makefile     Sun May 21 06:45:39 2017 +0000
+++ b/net/openvmps/Makefile     Sun May 21 06:49:09 2017 +0000
@@ -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 @@
 
 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"
diff -r 04930ecb0f34 -r ca57efc08c64 net/rinetd/Makefile
--- a/net/rinetd/Makefile       Sun May 21 06:45:39 2017 +0000
+++ b/net/rinetd/Makefile       Sun May 21 06:49:09 2017 +0000
@@ -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 @@
 INSTALLATION_DIRS=     sbin ${PKGMANDIR}/man8
 
 RCD_SCRIPTS=           rinetd
-RCD_SCRIPT_WRK.rinetd= ${WRKDIR}/rinetd.sh
 
 SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     rinetd.8
diff -r 04930ecb0f34 -r ca57efc08c64 security/isakmpd/Makefile
--- a/security/isakmpd/Makefile Sun May 21 06:45:39 2017 +0000
+++ b/security/isakmpd/Makefile Sun May 21 06:49:09 2017 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index