Attachment #27514 for bug #46636

View | Details | Raw Unified | Return to bug 46636
Collapse All | Expand All

Lines 55-64 Link Here

(-)textproc/xerces-c2/Makefile (-3 / +5 lines)
55	GNU_CONFIGURE= yes	55	GNU_CONFIGURE= yes
56	CONFIGURE_ENV+= XERCESCROOT=${WRKSRC} TRANSCODER=${TRANSCODER}	56	CONFIGURE_ENV+= XERCESCROOT=${WRKSRC} TRANSCODER=${TRANSCODER}
57	CONFIGURE_SCRIPT= runConfigure	57	CONFIGURE_SCRIPT= runConfigure
58	CONFIGURE_ARGS?= -p freebsd -c ${CC} -x ${CXX} -n socket -P ${PREFIX}	58	CONFIGURE_ARGS+= -p freebsd -c ${CC} -x ${CXX} -n socket -P ${PREFIX}
59		59
60	CONFIGURE_ARGS+= -t ${TRANSCODER}	60	CONFIGURE_ARGS+= -t ${TRANSCODER}
61		61
		62	.include <bsd.port.pre.mk>
		63
62	.if defined(NO_THREADS)	64	.if defined(NO_THREADS)
63	CONFIGURE_ARGS+= -r none	65	CONFIGURE_ARGS+= -r none
64	.endif	66	.endif
Lines 73-79 Link Here
73	ALL_TARGET?= all samples	75	ALL_TARGET?= all samples
74	XERCES_BINS?= CreateDOMDocument DOMCount DOMPrint EnumVal MemParse PParse \	76	XERCES_BINS?= CreateDOMDocument DOMCount DOMPrint EnumVal MemParse PParse \
75	Redirect SAX2Count SAX2Print SAXCount SAXPrint SEnumVal StdInParse	77	Redirect SAX2Count SAX2Print SAXCount SAXPrint SEnumVal StdInParse
76	SAMPLES_CONFIG_ARGS?= -p freebsd -x g++	78	SAMPLES_CONFIG_ARGS+= -p freebsd -c ${CC} -x ${CXX}
77	.if defined(NO_THREADS)	79	.if defined(NO_THREADS)
78	SAMPLES_CONFIG_ARGS+= -r none	80	SAMPLES_CONFIG_ARGS+= -r none
79	.endif	81	.endif
Lines 143-146 Link Here
143	.endfor	145	.endfor
144	.endif	146	.endif
145		147
146	.include <bsd.port.mk>	148	.include <bsd.port.post.mk>

Line 0 Link Here

(-)textproc/xerces-c2/Makefile.alpha (+10 lines)
	1	# Date created: 29 December 2002
	2	# Whom: "Bjoern A. Zeeb" (bzeeb+freebsdports@zabbadoz.net)
	3	#
	4	# $FreeBSD$
	5	#
	6
	7	# set bitsToBuild to 64
	8	CONFIGURE_ARGS+= -b 64
	9	SAMPLES_CONFIG_ARGS+= -b 64
	10




# 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





--- ./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;

Return to bug 46636

Line 0 Link Here

(-)textproc/xerces-c2/Makefile.sparc64 (+14 lines)
	1	# Date created: 26 December 2002
	2	# Whom: "Bjoern A. Zeeb" (bzeeb+freebsdports@zabbadoz.net)
	3	#
	4	# $FreeBSD$
	5	#
	6
	7	# When there are no probs with libc_r / pthreads on sparc64-freebsd we
	8	# should remove this files or make it conditional on OSVERSION
	9	NO_THREADS= yes
	10
	11	# set bitsToBuild to 64
	12	CONFIGURE_ARGS+= -b 64
	13	SAMPLES_CONFIG_ARGS+= -b 64
	14

Line 0 Link Here

(-)textproc/xerces-c2/files/patch-aa (+12 lines)
	1	--- ./src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp.orig Fri Dec 27 21:04:38 2002
	2	+++ ./src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp Fri Dec 27 21:06:26 2002
	3	@@ -1091,7 +1091,8 @@
	4	// perform conversion
	5	wLent *= uChSize();
	6	char *ptr = retVal;
	7	- size_t rc = iconvTo(wideCharBuf, &wLent, &ptr, neededLen);
	8	+ size_t tmpwLent = wLent;
	9	+ size_t rc = iconvTo(wideCharBuf, &tmpwLent, &ptr, neededLen);
	10	if (rc == (size_t)-1) {
	11	if (wBufPtr)
	12	delete [] wBufPtr;