Module Name: src
Committed By: martin
Date: Fri Jul 7 18:46:57 UTC 2023
Modified Files:
src/distrib/sets/lists/misc [netbsd-9]: mi
src/external/bsd/dhcpcd/examples [netbsd-9]: Makefile
Added Files:
src/external/bsd/dhcpcd/examples/conf [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by gutteridge in ticket #1663):
external/bsd/dhcpcd/examples/Makefile: revision 1.2
distrib/sets/lists/misc/mi: revision 1.225
external/bsd/dhcpcd/examples/conf/Makefile: revision 1.1
Install a copy of dhcpcd.conf under /usr/share/examples
Addresses PR bin/57487 from Taylor R Campbell.
To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.215.2.1 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.1 -r1.1.20.1 src/external/bsd/dhcpcd/examples/Makefile
cvs rdiff -u -r0 -r1.1.4.2 src/external/bsd/dhcpcd/examples/conf/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/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.215 src/distrib/sets/lists/misc/mi:1.215.2.1
--- src/distrib/sets/lists/misc/mi:1.215 Fri Jul 26 13:29:36 2019
+++ src/distrib/sets/lists/misc/mi Fri Jul 7 18:46:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.215 2019/07/26 13:29:36 roy Exp $
+# $NetBSD: mi,v 1.215.2.1 2023/07/07 18:46:57 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1363,6 +1363,7 @@
./usr/share/examples/atf/tests-results.css misc-atf-examples share,atf,!kyua
./usr/share/examples/atf/tests-results.css misc-obsolete share,kyua,obsolete
./usr/share/examples/dhcp/dhcpd.conf misc-dhcpd-examples share
+./usr/share/examples/dhcpcd/dhcpcd.conf misc-dhcpcd-examples share
./usr/share/examples/dhcpcd/hooks/10-wpa_supplicant misc-dhcpcd-examples share
./usr/share/examples/dhcpcd/hooks/15-timezone misc-dhcpcd-examples share
./usr/share/examples/dhcpcd/hooks/29-lookup-hostname misc-dhcpcd-examples share
Index: src/external/bsd/dhcpcd/examples/Makefile
diff -u src/external/bsd/dhcpcd/examples/Makefile:1.1 src/external/bsd/dhcpcd/examples/Makefile:1.1.20.1
--- src/external/bsd/dhcpcd/examples/Makefile:1.1 Sun Apr 2 20:18:37 2017
+++ src/external/bsd/dhcpcd/examples/Makefile Fri Jul 7 18:46:57 2023
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2017/04/02 20:18:37 roy Exp $
+# $NetBSD: Makefile,v 1.1.20.1 2023/07/07 18:46:57 martin Exp $
-SUBDIR= hooks
+SUBDIR= conf hooks
.include <bsd.subdir.mk>
Added files:
Index: src/external/bsd/dhcpcd/examples/conf/Makefile
diff -u /dev/null src/external/bsd/dhcpcd/examples/conf/Makefile:1.1.4.2
--- /dev/null Fri Jul 7 18:46:57 2023
+++ src/external/bsd/dhcpcd/examples/conf/Makefile Fri Jul 7 18:46:57 2023
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1.4.2 2023/07/07 18:46:57 martin Exp $
+
+.include <bsd.own.mk>
+
+.include "../../Makefile.inc"
+.PATH: ${DIST}/src
+
+.if ${MKSHARE} != "no"
+FILES= dhcpcd.conf
+
+FILESDIR= /usr/share/examples/dhcpcd/
+.endif
+
+.include <bsd.prog.mk>
