- Correct linking with libiconv

- USE_ICONV instead of direct dependency
- USE_REINPLACE instead of cp/sed
- GNU_CONFIGURE -> HAS_CONFIGURE

PR:		ports/64149
Submitted by:	Bjoern A. Zeeb <bzeeb+freebsdports@zabbadoz.net>

6 files changed, 387 insertions, 45 deletions

diff --git a/textproc/xerces-c2-devel/Makefile b/textproc/xerces-c2-devel/Makefile
index 205f7149968..1b8d9cf1e27 100644
--- a/textproc/xerces-c2-devel/Makefile
+++ b/textproc/xerces-c2-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xerces-c2
 PORTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_APACHE_XML}
 MASTER_SITE_SUBDIR=	xerces-c/source
@@ -16,8 +17,11 @@ MAINTAINER=	bzeeb+freebsdports@zabbadoz.net
 COMMENT=	Validating XML parser from the Apache XML Project
 
 .if !defined(TRANSCODER)
-LIB_DEPENDS+=		iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=		yes
 TRANSCODER=		"IconvFBSD"
+ICONVROOT?=		${LOCALBASE}
+CONFIGURE_ENV+=		ICONVROOT=${ICONVROOT}
+MAKE_ENV+=		ICONVROOT=${ICONVROOT}
 PLIST_SUB+=		TRANSICONV=""
 PLIST_SUB+=		TRANSICU="@comment "
 .else
@@ -25,8 +29,8 @@ PLIST_SUB+=		TRANSICU="@comment "
 PKGNAMESUFFIX+=		-icu2
 LIB_DEPENDS+=		icuuc.28:${PORTSDIR}/devel/icu2
 ICUROOT?=		${LOCALBASE}
-CONFIGURE_ENV+=		ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib"
-MAKE_ENV+=		ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=		ICUROOT=${ICUROOT}
+MAKE_ENV+=		ICUROOT=${ICUROOT}
 PLIST_SUB+=		TRANSICONV="@comment "
 PLIST_SUB+=		TRANSICU=""
 .elif (${TRANSCODER} == "native")
@@ -34,8 +38,11 @@ PKGNAMESUFFIX+=		-native
 PLIST_SUB+=		TRANSICONV=""
 PLIST_SUB+=		TRANSICU="@comment "
 .else
-LIB_DEPENDS+=		iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=		yes
 TRANSCODER=		"IconvFBSD"
+ICONVROOT?=		${LOCALBASE}
+CONFIGURE_ENV+=		ICONVROOT=${ICONVROOT}
+MAKE_ENV+=		ICONVROOT=${ICONVROOT}
 PLIST_SUB+=		TRANSICONV=""
 PLIST_SUB+=		TRANSICU="@comment "
 .endif
@@ -50,10 +57,11 @@ CONFIGURE_WRKSRC=	${XERCESWRKSRC}
 BUILD_WRKSRC=		${XERCESWRKSRC}
 INSTALL_WRKSRC=		${XERCESWRKSRC}
 
+USE_REINPLACE=		yes
 USE_GMAKE=		yes
 MAKE_ENV+=		XERCESCROOT=${WRKSRC}
 
-GNU_CONFIGURE=		yes
+HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		XERCESCROOT=${WRKSRC} TRANSCODER=${TRANSCODER}
 CONFIGURE_SCRIPT=	runConfigure
 CONFIGURE_ARGS+=	-p freebsd -c ${CC} -x ${CXX} -n socket -P ${PREFIX}
@@ -127,10 +135,7 @@ pre-everything::
 .endif
 
 post-patch:
-	@${CP} ${WRKSRC}/src/xercesc/Makefile.incl \
-		${WRKSRC}/src/xercesc/Makefile.incl.Dist
-	@${SED} -e 's#CP = -cp -p#CP = -cp#' \
-		${WRKSRC}/src/xercesc/Makefile.incl.Dist > \
+	@${REINPLACE_CMD} -e 's#CP = -cp -p#CP = -cp#'	\
 		${WRKSRC}/src/xercesc/Makefile.incl
 
 pre-configure:
