Tue Aug 25 08:54:52 2020 UTC ()
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).


(schmonz)
diff -r1.98 -r1.99 pkgsrc/security/gpgme/Makefile
diff -r1.45 -r1.46 pkgsrc/security/gpgme/distinfo
diff -r0 -r1.1 pkgsrc/security/gpgme/patches/patch-Makefile.in
cvs diff -r1.98 -r1.99 pkgsrc/security/gpgme/Makefile (expand / switch to unified diff)

--- pkgsrc/security/gpgme/Makefile 2020/08/03 15:32:31 1.98
+++ pkgsrc/security/gpgme/Makefile 2020/08/25 08:54:52 1.99
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.98 2020/08/03 15:32:31 adam Exp $ 1# $NetBSD: Makefile,v 1.99 2020/08/25 08:54:52 schmonz Exp $
2 2
3DISTNAME= gpgme-1.14.0 3DISTNAME= gpgme-1.14.0
4CATEGORIES= security 4CATEGORIES= security
5MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gpgme/ 5MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gpgme/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.gnupg.org/related_software/gpgme/ 9HOMEPAGE= https://www.gnupg.org/related_software/gpgme/
10COMMENT= GnuPG Made Easy 10COMMENT= GnuPG Made Easy
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13USE_LANGUAGES+= c99 c++ 13USE_LANGUAGES+= c99 c++
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
@@ -19,22 +19,23 @@ INFO_FILES= yes @@ -19,22 +19,23 @@ INFO_FILES= yes
19CONFIGURE_ARGS+= --enable-languages="cl cpp" 19CONFIGURE_ARGS+= --enable-languages="cl cpp"
20 20
21SUBST_CLASSES+= pthread 21SUBST_CLASSES+= pthread
22SUBST_FILES.pthread= src/gpgme-config.in 22SUBST_FILES.pthread= src/gpgme-config.in
23SUBST_SED.pthread+= -e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g' 23SUBST_SED.pthread+= -e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g'
24SUBST_VARS.pthread= PTHREAD_CFLAGS 24SUBST_VARS.pthread= PTHREAD_CFLAGS
25SUBST_STAGE.pthread= pre-configure 25SUBST_STAGE.pthread= pre-configure
26 26
27CPPFLAGS.Darwin= -D_POSIX_C_SOURCE=200809L 27CPPFLAGS.Darwin= -D_POSIX_C_SOURCE=200809L
28LIBS.SunOS+= -lnsl -lsocket 28LIBS.SunOS+= -lnsl -lsocket
29 29
30BUILDLINK_TRANSFORM+= rm:-Wsuggest-override 30BUILDLINK_TRANSFORM+= rm:-Wsuggest-override
31 31
32TEST_TARGET= check 32TEST_TARGET= all
 33TEST_DIRS= tests
33 34
34.include "options.mk" 35.include "options.mk"
35 36
36.include "../../security/libassuan2/buildlink3.mk" 37.include "../../security/libassuan2/buildlink3.mk"
37BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.28 38BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.28
38.include "../../security/libgpg-error/buildlink3.mk" 39.include "../../security/libgpg-error/buildlink3.mk"
39.include "../../mk/pthread.buildlink3.mk" 40.include "../../mk/pthread.buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.45 -r1.46 pkgsrc/security/gpgme/distinfo (expand / switch to unified diff)

--- pkgsrc/security/gpgme/distinfo 2020/08/14 10:32:43 1.45
+++ pkgsrc/security/gpgme/distinfo 2020/08/25 08:54:52 1.46
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.45 2020/08/14 10:32:43 tnn Exp $ 1$NetBSD: distinfo,v 1.46 2020/08/25 08:54:52 schmonz Exp $
2 2
3SHA1 (gpgme-1.14.0.tar.bz2) = 90a1b678703b0cabdb953035a4bee012e5685dce 3SHA1 (gpgme-1.14.0.tar.bz2) = 90a1b678703b0cabdb953035a4bee012e5685dce
4RMD160 (gpgme-1.14.0.tar.bz2) = 1889520e54ca69b06386b7b53f5dc82c6f8d036a 4RMD160 (gpgme-1.14.0.tar.bz2) = 1889520e54ca69b06386b7b53f5dc82c6f8d036a
5SHA512 (gpgme-1.14.0.tar.bz2) = b7ffa30a046c75215e1c73e2f34e5e65532e4dcf6bea55796adc6f82fd38dafe264bcd4332b2001155d6f9476d6fd82a77112dad31c1bb29db9ddefc532ae668 5SHA512 (gpgme-1.14.0.tar.bz2) = b7ffa30a046c75215e1c73e2f34e5e65532e4dcf6bea55796adc6f82fd38dafe264bcd4332b2001155d6f9476d6fd82a77112dad31c1bb29db9ddefc532ae668
6Size (gpgme-1.14.0.tar.bz2) = 1678910 bytes 6Size (gpgme-1.14.0.tar.bz2) = 1678910 bytes
 7SHA1 (patch-Makefile.in) = 3277143d4aca64067249e03f584c9f7381c9037e
7SHA1 (patch-aa) = 6b81bc9b6b17f14329e0dbf1917d1352c142c072 8SHA1 (patch-aa) = 6b81bc9b6b17f14329e0dbf1917d1352c142c072
8SHA1 (patch-lang_cpp_src_editinteractor.cpp) = f6e7234c31956ce81353d012b52011a72713e45d 9SHA1 (patch-lang_cpp_src_editinteractor.cpp) = f6e7234c31956ce81353d012b52011a72713e45d
File Added: pkgsrc/security/gpgme/patches/patch-Makefile.in
$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