From 77d17004730dcd32fc8f09d32ad652cfb40c6a04 Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Sun, 16 May 2021 14:34:08 +0000
Subject: [PATCH] alacritty: reworked build()

---
 alacritty/.signature |  4 ++--
 alacritty/Pkgfile    | 35 ++++++++++++++---------------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/alacritty/.signature b/alacritty/.signature
index a55c9ca2b..88067d573 100644
--- a/alacritty/.signature
+++ b/alacritty/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF31NyL5izdOgcyMwwQNjudLcHNE44kdUyFKeIYiv0IdZe6tYPb7njCXDzbARpEPsCOcfQlntEhxBaKsOQfFuxugw=
-SHA256 (Pkgfile) = 1434cd5870d4fe9cd87e32fe3b43fb19e1e6ec114bf20a0c52531d435705053c
+RWSagIOpLGJF303SY0yycbk2WMtpf91OVW3sfM+8Mh7WCdVBPhas0f9Zrl19v1Y8GztC9jyjrSZoiN6iguUTgF384JoJZANBUww=
+SHA256 (Pkgfile) = ad74aba8860e97020c483a247cffa750ac2ccfaebac16bf4e4cf8aa5d2e5ff8e
 SHA256 (.footprint) = 2fabff3156bceeb2af3d151a8d16bec629f8f157908d079f2f880e616d42bf79
 SHA256 (alacritty-0.7.2.tar.gz) = 750c294d384d23f1dfc30e9105380e4194507b0828ac91d8ffd94c9bbc18d6c3
diff --git a/alacritty/Pkgfile b/alacritty/Pkgfile
index f47024c49..4f5b7cce0 100644
--- a/alacritty/Pkgfile
+++ b/alacritty/Pkgfile
@@ -2,6 +2,7 @@
 # URL: https://github.com/alacritty/alacritty
 # Maintainer: Tim Biermann, tbier at posteo dot de
 # Depends on: fontconfig rust util-linux xorg-libxcb
+# Optional: bash-completion zsh
 
 name=alacritty
 version=0.7.2
@@ -9,36 +10,28 @@ release=1
 source=(https://github.com/alacritty/alacritty/archive/v$version/$name-$version.tar.gz)
 
 build() {
-  cd $name-$version
-
   prt-get isinst sccache && export RUSTC_WRAPPER=/usr/bin/sccache
   mkdir $PKGMK_SOURCE_DIR/rust || true
   export CARGO_HOME=$PKGMK_SOURCE_DIR/rust
 
-  cargo update
-  cargo fetch
-  env CARGO_INCREMENTAL=0 cargo build --release --locked
+  cargo update --manifest-path $name-$version/Cargo.toml
+  cargo build --release --locked --manifest-path \
+    $name-$version/Cargo.toml
 
-  install -D -m755 target/release/alacritty \
-    $PKG/usr/bin/alacritty
-  install -D -m644 extra/alacritty.man $PKG/usr/share/man/man1/alacritty.1
-  install -D -m644 extra/linux/io.alacritty.Alacritty.appdata.xml \
+  install -D -m755 $name-$version/target/release/alacritty $PKG/usr/bin/alacritty
+  install -D -m644 $name-$version/extra/alacritty.man $PKG/usr/share/man/man1/alacritty.1
+  install -D -m644 $name-$version/extra/linux/io.alacritty.Alacritty.appdata.xml \
     $PKG/usr/share/appdata/io.alacritty.Alacritty.appdata.xml
 
-  install -D -m644 alacritty.yml \
-    $PKG/usr/share/alacritty/alacritty.yml
-  install -D -m 644 extra/linux/Alacritty.desktop \
+  install -D -m644 $name-$version/alacritty.yml $PKG/usr/share/alacritty/alacritty.yml
+  install -D -m 644 $name-$version/extra/linux/Alacritty.desktop \
     $PKG/usr/share/applications/Alacritty.desktop
-  install -D -m644 extra/logo/alacritty-term.svg \
+  install -D -m644 $name-$version/extra/logo/alacritty-term.svg \
     $PKG/usr/share/pixmaps/Alacritty.svg
 
   # install auto-completion files if the ports for it are installed
-  if [ -e /bin/zsh || /usr/bin/zsh ]; then
-    install -D -m644 extra/completions/_alacritty \
-      $PKG/usr/share/zsh/site-functions/_alacritty
-  fi
-  if [ -e /usr/lib/pkgconfig/bash-completion.pc ]; then
-    install -D -m644 extra/completions/alacritty.bash \
-      $PKG/usr/share/bash-completion/completions/alacritty
-  fi
+  prt-get isinst zsh && install -D -m644 extra/completions/_alacritty \
+      $PKG/usr/share/zsh/site-functions/_alacritty || true
+  prt-get isinst bash-completion && install -D -m644 extra/completions/alacritty.bash \
+      $PKG/usr/share/bash-completion/completions/alacritty || true
 }