6 files changed, 20 insertions, 55 deletions

diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index e9f0025815f6..392fb5812bb4 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sdl_mixer
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 DISTNAME=	SDL_mixer-${PORTVERSION}
diff --git a/audio/sdl_mixer/distinfo b/audio/sdl_mixer/distinfo
index dfad2adeb267..5791b60d9520 100644
--- a/audio/sdl_mixer/distinfo
+++ b/audio/sdl_mixer/distinfo
@@ -1 +1 @@
-MD5 (SDL_mixer-1.2.0.tar.gz) = 3348f6b971b9acf54dbc74d5c57abc63
+MD5 (SDL_mixer-1.2.1.tar.gz) = d69327883d91543f76514194450b1b04
diff --git a/audio/sdl_mixer/files/patch-aa b/audio/sdl_mixer/files/patch-aa
index 07abb9fab55e..3bbfc412e84e 100644
--- a/audio/sdl_mixer/files/patch-aa
+++ b/audio/sdl_mixer/files/patch-aa
@@ -1,23 +1,23 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Thu Nov 30 06:50:20 2000
-+++ Makefile.in	Mon Jan 29 20:20:33 2001
-@@ -91,7 +91,7 @@
+--- Makefile.in.orig	Wed Dec 19 00:04:36 2001
++++ Makefile.in	Wed Dec 19 14:31:08 2001
+@@ -93,7 +93,7 @@
  SUBDIRS = @MUSIC_SUBDIRS@
- DIST_SUBIDRS = mikmod timidity
+ DIST_SUBDIRS = mikmod timidity native_midi
  
 -libSDL_mixerincludedir = $(includedir)/SDL
 +libSDL_mixerincludedir = $(includedir)/SDL11
  libSDL_mixerinclude_HEADERS =  	SDL_mixer.h
  
  
-@@ -105,7 +105,7 @@
- EXTRA_DIST =  	CHANGES				VisualC.zip			MPWmake.sea.hqx			CWprojects.sea.hqx		autogen.sh
+@@ -109,7 +109,7 @@
+ EXTRA_DIST =  	CHANGES				VisualC.zip			PBProjects.tar.gz		MPWmake.sea.bin			CWprojects.sea.hqx		SDL_mixer.spec			SDL_mixer.spec.in		autogen.sh
  
  
--libSDL_mixer_la_LDFLAGS =          -release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libSDL_mixer_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+-libSDL_mixer_la_LDFLAGS =  	-release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libSDL_mixer_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
- libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
+ libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) $(NATIVE_MIDI_LIB)
  
diff --git a/audio/sdl_mixer/files/patch-ab b/audio/sdl_mixer/files/patch-ab
index 8eab788ef74d..66de8aa6beec 100644
--- a/audio/sdl_mixer/files/patch-ab
+++ b/audio/sdl_mixer/files/patch-ab
@@ -1,20 +1,14 @@
 
 $FreeBSD$
 
---- configure.orig	Fri Apr  6 01:56:54 2001
-+++ configure	Fri Apr  6 16:01:40 2001
-@@ -569,10 +569,10 @@
- # set BINARY_AGE and INTERFACE_AGE to 0.
- 
- MAJOR_VERSION=1
--MINOR_VERSION=2
--MICRO_VERSION=0
--INTERFACE_AGE=0
--BINARY_AGE=0
-+MINOR_VERSION=0
-+MICRO_VERSION=6
-+INTERFACE_AGE=4
-+BINARY_AGE=6
- VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
+--- configure	2001/12/19 12:37:01	1.1
++++ configure	2001/12/19 12:37:51
+@@ -588,7 +588,7 @@
  
+ # libtool versioning
+ LT_RELEASE=$MAJOR_VERSION.$MINOR_VERSION
+-LT_CURRENT=`expr $MICRO_VERSION - $INTERFACE_AGE`
++LT_CURRENT=2
+ LT_REVISION=$INTERFACE_AGE
+ LT_AGE=`expr $BINARY_AGE - $INTERFACE_AGE`
  
diff --git a/audio/sdl_mixer/files/patch-ad b/audio/sdl_mixer/files/patch-ad
deleted file mode 100644
index de5965d20b66..000000000000
--- a/audio/sdl_mixer/files/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
---- timidity/resample.c.orig	Tue Feb  1 23:16:29 2000
-+++ timidity/resample.c	Mon Apr 24 12:53:27 2000
-@@ -22,7 +22,11 @@
- 
- #include <math.h>
- #include <stdio.h>
-+#ifdef __FreeBSD__
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- 
- #include "config.h"
- #include "common.h"
diff --git a/audio/sdl_mixer/files/patch-ae b/audio/sdl_mixer/files/patch-ae
deleted file mode 100644
index b4c308e879fb..000000000000
--- a/audio/sdl_mixer/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- timidity/mix.c.orig	Tue Feb  1 23:16:29 2000
-+++ timidity/mix.c	Mon Apr 24 12:53:27 2000
-@@ -23,7 +23,11 @@
- 
- #include <math.h>
- #include <stdio.h>
-+#ifdef __FreeBSD__
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- 
- #include "config.h"
- #include "common.h"