Update to 2.1.2.

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

6 files changed, 42 insertions, 35 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 0614f36b0..bc9d49084 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 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 94db5d3ee..2a374b3ef 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.1.1.tar.bz2) = 74c845fe31bc76b8a5dbb44d668ff74a
+MD5 (gnome2/nautilus-2.1.2.tar.bz2) = bb13f3427ce259b042d7244c4c611afc
diff --git a/x11-fm/nautilus/files/patch-Makefile.in b/x11-fm/nautilus/files/patch-Makefile.in
index 334665c47..175d74d23 100644
--- a/x11-fm/nautilus/files/patch-Makefile.in
+++ b/x11-fm/nautilus/files/patch-Makefile.in
@@ -1,11 +1,10 @@
---- Makefile.in.orig	Mon Oct 14 22:08:24 2002
-+++ Makefile.in	Mon Oct 14 22:08:53 2002
-@@ -145,7 +145,7 @@
- DESKTOP_IN_FILES = nautilus.desktop.in
- DESKTOP_FILES = $(DESKTOP_IN_FILES:.desktop.in=.desktop)
- 
--SUBDIRS =  	libnautilus 			cut-n-paste-code 		libbackground			libnautilus-private 		libnautilus-adapter		src 				test 				components			po 				data 				icons 				docs				$(NULL)
-+SUBDIRS =  	libnautilus 			cut-n-paste-code 		libbackground			libnautilus-private 		libnautilus-adapter		src 								components			po 				data 				icons 				docs				$(NULL)
- 
- 
- EXTRA_DIST =  	COPYING.LIB					COPYING-DOCS					HACKING						MAINTAINERS					nautilus.spec.in				nautilus.desktop				nautilus.desktop.in				gnome-starthere-96.png				gnome-starthere.png				ChangeLog-20000414				ChangeLog-20000625				ChangeLog-20000831				ChangeLog-20001018				intltool-extract.in				intltool-merge.in				intltool-update.in				Makefile.shared					add-include-prefix				$(DESKTOP_IN_FILES)				$(DESKTOP_FILES)				$(NULL)
+--- Makefile.in.orig	Mon Nov 11 01:18:40 2002
++++ Makefile.in	Mon Nov 11 01:19:14 2002
+@@ -164,7 +164,6 @@
+ 	libnautilus-private 	\
+ 	libnautilus-adapter	\
+ 	src 			\
+-	test 			\
+ 	components		\
+ 	po 			\
+ 	data 			\
diff --git a/x11-fm/nautilus/files/patch-aa b/x11-fm/nautilus/files/patch-aa
index 194bf8905..fa83e8348 100644
--- a/x11-fm/nautilus/files/patch-aa
+++ b/x11-fm/nautilus/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Mon Oct 14 06:41:32 2002
-+++ configure	Mon Oct 14 22:12:45 2002
-@@ -7484,6 +7484,7 @@
+--- configure.orig	Thu Oct 31 20:39:00 2002
++++ configure	Mon Nov 11 01:22:48 2002
+@@ -8619,6 +8619,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,11 +8,12 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -11841,14 +11842,14 @@
+@@ -13582,16 +13583,14 @@
  
  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"
