From nobody Wed Jul 26 06:51:04 2023 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 4R9l0n0QVXz4ncgk; Wed, 26 Jul 2023 06:51:05 +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 4R9l0m6Ptkz3N9f; Wed, 26 Jul 2023 06:51:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690354264; 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=bYnW6rOiurkHbuUCC3i9uSbPsE5LHKPYZcsP2comUFw=; b=FNIiiRy0trhzdMW0oET9MrfSRVlzbonDasFdJaV508n11hzXnsyl//4UKo9bCqT+Pcn2fA lzgweUm47QqOURsk/eeiKZrcFAvR1gPpz3DGXSD+sYiQMAyh/JhcHS0hhUhW5slixHGb4Z +gN7VFghzRpwYX5pb0zMJ8ndV3lm5q0U3TVstd+sSQM7rGhXvutCXkpDqa3mGWFkTE5cvD fbQHSkfjH3orgb4/1a7L74FCHy0PX7uvfes+p3YtKq5oAohkWI/SOxt+3iJW8qBQ/fy7Zr +hRgXT4BDYuvhvj5D5h89OMlLvO12rs67uB3cO5yK3v91kNdPgME9zrkrEk2kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690354264; 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=bYnW6rOiurkHbuUCC3i9uSbPsE5LHKPYZcsP2comUFw=; b=bH4okWLoDkoqiXGJuzdU8mh+nYoGjjBka5KgrFHkdXDowEY2qM+B+c5z1UfwY591Z/j5ZD yFiLrx8MqKJZAs9kkzlYqfpCa5xLR3pwsZhAerU5GRyhSvSQW88WJa4Yk0QpBe8zI3uJeG CRckup8qlk00lh2UoRt4r/g1f1LvI6xwrY6k0yDQnAd6Wg1cAj6NlIKtrJun2/bdUvTvh/ PlAXJ4wSS7jspdmhxspCkvul/qY59S+/rzydqyVqNAO0W0z2S+tuiAj31TNg7DxzYaPJ4Z muEJaIMX2Tfdpf/8kWsGuiD5rSMxpjt1Gc5hIarKzpqYRC3q+yX8p8xVfSeZdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690354264; a=rsa-sha256; cv=none; b=xcjrP6zPYwwtIMV0aU4J/S6En4PqE7mRJHi/ob+QxYHFz6QNnlGXe+id4ZIOmAvhK4wi3J NsitmVgO0orznXoY3WssIGcKXcWqyaIaxURH7/T77fF/9ASGh1mgZi2/Vv7F6B+QVsZmx8 PRH0azco+gO73FFLDJqakR7X3vO69rH8OrzZUmRWqF8L79LHfhYdO3fjh1t0UWAxJd9l9h 5aUhgpjDl0IPRHZIApze25S8uwes3bvMFa5GVB2CWMK2JxVaNO5s6+YU5hbrJrn5wH47c/ H7vzHR5wArQDzBWc4hiJYAHvYIvoZkJoqS+uq8AetlGUTKjhzFBBnCh/WahBMA== 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 4R9l0m5VHvzXlW; Wed, 26 Jul 2023 06:51:04 +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 36Q6p4Jh070246; Wed, 26 Jul 2023 06:51:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36Q6p4i3070245; Wed, 26 Jul 2023 06:51:04 GMT (envelope-from git) Date: Wed, 26 Jul 2023 06:51:04 GMT Message-Id: <202307260651.36Q6p4i3070245@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: 2ca9bcd573e3 - main - games/quake2-rogue: try to unbreak the port against Clang 16 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ca9bcd573e3cae9538e22df3992d987726c537a Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ca9bcd573e3cae9538e22df3992d987726c537a commit 2ca9bcd573e3cae9538e22df3992d987726c537a Author: Alexey Dokuchaev AuthorDate: 2023-07-26 06:50:02 +0000 Commit: Alexey Dokuchaev 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 /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