- Update devel/sdl12 to version 1.2.11. Now we employ stock SDL directory

   structure (i.e. include/SDL for includes and sdl-config for configuration
   binary)
 - Update graphics/sdl_ttf to version 2.0.8
 - Update graphics/sdl_image to version 1.2.5
 - Update audio/sdl_mixer to version 1.2.7
 - Update net/sdl_net to version 1.2.6
 - Update Mk/bsd.sdl.mk accordingly
 - Fix dependent ports to fit the new directory structure and avoid several
   API breakages
 - Bump up portrevisions for all dependent ports to allow them to be upgraded
   by portupgrade/portmaster etc tools

Approved by:    kris (portmgr), sem (mentor)

26 files changed, 51 insertions, 93 deletions

diff --git a/audio/adplay/Makefile b/audio/adplay/Makefile
index 06bee6d1548c..61deec379e15 100644
--- a/audio/adplay/Makefile
+++ b/audio/adplay/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	adplay
 PORTVERSION=	1.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	adplug
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index c6a8f241448b..346f86d7513e 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	amarok
 PORTVERSION=	1.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index c6a8f241448b..346f86d7513e 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	amarok
 PORTVERSION=	1.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/audio/drumpiler/Makefile b/audio/drumpiler/Makefile
index a14c6406efd1..b4af194e5848 100644
--- a/audio/drumpiler/Makefile
+++ b/audio/drumpiler/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	drumpiler
 PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,9 +21,6 @@ CFLAGS+=	`${SDL_CONFIG} --cflags`
 LIBS+=		`${SDL_CONFIG} --libs`
 PLIST_FILES=	bin/drumpiler
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|SDL.h|SDL11/SDL.h|" ${WRKSRC}/drumpiler.c
-
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} -DUSESDL -o drumpiler drumpiler.c ${LIBS}
 
diff --git a/audio/festalon/Makefile b/audio/festalon/Makefile
index 0434f9dca2fa..fe90ef867000 100644
--- a/audio/festalon/Makefile
+++ b/audio/festalon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	festalon
 PORTVERSION=	0.5.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://projects.raphnet.net/festalon/ \
 		http://critical.ch/distfiles/ \
diff --git a/audio/ksmp3play/Makefile b/audio/ksmp3play/Makefile
index 1755914d0775..bba6e8fef753 100644
--- a/audio/ksmp3play/Makefile
+++ b/audio/ksmp3play/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ksmp3play
 PORTVERSION=	0.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=ksmp3play
diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile
index 0b181a4a9857..a48a1c3376e5 100644
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	mhwaveedit
 PORTVERSION=	1.4.9
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.gna.org/mhwaveedit/
 
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index ffe0bc4eaf56..fab854c2d3a2 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mp3blaster
 PORTVERSION=	3.2.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index ddc10cd3fa63..c77713687b3a 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openal
 PORTVERSION=	20060211
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://openal.org/openal_webstf/downloads/
 DISTVERSION=	0.0.8
diff --git a/audio/phatbeat/Makefile b/audio/phatbeat/Makefile
index 2b5c7c34e7b6..bd55744c437a 100644
--- a/audio/phatbeat/Makefile
+++ b/audio/phatbeat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		phatbeat
 PORTVERSION=		1.1
+PORTREVISION=	1
 CATEGORIES=		audio
 MASTER_SITES=		http://www.postreal.org/files/
 DISTNAME=		PhatBeat-${PORTVERSION}
diff --git a/audio/py-sdl_mixer/Makefile b/audio/py-sdl_mixer/Makefile
index 1a166490a730..6cab526eec2c 100644
--- a/audio/py-sdl_mixer/Makefile
+++ b/audio/py-sdl_mixer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdl_mixer
 PORTVERSION=	0.0.3
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	http://download.gna.org/pysdlmixer/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -26,8 +27,6 @@ WRKSRC=		${WRKDIR}/pysdl_mixer-${PORTVERSION}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-sdl-mixer
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,"SDL","SDL-1.1",g' ${WRKSRC}/setup.py
-	@${REINPLACE_CMD} -e 's,SDL/SDL,SDL11/SDL,g' ${WRKSRC}/sdl_mixer.c
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
diff --git a/audio/pysol-sound-server/Makefile b/audio/pysol-sound-server/Makefile
index 0f6e051f4586..bd8fec67745b 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=	2
+PORTREVISION=	1
 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 532c62c55fef..b980de68fed2 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	sdl_mixer
