8 files changed, 80 insertions, 62 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index c0a3d15c332e..540728bcd99f 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -70,11 +70,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		4
+MILESTONE?=		5
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3.0
-SNAPDATE=		20080321
+SNAPDATE=		20080330
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 0886c8cc8d50..a9cc48439b41 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m4_source.tar.bz2) = b31ccaef3bbdc1fc053c8fd56e8f3095
-SHA256 (openoffice.org3/OOo_DEV300_m4_source.tar.bz2) = d3abd928d3c0c124fadd0ccea1e232fb5a5b5ac369413a6e297689906c7acb41
-SIZE (openoffice.org3/OOo_DEV300_m4_source.tar.bz2) = 289023906
+MD5 (openoffice.org3/OOo_DEV300_m5_source.tar.bz2) = f808337d10e3af44c24ccb6aa55b1a9c
+SHA256 (openoffice.org3/OOo_DEV300_m5_source.tar.bz2) = b4f38830879a479045971c672530f4aaed1c932ad163a6bc369fd0671a9bc196
+SIZE (openoffice.org3/OOo_DEV300_m5_source.tar.bz2) = 288758177
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs
index a24d1fdea61f..124ee636dbe4 100644
--- a/editors/openoffice-3-devel/files/Makefile.knobs
+++ b/editors/openoffice-3-devel/files/Makefile.knobs
@@ -104,20 +104,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"
@@ -143,6 +129,20 @@ pre-fetch:
 	@${ECHO} "You can compile OOo with full localized language support by"
 	@${ECHO} "make LOCALIZED_LANG=all"
 .endif
+.if ${LOCALIZED_LANG} == "en-US"
+	@${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} "Default: en-US"
+.endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
diff --git a/editors/openoffice-3-devel/files/Makefile.localized b/editors/openoffice-3-devel/files/Makefile.localized
index 4088c9664bfa..231caf474ee0 100644
--- a/editors/openoffice-3-devel/files/Makefile.localized
+++ b/editors/openoffice-3-devel/files/Makefile.localized
@@ -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"
@@ -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
@@ -279,14 +290,12 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "sh-YU"
+.if ${LOCALIZED_LANG} == "sh"
 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"
@@ -310,18 +319,14 @@ LANG_PKGNAME=	sw
 LANG_SUFFIX=	TZ
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "sx"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
 .if ${LOCALIZED_LANG} == "ta-IN"
 LANG_PKGNAME=	ta
 LANG_SUFFIX=	IN
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "te-IN"
+.if ${LOCALIZED_LANG} == "te-ER"
 LANG_PKGNAME=	te
-LANG_SUFFIX=	IN
+LANG_SUFFIX=	ER
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ti-IN"
@@ -358,6 +363,10 @@ LANG_SUFFIX=	IN
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "uz"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "ve"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index c0a3d15c332e..540728bcd99f 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -70,11 +70,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		4
+MILESTONE?=		5
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3.0
-SNAPDATE=		20080321
+SNAPDATE=		20080330
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 0886c8cc8d50..a9cc48439b41 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m4_source.tar.bz2) = b31ccaef3bbdc1fc053c8fd56e8f3095
-SHA256 (openoffice.org3/OOo_DEV300_m4_source.tar.bz2) = d3abd928d3c0c124fadd0ccea1e232fb5a5b5ac369413a6e297689906c7acb41
-SIZE (openoffice.org3/OOo_DEV300_m4_source.tar.bz2) = 289023906
+MD5 (openoffice.org3/OOo_DEV300_m5_source.tar.bz2) = f808337d10e3af44c24ccb6aa55b1a9c
+SHA256 (openoffice.org3/OOo_DEV300_m5_source.tar.bz2) = b4f38830879a479045971c672530f4aaed1c932ad163a6bc369fd0671a9bc196
+SIZE (openoffice.org3/OOo_DEV300_m5_source.tar.bz2) = 288758177
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs
index a24d1fdea61f..124ee636dbe4 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-3-devel/files/Makefile.knobs
@@ -104,20 +104,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"
@@ -143,6 +129,20 @@ pre-fetch:
 	@${ECHO} "You can compile OOo with full localized language support by"
 	@${ECHO} "make LOCALIZED_LANG=all"
 .endif
+.if ${LOCALIZED_LANG} == "en-US"
+	@${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} "Default: en-US"
+.endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
diff --git a/editors/openoffice.org-3-devel/files/Makefile.localized b/editors/openoffice.org-3-devel/files/Makefile.localized
index 4088c9664bfa..231caf474ee0 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.localized
+++ b/editors/openoffice.org-3-devel/files/Makefile.localized
@@ -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"
@@ -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
@@ -279,14 +290,12 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "sh-YU"
+.if ${LOCALIZED_LANG} == "sh"
 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"
@@ -310,18 +319,14 @@ LANG_PKGNAME=	sw
 LANG_SUFFIX=	TZ
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "sx"
-LANG_PKGNAME=	${LOCALIZED_LANG}
-.endif
-################################################################
 .if ${LOCALIZED_LANG} == "ta-IN"
 LANG_PKGNAME=	ta
 LANG_SUFFIX=	IN
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "te-IN"
+.if ${LOCALIZED_LANG} == "te-ER"
 LANG_PKGNAME=	te
-LANG_SUFFIX=	IN
+LANG_SUFFIX=	ER
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ti-IN"
@@ -358,6 +363,10 @@ LANG_SUFFIX=	IN
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "uz"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "ve"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif