7 files changed, 19 insertions, 68 deletions

diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index 532c62c55fef..b980de68fed2 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	sdl_mixer
-PORTVERSION=	1.2.6
-PORTREVISION=	2
+PORTVERSION=	1.2.7
+PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 DISTNAME=	SDL_mixer-${PORTVERSION}
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 OPTIONS=	MIKMOD "Enable MOD music via libMikMod" on \
 		VORBIS "Enable Ogg Vorbis music" on \
diff --git a/audio/sdl_mixer/distinfo b/audio/sdl_mixer/distinfo
index 1edd13b542e6..2052714ba790 100644
--- a/audio/sdl_mixer/distinfo
+++ b/audio/sdl_mixer/distinfo
@@ -1,3 +1,3 @@
-MD5 (SDL_mixer-1.2.6.tar.gz) = 2b8beffad9179d80e598c22c80efb135
-SHA256 (SDL_mixer-1.2.6.tar.gz) = 89f94840b1b42ddfe53a8aee415331516f1bbdd942b42d25e74906a332cdf22a
-SIZE (SDL_mixer-1.2.6.tar.gz) = 1147838
+MD5 (SDL_mixer-1.2.7.tar.gz) = 7959b89c8f8f1564ca90968f6c88fa1e
+SHA256 (SDL_mixer-1.2.7.tar.gz) = bb3197285d8dc95a09068bbddefdf34c8b08ded8975bcc169050ff2bfded2ea4
+SIZE (SDL_mixer-1.2.7.tar.gz) = 1960614
diff --git a/audio/sdl_mixer/files/patch-Makefile.in b/audio/sdl_mixer/files/patch-Makefile.in
new file mode 100644
index 000000000000..b4c7a8df98fb
--- /dev/null
+++ b/audio/sdl_mixer/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Thu Aug 31 14:23:43 2006
++++ Makefile.in	Thu Aug 31 14:23:54 2006
+@@ -41,7 +41,7 @@
+ LT_CURRENT  = @LT_CURRENT@
+ LT_RELEASE  = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+-LT_LDFLAGS  = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++LT_LDFLAGS  = -no-undefined -rpath $(libdir) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE)
+ 
diff --git a/audio/sdl_mixer/files/patch-aa b/audio/sdl_mixer/files/patch-aa
deleted file mode 100644
index 6ede2a503503..000000000000
--- a/audio/sdl_mixer/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig
-+++ Makefile.in
-@@ -254,7 +254,7 @@
- lib_LTLIBRARIES = libSDL_mixer.la
- SUBDIRS = @MUSIC_SUBDIRS@
- DIST_SUBDIRS = mikmod timidity native_midi native_midi_gpl
--libSDL_mixerincludedir = $(includedir)/SDL
-+libSDL_mixerincludedir = $(includedir)/SDL11
- libSDL_mixerinclude_HEADERS = \
- 	SDL_mixer.h
- 
-@@ -297,7 +297,6 @@
- 
- libSDL_mixer_la_LDFLAGS = \
- 	-no-undefined		\
--	-release $(LT_RELEASE)	\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- 	-export-symbols-regex Mix_.*
- 
diff --git a/audio/sdl_mixer/files/patch-ab b/audio/sdl_mixer/files/patch-ab
deleted file mode 100644
index 66de8aa6beec..000000000000
--- a/audio/sdl_mixer/files/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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-ac b/audio/sdl_mixer/files/patch-ac
deleted file mode 100644
index f4e45d1285e8..000000000000
--- a/audio/sdl_mixer/files/patch-ac
+++ /dev/null
@@ -1,25 +0,0 @@
---- timidity/config.h.orig	Mon Jul  3 07:36:37 2000
-+++ timidity/config.h	Sat Nov 18 18:47:45 2000
-@@ -159,6 +159,22 @@
- # endif
- #endif /* linux */
- 
-+#ifdef __FreeBSD__
-+#include <errno.h>
-+#include <machine/endian.h>
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#undef BIG_ENDIAN
-+#undef PDP_ENDIAN
-+#elif BYTE_ORDER == BIG_ENDIAN
-+#undef LITTLE_ENDIAN
-+#undef PDP_ENDIAN
-+#else
-+# error No valid byte sex defined
-+#endif
-+#define USE_LDEXP
-+#define PI M_PI
-+#endif
-+
- /* Win32 on Intel machines */
- #ifdef __WIN32__
- #  define LITTLE_ENDIAN
diff --git a/audio/sdl_mixer/pkg-plist b/audio/sdl_mixer/pkg-plist
index e9670914d848..2f5d237ac04d 100644
--- a/audio/sdl_mixer/pkg-plist
+++ b/audio/sdl_mixer/pkg-plist
@@ -1,5 +1,6 @@
-include/SDL11/SDL_mixer.h
+include/SDL/SDL_mixer.h
 lib/libSDL_mixer.a
 lib/libSDL_mixer.la
 lib/libSDL_mixer.so
 lib/libSDL_mixer.so.2
+@dirrmtry include/SDL