diff options
| author | Pedro F. Giffuni <pfg@FreeBSD.org> | 2017-01-30 16:32:53 +0000 |
|---|---|---|
| committer | Pedro F. Giffuni <pfg@FreeBSD.org> | 2017-01-30 16:32:53 +0000 |
| commit | 87b2cfcecfa519b11313951f10e6a4076d9f595a (patch) | |
| tree | b1fc30bbd319236ca46ac800f1a7fce4a84d6d1a /sbin | |
| parent | 826b3d3187187756fb5151d2d067244daf1a5e40 (diff) | |
| parent | ace5731aabbd00dd686dcf91ceff8f1be5ba0343 (diff) | |
| download | src-87b2cfcecfa519b11313951f10e6a4076d9f595a.tar.gz src-87b2cfcecfa519b11313951f10e6a4076d9f595a.zip | |
MFV r312970:
openresolv: update to version 3.9.0.
It is now possible to drop the _WITH_ARG vars thanks to a change to the
pdns_recursor upstreamed by Guy Yur.
MFC after: 3 weeks
Notes
Notes:
svn path=/head/; revision=312992
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/resolvconf/Makefile | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sbin/resolvconf/Makefile b/sbin/resolvconf/Makefile index 355d72f0c8ac..e1428208d6b1 100644 --- a/sbin/resolvconf/Makefile +++ b/sbin/resolvconf/Makefile @@ -20,20 +20,16 @@ SBINDIR= /sbin # We don't assume to restart the services in /sbin. So, though # our service(8) is in /usr/sbin, we can use it, here. -CMD1_WITH_ARG= \1 onestatus >/dev/null 2>\&1 -CMD2_WITH_ARG= \1 restart -RESTARTCMD_WITH_ARG= /usr/sbin/service ${CMD1_WITH_ARG} \&\& /usr/sbin/service ${CMD2_WITH_ARG} -CMD1= \\$$1 onestatus >/dev/null 2>\&1 -CMD2= \\$$1 restart -RESTARTCMD= "/usr/sbin/service ${CMD1} \&\& /usr/sbin/service ${CMD2}" +CMD1= \1 onestatus >/dev/null 2>\&1 +CMD2= \1 restart +RESTARTCMD= /usr/sbin/service ${CMD1} \&\& /usr/sbin/service ${CMD2} .for f in ${SCRIPTS} ${FILES} ${MAN} ${f}: ${f}.in sed -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' \ -e 's:@LIBEXECDIR@:${FILESDIR}:g' \ -e 's:@VARDIR@:${VARDIR}:g' \ - -e 's:@RESTARTCMD \(.*\)@:${RESTARTCMD_WITH_ARG}:g' \ - -e 's:@RESTARTCMD@:${RESTARTCMD}:g' \ + -e 's:@RESTARTCMD \(.*\)@:${RESTARTCMD}:g' \ -e 's:@RCDIR@:${RCDIR}:g' \ -e 's:@SBINDIR@:${SBINDIR}:g' \ -e 's: vpn : ng[0-9]*&:g' \ |