From 5058631d2f54f80756d79501f2e6dbb6ab967adf Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Wed, 11 Jan 2023 08:07:35 +0900
Subject: [PATCH] lesspipe: Bump to 2.07

---
 packages/lesspipe/build.sh          |  8 ++++----
 packages/lesspipe/configure.patch   | 25 -------------------------
 packages/lesspipe/lesspipe.sh.patch |  2 +-
 3 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 packages/lesspipe/configure.patch

diff --git a/packages/lesspipe/build.sh b/packages/lesspipe/build.sh
index 2cb123abf1..0a67b46675 100644
--- a/packages/lesspipe/build.sh
+++ b/packages/lesspipe/build.sh
@@ -2,19 +2,19 @@ TERMUX_PKG_HOMEPAGE=http://www-zeuthen.desy.de/~friebel/unix/lesspipe.html
 TERMUX_PKG_DESCRIPTION="An input filter for the pager less"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="2.06"
+TERMUX_PKG_VERSION=2.07
 TERMUX_PKG_SRCURL=https://github.com/wofr06/lesspipe/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=f46c7b0b06f951613535a480d22ba7e8563f4f08d3d3f8e370047df122cb1637
+TERMUX_PKG_SHA256=b6a591c053057c3968d0d1fbd32e4a0a8026cd5c27e861023e3542772eda1cba
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="less"
+TERMUX_PKG_BUILD_DEPENDS="bash-completion"
 TERMUX_PKG_SUGGESTS="imagemagick, p7zip, unrar, unzip"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_configure() {
 	./configure \
-		--prefix="$TERMUX_PREFIX" \
-		--yes
+		--prefix="$TERMUX_PREFIX"
 }
 
 termux_step_post_make_install() {
diff --git a/packages/lesspipe/configure.patch b/packages/lesspipe/configure.patch
deleted file mode 100644
index bb7b606fcb..0000000000
--- a/packages/lesspipe/configure.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -uNr lesspipe-2.06/configure lesspipe-2.06.mod/configure
---- lesspipe-2.06/configure	2022-08-17 17:56:28.000000000 +0800
-+++ lesspipe-2.06.mod/configure	2022-08-18 08:56:15.742341358 +0800
-@@ -30,16 +30,16 @@
- 	exit ! $opt_help ? 1 : 0;
- }
- my $bash_complete_dir = `pkg-config --variable=completionsdir bash-completion`;
--$bash_complete_dir ||= '/usr/share/bash-completion/completions';
-+$bash_complete_dir ||= '@TERMUX_PREFIX@/share/bash-completion/completions';
- # dynamic loading not working, use the following dir instead:
--$bash_complete_dir = '/etc/bashcompletion.d';
-+$bash_complete_dir = '@TERMUX_PREFIX@/etc/bashcompletion.d';
- if ($opt_prefix and $opt_prefix !~ /^\/usr/) {
--	$bash_complete_dir = "$ENV{HOME}/.local/share/bash-completion";
-+	$bash_complete_dir = "@TERMUX_HOME@/.local/share/bash-completion";
- 	# dynamic loading not working, use the following dir instead:
--	$bash_complete_dir = "$opt_prefix/share/bash-completion";
-+	$bash_complete_dir = "@TERMUX_PREFIX@/share/bash-completion";
- 	print "installing bash completion in $bash_complete_dir\nIn bash, please preload the completion, dynamic invocation does not work\n. $bash_complete_dir/less_completion\n";
- } else {
--	$opt_prefix = '/usr/local';
-+	$opt_prefix = '@TERMUX_PREFIX@';
- }
- # remove trailing slash and trailing bin directory
- print "removed trailing /bin dir from prefix\n" if $opt_prefix =~ m|/bin/?$|;
diff --git a/packages/lesspipe/lesspipe.sh.patch b/packages/lesspipe/lesspipe.sh.patch
index 6caaabd0af..5b100c6c59 100644
--- a/packages/lesspipe/lesspipe.sh.patch
+++ b/packages/lesspipe/lesspipe.sh.patch
@@ -7,6 +7,6 @@ diff -uNr lesspipe-2.06/lesspipe.sh lesspipe-2.06.mod/lesspipe.sh
  # the current locale in lowercase (or generic utf-8)
 -locale=$(locale|grep LC_CTYPE|sed 's/.*"\(.*\)"/\1/') || locale=en_US.UTF-8
 +locale=en_US.UTF-8
- lclocale=$(echo ${locale##*.}|tr '[:upper:]' '[:lower:]')
+ lclocale=$(echo "${locale##*.}"|tr '[:upper:]' '[:lower:]')
  
  sep=:					# file name separator