diff -u -rN /usr/ports/astro/gpsdrive/Makefile /usr/ports/astro/gpsdrive-1.33/Makefile --- /usr/ports/astro/gpsdrive/Makefile Fri Apr 11 14:52:55 2003 +++ /usr/ports/astro/gpsdrive-1.33/Makefile Tue Jul 22 21:28:42 2003 @@ -6,7 +6,7 @@ # PORTNAME= gpsdrive -PORTVERSION= 1.31 +PORTVERSION= 1.33 CATEGORIES= astro MASTER_SITES= http://gpsdrive.kraftvoll.at/ \ http://gpsdrive.dotdeguy.de/ \ diff -u -rN /usr/ports/astro/gpsdrive/distinfo /usr/ports/astro/gpsdrive-1.33/distinfo --- /usr/ports/astro/gpsdrive/distinfo Sun Jan 19 10:48:04 2003 +++ /usr/ports/astro/gpsdrive-1.33/distinfo Tue Jul 22 21:29:44 2003 @@ -1 +1 @@ -MD5 (gpsdrive-1.31.tar.gz) = d6ae72cb4426068afadce2a5e338502b +MD5 (gpsdrive-1.33.tar.gz) = 140ee8a0addf4c71c3a2d80bbe51c1c6 diff -u -rN /usr/ports/astro/gpsdrive/files/patch-src-Makefile.in /usr/ports/astro/gpsdrive-1.33/files/patch-src-Makefile.in --- /usr/ports/astro/gpsdrive/files/patch-src-Makefile.in Mon Aug 12 16:56:27 2002 +++ /usr/ports/astro/gpsdrive-1.33/files/patch-src-Makefile.in Tue Jul 22 21:35:29 2003 @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig Thu Aug 8 23:52:40 2002 -+++ src/Makefile.in Thu Aug 8 23:54:21 2002 -@@ -117,7 +117,7 @@ +--- src/Makefile.in.orig Sun Jun 29 19:29:49 2003 ++++ src/Makefile.in Tue Jul 22 21:34:25 2003 +@@ -167,7 +167,7 @@ # gpsdrive_LDADD= $(GLIB_LIBS) $(GTK_LIBS) $(PIXLIBS) #gpsdrive_LDADD=@LIBS@ @@ -9,21 +9,21 @@ # gpsdrive_CFLAGS=@CFLAGS@ # libgpsd_a_CFLAGS=@CFLAGS@ # CFLAGS= -@@ -173,7 +173,7 @@ +@@ -193,7 +193,7 @@ + @DISABLEGARMIN_FALSE@garble_SOURCES = garble.cpp garmin_legacy.cpp garmin_data.cpp garmin_serial_unix.cpp garmin_application.cpp garmin_link.cpp garmin_util.cpp - am_friendsd_OBJECTS = friendsd.$(OBJEXT) - friendsd_OBJECTS = $(am_friendsd_OBJECTS) --friendsd_LDADD = $(LDADD) -+friendsd_LDADD = $(LDADD) -lintl - friendsd_DEPENDENCIES = - friendsd_LDFLAGS = - @DISABLEGARMIN_TRUE@am_garble_OBJECTS = -@@ -183,7 +183,7 @@ + friendsd_SOURCES = friendsd.c +-friendsd_LDADD = $(LDADD) $(LIBINTL) ++friendsd_LDADD = $(LDADD) $(LIBINTL) -lgnugetopt + EXTRA_DIST = mysql wpcvt wpget gpsfetchmap gpsfetchmap.pl gpsdrive.spec gpsdrive-nosql.spec map_koord.txt gpsdrivesplash.png friendsicon.png gpspoint2gpsdrive.pl geo-nearest geocache2way geo-code gpssql_backup.sh gpssql_restore.sh + + data_DATA = gpsdrivesplash.png friendsicon.png +@@ -237,7 +237,7 @@ @DISABLEGARMIN_FALSE@ garmin_link.$(OBJEXT) \ @DISABLEGARMIN_FALSE@ garmin_util.$(OBJEXT) garble_OBJECTS = $(am_garble_OBJECTS) -garble_LDADD = $(LDADD) +garble_LDADD = $(LDADD) -lgnugetopt - garble_DEPENDENCIES = garble_LDFLAGS = am_gpsd_OBJECTS = gpsd.$(OBJEXT) + gpsd_OBJECTS = $(am_gpsd_OBJECTS) diff -u -rN /usr/ports/astro/gpsdrive/files/patch-src-battery.c /usr/ports/astro/gpsdrive-1.33/files/patch-src-battery.c --- /usr/ports/astro/gpsdrive/files/patch-src-battery.c Mon Aug 12 19:30:03 2002 +++ /usr/ports/astro/gpsdrive-1.33/files/patch-src-battery.c Thu Jan 1 01:00:00 1970 @@ -1,43 +0,0 @@ ---- src/battery.c.orig Mon Aug 12 14:07:55 2002 -+++ src/battery.c Mon Aug 12 14:16:49 2002 -@@ -70,10 +70,11 @@ - #include - #include - --#ifdef __FreeBSD__ -+/* APM is i386-specific. */ -+#if defined(__FreeBSD__) && defined(__i386__) - #include - #include --#endif /* __FreeBSD__ */ -+#endif /* __FreeBSD__ && __i386__ */ - - #include "../config.h" - #include "battery.h" -@@ -237,7 +238,7 @@ - #endif /* Linux */ - - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) && defined(__i386__) - /* - * Return TRUE on success, FALSE on error. - */ -@@ -311,7 +312,7 @@ - close (fd); - return TRUE; - } --#endif /* __FreeBSD__ */ -+#endif /* __FreeBSD__ && __i386__ */ - - - /* -@@ -326,7 +327,7 @@ - } - #if defined(__linux__) - return battery_get_values_linux (&batlevel, &batloading); --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) && defined(__i386__) - return battery_get_values_fbsd (&batlevel, &batloading); - #else - /* add support for your favourite OS here */