From nobody Sat Apr 6 09:06:52 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBTxm4Bh1z5GC50; Sat, 6 Apr 2024 09:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBTxm3P6jz4GRL; Sat, 6 Apr 2024 09:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712394412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GZ9zDnvVY2ZWIiQHv4QcCV7r+XlQYuqTjGPWC4VapWk=; b=xMApfEHr2Cr/llj4WElyjgiMEqjluHhXkH1Xh+N4z2qfj/sQHxvV2tbJDB/dmpn0EZUeUb dB9kmNSuU5DVeyXd52EkbhwZSF8CQv8JA0Q8Fz052BJX6AIfGYQJ+AZ8tRBTQWg47jMHsy No+M/SEGiYa1shaGhhz0whLfWUFCEY/FesBj2RASo51YqG1TRLgsGwUt8XJK9Xmsd0K9Ok wOc39LDGnS8sAM4tsJk2DSIJBGVPMejq0N2WzDWqrWAB70IZEiYip3O4NBZW5eTPQQCH2O J8zeBACPXTohG/0NgEypVDytX2EFt3L6j99R38fSKljjonr+fOUE3QAVUjn1tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712394412; a=rsa-sha256; cv=none; b=SYCp5a8hD2hEYn/CVCE9jmf2x+f6edgPDMddM3/JgJ05F92LodjBsHYiW7AA/+DbgA012V uJVW0wbujhL0biknyNyDqsAmhAKonFlB9RQEuSa5BSKLSaRQlYTcjG+qc5MMUIvgi6ni3+ i6L2B5Vnf+pVU+qlbqG6E+pBpTANaDOtiz7cm8uAOoXMgIoyZgQGAR5sd7dpoMMjUnU9/I doaw+PIHMpPGggIOwlNQIJPN1DD+9jovqfQI10FK/bjDtaoc+eKL+HjmQi2VHkumMVcqhz ESj41xesLmKX66FFzhqt5yVtjGxRdnZ36txhZu58B0q0AUDabk4bZszcN7QO+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712394412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GZ9zDnvVY2ZWIiQHv4QcCV7r+XlQYuqTjGPWC4VapWk=; b=DO4GPvbkPWHir4AXDREeP+iTE3ckOUFp8V8gNeTK+NGTll797f1oXsDAAEivC86rN86LaV 3x9nTCa4GGwj3tH2d++uhyLsk0J33FkRX2eX2oHBTnSAtvJ2cQANUrVX5khAnXuJBAI2l1 qL3ZertuS3m9vfBUGDLkoyEmioOjJHfotZ/5NqF8EZ+QUEhQUPX4pem44Z3sfH94OwglLc 4uAu7R3bT5VVjPIMVNFh8DoMkeHLrgcRFGqH/9cPaXlbMIxD+3YR01qIzS4jCdC2fpcCxJ 8bM7whoWDmov8cZdn6ZdY8Lm0XHWMyziJ4toLcb35i2EmmDeyN/YpiaapYnGCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBTxm2tyVzdbb; Sat, 6 Apr 2024 09:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43696q2k096463; Sat, 6 Apr 2024 09:06:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43696qZt096460; Sat, 6 Apr 2024 09:06:52 GMT (envelope-from git) Date: Sat, 6 Apr 2024 09:06:52 GMT Message-Id: <202404060906.43696qZt096460@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 02122c50a27e - main - games/eduke32: Fix build and datadir List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02122c50a27e3470c067b5c4d4660c0307067e15 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=02122c50a27e3470c067b5c4d4660c0307067e15 commit 02122c50a27e3470c067b5c4d4660c0307067e15 Author: Felix Palmen AuthorDate: 2024-04-03 06:12:49 +0000 Commit: Piotr Kubaj 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: