head	1.2;
access;
symbols
	RELENG_9_1_0_RELEASE:1.1.2.1.4.2
	RELENG_9_1:1.1.2.1.0.4
	RELENG_9_1_BP:1.1.2.1
	RELENG_9_0_0_RELEASE:1.1.2.1.2.1
	RELENG_9_0:1.1.2.1.0.2
	RELENG_9_0_BP:1.1.2.1
	RELENG_9:1.1.0.2
	RELENG_9_BP:1.1;
locks; strict;
comment	@# @;


1.2
date	2012.11.17.01.50.25;	author svnexp;	state Exp;
branches;
next	1.1;

1.1
date	2011.03.18.12.18.52;	author ume;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.1.2.1.2.1
	1.1.2.1.4.1;
next	1.1.2.2;

1.1.2.2
date	2012.11.17.11.36.33;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.1.2.1.2.2;

1.1.2.1.2.2
date	2012.11.17.08.36.32;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.1.2.1.4.2;

1.1.2.1.4.2
date	2012.11.17.08.47.22;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sbin/resolvconf/Makefile 219738 2011-03-18 12:18:52Z ume $

DIST=		${.CURDIR}/../../contrib/openresolv
.PATH:		${DIST}

SCRIPTS=	resolvconf

FILES=		libc dnsmasq named pdnsd unbound
FILESDIR=	/libexec/resolvconf

MAN=		resolvconf.conf.5 resolvconf.8

CLEANFILES=	${SCRIPTS} ${FILES} ${MAN}

SYSCONFDIR=	/etc
RCDIR=		${SYSCONFDIR}/rc.d
VARDIR=		/var/run/resolvconf

# 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=		\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:@@PREFIX@@::g' \
		-e 's:@@SYSCONFDIR@@:${SYSCONFDIR}:g' \
		-e 's:@@LIBEXECDIR@@:${FILESDIR}:g' \
		-e 's:@@VARDIR@@:${VARDIR}:g' \
		-e 's:@@RESTARTCMD \(.*\)@@:${RESTARTCMD}:g' \
		-e 's:@@RCDIR@@:${RCDIR}:g' \
		-e 's: vpn : ng[0-9]*&:g' \
		${DIST}/$@@.in > $@@
.endfor

.include <bsd.prog.mk>
@


1.1
log
@SVN rev 219738 on 2011-03-18 12:18:52Z by ume

Add resolvconf(8) which manages resolv.conf.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.1.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.1.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sbin/resolvconf/Makefile 219738 2011-03-18 12:18:52Z ume $
@


1.1.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.1.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sbin/resolvconf/Makefile 219738 2011-03-18 12:18:52Z ume $
@


1.1.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.1.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sbin/resolvconf/Makefile 219738 2011-03-18 12:18:52Z ume $
@


