diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2018-04-27 18:52:13 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2018-04-27 18:52:13 +0000 |
| commit | 6ca3e8a3cb94f196cd28f619f4daa8461f7f0b8d (patch) | |
| tree | ee86942de4ee71f35dd0998565bd9e48e1dff658 /dns/libpsl | |
| parent | 010f5b54e7f170a1aaccf96051e0fc1ce00e6e5e (diff) | |
| download | ports-6ca3e8a3cb94f196cd28f619f4daa8461f7f0b8d.tar.gz ports-6ca3e8a3cb94f196cd28f619f4daa8461f7f0b8d.zip | |
Update to 0.20.2
- Change default IDNA library from libicu to libidn2: upstream changed it since 0.18.0
Changes: https://github.com/rockdaboot/libpsl/blob/master/NEWS
Notes
Notes:
svn path=/head/; revision=468480
Diffstat (limited to 'dns/libpsl')
| -rw-r--r-- | dns/libpsl/Makefile | 8 | ||||
| -rw-r--r-- | dns/libpsl/distinfo | 6 | ||||
| -rw-r--r-- | dns/libpsl/files/patch-Makefile.am | 16 | ||||
| -rw-r--r-- | dns/libpsl/files/patch-configure.ac | 15 | ||||
| -rw-r--r-- | dns/libpsl/files/patch-src-psl.c | 11 | ||||
| -rw-r--r-- | dns/libpsl/pkg-plist | 2 |
6 files changed, 35 insertions, 23 deletions
diff --git a/dns/libpsl/Makefile b/dns/libpsl/Makefile index 372b74171217..85ed754d9099 100644 --- a/dns/libpsl/Makefile +++ b/dns/libpsl/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= libpsl -PORTVERSION= 0.20.1 +PORTVERSION= 0.20.2 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 1 CATEGORIES= dns MAINTAINER= sunpoet@FreeBSD.org @@ -19,12 +18,13 @@ BUILD_DEPENDS= public_suffix_list>=0:dns/public_suffix_list \ OPTIONS_DEFINE= NLS OPTIONS_SINGLE= IDNA OPTIONS_SINGLE_IDNA= ICU IDN IDN2 -OPTIONS_DEFAULT=ICU +OPTIONS_DEFAULT=IDN2 ICU_DESC= Use devel/icu (IDNA2008 UTS\#46 library) IDN_DESC= Use dns/libidn (IDNA2003 library) IDN2_DESC= Use dns/libidn2 (IDNA2008 library) -CONFIGURE_ARGS= --enable-man \ +CONFIGURE_ARGS= --disable-gtk-doc \ + --enable-man \ --with-psl-file=${LOCALBASE}/share/public_suffix_list/public_suffix_list.dat \ --with-psl-testfile=${LOCALBASE}/share/public_suffix_list/test_psl.txt GNU_CONFIGURE= yes diff --git a/dns/libpsl/distinfo b/dns/libpsl/distinfo index f18825c624ee..41d2a0867699 100644 --- a/dns/libpsl/distinfo +++ b/dns/libpsl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519732214 -SHA256 (rockdaboot-libpsl-libpsl-0.20.1_GH0.tar.gz) = 6ce1e8550587a5ff61e8172d859942e01f35022ec6634c58b02b8a3b47f042ee -SIZE (rockdaboot-libpsl-libpsl-0.20.1_GH0.tar.gz) = 8578922 +TIMESTAMP = 1524845247 +SHA256 (rockdaboot-libpsl-libpsl-0.20.2_GH0.tar.gz) = 7aa949fd3fdba61b0dc7b3f4c2520263b942c189746e157f48436386eca3398e +SIZE (rockdaboot-libpsl-libpsl-0.20.2_GH0.tar.gz) = 8589843 diff --git a/dns/libpsl/files/patch-Makefile.am b/dns/libpsl/files/patch-Makefile.am new file mode 100644 index 000000000000..19932ed8ab30 --- /dev/null +++ b/dns/libpsl/files/patch-Makefile.am @@ -0,0 +1,16 @@ +--- Makefile.am.orig 2018-04-26 18:18:39 UTC ++++ Makefile.am +@@ -1,13 +1,6 @@ + # got some hints from https://gitorious.org/openismus-playground/examplelib/source + + SUBDIRS = po include src tools +-if ENABLE_GTK_DOC +- SUBDIRS += docs/libpsl +-else +-if ENABLE_MAN +- SUBDIRS += docs/libpsl +-endif +-endif + SUBDIRS += fuzz tests msvc + + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} diff --git a/dns/libpsl/files/patch-configure.ac b/dns/libpsl/files/patch-configure.ac index 9ac60c7fa5de..e24c8a1f3449 100644 --- a/dns/libpsl/files/patch-configure.ac +++ b/dns/libpsl/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2015-09-23 12:52:04 UTC +--- configure.ac.orig 2018-04-26 18:18:39 UTC +++ configure.ac -@@ -33,24 +33,6 @@ AM_GNU_GETTEXT([external],[need-ngettext +@@ -37,23 +37,6 @@ AM_GNU_GETTEXT([external],[need-ngettext AM_GNU_GETTEXT_VERSION([0.18.1]) # @@ -17,11 +17,18 @@ -]) - -if test x"$have_gtk_doc" = xyes -a x"$enable_gtk_doc" = xyes; then -- AC_CONFIG_FILES([docs/libpsl/Makefile docs/libpsl/version.xml]) - AC_SUBST([LIBPSL_DOCS], [docs/libpsl]) -fi - -# # enable creation of man pages # - AC_ARG_ENABLE(man,[AC_HELP_STRING([--enable-man], + AC_ARG_ENABLE([man], +@@ -372,7 +355,6 @@ AC_CONFIG_FILES([Makefile + po/Makefile.in + fuzz/Makefile + tests/Makefile +- docs/libpsl/Makefile docs/libpsl/version.xml + libpsl.pc:libpsl.pc.in + msvc/Makefile + msvc/config.h.win32 diff --git a/dns/libpsl/files/patch-src-psl.c b/dns/libpsl/files/patch-src-psl.c deleted file mode 100644 index 83d91b3898f6..000000000000 --- a/dns/libpsl/files/patch-src-psl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/psl.c.orig 2016-01-02 13:38:37 UTC -+++ src/psl.c -@@ -67,6 +67,8 @@ - #endif - - #include <sys/types.h> -+#include <netinet/in.h> -+#include <sys/socket.h> - #include <sys/stat.h> - #include <unistd.h> - #include <stdio.h> diff --git a/dns/libpsl/pkg-plist b/dns/libpsl/pkg-plist index 42c1ff894600..0a32c5f42eed 100644 --- a/dns/libpsl/pkg-plist +++ b/dns/libpsl/pkg-plist @@ -3,7 +3,7 @@ include/libpsl.h lib/libpsl.a lib/libpsl.so lib/libpsl.so.5 -lib/libpsl.so.5.3.0 +lib/libpsl.so.5.3.1 libdata/pkgconfig/libpsl.pc man/man1/psl-make-dafsa.1.gz man/man1/psl.1.gz |