Index: head/games/doomlegacy/Makefile =================================================================== --- head/games/doomlegacy/Makefile (revision 538209) +++ head/games/doomlegacy/Makefile (revision 538210) @@ -1,63 +1,63 @@ # Created by: Alexander G. Chetirbock # $FreeBSD$ PORTNAME= doomlegacy -PORTVERSION= 1.47.2 +PORTVERSION= 1.48.4 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 LICENSE= GPLv2 USES= gl gmake sdl tar:bzip2 USE_GL= gl glu USE_SDL= mixer sdl PLIST_FILES= bin/${PORTNAME} 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 \ ${STAGEDIR}${DMDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include "${.CURDIR}/../doom-data/Makefile.include" .include Index: head/games/doomlegacy/distinfo =================================================================== --- head/games/doomlegacy/distinfo (revision 538209) +++ head/games/doomlegacy/distinfo (revision 538210) @@ -1,5 +1,5 @@ -TIMESTAMP = 1532515359 -SHA256 (doomlegacy_1.47.2_source.tar.bz2) = ed50c5091f39e08a2cd1163497c8d047467a059f3ade14915f07e38da5174373 -SIZE (doomlegacy_1.47.2_source.tar.bz2) = 2276199 -SHA256 (doomlegacy_1.47.2_common.zip) = 7fbd94a8c0186170f3250c7ee60dacfc30d7f8f08102f3b990b91f31c7b339d1 -SIZE (doomlegacy_1.47.2_common.zip) = 981654 +TIMESTAMP = 1589672432 +SHA256 (doomlegacy_1.48.4_source.tar.bz2) = 5443684f7b8e172b1c9aac61923c6e905ec83fd99352cbb7fc107b726e69ea0a +SIZE (doomlegacy_1.48.4_source.tar.bz2) = 2410187 +SHA256 (doomlegacy_1.48.4_common.zip) = ebf4ec93d7d083bd726947fb69addc86da350e751156acb4baf63973bad79fac +SIZE (doomlegacy_1.48.4_common.zip) = 1004978 Index: head/games/doomlegacy/files/patch-src_d__main.c =================================================================== --- head/games/doomlegacy/files/patch-src_d__main.c (revision 538209) +++ head/games/doomlegacy/files/patch-src_d__main.c (nonexistent) @@ -1,26 +0,0 @@ ---- src/d_main.c.orig 2018-07-25 10:14:34 UTC -+++ src/d_main.c -@@ -454,18 +454,20 @@ void owner_wad_search_order( void ) - } - else - if( (strcmp( defdir, cv_home.string ) != 0) // not home directory -- && (strcmp( defdir, progdir ) != 0) // not program directory -- && (strcmp( defdir, progdir_wads ) != 0) ) // not wads directory -- { -+ ) { if( verbose ) -+ GenPrintf( EMSG_ver, "User's home is default dir, not searched.\n"); -+ } else { - defdir_search = 1; - // Search current dir near first, for other wad searches. - doomwaddir[1] = defdir; - } - } -+#if 0 // only useful for developers, missing NULL checks - // Search progdir/wads early, for other wad searches. - doomwaddir[2] = progdir_wads; - // Search last, for other wad searches. - doomwaddir[MAX_NUM_DOOMWADDIR-1] = progdir; -+#endif - } - - Property changes on: head/games/doomlegacy/files/patch-src_d__main.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/doomlegacy/files/patch-src_Makefile =================================================================== --- head/games/doomlegacy/files/patch-src_Makefile (revision 538209) +++ head/games/doomlegacy/files/patch-src_Makefile (revision 538210) @@ -1,37 +1,37 @@ --- src/Makefile.orig 2018-07-16 09:17:06 UTC +++ src/Makefile @@ -554,8 +554,10 @@ LIBS:= LDFLAGS:= 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 + 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 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)