diff --git a/x11/gtk-engines2/Makefile b/x11/gtk-engines2/Makefile
index 72783601f6d..12eef3385e3 100644
--- a/x11/gtk-engines2/Makefile
+++ b/x11/gtk-engines2/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2002/12/01 19:59:31 marcm Exp $
+# $OpenBSD: Makefile,v 1.4 2003/06/12 19:27:25 marcm Exp $
+
+NOT_FOR_ARCHS=		${NO_SHARED_ARCHS}
 
 COMMENT=		"collection of theme engines for GTK+2"
 
-DISTNAME=		gtk-engines-1.9.0
-PKGNAME=		gtk-engines2-1.9.0
+DISTNAME=		gtk-engines-2.2.0
+PKGNAME=		gtk-engines2-2.2.0
 CATEGORIES=		x11
 
 HOMEPAGE=		http://www.gnome.org
@@ -15,16 +17,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-engines/1.9/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-engines/2.2/}
 EXTRACT_SUFX=		.tar.bz2
 
 BUILD_DEPENDS=		:pkgconfig->=0.9.0:devel/pkgconfig
-LIB_DEPENDS=		gdk-x11-2.0.=0,gdk_pixbuf-2.0.=0,gtk-x11-2.0.=0::x11/gtk+2
+LIB_DEPENDS=		gdk-x11-2.0.0.10,gdk_pixbuf-2.0.0.10,gtk-x11-2.0.0.10::x11/gtk+2
 
 SEPARATE_BUILD=		concurrent
 USE_X11=		Yes
 CONFIGURE_STYLE= 	gnu
-CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/themes/Pixmap/gtk-2.0
diff --git a/x11/gtk-engines2/distinfo b/x11/gtk-engines2/distinfo
index 8c8c3549159..2d1ddf5578d 100644
--- a/x11/gtk-engines2/distinfo
+++ b/x11/gtk-engines2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtk-engines-1.9.0.tar.bz2) = d77b10a9e73226a306a32d5c89ba066d
-RMD160 (gtk-engines-1.9.0.tar.bz2) = dbacbe98850c0999861e80cebafc99a67c97762c
-SHA1 (gtk-engines-1.9.0.tar.bz2) = 1ce89fa8b203ff5c3563c96c2924c60cbfc6c524
+MD5 (gtk-engines-2.2.0.tar.bz2) = 78e9276c28b509f3203de4873c20a263
+RMD160 (gtk-engines-2.2.0.tar.bz2) = 464568aae902512df57a858e07cc22a73f9223d8
+SHA1 (gtk-engines-2.2.0.tar.bz2) = 963e9fe91a9819b8a073d33c7facf441bae0c928
diff --git a/x11/gtk-engines2/patches/patch-configure b/x11/gtk-engines2/patches/patch-configure
deleted file mode 100644
index 03c74ae7a68..00000000000
--- a/x11/gtk-engines2/patches/patch-configure
+++ /dev/null
@@ -1,25 +0,0 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2002/09/12 09:33:01 nino Exp $
---- configure.orig	Tue Jul 16 23:25:51 2002
-+++ configure	Tue Jul 16 23:28:18 2002
-@@ -5061,8 +5061,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
-@@ -5071,8 +5071,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/gtk-engines2/patches/patch-ltmain_sh b/x11/gtk-engines2/patches/patch-ltmain_sh
index 2b13bb7fc7c..a72feb6e182 100644
--- a/x11/gtk-engines2/patches/patch-ltmain_sh
+++ b/x11/gtk-engines2/patches/patch-ltmain_sh
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2002/09/12 09:33:01 nino Exp $
---- ltmain.sh.orig	Tue Jul 16 23:25:44 2002
-+++ ltmain.sh	Tue Jul 16 23:27:46 2002
-@@ -1060,6 +1060,17 @@ compiler."
+$OpenBSD: patch-ltmain_sh,v 1.2 2003/06/12 19:27:25 marcm Exp $
+--- ltmain.sh.orig	Fri Jan 17 15:48:57 2003
++++ ltmain.sh	Thu Apr  3 22:15:46 2003
+@@ -1082,6 +1082,17 @@ compiler."
  	continue
  	;;
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2002/09/12 09:33:01 nino Exp $
        -module)
  	module=yes
  	continue
