From nobody Thu May 11 05:24:41 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 4QH0h92zwdz49k1P; Thu, 11 May 2023 05:24:41 +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 4QH0h92C3gz4Lj9; Thu, 11 May 2023 05:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683782681; 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=HO3Mm8lV2/xpQZRzuRZ32Ptu1OHR9CDdoplWl9WXgOw=; b=T1S8z4qscw9pvClZS90/Ic1eJrDXfIa+GIdL4J98krpb1WNkPbys05SC6Qb1TL/jL+rvrQ ZNE5qy71ajf9jTDy74JTgadz+Ga86YjwTOpqCGc56cHlGTgugEcFg44Sdg6E39Tyq/8711 8QecCSgwGZaDeDgALR9D4gytKZEoEx6gOmMFfs0YghXyUYkMqqvFzv8bEyGn3JojD/KYWB H2869qNnIgCV9nfASkirM7gxLqdg45CBW0ckwNWGveAePxT/tpuvujLfdCoiDuxU21AFyR T+q59ovP7p9l2KXsHseUdsnYUXI6iT2KMBah4Z4ABBgBcHZO6TBZsHTQWQCW1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683782681; 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=HO3Mm8lV2/xpQZRzuRZ32Ptu1OHR9CDdoplWl9WXgOw=; b=Gxz++8ZVtnFHj0SwMAXXPyqwIjo/TZD48craY6bufFMjK3rYBAMLyz0peetx9NIjdeJNYL EDnKKOFCRtF4MbeXsTmFZ6V//3gltMLj5lgBXz/cBRjdBxhnXPsXSUcvk7jzUaNNG59rvO 7tWlkjcHTblhA2214QQYFYxK8ByacxV2sSlo6dMx5rOX0eNrT1S59gQkvVF43hX1ywRvQA T7VAeqHvfjBsE58qZH3skdPvttHLcJ6mRoA1MgIpAMVwGnKdqjxGqDill+J8igLzi37DRQ /wpr+dg4lKD8QP0Dh7WJjwX7mbKQmgvTiYBt5JXDZ/319dtkRsXlHtAgmvlqdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683782681; a=rsa-sha256; cv=none; b=QNCzgObU0VZmRZg4xEULLuIpk86J4kMigUx0v9Dwo87ueGwTsH3K9tRk8HDg8TxEyumFNE 71tOgJBjjyiuHvgbaEuAtPg3q9UkAVFTSk/ymY4J0pdaTn/Nx1UzHykxfhb8ww9b21r7iO d497OpzkJaaWFueeh4cwH193/z58H8x/mX/Mng3DMa0dPASKj4INbRgjgJ3GeFm0Tn5jOo It/DWcccOGdZ8wwaf7HBMQiAGqp5dx6krDKpg7oLDLn+G0iSaKAYjyZtQ72tsmmVyaO+IH e3le4AucY3O5qYZznz+B/6u6HaV7hTJxBa8Ca+f63sBvMW0pBcIwcKofLIt0ng== 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 4QH0h91Gnmzg8K; Thu, 11 May 2023 05:24:41 +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 34B5Ofag068553; Thu, 11 May 2023 05:24:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34B5OfHm068552; Thu, 11 May 2023 05:24:41 GMT (envelope-from git) Date: Thu, 11 May 2023 05:24:41 GMT Message-Id: <202305110524.34B5OfHm068552@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: 9361a944fd52 - main - games/qudos: do not patch the top GPL comment in two *.c files. 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: 9361a944fd52c7d782c24336086bc3c398145794 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=9361a944fd52c7d782c24336086bc3c398145794 commit 9361a944fd52c7d782c24336086bc3c398145794 Author: Alexey Dokuchaev AuthorDate: 2023-05-11 05:24:02 +0000 Commit: Alexey Dokuchaev 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 + #include @@ -31,26 +27,30 @@ #include #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"