Update to 2.6.2.

4 files changed, 24 insertions, 25 deletions

diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 4575f116aef5..39033e319430 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.6.1
+PORTVERSION=	2.6.2
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 0da48126d98a..7a0227ebdb1a 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-2.6.1.tar.bz2) = 50c5732c0c9736b7026bce1c6b0007dc
-SIZE (gnome2/nautilus-2.6.1.tar.bz2) = 5610905
+MD5 (gnome2/nautilus-2.6.2.tar.bz2) = a247c541c876dbdcb0b551383d65bd7c
+SIZE (gnome2/nautilus-2.6.2.tar.bz2) = 5620243
diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus2/files/patch-Makefile.in
index 54984be63e96..d1e95a23b85f 100644
--- a/x11-fm/nautilus2/files/patch-Makefile.in
+++ b/x11-fm/nautilus2/files/patch-Makefile.in
@@ -1,11 +1,10 @@
---- Makefile.in.orig	Fri Jan 30 16:22:10 2004
-+++ Makefile.in	Fri Jan 30 16:41:37 2004
-@@ -176,7 +176,7 @@
- DESKTOP_SETTINGS_FILES =  	nautilus-file-management-properties.desktop
- 
- 
--SUBDIRS =  	libnautilus 			libnautilus-extension		cut-n-paste-code 		libbackground			libnautilus-private 		libnautilus-adapter		src 				test 				components			po 				data 				icons 				docs				$(NULL)
-+SUBDIRS =  	libnautilus 			libnautilus-extension		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				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_APPLICATIONS_FILES)				$(DESKTOP_SETTINGS_FILES)				$(NULL)
+--- Makefile.in.orig	Fri Jun  4 16:51:06 2004
++++ Makefile.in	Fri Jun  4 17:01:49 2004
+@@ -195,7 +195,6 @@
+ 	libnautilus-private 	\
+ 	libnautilus-adapter	\
+ 	src 			\
+-	test 			\
+ 	components		\
+ 	po 			\
+ 	data 			\
diff --git a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
index e60d29e99b67..d82ca373940e 100644
--- a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
+++ b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
@@ -1,11 +1,11 @@
---- libbackground/Makefile.in.orig	Fri Jan 30 16:42:13 2004
-+++ libbackground/Makefile.in	Fri Jan 30 16:43:02 2004
-@@ -168,7 +168,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	Fri Jun  4 17:02:10 2004
++++ libbackground/Makefile.in	Fri Jun  4 17:02:52 2004
+@@ -173,7 +173,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@