diff options
author | Maho Nakata <maho@FreeBSD.org> | 2004-08-13 03:04:04 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2004-08-13 03:04:04 +0000 |
commit | 369083f9cd172ba99ef02704c9a42556c3a29114 (patch) | |
tree | 098d07a541fcef1add15a3690287163e60e65db7 /editors/openoffice-1.1-devel/files | |
parent | Update to 0.37 (diff) |
o remove obsolated (?) patches
files/freebsd-local.sh
files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
files/patch-desktop+scripts+soffice.sh
files/patch-solenv+bin+addsym.awk
files/patch-tools+source+string+tstring.cxx
files/patch-unoil+makefile.pmk
o More clean-up of Makefiles
o add generate.pl, generates csh script that build everything
o WITHOUT_MOZILLA for 5-current, workaround for mozilla subproject
Notes
Notes:
svn path=/head/; revision=116086
Diffstat (limited to 'editors/openoffice-1.1-devel/files')
8 files changed, 28 insertions, 179 deletions
diff --git a/editors/openoffice-1.1-devel/files/Makefile.localized b/editors/openoffice-1.1-devel/files/Makefile.localized index 226e649100a7..064f04588288 100644 --- a/editors/openoffice-1.1-devel/files/Makefile.localized +++ b/editors/openoffice-1.1-devel/files/Makefile.localized @@ -1,6 +1,6 @@ # localized makefile # Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1-devel/files/Attic/Makefile.localized,v 1.3 2004-08-11 00:36:27 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1-devel/files/Attic/Makefile.localized,v 1.4 2004-08-13 03:04:04 maho Exp $ ################################################################ .if defined(LOCALIZED_LANG) @@ -275,5 +275,11 @@ 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-1.1-devel/files/freebsd-local.sh b/editors/openoffice-1.1-devel/files/freebsd-local.sh deleted file mode 100644 index e4d951ae481f..000000000000 --- a/editors/openoffice-1.1-devel/files/freebsd-local.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# -# $FreeBSD $ - -save_common_xcu() { -sed 's/^X//' > $OOHOME/tmp/Common.xcu << 'END-of-Common.xcu' -X<?xml version="1.0" encoding="UTF-8"?> -X<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Common" oor:package="org.openoffice.Office"> -X <node oor:name="Internal"> -X <prop oor:name="CurrentTempURL" oor:type="xs:string"> -X <value/> -X </prop> -X </node> -X <node oor:name="Misc"> -X <prop oor:name="FirstRun" oor:type="xs:boolean"> -X <value>true</value> -X </prop> -X </node> -X <node oor:name="ExternalApps"> -X <prop oor:name="file" oor:type="xs:string"> -X <value/> -X </prop> -X <prop oor:name="ftp" oor:type="xs:string"> -X <value/> -X </prop> -X <prop oor:name="http" oor:type="xs:string"> -X <value>%%mozilla%%</value> -X </prop> -X <prop oor:name="https" oor:type="xs:string"> -X <value/> -X </prop> -X <prop oor:name="mailto" oor:type="xs:string"> -X <value/> -X </prop> -X </node> -X</oor:component-data> -END-of-Common.xcu -mozilla=`which mozilla`; -if [ $? -eq 0 ]; then - sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' $OOHOME/tmp/Common.xcu -fi -mozilla=`which linux-mozilla`; -if [ $? -eq 0 ]; then - sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' $OOHOME/tmp/Common.xcu -fi -mv $OOHOME/tmp/Common.xcu $OOHOME/user/registry/data/org/openoffice/Office -} - -# -# Set default lang to en_US.ISO8859-15 -# -if [ ! $LANG ]; then - export LANG=en_US.ISO8859-15 -fi - -# -# Create soffice.cfg if it does not exist. -# -if [ ! -z $OOHOME ] && [ -e $OOHOME/setup ]; then - if [ ! -d $OOHOME/user/config/soffice.cfg ]; then - mkdir $OOHOME/user/config/soffice.cfg - fi -fi - -# -# Detect installed mozilla -# -if [ ! -z $OOHOME ] && [ ! -e $OOHOME/user/registry/data/org/openoffice/Office/Common.xcu ]; then - mkdir -p $OOHOME/tmp; - save_common_xcu; -fi diff --git a/editors/openoffice-1.1-devel/files/generate.pl b/editors/openoffice-1.1-devel/files/generate.pl new file mode 100644 index 000000000000..dfbbdc7f6e46 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/generate.pl @@ -0,0 +1,21 @@ +#!/usr/bin/perl + +# generate full build shell script for OpenOffice.org +# Whom: Maho Nakata <maho@FreeBSD.org> +# $FreeBSD$ + +print "#!/bin/csh\n"; +print "/usr/bin/time make WITH_CCACHE=yes package package-rename solver sdk deinstall clean >& log.en\n"; +print "/usr/bin/time make ALL_LOCALIZED_LANGS=yes >& log.all\n"; + +open ( FILE, "< Makefile.localized") ; +while(<FILE>){ +@tmp=split (' ',$_); +@tmp2=split ('"',$tmp[3]); +if ( $tmp[1] eq "\${LOCALIZED_LANG}") { $LANG=$tmp2[1]; + print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n"; + print "/usr/bin/time make LOCALIZED_LANG=$LANG WITH_CCACHE=yes package package-rename deinstall >& log.$LANG\n"; + } +} +close FILE; + diff --git a/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk deleted file mode 100644 index 2f79f5a07f6e..000000000000 --- a/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk +++ /dev/null @@ -1,45 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Apr 15 19:39:14 2003 -+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 31 22:34:31 2003 -@@ -64,8 +64,8 @@ - #mozilla specific stuff. - MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) - MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla --#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib --#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla -+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib -+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla - #End of mozilla specific stuff. - - PRJ=..$/..$/..$/.. -@@ -132,7 +132,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \ - -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ - -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ -@@ -150,7 +150,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS+= -DMOZILLA_CLIENT \ - -DOSTYPE=\"Linux2.2.14-5\" -DOJI - .IF "$(OS)" == "LINUX" -@@ -166,6 +166,13 @@ - -fno-rtti -Wall -Wconversion -Wpointer-arith \ - -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ - -Wno-long-long -+CDEFS += -DTRACING -+.ELIF "$(OS)" == "FREEBSD" -+CFLAGS += -fPIC -+CFLAGSCXX += \ -+ -fno-rtti -Wall -Wconversion -Wpointer-arith \ -+ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ -+ -Wno-long-long -pthread - CDEFS += -DTRACING - .ENDIF - .ENDIF diff --git a/editors/openoffice-1.1-devel/files/patch-desktop+scripts+soffice.sh b/editors/openoffice-1.1-devel/files/patch-desktop+scripts+soffice.sh deleted file mode 100644 index ad1235c24e01..000000000000 --- a/editors/openoffice-1.1-devel/files/patch-desktop+scripts+soffice.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- ../desktop/scripts/soffice.sh.orig Wed Sep 17 05:21:54 2003 -+++ ../desktop/scripts/soffice.sh Wed Sep 17 05:24:59 2003 -@@ -233,6 +233,8 @@ - PATH="$sd_prog":$PATH - export PATH - -+. $sd_prog/freebsd-local.sh -+ - # execute soffice binary - exec "$sd_prog/$sd_binary" "$@" - diff --git a/editors/openoffice-1.1-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice-1.1-devel/files/patch-solenv+bin+addsym.awk deleted file mode 100644 index 996e282b350b..000000000000 --- a/editors/openoffice-1.1-devel/files/patch-solenv+bin+addsym.awk +++ /dev/null @@ -1,16 +0,0 @@ ---- ../solenv/bin/addsym.awk.orig Tue Mar 11 15:11:44 2003 -+++ ../solenv/bin/addsym.awk Tue Mar 11 15:13:19 2003 -@@ -72,11 +72,11 @@ - END { - if (state == 0) { - print "# Weak RTTI symbols for C++ exceptions:" -- print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };" -+ print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};" - } - } - state == 2 { -- print " _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions" -+ print " _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions" - state = 3 - } - /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 } diff --git a/editors/openoffice-1.1-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-1.1-devel/files/patch-tools+source+string+tstring.cxx deleted file mode 100644 index 43a78f4c538b..000000000000 --- a/editors/openoffice-1.1-devel/files/patch-tools+source+string+tstring.cxx +++ /dev/null @@ -1,22 +0,0 @@ ---- ../tools/source/string/tstring.cxx.orig Thu Mar 27 18:04:53 2003 -+++ ../tools/source/string/tstring.cxx Sat May 31 23:04:05 2003 -@@ -103,6 +103,9 @@ - xub_StrLen ImplStringLen( const sal_Char* pStr ) - { - const sal_Char* pTempStr = pStr; -+ -+ if (pStr == NULL) -+ return(0); - while( *pTempStr ) - ++pTempStr; - return (xub_StrLen)(pTempStr-pStr); -@@ -113,6 +116,9 @@ - xub_StrLen ImplStringLen( const sal_Unicode* pStr ) - { - const sal_Unicode* pTempStr = pStr; -+ -+ if (pStr == NULL) -+ return(0); - while( *pTempStr ) - ++pTempStr; - return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice-1.1-devel/files/patch-unoil+makefile.pmk b/editors/openoffice-1.1-devel/files/patch-unoil+makefile.pmk deleted file mode 100644 index 7febdabf7b4b..000000000000 --- a/editors/openoffice-1.1-devel/files/patch-unoil+makefile.pmk +++ /dev/null @@ -1,13 +0,0 @@ ---- ../unoil/makefile.pmk.orig Fri Aug 31 18:04:43 2001 -+++ ../unoil/makefile.pmk Thu Sep 12 12:17:50 2002 -@@ -74,8 +74,8 @@ - JAVAFILESLIST := $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java) - .ENDIF # "$(L10N_framework)"=="" - --GENJAVAFILES := $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i) --GENCLASSFILES := $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class) -+GENJAVAFILES += $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i) -+GENCLASSFILES += $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class) - - # --- Targets ------------------------------------------------------ - |