Bring up already ported portion on GNOME2 development platform on par with

GNOME2 beta2 release.

33 files changed, 148 insertions, 192 deletions

diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index a2e01bc325c3..f919650433ad 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gail
-PORTVERSION=	0.8
+PORTVERSION=	0.9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo
index 9fc048f43e9a..b7613b419d0f 100644
--- a/accessibility/gail/distinfo
+++ b/accessibility/gail/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gail-0.8.tar.bz2) = 6f53ca1d060347647cf2d050ad2a9e9e
+MD5 (gnome2/gail-0.9.tar.bz2) = e1644a587e4522b52181c62d1d9e57ea
diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist
index f141e8820254..2412ec335bf1 100644
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@@ -2,47 +2,47 @@ include/gail-1.0/util/gail-util.h
 include/gail-1.0/util/gailmisc.h
 include/gail-1.0/util/gailtextutil.h
 lib/libferret.so
-lib/libferret.so.0
+lib/libferret.so.9
 lib/libgail.so
 lib/libgail.so.0
 lib/libgailutil.so
-lib/libgailutil.so.8
+lib/libgailutil.so.9
 lib/libtestaction.so
-lib/libtestaction.so.0
+lib/libtestaction.so.9
 lib/libtestbutton.so
-lib/libtestbutton.so.0
+lib/libtestbutton.so.9
 lib/libtestcombo.so
-lib/libtestcombo.so.0
+lib/libtestcombo.so.9
 lib/libtestcomponent.so
-lib/libtestcomponent.so.0
+lib/libtestcomponent.so.9
 lib/libtestimage.so
-lib/libtestimage.so.0
+lib/libtestimage.so.9
 lib/libtestmenuitem.so
-lib/libtestmenuitem.so.0
+lib/libtestmenuitem.so.9
 lib/libtestnotebook.so
-lib/libtestnotebook.so.0
+lib/libtestnotebook.so.9
 lib/libtestobject.so
-lib/libtestobject.so.0
+lib/libtestobject.so.9
 lib/libtestoptionmenu.so
-lib/libtestoptionmenu.so.0
+lib/libtestoptionmenu.so.9
 lib/libtestpaned.so
-lib/libtestpaned.so.0
+lib/libtestpaned.so.9
 lib/libtestprops.so
-lib/libtestprops.so.0
+lib/libtestprops.so.9
 lib/libtestselection.so
-lib/libtestselection.so.0
+lib/libtestselection.so.9
 lib/libteststatusbar.so
-lib/libteststatusbar.so.0
+lib/libteststatusbar.so.9
 lib/libtesttable.so
-lib/libtesttable.so.0
+lib/libtesttable.so.9
 lib/libtesttext.so
-lib/libtesttext.so.0
+lib/libtesttext.so.9
 lib/libtesttoplevel.so
-lib/libtesttoplevel.so.0
+lib/libtesttoplevel.so.9
 lib/libtesttreetable.so
-lib/libtesttreetable.so.0
+lib/libtesttreetable.so.9
 lib/libtestvalues.so
-lib/libtestvalues.so.0
+lib/libtestvalues.so.9
 libdata/pkgconfig/gail.pc
 @dirrm include/gail-1.0/util
 @dirrm include/gail-1.0
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index a51f855ad89f..075d81dd1b20 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ORBit2
-PORTVERSION=	2.3.105
+PORTVERSION=	2.3.106
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index 8045dc8a1c0b..3a2137aa7e73 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/ORBit2-2.3.105.tar.bz2) = a43ddec07a53d2e5ce14b0060d5fc347
+MD5 (gnome2/ORBit2-2.3.106.tar.bz2) = b39bc65e0ba57415afac3fff1278ee62
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index f77f38ae5026..b6e72cf12bb2 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	bonobo-activation
-PORTVERSION=	0.9.4
+PORTVERSION=	0.9.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo
index 0ad288051923..622d125f2cd0 100644
--- a/devel/bonobo-activation/distinfo
+++ b/devel/bonobo-activation/distinfo
@@ -1 +1 @@
-MD5 (gnome2/bonobo-activation-0.9.4.tar.bz2) = 8ba26b622b2e459d19e43a8099987415
+MD5 (gnome2/bonobo-activation-0.9.5.tar.bz2) = 6dc24bac530afc7e306913a7b67e8039
diff --git a/devel/bonobo-activation/pkg-plist b/devel/bonobo-activation/pkg-plist
index f34cbe33ad04..5a3b86e60580 100644
--- a/devel/bonobo-activation/pkg-plist
+++ b/devel/bonobo-activation/pkg-plist
@@ -25,6 +25,38 @@ libdata/bonobo/servers/broken.server
 libdata/bonobo/servers/empty.server
 libdata/bonobo/servers/plugin.server
 libdata/pkgconfig/bonobo-activation-2.0.pc
