Update to 2.1.3.

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

8 files changed, 28 insertions, 50 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index bc9d49084..77c78efc3 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.1.2
+PORTVERSION=	2.1.3
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.1
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index 2a374b3ef..c5046cc08 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.1.2.tar.bz2) = bb13f3427ce259b042d7244c4c611afc
+MD5 (gnome2/nautilus-2.1.3.tar.bz2) = a6f372104cfd03ed56846cba474e61e8
diff --git a/x11-fm/nautilus/files/patch-aa b/x11-fm/nautilus/files/patch-aa
index fa83e8348..3b98f9aff 100644
--- a/x11-fm/nautilus/files/patch-aa
+++ b/x11-fm/nautilus/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Thu Oct 31 20:39:00 2002
-+++ configure	Mon Nov 11 01:22:48 2002
-@@ -8619,6 +8619,7 @@
+--- configure.orig	Mon Nov 25 21:42:34 2002
++++ configure	Tue Nov 26 15:25:56 2002
+@@ -8313,6 +8313,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,26 +8,25 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -13582,16 +13583,14 @@
+@@ -13276,7 +13277,7 @@
  
  LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
  
 -LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`"
--
 +LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | xargs -n1 echo -n ' -I '`"
  
+ 
  CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
- CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
+@@ -13284,7 +13285,7 @@
  
  CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
  
 -CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`"
--
 +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"
- COMPONENT_CFLAGS="`$PKG_CONFIG --cflags $COMPONENT_MODULES`"
-@@ -14546,9 +14545,9 @@
+@@ -14176,9 +14177,9 @@
  s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t
@@ -39,7 +38,7 @@
  s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
  s,@ALLOCA@,$ALLOCA,;t t
  s,@USE_NLS@,$USE_NLS,;t t
-@@ -14597,24 +14596,24 @@
+@@ -14227,25 +14228,25 @@
  s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t
  s,@HAVE_JW@,$HAVE_JW,;t t
  s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t
@@ -47,6 +46,7 @@
 +s~@MEDUSA_LIBS@~$MEDUSA_LIBS~;t t
  s,@LIBJPEG@,$LIBJPEG,;t t
  s,@GIMPHWRAPBOX_CFLAGS@,$GIMPHWRAPBOX_CFLAGS,;t t
+ s,@LIBEGG_CFLAGS@,$LIBEGG_CFLAGS,;t t
  s,@LIBNAUTILUS_CFLAGS@,$LIBNAUTILUS_CFLAGS,;t t
 -s,@LIBNAUTILUS_LIBS@,$LIBNAUTILUS_LIBS,;t t
 +s~@LIBNAUTILUS_LIBS@~$LIBNAUTILUS_LIBS~;t t
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 5929dee53..c412aff8f 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -11,14 +11,12 @@ etc/X11/sysconfig/.directory
 etc/gconf/gconf.xml.defaults/apps/nautilus/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/nautilus/list_view/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/nautilus/news/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/nautilus/preferences/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/news/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree/%gconf.xml
@@ -49,35 +47,26 @@ lib/libnautilus.so
 lib/libnautilus.so.2
 libdata/bonobo/servers/Nautilus_ComponentAdapterFactory_std.server
 libdata/bonobo/servers/Nautilus_Control_throbber.server
-libdata/bonobo/servers/Nautilus_View_content-loser.server
 libdata/bonobo/servers/Nautilus_View_emblem.server
 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_sample.server
-libdata/bonobo/servers/Nautilus_View_sidebar-loser.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
 libexec/nautilus-adapter
-libexec/nautilus-content-loser
-libexec/nautilus-sample-content-view
-libexec/nautilus-sidebar-loser
 libexec/nautilus-text-view
 libexec/nautilus-throbber
 share/gnome/applications/nautilus.desktop
 share/gnome/applications/nautilus-file-management-properties.desktop
 share/gnome/applications/network-scheme.desktop
 share/gnome/gnome-2.0/ui/nautilus-clipboard-ui.xml
-share/gnome/gnome-2.0/ui/nautilus-content-loser-ui.xml
 share/gnome/gnome-2.0/ui/nautilus-desktop-icon-view-ui.xml
 share/gnome/gnome-2.0/ui/nautilus-directory-view-ui.xml
 share/gnome/gnome-2.0/ui/nautilus-icon-view-ui.xml
-share/gnome/gnome-2.0/ui/nautilus-sample-content-view-ui.xml
 share/gnome/gnome-2.0/ui/nautilus-search-list-view-ui.xml
 share/gnome/gnome-2.0/ui/nautilus-shell-ui.xml
-share/gnome/gnome-2.0/ui/nautilus-sidebar-loser-ui.xml
 share/gnome/idl/nautilus-distributed-undo.idl
 share/gnome/idl/nautilus-view-component.idl
 share/gnome/nautilus/browser.xml
@@ -127,6 +116,7 @@ share/gnome/nautilus/static_bookmarks.xml
 share/gnome/network/nautilus-server-connect.desktop
 share/gnome/pixmaps/gnome-starthere-96.png
 share/gnome/pixmaps/gnome-starthere.png
+share/gnome/pixmaps/nautilus/nautilus-desktop.png
 share/gnome/pixmaps/nautilus/CD_drive.png
 share/gnome/pixmaps/nautilus/HD_drive.png
 share/gnome/pixmaps/nautilus/Search.png
@@ -288,6 +278,7 @@ share/gnome/pixmaps/nautilus/throbber/rest.png
 share/gnome/pixmaps/nautilus/thumbnail_frame.png
 share/gnome/pixmaps/nautilus/zoom_body.png
 share/locale/az/LC_MESSAGES/nautilus.mo
+share/locale/be/LC_MESSAGES/nautilus.mo
 share/locale/bg/LC_MESSAGES/nautilus.mo
 share/locale/ca/LC_MESSAGES/nautilus.mo
 share/locale/cs/LC_MESSAGES/nautilus.mo
@@ -331,14 +322,12 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 @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
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/news
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/preferences
-@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/news
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/list_view
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index bc9d49084..77c78efc3 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.1.2
+PORTVERSION=	2.1.3
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.1
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 2a374b3ef..c5046cc08 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.1.2.tar.bz2) = bb13f3427ce259b042d7244c4c611afc
+MD5 (gnome2/nautilus-2.1.3.tar.bz2) = a6f372104cfd03ed56846cba474e61e8
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa
index fa83e8348..3b98f9aff 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Thu Oct 31 20:39:00 2002
-+++ configure	Mon Nov 11 01:22:48 2002
-@@ -8619,6 +8619,7 @@
+--- configure.orig	Mon Nov 25 21:42:34 2002
++++ configure	Tue Nov 26 15:25:56 2002
+@@ -8313,6 +8313,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,26 +8,25 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -13582,16 +13583,14 @@
+@@ -13276,7 +13277,7 @@
  
  LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
  
 -LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`"
