diff options
author | Maho Nakata <maho@FreeBSD.org> | 2005-12-11 01:02:19 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2005-12-11 01:02:19 +0000 |
commit | faebbd02e30cd0d381340029b5b261695340b3be (patch) | |
tree | 6d786cf6c26b647f3230bf7c4d85026fa60a656c /editors | |
parent | net/mldonkey-devel has been fixed to work with lang/ocaml version (diff) |
Update to 2.0m145=(2.0.1rc4)
Notes
Notes:
svn path=/head/; revision=150841
Diffstat (limited to 'editors')
30 files changed, 405 insertions, 135 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 937943971631..bb8ac0ee24a7 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -59,8 +59,8 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -MILESTONE?= 143 -SNAPDATE= 20051202 +MILESTONE?= 145 +SNAPDATE= 20051208 INSTALLATION_BASEDIR?= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE?= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index 06847b7df484..d44e6853e590 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_2.0m143_source.tar.bz2) = d8094179e1705ea20d1d1c60aaa8fa6f -SHA256 (openoffice.org2.0/OOo_2.0m143_source.tar.bz2) = df2c3e58c2883fbd4dba6f1bf3249ebcac9759324098460a30d7a6464528d1c6 -SIZE (openoffice.org2.0/OOo_2.0m143_source.tar.bz2) = 235394897 +MD5 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85 +SHA256 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7 +SIZE (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 235392588 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs index 1f3ae9cce1a4..8fc898b33521 100644 --- a/editors/openoffice-3-devel/files/Makefile.knobs +++ b/editors/openoffice-3-devel/files/Makefile.knobs @@ -89,11 +89,11 @@ 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 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} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el" + @${ECHO} "en-GB en-US en-ZA eo es et eu fi fr ga gl gu-IN he hi-IN" + @${ECHO} "hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl nn nr" + @${ECHO} "ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv" + @${ECHO} "sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu" @${ECHO} "Default: en-US" #XXX currently broken #.if !defined(WITHOUT_JAVA) diff --git a/editors/openoffice-3-devel/files/Makefile.localized b/editors/openoffice-3-devel/files/Makefile.localized index a3f90e791abe..d1a0fa4e670b 100644 --- a/editors/openoffice-3-devel/files/Makefile.localized +++ b/editors/openoffice-3-devel/files/Makefile.localized @@ -14,15 +14,34 @@ CATEGORIES+= arabic LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "bn" +.if ${LOCALIZED_LANG} == "be-BY" +LANG_PKGNAME= be +LANG_SUFFIX= BY +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bg" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "be-BY" +.if ${LOCALIZED_LANG} == "br" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "bg" +.if ${LOCALIZED_LANG} == "bn" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bn-BD" +LANG_PKGNAME= be +LANG_SUFFIX= BD +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bn-IN" +LANG_PKGNAME= bn +LANG_SUFFIX= IN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bs" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ @@ -53,11 +72,18 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "en-GB" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= en +LANG_SUFFIX= GB .endif ################################################################ .if ${LOCALIZED_LANG} == "en-US" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= en +LANG_SUFFIX= US +.endif +################################################################ +.if ${LOCALIZED_LANG} == "en-ZA" +LANG_PKGNAME= en +LANG_SUFFIX= ZA .endif ################################################################ .if ${LOCALIZED_LANG} == "eo" @@ -94,7 +120,8 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "gu-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= gu +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "he" @@ -102,7 +129,8 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "hi-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= hi +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "hr" @@ -138,10 +166,22 @@ CATEGORIES+= korean LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "lo" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "lt" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "lv" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "mk" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "ms" LANG_PKGNAME= ${LOCALIZED_LANG} .endif @@ -171,7 +211,8 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "pa-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= pa +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "pl" @@ -183,7 +224,6 @@ LANG_PKGNAME= ${LOCALIZED_LANG} COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado CATEGORIES+= portuguese LANG_PKGNAME= ${LOCALIZED_LANG} -LANG_EXT= 03 LANG_CONFIGURE_ARG= PORT .endif ################################################################ @@ -212,11 +252,13 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "sh-YU" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= sh +LANG_SUFFIX= YU .endif ################################################################ .if ${LOCALIZED_LANG} == "sr-CS" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= sr +LANG_SUFFIX= CS .endif ################################################################ .if ${LOCALIZED_LANG} == "ss" @@ -231,12 +273,22 @@ LANG_PKGNAME= ${LOCALIZED_LANG} LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "sw" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "sw-TZ" +LANG_PKGNAME= sw +LANG_SUFFIX= TZ +.endif +################################################################ +.if ${LOCALIZED_LANG} == "sx" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "ta-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= ta +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "th" diff --git a/editors/openoffice-3-devel/files/Makefile.others b/editors/openoffice-3-devel/files/Makefile.others index 0cb16885f9af..0b5736d98822 100644 --- a/editors/openoffice-3-devel/files/Makefile.others +++ b/editors/openoffice-3-devel/files/Makefile.others @@ -21,7 +21,6 @@ package-canonical: sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" - #@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util; dmake sdkoo' @${RM} -fr ${WRKDIR}/sdk_tmp @${MKDIR} ${WRKDIR}/sdk_tmp @cd ${WRKDIR}/sdk_tmp ; \ @@ -33,7 +32,6 @@ sdk: ure: @${ECHO_MSG} "===> Make Uno Runtime Environment of OpenOffice.org" - #@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util; dmake ure_en-US' @${RM} -fr ${WRKDIR}/ure_tmp @${MKDIR} ${WRKDIR}/ure_tmp @cd ${WRKDIR}/ure_tmp ; \ diff --git a/editors/openoffice-3-devel/files/patch-instsetoo b/editors/openoffice-3-devel/files/patch-instsetoo index 1546e5ab8d09..77fcd635acfa 100644 --- a/editors/openoffice-3-devel/files/patch-instsetoo +++ b/editors/openoffice-3-devel/files/patch-instsetoo @@ -130,20 +130,24 @@ diff -u -r1.47 globals.pm $unpackpath = ""; $idttemplatepath = ""; $idtlanguagepath = ""; + Index: solenv/bin/modules/installer/parameter.pm =================================================================== RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v retrieving revision 1.29 diff -u -r1.29 parameter.pm --- solenv/bin/modules/installer/parameter.pm 9 Nov 2005 09:10:12 -0000 1.29 -+++ solenv/bin/modules/installer/parameter.pm 3 Dec 2005 22:26:53 -0000 -@@ -304,6 +304,10 @@ ++++ solenv/bin/modules/installer/parameter.pm 10 Dec 2005 13:11:30 -0000 +@@ -304,6 +304,13 @@ $installer::globals::epmoutpath = "packages"; } } + if ( $installer::globals::compiler =~ /unxfbsdi/ ) + { -+ $installer::globals::isfreebsdpkgbuild = 1; ++ if ( $installer::globals::packageformat eq "bsd" ) ++ { ++ $installer::globals::isfreebsdpkgbuild = 1; ++ } + } if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; } diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 937943971631..bb8ac0ee24a7 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -59,8 +59,8 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -MILESTONE?= 143 -SNAPDATE= 20051202 +MILESTONE?= 145 +SNAPDATE= 20051208 INSTALLATION_BASEDIR?= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE?= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo index 06847b7df484..d44e6853e590 100644 --- a/editors/openoffice.org-2-devel/distinfo +++ b/editors/openoffice.org-2-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_2.0m143_source.tar.bz2) = d8094179e1705ea20d1d1c60aaa8fa6f -SHA256 (openoffice.org2.0/OOo_2.0m143_source.tar.bz2) = df2c3e58c2883fbd4dba6f1bf3249ebcac9759324098460a30d7a6464528d1c6 -SIZE (openoffice.org2.0/OOo_2.0m143_source.tar.bz2) = 235394897 +MD5 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85 +SHA256 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7 +SIZE (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 235392588 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 diff --git a/editors/openoffice.org-2-devel/files/Makefile.knobs b/editors/openoffice.org-2-devel/files/Makefile.knobs index 1f3ae9cce1a4..8fc898b33521 100644 --- a/editors/openoffice.org-2-devel/files/Makefile.knobs +++ b/editors/openoffice.org-2-devel/files/Makefile.knobs @@ -89,11 +89,11 @@ 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 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} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el" + @${ECHO} "en-GB en-US en-ZA eo es et eu fi fr ga gl gu-IN he hi-IN" + @${ECHO} "hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl nn nr" + @${ECHO} "ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv" + @${ECHO} "sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu" @${ECHO} "Default: en-US" #XXX currently broken #.if !defined(WITHOUT_JAVA) diff --git a/editors/openoffice.org-2-devel/files/Makefile.localized b/editors/openoffice.org-2-devel/files/Makefile.localized index a3f90e791abe..d1a0fa4e670b 100644 --- a/editors/openoffice.org-2-devel/files/Makefile.localized +++ b/editors/openoffice.org-2-devel/files/Makefile.localized @@ -14,15 +14,34 @@ CATEGORIES+= arabic LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "bn" +.if ${LOCALIZED_LANG} == "be-BY" +LANG_PKGNAME= be +LANG_SUFFIX= BY +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bg" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "be-BY" +.if ${LOCALIZED_LANG} == "br" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "bg" +.if ${LOCALIZED_LANG} == "bn" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bn-BD" +LANG_PKGNAME= be +LANG_SUFFIX= BD +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bn-IN" +LANG_PKGNAME= bn +LANG_SUFFIX= IN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bs" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ @@ -53,11 +72,18 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "en-GB" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= en +LANG_SUFFIX= GB .endif ################################################################ .if ${LOCALIZED_LANG} == "en-US" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= en +LANG_SUFFIX= US +.endif +################################################################ +.if ${LOCALIZED_LANG} == "en-ZA" +LANG_PKGNAME= en +LANG_SUFFIX= ZA .endif ################################################################ .if ${LOCALIZED_LANG} == "eo" @@ -94,7 +120,8 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "gu-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= gu +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "he" @@ -102,7 +129,8 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "hi-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= hi +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "hr" @@ -138,10 +166,22 @@ CATEGORIES+= korean LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "lo" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "lt" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "lv" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "mk" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "ms" LANG_PKGNAME= ${LOCALIZED_LANG} .endif @@ -171,7 +211,8 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "pa-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= pa +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "pl" @@ -183,7 +224,6 @@ LANG_PKGNAME= ${LOCALIZED_LANG} COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado CATEGORIES+= portuguese LANG_PKGNAME= ${LOCALIZED_LANG} -LANG_EXT= 03 LANG_CONFIGURE_ARG= PORT .endif ################################################################ @@ -212,11 +252,13 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "sh-YU" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= sh +LANG_SUFFIX= YU .endif ################################################################ .if ${LOCALIZED_LANG} == "sr-CS" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= sr +LANG_SUFFIX= CS .endif ################################################################ .if ${LOCALIZED_LANG} == "ss" @@ -231,12 +273,22 @@ LANG_PKGNAME= ${LOCALIZED_LANG} LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "sw" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "sw-TZ" +LANG_PKGNAME= sw +LANG_SUFFIX= TZ +.endif +################################################################ +.if ${LOCALIZED_LANG} == "sx" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "ta-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= ta +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "th" diff --git a/editors/openoffice.org-2-devel/files/Makefile.others b/editors/openoffice.org-2-devel/files/Makefile.others index 0cb16885f9af..0b5736d98822 100644 --- a/editors/openoffice.org-2-devel/files/Makefile.others +++ b/editors/openoffice.org-2-devel/files/Makefile.others @@ -21,7 +21,6 @@ package-canonical: sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" - #@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util; dmake sdkoo' @${RM} -fr ${WRKDIR}/sdk_tmp @${MKDIR} ${WRKDIR}/sdk_tmp @cd ${WRKDIR}/sdk_tmp ; \ @@ -33,7 +32,6 @@ sdk: ure: @${ECHO_MSG} "===> Make Uno Runtime Environment of OpenOffice.org" - #@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util; dmake ure_en-US' @${RM} -fr ${WRKDIR}/ure_tmp @${MKDIR} ${WRKDIR}/ure_tmp @cd ${WRKDIR}/ure_tmp ; \ diff --git a/editors/openoffice.org-2-devel/files/patch-instsetoo b/editors/openoffice.org-2-devel/files/patch-instsetoo index 1546e5ab8d09..77fcd635acfa 100644 --- a/editors/openoffice.org-2-devel/files/patch-instsetoo +++ b/editors/openoffice.org-2-devel/files/patch-instsetoo @@ -130,20 +130,24 @@ diff -u -r1.47 globals.pm $unpackpath = ""; $idttemplatepath = ""; $idtlanguagepath = ""; + Index: solenv/bin/modules/installer/parameter.pm =================================================================== RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v retrieving revision 1.29 diff -u -r1.29 parameter.pm --- solenv/bin/modules/installer/parameter.pm 9 Nov 2005 09:10:12 -0000 1.29 -+++ solenv/bin/modules/installer/parameter.pm 3 Dec 2005 22:26:53 -0000 -@@ -304,6 +304,10 @@ ++++ solenv/bin/modules/installer/parameter.pm 10 Dec 2005 13:11:30 -0000 +@@ -304,6 +304,13 @@ $installer::globals::epmoutpath = "packages"; } } + if ( $installer::globals::compiler =~ /unxfbsdi/ ) + { -+ $installer::globals::isfreebsdpkgbuild = 1; ++ if ( $installer::globals::packageformat eq "bsd" ) ++ { ++ $installer::globals::isfreebsdpkgbuild = 1; ++ } + } if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; } diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index 937943971631..bb8ac0ee24a7 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -59,8 +59,8 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -MILESTONE?= 143 -SNAPDATE= 20051202 +MILESTONE?= 145 +SNAPDATE= 20051208 INSTALLATION_BASEDIR?= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE?= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo index 06847b7df484..d44e6853e590 100644 --- a/editors/openoffice.org-2.0-devel/distinfo +++ b/editors/openoffice.org-2.0-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_2.0m143_source.tar.bz2) = d8094179e1705ea20d1d1c60aaa8fa6f -SHA256 (openoffice.org2.0/OOo_2.0m143_source.tar.bz2) = df2c3e58c2883fbd4dba6f1bf3249ebcac9759324098460a30d7a6464528d1c6 -SIZE (openoffice.org2.0/OOo_2.0m143_source.tar.bz2) = 235394897 +MD5 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85 +SHA256 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7 +SIZE (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 235392588 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.knobs b/editors/openoffice.org-2.0-devel/files/Makefile.knobs index 1f3ae9cce1a4..8fc898b33521 100644 --- a/editors/openoffice.org-2.0-devel/files/Makefile.knobs +++ b/editors/openoffice.org-2.0-devel/files/Makefile.knobs @@ -89,11 +89,11 @@ 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 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} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el" + @${ECHO} "en-GB en-US en-ZA eo es et eu fi fr ga gl gu-IN he hi-IN" + @${ECHO} "hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl nn nr" + @${ECHO} "ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv" + @${ECHO} "sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu" @${ECHO} "Default: en-US" #XXX currently broken #.if !defined(WITHOUT_JAVA) diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.localized b/editors/openoffice.org-2.0-devel/files/Makefile.localized index a3f90e791abe..d1a0fa4e670b 100644 --- a/editors/openoffice.org-2.0-devel/files/Makefile.localized +++ b/editors/openoffice.org-2.0-devel/files/Makefile.localized @@ -14,15 +14,34 @@ CATEGORIES+= arabic LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "bn" +.if ${LOCALIZED_LANG} == "be-BY" +LANG_PKGNAME= be +LANG_SUFFIX= BY +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bg" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "be-BY" +.if ${LOCALIZED_LANG} == "br" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "bg" +.if ${LOCALIZED_LANG} == "bn" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bn-BD" +LANG_PKGNAME= be +LANG_SUFFIX= BD +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bn-IN" +LANG_PKGNAME= bn +LANG_SUFFIX= IN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bs" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ @@ -53,11 +72,18 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "en-GB" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= en +LANG_SUFFIX= GB .endif ################################################################ .if ${LOCALIZED_LANG} == "en-US" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= en +LANG_SUFFIX= US +.endif +################################################################ +.if ${LOCALIZED_LANG} == "en-ZA" +LANG_PKGNAME= en +LANG_SUFFIX= ZA .endif ################################################################ .if ${LOCALIZED_LANG} == "eo" @@ -94,7 +120,8 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "gu-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= gu +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "he" @@ -102,7 +129,8 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "hi-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= hi +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "hr" @@ -138,10 +166,22 @@ CATEGORIES+= korean LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "lo" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "lt" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "lv" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "mk" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "ms" LANG_PKGNAME= ${LOCALIZED_LANG} .endif @@ -171,7 +211,8 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "pa-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= pa +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "pl" @@ -183,7 +224,6 @@ LANG_PKGNAME= ${LOCALIZED_LANG} COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado CATEGORIES+= portuguese LANG_PKGNAME= ${LOCALIZED_LANG} -LANG_EXT= 03 LANG_CONFIGURE_ARG= PORT .endif ################################################################ @@ -212,11 +252,13 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "sh-YU" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= sh +LANG_SUFFIX= YU .endif ################################################################ .if ${LOCALIZED_LANG} == "sr-CS" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= sr +LANG_SUFFIX= CS .endif ################################################################ .if ${LOCALIZED_LANG} == "ss" @@ -231,12 +273,22 @@ LANG_PKGNAME= ${LOCALIZED_LANG} LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "sw" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "sw-TZ" +LANG_PKGNAME= sw +LANG_SUFFIX= TZ +.endif +################################################################ +.if ${LOCALIZED_LANG} == "sx" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "ta-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= ta +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "th" diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.others b/editors/openoffice.org-2.0-devel/files/Makefile.others index 0cb16885f9af..0b5736d98822 100644 --- a/editors/openoffice.org-2.0-devel/files/Makefile.others +++ b/editors/openoffice.org-2.0-devel/files/Makefile.others @@ -21,7 +21,6 @@ package-canonical: sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" - #@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util; dmake sdkoo' @${RM} -fr ${WRKDIR}/sdk_tmp @${MKDIR} ${WRKDIR}/sdk_tmp @cd ${WRKDIR}/sdk_tmp ; \ @@ -33,7 +32,6 @@ sdk: ure: @${ECHO_MSG} "===> Make Uno Runtime Environment of OpenOffice.org" - #@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util; dmake ure_en-US' @${RM} -fr ${WRKDIR}/ure_tmp @${MKDIR} ${WRKDIR}/ure_tmp @cd ${WRKDIR}/ure_tmp ; \ diff --git a/editors/openoffice.org-2.0-devel/files/patch-instsetoo b/editors/openoffice.org-2.0-devel/files/patch-instsetoo index 1546e5ab8d09..77fcd635acfa 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-instsetoo +++ b/editors/openoffice.org-2.0-devel/files/patch-instsetoo @@ -130,20 +130,24 @@ diff -u -r1.47 globals.pm $unpackpath = ""; $idttemplatepath = ""; $idtlanguagepath = ""; + Index: solenv/bin/modules/installer/parameter.pm =================================================================== RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v retrieving revision 1.29 diff -u -r1.29 parameter.pm --- solenv/bin/modules/installer/parameter.pm 9 Nov 2005 09:10:12 -0000 1.29 -+++ solenv/bin/modules/installer/parameter.pm 3 Dec 2005 22:26:53 -0000 -@@ -304,6 +304,10 @@ ++++ solenv/bin/modules/installer/parameter.pm 10 Dec 2005 13:11:30 -0000 +@@ -304,6 +304,13 @@ $installer::globals::epmoutpath = "packages"; } } + if ( $installer::globals::compiler =~ /unxfbsdi/ ) + { -+ $installer::globals::isfreebsdpkgbuild = 1; ++ if ( $installer::globals::packageformat eq "bsd" ) ++ { ++ $installer::globals::isfreebsdpkgbuild = 1; ++ } + } if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; } diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 937943971631..bb8ac0ee24a7 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -59,8 +59,8 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -MILESTONE?= 143 -SNAPDATE= 20051202 +MILESTONE?= 145 +SNAPDATE= 20051208 INSTALLATION_BASEDIR?= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE?= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo index 06847b7df484..d44e6853e590 100644 --- a/editors/openoffice.org-3-devel/distinfo +++ b/editors/openoffice.org-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_2.0m143_source.tar.bz2) = d8094179e1705ea20d1d1c60aaa8fa6f -SHA256 (openoffice.org2.0/OOo_2.0m143_source.tar.bz2) = df2c3e58c2883fbd4dba6f1bf3249ebcac9759324098460a30d7a6464528d1c6 -SIZE (openoffice.org2.0/OOo_2.0m143_source.tar.bz2) = 235394897 +MD5 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85 +SHA256 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7 +SIZE (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 235392588 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs index 1f3ae9cce1a4..8fc898b33521 100644 --- a/editors/openoffice.org-3-devel/files/Makefile.knobs +++ b/editors/openoffice.org-3-devel/files/Makefile.knobs @@ -89,11 +89,11 @@ 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 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} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el" + @${ECHO} "en-GB en-US en-ZA eo es et eu fi fr ga gl gu-IN he hi-IN" + @${ECHO} "hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl nn nr" + @${ECHO} "ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv" + @${ECHO} "sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu" @${ECHO} "Default: en-US" #XXX currently broken #.if !defined(WITHOUT_JAVA) diff --git a/editors/openoffice.org-3-devel/files/Makefile.localized b/editors/openoffice.org-3-devel/files/Makefile.localized index a3f90e791abe..d1a0fa4e670b 100644 --- a/editors/openoffice.org-3-devel/files/Makefile.localized +++ b/editors/openoffice.org-3-devel/files/Makefile.localized @@ -14,15 +14,34 @@ CATEGORIES+= arabic LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "bn" +.if ${LOCALIZED_LANG} == "be-BY" +LANG_PKGNAME= be +LANG_SUFFIX= BY +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bg" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "be-BY" +.if ${LOCALIZED_LANG} == "br" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "bg" +.if ${LOCALIZED_LANG} == "bn" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bn-BD" +LANG_PKGNAME= be +LANG_SUFFIX= BD +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bn-IN" +LANG_PKGNAME= bn +LANG_SUFFIX= IN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bs" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ @@ -53,11 +72,18 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "en-GB" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= en +LANG_SUFFIX= GB .endif ################################################################ .if ${LOCALIZED_LANG} == "en-US" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= en +LANG_SUFFIX= US +.endif +################################################################ +.if ${LOCALIZED_LANG} == "en-ZA" +LANG_PKGNAME= en +LANG_SUFFIX= ZA .endif ################################################################ .if ${LOCALIZED_LANG} == "eo" @@ -94,7 +120,8 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "gu-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= gu +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "he" @@ -102,7 +129,8 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "hi-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= hi +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "hr" @@ -138,10 +166,22 @@ CATEGORIES+= korean LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "lo" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "lt" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "lv" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "mk" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "ms" LANG_PKGNAME= ${LOCALIZED_LANG} .endif @@ -171,7 +211,8 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "pa-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= pa +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "pl" @@ -183,7 +224,6 @@ LANG_PKGNAME= ${LOCALIZED_LANG} COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado CATEGORIES+= portuguese LANG_PKGNAME= ${LOCALIZED_LANG} -LANG_EXT= 03 LANG_CONFIGURE_ARG= PORT .endif ################################################################ @@ -212,11 +252,13 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "sh-YU" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= sh +LANG_SUFFIX= YU .endif ################################################################ .if ${LOCALIZED_LANG} == "sr-CS" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= sr +LANG_SUFFIX= CS .endif ################################################################ .if ${LOCALIZED_LANG} == "ss" @@ -231,12 +273,22 @@ LANG_PKGNAME= ${LOCALIZED_LANG} LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "sw" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "sw-TZ" +LANG_PKGNAME= sw +LANG_SUFFIX= TZ +.endif +################################################################ +.if ${LOCALIZED_LANG} == "sx" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "ta-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= ta +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "th" diff --git a/editors/openoffice.org-3-devel/files/Makefile.others b/editors/openoffice.org-3-devel/files/Makefile.others index 0cb16885f9af..0b5736d98822 100644 --- a/editors/openoffice.org-3-devel/files/Makefile.others +++ b/editors/openoffice.org-3-devel/files/Makefile.others @@ -21,7 +21,6 @@ package-canonical: sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" - #@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util; dmake sdkoo' @${RM} -fr ${WRKDIR}/sdk_tmp @${MKDIR} ${WRKDIR}/sdk_tmp @cd ${WRKDIR}/sdk_tmp ; \ @@ -33,7 +32,6 @@ sdk: ure: @${ECHO_MSG} "===> Make Uno Runtime Environment of OpenOffice.org" - #@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util; dmake ure_en-US' @${RM} -fr ${WRKDIR}/ure_tmp @${MKDIR} ${WRKDIR}/ure_tmp @cd ${WRKDIR}/ure_tmp ; \ diff --git a/editors/openoffice.org-3-devel/files/patch-instsetoo b/editors/openoffice.org-3-devel/files/patch-instsetoo index 1546e5ab8d09..77fcd635acfa 100644 --- a/editors/openoffice.org-3-devel/files/patch-instsetoo +++ b/editors/openoffice.org-3-devel/files/patch-instsetoo @@ -130,20 +130,24 @@ diff -u -r1.47 globals.pm $unpackpath = ""; $idttemplatepath = ""; $idtlanguagepath = ""; + Index: solenv/bin/modules/installer/parameter.pm =================================================================== RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v retrieving revision 1.29 diff -u -r1.29 parameter.pm --- solenv/bin/modules/installer/parameter.pm 9 Nov 2005 09:10:12 -0000 1.29 -+++ solenv/bin/modules/installer/parameter.pm 3 Dec 2005 22:26:53 -0000 -@@ -304,6 +304,10 @@ ++++ solenv/bin/modules/installer/parameter.pm 10 Dec 2005 13:11:30 -0000 +@@ -304,6 +304,13 @@ $installer::globals::epmoutpath = "packages"; } } + if ( $installer::globals::compiler =~ /unxfbsdi/ ) + { -+ $installer::globals::isfreebsdpkgbuild = 1; ++ if ( $installer::globals::packageformat eq "bsd" ) ++ { ++ $installer::globals::isfreebsdpkgbuild = 1; ++ } + } if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; } diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 937943971631..bb8ac0ee24a7 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -59,8 +59,8 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -MILESTONE?= 143 -SNAPDATE= 20051202 +MILESTONE?= 145 +SNAPDATE= 20051208 INSTALLATION_BASEDIR?= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE?= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo index 06847b7df484..d44e6853e590 100644 --- a/editors/openoffice.org-vcltesttool/distinfo +++ b/editors/openoffice.org-vcltesttool/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_2.0m143_source.tar.bz2) = d8094179e1705ea20d1d1c60aaa8fa6f -SHA256 (openoffice.org2.0/OOo_2.0m143_source.tar.bz2) = df2c3e58c2883fbd4dba6f1bf3249ebcac9759324098460a30d7a6464528d1c6 -SIZE (openoffice.org2.0/OOo_2.0m143_source.tar.bz2) = 235394897 +MD5 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = e6d84c811531055d785e6e82dd9b0b85 +SHA256 (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 76958f108e13774f3920688af44cf5e9334e2d9bc8a47a72f27cb5761868dda7 +SIZE (openoffice.org2.0/OOo_2.0m145_source.tar.bz2) = 235392588 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs index 1f3ae9cce1a4..8fc898b33521 100644 --- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs +++ b/editors/openoffice.org-vcltesttool/files/Makefile.knobs @@ -89,11 +89,11 @@ 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 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} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el" + @${ECHO} "en-GB en-US en-ZA eo es et eu fi fr ga gl gu-IN he hi-IN" + @${ECHO} "hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl nn nr" + @${ECHO} "ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv" + @${ECHO} "sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu" @${ECHO} "Default: en-US" #XXX currently broken #.if !defined(WITHOUT_JAVA) diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.localized b/editors/openoffice.org-vcltesttool/files/Makefile.localized index a3f90e791abe..d1a0fa4e670b 100644 --- a/editors/openoffice.org-vcltesttool/files/Makefile.localized +++ b/editors/openoffice.org-vcltesttool/files/Makefile.localized @@ -14,15 +14,34 @@ CATEGORIES+= arabic LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "bn" +.if ${LOCALIZED_LANG} == "be-BY" +LANG_PKGNAME= be +LANG_SUFFIX= BY +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bg" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "be-BY" +.if ${LOCALIZED_LANG} == "br" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ -.if ${LOCALIZED_LANG} == "bg" +.if ${LOCALIZED_LANG} == "bn" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bn-BD" +LANG_PKGNAME= be +LANG_SUFFIX= BD +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bn-IN" +LANG_PKGNAME= bn +LANG_SUFFIX= IN +.endif +################################################################ +.if ${LOCALIZED_LANG} == "bs" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ @@ -53,11 +72,18 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "en-GB" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= en +LANG_SUFFIX= GB .endif ################################################################ .if ${LOCALIZED_LANG} == "en-US" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= en +LANG_SUFFIX= US +.endif +################################################################ +.if ${LOCALIZED_LANG} == "en-ZA" +LANG_PKGNAME= en +LANG_SUFFIX= ZA .endif ################################################################ .if ${LOCALIZED_LANG} == "eo" @@ -94,7 +120,8 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "gu-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= gu +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "he" @@ -102,7 +129,8 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "hi-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= hi +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "hr" @@ -138,10 +166,22 @@ CATEGORIES+= korean LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "lo" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "lt" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "lv" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ +.if ${LOCALIZED_LANG} == "mk" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "ms" LANG_PKGNAME= ${LOCALIZED_LANG} .endif @@ -171,7 +211,8 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "pa-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= pa +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "pl" @@ -183,7 +224,6 @@ LANG_PKGNAME= ${LOCALIZED_LANG} COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado CATEGORIES+= portuguese LANG_PKGNAME= ${LOCALIZED_LANG} -LANG_EXT= 03 LANG_CONFIGURE_ARG= PORT .endif ################################################################ @@ -212,11 +252,13 @@ LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "sh-YU" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= sh +LANG_SUFFIX= YU .endif ################################################################ .if ${LOCALIZED_LANG} == "sr-CS" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= sr +LANG_SUFFIX= CS .endif ################################################################ .if ${LOCALIZED_LANG} == "ss" @@ -231,12 +273,22 @@ LANG_PKGNAME= ${LOCALIZED_LANG} LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ +.if ${LOCALIZED_LANG} == "sw" +LANG_PKGNAME= ${LOCALIZED_LANG} +.endif +################################################################ .if ${LOCALIZED_LANG} == "sw-TZ" +LANG_PKGNAME= sw +LANG_SUFFIX= TZ +.endif +################################################################ +.if ${LOCALIZED_LANG} == "sx" LANG_PKGNAME= ${LOCALIZED_LANG} .endif ################################################################ .if ${LOCALIZED_LANG} == "ta-IN" -LANG_PKGNAME= ${LOCALIZED_LANG} +LANG_PKGNAME= ta +LANG_SUFFIX= IN .endif ################################################################ .if ${LOCALIZED_LANG} == "th" diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.others b/editors/openoffice.org-vcltesttool/files/Makefile.others index 0cb16885f9af..0b5736d98822 100644 --- a/editors/openoffice.org-vcltesttool/files/Makefile.others +++ b/editors/openoffice.org-vcltesttool/files/Makefile.others @@ -21,7 +21,6 @@ package-canonical: sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" - #@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util; dmake sdkoo' @${RM} -fr ${WRKDIR}/sdk_tmp @${MKDIR} ${WRKDIR}/sdk_tmp @cd ${WRKDIR}/sdk_tmp ; \ @@ -33,7 +32,6 @@ sdk: ure: @${ECHO_MSG} "===> Make Uno Runtime Environment of OpenOffice.org" - #@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util; dmake ure_en-US' @${RM} -fr ${WRKDIR}/ure_tmp @${MKDIR} ${WRKDIR}/ure_tmp @cd ${WRKDIR}/ure_tmp ; \ diff --git a/editors/openoffice.org-vcltesttool/files/patch-instsetoo b/editors/openoffice.org-vcltesttool/files/patch-instsetoo index 1546e5ab8d09..77fcd635acfa 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-instsetoo +++ b/editors/openoffice.org-vcltesttool/files/patch-instsetoo @@ -130,20 +130,24 @@ diff -u -r1.47 globals.pm $unpackpath = ""; $idttemplatepath = ""; $idtlanguagepath = ""; + Index: solenv/bin/modules/installer/parameter.pm =================================================================== RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v retrieving revision 1.29 diff -u -r1.29 parameter.pm --- solenv/bin/modules/installer/parameter.pm 9 Nov 2005 09:10:12 -0000 1.29 -+++ solenv/bin/modules/installer/parameter.pm 3 Dec 2005 22:26:53 -0000 -@@ -304,6 +304,10 @@ ++++ solenv/bin/modules/installer/parameter.pm 10 Dec 2005 13:11:30 -0000 +@@ -304,6 +304,13 @@ $installer::globals::epmoutpath = "packages"; } } + if ( $installer::globals::compiler =~ /unxfbsdi/ ) + { -+ $installer::globals::isfreebsdpkgbuild = 1; ++ if ( $installer::globals::packageformat eq "bsd" ) ++ { ++ $installer::globals::isfreebsdpkgbuild = 1; ++ } + } if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; } |