===================================================================
RCS file: /cvs/ports/geo/gpsdrive/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ports/geo/gpsdrive/Makefile	2011/03/04 12:52:17	1.6
+++ ports/geo/gpsdrive/Makefile	2011/09/20 12:52:56	1.7
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.6 2011/03/04 12:52:17 yason Exp $
+# $OpenBSD: Makefile,v 1.7 2011/09/20 12:52:56 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,40 +16,32 @@
 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 gps gtk-x11-2.0 intl m pango-1.0
+WANTLIB += pthread sqlite3 xml2
 
 MASTER_SITES =		${HOMEPAGE}/packages/
 
-MODULES =		devel/cmake \
-			devel/gettext
+MODULES =		devel/cmake
 
 LIB_DEPENDS = 		databases/sqlite3 \
-			devel/atk \
-			devel/glib2 \
 			graphics/cairo \
-			graphics/glitz \
-			graphics/png \
 			misc/gpsd \
 			net/curl \
 			x11/gtk+2
-RUN_DEPENDS = 		sysutils/gamin,-server \
-			devel/desktop-file-utils
+RUN_DEPENDS = 		devel/desktop-file-utils
 
 SEPARATE_BUILD = 	concurrent
 USE_LIBTOOL =		Yes
 CONFIGURE_ARGS +=	-DCMAKE_BUILD_TYPE=Release -DWITH_GDA3=NO \
 			-DWITH_MAPNIK=NO -DWITH_POSTGIS=NO \
-			-DWITH_SPEECH=NO -DWITH_KISMET=NO
+			-DWITH_SPEECH=NO -DWITH_KISMET=NO \
+			-DWITH_FRIENDSD=YES -DLIBGPS_OLD=OFF
 
 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>