Update libxml2 to 2.3.3 and libxslt to 0.4.0 (updates rely on each other)

7 files changed, 25 insertions, 31 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 42fca8cbe1c4..335103fe3d63 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.3.0
-PORTREVISION=	1
+PORTVERSION=	2.3.3
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libxml
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 0ee74f725508..40e23ecb2119 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1 +1 @@
-MD5 (libxml2-2.3.0.tar.gz) = 6d95744d6401036d6c06f82956b6ba06
+MD5 (libxml2-2.3.3.tar.gz) = ba3cbd73f9336a8eae89a306a4ee2f48
diff --git a/textproc/libxml2/files/patch-ab b/textproc/libxml2/files/patch-ab
index 752788d6c57b..21cc214b6e21 100644
--- a/textproc/libxml2/files/patch-ab
+++ b/textproc/libxml2/files/patch-ab
@@ -1,32 +1,26 @@
-
-$FreeBSD$
-
---- configure.orig	Thu Feb  8 13:39:59 2001
-+++ configure	Fri Feb  9 23:40:58 2001
-@@ -3474,7 +3474,7 @@
- 
- 
+--- configure.orig	Thu Mar  1 11:00:11 2001
++++ configure	Thu Mar  8 22:11:26 2001
+@@ -3479,3 +3479,3 @@
  XML_LIBDIR='-L${libdir}'
 -XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}'
 +XML_INCLUDEDIR='-I${includedir}/libxml2 -I${includedir}/libxml2/libxml'
  XML_LIBS="-lxml2 $Z_LIBS $M_LIBS $LIBS"
- 
- XML_CFLAGS=""
-@@ -3871,7 +3871,7 @@
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
+@@ -3875,3 +3875,3 @@
      builtin and then its argument prototype would still apply.  */
--char $ac_func();
-+char lib$ac_func();
+-char iconv();
++char libiconv();
  
- int main() {
- 
-@@ -3881,7 +3881,7 @@
- #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
+@@ -3885,3 +3885,3 @@
  #else
--$ac_func();
-+lib$ac_func();
+-iconv();
++libiconv();
  #endif
+@@ -3921,6 +3921,6 @@
+     builtin and then its argument prototype would still apply.  */
+-char iconv();
++char libiconv();
  
+ int main() {
+-iconv()
++libiconv()
  ; return 0; }
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index 40185e94f8e4..2fb3f6850d0c 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -8,6 +8,7 @@ include/libxml2/libxml/debugXML.h
 include/libxml2/libxml/encoding.h
 include/libxml2/libxml/entities.h
 include/libxml2/libxml/hash.h
+include/libxml2/libxml/list.h
 include/libxml2/libxml/nanoftp.h
 include/libxml2/libxml/nanohttp.h
 include/libxml2/libxml/parser.h
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index cbbd694667db..f2f7d4f6fcf6 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libxslt
-PORTVERSION=	0.1.0
+PORTVERSION=	0.4.0
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/libxslt
@@ -18,9 +18,6 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-
-pre-patch:
-	@find ${WRKSRC} -type f -name "*.[ch]" | \
-		xargs ${PERL} -pi -e 's|libxml/|libxml2/|'
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 
 .include <bsd.port.mk>
diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo
index 746c9f79489d..044f03d5a98e 100644
--- a/textproc/libxslt/distinfo
+++ b/textproc/libxslt/distinfo
@@ -1 +1 @@
-MD5 (libxslt-0.1.0.tar.gz) = b9b9cc8c127eba9b8f7608d9606bf164
+MD5 (libxslt-0.4.0.tar.gz) = 2efb2f1865eecca50b55db1ef885368c
diff --git a/textproc/libxslt/pkg-plist b/textproc/libxslt/pkg-plist
index 2649d2a4da26..1b37f7ab1578 100644
--- a/textproc/libxslt/pkg-plist
+++ b/textproc/libxslt/pkg-plist
@@ -2,6 +2,9 @@ bin/xslt-config
 bin/xsltproc
 etc/xsltConf.sh
 include/libxslt/attributes.h
+include/libxslt/documents.h
+include/libxslt/extensions.h
+include/libxslt/extra.h
 include/libxslt/functions.h
 include/libxslt/imports.h
 include/libxslt/keys.h