Remove the part from patch-ac that modifies interpreter path. Not needed.

2 files changed, 14 insertions, 23 deletions

diff --git a/geography/gpsdrive/distinfo b/geography/gpsdrive/distinfo
index 52032d4ad1c..d8204bd373e 100644
--- a/geography/gpsdrive/distinfo
+++ b/geography/gpsdrive/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2005/02/22 21:08:32 agc Exp $
+$NetBSD: distinfo,v 1.4 2011/07/03 21:42:24 jym Exp $
 
 SHA1 (gpsdrive-1.31.tar.gz) = 296a06d264c5fbb077c91f3529b4e6f122423f05
 RMD160 (gpsdrive-1.31.tar.gz) = 56ea8fb9355e0381d55aeb691757c59c9e332406
 Size (gpsdrive-1.31.tar.gz) = 784379 bytes
 SHA1 (patch-aa) = cc5dd44020ffc5f22dc958c938b9f98ff6e01810
 SHA1 (patch-ab) = 240901fe52e41db1a41299f66ac61c06898f1881
-SHA1 (patch-ac) = 86f67ad04378f14a95e5b9fc806b2054ef4be127
+SHA1 (patch-ac) = 78e21378bc10d4a1098827d25308f59432b180f1
 SHA1 (patch-ad) = 05d6be6ba7bd37b4b0599092ace2d5db7825c01d
 SHA1 (patch-ae) = 5ab12f3f1f94a84acac0bc47fb4ad5a3bb75b7b6
 SHA1 (patch-af) = ba047381fcf07b3797c73199f85536b2a7efb61e
diff --git a/geography/gpsdrive/patches/patch-ac b/geography/gpsdrive/patches/patch-ac
index 3bde51fd88d..1b7e6383171 100644
--- a/geography/gpsdrive/patches/patch-ac
+++ b/geography/gpsdrive/patches/patch-ac
@@ -1,18 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/07/26 23:33:35 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2011/07/03 21:42:24 jym Exp $
 
-Drew Einhorn's gpsfetchmap.pl enhancements from:
-
-http://s2.selwerd.nl/~dirk-jan/gpsdrive/archive/msg01772.html
-
---- src/gpsfetchmap.pl.orig	Sun Nov 24 11:04:38 2002
-+++ src/gpsfetchmap.pl	Wed Jan  8 12:13:17 2003
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/bin/env perl
- 
- # gpsfetchmap
- #
-@@ -9,38 +9,71 @@
+--- src/gpsfetchmap.pl.orig	2002-11-24 16:04:38.000000000 +0000
++++ src/gpsfetchmap.pl
+@@ -9,38 +9,71 @@ my $VERSION =<<EOP;
  gpsfetchmap (c) 2002 Kevin Stephens <gps\@suburbialost.com>
  modified (Sept 06, 2002) by Sven Fichtner <sven.fichtner\@flugfunk.de>
  modified (Sept 18, 2002) by Sven Fichtner <sven.fichtner\@flugfunk.de>
@@ -95,7 +85,7 @@ http://s2.selwerd.nl/~dirk-jan/gpsdrive/archive/msg01772.html
  pod2usage(1) if $help;
  pod2usage(-verbose=>2) if $man;
  
-@@ -55,7 +88,6 @@
+@@ -55,7 +88,6 @@ pod2usage(1) if (&error_check);
  
  
  # Setup up some constants
@@ -103,7 +93,7 @@ http://s2.selwerd.nl/~dirk-jan/gpsdrive/archive/msg01772.html
  my $DIFF          = 0.0000028;
  my $RADIUS_KM     = 6371.01;
  my $LAT_DIST_KM   = 110.87;
-@@ -64,7 +96,7 @@
+@@ -64,7 +96,7 @@ my $KM2MILES      = 0.62137119;
  
  # Get the list of scales we need
  my $SCALES_TO_GET_ref = get_scales(\$scale);
@@ -112,7 +102,7 @@ http://s2.selwerd.nl/~dirk-jan/gpsdrive/archive/msg01772.html
  
  # Get the center waypoint if they want one
  if ($waypoint) {
-@@ -82,7 +114,7 @@
+@@ -82,7 +114,7 @@ $mapdir = &get_mapdir unless ($mapdir);
  unless ($slat && $slon && $endlat && $endlon) {
     ($slat,$slon,$endlat,$endlon) = get_coords(\$lat,\$lon,\$area,\$unit); 
  }
@@ -121,7 +111,7 @@ http://s2.selwerd.nl/~dirk-jan/gpsdrive/archive/msg01772.html
  
  unless ($force) {
     my $count = file_count(\($slat,$slon,$endlat,$endlon));
-@@ -93,67 +125,136 @@
+@@ -93,61 +125,12 @@ unless ($force) {
  
  print "\nDownloading files:\n";
  
@@ -187,10 +177,10 @@ http://s2.selwerd.nl/~dirk-jan/gpsdrive/archive/msg01772.html
  
  ################################################################################
  #
- # Subroutines
+@@ -155,6 +138,124 @@ print "\n";
  #
  ################################################################################
-+
+ 
 +sub getmaps {
 +  my ($scale, $slat, $endlat, $slon, $endlon, $k) = @_;
 +
@@ -308,6 +298,7 @@ http://s2.selwerd.nl/~dirk-jan/gpsdrive/archive/msg01772.html
 +  $filename = sprintf("%s%d-%08.4f-%09.4f.gif", $prefix, $scale, $lati, $long);
 +  return "$pathname$filename";
 +}
- 
++
  sub error_check {
     my $status;
+