Ticket #52166: gpgme-patch.txt

File gpgme-patch.txt, 2.4 KB (added by blair (Blair Zajac), 8 years ago)
Line 
1Index: Portfile
2===================================================================
3--- Portfile    (revision 152322)
4+++ Portfile    (working copy)
5@@ -5,7 +5,7 @@
6 
7 name                gpgme
8 version             1.6.0
9-revision            1
10+revision            2
11 categories          devel security crypto
12 license             {LGPL-2.1+ GPL-3+}
13 maintainers         devans openmaintainer
14@@ -26,8 +26,11 @@
15 checksums           rmd160  0ce3451911bba6dcce7b120f9c8387cd41e3f514 \
16                     sha256  b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d
17 
18-depends_lib         port:gnupg2 \
19-                    port:pth \
20+# gnupg2 is only needed for running the unit tests, it is not needed
21+# at runtime.
22+depends_build       port:gnupg2
23+
24+depends_lib         port:pth \
25                     port:libgpg-error \
26                     port:libassuan
27 
28@@ -34,7 +37,7 @@
29 use_parallel_build  no
30 
31 patchfiles          patch-configure.ac.diff \
32-                    patch-tests-gpg-Makefile.in.diff
33+                    patch-tests-gpg-Makefile.am.diff
34 
35 post-patch {
36     reinplace "s|thread_modules=\"\"|thread_modules=\"pthread\"|" ${worksrcpath}/src/gpgme-config.in
37Index: files/patch-tests-gpg-Makefile.am.diff
38===================================================================
39--- files/patch-tests-gpg-Makefile.am.diff      (nonexistent)
40+++ files/patch-tests-gpg-Makefile.am.diff      (working copy)
41@@ -0,0 +1,11 @@
42+--- tests/gpg/Makefile.am.orig 2015-06-08 05:54:24.000000000 -0700
43++++ tests/gpg/Makefile.am      2016-09-03 13:39:03.000000000 -0700
44+@@ -19,7 +19,7 @@
45+
46+ ## Process this file with automake to produce Makefile.in
47+
48+-GPG = gpg
49++GPG = gpg2
50+ GPG_AGENT = gpg-agent
51+
52+ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO= \
53Index: files/patch-tests-gpg-Makefile.in.diff
54===================================================================
55--- files/patch-tests-gpg-Makefile.in.diff      (revision 152322)
56+++ files/patch-tests-gpg-Makefile.in.diff      (nonexistent)
57@@ -1,11 +0,0 @@
58---- tests/gpg/Makefile.in.orig 2015-06-08 06:03:50.000000000 -0700
59-+++ tests/gpg/Makefile.in      2015-06-09 09:11:19.000000000 -0700
60-@@ -470,7 +470,7 @@
61- top_build_prefix = @top_build_prefix@
62- top_builddir = @top_builddir@
63- top_srcdir = @top_srcdir@
64--GPG = gpg
65-+GPG = gpg2
66- GPG_AGENT = gpg-agent
67- TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO= \
68-                     top_srcdir=$(top_srcdir)