Update to 2.4.1.1, based on work done by xtraeme@:

Version 2.4.1.1
  libgnome-desktop
	* Make the localte keystring matching with the desktop entry
	  specification by not removing the modifier from the
	  localestring before matching (Danilo Segan)

Version 2.4.1
  Misc
	* Mark a missing string for translation (Hidetoshi Tajima)
	* Fix build issue with install location of icons (George)
	* Use GRandom instead of srandom() and random() (George)

Version 2.4.0
  gnome-about
	* Fix off by one error with the build date (Young-Ho Cha)

Version 2.3.6.1
  gnome-about
	+ Clean up introductory text (Luis Villa)

Version 2.3.6
  gnome-about
	+ Internalionalize gnome-version.xml so that the descriptive
	  intro and date  can be translated (Malcolm Tredinnick)
	+ Handle errors when clicking on links (Olav Vitters)
  Misc
	+ Follow KDE behaviour when substituting %i, %m, %c and %k
	  in .desktop files (George)
	+ Allow custom icons with the same name as a themed icon to
	  be selected in GnomeDitemEdit (George)
	+ Build fix (Thomas Vander Stichele)

Version 2.3.4
  Misc
	* Allow vendor and date to be configured using configure (Frederic
	  Crozat)
	* Ship the .directory.in files in the distributed tarball (Mark)

Version 2.3.3.1
  Misc
	* Added a default desktop background image (Mark Finlay)
	* Removed icons which belong to gnome-control-center (Mark Finlay)
	* Use macros in gnome-version.xml so we have the correct version
	  number (Andrew Sebola)
	* Renamed "Sound & Video" to "Multimedia (Mark)
	* Use different icon for the "Other" menu (Mark)
	* Fix issues with backwards compat with old icon names (Mark Finlay)
	* Fix gnome-about build with gcc 2.95 (Mark)
	* HIG fixes for .desktop file editing dialog (Dennis Cranston)

Version 2.3.3
	* New GNOME About Dialog ! (Kristian Rietveld,
	                            Mark McLoughlin,
	                            Glynn Foster,
	                            Jeff Waugh)
  Misc
	* Moved some icons to gnome-icon-theme (Mark Finlay)
	* Change icon for Accessories, Games and Programming menus (Mark
	  Finlay)

Version 2.3.2
  gnome-about
	* Hexify contributors list so it doesn't need to be translated and
	  make a format string much easier to translate (Christian Neumair)
  Misc
	* Removed gnome-panel icons (Mark)
	* Removed gnome-games icons (Luca Ferretti)
	* Cygwin fixes (Masahiro Sakai)
	* Fix sgmldocs.make (Art Haas)

Version 2.3.1
	* s/Vendor/Distributor (Mike Newman)

Version 2.2.2
  libgnome-desktop
	* Don't unescape special characteres (e.g. %20) (Bala)

Version 2.2.1
  libgnome-desktop
	* Fix issue with gettext (Frederic Crozat)
	* Don't crash when adding translations to a new Ditem (Arvind)
	* Remove mime type checking from .desktop file loader (Andrew
	  Sobala)
	* Fix memory corruption when DESKTOP_STARTUP_ID is already set
	  (fourdan@xfce.org)
	* Fix silly bug in the option menu of the Ditem edit dialog (Kalle
	  Olavi Niemitalo)
  Miscellanous
	* Update the "Reporting Bugs" docs (Alexander Kirillov)
	* Build fix (Dan Mills)
	* New screenshot icon (Jakub Steiner)

8 files changed, 41 insertions, 94 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index ab9c3db48ce..0cd3d6a50da 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2003/12/13 00:45:26 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/12/14 22:42:15 jmmv Exp $
 #
 
-DISTNAME=		gnome-desktop-2.2.0.1
-PKGREVISION=		4
+DISTNAME=		gnome-desktop-2.4.1.1
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.2/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.4/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
diff --git a/x11/gnome-desktop/PLIST b/x11/gnome-desktop/PLIST
index 198c2eb5f63..af2a717fc8e 100644
--- a/x11/gnome-desktop/PLIST
+++ b/x11/gnome-desktop/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2003/02/14 20:53:41 jmmv Exp $
-bin/gnome2-about
+@comment $NetBSD: PLIST,v 1.4 2003/12/14 22:42: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
 include/gnome-desktop-2.0/libgnomeui/gnome-hint.h
