Index: head/lang/p5-ExtUtils-F77/Makefile =================================================================== --- head/lang/p5-ExtUtils-F77/Makefile (revision 388868) +++ head/lang/p5-ExtUtils-F77/Makefile (revision 388869) @@ -1,22 +1,25 @@ # Created by: jmz # $FreeBSD$ PORTNAME= ExtUtils-F77 -PORTVERSION= 1.17 -PORTREVISION= 5 +PORTVERSION= 1.18 CATEGORIES= lang perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Helps link C programs with Fortran subroutines +LICENSE= ART10 GPLv1 +LICENSE_COMB= dual + +NO_ARCH= yes USES= fortran perl5 USE_PERL5= configure post-patch: @${REINPLACE_CMD} -e "s|'gfortran44'|'${FC}'|" \ -e "s|'-O2'|'${CFLAGS}'|" \ ${WRKSRC}/F77.pm .include Index: head/lang/p5-ExtUtils-F77/distinfo =================================================================== --- head/lang/p5-ExtUtils-F77/distinfo (revision 388868) +++ head/lang/p5-ExtUtils-F77/distinfo (revision 388869) @@ -1,2 +1,2 @@ -SHA256 (ExtUtils-F77-1.17.tar.gz) = b3919200443174ff348ed5567d461335e289fba047cb17432f31dea5a26cad3f -SIZE (ExtUtils-F77-1.17.tar.gz) = 11225 +SHA256 (ExtUtils-F77-1.18.tar.gz) = 6b1fbeb38f092b399f46d58f8699917f71c098dff131a3c7b72ccccadbc953b4 +SIZE (ExtUtils-F77-1.18.tar.gz) = 11614 Index: head/lang/p5-ExtUtils-F77/files/patch-F77.pm =================================================================== --- head/lang/p5-ExtUtils-F77/files/patch-F77.pm (revision 388868) +++ head/lang/p5-ExtUtils-F77/files/patch-F77.pm (revision 388869) @@ -1,65 +1,65 @@ ---- F77.pm.orig 2010-12-31 19:53:06.000000000 -0600 -+++ F77.pm 2011-03-24 01:05:00.742862139 -0500 -@@ -351,9 +351,49 @@ $F77config{Aix}{DEFAULT} = 'F77'; +--- F77.pm.orig 2015-06-07 20:28:59 UTC ++++ F77.pm +@@ -343,9 +343,49 @@ $F77config{Aix}{DEFAULT} = 'F77'; ### FreeBSD ### -$F77config{Freebsd}{F77}{Trail_} = 1; -$F77config{Freebsd}{F77}{Link} = '-L/usr/lib -lf2c -lm'; -$F77config{Freebsd}{DEFAULT} = 'F77'; +if($^O =~ /Freebsd/i) { + $gfortran = 'gfortran44'; # requires rewrite + $fallback_compiler = 'G77'; +} + +$F77config{Freebsd}{G77}{Link} = sub { + $dir = `g77-34 -print-file-name=libg2c.a`; + chomp $dir; + # Note that -print-file-name returns just the library name + # if it cant be found - make sure that we only accept the + # directory if it returns a proper path (or matches a /) + + if( defined $dir ) { + $dir =~ s,/libg2c.a$,,; + } else { + $dir = "/usr/local/lib"; + } + return( "-L$dir -L/usr/lib -lg2c -lm" ); +}; + +$F77config{Freebsd}{GFortran}{Link} = sub { + $dir = `$gfortran -print-file-name=libgfortran.a`; + chomp $dir; + # Note that -print-file-name returns just the library name + # if it cant be found - make sure that we only accept the + # directory if it returns a proper path (or matches a /) + + if( defined $dir ) { + $dir =~ s,/libgfortran.a$,,; + } else { + $dir = "/usr/local/lib"; + } + return( "-L$dir -L/usr/lib -lgfortran -lm" ); +}; + +$F77config{Freebsd}{G77}{Trail_} = 1; +$F77config{Freebsd}{GFortran}{Trail_} = 1; +$F77config{Freebsd}{G77}{Compiler} = 'g77-34'; +$F77config{Freebsd}{GFortran}{Compiler} = "$gfortran"; +$F77config{Freebsd}{G77}{Cflags} = '-O2'; +$F77config{Freebsd}{GFortran}{Cflags} = '-O2'; +$F77config{Freebsd}{DEFAULT} = 'GFortran'; + ### VMS ### -@@ -446,7 +486,8 @@ $Pkg: Will try system=Generic Compiler=$ +@@ -438,7 +478,8 @@ $Pkg: Will try system=Generic Compiler=$ EOD $system = $Config{cc} =~ /\bgcc/ && $^O =~ /MSWin32/i ? "MinGW" - :"Generic"; + : $^O =~ /Freebsd/i ? "Freebsd" + : "Generic"; $compiler = $fallback_compiler; my $flibs = get ($F77config{$system}{$compiler}{Link}); $Runtime = $flibs ; #. gcclibs($flibs); # Note gcclibs appears to be no longer required. Index: head/lang/p5-ExtUtils-F77/pkg-plist =================================================================== --- head/lang/p5-ExtUtils-F77/pkg-plist (revision 388868) +++ head/lang/p5-ExtUtils-F77/pkg-plist (revision 388869) @@ -1,2 +1,2 @@ -%%PERL5_MAN3%%/ExtUtils::F77.3.gz %%SITE_PERL%%/ExtUtils/F77.pm +%%PERL5_MAN3%%/ExtUtils::F77.3.gz