Update to 2.5.3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1635 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 32 insertions, 16 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 92ff51d4f..e9a62e6a9 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.5.4
+PORTVERSION=	2.5.5
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
@@ -16,8 +16,6 @@ DISTNAME=	nautilus-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME file manager and graphical shell developed by Eazel
 
-BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index fd5e0d455..86e0343ff 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.5.4.tar.bz2) = b1d9e8cadbc61c92465df712a2dbc013
+MD5 (gnome2/nautilus-2.5.5.tar.bz2) = 2e6fde2041fe860faab9008eeafbd0ba
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 765b27e2b..f182fbb42 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -34,14 +34,25 @@ include/libnautilus/nautilus-undo.h
 include/libnautilus/nautilus-view-component.h
 include/libnautilus/nautilus-view-standard-main.h
 include/libnautilus/nautilus-view.h
+include/nautilus/libnautilus-extension/nautilus-column-provider.h
+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-menu-item.h
+include/nautilus/libnautilus-extension/nautilus-menu-provider.h
+include/nautilus/libnautilus-extension/nautilus-property-page-provider.h
+include/nautilus/libnautilus-extension/nautilus-property-page.h
 lib/bonobo/libnautilus-emblem-view.so
 lib/bonobo/libnautilus-history-view.so
 lib/bonobo/libnautilus-image-properties-view.so
 lib/bonobo/libnautilus-notes-view.so
-lib/bonobo/libnautilus-tree-view.so
 lib/libnautilus-adapter.a
 lib/libnautilus-adapter.so
 lib/libnautilus-adapter.so.2
+lib/libnautilus-extension.a
+lib/libnautilus-extension.so
+lib/libnautilus-extension.so.1
 lib/libnautilus-private.a
 lib/libnautilus-private.so
 lib/libnautilus-private.so.2
@@ -55,9 +66,9 @@ libdata/bonobo/servers/Nautilus_View_history.server
 libdata/bonobo/servers/Nautilus_View_image_properties.server
 libdata/bonobo/servers/Nautilus_View_notes.server
 libdata/bonobo/servers/Nautilus_View_text.server
-libdata/bonobo/servers/Nautilus_View_tree.server
 libdata/bonobo/servers/Nautilus_shell.server
 libdata/pkgconfig/libnautilus.pc
+libdata/pkgconfig/libnautilus-extension.pc
 libexec/nautilus-adapter
 libexec/nautilus-text-view
 libexec/nautilus-throbber
@@ -116,8 +127,6 @@ share/gnome/nautilus/patterns/snow_ridge.png
 share/gnome/nautilus/patterns/stucco.jpg
 share/gnome/nautilus/patterns/terracotta.png
 share/gnome/nautilus/patterns/wavy_white.png
-share/gnome/nautilus/services/text/google.xml
-share/gnome/nautilus/services/text/webster.xml
 share/gnome/nautilus/starthere-link.desktop
 share/gnome/nautilus/starthere.desktop
 share/gnome/nautilus/static_bookmarks.xml
@@ -214,6 +223,7 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 @dirrm share/gnome/pixmaps/nautilus/default
 @dirrm share/gnome/network
 @dirrm share/gnome/nautilus/glade
+@dirrm include/nautilus/libnautilus-extension
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 92ff51d4f..e9a62e6a9 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.5.4
+PORTVERSION=	2.5.5
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
@@ -16,8 +16,6 @@ DISTNAME=	nautilus-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME file manager and graphical shell developed by Eazel
 
-BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index fd5e0d455..86e0343ff 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.5.4.tar.bz2) = b1d9e8cadbc61c92465df712a2dbc013
+MD5 (gnome2/nautilus-2.5.5.tar.bz2) = 2e6fde2041fe860faab9008eeafbd0ba
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 765b27e2b..f182fbb42 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -34,14 +34,25 @@ include/libnautilus/nautilus-undo.h
 include/libnautilus/nautilus-view-component.h
 include/libnautilus/nautilus-view-standard-main.h
 include/libnautilus/nautilus-view.h
+include/nautilus/libnautilus-extension/nautilus-column-provider.h
+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-menu-item.h
+include/nautilus/libnautilus-extension/nautilus-menu-provider.h
+include/nautilus/libnautilus-extension/nautilus-property-page-provider.h
+include/nautilus/libnautilus-extension/nautilus-property-page.h
 lib/bonobo/libnautilus-emblem-view.so
 lib/bonobo/libnautilus-history-view.so
 lib/bonobo/libnautilus-image-properties-view.so
 lib/bonobo/libnautilus-notes-view.so
-lib/bonobo/libnautilus-tree-view.so
 lib/libnautilus-adapter.a
 lib/libnautilus-adapter.so
 lib/libnautilus-adapter.so.2
+lib/libnautilus-extension.a
+lib/libnautilus-extension.so
+lib/libnautilus-extension.so.1
 lib/libnautilus-private.a
 lib/libnautilus-private.so
 lib/libnautilus-private.so.2
@@ -55,9 +66,9 @@ libdata/bonobo/servers/Nautilus_View_history.server
 libdata/bonobo/servers/Nautilus_View_image_properties.server
 libdata/bonobo/servers/Nautilus_View_notes.server
 libdata/bonobo/servers/Nautilus_View_text.server
-libdata/bonobo/servers/Nautilus_View_tree.server
 libdata/bonobo/servers/Nautilus_shell.server
 libdata/pkgconfig/libnautilus.pc
+libdata/pkgconfig/libnautilus-extension.pc
 libexec/nautilus-adapter
 libexec/nautilus-text-view
 libexec/nautilus-throbber
@@ -116,8 +127,6 @@ share/gnome/nautilus/patterns/snow_ridge.png
 share/gnome/nautilus/patterns/stucco.jpg
 share/gnome/nautilus/patterns/terracotta.png
 share/gnome/nautilus/patterns/wavy_white.png
-share/gnome/nautilus/services/text/google.xml
-share/gnome/nautilus/services/text/webster.xml
 share/gnome/nautilus/starthere-link.desktop
 share/gnome/nautilus/starthere.desktop
 share/gnome/nautilus/static_bookmarks.xml
@@ -214,6 +223,7 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 @dirrm share/gnome/pixmaps/nautilus/default
 @dirrm share/gnome/network
 @dirrm share/gnome/nautilus/glade
+@dirrm include/nautilus/libnautilus-extension
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences