[131106] trunk/dports/perl/p5-sdl_perl

ryandesign at macports.org ryandesign at macports.org
Mon Jan 5 22:55:03 PST 2015


Revision: 131106
          https://trac.macports.org/changeset/131106
Author:   ryandesign at macports.org
Date:     2015-01-05 22:55:03 -0800 (Mon, 05 Jan 2015)
Log Message:
-----------
p5-sdl_perl: update to 2.2.6 (#38484); add p5.18 and p5.20 subports; rename patchfiles

Modified Paths:
--------------
    trunk/dports/perl/p5-sdl_perl/Portfile

Added Paths:
-----------
    trunk/dports/perl/p5-sdl_perl/files/patch-Build.PL.diff
    trunk/dports/perl/p5-sdl_perl/files/patch-make-lib-SDL-Build-Darwin.pm.diff
    trunk/dports/perl/p5-sdl_perl/files/patch-src-SDL.xs.diff

Removed Paths:
-------------
    trunk/dports/perl/p5-sdl_perl/files/patch-make-lib-SDL-Build-Darwin.pm
    trunk/dports/perl/p5-sdl_perl/files/patch-src-SDL.xs
    trunk/dports/perl/p5-sdl_perl/files/patch-test-testgfxprim.pl

Modified: trunk/dports/perl/p5-sdl_perl/Portfile
===================================================================
--- trunk/dports/perl/p5-sdl_perl/Portfile	2015-01-06 06:15:07 UTC (rev 131105)
+++ trunk/dports/perl/p5-sdl_perl/Portfile	2015-01-06 06:55:03 UTC (rev 131106)
@@ -4,72 +4,39 @@
 PortSystem              1.0
 PortGroup               perl5 1.0
 
-perl5.branches      5.16
-perl5.setup             SDL_Perl 2.1.3
-revision                5
+perl5.branches          5.16 5.18 5.20
+perl5.setup             SDL_Perl 2.2.6 ../by-authors/id/K/KT/KTHAKORE
 maintainers             nomaintainer
 categories-append       devel
 description             Perl bindings for the Simple DirectMedia Layer
 long_description        ${description}
 homepage                http://sdl.perl.org/
-master_sites            http://search.cpan.org/CPAN/authors/id/D/DG/DGOEHRIG/
-checksums               md5 6ce26e1b710ce52def4ec22637cd5176 \
-                        sha1 9c11cd7e4356f9b254cd9e3a2f993b1751a21552 \
-                        rmd160 26a4d317d9a5761fc893b732f2236eaad8d12b88
 platforms               darwin
+distname                ${perl5.module}-v${version}
 
+checksums               rmd160  1a6d779c05d97c691e9a3673e83ca650142a0d0a \
+                        sha256  a3fbf0213855629fefab9fa3431053ad646e175e9daa8e9796be1d84a5c32061
+
 if {${perl5.major} != ""} {
 
-patchfiles              patch-make-lib-SDL-Build-Darwin.pm patch-src-SDL.xs \
-                        patch-test-testgfxprim.pl
-
 depends_lib-append      port:p${perl5.major}-module-build \
-                        port:libsdl
+                        port:libsdl \
+                        port:libsdl_gfx \
+                        port:libsdl_image \
+                        port:libsdl_mixer \
+                        port:libsdl_net \
+                        port:libsdl_ttf
 
-variant image {
-    depends_lib-append  port:libsdl_image
-}
+patchfiles              patch-Build.PL.diff \
+                        patch-make-lib-SDL-Build-Darwin.pm.diff \
+                        patch-src-SDL.xs.diff
 
-variant mixer {
-    depends_lib-append  port:libsdl_mixer
+post-patch {
+    reinplace "s|@ARCHFLAGS@|[get_canonical_archflags]|g" ${worksrcpath}/Build.PL
 }
 
-variant net {
-    depends_lib-append  port:libsdl_net
-}
+perl5.use_module_build
 
-variant ttf {
-    depends_lib-append  port:libsdl_ttf
 }
 
-variant gfx {
-    depends_lib-append  port:libsdl_gfx
-}
-
-default_variants        +image +mixer +net +ttf +gfx
-
-configure.cmd           ${perl5.bin}
-configure.pre_args      Build.PL
-configure.env-append    PREFIX=${prefix}
-configure.args          'Build Build' installdirs=vendor
-
-build.cmd               ${perl5.bin}
-build.pre_args          Build
-build.args              build
-
-# Work around build system problem:
-post-build {
-    file rename ${worksrcpath}/blib/arch/auto/src/SDL \
-        ${worksrcpath}/blib/arch/auto/
-    file rename ${worksrcpath}/blib/arch/auto/src/SDL_perl \
-        ${worksrcpath}/blib/arch/auto/
-    system "rmdir ${worksrcpath}/blib/arch/auto/src"
-}
-
-test.pre_args           Build
-
-destroot.cmd            ${perl5.bin}
-destroot.pre_args       Build
-destroot.args           install
-destroot.destdir        destdir=${destroot}
-}
+livecheck.version       v${version}

Added: trunk/dports/perl/p5-sdl_perl/files/patch-Build.PL.diff
===================================================================
--- trunk/dports/perl/p5-sdl_perl/files/patch-Build.PL.diff	                        (rev 0)
+++ trunk/dports/perl/p5-sdl_perl/files/patch-Build.PL.diff	2015-01-06 06:55:03 UTC (rev 131106)
@@ -0,0 +1,13 @@
+--- Build.PL.orig	2009-11-07 14:47:35.000000000 -0600
++++ Build.PL	2015-01-06 00:44:26.000000000 -0600
+@@ -167,8 +167,8 @@
+ 	$defines,
+ 	$includes,
+ 	$links,
+-	$sdl_compile_flags,
+-	$sdl_link_flags,
++	$sdl_compile_flags . ' @ARCHFLAGS@',
++	$sdl_link_flags . ' @ARCHFLAGS@',
+ );
+ # now we're ready to go!
+ $build->create_build_script();

Deleted: trunk/dports/perl/p5-sdl_perl/files/patch-make-lib-SDL-Build-Darwin.pm
===================================================================
--- trunk/dports/perl/p5-sdl_perl/files/patch-make-lib-SDL-Build-Darwin.pm	2015-01-06 06:15:07 UTC (rev 131105)
+++ trunk/dports/perl/p5-sdl_perl/files/patch-make-lib-SDL-Build-Darwin.pm	2015-01-06 06:55:03 UTC (rev 131106)
@@ -1,44 +0,0 @@
---- make/lib/SDL/Build/Darwin.pm.orig	2008-05-03 13:58:14.000000000 -0700
-+++ make/lib/SDL/Build/Darwin.pm	2008-05-03 14:00:52.000000000 -0700
-@@ -5,28 +5,25 @@
- sub fetch_includes
- {
- 	return (
--	'/usr/local/include/SDL'   => '/usr/local/lib',
-+	"$ENV{'PREFIX'}/include"   => "$ENV{'PREFIX'}/lib",
-+	"$ENV{'PREFIX'}/include/SDL" => "$ENV{'PREFIX'}/lib",
- 	'/usr/local/include'       => '/usr/local/lib',
--	'/usr/local/include/smpeg' => '/usr/local/lib',
--	'/usr/include/SDL'         => '/usr/lib',
- 	'/usr/include'             => '/usr/lib',
--	'/usr/include/smpeg'       => '/usr/lib',
--	'/usr/local/include/GL'    => '/usr/local/lib',
--	'/usr/local/include/gl'    => '/usr/local/lib',
--	'/usr/include/GL'          => '/usr/lib', 
--	'/usr/include/gl'          => '/usr/lib', 
- 
--	'/System/Library/Frameworks/SDL_mixer.framework/Headers'     => '../../lib',
--	'/System/Library/Frameworks/SDL_image.framework/Headers'     => '../../lib',
--	'/System/Library/Frameworks/SDL_ttf.framework/Headers'       => '../../lib',
--	'/System/Library/Frameworks/libogg.framework/Headers'        => '../../lib',
--	'/System/Library/Frameworks/libvorbis.framework/Headers'     => '../../lib',
--	'/System/Library/Frameworks/libvorbisfile.framework/Headers' => '../../lib',
--	'/System/Library/Frameworks/libvorbisenc.framework/Headers'  => '../../lib',
--	'../../include'                                              => '../../lib',
-+	'../../include'                                       => '../../lib',
- 	'/System/Library/Frameworks/OpenGL.framework/Headers'        =>
- 		'/System/Library/Frameworks/OpenGL.framework/Libraries',
- 	);
- }
- 
-+sub build_defines
-+{
-+	my $self = shift;
-+	my $defines = $self->SUPER::build_defines(@_);
-+
-+	push @{$defines->{SDL}}, "-Ddarwin", "-DMACOSX";
-+
-+	return $defines;
-+}
-+
- 1;

Copied: trunk/dports/perl/p5-sdl_perl/files/patch-make-lib-SDL-Build-Darwin.pm.diff (from rev 131105, trunk/dports/perl/p5-sdl_perl/files/patch-make-lib-SDL-Build-Darwin.pm)
===================================================================
--- trunk/dports/perl/p5-sdl_perl/files/patch-make-lib-SDL-Build-Darwin.pm.diff	                        (rev 0)
+++ trunk/dports/perl/p5-sdl_perl/files/patch-make-lib-SDL-Build-Darwin.pm.diff	2015-01-06 06:55:03 UTC (rev 131106)
@@ -0,0 +1,26 @@
+--- make/lib/SDL/Build/Darwin.pm.orig	2009-11-07 14:47:35.000000000 -0600
++++ make/lib/SDL/Build/Darwin.pm	2013-03-25 04:35:19.000000000 -0500
+@@ -72,21 +72,9 @@
+ 		$include_path[0] => $lib_path[0],
+ 
+ 		# Local libraries.
+-		'/usr/local/include/smpeg' => '/usr/local/lib',
+-		'/usr/local/include/GL'    => '/usr/local/lib',
+-		'/usr/local/include/gl'    => '/usr/local/lib',
++		"$ENV{'PREFIX'}/include"   => "$ENV{'PREFIX'}/lib",
++		"$ENV{'PREFIX'}/include/SDL" => "$ENV{'PREFIX'}/lib",
+ 
+-		# System libraries.
+-		'/usr/include/smpeg'       => '/usr/lib',
+-		'/usr/include/GL'          => '/usr/lib', 
+-		'/usr/include/gl'          => '/usr/lib', 
+-
+-		# System-wide frameworks.
+-		'/System/Library/Frameworks/libogg.framework/Headers'        => '../../lib',
+-		'/System/Library/Frameworks/libvorbis.framework/Headers'     => '../../lib',
+-		'/System/Library/Frameworks/libvorbisfile.framework/Headers' => '../../lib',
+-		'/System/Library/Frameworks/libvorbisenc.framework/Headers'  => '../../lib',
+-		'/System/Library/Frameworks/OpenGL.framework/Headers'        => '/System/Library/Frameworks/OpenGL.framework/Libraries',
+ 
+ 		# System libraries.
+ 		'/System/Library/Frameworks/OpenGL.framework/Headers'        => '/System/Library/Frameworks/OpenGL.framework/Libraries',

Deleted: trunk/dports/perl/p5-sdl_perl/files/patch-src-SDL.xs
===================================================================
--- trunk/dports/perl/p5-sdl_perl/files/patch-src-SDL.xs	2015-01-06 06:15:07 UTC (rev 131105)
+++ trunk/dports/perl/p5-sdl_perl/files/patch-src-SDL.xs	2015-01-06 06:55:03 UTC (rev 131106)
@@ -1,65 +0,0 @@
---- src/SDL.xs.orig	2006-11-27 05:58:47.000000000 -0800
-+++ src/SDL.xs	2006-11-27 05:59:10.000000000 -0800
-@@ -71,6 +71,29 @@
- 
- #include "defines.h"
- 
-+#ifdef MACOSX
-+#include <CoreServices/CoreServices.h>
-+
-+void CPSEnableForegroundOperation(ProcessSerialNumber* psn);
-+void NSApplicationLoad();
-+void SDL_macosx_init(void) {
-+    Boolean sameProc;
-+    ProcessSerialNumber myProc, frProc;
-+    if (GetFrontProcess(&frProc) == noErr)
-+        if (GetCurrentProcess(&myProc) == noErr)
-+            if (SameProcess(&frProc, &myProc, &sameProc) == noErr && sameProc == 0) {
-+                /*
-+                NSLog(@"creating bad autorelease pool");
-+                [[NSAutoreleasePool alloc] init];
-+                */
-+                NSApplicationLoad();
-+                CPSEnableForegroundOperation(&myProc);
-+            }
-+}
-+void SDL_macosx_quit(void) {
-+}
-+#endif // MACOSX
-+
- Uint32 
- sdl_perl_timer_callback ( Uint32 interval, void* param )
- {
-@@ -3902,7 +3925,7 @@
-      RETVAL
- 
- int
--GFXFilledpieColor ( dst, x, y, rad, start, end, color )
-+GFXFilledPieColor ( dst, x, y, rad, start, end, color )
-     SDL_Surface* dst;
-     Sint16 x;
-     Sint16 y;
-@@ -3911,12 +3934,12 @@
-     Sint16 end;
-     Uint32 color;
- CODE:
--     RETVAL = filledpieColor( dst, x, y, rad, start, end, color );
-+     RETVAL = filledPieColor( dst, x, y, rad, start, end, color );
- OUTPUT:
-      RETVAL
- 
- int
--GFXFilledpieRGBA ( dst, x, y, rad, start, end, r, g, b, a )
-+GFXFilledPieRGBA ( dst, x, y, rad, start, end, r, g, b, a )
-     SDL_Surface* dst;
-     Sint16 x;
-     Sint16 y;
-@@ -3928,7 +3951,7 @@
-     Uint8 b;
-     Uint8 a;
- CODE:
--     RETVAL = filledpieRGBA( dst, x, y, rad, start, end, r, g, b, a );
-+     RETVAL = filledPieRGBA( dst, x, y, rad, start, end, r, g, b, a );
- OUTPUT:
-      RETVAL
- 

Copied: trunk/dports/perl/p5-sdl_perl/files/patch-src-SDL.xs.diff (from rev 131105, trunk/dports/perl/p5-sdl_perl/files/patch-src-SDL.xs)
===================================================================
--- trunk/dports/perl/p5-sdl_perl/files/patch-src-SDL.xs.diff	                        (rev 0)
+++ trunk/dports/perl/p5-sdl_perl/files/patch-src-SDL.xs.diff	2015-01-06 06:55:03 UTC (rev 131106)
@@ -0,0 +1,32 @@
+--- src/SDL.xs.orig	2009-11-07 14:47:35.000000000 -0600
++++ src/SDL.xs	2014-12-13 19:54:40.000000000 -0600
+@@ -119,6 +119,29 @@
+ 
+ #endif
+ 
++#ifdef MACOSX
++#include <CoreServices/CoreServices.h>
++
++void CPSEnableForegroundOperation(ProcessSerialNumber* psn);
++void NSApplicationLoad();
++void SDL_macosx_init(void) {
++    Boolean sameProc;
++    ProcessSerialNumber myProc, frProc;
++    if (GetFrontProcess(&frProc) == noErr)
++        if (GetCurrentProcess(&myProc) == noErr)
++            if (SameProcess(&frProc, &myProc, &sameProc) == noErr && sameProc == 0) {
++                /*
++                NSLog(@"creating bad autorelease pool");
++                [[NSAutoreleasePool alloc] init];
++                */
++                NSApplicationLoad();
++                CPSEnableForegroundOperation(&myProc);
++            }
++}
++void SDL_macosx_quit(void) {
++}
++#endif // MACOSX
++
+ Uint32 
+ sdl_perl_timer_callback ( Uint32 interval, void* param )
+ {

Deleted: trunk/dports/perl/p5-sdl_perl/files/patch-test-testgfxprim.pl
===================================================================
--- trunk/dports/perl/p5-sdl_perl/files/patch-test-testgfxprim.pl	2015-01-06 06:15:07 UTC (rev 131105)
+++ trunk/dports/perl/p5-sdl_perl/files/patch-test-testgfxprim.pl	2015-01-06 06:55:03 UTC (rev 131106)
@@ -1,15 +0,0 @@
---- test/testgfxprim.pl.orig	2006-11-27 06:03:08.000000000 -0800
-+++ test/testgfxprim.pl	2006-11-27 06:03:24.000000000 -0800
-@@ -202,10 +202,10 @@
- 		$surfMidWidth*.25,$surfMidHeight*.10,255,255,0,255);
- 
- 	# pie slices
--	SDL::GFXFilledpieRGBA($surf,$surfMidWidth,$surfMidHeight, $surfMidWidth*.1,
-+	SDL::GFXFilledPieRGBA($surf,$surfMidWidth,$surfMidHeight, $surfMidWidth*.1,
- 		0,90,0,0,255,255);
- 
--	SDL::GFXFilledpieRGBA($surf,$surfMidWidth,$surfMidHeight, $surfMidWidth*.1,
-+	SDL::GFXFilledPieRGBA($surf,$surfMidWidth,$surfMidHeight, $surfMidWidth*.1,
- 		180,270,0,0,255,255);
- 
- 	# polygons
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150105/8030c476/attachment.html>


More information about the macports-changes mailing list