head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.48 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.46 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.44 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.42 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.40 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.38 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.36 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.34 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.32 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.30 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.28 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.26 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.24 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.22 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.20 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.18 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.16 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.14 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.12 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.10 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.8 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.6 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.4 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.2 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.1.0.8 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.6 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.4 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.2 netbsd-1-6-1-base:1.1; locks; strict; comment @# @; 1.2 date 2004.07.26.23.40.08; author wiz; state dead; branches; next 1.1; 1.1 date 2003.01.08.17.29.06; author tsarna; state Exp; branches; next ; desc @@ 1.2 log @Finish move of misc/gpsd and misc/gpsdrive to geography/. Closes PR 26422 by Iain Hibbert. @ text @$NetBSD: patch-ab,v 1.1 2003/01/08 17:29:06 tsarna Exp $ Drew Einhorn's gpsfetchmap.pl enhancements from: http://s2.selwerd.nl/~dirk-jan/gpsdrive/archive/msg01772.html also require this patch to support tree'd rather than flap map driectories. --- src/gpsdrive.c.orig Sun Dec 8 09:43:33 2002 +++ src/gpsdrive.c Wed Jan 8 12:20:48 2003 @@@@ -2926,12 +2926,22 @@@@ } for (i = 0; i < nrmaps; i++) { + /* strip off the path, we just want to check the filename */ + char *fullname; + char *rslash; + char *filename; + skip = TRUE; + + fullname = (maps + i)->filename; + rslash = strrchr(fullname, '/'); + filename = rslash == NULL ? fullname : rslash + 1; + if (displaymap_map) - if (!(strncmp ((maps + i)->filename, "map_", 4))) + if (!(strncmp (filename, "map_", 4))) skip = FALSE; if (displaymap_top) - if (!(strncmp ((maps + i)->filename, "top_", 4))) + if (!(strncmp (filename, "top_", 4))) skip = FALSE; if (skip) @@@@ -3101,8 +3111,17 @@@@ for (i = 0; i < nrmaps; i++) { - if ((strncmp ((maps + i)->filename, "map_", 4))) - if ((strncmp ((maps + i)->filename, "top_", 4))) + /* strip off the path, we just want to check the filename */ + char *fullname; + char *rslash; + char *filename; + + fullname = (maps + i)->filename; + rslash = strrchr(fullname, '/'); + filename = rslash == NULL ? fullname : rslash + 1; + + if ((strncmp (filename, "map_", 4))) + if ((strncmp (filename, "top_", 4))) { GString *error; error = g_string_new (NULL); @ 1.1 log @Bump to 1.31nb2 with addition of Drew Einhorn's gpsfetchmap.pl enhancements, including: - tred rather than flat map directory - grid-snapped images and checking to see if images are already available before downloading - support for US Census TIGER Line map server and terraserver as image sources. @ text @d1 1 a1 1 $NetBSD$ @