Index: Portfile
===================================================================
--- Portfile	(revision 152322)
+++ Portfile	(working copy)
@@ -5,7 +5,7 @@
 
 name                gpgme
 version             1.6.0
-revision            1
+revision            2
 categories          devel security crypto
 license             {LGPL-2.1+ GPL-3+}
 maintainers         devans openmaintainer
@@ -26,8 +26,11 @@
 checksums           rmd160  0ce3451911bba6dcce7b120f9c8387cd41e3f514 \
                     sha256  b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d
 
-depends_lib         port:gnupg2 \
-                    port:pth \
+# gnupg2 is only needed for running the unit tests, it is not needed
+# at runtime.
+depends_build       port:gnupg2
+
+depends_lib         port:pth \
                     port:libgpg-error \
                     port:libassuan
 
@@ -34,7 +37,7 @@
 use_parallel_build  no
 
 patchfiles          patch-configure.ac.diff \
-                    patch-tests-gpg-Makefile.in.diff
+                    patch-tests-gpg-Makefile.am.diff
 
 post-patch {
     reinplace "s|thread_modules=\"\"|thread_modules=\"pthread\"|" ${worksrcpath}/src/gpgme-config.in
Index: files/patch-tests-gpg-Makefile.am.diff
===================================================================
--- files/patch-tests-gpg-Makefile.am.diff	(nonexistent)
+++ files/patch-tests-gpg-Makefile.am.diff	(working copy)
@@ -0,0 +1,11 @@
+--- tests/gpg/Makefile.am.orig	2015-06-08 05:54:24.000000000 -0700
++++ tests/gpg/Makefile.am	2016-09-03 13:39:03.000000000 -0700
+@@ -19,7 +19,7 @@
+ 
+ ## Process this file with automake to produce Makefile.in
+ 
+-GPG = gpg
++GPG = gpg2
+ GPG_AGENT = gpg-agent
+ 
+ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO= \
Index: files/patch-tests-gpg-Makefile.in.diff
===================================================================
--- files/patch-tests-gpg-Makefile.in.diff	(revision 152322)
+++ files/patch-tests-gpg-Makefile.in.diff	(nonexistent)
@@ -1,11 +0,0 @@
---- tests/gpg/Makefile.in.orig	2015-06-08 06:03:50.000000000 -0700
-+++ tests/gpg/Makefile.in	2015-06-09 09:11:19.000000000 -0700
-@@ -470,7 +470,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--GPG = gpg
-+GPG = gpg2
- GPG_AGENT = gpg-agent
- TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO= \
-                     top_srcdir=$(top_srcdir)