Catch up localized language parts.

3 files changed, 59 insertions, 47 deletions

diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index e9a84ffd26d1..92761ae67e77 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@@ -98,20 +98,6 @@ pre-fetch:
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
 .endif
-.if !defined(LOCALIZED_LANG)
-	@${ECHO}
-	@${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 as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da"
-	@${ECHO} "de el en-GB en-US en-ZA eo es et eu fa fi fr ga gl"
-	@${ECHO} "gu-IN he hi-IN hr hu it ja km kn-IN ko ku lo lt lv mk"
-	@${ECHO} "ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt"
-	@${ECHO} "pt-BR ru rw sk sl sh-YU sr-CS ss st sv sw sw-TZ sx"
-	@${ECHO} "te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk ve vi xh"
-	@${ECHO} "zh-CN zh-TW zu"
-	@${ECHO} "Default: en-US"
-.endif
 .if !defined(WITH_CUPS)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with CUPS support with"
@@ -138,6 +124,18 @@ pre-fetch:
 	@${ECHO} "make LOCALIZED_LANG=all"
 .endif
 	@${ECHO}
+	@${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 as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da"
+	@${ECHO} "de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl"
+	@${ECHO} "gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk"
+	@${ECHO} "ms ml-IN mr-IN ne nb nl nn nr ns oc or-IN pa-IN pl pt"
+	@${ECHO} "pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER"
+	@${ECHO} "ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW"
+	@${ECHO} "zu"
+	@${ECHO} "Current setting: ${LOCALIZED_LANG}"
+	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
 	@${ECHO} "To build OOo, you should have a lot"
diff --git a/editors/openoffice-3/files/Makefile.localized b/editors/openoffice-3/files/Makefile.localized
index 4088c9664bfa..1e928e2e04cd 100644
--- a/editors/openoffice-3/files/Makefile.localized
+++ b/editors/openoffice-3/files/Makefile.localized
@@ -28,14 +28,6 @@ LANG_SUFFIX=	BY
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "br"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "bn"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
 .if ${LOCALIZED_LANG} == "bn-BD"
 LANG_PKGNAME=	be
 LANG_SUFFIX=	BD
@@ -46,6 +38,14 @@ LANG_PKGNAME=	bn
 LANG_SUFFIX=	IN
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "br"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "bs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
@@ -72,6 +72,10 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "dz"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "el"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
@@ -161,13 +165,16 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ka"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "km"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "kn-IN"
+.if ${LOCALIZED_LANG} == "kn"
 LANG_PKGNAME=	kn
-LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ko"
@@ -195,10 +202,6 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "ms"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
 .if ${LOCALIZED_LANG} == "ml-IN"
 LANG_PKGNAME=	ml
 LANG_SUFFIX=	IN
@@ -209,7 +212,7 @@ LANG_PKGNAME=	mr
 LANG_SUFFIX=	IN
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "ne"
+.if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
@@ -217,6 +220,10 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ne"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "nl"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
@@ -233,6 +240,10 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "oc"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "or-IN"
 LANG_PKGNAME=	or
 LANG_SUFFIX=	IN
@@ -271,6 +282,10 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "sh"
+LANG_PKGNAME=	sh
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sk"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
@@ -279,14 +294,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "sh-YU"
-LANG_PKGNAME=	sh
-LANG_SUFFIX=	YU
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "sr-CS"
+.if ${LOCALIZED_LANG} == "sr"
 LANG_PKGNAME=	sr
-LANG_SUFFIX=	CS
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ss"
@@ -301,16 +310,12 @@ 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"
+.if ${LOCALIZED_LANG} == "sw"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
@@ -324,15 +329,19 @@ LANG_PKGNAME=	te
 LANG_SUFFIX=	IN
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "ti-IN"
-LANG_PKGNAME=	ti
-LANG_SUFFIX=	IN
+.if ${LOCALIZED_LANG} == "tg"
+LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "th"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ti-ER"
+LANG_PKGNAME=	ti
+LANG_SUFFIX=	ER
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "tn"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
@@ -345,7 +354,7 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "tg"
+.if ${LOCALIZED_LANG} == "uk"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
@@ -354,7 +363,7 @@ LANG_PKGNAME=	ur
 LANG_SUFFIX=	IN
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "uk"
+.if ${LOCALIZED_LANG} == "uz"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
diff --git a/editors/openoffice-3/files/generate.pl b/editors/openoffice-3/files/generate.pl
index e7a4fc2886e6..8f9ccd56785d 100644
--- a/editors/openoffice-3/files/generate.pl
+++ b/editors/openoffice-3/files/generate.pl
@@ -1,11 +1,12 @@
 #!/usr/bin/perl
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/generate.pl,v 1.7 2005-12-23 04:14:28 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/generate.pl,v 1.8 2008-04-02 21:54:06 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
 print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk ure languagepack deinstall >& log.en\n";
+print "bzip2 log.en\n";
 #print "rm work/.configure* work/.build* \n";
 #workaround for breakage at odk sdk_oo
 print "make deinstall clean\n";
@@ -19,6 +20,10 @@ while(<FILE>){
 if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1]; 
 	print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n";
 	print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes languagepack package package-rename deinstall >& log.$LANG\n";
+	print "bzip2 log.$LANG\n";
 	}
 }
 close FILE;
+print "md5 OOo* > MD5SUMS.log\n";
+#print "ssh mkdir -p build.good-day.net:/home/ftp/pub/OpenOffice.org/FreeBSD/tmp/\n";
+#print "scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/FreeBSD/tmp/\n";