12 files changed, 126 insertions, 18 deletions

diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index f6ac5e578899..7f0e688d97b6 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	powerdns
-PORTVERSION=	2.9.4
+PORTVERSION=	2.9.6
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${PORTVERSION}
@@ -16,6 +16,7 @@ COMMENT=	An advanced DNS server with SQL backend
 
 USE_GMAKE=	YES
 USE_SUBMAKE=	YES
+USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--with-modules="${CONFIGURE_MODULES} pipe" \
 			--with-dynmodules=""
@@ -50,7 +51,7 @@ CONFIGURE_ARGS+=	--disable-mysql
 .endif
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-	        CURDIR="${.CURDIR}" \
+		CURDIR2="${.CURDIR}" \
 		MKDIR="${MKDIR}" \
 		DISTNAME="${DISTNAME}" \
 		POWERDNS_OPTIONS="${POWERDNS_OPTIONS}"
@@ -60,6 +61,14 @@ MAN8=		pdns_control.8 pdns_server.8 zone2sql.8
 pre-everything::
 	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns
 
+post-patch:
+	${REINPLACE_CMD} -e 's;-I. ;-I. -I${LOCALBASE}/include ;' \
+		-e 's;la_LDFLAGS =;la_LDFLAGS = -L${LOCALBASE}/lib;' \
+		${WRKSRC}/modules/ldapbackend/Makefile.in
+	${REINPLACE_CMD} -e 's;@LIBDL@;@LIBDL@ -L${LOCALBASE}/lib;' \
+		-e 's;@modulelibs@;@modulelibs@ -llber;' \
+		${WRKSRC}/pdns/Makefile.in
+
 post-install:
 .if !exists(${PREFIX}/etc/pdns.conf)
 	${INSTALL_DATA} ${PREFIX}/etc/pdns.conf-dist ${PREFIX}/etc/pdns.conf
@@ -82,4 +91,20 @@ describe:
 	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} BATCH=yes ${.TARGET}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500043
+CONFIGURE_ARGS+=	--enable-recursor
+PLIST_SUB+=		RECURSOR=""
+
+.if defined(WITH_LDAP)
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
+CONFIGURE_MODULES+=	"ldap"
+.endif
+
+.else
+PLIST_SUB+=		RECURSOR="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/dns/powerdns-devel/distinfo b/dns/powerdns-devel/distinfo
index 845508a8f487..454cccf61e77 100644
--- a/dns/powerdns-devel/distinfo
+++ b/dns/powerdns-devel/distinfo
@@ -1 +1 @@
-MD5 (pdns-2.9.4.tar.gz) = b59ebeae2ceb10cb13710e772708678a
+MD5 (pdns-2.9.6.tar.gz) = 5c954197a8918d1701f8fb2e34654ed9
diff --git a/dns/powerdns-devel/files/configure.powerdns b/dns/powerdns-devel/files/configure.powerdns
index e41c817d67e2..02545a440be8 100644
--- a/dns/powerdns-devel/files/configure.powerdns
+++ b/dns/powerdns-devel/files/configure.powerdns
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
+if [ -f ${WRKDIRPREFIX}${CURDIR2}/Makefile.inc ]; then
 	exit
 fi
 
@@ -11,9 +11,10 @@ if [ "${POWERDNS_OPTIONS}" ]; then
 else
 	dialog --title "configuration options" --clear \
 				--checklist "\n\
-Please select desired options:" -1 -1 2 \
+Please select desired options:" -1 -1 3 \
 PostgreSQL	"PostgreSQL driver" ON \
 MySQL		"MySQL driver" OFF \
+OpenLDAP	"OpenLDAP backend" OFF \
 2> /tmp/checklist.tmp.$$
 
         retval=$?
@@ -33,8 +34,8 @@ MySQL		"MySQL driver" OFF \
 	esac
 fi
 
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+${MKDIR} ${WRKDIRPREFIX}${CURDIR2}
+exec > ${WRKDIRPREFIX}${CURDIR2}/Makefile.inc
 
 while [ "$1" ]; do
 	case $1 in
@@ -44,11 +45,14 @@ while [ "$1" ]; do
 		\"MySQL\")
 			echo WITH_MYSQL_DRIVER=YES
 			;;
+		\"OpenLDAP\")
+			echo WITH_LDAP=YES
+			;;
 		\"nothing\"|true)
 			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			rm -f ${WRKDIRPREFIX}${CURDIR2}/Makefile.inc
 			exit 1
 			;;
 	esac
