From owner-svn-ports-all@FreeBSD.ORG Wed Sep 10 21:12:09 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE04C8F9; Wed, 10 Sep 2014 21:12:09 +0000 (UTC) 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 99592D72; Wed, 10 Sep 2014 21:12:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8ALC98J073649; Wed, 10 Sep 2014 21:12:09 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8ALC9Oc073644; Wed, 10 Sep 2014 21:12:09 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201409102112.s8ALC9Oc073644@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Wed, 10 Sep 2014 21:12:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367894 - 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-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Sep 2014 21:12:09 -0000 Author: mandree Date: Wed Sep 10 21:12:08 2014 New Revision: 367894 URL: http://svnweb.freebsd.org/changeset/ports/367894 QAT: https://qat.redports.org/buildarchive/r367894/ Log: Forward port dnsmasq changes from previous versions, to update the port and fix 10/11 build issues. Modified: head/dns/dnsmasq-devel/Makefile head/dns/dnsmasq-devel/pkg-plist Modified: head/dns/dnsmasq-devel/Makefile ============================================================================== --- head/dns/dnsmasq-devel/Makefile Wed Sep 10 21:10:20 2014 (r367893) +++ head/dns/dnsmasq-devel/Makefile Wed Sep 10 21:12:08 2014 (r367894) @@ -3,6 +3,7 @@ PORTNAME= dnsmasq DISTVERSION= 2.72rc1 +PORTREVISION= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/release-candidates/ PKGNAMESUFFIX= -devel @@ -19,14 +20,18 @@ PORTDOCS= CHANGELOG CHANGELOG.archive FA SUB_FILES= pkg-message CFLAGS+= -Wall -Wno-unused-value +CPPFLAGS+= -I${LOCALBASE}/include MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" COPTS="${CFLAGS}" LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}" -OPTIONS_DEFINE= IPV6 DBUS NLS IDN LUA DNSSEC DOCS +OPTIONS_DEFINE= IPV6 DBUS LUA DNSSEC DOCS OPTIONS_DEFAULT= IPV6 NLS DNSSEC 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 +OPTIONS_RADIO= INTL +OPTIONS_RADIO_INTL= IDN NLS +INTL_DESC= Internationalization Support Level +NLS_DESC= IDN+NLS: Int'l Domain Names & National Language support +IDN_DESC= IDN: Int'l Domain Names WITHOUT full NLS +LUA_DESC= Support lease-change scripts written in Lua DNSSEC_DESC= Enable DNSSEC caching and validation USES= shebangfix tar:xz SHEBANG_FILES= contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl \ @@ -39,32 +44,40 @@ CFLAGS+= -DNO_IPV6 .endif .if ${PORT_OPTIONS:MNLS} -USES+= pkgconfig gettext +USES+= pkgconfig gettext iconv gmake LIB_DEPENDS+= libidn.so:${PORTSDIR}/dns/libidn PLIST_SUB+= NLS="" ALL_TARGET= all-i18n -USES+= gmake +_intllibs= -lintl .else +_intllibs= PLIST_SUB+= NLS="@comment " .if ${PORT_OPTIONS:MIDN} +USES+= iconv CFLAGS+= -DHAVE_IDN LIB_DEPENDS+= libidn.so:${PORTSDIR}/dns/libidn +_intllibs+= -lidn .endif .endif .if ${PORT_OPTIONS:MDBUS} LIB_DEPENDS+= libdbus-1.so:${PORTSDIR}/devel/dbus USES+= pkgconfig +CPPFLAGS+= `pkg-config --cflags dbus-1` CFLAGS+= -DHAVE_DBUS +LDFLAGS+= `pkg-config --libs dbus-1` .endif .if ${PORT_OPTIONS:MLUA} +CPPFLAGS+= -I${LUA_INCDIR} CFLAGS+= -DHAVE_LUASCRIPT +LDFLAGS+= -L${LUA_LIBDIR} -llua-${LUA_VER} USES+= lua .endif .if ${PORT_OPTIONS:MDNSSEC} CFLAGS+= -DHAVE_DNSSEC +USES+= pkgconfig LIB_DEPENDS+= libnettle.so:${PORTSDIR}/security/nettle LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp .endif @@ -73,15 +86,16 @@ USE_RC_SUBR= dnsmasq .include +LDFLAGS+= -L${LOCALBASE}/lib ${_intllibs} ${ICONV_LIB} + post-patch: ${REINPLACE_CMD} -e "s/lua5\.1/lua-${LUA_VER}/" ${WRKSRC}/Makefile -pre-configure: - @: +pre-configure: pretty-print-config .if ${PORT_OPTIONS:MIDN} .if empty(PORT_OPTIONS:MNLS) @if ${OBJDUMP} -p ${LOCALBASE}/lib/libidn.so \ - | ${EGREP} -q "NEEDED[[:space:]]+lib(intl|iconv)\.so" ; \ + | ${EGREP} -q 'NEEDED[[:space:]]+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} ; \ fi Modified: head/dns/dnsmasq-devel/pkg-plist ============================================================================== --- head/dns/dnsmasq-devel/pkg-plist Wed Sep 10 21:10:20 2014 (r367893) +++ head/dns/dnsmasq-devel/pkg-plist Wed Sep 10 21:12:08 2014 (r367894) @@ -3,15 +3,15 @@ sbin/dnsmasq etc/dnsmasq.conf.example @exec if [ ! -f %D/etc/dnsmasq.conf ]; then cp -p %D/%F %B/dnsmasq.conf; fi man/man8/dnsmasq.8.gz -share/dnsmasq/trust-anchors.conf +%%DATADIR%%/trust-anchors.conf %%EXAMPLESDIR%%/dnslist/dhcp.css %%EXAMPLESDIR%%/dnslist/dnslist.pl %%EXAMPLESDIR%%/dnslist/dnslist.tt2 %%EXAMPLESDIR%%/dynamic-dnsmasq/dynamic-dnsmasq.pl -@dirrm share/dnsmasq @dirrm %%EXAMPLESDIR%%/dnslist @dirrm %%EXAMPLESDIR%%/dynamic-dnsmasq @dirrm %%EXAMPLESDIR%% +@dirrmtry %%DATADIR%% %%NLS%%share/locale/de/LC_MESSAGES/dnsmasq.mo %%NLS%%share/locale/es/LC_MESSAGES/dnsmasq.mo %%NLS%%share/locale/fi/LC_MESSAGES/dnsmasq.mo