diff options
| -rw-r--r-- | editors/p5-Padre/Makefile | 8 | ||||
| -rw-r--r-- | editors/p5-Padre/distinfo | 10 | ||||
| -rw-r--r-- | editors/p5-Padre/patches/patch-aa | 25 | ||||
| -rw-r--r-- | editors/p5-Padre/patches/patch-ab | 22 |
4 files changed, 58 insertions, 7 deletions
diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile index d14ba1e00bb..48dbbc1c502 100644 --- a/editors/p5-Padre/Makefile +++ b/editors/p5-Padre/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2010/02/04 13:58:45 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2010/02/25 13:32:50 sno Exp $ # -DISTNAME= Padre-0.56 +DISTNAME= Padre-0.57 PKGNAME= p5-${DISTNAME} CATEGORIES= editors perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Padre/} @@ -50,7 +50,7 @@ DEPENDS+= {perl>=5.10.1,p5-File-Path>=2.07}:../../devel/p5-File-Path DEPENDS+= p5-File-Remove>=1.42:../../sysutils/p5-File-Remove DEPENDS+= p5-File-ShareDir>=1.00:../../devel/p5-File-ShareDir DEPENDS+= p5-File-Which>=1.08:../../devel/p5-File-Which -DEPENDS+= p5-Format-Human-Bytes-[0-9]*:../../devel/p5-Format-Human-Bytes +DEPENDS+= p5-Format-Human-Bytes>=0.04:../../devel/p5-Format-Human-Bytes DEPENDS+= p5-HTML-Parser>=3.58:../../www/p5-HTML-Parser DEPENDS+= p5-IO-stringy>=2.110:../../devel/p5-IO-stringy DEPENDS+= p5-IO-String>=1.08:../../devel/p5-IO-String @@ -70,7 +70,9 @@ DEPENDS+= p5-Pod-POM>=0.17:../../textproc/p5-Pod-POM DEPENDS+= {perl>=5.10.1,p5-Pod-Simple>=3.07}:../../textproc/p5-Pod-Simple DEPENDS+= p5-Probe-Perl>=0.01:../../devel/p5-Probe-Perl DEPENDS+= {perl>=5.8.8,p5-Storable>=2.15}:../../devel/p5-Storable +DEPENDS+= p5-Readonly-XS>=1.05:../../devel/p5-Readonly-XS DEPENDS+= p5-Template-Tiny>=0.03:../../textproc/p5-Template-Tiny +DEPENDS+= {perl>=5.11.0,p5-Text-Balanced>=2.01}:../../textproc/p5-Text-Balanced DEPENDS+= p5-Text-Diff>=0.35:../../textproc/p5-Text-Diff DEPENDS+= p5-Text-FindIndent>=0.06:../../textproc/p5-Text-FindIndent # Thread::Queue 2.11 is in Perl 5.8.9, but Perl 5.10.0 contains "only" 2.00 diff --git a/editors/p5-Padre/distinfo b/editors/p5-Padre/distinfo index 03821b17011..2961e485e00 100644 --- a/editors/p5-Padre/distinfo +++ b/editors/p5-Padre/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.3 2010/02/03 11:23:19 sno Exp $ +$NetBSD: distinfo,v 1.4 2010/02/25 13:32:50 sno Exp $ -SHA1 (Padre-0.56.tar.gz) = 904ec73284acfe04718960e18be85bc87b3d260d -RMD160 (Padre-0.56.tar.gz) = d195dc1044a456c4c08db19521b5ba817ea9977a -Size (Padre-0.56.tar.gz) = 1270173 bytes +SHA1 (Padre-0.57.tar.gz) = 06f728e7470928b44fb628b36bb55c0b4bdaad56 +RMD160 (Padre-0.57.tar.gz) = 654b5e5875565e8d00e7316cf1d5afbe824c448c +Size (Padre-0.57.tar.gz) = 1288888 bytes +SHA1 (patch-aa) = f0d7c83b42d6c70c28146535667f59fa9de66186 +SHA1 (patch-ab) = 2db009c3bf83f73462fd3b6f07a035aadee93891 diff --git a/editors/p5-Padre/patches/patch-aa b/editors/p5-Padre/patches/patch-aa new file mode 100644 index 00000000000..dc2f426ee47 --- /dev/null +++ b/editors/p5-Padre/patches/patch-aa @@ -0,0 +1,25 @@ +$NetBSD: patch-aa,v 1.1 2010/02/25 13:32:50 sno Exp $ + +--- script/padre.orig 2010-02-16 12:45:40.000000000 +0000 ++++ script/padre +@@ -11,20 +11,6 @@ local $SIG{__DIE__} = + ? sub { print STDERR Carp::longmess "\nDIE: @_\n" . ( "-" x 80 ) . "\n" } + : $SIG{__DIE__}; + +-# Must run using wxPerl on OS X. +-if ( $^O eq 'darwin' and $^X !~ m{/wxPerl\.app/} ) { +- require File::Which; +- my $perl = scalar File::Which::which('wxPerl'); +- chomp($perl); +- if ( -e $perl ) { +- warn "spawning 'wxPerl' interpreter for OS X\n"; +- system( $perl, '-S', $0, @ARGV ); +- } else { +- warn "padre cannot find wxPerl executable (which it requires on OS X)\n"; +- } +- exit 0; +-} +- + # Handle special command line cases early, because options like --home + # MUST be processed before the Padre.pm library is loaded. + require Getopt::Long; diff --git a/editors/p5-Padre/patches/patch-ab b/editors/p5-Padre/patches/patch-ab new file mode 100644 index 00000000000..92a9da39799 --- /dev/null +++ b/editors/p5-Padre/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.1 2010/02/25 13:32:50 sno Exp $ + +--- lib/Padre/Perl.pm.orig 2010-02-18 10:09:59.000000000 +0000 ++++ lib/Padre/Perl.pm +@@ -136,7 +136,7 @@ sub cperl { + if ( $path =~ s/\b(wxPerl)\z// ) { + + # Convert to non-GUI +- if ( -f "${path}perl" ) { ++ if ( -x "${path}perl" ) { + return "${path}perl"; + } else { + return "${path}wxPerl"; +@@ -193,7 +193,7 @@ sub wxperl { + if ( $path =~ s/\b(perl)\z// ) { + + # Convert to Wx launcher +- if ( -f "${path}wxPerl" ) { ++ if ( -x "${path}wxPerl" ) { + return "${path}wxPerl"; + } else { + return "${path}perl"; |