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

[Alexander Rødseth]

    Date: Thursday, March 23, 2017 @ 18:17:12
  Author: arodseth
Revision: 218553

upgpkg: haxe 3.4.2-1

Modified:
  haxe/trunk/PKGBUILD

----------+
 PKGBUILD |   32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-23 17:39:34 UTC (rev 218552)
+++ PKGBUILD	2017-03-23 18:17:12 UTC (rev 218553)
@@ -7,12 +7,12 @@
 # Contributor: Michael Fellinger <mf at rubyists.com>
 
 pkgname=haxe
-pkgver=3.4.0
+pkgver=3.4.2
 pkgrel=1
 pkgdesc='Cross-platform toolkit and programming language'
 arch=('x86_64' 'i686')
 url='http://haxe.org/'
-license=('GPL' 'MIT' 'LGPL') # http://haxe.org/foundation/open-source.html
+license=('GPL' 'MIT' 'LGPL')
 groups=('devel')
 depends=('neko')
 optdepends=('python' 'php' 'java-environment' 'mono')
@@ -19,9 +19,9 @@
 makedepends=('git' 'ocaml' 'camlp4' 'zlib' 'neko')
 provides=('haxe' 'haxelib')
 options=('!strip' '!makeflags')
-source=("$pkgname-${pkgver/rc?/}::git+https://github.com/HaxeFoundation/haxe.git#tag=$pkgver" #${pkgver/rc/-rc}
-  'git+https://github.com/HaxeFoundation/haxelib.git'
-  'git+https://github.com/HaxeFoundation/ocamllibs.git'
+source=("$pkgname-$pkgver::git+https://github.com/HaxeFoundation/haxe.git#commit=890f8c70cf"
+  'git+https://github.com/HaxeFoundation/haxelib.git#commit=b0b6057d24'
+  'git+https://github.com/HaxeFoundation/ocamllibs.git#commit=ea953db15a'
   'haxe.sh'
 )
 md5sums=('SKIP'
@@ -29,30 +29,28 @@
          'SKIP'
          '977476c8fc1dfc0acbb05bd22f9136b0')
 
-build() {
-  cd "$pkgname-$pkgver" # ${pkgver/rc?/}
+prepare() {
+  cd "$pkgname-$pkgver"
 
   git submodule init
   git config submodule.extra/haxelib_src.url "$srcdir/haxelib"
   git config submodule.libs.url "$srcdir/ocamllibs"
   git submodule update
+}
 
-  make
-  make tools
+build() {
+  make -C "$pkgname-$pkgver" all tools
 }
 
 check() {
-  cd "$pkgname-$pkgver" # ${pkgver/rc?/}
-
-  echo "haxe version: $(./haxe -version)"
-  echo "haxelib version: $(./haxelib version)"
+  "$pkgname-$pkgver/haxe" -version && "$pkgname-$pkgver/haxelib" version
 }
 
 package() {
-  install -d "$pkgdir"/usr/bin/ "$pkgdir"/usr/share/haxe/
-  install -m 755 "$srcdir/$pkgname-${pkgver/rc?/}"/{haxe,haxelib} "$pkgdir"/usr/bin/
-  cp -rf "$srcdir/$pkgname-$pkgver"/std "$pkgdir"/usr/share/$pkgname/ # -rc
-  install -Dm 644 "$srcdir/$pkgname-${pkgver/rc?/}"/extra/LICENSE.txt \
+  install -d "$pkgdir/usr/"{bin/,share/haxe/}
+  install -m 755 "$srcdir/$pkgname-$pkgver"/{haxe,haxelib} "$pkgdir"/usr/bin/
+  cp -rf "$srcdir/$pkgname-$pkgver/std" "$pkgdir/usr/share/$pkgname/"
+  install -Dm 644 "$srcdir/$pkgname-$pkgver"/extra/LICENSE.txt \
     "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
   install -Dm 644 "$srcdir/haxe.sh" "$pkgdir/etc/profile.d/haxe.sh"
 }