Module Name: src
Committed By: roy
Date: Fri Oct 22 13:25:58 UTC 2021
Modified Files:
src/external/bsd/dhcpcd: Makefile.inc
src/external/bsd/dhcpcd/examples/hooks: Makefile
src/external/bsd/dhcpcd/libexec/dhcpcd-hooks: Makefile
src/external/bsd/dhcpcd/libexec/dhcpcd-run-hooks: Makefile
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile
Log Message:
Remove build for stuff dhcpcd's import-src target now does.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcpcd/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcpcd/examples/hooks/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/dhcpcd/libexec/dhcpcd-run-hooks/Makefile
cvs rdiff -u -r1.55 -r1.56 src/external/bsd/dhcpcd/sbin/dhcpcd/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/dhcpcd/Makefile.inc
diff -u src/external/bsd/dhcpcd/Makefile.inc:1.4 src/external/bsd/dhcpcd/Makefile.inc:1.5
--- src/external/bsd/dhcpcd/Makefile.inc:1.4 Thu Apr 2 12:56:01 2020
+++ src/external/bsd/dhcpcd/Makefile.inc Fri Oct 22 13:25:57 2021
@@ -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'
Index: src/external/bsd/dhcpcd/examples/hooks/Makefile
diff -u src/external/bsd/dhcpcd/examples/hooks/Makefile:1.3 src/external/bsd/dhcpcd/examples/hooks/Makefile:1.4
--- src/external/bsd/dhcpcd/examples/hooks/Makefile:1.3 Fri Jul 26 13:29:36 2019
+++ src/external/bsd/dhcpcd/examples/hooks/Makefile Fri Oct 22 13:25:57 2021
@@ -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>
Index: src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile
diff -u src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile:1.6 src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile:1.7
--- src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile:1.6 Tue Apr 14 03:16:27 2020
+++ src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile Fri Oct 22 13:25:57 2021
@@ -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 @@ FILES+= 50-ntp.conf
FILESDIR= /libexec/dhcpcd-hooks
-FILESBUILD_30-hostname= YES
-CLEANFILES= 30-hostname
-
-.SUFFIXES: .in
-
-.in: ../../Makefile.inc
- ${TOOL_SED} ${SED_SYS} $< > $@
-
.include <bsd.prog.mk>
Index: src/external/bsd/dhcpcd/libexec/dhcpcd-run-hooks/Makefile
diff -u src/external/bsd/dhcpcd/libexec/dhcpcd-run-hooks/Makefile:1.1 src/external/bsd/dhcpcd/libexec/dhcpcd-run-hooks/Makefile:1.2
--- src/external/bsd/dhcpcd/libexec/dhcpcd-run-hooks/Makefile:1.1 Fri Mar 31 21:02:09 2017
+++ src/external/bsd/dhcpcd/libexec/dhcpcd-run-hooks/Makefile Fri Oct 22 13:25:58 2021
@@ -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 @@ SCRIPTSDIR= /libexec
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>
Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.55 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.56
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.55 Thu Feb 25 07:55:53 2021
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Fri Oct 22 13:25:58 2021
@@ -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 @@ FILESDIR_dhcpcd.conf= /etc
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>
