Date: Thu, 11 May 2023 05:24:41 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9361a944fd52 - main - games/qudos: do not patch the top GPL comment in two *.c files. Message-ID: <202305110524.34B5OfHm068552@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=9361a944fd52c7d782c24336086bc3c398145794 commit 9361a944fd52c7d782c24336086bc3c398145794 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2023-05-11 05:24:02 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2023-05-11 05:24:02 +0000 games/qudos: do not patch the top GPL comment in two *.c files. --- games/qudos/files/patch-src__client__snd_dma.c | 45 +++------------------ games/qudos/files/patch-src__unix__snd_sdl.c | 55 +------------------------- 2 files changed, 6 insertions(+), 94 deletions(-) diff --git a/games/qudos/files/patch-src__client__snd_dma.c b/games/qudos/files/patch-src__client__snd_dma.c index 98c604886a2e..da0f8db9730f 100644 --- a/games/qudos/files/patch-src__client__snd_dma.c +++ b/games/qudos/files/patch-src__client__snd_dma.c @@ -1,51 +1,16 @@ --- src/client/snd_dma.c.orig Fri Jun 9 16:42:59 2006 +++ src/client/snd_dma.c Thu Sep 13 20:17:11 2007 -@@ -1,27 +1,23 @@ - /* -- * Copyright (C) 1997-2001 Id Software, Inc. -- * -- * This program is free software; you can redistribute it and/or modify it under -- * the terms of the GNU General Public License as published by the Free -- * Software Foundation; either version 2 of the License, or (at your option) -- * any later version. -- * -- * This program is distributed in the hope that it will be useful, but WITHOUT -- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -- * FITNESS FOR A PARTICULAR PURPOSE. -- * -- * See the GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License along with -- * this program; if not, write to the Free Software Foundation, Inc., 59 -- * Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- * -- */ --/* snd_dma.c -- main control for any streaming sound output device */ -+Copyright (C) 1997-2001 Id Software, Inc. +@@ -19,10 +19,6 @@ + */ + /* snd_dma.c -- main control for any streaming sound output device */ -#include "client.h" -#include "snd_loc.h" -#include "snd_ogg.h" -+This program is free software; you can redistribute it and/or -+modify it under the terms of the GNU General Public License -+as published by the Free Software Foundation; either version 2 -+of the License, or (at your option) any later version. -+ -+This program is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+ -+See the GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with this program; if not, write to the Free Software -+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+*/ -+// snd_dma.c -- main control for any streaming sound output device - +- #if defined (__unix__) #include <sys/types.h> + #include <sys/stat.h> @@ -31,26 +27,30 @@ #include <dlfcn.h> #endif diff --git a/games/qudos/files/patch-src__unix__snd_sdl.c b/games/qudos/files/patch-src__unix__snd_sdl.c index 2d9f9a5ba3e2..cc8829544c48 100644 --- a/games/qudos/files/patch-src__unix__snd_sdl.c +++ b/games/qudos/files/patch-src__unix__snd_sdl.c @@ -1,59 +1,6 @@ --- src/unix/snd_sdl.c.orig Thu Sep 13 20:13:49 2007 +++ src/unix/snd_sdl.c Thu Sep 13 20:17:03 2007 -@@ -1,47 +1,47 @@ - /* -- * snd_sdl.c -- * -- * Sound code taken from SDLQuake and modified to work with Quake2 Robert Bäuml -- * 2001-12-25 -- * -- * This program is free software; you can redistribute it and/or modify it under -- * the terms of the GNU General Public License as published by the Free -- * Software Foundation; either version 2 of the License, or (at your option) -- * any later version. -- * -- * This program is distributed in the hope that it will be useful, but WITHOUT -- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -- * FITNESS FOR A PARTICULAR PURPOSE. -- * -- * See the GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License along with -- * this program; if not, write to: -- * -- * Free Software Foundation, Inc. 59 Temple Place - Suite 330 Boston, MA -- * 02111-1307, USA -- * -- * $Id: snd_sdl.c,v 1.2 2002/02/09 20:29:38 relnev Exp $ -- */ -+ snd_sdl.c -+ -+ Sound code taken from SDLQuake and modified to work with Quake2 -+ Robert B�ml 2001-12-25 -+ -+ This program is free software; you can redistribute it and/or -+ modify it under the terms of the GNU General Public License -+ as published by the Free Software Foundation; either version 2 -+ of the License, or (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+ -+ See the GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to: -+ -+ Free Software Foundation, Inc. -+ 59 Temple Place - Suite 330 -+ Boston, MA 02111-1307, USA -+ -+ $Id: snd_sdl.c,v 1.2 2002/02/09 20:29:38 relnev Exp $ -+*/ - - #include "SDL.h" - +@@ -29,19 +29,18 @@ #include "../client/client.h" #include "../client/snd_loc.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305110524.34B5OfHm068552>