From be20cbf86b1eeda56461ab4a783ade59d46f6fcf Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Wed, 9 Dec 2020 12:19:51 +0200
Subject: [PATCH] aterm: 'xterm' stub script is now provided by aterm

Now package 'aterm' will provide stub script for xterm compatibility
as well as the virtual package.

Separate package will be removed.
---
 x11-packages/aterm/build.sh | 13 ++++++++++++-
 x11-packages/xterm/build.sh | 15 ---------------
 x11-packages/xterm/xterm    |  2 --
 3 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 x11-packages/xterm/build.sh
 delete mode 100755 x11-packages/xterm/xterm

diff --git a/x11-packages/aterm/build.sh b/x11-packages/aterm/build.sh
index 9f04d8d04..d4b6d6ee6 100644
--- a/x11-packages/aterm/build.sh
+++ b/x11-packages/aterm/build.sh
@@ -3,10 +3,13 @@ TERMUX_PKG_DESCRIPTION="An xterm replacement with transparency support"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Leonid Pliushch <leonid.pliushch@gmail.com>"
 TERMUX_PKG_VERSION=1.0.1
-TERMUX_PKG_REVISION=27
+TERMUX_PKG_REVISION=28
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/aterm/aterm-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=a161c3b2d9c7149130a41963899993af21eae92e8e362f4b5b3c7c4cb16760ce
 TERMUX_PKG_DEPENDS="libice, libsm, libx11, libxext, xorg-fonts-75dpi | xorg-fonts-100dpi"
+TERMUX_PKG_CONFLICTS="xterm"
+TERMUX_PKG_REPLACES="xterm"
+TERMUX_PKG_PROVIDES="xterm"
 TERMUX_PKG_BUILD_DEPENDS="libxt"
 TERMUX_PKG_BUILD_IN_SRC=true
 
@@ -17,3 +20,11 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --enable-menubar
 --enable-graphics
 "
+
+termux_step_post_make_install() {
+	cat <<- EOF > $TERMUX_PREFIX/bin/xterm
+	#!${TERMUX_PREFIX}/bin/sh
+	exec ${TERMUX_PREFIX}/bin/aterm +tr "\${@}"
+	EOF
+	chmod 700 $TERMUX_PREFIX/bin/xterm
+}
diff --git a/x11-packages/xterm/build.sh b/x11-packages/xterm/build.sh
deleted file mode 100644
index 290d6e3de..000000000
--- a/x11-packages/xterm/build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://github.com/termux/x11-packages
-TERMUX_PKG_DESCRIPTION="A compatibility wrapper for Aterm"
-TERMUX_PKG_LICENSE="MIT"
-TERMUX_PKG_MAINTAINER="Leonid Pliushch <leonid.pliushch@gmail.com>"
-TERMUX_PKG_VERSION=9999
-TERMUX_PKG_REVISION=17
-TERMUX_PKG_SKIP_SRC_EXTRACT=true
-TERMUX_PKG_DEPENDS="aterm"
-TERMUX_PKG_PLATFORM_INDEPENDENT=true
-
-termux_step_make_install() {
-	install \
-		-Dm700 "${TERMUX_PKG_BUILDER_DIR}/xterm" \
-		"${TERMUX_PREFIX}/bin/xterm"
-}
diff --git a/x11-packages/xterm/xterm b/x11-packages/xterm/xterm
deleted file mode 100755
index 50c050580..000000000
--- a/x11-packages/xterm/xterm
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/data/data/com.termux/files/usr/bin/sh
-exec aterm +tr "${@}"