aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2002-06-07 15:29:55 +0000
committerMartin Blapp <mbr@FreeBSD.org>2002-06-07 15:29:55 +0000
commit38285ee8ef3a6e55315f9708e4ba13454400d8c8 (patch)
treea3188a24027765681be375e62b12829cbe0d5110 /editors
parentc7b31b51f7256ca8895a17fc293f3ff0188d3ab2 (diff)
downloadports-38285ee8ef3a6e55315f9708e4ba13454400d8c8.tar.gz
ports-38285ee8ef3a6e55315f9708e4ba13454400d8c8.zip
Add missing -D_REENTRANT in CURRENT.
Notes
Notes: svn path=/head/; revision=60771
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice-1.0/files/patch-stlport::STLport-4.5.patch8
-rw-r--r--editors/openoffice-1.1-devel/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice-1.1/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice-2.0-devel/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice-3-devel/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice-3/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice-devel/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice.org-1.0/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice.org-1.0/files/patch-stlport::STLport-4.5.patch8
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice.org-1.1/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice.org-2-devel/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice.org-2.0/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice.org-2/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice.org-3-RC/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice.org-3-devel/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice.org-3/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice/files/patch-stlport+STLport-4.5.patch8
-rw-r--r--editors/openoffice/files/patch-stlport::STLport-4.5.patch8
23 files changed, 92 insertions, 92 deletions
diff --git a/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice-1.0/files/patch-stlport::STLport-4.5.patch b/editors/openoffice-1.0/files/patch-stlport::STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice-1.0/files/patch-stlport::STLport-4.5.patch
+++ b/editors/openoffice-1.0/files/patch-stlport::STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice-1.1-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-1.1-devel/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice-1.1-devel/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice-1.1-devel/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice-1.1/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-1.1/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice-1.1/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice-1.1/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice-2.0-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-2.0-devel/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice-2.0-devel/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice-2.0-devel/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice-3-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-3-devel/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice-3-devel/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice-3-devel/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice-3/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-3/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice-3/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice-3/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-devel/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice-devel/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice-devel/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice.org-1.0/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-1.0/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice.org-1.0/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-1.0/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice.org-1.0/files/patch-stlport::STLport-4.5.patch b/editors/openoffice.org-1.0/files/patch-stlport::STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice.org-1.0/files/patch-stlport::STLport-4.5.patch
+++ b/editors/openoffice.org-1.0/files/patch-stlport::STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-1.1-devel/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-1.1-devel/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice.org-1.1/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-1.1/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice.org-1.1/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-1.1/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice.org-2-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-2-devel/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice.org-2-devel/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-2-devel/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-2.0-devel/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-2.0-devel/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice.org-2.0/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-2.0/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice.org-2.0/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-2.0/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice.org-2/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-2/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice.org-2/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-2/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice.org-3-RC/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-3-RC/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice.org-3-RC/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-3-RC/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice.org-3-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-3-devel/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice.org-3-devel/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-3-devel/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice.org-3/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-3/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice.org-3/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-3/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-vcltesttool/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-vcltesttool/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice/files/patch-stlport+STLport-4.5.patch b/editors/openoffice/files/patch-stlport+STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice/files/patch-stlport+STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries
diff --git a/editors/openoffice/files/patch-stlport::STLport-4.5.patch b/editors/openoffice/files/patch-stlport::STLport-4.5.patch
index 83b4a7359d18..8c482fea843a 100644
--- a/editors/openoffice/files/patch-stlport::STLport-4.5.patch
+++ b/editors/openoffice/files/patch-stlport::STLport-4.5.patch
@@ -12,8 +12,8 @@
+ #
+-CC = gcc -pthread
+-CXX = c++ -pthread -fexceptions
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
+
+ #
+ # Basename for libraries
@@ -47,8 +47,8 @@
++#
++# compiler
++#
-++CC+= ${PTHREAD_CFLAGS}
-++CXX+= ${PTHREAD_CFLAGS} -fexceptions
+++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
+++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
++
++#
++# Basename for libraries