Fix paths for GConf, libglade, libart, libsigc++, lablgtk moves.

Bump PKGREVISION.

63 files changed, 150 insertions, 134 deletions

diff --git a/graphics/3DKit/Makefile b/graphics/3DKit/Makefile
index 0c08b51d57a..d22cba4e02f 100644
--- a/graphics/3DKit/Makefile
+++ b/graphics/3DKit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/06/12 16:28:11 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:03:46 wiz Exp $
 #
 
 .include "../../graphics/3DKit/Makefile.common"
-PKGREVISION=	11
+PKGREVISION=	12
 
 DISTFILES=	DevManual.pdf
 
diff --git a/graphics/Cenon/Makefile b/graphics/Cenon/Makefile
index e77ec5418e1..0f785dc4021 100644
--- a/graphics/Cenon/Makefile
+++ b/graphics/Cenon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/07/22 05:10:54 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/21 13:03:46 wiz Exp $
 #
 
 DISTNAME=		Cenon-3.67
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		graphics cad gnustep
 MASTER_SITES=		http://www.vhf-group.com/vhfInterservice/download/source/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/graphics/GLXKit/Makefile b/graphics/GLXKit/Makefile
index ff64b1458e5..bba18fe4aad 100644
--- a/graphics/GLXKit/Makefile
+++ b/graphics/GLXKit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:03:46 wiz Exp $
 #
 
 .include "../../graphics/3DKit/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/3DKit/GLXKit/}
-PKGREVISION=	10
+PKGREVISION=	11
 
 COMMENT=	3DKit GLX backend
 
diff --git a/graphics/GeometryKit/Makefile b/graphics/GeometryKit/Makefile
index 7a8701516bb..bdcf5bae624 100644
--- a/graphics/GeometryKit/Makefile
+++ b/graphics/GeometryKit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2006/07/22 05:10:54 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:03:46 wiz Exp $
 #
 
 .include "../../graphics/3DKit/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/3DKit/GeometryKit/}
-PKGREVISION=	10
+PKGREVISION=	11
 
 COMMENT=	Objective-C class library for calculating 3D geometry
 
diff --git a/graphics/GlutKit/Makefile b/graphics/GlutKit/Makefile
index 413bffba355..9e2834322ee 100644
--- a/graphics/GlutKit/Makefile
+++ b/graphics/GlutKit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/09/21 13:03:46 wiz Exp $
 #
 
 .include "../../graphics/3DKit/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/3DKit/GlutKit/}
-PKGREVISION=	12
+PKGREVISION=	13
 
 COMMENT=	3DKit GLUT backend
 
diff --git a/graphics/ImageViewer/Makefile b/graphics/ImageViewer/Makefile
index dfc9532185e..b48d3258ef0 100644
--- a/graphics/ImageViewer/Makefile
+++ b/graphics/ImageViewer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2006/09/22 07:08:16 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2007/09/21 13:03:46 wiz Exp $
 
 DISTNAME=	ImageViewer-0.6.3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://www.nice.ch/~phip/
 
diff --git a/graphics/Makefile b/graphics/Makefile
index ac9d918fdc9..420fc4e3366 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.468 2007/09/20 21:36:55 wiz Exp $
+# $NetBSD: Makefile,v 1.469 2007/09/21 13:03:45 wiz Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -167,7 +167,7 @@ SUBDIR+=	kphotobook
 SUBDIR+=	kphotools
 SUBDIR+=	lcms
 SUBDIR+=	lib3ds
-SUBDIR+=	libart2
+SUBDIR+=	libart
 SUBDIR+=	libcaca
 SUBDIR+=	libexif
 SUBDIR+=	libexif-gtk
diff --git a/graphics/RenderKit/Makefile b/graphics/RenderKit/Makefile
index bed0397c27d..452db2a8765 100644
--- a/graphics/RenderKit/Makefile
+++ b/graphics/RenderKit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:03:46 wiz Exp $
 #
 
 .include "../../graphics/3DKit/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/3DKit/RenderKit/}
-PKGREVISION=	10
+PKGREVISION=	11
 
 COMMENT=	Objective-C API for core scene rendering
 
