update to 2.22.0

This switches to the gnome-2.22 release branch.

9 files changed, 56 insertions, 36 deletions

diff --git a/devel/GConf/Makefile.common b/devel/GConf/Makefile.common
index cd4ea6e2bca..45d450fdaab 100644
--- a/devel/GConf/Makefile.common
+++ b/devel/GConf/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.2 2007/10/31 19:46:17 drochner Exp $
+# $NetBSD: Makefile.common,v 1.3 2008/04/10 16:27:47 drochner Exp $
 #
 
-GCONF_VERSION=		2.20.1
+GCONF_VERSION=		2.22.0
 
 DISTNAME=		GConf-${GCONF_VERSION}
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.20/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.22/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST
index 8d8a39a9794..3594078c639 100644
--- a/devel/GConf/PLIST
+++ b/devel/GConf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2007/10/31 19:46:17 drochner Exp $
+@comment $NetBSD: PLIST,v 1.24 2008/04/10 16:27:47 drochner Exp $
 bin/gconf-merge-tree
 bin/gconftool-2
 include/gconf/2/gconf/gconf-changeset.h
@@ -42,6 +42,7 @@ share/gtk-doc/html/gconf/style.css
 share/gtk-doc/html/gconf/up.png
 share/locale/am/LC_MESSAGES/GConf2.mo
 share/locale/ar/LC_MESSAGES/GConf2.mo
+share/locale/as/LC_MESSAGES/GConf2.mo
 share/locale/az/LC_MESSAGES/GConf2.mo
 share/locale/be/LC_MESSAGES/GConf2.mo
 share/locale/bg/LC_MESSAGES/GConf2.mo
@@ -83,6 +84,7 @@ share/locale/mg/LC_MESSAGES/GConf2.mo
 share/locale/mk/LC_MESSAGES/GConf2.mo
 share/locale/ml/LC_MESSAGES/GConf2.mo
 share/locale/mn/LC_MESSAGES/GConf2.mo
+share/locale/mr/LC_MESSAGES/GConf2.mo
 share/locale/ms/LC_MESSAGES/GConf2.mo
 share/locale/nb/LC_MESSAGES/GConf2.mo
 share/locale/ne/LC_MESSAGES/GConf2.mo
@@ -97,6 +99,7 @@ share/locale/pt_BR/LC_MESSAGES/GConf2.mo
 share/locale/ro/LC_MESSAGES/GConf2.mo
 share/locale/ru/LC_MESSAGES/GConf2.mo
 share/locale/rw/LC_MESSAGES/GConf2.mo
+share/locale/si/LC_MESSAGES/GConf2.mo
 share/locale/sk/LC_MESSAGES/GConf2.mo
 share/locale/sl/LC_MESSAGES/GConf2.mo
 share/locale/sq/LC_MESSAGES/GConf2.mo
diff --git a/devel/GConf/distinfo b/devel/GConf/distinfo
index 706d07faf92..3b7a53cfbd8 100644
--- a/devel/GConf/distinfo
+++ b/devel/GConf/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2007/10/31 19:46:17 drochner Exp $
+$NetBSD: distinfo,v 1.18 2008/04/10 16:27:47 drochner Exp $
 
-SHA1 (GConf-2.20.1.tar.bz2) = c628e2645a91b15749f1ebacc62ea685cbfa681c
-RMD160 (GConf-2.20.1.tar.bz2) = 743bee341731402e5d4938ee030adf4f463d9a52
-Size (GConf-2.20.1.tar.bz2) = 1404919 bytes
+SHA1 (GConf-2.22.0.tar.bz2) = 2a9ca649ef58394e425a030dc99b863b499a8a56
+RMD160 (GConf-2.22.0.tar.bz2) = 71f0c6f20882681efdffc957f6d86affd4a29a80
+Size (GConf-2.22.0.tar.bz2) = 1416685 bytes
 SHA1 (patch-ab) = ca0c9f45ff46ceb05a10c03c59f94b6a5be562b0
-SHA1 (patch-ac) = 1a1989511b9bb78f0310e70289b54ed326dede1b
+SHA1 (patch-ac) = de94ecba73ae748f609f4e4790df8eb856793d7b
 SHA1 (patch-ad) = 5d90ad4651d4c2562277c9008a3056568afe7317
