svn commit: r331639 - in head/dns: dnsmasq dnsmasq-devel

[Matthias Andree]

Author: mandree
Date: Fri Oct 25 22:27:59 2013
New Revision: 331639
URL: http://svnweb.freebsd.org/changeset/ports/331639

Log:
  Upgrade dnsmasq to new upstream release 2.67.
  Changelog: <http://www.thekelleys.org.uk/dnsmasq/CHANGELOG>
  Enable NLS and IPV6 options by default.
  Use shebangfix on files that need it.
  
  Mark dnsmasq-devel (older than release) IGNORE.

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

Modified: head/dns/dnsmasq-devel/Makefile
==============================================================================
--- head/dns/dnsmasq-devel/Makefile	Fri Oct 25 21:04:57 2013	(r331638)
+++ head/dns/dnsmasq-devel/Makefile	Fri Oct 25 22:27:59 2013	(r331639)
@@ -13,6 +13,7 @@ COMMENT=	Lightweight DNS forwarder, DHCP
 LICENSE=	GPLv2
 
 CONFLICTS_INSTALL=dnsmasq-2*
+IGNORE=		- build stable version instead, it is newer than this release candidate
 
 PORTDOCS=	CHANGELOG CHANGELOG.archive FAQ doc.html setup.html
 

Modified: head/dns/dnsmasq/Makefile
==============================================================================
--- head/dns/dnsmasq/Makefile	Fri Oct 25 21:04:57 2013	(r331638)
+++ head/dns/dnsmasq/Makefile	Fri Oct 25 22:27:59 2013	(r331639)
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	dnsmasq
-DISTVERSION=	2.66
+DISTVERSION=	2.67
 PORTEPOCH=	1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/ \
-		${MASTER_SITE_LOCAL}/
-MASTER_SITE_SUBDIR=	mandree
+		LOCAL/mandree/
 
 MAINTAINER=	mandree at FreeBSD.org
 COMMENT=	Lightweight DNS forwarder, DHCP, and TFTP server
@@ -25,10 +24,14 @@ CFLAGS+=	-Wall -Wno-unused-value
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" COPTS="${CFLAGS}" LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}"
 
 OPTIONS_DEFINE=		IPV6 DBUS NLS IDN LUA
+OPTIONS_DEFAULT=	IPV6 NLS
 OPTIONS_EXCLUDE+=	EXAMPLES
 NLS_DESC=	National Language Support (NLS, enables IDN)
 IDN_DESC=	International Domain Names (IDN) WITHOUT NLS
 LUA_DESC=	Support lease-change scripts in LUA
+USES=		shebangfix
+SHEBANG_FILES=	contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl \
+		contrib/dnslist/dnslist.pl
 
 .include <bsd.port.options.mk>
 

Modified: head/dns/dnsmasq/distinfo
==============================================================================
--- head/dns/dnsmasq/distinfo	Fri Oct 25 21:04:57 2013	(r331638)
+++ head/dns/dnsmasq/distinfo	Fri Oct 25 22:27:59 2013	(r331639)
@@ -1,2 +1,2 @@
-SHA256 (dnsmasq-2.66.tar.xz) = 5e143947527bcdc46a30f4b1bbdfbfa96333dd98bcecdac3b5b1d6cacfe06c75
-SIZE (dnsmasq-2.66.tar.xz) = 401056
+SHA256 (dnsmasq-2.67.tar.xz) = a8f1cec9d3f38d19c7c54e2879703d42748ace0f62c32e695b082051bdd2705d
+SIZE (dnsmasq-2.67.tar.xz) = 418484