diff --git a/graphics/SDLKit/Makefile b/graphics/SDLKit/Makefile
index fa8417a0808..1976ab6cb28 100644
--- a/graphics/SDLKit/Makefile
+++ b/graphics/SDLKit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2006/06/12 16:28:11 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/09/21 13:03:47 wiz Exp $
 #
 
 .include "../../graphics/3DKit/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/3DKit/SDLKit/}
-PKGREVISION=	15
+PKGREVISION=	16
 
 COMMENT=	3DKit SDL backend
 
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index 4bafbd310f4..5f53ae36b78 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:34 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/21 13:03:47 wiz Exp $
 
 DISTNAME=		camlimages-2.2.0
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/
 EXTRACT_SUFX=		.tgz
@@ -40,7 +40,7 @@ PLIST_SUBST+=	COND_DLL="@comment "
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/lablgtk/buildlink3.mk"
+.include "../../x11/lablgtk1/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/ocaml-graphics/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile
index b4d35ed43f0..011ae25a5f4 100644
--- a/graphics/comix/Makefile
+++ b/graphics/comix/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/06/01 00:45:49 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:03:47 wiz Exp $
 #
 
 DISTNAME=		comix-3.6.4
+PKGREVISION=		1
 CATEGORIES=		graphics python
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=comix/}
 
@@ -28,7 +29,7 @@ do-install:
 	cd ${WRKSRC} && ${PYTHONBIN} install.py install --installdir ${PREFIX}
 
 .include "../../databases/shared-mime-info/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/py-imaging/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/graphics/dia-python/Makefile b/graphics/dia-python/Makefile
index cd3bc82055c..cd543d4e65a 100644
--- a/graphics/dia-python/Makefile
+++ b/graphics/dia-python/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2006/05/02 16:23:30 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:03:48 wiz Exp $
 #
 
 DIA_SUBPKG=		-python
 .include "../../graphics/dia/Makefile.common"
+PKGREVISION=		1
 
 COMMENT+=		(Python plugin)
 
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 52fe341dc86..3b1934b118f 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2007/09/19 23:18:53 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2007/09/21 13:03:48 wiz Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=	1
+PKGREVISION=	2
 USE_DIRS+=	xdg-1.1
 
 .include "options.mk"
diff --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common
index dbbea6850a1..e6e5bcdb688 100644
--- a/graphics/dia/Makefile.common
+++ b/graphics/dia/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2007/04/19 20:14:58 drochner Exp $
+# $NetBSD: Makefile.common,v 1.18 2007/09/21 13:03:48 wiz Exp $
 #
 
 DISTNAME=	dia-0.96.1
@@ -37,7 +37,7 @@ BUILDLINK_DEPMETHOD.glib2+=		build
 BUILDLINK_DEPMETHOD.pango+=		build
 BUILDLINK_DEPMETHOD.pkgconfig+=		build
 BUILDLINK_DEPMETHOD.freetype2+=		build
-BUILDLINK_DEPMETHOD.libart2+=		build
+BUILDLINK_DEPMETHOD.libart+=		build
 BUILDLINK_DEPMETHOD.libxml2+=		build
 BUILDLINK_DEPMETHOD.libxslt+=		build
 BUILDLINK_DEPMETHOD.scrollkeeper+=	build
@@ -48,7 +48,7 @@ BUILDLINK_DEPMETHOD.gtk2+=		build
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
diff --git a/graphics/digikam-doc/Makefile b/graphics/digikam-doc/Makefile
index 379b159a565..c3df3673f9f 100644
--- a/graphics/digikam-doc/Makefile
+++ b/graphics/digikam-doc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/06/03 00:50:11 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:03:48 wiz Exp $
 
 DISTNAME=		digikam-doc-0.9.1
+PKGREVISION=		1
 CATEGORIES=		graphics kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=digikam/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index db9c5c3e095..f5d2e1fba7f 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2007/07/08 08:47:26 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2007/09/21 13:03:48 wiz Exp $
 
 DISTNAME=		digikam-0.9.2
+PKGREVISION=		1
 CATEGORIES=		graphics kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=digikam/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index f6c31a43706..f124f2b0d35 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2007/09/20 22:38:22 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2007/09/21 13:03:48 wiz Exp $
 #
 
 DISTNAME=	eog-2.18.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -16,25 +16,25 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 
