Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.517
diff -u -r1.517 bsd.port.mk
--- bsd.port.mk	15 Sep 2005 12:24:33 -0000	1.517
+++ bsd.port.mk	14 Oct 2005 01:47:19 -0000
@@ -309,6 +309,8 @@
 # WANT_OPENLDAP_SASL
 #				- If set, the system should use OpenLDAP libraries
 #				  with SASL support.
+# WITH_OPENLDAP_VER
+#				- If set, value are passed to WANT_OPENLDAP_VER.
 ##
 # USE_FAM		- If set, this port uses the File Alteration Monitor.
 #
@@ -1367,8 +1369,6 @@
 # Location of mounted CDROM(s) to search for files
 CD_MOUNTPTS?=	/cdrom ${CD_MOUNTPT}
 
-WANT_OPENLDAP_VER?=	22
-
 WANT_FAM_SYSTEM?=	fam
 
 # Owner and group of the WWW user
@@ -1466,12 +1466,12 @@
 .include "${PORTSDIR}/Mk/bsd.gcc.mk"
 .endif
 
-.if defined(USE_OPENLDAP_VER)
-USE_OPENLDAP?=		yes
-WANT_OPENLDAP_VER=	${USE_OPENLDAP_VER}
+.if defined(WITH_OPENLDAP_VER)
+WANT_OPENLDAP_VER?=	${WITH_OPENLDAP_VER}
 .endif
 
 .if defined(USE_OPENLDAP)
+WANT_OPENLDAP_SASL?=	22
 .if defined(WANT_OPENLDAP_SASL)
 _OPENLDAP_FLAVOUR=	-sasl
 .else