- Update to 2.07-pre7.

- Use gtk2 instead of gtk1.

PR:		ports/61299
Submitted by:	Marco Molteni <molter@tin.it> (maintainer)
Approved by:	nork (mentor/implicitly)

4 files changed, 42 insertions, 28 deletions

diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index ded4229e02c5..c7688773a9b6 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -6,27 +6,30 @@
 #
 
 PORTNAME=	gpsdrive
-PORTVERSION=	1.33
-PORTREVISION=	1
+PORTVERSION=	2.07.r7
 CATEGORIES=	astro
 MASTER_SITES=	http://gpsdrive.kraftvoll.at/     \
-		http://gpsdrive.dotdeguy.de/      \
-		http://gpsdrive.spoiledmeat.net/  \
-		http://gpsdrive.flugfunk.de/      \
-		http://gpsdrive.alumnosfdi.org/   \
-		http://gpsdrive.teachlinux.com/
+		http://www.gpsdrive.cc/           \
+		http://www.kraftvoll.at/          \
+		http://www.ganter.at/             \
+		http://www.gpsdrive.de/           \
+		http://gpsdrive.teachlinux.com/   \
+		http://gpsdrive.flugfunk.de/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/pre/}
 
 MAINTAINER=	molter@gufi.org
 COMMENT=	A GPS navigation system
 
 LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 USE_GETOPT_LONG=yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gdkpixbuf
+USE_X_PREFIX=	yes
+USE_GNOME=	gtk20
 USE_LIBTOOL=	yes
+USE_GCC=	3.2
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-garmin --disable-mysql
diff --git a/astro/gpsdrive/distinfo b/astro/gpsdrive/distinfo
index 5d97015a09a3..5182f81b96cb 100644
--- a/astro/gpsdrive/distinfo
+++ b/astro/gpsdrive/distinfo
@@ -1 +1 @@
-MD5 (gpsdrive-1.33.tar.gz) = 140ee8a0addf4c71c3a2d80bbe51c1c6
+MD5 (gpsdrive-2.07pre7.tar.gz) = 2a409630bc5254920d281adf61f50026
diff --git a/astro/gpsdrive/pkg-descr b/astro/gpsdrive/pkg-descr
index a6f0e2fe7c24..2f23350fc92c 100644
--- a/astro/gpsdrive/pkg-descr
+++ b/astro/gpsdrive/pkg-descr
@@ -1,9 +1,9 @@
-GpsDrive is a car (bike, ship, plane) navigation system.
+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+ graphic
+software is running. GpsDrive is written in C with use of the GTK-2 graphic
 toolkit.
 
 WWW: http://gpsdrive.kraftvoll.at/
diff --git a/astro/gpsdrive/pkg-plist b/astro/gpsdrive/pkg-plist
index b95289c31fd3..0c79ec242433 100644
--- a/astro/gpsdrive/pkg-plist
+++ b/astro/gpsdrive/pkg-plist
@@ -1,9 +1,15 @@
-bin/friendsd
+bin/friendsd2
+bin/geo-code
+bin/geo-nearest
+bin/geocache2way
 bin/gpsd
 bin/gpsdrive
 bin/gpsfetchmap
 bin/gpsfetchmap.pl
 bin/gpspoint2gpsdrive.pl
+bin/gpsreplay
+bin/gpssql_backup.sh
+bin/gpssql_restore.sh
 bin/wpcvt
 bin/wpget
 lib/libfly.a
@@ -12,33 +18,38 @@ lib/libfly.so.2
 lib/libnautic.a
 lib/libnautic.so
 lib/libnautic.so.2
+share/gpsdrive/AUTHORS
+share/gpsdrive/CREDITS
+share/gpsdrive/FAQ.gpsdrive
+share/gpsdrive/FAQ.gpsdrive.fr
+share/gpsdrive/GPS-receivers
+share/gpsdrive/LEEME
+share/gpsdrive/LISEZMOI
+share/gpsdrive/NMEA.txt
+share/gpsdrive/README
+share/gpsdrive/README.FreeBSD
+share/gpsdrive/README.SQL
+share/gpsdrive/README.gpspoint2gspdrive
+share/gpsdrive/README.kismet
+share/gpsdrive/TODO
+share/gpsdrive/create.sql
 share/gpsdrive/friendsicon.png
-share/gpsdrive/gpsdrive/AUTHORS
-share/gpsdrive/gpsdrive/FAQ.gpsdrive
-share/gpsdrive/gpsdrive/FAQ.gpsdrive.fr
-share/gpsdrive/gpsdrive/GPS-receivers
-share/gpsdrive/gpsdrive/LEEME
-share/gpsdrive/gpsdrive/LISEZMOI
-share/gpsdrive/gpsdrive/NMEA.txt
-share/gpsdrive/gpsdrive/README
-share/gpsdrive/gpsdrive/README.FreeBSD
-share/gpsdrive/gpsdrive/README.SQL
-share/gpsdrive/gpsdrive/README.gpspoint2gspdrive
-share/gpsdrive/gpsdrive/README.kismet
-share/gpsdrive/gpsdrive/TODO
-share/gpsdrive/gpsdrive/create.sql
-share/gpsdrive/gpsdrive/wp2sql
 share/gpsdrive/gpsdrivesplash.png
+share/gpsdrive/map_GPSWORLD.jpg
+share/gpsdrive/wp2sql
 share/locale/da/LC_MESSAGES/gpsdrive.mo
 share/locale/de/LC_MESSAGES/gpsdrive.mo
 share/locale/de_AT/LC_MESSAGES/gpsdrive.mo
 share/locale/es/LC_MESSAGES/gpsdrive.mo
 share/locale/fr/LC_MESSAGES/gpsdrive.mo
+share/locale/gr/LC_MESSAGES/gpsdrive.mo
 share/locale/hu/LC_MESSAGES/gpsdrive.mo
 share/locale/it/LC_MESSAGES/gpsdrive.mo
+share/locale/ja/LC_MESSAGES/gpsdrive.mo
 share/locale/nl/LC_MESSAGES/gpsdrive.mo
+share/locale/no/LC_MESSAGES/gpsdrive.mo
+share/locale/pt_BR/LC_MESSAGES/gpsdrive.mo
 share/locale/sk/LC_MESSAGES/gpsdrive.mo
 share/locale/sv/LC_MESSAGES/gpsdrive.mo
 share/locale/tr/LC_MESSAGES/gpsdrive.mo
-@dirrm share/gpsdrive/gpsdrive
 @dirrm share/gpsdrive