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

Bump PKGREVISION.

7 files changed, 25 insertions, 24 deletions

diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index cebce9eac7b..56e763a716b 100644
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/07/19 10:08:12 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:03:58 wiz Exp $
 #
 
 DISTNAME=		galculator-1.2.5.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=galculator/}
 
@@ -15,5 +15,5 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake msgfmt pkg-config intltool
 
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 11cfd1471a7..e2cb9a4dcf3 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2007/09/19 23:19:00 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2007/09/21 13:03:58 wiz Exp $
 #
 
 DISTNAME=		gcalctool-5.9.14
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gcalctool/5.9/}
 EXTRACT_SUFX=		.tar.bz2
@@ -19,11 +19,11 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		bison gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 
-GCONF2_SCHEMAS=		gcalctool.schemas
+GCONF_SCHEMAS=		gcalctool.schemas
 
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/math/genius/Makefile b/math/genius/Makefile
index 8d54d4e8d51..c6d5e868fe6 100644
--- a/math/genius/Makefile
+++ b/math/genius/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2007/09/19 23:19:00 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/21 13:03:58 wiz Exp $
 #
 
 DISTNAME=		genius-0.7.7
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		math
 MASTER_SITES=		http://ftp.5z.com/pub/genius/
 
@@ -24,7 +24,7 @@ do-test:
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../math/mpfr/buildlink3.mk"
diff --git a/math/gnumeric-current/Makefile b/math/gnumeric-current/Makefile
index 6507f46b5ea..efd0ec40656 100644
--- a/math/gnumeric-current/Makefile
+++ b/math/gnumeric-current/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/09/19 23:19:01 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:03:58 wiz Exp $
 #
 
 DISTNAME=		gnumeric-1.7.12
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.7/}
 EXTRACT_SUFX=		.tar.bz2
@@ -17,7 +17,7 @@ USE_TOOLS+=		gmake intltool msgfmt perl:run pkg-config
 USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
-GCONF2_SCHEMAS=		gnumeric-dialogs.schemas gnumeric-general.schemas \
+GCONF_SCHEMAS=		gnumeric-dialogs.schemas gnumeric-general.schemas \
 			gnumeric-plugins.schemas
 PKGCONFIG_OVERRIDE=	libspreadsheet-1.7.pc.in
 
@@ -33,12 +33,12 @@ PYTHON_VERSIONS_ACCEPTED=	24 23
 #.include "../../databases/libgnomedb/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgsf+=	libgsf>=1.14.2
 .include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../misc/goffice0.5/buildlink3.mk"
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 346faa68ca1..d77704e8e72 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.124 2007/09/19 23:19:00 wiz Exp $
+# $NetBSD: Makefile,v 1.125 2007/09/21 13:03:58 wiz Exp $
 #
 
 DISTNAME=		gnumeric-1.6.3
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.6/}
 EXTRACT_SUFX=		.tar.bz2
@@ -20,7 +20,7 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-python
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 PYTHON_VERSIONS_ACCEPTED=	24 23
-GCONF2_SCHEMAS=		gnumeric-dialogs.schemas gnumeric-general.schemas \
+GCONF_SCHEMAS=		gnumeric-dialogs.schemas gnumeric-general.schemas \
 			gnumeric-plugins.schemas
 
 # XXX: link test against libDynaLoader_pic.a fails; bug
@@ -31,14 +31,14 @@ PLIST_SUBST+=	PERL="@comment "
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 # guile is currently not supported in gnumeric
 #.include "../../lang/guile/buildlink3.mk"
diff --git a/math/qalculate-gtk/Makefile b/math/qalculate-gtk/Makefile
index 3fa5dbe0982..c6c01743134 100644
--- a/math/qalculate-gtk/Makefile
+++ b/math/qalculate-gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2007/09/19 23:19:01 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/09/21 13:03:59 wiz Exp $
 
 DISTNAME=	qalculate-gtk-0.9.5
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qalculate/}
 
@@ -20,7 +20,7 @@ GNU_CONFIGURE=		yes
 pre-configure:
 	cd ${WRKSRC}; autoconf
 
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../math/qalculate/buildlink3.mk"
 .include "../../textproc/scrollkeeper/buildlink3.mk"
diff --git a/math/qalculate-kde/Makefile b/math/qalculate-kde/Makefile
index e545af0d32b..1c81b091532 100644
--- a/math/qalculate-kde/Makefile
+++ b/math/qalculate-kde/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/02/20 15:08:48 adam Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:03:59 wiz Exp $
 
 DISTNAME=	qalculate-kde-0.9.5
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qalculate/}