@@ -21,11 +22,12 @@
  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`"
-@@ -12579,9 +12580,9 @@
+@@ -14546,9 +14545,9 @@
  s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t
@@ -37,7 +39,7 @@
  s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
  s,@ALLOCA@,$ALLOCA,;t t
  s,@USE_NLS@,$USE_NLS,;t t
-@@ -12633,26 +12634,26 @@
+@@ -14597,24 +14596,24 @@
  s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t
  s,@HAVE_JW@,$HAVE_JW,;t t
  s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t
@@ -56,9 +58,6 @@
  s,@COMPONENT_CFLAGS@,$COMPONENT_CFLAGS,;t t
 -s,@COMPONENT_LIBS@,$COMPONENT_LIBS,;t t
 +s~@COMPONENT_LIBS@~$COMPONENT_LIBS~;t t
- s,@MUSIC_COMPONENT_CFLAGS@,$MUSIC_COMPONENT_CFLAGS,;t t
--s,@MUSIC_COMPONENT_LIBS@,$MUSIC_COMPONENT_LIBS,;t t
-+s~@MUSIC_COMPONENT_LIBS@~$MUSIC_COMPONENT_LIBS~;t t
  s,@EMBLEM_COMPONENT_CFLAGS@,$EMBLEM_COMPONENT_CFLAGS,;t t
  s,@EMBLEM_COMPONENT_LIBS@,$EMBLEM_COMPONENT_LIBS,;t t
  s,@DISABLE_DEPRECATED_CFLAGS@,$DISABLE_DEPRECATED_CFLAGS,;t t
diff --git a/x11-fm/nautilus/files/patch-libbackground_Makefile.in b/x11-fm/nautilus/files/patch-libbackground_Makefile.in
index eb7927b81..d35ac9cc6 100644
--- a/x11-fm/nautilus/files/patch-libbackground_Makefile.in
+++ b/x11-fm/nautilus/files/patch-libbackground_Makefile.in
@@ -1,11 +1,11 @@
---- libbackground/Makefile.in.orig	Mon Oct 14 22:13:17 2002
-+++ libbackground/Makefile.in	Mon Oct 14 22:14:31 2002
-@@ -141,7 +141,7 @@
- 
- EXTRA_DIST = ChangeLog
- 
--INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-I$(top_srcdir)/							@CAPPLET_CFLAGS@
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-I$(top_srcdir)/							@CAPPLET_CFLAGS@
- 
- 
- noinst_LTLIBRARIES = libbackground.la
+--- libbackground/Makefile.in.orig	Mon Nov 11 01:23:17 2002
++++ libbackground/Makefile.in	Mon Nov 11 01:23:58 2002
+@@ -153,7 +153,7 @@
+ 
+ INCLUDES = \
+         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 		\
+-	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"			\
++	-DGNOME_ICONDIR=\""${prefix}/pixmaps"\"			\
+ 	-DG_LOG_DOMAIN=\"capplet-common\"				\
+ 	-I$(top_srcdir)/						\
+ 	@CAPPLET_CFLAGS@
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 08ab89976..5929dee53 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -1,4 +1,6 @@
 bin/nautilus
+bin/nautilus-file-management-properties
+bin/nautilus-server-connect
 etc/X11/serverconfig/.directory
 etc/X11/starthere/.directory
 etc/X11/starthere/applications.desktop
@@ -33,6 +35,7 @@ include/libnautilus/nautilus-view-standard-main.h
 include/libnautilus/nautilus-view.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
@@ -49,7 +52,7 @@ 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_music.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
@@ -59,12 +62,13 @@ libdata/bonobo/servers/Nautilus_shell.server
 libdata/pkgconfig/libnautilus.pc
 libexec/nautilus-adapter
 libexec/nautilus-content-loser
-libexec/nautilus-music-view
 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
@@ -79,6 +83,8 @@ share/gnome/idl/nautilus-view-component.idl
 share/gnome/nautilus/browser.xml
 share/gnome/nautilus/filesystem-attributes.xml
 share/gnome/nautilus/glade/nautilus-bookmarks-window.glade
+share/gnome/nautilus/glade/nautilus-file-management-properties.glade
+share/gnome/nautilus/glade/nautilus-server-connect.glade
 share/gnome/nautilus/nautilus-extras.placeholder
 share/gnome/nautilus/nautilus-suggested.placeholder
 share/gnome/nautilus/patterns/.striated.png
@@ -118,6 +124,7 @@ share/gnome/nautilus/services/text/webster.xml
 share/gnome/nautilus/starthere-link.desktop
 share/gnome/nautilus/starthere.desktop
 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/CD_drive.png
@@ -234,6 +241,7 @@ share/gnome/pixmaps/nautilus/knob.png
 share/gnome/pixmaps/nautilus/memory_chip.gif
 share/gnome/pixmaps/nautilus/nautilus-launch-icon.png
 share/gnome/pixmaps/nautilus/nautilus-mini-logo.png
+share/gnome/pixmaps/nautilus/nautilus-server-connect.png
 share/gnome/pixmaps/nautilus/note-indicator.png
 share/gnome/pixmaps/nautilus/number_strip.png
 share/gnome/pixmaps/nautilus/sierra/green_weave.png
@@ -318,6 +326,7 @@ share/locale/vi/LC_MESSAGES/nautilus.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 @dirrm share/gnome/pixmaps/nautilus/default
+@dirrm share/gnome/network
 @dirrm share/gnome/nautilus/glade
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels