Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_159834569210990"
MIME-Version: 1.0
Date: Tue, 25 Aug 2020 08:54:52 +0000
From: "Amitai Schleier" <schmonz@netbsd.org>
Subject: CVS commit: pkgsrc/security/gpgme
To: pkgsrc-changes@NetBSD.org
Reply-To: schmonz@netbsd.org
Message-Id: <20200825085452.4BF19FB2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_159834569210990
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	schmonz
Date:		Tue Aug 25 08:54:52 UTC 2020

Modified Files:
	pkgsrc/security/gpgme: Makefile distinfo
Added Files:
	pkgsrc/security/gpgme/patches: patch-Makefile.in

Log Message:
On macOS, the build intermittently breaks because tests intermittently
give "gpg: can't connect to the agent: File name too long". Make this
less annoying by not running tests before 'make test' (and fixing that
pkgsrc target).


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 pkgsrc/security/gpgme/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/security/gpgme/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/gpgme/patches/patch-Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_159834569210990
Content-Disposition: inline
Content-Length: 2319
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/security/gpgme/Makefile
diff -u pkgsrc/security/gpgme/Makefile:1.98 pkgsrc/security/gpgme/Makefile:1.99
--- pkgsrc/security/gpgme/Makefile:1.98	Mon Aug  3 15:32:31 2020
+++ pkgsrc/security/gpgme/Makefile	Tue Aug 25 08:54:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2020/08/03 15:32:31 adam Exp $
+# $NetBSD: Makefile,v 1.99 2020/08/25 08:54:52 schmonz Exp $
 
 DISTNAME=	gpgme-1.14.0
 CATEGORIES=	security
@@ -29,7 +29,8 @@ LIBS.SunOS+=		-lnsl -lsocket
 
 BUILDLINK_TRANSFORM+=	rm:-Wsuggest-override
 
-TEST_TARGET=		check
+TEST_TARGET=		all
+TEST_DIRS=		tests
 
 .include "options.mk"
 

Index: pkgsrc/security/gpgme/distinfo
diff -u pkgsrc/security/gpgme/distinfo:1.45 pkgsrc/security/gpgme/distinfo:1.46
--- pkgsrc/security/gpgme/distinfo:1.45	Fri Aug 14 10:32:43 2020
+++ pkgsrc/security/gpgme/distinfo	Tue Aug 25 08:54:52 2020
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.45 2020/08/14 10:32:43 tnn Exp $
+$NetBSD: distinfo,v 1.46 2020/08/25 08:54:52 schmonz Exp $
 
 SHA1 (gpgme-1.14.0.tar.bz2) = 90a1b678703b0cabdb953035a4bee012e5685dce
 RMD160 (gpgme-1.14.0.tar.bz2) = 1889520e54ca69b06386b7b53f5dc82c6f8d036a
 SHA512 (gpgme-1.14.0.tar.bz2) = b7ffa30a046c75215e1c73e2f34e5e65532e4dcf6bea55796adc6f82fd38dafe264bcd4332b2001155d6f9476d6fd82a77112dad31c1bb29db9ddefc532ae668
 Size (gpgme-1.14.0.tar.bz2) = 1678910 bytes
+SHA1 (patch-Makefile.in) = 3277143d4aca64067249e03f584c9f7381c9037e
 SHA1 (patch-aa) = 6b81bc9b6b17f14329e0dbf1917d1352c142c072
 SHA1 (patch-lang_cpp_src_editinteractor.cpp) = f6e7234c31956ce81353d012b52011a72713e45d

Added files:

Index: pkgsrc/security/gpgme/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/security/gpgme/patches/patch-Makefile.in:1.1
--- /dev/null	Tue Aug 25 08:54:52 2020
+++ pkgsrc/security/gpgme/patches/patch-Makefile.in	Tue Aug 25 08:54:52 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2020/08/25 08:54:52 schmonz Exp $
+
+Don't run tests before TEST_TARGET.
+
+--- Makefile.in.orig	2020-07-16 15:21:00.000000000 +0000
++++ Makefile.in
+@@ -458,7 +458,7 @@ EXTRA_DIST = autogen.sh autogen.rc gpgme
+              conf/whatisthis VERSION
+ 
+ @RUN_GPG_TESTS_FALSE@tests = 
+-@RUN_GPG_TESTS_TRUE@tests = tests
++@RUN_GPG_TESTS_TRUE@tests = #tests
+ SUBDIRS = src ${tests} doc lang
+ gen_start_date = 2011-12-01T00:00:00
+ 


--_----------=_159834569210990--