-PORTVERSION=	1.2.6
-PORTREVISION=	2
+PORTVERSION=	1.2.7
+PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 DISTNAME=	SDL_mixer-${PORTVERSION}
@@ -21,7 +21,7 @@ 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"
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 OPTIONS=	MIKMOD "Enable MOD music via libMikMod" on \
 		VORBIS "Enable Ogg Vorbis music" on \
diff --git a/audio/sdl_mixer/distinfo b/audio/sdl_mixer/distinfo
index 1edd13b542e6..2052714ba790 100644
--- a/audio/sdl_mixer/distinfo
+++ b/audio/sdl_mixer/distinfo
@@ -1,3 +1,3 @@
-MD5 (SDL_mixer-1.2.6.tar.gz) = 2b8beffad9179d80e598c22c80efb135
-SHA256 (SDL_mixer-1.2.6.tar.gz) = 89f94840b1b42ddfe53a8aee415331516f1bbdd942b42d25e74906a332cdf22a
-SIZE (SDL_mixer-1.2.6.tar.gz) = 1147838
+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
diff --git a/audio/sdl_mixer/files/patch-Makefile.in b/audio/sdl_mixer/files/patch-Makefile.in
new file mode 100644
index 000000000000..b4c7a8df98fb
--- /dev/null
+++ b/audio/sdl_mixer/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- 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/files/patch-aa b/audio/sdl_mixer/files/patch-aa
deleted file mode 100644
index 6ede2a503503..000000000000
--- a/audio/sdl_mixer/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig
-+++ Makefile.in
-@@ -254,7 +254,7 @@
- lib_LTLIBRARIES = libSDL_mixer.la
- SUBDIRS = @MUSIC_SUBDIRS@
- DIST_SUBDIRS = mikmod timidity native_midi native_midi_gpl
--libSDL_mixerincludedir = $(includedir)/SDL
-+libSDL_mixerincludedir = $(includedir)/SDL11
- libSDL_mixerinclude_HEADERS = \
- 	SDL_mixer.h
- 
-@@ -297,7 +297,6 @@
- 
- libSDL_mixer_la_LDFLAGS = \
- 	-no-undefined		\
--	-release $(LT_RELEASE)	\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- 	-export-symbols-regex Mix_.*
- 
diff --git a/audio/sdl_mixer/files/patch-ab b/audio/sdl_mixer/files/patch-ab
deleted file mode 100644
index 66de8aa6beec..000000000000
--- a/audio/sdl_mixer/files/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- configure	2001/12/19 12:37:01	1.1
-+++ configure	2001/12/19 12:37:51
-@@ -588,7 +588,7 @@
- 
- # libtool versioning
- LT_RELEASE=$MAJOR_VERSION.$MINOR_VERSION
--LT_CURRENT=`expr $MICRO_VERSION - $INTERFACE_AGE`
-+LT_CURRENT=2
- LT_REVISION=$INTERFACE_AGE
- LT_AGE=`expr $BINARY_AGE - $INTERFACE_AGE`
- 
diff --git a/audio/sdl_mixer/files/patch-ac b/audio/sdl_mixer/files/patch-ac
deleted file mode 100644
index f4e45d1285e8..000000000000
--- a/audio/sdl_mixer/files/patch-ac
+++ /dev/null
@@ -1,25 +0,0 @@
---- timidity/config.h.orig	Mon Jul  3 07:36:37 2000
-+++ timidity/config.h	Sat Nov 18 18:47:45 2000
-@@ -159,6 +159,22 @@
- # endif
- #endif /* linux */
- 
-+#ifdef __FreeBSD__
-+#include <errno.h>
-+#include <machine/endian.h>
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#undef BIG_ENDIAN
-+#undef PDP_ENDIAN
-+#elif BYTE_ORDER == BIG_ENDIAN
-+#undef LITTLE_ENDIAN
-+#undef PDP_ENDIAN
-+#else
-+# error No valid byte sex defined
-+#endif
-+#define USE_LDEXP
-+#define PI M_PI
-+#endif
-+
- /* Win32 on Intel machines */
- #ifdef __WIN32__
- #  define LITTLE_ENDIAN
diff --git a/audio/sdl_mixer/pkg-plist b/audio/sdl_mixer/pkg-plist
index e9670914d848..2f5d237ac04d 100644
--- a/audio/sdl_mixer/pkg-plist
+++ b/audio/sdl_mixer/pkg-plist
@@ -1,5 +1,6 @@
-include/SDL11/SDL_mixer.h
+include/SDL/SDL_mixer.h
 lib/libSDL_mixer.a
 lib/libSDL_mixer.la
 lib/libSDL_mixer.so
 lib/libSDL_mixer.so.2
