Date: Thu, 14 Nov 2013 15:09:42 +0100 (CET) From: Mathieu Arnold <mat@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: kuriyama@FreeBSD.org Subject: ports/183955: [PATCH] security/gnupg: Convert to new options framework. Message-ID: <20131114140942.90A5114269C@aragorn.in.absolight.net> Resent-Message-ID: <201311141410.rAEEA0K0031147@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183955
>Category: ports
>Synopsis: [PATCH] security/gnupg: Convert to new options framework.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 14 14:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Mathieu Arnold
>Release: FreeBSD 9.2-RELEASE i386
>Organization:
Absolight
>Environment:
System: FreeBSD aragorn.in.absolight.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC
>Description:
Convert to new options framework.
Leave out the LDAP part because it needs to be enabled by GPGSM.
Port maintainer (kuriyama@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_10 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:
--- gnupg-2.0.22.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 333756)
+++ Makefile (working copy)
@@ -41,23 +41,28 @@
NO_OPTIONS_SORT= YES
OPTIONS_SUB= YES
+DOCS_CONFIGURE_ENABLE= doc
+PINENTRY_RUN_DEPENDS= pinentry>0:${PORTSDIR}/security/pinentry
+GPGSM_RUN_DEPENDS= dirmngr:${PORTSDIR}/security/dirmngr
+GPGSM_CONFIGURE_ENABLE= gpgsm
+MKDNS_LIB_DEPENDS= libadns.so:${PORTSDIR}/dns/adns
+MKDNS_CONFIGURE_ON= --with-adns=${LOCALBASE}
+STD_SOCKET_CONFIGURE_ENABLE= socket
+NLS_USES= gettext
+NLS_CONFIGURE_ENABLE= nls
+SCDAEMON_CONFIGURE_ENABLE= scdaemon
+CURL_LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
+CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE}
+CURL_CONFIGURE_OFF= --without-libcurl
+
.include <bsd.port.options.mk>
-.if ! ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+= --disable-doc
-.else
+.if ${PORT_OPTIONS:MDOCS}
INFO= gnupg
.endif
-.if ${PORT_OPTIONS:MPINENTRY}
-RUN_DEPENDS+= pinentry>0:${PORTSDIR}/security/pinentry
-.endif
-
.if ${PORT_OPTIONS:MGPGSM}
-RUN_DEPENDS+= dirmngr:${PORTSDIR}/security/dirmngr
PORT_OPTIONS+= LDAP
-.else
-CONFIGURE_ARGS+=--disable-gpgsm
.endif
.if ${PORT_OPTIONS:MLDAP}
@@ -67,37 +72,10 @@
CONFIGURE_ARGS+=--disable-ldap
.endif
-.if ${PORT_OPTIONS:MKDNS}
-LIB_DEPENDS+= libadns.so:${PORTSDIR}/dns/adns
-CONFIGURE_ARGS+= --with-adns=${LOCALBASE}
-.else
+.if ! ${PORT_OPTIONS:MKDNS}
CONFIGURE_SUB= -e '/GPGKEYS_KDNS=/s/".*"/""/'
.endif
-.if ${PORT_OPTIONS:MSTD_SOCKET}
-CONFIGURE_ARGS+=--enable-standard-socket
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-CONFIGURE_ARGS+=--enable-nls
-.else
-CONFIGURE_ARGS+=--disable-nls
-.endif
-
-.if ${PORT_OPTIONS:MSCDAEMON}
-CONFIGURE_ARGS+=--enable-scdaemon
-.else
-CONFIGURE_ARGS+=--disable-scdaemon
-.endif
-
-.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
-CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--without-libcurl
-.endif
-
verify: checksum
gpg2 --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig
--- gnupg-2.0.22.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131114140942.90A5114269C>