-@@ -1496,6 +1507,9 @@ compiler."
+@@ -1522,6 +1533,9 @@ compiler."
  	  fi
  	  continue
  	  ;;
@@ -29,9 +29,9 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2002/09/12 09:33:01 nino Exp $
  	%DEPLIBS%)
  	  alldeplibs=yes
  	  continue
-@@ -4450,40 +4464,6 @@ relink_command=\"$relink_command\""
+@@ -4575,40 +4589,6 @@ relink_command=\"$relink_command\""
      # Exit here if they wanted silent mode.
-     test "$show" = : && exit 0
+     test "$show" = ":" && exit 0
  
 -    echo "----------------------------------------------------------------------"
 -    echo "Libraries have been installed in:"
diff --git a/x11/gtk-engines2/pkg/PFRAG.shared b/x11/gtk-engines2/pkg/PFRAG.shared
index 4bb7b6397da..9d31f8c3669 100644
--- a/x11/gtk-engines2/pkg/PFRAG.shared
+++ b/x11/gtk-engines2/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2002/09/12 09:33:01 nino Exp $
-lib/gtk-2.0/2.0.0/engines/libmetal.so
-lib/gtk-2.0/2.0.0/engines/libpixmap.so
-lib/gtk-2.0/2.0.0/engines/libredmond95.so
+@comment $OpenBSD: PFRAG.shared,v 1.2 2003/06/12 19:27:25 marcm Exp $
+lib/gtk-2.0/2.2.0/engines/libmetal.so
+lib/gtk-2.0/2.2.0/engines/libpixmap.so
+lib/gtk-2.0/2.2.0/engines/libredmond95.so
diff --git a/x11/gtk-engines2/pkg/PLIST b/x11/gtk-engines2/pkg/PLIST
index a45ff656ab5..83f63a6c615 100644
--- a/x11/gtk-engines2/pkg/PLIST
+++ b/x11/gtk-engines2/pkg/PLIST
@@ -1,9 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.3 2003/05/21 06:44:10 marcm Exp $
-%%SHARED%%
-lib/gtk-2.0/2.0.0/engines/libmetal.la
-lib/gtk-2.0/2.0.0/engines/libpixmap.la
-lib/gtk-2.0/2.0.0/engines/libredmond95.la
-@comment share/themes/Metal/ICON.png
+@comment $OpenBSD: PLIST,v 1.4 2003/06/12 19:27:25 marcm Exp $
+lib/gtk-2.0/2.2.0/engines/libmetal.la
+lib/gtk-2.0/2.2.0/engines/libpixmap.la
+lib/gtk-2.0/2.2.0/engines/libredmond95.la
+lib/pkgconfig/gtk-engines-2.pc
 @comment share/themes/Metal/README.html
 share/themes/Metal/gtk-2.0/gtkrc
 share/themes/Pixmap/gtk-2.0/bc-dark.png
@@ -13,13 +12,16 @@ share/themes/Pixmap/gtk-2.0/bubble-blue.png
 share/themes/Pixmap/gtk-2.0/bubble-parts.xcf
 share/themes/Pixmap/gtk-2.0/gtkrc
 share/themes/Pixmap/gtk-2.0/triangle_background.png
-@comment share/themes/Redmond95/ICON.png
 @comment share/themes/Redmond95/README.html
 share/themes/Redmond95/gtk-2.0/gtkrc
+%%SHARED%%
 @dirrm share/themes/Redmond95/gtk-2.0
-@unexec rmdir %D/share/themes/Redmond95 || true
+@dirrm share/themes/Redmond95
 @dirrm share/themes/Pixmap/gtk-2.0
-@unexec rmdir %D/share/themes/Pixmap || true
+@dirrm share/themes/Pixmap
 @dirrm share/themes/Metal/gtk-2.0
-@unexec rmdir %D/share/themes/Metal || true
+@dirrm share/themes/Metal
 @comment @dirrm share/themes
+@comment @dirrm lib/pkgconfig
+@comment @dirrm lib/gtk-2.0/2.2.0/engines
+@comment @dirrm lib/gtk-2.0/2.2.0