[src/trunk]: src/external/bsd/openresolv openresolv: Rework the build system ...

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

details:   https://anonhg.NetBSD.org/src/rev/bfc83171d877
branches:  trunk
changeset: 936245:bfc83171d877
user:      roy <roy%NetBSD.org@localhost>
date:      Wed Jul 22 19:00:19 2020 +0000

description:
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.

diffstat:

 external/bsd/openresolv/Makefile                    |   3 +-
 external/bsd/openresolv/Makefile.inc                |  14 ++++++++++
 external/bsd/openresolv/libexec/Makefile            |   6 ++++
 external/bsd/openresolv/libexec/libc.d/Makefile     |  21 ++++++++++++++++
 external/bsd/openresolv/libexec/resolvconf/Makefile |  21 ++++++++++++++++
 external/bsd/openresolv/sbin/resolvconf/Makefile    |  27 +++-----------------
 6 files changed, 69 insertions(+), 23 deletions(-)

diffs (134 lines):

diff -r 931dd1b9d8b6 -r bfc83171d877 external/bsd/openresolv/Makefile
--- a/external/bsd/openresolv/Makefile  Wed Jul 22 17:23:52 2020 +0000
+++ b/external/bsd/openresolv/Makefile  Wed Jul 22 19:00:19 2020 +0000
@@ -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>
diff -r 931dd1b9d8b6 -r bfc83171d877 external/bsd/openresolv/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/openresolv/Makefile.inc      Wed Jul 22 19:00:19 2020 +0000
@@ -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'
diff -r 931dd1b9d8b6 -r bfc83171d877 external/bsd/openresolv/libexec/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/openresolv/libexec/Makefile  Wed Jul 22 19:00:19 2020 +0000
@@ -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>
diff -r 931dd1b9d8b6 -r bfc83171d877 external/bsd/openresolv/libexec/libc.d/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/openresolv/libexec/libc.d/Makefile   Wed Jul 22 19:00:19 2020 +0000
@@ -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>
diff -r 931dd1b9d8b6 -r bfc83171d877 external/bsd/openresolv/libexec/resolvconf/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/openresolv/libexec/resolvconf/Makefile       Wed Jul 22 19:00:19 2020 +0000
@@ -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>
diff -r 931dd1b9d8b6 -r bfc83171d877 external/bsd/openresolv/sbin/resolvconf/Makefile
--- a/external/bsd/openresolv/sbin/resolvconf/Makefile  Wed Jul 22 17:23:52 2020 +0000
+++ b/external/bsd/openresolv/sbin/resolvconf/Makefile  Wed Jul 22 19:00:19 2020 +0000
@@ -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>