From 809ce2c0394b8c709efffaaf5bb5448b59e0e913 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 20 Sep 2017 00:48:04 +0200 Subject: [PATCH] Drop need of setting TERMUX_PKG_FOLDERNAME Instead figure out the top level source folder ourselves. --- packages/angband/build.sh | 1 - packages/brogue/build.sh | 1 - packages/curseofwar/build.sh | 1 - packages/frotz/build.sh | 1 - packages/glulxe/build.sh | 1 - packages/moria/build.sh | 1 - 6 files changed, 6 deletions(-) diff --git a/packages/angband/build.sh b/packages/angband/build.sh index cef060a2a..f11d59a1c 100644 --- a/packages/angband/build.sh +++ b/packages/angband/build.sh @@ -7,7 +7,6 @@ TERMUX_PKG_DEPENDS="ncurses" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-x11 --bindir=$TERMUX_PREFIX/bin --sysconfdir=$TERMUX_PREFIX/share/angband" TERMUX_PKG_RM_AFTER_INSTALL="share/angband/xtra share/angband/icons" -TERMUX_PKG_FOLDERNAME=angband-master termux_step_pre_configure () { ./autogen.sh diff --git a/packages/brogue/build.sh b/packages/brogue/build.sh index 9560e05e5..9fa987fe8 100644 --- a/packages/brogue/build.sh +++ b/packages/brogue/build.sh @@ -7,7 +7,6 @@ TERMUX_PKG_SHA256=9e313521c4004566ab1518402393f5bd1cc14df097a283c2cc614998b9097e TERMUX_PKG_DEPENDS="ncurses" TERMUX_PKG_EXTRA_MAKE_ARGS="curses" TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_FOLDERNAME=brogue-${TERMUX_PKG_VERSION} termux_step_pre_configure () { CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS" diff --git a/packages/curseofwar/build.sh b/packages/curseofwar/build.sh index 2d06ca805..0ee32ebed 100644 --- a/packages/curseofwar/build.sh +++ b/packages/curseofwar/build.sh @@ -5,7 +5,6 @@ TERMUX_PKG_VERSION=1.2.0 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/a-nikolaev/curseofwar/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=91b7781e26341faa6b6999b6baf6e74ef532fa94303ab6a2bf9ff6d614a3f670 -TERMUX_PKG_FOLDERNAME="curseofwar-$TERMUX_PKG_VERSION" termux_step_make_install () { mkdir -p $TERMUX_PREFIX/share/man/man6 diff --git a/packages/frotz/build.sh b/packages/frotz/build.sh index 9bbf74dc0..eb0eec8b7 100644 --- a/packages/frotz/build.sh +++ b/packages/frotz/build.sh @@ -6,7 +6,6 @@ TERMUX_PKG_VERSION=2.44 TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/DavidGriffith/frotz/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=dbb5eb3bc95275dcb984c4bdbaea58bc1f1b085b20092ce6e86d9f0bf3ba858f -TERMUX_PKG_FOLDERNAME=frotz-${TERMUX_PKG_VERSION} TERMUX_PKG_BUILD_IN_SRC=yes termux_step_pre_configure() { diff --git a/packages/glulxe/build.sh b/packages/glulxe/build.sh index f13bd8736..ffd96378e 100644 --- a/packages/glulxe/build.sh +++ b/packages/glulxe/build.sh @@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Interpreter for the Glulx portable VM for interactive fi TERMUX_PKG_VERSION=0.5.4 TERMUX_PKG_SRCURL=http://www.eblong.com/zarf/glulx/glulxe-051.tar.gz TERMUX_PKG_SHA256=33c563bdbd0fdbae625e1a2441e9a6f40f1491f1cdc2a197bbd6cf2c32c3830d -TERMUX_PKG_FOLDERNAME=glulxe TERMUX_PKG_BUILD_IN_SRC="yes" TERMUX_PKG_DEPENDS="ncurses" diff --git a/packages/moria/build.sh b/packages/moria/build.sh index d7843bbd4..4a0a64439 100644 --- a/packages/moria/build.sh +++ b/packages/moria/build.sh @@ -5,7 +5,6 @@ TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli" # This seems to be a pretty good mirror TERMUX_PKG_SRCURL=https://github.com/HunterZ/umoria/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=1ee52ec001539945139b2960e8441f490d2b7f5fe6dce5a070686a178515d182 -TERMUX_PKG_FOLDERNAME=umoria-$TERMUX_PKG_VERSION TERMUX_PKG_DEPENDS="ncurses" TERMUX_PKG_BUILD_IN_SRC=yes