ports/66143: fixed OpenLDAP 2.2 support

[Ralf van der Enden]

>Number:         66143
>Category:       ports
>Synopsis:       fixed OpenLDAP 2.2 support
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 01 04:30:19 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Ralf van der Enden
>Release:        FreeBSD 5.2.1-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD lan.cainites.net 5.2.1-RELEASE-p5 FreeBSD 5.2.1-RELEASE-p5 #0: Fri Apr 16 09:13:32 CEST 2004 root at lan.cainites.net:/usr/obj/usr/src/sys/HELLKERNEL i386


	
>Description:
Fixed OpenLDAP 2.2 support by using USE_OPENLDAP knob
Default MySQL version now 4.0 instead of 3.23
>How-To-Repeat:
	
>Fix:

	

--- pdns-2.9.16_4.diff begins here ---
diff -ruN powerdns.org/Makefile powerdns/Makefile
--- powerdns.org/Makefile	Sat May  1 12:32:58 2004
+++ powerdns/Makefile	Sat May  1 13:11:00 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	powerdns
 PORTVERSION=	2.9.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 DISTNAME=	pdns-${PORTVERSION}
@@ -52,8 +52,7 @@
 .endif
 
 .if defined(WITH_MYSQL_DRIVER)
-LIB_DEPENDS+=	mysqlclient:${PORTSDIR}/${MYSQL_PORT}
-MYSQL_PORT?=	databases/mysql323-client
+USE_MYSQL?= YES
 CONFIGURE_ARGS+=	--enable-mysql
 CONFIGURE_MODULES+=	"gmysql"
 .else
@@ -61,9 +60,7 @@
 .endif
 
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/${LDAP_PORT}
-LIB_DEPENDS+=	lber.2:${PORTSDIR}/${LDAP_PORT}
-LDAP_PORT?=	net/openldap21-client
+USE_OPENLDAP?= YES
 USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	YES
 USE_GCC=3.2
diff -ruN powerdns.org/files/configure.powerdns powerdns/files/configure.powerdns
--- powerdns.org/files/configure.powerdns	Sat May  1 12:32:58 2004
+++ powerdns/files/configure.powerdns	Sat May  1 13:13:59 2004
@@ -11,7 +11,7 @@
 else
 	dialog --title "configuration options" --clear \
 				--checklist "\n\
-Please select desired options:" -1 -1 9 \
+Please select desired options:" -1 -1 8 \
 PostgreSQL	"PostgreSQL driver" ON \
 MySQL323	"MySQL 3.23 driver" OFF \
 MySQL40		"MySQL 4.0 driver" OFF \
@@ -49,23 +49,21 @@
 			;;
 		\"MySQL323\")
 			echo WITH_MYSQL_DRIVER=YES
-			echo MYSQL_PORT?=databases/mysql323-client
+			echo WITH_MYSQL_VER?=323
 			;;
 		\"MySQL40\")
 			echo WITH_MYSQL_DRIVER=YES
-			echo MYSQL_PORT?=databases/mysql40-client
 			;;
 		\"MySQL41\")
 			echo WITH_MYSQL_DRIVER=YES
-			echo MYSQL_PORT?=databases/mysql41-client
+			echo WITH_MYSQL_VER?=41
 			;;
 		\"OpenLDAP21\")
 			echo WITH_LDAP=YES
-			echo LDAP_PORT?=net/openldap21-client
 			;;
 		\"OpenLDAP22\")
 			echo WITH_LDAP=YES
-			echo LDAP_PORT?=net/openldap22-client
+			echo WANT_OPENLDAP_VER?=22
 			;;
 		\"SQLite\")
 			echo WITH_SQLITE=YES
--- pdns-2.9.16_4.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: