[src/trunk]: src/external/bsd/openresolv/sbin/resolvconf Fix build for operes...

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a1fdd2cd531d
branches:  trunk
changeset: 814830:a1fdd2cd531d
user:      roy <roy%NetBSD.org@localhost>
date:      Mon Apr 11 10:43:24 2016 +0000

description:
Fix build for operesolv-3.8.0

diffstat:

 external/bsd/openresolv/sbin/resolvconf/Makefile |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r 4f75a7b777f8 -r a1fdd2cd531d external/bsd/openresolv/sbin/resolvconf/Makefile
--- a/external/bsd/openresolv/sbin/resolvconf/Makefile  Mon Apr 11 10:41:51 2016 +0000
+++ b/external/bsd/openresolv/sbin/resolvconf/Makefile  Mon Apr 11 10:43:24 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/07/12 17:32:47 roy Exp $
+# $NetBSD: Makefile,v 1.7 2016/04/11 10:43:24 roy Exp $
 #
 
 .include <bsd.own.mk>
@@ -20,9 +20,6 @@
 
 CLEANFILES=    ${SCRIPTS} ${FILES} ${MAN}
 
-CMD1=          \1 status >/dev/null 2>\&1
-CMD2=          \1 restart
-RESTARTCMD=    if /etc/rc.d/${CMD1}; then /etc/rc.d/${CMD2}; fi
 .for f in ${SCRIPTS} ${FILES} ${MAN}
 ${f}:  Makefile ${f}.in
        ${TOOL_SED} -e 's:@PREFIX@::g' \
@@ -31,7 +28,8 @@
                -e 's:@SYSCONFDIR@:/etc:g' \
                -e 's:@LIBEXECDIR@:/libexec/resolvconf:g' \
                -e 's:@VARDIR@:/var/run/resolvconf:g' \
-               -e 's:@RESTARTCMD \(.*\)@:${RESTARTCMD}:g' \
+               -e 's:@RESTARTCMD@::g' \
+               -e 's:@STATUSARG@::g' \
                ${DIST}/${f}.in > $@
 .endfor