Update to 2.14.0:

==============
Version 2.14.0
==============

  Fixes

	* Don't use a GtkEntry function on a GnomeFileEntry (Vincent)

  Translators

	* Ales Nyakhaychyk (be)
	* Jérémy Le Floc'h (br)
	* Petr Tomeš (cs)
	* Martin Willemoes Hansen (da)
	* Raivis Dejus (lv)
	* Åsmund Skjæveland (nn)

===============
Version 2.13.92
===============

  Misc

	* Report the correct version number in gnome-about --version
	  (Glynn Foster)

  Documentation

	* Added a description for gnome-feedback (Brent Smith)

  Doc Translations

	* Luca Ferretti (it)

  Translators

	* Jakub Friedl (cs)
	* Farzaneh Sarafraz (fa)
	* Vladimer SIchinava (ka)
	* Raivis Dejus (lv)
	* Licio Fernando Nascimento da Fonseca (pt_BR)

===============
Version 2.13.91
===============

  Doc Translations

	* Francisco Javier F. Serrador (es)

===============
Version 2.13.90
===============

  Fixes

	* Fix crash when no icon file can be found for the .desktop file
	  (Vincent)

  Doc Translations

	* Christophe Bliard (fr)

  Translators

	* Luca Ferretti (it)

===============
Version 2.13.4
===============

  Misc

	* Fix .desktop file (Vincent Untz)

===============
Version 2.13.3
===============

  Misc

	* Fix warnings (Kjartan Maraas)

===============
Version 2.13.2
===============

  Misc

	* Fix build on Darwin (Mark)

  Translators

	* Erdal Ronahi (ku)
	* Timur Jamakeev (ky)

===============
Version 2.13.1
===============

  Misc

	* Remove scrollkeeper hack (Vincent)

  Translators

	* Tino Meinen (nl)
	* Christian Rose (sv)
	* Clytie Siddall (vi)

6 files changed, 35 insertions, 12 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index c45ee67a3e6..c9f5ec82741 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2006/03/21 06:00:52 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2006/03/30 21:47:15 jmmv Exp $
 #
 
-DISTNAME=		gnome-desktop-2.12.3
-PKGREVISION=		2
+DISTNAME=		gnome-desktop-2.14.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.12/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.14/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -19,8 +18,15 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake perl:run pkg-config
 USE_LIBTOOL=		yes
 
+CONFIGURE_ARGS+=	--with-gnome-distributor="The NetBSD Foundation"
+
 BUILDLINK_DEPENDS.glib2+=	glib2>=2.8.0
 
+post-install:
+.for f in netbsd-logo-icon.png netbsd-logo-icon-transparent.png
+	${INSTALL_DATA} ${FILESDIR}/${f} ${PREFIX}/share/pixmaps/${f}
+.endfor
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnome-desktop/PLIST b/x11/gnome-desktop/PLIST
index 0388dd12b59..5d516079385 100644
--- a/x11/gnome-desktop/PLIST
+++ b/x11/gnome-desktop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2005/10/12 21:52:01 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.16 2006/03/30 21:47:15 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
@@ -20,14 +20,19 @@ share/gnome-about/headers/header-bg-snow01.png
 share/gnome-about/headers/header-bg-sunset01.png
 share/gnome/help/fdl/C/fdl.xml
 share/gnome/help/fdl/es/fdl.xml
+share/gnome/help/fdl/fr/fdl.xml
 share/gnome/help/gnome-feedback/C/gnome-feedback.xml
 share/gnome/help/gnome-feedback/es/gnome-feedback.xml
+share/gnome/help/gnome-feedback/fr/gnome-feedback.xml
+share/gnome/help/gnome-feedback/it/gnome-feedback.xml
 share/gnome/help/gpl/C/gpl.xml
 share/gnome/help/gpl/es/gpl.xml
 share/gnome/help/gpl/fi/gpl.xml
+share/gnome/help/gpl/fr/gpl.xml
 share/gnome/help/gpl/pa/gpl.xml
 share/gnome/help/lgpl/C/lgpl.xml
 share/gnome/help/lgpl/es/lgpl.xml
+share/gnome/help/lgpl/fr/lgpl.xml
 share/gnome/help/lgpl/pa/lgpl.xml
 ${PKGLOCALEDIR}/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -68,6 +73,7 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/ku/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/ky/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -113,14 +119,19 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
 share/omf/fdl/fdl-C.omf
 share/omf/fdl/fdl-es.omf
+share/omf/fdl/fdl-fr.omf
 share/omf/gnome-feedback/gnome-feedback-C.omf
 share/omf/gnome-feedback/gnome-feedback-es.omf
