- 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)
svn path=/head/; revision=173460
2024-10-18 19:49:40 +00:00 · 2006-09-20 11:21:59 +00:00 · 2006-09-20 11:21:59 +00:00 · 0d2725682b · 2021-03-31 03:12:20 +00:00
commit 0d2725682b
parent 750f1f56ed
471 changed files with 1194 additions and 1886 deletions
--- a/Mk/bsd.sdl.mk
+++ b/Mk/bsd.sdl.mk
@ -56,7 +56,7 @@ _VERSION_gui=	0
 _SUBDIR_gui=	x11-toolkits
 _REQUIRES_gui=	sdl image ttf

-_VERSION_image=	10
+_VERSION_image=	1
 _SUBDIR_image=	graphics
 _REQUIRES_image=sdl

@ -74,17 +74,16 @@ _VERSION_net=	0
 _SUBDIR_net=	net
 _REQUIRES_net=	sdl

-_VERSION_sdl=	7
+_VERSION_sdl=	11
 _SUBDIR_sdl=	devel
-_LIB_sdl=		SDL-1.1
+_LIB_sdl=		SDL
 _PORTDIR_sdl=	sdl12

 _VERSION_sound=	1
 _SUBDIR_sound=	audio
-_LIB_sound=		SDL_sound-1.0
 _REQUIRES_sound=sdl

-_VERSION_ttf=	3
+_VERSION_ttf=	6
 _SUBDIR_ttf=	graphics
 _REQUIRES_ttf=	sdl

@ -171,7 +170,7 @@ LIB_DEPENDS+=	${_LIB_${component}}.${_VERSION_${component}}:${PORTSDIR}/${_SUBDI
 # "Normal" dependencies and variables
 #
 BUILD_DEPENDS+=	${SDL_CONFIG}:${PORTSDIR}/${_SUBDIR_sdl}/${_PORTDIR_sdl}
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
+SDL_CONFIG?=	${LOCALBASE}/bin/sdl-config
 CONFIGURE_ENV+=	SDL_CONFIG=${SDL_CONFIG}
 MAKE_ENV+=		SDL_CONFIG=${SDL_CONFIG}

--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	stellarium
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- 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
--- 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
--- 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
--- 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}

--- 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/ \
--- 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
--- 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/

