Module Name:    src
Committed By:   roy
Date:           Wed Jan 15 20:58:53 UTC 2014

Modified Files:
        src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile

Log Message:
Don't enforce rc.d usage in the default build.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.17 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.18
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.17	Fri Jan  3 22:27:31 2014
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile	Wed Jan 15 20:58:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/01/03 22:27:31 roy Exp $
+# $NetBSD: Makefile,v 1.18 2014/01/15 20:58:53 roy Exp $
 #
 
 PROG=		dhcpcd
@@ -40,18 +40,15 @@ MAN=			dhcpcd.conf.5 dhcpcd.8 dhcpcd-run
 CLEANFILES=		dhcpcd.conf.5 dhcpcd.8 \
 			dhcpcd-run-hooks dhcpcd-run-hooks.8
 
-SERVICEEXISTS=		[ -x /etc/rc.d/$$1 ]
-SERVICECMD=		/etc/rc.d/$$1 $$2
-SERVICESTATUS=		service_command $$1 status >/dev/null 2>\&1
 .for f in dhcpcd-run-hooks dhcpcd.conf.5 dhcpcd.8 dhcpcd-run-hooks.8
 ${f}:	${f}.in
 	${TOOL_SED} -e 's:@SYSCONFDIR@:/etc:g' -e 's:@DBDIR@:/var/db:g' \
 	    -e 's:@LIBDIR@:/lib:g' \
 	    -e 's:@HOOKDIR@:/libexec/dhcpcd-hooks:g' \
 	    -e 's:@SCRIPT@:/libexec/dhcpcd-run-hooks:g' \
-	    -e 's:@SERVICEEXISTS@:[ -x /etc/rc.d/$$1 ]:g' \
-	    -e 's:@SERVICECMD@:/etc/rc.d/$$1 $$2:g' \
-	    -e 's:@SERVICESTATUS@:service_command $$1 status >/dev/null 2>\&1:g' \
+	    -e 's:@SERVICEEXISTS@::g' \
+	    -e 's:@SERVICECMD@::g' \
+	    -e 's:@SERVICESTATUS@::g' \
 	    ${DIST}/${f}.in > $@
 .endfor
 

Reply via email to