4 files changed, 28 insertions, 22 deletions

diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 3e6398200b0f..b77b277daaa2 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -3,15 +3,14 @@
 # Whom:                 		ade, archie
 #
 # $FreeBSD$
-#   $MCom: ports/x11-fm/nautilus2/Makefile,v 1.90 2005/10/03 16:24:38 marcus Exp $
+#   $MCom: ports/x11-fm/nautilus2/Makefile,v 1.105 2006/04/13 07:52:42 bland Exp $
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.12.2
-PORTREVISION=	1
+PORTVERSION=	2.14.1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.12
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	nautilus-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -22,13 +21,13 @@ LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop eel2 \
 		librsvg2 desktopfileutils
 GNOME_DESKTOP_VERSION=2
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
 		LIBPNG="-L${LOCALBASE}/lib -lpng -lz"
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index a18bc4a0f0b3..672c4c291eb1 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-2.12.2.tar.bz2) = 1c1304e458eda551da11ed8c52b1faa2
-SHA256 (gnome2/nautilus-2.12.2.tar.bz2) = 9b1a11fde474d0bc0891afeef912aaa01bf8189e453bb555b2977f60f98d5455
-SIZE (gnome2/nautilus-2.12.2.tar.bz2) = 4057461
+MD5 (gnome2/nautilus-2.14.1.tar.bz2) = d8bad8b9141bc823c612abb7d460b725
+SHA256 (gnome2/nautilus-2.14.1.tar.bz2) = ace7b821176159bf70cca61ee9a38384896878ec028e1fc1014ec975c08b12db
+SIZE (gnome2/nautilus-2.14.1.tar.bz2) = 4057351
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa
index 73824998fced..25fa0ee71c8a 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Mon Nov 10 22:08:05 2003
-+++ configure	Mon Nov 10 22:08:05 2003
-@@ -12979,7 +12979,7 @@
+--- configure.orig	Mon Apr 10 20:37:17 2006
++++ configure	Mon Apr 10 20:38:17 2006
+@@ -25674,7 +25674,7 @@
  
  CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
  
@@ -8,13 +8,13 @@
 +CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | xargs -n1 echo -n ' -I '`"
  
  
- COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0"
-@@ -13959,7 +13959,7 @@
- s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ DISABLE_DEPRECATED_CFLAGS=""
+@@ -26832,7 +26832,7 @@
  s,@STARTUP_NOTIFICATION_PACKAGE@,$STARTUP_NOTIFICATION_PACKAGE,;t t
+ s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
  s,@ALL_CFLAGS@,$ALL_CFLAGS,;t t
 -s,@ALL_LIBS@,$ALL_LIBS,;t t
 +s~@ALL_LIBS@~$ALL_LIBS~;t t
+ s,@CONFIG_STATUS_DEPENDENCIES@,$CONFIG_STATUS_DEPENDENCIES,;t t
  s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
  s,@USE_NLS@,$USE_NLS,;t t
- s,@MSGFMT@,$MSGFMT,;t t
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 148b775a88ed..b8cea3254ea9 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -6,6 +6,7 @@ include/nautilus/libnautilus-extension/nautilus-column.h
 include/nautilus/libnautilus-extension/nautilus-extension-types.h
 include/nautilus/libnautilus-extension/nautilus-file-info.h
 include/nautilus/libnautilus-extension/nautilus-info-provider.h
+include/nautilus/libnautilus-extension/nautilus-location-widget-provider.h
 include/nautilus/libnautilus-extension/nautilus-menu-item.h
 include/nautilus/libnautilus-extension/nautilus-menu-provider.h
 include/nautilus/libnautilus-extension/nautilus-property-page-provider.h
@@ -14,10 +15,6 @@ lib/libnautilus-extension.a
 lib/libnautilus-extension.la
 lib/libnautilus-extension.so
 lib/libnautilus-extension.so.1
-lib/libnautilus-private.a
-lib/libnautilus-private.la
-lib/libnautilus-private.so
-lib/libnautilus-private.so.2
 libdata/bonobo/servers/Nautilus_shell.server
 libdata/pkgconfig/libnautilus-extension.pc
 share/gnome/applications/nautilus-computer.desktop
@@ -32,7 +29,6 @@ share/gnome/nautilus/glade/nautilus-bookmarks-window.glade
 share/gnome/nautilus/glade/nautilus-file-management-properties.glade
 share/gnome/nautilus/nautilus-extras.placeholder
 share/gnome/nautilus/nautilus-suggested.placeholder
-share/gnome/nautilus/patterns/.striated.png
 share/gnome/nautilus/patterns/blue_gray_rough.png
 share/gnome/nautilus/patterns/blue_ridge.png
 share/gnome/nautilus/patterns/blue_type.png
@@ -115,6 +111,8 @@ share/locale/id/LC_MESSAGES/nautilus.mo
 share/locale/is/LC_MESSAGES/nautilus.mo
 share/locale/it/LC_MESSAGES/nautilus.mo
 share/locale/ja/LC_MESSAGES/nautilus.mo
+share/locale/ka/LC_MESSAGES/nautilus.mo
+share/locale/km/LC_MESSAGES/nautilus.mo
 share/locale/ko/LC_MESSAGES/nautilus.mo
 share/locale/ku/LC_MESSAGES/nautilus.mo
 share/locale/li/LC_MESSAGES/nautilus.mo
@@ -156,12 +154,19 @@ share/locale/wa/LC_MESSAGES/nautilus.mo
 share/locale/xh/LC_MESSAGES/nautilus.mo
 share/locale/yi/LC_MESSAGES/nautilus.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus.mo
+share/locale/zh_HK/LC_MESSAGES/nautilus.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 share/locale/zu/LC_MESSAGES/nautilus.mo
+share/mime/application/x-gnome-saved-search.xml
+share/mime/packages/nautilus.xml
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
 @dirrm share/gnome/pixmaps/nautilus
 @dirrm share/gnome/nautilus/ui
 @dirrm share/gnome/nautilus/patterns
@@ -170,6 +175,8 @@ share/locale/zu/LC_MESSAGES/nautilus.mo
 @dirrm include/nautilus/libnautilus-extension
 @dirrm include/nautilus
 @exec /bin/mkdir -p %D/lib/nautilus/extensions-1.0
-@unexec /bin/rmdir %D/lib/nautilus/extensions-1.0 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/lib/nautilus 2>/dev/null || /usr/bin/true
+@dirrmtry lib/nautilus/extensions-1.0
+@dirrmtry lib/nautilus
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime