svn commit: r389262 - head/dns/dnsmasq-devel

[Matthias Andree]

Author: mandree
Date: Fri Jun 12 06:17:43 2015
New Revision: 389262
URL: https://svnweb.freebsd.org/changeset/ports/389262

Log:
  Update to new upstream release candidate #10.
  
  Git shortlog since rc #9:
  
  Neil Jerram (6):
        Fix logging of unknown interface in --bridge-interface, DHPCv4.
        Extend --bridge-interface aliasing to DHCPv6.
        Allow router advertisements to have the "off-link" bit set.
        Upply --bridge-interface aliasing to solicited router advertisements.
        Apply --bridge-interfaces to unsolicited router advertisements.
        Documenation updates for --bridge-interface and "off-link".
  
  Nicolas Cavallari (1):
        Add Dbus methods to create and delete DHCP leases.
  
  Simon Kelley (2):
        Add a couple of missed logging strings to the catalogue.
        Merge messages and fix makefile process to do this.

Modified:
  head/dns/dnsmasq-devel/Makefile
  head/dns/dnsmasq-devel/distinfo
  head/dns/dnsmasq-devel/pkg-plist

Modified: head/dns/dnsmasq-devel/Makefile
==============================================================================
--- head/dns/dnsmasq-devel/Makefile	Fri Jun 12 02:28:56 2015	(r389261)
+++ head/dns/dnsmasq-devel/Makefile	Fri Jun 12 06:17:43 2015	(r389262)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dnsmasq
-DISTVERSION=	2.73rc9
+DISTVERSION=	2.73rc10
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/release-candidates/
 PKGNAMESUFFIX=	-devel
@@ -109,8 +109,8 @@ pre-configure: pretty-print-config
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${STAGEDIR}${PREFIX}/etc
-	${REINPLACE_CMD} -i '' 's}%%PREFIX%%}${PREFIX}}' ${STAGEDIR}${PREFIX}/etc/dnsmasq.conf.example
+	${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${STAGEDIR}${PREFIX}/etc/dnsmasq.conf.sample
+	${REINPLACE_CMD} -i '' 's}%%PREFIX%%}${PREFIX}}' ${STAGEDIR}${PREFIX}/etc/dnsmasq.conf.sample
 	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/trust-anchors.conf ${STAGEDIR}${DATADIR}/

Modified: head/dns/dnsmasq-devel/distinfo
==============================================================================
--- head/dns/dnsmasq-devel/distinfo	Fri Jun 12 02:28:56 2015	(r389261)
+++ head/dns/dnsmasq-devel/distinfo	Fri Jun 12 06:17:43 2015	(r389262)
@@ -1,2 +1,2 @@
-SHA256 (dnsmasq-2.73rc9.tar.xz) = 7d010a938a6e807e4db60d0a2d7a4b8960971b04a7952a925b34f2cb99720592
-SIZE (dnsmasq-2.73rc9.tar.xz) = 482432
+SHA256 (dnsmasq-2.73rc10.tar.xz) = 7e51f32abecc18306c41116f1f069893e5602acd7ff57bcc80a3678656fcdf2a
+SIZE (dnsmasq-2.73rc10.tar.xz) = 485028

Modified: head/dns/dnsmasq-devel/pkg-plist
==============================================================================
--- head/dns/dnsmasq-devel/pkg-plist	Fri Jun 12 02:28:56 2015	(r389261)
+++ head/dns/dnsmasq-devel/pkg-plist	Fri Jun 12 06:17:43 2015	(r389262)
@@ -1,7 +1,5 @@
 sbin/dnsmasq
- at unexec if cmp -s %D/etc/dnsmasq.conf %D/etc/dnsmasq.conf.example ; then rm -f %D/etc/dnsmasq.conf ; fi
-etc/dnsmasq.conf.example
- at exec if [ ! -f %D/etc/dnsmasq.conf ]; then cp -p %D/%F %B/dnsmasq.conf; fi
+ at sample etc/dnsmasq.conf.sample
 man/man8/dnsmasq.8.gz
 %%DATADIR%%/trust-anchors.conf
 %%EXAMPLESDIR%%/dnslist/dhcp.css