+share/doc/bonobo-activation/api-reference.html
+share/doc/bonobo-activation/architecture.html
+share/doc/bonobo-activation/async-activation.html
+share/doc/bonobo-activation/attribute-tag.html
+share/doc/bonobo-activation/bonobo-activation-debugging.html
+share/doc/bonobo-activation/bonobo-activation-initialization.html
+share/doc/bonobo-activation/bonobo-activation-query-and-activation.html
+share/doc/bonobo-activation/bonobo-activation-registration.html
+share/doc/bonobo-activation/bonobo-activation-utilities.html
+share/doc/bonobo-activation/bonobo-activation.png
+share/doc/bonobo-activation/checklist.html
+share/doc/bonobo-activation/configuring.html
+share/doc/bonobo-activation/fdl-section1.html
+share/doc/bonobo-activation/fdl-section10.html
+share/doc/bonobo-activation/fdl-section2.html
+share/doc/bonobo-activation/fdl-section3.html
+share/doc/bonobo-activation/fdl-section4.html
+share/doc/bonobo-activation/fdl-section5.html
+share/doc/bonobo-activation/fdl-section6.html
+share/doc/bonobo-activation/fdl-section7.html
+share/doc/bonobo-activation/fdl-section8.html
+share/doc/bonobo-activation/fdl-section9.html
+share/doc/bonobo-activation/fdl-using.html
+share/doc/bonobo-activation/fdl.html
+share/doc/bonobo-activation/index.html
+share/doc/bonobo-activation/index.sgml
+share/doc/bonobo-activation/migrating.html
+share/doc/bonobo-activation/query-langage.html
+share/doc/bonobo-activation/query-syntax.html
+share/doc/bonobo-activation/server-arch.html
+share/doc/bonobo-activation/server-xml-reference.html
+share/doc/bonobo-activation/tutorial.html
 share/idl/bonobo-activation-2.0/Bonobo_ActivationContext.idl
 share/idl/bonobo-activation-2.0/Bonobo_Activation_types.idl
 share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 1e00b77874d7..ce8c377d7b4f 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	1.9.7
+PORTVERSION=	1.9.10
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index ba692c445c37..01ca5ef35958 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.7.tar.bz2) = 766b86fbcbcec8da3604ca92b6eadc42
+MD5 (gnome2/gnome-vfs-1.9.10.tar.bz2) = 967ac50161fe0f24bc071d3d8d010081
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index e6ade3b65778..bd10b13e7ff5 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,20 +1,20 @@
 
 $FreeBSD$
 
---- configure.orig	Wed Feb 27 12:00:58 2002
-+++ configure	Wed Feb 27 12:02:16 2002
-@@ -11963,8 +11963,8 @@
+--- configure.orig	Mon Mar 11 21:42:05 2002
++++ configure	Mon Mar 11 21:42:37 2002
+@@ -11993,8 +11993,8 @@
    done
  fi
  
--echo "$as_me:11966: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:11996: checking for bzCompressInit in -lbz2" >&5
 -echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:11966: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:11996: checking for BZ2_bzCompressInit in -lbz2" >&5
 +echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
  if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11980,11 +11980,11 @@
+@@ -12010,11 +12010,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -28,16 +28,16 @@ $FreeBSD$
    ;
    return 0;
  }
-@@ -12296,7 +12296,7 @@
+@@ -12326,7 +12326,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
 +		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
  		cat >conftest.$ac_ext <<_ACEOF
- #line 12301 "configure"
+ #line 12331 "configure"
  #include "confdefs.h"
-@@ -12347,9 +12347,9 @@
+@@ -12377,9 +12377,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -49,7 +49,7 @@ $FreeBSD$
                  fi
  
  if true; then
-@@ -13227,7 +13227,7 @@
+@@ -13259,7 +13259,7 @@
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
  s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnome-vfs/files/patch-intltool-merge.in b/devel/gnome-vfs/files/patch-intltool-merge.in
