From 2a61ec59bd358080e410623be8c1e6945ffa0f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Sat, 3 Oct 2015 02:10:16 +0200
Subject: testing/multitail: upgrade to 6.4.1

---
 testing/multitail/APKBUILD                   | 43 +++++++++++++++++++---------
 testing/multitail/fix-ncursesw-include.patch | 14 +++++++++
 2 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 testing/multitail/fix-ncursesw-include.patch

(limited to 'testing/multitail')

diff --git a/testing/multitail/APKBUILD b/testing/multitail/APKBUILD
index eb933404a9..aefae27c54 100644
--- a/testing/multitail/APKBUILD
+++ b/testing/multitail/APKBUILD
@@ -1,35 +1,50 @@
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Contributor: Francesco Colista <francesco.colista@gmail.com>
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=multitail
-pkgver=5.2.13
-pkgrel=1
+pkgver=6.4.2
+pkgrel=0
 pkgdesc="MultiTail lets you view one or multiple files like the original tail program"
 arch="x86 x86_64"
 url="http://www.vanheusden.com/multitail"
 license="GPL2"
+depends_dev=""
 depends="ncurses coreutils"
 makedepends="ncurses-dev"
 install=""
 subpackages="$pkgname-doc"
-source="http://www.vanheusden.com/multitail/$pkgname-$pkgver.tgz"
+source="http://www.vanheusden.com/multitail/$pkgname-$pkgver.tgz
+	fix-ncursesw-include.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
-build() {
+prepare() {
+	local i
 	cd "$_builddir"
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc
-	make -j1 || return 1
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	make -C "$_builddir" || return 1
 }
 
 package() {
 	cd $_builddir
-	mkdir -p "$pkgdir"/usr/bin
-	mkdir -p "$pkgdir"/usr/share/man/man1
-	mkdir -p "$pkgdir"/etc
   	make DESTDIR="$pkgdir" install || return 1
+
+  	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
 }
 
-md5sums="71a774b6d6bb430672c8a9252baac6e6  multitail-5.2.13.tgz"
-sha256sums="8692a9d8513093877e337673a8437075dcd34522a0840b2438e5cd1e6a5bafab  multitail-5.2.13.tgz"
-sha512sums="fa8b057e445d845544afb52c0fa314a14dec08e64789e515fe86ebe22875c9626141476ad704ed4208301546c4ac794944165dcfcd8475d79d7d03e1725e5a51  multitail-5.2.13.tgz"
+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"
diff --git a/testing/multitail/fix-ncursesw-include.patch b/testing/multitail/fix-ncursesw-include.patch
new file mode 100644
index 0000000000..33c1051804
--- /dev/null
+++ b/testing/multitail/fix-ncursesw-include.patch
@@ -0,0 +1,14 @@
+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>
-- 
cgit v1.2.3