Update to version 1.2.5.

Based on a patch sent by Soren Jacobsen via PR pkg/21525.

Changes:

- handle the patching in a simpler way
- style nits

1.2.5:
======
- Worked around MacOS X deadlock between CoreAudio and QuickTime
- Fixed crash in native midi code with files with more than 32 tracks
- Added 8SVX format support to the AIFF loader
- Fixed volume control on WAVE music chunks
- Fixed volume control on MOD music chunks
- Added support for the Atari platform
- Patch from Steven Fuller to fix panning effect with 8-bit sounds.
- Patch from guy on 3DRealms forums to fix native win32 midi volume.
- Small, looping music samples should now be able to fade out correctly.
- Added shared library support for MacOS X
- Correctly report an error when using an unknown filetype
- Added support for loading Ogg Vorbis samples as an audio chunk
- Fixed to start playing another sample immediately when one finishes
- Fixed a volume bug when calling Mix_HaltChannel() on unused channel
- Fixed volume reset bug at end of channel fade.
- Mix_LoadMUS() will now accept an MP3 by file extension, instead of relying
  entirely on the magic number.

6 files changed, 22 insertions, 22 deletions

diff --git a/audio/SDL_mixer/DESCR b/audio/SDL_mixer/DESCR
index 18b7f9ca7f8..cda3c9d2cde 100644
--- a/audio/SDL_mixer/DESCR
+++ b/audio/SDL_mixer/DESCR
@@ -1,4 +1,4 @@
-  SDL_mixer is a sample multi-channel audio mixer library.  It supports
-any number of simultaneously playing channels of 16 bit stereo audio, plus
+SDL_mixer is a sample multi-channel audio mixer library.  It supports any
+number of simultaneously playing channels of 16 bit stereo audio, plus
 a single channel of music, mixed by the popular MikMod MOD, Timidity MIDI,
 Ogg Vorbis, and SMPEG MP3 libraries.
diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile
index ba3c37de526..a90dcf5a56e 100644
--- a/audio/SDL_mixer/Makefile
+++ b/audio/SDL_mixer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/05/02 11:53:36 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/11 02:23:18 salo Exp $
 #
 
-DISTNAME=		SDL_mixer-1.2.4
-PKGREVISION=		2
+DISTNAME=		SDL_mixer-1.2.5
 CATEGORIES=		audio
 MASTER_SITES=		http://www.libsdl.org/projects/SDL_mixer/release/
 
@@ -12,19 +11,19 @@ COMMENT=		multi-channel audio mixer library
 
 CONFLICTS=		SDL-mixer-[0-9]*
 
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_X11=		YES
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-USE_BUILDLINK2=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-CPPFLAGS+=		-Dunix=1
+CPPFLAGS=		-Dunix=1
+CFLAGS=			-DPREFIX=\"\\\"${PREFIX}\\\"\"
 
-post-configure:
-	${SED} -e "s|@PREFIX@|${PREFIX}|" ${WRKSRC}/timidity/config.h \
-		> ${WRKSRC}/timidity/config.h.patched
-	${MV} ${WRKSRC}/timidity/config.h.patched ${WRKSRC}/timidity/config.h
+post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/.libs/playmus ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/.libs/playwave ${PREFIX}/bin
 
 .include "../../audio/libogg/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
diff --git a/audio/SDL_mixer/PLIST b/audio/SDL_mixer/PLIST
index 07109f9e46a..5f4e766af13 100644
--- a/audio/SDL_mixer/PLIST
+++ b/audio/SDL_mixer/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/03 08:17:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/05/11 02:23:18 salo Exp $
 bin/playmus
 bin/playwave
 include/SDL/SDL_mixer.h
 lib/libSDL_mixer-1.2.so
 lib/libSDL_mixer-1.2.so.2
-lib/libSDL_mixer-1.2.so.2.2
+lib/libSDL_mixer-1.2.so.2.3
 lib/libSDL_mixer.a
 lib/libSDL_mixer.la
 lib/libSDL_mixer.so
diff --git a/audio/SDL_mixer/buildlink2.mk b/audio/SDL_mixer/buildlink2.mk
index 6b210d202a2..c2bb616841e 100644
--- a/audio/SDL_mixer/buildlink2.mk
+++ b/audio/SDL_mixer/buildlink2.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:53:36 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/11 02:23:18 salo Exp $
+#
 
 .if !defined(SDL_MIXER_BUILDLINK2_MK)
 SDL_MIXER_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		SDL_mixer
-BUILDLINK_DEPENDS.SDL_mixer?=	SDL_mixer>=1.2.4nb2
+BUILDLINK_DEPENDS.SDL_mixer?=	SDL_mixer>=1.2.5
 BUILDLINK_PKGSRCDIR.SDL_mixer?=	../../audio/SDL_mixer
 
 EVAL_PREFIX+=				BUILDLINK_PREFIX.SDL_mixer=SDL_mixer
diff --git a/audio/SDL_mixer/distinfo b/audio/SDL_mixer/distinfo
index 8a1c68d2721..4d82309a0e5 100644
--- a/audio/SDL_mixer/distinfo
+++ b/audio/SDL_mixer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/04/03 08:17:22 wiz Exp $
+$NetBSD: distinfo,v 1.2 2003/05/11 02:23:19 salo Exp $
 
-SHA1 (SDL_mixer-1.2.4.tar.gz) = 96c4d173382d3eaefa3a837c388d5f50f34a7d11
-Size (SDL_mixer-1.2.4.tar.gz) = 955542 bytes
-SHA1 (patch-aa) = dc8f4f72e347caaa3c470b3757dd124850ff3059
+SHA1 (SDL_mixer-1.2.5.tar.gz) = 48c7c7143f0a0a21e94e743ca0fafd7ae33f62dd
+Size (SDL_mixer-1.2.5.tar.gz) = 936765 bytes
+SHA1 (patch-aa) = c55dcaf2251370131d90d6834eb8244c08342d98
diff --git a/audio/SDL_mixer/patches/patch-aa b/audio/SDL_mixer/patches/patch-aa
index b1f99b01f28..131bdc37484 100644
--- a/audio/SDL_mixer/patches/patch-aa
+++ b/audio/SDL_mixer/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/04/03 08:17:22 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2003/05/11 02:23:19 salo Exp $
 
 --- timidity/config.h.orig	Mon Mar 24 00:04:57 2003
 +++ timidity/config.h	Mon Mar 24 00:06:06 2003
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/04/03 08:17:22 wiz 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	PREFIX"/share/timidity/timidity.cfg"
  #ifdef __WIN32__
  #define DEFAULT_PATH	"\\TIMIDITY"
  #else