Update to 1.1.5rc2

13 files changed, 45 insertions, 294 deletions

diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index a3eff4ca8099..0228923be918 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -6,40 +6,39 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	1.1.4
-PORTREVISION=	2
+PORTVERSION=	1.1.5.rc2
 CATEGORIES+=	editors
-MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \
+MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/rc/1.1.5rc2/&,} \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:moz \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla1.0/src/&,}:mozsrc \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/%SUBDIR%/ \
-		ftp://ftp.kddlabs.co.jp/office/openoffice/%SUBDIR%/ \
-		ftp://ftp.tu-chemnitz.de/pub/openoffice/%SUBDIR%/ \
-		http://ftp.stardiv.de/pub/OpenOffice.org/%SUBDIR%/ \
-		http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \
+		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/rc/1.1.5rc2/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/rc/1.1.5rc2/ \
+		ftp://ftp.tu-chemnitz.de/pub/openoffice/contrib/rc/1.1.5rc2/ \
+		ftp://ftp.stardiv.de/pub/OpenOffice.org/contrib/rc/1.1.5rc2/ \
+		http://ftp.gwdg.de/pub/misc/openoffice/contrib/rc/1.1.5rc2/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent-1.0/&,}:help3 \
 		ftp://ftp.kddlabs.co.jp/office/openoffice/contrib/helpcontent/:help \
 		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
 		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \
-		ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Files/:help2
-MASTER_SITE_SUBDIR=     stable/${PORTVERSION}
-DISTFILES+=	OOo_${PORTVERSION}_source.tar.gz gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.gz
+	ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Files/:help2
+
+DISTFILES+=	OOo_${RELEASE_NR}rc2_src.tar.gz gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_${RELEASE_NR}rc2_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
-USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20040203.tar.gz
 MOZILLA_VERSION=	1.0
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_PROJECT}:moz ${MOZILLA_SOURCE}:mozsrc
-USE_GNOME+=	orbit gtk12
+USE_GNOME=	orbit
 .endif
 
+USE_XLIB=	yes
 USE_PERL5=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
@@ -47,7 +46,7 @@ USE_REINPLACE=	yes
 
 .if !defined(WITHOUT_JAVA)
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.4
 JAVA_BUILD=	jdk
 .endif
 
@@ -62,9 +61,7 @@ LANG_EXT?=	01
 LANG_CONFIGURE_ARG?=	ENUS
 L10NHELP?=     helpcontent_01_unix.tgz
 
-.if defined(L10NHELP)
 DISTFILES+=	${L10NHELP}:help
-.endif
 .if defined(ALL_LOCALIZED_LANGS)
 DISTFILES+=	helpcontent_01_unix.tgz:help helpcontent_07_unix.tgz:help3 \
 		helpcontent_31_unix.tgz:help  helpcontent_33_unix.tgz:help \
@@ -87,9 +84,9 @@ L10NHELPS=	helpcontent_01_unix.tgz helpcontent_07_unix.tgz \
 .endif
 
 CODELINE=		645
-RELEASE_NR=		${PORTVERSION}
+RELEASE_NR=		1.1.5
 INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
-EXECBASE=		openoffice.org-${RELEASE_NR}
+EXECBASE=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org1.1
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=       OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
@@ -115,34 +112,19 @@ CXX=	g++32
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
-		xmkmf:${X_IMAKE_PORT} \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
-.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
-.endif
-LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png \
-		mng.1:${PORTSDIR}/graphics/libmng \
-		freetype.9:${PORTSDIR}/print/freetype2
+		imake:${X_IMAKE_PORT}
 .if defined(WITHOUT_JAVA)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