diff --git a/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.cc b/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.cc
new file mode 100644
index 000000000000..4cc027918def
--- /dev/null
+++ b/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.cc
@@ -0,0 +1,12 @@
+*** modules/ldapbackend/powerldap.cc.orig	Thu Mar 13 20:49:23 2003
+--- modules/ldapbackend/powerldap.cc	Thu Mar 13 20:49:46 2003
+***************
+*** 3,9 ****
+  
+  #include <map>
+  #include <vector>
+- #include <crypt.h>
+  #include <exception>
+  #include <stdexcept>
+  #include <string>
+--- 3,8 ----
diff --git a/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.hh b/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.hh
new file mode 100644
index 000000000000..b73538245123
--- /dev/null
+++ b/dns/powerdns-devel/files/patch-modules_ldapbackend_powerldap.hh
@@ -0,0 +1,12 @@
+*** modules/ldapbackend/powerldap.hh.orig	Thu Mar 13 20:49:33 2003
+--- modules/ldapbackend/powerldap.hh	Thu Mar 13 20:49:50 2003
+***************
+*** 2,8 ****
+  #define POWERLDAP_HH
+  #include <map>
+  #include <vector>
+- #include <crypt.h>
+  #include <exception>
+  #include <stdexcept>
+  #include <string>
+--- 2,7 ----
diff --git a/dns/powerdns-devel/pkg-plist b/dns/powerdns-devel/pkg-plist
index 40a83b83e279..59a25e744fe5 100644
--- a/dns/powerdns-devel/pkg-plist
+++ b/dns/powerdns-devel/pkg-plist
@@ -1,6 +1,7 @@
 bin/pdns_control
 bin/zone2sql
 sbin/pdns_server
+%%RECURSOR%%bin/pdns_recursor
 @unexec if cmp -s %D/etc/pdns.conf %D/etc/pdns.conf-dist; then rm -f %D/etc/pdns.conf; fi
 etc/pdns.conf-dist
 @exec [ -f %B/pdns.conf ] || cp %B/%f %B/pdns.conf
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index f6ac5e578899..7f0e688d97b6 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	powerdns
-PORTVERSION=	2.9.4
+PORTVERSION=	2.9.6
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${PORTVERSION}
@@ -16,6 +16,7 @@ COMMENT=	An advanced DNS server with SQL backend
 
 USE_GMAKE=	YES
 USE_SUBMAKE=	YES
+USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--with-modules="${CONFIGURE_MODULES} pipe" \
 			--with-dynmodules=""
@@ -50,7 +51,7 @@ CONFIGURE_ARGS+=	--disable-mysql
 .endif
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-	        CURDIR="${.CURDIR}" \
+		CURDIR2="${.CURDIR}" \
 		MKDIR="${MKDIR}" \
 		DISTNAME="${DISTNAME}" \
 		POWERDNS_OPTIONS="${POWERDNS_OPTIONS}"
@@ -60,6 +61,14 @@ MAN8=		pdns_control.8 pdns_server.8 zone2sql.8
 pre-everything::
 	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.powerdns
 
+post-patch:
+	${REINPLACE_CMD} -e 's;-I. ;-I. -I${LOCALBASE}/include ;' \
+		-e 's;la_LDFLAGS =;la_LDFLAGS = -L${LOCALBASE}/lib;' \
+		${WRKSRC}/modules/ldapbackend/Makefile.in
+	${REINPLACE_CMD} -e 's;@LIBDL@;@LIBDL@ -L${LOCALBASE}/lib;' \
+		-e 's;@modulelibs@;@modulelibs@ -llber;' \
+		${WRKSRC}/pdns/Makefile.in
+
 post-install:
 .if !exists(${PREFIX}/etc/pdns.conf)
 	${INSTALL_DATA} ${PREFIX}/etc/pdns.conf-dist ${PREFIX}/etc/pdns.conf
@@ -82,4 +91,20 @@ describe:
 	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} BATCH=yes ${.TARGET}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500043