--
 +LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | xargs -n1 echo -n ' -I '`"
  
+ 
  CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
- CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
+@@ -13284,7 +13285,7 @@
  
  CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
  
 -CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`"
--
 +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"
- COMPONENT_CFLAGS="`$PKG_CONFIG --cflags $COMPONENT_MODULES`"
-@@ -14546,9 +14545,9 @@
+@@ -14176,9 +14177,9 @@
  s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t
@@ -39,7 +38,7 @@
  s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
  s,@ALLOCA@,$ALLOCA,;t t
  s,@USE_NLS@,$USE_NLS,;t t
-@@ -14597,24 +14596,24 @@
+@@ -14227,25 +14228,25 @@
  s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t
  s,@HAVE_JW@,$HAVE_JW,;t t
  s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t
@@ -47,6 +46,7 @@
 +s~@MEDUSA_LIBS@~$MEDUSA_LIBS~;t t
  s,@LIBJPEG@,$LIBJPEG,;t t
  s,@GIMPHWRAPBOX_CFLAGS@,$GIMPHWRAPBOX_CFLAGS,;t t
+ s,@LIBEGG_CFLAGS@,$LIBEGG_CFLAGS,;t t
  s,@LIBNAUTILUS_CFLAGS@,$LIBNAUTILUS_CFLAGS,;t t
 -s,@LIBNAUTILUS_LIBS@,$LIBNAUTILUS_LIBS,;t t
 +s~@LIBNAUTILUS_LIBS@~$LIBNAUTILUS_LIBS~;t t
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 5929dee53..c412aff8f 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -11,14 +11,12 @@ etc/X11/sysconfig/.directory
 etc/gconf/gconf.xml.defaults/apps/nautilus/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/nautilus/list_view/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/nautilus/news/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/nautilus/preferences/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/news/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree/%gconf.xml
