From eikemeier@fillmore-labs.com  Fri Oct  3 05:47:16 2003
Return-Path: <eikemeier@fillmore-labs.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 71ED216A4B3
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri,  3 Oct 2003 05:47:16 -0700 (PDT)
Received: from mx2.fillmore-labs.com (lima.fillmore-labs.com [62.138.193.83])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5F27643FF2
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri,  3 Oct 2003 05:47:15 -0700 (PDT)
	(envelope-from eikemeier@fillmore-labs.com)
Received: from p5080bc44.dip.t-dialin.net
	([80.128.188.68] helo=fillmore-labs.com ident=s0r1t18kqdmvd1lc)
	by mx2.fillmore-labs.com with asmtp (TLSv1:AES256-SHA:256)
	(Exim 4.24; FreeBSD 4.9)
	id 1A5PL0-0009rK-28
	for FreeBSD-gnats-submit@FreeBSD.org; Fri, 03 Oct 2003 14:47:14 +0200
Message-Id: <3F7D6FD0.2000600@fillmore-labs.com>
Date: Fri, 03 Oct 2003 14:47:12 +0200
From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: [PATCH] bsd.port.mk: enable the use of USE_OPENLDAP after including
 bsd.port.pre.mk

>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:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 03 05:50:17 PDT 2003
>Closed-Date:    Fri Nov 07 00:57:33 PST 2003
>Last-Modified:  Fri Nov 07 00:57:33 PST 2003
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Oct 3 05:56:01 PDT 2003 
Responsible-Changed-Why:  
Portmgr territory 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57529 

From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
To: Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/57529: [PATCH] bsd.port.mk: enable the use of USE_OPENLDAP
 after including bsd.port.pre.mk
Date: Mon, 06 Oct 2003 17:13:06 +0200

 updated patch: remove support for OpenLDAP 1.2
 
 --- bsd.port.mk.patch begins here ---
 --- bsd.port.mk.orig	3 Sep 2003 19:50:24 -0000
 +++ bsd.port.mk	6 Oct 2003 15:06:29 -0000
 @@ -353,7 +353,7 @@
  #
  # USE_OPENLDAP		- Says that the port uses the OpenLDAP libraries
  #					  Implies: WANT_OPENLDAP_VER?=21
 -# WANT_OPENLDAP_VER	- Legal values are: 12, 20, 21, and 22
 +# WANT_OPENLDAP_VER	- Legal values are: 20, 21, and 22
  #					  If set to an unkown value, the port is marked BROKEN.
  #
  ##
 @@ -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,20 @@
  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 !empty(WANT_OPENLDAP_VER:M2[0-9]) && \
 +	exists(${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-client/Makefile)
 +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 ---
 
State-Changed-From-To: open->analyzed 
State-Changed-By: marcus 
State-Changed-When: Sat Nov 1 12:55:44 PST 2003 
State-Changed-Why:  
This is currently being tested on bento. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57529 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=21885 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=51588 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=55325 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57778 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=55674 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Fixed with the comment made in the follow-up.  Thanks for reporting. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=56096 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=56355 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=56533 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57272 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Committed with the additional check of INSTALL_AS_USER.  Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57378 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57403 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57438 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57488 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57928 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=58232 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=58317 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Final version committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=32604 
State-Changed-From-To: analyzed->closed 
State-Changed-By: marcus 
State-Changed-When: Fri Nov 7 00:52:50 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57529 
>Unformatted:
