svn commit: r470832 - in head/dns: bind9-devel bind910 bind911 bind912 bind913 bind913/files bind99

Mathieu Arnold mat at FreeBSD.org
Fri May 25 12:43:35 UTC 2018 

Author: mat
Date: Fri May 25 12:43:32 2018
New Revision: 470832
URL: https://svnweb.freebsd.org/changeset/ports/470832

Log:
  Add BIND9 9.13.0.
  
  The ISC changed their release model, they are now doing
  odd-unstable/even-stable release numbering.  This is a development
  version, consider it alpha/beta quality.  The next stable release will
  be 9.14.0.
  
  Changes:	https://kb.isc.org/article/AA-01612
  Sponsored by:	Absolight

Added:
  head/dns/bind913/
     - copied from r470831, head/dns/bind9-devel/
Modified:
  head/dns/bind9-devel/Makefile
  head/dns/bind910/Makefile
  head/dns/bind911/Makefile
  head/dns/bind912/Makefile
  head/dns/bind913/Makefile
  head/dns/bind913/distinfo
  head/dns/bind913/files/patch-configure
  head/dns/bind913/files/pkg-message.in
  head/dns/bind99/Makefile

Modified: head/dns/bind9-devel/Makefile
==============================================================================
--- head/dns/bind9-devel/Makefile	Fri May 25 11:51:39 2018	(r470831)
+++ head/dns/bind9-devel/Makefile	Fri May 25 12:43:32 2018	(r470832)
@@ -65,7 +65,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-c
 ETCDIR=		${PREFIX}/etc/namedb
 
 # XXX: Add -devel
-CONFLICTS=	bind99 bind910 bind911 bind912
+CONFLICTS=	bind99 bind910 bind911 bind912 bind913
 
 .if defined(BIND_TOOLS_SLAVE)
 CONFIGURE_ARGS+=	--disable-shared

Modified: head/dns/bind910/Makefile
==============================================================================
--- head/dns/bind910/Makefile	Fri May 25 11:51:39 2018	(r470831)
+++ head/dns/bind910/Makefile	Fri May 25 12:43:32 2018	(r470832)
@@ -41,7 +41,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-c
 		--sysconfdir=${ETCDIR}
 ETCDIR=		${PREFIX}/etc/namedb
 
-CONFLICTS=	bind-tools bind99 bind911 bind912 bind9-devel
+CONFLICTS=	bind-tools bind99 bind911 bind912 bind913 bind9-devel
 
 SUB_FILES=	pkg-message named.conf
 USE_RC_SUBR=	named

Modified: head/dns/bind911/Makefile
==============================================================================
--- head/dns/bind911/Makefile	Fri May 25 11:51:39 2018	(r470831)
+++ head/dns/bind911/Makefile	Fri May 25 12:43:32 2018	(r470832)
@@ -38,7 +38,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-c
 		--sysconfdir=${ETCDIR}
 ETCDIR=		${PREFIX}/etc/namedb
 
-CONFLICTS=	bind-tools bind99 bind910 bind912 bind9-devel
+CONFLICTS=	bind-tools bind99 bind910 bind912 bind913 bind9-devel
 
 SUB_FILES=	pkg-message named.conf
 USE_RC_SUBR=	named

Modified: head/dns/bind912/Makefile
==============================================================================
--- head/dns/bind912/Makefile	Fri May 25 11:51:39 2018	(r470831)
+++ head/dns/bind912/Makefile	Fri May 25 12:43:32 2018	(r470832)
@@ -52,7 +52,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-c
 		--sysconfdir=${ETCDIR}
 ETCDIR=		${PREFIX}/etc/namedb
 
-CONFLICTS=	bind99 bind910 bind911 bind9-devel
+CONFLICTS=	bind99 bind910 bind911 bind913 bind9-devel
 
 .if defined(BIND_TOOLS_SLAVE)
 CONFIGURE_ARGS+=	--disable-shared

Modified: head/dns/bind913/Makefile
==============================================================================
--- head/dns/bind9-devel/Makefile	Fri May 25 11:51:39 2018	(r470831)
+++ head/dns/bind913/Makefile	Fri May 25 12:43:32 2018	(r470832)
@@ -7,21 +7,17 @@ PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc
 # dns/bind-tools here
 PORTREVISION=	0
 .else
-# XXX: correct version
-# dns/bind9xx here
+# dns/bind913 here
 PORTREVISION=	0
 .endif
 CATEGORIES=	dns net ipv6
-# XXX: put the ISC master_site
-#MASTER_SITES=	ISC/bind9/${ISCVERSION}
-MASTER_SITES=	LOCAL/mat/bind
+MASTER_SITES=	ISC/bind9/${ISCVERSION}
 .if defined(BIND_TOOLS_SLAVE)
 PKGNAMESUFFIX=	-tools
 .else
-PKGNAMESUFFIX=	9-devel
+PKGNAMESUFFIX=	913
 .endif
-# XXX: correct DISTNAME.
-#DISTNAME=	${PORTNAME}-${ISCVERSION}
+DISTNAME=	${PORTNAME}-${ISCVERSION}
 
 MAINTAINER=	mat at FreeBSD.org
 .if defined(BIND_TOOLS_SLAVE)