-.else
-BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 .endif
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	259
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/OOo_${RELEASE_NR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
-ANT?=		${LOCALBASE}/bin/ant
 TCSH?=		/bin/tcsh
-UNZIP?=		${PREFIX}/bin/unzip
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-.if !defined(DISPLAY)
 DISPLAYHACK=localhost:1001
-.endif
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --enable-pasf
 
 .include <${FILESDIR}/Makefile.knobs>
 
@@ -170,15 +152,10 @@ post-extract:
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
-.if defined(L10NHELP)
-	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP ; \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
-.endif
 .if defined(ALL_LOCALIZED_LANGS)
-	@${ECHO_MSG} "===>  Extracting All available L10NHELPs"
-	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP ; \
 	for helpfile in ${L10NHELPS}; do \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$helpfile | ${GZIP_CMD} -d | ${TAR} xf - ; \
@@ -191,38 +168,17 @@ post-extract:
 	@cd ${WRKSRC} ; ${MV} moz moz.runtime ; ${MV} moz.old moz
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/odk/settings/settings.mk
-	@${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/odk/settings/settings.mk
-
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 .if !defined(WITHOUT_MOZILLA)
 	@cd ${WRKSRC}/moz.runtime ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
 .endif
-.if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS)
 	@${MKDIR} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
-.endif
-.if !defined(DISPLAY)
-	#
-	# This is a UGLY hack to not have to specify a X-Display.
-	#
-	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
-	@sleep 5
 .if (${NUMOFPROCESSES}>1)
 	@cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo ; build.pl -P${NUMOFPROCESSES} --all"
 .else
-	cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
-.endif
-	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
-	@${RM} -f ${WRKDIR}/.Xvfb.pid
-.else
-.if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ; DISPLAY=${DISPLAY} ; ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo ; build.pl -P${NUMOFPROCESSES} --all"
-.else
-	@cd ${WRKSRC} ; DISPLAY=${DISPLAY} ; ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
-.endif
+	@cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
diff --git a/editors/openoffice-1.1/distinfo b/editors/openoffice-1.1/distinfo
index f1d22d4988de..5ced965cbbcf 100644
--- a/editors/openoffice-1.1/distinfo
+++ b/editors/openoffice-1.1/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org1.1/OOo_1.1.4_source.tar.gz) = 20c10db97865ae4c51dc827d668b8939
-SIZE (openoffice.org1.1/OOo_1.1.4_source.tar.gz) = 219743530
+MD5 (openoffice.org1.1/OOo_1.1.5rc2_src.tar.gz) = ba4742e3f15ab700b602a9d67a08c597
+SIZE (openoffice.org1.1/OOo_1.1.5rc2_src.tar.gz) = 223387399
 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
@@ -8,6 +8,8 @@ MD5 (openoffice.org1.1/mozilla-source-1.0.tar.gz) = 35a7524c2fbb773e23449179c5cb
 SIZE (openoffice.org1.1/mozilla-source-1.0.tar.gz) = 39881558
 MD5 (openoffice.org1.1/helpcontent_01_unix.tgz) = 7da2aff674c2c84aba8b21ac2ab16bb6
 SIZE (openoffice.org1.1/helpcontent_01_unix.tgz) = 12052480
+MD5 (openoffice.org1.1/helpcontent_01_unix.tgz) = 7da2aff674c2c84aba8b21ac2ab16bb6
+SIZE (openoffice.org1.1/helpcontent_01_unix.tgz) = 12052480
 MD5 (openoffice.org1.1/helpcontent_07_unix.tgz) = e3ab37cbf2407d909953f06467b27611
 SIZE (openoffice.org1.1/helpcontent_07_unix.tgz) = 13820401
 MD5 (openoffice.org1.1/helpcontent_31_unix.tgz) = c7e618e2d9b8bd25cae12954ef2548c9
diff --git a/editors/openoffice-1.1/files/moz-patch b/editors/openoffice-1.1/files/moz-patch
index 818bc154943d..5da4ae43ef25 100644
--- a/editors/openoffice-1.1/files/moz-patch
+++ b/editors/openoffice-1.1/files/moz-patch
@@ -23,7 +23,7 @@ this functionality is not used at all.
 
 --- moz/mozilla-source-1.0.patch.org	Tue Feb 10 19:44:34 2004
 +++ moz/mozilla-source-1.0.patch	Sat Mar 19 12:51:35 2005
-@@ -4471,14 +4471,15 @@
+@@ -4471,14 +4471,16 @@
       return NS_OK;
   }
  