diff --git a/textproc/xerces-c2-devel/files/patch-aa b/textproc/xerces-c2-devel/files/patch-aa
index 3bc4dea4baa..e058afbec12 100644
--- a/textproc/xerces-c2-devel/files/patch-aa
+++ b/textproc/xerces-c2-devel/files/patch-aa
@@ -1,6 +1,6 @@
---- samples/runConfigure.orig	Mon May 12 09:44:18 2003
-+++ samples/runConfigure	Tue Feb 17 20:26:46 2004
-@@ -262,8 +262,13 @@ else
+--- samples/runConfigure.orig	Tue Jan 13 19:42:18 2004
++++ samples/runConfigure	Thu Mar 11 17:11:03 2004
+@@ -271,8 +271,13 @@
                 ;;
          esac
      elif test $platform = "freebsd"; then
@@ -16,9 +16,48 @@
      elif test $platform = "netbsd"; then
          threadingLibs="-pthread"
          threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
---- src/xercesc/runConfigure.orig	Tue Feb 17 20:05:09 2004
-+++ src/xercesc/runConfigure	Tue Feb 17 20:27:13 2004
-@@ -303,8 +303,13 @@ else
+@@ -390,38 +395,6 @@
+ #
+ BITSTOBUILD=$bitsToBuild
+ export BITSTOBUILD
+-
+-#
+-# Special test for libiconv necessity under FreeBSD
+-#
+-transcodingLibs=""       # by default don't suppose the libiconv is necessary
+-transcodingDefines=""
+-if test $platform = "freebsd"; then
+-    if test -n "${XERCESCROOT}"; then
+-       # try lookup the configuration results
+-       . "${XERCESCROOT}/version.incl"
+-       SOLIBNAME=libxerces-c.so.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
+-       if test -f "${XERCESCROOT}/src/xercesc/config.log" ; then
+-           if grep XML_USE_LIBICONV "${XERCESCROOT}/src/xercesc/config.log" \
+-              > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       elif test -f "${XERCESCROOT}/obj/FREEBSD/IconvFBSDTransService.o" ; then
+-           if nm "${XERCESCROOT}/obj/FREEBSD/IconvFBSDTransService.o" | \
+-              grep iconv_open > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       elif test -f "${XERCESCROOT}/lib/${SOLIBNAME}" ; then
+-           if nm "${XERCESCROOT}/lib/${SOLIBNAME}" | \
+-              grep iconv_open > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       fi
+-    fi
+-fi
+ 
+ #
+ # Set the C compiler and C++ compiler environment variables
+--- src/xercesc/runConfigure.orig	Wed Feb  4 13:26:44 2004
++++ src/xercesc/runConfigure	Thu Mar 11 17:10:00 2004
+@@ -319,8 +319,13 @@
                 ;;
          esac
      elif test $platform = "freebsd"; then
@@ -33,3 +72,73 @@
      elif test $platform = "netbsd"; then
          threadingLibs="-pthread -lpthread"
          threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
