From owner-svn-ports-head@FreeBSD.ORG  Tue Dec 23 21:09:46 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DA118E93;
 Tue, 23 Dec 2014 21:09:46 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C5BA43340;
 Tue, 23 Dec 2014 21:09:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBNL9k6E045725;
 Tue, 23 Dec 2014 21:09:46 GMT (envelope-from naddy@FreeBSD.org)
Received: (from naddy@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBNL9kwU045722;
 Tue, 23 Dec 2014 21:09:46 GMT (envelope-from naddy@FreeBSD.org)
Message-Id: <201412232109.sBNL9kwU045722@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: naddy set sender to
 naddy@FreeBSD.org using -f
From: Christian Weisgerber <naddy@FreeBSD.org>
Date: Tue, 23 Dec 2014 21:09:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r375356 - in head/multimedia/xmms: . 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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Dec 2014 21:09:47 -0000

Author: naddy
Date: Tue Dec 23 21:09:45 2014
New Revision: 375356
URL: https://svnweb.freebsd.org/changeset/ports/375356
QAT: https://qat.redports.org/buildarchive/r375356/

Log:
  Fix segfault in MikMod plugin with modern libmikmod.
  
  PR:		196180
  Submitted by:	Michael Lackner
  Obtained from:	Jakob Steltner (Arch Linux)

Added:
  head/multimedia/xmms/files/patch-Input_mikmod_drv__xmms.c   (contents, props changed)
Modified:
  head/multimedia/xmms/Makefile

Modified: head/multimedia/xmms/Makefile
==============================================================================
--- head/multimedia/xmms/Makefile	Tue Dec 23 20:58:43 2014	(r375355)
+++ head/multimedia/xmms/Makefile	Tue Dec 23 21:09:45 2014	(r375356)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xmms
 PORTVERSION=	1.2.11
-PORTREVISION=	25
+PORTREVISION=	26
 CATEGORIES=	multimedia audio ipv6
 MASTER_SITES=	http://www.xmms.org/files/1.2.x/ \
 		http://legacy.xmms2.org/ \

Added: head/multimedia/xmms/files/patch-Input_mikmod_drv__xmms.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/xmms/files/patch-Input_mikmod_drv__xmms.c	Tue Dec 23 21:09:45 2014	(r375356)
@@ -0,0 +1,21 @@
+--- Input/mikmod/drv_xmms.c.orig	2003-05-19 21:22:06 UTC
++++ Input/mikmod/drv_xmms.c
+@@ -117,6 +117,10 @@ static BOOL xmms_Reset(void)
+ 	return VC_Init();
+ }
+ 
++static void xmms_CommandLine(CHAR * commandLine)
++{
++}
++
+ MDRIVER drv_xmms =
+ {
+ 	NULL,
+@@ -127,6 +131,7 @@ MDRIVER drv_xmms =
+         "xmms",
+         NULL,
+ #endif
++        xmms_CommandLine, 
+         xmms_IsThere, 
+ 	VC_SampleLoad,
+ 	VC_SampleUnload,