- update DLZ to 0.6.0

- add berkleydb support
- add openldap support
- improved documentation

3 files changed, 49 insertions, 11 deletions

diff --git a/dns/bind9-dlz/Makefile b/dns/bind9-dlz/Makefile
index 98711f8d185b..f93fe2518398 100644
--- a/dns/bind9-dlz/Makefile
+++ b/dns/bind9-dlz/Makefile
@@ -29,7 +29,7 @@ POSTGRESQL_PORT?=	databases/postgresql7
 MASTER_SITES_DLZ=	${MASTER_SITE_SOURCEFORGE}
 
 ISCVERSION=	9.2.2
-DLZVERSION=	0.5.0
+DLZVERSION=	0.6.0
 USE_SUBMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
@@ -62,6 +62,20 @@ LIB_DEPENDS+=	mysqlclient:${PORTSDIR}/${MYSQL_PORT}
 CONFIGURE_ARGS+=	--with-dlz-mysql
 .endif
 
+.if defined(WITH_LDAP)
+LDAP_PORT?=	net/openldap20-client
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/${LDAP_PORT}
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/${LDAP_PORT}
+CONFIGURE_ARGS+=	--with-dlz-ldap
+.endif
+
+.if defined(WITH_BERKLEYDB_DRIVER)
+BERKLEYDB_PORT?=	databases/db41
+BERKLEYDB_LIB?=		db41.1
+CONFIGURE_ARGS+=	--with-dlz-bdb=${LOCALBASE}
+LIB_DEPENDS+=		${BERKLEYDB_LIB}:${PORTSDIR}/${BERKLEYDB_PORT}
+.endif
+
 .if defined(WITH_FILESYSTEM_DRIVER)
 .if !defined(WITHOUT_FILESYSTEM_DRIVER)
 CONFIGURE_ARGS+=	--with-dlz-filesystem
@@ -82,6 +96,7 @@ CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 WRKSRC=		${WRKDIR}/bind-${ISCVERSION}
 EXTRA_PATCHES=	${WRKDIR}/dlz.patch
 PLIST=		${WRKDIR}/.PLIST.more
+PLIST_SUB+=	EXTRA_DOCSDIR=${EXTRA_DOCSDIR}
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 	        CURDIR2="${.CURDIR}" \
@@ -91,12 +106,8 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 
 DOCSDIR=	${PREFIX}/share/doc/bind9
 EXTRA_DOCSDIR=	share/doc/bind9-dlz
-DOCS=		README.txt bind_dlz.txt changelog.txt \
-		dlz_bdb_driver.txt dlz_filesystem_driver.txt \
-		dlz_interface.txt dlz_mysql_driver.txt \
-		dlz_odbc_driver.txt dlz_postgres_driver.txt \
-		dlz_stub_driver.txt \
-		sdlz_helper.txt sdlz_interface.txt
+DOCS=		README.txt bind_dlz.txt changelog.txt dlz.schema \
+		dlz_interface.txt sdlz_helper.txt sdlz_interface.txt
 
 MAN1=	dig.1 host.1
 MAN3=	lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \
@@ -159,9 +170,13 @@ pre-install:
 .if !defined(NOPORTDOCS)
 .for i in ${DOCS}
 	@${ECHO_CMD} `${BASENAME} ${i}` | \
-	${AWK} '{print "${EXTRA_DOCSDIR}/" $$1}' >>${PLIST}
+	${SED}  -e "s=^=%%EXTRA_DOCSDIR%%/=" >>${PLIST}
 .endfor
-	@${ECHO_CMD} "@dirrm ${EXTRA_DOCSDIR}" >>${PLIST}
+	@(cd ${WRKSRC}/.. && find dlz_docs -type f ) | \
+	${SED}  -e "s=^=%%EXTRA_DOCSDIR%%/=" >>${PLIST}
+	@(cd ${WRKSRC}/.. && find -d dlz_docs -type d ) | \
+	${SED} -e "s=^=@dirrm %%EXTRA_DOCSDIR%%/=" >>${PLIST}
+	@${ECHO_CMD} "@dirrm %%EXTRA_DOCSDIR%%" >>${PLIST}
 .endif
 
 post-install:
