===================================================================
RCS file: /cvs/ports/geo/navit/Makefile,v
retrieving revision 1.2
retrieving revision 1.6
diff -u -r1.2 -r1.6
--- ports/geo/navit/Makefile	2009/09/16 22:43:00	1.2
+++ ports/geo/navit/Makefile	2011/10/26 19:05:02	1.6
@@ -1,13 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2009/09/16 21:43:00 yason Exp $
-#ONLY_FOR_ARCHS =	???
-#NOT_FOR_ARCHS =	???
-#SHARED_ONLY =		???
-#COMES_WITH =		???
-#BROKEN =		reason
+# $OpenBSD: Makefile,v 1.6 2011/10/26 19:05:02 yason Exp $
+#BROKEN =		GNU getline suxx (undefined reference to `getline')
 
 COMMENT =		car navigation system with routing engine
 
-DISTNAME =		navit-0.1.1
+DISTNAME =		navit-0.2.0
 
 #SHARED_LIBS =		???
 
@@ -23,66 +19,50 @@
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-#WANTLIB =		???
-
 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 \
 			textproc/intltool
-BUILD_DEPENDS =		::x11/gnome/librsvg
-#RUN_DEPENDS =		???
-LIB_DEPENDS =		::graphics/freeglut \
-			::graphics/quesoglc \
-			::devel/sdl-image \
-			::misc/gpsd
-#REGRESS_DEPENDS =	???
+BUILD_DEPENDS =		x11/gnome/librsvg
 
+LIB_DEPENDS =		databases/postgresql \
+			devel/fribidi \
+			devel/sdl-image \
+			graphics/cairo \
+			graphics/quesoglc \
+			misc/gpsd,-main \
+			x11/dbus \
+			x11/dbus-glib \
+			x11/gtk+2
+
 #MAKE_FLAGS =		???
 #MAKE_ENV =		???
 #FAKE_FLAGS =		???
 #REGRESS_FLAGS =	???
 
-USE_X11 =		Yes
 USE_GMAKE =		Yes
 USE_LIBTOOL =		Yes
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS +=	--enable-threads=posix \
+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"
 
-#FLAVORS =	1 2 3 a b
-#FLAVOR ?=
-# grab multiple choice value
-#CHOICE = ${FLAVOR:L:Na:Nb}
-# check that CHOICE is 1 OR 2 OR 3, or error out
-#.if ${CHOICE} == "1"
-# code for 1
-#.elif ${CHOICE} == "2"
-# code for 2
-#.elif ${CHOICE} == "3"
-# code for 3
-#.else
-#ERRORS += "Fatal: Conflicting flavor: ${FLAVOR}"
-#.endif
-# check for switches
-#.if ${FLAVOR:L:Ma}
-# code for a
-#.endif
-#.if ${FLAVOR:L:Mb}
-# code for b
-#.endif
+NO_REGRESS =		Yes
 
-#NO_REGRESS =		Yes
-
 #CFLAGS =		???
 #LDFLAGS =		???
 #MAKE_FILE =		???
 #PKG_ARCH =		???
-
-#ALL_TARGET =		???
-#INSTALL_TARGET =	???
-#REGRESS_TARGET =	???
 
 .include <bsd.port.mk>