6 files changed, 117 insertions, 12 deletions
diff --git a/devel/p5-SDL/patches/patch-aa b/devel/p5-SDL/patches/patch-aa
deleted file mode 100644
index df695fd40f3..00000000000
--- a/devel/p5-SDL/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/06/21 21:53:31 joerg Exp $
---- Makefile.PL.old	Wed Jan  1 15:54:59 2003
-+++ Makefile.PL	Wed Jan  1 15:55:16 2003
-@@ -5,6 +5,8 @@
- #
- 
- %OS = (
-+	netbsd	=> "Makefile.netbsd",
-+	dragonfly	=> "Makefile.netbsd",
- 	linux 	=> "Makefile.linux",
- 	win 	=> "Makefile.win32",
- 	freebsd => "Makefile.freebsd",
diff --git a/devel/p5-SDL/patches/patch-ab b/devel/p5-SDL/patches/patch-ab
new file mode 100644
index 00000000000..d9e4ceba9c4
--- /dev/null
+++ b/devel/p5-SDL/patches/patch-ab
@@ -0,0 +1,27 @@
+$NetBSD: patch-ab,v 1.1 2008/11/17 19:54:26 he Exp $
+
+Tweak includes so that they can be found.
+Latter include is due to CPAN bug 19155.
+
+--- src/OpenGL.xs.orig	2004-09-24 00:36:56.000000000 +0000
++++ src/OpenGL.xs
+@@ -12,8 +12,8 @@
+ 
+ #include <SDL.h>
+ 
+-#include <gl.h>
+-#include <glu.h>
++#include <GL/gl.h>
++#include <GL/glu.h>
+ 
+ #ifdef USE_THREADS
+ #define HAVE_TLS_CONTEXT
+@@ -23,7 +23,7 @@
+ #define GL_ALL_CLIENT_ATTRIB_BITS 0xFFFFFFF
+ #endif /* GL_ALL_CLIENT_BITS */  
+ 
+-#include "../defines.h"
++#include "../src/defines.h"
+ 
+ SV* sdl_perl_nurbs_error_hook;
+ void
diff --git a/devel/p5-SDL/patches/patch-ac b/devel/p5-SDL/patches/patch-ac
new file mode 100644
index 00000000000..02f8fcdf942
--- /dev/null
+++ b/devel/p5-SDL/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2008/11/17 19:54:26 he Exp $
+
+Define a missing type used in OpenGL.xs.
+
+--- typemap.orig	2004-09-24 00:36:56.000000000 +0000
++++ typemap
+@@ -54,6 +54,7 @@ GLboolean		T_U_CHAR
+ GLUnurbsObj *		T_PTR
+ GLUtesselator *		T_PTR
+ GLuint			T_UV
++GLint			T_IV
+ GLint*			T_PTR
+ float *			T_PTR
+ float			T_NV
diff --git a/devel/p5-SDL/patches/patch-ad b/devel/p5-SDL/patches/patch-ad
new file mode 100644
index 00000000000..931f4867169
--- /dev/null
+++ b/devel/p5-SDL/patches/patch-ad
@@ -0,0 +1,42 @@
+$NetBSD: patch-ad,v 1.1 2008/11/17 19:54:26 he Exp $
+
+Ensure that the xs modules are installed in the right path.
+This fix is from CPAN bug #19155.
+The tweak to the module_name is from the diff in CPAN bug #32744.
+
+--- Build.PL.orig	2004-09-24 00:36:56.000000000 +0000
++++ Build.PL
+@@ -34,7 +34,7 @@ my %subsystems =
+ 	SDL => {
+ 		file      => {
+ 			from  => 'src/SDL.xs',
+-			to    => 'src/SDL_perl.xs',
++			to    => './SDL_perl.xs',
+ 		},
+ 		libraries => [qw( SDL SDL_image SDL_mixer SDL_net SDL_ttf SDL_gfx
+ 		                  png jpeg smpeg )],
+@@ -42,14 +42,14 @@ my %subsystems =
+ 	OpenGL => {
+ 		file      => {
+ 			from => 'src/OpenGL.xs',
+-			to   => 'src/SDL/OpenGL.xs', 
++			to   => 'SDL/OpenGL.xs', 
+ 		},
+ 		libraries => [qw( SDL GL GLU )],
+ 	},
+ 	SFont => {
+ 		file	=> {
+ 			from => 'src/SFont.xs',
+-			to   =>	'src/SDL/SFont.xs',
++			to   =>	'SDL/SFont.xs',
+ 		},
+ 		libraries => [qw( SDL SDL_image )],
+ 	},	
+@@ -122,6 +122,7 @@ my %xs = map { $subsystems{$_}{file}{fro
+ 	     keys %subsystems;
+ 
+ my $build   = SDL::Build->new(
++	module_name	     => 'SDL',
+ 	dist_name            => 'SDL_Perl', 
+ 	license		     => 'lgpl',
+ 	dist_version_from    => 'lib/SDL.pm',
diff --git a/devel/p5-SDL/patches/patch-ae b/devel/p5-SDL/patches/patch-ae
new file mode 100644
index 00000000000..a212b91a0aa
--- /dev/null
+++ b/devel/p5-SDL/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2008/11/17 19:54:26 he Exp $
+
+This is from CPAN bug #19155, adapting to the new location
+of the C source file.
+
+--- src/SDL.xs.orig	2004-09-24 00:36:56.000000000 +0000
++++ src/SDL.xs
+@@ -69,7 +69,7 @@ static int sdl_perl_use_smpeg_audio = 0;
+ #define HAVE_TLS_CONTEXT
+ #endif
+ 
+-#include "defines.h"
++#include "src/defines.h"
+ 
+ Uint32 
+ sdl_perl_timer_callback ( Uint32 interval, void* param )
diff --git a/devel/p5-SDL/patches/patch-af b/devel/p5-SDL/patches/patch-af
new file mode 100644
index 00000000000..c2e3e30ae3b
--- /dev/null
+++ b/devel/p5-SDL/patches/patch-af
@@ -0,0 +1,18 @@
+$NetBSD: patch-af,v 1.1 2008/11/17 19:54:26 he Exp $
+
+This is from CPAN bug #19155, adapting to the new placement
+of the C source files.
+
+--- src/SFont.xs.orig	2004-09-24 00:36:56.000000000 +0000
++++ src/SFont.xs
+@@ -23,8 +23,8 @@
+ #define HAVE_TLS_CONTEXT
+ #endif
+ 
+-#include "../defines.h"
+-#include "../SFont.h"
++#include "../src/defines.h"
++#include "../src/SFont.h"
+ 
+ #ifdef HAVE_SDL_IMAGE
+ #include <SDL_image.h>