From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Oct 2 19:10:05 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ACD52106566B for ; Sun, 2 Oct 2011 19:10:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 8193B8FC0A for ; Sun, 2 Oct 2011 19:10:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p92JA54i012213 for ; Sun, 2 Oct 2011 19:10:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p92JA52W012212; Sun, 2 Oct 2011 19:10:05 GMT (envelope-from gnats) Resent-Date: Sun, 2 Oct 2011 19:10:05 GMT Resent-Message-Id: <201110021910.p92JA52W012212@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Naram Qashat Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1EA3B106566B for ; Sun, 2 Oct 2011 19:05:17 +0000 (UTC) (envelope-from root@cyberbotx.com) Received: from qmta05.westchester.pa.mail.comcast.net (qmta05.westchester.pa.mail.comcast.net [76.96.62.48]) by mx1.freebsd.org (Postfix) with ESMTP id D81748FC08 for ; Sun, 2 Oct 2011 19:05:16 +0000 (UTC) Received: from omta24.westchester.pa.mail.comcast.net ([76.96.62.76]) by qmta05.westchester.pa.mail.comcast.net with comcast id fu6U1h0021ei1Bg55v5HvF; Sun, 02 Oct 2011 19:05:17 +0000 Received: from kirby.cyberbotx.com ([69.244.146.119]) by omta24.westchester.pa.mail.comcast.net with comcast id fv5G1h00H2anbQt3kv5GPz; Sun, 02 Oct 2011 19:05:16 +0000 Received: by kirby.cyberbotx.com (Postfix, from userid 0) id 9788928440; Sun, 2 Oct 2011 15:05:14 -0400 (EDT) Message-Id: <20111002190514.9788928440@kirby.cyberbotx.com> Date: Sun, 2 Oct 2011 15:05:14 -0400 (EDT) From: Naram Qashat To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/161244: [PATCH] audio/libmikmod: fix failed patching X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Naram Qashat List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 19:10:05 -0000 >Number: 161244 >Category: ports >Synopsis: [PATCH] audio/libmikmod: fix failed patching >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Oct 02 19:10:05 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Naram Qashat >Release: FreeBSD 8.2-RELEASE amd64 >Organization: >Environment: System: FreeBSD kirby.cyberbotx.com 8.2-RELEASE FreeBSD 8.2-RELEASE #3: Sun Feb 27 08:58:31 EST 2011 root@kirby.cyberbotx.com:/usr/obj/usr/src/sys/CBXKERN amd64 >Description: - Fix failed patching of audio/libmikmod due to 2 patch files trying to patch the same file. Removed file(s): - files/patch-playercode-mloader.c >How-To-Repeat: >Fix: --- libmikmod.patch begins here --- diff -ruN /usr/ports/audio/libmikmod/files/patch-playercode-mloader.c /kirby/shared/ports/libmikmod/files/patch-playercode-mloader.c --- /usr/ports/audio/libmikmod/files/patch-playercode-mloader.c 2010-05-02 17:33:53.000000000 -0400 +++ /kirby/shared/ports/libmikmod/files/patch-playercode-mloader.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,19 +0,0 @@ ---- playercode/mloader.c.orig 2010-05-02 17:31:03.000000000 -0400 -+++ playercode/mloader.c 2010-05-02 17:32:25.000000000 -0400 -@@ -450,10 +450,12 @@ - if (!l->Init || l->Init()) { - _mm_rewind(modreader); - ok = l->Load(curious); -- /* propagate inflags=flags for in-module samples */ -- for (t = 0; t < of.numsmp; t++) -- if (of.samples[t].inflags == 0) -- of.samples[t].inflags = of.samples[t].flags; -+ if (ok) { -+ /* propagate inflags=flags for in-module samples */ -+ for (t = 0; t < of.numsmp; t++) -+ if (of.samples[t].inflags == 0) -+ of.samples[t].inflags = of.samples[t].flags; -+ } - } else - ok = 0; - --- libmikmod.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: