4 files changed, 22 insertions, 28 deletions

diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index 9bc2c0b931dc..2097dad55ceb 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -6,45 +6,49 @@
 #
 
 PORTNAME=	sdl_mixer
-PORTVERSION=	1.2.7
-PORTREVISION=	2
+PORTVERSION=	1.2.8
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 DISTNAME=	SDL_mixer-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mva@sysfault.org
 COMMENT=	A sample multi-channel audio mixer library
 
+USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl
 USE_GMAKE=	yes
 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"
+CPPFLAGS+=	-DCONFIG_FILE_ETC_TIMIDITY \"${LOCALBASE}/etc/timidity.cfg\"
 USE_LDCONFIG=	yes
 
-OPTIONS=	MIKMOD "Enable MOD music via libMikMod" on \
-		VORBIS "Enable Ogg Vorbis music" on \
-		SMPEG "Enable MP3 music via SMPEG" on
+OPTIONS=	MIKMOD		"Enable MOD music via libMikMod"	On \
+		SMPEG		"Enable MP3 music via SMPEG"		On \
+		VORBIS		"Enable Ogg Vorbis music"		On
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_MIKMOD)
-CONFIGURE_ARGS+=	--disable-music-libmikmod
+CONFIGURE_ARGS+=--disable-music-libmikmod
 .else
 LIB_DEPENDS=	mikmod.2:${PORTSDIR}/audio/libmikmod
+CONFIGURE_ARGS+=--enable-music-libmikmod
 .endif
 
-.if defined(WITHOUT_VORBIS)
-CONFIGURE_ARGS+=	--disable-music-ogg
+.if defined(WITHOUT_SMPEG)
+CONFIGURE_ARGS+=--disable-music-mp3
 .else
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	smpeg.1:${PORTSDIR}/multimedia/smpeg
+CONFIGURE_ARGS+=--enable-music-mp3
 .endif
 
-.if defined(WITHOUT_SMPEG)
-CONFIGURE_ARGS+=	--disable-music-mp3
+.if defined(WITHOUT_VORBIS)
+CONFIGURE_ARGS+=--disable-music-ogg
 .else
-LIB_DEPENDS+=	smpeg.1:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+CONFIGURE_ARGS+=--enable-music-ogg
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/sdl_mixer/distinfo b/audio/sdl_mixer/distinfo
index 2052714ba790..322c1508b0bd 100644
--- a/audio/sdl_mixer/distinfo
+++ b/audio/sdl_mixer/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (SDL_mixer-1.2.8.tar.gz) = 0b5b91015d0f3bd9597e094ba67c4d65
+SHA256 (SDL_mixer-1.2.8.tar.gz) = a8222a274778ff16d0e3ee49a30db27a48a4d357169a915fc599a764e405e0b6
+SIZE (SDL_mixer-1.2.8.tar.gz) = 2096559
diff --git a/audio/sdl_mixer/files/patch-Makefile.in b/audio/sdl_mixer/files/patch-Makefile.in
deleted file mode 100644
index b4c7a8df98fb..000000000000
--- a/audio/sdl_mixer/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/pkg-plist b/audio/sdl_mixer/pkg-plist
index 2f5d237ac04d..eb8b9a1bb8f6 100644
--- a/audio/sdl_mixer/pkg-plist
+++ b/audio/sdl_mixer/pkg-plist
@@ -1,6 +1,7 @@
 include/SDL/SDL_mixer.h
+lib/libSDL_mixer-1.2.so
+lib/libSDL_mixer-1.2.so.2
 lib/libSDL_mixer.a
 lib/libSDL_mixer.la
 lib/libSDL_mixer.so
-lib/libSDL_mixer.so.2
 @dirrmtry include/SDL