ports/59151: [Port Fix] security/gnupg doesn't use USE_OPENLDAP correctly

[Alex Dupre]

>Number:         59151
>Category:       ports
>Synopsis:       [Port Fix] security/gnupg doesn't use USE_OPENLDAP correctly
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 10 15:10:12 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Alex Dupre
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD armada.alexdupre.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Sat Nov 8 12:21:11 CET 2003 alex at armada.alexdupre.com:/usr/obj/usr/src/sys/ARMADA i386


	
>Description:
USE_OPENLDAP and WITH_LDAP are inverted.
Fix them and remove the second useless 'if'.

	
>How-To-Repeat:
	
>Fix:

	

--- gnupg.diff begins here ---
--- Makefile.orig	Mon Nov 10 23:56:03 2003
+++ Makefile	Mon Nov 10 23:56:55 2003
@@ -35,10 +35,8 @@
 .if defined(WITH_LIBICONV) || exists(${PREFIX}/lib/libiconv.so)
 LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
 .endif
-.if defined(USE_OPENLDAP) || exists(${PREFIX}/lib/libldap.so.2)
-WITH_LDAP=	yes
-.endif
-.if defined(WITH_LDAP)
+.if defined(WITH_LDAP) || exists(${PREFIX}/lib/libldap.so.2)
+USE_OPENLDAP=	yes
 PLIST_SUB+=	WITH_LDAP=""
 .else
 PLIST_SUB+=	WITH_LDAP="@comment "
--- gnupg.diff ends here ---



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