diff --git a/games/mrboom/Makefile b/games/mrboom/Makefile index cca4d6bb1354..f2465457dd85 100644 --- a/games/mrboom/Makefile +++ b/games/mrboom/Makefile @@ -1,39 +1,40 @@ PORTNAME= mrboom -PORTVERSION= 5.3 +DISTVERSION= 5.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= https://github.com/Javanaise/mrboom-libretro/releases/download/${PORTVERSION}/ DISTNAME= MrBoom-src-${PORTVERSION} MAINTAINER= ehaupt@FreeBSD.org COMMENT= 8 players Bomberman clone WWW= http://mrboom.mumblecore.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_FreeBSD_14_i386= lld crashes during build BROKEN_FreeBSD_15_i386= lld crashes during build LIB_DEPENDS= libmodplug.so:audio/libmodplug USES= compiler:c++11-lang gmake minizip sdl USE_SDL= mixer2 sdl2 MAKE_ENV+= LIBSDL2=1 ALL_TARGET= mrboom CFLAGS+= `sdl2-config --cflags` LDFLAGS+= `sdl2-config --libs` PLIST_FILES= bin/mrboom \ - man/man6/mrboom.6.gz \ share/applications/mrboom.desktop \ + share/man/man6/mrboom.6.gz \ share/pixmaps/mrboom.png post-install: ${INSTALL_DATA} ${WRKSRC}/Assets/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ ${INSTALL_DATA} ${WRKSRC}/Assets/${PORTNAME}.desktop \ ${STAGEDIR}${DESKTOPDIR} .include diff --git a/games/mrboom/files/patch-Makefile b/games/mrboom/files/patch-Makefile index 686695e841d7..3132d3ccc926 100644 --- a/games/mrboom/files/patch-Makefile +++ b/games/mrboom/files/patch-Makefile @@ -1,28 +1,34 @@ ---- Makefile.orig 2020-12-30 21:19:43 UTC +--- Makefile.orig 2023-09-30 09:08:22 UTC +++ Makefile -@@ -3,7 +3,6 @@ AR := ar +@@ -3,20 +3,19 @@ STRIP := strip INSTALL := install RM := rm STRIP := strip -GIT_VERSION := " $(shell git rev-parse --short HEAD)" BINDIR ?= bin LIBDIR ?= lib DATADIR ?= share -@@ -16,7 +15,7 @@ CFLAGS := $(filter-out -D_FORTIFY_SOURCE=2,$(CFLAGS)) + LIBRETRO_DIR ?= libretro + WANT_BPP := 32 + +-MANDIR := man/man6 ++MANDIR := share/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)) -@@ -572,7 +571,7 @@ else +@@ -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)\" - SDL2LIBS := -lSDL2 -lSDL2_mixer -lminizip - + 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