X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/727ffe26f724facc6cd6256ee5f3d0a8f958d148..3deed904886dc5d14aaa470f107934e8558493ac:/packages/emacs/build.sh

diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh
index cf82c63c..de34d1c6 100644
--- a/packages/emacs/build.sh
+++ b/packages/emacs/build.sh
@@ -1,13 +1,18 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/emacs/
-TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor—and more"
+TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
 TERMUX_PKG_VERSION=24.5
+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
@@ -15,8 +20,8 @@ TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/emacs/${TERMUX_PKG_VERSION}/etc/i
 # The command temacs -l loadup would run temacs and direct it to load loadup.el. The loadup library loads additional Lisp libraries,
 # which set up the normal Emacs editing environment. After this step, the Emacs executable is no longer bare.
 # Because it takes some time to load the standard Lisp files, the temacs executable usually isn't run directly by users. Instead, as
-# one of the last steps of building Emacs, the command ‘temacs -batch -l loadup dump’ is run. The special ‘dump’ argument causes temacs
-# to dump out an executable program, called emacs, which has all the standard Lisp files preloaded. (The ‘-batch’ argument prevents
+# one of the last steps of building Emacs, the command 'temacs -batch -l loadup dump' is run. The special 'dump' argument causes temacs
+# to dump out an executable program, called emacs, which has all the standard Lisp files preloaded. (The '-batch' argument prevents
 # temacs from trying to initialize any of its data on the terminal, so that the tables of terminal information are empty in the dumped Emacs.)"
 
 ########## FROM src/Makefile: