Skip to content

Commit

Permalink
games/quake2-rogue: try to unbreak the port against Clang 16
Browse files Browse the repository at this point in the history
While here, set the MAKEFILE instead of copying the Makefile,
drop dubious or even bogus compiler options (see the log for
commit 7b672c1 for exact reasons) and needless LDFLAGS.

Reported by:	pkg-fallout
  • Loading branch information
Alexey Dokuchaev authored and Alexey Dokuchaev committed Jul 26, 2023
1 parent ba6aae7 commit 2ca9bcd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
5 changes: 2 additions & 3 deletions games/quake2-rogue/Makefile
Expand Up @@ -10,6 +10,7 @@ MAINTAINER= danfe@FreeBSD.org
COMMENT= Quake II: Ground Zero (Rogue) official mission pack
WWW= http://www.idsoftware.com/games/quake/quake2-grndzero/

MAKEFILE= ${FILESDIR}/Makefile
NO_WRKSUBDIR= yes
SUB_FILES= pkg-message

Expand All @@ -20,11 +21,9 @@ do-extract:
@cd ${WRKSRC} && uncompress -c ${DISTDIR}/${DISTFILES} | \
${TAIL} +454 | ${SH}

post-extract:
@${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}

post-patch:
@${REINPLACE_CMD} -e '/#include <nan\.h>/d' ${WRKSRC}/g_local.h
@${REINPLACE_CMD} -e '/extern SP_monster_makron/d' ${WRKSRC}/m_boss31.c
@${REINPLACE_CMD} -e 's/__linux__/__unix__/' ${WRKSRC}/q_shared.[ch]

do-install:
Expand Down
6 changes: 2 additions & 4 deletions games/quake2-rogue/files/Makefile
Expand Up @@ -64,9 +64,7 @@ SRCS= dm_ball.c \
p_weapon.c \
q_shared.c

CFLAGS+= -Dstricmp=strcasecmp -ffast-math -funroll-loops \
-fomit-frame-pointer -fexpensive-optimizations

LDFLAGS+= -L/lib -L/usr/lib -lm
CFLAGS+= -Dstricmp=strcasecmp -ffast-math \
-Wno-incompatible-function-pointer-types

.include <bsd.lib.mk>

0 comments on commit 2ca9bcd

Please sign in to comment.