+@@ -467,7 +472,11 @@
+        TRANSCODER=Uniconv390 ;;
+    IconvFBSD)
+        TRANSCODER=IconvFBSD ;
+-       transcodingDefines="-DXML_USE_LIBICONV -I/usr/local/include" ;;
++       transcodingDefines="-DXML_USE_LIBICONV -I/usr/local/include" ;
++       if test ${ICONVROOT}o != "o"; then
++	       ICONVROOT=/usr/local
++       fi
++       transcodingLibs="-L${ICONVROOT} -L${ICONVROOT}/lib -liconv" ;;
+    IconvGNU)
+        TRANSCODER=IconvGNU ;
+        transcodingDefines="-DXML_USE_GNU_TRANSCODER -I/usr/local/include" ;;
+--- tests/runConfigure.orig	Thu Mar 11 17:11:09 2004
++++ tests/runConfigure	Thu Mar 11 17:12:03 2004
+@@ -270,8 +270,13 @@
+                ;;
+         esac
+     elif test $platform = "freebsd"; then
+-        threadingLibs="-pthread -lc_r"
+-        threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
++      if test -n "${PTHREAD_LIBS}" ; then
++        threadingLibs="${PTHREAD_LIBS}"
++        threadingDefines="${PTHREAD_CFLAGS} -DXML_USE_PTHREADS"
++      else
++        threadingLibs="-lpthread"
++        threadingDefines="-DXML_USE_PTHREADS"
++      fi
+     elif test $platform = "netbsd"; then
+         threadingLibs="-pthread"
+         threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
+@@ -389,38 +394,6 @@
+ #
+ BITSTOBUILD=$bitsToBuild
+ export BITSTOBUILD
+-
+-#
+-# Special test for libiconv necessity under FreeBSD
+-#
+-transcodingLibs=""       # by default don't suppose the libiconv is necessary
+-transcodingDefines=""
+-if test $platform = "freebsd"; then
+-    if test -n "${XERCESCROOT}"; then
+-       # try lookup the configuration results
+-       . "${XERCESCROOT}/version.incl"
+-       SOLIBNAME=libxerces-c.so.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
+-       if test -f "${XERCESCROOT}/src/xercesc/config.log" ; then
+-           if grep XML_USE_LIBICONV "${XERCESCROOT}/src/xercesc/config.log" \
+-              > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       elif test -f "${XERCESCROOT}/obj/FREEBSD/IconvFBSDTransService.o" ; then
+-           if nm "${XERCESCROOT}/obj/FREEBSD/IconvFBSDTransService.o" | \
+-              grep iconv_open > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       elif test -f "${XERCESCROOT}/lib/${SOLIBNAME}" ; then
+-           if nm "${XERCESCROOT}/lib/${SOLIBNAME}" | \
+-              grep iconv_open > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       fi
+-    fi
+-fi
+ 
+ #
+ # Set the C compiler and C++ compiler environment variables
diff --git a/textproc/xerces-c2/Makefile b/textproc/xerces-c2/Makefile
index 205f7149968..1b8d9cf1e27 100644
--- a/textproc/xerces-c2/Makefile
+++ b/textproc/xerces-c2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xerces-c2
 PORTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_APACHE_XML}
 MASTER_SITE_SUBDIR=	xerces-c/source
@@ -16,8 +17,11 @@ MAINTAINER=	bzeeb+freebsdports@zabbadoz.net
 COMMENT=	Validating XML parser from the Apache XML Project
 
 .if !defined(TRANSCODER)
-LIB_DEPENDS+=		iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=		yes
 TRANSCODER=		"IconvFBSD"
+ICONVROOT?=		${LOCALBASE}
+CONFIGURE_ENV+=		ICONVROOT=${ICONVROOT}
+MAKE_ENV+=		ICONVROOT=${ICONVROOT}
 PLIST_SUB+=		TRANSICONV=""
 PLIST_SUB+=		TRANSICU="@comment "
 .else
@@ -25,8 +29,8 @@ PLIST_SUB+=		TRANSICU="@comment "
 PKGNAMESUFFIX+=		-icu2
 LIB_DEPENDS+=		icuuc.28:${PORTSDIR}/devel/icu2
 ICUROOT?=		${LOCALBASE}
-CONFIGURE_ENV+=		ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib"
-MAKE_ENV+=		ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=		ICUROOT=${ICUROOT}
+MAKE_ENV+=		ICUROOT=${ICUROOT}
 PLIST_SUB+=		TRANSICONV="@comment "
 PLIST_SUB+=		TRANSICU=""
 .elif (${TRANSCODER} == "native")
@@ -34,8 +38,11 @@ PKGNAMESUFFIX+=		-native
 PLIST_SUB+=		TRANSICONV=""
 PLIST_SUB+=		TRANSICU="@comment "
 .else
-LIB_DEPENDS+=		iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=		yes
 TRANSCODER=		"IconvFBSD"
+ICONVROOT?=		${LOCALBASE}
+CONFIGURE_ENV+=		ICONVROOT=${ICONVROOT}
+MAKE_ENV+=		ICONVROOT=${ICONVROOT}
 PLIST_SUB+=		TRANSICONV=""
 PLIST_SUB+=		TRANSICU="@comment "
 .endif
@@ -50,10 +57,11 @@ CONFIGURE_WRKSRC=	${XERCESWRKSRC}
 BUILD_WRKSRC=		${XERCESWRKSRC}
 INSTALL_WRKSRC=		${XERCESWRKSRC}
 
