[arch-commits] Commit in dfc/trunk (PKGBUILD dfc.install)

[Sven-Hendrik Haase]

    Date: Sunday, May 24, 2020 @ 02:06:51
  Author: svenstaro
Revision: 632735

upgpkg: dfc 3.1.1-3: Modernize package

Modified:
  dfc/trunk/PKGBUILD
Deleted:
  dfc/trunk/dfc.install

-------------+
 PKGBUILD    |   26 +++++++++++++++-----------
 dfc.install |    4 ----
 2 files changed, 15 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-24 01:44:57 UTC (rev 632734)
+++ PKGBUILD	2020-05-24 02:06:51 UTC (rev 632735)
@@ -1,31 +1,35 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
 # Contributor: Rolinh <robinDOThahlingATgw-computingDOTnet>
 
 pkgname=dfc
 pkgver=3.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Display file system space usage using graphs and colors"
 arch=('x86_64')
 url="http://projects.gw-computing.net/projects/dfc"
 license=('BSD')
 depends=('glibc')
-makedepends=('cmake' 'gettext')
-conflicts=('dfc-git')
-source=("https://github.com/Rolinh/dfc/archive/v${pkgver}.tar.gz")
-install='dfc.install'
+makedepends=('cmake' 'gettext' 'ninja')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/Rolinh/dfc/archive/v${pkgver}.tar.gz")
 sha512sums=('0dded1824e6e6734214999f898d253fab760bb69b0f152b44e47b54b30c6ebcf4ac04cec44a37eb655548d4dbaef9328a6b383957b5b8fe6e20cb550d51d46e2')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
 
-  cmake . -DPREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE
-  make
+  cmake \
+    -B build \
+    -G Ninja \
+    -DPREFIX=/usr \
+    -DSYSCONFDIR=/etc \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE
+  ninja -C build
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
 
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -C build install
 
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: dfc.install
===================================================================
--- dfc.install	2020-05-24 01:44:57 UTC (rev 632734)
+++ dfc.install	2020-05-24 02:06:51 UTC (rev 632735)
@@ -1,4 +0,0 @@
-post_install() {
-	echo 'Optional configuration file is located in /etc/xdg/dfc/'
-	echo 'Copy it to ~/.config/dfc/ (create this folder if necessary) if you want to use it.'
-}