Update to 2.4.1.

4 files changed, 35 insertions, 31 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 244018e44545..17c559278d7a 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.1
 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 20ba6ba05476..7041f2c10844 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1 +1 @@
-MD5 (libxml2-2.4.0.tar.gz) = 38634715dd81ceb2a69bac3da8b5e56c
+MD5 (libxml2-2.4.1.tar.gz) = 647353d22bb1bfc77a1f54f1b012ec45
diff --git a/textproc/libxml2/files/patch-ab b/textproc/libxml2/files/patch-ab
index 5f2557587a38..10c25c830586 100644
--- a/textproc/libxml2/files/patch-ab
+++ b/textproc/libxml2/files/patch-ab
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Jul 10 18:51:46 2001
-+++ configure	Wed Jul 11 10:25:59 2001
-@@ -3569,7 +3569,7 @@
+--- configure.orig	Mon Jul 23 22:40:34 2001
++++ configure	Mon Jul 30 15:39:38 2001
+@@ -3571,7 +3572,7 @@
  
  
  XML_LIBDIR='-L${libdir}'
@@ -12,37 +12,27 @@ $FreeBSD$
  
  XML_CFLAGS=""
  RDL_LIBS=""
-@@ -4020,16 +4020,16 @@
- 	ICONV_LIBS="-L$with_iconv/lib"
+@@ -4034,15 +4035,15 @@
      fi
  
--    ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
+     ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
--echo "configure:4026: checking for iconv.h" >&5
-+    ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
+-echo "configure:4039: checking for iconv.h" >&5
 +echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
-+echo "configure:4026: checking for giconv.h" >&5
++echo "configure:4039: checking for giconv.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 4031 "configure"
+ #line 4044 "configure"
  #include "confdefs.h"
 -#include <iconv.h>
 +#include <giconv.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:4036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -4048,17 +4048,17 @@
- fi
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  echo $ac_n "checking for iconv""... $ac_c" 1>&6
--echo "configure:4053: checking for iconv" >&5
-+  echo $ac_n "checking for libiconv""... $ac_c" 1>&6
-+echo "configure:4053: checking for libiconv" >&5
- 	cat > conftest.$ac_ext <<EOF
- #line 4055 "configure"
+ { (eval echo configure:4049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -4067,11 +4068,11 @@
+ #line 4068 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
 -#include <iconv.h>
@@ -54,15 +44,15 @@ $FreeBSD$
 +libiconv (cd, NULL, NULL, NULL, NULL);
  ; return 0; }
  EOF
- if { (eval echo configure:4065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -4072,23 +4072,23 @@
+ if { (eval echo configure:4078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -4085,23 +4086,23 @@
    rm -rf conftest*
    
  	    echo "$ac_t""no" 1>&6
 -	    echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
--echo "configure:4077: checking for iconv in -liconv" >&5
-+	    echo $ac_n "checking for libiconv in -lgiconv""... $ac_c" 1>&6
-+echo "configure:4077: checking for libiconv in -lgiconv" >&5
+-echo "configure:4090: checking for iconv in -liconv" >&5
++	    echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
++echo "configure:4090: checking for iconv in -lgiconv" >&5
  
  	    _ldflags="${LDFLAGS}"
  	    _libs="${LIBS}"
@@ -71,7 +61,7 @@ $FreeBSD$
 +	    LIBS="${LIBS} -lgiconv"
  
  	    cat > conftest.$ac_ext <<EOF
- #line 4085 "configure"
+ #line 4098 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
 -#include <iconv.h>
@@ -83,8 +73,8 @@ $FreeBSD$
 +libiconv (cd, NULL, NULL, NULL, NULL);
  ; return 0; }
  EOF
- if { (eval echo configure:4095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -4096,7 +4096,7 @@
+ if { (eval echo configure:4108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -4109,7 +4110,7 @@
    
  		echo "$ac_t""yes" 1>&6
  		WITH_ICONV=1
diff --git a/textproc/libxml2/files/patch-config.h.in b/textproc/libxml2/files/patch-config.h.in
new file mode 100644
index 000000000000..137b7498c39d
--- /dev/null
+++ b/textproc/libxml2/files/patch-config.h.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- config.h.in	2001/07/30 12:43:27	1.1
++++ config.h.in	2001/07/30 12:44:21
+@@ -1,5 +1,8 @@
+ /* config.h.in.  Generated automatically from configure.in by autoheader.  */
+ 
++/* XXX */
++#define HAVE_VFSCANF
++
+ /* Define if you have the strftime function.  */
+ #undef HAVE_STRFTIME
+