Hi, all:
Here is a patch for net/p5-Zonemaster ：
i）Update cli to 2.0.4, engine to 3.1.2 and ldns to 2.1.0
ii) Remove unneeded BUILD_DEPENDS=${RUN_DEPENDS}
iii) Pass --no-ed25519 to ldns's CONFIGURE_ARGS, since it
failed build with ed25519 option.
All 3 sub-ports build well and all tests passed, but one test in
engine failed, not caused by this patch.
Cheers !
wen
Index: cli/Makefile
===================================================================
RCS file: /cvs/ports/net/p5-Zonemaster/cli/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- cli/Makefile 11 Jul 2020 22:54:38 -0000 1.11
+++ cli/Makefile 26 Jul 2020 08:59:52 -0000
@@ -6,11 +6,10 @@ COMMENT = tool to check the quality of a
MODULES = cpan
CPAN_AUTHOR = ZNMSTR
-V = 1.1.3
+V = 2.0.4
DISTNAME = Zonemaster-CLI-v$V
PKGNAME = zonemaster-$V
CATEGORIES = net
-REVISION = 1
MAINTAINER = Stuart Henderson <[email protected]>
@@ -20,8 +19,6 @@ PERMIT_PACKAGE = Yes
WANTLIB = perl
CONFIGURE_STYLE = modinst
-
-BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = devel/p5-MooseX-Getopt \
devel/p5-namespace-autoclean \
Index: cli/distinfo
===================================================================
RCS file: /cvs/ports/net/p5-Zonemaster/cli/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- cli/distinfo 26 Aug 2018 19:37:27 -0000 1.6
+++ cli/distinfo 26 Jul 2020 08:59:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (Zonemaster-CLI-v1.1.3.tar.gz) =
3tpc7xu69MHryT+ecEfPaorukhtcSMKE8BUfeWZhvZc=
-SIZE (Zonemaster-CLI-v1.1.3.tar.gz) = 37407
+SHA256 (Zonemaster-CLI-v2.0.4.tar.gz) =
0bl0kLM5gUjN0z8G83MQpECiADDhBuUXBSqADeOSW1U=
+SIZE (Zonemaster-CLI-v2.0.4.tar.gz) = 40838
Index: engine/Makefile
===================================================================
RCS file: /cvs/ports/net/p5-Zonemaster/engine/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- engine/Makefile 11 Jul 2020 22:54:38 -0000 1.12
+++ engine/Makefile 26 Jul 2020 08:59:52 -0000
@@ -6,11 +6,10 @@ COMMENT = tool to check the quality of a
MODULES = cpan
CPAN_AUTHOR = ZNMSTR
-V = 2.0.7
+V = 3.1.2
DISTNAME = Zonemaster-Engine-v$V
PKGNAME = p5-Zonemaster-engine-$V
CATEGORIES = net
-REVISION = 1
MAINTAINER = Stuart Henderson <[email protected]>
@@ -19,7 +18,6 @@ PERMIT_PACKAGE = Yes
WANTLIB = perl
-BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = converters/p5-JSON>=2.53 \
converters/p5-JSON-XS>=2.32 \
devel/p5-File-ShareDir>=1.00 \
@@ -36,7 +34,8 @@ RUN_DEPENDS = converters/p5-JSON>=2.53
net/p5-Zonemaster/ldns \
textproc/p5-Text-CSV
-TEST_DEPENDS = devel/p5-Pod-Coverage \
- devel/p5-Test-Fatal
+TEST_DEPENDS = devel/p5-Test-Fatal
+
+MAKE_ENV = TEST_POD=Yes
.include <bsd.port.mk>
Index: engine/distinfo
===================================================================
RCS file: /cvs/ports/net/p5-Zonemaster/engine/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- engine/distinfo 26 Aug 2018 19:33:15 -0000 1.6
+++ engine/distinfo 26 Jul 2020 08:59:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (Zonemaster-Engine-v2.0.7.tar.gz) =
f1f6rUKYTBFqW3oPTqKqe88PIs0HHT7/6TZVFdAbptw=
-SIZE (Zonemaster-Engine-v2.0.7.tar.gz) = 560703
+SHA256 (Zonemaster-Engine-v3.1.2.tar.gz) =
djpnIffW1gn0Ogcj0igPDBzQRjcmaI1BAzTYAAuqq5g=
+SIZE (Zonemaster-Engine-v3.1.2.tar.gz) = 1090771
Index: engine/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/p5-Zonemaster/engine/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- engine/pkg/PLIST 6 Feb 2018 21:55:39 -0000 1.5
+++ engine/pkg/PLIST 26 Jul 2020 08:59:52 -0000
@@ -3,7 +3,6 @@ ${P5SITE}/Zonemaster/
${P5SITE}/Zonemaster/Engine/
${P5SITE}/Zonemaster/Engine.pm
${P5SITE}/Zonemaster/Engine/ASNLookup.pm
-${P5SITE}/Zonemaster/Engine/Config.pm
${P5SITE}/Zonemaster/Engine/Constants.pm
${P5SITE}/Zonemaster/Engine/DNSName.pm
${P5SITE}/Zonemaster/Engine/Exception.pm
@@ -18,6 +17,7 @@ ${P5SITE}/Zonemaster/Engine/Net/
${P5SITE}/Zonemaster/Engine/Net/IP.pm
${P5SITE}/Zonemaster/Engine/Overview.pod
${P5SITE}/Zonemaster/Engine/Packet.pm
+${P5SITE}/Zonemaster/Engine/Profile.pm
${P5SITE}/Zonemaster/Engine/Recursor.pm
${P5SITE}/Zonemaster/Engine/Test/
${P5SITE}/Zonemaster/Engine/Test.pm
@@ -27,7 +27,6 @@ ${P5SITE}/Zonemaster/Engine/Test/Connect
${P5SITE}/Zonemaster/Engine/Test/Consistency.pm
${P5SITE}/Zonemaster/Engine/Test/DNSSEC.pm
${P5SITE}/Zonemaster/Engine/Test/Delegation.pm
-${P5SITE}/Zonemaster/Engine/Test/Example.pm
${P5SITE}/Zonemaster/Engine/Test/Nameserver.pm
${P5SITE}/Zonemaster/Engine/Test/Syntax.pm
${P5SITE}/Zonemaster/Engine/Test/Zone.pm
@@ -36,11 +35,9 @@ ${P5SITE}/Zonemaster/Engine/Translator.p
${P5SITE}/Zonemaster/Engine/Util.pm
${P5SITE}/Zonemaster/Engine/Zone.pm
${P5SITE}/auto/share/dist/Zonemaster-Engine/
-${P5SITE}/auto/share/dist/Zonemaster-Engine/config.json
${P5SITE}/auto/share/dist/Zonemaster-Engine/config_example_logfilter.json
${P5SITE}/auto/share/dist/Zonemaster-Engine/iana-ipv4-special-registry.csv
${P5SITE}/auto/share/dist/Zonemaster-Engine/iana-ipv6-special-registry.csv
-${P5SITE}/auto/share/dist/Zonemaster-Engine/iana-profile.json
${P5SITE}/auto/share/dist/Zonemaster-Engine/locale/
${P5SITE}/auto/share/dist/Zonemaster-Engine/locale/da/
${P5SITE}/auto/share/dist/Zonemaster-Engine/locale/da/LC_MESSAGES/
@@ -54,10 +51,11 @@ ${P5SITE}/auto/share/dist/Zonemaster-Eng
${P5SITE}/auto/share/dist/Zonemaster-Engine/locale/sv/
${P5SITE}/auto/share/dist/Zonemaster-Engine/locale/sv/LC_MESSAGES/
${P5SITE}/auto/share/dist/Zonemaster-Engine/locale/sv/LC_MESSAGES/Zonemaster-Engine.mo
-${P5SITE}/auto/share/dist/Zonemaster-Engine/policy.json
+${P5SITE}/auto/share/dist/Zonemaster-Engine/modules.txt
+${P5SITE}/auto/share/dist/Zonemaster-Engine/profile.json
+${P5SITE}/auto/share/dist/Zonemaster-Engine/profile_example_logfilter.json
@man man/man3p/Zonemaster::Engine.3p
@man man/man3p/Zonemaster::Engine::ASNLookup.3p
-@man man/man3p/Zonemaster::Engine::Config.3p
@man man/man3p/Zonemaster::Engine::Constants.3p
@man man/man3p/Zonemaster::Engine::DNSName.3p
@man man/man3p/Zonemaster::Engine::Exception.3p
@@ -69,6 +67,7 @@ ${P5SITE}/auto/share/dist/Zonemaster-Eng
@man man/man3p/Zonemaster::Engine::Net::IP.3p
@man man/man3p/Zonemaster::Engine::Overview.3p
@man man/man3p/Zonemaster::Engine::Packet.3p
+@man man/man3p/Zonemaster::Engine::Profile.3p
@man man/man3p/Zonemaster::Engine::Recursor.3p
@man man/man3p/Zonemaster::Engine::Test.3p
@man man/man3p/Zonemaster::Engine::Test::Address.3p
@@ -77,7 +76,6 @@ ${P5SITE}/auto/share/dist/Zonemaster-Eng
@man man/man3p/Zonemaster::Engine::Test::Consistency.3p
@man man/man3p/Zonemaster::Engine::Test::DNSSEC.3p
@man man/man3p/Zonemaster::Engine::Test::Delegation.3p
-@man man/man3p/Zonemaster::Engine::Test::Example.3p
@man man/man3p/Zonemaster::Engine::Test::Nameserver.3p
@man man/man3p/Zonemaster::Engine::Test::Syntax.3p
@man man/man3p/Zonemaster::Engine::Test::Zone.3p
Index: ldns/Makefile
===================================================================
RCS file: /cvs/ports/net/p5-Zonemaster/ldns/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- ldns/Makefile 11 Jul 2020 22:54:38 -0000 1.8
+++ ldns/Makefile 26 Jul 2020 08:59:52 -0000
@@ -4,8 +4,7 @@ COMMENT = module to interface the DNS re
MODULES = cpan
CPAN_AUTHOR = ZNMSTR
-DISTNAME = Zonemaster-LDNS-2.0.1
-REVISION = 2
+DISTNAME = Zonemaster-LDNS-2.1.0
CATEGORIES = net
MAINTAINER = Stuart Henderson <[email protected]>
@@ -20,7 +19,7 @@ LIB_DEPENDS = devel/libidn \
net/ldns
TEST_DEPENDS = devel/p5-Test-Fatal
-CONFIGURE_ARGS = --no-internal-ldns
+CONFIGURE_ARGS = --no-internal-ldns --no-ed25519
# XXX something is wrong passing libs from makemaker to the generated
# Makefile, bodge it for now
Index: ldns/distinfo
===================================================================
RCS file: /cvs/ports/net/p5-Zonemaster/ldns/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- ldns/distinfo 28 May 2019 13:39:16 -0000 1.3
+++ ldns/distinfo 26 Jul 2020 08:59:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (Zonemaster-LDNS-2.0.1.tar.gz) =
DTt3lMbqEYtZ2OvVJFu8srXbcTcG5O2AxU3I/F/UPXs=
-SIZE (Zonemaster-LDNS-2.0.1.tar.gz) = 595251
+SHA256 (Zonemaster-LDNS-2.1.0.tar.gz) =
SrHsbLrV4rNKJfTp7AlGMd6eXOrvurtrZ94oD4qbps4=
+SIZE (Zonemaster-LDNS-2.1.0.tar.gz) = 605228
Index: ldns/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/p5-Zonemaster/ldns/pkg/PLIST,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST
--- ldns/pkg/PLIST 6 Feb 2018 21:55:39 -0000 1.1
+++ ldns/pkg/PLIST 26 Jul 2020 08:59:52 -0000
@@ -84,7 +84,7 @@ ${P5ARCH}/Zonemaster/LDNS/RRList.pm
${P5ARCH}/auto/
${P5ARCH}/auto/Zonemaster/
${P5ARCH}/auto/Zonemaster/LDNS/
-${P5ARCH}/auto/Zonemaster/LDNS/LDNS.so
+@so ${P5ARCH}/auto/Zonemaster/LDNS/LDNS.so
@man man/man3p/Zonemaster::LDNS.3p
@man man/man3p/Zonemaster::LDNS::Packet.3p
@man man/man3p/Zonemaster::LDNS::RR.3p
