===================================================================
RCS file: /cvs/ports/geo/gpsdrive/Makefile,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -r1.5 -r1.8
--- ports/geo/gpsdrive/Makefile	2010/06/26 15:36:26	1.5
+++ ports/geo/gpsdrive/Makefile	2011/10/27 20:23:13	1.8
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.5 2010/06/26 14:36:26 yason Exp $
+# $OpenBSD: Makefile,v 1.8 2011/10/27 20:23:13 yason Exp $
 
 COMMENT =		car (bike, ship, plane) navigation system
 
 DISTNAME =		gpsdrive-2.11
 
-CATEGORIES =		geo
+CATEGORIES =		geo x11
 
 HOMEPAGE =		http://www.gpsdrive.de/
 
-#MAINTAINER =		???
+MAINTAINER =		Kirill Bychkov <yason@linklevel.net>
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
@@ -16,41 +16,34 @@
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB = 		X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
-			Xi Xinerama Xrandr Xrender c expat fontconfig freetype \
-			m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \
-			pthread pthread-stubs stdc++ xcb xcb-render \
-			xcb-render-util xml2 z
+WANTLIB += atk-1.0 c cairo curl freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += glib-2.0 gobject-2.0 gmodule-2.0 gps gtk-x11-2.0 intl m
+WANTLIB += pango-1.0 pthread speechd sqlite3 xml2
 
 MASTER_SITES =		${HOMEPAGE}/packages/
 
-MODULES =		devel/cmake \
-			devel/gettext
+MODULES =		devel/cmake
 
-LIB_DEPENDS = 		sqlite3::databases/sqlite3 \
-			atk-1.0::devel/atk \
-			gio-2.0,glib-2.0,gmodule-2.0::devel/glib2 \
-			gobject-2.0,gthread-2.0::devel/glib2 \
-			cairo::graphics/cairo \
-			glitz::graphics/glitz \
-			png::graphics/png \
-			gps::misc/gpsd \
-			curl::net/curl \
-			gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \
-			gtk-x11-2.0::x11/gtk+2
-RUN_DEPENDS = 		::sysutils/gamin,-server \
-			::devel/desktop-file-utils
+LIB_DEPENDS = 		audio/speech-dispatcher \
+			databases/sqlite3 \
+			graphics/cairo \
+			misc/gpsd \
+			net/curl \
+			x11/gtk+2
+RUN_DEPENDS = 		devel/desktop-file-utils
 
 SEPARATE_BUILD = 	concurrent
-USE_X11 =		Yes
-USE_LIBTOOL =		Yes
-CONFIGURE_ARGS +=	-DCMAKE_BUILD_TYPE=Release -DWITH_GDA3=NO -DWITH_MAPNIK=NO -DWITH_SPEECH=NO -DWITH_KISMET=NO
+#USE_LIBTOOL =		Yes
+CONFIGURE_ARGS +=	-DCMAKE_BUILD_TYPE=Release \
+			-DWITH_MAPNIK=NO -DWITH_POSTGIS=NO \
+			-DWITH_SPEECH=YES -DWITH_KISMET=NO \
+			-DWITH_FRIENDSD=YES -DLIBGPS_OLD=OFF \
+			-DWITH_NAVIGATION=YES
 
 NO_REGRESS =		Yes
 
 pre-configure:
-	perl -pi -e 's,/opt/gnome,${LOCALBASE},g' ${WRKSRC}/cmake/Modules/FindGTK2.cmake
-# XXX dirty hack
-	cp ${LOCALBASE}/share/cmake/Modules/FindGettext.cmake ${WRKSRC}/cmake/Modules/
+	rm ${WRKSRC}/cmake/Modules/FindGTK2.cmake
+	rm ${WRKSRC}/cmake/Modules/FindGettext.cmake
 
 .include <bsd.port.mk>