update to 2.30.2

This switches to the gnome-2.30 release branch.

5 files changed, 19 insertions, 20 deletions

diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 30395301cc5..a4f59379111 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:38 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/07/06 15:56:47 drochner Exp $
 #
 
-DISTNAME=		gnome-terminal-2.28.2
-PKGREVISION=		2
+DISTNAME=		gnome-terminal-2.30.2
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-terminal/2.28/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-terminal/2.30/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -27,7 +26,6 @@ CONFIGURE_ENV+=		ac_cv_path_GTK_BUILDER_CONVERT="${PYTHONBIN} ${BUILDLINK_PREFIX
 GCONF_SCHEMAS=	gnome-terminal.schemas
 
 PYTHON_FOR_BUILD_ONLY=	YES
-BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 BUILDLINK_API_DEPENDS.GConf+=	GConf>=2.14.0
@@ -44,6 +42,6 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.13.6
 .include "../../x11/libXft/buildlink3.mk"
 BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.8
 .include "../../x11/startup-notification/buildlink3.mk"
-BUILDLINK_API_DEPENDS.vte+=	vte>=0.19.1
+BUILDLINK_API_DEPENDS.vte+=	vte>=0.24.0
 .include "../../x11/vte/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-terminal/PLIST b/x11/gnome-terminal/PLIST
index 4e6fde17da9..e5bdd55c10a 100644
--- a/x11/gnome-terminal/PLIST
+++ b/x11/gnome-terminal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/12/16 17:20:31 drochner Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/07/06 15:56:47 drochner Exp $
 bin/gnome-terminal
 share/applications/gnome-terminal.desktop
 share/gconf/schemas/gnome-terminal.schemas
@@ -88,6 +88,7 @@ share/locale/be@latin/LC_MESSAGES/gnome-terminal.mo
 share/locale/bg/LC_MESSAGES/gnome-terminal.mo
 share/locale/bn/LC_MESSAGES/gnome-terminal.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-terminal.mo
+share/locale/br/LC_MESSAGES/gnome-terminal.mo
 share/locale/bs/LC_MESSAGES/gnome-terminal.mo
 share/locale/ca/LC_MESSAGES/gnome-terminal.mo
 share/locale/ca@valencia/LC_MESSAGES/gnome-terminal.mo
@@ -97,6 +98,7 @@ share/locale/da/LC_MESSAGES/gnome-terminal.mo
 share/locale/de/LC_MESSAGES/gnome-terminal.mo
 share/locale/dz/LC_MESSAGES/gnome-terminal.mo
 share/locale/el/LC_MESSAGES/gnome-terminal.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-terminal.mo
 share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo
 share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo
 share/locale/es/LC_MESSAGES/gnome-terminal.mo
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 549f976b0fe..11856cceafb 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2009/12/16 17:20:31 drochner Exp $
+$NetBSD: distinfo,v 1.18 2010/07/06 15:56:47 drochner Exp $
 
-SHA1 (gnome-terminal-2.28.2.tar.bz2) = d5437aa0cb8e30315f18a4f8b694fa21387cfe3a
-RMD160 (gnome-terminal-2.28.2.tar.bz2) = 10b3cea1f57d7775c1209103cdf88e738ea4ac28
-Size (gnome-terminal-2.28.2.tar.bz2) = 2194820 bytes
+SHA1 (gnome-terminal-2.30.2.tar.bz2) = ab97acd3d70bdcc468975a49b23ebb05f6e9bc49
+RMD160 (gnome-terminal-2.30.2.tar.bz2) = cabf51649dafa6ccf0bbf2903fa081315d7e2933
+Size (gnome-terminal-2.30.2.tar.bz2) = 2250070 bytes
diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile
index add65e798d1..51223587e79 100644
--- a/x11/py-gnome2-desktop/Makefile
+++ b/x11/py-gnome2-desktop/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.36 2010/06/13 22:45:49 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2010/07/06 15:57:46 drochner Exp $
 #
 
-DISTNAME=	gnome-python-desktop-2.28.0
+DISTNAME=	gnome-python-desktop-2.30.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python/2/}
-PKGREVISION=	4
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python-desktop/2.28/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python-desktop/2.30/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -35,7 +34,7 @@ PYTHON_VERSIONS_ACCEPTED=	26 25
 .include "../../print/evince/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
-.include "../../security/gnome-keyring/buildlink3.mk"
+.include "../../security/libgnome-keyring/buildlink3.mk"
 .include "../../sysutils/libgtop/buildlink3.mk"
 # disabled in configure script by default
 # CONFIGURE_ARGS+=	--enable-metacity
diff --git a/x11/py-gnome2-desktop/distinfo b/x11/py-gnome2-desktop/distinfo
index cb216183ca1..b8e25b1b100 100644
--- a/x11/py-gnome2-desktop/distinfo
+++ b/x11/py-gnome2-desktop/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2009/10/22 17:20:55 drochner Exp $
+$NetBSD: distinfo,v 1.10 2010/07/06 15:57:46 drochner Exp $
 
-SHA1 (gnome-python-desktop-2.28.0.tar.bz2) = 3e30867fc492c5d70114eadd4569bb9fe8d1d27e
-RMD160 (gnome-python-desktop-2.28.0.tar.bz2) = 1ccf2bd4ea285922fbaa136c00522f4985510ebe
-Size (gnome-python-desktop-2.28.0.tar.bz2) = 613169 bytes
+SHA1 (gnome-python-desktop-2.30.2.tar.bz2) = 75f41e1832baf37e332ee1e10b29a82b1809b6ef
+RMD160 (gnome-python-desktop-2.30.2.tar.bz2) = 8b46fbe26e3fa0a9eae3dbd3ff31fb910fb6b135
+Size (gnome-python-desktop-2.30.2.tar.bz2) = 598305 bytes
 SHA1 (patch-aa) = 774c396b894f9b9b0247398d3dd0b5c99c6e62d5