Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/dhcpcd Remove build for stuff dhcpcd's import-s...



details:   https://anonhg.NetBSD.org/src/rev/e878dd80c9a6
branches:  trunk
changeset: 1024403:e878dd80c9a6
user:      roy <roy%NetBSD.org@localhost>
date:      Fri Oct 22 13:25:57 2021 +0000

description:
Remove build for stuff dhcpcd's import-src target now does.

diffstat:

 external/bsd/dhcpcd/Makefile.inc                      |  15 +--------------
 external/bsd/dhcpcd/examples/hooks/Makefile           |   9 +--------
 external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile     |  10 +---------
 external/bsd/dhcpcd/libexec/dhcpcd-run-hooks/Makefile |   9 +--------
 external/bsd/dhcpcd/sbin/dhcpcd/Makefile              |   9 +--------
 5 files changed, 5 insertions(+), 47 deletions(-)

diffs (116 lines):

diff -r 8025b7970917 -r e878dd80c9a6 external/bsd/dhcpcd/Makefile.inc
--- a/external/bsd/dhcpcd/Makefile.inc  Fri Oct 22 13:23:20 2021 +0000
+++ b/external/bsd/dhcpcd/Makefile.inc  Fri Oct 22 13:25:57 2021 +0000
@@ -1,17 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2020/04/02 12:56:01 roy Exp $
+# $NetBSD: Makefile.inc,v 1.5 2021/10/22 13:25:57 roy Exp $
 
 SRCDIR=                ${NETBSDSRCDIR}/external/bsd/dhcpcd
 DIST=          ${SRCDIR}/dist
-
-SED_SYS=       -e 's:@SYSCONFDIR@:/etc:g' \
-               -e 's:@DATADIR@:/usr/share/examples:g' \
-               -e 's:@DBDIR@:/var/db/dhcpcd:g' \
-               -e 's:@LIBDIR@:/lib:g' \
-               -e 's:@RUNDIR@:/var/run/dhcpcd:g' \
-               -e 's:@HOOKDIR@:/libexec/dhcpcd-hooks:g' \
-               -e 's:@SCRIPT@:/libexec/dhcpcd-run-hooks:g' \
-               -e 's:@SERVICEEXISTS@::g' \
-               -e 's:@SERVICECMD@::g' \
-               -e 's:@SERVICESTATUS@::g' \
-               -e 's:@STATUSARG@::g' \
-               -e 's:@DEFAULT_HOSTNAME@::g'
diff -r 8025b7970917 -r e878dd80c9a6 external/bsd/dhcpcd/examples/hooks/Makefile
--- a/external/bsd/dhcpcd/examples/hooks/Makefile       Fri Oct 22 13:23:20 2021 +0000
+++ b/external/bsd/dhcpcd/examples/hooks/Makefile       Fri Oct 22 13:25:57 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/07/26 13:29:36 roy Exp $
+# $NetBSD: Makefile,v 1.4 2021/10/22 13:25:57 roy Exp $
 #
 
 .include <bsd.own.mk>
@@ -10,17 +10,10 @@
 FILES=                 10-wpa_supplicant 15-timezone 29-lookup-hostname
 
 .if ${MKYP} != "no"
-FILESBUILD_50-ypbind=  YES
 FILES+=                        50-ypbind
-CLEANFILES+=           50-ypbind
 .endif
 
 FILESDIR=              /usr/share/examples/dhcpcd/hooks
-
-.SUFFIXES:             .in
-
-.in:   ../../Makefile.inc
-       ${TOOL_SED} ${SED_SYS} $< > $@
 .endif
 
 .include <bsd.prog.mk>
diff -r 8025b7970917 -r e878dd80c9a6 external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile
--- a/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile Fri Oct 22 13:23:20 2021 +0000
+++ b/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile Fri Oct 22 13:25:57 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/04/14 03:16:27 kre Exp $
+# $NetBSD: Makefile,v 1.7 2021/10/22 13:25:57 roy Exp $
 #
 
 .include <bsd.own.mk>
@@ -12,12 +12,4 @@
 
 FILESDIR=      /libexec/dhcpcd-hooks
 
-FILESBUILD_30-hostname=   YES
-CLEANFILES=    30-hostname
-
-.SUFFIXES:     .in
-
-.in:   ../../Makefile.inc
-       ${TOOL_SED} ${SED_SYS} $< > $@
-
 .include <bsd.prog.mk>
diff -r 8025b7970917 -r e878dd80c9a6 external/bsd/dhcpcd/libexec/dhcpcd-run-hooks/Makefile
--- a/external/bsd/dhcpcd/libexec/dhcpcd-run-hooks/Makefile     Fri Oct 22 13:23:20 2021 +0000
+++ b/external/bsd/dhcpcd/libexec/dhcpcd-run-hooks/Makefile     Fri Oct 22 13:25:57 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/03/31 21:02:09 roy Exp $
+# $NetBSD: Makefile,v 1.2 2021/10/22 13:25:58 roy Exp $
 #
 
 .include <bsd.own.mk>
@@ -12,11 +12,4 @@
 
 MAN=           dhcpcd-run-hooks.8
 
-CLEANFILES=    dhcpcd-run-hooks dhcpcd-run-hooks.8
-
-.for f in ${SCRIPTS} ${MAN}
-${f}:  ../../Makefile.inc ${f}.in
-       ${TOOL_SED} ${SED_SYS} ${HOOKSRC}/${f}.in > $@
-.endfor
-
 .include <bsd.prog.mk>
diff -r 8025b7970917 -r e878dd80c9a6 external/bsd/dhcpcd/sbin/dhcpcd/Makefile
--- a/external/bsd/dhcpcd/sbin/dhcpcd/Makefile  Fri Oct 22 13:23:20 2021 +0000
+++ b/external/bsd/dhcpcd/sbin/dhcpcd/Makefile  Fri Oct 22 13:25:57 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2021/02/25 07:55:53 rin Exp $
+# $NetBSD: Makefile,v 1.56 2021/10/22 13:25:58 roy Exp $
 #
 
 WARNS?=                6
@@ -75,14 +75,7 @@
 FILESMODE_dhcpcd.conf=         644     # -rw-r--r--
 
 MAN=                   dhcpcd.conf.5 dhcpcd.8 
-CLEANFILES=            dhcpcd.conf.5 dhcpcd.8 
 
 COPTS.logerr.c+=    ${${ACTIVE_CC} == "clang" && ${MACHINE_ARCH} == "powerpc":? -O0 :}
 
-
-.for f in dhcpcd.conf.5 dhcpcd.8
-${f}:  ${f}.in
-       ${TOOL_SED} ${SED_SYS} ${DIST}/src/${f}.in > $@
-.endfor
-
 .include <bsd.prog.mk>



Home | Main Index | Thread Index | Old Index