4 files changed, 24 insertions, 19 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 242f6086e72c..137a43ce5b7a 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,11 +3,12 @@
 # Whom:                 		ade, archie
 #
 # $FreeBSD$
-#   $MCom: ports/x11-fm/nautilus/Makefile,v 1.117 2006/10/02 22:48:27 ahze Exp $
+#   $MCom: ports/x11-fm/nautilus/Makefile,v 1.127 2007/03/16 16:07:42 marcus Exp $
 #
 
 PORTNAME=	nautilus
-PORTVERSION=	2.16.3
+PORTVERSION=	2.18.0.1
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,6 +19,7 @@ COMMENT=	File manager for the GNOME desktop
 
 LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif
 
+INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
@@ -35,11 +37,20 @@ CONFIGURE_ARGS=	--with-freetype2-lib-place=${LOCALBASE}/lib \
 		--enable-static
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
+OPTIONS=	TRACKER "Enable Tracker Search (sysutils/tracker)" Off
+
 GCONF_SCHEMAS=	apps_nautilus_preferences.schemas
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_TRACKER)
+LIB_DEPENDS+=	trackerclient.0:${PORTSDIR}/sysutils/tracker
+.else
+CONFIGURE_ARGS+=--disable-tracker
+.endif
+
 post-install:
 	${MKDIR} ${PREFIX}/lib/nautilus/extensions-1.0
 	@-update-desktop-database
-#	@${CHMOD} u+w ${PREFIX}/share/gnome/nautilus/*.desktop
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index 40184b75f6ae..2d40f1a043ce 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-2.16.3.tar.bz2) = 05a0fe98d524ca5287da21845ab8490c
-SHA256 (gnome2/nautilus-2.16.3.tar.bz2) = af2ff5ad922e28cc831b4ac3d83f0f35eedcf7a3230d3df76aa9f91c3ffbc36c
-SIZE (gnome2/nautilus-2.16.3.tar.bz2) = 4268274
+MD5 (gnome2/nautilus-2.18.0.1.tar.bz2) = a4e98623e326c5daa201564eed218594
+SHA256 (gnome2/nautilus-2.18.0.1.tar.bz2) = 30fa5660a93d01d8711e974436a629de5659d034973dbff10c0734c507f03734
+SIZE (gnome2/nautilus-2.18.0.1.tar.bz2) = 4339093
diff --git a/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c b/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c
deleted file mode 100644
index 2d67d65e74db..000000000000
--- a/x11-fm/nautilus/files/patch-libnautilus-private_nautilus-emblem-utils.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libnautilus-private/nautilus-emblem-utils.c.orig	Mon Oct 14 22:20:28 2002
-+++ libnautilus-private/nautilus-emblem-utils.c	Mon Oct 14 22:20:56 2002
-@@ -24,6 +24,7 @@
- 
- #include <config.h>
- 
-+#include <sys/types.h>
- #include <utime.h>
- #include <stdio.h>
- #include <time.h>
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index f5d69f1350d0..4a600f94f623 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -75,10 +75,13 @@ share/gnome/pixmaps/nautilus/colors.png
 share/gnome/pixmaps/nautilus/emblems.png
 share/gnome/pixmaps/nautilus/erase.png
 share/gnome/pixmaps/nautilus/knob.png
-share/gnome/pixmaps/nautilus/nautilus-launch-icon.png
 share/gnome/pixmaps/nautilus/note-indicator.png
-share/gnome/pixmaps/nautilus/text-selection-frame.png
 share/gnome/pixmaps/nautilus/thumbnail_frame.png
+share/icons/hicolor/16x16/apps/nautilus.png
+share/icons/hicolor/22x22/apps/nautilus.png
+share/icons/hicolor/24x24/apps/nautilus.png
+share/icons/hicolor/32x32/apps/nautilus.png
+share/icons/hicolor/scalable/apps/nautilus.svg
 share/locale/af/LC_MESSAGES/nautilus.mo
 share/locale/am/LC_MESSAGES/nautilus.mo
 share/locale/ar/LC_MESSAGES/nautilus.mo
@@ -98,6 +101,7 @@ share/locale/dz/LC_MESSAGES/nautilus.mo
 share/locale/el/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
 share/locale/es/LC_MESSAGES/nautilus.mo
 share/locale/et/LC_MESSAGES/nautilus.mo
 share/locale/eu/LC_MESSAGES/nautilus.mo