Switch to bintray mirror for imagemagick&picolisp

diff --git a/build-package.sh b/build-package.sh
index 50daa0f..0941f10 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -351,8 +351,7 @@ termux_step_extract_package () {
        cd $TERMUX_PKG_TMPDIR
        filename=`basename $TERMUX_PKG_SRCURL`
        file=$TERMUX_PKG_CACHEDIR/$filename
-       # Set "TERMUX_PKG_NO_SRC_CACHE=yes" in package to never cache packages, such as in git builds:
-       test -n ${TERMUX_PKG_NO_SRC_CACHE-""} -o ! -f $file && termux_download $TERMUX_PKG_SRCURL $file
+       test ! -f $file && termux_download $TERMUX_PKG_SRCURL $file
        if [ "x$TERMUX_PKG_FOLDERNAME" = "x" ]; then
                folder=`basename $filename .tar.bz2` && folder=`basename $folder .tar.gz` && folder=`basename $folder .tar.xz` && folder=`basename $folder .tar.lz` && folder=`basename $folder .tgz` && folder=`basename $folder .zip`
                folder=`echo $folder | sed 's/_/-/'` # dpkg uses _ in tar filename, but - in folder

diff --git a/packages/imagemagick/build.sh b/packages/imagemagick/build.sh
index 357de0f..a98573e 100644 (file)
--- a/packages/imagemagick/build.sh
+++ b/packages/imagemagick/build.sh
@@ -1,7 +1,10 @@
 TERMUX_PKG_HOMEPAGE=http://www.imagemagick.org/
 TERMUX_PKG_DESCRIPTION="Suite to create, edit, compose, or convert images in a variety of formats"
 TERMUX_PKG_VERSION="7.0.2-6"
-TERMUX_PKG_SRCURL=http://www.imagemagick.org/download/ImageMagick-${TERMUX_PKG_VERSION}.tar.xz
+# Since older releases are removed from imagemagick.org we use our bintray mirror to avoid breaking
+# the build for each minor version bump.
+# TERMUX_PKG_SRCURL=http://www.imagemagick.org/download/ImageMagick-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/ImageMagick-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-largefile --without-x --with-magick-plus-plus=no    --with-bzlib=no --with-xml=yes --with-lzma ac_cv_func_ftime=no ac_cv_header_complex_h=no"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/Magick-config bin/MagickCore-config bin/MagickWand-config bin/Wand-config share/ImageMagick-6/francais.xml share/man/man1/Magick-config.1 share/man/man1/MagickCore-config.1 share/man/man1/MagickWand-config.1 share/man/man1/Wand-config.1"
 TERMUX_PKG_DEPENDS="fftw, pango, glib, libbz2, libjpeg-turbo, liblzma, libpng, libtiff, libxml2, openjpeg, littlecms"

diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index e60e665..c558260 100644 (file)
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -3,10 +3,11 @@ TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
 TERMUX_PKG_DEPENDS="libcrypt, openssl"
 _PICOLISP_YEAR=16
 _PICOLISP_MONTH=8
-_PICOLISP_DAY=1
+_PICOLISP_DAY=3
 TERMUX_PKG_VERSION=${_PICOLISP_YEAR}.${_PICOLISP_MONTH}.${_PICOLISP_DAY}
-TERMUX_PKG_SRCURL=http://software-lab.de/picoLisp.tgz
-TERMUX_PKG_NO_SRC_CACHE=yes
+# We use our bintray mirror since old version snapshots are not kept on main site.
+# TERMUX_PKG_SRCURL=http://software-lab.de/picoLisp.tgz
+TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/picolisp_${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_FOLDERNAME=picoLisp
 TERMUX_PKG_BUILD_IN_SRC=true
 # The assembly is not position-independent (would be a major rewrite):