Update to 2.24.2:

Major changes in 2.24.2 are:
* Fix custom mime icons, requires new glib & gvfs
* Fix crashes

3 files changed, 21 insertions, 18 deletions

diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index b7926bca09c..be4d16f0da3 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.94 2008/10/31 13:25:39 wiz Exp $
+# $NetBSD: Makefile,v 1.95 2008/11/24 15:41:52 wiz Exp $
 #
 
-DISTNAME=		nautilus-2.24.1
+DISTNAME=		nautilus-2.24.2
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.24/}
 EXTRACT_SUFX=		.tar.bz2
@@ -21,19 +21,21 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 GCONF_SCHEMAS=		apps_nautilus_preferences.schemas
 
-BUILDLINK_API_DEPENDS.eel+=	eel>=2.15.91
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.10.0
-BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.8
-
-BUILDLINK_DEPMETHOD.libXt?=	build
+post-install:
+	# for nautilus-cd-burner, remove when it's no longer needed
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/nautilus/extensions-1.0
+	# current default path
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/nautilus/extensions-2.0
 
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/GConf/schemas.mk"
+BUILDLINK_API_DEPENDS.eel+=	eel>=2.24.0
 .include "../../devel/eel/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.17.5
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.14.0
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
@@ -45,14 +47,12 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.13.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXt/buildlink3.mk"
+BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.8
 .include "../../x11/startup-notification/buildlink3.mk"
-
-# for nautilus-cd-burner, remove when it's no longer needed
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/nautilus/extensions-1.0
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/nautilus/PLIST b/sysutils/nautilus/PLIST
index 9964e9a9000..83bb128ee10 100644
--- a/sysutils/nautilus/PLIST
+++ b/sysutils/nautilus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2008/10/27 01:13:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.26 2008/11/24 15:41:52 wiz Exp $
 bin/nautilus
 bin/nautilus-autorun-software
 bin/nautilus-connect-server
@@ -59,6 +59,7 @@ share/locale/af/LC_MESSAGES/nautilus.mo
 share/locale/am/LC_MESSAGES/nautilus.mo
 share/locale/ar/LC_MESSAGES/nautilus.mo
 share/locale/as/LC_MESSAGES/nautilus.mo
+share/locale/ast/LC_MESSAGES/nautilus.mo
 share/locale/az/LC_MESSAGES/nautilus.mo
 share/locale/be/LC_MESSAGES/nautilus.mo
 share/locale/be@latin/LC_MESSAGES/nautilus.mo
@@ -219,7 +220,9 @@ share/pixmaps/nautilus/thumbnail_frame.png
 @dirrm share/gtk-doc/html/libnautilus-extension
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
+@unexec ${MKDIR} %D/lib/nautilus/extensions-2.0 2>/dev/null || ${TRUE}
 @dirrm lib/nautilus/extensions-2.0
+@unexec ${MKDIR} %D/lib/nautilus/extensions-1.0 2>/dev/null || ${TRUE}
 @dirrm lib/nautilus/extensions-1.0
 @dirrm lib/nautilus
 @comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/sysutils/nautilus/distinfo b/sysutils/nautilus/distinfo
index f9f6f4b0948..00c54b1d5c3 100644
--- a/sysutils/nautilus/distinfo
+++ b/sysutils/nautilus/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.39 2008/10/27 01:13:06 wiz Exp $
+$NetBSD: distinfo,v 1.40 2008/11/24 15:41:52 wiz Exp $
 
-SHA1 (nautilus-2.24.1.tar.bz2) = d9661a75bb02859b2275d61d77f8e4926fcf8c7b
-RMD160 (nautilus-2.24.1.tar.bz2) = e2523a9154a3a136890cd897568a6e8b65435948
-Size (nautilus-2.24.1.tar.bz2) = 5330025 bytes
+SHA1 (nautilus-2.24.2.tar.bz2) = 9bc2cf110ae50d69633095aa8115cf89c095ef42
+RMD160 (nautilus-2.24.2.tar.bz2) = a0159b7a6814a731bdbbcee33f4c6aafaee4c8ef
+Size (nautilus-2.24.2.tar.bz2) = 5356516 bytes
 SHA1 (patch-af) = 7b6d50ff805ed971ebe96d1d91a563a19220ebc7
 SHA1 (patch-aj) = d905ae52f35bd4fa11a9c10a0c7423aa5e04f8b9
 SHA1 (patch-ak) = e1548234ee9c96b0727710498e8f29a41a6df759