summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgutteridge <gutteridge@NetBSD.org>2023-07-05 00:26:38 +0000
committergutteridge <gutteridge@NetBSD.org>2023-07-05 00:26:38 +0000
commit7bc56d8aaf833b6b2a3a42f7cac3566ebb5aeff0 (patch)
tree96de4df31b3c62edd797d22edc36673cec8b8570
parent65f181473371a43b75322ff0cc95f6b33ac845ca (diff)
Install a copy of dhcpcd.conf under /usr/share/examples
Addresses PR bin/57487 from Taylor R Campbell.
-rw-r--r--distrib/sets/lists/misc/mi3
-rw-r--r--external/bsd/dhcpcd/examples/Makefile4
-rw-r--r--external/bsd/dhcpcd/examples/conf/Makefile14
3 files changed, 18 insertions, 3 deletions
diff --git a/distrib/sets/lists/misc/mi b/distrib/sets/lists/misc/mi
index 014b268f170..c20fefe91ce 100644
--- a/distrib/sets/lists/misc/mi
+++ b/distrib/sets/lists/misc/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.224 2022/10/14 19:43:35 ryo Exp $
+# $NetBSD: mi,v 1.225 2023/07/05 00:26:38 gutteridge 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 --git a/external/bsd/dhcpcd/examples/Makefile b/external/bsd/dhcpcd/examples/Makefile
index 7024f06ffd4..c56d37f967e 100644
--- a/external/bsd/dhcpcd/examples/Makefile
+++ b/external/bsd/dhcpcd/examples/Makefile
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2017/04/02 20:18:37 roy Exp $
+# $NetBSD: Makefile,v 1.2 2023/07/05 00:26:38 gutteridge Exp $
-SUBDIR= hooks
+SUBDIR= conf hooks
.include <bsd.subdir.mk>
diff --git a/external/bsd/dhcpcd/examples/conf/Makefile b/external/bsd/dhcpcd/examples/conf/Makefile
new file mode 100644
index 00000000000..065e505620c
--- /dev/null
+++ b/external/bsd/dhcpcd/examples/conf/Makefile
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2023/07/05 00:26:38 gutteridge 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>