ports/123602: [PATCH] Change default OpenLDAP version to 2.4.x series in ports/Mk/bsd.port.mk

[Xin LI]

>Number:         123602
>Category:       ports
>Synopsis:       [PATCH] Change default OpenLDAP version to 2.4.x series in ports/Mk/bsd.port.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 12 05:50:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Xin LI
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD freefall.freebsd.org 7.0-STABLE FreeBSD 7.0-STABLE #34: Sat Apr 12 11:52:18 UTC 2008 simon at freefall.freebsd.org:/usr/src/sys/i386/compile/FREEFALL i386


>Description:
	I would like to request an experimental build of all ports with the
attached patch applied against bsd.port.mk.

	Change description:

	 - Switch from OpenLDAP 2.3 to 2.4 as default OpenLDAP implementation;
	   with the results we will be able to decide whether switching at this
	   point is a right move before actually doing it.
	 - Remove OpenLDAP 2.2 series support.  The port has been removed long ago
	   so this part should be no-op.
>How-To-Repeat:
>Fix:


--- exp-bsd.port.mk.diff begins here ---
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.592
diff -u -p -r1.592 bsd.port.mk
--- bsd.port.mk	14 Apr 2008 16:46:41 -0000	1.592
+++ bsd.port.mk	7 May 2008 20:57:07 -0000
@@ -399,9 +399,9 @@ FreeBSD_MAINTAINER=	portmgr at FreeBSD.org
 # USE_OPENSSL	- If set, this port relies on the OpenSSL package.
 ##
 # USE_OPENLDAP	- If set, this port uses the OpenLDAP libraries.
-#				  Implies: WANT_OPENLDAP_VER?=23
+#				  Implies: WANT_OPENLDAP_VER?=24
 # WANT_OPENLDAP_VER
-#				- Legal values are: 22, 23, 24
+#				- Legal values are: 23, 24
 #				  If set to an unkown value, the port is marked BROKEN.
 # WANT_OPENLDAP_SASL
 #				- If set, the system should use OpenLDAP libraries
@@ -1531,7 +1531,7 @@ PERL=		${LOCALBASE}/bin/perl
 # Location of mounted CDROM(s) to search for files
 CD_MOUNTPTS?=	/cdrom ${CD_MOUNTPT}
 
-WANT_OPENLDAP_VER?=	23
+WANT_OPENLDAP_VER?=	24
 
 # Owner and group of the WWW user
 WWWOWN?=	www
@@ -1687,9 +1687,7 @@ _OPENLDAP_FLAVOUR=	-sasl
 .else
 _OPENLDAP_FLAVOUR=
 .endif
-.if ${WANT_OPENLDAP_VER} == 22
-LIB_DEPENDS+=		ldap-2.2.7:${PORTSDIR}/net/openldap22${_OPENLDAP_FLAVOUR}-client
-.elif ${WANT_OPENLDAP_VER} == 23
+.if ${WANT_OPENLDAP_VER} == 23
 LIB_DEPENDS+=		ldap-2.3.2:${PORTSDIR}/net/openldap23${_OPENLDAP_FLAVOUR}-client
 .elif ${WANT_OPENLDAP_VER} == 24
 LIB_DEPENDS+=		ldap-2.4.2:${PORTSDIR}/net/openldap24${_OPENLDAP_FLAVOUR}-client
--- exp-bsd.port.mk.diff ends here ---


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