Date: Sun, 12 Apr 2020 01:59:59 +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: r531473 - in head: . dns dns/dnsmasq dns/dnsmasq-devel dns/dnsmasq/files Message-ID: <202004120159.03C1xxiZ051199@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Sun Apr 12 01:59:59 2020 New Revision: 531473 URL: https://svnweb.freebsd.org/changeset/ports/531473 Log: dns/dnsmasq: update to 2.81, unlink dnsmasq-devel Update dns/dnsmasq to the new upstream version 2.81. The Makefile has been rearranged with portfmt, except the LDFLAGS+=..._intllibs... line that portfmt does not recognize. Changelog: <http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob;f=CHANGELOG;h=60b08d015b2d5a979f39b8ad43633b419135cb64;hb=7ddb99d251c3f5870c8c308a98bb8f283c831872#l1> (or see CHANGELOG in the package) Unlink dnsmasq-devel from the build, but keep the sources, and mark it IGNORE and list dnsmasq-devel in MOVED. Deleted: head/dns/dnsmasq/files/patch-src_crypto.c head/dns/dnsmasq/files/patch-src_tftp.c Modified: head/MOVED head/dns/Makefile head/dns/dnsmasq-devel/Makefile head/dns/dnsmasq/Makefile head/dns/dnsmasq/distinfo Modified: head/MOVED ============================================================================== --- head/MOVED Sun Apr 12 01:49:49 2020 (r531472) +++ head/MOVED Sun Apr 12 01:59:59 2020 (r531473) @@ -14523,3 +14523,4 @@ devel/rubygem-cucumber-tag_expressions|devel/rubygem-c devel/p5-Glib2|devel/p5-Glib|2020-04-07|Rename to match our p5- port naming devel/jucipp|editors/jucipp|2020-04-07|Remove duplicate www/py-django_polymorphic|www/py-django-polymorphic|2020-04-11|Match canonical/registered (PyPI/CHEESESHOP) name +dns/dnsmasq-devel|dns/dnsmasq|2020-04-12|dnsmasq is newer than dnsmasq-devel Modified: head/dns/Makefile ============================================================================== --- head/dns/Makefile Sun Apr 12 01:49:49 2020 (r531472) +++ head/dns/Makefile Sun Apr 12 01:59:59 2020 (r531473) @@ -48,7 +48,6 @@ SUBDIR += dnshistory SUBDIR += dnsjava SUBDIR += dnsmasq - SUBDIR += dnsmasq-devel SUBDIR += dnsmax-perl SUBDIR += dnsperf SUBDIR += dnsproxy Modified: head/dns/dnsmasq-devel/Makefile ============================================================================== --- head/dns/dnsmasq-devel/Makefile Sun Apr 12 01:49:49 2020 (r531472) +++ head/dns/dnsmasq-devel/Makefile Sun Apr 12 01:59:59 2020 (r531473) @@ -14,37 +14,45 @@ COMMENT= Lightweight DNS forwarder, DHCP, and TFTP ser LICENSE= GPLv2 +IGNORE= please use dns/dnsmasq, which is newer, instead + USES= cpe shebangfix tar:xz -CONFLICTS_INSTALL=dnsmasq-2* +CONFLICTS_INSTALL= dnsmasq-2* PORTDOCS= CHANGELOG CHANGELOG.archive FAQ doc.html setup.html SUB_FILES= pkg-message -CFLAGS+= -Wall -Wno-unused-value -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function +CFLAGS+= -Wall -Wno-unused-function -Wno-unused-parameter \ + -Wno-unused-value -Wno-unused-variable CPPFLAGS+= -I${LOCALBASE}/include -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" COPTS="${CFLAGS}" LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}" +MAKE_ARGS= CC="${CC}" \ + CFLAGS="${CFLAGS}" \ + COPTS="${CFLAGS}" \ + LIBS="${LDFLAGS}" \ + PREFIX="${PREFIX}" \ + RPM_OPT_FLAGS="${CPPFLAGS}" -OPTIONS_DEFINE= IPSET IPV6 DBUS LUA DNSSEC DOCS +OPTIONS_DEFINE= DBUS DNSSEC DOCS IPSET IPV6 LUA OPTIONS_DEFAULT= DNSSEC IPSET OPTIONS_EXCLUDE+= EXAMPLES 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 -IPSET_DESC= Dynamic firewall management of resolved names (needs PF) -LUA_DESC= Support lease-change scripts written in Lua -DNSSEC_DESC= Enable DNSSEC caching and validation -SHEBANG_FILES= contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl \ - contrib/dnslist/dnslist.pl -CPE_VENDOR= thekelleys -CPE_VERSION= ${DISTVERSION:C/r.*//} -CPE_UPDATE= ${DISTVERSION:C/.*rc/rc/} +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 +IPSET_DESC= Dynamic firewall management of resolved names (needs PF) +LUA_DESC= Support lease-change scripts written in Lua +DNSSEC_DESC= Enable DNSSEC caching and validation +SHEBANG_FILES= contrib/dnslist/dnslist.pl \ + contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl +CPE_VENDOR= thekelleys +CPE_VERSION= ${DISTVERSION:C/r.*//} +CPE_UPDATE= ${DISTVERSION:C/.*rc/rc/} -IPV6_CFLAGS_OFF=-DNO_IPV6 -IPSET_CFLAGS_OFF=-DNO_IPSET +IPV6_CFLAGS_OFF= -DNO_IPV6 +IPSET_CFLAGS_OFF= -DNO_IPSET .include <bsd.port.options.mk> @@ -84,15 +92,15 @@ USES+= lua pkgconfig .if ${PORT_OPTIONS:MDNSSEC} CFLAGS+= -DHAVE_DNSSEC -I${LOCALBASE}/include USES+= pkgconfig -LIB_DEPENDS+= libnettle.so:security/nettle -LIB_DEPENDS+= libgmp.so:math/gmp +LIB_DEPENDS+= libgmp.so:math/gmp \ + libnettle.so:security/nettle .endif USE_RC_SUBR= dnsmasq .include <bsd.port.pre.mk> -LDFLAGS+= -L${LOCALBASE}/lib ${_intllibs} ${ICONV_LIB} +LDFLAGS+= ${_intllibs} ${ICONV_LIB} -L${LOCALBASE}/lib pre-configure: pretty-print-config .if ${PORT_OPTIONS:MIDN} Modified: head/dns/dnsmasq/Makefile ============================================================================== --- head/dns/dnsmasq/Makefile Sun Apr 12 01:49:49 2020 (r531472) +++ head/dns/dnsmasq/Makefile Sun Apr 12 01:59:59 2020 (r531473) @@ -2,8 +2,9 @@ # $FreeBSD$ PORTNAME= dnsmasq -DISTVERSION= 2.80 -PORTREVISION= 4 # leave this in even if 0 to avoid PORTEPOCH bumps +DISTVERSION= 2.81 +# Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps: +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= dns MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ \ @@ -14,34 +15,43 @@ COMMENT= Lightweight DNS forwarder, DHCP, and TFTP ser LICENSE= GPLv2 -CONFLICTS_INSTALL=dnsmasq-devel-* +USES= cpe shebangfix tar:xz +CPE_VENDOR= thekelleys -PORTDOCS= CHANGELOG CHANGELOG.archive FAQ doc.html setup.html +SHEBANG_FILES= contrib/dnslist/dnslist.pl \ + contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl +MAKE_ARGS= CC="${CC}" \ + CFLAGS="${CFLAGS}" \ + COPTS="${CFLAGS}" \ + LIBS="${LDFLAGS}" \ + PREFIX="${PREFIX}" \ + RPM_OPT_FLAGS="${CPPFLAGS}" +CFLAGS+= -Wall -Wno-unused-function -Wno-unused-parameter \ + -Wno-unused-value -Wno-unused-variable +CPPFLAGS+= -I${LOCALBASE}/include + +CONFLICTS_INSTALL= dnsmasq-devel-* + SUB_FILES= pkg-message -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}" +PORTDOCS= CHANGELOG CHANGELOG.archive FAQ doc.html setup.html -OPTIONS_DEFINE= IPSET IPV6 DBUS LUA DNSSEC DOCS +OPTIONS_DEFINE= DBUS DNSSEC DOCS IPSET IPV6 LUA OPTIONS_DEFAULT= DNSSEC IPSET -OPTIONS_EXCLUDE+= EXAMPLES OPTIONS_RADIO= INTL OPTIONS_RADIO_INTL= IDN NLS -INTL_DESC= Internationalization Support Level -NLS_DESC= IDN+NLS: Int'l Domain Names & National Language support +OPTIONS_EXCLUDE+= EXAMPLES + +DNSSEC_DESC= Enable DNSSEC caching and validation (needs nettle) IDN_DESC= IDN: Int'l Domain Names WITHOUT full NLS +INTL_DESC= Internationalization Support Level IPSET_DESC= Dynamic firewall management of resolved names (needs PF) LUA_DESC= Support lease-change scripts written in Lua -DNSSEC_DESC= Enable DNSSEC caching and validation -USES= cpe shebangfix tar:xz -SHEBANG_FILES= contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl \ - contrib/dnslist/dnslist.pl -CPE_VENDOR= thekelleys +NLS_DESC= IDN+NLS: Int'l Domain Names & National Language support -IPV6_CFLAGS_OFF=-DNO_IPV6 -IPSET_CFLAGS_OFF=-DNO_IPSET +IPSET_CFLAGS_OFF= -DNO_IPSET +IPV6_CFLAGS_OFF= -DNO_IPV6 .include <bsd.port.options.mk> @@ -75,14 +85,14 @@ LDFLAGS+= `pkg-config --libs dbus-1` CPPFLAGS+= -I${LUA_INCDIR} CFLAGS+= -DHAVE_LUASCRIPT LDFLAGS+= -L${LUA_LIBDIR} -llua-${LUA_VER} -USES+= lua +USES+= lua pkgconfig .endif .if ${PORT_OPTIONS:MDNSSEC} CFLAGS+= -DHAVE_DNSSEC -I${LOCALBASE}/include USES+= pkgconfig -LIB_DEPENDS+= libnettle.so:security/nettle -LIB_DEPENDS+= libgmp.so:math/gmp +LIB_DEPENDS+= libgmp.so:math/gmp \ + libnettle.so:security/nettle .endif USE_RC_SUBR= dnsmasq @@ -90,6 +100,9 @@ USE_RC_SUBR= dnsmasq .include <bsd.port.pre.mk> LDFLAGS+= -L${LOCALBASE}/lib ${_intllibs} ${ICONV_LIB} + +post-patch: + ${REINPLACE_CMD} -e '/^lua_/s/lua5\.2/lua-${LUA_VER}/' ${WRKSRC}/Makefile pre-configure: pretty-print-config .if ${PORT_OPTIONS:MIDN} Modified: head/dns/dnsmasq/distinfo ============================================================================== --- head/dns/dnsmasq/distinfo Sun Apr 12 01:49:49 2020 (r531472) +++ head/dns/dnsmasq/distinfo Sun Apr 12 01:59:59 2020 (r531473) @@ -1,3 +1,3 @@ -TIMESTAMP = 1539932660 -SHA256 (dnsmasq-2.80.tar.xz) = cdaba2785e92665cf090646cba6f94812760b9d7d8c8d0cfb07ac819377a63bb -SIZE (dnsmasq-2.80.tar.xz) = 501072 +TIMESTAMP = 1586652751 +SHA256 (dnsmasq-2.81.tar.xz) = 749ca903537c5197c26444ac24b0dce242cf42595fdfe6b9a5b9e4c7ad32f8fb +SIZE (dnsmasq-2.81.tar.xz) = 510648
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004120159.03C1xxiZ051199>