index 3d34ddfdbf53..d5a424fcc59c 100644
--- a/devel/gnome-vfs/files/patch-intltool-merge.in
+++ b/devel/gnome-vfs/files/patch-intltool-merge.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- intltool-merge.in.orig	Mon Feb 11 23:40:38 2002
-+++ intltool-merge.in	Wed Feb 27 12:03:10 2002
-@@ -287,7 +287,7 @@
+--- intltool-merge.in.orig	Sun Mar 10 01:56:09 2002
++++ intltool-merge.in	Mon Mar 11 21:43:48 2002
+@@ -290,7 +290,7 @@
              if (lc $encoding eq "utf-8") {
                  open PO_FILE, "<$po_file";	
              } else {
--                open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";	
-+                open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";	
+-                my $iconv = $ENV{"INTLTOOL_ICONV"} || "iconv";
++                my $iconv = $ENV{"INTLTOOL_ICONV"} || "giconv";
+                 open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|";	
              }
          } else {
-             open PO_FILE, "<$po_file";	
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index e752643c375a..122e0d80cc66 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -78,55 +78,13 @@ lib/vfs2/extfs/zoo
 libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
 libdata/pkgconfig/gnome-vfs-2.0.pc
 libdata/pkgconfig/gnome-vfs-module-2.0.pc
-share/doc/gnome-vfs/about.html
-share/doc/gnome-vfs/data-types.html
-share/doc/gnome-vfs/everything-else.html
-share/doc/gnome-vfs/file-operations.html
-share/doc/gnome-vfs/gnome-vfs-application-registry.html
-share/doc/gnome-vfs/gnome-vfs-asynchronous-operations.html
-share/doc/gnome-vfs/gnome-vfs-cancellation.html
-share/doc/gnome-vfs/gnome-vfs-configuration.html
-share/doc/gnome-vfs/gnome-vfs-context.html
-share/doc/gnome-vfs/gnome-vfs-directory.html
-share/doc/gnome-vfs/gnome-vfs-file-info.html
-share/doc/gnome-vfs/gnome-vfs-file-size.html
-share/doc/gnome-vfs/gnome-vfs-finding-special-directories.html
-share/doc/gnome-vfs/gnome-vfs-inet-connection.html
-share/doc/gnome-vfs/gnome-vfs-initialization.html
-share/doc/gnome-vfs/gnome-vfs-iobuf.html
-share/doc/gnome-vfs/gnome-vfs-method.html
-share/doc/gnome-vfs/gnome-vfs-mime-handlers.html
-share/doc/gnome-vfs/gnome-vfs-mime-info.html
-share/doc/gnome-vfs/gnome-vfs-mime-magic.html
-share/doc/gnome-vfs/gnome-vfs-mime-monitor.html
-share/doc/gnome-vfs/gnome-vfs-mime-sniff-buffer.html
-share/doc/gnome-vfs/gnome-vfs-mime.html
-share/doc/gnome-vfs/gnome-vfs-module-callback-module-api.html
-share/doc/gnome-vfs/gnome-vfs-module-callbacks.html
-share/doc/gnome-vfs/gnome-vfs-module-shared.html
-share/doc/gnome-vfs/gnome-vfs-module.html
-share/doc/gnome-vfs/gnome-vfs-ops.html
-share/doc/gnome-vfs/gnome-vfs-parse-ls.html
-share/doc/gnome-vfs/gnome-vfs-process.html
-share/doc/gnome-vfs/gnome-vfs-result.html
-share/doc/gnome-vfs/gnome-vfs-ssl.html
-share/doc/gnome-vfs/gnome-vfs-standard-callbacks.html
-share/doc/gnome-vfs/gnome-vfs-types.html
-share/doc/gnome-vfs/gnome-vfs-uri.html
-share/doc/gnome-vfs/gnome-vfs-utils.html
-share/doc/gnome-vfs/gnome-vfs-xfer.html
-share/doc/gnome-vfs/index.html
-share/doc/gnome-vfs/index.sgml
-share/doc/gnome-vfs/mime-registry.html
-share/doc/gnome-vfs/modules.html
-share/doc/gnome-vfs/writing-modules.html
-share/doc/gnome-vfs/x27.html
 share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -136,6 +94,7 @@ share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 1e00b77874d7..ce8c377d7b4f 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	1.9.7
+PORTVERSION=	1.9.10
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index ba692c445c37..01ca5ef35958 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.7.tar.bz2) = 766b86fbcbcec8da3604ca92b6eadc42
+MD5 (gnome2/gnome-vfs-1.9.10.tar.bz2) = 967ac50161fe0f24bc071d3d8d010081
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index e6ade3b65778..bd10b13e7ff5 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,20 +1,20 @@
 
 $FreeBSD$
 
