- Update devel/sdl12 to version 1.2.14.

- Update audio/sdl_mixer to version 1.2.11.
- Update graphics/sdl_gfx to version 2.0.20.
- Update graphics/sdl_image to version 1.2.10.
- Bump portrevisions for all ports depending on audio/sdl_mixer and
  graphics/sdl_image.
- Update Mk/bsd.sdl.mk accordingly for the new shared lib versions.

PR:		ports/142147 ports/142248 ports/142249
Approved by:	miwi (mentor implicit)

6 files changed, 18 insertions, 9 deletions

diff --git a/audio/adplay/Makefile b/audio/adplay/Makefile
index 817a18644bc5..c61462e52007 100644
--- a/audio/adplay/Makefile
+++ b/audio/adplay/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	adplay
 PORTVERSION=	1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	SF/adplug/AdPlay_UNIX/${PORTVERSION}:main \
 		SF/adplug/Database/2006-07-06:db
diff --git a/audio/phatbeat/Makefile b/audio/phatbeat/Makefile
index 18f6ef03005d..08d44c8a8008 100644
--- a/audio/phatbeat/Makefile
+++ b/audio/phatbeat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		phatbeat
 PORTVERSION=		1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=		audio
 MASTER_SITES=		http://www.postreal.org/files/
 DISTNAME=		PhatBeat-${PORTVERSION}
diff --git a/audio/pysol-sound-server/Makefile b/audio/pysol-sound-server/Makefile
index 496336f57f5b..b412cc3da611 100644
--- a/audio/pysol-sound-server/Makefile
+++ b/audio/pysol-sound-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pysol-sound-server
 PORTVERSION=	3.01
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio games
 MASTER_SITES=	http://www.pysol.org/download/pysol/ \
 		ftp://ftp.is.co.za/linux/distributions/gentoo/distfiles/
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index fc99855b396b..566d7244c326 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sdl_mixer
-PORTVERSION=	1.2.8
-PORTREVISION=	2
+PORTVERSION=	1.2.11
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 DISTNAME=	SDL_mixer-${PORTVERSION}
@@ -17,6 +16,7 @@ COMMENT=	A sample multi-channel audio mixer library
 
 USE_AUTOTOOLS=	libtool:22
 USE_SDL=	sdl
+USE_GNOME=	pkgconfig gnomehack
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -26,6 +26,7 @@ USE_LDCONFIG=	yes
 
 OPTIONS=	MIKMOD		"Enable MOD music via libMikMod"	On \
 		SMPEG		"Enable MP3 music via SMPEG"		On \
+		FLAC		"Enable FLAC encoding support via flac"	On \
 		VORBIS		"Enable Ogg Vorbis music"		On \
 		TIMIDITYPLUS	"Use Timidity++ instead of Timidity"	Off
 
@@ -38,6 +39,13 @@ LIB_DEPENDS=	mikmod.2:${PORTSDIR}/audio/libmikmod
 CONFIGURE_ARGS+=--enable-music-libmikmod
 .endif
 
+.if defined(WITHOUT_FLAC)
+CONFIGURE_ARGS+=--disable-music-flac
+.else
+LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac
+CONFIGURE_ARGS+=--enable-music-flac
+.endif
+
 .if defined(WITHOUT_SMPEG)
 CONFIGURE_ARGS+=--disable-music-mp3
 .else
diff --git a/audio/sdl_mixer/distinfo b/audio/sdl_mixer/distinfo
index 322c1508b0bd..104d25d68ac7 100644
--- a/audio/sdl_mixer/distinfo
+++ b/audio/sdl_mixer/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (SDL_mixer-1.2.11.tar.gz) = 65ada3d997fe85109191a5fb083f248c
+SHA256 (SDL_mixer-1.2.11.tar.gz) = 86145ac39cac6d2c6169c226f937648dca5e89dcd828751763dd174fa9af9cf9
+SIZE (SDL_mixer-1.2.11.tar.gz) = 2690654
diff --git a/audio/sdl_mixer/pkg-plist b/audio/sdl_mixer/pkg-plist
index eb8b9a1bb8f6..4fad8cdca5aa 100644
--- a/audio/sdl_mixer/pkg-plist
+++ b/audio/sdl_mixer/pkg-plist
@@ -1,7 +1,8 @@
 include/SDL/SDL_mixer.h
 lib/libSDL_mixer-1.2.so
-lib/libSDL_mixer-1.2.so.2
+lib/libSDL_mixer-1.2.so.10
 lib/libSDL_mixer.a
 lib/libSDL_mixer.la
 lib/libSDL_mixer.so
+libdata/pkgconfig/SDL_mixer.pc
 @dirrmtry include/SDL