@@ -49,35 +47,26 @@ lib/libnautilus.so
 lib/libnautilus.so.2
 libdata/bonobo/servers/Nautilus_ComponentAdapterFactory_std.server
 libdata/bonobo/servers/Nautilus_Control_throbber.server
-libdata/bonobo/servers/Nautilus_View_content-loser.server
 libdata/bonobo/servers/Nautilus_View_emblem.server
 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_sample.server
-libdata/bonobo/servers/Nautilus_View_sidebar-loser.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
 libexec/nautilus-adapter
-libexec/nautilus-content-loser
-libexec/nautilus-sample-content-view
-libexec/nautilus-sidebar-loser
 libexec/nautilus-text-view
 libexec/nautilus-throbber
 share/gnome/applications/nautilus.desktop
 share/gnome/applications/nautilus-file-management-properties.desktop
 share/gnome/applications/network-scheme.desktop
 share/gnome/gnome-2.0/ui/nautilus-clipboard-ui.xml
-share/gnome/gnome-2.0/ui/nautilus-content-loser-ui.xml
 share/gnome/gnome-2.0/ui/nautilus-desktop-icon-view-ui.xml
 share/gnome/gnome-2.0/ui/nautilus-directory-view-ui.xml
 share/gnome/gnome-2.0/ui/nautilus-icon-view-ui.xml
-share/gnome/gnome-2.0/ui/nautilus-sample-content-view-ui.xml
 share/gnome/gnome-2.0/ui/nautilus-search-list-view-ui.xml
 share/gnome/gnome-2.0/ui/nautilus-shell-ui.xml
-share/gnome/gnome-2.0/ui/nautilus-sidebar-loser-ui.xml
 share/gnome/idl/nautilus-distributed-undo.idl
 share/gnome/idl/nautilus-view-component.idl
 share/gnome/nautilus/browser.xml
@@ -127,6 +116,7 @@ share/gnome/nautilus/static_bookmarks.xml
 share/gnome/network/nautilus-server-connect.desktop
 share/gnome/pixmaps/gnome-starthere-96.png
 share/gnome/pixmaps/gnome-starthere.png
+share/gnome/pixmaps/nautilus/nautilus-desktop.png
 share/gnome/pixmaps/nautilus/CD_drive.png
 share/gnome/pixmaps/nautilus/HD_drive.png
 share/gnome/pixmaps/nautilus/Search.png
@@ -288,6 +278,7 @@ share/gnome/pixmaps/nautilus/throbber/rest.png
 share/gnome/pixmaps/nautilus/thumbnail_frame.png
 share/gnome/pixmaps/nautilus/zoom_body.png
 share/locale/az/LC_MESSAGES/nautilus.mo
+share/locale/be/LC_MESSAGES/nautilus.mo
 share/locale/bg/LC_MESSAGES/nautilus.mo
 share/locale/ca/LC_MESSAGES/nautilus.mo
 share/locale/cs/LC_MESSAGES/nautilus.mo
@@ -331,14 +322,12 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 @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
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/news
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/preferences
-@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/news
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/list_view
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view
 @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus