Attachment 47510 Details for Bug 72784 – file.diff

[patch] file.diff

file.diff (text/plain), 13.36 KB, created by Bjoern A. Zeeb on 2004-10-17 11:00:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bjoern A. Zeeb

Created: 2004-10-17 11:00:45 UTC

Size: 13.36 KB

patch

obsolete

>diff -x CVS -urN ports/textproc/xerces-c2/Makefile /usr/ports/textproc/xerces-c2/Makefile
>--- ports/textproc/xerces-c2/Makefile	Thu Mar 18 15:48:13 2004
>+++ /usr/ports/textproc/xerces-c2/Makefile	Sun Oct 17 08:54:41 2004
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	xerces-c2
>-PORTVERSION=	2.5.0
>-PORTREVISION=	2
>+PORTVERSION=	2.6.0
> CATEGORIES=	textproc
> MASTER_SITES=	${MASTER_SITE_APACHE_XML}
> MASTER_SITE_SUBDIR=	xerces-c/source
>@@ -16,9 +15,44 @@
> MAINTAINER=	bzeeb+freebsdports@zabbadoz.net
> COMMENT=	Validating XML parser from the Apache XML Project
> 
>+OPTIONS=	THREADS "Build a thread enabled shared library." on \
>+		SAMPLES "Copy sample binaries and sources." on \
>+		PORTDOCS "Copy documentation." on \
>+		DEBUG "Include debugging information, do not strip." off \
>+		ICONVFBSD "Use IconvFBSD transcoder." on \
>+		ICU "Use ICU transcoder." off \
>+		NATIVE "Use native transcoder." off
>+
>+.include <bsd.port.pre.mk>
>+
>+.if defined(TRANSCODER)
>+.error command line transcoder selection is no longer supported - \
>+	please use make config
>+.endif
>+
>+.if defined(WITH_ICONVFBSD)
>+TRANSCODER=		IconvFBSD
>+.endif
>+.if defined(WITH_ICU)
>+.if defined(TRANSCODER)
>+.warning ICU selected but transcoder already set - \
>+	please only select one transcoder type
>+.else
>+TRANSCODER=		icu
>+.endif
>+.endif
>+.if defined(WITH_NATIVE)
>+.if defined(TRANSCODER)
>+.warning NATIVE selected but transcoder already set - \
>+	please only select one transcoder type
>+.else
>+TRANSCODER=		native
>+.endif
>+.endif
>+
> .if !defined(TRANSCODER)
> USE_ICONV=		yes
>-TRANSCODER=		"IconvFBSD"
>+TRANSCODER=		IconvFBSD
> ICONVROOT?=		${LOCALBASE}
> CONFIGURE_ENV+=		ICONVROOT=${ICONVROOT}
> MAKE_ENV+=		ICONVROOT=${ICONVROOT}
>@@ -39,7 +73,7 @@
> PLIST_SUB+=		TRANSICU="@comment "
> .else
> USE_ICONV=		yes
>-TRANSCODER=		"IconvFBSD"
>+TRANSCODER=		IconvFBSD
> ICONVROOT?=		${LOCALBASE}
> CONFIGURE_ENV+=		ICONVROOT=${ICONVROOT}
> MAKE_ENV+=		ICONVROOT=${ICONVROOT}
>@@ -68,13 +102,11 @@
> 
> CONFIGURE_ARGS+=	-t ${TRANSCODER}
> 
>-.if defined(DEBUG)
>+.if !defined(WITHOUT_DEBUG)
> CONFIGURE_ARGS+=	-d
> STRIP=
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
> .if defined(ARCH) && \
> 	(${ARCH} == "alpha" || ${ARCH} == "sparc64" || \
> 	${ARCH} == "amd64" || ${ARCH} == "ia64")
>@@ -83,7 +115,7 @@
> SAMPLES_CONFIG_ARGS+=	-b 64
> .endif
> 
>-.if defined(NO_THREADS)
>+.if defined(WITHOUT_THREADS)
> CONFIGURE_ARGS+=	-r none
> .else
> CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
>@@ -92,16 +124,19 @@
> 
> XERCESC_LIB_VERSION=	${PORTVERSION:S/.//:R}
> XERCESC_LIB=		libxerces-c.so.${PORTVERSION:S/.//}
>+XERCESC_DEPDOM_LIB=	libxerces-depdom.so.${PORTVERSION:S/.//}
> PLIST_SUB+=		XERCESC_LIB=${XERCESC_LIB} \
>+			XERCESC_DEPDOM_LIB=${XERCESC_DEPDOM_LIB} \
> 				XERCESC_LIB_VERSION=${XERCESC_LIB_VERSION}
> 
>-.if !defined(NO_SAMPLES)
>+.if !defined(WITHOUT_SAMPLES)
> PLIST_SUB+=	NO_SAMPLES=""
> ALL_TARGET?=	all samples
> XERCES_BINS?=	CreateDOMDocument DOMCount DOMPrint EnumVal MemParse PParse \
>-	Redirect SAX2Count SAX2Print SAXCount SAXPrint SEnumVal StdInParse
>+		PSVIWriter Redirect SAX2Count SAX2Print SAXCount SAXPrint \
>+		SCMPrint SEnumVal StdInParse
> SAMPLES_CONFIG_ARGS+=	-p freebsd -c ${CC} -x ${CXX}
>-.if defined(NO_THREADS)
>+.if defined(WITHOUT_THREADS)
> SAMPLES_CONFIG_ARGS+=	-r none
> .else
> SAMPLES_CONFIG_ARGS+=	-r pthread
>@@ -112,28 +147,10 @@
> PLIST_SUB+=	NO_SAMPLES="@comment "
> .endif
> 
>-.if !defined(NOPORTDOCS)
>+.if !defined(WITHOUT_PORTDOCS)
> PORTDOCS=	*
> .endif
> 
>-pre-everything::
>-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
>-	@${ECHO} ''
>-	@${ECHO} 'You may use the following build options by defining'
>-	@${ECHO} 'them on the command line with -D'
>-	@${ECHO} ''
>-	@${ECHO} 'NO_THREADS	do not build a thread enabled shared library'
>-	@${ECHO} 'NO_SAMPLES	do not copy sample binaries and sources'
>-	@${ECHO} 'NOPORTDOCS	do not copy documentation'
>-	@${ECHO} 'DEBUG		include debugging information, do not strip'
>-	@${ECHO} ''
>-	@${ECHO} 'Also you may set TRANSCODER to the following values (without -D):'
>-	@${ECHO} ''
>-	@${ECHO} 'TRANSCODER=[icu|IconvFBSD|native]	default: IconvFBSD'
>-	@${ECHO} ''
>-	@/bin/sleep 2
>-.endif
>-
> post-patch:
> 	@${REINPLACE_CMD} -e 's#CP = -cp -p#CP = -cp#'	\
> 		${WRKSRC}/src/xercesc/Makefile.incl
>@@ -143,7 +160,7 @@
> 	@${CHMOD} 700 ${CONFIGURE_WRKSRC}/configure
> 
> post-configure:
>-.if !defined(NO_SAMPLES)
>+.if !defined(WITHOUT_SAMPLES)
> .if defined(TRANSCODER) && (${TRANSCODER} == "icu")
> 	@(cd ${WRKSRC}/samples && \
> 		${SETENV} \
>@@ -162,14 +179,15 @@
> .endif
> 
> post-install:
>-.if !defined(DEBUG)
>+.if defined(WITHOUT_DEBUG)
> 	@${STRIP_CMD} ${PREFIX}/lib/${XERCESC_LIB}
>+	@${STRIP_CMD} ${PREFIX}/lib/${XERCESC_DEPDOM_LIB}
> .endif
>-.if !defined(NOPORTDOCS)
>+.if !defined(WITHOUT_PORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
> 	@${CP} -r ${WRKSRC}/doc/ ${DOCSDIR}
> .endif
>-.if !defined(NO_SAMPLES)
>+.if !defined(WITHOUT_SAMPLES)
> 	@${MKDIR} ${EXAMPLESDIR}
> .for i in ${XERCES_BINS} data
> 	@${CP} -r ${WRKSRC}/samples/$i ${EXAMPLESDIR}
>diff -x CVS -urN ports/textproc/xerces-c2/distinfo /usr/ports/textproc/xerces-c2/distinfo
>--- ports/textproc/xerces-c2/distinfo	Tue Feb 24 09:53:19 2004
>+++ /usr/ports/textproc/xerces-c2/distinfo	Wed Oct 13 20:15:31 2004
>@@ -1,2 +1,2 @@
>-MD5 (xerces-c-src_2_5_0.tar.gz) = e7ff7d007fabfa7e3fc8c75a8007b0b1
>-SIZE (xerces-c-src_2_5_0.tar.gz) = 9379748
>+MD5 (xerces-c-src_2_6_0.tar.gz) = 038b3614ae82d2878bcc820b9ccbe853
>+SIZE (xerces-c-src_2_6_0.tar.gz) = 9324884
>diff -x CVS -urN ports/textproc/xerces-c2/files/patch-ab /usr/ports/textproc/xerces-c2/files/patch-ab
>--- ports/textproc/xerces-c2/files/patch-ab	Thu Mar 18 15:48:14 2004
>+++ /usr/ports/textproc/xerces-c2/files/patch-ab	Fri Oct 15 19:57:13 2004
>@@ -1,14 +1,15 @@
>---- src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp.orig	Thu Mar 18 10:44:13 2004
>-+++ src/xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.cpp	Thu Mar 18 10:47:04 2004
>-@@ -1340,6 +1340,11 @@
>-     if (wBufPtr)
>-         manager->deallocate(wBufPtr);//delete [] wBufPtr;
>- 
>-+    // iconvTo resp. iconv(3) doe NOT return number of characters
>-+    // converted but only number of non-reversible conversions;
>-+    // thus we need to calculate correct mblen on our own
>-+    mblen = ptr - toFill;
>-+
>- #endif /* !XML_USE_LIBICONV */
>- 
>-     // Cap it off just in case
>+--- obj/Makefile.in.orig	Fri Oct 15 19:55:39 2004
>++++ obj/Makefile.in	Fri Oct 15 19:55:53 2004
>+@@ -247,10 +247,10 @@
>+ 	(cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_DEPDOM}.a libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_NAME}.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxercesdepdom.dll.a)
>+ else
>+ 	$(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/lib
>+-	(cd ${DESTDIR}$(PREFIX)/lib; ln -s ${REAL_NAME} ${SO_NAME}; ln -s ${REAL_NAME} ${LINK_NAME})
>++	(cd ${DESTDIR}$(PREFIX)/lib; ln -sf ${REAL_NAME} ${SO_NAME}; ln -sf ${REAL_NAME} ${LINK_NAME})
>+ 	
>+ 	$(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/lib
>+-	(cd ${DESTDIR}$(PREFIX)/lib; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM})	
>++	(cd ${DESTDIR}$(PREFIX)/lib; ln -sf ${REAL_DEPDOM} ${SO_DEPDOM}; ln -sf ${REAL_DEPDOM} ${LINK_DEPDOM})	
>+ endif
>+ ifeq (${PLATFORM},OS390)
>+ 	$(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib
>diff -x CVS -urN ports/textproc/xerces-c2/files/patch-ac /usr/ports/textproc/xerces-c2/files/patch-ac
>--- ports/textproc/xerces-c2/files/patch-ac	Sat Aug 28 20:30:04 2004
>+++ /usr/ports/textproc/xerces-c2/files/patch-ac	Thu Jan  1 00:00:00 1970
>@@ -1,19 +0,0 @@
>---- src/xercesc/util/RefArrayOf.hpp	2004/01/29 11:48:46	1.6
>-+++ src/xercesc/util/RefArrayOf.hpp	2004/06/23 22:19:35	1.7
>-@@ -56,6 +56,9 @@
>- 
>- /*
>-  * $Log: RefArrayOf.hpp,v $
>-+ * Revision 1.7  2004/06/23 22:19:35  neilg
>-+ * fix for compilation under gcc 3.5
>-+ *
>-  * Revision 1.6  2004/01/29 11:48:46  cargilld
>-  * Code cleanup changes to get rid of various compiler diagnostic messages.
>-  *
>-@@ -101,6 +104,7 @@
>- #include <xercesc/util/ArrayIndexOutOfBoundsException.hpp>
>- #include <xercesc/util/IllegalArgumentException.hpp>
>- #include <xercesc/util/XMLEnumerator.hpp>
>-+#include <xercesc/framework/MemoryManager.hpp>
>- 
>- XERCES_CPP_NAMESPACE_BEGIN
>diff -x CVS -urN ports/textproc/xerces-c2/pkg-plist /usr/ports/textproc/xerces-c2/pkg-plist
>--- ports/textproc/xerces-c2/pkg-plist	Mon Mar  8 17:07:50 2004
>+++ /usr/ports/textproc/xerces-c2/pkg-plist	Fri Oct 15 21:36:43 2004
>@@ -29,6 +29,7 @@
> include/xercesc/dom/DOMNodeIterator.hpp
> include/xercesc/dom/DOMNodeList.hpp
> include/xercesc/dom/DOMNotation.hpp
>+include/xercesc/dom/DOMPSVITypeInfo.hpp
> include/xercesc/dom/DOMProcessingInstruction.hpp
> include/xercesc/dom/DOMRange.hpp
> include/xercesc/dom/DOMRangeException.hpp
>@@ -135,6 +136,7 @@
> include/xercesc/framework/psvi/XSParticle.hpp
> include/xercesc/framework/psvi/XSSimpleTypeDefinition.hpp
> include/xercesc/framework/psvi/XSTypeDefinition.hpp
>+include/xercesc/framework/psvi/XSValue.hpp
> include/xercesc/framework/psvi/XSWildcard.hpp
> include/xercesc/internal/BinFileOutputStream.hpp
> include/xercesc/internal/BinMemOutputStream.hpp
>@@ -159,6 +161,7 @@
> include/xercesc/internal/XMLScannerResolver.hpp
> include/xercesc/internal/XObjectComparator.hpp
> include/xercesc/internal/XProtoType.hpp
>+include/xercesc/internal/XSAXMLScanner.hpp
> include/xercesc/internal/XSObjectFactory.hpp
> include/xercesc/internal/XSerializable.hpp
> include/xercesc/internal/XSerializationException.hpp
>@@ -416,9 +419,9 @@
> include/xercesc/validators/datatype/StringDatatypeValidator.hpp
> include/xercesc/validators/datatype/TimeDatatypeValidator.hpp
> include/xercesc/validators/datatype/UnionDatatypeValidator.hpp
>+include/xercesc/validators/datatype/XMLCanRepGroup.hpp
> include/xercesc/validators/datatype/YearDatatypeValidator.hpp
> include/xercesc/validators/datatype/YearMonthDatatypeValidator.hpp
>-include/xercesc/validators/datatype/XMLCanRepGroup.hpp
> include/xercesc/validators/schema/ComplexTypeInfo.hpp
> include/xercesc/validators/schema/GeneralAttributeCheck.hpp
> include/xercesc/validators/schema/NamespaceScope.hpp
>@@ -448,6 +451,7 @@
> include/xercesc/validators/schema/identity/IC_Selector.hpp
> include/xercesc/validators/schema/identity/IC_Unique.hpp
> include/xercesc/validators/schema/identity/IdentityConstraint.hpp
>+include/xercesc/validators/schema/identity/IdentityConstraintHandler.hpp
> include/xercesc/validators/schema/identity/ValueStore.hpp
> include/xercesc/validators/schema/identity/ValueStoreCache.hpp
> include/xercesc/validators/schema/identity/XPathException.hpp
>@@ -460,6 +464,11 @@
> @exec ln -sf %%XERCESC_LIB%% %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%
> @unexec if test ! -r %D/lib/libxerces-c.so; then rm -f %D/lib/libxerces-c.so; fi
> @unexec if test ! -r %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%; then rm -f %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%; fi
>+lib/%%XERCESC_DEPDOM_LIB%%
>+@exec ln -sf %%XERCESC_DEPDOM_LIB%% %D/lib/libxerces-depdom.so
>+@exec ln -sf %%XERCESC_DEPDOM_LIB%% %D/lib/libxerces-depdom.so.%%XERCESC_LIB_VERSION%%
>+@unexec if test ! -r %D/lib/libxerces-depdom.so; then rm -f %D/lib/libxerces-depdom.so; fi
>+@unexec if test ! -r %D/lib/libxerces-depdom.so.%%XERCESC_LIB_VERSION%%; then rm -f %D/lib/libxerces-depdom.so.%%XERCESC_LIB_VERSION%%; fi
> @dirrm include/xercesc/validators/schema/identity
> @dirrm include/xercesc/validators/schema
> @dirrm include/xercesc/validators/datatype
>@@ -495,11 +504,13 @@
> %%NO_SAMPLES%%bin/EnumVal
> %%NO_SAMPLES%%bin/MemParse
> %%NO_SAMPLES%%bin/PParse
>+%%NO_SAMPLES%%bin/PSVIWriter
> %%NO_SAMPLES%%bin/Redirect
> %%NO_SAMPLES%%bin/SAX2Count
> %%NO_SAMPLES%%bin/SAX2Print
> %%NO_SAMPLES%%bin/SAXCount
> %%NO_SAMPLES%%bin/SAXPrint
>+%%NO_SAMPLES%%bin/SCMPrint
> %%NO_SAMPLES%%bin/SEnumVal
> %%NO_SAMPLES%%bin/StdInParse
> %%NO_SAMPLES%%%%EXAMPLESDIR%%/CreateDOMDocument/CreateDOMDocument.cpp
>@@ -533,6 +544,14 @@
> %%NO_SAMPLES%%%%EXAMPLESDIR%%/PParse/PParse.hpp
> %%NO_SAMPLES%%%%EXAMPLESDIR%%/PParse/PParseHandlers.cpp
> %%NO_SAMPLES%%%%EXAMPLESDIR%%/PParse/PParseHandlers.hpp
>+%%NO_SAMPLES%%%%EXAMPLESDIR%%/PSVIWriter/Makefile
>+%%NO_SAMPLES%%%%EXAMPLESDIR%%/PSVIWriter/Makefile.in
>+%%NO_SAMPLES%%%%EXAMPLESDIR%%/PSVIWriter/PSVIUni.cpp
>+%%NO_SAMPLES%%%%EXAMPLESDIR%%/PSVIWriter/PSVIUni.hpp
>+%%NO_SAMPLES%%%%EXAMPLESDIR%%/PSVIWriter/PSVIWriter.cpp
>+%%NO_SAMPLES%%%%EXAMPLESDIR%%/PSVIWriter/PSVIWriter.hpp
>+%%NO_SAMPLES%%%%EXAMPLESDIR%%/PSVIWriter/PSVIWriterHandlers.cpp
>+%%NO_SAMPLES%%%%EXAMPLESDIR%%/PSVIWriter/PSVIWriterHandlers.hpp
> %%NO_SAMPLES%%%%EXAMPLESDIR%%/Redirect/Makefile
> %%NO_SAMPLES%%%%EXAMPLESDIR%%/Redirect/Makefile.in
> %%NO_SAMPLES%%%%EXAMPLESDIR%%/Redirect/Redirect.cpp
>@@ -563,6 +582,9 @@
> %%NO_SAMPLES%%%%EXAMPLESDIR%%/SAXPrint/SAXPrint.hpp
> %%NO_SAMPLES%%%%EXAMPLESDIR%%/SAXPrint/SAXPrintHandlers.cpp
> %%NO_SAMPLES%%%%EXAMPLESDIR%%/SAXPrint/SAXPrintHandlers.hpp
>+%%NO_SAMPLES%%%%EXAMPLESDIR%%/SCMPrint/Makefile
>+%%NO_SAMPLES%%%%EXAMPLESDIR%%/SCMPrint/Makefile.in
>+%%NO_SAMPLES%%%%EXAMPLESDIR%%/SCMPrint/SCMPrint.cpp
> %%NO_SAMPLES%%%%EXAMPLESDIR%%/SEnumVal/Makefile
> %%NO_SAMPLES%%%%EXAMPLESDIR%%/SEnumVal/Makefile.in
> %%NO_SAMPLES%%%%EXAMPLESDIR%%/SEnumVal/SEnumVal.cpp
>@@ -580,11 +602,13 @@
> %%NO_SAMPLES%%@dirrm %%EXAMPLESDIR%%/data
> %%NO_SAMPLES%%@dirrm %%EXAMPLESDIR%%/StdInParse
> %%NO_SAMPLES%%@dirrm %%EXAMPLESDIR%%/SEnumVal
>+%%NO_SAMPLES%%@dirrm %%EXAMPLESDIR%%/SCMPrint
> %%NO_SAMPLES%%@dirrm %%EXAMPLESDIR%%/SAXPrint
> %%NO_SAMPLES%%@dirrm %%EXAMPLESDIR%%/SAXCount
> %%NO_SAMPLES%%@dirrm %%EXAMPLESDIR%%/SAX2Print
> %%NO_SAMPLES%%@dirrm %%EXAMPLESDIR%%/SAX2Count
> %%NO_SAMPLES%%@dirrm %%EXAMPLESDIR%%/Redirect
>+%%NO_SAMPLES%%@dirrm %%EXAMPLESDIR%%/PSVIWriter
> %%NO_SAMPLES%%@dirrm %%EXAMPLESDIR%%/PParse
> %%NO_SAMPLES%%@dirrm %%EXAMPLESDIR%%/MemParse
> %%NO_SAMPLES%%@dirrm %%EXAMPLESDIR%%/EnumVal
>--- cut ---

Actions: View | Diff

Attachments on bug 72784: 47510