Update gnome-vfs to 1.0.3.

Changes are mainly bugfixes, most notably this now compiles with
control-center-1.4.0.4.  This version also adds support  for start-here:,
preferences:, system-settings:, server-settings:, start-here:, and
programs: URI schemes.

While at it, fix localstatedir to avoid installing scrollkeeper files
where they don't belong (PR pkg/13057).

5 files changed, 22 insertions, 39 deletions

diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index c3f2adfcc89..a906f4153b8 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2002/03/13 17:37:43 fredb Exp $
+# $NetBSD: Makefile,v 1.18 2002/03/24 19:59:37 rh Exp $
 
-DISTNAME=		gnome-vfs-1.0.2
-PKGREVISION=		1
+DISTNAME=		gnome-vfs-1.0.3
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-vfs/}
 
diff --git a/sysutils/gnome-vfs/PLIST b/sysutils/gnome-vfs/PLIST
index 8ecaa270386..21c7e2fb465 100644
--- a/sysutils/gnome-vfs/PLIST
+++ b/sysutils/gnome-vfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/02/05 22:39:08 skrll Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/03/24 19:59:37 rh Exp $
 bin/gnome-vfs-config
 etc/gnome-vfs-mime-magic
 etc/vfs/modules/default-modules.conf
@@ -53,8 +53,6 @@ lib/gnome-vfs-1.0/include/gnome-vfs-file-size.h
 lib/libgnomevfs-pthread.a
 lib/libgnomevfs-pthread.la
 lib/libgnomevfs-pthread.so
-lib/libgnomevfs-pthread.so.0
-lib/libgnomevfs-pthread.so.0.0
 lib/libgnomevfs.a
 lib/libgnomevfs.la
 lib/libgnomevfs.so
@@ -80,6 +78,9 @@ lib/vfs/extfs/zoo
 lib/vfs/modules/libbzip2.a
 lib/vfs/modules/libbzip2.la
 lib/vfs/modules/libbzip2.so
+lib/vfs/modules/libdesktop.a
+lib/vfs/modules/libdesktop.la
+lib/vfs/modules/libdesktop.so
 lib/vfs/modules/libextfs.a
 lib/vfs/modules/libextfs.la
 lib/vfs/modules/libextfs.so
@@ -133,6 +134,7 @@ share/locale/nl/LC_MESSAGES/gnome-vfs.mo
 share/locale/nn/LC_MESSAGES/gnome-vfs.mo
 share/locale/no/LC_MESSAGES/gnome-vfs.mo
 share/locale/pl/LC_MESSAGES/gnome-vfs.mo
+share/locale/pt/LC_MESSAGES/gnome-vfs.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-vfs.mo
 share/locale/ro/LC_MESSAGES/gnome-vfs.mo
 share/locale/ru/LC_MESSAGES/gnome-vfs.mo
diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
index 1c6ecf181aa..42356be1793 100644
--- a/sysutils/gnome-vfs/distinfo
+++ b/sysutils/gnome-vfs/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2001/10/07 11:45:02 rh Exp $
+$NetBSD: distinfo,v 1.7 2002/03/24 19:59:37 rh Exp $
 
-SHA1 (gnome-vfs-1.0.2.tar.gz) = 047e9fa874ddaa6bf1b6dc750b92904db3f87530
-Size (gnome-vfs-1.0.2.tar.gz) = 1267925 bytes
-SHA1 (patch-aa) = f2a65e394aa18e0932139a2469b43bf1e5b9107e
+SHA1 (gnome-vfs-1.0.3.tar.gz) = 51b4ca77591ee83b35d3987f0f26740623c1fa0a
+Size (gnome-vfs-1.0.3.tar.gz) = 1211129 bytes
+SHA1 (patch-aa) = d52f92046cb455587571b3eaa82efa4724c05328
 SHA1 (patch-ab) = 6d038601f881185f8a4c55a604f7baccb8693ffe
 SHA1 (patch-ac) = 4da6d9b46d059710dcd8248dd9d23cb79e5253e1
 SHA1 (patch-ad) = cf959c7d8eb70dba844ea01e887e7487111d9cbd
 SHA1 (patch-ae) = a0906ba19a6953aca3b173f03fb1b2d9bf742a09
 SHA1 (patch-af) = c76c64801b643828f6cb8751131447335d39c28e
