* Remove RELEASE_NR. It is not used anymore [1].

* Add some localized languages.
* Desktop Icons and menus are not installed as default as pkg-plist
 is incomplete [2].
* Remove openoffice.org symlink.
* Some cosmetic fixes.

Submitted by:	oliver[1], kris[2]

2 files changed, 59 insertions, 6 deletions

diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
index 87843d8a66bc..33fa59095e15 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
@@ -99,12 +99,13 @@ 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 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 fa fi fr ga gl gu-IN he"
-	@${ECHO} "hi-IN hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl"
-	@${ECHO} "nn nr ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss"
-	@${ECHO} "st sv sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN"
-	@${ECHO} "zh-TW zu"
+	@${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_GNUGCJ)
@@ -132,6 +133,11 @@ pre-fetch:
 	@${ECHO} "You can compile OOo with evolution2 support by"
 	@${ECHO} "make -DWITH_EVOLUTION2"
 .endif
+.if !defined(WITH_MENU)
+	@${ECHO}
+	@${ECHO} "You can install OOo with menu items by"
+	@${ECHO} "make -DWITH_MENU"
+.endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.localized b/editors/openoffice.org-vcltesttool/files/Makefile.localized
index 410647cd4dff..4bcfcf78d781 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.localized
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.localized
@@ -14,6 +14,11 @@ CATEGORIES+=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "as-IN"
+LANG_PKGNAME=	as
+LANG_SUFFIX=	IN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "be-BY"
 LANG_PKGNAME=	be
 LANG_SUFFIX=	BY
@@ -170,6 +175,10 @@ CATEGORIES+=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ku"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "lo"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
@@ -190,6 +199,16 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "ml-IN"
+LANG_PKGNAME=	ml
+LANG_SUFFIX=	IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "mr-IN"
+LANG_PKGNAME=	mr
+LANG_SUFFIX=	IN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "ne"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
@@ -214,6 +233,11 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "or-IN"
+LANG_PKGNAME=	or
+LANG_SUFFIX=	IN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "pa-IN"
 LANG_PKGNAME=	pa
 LANG_SUFFIX=	IN
@@ -295,6 +319,16 @@ LANG_PKGNAME=	ta
 LANG_SUFFIX=	IN
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "te-IN"
+LANG_PKGNAME=	te
+LANG_SUFFIX=	IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ti-IN"
+LANG_PKGNAME=	ti
+LANG_SUFFIX=	IN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "th"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
@@ -311,6 +345,19 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "tg"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "ur-IN"
+LANG_PKGNAME=	ur
+LANG_SUFFIX=	IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "uk"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "ve"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif