6 files changed, 102 insertions, 14 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 6e06573b024f..6f2ddaa7bde5 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.4.13
+PORTVERSION=	2.4.16
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libxml
@@ -19,7 +19,6 @@ RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-
 CONFIGURE_ARGS=	--with-iconv=${LOCALBASE} \
 		--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -28,6 +27,22 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=		xml2-config.1 xmllint.1 xmlcatalog.1
 MAN4=		libxml.4
 
+.if !defined(WITHOUT_PYTHON)
+USE_PYTHON=	yes
+PLIST_SUB+=	PYTHON:=""
+.else
+CONFIGURE_ARGS+=	--without-python
+PLIST_SUB+=	PYTHON:="@comment "
+PKGNAMESUFFIX=	-nopython
+.endif
+
+.if !defined(WITHOUT_PYTHON)
+pre-extract:
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "If you don't want Python support, add WITHOUT_PYTHON=yes to command line"
+	@${ECHO_MSG} ""
+.endif
+
 pre-patch:
 	@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
 		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index d0d9707d800d..c3ff5b07d43b 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1 +1 @@
-MD5 (libxml2-2.4.13.tar.gz) = df94fd00943a2bc8024517fb4db33553
+MD5 (libxml2-2.4.16.tar.gz) = 1144a6742405481509c2b70cf1c98db3
diff --git a/textproc/libxml2/files/patch-aa b/textproc/libxml2/files/patch-aa
index ba39c1dceb50..96086f8eebaf 100644
--- a/textproc/libxml2/files/patch-aa
+++ b/textproc/libxml2/files/patch-aa
@@ -1,24 +1,45 @@
---- work/libxml2-2.4.5/Makefile.in.orig	Tue Sep 18 20:11:32 2001
-+++ Makefile.in				Tue Sep 18 20:11:32 2001
-@@ -137,7 +137,7 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Tue Feb 26 20:08:54 2002
++++ Makefile.in	Tue Feb 26 20:36:25 2002
+@@ -130,7 +130,7 @@
+ 
+ AUTOMAKE_OPTIONS = no-dependencies
+ 
+-SUBDIRS = include . doc example python
++SUBDIRS = include . doc example @WITH_PYTHON_TRUE@ python
+ 
+ INCLUDES = -I@srcdir@/include -I$(top_builddir)/include @THREAD_CFLAGS@ @Z_CFLAGS@ 
+ 
+@@ -143,7 +143,7 @@
  lib_LTLIBRARIES = libxml2.la
  libxml2_la_LIBADD = @Z_LIBS@ $(ICONV_LIBS) -lm
  
 -libxml2_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
 +libxml2_la_LDFLAGS = -version-info 5:0:0
  
- @WITH_TRIO_SOURCES_TRUE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  		parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c  		valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c  		xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c 		catalog.c strio.c trio.c
- @WITH_TRIO_SOURCES_FALSE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  		parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c  		valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c  		xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c 		catalog.c 
-@@ -185,7 +185,7 @@
- testURI_DEPENDENCIES = $(DEPS)
- testURI_LDADD = $(LDADDS)
+ @WITH_TRIO_SOURCES_TRUE@libxml2_la_SOURCES = @WITH_TRIO_SOURCES_TRUE@SAX.c entities.c encoding.c error.c parserInternals.c  \
+ @WITH_TRIO_SOURCES_TRUE@		parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c  \
+@@ -206,7 +206,7 @@
+ 
+ CLEANFILES = xml2Conf.sh
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = xml2Conf.sh
- 
- CLEANFILES = xml2Conf.sh
-@@ -770,7 +770,7 @@
+ EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml.spec \
+              libxml.m4 Copyright check-xml-test-suite.py \
+@@ -224,7 +224,7 @@
+ # Instll the tests program sources as examples 
+ #
+ BASE_DIR = @HTML_DIR@
+-DOC_MODULE = libxml2-$(VERSION)
++DOC_MODULE = libxml2
+ EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -809,7 +809,7 @@
  		uninstall-confexecDATA uninstall-m4dataDATA \
  		uninstall-pkgconfigDATA
  uninstall: uninstall-recursive
