Update to version 1.4.0.

PR:		12781 (2 of 19)
Submitted by:	Ade Lovett <ade@lovett.com>

4 files changed, 21 insertions, 31 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index d6ce83682e2..bba0127eccb 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,21 +1,18 @@
 # New ports collection makefile for:	libxml
-# Version required:			1.0.0
+# Version required:			1.4.0
 # Date created:				28 September 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.8 1999/03/09 01:09:03 nectar Exp $
+# $Id: Makefile,v 1.9 1999/04/08 18:08:38 steve Exp $
 #
 
-DISTNAME=	libxml-1.0.0
-CATEGORIES=	textproc
+DISTNAME=	libxml-1.4.0
+CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/libxml
 
 MAINTAINER=	nacai@iname.com
 
-GNU_CONFIGURE=	yes
-
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index d73d4fb0a0f..fcbf4bc0e8c 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1 +1 @@
-MD5 (libxml-1.0.0.tar.gz) = 50c6631b4feb0cd6360ae2225fef0fe8
+MD5 (libxml-1.4.0.tar.gz) = f7844f2e7e87a898ee75cc3ed0f4c07d
diff --git a/textproc/libxml2/files/patch-aa b/textproc/libxml2/files/patch-aa
index 4e29579d03d..48b3322657a 100644
--- a/textproc/libxml2/files/patch-aa
+++ b/textproc/libxml2/files/patch-aa
@@ -1,14 +1,14 @@
 --- Makefile.in.orig	Thu Feb 25 13:01:50 1999
 +++ Makefile.in	Wed Mar  3 13:15:47 1999
-@@ -94,7 +94,7 @@
+@@ -101,7 +101,7 @@
  
+ lib_LTLIBRARIES = libxml.la
  
- xmlincdir = $(includedir)/gnome-xml
--xmlinc_HEADERS =  		entities.h 		encoding.h 		parser.h 		parserInternals.h 		debugXML.h 		tree.h 		valid.h
-+xmlinc_HEADERS =  		entities.h 		encoding.h 		error.h			parser.h 		parserInternals.h 		debugXML.h 		tree.h 		valid.h
+-libxml_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
++libxml_la_LDFLAGS = -version-info 4:0:0
  
+ libxml_la_SOURCES =  		SAX.c 		entities.c 		encoding.c 		error.c 		parser.c 		HTMLparser.c 		HTMLtree.c 		debugXML.c 		tree.c 		xpath.c 		valid.c
  
- DEPS = $(top_builddir)/libxml.la
 @@ -105,7 +105,7 @@
  tester_DEPENDENCIES = $(DEPS)
  tester_LDADD = $(LDADDS)
@@ -38,17 +38,3 @@
  
  TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -227,10 +227,9 @@
- 
- install-data-local: 
- 	install -d -m 0755 $(TARGET_DIR)
--	-install -m 0644 $(srcdir)/xml.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(TARGET_DIR)
--	-install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR)
--	-install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR)
--	-gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)
-+	-install -c -m 0644 $(srcdir)/xml.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(TARGET_DIR)
-+	-install -c -m 0644 $(srcdir)/html/*.html $(TARGET_DIR)
-+	-install -c -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR)
- 
- dist-hook:
- 	(cd $(srcdir) ; tar cvf - xml.html structure.gif DOM.gif html/*.html html/*.sgml) | (cd $(distdir); tar xf -)
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index 4a5db9d97c6..79ee90f6a48 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -1,27 +1,34 @@
 bin/xml-config
 etc/xmlConf.sh
+include/gnome-xml/HTMLparser.h
+include/gnome-xml/HTMLtree.h
 include/gnome-xml/debugXML.h
 include/gnome-xml/encoding.h
 include/gnome-xml/entities.h
-include/gnome-xml/error.h
 include/gnome-xml/parser.h
 include/gnome-xml/parserInternals.h
 include/gnome-xml/tree.h
 include/gnome-xml/valid.h
+include/gnome-xml/xml-error.h
+include/gnome-xml/xmlIO.h
+include/gnome-xml/xpath.h
 lib/libxml.a
-lib/libxml.la
 lib/libxml.so
-lib/libxml.so.0
+lib/libxml.so.4
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/gnome-xml/DOM.gif
 share/gnome-xml/book1.html
 share/gnome-xml/gnome-xml-entities.html
 share/gnome-xml/gnome-xml-error.html
+share/gnome-xml/gnome-xml-htmlparser.html
+share/gnome-xml/gnome-xml-htmltree.html
 share/gnome-xml/gnome-xml-parser.html
 share/gnome-xml/gnome-xml-parserinternals.html
 share/gnome-xml/gnome-xml-tree.html
 share/gnome-xml/gnome-xml-valid.html
+share/gnome-xml/gnome-xml-xml-error.html
+share/gnome-xml/gnome-xml-xpath.html
 share/gnome-xml/index.sgml
 share/gnome-xml/libxml.html
 share/gnome-xml/structure.gif