Attachment 27514 Details for Bug 46636 – file.diff

[patch] file.diff

file.diff (text/plain), 2.74 KB, created by Bjoern A. Zeeb on 2002-12-30 18:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bjoern A. Zeeb

Created: 2002-12-30 18:10:01 UTC

Size: 2.74 KB

patch

obsolete

>diff -urN textproc/xerces-c2.orig/Makefile textproc/xerces-c2/Makefile
>--- textproc/xerces-c2.orig/Makefile	Fri Nov 15 17:00:34 2002
>+++ textproc/xerces-c2/Makefile	Mon Dec 30 17:26:43 2002
>@@ -55,10 +55,12 @@
> 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 @@
> 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 @@
> .endfor
> .endif
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -urN textproc/xerces-c2.orig/Makefile.alpha textproc/xerces-c2/Makefile.alpha
>--- textproc/xerces-c2.orig/Makefile.alpha	Thu Jan  1 00:00:00 1970
>+++ textproc/xerces-c2/Makefile.alpha	Mon Dec 30 17:26:28 2002
>@@ -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 -urN textproc/xerces-c2.orig/Makefile.sparc64 textproc/xerces-c2/Makefile.sparc64
>--- textproc/xerces-c2.orig/Makefile.sparc64	Thu Jan  1 00:00:00 1970
>+++ textproc/xerces-c2/Makefile.sparc64	Mon Dec 30 17:26:33 2002
>@@ -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 -urN textproc/xerces-c2.orig/files/patch-aa textproc/xerces-c2/files/patch-aa
>--- textproc/xerces-c2.orig/files/patch-aa	Thu Jan  1 00:00:00 1970
>+++ textproc/xerces-c2/files/patch-aa	Fri Dec 27 21:06:44 2002
>@@ -0,0 +1,12 @@
>+--- ./src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp.orig	Fri Dec 27 21:04:38 2002
>++++ ./src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp	Fri Dec 27 21:06:26 2002
>+@@ -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;

Actions: View | Diff

Attachments on bug 46636: 27514