From f0372da0d51f461d0eb6a2f0639c0781e61aaf06 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 9 Sep 2015 10:38:01 -0400 Subject: [PATCH] angband: Update to 4.0.2 from 4.0.1 --- packages/angband/build.sh | 13 +++++++++++-- packages/angband/configure.patch | 26 -------------------------- 2 files changed, 11 insertions(+), 28 deletions(-) delete mode 100644 packages/angband/configure.patch diff --git a/packages/angband/build.sh b/packages/angband/build.sh index 2e17bce12..7a5afea0a 100644 --- a/packages/angband/build.sh +++ b/packages/angband/build.sh @@ -1,8 +1,17 @@ -TERMUX_PKG_VERSION=4.0.1 +TERMUX_PKG_VERSION=4.0.2 TERMUX_PKG_SRCURL=http://rephial.org/downloads/4.0/angband-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_HOMEPAGE=http://rephial.org/ TERMUX_PKG_DESCRIPTION="Dungeon exploration game where you play an adventurer seeking riches, fighting monsters and preparing for a final battle with Morgoth, the Lord of Darkness" TERMUX_PKG_DEPENDS="libandroid-support, ncurses" TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-x --bindir=$TERMUX_PREFIX/bin --sysconfdir=$TERMUX_PREFIX/share/angband" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-x11 --bindir=$TERMUX_PREFIX/bin --sysconfdir=$TERMUX_PREFIX/share/angband" TERMUX_PKG_RM_AFTER_INSTALL="share/angband/xtra" + +termux_step_pre_configure () { + ./autogen.sh + perl -p -i -e 's|ncursesw5-config|ncursesw6-config|g' configure +} + +termux_step_post_make_install () { + rm -Rf $TERMUX_PREFIX/share/angband/{fonts,sounds} +} diff --git a/packages/angband/configure.patch b/packages/angband/configure.patch deleted file mode 100644 index 85a32e96a..000000000 --- a/packages/angband/configure.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -u -r ../angband-v3.5.0/configure ./configure ---- ../angband-v3.5.0/configure 2013-12-24 16:56:55.000000000 +0100 -+++ ./configure 2014-03-10 01:27:04.085884186 +0100 -@@ -4879,18 +4879,18 @@ - if test x$ncurses_exec_prefix != x ; then - ncurses_args="$ncurses_args --exec-prefix=$ncurses_exec_prefix" - if test x${NCURSES_CONFIG+set} != xset ; then -- NCURSES_CONFIG=$ncurses_exec_prefix/bin/ncursesw5-config -+ NCURSES_CONFIG=$ncurses_exec_prefix/bin/ncursesw6-config - fi - fi - if test x$ncurses_prefix != x ; then - ncurses_args="$ncurses_args --prefix=$ncurses_prefix" - if test x${NCURSES_CONFIG+set} != xset ; then -- NCURSES_CONFIG=$ncurses_prefix/bin/ncursesw5-config -+ NCURSES_CONFIG=$ncurses_prefix/bin/ncursesw6-config - fi - fi - -- # Extract the first word of "ncursesw5-config", so it can be a program name with args. --set dummy ncursesw5-config; ac_word=$2 -+ # Extract the first word of "ncursesw6-config", so it can be a program name with args. -+set dummy ncursesw6-config; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } - if ${ac_cv_path_NCURSES_CONFIG+:} false; then :