4 files changed, 75 insertions, 27 deletions

diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index 59048df6b849..97f02f2fb4fa 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -4,15 +4,13 @@
 # $FreeBSD$
 
 PORTNAME=	sdl
-PORTVERSION=	1.18.7
-PORTREVISION=	2
+PORTVERSION=	1.20.3
 CATEGORIES=	devel
-MASTER_SITES=	http://www.sdlperl.org/downloads/ \
-		ftp://sdlperl.org/SDL_perl/old/
+MASTER_SITES=	http://bloodgate.com/perl/sdl/pub/
 PKGNAMEPREFIX=	p5-
 DISTNAME=	SDL_perl-${PORTVERSION}
 
-MAINTAINER=	klaus.goger@reflex.at
+MAINTAINER=	philip@paeps.cx
 COMMENT=	Perl Bindings for SDL
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
@@ -41,14 +39,41 @@ LIB_DEPENDS+=	SDL_image.10:${PORTSDIR}/graphics/sdl_image
 LIB_DEPENDS+=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
 .endif
 
+.if ${PERL_LEVEL} < 500600
+IGNORE=		This port requires perl 5.6 or newer
+.endif
+
+.if ${PERL_LEVEL} < 500800
+BUILD_DEPENDS+=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS+=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+.endif
+
 USE_PERL5=	yes
 INSTALLS_SHLIB=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		SDL::Cursor.3 SDL::Rect.3 SDL::Color.3 SDL::TTFont.3 \
-		SDL::App.3 SDL::Timer.3 SDL::Event.3 SDL::Console.3 \
-		SDL::Mixer.3 SDL::Cdrom.3 SDL::Font.3 SDL::Surface.3 \
-		SDL.3
+MAN3=		SDL.3		\
+		SDL::App.3	\
+		SDL::Cdrom.3	\
+		SDL::Color.3	\
+		SDL::Console.3	\
+		SDL::Cursor.3	\
+		SDL::Event.3	\
+		SDL::Font.3	\
+		SDL::Mixer.3	\
+		SDL::Music.3	\
+		SDL::OpenGL.3	\
+		SDL::OpenGL::Cube.3	\
+		SDL::OpenGL::Model.3	\
+		SDL::Palette.3	\
+		SDL::Rect.3	\
+		SDL::Shell.3	\
+		SDL::Sound.3	\
+		SDL::Surface.3	\
+		SDL::TTFont.3	\
+		SDL::Timer.3	\
+		SDL::Tool::Font.3	\
+		SDL::Tool::Graphic.3
 
 pre-extract:
 .if !defined(WITHOUT_SDL_GFX)
diff --git a/devel/p5-SDL/distinfo b/devel/p5-SDL/distinfo
index 6eb5786eda15..06612d64e9d0 100644
--- a/devel/p5-SDL/distinfo
+++ b/devel/p5-SDL/distinfo
@@ -1 +1 @@
-MD5 (SDL_perl-1.18.7.tar.gz) = b69f6affc8aa580fefc0331f345f6c8c
+MD5 (SDL_perl-1.20.3.tar.gz) = ab7fb92a1ed0db54a88839e64b9ce2c6
diff --git a/devel/p5-SDL/files/patch-Makefile.freebsd b/devel/p5-SDL/files/patch-Makefile.freebsd
new file mode 100644
index 000000000000..b35294b7189d
--- /dev/null
+++ b/devel/p5-SDL/files/patch-Makefile.freebsd
@@ -0,0 +1,19 @@
+--- Makefile.freebsd.orig	Thu Jan  1 02:38:22 2004
++++ Makefile.freebsd	Thu Jan  1 02:38:54 2004
+@@ -1,6 +1,7 @@
+ #!/usr/bin/env perl 
+ 
+ use strict;
++use Config;
+ use ExtUtils::MakeMaker;
+ 
+ #
+@@ -96,7 +97,7 @@
+ 
+ my %options = (
+     'NAME'	=> 'SDL_perl',
+-    'VERSION_FROM' => 'SDL.pm', 
++    'VERSION_FROM' => 'lib/SDL.pm', 
+     'LIBS'	=> [ join( " ",	"$sdl_libs", 
+ 			map { $ext{$_}{exists} ? "-l$_" : '' } (sort keys %ext),
+ 			)
diff --git a/devel/p5-SDL/pkg-plist b/devel/p5-SDL/pkg-plist
index 58ec1e174ca1..458933d11904 100644
--- a/devel/p5-SDL/pkg-plist
+++ b/devel/p5-SDL/pkg-plist
@@ -1,30 +1,34 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL_perl/SDL_perl.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL_perl/SDL_perl.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL_perl/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Cursor.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/TTFont.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Color.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Timer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL_perl/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL_perl/SDL_perl.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL_perl/SDL_perl.so
 %%SITE_PERL%%/%%PERL_ARCH%%/SDL/App.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Music.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Cdrom.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Color.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Console.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Constants.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Cursor.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/SDL/Event.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Font.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Mixer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Music.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/SDL/OpenGL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/SDL/OpenGL/Model.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/SDL/OpenGL/Cube.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Mixer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Sound.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Surface.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Rect.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/OpenGL/Constants.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/SDL/Palette.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Console.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Cdrom.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/FontTool.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Font.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Rect.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/SDL/Shell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/GraphicTool.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Sound.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Surface.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/TTFont.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Timer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Tool/Font.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Tool/Graphic.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/SDL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/SDL_perl.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL_perl
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SDL/OpenGL
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SDL/Tool
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SDL