16 files changed, 8 insertions, 472 deletions

diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 79d49bccee6e..0cc8d49509f2 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -83,8 +83,8 @@ L10NHELPS=	helpcontent_07_unix.tgz \
 
 CODELINE=		645
 RELEASE_NR=		1.1.4
-MILESTONE=		54
-SNAPDATE=		20050503
+MILESTONE=		55
+SNAPDATE=		20050615
 INSTALLATION_BASEDIR=   OpenOffice.org${RELEASE_NR}
 EXECBASE=               openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org1.1
diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo
index fd39018486e4..9ddb16e6c96c 100644
--- a/editors/openoffice-1.1-devel/distinfo
+++ b/editors/openoffice-1.1-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org1.1/OOo_1.1.4m54_source.tar.bz2) = f0d556b998846eebae0314ed0e706868
-SIZE (openoffice.org1.1/OOo_1.1.4m54_source.tar.bz2) = 198587650
+MD5 (openoffice.org1.1/OOo_1.1.4m55_source.tar.bz2) = b7a8a3dcaf7fa13f6470a6e988a6506f
+SIZE (openoffice.org1.1/OOo_1.1.4m55_source.tar.bz2) = 201811678
 MD5 (openoffice.org1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org1.1/gpc231.tar.Z) = 27917
 MD5 (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67
diff --git a/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk b/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk
deleted file mode 100644
index 96e65f6ec6df..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-Issutracker : #i48978#
-CWS         : cws_srx645_bsd02
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : do not compile cpp_uno/gcc2_freebsd_intel unless gcc is 2.95
-
-Index: bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk
-===================================================================
-RCS file: /cvs/udk/bridges/source/cpp_uno/gcc2_freebsd_intel/Attic/makefile.mk,v
-retrieving revision 1.1
-diff -u -r1.1 makefile.mk
---- bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	12 Nov 2001 22:43:04 -0000	1.1
-+++ bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	10 May 2005 01:12:25 -0000
-@@ -76,7 +76,7 @@
- 
- # --- Files --------------------------------------------------------
- 
--.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc2"
- 
- CFLAGSNOOPT=-O0
- NOOPTFILES=$(SLO)$/uno2cpp.obj
diff --git a/editors/openoffice-1.1-devel/files/patch-config_office+configure.in b/editors/openoffice-1.1-devel/files/patch-config_office+configure.in
deleted file mode 100644
index 6cb878d81452..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,29 +0,0 @@
-Issutracker : #i40189#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct PTHREAD_* flags
-
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.55.6.10
-diff -u -r1.55.6.10 configure.in
---- config_office/configure.in	27 Aug 2004 10:03:41 -0000	1.55.6.10
-+++ config_office/configure.in	18 Dec 2004 03:13:51 -0000
-@@ -357,13 +357,14 @@
- 			OSVERSION=`/sbin/sysctl -n kern.osreldate`
- 		fi
- 		AC_MSG_RESULT([found OSVERSION=$OSVERSION])
--		PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 		if test "$OSVERSION" -lt "500016"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-pthread"
- 		elif test "$OSVERSION" -lt "502102"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-lc_r"
- 		else 
--			PTHREAD_LIBS="-lpthread"
-+			PTHREAD_LIBS="-pthread"
- 		fi
- 		;;
- 	"OSF1")
diff --git a/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in
deleted file mode 100644
index 55bab8afbb32..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in
+++ /dev/null
@@ -1,31 +0,0 @@
-Issutracker : #i40190#, #i24142#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Add SDK support for FreeBSD
-
---- odk/setsdkenv_unix.in.orig	Sun Jan 25 18:41:01 2004
-+++ odk/setsdkenv_unix.in	Sun Jan 25 18:42:00 2004
-@@ -2,7 +2,8 @@
- 
- # This script starts a new shell and sets all enviroment variables, which
- # are necessary for building the examples of the Office Development Kit.
--# The Script was developed for the operating systems Solaris and Linux.
-+# The script was developed for the operating systems Solaris, Linux, MacOS X
-+# and FreeBSD.
- 
- # Installation directory of the Software Development Kit.
- # Example: OO_SDK_HOME=/work/StarOffice_SDK
-@@ -76,6 +77,13 @@
-     LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH
-     export LD_LIBRARY_PATH
-     ;;
-+
-+  FreeBSD)
-+    directoryname=freebsd
-+    exampleout=FREEBSDexample.out
-+    LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH
-+    export LD_LIBRARY_PATH
-+    ;;
- esac
- 
- # Add directory of the SDK tools to the path.
diff --git a/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk b/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk
deleted file mode 100644
index c8194ff76f7f..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-Issutracker : #i40190#, #i24142#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : SDK support for FreeBSD
-
---- odk/settings/settings.mk.orig	Sun Jan 25 18:41:02 2004
-+++ odk/settings/settings.mk	Sun Jan 25 18:45:09 2004
-@@ -368,3 +368,85 @@
- 
- endif
- 
-+ifeq "$(PLATFORM)" "FreeBSD"
-+# Settings for FreeBSD using gcc compiler
-+
-+PROCTYPE := $(shell uname -m)
-+
-+    
-+# Default is freebsd on a intel machine    
-+PLATFORM=FreeBSD
-+PACKAGE_LIB_DIR=freebsd_x86.plt
-+JAVA_PROC_TYPE=i386
-+
-+OS=FREEBSD
-+PS=/
-+CC=gcc
-+LINK=gcc
-+LIB=gcc
-+ECHO=@echo
-+MKDIR=mkdir -p
-+CAT=cat
-+OBJ_EXT=o
-+SHAREDLIB_EXT=so
-+SHAREDLIB_PRE=lib
-+SHAREDLIB_OUT=$(OUT_LIB)
-+    
-+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=\>
-+QUOTE=$(subst S,\,S)
-+QM=\"
-+    
-+DEL=rm -f
-+DELRECURSIVE=rm -rf
-+COPY=cp
-+URLPREFIX=file://
-+
-+# Include UDK version numbers
-+include $(PRJ)/include/udkversion.mk
-+
-+SALLIB=-lsal
-+CPPULIB=-lcppu
-+CPPUHELPERLIB=-lcppuhelper$(COMID)
-+SALHELPERLIB=-lsalhelper$(COMID)
-+STLPORTLIB=-lstlport_gcc
-+
-+EMPTYSTRING=
-+PATH_SEPARATOR=:
-+
-+# -O is necessary for inlining (see gcc documentation)
-+ifeq "$(DEBUG)" "yes"
-+CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%%
-+else
-+CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%%
-+endif
-+
-+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd
-+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include
-+STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl
-+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV)
-+
-+# define for used compiler necessary for UNO
-+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95
-+#-DCPPU_ENV=gcc3 -- gcc3 3.0
-+
-+CC_OUTPUT_SWITCH=-o
-+
-+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'
-+
-+EXE_LINK_FLAGS=-Wl
-+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%%
-+LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)
-+
-+endif
-+
diff --git a/editors/openoffice-1.1-devel/files/patch-ucbhelper+source+client+proxydeider.cxx b/editors/openoffice-1.1-devel/files/patch-ucbhelper+source+client+proxydeider.cxx
deleted file mode 100644
index a5dd8fbfb172..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-ucbhelper+source+client+proxydeider.cxx
+++ /dev/null
@@ -1,23 +0,0 @@
-Issutracker : #i40191#
-CWS         : cws_srx645_bsd01
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : sys/socket.h is needed for FreeBSD
-
-Index: ucbhelper/source/client/proxydecider.cxx
-===================================================================
-RCS file: /cvs/ucb/ucbhelper/source/client/proxydecider.cxx,v
-retrieving revision 1.3.16.1
-diff -u -r1.3.16.1 proxydecider.cxx
---- ucbhelper/source/client/proxydecider.cxx	20 Oct 2004 12:04:36 -0000	1.3.16.1
-+++ ucbhelper/source/client/proxydecider.cxx	30 Dec 2004 04:12:01 -0000
-@@ -127,6 +127,10 @@
- #include <unistd.h>
- #endif
- 
-+#if defined (FREEBSD)
-+#include <sys/socket.h>
-+#endif
-+
- #ifdef SOLARIS
- 
- extern "C"
diff --git a/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+app+makefile.mk b/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+app+makefile.mk
deleted file mode 100644
index d8255abac36a..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+app+makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-Issutracker : #i48988#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : at configure stage,  ENABLE_PASF is settend to NO.
----config_office/configure.in start
-dnl ===================================================================
-dnl Test whether wwe want to use portaudio/sndfile
-dnl ===================================================================
-AC_MSG_CHECKING([whether to use portaudio/sndfile])
-ENABLE_PASF=NO
-if test -n "$enable_pasf"; then
-        ENABLE_PASF=YES
-        AC_MSG_RESULT([yes])
-else
-        AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_PASF)
----end
-
-Index: vcl/unx/source/app/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/app/makefile.mk,v
-retrieving revision 1.9.250.3
-diff -u -r1.9.250.3 makefile.mk
---- vcl/unx/source/app/makefile.mk	29 Apr 2005 14:25:56 -0000	1.9.250.3
-+++ vcl/unx/source/app/makefile.mk	10 May 2005 05:53:27 -0000
-@@ -113,7 +113,7 @@
- 			$(SLO)$/rptpsound.obj		\
- 			$(SLO)$/nassound.obj		
- 
--.IF "$(ENABLE_PASF)" != ""
-+.IF "$(ENABLE_PASF)" == "YES"
- CFLAGS+=-DUSE_PASF
- .IF "$(SYSTEM_PORTAUDIO)" == "YES"
- CFLAGS+=-DSYSTEM_PORTAUDIO
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 79d49bccee6e..0cc8d49509f2 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -83,8 +83,8 @@ L10NHELPS=	helpcontent_07_unix.tgz \
 
 CODELINE=		645
 RELEASE_NR=		1.1.4
