[pkgsrc/trunk]: pkgsrc/pkgtools/rc.subr This appears to work on Darwin as wel...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/95ca3772b3bd
branches:  trunk
changeset: 478895:95ca3772b3bd
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sun Aug 01 08:56:10 2004 +0000

description:
This appears to work on Darwin as well. Respect RCD_SCRIPTS_DIR.

diffstat:

 pkgtools/rc.subr/Makefile |  16 +++++++++-------
 pkgtools/rc.subr/PLIST    |  12 ++++++------
 2 files changed, 15 insertions(+), 13 deletions(-)

diffs (63 lines):

diff -r 2f17f5296ac9 -r 95ca3772b3bd pkgtools/rc.subr/Makefile
--- a/pkgtools/rc.subr/Makefile Sun Aug 01 08:36:34 2004 +0000
+++ b/pkgtools/rc.subr/Makefile Sun Aug 01 08:56:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/06 20:40:35 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/08/01 08:56:10 schmonz Exp $
 #
 
 DISTNAME=              rc.subr-20030706
@@ -10,7 +10,7 @@
 HOMEPAGE=              http://www.NetBSD.org/
 COMMENT=               Portable NetBSD rc.subr implementation for pkgsrc
 
-ONLY_FOR_PLATFORM=     Linux-*-* SunOS-*-*
+ONLY_FOR_PLATFORM=     Darwin-*-* Linux-*-* SunOS-*-*
 
 NO_BUILD=              # defined
 NO_CHECKSUM=           # defined
@@ -18,19 +18,21 @@
 NO_MTREE=              # defined
 USE_PKGINSTALL=                YES
 
+PLIST_SUBST+=          RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR:S/^\///}
+
 CONF_FILES+=           ${PREFIX}etc/rc.conf.example ${PREFIX}etc/rc.conf
 
 do-extract:
        @${CP} -Rp ${FILESDIR} ${WRKSRC}
 
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}etc/rc.d
+       ${INSTALL_DATA_DIR} ${RCD_SCRIPTS_DIR}
        ${INSTALL_DATA} ${WRKSRC}/rc.conf.example ${PREFIX}etc/rc.conf.example
        ${INSTALL_DATA} ${WRKSRC}/rc.subr ${PREFIX}etc/rc.subr
-       ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/DAEMON ${PREFIX}etc/rc.d
-       ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/LOGIN ${PREFIX}etc/rc.d
-       ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/NETWORKING ${PREFIX}etc/rc.d
-       ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/SERVERS ${PREFIX}etc/rc.d
+       ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/DAEMON ${RCD_SCRIPTS_DIR}
+       ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/LOGIN ${RCD_SCRIPTS_DIR}
+       ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/NETWORKING ${RCD_SCRIPTS_DIR}
+       ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/SERVERS ${RCD_SCRIPTS_DIR}
 
 .include "../../mk/bsd.pkg.mk"
 
diff -r 2f17f5296ac9 -r 95ca3772b3bd pkgtools/rc.subr/PLIST
--- a/pkgtools/rc.subr/PLIST    Sun Aug 01 08:36:34 2004 +0000
+++ b/pkgtools/rc.subr/PLIST    Sun Aug 01 08:56:10 2004 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2003/06/23 07:02:16 grant Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/08/01 08:56:10 schmonz Exp $
 etc/rc.conf.example
 etc/rc.subr
-etc/rc.d/DAEMON
-etc/rc.d/LOGIN
-etc/rc.d/NETWORKING
-etc/rc.d/SERVERS
-@unexec ${RMDIR} %Detc/rc.d 2> /dev/null || ${TRUE}
+${RCD_SCRIPTS_DIR}/DAEMON
+${RCD_SCRIPTS_DIR}/LOGIN
+${RCD_SCRIPTS_DIR}/NETWORKING
+${RCD_SCRIPTS_DIR}/SERVERS
+@unexec ${RMDIR} ${RCD_SCRIPTS_DIR} 2> /dev/null || ${TRUE}