Update to 2.0m145=(2.0.1rc4)

4 files changed, 76 insertions, 22 deletions

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; }