Try to create a fully offline build (also fixed some of the reported errors in the packages)

1 files changed, 266 insertions, 62 deletions

diff --git a/libreoffice/build/libreoffice36.SlackBuild b/libreoffice/build/libreoffice36.SlackBuild
index 90954847..094ed429 100755
--- a/libreoffice/build/libreoffice36.SlackBuild
+++ b/libreoffice/build/libreoffice36.SlackBuild
@@ -39,10 +39,14 @@
 #               so that the package version will be like "3.2.99.2_20101012".
 #               Remove the slack-required file, since this package has no
 #               run-time dependencies any more.
-# 20101116-1: 16/nov/2010 by Eric Hameleers <alien@slackware.com>
-#             * Fix permissions of LICENSE.odt file.
-#               Add additional (non-english) language support - some code taken
-#               from GnomeSlackBuild's openoffice3.SlackBuild script.
+# 3.2.99.3-1: 21/nov/2010 by Eric Hameleers <alien@slackware.com>
+#             * LibreOffice 3.3-beta3.
+#               Fix permissions of LICENSE.odt file.
+# 20101126-1: 26/nov/2010 by Eric Hameleers <alien@slackware.com>
+#               Do not create a language pack for the default language.
+#               Compile -without "-O2" - this seems to be required to stay
+#               compatible with OOo extensions.
+#               Use the correct location of apache-ant in Slackware.conf.in.
 #               Make preparations for off-line build.
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
@@ -54,15 +58,28 @@
 # Set initial variables:
 
 PRGNAM=libreoffice
-#SRCVER=${SRCVER:-20101109}
-SRCVER=${SRCVER:-HEAD}
-[ "$SRCVER" = "HEAD" ] && VERSION=$(date +%Y%m%d) || VERSION=$SRCVER
 BUILD=${BUILD:-1}
-NUMCPUS=${NUMCPUS:-2}
 TAG=${TAG:-alien}
 
+# SRCVER is the variable you control. It can be one of:
+# "HEAD" - in which case a new git # snapshot will be pulled,
+# "yyyymmdd" - like "20101126", if you downloaded a git snapshot before, or
+# "X.Y.Z" - like "3.2.99.3", meaning a release tarball is used.
+#SRCVER=${SRCVER:-20101121}
+#SRCVER=${SRCVER:-HEAD}
+SRCVER=${SRCVER:-3.2.99.3}
+
+# If we pull a git shapshot, use today's date as the VERSION:
+if [ "$SRCVER" = "HEAD" ]; then
+  VERSION=$(date +%Y%m%d)
+else
+  VERSION=$SRCVER
+fi
+
 DOCS="AUTHORS COPYING* MAINTAINERS NEWS README* TODO TOTEST"
 
+NUMCPUS=${NUMCPUS:-2}
+
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
 
@@ -72,108 +89,122 @@ DEF_LANG=${DEF_LANG:-"en_US"}
 # If this variable is non-empty, we will build additional languuage packs;
 # otherwise LibreOffice will be built for one language, defined in DEF_LANG:
 # Note:
-# The languages plus their descriptive names are kept in an external file
-# called 'languages' in the same directory, edit that one if you want:
+#   The languages plus their descriptive names are kept in an external file
+#   called 'languages' in the same directory as the SlackBuild script.
+#    Edit that file if you want to add more languages.
 # Note:
-# The packagenames use official language code like 'en_US' while LIbreOffice uses 'en-US'.
-ADD_LANGUAGES=""
-#ADD_LANGUAGES="$(cat $SRCDIR/languages |grep -v "^#" |cut -f1 -d= |tr '\n' ' ' |tr -s ' ' |sed -e 's/ *$//')"
+#   The packagenames use official language code like 'en_US' while LibreOffice
+#    uses 'en-US'.
+#
+#ADD_LANGUAGES=""
+ADD_LANGUAGES="$(cat $SRCDIR/languages |grep -v "^#" |cut -f1 -d= |tr '\n' ' ' |tr -s ' ' |sed -e 's/ *$//')"
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
 TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# Base resource locators for tarballs and snapshots:
+SRCBASE="http://download.documentfoundation.org/libreoffice/src"
+GITBASE="git://anongit.freedesktop.org/git/libreoffice"
+
 # Core components of LibreOffice (downloaded or checked-out) are:
 #   artwork base bootstrap build calc components extras filters help
 #   impress libs-gui libs-core libs-extern postprocess sdk testing
 #   ure writer libs-extern-sys extensions l10n
 
 # We will need the "build" tarball first.