diff --git a/devel/GConf/patches/patch-ac b/devel/GConf/patches/patch-ac
index ac003f91c2b..9dd60dbd6c6 100644
--- a/devel/GConf/patches/patch-ac
+++ b/devel/GConf/patches/patch-ac
@@ -1,13 +1,17 @@
-$NetBSD: patch-ac,v 1.9 2007/09/21 12:58:14 wiz Exp $
+$NetBSD: patch-ac,v 1.10 2008/04/10 16:27:47 drochner Exp $
 
---- gconf/Makefile.in.orig	2006-10-05 12:54:51.000000000 +0000
+--- gconf/Makefile.in.orig	2008-03-10 15:54:18.000000000 +0100
 +++ gconf/Makefile.in
-@@ -818,8 +818,8 @@ default.path: $(srcdir)/default.path.in
+@@ -795,12 +795,8 @@ default.path: $(srcdir)/default.path.in
  		<$(srcdir)/default.path.in >default.path
  
  install-data-local: default.path
 -	$(mkinstalldirs) $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)
--	$(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
+-	if test -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path; then				\
+-		echo "Existing path configuration file not changed";				\
+-	else 											\
+-		$(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path;	\
+-	fi
 +	$(mkinstalldirs) $(DESTDIR)$(datadir)/examples/GConf
 +	$(INSTALL_DATA) default.path $(DESTDIR)$(datadir)/examples/GConf/path
  
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index bd5bdb84e3d..23bc289a89d 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2008/04/10 16:25:29 drochner Exp $
 
 PKGCONFIG_OVERRIDE=	gnome-vfs-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gnome-vfs-module-2.0.pc.in
@@ -23,7 +23,6 @@ MAKE_JOBS_SAFE=		no
 
 .include "Makefile.common"
 
-PKGREVISION=		1
 CONFIGURE_ARGS+=	--enable-fam
 
 CONFLICTS+=		gnome-vfs2-[0-9]*
diff --git a/sysutils/gnome-vfs/Makefile.common b/sysutils/gnome-vfs/Makefile.common
index 86160ba175b..b00ec01ebdc 100644
--- a/sysutils/gnome-vfs/Makefile.common
+++ b/sysutils/gnome-vfs/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.7 2007/11/22 20:16:27 drochner Exp $
+# $NetBSD: Makefile.common,v 1.8 2008/04/10 16:25:29 drochner Exp $
 #
 
-GNOME_VFS_VERSION=	2.20.1
+GNOME_VFS_VERSION=	2.22.0
 
 DISTNAME=		gnome-vfs-${GNOME_VFS_VERSION}
 CATEGORIES?=		sysutils
 CATEGORIES+=		gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/2.20/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/2.22/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -45,9 +45,14 @@ CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-vfs
-PKG_SUPPORTED_OPTIONS+=	inet6
+PKG_SUPPORTED_OPTIONS+=	inet6 gssapi
 
 .include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == NetBSD
+# Kerberos is built in - no additional dependency
+PKG_SUGGESTED_OPTIONS+= gssapi
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Minet6)
@@ -56,6 +61,13 @@ CONFIGURE_ARGS+=	--enable-ipv6
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
+.if !empty(PKG_OPTIONS:Mgssapi)
+.include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ENV+=		KRB5_CONFIG=${SH_KRB5_CONFIG}
+.else
+CONFIGURE_ENV+=		ac_cv_path_KRB5_CONFIG=none
+.endif
+
 # XXX Work-around for a problem in the configure script which checks for
 # statvfs(2) having SVR4 in mind.  Solving this in the script itself could
 # be the right way to go, but it is out of the scope of a local patch; it
diff --git a/sysutils/gnome-vfs/PLIST b/sysutils/gnome-vfs/PLIST
index 12c2aad6809..f27134dcfbc 100644
--- a/sysutils/gnome-vfs/PLIST
+++ b/sysutils/gnome-vfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2007/10/31 19:58:13 drochner Exp $
+@comment $NetBSD: PLIST,v 1.19 2008/04/10 16:25:29 drochner Exp $
 bin/gnomevfs-cat
 bin/gnomevfs-copy
 bin/gnomevfs-df
@@ -149,6 +149,7 @@ share/gtk-doc/html/gnome-vfs-2.0/volumes.html
 share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/as/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -182,6 +183,7 @@ share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ka/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/kn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo
diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
index b31d03efba1..81508bc4e81 100644
--- a/sysutils/gnome-vfs/distinfo
+++ b/sysutils/gnome-vfs/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.23 2008/04/01 18:05:37 drochner Exp $
+$NetBSD: distinfo,v 1.24 2008/04/10 16:25:29 drochner Exp $
 
-SHA1 (gnome-vfs-2.20.1.tar.bz2) = 03afa10e84425f7f38e05f0db0ecf55ae5fb7b15
-RMD160 (gnome-vfs-2.20.1.tar.bz2) = faa5fffb5495d1e161cb6c3b47612cf39cbb1629
-Size (gnome-vfs-2.20.1.tar.bz2) = 1890300 bytes
+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 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db
 SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5
-SHA1 (patch-ae) = 77466b2b6ae44a2bbf72a76a126ba275adf9d2e4
+SHA1 (patch-ae) = fd33bedc306f9ad9ca1b602e3dba4bb97604d631
 SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56
 SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2
 SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9
diff --git a/sysutils/gnome-vfs/patches/patch-ae b/sysutils/gnome-vfs/patches/patch-ae
index 250181af062..ec988a115de 100644
--- a/sysutils/gnome-vfs/patches/patch-ae
+++ b/sysutils/gnome-vfs/patches/patch-ae
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.4 2007/11/22 20:16:27 drochner Exp $
+$NetBSD: patch-ae,v 1.5 2008/04/10 16:25:29 drochner Exp $
 
---- configure.orig	2007-11-12 10:30:09.000000000 +0100
+--- configure.orig	2008-03-10 20:22:50.000000000 +0100
 +++ configure
-@@ -24817,7 +24817,7 @@ fi
+@@ -24851,7 +24851,7 @@ fi
  
  
  
--for ac_func in getdtablesize open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll
-+for ac_func in getdtablesize login_tty open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll
+-for ac_func in getdtablesize open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll mmap
++for ac_func in getdtablesize login_tty open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll mmap
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  { echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -26020,9 +26020,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -26056,9 +26056,11 @@ cat >>conftest.$ac_ext <<_ACEOF
  int
  main ()
  {
@@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.4 2007/11/22 20:16:27 drochner Exp $
    return 0;
  }
  _ACEOF
-@@ -33378,7 +33380,7 @@ _ACEOF
+@@ -33422,7 +33424,7 @@ _ACEOF
  
  		msg_samba="yes"
                  if test x$with_samba_libs != x/usr/lib; then
@@ -32,7 +32,7 @@ $NetBSD: patch-ae,v 1.4 2007/11/22 20:16:27 drochner Exp $
                  else
                  	SAMBA_LIBS="-lsmbclient"
                  fi
-@@ -36359,12 +36361,12 @@ if test -n "$PKG_CONFIG"; then
+@@ -36425,12 +36427,12 @@ if test -n "$PKG_CONFIG"; then
          pkg_cv_LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
@@ -48,7 +48,7 @@ $NetBSD: patch-ae,v 1.4 2007/11/22 20:16:27 drochner Exp $
  else
    pkg_failed=yes
  fi
-@@ -36377,12 +36379,12 @@ if test -n "$PKG_CONFIG"; then
+@@ -36443,12 +36445,12 @@ if test -n "$PKG_CONFIG"; then
          pkg_cv_LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
@@ -64,7 +64,7 @@ $NetBSD: patch-ae,v 1.4 2007/11/22 20:16:27 drochner Exp $
  else
    pkg_failed=yes
  fi
-@@ -36401,14 +36403,14 @@ else
+@@ -36467,14 +36469,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -82,7 +82,7 @@ $NetBSD: patch-ae,v 1.4 2007/11/22 20:16:27 drochner Exp $
  
  $LIBGNOMEVFS_PKG_ERRORS
  
-@@ -36419,7 +36421,7 @@ Alternatively, you may set the environme
+@@ -36485,7 +36487,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