+USE_REINPLACE=		yes
 USE_GMAKE=		yes
 MAKE_ENV+=		XERCESCROOT=${WRKSRC}
 
-GNU_CONFIGURE=		yes
+HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		XERCESCROOT=${WRKSRC} TRANSCODER=${TRANSCODER}
 CONFIGURE_SCRIPT=	runConfigure
 CONFIGURE_ARGS+=	-p freebsd -c ${CC} -x ${CXX} -n socket -P ${PREFIX}
@@ -127,10 +135,7 @@ pre-everything::
 .endif
 
 post-patch:
-	@${CP} ${WRKSRC}/src/xercesc/Makefile.incl \
-		${WRKSRC}/src/xercesc/Makefile.incl.Dist
-	@${SED} -e 's#CP = -cp -p#CP = -cp#' \
-		${WRKSRC}/src/xercesc/Makefile.incl.Dist > \
+	@${REINPLACE_CMD} -e 's#CP = -cp -p#CP = -cp#'	\
 		${WRKSRC}/src/xercesc/Makefile.incl
 
 pre-configure:
diff --git a/textproc/xerces-c2/files/patch-aa b/textproc/xerces-c2/files/patch-aa
index 3bc4dea4baa..e058afbec12 100644
--- a/textproc/xerces-c2/files/patch-aa
+++ b/textproc/xerces-c2/files/patch-aa
@@ -1,6 +1,6 @@
---- samples/runConfigure.orig	Mon May 12 09:44:18 2003
-+++ samples/runConfigure	Tue Feb 17 20:26:46 2004
-@@ -262,8 +262,13 @@ else
+--- samples/runConfigure.orig	Tue Jan 13 19:42:18 2004
++++ samples/runConfigure	Thu Mar 11 17:11:03 2004
+@@ -271,8 +271,13 @@
                 ;;
          esac
      elif test $platform = "freebsd"; then
@@ -16,9 +16,48 @@
      elif test $platform = "netbsd"; then
          threadingLibs="-pthread"
          threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
---- src/xercesc/runConfigure.orig	Tue Feb 17 20:05:09 2004
-+++ src/xercesc/runConfigure	Tue Feb 17 20:27:13 2004
-@@ -303,8 +303,13 @@ else
+@@ -390,38 +395,6 @@
+ #
+ BITSTOBUILD=$bitsToBuild
+ export BITSTOBUILD
+-
+-#
+-# Special test for libiconv necessity under FreeBSD
+-#
+-transcodingLibs=""       # by default don't suppose the libiconv is necessary
+-transcodingDefines=""
+-if test $platform = "freebsd"; then
+-    if test -n "${XERCESCROOT}"; then
+-       # try lookup the configuration results
+-       . "${XERCESCROOT}/version.incl"
+-       SOLIBNAME=libxerces-c.so.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
+-       if test -f "${XERCESCROOT}/src/xercesc/config.log" ; then
+-           if grep XML_USE_LIBICONV "${XERCESCROOT}/src/xercesc/config.log" \
+-              > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       elif test -f "${XERCESCROOT}/obj/FREEBSD/IconvFBSDTransService.o" ; then
+-           if nm "${XERCESCROOT}/obj/FREEBSD/IconvFBSDTransService.o" | \
+-              grep iconv_open > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       elif test -f "${XERCESCROOT}/lib/${SOLIBNAME}" ; then
+-           if nm "${XERCESCROOT}/lib/${SOLIBNAME}" | \
+-              grep iconv_open > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       fi
+-    fi
+-fi
+ 
+ #
+ # Set the C compiler and C++ compiler environment variables
+--- src/xercesc/runConfigure.orig	Wed Feb  4 13:26:44 2004
++++ src/xercesc/runConfigure	Thu Mar 11 17:10:00 2004
+@@ -319,8 +319,13 @@
                 ;;
          esac
      elif test $platform = "freebsd"; then
@@ -33,3 +72,73 @@
      elif test $platform = "netbsd"; then
          threadingLibs="-pthread -lpthread"
          threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
