- temporary remove dependency of p5-version,
it will cause cyclic dependencies. - 3 patches are made for that (copy from version 0.2801) - bump PORTREVISION
This commit is contained in:
parent
ca481e926d
commit
49598cce49
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=167961
@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
PORTNAME= Module-Build
|
PORTNAME= Module-Build
|
||||||
PORTVERSION= 0.28.03
|
PORTVERSION= 0.28.03
|
||||||
|
PORTREVISION= 1
|
||||||
CATEGORIES= devel perl5
|
CATEGORIES= devel perl5
|
||||||
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
|
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
|
||||||
MASTER_SITE_SUBDIR= Module/KWILLIAMS
|
MASTER_SITE_SUBDIR= Module/KWILLIAMS
|
||||||
@ -17,7 +18,6 @@ MAINTAINER= perl@FreeBSD.org
|
|||||||
COMMENT= Build and install Perl modules
|
COMMENT= Build and install Perl modules
|
||||||
|
|
||||||
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
|
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
|
${SITE_PERL}/ExtUtils/CBuilder.pm:${PORTSDIR}/devel/p5-ExtUtils-CBuilder
|
||||||
BUILD_DEPENDS= ${RUN_DEPENDS}
|
BUILD_DEPENDS= ${RUN_DEPENDS}
|
||||||
BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
|
BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
|
||||||
|
16
devel/p5-Module-Build/files/patch-lib-Module-Build-Base.pm
Normal file
16
devel/p5-Module-Build/files/patch-lib-Module-Build-Base.pm
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
--- 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;
|
@ -0,0 +1,20 @@
|
|||||||
|
--- 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;
|
||||||
|
}
|
@ -0,0 +1,9 @@
|
|||||||
|
--- 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,
|
Loading…
Reference in New Issue
Block a user