From nobody Fri Apr 14 14:18:00 2023 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 4Pydp228bGz45KdD; Fri, 14 Apr 2023 14:18:02 +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 4Pydp14MZ1z42WY; Fri, 14 Apr 2023 14:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681481881; 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=nucChNe+yT5aGQb7Vq9FIcyeKGj9M509Wfo07xWAvoo=; b=idTKERLAcDLnEVQRZSC0OVsPtwL+3ZWWQeql2gAJqkHHl17TNBbUhoqXFKAgIz4Rv0bs68 rXzh+dIQXopHrX/Z1rejKhMfTqXsMttG+ep6Witkv8X62bA9bE4PYVNyjxxgxqQ+oIWs7c TEyquYaUshRRgqs8zhF/2SOwNMJJiGY4940PGvS13rYyJ06/SLTVlbzabLNlaI5HZ6Vqvw wxvsvPrZdMyEk20dQBUrk2MXStXGYK/ORjGCex3b/atY3zEHqG7XlWL+qbt+WzwRoGCezJ ajPw/vfFGFTowaUdou2hhKIwetJ8Gvrq0VtxhPvYCZ6VThcbergkE6zapegnYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681481881; 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=nucChNe+yT5aGQb7Vq9FIcyeKGj9M509Wfo07xWAvoo=; b=pTo6qdKpqT2iMTLyuNd6+MuetxLZX3bdePyCOnmziZu7czM+2GdKQFlgLEpyi1xxfu+HQD XNk5VyaDNOntVB7GOjCvxFboGRpVfFFvWWb5NxcKjJZgxwOQ7IIVo5xnSsoSIEJbbQquZF HbKD3oKdLXgfz7qwgG3xorSoySJZQBOKHrglZ16fx0ssKtqL7nD5RmarxDN8E+MMm/9A6t XpxPhjXjM6X3xoXfZSGz4J3QA0b3A/iBswS/hG/hi/W1HN7Ej+MAL7098kYRLpAo2sUiAR +Pfk8j9nW948eSXxRzx5sYdteVv1Pi2X5KcPB4VC77B5TiY56PEiYEptxBegPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681481881; a=rsa-sha256; cv=none; b=rOxFgo0ME5SW+Am7MLhPAkdaIbLnQ1v8tA6TxFtm6DMVZv4vrUUAM6rCg9swS0sAz0XpES Quz5w3VXGVyLXi90FIgCrnE5RwyAv6tL//xR3WUeWwCEl9jyn5y8OTD/Q1iaVcu7FoaClA zX5A7xqh4jOEQpMT/2P8RhGy3wA76djMZoYCofo3ytshj+NgANOvC8Gg2NNRet4/rNrKxC I7BRK0OE0Icj9Ek6tu0AEcimbgg65qcuxE5/M18iRl8IJ/T1lcQdHWSTBT7kAT93ia7K50 orkrlkPKC/OeNf8XWHxd1oXSmekSs1va6dbILZf5Iibg9Bga59XQrcD1bE0tAA== 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 4Pydp03357zSDH; Fri, 14 Apr 2023 14:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EEI0Gn008488; Fri, 14 Apr 2023 14:18:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EEI0SQ008487; Fri, 14 Apr 2023 14:18:00 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:18:00 GMT Message-Id: <202304141418.33EEI0SQ008487@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 845903250cf5 - main - games/quaqut: fix build with -fno-common 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 845903250cf53a204237836e44c1b6f3c6410d1e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=845903250cf53a204237836e44c1b6f3c6410d1e commit 845903250cf53a204237836e44c1b6f3c6410d1e Author: Robert Clausecker AuthorDate: 2023-04-13 09:04:05 +0000 Commit: Robert Clausecker CommitDate: 2023-04-14 14:16:08 +0000 games/quaqut: fix build with -fno-common Move the definition of a global structure from header to source file. This unbreaks the build on FreeBSD 13+. While we are at it, regenerate patch and set LICENSE. --- games/quaqut/Makefile | 7 ++++--- games/quaqut/files/patch-display.c | 13 ------------- games/quaqut/files/patch-src_display.c | 13 +++++++++++++ games/quaqut/files/patch-src_network.c | 11 +++++++++++ games/quaqut/files/patch-src_quaqut.h | 11 +++++++++++ 5 files changed, 39 insertions(+), 16 deletions(-) diff --git a/games/quaqut/Makefile b/games/quaqut/Makefile index b19356f28a64..1661709cfd3b 100644 --- a/games/quaqut/Makefile +++ b/games/quaqut/Makefile @@ -1,5 +1,6 @@ PORTNAME= quaqut -PORTVERSION= 0.2.0 +DISTVERSION= 0.2.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20C%20sources/${PORTNAME}-${PORTVERSION} @@ -7,8 +8,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Queries information from Unreal Tournament 2004 game servers WWW= http://quaqut.sourceforge.net/ -BROKEN_FreeBSD_13= ld: error: duplicate symbol: quaqut -BROKEN_FreeBSD_14= ld: error: duplicate symbol: quaqut +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING HAS_CONFIGURE= yes USE_RC_SUBR= ${PORTNAME} diff --git a/games/quaqut/files/patch-display.c b/games/quaqut/files/patch-display.c deleted file mode 100644 index e77ea7166e26..000000000000 --- a/games/quaqut/files/patch-display.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/display.c.orig Tue Sep 28 22:49:58 2004 -+++ src/display.c Thu Oct 19 17:50:41 2006 -@@ -122,7 +122,9 @@ - - if ( quaqut.options & QUAQUT_OPTION_LOGFILE ) - fclose(destination); -- -+ else -+ fflush(stdout); -+ - return 1; - } - diff --git a/games/quaqut/files/patch-src_display.c b/games/quaqut/files/patch-src_display.c new file mode 100644 index 000000000000..a8a605ee5418 --- /dev/null +++ b/games/quaqut/files/patch-src_display.c @@ -0,0 +1,13 @@ +--- src/display.c.orig 2004-09-28 12:49:58 UTC ++++ src/display.c +@@ -122,7 +122,9 @@ int quaqut_display_process( int protocol , char comman + + if ( quaqut.options & QUAQUT_OPTION_LOGFILE ) + fclose(destination); +- ++ else ++ fflush(stdout); ++ + return 1; + } + diff --git a/games/quaqut/files/patch-src_network.c b/games/quaqut/files/patch-src_network.c new file mode 100644 index 000000000000..607b24debfff --- /dev/null +++ b/games/quaqut/files/patch-src_network.c @@ -0,0 +1,11 @@ +--- src/network.c.orig 2023-04-13 09:01:58 UTC ++++ src/network.c +@@ -22,6 +22,8 @@ + #include "quaqut.h" + #include "protocol.h" + ++struct quaqut quaqut; ++ + #ifdef _WIN_32_ + void quaqut_network_initwsa( void ); + void quaqut_network_shutwsa( void ); diff --git a/games/quaqut/files/patch-src_quaqut.h b/games/quaqut/files/patch-src_quaqut.h new file mode 100644 index 000000000000..7ca344a93387 --- /dev/null +++ b/games/quaqut/files/patch-src_quaqut.h @@ -0,0 +1,11 @@ +--- src/quaqut.h.orig 2023-04-13 09:01:23 UTC ++++ src/quaqut.h +@@ -114,7 +114,7 @@ int quaqut_utils_bufferize4bytes( unsigned char* , uns + int quaqut_utils_bufferizestring( unsigned char* , unsigned char* , int ); + + +-struct { ++extern struct quaqut { + + char command; + unsigned int options;