./packages/openofficeorg/3.2/unstable r1978: update cws-kfreebsdport01v2.diff to fix SDK for kfreebsd-*

[Rene Engelhard <rene@debian.org>]

------------------------------------------------------------
revno: 1978
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2010-05-06 13:27:13 +0200
message:
  update cws-kfreebsdport01v2.diff to fix SDK for kfreebsd-*
modified:
  changelog
  patches/cws-kfreebsdport01v2.diff

=== modified file 'changelog'
--- a/changelog	2010-05-02 21:38:47 +0000
+++ b/changelog	2010-05-06 11:27:13 +0000
@@ -1,3 +1,10 @@
+openoffice.org (1:3.2.0-10) unstable; urgency=low
+
+  * debian/patches/cws-kfreebsdport01v2.diff: update to fix SDK for
+    kfreebsd-*
+
+ -- Rene Engelhard <rene@debian.org>  Wed, 05 May 2010 13:20:25 +0200
+
 openoffice.org (1:3.2.0-9) unstable; urgency=low
 
   * debian/patches/cws-kfreebsdport01v2.diff: add kFreeBSD port patches,

=== modified file 'patches/cws-kfreebsdport01v2.diff'
--- a/patches/cws-kfreebsdport01v2.diff	2010-04-25 17:50:21 +0000
+++ b/patches/cws-kfreebsdport01v2.diff	2010-05-06 11:27:13 +0000
@@ -23,7 +23,7 @@
 
 --- /dev/null	2010-04-14 03:44:50.008165136 +0200
 +++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/cws-kfreebsdport01v2.diff	2010-04-17 15:10:04.000000000 +0200
-@@ -0,0 +1,9796 @@
+@@ -0,0 +1,9852 @@
 +diff --git a/config.guess b/config.guess
 +--- config.guess
 ++++ config.guess
@@ -9820,3 +9820,59 @@
 ++   return (0);
 ++ }
 ++ 
++diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
++--- odk/settings/settings.mk
+++++ odk/settings/settings.mk
++@@ -498,13 +498,37 @@
++ 
++ PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
++ 
++-# Default is freebsd on a intel machine    
+++ifeq (kfreebsd,$(findstring kfreebsd,$(PLATFORM)))
+++PLATFORM=kfreebsd
+++ifeq "$(PROCTYPE)" "x86_64"
+++PACKAGE_LIB_DIR=kfreebsd_x86_64.plt
+++UNOPKG_PLATFORM=kFreeBSD_x86_64
+++else
+++PACKAGE_LIB_DIR=kfreebsd_x86.plt
+++UNOPKG_PLATFORM=kFreeBSD_x86
+++endif
+++else
++ PLATFORM=freebsd
+++ifeq "$(PROCTYPE)" "x86_64"
+++PACKAGE_LIB_DIR=freebsd_x86_64.plt
+++UNOPKG_PLATFORM=FreeBSD_x86_64
+++else
++ PACKAGE_LIB_DIR=freebsd_x86.plt
++ UNOPKG_PLATFORM=FreeBSD_x86
+++endif
+++endif
+++
+++ifeq "$(PROCTYPE)" "x86_64"
+++JAVA_PROC_TYPE=amd64
+++else
++ JAVA_PROC_TYPE=i386
+++endif
++ 
+++ifeq (kfreebsd,$(findstring kfreebsd,$(PLATFORM)))
+++OS=LINUX
+++else
++ OS=FREEBSD
+++endif
++ PS=/
++ ICL=\$$
++ CC=gcc
++@@ -520,13 +544,8 @@
++ 
++ GCC_VERSION=$(shell $(CC) -dumpversion)
++ 
++-ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3"
++ COMID=gcc3
++ CPPU_ENV=gcc3
++-else
++-COMID=GCC
++-CPPU_ENV=gcc2
++-endif
++ 
++ OSEP=\<
++ CSEP=\>