@@ -34,17 +30,9 @@ LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.13.0a0.2018.05.18
-# XXX: Remove gitlab
-USE_GITLAB=	yes
-GL_SITE=	https://gitlab.isc.org
-GL_ACCOUNT=	isc-projects
-GL_PROJECT=	bind9
-GL_COMMIT=	e8dd921ef96582c1dbed099015f8e45e00ede439
+ISCVERSION=	9.13.0
+USES=	cpe libedit ssl
 
-# XXX: remove tar:bz2
-USES=	cpe libedit ssl tar:bz2
-
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
 .if ${ISCVERSION:M*-*}
@@ -64,13 +52,11 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-c
 		--sysconfdir=${ETCDIR}
 ETCDIR=		${PREFIX}/etc/namedb
 
-# XXX: Add -devel
-CONFLICTS=	bind99 bind910 bind911 bind912
+CONFLICTS=	bind99 bind910 bind911 bind912 bind9-devel
 
 .if defined(BIND_TOOLS_SLAVE)
 CONFIGURE_ARGS+=	--disable-shared
-# XXX: Change to the correct version
-CONFLICTS+=		bind9-devel
+CONFLICTS+=		bind913
 .else
 USE_RC_SUBR=	named
 SUB_FILES=	pkg-message named.conf
@@ -239,14 +225,7 @@ BROKEN=	OpenSSL from the base system does not support 
 	that needs SSL.
 .endif
 
-# XXX: Remove
-post-extract:
-	echo "SRCID=${GL_COMMIT}" > ${WRKSRC}/srcid
-
-# XXX: Remove first REINPLACE_CMD
 post-patch:
-	@${REINPLACE_CMD} -e '/RELEASETYPE=/s#$$#-${GL_COMMIT}#' \
-		${WRKSRC}/version
 .if defined(BIND_TOOLS_SLAVE)
 	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \
 		-e 's#isc-config.sh installdirs#installdirs#' \

Modified: head/dns/bind913/distinfo
==============================================================================
--- head/dns/bind9-devel/distinfo	Fri May 25 11:51:39 2018	(r470831)
+++ head/dns/bind913/distinfo	Fri May 25 12:43:32 2018	(r470832)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526897763
-SHA256 (isc-projects-bind9-e8dd921ef96582c1dbed099015f8e45e00ede439_GL0.tar.gz) = 986f430c0e814dfd06ed457eb8c39955e6e61a3b628a03f5ffd103de4313bdfb
-SIZE (isc-projects-bind9-e8dd921ef96582c1dbed099015f8e45e00ede439_GL0.tar.gz) = 8922126
+TIMESTAMP = 1527250140
+SHA256 (bind-9.13.0.tar.gz) = cac499088c7135d9486ba1fc8416088adec58eea9eeee017845383a1aff34ffc
+SIZE (bind-9.13.0.tar.gz) = 8906102

Modified: head/dns/bind913/files/patch-configure
==============================================================================
--- head/dns/bind9-devel/files/patch-configure	Fri May 25 11:51:39 2018	(r470831)
+++ head/dns/bind913/files/patch-configure	Fri May 25 12:43:32 2018	(r470832)
@@ -1,6 +1,6 @@
---- configure.orig	2018-05-18 05:44:02 UTC
+--- configure.orig	2018-05-22 23:42:35 UTC
 +++ configure
-@@ -14770,27 +14770,9 @@ done
+@@ -14757,27 +14757,9 @@ done
  		# problems start to show up.
  		saved_libs="$LIBS"
  		for TRY_LIBS in \
@@ -30,7 +30,7 @@
  		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
  $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
  		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -14833,47 +14815,7 @@ $as_echo "no" >&6; } ;;
+@@ -14820,47 +14802,7 @@ $as_echo "no" >&6; } ;;
  		no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
  		esac
  
@@ -79,7 +79,7 @@
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -23338,7 +23280,7 @@ $as_echo "" >&6; }
+@@ -23329,7 +23271,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  

Modified: head/dns/bind913/files/pkg-message.in
==============================================================================
--- head/dns/bind9-devel/files/pkg-message.in	Fri May 25 11:51:39 2018	(r470831)
+++ head/dns/bind913/files/pkg-message.in	Fri May 25 12:43:32 2018	(r470832)
@@ -21,7 +21,7 @@
 *    And then restarting syslogd with: service syslogd restart       *
 *                                                                    *
 *                                                                    *
-*   THIS IS A DEVELOPMENT VERSION IF BIND, IT WILL EAT YOUR DATA     *
+*   THIS IS A DEVELOPMENT VERSION IF BIND, IT MAY EAT YOUR DATA      *
 *                                                                    *
 *                                                                    *
 *                                                                    *

Modified: head/dns/bind99/Makefile
==============================================================================
--- head/dns/bind99/Makefile	Fri May 25 11:51:39 2018	(r470831)
+++ head/dns/bind99/Makefile	Fri May 25 12:43:32 2018	(r470832)
@@ -41,7 +41,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-c
 		--sysconfdir=${ETCDIR}
 ETCDIR=		${PREFIX}/etc/namedb
 
-CONFLICTS=	bind-tools bind9-devel bind910 bind911 bind912
+CONFLICTS=	bind-tools bind9-devel bind910 bind911 bind912 bind913
 
 SUB_FILES=	pkg-message named.conf
 USE_RC_SUBR=	named

More information about the svn-ports-all mailing list