From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jul 1 12:50:05 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A48D0106564A for ; Sun, 1 Jul 2012 12:50:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 763F38FC0C for ; Sun, 1 Jul 2012 12:50:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q61Co5lH016308 for ; Sun, 1 Jul 2012 12:50:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q61Co50T016307; Sun, 1 Jul 2012 12:50:05 GMT (envelope-from gnats) Resent-Date: Sun, 1 Jul 2012 12:50:05 GMT Resent-Message-Id: <201207011250.q61Co50T016307@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Jason E. Hale" Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BC487106566C for ; Sun, 1 Jul 2012 12:41:06 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-qc0-f182.google.com (mail-qc0-f182.google.com [209.85.216.182]) by mx1.freebsd.org (Postfix) with ESMTP id 7E7918FC18 for ; Sun, 1 Jul 2012 12:41:06 +0000 (UTC) Received: by qcsg15 with SMTP id g15so2852110qcs.13 for ; Sun, 01 Jul 2012 05:41:05 -0700 (PDT) Received: by 10.224.86.206 with SMTP id t14mr16728481qal.11.1341146465756; Sun, 01 Jul 2012 05:41:05 -0700 (PDT) Received: from mocha.verizon.net (c-71-61-40-68.hsd1.oh.comcast.net. [71.61.40.68]) by mx.google.com with ESMTPS id s9sm23982082qaa.7.2012.07.01.05.41.05 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 01 Jul 2012 05:41:05 -0700 (PDT) Message-Id: <1341146465.365609.22269@mocha.verizon.net> Date: Sun, 1 Jul 2012 08:41:05 -0400 From: "Jason E. Hale" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/169576: [MAINTAINER] security/gpgme: Convert to new options framework X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Jason E. Hale" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jul 2012 12:50:05 -0000 >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@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 +.include -.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 +.include --- 2012-05-30-gpgme.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: