Update to 2.3.0. Finally Gnome folks recognized the need to allow libxml2

co-exist with old libxml installed on the same machine, so I was able to
happily remove most of my hacks.

7 files changed, 123 insertions, 144 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index b07f1320e7c9..25c37e2b7c4a 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.2.11
+PORTVERSION=	2.3.0
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libxml
@@ -26,9 +26,9 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=		xml2-config.1 xmllint.1
 MAN4=		libxml.4
 
-pre-patch:
-	@find ${WRKSRC}/include -type f -name "*.h" | \
-		xargs ${PERL} -pi -e 's|libxml/|libxml2/|'
-	@${LN} -sf ${WRKSRC}/include/libxml ${WRKSRC}/include/libxml2
+#pre-patch:
+#	@find ${WRKSRC}/include -type f -name "*.h" | \
+#		xargs ${PERL} -pi -e 's|libxml/|libxml2/|'
+#	@${LN} -sf ${WRKSRC}/include/libxml ${WRKSRC}/include/libxml2
 
 .include <bsd.port.mk>
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index ea3073fe9566..0ee74f725508 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1 +1 @@
-MD5 (libxml2-2.2.11.tar.gz) = df3fce3245cd2a5c32ff243d6f6a3609
+MD5 (libxml2-2.3.0.tar.gz) = 6d95744d6401036d6c06f82956b6ba06
diff --git a/textproc/libxml2/files/patch-aa b/textproc/libxml2/files/patch-aa
index 78bb7d7b47e2..e5c879a5d508 100644
--- a/textproc/libxml2/files/patch-aa
+++ b/textproc/libxml2/files/patch-aa
@@ -1,76 +1,59 @@
---- Makefile.in.orig	Sat Nov 25 04:00:19 2000
-+++ Makefile.in	Wed Nov 29 17:37:37 2000
-@@ -121,8 +121,8 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Thu Feb  8 13:47:28 2001
++++ Makefile.in	Fri Feb  9 02:04:41 2001
+@@ -124,7 +124,7 @@
+ lib_LTLIBRARIES = libxml2.la
+ libxml2_la_LIBADD = @Z_LIBS@
  
--bin_SCRIPTS = xml-config
-+bin_SCRIPTS = xml2-config
+-libxml2_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
++libxml2_la_LDFLAGS = -version-info 5:0:0
  
--lib_LTLIBRARIES = libxml.la
-+lib_LTLIBRARIES = libxml2.la
- libxml_la_LIBADD = @Z_LIBS@
+ libxml2_la_SOURCES =  		SAX.c 		entities.c 		encoding.c 		error.c 		parserInternals.c 		parser.c 		tree.c 		hash.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
  
--libxml_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
-+libxml_la_LDFLAGS = -version-info 5:0:0
- 
-@@ -131,6 +131,6 @@
- 
--DEPS = $(top_builddir)/libxml.la
--LDADDS = $(top_builddir)/libxml.la @Z_LIBS@ @M_LIBS@
-+DEPS = $(top_builddir)/libxml2.la
-+LDADDS = $(top_builddir)/libxml2.la @Z_LIBS@ @M_LIBS@
- 
--man_MANS = xmllint.1 xml-config.1 libxml.4
-+man_MANS = xmllint.1 xml2-config.1 libxml.4
- 
-@@ -164,6 +164,6 @@
+@@ -162,7 +162,7 @@
+ testURI_DEPENDENCIES = $(DEPS)
+ testURI_LDADD = $(LDADDS)
  
 -confexecdir = $(libdir)
--confexec_DATA = xmlConf.sh
 +confexecdir = $(sysconfdir)
-+confexec_DATA = xml2Conf.sh
+ confexec_DATA = xml2Conf.sh
+ 
+ CLEANFILES = xml2Conf.sh
+@@ -205,7 +205,7 @@
+ MANS = $(man_MANS)
  
--CLEANFILES = xmlConf.sh
-+CLEANFILES = xml2Conf.sh
- EXTRA_DIST = xmlConf.sh.in libxml.spec.in libxml.spec libxml.m4              example/Makefile.am example/gjobread.c example/gjobs.xml 	     $(man_MANS) libxml-2.0.pc.in xmlversion.h.in 	     win32/README.MSDev win32/Makefile.mingw win32/libxml2/libxml2.dsp
-@@ -207,3 +207,3 @@
  NROFF = nroff
 -DATA =  $(confexec_DATA) $(m4data_DATA) $(pkgconfig_DATA)
 +DATA =  $(confexec_DATA) $(m4data_DATA)
  
-@@ -273,2 +273,6 @@
- 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+xml2-config: xml-config
-+	cd $(top_builddir) && cp xml-config xml2-config
-+xml2-config.1: xml-config.1
-+	cd $(top_builddir) && cp xml-config.1 xml2-config.1
- 
-@@ -337,3 +341,3 @@
- 
--libxml.la: $(libxml_la_OBJECTS) $(libxml_la_DEPENDENCIES)
-+libxml2.la: $(libxml_la_OBJECTS) $(libxml_la_DEPENDENCIES)
- 	$(LINK) -rpath $(libdir) $(libxml_la_LDFLAGS) $(libxml_la_OBJECTS) $(libxml_la_LIBADD) $(LIBS)
-@@ -827,3 +831,3 @@
+ DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING COPYING.LIB ChangeLog \
+ INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h acinclude.m4 \
+@@ -825,7 +825,7 @@
+ 		install-binSCRIPTS install-confexecDATA
+ install-exec: install-exec-recursive
  
 -install-data-am: install-man install-m4dataDATA install-pkgconfigDATA
 +install-data-am: install-man install-m4dataDATA
  install-data: install-data-recursive
-@@ -838,3 +842,3 @@
+ 
+ install-am: all-am
+@@ -836,7 +836,7 @@
+ 		uninstall-confexecDATA uninstall-m4dataDATA \
+ 		uninstall-pkgconfigDATA
  uninstall: uninstall-recursive
 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
 +all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
  		config.h
-@@ -848,3 +852,3 @@
+ all-redirect: all-recursive-am
+ install-strip:
+@@ -846,7 +846,7 @@
+ 	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
+ 		$(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 \
  		$(DESTDIR)$(mandir)/man4 $(DESTDIR)$(confexecdir) \
 -		$(DESTDIR)$(m4datadir) $(DESTDIR)$(pkgconfigdir)
 +		$(DESTDIR)$(m4datadir)
  
-@@ -1219,3 +1223,3 @@
- 
--xmlConf.sh: xmlConf.sh.in Makefile
-+xml2Conf.sh: xmlConf.sh.in Makefile
- 	sed -e 's?\@XML_LIBDIR\@?$(XML_LIBDIR)?g' \
-@@ -1225,3 +1229,3 @@
- 	      < $(srcdir)/xmlConf.sh.in > xmlConf.tmp \
--	  && mv xmlConf.tmp xmlConf.sh
-+	  && mv xmlConf.tmp xml2Conf.sh
  
+ mostlyclean-generic:
diff --git a/textproc/libxml2/files/patch-ab b/textproc/libxml2/files/patch-ab
index 53faf2f4006d..e21bcc174b83 100644
--- a/textproc/libxml2/files/patch-ab
+++ b/textproc/libxml2/files/patch-ab
@@ -1,13 +1,14 @@
---- configure	2000/11/15 09:47:14	1.1
-+++ configure	2000/11/15 09:51:34
-@@ -3419,8 +3419,8 @@
+
+$FreeBSD$
+
+--- configure.orig	Thu Feb  8 13:39:59 2001
++++ configure	Fri Feb  9 02:04:41 2001
+@@ -3474,7 +3474,7 @@
  
  
  XML_LIBDIR='-L${libdir}'
 -XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}'
--XML_LIBS="-lxml $Z_LIBS $M_LIBS $LIBS"
-+XML_INCLUDEDIR='-I${includedir}/libxml2 -I${includedir}'
-+XML_LIBS="-lxml2 $Z_LIBS $M_LIBS $LIBS"
++XML_INCLUDEDIR='-I${includedir}/libxml2 -I${includedir}/libxml2/libxml'
+ XML_LIBS="-lxml2 $Z_LIBS $M_LIBS $LIBS"
  
  XML_CFLAGS=""
