Update to 8.04.15.20160215

2 files changed, 31 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 201ac5ecbaa2..0df061dfd93d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Jan 21 21:59:00 UTC 2016
+# Mon Feb 15 19:07:19 UTC 2016
 pkgbase = j8-git
 	pkgdesc = J is a modern, high-level, general-purpose, high-performance programming language
-	pkgver = 8.04.15.20160121
-	pkgrel = 4
+	pkgver = 8.04.15.20160215
+	pkgrel = 1
 	url = http://www.jsoftware.com
 	install = j8-git.install
 	arch = i686
@@ -18,9 +18,9 @@ pkgbase = j8-git
 	optdepends = expat: for api/expat addon
 	optdepends = fftw: for math/fftw addon
 	optdepends = lapack: for math/lapack addon
-	source = jsource.zip::http://www.jsoftware.com/gitlist/jsource.git/zipball/master
-	source = qtide.zip::http://www.jsoftware.com/gitlist/qtide.git/zipball/master
-	source = jenv.tar.gz::http://www.databaserossoverde.it/jsoftware/j804_env_20160121.tar.gz
+	source = jsource.zip::https://github.com/jsoftware/jsource/archive/master.zip
+	source = qtide.zip::https://github.com/jsoftware/qtide/archive/master.zip
+	source = jenv.tar.gz::http://www.databaserossoverde.it/jsoftware/j804_env_20160215.tar.gz
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = f157ca86bba79f5ae620cb19b163d5e8
diff --git a/PKGBUILD b/PKGBUILD
index 3f4cbdb37638..a29cd6adf012 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Lorenzo Tomei <tomeil@tiscali.it>
 
 pkgname=j8-git
-pkgver=8.04.15.20160121
-pkgrel=4
+pkgver=8.04.15.20160215
+pkgrel=1
 pkgdesc='J is a modern, high-level, general-purpose, high-performance programming language'
 arch=('i686' 'x86_64')
 url='http://www.jsoftware.com'
@@ -12,9 +12,9 @@ optdepends=('wget: for web/gethttp addon'
             'expat: for api/expat addon'
             'fftw: for math/fftw addon'
             'lapack: for math/lapack addon')
-source=('jsource.zip::http://www.jsoftware.com/gitlist/jsource.git/zipball/master'
-        'qtide.zip::http://www.jsoftware.com/gitlist/qtide.git/zipball/master'
-        'jenv.tar.gz::http://www.databaserossoverde.it/jsoftware/j804_env_20160121.tar.gz')
+source=('jsource.zip::https://github.com/jsoftware/jsource/archive/master.zip'
+        'qtide.zip::https://github.com/jsoftware/qtide/archive/master.zip'
+        'jenv.tar.gz::http://www.databaserossoverde.it/jsoftware/j804_env_20160215.tar.gz')
 md5sums=('SKIP' 'SKIP' 'f157ca86bba79f5ae620cb19b163d5e8')
 install=j8-git.install
 if [ "${CARCH}" = x86_64 ]; then
@@ -26,45 +26,45 @@ _jarch=j32
 fi
 
 pkgver() {
-cd "${srcdir}"
+cd ${srcdir}
 echo "$(head -c 7 jenv/usr/lib/j8/system/config/version.txt)"."$(date +%Y%m%d)"
 } 
 
 prepare() {
-cd "${srcdir}"
+cd ${srcdir}/jsource-master
 echo '#define jversion "804"' > jsrc/jversion.h
 echo '#define jplatform "linux"' >> jsrc/jversion.h
 echo '#define jtype "build"' >> jsrc/jversion.h
 echo '#define jlicense "GPL3"' >> jsrc/jversion.h
 echo '#define jbuilder "www.jsoftware.com"' >> jsrc/jversion.h
-sed -i "s@jgit=~/gitdev/jsource@jgit=${srcdir}@" make/jvars.sh
-sed -i "s@jbld=~/jbld@jbld=${srcdir}/jbld@" make/jvars.sh
-sed -i "s@cd ~@cd ${srcdir}@" make/build_jconsole.sh
-sed -i "s@cd ~@cd ${srcdir}@" make/build_libj.sh
-sed -i "s@cd ~@cd ${srcdir}@" make/domake.sh
+sed -i "s@jgit=~/gitdev/jsource@jgit=${srcdir}/jsource-master@" make/jvars.sh
+sed -i "s@jbld=~/jbld@jbld=${srcdir}/jsource-master/jbld@" make/jvars.sh
+sed -i "s@cd ~@cd ${srcdir}/jsource-master@" make/build_jconsole.sh
+sed -i "s@cd ~@cd ${srcdir}/jsource-master@" make/build_libj.sh
+sed -i "s@cd ~@cd ${srcdir}/jsource-master@" make/domake.sh
 cp make/jvars.sh ./
 }
 
 build() {
 # jsource
-cd "${srcdir}"
-rm -rf "${srcdir}/jbld"
-mkdir -p "${srcdir}/jbld/jout"
-mkdir "${srcdir}/jbld/${_jarch}"
-cp -r "${srcdir}"/jlibrary/* "${srcdir}/jbld/${_jarch}"
-"${srcdir}"/make/build_jconsole.sh "${_jarch}"
-"${srcdir}"/make/build_libj.sh "${_jarch}"
+cd ${srcdir}/jsource-master
+rm -rf jbld
+mkdir -p jbld/jout
+mkdir jbld/${_jarch}
+cp -r jlibrary/* jbld/${_jarch}
+make/build_jconsole.sh ${_jarch}
+make/build_libj.sh ${_jarch}
 # qtide
-cd "${srcdir}/lib"
+cd ${srcdir}/qtide-master/lib
 qmake && make
-cd "${srcdir}/main"
+cd ${srcdir}/qtide-master/main
 qmake && make
 }
 
 package() {
-cd "${srcdir}"
-cp -a jenv/* "${pkgdir}"/
-cp -a jbld/"${_jarch}"/bin/{jconsole,libj.so} "${pkgdir}"/usr/lib/j8/bin/
-cp -a bin/linux-"${_xarch}"/release/*  "${pkgdir}"/usr/lib/j8/bin/
+cd ${srcdir}
+cp -a jenv/* ${pkgdir}/
+cp -a jsource-master/jbld/${_jarch}/bin/{jconsole,libj.so} ${pkgdir}/usr/lib/j8/bin/
+cp -a qtide-master/bin/linux-${_xarch}/release/*  ${pkgdir}/usr/lib/j8/bin/
 echo "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.xz (Arch Linux package)" > ${pkgdir}/usr/lib/j8/bin/installer.txt
 }