Upgrade from 2.4.1 to 2.4.2... I let the maintainers know a couple of

days ago, but the entire maintership (gnome@) is quiet...

Reviewed by:	maintainers' silence

5 files changed, 19 insertions, 108 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 17c559278d7a..9d7711d963e1 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libxml
@@ -17,14 +17,17 @@ BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
-USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+MAKE_FLAGS+=	LIBTOOL="${LIBTOOL}" -ELIBTOOL
+.if defined(MAKE_JOBS)
+MAKE_FLAGS+=	AM_MAKEFLAGS=-j${MAKE_JOBS}
+.endif
 
 CONFIGURE_ARGS=	--with-iconv \
 		--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lgiconv"
+		LIBS="-L${LOCALBASE}/lib"
 
 MAN1=		xml2-config.1 xmllint.1
 MAN4=		libxml.4
@@ -33,4 +36,9 @@ pre-patch:
 	@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
 		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
 
+post-patch:
+	@${PERL} -pi -e 's/([^g])iconv.h/\1giconv.h/g;' \
+		-e 's/-liconv/-lgiconv/g' ${WRKSRC}/${CONFIGURE_SCRIPT} \
+		${WRKSRC}/include/libxml/encoding.h
+
 .include <bsd.port.mk>
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 7041f2c10844..654e02202fc9 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1 +1 @@
-MD5 (libxml2-2.4.1.tar.gz) = 647353d22bb1bfc77a1f54f1b012ec45
+MD5 (libxml2-2.4.2.tar.gz) = 1b05a325cd6128eb1aa3c06e22cafb12
diff --git a/textproc/libxml2/files/patch-aa b/textproc/libxml2/files/patch-aa
index 78c051c731a2..fc979368da68 100644
--- a/textproc/libxml2/files/patch-aa
+++ b/textproc/libxml2/files/patch-aa
@@ -1,32 +1,20 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Thu Feb  8 13:47:28 2001
-+++ Makefile.in	Fri Feb  9 02:04:41 2001
-@@ -124,7 +124,7 @@
+--- work/libxml2-2.4.2/Makefile.in	Wed Aug 15 08:26:06 2001
++++ Makefile.in	Thu Aug 23 17:02:39 2001
+@@ -137,5 +137,5 @@
  lib_LTLIBRARIES = libxml2.la
- libxml2_la_LIBADD = @Z_LIBS@
+-libxml2_la_LIBADD = @Z_LIBS@ -lm
++libxml2_la_LIBADD = @Z_LIBS@ -lm @ICONV_LIBS@
  
 -libxml2_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
 +libxml2_la_LDFLAGS = -version-info 5:0:0
  
- libxml2_la_SOURCES =  		SAX.c 		entities.c 		encoding.c 		error.c 		parserInternals.c 		parser.c 		tree.c 		hash.c 		xmlIO.c 		xmlmemory.c 		uri.c 		valid.c 		xlink.c 		HTMLparser.c 		HTMLtree.c 		debugXML.c 		xpath.c 		xpointer.c 		xinclude.c 		nanohttp.c 		nanoftp.c
- 
-@@ -162,7 +162,7 @@
- testURI_DEPENDENCIES = $(DEPS)
- testURI_LDADD = $(LDADDS)
+@@ -187,3 +187,3 @@
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = xml2Conf.sh
- 
- CLEANFILES = xml2Conf.sh
-@@ -836,7 +836,7 @@
- 		uninstall-confexecDATA uninstall-m4dataDATA \
- 		uninstall-pkgconfigDATA
+@@ -772,3 +772,3 @@
  uninstall: uninstall-recursive
 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
 +all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
  		config.h
- all-redirect: all-recursive-am
- install-strip:
diff --git a/textproc/libxml2/files/patch-ab b/textproc/libxml2/files/patch-ab
index 10c25c830586..b46b50db40f3 100644
--- a/textproc/libxml2/files/patch-ab
+++ b/textproc/libxml2/files/patch-ab
@@ -12,74 +12,3 @@ $FreeBSD$
  
  XML_CFLAGS=""
  RDL_LIBS=""
-@@ -4034,15 +4035,15 @@
-     fi
- 
-     ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
--echo "configure:4039: checking for iconv.h" >&5
-+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
-+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 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: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>
-+#include <giconv.h>
- int main() {
- 
- iconv_t cd = iconv_open ("","");
--iconv (cd, NULL, NULL, NULL, NULL);
-+libiconv (cd, NULL, NULL, NULL, NULL);
- ; return 0; }
- EOF
- 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: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}"
- 	    LDFLAGS="${LDFLAGS} ${ICONV_LIBS}"
--	    LIBS="${LIBS} -liconv"
-+	    LIBS="${LIBS} -lgiconv"
- 
- 	    cat > conftest.$ac_ext <<EOF
- #line 4098 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
--#include <iconv.h>
-+#include <giconv.h>
- int main() {
- 
- iconv_t cd = iconv_open ("","");
--iconv (cd, NULL, NULL, NULL, NULL);
-+libiconv (cd, NULL, NULL, NULL, NULL);
- ; return 0; }
- EOF
- 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
--		ICONV_LIBS="${ICONV_LIBS} -liconv"
-+		ICONV_LIBS="${ICONV_LIBS} -lgiconv"
- 		LIBS="${_libs}"
- 		LDFLAGS="${_ldflags}"
- else
diff --git a/textproc/libxml2/files/patch-ae b/textproc/libxml2/files/patch-ae
deleted file mode 100644
index 00fd712110b4..000000000000
--- a/textproc/libxml2/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- include/libxml/encoding.h	2001/02/09 21:35:22	1.1
-+++ include/libxml/encoding.h	2001/02/09 21:35:37
-@@ -23,7 +23,7 @@
- 
- #include <libxml/xmlversion.h>
- #ifdef LIBXML_ICONV_ENABLED
--#include <iconv.h>
-+#include <giconv.h>
- #endif
- #include <libxml/tree.h>
-