Add DragonFly support. Fix a C++ issue by dropping the default value

for the vector resize, it is not really needed.

6 files changed, 94 insertions, 2 deletions

diff --git a/textproc/xalan-c/Makefile b/textproc/xalan-c/Makefile
index 80165224944..62ebf15c4f4 100644
--- a/textproc/xalan-c/Makefile
+++ b/textproc/xalan-c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/01/03 00:05:39 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/05 20:43:20 joerg Exp $
 #
 
 DISTNAME=	Xalan-C_1_6-src
@@ -37,6 +37,10 @@ CONFIGURE_ARGS+=	-r pthread
 CONFIGURE_ENV+=	${XALAN_ENV}
 MAKE_ENV+=	${XALAN_ENV}
 
+pre-configure:
+	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}
+	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/xerces-c/buildlink3.mk"
diff --git a/textproc/xalan-c/distinfo b/textproc/xalan-c/distinfo
index 593841c8b9b..79741d62e43 100644
--- a/textproc/xalan-c/distinfo
+++ b/textproc/xalan-c/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 14:48:50 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/01/05 20:43:20 joerg 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 (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
new file mode 100644
index 00000000000..c906c56314d
--- /dev/null
+++ b/textproc/xalan-c/patches/patch-aa
@@ -0,0 +1,37 @@
+$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-ab b/textproc/xalan-c/patches/patch-ab
new file mode 100644
index 00000000000..77fcf7dc2dd
--- /dev/null
+++ b/textproc/xalan-c/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.4 2006/01/05 20:43:20 joerg Exp $
+
+--- configure.orig	2005-12-31 00:57:54.000000000 +0000
++++ configure
+@@ -1121,6 +1121,7 @@ case "${host}" in
+         *-*-solaris*)   platform=SOLARIS ;;
+         *-*-linux*)     platform=LINUX ;;
+         *-*-freebsd*)   platform=FREEBSD ;;
++        *-*-dragonfly*) platform=DRAGONFLY ;;
+         *-*-netbsd*)    platform=NETBSD ;;
+         *-*-irix*)      platform=IRIX ;;
+         *-*-aix*)       platform=AIX ;;
diff --git a/textproc/xalan-c/patches/patch-ac b/textproc/xalan-c/patches/patch-ac
new file mode 100644
index 00000000000..141a78ac651
--- /dev/null
+++ b/textproc/xalan-c/patches/patch-ac
@@ -0,0 +1,22 @@
+$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
new file mode 100644
index 00000000000..2cb3f5ae31e
--- /dev/null
+++ b/textproc/xalan-c/patches/patch-ad
@@ -0,0 +1,13 @@
+$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;