- 
diff --git a/textproc/libxml2/files/patch-ac b/textproc/libxml2/files/patch-ac
index 1b305d6e71d3..93ac874c2be6 100644
--- a/textproc/libxml2/files/patch-ac
+++ b/textproc/libxml2/files/patch-ac
@@ -1,22 +1,14 @@
---- include/Makefile.in	2000/11/15 09:53:28	1.1
-+++ include/Makefile.in	2000/11/15 10:12:23
-@@ -143,8 +143,8 @@
- 	$(mkinstalldirs) $(DESTDIR)$(xmlincdir)
- 	@list='$(xmlinc_HEADERS)'; for p in $$list; do \
- 	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
--	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(xmlincdir)/$$p"; \
--	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(xmlincdir)/$$p; \
-+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(xmlincdir)/`echo $$p | sed 's|libxml/|libxml2/|'`"; \
-+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(xmlincdir)/`echo $$p | sed 's|libxml/|libxml2/|'`; \
- 	done
+
+$FreeBSD$
+
+--- include/Makefile.in.orig	Thu Feb  8 13:47:30 2001
++++ include/Makefile.in	Fri Feb  9 02:04:41 2001
+@@ -111,7 +111,7 @@
+ Z_CFLAGS = @Z_CFLAGS@
+ Z_LIBS = @Z_LIBS@
  
- uninstall-xmlincHEADERS:
-@@ -266,7 +266,7 @@
+-xmlincdir = $(includedir)
++xmlincdir = $(includedir)/libxml2
  
+ xmlinc_HEADERS =  		libxml/SAX.h 		libxml/entities.h 		libxml/encoding.h 		libxml/parser.h 		libxml/parserInternals.h 		libxml/xmlerror.h 		libxml/HTMLparser.h 		libxml/HTMLtree.h 		libxml/debugXML.h 		libxml/tree.h 		libxml/hash.h 		libxml/xpath.h 		libxml/xpathInternals.h 		libxml/xpointer.h 		libxml/xinclude.h 		libxml/xmlIO.h 		libxml/xmlmemory.h 		libxml/nanohttp.h 		libxml/nanoftp.h 		libxml/uri.h 		libxml/valid.h 		libxml/xlink.h 		libxml/xmlversion.h
  
- install-exec-hook:
--	$(mkinstalldirs) $(DESTDIR)$(xmlincdir) $(DESTDIR)$(xmlincdir)/libxml
-+	$(mkinstalldirs) $(DESTDIR)$(xmlincdir) $(DESTDIR)$(xmlincdir)/libxml2
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/textproc/libxml2/files/patch-ad b/textproc/libxml2/files/patch-ad
index 5c12cf1afc30..dc7b56a04051 100644
--- a/textproc/libxml2/files/patch-ad
+++ b/textproc/libxml2/files/patch-ad
@@ -1,11 +1,14 @@
---- doc/Makefile.in.orig	Mon Nov 13 20:28:44 2000
-+++ doc/Makefile.in	Wed Nov 15 12:50:29 2000
+
+$FreeBSD$
+
+--- doc/Makefile.in.orig	Thu Feb  8 13:47:31 2001
++++ doc/Makefile.in	Fri Feb  9 02:04:41 2001
 @@ -112,7 +112,7 @@
  Z_CFLAGS = @Z_CFLAGS@
  Z_LIBS = @Z_LIBS@
  
--DOC_MODULE = gnome-xml
-+DOC_MODULE = gnome-xml2
+-DOC_MODULE = libxml2-$(VERSION)
++DOC_MODULE = libxml2
  
  # The top-level SGML file.
  DOC_MAIN_SGML_FILE = gnome-xml.sgml
@@ -13,8 +16,8 @@
  # The directory containing the source code (if it contains documentation).
  DOC_SOURCE_DIR = ..
  
--HTML_DIR = $(datadir)/gnome-xml/html
+-HTML_DIR = $(prefix)/doc
 +HTML_DIR = $(datadir)
  
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/html
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index 05035ae4ca14..40185e94f8e4 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -1,62 +1,62 @@
 bin/xml2-config
 bin/xmllint
 etc/xml2Conf.sh