@@ -175,6 +190,8 @@ post-install:
 		${WRKSRC}/README ${DOCSDIR}/
 	${MKDIR} ${PREFIX}/${EXTRA_DOCSDIR}
 	@cd ${WRKDIR} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/${EXTRA_DOCSDIR}/
+	${CP} -R ${WRKSRC}/../dlz_docs ${PREFIX}/${EXTRA_DOCSDIR}/dlz_docs
+	@cd ${WRKDIR} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/${EXTRA_DOCSDIR}/
 .endif
 
 post-clean:
diff --git a/dns/bind9-dlz/distinfo b/dns/bind9-dlz/distinfo
index 17b93e1d76a7..3758cf884418 100644
--- a/dns/bind9-dlz/distinfo
+++ b/dns/bind9-dlz/distinfo
@@ -1,3 +1,3 @@
 MD5 (bind-9.2.2.tar.gz) = 6ea7d64a0856893ab3eb541ab7bbc725
-MD5 (DLZ-0.5.0.tar.gz) = ce9ea62bdca73b89973ce118566b5c7b
+MD5 (DLZ-0.6.0.tar.gz) = acbbbda717e0d3e5c8c7c5ef5ba3fe47
 MD5 (patch.9.2.2-P1) = 063edc41c756ffc6a1051d5f1937fa2c
diff --git a/dns/bind9-dlz/files/configure.bind9-dlz b/dns/bind9-dlz/files/configure.bind9-dlz
index 69c77b34b8f3..8aca828c9cb2 100644
--- a/dns/bind9-dlz/files/configure.bind9-dlz
+++ b/dns/bind9-dlz/files/configure.bind9-dlz
@@ -11,12 +11,16 @@ if [ "${BINDDLZ_OPTIONS}" ]; then
 else
 	dialog --title "configuration options" --clear \
 				--checklist "\n\
-Please select desired options:" -1 -1 7 \
+Please select desired options:" -1 -1 11 \
 OpenSSL		"OpenSSL support" ON \
 PostgreSQL	"PostgreSQL driver" ON \
 MySQL323	"MySQL 3.23 driver" OFF \
 MySQL40	"MySQL 4.0 driver" OFF \
 MySQL41	"MySQL 4.1 driver" OFF \
+OpenLDAP20	"OpenLDAP 2.0 backend" OFF \
+OpenLDAP21	"OpenLDAP 2.1 backend" OFF \
+OpenLDAP22	"OpenLDAP 2.2 backend" OFF \
+BerkleyDB41	"BerkleyDB 4.1 backend" OFF \
 FileSystem	"Filesystem driver" ON \
 Stub		"Stub driver" OFF \
 2> /tmp/checklist.tmp.$$
@@ -61,6 +65,23 @@ while [ "$1" ]; do
 			echo WITH_MYSQL_DRIVER=YES
 			echo MYSQL_PORT?=databases/mysql41-client
 			;;
+		\"OpenLDAP20\")
+			echo WITH_LDAP=YES
+			echo LDAP_PORT?=net/openldap20-client
+			;;
+		\"OpenLDAP21\")
+			echo WITH_LDAP=YES
+			echo LDAP_PORT?=net/openldap21-client
+			;;
+		\"OpenLDAP22\")
+			echo WITH_LDAP=YES
+			echo LDAP_PORT?=net/openldap22-client
+			;;
+		\"BerkleyDB41\")
+			echo WITH_BERKLEYDB_DRIVER=YES
+			echo BERKLEYDB_LIB?=db41.1
+			echo BERKLEYDB_PORT?=databases/db41
+			;;
 		\"FileSystem\")
 			echo WITH_FILESYSTEM_DRIVER=YES
 			;;