diff -Nur audio/sdl_mixer/Makefile audio/sdl_mixer.new/Makefile
--- audio/sdl_mixer/Makefile	2007-10-28 13:01:31.000000000 +0100
+++ audio/sdl_mixer.new/Makefile	2007-12-22 10:54:30.000000000 +0100
@@ -6,45 +6,49 @@
 #
 
 PORTNAME=	sdl_mixer
-PORTVERSION=	1.2.7
-PORTREVISION=	2
+PORTVERSION=	1.2.8
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 DISTNAME=	SDL_mixer-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mva@sysfault.org
 COMMENT=	A sample multi-channel audio mixer library
 
+USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl
 USE_GMAKE=	yes
 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"
+CPPFLAGS+=	-DCONFIG_FILE_ETC_TIMIDITY \"${LOCALBASE}/etc/timidity.cfg\"
 USE_LDCONFIG=	yes
 
-OPTIONS=	MIKMOD "Enable MOD music via libMikMod" on \
-		VORBIS "Enable Ogg Vorbis music" on \
-		SMPEG "Enable MP3 music via SMPEG" on
+OPTIONS=	MIKMOD		"Enable MOD music via libMikMod"	On \
+		SMPEG		"Enable MP3 music via SMPEG"		On \
+		VORBIS		"Enable Ogg Vorbis music"		On
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_MIKMOD)
-CONFIGURE_ARGS+=	--disable-music-libmikmod
+CONFIGURE_ARGS+=--disable-music-libmikmod
 .else
 LIB_DEPENDS=	mikmod.2:${PORTSDIR}/audio/libmikmod
+CONFIGURE_ARGS+=--enable-music-libmikmod
 .endif
 
-.if defined(WITHOUT_VORBIS)
-CONFIGURE_ARGS+=	--disable-music-ogg
+.if defined(WITHOUT_SMPEG)
+CONFIGURE_ARGS+=--disable-music-mp3
 .else
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	smpeg.1:${PORTSDIR}/multimedia/smpeg
+CONFIGURE_ARGS+=--enable-music-mp3
 .endif
 
-.if defined(WITHOUT_SMPEG)
-CONFIGURE_ARGS+=	--disable-music-mp3
+.if defined(WITHOUT_VORBIS)
+CONFIGURE_ARGS+=--disable-music-ogg
 .else
-LIB_DEPENDS+=	smpeg.1:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+CONFIGURE_ARGS+=--enable-music-ogg
 .endif
 
 .include <bsd.port.post.mk>
diff -Nur audio/sdl_mixer/distinfo audio/sdl_mixer.new/distinfo
--- audio/sdl_mixer/distinfo	2006-09-20 13:20:35.000000000 +0200
+++ audio/sdl_mixer.new/distinfo	2007-12-21 11:26:08.000000000 +0100
@@ -1,3 +1,3 @@
-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
+MD5 (SDL_mixer-1.2.8.tar.gz) = 0b5b91015d0f3bd9597e094ba67c4d65
+SHA256 (SDL_mixer-1.2.8.tar.gz) = a8222a274778ff16d0e3ee49a30db27a48a4d357169a915fc599a764e405e0b6
+SIZE (SDL_mixer-1.2.8.tar.gz) = 2096559
diff -Nur audio/sdl_mixer/files/patch-Makefile.in audio/sdl_mixer.new/files/patch-Makefile.in
--- audio/sdl_mixer/files/patch-Makefile.in	2006-09-20 13:20:35.000000000 +0200
+++ audio/sdl_mixer.new/files/patch-Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- 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 -Nur audio/sdl_mixer/pkg-plist audio/sdl_mixer.new/pkg-plist
--- audio/sdl_mixer/pkg-plist	2006-09-20 13:20:35.000000000 +0200
+++ audio/sdl_mixer.new/pkg-plist	2007-12-22 10:47:25.000000000 +0100
@@ -2,5 +2,5 @@
 lib/libSDL_mixer.a
 lib/libSDL_mixer.la
 lib/libSDL_mixer.so
-lib/libSDL_mixer.so.2
+lib/libSDL_mixer-1.2.so.2
 @dirrmtry include/SDL
diff -Nur devel/sdl12/Makefile devel/sdl12.new/Makefile
--- devel/sdl12/Makefile	2007-10-28 13:01:32.000000000 +0100
+++ devel/sdl12.new/Makefile	2007-12-21 11:24:57.000000000 +0100
@@ -6,66 +6,85 @@
 #
 
 PORTNAME=	sdl
-PORTVERSION=	1.2.11
-PORTREVISION=	1
+PORTVERSION=	1.2.12
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/
 DISTNAME=	SDL-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Cross-platform multi-media development API
+MAINTAINER=	mva@sysfault.org
+COMMENT=	Cross-platform multimedia development API
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
+USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gnomehack gnometarget
+USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_ICONV=	yes
-CONFIGURE_ENV=	NASM="${LOCALBASE}/bin/nasm"		\
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
 		PTHREAD_LIBS="${PTHREAD_LIBS}"		\
 		LDFLAGS="${LDFLAGS}"
 
 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if !defined(WITHOUT_X11)
-USE_XLIB=	yes
-.else
-PKGNAMESUFFIX=	-nox11
-CONFIGURE_ARGS+=--disable-video-x11
-.endif
+CONFIGURE_ARGS+=--disable-alsa --disable-alsatest
+CONFIGURE_ARGS+=--disable-video-directfb
 
 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	\
-		GGI	"Include support for GGI"			Off	\
-		SVGALIB	"Include support for SVGALIB"			On
-
-.include <bsd.port.pre.mk>
+OPTIONS=	AALIB		"ASCII art support"			On  \
+		ARTS		"ARts sound system support"		Off \
+		ESD		"Enlightenment sound system support"	Off \
+		GGI		"General Graphics Interface support"	Off \
+		NAS		"Network Audio System support"		Off \
+		OPENGL		"OpenGL 2D/3D graphics support"		On  \
+		OSS		"Open Sound System support"		On  \
+		PULSEAUDIO	"PulseAudio sound system support"       Off \
+		SVGALIB		"SVGA graphics support (i386 only)"	Off
 
 .if exists(/usr/lib/libvgl.so)