-include/libxml2/HTMLparser.h
-include/libxml2/HTMLtree.h
-include/libxml2/SAX.h
-include/libxml2/debugXML.h
-include/libxml2/encoding.h
-include/libxml2/entities.h
-include/libxml2/hash.h
-include/libxml2/nanoftp.h
-include/libxml2/nanohttp.h
-include/libxml2/parser.h
-include/libxml2/parserInternals.h
-include/libxml2/tree.h
-include/libxml2/uri.h
-include/libxml2/valid.h
-include/libxml2/xinclude.h
-include/libxml2/xlink.h
-include/libxml2/xmlIO.h
-include/libxml2/xmlerror.h
-include/libxml2/xmlmemory.h
-include/libxml2/xmlversion.h
-include/libxml2/xpath.h
-include/libxml2/xpathInternals.h
-include/libxml2/xpointer.h
+include/libxml2/libxml/HTMLparser.h
+include/libxml2/libxml/HTMLtree.h
+include/libxml2/libxml/SAX.h
+include/libxml2/libxml/debugXML.h
+include/libxml2/libxml/encoding.h
+include/libxml2/libxml/entities.h
+include/libxml2/libxml/hash.h
+include/libxml2/libxml/nanoftp.h
+include/libxml2/libxml/nanohttp.h
+include/libxml2/libxml/parser.h
+include/libxml2/libxml/parserInternals.h
+include/libxml2/libxml/tree.h
+include/libxml2/libxml/uri.h
+include/libxml2/libxml/valid.h
+include/libxml2/libxml/xinclude.h
+include/libxml2/libxml/xlink.h
+include/libxml2/libxml/xmlIO.h
+include/libxml2/libxml/xmlerror.h
+include/libxml2/libxml/xmlmemory.h
+include/libxml2/libxml/xmlversion.h
+include/libxml2/libxml/xpath.h
+include/libxml2/libxml/xpathInternals.h
+include/libxml2/libxml/xpointer.h
 lib/libxml2.a
 lib/libxml2.so
 lib/libxml2.so.5
 share/aclocal/libxml.m4
-share/gnome-xml2/DOM.gif
-share/gnome-xml2/FAQ.html
-share/gnome-xml2/book1.html
-share/gnome-xml2/encoding.html
-share/gnome-xml2/gnome-xml-debugxml.html
-share/gnome-xml2/gnome-xml-encoding.html
-share/gnome-xml2/gnome-xml-entities.html
-share/gnome-xml2/gnome-xml-error.html
-share/gnome-xml2/gnome-xml-htmlparser.html
-share/gnome-xml2/gnome-xml-htmltree.html
-share/gnome-xml2/gnome-xml-nanoftp.html
-share/gnome-xml2/gnome-xml-nanohttp.html
-share/gnome-xml2/gnome-xml-parser.html
-share/gnome-xml2/gnome-xml-parserinternals.html
-share/gnome-xml2/gnome-xml-sax.html
-share/gnome-xml2/gnome-xml-tree.html
-share/gnome-xml2/gnome-xml-uri.html
-share/gnome-xml2/gnome-xml-valid.html
-share/gnome-xml2/gnome-xml-xinclude.html
-share/gnome-xml2/gnome-xml-xml-error.html
-share/gnome-xml2/gnome-xml-xmlio.html
-share/gnome-xml2/gnome-xml-xmlmemory.html
-share/gnome-xml2/gnome-xml-xpath.html
-share/gnome-xml2/gnome-xml-xpathinternals.html
-share/gnome-xml2/gnome-xml-xpointer.html
-share/gnome-xml2/index.sgml
-share/gnome-xml2/libxml-lib.html
-share/gnome-xml2/libxml-notes.html
-share/gnome-xml2/structure.gif
-share/gnome-xml2/xml.html
-@dirrm share/gnome-xml2
+share/libxml2/html/DOM.gif
+share/libxml2/html/FAQ.html
+share/libxml2/html/book1.html
+share/libxml2/html/encoding.html
+share/libxml2/html/index.sgml
+share/libxml2/html/libxml-debugxml.html
+share/libxml2/html/libxml-encoding.html
+share/libxml2/html/libxml-entities.html
+share/libxml2/html/libxml-htmlparser.html
+share/libxml2/html/libxml-htmltree.html
+share/libxml2/html/libxml-lib.html
+share/libxml2/html/libxml-nanoftp.html
+share/libxml2/html/libxml-nanohttp.html
+share/libxml2/html/libxml-notes.html
+share/libxml2/html/libxml-parser.html
+share/libxml2/html/libxml-parserinternals.html
+share/libxml2/html/libxml-sax.html
+share/libxml2/html/libxml-tree.html
+share/libxml2/html/libxml-uri.html
+share/libxml2/html/libxml-valid.html
+share/libxml2/html/libxml-xinclude.html
+share/libxml2/html/libxml-xmlio.html
+share/libxml2/html/libxml-xmlmemory.html
+share/libxml2/html/libxml-xpath.html
+share/libxml2/html/libxml-xpathinternals.html
+share/libxml2/html/libxml-xpointer.html
+share/libxml2/html/structure.gif
+share/libxml2/html/xml.html
+@dirrm share/libxml2/html
+@dirrm share/libxml2
+@dirrm include/libxml2/libxml
 @dirrm include/libxml2