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

Bump PKGREVISION.

12 files changed, 40 insertions, 36 deletions

diff --git a/print/advi/Makefile b/print/advi/Makefile
index a7d1e1a516d..8ce2598cdb0 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2006/12/15 20:33:00 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2007/09/21 13:04:14 wiz Exp $
 
 DISTNAME=		advi-1.6.0
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		print
 MASTER_SITES=		ftp://ftp.inria.fr/INRIA/Projects/cristal/advi/
 EXTRACT_SUFX=		.tgz
@@ -60,7 +60,7 @@ post-install:
 .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/print/evince-nautilus/Makefile b/print/evince-nautilus/Makefile
index 08390db853c..77f61db83f7 100644
--- a/print/evince-nautilus/Makefile
+++ b/print/evince-nautilus/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2007/09/20 21:37:39 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/09/21 13:04:14 wiz Exp $
 #
 
 .include "../../print/evince/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/evince/evince-nautilus/}
-PKGREVISION=		3
+PKGREVISION=		4
 
 COMMENT=		File properties plugin for evince files
 PKG_OPTIONS_VAR=	PKG_OPTIONS.evince
diff --git a/print/evince/Makefile b/print/evince/Makefile
index 5a77c61b1c6..ecca66bc52f 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.34 2007/09/19 23:19:06 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2007/09/21 13:04:14 wiz Exp $
 #
 
 .include "../../print/evince/Makefile.common"
 
 COMMENT=		Document viewer for the GNOME Desktop
-PKGREVISION=		1
+PKGREVISION=		2
 
-GCONF2_SCHEMAS=		evince.schemas
-GCONF2_SCHEMAS+=	evince-thumbnailer.schemas
-GCONF2_SCHEMAS+=	evince-thumbnailer-ps.schemas
+GCONF_SCHEMAS=		evince.schemas
+GCONF_SCHEMAS+=	evince-thumbnailer.schemas
+GCONF_SCHEMAS+=	evince-thumbnailer-ps.schemas
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.evince
 PKG_SUPPORTED_OPTIONS=	dvi djvu
@@ -19,7 +19,7 @@ PKG_SUGGESTED_OPTIONS=	# none
 .if !empty(PKG_OPTIONS:Mdvi)
 CONFIGURE_ARGS+=	--enable-dvi
 PLIST_SUBST+=		DVI=	# empty
-GCONF2_SCHEMAS+=	evince-thumbnailer-dvi.schemas
+GCONF_SCHEMAS+=	evince-thumbnailer-dvi.schemas
 .include "../../mk/tex.buildlink3.mk"
 .else
 PLIST_SUBST+=		DVI="@comment "
@@ -28,7 +28,7 @@ PLIST_SUBST+=		DVI="@comment "
 .if !empty(PKG_OPTIONS:Mdjvu)
 CONFIGURE_ARGS+=	--enable-djvu
 PLIST_SUBST+=		DJVU=	#empty
-GCONF2_SCHEMAS+=	evince-thumbnailer-djvu.schemas
+GCONF_SCHEMAS+=	evince-thumbnailer-djvu.schemas
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
 .else
 PLIST_SUBST+=		DJVU="@comment "
@@ -36,7 +36,7 @@ PLIST_SUBST+=		DJVU="@comment "
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common
index 68c75320904..a06b2fb4b65 100644
--- a/print/evince/Makefile.common
+++ b/print/evince/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2007/09/19 23:13:26 wiz Exp $
+# $NetBSD: Makefile.common,v 1.17 2007/09/21 13:04:14 wiz Exp $
 #
 
 DISTNAME=		evince-0.8.3
@@ -32,7 +32,7 @@ BUILDLINK_API_DEPENDS.poppler-glib+=	poppler-glib>=0.5.3
 
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/print/glabels/Makefile b/print/glabels/Makefile
index 6e85cae7eb6..cdeadc2f553 100644
--- a/print/glabels/Makefile
+++ b/print/glabels/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2007/09/19 23:19:06 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2007/09/21 13:04:14 wiz Exp $
 #
 
 DISTNAME=		glabels-2.0.4
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=glabels/}
 
