From owner-svn-ports-head@FreeBSD.ORG Fri Jun 12 06:17:44 2015 Return-Path: Delivered-To: svn-ports-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 884042ED; Fri, 12 Jun 2015 06:17:44 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 763031195; Fri, 12 Jun 2015 06:17:44 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5C6HiiZ080029; Fri, 12 Jun 2015 06:17:44 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5C6HhU8080026; Fri, 12 Jun 2015 06:17:43 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201506120617.t5C6HhU8080026@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Fri, 12 Jun 2015 06:17:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r389262 - head/dns/dnsmasq-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Jun 2015 06:17:44 -0000 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 -@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 -@exec if [ ! -f %D/etc/dnsmasq.conf ]; then cp -p %D/%F %B/dnsmasq.conf; fi +@sample etc/dnsmasq.conf.sample man/man8/dnsmasq.8.gz %%DATADIR%%/trust-anchors.conf %%EXAMPLESDIR%%/dnslist/dhcp.css