Update to 2.9.91.

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

6 files changed, 4 insertions, 117 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index c9db0e194..5dc80ab97 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.9.90
+PORTVERSION=	2.9.91
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.9
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index 0be5601ce..21534e9a0 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-2.9.90.tar.bz2) = 1895a2d95dfd5f6f13cc3d2e18898d17
-SIZE (gnome2/nautilus-2.9.90.tar.bz2) = 5994731
+MD5 (gnome2/nautilus-2.9.91.tar.bz2) = 430e3615efe75ff07d5cc3c109987675
+SIZE (gnome2/nautilus-2.9.91.tar.bz2) = 5909884
diff --git a/x11-fm/nautilus/files/patch-data_static_bookmarks.xml b/x11-fm/nautilus/files/patch-data_static_bookmarks.xml
deleted file mode 100644
index 54ea8ae37..000000000
--- a/x11-fm/nautilus/files/patch-data_static_bookmarks.xml
+++ /dev/null
@@ -1,84 +0,0 @@
---- data/static_bookmarks.xml.orig	Wed Jun  5 22:58:43 2002
-+++ data/static_bookmarks.xml	Wed Jun  5 23:30:11 2002
-@@ -1,54 +1,44 @@
- <?xml version="1.0"?>
- <bookmarks>
-   <folder _name="Software">
--        <bookmark _name="Allaire" icon_name="i-web" uri="http://www.allaire.com/Products/index.cfm"/>
--        <bookmark _name="Borland" icon_name="i-web" uri="http://www.borland.com/kylix/"/>
--        <bookmark _name="MandrakeSoft" icon_name="i-web" uri="http://mandrakesoft.com/"/>
--        <bookmark _name="Netraverse" icon_name="i-web" uri="http://www.netraverse.com"/>
--        <bookmark _name="Red Hat" icon_name="i-web" uri="http://www.redhat.com"/>
--        <bookmark _name="SuSE" icon_name="i-web" uri="http://www.suse.com"/>
-+	<bookmark _name="4Front Technologies" icon_name="i-web" uri="http://www.4front-tech.com"/>
-+	<bookmark _name="BSD Mall" icon_name="i-web" uri="http://www.bsdmall.com/freebsd1.html"/>
-+        <bookmark _name="FreeBSD" icon_name="i-web" uri="http://www.freebsd.org"/>
-+        <bookmark _name="GNOME" icon_name="i-web" uri="http://www.gnome.org/"/>
-         <bookmark _name="Sun StarOffice" icon_name="i-web" uri="http://www.sun.com/products/staroffice/"/>
-         <bookmark _name="Ximian" icon_name="i-web" uri="http://www.ximian.com"/>
--        <bookmark _name="Zero-Knowledge" icon_name="i-web" uri="http://www.zeroknowledge.com"/>
-   </folder>
-   <folder _name="Hardware">
--        <bookmark _name="Compaq" icon_name="i-web" uri="http://www.compaq.com/products/software/linux/"/>
--        <bookmark _name="CNET Computers.com" icon_name="i-web" uri="http://computers.cnet.com/hardware/0-1016.html"/>
--        <bookmark _name="Dell" icon_name="i-web" uri="http://www.dell.com/linux/"/>
--        <bookmark _name="Penguin Computing" icon_name="i-web" uri="http://www.penguincomputing.com"/>
--        <bookmark _name="ZDNet Linux Hardware Database" icon_name="i-web" uri="http://lhd.zdnet.com"/>
-+	<bookmark _name="Adaptec" icon_name="i-web" uri="http://www.adaptec.com"/>
-+	<bookmark _name="BSD Mall" icon_name="i-web" uri="http://www.bsdmall.com/hardware.html"/>
-+	<bookmark _name="Cisco Systems, Inc" icon_name="i-web" uri="http://www.cisco.com"/>
-+        <bookmark _name="Compaq" icon_name="i-web" uri="http://www.compaq.com"/>
-+        <bookmark _name="Data Net Solutions" icon_name="i-web" uri="http://www.eclipse.com"/>
-+        <bookmark _name="Dell" icon_name="i-web" uri="http://www.dell.com"/>
-   </folder>
-   <folder _name="News and Media">
--         <bookmark _name="Binary Freedom" icon_name="i-web" uri="http://www.binaryfreedom.com/"/>
--         <bookmark _name="CNET Linux Center" icon_name="i-web" uri="http://linux.cnet.com/linux/0-1518529-7-3378110.html"/>
--         <bookmark _name="LinuxOrbit.com" icon_name="i-web" uri="http://www.linuxorbit.com"/>
--         <bookmark _name="Linux Weekly News" icon_name="i-web" uri="http://www.lwn.net"/>
-+	 <bookmark _name="BSD Today" icon_name="i-web" uri="http://www.bsdtoday.com"/>
-+	 <bookmark _name="Daily Daemon News" icon_name="i-web" uri="http://daily.daemonnews.org"/>
-+	 <bookmark _name="Daemon News" icon_name="i-web" uri="http://www.daemonnews.org"/>
-          <bookmark _name="O'Reilly" icon_name="i-web" uri="http://www.oreillynet.com"/>
--         <bookmark _name="OSDN" icon_name="i-web" uri="http://www.osdn.com"/>
--         <bookmark _name="ZDNet Linux Resource Center" icon_name="i-web" uri="http://linux.zdnet.com"/>
-   </folder>
-   <folder _name="Web Services">
--         <bookmark _name="CollabNet" icon_name="i-web" uri="http://www.collab.net/community/"/>
--         <bookmark _name="Covalent" icon_name="i-web" uri="http://www.covalent.com"/>
--         <bookmark _name="Rackspace" icon_name="i-web" uri="http://www.rackspace.com"/>
--         <bookmark _name="Red Hat Network" icon_name="i-web" uri="http://www.redhat.com/network/"/>
-+	 <bookmark _name="FreeBSD Services, Ltd." icon_name="i-web" uri="http://www.freebsd-services.com"/>
-+	 <bookmark _name="JohnsCompanies Collocation Services" icon_name="i-web" uri="http://www.johncompanies.com/collocation"/>
-          <bookmark _name="SourceForge" icon_name="i-web" uri="http://www.sourceforge.net"/>
-   </folder>
--  <folder _name="International">
--         <bookmark _name="Conectiva" icon_name="i-web" uri="http://en.conectiva.com/"/>
--         <bookmark _name="Linux One" icon_name="i-web" uri="http://www.linuxone.co.kr/english2/eng/main.htm"/>
--         <bookmark _name="Open Source Asia" icon_name="i-web" uri="http://www.opensourceasia.com"/>
--         <bookmark _name="RedFlag Linux" icon_name="i-web" uri="http://www.redflag-linux.com/english/index.html"/>
--         <bookmark _name="Sun Wah Linux" icon_name="i-web" uri="http://www.sw-linux.com/nonflash_front.htm"/>
--  </folder>
--  <folder _name="Linux Resources">
--         <bookmark _name="Debian.org" icon_name="i-web" uri="http://www.debian.org"/>
--         <bookmark _name="Freshmeat.net" icon_name="i-web" uri="http://www.freshmeat.net"/>
--         <bookmark _name="GNOME.org" icon_name="i-web" uri="http://www.gnome.org"/>
--         <bookmark _name="GNU.org" icon_name="i-web" uri="http://www.gnu.org"/>
--         <bookmark _name="Linux Online" icon_name="i-web" uri="http://www.linux.org"/>
--         <bookmark _name="Linux Documentation Project" icon_name="i-web" uri="http://www.linuxdoc.org"/>
--         <bookmark _name="LinuxNewbie.org" icon_name="i-web" uri="http://www.linuxnewbie.org"/>
-+  <folder _name="FreeBSD Resources">
-+         <bookmark _name="BSD Apps" icon_name="i-web" uri="http://www.bsdapps.com"/>
-+         <bookmark _name="BSD At Work" icon_name="i-web" uri="http://www.bsdatwork.com"/>
-+	 <bookmark _name="BSD Central" icon_name="i-web" uri="http://bsdcentral.com"/>
-+         <bookmark _name="BSD Dev Center" icon_name="i-web" uri="http://www.onlamp.com/bsd/"/>
-+	 <bookmark _name="FreeBSD Diary" icon_name="i-web" uri="http://www.freebsddiary.org"/>
-+	 <bookmark _name="FreeBSD Forums" icon_name="i-web" uri="http://www.freebsdforums.org"/>
-+	 <bookmark _name="FreeBSD GNOME Project" icon_name="i-web" uri="http://www.freebsd.org/gnome"/>
-+	 <bookmark _name="FreeBSD Handbook" icon_name="i-web" uri="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/index.html"/>
-+	 <bookmark _name="FreeBSD Security Information" icon_name="i-web" uri="http://www.freebsd.org/security/security.html"/>
-+         <bookmark _name="Freshports" icon_name="i-web" uri="http://www.freshports.org"/>
-+	 <bookmark _name="Google's BSD Search Engine" icon_name="i-web" uri="http://www.google.com/bsd"/>
-          <bookmark _name="OpenOffice" icon_name="i-web" uri="http://www.openoffice.org"/>
-   </folder>
- </bookmarks>
diff --git a/x11-fm/nautilus/files/patch-libbackground_Makefile.in b/x11-fm/nautilus/files/patch-libbackground_Makefile.in
deleted file mode 100644
index c5dd046fb..000000000
--- a/x11-fm/nautilus/files/patch-libbackground_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libbackground/Makefile.in.orig	Wed Nov 24 13:17:35 2004
-+++ libbackground/Makefile.in	Wed Nov 24 13:18:06 2004
-@@ -169,7 +169,7 @@
- 
- INCLUDES = \
-         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 		\
--	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"			\
-+	-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"			\
- 	-DG_LOG_DOMAIN=\"capplet-common\"				\
- 	-I$(top_srcdir)/						\
- 	@CAPPLET_CFLAGS@
diff --git a/x11-fm/nautilus/files/patch-src_nautilus-image-properties-page.c b/x11-fm/nautilus/files/patch-src_nautilus-image-properties-page.c
deleted file mode 100644
index a6d710d75..000000000
--- a/x11-fm/nautilus/files/patch-src_nautilus-image-properties-page.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/nautilus-image-properties-page.c.orig	Wed Nov 24 13:25:51 2004
-+++ src/nautilus-image-properties-page.c	Wed Nov 24 13:26:28 2004
-@@ -144,13 +144,14 @@
- exif_content_callback (ExifContent *content, gpointer data)
- {
- 	struct ExifAttribute *attribute;
-+	char value[1024];
- 
- 	attribute = (struct ExifAttribute *)data;
- 	if (attribute->found) {
- 		return;
- 	}
- 
--        attribute->value = g_strdup (exif_content_get_value (content, attribute->tag));
-+        attribute->value = g_strdup (exif_content_get_value (content, attribute->tag, value, sizeof(value)));
- 	if (attribute->value != NULL) {
- 		attribute->found = TRUE;
- 	}
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index ab5db6929..647e539ba 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -20,6 +20,7 @@ libdata/bonobo/servers/Nautilus_shell.server
 libdata/pkgconfig/libnautilus-extension.pc
 share/gnome/applications/nautilus-computer.desktop
 share/gnome/applications/nautilus-file-management-properties.desktop
+share/gnome/applications/nautilus-folder-handler.desktop
 share/gnome/applications/nautilus-home.desktop
 share/gnome/applications/nautilus.desktop
 share/gnome/applications/network-scheme.desktop
@@ -60,7 +61,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/static_bookmarks.xml
 share/gnome/nautilus/ui/nautilus-desktop-icon-view-ui.xml
 share/gnome/nautilus/ui/nautilus-directory-view-ui.xml
 share/gnome/nautilus/ui/nautilus-icon-view-ui.xml