[Midnightbsd-cvs] mports [16982] trunk/dns/bind99/Makefile: just turn on xml

[laffer1 at midnightbsd.org]

Revision: 16982
          http://svnweb.midnightbsd.org/mports/?rev=16982
Author:   laffer1
Date:     2014-09-11 20:48:32 -0400 (Thu, 11 Sep 2014)
Log Message:
-----------
just turn on xml

Modified Paths:
--------------
    trunk/dns/bind99/Makefile

Modified: trunk/dns/bind99/Makefile
===================================================================
--- trunk/dns/bind99/Makefile	2014-09-12 00:25:47 UTC (rev 16981)
+++ trunk/dns/bind99/Makefile	2014-09-12 00:48:32 UTC (rev 16982)
@@ -2,7 +2,7 @@
 
 PORTNAME?=	bind99
 PORTVERSION=	9.9.5
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
@@ -18,19 +18,30 @@
 
 MAKE_JOBS_UNSAFE=	yes
 
+USES=		cpe
+
+CPE_VENDOR=	isc
+CPE_VERSION=	${ISCVERSION:C/-.*//}
+.if ${ISCVERSION:M*-*}
+CPE_UPDATE=	${ISCVERSION:C/.*-//:tl}
+.endif
+
+LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 		--disable-symtable \
 		--with-randomdev=/dev/random \
-		--without-python
+		--without-python \
+		--with-libxml2=${LOCALBASE}
 
 CONFLICTS=	bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.*
 
-OPTIONS_DEFAULT=	IPV6 SSL LINKS XML THREADS
+OPTIONS_DEFAULT=	IPV6 SSL LINKS THREADS
 OPTIONS_DEFINE=		SSL IDN REPLACE_BASE LARGE_FILE \
 			FIXED_RRSET SIGCHASE IPV6 THREADS
 .if !defined(BIND_TOOLS_SLAVE)
-OPTIONS_DEFINE+=	LINKS XML RPZ_NSIP RPZ_NSDNAME RPZRRL_PATCH
+OPTIONS_DEFINE+=	LINKS RPZ_NSIP RPZ_NSDNAME RPZRRL_PATCH
 OPTIONS_GROUP=		DLZ
 OPTIONS_GROUP_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
 			DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
@@ -44,7 +55,6 @@
 
 .if !defined(BIND_TOOLS_SLAVE)
 LINKS_DESC=		Create conf file symlinks in ${PREFIX}
-XML_DESC=		Support for xml statistics output
 RPZ_NSIP_DESC=		Enable RPZ NSIP trigger rules
 RPZ_NSDNAME_DESC=	Enable RPZ NSDNAME policy records
 RPZRRL_PATCH_DESC=	RPZ improvements + RRL patch (experimental)
@@ -73,13 +83,6 @@
 CONFIGURE_ARGS+=	--without-openssl
 .endif
 
-.if ${PORT_OPTIONS:MXML} && !defined(BIND_TOOLS_SLAVE)
-CONFIGURE_ARGS+=	--with-libxml2=${LOCALBASE}
-LIB_DEPENDS+=		xml2:${PORTSDIR}/textproc/libxml2
-.else
-CONFIGURE_ARGS+=	--without-libxml2
-.endif
-
 .if ${PORT_OPTIONS:MIDN}
 CONFIGURE_ARGS+=	--with-idn=${LOCALBASE} --with-libiconv=${LOCALBASE}
 LIB_DEPENDS+=		idnkit.1:${PORTSDIR}/dns/idnkit