Index: head/dns/libpsl/Makefile =================================================================== --- head/dns/libpsl/Makefile (revision 468479) +++ head/dns/libpsl/Makefile (revision 468480) @@ -1,55 +1,55 @@ # Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ PORTNAME= libpsl -PORTVERSION= 0.20.1 +PORTVERSION= 0.20.2 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 1 CATEGORIES= dns MAINTAINER= sunpoet@FreeBSD.org COMMENT= C library to handle the Public Suffix List LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= public_suffix_list>=0:dns/public_suffix_list \ xsltproc:textproc/libxslt 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 INSTALL_TARGET= install-strip USE_LDCONFIG= yes USE_LOCALE= en_US.UTF-8 USES= autoreconf libtool localbase:ldflags pathfix pkgconfig python:build shebangfix GH_ACCOUNT= rockdaboot USE_GITHUB= yes SHEBANG_FILES= src/psl-make-dafsa ICU_CONFIGURE_ON= --enable-builtin=libicu --enable-runtime=libicu ICU_LIB_DEPENDS= libicuuc.so:devel/icu IDN_CONFIGURE_ON= --enable-builtin=libidn --enable-runtime=libidn IDN_LIB_DEPENDS= libidn.so:dns/libidn \ libunistring.so:devel/libunistring IDN_USES= iconv IDN2_CONFIGURE_ON= --enable-builtin=libidn2 --enable-runtime=libidn2 IDN2_LIB_DEPENDS= libidn2.so:dns/libidn2 \ libunistring.so:devel/libunistring IDN2_USES= iconv NLS_CPPFLAGS= -DENABLE_NLS=1 NLS_USES= gettext NLS_USES_OFF= gettext-tools .include Index: head/dns/libpsl/distinfo =================================================================== --- head/dns/libpsl/distinfo (revision 468479) +++ head/dns/libpsl/distinfo (revision 468480) @@ -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 Index: head/dns/libpsl/files/patch-src-psl.c =================================================================== --- head/dns/libpsl/files/patch-src-psl.c (revision 468479) +++ head/dns/libpsl/files/patch-src-psl.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/psl.c.orig 2016-01-02 13:38:37 UTC -+++ src/psl.c -@@ -67,6 +67,8 @@ - #endif - - #include -+#include -+#include - #include - #include - #include Property changes on: head/dns/libpsl/files/patch-src-psl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/dns/libpsl/files/patch-Makefile.am =================================================================== --- head/dns/libpsl/files/patch-Makefile.am (nonexistent) +++ head/dns/libpsl/files/patch-Makefile.am (revision 468480) @@ -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} Property changes on: head/dns/libpsl/files/patch-Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/dns/libpsl/files/patch-configure.ac =================================================================== --- head/dns/libpsl/files/patch-configure.ac (revision 468479) +++ head/dns/libpsl/files/patch-configure.ac (revision 468480) @@ -1,27 +1,34 @@ ---- 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]) # -# check for gtk-doc -# -m4_ifdef([GTK_DOC_CHECK], [ -GTK_DOC_CHECK([1.15],[--flavour no-tmpl]) -],[ -AM_CONDITIONAL([ENABLE_GTK_DOC], false) -]) -# needed for some older versions of gtk-doc -m4_ifdef([GTK_DOC_USE_LIBTOOL], [], [ -AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], false) -]) - -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 Index: head/dns/libpsl/pkg-plist =================================================================== --- head/dns/libpsl/pkg-plist (revision 468479) +++ head/dns/libpsl/pkg-plist (revision 468480) @@ -1,9 +1,9 @@ bin/psl 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