--- audio/sdl_mixer/Makefile	Tue Apr 26 23:05:31 2005
+++ audio/sdl_mixer/Makefile	Sun Jun 26 21:09:01 2005
@@ -7,6 +7,7 @@ 
 
 PORTNAME=	sdl_mixer
 PORTVERSION=	1.2.6
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 DISTNAME=	SDL_mixer-${PORTVERSION}
@@ -14,11 +15,8 @@ 
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	A sample multi-channel audio mixer library
 
-LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
-		smpeg.1:${PORTSDIR}/multimedia/smpeg
 
 USE_SDL=	sdl
-USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -26,9 +24,28 @@ 
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 INSTALLS_SHLIB=	yes
 
-post-configure:
-	@${REINPLACE_CMD} -e \
-		's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
-			${WRKSRC}/libtool
+OPTIONS=	MIKMOD "Enable MOD music via libMikMod" on \
+		VORBIS "Enable Ogg Vorbis music" on \
+		SMPEG "Enable MP3 music via SMPEG" on
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_MIKMOD)
+CONFIGURE_ARGS+=	--disable-music-libmikmod
+.else
+LIB_DEPENDS=	mikmod.2:${PORTSDIR}/audio/libmikmod
+.endif
+
+.if defined(WITHOUT_VORBIS)
+CONFIGURE_ARGS+=	--disable-music-ogg
+.else
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
+.endif
+
+.if defined(WITHOUT_SMPEG)
+CONFIGURE_ARGS+=	--disable-music-mp3
+.else
+LIB_DEPENDS+= smpeg.1:${PORTSDIR}/multimedia/smpeg
+.endif
+
+.include <bsd.port.post.mk>