Module Name: src Committed By: roy Date: Sat Nov 21 03:24:31 UTC 2009
Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/man: mi src/etc/mtree: NetBSD.dist.base src/external/bsd: Makefile Added Files: src/external/bsd/openresolv: Makefile src/external/bsd/openresolv/sbin: Makefile Makefile.inc src/external/bsd/openresolv/sbin/resolvconf: Makefile Log Message: Hook openresolv into build. To generate a diff of this commit: cvs rdiff -u -r1.842 -r1.843 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1174 -r1.1175 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.5 -r1.6 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.19 -r1.20 src/external/bsd/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/openresolv/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/openresolv/sbin/Makefile \ src/external/bsd/openresolv/sbin/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/bsd/openresolv/sbin/resolvconf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.842 src/distrib/sets/lists/base/mi:1.843 --- src/distrib/sets/lists/base/mi:1.842 Sat Nov 14 01:56:21 2009 +++ src/distrib/sets/lists/base/mi Sat Nov 21 03:24:30 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.842 2009/11/14 01:56:21 tnozaki Exp $ +# $NetBSD: mi,v 1.843 2009/11/21 03:24:30 roy Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -171,6 +171,11 @@ ./libexec/dhcpcd-hooks/30-hostname base-dhcpcd-root ./libexec/dhcpcd-hooks/50-ntp.conf base-dhcpcd-root ./libexec/dhcpcd-run-hooks base-dhcpcd-root +./libexec/resolvconf base-resolvconf-root +./libexec/resolvconf/libc base-resolvconf-root +./libexec/resolvconf/dnsmasq base-resolvconf-root +./libexec/resolvconf/named base-resolvconf-root +./libexec/resolvconf/unbound base-resolvconf-root ./libexec/lfs_cleanerd base-sysutil-bin ./mnt base-sys-root ./rescue base-sys-root @@ -275,6 +280,7 @@ ./sbin/rdump base-sysutil-root ./sbin/rdump_lfs base-sysutil-root ./sbin/reboot base-sysutil-root +./sbin/resolvconf base-resolvconf-root ./sbin/resize_lfs base-sysutil-root ./sbin/restore base-sysutil-root ./sbin/rndctl base-sysutil-root Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1174 src/distrib/sets/lists/man/mi:1.1175 --- src/distrib/sets/lists/man/mi:1.1174 Fri Nov 13 09:51:13 2009 +++ src/distrib/sets/lists/man/mi Sat Nov 21 03:24:30 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1174 2009/11/13 09:51:13 mishka Exp $ +# $NetBSD: mi,v 1.1175 2009/11/21 03:24:30 roy Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1850,6 +1850,7 @@ ./usr/share/man/cat5/relocated.0 man-postfix-catman postfix,.cat ./usr/share/man/cat5/remote.0 man-sys-catman .cat ./usr/share/man/cat5/resolv.conf.0 man-net-catman .cat +./usr/share/man/cat5/resolvconf.conf.0 man-resolvconf-catman .cat ./usr/share/man/cat5/rhosts.0 man-netutil-catman .cat ./usr/share/man/cat5/rndc.conf.0 man-bind-catman .cat ./usr/share/man/cat5/route.conf.0 man-sys-catman .cat @@ -2495,6 +2496,7 @@ ./usr/share/man/cat8/repquota.0 man-sysutil-catman .cat ./usr/share/man/cat8/rescue.0 man-sysutil-catman .cat ./usr/share/man/cat8/resize_lfs.0 man-sysutil-catman .cat +./usr/share/man/cat8/resolvconf.0 man-resolvconf-catman .cat ./usr/share/man/cat8/restore.0 man-sysutil-catman .cat ./usr/share/man/cat8/revnetgroup.0 man-nis-catman yp,.cat ./usr/share/man/cat8/revoke.0 man-sysutil-catman .cat @@ -4386,6 +4388,7 @@ ./usr/share/man/html5/relocated.html man-postfix-htmlman postfix,html ./usr/share/man/html5/remote.html man-sys-htmlman html ./usr/share/man/html5/resolv.conf.html man-net-htmlman html +./usr/share/man/html5/resolvconf.conf.html man-resolvconf-htmlman html ./usr/share/man/html5/rhosts.html man-netutil-htmlman html ./usr/share/man/html5/rndc.conf.html man-bind-htmlman html ./usr/share/man/html5/route.conf.html man-sys-htmlman html @@ -4875,6 +4878,7 @@ ./usr/share/man/html8/repquota.html man-sysutil-htmlman html ./usr/share/man/html8/rescue.html man-sysutil-htmlman html ./usr/share/man/html8/resize_lfs.html man-sysutil-htmlman html +./usr/share/man/html8/resolvconf.html man-resolvconf-htmlman html ./usr/share/man/html8/restore.html man-sysutil-htmlman html ./usr/share/man/html8/revnetgroup.html man-nis-htmlman yp,html ./usr/share/man/html8/revoke.html man-sysutil-htmlman html @@ -6886,6 +6890,7 @@ ./usr/share/man/man5/relocated.5 man-postfix-man postfix,.man ./usr/share/man/man5/remote.5 man-sys-man .man ./usr/share/man/man5/resolv.conf.5 man-net-man .man +./usr/share/man/man5/resolvconf.conf.5 man-resolvconf-man .man ./usr/share/man/man5/rhosts.5 man-netutil-man .man ./usr/share/man/man5/rndc.conf.5 man-bind-man .man ./usr/share/man/man5/route.conf.5 man-sys-man .man @@ -7531,6 +7536,7 @@ ./usr/share/man/man8/repquota.8 man-sysutil-man .man ./usr/share/man/man8/rescue.8 man-sysutil-man .man ./usr/share/man/man8/resize_lfs.8 man-sysutil-man .man +./usr/share/man/man8/resolvconf.8 man-resolvconf-man .man ./usr/share/man/man8/restore.8 man-sysutil-man .man ./usr/share/man/man8/revnetgroup.8 man-nis-man yp,.man ./usr/share/man/man8/revoke.8 man-sysutil-man .man Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.5 src/etc/mtree/NetBSD.dist.base:1.6 --- src/etc/mtree/NetBSD.dist.base:1.5 Mon Nov 2 10:15:45 2009 +++ src/etc/mtree/NetBSD.dist.base Sat Nov 21 03:24:30 2009 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.5 2009/11/02 10:15:45 plunky Exp $ +# $NetBSD: NetBSD.dist.base,v 1.6 2009/11/21 03:24:30 roy Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -67,6 +67,7 @@ ./libdata/firmware/zyd ./libexec ./libexec/dhcpcd-hooks +./libexec/resolvconf ./mnt ./rescue ./root Index: src/external/bsd/Makefile diff -u src/external/bsd/Makefile:1.19 src/external/bsd/Makefile:1.20 --- src/external/bsd/Makefile:1.19 Mon Nov 2 10:13:19 2009 +++ src/external/bsd/Makefile Sat Nov 21 03:24:30 2009 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.19 2009/11/02 10:13:19 plunky Exp $ +# $NetBSD: Makefile,v 1.20 2009/11/21 03:24:30 roy Exp $ .include <bsd.own.mk> SUBDIR+= am-utils bind dhcpcd fetch file flex libarchive libevent \ - mdocml pkg_install top byacc + mdocml openresolv pkg_install top byacc .if (${MKATF} != "no") SUBDIR+= atf Added files: Index: src/external/bsd/openresolv/Makefile diff -u /dev/null src/external/bsd/openresolv/Makefile:1.1 --- /dev/null Sat Nov 21 03:24:31 2009 +++ src/external/bsd/openresolv/Makefile Sat Nov 21 03:24:30 2009 @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2009/11/21 03:24:30 roy Exp $ + +SUBDIR= sbin + +.include <bsd.subdir.mk> Index: src/external/bsd/openresolv/sbin/Makefile diff -u /dev/null src/external/bsd/openresolv/sbin/Makefile:1.1 --- /dev/null Sat Nov 21 03:24:31 2009 +++ src/external/bsd/openresolv/sbin/Makefile Sat Nov 21 03:24:31 2009 @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2009/11/21 03:24:31 roy Exp $ + +SUBDIR= resolvconf + +.include <bsd.subdir.mk> Index: src/external/bsd/openresolv/sbin/Makefile.inc diff -u /dev/null src/external/bsd/openresolv/sbin/Makefile.inc:1.1 --- /dev/null Sat Nov 21 03:24:31 2009 +++ src/external/bsd/openresolv/sbin/Makefile.inc Sat Nov 21 03:24:31 2009 @@ -0,0 +1,5 @@ +# $NetBSD: Makefile.inc,v 1.1 2009/11/21 03:24:31 roy Exp $ + +.include <bsd.own.mk> + +BINDIR= /sbin Index: src/external/bsd/openresolv/sbin/resolvconf/Makefile diff -u /dev/null src/external/bsd/openresolv/sbin/resolvconf/Makefile:1.1 --- /dev/null Sat Nov 21 03:24:31 2009 +++ src/external/bsd/openresolv/sbin/resolvconf/Makefile Sat Nov 21 03:24:31 2009 @@ -0,0 +1,32 @@ +# $NetBSD: Makefile,v 1.1 2009/11/21 03:24:31 roy Exp $ +# + +.include <bsd.own.mk> + +DIST= ${NETBSDSRCDIR}/external/bsd/openresolv/dist +.PATH: ${DIST} + +SCRIPTS= resolvconf +SCRIPTS+= libc dnsmasq named unbound + +SCRIPTSDIR_resolvconf= /sbin +SCRIPTSDIR= /libexec/resolvconf + +MAN= resolvconf.conf.5 resolvconf.8 + +CLEANFILES= ${SCRIPTS} ${MAN} + +CMD1= \\1 status >/dev/null 2>\\&1 +CMD2= \\1 restart +RESTART_CMD= /etc/rc.d/${CMD1} \\&\\& /etc/rc.d/${CMD2} +.for f in ${SCRIPTS} ${MAN} +${f}: ${f}.in + ${TOOL_SED} -e 's:@PREFIX@::g' \ + -e 's:@SYSCONFDIR@:/etc:g' \ + -e 's:@LIBEXECDIR@:/libexec/resolvconf:g' \ + -e 's:@VARDIR@:/var/run/resolvconf:g' \ + -e 's:@RESTARTCMD \(.*\)@:${RESARTCMD}:g' \ + ${DIST}/${f}.in > $@ +.endfor + +.include <bsd.prog.mk>