+@@ -467,7 +472,11 @@
+        TRANSCODER=Uniconv390 ;;
+    IconvFBSD)
+        TRANSCODER=IconvFBSD ;
+-       transcodingDefines="-DXML_USE_LIBICONV -I/usr/local/include" ;;
++       transcodingDefines="-DXML_USE_LIBICONV -I/usr/local/include" ;
++       if test ${ICONVROOT}o != "o"; then
++	       ICONVROOT=/usr/local
++       fi
++       transcodingLibs="-L${ICONVROOT} -L${ICONVROOT}/lib -liconv" ;;
+    IconvGNU)
+        TRANSCODER=IconvGNU ;
+        transcodingDefines="-DXML_USE_GNU_TRANSCODER -I/usr/local/include" ;;
+--- tests/runConfigure.orig	Thu Mar 11 17:11:09 2004
++++ tests/runConfigure	Thu Mar 11 17:12:03 2004
+@@ -270,8 +270,13 @@
+                ;;
+         esac
+     elif test $platform = "freebsd"; then
+-        threadingLibs="-pthread -lc_r"
+-        threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
++      if test -n "${PTHREAD_LIBS}" ; then
++        threadingLibs="${PTHREAD_LIBS}"
++        threadingDefines="${PTHREAD_CFLAGS} -DXML_USE_PTHREADS"
++      else
++        threadingLibs="-lpthread"
++        threadingDefines="-DXML_USE_PTHREADS"
++      fi
+     elif test $platform = "netbsd"; then
+         threadingLibs="-pthread"
+         threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
+@@ -389,38 +394,6 @@
+ #
+ BITSTOBUILD=$bitsToBuild
+ export BITSTOBUILD
+-
+-#
+-# Special test for libiconv necessity under FreeBSD
+-#
+-transcodingLibs=""       # by default don't suppose the libiconv is necessary
+-transcodingDefines=""
+-if test $platform = "freebsd"; then
+-    if test -n "${XERCESCROOT}"; then
+-       # try lookup the configuration results
+-       . "${XERCESCROOT}/version.incl"
+-       SOLIBNAME=libxerces-c.so.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
+-       if test -f "${XERCESCROOT}/src/xercesc/config.log" ; then
+-           if grep XML_USE_LIBICONV "${XERCESCROOT}/src/xercesc/config.log" \
+-              > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       elif test -f "${XERCESCROOT}/obj/FREEBSD/IconvFBSDTransService.o" ; then
+-           if nm "${XERCESCROOT}/obj/FREEBSD/IconvFBSDTransService.o" | \
+-              grep iconv_open > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       elif test -f "${XERCESCROOT}/lib/${SOLIBNAME}" ; then
+-           if nm "${XERCESCROOT}/lib/${SOLIBNAME}" | \
+-              grep iconv_open > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       fi
+-    fi
+-fi
+ 
+ #
+ # Set the C compiler and C++ compiler environment variables
diff --git a/textproc/xerces-c27/Makefile b/textproc/xerces-c27/Makefile
index 205f7149968..1b8d9cf1e27 100644
--- a/textproc/xerces-c27/Makefile
+++ b/textproc/xerces-c27/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xerces-c2
 PORTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_APACHE_XML}
 MASTER_SITE_SUBDIR=	xerces-c/source
@@ -16,8 +17,11 @@ MAINTAINER=	bzeeb+freebsdports@zabbadoz.net
 COMMENT=	Validating XML parser from the Apache XML Project
 
 .if !defined(TRANSCODER)
-LIB_DEPENDS+=		iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=		yes
 TRANSCODER=		"IconvFBSD"
+ICONVROOT?=		${LOCALBASE}
+CONFIGURE_ENV+=		ICONVROOT=${ICONVROOT}
+MAKE_ENV+=		ICONVROOT=${ICONVROOT}
 PLIST_SUB+=		TRANSICONV=""
 PLIST_SUB+=		TRANSICU="@comment "
 .else
@@ -25,8 +29,8 @@ PLIST_SUB+=		TRANSICU="@comment "
 PKGNAMESUFFIX+=		-icu2
 LIB_DEPENDS+=		icuuc.28:${PORTSDIR}/devel/icu2
 ICUROOT?=		${LOCALBASE}