-CONFIGURE_ARGS+=--enable-video-vgl
-DISPLAY_MSG=	${CAT} ${PKGMESSAGE}
+OPTIONS+=	VGL		"Video Graphics Lib support"		On
 .else
-CONFIGURE_ARGS+=--disable-video-vgl
-PKGMESSAGE=	none
-DISPLAY_MSG=	${DO_NADA}
+WITHOUT_VGL=	true
+.endif
+
+.if defined(WITHOUT_X11)
+WITHOUT_XLIB=	true
+.else
+OPTIONS+=	XLIB		"XLib (xorg) graphics support"		On
 .endif
 
+.include <bsd.port.pre.mk>
+
+MAN3!=		${CAT} ${FILESDIR}/man3
+
 .if ${OSVERSION} >= 500111
 CONFIGURE_ENV+=	ac_cv_header_libusbhid_h=no
 .endif
 
-.if defined(WITH_NAS)
-LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
+.if defined(WITHOUT_AALIB)
+CONFIGURE_ARGS+=--disable-video-aalib
 .else
-CONFIGURE_ARGS+=--disable-nas
+LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
+CONFIGURE_ARGS+=--enable-video-aalib
+.endif
+
+.if defined(WITH_ARTS)
+LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
+CONFIGURE_ARGS+=--enable-arts
+.else
+CONFIGURE_ARGS+=--disable-arts
+.endif
+
+.if defined(WITH_ESD)
+USE_GNOME+=	esound
+CONFIGURE_ARGS+=--enable-esd
+.else
+CONFIGURE_ARGS+=--disable-esd --disable-esdtest
 .endif
 
 .if defined(WITH_GGI)
@@ -75,57 +94,64 @@
 CONFIGURE_ARGS+=--disable-video-ggi
 .endif
 
-.if defined(WITHOUT_GL)
+.if defined(WITH_NAS)
+LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
+.else
+CONFIGURE_ARGS+=--disable-nas
+.endif
+
+.if defined(WITHOUT_OPENGL)
 CONFIGURE_ARGS+=--disable-video-opengl
 .else
 USE_GL=		yes
 CONFIGURE_ARGS+=--enable-video-opengl
 .endif
 
-.if defined(WITHOUT_AALIB)
-CONFIGURE_ARGS+=--disable-video-aalib
+.if defined(WITHOUT_OSS)
+CONFIGURE_ARGS+=--disable-oss
 .else
-LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
-CONFIGURE_ARGS+=--enable-video-aalib
-.endif
-
-MAN3!=		${CAT} ${FILESDIR}/man3
-
-.if (${ARCH} != "i386")
-WITHOUT_SVGALIB=	yes
+CONFIGURE_ARGS+=--enable-oss
 .endif
 
-.if ${HAVE_GNOME:Mesound}!=""
-USE_GNOME+=	esound
+.if defined(WITH_PULSEAUDIO)
+CONFIGURE_ARGS+=--enable-pulseaudio
 .else
-CONFIGURE_ARGS+=--disable-esd --disable-esdtest
+CONFIGURE_ARGS+=--disable-pulseaudio
 .endif
 
-.if !defined(WITHOUT_SVGALIB)
+.if defined(WITHOUT_SVGALIB)
+CONFIGURE_ARGS+=--disable-video-svga
+.else
 LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
 CONFIGURE_ARGS+=--enable-video-svga
 .endif
 
-.if (exists(${LOCALBASE}/bin/artsc-config) || defined(WITH_ARTS)) && !defined(WITHOUT_ARTS)
-LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
-CONFIGURE_ARGS+=--enable-arts
+.if (defined(WITHOUT_VGL) || ${ARCH} != "i386")
+CONFIGURE_ARGS+=--disable-video-vgl
+PKGMESSAGE=	none
+DISPLAY_MSG=	${DO_NADA}
 .else
-CONFIGURE_ARGS+=--disable-arts
+CONFIGURE_ARGS+=--enable-video-vgl
+DISPLAY_MSG=	${CAT} ${PKGMESSAGE}
 .endif
 
-pre-configure:
-	@${FIND} ${WRKSRC} -type f -name Makefile.in | ${XARGS} ${TOUCH}
+.if defined(WITHOUT_XLIB)
+PKGNAMESUFFIX=	-nox11
+CONFIGURE_ARGS+=--disable-video-x11
+.else
+USE_XLIB=	yes
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${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} && \
-		${COPYTREE_SHARE} docs ${DOCSDIR}/ "! -regex .*/man3.*")
+	${MKDIR} ${DOCSDIR} &&\
+		${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ &&\
+	cd ${WRKSRC} &&\
+		${COPYTREE_SHARE} docs ${DOCSDIR}/ "! -regex .*/man3.*"
+.endif
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR} &&\
+		${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/,} ${EXAMPLESDIR}/
 .endif
 	@${DISPLAY_MSG}
 
