ports/57529: [PATCH] bsd.port.mk: enable the use of USE_OPENLDAP after including bsd.port.pre.mk

[Oliver Eikemeier]

>Number:         57529
>Category:       ports
>Synopsis:       [PATCH] bsd.port.mk: enable the use of USE_OPENLDAP after including bsd.port.pre.mk
>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:   Fri Oct 03 05:50:17 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Eikemeier
>Release:        FreeBSD 4.9-PRERELEASE i386
>Organization:
Fillmore Labs - http://www.fillmore-labs.com
>Environment:
System: FreeBSD nuuk.fillmore-labs.com 4.9-PRERELEASE

>Description:

Multiple ports are having problems with defining USE_OPENLDAP after they
included bsd.port.pre.mk, which results in that that directive being
ignored. This patch moves the check for USE_OPENLDAP to bsd.port.post.mk.

This fixes the ports listed under USE_OPENLDAP in PR 57502, USE_OPENLDAP and
USE_OPENLDAP_VER can be removed from _PRE_MAKE_DEFINES in PR 57496.

>How-To-Repeat:
>Fix:

--- bsd.port.mk.patch begins here ---
--- bsd.port.mk.orig	3 Sep 2003 19:50:24 -0000
+++ bsd.port.mk	3 Oct 2003 11:55:26 -0000
@@ -1029,23 +1029,6 @@
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 .endif
 
-.if defined(USE_OPENLDAP_VER)
-USE_OPENLDAP?=		yes
-WANT_OPENLDAP_VER=	${USE_OPENLDAP_VER}
-.endif
-
-.if defined(USE_OPENLDAP)
-WANT_OPENLDAP_VER?=	21
-.if ${WANT_OPENLDAP_VER} == 12
-LIB_DEPENDS+=		ldap.1:${PORTSDIR}/net/openldap12
-.elif ${WANT_OPENLDAP_VER} == 20 || ${WANT_OPENLDAP_VER} == 21 || \
-		${WANT_OPENLDAP_VER} == 22
-LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-client
-.else
-BROKEN=		"unknown OpenLDAP version: ${WANT_OPENLDAP_VER}"
-.endif
-.endif
-
 .if defined(EMACS_PORT_NAME)
 .include "${PORTSDIR}/Mk/bsd.emacs.mk"
 .endif
@@ -1082,6 +1065,8 @@
 # Location of mounted CDROM(s) to search for files
 CD_MOUNTPTS?=	/cdrom ${CD_MOUNTPT}
 
+WANT_OPENLDAP_VER?=	21
+
 .endif
 # End of pre-makefile section.
 
@@ -1387,6 +1372,22 @@
 CC=				gcc34
 CXX=			g++34
 BUILD_DEPENDS+=	gcc34:${PORTSDIR}/lang/gcc34
+.endif
+
+.if defined(USE_OPENLDAP_VER)
+USE_OPENLDAP?=		yes
+WANT_OPENLDAP_VER=	${USE_OPENLDAP_VER}
+.endif
+
+.if defined(USE_OPENLDAP)
+.if ${WANT_OPENLDAP_VER} == 12
+LIB_DEPENDS+=		ldap.1:${PORTSDIR}/net/openldap12
+.elif ${WANT_OPENLDAP_VER} == 20 || ${WANT_OPENLDAP_VER} == 21 || \
+		${WANT_OPENLDAP_VER} == 22
+LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-client
+.else
+BROKEN=		"unknown OpenLDAP version: ${WANT_OPENLDAP_VER}"
+.endif
 .endif
 
 .if defined(USE_GETOPT_LONG)
--- bsd.port.mk.patch ends here ---


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