Date: Tuesday, October 4, 2022 @ 19:49:22
  Author: arojas
Revision: 1321259

upgpkg: multitail 7.0.0-1: Update to 7.0.0

Modified:
  multitail/trunk/PKGBUILD

----------+
 PKGBUILD |   30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-10-04 19:48:12 UTC (rev 1321258)
+++ PKGBUILD    2022-10-04 19:49:22 UTC (rev 1321259)
@@ -3,7 +3,7 @@
 # Contributor: Roberto Carvajal <[email protected]>
 
 pkgname=multitail
-pkgver=6.5.1
+pkgver=7.0.0
 pkgrel=1
 pkgdesc="Lets you view one or multiple files like the original tail program"
 arch=('x86_64')
@@ -10,29 +10,33 @@
 license=('GPL')
 url="https://www.vanheusden.com/multitail";
 depends=('ncurses')
+makedepends=('cmake')
 backup=('etc/multitail.conf')
 #source=("https://www.vanheusden.com/multitail/${pkgname}-${pkgver}.tgz";)
-source=(https://github.com/halturin/multitail/archive/v$pkgver/$pkgname-$pkgver.tar.gz
-        https://github.com/halturin/multitail/commit/d7d10f3b.patch)
-md5sums=('b4538d88508c6f7774b06d15bec8fcb6'
-         '248d9464c6cad37c7b563592881b902e')
+source=(https://github.com/folkertvanheusden/multitail/archive/$pkgver/$pkgname-$pkgver.tar.gz
+        https://github.com/halturin/multitail/commit/d7d10f3b.patch
+        https://github.com/folkertvanheusden/multitail/commit/608bad75.patch)
+md5sums=('90b67e3e41c5c51b65b946149eaa780e'
+         '248d9464c6cad37c7b563592881b902e'
+         '177842833f5bb82c06574e70d5034fd3')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -p1 < ../d7d10f3b.patch # Fix build with -Werror=format-security
+  patch -p1 < ../608bad75.patch # Fix license install
+  sed -i 's|ncursesw/panel.h|panel.h|' mt.h    
+  sed -i 's|ncursesw/ncurses.h|ncurses.h|' mt.h
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|ncursesw/panel.h|panel.h|' mt.h
-  sed -i 's|ncursesw/ncurses.h|ncurses.h|' mt.h
-  make
+  cmake -B build -S $pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  cmake --build build
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  install -D -m 755 multitail      "$pkgdir/usr/bin/multitail"
-  install -D -m 644 multitail.1    "$pkgdir/usr/share/man/man1/multitail.1"
-  install -D -m 644 multitail.conf "$pkgdir/etc/multitail.conf"
+  DESTDIR="$pkgdir" cmake --install build
+  mv "$pkgdir"/{usr/,}etc
+  mv "$pkgdir"/etc/multitail.conf{.new,}
 }
 # vim: ts=2 sw=2 et ft=sh

Reply via email to