-MILESTONE=		54
-SNAPDATE=		20050503
+MILESTONE=		55
+SNAPDATE=		20050615
 INSTALLATION_BASEDIR=   OpenOffice.org${RELEASE_NR}
 EXECBASE=               openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org1.1
diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo
index fd39018486e4..9ddb16e6c96c 100644
--- a/editors/openoffice.org-1.1-devel/distinfo
+++ b/editors/openoffice.org-1.1-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org1.1/OOo_1.1.4m54_source.tar.bz2) = f0d556b998846eebae0314ed0e706868
-SIZE (openoffice.org1.1/OOo_1.1.4m54_source.tar.bz2) = 198587650
+MD5 (openoffice.org1.1/OOo_1.1.4m55_source.tar.bz2) = b7a8a3dcaf7fa13f6470a6e988a6506f
+SIZE (openoffice.org1.1/OOo_1.1.4m55_source.tar.bz2) = 201811678
 MD5 (openoffice.org1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org1.1/gpc231.tar.Z) = 27917
 MD5 (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67
diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk
deleted file mode 100644
index 96e65f6ec6df..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-Issutracker : #i48978#
-CWS         : cws_srx645_bsd02
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : do not compile cpp_uno/gcc2_freebsd_intel unless gcc is 2.95
-
-Index: bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk
-===================================================================
-RCS file: /cvs/udk/bridges/source/cpp_uno/gcc2_freebsd_intel/Attic/makefile.mk,v
-retrieving revision 1.1
-diff -u -r1.1 makefile.mk
---- bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	12 Nov 2001 22:43:04 -0000	1.1
-+++ bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk	10 May 2005 01:12:25 -0000
-@@ -76,7 +76,7 @@
- 
- # --- Files --------------------------------------------------------
- 
--.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc2"
- 
- CFLAGSNOOPT=-O0
- NOOPTFILES=$(SLO)$/uno2cpp.obj
diff --git a/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in b/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in
deleted file mode 100644
index 6cb878d81452..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,29 +0,0 @@
-Issutracker : #i40189#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : correct PTHREAD_* flags
-
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.55.6.10
-diff -u -r1.55.6.10 configure.in
---- config_office/configure.in	27 Aug 2004 10:03:41 -0000	1.55.6.10
-+++ config_office/configure.in	18 Dec 2004 03:13:51 -0000
-@@ -357,13 +357,14 @@
- 			OSVERSION=`/sbin/sysctl -n kern.osreldate`
- 		fi
- 		AC_MSG_RESULT([found OSVERSION=$OSVERSION])
--		PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 		if test "$OSVERSION" -lt "500016"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-pthread"
- 		elif test "$OSVERSION" -lt "502102"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-lc_r"
- 		else 
--			PTHREAD_LIBS="-lpthread"
-+			PTHREAD_LIBS="-pthread"
- 		fi
- 		;;
- 	"OSF1")
diff --git a/editors/openoffice.org-1.1-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-1.1-devel/files/patch-odk+setsdkenv_unix.in
deleted file mode 100644
index 55bab8afbb32..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-odk+setsdkenv_unix.in
+++ /dev/null
@@ -1,31 +0,0 @@
-Issutracker : #i40190#, #i24142#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Add SDK support for FreeBSD
-
---- odk/setsdkenv_unix.in.orig	Sun Jan 25 18:41:01 2004
-+++ odk/setsdkenv_unix.in	Sun Jan 25 18:42:00 2004
-@@ -2,7 +2,8 @@
- 
- # This script starts a new shell and sets all enviroment variables, which
- # are necessary for building the examples of the Office Development Kit.
--# The Script was developed for the operating systems Solaris and Linux.
-+# The script was developed for the operating systems Solaris, Linux, MacOS X
-+# and FreeBSD.
- 
- # Installation directory of the Software Development Kit.
- # Example: OO_SDK_HOME=/work/StarOffice_SDK
-@@ -76,6 +77,13 @@
-     LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH
-     export LD_LIBRARY_PATH
-     ;;
-+
-+  FreeBSD)
-+    directoryname=freebsd
-+    exampleout=FREEBSDexample.out
-+    LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH
-+    export LD_LIBRARY_PATH
-+    ;;
- esac
- 
- # Add directory of the SDK tools to the path.
diff --git a/editors/openoffice.org-1.1-devel/files/patch-odk+settings+settings.mk b/editors/openoffice.org-1.1-devel/files/patch-odk+settings+settings.mk
deleted file mode 100644
index c8194ff76f7f..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-Issutracker : #i40190#, #i24142#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : SDK support for FreeBSD
-
---- odk/settings/settings.mk.orig	Sun Jan 25 18:41:02 2004
-+++ odk/settings/settings.mk	Sun Jan 25 18:45:09 2004
-@@ -368,3 +368,85 @@
- 
- endif
- 
-+ifeq "$(PLATFORM)" "FreeBSD"
-+# Settings for FreeBSD using gcc compiler
-+
-+PROCTYPE := $(shell uname -m)
-+
-+    
-+# Default is freebsd on a intel machine    
-+PLATFORM=FreeBSD
-+PACKAGE_LIB_DIR=freebsd_x86.plt
-+JAVA_PROC_TYPE=i386
-+
-+OS=FREEBSD
-+PS=/
-+CC=gcc
-+LINK=gcc
-+LIB=gcc
-+ECHO=@echo
-+MKDIR=mkdir -p
-+CAT=cat
-+OBJ_EXT=o
-+SHAREDLIB_EXT=so
-+SHAREDLIB_PRE=lib
-+SHAREDLIB_OUT=$(OUT_LIB)
-+    
-+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=\>
-+QUOTE=$(subst S,\,S)
-+QM=\"
-+    
-+DEL=rm -f
-+DELRECURSIVE=rm -rf
-+COPY=cp
-+URLPREFIX=file://
-+
-+# Include UDK version numbers
-+include $(PRJ)/include/udkversion.mk
-+
-+SALLIB=-lsal
-+CPPULIB=-lcppu
-+CPPUHELPERLIB=-lcppuhelper$(COMID)
-+SALHELPERLIB=-lsalhelper$(COMID)
-+STLPORTLIB=-lstlport_gcc
-+
-+EMPTYSTRING=
-+PATH_SEPARATOR=:
-+
-+# -O is necessary for inlining (see gcc documentation)
-+ifeq "$(DEBUG)" "yes"
-+CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%%
-+else
-+CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%%
-+endif
-+
-+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd
-+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include
-+STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl
-+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV)
-+
-+# define for used compiler necessary for UNO
-+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95
-+#-DCPPU_ENV=gcc3 -- gcc3 3.0
-+
-+CC_OUTPUT_SWITCH=-o
-+
-+LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'
-+
-+EXE_LINK_FLAGS=-Wl
-+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%%
-+LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)
-+
-+endif
-+
diff --git a/editors/openoffice.org-1.1-devel/files/patch-ucbhelper+source+client+proxydeider.cxx b/editors/openoffice.org-1.1-devel/files/patch-ucbhelper+source+client+proxydeider.cxx
deleted file mode 100644
index a5dd8fbfb172..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-ucbhelper+source+client+proxydeider.cxx
+++ /dev/null
@@ -1,23 +0,0 @@
-Issutracker : #i40191#
-CWS         : cws_srx645_bsd01
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : sys/socket.h is needed for FreeBSD
-
-Index: ucbhelper/source/client/proxydecider.cxx
-===================================================================
-RCS file: /cvs/ucb/ucbhelper/source/client/proxydecider.cxx,v
-retrieving revision 1.3.16.1
-diff -u -r1.3.16.1 proxydecider.cxx
---- ucbhelper/source/client/proxydecider.cxx	20 Oct 2004 12:04:36 -0000	1.3.16.1
-+++ ucbhelper/source/client/proxydecider.cxx	30 Dec 2004 04:12:01 -0000
-@@ -127,6 +127,10 @@
- #include <unistd.h>
- #endif
- 
-+#if defined (FREEBSD)
-+#include <sys/socket.h>
-+#endif
-+
- #ifdef SOLARIS
- 
- extern "C"
diff --git a/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+app+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+app+makefile.mk
deleted file mode 100644
index d8255abac36a..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+app+makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-Issutracker : #i48988#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : at configure stage,  ENABLE_PASF is settend to NO.
----config_office/configure.in start
-dnl ===================================================================
-dnl Test whether wwe want to use portaudio/sndfile
-dnl ===================================================================
-AC_MSG_CHECKING([whether to use portaudio/sndfile])
-ENABLE_PASF=NO
-if test -n "$enable_pasf"; then
-        ENABLE_PASF=YES
-        AC_MSG_RESULT([yes])
-else
-        AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_PASF)
----end
-
-Index: vcl/unx/source/app/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/app/makefile.mk,v
-retrieving revision 1.9.250.3
-diff -u -r1.9.250.3 makefile.mk
---- vcl/unx/source/app/makefile.mk	29 Apr 2005 14:25:56 -0000	1.9.250.3
-+++ vcl/unx/source/app/makefile.mk	10 May 2005 05:53:27 -0000
-@@ -113,7 +113,7 @@
- 			$(SLO)$/rptpsound.obj		\
- 			$(SLO)$/nassound.obj		
- 
--.IF "$(ENABLE_PASF)" != ""
-+.IF "$(ENABLE_PASF)" == "YES"
- CFLAGS+=-DUSE_PASF
- .IF "$(SYSTEM_PORTAUDIO)" == "YES"
- CFLAGS+=-DSYSTEM_PORTAUDIO