[pkgsrc/trunk]: pkgsrc/net/dnscheck Added run-fix based on suggestions in pkg...

[pettai <pettai%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c30fe0104f7e
branches:  trunk
changeset: 648815:c30fe0104f7e
user:      pettai <pettai%pkgsrc.org@localhost>
date:      Thu Mar 19 22:15:52 2015 +0000

description:
Added run-fix based on suggestions in pkg/49755

diffstat:

 net/dnscheck/Makefile         |  31 ++++++++++++-------------------
 net/dnscheck/PLIST            |   9 +++++++--
 net/dnscheck/distinfo         |   3 +--
 net/dnscheck/patches/patch-ab |  20 --------------------
 4 files changed, 20 insertions(+), 43 deletions(-)

diffs (133 lines):

diff -r de22861b0af5 -r c30fe0104f7e net/dnscheck/Makefile
--- a/net/dnscheck/Makefile     Thu Mar 19 22:11:44 2015 +0000
+++ b/net/dnscheck/Makefile     Thu Mar 19 22:15:52 2015 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2014/05/29 23:37:03 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2015/03/19 22:15:52 pettai Exp $
 
 DISTNAME=      dotse-dnscheck-1.5.4-0-g352a15c
 PKGNAME=       dnscheck-1.5.4
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net perl5
-MASTER_SITES=  -https://github.com/dotse/dnscheck/tarball/1.5.4
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=dotse/dnscheck/tarball/1.5.4/}
 
 MAINTAINER=    pettai%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/dotse/dnscheck/
@@ -31,6 +31,7 @@
 DEPENDS+=      p5-JSON-XS-[0-9]*:../../converters/p5-JSON-XS
 DEPENDS+=      p5-MIME-Lite-[0-9]*:../../mail/p5-MIME-Lite
 DEPENDS+=      p5-Text-Template-[0-9]*:../../textproc/p5-Text-Template
+DEPENDS+=      p5-List-MoreUtils-[0-9]*:../../devel/p5-List-MoreUtils
 
 REPLACE_PERL+=  lib/DNSCheck.pm lib/DNSCheck/*.pm
 REPLACE_PERL+=  lib/DNSCheck/Lookup/*.pm lib/DNSCheck/Test/*.pm
@@ -39,29 +40,21 @@
 PERL5_PACKLIST=        auto/DNSCheck/.packlist
 BUILDLINK_API_DEPENDS.perl+=   perl>=5.6.1
 
-WRKSRC=         ${WRKDIR}/dotse-dnscheck-006ca8d/engine
-SYSCONFDIR=     `${BASENAME} ${PKG_SYSCONFDIR}`
+BUILD_DEFS+=    IPV6_READY
 
-EGDIR=         ${PREFIX}/share/examples/${PKGBASE}
-#CONF_FILES=   ${EGDIR}/config.yaml ${PKG_SYSCONFDIR}/${PKGBASE}/config.yaml
-#CONF_FILES+=  ${EGDIR}/policy.yaml ${PKG_SYSCONFDIR}/${PKGBASE}/policy.yaml
-
-BUILD_DEFS+=    IPV6_READY
+INSTALLATION_DIRS=     ${EGDIR}
+OWN_DIRS=              ${SYSCONFDIR}/${PKGBASE}
 
 SUBST_CLASSES+=         paths
 SUBST_STAGE.paths=      pre-configure
 SUBST_FILES.paths=      lib/DNSCheck/Config.pm
-SUBST_SED.paths+=       -e s!@SYSCONFDIR@!${SYSCONFDIR}!g
-
-INSTALLATION_DIRS=     ${EGDIR}
-OWN_DIRS=              ${SYSCONFDIR}/${PKGBASE}
+SUBST_SED.paths+=       -e s!/etc!${SYSCONFDIR}!g
 
-post-patch:
-       ${RM} ${WRKSRC}/lib/DNSCheck/Config.pm.orig
+WRKSRC=                ${WRKDIR}/dotse-dnscheck-006ca8d/engine
+EGDIR=         ${PREFIX}/share/examples/${PKGBASE}
 
-#post-install:
-#      ${INSTALL_DATA} ${WRKSRC}/config.yaml ${DESTDIR}${EGDIR}/
-#      ${INSTALL_DATA} ${WRKSRC}/policy.yaml ${DESTDIR}${EGDIR}/
+post-install:
+       ${CP} -r ${WRKSRC}/config ${DESTDIR}${EGDIR}/
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r de22861b0af5 -r c30fe0104f7e net/dnscheck/PLIST
--- a/net/dnscheck/PLIST        Thu Mar 19 22:11:44 2015 +0000
+++ b/net/dnscheck/PLIST        Thu Mar 19 22:15:52 2015 +0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2013/06/15 21:18:49 pettai Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/03/19 22:15:52 pettai Exp $
+${PERL5_SUB_INSTALLARCHLIB}/perllocal.pod
 ${PERL5_SUB_INSTALLVENDORLIB}/DNSCheck.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/DNSCheck/Config.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/DNSCheck/Locale.pm
@@ -19,6 +20,7 @@
 ${PERL5_SUB_INSTALLVENDORLIB}/DNSCheck/Test/SOA.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/DNSCheck/Test/Zone.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/auto/share/dist/DNSCheck/config.yaml
+${PERL5_SUB_INSTALLVENDORLIB}/auto/share/dist/DNSCheck/cz.yaml
 ${PERL5_SUB_INSTALLVENDORLIB}/auto/share/dist/DNSCheck/en.yaml
 ${PERL5_SUB_INSTALLVENDORLIB}/auto/share/dist/DNSCheck/nl.yaml
 ${PERL5_SUB_INSTALLVENDORLIB}/auto/share/dist/DNSCheck/policy.yaml
@@ -28,7 +30,9 @@
 ${PERL5_SUB_INSTALLVENDORBIN}/dnscheck-12hourmailer
 ${PERL5_SUB_INSTALLVENDORBIN}/dnscheck-dispatcher
 ${PERL5_SUB_INSTALLVENDORBIN}/dnscheck-dnssecmailer
+${PERL5_SUB_INSTALLVENDORBIN}/dnscheck-enqueue
 ${PERL5_SUB_INSTALLVENDORBIN}/dnscheck-hostsyntax
+${PERL5_SUB_INSTALLVENDORBIN}/dnscheck-packetcheck
 ${PERL5_SUB_INSTALLVENDORBIN}/dnscheck-preflight
 ${PERL5_SUB_INSTALLVENDORBIN}/dnscheck-zonediff
 ${PERL5_SUB_INSTALLVENDORMAN1DIR}/dnscheck-12hourmailer.1
@@ -57,4 +61,5 @@
 ${PERL5_SUB_INSTALLVENDORMAN3DIR}/DNSCheck::Test::Nameserver.3
 ${PERL5_SUB_INSTALLVENDORMAN3DIR}/DNSCheck::Test::SOA.3
 ${PERL5_SUB_INSTALLVENDORMAN3DIR}/DNSCheck::Test::Zone.3
-@pkgdir share/examples/dnscheck
+share/examples/dnscheck/config/config.yaml
+share/examples/dnscheck/config/policy.yaml
diff -r de22861b0af5 -r c30fe0104f7e net/dnscheck/distinfo
--- a/net/dnscheck/distinfo     Thu Mar 19 22:11:44 2015 +0000
+++ b/net/dnscheck/distinfo     Thu Mar 19 22:15:52 2015 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2014/02/03 12:45:26 pettai Exp $
+$NetBSD: distinfo,v 1.4 2015/03/19 22:15:52 pettai Exp $
 
 SHA1 (dotse-dnscheck-1.5.4-0-g352a15c.tar.gz) = c3a0e38071856ae9b62acf0265fa33fc6581bf96
 RMD160 (dotse-dnscheck-1.5.4-0-g352a15c.tar.gz) = 79f99139446f8d280e51ca60be75faf51f49d6eb
 Size (dotse-dnscheck-1.5.4-0-g352a15c.tar.gz) = 1341040 bytes
-SHA1 (patch-ab) = 4a5ef356166e3bd84b7f51575ac18147b7da45e1
diff -r de22861b0af5 -r c30fe0104f7e net/dnscheck/patches/patch-ab
--- a/net/dnscheck/patches/patch-ab     Thu Mar 19 22:11:44 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2013/06/15 21:18:49 pettai Exp $
-
-Look for the configuration files in SYSCONFDIR instead of /etc
-
---- lib/DNSCheck/Config.pm.orig        2013-04-11 15:53:42.000000000 +0000
-+++ lib/DNSCheck/Config.pm
-@@ -58,11 +58,11 @@ sub new {
-         croak 'Configuration file ' . $arg{'configfile'} . ' not readable';
-     }
- 
--    my $config = _get_with_path( $arg{'configfile'}, _catfile( $arg{'configdir'}, 'config.yaml' ), '/etc/dnscheck/config.yaml', );
-+    my $config = _get_with_path( $arg{'configfile'}, _catfile( $arg{'configdir'}, 'config.yaml' ), '@SYSCONFDIR@/dnscheck/config.yaml', );
- 
-     my $default_policy = _get_with_path( _catfile( dist_dir( 'DNSCheck' ), 'policy.yaml' ) );
- 
--    my $policy = _get_with_path( $arg{'policyfile'}, _catfile( $arg{'policydir'}, 'policy.yaml' ), '/etc/dnscheck/policy.yaml', );
-+    my $policy = _get_with_path( $arg{'policyfile'}, _catfile( $arg{'policydir'}, 'policy.yaml' ), '@SYSCONFDIR@/dnscheck/policy.yaml', );
- 
-     my $locale;
-     if ( $arg{'localefile'} ) {