---- configure.orig	Wed Feb 27 12:00:58 2002
-+++ configure	Wed Feb 27 12:02:16 2002
-@@ -11963,8 +11963,8 @@
+--- configure.orig	Mon Mar 11 21:42:05 2002
++++ configure	Mon Mar 11 21:42:37 2002
+@@ -11993,8 +11993,8 @@
    done
  fi
  
--echo "$as_me:11966: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:11996: checking for bzCompressInit in -lbz2" >&5
 -echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:11966: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:11996: checking for BZ2_bzCompressInit in -lbz2" >&5
 +echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
  if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11980,11 +11980,11 @@
+@@ -12010,11 +12010,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -28,16 +28,16 @@ $FreeBSD$
    ;
    return 0;
  }
-@@ -12296,7 +12296,7 @@
+@@ -12326,7 +12326,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
 +		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
  		cat >conftest.$ac_ext <<_ACEOF
- #line 12301 "configure"
+ #line 12331 "configure"
  #include "confdefs.h"
-@@ -12347,9 +12347,9 @@
+@@ -12377,9 +12377,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -49,7 +49,7 @@ $FreeBSD$
                  fi
  
  if true; then
-@@ -13227,7 +13227,7 @@
+@@ -13259,7 +13259,7 @@
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
  s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnomevfs2/files/patch-intltool-merge.in b/devel/gnomevfs2/files/patch-intltool-merge.in