+# Use SRCURL for tarball releases and GITURI for git snapshots:
+#SRCURL[0]=""
+SRCURL[0]="$SRCBASE/libreoffice-build-3.2.99.3.tar.gz"
+GITURI[0]="$GITBASE/build"
 
-SOURCE[0]="$SRCDIR/sources/libreoffice-build-${VERSION}.tar.xz"
-SRCURL[0]=""
-GITURI[0]="git://anongit.freedesktop.org/git/libreoffice/build"
+if [ -z "$SRCURL[0]" ]; then
+  SOURCE[0]="$SRCDIR/sources/libreoffice-build-${VERSION}.tar.xz"
+else
+  SOURCE[0]="$SRCDIR/sources/$(basename ${SRCURL[0]})"
+fi
 
+# And the rest...
 SOURCE[1]="$SRCDIR/sources/libreoffice-artwork-${VERSION}.tar.xz"
 SRCURL[1]=""
-GITURI[1]="git://anongit.freedesktop.org/git/libreoffice/artwork"
+GITURI[1]="$GITBASE/artwork"
 
 SOURCE[2]="$SRCDIR/sources/libreoffice-base-${VERSION}.tar.xz"
 SRCURL[2]=""
-GITURI[2]="git://anongit.freedesktop.org/git/libreoffice/base"
+GITURI[2]="$GITBASE/base"
 
 SOURCE[3]="$SRCDIR/sources/libreoffice-bootstrap-${VERSION}.tar.xz"
 SRCURL[3]=""
-GITURI[3]="git://anongit.freedesktop.org/git/libreoffice/bootstrap"
+GITURI[3]="$GITBASE/bootstrap"
 
 SOURCE[4]="$SRCDIR/sources/libreoffice-calc-${VERSION}.tar.xz"
 SRCURL[4]=""
-GITURI[4]="git://anongit.freedesktop.org/git/libreoffice/calc"
+GITURI[4]="$GITBASE/calc"
 
 SOURCE[5]="$SRCDIR/sources/libreoffice-components-${VERSION}.tar.xz"
 SRCURL[5]=""
-GITURI[5]="git://anongit.freedesktop.org/git/libreoffice/components"
+GITURI[5]="$GITBASE/components"
 
 SOURCE[6]="$SRCDIR/sources/libreoffice-extras-${VERSION}.tar.xz"
 SRCURL[6]=""
-GITURI[6]="git://anongit.freedesktop.org/git/libreoffice/extras"
+GITURI[6]="$GITBASE/extras"
 
 SOURCE[7]="$SRCDIR/sources/libreoffice-filters-${VERSION}.tar.xz"
 SRCURL[7]=""
-GITURI[7]="git://anongit.freedesktop.org/git/libreoffice/filters"
+GITURI[7]="$GITBASE/filters"
 
 SOURCE[8]="$SRCDIR/sources/libreoffice-help-${VERSION}.tar.xz"
 SRCURL[8]=""
-GITURI[8]="git://anongit.freedesktop.org/git/libreoffice/help"
+GITURI[8]="$GITBASE/help"
 
 SOURCE[9]="$SRCDIR/sources/libreoffice-impress-${VERSION}.tar.xz"
 SRCURL[9]=""
-GITURI[9]="git://anongit.freedesktop.org/git/libreoffice/impress"
+GITURI[9]="$GITBASE/impress"
 
 SOURCE[10]="$SRCDIR/sources/libreoffice-libs-gui-${VERSION}.tar.xz"
 SRCURL[10]=""
-GITURI[10]="git://anongit.freedesktop.org/git/libreoffice/libs-gui"
+GITURI[10]="$GITBASE/libs-gui"
 
 SOURCE[11]="$SRCDIR/sources/libreoffice-libs-core-${VERSION}.tar.xz"
 SRCURL[11]=""
-GITURI[11]="git://anongit.freedesktop.org/git/libreoffice/libs-core"
+GITURI[11]="$GITBASE/libs-core"
 
 SOURCE[12]="$SRCDIR/sources/libreoffice-libs-extern-${VERSION}.tar.xz"
 SRCURL[12]=""
