Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 15 Oct 2005 12:57:33 -0400 (EDT)
From:      Rod Taylor <ports@rbt.ca>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/87486: MAINTAINER-UPDATE: math/p5-Geo-Distance
Message-ID:  <200510151657.j9FGvXYL097662@home.rbt.ca>
Resent-Message-ID: <200510151700.j9FH0TRq034714@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         87486
>Category:       ports
>Synopsis:       MAINTAINER-UPDATE: math/p5-Geo-Distance
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 15 17:00:28 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Rod Taylor
>Release:        FreeBSD 6.0-BETA4 amd64
>Organization:
>Environment:
System: FreeBSD home 6.0-BETA4 FreeBSD 6.0-BETA4 #12: Thu Sep 15 22:41:54 EDT 2005 root@home:/usr/obj/usr/src/sys/HOME amd64


	
>Description:

	Upgrade of p5-Geo-Distance port from 0.6 to 0.11. The maintainers of the CPAN package do not support perl versions before 5.6 and I didn't take the time or had the ability to test previous versions. Add in an IGNORE to the makefile instead.

>How-To-Repeat:
	
>Fix:

	

--- geo-distance.patch begins here ---
Binary files p5-Geo-Distance.orig/.Makefile.swp and p5-Geo-Distance/.Makefile.swp differ
diff -crN p5-Geo-Distance.orig/Makefile p5-Geo-Distance/Makefile
*** p5-Geo-Distance.orig/Makefile	Mon Jul 12 09:38:55 2004
--- p5-Geo-Distance/Makefile	Sat Oct 15 12:46:32 2005
***************
*** 6,12 ****
  #
  
  PORTNAME=	Geo-Distance
! PORTVERSION=	0.06
  PORTREVISION=	1
  CATEGORIES=	math perl5
  MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
--- 6,12 ----
  #
  
  PORTNAME=	Geo-Distance
! PORTVERSION=	0.11
  PORTREVISION=	1
  CATEGORIES=	math perl5
  MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
***************
*** 18,23 ****
  
  PERL_CONFIGURE=	yes
  
  MAN3=		Geo::Distance.3
  
! .include <bsd.port.mk>
--- 18,30 ----
  
  PERL_CONFIGURE=	yes
  
+ .include <bsd.port.pre.mk>
+ 
+ # Module from CPAN written for 5.6 or later
+ .if ${PERL_LEVEL} < 500600
+ IGNORE=		Port requires perl 5.6.x or later. Install lang/perl5.8 then try again
+ .endif
+ 
  MAN3=		Geo::Distance.3
  
! .include <bsd.port.post.mk>
diff -crN p5-Geo-Distance.orig/distinfo p5-Geo-Distance/distinfo
*** p5-Geo-Distance.orig/distinfo	Sun Jul 11 17:53:10 2004
--- p5-Geo-Distance/distinfo	Sat Oct 15 12:35:19 2005
***************
*** 1,2 ****
! MD5 (Geo-Distance-0.06.tar.gz) = 6313eb1cdabca80d494d213db1aa94c0
! SIZE (Geo-Distance-0.06.tar.gz) = 9234
--- 1,2 ----
! MD5 (Geo-Distance-0.11.tar.gz) = d7bd2b67a3d3e233fa79be5c1b3f7352
! SIZE (Geo-Distance-0.11.tar.gz) = 9684
diff -crN p5-Geo-Distance.orig/files/patch-Distance.pm p5-Geo-Distance/files/patch-Distance.pm
*** p5-Geo-Distance.orig/files/patch-Distance.pm	Sun Jul 11 17:53:10 2004
--- p5-Geo-Distance/files/patch-Distance.pm	Wed Dec 31 19:00:00 1969
***************
*** 1,51 ****
- --- ../../../Geo-Distance-0.06/Distance.pm	Wed Jun 30 02:12:10 2004
- +++ Distance.pm	Sun Jul 11 21:46:44 2004
- @@ -1,21 +1,20 @@
-  package Geo::Distance;
-  
- -use 5.006;
-  use strict;
- -use warnings;
-  use Carp;
-  use Math::Trig qw( great_circle_distance deg2rad );
-  
-  require Exporter;
- -our @ISA = qw(Exporter);
- -our %EXPORT_TAGS = ( 'all' => [ qw(
- +use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK $VERSION);
- +@ISA = qw(Exporter);
- +%EXPORT_TAGS = ( 'all' => [ qw(
-  	&distance
-  	&distance_calc
-  	&find_closest
-  	&reg_unit
-  	&formula
-  ) ] );
- -our @EXPORT_OK = (
- +@EXPORT_OK = (
-  	@{ $EXPORT_TAGS{'all'} },
-  	'&distance',
-  	'&distance_calc',
- @@ -23,11 +22,11 @@
-  	'&reg_unit',
-  	'&formula'
-  );
- -our $VERSION = '0.06';
- +$VERSION = '0.06';
-  
-  
-  # See Math::Trig for what $rho is.
- -our(%rho,$formula);
- +use vars qw(%rho $formula);
-  $rho{kilometer} = 6378; # Derived from the Math::Trig POD on the 'great_circle_distance'.
-  $rho{meter} = $rho{kilometer}*1000; # 1000 meters in one kilometer.
-  $rho{centimeter} = $rho{meter}*100; # 100 centimeters in one meter.
- @@ -41,7 +40,7 @@
-  # Number of units in a single degree (lat or lon) at the equator.
-  # Derived from doing dirty_distance('kilometer',10,0,11,0) = 111.317099692185
-  # Then dividing that by $unit{kilometer} = 6378
- -our $deg_ratio = 0.01745329252;
- +use vars qw($deg_ratio); $deg_ratio = 0.01745329252;
-  
-  
-  # New Object Constructor
--- 0 ----
--- geo-distance.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510151657.j9FGvXYL097662>