- Update devel/sdl12 to 1.2.15

- Update audio/sdl_mixer to 1.2.15
- Update graphics/sdl_image to 1.2.12
- Update graphics/sdl_ttf to 2.0.11
- Update graphics/sdl_gfx to 2.0.23
- Update net/sdl_net to 1.2.8
- Bump PORTREVISIONs on ports that depend on one or more packages due to
ABI and shared library version changes
- Update Mk/bsd.sdl.mk accordingly for the new shared library versions

Tested by:	exp-run by pav

32 files changed, 42 insertions, 71 deletions

diff --git a/devel/adasdl/Makefile b/devel/adasdl/Makefile
index 67cf3a652ba2..56745e800ae8 100644
--- a/devel/adasdl/Makefile
+++ b/devel/adasdl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=      adasdl
 PORTVERSION=   20010504
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=    devel
 MASTER_SITES=  SF/${PORTNAME}/AdaSDL_${PORTVERSION}/AdaSDL_${PORTVERSION}
 DISTNAME=      AdaSDL_${PORTVERSION}
diff --git a/devel/bennugd-modules/Makefile b/devel/bennugd-modules/Makefile
index 216921bf33e4..ed5f309c7dd4 100644
--- a/devel/bennugd-modules/Makefile
+++ b/devel/bennugd-modules/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	modules
 PORTVERSION=	r20091106
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel games
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
 PKGNAMEPREFIX=	bennugd-
diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile
index e040b33b441e..79a96f87af71 100644
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	clanlib
 PORTVERSION=	0.8.1
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.clanlib.org/download/releases-0.8/
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index e5e5467cf42e..b693ca0c8f39 100644
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	directfb
 PORTVERSION=	1.4.13
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.directfb.org/downloads/Core/${DISTNAME:R}/
 DISTNAME=	DirectFB-${PORTVERSION}
diff --git a/devel/esdl/Makefile b/devel/esdl/Makefile
index 925732e94e46..6b5acd81c65a 100644
--- a/devel/esdl/Makefile
+++ b/devel/esdl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	esdl
 PORTVERSION=	1.0.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
diff --git a/devel/flatzebra/Makefile b/devel/flatzebra/Makefile
index 9d1ee9843406..8b8097b93aa5 100644
--- a/devel/flatzebra/Makefile
+++ b/devel/flatzebra/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flatzebra
 PORTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	devel games
 MASTER_SITES=	http://perso.b2b2c.ca/sarrazip/dev/
 
diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile
index d3720d72420f..617a1b9138bd 100644
--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guichan
 PORTVERSION=	0.8.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel games
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index e2197dea35c0..f76dfa0be3b5 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kyra
 PORTVERSION=	2.0.7
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}2/${PORTVERSION}
 DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
diff --git a/devel/love/Makefile b/devel/love/Makefile
index 498fa9990195..737d17c0f747 100644
--- a/devel/love/Makefile
+++ b/devel/love/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	love
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	devel games
 MASTER_SITES=	http://cdn.bitbucket.org/rude/love/downloads/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/devel/love07/Makefile b/devel/love07/Makefile
index 498fa9990195..737d17c0f747 100644
--- a/devel/love07/Makefile
+++ b/devel/love07/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	love
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	devel games
 MASTER_SITES=	http://cdn.bitbucket.org/rude/love/downloads/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/devel/love5/Makefile b/devel/love5/Makefile
index 13b9c337384e..c94decc4bf1a 100644
--- a/devel/love5/Makefile
+++ b/devel/love5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	love
 DISTVERSION=	0.5-0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile
index acfb3a62db22..dfee1c9b1277 100644
--- a/devel/ocaml-sdl/Makefile
+++ b/devel/ocaml-sdl/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	sdl
 PORTVERSION=	0.7.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel
 MASTER_SITES=	SF/ocaml${PORTNAME}/OCamlSDL/ocaml${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	ocaml-
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index d0c585fa35ad..9675d94951fb 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	SDL
 PORTVERSION=	2.2.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=SDL
diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile
index 7294ed10a9a9..0b00cb30a3c2 100644
--- a/devel/ptlib/Makefile
+++ b/devel/ptlib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ptlib
 PORTVERSION=	2.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/ptlib/2.4
diff --git a/devel/ptlib26/Makefile b/devel/ptlib26/Makefile
index 67f94eed7175..8d98e4627057 100644
--- a/devel/ptlib26/Makefile
+++ b/devel/ptlib26/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ptlib
 PORTVERSION=	2.6.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/opalvoip/v3.6%20Lalande/Final/
 DISTNAME=	ptlib-${PORTVERSION}
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 158e44368be0..261ad5b99725 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pwlib
 PORTVERSION=	1.12.0
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES= 	SF/openh323/${PORTNAME}/${PORTVERSION}
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index 0d258c806bec..9f73fb80b18c 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	game
 PORTVERSION=	1.8.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel python
 MASTER_SITES=	http://pygame.seul.org/ftp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/ros-common/Makefile b/devel/ros-common/Makefile
index 82b2fb6de240..870b5f463543 100644
--- a/devel/ros-common/Makefile
+++ b/devel/ros-common/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ros-common
 PORTVERSION=	1.4.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://code.ros.org/svn/release/download/stacks/${STACKNAME}/${STACKNAME}-${PORTVERSION}/:rel \
 		http://pr.willowgarage.com/downloads/:pr \
diff --git a/devel/ruby-rudl/Makefile b/devel/ruby-rudl/Makefile
index 11b6d01a577d..96fd4eec301f 100644
--- a/devel/ruby-rudl/Makefile
+++ b/devel/ruby-rudl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rudl
 PORTVERSION=	0.8
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel ruby
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/devel/ruby-sdl/Makefile b/devel/ruby-sdl/Makefile
index 13fe4045e109..86c18be68eba 100644
--- a/devel/ruby-sdl/Makefile
+++ b/devel/ruby-sdl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl
 PORTVERSION=	1.3.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel graphics audio ruby
 MASTER_SITES=	http://www.kmc.gr.jp/~ohai/rubysdl/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/devel/rubygem-rubygame/Makefile b/devel/rubygem-rubygame/Makefile
index caf939c0624a..ad6e4dc28cbe 100644
--- a/devel/rubygem-rubygame/Makefile
+++ b/devel/rubygem-rubygame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rubygame
 PORTVERSION=	2.6.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-sdl/Makefile b/devel/rubygem-sdl/Makefile
index b101c5e0c9e5..1c6745af611a 100644
--- a/devel/rubygem-sdl/Makefile
+++ b/devel/rubygem-sdl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdl
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	devel graphics audio ruby
 MASTER_SITES=	RG
 DISTNAME=	rubysdl-${PORTVERSION}
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index 3c2b4f830173..6c5115669dd7 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sdl
-PORTVERSION=	1.2.14
-PORTREVISION=	2
+PORTVERSION=	1.2.15
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/
@@ -20,6 +19,7 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack pkgconfig
diff --git a/devel/sdl12/distinfo b/devel/sdl12/distinfo
index ba8000f6587a..d6b4be545dfe 100644
--- a/devel/sdl12/distinfo
+++ b/devel/sdl12/distinfo
@@ -1,2 +1,2 @@
-SHA256 (SDL-1.2.14.tar.gz) = 5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642eed9b6
-SIZE (SDL-1.2.14.tar.gz) = 4014154
+SHA256 (SDL-1.2.15.tar.gz) = d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00
+SIZE (SDL-1.2.15.tar.gz) = 3920622
diff --git a/devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c b/devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c
index 3c5d8b921d21..a8a8a9a7f41c 100644
--- a/devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c
+++ b/devel/sdl12/files/patch-src_joystick_bsd_SDL_sysjoystick.c
@@ -1,16 +1,11 @@
---- src/joystick/bsd/SDL_sysjoystick.c.orig	2010-02-05 11:17:18.000000000 +0100
-+++ src/joystick/bsd/SDL_sysjoystick.c	2010-02-05 11:18:15.000000000 +0100
-@@ -303,11 +303,12 @@
- 		    strerror(errno));
- 		goto usberr;
- 	}
-+
-+	rep = &hw->inreport;
- #if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
-        rep->rid = hid_get_report_id(fd);
-        if (rep->rid < 0) {
- #else
--	rep = &hw->inreport;
- 	if (ioctl(fd, USB_GET_REPORT_ID, &rep->rid) < 0) {
- #endif
- 		rep->rid = -1; /* XXX */
+--- src/joystick/bsd/SDL_sysjoystick.c.orig	2012-01-28 12:07:18.000000000 +0100
++++ src/joystick/bsd/SDL_sysjoystick.c	2012-01-28 12:08:44.000000000 +0100
+@@ -148,7 +148,7 @@
+ static int	report_alloc(struct report *, struct report_desc *, int);
+ static void	report_free(struct report *);
+ 
+-#if defined(USBHID_UCR_DATA) || defined(__FreeBSD_kernel__)
++#if defined(USBHID_UCR_DATA) || (defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version <= 800063)
+ #define REP_BUF_DATA(rep) ((rep)->buf->ucr_data)
+ #elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063))
+ #define REP_BUF_DATA(rep) ((rep)->buf->ugd_data)
diff --git a/devel/sdl12/files/patch-src_video_mmx.h b/devel/sdl12/files/patch-src_video_mmx.h
deleted file mode 100644
index f55032507381..000000000000
--- a/devel/sdl12/files/patch-src_video_mmx.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/video/mmx.h	2009-10-12 23:07:15.000000000 +0000
-+++ src/video/mmx.h	2010-04-13 14:25:40.530735004 +0000
-@@ -355,7 +355,7 @@
- 
- #define	mmx_r2m(op, reg, mem) \
- 	__asm__ __volatile__ (#op " %%" #reg ", %0" \
--			      : "=X" (mem) \
-+			      : "=m" (mem) \
- 			      : /* nothing */ )
- 
- #define	mmx_r2r(op, regs, regd) \
diff --git a/devel/sdl12/files/patch-src_video_x11_SDL_x11events.c b/devel/sdl12/files/patch-src_video_x11_SDL_x11events.c
deleted file mode 100644
index 631c55cf4a4b..000000000000
--- a/devel/sdl12/files/patch-src_video_x11_SDL_x11events.c
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-Patch attached with submission follows:
-
---- src/video/x11/SDL_x11events.c.orig	2010-08-29 20:13:12.455316094 +0300
-+++ src/video/x11/SDL_x11events.c	2010-08-29 20:14:46.875763077 +0300
-@@ -441,8 +441,10 @@
- if ( xevent.xcrossing.mode == NotifyUngrab )
- printf("Mode: NotifyUngrab\n");
- #endif
--		if ( xevent.xcrossing.detail != NotifyInferior ) {
--			if ( this->input_grab == SDL_GRAB_OFF ) {
-+		if ( (xevent.xcrossing.mode != NotifyGrab) &&
-+		     (xevent.xcrossing.mode != NotifyUngrab) &&
-+		     (xevent.xcrossing.detail != NotifyInferior) ) {
-+              		if ( this->input_grab == SDL_GRAB_OFF ) {
- 				posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
- 			} else {
- 				posted = SDL_PrivateMouseMotion(0, 0,
-
-
diff --git a/devel/sdl12/pkg-plist b/devel/sdl12/pkg-plist
index 82c2c10f451f..cb4cfc6941f5 100644
--- a/devel/sdl12/pkg-plist
+++ b/devel/sdl12/pkg-plist
@@ -37,6 +37,7 @@ lib/libSDL-1.2.so.11
 lib/libSDL.la
 lib/libSDL.a
 lib/libSDLmain.a
+lib/libSDLmain.la
 libdata/pkgconfig/sdl.pc
 share/aclocal/sdl.m4
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
diff --git a/devel/sdl_console/Makefile b/devel/sdl_console/Makefile
index a85a4545b5ac..0ef2262dd63a 100644
--- a/devel/sdl_console/Makefile
+++ b/devel/sdl_console/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl_console
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/sdlconsole/sdlconsole-source/sdlconsole-${PORTVERSION}
 DISTNAME=	sdlconsole-${PORTVERSION}
diff --git a/devel/sdl_sge/Makefile b/devel/sdl_sge/Makefile
index 385e5ef9d56d..65b513f1c0db 100644
--- a/devel/sdl_sge/Makefile
+++ b/devel/sdl_sge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl_sge
 PORTVERSION=	0.030809
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel graphics
 MASTER_SITES=	http://www.digitalfanatics.org/cal/sge/files/ \
 		http://www.sourcefiles.org/Programming/Libraries/Graphics/
diff --git a/devel/sdlmm/Makefile b/devel/sdlmm/Makefile
index 8b784ed0bc6f..a85755fe2cae 100644
--- a/devel/sdlmm/Makefile
+++ b/devel/sdlmm/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	sdlmm
 PORTVERSION=	0.1.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/SDLmm/${PORTVERSION}
 DISTNAME=	SDLmm-${PORTVERSION}
diff --git a/devel/upp/Makefile b/devel/upp/Makefile
index 08af370f8b16..78f932f1e435 100644
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	upp
 PORTVERSION=	4193
+PORTREVISION=	1
 CATEGORIES=	devel x11-toolkits
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-x11-src-${PORTVERSION}