-GITURI[12]="git://anongit.freedesktop.org/git/libreoffice/libs-extern"
+GITURI[12]="$GITBASE/libs-extern"
 
 SOURCE[13]="$SRCDIR/sources/libreoffice-postprocess-${VERSION}.tar.xz"
 SRCURL[13]=""
-GITURI[13]="git://anongit.freedesktop.org/git/libreoffice/postprocess"
+GITURI[13]="$GITBASE/postprocess"
 
 SOURCE[14]="$SRCDIR/sources/libreoffice-sdk-${VERSION}.tar.xz"
 SRCURL[14]=""
-GITURI[14]="git://anongit.freedesktop.org/git/libreoffice/sdk"
+GITURI[14]="$GITBASE/sdk"
 
 SOURCE[15]="$SRCDIR/sources/libreoffice-testing-${VERSION}.tar.xz"
 SRCURL[15]=""
-GITURI[15]="git://anongit.freedesktop.org/git/libreoffice/testing"
+GITURI[15]="$GITBASE/testing"
 
 SOURCE[16]="$SRCDIR/sources/libreoffice-ure-${VERSION}.tar.xz"
 SRCURL[16]=""
-GITURI[16]="git://anongit.freedesktop.org/git/libreoffice/ure"
+GITURI[16]="$GITBASE/ure"
 
 SOURCE[17]="$SRCDIR/sources/libreoffice-writer-${VERSION}.tar.xz"
 SRCURL[17]=""
-GITURI[17]="git://anongit.freedesktop.org/git/libreoffice/writer"
+GITURI[17]="$GITBASE/writer"
 
 SOURCE[18]="$SRCDIR/sources/libreoffice-libs-extern-sys-${VERSION}.tar.xz"
 SRCURL[18]=""
-GITURI[18]="git://anongit.freedesktop.org/git/libreoffice/libs-extern-sys"
+GITURI[18]="$GITBASE/libs-extern-sys"
 
 SOURCE[19]="$SRCDIR/sources/libreoffice-extensions-${VERSION}.tar.xz"
 SRCURL[19]=""
-GITURI[19]="git://anongit.freedesktop.org/git/libreoffice/extensions"
+GITURI[19]="$GITBASE/extensions"
 
 SOURCE[20]="$SRCDIR/sources/libreoffice-l10n-${VERSION}.tar.xz"
 SRCURL[20]=""
-GITURI[20]="git://anongit.freedesktop.org/git/libreoffice/l10n"
+GITURI[20]="$GITBASE/l10n"
 
 # Extra libraries / binaries required to build LibreOffice from source:
 
@@ -192,6 +223,173 @@ SRCURL[24]="http://download.go-oo.org//SRC680/extras-3.1.tar.bz2"
 SOURCE[25]="$SRCDIR/sources/biblio.tar.bz2"
 SRCURL[25]="http://download.go-oo.org//SRC680/biblio.tar.bz2"
 
