summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--textproc/xalan-c/Makefile10
-rw-r--r--textproc/xalan-c/PLIST117
-rw-r--r--textproc/xalan-c/distinfo11
-rw-r--r--textproc/xalan-c/patches/patch-aa37
-rw-r--r--textproc/xalan-c/patches/patch-ac22
-rw-r--r--textproc/xalan-c/patches/patch-ad13
6 files changed, 85 insertions, 125 deletions
diff --git a/textproc/xalan-c/Makefile b/textproc/xalan-c/Makefile
index d6a806561f4..090b123409c 100644
--- a/textproc/xalan-c/Makefile
+++ b/textproc/xalan-c/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:30:52 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2008/01/24 07:17:33 xtraeme Exp $
#
-DISTNAME= Xalan-C_1_6-src
-PKGNAME= xalan-c-1.6
-PKGREVISION= 4
+DISTNAME= Xalan-C_1_10_0-src
+PKGNAME= xalan-c-1.10
+#PKGREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://archive.apache.org/dist/xml/xalan-c/source/
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://xml.apache.org/xalan-c/
COMMENT= XSLT processor of the Apache Project
-WRKSRC= ${WRKDIR}/xml-xalan/c/src/xalanc
+WRKSRC= ${WRKDIR}/xml-xalan/c
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
diff --git a/textproc/xalan-c/PLIST b/textproc/xalan-c/PLIST
index 1040f57c566..b30802e2e7a 100644
--- a/textproc/xalan-c/PLIST
+++ b/textproc/xalan-c/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2004/02/11 04:20:16 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/01/24 07:17:33 xtraeme Exp $
bin/Xalan
-bin/testXSLT
include/xalanc/DOMSupport/DOMServices.hpp
include/xalanc/DOMSupport/DOMSupport.hpp
include/xalanc/DOMSupport/DOMSupportDefault.hpp
@@ -10,22 +9,37 @@ include/xalanc/DOMSupport/DOMSupportInit.hpp
include/xalanc/DOMSupport/TreeWalker.hpp
include/xalanc/DOMSupport/XalanDocumentPrefixResolver.hpp
include/xalanc/DOMSupport/XalanNamespacesStack.hpp
+include/xalanc/Harness/XalanDiagnosticMemoryManager.hpp
+include/xalanc/Harness/XalanFileUtility.hpp
+include/xalanc/Harness/XalanHarnessDefinitions.hpp
+include/xalanc/Harness/XalanXMLFileReporter.hpp
include/xalanc/Include/AIXDefinitions.hpp
include/xalanc/Include/GCCDefinitions.hpp
include/xalanc/Include/HPUXDefinitions.hpp
include/xalanc/Include/IntelDefinitions.hpp
include/xalanc/Include/OS390Definitions.hpp
+include/xalanc/Include/OS400Definitions.hpp
include/xalanc/Include/PlatformDefinitions.hpp
include/xalanc/Include/STLHelper.hpp
include/xalanc/Include/SolarisDefinitions.hpp
include/xalanc/Include/TRU64Definitions.hpp
include/xalanc/Include/VCPPDefinitions.hpp
-include/xalanc/Include/XalanArrayKeyMap.hpp
include/xalanc/Include/XalanAutoPtr.hpp
+include/xalanc/Include/XalanDeque.hpp
+include/xalanc/Include/XalanList.hpp
+include/xalanc/Include/XalanMap.hpp
+include/xalanc/Include/XalanMemMgrAutoPtr.hpp
+include/xalanc/Include/XalanMemMgrHelper.hpp
+include/xalanc/Include/XalanMemMngArrayAllocate.hpp
+include/xalanc/Include/XalanMemoryManagement.hpp
include/xalanc/Include/XalanObjectCache.hpp
+include/xalanc/Include/XalanObjectStackCache.hpp
+include/xalanc/Include/XalanSet.hpp
+include/xalanc/Include/XalanVector.hpp
include/xalanc/Include/XalanVersion.hpp
include/xalanc/PlatformSupport/ArenaAllocator.hpp
include/xalanc/PlatformSupport/ArenaBlock.hpp
+include/xalanc/PlatformSupport/ArenaBlockBase.hpp
include/xalanc/PlatformSupport/AttributeListImpl.hpp
include/xalanc/PlatformSupport/AttributeVectorEntry.hpp
include/xalanc/PlatformSupport/AttributeVectorEntryExtended.hpp
@@ -36,6 +50,7 @@ include/xalanc/PlatformSupport/DirectoryEnumerator.hpp
include/xalanc/PlatformSupport/DoubleSupport.hpp
include/xalanc/PlatformSupport/ExecutionContext.hpp
include/xalanc/PlatformSupport/FormatterListener.hpp
+include/xalanc/PlatformSupport/LocalMsgIndex.hpp
include/xalanc/PlatformSupport/NamedNodeMapAttributeList.hpp
include/xalanc/PlatformSupport/NullPrintWriter.hpp
include/xalanc/PlatformSupport/PlatformSupportDefinitions.hpp
@@ -53,16 +68,22 @@ include/xalanc/PlatformSupport/XSLException.hpp
include/xalanc/PlatformSupport/XalanAllocator.hpp
include/xalanc/PlatformSupport/XalanArrayAllocator.hpp
include/xalanc/PlatformSupport/XalanBitmap.hpp
+include/xalanc/PlatformSupport/XalanCollationServices.hpp
include/xalanc/PlatformSupport/XalanDOMStringAllocator.hpp
include/xalanc/PlatformSupport/XalanDOMStringCache.hpp
include/xalanc/PlatformSupport/XalanDOMStringHashTable.hpp
include/xalanc/PlatformSupport/XalanDOMStringPool.hpp
-include/xalanc/PlatformSupport/XalanDecimalFormat.hpp
+include/xalanc/PlatformSupport/XalanDOMStringReusableAllocator.hpp
include/xalanc/PlatformSupport/XalanDecimalFormatSymbols.hpp
include/xalanc/PlatformSupport/XalanEncodingPropertyCache.hpp
include/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp
include/xalanc/PlatformSupport/XalanFileOutputStream.hpp
+include/xalanc/PlatformSupport/XalanICUMessageLoader.hpp
+include/xalanc/PlatformSupport/XalanInMemoryMessageLoader.hpp
include/xalanc/PlatformSupport/XalanLocator.hpp
+include/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp
+include/xalanc/PlatformSupport/XalanMessageLoader.hpp
+include/xalanc/PlatformSupport/XalanNLSMessageLoader.hpp
include/xalanc/PlatformSupport/XalanNamespace.hpp
include/xalanc/PlatformSupport/XalanNullOutputStream.hpp
include/xalanc/PlatformSupport/XalanNumberFormat.hpp
@@ -82,17 +103,23 @@ include/xalanc/XMLSupport/FormatterToHTML.hpp
include/xalanc/XMLSupport/FormatterToNull.hpp
include/xalanc/XMLSupport/FormatterToText.hpp
include/xalanc/XMLSupport/FormatterToXML.hpp
-include/xalanc/XMLSupport/FormatterToXML_UTF16.hpp
-include/xalanc/XMLSupport/FormatterToXML_UTF8.hpp
+include/xalanc/XMLSupport/FormatterToXMLUnicode.hpp
include/xalanc/XMLSupport/FormatterTreeWalker.hpp
include/xalanc/XMLSupport/XMLParserLiaison.hpp
include/xalanc/XMLSupport/XMLSupportDefinitions.hpp
include/xalanc/XMLSupport/XMLSupportException.hpp
include/xalanc/XMLSupport/XMLSupportInit.hpp
+include/xalanc/XMLSupport/XalanDummyIndentWriter.hpp
+include/xalanc/XMLSupport/XalanFormatterWriter.hpp
include/xalanc/XMLSupport/XalanHTMLElementsProperties.hpp
+include/xalanc/XMLSupport/XalanIndentWriter.hpp
+include/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp
+include/xalanc/XMLSupport/XalanUTF16Writer.hpp
+include/xalanc/XMLSupport/XalanUTF8Writer.hpp
+include/xalanc/XMLSupport/XalanXMLSerializerBase.hpp
+include/xalanc/XMLSupport/XalanXMLSerializerFactory.hpp
include/xalanc/XPath/ElementPrefixResolverProxy.hpp
include/xalanc/XPath/FormatterStringLengthCounter.hpp
-include/xalanc/XPath/FoundIndex.hpp
include/xalanc/XPath/Function.hpp
include/xalanc/XPath/FunctionConcat.hpp
include/xalanc/XPath/FunctionContains.hpp
@@ -110,7 +137,6 @@ include/xalanc/XPath/MutableNodeRefList.hpp
include/xalanc/XPath/NameSpace.hpp
include/xalanc/XPath/NodeRefList.hpp
include/xalanc/XPath/NodeRefListBase.hpp
-include/xalanc/XPath/ResultTreeFragBase.hpp
include/xalanc/XPath/XBoolean.hpp
include/xalanc/XPath/XNodeSet.hpp
include/xalanc/XPath/XNodeSetAllocator.hpp
@@ -164,6 +190,7 @@ include/xalanc/XPath/XTokenNumberAdapterAllocator.hpp
include/xalanc/XPath/XTokenStringAdapter.hpp
include/xalanc/XPath/XTokenStringAdapterAllocator.hpp
include/xalanc/XPath/XUnknown.hpp
+include/xalanc/XPath/XalanDocumentFragmentNodeRefListBaseProxy.hpp
include/xalanc/XPath/XalanQName.hpp
include/xalanc/XPath/XalanQNameByReference.hpp
include/xalanc/XPath/XalanQNameByValue.hpp
@@ -192,6 +219,7 @@ include/xalanc/XSLT/ElemEmpty.hpp
include/xalanc/XSLT/ElemExtensionCall.hpp
include/xalanc/XSLT/ElemFallback.hpp
include/xalanc/XSLT/ElemForEach.hpp
+include/xalanc/XSLT/ElemForwardCompatible.hpp
include/xalanc/XSLT/ElemIf.hpp
include/xalanc/XSLT/ElemLiteralResult.hpp
include/xalanc/XSLT/ElemMessage.hpp
@@ -230,9 +258,6 @@ include/xalanc/XSLT/OutputContextStack.hpp
include/xalanc/XSLT/ProblemListener.hpp
include/xalanc/XSLT/ProblemListenerDefault.hpp
include/xalanc/XSLT/ResultNamespacesStack.hpp
-include/xalanc/XSLT/ResultTreeFrag.hpp
-include/xalanc/XSLT/ResultTreeFragAllocator.hpp
-include/xalanc/XSLT/ResultTreeFragBaseNodeRefListBaseProxy.hpp
include/xalanc/XSLT/SelectionEvent.hpp
include/xalanc/XSLT/Stylesheet.hpp
include/xalanc/XSLT/StylesheetConstructionContext.hpp
@@ -272,9 +297,12 @@ include/xalanc/XSLT/XalanElemTextAllocator.hpp
include/xalanc/XSLT/XalanElemTextLiteralAllocator.hpp
include/xalanc/XSLT/XalanElemValueOfAllocator.hpp
include/xalanc/XSLT/XalanElemVariableAllocator.hpp
+include/xalanc/XSLT/XalanMatchPatternData.hpp
+include/xalanc/XSLT/XalanMatchPatternDataAllocator.hpp
include/xalanc/XSLT/XalanNumberingResourceBundle.hpp
include/xalanc/XSLT/XalanSourceTreeDocumentAllocator.hpp
include/xalanc/XSLT/XalanSourceTreeDocumentFragmentAllocator.hpp
+include/xalanc/XSLT/XalanSpaceNodeTester.hpp
include/xalanc/XalanDOM/XalanAttr.hpp
include/xalanc/XalanDOM/XalanCDATASection.hpp
include/xalanc/XalanDOM/XalanCharacterData.hpp
@@ -301,7 +329,11 @@ include/xalanc/XalanDOM/XalanProcessingInstruction.hpp
include/xalanc/XalanDOM/XalanText.hpp
include/xalanc/XalanEXSLT/XalanEXSLTCommon.hpp
include/xalanc/XalanEXSLT/XalanEXSLTCommonImpl.hpp
+include/xalanc/XalanEXSLT/XalanEXSLTDateTime.hpp
+include/xalanc/XalanEXSLT/XalanEXSLTDateTimeImpl.hpp
include/xalanc/XalanEXSLT/XalanEXSLTDefinitions.hpp
+include/xalanc/XalanEXSLT/XalanEXSLTDynamic.hpp
+include/xalanc/XalanEXSLT/XalanEXSLTDynamicImpl.hpp
include/xalanc/XalanEXSLT/XalanEXSLTMath.hpp
include/xalanc/XalanEXSLT/XalanEXSLTMathImpl.hpp
include/xalanc/XalanEXSLT/XalanEXSLTSet.hpp
@@ -360,68 +392,70 @@ include/xalanc/XalanTransformer/XalanTransformerOutputStream.hpp
include/xalanc/XalanTransformer/XalanTransformerProblemListener.hpp
include/xalanc/XalanTransformer/XercesDOMParsedSource.hpp
include/xalanc/XalanTransformer/XercesDOMWrapperParsedSource.hpp
-include/xalanc/XercesParserLiaison/FormatterToDeprecatedXercesDOM.hpp
+include/xalanc/XercesParserLiaison/Deprecated/FormatterToDeprecatedXercesDOM.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesAttrBridge.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesAttributeBridgeAllocator.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesBridgeHelper.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesBridgeNavigator.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesBridgeTypes.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesCDATASectionBridge.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesCommentBridge.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesDOMImplementationBridge.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesDOM_NodeHack.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesDocumentBridge.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesDocumentFragmentBridge.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesDocumentTypeBridge.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesElementBridge.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesElementBridgeAllocator.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesEntityBridge.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesEntityReferenceBridge.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesNamedNodeMapBridge.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesNodeListBridge.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesNotationBridge.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesProcessingInstructionBridge.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesTextBridge.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesTextBridgeAllocator.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesToXalanNodeMap.hpp
+include/xalanc/XercesParserLiaison/Deprecated/XercesTreeWalker.hpp
include/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp
-include/xalanc/XercesParserLiaison/XercesAttrBridge.hpp
include/xalanc/XercesParserLiaison/XercesAttrWrapper.hpp
include/xalanc/XercesParserLiaison/XercesAttrWrapperAllocator.hpp
-include/xalanc/XercesParserLiaison/XercesAttributeBridgeAllocator.hpp
-include/xalanc/XercesParserLiaison/XercesBridgeHelper.hpp
-include/xalanc/XercesParserLiaison/XercesBridgeNavigator.hpp
-include/xalanc/XercesParserLiaison/XercesBridgeTypes.hpp
-include/xalanc/XercesParserLiaison/XercesCDATASectionBridge.hpp
include/xalanc/XercesParserLiaison/XercesCDATASectionWrapper.hpp
-include/xalanc/XercesParserLiaison/XercesCommentBridge.hpp
include/xalanc/XercesParserLiaison/XercesCommentWrapper.hpp
include/xalanc/XercesParserLiaison/XercesDOMException.hpp
include/xalanc/XercesParserLiaison/XercesDOMFormatterWalker.hpp
-include/xalanc/XercesParserLiaison/XercesDOMImplementationBridge.hpp
include/xalanc/XercesParserLiaison/XercesDOMImplementationWrapper.hpp
include/xalanc/XercesParserLiaison/XercesDOMSupport.hpp
include/xalanc/XercesParserLiaison/XercesDOMWalker.hpp
include/xalanc/XercesParserLiaison/XercesDOMWrapperException.hpp
-include/xalanc/XercesParserLiaison/XercesDOM_NodeHack.hpp
-include/xalanc/XercesParserLiaison/XercesDocumentBridge.hpp
-include/xalanc/XercesParserLiaison/XercesDocumentFragmentBridge.hpp
-include/xalanc/XercesParserLiaison/XercesDocumentNamedNodeListCache.hpp
-include/xalanc/XercesParserLiaison/XercesDocumentTypeBridge.hpp
include/xalanc/XercesParserLiaison/XercesDocumentTypeWrapper.hpp
include/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp
-include/xalanc/XercesParserLiaison/XercesElementBridge.hpp
-include/xalanc/XercesParserLiaison/XercesElementBridgeAllocator.hpp
-include/xalanc/XercesParserLiaison/XercesElementNamedNodeListCache.hpp
include/xalanc/XercesParserLiaison/XercesElementWrapper.hpp
include/xalanc/XercesParserLiaison/XercesElementWrapperAllocator.hpp
-include/xalanc/XercesParserLiaison/XercesEntityBridge.hpp
-include/xalanc/XercesParserLiaison/XercesEntityReferenceBridge.hpp
include/xalanc/XercesParserLiaison/XercesEntityReferenceWrapper.hpp
include/xalanc/XercesParserLiaison/XercesEntityWrapper.hpp
include/xalanc/XercesParserLiaison/XercesLiaisonXalanDOMStringPool.hpp
-include/xalanc/XercesParserLiaison/XercesNamedNodeListCache.hpp
include/xalanc/XercesParserLiaison/XercesNamedNodeMapAttributeList.hpp
-include/xalanc/XercesParserLiaison/XercesNamedNodeMapBridge.hpp
include/xalanc/XercesParserLiaison/XercesNamedNodeMapWrapper.hpp
-include/xalanc/XercesParserLiaison/XercesNodeListBridge.hpp
include/xalanc/XercesParserLiaison/XercesNodeListWrapper.hpp
-include/xalanc/XercesParserLiaison/XercesNotationBridge.hpp
include/xalanc/XercesParserLiaison/XercesNotationWrapper.hpp
include/xalanc/XercesParserLiaison/XercesParserLiaison.hpp
include/xalanc/XercesParserLiaison/XercesParserLiaisonDefinitions.hpp
-include/xalanc/XercesParserLiaison/XercesProcessingInstructionBridge.hpp
include/xalanc/XercesParserLiaison/XercesProcessingInstructionWrapper.hpp
-include/xalanc/XercesParserLiaison/XercesTextBridge.hpp
-include/xalanc/XercesParserLiaison/XercesTextBridgeAllocator.hpp
include/xalanc/XercesParserLiaison/XercesTextWrapper.hpp
include/xalanc/XercesParserLiaison/XercesTextWrapperAllocator.hpp
-include/xalanc/XercesParserLiaison/XercesToXalanNodeMap.hpp
-include/xalanc/XercesParserLiaison/XercesTreeWalker.hpp
include/xalanc/XercesParserLiaison/XercesWrapperHelper.hpp
include/xalanc/XercesParserLiaison/XercesWrapperNavigator.hpp
+include/xalanc/XercesParserLiaison/XercesWrapperNavigatorAllocator.hpp
include/xalanc/XercesParserLiaison/XercesWrapperToXalanNodeMap.hpp
include/xalanc/XercesParserLiaison/XercesWrapperTypes.hpp
lib/libxalan-c.so
-lib/libxalan-c.so.16
-lib/libxalan-c.so.16.0
+lib/libxalan-c.so.110
+lib/libxalan-c.so.110.0
+lib/libxalanMsg.so
+lib/libxalanMsg.so.110
+lib/libxalanMsg.so.110.0
+@dirrm include/xalanc/XercesParserLiaison/Deprecated
@dirrm include/xalanc/XercesParserLiaison
@dirrm include/xalanc/XalanTransformer
@dirrm include/xalanc/XalanSourceTree
@@ -434,5 +468,6 @@ lib/libxalan-c.so.16.0
@dirrm include/xalanc/XMLSupport
@dirrm include/xalanc/PlatformSupport
@dirrm include/xalanc/Include
+@dirrm include/xalanc/Harness
@dirrm include/xalanc/DOMSupport
@dirrm include/xalanc
diff --git a/textproc/xalan-c/distinfo b/textproc/xalan-c/distinfo
index 79741d62e43..be979ae0e85 100644
--- a/textproc/xalan-c/distinfo
+++ b/textproc/xalan-c/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.6 2006/01/05 20:43:20 joerg Exp $
+$NetBSD: distinfo,v 1.7 2008/01/24 07:17:33 xtraeme Exp $
-SHA1 (Xalan-C_1_6-src.tar.gz) = a683c328dd266180bff2a182183be29a4596a662
-RMD160 (Xalan-C_1_6-src.tar.gz) = 9d8d5c85b4cf395d710ce7e3638665cbf17804d5
-Size (Xalan-C_1_6-src.tar.gz) = 1274432 bytes
-SHA1 (patch-aa) = 595c294aa1857b817c6a931e6ba16f4adb0040d8
+SHA1 (Xalan-C_1_10_0-src.tar.gz) = 3fc63045048176e0ab00ce8aa0d15b2c1e5d646b
+RMD160 (Xalan-C_1_10_0-src.tar.gz) = 537ba0be6a14e47eb4453c2d813b31ec416835ab
+Size (Xalan-C_1_10_0-src.tar.gz) = 1554940 bytes
SHA1 (patch-ab) = e67667ba44e8f5cc9beb45a459f52ae1f3a5be59
-SHA1 (patch-ac) = 56e8697c21d9902b5bb9ed35fb63a756a0765e6a
-SHA1 (patch-ad) = d480090164623222f5f8891423af74c251d12a28
diff --git a/textproc/xalan-c/patches/patch-aa b/textproc/xalan-c/patches/patch-aa
deleted file mode 100644
index c906c56314d..00000000000
--- a/textproc/xalan-c/patches/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/01/05 20:43:20 joerg Exp $
-
---- Makefile.in.orig 2005-12-31 00:57:23.000000000 +0000
-+++ Makefile.in
-@@ -257,6 +257,32 @@ ifeq ($(PLATFORM), FREEBSD)
- LINK = $(CXX) -D${PLATFORM} ${PIC_OPTION}
-
- endif
-+#=============== DRAGONFLY SPECIFIC OPTIONS ======================
-+
-+ifeq ($(PLATFORM), DRAGONFLY)
-+
-+ SUPPORTED = TRUE
-+ ALLLIBS = ${LIBS} -L/usr/local/lib
-+ SHLIBSUFFIX=.so
-+ PIC_OPTION = -fPIC
-+
-+ PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} ${PIC_OPTION} ${WCSTOMBS}
-+
-+ # We need the ICU library if we are using the ICUBridge
-+ ifdef XALAN_USE_ICU
-+ LD_RPATH_PRE = -Wl,-rpath,
-+ PLATFORM_LIB_LINK_OPTIONS = $(LD_RPATH_PRE)${ICUROOT}/lib
-+ PLATFORM_LIB_LINK_OPTIONS += -licuuc -licudata -lgcc
-+ ALLLIBS += -L${ICUROOT}
-+ endif
-+
-+ EXTRA_LINK_OPTIONS = ${LDFLAGS}
-+ CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
-+ CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
-+ MAKE_SHARED = $(CXX) $(CXXFLAGS) -D${PLATFORM} -shared ${PIC_OPTION}
-+ LINK = $(CXX) -D${PLATFORM} ${PIC_OPTION}
-+
-+endif
-
- #=============== NETBSD SPECIFIC OPTIONS ======================
-
diff --git a/textproc/xalan-c/patches/patch-ac b/textproc/xalan-c/patches/patch-ac
deleted file mode 100644
index 141a78ac651..00000000000
--- a/textproc/xalan-c/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/01/05 20:43:20 joerg Exp $
-
---- runConfigure.orig 2005-12-31 00:58:34.000000000 +0000
-+++ runConfigure
-@@ -261,7 +261,7 @@ echo "Extra configure options: $configur
- #
-
- case $platform in
-- aix | linux | freebsd | netbsd | solaris | hp-10 | hp-11 | irix | tru64 | macosx)
-+ aix | linux | freebsd | netbsd | solaris | hp-10 | hp-11 | irix | tru64 | macosx | dragonfly)
- # platform has been recognized
- ;;
- *)
-@@ -398,6 +398,8 @@ elif test $platform = "aix"; then
- threadingLibs="-lpthreads"
- elif test $platform = "freebsd"; then
- threadingLibs="-pthread -lc_r"
-+elif test $platform = "dragonfly"; then
-+ threadingLibs="-pthread -lc_r"
- elif test $platform = "netbsd"; then
- threadingLibs="-pthread -lpthread"
- elif test $platform = "hp-10"; then
diff --git a/textproc/xalan-c/patches/patch-ad b/textproc/xalan-c/patches/patch-ad
deleted file mode 100644
index 2cb3f5ae31e..00000000000
--- a/textproc/xalan-c/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/01/05 20:43:20 joerg Exp $
-
---- PlatformSupport/XalanArrayAllocator.hpp.orig 2005-12-31 01:07:05.000000000 +0000
-+++ PlatformSupport/XalanArrayAllocator.hpp
-@@ -211,7 +211,7 @@ private:
- ListEntryType& theNewEntry = m_list.back();
-
- // Resize the vector to the appropriate size...
-- theNewEntry.second.resize(theBlockSize, VectorType::value_type(0));
-+ theNewEntry.second.resize(theBlockSize);
-
- // Set the number of free spaces accordingly...
- theNewEntry.first = theBlockSize - theCount;