From nobody Thu Jan 30 06:46:49 2025 X-Original-To: dev-commits-ports-main@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 4Yk8h92Twlz5mtHT; Thu, 30 Jan 2025 06:46:49 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yk8h91wPtz4M8H; Thu, 30 Jan 2025 06:46:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738219609; 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=WM2OoNV55yOPo0d5K87zS+FLXIo5UNiGPj35mNMA0Hg=; b=e5VgqEVsMj9klhtkRSvtECmBqPNYPAktErazAsym0CBfzM1DOJm3W2lk9fb2+w7zeB06kb 3nuY+uJgd8tzVijTMC/7TO+Ts1Ef/KQB0AhAei72cbmqDsTZ4wFA3HF0kjxr1xgbRfP4Mv 0x5oMwPAXwgD67koZXPGmSDb36qg4cigCODgrZ9nBI1PPmNF3zArPsJcvCITqhKeQPVsKs 3WGT6C05V/VmFxAnzLUprnFZyPN1ZY7rn1ZJTayT/Ny3pmshSEp/TLeYC0Eu+JRyuVeVbe D5HNnIf5huBDgsGR8zjt2+uQd1HwL6eZY3fSR5bkxJUwk3kraENBlfVho0mOGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738219609; 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=WM2OoNV55yOPo0d5K87zS+FLXIo5UNiGPj35mNMA0Hg=; b=LmZc1w6hXJYVpSUA3C9LAoSiZEi0ZApRO1+RZJrrifsBbztWX6kTfM6PtyQMK/GxE9QihK u3mWNO/kzXTe+iTyARXVAgBS8O/XlmjTOA13ft3aOuO9pvHxojwFoSPNNCYKO7dMc0p9S4 0CPCC7ySwNlIMVGlIvu6rBsYsL+TlIPAGzFikhE+03sne7eVtg/xMEUv8Gv/LuGscsfLz8 TY+MaTsXtBPNtA28nAu40fRCjcKbX3Ca6N3z9fv5OUyt+o+6HZS16Je8z9kq9VxhZGITwu HwWBZovqDCwVIMvnsnRsSJWSf/IukVbARkcClHLgeKq7cMyzNvqDwgReKkGLDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738219609; a=rsa-sha256; cv=none; b=ct/sIDevR/9QAzT4L88uq7MsVkVPAsAEPE5eD0PqtfyRtcIre3n6w6KlKJrMr2AykKHTIT FLoY4oB5kctnAsQz/4wQ2zr3m7BN5tt0xfjK95m7+VrQhfCqbmUzHsQxB9UQ4E78HSlwB4 QvK/15N2N0FuNORkQWWTB+yPnyceXlt08HKCbkjzINiskjPpZnEIeGWU6SS1MCMMDuqKsS 5gxuzPTNbxPCUgHfawQJO64itLc1vdPU8lF+jwbJYitq6fbA5sLnbNOIRlQbhYS1/wzEls TYI+N5KkhknP2vMoYkpj3fzJj9dRNIlyQW55ERwaU2Iwjx+lLjY5JmvA9XKZQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yk8h91CZSzcmv; Thu, 30 Jan 2025 06:46:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50U6knIF093645; Thu, 30 Jan 2025 06:46:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50U6knPp093642; Thu, 30 Jan 2025 06:46:49 GMT (envelope-from git) Date: Thu, 30 Jan 2025 06:46:49 GMT Message-Id: <202501300646.50U6knPp093642@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: a095df27d3e6 - main - games/{quake2lnx,r1q2}: unbreak the build after src commit 660331da7a List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a095df27d3e63f6e26482f52af35c651d1d7fc12 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=a095df27d3e63f6e26482f52af35c651d1d7fc12 commit a095df27d3e63f6e26482f52af35c651d1d7fc12 Author: Alexey Dokuchaev AuthorDate: 2025-01-30 06:45:56 +0000 Commit: Alexey Dokuchaev CommitDate: 2025-01-30 06:45:56 +0000 games/{quake2lnx,r1q2}: unbreak the build after src commit 660331da7a Reported by: pkg-fallout --- games/quake2lnx/Makefile | 2 ++ games/r1q2/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/games/quake2lnx/Makefile b/games/quake2lnx/Makefile index 3ea3f1121220..bfaabb175dc2 100644 --- a/games/quake2lnx/Makefile +++ b/games/quake2lnx/Makefile @@ -201,6 +201,8 @@ post-patch: .SILENT ${WRKSRC}/src/linux/vid_so.c ${REINPLACE_CMD} -e 's|dllname, RTLD_LAZY|& \| RTLD_GLOBAL|' \ ${WRKSRC}/src/linux/qgl_linux.c + ${REINPLACE_CMD} -e '/param\.h/s|machine|sys|' \ + ${WRKSRC}/src/linux/q_shlinux.c ${REINPLACE_CMD} -e 's|/js|/joy|' ${WRKSRC}/src/linux/joystick.c ${REINPLACE_CMD} -e 's|jpeg_mem_src|local_&|' \ ${WRKSRC}/src/ref_candygl/gl_image.c diff --git a/games/r1q2/Makefile b/games/r1q2/Makefile index 95a287bd9032..8e1a41edfcd3 100644 --- a/games/r1q2/Makefile +++ b/games/r1q2/Makefile @@ -70,6 +70,8 @@ PLIST_SUB+= REF_GL="@comment " post-patch: @${REINPLACE_CMD} -e 's|game$$(ARCH)|game|g' \ ${BUILD_WRKSRC}/game/Makefile + @${REINPLACE_CMD} -e '/param\.h/s|machine|sys|' \ + ${WRKSRC}/linux/q_shlinux.c @${REINPLACE_CMD} -e '/SV_FixPlayerSkin/s,__inline,static,' \ ${WRKSRC}/server/sv_game.c