Attachment #248202 for bug #276836

Lines 1-5 Link Here

(-)b/devel/sdl20/Makefile (-1 / +1 lines)
1	PORTNAME= sdl2	1	PORTNAME= sdl2
2	DISTVERSION= 2.28.5	2	DISTVERSION= 2.30.0
3	CATEGORIES= devel	3	CATEGORIES= devel
4	MASTER_SITES= https://www.libsdl.org/release/	4	MASTER_SITES= https://www.libsdl.org/release/
5	DISTNAME= SDL2-${PORTVERSION}	5	DISTNAME= SDL2-${PORTVERSION}

Lines 1-3 Link Here

(-)b/devel/sdl20/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1699371584	1	TIMESTAMP = 1707128000
2	SHA256 (SDL2-2.28.5.tar.gz) = 332cb37d0be20cb9541739c61f79bae5a477427d79ae85e352089afdaf6666e4	2	SHA256 (SDL2-2.30.0.tar.gz) = 36e2e41557e0fa4a1519315c0f5958a87ccb27e25c51776beb6f1239526447b0
3	SIZE (SDL2-2.28.5.tar.gz) = 7345355	3	SIZE (SDL2-2.30.0.tar.gz) = 7428037

Lines 80-86 include/SDL2/close_code.h Link Here

(-)b/devel/sdl20/pkg-plist (-1 / +1 lines)
80	lib/cmake/SDL2/sdl2-config-version.cmake	80	lib/cmake/SDL2/sdl2-config-version.cmake
81	lib/cmake/SDL2/sdl2-config.cmake	81	lib/cmake/SDL2/sdl2-config.cmake
82	lib/libSDL2-2.0.so.0	82	lib/libSDL2-2.0.so.0
83	lib/libSDL2-2.0.so.0.2800.5	83	lib/libSDL2-2.0.so.0.3000.0
84	lib/libSDL2.a	84	lib/libSDL2.a
85	lib/libSDL2.so	85	lib/libSDL2.so
86	lib/libSDL2_test.a	86	lib/libSDL2_test.a

Lines 1-6 Link Here

(-)b/games/mrboom/Makefile (-2 / +3 lines)
1	PORTNAME= mrboom	1	PORTNAME= mrboom
2	DISTVERSION= 5.3	2	DISTVERSION= 5.4
3	PORTREVISION= 1
4	CATEGORIES= games	3	CATEGORIES= games
5	MASTER_SITES= https://github.com/Javanaise/mrboom-libretro/releases/download/${PORTVERSION}/	4	MASTER_SITES= https://github.com/Javanaise/mrboom-libretro/releases/download/${PORTVERSION}/
6	DISTNAME= MrBoom-src-${PORTVERSION}	5	DISTNAME= MrBoom-src-${PORTVERSION}
Lines 31-36 PLIST_FILES= bin/mrboom \ Link Here
31	share/man/man6/mrboom.6.gz \	30	share/man/man6/mrboom.6.gz \
32	share/pixmaps/mrboom.png	31	share/pixmaps/mrboom.png
33		32
		33	MAKE_ENV+= MANDIR="share/man/man6"
		34
34	post-install:	35	post-install:
35	${INSTALL_DATA} ${WRKSRC}/Assets/${PORTNAME}.png \	36	${INSTALL_DATA} ${WRKSRC}/Assets/${PORTNAME}.png \
36	${STAGEDIR}${PREFIX}/share/pixmaps/	37	${STAGEDIR}${PREFIX}/share/pixmaps/

Lines 1-3 Link Here

(-)b/games/mrboom/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1696246783	1	TIMESTAMP = 1707120050
2	SHA256 (MrBoom-src-5.3.tar.gz) = 75c3812878809c908094416b0d50e8b380d158d0ad12b9ae6a9a95ab926866c1	2	SHA256 (MrBoom-src-5.4.tar.gz) = 5f8f612a850a184dc59f03bcc74e279b50bc027d8ca2d9a4927a4caaa570b93a
3	SIZE (MrBoom-src-5.3.tar.gz) = 7950508	3	SIZE (MrBoom-src-5.4.tar.gz) = 8165615




--- Makefile.orig	2024-02-05 07:30:26 UTC
+++ Makefile
@@ -11,7 +11,7 @@ WANT_BPP       := 32
 INSTALL        := install
 RM             := rm
 STRIP          := strip
-GIT_VERSION    := " $(shell git rev-parse --short HEAD)"
 BINDIR         ?= bin
 LIBDIR         ?= lib
 DATADIR        ?= share
 LIBRETRO_DIR   ?= libretro
 WANT_BPP       := 32
 #DEBUG := 1
 
-MANDIR := man/man6
+MANDIR ?= man/man6
 CFLAGS := $(filter-out -D_FORTIFY_SOURCE=1,$(CFLAGS))
 CFLAGS := $(filter-out -D_FORTIFY_SOURCE=2,$(CFLAGS))
 CFLAGS := $(filter-out -D_FORTIFY_SOURCE,$(CFLAGS))
 CXXFLAGS := $(filter-out -D_FORTIFY_SOURCE=1,$(CXXFLAGS))
 CXXFLAGS := $(filter-out -D_FORTIFY_SOURCE=2,$(CXXFLAGS))
-CXXFLAGS := $(filter-out -D_FORTIFY_SOURCE,$(CXXFLAGS))
+
 CPPFLAGS := $(filter-out -D_FORTIFY_SOURCE=1,$(CPPFLAGS))
 CPPFLAGS := $(filter-out -D_FORTIFY_SOURCE=2,$(CPPFLAGS))
 CPPFLAGS := $(filter-out -D_FORTIFY_SOURCE,$(CPPFLAGS))
@@ -628,7 +627,7 @@ endif
    endif
 endif
 
-CFLAGS += -DMRBOOM -DHAVE_IBXM -D_FORTIFY_SOURCE=0 -DPLATFORM=\"$(platform)\" -DGIT_VERSION=\"$(GIT_VERSION)\"
+CFLAGS += -DMRBOOM -DHAVE_IBXM -D_FORTIFY_SOURCE=0 -DPLATFORM=\"$(platform)\"
 
 ifneq ($(FALCON),)
    SDLLIBS := -mshort -L/usr/m68k-atari-mint/sys-root/usr/lib/m68020-60 -lSDL_mixer -lSDL -lSDLmain -lFLAC -lmikmod -lgem -lldg  -lgem -lm -lvorbisfile -lvorbis -logg -lmpg123 

Return to bug 276836

Lines 1-34 Link Here

(-)b/games/mrboom/files/patch-Makefile (-27 / +4 lines)
1	--- Makefile.orig 2023-09-30 09:08:22 UTC	1	--- Makefile.orig 2024-02-05 07:30:26 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -3,20 +3,19 @@ STRIP := strip	3	@@ -11,7 +11,7 @@ WANT_BPP := 32
4	INSTALL := install
5	RM := rm
6	STRIP := strip
7	-GIT_VERSION := " $(shell git rev-parse --short HEAD)"
8	BINDIR ?= bin
9	LIBDIR ?= lib
10	DATADIR ?= share
11	LIBRETRO_DIR ?= libretro
12	WANT_BPP := 32	4	WANT_BPP := 32
		5	#DEBUG := 1
13		6
14	-MANDIR := man/man6	7	-MANDIR := man/man6
15	+MANDIR := share/man/man6	8	+MANDIR ?= man/man6
16	CFLAGS := $(filter-out -D_FORTIFY_SOURCE=1,$(CFLAGS))	9	CFLAGS := $(filter-out -D_FORTIFY_SOURCE=1,$(CFLAGS))
17	CFLAGS := $(filter-out -D_FORTIFY_SOURCE=2,$(CFLAGS))	10	CFLAGS := $(filter-out -D_FORTIFY_SOURCE=2,$(CFLAGS))
18	CFLAGS := $(filter-out -D_FORTIFY_SOURCE,$(CFLAGS))	11	CFLAGS := $(filter-out -D_FORTIFY_SOURCE,$(CFLAGS))
19	CXXFLAGS := $(filter-out -D_FORTIFY_SOURCE=1,$(CXXFLAGS))
20	CXXFLAGS := $(filter-out -D_FORTIFY_SOURCE=2,$(CXXFLAGS))
21	-CXXFLAGS := $(filter-out -D_FORTIFY_SOURCE,$(CXXFLAGS))
22	+
23	CPPFLAGS := $(filter-out -D_FORTIFY_SOURCE=1,$(CPPFLAGS))
24	CPPFLAGS := $(filter-out -D_FORTIFY_SOURCE=2,$(CPPFLAGS))
25	CPPFLAGS := $(filter-out -D_FORTIFY_SOURCE,$(CPPFLAGS))
26	@@ -628,7 +627,7 @@ endif
27	endif
28	endif
29
30	-CFLAGS += -DMRBOOM -DHAVE_IBXM -D_FORTIFY_SOURCE=0 -DPLATFORM=\"$(platform)\" -DGIT_VERSION=\"$(GIT_VERSION)\"
31	+CFLAGS += -DMRBOOM -DHAVE_IBXM -D_FORTIFY_SOURCE=0 -DPLATFORM=\"$(platform)\"
32
33	ifneq ($(FALCON),)
34	SDLLIBS := -mshort -L/usr/m68k-atari-mint/sys-root/usr/lib/m68020-60 -lSDL_mixer -lSDL -lSDLmain -lFLAC -lmikmod -lgem -lldg -lgem -lm -lvorbisfile -lvorbis -logg -lmpg123