+CONFIGURE_ARGS+=	--enable-recursor
+PLIST_SUB+=		RECURSOR=""
+
+.if defined(WITH_LDAP)
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
+CONFIGURE_MODULES+=	"ldap"
+.endif
+
+.else
+PLIST_SUB+=		RECURSOR="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/dns/powerdns/distinfo b/dns/powerdns/distinfo
index 845508a8f487..454cccf61e77 100644
--- a/dns/powerdns/distinfo
+++ b/dns/powerdns/distinfo
@@ -1 +1 @@
-MD5 (pdns-2.9.4.tar.gz) = b59ebeae2ceb10cb13710e772708678a
+MD5 (pdns-2.9.6.tar.gz) = 5c954197a8918d1701f8fb2e34654ed9
diff --git a/dns/powerdns/files/configure.powerdns b/dns/powerdns/files/configure.powerdns
index e41c817d67e2..02545a440be8 100644
--- a/dns/powerdns/files/configure.powerdns
+++ b/dns/powerdns/files/configure.powerdns
@@ -2,7 +2,7 @@
 #
 # $FreeBSD$
 #
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
+if [ -f ${WRKDIRPREFIX}${CURDIR2}/Makefile.inc ]; then
 	exit
 fi
 
@@ -11,9 +11,10 @@ if [ "${POWERDNS_OPTIONS}" ]; then
 else
 	dialog --title "configuration options" --clear \
 				--checklist "\n\
-Please select desired options:" -1 -1 2 \
+Please select desired options:" -1 -1 3 \
 PostgreSQL	"PostgreSQL driver" ON \
 MySQL		"MySQL driver" OFF \
+OpenLDAP	"OpenLDAP backend" OFF \
 2> /tmp/checklist.tmp.$$
 
         retval=$?
@@ -33,8 +34,8 @@ MySQL		"MySQL driver" OFF \
 	esac
 fi
 
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+${MKDIR} ${WRKDIRPREFIX}${CURDIR2}
+exec > ${WRKDIRPREFIX}${CURDIR2}/Makefile.inc
 
 while [ "$1" ]; do
 	case $1 in
@@ -44,11 +45,14 @@ while [ "$1" ]; do
 		\"MySQL\")
 			echo WITH_MYSQL_DRIVER=YES
 			;;
+		\"OpenLDAP\")
+			echo WITH_LDAP=YES
+			;;
 		\"nothing\"|true)
 			;;
 		*)
 			echo "Invalid option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+			rm -f ${WRKDIRPREFIX}${CURDIR2}/Makefile.inc
 			exit 1
 			;;
 	esac
diff --git a/dns/powerdns/files/patch-modules_ldapbackend_powerldap.cc b/dns/powerdns/files/patch-modules_ldapbackend_powerldap.cc
new file mode 100644
index 000000000000..4cc027918def
--- /dev/null
+++ b/dns/powerdns/files/patch-modules_ldapbackend_powerldap.cc
@@ -0,0 +1,12 @@
+*** modules/ldapbackend/powerldap.cc.orig	Thu Mar 13 20:49:23 2003
+--- modules/ldapbackend/powerldap.cc	Thu Mar 13 20:49:46 2003
+***************
+*** 3,9 ****
+  
+  #include <map>
+  #include <vector>
+- #include <crypt.h>
+  #include <exception>
+  #include <stdexcept>
+  #include <string>
+--- 3,8 ----
diff --git a/dns/powerdns/files/patch-modules_ldapbackend_powerldap.hh b/dns/powerdns/files/patch-modules_ldapbackend_powerldap.hh
new file mode 100644
index 000000000000..b73538245123
--- /dev/null
+++ b/dns/powerdns/files/patch-modules_ldapbackend_powerldap.hh
@@ -0,0 +1,12 @@
+*** modules/ldapbackend/powerldap.hh.orig	Thu Mar 13 20:49:33 2003
+--- modules/ldapbackend/powerldap.hh	Thu Mar 13 20:49:50 2003
+***************
+*** 2,8 ****
+  #define POWERLDAP_HH
+  #include <map>
+  #include <vector>
+- #include <crypt.h>
+  #include <exception>
+  #include <stdexcept>
+  #include <string>
+--- 2,7 ----
diff --git a/dns/powerdns/pkg-plist b/dns/powerdns/pkg-plist
index 40a83b83e279..59a25e744fe5 100644
--- a/dns/powerdns/pkg-plist
+++ b/dns/powerdns/pkg-plist
@@ -1,6 +1,7 @@
 bin/pdns_control
 bin/zone2sql
 sbin/pdns_server
+%%RECURSOR%%bin/pdns_recursor
 @unexec if cmp -s %D/etc/pdns.conf %D/etc/pdns.conf-dist; then rm -f %D/etc/pdns.conf; fi
 etc/pdns.conf-dist
 @exec [ -f %B/pdns.conf ] || cp %B/%f %B/pdns.conf