-GCONF2_SCHEMAS=	eog.schemas
+GCONF_SCHEMAS=	eog.schemas
 
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
-BUILDLINK_API_DEPENDS.libart2+=	libart2>=2.3.16
+BUILDLINK_API_DEPENDS.libart+=	libart>=2.3.16
 BUILDLINK_API_DEPENDS.libexif+=	libexif>=0.6.12
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/eel/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 745c57960b3..275e758fd3c 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2007/09/20 21:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2007/09/21 13:03:49 wiz Exp $
 
 DISTNAME=	gimageview-0.2.27
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmmviewer/}
 
diff --git a/graphics/gimp-color-manager/Makefile b/graphics/gimp-color-manager/Makefile
index f8c1e466dc5..82308d08b0b 100644
--- a/graphics/gimp-color-manager/Makefile
+++ b/graphics/gimp-color-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2007/09/20 21:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:03:49 wiz Exp $
 #
 
 DISTNAME=		gimp-color-manager-0.1.0
-PKGREVISION=		11
+PKGREVISION=		12
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://www.virtual-sub.org/
 
diff --git a/graphics/gimp-fix-ca/Makefile b/graphics/gimp-fix-ca/Makefile
index 44003fe40b6..6d5f723d6a8 100644
--- a/graphics/gimp-fix-ca/Makefile
+++ b/graphics/gimp-fix-ca/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/09/20 21:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:49 wiz Exp $
 #
 
 DISTNAME=		gimp-fix-ca-2.1.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		graphics
 MASTER_SITES=		http://registry.gimp.org/file/fix-ca.c?action=download&id=8944&file=
 EXTRACT_SUFX=		.c
diff --git a/graphics/gimp-rawphoto/Makefile b/graphics/gimp-rawphoto/Makefile
index 115277c3fac..939aa58dbfc 100644
--- a/graphics/gimp-rawphoto/Makefile
+++ b/graphics/gimp-rawphoto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2007/09/20 21:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/21 13:03:49 wiz Exp $
 #
 
 DISTNAME=		rawphoto-200410220928
 PKGNAME=		gimp-rawphoto-1.19
-PKGREVISION=		11
+PKGREVISION=		12
 CATEGORIES=		graphics
 MASTER_SITES=		#
 EXTRACT_SUFX=		.tgz
diff --git a/graphics/gimp-refocus-it/Makefile b/graphics/gimp-refocus-it/Makefile
index b27d6e99c99..d32707b3bc1 100644
--- a/graphics/gimp-refocus-it/Makefile
+++ b/graphics/gimp-refocus-it/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2007/09/20 21:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/21 13:03:49 wiz Exp $
 #
 
 DISTNAME=		refocus-it-2.0.0
 PKGNAME=		gimp-refocus-it-2.0.0
-PKGREVISION=		11
+PKGREVISION=		12
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=refocus-it/}
 
diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile
index 36103426eb5..e2ef3002a55 100644
--- a/graphics/gimp-ufraw/Makefile
+++ b/graphics/gimp-ufraw/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2007/09/20 21:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2007/09/21 13:03:49 wiz Exp $
 
 DISTNAME=		ufraw-0.12.1
 PKGNAME=		gimp-${DISTNAME}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ufraw/}
 
@@ -19,7 +19,7 @@ USE_LANGUAGES=		c c++
 
 CONFIGURE_ARGS+=	--enable-mime
 
-GCONF2_SCHEMAS=		ufraw.schemas
+GCONF_SCHEMAS=		ufraw.schemas
 
 PTHREAD_AUTO_VARS=	yes
 
@@ -28,7 +28,7 @@ GCC_REQD+=		3.0
 BUILDLINK_TRANSFORM+=	rm:-std=gnu99
 
 .include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/gimp/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 4aca8773109..62ca77fc869 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.160 2007/09/20 21:37:35 wiz Exp $
+# $NetBSD: Makefile,v 1.161 2007/09/21 13:03:49 wiz Exp $
 
 DISTNAME=	gimp-2.2.17
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.2/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/v2.2/ \
@@ -60,7 +60,7 @@ PLIST_SUBST+=		TWAIN="@comment "
 .include "../../graphics/aalib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
