Update to 2.1.3

PR:             ports/120983
Submitted by:   Alex Kozlov <spam@rm-rf.kiev.ua>
Approved by:    araujo (mentor, implicit)

4 files changed, 73 insertions, 97 deletions

diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index a91a9eb49b3e..091b365d6c2c 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -3,15 +3,15 @@
 # Whom:					Klaus Goger <klaus.goger@reflex.at>
 # $FreeBSD$
 
-PORTNAME=	sdl
-PORTVERSION=	1.20.3
-PORTREVISION=	7
+PORTNAME=	SDL
+PORTVERSION=	2.1.3
 CATEGORIES=	devel perl5
-MASTER_SITES=	http://bloodgate.com/perl/sdl/pub/
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	../../authors/id/D/DG/DGOEHRIG
 PKGNAMEPREFIX=	p5-
-DISTNAME=	SDL_perl-${PORTVERSION}
+DISTNAME=	SDL_Perl-${PORTVERSION}
 
-MAINTAINER=	philip@FreeBSD.org
+MAINTAINER=	spam@rm-rf.kiev.ua
 COMMENT=	Perl Bindings for SDL
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
@@ -19,6 +19,13 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 
 USE_PERL5=	yes
 USE_SDL=	sdl
+PERL_MODBUILD=	yes
+
+OPTIONS=	SDL_TTF "Enable TTF support" on \
+			SDL_NET "Enable NET support" on \
+			SDL_GFX "Enable GFX support" on \
+			SDL_IMAGE "Enable IMAGE support" on \
+			SDL_MIXER "Enable MIXER support" on
 
 .include <bsd.port.pre.mk>
 
@@ -48,50 +55,49 @@ RUN_DEPENDS+=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 .endif
 
 USE_LDCONFIG=	yes
-INSTALL_TARGET=	pure_install
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-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)
-	@${ECHO_MSG} "You can disable support for SDL_gfx by defining WITHOUT_SDL_GFX."
-.endif
-.if !defined(WITHOUT_SDL_IMAGE)
-	@${ECHO_MSG} "You can disable support for SDL_image by defining WITHOUT_SDL_IMAGE."
-.endif
-.if !defined(WITHOUT_SDL_MIXER)
-	@${ECHO_MSG} "You can disable support for SDL_mixer by defining WITHOUT_SDL_MIXER."
-.endif
-.if !defined(WITHOUT_SDL_NET)
-	@${ECHO_MSG} "You can disable support for SDL_net by defining WITHOUT_SDL_NET."
-.endif
-.if !defined(WITHOUT_SDL_TTF)
-	@${ECHO_MSG} "You can disable support for SDL_ttf by defining WITHOUT_SDL_TTF."
-.endif
-
-do-configure:
-	cd ${WRKSRC}; ${PERL} ${WRKSRC}/Makefile.freebsd
 
