Index: branches/2016Q2/net/dhcpcd/Makefile
===================================================================
--- branches/2016Q2/net/dhcpcd/Makefile	(revision 413486)
+++ branches/2016Q2/net/dhcpcd/Makefile	(revision 413487)
@@ -1,28 +1,28 @@
 # Created by: Roy Marples <roy@marples.name>
 # $FreeBSD$
 
 PORTNAME=	dhcpcd
-PORTVERSION=	6.10.1
+PORTVERSION=	6.10.2
 CATEGORIES=	net
 MASTER_SITES=	http://roy.marples.name/downloads/dhcpcd/ \
 		http://roy.aydogan.net/dhcpcd/ \
 		http://cflags.cc/roy/dhcpcd/ \
 		LOCAL/delphij
 
 MAINTAINER=	roy@marples.name
 COMMENT=	DHCP/IPv4LL/IPv6RS/DHCPv6 client
 
 LICENSE=	BSD2CLAUSE
 
 USES=		cpe tar:xz
 CPE_VENDOR=	dhcpcd_project
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/examples
 USE_RC_SUBR=	dhcpcd
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/dhcpcd.conf \
 		${STAGEDIR}${PREFIX}/etc/dhcpcd.conf.sample
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/dhcpcd
 
 .include <bsd.port.mk>
Index: branches/2016Q2/net/dhcpcd/distinfo
===================================================================
--- branches/2016Q2/net/dhcpcd/distinfo	(revision 413486)
+++ branches/2016Q2/net/dhcpcd/distinfo	(revision 413487)
@@ -1,2 +1,2 @@
-SHA256 (dhcpcd-6.10.1.tar.xz) = 284abf8c3be0580bbac5eaca95359346ab0d78d4072317b6ce87cc68f2e8ae7b
-SIZE (dhcpcd-6.10.1.tar.xz) = 180112
+SHA256 (dhcpcd-6.10.2.tar.xz) = 64a0ff84ba7f1e820b2ccfe08980b3b73e96bb072274b21de523f1da83a94e09
+SIZE (dhcpcd-6.10.2.tar.xz) = 184512
Index: branches/2016Q2/net/dhcpcd/files/patch-dhcpcd.conf
===================================================================
--- branches/2016Q2/net/dhcpcd/files/patch-dhcpcd.conf	(revision 413486)
+++ branches/2016Q2/net/dhcpcd/files/patch-dhcpcd.conf	(nonexistent)
@@ -1,13 +0,0 @@
-Disable private SLAAC addresses as that would cause dhcpcd to own the routes
-by default.
-
-See http://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194485
-
---- dhcpcd.conf.orig	2016-01-07 16:47:19 UTC
-+++ dhcpcd.conf
-@@ -35,4 +35,4 @@ option interface_mtu
- require dhcp_server_identifier
- 
- # Generate Stable Private IPv6 Addresses instead of hardware based ones
--slaac private
-+#slaac private

Property changes on: branches/2016Q2/net/dhcpcd/files/patch-dhcpcd.conf
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2016Q2/net/dhcpcd/files/dhcpcd.in
===================================================================
--- branches/2016Q2/net/dhcpcd/files/dhcpcd.in	(revision 413486)
+++ branches/2016Q2/net/dhcpcd/files/dhcpcd.in	(revision 413487)
@@ -1,36 +1,40 @@
 #!/bin/sh
 
 # PROVIDE: dhclient
 # KEYWORD: nojail nostart
 #
 
 . /etc/rc.subr
 . /etc/network.subr
 
 name="dhcpcd"
 ifn="$2"
 command="%%PREFIX%%/sbin/dhcpcd"
 command_args="$ifn"
-pidfile="/var/run/dhcpcd-$ifn.pid"
+if [ -n "$ifn" ]; then
+	specific="$(get_if_var $ifn dhcpcd_flags_IF)"
+	if [ -z "$flags" -a -n "$specific" ]; then
+		rc_flags="$specific"
+	fi
+	pidfile="/var/run/dhcpcd-$ifn.pid"
+else
+	pidfile="$($command -P $rc_flags)"
+fi
 start_precmd="dhcpcd_precmd"
 
 dhcpcd_precmd()
 {
-	# Override for $ifn specific flags (see rc.subr for $flags setting)
-	specific=`get_if_var $ifn dhcpcd_flags_IF`
-	if [ -z "$flags" -a -n "$specific" ]; then
-		rc_flags=$specific
-	fi
-
 	# dhcpcd may need local binaries
-	export PATH=${PATH}:%%PREFIX%%/sbin
+	export PATH=${PATH}:/usr/local/sbin
 }
 
 load_rc_config $name
 load_rc_config network
 
-if ! dhcpif $ifn; then
-	return 1
+if [ -n "$ifn" ]; then
+	if ! dhcpif $ifn; then
+		err 1 "$ifn is not enabled for DHCP"
+	fi
 fi
 
 run_rc_command "$1"
Index: branches/2016Q2/net/dhcpcd/pkg-message
===================================================================
--- branches/2016Q2/net/dhcpcd/pkg-message	(revision 413486)
+++ branches/2016Q2/net/dhcpcd/pkg-message	(revision 413487)
@@ -1,4 +1,6 @@
 The default FreeBSD kernel does not allow userland to provide IPv6
-Prefix Routes, which dhcpcd needs to do when running the default configuration.
+Prefix Routes when the kernel is handling Router Advertisements.
+The default dhcpcd configuration will disable the kernel from handling
+Router Advertisements.
 
 See http://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194485 for a patch.
Index: branches/2016Q2
===================================================================
--- branches/2016Q2	(revision 413486)
+++ branches/2016Q2	(revision 413487)

Property changes on: branches/2016Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r413437