From e48bffa52d37fbf3d09668e970ac7c17bf008e05 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 4 Oct 2018 11:23:51 +0300
Subject: [PATCH] new package: xterm - add compatibility wrapper for Aterm

Should deal with Xterm package requests unless a real
Xterm package will be added.
---
 x11-packages/aterm/build.sh |  7 +------
 x11-packages/xterm/build.sh | 13 +++++++++++++
 x11-packages/xterm/xterm    |  2 ++
 3 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 x11-packages/xterm/build.sh
 create mode 100755 x11-packages/xterm/xterm

diff --git a/x11-packages/aterm/build.sh b/x11-packages/aterm/build.sh
index 7911e21b0..1efa46e29 100644
--- a/x11-packages/aterm/build.sh
+++ b/x11-packages/aterm/build.sh
@@ -3,12 +3,11 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=http://aterm.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="An xterm replacement with transparency support"
 TERMUX_PKG_VERSION=1.0.1
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/sourceforge/aterm/aterm-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=a161c3b2d9c7149130a41963899993af21eae92e8e362f4b5b3c7c4cb16760ce
 TERMUX_PKG_DEPENDS="libice, libsm, libx11, libxext"
 TERMUX_PKG_BUILD_DEPENDS="libxt"
-TERMUX_PKG_CONFLICTS="xterm"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@@ -18,7 +17,3 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --enable-menubar
 --enable-graphics
 "
-
-termux_step_post_make_install() {
-    ln -sfr "${TERMUX_PREFIX}/bin/aterm" "${TERMUX_PREFIX}/bin/xterm"
-}
diff --git a/x11-packages/xterm/build.sh b/x11-packages/xterm/build.sh
new file mode 100644
index 000000000..e15a03954
--- /dev/null
+++ b/x11-packages/xterm/build.sh
@@ -0,0 +1,13 @@
+TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
+
+TERMUX_PKG_HOMEPAGE=https://github.com/termux/x11-packages
+TERMUX_PKG_DESCRIPTION="A compatibility wrapper for Aterm"
+TERMUX_PKG_VERSION=1.0
+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
new file mode 100755
index 000000000..895342fea
--- /dev/null
+++ b/x11-packages/xterm/xterm
@@ -0,0 +1,2 @@
+#!/data/data/com.termux/files/usr/bin/sh
+exec aterm "${@}"