- 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

6 files changed, 16 insertions, 52 deletions

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