From 5eb10bc02ed75f8c039ebbce807bb2df15d1c120 Mon Sep 17 00:00:00 2001 From: landry Date: Fri, 4 Sep 2009 21:38:41 +0000 Subject: [PATCH] Use VERSION where possible, and move gnomevfs-2 to WANTLIB. prodded by 'ceiling frogz is watchin' your commitz' ajacoutot@ --- geo/osm2go/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/geo/osm2go/Makefile b/geo/osm2go/Makefile index e95b7ca1970..23042a82e6d 100644 --- a/geo/osm2go/Makefile +++ b/geo/osm2go/Makefile @@ -1,11 +1,12 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2009/09/04 18:19:41 landry Exp $ +# $OpenBSD: Makefile,v 1.2 2009/09/04 21:38:41 landry Exp $ COMMENT = Openstreetmap editor for handheld devices -DISTNAME = osm2go_0.7.18-maemo1 -PKGNAME = osm2go-0.7.18 +VERSION = 0.7.18 +DISTNAME = osm2go_${VERSION}-maemo1 +PKGNAME = osm2go-${VERSION}p0 -WRKDIST = ${WRKDIR}/osm2go-0.7.18 +WRKDIST = ${WRKDIR}/osm2go-${VERSION} CATEGORIES = geo x11 HOMEPAGE = http://wiki.openstreetmap.org/wiki/Osm2go @@ -24,8 +25,7 @@ CONFIGURE_STYLE = gnu MODULES = devel/gettext \ devel/gconf2 -LIB_DEPENDS = gnomevfs-2::x11/gnome/vfs2 \ - gnome-2::x11/gnome/libgnome \ +LIB_DEPENDS = gnome-2::x11/gnome/libgnome \ soup-2.4::devel/libsoup \ curl::net/curl \ goocanvas::graphics/goocanvas @@ -38,7 +38,7 @@ WANTLIB += bonobo-activation c cairo dbus-1 expat fontconfig freetype WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 WANTLIB += gnutls gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pixman-1 png popt pthread pthread-stubs -WANTLIB += xcb xml2 z +WANTLIB += xcb xml2 z gnomevfs-2 pre-configure: ${SUBST_CMD} ${WRKSRC}/data/osm2go-ubuntu.desktop