mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-09 06:16:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

community/multitail: upgrade to 6.5.0

Browse Source
This commit is contained in:
Leo 2019-11-08 17:31:27 -03:00
parent 6f5a34e246
commit bc6d8da31b
3 changed files with 47 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
community/multitail/APKBUILD
View File

@ -2,40 +2,36 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=multitail
pkgver=6.4.2
pkgrel=1
pkgver=6.5.0
pkgrel=0
pkgdesc="MultiTail lets you view one or multiple files like the original tail program"
arch="all"
url="http://www.vanheusden.com/multitail"
license="GPL-2.0"
depends_dev=""
depends="ncurses coreutils"
makedepends="ncurses-dev"
install=""
subpackages="$pkgname-doc"
source="http://www.vanheusden.com/multitail/$pkgname-$pkgver.tgz
fix-ncursesw-include.patch"
builddir="$srcdir"/$pkgname-$pkgver
source="http://www.vanheusden.com/multitail/multitail-$pkgver.tgz
linux-is-not-debian-ncurses.patch
"
build() {
make -C "$builddir" || return 1
make -C "$builddir"
}
package() {
cd $builddir
make DESTDIR="$pkgdir" install || return 1
make DESTDIR="$pkgdir" PREFIX=/usr install
mv "$pkgdir"/usr/share/doc/$pkgname-$pkgver \
"$pkgdir"/usr/share/doc/$pkgname || return 1
mv "$pkgdir"/etc/multitail \
"$pkgdir"/usr/share/doc/$pkgname/examples || return 1
mv "$pkgdir"/etc/$pkgname.conf.new "$pkgdir"/etc/$pkgname.conf || return 1
mkdir -p "$pkgdir"/etc
mv "$pkgdir"/usr/share/doc/$pkgname-$pkgver \
"$pkgdir"/usr/share/doc/$pkgname
mv "$pkgdir"/usr/etc/multitail \
"$pkgdir"/usr/share/doc/$pkgname/examples
mv "$pkgdir"/usr/etc/$pkgname.conf.new "$pkgdir"/etc/$pkgname.conf
rmdir "$pkgdir"/usr/etc
}
md5sums="a0959f7b2385061080712afd8ae6e33d multitail-6.4.2.tgz
7c5935cb04737f648f104e9f2b9eb96e fix-ncursesw-include.patch"
sha256sums="af1d5458a78ad3b747c5eeb135b19bdca281ce414cefdc6ea0cff6d913caa1fd multitail-6.4.2.tgz
766c463182e80756be797423f97185f6619f04c0cb1c3c63f897a99bbe6a9f38 fix-ncursesw-include.patch"
sha512sums="668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd multitail-6.4.2.tgz
8ab00ff267974cff4c64075e9c0b89cf1c90aebb001a38b41a0d6832d6f49e7838869c5dff12f6e05f5622001726b6bec0b5e7132832087a8ef89f2916e287b3 fix-ncursesw-include.patch"
sha512sums="de6dfc8f9278752a77ded4b317952dbada2b05927ce7afcbe063a6e8f5a628e31e719ce4badc7a600f75cabe4f40d811e51ff6cddf25f1c90d1180b1b0e0057c multitail-6.5.0.tgz
8f9a02b37187af204a1b00646e9657ead1c70bb1f3ee9dda922186b24060f5e9bd9d7d3cfe7f29ccbc242ff69a515e010b11d51c41112ca77acd910e2de2e9db linux-is-not-debian-ncurses.patch"

14
community/multitail/fix-ncursesw-include.patch
View File

@ -1,14 +0,0 @@
diff -upr multitail-6.4.2.orig/mt.h multitail-6.4.2/mt.h
--- multitail-6.4.2.orig/mt.h 2015-10-03 01:53:00.408700746 +0200
+++ multitail-6.4.2/mt.h 2015-10-03 01:53:03.935011348 +0200
@@ -60,8 +60,8 @@ typedef enum { SCHEME_TYPE_EDIT = 0, SCH
#endif
#ifdef UTF8_SUPPORT
- #include <ncursesw/panel.h>
- #include <ncursesw/ncurses.h>
+ #include <panel.h>
+ #include <ncurses.h>
#else
#if defined(sun) || defined(__sun) || defined(scoos) || defined(_HPUX_SOURCE) || defined(AIX) || defined(__CYGWIN__)
#include <ncurses/panel.h>

29
community/multitail/linux-is-not-debian-ncurses.patch Normal file
View File

@ -0,0 +1,29 @@
diff --git a/mt.h b/mt.h
index e3f0542..411217f 100644
--- a/mt.h
+++ b/mt.h
@@ -59,21 +59,8 @@ typedef enum { SCHEME_TYPE_EDIT = 0, SCHEME_TYPE_FILTER } filter_edit_scheme_t;
#define __USE_BSD /* manpage says _BSD_SOURCE, stdlib.h says __USE_BSD */
#endif
-#if defined(UTF8_SUPPORT) && !defined(__APPLE__)
- #include <ncursesw/panel.h>
- #include <ncursesw/ncurses.h>
-#else
- #if defined(__APPLE__)
- #include <ncurses.h>
- #include <panel.h>
- #elif defined(sun) || defined(__sun) || defined(scoos) || defined(_HPUX_SOURCE) || defined(AIX) || defined(__CYGWIN__)
- #include <ncurses/panel.h>
- #include <ncurses/ncurses.h>
- #else
- #include <panel.h>
- #include <ncurses.h>
- #endif
-#endif
+#include <panel.h>
+#include <ncurses.h>
/* it seems the default HP-UX c-compiler doesn't understand atoll and
* strtoll while it does understand 'long long'