===================================================================
RCS file: /cvs/ports/geo/navit/Makefile,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -r1.5 -r1.8
--- ports/geo/navit/Makefile	2011/03/04 14:44:08	1.5
+++ ports/geo/navit/Makefile	2012/05/13 14:21:08	1.8
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2011/03/04 14:44:08 yason Exp $
+# $OpenBSD: Makefile,v 1.8 2012/05/13 14:21:08 kirby Exp $
 #BROKEN =		GNU getline suxx (undefined reference to `getline')
 
 COMMENT =		car navigation system with routing engine
 
-DISTNAME =		navit-0.2.0
+DISTNAME =		navit-0.2.1
 
 #SHARED_LIBS =		???
 
@@ -21,12 +21,22 @@
 
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=navit/}
 
+WANTLIB += GL SDL SDL_image X11 Xau Xcomposite Xcursor Xdamage
+WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
+WANTLIB += atk-1.0 c cairo com_err crypto dbus-1 dbus-glib-1 drm
+WANTLIB += expat fontconfig freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gps gthread-2.0
+WANTLIB += gtk-x11-2.0 jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pcre pixman-1 png pq pthread pthread-stubs sndio ssl
+WANTLIB += tiff usbhid xcb xcb-render xcb-shm z
 
-MODULES =		devel/gettext \
+MODULES =		devel/cmake \
+			devel/gettext \
 			textproc/intltool
 BUILD_DEPENDS =		x11/gnome/librsvg
 
 LIB_DEPENDS =		databases/postgresql \
+			devel/fribidi \
 			devel/sdl-image \
 			graphics/cairo \
 			graphics/quesoglc \
@@ -34,31 +44,25 @@
 			x11/dbus \
 			x11/dbus-glib \
 			x11/gtk+2
-#REGRESS_DEPENDS =	???
 
 #MAKE_FLAGS =		???
 #MAKE_ENV =		???
 #FAKE_FLAGS =		???
 #REGRESS_FLAGS =	???
 
-USE_GMAKE =		Yes
-USE_LIBTOOL =		Yes
-CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS =	--enable-threads=posix \
-			--disable-samplemap \
-			${CONFIGURE_SHARED}
-CONFIGURE_ENV +=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+#USE_LIBTOOL =		Yes
+#CONFIGURE_ARGS =	--enable-threads=posix \
+#			--disable-samplemap \
+#			${CONFIGURE_SHARED}
+CONFIGURE_ARGS +=	-DCMAKE_BUILD_TYPE=Release \
+			-DEXTRA_INCLUDES=${LOCALBASE}/include \
+			-DEXTRA_LIBDIR=${LOCALBASE}/lib
 
-#NO_REGRESS =		Yes
+NO_REGRESS =		Yes
 
 #CFLAGS =		???
 #LDFLAGS =		???
 #MAKE_FILE =		???
 #PKG_ARCH =		???
-
-#ALL_TARGET =		???
-#INSTALL_TARGET =	???
-#REGRESS_TARGET =	???
 
 .include <bsd.port.mk>