Update to 2.9.2.

Someone will have to take a look at the new screenshot tool. I don't feel well,
but it looks like it doesn't find home directory or whatever.


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

5 files changed, 28 insertions, 20 deletions

diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index cc4d9447c..aa7b61d32 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomeutils2
-PORTVERSION=	2.9.0
+PORTVERSION=	2.9.2
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -29,6 +29,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1
-GCONF_SCHEMAS=	gdict.schemas gnome-search-tool.schemas logview.schemas
+GCONF_SCHEMAS=	gdict.schemas gnome-screenshot.schemas \
+		gnome-search-tool.schemas logview.schemas
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index fda548b35..d6658b561 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-utils-2.9.0.tar.bz2) = 9f9a189c154c648be1f82874a0c8e6ba
-SIZE (gnome2/gnome-utils-2.9.0.tar.bz2) = 1714176
+MD5 (gnome2/gnome-utils-2.9.2.tar.bz2) = a35a2cdb8275151503023b5f54d1d5bd
+SIZE (gnome2/gnome-utils-2.9.2.tar.bz2) = 1775245
diff --git a/deskutils/gnome-utils/files/patch-logview_logview.c b/deskutils/gnome-utils/files/patch-logview_logview.c
index 942ed8a02..4ac243d34 100644
--- a/deskutils/gnome-utils/files/patch-logview_logview.c
+++ b/deskutils/gnome-utils/files/patch-logview_logview.c
@@ -1,37 +1,29 @@
---- logview/logview.c.orig	Fri May  7 21:47:59 2004
-+++ logview/logview.c	Wed Aug  4 18:40:24 2004
-@@ -781,7 +781,7 @@
+--- logview/logview.c.orig	Tue Nov 30 00:29:01 2004
++++ logview/logview.c	Tue Nov 30 00:30:44 2004
+@@ -656,7 +656,7 @@
  
  	if ( ! found) {
  		g_snprintf (full_name, sizeof (full_name),
 -			    "%s/share/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX);
-+			    "%s/gnome-system-log/gnome-system-log-regexp.db", DATADIR);
++			    "%s/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX);
  		if (access (full_name, R_OK) == 0) {
  			found = TRUE;
  			g_free (cfg->regexp_db_path);
-@@ -804,7 +804,7 @@
+@@ -678,7 +678,7 @@
  
  	if ( ! found) {
  		g_snprintf (full_name, sizeof (full_name),
 -			    "%s/share/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX);
-+			    "%s/gnome-system-log/gnome-system-log-descript.db", DATADIR);
++			    "%s/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX);
  		if (access (full_name, R_OK) == 0) {
  			found = TRUE;
  			g_free (cfg->descript_db_path);
-@@ -838,7 +838,7 @@
+@@ -709,7 +709,7 @@
  
  	if ( ! found) {
  		g_snprintf (full_name, sizeof (full_name),
 -			    "%s/share/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX);
-+			    "%s/gnome-system-log/gnome-system-log-actions.db", DATADIR);
++			    "%s/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX);
  		if (access (full_name, R_OK) == 0) {
  			found = TRUE;
  			g_free (cfg->action_db_path);
-@@ -922,6 +922,7 @@
-             /* remove trailing newline */
-             if (logfile[strlen(logfile)-1] == '\n')
-                 logfile[strlen(logfile)-1] = '\0';
-+	    if (strcmp (logfile, "/dev/console") == 0) continue;
-             fprintf(stderr, "Found a logfile: (%s)\n", logfile);
-             return logfile;
-         }
diff --git a/deskutils/gnome-utils/files/patch-logview_userprefs.c b/deskutils/gnome-utils/files/patch-logview_userprefs.c
new file mode 100644
index 000000000..d93f8ae57
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_userprefs.c
@@ -0,0 +1,10 @@
+--- logview/userprefs.c.orig	Tue Nov 30 00:35:05 2004
++++ logview/userprefs.c	Tue Nov 30 00:36:34 2004
+@@ -56,6 +56,7 @@
+ 			/* remove trailing newline */
+ 			if (logfile[strlen(logfile)-1] == '\n')
+ 				logfile[strlen(logfile)-1] = '\0';
++			if (strcmp (logfile, "/dev/console") == 0) continue;
+ 			return logfile;
+ 		}
+ 	}
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index cc9008367..5736459b6 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -1,4 +1,6 @@
 bin/gnome-dictionary
+bin/gnome-panel-screenshot
+bin/gnome-screenshot
 bin/gnome-search-tool
 bin/gnome-system-log
 libdata/bonobo/servers/GNOME_GDictApplet.server
@@ -7,6 +9,7 @@ share/gnome/applications/gnome-dictionary.desktop
 share/gnome/applications/gnome-search-tool.desktop
 share/gnome/applications/gnome-system-log.desktop
 share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml
+share/gnome/gnome-screenshot/glade/gnome-screenshot.glade
 share/gnome/gnome-system-log/gnome-system-log-actions.db
 share/gnome/gnome-system-log/gnome-system-log-descript.db
 share/gnome/gnome-system-log/gnome-system-log-regexp.db
@@ -212,3 +215,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-dictionary/C
 @dirrm share/gnome/help/gnome-dictionary
 @dirrm share/gnome/gnome-system-log
+@dirrm share/gnome/gnome-screenshot/glade
+@dirrm share/gnome/gnome-screenshot