diff --git a/graphics/gimp/buildlink3.mk b/graphics/gimp/buildlink3.mk
index 1d57caf72b2..30ee27caba7 100644
--- a/graphics/gimp/buildlink3.mk
+++ b/graphics/gimp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/09/20 21:37:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2007/09/21 13:03:49 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIMP_BUILDLINK3_MK:=	${GIMP_BUILDLINK3_MK}+
@@ -22,7 +22,7 @@ BUILDLINK_PKGSRCDIR.gimp?=	../../graphics/gimp
 .include "../../graphics/aalib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
diff --git a/graphics/gimp2-wideangle/Makefile b/graphics/gimp2-wideangle/Makefile
index 23f6acb3d71..0e61c8787da 100644
--- a/graphics/gimp2-wideangle/Makefile
+++ b/graphics/gimp2-wideangle/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2007/09/20 21:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/21 13:03:50 wiz Exp $
 #
 
 DISTNAME=	wideangle
 PKGNAME=	gimp2-wideangle-1.0
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	graphics
 MASTER_SITES=	http://members.ozemail.com.au/~hodsond/
 EXTRACT_SUFX=	.c
diff --git a/graphics/gimp24/Makefile b/graphics/gimp24/Makefile
index 6542196a788..4b731ba32d0 100644
--- a/graphics/gimp24/Makefile
+++ b/graphics/gimp24/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2007/09/20 21:37:35 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2007/09/21 13:03:50 wiz Exp $
 
 DISTNAME=	gimp-2.3.19
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.3/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/v2.3/ \
@@ -65,7 +65,7 @@ PLIST_SUBST+=	TWAIN="@comment "
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
diff --git a/graphics/gimp24/buildlink3.mk b/graphics/gimp24/buildlink3.mk
index 775cc83208e..d986a4138ed 100644
--- a/graphics/gimp24/buildlink3.mk
+++ b/graphics/gimp24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/09/20 21:37:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/09/21 13:03:50 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIMP_BUILDLINK3_MK:=	${GIMP_BUILDLINK3_MK}+
@@ -21,7 +21,7 @@ BUILDLINK_PKGSRCDIR.gimp?=	../../graphics/gimp24
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/aalib/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 9e7c8c04961..20d17916979 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2007/09/19 23:13:19 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2007/09/21 13:03:50 wiz Exp $
 
 DISTNAME=		gthumb-2.10.6
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gthumb/2.10/}
 
@@ -15,15 +15,15 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-GCONF2_SCHEMAS+=	gthumb.schemas
-BUILDLINK_API_DEPENDS.libglade2+=   libglade2>=2.4.0
+GCONF_SCHEMAS+=	gthumb.schemas
+BUILDLINK_API_DEPENDS.libglade+=   libglade>=2.4.0
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
diff --git a/graphics/gwenview-i18n/Makefile b/graphics/gwenview-i18n/Makefile
index 95e9292e636..68c98f0f0c8 100644
--- a/graphics/gwenview-i18n/Makefile
+++ b/graphics/gwenview-i18n/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/01/17 23:47:20 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:50 wiz Exp $
 #
 
 DISTNAME=	gwenview-i18n-1.4.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	kde graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gwenview/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index ea490fadd59..2e02c421177 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2007/04/01 14:20:16 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2007/09/21 13:03:50 wiz Exp $
 #
 
 DISTNAME=	gwenview-1.4.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	kde graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gwenview/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index c6f3bd8941f..b2befdbc89c 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2007/09/19 23:13:20 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2007/09/21 13:03:50 wiz Exp $
 
 DISTNAME=	inkscape-0.45.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=inkscape/}
 
