From owner-svn-ports-head@FreeBSD.ORG Thu Sep 5 07:22:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 657DE6C0; Thu, 5 Sep 2013 07:22:48 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 52881219B; Thu, 5 Sep 2013 07:22:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r857Mmx1013806; Thu, 5 Sep 2013 07:22:48 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r857MlVH013803; Thu, 5 Sep 2013 07:22:47 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201309050722.r857MlVH013803@svn.freebsd.org> From: Alexey Dokuchaev Date: Thu, 5 Sep 2013 07:22:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326360 - in head/games/quetoo: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Sep 2013 07:22:48 -0000 Author: danfe Date: Thu Sep 5 07:22:47 2013 New Revision: 326360 URL: http://svnweb.freebsd.org/changeset/ports/326360 Log: - Fix the build against Clang - Drop the check for old OSVERSION - Improve OPTIONS descriptions - Remove non-working WWW line - Add LICENSE (GPLv2) while here Reported by: pkg-fallout Added: head/games/quetoo/files/patch-clang-fixes (contents, props changed) Modified: head/games/quetoo/Makefile head/games/quetoo/pkg-descr Modified: head/games/quetoo/Makefile ============================================================================== --- head/games/quetoo/Makefile Thu Sep 5 07:00:07 2013 (r326359) +++ head/games/quetoo/Makefile Thu Sep 5 07:22:47 2013 (r326360) @@ -11,6 +11,8 @@ MASTER_SITES= http://tastyspleen.net/~jd MAINTAINER= danfe@FreeBSD.org COMMENT= Fast, stable, compatible, and secure Quake II client +LICENSE= GPLv2 + USE_BZIP2= yes USE_SDL= sdl USE_GL= glut @@ -30,10 +32,10 @@ OPTIONS_DEFINE= GAME CTF VANCTF QMASS MY # they're available via `quake2-data' and `quake2-ctf' ports. OPTIONS_DEFAULT= VANCTF QMASS -GAME_DESC= Build main game shared object file -CTF_DESC= Build Capture The Flag modification -VANCTF_DESC= Build Vanilla CTF modification -QMASS_DESC= Build QMass deathmatch modification +GAME_DESC= Build main game (default mod) +CTF_DESC= Build Capture The Flag mod +VANCTF_DESC= Build Vanilla CTF mod +QMASS_DESC= Build QMass deathmatch mod MYSQL_DESC= Enable frag logging with MySQL .include @@ -85,9 +87,6 @@ post-patch: .SILENT ${REINPLACE_CMD} -E 's,^(eval PKGDATADIR=).*$$,\1"${Q2DIR}", ; \ 19752s,sdl-config,${SDL_CONFIG}, ; \ s,^(GAME_MODULES=")baseq2",\1",' ${WRKSRC}/configure -.if ${OSVERSION} < 800501 - ${REINPLACE_CMD} -e 's,const struct,struct,' ${WRKSRC}/src/files.c -.endif ${REINPLACE_CMD} -e 's,-ldl,,' ${WRKSRC}/src/Makefile.in do-install: Added: head/games/quetoo/files/patch-clang-fixes ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/quetoo/files/patch-clang-fixes Thu Sep 5 07:22:47 2013 (r326360) @@ -0,0 +1,53 @@ +--- src/sv_user.c.orig 2007-12-28 07:25:47.000000000 +0800 ++++ src/sv_user.c 2013-09-05 14:53:30.000000000 +0800 +@@ -363,7 +363,7 @@ void SV_Info_f(void){ + continue; //only print serverinfo cvars + + snprintf(line, MAX_STRING_CHARS, "%s %s\n", cvar->name, cvar->string); +- SV_ClientPrintf(sv_client, PRINT_MEDIUM, line); ++ SV_ClientPrintf(sv_client, PRINT_MEDIUM, "%s", line); + } + } + +--- src/cl_main.c.orig 2007-12-28 07:25:47.000000000 +0800 ++++ src/cl_main.c 2013-09-05 14:53:30.000000000 +0800 +@@ -691,7 +691,7 @@ void CL_Ping_f(void){ + } + + if(!adr.port) adr.port = BigShort(PORT_SERVER); +- Netchan_OutOfBandPrint(NS_CLIENT, adr, va("info %i", PROTOCOL_34)); ++ Netchan_OutOfBandPrint(NS_CLIENT, adr, "info %i", PROTOCOL_34); + return; + } + +@@ -700,7 +700,7 @@ void CL_Ping_f(void){ + + adr.type = NA_IP_BROADCAST; + adr.port = BigShort(PORT_SERVER); +- Netchan_OutOfBandPrint(NS_CLIENT, adr, va("info %i", PROTOCOL_34)); ++ Netchan_OutOfBandPrint(NS_CLIENT, adr, "info %i", PROTOCOL_34); + } + + +--- src/cl_keys.c.orig 2007-12-28 07:25:47.000000000 +0800 ++++ src/cl_keys.c 2013-09-05 14:53:30.000000000 +0800 +@@ -143,7 +143,7 @@ void CompleteCommand(void){ + cvar = Cvar_CompleteVariable(partial, &cvars); //partial cvar lookup + if(cvar && !strcmp(cvar, partial)) goto append; //exact match + +- if(cmds == 1 && cvars == 0) cmd = cmd; ++ if(cmds == 1 && cvars == 0); + else if(cmds == 0 && cvars == 1) cmd = cvar; + else cmd = NULL; + +--- src/qmass/g_cmds.c.orig 2007-12-28 07:25:44.000000000 +0800 ++++ src/qmass/g_cmds.c 2013-09-05 14:53:30.000000000 +0800 +@@ -724,7 +724,7 @@ void Cmd_Say_f(edict_t *ent, qboolean te + + if(chatlog != NULL){ //write chatlog + +- fprintf(chatlog, text); ++ fprintf(chatlog, "%s", text); + + fflush(chatlog); + } Modified: head/games/quetoo/pkg-descr ============================================================================== --- head/games/quetoo/pkg-descr Thu Sep 5 07:00:07 2013 (r326359) +++ head/games/quetoo/pkg-descr Thu Sep 5 07:22:47 2013 (r326360) @@ -20,5 +20,3 @@ following features will sound good to yo * Vastly improved console with Bash-style tab completion, positioned editing, mouse wheel scrolling, etc. * Optional deathmatch mod with MySQL frag logging and team play - -WWW: http://jdolan.dyndns.org/trac/wiki/Quetoo