Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 434AD7A27F for ; Wed, 5 Apr 2017 08:58:41 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id E37F48557E; Wed, 5 Apr 2017 08:58:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 753798556F for ; Wed, 5 Apr 2017 08:58:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 7IAue9fJec4N for ; Wed, 5 Apr 2017 08:58:40 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D2AB88556B for ; Wed, 5 Apr 2017 08:58:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5BDBAFBE4; Wed, 5 Apr 2017 08:58:24 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1491382704152870" MIME-Version: 1.0 Date: Wed, 5 Apr 2017 08:58:24 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/security/gpgme To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20170405085824.5BDBAFBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1491382704152870 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Apr 5 08:58:24 UTC 2017 Modified Files: pkgsrc/security/gpgme: options.mk Log Message: Remove unrecognized configure arguments. Set gpg binary name for tests. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/gpgme/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1491382704152870 Content-Disposition: inline Content-Length: 1250 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/gpgme/options.mk diff -u pkgsrc/security/gpgme/options.mk:1.4 pkgsrc/security/gpgme/options.mk:1.5 --- pkgsrc/security/gpgme/options.mk:1.4 Wed Nov 25 12:58:02 2015 +++ pkgsrc/security/gpgme/options.mk Wed Apr 5 08:58:24 2017 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2015/11/25 12:58:02 jperkin Exp $ +# $NetBSD: options.mk,v 1.5 2017/04/05 08:58:24 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gpgme PKG_OPTIONS_REQUIRED_GROUPS= gnupg @@ -9,16 +9,14 @@ PKG_SUGGESTED_OPTIONS= gnupg2 .if !empty(PKG_OPTIONS:Mgnupg21) DEPENDS+= gnupg21>=2.1:../../security/gnupg21 -CONFIGURE_ARGS+= --with-gpgsm=${LOCALBASE}/bin/gpgsm -CONFIGURE_ARGS+= --with-gpg=${LOCALBASE}/bin/gpg2 REPLACE_SH+= tests/gpg/pinentry +GPG_DEFAULT= ${LOCALBASE}/bin/gpg2 +MAKE_FLAGS+= GPG=${GPG_DEFAULT} .elif !empty(PKG_OPTIONS:Mgnupg2) DEPENDS+= gnupg2>=2.0<2.1:../../security/gnupg2 -CONFIGURE_ARGS+= --with-gpgsm=${LOCALBASE}/bin/gpgsm -CONFIGURE_ARGS+= --with-gpg=${LOCALBASE}/bin/gpg2 REPLACE_SH+= tests/gpg/pinentry +GPG_DEFAULT= ${LOCALBASE}/bin/gpg2 +MAKE_FLAGS+= GPG=${GPG_DEFAULT} .else DEPENDS+= gnupg>=1.4.2:../../security/gnupg -CONFIGURE_ARGS+= --without-gpgconf -CONFIGURE_ARGS+= --without-gpgsm .endif --_----------=_1491382704152870--