aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arabic/libreoffice/distinfo4
-rw-r--r--chinese/libreoffice-zh_CN/distinfo8
-rw-r--r--chinese/libreoffice-zh_TW/distinfo8
-rw-r--r--editors/Makefile1
-rw-r--r--editors/libreoffice-af/distinfo4
-rw-r--r--editors/libreoffice-am/distinfo4
-rw-r--r--editors/libreoffice-as/Makefile2
-rw-r--r--editors/libreoffice-as/distinfo4
-rw-r--r--editors/libreoffice-ast/distinfo8
-rw-r--r--editors/libreoffice-be/Makefile2
-rw-r--r--editors/libreoffice-be/distinfo4
-rw-r--r--editors/libreoffice-bg/Makefile2
-rw-r--r--editors/libreoffice-bg/distinfo8
-rw-r--r--editors/libreoffice-bn/Makefile2
-rw-r--r--editors/libreoffice-bn/distinfo8
-rw-r--r--editors/libreoffice-bn_IN/distinfo8
-rw-r--r--editors/libreoffice-bo/distinfo8
-rw-r--r--editors/libreoffice-br/Makefile2
-rw-r--r--editors/libreoffice-br/distinfo4
-rw-r--r--editors/libreoffice-brx/Makefile2
-rw-r--r--editors/libreoffice-brx/distinfo4
-rw-r--r--editors/libreoffice-bs/Makefile2
-rw-r--r--editors/libreoffice-bs/distinfo8
-rw-r--r--editors/libreoffice-ca/Makefile2
-rw-r--r--editors/libreoffice-ca/distinfo8
-rw-r--r--editors/libreoffice-ca_XV/Makefile2
-rw-r--r--editors/libreoffice-ca_XV/distinfo8
-rw-r--r--editors/libreoffice-cs/Makefile2
-rw-r--r--editors/libreoffice-cs/distinfo8
-rw-r--r--editors/libreoffice-cy/Makefile2
-rw-r--r--editors/libreoffice-cy/distinfo4
-rw-r--r--editors/libreoffice-da/Makefile2
-rw-r--r--editors/libreoffice-da/distinfo8
-rw-r--r--editors/libreoffice-dgo/Makefile2
-rw-r--r--editors/libreoffice-dgo/distinfo4
-rw-r--r--editors/libreoffice-dz/Makefile2
-rw-r--r--editors/libreoffice-dz/distinfo8
-rw-r--r--editors/libreoffice-el/Makefile2
-rw-r--r--editors/libreoffice-el/distinfo8
-rw-r--r--editors/libreoffice-en_GB/Makefile2
-rw-r--r--editors/libreoffice-en_GB/distinfo8
-rw-r--r--editors/libreoffice-en_ZA/Makefile2
-rw-r--r--editors/libreoffice-en_ZA/distinfo8
-rw-r--r--editors/libreoffice-eo/Makefile2
-rw-r--r--editors/libreoffice-eo/distinfo8
-rw-r--r--editors/libreoffice-es/Makefile2
-rw-r--r--editors/libreoffice-es/distinfo8
-rw-r--r--editors/libreoffice-et/Makefile2
-rw-r--r--editors/libreoffice-et/distinfo8
-rw-r--r--editors/libreoffice-eu/Makefile2
-rw-r--r--editors/libreoffice-eu/distinfo8
-rw-r--r--editors/libreoffice-fa/Makefile2
-rw-r--r--editors/libreoffice-fa/distinfo4
-rw-r--r--editors/libreoffice-fi/Makefile2
-rw-r--r--editors/libreoffice-fi/distinfo8
-rw-r--r--editors/libreoffice-ga/Makefile2
-rw-r--r--editors/libreoffice-ga/distinfo4
-rw-r--r--editors/libreoffice-gd/Makefile2
-rw-r--r--editors/libreoffice-gd/distinfo4
-rw-r--r--editors/libreoffice-gl/Makefile2
-rw-r--r--editors/libreoffice-gl/distinfo8
-rw-r--r--editors/libreoffice-gu/Makefile2
-rw-r--r--editors/libreoffice-gu/distinfo8
-rw-r--r--editors/libreoffice-hi/Makefile2
-rw-r--r--editors/libreoffice-hi/distinfo8
-rw-r--r--editors/libreoffice-hr/Makefile2
-rw-r--r--editors/libreoffice-hr/distinfo8
-rw-r--r--editors/libreoffice-i18n/Makefile4
-rw-r--r--editors/libreoffice-id/Makefile2
-rw-r--r--editors/libreoffice-id/distinfo8
-rw-r--r--editors/libreoffice-is/Makefile2
-rw-r--r--editors/libreoffice-is/distinfo8
-rw-r--r--editors/libreoffice-it/Makefile2
-rw-r--r--editors/libreoffice-it/distinfo8
-rw-r--r--editors/libreoffice-ka/Makefile2
-rw-r--r--editors/libreoffice-ka/distinfo8
-rw-r--r--editors/libreoffice-kk/Makefile2
-rw-r--r--editors/libreoffice-kk/distinfo4
-rw-r--r--editors/libreoffice-km/Makefile2
-rw-r--r--editors/libreoffice-km/distinfo8
-rw-r--r--editors/libreoffice-kn/distinfo4
-rw-r--r--editors/libreoffice-kok/Makefile2
-rw-r--r--editors/libreoffice-kok/distinfo4
-rw-r--r--editors/libreoffice-ks/Makefile2
-rw-r--r--editors/libreoffice-ks/distinfo4
-rw-r--r--editors/libreoffice-ku/Makefile2
-rw-r--r--editors/libreoffice-ku/distinfo4
-rw-r--r--editors/libreoffice-lb/Makefile1
-rw-r--r--editors/libreoffice-lb/distinfo6
-rw-r--r--editors/libreoffice-lo/Makefile2
-rw-r--r--editors/libreoffice-lo/distinfo4
-rw-r--r--editors/libreoffice-lt/Makefile2
-rw-r--r--editors/libreoffice-lt/distinfo4
-rw-r--r--editors/libreoffice-lv/Makefile2
-rw-r--r--editors/libreoffice-lv/distinfo4
-rw-r--r--editors/libreoffice-mai/Makefile2
-rw-r--r--editors/libreoffice-mai/distinfo4
-rw-r--r--editors/libreoffice-mk/Makefile2
-rw-r--r--editors/libreoffice-mk/distinfo8
-rw-r--r--editors/libreoffice-ml/Makefile2
-rw-r--r--editors/libreoffice-ml/distinfo4
-rw-r--r--editors/libreoffice-mn/Makefile2
-rw-r--r--editors/libreoffice-mn/distinfo4
-rw-r--r--editors/libreoffice-mni/Makefile2
-rw-r--r--editors/libreoffice-mni/distinfo4
-rw-r--r--editors/libreoffice-mr/Makefile2
-rw-r--r--editors/libreoffice-mr/distinfo4
-rw-r--r--editors/libreoffice-my/Makefile2
-rw-r--r--editors/libreoffice-my/distinfo4
-rw-r--r--editors/libreoffice-nb/Makefile2
-rw-r--r--editors/libreoffice-nb/distinfo8
-rw-r--r--editors/libreoffice-ne/Makefile2
-rw-r--r--editors/libreoffice-ne/distinfo8
-rw-r--r--editors/libreoffice-nl/distinfo8
-rw-r--r--editors/libreoffice-nn/Makefile2
-rw-r--r--editors/libreoffice-nn/distinfo8
-rw-r--r--editors/libreoffice-nr/Makefile2
-rw-r--r--editors/libreoffice-nr/distinfo4
-rw-r--r--editors/libreoffice-nso/Makefile2
-rw-r--r--editors/libreoffice-nso/distinfo4
-rw-r--r--editors/libreoffice-oc/Makefile2
-rw-r--r--editors/libreoffice-oc/distinfo4
-rw-r--r--editors/libreoffice-om/Makefile2
-rw-r--r--editors/libreoffice-om/distinfo8
-rw-r--r--editors/libreoffice-or/Makefile2
-rw-r--r--editors/libreoffice-or/distinfo4
-rw-r--r--editors/libreoffice-pa_IN/Makefile2
-rw-r--r--editors/libreoffice-pa_IN/distinfo4
-rw-r--r--editors/libreoffice-ro/Makefile2
-rw-r--r--editors/libreoffice-ro/distinfo8
-rw-r--r--editors/libreoffice-rw/Makefile2
-rw-r--r--editors/libreoffice-rw/distinfo4
-rw-r--r--editors/libreoffice-sa_IN/Makefile2
-rw-r--r--editors/libreoffice-sa_IN/distinfo4
-rw-r--r--editors/libreoffice-sat/Makefile2
-rw-r--r--editors/libreoffice-sat/distinfo4
-rw-r--r--editors/libreoffice-sd/Makefile2
-rw-r--r--editors/libreoffice-sd/distinfo4
-rw-r--r--editors/libreoffice-sh/Makefile2
-rw-r--r--editors/libreoffice-sh/distinfo4
-rw-r--r--editors/libreoffice-si/Makefile2
-rw-r--r--editors/libreoffice-si/distinfo8
-rw-r--r--editors/libreoffice-sid/Makefile7
-rw-r--r--editors/libreoffice-sid/distinfo2
-rw-r--r--editors/libreoffice-sid/pkg-descr3
-rw-r--r--editors/libreoffice-sk/Makefile2
-rw-r--r--editors/libreoffice-sk/distinfo8
-rw-r--r--editors/libreoffice-sl/Makefile2
-rw-r--r--editors/libreoffice-sl/distinfo8
-rw-r--r--editors/libreoffice-sq/Makefile2
-rw-r--r--editors/libreoffice-sq/distinfo8
-rw-r--r--editors/libreoffice-sr/Makefile2
-rw-r--r--editors/libreoffice-sr/distinfo4
-rw-r--r--editors/libreoffice-ss/Makefile2
-rw-r--r--editors/libreoffice-ss/distinfo4
-rw-r--r--editors/libreoffice-st/Makefile2
-rw-r--r--editors/libreoffice-st/distinfo4
-rw-r--r--editors/libreoffice-sv/Makefile2
-rw-r--r--editors/libreoffice-sv/distinfo8
-rw-r--r--editors/libreoffice-sw_TZ/Makefile2
-rw-r--r--editors/libreoffice-sw_TZ/distinfo4
-rw-r--r--editors/libreoffice-ta/Makefile2
-rw-r--r--editors/libreoffice-ta/distinfo4
-rw-r--r--editors/libreoffice-te/Makefile2
-rw-r--r--editors/libreoffice-te/distinfo4
-rw-r--r--editors/libreoffice-tg/Makefile2
-rw-r--r--editors/libreoffice-tg/distinfo8
-rw-r--r--editors/libreoffice-th/Makefile2
-rw-r--r--editors/libreoffice-th/distinfo4
-rw-r--r--editors/libreoffice-tn/Makefile2
-rw-r--r--editors/libreoffice-tn/distinfo4
-rw-r--r--editors/libreoffice-tr/Makefile2
-rw-r--r--editors/libreoffice-tr/distinfo8
-rw-r--r--editors/libreoffice-ts/Makefile2
-rw-r--r--editors/libreoffice-ts/distinfo4
-rw-r--r--editors/libreoffice-tt/distinfo4
-rw-r--r--editors/libreoffice-ug/distinfo8
-rw-r--r--editors/libreoffice-uz/Makefile2
-rw-r--r--editors/libreoffice-uz/distinfo4
-rw-r--r--editors/libreoffice-ve/Makefile2
-rw-r--r--editors/libreoffice-ve/distinfo4
-rw-r--r--editors/libreoffice-xh/Makefile2
-rw-r--r--editors/libreoffice-xh/distinfo4
-rw-r--r--editors/libreoffice-zu/Makefile2
-rw-r--r--editors/libreoffice-zu/distinfo4
-rw-r--r--editors/libreoffice/Makefile412
-rw-r--r--editors/libreoffice/Makefile.common10
-rw-r--r--editors/libreoffice/distinfo14
-rw-r--r--editors/libreoffice/files/disable-cppunittester6
-rw-r--r--editors/libreoffice/files/patch-RepositoryExternal.mk11
-rw-r--r--editors/libreoffice/files/patch-bin__distro-install-desktop-integration12
-rw-r--r--editors/libreoffice/files/patch-bridges__Library_gcc3_linux_intel.mk11
-rw-r--r--editors/libreoffice/files/patch-bridges__Library_gcc3_linux_x86-64.mk14
-rw-r--r--editors/libreoffice/files/patch-configure.ac84
-rw-r--r--editors/libreoffice/files/patch-configure.in164
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__commontools__FDatabaseMetaDataResultSet.cxx17
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__commontools__dbexception.cxx24
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__drivers__ado__AColumn.cxx11
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__drivers__ado__AUser.cxx11
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__drivers__file__FResultSet.cxx17
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__drivers__file__FStatement.cxx27
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__drivers__hsqldb__HUser.cxx11
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__drivers__mysql__YUser.cxx11
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__inc__propertyids.hxx11
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__parse__PColumn.cxx35
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__sdbcx__VCatalog.cxx11
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__sdbcx__VColumn.cxx23
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__sdbcx__VIndex.cxx11
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__sdbcx__VKey.cxx17
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__sdbcx__VKeyColumn.cxx11
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__sdbcx__VTable.cxx17
-rw-r--r--editors/libreoffice/files/patch-connectivity__source__sdbcx__VView.cxx17
-rw-r--r--editors/libreoffice/files/patch-cppunit__freebsd.patch24
-rw-r--r--editors/libreoffice/files/patch-cppunit__gcc-abi-demangle.patch31
-rw-r--r--editors/libreoffice/files/patch-cppunit__makefile.mk17
-rw-r--r--editors/libreoffice/files/patch-dbaccess__source__core__api__RowSet.cxx92
-rw-r--r--editors/libreoffice/files/patch-dbaccess__source__core__api__TableDeco.cxx11
-rw-r--r--editors/libreoffice/files/patch-dbaccess__source__ui__browser__sbagrid.cxx11
-rw-r--r--editors/libreoffice/files/patch-editeng__Module_editeng.mk10
-rw-r--r--editors/libreoffice/files/patch-extensions__Library_ldapbe2.mk23
-rw-r--r--editors/libreoffice/files/patch-extensions__Library_npsoplugin.mk14
-rw-r--r--editors/libreoffice/files/patch-extensions__source__resource__ResourceIndexAccess.cxx20
-rw-r--r--editors/libreoffice/files/patch-extensions__source__resource__ResourceIndexAccess.hxx11
-rw-r--r--editors/libreoffice/files/patch-forms__source__component__ComboBox.cxx11
-rw-r--r--editors/libreoffice/files/patch-forms__source__component__ListBox.cxx29
-rw-r--r--editors/libreoffice/files/patch-forms__source__inc__property.hxx20
-rw-r--r--editors/libreoffice/files/patch-i18npool__CustomTarget_breakiterator.mk11
-rw-r--r--editors/libreoffice/files/patch-mysqlc__source__mysqlc_propertyids.hxx11
-rw-r--r--editors/libreoffice/files/patch-odk__pack__gendocu__makefile.mk6
-rw-r--r--editors/libreoffice/files/patch-odk__settings__settings.mk11
-rw-r--r--editors/libreoffice/files/patch-registry__workben__makefile.mk13
-rw-r--r--editors/libreoffice/files/patch-reportdesign__source__ui__report__ReportController.cxx11
-rw-r--r--editors/libreoffice/files/patch-sal__osl__unx__interlck.c20
-rw-r--r--editors/libreoffice/files/patch-shell__Module_shell.mk11
-rw-r--r--editors/libreoffice/files/patch-solenv__gbuild__platform__unxgcc.mk29
-rw-r--r--editors/libreoffice/files/patch-solenv__inc__libs.mk11
-rw-r--r--editors/libreoffice/files/patch-solenv__inc__unxgcc.mk18
-rw-r--r--editors/libreoffice/files/patch-svtools__source__control__ctrlbox.cxx11
-rw-r--r--editors/libreoffice/files/patch-svx__source__items__clipfmtitem.cxx11
-rw-r--r--editors/libreoffice/files/patch-sw__Module_sw.mk13
-rw-r--r--editors/libreoffice/files/patch-sysui__desktop__share__create_tree.sh6
-rw-r--r--editors/libreoffice/files/patch-testtools__Module_testtools.mk (renamed from editors/libreoffice/files/disable-uno_test)4
-rw-r--r--editors/libreoffice/files/patch-vcl__unx__gtk__gdi__salnativewidgets-gtk.cxx8
-rw-r--r--french/libreoffice/distinfo8
-rw-r--r--german/libreoffice/distinfo8
-rw-r--r--hebrew/libreoffice/distinfo8
-rw-r--r--hungarian/libreoffice/distinfo8
-rw-r--r--japanese/libreoffice/distinfo8
-rw-r--r--korean/libreoffice/distinfo8
-rw-r--r--polish/libreoffice/distinfo8
-rw-r--r--portuguese/libreoffice-pt_BR/distinfo8
-rw-r--r--portuguese/libreoffice/distinfo8
-rw-r--r--russian/libreoffice/distinfo8
-rw-r--r--ukrainian/libreoffice/distinfo8
-rw-r--r--vietnamese/libreoffice/Makefile2
-rw-r--r--vietnamese/libreoffice/distinfo8
256 files changed, 865 insertions, 1532 deletions
diff --git a/arabic/libreoffice/distinfo b/arabic/libreoffice/distinfo
index aa867abe7336..a2f800e43cdf 100644
--- a/arabic/libreoffice/distinfo
+++ b/arabic/libreoffice/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ar.tar.gz) = 1464879e97b7f0120de835915a25644517e33966805ef9dc4405ac48fdb9c756
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ar.tar.gz) = 3350089
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ar.tar.gz) = 904c12e40047a98f722181375a9091762e68adf6cba1f4aef9a965db9f97ea08
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ar.tar.gz) = 2468332
diff --git a/chinese/libreoffice-zh_CN/distinfo b/chinese/libreoffice-zh_CN/distinfo
index 0b89687b28bc..426ec09c2d51 100644
--- a/chinese/libreoffice-zh_CN/distinfo
+++ b/chinese/libreoffice-zh_CN/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_zh-CN.tar.gz) = e3c44d1b4cde0eded56da42fffae751d844e1c15f27c6f29e446f600f0137826
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_zh-CN.tar.gz) = 1661441
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_zh-CN.tar.gz) = 02a4d4a7ce30993217872f51d3bbd2db6ce1f8abd2e7ee1eced0d9799961e858
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_zh-CN.tar.gz) = 13869926
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_zh-CN.tar.gz) = 7f5125284a218a63c23e1dd06eb68a7871a2a73d7fd02f068f21413a9aec6379
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_zh-CN.tar.gz) = 689581
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_zh-CN.tar.gz) = 3dadf6a428867cd4077e9dc29ed3eb74782c96c4e5f5480a7a1dafd3979573f5
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_zh-CN.tar.gz) = 13608203
diff --git a/chinese/libreoffice-zh_TW/distinfo b/chinese/libreoffice-zh_TW/distinfo
index e4cd866c9898..7779aaa1aea2 100644
--- a/chinese/libreoffice-zh_TW/distinfo
+++ b/chinese/libreoffice-zh_TW/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_zh-TW.tar.gz) = 1fe57472dbd2f3b020a0562da1bbf03de6f209a86b9b87fa5b6c52eb25ecad20
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_zh-TW.tar.gz) = 1652105
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_zh-TW.tar.gz) = ba2c2afcbb46d58bcd790a63084061865d1a1d069ed79753ab4a30f0db3c9778
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_zh-TW.tar.gz) = 14009762
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_zh-TW.tar.gz) = 6773af54969156dd8eccf5a1b6e318cfbab7571382f01b52bbecd227e2bb5185
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_zh-TW.tar.gz) = 687841
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_zh-TW.tar.gz) = 55911ebb471b4ddab9dea07bd89492a9369487557677b96dc85ad0d57ec264b1
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_zh-TW.tar.gz) = 13740249
diff --git a/editors/Makefile b/editors/Makefile
index 834c1737838b..8883398220d9 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -190,6 +190,7 @@
SUBDIR += libreoffice-sd
SUBDIR += libreoffice-sh
SUBDIR += libreoffice-si
+ SUBDIR += libreoffice-sid
SUBDIR += libreoffice-sk
SUBDIR += libreoffice-sl
SUBDIR += libreoffice-sq
diff --git a/editors/libreoffice-af/distinfo b/editors/libreoffice-af/distinfo
index 47ffc6d0a86c..49af8d07ddb5 100644
--- a/editors/libreoffice-af/distinfo
+++ b/editors/libreoffice-af/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_af.tar.gz) = 3dba5a879306b40467a964b09b862e388cb693aaf1dda1c7a1884d524c8cb2b0
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_af.tar.gz) = 2208747
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_af.tar.gz) = 69169a172f882590298fd71adfe0f9de96d6d640849c20829ae17cf3ad3dd6ae
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_af.tar.gz) = 1324751
diff --git a/editors/libreoffice-am/distinfo b/editors/libreoffice-am/distinfo
index d3e004390412..486461d77359 100644
--- a/editors/libreoffice-am/distinfo
+++ b/editors/libreoffice-am/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_am.tar.gz) = bec869dd6fe0f16994c63984d269c937010b6f755dbda640ea1a48fbad2271e6
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_am.tar.gz) = 1616568
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_am.tar.gz) = dfd4120594db3c877a1e48831933ac215e8fd4e6256f40c304370668582e0f86
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_am.tar.gz) = 733378
diff --git a/editors/libreoffice-as/Makefile b/editors/libreoffice-as/Makefile
index 658282124857..be32de05f708 100644
--- a/editors/libreoffice-as/Makefile
+++ b/editors/libreoffice-as/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= as
+LO_I18N= as
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-as/distinfo b/editors/libreoffice-as/distinfo
index 6120436f4cc9..965dca2e9e1e 100644
--- a/editors/libreoffice-as/distinfo
+++ b/editors/libreoffice-as/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_as.tar.gz) = 2291282be91d54cabb467e4f4557b377ccc4cdd9457055a71068d2fc7829d570
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_as.tar.gz) = 1652030
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_as.tar.gz) = ff0d141cdc597ff00a3e80bda3e6675d4663a1b2d1adf5bafed4285dde216eb4
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_as.tar.gz) = 769857
diff --git a/editors/libreoffice-ast/distinfo b/editors/libreoffice-ast/distinfo
index 227467241e60..a7a7c525c4c1 100644
--- a/editors/libreoffice-ast/distinfo
+++ b/editors/libreoffice-ast/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ast.tar.gz) = 0ea3cc6ed46800203635a0a24d74e63830ba02bf0abce27314d9c90a43d13f59
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ast.tar.gz) = 1595143
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ast.tar.gz) = 3f4275ea86836bf902806db04a799213b963f6061e7c689262e31fed5d64831d
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ast.tar.gz) = 11068881
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ast.tar.gz) = 5a95cc75c2543b1e5ae68db6854d7ff640f62c89b831663bc1627656d13ddd5f
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ast.tar.gz) = 712516
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ast.tar.gz) = a2c0d7c624e25c98bcf5df2c2af810a75089fd62c75e3c8af2716223f78f4d9a
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ast.tar.gz) = 10800959
diff --git a/editors/libreoffice-be/Makefile b/editors/libreoffice-be/Makefile
index c519cddf154f..18a310f8eed2 100644
--- a/editors/libreoffice-be/Makefile
+++ b/editors/libreoffice-be/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= be
+LO_I18N= be
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-be/distinfo b/editors/libreoffice-be/distinfo
index eb0366758ac7..c4af0461b637 100644
--- a/editors/libreoffice-be/distinfo
+++ b/editors/libreoffice-be/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_be.tar.gz) = 60c88c6cd0df13d712fac6eb894e30a005fdd71281a77645e5bc0d004e867d91
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_be.tar.gz) = 1992688
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_be.tar.gz) = a02472c2646bfd8c16a8c1888fd1d3e1e77b623e80fa21d9be9b4d77669b0b7e
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_be.tar.gz) = 1113654
diff --git a/editors/libreoffice-bg/Makefile b/editors/libreoffice-bg/Makefile
index c2b2c30e720b..07b93b6730e2 100644
--- a/editors/libreoffice-bg/Makefile
+++ b/editors/libreoffice-bg/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= bg
+LO_I18N= bg
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-bg/distinfo b/editors/libreoffice-bg/distinfo
index c8f4243cac2a..7b5b946fd350 100644
--- a/editors/libreoffice-bg/distinfo
+++ b/editors/libreoffice-bg/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_bg.tar.gz) = bb7d24f4b0fa31e141c1ae572138a1ad614ed5668292b0adcbae24f31bf87b09
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_bg.tar.gz) = 3003212
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_bg.tar.gz) = ec15720cfdeec7137d875d5457169621bf5b4e6a0922b877cb9f029563baaec8
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_bg.tar.gz) = 11594910
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_bg.tar.gz) = 4071027c49319b1ecb0f182f93e9e80a854f8d802b91ea737013c7d1ba4e2d0e
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_bg.tar.gz) = 2079247
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_bg.tar.gz) = 801a918b37d64b9bb92104ac0b9e65fee9489040414ffc8bd36964082df7bc6f
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_bg.tar.gz) = 11334506
diff --git a/editors/libreoffice-bn/Makefile b/editors/libreoffice-bn/Makefile
index 41ea0d39938a..29603142b664 100644
--- a/editors/libreoffice-bn/Makefile
+++ b/editors/libreoffice-bn/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= bn
+LO_I18N= bn
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-bn/distinfo b/editors/libreoffice-bn/distinfo
index 9054d7862061..4ad187270f61 100644
--- a/editors/libreoffice-bn/distinfo
+++ b/editors/libreoffice-bn/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_bn.tar.gz) = 55e187e6bdb52235a2e5d0f607a3c5690ba4c6f5c2aeffef3688376baecbb633
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_bn.tar.gz) = 2021842
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_bn.tar.gz) = 5a7f1b23c598ff3e3ef0ac7d0b4555779386e0d1efe627f6352bb8d1914bc9ae
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_bn.tar.gz) = 13303521
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_bn.tar.gz) = 993eb3d44bf4d72df13e92179905dbdd238dedde39505b50730165f2cb1f3154
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_bn.tar.gz) = 1137692
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_bn.tar.gz) = 6b765c7383091f236fd1dbf1219f8ad6eaa6678ff2ab2373e0fae98ae64806a2
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_bn.tar.gz) = 13009548
diff --git a/editors/libreoffice-bn_IN/distinfo b/editors/libreoffice-bn_IN/distinfo
index efec66616e36..d62d2a7d08fe 100644
--- a/editors/libreoffice-bn_IN/distinfo
+++ b/editors/libreoffice-bn_IN/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_bn-IN.tar.gz) = d1e4f45c50d9c796caa9d8e8d97cdccc5ac64125bc89d480c849812c094d774d
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_bn-IN.tar.gz) = 1648468
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_bn-IN.tar.gz) = 182cd9c20494e55249e5c90299e61bac311b8919cb3497220b5745678f618cfa
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_bn-IN.tar.gz) = 9410802
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_bn-IN.tar.gz) = 48f0d37d252df7ac16da283fc728059ac43f257935eb1c8a9dc7a2766e03f76c
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_bn-IN.tar.gz) = 765246
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_bn-IN.tar.gz) = 5ab606dbd34b7ba720692bcb1748de3a6edd715886392742c30cbbf4586468e0
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_bn-IN.tar.gz) = 9143288
diff --git a/editors/libreoffice-bo/distinfo b/editors/libreoffice-bo/distinfo
index 491d9f0c7868..3a018a26cf4e 100644
--- a/editors/libreoffice-bo/distinfo
+++ b/editors/libreoffice-bo/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_bo.tar.gz) = 24812723e432f0f626da8b8f6370897a3a18f0af5f14aa5df153d7d49577a642
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_bo.tar.gz) = 1665052
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_bo.tar.gz) = 3427c0dcb2725bba90d6d0f42bde11a05e233cb1cde98690e591f3af74c67360
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_bo.tar.gz) = 12882712
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_bo.tar.gz) = e725b5911d2e07cb1bb183306805336511aad579beef6961ab15f945ebb297f8
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_bo.tar.gz) = 781003
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_bo.tar.gz) = 08931bad5644b4eac6fd9e1ac3522820f00433f7a3a4a62cb2edcd84cda34cfd
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_bo.tar.gz) = 12597225
diff --git a/editors/libreoffice-br/Makefile b/editors/libreoffice-br/Makefile
index 0adc20abc93b..eeadd6382f94 100644
--- a/editors/libreoffice-br/Makefile
+++ b/editors/libreoffice-br/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= br
+LO_I18N= br
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-br/distinfo b/editors/libreoffice-br/distinfo
index 890dba352bab..a7ae127e9b83 100644
--- a/editors/libreoffice-br/distinfo
+++ b/editors/libreoffice-br/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_br.tar.gz) = 1cae4e61a83755407056a7cc3584714f7c0ac98d4312c4216b259333e1820229
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_br.tar.gz) = 2802656
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_br.tar.gz) = 8a94f471e8e479f1ff147de36016fb319cd4bba8b21cd6bdde9c3a3b4915e629
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_br.tar.gz) = 1920076
diff --git a/editors/libreoffice-brx/Makefile b/editors/libreoffice-brx/Makefile
index 4d652d988e2d..00c529ff99fa 100644
--- a/editors/libreoffice-brx/Makefile
+++ b/editors/libreoffice-brx/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= brx
+LO_I18N= brx
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-brx/distinfo b/editors/libreoffice-brx/distinfo
index f59f67300072..8254e35afc5b 100644
--- a/editors/libreoffice-brx/distinfo
+++ b/editors/libreoffice-brx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_brx.tar.gz) = c6f804bc0ba545dfc02d80fdbe444d1cf6b8b0344e7a2d108583b5564b2b628f
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_brx.tar.gz) = 1629394
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_brx.tar.gz) = f7a660c8899526b15575ef22b0cde9362fcaa8e8d13def32120b2de4aad9c094
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_brx.tar.gz) = 746188
diff --git a/editors/libreoffice-bs/Makefile b/editors/libreoffice-bs/Makefile
index a06afa500203..f12f41681509 100644
--- a/editors/libreoffice-bs/Makefile
+++ b/editors/libreoffice-bs/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= bs
+LO_I18N= bs
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-bs/distinfo b/editors/libreoffice-bs/distinfo
index 661e6b936c47..9924b7eaf2a6 100644
--- a/editors/libreoffice-bs/distinfo
+++ b/editors/libreoffice-bs/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_bs.tar.gz) = c3ff1551d871e61e411d15a06093959d593e779d51fb64750b42b6266854da4d
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_bs.tar.gz) = 1593058
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_bs.tar.gz) = d6b7b5cd3071f93cf2e0ff79110376450284380110afd5599e0cae768cff7c1e
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_bs.tar.gz) = 10071321
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_bs.tar.gz) = e7eb01182730b18f86af9336c511dec293e6f2f486ac889645d713b0a8fa9e6b
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_bs.tar.gz) = 823437
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_bs.tar.gz) = 74954106a8fa1f5dc82e55f3199beb6fa77a6aa8d765c14049e959b8040b5446
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_bs.tar.gz) = 9795876
diff --git a/editors/libreoffice-ca/Makefile b/editors/libreoffice-ca/Makefile
index 5834f17d78c3..fb8835cf5957 100644
--- a/editors/libreoffice-ca/Makefile
+++ b/editors/libreoffice-ca/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= ca
+LO_I18N= ca
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-ca/distinfo b/editors/libreoffice-ca/distinfo
index c014a0d3c1c8..013b74f15cfa 100644
--- a/editors/libreoffice-ca/distinfo
+++ b/editors/libreoffice-ca/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ca.tar.gz) = fdd577e7d9acb846441374207b4c231762b5f94a20cfaa124deebc955bebcd62
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ca.tar.gz) = 2240363
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ca.tar.gz) = ac7ed6d78e41f07c7a3d9f5f3a0bd5bb8811c44f13dc7fdca84fbeafb8a15618
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ca.tar.gz) = 10915504
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ca.tar.gz) = 02662417ffa6fffefec26e5cc7d4a046b0692787f927c0a92dbd66a4f1e78a1c
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ca.tar.gz) = 799668
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ca.tar.gz) = e675d5a9820cb731d153f8af191cbd89491b2981bf3734864edd1ae804e89cdb
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ca.tar.gz) = 10647637
diff --git a/editors/libreoffice-ca_XV/Makefile b/editors/libreoffice-ca_XV/Makefile
index 1546bf9a3d04..dc86e6402b2c 100644
--- a/editors/libreoffice-ca_XV/Makefile
+++ b/editors/libreoffice-ca_XV/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= ca_XV
+LO_I18N= ca_XV
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-ca_XV/distinfo b/editors/libreoffice-ca_XV/distinfo
index 5406d7d39091..2af78a9b96ca 100644
--- a/editors/libreoffice-ca_XV/distinfo
+++ b/editors/libreoffice-ca_XV/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ca-XV.tar.gz) = c811cda677e15d68e4a3f220a26db03a4700ec161bb51c7243c16c161826ad00
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ca-XV.tar.gz) = 1590330
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ca-XV.tar.gz) = 492cb5593f8447bfdbc01236c61bfcbe9b69452dcd88fa072dc41f24079a3bb0
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ca-XV.tar.gz) = 10940115
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ca-XV.tar.gz) = 3e6ed775b674e5bc4a3e190041b62dde768257015d8803033ca8e9ab94fc9d66
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ca-XV.tar.gz) = 707609
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ca-XV.tar.gz) = eb6da51320461ef4b454ad675c384780624133a6921bb444939a5bc680983aba
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ca-XV.tar.gz) = 10662643
diff --git a/editors/libreoffice-cs/Makefile b/editors/libreoffice-cs/Makefile
index 95be69ab4361..9b548d4e5f21 100644
--- a/editors/libreoffice-cs/Makefile
+++ b/editors/libreoffice-cs/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= cs
+LO_I18N= cs
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-cs/distinfo b/editors/libreoffice-cs/distinfo
index dbbdaa66af5e..691c12ceba75 100644
--- a/editors/libreoffice-cs/distinfo
+++ b/editors/libreoffice-cs/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_cs.tar.gz) = 06559e560d21e6f298157cd46d8fc8cbacc6707695618553e8195199e1e36f02
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_cs.tar.gz) = 3459108
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_cs.tar.gz) = e7e8624be91db67aed9edd4b0b6c762525e966c6496bd1a450911ce89bf73fec
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_cs.tar.gz) = 10608018
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_cs.tar.gz) = 761926358367d5610e9946fabcde8938f1775cd31fb720af087faaacfe582f87
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_cs.tar.gz) = 2563130
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_cs.tar.gz) = cdb72fec3066c21fdcdc1ece5df671756c690ce82075dca85c318068a16bc10f
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_cs.tar.gz) = 10351003
diff --git a/editors/libreoffice-cy/Makefile b/editors/libreoffice-cy/Makefile
index c9ea64463737..c954b5dbf824 100644
--- a/editors/libreoffice-cy/Makefile
+++ b/editors/libreoffice-cy/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= cy
+LO_I18N= cy
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-cy/distinfo b/editors/libreoffice-cy/distinfo
index 7e4c6b00ae70..2c0464b90f90 100644
--- a/editors/libreoffice-cy/distinfo
+++ b/editors/libreoffice-cy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_cy.tar.gz) = c7ac9a6eba98034e6cd673a7155c64ef11f8befa3d2b81ffff1679ffd5eb252a
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_cy.tar.gz) = 1571666
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_cy.tar.gz) = 1a944a3269aac93d06d2151d69bb4f444d8e115ecda89501dba704551abd351d
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_cy.tar.gz) = 686604
diff --git a/editors/libreoffice-da/Makefile b/editors/libreoffice-da/Makefile
index 35be7ac4f339..7126955aef5e 100644
--- a/editors/libreoffice-da/Makefile
+++ b/editors/libreoffice-da/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= da
+LO_I18N= da
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-da/distinfo b/editors/libreoffice-da/distinfo
index db1e4b256590..1b79ffad775d 100644
--- a/editors/libreoffice-da/distinfo
+++ b/editors/libreoffice-da/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_da.tar.gz) = e10eb27a86a12f9de02afa65814b43139d6591f2049dc0cd52d300ea0c71085b
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_da.tar.gz) = 3395032
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_da.tar.gz) = 329a5a311939c6ae8ac52ee36e552741da9fd6192baf4d8b9b8e0c6cce361efc
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_da.tar.gz) = 10527474
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_da.tar.gz) = 8fe838e418c430b440f0602ab187457adefcc9991e0638fa1ed417e72164fda3
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_da.tar.gz) = 2517719
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_da.tar.gz) = 244d810cb6fd3541eacf7a85a56f017246ac1129fa0c8c569b3b9f0e03073077
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_da.tar.gz) = 10271413
diff --git a/editors/libreoffice-dgo/Makefile b/editors/libreoffice-dgo/Makefile
index 0ecea60cd21e..87980b3ef587 100644
--- a/editors/libreoffice-dgo/Makefile
+++ b/editors/libreoffice-dgo/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= dgo
+LO_I18N= dgo
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-dgo/distinfo b/editors/libreoffice-dgo/distinfo
index 61693e3a23dc..b81b38c51f81 100644
--- a/editors/libreoffice-dgo/distinfo
+++ b/editors/libreoffice-dgo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_dgo.tar.gz) = 45433aebdae452192d480f1c818df26db767abb1cdf9370c805a3b1a5ce27ff3
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_dgo.tar.gz) = 1640069
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_dgo.tar.gz) = c84dc9f49d2770e5ab03ff788bccac74778766778cc44a8f6752595278550572
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_dgo.tar.gz) = 756435
diff --git a/editors/libreoffice-dz/Makefile b/editors/libreoffice-dz/Makefile
index ccf0dda0d445..bee76d700689 100644
--- a/editors/libreoffice-dz/Makefile
+++ b/editors/libreoffice-dz/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= dz
+LO_I18N= dz
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-dz/distinfo b/editors/libreoffice-dz/distinfo
index 47b71cf90550..74c60bf8478c 100644
--- a/editors/libreoffice-dz/distinfo
+++ b/editors/libreoffice-dz/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_dz.tar.gz) = 72970dec1bd5b2fd8fa0ca7eb3bbeb13f664362fd14c3379a18857d227e6b3e4
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_dz.tar.gz) = 1677335
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_dz.tar.gz) = 8954a3e1a6b727e5a32b9899a746525fc5458f9d47340d976bf6dfde40803438
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_dz.tar.gz) = 13936595
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_dz.tar.gz) = e8b8de737d829a72f198af6b6c0dc6cea12f779625c466b315152ef5ad055f9a
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_dz.tar.gz) = 791759
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_dz.tar.gz) = b397bdea1040b9110a51e8f252f2ac4cf81774f79ee0fb852f188eaf6038c0ef
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_dz.tar.gz) = 13618055
diff --git a/editors/libreoffice-el/Makefile b/editors/libreoffice-el/Makefile
index 8e0d88ca4725..dc2120cb354c 100644
--- a/editors/libreoffice-el/Makefile
+++ b/editors/libreoffice-el/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= el
+LO_I18N= el
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-el/distinfo b/editors/libreoffice-el/distinfo
index 898da65dcc74..be40ee4a239d 100644
--- a/editors/libreoffice-el/distinfo
+++ b/editors/libreoffice-el/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_el.tar.gz) = 2c32e29db58676516379ec23df18d660b8593215489a89dd8a7738ce8559a26b
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_el.tar.gz) = 3192219
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_el.tar.gz) = 23c0719971785f2c0dc80306deac9bd6553f68bed4c76754b3f588c2eda5aadf
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_el.tar.gz) = 12355379
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_el.tar.gz) = 8d853d7137a10639ac1f41609d268a736fa6a4b94fced45a8aee2874cfe4fe49
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_el.tar.gz) = 2308471
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_el.tar.gz) = e0ad6c67c04103dc83727d36f75622d7c02a3aa0ba3f37abbbcbf0f9d4b7f506
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_el.tar.gz) = 12088598
diff --git a/editors/libreoffice-en_GB/Makefile b/editors/libreoffice-en_GB/Makefile
index 3ad79d6504d0..2835b3a68ae6 100644
--- a/editors/libreoffice-en_GB/Makefile
+++ b/editors/libreoffice-en_GB/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= en_GB
+LO_I18N= en_GB
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-en_GB/distinfo b/editors/libreoffice-en_GB/distinfo
index d0ab3a4bdfd2..4147a5b079a2 100644
--- a/editors/libreoffice-en_GB/distinfo
+++ b/editors/libreoffice-en_GB/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_en-GB.tar.gz) = 6c3c60f2ad89e7b13547ca878847ad0c79ac0403715234ee57cf28031fa04ef1
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_en-GB.tar.gz) = 8189015
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_en-GB.tar.gz) = aa9357df23ef480969095ab803026d866b5ae00a031a14a369f93d0bf7613da6
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_en-GB.tar.gz) = 9356956
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_en-GB.tar.gz) = bb0b13924583d679b815019e286e3545c8f41f83847b43e67448072b85335cbf
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_en-GB.tar.gz) = 7242190
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_en-GB.tar.gz) = 60da768c6a8e93ad0ab99d929743bf7fc89c667640f43be92333081343050712
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_en-GB.tar.gz) = 9089023
diff --git a/editors/libreoffice-en_ZA/Makefile b/editors/libreoffice-en_ZA/Makefile
index 8c681b77a0f3..f5b19893a263 100644
--- a/editors/libreoffice-en_ZA/Makefile
+++ b/editors/libreoffice-en_ZA/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= en_ZA
+LO_I18N= en_ZA
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-en_ZA/distinfo b/editors/libreoffice-en_ZA/distinfo
index 8c803ab22273..7d4fc3acef04 100644
--- a/editors/libreoffice-en_ZA/distinfo
+++ b/editors/libreoffice-en_ZA/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_en-ZA.tar.gz) = e110db6b95f3dbc33c57a000c026b4d55968b180016d617b15316c5768876b8a
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_en-ZA.tar.gz) = 8108998
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_en-ZA.tar.gz) = 697b78a98b56326ff6f93588c17ba957a356cdd5cc24778a2443647cea3b5046
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_en-ZA.tar.gz) = 9339302
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_en-ZA.tar.gz) = 98f809fe2a91a5c0e068cb07796ab9dae646046a2e81545a725b30564c1efd0f
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_en-ZA.tar.gz) = 7235317
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_en-ZA.tar.gz) = b5ce3c03896b684d01e46c3d749b1c2999d66d3c1e07aada8c76c4ef9e0b169a
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_en-ZA.tar.gz) = 9069934
diff --git a/editors/libreoffice-eo/Makefile b/editors/libreoffice-eo/Makefile
index c17d53a3cf4b..2a7307abe49d 100644
--- a/editors/libreoffice-eo/Makefile
+++ b/editors/libreoffice-eo/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= eo
+LO_I18N= eo
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-eo/distinfo b/editors/libreoffice-eo/distinfo
index f3642fdb61cb..c39932e46ef7 100644
--- a/editors/libreoffice-eo/distinfo
+++ b/editors/libreoffice-eo/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_eo.tar.gz) = 9595e13c9672c6dc0e8f55db8c2b6c36ab62f9ef6d9473c5b5c36bc225e097ff
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_eo.tar.gz) = 1570224
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_eo.tar.gz) = f4e36767422ea41e777c43d9267a16305f46233fac112b0f952b98c24ebfcb82
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_eo.tar.gz) = 9919864
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_eo.tar.gz) = d466289ec380d5d79e4c27fbc1d34a5ad15262028d7290103146ed5ba80a093a
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_eo.tar.gz) = 687497
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_eo.tar.gz) = a1431f02c742ad1e20e0f6c86c3b88af10dcba115712626b0fdcf7c16720b620
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_eo.tar.gz) = 9658870
diff --git a/editors/libreoffice-es/Makefile b/editors/libreoffice-es/Makefile
index 38017d9d35e9..170195f49e5e 100644
--- a/editors/libreoffice-es/Makefile
+++ b/editors/libreoffice-es/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= es
+LO_I18N= es
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-es/distinfo b/editors/libreoffice-es/distinfo
index 2948df534f83..f5e67e33ed08 100644
--- a/editors/libreoffice-es/distinfo
+++ b/editors/libreoffice-es/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_es.tar.gz) = 02975cd4d7f1e37e6696c05f982921df2e3478b3210a283d2881d256ed9173ba
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_es.tar.gz) = 1651467
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_es.tar.gz) = 1078678718303bd8f3b04c4b3aaa750c79e12a65bf7db970f2a3e9cb6b53da35
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_es.tar.gz) = 11031521
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_es.tar.gz) = e06aa6902c492f7bae0766d1e4ce6beb2a985d12d03533d0d9ecbbf60cb34ee4
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_es.tar.gz) = 800116
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_es.tar.gz) = 7fe763b24587bb3524ec8966a37df3d88919cf03b2f9cf0951d823792e639bdb
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_es.tar.gz) = 10765083
diff --git a/editors/libreoffice-et/Makefile b/editors/libreoffice-et/Makefile
index 83319cecab65..c1e7bd4a59de 100644
--- a/editors/libreoffice-et/Makefile
+++ b/editors/libreoffice-et/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= et
+LO_I18N= et
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-et/distinfo b/editors/libreoffice-et/distinfo
index dc41737912ce..a7a643efbc1f 100644
--- a/editors/libreoffice-et/distinfo
+++ b/editors/libreoffice-et/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_et.tar.gz) = 642f9798b1158c072eea72d95cd704d794fff50291a520e2b31ae00c7d94fa8d
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_et.tar.gz) = 2480502
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_et.tar.gz) = 7b3e5a9e0b7dcae17fc6b461f86a9dfa4cb25a375e310ee2aef26cdddee1d5a1
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_et.tar.gz) = 10429595
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_et.tar.gz) = dada5b6d7ef34092ece92a1c641989002ff67ebb12bb50886c6f75222ef09fd6
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_et.tar.gz) = 1600418
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_et.tar.gz) = d4934e0ba366787ea4c6d1c4f8fe53ac93a1e0bccc1f81b477a1e9c771e21f48
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_et.tar.gz) = 10173988
diff --git a/editors/libreoffice-eu/Makefile b/editors/libreoffice-eu/Makefile
index fcbea4cc2b61..42f1c35cacdf 100644
--- a/editors/libreoffice-eu/Makefile
+++ b/editors/libreoffice-eu/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= eu
+LO_I18N= eu
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-eu/distinfo b/editors/libreoffice-eu/distinfo
index be533ae006af..9f71c63c97e2 100644
--- a/editors/libreoffice-eu/distinfo
+++ b/editors/libreoffice-eu/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_eu.tar.gz) = 77d0ac5373bb80206fd853bb2f91807fad91c810cf2980e1b9900cafcd6b2d22
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_eu.tar.gz) = 1763944
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_eu.tar.gz) = e17e38b76d83223b4a377d2de3f65c3ab05896670bd54162c9de66ef0bb6cc89
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_eu.tar.gz) = 10609382
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_eu.tar.gz) = b016a49bd12f6cc27d50d2ecb5e6d2d402468aa7f59c025fb20e9becd7963fbb
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_eu.tar.gz) = 697560
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_eu.tar.gz) = 1f78eeadd9b0531a859f27811e422467876379ae06a9835d405066f35ac5fd75
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_eu.tar.gz) = 10352106
diff --git a/editors/libreoffice-fa/Makefile b/editors/libreoffice-fa/Makefile
index 405e4b969658..7074e663a96e 100644
--- a/editors/libreoffice-fa/Makefile
+++ b/editors/libreoffice-fa/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= fa
+LO_I18N= fa
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-fa/distinfo b/editors/libreoffice-fa/distinfo
index 75ad4204760f..ef8be07ef60a 100644
--- a/editors/libreoffice-fa/distinfo
+++ b/editors/libreoffice-fa/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_fa.tar.gz) = e211a5504deb0ed61c1964bc381e2458afb40779fc42d21695fdda7c4aaded24
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_fa.tar.gz) = 1617204
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_fa.tar.gz) = 26422e4e67425abacd83a96746199446b793e8c5deae9ff731de87016e42359c
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_fa.tar.gz) = 734355
diff --git a/editors/libreoffice-fi/Makefile b/editors/libreoffice-fi/Makefile
index 315412a1d5bd..f7e7758b38b2 100644
--- a/editors/libreoffice-fi/Makefile
+++ b/editors/libreoffice-fi/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= fi
+LO_I18N= fi
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-fi/distinfo b/editors/libreoffice-fi/distinfo
index 7fcaed0544a8..74b2bf9eb4e1 100644
--- a/editors/libreoffice-fi/distinfo
+++ b/editors/libreoffice-fi/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_fi.tar.gz) = 5d0ed94754a6801500b83a3f0adda5eb990b20a245364a411f16018a638b4cc8
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_fi.tar.gz) = 1584689
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_fi.tar.gz) = 83af899bc27a5cb509affdb9f08341f55d3f488722f06dc2fff685fcb3a16165
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_fi.tar.gz) = 10727726
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_fi.tar.gz) = ae35e3e42fbdc9ded300f47dae24cdcc62abaacdac7fd8c292e417b1f2e99153
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_fi.tar.gz) = 700499
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_fi.tar.gz) = 087662ec5e23f403d35a2e42127bfea17e4a40be8bfed70e5f1647ae71b0475c
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_fi.tar.gz) = 10468067
diff --git a/editors/libreoffice-ga/Makefile b/editors/libreoffice-ga/Makefile
index 0300df6eea6b..16d74b446e2b 100644
--- a/editors/libreoffice-ga/Makefile
+++ b/editors/libreoffice-ga/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= ga
+LO_I18N= ga
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-ga/distinfo b/editors/libreoffice-ga/distinfo
index d4282bde252a..9134fdd1204e 100644
--- a/editors/libreoffice-ga/distinfo
+++ b/editors/libreoffice-ga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ga.tar.gz) = c9a7b1b92dc5f8ed311750dc964bc86b8ae1fbc77560be5171d58c9aad0e6b4d
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ga.tar.gz) = 1596960
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ga.tar.gz) = 41195b7460e484616905925f3a7dccf70979d15480f5b90f79a0b15887905ed9
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ga.tar.gz) = 713355
diff --git a/editors/libreoffice-gd/Makefile b/editors/libreoffice-gd/Makefile
index d75dd508761e..f1511034a191 100644
--- a/editors/libreoffice-gd/Makefile
+++ b/editors/libreoffice-gd/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= gd
+LO_I18N= gd
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-gd/distinfo b/editors/libreoffice-gd/distinfo
index ed3362f52eb2..74628848fa13 100644
--- a/editors/libreoffice-gd/distinfo
+++ b/editors/libreoffice-gd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_gd.tar.gz) = 812d8b4184fc17ffd0ebe02132ee677f958ba40e9dbff47515ad5855b175ab87
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_gd.tar.gz) = 1972971
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_gd.tar.gz) = 369163aa79cf5f15c6694f416f0dfeb6ac98ba74f4a270101378670d30c3e684
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_gd.tar.gz) = 1089955
diff --git a/editors/libreoffice-gl/Makefile b/editors/libreoffice-gl/Makefile
index c2af053756c4..bed6162fe09b 100644
--- a/editors/libreoffice-gl/Makefile
+++ b/editors/libreoffice-gl/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= gl
+LO_I18N= gl
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-gl/distinfo b/editors/libreoffice-gl/distinfo
index e24aced08928..db612a4777b9 100644
--- a/editors/libreoffice-gl/distinfo
+++ b/editors/libreoffice-gl/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_gl.tar.gz) = 442c3df506f4cdd6ee8835da5cb1050139338d85f3ab270043fd989a2f036cfa
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_gl.tar.gz) = 2141875
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_gl.tar.gz) = 3579a9d5fdf24fc6cbc4fadcdd8e04c40fc730800bbce25d0a93ea06f6ca69bc
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_gl.tar.gz) = 10473265
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_gl.tar.gz) = b5388c777b6cc42b5c98ea359fba35c1fa95f1c8a4fd568521f9be67355c0ca4
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_gl.tar.gz) = 1260362
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_gl.tar.gz) = fcd9eccc8af04cad287a04bc58d6ff54e868afe3102a41de4ae69b86357886e0
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_gl.tar.gz) = 10206104
diff --git a/editors/libreoffice-gu/Makefile b/editors/libreoffice-gu/Makefile
index 87f0932ed4ea..a765c2fd5367 100644
--- a/editors/libreoffice-gu/Makefile
+++ b/editors/libreoffice-gu/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= gu
+LO_I18N= gu
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-gu/distinfo b/editors/libreoffice-gu/distinfo
index 360fb230d443..5e90cfaaef02 100644
--- a/editors/libreoffice-gu/distinfo
+++ b/editors/libreoffice-gu/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_gu.tar.gz) = afc39e35431af8d877268abf9e449ed3bb0b9d829ef61d552cf6ace9dc6705b0
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_gu.tar.gz) = 2289747
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_gu.tar.gz) = b261070003165bc28c6f9c8a71a2e39e15bb9d15eb42ad51b21af5c94b41ab71
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_gu.tar.gz) = 9524555
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_gu.tar.gz) = 65f91cd56e9d9f34eeef0f5ea83f007cb05332d2487dc5e5d2e4d7ac34bc5e68
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_gu.tar.gz) = 1407940
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_gu.tar.gz) = fc40960734c198fc7ffd1f7ec7e3cdce5ca60243f9554a9702962f1f32527d41
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_gu.tar.gz) = 9253576
diff --git a/editors/libreoffice-hi/Makefile b/editors/libreoffice-hi/Makefile
index c4a14ec3a187..6627b6344393 100644
--- a/editors/libreoffice-hi/Makefile
+++ b/editors/libreoffice-hi/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= hi
+LO_I18N= hi
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-hi/distinfo b/editors/libreoffice-hi/distinfo
index ad3ba76977ac..ca66f49e929c 100644
--- a/editors/libreoffice-hi/distinfo
+++ b/editors/libreoffice-hi/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_hi.tar.gz) = 968f4b6eb9f1c13d31779434f31ee256e07c2b0b2dde8f3e96a48f7b53c265f1
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_hi.tar.gz) = 1716141
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_hi.tar.gz) = 89ad7ef6e2e4c75d5d98a7e9d15550209043c4af56f88eb3231576d0f12ead53
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_hi.tar.gz) = 10359794
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_hi.tar.gz) = c99ed6580eaa115e1098aa2e4082eb820ceeeacc28129dc378476a7926caabf4
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_hi.tar.gz) = 834656
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_hi.tar.gz) = 7a49370082ba4ba159a76ef63abc08b7243dfaff2958f8b4e60df760b94f988b
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_hi.tar.gz) = 10085410
diff --git a/editors/libreoffice-hr/Makefile b/editors/libreoffice-hr/Makefile
index 5cd886fdcbf9..d35a11052e90 100644
--- a/editors/libreoffice-hr/Makefile
+++ b/editors/libreoffice-hr/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= hr
+LO_I18N= hr
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-hr/distinfo b/editors/libreoffice-hr/distinfo
index 7a74ea068449..17af32845423 100644
--- a/editors/libreoffice-hr/distinfo
+++ b/editors/libreoffice-hr/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_hr.tar.gz) = d998d4ffa9aee3d5ec0666036689587627195d198558c6f4edaddf18fae19c1c
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_hr.tar.gz) = 2349451
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_hr.tar.gz) = b4a290d11f3709d09aa9dc06d08ef566456665669c0dfdc6aa1b8eaecb583f1f
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_hr.tar.gz) = 9730869
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_hr.tar.gz) = 257f8691933bdaa36372858b88adad70a2ddc126829b6f2a26fe69ff5697bcaa
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_hr.tar.gz) = 1466056
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_hr.tar.gz) = 54b0b06cb1bc1ec199166ce7f623465dd4e480671fbe8a37d2934c693ff93be8
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_hr.tar.gz) = 9456198
diff --git a/editors/libreoffice-i18n/Makefile b/editors/libreoffice-i18n/Makefile
index e718ed8cba61..1406eea4c2c8 100644
--- a/editors/libreoffice-i18n/Makefile
+++ b/editors/libreoffice-i18n/Makefile
@@ -15,8 +15,8 @@ LO_LANG_ALL= af am ar as ast be bg bn bn_IN bo br brx bs ca_XV ca cs cy \
da de dgo dz el en_GB en_ZA eo es et eu fa fi fr ga gd gl \
gu he hi hr hu id is it ja ka kk km kn ko kok ks ku lb lo \
lt lv mai mk ml mn mni mr my nb ne nl nn nr nso oc om or \
- pa_IN pl pt_BR pt ro ru rw sa_IN sat sd sh si sk sl sq sr \
- ss st sv sw_TZ ta te tg th tn tr ts tt ug uk uz ve vi xh \
+ pa_IN pl pt_BR pt ro ru rw sa_IN sat sd sh si sid sk sl sq \
+ sr ss st sv sw_TZ ta te tg th tn tr ts tt ug uk uz ve vi xh \
zh_CN zh_TW zu
ar_PORT= arabic/${PORTNAME}
diff --git a/editors/libreoffice-id/Makefile b/editors/libreoffice-id/Makefile
index ebc72036054d..09fbd7fdfde3 100644
--- a/editors/libreoffice-id/Makefile
+++ b/editors/libreoffice-id/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= id
+LO_I18N= id
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-id/distinfo b/editors/libreoffice-id/distinfo
index 9c77468d6850..beb2ca22da19 100644
--- a/editors/libreoffice-id/distinfo
+++ b/editors/libreoffice-id/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_id.tar.gz) = b342b2b1730d87c073131fa34001c26c2768ab9a01a64b05aae572babde0be49
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_id.tar.gz) = 1567889
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_id.tar.gz) = 4018e8767dbca50c4c633be010f611e9cb35c384bea67d6bd706a5c01d608ca6
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_id.tar.gz) = 9668527
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_id.tar.gz) = c915e3f25d7459a91c3eac78a65f07cf473af275e64126c7456286b8ff7dd78f
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_id.tar.gz) = 685474
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_id.tar.gz) = 893fc03400af191ee2cb0be65eaaec6aae1d101d857b626813408f1b05603f5c
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_id.tar.gz) = 9398747
diff --git a/editors/libreoffice-is/Makefile b/editors/libreoffice-is/Makefile
index 013e613ea030..e473c26c54a9 100644
--- a/editors/libreoffice-is/Makefile
+++ b/editors/libreoffice-is/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= is
+LO_I18N= is
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-is/distinfo b/editors/libreoffice-is/distinfo
index 45ad6fb26208..3ca91d6603e7 100644
--- a/editors/libreoffice-is/distinfo
+++ b/editors/libreoffice-is/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_is.tar.gz) = 1a76c403ac693ba66a8cdaaa175613975ddfc28f7d60eea6b9a160e9e58e4667
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_is.tar.gz) = 1592231
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_is.tar.gz) = c71825b76b0254e94e419bf6ad97a36cf58fe1e0799603558da08d64fa6d7c58
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_is.tar.gz) = 9816221
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_is.tar.gz) = 6fb75e353ac8e0a7a8a87ccbfbf7dbab829d960a82e71d09276d91424a560e87
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_is.tar.gz) = 708782
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_is.tar.gz) = 9f72f637f6db6596f17758982eab895a9375cda663513e1bf6bfd9c535d7dc05
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_is.tar.gz) = 9546310
diff --git a/editors/libreoffice-it/Makefile b/editors/libreoffice-it/Makefile
index d9ed3cd6dcfe..415b0229af52 100644
--- a/editors/libreoffice-it/Makefile
+++ b/editors/libreoffice-it/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= it
+LO_I18N= it
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-it/distinfo b/editors/libreoffice-it/distinfo
index 87c7314a2d6a..d326919ad56e 100644
--- a/editors/libreoffice-it/distinfo
+++ b/editors/libreoffice-it/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_it.tar.gz) = e383d2a466752e725f08de692e179514ebdb7076949bc7d711b3b5e3431eeaab
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_it.tar.gz) = 2821440
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_it.tar.gz) = 7b972d728967140d3524b8c2e5ce81900c06621f207c219d10314f35ac06e144
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_it.tar.gz) = 10919643
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_it.tar.gz) = fbd584ecf04a2689c1f05fae93226525a56dec5b4a0d0c94dc028634ba6b0495
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_it.tar.gz) = 1947667
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_it.tar.gz) = 8e7ed531f893e24fb9a582942dbd5c2c979bc7777252e7613f875a10c66eadbd
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_it.tar.gz) = 10657028
diff --git a/editors/libreoffice-ka/Makefile b/editors/libreoffice-ka/Makefile
index ec990ed5461e..cc1ec3bb2688 100644
--- a/editors/libreoffice-ka/Makefile
+++ b/editors/libreoffice-ka/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= ka
+LO_I18N= ka
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-ka/distinfo b/editors/libreoffice-ka/distinfo
index 03c2eb62cd46..d3e277ea3633 100644
--- a/editors/libreoffice-ka/distinfo
+++ b/editors/libreoffice-ka/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ka.tar.gz) = 40ede9a9a94e2b19ac37c8ff1da7e321d207229c0d6ccf98166df3c453094d93
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ka.tar.gz) = 1638888
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ka.tar.gz) = 2c9b9cfc89bad6a2c65763c326ad6e8710b3c00ffd290fce6e2a3802ee39a6f0
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ka.tar.gz) = 10158413
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ka.tar.gz) = f7886711ce9893946a4e2f841934a0d348ad97b76a49e4ec4e208ea9a000fb49
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ka.tar.gz) = 755157
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ka.tar.gz) = e22eae76b904043a30f2bbb8d3d96920bab1d0ded3fac6b0f883891cf695d5dd
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ka.tar.gz) = 9875434
diff --git a/editors/libreoffice-kk/Makefile b/editors/libreoffice-kk/Makefile
index 3a495882a8b5..c70371ac0f25 100644
--- a/editors/libreoffice-kk/Makefile
+++ b/editors/libreoffice-kk/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= kk
+LO_I18N= kk
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-kk/distinfo b/editors/libreoffice-kk/distinfo
index 8c04f207ccb9..10eb00e8f22d 100644
--- a/editors/libreoffice-kk/distinfo
+++ b/editors/libreoffice-kk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_kk.tar.gz) = 233186a139474ba09b92b8eed5405b3209954b05b89242958993c53c40fa8815
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_kk.tar.gz) = 1635441
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_kk.tar.gz) = 9867c633d2343b8fea72a228fb4381e12b1642b791b7dfcedc821b95f90bff34
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_kk.tar.gz) = 759281
diff --git a/editors/libreoffice-km/Makefile b/editors/libreoffice-km/Makefile
index 6e7e1a0e74be..6945877fdded 100644
--- a/editors/libreoffice-km/Makefile
+++ b/editors/libreoffice-km/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= km
+LO_I18N= km
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-km/distinfo b/editors/libreoffice-km/distinfo
index ad16a06413a0..413a52c1aeea 100644
--- a/editors/libreoffice-km/distinfo
+++ b/editors/libreoffice-km/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_km.tar.gz) = 0be02f49e3657db81b37baa68a8252d2767e4a3216e94e4e4d64882095c49fb4
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_km.tar.gz) = 1808658
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_km.tar.gz) = f2aebfc13dbbd59f28ec273319328a38316d8345d1342b0f189e536c9ecb1c9a
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_km.tar.gz) = 13809007
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_km.tar.gz) = daa9bbfa4cef8507047095c849be54445bb30c8a5981e6ede9cfc9e809b72aab
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_km.tar.gz) = 776739
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_km.tar.gz) = 3ecd9aa0ed18efaeda852e74304ccaabf74c10f7cb173f4d56b8e1d42d80baae
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_km.tar.gz) = 13534485
diff --git a/editors/libreoffice-kn/distinfo b/editors/libreoffice-kn/distinfo
index ac13e0a45c75..dabf06b4c0b6 100644
--- a/editors/libreoffice-kn/distinfo
+++ b/editors/libreoffice-kn/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_kn.tar.gz) = 490ecfb9da392a9ebeaaee470db5a1436e4f8de3531a90668b9bd1762f07ba2a
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_kn.tar.gz) = 1661949
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_kn.tar.gz) = 55634318e43574a164a3528d63370e75df145dc827f25c124508d87f128735ff
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_kn.tar.gz) = 777902
diff --git a/editors/libreoffice-kok/Makefile b/editors/libreoffice-kok/Makefile
index 466560d2d519..ad1a7c9afc28 100644
--- a/editors/libreoffice-kok/Makefile
+++ b/editors/libreoffice-kok/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= kok
+LO_I18N= kok
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-kok/distinfo b/editors/libreoffice-kok/distinfo
index 46918f657074..5895f530621d 100644
--- a/editors/libreoffice-kok/distinfo
+++ b/editors/libreoffice-kok/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_kok.tar.gz) = c317d503185f51d1962ab9bfa639a3c9148a5d7ef5d5adc99d7ec1381b393cfd
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_kok.tar.gz) = 1627911
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_kok.tar.gz) = c8af7e0edbde22303fcacfce603e23a0b6cc7e11dc2aed779e94aeec1fa58226
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_kok.tar.gz) = 745247
diff --git a/editors/libreoffice-ks/Makefile b/editors/libreoffice-ks/Makefile
index b481c07fb122..99f31289be74 100644
--- a/editors/libreoffice-ks/Makefile
+++ b/editors/libreoffice-ks/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= ks
+LO_I18N= ks
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-ks/distinfo b/editors/libreoffice-ks/distinfo
index a7c06fbc83dc..bd3788d51289 100644
--- a/editors/libreoffice-ks/distinfo
+++ b/editors/libreoffice-ks/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ks.tar.gz) = 8858f1c9d82fad937f7695b1605f327880b58e1e8199d74e3f2b6218380ece44
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ks.tar.gz) = 1632651
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ks.tar.gz) = 252b7e9e63dc5a76d9e207c1cc0167a6f15309e93c8205d7a58c745b6d91e9bf
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ks.tar.gz) = 750413
diff --git a/editors/libreoffice-ku/Makefile b/editors/libreoffice-ku/Makefile
index 25499a5ceff7..db7c9a3ce946 100644
--- a/editors/libreoffice-ku/Makefile
+++ b/editors/libreoffice-ku/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= ku
+LO_I18N= ku
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-ku/distinfo b/editors/libreoffice-ku/distinfo
index 79bd9da8ccfe..3ab06f40b073 100644
--- a/editors/libreoffice-ku/distinfo
+++ b/editors/libreoffice-ku/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ku.tar.gz) = 7350516ec560025e9d991099dc7d9f698d046614cc25558aef786ec82007c6a5
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ku.tar.gz) = 1661702
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ku.tar.gz) = 9f6d639fc23950c1d2cb19db6b8c0f3a3de139fcad245047972f11de1c24de27
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ku.tar.gz) = 776177
diff --git a/editors/libreoffice-lb/Makefile b/editors/libreoffice-lb/Makefile
index c784c76b5b9a..5f3c9a58aa8d 100644
--- a/editors/libreoffice-lb/Makefile
+++ b/editors/libreoffice-lb/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
LO_I18N= lb
-LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-lb/distinfo b/editors/libreoffice-lb/distinfo
index 75cf8d493b1a..9873eb924aa6 100644
--- a/editors/libreoffice-lb/distinfo
+++ b/editors/libreoffice-lb/distinfo
@@ -1,4 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_lb.tar.gz) = 1c7099d89db595381e03313f21951b0af99f898ea1488506046af07664230d07
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_lb.tar.gz) = 1567327
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_lb.tar.gz) = 40b2dc774d21feddf1385bcd7005481cf867a5d2536cabb5e2c4fce914004ce0
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_lb.tar.gz) = 9410649
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_lb.tar.gz) = 018b9c60676aeb67cbd735c12eb92bb7a4e24054c62afe3d8e5be7ea3c0d9d8c
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_lb.tar.gz) = 682534
diff --git a/editors/libreoffice-lo/Makefile b/editors/libreoffice-lo/Makefile
index f3d3ce6c4bcb..2bbae7e247e0 100644
--- a/editors/libreoffice-lo/Makefile
+++ b/editors/libreoffice-lo/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= lo
+LO_I18N= lo
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-lo/distinfo b/editors/libreoffice-lo/distinfo
index 9ee6a321187b..46707ea0a2a0 100644
--- a/editors/libreoffice-lo/distinfo
+++ b/editors/libreoffice-lo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_lo.tar.gz) = 76ee7a6a2d065e4877f094b6a085731d417f39f3b09b3671f43d9afd63c0078b
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_lo.tar.gz) = 1621998
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_lo.tar.gz) = 34a671bd64bb4c7ff7cb3a11fcd801cd88784adc1b07192027e77bf5857afaf2
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_lo.tar.gz) = 739765
diff --git a/editors/libreoffice-lt/Makefile b/editors/libreoffice-lt/Makefile
index 383d2a538414..8021224ccfb3 100644
--- a/editors/libreoffice-lt/Makefile
+++ b/editors/libreoffice-lt/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= lt
+LO_I18N= lt
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-lt/distinfo b/editors/libreoffice-lt/distinfo
index b6a394c0ac20..e7192a7ce6a5 100644
--- a/editors/libreoffice-lt/distinfo
+++ b/editors/libreoffice-lt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_lt.tar.gz) = b9ff38c72bb5c7e65341eaf77d1961c2f9c603a2d3fdf3c4550cf8860907c253
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_lt.tar.gz) = 1961675
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_lt.tar.gz) = e22d6428455a53c031f2a4a8a738d419dd7e06108e21be31f635371dd2603f00
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_lt.tar.gz) = 1039765
diff --git a/editors/libreoffice-lv/Makefile b/editors/libreoffice-lv/Makefile
index 37c92d180c92..3d030b2795bb 100644
--- a/editors/libreoffice-lv/Makefile
+++ b/editors/libreoffice-lv/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= lv
+LO_I18N= lv
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-lv/distinfo b/editors/libreoffice-lv/distinfo
index 7935921db0d8..b47f9d777d88 100644
--- a/editors/libreoffice-lv/distinfo
+++ b/editors/libreoffice-lv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_lv.tar.gz) = f59f547cd4109df70f232b360bf679228b0193f8270a255649c76a0a6c10805b
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_lv.tar.gz) = 2344959
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_lv.tar.gz) = e35586c933f9d624e995598e6c1203054c36264dbf7b6431342fc00b36bdcfff
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_lv.tar.gz) = 1461957
diff --git a/editors/libreoffice-mai/Makefile b/editors/libreoffice-mai/Makefile
index f54dca8e457d..4eb0a276a0fd 100644
--- a/editors/libreoffice-mai/Makefile
+++ b/editors/libreoffice-mai/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= mai
+LO_I18N= mai
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-mai/distinfo b/editors/libreoffice-mai/distinfo
index a82805c279c9..4ea38d7b7592 100644
--- a/editors/libreoffice-mai/distinfo
+++ b/editors/libreoffice-mai/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_mai.tar.gz) = 63f79e7ec83f7924817c83db7e0603ead9fa47766fc45863360236c9871be622
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_mai.tar.gz) = 1640457
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_mai.tar.gz) = f2964d95aebfea31ee58cb79588e9120d413dcbeabb15a05c165e74de8fb0325
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_mai.tar.gz) = 756024
diff --git a/editors/libreoffice-mk/Makefile b/editors/libreoffice-mk/Makefile
index 87cf21bb305a..ef0375598681 100644
--- a/editors/libreoffice-mk/Makefile
+++ b/editors/libreoffice-mk/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= mk
+LO_I18N= mk
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-mk/distinfo b/editors/libreoffice-mk/distinfo
index 7f650ea93d32..5d9f10f340b5 100644
--- a/editors/libreoffice-mk/distinfo
+++ b/editors/libreoffice-mk/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_mk.tar.gz) = 588081b04d3a9d00091fd71043bad7defb4f40cd94d76219d5f3b7ea08d02782
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_mk.tar.gz) = 1637890
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_mk.tar.gz) = 07b43ae7463adc39f5369789d12b09198e39860f225311a02091fcf65b68e2c8
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_mk.tar.gz) = 10429789
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_mk.tar.gz) = c364eae0395fcbfc91038c5c8de3f2cccb818a23dbc103dd0c16b5e7da98af22
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_mk.tar.gz) = 754851
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_mk.tar.gz) = a89e6304892e05c13d2383400b81f0d2bbdab81327a4a79a5e04fdddc202a413
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_mk.tar.gz) = 10151463
diff --git a/editors/libreoffice-ml/Makefile b/editors/libreoffice-ml/Makefile
index e25a1e063710..05301f8197b3 100644
--- a/editors/libreoffice-ml/Makefile
+++ b/editors/libreoffice-ml/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= ml
+LO_I18N= ml
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-ml/distinfo b/editors/libreoffice-ml/distinfo
index 76df19e526c2..5be8c10c51d4 100644
--- a/editors/libreoffice-ml/distinfo
+++ b/editors/libreoffice-ml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ml.tar.gz) = 3717f057ec625bf62eb8bde500bbe9213890e25352c6aa1b9b2d86eb8f9d3379
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ml.tar.gz) = 1673503
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ml.tar.gz) = 9f12802002c06ef361673afb417187a14ec17f0b2007c69cf9efb52fe0f66850
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ml.tar.gz) = 791118
diff --git a/editors/libreoffice-mn/Makefile b/editors/libreoffice-mn/Makefile
index e7a3702b79b8..4cf35854e245 100644
--- a/editors/libreoffice-mn/Makefile
+++ b/editors/libreoffice-mn/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= mn
+LO_I18N= mn
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-mn/distinfo b/editors/libreoffice-mn/distinfo
index 57d2e8ee36a4..01ec40987426 100644
--- a/editors/libreoffice-mn/distinfo
+++ b/editors/libreoffice-mn/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_mn.tar.gz) = d9fa527b66ae1934d5bf497c58aa8c7c4134a8a9c98d36e73557c8ca5ebd4045
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_mn.tar.gz) = 1641324
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_mn.tar.gz) = 39726e56f1a297c1cd2e1584604d4bebaf7e71aed893056c8d9d1be2c63d4024
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_mn.tar.gz) = 758112
diff --git a/editors/libreoffice-mni/Makefile b/editors/libreoffice-mni/Makefile
index 874a3fa6a6b7..59394596848d 100644
--- a/editors/libreoffice-mni/Makefile
+++ b/editors/libreoffice-mni/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= mni
+LO_I18N= mni
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-mni/distinfo b/editors/libreoffice-mni/distinfo
index fc3ff5ac421c..b32670c9ae56 100644
--- a/editors/libreoffice-mni/distinfo
+++ b/editors/libreoffice-mni/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_mni.tar.gz) = fd6a6a034b304e395981b8ec5008840f8289273e3e682a3484d7c6a04da705d9
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_mni.tar.gz) = 1635001
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_mni.tar.gz) = 0fccfff90ea6d704d68faa7f0725abeacdca68ae76ed38f70bbb7efde1d84752
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_mni.tar.gz) = 751592
diff --git a/editors/libreoffice-mr/Makefile b/editors/libreoffice-mr/Makefile
index 60d03bee6fd0..c55feb55fcab 100644
--- a/editors/libreoffice-mr/Makefile
+++ b/editors/libreoffice-mr/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= mr
+LO_I18N= mr
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-mr/distinfo b/editors/libreoffice-mr/distinfo
index fb06992e2ddb..4bff9d55cb53 100644
--- a/editors/libreoffice-mr/distinfo
+++ b/editors/libreoffice-mr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_mr.tar.gz) = b67a46a7410c0dc01a6c88a186e5bca279b21e317d7989d232c4e1a8fa75c5d2
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_mr.tar.gz) = 1655704
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_mr.tar.gz) = 47b42e08652ebe5bde7a3032bccd0bf7b5d7664cb7c6e0624ff2789e98722e9b
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_mr.tar.gz) = 772868
diff --git a/editors/libreoffice-my/Makefile b/editors/libreoffice-my/Makefile
index c86e2276a523..4d6b31051d9d 100644
--- a/editors/libreoffice-my/Makefile
+++ b/editors/libreoffice-my/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= my
+LO_I18N= my
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-my/distinfo b/editors/libreoffice-my/distinfo
index ade14be3a350..01dc19782951 100644
--- a/editors/libreoffice-my/distinfo
+++ b/editors/libreoffice-my/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_my.tar.gz) = eb7c9c2dba92f92cd24c1c9c0123576c9697235cd9c0022bbc651867f4972443
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_my.tar.gz) = 1678465
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_my.tar.gz) = 555b83afbdd38a7bb6f573d58f497122d46acf6194e3440a102fce54c4d21f8b
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_my.tar.gz) = 794762
diff --git a/editors/libreoffice-nb/Makefile b/editors/libreoffice-nb/Makefile
index cf35641e8868..da57f5905b42 100644
--- a/editors/libreoffice-nb/Makefile
+++ b/editors/libreoffice-nb/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= nb
+LO_I18N= nb
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-nb/distinfo b/editors/libreoffice-nb/distinfo
index f50360c511b0..abe54c42538b 100644
--- a/editors/libreoffice-nb/distinfo
+++ b/editors/libreoffice-nb/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_nb.tar.gz) = 087537213876c68781cea2f2f9808ee57745ad13f9cda1dbb02b3a861d822203
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_nb.tar.gz) = 4789100
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_nb.tar.gz) = 8866ee34042868a3e84516fcf4df5c96b65dc8c6c591e2a0693326284bbc6bd1
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_nb.tar.gz) = 10636560
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_nb.tar.gz) = cb6b903093a0233adafab3b9e40e9032e46299fbf71383a354bfb3fc8740f1a4
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_nb.tar.gz) = 3907259
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_nb.tar.gz) = df3e186e736b4c846986e7ad45cce2a8ec611b4b4221acc2662fd2e353d7a9da
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_nb.tar.gz) = 10378453
diff --git a/editors/libreoffice-ne/Makefile b/editors/libreoffice-ne/Makefile
index 17bffa6c1ee8..b150ab37ebcc 100644
--- a/editors/libreoffice-ne/Makefile
+++ b/editors/libreoffice-ne/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= ne
+LO_I18N= ne
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-ne/distinfo b/editors/libreoffice-ne/distinfo
index e7b43d6f995b..ea4a53322738 100644
--- a/editors/libreoffice-ne/distinfo
+++ b/editors/libreoffice-ne/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ne.tar.gz) = 0e231817c7ec9b78aca9497d80f9d7559a85272d5513f272a398f6082efb851a
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ne.tar.gz) = 2031530
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ne.tar.gz) = 71b59731a92a58bc42a53a54a436655579619515c6f02ce71cec81a2c4ec4bd1
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ne.tar.gz) = 13306237
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ne.tar.gz) = d72c3fe606996b9086d277ed99bc5fd316890ad27264a3d71ab3aa4851836332
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ne.tar.gz) = 1149694
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ne.tar.gz) = d13ce3878788d2e297d40473dad1b2ba0b224f1146490acfd320b589707d5c8d
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ne.tar.gz) = 13002044
diff --git a/editors/libreoffice-nl/distinfo b/editors/libreoffice-nl/distinfo
index 75cd890f0dc0..f0657c2427ab 100644
--- a/editors/libreoffice-nl/distinfo
+++ b/editors/libreoffice-nl/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_nl.tar.gz) = ff7407139653e816f6672069a898296dc050bd9fdf22a4640a33129fc2dea1be
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_nl.tar.gz) = 2311736
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_nl.tar.gz) = 82c28925d9acf96414d58867c7ec8398cd54b2580eb664e94aceaa0a2d49eaf9
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_nl.tar.gz) = 10696584
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_nl.tar.gz) = 01d804f791456d9d4e61598e1e2f729c6f2c522c335cbf44208bf655eb5bf980
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_nl.tar.gz) = 1401856
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_nl.tar.gz) = 16489905e6d8520749c9105a777fb96764b7f7266e64cca4b1945dee5ea6911e
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_nl.tar.gz) = 10441052
diff --git a/editors/libreoffice-nn/Makefile b/editors/libreoffice-nn/Makefile
index abde8d41eb96..0a224b3590fe 100644
--- a/editors/libreoffice-nn/Makefile
+++ b/editors/libreoffice-nn/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= nn
+LO_I18N= nn
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-nn/distinfo b/editors/libreoffice-nn/distinfo
index 37a0d710f14d..21b059febcbd 100644
--- a/editors/libreoffice-nn/distinfo
+++ b/editors/libreoffice-nn/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_nn.tar.gz) = 1fd515b6079f9f4862dda10bb25c07a0ec6a71b07d83713a5cbfb458b29c60b7
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_nn.tar.gz) = 4794515
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_nn.tar.gz) = 7ac5928c75961f3c0fdbcd8e15ec301c611b0ff2fdcedea28f29a509eff035fe
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_nn.tar.gz) = 10209097
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_nn.tar.gz) = b1c18e5bb30e380b76176843f73b80f827d955b4d86f684a41d5bb5a7e5fcf5d
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_nn.tar.gz) = 3907005
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_nn.tar.gz) = 3ee001dede616990ce7e95b04e9a111acc764a85a7daf4d2b924af94386e1515
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_nn.tar.gz) = 10047905
diff --git a/editors/libreoffice-nr/Makefile b/editors/libreoffice-nr/Makefile
index 00c05bf74a29..fc354a37b66f 100644
--- a/editors/libreoffice-nr/Makefile
+++ b/editors/libreoffice-nr/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= nr
+LO_I18N= nr
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-nr/distinfo b/editors/libreoffice-nr/distinfo
index c086cf7fed6d..e9db6906b977 100644
--- a/editors/libreoffice-nr/distinfo
+++ b/editors/libreoffice-nr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_nr.tar.gz) = deb71bcaaec04f95b1e9e190824e8183e8623a393c7eb76c7b5c472376872bb6
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_nr.tar.gz) = 1607962
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_nr.tar.gz) = 9248d73325b7cae9f43b95a2b63b5e28c2676f6bad4333712659e9f5ed38f95d
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_nr.tar.gz) = 722392
diff --git a/editors/libreoffice-nso/Makefile b/editors/libreoffice-nso/Makefile
index 30a9cba3e8d8..7df4b1e3d3d1 100644
--- a/editors/libreoffice-nso/Makefile
+++ b/editors/libreoffice-nso/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= nso
+LO_I18N= nso
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-nso/distinfo b/editors/libreoffice-nso/distinfo
index 259ffe07405a..7a51183bb958 100644
--- a/editors/libreoffice-nso/distinfo
+++ b/editors/libreoffice-nso/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_nso.tar.gz) = 1c160330142148fb9cd43e70c24f2f9112b10b366c23d65423dc22d4a34e7551
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_nso.tar.gz) = 1598363
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_nso.tar.gz) = efb604fa70bb6888077270df8bbda1fd1b336a474bea4075ed84dcd6f495d625
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_nso.tar.gz) = 714791
diff --git a/editors/libreoffice-oc/Makefile b/editors/libreoffice-oc/Makefile
index 153415944381..b8b7440ecd9e 100644
--- a/editors/libreoffice-oc/Makefile
+++ b/editors/libreoffice-oc/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= oc
+LO_I18N= oc
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-oc/distinfo b/editors/libreoffice-oc/distinfo
index 5f609d745652..96ec5c28cad4 100644
--- a/editors/libreoffice-oc/distinfo
+++ b/editors/libreoffice-oc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_oc.tar.gz) = c51cf3e2f60b91433a81c46d4e9bdf6d2e0fa59a952dc48349ce421d9954eb3a
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_oc.tar.gz) = 1787470
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_oc.tar.gz) = ab3b5b1daf8331dbd4f8e741f5a921c269037577726083211d5ac1eb62e25f11
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_oc.tar.gz) = 904731
diff --git a/editors/libreoffice-om/Makefile b/editors/libreoffice-om/Makefile
index 9eea9eb4d4dd..72951f0e20b1 100644
--- a/editors/libreoffice-om/Makefile
+++ b/editors/libreoffice-om/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= om
+LO_I18N= om
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-om/distinfo b/editors/libreoffice-om/distinfo
index f2899fa5e61e..4f9c594c1a07 100644
--- a/editors/libreoffice-om/distinfo
+++ b/editors/libreoffice-om/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_om.tar.gz) = d7912cf3a08a7546d02f8ffb9f946eee3e6796b365d00af4fa375dc6cf8374c5
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_om.tar.gz) = 1578635
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_om.tar.gz) = d6ccf3b04661a0b786911519f83efc663a0cbfa4bc4f64130455638265625d04
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_om.tar.gz) = 10967073
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_om.tar.gz) = 4945e458af97b36211a267e81d78817960592af8efdd75903948c161abeeca57
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_om.tar.gz) = 696372
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_om.tar.gz) = b072b36a7778148d7936da9a87cdb20a5c3c56fa99e2d65d2e73bcb96945d490
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_om.tar.gz) = 10703222
diff --git a/editors/libreoffice-or/Makefile b/editors/libreoffice-or/Makefile
index 6f15382223de..6c9d3895ed05 100644
--- a/editors/libreoffice-or/Makefile
+++ b/editors/libreoffice-or/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= or
+LO_I18N= or
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-or/distinfo b/editors/libreoffice-or/distinfo
index 6cde8b5c91c1..a77dc2c953a0 100644
--- a/editors/libreoffice-or/distinfo
+++ b/editors/libreoffice-or/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_or.tar.gz) = 885541b35612ec10d94e365f65ab1b7dcda2b12dd14f0f797ed89b00e5d5b49d
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_or.tar.gz) = 1650859
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_or.tar.gz) = 2e1dd7368033339802d6410612da4a18d063d402c7591a4bb15bbd7f0e89b39c
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_or.tar.gz) = 768982
diff --git a/editors/libreoffice-pa_IN/Makefile b/editors/libreoffice-pa_IN/Makefile
index 738ec6fd1f20..454c1b0302e2 100644
--- a/editors/libreoffice-pa_IN/Makefile
+++ b/editors/libreoffice-pa_IN/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= pa_IN
+LO_I18N= pa_IN
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-pa_IN/distinfo b/editors/libreoffice-pa_IN/distinfo
index ac9fc14f6271..7949d4a2cddc 100644
--- a/editors/libreoffice-pa_IN/distinfo
+++ b/editors/libreoffice-pa_IN/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_pa-IN.tar.gz) = e99794af82a53594bfb481f891907092fc96d4491f0a0080400b58522fd83379
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_pa-IN.tar.gz) = 1630661
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_pa-IN.tar.gz) = 3867bcf22030f33b265c4300375339017bf9a60845a86dfdaeac4f8f661b3431
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_pa-IN.tar.gz) = 747994
diff --git a/editors/libreoffice-ro/Makefile b/editors/libreoffice-ro/Makefile
index 9ca58e0a8265..f82d03734dd6 100644
--- a/editors/libreoffice-ro/Makefile
+++ b/editors/libreoffice-ro/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= ro
+LO_I18N= ro
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-ro/distinfo b/editors/libreoffice-ro/distinfo
index 3aac079a85be..2a087e4f15ad 100644
--- a/editors/libreoffice-ro/distinfo
+++ b/editors/libreoffice-ro/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ro.tar.gz) = a17f43a534e48dbe14e8d289b0a1671f94a30951d711f074f49dbc0007fd578c
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ro.tar.gz) = 3410352
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ro.tar.gz) = 68766e5a347c724726f6ffd9c9e97c173b59fcd6f1b6b1c4b04fdda49f694df7
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ro.tar.gz) = 9926858
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ro.tar.gz) = de2d7a341b7a2dd1628bd8b3c2265c3f94ea0ae37b40786631a6be6093779a6b
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ro.tar.gz) = 2532933
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ro.tar.gz) = 42d3dbeadb6eb7d002b504b134e0ccb737e65a5db2f138f0b4723baa571f8d36
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ro.tar.gz) = 9059191
diff --git a/editors/libreoffice-rw/Makefile b/editors/libreoffice-rw/Makefile
index 3e7a3a2c9af1..a7c361def4c1 100644
--- a/editors/libreoffice-rw/Makefile
+++ b/editors/libreoffice-rw/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= rw
+LO_I18N= rw
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-rw/distinfo b/editors/libreoffice-rw/distinfo
index 81f4f619ef42..fa29db8c46a6 100644
--- a/editors/libreoffice-rw/distinfo
+++ b/editors/libreoffice-rw/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_rw.tar.gz) = 98ae3183186648d3b2497dc56cd22146f7cc5c2dff366d589882e968f075ab7c
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_rw.tar.gz) = 1589122
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_rw.tar.gz) = b5c4eebcb8dbab0e27389f48bada7c103fa5f8c7725775dbad50d0be6cca3525
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_rw.tar.gz) = 706138
diff --git a/editors/libreoffice-sa_IN/Makefile b/editors/libreoffice-sa_IN/Makefile
index 48b19c2a5762..5b582151e64a 100644
--- a/editors/libreoffice-sa_IN/Makefile
+++ b/editors/libreoffice-sa_IN/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= sa_IN
+LO_I18N= sa_IN
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-sa_IN/distinfo b/editors/libreoffice-sa_IN/distinfo
index 9ee73663955c..66de6eca43a3 100644
--- a/editors/libreoffice-sa_IN/distinfo
+++ b/editors/libreoffice-sa_IN/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sa-IN.tar.gz) = 5df22f920179f9518343f5bfefe1d2bba489d7e811535342c55208cc2acaa92a
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sa-IN.tar.gz) = 1637352
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sa-IN.tar.gz) = 2769ea5046bf121f97fb1342d8c94e2288d22b73b7cdc3452a0fb7c2f5f822aa
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sa-IN.tar.gz) = 755044
diff --git a/editors/libreoffice-sat/Makefile b/editors/libreoffice-sat/Makefile
index 3888814a7cf5..66942f267b8a 100644
--- a/editors/libreoffice-sat/Makefile
+++ b/editors/libreoffice-sat/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= sat
+LO_I18N= sat
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-sat/distinfo b/editors/libreoffice-sat/distinfo
index ab597cc29d17..25f3ea15c7ed 100644
--- a/editors/libreoffice-sat/distinfo
+++ b/editors/libreoffice-sat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sat.tar.gz) = f6dc5407c70c82ec59ea249626b0dd2f0e70f512d525d60a52ee595cf4827fc2
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sat.tar.gz) = 1624658
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sat.tar.gz) = 6d34f80af7185c19656a285752a7398b212eaa4b22bfd3c37db2e39e42fe7033
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sat.tar.gz) = 740683
diff --git a/editors/libreoffice-sd/Makefile b/editors/libreoffice-sd/Makefile
index e7f15e16e694..90757b2d5902 100644
--- a/editors/libreoffice-sd/Makefile
+++ b/editors/libreoffice-sd/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= sd
+LO_I18N= sd
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-sd/distinfo b/editors/libreoffice-sd/distinfo
index e7b0a00ec6ac..e9a66a3dc68c 100644
--- a/editors/libreoffice-sd/distinfo
+++ b/editors/libreoffice-sd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sd.tar.gz) = ae080b0febd558339fe1af9ff2d5400f3cc61033333778a06e96dd4ff029e08d
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sd.tar.gz) = 1624388
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sd.tar.gz) = 7429b7610fad944e08bf33b6f5bbdd2c57bf83b5567e07bdbe8fb08e0231f9a5
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sd.tar.gz) = 741445
diff --git a/editors/libreoffice-sh/Makefile b/editors/libreoffice-sh/Makefile
index f70ac1f18147..d03f01b6e121 100644
--- a/editors/libreoffice-sh/Makefile
+++ b/editors/libreoffice-sh/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= sh
+LO_I18N= sh
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-sh/distinfo b/editors/libreoffice-sh/distinfo
index 77a17b4018ce..c69d1b926b42 100644
--- a/editors/libreoffice-sh/distinfo
+++ b/editors/libreoffice-sh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sh.tar.gz) = 7870297f1e763616ccff60e0702d3a3cf643de8ad0353d4802fff7cf48606a34
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sh.tar.gz) = 2776740
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sh.tar.gz) = 53cda93d9ebfc378459659a1dc5356bbe7f3e4a4a36706b177b462fd2f63faf7
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sh.tar.gz) = 1890970
diff --git a/editors/libreoffice-si/Makefile b/editors/libreoffice-si/Makefile
index 05b9fd89de1f..782a83d18b3b 100644
--- a/editors/libreoffice-si/Makefile
+++ b/editors/libreoffice-si/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= si
+LO_I18N= si
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-si/distinfo b/editors/libreoffice-si/distinfo
index 52de904f8688..5c8ae5838ae1 100644
--- a/editors/libreoffice-si/distinfo
+++ b/editors/libreoffice-si/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_si.tar.gz) = 32a813b026e59c5b65ff5eb75ee266101be1ae3a5c7dc5a6f79c7fe2bab485b4
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_si.tar.gz) = 1939933
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_si.tar.gz) = 1d17ea778fc58d4e8613b7ce8f6af4861473b82f0bb0e01808b45fec743b3f32
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_si.tar.gz) = 10146226
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_si.tar.gz) = eb8994fcddf9214f97dba3e72c3fbb5152eace2c294eaa92bf4e4d44c0bc719c
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_si.tar.gz) = 1055557
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_si.tar.gz) = e380c9a82be048e062d0cad14748325e35f8ed4b6c01fff10671dfdfea9d5334
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_si.tar.gz) = 9861211
diff --git a/editors/libreoffice-sid/Makefile b/editors/libreoffice-sid/Makefile
new file mode 100644
index 000000000000..17261c6b13a3
--- /dev/null
+++ b/editors/libreoffice-sid/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+LO_I18N= sid
+
+.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
+
+.include <bsd.port.mk>
diff --git a/editors/libreoffice-sid/distinfo b/editors/libreoffice-sid/distinfo
new file mode 100644
index 000000000000..482b95b1daf1
--- /dev/null
+++ b/editors/libreoffice-sid/distinfo
@@ -0,0 +1,2 @@
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sid.tar.gz) = fe9b20825674ff404ee625eb6d824b26bd65a9d97a29045fd71c9a5c1901d7db
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sid.tar.gz) = 684649
diff --git a/editors/libreoffice-sid/pkg-descr b/editors/libreoffice-sid/pkg-descr
new file mode 100644
index 000000000000..4390538da4dd
--- /dev/null
+++ b/editors/libreoffice-sid/pkg-descr
@@ -0,0 +1,3 @@
+Localized messages and documentation for libreoffice
+
+WWW: http://www.libreoffice.org
diff --git a/editors/libreoffice-sk/Makefile b/editors/libreoffice-sk/Makefile
index a66f68ea5ec1..853ce361825c 100644
--- a/editors/libreoffice-sk/Makefile
+++ b/editors/libreoffice-sk/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= sk
+LO_I18N= sk
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-sk/distinfo b/editors/libreoffice-sk/distinfo
index 7142c60931f1..b52c6ac1101d 100644
--- a/editors/libreoffice-sk/distinfo
+++ b/editors/libreoffice-sk/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sk.tar.gz) = 886862ec66e117032a75397d6235103458dca883f9e18cdcf45a828cbd5b78b8
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sk.tar.gz) = 2974265
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_sk.tar.gz) = 6fd118190ce3d1107354ca77794b7de489eca6aa83a66a22b85dd33a0a0f9df6
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_sk.tar.gz) = 10507225
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sk.tar.gz) = 74fa017d0e56926437db7b5df864d883fcf758a9c5e9dc665f98142301fc9eb8
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sk.tar.gz) = 2085062
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_sk.tar.gz) = 823030776f305c953f30e74042a794c79c6e96635c2ba1d7d19b6770797fae79
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_sk.tar.gz) = 10243546
diff --git a/editors/libreoffice-sl/Makefile b/editors/libreoffice-sl/Makefile
index efb612e47042..5d693ea603ad 100644
--- a/editors/libreoffice-sl/Makefile
+++ b/editors/libreoffice-sl/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= sl
+LO_I18N= sl
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-sl/distinfo b/editors/libreoffice-sl/distinfo
index 546d0799f8f7..063b00b995b6 100644
--- a/editors/libreoffice-sl/distinfo
+++ b/editors/libreoffice-sl/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sl.tar.gz) = 699f61266618fa9e2afb27de3ae27ca3ef3c7260dc4cc829cd1b2d61207a7325
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sl.tar.gz) = 3128723
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_sl.tar.gz) = 617e88a90a15f252446c5e50b3107995b129718580d60fc7a57433929d56e21e
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_sl.tar.gz) = 10690522
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sl.tar.gz) = 8bb39baf0452802588d076de0af9fb93029705a3e6bbd4028420a2d41bb49519
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sl.tar.gz) = 2248310
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_sl.tar.gz) = 28ebec8cb9e64019a0023779f07fab0bcc7d19315eb74244b4f4e2406eb8ad75
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_sl.tar.gz) = 10440818
diff --git a/editors/libreoffice-sq/Makefile b/editors/libreoffice-sq/Makefile
index 89ec779b3d0b..392eda3cda97 100644
--- a/editors/libreoffice-sq/Makefile
+++ b/editors/libreoffice-sq/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= sq
+LO_I18N= sq
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-sq/distinfo b/editors/libreoffice-sq/distinfo
index 5bce103bdceb..acdffe2a4b7f 100644
--- a/editors/libreoffice-sq/distinfo
+++ b/editors/libreoffice-sq/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sq.tar.gz) = 9d06ea1942fe18cb1f06c42f97df6ee066af362dd65ae630a78b0face4bdcfe0
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sq.tar.gz) = 1597530
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_sq.tar.gz) = 1a3076a5a69ba39197edd6c9b9cdd6b810911d06c0e679ceaaa61ffcc640bd51
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_sq.tar.gz) = 9829117
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sq.tar.gz) = f2842b83606aa6b2ad082985f8cd3b0c84f05c5184bd7b9d484ceb754ef763c8
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sq.tar.gz) = 714244
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_sq.tar.gz) = 23b35c7e2bdd57f14c3287d4acf65c3d3952f2c5e147878b48cb81a9109a56b2
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_sq.tar.gz) = 9558544
diff --git a/editors/libreoffice-sr/Makefile b/editors/libreoffice-sr/Makefile
index 804a6992ce09..dbe0448fdc79 100644
--- a/editors/libreoffice-sr/Makefile
+++ b/editors/libreoffice-sr/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= sr
+LO_I18N= sr
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-sr/distinfo b/editors/libreoffice-sr/distinfo
index 8a94e2df96a0..373baec8a1f0 100644
--- a/editors/libreoffice-sr/distinfo
+++ b/editors/libreoffice-sr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sr.tar.gz) = b509337f4e0b9f21fb64e74775eeb53d95dd02d46450a33b95d69ca181334592
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sr.tar.gz) = 2823616
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sr.tar.gz) = 925b5b79f1f7758d8f69c76f0eb24fff81c08578813415e45ecdae26c034e3e3
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sr.tar.gz) = 1940053
diff --git a/editors/libreoffice-ss/Makefile b/editors/libreoffice-ss/Makefile
index e5c1c450e70c..3da498bb142d 100644
--- a/editors/libreoffice-ss/Makefile
+++ b/editors/libreoffice-ss/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= ss
+LO_I18N= ss
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-ss/distinfo b/editors/libreoffice-ss/distinfo
index 7b1253eff60c..5e2f71628e2c 100644
--- a/editors/libreoffice-ss/distinfo
+++ b/editors/libreoffice-ss/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ss.tar.gz) = 5af1c0c58b18e8acc7dc68ebf7cc9647d6dae722002b4f4c5e80921bc34c5e68
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ss.tar.gz) = 1603647
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ss.tar.gz) = 0cd0fcb6ad6f52ff474d159cb7c0d40638b2b828dbb0be69c574a7f31f1f89e0
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ss.tar.gz) = 717893
diff --git a/editors/libreoffice-st/Makefile b/editors/libreoffice-st/Makefile
index 2a12c935d897..860dd5ce72b7 100644
--- a/editors/libreoffice-st/Makefile
+++ b/editors/libreoffice-st/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= st
+LO_I18N= st
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-st/distinfo b/editors/libreoffice-st/distinfo
index 2b51faed5b93..e5936554341d 100644
--- a/editors/libreoffice-st/distinfo
+++ b/editors/libreoffice-st/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_st.tar.gz) = 022c1bf5b8fc15507330238ef178ef8518be3b52828cf1c948e64178e20eaf51
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_st.tar.gz) = 1601993
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_st.tar.gz) = 919efe438776fdb08392a8f792e60b4100f3949e0e5a5b44f12ecc6edeaa1b96
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_st.tar.gz) = 716833
diff --git a/editors/libreoffice-sv/Makefile b/editors/libreoffice-sv/Makefile
index d08c50a3188e..23d0f79fd688 100644
--- a/editors/libreoffice-sv/Makefile
+++ b/editors/libreoffice-sv/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= sv
+LO_I18N= sv
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-sv/distinfo b/editors/libreoffice-sv/distinfo
index 5b0ebad9df5c..7f31e6f08788 100644
--- a/editors/libreoffice-sv/distinfo
+++ b/editors/libreoffice-sv/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sv.tar.gz) = bed3200e5427236117369cc991e2ef970f99cd32c1ba116b79104a7386dd2d03
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sv.tar.gz) = 3019845
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_sv.tar.gz) = db17cda8db6e2c9b8212c44107a65b59950306a35e9ab5c03bc8e18c57239e94
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_sv.tar.gz) = 10650166
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sv.tar.gz) = 9fc12eb05127c0f81c42f15ead1887b135445cef4dd822614b590a3060a2fdcd
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sv.tar.gz) = 2333521
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_sv.tar.gz) = 374373dd8c4e776a8757ec6bc71bd169acd29c5ec83216a864c09e9245dbddf2
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_sv.tar.gz) = 10378418
diff --git a/editors/libreoffice-sw_TZ/Makefile b/editors/libreoffice-sw_TZ/Makefile
index 916d82796af9..806513776eb0 100644
--- a/editors/libreoffice-sw_TZ/Makefile
+++ b/editors/libreoffice-sw_TZ/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= sw_TZ
+LO_I18N= sw_TZ
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-sw_TZ/distinfo b/editors/libreoffice-sw_TZ/distinfo
index 5b3320ced830..27e7bc431fee 100644
--- a/editors/libreoffice-sw_TZ/distinfo
+++ b/editors/libreoffice-sw_TZ/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sw-TZ.tar.gz) = 90a7efa72072216aa4a14d09996b3e2e17157fdc813a951557f1289007865436
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_sw-TZ.tar.gz) = 1575998
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sw-TZ.tar.gz) = 51eb95302ee52a8e5ef3836fd8a2c435ecf448d42a24d7b36fbd928dbc93e83b
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_sw-TZ.tar.gz) = 691825
diff --git a/editors/libreoffice-ta/Makefile b/editors/libreoffice-ta/Makefile
index e62f224a00d7..27311331ac11 100644
--- a/editors/libreoffice-ta/Makefile
+++ b/editors/libreoffice-ta/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= ta
+LO_I18N= ta
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-ta/distinfo b/editors/libreoffice-ta/distinfo
index 533c9496105c..d5efe3b7bed8 100644
--- a/editors/libreoffice-ta/distinfo
+++ b/editors/libreoffice-ta/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ta.tar.gz) = 19e874b35d7e2f38a9d6a9727399a23862ad06969454ae8253313ceab7da50c2
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ta.tar.gz) = 1648212
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ta.tar.gz) = 3e507e8c18ebac19511519a6c750b3500f05f41149510713b6be3b6fefd6272f
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ta.tar.gz) = 766752
diff --git a/editors/libreoffice-te/Makefile b/editors/libreoffice-te/Makefile
index 76fcc34ba759..8c2d366aec05 100644
--- a/editors/libreoffice-te/Makefile
+++ b/editors/libreoffice-te/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= te
+LO_I18N= te
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-te/distinfo b/editors/libreoffice-te/distinfo
index 3a8b13e52761..f8e1b7068fac 100644
--- a/editors/libreoffice-te/distinfo
+++ b/editors/libreoffice-te/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_te.tar.gz) = 6c9e964666692438b85dacc783be8c60e38be0e10bd3a4e4a77c1f36bf5d1a81
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_te.tar.gz) = 2217142
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_te.tar.gz) = dd20228c116e8df1279e0dca64320ca57542ee70e6017ea8dd6bd75f43fa9cd1
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_te.tar.gz) = 1334606
diff --git a/editors/libreoffice-tg/Makefile b/editors/libreoffice-tg/Makefile
index bfcf08ebaf77..484bb1cf5574 100644
--- a/editors/libreoffice-tg/Makefile
+++ b/editors/libreoffice-tg/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= tg
+LO_I18N= tg
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-tg/distinfo b/editors/libreoffice-tg/distinfo
index 6e62f8f028c5..645883f2cccf 100644
--- a/editors/libreoffice-tg/distinfo
+++ b/editors/libreoffice-tg/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_tg.tar.gz) = 8ee0c767180af0773fd271b9f902167aed5a428a0e8a69d98cfdb0e5943a6926
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_tg.tar.gz) = 1625077
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_tg.tar.gz) = 7e85976c032efa98a55589a19f3a78b57d00d0967b39833882ab6120dd2e95f2
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_tg.tar.gz) = 10236367
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_tg.tar.gz) = d9215ee10d7061012f1dc83f5f27f7b081765b23f5050f5e5a96651419422ac9
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_tg.tar.gz) = 742334
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_tg.tar.gz) = 212359528aca2d2bd6479337298a5bec6172876e764b24dea6b9270701928a82
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_tg.tar.gz) = 9961242
diff --git a/editors/libreoffice-th/Makefile b/editors/libreoffice-th/Makefile
index e0e073f37c7f..ca62481d66a3 100644
--- a/editors/libreoffice-th/Makefile
+++ b/editors/libreoffice-th/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= th
+LO_I18N= th
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-th/distinfo b/editors/libreoffice-th/distinfo
index b75424b88687..53cddf230d1c 100644
--- a/editors/libreoffice-th/distinfo
+++ b/editors/libreoffice-th/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_th.tar.gz) = 0eee5269bb4db23bb6eb19f1b570ea6ff6b24e7a6b46cfb63691f3cf1e9da22f
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_th.tar.gz) = 1785825
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_th.tar.gz) = 75381b04b72d4e872748354e647f788a7a5eb3b61012379ec60c559a5f961687
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_th.tar.gz) = 901384
diff --git a/editors/libreoffice-tn/Makefile b/editors/libreoffice-tn/Makefile
index 27c59be8c579..54b3de7fedd9 100644
--- a/editors/libreoffice-tn/Makefile
+++ b/editors/libreoffice-tn/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= tn
+LO_I18N= tn
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-tn/distinfo b/editors/libreoffice-tn/distinfo
index 7b3f261b67fe..e0cceeaa7449 100644
--- a/editors/libreoffice-tn/distinfo
+++ b/editors/libreoffice-tn/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_tn.tar.gz) = f59e1b5252e281bf927612f421c9ae7eda453a38057aed9bdf3a40a6795c2b9c
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_tn.tar.gz) = 1584398
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_tn.tar.gz) = b415762e340431323809733c16e234b54efaa4793c0db7078423bf2fd0aaa1c4
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_tn.tar.gz) = 700323
diff --git a/editors/libreoffice-tr/Makefile b/editors/libreoffice-tr/Makefile
index ac429e117176..ca60a5bf6b4a 100644
--- a/editors/libreoffice-tr/Makefile
+++ b/editors/libreoffice-tr/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= tr
+LO_I18N= tr
LO_HAS_HELPPACK= yes
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-tr/distinfo b/editors/libreoffice-tr/distinfo
index acc335afdb56..d589c795fe7d 100644
--- a/editors/libreoffice-tr/distinfo
+++ b/editors/libreoffice-tr/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_tr.tar.gz) = 874b14929220ba902dbfa4c3069f0039f011142b14f4e202e8c54db1ffc185cc
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_tr.tar.gz) = 1544389
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_tr.tar.gz) = 29e2a1317f2a91d0c02fdeae67dfdd37bcafc5b586bdee6d7a862f4208663fd9
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_tr.tar.gz) = 10962409
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_tr.tar.gz) = cb03b476b2f18bea7d68afe61d38de533429983969406bcd3b8bb750289ec889
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_tr.tar.gz) = 641585
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_tr.tar.gz) = e99a9937611bab31d17262f306672549d9d01d0b603b9247d93c13f8dc10c9d8
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_tr.tar.gz) = 10720633
diff --git a/editors/libreoffice-ts/Makefile b/editors/libreoffice-ts/Makefile
index 79595c5c7c47..3ee620730c7f 100644
--- a/editors/libreoffice-ts/Makefile
+++ b/editors/libreoffice-ts/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= ts
+LO_I18N= ts
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-ts/distinfo b/editors/libreoffice-ts/distinfo
index 13d4d567cd74..844ad9ffb326 100644
--- a/editors/libreoffice-ts/distinfo
+++ b/editors/libreoffice-ts/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ts.tar.gz) = 53436c92e6612af6cf3ee76da0e2afe3e150a34d9847c3c11a2fbefa9529d066
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ts.tar.gz) = 1603052
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ts.tar.gz) = dc0cb27879351795526676c777035bc58520a845c9689b2f22fdde3af7b2d032
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ts.tar.gz) = 717640
diff --git a/editors/libreoffice-tt/distinfo b/editors/libreoffice-tt/distinfo
index 8a497b82fea0..f242ff04beb3 100644
--- a/editors/libreoffice-tt/distinfo
+++ b/editors/libreoffice-tt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_tt.tar.gz) = 1b0a2f77064ea6dd1f596beac98bb2f21baa9d4daaa519d7dd14f8cd120a8f01
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_tt.tar.gz) = 1592080
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_tt.tar.gz) = 309f4e160eebd29b0940bd37be05e6fe028630255e697f2fe78359cc5495bcf3
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_tt.tar.gz) = 708064
diff --git a/editors/libreoffice-ug/distinfo b/editors/libreoffice-ug/distinfo
index 1d0c5bede218..3d3d5f87905a 100644
--- a/editors/libreoffice-ug/distinfo
+++ b/editors/libreoffice-ug/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ug.tar.gz) = 984904ece1424817ba0ff29e0ebc397fdba98df2a2e9a232ac6b654777cf3fc4
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ug.tar.gz) = 1625028
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ug.tar.gz) = 971dd947011354b0e3d118b2b251b69f3ee65ea5daebe7928d03046489d99ed9
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ug.tar.gz) = 9805821
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ug.tar.gz) = 9491e156a9f5c75da5778ca14e48b86e05a105422d67aaa98aafd53b21719225
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ug.tar.gz) = 742831
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ug.tar.gz) = 2a3768b4e8a5ec60ed2b5014774e156c58010282cb7a1543c30c85168d8d3ac0
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ug.tar.gz) = 9604220
diff --git a/editors/libreoffice-uz/Makefile b/editors/libreoffice-uz/Makefile
index eb8ac3a05db0..8e091c6b85c1 100644
--- a/editors/libreoffice-uz/Makefile
+++ b/editors/libreoffice-uz/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= uz
+LO_I18N= uz
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-uz/distinfo b/editors/libreoffice-uz/distinfo
index 5ced781d2c19..71a11ce4ee37 100644
--- a/editors/libreoffice-uz/distinfo
+++ b/editors/libreoffice-uz/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_uz.tar.gz) = 89d8817a52054e94514065390d3341c17708b25becc45e13fd2381a717a0129b
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_uz.tar.gz) = 1587824
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_uz.tar.gz) = ef3013ad2d18cb00ba1dae881591ac7b744f75f00802b8832a3a862d4963fe94
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_uz.tar.gz) = 703948
diff --git a/editors/libreoffice-ve/Makefile b/editors/libreoffice-ve/Makefile
index 80ff534d5b3c..b78f38b139a6 100644
--- a/editors/libreoffice-ve/Makefile
+++ b/editors/libreoffice-ve/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= ve
+LO_I18N= ve
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-ve/distinfo b/editors/libreoffice-ve/distinfo
index 8099dd56988c..7b9be44123c0 100644
--- a/editors/libreoffice-ve/distinfo
+++ b/editors/libreoffice-ve/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ve.tar.gz) = 0fff155f380d7d71dd543e87f8c0cdc495848afaa38a7d9f40f6c94902d0a6a4
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ve.tar.gz) = 1607692
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ve.tar.gz) = 1a4d841593ff1b9c304ce2c6a944972cf06a7536064ad515cc656f4e4a5ea4c8
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ve.tar.gz) = 722510
diff --git a/editors/libreoffice-xh/Makefile b/editors/libreoffice-xh/Makefile
index 5751ba5b4b3e..cfe18ccc2462 100644
--- a/editors/libreoffice-xh/Makefile
+++ b/editors/libreoffice-xh/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= xh
+LO_I18N= xh
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-xh/distinfo b/editors/libreoffice-xh/distinfo
index 005eba31fb7e..0673f545d0eb 100644
--- a/editors/libreoffice-xh/distinfo
+++ b/editors/libreoffice-xh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_xh.tar.gz) = 58da8c90f5915be0a5a95bf7a3d4f491addd4cc809fb5c2e43ae507facf9515f
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_xh.tar.gz) = 1619625
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_xh.tar.gz) = 32b757be376df053e3af88835d939b9b2941b7d38a8ff0f21631a73af994a592
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_xh.tar.gz) = 733142
diff --git a/editors/libreoffice-zu/Makefile b/editors/libreoffice-zu/Makefile
index da81ee00d403..7b560378db01 100644
--- a/editors/libreoffice-zu/Makefile
+++ b/editors/libreoffice-zu/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= zu
+LO_I18N= zu
.include "${.CURDIR}/../../editors/libreoffice/Makefile.common"
diff --git a/editors/libreoffice-zu/distinfo b/editors/libreoffice-zu/distinfo
index 30e08bc48f84..6afdc7dd9e83 100644
--- a/editors/libreoffice-zu/distinfo
+++ b/editors/libreoffice-zu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_zu.tar.gz) = d9585de05d5e945f44aca27341e951eded58d276d154c7559cc9d695bd9f8433
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_zu.tar.gz) = 1614657
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_zu.tar.gz) = 348751934596da2fd3700aa389844510392d801550bdc5ffc311ab8a0c76debb
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_zu.tar.gz) = 730017
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 1e9ded209250..eddc08f504b3 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -2,108 +2,88 @@
.include "${.CURDIR}/Makefile.common"
-PORTREVISION= 2
-
-MASTER_SITE_SUBDIR= src/${PORTVERSION}/
+PORTREVISION= 0
MASTER_SITES+= http://dev-www.libreoffice.org/src/:src \
http://dev-www.libreoffice.org/extern/:ext
+MASTER_SITE_SUBDIR= src/${PORTVERSION}/
COMMENT= Full integrated office productivity suite
-BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
- gpatch:${PORTSDIR}/devel/patch \
+BUILD_DEPENDS= p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
unzip:${PORTSDIR}/archivers/unzip \
- bash:${PORTSDIR}/shells/bash \
+ zip:${PORTSDIR}/archivers/zip \
+ ${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs \
+ ${LOCALBASE}/lib/libcppunit.so:${PORTSDIR}/devel/cppunit \
dmake:${PORTSDIR}/devel/dmake \
- p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
- ${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs \
${LOCALBASE}/include/mdds/global.hpp:${PORTSDIR}/devel/mdds \
- vigra-config:${PORTSDIR}/graphics/vigra
+ gpatch:${PORTSDIR}/devel/patch \
+ ucpp:${PORTSDIR}/devel/ucpp \
+ vigra-config:${PORTSDIR}/graphics/vigra \
+ bash:${PORTSDIR}/shells/bash \
+ gsed:${PORTSDIR}/textproc/gsed
-LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
+LIB_DEPENDS= icutu:${PORTSDIR}/devel/icu \
+ langtag:${PORTSDIR}/devel/liblangtag \
+ orcus-0.4:${PORTSDIR}/devel/liborcus \
+ curl.6:${PORTSDIR}/ftp/curl \
+ cairo.2:${PORTSDIR}/graphics/cairo \
+ graphite2:${PORTSDIR}/graphics/graphite2 \
+ jpeg.11:${PORTSDIR}/graphics/jpeg \
cdr:${PORTSDIR}/graphics/libcdr \
lcms2:${PORTSDIR}/graphics/lcms2 \
+ wpg-0.2.2:${PORTSDIR}/graphics/libwpg \
+ png15:${PORTSDIR}/graphics/png \
+ poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
+ lpsolve55:${PORTSDIR}/math/lp_solve \
+ cmis-0.3:${PORTSDIR}/net/libcmis \
+ ldap-2.4:${PORTSDIR}/net/openldap24-client \
+ mspub-0.0:${PORTSDIR}/print/libmspub \
+ nss3.1:${PORTSDIR}/security/nss \
clucene-core:${PORTSDIR}/textproc/clucene \
- xml2.5:${PORTSDIR}/textproc/libxml2 \
- xslt.2:${PORTSDIR}/textproc/libxslt \
expat.6:${PORTSDIR}/textproc/expat2 \
- icutu:${PORTSDIR}/devel/icu \
- jpeg.11:${PORTSDIR}/graphics/jpeg \
- curl.6:${PORTSDIR}/ftp/curl \
hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \
- mythes-1.2.0:${PORTSDIR}/textproc/mythes \
hyphen.2:${PORTSDIR}/textproc/hyphen \
- poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
- wpd-0.9.9:${PORTSDIR}/textproc/libwpd \
- wpg-0.2.2:${PORTSDIR}/graphics/libwpg \
- wps-0.2.2:${PORTSDIR}/textproc/libwps \
- rdf.0:${PORTSDIR}/textproc/redland \
exttextcat-2.0.0:${PORTSDIR}/textproc/libexttextcat \
- lpsolve55:${PORTSDIR}/math/lp_solve \
visio-0.0.0:${PORTSDIR}/textproc/libvisio \
- graphite2:${PORTSDIR}/graphics/graphite2 \
- nss3.1:${PORTSDIR}/security/nss \
- png15:${PORTSDIR}/graphics/png
+ xml2.5:${PORTSDIR}/textproc/libxml2 \
+ xslt.2:${PORTSDIR}/textproc/libxslt \
+ wpd-0.9.9:${PORTSDIR}/textproc/libwpd \
+ wps-0.2.2:${PORTSDIR}/textproc/libwps \
+ mythes-1.2.0:${PORTSDIR}/textproc/mythes \
+ rdf.0:${PORTSDIR}/textproc/redland
-RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/Liberation/LiberationMono-Bold.ttf:${PORTSDIR}/x11-fonts/liberation-fonts-ttf \
- ${LOCALBASE}/lib/X11/fonts/LinLibertineG/LinLibertine_DR_G.ttf:${PORTSDIR}/x11-fonts/linuxlibertine-g \
- ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \
- ${LOCALBASE}/lib/X11/fonts/GentiumBasic/GenBasI.ttf:${PORTSDIR}/x11-fonts/gentium-basic
+RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \
+ ${LOCALBASE}/lib/X11/fonts/GentiumBasic/GenBasI.ttf:${PORTSDIR}/x11-fonts/gentium-basic \
+ ${LOCALBASE}/lib/X11/fonts/Liberation/LiberationMono-Bold.ttf:${PORTSDIR}/x11-fonts/liberation-fonts-ttf \
+ ${LOCALBASE}/lib/X11/fonts/LinLibertineG/LinLibertine_DR_G.ttf:${PORTSDIR}/x11-fonts/linuxlibertine-g
CONFLICTS_INSTALL= libreoffice-legacy-[0-9]*
-#LO_COMPONENTS= binfilter dictionaries help translations
-LO_COMPONENTS= help
-
-USE_XZ= yes
-USE_PYTHON= yes
-USE_QT4= # empty but required
-#l10n
-
-DIST_SUBDIR= libreoffice
-WRKSRC= ${WRKDIR}/${PORTNAME}-core-${LOVERSION}
-
-LODESTDIR= ${WRKDIR}/loinstall
-
-DISTFILES+= ${PORTNAME}-core-${LOVERSION}${EXTRACT_SUFX}
-.for components in ${LO_COMPONENTS}
-DISTFILES+= ${PORTNAME}-${components}-${LOVERSION}${EXTRACT_SUFX}
-.endfor
-
-EXTRACT_ONLY:= ${DISTFILES}
-
-DISTFILES+= 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz:src \
- 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz:src
-
-USE_AUTOTOOLS= autoconf aclocal
-USE_BDB= yes
-USE_PERL5_BUILD= yes
GNU_CONFIGURE= yes
+MAKE_JOBS_UNSAFE= yes
+USE_AUTOTOOLS= autoconf aclocal
+USE_GL= gl glu
USE_GMAKE= yes
+USE_PERL5_BUILD= yes
+USE_PKGCONFIG= build
+USE_PYTHON= yes
+USE_QT4= # empty but required
+USE_XORG= xaw xrandr
+USE_XZ= yes
USES= bison
WANT_GNOME= yes
-USE_XORG= xaw xrandr
-USE_GL= gl glu
-MAKE_JOBS_UNSAFE= yes
-USE_GETTEXT= yes
-USE_PKGCONFIG= build
+DISTFILES+= ${PORTNAME}-${LOVERSION}${EXTRACT_SUFX}
+DISTFILES+= ${PORTNAME}-help-${LOVERSION}${EXTRACT_SUFX}
-OPTIONS_DEFINE= CPPUNIT CUPS DEBUG GNOME GTK2 GTK3 JAVA KDE4 MERGELIBS MMEDIA \
- PGSQL SDK SVG SYSTRAY WEBDAV
-OPTIONS_DEFAULT=CUPS GTK2 MERGELIBS SVG
+EXTRACT_ONLY:= ${DISTFILES}
-CPPUNIT_DESC= Run C++ unit tests
-PGSQL_DESC= Build with PostgreSQL-SDBC driver
-MERGELIBS_DESC= Enable linking of big merged library
-SDK_DESC= Build with SDK
-MMEDIA_DESC= Enable multimedia backend for impress
-SYSTRAY_DESC= Enable systemtray quickstarter
-WEBDAV_DESC= Enable webdav protocol
-JAVA_DESC= Add java support (XML Filters, macros)
+DISTFILES+= 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz:src
-ACLOCAL_ARGS= -I "${WRKSRC}/m4"
+DIST_SUBDIR= libreoffice
+LODESTDIR= ${WRKDIR}/loinstall
+WRKSRC= ${WRKDIR}/${PORTNAME}-${LOVERSION}
.if defined(DISABLE_MAKE_JOBS)
MAKE_JOBS_NUMBER= 1
@@ -111,109 +91,109 @@ MAKE_JOBS_NUMBER= 1
MAKE_JOBS_NUMBER?= `${SYSCTL} -n kern.smp.cpus`
.endif
-CONFIGURE_ENV= BDB_INCLUDE_DIR=${BDB_INCLUDE_DIR} \
- BDB_LIB_DIR=${BDB_LIB_DIR} \
- BDB_LIB_NAME=${BDB_LIB_NAME} \
- BDB_LIB_CXX_NAME=${BDB_LIB_CXX_NAME} \
- DMAKE=${LOCALBASE}/bin/dmake \
+CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \
GPERF=${LOCALBASE}/bin/gperf \
PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \
PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`"
-CONFIGURE_ARGS+= --with-unix-wrapper="libreoffice" \
+CONFIGURE_ARGS+= --disable-dependency-tracking \
--disable-fetch-external \
- --with-build-version="FreeBSD ports ${PKGVERSION}" \
- --with-vendor="FreeBSD ports ${PKGVERSION}" \
+ --disable-online-update \
--exec-prefix=${PREFIX} \
- --with-gnu-patch=${LOCALBASE}/bin/gpatch \
+ --with-build-version="FreeBSD ports ${PKGVERSION}" \
--with-external-tar=${DISTDIR}/${DIST_SUBDIR} \
- --with-num-cpus=${MAKE_JOBS_NUMBER} \
+ --with-gnu-patch=${LOCALBASE}/bin/gpatch \
+ --with-os-version=${OSVERSION} \
+ --with-parallelism=${MAKE_JOBS_NUMBER} \
--with-solver-and-workdir-root=${TMPDIR}/lobuild \
+ --with-unix-wrapper="libreoffice" \
+ --with-vendor="FreeBSD ports ${PKGVERSION}"
+
+CONFIGURE_ARGS+= --disable-epm \
+ --disable-gnome-vfs \
+ --disable-gstreamer \
+ --disable-kde \
+ --disable-kdeab \
+ --disable-linkoo \
+ --disable-zenity \
+ --enable-cairo-canvas \
+ --enable-graphite \
+ --enable-python=system \
+ --with-alloc=system \
+ --with-external-dict-dir=${LOCALBASE}/share/hunspell \
+ --with-external-hyph-dir=${LOCALBASE}/share/hyphen \
+ --with-external-thes-dir=${LOCALBASE}/share/mythes \
+ --with-system-altlinuxhyph \
--with-system-boost \
- --with-system-clucene \
- --with-system-mdds \
- --with-system-lcms2 \
- --with-system-libcdr \
- --with-system-libxml \
--with-system-cairo \
- --enable-cairo-canvas \
- --with-system-zlib \
+ --with-system-clucene \
+ --with-system-cppunit \
+ --with-system-curl \
+ --with-system-dicts \
+ --with-system-expat \
+ --with-system-graphite \
+ --with-system-hunspell \
--with-system-icu \
- --with-system-db \
--with-system-jpeg \
- --with-system-expat \
- --with-system-openssl \
- --with-system-curl \
+ --with-system-lcms2 \
+ --with-system-libcdr \
+ --with-system-libcmis \
+ --with-system-libexttextcat \
+ --with-system-liblangtag \
+ --with-system-libmspub \
+ --with-system-libpng \
--with-system-libvisio \
--with-system-libwpd \
--with-system-libwpg \
--with-system-libwps \
+ --with-system-libxml \
+ --with-system-lpsolve \
+ --with-system-mdds \
+ --with-system-mesa-headers \
+ --with-system-mythes \
+ --with-system-nss \
+ --with-system-openldap \
+ --with-system-openssl \
+ --with-system-orcus \
--with-system-poppler \
--with-system-redland \
- --with-system-hunspell \
- --with-system-mythes \
- --with-system-altlinuxhyph \
- --with-system-libexttextcat \
- --with-system-lpsolve \
- --with-system-vigra \
- --with-alloc=system \
--with-system-stdlibs \
- --with-system-mesa-headers \
- --disable-epm \
- --disable-mozilla \
- --disable-build-mozilla \
- --without-system-mozilla \
- --without-fonts \
+ --with-system-ucpp \
+ --with-system-vigra \
+ --with-system-zlib \
--without-afms \
- --without-stlport \
- --disable-kde \
- --disable-kdeab \
- --with-system-nss \
+ --without-fonts \
--without-myspell-dicts \
- --with-system-dicts \
- --disable-dependency-tracking \
- --with-external-thes-dir=${LOCALBASE}/share/mythes \
- --with-external-hyph-dir=${LOCALBASE}/share/hyphen \
- --with-external-dict-dir=${LOCALBASE}/share/hunspell \
- --disable-zenity \
- --enable-graphite \
- --with-system-graphite \
- --enable-gio \
- --disable-nsplugin \
- --disable-linkoo \
- --disable-online-update \
- --with-system-gettext \
- --with-system-libpng \
- --disable-gnome-vfs \
- --enable-python=system
+ --without-system-mozilla
-# extensions
-CONFIGURE_ARGS+= --enable-ext-pdfimport
-# --enable-extra-gallery \
-# --enable-extra-template \
-# --enable-extra-sample \
-# --enable-extra-font
-
-MAN1= lobase.1 \
- lomath.1 \
- loffice.1 \
+MAN1= libreoffice.1 \
+ lobase.1 \
localc.1 \
- unopkg.1 \
- loweb.1 \
- lowriter.1 \
- libreoffice.1 \
lodraw.1 \
+ loffice.1 \
lofromtemplate.1 \
- loimpress.1
+ loimpress.1 \
+ lomath.1 \
+ loweb.1 \
+ lowriter.1 \
+ unopkg.1
MANCOMPRESSED= yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE= CUPS DEBUG GNOME GTK2 GTK3 JAVA KDE4 MERGELIBS MMEDIA PGSQL \
+ SDK SYSTRAY TEST WEBDAV
+OPTIONS_DEFAULT=CUPS GTK2 MERGELIBS
-.if empty(PORT_OPTIONS:MCPPUNIT)
-EXTRA_PATCHES+= ${FILESDIR}/disable-cppunittester \
- ${FILESDIR}/disable-uno_test
-.endif
+JAVA_DESC= Add java support (XML Filters, macros)
+MERGELIBS_DESC= Enable linking of big merged library
+MMEDIA_DESC= Enable multimedia backend for impress
+PGSQL_DESC= Build with PostgreSQL-SDBC driver
+SDK_DESC= Build with SDK
+SYSTRAY_DESC= Enable systemtray quickstarter
+TEST_DESC= Run all regression tests
+WEBDAV_DESC= Enable webdav protocol
+
+.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MCUPS}
LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-client
@@ -222,33 +202,24 @@ CONFIGURE_ARGS+= --enable-cups --without-ppds
CONFIGURE_ARGS+= --disable-cups
.endif
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
-WANT_PGSQL_VER= 90+
-CONFIGURE_ARGS+= --enable-postgresql-sdbc --with-system-postgresql
-.else
-CONFIGURE_ARGS+= --disable-postgresql-sdbc \
- --without-gssapi --without-krb5
-.endif
-
-.if ${PORT_OPTIONS:MSYSTRAY}
-CONFIGURE_ARGS+= --enable-systray
-.else
-CONFIGURE_ARGS+= --disable-systray
-.endif
-
-.if ${PORT_OPTIONS:MMMEDIA}
-USE_GSTREAMER= yes
-CONFIGURE_ARGS+= --enable-gstreamer
+.if ${PORT_OPTIONS:MDEBUG}
+IGNORE= known as broken
+CONFIGURE_ARGS+= --enable-debug \
+ --enable-dbgutil \
+ --enable-verbose \
+ --enable-crashdump
.else
-CONFIGURE_ARGS+= --disable-gstreamer
+CONFIGURE_ARGS+= --enable-release-build
.endif
-.if ${PORT_OPTIONS:MSVG}
-CONFIGURE_ARGS+= --enable-librsvg=system
-USE_GNOME+= librsvg2
+.if ${PORT_OPTIONS:MGNOME}
+LIB_DEPENDS+= dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+USE_GNOME+= gconf2
+CONFIGURE_ARGS+= --enable-dbus --enable-gconf --enable-gio \
+ --enable-lockdown
.else
-CONFIGURE_ARGS+= --enable-librsvg=no
+CONFIGURE_ARGS+= --disable-dbus --disable-gconf --disable-gio \
+ --disable-lockdown
.endif
.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGNOME}
@@ -268,29 +239,6 @@ CONFIGURE_ARGS+= --enable-gtk3
CONFIGURE_ARGS+= --disable-gtk3
.endif
-.if ${PORT_OPTIONS:MWEBDAV}
-CONFIGURE_ARGS+= --enable-neon --with-system-neon
-LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29
-.else
-CONFIGURE_ARGS+= --disable-neon
-.endif
-
-.if ${PORT_OPTIONS:MKDE4}
-USE_KDE4= kdelibs
-USE_QT4+= moc_build qmake_build
-CONFIGURE_ENV+= QT4DIR="${QT_PREFIX}" QT4LIB="${QT_LIBDIR}" QT4INC="${QT_INCDIR}" KDE4DIR="${KDE4_PREFIX}"
-CONFIGURE_ARGS+= --enable-kde4
-.else
-CONFIGURE_ARGS+= --disable-kde4
-.endif
-
-.if ${PORT_OPTIONS:MGNOME}
-USE_GNOME+= gconf2
-CONFIGURE_ARGS+= --enable-gconf
-.else
-CONFIGURE_ARGS+= --disable-gconf --disable-lockdown
-.endif
-
.if ${PORT_OPTIONS:MJAVA}
# XXX jni.h from GNU classpath causes ABI conflicts.
CONFLICTS_BUILD= classpath-[0-9]*
@@ -309,7 +257,6 @@ DISTFILES+= 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \
97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip:src \
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip:src \
ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip:src \
- ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip:src \
af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz:src \
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip:src \
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip:src \
@@ -328,9 +275,9 @@ BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant \
${JAVAJARDIR}/junit.jar:${PORTSDIR}/java/junit
CONFIGURE_ARGS+= --enable-ext-report-builder \
- --enable-ext-scripting-beanshell \
- --enable-ext-scripting-javascript \
--enable-ext-wiki-publisher \
+ --enable-scripting-beanshell \
+ --enable-scripting-javascript \
--with-ant-home=${LOCALBASE}/share/java/apache-ant/ \
--with-jdk-home=${JAVA_HOME} \
--with-junit=${JAVAJARDIR}/junit.jar
@@ -339,12 +286,37 @@ CONFIGURE_ARGS+= --enable-ext-report-builder \
CONFIGURE_ARGS+= --without-java
.endif
+.if ${PORT_OPTIONS:MKDE4}
+USE_KDE4= kdelibs
+USE_QT4+= moc_build qmake_build
+CONFIGURE_ENV+= QT4DIR="${QT_PREFIX}" QT4LIB="${QT_LIBDIR}" QT4INC="${QT_INCDIR}" KDE4DIR="${KDE4_PREFIX}"
+CONFIGURE_ARGS+= --enable-kde4
+.else
+CONFIGURE_ARGS+= --disable-kde4
+.endif
+
.if ${PORT_OPTIONS:MMERGELIBS}
CONFIGURE_ARGS+= --enable-mergelibs
.else
CONFIGURE_ARGS+= --disable-mergelibs
.endif
+.if ${PORT_OPTIONS:MMMEDIA}
+USE_GSTREAMER= yes
+CONFIGURE_ARGS+= --enable-gstreamer-0-10
+.else
+CONFIGURE_ARGS+= --disable-gstreamer-0-10
+.endif
+
+.if ${PORT_OPTIONS:MPGSQL}
+USE_PGSQL= yes
+WANT_PGSQL_VER= 90+
+CONFIGURE_ARGS+= --enable-postgresql-sdbc --with-system-postgresql
+.else
+CONFIGURE_ARGS+= --disable-postgresql-sdbc \
+ --without-gssapi --without-krb5
+.endif
+
.if ${PORT_OPTIONS:MSDK}
DISTFILES+= 185d60944ea767075d27247c3162b3bc-unowinreg.dll:ext
BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen
@@ -353,24 +325,33 @@ CONFIGURE_ARGS+= --enable-odk --with-doxygen=${LOCALBASE}/bin/doxygen
CONFIGURE_ARGS+= --disable-odk
.endif
-.if ${PORT_OPTIONS:MDEBUG}
-IGNORE= Known as broken
-CONFIGURE_ARGS+= --enable-debug \
- --enable-dbgutil \
- --enable-verbose \
- --enable-crashdump
+.if ${PORT_OPTIONS:MSYSTRAY}
+CONFIGURE_ARGS+= --enable-systray
.else
-CONFIGURE_ARGS+= --enable-release-build
+CONFIGURE_ARGS+= --disable-systray
+.endif
+
+.if ${PORT_OPTIONS:MTEST}
+CONFIGURE_ARGS+= --enable-cve-tests
+.else
+EXTRA_PATCHES+= ${FILESDIR}/disable-cppunittester
+CONFIGURE_ARGS+= --disable-cve-tests
+.endif
+
+.if ${PORT_OPTIONS:MWEBDAV}
+CONFIGURE_ARGS+= --enable-neon --with-system-neon
+LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29
+.else
+CONFIGURE_ARGS+= --disable-neon
.endif
.include <bsd.port.pre.mk>
.if defined(WITH_GCC)
USE_GCC= 4.6+
-DISTFILES+= bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz:ext
CONFIGURE_ENV+= CXXCPP="${CPP}"
.else
-.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014
+.if exists(/usr/bin/clang) && ${OSVERSION} > 901502
CC= /usr/bin/clang
CPP= /usr/bin/clang-cpp
CXX= /usr/bin/clang++
@@ -383,48 +364,29 @@ CPP= ${CC} -E
CXX= ${LOCALBASE}/bin/clang++
CONFIGURE_ENV+= CXXCPP="${CXX} -E"
.endif
-CONFIGURE_ARGS+= --with-system-cppunit
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libcppunit.so:${PORTSDIR}/devel/cppunit
.endif
.if ${OSVERSION} < 900506
CONFIGURE_ARGS+= --with-linker-hash-style=sysv
.endif
+ACLOCAL_ARGS= -I "${WRKSRC}/m4"
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
MAKE_ENV+= ENVCFLAGS="${CFLAGS}" ENVCXXFLAGS="${CXXFLAGS}"
MAKE_ENV+= ENVLINKFLAGS="${LDFLAGS}"
MAKE_ENV+= LANG=C LC_ALL=C
-MAKE_ENV+= USE_GMAKE=1
+MAKE_ENV+= SED="${LOCALBASE}/bin/gsed" USE_GMAKE=1
TMPDIR?= /tmp
-post-extract:
- @${MKDIR} ${WRKSRC}/clone
- @${MKDIR} ${WRKSRC}/src
-.for component in ${LO_COMPONENTS}
- @${MV} ${WRKDIR}/${PORTNAME}-${component}-${LOVERSION} ${WRKSRC}/clone/${component}
-.endfor
- @${TOUCH} ${WRKSRC}/clone/repos_changed
-
-.if ${PORT_OPTIONS:MJAVA}
-post-patch:
- @${REINPLACE_CMD} -e 's/^ANT_OPT/#ANT_OPT/g' \
- ${WRKSRC}/apache-commons/java/codec/makefile.mk \
- ${WRKSRC}/apache-commons/java/httpclient/makefile.mk \
- ${WRKSRC}/apache-commons/java/lang/makefile.mk \
- ${WRKSRC}/apache-commons/java/logging/makefile.mk
-.endif
-
pre-configure:
@${TOUCH} ${WRKSRC}/autogen.lastrun
@${MKDIR} ${WRKDIR}/lobuild
@${LN} -fs ${WRKDIR}/lobuild ${TMPDIR}
post-configure:
- @cd ${WRKSRC} && ./bin/create_bootstrap_links
@${TOUCH} ${WRKSRC}/src.downloaded
do-install:
diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common
index 1286a796d28b..3927832741c7 100644
--- a/editors/libreoffice/Makefile.common
+++ b/editors/libreoffice/Makefile.common
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libreoffice
-PORTVERSION= 3.6.5
+PORTVERSION= 4.0.1
RCVER= 2
#PRERELEASE= yes
LOVERSION= ${PORTVERSION}.${RCVER}
@@ -45,19 +45,19 @@ RUN_DEPENDS= libreoffice:${PORTSDIR}/editors/libreoffice
.if defined(PRERELEASE)
MASTER_SITE_SUBDIR= testing/${PORTVERSION}/deb/x86/
-LO_I18N_FILE= LibO_${LOVERSION}_Linux_x86
+LO_I18N_FILE= LibreOffice_${LOVERSION}_Linux_x86_deb
.else
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/deb/x86/
-LO_I18N_FILE= LibO_${PORTVERSION}_Linux_x86
+LO_I18N_FILE= LibreOffice_${PORTVERSION}_Linux_x86_deb
.endif
DIST_SUBDIR?= libreoffice/i18n
PKGNAMEPREFIX= ${LO_I18N}-
-DISTFILES= ${LO_I18N_FILE}_langpack-deb_${LO_I18N:S/_/-/}${EXTRACT_SUFX}
+DISTFILES= ${LO_I18N_FILE}_langpack_${LO_I18N:S/_/-/}${EXTRACT_SUFX}
.if defined(LO_HAS_HELPPACK)
-DISTFILES+= ${LO_I18N_FILE}_helppack-deb_${LO_I18N:S/_/-/}${EXTRACT_SUFX}
+DISTFILES+= ${LO_I18N_FILE}_helppack_${LO_I18N:S/_/-/}${EXTRACT_SUFX}
.endif
COMMENT?= ${LO_I18N} language pack for ${PORTNAME}
diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo
index f823a403ad18..23025c6c8249 100644
--- a/editors/libreoffice/distinfo
+++ b/editors/libreoffice/distinfo
@@ -1,9 +1,7 @@
-SHA256 (libreoffice/libreoffice-core-3.6.5.2.tar.xz) = e6a97b77dc5a8ba4f57028fd2fab3e5b008e8776ac549f71ba3ec154550606e7
-SIZE (libreoffice/libreoffice-core-3.6.5.2.tar.xz) = 109108684
-SHA256 (libreoffice/libreoffice-help-3.6.5.2.tar.xz) = e7fe01ba83fc33d39f57aed6cc6d383095cb3c669db7d1b56b37b72eac3f4f8c
-SIZE (libreoffice/libreoffice-help-3.6.5.2.tar.xz) = 1912108
-SHA256 (libreoffice/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz) = a4ace7c0280e5ee8d4941b33449ee10edf1515437483d55ae387cc4de2c2bea0
-SIZE (libreoffice/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz) = 432064
+SHA256 (libreoffice/libreoffice-4.0.1.2.tar.xz) = 9f7d62996a362d42fbf45d02b92cef953bcf5df18337d721751b76fae72819d7
+SIZE (libreoffice/libreoffice-4.0.1.2.tar.xz) = 104163948
+SHA256 (libreoffice/libreoffice-help-4.0.1.2.tar.xz) = 8ca09258855e9eebb2cc461f61cad61236ab67e46232f65ccbbfee8d89d13d8e
+SIZE (libreoffice/libreoffice-help-4.0.1.2.tar.xz) = 1857432
SHA256 (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a
SIZE (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 1652670
SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
@@ -34,8 +32,6 @@ SHA256 (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 7582377
SIZE (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 23150
SHA256 (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
SIZE (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 2929311
-SHA256 (libreoffice/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip) = 64f8d737c32756713d60c22efe3978a59fa167cdeaa2d3d0a1646b1f2232b825
-SIZE (libreoffice/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip) = 2732347
SHA256 (libreoffice/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz) = 12effcf3fea025bd34edbfec60a6216ca453fb27e781d8e5783caf75fd33d90e
SIZE (libreoffice/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz) = 80427
SHA256 (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
@@ -52,5 +48,3 @@ SHA256 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) =
SIZE (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919
SHA256 (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
SIZE (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 12288
-SHA256 (libreoffice/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz) = ac28a04c8e6c9217d910b0ae7122832d28d9917fa668bcc9e0b8b09acb4ea44a
-SIZE (libreoffice/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz) = 762803
diff --git a/editors/libreoffice/files/disable-cppunittester b/editors/libreoffice/files/disable-cppunittester
index 5af65b0f4b87..6cb4d3934ae1 100644
--- a/editors/libreoffice/files/disable-cppunittester
+++ b/editors/libreoffice/files/disable-cppunittester
@@ -1,6 +1,6 @@
---- ./sal/cppunittester/cppunittester.cxx.orig 2013-02-01 15:06:04.000000000 -0500
-+++ ./sal/cppunittester/cppunittester.cxx 2013-02-01 16:35:44.000000000 -0500
-@@ -172,6 +172,7 @@
+--- ./sal/cppunittester/cppunittester.cxx.orig 2013-01-31 05:54:53.000000000 -0500
++++ ./sal/cppunittester/cppunittester.cxx 2013-02-18 18:38:28.000000000 -0500
+@@ -167,6 +167,7 @@
}
SAL_IMPLEMENT_MAIN() {
diff --git a/editors/libreoffice/files/patch-RepositoryExternal.mk b/editors/libreoffice/files/patch-RepositoryExternal.mk
deleted file mode 100644
index 26de1d923dc2..000000000000
--- a/editors/libreoffice/files/patch-RepositoryExternal.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./RepositoryExternal.mk.orig 2013-02-01 13:12:08.000000000 -0500
-+++ ./RepositoryExternal.mk 2013-02-01 13:37:47.000000000 -0500
-@@ -1056,7 +1056,7 @@
- )
-
- $(call gb_LinkTarget_add_libs,$(1),\
-- -l$(DB_LIB) \
-+ $(DB_LIB) \
- )
-
- endef
diff --git a/editors/libreoffice/files/patch-bin__distro-install-desktop-integration b/editors/libreoffice/files/patch-bin__distro-install-desktop-integration
index 8c9bed5368e8..f8d0ba376383 100644
--- a/editors/libreoffice/files/patch-bin__distro-install-desktop-integration
+++ b/editors/libreoffice/files/patch-bin__distro-install-desktop-integration
@@ -1,6 +1,6 @@
---- ./bin/distro-install-desktop-integration.orig 2012-03-27 18:22:01.000000000 +0200
-+++ ./bin/distro-install-desktop-integration 2012-04-23 19:17:27.574712717 +0200
-@@ -91,13 +91,13 @@
+--- ./bin/distro-install-desktop-integration.orig 2013-01-31 05:54:53.000000000 -0500
++++ ./bin/distro-install-desktop-integration 2013-02-18 18:38:28.000000000 -0500
+@@ -94,13 +94,13 @@
}
# install desktop integration from plain packages
@@ -17,7 +17,7 @@
-e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
-e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
-e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
-@@ -111,16 +111,17 @@
+@@ -114,16 +114,17 @@
export PRODUCTVERSION=
export KDEMAINDIR=$PREFIXDIR
export GNOMEDIR=$PREFIXDIR
@@ -38,7 +38,7 @@
if test -d $DESTDIR/opt ; then
rm -f $DESTDIR/opt/$INSTALLDIRNAME
rmdir --ignore-fail-on-non-empty $DESTDIR/opt
-@@ -129,7 +130,7 @@
+@@ -132,7 +133,7 @@
# we want non-versioned desktop files
cd $DESTDIR/$INSTALLDIR/share/xdg
# we want non-versioned stuff in the distro packages
@@ -47,7 +47,7 @@
-e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
-e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
-e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
-@@ -144,7 +145,7 @@
+@@ -147,7 +148,7 @@
$PREFIXDIR/share/mime/packages \
$PREFIXDIR/share/mime-info \
$PREFIXDIR/share/icons ; do
diff --git a/editors/libreoffice/files/patch-bridges__Library_gcc3_linux_intel.mk b/editors/libreoffice/files/patch-bridges__Library_gcc3_linux_intel.mk
new file mode 100644
index 000000000000..16ff470bc36e
--- /dev/null
+++ b/editors/libreoffice/files/patch-bridges__Library_gcc3_linux_intel.mk
@@ -0,0 +1,11 @@
+--- ./bridges/Library_gcc3_linux_intel.mk.orig 2013-01-31 05:54:53.000000000 -0500
++++ ./bridges/Library_gcc3_linux_intel.mk 2013-02-19 20:22:56.000000000 -0500
+@@ -39,7 +39,7 @@
+ ) \
+ ))
+
+-ifneq ($(OS),ANDROID)
++ifeq ($(filter ANDROID DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
+ $(eval $(call gb_Library_add_libs,gcc3_uno,\
+ -ldl \
+ ))
diff --git a/editors/libreoffice/files/patch-bridges__Library_gcc3_linux_x86-64.mk b/editors/libreoffice/files/patch-bridges__Library_gcc3_linux_x86-64.mk
new file mode 100644
index 000000000000..78bd6be6ad51
--- /dev/null
+++ b/editors/libreoffice/files/patch-bridges__Library_gcc3_linux_x86-64.mk
@@ -0,0 +1,14 @@
+--- ./bridges/Library_gcc3_linux_x86-64.mk.orig 2013-01-31 05:54:53.000000000 -0500
++++ ./bridges/Library_gcc3_linux_x86-64.mk 2013-02-19 17:34:24.000000000 -0500
+@@ -41,9 +41,11 @@
+ ) \
+ ))
+
++ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
+ $(eval $(call gb_Library_add_libs,gcc3_uno,\
+ -ldl \
+ ))
++endif
+
+ $(eval $(call gb_Library_use_libraries,gcc3_uno,\
+ cppu \
diff --git a/editors/libreoffice/files/patch-configure.ac b/editors/libreoffice/files/patch-configure.ac
new file mode 100644
index 000000000000..0475e315d9af
--- /dev/null
+++ b/editors/libreoffice/files/patch-configure.ac
@@ -0,0 +1,84 @@
+--- ./configure.ac.orig 2013-01-31 05:54:53.000000000 -0500
++++ ./configure.ac 2013-02-18 18:14:20.000000000 -0500
+@@ -3588,7 +3588,7 @@
+ PLATFORMID=freebsd_x86
+ OUTPATH=unxfbsdi
+ ;;
+- x86_64)
++ amd64|x86_64)
+ CPU=X
+ CPUNAME=X86_64
+ RTL_ARCH=X86_64
+@@ -6200,21 +6200,13 @@
+ JAVA_ARCH="i386"
+ JAVA_TOOLKIT="client"
+ ;;
+- x86_64)
+- if test "`echo $JAVA_HOME | sed -e 's,.*/,,'`" = "linux"; then
+- JAVA_ARCH="i386"
+- JAVA_TOOLKIT="client"
+- else
+- JAVA_ARCH="amd64"
+- JAVA_TOOLKIT="server"
+- fi
++ amd64|x86_64)
++ JAVA_ARCH="amd64"
++ JAVA_TOOLKIT="server"
+ ;;
+ esac
+ SOLARINC="$SOLARINC -I$JAVA_HOME/include"
+ SOLARINC="$SOLARINC -I$JAVA_HOME/include/freebsd"
+- SOLARINC="$SOLARINC -I$JAVA_HOME/include/bsd"
+- SOLARINC="$SOLARINC -I$JAVA_HOME/include/linux"
+- SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
+ ;;
+
+ k*bsd*-gnu*)
+@@ -7861,9 +7853,13 @@
+ AC_MSG_CHECKING([which hash container mdds shall use])
+ if test "x$HAVE_CXX0X" = "xTRUE"; then
+ MDDS_CPPFLAGS="-std=gnu++0x"
++ else
++ MDDS_CPPFLAGS="-std=gnu++98"
++ fi
++ if test "x`basename $GXX_INCLUDE_PATH 2>/dev/null`" != "x4.2"; then
+ AC_MSG_RESULT([std::unordered_map])
+ else
+- MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_BOOST"
++ MDDS_CPPFLAGS="$MDDS_CPPFLAGS -DMDDS_HASH_CONTAINER_BOOST"
+ AC_MSG_RESULT([boost::unordered_map])
+ fi
+
+@@ -8230,7 +8226,7 @@
+ dnl ===================================================================
+
+ AC_MSG_CHECKING([whether to enable graphite support])
+-if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "$enable_graphite" = "" -o "$enable_graphite" != "no"; then
++if test "$_os" = "WINNT" -o "$_os" = "Linux" -o "$_os" = "FreeBSD" && test "$enable_graphite" = "" -o "$enable_graphite" != "no"; then
+ AC_MSG_RESULT([yes])
+ ENABLE_GRAPHITE="TRUE"
+ AC_MSG_CHECKING([which graphite to use])
+@@ -8482,8 +8478,8 @@
+ AC_MSG_RESULT([external])
+ # Mac OS builds should get out without extra stuff is the Mac porters'
+ # wish. And pkg-config is although Xcode ships a .pc for openssl
+- if test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \
+- "$_os" = "DragonFly"; then
++ if test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \
++ "$_os" = "OpenBSD" -o "$_os" = "DragonFly"; then
+ OPENSSL_CFLAGS=
+ OPENSSL_LIBS="-lssl -lcrypto"
+ else
+@@ -10325,10 +10321,10 @@
+
+ dnl Check for Meta Object Compiler
+
+- AC_PATH_PROG( MOCQT4, moc-qt4, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
++ AC_PATH_PROG( MOCQT4, moc-qt4, no, [$QT4DIR/bin:$PATH] )
+ MOC4="$MOCQT4"
+ if test "$MOC4" = "no"; then
+- AC_PATH_PROG( MOC4, moc, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
++ AC_PATH_PROG( MOC4, moc, no, [$QT4DIR/bin:$PATH] )
+ if test "$MOC4" = "no"; then
+ AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
+ the root of your Qt installation by exporting QT4DIR before running "configure".])
diff --git a/editors/libreoffice/files/patch-configure.in b/editors/libreoffice/files/patch-configure.in
deleted file mode 100644
index 3711257a4e88..000000000000
--- a/editors/libreoffice/files/patch-configure.in
+++ /dev/null
@@ -1,164 +0,0 @@
---- ./configure.in.orig 2013-02-06 19:18:52.000000000 -0500
-+++ ./configure.in 2013-02-06 19:22:43.000000000 -0500
-@@ -2115,7 +2115,7 @@
- AC_SUBST(GNUTAR)
-
- AC_MSG_CHECKING([for tar's option to strip components])
--$GNUTAR --help 2> /dev/null | egrep "strip-components" 2>&1 >/dev/null
-+$GNUTAR --help 2> /dev/null | egrep "bsdtar|strip-components" 2>&1 >/dev/null
- if test $? -eq 0; then
- STRIP_COMPONENTS="--strip-components"
- else
-@@ -3121,7 +3121,7 @@
- RTL_ARCH=x86
- OUTPATH=unxfbsdi
- ;;
-- x86_64)
-+ amd64|x86_64)
- CPU=X
- CPUNAME=X86_64
- RTL_ARCH=X86_64
-@@ -5561,21 +5561,13 @@
- JAVA_ARCH="i386"
- JAVA_TOOLKIT="client"
- ;;
-- x86_64)
-- if test "`echo $JAVA_HOME | sed -e 's,.*/,,'`" = "linux"; then
-- JAVA_ARCH="i386"
-- JAVA_TOOLKIT="client"
-- else
-- JAVA_ARCH="amd64"
-- JAVA_TOOLKIT="server"
-- fi
-+ amd64|x86_64)
-+ JAVA_ARCH="amd64"
-+ JAVA_TOOLKIT="server"
- ;;
- esac
- SOLARINC="$SOLARINC -I$JAVA_HOME/include"
- SOLARINC="$SOLARINC -I$JAVA_HOME/include/freebsd"
-- SOLARINC="$SOLARINC -I$JAVA_HOME/include/bsd"
-- SOLARINC="$SOLARINC -I$JAVA_HOME/include/linux"
-- SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include"
- ;;
-
- k*bsd*-gnu*)
-@@ -6719,51 +6711,11 @@
- dnl ===================================================================
- AC_MSG_CHECKING([which db to use])
- if test "$with_system_db" = "yes"; then
-- SYSTEM_DB=YES
- AC_MSG_RESULT([external])
--
-- db_header=
-- for dbver in 5.3 5.1 5.0 5 4.8 4.7 4; do
-- for dash in - ''; do
-- AC_CHECK_HEADER([db$dash$dbver/db.h],
-- [ db_header="db$dash$dbver/db.h"; break 2 ])
-- done
-- done
--
-- if test -z "$db_header"; then
-- AC_CHECK_HEADER([db/db.h], [db_header='db/db.h'; dbver=''])
-- fi
--
-- if test -z "$db_header"; then
-- AC_CHECK_HEADER(db.h, [ db_header='db.h'; dbver='' ])
-- fi
--
-- if test -z "$db_header"; then
-- AC_MSG_ERROR([db.h not found. Use the correct -I flag, or install the Berkeley db development package.])
-- fi
--
-- AC_MSG_CHECKING([whether db is at least 4.1])
-- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <$db_header>]], [[int array[(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))-1];]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([no. you need at least db 4.1])])
--
-- SYSTEM_DB_CFLAGS="-DSYSTEM_DB_HEADER='<$db_header>'"
--
-- DB_LIB=
-- dnl At least on OpenBSD dbver is not appended to the library
-- if test "$_os" = "OpenBSD"; then
-- dbver=''
-- fi
-- for dash in - ''; do
-- AC_CHECK_LIB(db$dash$dbver, dbopen,
-- [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ])
-- AC_CHECK_LIB(db$dash$dbver, __db185_open,
-- [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ])
-- done
--
-- if test -z "$DB_LIB"; then
-- AC_MSG_ERROR([db library not found. Use the correct -L flag,
--or install the Berkeley db development package.])
-- fi
--
-+ SYSTEM_DB=YES
-+ SYSTEM_DB_CFLAGS="-DSYSTEM_DB_HEADER='<db.h>' -I$BDB_INCLUDE_DIR"
-+ DB_LIB="-L$BDB_LIB_DIR -l$BDB_LIB_NAME"
-+ DB_CPPLIB="-L$BDB_LIB_DIR -l$BDB_LIB_CXX_NAME"
- SCPDEFS="$SCPDEFS -DSYSTEM_DB"
- libo_MINGW_CHECK_DLL([DB], [libdb])
- elif test $_os != iOS -a $_os != Android; then
-@@ -7347,9 +7299,13 @@
- AC_MSG_CHECKING([which hash container mdds shall use])
- if test "x$HAVE_CXX0X" = "xTRUE"; then
- MDDS_CPPFLAGS="-std=gnu++0x"
-+ else
-+ MDDS_CPPFLAGS="-std=gnu++98"
-+ fi
-+ if test "x`basename $GXX_INCLUDE_PATH 2>/dev/null`" != "x4.2"; then
- AC_MSG_RESULT([std::unordered_map])
- else
-- MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_BOOST"
-+ MDDS_CPPFLAGS="$MDDS_CPPFLAGS -DMDDS_HASH_CONTAINER_BOOST"
- AC_MSG_RESULT([boost::unordered_map])
- fi
-
-@@ -7911,12 +7867,12 @@
- if test -z "$SYSTEM_GENCMN"; then
- AC_MSG_ERROR([\'gencmn\' not found in \$PATH, install the icu development tool \'gencmn\'])
- fi
-- if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "4"; then
-+ if test "$ICU_MAJOR" -ge "49" -o \( "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "4" \); then
- ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
- else
- ICU_RECLASSIFIED_CLOSE_PARENTHESIS="NO"
- fi
-- if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "9"; then
-+ if test "$ICU_MAJOR" -ge "49"; then
- ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES"
- else
- ICU_RECLASSIFIED_PREPEND_SET_EMPTY="NO"
-@@ -7956,7 +7912,7 @@
- dnl ===================================================================
-
- AC_MSG_CHECKING([whether to enable graphite support])
--if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "$enable_graphite" = "" -o "$enable_graphite" != "no"; then
-+if test "$_os" = "WINNT" -o "$_os" = "Linux" -o "$_os" = "FreeBSD" && test "$enable_graphite" = "" -o "$enable_graphite" != "no"; then
- AC_MSG_RESULT([yes])
- ENABLE_GRAPHITE="TRUE"
- AC_MSG_CHECKING([which graphite to use])
-@@ -8186,8 +8142,8 @@
- AC_MSG_RESULT([external])
- # Mac OS builds should get out without extra stuff is the Mac porters'
- # wish. And pkg-config is although Xcode ships a .pc for openssl
-- if test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \
-- "$_os" = "DragonFly"; then
-+ if test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \
-+ "$_os" = "OpenBSD" -o "$_os" = "DragonFly"; then
- OPENSSL_CFLAGS=
- OPENSSL_LIBS="-lssl -lcrypto"
- else
-@@ -9842,10 +9798,10 @@
-
- dnl Check for Meta Object Compiler
-
-- AC_PATH_PROG( MOCQT4, moc-qt4, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
-+ AC_PATH_PROG( MOCQT4, moc-qt4, no, [$QT4DIR/bin:$PATH] )
- MOC4="$MOCQT4"
- if test "$MOC4" = "no"; then
-- AC_PATH_PROG( MOC4, moc, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
-+ AC_PATH_PROG( MOC4, moc, no, [$QT4DIR/bin:$PATH] )
- if test "$MOC4" = "no"; then
- AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
- the root of your Qt installation by exporting QT4DIR before running "configure".])
diff --git a/editors/libreoffice/files/patch-connectivity__source__commontools__FDatabaseMetaDataResultSet.cxx b/editors/libreoffice/files/patch-connectivity__source__commontools__FDatabaseMetaDataResultSet.cxx
deleted file mode 100644
index 41040afc1f14..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__commontools__FDatabaseMetaDataResultSet.cxx
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx 2012-07-18 13:26:19.000000000 -0400
-@@ -91,10 +91,10 @@
- // -------------------------------------------------------------------------
- void ODatabaseMetaDataResultSet::construct()
- {
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0, &m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(static_cast<sal_Int32*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(static_cast<sal_Int32*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0, &m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(static_cast<sal_Int32*>(0)));
- }
- // -----------------------------------------------------------------------------
- void ODatabaseMetaDataResultSet::setType(MetaDataResultSetType _eType)
diff --git a/editors/libreoffice/files/patch-connectivity__source__commontools__dbexception.cxx b/editors/libreoffice/files/patch-connectivity__source__commontools__dbexception.cxx
deleted file mode 100644
index 7ce733115258..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__commontools__dbexception.cxx
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./connectivity/source/commontools/dbexception.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/commontools/dbexception.cxx 2012-07-18 13:24:25.000000000 -0400
-@@ -144,7 +144,7 @@
- //------------------------------------------------------------------------------
- SQLExceptionInfo::SQLExceptionInfo(const staruno::Any& _rError)
- {
-- const staruno::Type& aSQLExceptionType = ::getCppuType(reinterpret_cast< ::com::sun::star::sdbc::SQLException*>(NULL));
-+ const staruno::Type& aSQLExceptionType = ::getCppuType(static_cast< ::com::sun::star::sdbc::SQLException*>(0));
- sal_Bool bValid = isAssignableFrom(aSQLExceptionType, _rError.getValueType());
- if (bValid)
- m_aContent = _rError;
-@@ -158,9 +158,9 @@
- {
- staruno::Type aContentType = m_aContent.getValueType();
-
-- const Type& aSQLExceptionType = ::getCppuType( reinterpret_cast< SQLException* >( NULL ) );
-- const Type& aSQLWarningType = ::getCppuType( reinterpret_cast< SQLWarning* >( NULL ) );
-- const Type& aSQLContextType = ::getCppuType( reinterpret_cast< SQLContext* >( NULL ) );
-+ const Type& aSQLExceptionType = ::getCppuType( static_cast< SQLException* >( 0 ) );
-+ const Type& aSQLWarningType = ::getCppuType( static_cast< SQLWarning* >( 0 ) );
-+ const Type& aSQLContextType = ::getCppuType( static_cast< SQLContext* >( 0 ) );
-
- if ( isAssignableFrom( aSQLContextType, m_aContent.getValueType() ) )
- m_eType = SQL_CONTEXT;
diff --git a/editors/libreoffice/files/patch-connectivity__source__drivers__ado__AColumn.cxx b/editors/libreoffice/files/patch-connectivity__source__drivers__ado__AColumn.cxx
deleted file mode 100644
index 53e3c74a0871..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__drivers__ado__AColumn.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./connectivity/source/drivers/ado/AColumn.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/drivers/ado/AColumn.cxx 2012-07-18 14:48:46.000000000 -0400
-@@ -117,7 +117,7 @@
- sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
-
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING, nAttrib,&m_IsAscending, ::getBooleanCppuType());
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
- }
- // -----------------------------------------------------------------------------
- void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
diff --git a/editors/libreoffice/files/patch-connectivity__source__drivers__ado__AUser.cxx b/editors/libreoffice/files/patch-connectivity__source__drivers__ado__AUser.cxx
deleted file mode 100644
index 6385ae62e118..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__drivers__ado__AUser.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./connectivity/source/drivers/ado/AUser.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/drivers/ado/AUser.cxx 2012-07-18 14:51:51.000000000 -0400
-@@ -145,7 +145,7 @@
- void OUserExtend::construct()
- {
- OUser_TYPEDEF::construct();
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(0)));
- }
- // -----------------------------------------------------------------------------
- cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
diff --git a/editors/libreoffice/files/patch-connectivity__source__drivers__file__FResultSet.cxx b/editors/libreoffice/files/patch-connectivity__source__drivers__file__FResultSet.cxx
deleted file mode 100644
index f8745f21fa11..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__drivers__file__FResultSet.cxx
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./connectivity/source/drivers/file/FResultSet.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/drivers/file/FResultSet.cxx 2012-07-18 13:28:45.000000000 -0400
-@@ -152,10 +152,10 @@
- void OResultSet::construct()
- {
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::construct" );
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0,&m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY,PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(static_cast<sal_Int32*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(static_cast<sal_Int32*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0,&m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY,PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(static_cast<sal_Int32*>(0)));
- }
- // -------------------------------------------------------------------------
- void OResultSet::disposing(void)
diff --git a/editors/libreoffice/files/patch-connectivity__source__drivers__file__FStatement.cxx b/editors/libreoffice/files/patch-connectivity__source__drivers__file__FStatement.cxx
deleted file mode 100644
index ed0a69c68a03..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__drivers__file__FStatement.cxx
+++ /dev/null
@@ -1,27 +0,0 @@
---- ./connectivity/source/drivers/file/FStatement.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/drivers/file/FStatement.cxx 2012-07-18 13:31:40.000000000 -0400
-@@ -93,16 +93,16 @@
-
- sal_Int32 nAttrib = 0;
-
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, nAttrib,&m_nMaxFieldSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, nAttrib,&m_nMaxRows, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, nAttrib,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, nAttrib,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, nAttrib,&m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, nAttrib,&m_nMaxFieldSize, ::getCppuType(static_cast<sal_Int32*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, nAttrib,&m_nMaxRows, ::getCppuType(static_cast<sal_Int32*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut, ::getCppuType(static_cast<sal_Int32*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, nAttrib,&m_nFetchSize, ::getCppuType(static_cast<sal_Int32*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, nAttrib,&m_nResultSetType, ::getCppuType(static_cast<sal_Int32*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, nAttrib,&m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING),PROPERTY_ID_ESCAPEPROCESSING, nAttrib,&m_bEscapeProcessing,::getCppuBooleanType());
-
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, nAttrib,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, nAttrib,&m_nResultSetConcurrency, ::getCppuType(static_cast<sal_Int32*>(0)));
- }
- // -----------------------------------------------------------------------------
- OStatement_Base::~OStatement_Base()
diff --git a/editors/libreoffice/files/patch-connectivity__source__drivers__hsqldb__HUser.cxx b/editors/libreoffice/files/patch-connectivity__source__drivers__hsqldb__HUser.cxx
deleted file mode 100644
index e0b84c798a54..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__drivers__hsqldb__HUser.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./connectivity/source/drivers/hsqldb/HUser.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/drivers/hsqldb/HUser.cxx 2012-07-18 14:47:11.000000000 -0400
-@@ -71,7 +71,7 @@
- typedef connectivity::sdbcx::OUser OUser_TYPEDEF;
- void OUserExtend::construct()
- {
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(0)));
- }
- // -----------------------------------------------------------------------------
- cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
diff --git a/editors/libreoffice/files/patch-connectivity__source__drivers__mysql__YUser.cxx b/editors/libreoffice/files/patch-connectivity__source__drivers__mysql__YUser.cxx
deleted file mode 100644
index e7f7135f8804..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__drivers__mysql__YUser.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./connectivity/source/drivers/mysql/YUser.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/drivers/mysql/YUser.cxx 2012-07-18 13:34:01.000000000 -0400
-@@ -71,7 +71,7 @@
- typedef connectivity::sdbcx::OUser OUser_TYPEDEF;
- void OUserExtend::construct()
- {
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(0)));
- }
- // -----------------------------------------------------------------------------
- cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
diff --git a/editors/libreoffice/files/patch-connectivity__source__inc__propertyids.hxx b/editors/libreoffice/files/patch-connectivity__source__inc__propertyids.hxx
deleted file mode 100644
index 8120a247967a..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__inc__propertyids.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./connectivity/source/inc/propertyids.hxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/inc/propertyids.hxx 2012-07-18 13:36:46.000000000 -0400
-@@ -75,7 +75,7 @@
-
- //------------------------------------------------------------------------------
- #define DECL_PROP1IMPL(varname, type) \
--pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type*>(NULL)),
-+pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(static_cast< type*>(0)),
- //------------------------------------------------------------------------------
- #define DECL_PROP0(varname, type) \
- DECL_PROP1IMPL(varname, type) 0)
diff --git a/editors/libreoffice/files/patch-connectivity__source__parse__PColumn.cxx b/editors/libreoffice/files/patch-connectivity__source__parse__PColumn.cxx
deleted file mode 100644
index 3fff8bfffa57..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__parse__PColumn.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
---- ./connectivity/source/parse/PColumn.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/parse/PColumn.cxx 2012-07-18 17:07:31.000000000 -0400
-@@ -176,13 +176,13 @@
- // -------------------------------------------------------------------------
- void OParseColumn::construct()
- {
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION), PROPERTY_ID_FUNCTION, 0, &m_bFunction, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AGGREGATEFUNCTION), PROPERTY_ID_AGGREGATEFUNCTION, 0, &m_bAggregateFunction, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME, 0, &m_aTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME), PROPERTY_ID_REALNAME, 0, &m_aRealName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DBASEPRECISIONCHANGED), PROPERTY_ID_DBASEPRECISIONCHANGED, 0, &m_bDbasePrecisionChanged, ::getCppuType(reinterpret_cast<sal_Bool*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE), PROPERTY_ID_ISSEARCHABLE, 0, &m_bIsSearchable, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL), PROPERTY_ID_LABEL, 0, &m_sLabel, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION), PROPERTY_ID_FUNCTION, 0, &m_bFunction, ::getCppuType(static_cast< sal_Bool*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AGGREGATEFUNCTION), PROPERTY_ID_AGGREGATEFUNCTION, 0, &m_bAggregateFunction, ::getCppuType(static_cast< sal_Bool*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME, 0, &m_aTableName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME), PROPERTY_ID_REALNAME, 0, &m_aRealName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DBASEPRECISIONCHANGED), PROPERTY_ID_DBASEPRECISIONCHANGED, 0, &m_bDbasePrecisionChanged, ::getCppuType(static_cast<sal_Bool*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE), PROPERTY_ID_ISSEARCHABLE, 0, &m_bIsSearchable, ::getCppuType(static_cast< sal_Bool*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL), PROPERTY_ID_LABEL, 0, &m_sLabel, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
- }
- // -----------------------------------------------------------------------------
- ::cppu::IPropertyArrayHelper* OParseColumn::createArrayHelper() const
-@@ -268,9 +268,9 @@
- void OOrderColumn::construct()
- {
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING,
-- PropertyAttribute::READONLY, const_cast< sal_Bool* >( &m_bAscending ), ::getCppuType( reinterpret_cast< sal_Bool* >( NULL ) ) );
-+ PropertyAttribute::READONLY, const_cast< sal_Bool* >( &m_bAscending ), ::getCppuType( static_cast< sal_Bool* >( 0 ) ) );
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME,
-- PropertyAttribute::READONLY, const_cast< ::rtl::OUString* >( &m_sTableName ), ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-+ PropertyAttribute::READONLY, const_cast< ::rtl::OUString* >( &m_sTableName ), ::getCppuType(static_cast< ::rtl::OUString*>(0)));
- }
- // -----------------------------------------------------------------------------
- ::cppu::IPropertyArrayHelper* OOrderColumn::createArrayHelper() const
diff --git a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VCatalog.cxx b/editors/libreoffice/files/patch-connectivity__source__sdbcx__VCatalog.cxx
deleted file mode 100644
index 31fe68eb2c90..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VCatalog.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./connectivity/source/sdbcx/VCatalog.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/sdbcx/VCatalog.cxx 2012-07-18 13:18:57.000000000 -0400
-@@ -230,7 +230,7 @@
- void ODescriptor::construct()
- {
- sal_Int32 nAttrib = isNew() ? 0 : ::com::sun::star::beans::PropertyAttribute::READONLY;
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME), PROPERTY_ID_NAME ,nAttrib,&m_Name,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME), PROPERTY_ID_NAME ,nAttrib,&m_Name,::getCppuType(static_cast< ::rtl::OUString*>(0)));
- }
- // -------------------------------------------------------------------------
- ODescriptor::~ODescriptor()
diff --git a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VColumn.cxx b/editors/libreoffice/files/patch-connectivity__source__sdbcx__VColumn.cxx
deleted file mode 100644
index cfbfcd18afbc..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VColumn.cxx
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./connectivity/source/sdbcx/VColumn.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/sdbcx/VColumn.cxx 2012-07-18 13:07:09.000000000 -0400
-@@ -166,13 +166,13 @@
-
- sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
-
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME), PROPERTY_ID_TYPENAME, nAttrib,&m_TypeName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION, nAttrib,&m_Description, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), PROPERTY_ID_DEFAULTVALUE, nAttrib,&m_DefaultValue, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION), PROPERTY_ID_PRECISION, nAttrib,&m_Precision, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE), PROPERTY_ID_SCALE, nAttrib,&m_Scale, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE), PROPERTY_ID_ISNULLABLE, nAttrib,&m_IsNullable, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME), PROPERTY_ID_TYPENAME, nAttrib,&m_TypeName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION, nAttrib,&m_Description, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), PROPERTY_ID_DEFAULTVALUE, nAttrib,&m_DefaultValue, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION), PROPERTY_ID_PRECISION, nAttrib,&m_Precision, ::getCppuType(static_cast<sal_Int32*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(static_cast<sal_Int32*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE), PROPERTY_ID_SCALE, nAttrib,&m_Scale, ::getCppuType(static_cast<sal_Int32*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE), PROPERTY_ID_ISNULLABLE, nAttrib,&m_IsNullable, ::getCppuType(static_cast<sal_Int32*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT), PROPERTY_ID_ISAUTOINCREMENT, nAttrib,&m_IsAutoIncrement, ::getBooleanCppuType());
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISROWVERSION), PROPERTY_ID_ISROWVERSION, nAttrib,&m_IsRowVersion, ::getBooleanCppuType());
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY), PROPERTY_ID_ISCURRENCY, nAttrib,&m_IsCurrency, ::getBooleanCppuType());
diff --git a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VIndex.cxx b/editors/libreoffice/files/patch-connectivity__source__sdbcx__VIndex.cxx
deleted file mode 100644
index 968e7f6fb7ac..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VIndex.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./connectivity/source/sdbcx/VIndex.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/sdbcx/VIndex.cxx 2012-07-18 13:17:23.000000000 -0400
-@@ -142,7 +142,7 @@
-
- sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
-
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOG), PROPERTY_ID_CATALOG, nAttrib,&m_Catalog, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOG), PROPERTY_ID_CATALOG, nAttrib,&m_Catalog, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE), PROPERTY_ID_ISUNIQUE, nAttrib,&m_IsUnique, ::getBooleanCppuType());
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISPRIMARYKEYINDEX),PROPERTY_ID_ISPRIMARYKEYINDEX, nAttrib,&m_IsPrimaryKeyIndex, ::getBooleanCppuType());
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCLUSTERED), PROPERTY_ID_ISCLUSTERED, nAttrib,&m_IsClustered, ::getBooleanCppuType());
diff --git a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VKey.cxx b/editors/libreoffice/files/patch-connectivity__source__sdbcx__VKey.cxx
deleted file mode 100644
index adb61fab6b3c..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VKey.cxx
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./connectivity/source/sdbcx/VKey.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/sdbcx/VKey.cxx 2012-07-18 13:16:00.000000000 -0400
-@@ -139,10 +139,10 @@
-
- sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
-
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE), PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_aProps->m_ReferencedTable, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_aProps->m_Type, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE), PROPERTY_ID_UPDATERULE, nAttrib,&m_aProps->m_UpdateRule, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE), PROPERTY_ID_DELETERULE, nAttrib,&m_aProps->m_DeleteRule, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE), PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_aProps->m_ReferencedTable, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_aProps->m_Type, ::getCppuType(static_cast<sal_Int32*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE), PROPERTY_ID_UPDATERULE, nAttrib,&m_aProps->m_UpdateRule, ::getCppuType(static_cast<sal_Int32*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE), PROPERTY_ID_DELETERULE, nAttrib,&m_aProps->m_DeleteRule, ::getCppuType(static_cast<sal_Int32*>(0)));
- }
- // -------------------------------------------------------------------------
- void SAL_CALL OKey::disposing()
diff --git a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VKeyColumn.cxx b/editors/libreoffice/files/patch-connectivity__source__sdbcx__VKeyColumn.cxx
deleted file mode 100644
index 31eeffc7ff87..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VKeyColumn.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./connectivity/source/sdbcx/VKeyColumn.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/sdbcx/VKeyColumn.cxx 2012-07-18 13:11:37.000000000 -0400
-@@ -115,7 +115,7 @@
- void OKeyColumn::construct()
- {
- sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
- }
- // -----------------------------------------------------------------------------
-
diff --git a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VTable.cxx b/editors/libreoffice/files/patch-connectivity__source__sdbcx__VTable.cxx
deleted file mode 100644
index 7e0faeb1c292..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VTable.cxx
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./connectivity/source/sdbcx/VTable.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/sdbcx/VTable.cxx 2012-07-18 13:14:27.000000000 -0400
-@@ -121,10 +121,10 @@
-
- sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
-
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
- }
- // -----------------------------------------------------------------------------
- void SAL_CALL OTable::acquire() throw()
diff --git a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VView.cxx b/editors/libreoffice/files/patch-connectivity__source__sdbcx__VView.cxx
deleted file mode 100644
index d9d9fbd6e2e0..000000000000
--- a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VView.cxx
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./connectivity/source/sdbcx/VView.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./connectivity/source/sdbcx/VView.cxx 2012-07-18 13:21:10.000000000 -0400
-@@ -78,10 +78,10 @@
-
- sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
-
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND), PROPERTY_ID_COMMAND, nAttrib,&m_Command, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION), PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND), PROPERTY_ID_COMMAND, nAttrib,&m_Command, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION), PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption, ::getCppuType(static_cast< sal_Int32*>(0)));
- }
- // -------------------------------------------------------------------------
- void OView::disposing(void)
diff --git a/editors/libreoffice/files/patch-cppunit__freebsd.patch b/editors/libreoffice/files/patch-cppunit__freebsd.patch
index 251ee50d8ff8..a946f8d7ba65 100644
--- a/editors/libreoffice/files/patch-cppunit__freebsd.patch
+++ b/editors/libreoffice/files/patch-cppunit__freebsd.patch
@@ -1,6 +1,6 @@
---- ./cppunit/freebsd.patch.orig 2012-07-25 15:44:00.000000000 -0400
-+++ ./cppunit/freebsd.patch 2012-07-25 15:46:01.000000000 -0400
-@@ -0,0 +1,128 @@
+--- ./cppunit/freebsd.patch.orig 2013-02-18 18:38:29.000000000 -0500
++++ ./cppunit/freebsd.patch 2013-02-18 18:38:29.000000000 -0500
+@@ -0,0 +1,110 @@
+--- misc/build/cppunit-1.12.1/configure 2008-02-20 00:59:58.000000000 -0500
++++ misc/build/cppunit-1.12.1/configure 2012-07-25 15:06:50.000000000 -0400
+@@ -8917,7 +8917,7 @@
@@ -111,21 +111,3 @@
+ *) objformat=elf ;;
+ esac
+ fi
-+@@ -21068,6 +21068,7 @@
-+ #include <typeinfo>
-+ #include <cxxabi.h>
-+ #include <string>
-++#include <cstdlib>
-+
-+ template<typename TYPE>
-+ class A {};
-+--- misc/build/cppunit-1.12.1/src/cppunit/TypeInfoHelper.cpp 2004-02-18 15:45:44.000000000 -0500
-++++ misc/build/cppunit-1.12.1/src/cppunit/TypeInfoHelper.cpp 2012-07-25 15:05:11.000000000 -0400
-+@@ -6,6 +6,7 @@
-+ #include <string>
-+
-+ #if CPPUNIT_HAVE_GCC_ABI_DEMANGLE
-++#include <cstdlib>
-+ #include <cxxabi.h>
-+ #endif
-+
diff --git a/editors/libreoffice/files/patch-cppunit__gcc-abi-demangle.patch b/editors/libreoffice/files/patch-cppunit__gcc-abi-demangle.patch
deleted file mode 100644
index 3446cacbe86d..000000000000
--- a/editors/libreoffice/files/patch-cppunit__gcc-abi-demangle.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./cppunit/gcc-abi-demangle.patch.orig 2012-07-25 15:22:00.000000000 -0400
-+++ ./cppunit/gcc-abi-demangle.patch 2012-08-22 14:35:55.000000000 -0400
-@@ -0,0 +1,28 @@
-+--- misc/build/cppunit-1.12.1/src/cppunit/TypeInfoHelper.cpp 2004-02-18 15:45:44.000000000 -0500
-++++ misc/build/cppunit-1.12.1/src/cppunit/TypeInfoHelper.cpp 2012-08-22 14:35:55.000000000 -0400
-+@@ -21,10 +21,21 @@
-+ int status = 0;
-+ char* c_name = 0;
-+
-+- c_name = abi::__cxa_demangle( info.name(), 0, 0, &status );
-+-
-+- std::string name( c_name );
-+- free( c_name );
-++ const char* c_origName = info.name();
-++ if(c_origName[0] == '*')
-++ ++c_origName;
-++ c_name = abi::__cxa_demangle( c_origName, 0, 0, &status );
-++
-++ std::string name;
-++ if(c_name)
-++ {
-++ name = std::string( c_name );
-++ free( c_name );
-++ }
-++ else
-++ {
-++ name = std::string( c_origName );
-++ }
-+
-+ #else // CPPUNIT_HAVE_GCC_ABI_DEMANGLE
-+
diff --git a/editors/libreoffice/files/patch-cppunit__makefile.mk b/editors/libreoffice/files/patch-cppunit__makefile.mk
index 7448d3031ab0..3ffb22ee3674 100644
--- a/editors/libreoffice/files/patch-cppunit__makefile.mk
+++ b/editors/libreoffice/files/patch-cppunit__makefile.mk
@@ -1,16 +1,7 @@
---- ./cppunit/makefile.mk.orig 2013-01-16 04:41:51.000000000 -0500
-+++ ./cppunit/makefile.mk 2013-01-31 15:27:50.000000000 -0500
-@@ -34,7 +34,7 @@
- # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
- # cppunit-1.12.1.tar.gz/download>
-
--PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch ios.patch cppunit-1.12.1-unused-parameters.patch cppunit-1.12.1-warnings.patch
-+PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch ios.patch cppunit-1.12.1-unused-parameters.patch cppunit-1.12.1-warnings.patch gcc-abi-demangle.patch
- # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail&
- # aid=2912590&group_id=11795&atid=311795>; upstreamed as
- # <http://cgit.freedesktop.org/libreoffice/cppunit/commit/?id=
-@@ -64,6 +64,10 @@
- PATCH_FILES += android.patch
+--- ./cppunit/makefile.mk.orig 2013-01-31 05:54:53.000000000 -0500
++++ ./cppunit/makefile.mk 2013-02-18 18:38:29.000000000 -0500
+@@ -46,6 +46,10 @@
+ PATCH_FILES += disable-dynloading.patch
.ENDIF
+.IF "$(OS)" == "FREEBSD"
diff --git a/editors/libreoffice/files/patch-dbaccess__source__core__api__RowSet.cxx b/editors/libreoffice/files/patch-dbaccess__source__core__api__RowSet.cxx
deleted file mode 100644
index 560b97de3a76..000000000000
--- a/editors/libreoffice/files/patch-dbaccess__source__core__api__RowSet.cxx
+++ /dev/null
@@ -1,92 +0,0 @@
---- ./dbaccess/source/core/api/RowSet.cxx.orig 2012-07-27 08:37:04.000000000 -0400
-+++ ./dbaccess/source/core/api/RowSet.cxx 2012-07-31 19:44:15.000000000 -0400
-@@ -178,45 +178,45 @@
- m_aPrematureParamValues.get().resize( 0 );
-
- // sdb.RowSet Properties
-- registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL)));
-- registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, &m_aDataSourceName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_aCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(PROPERTY_COMMAND_TYPE, PROPERTY_ID_COMMAND_TYPE, PropertyAttribute::BOUND, &m_nCommandType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
-- registerProperty(PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, nRBT, &m_aActiveCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-+ registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(static_cast< Reference< XConnection >* >(0)));
-+ registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, &m_aDataSourceName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_aCommand, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(PROPERTY_COMMAND_TYPE, PROPERTY_ID_COMMAND_TYPE, PropertyAttribute::BOUND, &m_nCommandType, ::getCppuType(static_cast< sal_Int32*>(0)));
-+ registerProperty(PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, nRBT, &m_aActiveCommand, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
- registerProperty(PROPERTY_IGNORERESULT, PROPERTY_ID_IGNORERESULT, PropertyAttribute::BOUND, &m_bIgnoreResult, ::getBooleanCppuType());
-- registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, &m_aFilter, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(PROPERTY_HAVING_CLAUSE, PROPERTY_ID_HAVING_CLAUSE, PropertyAttribute::BOUND, &m_aHavingClause, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(PROPERTY_GROUP_BY, PROPERTY_ID_GROUP_BY, PropertyAttribute::BOUND, &m_aGroupBy, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-+ registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, &m_aFilter, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(PROPERTY_HAVING_CLAUSE, PROPERTY_ID_HAVING_CLAUSE, PropertyAttribute::BOUND, &m_aHavingClause, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(PROPERTY_GROUP_BY, PROPERTY_ID_GROUP_BY, PropertyAttribute::BOUND, &m_aGroupBy, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
- registerProperty(PROPERTY_APPLYFILTER, PROPERTY_ID_APPLYFILTER, PropertyAttribute::BOUND, &m_bApplyFilter, ::getBooleanCppuType());
-- registerProperty(PROPERTY_ORDER, PROPERTY_ID_ORDER, PropertyAttribute::BOUND, &m_aOrder, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, nRT, &m_nPrivileges, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
-+ registerProperty(PROPERTY_ORDER, PROPERTY_ID_ORDER, PropertyAttribute::BOUND, &m_aOrder, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, nRT, &m_nPrivileges, ::getCppuType(static_cast< sal_Int32*>(0)));
- registerProperty(PROPERTY_ISMODIFIED, PROPERTY_ID_ISMODIFIED, nBT, &m_bModified, ::getBooleanCppuType());
- registerProperty(PROPERTY_ISNEW, PROPERTY_ID_ISNEW, nRBT, &m_bNew, ::getBooleanCppuType());
-- registerProperty(PROPERTY_SINGLESELECTQUERYCOMPOSER,PROPERTY_ID_SINGLESELECTQUERYCOMPOSER, nRT, &m_xComposer, ::getCppuType(reinterpret_cast< Reference< XSingleSelectQueryComposer >* >(NULL)));
-+ registerProperty(PROPERTY_SINGLESELECTQUERYCOMPOSER,PROPERTY_ID_SINGLESELECTQUERYCOMPOSER, nRT, &m_xComposer, ::getCppuType(static_cast< Reference< XSingleSelectQueryComposer >* >(0)));
-
- // sdbcx.ResultSet Properties
- registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarkable, ::getBooleanCppuType());
- registerProperty(PROPERTY_CANUPDATEINSERTEDROWS,PROPERTY_ID_CANUPDATEINSERTEDROWS, nRT, &m_bCanUpdateInsertedRows, ::getBooleanCppuType());
- // sdbc.ResultSet Properties
-- registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::TRANSIENT, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
-- registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::TRANSIENT, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
-- registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
-- registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
-+ registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::TRANSIENT, &m_nResultSetConcurrency,::getCppuType(static_cast< sal_Int32*>(0)));
-+ registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::TRANSIENT, &m_nResultSetType, ::getCppuType(static_cast< sal_Int32*>(0)));
-+ registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(static_cast< sal_Int32*>(0)));
-+ registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(static_cast< sal_Int32*>(0)));
-
- // sdbc.RowSet Properties
-- registerProperty(PROPERTY_URL, PROPERTY_ID_URL, 0, &m_aURL, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(PROPERTY_TRANSACTIONISOLATION, PROPERTY_ID_TRANSACTIONISOLATION, PropertyAttribute::TRANSIENT, &m_nTransactionIsolation,::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
-- registerMayBeVoidProperty(PROPERTY_TYPEMAP, PROPERTY_ID_TYPEMAP, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT, &m_aTypeMap, ::getCppuType(reinterpret_cast< Reference< XNameAccess >* >(NULL)));
-+ registerProperty(PROPERTY_URL, PROPERTY_ID_URL, 0, &m_aURL, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(PROPERTY_TRANSACTIONISOLATION, PROPERTY_ID_TRANSACTIONISOLATION, PropertyAttribute::TRANSIENT, &m_nTransactionIsolation,::getCppuType(static_cast< sal_Int32*>(0)));
-+ registerMayBeVoidProperty(PROPERTY_TYPEMAP, PROPERTY_ID_TYPEMAP, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT, &m_aTypeMap, ::getCppuType(static_cast< Reference< XNameAccess >* >(0)));
- registerProperty(PROPERTY_ESCAPE_PROCESSING,PROPERTY_ID_ESCAPE_PROCESSING, PropertyAttribute::BOUND, &m_bUseEscapeProcessing,::getBooleanCppuType() );
-- registerProperty(PROPERTY_QUERYTIMEOUT, PROPERTY_ID_QUERYTIMEOUT, PropertyAttribute::TRANSIENT, &m_nQueryTimeOut, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
-- registerProperty(PROPERTY_MAXFIELDSIZE, PROPERTY_ID_MAXFIELDSIZE, PropertyAttribute::TRANSIENT, &m_nMaxFieldSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
-- registerProperty(PROPERTY_MAXROWS, PROPERTY_ID_MAXROWS, 0, &m_nMaxRows, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)) );
-- registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT, &m_aUser, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT, &m_aPassword, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
--
-- registerProperty(PROPERTY_UPDATE_CATALOGNAME, PROPERTY_ID_UPDATE_CATALOGNAME, PropertyAttribute::BOUND, &m_aUpdateCatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(PROPERTY_UPDATE_SCHEMANAME, PROPERTY_ID_UPDATE_SCHEMANAME, PropertyAttribute::BOUND, &m_aUpdateSchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-- registerProperty(PROPERTY_UPDATE_TABLENAME, PROPERTY_ID_UPDATE_TABLENAME, PropertyAttribute::BOUND, &m_aUpdateTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-+ registerProperty(PROPERTY_QUERYTIMEOUT, PROPERTY_ID_QUERYTIMEOUT, PropertyAttribute::TRANSIENT, &m_nQueryTimeOut, ::getCppuType(static_cast< sal_Int32*>(0)));
-+ registerProperty(PROPERTY_MAXFIELDSIZE, PROPERTY_ID_MAXFIELDSIZE, PropertyAttribute::TRANSIENT, &m_nMaxFieldSize, ::getCppuType(static_cast< sal_Int32*>(0)));
-+ registerProperty(PROPERTY_MAXROWS, PROPERTY_ID_MAXROWS, 0, &m_nMaxRows, ::getCppuType(static_cast< sal_Int32*>(0)) );
-+ registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT, &m_aUser, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT, &m_aPassword, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+
-+ registerProperty(PROPERTY_UPDATE_CATALOGNAME, PROPERTY_ID_UPDATE_CATALOGNAME, PropertyAttribute::BOUND, &m_aUpdateCatalogName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(PROPERTY_UPDATE_SCHEMANAME, PROPERTY_ID_UPDATE_SCHEMANAME, PropertyAttribute::BOUND, &m_aUpdateSchemaName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-+ registerProperty(PROPERTY_UPDATE_TABLENAME, PROPERTY_ID_UPDATE_TABLENAME, PropertyAttribute::BOUND, &m_aUpdateTableName, ::getCppuType(static_cast< ::rtl::OUString*>(0)));
-
- // ???
- registerProperty(PROPERTY_CHANGE_NOTIFICATION_ENABLED, PROPERTY_ID_PROPCHANGE_NOTIFY, PropertyAttribute::BOUND, &m_bPropChangeNotifyEnabled, ::getBooleanCppuType());
-@@ -2806,11 +2806,11 @@
- sal_Int32 nRT = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT;
-
- // sdb.RowSet Properties
-- registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, &rParent.m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL)));
-- registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
-- registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
-- registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
-- registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
-+ registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, &rParent.m_aActiveConnection, ::getCppuType(static_cast< Reference< XConnection >* >(0)));
-+ registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY, &m_nResultSetConcurrency,::getCppuType(static_cast< sal_Int32*>(0)));
-+ registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY, &m_nResultSetType, ::getCppuType(static_cast< sal_Int32*>(0)));
-+ registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(static_cast< sal_Int32*>(0)));
-+ registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(static_cast< sal_Int32*>(0)));
- registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarkable, ::getBooleanCppuType());
- }
-
diff --git a/editors/libreoffice/files/patch-dbaccess__source__core__api__TableDeco.cxx b/editors/libreoffice/files/patch-dbaccess__source__core__api__TableDeco.cxx
deleted file mode 100644
index 6cc63680126a..000000000000
--- a/editors/libreoffice/files/patch-dbaccess__source__core__api__TableDeco.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./dbaccess/source/core/api/TableDeco.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./dbaccess/source/core/api/TableDeco.cxx 2012-07-18 14:52:59.000000000 -0400
-@@ -172,7 +172,7 @@
- {
- Any aValue;
- getFastPropertyValue(aValue,nHandle);
-- bRet = ::comphelper::tryPropertyValue(rConvertedValue,rOldValue,rValue,aValue,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-+ bRet = ::comphelper::tryPropertyValue(rConvertedValue,rOldValue,rValue,aValue,::getCppuType(static_cast< ::rtl::OUString*>(0)));
- }
- break; // we assume that it works
- }
diff --git a/editors/libreoffice/files/patch-dbaccess__source__ui__browser__sbagrid.cxx b/editors/libreoffice/files/patch-dbaccess__source__ui__browser__sbagrid.cxx
deleted file mode 100644
index 8ad7caf014a6..000000000000
--- a/editors/libreoffice/files/patch-dbaccess__source__ui__browser__sbagrid.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./dbaccess/source/ui/browser/sbagrid.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./dbaccess/source/ui/browser/sbagrid.cxx 2012-07-18 14:58:46.000000000 -0400
-@@ -602,7 +602,7 @@
- Sequence< Type > aTypes = FmXGridPeer::getTypes();
- sal_Int32 nOldLen = aTypes.getLength();
- aTypes.realloc(nOldLen + 1);
-- aTypes.getArray()[nOldLen] = ::getCppuType( reinterpret_cast< Reference< ::com::sun::star::frame::XDispatch >* >(NULL) );
-+ aTypes.getArray()[nOldLen] = ::getCppuType( static_cast< Reference< ::com::sun::star::frame::XDispatch >* >(0) );
-
- return aTypes;
- }
diff --git a/editors/libreoffice/files/patch-editeng__Module_editeng.mk b/editors/libreoffice/files/patch-editeng__Module_editeng.mk
new file mode 100644
index 000000000000..7f92f4a1fa01
--- /dev/null
+++ b/editors/libreoffice/files/patch-editeng__Module_editeng.mk
@@ -0,0 +1,10 @@
+--- editeng/Module_editeng.mk.orig 2013-01-31 05:54:53.000000000 -0500
++++ editeng/Module_editeng.mk 2013-02-22 14:31:45.000000000 -0500
+@@ -28,7 +28,6 @@
+ # add any runtime tests (unit tests) here
+ # remove if no tests
+ $(eval $(call gb_Module_add_check_targets,editeng,\
+- CppunitTest_editeng_core \
+ CppunitTest_editeng_borderline \
+ CppunitTest_editeng_lookuptree \
+ ))
diff --git a/editors/libreoffice/files/patch-extensions__Library_ldapbe2.mk b/editors/libreoffice/files/patch-extensions__Library_ldapbe2.mk
new file mode 100644
index 000000000000..35a58003af24
--- /dev/null
+++ b/editors/libreoffice/files/patch-extensions__Library_ldapbe2.mk
@@ -0,0 +1,23 @@
+--- ./extensions/Library_ldapbe2.mk.orig 2013-01-31 05:54:53.000000000 -0500
++++ ./extensions/Library_ldapbe2.mk 2013-02-19 17:56:48.000000000 -0500
+@@ -58,16 +58,10 @@
+ wldap32 \
+ ))
+ else # 0S!=WNT
+-$(eval $(call gb_Library_use_externals,ldapbe2,openldap))
+-
+-$(eval $(call gb_Library_add_libs,ldapbe2,\
+- -lssl3 \
+- -lsmime3 \
+- -lnss3 \
+- -lnssutil3 \
+- -lplds4 \
+- -lplc4 \
+- -lnspr4 \
++$(eval $(call gb_Library_use_externals,ldapbe2,\
++ nss3 \
++ openldap \
++ plc4 \
+ ))
+ endif
+
diff --git a/editors/libreoffice/files/patch-extensions__Library_npsoplugin.mk b/editors/libreoffice/files/patch-extensions__Library_npsoplugin.mk
new file mode 100644
index 000000000000..f57f3dd1f8db
--- /dev/null
+++ b/editors/libreoffice/files/patch-extensions__Library_npsoplugin.mk
@@ -0,0 +1,14 @@
+--- ./extensions/Library_npsoplugin.mk.orig 2013-01-31 05:54:53.000000000 -0500
++++ ./extensions/Library_npsoplugin.mk 2013-02-19 17:00:56.000000000 -0500
+@@ -44,9 +44,11 @@
+
+ ifeq ($(GUI),UNX)
+
++ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
+ $(eval $(call gb_Library_add_libs,npsoplugin,\
+ -ldl \
+ ))
++endif
+
+ $(eval $(call gb_Library_use_external,npsoplugin,gtk))
+
diff --git a/editors/libreoffice/files/patch-extensions__source__resource__ResourceIndexAccess.cxx b/editors/libreoffice/files/patch-extensions__source__resource__ResourceIndexAccess.cxx
deleted file mode 100644
index 6d8ac3ce1707..000000000000
--- a/editors/libreoffice/files/patch-extensions__source__resource__ResourceIndexAccess.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./extensions/source/resource/ResourceIndexAccess.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./extensions/source/resource/ResourceIndexAccess.cxx 2012-07-18 15:15:23.000000000 -0400
-@@ -94,7 +94,7 @@
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- // XElementAccessBase
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException)
-- { return ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)); };
-+ { return ::getCppuType(static_cast< ::rtl::OUString*>(0)); };
- };
-
- class ResourceStringListIndexAccess : public ResourceIndexAccessBase
-@@ -106,7 +106,7 @@
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- // XElementAccessBase
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException)
-- { return ::getCppuType(reinterpret_cast<Sequence<PropertyValue> * >(NULL)); };
-+ { return ::getCppuType(static_cast<Sequence<PropertyValue> * >(0)); };
- };
- }
-
diff --git a/editors/libreoffice/files/patch-extensions__source__resource__ResourceIndexAccess.hxx b/editors/libreoffice/files/patch-extensions__source__resource__ResourceIndexAccess.hxx
deleted file mode 100644
index cf92d2dc371d..000000000000
--- a/editors/libreoffice/files/patch-extensions__source__resource__ResourceIndexAccess.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./extensions/source/resource/ResourceIndexAccess.hxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./extensions/source/resource/ResourceIndexAccess.hxx 2012-07-18 15:17:25.000000000 -0400
-@@ -58,7 +58,7 @@
- virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
- // XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException)
-- { return ::getCppuType(reinterpret_cast< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>*>(NULL)); };
-+ { return ::getCppuType(static_cast< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>*>(0)); };
- virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException)
- { return static_cast<bool>(m_pResMgr.get()); };
-
diff --git a/editors/libreoffice/files/patch-forms__source__component__ComboBox.cxx b/editors/libreoffice/files/patch-forms__source__component__ComboBox.cxx
deleted file mode 100644
index 88e28506df14..000000000000
--- a/editors/libreoffice/files/patch-forms__source__component__ComboBox.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./forms/source/component/ComboBox.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./forms/source/component/ComboBox.cxx 2012-07-18 14:41:05.000000000 -0400
-@@ -227,7 +227,7 @@
- switch (_nHandle)
- {
- case PROPERTY_ID_LISTSOURCETYPE :
-- DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(reinterpret_cast<ListSourceType*>(NULL))),
-+ DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(static_cast<ListSourceType*>(0))),
- "OComboBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" );
- _rValue >>= m_eListSourceType;
- break;
diff --git a/editors/libreoffice/files/patch-forms__source__component__ListBox.cxx b/editors/libreoffice/files/patch-forms__source__component__ListBox.cxx
deleted file mode 100644
index 01b2ed7d087e..000000000000
--- a/editors/libreoffice/files/patch-forms__source__component__ListBox.cxx
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./forms/source/component/ListBox.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./forms/source/component/ListBox.cxx 2012-07-18 14:39:02.000000000 -0400
-@@ -304,7 +304,7 @@
- break;
-
- case PROPERTY_ID_LISTSOURCETYPE :
-- DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(reinterpret_cast<ListSourceType*>(NULL))),
-+ DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(static_cast<ListSourceType*>(0))),
- "OComboBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" );
- _rValue >>= m_eListSourceType;
- break;
-@@ -343,7 +343,7 @@
- throw PropertyVetoException();
-
- case PROPERTY_ID_DEFAULT_SELECT_SEQ :
-- DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(reinterpret_cast< Sequence<sal_Int16>*>(NULL))),
-+ DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(static_cast< Sequence<sal_Int16>*>(0))),
- "OListBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" );
- _rValue >>= m_aDefaultSelectSeq;
-
-@@ -378,7 +378,7 @@
- switch (_nHandle)
- {
- case PROPERTY_ID_BOUNDCOLUMN :
-- bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_aBoundColumn, ::getCppuType(reinterpret_cast<sal_Int16*>(NULL)));
-+ bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_aBoundColumn, ::getCppuType(static_cast<sal_Int16*>(0)));
- break;
-
- case PROPERTY_ID_LISTSOURCETYPE:
diff --git a/editors/libreoffice/files/patch-forms__source__inc__property.hxx b/editors/libreoffice/files/patch-forms__source__inc__property.hxx
deleted file mode 100644
index 626baae6e76f..000000000000
--- a/editors/libreoffice/files/patch-forms__source__inc__property.hxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./forms/source/inc/property.hxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./forms/source/inc/property.hxx 2012-07-18 14:18:22.000000000 -0400
-@@ -111,7 +111,7 @@
-
- //------------------------------------------------------------------------------
- #define DECL_PROP_IMPL(varname, type) \
-- *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type* >(NULL)),
-+ *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(static_cast< type* >(0)),
-
- //------------------------------------------------------------------------------
- #define DECL_BOOL_PROP_IMPL(varname) \
-@@ -119,7 +119,7 @@
-
- //------------------------------------------------------------------------------
- #define DECL_IFACE_PROP_IMPL(varname, type) \
-- *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< com::sun::star::uno::Reference< type >* >(NULL)),
-+ *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(static_cast< com::sun::star::uno::Reference< type >* >(0)),
-
- //------------------------------------------------------------------------------
- #define BEGIN_DESCRIBE_PROPERTIES( count, baseclass ) \
diff --git a/editors/libreoffice/files/patch-i18npool__CustomTarget_breakiterator.mk b/editors/libreoffice/files/patch-i18npool__CustomTarget_breakiterator.mk
new file mode 100644
index 000000000000..aafdc05efce4
--- /dev/null
+++ b/editors/libreoffice/files/patch-i18npool__CustomTarget_breakiterator.mk
@@ -0,0 +1,11 @@
+--- ./i18npool/CustomTarget_breakiterator.mk.orig 2013-01-31 05:54:53.000000000 -0500
++++ ./i18npool/CustomTarget_breakiterator.mk 2013-02-22 15:26:45.000000000 -0500
+@@ -120,7 +120,7 @@
+ # sed substitution...
+ $(i18npool_BIDIR)/%.txt : \
+ $(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(i18npool_BIDIR)/.dir
+- sed -e ': dummy' \
++ $(SED) -e ': dummy' \
+ -e "s#\[:LineBreak = Close_Punctuation:\]#\[& \[:LineBreak = Close_Parenthesis:\]\]#" \
+ $(if $(filter-out YES,$(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER)),\
+ -e '/\[:LineBreak = Conditional_Japanese_Starter:\]/d' \
diff --git a/editors/libreoffice/files/patch-mysqlc__source__mysqlc_propertyids.hxx b/editors/libreoffice/files/patch-mysqlc__source__mysqlc_propertyids.hxx
deleted file mode 100644
index 80bc37aed19f..000000000000
--- a/editors/libreoffice/files/patch-mysqlc__source__mysqlc_propertyids.hxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./mysqlc/source/mysqlc_propertyids.hxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./mysqlc/source/mysqlc_propertyids.hxx 2012-07-18 15:00:02.000000000 -0400
-@@ -119,7 +119,7 @@
-
- //------------------------------------------------------------------------------
- #define DECL_PROP1IMPL(varname, type) \
--pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type*>(NULL)),
-+pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(static_cast< type*>(0)),
- //------------------------------------------------------------------------------
- #define DECL_PROP0(varname, type) \
- DECL_PROP1IMPL(varname, type) 0)
diff --git a/editors/libreoffice/files/patch-odk__pack__gendocu__makefile.mk b/editors/libreoffice/files/patch-odk__pack__gendocu__makefile.mk
index 6ff4536ba34a..96e61b0ee1dd 100644
--- a/editors/libreoffice/files/patch-odk__pack__gendocu__makefile.mk
+++ b/editors/libreoffice/files/patch-odk__pack__gendocu__makefile.mk
@@ -1,6 +1,6 @@
---- ./odk/pack/gendocu/makefile.mk.orig 2013-02-06 20:11:03.000000000 -0500
-+++ ./odk/pack/gendocu/makefile.mk 2013-02-07 13:26:20.000000000 -0500
-@@ -106,7 +106,7 @@
+--- ./odk/pack/gendocu/makefile.mk.orig 2013-01-31 05:54:53.000000000 -0500
++++ ./odk/pack/gendocu/makefile.mk 2013-02-18 18:38:29.000000000 -0500
+@@ -97,7 +97,7 @@
$(JAVA_SRC_FILES) : $(SOLARCOMMONPCKDIR)$/$$(@:f)
-$(MKDIRHIER) $(@:d)
$(MY_COPY) $< $@
diff --git a/editors/libreoffice/files/patch-odk__settings__settings.mk b/editors/libreoffice/files/patch-odk__settings__settings.mk
deleted file mode 100644
index e524171ffc92..000000000000
--- a/editors/libreoffice/files/patch-odk__settings__settings.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./odk/settings/settings.mk.orig 2013-01-16 04:41:51.000000000 -0500
-+++ ./odk/settings/settings.mk 2013-02-12 20:53:11.000000000 -0500
-@@ -566,7 +566,7 @@
-
- CC_OUTPUT_SWITCH=-o
-
--LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN'
-+LIBRARY_LINK_FLAGS=-shared '-Wl,-z,origin,-rpath,$$ORIGIN'
- COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
-
- EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined
diff --git a/editors/libreoffice/files/patch-registry__workben__makefile.mk b/editors/libreoffice/files/patch-registry__workben__makefile.mk
deleted file mode 100644
index dc2579fc7124..000000000000
--- a/editors/libreoffice/files/patch-registry__workben__makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./registry/workben/makefile.mk.orig 2012-07-27 08:37:04.000000000 -0400
-+++ ./registry/workben/makefile.mk 2012-08-28 19:38:00.000000000 -0400
-@@ -63,8 +63,8 @@
- APP2RPATH=NONE
- .IF "$(GUI)"=="UNX" && "$(OS)"!="MACOSX"
-
--.IF "$(OS)"=="LINUX"
--APP2LINKFLAGS=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../lib'\'
-+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
-+APP2LINKFLAGS=-Wl,-z,origin,-rpath,\''$$ORIGIN:$$ORIGIN/../lib'\'
- .ENDIF
-
- .IF "$(OS)"=="SOLARIS"
diff --git a/editors/libreoffice/files/patch-reportdesign__source__ui__report__ReportController.cxx b/editors/libreoffice/files/patch-reportdesign__source__ui__report__ReportController.cxx
deleted file mode 100644
index b9268de4af78..000000000000
--- a/editors/libreoffice/files/patch-reportdesign__source__ui__report__ReportController.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./reportdesign/source/ui/report/ReportController.cxx.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./reportdesign/source/ui/report/ReportController.cxx 2012-07-18 15:01:02.000000000 -0400
-@@ -325,7 +325,7 @@
-
- m_sMode = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal"));
- DBG_CTOR( rpt_OReportController,NULL);
-- registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZoomValue")),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(reinterpret_cast< sal_Int16*>(NULL)));
-+ registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZoomValue")),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(static_cast< sal_Int16*>(0)));
-
- }
- // -----------------------------------------------------------------------------
diff --git a/editors/libreoffice/files/patch-sal__osl__unx__interlck.c b/editors/libreoffice/files/patch-sal__osl__unx__interlck.c
deleted file mode 100644
index 3febb88ae2ea..000000000000
--- a/editors/libreoffice/files/patch-sal__osl__unx__interlck.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./sal/osl/unx/interlck.c.orig 2012-07-03 07:01:28.000000000 -0400
-+++ ./sal/osl/unx/interlck.c 2012-08-17 19:37:35.000000000 -0400
-@@ -60,7 +60,7 @@
- : "memory");
- return ++nCount;
- }
--#if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 ))
-+#if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 2 ))
- else
- return __sync_add_and_fetch (pCount, 1);
- #else
-@@ -89,7 +89,7 @@
- : "memory");
- return --nCount;
- }
--#if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 ))
-+#if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 2 ))
- else
- return __sync_sub_and_fetch (pCount, 1);
- #else
diff --git a/editors/libreoffice/files/patch-shell__Module_shell.mk b/editors/libreoffice/files/patch-shell__Module_shell.mk
new file mode 100644
index 000000000000..4b8970340fc1
--- /dev/null
+++ b/editors/libreoffice/files/patch-shell__Module_shell.mk
@@ -0,0 +1,11 @@
+--- ./shell/Module_shell.mk.orig 2013-01-31 05:54:53.000000000 -0500
++++ ./shell/Module_shell.mk 2013-02-19 20:26:39.000000000 -0500
+@@ -32,7 +32,7 @@
+ Library_localebe \
+ ))
+
+-ifeq ($(OS),LINUX)
++ifeq ($(GUI),UNX)
+ ifeq ($(ENABLE_GIO),TRUE)
+ $(eval $(call gb_Module_add_targets,shell,\
+ Library_losessioninstall \
diff --git a/editors/libreoffice/files/patch-solenv__gbuild__platform__unxgcc.mk b/editors/libreoffice/files/patch-solenv__gbuild__platform__unxgcc.mk
index c83340a64da7..19422ce327b9 100644
--- a/editors/libreoffice/files/patch-solenv__gbuild__platform__unxgcc.mk
+++ b/editors/libreoffice/files/patch-solenv__gbuild__platform__unxgcc.mk
@@ -1,20 +1,11 @@
---- ./solenv/gbuild/platform/unxgcc.mk.orig 2013-01-16 04:41:51.000000000 -0500
-+++ ./solenv/gbuild/platform/unxgcc.mk 2013-02-12 20:48:19.000000000 -0500
-@@ -297,7 +297,7 @@
- $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
-
- define gb_Library__get_rpath
--$(if $(1),$(strip '-Wl,-rpath,$(1)' '-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'))
-+$(if $(1),$(strip '-Wl,-z,origin,-rpath,$(1)' '-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'))
- endef
-
- define gb_Library_get_rpath
-@@ -338,7 +338,7 @@
-
-
- define gb_Executable_get_rpath
--'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))' \
-+'-Wl,-z,origin,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))' \
- -Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
- endef
+--- ./solenv/gbuild/platform/unxgcc.mk.orig 2013-02-19 19:39:23.000000000 -0500
++++ ./solenv/gbuild/platform/unxgcc.mk 2013-02-19 19:35:41.000000000 -0500
+@@ -53,7 +53,7 @@
+ gb_CXXFLAGS := \
+ $(gb_CXXFLAGS_COMMON) \
+ -fPIC \
+- -Wshadow \
++ -Wno-unused-parameter \
+ -Wsign-promo \
+ -Woverloaded-virtual \
diff --git a/editors/libreoffice/files/patch-solenv__inc__libs.mk b/editors/libreoffice/files/patch-solenv__inc__libs.mk
deleted file mode 100644
index ef982aaced3b..000000000000
--- a/editors/libreoffice/files/patch-solenv__inc__libs.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./solenv/inc/libs.mk.orig 2013-02-01 13:12:41.000000000 -0500
-+++ ./solenv/inc/libs.mk 2013-02-01 13:40:41.000000000 -0500
-@@ -213,7 +213,7 @@
- NEON3RDLIB=-lneon
- .ENDIF
- .IF "$(SYSTEM_DB)" == "YES"
--BERKELEYLIB=-l$(DB_LIB)
-+BERKELEYLIB=$(DB_LIB)
- .ELIF "$(GUI)$(COM)"=="WNTGCC"
- BERKELEYLIB=-ldb47
- .ELSE
diff --git a/editors/libreoffice/files/patch-solenv__inc__unxgcc.mk b/editors/libreoffice/files/patch-solenv__inc__unxgcc.mk
deleted file mode 100644
index 7ec2d03efa62..000000000000
--- a/editors/libreoffice/files/patch-solenv__inc__unxgcc.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./solenv/inc/unxgcc.mk.orig 2013-01-16 04:41:51.000000000 -0500
-+++ ./solenv/inc/unxgcc.mk 2013-02-12 20:50:31.000000000 -0500
-@@ -191,11 +191,11 @@
- # entry. This will cause both, DT_RPATH and DT_RUNPATH entries, to be created
- #
- LINKFLAGSDEFS*=-Wl,-z,defs
--LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\',--enable-new-dtags
--LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags
-+LINKFLAGSRUNPATH_URELIB=-Wl,-z,origin,-rpath,\''$$ORIGIN'\',--enable-new-dtags
-+LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags
- #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
--LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags
--LINKFLAGSRUNPATH_SDKBIN=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
-+LINKFLAGSRUNPATH_OOO=-Wl,-z,origin,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags
-+LINKFLAGSRUNPATH_SDKBIN=-Wl,-z,origin,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
- LINKFLAGSRUNPATH_OXT=
- LINKFLAGSRUNPATH_NONE=
- # flag -Wl,-z,noexecstack sets the NX bit on the stack
diff --git a/editors/libreoffice/files/patch-svtools__source__control__ctrlbox.cxx b/editors/libreoffice/files/patch-svtools__source__control__ctrlbox.cxx
new file mode 100644
index 000000000000..cd33a8d0ee1e
--- /dev/null
+++ b/editors/libreoffice/files/patch-svtools__source__control__ctrlbox.cxx
@@ -0,0 +1,11 @@
+--- ./svtools/source/control/ctrlbox.cxx.orig 2013-01-31 05:54:53.000000000 -0500
++++ svtools/source/control/ctrlbox.cxx 2013-02-19 18:17:07.000000000 -0500
+@@ -829,7 +829,7 @@
+ if ( nPos < pLineList->size() ) {
+ ImpLineList::iterator it = pLineList->begin();
+ ::std::advance( it, nPos );
+- pLineList->insert( it, reinterpret_cast<ImpLineListData *>(NULL) );
++ pLineList->insert( it, static_cast<ImpLineListData *>(NULL) );
+ } else {
+ pLineList->push_back( NULL );
+ }
diff --git a/editors/libreoffice/files/patch-svx__source__items__clipfmtitem.cxx b/editors/libreoffice/files/patch-svx__source__items__clipfmtitem.cxx
deleted file mode 100644
index 66580a48d826..000000000000
--- a/editors/libreoffice/files/patch-svx__source__items__clipfmtitem.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./svx/source/items/clipfmtitem.cxx.orig 2012-07-27 08:37:04.000000000 -0400
-+++ ./svx/source/items/clipfmtitem.cxx 2012-08-14 18:47:08.000000000 -0400
-@@ -133,7 +133,7 @@
- if( nPos > pImpl->aFmtNms.size() )
- nPos = pImpl->aFmtNms.size();
-
-- pImpl->aFmtNms.insert(pImpl->aFmtNms.begin() + nPos, NULL);
-+ pImpl->aFmtNms.insert(pImpl->aFmtNms.begin() + nPos, 0);
- pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId );
- }
-
diff --git a/editors/libreoffice/files/patch-sw__Module_sw.mk b/editors/libreoffice/files/patch-sw__Module_sw.mk
new file mode 100644
index 000000000000..c119788f71f6
--- /dev/null
+++ b/editors/libreoffice/files/patch-sw__Module_sw.mk
@@ -0,0 +1,13 @@
+--- ./sw/Module_sw.mk.orig 2013-01-31 05:54:53.000000000 -0500
++++ ./sw/Module_sw.mk 2013-02-22 14:30:05.000000000 -0500
+@@ -37,10 +37,6 @@
+
+ endif
+
+-$(eval $(call gb_Module_add_check_targets,sw,\
+- CppunitTest_sw_swdoc_test \
+-))
+-
+ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
+ CppunitTest_sw_macros_test \
+ CppunitTest_sw_subsequent_ooxmlexport \
diff --git a/editors/libreoffice/files/patch-sysui__desktop__share__create_tree.sh b/editors/libreoffice/files/patch-sysui__desktop__share__create_tree.sh
index 699066ab780c..7abb4306d9d1 100644
--- a/editors/libreoffice/files/patch-sysui__desktop__share__create_tree.sh
+++ b/editors/libreoffice/files/patch-sysui__desktop__share__create_tree.sh
@@ -1,6 +1,6 @@
---- ./sysui/desktop/share/create_tree.sh.orig 2012-03-27 18:22:01.000000000 +0200
-+++ ./sysui/desktop/share/create_tree.sh 2012-04-23 19:19:44.734593732 +0200
-@@ -42,32 +42,32 @@
+--- ./sysui/desktop/share/create_tree.sh.orig 2013-01-31 05:54:53.000000000 -0500
++++ ./sysui/desktop/share/create_tree.sh 2013-02-18 18:46:30.000000000 -0500
+@@ -60,32 +60,32 @@
chmod 0644 "${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}".*
fi
diff --git a/editors/libreoffice/files/disable-uno_test b/editors/libreoffice/files/patch-testtools__Module_testtools.mk
index 12bcacc6b6db..974bcdb4e942 100644
--- a/editors/libreoffice/files/disable-uno_test
+++ b/editors/libreoffice/files/patch-testtools__Module_testtools.mk
@@ -1,5 +1,5 @@
---- ./testtools/Module_testtools.mk.orig 2012-07-27 08:37:04.000000000 -0400
-+++ ./testtools/Module_testtools.mk 2012-08-21 12:06:21.000000000 -0400
+--- ./testtools/Module_testtools.mk.orig 2013-01-31 05:54:53.000000000 -0500
++++ ./testtools/Module_testtools.mk 2013-02-22 14:30:43.000000000 -0500
@@ -55,14 +55,6 @@
#))
#endif
diff --git a/editors/libreoffice/files/patch-vcl__unx__gtk__gdi__salnativewidgets-gtk.cxx b/editors/libreoffice/files/patch-vcl__unx__gtk__gdi__salnativewidgets-gtk.cxx
index cc7ee34763be..c8e35c703002 100644
--- a/editors/libreoffice/files/patch-vcl__unx__gtk__gdi__salnativewidgets-gtk.cxx
+++ b/editors/libreoffice/files/patch-vcl__unx__gtk__gdi__salnativewidgets-gtk.cxx
@@ -1,11 +1,11 @@
---- ./vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx.orig 2012-03-27 18:22:01.000000000 +0200
-+++ ./vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 2012-04-16 14:24:48.000000000 +0200
-@@ -3688,7 +3688,7 @@
+--- ./vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx.orig 2013-01-31 05:54:53.000000000 -0500
++++ ./vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 2013-02-18 18:47:08.000000000 -0500
+@@ -4025,7 +4025,7 @@
aStyleSet.SetPreferredSymbolsStyleName( OUString::createFromAscii( pIconThemeName ) );
g_free( pIconThemeName );
- aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE );
+ aStyleSet.SetToolbarIconSize( nDispDPIY > 160 ? STYLE_TOOLBAR_ICONSIZE_LARGE : STYLE_TOOLBAR_ICONSIZE_SMALL );
- const cairo_font_options_t* pNewOptions = NULL;
#if !GTK_CHECK_VERSION(2,9,0)
+ static cairo_font_options_t* (*gdk_screen_get_font_options)(GdkScreen*) =
diff --git a/french/libreoffice/distinfo b/french/libreoffice/distinfo
index 0a917fb3dae1..d140ce128d02 100644
--- a/french/libreoffice/distinfo
+++ b/french/libreoffice/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_fr.tar.gz) = 62014dd6a362148fb4939dc4ce593047e2955638510de2186ddcdbc8463cf3a1
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_fr.tar.gz) = 3787264
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_fr.tar.gz) = 5010771fb8e53a4e06733c96c481423c0b2d33c8ef8479fb11f4cd54a3c66162
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_fr.tar.gz) = 11194651
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_fr.tar.gz) = 81d275a31c80846ca1caf967b3da38afad7ef7e20826e74824636f113d953461
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_fr.tar.gz) = 2939269
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_fr.tar.gz) = 648c060ee7c14122e9b802644f727be37695bef66ff2fb4b9408e7d654e25258
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_fr.tar.gz) = 10932779
diff --git a/german/libreoffice/distinfo b/german/libreoffice/distinfo
index d41a3b2182d4..8a10abcbd163 100644
--- a/german/libreoffice/distinfo
+++ b/german/libreoffice/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_de.tar.gz) = 4ef9915fc4eaacd8e1c48546c3f339986d1db9630b661f348d979acec2828a37
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_de.tar.gz) = 11637818
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_de.tar.gz) = a65daeddacde63745d8116a8829a22800e24c4edf79f6edcc7ad8fcefbafa42a
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_de.tar.gz) = 11144971
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_de.tar.gz) = afc023f6e5e8f7f31b2e6e8e06ec1384334937e629c2be69f0c34a39c81039b5
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_de.tar.gz) = 11352490
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_de.tar.gz) = d948f37d4a4fd95c58ffc2a732a0dd4dc940358a1b26f2f8c9e3aff7117066e5
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_de.tar.gz) = 10879100
diff --git a/hebrew/libreoffice/distinfo b/hebrew/libreoffice/distinfo
index c245352117b6..6e5d2d124f02 100644
--- a/hebrew/libreoffice/distinfo
+++ b/hebrew/libreoffice/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_he.tar.gz) = be27f22e3abbb0fed89298faa8abdfa3094e5664a5cc7c753c3832f03ad6417a
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_he.tar.gz) = 2667405
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_he.tar.gz) = d20be0588966bfc3db4f94e458b648556931031aab724f0f80c357d39ccba41d
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_he.tar.gz) = 9125454
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_he.tar.gz) = 36bd7f0b56dc52863dba3dc1c32d09a2c15ecf5f96171737e257d5936506cce0
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_he.tar.gz) = 1785595
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_he.tar.gz) = 3bdf09f09f307a826abdfe34a70a9e69eac41eacaeccd43d5bff5a7f8548a919
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_he.tar.gz) = 8859110
diff --git a/hungarian/libreoffice/distinfo b/hungarian/libreoffice/distinfo
index 3d2b2e0235a9..5d71e7d10175 100644
--- a/hungarian/libreoffice/distinfo
+++ b/hungarian/libreoffice/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_hu.tar.gz) = 0d9119eab04073fe5910188ec9bd7dde3231263e6ac275245d0861b4baf1a974
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_hu.tar.gz) = 3763200
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_hu.tar.gz) = cb7ff983c98fe8700cbd92fe41bc877da4a7c2afd681121059be7e1cf054d708
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_hu.tar.gz) = 11077709
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_hu.tar.gz) = e64174d54d8817daec92c106630fae5add7372962678bc5eff08521f937d1190
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_hu.tar.gz) = 2826869
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_hu.tar.gz) = 3016fac077f61632c1136cf2129a354c7a32567c100d74221161679bc7d1b254
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_hu.tar.gz) = 10808438
diff --git a/japanese/libreoffice/distinfo b/japanese/libreoffice/distinfo
index a9f5d3656757..191895bc5bbc 100644
--- a/japanese/libreoffice/distinfo
+++ b/japanese/libreoffice/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ja.tar.gz) = 327f5262e0a09f533d9be73503704ebd9f5b03334fc9c6a4ed4a90cbef16d263
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ja.tar.gz) = 1698661
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ja.tar.gz) = 5f486b0378fcca537f210d1e52c0fb0a9b286ee1b6fdb06ae9e4501f9a9956e2
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ja.tar.gz) = 16974150
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ja.tar.gz) = 8d9031b2ea18e79bcbd5054e69df74f45c393fe17fef2a46fc0b55629210bdf1
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ja.tar.gz) = 711332
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ja.tar.gz) = 0e4c9e44b3b3d34a8c28befec3c5a31449ba3ea1e9d93a1902e523ddd3cf80c4
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ja.tar.gz) = 16675050
diff --git a/korean/libreoffice/distinfo b/korean/libreoffice/distinfo
index 939d697b55d5..169d7dd81969 100644
--- a/korean/libreoffice/distinfo
+++ b/korean/libreoffice/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ko.tar.gz) = 1c4747dd2058f2b8d8b528e8a7f362d35ffd88f2434d25dd02b2ffbefdfa80dc
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ko.tar.gz) = 1563212
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ko.tar.gz) = 9c5e0a3602f7fd5b0678a06a8a9f6bfce0fea0d9923eb803806fdd25279f116f
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ko.tar.gz) = 12544297
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ko.tar.gz) = 0acf8fc5430ec88f78397da0c3ca73387d044cc18587892bdcae8eb7bff210e0
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ko.tar.gz) = 700186
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ko.tar.gz) = 4cc28b92631ca4c831afce44c3ad1c0145be04a491bb29fe66fa5fccdcb40ea6
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ko.tar.gz) = 12292586
diff --git a/polish/libreoffice/distinfo b/polish/libreoffice/distinfo
index 0856f894ecba..d1ddcfed4769 100644
--- a/polish/libreoffice/distinfo
+++ b/polish/libreoffice/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_pl.tar.gz) = e57e5a0c32bf4decaa5685f96a0a0d53ce628a554b880e772af8cf8c9c650ef4
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_pl.tar.gz) = 4297595
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_pl.tar.gz) = 39173cbbe8fbde1a06a3acb13e3ef35c8792d541d9bff66abaada82759a4bb61
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_pl.tar.gz) = 11064752
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_pl.tar.gz) = fc06ac7aa5fcfb9b6abd9481bd7a1db04d350ab00e088ec2cefb29e98ec491dc
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_pl.tar.gz) = 3410480
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_pl.tar.gz) = fda72fe0f379de65844c0dfc3d423fb00207dbc6b229354adfa1ec034fdb1466
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_pl.tar.gz) = 10798668
diff --git a/portuguese/libreoffice-pt_BR/distinfo b/portuguese/libreoffice-pt_BR/distinfo
index 5625d4c09d15..ee620ab4039b 100644
--- a/portuguese/libreoffice-pt_BR/distinfo
+++ b/portuguese/libreoffice-pt_BR/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_pt-BR.tar.gz) = 3ede1b951fd33acecdf12aff2b92f1e83e8e7f365147d65d997fceb3f178d099
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_pt-BR.tar.gz) = 2902864
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_pt-BR.tar.gz) = 05f113e9c297e8cb11f3fd60f1f4cb5b7f3fa19957e8e225619f1e10a0bad2d5
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_pt-BR.tar.gz) = 10774134
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_pt-BR.tar.gz) = 1943345d58cd98f71334ac987abad0b66cb163abd3ccf523f3ecc43f5c300569
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_pt-BR.tar.gz) = 2433109
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_pt-BR.tar.gz) = 4500d9bf96d052a5520b846fdb7a7cd81f8a158c23371b736654b6eb49e30785
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_pt-BR.tar.gz) = 10510897
diff --git a/portuguese/libreoffice/distinfo b/portuguese/libreoffice/distinfo
index 1ea7779ea621..ec6dffe5c805 100644
--- a/portuguese/libreoffice/distinfo
+++ b/portuguese/libreoffice/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_pt.tar.gz) = f7517ca14cf28faa0f65d2c04443ba487ce370d5913a3470a2f1fc3b17a7ea8e
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_pt.tar.gz) = 2160251
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_pt.tar.gz) = 8c8d329164b5a791ea4b49bc9eedc721453eb57bfc2ee610bc375b07e2c68d86
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_pt.tar.gz) = 10763533
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_pt.tar.gz) = 481dbe6fa3003f3fb17e191f0b088e5b1bb6a062d865ec34fee1cfc7bdc12cca
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_pt.tar.gz) = 932844
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_pt.tar.gz) = 075ed0925cf6d0c7663254b7a66ee808f0c45c3b915c9c8da266f861c069c021
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_pt.tar.gz) = 10491678
diff --git a/russian/libreoffice/distinfo b/russian/libreoffice/distinfo
index 618deabb86f7..df057753ac22 100644
--- a/russian/libreoffice/distinfo
+++ b/russian/libreoffice/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ru.tar.gz) = 991f467683e0ec1371b770d97dd56d56a54998b2246178df0711d79cc4c6c61c
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_ru.tar.gz) = 2710418
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ru.tar.gz) = 51bca1f0f139122b981b73de8d2702136d998f7d9309fc379bab9848fc35648f
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_ru.tar.gz) = 11729150
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ru.tar.gz) = d7cbb20093e81f25ba2511c4a45d3aa6a3c020fbbc6a2a46a16605ac72648303
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_ru.tar.gz) = 1782117
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ru.tar.gz) = 1e35de193935381e607829e28689f820a825802927a2d2c9e2dea2f43e44fcfb
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_ru.tar.gz) = 11469155
diff --git a/ukrainian/libreoffice/distinfo b/ukrainian/libreoffice/distinfo
index 2202a72af813..8ba5c38d1c39 100644
--- a/ukrainian/libreoffice/distinfo
+++ b/ukrainian/libreoffice/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_uk.tar.gz) = 486d729a0832dc4bb8f002272318a9ae779c50ae3ba35abb6f05ae2aa9607f61
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_uk.tar.gz) = 2470173
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_uk.tar.gz) = 589b3cc6d8c5431af1fd69800893466b265e9f78a97f9ed436efec6afd6092a6
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_uk.tar.gz) = 9637033
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_uk.tar.gz) = 3ccc3e7c26cb8a5f1d562657fe09024556ad9a076e914ce9ac60790945475a21
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_uk.tar.gz) = 1587428
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_uk.tar.gz) = e3ede982ee0b4410673d6fa29b806ac12e562c8720421d600a00a9fcd09ebd95
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_uk.tar.gz) = 9367240
diff --git a/vietnamese/libreoffice/Makefile b/vietnamese/libreoffice/Makefile
index 3df756d6a71e..5aa4ea092591 100644
--- a/vietnamese/libreoffice/Makefile
+++ b/vietnamese/libreoffice/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-LO_I18N= vi
+LO_I18N= vi
LO_HAS_HELPPACK= yes
CATEGORIES= vietnamese editors
diff --git a/vietnamese/libreoffice/distinfo b/vietnamese/libreoffice/distinfo
index f57a48a103f3..3cb1789ba455 100644
--- a/vietnamese/libreoffice/distinfo
+++ b/vietnamese/libreoffice/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_vi.tar.gz) = f6dd634cedf99f508733da83596235e41d8321de13684ee736dc5405b4a08074
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_langpack-deb_vi.tar.gz) = 1707776
-SHA256 (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_vi.tar.gz) = bcc44b11bf435531c498a726cf62de8c67abdaf6bc489e0d863d0ddc581dbaef
-SIZE (libreoffice/i18n/LibO_3.6.5_Linux_x86_helppack-deb_vi.tar.gz) = 11308612
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_vi.tar.gz) = 608c3a4ed1927fab473f4cdc3664009b29336f4951b76718ea73743c7a3a7d46
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_langpack_vi.tar.gz) = 732074
+SHA256 (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_vi.tar.gz) = d7aac260e9f257e515c1e2de47caa45641da4852ed4a1c1689dd748fe03a5fff
+SIZE (libreoffice/i18n/LibreOffice_4.0.1_Linux_x86_deb_helppack_vi.tar.gz) = 11042963