Update to 2.2.0.1. This version includes several new translations.

5 files changed, 24 insertions, 43 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index e4978b9cb37..4f56d5fddb8 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/01/10 07:58:48 cjep Exp $
+# $NetBSD: Makefile,v 1.7 2003/02/14 20:53:41 jmmv Exp $
 #
 
-DISTNAME=		gnome-desktop-2.0.10
-PKGREVISION=		1
+DISTNAME=		gnome-desktop-2.2.0.1
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.0/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.2/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@netbsd.org
@@ -12,12 +11,12 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Common GNOME2 desktop files and libgnome-desktop library
 
 BUILD_USES_MSGFMT=	yes
+DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GMAKE=		yes
-USE_GNU_GETTEXT=	yes
 USE_PERL5=		yes
 USE_X11=		yes
 
diff --git a/x11/gnome-desktop/PLIST b/x11/gnome-desktop/PLIST
index f0837aaeadb..198c2eb5f63 100644
--- a/x11/gnome-desktop/PLIST
+++ b/x11/gnome-desktop/PLIST
@@ -1,14 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/16 21:26:55 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/02/14 20:53:41 jmmv Exp $
 bin/gnome2-about
 include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
-include/gnome-desktop-2.0/libgnome/gnome-icon-loader.h
 include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
 include/gnome-desktop-2.0/libgnomeui/gnome-hint.h
 lib/libgnome-desktop-2.a
 lib/libgnome-desktop-2.la
 lib/libgnome-desktop-2.so
-lib/libgnome-desktop-2.so.0
-lib/libgnome-desktop-2.so.0.6
+lib/libgnome-desktop-2.so.3
+lib/libgnome-desktop-2.so.3.4
 lib/pkgconfig/gnome-desktop-2.0.pc
 man/man1/gnome2-about.1
 share/gnome/help/fdl/C/fdl.xml
@@ -20,18 +19,14 @@ share/gnome/vfolders/Applications.directory
 share/gnome/vfolders/Development.directory
 share/gnome/vfolders/Games.directory
 share/gnome/vfolders/Graphics.directory
-share/gnome/vfolders/Home.directory
 share/gnome/vfolders/Internet.directory
 share/gnome/vfolders/Multimedia.directory
 share/gnome/vfolders/Office.directory
 share/gnome/vfolders/Root.directory
-share/gnome/vfolders/Root.order
 share/gnome/vfolders/Settings.directory
-share/gnome/vfolders/Settings.order
 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
@@ -59,6 +54,7 @@ ${PKGLOCALEDIR}/locale/ko/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/mn/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/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
@@ -71,9 +67,11 @@ ${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/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
 ${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
@@ -82,24 +80,10 @@ ${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/lgpl/C/figures
-@unexec ${RMDIR} %D/share/gnome/help/lgpl/C/figures 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/help/lgpl/C 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/help/lgpl 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/share/gnome/help/gpl/C/figures
-@unexec ${RMDIR} %D/share/gnome/help/gpl/C/figures 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/help/gpl/C 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/help/gpl 2>/dev/null || ${TRUE}
 @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
-@exec ${MKDIR} %D/share/gnome/help/fdl/C/figures
-@unexec ${RMDIR} %D/share/gnome/help/fdl/C/figures 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/help/fdl/C 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/help/fdl 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/help 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome 2>/dev/null || ${TRUE}
 @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 06049329f99..bbcc0fb8cfb 100644
--- a/x11/gnome-desktop/buildlink2.mk
+++ b/x11/gnome-desktop/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/12/24 06:10:30 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/02/14 20:53:42 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use gnome-desktop.
 #
@@ -9,15 +9,13 @@
 GNOME_DESKTOP_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-desktop
-BUILDLINK_DEPENDS.gnome-desktop?=		gnome-desktop>=2.0.10nb1
-BUILDLINK_PKGSRCDIR.gnome-desktop?=		../../x11/gnome-desktop
+BUILDLINK_DEPENDS.gnome-desktop?=	gnome-desktop>=2.2.0.1
+BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-desktop=gnome-desktop
 BUILDLINK_PREFIX.gnome-desktop_DEFAULT=	${X11PREFIX}
-BUILDLINK_FILES.gnome-desktop+=	include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
-BUILDLINK_FILES.gnome-desktop+=	include/gnome-desktop-2.0/libgnome/gnome-icon-loader.h
-BUILDLINK_FILES.gnome-desktop+=	include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
-BUILDLINK_FILES.gnome-desktop+=	include/gnome-desktop-2.0/libgnomeui/gnome-hint.h
+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"
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index c93abf2b4b2..6be9e78efc8 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2002/12/16 21:26:55 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2003/02/14 20:53:42 jmmv Exp $
 
-SHA1 (gnome-desktop-2.0.10.tar.bz2) = 72a43eacb3c3b1add6a593e8d804491c6342b86c
-Size (gnome-desktop-2.0.10.tar.bz2) = 1084473 bytes
+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) = abe74de44456c61ffef93b476f1950d603380082
+SHA1 (patch-ac) = df2c7c5d9fb957d7fc433c77dd5aa337c4c51d53
 SHA1 (patch-ad) = e1a08df6453404a0c711078f26a22285c163da5d
 SHA1 (patch-ae) = 85ff31395a7d24693e3125ee5c180a075612207c
diff --git a/x11/gnome-desktop/patches/patch-ac b/x11/gnome-desktop/patches/patch-ac
index 61bb3ab86da..263f7193d2e 100644
--- a/x11/gnome-desktop/patches/patch-ac
+++ b/x11/gnome-desktop/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/09/14 07:01:43 rh Exp $
+$NetBSD: patch-ac,v 1.2 2003/02/14 20:53:43 jmmv Exp $
 
---- gnome-about/gnome-about.c.orig	Mon Aug 26 23:54:46 2002
+--- gnome-about/gnome-about.c.orig	2002-12-10 00:01:43.000000000 +0100
 +++ gnome-about/gnome-about.c
-@@ -299,7 +299,7 @@ cb_clicked (GtkWidget *widget, GdkEvent 
+@@ -305,7 +305,7 @@ cb_clicked (GtkWidget *widget, GdkEvent 
  			
  		filename = gnome_program_locate_file (
  				NULL, GNOME_FILE_DOMAIN_DATADIR,
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/09/14 07:01:43 rh Exp $
  		if (filename)
  			gnome_sound_play (filename);
  
-@@ -718,7 +718,7 @@ main (gint argc, gchar *argv[])
+@@ -820,7 +820,7 @@ main (gint argc, gchar *argv[])
  	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
  	textdomain (GETTEXT_PACKAGE);
  
@@ -19,4 +19,4 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/09/14 07:01:43 rh Exp $
 +	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 ());
- 	
+