diff --git a/textproc/libxml2/files/patch-python::Makefile.in b/textproc/libxml2/files/patch-python::Makefile.in
new file mode 100644
index 000000000000..41bcf33a3a92
--- /dev/null
+++ b/textproc/libxml2/files/patch-python::Makefile.in
@@ -0,0 +1,14 @@
+
+$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 @@
+ 	-I$(top_srcdir)/include
+ 
+ 
+-DOCS_DIR = $(prefix)/share/doc/libxml2-python-$(LIBXML_VERSION)
++DOCS_DIR = $(prefix)/share/doc/libxml2-python
+ DOCS = TODO libxml2class.txt
+ 
+ EXTRA_DIST = \
diff --git a/textproc/libxml2/files/patch-python::tests::Makefile.in b/textproc/libxml2/files/patch-python::tests::Makefile.in
new file mode 100644
index 000000000000..0120732fa029
--- /dev/null
+++ b/textproc/libxml2/files/patch-python::tests::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- python/tests/Makefile.in	2002/02/26 18:09:00	1.1
++++ python/tests/Makefile.in	2002/02/26 18:09:12
+@@ -128,7 +128,7 @@
+ Z_CFLAGS = @Z_CFLAGS@
+ Z_LIBS = @Z_LIBS@
+ 
+-EXAMPLE_DIR = $(prefix)/share/doc/libxml2-python-$(LIBXML_VERSION)/examples
++EXAMPLE_DIR = $(prefix)/share/doc/libxml2-python/examples
+ 
+ PYTESTS = \
+     build.py	\
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index 0b6cfbb2c0d9..fa623cc30b8a 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -34,8 +34,29 @@ include/libxml2/libxml/xpointer.h
 lib/libxml2.a
 lib/libxml2.so
 lib/libxml2.so.5
+%%PYTHON:%%lib/%%PYTHON_VERSION%%/site-packages/libxml2.py
+%%PYTHON:%%lib/%%PYTHON_VERSION%%/site-packages/libxml2mod.so
 libdata/pkgconfig/libxml-2.0.pc
 share/aclocal/libxml.m4
+%%PYTHON:%%share/doc/libxml2-python/TODO
+%%PYTHON:%%share/doc/libxml2-python/examples/build.py
+%%PYTHON:%%share/doc/libxml2-python/examples/error.py
+%%PYTHON:%%share/doc/libxml2-python/examples/invalid.xml
+%%PYTHON:%%share/doc/libxml2-python/examples/push.py
+%%PYTHON:%%share/doc/libxml2-python/examples/pushSAX.py
+%%PYTHON:%%share/doc/libxml2-python/examples/tst.py
+%%PYTHON:%%share/doc/libxml2-python/examples/tst.xml
+%%PYTHON:%%share/doc/libxml2-python/examples/tstxpath.py
+%%PYTHON:%%share/doc/libxml2-python/examples/valid.xml
+%%PYTHON:%%share/doc/libxml2-python/examples/validate.py
+%%PYTHON:%%share/doc/libxml2-python/examples/xpath.py
+%%PYTHON:%%share/doc/libxml2-python/examples/xpathext.py
+%%PYTHON:%%share/doc/libxml2-python/libxml2class.txt
+share/doc/libxml2/Copyright
+share/doc/libxml2/examples/testHTML.c
+share/doc/libxml2/examples/testSAX.c
+share/doc/libxml2/examples/testXPath.c
+share/doc/libxml2/examples/xmllint.c
 share/doc/libxml2/html/DOM.gif
 share/doc/libxml2/html/FAQ.html
 share/doc/libxml2/html/book1.html
@@ -71,6 +92,9 @@ share/doc/libxml2/html/libxml-xpointer.html
 share/doc/libxml2/html/structure.gif
 share/doc/libxml2/html/xml.html
 @dirrm share/doc/libxml2/html
+%%PYTHON:%%@dirrm share/doc/libxml2-python/examples
+%%PYTHON:%%@dirrm share/doc/libxml2-python
+@dirrm share/doc/libxml2/examples
 @dirrm share/doc/libxml2
 @dirrm include/libxml2/libxml
 @dirrm include/libxml2