U[date to 2.4.19.

PR:		36343
Submitted by:	Lev A. Serebryakov <lev@serebryakov.spb.ru>

5 files changed, 30 insertions, 16 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 5806dd903d16..717dbbb0415f 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.4.17
-PORTREVISION=	1
+PORTVERSION=	2.4.19
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libxml
@@ -20,6 +19,7 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 USE_BZIP2=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-iconv=${LOCALBASE} \
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index d9b279ce8517..91c458bbed45 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libxml2-2.4.17.tar.bz2) = 80efd21660f87b5c96182b57e41f064f
+MD5 (gnome2/libxml2-2.4.19.tar.bz2) = 1e24b4fef9236305887f5316921b04b1
diff --git a/textproc/libxml2/files/patch-ltmain.sh b/textproc/libxml2/files/patch-ltmain.sh
index 98cb05e4ddb3..91713d2306f8 100644
--- a/textproc/libxml2/files/patch-ltmain.sh
+++ b/textproc/libxml2/files/patch-ltmain.sh
@@ -1,9 +1,26 @@
 
 $FreeBSD$
 
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
++	compiler_flags="$compiler_flags -pthread"
++	continue
++	;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2412,6 +2420,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -13,7 +30,7 @@ $FreeBSD$
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/textproc/libxml2/files/patch-python::Makefile.in b/textproc/libxml2/files/patch-python::Makefile.in
index 41bcf33a3a92..b5d35f2773fb 100644
--- a/textproc/libxml2/files/patch-python::Makefile.in
+++ b/textproc/libxml2/files/patch-python::Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- python/Makefile.in	2002/02/26 18:02:33	1.1
-+++ python/Makefile.in	2002/02/26 18:02:50
-@@ -139,7 +139,7 @@
+--- python/Makefile.in.orig	Tue Mar 26 21:54:53 2002
++++ python/Makefile.in	Tue Mar 26 21:55:17 2002
+@@ -141,7 +141,7 @@
  	-I$(top_srcdir)/include
  
  
 -DOCS_DIR = $(prefix)/share/doc/libxml2-python-$(LIBXML_VERSION)
 +DOCS_DIR = $(prefix)/share/doc/libxml2-python
- DOCS = TODO libxml2class.txt
+ # libxml2class.txt is generated
+ DOCS = TODO
  
- EXTRA_DIST = \
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index b78ca0909c2c..f79dca1364b8 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -57,7 +57,6 @@ share/aclocal/libxml.m4
 %%PYTHON:%%share/doc/libxml2-python/examples/xpath.py
 %%PYTHON:%%share/doc/libxml2-python/examples/xpathext.py
 %%PYTHON:%%share/doc/libxml2-python/examples/xpathret.py
-%%PYTHON:%%share/doc/libxml2-python/libxml2class.txt
 share/doc/libxml2/Copyright
 share/doc/libxml2/examples/testHTML.c
 share/doc/libxml2/examples/testSAX.c
@@ -68,6 +67,7 @@ share/doc/libxml2/html/FAQ.html
 share/doc/libxml2/html/book1.html
 share/doc/libxml2/html/encoding.html
 share/doc/libxml2/html/index.sgml
+share/doc/libxml2/html/libxml-c14n.html
 share/doc/libxml2/html/libxml-catalog.html
 share/doc/libxml2/html/libxml-debugxml.html
 share/doc/libxml2/html/libxml-docbparser.html