Update to 2.1.4.

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

10 files changed, 50 insertions, 48 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index f5039684e..a7f6ca419 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTVERSION=	2.1.4
 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 c5046cc08..2d2181585 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.1.3.tar.bz2) = a6f372104cfd03ed56846cba474e61e8
+MD5 (gnome2/nautilus-2.1.4.tar.bz2) = efb9e3f09dcdb7cbce2ee61f836750ef
diff --git a/x11-fm/nautilus/files/patch-Makefile.in b/x11-fm/nautilus/files/patch-Makefile.in
index 175d74d23..dd27d3a1b 100644
--- a/x11-fm/nautilus/files/patch-Makefile.in
+++ b/x11-fm/nautilus/files/patch-Makefile.in
@@ -1,10 +1,11 @@
---- 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 			\
+--- Makefile.in.orig	Tue Dec 10 16:43:48 2002
++++ Makefile.in	Tue Dec 10 16:44:13 2002
+@@ -146,7 +146,7 @@
+ 
+ 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)
diff --git a/x11-fm/nautilus/files/patch-libbackground_Makefile.in b/x11-fm/nautilus/files/patch-libbackground_Makefile.in
index d35ac9cc6..8278adc9c 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 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@
+--- libbackground/Makefile.in.orig	Tue Dec 10 16:44:41 2002
++++ libbackground/Makefile.in	Tue Dec 10 16:45:24 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
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index c412aff8f..0b7a86c82 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -309,6 +309,7 @@ share/locale/ro/LC_MESSAGES/nautilus.mo
 share/locale/ru/LC_MESSAGES/nautilus.mo
 share/locale/sk/LC_MESSAGES/nautilus.mo
 share/locale/sl/LC_MESSAGES/nautilus.mo
+share/locale/sq/LC_MESSAGES/nautilus.mo
 share/locale/sv/LC_MESSAGES/nautilus.mo
 share/locale/ta/LC_MESSAGES/nautilus.mo
 share/locale/tr/LC_MESSAGES/nautilus.mo
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index f5039684e..a7f6ca419 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTVERSION=	2.1.4
 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 c5046cc08..2d2181585 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.1.3.tar.bz2) = a6f372104cfd03ed56846cba474e61e8
+MD5 (gnome2/nautilus-2.1.4.tar.bz2) = efb9e3f09dcdb7cbce2ee61f836750ef
diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus2/files/patch-Makefile.in
index 175d74d23..dd27d3a1b 100644
--- a/x11-fm/nautilus2/files/patch-Makefile.in
+++ b/x11-fm/nautilus2/files/patch-Makefile.in
@@ -1,10 +1,11 @@
---- 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 			\
+--- Makefile.in.orig	Tue Dec 10 16:43:48 2002
++++ Makefile.in	Tue Dec 10 16:44:13 2002
+@@ -146,7 +146,7 @@
+ 
+ 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)
diff --git a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
index d35ac9cc6..8278adc9c 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	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@
+--- libbackground/Makefile.in.orig	Tue Dec 10 16:44:41 2002
++++ libbackground/Makefile.in	Tue Dec 10 16:45:24 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
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index c412aff8f..0b7a86c82 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -309,6 +309,7 @@ share/locale/ro/LC_MESSAGES/nautilus.mo
 share/locale/ru/LC_MESSAGES/nautilus.mo
 share/locale/sk/LC_MESSAGES/nautilus.mo
 share/locale/sl/LC_MESSAGES/nautilus.mo
+share/locale/sq/LC_MESSAGES/nautilus.mo
 share/locale/sv/LC_MESSAGES/nautilus.mo
 share/locale/ta/LC_MESSAGES/nautilus.mo
 share/locale/tr/LC_MESSAGES/nautilus.mo