-SHA1 (patch-ag) = d5ffffbfcb0a65d47b873f20a6514ad85c260057
+SHA1 (patch-ag) = 55361667a39f4a6b7afbf23b7daa06345ec93418
diff --git a/sysutils/gnome-vfs/patches/patch-aa b/sysutils/gnome-vfs/patches/patch-aa
index fca9db05daf..98b716052e2 100644
--- a/sysutils/gnome-vfs/patches/patch-aa
+++ b/sysutils/gnome-vfs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2001/10/05 06:56:46 rh Exp $
+$NetBSD: patch-aa,v 1.5 2002/03/24 19:59:38 rh Exp $
 
---- aclocal.m4.orig	Tue Sep 11 09:27:38 2001
+--- aclocal.m4.orig	Fri Oct 12 18:35:42 2001
 +++ aclocal.m4
-@@ -221,46 +221,37 @@
+@@ -148,46 +148,37 @@
  dnl AC_SUBST itself to avoid automake putting 
  dnl XML_I18N_MERGE_OAF_RULE = @XML_I18N_MERGE_OAF_RULE@
  dnl in all the Makefile.in's, because that will blow up when substituted.
@@ -58,25 +58,7 @@ $NetBSD: patch-aa,v 1.4 2001/10/05 06:56:46 rh Exp $
  HACK_SUBST(XML_I18N_MERGE_SHEET_RULE)
  
  
-@@ -4556,17 +4547,6 @@
- dnl From Jim Meyering.  Use this if you use the GNU error.[ch].
- dnl FIXME: Migrate into libit
- 
--AC_DEFUN(AM_FUNC_ERROR_AT_LINE,
--[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
-- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
--              am_cv_lib_error_at_line=yes,
--	      am_cv_lib_error_at_line=no)])
-- if test $am_cv_lib_error_at_line = no; then
--   LIBOBJS="$LIBOBJS error.o"
-- fi
-- AC_SUBST(LIBOBJS)dnl
--])
--
- dnl See whether we need a declaration for a function.
- dnl GCC_NEED_DECLARATION(FUNCTION [, EXTRA-HEADER-FILES])
- AC_DEFUN([GCC_NEED_DECLARATION],
-@@ -4706,7 +4686,7 @@
+@@ -4447,7 +4438,7 @@
  		  [CATOBJEXT=.gmo
  		   DATADIRNAME=share],
  		  [CATOBJEXT=.mo
diff --git a/sysutils/gnome-vfs/patches/patch-ag b/sysutils/gnome-vfs/patches/patch-ag
index 23ffbaeaa01..f415ee33513 100644
--- a/sysutils/gnome-vfs/patches/patch-ag
+++ b/sysutils/gnome-vfs/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2001/10/07 11:45:03 rh Exp $
+$NetBSD: patch-ag,v 1.4 2002/03/24 19:59:39 rh Exp $
 
---- configure.orig	Tue Sep 11 09:27:44 2001
+--- configure.orig	Fri Oct 12 18:35:44 2001
 +++ configure
-@@ -11052,7 +11052,6 @@
+@@ -10210,7 +10210,6 @@
  data/Makefile
  data/mime/Makefile
  idl/Makefile
@@ -10,7 +10,7 @@ $NetBSD: patch-ag,v 1.3 2001/10/07 11:45:03 rh Exp $
  libgnomevfs-pthread/Makefile
  libgnomevfs/Makefile
  modules/Makefile
-@@ -11072,7 +11071,9 @@
+@@ -10230,7 +10229,9 @@
  test/Makefile
  test/vfs-run
  doc/Makefile
@@ -21,7 +21,7 @@ $NetBSD: patch-ag,v 1.3 2001/10/07 11:45:03 rh Exp $
   config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
  EOF
  cat >> $CONFIG_STATUS <<EOF
-@@ -11321,7 +11322,6 @@
+@@ -10475,7 +10476,6 @@
  data/Makefile
  data/mime/Makefile
  idl/Makefile
@@ -29,7 +29,7 @@ $NetBSD: patch-ag,v 1.3 2001/10/07 11:45:03 rh Exp $
  libgnomevfs-pthread/Makefile
  libgnomevfs/Makefile
  modules/Makefile
-@@ -11341,7 +11341,9 @@
+@@ -10495,7 +10495,9 @@
  test/Makefile
  test/vfs-run
  doc/Makefile