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

[Alexander Rødseth]

    Date: Tuesday, May 18, 2021 @ 07:54:36
  Author: arodseth
Revision: 936195

upgpkg: haxe 4.2.2-1

Modified:
  haxe/trunk/PKGBUILD

----------+
 PKGBUILD |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-18 07:47:46 UTC (rev 936194)
+++ PKGBUILD	2021-05-18 07:54:36 UTC (rev 936195)
@@ -6,7 +6,7 @@
 # Contributor: Michael Fellinger <mf at rubyists.com>
 
 pkgname=haxe
-pkgver=4.2.1
+pkgver=4.2.2
 pkgrel=1
 pkgdesc='Cross-platform toolkit and programming language'
 arch=(x86_64)
@@ -15,10 +15,9 @@
 depends=(neko mbedtls)
 optdepends=(java-environment mono php python)
 makedepends=(camlp4 git neko ocaml opam zlib perl-string-shellquote perl-ipc-system-simple)
-provides=(haxe haxelib)
 options=(!makeflags !strip)
-source=("$pkgname-$pkgver::git+https://github.com/HaxeFoundation/haxe#commit=bf9ff69c0801082174f0b2b0a66faeb5356de580") # tag: 4.2.1
-sha256sums=('SKIP')
+source=("$pkgname-$pkgver::git+https://github.com/HaxeFoundation/haxe#commit=a2f4ba95400edf10195ce2a1c87c56dc0d67111b") # tag: 4.2.2
+b2sums=(SKIP)
 
 prepare() {
   cd $pkgname-$pkgver
@@ -30,16 +29,17 @@
   eval $(opam env)
 
   # Install required OCaml packages
-  opam install -y camlp5 dune extlib jbuilder luv ocamlfind ppx_tools_versioned ptmap sedlex sha xml-light
+  opam install -y camlp5 dune extlib jbuilder luv ocamlfind \
+    ppx_tools_versioned ptmap sedlex sha xml-light
 
-  # Create the script that will be placed in /etc/profile.d/
-  echo 'export HAXE_STD_PATH=/usr/share/haxe/std' > "$srcdir/haxe.sh"
+  # Create the script that will be placed in /etc/profile.d
+  echo 'export HAXE_STD_PATH=/usr/share/haxe/std' > haxe.sh
 }
 
 build() {
   # Needed to make Haxe build with OCaml 4.06 and 4.07
   # For more info, see: https://github.com/HaxeFoundation/haxe/issues/6883#issuecomment-370142073
-  export OCAMLPARAM="safe-string=0,_"
+  export OCAMLPARAM='safe-string=0,_'
 
   # Prepare opam and ocamlfind before building
   eval $(opam env)
@@ -48,7 +48,7 @@
   make libs haxe
 
   # "make tools" did not work. These are the replacement commands:
-  cd "$srcdir/$pkgname-$pkgver/extra/haxelib_src"
+  cd "$srcdir"/$pkgname-$pkgver/extra/haxelib_src
   ../../haxe client.hxml || true
   nekotools boot run.n
   mv run ../../haxelib
@@ -60,10 +60,11 @@
 }
 
 package() {
+  cd $pkgname-$pkgver
   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 \
+  install -m 755 haxe{,lib} "$pkgdir"/usr/bin/
+  cp -rf std "$pkgdir/usr/share/$pkgname/"
+  install -Dm 644 haxe.sh "$pkgdir/etc/profile.d/haxe.sh"
+  install -Dm 644 extra/LICENSE.txt \
     "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
-  install -Dm 644 "$srcdir/haxe.sh" "$pkgdir/etc/profile.d/haxe.sh"
 }