Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Jun 2018 10:31:31 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r471831 - in head/dns: bind9-devel bind911 bind912 bind913
Message-ID:  <201806061031.w56AVVu8016720@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Wed Jun  6 10:31:30 2018
New Revision: 471831
URL: https://svnweb.freebsd.org/changeset/ports/471831

Log:
  Move things around a bit to be more handbook compliant.
  
  Sponsored by:	Absolight

Modified:
  head/dns/bind9-devel/Makefile   (contents, props changed)
  head/dns/bind911/Makefile   (contents, props changed)
  head/dns/bind912/Makefile   (contents, props changed)
  head/dns/bind913/Makefile   (contents, props changed)

Modified: head/dns/bind9-devel/Makefile
==============================================================================
--- head/dns/bind9-devel/Makefile	Wed Jun  6 09:34:25 2018	(r471830)
+++ head/dns/bind9-devel/Makefile	Wed Jun  6 10:31:30 2018	(r471831)
@@ -35,6 +35,10 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 BROKEN_powerpc64=	fails to link: /usr/bin/ld: cannot find -latomic
 
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
+
+# XXX: remove tar:bz2
+USES=	cpe libedit ssl tar:bz2
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
 ISCVERSION=	9.13.0a0.2018.06.03
 # XXX: Remove gitlab
@@ -44,17 +48,12 @@ GL_ACCOUNT=	isc-projects
 GL_PROJECT=	bind9
 GL_COMMIT=	193cc42b442996685caa94ec8aec914ecf6d3357
 
