summaryrefslogtreecommitdiff
path: root/devel/p5-SDL
diff options
context:
space:
mode:
Diffstat (limited to 'devel/p5-SDL')
-rw-r--r--devel/p5-SDL/Makefile13
-rw-r--r--devel/p5-SDL/distinfo14
-rw-r--r--devel/p5-SDL/patches/patch-aa12
-rw-r--r--devel/p5-SDL/patches/patch-ab27
-rw-r--r--devel/p5-SDL/patches/patch-ac14
-rw-r--r--devel/p5-SDL/patches/patch-ad42
-rw-r--r--devel/p5-SDL/patches/patch-ae16
-rw-r--r--devel/p5-SDL/patches/patch-af18
8 files changed, 133 insertions, 23 deletions
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index 4073300bc1f..9ddf8f9a67c 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.35 2008/10/19 19:17:59 he Exp $
+# $NetBSD: Makefile,v 1.36 2008/11/17 19:54:26 he Exp $
#
-DISTNAME= SDL_perl-1.19.2
-PKGNAME= p5-SDL-1.19.2
-PKGREVISION= 18
+DISTNAME= SDL_Perl-2.1.2
+PKGNAME= p5-SDL-2.1.2
CATEGORIES= devel perl5
-MASTER_SITES= ftp://sdlperl.org/SDL_perl/
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/D/DG/DGOEHRIG/}
PKG_DESTDIR_SUPPORT= user-destdir
@@ -15,7 +14,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://sdlperl.org/
COMMENT= Perl module for SDL
-PERL5_PACKLIST= auto/SDL_perl/.packlist
+PERL5_MODULE_TYPE= Module::Build
+
+PERL5_PACKLIST= auto/SDL/.packlist
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
diff --git a/devel/p5-SDL/distinfo b/devel/p5-SDL/distinfo
index 6ceb3700d90..cc375c3323f 100644
--- a/devel/p5-SDL/distinfo
+++ b/devel/p5-SDL/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.3 2006/06/21 21:53:30 joerg Exp $
+$NetBSD: distinfo,v 1.4 2008/11/17 19:54:26 he Exp $
-SHA1 (SDL_perl-1.19.2.tar.gz) = 3c36b46bc533f62052c045724e3b98511fd825e1
-RMD160 (SDL_perl-1.19.2.tar.gz) = 9a657ade1b298e06ea4fa63f9a6dfb761b204165
-Size (SDL_perl-1.19.2.tar.gz) = 680136 bytes
-SHA1 (patch-aa) = ab13f9909865f3af41e54613839570525b908084
+SHA1 (SDL_Perl-2.1.2.tar.gz) = 1f2ad20ce3657073a902ddfacd1a388ff698d3db
+RMD160 (SDL_Perl-2.1.2.tar.gz) = 02ae15981e90869eba60aea68e286ba49320af55
+Size (SDL_Perl-2.1.2.tar.gz) = 783084 bytes
+SHA1 (patch-ab) = bc66b0b79ba24f681722a7833b10a88a53b8cfc3
+SHA1 (patch-ac) = d1a20f4bcb6f03d524ad4f7887cfc1edf4046635
+SHA1 (patch-ad) = a2122180e1da72c755466aa51f75bbba8607fa9e
+SHA1 (patch-ae) = 4b8c70e7ac886a7b6e6dac2bb4a1b3580d0749e3
+SHA1 (patch-af) = 755e7d4954b6ad4ace6b63c44bb3764ce116a4b6
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>