@@ -36,7 +36,7 @@ UNLIMIT_RESOURCES=	datasize
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile
index 6676ab8b247..42ecaa24c0b 100644
--- a/graphics/kbarcode/Makefile
+++ b/graphics/kbarcode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2007/01/26 04:13:34 markd Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/21 13:03:50 wiz Exp $
 
 DISTNAME=		kbarcode-2.0.5
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		graphics kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kbarcode/}
 
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 658b6e2dbf8..f31ec21fb79 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2007/08/12 21:06:49 markd Exp $
+# $NetBSD: Makefile,v 1.73 2007/09/21 13:03:50 wiz Exp $
 
 DISTNAME=	kdegraphics-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 COMMENT=	Graphics programs for the KDE integrated X11 desktop
 
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index adca7f187ea..4175975638c 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2007/07/08 10:04:44 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2007/09/21 13:03:51 wiz Exp $
 
 DISTNAME=	kipi-plugins-0.1.4
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kipi/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/koverartist/Makefile b/graphics/koverartist/Makefile
index a95dac4ca01..e598ac1bae2 100644
--- a/graphics/koverartist/Makefile
+++ b/graphics/koverartist/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/06/06 11:23:09 markd Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/21 13:03:51 wiz Exp $
 
 DISTNAME=		koverartist-0.5
+PKGREVISION=		1
 CATEGORIES=		graphics kde
 MASTER_SITES=		http://www.kde-apps.org/content/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile
index b13078cbb13..8a6a9e22a88 100644
--- a/graphics/kphotoalbum/Makefile
+++ b/graphics/kphotoalbum/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2007/07/17 19:32:42 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:03:51 wiz Exp $
 #
 
 DISTNAME=		kphotoalbum-3.0.1
+PKGREVISION=		1
 CATEGORIES=		graphics
 MASTER_SITES=		http://ktown.kde.org/kphotoalbum/download/
 
diff --git a/graphics/kphotobook/Makefile b/graphics/kphotobook/Makefile
index 8da00a390fe..ece8c0b4f1f 100644
--- a/graphics/kphotobook/Makefile
+++ b/graphics/kphotobook/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2007/06/16 11:26:00 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:03:51 wiz Exp $
 #
 
 DISTNAME=	kphotobook-0.0.6
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	kde graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kphotobook/}
 
diff --git a/graphics/kphotools/Makefile b/graphics/kphotools/Makefile
index c62bba537ef..4ed81cc5a08 100644
--- a/graphics/kphotools/Makefile
+++ b/graphics/kphotools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2007/01/26 04:13:34 markd Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:03:51 wiz Exp $
 #
 
 DISTNAME=	kphotools-0.2.1
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	kde graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kphotools/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 794074c0c68..7c04f0d3bae 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2006/11/13 21:31:26 drochner Exp $
+# $NetBSD: Makefile,v 1.45 2007/09/21 13:03:51 wiz Exp $
 #
 
 DISTNAME=		libgnomecanvas-2.14.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		graphics gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomecanvas/2.14/}
 EXTRACT_SUFX=		.tar.bz2
@@ -21,8 +21,8 @@ USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE=	libgnomecanvas/libgnomecanvas-2.0.pc.in
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgnomecanvas/buildlink3.mk b/graphics/libgnomecanvas/buildlink3.mk
index d9846656f20..76ba80835f4 100644
--- a/graphics/libgnomecanvas/buildlink3.mk
+++ b/graphics/libgnomecanvas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/09/21 13:03:51 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMECANVAS_BUILDLINK3_MK:=	${LIBGNOMECANVAS_BUILDLINK3_MK}+
@@ -18,8 +18,8 @@ BUILDLINK_PKGSRCDIR.libgnomecanvas?=	../../graphics/libgnomecanvas
 .endif	# LIBGNOMECANVAS_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile
index d8a5d034741..38feb908657 100644
--- a/graphics/libgnomecanvasmm/Makefile
+++ b/graphics/libgnomecanvasmm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/09/24 16:49:19 adam Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:03:51 wiz Exp $
 
 DISTNAME=	libgnomecanvasmm-2.16.0
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomecanvasmm/2.16/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile
index 131eba3faff..b3550be3542 100644
--- a/graphics/libkdcraw/Makefile
+++ b/graphics/libkdcraw/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/07/08 08:13:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:03:52 wiz Exp $
 #
 
 DISTNAME=	libkdcraw-0.1.1
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kipi/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile
index 807569bde6e..d0f51c12f09 100644
--- a/graphics/libkexif/Makefile
+++ b/graphics/libkexif/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2007/01/27 21:12:16 markd Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/21 13:03:52 wiz Exp $
 
 DISTNAME=	libkexif-0.2.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kipi/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
