===================================================================
RCS file: /cvs/ports/geo/navit/Makefile,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -r1.2 -r1.4
--- ports/geo/navit/Makefile	2009/09/16 22:43:00	1.2
+++ ports/geo/navit/Makefile	2009/12/11 19:31:48	1.4
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2009/09/16 21:43:00 yason Exp $
+# $OpenBSD: Makefile,v 1.4 2009/12/11 19:31:48 yason Exp $
 #ONLY_FOR_ARCHS =	???
 #NOT_FOR_ARCHS =	???
 #SHARED_ONLY =		???
 #COMES_WITH =		???
-#BROKEN =		reason
+#BROKEN =		GNU getline suxx
 
 COMMENT =		car navigation system with routing engine
 
@@ -23,18 +23,30 @@
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-#WANTLIB =		???
-
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=navit/}
 
+WANTLIB = 		GL GLU SDL X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
+			Xext Xfixes Xi Xinerama Xrandr Xrender c expat fontconfig \
+			freetype fribidi gio-2.0 glib-2.0 glitz gmodule-2.0 \
+			gobject-2.0 gthread-2.0 jpeg m pcre pixman-1 png pthread  \
+			pthread-stubs sndio tiff usbhid xcb z
+
 MODULES =		devel/gettext \
 			textproc/intltool
 BUILD_DEPENDS =		::x11/gnome/librsvg
-#RUN_DEPENDS =		???
-LIB_DEPENDS =		::graphics/freeglut \
-			::graphics/quesoglc \
-			::devel/sdl-image \
-			::misc/gpsd
+
+LIB_DEPENDS =		atk-1.0::devel/atk \
+			cairo::graphics/cairo \
+			dbus-1::x11/dbus \
+			dbus-glib-1::x11/dbus-glib \
+			gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \
+			gtk-x11-2.0::x11/gtk+2 \
+			pango-1.0,pangocairo-1.0::devel/pango \
+			pangoft2-1.0::devel/pango \
+			pq::databases/postgresql \
+			GLC::graphics/quesoglc \
+			SDL_image::devel/sdl-image \
+			gps::misc/gpsd
 #REGRESS_DEPENDS =	???
 
 #MAKE_FLAGS =		???
@@ -46,33 +58,11 @@
 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