--- 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}
--- 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
--- 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}
--- 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' \
--- 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/
--- 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 \
--- 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
--- a/audio/sdl_mixer/files/patch-Makefile.in
+++ 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)
+ 
--- a/audio/sdl_mixer/files/patch-aa
+++ b/audio/sdl_mixer/files/patch-aa
@ -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_.*
- 
--- a/audio/sdl_mixer/files/patch-ab
+++ b/audio/sdl_mixer/files/patch-ab
@ -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`
- 
--- a/audio/sdl_mixer/files/patch-ac
+++ b/audio/sdl_mixer/files/patch-ac
@ -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
--- 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
--- 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>
--- a/audio/sdl_sound/files/patch-Makefile.in
+++ 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 = \
--- 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
--- 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}" \
--- 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}
--- 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/

--- 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}
--- a/devel/adasdl/Makefile
+++ b/devel/adasdl/Makefile
@ -7,7 +7,7 @@

 PORTNAME=      adasdl
 PORTVERSION=   20010504
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=    ${PORTNAME}
@ -30,7 +30,6 @@ do-patch:
 		${REINPLACE_CMD} \
 			-e 's,/usr/local,${LOCALBASE},g' \
 			-e 's,/usr/X11R6,${X11BASE},g' \
-			-e 's,-lSDL\ ,-lSDL-1.1\ ,' \
 			-e 's,-lpthread,-pthread,' \
 			-e 's,-lGL,-L${X11BASE}/lib\ -lX11 -lXext -lGL,' \
 		$${i}; \
--- a/devel/adasdl/files/patch-AdaSDL-make.conf_x11
+++ b/devel/adasdl/files/patch-AdaSDL-make.conf_x11
@ -3,7 +3,7 @@
@@ -1,5 +1,5 @@
 #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU
 -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib  -lSDL -lpthread -lGL -lGLU
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib  -lSDL-1.1 -pthread -lGL -lGLU
+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib  -lSDL -pthread -lGL -lGLU
 GNATHTML=/usr/local/bin/gnathtml.pl
 PERL=/usr/bin/perl
 EXE=
--- a/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11
+++ b/devel/adasdl/files/patch-AdaSDL_framebuff-make.conf_x11
@ -3,6 +3,6 @@
@@ -1,4 +1,4 @@
 #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU
 -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib  -lSDL_mixer -lSDL -lpthread -lGL -lGLU
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib  -lSDL_mixer -lSDL-1.1 -pthread -lGL -lGLU
+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib  -lSDL_mixer -lSDL -pthread -lGL -lGLU
 
 EXE=
--- a/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile
+++ b/devel/adasdl/files/patch-AdaSDL_framebuff-sdltests-Makefile
@ -4,7 +4,7 @@
 
 -INC+=-I../../AdaSDL/binding -I../../AdaGL/GL -I..
 -include ../make.conf
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib  -lSDL_mixer -lSDL-1.1 -pthread -lGL -lGLU
+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib  -lSDL_mixer -lSDL -pthread -lGL -lGLU
 +
 +INC+=-I${LOCALBASE}/lib/adaSDL -I${LOCALBASE}/lib/adaGL -I..
 
--- a/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11
+++ b/devel/adasdl/files/patch-AdaSDL_image-make.conf_x11
@ -3,6 +3,6 @@
@@ -1,4 +1,4 @@
 #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU
 -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib  -lSDL_image -lSDL -lpthread -lGL -lGLU
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib  -lSDL_image -lSDL-1.1 -pthread -lGL -lGLU
+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib  -lSDL_image -lSDL -pthread -lGL -lGLU
 
 EXE=
--- a/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11
+++ b/devel/adasdl/files/patch-AdaSDL_mixer-make.conf_x11
@ -3,6 +3,6 @@
@@ -1,4 +1,4 @@
 #LIBS= -L/usr/lib -L/usr/local/lib ~/lib -Wl,-rpath,. -lSDL -lpthread -L/usr/lib -lGL -lGLU
 -LIBS= -L/usr/lib -L/usr/local/lib -L~/lib  -lSDL_mixer -lSDL -lpthread -lGL -lGLU
-+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib  -lSDL_mixer -lSDL-1.1 -pthread -lGL -lGLU
+LIBS= -L/usr/lib -L${LOCALBASE}/lib -L${X11BASE}/lib -L~/lib  -lSDL_mixer -lSDL -pthread -lGL -lGLU
 
 EXE=
--- a/devel/clanlib-devel/Makefile
+++ b/devel/clanlib-devel/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	clanlib
 PORTVERSION=	0.7.8.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	directfb
 PORTVERSION=	0.9.16
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	http://www.directfb.org/downloads/Old/
 DISTNAME=	DirectFB-${PORTVERSION}
--- a/devel/eboxy/Makefile
+++ b/devel/eboxy/Makefile
@ -8,7 +8,7 @@

 PORTNAME=	eboxy
 PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/devel/esdl/Makefile
+++ b/devel/esdl/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	esdl
 PORTVERSION=	0.95.0630
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/devel/flatzebra/Makefile
+++ b/devel/flatzebra/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	flatzebra
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	devel games
 MASTER_SITES=	http://www3.sympatico.ca/sarrazip/dev/

--- a/devel/flatzebra/files/patch-srcflatzebraSoundMixer.h
+++ b/devel/flatzebra/files/patch-srcflatzebraSoundMixer.h
@ -1,11 +0,0 @@
--- src/flatzebra/SoundMixer.h.orig	Tue Oct 18 12:13:19 2005
-+++ src/flatzebra/SoundMixer.h	Tue Oct 18 12:13:24 2005
-@@ -23,7 +23,7 @@
- #ifndef _H_SoundMixer
- #define _H_SoundMixer
- 
-#include <SDL/SDL_mixer.h>
-+#include <SDL11/SDL_mixer.h>
- 
- #include <string>
- 
--- a/devel/gauche-sdl/Makefile
+++ b/devel/gauche-sdl/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	gauche-sdl
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	devel scheme
 MASTER_SITES=	http://michaelvess.com/files/
 DISTNAME=	${PORTFAKENAME}
--- a/devel/gengameng/Makefile
+++ b/devel/gengameng/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	gengameng
 PORTVERSION=	4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.osuosl.org/pub/FreeBSD/distfiles/

--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	guichan
 PORTVERSION=	0.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@ -26,7 +26,7 @@ CONFIGURE_ARGS=	--disable-allegro
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%LOCALBASE%%/lib

-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL11 \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL \
 		-I${X11BASE}/include" LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib \
 		${PTHREAD_LIBS}"

--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	kyra
 PORTVERSION=	2.0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/devel/kyra/files/patch-engine_namefield.h
+++ b/devel/kyra/files/patch-engine_namefield.h
@ -0,0 +1,10 @@
+--- engine/namefield.h.orig	Tue Sep 12 19:06:04 2006
+++ engine/namefield.h	Tue Sep 12 19:07:20 2006
+@@ -31,6 +31,7 @@
+ #include "../util/gltypes.h"
+ #include "../util/gllist.h"
+ #include "SDL_endian.h"
+#include "SDL_rwops.h"
+ 
+ 
+ 
--- a/devel/kyra/files/patch-util_gltypes.h
+++ b/devel/kyra/files/patch-util_gltypes.h
@ -0,0 +1,13 @@
+--- util/gltypes.h.orig	Tue Sep 12 19:01:55 2006
+++ util/gltypes.h	Tue Sep 12 19:02:26 2006
+@@ -40,8 +40,8 @@
+ 	typedef Sint32			S32;
+ 
+ 	#ifdef SDL_HAS_64BIT_TYPE
+-		typedef SDL_HAS_64BIT_TYPE				S64;
+-		typedef unsigned SDL_HAS_64BIT_TYPE		U64;
+		typedef Sint64		S64;
+		typedef Uint64		U64;
+ 	#else
+ 		#error No 64-bit integer.
+ 	#endif
--- a/devel/ocaml-sdl/Makefile
+++ b/devel/ocaml-sdl/Makefile
@ -8,7 +8,7 @@

 PORTNAME=	sdl
 PORTVERSION=	0.7.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ocamlsdl
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@ -5,7 +5,7 @@

 PORTNAME=	sdl
 PORTVERSION=	1.20.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	http://bloodgate.com/perl/sdl/pub/
 PKGNAMEPREFIX=	p5-
--- a/devel/p5-SDL/files/patch-Makefile.freebsd
+++ b/devel/p5-SDL/files/patch-Makefile.freebsd
@ -1,5 +1,5 @@
--- Makefile.freebsd.orig	Thu Jan  1 02:38:22 2004
-+++ Makefile.freebsd	Thu Jan  1 02:38:54 2004
+--- Makefile.freebsd.orig	Wed Mar 12 03:38:56 2003
+++ Makefile.freebsd	Tue Sep 12 18:08:44 2006
@@ -1,6 +1,7 @@
 #!/usr/bin/env perl 
 
@ -8,6 +8,26 @@
 use ExtUtils::MakeMaker;
 
 #
+@@ -13,8 +14,8 @@
+ # Configuration detection of Linux / Unix
+ #
+ 
+-chomp ($sdl_cflags = "-I/usr/X11R6/include " . `sdl11-config --cflags`);
+-chomp ($sdl_libs = "-L/usr/X11R6/lib " . `sdl11-config --libs`);
+chomp ($sdl_cflags = "-I/usr/X11R6/include " . `sdl-config --cflags`);
+chomp ($sdl_libs = "-L/usr/X11R6/lib " . `sdl-config --libs`);
+ $sdl_libs =~ s/-Wl,-rpath,\/usr\/local\/lib//; # suppress the insanity
+ $sdl_libs =~ s/-pthread//;
+ 
+@@ -24,7 +25,7 @@
+ 
+ @dirs=(
+ 	'/usr/local/include',
+-	'/usr/local/include/SDL11', 
+	'/usr/local/include/SDL', 
+ 	'/usr/local/include/smpeg',
+ 	'/usr/X11R6/include',
+ 	'/usr/X11R6/include/GL', 
@@ -96,7 +97,7 @@
 
 my %options = (
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	pwlib
 PORTVERSION=	1.10.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.voxgratia.org/releases/
--- a/devel/pwlib/files/patch-configureac
+++ b/devel/pwlib/files/patch-configureac
@ -124,7 +124,7 @@
 +  dnl FreeBSD SDL check
   if test "${HAS_SDL:-unset}" = "unset" ; then
 -    AC_CHECK_FILE(/usr/local/include/SDL11/SDL.h, HAS_SDL=1)
-+    AC_CHECK_HEADER(SDL11/SDL.h, HAS_SDL=1)
+    AC_CHECK_HEADER(SDL/SDL.h, HAS_SDL=1)
     if test "${HAS_SDL:-unset}" != "unset" ; then
       SDLLIB=SDL-1.1
     fi
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	game
 PORTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://pygame.seul.org/ftp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-game/files/patch-config_unix.py
+++ b/devel/py-game/files/patch-config_unix.py
@ -1,14 +1,5 @@
 --- config_unix.py.orig	Wed Aug 10 04:45:11 2005
 +++ config_unix.py	Wed Sep 14 09:12:44 2005
-@@ -4,7 +4,7 @@
- from glob import glob
- from distutils.sysconfig import get_python_inc
- 
-configcommand = os.environ.get('SDL_CONFIG', 'sdl-config',)
-+configcommand = os.environ.get('SDL_CONFIG', 'sdl11-config',)
- configcommand = configcommand + ' --version --cflags --libs'
- localbase = os.environ.get('LOCALBASE', '')
- 
@@ -52,6 +52,9 @@
                     self.cflags += f + ' '
                 elif f[:3] == '-Wl':
@ -19,21 +10,3 @@
         except:
             print 'WARNING: "%s" failed!' % command    
             self.found = 0
-@@ -137,7 +140,7 @@
- def main():
-     print '\nHunting dependencies...'
-     DEPS = [
-        DependencyProg('SDL', 'SDL_CONFIG', 'sdl-config', '1.2', 'sdl'),
-+        DependencyProg('SDL', 'SDL_CONFIG', 'sdl11-config', '1.2', 'sdl'),
-         Dependency('FONT', 'SDL_ttf.h', 'libSDL_ttf.so', 'SDL_ttf'),
-         Dependency('IMAGE', 'SDL_image.h', 'libSDL_image.so', 'SDL_image'),
-         Dependency('MIXER', 'SDL_mixer.h', 'libSDL_mixer.so', 'SDL_mixer'),
-@@ -146,7 +149,7 @@
-     ]
- 
-     if not DEPS[0].found:
-        print 'Unable to run "sdl-config". Please make sure a development version of SDL is installed.'
-+        print 'Unable to run "sdl11-config". Please make sure a development version of SDL is installed.'
-         raise SystemExit
- 
-     if localbase:
--- a/devel/ruby-game/Makefile
+++ b/devel/ruby-game/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	game
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://rubygame.seul.org/files/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
--- a/devel/ruby-rudl/Makefile
+++ b/devel/ruby-rudl/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	rudl
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	devel ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@ -22,7 +23,7 @@ USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes

 #NO_WRKSUBDIR=	yes
-CONFIGURE_ARGS=	--with-sdl-config="sdl11-config"
+CONFIGURE_ARGS=	--with-sdl-config="sdl-config"
 INSTALL_TARGET=	site-install

 DOCS=	RUDL/audio.html \
--- a/devel/ruby-sdl/Makefile
+++ b/devel/ruby-sdl/Makefile
@ -7,13 +7,14 @@

 PORTNAME=	sdl
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel graphics audio ruby
 MASTER_SITES=	http://www.kmc.gr.jp/~ohai/rubysdl/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby

-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ssedov@mbsd.msk.ru
 COMMENT=	Ruby extension library to use SDL library

 BUILD_DEPENDS=	${NONEXISTENT}:${RUBY_OPENGL_PORTDIR}:patch
@ -25,7 +26,7 @@ USE_SDL=	mixer image ttf sdl
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes

-CONFIGURE_ARGS=	--with-sdl-config="sdl11-config" \
+CONFIGURE_ARGS=	--with-sdl-config="sdl-config" \
 		--enable-opengl --linkoglmodule \
 		--with-x11-dir="${X11BASE}"
 INSTALL_TARGET=	site-install
--- a/devel/rubygem-rubygame/Makefile
+++ b/devel/rubygem-rubygame/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	game
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://rubygame.seul.org/files/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@ -6,8 +6,8 @@
 #

 PORTNAME=	sdl
-PORTVERSION=	1.2.9
-PORTREVISION=	2
+PORTVERSION=	1.2.11
+PORTREVISION=	0
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/
@ -21,11 +21,12 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
+USE_GNOME=	gnomehack gnometarget
+USE_ICONV=      yes
 CONFIGURE_ENV=	NASM="${LOCALBASE}/bin/nasm"		\
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
 		PTHREAD_LIBS="${PTHREAD_LIBS}"		\
 		LDFLAGS="${LDFLAGS}"
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}

 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@ -37,13 +38,20 @@ PKGNAMESUFFIX=	-nox11
 CONFIGURE_ARGS+=--disable-video-x11
 .endif

-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
-.endif
+# XXX: exists untill it will be committed to bsd.port.mk
+COPYTREE_SHARE=	${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
+		2>&1) && \
+		${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \
+		${FIND} $$1/ -type d -exec ${CHMOD} 755 {} \; && \
+		${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' --
+
+EXAMPLES=	test/*.c test/*.bmp test/*.dat test/*.xbm test/*.wav
+DOCS=		BUGS COPYING CREDITS README README-SDL.txt WhatsNew docs.html

 OPTIONS=	NAS	"Include support for the Network Audio System" Off \
+		AALIB	"Include support for AA-lib" On \
 		GL	"Include support for OpenGL" On \
-		AALIB	"Include support for AA-lib" On
+		GGI	"Include support for GGI" Off

 .include <bsd.port.pre.mk>

@ -62,24 +70,26 @@ LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
 CONFIGURE_ARGS+=--disable-nas
 .endif

+.if defined(WITH_GGI)
+LIB_DEPENDS+=	ggi.2:${PORTSDIR}/graphics/libggi
+CONFIGURE_ARGS+=--enable-video-ggi
+.else
+CONFIGURE_ARGS+=--disable-video-ggi
+.endif
+
 .if defined(WITHOUT_GL)
 CONFIGURE_ARGS+=--disable-video-opengl
 .else
 USE_GL=		yes
 CONFIGURE_ARGS+=--enable-video-opengl
 .endif
+
 .if defined(WITHOUT_AALIB)
 CONFIGURE_ARGS+=--disable-video-aalib
 .else
 LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
 CONFIGURE_ARGS+=--enable-video-aalib
 .endif
-.if exists(/usr/include/libusbhid.h)
-CONFIGURE_ENV+=	USB_LIBS=-lusbhid
-CFLAGS+=	-DHAVE_LIBUSBHID_H
-.else
-CONFIGURE_ENV+=	USB_LIBS=-lusb
-.endif

 MAN3!=		${CAT} ${FILESDIR}/man3

@ -105,34 +115,19 @@ CONFIGURE_ARGS+=--enable-arts
 CONFIGURE_ARGS+=--disable-arts
 .endif

-post-patch:
-	@${REINPLACE_CMD} 's|sdl-config|sdl11-config|g'	\
-		${WRKSRC}/test/configure
-	@${RM} ${WRKSRC}/test/configure.bak
-
 pre-configure:
 	@${FIND} ${WRKSRC} -type f -name Makefile.in | ${XARGS} ${TOUCH}

-post-configure:
-	@cd ${WRKSRC} && \
-		${CP} sdl-config sdl11-config && \
-		${CP} sdl.m4 sdl11.m4
-	@${REINPLACE_CMD} 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
-		${WRKSRC}/libtool
-
 post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/test/* ${EXAMPLESDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/test/configure ${EXAMPLESDIR}
-	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/docs
-.for f in BUGS COPYING CREDITS README README-SDL.txt WhatsNew docs.html
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
+	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/,} ${EXAMPLESDIR}/
+	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
+	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-	@cd ${WRKSRC}/docs; ${TAR} cf - `${ECHO_CMD} [^Mm]*` | \
-		(cd ${DOCSDIR}/docs; ${TAR} --unlink -xf - )
+	@(cd ${WRKSRC} && \
+		${COPYTREE_SHARE} docs ${DOCSDIR}/ "! -regex .*/man3.*")
 .endif
 	@${DISPLAY_MSG}

--- a/devel/sdl12/distinfo
+++ b/devel/sdl12/distinfo
@ -1,3 +1,3 @@
-MD5 (SDL-1.2.9.tar.gz) = 80919ef556425ff82a8555ff40a579a0
-SHA256 (SDL-1.2.9.tar.gz) = d5a168968051536641ab5a3ba5fc234383511c77a8bc5ceb8bed619bdd42e5f9
-SIZE (SDL-1.2.9.tar.gz) = 2688179
+MD5 (SDL-1.2.11.tar.gz) = 418b42956b7cd103bfab1b9077ccc149
+SHA256 (SDL-1.2.11.tar.gz) = 6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730
+SIZE (SDL-1.2.11.tar.gz) = 2796407
--- a/devel/sdl12/files/patch-Makefile.in
+++ b/devel/sdl12/files/patch-Makefile.in
@ -0,0 +1,11 @@
+--- Makefile.in.orig	Wed Jul  5 00:58:18 2006
+++ Makefile.in	Wed Jul  5 01:06:48 2006
+@@ -44,7 +44,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)/$(SDLMAIN_TARGET)
+ 
--- a/devel/sdl12/files/patch-ac
+++ b/devel/sdl12/files/patch-ac
@ -1,39 +0,0 @@
--- configure.orig	Mon Feb 23 06:32:33 2004
-+++ configure	Wed Mar 17 19:23:24 2004
-@@ -21171,7 +21171,7 @@
- 
- 
- SDL_CFLAGS=""
-SDL_LIBS="-lSDL"
-+SDL_LIBS="-lSDL-1.1"
- 
- 
- case "$target" in
-@@ -25926,8 +25926,8 @@
- #            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
-             ;;
-         *-*-freebsd*)
-            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
-            pthread_lib="-pthread"
-+            pthread_cflags="-D_REENTRANT ${PTHREAD_CFLAGS}"
-+            pthread_lib="${PTHREAD_LIBS}"
-             ;;
-         *-*-netbsd*)
-             pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
-@@ -28394,14 +28394,13 @@
- fi
- 
- 
-        if test x$have_usb_h = xyes; then
-            CFLAGS="$CFLAGS -DHAVE_USB_H"
-        fi
-         if test x$have_usbhid_h = xyes; then
-             CFLAGS="$CFLAGS -DHAVE_USBHID_H"
-         fi
-         if test x$have_libusb_h = xyes; then
-+	    if test x$have_libusbhid_h = xno; then
-             CFLAGS="$CFLAGS -DHAVE_LIBUSB_H"
-+	    fi
-         fi
-         if test x$have_libusbhid_h = xyes; then
-             CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H"
--- a/devel/sdl12/files/patch-ag
+++ b/devel/sdl12/files/patch-ag
@ -1,26 +0,0 @@
--- src/Makefile.in.orig	Mon Feb 23 08:32:05 2004
-+++ src/Makefile.in	Mon Mar  8 18:41:14 2004
-@@ -296,12 +296,12 @@
- DIST_SUBDIRS = $(CORE_SUBDIRS) $(EXTRA_SUBDIRS)
- 
- # The SDL library target
-lib_LTLIBRARIES = libSDL.la
-+lib_LTLIBRARIES = libSDL-1.1.la
- libSDL_la_SOURCES = $(GENERAL_SRCS)
- libSDL_la_LDFLAGS = \
- 	-no-undefined		\
-        -release $(LT_RELEASE)	\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+#        -release $(LT_RELEASE)	\
- 
- libSDL_la_LIBADD = \
- 	main/libarch.la		\
-@@ -383,7 +383,7 @@
- 	  echo "rm -f \"$${dir}/so_locations\""; \
- 	  rm -f "$${dir}/so_locations"; \
- 	done
-libSDL.la: $(libSDL_la_OBJECTS) $(libSDL_la_DEPENDENCIES) 
-+libSDL-1.1.la: $(libSDL_la_OBJECTS) $(libSDL_la_DEPENDENCIES) 
- 	$(LINK) -rpath $(libdir) $(libSDL_la_LDFLAGS) $(libSDL_la_OBJECTS) $(libSDL_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--- a/devel/sdl12/files/patch-ah
+++ b/devel/sdl12/files/patch-ah
@ -1,26 +0,0 @@
--- src/main/Makefile.in.orig	Mon Feb 23 08:32:20 2004
-+++ src/main/Makefile.in	Mon Mar  8 15:59:18 2004
-@@ -319,7 +319,7 @@
- 
- 
- # Build a separate library containing the main() entry point.
-lib_LIBRARIES = libSDLmain.a
-+lib_LIBRARIES = libSDLmain-1.1.a
- @TARGET_MACOSX_FALSE@@TARGET_QTOPIA_FALSE@@TARGET_WIN32_FALSE@MAINLIB_ARCH_SRCS = dummy/SDL_dummy_main.c
- @TARGET_MACOSX_FALSE@@TARGET_QTOPIA_TRUE@@TARGET_WIN32_FALSE@MAINLIB_ARCH_SRCS = qtopia/SDL_qtopia_main.cc
- @TARGET_MACOSX_TRUE@@TARGET_WIN32_FALSE@MAINLIB_ARCH_SRCS = macosx/SDLMain.m macosx/SDLMain.h
-@@ -393,10 +393,10 @@
- 
- clean-libLIBRARIES:
- 	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
-libSDLmain.a: $(libSDLmain_a_OBJECTS) $(libSDLmain_a_DEPENDENCIES) 
-	-rm -f libSDLmain.a
-	$(libSDLmain_a_AR) libSDLmain.a $(libSDLmain_a_OBJECTS) $(libSDLmain_a_LIBADD)
-	$(RANLIB) libSDLmain.a
-+libSDLmain-1.1.a: $(libSDLmain_a_OBJECTS) $(libSDLmain_a_DEPENDENCIES) 
-+	-rm -f libSDLmain-1.1.a
-+	$(libSDLmain_a_AR) libSDLmain-1.1.a $(libSDLmain_a_OBJECTS) $(libSDLmain_a_LIBADD)
-+	$(RANLIB) libSDLmain-1.1.a
- 
- clean-noinstLTLIBRARIES:
- 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
--- a/devel/sdl12/files/patch-ai
+++ b/devel/sdl12/files/patch-ai
@ -1,11 +0,0 @@
--- include/Makefile.in.orig	Mon Feb 23 08:32:04 2004
-+++ include/Makefile.in	Mon Mar  8 16:00:11 2004
-@@ -256,7 +256,7 @@
- target_vendor = @target_vendor@
- 
- # The directory where the include files will be installed
-libSDLincludedir = $(includedir)/SDL
-+libSDLincludedir = $(includedir)/SDL11
- 
- # Which header files to install
- libSDLinclude_HEADERS = \
--- a/devel/sdl12/files/patch-aj
+++ b/devel/sdl12/files/patch-aj
@ -1,60 +0,0 @@
--- Makefile.in.orig	Mon Feb 23 08:32:04 2004
-+++ Makefile.in	Mon Mar  8 16:01:47 2004
-@@ -81,7 +81,7 @@
- GZIP_ENV = --best
- distuninstallcheck_listfiles = find . -type f -print
- distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-+ACLOCAL = #@ACLOCAL@
- ALLOCA = @ALLOCA@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -93,9 +93,9 @@
- ASFLAGS = @ASFLAGS@
- AUDIO_DRIVERS = @AUDIO_DRIVERS@
- AUDIO_SUBDIRS = @AUDIO_SUBDIRS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-+AUTOCONF = #@AUTOCONF@
-+AUTOHEADER = #@AUTOHEADER@
-+AUTOMAKE = #@AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCAS = @CCAS@
-@@ -285,7 +285,7 @@
- DIST_SUBDIRS = $(SUBDIRS)
- 
- # SDL runtime configuration script
-bin_SCRIPTS = sdl-config
-+bin_SCRIPTS = sdl11-config
- 
- # All the rest of the distributed files
- EXTRA_DIST = \
-@@ -321,7 +321,7 @@
- 	EpocBuildFiles.zip \
- 	WhatsNew	\
- 	docs.html	\
-	sdl.m4		\
-+	sdl11.m4	\
- 	SDL.spec	\
- 	autogen.sh	\
- 	strip_fPIC.sh
-@@ -329,7 +329,7 @@
- 
- # M4 macro file for inclusion with autoconf
- m4datadir = $(datadir)/aclocal
-m4data_DATA = sdl.m4
-+m4data_DATA = sdl11.m4
- 
- # Create a CVS snapshot that people can run update -d on
- CVSROOT = :pserver:guest@libsdl.org:/home/sdlweb/libsdl.org/cvs
-@@ -369,7 +369,7 @@
- 	cd $(srcdir) && $(AUTOCONF)
- $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
- 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-sdl-config: $(top_builddir)/config.status $(srcdir)/sdl-config.in
-+sdl11-config: $(top_builddir)/config.status $(srcdir)/sdl-config.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- SDL.spec: $(top_builddir)/config.status $(srcdir)/SDL.spec.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
--- a/devel/sdl12/files/patch-ak
+++ b/devel/sdl12/files/patch-ak
@ -1,23 +0,0 @@
-
-$FreeBSD$
-
--- sdl-config.in.orig	Mon Sep  9 08:28:06 2002
-+++ sdl-config.in	Fri Jan  3 10:43:28 2003
-@@ -5,7 +5,7 @@
- exec_prefix_set=no
- 
- usage="\
-Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
-+Usage: sdl11-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
- 
- if test $# -eq 0; then
-       echo "${usage}" 1>&2
-@@ -39,7 +39,7 @@
-       echo @SDL_VERSION@
-       ;;
-     --cflags)
-      echo -I@includedir@/SDL @SDL_CFLAGS@
-+      echo -I@includedir@/SDL11 -I@includedir@ @SDL_CFLAGS@
- 
-       # The portable way of including SDL is #include "SDL.h"
-       #if test @includedir@ != /usr/include ; then
--- a/devel/sdl12/files/patch-configure
+++ b/devel/sdl12/files/patch-configure
@ -0,0 +1,13 @@
+--- configure.orig	Wed Jul  5 00:52:15 2006
+++ configure	Wed Jul  5 01:01:28 2006
+@@ -29772,8 +29772,8 @@
+ #            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
+             ;;
+         *-*-freebsd*|*-*-dragonfly*)
+-            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
+-            pthread_lib="-pthread"
+            pthread_cflags="-D_REENTRANT ${PTHREAD_CFLAGS}"
+            pthread_lib="${PTHREAD_LIBS}"
+             ;;
+         *-*-netbsd*)
+             pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
--- a/devel/sdl12/files/patch-sdl-config.in
+++ b/devel/sdl12/files/patch-sdl-config.in
@ -0,0 +1,15 @@
+#
+# Temporary hack to provide iconv include directory is well
+# (sdl explicitly includes iconv.h)
+#
+--- sdl-config.in.orig	Thu Aug 31 03:54:26 2006
+++ sdl-config.in	Thu Aug 31 03:54:39 2006
+@@ -41,7 +41,7 @@
+       echo @SDL_VERSION@
+       ;;
+     --cflags)
+-      echo -I@includedir@/SDL @SDL_CFLAGS@
+      echo -I@includedir@/SDL -I@includedir@ @SDL_CFLAGS@
+       ;;
+ @ENABLE_SHARED_TRUE@    --libs)
+ @ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
--- a/devel/sdl12/files/patch-sdl.pc.in
+++ b/devel/sdl12/files/patch-sdl.pc.in
@ -0,0 +1,12 @@
+#
+# Temporary hack to provide iconv include directory is well
+# (sdl explicitly includes iconv.h)
+#
+--- sdl.pc.in.orig	Thu Aug 31 03:47:07 2006
+++ sdl.pc.in	Thu Aug 31 03:47:19 2006
+@@ -11,4 +11,4 @@
+ Requires:
+ Conflicts:
+ Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@
+-Cflags: -I${includedir}/SDL @SDL_CFLAGS@
+Cflags: -I${includedir}/SDL -I${includedir} @SDL_CFLAGS@
--- a/devel/sdl12/files/patch-src_hermes_HeadMMX.h
+++ b/devel/sdl12/files/patch-src_hermes_HeadMMX.h
@ -1,39 +0,0 @@
-
-$FreeBSD$
-
--- src/hermes/HeadMMX.h.orig
-+++ src/hermes/HeadMMX.h
-@@ -50,21 +50,19 @@
-   extern "C" {   
-   #endif
- 
-  void ConvertMMX(HermesConverterInterface *) __attribute__ ((alias ("_ConvertMMX")));
-#if 0
-  void ClearMMX_32(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_32")));
-  void ClearMMX_24(HermesClearInterface *)  __attribute__ ((alias ("_ClearMMX_24")));
-  void ClearMMX_16(HermesClearInterface *)  __attribute__ ((alias ("_ClearMMX_16")));
-  void ClearMMX_8(HermesClearInterface *)  __attribute__ ((alias ("_ClearMMX_8")));
-
-  void ConvertMMXp32_16RGB555() __attribute__ ((alias ("_ConvertMMXp32_16RGB555")));
-#endif
-+  extern void _ConvertMMX(HermesConverterInterface *);
-+  extern void _ConvertMMXpII32_24RGB888();
-+  extern void _ConvertMMXpII32_16RGB565();
-+  extern void _ConvertMMXpII32_16BGR565();
-+  extern void _ConvertMMXpII32_16RGB555();
-+  extern void _ConvertMMXpII32_16BGR555();
- 
-  void ConvertMMXpII32_24RGB888() __attribute__ ((alias ("_ConvertMMXpII32_24RGB888")));
-  void ConvertMMXpII32_16RGB565() __attribute__ ((alias ("_ConvertMMXpII32_16RGB565")));
-  void ConvertMMXpII32_16BGR565() __attribute__ ((alias ("_ConvertMMXpII32_16BGR565")));
-  void ConvertMMXpII32_16RGB555() __attribute__ ((alias ("_ConvertMMXpII32_16RGB555")));
-  void ConvertMMXpII32_16BGR555() __attribute__ ((alias ("_ConvertMMXpII32_16BGR555")));
-+  #define ConvertMMX _ConvertMMX
-+  #define ConvertMMXpII32_24RGB888 _ConvertMMXpII32_24RGB888
-+  #define ConvertMMXpII32_16RGB565 _ConvertMMXpII32_16RGB565
-+  #define ConvertMMXpII32_16BGR565 _ConvertMMXpII32_16BGR565
-+  #define ConvertMMXpII32_16RGB555 _ConvertMMXpII32_16RGB555
-+  #define ConvertMMXpII32_16BGR555 _ConvertMMXpII32_16BGR555
- 
-   #ifdef __cplusplus
-   }
--- a/devel/sdl12/files/patch-src_hermes_HeadX86.h
+++ b/devel/sdl12/files/patch-src_hermes_HeadX86.h
@ -1,96 +0,0 @@
-
-$FreeBSD$
-
--- src/hermes/HeadX86.h.orig
-+++ src/hermes/HeadX86.h
-@@ -79,56 +79,47 @@
-   extern "C" {
-   #endif
- 
-  int Hermes_X86_CPU() __attribute__ ((alias ("_Hermes_X86_CPU")));
-+  extern int _Hermes_X86_CPU();
- 
-  void ConvertX86(HermesConverterInterface *) __attribute__ ((alias ("_ConvertX86")));
-+  extern void _ConvertX86(HermesConverterInterface *);
- 
-#if 0
-  void ClearX86_32(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_32")));
-  void ClearX86_24(HermesClearInterface *)  __attribute__ ((alias ("_ClearX86_24")));
-  void ClearX86_16(HermesClearInterface *)  __attribute__ ((alias ("_ClearX86_16")));
-  void ClearX86_8(HermesClearInterface *)  __attribute__ ((alias ("_ClearX86_8")));
-#endif
-+  extern void _ConvertX86p32_32BGR888();
-+  extern void _ConvertX86p32_32RGBA888();
-+  extern void _ConvertX86p32_32BGRA888();
-+  extern void _ConvertX86p32_24RGB888();
-+  extern void _ConvertX86p32_24BGR888();
-+  extern void _ConvertX86p32_16RGB565();
-+  extern void _ConvertX86p32_16BGR565();
-+  extern void _ConvertX86p32_16RGB555();
-+  extern void _ConvertX86p32_16BGR555();
-+  extern void _ConvertX86p32_8RGB332();
- 
-  void ConvertX86p32_32BGR888() __attribute__ ((alias ("_ConvertX86p32_32BGR888")));
-  void ConvertX86p32_32RGBA888() __attribute__ ((alias ("_ConvertX86p32_32RGBA888")));
-  void ConvertX86p32_32BGRA888() __attribute__ ((alias ("_ConvertX86p32_32BGRA888")));
-  void ConvertX86p32_24RGB888() __attribute__ ((alias ("_ConvertX86p32_24RGB888")));
-  void ConvertX86p32_24BGR888() __attribute__ ((alias ("_ConvertX86p32_24BGR888")));
-  void ConvertX86p32_16RGB565() __attribute__ ((alias ("_ConvertX86p32_16RGB565")));
-  void ConvertX86p32_16BGR565() __attribute__ ((alias ("_ConvertX86p32_16BGR565")));
-  void ConvertX86p32_16RGB555() __attribute__ ((alias ("_ConvertX86p32_16RGB555")));
-  void ConvertX86p32_16BGR555() __attribute__ ((alias ("_ConvertX86p32_16BGR555")));
-  void ConvertX86p32_8RGB332() __attribute__ ((alias ("_ConvertX86p32_8RGB332")));
-+  extern void _ConvertX86p16_16BGR565();
-+  extern void _ConvertX86p16_16RGB555();
-+  extern void _ConvertX86p16_16BGR555();
-+  extern void _ConvertX86p16_8RGB332();
- 
-#if 0
-  void ConvertX86p16_32RGB888() __attribute__ ((alias ("_ConvertX86p16_32RGB888")));
-  void ConvertX86p16_32BGR888() __attribute__ ((alias ("_ConvertX86p16_32BGR888")));
-  void ConvertX86p16_32RGBA888() __attribute__ ((alias ("_ConvertX86p16_32RGBA888")));
-  void ConvertX86p16_32BGRA888() __attribute__ ((alias ("_ConvertX86p16_32BGRA888")));
-  void ConvertX86p16_24RGB888() __attribute__ ((alias ("_ConvertX86p16_24RGB888")));
-  void ConvertX86p16_24BGR888() __attribute__ ((alias ("_ConvertX86p16_24BGR888")));
-#endif
-  void ConvertX86p16_16BGR565() __attribute__ ((alias ("_ConvertX86p16_16BGR565")));
-  void ConvertX86p16_16RGB555() __attribute__ ((alias ("_ConvertX86p16_16RGB555")));
-  void ConvertX86p16_16BGR555() __attribute__ ((alias ("_ConvertX86p16_16BGR555")));
-  void ConvertX86p16_8RGB332() __attribute__ ((alias ("_ConvertX86p16_8RGB332")));
- 
-#if 0
-  void CopyX86p_4byte() __attribute__ ((alias ("_CopyX86p_4byte")));
-  void CopyX86p_3byte() __attribute__ ((alias ("_CopyX86p_3byte")));
-  void CopyX86p_2byte() __attribute__ ((alias ("_CopyX86p_2byte")));
-  void CopyX86p_1byte() __attribute__ ((alias ("_CopyX86p_1byte")));
-+  #define Hermes_X86_CPU _Hermes_X86_CPU
- 
-  void ConvertX86pI8_32() __attribute__ ((alias ("_ConvertX86pI8_32")));
-  void ConvertX86pI8_24() __attribute__ ((alias ("_ConvertX86pI8_24")));
-  void ConvertX86pI8_16() __attribute__ ((alias ("_ConvertX86pI8_16")));
-+  #define ConvertX86 _ConvertX86
-+
-+  #define ConvertX86p32_32BGR888 _ConvertX86p32_32BGR888
-+  #define ConvertX86p32_32RGBA888 _ConvertX86p32_32RGBA888
-+  #define ConvertX86p32_32BGRA888 _ConvertX86p32_32BGRA888
-+  #define ConvertX86p32_24RGB888 _ConvertX86p32_24RGB888
-+  #define ConvertX86p32_24BGR888 _ConvertX86p32_24BGR888
-+  #define ConvertX86p32_16RGB565 _ConvertX86p32_16RGB565
-+  #define ConvertX86p32_16BGR565 _ConvertX86p32_16BGR565
-+  #define ConvertX86p32_16RGB555 _ConvertX86p32_16RGB555
-+  #define ConvertX86p32_16BGR555 _ConvertX86p32_16BGR555
-+  #define ConvertX86p32_8RGB332 _ConvertX86p32_8RGB332
-+
-+  #define ConvertX86p16_16BGR565 _ConvertX86p16_16BGR565
-+  #define ConvertX86p16_16RGB555 _ConvertX86p16_16RGB555
-+  #define ConvertX86p16_16BGR555 _ConvertX86p16_16BGR555
-+  #define ConvertX86p16_8RGB332 _ConvertX86p16_8RGB332
- 
-  extern int ConvertX86p16_32RGB888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGB888_LUT_X86")));
-  extern int ConvertX86p16_32BGR888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGR888_LUT_X86")));
-  extern int ConvertX86p16_32RGBA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGBA888_LUT_X86")));
-  extern int ConvertX86p16_32BGRA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGRA888_LUT_X86")));
-#endif
- 
-   #ifdef __cplusplus
-   }
--- a/devel/sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c
+++ b/devel/sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c
@ -1,6 +1,6 @@
--- src/joystick/bsd/SDL_sysjoystick.c.orig	Fri Nov 12 22:24:46 2004
-+++ src/joystick/bsd/SDL_sysjoystick.c	Tue Nov  8 20:19:38 2005
-@@ -122,6 +122,12 @@
+--- src/joystick/bsd/SDL_sysjoystick.c.orig	Mon May  1 12:02:40 2006
+++ src/joystick/bsd/SDL_sysjoystick.c	Wed Jul  5 01:11:57 2006
+@@ -123,6 +123,12 @@
 	struct	report_desc *repdesc;
 	struct	report inreport;
 	int	axis_map[JOYAXE_count];	/* map present JOYAXE_* to 0,1,..*/
@ -13,7 +13,7 @@
 };
 
 static char *joynames[MAX_JOYS];
-@@ -255,6 +261,12 @@
+@@ -257,6 +263,12 @@
 	joy->hwdata = hw;
 	hw->fd = fd;
 	hw->path = strdup(path);
@ -23,12 +23,12 @@
 +	hw->ymin = 0xffff;
 +	hw->xmax = 0;
 +	hw->ymax = 0;
- 	if (! strncmp(path, "/dev/joy", 8)) {
+ 	if (! SDL_strncmp(path, "/dev/joy", 8)) {
 		hw->type = BSDJOY_JOY;
 		joy->naxes = 2;
-@@ -372,43 +384,42 @@
+@@ -380,43 +392,42 @@
 
- #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
 	struct joystick gameport;
 -	static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
  
--- a/devel/sdl12/files/patch-src_video_SDLyuvmmx.c
+++ b/devel/sdl12/files/patch-src_video_SDLyuvmmx.c
@ -1,324 +0,0 @@
-
-$FreeBSD$
-
--- src/video/SDL_yuv_mmx.c.orig
-+++ src/video/SDL_yuv_mmx.c
-@@ -30,42 +30,31 @@
- 
- #include "SDL_types.h"
- 
-#if __GNUC__ > 2
-#    undef GCC2_HACK
-#else
-#    define GCC2_HACK
-#endif
-
- 
-#if defined(GCC2_HACK) && defined (__ELF__)
-#define ASM_VAR(X) _##X
-#else
-#define ASM_VAR(X) X
-#endif
-+#define ASM_ARRAY(x) x[] __asm__("_" #x) __attribute__((used))
-  
-static volatile unsigned int  ASM_VAR(MMX_0080w)[]    = {0x00800080, 0x00800080};
-static volatile unsigned int  ASM_VAR(MMX_00FFw)[]    = {0x00ff00ff, 0x00ff00ff}; 
-static volatile unsigned int  ASM_VAR(MMX_FF00w)[]    = {0xff00ff00, 0xff00ff00}; 
-+static unsigned int  ASM_ARRAY(MMX_0080w)    = {0x00800080, 0x00800080};
-+static unsigned int  ASM_ARRAY(MMX_00FFw)    = {0x00ff00ff, 0x00ff00ff};
-+static unsigned int  ASM_ARRAY(MMX_FF00w)    = {0xff00ff00, 0xff00ff00};
- 
-static volatile unsigned short ASM_VAR(MMX_Ycoeff)[]  = {0x004a, 0x004a, 0x004a, 0x004a}; 
-+static unsigned short ASM_ARRAY(MMX_Ycoeff)  = {0x004a, 0x004a, 0x004a, 0x004a};
- 
-static volatile unsigned short ASM_VAR(MMX_UbluRGB)[] = {0x0072, 0x0072, 0x0072, 0x0072};    
-static volatile unsigned short ASM_VAR(MMX_VredRGB)[] = {0x0059, 0x0059, 0x0059, 0x0059};  
-static volatile unsigned short ASM_VAR(MMX_UgrnRGB)[] = {0xffea, 0xffea, 0xffea, 0xffea}; 
-static volatile unsigned short ASM_VAR(MMX_VgrnRGB)[] = {0xffd2, 0xffd2, 0xffd2, 0xffd2};  
-+static unsigned short ASM_ARRAY(MMX_UbluRGB) = {0x0072, 0x0072, 0x0072, 0x0072};
-+static unsigned short ASM_ARRAY(MMX_VredRGB) = {0x0059, 0x0059, 0x0059, 0x0059};
-+static unsigned short ASM_ARRAY(MMX_UgrnRGB) = {0xffea, 0xffea, 0xffea, 0xffea};
-+static unsigned short ASM_ARRAY(MMX_VgrnRGB) = {0xffd2, 0xffd2, 0xffd2, 0xffd2};
- 
-static volatile unsigned short ASM_VAR(MMX_Ublu5x5)[] = {0x0081, 0x0081, 0x0081, 0x0081};
-static volatile unsigned short ASM_VAR(MMX_Vred5x5)[] = {0x0066, 0x0066, 0x0066, 0x0066};
-static volatile unsigned short ASM_VAR(MMX_Ugrn555)[] = {0xffe7, 0xffe7, 0xffe7, 0xffe7};
-static volatile unsigned short ASM_VAR(MMX_Vgrn555)[] = {0xffcc, 0xffcc, 0xffcc, 0xffcc};
-static volatile unsigned short ASM_VAR(MMX_Ugrn565)[] = {0xffe8, 0xffe8, 0xffe8, 0xffe8};
-static volatile unsigned short ASM_VAR(MMX_Vgrn565)[] = {0xffcd, 0xffcd, 0xffcd, 0xffcd};
-+static unsigned short ASM_ARRAY(MMX_Ublu5x5) = {0x0081, 0x0081, 0x0081, 0x0081};
-+static unsigned short ASM_ARRAY(MMX_Vred5x5) = {0x0066, 0x0066, 0x0066, 0x0066};
-+static unsigned short ASM_ARRAY(MMX_Ugrn555) = {0xffe7, 0xffe7, 0xffe7, 0xffe7};
-+static unsigned short ASM_ARRAY(MMX_Vgrn555) = {0xffcc, 0xffcc, 0xffcc, 0xffcc};
-+static unsigned short ASM_ARRAY(MMX_Ugrn565) = {0xffe8, 0xffe8, 0xffe8, 0xffe8};
-+static unsigned short ASM_ARRAY(MMX_Vgrn565) = {0xffcd, 0xffcd, 0xffcd, 0xffcd};
- 
-static volatile unsigned short ASM_VAR(MMX_red555)[]  = {0x7c00, 0x7c00, 0x7c00, 0x7c00};
-static volatile unsigned short ASM_VAR(MMX_red565)[]  = {0xf800, 0xf800, 0xf800, 0xf800};
-static volatile unsigned short ASM_VAR(MMX_grn555)[]  = {0x03e0, 0x03e0, 0x03e0, 0x03e0};
-static volatile unsigned short ASM_VAR(MMX_grn565)[]  = {0x07e0, 0x07e0, 0x07e0, 0x07e0};
-static volatile unsigned short ASM_VAR(MMX_blu5x5)[]  = {0x001f, 0x001f, 0x001f, 0x001f};
-+static unsigned short ASM_ARRAY(MMX_red555)  = {0x7c00, 0x7c00, 0x7c00, 0x7c00};
-+static unsigned short ASM_ARRAY(MMX_red565)  = {0xf800, 0xf800, 0xf800, 0xf800};
-+static unsigned short ASM_ARRAY(MMX_grn555)  = {0x03e0, 0x03e0, 0x03e0, 0x03e0};
-+static unsigned short ASM_ARRAY(MMX_grn565)  = {0x07e0, 0x07e0, 0x07e0, 0x07e0};
-+static unsigned short ASM_ARRAY(MMX_blu5x5)  = {0x001f, 0x001f, 0x001f, 0x001f};
- 
- /**
-    This MMX assembler is my first assembler/MMX program ever.
-@@ -127,21 +116,12 @@
- 		 "movd (%2), %%mm2\n"           //    0  0  0  0 l3 l2 l1 l0
- 		 "punpcklbw %%mm7,%%mm1\n" //         0  v3 0  v2 00 v1 00 v0
- 		 "punpckldq %%mm1,%%mm1\n" //         00 v1 00 v0 00 v1 00 v0
-#ifdef GCC2_HACK
- 		 "psubw _MMX_0080w,%%mm1\n"  // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0 
-#else
-		 "psubw %[_MMX_0080w],%%mm1\n"  // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0 
-#endif
- 
- 		 // create Cr_g (result in mm0)
- 		 "movq %%mm1,%%mm0\n"           // r1 r1 r0 r0 r1 r1 r0 r0
-#ifdef GCC2_HACK
- 		 "pmullw _MMX_VgrnRGB,%%mm0\n"// red*-46dec=0.7136*64
- 		 "pmullw _MMX_VredRGB,%%mm1\n"// red*89dec=1.4013*64
-#else
-		 "pmullw %[_MMX_VgrnRGB],%%mm0\n"// red*-46dec=0.7136*64
-		 "pmullw %[_MMX_VredRGB],%%mm1\n"// red*89dec=1.4013*64
-#endif
- 		 "psraw  $6, %%mm0\n"           // red=red/64
- 		 "psraw  $6, %%mm1\n"           // red=red/64
- 		 
-@@ -150,13 +130,8 @@
- 		 "movq (%2,%4),%%mm3\n"         //    0  0  0  0 L3 L2 L1 L0
- 		 "punpckldq %%mm3,%%mm2\n"      //   L3 L2 L1 L0 l3 l2 l1 l0
- 		 "movq %%mm2,%%mm4\n"           //   L3 L2 L1 L0 l3 l2 l1 l0
-#ifdef GCC2_HACK
- 		 "pand _MMX_FF00w,%%mm2\n"      //   L3 0  L1  0 l3  0 l1  0
- 		 "pand _MMX_00FFw,%%mm4\n"      //   0  L2  0 L0  0 l2  0 l0
-#else
-		 "pand %[_MMX_FF00w],%%mm2\n"      //   L3 0  L1  0 l3  0 l1  0
-		 "pand %[_MMX_00FFw],%%mm4\n"      //   0  L2  0 L0  0 l2  0 l0
-#endif
- 		 "psrlw $8,%%mm2\n"             //   0  L3  0 L1  0 l3  0 l1
- 
- 		 // create R (result in mm6)
-@@ -173,20 +148,11 @@
- 		 "movd (%1), %%mm1\n"      //         0  0  0  0  u3 u2 u1 u0
- 		 "punpcklbw %%mm7,%%mm1\n" //         0  u3 0  u2 00 u1 00 u0
- 		 "punpckldq %%mm1,%%mm1\n" //         00 u1 00 u0 00 u1 00 u0
-#ifdef GCC2_HACK
- 		 "psubw _MMX_0080w,%%mm1\n"  // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0 
-#else
-		 "psubw %[_MMX_0080w],%%mm1\n"  // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0 
-#endif
- 		 // create Cb_g (result in mm5)
- 		 "movq %%mm1,%%mm5\n"            // u1 u1 u0 u0 u1 u1 u0 u0
-#ifdef GCC2_HACK
- 		 "pmullw _MMX_UgrnRGB,%%mm5\n"    // blue*-109dec=1.7129*64
- 		 "pmullw _MMX_UbluRGB,%%mm1\n"    // blue*114dec=1.78125*64
-#else
-		 "pmullw %[_MMX_UgrnRGB],%%mm5\n"    // blue*-109dec=1.7129*64
-		 "pmullw %[_MMX_UbluRGB],%%mm1\n"    // blue*114dec=1.78125*64
-#endif
- 		 "psraw  $6, %%mm5\n"            // blue=red/64
- 		 "psraw  $6, %%mm1\n"            // blue=blue/64
- 
-@@ -268,17 +234,7 @@
- 		 "popl %%ebx\n"
- 		 :
- 		 : "m" (cr), "r"(cb),"r"(lum),
-		 "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)
-#ifndef GCC2_HACK
-		 ,[_MMX_0080w] "m" (*MMX_0080w),
-		 [_MMX_00FFw] "m" (*MMX_00FFw),
-		 [_MMX_FF00w] "m" (*MMX_FF00w),
-		 [_MMX_VgrnRGB] "m" (*MMX_VgrnRGB),
-		 [_MMX_VredRGB] "m" (*MMX_VredRGB),
-		 [_MMX_UgrnRGB] "m" (*MMX_UgrnRGB),
-		 [_MMX_UbluRGB] "m" (*MMX_UbluRGB)
-#endif
-			 );
-+		 "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod));
- }
- 
- void Color565DitherYV12MMX1X( int *colortab, Uint32 *rgb_2_pix,
-@@ -307,48 +263,21 @@
-          "movd           (%%ebx),                %%mm1\n" // 4 Cr                0  0  0  0 v3 v2 v1 v0
-          "punpcklbw      %%mm7,                  %%mm0\n" // 4 W cb   0 u3  0 u2  0 u1  0 u0
-          "punpcklbw      %%mm7,                  %%mm1\n" // 4 W cr   0 v3  0 v2  0 v1  0 v0
-#ifdef GCC2_HACK
-          "psubw          _MMX_0080w,             %%mm0\n"
-          "psubw          _MMX_0080w,             %%mm1\n"
-#else
-         "psubw          %[_MMX_0080w],             %%mm0\n"
-         "psubw          %[_MMX_0080w],             %%mm1\n"
-#endif
-          "movq           %%mm0,                  %%mm2\n" // Cb                   0 u3  0 u2  0 u1  0 u0
-          "movq           %%mm1,                  %%mm3\n" // Cr
-#ifdef GCC2_HACK
-          "pmullw         _MMX_Ugrn565,           %%mm2\n" // Cb2green 0 R3  0 R2  0 R1  0 R0
-#else
-         "pmullw         %[_MMX_Ugrn565],           %%mm2\n" // Cb2green 0 R3  0 R2  0 R1  0 R0
-#endif
-          "movq           (%2),                   %%mm6\n" // L1      l7 L6 L5 L4 L3 L2 L1 L0
-#ifdef GCC2_HACK
-          "pmullw         _MMX_Ublu5x5,           %%mm0\n" // Cb2blue
-          "pand           _MMX_00FFw,             %%mm6\n" // L1      00 L6 00 L4 00 L2 00 L0
-          "pmullw         _MMX_Vgrn565,           %%mm3\n" // Cr2green
-#else
-         "pmullw         %[_MMX_Ublu5x5],           %%mm0\n" // Cb2blue
-         "pand           %[_MMX_00FFw],             %%mm6\n" // L1      00 L6 00 L4 00 L2 00 L0
-         "pmullw         %[_MMX_Vgrn565],           %%mm3\n" // Cr2green
-#endif
-          "movq           (%2),                   %%mm7\n" // L2
-#ifdef GCC2_HACK
-          "pmullw         _MMX_Vred5x5,           %%mm1\n" // Cr2red
-#else
-         "pmullw         %[_MMX_Vred5x5],           %%mm1\n" // Cr2red
-#endif
-          "psrlw          $8,                     %%mm7\n"        // L2           00 L7 00 L5 00 L3 00 L1
-#ifdef GCC2_HACK
-          "pmullw         _MMX_Ycoeff,            %%mm6\n" // lum1
-#else
-         "pmullw         %[_MMX_Ycoeff],            %%mm6\n" // lum1
-#endif
-          "paddw          %%mm3,                  %%mm2\n" // Cb2green + Cr2green == green
-#ifdef GCC2_HACK
-          "pmullw         _MMX_Ycoeff,            %%mm7\n" // lum2
-#else
-         "pmullw         %[_MMX_Ycoeff],            %%mm7\n" // lum2
-#endif
- 
-          "movq           %%mm6,                  %%mm4\n" // lum1
-          "paddw          %%mm0,                  %%mm6\n" // lum1 +blue 00 B6 00 B4 00 B2 00 B0
-@@ -366,20 +295,11 @@
-          "punpcklbw      %%mm4,                  %%mm4\n"
-          "punpcklbw      %%mm5,                  %%mm5\n"
- 
-#ifdef GCC2_HACK
-          "pand           _MMX_red565,            %%mm4\n"
-#else
-         "pand           %[_MMX_red565],            %%mm4\n"
-#endif
-          "psllw          $3,                     %%mm5\n" // GREEN       1
-          "punpcklbw      %%mm6,                  %%mm6\n"
-#ifdef GCC2_HACK
-          "pand           _MMX_grn565,            %%mm5\n"
-          "pand           _MMX_red565,            %%mm6\n"
-#else
-         "pand           %[_MMX_grn565],            %%mm5\n"
-         "pand           %[_MMX_red565],            %%mm6\n"
-#endif
-          "por            %%mm5,                  %%mm4\n" //
-          "psrlw          $11,                    %%mm6\n" // BLUE        1
-          "movq           %%mm3,                  %%mm5\n" // lum2
-@@ -393,44 +313,23 @@
-          "packuswb       %%mm3,                  %%mm3\n"
-          "packuswb       %%mm5,                  %%mm5\n"
-          "packuswb       %%mm7,                  %%mm7\n"
-#ifdef GCC2_HACK
-          "pand           _MMX_00FFw,             %%mm6\n" // L3
-#else
-         "pand           %[_MMX_00FFw],             %%mm6\n" // L3
-#endif
-          "punpcklbw      %%mm3,                  %%mm3\n"
-          "punpcklbw      %%mm5,                  %%mm5\n"
-#ifdef GCC2_HACK
-          "pmullw         _MMX_Ycoeff,            %%mm6\n" // lum3
-#else
-         "pmullw         %[_MMX_Ycoeff],            %%mm6\n" // lum3
-#endif
-          "punpcklbw      %%mm7,                  %%mm7\n"
-          "psllw          $3,                     %%mm5\n" // GREEN 2
-#ifdef GCC2_HACK
-          "pand           _MMX_red565,            %%mm7\n"
-          "pand           _MMX_red565,            %%mm3\n"
-#else
-         "pand           %[_MMX_red565],            %%mm7\n"
-         "pand           %[_MMX_red565],            %%mm3\n"
-#endif
-          "psrlw          $11,                    %%mm7\n" // BLUE  2
-#ifdef GCC2_HACK
-          "pand           _MMX_grn565,            %%mm5\n"
-#else
-         "pand           %[_MMX_grn565],            %%mm5\n"
-#endif
-          "por            %%mm7,                  %%mm3\n"
-          "movq           (%2,%4),                %%mm7\n" // L4 load lum2
-          "por            %%mm5,                  %%mm3\n" //
-          "psrlw          $8,                     %%mm7\n" // L4
-          "movq           %%mm4,                  %%mm5\n"
-          "punpcklwd      %%mm3,                  %%mm4\n"
-#ifdef GCC2_HACK
-          "pmullw         _MMX_Ycoeff,            %%mm7\n" // lum4
-#else
-         "pmullw         %[_MMX_Ycoeff],            %%mm7\n" // lum4
-#endif
-          "punpckhwd      %%mm3,                  %%mm5\n"
- 
-          "movq           %%mm4,                  (%3)\n"  // write row1
-@@ -457,20 +356,11 @@
-          "punpcklbw      %%mm5,                  %%mm5\n"
-          "punpcklbw      %%mm6,                  %%mm6\n"
-          "psllw          $3,                     %%mm5\n" // GREEN 3
-#ifdef GCC2_HACK
-          "pand           _MMX_red565,            %%mm4\n"
-#else
-         "pand           %[_MMX_red565],            %%mm4\n"
-#endif
-          "psraw          $6,                     %%mm3\n" // psr 6
-          "psraw          $6,                     %%mm0\n"
-#ifdef GCC2_HACK
-          "pand           _MMX_red565,            %%mm6\n" // BLUE
-          "pand           _MMX_grn565,            %%mm5\n"
-#else
-         "pand           %[_MMX_red565],            %%mm6\n" // BLUE
-         "pand           %[_MMX_grn565],            %%mm5\n"
-#endif
-          "psrlw          $11,                    %%mm6\n" // BLUE  3
-          "por            %%mm5,                  %%mm4\n"
-          "psraw          $6,                     %%mm7\n"
-@@ -481,20 +371,11 @@
-          "punpcklbw      %%mm3,                  %%mm3\n"
-          "punpcklbw      %%mm0,                  %%mm0\n"
-          "punpcklbw      %%mm7,                  %%mm7\n"
-#ifdef GCC2_HACK
-          "pand           _MMX_red565,            %%mm3\n"
-          "pand           _MMX_red565,            %%mm7\n" // BLUE
-#else
-         "pand           %[_MMX_red565],            %%mm3\n"
-         "pand           %[_MMX_red565],            %%mm7\n" // BLUE
-#endif
-          "psllw          $3,                     %%mm0\n" // GREEN 4
-          "psrlw          $11,                    %%mm7\n"
-#ifdef GCC2_HACK
-          "pand           _MMX_grn565,            %%mm0\n"
-#else
-         "pand           %[_MMX_grn565],            %%mm0\n"
-#endif
-          "por            %%mm7,                  %%mm3\n"
-          "por            %%mm0,                  %%mm3\n"
- 
-@@ -526,21 +407,7 @@
- 	 "popl %%ebx\n"
-          :
-          :"m" (cr), "r"(cb),"r"(lum),
-	 "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)
-#ifndef GCC2_HACK
-	 ,[_MMX_0080w] "m" (*MMX_0080w),
-	 [_MMX_Ugrn565] "m" (*MMX_Ugrn565),
-	 [_MMX_Ublu5x5] "m" (*MMX_Ublu5x5),
-	 [_MMX_00FFw] "m" (*MMX_00FFw),
-	 [_MMX_Vgrn565] "m" (*MMX_Vgrn565),
-	 [_MMX_Vred5x5] "m" (*MMX_Vred5x5),
-	 [_MMX_Ycoeff] "m" (*MMX_Ycoeff),
-	 [_MMX_red565] "m" (*MMX_red565),
-	 [_MMX_grn565] "m" (*MMX_grn565)
-#endif
-		 );
-+	 "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod));
- }
-
-#undef GCC2_HACK
- 
- #endif /* GCC i386 inline assembly */
--- a/devel/sdl12/pkg-plist
+++ b/devel/sdl12/pkg-plist
@ -1,85 +1,301 @@
-bin/sdl11-config
-include/SDL11/SDL.h
-include/SDL11/SDL_active.h
-include/SDL11/SDL_audio.h
-include/SDL11/SDL_byteorder.h
-include/SDL11/SDL_cdrom.h
-include/SDL11/SDL_copying.h
-include/SDL11/SDL_cpuinfo.h
-include/SDL11/SDL_endian.h
-include/SDL11/SDL_error.h
-include/SDL11/SDL_events.h
-include/SDL11/SDL_getenv.h
-include/SDL11/SDL_joystick.h
-include/SDL11/SDL_keyboard.h
-include/SDL11/SDL_keysym.h
-include/SDL11/SDL_loadso.h
-include/SDL11/SDL_main.h
-include/SDL11/SDL_mouse.h
-include/SDL11/SDL_mutex.h
-include/SDL11/SDL_name.h
-include/SDL11/SDL_opengl.h
-include/SDL11/SDL_quit.h
-include/SDL11/SDL_rwops.h
-include/SDL11/SDL_syswm.h
-include/SDL11/SDL_thread.h
-include/SDL11/SDL_timer.h
-include/SDL11/SDL_types.h
-include/SDL11/SDL_version.h
-include/SDL11/SDL_video.h
-include/SDL11/begin_code.h
-include/SDL11/close_code.h
-lib/libSDL-1.1.a
-lib/libSDL-1.1.la
-lib/libSDL-1.1.so
-lib/libSDL-1.1.so.7
-lib/libSDLmain-1.1.a
-share/aclocal/sdl11.m4
-%%EXAMPLESDIR%%/COPYING
-%%EXAMPLESDIR%%/Makefile.am
-%%EXAMPLESDIR%%/Makefile.in
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/acinclude.m4
-%%EXAMPLESDIR%%/aclocal.m4
-%%EXAMPLESDIR%%/autogen.sh
-%%EXAMPLESDIR%%/checkkeys.c
-%%EXAMPLESDIR%%/configure
-%%EXAMPLESDIR%%/configure.in
-%%EXAMPLESDIR%%/graywin.c
-%%EXAMPLESDIR%%/icon.bmp
-%%EXAMPLESDIR%%/loopwave.c
-%%EXAMPLESDIR%%/missing
-%%EXAMPLESDIR%%/moose.dat
-%%EXAMPLESDIR%%/picture.xbm
-%%EXAMPLESDIR%%/sail.bmp
-%%EXAMPLESDIR%%/sample.bmp
-%%EXAMPLESDIR%%/sample.wav
-%%EXAMPLESDIR%%/testalpha.c
-%%EXAMPLESDIR%%/testbitmap.c
-%%EXAMPLESDIR%%/testblitspeed.c
-%%EXAMPLESDIR%%/testcdrom.c
-%%EXAMPLESDIR%%/testcpuinfo.c
-%%EXAMPLESDIR%%/testdyngl.c
-%%EXAMPLESDIR%%/testendian.c
-%%EXAMPLESDIR%%/testerror.c
-%%EXAMPLESDIR%%/testgamma.c
-%%EXAMPLESDIR%%/testgl.c
-%%EXAMPLESDIR%%/testhread.c
-%%EXAMPLESDIR%%/testjoystick.c
-%%EXAMPLESDIR%%/testkeys.c
-%%EXAMPLESDIR%%/testlock.c
-%%EXAMPLESDIR%%/testoverlay.c
-%%EXAMPLESDIR%%/testoverlay2.c
-%%EXAMPLESDIR%%/testpalette.c
-%%EXAMPLESDIR%%/testsem.c
-%%EXAMPLESDIR%%/testsprite.c
-%%EXAMPLESDIR%%/testtimer.c
-%%EXAMPLESDIR%%/testtypes.c
-%%EXAMPLESDIR%%/testver.c
-%%EXAMPLESDIR%%/testvidinfo.c
-%%EXAMPLESDIR%%/testwin.c
-%%EXAMPLESDIR%%/testwm.c
-%%EXAMPLESDIR%%/threadwin.c
-%%EXAMPLESDIR%%/torturethread.c
-@dirrm %%EXAMPLESDIR%%
-@dirrmtry include/SDL11
+bin/sdl-config
+include/SDL/SDL.h
+include/SDL/SDL_active.h
+include/SDL/SDL_audio.h
+include/SDL/SDL_byteorder.h
+include/SDL/SDL_cdrom.h
+include/SDL/SDL_config.h
+include/SDL/SDL_config_amiga.h
+include/SDL/SDL_config_dreamcast.h
+include/SDL/SDL_config_macos.h
+include/SDL/SDL_config_macosx.h
+include/SDL/SDL_config_minimal.h
+include/SDL/SDL_config_os2.h
+include/SDL/SDL_config_win32.h
+include/SDL/SDL_copying.h
+include/SDL/SDL_cpuinfo.h
+include/SDL/SDL_endian.h
+include/SDL/SDL_error.h
+include/SDL/SDL_events.h
+include/SDL/SDL_getenv.h
+include/SDL/SDL_joystick.h
+include/SDL/SDL_keyboard.h
+include/SDL/SDL_keysym.h
+include/SDL/SDL_loadso.h
+include/SDL/SDL_main.h
+include/SDL/SDL_mouse.h
+include/SDL/SDL_mutex.h
+include/SDL/SDL_name.h
+include/SDL/SDL_opengl.h
+include/SDL/SDL_platform.h
+include/SDL/SDL_quit.h
+include/SDL/SDL_rwops.h
+include/SDL/SDL_stdinc.h
+include/SDL/SDL_syswm.h
+include/SDL/SDL_thread.h
+include/SDL/SDL_timer.h
+include/SDL/SDL_types.h
+include/SDL/SDL_version.h
+include/SDL/SDL_video.h
+include/SDL/begin_code.h
+include/SDL/close_code.h
+lib/libSDL.a
+lib/libSDL.la
+lib/libSDL.so
+lib/libSDL.so.11
+lib/libSDLmain.a
+libdata/pkgconfig/sdl.pc
+share/aclocal/sdl.m4
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README-SDL.txt
+%%PORTDOCS%%%%DOCSDIR%%/WhatsNew
+%%PORTDOCS%%%%DOCSDIR%%/docs.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/audio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/cdrom.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/event.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/eventfunctions.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/eventstructures.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/general.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guide.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideaboutsdldoc.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideaudioexamples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidebasicsinit.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidecdromexamples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidecredits.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideeventexamples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideexamples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideinput.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideinputkeyboard.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidepreface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidethebasics.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidetimeexamples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidevideo.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidevideoopengl.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/joystick.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/reference.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlactiveevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdladdtimer.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlaudiocvt.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlaudiospec.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlblitsurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlbuildaudiocvt.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcd.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdclose.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdeject.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdname.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdnumdrives.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdopen.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdpause.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdplay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdplaytracks.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdresume.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdstatus.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdstop.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdtrack.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcloseaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcolor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcondbroadcast.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcondsignal.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcondwait.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcondwaittimeout.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlconvertaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlconvertsurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatecond.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatecursor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatemutex.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatergbsurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatergbsurfacefrom.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatesemaphore.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatethread.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreateyuvoverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldelay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldestroycond.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldestroymutex.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldestroysemaphore.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldisplayformat.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldisplayformatalpha.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldisplayyuvoverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlenablekeyrepeat.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlenableunicode.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlenvvars.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdleventstate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlexposeevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfillrect.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlflip.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfreecursor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfreesurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfreewav.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfreeyuvoverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetappstate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetaudiostatus.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetcliprect.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetcursor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgeterror.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgeteventfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetgammaramp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetkeyname.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetkeystate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetmodstate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetmousestate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetrelativemousestate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetrgb.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetrgba.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetthreadid.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetticks.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetvideoinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetvideosurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglattr.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglgetattribute.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglgetprocaddress.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglloadlibrary.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglsetattribute.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglswapbuffers.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlinit.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlinitsubsystem.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoyaxisevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoyballevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoybuttonevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoyhatevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickclose.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickeventstate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickgetaxis.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickgetball.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickgetbutton.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickgethat.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickindex.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickname.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoysticknumaxes.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoysticknumballs.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoysticknumbuttons.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoysticknumhats.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickopen.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickopened.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickupdate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlkey.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlkeyboardevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlkeysym.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlkillthread.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdllistmodes.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlloadbmp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlloadwav.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdllockaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdllocksurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdllockyuvoverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmaprgb.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmaprgba.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmixaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmousebuttonevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmousemotionevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmutexp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmutexv.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlnumjoysticks.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlopenaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdloverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpalette.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpauseaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpeepevents.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpix%%PORTOBJFORMAT%%ormat.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpollevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpumpevents.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpushevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlquit.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlquitevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlquitsubsystem.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlrect.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlremovetimer.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlresizeevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsavebmp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsempost.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsemtrywait.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsemvalue.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsemwait.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsemwaittimeout.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetalpha.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetcliprect.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetcolorkey.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetcolors.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetcursor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlseteventfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetgamma.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetgammaramp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetmodstate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetpalette.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsettimer.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetvideomode.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlshowcursor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsyswmevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlthreadid.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlunlockaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlunlocksurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlunlockyuvoverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlupdaterect.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlupdaterects.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdluserevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlvideodrivername.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlvideoinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlvideomodeok.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwaitevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwaitthread.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwarpmouse.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwasinit.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmgetcaption.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmgrabinput.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmiconifywindow.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmsetcaption.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmseticon.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmtogglefullscreen.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/thread.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/time.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/video.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/wm.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/images/rainbow.gif
+%%PORTDOCS%%%%DOCSDIR%%/docs/index.html
+%%PORTDOCS%%%%EXAMPLESDIR%%/checkkeys.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/graywin.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/icon.bmp
+%%PORTDOCS%%%%EXAMPLESDIR%%/loopwave.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/moose.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/picture.xbm
+%%PORTDOCS%%%%EXAMPLESDIR%%/sail.bmp
+%%PORTDOCS%%%%EXAMPLESDIR%%/sample.bmp
+%%PORTDOCS%%%%EXAMPLESDIR%%/sample.wav
+%%PORTDOCS%%%%EXAMPLESDIR%%/testalpha.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testbitmap.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testblitspeed.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testcdrom.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testcursor.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testdyngl.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testerror.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testfile.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testgamma.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testgl.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testhread.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testiconv.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testjoystick.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testkeys.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testlock.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testoverlay.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testoverlay2.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testpalette.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testplatform.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testsem.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testsprite.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testtimer.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testver.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testvidinfo.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testwin.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testwm.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/threadwin.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/torturethread.c
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm include/SDL
--- a/devel/sdl_ldbad/Makefile
+++ b/devel/sdl_ldbad/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	sdl_ldbad
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	# none
 DISTFILES=	# none
@ -15,6 +15,10 @@ DISTFILES=	# none
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A SDL Linux Developer's BandAiD

+BROKEN=		incorrect pkg-plist and doesn't required anymore
+DEPRECATED=	${BROKEN}
+EXPIRATION_DATE=2006-10-17
+
 USE_SDL=	sdl
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
--- a/devel/sdl_sge/Makefile
+++ b/devel/sdl_sge/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	sge
 PORTVERSION=	0.030809
+PORTREVISION=	1
 CATEGORIES=	devel graphics
 MASTER_SITES=	http://www.etek.chalmers.se/~e8cal1/sge/files/ \
 		http://www.digitalfanatics.org/cal/sge/files/
@ -53,7 +54,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|#USE_FT = n|USE_FT = y|g' ${WRKSRC}/Makefile.conf
 .endif
 	@${REINPLACE_CMD} -e 's|PREFIX =PREFIX|PREFIX =${PREFIX}|g' ${WRKSRC}/Makefile.conf
-	@${REINPLACE_CMD} -e 's|PREFIX_H =PREFIX_H|PREFIX_H =${PREFIX}/include/SDL11|g' ${WRKSRC}/Makefile.conf
+	@${REINPLACE_CMD} -e 's|PREFIX_H =PREFIX_H|PREFIX_H =${PREFIX}/include/SDL|g' ${WRKSRC}/Makefile.conf
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile.conf

 post-install:
--- a/devel/sdl_sge/pkg-plist
+++ b/devel/sdl_sge/pkg-plist
@ -1,16 +1,16 @@
-include/SDL11/sge.h
-include/SDL11/sge_blib.h
-include/SDL11/sge_bm_text.h
-include/SDL11/sge_collision.h
-include/SDL11/sge_config.h
-include/SDL11/sge_internal.h
-include/SDL11/sge_misc.h
-include/SDL11/sge_primitives.h
-include/SDL11/sge_rotation.h
-include/SDL11/sge_shape.h
-include/SDL11/sge_surface.h
-include/SDL11/sge_textpp.h
-include/SDL11/sge_tt_text.h
+include/SDL/sge.h
+include/SDL/sge_blib.h
+include/SDL/sge_bm_text.h
+include/SDL/sge_collision.h
+include/SDL/sge_config.h
+include/SDL/sge_internal.h
+include/SDL/sge_misc.h
+include/SDL/sge_primitives.h
+include/SDL/sge_rotation.h
+include/SDL/sge_shape.h
+include/SDL/sge_surface.h
+include/SDL/sge_textpp.h
+include/SDL/sge_tt_text.h
 lib/libSGE.a
 lib/libSGE.so
 lib/libSGE.so.0
@ -59,6 +59,6 @@ lib/libSGE.so.0.030809
 %%PORTDOCS%%%%EXAMPLESDIR%%/sprite2.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/ttf_readme
 %%PORTDOCS%%%%EXAMPLESDIR%%/tux.bmp
-@dirrmtry include/SDL11
+@dirrmtry include/SDL
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
--- a/devel/sdlmm/Makefile
+++ b/devel/sdlmm/Makefile
@ -8,7 +8,7 @@

 PORTNAME=	sdlmm
 PORTVERSION=	0.1.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/devel/sge/Makefile
+++ b/devel/sge/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	sge
 PORTVERSION=	0.030809
+PORTREVISION=	1
 CATEGORIES=	devel graphics
 MASTER_SITES=	http://www.etek.chalmers.se/~e8cal1/sge/files/ \
 		http://www.digitalfanatics.org/cal/sge/files/
@ -53,7 +54,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|#USE_FT = n|USE_FT = y|g' ${WRKSRC}/Makefile.conf
 .endif
 	@${REINPLACE_CMD} -e 's|PREFIX =PREFIX|PREFIX =${PREFIX}|g' ${WRKSRC}/Makefile.conf
-	@${REINPLACE_CMD} -e 's|PREFIX_H =PREFIX_H|PREFIX_H =${PREFIX}/include/SDL11|g' ${WRKSRC}/Makefile.conf
+	@${REINPLACE_CMD} -e 's|PREFIX_H =PREFIX_H|PREFIX_H =${PREFIX}/include/SDL|g' ${WRKSRC}/Makefile.conf
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile.conf

 post-install:
--- a/devel/sge/pkg-plist
+++ b/devel/sge/pkg-plist
@ -1,16 +1,16 @@
-include/SDL11/sge.h
-include/SDL11/sge_blib.h
-include/SDL11/sge_bm_text.h
-include/SDL11/sge_collision.h
-include/SDL11/sge_config.h
-include/SDL11/sge_internal.h
-include/SDL11/sge_misc.h
-include/SDL11/sge_primitives.h
-include/SDL11/sge_rotation.h
-include/SDL11/sge_shape.h
-include/SDL11/sge_surface.h
-include/SDL11/sge_textpp.h
-include/SDL11/sge_tt_text.h
+include/SDL/sge.h
+include/SDL/sge_blib.h
+include/SDL/sge_bm_text.h
+include/SDL/sge_collision.h
+include/SDL/sge_config.h
+include/SDL/sge_internal.h
+include/SDL/sge_misc.h
+include/SDL/sge_primitives.h
+include/SDL/sge_rotation.h
+include/SDL/sge_shape.h
+include/SDL/sge_surface.h
+include/SDL/sge_textpp.h
+include/SDL/sge_tt_text.h
 lib/libSGE.a
 lib/libSGE.so
 lib/libSGE.so.0
@ -59,6 +59,6 @@ lib/libSGE.so.0.030809
 %%PORTDOCS%%%%EXAMPLESDIR%%/sprite2.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/ttf_readme
 %%PORTDOCS%%%%EXAMPLESDIR%%/tux.bmp
-@dirrmtry include/SDL11
+@dirrmtry include/SDL
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	upp
 PORTVERSION=	605
+PORTREVISION=	1
 CATEGORIES=	devel x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	atari800
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/emulators/cygne-sdl/Makefile
+++ b/emulators/cygne-sdl/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	cygne-sdl
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://sdlemu.ngemu.com/OpenProjects/
 DISTNAME=	Cygne-SDL-${PORTVERSION}-src
--- a/emulators/dgen-sdl/Makefile
+++ b/emulators/dgen-sdl/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	dgen-sdl
 PORTVERSION=	1.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://pknet.com/~joe/

--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	dosbox
 PORTVERSION=	0.65
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/emulators/fceu/Makefile
+++ b/emulators/fceu/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	fceu
 PORTVERSION=	0.98.13
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://bsd-unix.org/downloads/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-pre.src
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	fceu
 PORTVERSION=	0.98.13
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://bsd-unix.org/downloads/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-pre.src
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	frodo
 PORTVERSION=	4.1b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators tk84
 MASTER_SITES=	http://frodo.cebix.net/downloads/
 DISTNAME=	FrodoV4_1b.Src
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	fuse
 PORTVERSION=	0.7.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fuse-emulator
--- a/emulators/gcube/Makefile
+++ b/emulators/gcube/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	gcube
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://gcube.exemu.net/downloads/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@ -30,9 +31,6 @@ FIXME=	general.h keys_sdl.h thpview.h video_sdl.c audio_sdl.c hw_gx.c gx.c \
 	gx_texture.c gx_transform.c

 post-patch:
-.for i in ${FIXME}
-	${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/${i}
-.endfor
 	${REINPLACE_CMD} \
 		-e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile.rules
 	${REINPLACE_CMD} \
--- a/emulators/generator-cbiere/Makefile
+++ b/emulators/generator-cbiere/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	generator
 PORTVERSION=	0.35.r2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.ghostwhitecrab.com/generator/ \
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	generator
 PORTVERSION=	0.35
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.squish.net/generator/files/

--- a/emulators/gens/Makefile
+++ b/emulators/gens/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	gens
 PORTVERSION=	2.12a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/emulators/gngb/Makefile
+++ b/emulators/gngb/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	gngb
 PORTVERSION=	20060309
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://m.peponas.free.fr/gngb/download/

@ -45,7 +46,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|"$$SDL_CONFIG" = yes|-n "$$SDL_CONFIG"|g ; \
 		 s|sdl-config |$$SDL_CONFIG |g ; \
-		 s|-lSDL|-lSDL-1.1|g ; \
 		 s|$$OPT||g' ${WRKSRC}/configure

 .include <bsd.port.mk>
--- a/emulators/gngeo/Makefile
+++ b/emulators/gngeo/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	gngeo
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/emulators/gnuboy/Makefile
+++ b/emulators/gnuboy/Makefile
@ -8,7 +8,7 @@

 PORTNAME=	gnuboy
 PORTVERSION=	1.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators games
 MASTER_SITES=	http://gnuboy.unix-fu.org/src/ \
 		http://brightrain.aerifal.cx/~laguna/src/
@ -32,9 +32,6 @@ PORTDOCS=	*
 PLIST_FILES=	bin/sdlgnuboy bin/sgnuboy bin/xgnuboy

 post-patch:
-.for file in sys/sdl/sdl.c sys/sdl/keymap.c
-	@${REINPLACE_CMD} -e "s|SDL/|SDL11/|g" ${WRKSRC}/${file}
-.endfor

 do-install:
 .for file in sdlgnuboy sgnuboy xgnuboy
--- a/emulators/gnuboy/files/patch-configure.in
+++ b/emulators/gnuboy/files/patch-configure.in
@ -12,8 +12,8 @@
 INCS="$INCS $SDL_CFLAGS"
 -AC_CHECK_LIB(SDL, SDL_Init, [
 -AC_CHECK_HEADERS(SDL/SDL.h, ,[
-+AC_CHECK_LIB(SDL-1.1, SDL_Init, [
-+AC_CHECK_HEADERS(SDL11/SDL.h, ,[
+AC_CHECK_LIB(SDL, SDL_Init, [
+AC_CHECK_HEADERS(SDL/SDL.h, ,[
 AC_MSG_WARN(SDL found but headers are missing!!)
 with_sdl=no
 ])], [with_sdl=no], $SDL_LIBS)
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	hatari
 PORTVERSION=	0.70
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
--- a/emulators/hugo/Makefile
+++ b/emulators/hugo/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	hugo
 PORTVERSION=	2.12
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.zeograd.com/download/

--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	mednafen
 PORTVERSION=	0.6.5
+PORTREVISION=	1
 CATEGORIES=	emulators games
 MASTER_SITES=	http://mednafen.com/releases/files/

--- a/Show More
+++ b/Show More