4 files changed, 10 insertions, 16 deletions

diff --git a/x11-fm/gentoo/Makefile b/x11-fm/gentoo/Makefile
index e8de0c5d2c33..fa7b12cdbc04 100644
--- a/x11-fm/gentoo/Makefile
+++ b/x11-fm/gentoo/Makefile
@@ -41,6 +41,8 @@ post-patch:
 		 s|/bin/umount|/sbin/umount|g' ${WRKSRC}/gentoorc.in
 	@${REINPLACE_CMD} -e '/^CFLAGS/s|@GENTOO_CFLAGS@|@CFLAGS@|g' \
 		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|#define GTK_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/src/odmultibutton.c
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/gentoo.1x ${MANPREFIX}/man/man1/gentoo.1
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 89c7abe44a39..cb2eef21cf8e 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,12 +3,11 @@
 # Whom:                 		ade, archie
 #
 # $FreeBSD$
-#   $MCom: ports/x11-fm/nautilus/Makefile,v 1.186 2009/10/20 13:37:51 avl Exp $
+#   $MCom: ports/x11-fm/nautilus/Makefile,v 1.196 2010/04/26 22:22:10 kwm Exp $
 #
 
 PORTNAME=	nautilus
-PORTVERSION=	2.28.4
-PORTREVISION=	2
+PORTVERSION=	2.30.1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -35,8 +34,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	--enable-static --disable-packagekit
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
-OPTIONS=	TRACKER "Enable Tracker Search (sysutils/tracker)" Off
-
 GCONF_SCHEMAS=	apps_nautilus_preferences.schemas
 
 MAN1=		nautilus-connect-server.1 nautilus-file-management-properties.1 \
@@ -44,14 +41,6 @@ MAN1=		nautilus-connect-server.1 nautilus-file-management-properties.1 \
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_TRACKER)
-#RUN_DEPENDS+=	tracker-applet:${PORTSDIR}/sysutils/tracker-gnome		
-LIB_DEPENDS+=	trackerclient.0:${PORTSDIR}/sysutils/tracker-client \
-		tracker-gtk.0:${PORTSDIR}/sysutils/tracker-libtrackergtk
-.else
-CONFIGURE_ARGS+=--disable-tracker
-.endif
-
 post-install:
 	@${MKDIR} ${PREFIX}/lib/nautilus/extensions-2.0
 	@-update-desktop-database
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index 768e6786e887..7c27f76e506f 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-2.28.4.tar.bz2) = 28c97e0e5195ae1ad5101e8b703cbf52
-SHA256 (gnome2/nautilus-2.28.4.tar.bz2) = 3aceda1c36acda20a0f9ce75165a31b1285a7aca2097d0583e340ccb2b01ea87
-SIZE (gnome2/nautilus-2.28.4.tar.bz2) = 6045403
+MD5 (gnome2/nautilus-2.30.1.tar.bz2) = e1bda55f9c6cd223561da066dbc4e863
+SHA256 (gnome2/nautilus-2.30.1.tar.bz2) = 83df19591c4d0d359fe67d16b3f73f71e6a2aa5ba7d477739276c7562f221144
+SIZE (gnome2/nautilus-2.30.1.tar.bz2) = 6156330
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 392591754954..ee5480228801 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -76,6 +76,7 @@ share/locale/da/LC_MESSAGES/nautilus.mo
 share/locale/de/LC_MESSAGES/nautilus.mo
 share/locale/dz/LC_MESSAGES/nautilus.mo
 share/locale/el/LC_MESSAGES/nautilus.mo
+share/locale/en@shaw/LC_MESSAGES/nautilus.mo
 share/locale/en_CA/LC_MESSAGES/nautilus.mo
 share/locale/en_GB/LC_MESSAGES/nautilus.mo
 share/locale/eo/LC_MESSAGES/nautilus.mo
@@ -288,6 +289,8 @@ share/pixmaps/nautilus/thumbnail_frame.png
 @dirrmtry share/locale/ha
 @dirrmtry share/locale/fur/LC_MESSAGES
 @dirrmtry share/locale/fur
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/crh/LC_MESSAGES