+# Further tarballs of which I am not sure which one are really needed:
+
+SOURCE[26]="63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz"
+SRCURL[26]="http://hg.services.openoffice.org/binaries/63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz"
+SOURCE[27]="09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz"
+SRCURL[27]="http://hg.services.openoffice.org/binaries/09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz"
+SOURCE[28]="0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt"
+SRCURL[28]="http://hg.services.openoffice.org/binaries/0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt"
+SOURCE[29]="68dd2e8253d9a7930e9fd50e2d7220d0-hunspell-1.2.9.tar.gz"
+SRCURL[29]="http://hg.services.openoffice.org/binaries/68dd2e8253d9a7930e9fd50e2d7220d0-hunspell-1.2.9.tar.gz"
+SOURCE[30]="128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
+SRCURL[30]="http://hg.services.openoffice.org/binaries/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
+SOURCE[31]="17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
+SRCURL[31]="http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
+SOURCE[32]="1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
+SRCURL[32]="http://hg.services.openoffice.org/binaries/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
+SOURCE[33]="18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz"
+SRCURL[33]="http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz"
+SOURCE[34]="1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
+SRCURL[34]="http://hg.services.openoffice.org/binaries/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
+SOURCE[35]="24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"
+SRCURL[35]="http://hg.services.openoffice.org/binaries/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"
+SOURCE[36]="26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
+SRCURL[36]="http://hg.services.openoffice.org/binaries/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
+SOURCE[37]="284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz"
+SRCURL[37]="http://hg.services.openoffice.org/binaries/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz"
+SOURCE[38]="2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz"
+SRCURL[38]="http://hg.services.openoffice.org/binaries/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz"
+SOURCE[39]="2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz"
+SRCURL[39]="http://hg.services.openoffice.org/binaries/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz"
+SOURCE[40]="2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz"
+SRCURL[40]="http://hg.services.openoffice.org/binaries/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz"
+SOURCE[41]="2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz"
+SRCURL[41]="http://hg.services.openoffice.org/binaries/2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz"
+SOURCE[42]="ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz"
+SRCURL[42]="http://hg.services.openoffice.org/binaries/ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz"
+SOURCE[43]="35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
+SRCURL[43]="http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
+SOURCE[44]="35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"
+SRCURL[44]="http://hg.services.openoffice.org/binaries/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"
+SOURCE[45]="377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt"
+SRCURL[45]="http://hg.services.openoffice.org/binaries/377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt"
+SOURCE[46]="39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"
+SRCURL[46]="http://hg.services.openoffice.org/binaries/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"
+SOURCE[47]="3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"
+SRCURL[47]="http://hg.services.openoffice.org/binaries/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"
+SOURCE[48]="3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz"
+SRCURL[48]="http://hg.services.openoffice.org/binaries/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz"
+SOURCE[49]="48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt"
+SRCURL[49]="http://hg.services.openoffice.org/binaries/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt"
+SOURCE[50]="48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz"
+SRCURL[50]="http://hg.services.openoffice.org/binaries/48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz"
+SOURCE[51]="4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz"
+SRCURL[51]="http://hg.services.openoffice.org/binaries/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz"
+SOURCE[52]="4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz"
+SRCURL[52]="http://hg.services.openoffice.org/binaries/4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz"
+SOURCE[53]="599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz"
+SRCURL[53]="http://hg.services.openoffice.org/binaries/599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz"
+SOURCE[54]="5aba06ede2daa9f2c11892fbd7bc3057-libserializer.zip"
+SRCURL[54]="http://hg.services.openoffice.org/binaries/5aba06ede2daa9f2c11892fbd7bc3057-libserializer.zip"
+SOURCE[55]="67b42915c8432abf0a922438f00860a2-libxml.zip"
+SRCURL[55]="http://hg.services.openoffice.org/binaries/67b42915c8432abf0a922438f00860a2-libxml.zip"
+SOURCE[56]="7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz"
+SRCURL[56]="http://hg.services.openoffice.org/binaries/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz"
+SOURCE[57]="7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz"
+SRCURL[57]="http://hg.services.openoffice.org/binaries/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz"
+SOURCE[58]="79600e696a98ff95c2eba976f7a8dfbb-liblayout.zip"
+SRCURL[58]="http://hg.services.openoffice.org/binaries/79600e696a98ff95c2eba976f7a8dfbb-liblayout.zip"
+SOURCE[59]="798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
+SRCURL[59]="http://hg.services.openoffice.org/binaries/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
+SOURCE[60]="ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz"
+SRCURL[60]="http://hg.services.openoffice.org/binaries/ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz"
+SOURCE[61]="8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar"
+SRCURL[61]="http://hg.services.openoffice.org/binaries/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar"
+SOURCE[62]="8ea307d71d11140574bfb9fcc2487e33-libbase.zip"
+SRCURL[62]="http://hg.services.openoffice.org/binaries/8ea307d71d11140574bfb9fcc2487e33-libbase.zip"
+SOURCE[63]="bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz"
+SRCURL[63]="http://hg.services.openoffice.org/binaries/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz"
+SOURCE[64]="a06a496d7a43cbdc35e69dbe678efadb-libloader.zip"
+SRCURL[64]="http://hg.services.openoffice.org/binaries/a06a496d7a43cbdc35e69dbe678efadb-libloader.zip"
+SOURCE[65]="a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz"
+SRCURL[65]="http://hg.services.openoffice.org/binaries/a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz"
+SOURCE[66]="a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html"
+SRCURL[66]="http://hg.services.openoffice.org/binaries/a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html"
+SOURCE[67]="a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
+SRCURL[67]="http://hg.services.openoffice.org/binaries/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
+SOURCE[68]="ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip"
+SRCURL[68]="http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip"
+SOURCE[69]="af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz"
+SRCURL[69]="http://hg.services.openoffice.org/binaries/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz"
+SOURCE[70]="ba1015b59c112d44d7797b62fe7bee51-neon-0.29.3.tar.gz"
+SRCURL[70]="http://hg.services.openoffice.org/binaries/ba1015b59c112d44d7797b62fe7bee51-neon-0.29.3.tar.gz"
+SOURCE[71]="bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1"
+SRCURL[71]="http://hg.services.openoffice.org/binaries/bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1"
+SOURCE[72]="c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz"
+SRCURL[72]="http://hg.services.openoffice.org/binaries/c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz"
+SOURCE[73]="ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz"
+SRCURL[73]="http://hg.services.openoffice.org/binaries/ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz"
+SOURCE[74]="d0b5af6e408b8d2958f3d83b5244f5e8-hyphen-2.4.tar.gz"
+SRCURL[74]="http://hg.services.openoffice.org/binaries/d0b5af6e408b8d2958f3d83b5244f5e8-hyphen-2.4.tar.gz"
+SOURCE[75]="d1a3205871c3c52e8a50c9f18510ae12-libformula.zip"
+SRCURL[75]="http://hg.services.openoffice.org/binaries/d1a3205871c3c52e8a50c9f18510ae12-libformula.zip"
+SOURCE[76]="d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz"
+SRCURL[76]="http://hg.services.openoffice.org/binaries/d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz"
+SOURCE[77]="d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip"
+SRCURL[77]="http://hg.services.openoffice.org/binaries/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip"
+SOURCE[78]="d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz"
+SRCURL[78]="http://hg.services.openoffice.org/binaries/d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz"
+SOURCE[79]="dbb3757275dc5cc80820c0b4dd24ed95-librepository.zip"
+SRCURL[79]="http://hg.services.openoffice.org/binaries/dbb3757275dc5cc80820c0b4dd24ed95-librepository.zip"
+SOURCE[80]="dbd5f3b47ed13132f04c685d608a7547-jpeg-6b.tar.gz"
+SRCURL[80]="http://hg.services.openoffice.org/binaries/dbd5f3b47ed13132f04c685d608a7547-jpeg-6b.tar.gz"
+SOURCE[81]="e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt"
+SRCURL[81]="http://hg.services.openoffice.org/binaries/e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt"
+SOURCE[82]="e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2"
+SRCURL[82]="http://hg.services.openoffice.org/binaries/e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2"
+SOURCE[83]="e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz"
+SRCURL[83]="http://hg.services.openoffice.org/binaries/e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz"
+SOURCE[84]="ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz"
+SRCURL[84]="http://hg.services.openoffice.org/binaries/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz"
+SOURCE[85]="ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
+SRCURL[85]="http://hg.services.openoffice.org/binaries/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
+SOURCE[86]="ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz"
+SRCURL[86]="http://hg.services.openoffice.org/binaries/ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz"
+SOURCE[87]="f3e2febd267c8e4b13df00dac211dd6d-flute.zip"
+SRCURL[87]="http://hg.services.openoffice.org/binaries/f3e2febd267c8e4b13df00dac211dd6d-flute.zip"
+SOURCE[88]="f7925ba8491fe570e5164d2c72791358-libfonts.zip"
+SRCURL[88]="http://hg.services.openoffice.org/binaries/f7925ba8491fe570e5164d2c72791358-libfonts.zip"
+SOURCE[89]="fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt"
+SRCURL[89]="http://hg.services.openoffice.org/binaries/fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt"
+SOURCE[90]="fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz"
+SRCURL[90]="http://hg.services.openoffice.org/binaries/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz"
+SOURCE[91]="fcc6df1160753d0b8c835d17fdeeb0a7-boost_1_39_0.tar.gz"
+SRCURL[91]="http://hg.services.openoffice.org/binaries/fcc6df1160753d0b8c835d17fdeeb0a7-boost_1_39_0.tar.gz"
+SOURCE[92]="fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
+SRCURL[92]="http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
+SOURCE[93]="37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip"
+SRCURL[93]="http://hg.services.openoffice.org/binaries/37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip"
+SOURCE[94]="831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip"
+SRCURL[94]="http://hg.services.openoffice.org/binaries/831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip"
+SOURCE[95]="067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz"
+SRCURL[95]="http://hg.services.openoffice.org/binaries/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz"
+SOURCE[96]="cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2"
+SRCURL[96]="http://hg.services.openoffice.org/binaries/cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2"
+SOURCE[97]="47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2"
+SRCURL[97]="http://download.go-oo.org/src/47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2"
+SOURCE[98]="90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
+SRCURL[98]="http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
+SOURCE[99]="debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz"
+SRCURL[99]="http://download.go-oo.org/src/debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz"
+SOURCE[100]="e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz"
+SRCURL[100]="http://download.go-oo.org/src/e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz"
+SOURCE[101]="0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz"
+SRCURL[101]="http://download.go-oo.org/src/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz"
+SOURCE[102]="71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz"
+SRCURL[102]="http://download.go-oo.org/src/71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz"
+SOURCE[103]="5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2"
+SRCURL[103]="http://download.go-oo.org/src/5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2"
+SOURCE[104]="86e390f015e505dd71a66f0123c62f09-libwpd-0.9.0.tar.bz2"
+SRCURL[104]="http://download.go-oo.org/src/86e390f015e505dd71a66f0123c62f09-libwpd-0.9.0.tar.bz2"
+SOURCE[105]="9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2"
+SRCURL[105]="http://download.go-oo.org/src/9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2"
+SOURCE[106]="185d60944ea767075d27247c3162b3bc-unowinreg.dll"
+SRCURL[106]="http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
+SOURCE[107]="c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip"
+SRCURL[107]="http://www.numbertext.org/linux/c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip"
+
 # Use the src_checkout() function if no downloadable tarball exists.
 # This function checks out sources from SVN/CVS and creates a tarball of them.
 src_checkout() {
@@ -248,13 +446,13 @@ if [ -z "$ARCH" ]; then
 fi
 
 case "$ARCH" in
-  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  i486)      SLKCFLAGS="-march=i486 -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
-  x86_64)    SLKCFLAGS="-O2 -fPIC"
+  x86_64)    SLKCFLAGS="-fPIC"
              SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
-  *)         SLKCFLAGS="-O2"
+  *)         SLKCFLAGS=""
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
 esac
@@ -339,9 +537,13 @@ cd ${PRGNAM}-build-${VERSION}
 
 echo Building ...
 
-# Find out what this version of LibreOffice calls itself:
-# Look for something like: AC_INIT(libreoffice-build, 3.2.99.2)
-LOVER=$(cat configure.in | grep ^AC_INIT | sed -e 's/.*, \(.\+\))/\1/')
+if [ -z "$SRCURL[0]" ]; then
+  # Git build; find out what this version of LibreOffice calls itself:
+  # Look for something like: AC_INIT(libreoffice-build, 3.2.99.2)
+  LOVER=$(cat configure.in | grep ^AC_INIT | sed -e 's/.*, \(.\+\))/\1/')_
+else
+  LOVER=""
+fi
 
 # Check for an installed KDE4 and assume Qt4:
 if [ ! -z "$KDEDIRS" ]; then
@@ -388,13 +590,13 @@ enable_pam=no \
   --with-arch-flags="$SLKCFLAGS" \
   --with-build-version="SlackBuild by Eric Hameleers" \
   --with-distro=Slackware \
-  --with-docdir=/usr/doc/$PRGNAM-${LOVER}_$VERSION \
+  --with-docdir=/usr/doc/$PRGNAM-${LOVER}$VERSION \
   --with-git \
   --with-installed-ooo-dirname=$PRGNAM \
   --with-lang="$(echo ${LANGUAGES} |tr _ -)" \
   --with-num-cpus=${NUMCPUS} \
   --without-binsuffix \