index b618a703a14..afa074150eb 100644
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2007/07/08 06:46:06 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/09/21 13:03:52 wiz Exp $
 #
 
 DISTNAME=	libkexiv2-0.1.5
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kipi/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
index 1212832575f..0f8b61d874e 100644
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2007/01/27 21:09:05 markd Exp $
+# $NetBSD: Makefile,v 1.21 2007/09/21 13:03:52 wiz Exp $
 
 DISTNAME=	libkipi-0.1.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kipi/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index 953e103eb0d..73731c77357 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2007/09/20 21:36:56 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2007/09/21 13:03:52 wiz Exp $
 
 DISTNAME=	librsvg-2.18.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/librsvg/2.18/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/libscigraphica/Makefile b/graphics/libscigraphica/Makefile
index a13df2f4637..da9e58b3bca 100644
--- a/graphics/libscigraphica/Makefile
+++ b/graphics/libscigraphica/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/07/27 09:03:28 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/21 13:03:52 wiz Exp $
 #
 
 DISTNAME=	libscigraphica-2.1.1
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scigraphica/}
 
@@ -21,7 +22,7 @@ pre-configure:
 
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numarray/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk2+extra/buildlink3.mk"
diff --git a/graphics/libscigraphica/buildlink3.mk b/graphics/libscigraphica/buildlink3.mk
index 08caad2eec9..905380ded2d 100644
--- a/graphics/libscigraphica/buildlink3.mk
+++ b/graphics/libscigraphica/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2007/09/21 13:03:52 wiz Exp $
 #
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
@@ -17,7 +17,7 @@ BUILDLINK_API_DEPENDS.libscigraphica+=	libscigraphica>=2.1.1
 BUILDLINK_PKGSRCDIR.libscigraphica?=	../../graphics/libscigraphica
 .endif	# LIBSCIGRAPHICA_BUILDLINK3_MK
 
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../math/py-numarray/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2+extra/buildlink3.mk"
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
index 19e02c9a8a5..1b25d9c50bb 100644
--- a/graphics/pixieplus/Makefile
+++ b/graphics/pixieplus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2007/01/26 04:13:34 markd Exp $
+# $NetBSD: Makefile,v 1.28 2007/09/21 13:03:52 wiz Exp $
 #
 
 DISTNAME=	pixieplus-0.5.4
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	graphics
 MASTER_SITES=	http://people.fruitsalad.org/avleeuwen/distfiles/pixieplus/ \
 		http://www.mosfet.org/pixie/
diff --git a/graphics/py-gtkglext/Makefile b/graphics/py-gtkglext/Makefile
index d27e15c4167..b109e51a3d9 100644
--- a/graphics/py-gtkglext/Makefile
+++ b/graphics/py-gtkglext/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/07/20 11:22:23 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:03:53 wiz Exp $
 #
 
 DISTNAME=	pygtkglext-1.1.0
 PKGNAME=	${PYPKGPREFIX}-pygtkglext-1.1.0
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkglext/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/py-matplotlib-gtk2/Makefile b/graphics/py-matplotlib-gtk2/Makefile
index 0d94df1fb6e..3a761fe97ba 100644
--- a/graphics/py-matplotlib-gtk2/Makefile
+++ b/graphics/py-matplotlib-gtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2006/06/11 22:58:12 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:54 wiz Exp $
 #
 
 DISTNAME=		matplotlib-0.87.2
 PKGNAME=		${PYPKGPREFIX}-matplotlib-gtk-0.87.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		graphics python
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=matplotlib/}
 
diff --git a/graphics/ruby-gnome2-gnomecanvas/Makefile b/graphics/ruby-gnome2-gnomecanvas/Makefile
index f40ebc182d3..4206e144a6e 100644
--- a/graphics/ruby-gnome2-gnomecanvas/Makefile
+++ b/graphics/ruby-gnome2-gnomecanvas/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2007/01/29 06:42:34 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:03:54 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gnomecanvas-${VERSION}
 COMMENT=		Ruby binding of GnomeCanvas-2.x
+PKGREVISION=		1
 CATEGORIES=		graphics gnome
 
 CONFLICTS+=		ruby-gnome2-gnomecanvas-[0-9]*
