Update to 4.18.6

1 files changed, 26 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 250a65792269..0e1a01ed472e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,29 @@
 # Maintainer: ???
 # Contributor: Flemming Madsen (arch at themadsens dot dk)
 
+# TODO: Can we remove the included agrep and use tre?
+
+set -u
 pkgname='glimpse'
-pkgver=3.6
-pkgrel=2
-arch=('i686' 'x86_64')
+pkgver='4.18.6'
+pkgrel=1
 pkgdesc='Fast full text search and indexing with approximate matching'
+arch=('i686' 'x86_64')
 url='http://webglimpse.net'
-license='BSD style'
+# https://github.com/gvelez17/glimpse
+license=('custom:BSD Style')
 depends=('glibc')
-source=("ftp://ftp.cs.tu-berlin.de/pub/linux/Mirrors/sunsite.unc.edu/utils/text/glimpse-3.6.src.tgz"
-        'compile.patch')
-sha256sums=('77a5836c15b08ee9665f6cb936506223aa52c20896251994507e7b3970568fde'
+conflicts=('tre') # agrep
+_verwatch=("${url}/download.php" '.*Downloads .* Glimpse \([^,]\+\),.*' 'f')
+source=(
+  #'ftp://ftp.cs.tu-berlin.de/pub/linux/Mirrors/sunsite.unc.edu/utils/text/glimpse-3.6.src.tgz'
+  #'ftp://ftp.vim.org/vol/2/metalab/utils/text/glimpse-3.6.src.tgz'
+  #'http://webglimpse.net/trial/glimpse-latest.tar.gz'
+  "http://webglimpse.net/trial/glimpse-${pkgver}.tar.gz"
+  'compile.patch'
+)
+sha256sums=('3045296877bc7a3714ae10872056030175c2f10de83544aa7f08811f24d38077'
             '27e995d061d9434e4e8309d1dc9574ecef8cd6737ae76f12125107d1499bb607')
-#source[0]='http://webglimpse.net/trial/glimpse-latest.tar.gz'
 
 _disabled_pkgver() {
   cd "${pkgname}"-*/
@@ -28,22 +38,24 @@ _disabled_pkgver() {
 prepare() {
   set -u
   cd "${pkgname}"-*/
-  [ "${pkgver}" = '3.6' ] && patch --backup -p0 < "${srcdir}/compile.patch"
+  if [ "${pkgver}" = '3.6' ]; then
+    patch --backup -p0 < "${srcdir}/compile.patch"
+  fi
   ./configure --prefix='/usr'
   set +u
 }
 
-
 build() {
   set -u
-  cd "${pkgname}"-*
-  make -s # -j "$(nproc)" # Not compatible with parallel make
+  cd "${pkgname}"-*/
+  make -s -j1 # Not compatible with parallel make
   set +u
 }
 
 package() {
   set -u
-  cd "${pkgname}"-*
-  make "prefix=${pkgdir}/usr" install
+  cd "${pkgname}"-*/
+  make prefix="${pkgdir}/usr" install
   set +u
 }
+set +u