===================================================================
RCS file: /cvs/ports/geo/viking/Attic/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ports/geo/viking/Attic/Makefile	2010/04/18 15:11:06	1.6
+++ ports/geo/viking/Attic/Makefile	2010/05/27 21:45:23	1.7
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/04/18 14:11:06 yason Exp $
+# $OpenBSD: Makefile,v 1.7 2010/05/27 20:45:23 yason Exp $
 #BROKEN =		reason
 
 COMMENT =		GPS data management
@@ -17,27 +17,24 @@
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB =		X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
-			Xi Xinerama Xrandr Xrender c crypto expat fontconfig \
-			freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \
-			gthread-2.0 iconv idn intl m pixman-1 png pthread \
-			pthread-stubs ssl xcb xcb-render xcb-render-util z
-
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=viking/}
 
+WANTLIB += 		X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += 		Xi Xinerama Xrandr Xrender atk-1.0 c crypto expat fontconfig
+WANTLIB += 		freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
+WANTLIB += 		gthread-2.0 idn m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += 		pixman-1 png pthread pthread-stubs ssl xcb xcb-render
+WANTLIB += 		xcb-render-util z
+
 MODULES = 		devel/gettext \
 			textproc/intltool
 RUN_DEPENDS =		::sysutils/gamin,-server \
 			::devel/desktop-file-utils
-LIB_DEPENDS =		atk-1.0::devel/atk \
-			cairo.>=9::graphics/cairo \
+LIB_DEPENDS =		cairo.>=9::graphics/cairo \
 			curl.>=13::net/curl \
-			gdk-x11-2.0.>=1400::x11/gtk+2 \
-			gdk_pixbuf-2.0.>=1400::x11/gtk+2 \
+			gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \
 			gps.>=18::misc/gpsd \
-			gtk-x11-2.0.>=1400::x11/gtk+2 \
-			pango-1.0.>=1800,pangoft2-1.0.>=1800::devel/pango \
-			pangocairo-1.0.>=1800::devel/pango
+			gtk-x11-2.0::x11/gtk+2
 
 USE_X11 =		Yes
 USE_GMAKE =		Yes