Adapt eel dependencies; bump PKGREVISION.

17 files changed, 40 insertions, 39 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index c55ff0a6faf..13a62f664b5 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.73 2007/09/19 23:13:12 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2007/09/20 21:21:36 wiz Exp $
 #
 
 DISTNAME=	file-roller-2.18.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.18/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 769bdb89bd7..bfb02d56f0a 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2007/09/19 23:13:12 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2007/09/20 21:21:36 wiz Exp $
 #
 
 DISTNAME=	rhythmbox-0.9.8
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/rhythmbox/0.9/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 8f0a5e10c9b..de1b63fe6eb 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2007/09/19 23:46:05 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/20 21:21:37 wiz Exp $
 #
 
 DISTNAME=		sound-juicer-2.14.5
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		audio
 MASTER_SITES=		http://www.burtonini.com/computing/
 
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index 38fd26ae201..af6c144e079 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2007/09/19 23:18:48 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2007/09/20 21:21:37 wiz Exp $
 #
 
 DISTNAME=	mlview-0.7.0
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/mlview/0.7/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,7 +21,7 @@ GCONF2_SCHEMAS=		mlview.schemas
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/eel2/buildlink3.mk"
+.include "../../devel/eel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 208aa7197c9..a76d65b8749 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2007/09/20 20:48:54 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/20 21:21:37 wiz Exp $
 #
 
 DISTNAME=	eog-2.18.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/2.18/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index a570f14f3f6..6f2624a0eb0 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2007/09/19 23:13:22 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2007/09/20 21:21:37 wiz Exp $
 #
 
 DISTNAME=	mail-notification-4.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://savannah.nongnu.org/download/mailnotify/
 
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=	--disable-sasl
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
-.include "../../devel/eel2/buildlink3.mk"
+.include "../../devel/eel/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile
index 5271baa5d70..8a8a3879e9f 100644
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2007/09/19 23:46:06 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/20 21:21:38 wiz Exp $
 
 DISTNAME=		gnome-media-2.18.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		multimedia gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.18/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index 8b7785bf74c..3e91e7a9431 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.32 2007/09/19 23:13:26 wiz Exp $
+# $NetBSD: Makefile.common,v 1.33 2007/09/20 21:21:38 wiz Exp $
 #
 
 DISTNAME=	totem-2.18.2
+PKGREVISION=	1
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/2.18/}
 
diff --git a/print/evince-nautilus/Makefile b/print/evince-nautilus/Makefile
index 5c05351f20a..d0a5a924468 100644
--- a/print/evince-nautilus/Makefile
+++ b/print/evince-nautilus/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2007/09/19 23:19:06 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/20 21:21:38 wiz Exp $
 #
 
 .include "../../print/evince/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/evince/evince-nautilus/}
-PKGREVISION=		1
+PKGREVISION=		2
 
 COMMENT=		File properties plugin for evince files
 PKG_OPTIONS_VAR=	PKG_OPTIONS.evince
diff --git a/security/seahorse-nautilus/Makefile b/security/seahorse-nautilus/Makefile
index 94ab02f7eb0..fdd8e898e8e 100644
--- a/security/seahorse-nautilus/Makefile
+++ b/security/seahorse-nautilus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2007/09/19 23:13:27 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/20 21:21:38 wiz Exp $
 
 DISTNAME=	seahorse-1.0.1
 PKGNAME=	seahorse-nautilus-1.0.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/1.0/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index bb89b6a39c1..e25136e3ed2 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2007/09/19 23:13:31 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2007/09/20 21:21:36 wiz Exp $
 #
 
 DISTNAME=	nautilus-cd-burner-2.14.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/nautilus-cd-burner/2.14/}
 EXTRACT_SUFX=	.tar.bz2
@@ -38,12 +38,12 @@ CONF_FILES=		${EGDIR}/mapping-modules.conf \
 
 GCONF2_SCHEMAS=		ncb.schemas
 
-BUILDLINK_API_DEPENDS.eel2+=	eel2>=2.13.3
+BUILDLINK_API_DEPENDS.eel+=	eel>=2.13.3
 BUILDLINK_API_DEPENDS.nautilus+=	nautilus>=2.13.4
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/eel2/buildlink3.mk"
+.include "../../devel/eel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index fdd22bdbd43..53b017c42cf 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2007/09/19 23:13:31 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2007/09/20 21:21:36 wiz Exp $
 #
 
 DISTNAME=		nautilus-2.18.3
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 GCONF2_SCHEMAS=		apps_nautilus_preferences.schemas
 
-BUILDLINK_API_DEPENDS.eel2+=	eel2>=2.15.91
+BUILDLINK_API_DEPENDS.eel+=	eel>=2.15.91
 BUILDLINK_API_DEPENDS.esound+=	esound>=0.2.27
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
 BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.14.2
@@ -34,7 +34,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../audio/esound/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/GConf2/schemas.mk"
-.include "../../devel/eel2/buildlink3.mk"
+.include "../../devel/eel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk
index 9d88eccf619..a6392606f6c 100644
--- a/sysutils/nautilus/buildlink3.mk
+++ b/sysutils/nautilus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2007/09/19 23:13:31 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2007/09/20 21:21:36 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NAUTILUS_BUILDLINK3_MK:=	${NAUTILUS_BUILDLINK3_MK}+
@@ -24,7 +24,7 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/nautilus\/extensions-1.0$$/ \
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
-.include "../../devel/eel2/buildlink3.mk"
+.include "../../devel/eel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
diff --git a/x11/control-center/Makefile b/x11/control-center/Makefile
index 261298d851d..c5ec0bf7f95 100644
--- a/x11/control-center/Makefile
+++ b/x11/control-center/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2007/09/19 23:53:48 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/20 21:21:36 wiz Exp $
 #
 
 DISTNAME=	control-center-2.18.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.18/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 4f264374ac4..20a681cd97f 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2007/09/20 21:12:57 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2007/09/20 21:21:38 wiz Exp $
 #
 
 DISTNAME=		gnome-applets-2.18.0
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.18/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index bada00a595a..71ccbc12846 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.86 2007/09/19 23:53:47 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2007/09/20 21:21:39 wiz Exp $
 #
 
 DISTNAME=		gnome-session-2.18.3
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.18/}
 SITES.gnome-splash-2.16.0.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile
index 5160452b5fe..58fefae0595 100644
--- a/x11/py-gnome2-desktop/Makefile
+++ b/x11/py-gnome2-desktop/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2007/09/20 21:12:57 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/20 21:21:39 wiz Exp $
 #
 
 DISTNAME=	gnome-python-desktop-2.18.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python/2/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python-desktop/2.18/}
 EXTRACT_SUFX=	.tar.bz2