Date: Mon, 22 May 2017 22:53:11 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441496 - in head/dns/dnsmasq-devel: . files Message-ID: <201705222253.v4MMrBDa055436@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Mon May 22 22:53:11 2017 New Revision: 441496 URL: https://svnweb.freebsd.org/changeset/ports/441496 Log: Update to new upstream release candidate #5. Switch IDN support from libidn to libidn2. Drop patches integrated upstream. Deleted: head/dns/dnsmasq-devel/files/patch-src_edns0.c head/dns/dnsmasq-devel/files/patch-src_forward.c Modified: head/dns/dnsmasq-devel/Makefile head/dns/dnsmasq-devel/distinfo Modified: head/dns/dnsmasq-devel/Makefile ============================================================================== --- head/dns/dnsmasq-devel/Makefile Mon May 22 22:48:09 2017 (r441495) +++ head/dns/dnsmasq-devel/Makefile Mon May 22 22:53:11 2017 (r441496) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dnsmasq -DISTVERSION= 2.77rc4 +DISTVERSION= 2.77rc5 PORTEPOCH= 2 CATEGORIES= dns ipv6 MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/release-candidates/ @@ -21,7 +21,7 @@ PORTDOCS= CHANGELOG CHANGELOG.archive FA SUB_FILES= pkg-message -CFLAGS+= -Wall -Wno-unused-value -Wno-unused-parameter +CFLAGS+= -Wall -Wno-unused-value -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function CPPFLAGS+= -I${LOCALBASE}/include MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" COPTS="${CFLAGS}" LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}" @@ -50,18 +50,19 @@ IPSET_CFLAGS_OFF=-DNO_IPSET .if ${PORT_OPTIONS:MNLS} USES+= gettext gmake iconv pkgconfig -LIB_DEPENDS+= libidn.so:dns/libidn +CFLAGS+= -DHAVE_LIBIDN2 +LIB_DEPENDS+= libidn2.so:dns/libidn2 PLIST_SUB+= NLS="" ALL_TARGET= all-i18n -_intllibs= -lintl +_intllibs= -lidn2 -lintl .else _intllibs= PLIST_SUB+= NLS="@comment " .if ${PORT_OPTIONS:MIDN} USES+= iconv -CFLAGS+= -DHAVE_IDN -LIB_DEPENDS+= libidn.so:dns/libidn -_intllibs+= -lidn +CFLAGS+= -DHAVE_LIBIDN2 +LIB_DEPENDS+= libidn2.so:dns/libidn2 +_intllibs+= -lidn2 .endif .endif @@ -99,10 +100,10 @@ post-patch: pre-configure: pretty-print-config .if ${PORT_OPTIONS:MIDN} .if empty(PORT_OPTIONS:MNLS) - @if ${READELF} -d ${LOCALBASE}/lib/libidn.so \ + @if ${READELF} -d ${LOCALBASE}/lib/libidn2.so \ | ${EGREP} -q '\<NEEDED\>.*\[libintl\.so' ; \ - then ${ECHO} ; ${ECHO} 'WARNING: dns/libidn was compiled with NLS support!' ; \ - ${ECHO} 'Recompile libidn WITHOUT_NLS to get rid of NLS dependencies.' ; ${ECHO} ; \ + then ${ECHO} ; ${ECHO} 'WARNING: dns/libidn2 was compiled with NLS support!' ; \ + ${ECHO} 'Recompile libidn2 WITHOUT_NLS to get rid of NLS dependencies.' ; ${ECHO} ; \ fi .else @${ECHO} 'WARNING: IDN and NLS enabled, building IDN WITH NLS.' Modified: head/dns/dnsmasq-devel/distinfo ============================================================================== --- head/dns/dnsmasq-devel/distinfo Mon May 22 22:48:09 2017 (r441495) +++ head/dns/dnsmasq-devel/distinfo Mon May 22 22:53:11 2017 (r441496) @@ -1,3 +1,3 @@ -TIMESTAMP = 1495362006 -SHA256 (dnsmasq-2.77rc4.tar.xz) = e357de7faa5fb34098635b7f6000a16cc7aa703a9c41de9d392b4ef594eb1abb -SIZE (dnsmasq-2.77rc4.tar.xz) = 503480 +TIMESTAMP = 1495487478 +SHA256 (dnsmasq-2.77rc5.tar.xz) = d9447e9307234c4818ca0e0d9818e1d62da65eaf32ee37ea9bdc47c82068f560 +SIZE (dnsmasq-2.77rc5.tar.xz) = 503548
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705222253.v4MMrBDa055436>