From 4e7d30e2b9b1dc716a7e9697435a3f531d10568f Mon Sep 17 00:00:00 2001 From: Cheng-Lung Sung Date: Mon, 24 Jul 2006 05:48:42 +0000 Subject: [PATCH] - update to 0.2804 - depends on version.pm again. --- devel/p5-Module-Build/Makefile | 4 ++-- devel/p5-Module-Build/distinfo | 6 +++--- .../files/patch-lib-Module-Build-Base.pm | 16 --------------- .../patch-lib-Module-Build-ModuleInfo.pm | 20 ------------------- .../files/patch-lib-Module-Build-Version.pm | 9 --------- 5 files changed, 5 insertions(+), 50 deletions(-) delete mode 100644 devel/p5-Module-Build/files/patch-lib-Module-Build-Base.pm delete mode 100644 devel/p5-Module-Build/files/patch-lib-Module-Build-ModuleInfo.pm delete mode 100644 devel/p5-Module-Build/files/patch-lib-Module-Build-Version.pm diff --git a/devel/p5-Module-Build/Makefile b/devel/p5-Module-Build/Makefile index ba6705b004ff..d4a051b34455 100644 --- a/devel/p5-Module-Build/Makefile +++ b/devel/p5-Module-Build/Makefile @@ -6,8 +6,7 @@ # PORTNAME= Module-Build -PORTVERSION= 0.28.03 -PORTREVISION= 1 +PORTVERSION= 0.28.04 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Module/KWILLIAMS @@ -18,6 +17,7 @@ MAINTAINER= clsung@FreeBSD.org COMMENT= Build and install Perl modules RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \ + ${SITE_PERL}/${PERL_ARCH}/version.pm:${PORTSDIR}/devel/p5-version \ ${SITE_PERL}/ExtUtils/CBuilder.pm:${PORTSDIR}/devel/p5-ExtUtils-CBuilder BUILD_DEPENDS= ${RUN_DEPENDS} BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple diff --git a/devel/p5-Module-Build/distinfo b/devel/p5-Module-Build/distinfo index 1ef7cdc2082b..a6e7c6ae8269 100644 --- a/devel/p5-Module-Build/distinfo +++ b/devel/p5-Module-Build/distinfo @@ -1,3 +1,3 @@ -MD5 (Module-Build-0.2803.tar.gz) = f4a0da17944edb9840b796f0a9f3545f -SHA256 (Module-Build-0.2803.tar.gz) = 896115ae39cb2ce731d79b9ea2fd168f342fa8e8eb65da3f9fb547fd45bcbfbf -SIZE (Module-Build-0.2803.tar.gz) = 181194 +MD5 (Module-Build-0.2804.tar.gz) = db3bd4acd00c257762f12b41c581d6a6 +SHA256 (Module-Build-0.2804.tar.gz) = 6d549453db2189c4505b8c888a8a28714a7fd1c19d11f861a3eb67c565fc27de +SIZE (Module-Build-0.2804.tar.gz) = 181282 diff --git a/devel/p5-Module-Build/files/patch-lib-Module-Build-Base.pm b/devel/p5-Module-Build/files/patch-lib-Module-Build-Base.pm deleted file mode 100644 index a89fdc5455ba..000000000000 --- a/devel/p5-Module-Build/files/patch-lib-Module-Build-Base.pm +++ /dev/null @@ -1,16 +0,0 @@ ---- lib/Module/Build/Base.pm.orig Sun Jul 16 04:42:38 2006 -+++ lib/Module/Build/Base.pm Sun Jul 16 16:20:49 2006 -@@ -1232,8 +1232,11 @@ - sub compare_versions { - my $self = shift; - my ($v1, $op, $v2) = @_; -- $v1 = Module::Build::Version->new($v1) -- unless UNIVERSAL::isa($v1,'Module::Build::Version'); -+ #$v1 = Module::Build::Version->new($v1) -+ # unless UNIVERSAL::isa($v1,'Module::Build::Version'); -+ # for alpha versions - this doesn't cover all cases, but should work for most: -+ $v1 =~ s/_(\d+)\z/$1/; -+ $v2 =~ s/_(\d+)\z/$1/; - - my $eval_str = "\$v1 $op \$v2"; - my $result = eval $eval_str; diff --git a/devel/p5-Module-Build/files/patch-lib-Module-Build-ModuleInfo.pm b/devel/p5-Module-Build/files/patch-lib-Module-Build-ModuleInfo.pm deleted file mode 100644 index dd550a064b4f..000000000000 --- a/devel/p5-Module-Build/files/patch-lib-Module-Build-ModuleInfo.pm +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/Module/Build/ModuleInfo.pm.orig Sun Jul 16 04:42:38 2006 -+++ lib/Module/Build/ModuleInfo.pm Sun Jul 16 16:16:22 2006 -@@ -286,12 +286,16 @@ - }; - - local $^W; -+ my $old_version = \&UNIVERSAL::VERSION; -+ eval {require version}; - # Try and get the $VERSION - my $result = eval $eval; -+ * UNIVERSAL::VERSION = $old_version; - warn "Error evaling version line '$eval' in $self->{filename}: $@\n" if $@; - - # Bless it into our own version class -- $result = Module::Build::Version->new($result); -+ #$result = Module::Build::Version->new($result); -+ $result = $result->numify if UNIVERSAL::isa($result, 'version'); - - return $result; - } diff --git a/devel/p5-Module-Build/files/patch-lib-Module-Build-Version.pm b/devel/p5-Module-Build/files/patch-lib-Module-Build-Version.pm deleted file mode 100644 index a83fdbd29591..000000000000 --- a/devel/p5-Module-Build/files/patch-lib-Module-Build-Version.pm +++ /dev/null @@ -1,9 +0,0 @@ ---- lib/Module/Build/Version.pm.orig Sun Jul 16 04:42:38 2006 -+++ lib/Module/Build/Version.pm Sun Jul 16 16:07:54 2006 -@@ -1,5 +1,5 @@ - package Module::Build::Version; --use base qw/version/; -+#use base qw/version/; - - use overload ( - '""' => \&stringify,