summaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authormaho <maho@FreeBSD.org>2005-01-20 11:33:35 +0000
committermaho <maho@FreeBSD.org>2005-01-20 11:33:35 +0000
commit3ccfd3eeaa927a87405d06dbc2003a7174724c95 (patch)
tree19db160fd5c2f70d4333a7eeadede307c3819188 /editors
parentec851bf5ebeed269c260af4d2fb4ddad342b4791 (diff)
downloadFreeBSD-ports-3ccfd3eeaa927a87405d06dbc2003a7174724c95.zip
FreeBSD-ports-3ccfd3eeaa927a87405d06dbc2003a7174724c95.tar.gz
update to 1.9m72
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-2.0-devel/Makefile13
-rw-r--r--editors/openoffice-2.0-devel/distinfo4
-rw-r--r--editors/openoffice-2.0-devel/files/Makefile.knobs3
-rw-r--r--editors/openoffice-2.0-devel/files/patch-odk+setsdkenv_unix.in33
-rw-r--r--editors/openoffice-2.0-devel/files/patch-odk+settings+settings.mk95
-rw-r--r--editors/openoffice-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl27
-rw-r--r--editors/openoffice-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl32
-rw-r--r--editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk4
-rw-r--r--editors/openoffice-3-devel/Makefile13
-rw-r--r--editors/openoffice-3-devel/distinfo4
-rw-r--r--editors/openoffice-3-devel/files/Makefile.knobs3
-rw-r--r--editors/openoffice-3-devel/files/patch-odk+setsdkenv_unix.in33
-rw-r--r--editors/openoffice-3-devel/files/patch-odk+settings+settings.mk95
-rw-r--r--editors/openoffice-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl27
-rw-r--r--editors/openoffice-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl32
-rw-r--r--editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk4
-rw-r--r--editors/openoffice-3/Makefile13
-rw-r--r--editors/openoffice-3/distinfo4
-rw-r--r--editors/openoffice-3/files/Makefile.knobs3
-rw-r--r--editors/openoffice-3/files/patch-odk+setsdkenv_unix.in33
-rw-r--r--editors/openoffice-3/files/patch-odk+settings+settings.mk95
-rw-r--r--editors/openoffice-3/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl27
-rw-r--r--editors/openoffice-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl32
-rw-r--r--editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk4
-rw-r--r--editors/openoffice.org-2-RC/Makefile13
-rw-r--r--editors/openoffice.org-2-RC/distinfo4
-rw-r--r--editors/openoffice.org-2-RC/files/Makefile.knobs3
-rw-r--r--editors/openoffice.org-2-RC/files/patch-odk+setsdkenv_unix.in33
-rw-r--r--editors/openoffice.org-2-RC/files/patch-odk+settings+settings.mk95
-rw-r--r--editors/openoffice.org-2-RC/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl27
-rw-r--r--editors/openoffice.org-2-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl32
-rw-r--r--editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk4
-rw-r--r--editors/openoffice.org-2-devel/Makefile13
-rw-r--r--editors/openoffice.org-2-devel/distinfo4
-rw-r--r--editors/openoffice.org-2-devel/files/Makefile.knobs3
-rw-r--r--editors/openoffice.org-2-devel/files/patch-odk+setsdkenv_unix.in33
-rw-r--r--editors/openoffice.org-2-devel/files/patch-odk+settings+settings.mk95
-rw-r--r--editors/openoffice.org-2-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl27
-rw-r--r--editors/openoffice.org-2-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl32
-rw-r--r--editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk4
-rw-r--r--editors/openoffice.org-2.0-devel/Makefile13
-rw-r--r--editors/openoffice.org-2.0-devel/distinfo4
-rw-r--r--editors/openoffice.org-2.0-devel/files/Makefile.knobs3
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-odk+setsdkenv_unix.in33
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-odk+settings+settings.mk95
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl27
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl32
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk4
-rw-r--r--editors/openoffice.org-2.0/Makefile13
-rw-r--r--editors/openoffice.org-2.0/distinfo4
-rw-r--r--editors/openoffice.org-2.0/files/Makefile.knobs3
-rw-r--r--editors/openoffice.org-2.0/files/patch-odk+setsdkenv_unix.in33
-rw-r--r--editors/openoffice.org-2.0/files/patch-odk+settings+settings.mk95
-rw-r--r--editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl27
-rw-r--r--editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl32
-rw-r--r--editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk4
-rw-r--r--editors/openoffice.org-2/Makefile13
-rw-r--r--editors/openoffice.org-2/distinfo4
-rw-r--r--editors/openoffice.org-2/files/Makefile.knobs3
-rw-r--r--editors/openoffice.org-2/files/patch-odk+setsdkenv_unix.in33
-rw-r--r--editors/openoffice.org-2/files/patch-odk+settings+settings.mk95
-rw-r--r--editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl27
-rw-r--r--editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl32
-rw-r--r--editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk4
-rw-r--r--editors/openoffice.org-3-RC/Makefile13
-rw-r--r--editors/openoffice.org-3-RC/distinfo4
-rw-r--r--editors/openoffice.org-3-RC/files/Makefile.knobs3
-rw-r--r--editors/openoffice.org-3-RC/files/patch-odk+setsdkenv_unix.in33
-rw-r--r--editors/openoffice.org-3-RC/files/patch-odk+settings+settings.mk95
-rw-r--r--editors/openoffice.org-3-RC/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl27
-rw-r--r--editors/openoffice.org-3-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl32
-rw-r--r--editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk4
-rw-r--r--editors/openoffice.org-3-devel/Makefile13
-rw-r--r--editors/openoffice.org-3-devel/distinfo4
-rw-r--r--editors/openoffice.org-3-devel/files/Makefile.knobs3
-rw-r--r--editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix.in33
-rw-r--r--editors/openoffice.org-3-devel/files/patch-odk+settings+settings.mk95
-rw-r--r--editors/openoffice.org-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl27
-rw-r--r--editors/openoffice.org-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl32
-rw-r--r--editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk4
-rw-r--r--editors/openoffice.org-3/Makefile13
-rw-r--r--editors/openoffice.org-3/distinfo4
-rw-r--r--editors/openoffice.org-3/files/Makefile.knobs3
-rw-r--r--editors/openoffice.org-3/files/patch-odk+setsdkenv_unix.in33
-rw-r--r--editors/openoffice.org-3/files/patch-odk+settings+settings.mk95
-rw-r--r--editors/openoffice.org-3/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl27
-rw-r--r--editors/openoffice.org-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl32
-rw-r--r--editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk4
-rw-r--r--editors/openoffice.org-vcltesttool/Makefile13
-rw-r--r--editors/openoffice.org-vcltesttool/distinfo4
-rw-r--r--editors/openoffice.org-vcltesttool/files/Makefile.knobs3
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-odk+setsdkenv_unix.in33
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-odk+settings+settings.mk95
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl27
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl32
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk4
96 files changed, 516 insertions, 2016 deletions
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 94c368a..2c535dc 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
-SNAPDATE= 20050110
+SNAPDATE= 20050119
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@@ -49,10 +49,10 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 71
+MILESTONE= 72
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
-DIST_SUBDIR= openoffice2.0
+DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
@@ -141,10 +141,6 @@ 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
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
@@ -190,7 +186,8 @@ post-install:
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} > ${TMPPLIST}
+ @${PRINTF} "bin/openoffice.org" > ${TMPPLIST}
+ @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index a09abe3..df4cc4f 100644
--- a/editors/openoffice-2.0-devel/distinfo
+++ b/editors/openoffice-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_1.9m71_source.tar.bz2) = d4dbf690d08471dca83d0f25ffe947f8
-SIZE (openoffice2.0/OOo_1.9m71_source.tar.bz2) = 234489374
+MD5 (openoffice2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
+SIZE (openoffice2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice2.0/gpc231.tar.Z) = 27917
MD5 (openoffice2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice-2.0-devel/files/Makefile.knobs b/editors/openoffice-2.0-devel/files/Makefile.knobs
index cf79dce..8b851a7 100644
--- a/editors/openoffice-2.0-devel/files/Makefile.knobs
+++ b/editors/openoffice-2.0-devel/files/Makefile.knobs
@@ -18,7 +18,8 @@ CONFIGURE_ARGS+= --enable-cups
.endif
.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
+CONFIGURE_ARGS+= --with-lang=ALL
+#"en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
.else
diff --git a/editors/openoffice-2.0-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice-2.0-devel/files/patch-odk+setsdkenv_unix.in
deleted file mode 100644
index 21f9537..0000000
--- a/editors/openoffice-2.0-devel/files/patch-odk+setsdkenv_unix.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/setsdkenv_unix.in 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-2.0-devel/files/patch-odk+settings+settings.mk b/editors/openoffice-2.0-devel/files/patch-odk+settings+settings.mk
deleted file mode 100644
index d6ae684..0000000
--- a/editors/openoffice-2.0-devel/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/settings/settings.mk 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-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl b/editors/openoffice-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
deleted file mode 100644
index 1e07bb2..0000000
--- a/editors/openoffice-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=40177
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1969&Path=SRC680%2Fpresperf01
-o presperf01
-
-Description
-Contains an illigal char.
-build breaks at odk project
-like
-ERROR : diff diff -br ../../unxfbsd.pro/bin/odk680/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl /work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl
-
-Index: offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl
-===================================================================
-RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl,v
-retrieving revision 1.4
-diff -u -r1.4 XGraphicDevice.idl
---- offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 26 Nov 2004 18:01:15 -0000 1.4
-+++ offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 31 Dec 2004 03:53:28 -0000
-@@ -136,7 +136,7 @@
- /** Query the physical resolution of the device in pixel per
- millimeter.
-
-- Á special value of 0 here indicates 'unknown', i.e. at the
-+ A special value of 0 here indicates 'unknown', i.e. at the
- time of rendering undetermined or possibly infinite
- resolution.
- */
diff --git a/editors/openoffice-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
new file mode 100644
index 0000000..4385f52
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -0,0 +1,32 @@
+IZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=41006
+o CWS (not yet)
+
+offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+contains an illigal char
+
+Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.4
+diff -u -r1.4 XParametricPolyPolygon2DFactory.idl
+--- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4
++++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000
+@@ -109,7 +109,7 @@
+ linearly between center and endColor via concentric ellipses
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ circular. If it's not 1, the gradient is elliptical, with the
+ special twist that the aspect ratio is maintained also for the
+ center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ linearly between center and endColor via rectangular boxes
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ quadratic. If it's not 1, the gradient is rectangular, with
+ the special twist that the aspect ratio is maintained also for
+ the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
index dcdd1cc..f3f55df 100644
--- a/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -127,9 +127,9 @@ diff -u -r1.11 unxfbsdi.mk
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=-fpic
++CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=-fpic
++CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 94c368a..2c535dc 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
-SNAPDATE= 20050110
+SNAPDATE= 20050119
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@@ -49,10 +49,10 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 71
+MILESTONE= 72
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
-DIST_SUBDIR= openoffice2.0
+DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
@@ -141,10 +141,6 @@ 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
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
@@ -190,7 +186,8 @@ post-install:
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} > ${TMPPLIST}
+ @${PRINTF} "bin/openoffice.org" > ${TMPPLIST}
+ @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index a09abe3..df4cc4f 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_1.9m71_source.tar.bz2) = d4dbf690d08471dca83d0f25ffe947f8
-SIZE (openoffice2.0/OOo_1.9m71_source.tar.bz2) = 234489374
+MD5 (openoffice2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
+SIZE (openoffice2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice2.0/gpc231.tar.Z) = 27917
MD5 (openoffice2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs
index cf79dce..8b851a7 100644
--- a/editors/openoffice-3-devel/files/Makefile.knobs
+++ b/editors/openoffice-3-devel/files/Makefile.knobs
@@ -18,7 +18,8 @@ CONFIGURE_ARGS+= --enable-cups
.endif
.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
+CONFIGURE_ARGS+= --with-lang=ALL
+#"en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
.else
diff --git a/editors/openoffice-3-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice-3-devel/files/patch-odk+setsdkenv_unix.in
deleted file mode 100644
index 21f9537..0000000
--- a/editors/openoffice-3-devel/files/patch-odk+setsdkenv_unix.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/setsdkenv_unix.in 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-3-devel/files/patch-odk+settings+settings.mk b/editors/openoffice-3-devel/files/patch-odk+settings+settings.mk
deleted file mode 100644
index d6ae684..0000000
--- a/editors/openoffice-3-devel/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/settings/settings.mk 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-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl b/editors/openoffice-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
deleted file mode 100644
index 1e07bb2..0000000
--- a/editors/openoffice-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=40177
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1969&Path=SRC680%2Fpresperf01
-o presperf01
-
-Description
-Contains an illigal char.
-build breaks at odk project
-like
-ERROR : diff diff -br ../../unxfbsd.pro/bin/odk680/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl /work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl
-
-Index: offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl
-===================================================================
-RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl,v
-retrieving revision 1.4
-diff -u -r1.4 XGraphicDevice.idl
---- offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 26 Nov 2004 18:01:15 -0000 1.4
-+++ offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 31 Dec 2004 03:53:28 -0000
-@@ -136,7 +136,7 @@
- /** Query the physical resolution of the device in pixel per
- millimeter.
-
-- Á special value of 0 here indicates 'unknown', i.e. at the
-+ A special value of 0 here indicates 'unknown', i.e. at the
- time of rendering undetermined or possibly infinite
- resolution.
- */
diff --git a/editors/openoffice-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
new file mode 100644
index 0000000..4385f52
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -0,0 +1,32 @@
+IZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=41006
+o CWS (not yet)
+
+offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+contains an illigal char
+
+Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.4
+diff -u -r1.4 XParametricPolyPolygon2DFactory.idl
+--- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4
++++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000
+@@ -109,7 +109,7 @@
+ linearly between center and endColor via concentric ellipses
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ circular. If it's not 1, the gradient is elliptical, with the
+ special twist that the aspect ratio is maintained also for the
+ center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ linearly between center and endColor via rectangular boxes
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ quadratic. If it's not 1, the gradient is rectangular, with
+ the special twist that the aspect ratio is maintained also for
+ the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
index dcdd1cc..f3f55df 100644
--- a/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -127,9 +127,9 @@ diff -u -r1.11 unxfbsdi.mk
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=-fpic
++CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=-fpic
++CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 94c368a..2c535dc 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
-SNAPDATE= 20050110
+SNAPDATE= 20050119
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@@ -49,10 +49,10 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 71
+MILESTONE= 72
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
-DIST_SUBDIR= openoffice2.0
+DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
@@ -141,10 +141,6 @@ 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
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
@@ -190,7 +186,8 @@ post-install:
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} > ${TMPPLIST}
+ @${PRINTF} "bin/openoffice.org" > ${TMPPLIST}
+ @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index a09abe3..df4cc4f 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_1.9m71_source.tar.bz2) = d4dbf690d08471dca83d0f25ffe947f8
-SIZE (openoffice2.0/OOo_1.9m71_source.tar.bz2) = 234489374
+MD5 (openoffice2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
+SIZE (openoffice2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice2.0/gpc231.tar.Z) = 27917
MD5 (openoffice2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index cf79dce..8b851a7 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@@ -18,7 +18,8 @@ CONFIGURE_ARGS+= --enable-cups
.endif
.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
+CONFIGURE_ARGS+= --with-lang=ALL
+#"en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
.else
diff --git a/editors/openoffice-3/files/patch-odk+setsdkenv_unix.in b/editors/openoffice-3/files/patch-odk+setsdkenv_unix.in
deleted file mode 100644
index 21f9537..0000000
--- a/editors/openoffice-3/files/patch-odk+setsdkenv_unix.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/setsdkenv_unix.in 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-3/files/patch-odk+settings+settings.mk b/editors/openoffice-3/files/patch-odk+settings+settings.mk
deleted file mode 100644
index d6ae684..0000000
--- a/editors/openoffice-3/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/settings/settings.mk 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-3/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl b/editors/openoffice-3/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
deleted file mode 100644
index 1e07bb2..0000000
--- a/editors/openoffice-3/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=40177
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1969&Path=SRC680%2Fpresperf01
-o presperf01
-
-Description
-Contains an illigal char.
-build breaks at odk project
-like
-ERROR : diff diff -br ../../unxfbsd.pro/bin/odk680/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl /work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl
-
-Index: offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl
-===================================================================
-RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl,v
-retrieving revision 1.4
-diff -u -r1.4 XGraphicDevice.idl
---- offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 26 Nov 2004 18:01:15 -0000 1.4
-+++ offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 31 Dec 2004 03:53:28 -0000
-@@ -136,7 +136,7 @@
- /** Query the physical resolution of the device in pixel per
- millimeter.
-
-- Á special value of 0 here indicates 'unknown', i.e. at the
-+ A special value of 0 here indicates 'unknown', i.e. at the
- time of rendering undetermined or possibly infinite
- resolution.
- */
diff --git a/editors/openoffice-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
new file mode 100644
index 0000000..4385f52
--- /dev/null
+++ b/editors/openoffice-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -0,0 +1,32 @@
+IZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=41006
+o CWS (not yet)
+
+offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+contains an illigal char
+
+Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.4
+diff -u -r1.4 XParametricPolyPolygon2DFactory.idl
+--- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4
++++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000
+@@ -109,7 +109,7 @@
+ linearly between center and endColor via concentric ellipses
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ circular. If it's not 1, the gradient is elliptical, with the
+ special twist that the aspect ratio is maintained also for the
+ center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ linearly between center and endColor via rectangular boxes
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ quadratic. If it's not 1, the gradient is rectangular, with
+ the special twist that the aspect ratio is maintained also for
+ the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk
index dcdd1cc..f3f55df 100644
--- a/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk
@@ -127,9 +127,9 @@ diff -u -r1.11 unxfbsdi.mk
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=-fpic
++CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=-fpic
++CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 94c368a..2c535dc 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
-SNAPDATE= 20050110
+SNAPDATE= 20050119
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@@ -49,10 +49,10 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 71
+MILESTONE= 72
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
-DIST_SUBDIR= openoffice2.0
+DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
@@ -141,10 +141,6 @@ 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
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
@@ -190,7 +186,8 @@ post-install:
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} > ${TMPPLIST}
+ @${PRINTF} "bin/openoffice.org" > ${TMPPLIST}
+ @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index a09abe3..df4cc4f 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_1.9m71_source.tar.bz2) = d4dbf690d08471dca83d0f25ffe947f8
-SIZE (openoffice2.0/OOo_1.9m71_source.tar.bz2) = 234489374
+MD5 (openoffice2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
+SIZE (openoffice2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice2.0/gpc231.tar.Z) = 27917
MD5 (openoffice2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice.org-2-RC/files/Makefile.knobs b/editors/openoffice.org-2-RC/files/Makefile.knobs
index cf79dce..8b851a7 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-2-RC/files/Makefile.knobs
@@ -18,7 +18,8 @@ CONFIGURE_ARGS+= --enable-cups
.endif
.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
+CONFIGURE_ARGS+= --with-lang=ALL
+#"en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
.else
diff --git a/editors/openoffice.org-2-RC/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-2-RC/files/patch-odk+setsdkenv_unix.in
deleted file mode 100644
index 21f9537..0000000
--- a/editors/openoffice.org-2-RC/files/patch-odk+setsdkenv_unix.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/setsdkenv_unix.in 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-2-RC/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2-RC/files/patch-odk+settings+settings.mk
deleted file mode 100644
index d6ae684..0000000
--- a/editors/openoffice.org-2-RC/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/settings/settings.mk 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-2-RC/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl b/editors/openoffice.org-2-RC/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
deleted file mode 100644
index 1e07bb2..0000000
--- a/editors/openoffice.org-2-RC/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=40177
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1969&Path=SRC680%2Fpresperf01
-o presperf01
-
-Description
-Contains an illigal char.
-build breaks at odk project
-like
-ERROR : diff diff -br ../../unxfbsd.pro/bin/odk680/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl /work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl
-
-Index: offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl
-===================================================================
-RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl,v
-retrieving revision 1.4
-diff -u -r1.4 XGraphicDevice.idl
---- offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 26 Nov 2004 18:01:15 -0000 1.4
-+++ offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 31 Dec 2004 03:53:28 -0000
-@@ -136,7 +136,7 @@
- /** Query the physical resolution of the device in pixel per
- millimeter.
-
-- Á special value of 0 here indicates 'unknown', i.e. at the
-+ A special value of 0 here indicates 'unknown', i.e. at the
- time of rendering undetermined or possibly infinite
- resolution.
- */
diff --git a/editors/openoffice.org-2-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-2-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
new file mode 100644
index 0000000..4385f52
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -0,0 +1,32 @@
+IZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=41006
+o CWS (not yet)
+
+offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+contains an illigal char
+
+Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.4
+diff -u -r1.4 XParametricPolyPolygon2DFactory.idl
+--- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4
++++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000
+@@ -109,7 +109,7 @@
+ linearly between center and endColor via concentric ellipses
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ circular. If it's not 1, the gradient is elliptical, with the
+ special twist that the aspect ratio is maintained also for the
+ center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ linearly between center and endColor via rectangular boxes
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ quadratic. If it's not 1, the gradient is rectangular, with
+ the special twist that the aspect ratio is maintained also for
+ the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk
index dcdd1cc..f3f55df 100644
--- a/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2-RC/files/patch-solenv+inc+unxfbsdi.mk
@@ -127,9 +127,9 @@ diff -u -r1.11 unxfbsdi.mk
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=-fpic
++CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=-fpic
++CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 94c368a..2c535dc 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
-SNAPDATE= 20050110
+SNAPDATE= 20050119
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@@ -49,10 +49,10 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 71
+MILESTONE= 72
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
-DIST_SUBDIR= openoffice2.0
+DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
@@ -141,10 +141,6 @@ 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
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
@@ -190,7 +186,8 @@ post-install:
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} > ${TMPPLIST}
+ @${PRINTF} "bin/openoffice.org" > ${TMPPLIST}
+ @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index a09abe3..df4cc4f 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_1.9m71_source.tar.bz2) = d4dbf690d08471dca83d0f25ffe947f8
-SIZE (openoffice2.0/OOo_1.9m71_source.tar.bz2) = 234489374
+MD5 (openoffice2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
+SIZE (openoffice2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice2.0/gpc231.tar.Z) = 27917
MD5 (openoffice2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice.org-2-devel/files/Makefile.knobs b/editors/openoffice.org-2-devel/files/Makefile.knobs
index cf79dce..8b851a7 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2-devel/files/Makefile.knobs
@@ -18,7 +18,8 @@ CONFIGURE_ARGS+= --enable-cups
.endif
.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
+CONFIGURE_ARGS+= --with-lang=ALL
+#"en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
.else
diff --git a/editors/openoffice.org-2-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-2-devel/files/patch-odk+setsdkenv_unix.in
deleted file mode 100644
index 21f9537..0000000
--- a/editors/openoffice.org-2-devel/files/patch-odk+setsdkenv_unix.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/setsdkenv_unix.in 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-2-devel/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2-devel/files/patch-odk+settings+settings.mk
deleted file mode 100644
index d6ae684..0000000
--- a/editors/openoffice.org-2-devel/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/settings/settings.mk 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-2-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl b/editors/openoffice.org-2-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
deleted file mode 100644
index 1e07bb2..0000000
--- a/editors/openoffice.org-2-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=40177
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1969&Path=SRC680%2Fpresperf01
-o presperf01
-
-Description
-Contains an illigal char.
-build breaks at odk project
-like
-ERROR : diff diff -br ../../unxfbsd.pro/bin/odk680/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl /work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl
-
-Index: offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl
-===================================================================
-RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl,v
-retrieving revision 1.4
-diff -u -r1.4 XGraphicDevice.idl
---- offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 26 Nov 2004 18:01:15 -0000 1.4
-+++ offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 31 Dec 2004 03:53:28 -0000
-@@ -136,7 +136,7 @@
- /** Query the physical resolution of the device in pixel per
- millimeter.
-
-- Á special value of 0 here indicates 'unknown', i.e. at the
-+ A special value of 0 here indicates 'unknown', i.e. at the
- time of rendering undetermined or possibly infinite
- resolution.
- */
diff --git a/editors/openoffice.org-2-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-2-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
new file mode 100644
index 0000000..4385f52
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -0,0 +1,32 @@
+IZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=41006
+o CWS (not yet)
+
+offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+contains an illigal char
+
+Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.4
+diff -u -r1.4 XParametricPolyPolygon2DFactory.idl
+--- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4
++++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000
+@@ -109,7 +109,7 @@
+ linearly between center and endColor via concentric ellipses
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ circular. If it's not 1, the gradient is elliptical, with the
+ special twist that the aspect ratio is maintained also for the
+ center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ linearly between center and endColor via rectangular boxes
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ quadratic. If it's not 1, the gradient is rectangular, with
+ the special twist that the aspect ratio is maintained also for
+ the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
index dcdd1cc..f3f55df 100644
--- a/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -127,9 +127,9 @@ diff -u -r1.11 unxfbsdi.mk
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=-fpic
++CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=-fpic
++CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 94c368a..2c535dc 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
-SNAPDATE= 20050110
+SNAPDATE= 20050119
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@@ -49,10 +49,10 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 71
+MILESTONE= 72
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
-DIST_SUBDIR= openoffice2.0
+DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
@@ -141,10 +141,6 @@ 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
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
@@ -190,7 +186,8 @@ post-install:
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} > ${TMPPLIST}
+ @${PRINTF} "bin/openoffice.org" > ${TMPPLIST}
+ @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index a09abe3..df4cc4f 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_1.9m71_source.tar.bz2) = d4dbf690d08471dca83d0f25ffe947f8
-SIZE (openoffice2.0/OOo_1.9m71_source.tar.bz2) = 234489374
+MD5 (openoffice2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
+SIZE (openoffice2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice2.0/gpc231.tar.Z) = 27917
MD5 (openoffice2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.knobs b/editors/openoffice.org-2.0-devel/files/Makefile.knobs
index cf79dce..8b851a7 100644
--- a/editors/openoffice.org-2.0-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2.0-devel/files/Makefile.knobs
@@ -18,7 +18,8 @@ CONFIGURE_ARGS+= --enable-cups
.endif
.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
+CONFIGURE_ARGS+= --with-lang=ALL
+#"en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
.else
diff --git a/editors/openoffice.org-2.0-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-2.0-devel/files/patch-odk+setsdkenv_unix.in
deleted file mode 100644
index 21f9537..0000000
--- a/editors/openoffice.org-2.0-devel/files/patch-odk+setsdkenv_unix.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/setsdkenv_unix.in 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-2.0-devel/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2.0-devel/files/patch-odk+settings+settings.mk
deleted file mode 100644
index d6ae684..0000000
--- a/editors/openoffice.org-2.0-devel/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/settings/settings.mk 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-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl b/editors/openoffice.org-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
deleted file mode 100644
index 1e07bb2..0000000
--- a/editors/openoffice.org-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=40177
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1969&Path=SRC680%2Fpresperf01
-o presperf01
-
-Description
-Contains an illigal char.
-build breaks at odk project
-like
-ERROR : diff diff -br ../../unxfbsd.pro/bin/odk680/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl /work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl
-
-Index: offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl
-===================================================================
-RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl,v
-retrieving revision 1.4
-diff -u -r1.4 XGraphicDevice.idl
---- offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 26 Nov 2004 18:01:15 -0000 1.4
-+++ offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 31 Dec 2004 03:53:28 -0000
-@@ -136,7 +136,7 @@
- /** Query the physical resolution of the device in pixel per
- millimeter.
-
-- Á special value of 0 here indicates 'unknown', i.e. at the
-+ A special value of 0 here indicates 'unknown', i.e. at the
- time of rendering undetermined or possibly infinite
- resolution.
- */
diff --git a/editors/openoffice.org-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
new file mode 100644
index 0000000..4385f52
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -0,0 +1,32 @@
+IZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=41006
+o CWS (not yet)
+
+offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+contains an illigal char
+
+Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.4
+diff -u -r1.4 XParametricPolyPolygon2DFactory.idl
+--- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4
++++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000
+@@ -109,7 +109,7 @@
+ linearly between center and endColor via concentric ellipses
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ circular. If it's not 1, the gradient is elliptical, with the
+ special twist that the aspect ratio is maintained also for the
+ center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ linearly between center and endColor via rectangular boxes
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ quadratic. If it's not 1, the gradient is rectangular, with
+ the special twist that the aspect ratio is maintained also for
+ the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
index dcdd1cc..f3f55df 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -127,9 +127,9 @@ diff -u -r1.11 unxfbsdi.mk
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=-fpic
++CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=-fpic
++CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 94c368a..2c535dc 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
-SNAPDATE= 20050110
+SNAPDATE= 20050119
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@@ -49,10 +49,10 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 71
+MILESTONE= 72
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
-DIST_SUBDIR= openoffice2.0
+DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
@@ -141,10 +141,6 @@ 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
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
@@ -190,7 +186,8 @@ post-install:
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} > ${TMPPLIST}
+ @${PRINTF} "bin/openoffice.org" > ${TMPPLIST}
+ @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index a09abe3..df4cc4f 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_1.9m71_source.tar.bz2) = d4dbf690d08471dca83d0f25ffe947f8
-SIZE (openoffice2.0/OOo_1.9m71_source.tar.bz2) = 234489374
+MD5 (openoffice2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
+SIZE (openoffice2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice2.0/gpc231.tar.Z) = 27917
MD5 (openoffice2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice.org-2.0/files/Makefile.knobs b/editors/openoffice.org-2.0/files/Makefile.knobs
index cf79dce..8b851a7 100644
--- a/editors/openoffice.org-2.0/files/Makefile.knobs
+++ b/editors/openoffice.org-2.0/files/Makefile.knobs
@@ -18,7 +18,8 @@ CONFIGURE_ARGS+= --enable-cups
.endif
.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
+CONFIGURE_ARGS+= --with-lang=ALL
+#"en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
.else
diff --git a/editors/openoffice.org-2.0/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-2.0/files/patch-odk+setsdkenv_unix.in
deleted file mode 100644
index 21f9537..0000000
--- a/editors/openoffice.org-2.0/files/patch-odk+setsdkenv_unix.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/setsdkenv_unix.in 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-2.0/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2.0/files/patch-odk+settings+settings.mk
deleted file mode 100644
index d6ae684..0000000
--- a/editors/openoffice.org-2.0/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/settings/settings.mk 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-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl b/editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
deleted file mode 100644
index 1e07bb2..0000000
--- a/editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=40177
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1969&Path=SRC680%2Fpresperf01
-o presperf01
-
-Description
-Contains an illigal char.
-build breaks at odk project
-like
-ERROR : diff diff -br ../../unxfbsd.pro/bin/odk680/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl /work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl
-
-Index: offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl
-===================================================================
-RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl,v
-retrieving revision 1.4
-diff -u -r1.4 XGraphicDevice.idl
---- offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 26 Nov 2004 18:01:15 -0000 1.4
-+++ offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 31 Dec 2004 03:53:28 -0000
-@@ -136,7 +136,7 @@
- /** Query the physical resolution of the device in pixel per
- millimeter.
-
-- Á special value of 0 here indicates 'unknown', i.e. at the
-+ A special value of 0 here indicates 'unknown', i.e. at the
- time of rendering undetermined or possibly infinite
- resolution.
- */
diff --git a/editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
new file mode 100644
index 0000000..4385f52
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -0,0 +1,32 @@
+IZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=41006
+o CWS (not yet)
+
+offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+contains an illigal char
+
+Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.4
+diff -u -r1.4 XParametricPolyPolygon2DFactory.idl
+--- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4
++++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000
+@@ -109,7 +109,7 @@
+ linearly between center and endColor via concentric ellipses
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ circular. If it's not 1, the gradient is elliptical, with the
+ special twist that the aspect ratio is maintained also for the
+ center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ linearly between center and endColor via rectangular boxes
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ quadratic. If it's not 1, the gradient is rectangular, with
+ the special twist that the aspect ratio is maintained also for
+ the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk
index dcdd1cc..f3f55df 100644
--- a/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk
@@ -127,9 +127,9 @@ diff -u -r1.11 unxfbsdi.mk
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=-fpic
++CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=-fpic
++CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 94c368a..2c535dc 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
-SNAPDATE= 20050110
+SNAPDATE= 20050119
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@@ -49,10 +49,10 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 71
+MILESTONE= 72
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
-DIST_SUBDIR= openoffice2.0
+DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
@@ -141,10 +141,6 @@ 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
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
@@ -190,7 +186,8 @@ post-install:
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} > ${TMPPLIST}
+ @${PRINTF} "bin/openoffice.org" > ${TMPPLIST}
+ @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index a09abe3..df4cc4f 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_1.9m71_source.tar.bz2) = d4dbf690d08471dca83d0f25ffe947f8
-SIZE (openoffice2.0/OOo_1.9m71_source.tar.bz2) = 234489374
+MD5 (openoffice2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
+SIZE (openoffice2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice2.0/gpc231.tar.Z) = 27917
MD5 (openoffice2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice.org-2/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs
index cf79dce..8b851a7 100644
--- a/editors/openoffice.org-2/files/Makefile.knobs
+++ b/editors/openoffice.org-2/files/Makefile.knobs
@@ -18,7 +18,8 @@ CONFIGURE_ARGS+= --enable-cups
.endif
.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
+CONFIGURE_ARGS+= --with-lang=ALL
+#"en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
.else
diff --git a/editors/openoffice.org-2/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-2/files/patch-odk+setsdkenv_unix.in
deleted file mode 100644
index 21f9537..0000000
--- a/editors/openoffice.org-2/files/patch-odk+setsdkenv_unix.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/setsdkenv_unix.in 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-2/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2/files/patch-odk+settings+settings.mk
deleted file mode 100644
index d6ae684..0000000
--- a/editors/openoffice.org-2/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/settings/settings.mk 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-2/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl b/editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
deleted file mode 100644
index 1e07bb2..0000000
--- a/editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=40177
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1969&Path=SRC680%2Fpresperf01
-o presperf01
-
-Description
-Contains an illigal char.
-build breaks at odk project
-like
-ERROR : diff diff -br ../../unxfbsd.pro/bin/odk680/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl /work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl
-
-Index: offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl
-===================================================================
-RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl,v
-retrieving revision 1.4
-diff -u -r1.4 XGraphicDevice.idl
---- offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 26 Nov 2004 18:01:15 -0000 1.4
-+++ offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 31 Dec 2004 03:53:28 -0000
-@@ -136,7 +136,7 @@
- /** Query the physical resolution of the device in pixel per
- millimeter.
-
-- Á special value of 0 here indicates 'unknown', i.e. at the
-+ A special value of 0 here indicates 'unknown', i.e. at the
- time of rendering undetermined or possibly infinite
- resolution.
- */
diff --git a/editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
new file mode 100644
index 0000000..4385f52
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -0,0 +1,32 @@
+IZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=41006
+o CWS (not yet)
+
+offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+contains an illigal char
+
+Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.4
+diff -u -r1.4 XParametricPolyPolygon2DFactory.idl
+--- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4
++++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000
+@@ -109,7 +109,7 @@
+ linearly between center and endColor via concentric ellipses
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ circular. If it's not 1, the gradient is elliptical, with the
+ special twist that the aspect ratio is maintained also for the
+ center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ linearly between center and endColor via rectangular boxes
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ quadratic. If it's not 1, the gradient is rectangular, with
+ the special twist that the aspect ratio is maintained also for
+ the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
index dcdd1cc..f3f55df 100644
--- a/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
@@ -127,9 +127,9 @@ diff -u -r1.11 unxfbsdi.mk
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=-fpic
++CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=-fpic
++CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 94c368a..2c535dc 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
-SNAPDATE= 20050110
+SNAPDATE= 20050119
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@@ -49,10 +49,10 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 71
+MILESTONE= 72
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
-DIST_SUBDIR= openoffice2.0
+DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
@@ -141,10 +141,6 @@ 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
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
@@ -190,7 +186,8 @@ post-install:
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} > ${TMPPLIST}
+ @${PRINTF} "bin/openoffice.org" > ${TMPPLIST}
+ @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index a09abe3..df4cc4f 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_1.9m71_source.tar.bz2) = d4dbf690d08471dca83d0f25ffe947f8
-SIZE (openoffice2.0/OOo_1.9m71_source.tar.bz2) = 234489374
+MD5 (openoffice2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
+SIZE (openoffice2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice2.0/gpc231.tar.Z) = 27917
MD5 (openoffice2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice.org-3-RC/files/Makefile.knobs b/editors/openoffice.org-3-RC/files/Makefile.knobs
index cf79dce..8b851a7 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-3-RC/files/Makefile.knobs
@@ -18,7 +18,8 @@ CONFIGURE_ARGS+= --enable-cups
.endif
.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
+CONFIGURE_ARGS+= --with-lang=ALL
+#"en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
.else
diff --git a/editors/openoffice.org-3-RC/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-3-RC/files/patch-odk+setsdkenv_unix.in
deleted file mode 100644
index 21f9537..0000000
--- a/editors/openoffice.org-3-RC/files/patch-odk+setsdkenv_unix.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/setsdkenv_unix.in 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-3-RC/files/patch-odk+settings+settings.mk b/editors/openoffice.org-3-RC/files/patch-odk+settings+settings.mk
deleted file mode 100644
index d6ae684..0000000
--- a/editors/openoffice.org-3-RC/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/settings/settings.mk 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-3-RC/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl b/editors/openoffice.org-3-RC/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
deleted file mode 100644
index 1e07bb2..0000000
--- a/editors/openoffice.org-3-RC/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=40177
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1969&Path=SRC680%2Fpresperf01
-o presperf01
-
-Description
-Contains an illigal char.
-build breaks at odk project
-like
-ERROR : diff diff -br ../../unxfbsd.pro/bin/odk680/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl /work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl
-
-Index: offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl
-===================================================================
-RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl,v
-retrieving revision 1.4
-diff -u -r1.4 XGraphicDevice.idl
---- offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 26 Nov 2004 18:01:15 -0000 1.4
-+++ offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 31 Dec 2004 03:53:28 -0000
-@@ -136,7 +136,7 @@
- /** Query the physical resolution of the device in pixel per
- millimeter.
-
-- Á special value of 0 here indicates 'unknown', i.e. at the
-+ A special value of 0 here indicates 'unknown', i.e. at the
- time of rendering undetermined or possibly infinite
- resolution.
- */
diff --git a/editors/openoffice.org-3-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-3-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
new file mode 100644
index 0000000..4385f52
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -0,0 +1,32 @@
+IZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=41006
+o CWS (not yet)
+
+offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+contains an illigal char
+
+Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.4
+diff -u -r1.4 XParametricPolyPolygon2DFactory.idl
+--- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4
++++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000
+@@ -109,7 +109,7 @@
+ linearly between center and endColor via concentric ellipses
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ circular. If it's not 1, the gradient is elliptical, with the
+ special twist that the aspect ratio is maintained also for the
+ center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ linearly between center and endColor via rectangular boxes
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ quadratic. If it's not 1, the gradient is rectangular, with
+ the special twist that the aspect ratio is maintained also for
+ the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
index dcdd1cc..f3f55df 100644
--- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-3-RC/files/patch-solenv+inc+unxfbsdi.mk
@@ -127,9 +127,9 @@ diff -u -r1.11 unxfbsdi.mk
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=-fpic
++CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=-fpic
++CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 94c368a..2c535dc 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
-SNAPDATE= 20050110
+SNAPDATE= 20050119
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@@ -49,10 +49,10 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 71
+MILESTONE= 72
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
-DIST_SUBDIR= openoffice2.0
+DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
@@ -141,10 +141,6 @@ 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
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
@@ -190,7 +186,8 @@ post-install:
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} > ${TMPPLIST}
+ @${PRINTF} "bin/openoffice.org" > ${TMPPLIST}
+ @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index a09abe3..df4cc4f 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_1.9m71_source.tar.bz2) = d4dbf690d08471dca83d0f25ffe947f8
-SIZE (openoffice2.0/OOo_1.9m71_source.tar.bz2) = 234489374
+MD5 (openoffice2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
+SIZE (openoffice2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice2.0/gpc231.tar.Z) = 27917
MD5 (openoffice2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs
index cf79dce..8b851a7 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-3-devel/files/Makefile.knobs
@@ -18,7 +18,8 @@ CONFIGURE_ARGS+= --enable-cups
.endif
.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
+CONFIGURE_ARGS+= --with-lang=ALL
+#"en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
.else
diff --git a/editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix.in
deleted file mode 100644
index 21f9537..0000000
--- a/editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/setsdkenv_unix.in 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-3-devel/files/patch-odk+settings+settings.mk b/editors/openoffice.org-3-devel/files/patch-odk+settings+settings.mk
deleted file mode 100644
index d6ae684..0000000
--- a/editors/openoffice.org-3-devel/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/settings/settings.mk 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-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl b/editors/openoffice.org-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
deleted file mode 100644
index 1e07bb2..0000000
--- a/editors/openoffice.org-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=40177
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1969&Path=SRC680%2Fpresperf01
-o presperf01
-
-Description
-Contains an illigal char.
-build breaks at odk project
-like
-ERROR : diff diff -br ../../unxfbsd.pro/bin/odk680/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl /work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl
-
-Index: offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl
-===================================================================
-RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl,v
-retrieving revision 1.4
-diff -u -r1.4 XGraphicDevice.idl
---- offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 26 Nov 2004 18:01:15 -0000 1.4
-+++ offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 31 Dec 2004 03:53:28 -0000
-@@ -136,7 +136,7 @@
- /** Query the physical resolution of the device in pixel per
- millimeter.
-
-- Á special value of 0 here indicates 'unknown', i.e. at the
-+ A special value of 0 here indicates 'unknown', i.e. at the
- time of rendering undetermined or possibly infinite
- resolution.
- */
diff --git a/editors/openoffice.org-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
new file mode 100644
index 0000000..4385f52
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -0,0 +1,32 @@
+IZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=41006
+o CWS (not yet)
+
+offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+contains an illigal char
+
+Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.4
+diff -u -r1.4 XParametricPolyPolygon2DFactory.idl
+--- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4
++++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000
+@@ -109,7 +109,7 @@
+ linearly between center and endColor via concentric ellipses
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ circular. If it's not 1, the gradient is elliptical, with the
+ special twist that the aspect ratio is maintained also for the
+ center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ linearly between center and endColor via rectangular boxes
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ quadratic. If it's not 1, the gradient is rectangular, with
+ the special twist that the aspect ratio is maintained also for
+ the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
index dcdd1cc..f3f55df 100644
--- a/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -127,9 +127,9 @@ diff -u -r1.11 unxfbsdi.mk
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=-fpic
++CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=-fpic
++CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 94c368a..2c535dc 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
-SNAPDATE= 20050110
+SNAPDATE= 20050119
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@@ -49,10 +49,10 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 71
+MILESTONE= 72
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
-DIST_SUBDIR= openoffice2.0
+DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
@@ -141,10 +141,6 @@ 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
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
@@ -190,7 +186,8 @@ post-install:
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} > ${TMPPLIST}
+ @${PRINTF} "bin/openoffice.org" > ${TMPPLIST}
+ @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index a09abe3..df4cc4f 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_1.9m71_source.tar.bz2) = d4dbf690d08471dca83d0f25ffe947f8
-SIZE (openoffice2.0/OOo_1.9m71_source.tar.bz2) = 234489374
+MD5 (openoffice2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
+SIZE (openoffice2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice2.0/gpc231.tar.Z) = 27917
MD5 (openoffice2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice.org-3/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs
index cf79dce..8b851a7 100644
--- a/editors/openoffice.org-3/files/Makefile.knobs
+++ b/editors/openoffice.org-3/files/Makefile.knobs
@@ -18,7 +18,8 @@ CONFIGURE_ARGS+= --enable-cups
.endif
.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
+CONFIGURE_ARGS+= --with-lang=ALL
+#"en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
.else
diff --git a/editors/openoffice.org-3/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-3/files/patch-odk+setsdkenv_unix.in
deleted file mode 100644
index 21f9537..0000000
--- a/editors/openoffice.org-3/files/patch-odk+setsdkenv_unix.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/setsdkenv_unix.in 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-3/files/patch-odk+settings+settings.mk b/editors/openoffice.org-3/files/patch-odk+settings+settings.mk
deleted file mode 100644
index d6ae684..0000000
--- a/editors/openoffice.org-3/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/settings/settings.mk 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-3/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl b/editors/openoffice.org-3/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
deleted file mode 100644
index 1e07bb2..0000000
--- a/editors/openoffice.org-3/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=40177
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1969&Path=SRC680%2Fpresperf01
-o presperf01
-
-Description
-Contains an illigal char.
-build breaks at odk project
-like
-ERROR : diff diff -br ../../unxfbsd.pro/bin/odk680/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl /work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl
-
-Index: offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl
-===================================================================
-RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl,v
-retrieving revision 1.4
-diff -u -r1.4 XGraphicDevice.idl
---- offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 26 Nov 2004 18:01:15 -0000 1.4
-+++ offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 31 Dec 2004 03:53:28 -0000
-@@ -136,7 +136,7 @@
- /** Query the physical resolution of the device in pixel per
- millimeter.
-
-- Á special value of 0 here indicates 'unknown', i.e. at the
-+ A special value of 0 here indicates 'unknown', i.e. at the
- time of rendering undetermined or possibly infinite
- resolution.
- */
diff --git a/editors/openoffice.org-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
new file mode 100644
index 0000000..4385f52
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -0,0 +1,32 @@
+IZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=41006
+o CWS (not yet)
+
+offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+contains an illigal char
+
+Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.4
+diff -u -r1.4 XParametricPolyPolygon2DFactory.idl
+--- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4
++++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000
+@@ -109,7 +109,7 @@
+ linearly between center and endColor via concentric ellipses
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ circular. If it's not 1, the gradient is elliptical, with the
+ special twist that the aspect ratio is maintained also for the
+ center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ linearly between center and endColor via rectangular boxes
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ quadratic. If it's not 1, the gradient is rectangular, with
+ the special twist that the aspect ratio is maintained also for
+ the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
index dcdd1cc..f3f55df 100644
--- a/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-3/files/patch-solenv+inc+unxfbsdi.mk
@@ -127,9 +127,9 @@ diff -u -r1.11 unxfbsdi.mk
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=-fpic
++CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=-fpic
++CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 94c368a..2c535dc 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
MAINTAINER= openoffice@FreeBSD.org
COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
-SNAPDATE= 20050110
+SNAPDATE= 20050119
NO_LATEST_LINK= yes
USE_GNOME= gtk20
MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz
@@ -49,10 +49,10 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
CODELINE= 680
RELEASE_NR= 1.9
-MILESTONE= 71
+MILESTONE= 72
INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE}
EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE}
-DIST_SUBDIR= openoffice2.0
+DIST_SUBDIR= openoffice.org2.0
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
PACKAGE_BASENAME= OOo_${RELEASE_NR}m${MILESTONE}_${OPSYS}${SIMPLEOSVER}Intel
@@ -141,10 +141,6 @@ 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
#DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
@@ -190,7 +186,8 @@ post-install:
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
- @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} > ${TMPPLIST}
+ @${PRINTF} "bin/openoffice.org" > ${TMPPLIST}
+ @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST}
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index a09abe3..df4cc4f 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice2.0/OOo_1.9m71_source.tar.bz2) = d4dbf690d08471dca83d0f25ffe947f8
-SIZE (openoffice2.0/OOo_1.9m71_source.tar.bz2) = 234489374
+MD5 (openoffice2.0/OOo_1.9m72_source.tar.bz2) = c51fa9d749f1e5eb3733d50b91f97fe8
+SIZE (openoffice2.0/OOo_1.9m72_source.tar.bz2) = 233690890
MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
SIZE (openoffice2.0/gpc231.tar.Z) = 27917
MD5 (openoffice2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
index cf79dce..8b851a7 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
@@ -18,7 +18,8 @@ CONFIGURE_ARGS+= --enable-cups
.endif
.if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
+CONFIGURE_ARGS+= --with-lang=ALL
+#"en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW"
#following langs still seem to be under development
#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu
.else
diff --git a/editors/openoffice.org-vcltesttool/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-vcltesttool/files/patch-odk+setsdkenv_unix.in
deleted file mode 100644
index 21f9537..0000000
--- a/editors/openoffice.org-vcltesttool/files/patch-odk+setsdkenv_unix.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/setsdkenv_unix.in 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-vcltesttool/files/patch-odk+settings+settings.mk b/editors/openoffice.org-vcltesttool/files/patch-odk+settings+settings.mk
deleted file mode 100644
index d6ae684..0000000
--- a/editors/openoffice.org-vcltesttool/files/patch-odk+settings+settings.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#iZ and CWS data
-o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
-o sdksample
-
-Description
-N/A
---- odk/settings/settings.mk 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-vcltesttool/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl b/editors/openoffice.org-vcltesttool/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
deleted file mode 100644
index 1e07bb2..0000000
--- a/editors/openoffice.org-vcltesttool/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=40177
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1969&Path=SRC680%2Fpresperf01
-o presperf01
-
-Description
-Contains an illigal char.
-build breaks at odk project
-like
-ERROR : diff diff -br ../../unxfbsd.pro/bin/odk680/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl /work/ports/editors/openoffice-2.0-devel/work/solver/680/unxfbsd.pro/idl/drafts/com/sun/star/rendering/XGraphicDevice.idl
-
-Index: offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl
-===================================================================
-RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl,v
-retrieving revision 1.4
-diff -u -r1.4 XGraphicDevice.idl
---- offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 26 Nov 2004 18:01:15 -0000 1.4
-+++ offapi/drafts/com/sun/star/rendering/XGraphicDevice.idl 31 Dec 2004 03:53:28 -0000
-@@ -136,7 +136,7 @@
- /** Query the physical resolution of the device in pixel per
- millimeter.
-
-- Á special value of 0 here indicates 'unknown', i.e. at the
-+ A special value of 0 here indicates 'unknown', i.e. at the
- time of rendering undetermined or possibly infinite
- resolution.
- */
diff --git a/editors/openoffice.org-vcltesttool/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-vcltesttool/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
new file mode 100644
index 0000000..4385f52
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -0,0 +1,32 @@
+IZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=41006
+o CWS (not yet)
+
+offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+contains an illigal char
+
+Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.4
+diff -u -r1.4 XParametricPolyPolygon2DFactory.idl
+--- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4
++++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000
+@@ -109,7 +109,7 @@
+ linearly between center and endColor via concentric ellipses
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ circular. If it's not 1, the gradient is elliptical, with the
+ special twist that the aspect ratio is maintained also for the
+ center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ linearly between center and endColor via rectangular boxes
+ around the center point. Note that the absolute size of the
+ rectangle given at this method does not matter, only it's
+- aspect ratio: if this aspect ratio ís 1, the gradient is
++ aspect ratio: if this aspect ratio is 1, the gradient is
+ quadratic. If it's not 1, the gradient is rectangular, with
+ the special twist that the aspect ratio is maintained also for
+ the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk
index dcdd1cc..f3f55df 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+unxfbsdi.mk
@@ -127,9 +127,9 @@ diff -u -r1.11 unxfbsdi.mk
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=-fpic
++CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=-fpic
++CFLAGSSLOCUIMT=-fPIC
+# Compiler flags for profiling
+CFLAGSPROF=
# Compiler flags for debugging
OpenPOWER on IntegriCloud