ports/154642: [PATCH] mail/elmo: Fix gpgme support, update MASTER_SITES

[Jason E. Hale]

>Number:         154642
>Category:       ports
>Synopsis:       [PATCH] mail/elmo: Fix gpgme support, update MASTER_SITES
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 10 07:50:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jason E. Hale
>Release:        FreeBSD 8.1-RELEASE-p1 i386
>Organization:
none 
>Environment:
System: FreeBSD mocha.verizon.net 8.1-RELEASE-p1 FreeBSD 8.1-RELEASE-p1 #0: Wed Oct 6 21:42:52 EDT 2010 root at mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA8 i386
	
>Description:
mail/elmo currently depends on the ancient security/gpgme03 for gpgme support.
Gpgme support is also broken as it is due to '==' instead of '=' being used 
with 'test' in the configure script.

The provided patch allows mail/elmo to use the latest gpgme library.

Bump PORTREVISION due to library change.

While here:
- Pet portlint(1)
- Update MASTER_SITES
- Remove MD5
- Add LICENSE
- Mark MAKE_JOBS_SAFE
	
>How-To-Repeat:
Use attached diff.
	
>Fix:

	

--- 2011-02-10-elmo.diff begins here ---
diff -ruN elmo.orig/Makefile elmo/Makefile
--- elmo.orig/Makefile	2010-06-07 03:44:21.000000000 -0400
+++ elmo/Makefile	2011-02-10 02:01:57.000000000 -0500
@@ -7,21 +7,28 @@
 
 PORTNAME=	elmo
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20devel/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	dhn at FreeBSD.org
 COMMENT=	Receive, filter, read, compose and send mail at the text console
 
-CONFLICTS=	elmo-devel-*
+CONFLICTS=	elmo-devel-[0-9]*
 
 GNU_CONFIGURE=	yes
 USE_ICONV=	yes
 USE_OPENSSL=	yes
 USE_PERL5_RUN=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+MAKE_JOBS_SAFE=	yes
 
 MAN1=		elmo.1 elmoconf.pl.1
 
@@ -36,8 +43,8 @@
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/lib/libgpgme03.so) || defined(WITH_GPGME)
-LIB_DEPENDS+=	gpgme03:${PORTSDIR}/security/gpgme03
+.if exists(${LOCALBASE}/lib/libgpgme.so) || defined(WITH_GPGME)
+LIB_DEPENDS+=	gpgme.18:${PORTSDIR}/security/gpgme
 .else
 pre-everything::
 	@${ECHO_CMD}
@@ -48,6 +55,8 @@
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/bin/env perl|${PERL} -w|" \
 		${WRKSRC}/src/elmoconf.pl
+	@${REINPLACE_CMD} -e 's|gpgme4|gpgme|g' -e 's|== "|= "|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|gpgme4|gpgme|g' ${WRKSRC}/src/pgp.c
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff -ruN elmo.orig/distinfo elmo/distinfo
--- elmo.orig/distinfo	2009-01-01 00:30:50.000000000 -0500
+++ elmo/distinfo	2011-02-10 01:50:50.000000000 -0500
@@ -1,3 +1,2 @@
-MD5 (elmo-1.3.0.tar.gz) = 432d502e188f35e061a5fcc73427650f
 SHA256 (elmo-1.3.0.tar.gz) = 6a4033ac4db0316fc3cbb5b36a1422ecaaae844cd0c668240037f3a6cf68d36b
 SIZE (elmo-1.3.0.tar.gz) = 513705
--- 2011-02-10-elmo.diff ends here ---


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