From b701ad67a91a53df891c87698f86d09ea516db3b Mon Sep 17 00:00:00 2001
From: ptrcnull <git@ptrcnull.me>
Date: Wed, 24 Aug 2022 22:50:31 +0200
Subject: [PATCH] community/multitail: upgrade to 6.5.2
---
community/multitail/APKBUILD | 12 +++++-------
community/multitail/install-docs.patch | 23 ++++++++++++++++++-----
2 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/community/multitail/APKBUILD b/community/multitail/APKBUILD
index 3c0acc2ef70c..2bc22794c284 100644
--- a/community/multitail/APKBUILD
+++ b/community/multitail/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=multitail
-pkgver=6.5.1
+pkgver=6.5.2
pkgrel=0
pkgdesc="MultiTail lets you view one or multiple files like the original tail program"
arch="all"
@@ -34,15 +34,13 @@ package() {
mv "$pkgdir"/usr/share/doc/$pkgname-$pkgver \
"$pkgdir"/usr/share/doc/$pkgname
- mv "$pkgdir"/usr/etc/multitail \
+ mv "$pkgdir"/etc/multitail \
"$pkgdir"/usr/share/doc/$pkgname/examples
- mv "$pkgdir"/usr/etc/$pkgname.conf.new "$pkgdir"/etc/$pkgname.conf
-
- rmdir "$pkgdir"/usr/etc
+ mv "$pkgdir"/etc/$pkgname.conf.new "$pkgdir"/etc/$pkgname.conf
}
sha512sums="
-7e535c20e6038d7b543fda8f0321d78ccaa23d569d8984ff1909c1750024f6192fb9ff3d14db7e1663910f5d0b239f1a26387b26c757a3b92b70a4a37aab3af7 multitail-6.5.1.tar.gz
+ec6eac03cc5673d878b66e68ca0ad6c4f7acca84bf1d9c67026d9f777c6f07b34a4d0c8e84101bd0de03785eecf240038146f12923b7e57a566adeaef5f833b9 multitail-6.5.2.tar.gz
8f9a02b37187af204a1b00646e9657ead1c70bb1f3ee9dda922186b24060f5e9bd9d7d3cfe7f29ccbc242ff69a515e010b11d51c41112ca77acd910e2de2e9db linux-is-not-debian-ncurses.patch
-1484b75f643c90c24e1609496b8642fca558109822242e12a4b18ff5ac1500c8e4fa3af787ee0c5b32a70397e176e206806e6543c8c80027716eaf93166d8c95 install-docs.patch
+d567d2cb07c1f8655f8973435815c32d4db35b468c3e38ece0e14fe2da9bd1ae1b9547b582b6dcc3c2c7a03e901ade1495c85975d998a68f6480b6acd8370db4 install-docs.patch
"
diff --git a/community/multitail/install-docs.patch b/community/multitail/install-docs.patch
index 9119557ce543..9f7ba1779a57 100644
--- a/community/multitail/install-docs.patch
+++ b/community/multitail/install-docs.patch
@@ -1,7 +1,20 @@
+diff --git a/Makefile b/Makefile
+index 6ef0f71..075b12a 100644
--- a/Makefile
+++ b/Makefile
-@@ -54,1 +54,1 @@
-- cp *.txt INSTALL manual*.html $(DESTDIR)$(PREFIX)/share/doc/multitail-$(VERSION)
-+ cp INSTALL manual*.html $(DESTDIR)$(PREFIX)/share/doc/multitail-$(VERSION)
-@@ -61,1 +61,0 @@
-- cp conversion-scripts/* $(DESTDIR)$(PREFIX)/etc/multitail/
+@@ -64,14 +64,13 @@ install: multitail
+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
+ $(INSTALL_EXEC) multitail $(DESTDIR)$(BINDIR)
+ $(INSTALL_DATA) multitail.1 $(DESTDIR)$(MAN1DIR)/multitail.1
+- $(INSTALL_DATA) *.txt INSTALL manual*.html $(DESTDIR)$(DOCDIR)
++ $(INSTALL_DATA) INSTALL manual*.html $(DESTDIR)$(DOCDIR)
+ #
+ ### COPIED multitail.conf.new, YOU NEED TO REPLACE THE multitail.conf
+ ### YOURSELF WITH THE NEW FILE
+ #
+ $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)
+ $(INSTALL_DATA) multitail.conf $(DESTDIR)$(CONFIG_FILE).new
+- $(INSTALL_EXEC) conversion-scripts/* $(DESTDIR)$(CONFIG_DIR)
+ #rm -f $(DESTDIR)$(PREFIX)/share/man/man1/multitail.1.gz
+ #gzip -9 $(DESTDIR)$(PREFIX)/share/man/man1/multitail.1
+ #
--
GitLab