+share/omf/gnome-feedback/gnome-feedback-fr.omf
+share/omf/gnome-feedback/gnome-feedback-it.omf
 share/omf/gpl/gpl-C.omf
 share/omf/gpl/gpl-es.omf
 share/omf/gpl/gpl-fi.omf
+share/omf/gpl/gpl-fr.omf
 share/omf/gpl/gpl-pa.omf
 share/omf/lgpl/lgpl-C.omf
 share/omf/lgpl/lgpl-es.omf
+share/omf/lgpl/lgpl-fr.omf
 share/omf/lgpl/lgpl-pa.omf
 share/pixmaps/apple-green.png
 share/pixmaps/apple-red.png
@@ -194,6 +205,8 @@ share/pixmaps/gnome-xterm.png
 share/pixmaps/gtkvim.png
 share/pixmaps/kterm.xpm
 share/pixmaps/monitor.png
+share/pixmaps/netbsd-logo-icon-transparent.png
+share/pixmaps/netbsd-logo-icon.png
 share/pixmaps/vnterm.xpm
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/lgpl
@@ -202,17 +215,22 @@ share/pixmaps/vnterm.xpm
 @dirrm share/omf/fdl
 @comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/lgpl/pa
+@dirrm share/gnome/help/lgpl/fr
 @dirrm share/gnome/help/lgpl/es
 @comment in gnome2-dirs: @dirrm share/gnome/help/lgpl/C
 @comment in gnome2-dirs: @dirrm share/gnome/help/lgpl
 @dirrm share/gnome/help/gpl/pa
+@dirrm share/gnome/help/gpl/fr
 @dirrm share/gnome/help/gpl/fi
 @dirrm share/gnome/help/gpl/es
 @comment in gnome2-dirs: @dirrm share/gnome/help/gpl/C
 @comment in gnome2-dirs: @dirrm share/gnome/help/gpl
+@dirrm share/gnome/help/gnome-feedback/it
+@dirrm share/gnome/help/gnome-feedback/fr
 @dirrm share/gnome/help/gnome-feedback/es
 @dirrm share/gnome/help/gnome-feedback/C
 @dirrm share/gnome/help/gnome-feedback
+@dirrm share/gnome/help/fdl/fr
 @dirrm share/gnome/help/fdl/es
 @comment in gnome2-dirs: @dirrm share/gnome/help/fdl/C
 @comment in gnome2-dirs: @dirrm share/gnome/help/fdl
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index e7a0935e5f6..4fbbc734b63 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/03/06 00:18:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/03/30 21:47:15 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_DESKTOP_BUILDLINK3_MK:=	${GNOME_DESKTOP_BUILDLINK3_MK}+
@@ -11,8 +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.12.1
-BUILDLINK_RECOMMENDED.gnome-desktop?=	gnome-desktop>=2.12.3
+BUILDLINK_DEPENDS.gnome-desktop+=	gnome-desktop>=2.14.0
 BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 .endif	# GNOME_DESKTOP_BUILDLINK3_MK
 
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 2a9b2d43880..c4548a95389 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2006/02/11 18:13:28 wiz Exp $
+$NetBSD: distinfo,v 1.20 2006/03/30 21:47:15 jmmv Exp $
 
-SHA1 (gnome-desktop-2.12.3.tar.bz2) = 8423d302af7d3a85a01a4da69c60333b465fd88a
-RMD160 (gnome-desktop-2.12.3.tar.bz2) = be564d4ff4ca753596c2488c1661288c88dbe00d
-Size (gnome-desktop-2.12.3.tar.bz2) = 1036062 bytes
+SHA1 (gnome-desktop-2.14.0.tar.bz2) = 4aa4d2ae40355112d2afe6a0157245615e6a7245
+RMD160 (gnome-desktop-2.14.0.tar.bz2) = b2657a8c7b743278f3e1abf0a20569a6a30f34ff
+Size (gnome-desktop-2.14.0.tar.bz2) = 1103449 bytes
diff --git a/x11/gnome-desktop/files/netbsd-logo-icon-transparent.png b/x11/gnome-desktop/files/netbsd-logo-icon-transparent.png
new file mode 100644
index 00000000000..768ddbf8663
--- /dev/null
+++ b/x11/gnome-desktop/files/netbsd-logo-icon-transparent.png
diff --git a/x11/gnome-desktop/files/netbsd-logo-icon.png b/x11/gnome-desktop/files/netbsd-logo-icon.png
new file mode 100644
index 00000000000..2db48ec14d3
--- /dev/null
+++ b/x11/gnome-desktop/files/netbsd-logo-icon.png