devel/sdl12:

 	- Update to 1.2.13
	- OPTIONize as recommended by Danny Pansters
	- Fixed up gnome dependencies as recommended by Danny Panster
	- Fixed up NOPORTDOCS and NOPORTEXAMPLES knobs as recommended by Danny Pansters
	- Got rid of library renaming as recommended by Danny Pansters
	- Pass maintainership to submitter
Mk/bsd.sdl.mk:
	- Fixed _LIB_* entries in order to retrieve the correct library versions.

PR:		117608
Submitted by:	Marcus von Appen <mva@sysfault.org>

4 files changed, 2 insertions, 109 deletions

diff --git a/devel/sdl12/files/patch-Makefile.in b/devel/sdl12/files/patch-Makefile.in
deleted file mode 100644
index aa132d337790..000000000000
--- a/devel/sdl12/files/patch-Makefile.in
+++ /dev/null
@@ -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 --git a/devel/sdl12/files/patch-configure b/devel/sdl12/files/patch-configure
index 6a5419d3f9cf..3441468c5d8a 100644
--- a/devel/sdl12/files/patch-configure
+++ b/devel/sdl12/files/patch-configure
@@ -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 --git a/devel/sdl12/files/patch-sdl-config.in b/devel/sdl12/files/patch-sdl-config.in
index d12cba743f80..ae61a0c95549 100644
--- a/devel/sdl12/files/patch-sdl-config.in
+++ b/devel/sdl12/files/patch-sdl-config.in
@@ -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 --git a/devel/sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c b/devel/sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c
deleted file mode 100644
index 629ecd38b9c1..000000000000
--- a/devel/sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c
+++ /dev/null
@@ -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]) {