Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Jul 2020 20:25:00 +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: r542155 - in head: . dns dns/dnsmasq-devel
Message-ID:  <202007132025.06DKP0Ls000765@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Mon Jul 13 20:24:59 2020
New Revision: 542155
URL: https://svnweb.freebsd.org/changeset/ports/542155

Log:
  dns/dnsmasq-devel: revive port and update to 2.82rc1
  
  http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob;f=CHANGELOG;h=4b4e5b345170ab1e3a54d8d2847f500664a84d8d;hb=4d85e409cd2f4b0935d6ac5e8c72f6a151735d52#l1

Added:
  head/dns/dnsmasq-devel/
     - copied from r533085, head/dns/dnsmasq-devel/
Modified:
  head/MOVED
  head/dns/Makefile
  head/dns/dnsmasq-devel/Makefile
  head/dns/dnsmasq-devel/distinfo

Modified: head/MOVED
==============================================================================
--- head/MOVED	Mon Jul 13 20:22:33 2020	(r542154)
+++ head/MOVED	Mon Jul 13 20:24:59 2020	(r542155)
@@ -14500,7 +14500,6 @@ math/mkl-dnn|math/onednn|2020-04-04|Project renamed
 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
 databases/mariadb55-server|databases/mariadb102-server|2020-04-12|Has expired: Upstream end-of-life 2020-04-11, switch to a newer version
 databases/mariadb55-client|databases/mariadb102-client|2020-04-12|Has expired: Upstream end-of-life 2020-04-11, switch to a newer version
 devel/aws-c-commons|devel/aws-c-common|2020-04-12|Renamed to the correct name

Modified: head/dns/Makefile
==============================================================================
--- head/dns/Makefile	Mon Jul 13 20:22:33 2020	(r542154)
+++ head/dns/Makefile	Mon Jul 13 20:24:59 2020	(r542155)
@@ -47,6 +47,7 @@
     SUBDIR += dnshistory
     SUBDIR += dnsjava
     SUBDIR += dnsmasq
+    SUBDIR += dnsmasq-devel
     SUBDIR += dnsmax-perl
     SUBDIR += dnsproxy
     SUBDIR += dnsrecon

Modified: head/dns/dnsmasq-devel/Makefile
==============================================================================
--- head/dns/dnsmasq-devel/Makefile	Sun Apr 26 21:32:58 2020	(r533085)
+++ head/dns/dnsmasq-devel/Makefile	Mon Jul 13 20:24:59 2020	(r542155)
@@ -2,7 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	dnsmasq
-DISTVERSION=	2.81rc5
+DISTVERSION=	2.82rc1
+# Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps:
+PORTREVISION=	0
 PORTEPOCH=	3
 CATEGORIES=	dns
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/release-candidates/
@@ -14,45 +16,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
+CPE_VENDOR=	thekelleys
+CPE_VERSION=	${DISTVERSION:C/r.*//}
+CPE_UPDATE=	${DISTVERSION:C/.*rc/rc/}
 
-CONFLICTS_INSTALL=	dnsmasq-2*
+SHEBANG_FILES=	contrib/dnslist/dnslist.pl \
+		contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl
 
-PORTDOCS=	CHANGELOG CHANGELOG.archive FAQ doc.html setup.html
-
-SUB_FILES=	pkg-message
-
-CFLAGS+=	-Wall -Wno-unused-function -Wno-unused-parameter \
-		-Wno-unused-value -Wno-unused-variable
-CPPFLAGS+=	-I${LOCALBASE}/include
 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-2*
+
+SUB_FILES=	pkg-message
+
+PORTDOCS=	CHANGELOG CHANGELOG.archive FAQ doc.html setup.html
+
 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/dnslist/dnslist.pl \
-			contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl
-CPE_VENDOR=		thekelleys
-CPE_VERSION=		${DISTVERSION:C/r.*//}
-CPE_UPDATE=		${DISTVERSION:C/.*rc/rc/}
+OPTIONS_EXCLUDE+=	EXAMPLES
 
-IPV6_CFLAGS_OFF=	-DNO_IPV6
+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
+NLS_DESC=	IDN+NLS: Int'l Domain Names & National Language support
+
 IPSET_CFLAGS_OFF=	-DNO_IPSET
+IPV6_CFLAGS_OFF=	-DNO_IPV6
 
 .include <bsd.port.options.mk>
 
@@ -100,8 +102,11 @@ USE_RC_SUBR=	dnsmasq
 
 .include <bsd.port.pre.mk>
 
-LDFLAGS+=	${_intllibs} ${ICONV_LIB} -L${LOCALBASE}/lib
+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}
 .if empty(PORT_OPTIONS:MNLS)
@@ -114,9 +119,6 @@ pre-configure: pretty-print-config
 	@${ECHO} 'WARNING: IDN and NLS enabled, building IDN WITH NLS.'
 .endif
 .endif
-
-post-patch:
-	${REINPLACE_CMD} -e '/^lua_/s/lua5\.2/lua-${LUA_VER}/' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${STAGEDIR}${PREFIX}/sbin

Modified: head/dns/dnsmasq-devel/distinfo
==============================================================================
--- head/dns/dnsmasq-devel/distinfo	Sun Apr 26 21:32:58 2020	(r533085)
+++ head/dns/dnsmasq-devel/distinfo	Mon Jul 13 20:24:59 2020	(r542155)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586075683
-SHA256 (dnsmasq-2.81rc5.tar.xz) = d95439b0f0b3d540fd4a10fc150efa7478e0d70db8168d76550562dadf9fc433
-SIZE (dnsmasq-2.81rc5.tar.xz) = 528996
+TIMESTAMP = 1594670669
+SHA256 (dnsmasq-2.82rc1.tar.xz) = 5f27c96a08f25881e3ef582cb74d3a88488b2debac52ccf95390ffd38e965867
+SIZE (dnsmasq-2.82rc1.tar.xz) = 530368



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007132025.06DKP0Ls000765>