5 files changed, 78 insertions, 28 deletions

diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index 6d1ab78aff23..037cca0228c2 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -6,17 +6,12 @@
 #
 
 PORTNAME=	gpsdrive
-PORTVERSION=	2.07.r7
-PORTREVISION=	2
+PORTVERSION=	2.09
 CATEGORIES=	astro
-MASTER_SITES=	http://gpsdrive.kraftvoll.at/     \
-		http://www.gpsdrive.cc/           \
-		http://www.kraftvoll.at/          \
-		http://www.ganter.at/             \
-		http://www.gpsdrive.de/           \
+MASTER_SITES=	http://www.gpsdrive.cc/           \
+		http://www.gpsdrive.oc512.us/     \
 		http://gpsdrive.teachlinux.com/   \
 		http://gpsdrive.flugfunk.de/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/pre/}
 
 MAINTAINER=	molter@gufi.org
 COMMENT=	A GPS navigation system
@@ -33,21 +28,13 @@ USE_LIBTOOL_VER=	13
 
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--disable-garmin --disable-mysql
+CONFIGURE_ARGS=	--disable-garmin
 INSTALLS_SHLIB=	yes
 
 MAN1=		gpsdrive.1
 MANLANG=	"" de es
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 501103 && ${OSVERSION} >= 500000
-USE_GCC=3.2
-.else
-USE_GCC=3.3
-.endif
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/astro/gpsdrive/distinfo b/astro/gpsdrive/distinfo
index 227fbc2e90e1..14810eccf09f 100644
--- a/astro/gpsdrive/distinfo
+++ b/astro/gpsdrive/distinfo
@@ -1,2 +1,2 @@
-MD5 (gpsdrive-2.07pre7.tar.gz) = 2a409630bc5254920d281adf61f50026
-SIZE (gpsdrive-2.07pre7.tar.gz) = 1357753
+MD5 (gpsdrive-2.09.tar.gz) = eaa52cb220f3d10312a1046dd47126bb
+SIZE (gpsdrive-2.09.tar.gz) = 1745509
diff --git a/astro/gpsdrive/files/patch-src::splash.c b/astro/gpsdrive/files/patch-src::splash.c
new file mode 100644
index 000000000000..22e57ada2d77
--- /dev/null
+++ b/astro/gpsdrive/files/patch-src::splash.c
@@ -0,0 +1,60 @@
+--- src/splash.c.orig	Mon Jun  7 09:55:30 2004
++++ src/splash.c	Mon Jun  7 09:56:28 2004
+@@ -529,6 +529,24 @@
+ {
+   GtkTextIter iter;
+   GtkTextIter start, end;
++  gchar *t1 =
++    _
++    ("Left mouse button         : Set position (usefull in simulation mode)\n"
++     "Right mouse button        : Set target directly on the map\n"
++     "Middle mouse button       : Display position again\n"
++     "Shift left mouse button   : smaller map\n"
++     "Shift right mouse button  : larger map\n"
++     "Control left mouse button : Set a waypoint (mouse position) on the map\n"
++     "Control right mouse button: Set a waypoint at current position on the map\n\n");
++  gchar *t2 = _("j    : switch to next waypoint in route mode\n"
++		"x    : add waypoint at current position\n"
++		"y    : add waypoint at mouse cursor position\n");
++  gchar *t3 =
++    _("Press the underlined key together with the ALT-key.\n\n"
++      "You can move on the map by selecting the Position-Mode"
++      " in the menu. A blue rectangle shows this mode, you can set this cursor by clicking on the map."
++      " If you click on the border of the map (the outer 20%) then the map switches to the next area.\n\n"
++      "Suggestions welcome.\n\n");
+ 
+   /* demo_find_file() looks in the the current directory first,
+    * so you can run gtk-demo without installing GTK, then looks
+@@ -564,19 +582,7 @@
+ 					    -1, "blue_foreground", NULL);
+ 
+   gtk_text_buffer_insert (buffer, &iter, "\n", -1);
+-  gchar *t1 =
+-    _
+-    ("Left mouse button         : Set position (usefull in simulation mode)\n"
+-     "Right mouse button        : Set target directly on the map\n"
+-     "Middle mouse button       : Display position again\n"
+-     "Shift left mouse button   : smaller map\n"
+-     "Shift right mouse button  : larger map\n"
+-     "Control left mouse button : Set a waypoint (mouse position) on the map\n"
+-     "Control right mouse button: Set a waypoint at current position on the map\n\n");
+ 
+-  gchar *t2 = _("j    : switch to next waypoint in route mode\n"
+-		"x    : add waypoint at current position\n"
+-		"y    : add waypoint at mouse cursor position\n");
+   gtk_text_buffer_insert (buffer, &iter, t1, -1);
+ 
+   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+@@ -592,12 +598,6 @@
+ 					    -1, "underline", NULL);
+   gtk_text_buffer_insert (buffer, &iter, _(" letters in the button text.\n"),
+ 			  -1);
+-  gchar *t3 =
+-    _("Press the underlined key together with the ALT-key.\n\n"
+-      "You can move on the map by selecting the Position-Mode"
+-      " in the menu. A blue rectangle shows this mode, you can set this cursor by clicking on the map."
+-      " If you click on the border of the map (the outer 20%) then the map switches to the next area.\n\n"
+-      "Suggestions welcome.\n\n");
+   gtk_text_buffer_insert (buffer, &iter, t3, -1);
+   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+ 					    _("Have a lot of fun!"), -1,
diff --git a/astro/gpsdrive/pkg-descr b/astro/gpsdrive/pkg-descr
index 2f23350fc92c..28a8bb9e6568 100644
--- a/astro/gpsdrive/pkg-descr
+++ b/astro/gpsdrive/pkg-descr
@@ -1,12 +1,11 @@
 GpsDrive is a car (bike, ship, plane) GPS navigation system.
 
-GpsDrive displays the position provided from a Garmin or NMEA-capable GPS
-receiver on a zoomable map. The map file is autoselected depending on
-the position and prefered scale. Speech output is supported if the "festival"
-software is running. GpsDrive is written in C with use of the GTK-2 graphic
-toolkit.
+GpsDrive displays the position provided from a NMEA-capable GPS receiver on
+a zoomable map. The map file is autoselected depending on the position and
+prefered scale. Speech output is supported if the "festival" software is
+running. Waypoint database is supported via mySQL (optional).
 
-WWW: http://gpsdrive.kraftvoll.at/
+WWW: http://www.gpsdrive.cc/
 
 - Marco
 molter@gufi.org
diff --git a/astro/gpsdrive/pkg-plist b/astro/gpsdrive/pkg-plist
index 0c79ec242433..e44c98868784 100644
--- a/astro/gpsdrive/pkg-plist
+++ b/astro/gpsdrive/pkg-plist
@@ -4,7 +4,6 @@ bin/geo-nearest
 bin/geocache2way
 bin/gpsd
 bin/gpsdrive
-bin/gpsfetchmap
 bin/gpsfetchmap.pl
 bin/gpspoint2gpsdrive.pl
 bin/gpsreplay
@@ -31,11 +30,16 @@ share/gpsdrive/README.FreeBSD
 share/gpsdrive/README.SQL
 share/gpsdrive/README.gpspoint2gspdrive
 share/gpsdrive/README.kismet
+share/gpsdrive/README.nasamaps
 share/gpsdrive/TODO
 share/gpsdrive/create.sql
 share/gpsdrive/friendsicon.png
+share/gpsdrive/gpsdriveanim.gif
+share/gpsdrive/gpsdrivemini.png
 share/gpsdrive/gpsdrivesplash.png
-share/gpsdrive/map_GPSWORLD.jpg
+share/gpsdrive/gpsicon.png
+share/gpsdrive/gpsiconbt.png
+share/gpsdrive/top_GPSWORLD.jpg
 share/gpsdrive/wp2sql
 share/locale/da/LC_MESSAGES/gpsdrive.mo
 share/locale/de/LC_MESSAGES/gpsdrive.mo