4 files changed, 41 insertions, 3 deletions

diff --git a/textproc/xerces-c2-devel/Makefile b/textproc/xerces-c2-devel/Makefile
index fda5c2cc1c8f..976e31423fb4 100644
--- a/textproc/xerces-c2-devel/Makefile
+++ b/textproc/xerces-c2-devel/Makefile
@@ -55,10 +55,12 @@ MAKE_ENV+=		XERCESCROOT=${WRKSRC}
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		XERCESCROOT=${WRKSRC} TRANSCODER=${TRANSCODER}
 CONFIGURE_SCRIPT=	runConfigure
-CONFIGURE_ARGS?=	-p freebsd -c ${CC} -x ${CXX} -n socket -P ${PREFIX}
+CONFIGURE_ARGS+=	-p freebsd -c ${CC} -x ${CXX} -n socket -P ${PREFIX}
 
 CONFIGURE_ARGS+=	-t ${TRANSCODER}
 
+.include <bsd.port.pre.mk>
+
 .if defined(NO_THREADS)
 CONFIGURE_ARGS+=	-r none
 .endif
@@ -73,7 +75,7 @@ PLIST_SUB+=	NO_SAMPLES=""
 ALL_TARGET?=	all samples
 XERCES_BINS?=	CreateDOMDocument DOMCount DOMPrint EnumVal MemParse PParse \
 	Redirect SAX2Count SAX2Print SAXCount SAXPrint SEnumVal StdInParse
-SAMPLES_CONFIG_ARGS?=	-p freebsd -x g++
+SAMPLES_CONFIG_ARGS+=	-p freebsd -c ${CC} -x ${CXX}
 .if defined(NO_THREADS)
 SAMPLES_CONFIG_ARGS+=	-r none
 .endif
@@ -143,4 +145,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/xerces-c2-devel/Makefile.alpha b/textproc/xerces-c2-devel/Makefile.alpha
new file mode 100644
index 000000000000..874bb0a96fca
--- /dev/null
+++ b/textproc/xerces-c2-devel/Makefile.alpha
@@ -0,0 +1,10 @@
+# Date created:		29 December 2002
+# Whom:			"Bjoern A. Zeeb" (bzeeb+freebsdports@zabbadoz.net)
+#
+# $FreeBSD$
+#
+
+# set bitsToBuild to 64
+CONFIGURE_ARGS+=	-b 64
+SAMPLES_CONFIG_ARGS+=	-b 64
+
diff --git a/textproc/xerces-c2-devel/Makefile.sparc64 b/textproc/xerces-c2-devel/Makefile.sparc64
new file mode 100644
index 000000000000..f5c5a7e8a47e
--- /dev/null
+++ b/textproc/xerces-c2-devel/Makefile.sparc64
@@ -0,0 +1,14 @@
+# Date created:		26 December 2002
+# Whom:			"Bjoern A. Zeeb" (bzeeb+freebsdports@zabbadoz.net)
+#
+# $FreeBSD$
+#
+
+# When there are no probs with libc_r / pthreads on sparc64-freebsd we
+# should remove this files or make it conditional on OSVERSION
+NO_THREADS=	yes
+
+# set bitsToBuild to 64
+CONFIGURE_ARGS+=	-b 64
+SAMPLES_CONFIG_ARGS+=	-b 64
+
diff --git a/textproc/xerces-c2-devel/files/patch-aa b/textproc/xerces-c2-devel/files/patch-aa
new file mode 100644
index 000000000000..1e3aad521e00
--- /dev/null
+++ b/textproc/xerces-c2-devel/files/patch-aa
@@ -0,0 +1,12 @@
+--- src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp.orig	Tue Aug 27 09:24:38 2002
++++ src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp	Sun Jan 12 01:44:04 2003
+@@ -1091,7 +1091,8 @@
+ 	// perform conversion
+ 	wLent *= uChSize();
+ 	char	*ptr = retVal;
+-	size_t	rc = iconvTo(wideCharBuf, &wLent, &ptr, neededLen);
++	size_t	tmpwLent = wLent;
++	size_t	rc = iconvTo(wideCharBuf, &tmpwLent, &ptr, neededLen);
+ 	if (rc == (size_t)-1) {
+ 	    if (wBufPtr)
+ 		delete [] wBufPtr;