@@ -18,7 +18,7 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/print/kbibtex/Makefile b/print/kbibtex/Makefile
index d20cd01be08..49017ad5e24 100644
--- a/print/kbibtex/Makefile
+++ b/print/kbibtex/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2007/01/26 04:34:53 markd Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:04:14 wiz Exp $
 
 DISTNAME=		kbibtex-0.1.5
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		print kde
 MASTER_SITES=		http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 1edf9ec7996..de278c9582f 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2007/09/20 17:15:49 rillig Exp $
+# $NetBSD: Makefile,v 1.61 2007/09/21 13:04:14 wiz Exp $
 #
 
 DISTNAME=	libgnomeprint-2.18.2
+PKGREVISION=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprint/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -52,6 +53,6 @@ PRINT_PLIST_AWK+=	/cups/ { print "$${USE_CUPS}" $$0; next; }
 .include "../../devel/pango/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomeprint/buildlink3.mk b/print/libgnomeprint/buildlink3.mk
index 1400221b45b..0ed613f8bc7 100644
--- a/print/libgnomeprint/buildlink3.mk
+++ b/print/libgnomeprint/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2007/05/30 08:54:31 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/09/21 13:04:15 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEPRINT_BUILDLINK3_MK:=	${LIBGNOMEPRINT_BUILDLINK3_MK}+
@@ -24,7 +24,7 @@ BUILDLINK_PKGSRCDIR.libgnomeprint?=	../../print/libgnomeprint
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 
 pkgbase := libgnomeprint
 .include "../../mk/pkg-build-options.mk"
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 4d64356ccc9..f2ec29b636f 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2007/09/18 20:01:40 drochner Exp $
+# $NetBSD: Makefile,v 1.50 2007/09/21 13:04:15 wiz Exp $
 #
 
 DISTNAME=	libgnomeprintui-2.18.1
+PKGREVISION=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -22,12 +23,12 @@ PKGCONFIG_OVERRIDE=	libgnomeprintui/libgnomeprintui-2.2.pc.in
 BUILDLINK_API_DEPENDS.libgnomeprint+=	libgnomeprint>=2.12.1
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/print/libgnomeprintui/buildlink3.mk b/print/libgnomeprintui/buildlink3.mk
index 19ed22788b5..69cfa3e267a 100644
--- a/print/libgnomeprintui/buildlink3.mk
+++ b/print/libgnomeprintui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/09/21 13:04:15 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEPRINTUI_BUILDLINK3_MK:=	${LIBGNOMEPRINTUI_BUILDLINK3_MK}+
@@ -17,13 +17,13 @@ BUILDLINK_ABI_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.12.1nb3
 BUILDLINK_PKGSRCDIR.libgnomeprintui?=	../../print/libgnomeprintui
 .endif	# LIBGNOMEPRINTUI_BUILDLINK3_MK
 
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/print/ruby-gnome2-gnomeprint/Makefile b/print/ruby-gnome2-gnomeprint/Makefile
index df5fd233182..991fb4a83b0 100644
--- a/print/ruby-gnome2-gnomeprint/Makefile
+++ b/print/ruby-gnome2-gnomeprint/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/06/09 01:07:13 obache Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:15 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gnomeprint-${VERSION}
 COMMENT=		Ruby binding of libgnomeprint
+PKGREVISION=		1
 CATEGORIES=		print
 
 RUBY_EXTCONF_SUBDIRS=	gnomeprint
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 71bd95181da..f3d59287bb8 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2007/08/08 17:11:33 joerg Exp $
+# $NetBSD: Makefile,v 1.51 2007/09/21 13:04:16 wiz Exp $
 
 DISTNAME=		scribus-1.3.3.9
+PKGREVISION=		1
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scribus/}
 EXTRACT_SUFX=		.tar.bz2
@@ -32,8 +33,8 @@ CONFIGURE_ENV+=		ac_cv_prog_hacups=no
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libart2+= libart2>=2.3.19nb1
-.include "../../graphics/libart2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libart+= libart>=2.3.19nb1
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"