Update p5-Padre to 0.90. - Improved syntax highlight. - Reduce memory usage. - Updated document and translation. - bug fix.diff -r1.14 -r1.15 pkgsrc/editors/p5-Padre/Makefile
(hiramatsu)
@@ -1,19 +1,18 @@ | @@ -1,19 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.14 2011/08/14 12:38:56 obache Exp $ | 1 | # $NetBSD: Makefile,v 1.15 2011/10/12 15:51:52 hiramatsu Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= Padre-0.70 | 4 | DISTNAME= Padre-0.90 | |
5 | PKGNAME= p5-${DISTNAME} | 5 | PKGNAME= p5-${DISTNAME} | |
6 | PKGREVISION= 4 | |||
7 | CATEGORIES= editors perl5 | 6 | CATEGORIES= editors perl5 | |
8 | MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Padre/} | 7 | MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Padre/} | |
9 | 8 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://search.cpan.org/dist/Padre/ | 10 | HOMEPAGE= http://search.cpan.org/dist/Padre/ | |
12 | COMMENT= Perl Application Development and Refactoring Environment | 11 | COMMENT= Perl Application Development and Refactoring Environment | |
13 | LICENSE= ${PERL5_LICENSE} | 12 | LICENSE= ${PERL5_LICENSE} | |
14 | 13 | |||
15 | PKG_DESTDIR_SUPPORT= user-destdir | 14 | PKG_DESTDIR_SUPPORT= user-destdir | |
16 | MAKE_JOBS_SAFE= no | 15 | MAKE_JOBS_SAFE= no | |
17 | 16 | |||
18 | USE_LANGUAGES+= c c++ | 17 | USE_LANGUAGES+= c c++ | |
19 | REPLACE_PERL+= share/templates/*.t | 18 | REPLACE_PERL+= share/templates/*.t |
@@ -1,7 +1,7 @@ | @@ -1,7 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.7 2010/09/23 21:53:33 sno Exp $ | 1 | $NetBSD: distinfo,v 1.8 2011/10/12 15:51:52 hiramatsu Exp $ | |
2 | 2 | |||
3 | SHA1 (Padre-0.70.tar.gz) = 961ca6f489cd081b73a50bfaf301b1f995fc539f | 3 | SHA1 (Padre-0.90.tar.gz) = cfce4de4fb216aff5dc1e87cc0c141def39f9744 | |
4 | RMD160 (Padre-0.70.tar.gz) = f71acf225c45c198ac92fb70322a462bd61b09d4 | 4 | RMD160 (Padre-0.90.tar.gz) = 24e7ec10555c472403e2db341501f5efbe904125 | |
5 | Size (Padre-0.70.tar.gz) = 1920190 bytes | 5 | Size (Padre-0.90.tar.gz) = 1690985 bytes | |
6 | SHA1 (patch-aa) = ce20ca397adaa4fb4630dc8f8b0de3ae072b4420 | 6 | SHA1 (patch-aa) = 5900452d0e0b592a20c24d53dc6e1481b8606fb8 | |
7 | SHA1 (patch-ab) = 30862f5a3584bc8432ac176f15985a83cb3fbd44 | 7 | SHA1 (patch-ab) = df2c86b5585f0dfae1400337295afb1da24239a8 |
@@ -1,27 +1,41 @@ | @@ -1,27 +1,41 @@ | |||
1 | $NetBSD: patch-aa,v 1.2 2010/08/20 07:01:35 sno Exp $ | 1 | $NetBSD: patch-aa,v 1.3 2011/10/12 15:51:52 hiramatsu Exp $ | |
2 | 2 | |||
3 | Remove special wxPerl handling on MacOS X - pkgsrc' perl can do it self | 3 | Remove special wxPerl handling on MacOS X - pkgsrc' perl can do it self | |
4 | 4 | |||
5 | --- script/padre.orig 2010-08-17 03:55:44.000000000 +0000 | 5 | --- script/padre.orig 2011-07-26 12:37:43.000000000 +0000 | |
6 | +++ script/padre | 6 | +++ script/padre | |
7 | @@ -11,20 +11,6 @@ local $SIG{__DIE__} = | 7 | @@ -11,34 +11,6 @@ local $SIG{__DIE__} = | |
8 | ? sub { print STDERR Carp::longmess "\nDIE: @_\n" . ( "-" x 80 ) . "\n" } | 8 | ? sub { print STDERR Carp::longmess "\nDIE: @_\n" . ( "-" x 80 ) . "\n" } | |
9 | : $SIG{__DIE__}; | 9 | : $SIG{__DIE__}; | |
10 | 10 | |||
11 | -# Must run using wxPerl on OS X. | 11 | -# Must run using wxPerl on OS X. | |
12 | -if ( $^O eq 'darwin' and $^X !~ m{/wxPerl} ) { | 12 | -if ( $^O eq 'darwin' and $^X !~ m{/wxPerl} ) { | |
13 | - require File::Which; | 13 | - require File::Which; | |
14 | - my $perl = scalar File::Which::which('wxPerl'); | 14 | - require File::Basename; | |
15 | - require File::Spec; | |||
16 | - | |||
17 | - my $this_perl = File::Which::which($^X) || $^X; | |||
18 | - if ( -l $this_perl ) { | |||
19 | - my $link = readlink $this_perl; | |||
20 | - $this_perl = $link if $link; | |||
21 | - } | |||
22 | - | |||
23 | - my $dir = File::Basename::dirname($this_perl); | |||
24 | - my $wx_perl = File::Spec->catfile( $dir, 'wxPerl' ); | |||
25 | - my $perl = | |||
26 | - $wx_perl && -e $wx_perl && -x _ | |||
27 | - ? $wx_perl | |||
28 | - : File::Which::which('wxPerl'); | |||
15 | - chomp($perl); | 29 | - chomp($perl); | |
16 | - if ( -e $perl ) { | 30 | - if ( -e $perl ) { | |
17 | - warn "spawning 'wxPerl' interpreter for OS X\n"; | 31 | - warn "spawning 'wxPerl' interpreter for OS X\n"; | |
18 | - system( $perl, '-S', $0, @ARGV ); | 32 | - system( $perl, '-S', $0, @ARGV ); | |
19 | - } else { | 33 | - } else { | |
20 | - warn "padre cannot find wxPerl executable (which it requires on OS X)\n"; | 34 | - warn "padre cannot find wxPerl executable (which it requires on OS X)\n"; | |
21 | - } | 35 | - } | |
22 | - exit 0; | 36 | - exit 0; | |
23 | -} | 37 | -} | |
24 | - | 38 | - | |
25 | # Handle special command line cases early, because options like --home | 39 | # Disable overlay scrollbar on Linux. | |
26 | # MUST be processed before the Padre.pm library is loaded. | 40 | # Done ugly this way to satisfy Perl::Critic (grrr) | |
27 | require Getopt::Long; | 41 | local $ENV{LIBOVERLAY_SCROLLBAR} = ( $^O eq 'linux' ) ? 0 : $ENV{LIBOVERLAY_SCROLLBAR}; |
@@ -1,24 +1,24 @@ | @@ -1,24 +1,24 @@ | |||
1 | $NetBSD: patch-ab,v 1.2 2010/08/20 07:01:35 sno Exp $ | 1 | $NetBSD: patch-ab,v 1.3 2011/10/12 15:51:52 hiramatsu Exp $ | |
2 | 2 | |||
3 | Remove special wxPerl handling on MacOS X - pkgsrc' perl can do it self | 3 | Remove special wxPerl handling on MacOS X - pkgsrc' perl can do it self | |
4 | 4 | |||
5 | --- lib/Padre/Perl.pm.orig 2010-02-18 10:09:59.000000000 +0000 | 5 | --- lib/Padre/Perl.pm.orig 2011-08-16 10:50:41.000000000 +0000 | |
6 | +++ lib/Padre/Perl.pm | 6 | +++ lib/Padre/Perl.pm | |
7 | @@ -136,7 +136,7 @@ sub cperl { | 7 | @@ -134,7 +134,7 @@ sub cperl { | |
8 | if ( $path =~ s/\b(wxPerl)\z// ) { | 8 | if ( $path =~ s/\b(wxPerl)\z// ) { | |
9 | 9 | |||
10 | # Convert to non-GUI | 10 | # Convert to non-GUI | |
11 | - if ( -f "${path}perl" ) { | 11 | - if ( -f "${path}perl" ) { | |
12 | + if ( -x "${path}perl" ) { | 12 | + if ( -x "${path}perl" ) { | |
13 | return "${path}perl"; | 13 | return "${path}perl"; | |
14 | } else { | 14 | } else { | |
15 | return "${path}wxPerl"; | 15 | return "${path}wxPerl"; | |
16 | @@ -193,7 +193,7 @@ sub wxperl { | 16 | @@ -191,7 +191,7 @@ sub wxperl { | |
17 | if ( $path =~ s/\b(perl)\z// ) { | 17 | if ( $path =~ s/\b(perl)\z// ) { | |
18 | 18 | |||
19 | # Convert to Wx launcher | 19 | # Convert to Wx launcher | |
20 | - if ( -f "${path}wxPerl" ) { | 20 | - if ( -f "${path}wxPerl" ) { | |
21 | + if ( -x "${path}wxPerl" ) { | 21 | + if ( -x "${path}wxPerl" ) { | |
22 | return "${path}wxPerl"; | 22 | return "${path}wxPerl"; | |
23 | } else { | 23 | } else { | |
24 | return "${path}perl"; | 24 | return "${path}perl"; |