-# XXX: remove tar:bz2
-USES=	cpe libedit ssl tar:bz2
-
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
 .if ${ISCVERSION:M*-*}
 CPE_UPDATE=	${ISCVERSION:C/.*-//:tl}
 .endif
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 		--disable-symtable \
@@ -168,15 +167,15 @@ GOST_ASN1_CONFIGURE_ON=	--with-gost=asn1
 
 GOST_CONFIGURE_ON=	--with-gost
 
-GSSAPI_BASE_CONFIGURE_ON= \
+GSSAPI_BASE_CONFIGURE_ON=\
 	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
 GSSAPI_BASE_USES=	gssapi
 
-GSSAPI_HEIMDAL_CONFIGURE_ON= \
+GSSAPI_HEIMDAL_CONFIGURE_ON=\
 	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
 
-GSSAPI_MIT_CONFIGURE_ON= \
+GSSAPI_MIT_CONFIGURE_ON=\
 	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
 GSSAPI_MIT_USES=	gssapi:mit
 
@@ -214,7 +213,6 @@ RPZ_NSDNAME_CONFIGURE_ENABLE=	rpz-nsdname
 RPZ_NSIP_CONFIGURE_ENABLE=	rpz-nsip
 
 SIGCHASE_CONFIGURE_ON=	STD_CDEFINES="-DDIG_SIGCHASE=1"
-
 
 START_LATE_SUB_LIST=	NAMED_REQUIRE="SERVERS cleanvar" \
 			NAMED_BEFORE="LOGIN"

Modified: head/dns/bind911/Makefile
==============================================================================
--- head/dns/bind911/Makefile	Wed Jun  6 09:34:25 2018	(r471830)
+++ head/dns/bind911/Makefile	Wed Jun  6 10:31:30 2018	(r471831)
@@ -15,19 +15,19 @@ COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.11.3
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 USES=	cpe libedit
 
+# ISC releases things like 9.8.0-P1, which our versioning doesn't like
+ISCVERSION=	9.11.3
+
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
 .if ${ISCVERSION:M*-*}
 CPE_UPDATE=	${ISCVERSION:C/.*-//:tl}
 .endif
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 		--disable-symtable \
@@ -135,15 +135,15 @@ GOST_ASN1_CONFIGURE_ON=	--with-gost=asn1
 
 GOST_CONFIGURE_ON=	--with-gost
 
-GSSAPI_BASE_CONFIGURE_ON= \
+GSSAPI_BASE_CONFIGURE_ON=\
 	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
 GSSAPI_BASE_USES=	gssapi
 
-GSSAPI_HEIMDAL_CONFIGURE_ON= \
+GSSAPI_HEIMDAL_CONFIGURE_ON=\
 	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
 
-GSSAPI_MIT_CONFIGURE_ON= \
+GSSAPI_MIT_CONFIGURE_ON=\
 	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
 GSSAPI_MIT_USES=	gssapi:mit
 

Modified: head/dns/bind912/Makefile
==============================================================================
--- head/dns/bind912/Makefile	Wed Jun  6 09:34:25 2018	(r471830)
+++ head/dns/bind912/Makefile	Wed Jun  6 10:31:30 2018	(r471831)
@@ -31,19 +31,18 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 BROKEN_powerpc64=	fails to link: /usr/bin/ld: cannot find -latomic
 
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
+
+USES=	cpe libedit
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
 ISCVERSION=	9.12.1-P2
 
-USES=	cpe libedit
-
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
 .if ${ISCVERSION:M*-*}
 CPE_UPDATE=	${ISCVERSION:C/.*-//:tl}
 .endif
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 		--disable-symtable \
@@ -155,15 +154,15 @@ GOST_ASN1_CONFIGURE_ON=	--with-gost=asn1
 
 GOST_CONFIGURE_ON=	--with-gost
 
-GSSAPI_BASE_CONFIGURE_ON= \
+GSSAPI_BASE_CONFIGURE_ON=\
 	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
 GSSAPI_BASE_USES=	gssapi
 
-GSSAPI_HEIMDAL_CONFIGURE_ON= \
+GSSAPI_HEIMDAL_CONFIGURE_ON=\
 	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
 
-GSSAPI_MIT_CONFIGURE_ON= \
+GSSAPI_MIT_CONFIGURE_ON=\
 	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
 GSSAPI_MIT_USES=	gssapi:mit
 

Modified: head/dns/bind913/Makefile
==============================================================================
--- head/dns/bind913/Makefile	Wed Jun  6 09:34:25 2018	(r471830)
+++ head/dns/bind913/Makefile	Wed Jun  6 10:31:30 2018	(r471831)
@@ -29,9 +29,11 @@ COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
+
+USES=	cpe libedit ssl
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
 ISCVERSION=	9.13.0
-USES=	cpe libedit ssl
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
@@ -39,8 +41,6 @@ CPE_VERSION=	${ISCVERSION:C/-.*//}
 CPE_UPDATE=	${ISCVERSION:C/.*-//:tl}
 .endif
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 		--disable-symtable \
@@ -152,15 +152,15 @@ GOST_ASN1_CONFIGURE_ON=	--with-gost=asn1
 
 GOST_CONFIGURE_ON=	--with-gost
 
-GSSAPI_BASE_CONFIGURE_ON= \
+GSSAPI_BASE_CONFIGURE_ON=\
 	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
 GSSAPI_BASE_USES=	gssapi
 
-GSSAPI_HEIMDAL_CONFIGURE_ON= \
+GSSAPI_HEIMDAL_CONFIGURE_ON=\
 	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
 
-GSSAPI_MIT_CONFIGURE_ON= \
+GSSAPI_MIT_CONFIGURE_ON=\
 	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
 GSSAPI_MIT_USES=	gssapi:mit
 
@@ -198,7 +198,6 @@ RPZ_NSDNAME_CONFIGURE_ENABLE=	rpz-nsdname
 RPZ_NSIP_CONFIGURE_ENABLE=	rpz-nsip
 
 SIGCHASE_CONFIGURE_ON=	STD_CDEFINES="-DDIG_SIGCHASE=1"
-
 
 START_LATE_SUB_LIST=	NAMED_REQUIRE="SERVERS cleanvar" \
 			NAMED_BEFORE="LOGIN"



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