diff --git a/games/doomlegacy/Makefile b/games/doomlegacy/Makefile index 4b939818fd71..bce42d3d9d7c 100644 --- a/games/doomlegacy/Makefile +++ b/games/doomlegacy/Makefile @@ -1,55 +1,58 @@ PORTNAME= doomlegacy -PORTVERSION= 1.48.14 +PORTVERSION= 1.48.18 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${DISTVERSION:S,_,%20,}/ DISTNAME= ${PORTNAME}_${DISTVERSION}_source DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${PORTNAME}_${DISTVERSION}_common.zip MAINTAINER= danfe@FreeBSD.org COMMENT= Improved and extended version of Doom WWW= https://doomlegacy.sourceforge.net/ LICENSE= GPLv2 USES= gl gmake sdl tar:bzip2 USE_GL= gl glu USE_SDL= mixer sdl MAKE_ARGS= OS=${OPSYS:tu} -MAKE_ENV= CC_ENVIRONMENT=1 HAVE_ZLIB=1 +MAKE_ENV= CC_ENVIRONMENT=1 + +WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}/svn1749 PLIST_FILES= bin/${PORTNAME} share/doom/dogs.wad share/doom/legacy.wad PORTDOCS= * OPTIONS_DEFINE= DOCS LIBZIP OPTIONS_DEFINE_i386= ASM OPTIONS_DEFAULT= LIBZIP ASM_BROKEN= segmentation fault in ASM_PatchRowBytes() ASM_BUILD_DEPENDS= nasm:devel/nasm ASM_MAKE_ENV= USEASM=1 LIBZIP_DESC= Zipped WAD file support via libzip LIBZIP_LIB_DEPENDS= libzip.so:archivers/libzip LIBZIP_MAKE_ENV= HAVE_LIBZIP=1 post-patch: .SILENT + ${REINPLACE_CMD} -e 's/^HAVE_LIBZIP/#&/' ${WRKSRC}/make_options_nix # Adjust default WAD search path and disable IPX ${REINPLACE_CMD} -e '/DEFWADS04/s|/.*|${DMDIR}"|' \ -e '/USE_IPX/s|define|undef|' ${WRKSRC}/src/doomdef.h pre-build: @${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} depend \ -C ${BUILD_WRKSRC} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/doomlegacy ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DMDIR} ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${PORTVERSION}_common/*.wad \ ${STAGEDIR}${DMDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .include "${.CURDIR}/../doom-data/Makefile.include" .include diff --git a/games/doomlegacy/distinfo b/games/doomlegacy/distinfo index 20942412c00f..157939763e78 100644 --- a/games/doomlegacy/distinfo +++ b/games/doomlegacy/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1703805810 -SHA256 (doomlegacy_1.48.14_source.tar.bz2) = 32f1de12088aa0fc339c12de1d2ba6756a9e6ab85ef6c4bcd6f8985374a73064 -SIZE (doomlegacy_1.48.14_source.tar.bz2) = 2624909 -SHA256 (doomlegacy_1.48.14_common.zip) = 3fecd4ee0fe943b92bf77eac08436953ab1a032403f539879c8599c8c02fb9f8 -SIZE (doomlegacy_1.48.14_common.zip) = 1056545 +TIMESTAMP = 1747209123 +SHA256 (doomlegacy_1.48.18_source.tar.bz2) = 80f502afb4b7c6a87e5c291cf8b145e4e0c01bf0dde9a79c64a1306890a3eb19 +SIZE (doomlegacy_1.48.18_source.tar.bz2) = 2803672 +SHA256 (doomlegacy_1.48.18_common.zip) = 9a611d6bef7693c4a2c12bd60dff123fa161a23bc2e13877c89161bf63f39313 +SIZE (doomlegacy_1.48.18_common.zip) = 1104556 diff --git a/games/doomlegacy/files/patch-src_Makefile b/games/doomlegacy/files/patch-src_Makefile index 35550b1c87ff..f4d789c621ca 100644 --- a/games/doomlegacy/files/patch-src_Makefile +++ b/games/doomlegacy/files/patch-src_Makefile @@ -1,38 +1,28 @@ --- src/Makefile.orig 2023-12-28 23:33:46 UTC +++ src/Makefile @@ -613,8 +613,10 @@ endif OPTINC:= INSTALL_SUPPL:= -CFLAGS:= +#CFLAGS:= # Machine architecture. +# (Ab)using ARCH is very bad idea and can easily break things! +override undefine ARCH ifdef ARCH # if does not have leading -march, -mcpu, -mtune, or similar. ifeq ($(filter -march% -mcpu% -mtune% -m%, $(strip $(ARCH))),) -@@ -1260,8 +1262,7 @@ ifdef CDMUS - endif - - # LIBZIP --# For now, Linux only. --ifeq ($(OS), LINUX) -+ifneq ($(filter LINUX FREEBSD,$(OS)),) - ifdef HAVE_DLOPEN - LIBS+=-ldl - OPTS+=-DHAVE_DLOPEN @@ -1317,11 +1318,11 @@ ifdef DEBUG else # build a normal optimized version #CFLAGS+=-O3 - CFLAGS+=$(OPTLEV) -fomit-frame-pointer + #CFLAGS+=$(OPTLEV) -fomit-frame-pointer endif endif -CFLAGS+=-ffast-math -fno-strict-aliasing +#CFLAGS+=-ffast-math -fno-strict-aliasing # WIN98 linking needs LCFLAGS without -D flags and does not need includes LCFLAGS:=$(CFLAGS) CFLAGS+=$(OPTS) $(OPTINC)