From 3deed904886dc5d14aaa470f107934e8558493ac Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 19 Mar 2016 15:16:11 -0400
Subject: [PATCH] Add a ctags package containing Universal Ctags

The ctags implementation from Universal Ctags (https://ctags.io/)
is hopefully the best ctags alternative that works with e.g. vim.

Remove the ctags binary from emacs so it does not conflict with
this new package (the etags program remains for emacs to use).
---
 packages/ctags/build.sh | 14 ++++++++++++++
 packages/emacs/build.sh |  8 ++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 packages/ctags/build.sh

diff --git a/packages/ctags/build.sh b/packages/ctags/build.sh
new file mode 100644
index 000000000..64ba434cb
--- /dev/null
+++ b/packages/ctags/build.sh
@@ -0,0 +1,14 @@
+TERMUX_PKG_HOMEPAGE=https://ctags.io/
+TERMUX_PKG_DESCRIPTION="Universal ctags: Source code index builder"
+TERMUX_PKG_VERSION=0.0.20160317
+_COMMIT=6126cb13375fd659e53e7cd9a943446f72048c07
+TERMUX_PKG_SRCURL=https://github.com/universal-ctags/ctags/archive/${_COMMIT}.zip
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-tmpdir=$TERMUX_PREFIX/tmp"
+TERMUX_PKG_FOLDERNAME=ctags-$_COMMIT
+TERMUX_PKG_BUILD_IN_SRC="yes"
+
+termux_step_post_extract_package () {
+	export regcomp_works=yes
+	cd $TERMUX_PKG_SRCDIR
+	./autogen.sh
+}
diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh
index 0118cfd59..de34d1c60 100644
--- a/packages/emacs/build.sh
+++ b/packages/emacs/build.sh
@@ -1,14 +1,18 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/emacs/
 TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
 TERMUX_PKG_VERSION=24.5
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_BUILD_REVISION=3
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/pub/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="ncurses"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-x --with-xpm=no --with-jpeg=no --with-png=no --with-gif=no --with-tiff=no --without-gconf --without-gsettings --without-all"
 TERMUX_PKG_HOSTBUILD="yes"
 
 # Note that we remove leim:
-TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/emacs/${TERMUX_PKG_VERSION}/etc/images share/applications/emacs.desktop share/emacs/${TERMUX_PKG_VERSION}/etc/emacs.desktop share/emacs/${TERMUX_PKG_VERSION}/etc/emacs.icon bin/grep-changelog share/man/man1/grep-changelog.1.gz share/emacs/${TERMUX_PKG_VERSION}/etc/refcards share/emacs/${TERMUX_PKG_VERSION}/etc/tutorials/TUTORIAL.* share/emacs/${TERMUX_PKG_VERSION}/leim"
+TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/emacs/${TERMUX_PKG_VERSION}/etc/images share/applications/emacs.desktop share/emacs/${TERMUX_PKG_VERSION}/etc/emacs.desktop share/emacs/${TERMUX_PKG_VERSION}/etc/emacs.icon bin/grep-changelog share/man/man1/grep-changelog.1.gz share/emacs/${TERMUX_PKG_VERSION}/etc/refcards share/emacs/${TERMUX_PKG_VERSION}/etc/tutorials/TUTORIAL.*"
+# Remove ctags from the emacs package to prevent conflicting with
+# the Universal Ctags from the 'ctags' package. The bin/etags
+# program still remain in the emacs package.
+TERMUX_PKG_RM_AFTER_INSTALL+=" bin/ctags share/man/man1/ctags.1"
 
 # http://www.gnu.org/software/emacs/manual/html_node/elisp/Building-Emacs.html#Building-Emacs
 # "Compilation of the C source files in the src directory produces an executable file called temacs, also called a