index 3d34ddfdbf53..d5a424fcc59c 100644
--- a/devel/gnomevfs2/files/patch-intltool-merge.in
+++ b/devel/gnomevfs2/files/patch-intltool-merge.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- intltool-merge.in.orig	Mon Feb 11 23:40:38 2002
-+++ intltool-merge.in	Wed Feb 27 12:03:10 2002
-@@ -287,7 +287,7 @@
+--- intltool-merge.in.orig	Sun Mar 10 01:56:09 2002
++++ intltool-merge.in	Mon Mar 11 21:43:48 2002
+@@ -290,7 +290,7 @@
              if (lc $encoding eq "utf-8") {
                  open PO_FILE, "<$po_file";	
              } else {
--                open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";	
-+                open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";	
+-                my $iconv = $ENV{"INTLTOOL_ICONV"} || "iconv";
++                my $iconv = $ENV{"INTLTOOL_ICONV"} || "giconv";
+                 open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|";	
              }
          } else {
-             open PO_FILE, "<$po_file";	
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index e752643c375a..122e0d80cc66 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -78,55 +78,13 @@ lib/vfs2/extfs/zoo
 libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
 libdata/pkgconfig/gnome-vfs-2.0.pc
 libdata/pkgconfig/gnome-vfs-module-2.0.pc
-share/doc/gnome-vfs/about.html
-share/doc/gnome-vfs/data-types.html
-share/doc/gnome-vfs/everything-else.html
-share/doc/gnome-vfs/file-operations.html
-share/doc/gnome-vfs/gnome-vfs-application-registry.html
-share/doc/gnome-vfs/gnome-vfs-asynchronous-operations.html
-share/doc/gnome-vfs/gnome-vfs-cancellation.html
-share/doc/gnome-vfs/gnome-vfs-configuration.html
-share/doc/gnome-vfs/gnome-vfs-context.html
-share/doc/gnome-vfs/gnome-vfs-directory.html
-share/doc/gnome-vfs/gnome-vfs-file-info.html
-share/doc/gnome-vfs/gnome-vfs-file-size.html
-share/doc/gnome-vfs/gnome-vfs-finding-special-directories.html
-share/doc/gnome-vfs/gnome-vfs-inet-connection.html
-share/doc/gnome-vfs/gnome-vfs-initialization.html
-share/doc/gnome-vfs/gnome-vfs-iobuf.html
-share/doc/gnome-vfs/gnome-vfs-method.html
-share/doc/gnome-vfs/gnome-vfs-mime-handlers.html
-share/doc/gnome-vfs/gnome-vfs-mime-info.html
-share/doc/gnome-vfs/gnome-vfs-mime-magic.html
-share/doc/gnome-vfs/gnome-vfs-mime-monitor.html
-share/doc/gnome-vfs/gnome-vfs-mime-sniff-buffer.html
-share/doc/gnome-vfs/gnome-vfs-mime.html
-share/doc/gnome-vfs/gnome-vfs-module-callback-module-api.html
-share/doc/gnome-vfs/gnome-vfs-module-callbacks.html
-share/doc/gnome-vfs/gnome-vfs-module-shared.html
-share/doc/gnome-vfs/gnome-vfs-module.html
-share/doc/gnome-vfs/gnome-vfs-ops.html
-share/doc/gnome-vfs/gnome-vfs-parse-ls.html
-share/doc/gnome-vfs/gnome-vfs-process.html
-share/doc/gnome-vfs/gnome-vfs-result.html
-share/doc/gnome-vfs/gnome-vfs-ssl.html
-share/doc/gnome-vfs/gnome-vfs-standard-callbacks.html
-share/doc/gnome-vfs/gnome-vfs-types.html
-share/doc/gnome-vfs/gnome-vfs-uri.html
-share/doc/gnome-vfs/gnome-vfs-utils.html
-share/doc/gnome-vfs/gnome-vfs-xfer.html
-share/doc/gnome-vfs/index.html
-share/doc/gnome-vfs/index.sgml
-share/doc/gnome-vfs/mime-registry.html
-share/doc/gnome-vfs/modules.html
-share/doc/gnome-vfs/writing-modules.html
-share/doc/gnome-vfs/x27.html
 share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -136,6 +94,7 @@ share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index 02329812467c..d68bf52301ae 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -9,12 +9,12 @@ PORTNAME=	libIDL
 PORTVERSION=	0.7.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	glib-1.3.14:${PORTSDIR}/devel/glib13
+LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 3010d4b6f30a..3bbe08dbd4b5 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libbonobo
 PORTVERSION=	1.112.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 5c31d07c383f..340a6b56ecda 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libglade2
-PORTVERSION=	1.99.7
+PORTVERSION=	1.99.8
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -17,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		gtk-x11-1.3.14:${PORTSDIR}/x11-toolkits/gtk13
+		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat
 
 USE_BZIP2=	yes
diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo
index d7384b6c79ae..759a06cf178c 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libglade-1.99.7.tar.bz2) = 0c3fa7bcd47f0e20f96d1dae855fa232
+MD5 (gnome2/libglade-1.99.8.tar.bz2) = 982fbb9d6ca84a7f1bc712117f6a532b
diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist
index 6a552523d95a..2266d9bb1e82 100644
--- a/devel/libglade2/pkg-plist
+++ b/devel/libglade2/pkg-plist
@@ -22,6 +22,8 @@ share/doc/libglade/libglade-libglade-sax-parser.html
 share/doc/libglade/libglade-modules.html
 share/doc/libglade/libglade-notes.html
 share/doc/libglade/libglade.html