-  --docdir=/usr/doc/$PRGNAM-${LOVER}_$VERSION \
+  --docdir=/usr/doc/$PRGNAM-${LOVER}$VERSION \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --mandir=/usr/man \
@@ -402,16 +604,16 @@ enable_pam=no \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
 if [ "$P1" != "--oldbuild" ]; then
-  mkdir -p src clone rawbuild build/${PRGNAM}-${LOVER}
+  mkdir -p src clone rawbuild build/${PRGNAM}-${LOVER%_}
   echo -n "Extracting additional component archive(s) for $PRGNAM"
   for (( i = 1; i < 21; i++ )) ; do
     echo -n " ."
-    #tar -C build/${PRGNAM}-${LOVER} -xf ${SOURCE[$i]}
+    #tar -C build/${PRGNAM}-${LOVER%_} -xf ${SOURCE[$i]}
     tar -C clone -xf ${SOURCE[$i]}
   done
   echo
-  #mv build/${PRGNAM}-${LOVER}/${PRGNAM}-*-${VERSION}/* build/${PRGNAM}-${LOVER}/
-  #rm -rf build/${PRGNAM}-${LOVER}/${PRGNAM}-*-${VERSION} 2>/dev/null
+  #mv build/${PRGNAM}-${LOVER%-}/${PRGNAM}-*-${VERSION}/* build/${PRGNAM}-${LOVER%_}/
+  #rm -rf build/${PRGNAM}-${LOVER%_}/${PRGNAM}-*-${VERSION} 2>/dev/null
   for PART in artwork base bootstrap calc components extras filters help \
               impress libs-gui libs-core libs-extern postprocess sdk testing \
               ure writer libs-extern-sys extensions l10n
