- 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)

7 files changed, 7 insertions, 16 deletions

diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile
index c491878642da..bc4a467e67a9 100644
--- a/x11-toolkits/gai/Makefile
+++ b/x11-toolkits/gai/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gai
 PORTVERSION=	0.5.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/mesgui/Makefile b/x11-toolkits/mesgui/Makefile
index e3c1887ddfe8..a4d3cd2d2cee 100644
--- a/x11-toolkits/mesgui/Makefile
+++ b/x11-toolkits/mesgui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mesgui
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index ed8b061c05e8..35076b06a591 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	paragui
 PORTVERSION=	1.1.8
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index 33d390726eba..b025a266378c 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	paragui
 PORTVERSION=	1.0.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/x11-toolkits/sdl_gui/Makefile b/x11-toolkits/sdl_gui/Makefile
index 86331879db15..6a186da2ceea 100644
--- a/x11-toolkits/sdl_gui/Makefile
+++ b/x11-toolkits/sdl_gui/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	sdl_gui
 PORTVERSION=	0.10.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.newimage.com/~rhk/SDL_gui/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/x11-toolkits/sdl_gui/files/patch-include::Makefile.in b/x11-toolkits/sdl_gui/files/patch-include::Makefile.in
deleted file mode 100644
index d6750394c3e5..000000000000
--- a/x11-toolkits/sdl_gui/files/patch-include::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/Makefile.in.orig	Sun Sep 15 23:11:18 2002
-+++ include/Makefile.in	Sun Sep 15 23:11:32 2002
-@@ -82,7 +82,7 @@
- SDL_LIBS = @SDL_LIBS@
- VERSION = @VERSION@
- 
--libSDL_guiincludedir = $(includedir)/SDL
-+libSDL_guiincludedir = $(includedir)/SDL11
- 
- # Which header files to install
- libSDL_guiinclude_HEADERS = SDL_gui.h
diff --git a/x11-toolkits/sdl_gui/pkg-plist b/x11-toolkits/sdl_gui/pkg-plist
index eea3128764a7..a622b8060a85 100644
--- a/x11-toolkits/sdl_gui/pkg-plist
+++ b/x11-toolkits/sdl_gui/pkg-plist
@@ -1,5 +1,6 @@
-include/SDL11/SDL_gui.h
+include/SDL/SDL_gui.h
 lib/libSDL_gui.a
 lib/libSDL_gui.la
 lib/libSDL_gui.so
 lib/libSDL_gui.so.0
+@dirrmtry include/SDL