4 files changed, 41 insertions, 19 deletions

diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index 619acb1b2140..b4b116162bb0 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -6,32 +6,22 @@
 #
 
 PORTNAME=	sdl_sound
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.icculus.org/SDL_sound/downloads/
-DISTNAME=	SDL_sound-1.0.0
+DISTNAME=	SDL_sound-${PORTVERSION}
 
 MAINTAINER=	dyeske@yahoo.com
 COMMENT=	A SDL audio library and player for some popular sound file formats
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
+USE_SDL=	yes
 USE_REINPLACE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
 
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
-SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
-
-post-patch:
-	@${REINPLACE_CMD} -E -e \
-		's|^program_transform_name.+$$||' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -E -e \
-		's|\$$\(includedir\)/SDL|\$$(includedir)/SDL11|' \
-		${CONFIGURE_WRKSRC}/Makefile.in
-
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_FLAC)
@@ -46,12 +36,24 @@ LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
 CONFIGURE_ARGS+=	--disable-mikmod
 .endif
 
+.if !defined(WITHOUT_PHYSFS)
+LIB_DEPENDS+=	physfs-0.1.9:${PORTSDIR}/devel/physfs
+.else
+CONFIGURE_ARGS+=	--disable-physfs
+.endif
+
 .if !defined(WITHOUT_SMPEG)
 LIB_DEPENDS+=	smpeg.1:${PORTSDIR}/multimedia/smpeg
 .else
 CONFIGURE_ARGS+=	--disable-smpeg
 .endif
 
+.if !defined(WITHOUT_SPEEX)
+LIB_DEPENDS+=	speex.2:${PORTSDIR}/audio/speex
+.else
+CONFIGURE_ARGS+=	--disable-speex
+.endif
+
 .if !defined(WITHOUT_MIDI)
 RUN_DEPENDS+=	${LOCALBASE}/lib/timidity/goemon.cfg:${PORTSDIR}/audio/timidity
 BUILD_DEPENDS+=	${LOCALBASE}/lib/timidity/goemon.cfg:${PORTSDIR}/audio/timidity
@@ -72,9 +74,15 @@ pre-extract:
 .if !defined(WITHOUT_MIKMOD)
 	@${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."
 .endif
+.if !defined(WITHOUT_PHYSFS)
+	@${ECHO_MSG} "You can disable support for physfs by defining WITHOUT_PHYSFS."
+.endif
 .if !defined(WITHOUT_SMPEG)
 	@${ECHO_MSG} "You can disable support for smpeg by defining WITHOUT_SMPEG."
 .endif
+.if !defined(WITHOUT_SPEEX)
+	@${ECHO_MSG} "You can disable support for speex by defining WITHOUT_SPEEX."
+.endif
 .if !defined(WITHOUT_MIDI)
 	@${ECHO_MSG} "You can disable support for midi by defining WITHOUT_MIDI."
 .endif
@@ -82,4 +90,8 @@ pre-extract:
 	@${ECHO_MSG} "You can disable support for vorbis by defining WITHOUT_VORBIS."
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$(includedir)/SDL|$$(includedir)/SDL11|' \
+		${WRKSRC}/Makefile.in
+
 .include <bsd.port.post.mk>
diff --git a/audio/sdl_sound/distinfo b/audio/sdl_sound/distinfo
index 919789766b31..9a1754cd3c87 100644
--- a/audio/sdl_sound/distinfo
+++ b/audio/sdl_sound/distinfo
@@ -1 +1 @@
-MD5 (SDL_sound-1.0.0.tar.gz) = 864a3b6e899d9a3aba45ce19ceba2ae2
+MD5 (SDL_sound-1.0.1.tar.gz) = 49e197ef7c8ab623d0640dc74be43160
diff --git a/audio/sdl_sound/files/patch-configure b/audio/sdl_sound/files/patch-configure
new file mode 100644
index 000000000000..dd8de669db0e
--- /dev/null
+++ b/audio/sdl_sound/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Mon Oct 13 03:54:57 2003
++++ configure	Mon Oct 13 07:44:41 2003
+@@ -6684,6 +6684,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/audio/sdl_sound/pkg-plist b/audio/sdl_sound/pkg-plist
index 04aea5dea00f..48c4f54305c5 100644
--- a/audio/sdl_sound/pkg-plist
+++ b/audio/sdl_sound/pkg-plist
@@ -1,6 +1,6 @@
 bin/playsound
 include/SDL11/SDL_sound.h
-lib/libSDL_sound-1.0.so.0
+lib/libSDL_sound-1.0.so.1
 lib/libSDL_sound.a
 lib/libSDL_sound.so
 @unexec rmdir %D/include/SDL11 2>/dev/null || true