diff --git a/graphics/ruby-gnome2-libart/Makefile b/graphics/ruby-gnome2-libart/Makefile
index 3fa9fdf173b..bf6a671d232 100644
--- a/graphics/ruby-gnome2-libart/Makefile
+++ b/graphics/ruby-gnome2-libart/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2007/01/29 06:42:34 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2007/09/21 13:03:54 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-libart-${VERSION}
 COMMENT=		Ruby binding of Libart_lgpl
+PKGREVISION=		1
 CATEGORIES=		graphics
 
 CONFLICTS+=		ruby-gnome2-libart-[0-9]*
@@ -14,5 +15,5 @@ USE_TOOLS+=		pkg-config
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/graphics/ruby-gnome2-rsvg/Makefile b/graphics/ruby-gnome2-rsvg/Makefile
index c44f841eb5e..347774e5a6e 100644
--- a/graphics/ruby-gnome2-rsvg/Makefile
+++ b/graphics/ruby-gnome2-rsvg/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2007/09/20 21:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/09/21 13:03:54 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-rsvg-${VERSION}
 COMMENT=		Ruby binding of librsvg
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		graphics
 
 RUBY_EXTCONF_SUBDIRS=	rsvg
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index a3f670ff048..574cbcfbb1f 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.35 2007/09/20 21:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2007/09/21 13:03:54 wiz Exp $
 
 .include "../../graphics/sane-backends/Makefile.common"
 
 DISTNAME=	sane-frontends-${SANE_VERSION}
 SANE_MICRO=	14
-PGKREVISION=	4
+PGKREVISION=	5
 
 COMMENT=	Frontends for access to scanners, digitals camera, frame grabbers etc
 
diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index 737082eb655..acb9d1dae51 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2006/09/16 21:52:57 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2007/09/21 13:03:55 wiz Exp $
 #
 
 DISTNAME=	scigraphica-2.1.0
+PKGREVISION=	1
 CATEGORIES=	graphics math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scigraphica/}
 
diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile
index 65b70ee2822..8eed4d3832d 100644
--- a/graphics/showimg/Makefile
+++ b/graphics/showimg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2007/01/26 04:13:34 markd Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/21 13:03:55 wiz Exp $
 #
 
 DISTNAME=	showimg-0.9.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	kde graphics x11
 MASTER_SITES=	http://www.jalix.org/projects/showimg/download/0.9.5/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index cac48d7fa86..971dc874bed 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2006/07/11 10:21:16 hira Exp $
+# $NetBSD: Makefile,v 1.37 2007/09/21 13:03:55 wiz Exp $
 #
 
 DISTNAME=	sodipodi-0.34
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sodipodi/}
 
@@ -28,7 +28,7 @@ LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index f820f4d3418..e151ffc615d 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2007/09/20 21:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2007/09/21 13:03:55 wiz Exp $
 #
 
 DISTNAME=	tuxpaint-0.9.17
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tuxpaint/} \
 		ftp://ftp.sonic.net/pub/users/nbs/unix/x/tuxpaint/source/
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index a1363b4a162..e6c70e7220d 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2007/07/14 18:32:29 heinz Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:03:55 wiz Exp $
 #
 
 DISTNAME=	wxsvg-1.0b6
 PKGNAME=	${DISTNAME:S/b/beta/}
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wxsvg/}
 
@@ -18,6 +19,6 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
 
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../x11/wxGTK/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/wxsvg/buildlink3.mk b/graphics/wxsvg/buildlink3.mk
index 00e236e33a1..5ef5bdf2eaf 100644
--- a/graphics/wxsvg/buildlink3.mk
+++ b/graphics/wxsvg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2007/09/21 13:03:55 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WXSVG_BUILDLINK3_MK:=	${WXSVG_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.wxsvg?=	../../graphics/wxsvg
 .endif	# WXSVG_BUILDLINK3_MK
 
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../x11/wxGTK/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index a6ef2ce0b36..a1e6da6349e 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2007/09/20 21:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2007/09/21 13:03:55 wiz Exp $
 
 DISTNAME=	xsane-0.994
 PKGNAME=	xsane-0.99.4
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.xsane.org/download/ \
 		http://gd.tuwien.ac.at/hci/sane/xsane/ \