- upgrade to version 2.3.10

- support libiconv
- bump NEED_VERSION

textproc/libxml/Makefile

@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.21 2001/05/20 13:00:25 kevlo Exp $
+# $OpenBSD: Makefile,v 1.22 2001/06/19 04:43:37 kevlo Exp $
 
 COMMENT=	"XML parsing library"
 
-VERSION=	2.3.9
+VERSION=	2.3.10
 DISTNAME=	libxml2-${VERSION}
 PKGNAME=	libxml-${VERSION}
 CATEGORIES=	textproc
-NEED_VERSION=	1.384
+NEED_VERSION=	1.414
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR= stable/sources/libxml
 
@@ -21,7 +21,9 @@ PERMIT_DISTFILES_FTP=	Yes
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --enable-static --without-iconv
+CONFIGURE_ARGS+= --enable-static
 CONFIGURE_ARGS+= --with-html-dir="${PREFIX}/share"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -liconv"
 
 .include <bsd.port.mk>

textproc/libxml/files/md5

@@ -1,3 +1,3 @@
-MD5 (libxml2-2.3.9.tar.gz) = e436e69347c52f7a398edbd504440ac4
-RMD160 (libxml2-2.3.9.tar.gz) = 027cc06708d25f9cfa9d47ee85424b96d4930ac1
-SHA1 (libxml2-2.3.9.tar.gz) = 983db84ba0ba998d87afe19cf196e9bd0072037e
+MD5 (libxml2-2.3.10.tar.gz) = 8625086f7134417d530527c1efbb756b
+RMD160 (libxml2-2.3.10.tar.gz) = 771156065ec329d995c0b8ab5e3076fede9bc537
+SHA1 (libxml2-2.3.10.tar.gz) = 38118492ee39adfc877f67c1b6d1090439a5f17a

textproc/libxml/patches/patch-configure

@@ -0,0 +1,33 @@
+--- configure.orig	Tue Jun 19 12:31:45 2001
++++ configure	Tue Jun 19 12:32:12 2001
+@@ -4026,7 +4026,7 @@
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char iconv();
++char libiconv();
+ 
+ int main() {
+ 
+@@ -4036,7 +4036,7 @@
+ #if defined (__stub_iconv) || defined (__stub___iconv)
+ choke me
+ #else
+-iconv();
++libiconv();
+ #endif
+ 
+ ; return 0; }
+@@ -4072,10 +4072,10 @@
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char iconv();
++char libiconv();
+ 
+ int main() {
+-iconv()
++libiconv()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:4082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

textproc/libxml/patches/patch-doc_Makefile_in

@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	Sun Apr  8 04:24:52 2001
-+++ doc/Makefile.in	Fri Apr 13 14:59:59 2001
-@@ -113,7 +113,7 @@ XPTR_OBJ = @XPTR_OBJ@
+--- doc/Makefile.in.orig	Tue Jun 19 11:07:12 2001
++++ doc/Makefile.in	Tue Jun 19 11:07:52 2001
+@@ -118,7 +118,7 @@
  Z_CFLAGS = @Z_CFLAGS@
  Z_LIBS = @Z_LIBS@
  
@@ -9,7 +9,7 @@
  
  # The top-level SGML file.
  DOC_MAIN_SGML_FILE = gnome-xml.sgml
-@@ -262,7 +262,6 @@ install-data-local: 
+@@ -267,7 +267,6 @@
  	-@INSTALL@ -m 0644 $(srcdir)/xml.html $(srcdir)/encoding.html $(srcdir)/FAQ.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(DESTDIR)$(TARGET_DIR)
  	-@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)
  	-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)

textproc/libxml/pkg/PFRAG.shared

@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.10 2001/05/20 13:00:31 kevlo Exp $
-lib/libxml2.so.5.9
+@comment $OpenBSD: PFRAG.shared,v 1.11 2001/06/19 04:43:45 kevlo Exp $
+lib/libxml2.so.5.10
 DYNLIBDIR(%B)