cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update tangogps to 0.99.4

Browse Source 
- switch to new DEPENDS
- use an axe to remove the bluez dependency; upstream refuses to reply to my
mails about actually fixing it instead of forcing it upon everyone.

ok MAINTAINER and landry@
This commit is contained in:
jasper 2010-09-01 07:12:17 +00:00
parent af91bb78f6
commit 91310a3e5b
7 changed files with 124 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
geo/tangogps/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2010/04/18 21:18:36 landry Exp $
# $OpenBSD: Makefile,v 1.3 2010/09/01 07:12:17 jasper Exp $
COMMENT = lightweight mapping application for use with or without GPS
DISTNAME = tangogps-0.99.3
PKGNAME = ${DISTNAME}p0
DISTNAME = tangogps-0.99.4
CATEGORIES = geo
@ -19,29 +18,33 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender c cairo crypto dbus-1 \
dbus-glib-1 expat fontconfig freetype gdk-x11-2.0 \
gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 \
gobject-2.0 gthread-2.0 gtk-x11-2.0 iconv idn intl m \
pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \
png pthread pthread-stubs ssl xcb xcb-render \
xcb-render-util xml2 z
WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender c cairo crypto dbus-1
WANTLIB += dbus-glib-1 expat fontconfig freetype gcrypt gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 gnutls
WANTLIB += gobject-2.0 gpg-error gthread-2.0 gtk-x11-2.0 idn m
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png pthread pthread-stubs ssl tasn1 xcb xcb-render
WANTLIB += xcb-render-util xml2 z
WANTLIB += atk-1.0 curl exif gconf-2 sqlite3 soup-2.4
MODULES = devel/gettext
LIB_DEPENDS = atk-1.0::devel/atk \
curl::net/curl \
exif::graphics/libexif \
gconf-2::devel/gconf2 \
sqlite3::databases/sqlite3
LIB_DEPENDS = ::devel/atk \
::net/curl \
::graphics/libexif \
::devel/gconf2 \
::databases/sqlite3 \
::devel/libsoup
RUN_DEPENDS = ::devel/desktop-file-utils
CONFIGURE_ENV += CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl"
USE_X11 = Yes
CONFIGURE_STYLE = gnu
USE_X11 = Yes
CONFIGURE_STYLE = autoconf gnu
AUTOCONF_VERSION = 2.64
NO_REGRESS = Yes
.include <bsd.port.mk>

10
geo/tangogps/distinfo
View File

@ -1,5 +1,5 @@
MD5 (tangogps-0.99.3.tar.gz) = dLT1hLbtrldsHXfRZqlHbg==
RMD160 (tangogps-0.99.3.tar.gz) = qbw0OBJ4K4/MJvFJylAkWyi6vz0=
SHA1 (tangogps-0.99.3.tar.gz) = wvuaBwwB9QKWtczjRGe6A7VNPzo=
SHA256 (tangogps-0.99.3.tar.gz) = /4v2MCHlTqfNXFI4KzKHclLlIwFUYG9iNWSMrzb1G48=
SIZE (tangogps-0.99.3.tar.gz) = 493873
MD5 (tangogps-0.99.4.tar.gz) = Dwft6Uoh64T14Bf6iKH8PQ==
RMD160 (tangogps-0.99.4.tar.gz) = orTMqq94MV08Zd2YA2e1K6rMY28=
SHA1 (tangogps-0.99.4.tar.gz) = e3w4FH9AC99F5rBzZf8e5r2y0DM=
SHA256 (tangogps-0.99.4.tar.gz) = Zg/fie88N58vwMKp0MnTv6U0WDV4a3K/n1E7qewsgSo=
SIZE (tangogps-0.99.4.tar.gz) = 518475

15
geo/tangogps/patches/patch-configure_in Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-configure_in,v 1.1 2010/09/01 07:12:17 jasper Exp $
Disable Bluez-stack bluetooth.
--- configure.in.orig Mon Aug 9 23:42:27 2010
+++ configure.in Mon Aug 9 23:42:32 2010
@@ -23,7 +23,7 @@ AM_GLIB_GNU_GETTEXT
AM_PROG_LIBTOOL
-PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 gdk-2.0 gconf-2.0 libxml-2.0 libsoup-2.4 bluez])
+PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 gdk-2.0 gconf-2.0 libxml-2.0 libsoup-2.4])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)

