quex: update to 0.69.3

3 files changed, 26 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index af0115016876..d0d035973551 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = quex
 	pkgdesc = Generator of lexical analyzers in C and C++. Unicode Supported.
-	pkgver = 0.68.2
+	pkgver = 0.69.3
 	pkgrel = 1
 	url = http://quex.org/
 	arch = any
 	license = LGPL
 	depends = python2
 	provides = quex
-	source = http://downloads.sourceforge.net/project/quex/DOWNLOAD/quex-0.68.2.tar.gz
-	source = quex
-	md5sums = 80ddb372819afa05449114633c5a6f69
-	md5sums = 89ee42a783fe1fb7bf7787cc861be1a3
+	provides = quex-for_libadalang
+	source = https://downloads.sourceforge.net/quex/quex-0.69.3.tar.gz
+	sha256sums = ad0fbb6bef8116ac312d6ab9e93b444ca5826f9c683a6dae1c1f606cf7e78fcf
 
 pkgname = quex
 
diff --git a/PKGBUILD b/PKGBUILD
index 79f496b1ac41..8c7a70456e65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,32 @@
-# Maintainer: Tarn Burton <twburton at gmail dot com>
+# Maintainer: Andrew Sun <adsun701@gmail.com>
+# Contributor: Tarn Burton <twburton at gmail dot com>
+
 pkgname='quex'
-pkgver=0.68.2
+pkgver=0.69.3
 pkgrel=1
 pkgdesc="Generator of lexical analyzers in C and C++. Unicode Supported."
 arch=('any')
 url="http://quex.org/"
 license=('LGPL')
-provides=('quex')
+provides=('quex' 'quex-for_libadalang')
 depends=('python2')
-source=("http://downloads.sourceforge.net/project/quex/DOWNLOAD/quex-$pkgver.tar.gz" "quex")
-md5sums=('80ddb372819afa05449114633c5a6f69'
-         '89ee42a783fe1fb7bf7787cc861be1a3')
+source=("https://downloads.sourceforge.net/quex/quex-$pkgver.tar.gz")
+sha256sums=('ad0fbb6bef8116ac312d6ab9e93b444ca5826f9c683a6dae1c1f606cf7e78fcf')
 
 package() {
-  install -D quex "$pkgdir/usr/bin/quex"
-  cd "$pkgname-$pkgver"
-  install -d "$pkgdir/usr/share/$pkgname"
-  #install -D manpage/quex.1 "$pkgdir/usr/share/man/man1/quex.1"
-  cp -r * "$pkgdir/usr/share/$pkgname"
-  #rm -r "$pkgdir/usr/share/$pkgname/manpage"
-  install -d "$pkgdir/usr/share/man/man1"
-  ln -s /usr/share/quex/manpage/quex.1 "$pkgdir/usr/share/man/man1/quex.1"
-  install -d "$pkgdir/usr/include"
-  ln -s /usr/share/quex/quex "$pkgdir/usr/include/quex"
+mkdir -p "${pkgdir}/usr/lib"
+mkdir -p "${pkgdir}/usr/bin"
+
+cp -rf "${srcdir}/${pkgname}-${pkgver}" "${pkgdir}/usr/lib"
+
+sed -s "s|#! /usr/bin/env python|#! /usr/bin/env python2|g" -i "${pkgdir}/usr/lib/${pkgname}-${pkgver}/quex-exe.py"
+
+# Install profile.d script to set QUEX_PATH.
+#
+mkdir -p "${pkgdir}"/etc/profile.d
+echo "export QUEX_PATH=/usr/lib/${pkgname}-${pkgver}" > "${pkgdir}"/etc/profile.d/quex.sh
+
+ln -s "/usr/lib/${pkgname}-${pkgver}/quex-exe.py" "${pkgdir}/usr/bin/quex"
+
+chmod 755 "${pkgdir}/usr/lib/${pkgname}-${pkgver}/quex-exe.py"
 }
diff --git a/quex b/quex
deleted file mode 100755
index e714492ae87d..000000000000
--- a/quex
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/bash
-export QUEX_PATH=/usr/share/quex/
-python2 $QUEX_PATH/quex-exe.py $*