Hi,
When libkiwix-14.0.0 came out I was overeager and committed it
without adequately checking all dependent ports, breaking kiwix-tools
in the process. Although kiwix-tools has been fixed upstream and has
seen no commits for four months, upstream has been resistant to rolling
a new release. To provide a working kiwix-tools for 7.7, we can either
revert libkiwix, or package up kiwix-tools's current git master. Since
this is a very small and simple port, I would rather do the latter.
For the version number, I arbitrarily chose 3.8.0pre20250402
Once 3.8.0 comes out, deleting the new middle hunk will be all that's
necessary to update the port to the real thing. (Probably.)
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/kiwix/kiwix-tools/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 8 Nov 2024 14:58:42 -0000 1.4
+++ Makefile 2 Apr 2025 09:04:53 -0000
@@ -1,18 +1,27 @@
COMMENT = command-line Kiwix tools
-BROKEN = kiwix-tools-3.7.0 is incompatible with libkiwix-14.0.0
-
KIWIX_PROJECT = kiwix-tools
-V = 3.7.0
+V = 3.8.0
+
+# Until 3.8.0 is released, use a commit that's compatible with libkiwix in
ports
+DISTNAME = kiwix-tools-${V}pre20241221
+GH_ACCOUNT = kiwix
+GH_PROJECT = kiwix-tools
+GH_COMMIT = 43b00419dd3f33eb644e1d83c2e802fc200b2de7
+SITES = https://github.com/kiwix/kiwix-tools/archive/
+EXTRACT_SUFX = .tar.gz
+
+MAINTAINER = Anthony J. Bentley <anth...@anjbe.name>
# GPLv3+
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} c kiwix zim
+WANTLIB += ${COMPILER_LIBCXX} c docopt kiwix zim
# C++11
COMPILER = base-clang ports-gcc
-LIB_DEPENDS = www/kiwix/libkiwix
+LIB_DEPENDS = devel/docopt.cpp \
+ www/kiwix/libkiwix
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/kiwix/kiwix-tools/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 15 Apr 2024 11:07:05 -0000 1.3
+++ distinfo 2 Apr 2025 09:04:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (kiwix-tools-3.7.0.tar.xz) =
enZObLj5sfdekqnA0JPQLIwDjWYBnE5JVCzCYd//VAw=
-SIZE (kiwix-tools-3.7.0.tar.xz) = 529908
+SHA256 (kiwix-tools-3.8.0pre20241221-43b00419.tar.gz) =
iZYw8HJ2JDvpvWupjVk90vSFNKWRyAOadh+b8HKXdtQ=
+SIZE (kiwix-tools-3.8.0pre20241221-43b00419.tar.gz) = 540994
