Fix alllang build, by removing "oc" language support.

http://www.openoffice.org/issues/show_bug.cgi?id=88955

Spotted by:     Kris Moore <kris@pcbsd.com>

7 files changed, 51 insertions, 16 deletions

diff --git a/editors/openoffice.org-2-RC/files/Makefile.localized b/editors/openoffice.org-2-RC/files/Makefile.localized
index 01bf95d..cf8bbd7 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.localized
+++ b/editors/openoffice.org-2-RC/files/Makefile.localized
@@ -240,10 +240,6 @@ 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
diff --git a/editors/openoffice.org-2-RC/files/patch-i88955 b/editors/openoffice.org-2-RC/files/patch-i88955
new file mode 100644
index 0000000..24e9742
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-i88955
@@ -0,0 +1,17 @@
+Removing OC lang as it is not supported.
+
+Index: solenv/inc/postset.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/postset.mk,v
+retrieving revision 1.41.50.2
+diff -u -r1.41.50.2 postset.mk
+--- solenv/inc/postset.mk	18 Jan 2008 13:44:54 -0000	1.41.50.2
++++ solenv/inc/postset.mk	4 Sep 2008 00:15:33 -0000
+@@ -39,6 +39,6 @@
+ defaultlangiso=en-US
+ 
+ # Complete list of all supported ISO codes
+-completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
++completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
+ 
+ alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))
diff --git a/editors/openoffice.org-2-devel/files/Makefile.localized b/editors/openoffice.org-2-devel/files/Makefile.localized
index 01bf95d..cf8bbd7 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.localized
+++ b/editors/openoffice.org-2-devel/files/Makefile.localized
@@ -240,10 +240,6 @@ 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
diff --git a/editors/openoffice.org-2-devel/files/patch-i88955 b/editors/openoffice.org-2-devel/files/patch-i88955
new file mode 100644
index 0000000..24e9742
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i88955
@@ -0,0 +1,17 @@
+Removing OC lang as it is not supported.
+
+Index: solenv/inc/postset.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/postset.mk,v
+retrieving revision 1.41.50.2
+diff -u -r1.41.50.2 postset.mk
+--- solenv/inc/postset.mk	18 Jan 2008 13:44:54 -0000	1.41.50.2
++++ solenv/inc/postset.mk	4 Sep 2008 00:15:33 -0000
+@@ -39,6 +39,6 @@
+ defaultlangiso=en-US
+ 
+ # Complete list of all supported ISO codes
+-completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
++completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
+ 
+ alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))
diff --git a/editors/openoffice.org-2/files/Makefile.localized b/editors/openoffice.org-2/files/Makefile.localized
index 01bf95d..cf8bbd7 100644
--- a/editors/openoffice.org-2/files/Makefile.localized
+++ b/editors/openoffice.org-2/files/Makefile.localized
@@ -240,10 +240,6 @@ 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
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.localized b/editors/openoffice.org-vcltesttool/files/Makefile.localized
index 01bf95d..cf8bbd7 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.localized
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.localized
@@ -240,10 +240,6 @@ 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
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i88955 b/editors/openoffice.org-vcltesttool/files/patch-i88955
new file mode 100644
index 0000000..24e9742
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-i88955
@@ -0,0 +1,17 @@
+Removing OC lang as it is not supported.
+
+Index: solenv/inc/postset.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/postset.mk,v
+retrieving revision 1.41.50.2
+diff -u -r1.41.50.2 postset.mk
+--- solenv/inc/postset.mk	18 Jan 2008 13:44:54 -0000	1.41.50.2
++++ solenv/inc/postset.mk	4 Sep 2008 00:15:33 -0000
+@@ -39,6 +39,6 @@
+ defaultlangiso=en-US
+ 
+ # Complete list of all supported ISO codes
+-completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
++completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
+ 
+ alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))