Module Name: src
Committed By: roy
Date: Fri Jun 21 19:47:29 UTC 2013
Modified Files:
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile
Log Message:
Build dhcpcd-6.0.0
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.13 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.14
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.13 Sat Aug 4 19:11:39 2012
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Fri Jun 21 19:47:29 2013
@@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.13 2012/08/04 19:11:39 roy Exp $
+# $NetBSD: Makefile,v 1.14 2013/06/21 19:47:29 roy Exp $
#
PROG= dhcpcd
-SRCS= arp.c bind.c common.c control.c configure.c dhcp.c dhcpcd.c \
- duid.c eloop.c if-options.c if-pref.c \
- ipv4ll.c ipv6.c ipv6ns.c ipv6rs.c \
- net.c signals.c
+SRCS= common.c control.c dhcpcd.c duid.c eloop.c
+SRCS+= if-options.c if-pref.c net.c script.c
+SRCS+= dhcp-common.c
SRCS+= bpf.c if-bsd.c platform-bsd.c
.include <bsd.own.mk>
-DIST= ${NETBSDSRCDIR}/external/bsd/dhcpcd/dist
-CPPFLAGS+= -I${DIST}
+CPPFLAGS+= -DINET
+SRCS+= arp.c dhcp.c ipv4.c ipv4ll.c
-# Workaround libc not exporting in6addr_any when MKINET6=no
-.if defined(MKINET6) && empty(MKINET6:M[yY][eE][sS])
-LIBC_NET= ${NETBSDSRCDIR}/lib/libc/net
-SRCS+= vars6.c
-CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libc/include
+.if (${USE_INET6} != "no")
+CPPFLAGS+= -DINET6
+SRCS+= ipv6.c ipv6rs.c ipv6ns.c dhcp6.c
.endif
+DIST= ${NETBSDSRCDIR}/external/bsd/dhcpcd/dist
+CPPFLAGS+= -I${DIST}
+
.PATH: ${DIST} ${LIBC_NET}
SCRIPTS= dhcpcd-run-hooks
@@ -28,8 +28,9 @@ SCRIPTSDIR_dhcpcd-run-hooks= /libexec
CONFIGFILES= dhcpcd.conf
FILESDIR_dhcpcd.conf= /etc
-HOOKS= 01-test 02-dump 10-mtu 20-resolv.conf 29-lookup-hostname \
- 30-hostname 50-ntp.conf
+HOOKS= 01-test 02-dump 10-mtu 10-wpa_supplicant
+HOOKS+= 20-resolv.conf 29-lookup-hostname 30-hostname
+HOOKS+= 50-ntp.conf
FILES= ${HOOKS:C,^,${DIST}/dhcpcd-hooks/,}
FILESDIR= /libexec/dhcpcd-hooks