@@ -7,9 +7,20 @@ lib/libgnome-desktop-2.a
 lib/libgnome-desktop-2.la
 lib/libgnome-desktop-2.so
 lib/libgnome-desktop-2.so.3
-lib/libgnome-desktop-2.so.3.4
+lib/libgnome-desktop-2.so.3.9
 lib/pkgconfig/gnome-desktop-2.0.pc
-man/man1/gnome2-about.1
+man/man1/gnome-about.1
+share/gnome-about/gnome-64.gif
+share/gnome-about/gnome-version.xml
+share/gnome-about/headers/header-bg-ancient01a.png
+share/gnome-about/headers/header-bg-city01.png
+share/gnome-about/headers/header-bg-clouds01.png
+share/gnome-about/headers/header-bg-clouds02.png
+share/gnome-about/headers/header-bg-hills01.png
+share/gnome-about/headers/header-bg-landscape01.png
+share/gnome-about/headers/header-bg-mountains01.png
+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/gnome-feedback/C/gnome-feedback.xml
 share/gnome/help/gpl/C/gpl.xml
@@ -22,25 +33,30 @@ share/gnome/vfolders/Graphics.directory
 share/gnome/vfolders/Internet.directory
 share/gnome/vfolders/Multimedia.directory
 share/gnome/vfolders/Office.directory
+share/gnome/vfolders/Other.directory
 share/gnome/vfolders/Root.directory
 share/gnome/vfolders/Settings.directory
 share/gnome/vfolders/System.directory
