aboutsummaryrefslogtreecommitdiff
path: root/dns
diff options
context:
space:
mode:
authorMatthias Andree <mandree@FreeBSD.org>2012-03-11 23:59:44 +0000
committerMatthias Andree <mandree@FreeBSD.org>2012-03-11 23:59:44 +0000
commit375fa2ae285c3d3a3cb05aaaef5dfa6899970e95 (patch)
tree76b1ae6d135b4f5e39c3ae98854ab0956d54d581 /dns
parent83df4f9a4b9861a80e4dae6f6736c521d656971f (diff)
downloadports-375fa2ae285c3d3a3cb05aaaef5dfa6899970e95.tar.gz
ports-375fa2ae285c3d3a3cb05aaaef5dfa6899970e95.zip
Update to new upstream release 2.60. Notable new features are:
- The LUA port option enables Lua support for DHCP lease-change scripts - DHCPv6 support - IPv6 Router Advertisement support Changelog: http://www.thekelleys.org.uk/dnsmasq/CHANGELOG Feature safe: yes
Notes
Notes: svn path=/head/; revision=293135
Diffstat (limited to 'dns')
-rw-r--r--dns/dnsmasq/Makefile18
-rw-r--r--dns/dnsmasq/distinfo4
2 files changed, 16 insertions, 6 deletions
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index 0863e7b084b1..226f037ea69a 100644
--- a/dns/dnsmasq/Makefile
+++ b/dns/dnsmasq/Makefile
@@ -6,11 +6,12 @@
#
PORTNAME= dnsmasq
-PORTVERSION= 2.59
+DISTVERSION= 2.60
PORTEPOCH= 1
CATEGORIES= dns ipv6
MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ \
${MASTER_SITE_LOCAL}/
+#MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/release-candidates/
MASTER_SITE_SUBDIR= mandree
EXTRACT_SUFX= .tar.lzma
@@ -27,14 +28,15 @@ SUB_FILES= pkg-message
USE_XZ= yes
MAKE_JOBS_SAFE= yes
-MAKE_ENV= LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}" COPTS="${CFLAGS}"
-MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}"
+CFLAGS+= -Wall -Wno-unused-value
+MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" COPTS="${CFLAGS}" LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}"
OPTIONS= IPV6 "IPv6 support" on
OPTIONS+= DBUS "DBUS support" off
OPTIONS+= NLS "National Language Support (NLS, enables IDN)" on
OPTIONS+= IDN "International Domain Names (IDN) WITHOUT NLS" off
# unfortunately, NLS always enables IDN in dnsmasq 2.57
+OPTIONS+= LUA "Support lease-change scripts in LUA" off
.include <bsd.port.options.mk>
@@ -52,7 +54,7 @@ USE_GMAKE= yes
.else
PLIST_SUB+= NLS="@comment "
.if defined(WITH_IDN)
-MAKE_ARGS+= COPTS=-DHAVE_IDN
+CFLAGS+= -DHAVE_IDN
LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn
.endif
.endif
@@ -63,10 +65,18 @@ BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config
CFLAGS+= -DHAVE_DBUS
.endif
+.if defined(WITH_LUA)
+CFLAGS+= -DHAVE_LUASCRIPT
+USE_LUA= 5.1
+.endif
+
USE_RC_SUBR= dnsmasq.sh
.include <bsd.port.pre.mk>
+post-patch:
+ ${REINPLACE_CMD} -e "s/lua5\.1/lua-5.1/" ${WRKSRC}/Makefile
+
pre-configure:
@:
.if defined(WITH_IDN)
diff --git a/dns/dnsmasq/distinfo b/dns/dnsmasq/distinfo
index c2cb35b6292e..1092d0a09183 100644
--- a/dns/dnsmasq/distinfo
+++ b/dns/dnsmasq/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dnsmasq-2.59.tar.lzma) = 484579f714023ea1bde67051310de32e9e6809686e325c779adc982e708dbdfa
-SIZE (dnsmasq-2.59.tar.lzma) = 340715
+SHA256 (dnsmasq-2.60.tar.lzma) = aa5ada47e71a1fc83050d7e8569f03bc060c6a506ecc27a30832ef888e6d4c92
+SIZE (dnsmasq-2.60.tar.lzma) = 365513