From 77dd3eb7d423e7426af4940f7ced8347ca06c06a Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Wed, 1 Jun 2005 14:11:26 +0000
Subject: Update to 1.2.6nb2: Fix MIDI playback. Remove configuration option
 that defaults to yes. From ISIHARA Takanori in PR 30330.

---
 audio/SDL_mixer/MESSAGE          | 8 ++++++--
 audio/SDL_mixer/Makefile         | 7 +++----
 audio/SDL_mixer/distinfo         | 4 ++--
 audio/SDL_mixer/patches/patch-aa | 4 ++--
 4 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'audio/SDL_mixer')

diff --git a/audio/SDL_mixer/MESSAGE b/audio/SDL_mixer/MESSAGE
index d170737ae8f..17621ec7555 100644
--- a/audio/SDL_mixer/MESSAGE
+++ b/audio/SDL_mixer/MESSAGE
@@ -1,7 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/05/12 18:38:07 reed Exp $
+$NetBSD: MESSAGE,v 1.3 2005/06/01 14:11:26 wiz Exp $
 
 To make use of the MIDI capabilities in the SDL_mixer package, you
-must install either the audio/eawpatches or audio/guspatches packages.
+must install any of these packages:
+
+	audio/freepats
+	audio/eawpatches
+	audio/guspatches
 
 ===========================================================================
diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile
index a5204f5fd5f..80d5fdd6c20 100644
--- a/audio/SDL_mixer/Makefile
+++ b/audio/SDL_mixer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:44:51 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/06/01 14:11:26 wiz Exp $
 
 DISTNAME=	SDL_mixer-1.2.6
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 
@@ -16,10 +16,9 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_LIBTOOL=		YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=        --enable-music-ogg
 
 CPPFLAGS=		-Dunix=1
-CFLAGS=			-DPREFIX="\"${PREFIX}\""
+CFLAGS=			-DSYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 
 INSTALLATION_DIRS=	bin
 
diff --git a/audio/SDL_mixer/distinfo b/audio/SDL_mixer/distinfo
index 32afa9676ac..93bb7f21c93 100644
--- a/audio/SDL_mixer/distinfo
+++ b/audio/SDL_mixer/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 20:39:42 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/06/01 14:11:26 wiz Exp $
 
 SHA1 (SDL_mixer-1.2.6.tar.gz) = d8e09d87a750c4bd989f0a3e4f1b6baff601b8f1
 RMD160 (SDL_mixer-1.2.6.tar.gz) = f20e3b7db266d9a0da75f2319dcc403d869907e6
 Size (SDL_mixer-1.2.6.tar.gz) = 1147838 bytes
-SHA1 (patch-aa) = 8f6b53ee69251e666538dfdbaf1ff481c73eb7ef
+SHA1 (patch-aa) = 1e4de54337d13e3c8407ca4bd6cc0b8777b6992f
diff --git a/audio/SDL_mixer/patches/patch-aa b/audio/SDL_mixer/patches/patch-aa
index 2b36e08c153..d6aa6aec985 100644
--- a/audio/SDL_mixer/patches/patch-aa
+++ b/audio/SDL_mixer/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2005/01/05 12:20:37 adam Exp $
+$NetBSD: patch-aa,v 1.4 2005/06/01 14:11:26 wiz Exp $
 
 --- timidity/config.h.orig	2004-12-16 05:20:14.000000000 +0000
 +++ timidity/config.h
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.3 2005/01/05 12:20:37 adam Exp $
  /* You could specify a complete path, e.g. "/etc/timidity.cfg", and
     then specify the library directory in the configuration file. */
 -#define CONFIG_FILE	"timidity.cfg"
-+#define CONFIG_FILE	PREFIX"/share/timidity/timidity.cfg"
++#define CONFIG_FILE	SYSCONFDIR"/timidity.cfg"
  #ifdef __WIN32__
  #define DEFAULT_PATH	"\\TIMIDITY"
  #else
-- 
cgit v1.2.3