update to 2.24.0

This switches to the gnome-2.24 release branch.
(This version is also compatible with newer shared-mime-info.)

6 files changed, 39 insertions, 79 deletions

diff --git a/sysutils/gnome-vfs/Makefile.common b/sysutils/gnome-vfs/Makefile.common
index 0e348313198..5145b0ee496 100644
--- a/sysutils/gnome-vfs/Makefile.common
+++ b/sysutils/gnome-vfs/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.11 2008/08/15 01:41:42 dsainty Exp $
+# $NetBSD: Makefile.common,v 1.12 2008/10/16 12:30:16 drochner Exp $
 #
 
-GNOME_VFS_VERSION=	2.22.0
+GNOME_VFS_VERSION=	2.24.0
 
 DISTNAME=		gnome-vfs-${GNOME_VFS_VERSION}
 CATEGORIES?=		sysutils
 CATEGORIES+=		gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/2.22/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/2.24/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/sysutils/gnome-vfs/PLIST b/sysutils/gnome-vfs/PLIST
index f27134dcfbc..2005dd02d60 100644
--- a/sysutils/gnome-vfs/PLIST
+++ b/sysutils/gnome-vfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2008/04/10 16:25:29 drochner Exp $
+@comment $NetBSD: PLIST,v 1.20 2008/10/16 12:30:16 drochner Exp $
 bin/gnomevfs-cat
 bin/gnomevfs-copy
 bin/gnomevfs-df
@@ -189,6 +189,7 @@ share/locale/ku/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/mai/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/mg/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -213,8 +214,8 @@ share/locale/sk/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/te/LC_MESSAGES/gnome-vfs-2.0.mo
diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
index 81508bc4e81..98c0835265d 100644
--- a/sysutils/gnome-vfs/distinfo
+++ b/sysutils/gnome-vfs/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.24 2008/04/10 16:25:29 drochner Exp $
+$NetBSD: distinfo,v 1.25 2008/10/16 12:30:16 drochner Exp $
 
-SHA1 (gnome-vfs-2.22.0.tar.bz2) = a58fb0654bb2c434372ee313a591ecfa8195fe18
-RMD160 (gnome-vfs-2.22.0.tar.bz2) = 307dbff23be666e18326211065a7dee78a8a17e2
-Size (gnome-vfs-2.22.0.tar.bz2) = 1939765 bytes
+SHA1 (gnome-vfs-2.24.0.tar.bz2) = d836594f9053e2b49cfbaa8f5fab24a5d2c271bd
+RMD160 (gnome-vfs-2.24.0.tar.bz2) = 56a44ca8f3035b781f6b396f3c4bc821340da5e8
+Size (gnome-vfs-2.24.0.tar.bz2) = 1935735 bytes
 SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db
 SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5
-SHA1 (patch-ae) = fd33bedc306f9ad9ca1b602e3dba4bb97604d631
+SHA1 (patch-ae) = ada79af188bf13d596af0b402535c159fa03e612
 SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56
 SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2
 SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9
@@ -19,8 +19,7 @@ SHA1 (patch-ba) = 5299eb32ff0c14eb98d8f7dd5e104cd931a02b51
 SHA1 (patch-bb) = 0b8d12e9b44547a0262231a09d181f4ccde0c1f3
 SHA1 (patch-bc) = 935965b6dda90d891e8e46da87d34690c4efa88b
 SHA1 (patch-bd) = 28cee53d3cecb18fe3b0c66b73bcece231e6fc42
-SHA1 (patch-ca) = c8d73a528d4a7260e4d976ba6c426ca92e7593e8
 SHA1 (patch-cb) = 370c75a72d8575051bb5f02d54fdd4a191ac00eb
 SHA1 (patch-cc) = 010674b9e7674cc4b84a57ac680a5769c5cffd29
-SHA1 (patch-cd) = e32c32e4a9834cc3335d5192a1110bfed9c4fd4c
+SHA1 (patch-cd) = 64ce812ca541dc34705586b4b01446b29bab8613
 SHA1 (patch-ce) = 718d7de318e85e58b7412345496263ca559e9a73
diff --git a/sysutils/gnome-vfs/patches/patch-ae b/sysutils/gnome-vfs/patches/patch-ae
index ec988a115de..7afeb838d69 100644
--- a/sysutils/gnome-vfs/patches/patch-ae
+++ b/sysutils/gnome-vfs/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2008/04/10 16:25:29 drochner Exp $
+$NetBSD: patch-ae,v 1.6 2008/10/16 12:30:16 drochner Exp $
 
---- configure.orig	2008-03-10 20:22:50.000000000 +0100
+--- configure.orig	2008-09-22 11:35:38.000000000 +0200
 +++ configure
-@@ -24851,7 +24851,7 @@ fi
+@@ -25103,7 +25103,7 @@ fi
  
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.5 2008/04/10 16:25:29 drochner Exp $
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  { echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -26056,9 +26056,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -26306,9 +26306,11 @@ cat >>conftest.$ac_ext <<_ACEOF
  int
  main ()
  {
@@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.5 2008/04/10 16:25:29 drochner Exp $
    return 0;
  }
  _ACEOF
-@@ -33422,7 +33424,7 @@ _ACEOF
+@@ -33660,7 +33662,7 @@ _ACEOF
  
  		msg_samba="yes"
                  if test x$with_samba_libs != x/usr/lib; then
@@ -32,10 +32,10 @@ $NetBSD: patch-ae,v 1.5 2008/04/10 16:25:29 drochner Exp $
                  else
                  	SAMBA_LIBS="-lsmbclient"
                  fi
-@@ -36425,12 +36427,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
+@@ -36624,12 +36626,12 @@ if test -n "$LIBGNOMEVFS_CFLAGS"; then
+     pkg_cv_LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 \$dbus_requirement\"") >&5
 -  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement") 2>&5
 +    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED \$dbus_requirement\"") >&5
@@ -48,10 +48,10 @@ $NetBSD: patch-ae,v 1.5 2008/04/10 16:25:29 drochner Exp $
  else
    pkg_failed=yes
  fi
-@@ -36443,12 +36445,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
+@@ -36640,12 +36642,12 @@ if test -n "$LIBGNOMEVFS_LIBS"; then
+     pkg_cv_LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 \$dbus_requirement\"") >&5
 -  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement") 2>&5
 +    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED \$dbus_requirement\"") >&5
@@ -64,15 +64,15 @@ $NetBSD: patch-ae,v 1.5 2008/04/10 16:25:29 drochner Exp $
  else
    pkg_failed=yes
  fi
-@@ -36467,14 +36469,14 @@ else
+@@ -36663,14 +36665,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
--	        LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement"`
-+	        LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement"`
+-	        LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement" 2>&1`
++	        LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement" 2>&1`
          else
--	        LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement"`
-+	        LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement"`
+-	        LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement" 2>&1`
++	        LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement" 2>&1`
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBGNOMEVFS_PKG_ERRORS" >&5
@@ -82,7 +82,7 @@ $NetBSD: patch-ae,v 1.5 2008/04/10 16:25:29 drochner Exp $
  
  $LIBGNOMEVFS_PKG_ERRORS
  
-@@ -36485,7 +36487,7 @@ Alternatively, you may set the environme
+@@ -36681,7 +36683,7 @@ Alternatively, you may set the environme
  and LIBGNOMEVFS_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5
diff --git a/sysutils/gnome-vfs/patches/patch-ca b/sysutils/gnome-vfs/patches/patch-ca
deleted file mode 100644
index c89d1d3fd0b..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ca
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2007/09/19 22:22:43 wiz Exp $
-
---- libgnomevfs/xdgmime.h.orig	2006-10-13 15:38:37.000000000 +0200
-+++ libgnomevfs/xdgmime.h
-@@ -97,12 +97,15 @@ int          xdg_mime_register_reload_ca
- void         xdg_mime_remove_callback              (int              callback_id);
- 
-    /* Private versions of functions that don't call xdg_mime_init () */
-+#define _xdg_mime_mime_type_equal _gnomevfs_xdg_mime_mime_type_equal
- int          _xdg_mime_mime_type_equal             (const char *mime_a,
- 						    const char *mime_b);
- int          _xdg_mime_media_type_equal            (const char *mime_a,
- 						    const char *mime_b);
-+#define _xdg_mime_mime_type_subclass _gnomevfs_xdg_mime_mime_type_subclass
- int          _xdg_mime_mime_type_subclass          (const char *mime,
- 						    const char *base);
-+#define _xdg_mime_unalias_mime_type _gnomevfs_xdg_mime_unalias_mime_type
- const char  *_xdg_mime_unalias_mime_type	   (const char *mime);
- 
- 
diff --git a/sysutils/gnome-vfs/patches/patch-cd b/sysutils/gnome-vfs/patches/patch-cd
index ee4223cef1a..7196023b11a 100644
--- a/sysutils/gnome-vfs/patches/patch-cd
+++ b/sysutils/gnome-vfs/patches/patch-cd
@@ -1,32 +1,12 @@
-$NetBSD: patch-cd,v 1.1 2007/09/19 22:22:44 wiz Exp $
+$NetBSD: patch-cd,v 1.2 2008/10/16 12:30:16 drochner Exp $
 
---- libgnomevfs/xdgmimecache.h.orig	2007-02-09 19:29:40.000000000 +0100
+--- libgnomevfs/xdgmimecache.h.orig	2008-08-04 23:28:24.000000000 +0200
 +++ libgnomevfs/xdgmimecache.h
-@@ -44,20 +44,27 @@ XdgMimeCache *_xdg_mime_cache_ref       
- void          _xdg_mime_cache_unref         (XdgMimeCache *cache);
+@@ -48,6 +48,7 @@ typedef struct _XdgMimeCache XdgMimeCach
+ #define _xdg_mime_cache_glob_dump                     XDG_RESERVED_ENTRY(cache_glob_dump)
+ #endif
  
++#define _caches _gnomevfs_caches
+ extern XdgMimeCache **_caches;
  
-+#define _xdg_mime_cache_get_mime_type_for_data _gnomevfs_xdg_mime_cache_get_mime_type_for_data
- const char  *_xdg_mime_cache_get_mime_type_for_data       (const void *data,
- 		 				           size_t      len);
-+#define _xdg_mime_cache_get_mime_type_for_file _gnomevfs_xdg_mime_cache_get_mime_type_for_file
- const char  *_xdg_mime_cache_get_mime_type_for_file       (const char  *file_name,
- 							   struct stat *statbuf);
-+#define _xdg_mime_cache_get_mime_type_from_file_name _gnomevfs_xdg_mime_cache_get_mime_type_from_file_name
- const char  *_xdg_mime_cache_get_mime_type_from_file_name (const char *file_name);
- int          _xdg_mime_cache_is_valid_mime_type           (const char *mime_type);
- int          _xdg_mime_cache_mime_type_equal              (const char *mime_a,
- 						           const char *mime_b);
- int          _xdg_mime_cache_media_type_equal             (const char *mime_a,
- 							   const char *mime_b);
-+#define _xdg_mime_cache_mime_type_subclass _gnomevfs_xdg_mime_cache_mime_type_subclass
- int          _xdg_mime_cache_mime_type_subclass           (const char *mime_a,
- 							   const char *mime_b);
-+#define _xdg_mime_cache_list_mime_parents _gnomevfs_xdg_mime_cache_list_mime_parents
- char       **_xdg_mime_cache_list_mime_parents		  (const char *mime);
-+#define _xdg_mime_cache_unalias_mime_type _gnomevfs_xdg_mime_cache_unalias_mime_type
- const char  *_xdg_mime_cache_unalias_mime_type            (const char *mime);
-+#define _xdg_mime_cache_get_max_buffer_extents _gnomevfs_xdg_mime_cache_get_max_buffer_extents
- int          _xdg_mime_cache_get_max_buffer_extents       (void);
- 
- #endif /* __XDG_MIME_CACHE_H__ */
+ XdgMimeCache *_xdg_mime_cache_new_from_file (const char   *file_name);