From 42477944dbbf76d0ed747e0a2c920c63f2895ecd Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sun, 21 May 2017 06:49:09 +0000
Subject: [PATCH] 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.
---
 net/openvmps/Makefile     | 4 +---
 net/rinetd/Makefile       | 3 +--
 security/isakmpd/Makefile | 4 +---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/net/openvmps/Makefile b/net/openvmps/Makefile
index f263376bbe46..b1503094e283 100644
--- a/net/openvmps/Makefile
+++ b/net/openvmps/Makefile
@@ -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"
diff --git a/net/rinetd/Makefile b/net/rinetd/Makefile
index 07b7c920b9cf..b9355d878052 100644
--- a/net/rinetd/Makefile
+++ b/net/rinetd/Makefile
@@ -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_SYSCONFDIR}/rinetd.conf\""
 INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8
 
 RCD_SCRIPTS=		rinetd
-RCD_SCRIPT_WRK.rinetd=	${WRKDIR}/rinetd.sh
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	rinetd.8
diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index 2c0c91121031..d5f174be78cb 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -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