Attachment #33420 for bug #54759

View | Details | Raw Unified | Return to bug 54759
Collapse All | Expand All

Lines 6-12 Link Here

(-)/usr/ports/astro/gpsdrive-1.33/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= gpsdrive	8	PORTNAME= gpsdrive
9	PORTVERSION= 1.31	9	PORTVERSION= 1.33
10	CATEGORIES= astro	10	CATEGORIES= astro
11	MASTER_SITES= http://gpsdrive.kraftvoll.at/ \	11	MASTER_SITES= http://gpsdrive.kraftvoll.at/ \
12	http://gpsdrive.dotdeguy.de/ \	12	http://gpsdrive.dotdeguy.de/ \

Line 1 Link Here

(-)/usr/ports/astro/gpsdrive-1.33/distinfo (-1 / +1 lines)
1	MD5 (gpsdrive-1.31.tar.gz) = d6ae72cb4426068afadce2a5e338502b	1	MD5 (gpsdrive-1.33.tar.gz) = 140ee8a0addf4c71c3a2d80bbe51c1c6




--- 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@

 # gpsdrive_CFLAGS=@CFLAGS@
 # libgpsd_a_CFLAGS=@CFLAGS@
 # CFLAGS=
@@ -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
 
 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 @@
@@ -183,7 +183,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)




--- 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 <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 
-#ifdef __FreeBSD__
+/* APM is i386-specific. */
+#if defined(__FreeBSD__) && defined(__i386__)
 #include <fcntl.h>
 #include <machine/apm_bios.h>
-#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 */

Return to bug 54759

Lines 1-6 Link Here

(-)/usr/ports/astro/gpsdrive-1.33/files/patch-src-Makefile.in (-13 / +13 lines)
1	--- src/Makefile.in.orig Thu Aug 8 23:52:40 2002	1	--- src/Makefile.in.orig Sun Jun 29 19:29:49 2003
2	+++ src/Makefile.in Thu Aug 8 23:54:21 2002	2	+++ src/Makefile.in Tue Jul 22 21:34:25 2003
3	@@ -117,7 +117,7 @@	3	@@ -167,7 +167,7 @@
4		4
5	# gpsdrive_LDADD= $(GLIB_LIBS) $(GTK_LIBS) $(PIXLIBS)	5	# gpsdrive_LDADD= $(GLIB_LIBS) $(GTK_LIBS) $(PIXLIBS)
6	#gpsdrive_LDADD=@LIBS@	6	#gpsdrive_LDADD=@LIBS@
Lines 9-29 Link Here
9	# gpsdrive_CFLAGS=@CFLAGS@	9	# gpsdrive_CFLAGS=@CFLAGS@
10	# libgpsd_a_CFLAGS=@CFLAGS@	10	# libgpsd_a_CFLAGS=@CFLAGS@
11	# CFLAGS=	11	# CFLAGS=
12	@@ -173,7 +173,7 @@	12	@@ -193,7 +193,7 @@
		13	@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
13		14
14	am_friendsd_OBJECTS = friendsd.$(OBJEXT)	15	friendsd_SOURCES = friendsd.c
15	friendsd_OBJECTS = $(am_friendsd_OBJECTS)	16	-friendsd_LDADD = $(LDADD) $(LIBINTL)
16	-friendsd_LDADD = $(LDADD)	17	+friendsd_LDADD = $(LDADD) $(LIBINTL) -lgnugetopt
17	+friendsd_LDADD = $(LDADD) -lintl	18	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
18	friendsd_DEPENDENCIES =	19
19	friendsd_LDFLAGS =	20	data_DATA = gpsdrivesplash.png friendsicon.png
20	@DISABLEGARMIN_TRUE@am_garble_OBJECTS =	21	@@ -237,7 +237,7 @@
21	@@ -183,7 +183,7 @@
22	@DISABLEGARMIN_FALSE@ garmin_link.$(OBJEXT) \	22	@DISABLEGARMIN_FALSE@ garmin_link.$(OBJEXT) \
23	@DISABLEGARMIN_FALSE@ garmin_util.$(OBJEXT)	23	@DISABLEGARMIN_FALSE@ garmin_util.$(OBJEXT)
24	garble_OBJECTS = $(am_garble_OBJECTS)	24	garble_OBJECTS = $(am_garble_OBJECTS)
25	-garble_LDADD = $(LDADD)	25	-garble_LDADD = $(LDADD)
26	+garble_LDADD = $(LDADD) -lgnugetopt	26	+garble_LDADD = $(LDADD) -lgnugetopt
27	garble_DEPENDENCIES =
28	garble_LDFLAGS =	27	garble_LDFLAGS =
29	am_gpsd_OBJECTS = gpsd.$(OBJEXT)	28	am_gpsd_OBJECTS = gpsd.$(OBJEXT)
		29	gpsd_OBJECTS = $(am_gpsd_OBJECTS)

Lines 1-43 Link Here

(-)/usr/ports/astro/gpsdrive-1.33/files/patch-src-battery.c (-43 lines)
1	--- src/battery.c.orig Mon Aug 12 14:07:55 2002
2	+++ src/battery.c Mon Aug 12 14:16:49 2002
3	@@ -70,10 +70,11 @@
4	#include <gdk-pixbuf/gdk-pixbuf.h>
5	#include <gtk/gtk.h>
6
7	-#ifdef __FreeBSD__
8	+/* APM is i386-specific. */
9	+#if defined(__FreeBSD__) && defined(__i386__)
10	#include <fcntl.h>
11	#include <machine/apm_bios.h>
12	-#endif /* __FreeBSD__ */
13	+#endif /* __FreeBSD__ && __i386__ */
14
15	#include "../config.h"
16	#include "battery.h"
17	@@ -237,7 +238,7 @@
18	#endif /* Linux */
19
20
21	-#ifdef __FreeBSD__
22	+#if defined(__FreeBSD__) && defined(__i386__)
23	/*
24	* Return TRUE on success, FALSE on error.
25	*/
26	@@ -311,7 +312,7 @@
27	close (fd);
28	return TRUE;
29	}
30	-#endif /* __FreeBSD__ */
31	+#endif /* __FreeBSD__ && __i386__ */
32
33
34	/*
35	@@ -326,7 +327,7 @@
36	}
37	#if defined(__linux__)
38	return battery_get_values_linux (&batlevel, &batloading);
39	-#elif defined(__FreeBSD__)
40	+#elif defined(__FreeBSD__) && defined(__i386__)
41	return battery_get_values_fbsd (&batlevel, &batloading);
42	#else
43	/* add support for your favourite OS here */