6 files changed, 9 insertions, 42 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index d742e495baf6..4e3aa4035b59 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,12 +3,11 @@
 # Whom:                 		ade, archie
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11-fm/nautilus/Makefile,v 1.4 2009/04/15 12:03:35 kwm Exp $
+#   $MCom: ports/x11-fm/nautilus/Makefile,v 1.186 2009/10/20 13:37:51 avl Exp $
 #
 
 PORTNAME=	nautilus
-PORTVERSION=	2.26.3
-PORTREVISION=	2
+PORTVERSION=	2.28.1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -32,7 +31,7 @@ USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv" \
 		LIBPNG="-L${LOCALBASE}/lib -lpng -lz"
-CONFIGURE_ARGS=	--enable-static
+CONFIGURE_ARGS=	--enable-static --disable-packagekit
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
 OPTIONS=	TRACKER "Enable Tracker Search (sysutils/tracker)" Off
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index b239d1afe719..912a5adba63f 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-2.26.3.tar.bz2) = e05f1b61c27f506451f7d46509631e7b
-SHA256 (gnome2/nautilus-2.26.3.tar.bz2) = 1d877362a0f1eea68c2945ef6b2770e0da19d4a0c81c49fb5ebe478fd5e0dfe1
-SIZE (gnome2/nautilus-2.26.3.tar.bz2) = 5913186
+MD5 (gnome2/nautilus-2.28.1.tar.bz2) = e759af11a0844828e2b484ff42ee0498
+SHA256 (gnome2/nautilus-2.28.1.tar.bz2) = 197147d04529ee14e63609fa4755c9effff19842f77594ff8cce6e2433d0bec0
+SIZE (gnome2/nautilus-2.28.1.tar.bz2) = 6020681
diff --git a/x11-fm/nautilus/files/patch-configure b/x11-fm/nautilus/files/patch-configure
deleted file mode 100644
index 4a9390ced7e9..000000000000
--- a/x11-fm/nautilus/files/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig	Mon May 14 20:47:58 2007
-+++ configure	Mon May 14 20:52:42 2007
-@@ -23611,9 +23611,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <unistd.h>
--  #ifdef HAVE_SYS_PARAM_H
-   #include <sys/param.h>
--  #endif
-   #ifdef HAVE_SYS_VFS_H
-   #include <sys/vfs.h>
-   #endif
-@@ -23674,9 +23672,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <unistd.h>
--  #ifdef HAVE_SYS_PARAM_H
-   #include <sys/param.h>
--  #endif
-   #ifdef HAVE_SYS_VFS_H
-   #include <sys/vfs.h>
-   #endif
diff --git a/x11-fm/nautilus/files/patch-nautilus.desktop.in.in b/x11-fm/nautilus/files/patch-data_nautilus.desktop.in.in
index 9a2d128a097c..448a4f6b0035 100644
--- a/x11-fm/nautilus/files/patch-nautilus.desktop.in.in
+++ b/x11-fm/nautilus/files/patch-data_nautilus.desktop.in.in
@@ -1,5 +1,5 @@
---- nautilus.desktop.in.in.orig	2009-04-25 17:13:18.000000000 -0400
-+++ nautilus.desktop.in.in	2009-04-25 17:13:32.000000000 -0400
+--- data/nautilus.desktop.in.in.orig	2009-04-25 17:13:18.000000000 -0400
++++ data/nautilus.desktop.in.in	2009-04-25 17:13:32.000000000 -0400
 @@ -15,4 +15,5 @@ X-GNOME-Bugzilla-Version=@VERSION@
  X-GNOME-Autostart-Phase=Desktop
  X-GNOME-Autostart-Notify=true
diff --git a/x11-fm/nautilus/files/patch-src_nautilus-file-management-properties.ui b/x11-fm/nautilus/files/patch-src_nautilus-file-management-properties.ui
deleted file mode 100644
index 4be8fc959422..000000000000
--- a/x11-fm/nautilus/files/patch-src_nautilus-file-management-properties.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/nautilus-file-management-properties.ui.orig	2009-09-09 22:36:20.000000000 -0400
-+++ src/nautilus-file-management-properties.ui	2009-09-09 22:26:46.000000000 -0400
-@@ -1128,7 +1128,7 @@
-                               </packing>
-                             </child>
-                             <child>
--                              <object class="GtkLabel" id="label">
-+                              <object class="GtkLabel" id="label99">
-                                 <property name="height_request">6</property>
-                                 <property name="visible">True</property>
-                                 <property name="label" translatable="yes"/>
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 513932c9554a..e834f8565dd3 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -17,6 +17,7 @@ lib/libnautilus-extension.a
 lib/libnautilus-extension.la
 lib/libnautilus-extension.so
 lib/libnautilus-extension.so.1
+libexec/nautilus-convert-metadata
 libdata/pkgconfig/libnautilus-extension.pc
 share/applications/nautilus-autorun-software.desktop
 share/applications/nautilus-browser.desktop