Update of astro/gpsdrive to latest version (2.09) enable mysql support (experimental) update master sites Please close PR ports/66822 when you commit this one. Thanks. Fix: Apply following patch How-To-Repeat: N/A
Responsible Changed From-To: freebsd-ports-bugs->vs I'll handle this one.
Marco, the patch at http://www-i2.informatik.rwth-aachen.de/~stolz/FreeBSD/patch-src::splash.c makes this C89-compliant and on -STABLE GCC3.3 is no longer required (just moves some constant declarations to the beginning of the function). Could you please review if this patch would be a good thing? You might even consider submitting it to upstream's bugtracker. Volker
Hi Volker, Thanks for the patch. Here is an updated version. BTW if you want to take maintainership feel free :-) marco diff -u -rN /usr/ports/astro/gpsdrive/Makefile /usr/ports/astro/gpsdrive-marco/Makefile --- /usr/ports/astro/gpsdrive/Makefile Tue Apr 13 18:50:53 2004 +++ /usr/ports/astro/gpsdrive-marco/Makefile Tue Jun 8 22:13:04 2004 @@ -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 @@ 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 -u -rN /usr/ports/astro/gpsdrive/distinfo /usr/ports/astro/gpsdrive-marco/distinfo --- /usr/ports/astro/gpsdrive/distinfo Tue Apr 13 18:50:53 2004 +++ /usr/ports/astro/gpsdrive-marco/distinfo Sun Jun 6 23:05:36 2004 @@ -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 -u -rN /usr/ports/astro/gpsdrive/files/patch-src::splash.c /usr/ports/astro/gpsdrive-marco/files/patch-src::splash.c --- /usr/ports/astro/gpsdrive/files/patch-src::splash.c Thu Jan 1 01:00:00 1970 +++ /usr/ports/astro/gpsdrive-marco/files/patch-src::splash.c Tue Jun 8 21:49:25 2004 @@ -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 -u -rN /usr/ports/astro/gpsdrive/pkg-descr /usr/ports/astro/gpsdrive-marco/pkg-descr --- /usr/ports/astro/gpsdrive/pkg-descr Sat Jan 17 15:35:47 2004 +++ /usr/ports/astro/gpsdrive-marco/pkg-descr Sun Jun 6 23:23:00 2004 @@ -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 -u -rN /usr/ports/astro/gpsdrive/pkg-plist /usr/ports/astro/gpsdrive-marco/pkg-plist --- /usr/ports/astro/gpsdrive/pkg-plist Sat Jan 17 15:35:47 2004 +++ /usr/ports/astro/gpsdrive-marco/pkg-plist Sun Jun 6 23:11:54 2004 @@ -4,7 +4,6 @@ bin/geocache2way bin/gpsd bin/gpsdrive -bin/gpsfetchmap bin/gpsfetchmap.pl bin/gpspoint2gpsdrive.pl bin/gpsreplay @@ -31,11 +30,16 @@ 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
Marco, I noticed there is no dependency on mysql. This doesn't seem right. -- http://www-i2.informatik.rwth-aachen.de/stolz/ *** PGP *** S/MIME Neu! Ändern Sie den Anfangstag Ihrer Woche
On Wednesday 09 June 2004 11:29, Volker Stolz wrote: > Is this just with my patch or did you change anything else from > your previous submission? Well, I changed the port's makefile not to refer to GCC anymore. Besides that, it is the same as before. I don't have a -stable box around, could you check if it works fine for you? > Marco, I noticed there is no dependency on mysql. This doesn't seem > right. Yes, I forgot to comment on it. I am having an email exchange with somebody who uses mysql with gpsdrive. He has some troubles the origin of them is not 100% clear. I am still debugging that. The lack of dependency on mysql is intentional for two reasons: 1. gpsdrive itself takes care of checking for mysql at runtime; if it doesn't find it, it goes on fine. If I were to add a dependency on mysql, this would mean that if you installed gpsdrive before mysql you would be forced to reinstall gpsdrive to use mysql. 2. there are at least 3 different myslqclient versions in the ports tree. I think there is no sense in either forcing a specific version or add complexity to the makefile just to track the version already installed. So my suggestion would be: - test if it builds and runs fine on -stable - if yes, commit it - wait for a new PR for the mysql bug i was referring to. is it ok? marco
State Changed From-To: open->closed Committed, thanks!