diff -Nur devel/sdl12/distinfo devel/sdl12.new/distinfo
--- devel/sdl12/distinfo	2006-09-20 13:20:40.000000000 +0200
+++ devel/sdl12.new/distinfo	2007-12-20 09:09:56.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (SDL-1.2.11.tar.gz) = 418b42956b7cd103bfab1b9077ccc149
-SHA256 (SDL-1.2.11.tar.gz) = 6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730
-SIZE (SDL-1.2.11.tar.gz) = 2796407
+MD5 (SDL-1.2.12.tar.gz) = 544b4554986e51eed6d34435cf9c5f3f
+SHA256 (SDL-1.2.12.tar.gz) = df77eb883efdcc61220eaf7ade38324629c273c278ce8d700a5530369e9b6df9
+SIZE (SDL-1.2.12.tar.gz) = 2829456
diff -Nur devel/sdl12/files/patch-Makefile.in devel/sdl12.new/files/patch-Makefile.in
--- devel/sdl12/files/patch-Makefile.in	2006-09-20 13:20:41.000000000 +0200
+++ devel/sdl12.new/files/patch-Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- 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)
- 
diff -Nur devel/sdl12/files/patch-configure devel/sdl12.new/files/patch-configure
--- devel/sdl12/files/patch-configure	2006-09-20 13:20:41.000000000 +0200
+++ devel/sdl12.new/files/patch-configure	2007-12-20 09:09:56.000000000 +0100
@@ -1,6 +1,6 @@
 --- configure.orig	Wed Jul  5 00:52:15 2006
 +++ configure	Wed Jul  5 01:01:28 2006
-@@ -29772,8 +29772,8 @@
+@@ -30485,8 +30485,8 @@
  #            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
              ;;
          *-*-freebsd*|*-*-dragonfly*)
diff -Nur devel/sdl12/files/patch-sdl-config.in devel/sdl12.new/files/patch-sdl-config.in
--- devel/sdl12/files/patch-sdl-config.in	2006-09-20 13:20:41.000000000 +0200
+++ devel/sdl12.new/files/patch-sdl-config.in	2007-12-20 09:09:56.000000000 +0100
@@ -4,7 +4,7 @@
 #
 --- 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 @@
+@@ -45,7 +45,7 @@
        echo @SDL_VERSION@
        ;;
      --cflags)
