Date: Wed, 26 Jul 2023 06:51:04 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2ca9bcd573e3 - main - games/quake2-rogue: try to unbreak the port against Clang 16 Message-ID: <202307260651.36Q6p4i3070245@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ca9bcd573e3cae9538e22df3992d987726c537a commit 2ca9bcd573e3cae9538e22df3992d987726c537a Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2023-07-26 06:50:02 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2023-07-26 06:50:02 +0000 games/quake2-rogue: try to unbreak the port against Clang 16 While here, set the MAKEFILE instead of copying the Makefile, drop dubious or even bogus compiler options (see the log for commit 7b672c1318c09 for exact reasons) and needless LDFLAGS. Reported by: pkg-fallout --- games/quake2-rogue/Makefile | 5 ++--- games/quake2-rogue/files/Makefile | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/games/quake2-rogue/Makefile b/games/quake2-rogue/Makefile index 30cdca4d6d5a..03c16f218937 100644 --- a/games/quake2-rogue/Makefile +++ b/games/quake2-rogue/Makefile @@ -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 @@ -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: diff --git a/games/quake2-rogue/files/Makefile b/games/quake2-rogue/files/Makefile index a56946b74afe..bfc8d9385be2 100644 --- a/games/quake2-rogue/files/Makefile +++ b/games/quake2-rogue/files/Makefile @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307260651.36Q6p4i3070245>