-CONFIGURE_ENV+=		ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib"
-MAKE_ENV+=		ICUROOT=${ICUROOT} LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=		ICUROOT=${ICUROOT}
+MAKE_ENV+=		ICUROOT=${ICUROOT}
 PLIST_SUB+=		TRANSICONV="@comment "
 PLIST_SUB+=		TRANSICU=""
 .elif (${TRANSCODER} == "native")
@@ -34,8 +38,11 @@ PKGNAMESUFFIX+=		-native
 PLIST_SUB+=		TRANSICONV=""
 PLIST_SUB+=		TRANSICU="@comment "
 .else
-LIB_DEPENDS+=		iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=		yes
 TRANSCODER=		"IconvFBSD"
+ICONVROOT?=		${LOCALBASE}
+CONFIGURE_ENV+=		ICONVROOT=${ICONVROOT}
+MAKE_ENV+=		ICONVROOT=${ICONVROOT}
 PLIST_SUB+=		TRANSICONV=""
 PLIST_SUB+=		TRANSICU="@comment "
 .endif
@@ -50,10 +57,11 @@ CONFIGURE_WRKSRC=	${XERCESWRKSRC}
 BUILD_WRKSRC=		${XERCESWRKSRC}
 INSTALL_WRKSRC=		${XERCESWRKSRC}
 
+USE_REINPLACE=		yes
 USE_GMAKE=		yes
 MAKE_ENV+=		XERCESCROOT=${WRKSRC}
 
-GNU_CONFIGURE=		yes
+HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		XERCESCROOT=${WRKSRC} TRANSCODER=${TRANSCODER}
 CONFIGURE_SCRIPT=	runConfigure
 CONFIGURE_ARGS+=	-p freebsd -c ${CC} -x ${CXX} -n socket -P ${PREFIX}
@@ -127,10 +135,7 @@ pre-everything::
 .endif
 
 post-patch:
-	@${CP} ${WRKSRC}/src/xercesc/Makefile.incl \
-		${WRKSRC}/src/xercesc/Makefile.incl.Dist
-	@${SED} -e 's#CP = -cp -p#CP = -cp#' \
-		${WRKSRC}/src/xercesc/Makefile.incl.Dist > \
+	@${REINPLACE_CMD} -e 's#CP = -cp -p#CP = -cp#'	\
 		${WRKSRC}/src/xercesc/Makefile.incl
 
 pre-configure:
diff --git a/textproc/xerces-c27/files/patch-aa b/textproc/xerces-c27/files/patch-aa
index 3bc4dea4baa..e058afbec12 100644
--- a/textproc/xerces-c27/files/patch-aa
+++ b/textproc/xerces-c27/files/patch-aa
@@ -1,6 +1,6 @@
---- samples/runConfigure.orig	Mon May 12 09:44:18 2003
-+++ samples/runConfigure	Tue Feb 17 20:26:46 2004
-@@ -262,8 +262,13 @@ else
+--- samples/runConfigure.orig	Tue Jan 13 19:42:18 2004
++++ samples/runConfigure	Thu Mar 11 17:11:03 2004
+@@ -271,8 +271,13 @@
                 ;;
          esac
      elif test $platform = "freebsd"; then
@@ -16,9 +16,48 @@
      elif test $platform = "netbsd"; then
          threadingLibs="-pthread"
          threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
---- src/xercesc/runConfigure.orig	Tue Feb 17 20:05:09 2004
-+++ src/xercesc/runConfigure	Tue Feb 17 20:27:13 2004
-@@ -303,8 +303,13 @@ else
+@@ -390,38 +395,6 @@
+ #
+ BITSTOBUILD=$bitsToBuild
+ export BITSTOBUILD
+-
+-#
+-# Special test for libiconv necessity under FreeBSD
+-#
+-transcodingLibs=""       # by default don't suppose the libiconv is necessary
+-transcodingDefines=""
+-if test $platform = "freebsd"; then
+-    if test -n "${XERCESCROOT}"; then
+-       # try lookup the configuration results
+-       . "${XERCESCROOT}/version.incl"
+-       SOLIBNAME=libxerces-c.so.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
+-       if test -f "${XERCESCROOT}/src/xercesc/config.log" ; then
+-           if grep XML_USE_LIBICONV "${XERCESCROOT}/src/xercesc/config.log" \
+-              > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       elif test -f "${XERCESCROOT}/obj/FREEBSD/IconvFBSDTransService.o" ; then
+-           if nm "${XERCESCROOT}/obj/FREEBSD/IconvFBSDTransService.o" | \
+-              grep iconv_open > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       elif test -f "${XERCESCROOT}/lib/${SOLIBNAME}" ; then
+-           if nm "${XERCESCROOT}/lib/${SOLIBNAME}" | \
+-              grep iconv_open > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       fi
+-    fi
+-fi
+ 
+ #
+ # Set the C compiler and C++ compiler environment variables
+--- src/xercesc/runConfigure.orig	Wed Feb  4 13:26:44 2004
++++ src/xercesc/runConfigure	Thu Mar 11 17:10:00 2004
+@@ -319,8 +319,13 @@
                 ;;
          esac
      elif test $platform = "freebsd"; then
