Update to 2.2.5

4 files changed, 22 insertions, 18 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index e88e47c9e2b1..5bb3d3f9d456 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION= 	2.2.4
+PORTVERSION= 	2.2.5
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libxml
@@ -23,7 +23,7 @@ CONFIGURE_ARGS=	--with-iconv
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -liconv"
 
-MAN1=		xmllint.1
+MAN1=		xml-config.1 xmllint.1
 MAN4=		libxml.4
 
 .include <bsd.port.mk>
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 8b89d5dee444..39dd27e37121 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1 +1 @@
-MD5 (libxml2-2.2.4.tar.gz) = ab58a500c6984ca7671d4118116fb076
+MD5 (libxml2-2.2.5.tar.gz) = fedc45974248514d40c3fa3a682e2325
diff --git a/textproc/libxml2/files/patch-aa b/textproc/libxml2/files/patch-aa
index eaa30d4bec50..31fc3d93ddfc 100644
--- a/textproc/libxml2/files/patch-aa
+++ b/textproc/libxml2/files/patch-aa
@@ -1,34 +1,35 @@
---- Makefile.in.orig	Sun Oct  1 15:33:56 2000
-+++ Makefile.in	Tue Oct  3 10:13:43 2000
-@@ -122,3 +122,3 @@
+--- Makefile.in.orig	Sun Oct 15 15:37:34 2000
++++ Makefile.in	Sun Oct 15 16:55:55 2000
+@@ -124,3 +124,3 @@
  
 -libxml_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
 +libxml_la_LDFLAGS = -version-info 5:0:0
  
-@@ -163,3 +163,3 @@
+@@ -161,3 +161,3 @@
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = xmlConf.sh
-@@ -207,3 +207,3 @@
+@@ -204,3 +204,3 @@
  NROFF = nroff
 -DATA =  $(confexec_DATA) $(pkgconfig_DATA)
 +DATA =  $(confexec_DATA)
  
-@@ -803,3 +803,3 @@
+@@ -782,3 +782,3 @@
  
--install-data-am: install-man install-pkgconfigDATA install-xmlincHEADERS
-+install-data-am: install-man install-xmlincHEADERS
+-install-data-am: install-man install-pkgconfigDATA
++install-data-am: install-man
  install-data: install-data-recursive
-@@ -814,3 +814,3 @@
+@@ -792,3 +792,3 @@
  uninstall: uninstall-recursive
 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
 +all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
- 		$(HEADERS) config.h
-@@ -824,3 +824,3 @@
- 		$(DESTDIR)$(mandir)/man4 $(DESTDIR)$(confexecdir) \
--		$(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(xmlincdir)
-+		$(DESTDIR)$(xmlincdir)
+ 		config.h
+@@ -801,4 +801,3 @@
+ 		$(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 \
+-		$(DESTDIR)$(mandir)/man4 $(DESTDIR)$(confexecdir) \
+-		$(DESTDIR)$(pkgconfigdir)
++		$(DESTDIR)$(mandir)/man4 $(DESTDIR)$(confexecdir)
  
 --- doc/Makefile.in.orig	Thu Feb 25 13:01:51 1999
 +++ doc/Makefile.in	Tue Mar  2 20:39:23 1999
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index 17ba48365a61..31fe9e6d238b 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -15,11 +15,13 @@ include/libxml/tree.h
 include/libxml/uri.h
 include/libxml/valid.h
 include/libxml/xlink.h
-include/libxml/xml-error.h
 include/libxml/xmlIO.h
+include/libxml/xmlerror.h
 include/libxml/xmlmemory.h
 include/libxml/xmlversion.h
+include/libxml/xmlversion.h.in
 include/libxml/xpath.h
+include/libxml/xpointer.h
 lib/libxml.a
 lib/libxml.so
 lib/libxml.so.5
@@ -45,6 +47,7 @@ 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/gnome-xml-xpointer.html
 share/gnome-xml/index.sgml
 share/gnome-xml/libxml-lib.html
 share/gnome-xml/libxml-notes.html