[arch-commits] Commit in marisa/trunk (PKGBUILD)

[Felix Yan]

    Date: Friday, June 1, 2018 @ 10:53:19
  Author: felixonmars
Revision: 335943

upgpkg: marisa 0.2.5-1

Modified:
  marisa/trunk/PKGBUILD

----------+
 PKGBUILD |   71 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 37 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-01 10:53:13 UTC (rev 335942)
+++ PKGBUILD	2018-06-01 10:53:19 UTC (rev 335943)
@@ -1,23 +1,28 @@
 # $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
 pkgbase=marisa
 pkgname=('marisa' 'perl-marisa' 'python2-marisa' 'ruby-marisa')
-pkgver=0.2.4
-pkgrel=11
+pkgver=0.2.5
+pkgrel=1
 arch=('x86_64')
-url="https://code.google.com/p/marisa-trie/"
+url="https://github.com/s-yata/marisa-trie"
 license=('BSD' 'LGPL')
 makedepends=('python2' 'ruby' 'perl')
-source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/marisa-trie/marisa-$pkgver.tar.gz)
-sha1sums=('fb0ed7d993e84dff32ec456a79bd36a00022629d')
+source=("marisa-trie::https://github.com/s-yata/marisa-trie/archive/v$pkgver.tar.gz")
+sha512sums=('62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547')
 
+prepare() {
+  cd marisa-trie-$pkgver
+  autoreconf -i
+}
+
 build() {
-  cd "${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static \
+  cd marisa-trie-$pkgver
+  # sse2 is part of amd64
+  ./configure --prefix=/usr --disable-static --enable-sse2
     # --enable-popcnt
-    # --enable-sse2
     # --enable-sse3
     # --enable-ssse3
     # --enable-sse4.1
@@ -25,29 +30,27 @@
     # --enable-sse4
     # --enable-sse4a
 
-  sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-  sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
   make
 
   # Perl bindings
-  cd "${srcdir}/${pkgbase}-${pkgver}/bindings/perl"
+  cd "$srcdir"/marisa-trie-$pkgver/bindings/perl
   perl Makefile.PL \
-    INC="-I${srcdir}/${pkgbase}-${pkgver}/lib" \
-    LIBS="-L${srcdir}/${pkgbase}-${pkgver}/lib/.libs"
+    INC=-I"$srcdir"/marisa-trie-$pkgver/include \
+    LIBS=-L"$srcdir"/marisa-trie-$pkgver/lib/marisa/.libs
   make
 
   # Python bindings
-  cd "${srcdir}/${pkgbase}-${pkgver}/bindings/python"
+  cd "$srcdir"/marisa-trie-$pkgver/bindings/python
   python2 setup.py build_ext \
-    --include-dirs="${srcdir}/${pkgbase}-${pkgver}/lib" \
-    --library-dirs="${srcdir}/${pkgbase}-${pkgver}/lib/.libs"
+    --include-dirs="$srcdir"/marisa-trie-$pkgver/include \
+    --library-dirs="$srcdir"/marisa-trie-$pkgver/lib/marisa/.libs
   python2 setup.py build
 
   # Ruby bindings
-  cd "${srcdir}/${pkgbase}-${pkgver}/bindings/ruby"
+  cd "$srcdir"/marisa-trie-$pkgver/bindings/ruby
   ruby extconf.rb \
-    --with-opt-include="${srcdir}/${pkgbase}-${pkgver}/lib" \
-    --with-opt-lib="${srcdir}/${pkgbase}-${pkgver}/lib/.libs" \
+    --with-opt-include="$srcdir"/marisa-trie-$pkgver/include \
+    --with-opt-lib="$srcdir"/marisa-trie-$pkgver/lib/marisa/.libs \
     --vendor
   make
 }
@@ -56,14 +59,14 @@
   pkgdesc="Static and space-efficient trie data structure library"
   depends=('gcc-libs')
 
-  cd "${pkgbase}-${pkgver}"
+  cd marisa-trie-$pkgver
   make DESTDIR="$pkgdir" install
 
-  install -d "${pkgdir}/usr/share/doc/${pkgbase}-${pkgver}"
-  install -m 644 docs/* README "${pkgdir}/usr/share/doc/${pkgbase}-${pkgver}/"
+  install -d "$pkgdir"/usr/share/doc/$pkgbase-$pkgver
+  install -m 644 docs/* "$pkgdir"/usr/share/doc/$pkgbase-$pkgver/
 
-  install -d "${pkgdir}/usr/share/licenses/$pkgname"
-  install -m 644 AUTHORS COPYING "${pkgdir}/usr/share/licenses/$pkgname/"
+  install -d "$pkgdir"/usr/share/licenses/$pkgname
+  install -m 644 AUTHORS COPYING.md "$pkgdir"/usr/share/licenses/$pkgname/
 }
 
 package_perl-marisa() {
@@ -70,12 +73,12 @@
   pkgdesc="Perl language binding for marisa"
   depends=('perl' 'marisa')
 
-  cd "${pkgbase}-${pkgver}/bindings/perl"
+  cd marisa-trie-$pkgver/bindings/perl
   make DESTDIR="$pkgdir" install
 
   cd ../..
-  install -d "${pkgdir}/usr/share/licenses/$pkgname"
-  install -m 644 AUTHORS COPYING "${pkgdir}/usr/share/licenses/$pkgname/"
+  install -d "$pkgdir"/usr/share/licenses/$pkgname
+  install -m 644 AUTHORS COPYING.md "$pkgdir"/usr/share/licenses/$pkgname/
 }
 
 package_python2-marisa() {
@@ -82,12 +85,12 @@
   pkgdesc="Python 2.x language binding for marisa"
   depends=('python2' 'marisa')
 
-  cd "${pkgbase}-${pkgver}/bindings/python"
+  cd marisa-trie-$pkgver/bindings/python
   python2 setup.py install -O1 --root="$pkgdir"
 
   cd ../..
-  install -d "${pkgdir}/usr/share/licenses/$pkgname"
-  install -m 644 AUTHORS COPYING "${pkgdir}/usr/share/licenses/$pkgname/"
+  install -d "$pkgdir"/usr/share/licenses/$pkgname
+  install -m 644 AUTHORS COPYING.md "$pkgdir"/usr/share/licenses/$pkgname/
 }
 
 package_ruby-marisa() {
@@ -97,7 +100,7 @@
   # ruby version without the patch number, e.g. 2.4
   local _rubyver=$(ruby -e"puts Gem.ruby_version.to_s.split('.')[0..1].join('.')")
 
-  cd "${pkgbase}-${pkgver}/bindings/ruby"
+  cd marisa-trie-$pkgver/bindings/ruby
     _hdrdir=$(pkg-config --variable=rubyhdrdir ruby-$_rubyver)
     _arch=$(pkg-config --variable=arch ruby-$_rubyver)
   make DESTDIR="$pkgdir" install \
@@ -106,6 +109,6 @@
     rubyhdrdir="$_hdrdir"
 
   cd ../..
-  install -d "${pkgdir}/usr/share/licenses/$pkgname"
-  install -m 644 AUTHORS COPYING "${pkgdir}/usr/share/licenses/$pkgname/"
+  install -d "$pkgdir"/usr/share/licenses/$pkgname
+  install -m 644 AUTHORS COPYING.md "$pkgdir"/usr/share/licenses/$pkgname/
 }