diff options
4 files changed, 11 insertions, 34 deletions
diff --git a/devel/p5-Module-Pluggable-Ordered/Makefile b/devel/p5-Module-Pluggable-Ordered/Makefile index 7aaec2af663d..1ff14450229c 100644 --- a/devel/p5-Module-Pluggable-Ordered/Makefile +++ b/devel/p5-Module-Pluggable-Ordered/Makefile @@ -6,7 +6,7 @@ # PORTNAME= Module-Pluggable-Ordered -PORTVERSION= 1.2 +PORTVERSION= 1.3 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Module @@ -25,6 +25,13 @@ MAN3= Module::Pluggable::Ordered.3 .include <bsd.port.pre.mk> .if ${PERL_LEVEL} <= 500503 -EXTRA_PATCHES= ${PATCHDIR}/5.005_03-* +post-patch: + ${PERL} -pi -e '$$_ = "" if /use 5.006;/;' \ + ${WRKSRC}/Makefile.PL + ${PERL} -pi -e '$$_ = "" if /use 5.006;/;' \ + -e '$$_ = "" if /use warnings/;' \ + -e 's/^our\s+([\$$\@\%]\w+)/use vars qw($$1); $$1/;' \ + -e 's/(->\$$order_name) /$$1\(\) /g;' \ + ${WRKSRC}/Ordered.pm .endif .include <bsd.port.post.mk> diff --git a/devel/p5-Module-Pluggable-Ordered/distinfo b/devel/p5-Module-Pluggable-Ordered/distinfo index 720a16571d44..bfc2032aaa2f 100644 --- a/devel/p5-Module-Pluggable-Ordered/distinfo +++ b/devel/p5-Module-Pluggable-Ordered/distinfo @@ -1,2 +1,2 @@ -MD5 (Module-Pluggable-Ordered-1.2.tar.gz) = 0a11301431ad480d1f886ebc0f9dd784 -SIZE (Module-Pluggable-Ordered-1.2.tar.gz) = 3088 +MD5 (Module-Pluggable-Ordered-1.3.tar.gz) = 808c43c9407badd7d00d2738a5367294 +SIZE (Module-Pluggable-Ordered-1.3.tar.gz) = 3450 diff --git a/devel/p5-Module-Pluggable-Ordered/files/5.005_03-Makefile.PL b/devel/p5-Module-Pluggable-Ordered/files/5.005_03-Makefile.PL deleted file mode 100644 index 4604bdd45a22..000000000000 --- a/devel/p5-Module-Pluggable-Ordered/files/5.005_03-Makefile.PL +++ /dev/null @@ -1,7 +0,0 @@ ---- Makefile.PL.orig Sun Aug 29 11:39:28 2004 -+++ Makefile.PL Sun Aug 29 11:39:33 2004 -@@ -1,4 +1,3 @@ --use 5.006; - use ExtUtils::MakeMaker; - # See lib/ExtUtils/MakeMaker.pm for details of how to influence - # the contents of the Makefile that is written. diff --git a/devel/p5-Module-Pluggable-Ordered/files/5.005_03-Ordered.pm b/devel/p5-Module-Pluggable-Ordered/files/5.005_03-Ordered.pm deleted file mode 100644 index fa1eea3be51e..000000000000 --- a/devel/p5-Module-Pluggable-Ordered/files/5.005_03-Ordered.pm +++ /dev/null @@ -1,23 +0,0 @@ ---- Ordered.pm.orig Sat Jul 17 16:57:11 2004 -+++ Ordered.pm Sun Aug 29 11:46:19 2004 -@@ -1,10 +1,8 @@ - package Module::Pluggable::Ordered; --use 5.006; - use strict; --use warnings; - require Module::Pluggable; - use UNIVERSAL::require; --our $VERSION = '1.2'; -+use vars qw($VERSION); $VERSION = '1.2'; - - sub import { - my ($self, %args) = @_; -@@ -32,7 +30,7 @@ - $_->require for @plugins; - - my $order_name = "${name}_order"; -- for my $class (sort { $a->$order_name <=> $b->$order_name } -+ for my $class (sort { $a->$order_name() <=> $b->$order_name() } - grep { $_->can($order_name) } - @plugins) { - $class->$name(@args); |