+share/xml/libglade/glade-2.0.dtd
+@dirrm share/xml/libglade
 @dirrm share/doc/libglade
 @dirrm include/libglade-2.0/glade
 @dirrm include/libglade-2.0
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index 139bfaaec7d8..b770f7b11738 100644
--- a/graphics/libart_lgpl/Makefile
+++ b/graphics/libart_lgpl/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libart_lgpl2
 PORTVERSION=	2.3.8
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index 139bfaaec7d8..b770f7b11738 100644
--- a/graphics/libart_lgpl2/Makefile
+++ b/graphics/libart_lgpl2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	libart_lgpl2
 PORTVERSION=	2.3.8
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 68436356d39e..0ba8ae85522c 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnomecanvas
-PORTVERSION=	1.111.0
+PORTVERSION=	1.112.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
 DIST_SUBDIR=	gnome2
 
 LIB_DEPENDS=	glade-2.0.0:${PORTSDIR}/devel/libglade2 \
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index 8d43d4492958..da6c731295a4 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomecanvas-1.111.0.tar.bz2) = f5251d70b45fe0cd9f5036b5d8fb9471
+MD5 (gnome2/libgnomecanvas-1.112.1.tar.bz2) = 8dab2e48694526749f31f6635b4e260f
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index f1d6d371a47f..e32d20010ba7 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -38,6 +38,8 @@ share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaswidget.html
 share/doc/libgnomecanvas/libgnomecanvas-libgnomecanvas.html
 share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/es/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/et/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/fi/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/fr/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/it/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ja/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -45,9 +47,11 @@ share/locale/ms/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/no/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/pl/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/pt/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ru/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sk/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/sl/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sv/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ta/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/tr/LC_MESSAGES/libgnomecanvas-2.0.mo
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 14106649f03a..ceb48af55ebb 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	linc
-PORTVERSION=	0.1.18
+PORTVERSION=	0.1.19
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	glib-1.3.14:${PORTSDIR}/devel/glib13
+LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/net/linc/distinfo b/net/linc/distinfo
index 377dcd257515..7ece7a0e25c4 100644
--- a/net/linc/distinfo
+++ b/net/linc/distinfo
@@ -1 +1 @@
-MD5 (gnome2/linc-0.1.18.tar.bz2) = 5351a08ccb833f9ff32eca138f0ff81e
+MD5 (gnome2/linc-0.1.19.tar.bz2) = 322107214ca8fecf5a6a33e634d1bc5a
diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile
index a2e01bc325c3..f919650433ad 100644
--- a/x11-toolkits/gail/Makefile
+++ b/x11-toolkits/gail/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gail
-PORTVERSION=	0.8
+PORTVERSION=	0.9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gail/distinfo b/x11-toolkits/gail/distinfo
index 9fc048f43e9a..b7613b419d0f 100644
--- a/x11-toolkits/gail/distinfo
+++ b/x11-toolkits/gail/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gail-0.8.tar.bz2) = 6f53ca1d060347647cf2d050ad2a9e9e
+MD5 (gnome2/gail-0.9.tar.bz2) = e1644a587e4522b52181c62d1d9e57ea
diff --git a/x11-toolkits/gail/pkg-plist b/x11-toolkits/gail/pkg-plist
index f141e8820254..2412ec335bf1 100644
--- a/x11-toolkits/gail/pkg-plist
+++ b/x11-toolkits/gail/pkg-plist
@@ -2,47 +2,47 @@ include/gail-1.0/util/gail-util.h
 include/gail-1.0/util/gailmisc.h
 include/gail-1.0/util/gailtextutil.h
 lib/libferret.so
-lib/libferret.so.0
+lib/libferret.so.9
 lib/libgail.so
 lib/libgail.so.0
 lib/libgailutil.so
-lib/libgailutil.so.8
+lib/libgailutil.so.9
 lib/libtestaction.so
-lib/libtestaction.so.0
+lib/libtestaction.so.9
 lib/libtestbutton.so
-lib/libtestbutton.so.0
+lib/libtestbutton.so.9
 lib/libtestcombo.so
-lib/libtestcombo.so.0
+lib/libtestcombo.so.9
 lib/libtestcomponent.so
-lib/libtestcomponent.so.0
+lib/libtestcomponent.so.9
 lib/libtestimage.so
-lib/libtestimage.so.0
+lib/libtestimage.so.9
 lib/libtestmenuitem.so
-lib/libtestmenuitem.so.0
+lib/libtestmenuitem.so.9
 lib/libtestnotebook.so
-lib/libtestnotebook.so.0
+lib/libtestnotebook.so.9
 lib/libtestobject.so
-lib/libtestobject.so.0
+lib/libtestobject.so.9
 lib/libtestoptionmenu.so
-lib/libtestoptionmenu.so.0
+lib/libtestoptionmenu.so.9
 lib/libtestpaned.so
-lib/libtestpaned.so.0
+lib/libtestpaned.so.9
 lib/libtestprops.so
-lib/libtestprops.so.0
+lib/libtestprops.so.9
 lib/libtestselection.so
-lib/libtestselection.so.0
+lib/libtestselection.so.9
 lib/libteststatusbar.so
-lib/libteststatusbar.so.0
+lib/libteststatusbar.so.9
 lib/libtesttable.so
-lib/libtesttable.so.0
+lib/libtesttable.so.9
 lib/libtesttext.so
-lib/libtesttext.so.0
+lib/libtesttext.so.9
 lib/libtesttoplevel.so
-lib/libtesttoplevel.so.0
+lib/libtesttoplevel.so.9
 lib/libtesttreetable.so
-lib/libtesttreetable.so.0
+lib/libtesttreetable.so.9
 lib/libtestvalues.so
-lib/libtestvalues.so.0
+lib/libtestvalues.so.9
 libdata/pkgconfig/gail.pc
 @dirrm include/gail-1.0/util
 @dirrm include/gail-1.0