+MAN3=	SDL.3		\
+	SDL::App.3	\
+	SDL::Cdrom.3	\
+	SDL::Color.3	\
+	SDL::Cursor.3	\
+	SDL::Event.3	\
+	SDL::Font.3	\
+	SDL::MPEG.3	\
+	SDL::Mixer.3	\
+	SDL::Music.3	\
+	SDL::OpenGL.3	\
+	SDL::Palette.3	\
+	SDL::Rect.3	\
+	SDL::SFont.3	\
+	SDL::Sound.3	\
+	SDL::Surface.3	\
+	SDL::TTFont.3	\
+	SDL::Timer.3	\
+	SDL::Tool::Font.3	\
+	SDL::Tool::Graphic.3	\
+	SDL::Tutorial.3	\
+	SDL::Tutorial::Animation.3	\
+	SDL::Tutorial::Images.3		\
+	SDL::Tutorial::Drawing.3	\
+	SDL::Video.3
+
+# Workaround for Build.PL bug
+post-install:
+	if [ -d ${SITE_PERL}/${PERL_ARCH}/auto/src ]; then \
+		mv ${SITE_PERL}/${PERL_ARCH}/auto/src/SDL* \
+		${SITE_PERL}/${PERL_ARCH}/auto/; \
+		rmdir ${SITE_PERL}/${PERL_ARCH}/auto/src; \
+	fi
+
+	if [ -n ${PERL} ]; then \
+		PERL_THREADED=`${PERL} -V | ${GREP} -- -Dusethreads=y || ${TRUE}`; \
+		if [ -z ${PERL_THREADED} ]; then \
+			${ECHO_MSG} "SDL_PERL must be built with a threaded Perl, reinstall Perl with WITH_THREADS=yes"; \
+			${ECHO_MSG} "or lunch any program that use this port with LD_PRELOAD=/usr/lib/libc_r.so"; \
+		fi; \
+	fi
+ 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-SDL/distinfo b/devel/p5-SDL/distinfo
index 6984553ce092..9b6f07503c78 100644
--- a/devel/p5-SDL/distinfo
+++ b/devel/p5-SDL/distinfo
@@ -1,3 +1,3 @@
-MD5 (SDL_perl-1.20.3.tar.gz) = ab7fb92a1ed0db54a88839e64b9ce2c6
-SHA256 (SDL_perl-1.20.3.tar.gz) = ac6f511404457592b88fd57c4c77f7feba8e3b55d62c3c45c117fe84f1e07a7d
-SIZE (SDL_perl-1.20.3.tar.gz) = 798385
+MD5 (SDL_Perl-2.1.3.tar.gz) = 6ce26e1b710ce52def4ec22637cd5176
+SHA256 (SDL_Perl-2.1.3.tar.gz) = 055e4eee85089cf9f7305e68580082fabb624c28199840cf91838b673539b082
+SIZE (SDL_Perl-2.1.3.tar.gz) = 782794
diff --git a/devel/p5-SDL/files/patch-Makefile.freebsd b/devel/p5-SDL/files/patch-Makefile.freebsd
index 02d2fd55958a..e69de29bb2d1 100644
--- a/devel/p5-SDL/files/patch-Makefile.freebsd
+++ b/devel/p5-SDL/files/patch-Makefile.freebsd
@@ -1,39 +0,0 @@
---- Makefile.freebsd.orig	Wed Mar 12 03:38:56 2003
-+++ Makefile.freebsd	Tue Sep 12 18:08:44 2006
-@@ -1,6 +1,7 @@
- #!/usr/bin/env perl 
- 
- use strict;
-+use Config;
- use ExtUtils::MakeMaker;
- 
- #
-@@ -13,8 +14,8 @@
- # Configuration detection of Linux / Unix
- #
- 
--chomp ($sdl_cflags = "-I/usr/X11R6/include " . `sdl11-config --cflags`);
--chomp ($sdl_libs = "-L/usr/X11R6/lib " . `sdl11-config --libs`);
-+chomp ($sdl_cflags = "-I/usr/X11R6/include " . `sdl-config --cflags`);
-+chomp ($sdl_libs = "-L/usr/X11R6/lib " . `sdl-config --libs`);
- $sdl_libs =~ s/-Wl,-rpath,\/usr\/local\/lib//; # suppress the insanity
- $sdl_libs =~ s/-pthread//;
- 
-@@ -24,7 +25,7 @@
- 
- @dirs=(
- 	'/usr/local/include',
--	'/usr/local/include/SDL11', 
-+	'/usr/local/include/SDL', 
- 	'/usr/local/include/smpeg',
- 	'/usr/X11R6/include',
- 	'/usr/X11R6/include/GL', 
-@@ -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 458933d11904..1fb320cb7076 100644
--- a/devel/p5-SDL/pkg-plist
+++ b/devel/p5-SDL/pkg-plist
@@ -1,34 +1,43 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/autosplit.ix
-%%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%%/auto/SDL/SFont/SFont.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/SFont/SFont.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/OpenGL/OpenGL.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/OpenGL/OpenGL.so
 %%SITE_PERL%%/%%PERL_ARCH%%/SDL/App.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/Config.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/MPEG.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/OpenGL/Constants.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/SDL/Palette.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/SDL/Rect.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Shell.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/SFont.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/Tutorial.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Tutorial/Animation.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Tutorial/Drawing.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Tutorial/Images.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/SDL/Video.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/SDL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/SDL_perl.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/OpenGL
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SDL/SFont
 @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/Tutorial
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SDL