update to m129

20 files changed, 290 insertions, 70 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 25605cf0979e..ddd2462a15e3 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -57,8 +57,8 @@ IGNORE=		Install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		128
-SNAPDATE=		20050907
+MILESTONE=		129
+SNAPDATE=		20050912
 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 0823e8ea9c7e..11975c4b90d9 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m128_source.tar.bz2) = 230de468468e7bcc93db9cfd468eef30
-SIZE (openoffice.org2.0/OOo_1.9m128_source.tar.bz2) = 229863809
+MD5 (openoffice.org2.0/OOo_1.9m129_source.tar.bz2) = a268a0cf9c32e3bb13742d8b13a62ebd
+SIZE (openoffice.org2.0/OOo_1.9m129_source.tar.bz2) = 228213420
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs
index bef0514d2a5d..366ae60ba851 100644
--- a/editors/openoffice-3-devel/files/Makefile.knobs
+++ b/editors/openoffice-3-devel/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-3-devel/files/Makefile.localized b/editors/openoffice-3-devel/files/Makefile.localized
index 795dc3bd2dd4..a3f90e791abe 100644
--- a/editors/openoffice-3-devel/files/Makefile.localized
+++ b/editors/openoffice-3-devel/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-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 25605cf0979e..ddd2462a15e3 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -57,8 +57,8 @@ IGNORE=		Install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		128
-SNAPDATE=		20050907
+MILESTONE=		129
+SNAPDATE=		20050912
 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 0823e8ea9c7e..11975c4b90d9 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m128_source.tar.bz2) = 230de468468e7bcc93db9cfd468eef30
-SIZE (openoffice.org2.0/OOo_1.9m128_source.tar.bz2) = 229863809
+MD5 (openoffice.org2.0/OOo_1.9m129_source.tar.bz2) = a268a0cf9c32e3bb13742d8b13a62ebd
+SIZE (openoffice.org2.0/OOo_1.9m129_source.tar.bz2) = 228213420
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2-devel/files/Makefile.knobs b/editors/openoffice.org-2-devel/files/Makefile.knobs
index bef0514d2a5d..366ae60ba851 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2-devel/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-devel/files/Makefile.localized b/editors/openoffice.org-2-devel/files/Makefile.localized
index 795dc3bd2dd4..a3f90e791abe 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.localized
+++ b/editors/openoffice.org-2-devel/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-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 25605cf0979e..ddd2462a15e3 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -57,8 +57,8 @@ IGNORE=		Install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		128
-SNAPDATE=		20050907
+MILESTONE=		129
+SNAPDATE=		20050912
 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 0823e8ea9c7e..11975c4b90d9 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m128_source.tar.bz2) = 230de468468e7bcc93db9cfd468eef30
-SIZE (openoffice.org2.0/OOo_1.9m128_source.tar.bz2) = 229863809
+MD5 (openoffice.org2.0/OOo_1.9m129_source.tar.bz2) = a268a0cf9c32e3bb13742d8b13a62ebd
+SIZE (openoffice.org2.0/OOo_1.9m129_source.tar.bz2) = 228213420
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.knobs b/editors/openoffice.org-2.0-devel/files/Makefile.knobs
index bef0514d2a5d..366ae60ba851 100644
--- a/editors/openoffice.org-2.0-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2.0-devel/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-devel/files/Makefile.localized b/editors/openoffice.org-2.0-devel/files/Makefile.localized
index 795dc3bd2dd4..a3f90e791abe 100644
--- a/editors/openoffice.org-2.0-devel/files/Makefile.localized
+++ b/editors/openoffice.org-2.0-devel/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-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 25605cf0979e..ddd2462a15e3 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -57,8 +57,8 @@ IGNORE=		Install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		128
-SNAPDATE=		20050907
+MILESTONE=		129
+SNAPDATE=		20050912
 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 0823e8ea9c7e..11975c4b90d9 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m128_source.tar.bz2) = 230de468468e7bcc93db9cfd468eef30
-SIZE (openoffice.org2.0/OOo_1.9m128_source.tar.bz2) = 229863809
+MD5 (openoffice.org2.0/OOo_1.9m129_source.tar.bz2) = a268a0cf9c32e3bb13742d8b13a62ebd
+SIZE (openoffice.org2.0/OOo_1.9m129_source.tar.bz2) = 228213420
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs
index bef0514d2a5d..366ae60ba851 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-3-devel/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-3-devel/files/Makefile.localized b/editors/openoffice.org-3-devel/files/Makefile.localized
index 795dc3bd2dd4..a3f90e791abe 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.localized
+++ b/editors/openoffice.org-3-devel/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-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 25605cf0979e..ddd2462a15e3 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -57,8 +57,8 @@ IGNORE=		Install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		128
-SNAPDATE=		20050907
+MILESTONE=		129
+SNAPDATE=		20050912
 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 0823e8ea9c7e..11975c4b90d9 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m128_source.tar.bz2) = 230de468468e7bcc93db9cfd468eef30
-SIZE (openoffice.org2.0/OOo_1.9m128_source.tar.bz2) = 229863809
+MD5 (openoffice.org2.0/OOo_1.9m129_source.tar.bz2) = a268a0cf9c32e3bb13742d8b13a62ebd
+SIZE (openoffice.org2.0/OOo_1.9m129_source.tar.bz2) = 228213420
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
index bef0514d2a5d..366ae60ba851 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs
+++ b/editors/openoffice.org-vcltesttool/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-vcltesttool/files/Makefile.localized b/editors/openoffice.org-vcltesttool/files/Makefile.localized
index 795dc3bd2dd4..a3f90e791abe 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.localized
+++ b/editors/openoffice.org-vcltesttool/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