inn: Fix GnuPG paths, Fix testsuite

[Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Wed Sep 4 16:06:08 2019 +0200
Changeset:	7a338db9522e6c119d04ba8370f3a0bed8732f77

Modified Files:
	inn/Makefile
	inn/TODO
	inn/distinfo
	inn/patches/patch-control_pgpverify.in

Log Message:
inn: Fix GnuPG paths, Fix testsuite

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7a338db9522e6c119d04ba8370f3a0bed8732f77

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

diffstat:
 inn/Makefile                           | 14 +++++++++++---
 inn/TODO                               |  5 ++++-
 inn/distinfo                           |  2 +-
 inn/patches/patch-control_pgpverify.in | 19 +++++++++++++++++--
 4 files changed, 33 insertions(+), 7 deletions(-)

diffs:
diff --git a/inn/Makefile b/inn/Makefile
index eddffb02c4..b3a0849071 100644
--- a/inn/Makefile
+++ b/inn/Makefile
@@ -14,8 +14,6 @@ LICENSE=		modified-bsd AND gnu-gpl-v2
 
 CONFLICTS+=		libradius-[0-9]* nntpclnt-[0-9]*
 
-USE_LIBTOOL=		yes
-
 .include "../../news/inn/Makefile.common"
 
 # Already done in Makefile.common
@@ -61,11 +59,21 @@ CONFIGURE_ENV+=		_PATH_SH=${TOOLS_SH}
 CONFIGURE_ENV+=		_PATH_SORT=${TOOLS_SORT}
 CONFIGURE_ENV+=		GZIP=${TOOLS_GZIP_CMD}
 USE_TOOLS+=		awk egrep gzip perl:run sed sh sort yacc
+USE_LIBTOOL=		yes
 
+REPLACE_PERL+=		tests/docs/pod.t
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
-DEPENDS+=		p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools
+# Modify GnuPG path to ${PREFIX} in pgpverify Perl script
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	pre-configure
+SUBST_MESSAGE.prefix=	Preparing pgpverify.in file ...
+SUBST_FILES.prefix=	control/pgpverify.in
+SUBST_SED.prefix=	-e 's,PKGSRC_PREFIX,${PREFIX},g'
+
 DEPENDS+=		p5-GD-[0-9]*:../../graphics/p5-GD
+DEPENDS+=		p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools
+DEPENDS+=		p5-Test-Pod-[0-9]*:../../devel/p5-Test-Pod
 DEPENDS+=		gnupg-[0-9]*:../../security/gnupg
 
 USERGROUP_PHASE=	pre-install
diff --git a/inn/TODO b/inn/TODO
index 885d9813bc..9b516e91eb 100644
--- a/inn/TODO
+++ b/inn/TODO
@@ -9,13 +9,16 @@
     => Fixed.
 [X] Check pkglints complaint about USE_LIBTOOL
     => Added with value yes
-[ ] gpg is now supported in addition to gpgv
+[X] gpg is now supported in addition to gpgv
     Check dependencies
+    => security/gnupg provides gpg too. Use it.
 [ ] Python3 is now supported
     Check declaration of supported Python versions
     Enable python option by default?
 [X] OpenSSL API 1.1 is now supported
     => Added comment to Makefile for future updates
+[X] Test suite fail
+    => Fixed the Perl stuff to make tests/docs/pod.t work
 [ ] Check permission problems while installing with nonprivileged account
 
 [ ] Suggest update to maintainer spz@ for import after it was tested in wip
diff --git a/inn/distinfo b/inn/distinfo
index cd25618bec..27d2053cb8 100644
--- a/inn/distinfo
+++ b/inn/distinfo
@@ -6,7 +6,7 @@ SHA512 (inn-2.6.3.tar.gz) = 123881d474ce1df21983b3093827915706670a400d48c3945c32
 Size (inn-2.6.3.tar.gz) = 2586168 bytes
 SHA1 (patch-Makefile.global.in) = b10fc0785ea790aad7b38989351fc74cadaebfec
 SHA1 (patch-configure) = 8b054a697f559980a5de00fa3132e08c390b4cc3
-SHA1 (patch-control_pgpverify.in) = bed9a7783f24792bac9c390981161ab4467331b1
+SHA1 (patch-control_pgpverify.in) = e21fc10d6a9d54cd8c19661db061461097facbb4
 SHA1 (patch-lib_fdlimit.c) = 65dcb372deb477d93ae31379f23137b7c210fb88
 SHA1 (patch-perl_INN_Config.pm.in) = eb1ee267dd6d358d0d0a508206e4dd70fa784770
 SHA1 (patch-scripts_news.daily.in) = e2b86b8e9f190c00b047862529447c7fe063ca4a
diff --git a/inn/patches/patch-control_pgpverify.in b/inn/patches/patch-control_pgpverify.in
index 0a48d249d5..da5688d1a9 100644
--- a/inn/patches/patch-control_pgpverify.in
+++ b/inn/patches/patch-control_pgpverify.in
@@ -1,10 +1,25 @@
 $NetBSD$
 
-XXX: This is wrong!
+Use GnuPG (gpg1) by default.
+Prepare pkgsrc PREFIX for both, gpg and gpgv.
 
 --- control/pgpverify.in.orig	2019-02-07 15:02:22.000000000 +0000
 +++ control/pgpverify.in
-@@ -152,7 +152,7 @@
+@@ -140,19 +140,19 @@
+ # the value of $INN::Config::gpg will override this.  On a recent Debian
+ # variant, use /usr/bin/gpg1 (from the gnupg1 package) if you want to
+ # support old signatures with MD5 digest algorithms.
+-# $gpg = '/usr/local/bin/gpg';
++$gpg = 'PKGSRC_PREFIX/gpg';
+ 
+ # Path to the GnuPG gpgv binary, if you have GnuPG.  If you do, this will
+ # be used in preference to PGP.  For most current control messages, you
+ # need a version of GnuPG that can handle RSA signatures.  If you have INN
+ # and the script is able to successfully include your INN::Config module,
+ # the value of $INN::Config::gpgv will override this.
+-# $gpgv = '/usr/local/bin/gpgv';
++#$gpgv = 'PKGSRC_PREFIX/gpgv';
+ 
  # Path to pgp binary; for PGP 5.0, set the path to the pgpv binary.  If
  # you have INN and the script is able to successfully include your
  # INN::Config module, the value of $INN::Config::pgp will override this.