+@dirrmtry include/SDL
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index 247fb5e9920b..66c758d935a6 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl_sound
 PORTVERSION=	1.0.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	http://www.icculus.org/SDL_sound/downloads/
 DISTNAME=	SDL_sound-${PORTVERSION}
@@ -20,7 +20,7 @@ USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -90,8 +90,4 @@ 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/files/patch-Makefile.in b/audio/sdl_sound/files/patch-Makefile.in
new file mode 100644
index 000000000000..75969df6c22f
--- /dev/null
+++ b/audio/sdl_sound/files/patch-Makefile.in
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	Tue Sep 12 19:18:15 2006
++++ Makefile.in	Tue Sep 12 19:18:24 2006
+@@ -127,7 +127,6 @@
+ @USE_MPGLIB_FALSE@MPGLIB_LIB = 
+ 
+ libSDL_sound_la_LDFLAGS = \
+-	-release $(LT_RELEASE)	\
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ libSDL_sound_la_LIBADD = \
diff --git a/audio/sdl_sound/pkg-plist b/audio/sdl_sound/pkg-plist
index 96ffa81ef647..1ad5f80848be 100644
--- a/audio/sdl_sound/pkg-plist
+++ b/audio/sdl_sound/pkg-plist
@@ -1,8 +1,7 @@
 bin/playsound
-include/SDL11/SDL_sound.h
-lib/libSDL_sound-1.0.so.1
-lib/libSDL_sound-1.0.so
+include/SDL/SDL_sound.h
 lib/libSDL_sound.a
 lib/libSDL_sound.la
 lib/libSDL_sound.so
-@dirrmtry include/SDL11
+lib/libSDL_sound.so.1
+@dirrmtry include/SDL
diff --git a/audio/sidplayer/Makefile b/audio/sidplayer/Makefile
index 077274a2e3f3..7e92256deecf 100644
--- a/audio/sidplayer/Makefile
+++ b/audio/sidplayer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sidplayer
 PORTVERSION=	4.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://sidplayer.cebix.net/downloads/ \
 		http://critical.ch/distfiles/ \
@@ -21,7 +22,7 @@ COMMENT=	A C64 SID tune player
 USE_SDL=	yes
 GNU_CONFIGURE=	yes
 
-SDLINCLUDEDIR=	SDL11
+SDLINCLUDEDIR=	SDL
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
 		CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 3c536d1418e7..21c87a74c12a 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	soundtracker
 PORTVERSION=	0.6.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://www.soundtracker.org/dl/%SUBDIR%/
 MASTER_SITE_SUBDIR=	v${PORTVERSION:R}
diff --git a/audio/tempest_for_eliza/Makefile b/audio/tempest_for_eliza/Makefile
index c3443ca1e651..0ec1fb2856ce 100644
--- a/audio/tempest_for_eliza/Makefile
+++ b/audio/tempest_for_eliza/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tempest_for_eliza
 PORTVERSION=	1.0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.erikyyy.de/tempest/
 
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index 150b508b2fd6..95938e300340 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	xmms2
 PORTVERSION=	0.2.d.6
+PORTREVISION=	1
 CATEGORIES?=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}