27
geo/tangogps/patches/patch-src_callbacks_c Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-src_callbacks_c,v 1.1 2010/09/01 07:12:17 jasper Exp $
Disable Bluez-stack bluetooth.
--- src/callbacks.c.orig Mon Aug 30 15:30:44 2010
+++ src/callbacks.c Mon Aug 30 15:34:03 2010
@@ -28,7 +28,9 @@
#include "poi.h"
#include "wp.h"
#include "tracks.h"
-#include "hrm_functions.h"
+#if !defined(__OpenBSD__)
+# include "hrm_functions.h"
+#endif
#include "dataupload.h"
#define WTFCOUNTER 5
@@ -405,7 +407,9 @@ on_drawingarea1_expose_event (GtkWidget
event->area.width, event->area.height);
osd_speed(TRUE);
+#if !defined(__OpenBSD__)
osd_hrm(TRUE);
+#endif
map_scale_indicator();
return FALSE;

34
geo/tangogps/patches/patch-src_gps_functions_c Normal file
View File

@ -0,0 +1,34 @@
$OpenBSD: patch-src_gps_functions_c,v 1.1 2010/09/01 07:12:17 jasper Exp $
Disable Bluez-stack bluetooth.
--- src/gps_functions.c.orig Mon Aug 30 15:30:39 2010
+++ src/gps_functions.c Mon Aug 30 15:33:46 2010
@@ -28,7 +28,9 @@
#include "wp.h"
#include "tracks.h"
#include "livetracks.h"
-#include "hrm_functions.h"
+#if !defined(__OpenBSD__)
+# include "hrm_functions.h"
+#endif
#define BUFSIZE 512
char * distance2scale(float distance, float *factor);
@@ -363,6 +365,7 @@ cb_gps_timer()
set_label_nogps();
}
+#if !defined(__OpenBSD__)
if(hrm_on && (!hrmdata || global_reconnect_hrm))
get_hrm_data();
else if(hrm_on && hrmdata) {
@@ -370,7 +373,7 @@ cb_gps_timer()
if(global_infopane_visible)
set_hrm_labels();
}
-
+#endif
return TRUE;
}

18
geo/tangogps/patches/patch-src_hrm_functions_c Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_hrm_functions_c,v 1.1 2010/09/01 07:12:17 jasper Exp $
Disable Bluez-stack bluetooth.
--- src/hrm_functions.c.orig Mon Aug 30 15:29:23 2010
+++ src/hrm_functions.c Mon Aug 30 15:30:13 2010
@@ -1,5 +1,5 @@
+#if !defined(__OpenBSD__)
-
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -293,3 +293,4 @@ get_hrm_data_thread(void *ptr)
}
return NULL;
}
+#endif /* ! __OpenBSD__ */

5
geo/tangogps/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/04/18 13:30:17 landry Exp $
@comment $OpenBSD: PLIST,v 1.2 2010/09/01 07:12:17 jasper Exp $
@bin bin/tangogps
share/applications/tangogps.desktop
share/doc/tangogps/
@ -9,8 +9,11 @@ share/locale/de/LC_MESSAGES/tangogps.mo
share/locale/es/LC_MESSAGES/tangogps.mo
share/locale/fi/LC_MESSAGES/tangogps.mo
share/locale/fr/LC_MESSAGES/tangogps.mo
share/locale/hr/LC_MESSAGES/tangogps.mo
share/locale/hu/LC_MESSAGES/tangogps.mo
share/locale/it/LC_MESSAGES/tangogps.mo
share/locale/nl/LC_MESSAGES/tangogps.mo
share/locale/pl/LC_MESSAGES/tangogps.mo
share/locale/ru/LC_MESSAGES/tangogps.mo
share/locale/sk/LC_MESSAGES/tangogps.mo
share/pixmaps/