Use upstream release tarball

6 files changed, 618 insertions, 57 deletions

diff --git a/dns/libpsl/Makefile b/dns/libpsl/Makefile
index f4653353fe1c..50caa0e50819 100644
--- a/dns/libpsl/Makefile
+++ b/dns/libpsl/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	libpsl
 PORTVERSION=	0.21.1
 CATEGORIES=	dns
+MASTER_SITES=	https://github.com/rockdaboot/libpsl/releases/download/${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	C library to handle the Public Suffix List
@@ -14,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	public_suffix_list>=0:dns/public_suffix_list \
 		xsltproc:textproc/libxslt
 
-USES=		autoreconf libtool localbase:ldflags pathfix pkgconfig python:build shebangfix
+USES=		libtool localbase:ldflags pathfix pkgconfig python:build shebangfix tar:lz
 
 CONFIGURE_ARGS=	--enable-man \
 		--with-psl-file=${LOCALBASE}/share/public_suffix_list/public_suffix_list.dat \
@@ -24,9 +25,6 @@ INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 USE_LOCALE=	en_US.UTF-8
 
-GH_ACCOUNT=	rockdaboot
-USE_GITHUB=	yes
-
 SHEBANG_FILES=	src/psl-make-dafsa
 
 OPTIONS_DEFINE=	NLS
