diff options
Diffstat (limited to 'editors/openoffice-3/files')
17 files changed, 0 insertions, 1026 deletions
diff --git a/editors/openoffice-3/files/Makefile.localized b/editors/openoffice-3/files/Makefile.localized deleted file mode 100644 index 9973b43605d6..000000000000 --- a/editors/openoffice-3/files/Makefile.localized +++ /dev/null @@ -1,241 +0,0 @@ -# localized makefile -# Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD$ - -################################################################ -.if defined(LOCALIZED_LANG) -.if ${LOCALIZED_LANG} == "af" -LANG_PKGNAME= af -LANG_EXT= 27 -LANG_CONFIGURE_ARG= AFRIK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ar" -CATEGORIES= arabic -LANG_PKGNAME= ar -LANG_EXT= 96 -LANG_CONFIGURE_ARG= ARAB -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ca" -LANG_PKGNAME= ca -LANG_EXT= 37 -LANG_CONFIGURE_ARG= CAT -.endif -################################################################ -.if ${LOCALIZED_LANG} == "cs" -LANG_PKGNAME= cs -LANG_EXT= 42 -LANG_CONFIGURE_ARG= CZECH -.endif -################################################################ -.if ${LOCALIZED_LANG} == "dk" -LANG_PKGNAME= dk -LANG_EXT= 45 -LANG_CONFIGURE_ARG= DAN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "el" -LANG_PKGNAME= el -LANG_EXT= 30 -LANG_CONFIGURE_ARG= GREEK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "es" -LANG_PKGNAME= es -LANG_EXT= 34 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= SPAN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "et" -LANG_PKGNAME= et -LANG_EXT= 77 -LANG_CONFIGURE_ARG= ESTONIAN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "fi" -LANG_PKGNAME= fi -LANG_EXT= 35 -LANG_CONFIGURE_ARG= FINN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "fr" -CATEGORIES= french -LANG_PKGNAME= fr -LANG_EXT= 33 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= FREN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "de" -CATEGORIES= german -LANG_PKGNAME= de -LANG_EXT= 49 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= GER -COMMENT= Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm -PKGMESSAGE= ${FILESDIR}/pkg-message.de -.endif -################################################################ -.if ${LOCALIZED_LANG} == "he" -LANG_PKGNAME= he -LANG_EXT= 97 -LANG_CONFIGURE_ARG= HEBREW -.endif -################################################################ -.if ${LOCALIZED_LANG} == "hu" -CATEGORIES= hungarian -LANG_PKGNAME= hu -LANG_EXT= 36 -LANG_CONFIGURE_ARG= HUNG -.endif -################################################################ -.if ${LOCALIZED_LANG} == "it" -LANG_PKGNAME= it -LANG_EXT= 39 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= ITAL -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ja" -CATEGORIES= japanese -LANG_PKGNAME= ja -LANG_EXT= 81 -LANG_CONFIGURE_ARG= JAPN -MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ko" -CATEGORIES= korean -LANG_PKGNAME= ko -LANG_EXT= 82 -LANG_CONFIGURE_ARG= KOREAN -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "nb" -LANG_PKGNAME= nb -LANG_EXT= 47 -LANG_CONFIGURE_ARG= NORBOK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "nl" -LANG_PKGNAME= nl -LANG_EXT= 31 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= DTCH -.endif -################################################################ -.if ${LOCALIZED_LANG} == "nn" -LANG_PKGNAME= nn -LANG_EXT= 79 -LANG_CONFIGURE_ARG= NORNYN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ns" -LANG_PKGNAME= ns -LANG_EXT= 26 -LANG_CONFIGURE_ARG= NSOTHO -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pl" -CATEGORIES= polish -LANG_PKGNAME= pl -LANG_EXT= 48 -LANG_CONFIGURE_ARG= POL -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pt" -COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado -CATEGORIES= portuguese -LANG_PKGNAME= pt -LANG_EXT= 03 -LANG_CONFIGURE_ARG= PORT -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pt-BR" -COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado -CATEGORIES= portuguese -LANG_PKGNAME= pt -LANG_SUFFIX= BR -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_EXT= 55 -LANG_CONFIGURE_ARG= PORTBR -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ru" -CATEGORIES= russian -LANG_PKGNAME= ru -LANG_EXT= 07 -LANG_CONFIGURE_ARG= RUSS -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sv" -LANG_PKGNAME= sv -LANG_EXT= 46 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= SWED -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sk" -LANG_PKGNAME= sk -LANG_EXT= 43 -LANG_CONFIGURE_ARG= SLOVAK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sl-SI" -LANG_PKGNAME= sl -LANG_SUFFIX= SI -LANG_EXT= 50 -LANG_CONFIGURE_ARG= SLOVENIAN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "tr" -LANG_PKGNAME= tr -LANG_EXT= 90 -LANG_CONFIGURE_ARG= TURK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "we" -LANG_PKGNAME= cy -LANG_EXT= 53 -LANG_CONFIGURE_ARG= WELSH -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zh-CN" -CATEGORIES= chinese -LANG_PKGNAME= zh -LANG_SUFFIX= CN -LANG_EXT= 86 -LANG_CONFIGURE_ARG= CHINSIM -BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zh-TW" -CATEGORIES= chinese -LANG_PKGNAME= zh -LANG_SUFFIX= TW -LANG_EXT= 88 -LANG_CONFIGURE_ARG= CHINTRAD -BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zu" -LANG_PKGNAME= zu -LANG_EXT= 28 -LANG_CONFIGURE_ARG= ZULU -.endif -################################################################ -.if defined(LANG_PKGNAME) -PKGNAMEPREFIX= ${LANG_PKGNAME}- -.endif -.if defined(LANG_SUFFIX) -PKGNAMESUFFIX?= -${LANG_SUFFIX} -.endif -.endif - diff --git a/editors/openoffice-3/files/moz-patch b/editors/openoffice-3/files/moz-patch deleted file mode 100644 index eb06154b2d97..000000000000 --- a/editors/openoffice-3/files/moz-patch +++ /dev/null @@ -1,100 +0,0 @@ -#iZ 28398 -#iZ 11424 - -http://qa.openoffice.org/issues/show_bug.cgi?id=28398 -http://qa.openoffice.org/issues/show_bug.cgi?id=11424 - -diff -u moz/mozilla-source-1.7b.patch moz.new/mozilla-source-1.7b.patch ---- moz/mozilla-source-1.7b.patch Wed Jul 14 13:22:36 2004 -+++ moz.new/mozilla-source-1.7b.patch Mon Nov 22 18:22:38 2004 -@@ -4447,7 +4447,6 @@ - +#MKSHLIB += -R '$$ORIGIN' - endif - endif -- endif - - Index: mailnews/addrbook/src/nsAbMD5sum.cpp - =================================================================== -@@ -5104,3 +5103,81 @@ - +//#define HAVE_MMX_INTEL_MNEMONICS - +//#define HAVE_SSE2_INTEL_MNEMONICS - #endif -+ -+ -+ -+ -+--- misc/build/mozilla/configure.orig Tue Mar 16 13:00:47 2004 -++++ misc/build/mozilla/configure Sat Oct 16 15:59:50 2004 -+@@ -12507,15 +12507,15 @@ -+ -+ -+ if test -z "$GSSAPI_LIBS" ; then -+- LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" -+- echo $ac_n "checking for gss_init_sec_context in -lgssapi_krb5""... $ac_c" 1>&6 -+-echo "configure:12513: checking for gss_init_sec_context in -lgssapi_krb5" >&5 -+-ac_lib_var=`echo gssapi_krb5'_'gss_init_sec_context | sed 'y%./+-%__p_%'` -++ LIBS="$LIBS -lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt" -++ echo $ac_n "checking for gss_init_sec_context in -lgssapi""... $ac_c" 1>&6 -++echo "configure:12513: checking for gss_init_sec_context in -lgssapi" >&5 -++ac_lib_var=`echo gssapi'_'gss_init_sec_context | sed 'y%./+-%__p_%'` -+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+ else -+ ac_save_LIBS="$LIBS" -+-LIBS="-lgssapi_krb5 $LIBS" -++LIBS="-lgssapi $LIBS" -+ cat > conftest.$ac_ext <<EOF -+ #line 12521 "configure" -+ #include "confdefs.h" -+@@ -12543,7 +12543,7 @@ -+ fi -+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+- GSSAPI_LIBS="-L$GSSAPI_DIR/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" -++ GSSAPI_LIBS="-L$GSSAPI_DIR/lib -lgssapi -lkrb5 -lasn1 -lroken -lcrypto -lcom_err -lcrypt" -+ else -+ echo "$ac_t""no" 1>&6 -+ fi -+@@ -12653,7 +12653,7 @@ -+ cat > conftest.$ac_ext <<EOF -+ #line 12655 "configure" -+ #include "confdefs.h" -+- #include <gssapi/gssapi.h> -++ #include <gssapi.h> -+ int main() { -+ gss_OID oid = GSS_C_NT_HOSTBASED_SERVICE; -+ ; return 0; } -+ -+ endif -+ -+--- misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in.org Fri Oct 22 22:43:46 2004 -++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in Fri Oct 22 22:44:01 2004 -+@@ -225,6 +225,10 @@ -+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe -+ endif -+ -++ifeq ($(OS_ARCH), FreeBSD) -++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -++endif -++ -+ ifeq ($(OS_ARCH), NetBSD) -+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -+ endif -+ -+ -+--- misc/build/mozilla/extensions/negotiateauth/nsHttpGssapiAuth.cpp.org Tue Mar 16 09:34:01 2004 -++++ misc/build/mozilla/extensions/negotiateauth/nsHttpGssapiAuth.cpp Mon Nov 22 18:21:07 2004 -+@@ -289,7 +289,7 @@ -+ return NS_OK; -+ } -+ -+-NS_IMPL_ISUPPORTS1(nsHttpGssapiAuth, nsIHttpAuthenticator); -++NS_IMPL_ISUPPORTS1(nsHttpGssapiAuth, nsIHttpAuthenticator) -+ -+ // -+ // GenerateCredentials -+ -+ -+ -+ -+ diff --git a/editors/openoffice-3/files/oo_setup.resp b/editors/openoffice-3/files/oo_setup.resp deleted file mode 100644 index 6c6080103dbb..000000000000 --- a/editors/openoffice-3/files/oo_setup.resp +++ /dev/null @@ -1,7 +0,0 @@ -[Environment] -InstallationMode = INSTALL_NETWORK -InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org%%RELEASE_NR%% - -[Java] -JavaSupport = preinstalled_or_none diff --git a/editors/openoffice-3/files/openoffice-wrapper b/editors/openoffice-3/files/openoffice-wrapper deleted file mode 100644 index 447b0a2d9945..000000000000 --- a/editors/openoffice-3/files/openoffice-wrapper +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/openoffice-wrapper,v 1.13 2004-06-13 23:57:01 maho Exp $ - -oopath=%%PREFIX%%/OpenOffice.org%%RELEASE_NR%%/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` - -case $program in -$0) - $oopath/soffice "$@" - ;; - *) - $oopath/$program "$@" - ;; -esac diff --git a/editors/openoffice-3/files/patch-automation+source+server+statemnt.cxx b/editors/openoffice-3/files/patch-automation+source+server+statemnt.cxx deleted file mode 100644 index f480a35038c0..000000000000 --- a/editors/openoffice-3/files/patch-automation+source+server+statemnt.cxx +++ /dev/null @@ -1,19 +0,0 @@ -#iZ 37204 - -Index: automation/source/server/statemnt.cxx -=================================================================== -RCS file: /cvs/util/automation/source/server/statemnt.cxx,v -retrieving revision 1.18 -diff -u -r1.18 statemnt.cxx ---- automation/source/server/statemnt.cxx 9 Nov 2004 16:52:40 -0000 1.18 -+++ automation/source/server/statemnt.cxx 21 Nov 2004 03:30:37 -0000 -@@ -2251,7 +2251,8 @@ - { - pRet->GenReturn ( RET_Value, aSmartMethodId, String() ); - GetTTSettings()->pTranslateWin->EnableTranslation(); -- ErrorBox( GetTTSettings()->pTranslateWin, TTProperties::GetSvtResId( TT_NO_CONTROL ) ).Execute(); -+ ErrorBox err= ErrorBox(GetTTSettings()->pTranslateWin, TTProperties::GetSvtResId( TT_NO_CONTROL )); -+ err.Execute(); - GetTTSettings()->bToTop = TRUE; - } - diff --git a/editors/openoffice-3/files/patch-config_office+configure.in b/editors/openoffice-3/files/patch-config_office+configure.in deleted file mode 100644 index 356c23bd10fb..000000000000 --- a/editors/openoffice-3/files/patch-config_office+configure.in +++ /dev/null @@ -1,37 +0,0 @@ -#i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 (ant) - -Index: config_office/configure.in -=================================================================== -RCS file: /cvs/tools/config_office/configure.in,v -retrieving revision 1.63 -diff -u -r1.63 configure.in ---- config_office/configure.in 17 Mar 2004 09:33:26 -0000 1.63 -+++ config_office/configure.in 8 Jun 2004 20:53:16 -0000 -@@ -1830,10 +1831,12 @@ - - if test "$enable_java" != "no"; then - ANT_HOME=; export ANT_HOME -+WITH_ANT_HOME=; export WITH_ANT_HOME - if test -z "$with_ant_home"; then - AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat]) - else -- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin) -+ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH) -+ WITH_ANT_HOME=$with_ant_home - fi - - -@@ -1873,7 +1876,11 @@ - AC_TRY_EVAL(ant_cmd) - if test $? = 0 && test -f ./conftest.class ; then - AC_MSG_RESULT([Ant works]) -- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ if test -z "$WITH_ANT_HOME"; then -+ ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ else -+ ANT_HOME="$WITH_ANT_HOME" -+ fi - else - echo "configure: Ant test failed" >&5 - cat conftest.java >&5 diff --git a/editors/openoffice-3/files/patch-config_office+set_soenv.in b/editors/openoffice-3/files/patch-config_office+set_soenv.in deleted file mode 100644 index 54f4b834c0db..000000000000 --- a/editors/openoffice-3/files/patch-config_office+set_soenv.in +++ /dev/null @@ -1,13 +0,0 @@ -#i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 - ---- config_office/set_soenv.in.old Tue Mar 9 21:31:38 2004 -+++ config_office/set_soenv.in Sun Mar 28 09:56:03 2004 -@@ -1419,6 +1419,7 @@ - ToFile( "XSLTPROC", "@XSLTPROC@", "e" ); - ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); - ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); -+ToFile( "ANT", "@ANT@", "e" ); - ToFile( "JDKLIB", $JAVA_LIB, "e" ); - ToFile( "STLPORT4", $STLPORT4, "e" ); - ToFile( "ASM_PATH", $ASM_PATH, "e" ); diff --git a/editors/openoffice-3/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice-3/files/patch-cppuhelper+source+gcc3_linux_intel.map deleted file mode 100644 index aa65477decb2..000000000000 --- a/editors/openoffice-3/files/patch-cppuhelper+source+gcc3_linux_intel.map +++ /dev/null @@ -1,14 +0,0 @@ -#iz 23917 -Mysterious :) - -http://qa.openoffice.org/issues/show_bug.cgi?id=23917 ---- cppuhelper/source/gcc3_linux_intel.map.orig Sat Sep 13 22:15:22 2003 -+++ cppuhelper/source/gcc3_linux_intel.map Sat Sep 13 22:16:01 2003 -@@ -299,6 +299,7 @@ - _ZNK4cppu6UnoUrl11getProtocolEv; - _ZNK4cppu6UnoUrl13getConnectionEv; - _ZNK4cppu6UnoUrl13getObjectNameEv; -+_end; - - local: - *; 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 1e5d4e585326..000000000000 --- a/editors/openoffice-3/files/patch-odk+setsdkenv_unix.in +++ /dev/null @@ -1,29 +0,0 @@ -#iz 24142 - -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 ---- 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 f67e65c31c28..000000000000 --- a/editors/openoffice-3/files/patch-odk+settings+settings.mk +++ /dev/null @@ -1,90 +0,0 @@ -http://qa.openoffice.org/issues/show_bug.cgi?id=24142 - ---- 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-project-extentions b/editors/openoffice-3/files/patch-project-extentions deleted file mode 100644 index ff52c1788dc8..000000000000 --- a/editors/openoffice-3/files/patch-project-extentions +++ /dev/null @@ -1,75 +0,0 @@ -#iZ XXXXX -not yet raised - -RCS file: /cvs/util/extensions/source/nsplugin/source/makefile.mk,v -retrieving revision 1.3 -diff -u -r1.3 makefile.mk ---- extensions/source/nsplugin/source/makefile.mk 3 Sep 2004 11:41:22 -0000 1.3 -+++ extensions/source/nsplugin/source/makefile.mk 4 Oct 2004 15:42:46 -0000 -@@ -77,6 +77,9 @@ - .IF "$(GUI)"=="UNX" - .IF "$(OS)"=="LINUX" - INC+= -DNP_LINUX -+CFLAGS+=`pkg-config --cflags gtk+-2.0` -+.ELIF "$(OS)"=="FREEBSD" -+CFLAGS+=`pkg-config --cflags gtk+-2.0` - .ENDIF - .ENDIF - .IF "$(GUI)"=="WNT" -@@ -93,8 +96,12 @@ - .IF "$(GUI)"=="UNX" - SHL1OBJS+=$(SLO)$/npunix.obj - SLOFILES+=$(SLO)$/npunix.obj -+.IF "$(OS)"=="FREEBSD" -+#SHL1STDLIBS+= -+.ELSE - SHL1STDLIBS+= -ldl -lnsl --.ENDIF -+.ENDIF # FREEBSD -+.ENDIF # UNX - .IF "$(GUI)"=="WNT" - SHL1OBJS+=$(SLO)$/npwin.obj - SLOFILES+=$(SLO)$/npwin.obj -@@ -123,6 +130,7 @@ - .IF "$(GUI)"=="UNX" - #APP1STDLIBS+= -lgdk-x11-2.0 -lgtk-x11-2.0 - .IF "$(OS)"=="LINUX" -+.ELIF "$(OS)"=="FREEBSD" - .ELSE - APP1STDLIBS+= -ldl -lnsl -lnls -lsocket - .ENDIF -Index: extensions/source/nsplugin/source/so_env.cxx -=================================================================== -RCS file: /cvs/util/extensions/source/nsplugin/source/so_env.cxx,v -retrieving revision 1.2 -diff -u -r1.2 so_env.cxx ---- extensions/source/nsplugin/source/so_env.cxx 20 Aug 2004 10:08:00 -0000 1.2 -+++ extensions/source/nsplugin/source/so_env.cxx 4 Oct 2004 15:42:46 -0000 -@@ -62,7 +62,7 @@ - #ifdef UNIX - #include <sys/types.h> - #include <strings.h> --#ifdef NP_LINUX -+#if defined(NP_LINUX) || defined (FREEBSD) - #include <stdarg.h> - #else - #include <sys/varargs.h> - - -Index: extensions/source/config/ldap/makefile.mk -=================================================================== -RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v -retrieving revision 1.2 -diff -u -r1.2 makefile.mk ---- extensions/source/config/ldap/makefile.mk 3 Aug 2004 14:39:30 -0000 1.2 -+++ extensions/source/config/ldap/makefile.mk 24 Oct 2004 04:05:13 -0000 -@@ -97,6 +97,9 @@ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) -+.IF "$(OS)"=="FREEBSD" -+SHL1STDLIBS+=-lcompat -+.ENDIF - - DEF1NAME=$(SHL1TARGET) - DEF1EXPORTFILE=exports.dxp diff --git a/editors/openoffice-3/files/patch-project-xmlsecurity b/editors/openoffice-3/files/patch-project-xmlsecurity deleted file mode 100644 index ef61490dd145..000000000000 --- a/editors/openoffice-3/files/patch-project-xmlsecurity +++ /dev/null @@ -1,40 +0,0 @@ -#iZ XXXX -porting project xmlsec -1) we should provide configure based one -2) malloc.h is deprecated for FreeBSD - -Index: libxmlsec/xmlsec1-1.2.4.patch -=================================================================== -RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.4.patch,v -retrieving revision 1.7 -diff -u -r1.7 xmlsec1-1.2.4.patch ---- libxmlsec/xmlsec1-1.2.4.patch 9 Sep 2004 08:31:29 -0000 1.7 -+++ libxmlsec/xmlsec1-1.2.4.patch 3 Oct 2004 05:52:20 -0000 -@@ -83,7 +83,7 @@ - ! #undef HAVE_MACH_O_DYLD_H - ! - ! /* Define to 1 if you have the <malloc.h> header file. */ --! #define HAVE_MALLOC_H 1 -+! #define HAVE_MALLOC_H 0 - ! - ! /* Define to 1 if you have the `memcpy' function. */ - ! #undef HAVE_MEMCPY - - -Index: xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx -=================================================================== -RCS file: /cvs/xml/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 xmldocumentwrapper_xmlsecimpl.cxx ---- xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx 12 Jul 2004 13:15:21 -0000 1.1.1.1 -+++ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx 4 Oct 2004 22:04:08 -0000 -@@ -68,7 +68,9 @@ - #include <xmloff/attrlist.hxx> - #include "xmlelementwrapper_xmlsecimpl.hxx" - -+#if !defined (FREEBSD) - #include <malloc.h> -+#endif - #include <stdio.h> - #include <stdlib.h> - #include <string.h> diff --git a/editors/openoffice-3/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice-3/files/patch-psprint+source+helper+strhelper.cxx deleted file mode 100644 index 186ff5e741b2..000000000000 --- a/editors/openoffice-3/files/patch-psprint+source+helper+strhelper.cxx +++ /dev/null @@ -1,21 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=27753 -The isnan() macro is a new feature of C99 and not yet part of C++. - -Index: source/helper/strhelper.cxx -=================================================================== -RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v -retrieving revision 1.6 -diff -u -r1.6 strhelper.cxx ---- psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 -+++ psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 -@@ -67,6 +67,10 @@ - #include <cmath> // for isnan - #include <cstring> - -+#if defined (FREEBSD) -+using namespace __gnu_cxx; //for isnan -+#endif -+ - namespace psp { - - inline int isSpace( char cChar ) diff --git a/editors/openoffice-3/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice-3/files/patch-sfx2+source+config+cfgmgr.cxx deleted file mode 100644 index e4965fdf3553..000000000000 --- a/editors/openoffice-3/files/patch-sfx2+source+config+cfgmgr.cxx +++ /dev/null @@ -1,17 +0,0 @@ -#iz 22253 - -http://qa.openoffice.org/issues/show_bug.cgi?id=22253 - ---- sfx2/source/config/cfgmgr.cxx.org Fri Nov 7 19:11:25 2003 -+++ sfx2/source/config/cfgmgr.cxx Fri Nov 7 19:30:26 2003 -@@ -118,6 +118,10 @@ - catch(com::sun::star::ucb::InteractiveAugmentedIOException&) - { - } -+ // PJ: This is a workaround for weird error on FreeBSD (#i22253#) -+ catch(com::sun::star::uno::Exception&) -+ { -+ } - sal_Bool bIsDocument; - if ( (aAny >>= bIsDocument) && bIsDocument ) - return new SotStorage( TRUE, rName, nMode, STORAGE_TRANSACTED ); diff --git a/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk deleted file mode 100644 index 16c987a9c521..000000000000 --- a/editors/openoffice-3/files/patch-solenv+inc+unxfbsdi.mk +++ /dev/null @@ -1,262 +0,0 @@ -Index: solenv/inc/unxfbsdi.mk -=================================================================== -RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v -retrieving revision 1.11 -diff -u -r1.11 unxfbsdi.mk ---- solenv/inc/unxfbsdi.mk 20 Sep 2004 08:37:13 -0000 1.11 -+++ solenv/inc/unxfbsdi.mk 21 Nov 2004 14:26:32 -0000 -@@ -60,16 +60,26 @@ - # - #************************************************************************* - --# mak file for unxfbsdi --ASM=$(CC) --AFLAGS=-x assembler-with-cpp -c $(CDEFS) -+# mk file for unxfbsdi -+ASM= -+AFLAGS= -+ -+SOLAR_JAVA*=TRUE -+JAVAFLAGSDEBUG=-g - - # filter for supressing verbose messages from linker - #not needed at the moment - #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" - -+# _PTHREADS is needed for the stl -+CDEFS+= -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -+ -+# enable visibility define in "sal/types.h" -+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE -+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -+ - # this is a platform with JAVA support --SOLAR_JAVA*=TRUE - .IF "$(SOLAR_JAVA)"!="" - JAVADEF=-DSOLAR_JAVA - .IF "$(debug)"=="" -@@ -77,96 +87,82 @@ - .ELSE - JAVA_RUNTIME=-ljava_g - .ENDIF -+.ENDIF -+ -+# define default arch flags when needed -+.IF "$(ARCH_FLAGS)"=="" -+ARCH_FLAGS=-mcpu=pentiumpro - .ENDIF - - # name of C++ Compiler - CXX*=g++ - # name of C Compiler - CC*=gcc -+# flags for C and C++ Compiler -+CFLAGS+=-Wuninitialized -fmessage-length=0 -c $(INCLUDE) - --# filter for supressing verbose messages from linker --# not needed at the moment --LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" -- --# options for C and C++ Compiler --CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION) --CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT -- --# flags for C and C++ Compile --CFLAGS+= -w -c $(INCLUDE) --CFLAGS+= -I/usr/X11R6/include -+# flags to enable build with symbols; required for crashdump feature -+.IF "$(ENABLE_SYMBOLS)"=="SMALL" -+CFLAGSENABLESYMBOLS=-g1 -+.ELSE -+CFLAGSENABLESYMBOLS=-g -+.ENDIF - - # flags for the C++ Compiler --CFLAGSCC= -pipe -fno-rtti --CFLAGSCXX= -pipe -fno-rtti --CFLAGSCXX+= -Wno-ctor-dtor-privacy -- -+CFLAGSCC= -pipe $(ARCH_FLAGS) - # Flags for enabling exception handling --CFLAGSEXCEPTIONS= -fexceptions --CFLAGS_NO_EXCEPTIONS= -fno-exceptions -- --# Compiler flags for compiling static object in single threaded --# environment with graphical user interface --CFLAGSOBJGUIST= -fPIC -- --# Compiler flags for compiling static object in single threaded --# environment with character user interface --CFLAGSOBJCUIST= -fPIC -- --# Compiler flags for compiling static object in multi threaded --# environment with graphical user interface --CFLAGSOBJGUIMT= -fPIC -- --# Compiler flags for compiling static object in multi threaded --# environment with character user interface --CFLAGSOBJCUIMT= -fPIC -- --# Compiler flags for compiling shared object in multi threaded --# environment with graphical user interface --CFLAGSSLOGUIMT= -fPIC -- --# Compiler flags for compiling shared object in multi threaded --# environment with character user interface --CFLAGSSLOCUIMT= -fPIC -+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs -+# Flags for disabling exception handling -+CFLAGS_NO_EXCEPTIONS=-fno-exceptions - --# Compiler flags for profilin --CFLAGSPROF= -pg -+CFLAGSCXX= -pipe $(ARCH_FLAGS) -+CFLAGSCXX+= -Wno-ctor-dtor-privacy - -+# Compiler flags for compiling static object in single threaded environment with graphical user interface -+CFLAGSOBJGUIST= -+# Compiler flags for compiling static object in single threaded environment with character user interface -+CFLAGSOBJCUIST= -+# Compiler flags for compiling static object in multi threaded environment with graphical user interface -+CFLAGSOBJGUIMT= -+# 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 -+# Compiler flags for compiling shared object in multi threaded environment with character user interface -+CFLAGSSLOCUIMT=-fPIC -+# Compiler flags for profiling -+CFLAGSPROF= -pg - # Compiler flags for debugging --CFLAGSDEBUG= -g -+CFLAGSDEBUG=-g - CFLAGSDBGUTIL= -- --# Compiler flags to enable optimizations --# -02 is broken for FreeBSD --CFLAGSOPT= -O -- --# Compiler flags to disable optimizations --# -0 is broken for STLport for FreeBSD --CFLAGSNOOPT= -O0 -- --# Compiler flags for the output path --CFLAGSOUTOBJ= -o -- -+# Compiler flags for enabling optimazations -+# CFLAGSOPT=-O2 -+# reduce to -O1 to avoid optimisation problems -+CFLAGSOPT=-O1 -+# Compiler flags for disabling optimazations -+CFLAGSNOOPT=-O0 -+# Compiler flags for discibing the output path -+CFLAGSOUTOBJ=-o - # Enable all warnings --CFLAGSWALL=-Wall -- -+CFLAGSWALL=-Wall -Wfloat-equal -Weffc++ -Wold-style-cast -Woverloaded-virtual -Wshadow -Wpointer-arith -Wcast-align -Wsign-compare -Winline - # Set default warn level --CFLAGSDFLTWARN=-w -+CFLAGSDFLTWARN= - - # switches for dynamic and static linking --STATIC= -Wl,-Bstatic --DYNAMIC= -Wl,-Bdynamic -+STATIC = -Wl,-Bstatic -+DYNAMIC = -Wl,-Bdynamic - - # name of linker --LINK=$(CC) -+LINK*=$(CC) - - # default linker flags --# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\' --LINKFLAGS=$(LINKFLAGSRUNPATH) -+LINKFLAGSDEFS*=-z defs -+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' -+LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) - - # linker flags for linking applications --LINKFLAGSAPPGUI= -Wl,--noinhibit-exec --LINKFLAGSAPPCUI= -Wl,--noinhibit-exec -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec - - # linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared -@@ -177,23 +173,19 @@ - LINKFLAGSDEBUG=-g - LINKFLAGSOPT= - --.IF "$(NO_BSYMBOLIC)"=="" --.IF "$(PRJNAME)" != "envtest" --LINKFLAGSSHLGUI+= -Wl,-Bsymbolic --LINKFLAGSSHLCUI+= -Wl,-Bsymbolic --.ENDIF --.ENDIF -+# linker flags for optimization (symbol hashtable) -+# for now, applied to symbol scoped libraries, only -+LINKFLAGSOPTIMIZE*=-Wl,-O1 -+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script - --LINKVERSIONMAPFLAG=-Wl,--version-script -+SONAME_SWITCH=-Wl,-h - - # Sequence of libs does matter ! --STDLIBCPP=-lstdc++ - --# _SYSLIBS= -L/usr/lib -lm --# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11 --# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib -+STDLIBCPP=-lstdc++ - - # default objectfilenames to link -+STDOBJVCL=$(L)$/salmain.o - STDOBJGUI= - STDSLOGUI= - STDOBJCUI= -@@ -201,24 +193,30 @@ - - # libraries for linking applications - STDLIBCUIST=-lm --STDLIBGUIST=-lXaw -lXt -lX11 -lm --STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm -+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm - STDLIBCUIMT=$(PTHREAD_LIBS) -lm -- -+STDLIBGUIST=-lX11 -lm - # libraries for linking shared libraries --STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm -+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm - STDSHLCUIMT=$(PTHREAD_LIBS) -lm -+STDSHLGUIST=-lX11 -lXext -lm -+STDSHLCUIST=-lm - - LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - --# STLport always needs pthread. --LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS) --LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS) -+.IF "$(USE_SYSTEM_STL)"=="YES" -+LIBSTLPORT=$(DYNAMIC) -lstdc++ -+LIBSTLPORTST=$(STATIC) $(DYNAMIC) -+.ELSE -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++ -+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -+.ENDIF -+ -+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - - # name of library manager - LIBMGR=ar - LIBFLAGS=-r --LIBEXT= .a - - # tool for generating import libraries - IMPLIB= -@@ -237,3 +235,4 @@ - DLLPOSTFIX=fi - DLLPRE=lib - DLLPOST=.so -+ diff --git a/editors/openoffice-3/files/patch-transex3+source+xmlparse.cxx b/editors/openoffice-3/files/patch-transex3+source+xmlparse.cxx deleted file mode 100644 index 1e88b4c4dda4..000000000000 --- a/editors/openoffice-3/files/patch-transex3+source+xmlparse.cxx +++ /dev/null @@ -1,29 +0,0 @@ -#iZ XXXX - -FreeBSD doesn't have alloca.h, and -builtin alloca is defined at stdlib.h. - -Index: transex3/source/xmlparse.cxx -=================================================================== -RCS file: /cvs/l10n/transex3/source/xmlparse.cxx,v -retrieving revision 1.2 -diff -u -r1.2 xmlparse.cxx ---- transex3/source/xmlparse.cxx 30 Aug 2004 17:31:58 -0000 1.2 -+++ transex3/source/xmlparse.cxx 3 Oct 2004 08:41:45 -0000 -@@ -64,11 +64,12 @@ - - - #include <stdio.h> --#ifdef WIN32 --#include <malloc.h> -+ -+#if defined(SOLARIS) || defined(IRIX) -+ #include <alloca.h> - #else --#ifndef MACOSX --#include <alloca.h> -+#if !(defined(MACOSX) || defined(FREEBSD)) -+ #include <malloc.h> - #endif - #endif - diff --git a/editors/openoffice-3/files/patch-ucbhelper+source+client+proxydecider.cxx b/editors/openoffice-3/files/patch-ucbhelper+source+client+proxydecider.cxx deleted file mode 100644 index 5c01ac64f193..000000000000 --- a/editors/openoffice-3/files/patch-ucbhelper+source+client+proxydecider.cxx +++ /dev/null @@ -1,17 +0,0 @@ -Index: ucbhelper/source/client/proxydecider.cxx -=================================================================== -RCS file: /cvs/ucb/ucbhelper/source/client/proxydecider.cxx,v -retrieving revision 1.4 -diff -u -r1.4 proxydecider.cxx ---- ucbhelper/source/client/proxydecider.cxx 3 Nov 2004 08:03:28 -0000 1.4 -+++ ucbhelper/source/client/proxydecider.cxx 21 Nov 2004 00:08:25 -0000 -@@ -128,6 +128,9 @@ - #include <unistd.h> - #endif - -+#ifdef FREEBSD -+#include <sys/socket.h> -+#endif - namespace - { - |