-share/gnome2-about/contributors.dat
-share/gnome2-about/gnome-version.xml
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/br/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -48,14 +64,21 @@ ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo
 ${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/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
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
+${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/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
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -66,9 +89,9 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo
-${PKGLOCALEDIR}/locale/sp/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -76,14 +99,16 @@ ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 ${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/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
-@dirrm share/gnome2-about
 @dirrm share/gnome/vfolders
 @exec ${MKDIR} %D/share/gnome/help/gnome-feedback/C/figures
 @dirrm share/gnome/help/gnome-feedback/C/figures
 @dirrm share/gnome/help/gnome-feedback/C
 @dirrm share/gnome/help/gnome-feedback
+@dirrm share/gnome-about/headers
+@dirrm share/gnome-about
 @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/buildlink2.mk b/x11/gnome-desktop/buildlink2.mk
index 697aea49602..af27d452390 100644
--- a/x11/gnome-desktop/buildlink2.mk
+++ b/x11/gnome-desktop/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.10 2003/12/13 00:45:26 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2003/12/14 22:42:15 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use gnome-desktop.
 #
@@ -9,7 +9,7 @@
 GNOME_DESKTOP_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-desktop
-BUILDLINK_DEPENDS.gnome-desktop?=	gnome-desktop>=2.2.0.1nb4
+BUILDLINK_DEPENDS.gnome-desktop?=	gnome-desktop>=2.4.1.1
 BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-desktop=gnome-desktop
@@ -18,7 +18,6 @@ BUILDLINK_FILES.gnome-desktop+=	include/gnome-desktop-2.0/libgnome/*
 BUILDLINK_FILES.gnome-desktop+=	include/gnome-desktop-2.0/libgnomeui/*
 BUILDLINK_FILES.gnome-desktop+=	lib/libgnome-desktop-2.*
 
-.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../graphics/libgnomecanvas/buildlink2.mk"
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 6be9e78efc8..d0f62e705bd 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/02/14 20:53:42 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/12/14 22:42:15 jmmv Exp $
 
-SHA1 (gnome-desktop-2.2.0.1.tar.bz2) = 81435f24bf884af3c490fbdd157fb7cffaf570ab
-Size (gnome-desktop-2.2.0.1.tar.bz2) = 1052155 bytes
-SHA1 (patch-aa) = 7098ab0000764a6451ab66132fa148d5af8bc2e0
-SHA1 (patch-ab) = 0df06568ac0ba45475674c7a851e78cad08d293d
-SHA1 (patch-ac) = df2c7c5d9fb957d7fc433c77dd5aa337c4c51d53
-SHA1 (patch-ad) = e1a08df6453404a0c711078f26a22285c163da5d
+SHA1 (gnome-desktop-2.4.1.1.tar.bz2) = d9294bd9633a3c4c522b2db35c67253bbbfb1cee
+Size (gnome-desktop-2.4.1.1.tar.bz2) = 1054097 bytes
 SHA1 (patch-ae) = 85ff31395a7d24693e3125ee5c180a075612207c
diff --git a/x11/gnome-desktop/patches/patch-aa b/x11/gnome-desktop/patches/patch-aa
deleted file mode 100644
index b6729621b02..00000000000
--- a/x11/gnome-desktop/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/14 07:01:43 rh Exp $
-
---- Makefile.in.orig	Thu Sep  5 12:20:35 2002
-+++ Makefile.in
-@@ -140,7 +140,7 @@ SUBDIRS =  	po 				libgnome-desktop 		gn
- EXTRA_DIST =  	gnome-version.xml.in		gnome-version.xml		gnome-desktop.spec.in		gnome-desktop.spec		COPYING-DOCS			HACKING				sgmldocs.make			xmldocs.make			intltool-extract.in		intltool-merge.in		intltool-update.in
- 
- 
--versiondir = $(datadir)/gnome-about
-+versiondir = $(datadir)/gnome2-about
- version_DATA = gnome-version.xml
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11/gnome-desktop/patches/patch-ab b/x11/gnome-desktop/patches/patch-ab
deleted file mode 100644
index 99779bc36ca..00000000000
--- a/x11/gnome-desktop/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/09/14 07:01:43 rh Exp $
-
---- gnome-about/Makefile.in.orig	Thu Sep  5 12:21:00 2002
-+++ gnome-about/Makefile.in
-@@ -149,7 +149,7 @@ bin_PROGRAMS = gnome-about
- gnome_about_SOURCES =  	gnome-about.c			contributors.h
- 
- 
--authorsdir = $(datadir)/gnome-about
-+authorsdir = $(datadir)/gnome2-about
- authors_DATA = contributors.dat
- 
- EXTRA_DIST = logo.xpm $(authors_DATA)
-@@ -207,8 +207,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/gnome/gnome2/' -e 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/gnome/gnome2/' -e 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- 	  else :; fi; \
- 	done
- 
diff --git a/x11/gnome-desktop/patches/patch-ac b/x11/gnome-desktop/patches/patch-ac
deleted file mode 100644
index 263f7193d2e..00000000000
--- a/x11/gnome-desktop/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/02/14 20:53:43 jmmv Exp $
-
---- gnome-about/gnome-about.c.orig	2002-12-10 00:01:43.000000000 +0100
-+++ gnome-about/gnome-about.c
-@@ -305,7 +305,7 @@ cb_clicked (GtkWidget *widget, GdkEvent 
- 			
- 		filename = gnome_program_locate_file (
- 				NULL, GNOME_FILE_DOMAIN_DATADIR,
--				"gnome-about/contributors.dat", TRUE, NULL);
-+				"gnome2-about/contributors.dat", TRUE, NULL);
- 		if (filename)
- 			gnome_sound_play (filename);
- 
-@@ -820,7 +820,7 @@ main (gint argc, gchar *argv[])
- 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- 	textdomain (GETTEXT_PACKAGE);
- 
--	gnome_program_init ("gnome-about","1.0", LIBGNOMEUI_MODULE, argc, argv, NULL);
-+	gnome_program_init ("gnome2-about","1.0", LIBGNOMEUI_MODULE, argc, argv, NULL);
- 	gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-logo-icon-transparent.png");
- 	gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
- 
diff --git a/x11/gnome-desktop/patches/patch-ad b/x11/gnome-desktop/patches/patch-ad
deleted file mode 100644
index 55722d0080a..00000000000
--- a/x11/gnome-desktop/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/09/14 07:01:43 rh Exp $
-
---- man/Makefile.in.orig	Thu Sep  5 12:21:10 2002
-+++ man/Makefile.in
-@@ -174,7 +174,7 @@ install-man1:
- 	  else file=$$i; fi; \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
--	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-+	  inst=`echo $$inst | sed -e 's/gnome/gnome2/' -e '$(transform)'`.$$ext; \
- 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
- 	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
- 	done