diff --git a/geo/osm2go/Makefile b/geo/osm2go/Makefile index bccd74e3163..1a0031213fc 100644 --- a/geo/osm2go/Makefile +++ b/geo/osm2go/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.14 2012/06/15 08:32:15 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.15 2012/09/30 16:17:36 jasper Exp $ COMMENT = Openstreetmap editor for handheld devices -VERSION = 0.7.22 +VERSION = 0.8.3 DISTNAME = osm2go_${VERSION}-maemo1 PKGNAME = osm2go-${VERSION} -REVISION= 7 WRKDIST = ${WRKDIR}/osm2go-${VERSION} CATEGORIES = geo x11 @@ -33,6 +32,8 @@ LIB_DEPENDS = x11/gnome/libgnome \ RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+2,-guic +NO_REGRESS = Yes + WANTLIB += GL ORBit-2 X11 Xcomposite Xcursor Xdamage Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 bonobo-2 bonobo-activation WANTLIB += c cairo curl expat fontconfig freetype gdk-x11-2.0 diff --git a/geo/osm2go/distinfo b/geo/osm2go/distinfo index d9e882fae44..5fc776e2dda 100644 --- a/geo/osm2go/distinfo +++ b/geo/osm2go/distinfo @@ -1,5 +1,2 @@ -MD5 (osm2go_0.7.22-maemo1.tar.gz) = p9ggI/Sb3wVAkIPS9zfk1w== -RMD160 (osm2go_0.7.22-maemo1.tar.gz) = I7YT14L6Ua4YbbWxO96p9/WLVX0= -SHA1 (osm2go_0.7.22-maemo1.tar.gz) = 3m+OjK9Ky9UUNhQAtRClUmT0gV4= -SHA256 (osm2go_0.7.22-maemo1.tar.gz) = R4X0PckG44zqgSGOgopefLznRSN3ZM89/3PX6gYTP/I= -SIZE (osm2go_0.7.22-maemo1.tar.gz) = 1086426 +SHA256 (osm2go_0.8.3-maemo1.tar.gz) = 3wiBCt+21tDHLGn5Zf34/PkSimZ3/LWdx6aE7vM2w4o= +SIZE (osm2go_0.8.3-maemo1.tar.gz) = 1210793 diff --git a/geo/osm2go/patches/patch-data_Makefile_in b/geo/osm2go/patches/patch-data_Makefile_in index b3d3d944676..976c2d6c160 100644 --- a/geo/osm2go/patches/patch-data_Makefile_in +++ b/geo/osm2go/patches/patch-data_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-data_Makefile_in,v 1.2 2010/05/22 12:29:04 landry Exp $ ---- data/Makefile.in.orig Wed Oct 14 20:32:57 2009 -+++ data/Makefile.in Sat May 22 14:15:14 2010 -@@ -7,7 +7,7 @@ datadir = @datarootdir@ +$OpenBSD: patch-data_Makefile_in,v 1.3 2012/09/30 16:17:36 jasper Exp $ +--- data/Makefile.in.orig Mon Dec 21 16:10:31 2009 ++++ data/Makefile.in Sun Sep 30 18:14:35 2012 +@@ -8,7 +8,7 @@ datadir = @datarootdir@ all: $(TEMPLATE_ELEMSTYLES) elemstyles-mapnik.xml: elemstyles-mapnik.xml.in diff --git a/geo/osm2go/patches/patch-src_project_c b/geo/osm2go/patches/patch-src_project_c deleted file mode 100644 index 7c5aeadeee9..00000000000 --- a/geo/osm2go/patches/patch-src_project_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_project_c,v 1.2 2010/05/22 12:29:04 landry Exp $ ---- src/project.c.orig Thu Oct 8 13:33:20 2009 -+++ src/project.c Sat May 22 14:15:15 2010 -@@ -1546,7 +1546,7 @@ static GtkWidget *wizard_create_intro_page(wizard_page - } - - /* ---------------- page 2: source selection ----------------- */ --static gboolean gtk_widget_get_sensitive(GtkWidget *widget) { -+static gboolean widget_get_sensitive(GtkWidget *widget) { - GValue is_sensitive= { 0, }; - g_value_init(&is_sensitive, G_TYPE_BOOLEAN); - g_object_get_property(G_OBJECT(widget), "sensitive", &is_sensitive); -@@ -1585,7 +1585,7 @@ static void wizard_update_source_selection_page(wizard - for(i=0;i<4;i++) { - if(gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(page->state.source_selection.check[i]))) -- sel_ok = gtk_widget_get_sensitive(page->state.source_selection.check[i]); -+ sel_ok = widget_get_sensitive(page->state.source_selection.check[i]); - } - - /* set page to "completed" if a valid entry is selected */ diff --git a/geo/osm2go/pkg/PLIST b/geo/osm2go/pkg/PLIST index 5a094ee5a3e..c5f1a19a0aa 100644 --- a/geo/osm2go/pkg/PLIST +++ b/geo/osm2go/pkg/PLIST @@ -1,24 +1,13 @@ -@comment $OpenBSD: PLIST,v 1.5 2012/06/15 08:32:15 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.6 2012/09/30 16:17:36 jasper Exp $ @bin bin/osm2go share/applications/osm2go.desktop -share/icons/ -share/icons/hicolor/ -share/icons/hicolor/16x16/ -share/icons/hicolor/16x16/apps/ share/icons/hicolor/16x16/apps/osm2go.png -share/icons/hicolor/22x22/ -share/icons/hicolor/22x22/apps/ share/icons/hicolor/22x22/apps/osm2go.png -share/icons/hicolor/32x32/ -share/icons/hicolor/32x32/apps/ share/icons/hicolor/32x32/apps/osm2go.png -share/icons/hicolor/64x64/ -share/icons/hicolor/64x64/apps/ share/icons/hicolor/64x64/apps/osm2go.png -share/icons/hicolor/scalable/ -share/icons/hicolor/scalable/apps/ share/icons/hicolor/scalable/apps/osm2go.svg share/osm2go/ +share/osm2go/COPYING share/osm2go/colours.txt share/osm2go/demo/ share/osm2go/demo/demo.osm @@ -41,8 +30,10 @@ share/osm2go/icons/node_add.png share/osm2go/icons/node_add_thumb.png share/osm2go/icons/ok.png share/osm2go/icons/ok_thumb.png +share/osm2go/icons/osm2go.32.png share/osm2go/icons/osm2go.png -share/osm2go/icons/paypal.png +share/osm2go/icons/paypal.32.png +share/osm2go/icons/paypal.64.png share/osm2go/icons/presets/ share/osm2go/icons/presets/Hockey.png share/osm2go/icons/presets/JusticeScales.png @@ -99,7 +90,9 @@ share/osm2go/icons/presets/cricket.png share/osm2go/icons/presets/crossing.png share/osm2go/icons/presets/cycleway.png share/osm2go/icons/presets/cycling.png +share/osm2go/icons/presets/dentist.png share/osm2go/icons/presets/diy_store.png +share/osm2go/icons/presets/doctor.png share/osm2go/icons/presets/dollar.png share/osm2go/icons/presets/douane.png share/osm2go/icons/presets/drag_lift.png @@ -131,6 +124,7 @@ share/osm2go/icons/presets/hiking_grade6.png share/osm2go/icons/presets/historic.png share/osm2go/icons/presets/hospital.png share/osm2go/icons/presets/hostel.png +share/osm2go/icons/presets/housenumber.png share/osm2go/icons/presets/hunting_stand.png share/osm2go/icons/presets/information.png share/osm2go/icons/presets/island.png @@ -507,6 +501,7 @@ share/osm2go/icons/styles/standard/vehicle/toll_station.png share/osm2go/icons/styles/standard/vehicle/turning_circle.png share/osm2go/icons/styles/standard/vehicle/viaduct.png share/osm2go/icons/styles/standard/vehicle/zebra_crossing.png +share/osm2go/icons/submenu_arrow.png share/osm2go/icons/trash-full.png share/osm2go/icons/trash.png share/osm2go/icons/trash_thumb.png