aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-11-08 17:31:27 -0300
committerLeo <thinkabit.ukim@gmail.com>2019-11-08 19:24:58 -0300
commitbc6d8da31b0deb8d2495f72ba9da0fc2803e2e5f (patch)
tree4cd18ee4b72fda84625285f647a9ae2250227d3b
parent6f5a34e24668708d26d5e4adbb18b1d0ad09016e (diff)
downloadaports-bc6d8da31b0deb8d2495f72ba9da0fc2803e2e5f.tar.gz
aports-bc6d8da31b0deb8d2495f72ba9da0fc2803e2e5f.tar.bz2
aports-bc6d8da31b0deb8d2495f72ba9da0fc2803e2e5f.tar.xz
community/multitail: upgrade to 6.5.0
-rw-r--r--community/multitail/APKBUILD40
-rw-r--r--community/multitail/fix-ncursesw-include.patch14
-rw-r--r--community/multitail/linux-is-not-debian-ncurses.patch29
3 files changed, 47 insertions, 36 deletions
diff --git a/community/multitail/APKBUILD b/community/multitail/APKBUILD
index f7b5a99d38..3bde4b11c5 100644
--- a/community/multitail/APKBUILD
+++ b/community/multitail/APKBUILD
@@ -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
+
+ 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
- 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
+ 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"
diff --git a/community/multitail/fix-ncursesw-include.patch b/community/multitail/fix-ncursesw-include.patch
deleted file mode 100644
index 33c1051804..0000000000
--- a/community/multitail/fix-ncursesw-include.patch
+++ /dev/null
@@ -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>
diff --git a/community/multitail/linux-is-not-debian-ncurses.patch b/community/multitail/linux-is-not-debian-ncurses.patch
new file mode 100644
index 0000000000..63da6893d2
--- /dev/null
+++ b/community/multitail/linux-is-not-debian-ncurses.patch
@@ -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'
+