@@ -424,8 +626,9 @@ if [ "$P1" != "--oldbuild" ]; then
   done
 fi
 
-#./download \
-#  2>&1 | tee $OUTPUT/download-${PRGNAM}.log
+# The download script does more than downloading tarballs, so let's run it:
+./download \
+  2>&1 | tee $OUTPUT/download-${PRGNAM}.log
 
 # Compile everything (takes many hours):
 make -i VERBOSE=yes \
@@ -459,10 +662,11 @@ chmod 0644 $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/LICENSE.odt
 # Split out language packs if we have built additional languages:
 if [ ! -z "${ADD_LANGUAGES}" ]; then
   cd $PKG
-  for lang in $(echo ${ADD_LANGUAGES} |sed -e 's/${DEF_LANG} *//') ; do
+  for lang in $(echo ${ADD_LANGUAGES} |sed -e "s/${DEF_LANG} *//") ; do
     langdesc="$(grep ^${lang}= $SRCDIR/languages |cut -f2 -d=)"
     lolang=$(echo $lang | tr _ -)
     echo "Splitting out '$lang' ($langdesc) - looking for '$lolang'..."
+    rm -rf ${PKG}-l10n-$lang
     mkdir -p ${PKG}-l10n-$lang
     tar cf - --remove-files \
       $(find . -name "README*$lolang*" \
@@ -482,12 +686,12 @@ if [ ! -z "${ADD_LANGUAGES}" ]; then
             -e "s/@LANG@/${lolang}/g" -e "s/@PRGNAM@/$PRGNAM/" \
       > ${PKG}-l10n-$lang/install/doinst.sh
     cd ${PKG}-l10n-$lang
-    /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-l10n-${lang}-${LOVER}_${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}
+    /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-l10n-${lang}-${LOVER}${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}
     cd -
     cd $OUTPUT
-    md5sum ${PRGNAM}-l10n-${lang}-${LOVER}_${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-l10n-$lang-${LOVER}_${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
+    md5sum ${PRGNAM}-l10n-${lang}-${LOVER}${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-l10n-$lang-${LOVER}${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
     cd -
-    cat $PKG-l10n-$lang/install/slack-desc | grep "^${PRGNAM}-l10n-$lang" > $OUTPUT/${PRGNAM}-l10n-$lang-${LOVER}_${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+    cat $PKG-l10n-$lang/install/slack-desc | grep "^${PRGNAM}-l10n-$lang" > $OUTPUT/${PRGNAM}-l10n-$lang-${LOVER}${VERSION}-${ARCH}-${BUILD}${TAG}.txt
   done
 fi # End of splitting out language packs
 
@@ -519,10 +723,10 @@ fi
 EOT
 
 # Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}_$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-${LOVER}_$VERSION || true
-cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-${LOVER}_$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc/$PRGNAM-${LOVER}_$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION || true
+cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION/$PRGNAM.SlackBuild
+chown -R root:root $PKG/usr/doc/$PRGNAM-${LOVER}$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Compress the man page(s):
@@ -542,12 +746,12 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-/sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-${LOVER}_${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+/sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-${LOVER}${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${LOVER}_${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${LOVER}_${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
+md5sum ${PRGNAM}-${LOVER}${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${LOVER}${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
 cd -
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${LOVER}_${VERSION}-${ARCH}-${BUILD}${TAG}.txt
-#cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${LOVER}_${VERSION}-${ARCH}-${BUILD}${TAG}.dep
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${LOVER}${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+#cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${LOVER}${VERSION}-${ARCH}-${BUILD}${TAG}.dep
 
 # Restore the original umask:
 umask ${_UMASK_}