@@ -31,13 +31,14 @@ this functionality is not used at all.
 +--- misc/build/mozilla/.mozconfig	Tue Jul 22 21:52:27 2003
  +++ misc/build/mozilla/.mozconfig	Mon Jul 28 15:07:20 2003
 -@@ -0,0 +1,8 @@
-+@@ -0,0 +1,9 @@
++@@ -0,0 +1,10 @@
  +ac_add_options --disable-tests
  +ac_add_options --disable-xprint
  +ac_add_options --without-system-zlib
  +ac_add_options --enable-ldap
  +ac_add_options --disable-debug
 ++ac_add_options --disable-freetype2
+++ac_add_options --enable-default-toolkit=xlib
  +ac_add_options --enable-optimize
  +ac_add_options --enable-crypto
  +ac_add_options --enable-strip
diff --git a/editors/openoffice-1.1/files/patch-config_office+configure.in b/editors/openoffice-1.1/files/patch-config_office+configure.in
deleted file mode 100644
index 76cb40db51e6..000000000000
--- a/editors/openoffice-1.1/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,26 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=40189
-
-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/files/patch-jvmaccess+source+javainfoimpl.cxx b/editors/openoffice-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx
deleted file mode 100644
index 6ef5bf464ef9..000000000000
--- a/editors/openoffice-1.1/files/patch-jvmaccess+source+javainfoimpl.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-http://qa.openoffice.org/issues/show_bug.cgi?id=40643
-
-Although FreeBSD has its own Java, 1.3.1 and 1.4.2, however,
-it is not certified by SUN Microsystems. FreeBSD can use Linux's Java
-since there is a binary compatibility (NOT EMULATION!)
-Recognize Linux's Java (SUN's, IBM's and Blackdown's) by default,
-we need to add several seachpaths.
-
-Index: jvmaccess/source/javainfoimpl.cxx
-===================================================================
-RCS file: /cvs/udk/jvmaccess/source/Attic/javainfoimpl.cxx,v
-retrieving revision 1.7.12.5
-diff -u -r1.7.12.5 javainfoimpl.cxx
---- jvmaccess/source/javainfoimpl.cxx	20 Oct 2004 11:43:13 -0000	1.7.12.5
-+++ jvmaccess/source/javainfoimpl.cxx	14 Jan 2005 10:58:53 -0000
-@@ -240,8 +240,16 @@
-                         "java", \
-                         "Home", \
-                         "IBMJava2-" ARCH "-131", \
--                        "IBMJava2-" ARCH "-141"
--
-+                        "IBMJava2-" ARCH "-141" , \
-+                        "jdk1.4.2", \
-+                        "diablo-jre1.3.1", \
-+                        "diablo-jdk1.3.1", \
-+                        "linux-sun-jdk1.3.1", \
-+                        "linux-sun-jdk1.4.2", \
-+                        "linux-ibm-jdk1.3.1", \
-+                        "linux-ibm-jdk1.4.2", \
-+                        "linux-blackdown-jdk1.3.1", \
-+                        "linux-blackdown-jdk1.4.2"
- 
- /* These are directories in which a java installation is
-    looked for.
diff --git a/editors/openoffice-1.1/files/patch-odk+configure.pl b/editors/openoffice-1.1/files/patch-odk+configure.pl
index bd269a961590..eba758c6b281 100644
--- a/editors/openoffice-1.1/files/patch-odk+configure.pl
+++ b/editors/openoffice-1.1/files/patch-odk+configure.pl
@@ -1,4 +1,7 @@
-#IZ Not raised yet. this is very ad hoc patch...
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author      : NAKATA Maho <maho@openoffice.org> (JCA)
+Description : most pop name of installated GNU make is gmake, not make for FreeBSD
 
 Index: configure.pl
 ===================================================================
diff --git a/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in b/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in
deleted file mode 100644
index 59269742ab37..000000000000
--- a/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in
+++ /dev/null
@@ -1,28 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=24142
-
---- 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/files/patch-odk+settings+settings.mk b/editors/openoffice-1.1/files/patch-odk+settings+settings.mk
deleted file mode 100644
index 78814a4cfaee..000000000000
--- a/editors/openoffice-1.1/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=24142
-
---- 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/files/patch-scp+source+office+unxbasic.scp b/editors/openoffice-1.1/files/patch-scp+source+office+unxbasic.scp
index daba6e99866f..ecb51c46c8d6 100644
--- a/editors/openoffice-1.1/files/patch-scp+source+office+unxbasic.scp
+++ b/editors/openoffice-1.1/files/patch-scp+source+office+unxbasic.scp
@@ -1,3 +1,8 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author      : NAKATA Maho <maho@openoffice.org> (JCA)
+Description : Do not make a link as /usr/bin/soffice
+
 Index: scp/source/office/unxbasic.scp
 ===================================================================
 RCS file: /cvs/installation/scp/source/office/Attic/unxbasic.scp,v
diff --git a/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
index 6cf440329e06..360312fc8001 100644
--- a/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ b/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
@@ -1,3 +1,7 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author      : NAKATA Maho <maho@openoffice.org> (JCA)
+Description : 
 In solver/645/unxfbsd.pro/inc/rtl/string.hxx,
 even though there is a descrioptin like
 static OString valueOf( sal_Int32 i, sal_Int16 radix = 10 ) SAL_THROW(())
diff --git a/editors/openoffice-1.1/files/patch-sot+source+sdstor+stgole.cxx b/editors/openoffice-1.1/files/patch-sot+source+sdstor+stgole.cxx
deleted file mode 100644
index 748c13bdf642..000000000000
--- a/editors/openoffice-1.1/files/patch-sot+source+sdstor+stgole.cxx
+++ /dev/null
@@ -1,21 +0,0 @@
-OpenOffice DOC document Heap Overflow
-o http://www.openoffice.org/servlets/ReadMsg?list=releases&msgNo=8387
-o http://www.openoffice.org/servlets/ReadMsg?list=releases&msgNo=8417
-http://util.openoffice.org/source/browse/util/sot/source/sdstor/stgole.cxx?r1=1.4&r2=1.4.166.1
-
-Index: sot/source/sdstor/stgole.cxx
-===================================================================
-RCS file: /cvs/util/sot/source/sdstor/stgole.cxx,v
-retrieving revision 1.4
-diff -u -r1.4 stgole.cxx
---- sot/source/sdstor/stgole.cxx	22 Jul 2002 12:28:43 -0000	1.4
-+++ sot/source/sdstor/stgole.cxx	18 Apr 2005 01:34:25 -0000
-@@ -156,6 +156,8 @@
- 		*this >> aClsId;
- 		INT32 nLen1 = 0;
- 		*this >> nLen1;
-+                // higher bits are ignored
-+                nLen1 &= 0xFFFF;
- 		sal_Char* p = new sal_Char[ (USHORT) nLen1 ];
- 		if( Read( p, nLen1 ) == (ULONG) nLen1 )
- 		{
diff --git a/editors/openoffice-1.1/files/patch-translation_limit_64k b/editors/openoffice-1.1/files/patch-translation_limit_64k
index 109833162541..4eea8acadbb5 100644
--- a/editors/openoffice-1.1/files/patch-translation_limit_64k
+++ b/editors/openoffice-1.1/files/patch-translation_limit_64k
@@ -1,7 +1,8 @@
-#iZ 33228#
-#iZ 34210#
-Kannada doesn't build since some resources are limited to 64k.
-it won't fix for 1.1.x
+Issutracker : #i33228#, #i34210#
+CWS         : N/A
+Author      :
+Description : Kannada doesn't build since some resources are
+limited to 64k. it won't fix for 1.1.x officially
 
 Index: inc/sc.hrc
 ===================================================================
diff --git a/editors/openoffice-1.1/files/patch-ucbhelper+source+client+proxydeider.cxx b/editors/openoffice-1.1/files/patch-ucbhelper+source+client+proxydeider.cxx
deleted file mode 100644
index 88225ffe8308..000000000000
--- a/editors/openoffice-1.1/files/patch-ucbhelper+source+client+proxydeider.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=40191
-
-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"