diff --git a/games/doomlegacy/Makefile b/games/doomlegacy/Makefile index a82eae835a0f..1c6bfec78050 100644 --- a/games/doomlegacy/Makefile +++ b/games/doomlegacy/Makefile @@ -1,62 +1,61 @@ PORTNAME= doomlegacy -PORTVERSION= 1.48.8 -PORTREVISION= 1 +PORTVERSION= 1.48.12 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= http://doomlegacy.sourceforge.net/ LICENSE= GPLv2 USES= gl gmake sdl tar:bzip2 USE_GL= gl glu USE_SDL= mixer sdl -PLIST_FILES= bin/${PORTNAME} share/doom/legacy.wad +PLIST_FILES= bin/${PORTNAME} share/doom/dogs.wad share/doom/legacy.wad PORTDOCS= * OPTIONS_DEFINE= DOCS OPTIONS_DEFINE_i386= ASM ASM_BROKEN= segmentation fault in ASM_PatchRowBytes() .if exists(/usr/include/netipx/ipx.h) OPTIONS_DEFINE+= IPX IPX_DESC= IPX protocol support .endif ASM_BUILD_DEPENDS= nasm:devel/nasm ASM_MAKE_ENV= USEASM=1 .include post-patch: .SILENT # Adjust default WAD search path ${REINPLACE_CMD} -e '/DEFWADS04/s|/.*|${DMDIR}"|' \ ${WRKSRC}/src/doomdef.h .if ! ${PORT_OPTIONS:MIPX} ${REINPLACE_CMD} -e '/USE_IPX/s|define|undef|' ${WRKSRC}/src/doomdef.h ${REINPLACE_CMD} -e 's| -lipx||' ${WRKSRC}/src/Makefile .endif pre-build: ${ECHO_CMD} CC_ENVIRONMENT=1 OS=${OPSYS:tu} | \ ${XARGS} -n 1 >> ${BUILD_WRKSRC}/make_options ${MAKE_CMD} -C ${BUILD_WRKSRC} dirs ${MAKE_CMD} -C ${BUILD_WRKSRC} depend do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/doomlegacy ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DMDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${PORTVERSION}/legacy.wad \ + ${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 e7ec6a58d27a..cab7521daea2 100644 --- a/games/doomlegacy/distinfo +++ b/games/doomlegacy/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1609626982 -SHA256 (doomlegacy_1.48.8_source.tar.bz2) = 67040b18891e885331806e7e167193dc45fcdad8779052ce5a95f087dba5b766 -SIZE (doomlegacy_1.48.8_source.tar.bz2) = 2451682 -SHA256 (doomlegacy_1.48.8_common.zip) = 1b019edc875f744a682dfb6493c83a568fce87cd94e312f79f02ed82c4b1e49c -SIZE (doomlegacy_1.48.8_common.zip) = 1011350 +TIMESTAMP = 1671410365 +SHA256 (doomlegacy_1.48.12_source.tar.bz2) = 8378e69730ae8fa57596b0c78d24d158618b90dabe9597793b5bd077324b5c44 +SIZE (doomlegacy_1.48.12_source.tar.bz2) = 2572064 +SHA256 (doomlegacy_1.48.12_common.zip) = 94cec77e7674b4c80d3f05812335918030056b33889c08d0389c6fffa28f368b +SIZE (doomlegacy_1.48.12_common.zip) = 1055689 diff --git a/games/doomlegacy/files/patch-src_Makefile b/games/doomlegacy/files/patch-src_Makefile index 863617217c3f..d94cf2bc29f3 100644 --- a/games/doomlegacy/files/patch-src_Makefile +++ b/games/doomlegacy/files/patch-src_Makefile @@ -1,37 +1,46 @@ ---- src/Makefile.orig 2018-07-16 09:17:06 UTC +--- src/Makefile.orig 2022-12-18 00:00:15 UTC +++ src/Makefile -@@ -554,8 +554,10 @@ LIBS:= - LDFLAGS:= +@@ -234,7 +234,7 @@ OPTLEV=-O3 + # Developers with svn can enable this to have svn revision number in executable. + # Causes compile error message otherwise. + # Until can find test for presence of svn, this is best that can be done. +-SVN_ENABLE=1 ++#SVN_ENABLE=1 + + # This Makefile may be invoked from within the src directory, + # or invoked from the Main Makefile with SRC=. +@@ -610,8 +610,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))),) -@@ -598,7 +600,7 @@ ifeq ($(SMIF), SDL) - # default is Linux, for all unix SDL - EXENAME:=doomlegacy - LDFLAGS+=-L/usr/X11R6/lib -- LIBS+=-lGL -lGLU -lm -+ LIBS+=-lGL -lGLU -lm -lipx - # -L/usr/X11R6/lib is needed by Linux 2.4 and others that still have - # the GLU libraries in an X11 directory. - # -lm is needed for pow, powf, and other MATH1 functions. -@@ -1001,11 +1003,11 @@ ifdef DEBUG +@@ -770,7 +772,7 @@ ifeq ($(SMIF), SDL) + # default is Linux, for all unix SDL + EXENAME:=doomlegacy + LDFLAGS+=-L/usr/X11R6/lib +- LIBS+=-lGL -lGLU -lm ++ LIBS+=-lGL -lGLU -lm -lipx + # -L/usr/X11R6/lib is needed by Linux 2.4 and others that still have + # the GLU libraries in an X11 directory. + # -lm is needed for pow, powf, and other MATH1 functions. +@@ -1305,11 +1307,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) diff --git a/games/doomlegacy/files/patch-sdl+i_system.c b/games/doomlegacy/files/patch-src_sdl_i__system.c similarity index 67% rename from games/doomlegacy/files/patch-sdl+i_system.c rename to games/doomlegacy/files/patch-src_sdl_i__system.c index 975d4f5a3e6a..fbd6b7a03be8 100644 --- a/games/doomlegacy/files/patch-sdl+i_system.c +++ b/games/doomlegacy/files/patch-src_sdl_i__system.c @@ -1,11 +1,12 @@ ---- src/sdl/i_system.c.orig 2014-05-16 20:11:49 UTC +--- src/sdl/i_system.c.orig 2022-12-18 00:00:15 UTC +++ src/sdl/i_system.c -@@ -508,6 +508,8 @@ void I_SysInit(void) +@@ -932,6 +932,9 @@ void I_SysInit(void) // Enable unicode key conversion SDL_EnableUNICODE(1); ++ + // Enable key auto repeat + SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); + #endif // Initialize the joystick subsystem. - I_JoystickInit();