svn commit: r468480 - in head/dns/libpsl: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Fri Apr 27 18:52:13 2018
New Revision: 468480
URL: https://svnweb.freebsd.org/changeset/ports/468480

Log:
  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

Added:
  head/dns/libpsl/files/patch-Makefile.am   (contents, props changed)
Deleted:
  head/dns/libpsl/files/patch-src-psl.c
Modified:
  head/dns/libpsl/Makefile
  head/dns/libpsl/distinfo
  head/dns/libpsl/files/patch-configure.ac
  head/dns/libpsl/pkg-plist

Modified: head/dns/libpsl/Makefile
==============================================================================
--- head/dns/libpsl/Makefile	Fri Apr 27 18:01:28 2018	(r468479)
+++ head/dns/libpsl/Makefile	Fri Apr 27 18:52:13 2018	(r468480)
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	libpsl
-PORTVERSION=	0.20.1
+PORTVERSION=	0.20.2
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	1
 CATEGORIES=	dns
 
 MAINTAINER=	sunpoet at FreeBSD.org
@@ -19,12 +18,13 @@ BUILD_DEPENDS=	public_suffix_list>=0:dns/public_suffix
 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

Modified: head/dns/libpsl/distinfo
==============================================================================
--- head/dns/libpsl/distinfo	Fri Apr 27 18:01:28 2018	(r468479)
+++ head/dns/libpsl/distinfo	Fri Apr 27 18:52:13 2018	(r468480)
@@ -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

Added: head/dns/libpsl/files/patch-Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/dns/libpsl/files/patch-Makefile.am	Fri Apr 27 18:52:13 2018	(r468480)
@@ -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}

Modified: head/dns/libpsl/files/patch-configure.ac
==============================================================================
--- head/dns/libpsl/files/patch-configure.ac	Fri Apr 27 18:01:28 2018	(r468479)
+++ head/dns/libpsl/files/patch-configure.ac	Fri Apr 27 18:52:13 2018	(r468480)
@@ -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

Modified: head/dns/libpsl/pkg-plist
==============================================================================
--- head/dns/libpsl/pkg-plist	Fri Apr 27 18:01:28 2018	(r468479)
+++ head/dns/libpsl/pkg-plist	Fri Apr 27 18:52:13 2018	(r468480)
@@ -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