Date: Sat, 6 Apr 2024 09:06:52 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 02122c50a27e - main - games/eduke32: Fix build and datadir Message-ID: <202404060906.43696qZt096460@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=02122c50a27e3470c067b5c4d4660c0307067e15 commit 02122c50a27e3470c067b5c4d4660c0307067e15 Author: Felix Palmen <zirias@FreeBSD.org> AuthorDate: 2024-04-03 06:12:49 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2024-04-06 09:06:25 +0000 games/eduke32: Fix build and datadir Fix building with clang17: mimalloc-override.h replaces malloc() and friends using macros which interfere with C++ standard headers. -> disable mimalloc usage. Fix setting DATADIR, upstream source changed here. --- games/eduke32/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile index 192c5158814c..630fc87c0e0d 100644 --- a/games/eduke32/Makefile +++ b/games/eduke32/Makefile @@ -1,5 +1,6 @@ PORTNAME= eduke32 PORTVERSION= 20240316 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://dukeworld.com/eduke32/synthesis/${PORTVERSION}-${GITREVISION}/:eduke32 \ LOCAL/pkubaj/:erp \ @@ -38,7 +39,7 @@ GITREVISION= 10564-0bc78c53d DATADIR= ${PREFIX}/share/duke3d SUB_FILES= pkg-message MAKEFILE= GNUmakefile -MAKE_ARGS= CC=${CC} CXX=${CXX} CLANG=1 +MAKE_ARGS= CC=${CC} CXX=${CXX} CLANG=1 PRETTY_OUTPUT=0 USE_MIMALLOC=0 PLIST_FILES= bin/eduke32 bin/mapster32 PORTEXAMPLES= * @@ -92,7 +93,8 @@ post-extract-SHAREWARE-on: @cd ${WRKDIR} && ${UNZIP_NATIVE_CMD} -qo DN3DSW13.SHR post-patch: - @${REINPLACE_CMD} 's|/usr/share/games/eduke32|${DATADIR}|' \ + @${REINPLACE_CMD} \ + 's|"/usr/local/share/games/" APPBASENAME|"${DATADIR}"|' \ ${WRKSRC}/source/duke3d/src/common.cpp do-install:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404060906.43696qZt096460>