From 42be3556c641cc0f939a2e285045e9a7c426bf0a Mon Sep 17 00:00:00 2001
From: Heinz Wiesinger <HMWiesinger@gmx.at>
Date: Thu, 13 May 2010 00:33:50 +0200
Subject: libraries/xalan-c: Updated for version 1.10.0

---
 libraries/xalan-c/xalan-c-1.10.0+gcc-4.3.patch | 50 ++++++++++++++++++++++++++
 libraries/xalan-c/xalan-c.SlackBuild           | 21 ++++++++---
 libraries/xalan-c/xalan-c.info                 |  2 ++
 3 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 libraries/xalan-c/xalan-c-1.10.0+gcc-4.3.patch

(limited to 'libraries/xalan-c')

diff --git a/libraries/xalan-c/xalan-c-1.10.0+gcc-4.3.patch b/libraries/xalan-c/xalan-c-1.10.0+gcc-4.3.patch
new file mode 100644
index 0000000000..a0a4eeae66
--- /dev/null
+++ b/libraries/xalan-c/xalan-c-1.10.0+gcc-4.3.patch
@@ -0,0 +1,50 @@
+--- XalanDOMString.cpp	2008-03-21 09:50:39.000000000 +0100
++++ xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.cpp	2008-03-21 09:51:06.000000000 +0100
+@@ -26,6 +26,7 @@
+
+
+ #include <cstdlib>
++#include <cstring>
+
+
+
+--- FormatterToHTML.cpp	2008-03-21 09:56:31.000000000 +0100
++++ xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.cpp	2008-03-21 09:56:54.000000000 +0100
+@@ -26,6 +26,7 @@
+
+
+ #include <cassert>
++#include <cstring>
+
+
+
+--- ElemNumber.cpp	2008-03-21 10:09:56.000000000 +0100
++++ xml-xalan/c/src/xalanc/XSLT/ElemNumber.cpp	2008-03-21 10:10:15.000000000 +0100
+@@ -14,6 +14,7 @@
+  * limitations under the License.
+  */
+ #include "ElemNumber.hpp"
++#include <cstring>
+
+
+
+--- DirectoryEnumerator.hpp	2008-03-21 10:19:13.000000000 +0100
++++ xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp	2008-03-21 10:19:41.000000000 +0100
+@@ -36,6 +36,7 @@
+
+ #include <functional>
+ #include <iterator>
++#include <cstring>
+
+
+ #include "xercesc/framework/MemoryManager.hpp"
+--- XalanExe.cpp	2008-03-21 12:11:08.000000000 +0100
++++ xml-xalan/c/src/xalanc/XalanExe/XalanExe.cpp	2008-03-21 12:11:44.000000000 +0100
+@@ -19,6 +19,7 @@
+
+
+ #include <cstdlib>
++#include <cstring>
+ #if defined(XALAN_CLASSIC_IOSTREAMS)
+ #include <iostream.h>
+ #else
diff --git a/libraries/xalan-c/xalan-c.SlackBuild b/libraries/xalan-c/xalan-c.SlackBuild
index 5b918f8f7a..90f19afd0e 100644
--- a/libraries/xalan-c/xalan-c.SlackBuild
+++ b/libraries/xalan-c/xalan-c.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xalan-c
 
-# Copyright 2008 Heinz Wiesinger <hmwiesinger@gmx.at>
+# Copyright 2008-2009 Heinz Wiesinger <pprkut@liwjatan.at>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 PRGNAM=Xalan-C
 VERSION=1_10_0
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -38,10 +38,13 @@ PKGVER=$(echo $VERSION | tr _ .)
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 FLAGS=""
@@ -60,10 +63,20 @@ cd xml-xalan
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+patch -p1 -i $CWD/xalan-c-1.10.0+gcc-4.3.patch
+
 cd c
   XALANCROOT="$TMP/xml-xalan/c" \
   XERCESCROOT="/usr" \
-    ./runConfigure -p linux -c gcc -x g++ -m inmem -r pthreads -P /usr "$FLAGS"
+    ./runConfigure \
+        -p linux \
+        -c gcc \
+        -x g++ \
+        -m inmem \
+        -r pthreads \
+        -P /usr \
+        -C --libdir=/usr/lib$LIBDIRSUFFIX \
+        "$FLAGS"
 
 # I could not get this to compile with more than 1 job, XGizzmo
   XALANCROOT="$TMP/xml-xalan/c" \
@@ -85,4 +98,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$PKGVER-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/xalan-c/xalan-c.info b/libraries/xalan-c/xalan-c.info
index 7d4c51c493..147e1e0d80 100644
--- a/libraries/xalan-c/xalan-c.info
+++ b/libraries/xalan-c/xalan-c.info
@@ -2,7 +2,9 @@ PRGNAM="xalan-c"
 VERSION="1.10.0"
 HOMEPAGE="http://xalan.apache.org"
 DOWNLOAD="http://www.apache.org/dist/xml/xalan-c/Xalan-C_1_10_0-src.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="0a3fbb535885531cc544b07a2060bfb1"
+MD5SUM_x86_64=""
 MAINTAINER="ppr:kut"
 EMAIL="HMWiesinger@gmx.at"
 APPROVED="David Somero"
\ No newline at end of file
-- 
cgit v1.2.3