diff -Nur devel/sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c devel/sdl12.new/files/patch-src_joystick_bsd_SDL__sysjoystick.c
--- devel/sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c	2006-09-20 13:20:41.000000000 +0200
+++ devel/sdl12.new/files/patch-src_joystick_bsd_SDL__sysjoystick.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,96 +0,0 @@
---- 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,..*/
-+	int	x;
-+	int	y;
-+	int	xmin;
-+	int	ymin;
-+	int	xmax;
-+	int	ymax;
- };
- 
- static char *joynames[MAX_JOYS];
-@@ -257,6 +263,12 @@
- 	joy->hwdata = hw;
- 	hw->fd = fd;
- 	hw->path = strdup(path);
-+	hw->x = 0;
-+	hw->y = 0;
-+	hw->xmin = 0xffff;
-+	hw->ymin = 0xffff;
-+	hw->xmax = 0;
-+	hw->ymax = 0;
- 	if (! SDL_strncmp(path, "/dev/joy", 8)) {
- 		hw->type = BSDJOY_JOY;
- 		joy->naxes = 2;
-@@ -380,43 +392,42 @@
- 
- #if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
- 	struct joystick gameport;
--	static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
-  
- 	if (joy->hwdata->type == BSDJOY_JOY) {
- 		if (read(joy->hwdata->fd, &gameport, sizeof gameport) != sizeof gameport)
- 			return;
--		if (abs(x - gameport.x) > 8) {
--			x = gameport.x;
--			if (x < xmin) {
--				xmin = x;
-+		if (abs(joy->hwdata->x - gameport.x) > 8) {
-+			joy->hwdata->x = gameport.x;
-+			if (joy->hwdata->x < joy->hwdata->xmin) {
-+				joy->hwdata->xmin = joy->hwdata->x;
- 			}
--			if (x > xmax) {
--				xmax = x;
-+			if (joy->hwdata->x > joy->hwdata->xmax) {
-+				joy->hwdata->xmax = joy->hwdata->x;
- 			}
--			if (xmin == xmax) {
--				xmin--;
--				xmax++;
-+			if (joy->hwdata->xmin == joy->hwdata->xmax) {
-+				joy->hwdata->xmin--;
-+				joy->hwdata->xmax++;
- 			}
--			v = (Sint32)x;
--			v -= (xmax + xmin + 1)/2;
--			v *= 32768/((xmax - xmin + 1)/2);
-+			v = (Sint32)joy->hwdata->x;
-+			v -= (joy->hwdata->xmax + joy->hwdata->xmin + 1)/2;
-+			v *= 32768/((joy->hwdata->xmax - joy->hwdata->xmin + 1)/2);
- 			SDL_PrivateJoystickAxis(joy, 0, v);
- 		}
--		if (abs(y - gameport.y) > 8) {
--			y = gameport.y;
--			if (y < ymin) {
--				ymin = y;
-+		if (abs(joy->hwdata->y - gameport.y) > 8) {
-+			joy->hwdata->y = gameport.y;
-+			if (joy->hwdata->y < joy->hwdata->ymin) {
-+				joy->hwdata->ymin = joy->hwdata->y;
- 			}
--			if (y > ymax) {
--				ymax = y;
-+			if (joy->hwdata->y > joy->hwdata->ymax) {
-+				joy->hwdata->ymax = joy->hwdata->y;
- 			}
--			if (ymin == ymax) {
--				ymin--;
--				ymax++;
-+			if (joy->hwdata->ymin == joy->hwdata->ymax) {
-+				joy->hwdata->ymin--;
-+				joy->hwdata->ymax++;
- 			}
--			v = (Sint32)y;
--			v -= (ymax + ymin + 1)/2;
--			v *= 32768/((ymax - ymin + 1)/2);
-+			v = (Sint32)joy->hwdata->y;
-+			v -= (joy->hwdata->ymax + joy->hwdata->ymin + 1)/2;
-+			v *= 32768/((joy->hwdata->ymax - joy->hwdata->ymin + 1)/2);
- 			SDL_PrivateJoystickAxis(joy, 1, v);
- 		}
- 		if (gameport.b1 != joy->buttons[0]) {
diff -Nur devel/sdl12/pkg-message devel/sdl12.new/pkg-message
--- devel/sdl12/pkg-message	2001-02-22 09:58:10.000000000 +0100
+++ devel/sdl12.new/pkg-message	2007-12-20 09:09:56.000000000 +0100
@@ -1,9 +1,8 @@
 ------------------------------------------------------------------------------
  Your SDL library has been built with libvgl support, which means that you
  can run almost any SDL application straight on your console (VESA 2.0
- compatible videocard is required). To do this you have to enable VESA
- support in the kernel by adding "option VESA" into your kernel
- configuration file and set environment variable "SDL_VIDEODRIVER=vgl".
+ compatible videocard is required).
 
- Good luck!
+ To do this you have to load the vesa kernel module or enable it in your
+ kernel, and set environment variable "SDL_VIDEODRIVER=vgl".
 ------------------------------------------------------------------------------
diff -Nur devel/sdl12/pkg-plist devel/sdl12.new/pkg-plist
--- devel/sdl12/pkg-plist	2007-04-01 03:04:05.000000000 +0200
+++ devel/sdl12.new/pkg-plist	2007-12-21 11:23:40.000000000 +0100
@@ -5,14 +5,6 @@
 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
@@ -39,10 +31,10 @@
 include/SDL/SDL_video.h
 include/SDL/begin_code.h
 include/SDL/close_code.h
-lib/libSDL.a
+lib/libSDL-1.2.so
+lib/libSDL-1.2.so.11
 lib/libSDL.la
-lib/libSDL.so
-lib/libSDL.so.11
+lib/libSDL.a
 lib/libSDLmain.a
 libdata/pkgconfig/sdl.pc
 share/aclocal/sdl.m4
@@ -256,46 +248,47 @@
 %%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%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checkkeys.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graywin.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loopwave.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/moose.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/picture.xbm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sail.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.wav
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testalpha.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testbitmap.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testblitspeed.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testcdrom.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testcursor.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testdyngl.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testerror.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testfile.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testgamma.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testgl.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testhread.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testiconv.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testjoystick.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testkeys.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testloadso.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testlock.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testoverlay.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testoverlay2.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testpalette.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testplatform.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsem.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testsprite.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testtimer.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testver.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testvidinfo.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testwin.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testwm.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threadwin.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/torturethread.c
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm include/SDL
diff -Nur graphics/sdl_gfx/Makefile graphics/sdl_gfx.new/Makefile
--- graphics/sdl_gfx/Makefile	2007-10-28 13:01:32.000000000 +0100
+++ graphics/sdl_gfx.new/Makefile	2007-12-22 10:18:00.000000000 +0100
@@ -7,15 +7,14 @@
 #
 
 PORTNAME=	sdl_gfx
-PORTVERSION=	2.0.13
-PORTREVISION=	3
+PORTVERSION=	2.0.16
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ferzkopp.net/Software/%SUBDIR%/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
 MASTER_SITE_SUBDIR=	SDL_gfx-${PORTVERSION:R}
 DISTNAME=	SDL_gfx-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mva@sysfault.org
 COMMENT=	SDL graphics drawing primitives and other support functions
 
 USE_AUTOTOOLS=	libtool:15
@@ -23,16 +22,20 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--includedir=${PREFIX}/include \
-		--disable-mmx
+CONFIGURE_ARGS=	--includedir=${PREFIX}/include
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 USE_LDCONFIG=	yes
 
+OPTIONS=	MMX	"Enable MMX instruction set (i386 only)"	Off
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MMX) && (${ARCH} == "i386")
+CONFIGURE_ARGS+=--enable-mmx
 CFLAGS+=	-DUSE_MMX
+.else
+CONFIGURE_ARGS=--disable-mmx
 .endif
 
 .include <bsd.port.post.mk>
diff -Nur graphics/sdl_gfx/distinfo graphics/sdl_gfx.new/distinfo
--- graphics/sdl_gfx/distinfo	2006-01-22 13:35:12.000000000 +0100
+++ graphics/sdl_gfx.new/distinfo	2007-12-22 10:16:47.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (SDL_gfx-2.0.13.tar.gz) = b1ce778232db0b1979695f0a5a945a13
-SHA256 (SDL_gfx-2.0.13.tar.gz) = d350706545894d1a60c6fa9109349c420ba86bb7243c770cf1602ccc820661d6
-SIZE (SDL_gfx-2.0.13.tar.gz) = 598297
+MD5 (SDL_gfx-2.0.16.tar.gz) = 22dc2d9d916197829f9342c490d2d02b
+SHA256 (SDL_gfx-2.0.16.tar.gz) = 1ac780303b76bc830b837e6030de60943df0c28d7b9dab3a7229427bb6f4c2ea
+SIZE (SDL_gfx-2.0.16.tar.gz) = 830086
diff -Nur graphics/sdl_gfx/pkg-plist graphics/sdl_gfx.new/pkg-plist
--- graphics/sdl_gfx/pkg-plist	2006-09-20 13:21:41.000000000 +0200
+++ graphics/sdl_gfx.new/pkg-plist	2007-12-22 10:19:53.000000000 +0100
@@ -6,5 +6,5 @@
 lib/libSDL_gfx.a
 lib/libSDL_gfx.la
 lib/libSDL_gfx.so
-lib/libSDL_gfx.so.13
+lib/libSDL_gfx.so.0
 @dirrmtry include/SDL
diff -Nur graphics/sdl_image/Makefile graphics/sdl_image.new/Makefile
--- graphics/sdl_image/Makefile	2007-10-28 13:01:32.000000000 +0100
+++ graphics/sdl_image.new/Makefile	2007-12-22 10:20:42.000000000 +0100
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	sdl_image
-PORTVERSION=	1.2.5
-PORTREVISION=	2
+PORTVERSION=	1.2.6
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_image/release/
 DISTNAME=	SDL_image-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mva@sysfault.org
 COMMENT=	A simple library to load images of various formats as SDL surfaces
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
+USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff -Nur graphics/sdl_image/distinfo graphics/sdl_image.new/distinfo
--- graphics/sdl_image/distinfo	2006-09-20 13:21:41.000000000 +0200
+++ graphics/sdl_image.new/distinfo	2007-12-22 10:20:42.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (SDL_image-1.2.5.tar.gz) = cd006109a73bf7dcc93e1c3ed15ee782
-SHA256 (SDL_image-1.2.5.tar.gz) = 8a665d136fb17cc9fedcd8e42d21fcab553bd7ab67b6cafea2c6c7efe1adb308
-SIZE (SDL_image-1.2.5.tar.gz) = 1308637
+MD5 (SDL_image-1.2.6.tar.gz) = b866dc4f647517bdaf57f6ffdefd013e
+SHA256 (SDL_image-1.2.6.tar.gz) = 88fcb1dbf934af33163667a6677312065c7d0a7f01cd764e3374c4c19b386ec4
+SIZE (SDL_image-1.2.6.tar.gz) = 1308812
diff -Nur graphics/sdl_image/files/patch-ab graphics/sdl_image.new/files/patch-ab
--- graphics/sdl_image/files/patch-ab	2006-09-20 13:21:42.000000000 +0200
+++ graphics/sdl_image.new/files/patch-ab	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-
-$FreeBSD: ports/graphics/sdl_image/files/patch-ab,v 1.3 2006/09/20 11:21:42 stas Exp $
-
---- Makefile.in.orig
-+++ Makefile.in
-@@ -255,7 +255,6 @@
- 
- libSDL_image_la_LDFLAGS = \
- 	-no-undefined		\
--	-release $(LT_RELEASE)	\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- 
- libSDL_image_la_LIBADD = @IMG_LIBS@
diff -Nur graphics/sdl_image/files/patch-sdl_image.segfault graphics/sdl_image.new/files/patch-sdl_image.segfault
--- graphics/sdl_image/files/patch-sdl_image.segfault	2007-06-11 17:28:25.000000000 +0200
+++ graphics/sdl_image.new/files/patch-sdl_image.segfault	1970-01-01 01:00:00.000000000 +0100
@@ -1,164 +0,0 @@
-diff -u sdl-image1.2-1.2.5/IMG_bmp.c IMG_bmp.c
---- sdl-image1.2-1.2.5/IMG_bmp.c	2006-05-14 17:57:03.000000000 -0300
-+++ IMG_bmp.c	2006-07-21 20:34:29.193015440 -0300
-@@ -36,6 +36,8 @@
- 	int is_BMP;
- 	char magic[2];
- 
-+	if ( !src )
-+		return 0;
- 	start = SDL_RWtell(src);
- 	is_BMP = 0;
- 	if ( SDL_RWread(src, magic, sizeof(magic), 1) ) {
-diff -u sdl-image1.2-1.2.5/IMG_gif.c IMG_gif.c
---- sdl-image1.2-1.2.5/IMG_gif.c	2006-05-14 16:54:24.000000000 -0300
-+++ IMG_gif.c	2006-07-21 20:33:22.437423410 -0300
-@@ -36,6 +36,8 @@
- 	int is_GIF;
- 	char magic[6];
- 
-+	if ( !src )
-+		return 0;
- 	start = SDL_RWtell(src);
- 	is_GIF = 0;
- 	if ( SDL_RWread(src, magic, sizeof(magic), 1) ) {
-diff -u sdl-image1.2-1.2.5/IMG_jpg.c IMG_jpg.c
---- sdl-image1.2-1.2.5/IMG_jpg.c	2006-05-14 16:54:24.000000000 -0300
-+++ IMG_jpg.c	2006-07-21 20:22:29.386350188 -0300
-@@ -179,6 +179,8 @@
- 	/* Blame me, not Sam, if this doesn't work right. */
- 	/* And don't forget to report the problem to the the sdl list too! */
- 
-+	if ( !src )
-+		return 0;
- 	start = SDL_RWtell(src);
- 	is_JPG = 0;
- 	in_scan = 0;
-diff -u sdl-image1.2-1.2.5/IMG_lbm.c IMG_lbm.c
---- sdl-image1.2-1.2.5/IMG_lbm.c	2006-05-12 00:02:44.000000000 -0300
-+++ IMG_lbm.c	2006-07-21 20:33:14.278818049 -0300
-@@ -65,6 +65,8 @@
- 	int   is_LBM;
- 	Uint8 magic[4+4+4];
- 
-+	if ( !src ) 
-+		return 0;
- 	start = SDL_RWtell(src);
- 	is_LBM = 0;
- 	if ( SDL_RWread( src, magic, sizeof(magic), 1 ) )
-diff -u sdl-image1.2-1.2.5/IMG_pcx.c IMG_pcx.c
---- sdl-image1.2-1.2.5/IMG_pcx.c	2006-05-01 04:25:51.000000000 -0300
-+++ IMG_pcx.c	2006-07-21 20:25:15.919749204 -0300
-@@ -69,6 +69,8 @@
- 	const int PCX_RunLength_Encoding = 1;
- 	struct PCXheader pcxh;
- 
-+	if ( !src )
-+		return 0;
- 	start = SDL_RWtell(src);
- 	is_PCX = 0;
- 	if ( SDL_RWread(src, &pcxh, sizeof(pcxh), 1) == 1 ) {
-diff -u sdl-image1.2-1.2.5/IMG_png.c IMG_png.c
---- sdl-image1.2-1.2.5/IMG_png.c	2006-05-14 16:54:24.000000000 -0300
-+++ IMG_png.c	2006-07-21 20:25:07.367217023 -0300
-@@ -273,6 +273,8 @@
- 	if ( IMG_InitPNG() < 0 ) {
- 		return 0;
- 	}
-+	if ( !src )
-+		return 0;
- 	start = SDL_RWtell(src);
- 	is_PNG = 0;
- 	if ( SDL_RWread(src, buf, 1, PNG_BYTES_TO_CHECK) == PNG_BYTES_TO_CHECK ) {
-diff -u sdl-image1.2-1.2.5/IMG_pnm.c IMG_pnm.c
---- sdl-image1.2-1.2.5/IMG_pnm.c	2006-05-01 04:25:51.000000000 -0300
-+++ IMG_pnm.c	2006-07-21 20:26:06.881005273 -0300
-@@ -44,6 +44,8 @@
- 	int is_PNM;
- 	char magic[2];
- 
-+	if ( !src )
-+		return 0;
- 	start = SDL_RWtell(src);
- 	is_PNM = 0;
- 	if ( SDL_RWread(src, magic, sizeof(magic), 1) ) {
-diff -u sdl-image1.2-1.2.5/IMG_tif.c IMG_tif.c
---- sdl-image1.2-1.2.5/IMG_tif.c	2006-07-21 20:31:17.000000000 -0300
-+++ IMG_tif.c	2006-07-21 20:27:09.959187601 -0300
-@@ -189,6 +189,8 @@
- 	if ( IMG_InitTIF() < 0 ) {
- 		return 0;
- 	}
-+	if ( !src )
-+		return 0;
- 	start = SDL_RWtell(src);
- 	is_TIF = 0;
- 
-diff -u sdl-image1.2-1.2.5/IMG_xcf.c IMG_xcf.c
---- sdl-image1.2-1.2.5/IMG_xcf.c	2006-05-01 04:25:51.000000000 -0300
-+++ IMG_xcf.c	2006-07-21 20:28:49.113194657 -0300
-@@ -213,6 +213,8 @@
- 	int is_XCF;
- 	char magic[14];
- 
-+	if ( !src )
-+		return 0;
- 	start = SDL_RWtell(src);
- 	is_XCF = 0;
- 	if ( SDL_RWread(src, magic, sizeof(magic), 1) ) {
-diff -u sdl-image1.2-1.2.5/IMG_xpm.c IMG_xpm.c
---- sdl-image1.2-1.2.5/IMG_xpm.c	2006-05-12 00:02:44.000000000 -0300
-+++ IMG_xpm.c	2006-07-21 20:33:29.517213256 -0300
-@@ -59,6 +59,8 @@
- 	int is_XPM;
- 	char magic[9];
- 
-+	if ( !src )
-+		return 0;
- 	start = SDL_RWtell(src);
- 	is_XPM = 0;
- 	if ( SDL_RWread(src, magic, sizeof(magic), 1) ) {
-@@ -326,7 +328,8 @@
- 	linebuf = NULL;
- 	buflen = 0;
- 
--	start = SDL_RWtell(src);
-+	if ( src ) 
-+		start = SDL_RWtell(src);
- 
- 	if(xpm)
- 		xpmlines = &xpm;
-@@ -453,7 +456,8 @@
- 
- done:
- 	if(error) {
--		SDL_RWseek(src, start, SEEK_SET);
-+		if ( src )
-+			SDL_RWseek(src, start, SEEK_SET);
- 		if ( image ) {
- 			SDL_FreeSurface(image);
- 			image = NULL;
-diff -u sdl-image1.2-1.2.5/IMG_xv.c IMG_xv.c
---- sdl-image1.2-1.2.5/IMG_xv.c	2006-05-01 04:25:51.000000000 -0300
-+++ IMG_xv.c	2006-07-21 20:29:16.504502815 -0300
-@@ -89,6 +89,8 @@
- 	int is_XV;
- 	int w, h;
- 
-+	if ( !src )
-+		return 0;
- 	start = SDL_RWtell(src);
- 	is_XV = 0;
- 	if ( get_header(src, &w, &h) == 0 ) {
-diff -u sdl-image1.2-1.2.5/IMG_xxx.c IMG_xxx.c
---- sdl-image1.2-1.2.5/IMG_xxx.c	2006-05-01 04:25:51.000000000 -0300
-+++ IMG_xxx.c	2006-07-21 20:29:57.169539262 -0300
-@@ -34,6 +34,8 @@
- 	int start;
- 	int is_XXX;
- 
-+	if ( !src )
-+		return 0;
- 	start = SDL_RWtell(src);
- 	is_XXX = 0;
- 
diff -Nur graphics/sdl_image/pkg-plist graphics/sdl_image.new/pkg-plist
--- graphics/sdl_image/pkg-plist	2006-09-20 13:21:41.000000000 +0200
+++ graphics/sdl_image.new/pkg-plist	2007-12-22 10:23:57.000000000 +0100
@@ -3,5 +3,5 @@
 lib/libSDL_image.a
 lib/libSDL_image.la
 lib/libSDL_image.so
-lib/libSDL_image.so.1
+lib/libSDL_image-1.2.so.1
 @dirrmtry include/SDL
diff -Nur graphics/sdl_ttf/Makefile graphics/sdl_ttf.new/Makefile
--- graphics/sdl_ttf/Makefile	2007-10-28 13:01:33.000000000 +0100
+++ graphics/sdl_ttf.new/Makefile	2007-12-22 10:26:31.000000000 +0100
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	sdl_ttf
-PORTVERSION=	2.0.8
-PORTREVISION=	2
+PORTVERSION=	2.0.9
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_ttf/release/
 DISTNAME=	SDL_ttf-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mva@sysfault.org
 COMMENT=	A library to use TrueType fonts to render text in SDL applications
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
+USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -31,6 +31,6 @@
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/.libs/glfont ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/.libs/showfont ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/.libs/showfont ${PREFIX}/bin/sdl-showfont
 
 .include <bsd.port.mk>
diff -Nur graphics/sdl_ttf/distinfo graphics/sdl_ttf.new/distinfo
--- graphics/sdl_ttf/distinfo	2006-09-20 13:21:42.000000000 +0200
+++ graphics/sdl_ttf.new/distinfo	2007-12-22 10:26:07.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (SDL_ttf-2.0.8.tar.gz) = 094b6c08769e9842dbe1dfb5efa22df7
-SHA256 (SDL_ttf-2.0.8.tar.gz) = 6f57c879c0d15211f468aac48ed43653103bbe701a3f1cff462107ad1f74c5bc
-SIZE (SDL_ttf-2.0.8.tar.gz) = 2457385
+MD5 (SDL_ttf-2.0.9.tar.gz) = 6dd5a85e4924689a35a5fb1cb3336156
+SHA256 (SDL_ttf-2.0.9.tar.gz) = b4248876798b43d0fae1931cf8ae249f4f67a87736f97183f035f34aab554653
+SIZE (SDL_ttf-2.0.9.tar.gz) = 3143838
diff -Nur graphics/sdl_ttf/files/patch-SDL_ttf.c graphics/sdl_ttf.new/files/patch-SDL_ttf.c
--- graphics/sdl_ttf/files/patch-SDL_ttf.c	2006-10-14 10:53:06.000000000 +0200
+++ graphics/sdl_ttf.new/files/patch-SDL_ttf.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
---- SDL_ttf.c.orig	Mon May  1 05:26:17 2006
-+++ SDL_ttf.c	Sun Sep 24 15:46:44 2006
-@@ -48,7 +48,6 @@
- #include <freetype/ftoutln.h>
- #include <freetype/ttnameid.h>
- */
--#include <freetype/internal/ftobjs.h>
- 
- #ifndef FT_OPEN_STREAM
- #define FT_OPEN_STREAM ft_open_stream
-@@ -278,7 +277,7 @@
- 	}
- 	memset(stream, 0, sizeof(*stream));
- 
--	stream->memory = library->memory;
-+	stream->memory = NULL;
- 	stream->read = RWread;
- 	stream->descriptor.pointer = src;
- 	stream->pos = (unsigned long)position;
diff -Nur graphics/sdl_ttf/files/patch-aa graphics/sdl_ttf.new/files/patch-aa
--- graphics/sdl_ttf/files/patch-aa	2006-10-14 10:53:06.000000000 +0200
+++ graphics/sdl_ttf.new/files/patch-aa	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-
-$FreeBSD: ports/graphics/sdl_ttf/files/patch-aa,v 1.4 2006/10/14 08:53:06 marcus Exp $
-
---- Makefile.in.orig
-+++ Makefile.in
-@@ -243,7 +243,6 @@
- 
- libSDL_ttf_la_LDFLAGS = \
- 	-no-undefined		\
--	-release $(LT_RELEASE)	\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- 
- libSDL_ttf_la_LIBADD = 
diff -Nur graphics/sdl_ttf/pkg-plist graphics/sdl_ttf.new/pkg-plist
--- graphics/sdl_ttf/pkg-plist	2006-09-20 13:21:42.000000000 +0200
+++ graphics/sdl_ttf.new/pkg-plist	2007-12-22 10:35:22.000000000 +0100
@@ -1,8 +1,8 @@
 bin/glfont
-bin/showfont
+bin/sdl-showfont
 include/SDL/SDL_ttf.h
 lib/libSDL_ttf.a
 lib/libSDL_ttf.la
 lib/libSDL_ttf.so
-lib/libSDL_ttf.so.6
+lib/libSDL_ttf-2.0.so.6
 @dirrmtry include/SDL
diff -Nur net/sdl_net/Makefile net/sdl_net.new/Makefile
--- net/sdl_net/Makefile	2007-10-28 13:01:33.000000000 +0100
+++ net/sdl_net.new/Makefile	2007-12-22 10:41:06.000000000 +0100
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	sdl_net
-PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTVERSION=	1.2.7
 CATEGORIES=	net
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_net/release/
 DISTNAME=	SDL_net-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mva@sysfault.org
 COMMENT=	A small sample cross-platform networking library
 
+USE_AUTOTOOLS=  libtool:15
 USE_SDL=	sdl
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff -Nur net/sdl_net/distinfo net/sdl_net.new/distinfo
--- net/sdl_net/distinfo	2006-09-20 13:21:56.000000000 +0200
+++ net/sdl_net.new/distinfo	2007-12-22 10:41:06.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (SDL_net-1.2.6.tar.gz) = 7be5b9ef36129ee187ace96906cd264c
-SHA256 (SDL_net-1.2.6.tar.gz) = 1a4b1a9e63e3cb6a9d482c7fecb0da0edb5b285d06e221cdabdbd421e747554b
-SIZE (SDL_net-1.2.6.tar.gz) = 372116
+MD5 (SDL_net-1.2.7.tar.gz) = 6bd4662d1423810f3140d4da21b6d912
+SHA256 (SDL_net-1.2.7.tar.gz) = 2ce7c84e62ff8117b9f205758bcce68ea603e08bc9d6936ded343735b8b77c53
+SIZE (SDL_net-1.2.7.tar.gz) = 373866
diff -Nur net/sdl_net/files/patch-Makefile.in net/sdl_net.new/files/patch-Makefile.in
--- net/sdl_net/files/patch-Makefile.in	2006-09-20 13:21:56.000000000 +0200
+++ net/sdl_net.new/files/patch-Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- Makefile.in.orig	Thu Aug 31 14:52:06 2006
-+++ Makefile.in	Thu Aug 31 14:52:12 2006
-@@ -263,7 +263,6 @@
- libSDL_net_la_LIBADD = @INETLIB@
- libSDL_net_la_LDFLAGS = \
- 	-no-undefined		\
--	-release $(LT_RELEASE)	\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- 
- @HAVE_GUI_LIB_FALSE@EXAMPLES = 
diff -Nur net/sdl_net/files/patch-SDLnetselect.c net/sdl_net.new/files/patch-SDLnetselect.c
--- net/sdl_net/files/patch-SDLnetselect.c	2001-07-25 11:50:34.000000000 +0200
+++ net/sdl_net.new/files/patch-SDLnetselect.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-
-$FreeBSD: ports/net/sdl_net/files/patch-SDLnetselect.c,v 1.1 2001/07/25 09:50:34 sobomax Exp $
-
---- SDLnetselect.c	2001/07/25 09:44:01	1.1
-+++ SDLnetselect.c	2001/07/25 09:45:57
-@@ -175,6 +175,7 @@
- 	SOCKET maxfd;
- 	int retval;
- 	struct timeval tv;
-+	struct timeval *tmp;
- 	fd_set mask;
- 
- 	/* Find the largest file descriptor */
-@@ -199,8 +200,14 @@
- 		tv.tv_sec = timeout/1000;
- 		tv.tv_usec = (timeout%1000)*1000;
- 
-+		/* XXX: Workaround for a bug in FreeBSD - w/o it in some cases select() chews 100% CPU */
-+		if (timeout == ~0)
-+			tmp = NULL;
-+		else
-+			tmp = &tv;
-+
- 		/* Look! */
--		retval = select(maxfd+1, &mask, NULL, NULL, &tv);
-+		retval = select(maxfd+1, &mask, NULL, NULL, tmp);
- 	} while ( errno == EINTR );
- 
- 	/* Mark all file descriptors ready that have data available */
diff -Nur net/sdl_net/files/patch-SDLnetsys.h net/sdl_net.new/files/patch-SDLnetsys.h
--- net/sdl_net/files/patch-SDLnetsys.h	1970-01-01 01:00:00.000000000 +0100
+++ net/sdl_net.new/files/patch-SDLnetsys.h	2007-12-22 10:41:06.000000000 +0100
@@ -0,0 +1,14 @@
+--- SDLnetsys.h.orig	Sun Jul  2 02:28:47 2000
++++ SDLnetsys.h	Wed Sep 20 18:42:27 2000
+@@ -41,6 +41,11 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #ifndef __BEOS__
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#endif /* FreeBSD */
+ #include <arpa/inet.h>
+ #endif
+ #include <netinet/in.h>
diff -Nur net/sdl_net/files/patch-aa net/sdl_net.new/files/patch-aa
--- net/sdl_net/files/patch-aa	2000-09-20 17:52:38.000000000 +0200
+++ net/sdl_net.new/files/patch-aa	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
---- SDLnetsys.h.orig	Sun Jul  2 02:28:47 2000
-+++ SDLnetsys.h	Wed Sep 20 18:42:27 2000
-@@ -41,6 +41,11 @@
- #include <unistd.h>
- #include <fcntl.h>
- #ifndef __BEOS__
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#endif /* FreeBSD */
- #include <arpa/inet.h>
- #endif
- #include <netinet/in.h>
diff -Nur net/sdl_net/pkg-plist net/sdl_net.new/pkg-plist
--- net/sdl_net/pkg-plist	2006-09-20 13:21:56.000000000 +0200
+++ net/sdl_net.new/pkg-plist	2007-12-22 10:44:35.000000000 +0100
@@ -2,5 +2,5 @@
 lib/libSDL_net.a
 lib/libSDL_net.la
 lib/libSDL_net.so
-lib/libSDL_net.so.0
+lib/libSDL_net-1.2.so.0
 @dirrmtry include/SDL
diff -Nur x11-fonts/showfont/Makefile x11-fonts/showfont.new/Makefile
--- x11-fonts/showfont/Makefile	2007-05-19 22:29:35.000000000 +0200
+++ x11-fonts/showfont.new/Makefile	2007-12-22 10:33:16.000000000 +0100
@@ -7,6 +7,7 @@
 
 PORTNAME=	showfont
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
--- Mk/bsd.sdl.mk.orig	2007-12-20 09:09:11.000000000 +0100
+++ Mk/bsd.sdl.mk	2007-12-22 10:46:57.000000000 +0100
@@ -48,7 +48,7 @@
 # _REQUIRES_xxx	also needs these SDL libraries
 #
 
-_VERSION_gfx=	13
+_VERSION_gfx=	0
 _SUBDIR_gfx=	graphics
 _REQUIRES_gfx=	sdl
 
@@ -58,30 +58,33 @@
 
 _VERSION_image=	1
 _SUBDIR_image=	graphics
+_LIB_image=	SDL_image-1.2
 _REQUIRES_image=sdl
 
 _VERSION_mixer=	2
 _SUBDIR_mixer=	audio
+_LIB_mixer=	SDL_mixer-1.2
 _REQUIRES_mixer=sdl
 
 _VERSION_mm=	8
-_SUBDIR_mm=		devel
-_LIB_mm=		SDLmm
+_SUBDIR_mm=	devel
+_LIB_mm=	SDLmm
 _PORTDIR_mm=	sdlmm
 _REQUIRES_mm=	sdl
 
 _VERSION_net=	0
 _SUBDIR_net=	net
+_LIB_net=	SDL_net-1.2
 _REQUIRES_net=	sdl
 
 _VERSION_pango=	2
 _SUBDIR_pango=	x11-toolkits
-_LIB_pango=		SDL_Pango
+_LIB_pango=	SDL_Pango
 _REQUIRES_pango=sdl
 
 _VERSION_sdl=	11
 _SUBDIR_sdl=	devel
-_LIB_sdl=		SDL
+_LIB_sdl=	SDL-1.2
 _PORTDIR_sdl=	sdl12
 
 _VERSION_sound=	1
@@ -90,6 +93,7 @@
 
 _VERSION_ttf=	6
 _SUBDIR_ttf=	graphics
+_LIB_tff=	SDL_ttf-2.0
 _REQUIRES_ttf=	sdl
 
 #