===================================================================
RCS file: /cvs/ports/geo/gpscorrelate/Makefile,v
retrieving revision 1.6
retrieving revision 1.9
diff -u -r1.6 -r1.9
--- ports/geo/gpscorrelate/Makefile	2010/05/27 21:39:26	1.6
+++ ports/geo/gpscorrelate/Makefile	2011/09/20 09:15:42	1.9
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.6 2010/05/27 20:39:26 yason Exp $
+# $OpenBSD: Makefile,v 1.9 2011/09/20 09:15:42 yason Exp $
 
-COMMENT =		GPS photo correlation
+COMMENT =		EXIF geotagging
 
 DISTNAME =		gpscorrelate-1.6.1
 
-CATEGORIES =		geo
+CATEGORIES =		geo x11
 
 HOMEPAGE =		http://www.freefoote.com/linux_gpscorr.html
 
-#MAINTAINER =		???
+MAINTAINER =		Kirill Bychkov <yason@linklevel.net>
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
@@ -16,34 +16,30 @@
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB = 		X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
-			Xi Xinerama Xrandr Xrender atk-1.0 c expat fontconfig freetype \
-			gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
-			m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \
-			pthread pthread-stubs stdc++ xcb  xcb-render \
-			xcb-render-util z
+WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 c cairo exiv2 expat fontconfig
+WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread pthread-stubs
+WANTLIB += stdc++ xcb xcb-render xcb-shm xml2 z
 
 MASTER_SITES =		http://www.freefoote.com/linux/
 
 MODULES =		devel/gettext \
 			textproc/intltool
 
-BUILD_DEPENDS =		::textproc/libxslt \
-			::converters/xmltoman \
-			::textproc/docbook \
-			::textproc/docbook-xsl
+BUILD_DEPENDS =		textproc/libxslt \
+			converters/xmltoman \
+			textproc/docbook \
+			textproc/docbook-xsl
 
-LIB_DEPENDS =		cairo::graphics/cairo \
-			exiv2::graphics/exiv2 \
-			gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \
-			gtk-x11-2.0::x11/gtk+2 \
-			glitz::graphics/glitz \
-			xml2::textproc/libxml
+LIB_DEPENDS =		graphics/cairo \
+			graphics/exiv2 \
+			x11/gtk+2 \
+			textproc/libxml
 
-RUN_DEPENDS = 		::devel/desktop-file-utils \
-			::sysutils/gamin,-server
+RUN_DEPENDS = 		devel/desktop-file-utils
 
-USE_X11 =		Yes
 USE_GMAKE =		Yes
 FAKE_FLAGS += 		mandir="${PREFIX}/man"