From 0495b7490eeeffb6a33ad63e87bb00e87515a1ca Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Tue, 4 Oct 2005 03:59:42 +0000 Subject: update to 2.0RC1 --- editors/openoffice.org-2.0/files/Makefile.knobs | 11 +++-- .../openoffice.org-2.0/files/Makefile.localized | 53 ++++++++++++++++++++-- .../openoffice.org-2.0/files/fbsd4-workaroundpatch | 11 +---- editors/openoffice.org-2.0/files/patch-instsetoo | 51 ++++++++++----------- 4 files changed, 80 insertions(+), 46 deletions(-) (limited to 'editors/openoffice.org-2.0/files') diff --git a/editors/openoffice.org-2.0/files/Makefile.knobs b/editors/openoffice.org-2.0/files/Makefile.knobs index bef0514d2a5d..366ae60ba851 100644 --- a/editors/openoffice.org-2.0/files/Makefile.knobs +++ b/editors/openoffice.org-2.0/files/Makefile.knobs @@ -85,11 +85,12 @@ pre-fetch: @${ECHO} "You can select the language for OOo by making it with:" @${ECHO} "make LOCALIZED_LANG=xx" @${ECHO} "while xx can be one of the following" - @${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB eo es" - @${ECHO} "et eu fi fr gl gu-IN he hi-IN hr hu it ja km kn-IN" - @${ECHO} "ko lt ms nb nl nn ns pa-IN pl pt pt-BR ru rw sk" - @${ECHO} "sl sv ta-IN th tn tr vi xh zh-CN zh-TW zu" - @${ECHO} + @${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB en-US eo es" + @${ECHO} "et eu fi fr ga gl gu-IN he hi-IN hr hu it ja km kn-IN" + @${ECHO} "ko lo lt ms ne nb nl nn nr ns pa-IN pl pt pt-BR ru rw" + @${ECHO} "sk sl sh-YU sr-CS ss st sv sw-TZ ta-IN th tn tr ts ve" + @${ECHO} "vi xh zh-CN zh-TW zu" + @${ECHO} "Default: en-US" #XXX currently broken #.if !defined(WITHOUT_JAVA) # @${ECHO} diff --git a/editors/openoffice.org-2.0/files/Makefile.localized b/editors/openoffice.org-2.0/files/Makefile.localized index 795dc3bd2dd4..a3f90e791abe 100644 --- a/editors/openoffice.org-2.0/files/Makefile.localized +++ b/editors/openoffice.org-2.0/files/Makefile.localized @@ -56,6 +56,10 @@ LANG_PKGNAME= ${LOCALIZED_LANG} LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "en-US" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "eo" LANG_PKGNAME= ${LOCALIZED_LANG} .endif @@ -81,6 +85,10 @@ CATEGORIES+= french LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "ga" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "gl" LANG_PKGNAME= ${LOCALIZED_LANG} .endif @@ -138,6 +146,10 @@ LANG_PKGNAME= ${LOCALIZED_LANG} LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "ne" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "nb" LANG_PKGNAME= ${LOCALIZED_LANG} .endif @@ -150,6 +162,10 @@ LANG_PKGNAME= ${LOCALIZED_LANG} LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "nr" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "ns" LANG_PKGNAME= ${LOCALIZED_LANG} .endif @@ -173,7 +189,7 @@ LANG_CONFIGURE_ARG= PORT ################################################################ .if ${LOCALIZED_LANG} == "pt-BR" COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado -CATEGORIES+= portuguese +CATEGORIES+= portuguese LANG_PKGNAME= pt LANG_SUFFIX= BR .endif @@ -184,7 +200,6 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "rw" -CATEGORIES+= russian LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ @@ -196,10 +211,30 @@ LANG_PKGNAME= ${LOCALIZED_LANG} LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "sh-YU" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "sr-CS" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ss" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "st" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "sv" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "sw-TZ" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "ta-IN" LANG_PKGNAME= ${LOCALIZED_LANG} .endif @@ -208,14 +243,22 @@ LANG_PKGNAME= ${LOCALIZED_LANG} LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -#.if ${LOCALIZED_LANG} == "tn" -#LANG_PKGNAME= ${LOCALIZED_LANG} -#.endif +.if ${LOCALIZED_LANG} == "tn" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif ################################################################ .if ${LOCALIZED_LANG} == "tr" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "ts" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "ve" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "vi" LANG_PKGNAME= ${LOCALIZED_LANG} .endif diff --git a/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch b/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch index fdf589585cf2..414bb86c38b4 100644 --- a/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch +++ b/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch @@ -43,7 +43,7 @@ diff -u -r1.5 makefile.mk ######################################################################### Issutracker : #i52984#, #i54178# CWS : N/A -Reported by : +Author: : (JCA) Description : Workaround for FreeBSD4. For rsc/rscpp, -pthread is ignored although it is specifled, so specified twice. it does solve the probem. this is redundant @@ -57,15 +57,6 @@ retrieving revision 1.17 diff -u -r1.17 unxfbsdi.mk --- solenv/inc/unxfbsdi.mk 18 Aug 2005 12:04:47 -0000 1.17 +++ solenv/inc/unxfbsdi.mk 3 Sep 2005 11:10:07 -0000 -@@ -72,7 +72,7 @@ - #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" - - # _PTHREADS is needed for the stl --CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -+CDEFS+=$(PTHREAD_CFLAGS) -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" @@ -217,8 +217,10 @@ LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive diff --git a/editors/openoffice.org-2.0/files/patch-instsetoo b/editors/openoffice.org-2.0/files/patch-instsetoo index c9cebc0a5c3a..ccb23c985924 100644 --- a/editors/openoffice.org-2.0/files/patch-instsetoo +++ b/editors/openoffice.org-2.0/files/patch-instsetoo @@ -10,91 +10,90 @@ and pkg_add command is forked infinite times and eats up systems' resource. namely when core01 tries to install core02, core02 also tries to install core01. - Index: instsetoo_native/inc_openoffice/unix/packagelist.txt =================================================================== RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v -retrieving revision 1.15 -diff -u -r1.15 packagelist.txt ---- instsetoo_native/inc_openoffice/unix/packagelist.txt 18 Aug 2005 12:48:34 -0000 1.15 -+++ instsetoo_native/inc_openoffice/unix/packagelist.txt 22 Aug 2005 07:01:29 -0000 -@@ -38,7 +38,7 @@ +retrieving revision 1.16 +diff -u -r1.16 packagelist.txt +--- instsetoo_native/inc_openoffice/unix/packagelist.txt 30 Aug 2005 08:52:34 -0000 1.16 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt 7 Sep 2005 10:20:37 -0000 +@@ -36,7 +36,7 @@ + solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" packagename = "openoffice.org-core01" - linuxreplaces = "openofficeorg-core,openofficeorg-core01" - provides = "openofficeorg-core01" + linuxreplaces = "openofficeorg-mailcap,openofficeorg-core,openofficeorg-core01" -requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08" +requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08,openoffice.org-core09,openoffice.org-core10" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -284,7 +284,6 @@ +@@ -265,7 +265,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core02" linuxreplaces = "openofficeorg-core02" - provides = "openofficeorg-core02" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -298,7 +297,6 @@ +@@ -278,7 +277,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core03" linuxreplaces = "openofficeorg-core03" - provides = "openofficeorg-core03" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -312,7 +310,6 @@ +@@ -291,7 +289,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core04" linuxreplaces = "openofficeorg-core04" - provides = "openofficeorg-core04" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -326,7 +323,6 @@ +@@ -304,7 +301,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core05" linuxreplaces = "openofficeorg-core05" - provides = "openofficeorg-core05" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -340,7 +336,6 @@ +@@ -317,7 +313,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core06" linuxreplaces = "openofficeorg-core06" - provides = "openofficeorg-core06" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -354,7 +349,6 @@ +@@ -330,7 +325,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core07" linuxreplaces = "openofficeorg-core07" - provides = "openofficeorg-core07" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -368,7 +362,6 @@ +@@ -343,7 +337,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core08" linuxreplaces = "openofficeorg-core08" - provides = "openofficeorg-core08" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -382,7 +375,6 @@ +@@ -356,7 +349,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core09" linuxreplaces = "openofficeorg-core09" - provides = "openofficeorg-core09" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -397,7 +389,6 @@ +@@ -370,7 +362,6 @@ + solarisrequires = "openofficeorg-core01" packagename = "openoffice.org-core10" linuxreplaces = "openofficeorg-core10" - provides = "openofficeorg-core10" -requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" -- cgit v1.2.3