Update to 0.3.3

2 files changed, 24 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 991fe98a5d47..153889155317 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Feb 19 01:52:53 UTC 2017
+# Mon Dec 18 21:12:57 UTC 2017
 pkgbase = littler
 	pkgdesc = a hash-bang and simple command line pipe front end for GNU R
-	pkgver = 0.3.2
+	pkgver = 0.3.3
 	pkgrel = 1
 	url = http://dirk.eddelbuettel.com/code/littler.html
 	arch = i686
@@ -11,8 +11,8 @@ pkgbase = littler
 	makedepends = make
 	makedepends = r
 	makedepends = sh
-	source = http://dirk.eddelbuettel.com/code/littler/littler_0.3.2.tar.gz
-	sha256sums = 32e13e9cd0bab43a330e8b48180e0a7c2e3c337dc6ddb118cbaf0b247da7dc2a
+	source = littler-0.3.3.tar.gz::https://github.com/eddelbuettel/littler/archive/0.3.3.tar.gz
+	sha256sums = cfd26f1b643e28e9ca3c564ce868edc702823fe3acd5cf96848bbb5939d9a63d
 
 pkgname = littler
 	depends = r
diff --git a/PKGBUILD b/PKGBUILD
index f73b9cc92da7..e3ec88297d0d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,20 +5,21 @@
 set -u
 _pkgname='littler'
 pkgname="${_pkgname}"
-pkgver=0.3.2
-pkgrel=1
+pkgver='0.3.3'
+pkgrel='1'
 pkgdesc='a hash-bang and simple command line pipe front end for GNU R'
 arch=('i686' 'x86_64')
 #url="http://code.google.com/p/littler"
 url='http://dirk.eddelbuettel.com/code/littler.html'
+#url="https://github.com/eddelbuettel/${_pkgname}"
 license=('GPL')
 #groups=('science')
 makedepends=('make' 'r' 'sh')
-#_giturl="https://github.com/eddelbuettel/${_pkgname}"
-#source=("${_pkgname}-${pkgver}.tar.gz::${_giturl}/archive/${pkgver}.tar.gz")
-source=("http://dirk.eddelbuettel.com/code/littler/${pkgname}_${pkgver}.tar.gz")
+_giturl="https://github.com/eddelbuettel/${_pkgname}"
+source=("${_pkgname}-${pkgver}.tar.gz::${_giturl}/archive/${pkgver}.tar.gz")
+#source=("http://dirk.eddelbuettel.com/code/littler/${pkgname}_${pkgver}.tar.gz")
 #source=("http://http.debian.net/debian/pool/main/l/littler/littler_0.2.3.orig.tar.gz")
-sha256sums=('32e13e9cd0bab43a330e8b48180e0a7c2e3c337dc6ddb118cbaf0b247da7dc2a')
+sha256sums=('cfd26f1b643e28e9ca3c564ce868edc702823fe3acd5cf96848bbb5939d9a63d')
 
 if [ "${pkgname%-git}" != "${pkgname}" ]; then # this is easily done with case
   _srcdir="${_pkgname}"
@@ -38,32 +39,36 @@ pkgver() {
   set +u
 }
 else
-  _srcdir="${pkgname}"
+  _srcdir="${pkgname}-${pkgver}"
   _verwatch=("${url%.html}/" "${pkgname}[-_]\(.*\)\.tar\.gz" 'l')
 fi
 
 prepare() {
-#false
   set -u
   cd "${_srcdir}"
   # The non git release forgot to run bootstrap so we must run bootstrap.
   # bootstrap requires the git info which doesn't come with the release version.
   if [ "${pkgver}" = '0.2.3' ] && [ ! -s 'gitversion.h' ]; then
-    sed -i -e 's:^\(\s\+gitrevision\)=.*$:\1="d0313e5":g' \
-           -e 's,^\(\s\+gitdate\)=.*$,\1="Sat Mar 14 08:07:19 2015 -0500",g' \
-      'bootstrap'
+    sed -e 's:^\(\s\+gitrevision\)=.*$:\1="d0313e5":g' \
+        -e 's,^\(\s\+gitdate\)=.*$,\1="Sat Mar 14 08:07:19 2015 -0500",g' \
+      -i 'bootstrap'
   fi
-  if [ ! -s 'configure' ]; then
-    sed -i -e 's:^./configure:exit 0\n&:g' 'bootstrap'
-    ./bootstrap
+  if [ "${pkgver}" = '0.3.3' ]; then
+    sed -e 's:0\.3\.2:0.3.3:g' -i 'configure.ac' 'configure'
   fi
-  ./configure --prefix='/usr'
   set +u
 }
 
 build() {
   set -u
   cd "${_srcdir}"
+  if [ ! -s 'configure' ]; then
+    sed -i -e 's:^./configure:exit 0\n&:g' 'bootstrap'
+    ./bootstrap
+  fi
+  if [ ! -s 'confi.log' ]; then
+    ./configure --prefix='/usr'
+  fi
   make -j1 -C 'src' -f 'Makevars'
   set +u
 }