ports/148888: [MAINTAINER] security/gpgme: Fix build without libassuan installed

[Jason E. Hale]

>Number:         148888
>Category:       ports
>Synopsis:       [MAINTAINER] security/gpgme: Fix build without libassuan installed
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 24 08:20:11 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Jason E. Hale
>Release:        FreeBSD 8.0-RELEASE i386
>Organization:
none 
>Environment:
System: FreeBSD mocha.verizon.net 8.0-RELEASE FreeBSD 8.0-RELEASE #0: Fri Nov 27 18:56:06 EST 2009 root at mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA8 i386
	
>Description:
security/gpgme will fail to build if security/libassuan is not installed
Fix build by making libassuan a LIB_DEPENDS for all cases.

Reported by: pav

	
>How-To-Repeat:
Try to build security/gpgme using the GNUPG1 option without security/libassuan installed

	
>Fix:
Use attached diff.
Remove: files/patch-src__engine-gpgconf.c (not needed since libassuan will always be required)
	

--- 2010-07-24-gpgme.diff begins here ---
diff -ruN gpgme.orig/Makefile gpgme/Makefile
--- gpgme.orig/Makefile	2010-07-24 03:18:35.000000000 -0400
+++ gpgme/Makefile	2010-07-24 03:24:11.000000000 -0400
@@ -7,6 +7,7 @@
 
 PORTNAME=	gpgme
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gpgme
@@ -16,7 +17,8 @@
 MAINTAINER=	bsdkaffee at gmail.com
 COMMENT=	A library to make access to GnuPG easier
 
-LIB_DEPENDS=	gpg-error.0:${PORTSDIR}/security/libgpg-error
+LIB_DEPENDS=	assuan.0:${PORTSDIR}/security/libassuan \
+		gpg-error.0:${PORTSDIR}/security/libgpg-error
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:22
@@ -52,7 +54,6 @@
 CONFIGURE_ARGS+=--with-gpg=${LOCALBASE}/bin/gpg2 \
 		--with-gpgconf=${LOCALBASE}/bin/gpgconf
 .if exists(${LOCALBASE}/bin/gpgsm)
-LIB_DEPENDS+=	assuan.0:${PORTSDIR}/security/libassuan
 CONFIGURE_ARGS+=--with-gpgsm=${LOCALBASE}/bin/gpgsm
 .else
 CONFIGURE_ARGS+=--with-gpgsm=no
@@ -69,7 +70,6 @@
 
 .if defined(WITH_UISERVER)
 CONFIGURE_ARGS+=--enable-fd-passing
-LIB_DEPENDS+=	assuan.0:${PORTSDIR}/security/libassuan
 .endif
 
 verify: checksum
diff -ruN gpgme.orig/files/patch-src__engine-gpgconf.c gpgme/files/patch-src__engine-gpgconf.c
--- gpgme.orig/files/patch-src__engine-gpgconf.c	2010-07-24 03:18:35.000000000 -0400
+++ gpgme/files/patch-src__engine-gpgconf.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,10 +0,0 @@
---- ./src/engine-gpgconf.c.orig	2009-06-15 07:59:37.000000000 -0400
-+++ ./src/engine-gpgconf.c	2009-12-05 03:03:51.000000000 -0500
-@@ -38,7 +38,6 @@
- #include "priv-io.h"
- #include "sema.h"
- 
--#include "assuan.h"
- #include "debug.h"
- 
- #include "engine-backend.h"
--- 2010-07-24-gpgme.diff ends here ---


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