From owner-svn-ports-head@FreeBSD.ORG Fri Nov 29 15:16:29 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 410A1870; Fri, 29 Nov 2013 15:16:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 143EE1C49; Fri, 29 Nov 2013 15:16:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rATFGSiG088029; Fri, 29 Nov 2013 15:16:28 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rATFGSPd088028; Fri, 29 Nov 2013 15:16:28 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201311291516.rATFGSPd088028@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 29 Nov 2013 15:16:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335188 - head/security/gnupg X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Nov 2013 15:16:29 -0000 Author: mat Date: Fri Nov 29 15:16:28 2013 New Revision: 335188 URL: http://svnweb.freebsd.org/changeset/ports/335188 Log: Convert to new options framekwork. maintainer timeout. PR: ports/183955 Submitted by: mat Modified: head/security/gnupg/Makefile Modified: head/security/gnupg/Makefile ============================================================================== --- head/security/gnupg/Makefile Fri Nov 29 15:14:26 2013 (r335187) +++ head/security/gnupg/Makefile Fri Nov 29 15:16:28 2013 (r335188) @@ -41,23 +41,28 @@ OPTIONS_DEFAULT= CURL 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 -.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+=--with-ldap=${LOCALBASE} 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