Fix rc.d handling.

4 files changed, 25 insertions, 5 deletions

diff --git a/security/zoneminder/Makefile b/security/zoneminder/Makefile
index e3f62f73531..14176885806 100644
--- a/security/zoneminder/Makefile
+++ b/security/zoneminder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/04/10 05:39:17 obache Exp $
+# $NetBSD: Makefile,v 1.9 2014/05/06 15:07:40 jperkin Exp $
 #
 
 DISTNAME=	ZoneMinder-1.25.0
@@ -145,6 +145,12 @@ SUBST_SED.files=	-e "s|@ZM_HTTPD_ROOT@|${PREFIX}/${ZM_HTTPD_ROOT}|g"
 SUBST_SED.files+=	-e "s|@ZM_HTTPD_CGIBIN@|${PREFIX}/${ZM_HTTPD_CGIBIN}|g"
 SUBST_MESSAGE.files=	Fixing ZoneMinder configuration file for Apache.
 
+PLIST_VARS+=		rcd
+
+.if ${INIT_SYSTEM} == "rc.d"
+PLIST.rcd=		yes
+.endif
+
 post-extract:
 	${CP} ${FILESDIR}/zoneminder.conf ${WRKSRC}/zoneminder.conf
 
@@ -171,7 +177,9 @@ INSTALLATION_DIRS+=	bin share/examples/rc.d share/zoneminder/db
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/zoneminder.conf ${DESTDIR}${PREFIX}/${EGDIR}/apache/zoneminder.conf
 	${INSTALL_DATA} ${WRKSRC}/zm.conf ${DESTDIR}${PREFIX}/${EGDIR}/config/zm.conf
+.if ${INIT_SYSTEM} == "rc.d"
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/zm ${DESTDIR}${PREFIX}/share/examples/rc.d/zoneminder
+.endif
 	${INSTALL_DATA} ${WRKSRC}/db/*.sql ${DESTDIR}${PREFIX}/share/zoneminder/db/
 	rmdir ${DESTDIR}${PREFIX}/${ZM_HTTPD_ROOT:Q}/events || true
 	rmdir ${DESTDIR}${PREFIX}/${ZM_HTTPD_ROOT:Q}/images || true
diff --git a/security/zoneminder/PLIST b/security/zoneminder/PLIST
index 8026c648aac..1158b2c70e6 100644
--- a/security/zoneminder/PLIST
+++ b/security/zoneminder/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/03/11 14:05:14 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/05/06 15:07:40 jperkin Exp $
 bin/zma
 bin/zmaudit.pl
 bin/zmc
@@ -18,6 +18,7 @@ bin/zmwatch.pl
 bin/zmx10.pl
 ${ZM_HTTPD_CGIBIN}/nph-zms
 ${ZM_HTTPD_CGIBIN}/zms
+${PLIST.rcd}share/examples/rc.d/zoneminder
 share/examples/zoneminder/apache/zoneminder.conf
 share/examples/zoneminder/config/zm.conf
 share/zoneminder/db/zm_create.sql
diff --git a/sysutils/pluged/Makefile b/sysutils/pluged/Makefile
index 8e814b89134..57e875c06df 100644
--- a/sysutils/pluged/Makefile
+++ b/sysutils/pluged/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/10/23 19:51:20 asau Exp $
+# $NetBSD: Makefile,v 1.3 2014/05/06 15:10:13 jperkin Exp $
 #
 
 PKGNAME=	pluged-0.1
@@ -18,12 +18,22 @@ EGDIR=		${PREFIX}/share/examples/pluged
 RCDDIR=		${PREFIX}/share/examples/rc.d
 CONF_FILES+=	${EGDIR}/pluged.conf ${PREFIX}/etc/pluged.conf
 
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS+=	rcd
+
+.if ${INIT_SYSTEM} == "rc.d"
+PLIST.rcd=	yes
+.endif
+
 do-install:
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}/${PREFIX}/sbin
 	${INSTALL_DATA_DIR} ${DESTDIR}/${EGDIR}
-	${INSTALL_DATA_DIR} ${DESTDIR}/${RCDDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/pluged ${DESTDIR}/${PREFIX}/sbin/pluged
 	${INSTALL_DATA} ${WRKSRC}/pluged.conf ${DESTDIR}/${EGDIR}/pluged.conf
+.if ${INIT_SYSTEM} == "rc.d"
+	${INSTALL_DATA_DIR} ${DESTDIR}/${RCDDIR}
 	${INSTALL_DATA} ${WRKSRC}/rc.d/pluged ${DESTDIR}/${RCDDIR}/pluged
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/pluged/PLIST b/sysutils/pluged/PLIST
index 7bca0541793..9245ece4776 100644
--- a/sysutils/pluged/PLIST
+++ b/sysutils/pluged/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/03/11 14:05:16 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/05/06 15:10:13 jperkin Exp $
 sbin/pluged
 share/examples/pluged/pluged.conf
+${PLIST.rcd}share/examples/rc.d/pluged