Update gnome2-pixmaps and gnome-desktop to 2.8.0. This version corresponds

to GNOME 2.8.0.

=============
Version 2.8.0
=============

  Translators

	* Mətin Əmirov (az)
	* Amila Akagić (bs)
	* Adam Weinberger (en_CA)
	* Jesús Bravo Álvarez (gl)
	* Gabor Kelemen (hu)
	* Takeshi AIHANA (ja)
	* Mişu Moldovan (ro)

==============
Version 2.7.92
==============

  Fixes

	* Change link in gnome-about from gnomedesktop.org to news.gnome.org (Alan Horkan)

  Translators

	* Kemal Sanjta (bs)
	* Jordi Mallach (ca)
	* Pauli Virtanen (fi)
	* Kjartan Maraas (nb)
	* Elian Myftiu (sq)
	* Maxim Dziumanenko (uk)

==============
Version 2.7.91
==============

  Fixes

	* Fix memory leak (Mark)
	* Fix crash with some .desktop files (Vincent Untz)
	* Fix compilation without startup-notification (Mariano Suárez-Alvarez)

==============
Version 2.7.90
==============

  Fixes

	* Randomize the order of the credits in gnome-about (Matthew Garrett)
	* Fix end of list corruption in gnome-about (Matthew Garrett)

  Translators

	* Elian Myftiu (sq)
	* Abayomi Mobolaji Onibudo (yo)

=============
Version 2.7.4
=============

  Fixes

	* Use the correct X timestamp with startup-notification (Elijah Newren, Mark)
	* Remove egg_spawn usage from libgnome-desktop (Mark)
	* Fix DTD validation errors in omf files (Frederic Crozat, Mariano Suárez-Alvarez)

  Translators

	* Peter "Peshka" Slavov (bg)
	* Pawan Chitrakar (ne)
	* Laurent Dhima (sq)

=============
Version 2.7.3
=============

  Translators

	* Suman Raj Tiwari (ne)
	* Elian Myftiu (sq)

=============
Version 2.7.1
=============

  Fixes

	* Make the languages list in .desktop editor use GTK_SHADOW_IN (Jorn Baayen)

  Help Docs

	* Basque documentation translations (Pablo Saratxaga)

  Translators

	* Žygimantas Beručka (lt)
	* Gurban Mühemmet Tewekgeli (tk)

6 files changed, 19 insertions, 33 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 962bdab2aab..5fa07556a28 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2004/06/28 13:59:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.29 2004/09/21 16:54:06 jmmv Exp $
 #
 
-DISTNAME=		gnome-desktop-2.6.2
+DISTNAME=		gnome-desktop-2.8.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.6/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.8/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
diff --git a/x11/gnome-desktop/PLIST b/x11/gnome-desktop/PLIST
index 0008d386a12..bbf58dd22ad 100644
--- a/x11/gnome-desktop/PLIST
+++ b/x11/gnome-desktop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/06/28 13:59:34 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/09/21 16:54:06 jmmv Exp $
 bin/gnome-about
 include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
 include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
@@ -87,6 +87,7 @@ ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -111,6 +112,7 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 share/omf/gnome-desktop/fdl-C.omf
@@ -139,6 +141,7 @@ share/omf/gnome-desktop/lgpl-eu.omf
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/gnome-about/headers
 @dirrm share/gnome-about
+@comment in gnome2-dirs: @dirrm share/gnome
 @dirrm include/gnome-desktop-2.0/libgnomeui
 @dirrm include/gnome-desktop-2.0/libgnome
 @dirrm include/gnome-desktop-2.0
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index 9890a3afed5..bcd071271ee 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/05/15 14:55:46 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/09/21 16:54:06 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_DESKTOP_BUILDLINK3_MK:=	${GNOME_DESKTOP_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-desktop}
 BUILDLINK_PACKAGES+=	gnome-desktop
 
 .if !empty(GNOME_DESKTOP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-desktop+=	gnome-desktop>=2.6.0
+BUILDLINK_DEPENDS.gnome-desktop+=	gnome-desktop>=2.8.0
 BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 
 PRINT_PLIST_AWK+=	/^@dirrm share\/gnome\/vfolders$$/ \
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 27b1accf91b..f43c2588e4f 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2004/06/28 13:59:34 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2004/09/21 16:54:06 jmmv Exp $
 
-SHA1 (gnome-desktop-2.6.2.tar.bz2) = ae63e93486d3b63c5c8ead6a0f67dc1793d1fe4f
-Size (gnome-desktop-2.6.2.tar.bz2) = 1131159 bytes
+SHA1 (gnome-desktop-2.8.0.tar.bz2) = af1156960f9bf6c4a55fd92cfb51b48f2d7b7c9b
+Size (gnome-desktop-2.8.0.tar.bz2) = 1117368 bytes
 SHA1 (patch-ae) = 85ff31395a7d24693e3125ee5c180a075612207c
-SHA1 (patch-af) = 5add103655b1e2996ea041de59156196bbf6f180
-SHA1 (patch-ag) = 2b2b757a9ecd2ee6348a52f51c48749bd78f29e4
+SHA1 (patch-ag) = ad8d3466bdfe18c1b853ba69f863db35a5891996
diff --git a/x11/gnome-desktop/patches/patch-af b/x11/gnome-desktop/patches/patch-af
deleted file mode 100644
index 6b647bc2279..00000000000
--- a/x11/gnome-desktop/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/05/11 12:31:27 danw Exp $
-
---- libgnome-desktop/egg-spawn.c.orig	Tue Apr 13 08:49:36 2004
-+++ libgnome-desktop/egg-spawn.c
-@@ -28,6 +28,11 @@
- #include <glib.h>
- #include <gdk/gdk.h>
- 
-+#if defined(__APPLE__)
-+#include <crt_externs.h>
-+#define environ (*_NSGetEnviron())
-+#endif
-+
- extern char **environ;
- 
- /**
diff --git a/x11/gnome-desktop/patches/patch-ag b/x11/gnome-desktop/patches/patch-ag
index 7f28f7d0ece..ef95c48bd56 100644
--- a/x11/gnome-desktop/patches/patch-ag
+++ b/x11/gnome-desktop/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.1 2004/05/11 12:31:27 danw Exp $
+$NetBSD: patch-ag,v 1.2 2004/09/21 16:54:06 jmmv Exp $
 
---- libgnome-desktop/gnome-desktop-item.c.orig	Tue Apr 13 08:49:43 2004
+--- libgnome-desktop/gnome-desktop-item.c.orig	2004-08-06 08:52:22.000000000 +0200
 +++ libgnome-desktop/gnome-desktop-item.c
-@@ -1396,6 +1396,11 @@ sn_error_trap_pop (SnDisplay *display,
- 	gdk_error_trap_pop ();
- }
+@@ -62,6 +62,11 @@
+ 
+ #define sure_string(s) ((s)!=NULL?(s):"")
  
 +#if defined(__APPLE__)
 +#include <crt_externs.h>
@@ -13,4 +13,4 @@ $NetBSD: patch-ag,v 1.1 2004/05/11 12:31:27 danw Exp $
 +
  extern char **environ;
  
- static char **
+ struct _GnomeDesktopItem {