CVS commit: src/external/bsd/dhcpcd/libexec/dhcpcd-hooks

2020-04-03 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Fri Apr  3 15:02:11 UTC 2020

Modified Files:
src/external/bsd/dhcpcd/libexec/dhcpcd-hooks: Makefile

Log Message:
Try a better syntax for building 30-hostname


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/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/libexec/dhcpcd-hooks/Makefile
diff -u src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile:1.4 src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile:1.5
--- src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile:1.4	Thu Apr  2 14:05:28 2020
+++ src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile	Fri Apr  3 15:02:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/04/02 14:05:28 roy Exp $
+# $NetBSD: Makefile,v 1.5 2020/04/03 15:02:11 roy Exp $
 #
 
 .include 
@@ -10,15 +10,14 @@ HOOKSRC=	${DIST}/hooks
 FILES=		01-test 02-dump 20-resolv.conf 30-hostname
 FILES+=		50-ntp.conf
 
-FILESBUILD_30-hostname=   YES
-
 FILESDIR=	/libexec/dhcpcd-hooks
 
+FILESBUILD_30-hostname=   YES
 CLEANFILES=	30-hostname
 
-.for f in ${FILES}
-${f}:	../../Makefile.inc ${f}.in
-	${TOOL_SED} ${SED_SYS} ${HOOKSRC}/${f}.in > $@
-.endfor
+.SUFFIXES:	.in
+
+.in:	../../Makefile.inc
+	${TOOL_SED} ${SED_SYS} $< > $@
 
 .include

CVS commit: src/external/bsd/dhcpcd/libexec/dhcpcd-hooks

2020-04-02 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Thu Apr  2 14:05:28 UTC 2020

Modified Files:
src/external/bsd/dhcpcd/libexec/dhcpcd-hooks: Makefile

Log Message:
Fix the build by building 30-hostname


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/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/libexec/dhcpcd-hooks/Makefile
diff -u src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile:1.3 src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile:1.4
--- src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile:1.3	Sun Apr  2 20:18:38 2017
+++ src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile	Thu Apr  2 14:05:28 2020
@@ -1,15 +1,24 @@
-# $NetBSD: Makefile,v 1.3 2017/04/02 20:18:38 roy Exp $
+# $NetBSD: Makefile,v 1.4 2020/04/02 14:05:28 roy Exp $
 #
 
 .include 
 
 .include "../../Makefile.inc"
+HOOKSRC=	${DIST}/hooks
+.PATH:		${HOOKSRC}
 
-.PATH:			${DIST}/hooks
+FILES=		01-test 02-dump 20-resolv.conf 30-hostname
+FILES+=		50-ntp.conf
 
-FILES=			01-test 02-dump 20-resolv.conf 30-hostname
-FILES+=			50-ntp.conf
+FILESBUILD_30-hostname=   YES
 
-FILESDIR=		/libexec/dhcpcd-hooks
+FILESDIR=	/libexec/dhcpcd-hooks
+
+CLEANFILES=	30-hostname
+
+.for f in ${FILES}
+${f}:	../../Makefile.inc ${f}.in
+	${TOOL_SED} ${SED_SYS} ${HOOKSRC}/${f}.in > $@
+.endfor
 
 .include

CVS commit: src/external/bsd/dhcpcd/libexec/dhcpcd-hooks

2017-04-01 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Sat Apr  1 19:02:58 UTC 2017

Modified Files:
src/external/bsd/dhcpcd/libexec/dhcpcd-hooks: Makefile

Log Message:
Fix building 50-ypbind


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/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/libexec/dhcpcd-hooks/Makefile
diff -u src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile:1.1 src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile:1.2
--- src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile:1.1	Fri Mar 31 21:02:09 2017
+++ src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile	Sat Apr  1 19:02:58 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2017/03/31 21:02:09 roy Exp $
+# $NetBSD: Makefile,v 1.2 2017/04/01 19:02:58 roy Exp $
 #
 
 .include 
 
 .include "../../Makefile.inc"
 HOOKSRC=		${DIST}/hooks
-.PATH:			${HOOKSRC}
+.PATH:			${HOOKSRC} ${OBJDIR}
 
 HOOKS=			01-test 02-dump 20-resolv.conf 30-hostname
 HOOKS+=			50-ntp.conf
@@ -14,14 +14,23 @@ FILES=			${HOOKS:C,^,${HOOKSRC}/,}
 FILESDIR=		/libexec/dhcpcd-hooks
 
 EGHOOKS=		10-wpa_supplicant 15-timezone 29-lookup-hostname
-EGHOOKS+=		50-ypbind
+MKEGHOOKS=		50-ypbind
+CLEANFILES+=		50-ypbind
 
 .if ${MKSHARE} != "no"
 EGFILES=		${EGHOOKS:C,^,${HOOKSRC}/,}
+EGFILES+=		${MKEGHOOKS:C,^,${.OBJDIR}/,}
 FILES+=			${EGFILES}
 .for f in ${EGFILES}
 FILESDIR_${f}=		/usr/share/examples/dhcpcd/hooks
 .endfor
 .endif
 
+.SUFFIXES:		.in
+
+all:	${HOOKS} ${EGHOOKS} ${MKEGHOOKS}
+
+.in:	../../Makefile.inc
+	${TOOL_SED} ${SED_SYS} $< > $@
+
 .include

CVS commit: src/external/bsd/dhcpcd/libexec

2017-04-01 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Sat Apr  1 10:51:41 UTC 2017

Modified Files:
src/external/bsd/dhcpcd/libexec: Makefile

Log Message:
We should build the hooks as well really.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/dhcpcd/libexec/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/libexec/Makefile
diff -u src/external/bsd/dhcpcd/libexec/Makefile:1.1 src/external/bsd/dhcpcd/libexec/Makefile:1.2
--- src/external/bsd/dhcpcd/libexec/Makefile:1.1	Fri Mar 31 21:02:09 2017
+++ src/external/bsd/dhcpcd/libexec/Makefile	Sat Apr  1 10:51:41 2017
@@ -1,6 +1,5 @@
-#	$NetBSD: Makefile,v 1.1 2017/03/31 21:02:09 roy Exp $
+#	$NetBSD: Makefile,v 1.2 2017/04/01 10:51:41 roy Exp $
 
-SUBDIR=		dhcpcd-hooks
-SUBDIR=		dhcpcd-run-hooks
+SUBDIR=		dhcpcd-run-hooks dhcpcd-hooks
 
 .include