Update to 2.9.3.

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

8 files changed, 16 insertions, 52 deletions

diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index adcc1b072..9754ba5fc 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomeutils2
-PORTVERSION=	2.9.2
-PORTREVISION=	2
+PORTVERSION=	2.9.3
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -33,4 +32,9 @@ MAN1=		gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1
 GCONF_SCHEMAS=	gdict.schemas gnome-screenshot.schemas \
 		gnome-search-tool.schemas logview.schemas
 
+post-patch:
+	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|
$$||g'
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
+
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index d6658b561..f19491950 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-utils-2.9.2.tar.bz2) = a35a2cdb8275151503023b5f54d1d5bd
-SIZE (gnome2/gnome-utils-2.9.2.tar.bz2) = 1775245
+MD5 (gnome2/gnome-utils-2.9.3.tar.bz2) = e8f813e87bce900503a6b865a0279ecf
+SIZE (gnome2/gnome-utils-2.9.3.tar.bz2) = 1808258
diff --git a/deskutils/gnome-utils/files/patch-gsearchtool.c b/deskutils/gnome-utils/files/patch-gsearchtool.c
deleted file mode 100644
index 796a47fa8..000000000
--- a/deskutils/gnome-utils/files/patch-gsearchtool.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gsearchtool/gsearchtool.c.orig	Fri Dec 17 10:31:38 2004
-+++ gsearchtool/gsearchtool.c	Fri Dec 17 10:33:11 2004
-@@ -2025,7 +2025,7 @@
- 	
- 	gtk_table_attach(GTK_TABLE(interface.table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
- 	
--	interface.look_in_folder_entry = gtk_file_chooser_button_new (_("Browse"));
-+	interface.look_in_folder_entry = gtk_file_chooser_button_new (_("Browse"), GTK_FILE_CHOOSER_ACTION_OPEN);
- 	gtk_file_chooser_set_action (GTK_FILE_CHOOSER (interface.look_in_folder_entry), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
- 	gtk_label_set_mnemonic_widget (GTK_LABEL(label), GTK_WIDGET (interface.look_in_folder_entry));		
- 	gtk_table_attach (GTK_TABLE(interface.table), interface.look_in_folder_entry, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0, 0, 0);
diff --git a/deskutils/gnome-utils/files/patch-screenshot-dialog.c b/deskutils/gnome-utils/files/patch-screenshot-dialog.c
deleted file mode 100644
index e0c3b795b..000000000
--- a/deskutils/gnome-utils/files/patch-screenshot-dialog.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-screenshot/screenshot-dialog.c.orig	Fri Dec 17 10:34:55 2004
-+++ gnome-screenshot/screenshot-dialog.c	Fri Dec 17 10:35:38 2004
-@@ -210,7 +210,7 @@
-   dialog->filename_entry = glade_xml_get_widget (dialog->xml, "filename_entry");
-   file_chooser_frame = glade_xml_get_widget (dialog->xml, "file_chooser_frame");
- 
--  dialog->save_widget = gtk_file_chooser_button_new ("Select a directory");
-+  dialog->save_widget = gtk_file_chooser_button_new ("Select a directory",GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-   gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog->save_widget), FALSE);
-   gtk_file_chooser_set_action (GTK_FILE_CHOOSER (dialog->save_widget),
- 			       GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index adcc1b072..9754ba5fc 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomeutils2
-PORTVERSION=	2.9.2
-PORTREVISION=	2
+PORTVERSION=	2.9.3
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -33,4 +32,9 @@ MAN1=		gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1
 GCONF_SCHEMAS=	gdict.schemas gnome-screenshot.schemas \
 		gnome-search-tool.schemas logview.schemas
 
+post-patch:
+	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|
$$||g'
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
+
 .include <bsd.port.mk>
diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
index d6658b561..f19491950 100644
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/gnomeutils2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-utils-2.9.2.tar.bz2) = a35a2cdb8275151503023b5f54d1d5bd
-SIZE (gnome2/gnome-utils-2.9.2.tar.bz2) = 1775245
+MD5 (gnome2/gnome-utils-2.9.3.tar.bz2) = e8f813e87bce900503a6b865a0279ecf
+SIZE (gnome2/gnome-utils-2.9.3.tar.bz2) = 1808258
diff --git a/deskutils/gnomeutils2/files/patch-gsearchtool.c b/deskutils/gnomeutils2/files/patch-gsearchtool.c
deleted file mode 100644
index 796a47fa8..000000000
--- a/deskutils/gnomeutils2/files/patch-gsearchtool.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gsearchtool/gsearchtool.c.orig	Fri Dec 17 10:31:38 2004
-+++ gsearchtool/gsearchtool.c	Fri Dec 17 10:33:11 2004
-@@ -2025,7 +2025,7 @@
- 	
- 	gtk_table_attach(GTK_TABLE(interface.table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
- 	
--	interface.look_in_folder_entry = gtk_file_chooser_button_new (_("Browse"));
-+	interface.look_in_folder_entry = gtk_file_chooser_button_new (_("Browse"), GTK_FILE_CHOOSER_ACTION_OPEN);
- 	gtk_file_chooser_set_action (GTK_FILE_CHOOSER (interface.look_in_folder_entry), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
- 	gtk_label_set_mnemonic_widget (GTK_LABEL(label), GTK_WIDGET (interface.look_in_folder_entry));		
- 	gtk_table_attach (GTK_TABLE(interface.table), interface.look_in_folder_entry, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0, 0, 0);
diff --git a/deskutils/gnomeutils2/files/patch-screenshot-dialog.c b/deskutils/gnomeutils2/files/patch-screenshot-dialog.c
deleted file mode 100644
index e0c3b795b..000000000
--- a/deskutils/gnomeutils2/files/patch-screenshot-dialog.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-screenshot/screenshot-dialog.c.orig	Fri Dec 17 10:34:55 2004
-+++ gnome-screenshot/screenshot-dialog.c	Fri Dec 17 10:35:38 2004
-@@ -210,7 +210,7 @@
-   dialog->filename_entry = glade_xml_get_widget (dialog->xml, "filename_entry");
-   file_chooser_frame = glade_xml_get_widget (dialog->xml, "file_chooser_frame");
- 
--  dialog->save_widget = gtk_file_chooser_button_new ("Select a directory");
-+  dialog->save_widget = gtk_file_chooser_button_new ("Select a directory",GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-   gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog->save_widget), FALSE);
-   gtk_file_chooser_set_action (GTK_FILE_CHOOSER (dialog->save_widget),
- 			       GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);