From 253521ca1180bc170651ab8ca37d15cd75b96996 Mon Sep 17 00:00:00 2001
From: adamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Mon, 16 Aug 2004 15:50:20 +0000
Subject: Update to 2.7.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2673 df743ca5-7f9a-e211-a948-0013205c9059
---
 x11-fm/nautilus/Makefile                           |  3 +--
 x11-fm/nautilus/distinfo                           |  4 ++--
 x11-fm/nautilus/files/patch-Makefile.in            | 21 +++++++++++----------
 .../nautilus/files/patch-libbackground_Makefile.in | 22 +++++++++++-----------
 x11-fm/nautilus2/Makefile                          |  3 +--
 x11-fm/nautilus2/distinfo                          |  4 ++--
 x11-fm/nautilus2/files/patch-Makefile.in           | 21 +++++++++++----------
 .../files/patch-libbackground_Makefile.in          | 22 +++++++++++-----------
 8 files changed, 50 insertions(+), 50 deletions(-)

(limited to 'x11-fm')

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 81604a306..5c55f1f17 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.7.2
-PORTREVISION=	2
+PORTVERSION=	2.7.4
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.7
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index ef7d4a676..e36ef8ab3 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-2.7.2.tar.bz2) = 61e5c920c5e2cbe0c622bf6e40f554f1
-SIZE (gnome2/nautilus-2.7.2.tar.bz2) = 6150723
+MD5 (gnome2/nautilus-2.7.4.tar.bz2) = 12ccef295fd12683c36820bb5406f04b
+SIZE (gnome2/nautilus-2.7.4.tar.bz2) = 5763773
diff --git a/x11-fm/nautilus/files/patch-Makefile.in b/x11-fm/nautilus/files/patch-Makefile.in
index 1881b7c50..7cb9fd809 100644
--- a/x11-fm/nautilus/files/patch-Makefile.in
+++ b/x11-fm/nautilus/files/patch-Makefile.in
@@ -1,10 +1,11 @@
---- Makefile.in.orig	Thu Jul 22 11:46:56 2004
-+++ Makefile.in	Thu Jul 22 11:47:17 2004
-@@ -195,7 +195,6 @@
- 	libnautilus-private 	\
- 	libnautilus-adapter	\
- 	src 			\
--	test 			\
- 	components		\
- 	po 			\
- 	data 			\
+--- Makefile.in.orig	Mon Aug 16 11:35:20 2004
++++ Makefile.in	Mon Aug 16 11:35:34 2004
+@@ -179,7 +179,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)
diff --git a/x11-fm/nautilus/files/patch-libbackground_Makefile.in b/x11-fm/nautilus/files/patch-libbackground_Makefile.in
index 413557417..411fe6693 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	Thu Jul 22 11:47:58 2004
-+++ libbackground/Makefile.in	Thu Jul 22 11:48:38 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@
+--- libbackground/Makefile.in.orig	Mon Aug 16 11:36:57 2004
++++ libbackground/Makefile.in	Mon Aug 16 11:37:35 2004
+@@ -171,7 +171,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
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 81604a306..5c55f1f17 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.7.2
-PORTREVISION=	2
+PORTVERSION=	2.7.4
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.7
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index ef7d4a676..e36ef8ab3 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-2.7.2.tar.bz2) = 61e5c920c5e2cbe0c622bf6e40f554f1
-SIZE (gnome2/nautilus-2.7.2.tar.bz2) = 6150723
+MD5 (gnome2/nautilus-2.7.4.tar.bz2) = 12ccef295fd12683c36820bb5406f04b
+SIZE (gnome2/nautilus-2.7.4.tar.bz2) = 5763773
diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus2/files/patch-Makefile.in
index 1881b7c50..7cb9fd809 100644
--- a/x11-fm/nautilus2/files/patch-Makefile.in
+++ b/x11-fm/nautilus2/files/patch-Makefile.in
@@ -1,10 +1,11 @@
---- Makefile.in.orig	Thu Jul 22 11:46:56 2004
-+++ Makefile.in	Thu Jul 22 11:47:17 2004
-@@ -195,7 +195,6 @@
- 	libnautilus-private 	\
- 	libnautilus-adapter	\
- 	src 			\
--	test 			\
- 	components		\
- 	po 			\
- 	data 			\
+--- Makefile.in.orig	Mon Aug 16 11:35:20 2004
++++ Makefile.in	Mon Aug 16 11:35:34 2004
+@@ -179,7 +179,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)
diff --git a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
index 413557417..411fe6693 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	Thu Jul 22 11:47:58 2004
-+++ libbackground/Makefile.in	Thu Jul 22 11:48:38 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@
+--- libbackground/Makefile.in.orig	Mon Aug 16 11:36:57 2004
++++ libbackground/Makefile.in	Mon Aug 16 11:37:35 2004
+@@ -171,7 +171,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
-- 
cgit v1.2.3