diff options
| -rw-r--r-- | dns/dnsmasq/Makefile | 31 | ||||
| -rw-r--r-- | dns/dnsmasq/distinfo | 4 | ||||
| -rw-r--r-- | dns/dnsmasq/files/patch-aa | 11 |
3 files changed, 24 insertions, 22 deletions
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile index 7cd3aba334f9..56316339c0be 100644 --- a/dns/dnsmasq/Makefile +++ b/dns/dnsmasq/Makefile @@ -6,8 +6,7 @@ # PORTNAME= dnsmasq -PORTVERSION= 2.56 -PORTREVISION= 1 +PORTVERSION= 2.57 PORTEPOCH= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ \ @@ -33,10 +32,9 @@ MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" OPTIONS= IPV6 "IPv6 support" on OPTIONS+= DBUS "DBUS support" off -OPTIONS+= NLS "NLS and IDN support" on -# unfortunately, NLS and IDN are inseparable in dnsmasq 2.56, this -# has been reported to Simon Kelley on 2009-10-01 and 2011-02-16 -# by the port maintainer. +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 .include <bsd.port.pre.mk> @@ -53,19 +51,34 @@ USE_GETTEXT= yes USE_GMAKE= yes .else PLIST_SUB+= NLS="@comment " +.if defined(WITH_IDN) +MAKE_ARGS+= COPTS=-DHAVE_IDN +LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn +.endif .endif .if defined(WITH_DBUS) LIB_DEPENDS+= dbus-1:${PORTSDIR}/devel/dbus BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config CFLAGS+= -DHAVE_DBUS -.if ${OSVERSION} < 700000 -LDFLAGS+= ${PTHREAD_LIBS} -.endif .endif USE_RC_SUBR= dnsmasq.sh +pre-configure: + @: +.if defined(WITH_IDN) +.if defined(WITHOUT_NLS) + @if ${OBJDUMP} -p ${LOCALBASE}/lib/libidn.so \ + | ${EGREP} -q "NEEDED[[:space:]]+lib(intl|iconv)\.so" ; \ + then ${ECHO} ; ${ECHO} 'WARNING: dns/libidn was compiled with NLS support!' ; \ + ${ECHO} 'Recompile libidn WITHOUT_NLS to get rid of NLS dependencies.' ; ${ECHO} ; \ + fi +.else + @${ECHO} 'WARNING: IDN and NLS enabled, building IDN WITH NLS.' +.endif +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${PREFIX}/etc diff --git a/dns/dnsmasq/distinfo b/dns/dnsmasq/distinfo index b44ae69b5bb2..00ef27f7ef48 100644 --- a/dns/dnsmasq/distinfo +++ b/dns/dnsmasq/distinfo @@ -1,2 +1,2 @@ -SHA256 (dnsmasq-2.56.tar.lzma) = 36341d2534801cae3463489b79d912f9db8b5dbf5527efd69821a7984def2c33 -SIZE (dnsmasq-2.56.tar.lzma) = 331543 +SHA256 (dnsmasq-2.57.tar.lzma) = b35c5a31afce2b7c4bd62566d5dc87e1ce62d0d2ebd9c2baf15b5ea16bcc279d +SIZE (dnsmasq-2.57.tar.lzma) = 333348 diff --git a/dns/dnsmasq/files/patch-aa b/dns/dnsmasq/files/patch-aa deleted file mode 100644 index b3537516efb1..000000000000 --- a/dns/dnsmasq/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- src/util.c 2011-01-18 22:23:57.000000000 +0000 -+++ src/util.c 2011-02-16 09:37:37.000000000 +0000 -@@ -379,7 +379,7 @@ - while (maxlen == -1 || i < maxlen) - { - for (r = in; *r != 0 && *r != ':' && *r != '-'; r++) -- if (!isxdigit((int)*r)) -+ if (*r != '*' && !isxdigit((int)*r)) - return -1; - - if (*r == 0) |