From 5184585732011bfa98f4122ab19bc7da9932ef7a Mon Sep 17 00:00:00 2001 From: "termux-actions[bot]" Date: Fri, 25 Feb 2022 17:18:45 +0000 Subject: [PATCH] packages/slashem-extended --- packages/slashem-extended/build.sh | 43 ------------ .../slashem-extended/include-unixconf.h.patch | 47 -------------- packages/slashem-extended/src-files.c.patch | 16 ----- .../sys-unix-GNUmakefile.patch | 65 ------------------- .../sys-unix-unixunix.c.patch | 20 ------ 5 files changed, 191 deletions(-) delete mode 100644 packages/slashem-extended/build.sh delete mode 100644 packages/slashem-extended/include-unixconf.h.patch delete mode 100644 packages/slashem-extended/src-files.c.patch delete mode 100644 packages/slashem-extended/sys-unix-GNUmakefile.patch delete mode 100644 packages/slashem-extended/sys-unix-unixunix.c.patch diff --git a/packages/slashem-extended/build.sh b/packages/slashem-extended/build.sh deleted file mode 100644 index 5ea684ff8b..0000000000 --- a/packages/slashem-extended/build.sh +++ /dev/null @@ -1,43 +0,0 @@ -TERMUX_PKG_HOMEPAGE=https://nethackwiki.com/wiki/Slash%27EM_Extended -TERMUX_PKG_DESCRIPTION="A variant of SLASH'EM (a variant of NetHack)" -TERMUX_PKG_LICENSE="Nethack" -TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.7.0 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SRCURL=https://github.com/SLASHEM-Extended/SLASHEM-Extended/archive/refs/tags/slex-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=54d301bcb8d79d92030a30195f091e694f843d4656061dbce85730fc12023dee -TERMUX_PKG_DEPENDS="ncurses" -TERMUX_PKG_BUILD_IN_SRC=true - -termux_step_configure() { - for s in dgn lev; do - ln -sf ${s}_comp.h include/${s}.tab.h - done - for f in alloc.c decl.c dlb.c drawing.c monst.c objects.c; do - ln -sf ../src/$f util/$f - done -} - -termux_step_make() { - CFLAGS+=" -fcommon -DMAILPATH=\\\"/dev/null\\\"" - export CFLAGS_FOR_BUILD="-m${TERMUX_ARCH_BITS} -O2 -fcommon" - export LDFLAGS_FOR_BUILD="-m${TERMUX_ARCH_BITS}" - make -f sys/unix/GNUmakefile -} - -termux_step_make_install() { - install -Dm700 -t $TERMUX_PREFIX/bin "$TERMUX_PKG_BUILDDIR/src/slex" - install -Dm600 -t $TERMUX_PREFIX/share/games/slex "$TERMUX_PKG_BUILDDIR/dat/nhdat" - install -Dm600 -t $TERMUX_PREFIX/share/doc/slex "$TERMUX_PKG_SRCDIR/dat/license" -} - -termux_step_create_debscripts() { - echo "#!$TERMUX_PREFIX/bin/sh" > postinst - echo "mkdir -p $TERMUX_PREFIX/var/games/slex" >> postinst - echo "touch $TERMUX_PREFIX/var/games/slex/perm" >> postinst - echo "touch $TERMUX_PREFIX/var/games/slex/record" >> postinst - echo "mkdir -p $TERMUX_PREFIX/var/games/slex/save" >> postinst - echo "mkdir -p $TERMUX_PREFIX/var/games/slex/unshare" >> postinst - echo "exit 0" >> postinst - chmod 0755 postinst -} diff --git a/packages/slashem-extended/include-unixconf.h.patch b/packages/slashem-extended/include-unixconf.h.patch deleted file mode 100644 index f72d1a4b28..0000000000 --- a/packages/slashem-extended/include-unixconf.h.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/include/unixconf.h -+++ b/include/unixconf.h -@@ -120,9 +120,7 @@ - * FILE_AREA_DOC For human-readable documentation - */ - --#ifdef PUBLIC_SERVER - #define FILE_AREAS /* Use file areas */ --#endif - - #ifdef FILE_AREAS - -@@ -157,11 +155,11 @@ - - #else /* PUBLIC_SERVER */ - --#define FILE_AREA_VAR "/var/games/slex/" --#define FILE_AREA_SAVE "/var/games/slex/save/" --#define FILE_AREA_SHARE "/usr/share/games/slex/" --#define FILE_AREA_UNSHARE "/usr/lib/games/slex/" --#define FILE_AREA_DOC "/usr/share/doc/slex/" -+#define FILE_AREA_VAR "@TERMUX_PREFIX@/var/games/slex/" -+#define FILE_AREA_SAVE "@TERMUX_PREFIX@/var/games/slex/save/" -+#define FILE_AREA_SHARE "@TERMUX_PREFIX@/share/games/slex/" -+#define FILE_AREA_UNSHARE "@TERMUX_PREFIX@/var/games/slex/unshare/" -+#define FILE_AREA_DOC "@TERMUX_PREFIX@/share/doc/slex/" - - #define FILE_AREA_BONES FILE_AREA_VAR - #define FILE_AREA_LEVL FILE_AREA_VAR -@@ -178,7 +176,7 @@ - * Ralf Brown, 7/26/89 (from v2.3 hack of 10/10/88) - */ - --/* #define NO_FILE_LINKS */ /* if no hard links */ -+#define NO_FILE_LINKS /* if no hard links */ - - #ifdef NO_FILE_LINKS - # ifdef FILE_AREAS -@@ -236,7 +234,7 @@ - * A stat system call is done on the mailbox every MAILCKFREQ moves. - */ - --#define MAIL /* Deliver mail during the game */ -+#undef MAIL /* Deliver mail during the game */ - - #ifdef PUBLIC_SERVER /* No reason to have mail except on a server. */ - #define SIMPLE_MAIL /* dgamelaunch simple mail */ diff --git a/packages/slashem-extended/src-files.c.patch b/packages/slashem-extended/src-files.c.patch deleted file mode 100644 index 00377adf46..0000000000 --- a/packages/slashem-extended/src-files.c.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/src/files.c -+++ b/src/files.c -@@ -1920,11 +1920,11 @@ - wait_synch(); - } - else if (!strncmp(windowprocs.name, "proxy/", 6)) { -- fp = fopenp("/etc/slashem/proxy.slashemrc", "r"); -+ fp = fopenp("@TERMUX_PREFIX@/etc/slashem/proxy.slashemrc", "r"); - if (fp != (FILE *)0) - return(fp); - else if (errno != ENOENT) { -- raw_printf("Couldn't open /etc/slashem/proxy.slashemrc (%d).", -+ raw_printf("Couldn't open @TERMUX_PREFIX@/etc/slashem/proxy.slashemrc (%d).", - errno); - wait_synch(); - } diff --git a/packages/slashem-extended/sys-unix-GNUmakefile.patch b/packages/slashem-extended/sys-unix-GNUmakefile.patch deleted file mode 100644 index 94e871c28a..0000000000 --- a/packages/slashem-extended/sys-unix-GNUmakefile.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/sys/unix/GNUmakefile -+++ b/sys/unix/GNUmakefile -@@ -21,12 +21,16 @@ - TOUCH_VARDATA += $(if $(GAMEUID),&& chown $(GAMEUID) $(1)) - TOUCH_VARDATA += $(if $(GAMEGID),&& chgrp $(GAMEGID) $(1)) - --CFLAGS = -g -O2 -+CFLAGS ?= -g -O2 - --CPPFLAGS += -Iinclude --CPPFLAGS += -DDLB --CPPFLAGS += -DDLBFILE=\"nhdat\" --CPPFLAGS += -DDLBAREA=FILE_AREA_SHARE -+COMMON_CPPFLAGS := -+COMMON_CPPFLAGS += -Iinclude -+COMMON_CPPFLAGS += -DDLB -+COMMON_CPPFLAGS += -DDLBFILE=\"nhdat\" -+COMMON_CPPFLAGS += -DDLBAREA=FILE_AREA_SHARE -+ -+CPPFLAGS += $(COMMON_CPPFLAGS) -+CPPFLAGS_FOR_BUILD += $(COMMON_CPPFLAGS) - - GAMELIBS = -lncurses - -@@ -88,28 +92,31 @@ - $(CC) $(LDFLAGS) $^ $(LDLIBS) $(GAMELIBS) -o $@ - AUTO_BIN += src/$(GAME) - --MAKEDEFS_O = util/makedefs.o src/alloc.o src/monst.o src/objects.o \ -+util/%.o: util/%.c -+ $(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -c -o $@ -+ -+MAKEDEFS_O = util/makedefs.o util/alloc.o util/monst.o util/objects.o \ - util/panic.o - util/makedefs: $(MAKEDEFS_O) -- $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ -+ $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@ - AUTO_BIN += util/makedefs - --DLB_O = util/dlb_main.o src/alloc.o src/dlb.o util/panic.o -+DLB_O = util/dlb_main.o util/alloc.o util/dlb.o util/panic.o - util/dlb: $(DLB_O) -- $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ -+ $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@ - AUTO_BIN += util/dlb - - DGN_COMP_O = util/dgn_main.o util/dgn_lex.o util/dgn_yacc.o \ -- src/alloc.o util/panic.o -+ util/alloc.o util/panic.o - util/dgn_comp: $(DGN_COMP_O) -- $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ -+ $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@ - AUTO_BIN += util/dgn_comp - - LEV_COMP_O = util/lev_main.o util/lev_lex.o util/lev_yacc.o \ -- src/alloc.o src/decl.o src/drawing.o src/monst.o \ -- src/objects.o util/panic.o -+ util/alloc.o util/decl.o util/drawing.o util/monst.o \ -+ util/objects.o util/panic.o - util/lev_comp: $(LEV_COMP_O) -- $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ -+ $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@ - AUTO_BIN += util/lev_comp - - ALL_O = $(GAME_O) $(MAKEDEFS_O) $(DLB_O) $(DGN_COMP_O) $(LEV_COMP_O) diff --git a/packages/slashem-extended/sys-unix-unixunix.c.patch b/packages/slashem-extended/sys-unix-unixunix.c.patch deleted file mode 100644 index 2c1c696985..0000000000 --- a/packages/slashem-extended/sys-unix-unixunix.c.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/sys/unix/unixunix.c -+++ b/sys/unix/unixunix.c -@@ -387,7 +387,7 @@ - if((str = getenv("SHELL")) != (char*)0) - (void) execl(str, str, (char *)0); - else -- (void) execl("/bin/sh", "sh", (char *)0); -+ (void) execl("@TERMUX_PREFIX@/bin/sh", "sh", (char *)0); - raw_print("sh: cannot execute."); - exit(EXIT_FAILURE); - } -@@ -395,7 +395,7 @@ - } - #endif /* PUBLIC_SERVER */ - --#if defined(SHELL) || defined(DEF_PAGER) || defined(DEF_MAILREADER) -+#if 1 - int - child(wt) - int wt;