From 5d35dfc8cbfc44d7b640ef033659c82102662453 Mon Sep 17 00:00:00 2001 From: Jaidyn Ann Date: Sun, 22 May 2022 00:04:39 -0500 Subject: [PATCH] frotz: bump version (#6934) --- .../{frotz-2.50.recipe => frotz-2.54.recipe} | 4 +- .../frotz/patches/frotz-2.50.patchset | 154 ------------------ 2 files changed, 2 insertions(+), 156 deletions(-) rename games-engines/frotz/{frotz-2.50.recipe => frotz-2.54.recipe} (91%) delete mode 100644 games-engines/frotz/patches/frotz-2.50.patchset diff --git a/games-engines/frotz/frotz-2.50.recipe b/games-engines/frotz/frotz-2.54.recipe similarity index 91% rename from games-engines/frotz/frotz-2.50.recipe rename to games-engines/frotz/frotz-2.54.recipe index 4395bf6b6..780e34a81 100644 --- a/games-engines/frotz/frotz-2.50.recipe +++ b/games-engines/frotz/frotz-2.54.recipe @@ -9,8 +9,7 @@ COPYRIGHT="1995-1997 Stefan Jokish LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://gitlab.com/DavidGriffith/frotz/-/archive/$portVersion/frotz-$portVersion.tar.bz2" -CHECKSUM_SHA256="7fd1185318dec2c897228d6ed81d4d2599d64d1e5bb7f913c09d17f3337ec663" -PATCHES="frotz-$portVersion.patchset" +CHECKSUM_SHA256="bdf9131e6de49108c9f032200cea3cb4011e5ca0c9fbdbf5b0c05f7c56c81395" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -41,6 +40,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix cmd:which " diff --git a/games-engines/frotz/patches/frotz-2.50.patchset b/games-engines/frotz/patches/frotz-2.50.patchset deleted file mode 100644 index 6f17b0924..000000000 --- a/games-engines/frotz/patches/frotz-2.50.patchset +++ /dev/null @@ -1,154 +0,0 @@ -From c77da0a4204db0029f4c0a4a35a108b79d3af605 Mon Sep 17 00:00:00 2001 -From: Vrondir -Date: Thu, 12 Dec 2019 17:03:37 +0000 -Subject: Remove -pthread flag - - -diff --git a/src/curses/Makefile b/src/curses/Makefile -index 9f5ea43..8c9fe58 100644 ---- a/src/curses/Makefile -+++ b/src/curses/Makefile -@@ -15,7 +15,7 @@ ARFLAGS = rc - SOUND_TYPE ?= ao - - ifeq ($(SOUND_TYPE), ao) -- CFLAGS += -pthread -+# CFLAGS += -pthread - else ifeq ($(SOUND_TYPE), none) - - else ifndef SOUND_TYPE --- -2.23.0 - - -From fb283598814089fb7aae98fe7a0195a5a3f665fd Mon Sep 17 00:00:00 2001 -From: Vrondir -Date: Fri, 13 Dec 2019 21:06:32 +0000 -Subject: Remove trailing whitespace - - -diff --git a/Makefile b/Makefile -index 2aba2e9..9938fc6 100644 ---- a/Makefile -+++ b/Makefile -@@ -91,30 +91,30 @@ STACK_SIZE = 1024 - - # Determine if we are compiling on MAC OS X - ifneq ($(OS),Windows_NT) -- # For now, assume !windows == unix. -- OS_TYPE ?= unix -- UNAME_S := $(shell uname -s) -- ifeq ($(UNAME_S),Darwin) -+ # For now, assume !windows == unix. -+ OS_TYPE ?= unix -+ UNAME_S := $(shell uname -s) -+ ifeq ($(UNAME_S),Darwin) - MACOS = yes - # On MACOS, curses is actually ncurses, but to get wide char support - # you need to define _XOPEN_SOURCE_EXTENDED - CURSES = curses - CFLAGS += -D_XOPEN_SOURCE_EXTENDED -DMACOS -I/opt/local/include - LDFLAGS += -L/opt/local/lib -- endif -- ifeq ($(UNAME_S),NetBSD) -+ endif -+ ifeq ($(UNAME_S),NetBSD) - NETBSD = yes - CFLAGS += -D_NETBSD_SOURCE -I/usr/pkg/include - LDFLAGS += -Wl,-R/usr/pkg/lib -L/usr/pkg/lib - SDL_LDFLAGS += -lexecinfo -- endif -- ifeq ($(UNAME_S),FreeBSD) -+ endif -+ ifeq ($(UNAME_S),FreeBSD) - FREEBSD = yes - CFLAGS += -I/usr/local/include - LDFLAGS += -L/usr/local/lib - SDL_LDFLAGS += -lexecinfo -- endif -- ifeq ($(UNAME_S),OpenBSD) -+ endif -+ ifeq ($(UNAME_S),OpenBSD) - OPENBSD = yes - NO_EXECINFO_H = yes - NO_UCONTEXT_H = yes -@@ -123,11 +123,11 @@ ifneq ($(OS),Windows_NT) - LDFLAGS += -L/usr/local/lib - SDL_CFLAGS += -DSDL_DISABLE_IMMINTRIN_H - SDL_LDFLAGS += -lexecinfo -- endif -- ifeq ($(UNAME_S),Linux) -+ endif -+ ifeq ($(UNAME_S),Linux) - CFLAGS += -D_POSIX_C_SOURCE=200809L - NPROCS = $(shell grep -c ^processor /proc/cpuinfo) -- endif -+ endif - endif - - RANLIB ?= $(shell which ranlib) -@@ -174,15 +174,15 @@ export CFLAGS - # - CURSES_LDFLAGS += -l$(CURSES) - ifeq ($(CURSES), curses) -- CURSES_DEFINE = USE_CURSES_H -+ CURSES_DEFINE = USE_CURSES_H - else ifneq ($(findstring ncurses,$(CURSES)),) -- CURSES_CFLAGS += -D_XOPEN_SOURCE_EXTENDED -- CURSES_DEFINE = USE_NCURSES_H -+ CURSES_CFLAGS += -D_XOPEN_SOURCE_EXTENDED -+ CURSES_DEFINE = USE_NCURSES_H - ifdef NETBSD - ifeq ($(CURSES), ncursesw) -- CURSES_CFLAGS += -I/usr/pkg/include/ncursesw -+ CURSES_CFLAGS += -I/usr/pkg/include/ncursesw - else -- CURSES_CFLAGS += -I/usr/pkg/include/ncurses -+ CURSES_CFLAGS += -I/usr/pkg/include/ncurses - endif - endif - endif -@@ -227,21 +227,21 @@ SFROTZ_LIBS = $(COMMON_LIB) $(SDL_LIB) $(BLORB_LIB) $(COMMON_LIB) - - - ifdef NO_BLORB -- SOUND_TYPE = none -- CURSES_SOUND = disabled -- BLORB_SUPPORT = disabled -- FROTZ_LIBS = $(COMMON_LIB) $(CURSES_LIB) $(COMMON_LIB) -- DFROTZ_LIBS = $(COMMON_LIB) $(DUMB_LIB) $(COMMON_LIB) -+ SOUND_TYPE = none -+ CURSES_SOUND = disabled -+ BLORB_SUPPORT = disabled -+ FROTZ_LIBS = $(COMMON_LIB) $(CURSES_LIB) $(COMMON_LIB) -+ DFROTZ_LIBS = $(COMMON_LIB) $(DUMB_LIB) $(COMMON_LIB) - else -- BLORB_SUPPORT = enabled -+ BLORB_SUPPORT = enabled - endif - - ifeq ($(SOUND_TYPE), ao) -- CURSES_SOUND_LDFLAGS += -lao -lpthread -lm \ -- -lsndfile -lvorbisfile -lmodplug -lsamplerate -- CURSES_SOUND = enabled -+ CURSES_SOUND_LDFLAGS += -lao -lpthread -lm \ -+ -lsndfile -lvorbisfile -lmodplug -lsamplerate -+ CURSES_SOUND = enabled - else -- CURSES_SOUND = disabled -+ CURSES_SOUND = disabled - endif - - # Check to see if the -Orecurse option is available. It's nice for -@@ -297,7 +297,7 @@ ifneq ($(and $(wildcard $(GIT_DIR)),$(shell which git)),) - $(NAME)src/doc/*.6 $(NAME)src/doc/frotz.conf* \ - $(NAME)src/doc/Xresources > /dev/null - else -- @echo "Not in a git repository or git command not found. Cannot make a tarball." -+ @echo "Not in a git repository or git command not found. Cannot make a tarball." - endif - - all: $(FROTZ_BIN) $(DFROTZ_BIN) $(SFROTZ_BIN) --- -2.23.0 -