Update p5-Padre to 0.90.

- Improved syntax highlight.
- Reduce memory usage.
- Updated document and translation.
- bug fix.

4 files changed, 33 insertions, 20 deletions

diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile
index 0622a57e408..b2a0934f624 100644
--- a/editors/p5-Padre/Makefile
+++ b/editors/p5-Padre/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2011/08/14 12:38:56 obache Exp $
+# $NetBSD: Makefile,v 1.15 2011/10/12 15:51:52 hiramatsu Exp $
 #
 
-DISTNAME=	Padre-0.70
+DISTNAME=	Padre-0.90
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	4
 CATEGORIES=	editors perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Padre/}
 
diff --git a/editors/p5-Padre/distinfo b/editors/p5-Padre/distinfo
index 17700a36df6..4c22c3900d4 100644
--- a/editors/p5-Padre/distinfo
+++ b/editors/p5-Padre/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2010/09/23 21:53:33 sno Exp $
+$NetBSD: distinfo,v 1.8 2011/10/12 15:51:52 hiramatsu Exp $
 
-SHA1 (Padre-0.70.tar.gz) = 961ca6f489cd081b73a50bfaf301b1f995fc539f
-RMD160 (Padre-0.70.tar.gz) = f71acf225c45c198ac92fb70322a462bd61b09d4
-Size (Padre-0.70.tar.gz) = 1920190 bytes
-SHA1 (patch-aa) = ce20ca397adaa4fb4630dc8f8b0de3ae072b4420
-SHA1 (patch-ab) = 30862f5a3584bc8432ac176f15985a83cb3fbd44
+SHA1 (Padre-0.90.tar.gz) = cfce4de4fb216aff5dc1e87cc0c141def39f9744
+RMD160 (Padre-0.90.tar.gz) = 24e7ec10555c472403e2db341501f5efbe904125
+Size (Padre-0.90.tar.gz) = 1690985 bytes
+SHA1 (patch-aa) = 5900452d0e0b592a20c24d53dc6e1481b8606fb8
+SHA1 (patch-ab) = df2c86b5585f0dfae1400337295afb1da24239a8
diff --git a/editors/p5-Padre/patches/patch-aa b/editors/p5-Padre/patches/patch-aa
index 556b68b915c..c3c1de4064c 100644
--- a/editors/p5-Padre/patches/patch-aa
+++ b/editors/p5-Padre/patches/patch-aa
@@ -1,17 +1,31 @@
-$NetBSD: patch-aa,v 1.2 2010/08/20 07:01:35 sno Exp $
+$NetBSD: patch-aa,v 1.3 2011/10/12 15:51:52 hiramatsu Exp $
 
 Remove special wxPerl handling on MacOS X - pkgsrc' perl can do it self
 
---- script/padre.orig	2010-08-17 03:55:44.000000000 +0000
+--- script/padre.orig	2011-07-26 12:37:43.000000000 +0000
 +++ script/padre
-@@ -11,20 +11,6 @@ local $SIG{__DIE__} =
+@@ -11,34 +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} ) {
 -	require File::Which;
--	my $perl = scalar File::Which::which('wxPerl');
+-	require File::Basename;
+-	require File::Spec;
+-
+-	my $this_perl = File::Which::which($^X) || $^X;
+-	if ( -l $this_perl ) {
+-		my $link = readlink $this_perl;
+-		$this_perl = $link if $link;
+-	}
+-
+-	my $dir = File::Basename::dirname($this_perl);
+-	my $wx_perl = File::Spec->catfile( $dir, 'wxPerl' );
+-	my $perl =
+-		  $wx_perl && -e $wx_perl && -x _
+-		? $wx_perl
+-		: File::Which::which('wxPerl');
 -	chomp($perl);
 -	if ( -e $perl ) {
 -		warn "spawning 'wxPerl' interpreter for OS X\n";
@@ -22,6 +36,6 @@ Remove special wxPerl handling on MacOS X - pkgsrc' perl can do it self
 -	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;
+ # Disable overlay scrollbar on Linux.
+ # Done ugly this way to satisfy Perl::Critic (grrr)
+ local $ENV{LIBOVERLAY_SCROLLBAR} = ( $^O eq 'linux' ) ? 0 : $ENV{LIBOVERLAY_SCROLLBAR};
diff --git a/editors/p5-Padre/patches/patch-ab b/editors/p5-Padre/patches/patch-ab
index abffae08797..b48dd6cad8d 100644
--- a/editors/p5-Padre/patches/patch-ab
+++ b/editors/p5-Padre/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.2 2010/08/20 07:01:35 sno Exp $
+$NetBSD: patch-ab,v 1.3 2011/10/12 15:51:52 hiramatsu Exp $
 
 Remove special wxPerl handling on MacOS X - pkgsrc' perl can do it self
 
---- lib/Padre/Perl.pm.orig	2010-02-18 10:09:59.000000000 +0000
+--- lib/Padre/Perl.pm.orig	2011-08-16 10:50:41.000000000 +0000
 +++ lib/Padre/Perl.pm
-@@ -136,7 +136,7 @@ sub cperl {
+@@ -134,7 +134,7 @@ sub cperl {
  		if ( $path =~ s/\b(wxPerl)\z// ) {
  
  			# Convert to non-GUI
@@ -13,7 +13,7 @@ Remove special wxPerl handling on MacOS X - pkgsrc' perl can do it self
  				return "${path}perl";
  			} else {
  				return "${path}wxPerl";
-@@ -193,7 +193,7 @@ sub wxperl {
+@@ -191,7 +191,7 @@ sub wxperl {
  		if ( $path =~ s/\b(perl)\z// ) {
  
  			# Convert to Wx launcher