Date: Fri, 14 Apr 2023 14:18:00 GMT From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 845903250cf5 - main - games/quaqut: fix build with -fno-common Message-ID: <202304141418.33EEI0SQ008487@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=845903250cf53a204237836e44c1b6f3c6410d1e commit 845903250cf53a204237836e44c1b6f3c6410d1e Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2023-04-13 09:04:05 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304141418.33EEI0SQ008487>