Module Name: src
Committed By: roy
Date: Wed Jul 22 19:00:20 UTC 2020
Modified Files:
src/external/bsd/openresolv: Makefile
src/external/bsd/openresolv/sbin/resolvconf: Makefile
Added Files:
src/external/bsd/openresolv: Makefile.inc
src/external/bsd/openresolv/libexec: Makefile
src/external/bsd/openresolv/libexec/libc.d: Makefile
src/external/bsd/openresolv/libexec/resolvconf: Makefile
Log Message:
openresolv: Rework the build system to cope with more directories
While here, install avahi-daemon and mdnsd notifiers for when
/etc/resolv.conf is updated.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/openresolv/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/openresolv/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/openresolv/libexec/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/openresolv/libexec/libc.d/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/openresolv/libexec/resolvconf/Makefile
cvs rdiff -u -r1.9 -r1.10 \
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/external/bsd/openresolv/Makefile
diff -u src/external/bsd/openresolv/Makefile:1.1 src/external/bsd/openresolv/Makefile:1.2
--- src/external/bsd/openresolv/Makefile:1.1 Sat Nov 21 03:24:30 2009
+++ src/external/bsd/openresolv/Makefile Wed Jul 22 19:00:19 2020
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2009/11/21 03:24:30 roy Exp $
+# $NetBSD: Makefile,v 1.2 2020/07/22 19:00:19 roy Exp $
SUBDIR= sbin
+SUBDIR+= libexec
.include <bsd.subdir.mk>
Index: src/external/bsd/openresolv/sbin/resolvconf/Makefile
diff -u src/external/bsd/openresolv/sbin/resolvconf/Makefile:1.9 src/external/bsd/openresolv/sbin/resolvconf/Makefile:1.10
--- src/external/bsd/openresolv/sbin/resolvconf/Makefile:1.9 Sun Sep 8 21:04:31 2019
+++ src/external/bsd/openresolv/sbin/resolvconf/Makefile Wed Jul 22 19:00:20 2020
@@ -1,36 +1,19 @@
-# $NetBSD: Makefile,v 1.9 2019/09/08 21:04:31 roy Exp $
+# $NetBSD: Makefile,v 1.10 2020/07/22 19:00:20 roy Exp $
#
.include <bsd.own.mk>
-
-DIST= ${NETBSDSRCDIR}/external/bsd/openresolv/dist
-.PATH: ${DIST}
+.include "../../Makefile.inc"
SCRIPTS= resolvconf
SCRIPTSDIR= /sbin
-FILES= libc dnsmasq named pdns_recursor pdnsd unbound
-FILESDIR= /libexec/resolvconf
-# We should not have to do this ...
-.for f in ${FILES}
-FILESBUILD_$f= yes
-.endfor
-
MAN= resolvconf.conf.5 resolvconf.8
-CLEANFILES= ${SCRIPTS} ${FILES} ${MAN}
+CLEANFILES= ${SCRIPTS} ${MAN}
-.for f in ${SCRIPTS} ${FILES} ${MAN}
+.for f in ${SCRIPTS} ${MAN}
${f}: Makefile ${f}.in
- ${TOOL_SED} -e 's:@PREFIX@::g' \
- -e 's:@SBINDIR@:/sbin:g' \
- -e 's:@RCDIR@:/etc/rc.d:g' \
- -e 's:@SYSCONFDIR@:/etc:g' \
- -e 's:@LIBEXECDIR@:/libexec/resolvconf:g' \
- -e 's:@VARDIR@:/var/run/resolvconf:g' \
- -e 's:@RESTARTCMD@::g' \
- -e 's:@STATUSARG@::g' \
- ${DIST}/${f}.in > $@
+ ${TOOL_SED} ${RESOLVCONF_SED} ${DIST}/${f}.in >$@
.endfor
.include <bsd.prog.mk>
Added files:
Index: src/external/bsd/openresolv/Makefile.inc
diff -u /dev/null src/external/bsd/openresolv/Makefile.inc:1.1
--- /dev/null Wed Jul 22 19:00:20 2020
+++ src/external/bsd/openresolv/Makefile.inc Wed Jul 22 19:00:19 2020
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile.inc,v 1.1 2020/07/22 19:00:19 roy Exp $
+#
+
+DIST= ${NETBSDSRCDIR}/external/bsd/openresolv/dist
+.PATH: ${DIST}
+
+RESOLVCONF_SED= -e 's:@PREFIX@::g' \
+ -e 's:@SBINDIR@:/sbin:g' \
+ -e 's:@RCDIR@:/etc/rc.d:g' \
+ -e 's:@SYSCONFDIR@:/etc:g' \
+ -e 's:@LIBEXECDIR@:/libexec/resolvconf:g' \
+ -e 's:@VARDIR@:/var/run/resolvconf:g' \
+ -e 's:@RESTARTCMD@::g' \
+ -e 's:@STATUSARG@::g'
Index: src/external/bsd/openresolv/libexec/Makefile
diff -u /dev/null src/external/bsd/openresolv/libexec/Makefile:1.1
--- /dev/null Wed Jul 22 19:00:20 2020
+++ src/external/bsd/openresolv/libexec/Makefile Wed Jul 22 19:00:19 2020
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2020/07/22 19:00:19 roy Exp $
+
+SUBDIR= resolvconf
+SUBDIR+= libc.d
+
+.include <bsd.subdir.mk>
Index: src/external/bsd/openresolv/libexec/libc.d/Makefile
diff -u /dev/null src/external/bsd/openresolv/libexec/libc.d/Makefile:1.1
--- /dev/null Wed Jul 22 19:00:20 2020
+++ src/external/bsd/openresolv/libexec/libc.d/Makefile Wed Jul 22 19:00:20 2020
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2020/07/22 19:00:20 roy Exp $
+#
+
+.include <bsd.own.mk>
+.include "../../Makefile.inc"
+
+FILES= avahi-daemon mdnsd
+FILESDIR= /libexec/resolvconf/libc.d
+# We should not have to do this ...
+.for f in ${FILES}
+FILESBUILD_$f= yes
+.endfor
+
+CLEANFILES= ${FILES}
+
+.for f in ${FILES}
+${f}: Makefile ${f}.in
+ ${TOOL_SED} ${RESOLVCONF_SED} ${DIST}/${f}.in >$@
+.endfor
+
+.include <bsd.prog.mk>
Index: src/external/bsd/openresolv/libexec/resolvconf/Makefile
diff -u /dev/null src/external/bsd/openresolv/libexec/resolvconf/Makefile:1.1
--- /dev/null Wed Jul 22 19:00:20 2020
+++ src/external/bsd/openresolv/libexec/resolvconf/Makefile Wed Jul 22 19:00:20 2020
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2020/07/22 19:00:20 roy Exp $
+#
+
+.include <bsd.own.mk>
+.include "../../Makefile.inc"
+
+FILES= libc dnsmasq named pdns_recursor pdnsd unbound
+FILESDIR= /libexec/resolvconf
+# We should not have to do this ...
+.for f in ${FILES}
+FILESBUILD_$f= yes
+.endfor
+
+CLEANFILES= ${FILES}
+
+.for f in ${FILES}
+${f}: Makefile ${f}.in
+ ${TOOL_SED} ${RESOLVCONF_SED} ${DIST}/${f}.in >$@
+.endfor
+
+.include <bsd.prog.mk>