diff --git a/dns/libpsl/distinfo b/dns/libpsl/distinfo
index cd31fb99bf52..a3c665328c72 100644
--- a/dns/libpsl/distinfo
+++ b/dns/libpsl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595416523
-SHA256 (rockdaboot-libpsl-0.21.1_GH0.tar.gz) = fa4339f0c832041443b1795b7ffbaf3f9b61d082ead928c514945b125fbab08d
-SIZE (rockdaboot-libpsl-0.21.1_GH0.tar.gz) = 8602264
+TIMESTAMP = 1598622955
+SHA256 (libpsl-0.21.1.tar.lz) = 644375d557bb3b84c485df2dae98ee388fe1e11fb75230004e4b8623b3b833a9
+SIZE (libpsl-0.21.1.tar.lz) = 2003340
diff --git a/dns/libpsl/files/patch-Makefile.am b/dns/libpsl/files/patch-Makefile.am
deleted file mode 100644
index 19932ed8ab30..000000000000
--- a/dns/libpsl/files/patch-Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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-Makefile.in b/dns/libpsl/files/patch-Makefile.in
new file mode 100644
index 000000000000..b4c1ee861c07
--- /dev/null
+++ b/dns/libpsl/files/patch-Makefile.in
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	2020-07-18 11:10:31 UTC
++++ Makefile.in
+@@ -90,8 +90,6 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-@ENABLE_GTK_DOC_TRUE@am__append_1 = docs/libpsl
+-@ENABLE_GTK_DOC_FALSE@@ENABLE_MAN_TRUE@am__append_2 = docs/libpsl
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
+@@ -199,7 +197,7 @@ am__define_uniq_tagged_files = \
+ ETAGS = etags
+ CTAGS = ctags
+ CSCOPE = cscope
+-DIST_SUBDIRS = po include src tools docs/libpsl fuzz tests msvc
++DIST_SUBDIRS = po include src tools fuzz tests msvc
+ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ 	$(srcdir)/libpsl.pc.in $(srcdir)/meson.build.in \
+ 	$(top_srcdir)/build-aux/ar-lib $(top_srcdir)/build-aux/compile \
diff --git a/dns/libpsl/files/patch-configure b/dns/libpsl/files/patch-configure
new file mode 100644
index 000000000000..1e37f14c049c
--- /dev/null
+++ b/dns/libpsl/files/patch-configure
@@ -0,0 +1,593 @@
+--- configure.orig	2020-07-18 11:10:31 UTC
++++ configure
+@@ -677,18 +677,6 @@ ENABLE_MAN_FALSE
+ ENABLE_MAN_TRUE
+ XSLTPROC
+ LIBPSL_DOCS
+-GTK_DOC_USE_REBASE_FALSE
+-GTK_DOC_USE_REBASE_TRUE
+-GTK_DOC_USE_LIBTOOL_FALSE
+-GTK_DOC_USE_LIBTOOL_TRUE
+-GTK_DOC_BUILD_PDF_FALSE
+-GTK_DOC_BUILD_PDF_TRUE
+-GTK_DOC_BUILD_HTML_FALSE
+-GTK_DOC_BUILD_HTML_TRUE
+-ENABLE_GTK_DOC_FALSE
+-ENABLE_GTK_DOC_TRUE
+-HAVE_GTK_DOC_FALSE
+-HAVE_GTK_DOC_TRUE
+ GTKDOC_DEPS_LIBS
+ GTKDOC_DEPS_CFLAGS
+ HTML_DIR
+@@ -14865,518 +14853,6 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+ 
+ 
+ #
+-# check for gtk-doc
+-#
+-
+-
+-
+-
+-
+-
+-
+-
+-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+-	if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $PKG_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_path_PKG_CONFIG"; then
+-  ac_pt_PKG_CONFIG=$PKG_CONFIG
+-  # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $ac_pt_PKG_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+-if test -n "$ac_pt_PKG_CONFIG"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-  if test "x$ac_pt_PKG_CONFIG" = x; then
+-    PKG_CONFIG=""
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    PKG_CONFIG=$ac_pt_PKG_CONFIG
+-  fi
+-else
+-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+-fi
+-
+-fi
+-if test -n "$PKG_CONFIG"; then
+-	_pkg_min_version=0.9.0
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	else
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-		PKG_CONFIG=""
+-	fi
+-fi
+-
+-
+-
+-  gtk_doc_requires="gtk-doc >= 1.15"
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5
+-$as_echo_n "checking for gtk-doc... " >&6; }
+-  if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  have_gtk_doc=yes
+-else
+-  have_gtk_doc=no
+-fi
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5
+-$as_echo "$have_gtk_doc" >&6; }
+-
+-  if test "$have_gtk_doc" = "no"; then
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+-  You will not be able to create source packages with 'make dist'
+-  because $gtk_doc_requires is not found." >&5
+-$as_echo "$as_me: WARNING:
+-  You will not be able to create source packages with 'make dist'
+-  because $gtk_doc_requires is not found." >&2;}
+-  fi
+-
+-            # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+-set dummy gtkdoc-check; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_GTKDOC_CHECK+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$GTKDOC_CHECK"; then
+-  ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK
+-if test -n "$GTKDOC_CHECK"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
+-$as_echo "$GTKDOC_CHECK" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-  # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+-set dummy gtkdoc-check; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $GTKDOC_CHECK_PATH in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH
+-if test -n "$GTKDOC_CHECK_PATH"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5
+-$as_echo "$GTKDOC_CHECK_PATH" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-  for ac_prog in gtkdoc-rebase
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GTKDOC_REBASE+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $GTKDOC_REBASE in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
+-if test -n "$GTKDOC_REBASE"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
+-$as_echo "$GTKDOC_REBASE" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-  test -n "$GTKDOC_REBASE" && break
+-done
+-test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true"
+-
+-  # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
+-set dummy gtkdoc-mkpdf; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GTKDOC_MKPDF+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $GTKDOC_MKPDF in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
+-if test -n "$GTKDOC_MKPDF"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
+-$as_echo "$GTKDOC_MKPDF" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-
+-
+-# Check whether --with-html-dir was given.
+-if test "${with_html_dir+set}" = set; then :
+-  withval=$with_html_dir;
+-else
+-  with_html_dir='${datadir}/gtk-doc/html'
+-fi
+-
+-  HTML_DIR="$with_html_dir"
+-
+-
+-    # Check whether --enable-gtk-doc was given.
+-if test "${enable_gtk_doc+set}" = set; then :
+-  enableval=$enable_gtk_doc;
+-else
+-  enable_gtk_doc=no
+-fi
+-
+-
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
+-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
+-$as_echo "$enable_gtk_doc" >&6; }
+-
+-  if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
+-    as_fn_error $? "
+-  You must have $gtk_doc_requires installed to build documentation for
+-  $PACKAGE_NAME. Please install gtk-doc or disable building the
+-  documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5
+-  fi
+-
+-    if test "x$PACKAGE_NAME" != "xglib"; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" >&5
+-$as_echo_n "checking for glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0... " >&6; }
+-
+-if test -n "$GTKDOC_DEPS_CFLAGS"; then
+-    pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$GTKDOC_DEPS_LIBS"; then
+-    pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>&1`
+-        else
+-	        GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$GTKDOC_DEPS_PKG_ERRORS" >&5
+-
+-	:
+-elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	:
+-else
+-	GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS
+-	GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-fi
+-  fi
+-
+-    # Check whether --enable-gtk-doc-html was given.
+-if test "${enable_gtk_doc_html+set}" = set; then :
+-  enableval=$enable_gtk_doc_html;
+-else
+-  enable_gtk_doc_html=yes
+-fi
+-
+-    # Check whether --enable-gtk-doc-pdf was given.
+-if test "${enable_gtk_doc_pdf+set}" = set; then :
+-  enableval=$enable_gtk_doc_pdf;
+-else
+-  enable_gtk_doc_pdf=no
+-fi
+-
+-
+-  if test -z "$GTKDOC_MKPDF"; then
+-    enable_gtk_doc_pdf=no
+-  fi
+-
+-  if test -z "$AM_DEFAULT_VERBOSITY"; then
+-    AM_DEFAULT_VERBOSITY=1
+-  fi
+-
+-
+-   if test x$have_gtk_doc = xyes; then
+-  HAVE_GTK_DOC_TRUE=
+-  HAVE_GTK_DOC_FALSE='#'
+-else
+-  HAVE_GTK_DOC_TRUE='#'
+-  HAVE_GTK_DOC_FALSE=
+-fi
+-
+-   if test x$enable_gtk_doc = xyes; then
+-  ENABLE_GTK_DOC_TRUE=
+-  ENABLE_GTK_DOC_FALSE='#'
+-else
+-  ENABLE_GTK_DOC_TRUE='#'
+-  ENABLE_GTK_DOC_FALSE=
+-fi
+-
+-   if test x$enable_gtk_doc_html = xyes; then
+-  GTK_DOC_BUILD_HTML_TRUE=
+-  GTK_DOC_BUILD_HTML_FALSE='#'
+-else
+-  GTK_DOC_BUILD_HTML_TRUE='#'
+-  GTK_DOC_BUILD_HTML_FALSE=
+-fi
+-
+-   if test x$enable_gtk_doc_pdf = xyes; then
+-  GTK_DOC_BUILD_PDF_TRUE=
+-  GTK_DOC_BUILD_PDF_FALSE='#'
+-else
+-  GTK_DOC_BUILD_PDF_TRUE='#'
+-  GTK_DOC_BUILD_PDF_FALSE=
+-fi
+-
+-   if test -n "$LIBTOOL"; then
+-  GTK_DOC_USE_LIBTOOL_TRUE=
+-  GTK_DOC_USE_LIBTOOL_FALSE='#'
+-else
+-  GTK_DOC_USE_LIBTOOL_TRUE='#'
+-  GTK_DOC_USE_LIBTOOL_FALSE=
+-fi
+-
+-   if test -n "$GTKDOC_REBASE"; then
+-  GTK_DOC_USE_REBASE_TRUE=
+-  GTK_DOC_USE_REBASE_FALSE='#'
+-else
+-  GTK_DOC_USE_REBASE_TRUE='#'
+-  GTK_DOC_USE_REBASE_FALSE=
+-fi
+-
+-
+-
+-# needed for some older versions of gtk-doc
+-
+- if false; then
+-  GTK_DOC_USE_LIBTOOL_TRUE=
+-  GTK_DOC_USE_LIBTOOL_FALSE='#'
+-else
+-  GTK_DOC_USE_LIBTOOL_TRUE='#'
+-  GTK_DOC_USE_LIBTOOL_FALSE=
+-fi
+-
+-
+-
+-if test x"$have_gtk_doc" = xyes -a x"$enable_gtk_doc" = xyes; then
+-  LIBPSL_DOCS=docs/libpsl
+-
+-fi
+-
+-#
+ # enable creation of man pages
+ #
+ # Check whether --enable-man was given.
+@@ -17646,7 +17122,7 @@ done
+ 
+ # Override the template file name of the generated .pc file, so that there
+ # is no need to rename the template file when the API version changes.
+-ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile tools/Makefile po/Makefile.in fuzz/Makefile tests/Makefile docs/libpsl/Makefile docs/libpsl/version.xml libpsl.pc:libpsl.pc.in meson.build msvc/Makefile msvc/config.h.win32 msvc/config-msvc.mak"
++ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile tools/Makefile po/Makefile.in fuzz/Makefile tests/Makefile libpsl.pc:libpsl.pc.in meson.build msvc/Makefile msvc/config.h.win32 msvc/config-msvc.mak"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -17781,34 +17257,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__f
+   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then
+-  as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
+-  as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
+-  as_fn_error $? "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
+-  as_fn_error $? "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
+-  as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
+-  as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
+-  as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${ENABLE_MAN_TRUE}" && test -z "${ENABLE_MAN_FALSE}"; then
+   as_fn_error $? "conditional \"ENABLE_MAN\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -18738,8 +18186,6 @@ do
+     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+     "fuzz/Makefile") CONFIG_FILES="$CONFIG_FILES fuzz/Makefile" ;;
+     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+-    "docs/libpsl/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libpsl/Makefile" ;;
+-    "docs/libpsl/version.xml") CONFIG_FILES="$CONFIG_FILES docs/libpsl/version.xml" ;;
+     "libpsl.pc") CONFIG_FILES="$CONFIG_FILES libpsl.pc:libpsl.pc.in" ;;
+     "meson.build") CONFIG_FILES="$CONFIG_FILES meson.build" ;;
+     "msvc/Makefile") CONFIG_FILES="$CONFIG_FILES msvc/Makefile" ;;
diff --git a/dns/libpsl/files/patch-configure.ac b/dns/libpsl/files/patch-configure.ac
deleted file mode 100644
index 89ec123356f2..000000000000
--- a/dns/libpsl/files/patch-configure.ac
+++ /dev/null
@@ -1,34 +0,0 @@
---- configure.ac.orig	2020-07-18 11:15:00 UTC
-+++ configure.ac
-@@ -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_SUBST([LIBPSL_DOCS], [docs/libpsl])
--fi
--
--#
- # enable creation of man pages
- #
- AC_ARG_ENABLE([man],
-@@ -385,7 +368,6 @@ AC_CONFIG_FILES([Makefile
-                  po/Makefile.in
-                  fuzz/Makefile
-                  tests/Makefile
--                 docs/libpsl/Makefile docs/libpsl/version.xml
-                  libpsl.pc:libpsl.pc.in
-                  meson.build
-                  msvc/Makefile