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 1D3537A2B4 for ; Fri, 16 Dec 2016 15:47:37 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 5F6C1855A4; Fri, 16 Dec 2016 15:47:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E36BA84CF5 for ; Fri, 16 Dec 2016 15:47:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id CfbcGdZk8pR1 for ; Fri, 16 Dec 2016 15:47:35 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4FA1484CBD for ; Fri, 16 Dec 2016 15:47:35 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4A701FBA6; Fri, 16 Dec 2016 15:47:35 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_148190325541380" MIME-Version: 1.0 Date: Fri, 16 Dec 2016 15:47:35 +0000 From: "Hans Rosenfeld" Subject: CVS commit: pkgsrc/mail/spamassassin To: pkgsrc-changes@NetBSD.org Reply-To: hans@netbsd.org X-Mailer: log_accum Message-Id: <20161216154735.4A701FBA6@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. --_----------=_148190325541380 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: hans Date: Fri Dec 16 15:47:35 UTC 2016 Modified Files: pkgsrc/mail/spamassassin: options.mk Log Message: Add option for security/gnupg21 support. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/mail/spamassassin/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_148190325541380 Content-Disposition: inline Content-Length: 967 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/spamassassin/options.mk diff -u pkgsrc/mail/spamassassin/options.mk:1.11 pkgsrc/mail/spamassassin/options.mk:1.12 --- pkgsrc/mail/spamassassin/options.mk:1.11 Wed Jul 24 16:17:02 2013 +++ pkgsrc/mail/spamassassin/options.mk Fri Dec 16 15:47:35 2016 @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.11 2013/07/24 16:17:02 drochner Exp $ +# $NetBSD: options.mk,v 1.12 2016/12/16 15:47:35 hans Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.spamassassin -PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg2 +PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg2 gnupg21 # # Default options @@ -53,7 +53,10 @@ DEPENDS+= p5-IO-Socket-INET6-[0-9]*:../ # # use gnupg2 instead of gnupg1 # -.if !empty(PKG_OPTIONS:Mgnupg2) +.if !empty(PKG_OPTIONS:Mgnupg21) +DEPENDS+= gnupg21-[0-9]*:../../security/gnupg21 +GPGPATH= ${LOCALBASE}/bin/gpg2 +.elif !empty(PKG_OPTIONS:Mgnupg2) DEPENDS+= gnupg2-[0-9]*:../../security/gnupg2 GPGPATH= ${LOCALBASE}/bin/gpg2 .else --_----------=_148190325541380--