From nobody Wed Jul 26 12:59:24 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 4R9v9n16jhz4nXyY; Wed, 26 Jul 2023 12:59:25 +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 4R9v9n0Gqsz416K; Wed, 26 Jul 2023 12:59:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690376365; 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=U8ahiRRc5OWFEoZzcPxyrPiMnm7XggQWruBzJ2yk7IA=; b=eHpXkeVWtk1rfRWDHmdtts9h6cDn8EQoq9sj2a/ESgXTM8tKADCg/UNWgZF1dt0W4A3aNm S4rCBt2LR4L9wdiki3njhuKgA9KPxKBH7rxMklmqpsBnMs4g3bIRj0z9PxNC3+fV5T2Qmc RcplQk4v2u92QranMaPm9M3THeBt1/MpUvAg9aNZpdU5N/FEGTntu5qq/gK/2N801/W3uD rf8rU7nweg6tJ53P4wTNhY32OCTZrxFE3FBnedE8yFwHkoVtvMw5k1aklUAkL/GZaJbt2A Ysl7OzKnaKTzIGXS3whxp5OlmCkNCj0BwiklKf6EV5jl5ZVbv0q0F/aYbfI1FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690376365; 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=U8ahiRRc5OWFEoZzcPxyrPiMnm7XggQWruBzJ2yk7IA=; b=rg1JXe7gVV9YCFJ7GgnrGPNdU6M06cAUf62QzI9r/QNtX+CfjCyqXwt9lhNhpu6j31dSsS lP0rBz54ImZmTBB6KeMRPEA+T9zEqexH7yH0KJ6uharou2fxiCxG5ZtR8hmj9Ztv+x925C okUCO35wG0GTQ1Su/lm9CAc9NR85Deav3lxpg+eH/6KLB0OtDTSWeWnqykix82lM65CV0r 42ZbWW85gPuPgMr1e95+zWJ1LSgFKIoyloctXTQaTYCrTcuTmwD4aAt59bQJ3GVe3TUysc ct45eIu64Ke3/bW5y8iv4gq6X2MzPfQgXiv0vZ4drZAE6e09dK+asFETmeL2xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690376365; a=rsa-sha256; cv=none; b=crXtc/+A5GkaOFnxEcG4L8+vYRh0L+bW2FUL+lhHXbbMM2cgL3/k+zBNdr6su9atNNb/Xw YjHkGKo5VFOi0zr2hFhFKiGtETOzDYcO1c/dshHKGvyBrQu8ousGU7TJrpXRNxaT8RgOao ebYbjZY1ToX4/lX/PnA9/gieMsVs6NExbpLzJ5TZ6vIAM/VLTrGfeCF8srdE2hj2w44QmO euAh0uiAvKzL6Qhm2T89wj+hUrfCUffzWIHq3heR8Dz+G+Uy8YLz4kX64IcltbYrNeZ0qK yaDcGMxgo83eaozp3l/lLCAhnmaF8xJbBdL0VRkMP92StKjMllQZlmebURcaHg== 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 4R9v9m5x81zjpM; Wed, 26 Jul 2023 12:59:24 +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 36QCxOIf072632; Wed, 26 Jul 2023 12:59:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36QCxO9h072631; Wed, 26 Jul 2023 12:59:24 GMT (envelope-from git) Date: Wed, 26 Jul 2023 12:59:24 GMT Message-Id: <202307261259.36QCxO9h072631@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: d4ca82f4f8ac - main - games/quake2-3zb2: 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: d4ca82f4f8ac3c77cf4efe0ca3ef77e8ec38e465 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=d4ca82f4f8ac3c77cf4efe0ca3ef77e8ec38e465 commit d4ca82f4f8ac3c77cf4efe0ca3ef77e8ec38e465 Author: Alexey Dokuchaev AuthorDate: 2023-07-26 12:58:04 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-07-26 12:58:04 +0000 games/quake2-3zb2: try to unbreak the port against Clang 16 The treatment is basically the same as in commit 2ca9bcd573e3 (-Wno-incompatible-function-pointer-types); using the MAKEFILE instead of copying the Makefile to ${WRKSRC} is also alike. While I'm here, prune the header files from the SRCS list and banal comment in the `post-extract' target, use option helpers during the installation, and stop messing with permissions as it breaks ``make clean''. Reported by: pkg-fallout --- games/quake2-3zb2/Makefile | 13 +++++-------- games/quake2-3zb2/files/Makefile | 16 +++------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/games/quake2-3zb2/Makefile b/games/quake2-3zb2/Makefile index 94ae48e1ce95..0bcdbdab4db1 100644 --- a/games/quake2-3zb2/Makefile +++ b/games/quake2-3zb2/Makefile @@ -16,6 +16,7 @@ WWW= http://users.jp.tri6.net/~ponpoko/3zb2/ USES= dos2unix zip DOS2UNIX_FILES= *.[ch] +MAKEFILE= ${FILESDIR}/Makefile NO_WRKSUBDIR= yes SUB_FILES= pkg-message @@ -44,11 +45,9 @@ DISTFILES+= ${f}${EXTRACT_SUFX}:routes .endif post-extract: -# Rename files and directories to lower case @cd ${WRKSRC}; for f in *; do \ ${MV} $${f} `${ECHO_CMD} $${f} | ${TR} '[:upper:]' '[:lower:]'`; \ done - @${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC} do-install: .for f in chctf chdtm @@ -60,15 +59,13 @@ do-install: ${STAGEDIR}${Q2DIR}/${PORTNAME} cd ${WRKSRC}/3zb2 && ${INSTALL_DATA} *.cfg 3ZBMaps.lst pak6.pak \ ${STAGEDIR}${Q2DIR}/${PORTNAME} -.if ${PORT_OPTIONS:MROUTES} + +do-install-ROUTES-on: ${INSTALL_DATA} ${WRKSRC}/*.chn ${STAGEDIR}${Q2DIR}/${PORTNAME}/chdtm ${INSTALL_DATA} ${WRKSRC}/*.chf ${STAGEDIR}${Q2DIR}/${PORTNAME}/chctf -.endif + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/3zb2 && ${CP} -a *.txt "User Guide" ${STAGEDIR}${DOCSDIR} - @${FIND} ${STAGEDIR}${DOCSDIR} -type d -print0 | \ - ${XARGS} -0 ${CHMOD} ${BINMODE} - @${FIND} ${STAGEDIR}${DOCSDIR} -type f -print0 | \ - ${XARGS} -0 ${CHMOD} ${SHAREMODE} .include diff --git a/games/quake2-3zb2/files/Makefile b/games/quake2-3zb2/files/Makefile index c3d34135a6f5..3a082013e284 100644 --- a/games/quake2-3zb2/files/Makefile +++ b/games/quake2-3zb2/files/Makefile @@ -2,19 +2,15 @@ SHLIB= game SHLIB_NAME= game.so SRCS= bot.c \ - bot.h \ bot_fire.c \ bot_func.c \ bot_za.c \ - botstr.h \ g_chase.c \ g_cmds.c \ g_combat.c \ g_ctf.c \ - g_ctf.h \ g_func.c \ g_items.c \ - g_local.h \ g_main.c \ g_misc.c \ g_monster.c \ @@ -27,22 +23,16 @@ SRCS= bot.c \ g_turret.c \ g_utils.c \ g_weapon.c \ - game.h \ m_move.c \ - m_player.h \ p_client.c \ p_hud.c \ p_menu.c \ - p_menu.h \ p_trail.c \ p_view.c \ p_weapon.c \ - q_shared.c \ - q_shared.h + 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