Hello ports@, Here is patch to update net/libpsl to 0.13.0
Switched distfile fetching method from GitHub tags to using tarball releases, which allows to drop autoconf / automake and related patches and tweaks. Python is now required as a build dependency, so added that and removed devel/gettext from MODULES. Bumping major as 'psl_builtin_compile_time' function has been removed. Index: Makefile =================================================================== RCS file: /cvs/ports/net/libpsl/Makefile,v retrieving revision 1.6 diff -u -p -u -p -r1.6 Makefile --- Makefile 11 Mar 2016 20:28:29 -0000 1.6 +++ Makefile 10 May 2016 10:02:15 -0000 @@ -2,11 +2,9 @@ COMMENT = public suffix list library -V = 0.7.1 -REVISION = 1 -DISTNAME = libpsl-$V +DISTNAME = libpsl-0.13.0 -SHARED_LIBS += psl 0.0 # 2.4 +SHARED_LIBS += psl 1.0 # 5.0 CATEGORIES = net www @@ -15,31 +13,27 @@ HOMEPAGE = https://github.com/rockdaboo # MIT PERMIT_PACKAGE_CDROM = Yes -WANTLIB += c idn unistring +WANTLIB += c iconv idn intl unistring -GH_ACCOUNT = rockdaboot -GH_PROJECT = libpsl -GH_TAGNAME = libpsl-$V +MASTER_SITES = ${HOMEPAGE}/releases/download/${DISTNAME}/ + +MODULES = lang/python + +MODPY_RUNDEP = No -MODULES = devel/gettext LIB_DEPENDS = converters/libunistring \ devel/libidn -BUILD_DEPENDS = devel/libtool \ - sysutils/coreutils -CONFIGURE_STYLE = autoconf automake +BUILD_DEPENDS = sysutils/coreutils + +CONFIGURE_STYLE = gnu + CONFIGURE_ARGS += --enable-builtin=libidn \ --enable-runtime=libidn CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -AUTOCONF_VERSION = 2.69 -AUTOMAKE_VERSION = 1.11 - -post-patch: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - AUTOCONF_VERSION=${AUTOCONF_VERSION} \ - AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ - sh ./autogen.sh +pre-configure: + @ln -s ${MODPY_BIN} ${WRKDIR}/bin/python .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/libpsl/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 distinfo --- distinfo 9 Apr 2015 11:28:24 -0000 1.1.1.1 +++ distinfo 10 May 2016 10:02:15 -0000 @@ -1,2 +1,2 @@ -SHA256 (libpsl-0.7.1.tar.gz) = I+rgLGeyhm04flHvYH77dZyD59Buj5RIBjsxZIykE8w= -SIZE (libpsl-0.7.1.tar.gz) = 91741 +SHA256 (libpsl-0.13.0.tar.gz) = /cQRBTMr9KotwTbNhAVc2D+hAaXN6aJc7MVUoQkT1ik= +SIZE (libpsl-0.13.0.tar.gz) = 556735 Index: patches/patch-autogen_sh =================================================================== RCS file: patches/patch-autogen_sh diff -N patches/patch-autogen_sh --- patches/patch-autogen_sh 9 Apr 2015 11:28:24 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-autogen_sh,v 1.1.1.1 2015/04/09 11:28:24 jca Exp $ - -Don't pick up gtk-doc - ---- autogen.sh.orig Sat Feb 21 18:30:52 2015 -+++ autogen.sh Mon Apr 6 10:37:21 2015 -@@ -9,7 +9,7 @@ fi - # create m4 before gtkdocize - mkdir m4 2>/dev/null - --GTKDOCIZE=`which gtkdocize 2>/dev/null` -+GTKDOCIZE=`false` - if test $? -ne 0; then - echo "No gtk-doc support found. You can't build the docs." - # rm because gtk-doc.make might be a link to a protected file Index: patches/patch-src_psl2c_c =================================================================== RCS file: /cvs/ports/net/libpsl/patches/patch-src_psl2c_c,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-src_psl2c_c --- patches/patch-src_psl2c_c 9 Apr 2015 20:04:23 -0000 1.2 +++ patches/patch-src_psl2c_c 10 May 2016 10:02:15 -0000 @@ -1,15 +1,15 @@ -$OpenBSD: patch-src_psl2c_c,v 1.2 2015/04/09 20:04:23 jca Exp $ +$OpenBSD$ Correct the name of the sha1sum command. ---- src/psl2c.c.orig Sat Feb 21 19:30:52 2015 -+++ src/psl2c.c Thu Apr 9 21:59:06 2015 -@@ -167,7 +167,7 @@ int main(int argc, const char **argv) - _print_psl_entries(fpout, psl->suffixes, "suffixes"); - _print_psl_entries(fpout, psl->suffix_exceptions, "suffix_exceptions"); +--- src/psl2c.c.orig Mon May 9 17:26:56 2016 ++++ src/psl2c.c Mon May 9 17:27:08 2016 +@@ -276,7 +276,7 @@ int main(int argc, const char **argv) -- snprintf(cmd, cmdsize, "sha1sum %s", argv[1]); -+ snprintf(cmd, cmdsize, "gsha1sum %s", argv[1]); + _print_psl_entries_dafsa(fpout, psl->suffixes); + +- snprintf(cmd, cmdsize, "sha1sum %s", argv[argpos]); ++ snprintf(cmd, cmdsize, "gsha1sum %s", argv[argpos]); if ((pp = popen(cmd, "r"))) { if (fscanf(pp, "%63[0-9a-zA-Z]", checksum) < 1) *checksum = 0; Index: patches/patch-src_psl_c =================================================================== RCS file: /cvs/ports/net/libpsl/patches/patch-src_psl_c,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-src_psl_c --- patches/patch-src_psl_c 9 Apr 2015 11:28:24 -0000 1.1.1.1 +++ patches/patch-src_psl_c 10 May 2016 10:02:15 -0000 @@ -1,17 +1,15 @@ -$OpenBSD: patch-src_psl_c,v 1.1.1.1 2015/04/09 11:28:24 jca Exp $ +$OpenBSD$ Missing includes for in6_addr / AF_INET*. ---- src/psl.c.orig Mon Jan 5 01:08:54 2015 -+++ src/psl.c Mon Jan 5 01:10:16 2015 -@@ -59,6 +59,10 @@ - # define ngettext(STRING1,STRING2,N) STRING2 - #endif +--- src/psl.c.orig Fri Feb 12 12:22:39 2016 ++++ src/psl.c Mon May 9 16:25:20 2016 +@@ -68,6 +68,8 @@ -+#include <sys/types.h> + #include <sys/types.h> + #include <sys/stat.h> +#include <sys/socket.h> +#include <netinet/in.h> -+ + #include <unistd.h> #include <stdio.h> #include <stdlib.h> - #include <string.h> Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/libpsl/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST --- pkg/PLIST 28 May 2015 06:59:14 -0000 1.2 +++ pkg/PLIST 10 May 2016 10:02:15 -0000 @@ -6,6 +6,3 @@ lib/libpsl.a lib/libpsl.la @lib lib/libpsl.so.${LIBpsl_VERSION} lib/pkgconfig/libpsl.pc -share/libpsl/ -share/libpsl/effective_tld_names.dat -share/libpsl/test_psl.txt