@@ -33,3 +72,73 @@
      elif test $platform = "netbsd"; then
          threadingLibs="-pthread -lpthread"
          threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
+@@ -467,7 +472,11 @@
+        TRANSCODER=Uniconv390 ;;
+    IconvFBSD)
+        TRANSCODER=IconvFBSD ;
+-       transcodingDefines="-DXML_USE_LIBICONV -I/usr/local/include" ;;
++       transcodingDefines="-DXML_USE_LIBICONV -I/usr/local/include" ;
++       if test ${ICONVROOT}o != "o"; then
++	       ICONVROOT=/usr/local
++       fi
++       transcodingLibs="-L${ICONVROOT} -L${ICONVROOT}/lib -liconv" ;;
+    IconvGNU)
+        TRANSCODER=IconvGNU ;
+        transcodingDefines="-DXML_USE_GNU_TRANSCODER -I/usr/local/include" ;;
+--- tests/runConfigure.orig	Thu Mar 11 17:11:09 2004
++++ tests/runConfigure	Thu Mar 11 17:12:03 2004
+@@ -270,8 +270,13 @@
+                ;;
+         esac
+     elif test $platform = "freebsd"; then
+-        threadingLibs="-pthread -lc_r"
+-        threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
++      if test -n "${PTHREAD_LIBS}" ; then
++        threadingLibs="${PTHREAD_LIBS}"
++        threadingDefines="${PTHREAD_CFLAGS} -DXML_USE_PTHREADS"
++      else
++        threadingLibs="-lpthread"
++        threadingDefines="-DXML_USE_PTHREADS"
++      fi
+     elif test $platform = "netbsd"; then
+         threadingLibs="-pthread"
+         threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
+@@ -389,38 +394,6 @@
+ #
+ BITSTOBUILD=$bitsToBuild
+ export BITSTOBUILD
+-
+-#
+-# Special test for libiconv necessity under FreeBSD
+-#
+-transcodingLibs=""       # by default don't suppose the libiconv is necessary
+-transcodingDefines=""
+-if test $platform = "freebsd"; then
+-    if test -n "${XERCESCROOT}"; then
+-       # try lookup the configuration results
+-       . "${XERCESCROOT}/version.incl"
+-       SOLIBNAME=libxerces-c.so.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
+-       if test -f "${XERCESCROOT}/src/xercesc/config.log" ; then
+-           if grep XML_USE_LIBICONV "${XERCESCROOT}/src/xercesc/config.log" \
+-              > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       elif test -f "${XERCESCROOT}/obj/FREEBSD/IconvFBSDTransService.o" ; then
+-           if nm "${XERCESCROOT}/obj/FREEBSD/IconvFBSDTransService.o" | \
+-              grep iconv_open > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       elif test -f "${XERCESCROOT}/lib/${SOLIBNAME}" ; then
+-           if nm "${XERCESCROOT}/lib/${SOLIBNAME}" | \
+-              grep iconv_open > /dev/null 2>&1 ; then
+-               transcodingLibs=" -L/usr/local/lib -liconv "
+-               transcodingDefines=" -DXML_USE_LIBICONV -I/usr/local/include "
+-           fi
+-       fi
+-    fi
+-fi
+ 
+ #
+ # Set the C compiler and C++ compiler environment variables