update to 2.18.0

This moves this pkg to the new stable gnome branch, too much to list here.

3 files changed, 22 insertions, 15 deletions

diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile
index 2528d9cf271..d3963c90831 100644
--- a/x11/py-gnome2-desktop/Makefile
+++ b/x11/py-gnome2-desktop/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2007/03/21 12:05:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/11 18:12:15 drochner Exp $
 #
 
-DISTNAME=	gnome-python-desktop-2.16.0
+DISTNAME=	gnome-python-desktop-2.18.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python/2/}
-PKGREVISION=	1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	http://ftp.gnome.org/pub/gnome/sources/gnome-python-desktop/2.16/
+MASTER_SITES=	http://ftp.gnome.org/pub/gnome/sources/gnome-python-desktop/2.18/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://ftp.gnome.org/pub/gnome/sources/gnome-python-desktop/2.16/
+HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Python modules for the GNOME desktop
 
 GNU_CONFIGURE=	yes
@@ -17,10 +16,16 @@ PY_PATCHPLIST=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 
+DEPENDS+=	bug-buddy>=2.16:../../net/bug-buddy
+
 PKGCONFIG_OVERRIDE+=	gnome-python-desktop-2.0.pc.in
 
 PYTHON_VERSIONS_ACCEPTED=	24
 
+# XXX not yet, needs hal
+PLIST_SUBST+=	NAUTILUSBURN="@comment "
+#.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
+
 .include "../../graphics/py-cairo/buildlink3.mk"
 .include "../../graphics/librsvg2/buildlink3.mk"
 .include "../../multimedia/totem/buildlink3.mk"
@@ -31,12 +36,11 @@ PYTHON_VERSIONS_ACCEPTED=	24
 .include "../../x11/gtksourceview/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../sysutils/libgtop2/buildlink3.mk"
-# needs 2.15.3, pkgsrc is 2.14
-#.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../x11/py-gnome2/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
-.include "../../wm/metacity/buildlink3.mk"
+# XXX not built per default, might be an option
+#.include "../../wm/metacity/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-gnome2-desktop/PLIST b/x11/py-gnome2-desktop/PLIST
index fb9c881f664..de42ce38b5c 100644
--- a/x11/py-gnome2-desktop/PLIST
+++ b/x11/py-gnome2-desktop/PLIST
@@ -1,5 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/02/04 09:33:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/11 18:12:15 drochner Exp $
 lib/pkgconfig/gnome-python-desktop-2.0.pc
+${PYSITELIB}/gtk-2.0/bugbuddy.py
+${PYSITELIB}/gtk-2.0/bugbuddy.pyc
+${PYSITELIB}/gtk-2.0/bugbuddy.pyo
 ${PYSITELIB}/gtk-2.0/gnome/applet.py
 ${PYSITELIB}/gtk-2.0/gnome/applet.pyc
 ${PYSITELIB}/gtk-2.0/gnome/applet.pyo
@@ -17,7 +20,7 @@ ${PYSITELIB}/gtk-2.0/gnomeprint/ui.la
 ${PYSITELIB}/gtk-2.0/gtksourceview.la
 ${PYSITELIB}/gtk-2.0/gtop.la
 ${PYSITELIB}/gtk-2.0/mediaprofiles.la
-${PYSITELIB}/gtk-2.0/metacity.la
+${NAUTILUSBURN}${PYSITELIB}/gtk-2.0/nautilusburn.la
 ${PYSITELIB}/gtk-2.0/rsvg.la
 ${PYSITELIB}/gtk-2.0/totem/__init__.py
 ${PYSITELIB}/gtk-2.0/totem/__init__.pyc
@@ -65,7 +68,7 @@ share/pygtk/2.0/defs/art.defs
 share/pygtk/2.0/defs/gnomekeyring.defs
 share/pygtk/2.0/defs/gtksourceview.defs
 share/pygtk/2.0/defs/mediaprofiles.defs
-share/pygtk/2.0/defs/metacity.defs
+${NAUTILUSBURN}share/pygtk/2.0/defs/nautilus_burn.defs
 share/pygtk/2.0/defs/print.defs
 share/pygtk/2.0/defs/printui.defs
 share/pygtk/2.0/defs/wnck.defs
diff --git a/x11/py-gnome2-desktop/distinfo b/x11/py-gnome2-desktop/distinfo
index c44668a7c22..5c0a6a439b3 100644
--- a/x11/py-gnome2-desktop/distinfo
+++ b/x11/py-gnome2-desktop/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2007/02/15 14:31:21 joerg Exp $
+$NetBSD: distinfo,v 1.3 2007/04/11 18:12:15 drochner Exp $
 
-SHA1 (gnome-python-desktop-2.16.0.tar.bz2) = d83957cd1c8d04c68f10747357e14c2f3a1bd173
-RMD160 (gnome-python-desktop-2.16.0.tar.bz2) = 20320f74dd77c53f025c51cc25a241505c954bbe
-Size (gnome-python-desktop-2.16.0.tar.bz2) = 429108 bytes
+SHA1 (gnome-python-desktop-2.18.0.tar.bz2) = b8ead4b600104b4c4df6d8e61d93c31f48434364
+RMD160 (gnome-python-desktop-2.18.0.tar.bz2) = e709be32734fa3662fe7c086c1ca3cefa192047d
+Size (gnome-python-desktop-2.18.0.tar.bz2) = 432321 bytes
 SHA1 (patch-aa) = c59eb57073649f8914c01be6e39c6f71f726766c