ports/169576: [MAINTAINER] security/gpgme: Convert to new options framework

[Jason E. Hale]

>Number:         169576
>Category:       ports
>Synopsis:       [MAINTAINER] security/gpgme: Convert to new options framework
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 01 12:50:05 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Jason E. Hale
>Release:        FreeBSD 9.0-RELEASE i386
>Organization:
none 
>Environment:
System: FreeBSD mocha.verizon.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Thu Jan 19 11:42:41 EST 2012 Jason at mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA9 i386


	
>Description:
- Convert to new options framework
- Use gpgv instead of gpg to detect installation of gnupg1
	
>How-To-Repeat:
- Use attached diff
	
>Fix:

	



--- 2012-05-30-gpgme.diff begins here ---
diff -ruN gpgme.orig/Makefile gpgme/Makefile
--- gpgme.orig/Makefile	2012-05-30 08:21:07.000000000 -0400
+++ gpgme/Makefile	2012-05-30 22:31:28.000000000 -0400
@@ -21,6 +21,15 @@
 LIB_DEPENDS=	assuan.0:${PORTSDIR}/security/libassuan \
 		gpg-error.0:${PORTSDIR}/security/libgpg-error
 
+OPTIONS_DEFINE=		DOCS UISERVER
+OPTIONS_SINGLE=		GNUPG
+OPTIONS_SINGLE_GNUPG=	GNUPG1 GNUPG2
+OPTIONS_DEFAULT=	GNUPG2
+
+GNUPG1_DESC=		Build gpgme library for GnuPG 1.x
+GNUPG2_DESC=		Build gpgme library for GnuPG 2.x
+UISERVER_DESC=		Enable GnuPG UI server support
+
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
@@ -34,18 +43,17 @@
 PORTDOCS=	AUTHORS ChangeLog COPYING COPYING.LESSER INSTALL \
 		NEWS README THANKS TODO
 
-OPTIONS=	GNUPG1 "Use GNUPG 1.x instead of GNUPG 2.x" off \
-		UISERVER "Enable the GNUPG UI Server support" off
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GNUPG1)
-BUILD_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg1
-RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg1
+.if ${PORT_OPTIONS:MGNUPG1}
+BUILD_DEPENDS+=	gpgv:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS+=	gpgv:${PORTSDIR}/security/gnupg1
 CONFIGURE_ARGS+=--with-gpg=${LOCALBASE}/bin/gpg \
 		--with-gpgsm=no \
 		--with-gpgconf=no
-.else
+.endif
+
+.if ${PORT_OPTIONS:MGNUPG2}
 BUILD_DEPENDS+=	gpg2:${PORTSDIR}/security/gnupg
 RUN_DEPENDS+=	gpg2:${PORTSDIR}/security/gnupg
 CONFIGURE_ARGS+=--with-gpg=${LOCALBASE}/bin/gpg2 \
@@ -57,7 +65,7 @@
 .endif
 .endif
 
-.if defined(WITH_UISERVER)
+.if ${PORT_OPTIONS:MUISERVER}
 CONFIGURE_ARGS+=--enable-fd-passing
 .endif
 
@@ -74,9 +82,9 @@
 					${WRKSRC}/lang/cl/Makefile.in
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- 2012-05-30-gpgme.diff ends here ---

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