svn commit: r410736 - in head/audio: sdl2_mixer sdl_mixer

[Jan Beich]

Author: jbeich
Date: Thu Mar 10 00:17:26 2016
New Revision: 410736
URL: https://svnweb.freebsd.org/changeset/ports/410736

Log:
  audio/sdl{,2}_mixer: fix VORBIS=on logic after r410689
  
  PR:		202689
  Reported by:	antoine

Modified:
  head/audio/sdl2_mixer/Makefile   (contents, props changed)
  head/audio/sdl_mixer/Makefile   (contents, props changed)

Modified: head/audio/sdl2_mixer/Makefile
==============================================================================
--- head/audio/sdl2_mixer/Makefile	Wed Mar  9 22:58:44 2016	(r410735)
+++ head/audio/sdl2_mixer/Makefile	Thu Mar 10 00:17:26 2016	(r410736)
@@ -2,7 +2,7 @@
 
 PORTNAME=	sdl2_mixer
 PORTVERSION=	2.0.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 DISTNAME=	SDL2_mixer-${PORTVERSION}
@@ -54,7 +54,9 @@ VORBIS_LIB_DEPENDS=		libvorbis.so:${PORT
 VORBIS_CONFIGURE_ENABLE=	music-ogg
 
 TREMOR_LIB_DEPENDS=		libvorbisidec.so:${PORTSDIR}/audio/libtremor
-TREMOR_CONFIGURE_ENABLE=	music-ogg music-ogg-tremor
+TREMOR_CONFIGURE_ON=		--enable-music-ogg
+# TREMOR_CONFIGURE_OFF is handled by VORBIS=off
+TREMOR_CONFIGURE_ENABLE=	music-ogg-tremor
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\($$(prefix)/libdata/pkgconfig\)|$$(DESTDIR)\1|' \

Modified: head/audio/sdl_mixer/Makefile
==============================================================================
--- head/audio/sdl_mixer/Makefile	Wed Mar  9 22:58:44 2016	(r410735)
+++ head/audio/sdl_mixer/Makefile	Thu Mar 10 00:17:26 2016	(r410736)
@@ -3,7 +3,7 @@
 
 PORTNAME=	sdl_mixer
 PORTVERSION=	1.2.12
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 DISTNAME=	SDL_mixer-${PORTVERSION}
@@ -61,7 +61,9 @@ TIMIDITYPLUS_RUN_DEPENDS_OFF=	${LOCALBAS
 TIMIDITYPLUS_VARS_OFF=		CONFIG_FILE=${LOCALBASE}/lib/timidity/timidity.cfg
 
 TREMOR_LIB_DEPENDS=		libvorbisidec.so:${PORTSDIR}/audio/libtremor
-TREMOR_CONFIGURE_ENABLE=	music-ogg music-ogg-tremor
+TREMOR_CONFIGURE_ON=		--enable-music-ogg
+# TREMOR_CONFIGURE_OFF is handled by VORBIS=off
+TREMOR_CONFIGURE_ENABLE=	music-ogg-tremor
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\($$(prefix)/libdata/pkgconfig\)|$$(DESTDIR)\1|' \