nmh: fix `test' phase

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Mon Aug 7 12:45:16 2017 +0200
Changeset:	4bdd4aa58a0368c394040109f2a47c978525a8fe

Modified Files:
	nmh/distinfo
	nmh/patches/patch-ca

Log Message:
nmh: fix `test' phase

Fix `test' phase directly (ab)using $nmhetcdirinst in the TEST_ENVIRONMENT
to fix test-mhparam.

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

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

diffstat:
 nmh/distinfo         | 2 +-
 nmh/patches/patch-ca | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs:
diff --git a/nmh/distinfo b/nmh/distinfo
index f4a7ce764e..d6702ba8f7 100644
--- a/nmh/distinfo
+++ b/nmh/distinfo
@@ -4,5 +4,5 @@ SHA1 (nmh-1.7-RC1.tar.gz) = 1e5d3d139d2771f61347be88737118e63a6f860d
 RMD160 (nmh-1.7-RC1.tar.gz) = f005591180c2ae8e177ed2d3baa24b6066bb14b9
 SHA512 (nmh-1.7-RC1.tar.gz) = 533ebc81ebf9070bfc754dc38d97600f18a50f23999b938348535bb5923b349ed6e3900477d15ebc4c252ca3993cc7a71af4522fdd7f52249e14d3875c1dedca
 Size (nmh-1.7-RC1.tar.gz) = 1386731 bytes
-SHA1 (patch-ca) = 809928b0de6f72f8c3d348936635c57a62e6ed63
+SHA1 (patch-ca) = 8e3d655602d8b508f403e51b105e122818b50b7c
 SHA1 (patch-cd) = 5a775091713bca2597a01fcd267d56e2a175588a
diff --git a/nmh/patches/patch-ca b/nmh/patches/patch-ca
index 177a485ae5..92e1d27ebe 100644
--- a/nmh/patches/patch-ca
+++ b/nmh/patches/patch-ca
@@ -3,7 +3,7 @@ $NetBSD: patch-ca,v 1.8 2014/09/06 16:07:43 schnoebe Exp $
 - Introduce $egdir and install all configuration files in it, in order to
   properly use CONF_FILES to manage configuration files for pkgsrc.
 - Adjust TEST_ENVIRONMENT in order to use $egdir instead of $nmhetcdir
-  because $nmhetcdir is not available in `test' phase.
+  and adjust $nmhetcdirinst to fix the `mhparam etcdir' test.
 
 --- Makefile.in.orig	2017-08-03 02:22:59.000000000 +0000
 +++ Makefile.in
@@ -22,7 +22,7 @@ $NetBSD: patch-ca,v 1.8 2014/09/06 16:07:43 schnoebe Exp $
 -		    mandir="$(mandir)" nmhetcdir="$(nmhetcdir)" \
 -		    nmhetcdirinst="@nmhetcdirinst@$(nmhetcdir)" \
 +		    mandir="$(mandir)" nmhetcdir="$(egdir)" \
-+		    nmhetcdirinst="@nmhetcdirinst@$(egdir)" \
++		    nmhetcdirinst="$(nmhetcdir)" \
  		    supported_locks="$(supported_locks)" \
  		    default_locking="${default_locking}" \
  		    MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \