diff --git a/x11/gnome/libbonoboui/Makefile b/x11/gnome/libbonoboui/Makefile
index 304b04148e5..bf8b7d0c65d 100644
--- a/x11/gnome/libbonoboui/Makefile
+++ b/x11/gnome/libbonoboui/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/01/31 18:51:47 todd Exp $
+# $OpenBSD: Makefile,v 1.2 2003/06/12 19:58:10 marcm Exp $
 
 COMMENT=		"user interface components for bonobo"
 
-DISTNAME=		libbonoboui-2.0.3
+DISTNAME=		libbonoboui-2.2.0.1
 CATEGORIES=		x11/gnome
 
 HOMEPAGE=		http://www.gnome.org/
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libbonoboui/2.0/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libbonoboui/2.2/}
 EXTRACT_SUFX=		.tar.bz2
 
 MODULES=		gettext
diff --git a/x11/gnome/libbonoboui/distinfo b/x11/gnome/libbonoboui/distinfo
index 8928d15169e..a2fb57318a4 100644
--- a/x11/gnome/libbonoboui/distinfo
+++ b/x11/gnome/libbonoboui/distinfo
@@ -1,3 +1,3 @@
-MD5 (libbonoboui-2.0.3.tar.bz2) = 0442fafde5b654b15154f72d740bbcbd
-RMD160 (libbonoboui-2.0.3.tar.bz2) = 1e4b1d362dab39bcc5022c717fee16e25e872677
-SHA1 (libbonoboui-2.0.3.tar.bz2) = 5f0457fb8e3340eebd85b4dc67c636d2002e4f45
+MD5 (libbonoboui-2.2.0.1.tar.bz2) = bf3486e5d609bc1f5a9d648bf71d5125
+RMD160 (libbonoboui-2.2.0.1.tar.bz2) = 0df81c5eb0a626a5dbdee93dfa92e0337014a1ee
+SHA1 (libbonoboui-2.2.0.1.tar.bz2) = ccc2bfbdfb75d0316ad50d5e8717dbe1f5c000ae
diff --git a/x11/gnome/libbonoboui/patches/patch-configure b/x11/gnome/libbonoboui/patches/patch-configure
deleted file mode 100644
index a6f8831945b..00000000000
--- a/x11/gnome/libbonoboui/patches/patch-configure
+++ /dev/null
@@ -1,25 +0,0 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2003/01/31 18:51:47 todd Exp $
---- configure.orig	Fri Aug 30 08:37:30 2002
-+++ configure	Mon Sep 23 14:15:29 2002
-@@ -5337,8 +5337,8 @@ else
-     hardcode_direct=yes
-     hardcode_shlibpath_var=no
-     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='${wl}-R$libdir'
-       export_dynamic_flag_spec='${wl}-E'
-     else
-       case "$host_os" in
-@@ -5347,8 +5347,8 @@ else
- 	hardcode_libdir_flag_spec='-R$libdir'
-         ;;
-       *)
--        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
--        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+        hardcode_libdir_flag_spec='${wl}-R$libdir'
-         ;;
-       esac
-     fi
diff --git a/x11/gnome/libbonoboui/patches/patch-ltmain_sh b/x11/gnome/libbonoboui/patches/patch-ltmain_sh
index 2ce2a86fc82..0befc18e467 100644
--- a/x11/gnome/libbonoboui/patches/patch-ltmain_sh
+++ b/x11/gnome/libbonoboui/patches/patch-ltmain_sh
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/01/31 18:51:47 todd Exp $
---- ltmain.sh.orig	Fri Aug 30 08:37:06 2002
-+++ ltmain.sh	Thu Dec 12 23:24:36 2002
-@@ -1071,6 +1071,17 @@ compiler."
+$OpenBSD: patch-ltmain_sh,v 1.2 2003/06/12 19:58:10 marcm Exp $
+--- ltmain.sh.orig	Thu Feb 20 03:48:58 2003
++++ ltmain.sh	Sun May 11 11:45:52 2003
+@@ -1082,6 +1082,17 @@ compiler."
  	continue
  	;;
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/01/31 18:51:47 todd Exp $
        -module)
  	module=yes
  	continue
-@@ -1507,6 +1518,19 @@ compiler."
+@@ -1522,6 +1533,19 @@ compiler."
  	  fi
  	  continue
  	  ;;
@@ -39,7 +39,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/01/31 18:51:47 todd Exp $
  	%DEPLIBS%)
  	  alldeplibs=yes
  	  continue
-@@ -1748,11 +1772,6 @@ compiler."
+@@ -1767,11 +1791,6 @@ compiler."
  	    continue
  	  fi
  
@@ -51,7 +51,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/01/31 18:51:47 todd Exp $
  	  if test -n "$old_archive_from_expsyms_cmds"; then
  	    # figure out the soname
  	    set dummy $library_names
-@@ -4498,40 +4517,6 @@ relink_command=\"$relink_command\""
+@@ -4575,40 +4594,6 @@ relink_command=\"$relink_command\""
      # Exit here if they wanted silent mode.
      test "$show" = ":" && exit 0
  
diff --git a/x11/gnome/libbonoboui/patches/patch-po_Makefile_in_in b/x11/gnome/libbonoboui/patches/patch-po_Makefile_in_in
new file mode 100644
index 00000000000..ca95eec3add
--- /dev/null
+++ b/x11/gnome/libbonoboui/patches/patch-po_Makefile_in_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-po_Makefile_in_in,v 1.1 2003/06/12 19:58:10 marcm Exp $
+--- po/Makefile.in.in.orig	Sun May 11 12:32:52 2003
++++ po/Makefile.in.in	Sun May 11 12:33:18 2003
+@@ -28,7 +28,7 @@ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+ libdir = @libdir@
+-localedir = $(libdir)/locale
++localedir = $(datadir)/locale
+ gnulocaledir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+ subdir = po
diff --git a/x11/gnome/libbonoboui/pkg/PLIST b/x11/gnome/libbonoboui/pkg/PLIST
index 15e0f8057ee..38b139363fb 100644
--- a/x11/gnome/libbonoboui/pkg/PLIST
+++ b/x11/gnome/libbonoboui/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/01/31 18:51:47 todd Exp $
+@comment $OpenBSD: PLIST,v 1.2 2003/06/12 19:58:10 marcm Exp $
 bin/test-moniker
 include/libbonoboui-2.0/bonobo.h
 include/libbonoboui-2.0/bonobo/bonobo-canvas-component.h
@@ -41,28 +41,38 @@ lib/libglade/2.0/libbonobo.a
 lib/libglade/2.0/libbonobo.la
 lib/pkgconfig/libbonoboui-2.0.pc
 share/gnome-2.0/ui/Bonobo_Sample_Hello.xml
+share/locale/am/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ar/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/az/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/be/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ca/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/cs/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/da/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/de/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/el/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/es/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/fa/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/fi/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/fr/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/he/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/hi/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/hu/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/id/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/it/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ja/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/kn/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ko/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/lv/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/mn/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ms/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/nl/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/nn/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/no/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/pl/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/pt/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ro/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ru/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/sk/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/sl/LC_MESSAGES/libbonoboui-2.0.mo
@@ -97,6 +107,8 @@ share/locale/zh_TW/LC_MESSAGES/libbonoboui-2.0.mo
 @comment @dirrm share/locale/sk
 @comment @dirrm share/locale/ru/LC_MESSAGES
 @comment @dirrm share/locale/ru
+@comment @dirrm share/locale/ro/LC_MESSAGES
+@comment @dirrm share/locale/ro
 @comment @dirrm share/locale/pt_BR/LC_MESSAGES
 @comment @dirrm share/locale/pt_BR
 @comment @dirrm share/locale/pt/LC_MESSAGES
@@ -107,45 +119,62 @@ share/locale/zh_TW/LC_MESSAGES/libbonoboui-2.0.mo
 @comment @dirrm share/locale/no
 @comment @dirrm share/locale/nn/LC_MESSAGES
 @comment @dirrm share/locale/nn
+@comment @dirrm share/locale/nl/LC_MESSAGES
+@comment @dirrm share/locale/nl
 @comment @dirrm share/locale/ms/LC_MESSAGES
 @comment @dirrm share/locale/ms
+@comment @dirrm share/locale/mn/LC_MESSAGES
+@comment @dirrm share/locale/mn
 @comment @dirrm share/locale/lv/LC_MESSAGES
 @comment @dirrm share/locale/lv
 @comment @dirrm share/locale/ko/LC_MESSAGES
 @comment @dirrm share/locale/ko
+@comment @dirrm share/locale/kn/LC_MESSAGES
+@comment @dirrm share/locale/kn
 @comment @dirrm share/locale/ja/LC_MESSAGES
 @comment @dirrm share/locale/ja
 @comment @dirrm share/locale/it/LC_MESSAGES
 @comment @dirrm share/locale/it
+@comment @dirrm share/locale/id/LC_MESSAGES
+@comment @dirrm share/locale/id
 @comment @dirrm share/locale/hu/LC_MESSAGES
 @comment @dirrm share/locale/hu
 @comment @dirrm share/locale/hi/LC_MESSAGES
 @comment @dirrm share/locale/hi
+@comment @dirrm share/locale/he/LC_MESSAGES
+@comment @dirrm share/locale/he
 @comment @dirrm share/locale/fr/LC_MESSAGES
 @comment @dirrm share/locale/fr
 @comment @dirrm share/locale/fi/LC_MESSAGES
 @comment @dirrm share/locale/fi
+@comment @dirrm share/locale/fa/LC_MESSAGES
+@comment @dirrm share/locale/fa
 @comment @dirrm share/locale/es/LC_MESSAGES
 @comment @dirrm share/locale/es
 @comment @dirrm share/locale/el/LC_MESSAGES
 @comment @dirrm share/locale/el
 @comment @dirrm share/locale/de/LC_MESSAGES
 @comment @dirrm share/locale/de
+@comment @dirrm share/locale/da/LC_MESSAGES
+@comment @dirrm share/locale/da
 @comment @dirrm share/locale/cs/LC_MESSAGES
 @comment @dirrm share/locale/cs
 @comment @dirrm share/locale/ca/LC_MESSAGES
 @comment @dirrm share/locale/ca
 @comment @dirrm share/locale/bg/LC_MESSAGES
 @comment @dirrm share/locale/bg
+@comment @dirrm share/locale/be/LC_MESSAGES
+@comment @dirrm share/locale/be
 @comment @dirrm share/locale/az/LC_MESSAGES
 @comment @dirrm share/locale/az
 @comment @dirrm share/locale/ar/LC_MESSAGES
 @comment @dirrm share/locale/ar
+@comment @dirrm share/locale/am/LC_MESSAGES
+@comment @dirrm share/locale/am
 @comment @dirrm share/locale
 @dirrm share/gnome-2.0/ui
 @dirrm share/gnome-2.0
 @comment @dirrm lib/pkgconfig
 @comment @dirrm lib/libglade
-@comment @dirrm lib/bonobo
 @dirrm include/libbonoboui-2.0/bonobo
 @dirrm include/libbonoboui-2.0