Update to 1.8.11

4 files changed, 49 insertions, 55 deletions

diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index ca318a93c91a..5ad72847f853 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libxml
-PORTVERSION= 	1.8.10
+PORTVERSION= 	1.8.11
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libxml
diff --git a/textproc/libxml/distinfo b/textproc/libxml/distinfo
index 624daebea93a..57f6a4ecac63 100644
--- a/textproc/libxml/distinfo
+++ b/textproc/libxml/distinfo
@@ -1 +1 @@
-MD5 (libxml-1.8.10.tar.gz) = 4773efd97515916b9b4a7d6a303997d4
+MD5 (libxml-1.8.11.tar.gz) = ddbbe7e76fe51d24bd8f6f961ea69c31
diff --git a/textproc/libxml/files/patch-aa b/textproc/libxml/files/patch-aa
index f3de3c8a5a7e..3888ac098ef8 100644
--- a/textproc/libxml/files/patch-aa
+++ b/textproc/libxml/files/patch-aa
@@ -1,40 +1,32 @@
---- Makefile.in.orig	Thu Feb 25 13:01:50 1999
-+++ Makefile.in	Wed Mar  3 13:15:47 1999
-@@ -101,7 +101,7 @@
+--- Makefile.in.orig	Thu Jan 11 04:30:32 2001
++++ Makefile.in	Thu Jan 11 10:40:25 2001
+@@ -108,3 +108,3 @@
  
- lib_LTLIBRARIES = libxml.la
+-libxml_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@ @Z_LIBS@
++libxml_la_LDFLAGS = -version-info 5:0:0 @Z_LIBS@
  
--libxml_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
-+libxml_la_LDFLAGS = -version-info 5: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
- 
-@@ -105,7 +105,7 @@
- tester_DEPENDENCIES = $(DEPS)
- tester_LDADD = $(LDADDS)
+@@ -140,3 +140,3 @@
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = xmlConf.sh
+@@ -176,3 +176,3 @@
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+-DATA =  $(confexec_DATA) $(pkgconfig_DATA)
++DATA =  $(confexec_DATA)
+ 
+@@ -620,3 +620,3 @@
  
- EXTRA_DIST = xmlConf.sh.in libxml.spec.in
-@@ -518,7 +518,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-binSCRIPTS \
- 		uninstall-confexecDATA uninstall-xmlincHEADERS
+-install-data-am: install-pkgconfigDATA install-xmlincHEADERS
++install-data-am: install-xmlincHEADERS
+ install-data: install-data-recursive
+@@ -630,3 +630,3 @@
  uninstall: uninstall-recursive
 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
 +all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
  		$(HEADERS) config.h
- all-redirect: all-recursive-am
- install-strip:
---- doc/Makefile.in.orig	Thu Feb 25 13:01:51 1999
-+++ doc/Makefile.in	Tue Mar  2 20:39:23 1999
-@@ -89,7 +89,7 @@
- # The directory containing the source code (if it contains documentation).
- DOC_SOURCE_DIR = ..
- 
--HTML_DIR = $(datadir)/gnome-xml/html
-+HTML_DIR = $(datadir)
- 
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -638,3 +638,3 @@
+ 	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
+-		$(DESTDIR)$(confexecdir) $(DESTDIR)$(pkgconfigdir) \
++		$(DESTDIR)$(confexecdir) \
+ 		$(DESTDIR)$(xmlincdir)
diff --git a/textproc/libxml/pkg-plist b/textproc/libxml/pkg-plist
index de4dcdcaf933..8bad544e5139 100644
--- a/textproc/libxml/pkg-plist
+++ b/textproc/libxml/pkg-plist
@@ -20,29 +20,31 @@ include/gnome-xml/xpath.h
 lib/libxml.a
 lib/libxml.so
 lib/libxml.so.5
-share/gnome-xml/DOM.gif
-share/gnome-xml/book1.html
-share/gnome-xml/gnome-xml-debugxml.html
-share/gnome-xml/gnome-xml-encoding.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-nanoftp.html
-share/gnome-xml/gnome-xml-nanohttp.html
-share/gnome-xml/gnome-xml-parser.html
-share/gnome-xml/gnome-xml-parserinternals.html
-share/gnome-xml/gnome-xml-sax.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-xmlio.html
-share/gnome-xml/gnome-xml-xmlmemory.html
-share/gnome-xml/gnome-xml-xpath.html
-share/gnome-xml/index.sgml
-share/gnome-xml/libxml-lib.html
-share/gnome-xml/libxml-notes.html
-share/gnome-xml/structure.gif
-share/gnome-xml/xml.html
+share/gnome-xml/html/gnome-xml/DOM.gif
+share/gnome-xml/html/gnome-xml/book1.html
+share/gnome-xml/html/gnome-xml/gnome-xml-debugxml.html
+share/gnome-xml/html/gnome-xml/gnome-xml-encoding.html
+share/gnome-xml/html/gnome-xml/gnome-xml-entities.html
+share/gnome-xml/html/gnome-xml/gnome-xml-error.html
+share/gnome-xml/html/gnome-xml/gnome-xml-htmlparser.html
+share/gnome-xml/html/gnome-xml/gnome-xml-htmltree.html
+share/gnome-xml/html/gnome-xml/gnome-xml-nanoftp.html
+share/gnome-xml/html/gnome-xml/gnome-xml-nanohttp.html
+share/gnome-xml/html/gnome-xml/gnome-xml-parser.html
+share/gnome-xml/html/gnome-xml/gnome-xml-parserinternals.html
+share/gnome-xml/html/gnome-xml/gnome-xml-sax.html
+share/gnome-xml/html/gnome-xml/gnome-xml-tree.html
+share/gnome-xml/html/gnome-xml/gnome-xml-valid.html
+share/gnome-xml/html/gnome-xml/gnome-xml-xml-error.html
+share/gnome-xml/html/gnome-xml/gnome-xml-xmlio.html
+share/gnome-xml/html/gnome-xml/gnome-xml-xmlmemory.html
+share/gnome-xml/html/gnome-xml/gnome-xml-xpath.html
+share/gnome-xml/html/gnome-xml/index.sgml
+share/gnome-xml/html/gnome-xml/libxml-lib.html
+share/gnome-xml/html/gnome-xml/libxml-notes.html
+share/gnome-xml/html/gnome-xml/structure.gif
+share/gnome-xml/html/gnome-xml/xml.html
+@dirrm share/gnome-xml/html/gnome-xml
+@dirrm share/gnome-xml/html
 @dirrm share/gnome-xml
 @dirrm include/gnome-xml