[src/netbsd-10]: src Pull up following revision(s) (requested by gutteridge i...

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

details:   https://anonhg.NetBSD.org/src/rev/c077feaeb905
branches:  netbsd-10
changeset: 377331:c077feaeb905
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jul 07 18:43:09 2023 +0000

description:
Pull up following revision(s) (requested by gutteridge in ticket #226):

        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.

diffstat:

 distrib/sets/lists/misc/mi                 |   3 ++-
 external/bsd/dhcpcd/examples/Makefile      |   4 ++--
 external/bsd/dhcpcd/examples/conf/Makefile |  14 ++++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r 292067f048c0 -r c077feaeb905 distrib/sets/lists/misc/mi
--- a/distrib/sets/lists/misc/mi        Wed Jul 05 16:12:51 2023 +0000
+++ b/distrib/sets/lists/misc/mi        Fri Jul 07 18:43:09 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.224 2022/10/14 19:43:35 ryo Exp $
+# $NetBSD: mi,v 1.224.2.1 2023/07/07 18:43:09 martin Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1368,6 +1368,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
diff -r 292067f048c0 -r c077feaeb905 external/bsd/dhcpcd/examples/Makefile
--- a/external/bsd/dhcpcd/examples/Makefile     Wed Jul 05 16:12:51 2023 +0000
+++ b/external/bsd/dhcpcd/examples/Makefile     Fri Jul 07 18:43:09 2023 +0000
@@ -1,5 +1,5 @@
-#      $NetBSD: Makefile,v 1.1 2017/04/02 20:18:37 roy Exp $
+#      $NetBSD: Makefile,v 1.1.28.1 2023/07/07 18:43:09 martin Exp $
 
-SUBDIR=                hooks
+SUBDIR=                conf hooks
 
 .include <bsd.subdir.mk>
diff -r 292067f048c0 -r c077feaeb905 external/bsd/dhcpcd/examples/conf/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/dhcpcd/examples/conf/Makefile        Fri Jul 07 18:43:09 2023 +0000
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1.2.2 2023/07/07 18:43:09 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>