Hi,
Here is a patch for net/libpsl :
i) Update to 0.21.1
ii) Switch build with python3
iii) Regenerator the patch
It build well and pass all tests on amd64-current system.
3 ports depends on libpsl:
net/wget
net/lua-psl
devel/libsoup
all build well with this patch, wget run well too.
Cheers !
wen
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/libpsl/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 27 Dec 2019 22:35:42 -0000 1.16
+++ Makefile 15 Jan 2021 07:57:59 -0000
@@ -2,10 +2,9 @@
COMMENT = public suffix list library
-DISTNAME = libpsl-0.20.2
-REVISION = 1
+DISTNAME = libpsl-0.21.1
-SHARED_LIBS += psl 1.2 # 8.1
+SHARED_LIBS += psl 1.2 # 8.3
CATEGORIES = net www
@@ -18,13 +17,14 @@ PERMIT_PACKAGE = Yes
WANTLIB += c iconv idn2 intl unistring
-MASTER_SITES = ${HOMEPAGE}/releases/download/${DISTNAME}/
+MASTER_SITES = ${HOMEPAGE}/releases/download/0.21.1/
DEBUG_PACKAGES = ${BUILD_PACKAGES}
MODULES = lang/python
MODPY_RUNDEP = No
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
BUILD_DEPENDS = devel/gettext,-tools \
sysutils/coreutils
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/libpsl/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 28 Nov 2018 13:45:43 -0000 1.5
+++ distinfo 15 Jan 2021 07:57:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (libpsl-0.20.2.tar.gz) = +P0K62YlLfzGOPFNm+HiNi/a8sqGveBET/TVzJYbVg8=
-SIZE (libpsl-0.20.2.tar.gz) = 9228099
+SHA256 (libpsl-0.21.1.tar.gz) = rGzh4fvU0CVMTdudN/H6md7INhnBJTMoFVIGuJYhDUw=
+SIZE (libpsl-0.21.1.tar.gz) = 9199351
Index: patches/patch-tests_test-is-public-builtin_c
===================================================================
RCS file: /cvs/ports/net/libpsl/patches/patch-tests_test-is-public-builtin_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-tests_test-is-public-builtin_c
--- patches/patch-tests_test-is-public-builtin_c 28 Nov 2018 13:45:43
-0000 1.1
+++ patches/patch-tests_test-is-public-builtin_c 15 Jan 2021 07:57:59
-0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-tests_test-is-public-builtin_c,v 1.1 2018/11/28 13:45:43 jca
Exp $
+$OpenBSD$
Print time_t in a portable way.
@@ -9,7 +9,7 @@ Index: tests/test-is-public-builtin.c
}
}
-- printf("psl_builtin_file_time()=%ld\n", psl_builtin_file_time());
+- printf("psl_builtin_file_time()=%ld\n", (long) psl_builtin_file_time());
+ printf("psl_builtin_file_time()=%lld\n", (long
long)psl_builtin_file_time());
psl_builtin_file_time() == 0 ? failed++ : ok++;
Index: patches/patch-tools_psl_c
===================================================================
RCS file: /cvs/ports/net/libpsl/patches/patch-tools_psl_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-tools_psl_c
--- patches/patch-tools_psl_c 28 Nov 2018 13:45:43 -0000 1.1
+++ patches/patch-tools_psl_c 15 Jan 2021 07:57:59 -0000
@@ -1,15 +1,15 @@
-$OpenBSD: patch-tools_psl_c,v 1.1 2018/11/28 13:45:43 jca Exp $
+$OpenBSD$
Print time_t in a portable way.
Index: tools/psl.c
--- tools/psl.c.orig
+++ tools/psl.c
-@@ -257,7 +257,7 @@ int main(int argc, const char *const *argv)
+@@ -290,7 +290,7 @@ int main(int argc, const char *const *argv)
printf("builtin exceptions: %d\n",
psl_suffix_exception_count(psl));
printf("builtin wildcards: %d\n",
psl_suffix_wildcard_count(psl));
printf("builtin filename: %s\n",
psl_builtin_filename());
-- printf("builtin file time: %ld (%s)\n",
psl_builtin_file_time(), time2str(psl_builtin_file_time()));
+- printf("builtin file time: %ld (%s)\n", (long)
psl_builtin_file_time(), time2str(psl_builtin_file_time()));
+ printf("builtin file time: %lld (%s)\n", (long
long)psl_builtin_file_time(), time2str(psl_builtin_file_time()));
printf("builtin SHA1 file hash: %s\n",
psl_builtin_sha1sum());
printf("builtin outdated: %d\n",
psl_builtin_outdated());
