textproc/libxml2: update to 2.9.10

PR:		24004
Exp-run by:	antoine
Reviewed by:	madpilot
Differential Revision:	https://reviews.freebsd.org/D22410

8 files changed, 21 insertions, 21 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 328da355a134..04aa1749ee53 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libxml2
-PORTVERSION=	2.9.9
+DISTVERSION=	2.9.10
 PORTREVISION?=	0
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	http://xmlsoft.org/sources/
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 673ef205e512..69b8549440d4 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559577911
-SHA256 (gnome2/libxml2-2.9.9.tar.gz) = 94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871
-SIZE (gnome2/libxml2-2.9.9.tar.gz) = 5476717
+TIMESTAMP = 1573915139
+SHA256 (gnome2/libxml2-2.9.10.tar.gz) = aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
+SIZE (gnome2/libxml2-2.9.10.tar.gz) = 5624761
diff --git a/textproc/libxml2/files/patch-Makefile.in b/textproc/libxml2/files/patch-Makefile.in
index ad56138b9791..d458e1da96c7 100644
--- a/textproc/libxml2/files/patch-Makefile.in
+++ b/textproc/libxml2/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2017-09-20 18:23:56 UTC
+--- Makefile.in.orig	2019-11-16 14:42:34 UTC
 +++ Makefile.in
-@@ -1245,7 +1245,7 @@ distclean-compile:
+@@ -1284,7 +1284,7 @@ am--depfiles: $(am__depfiles_remade)
  @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .c.lo:
@@ -9,16 +9,16 @@
  @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@@ -1730,7 +1730,7 @@ distcleancheck: distclean
- check-am: all-am
+@@ -1773,7 +1773,7 @@ check-am: all-am
+ 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
  check: $(BUILT_SOURCES)
  	$(MAKE) $(AM_MAKEFLAGS) check-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
+-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
 +all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
  		config.h
  install-binPROGRAMS: install-libLTLIBRARIES
  
-@@ -1798,7 +1798,7 @@ info: info-recursive
+@@ -1910,7 +1910,7 @@ info: info-recursive
  
  info-am:
  
diff --git a/textproc/libxml2/files/patch-configure b/textproc/libxml2/files/patch-configure
index 595fd65c6659..59a6d53a2ef6 100644
--- a/textproc/libxml2/files/patch-configure
+++ b/textproc/libxml2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2016-05-23 08:00:35 UTC
+--- configure.orig	2019-10-30 19:14:22 UTC
 +++ configure
-@@ -15639,6 +15639,8 @@ fi
+@@ -15525,6 +15525,8 @@ fi
  	       fi
  	   fi
         ;;
diff --git a/textproc/libxml2/files/patch-python_Makefile.in b/textproc/libxml2/files/patch-python_Makefile.in
index f7bbcc829147..610b02d370ef 100644
--- a/textproc/libxml2/files/patch-python_Makefile.in
+++ b/textproc/libxml2/files/patch-python_Makefile.in
@@ -1,6 +1,6 @@
---- python/Makefile.in.orig	2017-09-20 18:23:56 UTC
+--- python/Makefile.in.orig	2019-11-16 14:42:34 UTC
 +++ python/Makefile.in
-@@ -489,7 +489,7 @@ top_srcdir = @top_srcdir@
+@@ -493,7 +493,7 @@ top_srcdir = @top_srcdir@
  
  # Makefile for libxml2 python library
  AUTOMAKE_OPTIONS = 1.4 foreign
@@ -9,7 +9,7 @@
  docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
  dist_docs_DATA = TODO
  EXTRA_DIST = \
-@@ -509,7 +509,7 @@ EXTRA_DIST = \
+@@ -513,7 +513,7 @@ EXTRA_DIST = \
  @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la
  @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
  @WITH_PYTHON_TRUE@libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \
diff --git a/textproc/libxml2/files/patch-python_tests_Makefile.in b/textproc/libxml2/files/patch-python_tests_Makefile.in
index a8fda96d86b2..9998f93a3e12 100644
--- a/textproc/libxml2/files/patch-python_tests_Makefile.in
+++ b/textproc/libxml2/files/patch-python_tests_Makefile.in
@@ -1,6 +1,6 @@
---- python/tests/Makefile.in.orig	2017-09-20 18:23:56 UTC
+--- python/tests/Makefile.in.orig	2019-11-16 14:42:34 UTC
 +++ python/tests/Makefile.in
-@@ -385,7 +385,7 @@ target_alias = @target_alias@
+@@ -387,7 +387,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
diff --git a/textproc/libxml2/files/patch-uri.c b/textproc/libxml2/files/patch-uri.c
index 03dbc8bbed99..82b06581c80e 100644
--- a/textproc/libxml2/files/patch-uri.c
+++ b/textproc/libxml2/files/patch-uri.c
@@ -12,9 +12,9 @@ bogus values when called with URIs that have rootless paths
 (e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be
 correct)
 
---- uri.c.orig	2016-05-22 01:49:02 UTC
+--- uri.c.orig	2019-10-22 18:46:01 UTC
 +++ uri.c
-@@ -1199,6 +1199,8 @@ xmlSaveUri(xmlURIPtr uri) {
+@@ -1201,6 +1201,8 @@ xmlSaveUri(xmlURIPtr uri) {
                  if (temp == NULL) goto mem_error;
                  ret = temp;
  	    }
diff --git a/textproc/libxml2/files/patch-xml2Conf.sh.in b/textproc/libxml2/files/patch-xml2Conf.sh.in
index 7d987c2af5ac..2f01e89136bb 100644
--- a/textproc/libxml2/files/patch-xml2Conf.sh.in
+++ b/textproc/libxml2/files/patch-xml2Conf.sh.in
@@ -1,4 +1,4 @@
---- xml2Conf.sh.in.orig	2009-07-30 15:24:35 UTC
+--- xml2Conf.sh.in.orig	2019-10-22 18:28:43 UTC
 +++ xml2Conf.sh.in
 @@ -1,6 +1,12 @@
  #
@@ -11,5 +11,5 @@
 +libdir=@libdir@
 +
  XML2_LIBDIR="@XML_LIBDIR@"
- XML2_LIBS="@XML_LIBS@"
+ XML2_LIBS="@XML_LIBS@ @XML_PRIVATE_LIBS@"
  XML2_INCLUDEDIR="@XML_INCLUDEDIR@"