From e502b3db0491a90e859b0cccbc6a9116d27c27e4 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Wed, 31 Oct 2012 10:26:12 +0000
Subject: [PATCH] Don't override an earlier CONFIGURE_ARGS at the bottom of the
 Makefile; fixes a problem where gnupg2 was picking up openldap even for the
 non-ldap build.  Build problem spotted by naddy, ok pea@

---
 security/gnupg2/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index f0a2bdb3675..1368ec497c3 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2012/09/30 16:28:07 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.22 2012/10/31 10:26:12 sthen Exp $
 
 COMMENT = 	gnu privacy guard - a free PGP replacement
 
 DISTNAME = 	gnupg-2.0.19
-REVISION =	2
+REVISION =	3
 CATEGORIES = 	security
 
 MASTER_SITES = 	ftp://ftp.gnupg.org/gcrypt/gnupg/ \
@@ -63,7 +63,7 @@ USE_GROFF =		Yes
 CONFIGURE_STYLE = 	gnu
 CONFIGURE_ENV = 	CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS = 	docdir=${LOCALBASE}/share/doc/gnupg2 \
+CONFIGURE_ARGS += 	docdir=${LOCALBASE}/share/doc/gnupg2 \
 			--enable-gpgtar
 
 # Avoid conflict with gnupg-1.x