Update to gtk+ 2.4.3 and friends.

Note: this will cause breakage in ports that set the various *_DISABLE_DEPRECATED defines for gtk. These weill be addressed shortly. ok pvalchev@
2004-06-22 03:15:02 +00:00 · 2004-06-22 03:15:02 +00:00 · 014548031a
commit 014548031a
parent b960664ed4
43 changed files with 561 additions and 820 deletions
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2003/12/08 06:06:00 marcm Exp $
+# $OpenBSD: Makefile,v 1.8 2004/06/22 03:15:02 marcm Exp $

 COMMENT=		"accessibility toolkit used by gtk+"

-DISTNAME=		atk-1.4.1
+DISTNAME=		atk-1.6.1
 CATEGORIES=		devel

 HOMEPAGE=		http://www.gtk.org
@ -14,21 +14,16 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/atk/1.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/atk/1.6/}
 EXTRACT_SUFX=           .tar.bz2

 MODULES=		gettext
 LIB_DEPENDS=		glib-2.0.0.0,gmodule-2.0.0.0,gobject-2.0.0.0::devel/glib2
 BUILD_DEPENDS=          :pkgconfig-*:devel/pkgconfig

-# library version (major:minor)
-LIBATK_VERSION=		0:7
-
-SEPARATE_BUILD=		simple
 USE_GMAKE=		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
 CONFIGURE_ARGS+=	--enable-static
-MAKE_ENV=		LIBATK_VERSION="${LIBATK_VERSION}"

 .include <bsd.port.mk>
--- a/devel/atk/distinfo
+++ b/devel/atk/distinfo
@ -1,3 +1,3 @@
-MD5 (atk-1.4.1.tar.bz2) = d7830bdf1e05d8395794f75097d291be
-RMD160 (atk-1.4.1.tar.bz2) = 74f1f5a9f174795afe237cfff5cf8a3f6ecf539a
-SHA1 (atk-1.4.1.tar.bz2) = fd9b876fc84de635c29ab4f4c79854a2e028e422
+MD5 (atk-1.6.1.tar.bz2) = f77be7e128c957bd3056c2e270b5f283
+RMD160 (atk-1.6.1.tar.bz2) = 139bebc0b1dfa448a65b0abb986e6d503836a17d
+SHA1 (atk-1.6.1.tar.bz2) = 8bb74543931423179e556a5b10f97102e5c51daa
--- a/devel/atk/pkg/PFRAG.shared
+++ b/devel/atk/pkg/PFRAG.shared
@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2003/12/08 06:06:00 marcm Exp $
-lib/libatk-1.0.so.400.1
+@comment $OpenBSD: PFRAG.shared,v 1.5 2004/06/22 03:15:02 marcm Exp $
+lib/libatk-1.0.so.600.1
 DYNLIBDIR(%D/lib)
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2004/02/04 07:39:18 sturm Exp $
+# $OpenBSD: Makefile,v 1.12 2004/06/22 03:15:02 marcm Exp $

 COMMENT=		"general-purpose utility library"
 COMMENT-docs=           "glib2 documentation"

-VERSION=		2.2.3
+VERSION=		2.4.2
 DISTNAME=		glib-${VERSION}
 PKGNAME=		glib2-${VERSION}
 PKGNAME-docs=           glib2-docs-${VERSION}
@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.2/
+MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.4/
 EXTRACT_SUFX=           .tar.bz2

 MULTI_PACKAGES=         -docs
@ -26,22 +26,22 @@ SUBPACKAGE?=

 .if ${SUBPACKAGE} != "-docs"
 MODULES=		gettext
-BUILD_DEPENDS=          :pkgconfig->=0.14:devel/pkgconfig
+BUILD_DEPENDS=          :pkgconfig-*:devel/pkgconfig
 .endif
 .if defined(PACKAGING) && ${SUBPACKAGE} == "-docs"
 PKG_ARCH=		*
 .endif

-# library versions (major:minor)
-OBSD_LIB_VERSION=	0:11
+# hppa's threads are broken (configure test gives Bus error)...
+.if (${MACHINE_ARCH} == "hppa")
+CONFIGURE_ARGS+=	--disable-threads
+.endif

 USE_GMAKE=		Yes
-SEPARATE_BUILD=		simple
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
 CONFIGURE_ARGS+=	--enable-static
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LIBS="-L${LOCALBASE}/lib"
-MAKE_ENV=		OBSD_LIB_VERSION="${OBSD_LIB_VERSION}"

 .include <bsd.port.mk>
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@ -1,3 +1,3 @@
-MD5 (glib-2.2.3.tar.bz2) = aa214a10d873b68ddd67cd9de2ccae55
-RMD160 (glib-2.2.3.tar.bz2) = 1942ee58592dcb1f2d109fa65d172b1973f48df6
-SHA1 (glib-2.2.3.tar.bz2) = 05580cbe110b94dd5020a07cf6d380190a2a13af
+MD5 (glib-2.4.2.tar.bz2) = 038b7cf535cbe016c6bb6033dbcf9acf
+RMD160 (glib-2.4.2.tar.bz2) = 4feb38a46f2c4fc060f63988dd5090494836beae
+SHA1 (glib-2.4.2.tar.bz2) = a516204aedf14f7c52963cc7d7a4e7241d27ce2a
--- a/devel/glib2/patches/patch-glib_Makefile_in
+++ b/devel/glib2/patches/patch-glib_Makefile_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-glib_Makefile_in,v 1.3 2003/06/30 03:55:29 marcm Exp $
--- glib/Makefile.in.orig	Sun Jun  8 09:42:56 2003
-+++ glib/Makefile.in	Thu Jun 19 08:15:48 2003
-@@ -298,7 +298,7 @@ libglib_2_0_la_LIBADD = libcharset/libch
- libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(trio_libtrio_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @G_LIB_WIN32_RESOURCE@ @GLIB_DEF@
- 
- libglib_2_0_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-+	-version-info $(OBSD_LIB_VERSION) \
- 	-export-dynamic $(no_undefined) $(export_symbols)
- 
- 
--- a/devel/glib2/patches/patch-glib_gmacros_h
+++ b/devel/glib2/patches/patch-glib_gmacros_h
@ -1,6 +1,6 @@
-$OpenBSD: patch-glib_gmacros_h,v 1.2 2003/04/17 05:55:42 marcm Exp $
--- glib/gmacros.h.orig	Tue Jan 28 12:15:50 2003
-+++ glib/gmacros.h	Mon Feb 24 23:37:16 2003
+$OpenBSD: patch-glib_gmacros_h,v 1.3 2004/06/22 03:15:02 marcm Exp $
+--- glib/gmacros.h.orig	2004-03-13 20:30:24.000000000 -0800
+++ glib/gmacros.h	2004-03-30 22:13:12.000000000 -0800
@@ -34,6 +34,7 @@
 /* We include stddef.h to get the system's definition of NULL
  */
@ -9,7 +9,7 @@ $OpenBSD: patch-glib_gmacros_h,v 1.2 2003/04/17 05:55:42 marcm Exp $
 
 /* Here we provide G_GNUC_EXTENSION as an alias for __extension__,
  * where this is valid. This allows for warningless compilation of
-@@ -137,11 +138,13 @@
+@@ -147,11 +148,13 @@
 #define	TRUE	(!FALSE)
 #endif
 
--- a/devel/glib2/patches/patch-glib_gnulib_g-gnulib_h
+++ b/devel/glib2/patches/patch-glib_gnulib_g-gnulib_h
@ -0,0 +1,12 @@
+$OpenBSD: patch-glib_gnulib_g-gnulib_h,v 1.1 2004/06/22 03:15:02 marcm Exp $
+--- glib/gnulib/g-gnulib.h.orig	2004-04-01 07:34:06.000000000 -0800
+++ glib/gnulib/g-gnulib.h	2004-04-01 07:35:10.000000000 -0800
+@@ -41,6 +41,8 @@
+ #define HAVE_SNPRINTF 0
+ #endif
+ 
+/* Undef this to work around issues in OpenBSD */
+#undef HAVE_WCHAR_T
+ 
+ #endif  /* __G_GNULIB_H__ */
+ 
--- a/devel/glib2/patches/patch-glib_trio_trio_c
+++ b/devel/glib2/patches/patch-glib_trio_trio_c
@ -1,257 +0,0 @@
-$OpenBSD: patch-glib_trio_trio_c,v 1.1 2004/01/12 22:23:19 brad Exp $
--- glib/trio/trio.c.orig	2003-08-25 20:17:43.000000000 -0400
-+++ glib/trio/trio.c	2004-01-12 17:11:29.000000000 -0500
-@@ -3575,9 +3575,12 @@ TRIO_ARGS2((format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-+
-   assert(VALID(format));
- 
-  return TrioFormat(stdout, 0, TrioOutStreamFile, format, &args, NULL);
-+  G_VA_COPY(args2, args);
-+  return TrioFormat(stdout, 0, TrioOutStreamFile, format, &args2, NULL);
- }
- 
- /**
-@@ -3644,10 +3647,13 @@ TRIO_ARGS3((file, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-+
-   assert(VALID(file));
-   assert(VALID(format));
-  
-  return TrioFormat(file, 0, TrioOutStreamFile, format, &args, NULL);
-+
-+  G_VA_COPY(args2, args);  
-+  return TrioFormat(file, 0, TrioOutStreamFile, format, &args2, NULL);
- }
- 
- /**
-@@ -3716,9 +3722,12 @@ TRIO_ARGS3((fd, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-+
-   assert(VALID(format));
-  
-  return TrioFormat(&fd, 0, TrioOutStreamFileDescriptor, format, &args, NULL);
-+
-+  G_VA_COPY(args2, args);  
-+  return TrioFormat(&fd, 0, TrioOutStreamFileDescriptor, format, &args2, NULL);
- }
- 
- /**
-@@ -3775,6 +3784,7 @@ TRIO_ARGS4((stream, closure, format, arg
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   trio_custom_t data;
- 
-   assert(VALID(stream));
-@@ -3782,7 +3792,8 @@ TRIO_ARGS4((stream, closure, format, arg
- 
-   data.stream.out = stream;
-   data.closure = closure;
-  return TrioFormat(&data, 0, TrioOutStreamCustom, format, &args, NULL);
-+  G_VA_COPY(args2, args);
-+  return TrioFormat(&data, 0, TrioOutStreamCustom, format, &args2, NULL);
- }
- 
- TRIO_PUBLIC int
-@@ -3850,12 +3861,14 @@ TRIO_ARGS3((buffer, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   int status;
- 
-   assert(VALID(buffer));
-   assert(VALID(format));
- 
-  status = TrioFormat(&buffer, 0, TrioOutStreamString, format, &args, NULL);
-+  G_VA_COPY(args2, args);
-+  status = TrioFormat(&buffer, 0, TrioOutStreamString, format, &args2, NULL);
-   *buffer = NIL;
-   return status;
- }
-@@ -3938,13 +3951,15 @@ TRIO_ARGS4((buffer, max, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   int status;
- 
-   assert(max == 0 || VALID(buffer));
-   assert(VALID(format));
- 
-+  G_VA_COPY(args2, args);
-   status = TrioFormat(&buffer, max > 0 ? max - 1 : 0,
-		      TrioOutStreamStringMax, format, &args, NULL);
-+		      TrioOutStreamStringMax, format, &args2, NULL);
-   if (max > 0)
-     *buffer = NIL;
-   return status;
-@@ -4019,6 +4034,7 @@ TRIO_ARGS4((buffer, max, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   int status;
-   size_t buf_len;
-   
-@@ -4027,8 +4043,9 @@ TRIO_ARGS4((buffer, max, format, args),
- 
-   buf_len = trio_length(buffer);
-   buffer = &buffer[buf_len];
-+  G_VA_COPY(args2, args);
-   status = TrioFormat(&buffer, max - 1 - buf_len,
-		      TrioOutStreamStringMax, format, &args, NULL);
-+		      TrioOutStreamStringMax, format, &args2, NULL);
-   *buffer = NIL;
-   return status;
- }
-@@ -4072,6 +4089,7 @@ TRIO_ARGS2((format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   trio_string_t *info;
-   char *result = NULL;
-   
-@@ -4080,8 +4098,9 @@ TRIO_ARGS2((format, args),
-   info = trio_xstring_duplicate("");
-   if (info)
-     {
-+      G_VA_COPY(args2, args);
-       (void)TrioFormat(info, 0, TrioOutStreamStringDynamic,
-		       format, &args, NULL);
-+		       format, &args2, NULL);
-       trio_string_terminate(info);
-       result = trio_string_extract(info);
-       trio_string_destroy(info);
-@@ -4132,6 +4151,7 @@ TRIO_ARGS3((result, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   int status;
-   trio_string_t *info;
-   
-@@ -4146,8 +4166,9 @@ TRIO_ARGS3((result, format, args),
-     }
-   else
-     {
-+      G_VA_COPY(args2, args);
-       status = TrioFormat(info, 0, TrioOutStreamStringDynamic,
-			  format, &args, NULL);
-+			  format, &args2, NULL);
-       if (status >= 0)
- 	{
- 	  trio_string_terminate(info);
-@@ -4834,9 +4855,11 @@ TRIO_ARGS3((ref, format, arglist),
- 	   TRIO_CONST char *format,
- 	   va_list arglist)
- {
-+  va_list args2;
-   assert(VALID(format));
-  
-  return TrioFormatRef((trio_reference_t *)ref, format, &arglist, NULL);
-+
-+  G_VA_COPY(args2, arglist); 
-+  return TrioFormatRef((trio_reference_t *)ref, format, &args2, NULL);
- }
- 
- /*************************************************************************
-@@ -6487,11 +6510,13 @@ TRIO_ARGS2((format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   assert(VALID(format));
-  
-+
-+  G_VA_COPY(args2, args);
-   return TrioScan((trio_pointer_t)stdin, 0,
- 		  TrioInStreamFile,
-		  format, &args, NULL);
-+		  format, &args2, NULL);
- }
- 
- TRIO_PUBLIC int
-@@ -6538,12 +6563,15 @@ TRIO_ARGS3((file, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-+
-   assert(VALID(file));
-   assert(VALID(format));
-  
-+
-+  G_VA_COPY(args2, args);  
-   return TrioScan((trio_pointer_t)file, 0,
- 		  TrioInStreamFile,
-		  format, &args, NULL);
-+		  format, &args2, NULL);
- }
- 
- TRIO_PUBLIC int
-@@ -6591,11 +6619,13 @@ TRIO_ARGS3((fd, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   assert(VALID(format));
-  
-+
-+  G_VA_COPY(args2, args); 
-   return TrioScan((trio_pointer_t)&fd, 0,
- 		  TrioInStreamFileDescriptor,
-		  format, &args, NULL);
-+		  format, &args2, NULL);
- }
- 
- TRIO_PUBLIC int
-@@ -6646,6 +6676,7 @@ TRIO_ARGS4((stream, closure, format, arg
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-   trio_custom_t data;
-   
-   assert(VALID(stream));
-@@ -6653,7 +6684,9 @@ TRIO_ARGS4((stream, closure, format, arg
- 
-   data.stream.in = stream;
-   data.closure = closure;
-  return TrioScan(&data, 0, TrioInStreamCustom, format, &args, NULL);
-+
-+  G_VA_COPY(args2, args);
-+  return TrioScan(&data, 0, TrioInStreamCustom, format, &args2, NULL);
- }
- 
- TRIO_PUBLIC int
-@@ -6705,12 +6738,15 @@ TRIO_ARGS3((buffer, format, args),
- 	   TRIO_CONST char *format,
- 	   va_list args)
- {
-+  va_list args2;
-+
-   assert(VALID(buffer));
-   assert(VALID(format));
-  
-+
-+  G_VA_COPY(args2, args);  
-   return TrioScan((trio_pointer_t)&buffer, 0,
- 		  TrioInStreamString,
-		  format, &args, NULL);
-+		  format, &args2, NULL);
- }
- 
- TRIO_PUBLIC int
--- a/devel/glib2/patches/patch-gmodule_Makefile_in
+++ b/devel/glib2/patches/patch-gmodule_Makefile_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-gmodule_Makefile_in,v 1.3 2003/06/30 03:55:29 marcm Exp $
--- gmodule/Makefile.in.orig	Sun Jun  8 09:42:59 2003
-+++ gmodule/Makefile.in	Thu Jun 19 08:15:48 2003
-@@ -190,7 +190,7 @@ lib_LTLIBRARIES = libgmodule-2.0.la
- libgmodule_2_0_la_SOURCES = gmodule.c
- libgmodule_2_0_la_LDFLAGS = \
- 	@G_MODULE_LDFLAGS@ \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-+	-version-info $(OBSD_LIB_VERSION) \
- 	-export-dynamic $(no_undefined) $(export_symbols)
- 
- 
--- a/devel/glib2/patches/patch-gobject_Makefile_in
+++ b/devel/glib2/patches/patch-gobject_Makefile_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-gobject_Makefile_in,v 1.3 2003/06/30 03:55:29 marcm Exp $
--- gobject/Makefile.in.orig	Sun Jun  8 09:42:58 2003
-+++ gobject/Makefile.in	Thu Jun 19 08:15:48 2003
-@@ -173,7 +173,7 @@ lib_LTLIBRARIES = libgobject-2.0.la
- # libtool stuff: set version and export symbols for resolving
- libgobjectincludedir = $(includedir)/glib-2.0/gobject
- libgobject_2_0_la_LDFLAGS = @STRIP_BEGIN@ \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
-+	-version-info $(OBSD_LIB_VERSION)	\
- 	-export-dynamic $(no_undefined) $(export_symbols)	\
- @STRIP_END@
- 
--- a/devel/glib2/patches/patch-gthread_Makefile_in
+++ b/devel/glib2/patches/patch-gthread_Makefile_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-gthread_Makefile_in,v 1.3 2003/06/30 03:55:29 marcm Exp $
--- gthread/Makefile.in.orig	Sun Jun  8 09:42:59 2003
-+++ gthread/Makefile.in	Thu Jun 19 08:15:48 2003
-@@ -179,7 +179,7 @@ lib_LTLIBRARIES = libgthread-2.0.la
- 
- libgthread_2_0_la_SOURCES = gthread-impl.c
- libgthread_2_0_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-+	-version-info $(OBSD_LIB_VERSION) \
- 	-export-dynamic $(no_undefined) $(export_symbols)
- 
- 
--- a/devel/glib2/patches/patch-ltmain_sh
+++ b/devel/glib2/patches/patch-ltmain_sh
@ -1,46 +1,22 @@
-$OpenBSD: patch-ltmain_sh,v 1.4 2003/06/30 03:55:29 marcm Exp $
--- ltmain.sh.orig	Thu Apr 24 16:44:23 2003
-+++ ltmain.sh	Thu Jun 19 08:40:05 2003
-@@ -1290,6 +1290,17 @@ EOF
- 	continue
- 	;;
- 
-+      -pthread)
-+       case $host in
-+       *-*-openbsd*)
-+         deplibs="$deplibs $arg"
-+         ;;
-+       *)
-+         continue
-+         ;;
-+       esac
-+       ;;
-+
-       -module)
- 	module=yes
- 	continue
-@@ -1961,6 +1972,20 @@ EOF
+$OpenBSD: patch-ltmain_sh,v 1.5 2004/06/22 03:15:03 marcm Exp $
+--- ltmain.sh.orig	2004-04-08 06:34:47.000000000 -0700
+++ ltmain.sh	2004-05-02 10:54:10.000000000 -0700
+@@ -1847,9 +1847,12 @@ EOF
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"
+ 	    finalize_deplibs="$deplib $finalize_deplibs"
+-	  else
+-	    deplibs="$deplib $deplibs"
+	    continue
 	  fi
+	  if test "$linkmode" = "lib"; then
+	    newdependency_libs="$deplib $newdependency_libs"
+	  fi
+	  deplibs="$deplib $deplibs"
 	  continue
 	  ;;
-+       -pthread)
-+         case $linkmode in
-+         lib)
-+           deplibs="$deplib $deplibs"
-+           newdependency_libs="$deplib $newdependency_libs"
-+           ;;
-+         prog)
-+           compile_deplibs="$deplib $compile_deplibs"
-+           finalize_deplibs="$deplib $finalize_deplibs"
-+           ;;
-+         esac
-+         continue
-+         ;;
-+
- 	%DEPLIBS%)
- 	  alldeplibs=yes
- 	  continue
-@@ -2209,10 +2234,6 @@ EOF
+ 	-l*)
+@@ -2262,10 +2265,6 @@ EOF
 	link_static=no # Whether the deplib will be linked statically
 	if test -n "$library_names" &&
 	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
@ -51,7 +27,7 @@ $OpenBSD: patch-ltmain_sh,v 1.4 2003/06/30 03:55:29 marcm Exp $
 	  # This is a shared library
 	
       # Warn about portability, can't link against -module's on some systems (darwin)
-@@ -5705,40 +5726,6 @@ relink_command=\"$relink_command\""
+@@ -5804,40 +5803,6 @@ relink_command=\"$relink_command\""
     # Exit here if they wanted silent mode.
     test "$show" = : && exit 0
 
--- a/devel/glib2/patches/patch-tests_patterntest_c
+++ b/devel/glib2/patches/patch-tests_patterntest_c
@ -1,15 +0,0 @@
-$OpenBSD: patch-tests_patterntest_c,v 1.1 2004/01/13 01:57:44 brad Exp $
--- tests/patterntest.c.orig	2004-01-12 20:43:17.000000000 -0500
-+++ tests/patterntest.c	2004-01-12 20:44:01.000000000 -0500
-@@ -31,8 +31,10 @@ static void
- verbose (const gchar *format, ...)
- {
-   va_list args;
-+  gchar *msg;
-+
-   va_start (args, format);
-  gchar *msg = g_strdup_vprintf (format, args);
-+  msg = g_strdup_vprintf (format, args);
-   va_end (args);
-   if (noisy) 
-     g_print (msg);
--- a/devel/glib2/pkg/PFRAG.shared
+++ b/devel/glib2/pkg/PFRAG.shared
@ -1,6 +1,6 @@
-@comment $OpenBSD: PFRAG.shared,v 1.5 2003/09/23 06:12:41 marcm Exp $
-lib/libglib-2.0.so.0.11
-lib/libgmodule-2.0.so.0.11
-lib/libgobject-2.0.so.0.11
-lib/libgthread-2.0.so.0.11
+@comment $OpenBSD: PFRAG.shared,v 1.6 2004/06/22 03:15:03 marcm Exp $
+lib/libglib-2.0.so.400.2
+lib/libgmodule-2.0.so.400.2
+lib/libgobject-2.0.so.400.2
+lib/libgthread-2.0.so.400.2
 DYNLIBDIR(%D/lib)
--- a/devel/glib2/pkg/PLIST
+++ b/devel/glib2/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2003/12/08 06:05:21 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.9 2004/06/22 03:15:03 marcm Exp $
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@ -8,6 +8,7 @@ include/glib-2.0/glib.h
 include/glib-2.0/glib/galloca.h
 include/glib-2.0/glib/garray.h
 include/glib-2.0/glib/gasyncqueue.h
+include/glib-2.0/glib/gatomic.h
 include/glib-2.0/glib/gbacktrace.h
 include/glib-2.0/glib/gcache.h
 include/glib-2.0/glib/gcompletion.h
@ -19,6 +20,8 @@ include/glib-2.0/glib/gerror.h
 include/glib-2.0/glib/gfileutils.h
 include/glib-2.0/glib/ghash.h
 include/glib-2.0/glib/ghook.h
+include/glib-2.0/glib/gi18n-lib.h
+include/glib-2.0/glib/gi18n.h
 include/glib-2.0/glib/giochannel.h
 include/glib-2.0/glib/glist.h
 include/glib-2.0/glib/gmacros.h
@ -82,11 +85,16 @@ lib/pkgconfig/gmodule-2.0.pc
 lib/pkgconfig/gobject-2.0.pc
 lib/pkgconfig/gthread-2.0.pc
 man/man1/glib-genmarshal.1
+man/man1/glib-gettextize.1
 man/man1/glib-mkenums.1
+man/man1/gobject-query.1
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/glib-2.0/gettext/po/Makefile.in.in
+share/gtk-doc/html/glib/style.css
+share/gtk-doc/html/gobject/style.css
 share/locale/am/LC_MESSAGES/glib20.mo
+share/locale/ar/LC_MESSAGES/glib20.mo
 share/locale/az/LC_MESSAGES/glib20.mo
 share/locale/be/LC_MESSAGES/glib20.mo
 share/locale/bg/LC_MESSAGES/glib20.mo
@ -97,6 +105,8 @@ share/locale/cy/LC_MESSAGES/glib20.mo
 share/locale/da/LC_MESSAGES/glib20.mo
 share/locale/de/LC_MESSAGES/glib20.mo
 share/locale/el/LC_MESSAGES/glib20.mo
+share/locale/en_CA/LC_MESSAGES/glib20.mo
+share/locale/en_GB/LC_MESSAGES/glib20.mo
 share/locale/eo/LC_MESSAGES/glib20.mo
 share/locale/es/LC_MESSAGES/glib20.mo
 share/locale/et/LC_MESSAGES/glib20.mo
@ -104,23 +114,26 @@ share/locale/eu/LC_MESSAGES/glib20.mo
 share/locale/fa/LC_MESSAGES/glib20.mo
 share/locale/fi/LC_MESSAGES/glib20.mo
 share/locale/fr/LC_MESSAGES/glib20.mo
+share/locale/ga/LC_MESSAGES/glib20.mo
 share/locale/gl/LC_MESSAGES/glib20.mo
+share/locale/gu/LC_MESSAGES/glib20.mo
 share/locale/he/LC_MESSAGES/glib20.mo
 share/locale/hi/LC_MESSAGES/glib20.mo
+share/locale/hr/LC_MESSAGES/glib20.mo
 share/locale/id/LC_MESSAGES/glib20.mo
 share/locale/is/LC_MESSAGES/glib20.mo
 share/locale/it/LC_MESSAGES/glib20.mo
 share/locale/ja/LC_MESSAGES/glib20.mo
 share/locale/ko/LC_MESSAGES/glib20.mo
-share/locale/li/LC_MESSAGES/glib20.mo
+share/locale/lt/LC_MESSAGES/glib20.mo
 share/locale/lv/LC_MESSAGES/glib20.mo
 share/locale/mk/LC_MESSAGES/glib20.mo
-share/locale/ml/LC_MESSAGES/glib20.mo
 share/locale/mn/LC_MESSAGES/glib20.mo
 share/locale/ms/LC_MESSAGES/glib20.mo
 share/locale/nl/LC_MESSAGES/glib20.mo
 share/locale/nn/LC_MESSAGES/glib20.mo
 share/locale/no/LC_MESSAGES/glib20.mo
+share/locale/pa/LC_MESSAGES/glib20.mo
 share/locale/pl/LC_MESSAGES/glib20.mo
 share/locale/pt/LC_MESSAGES/glib20.mo
 share/locale/pt_BR/LC_MESSAGES/glib20.mo
@ -131,11 +144,13 @@ share/locale/sl/LC_MESSAGES/glib20.mo
 share/locale/sq/LC_MESSAGES/glib20.mo
 share/locale/sr/LC_MESSAGES/glib20.mo
 share/locale/sr@Latn/LC_MESSAGES/glib20.mo
+share/locale/sr@ije/LC_MESSAGES/glib20.mo
 share/locale/sv/LC_MESSAGES/glib20.mo
 share/locale/ta/LC_MESSAGES/glib20.mo
 share/locale/tr/LC_MESSAGES/glib20.mo
 share/locale/uk/LC_MESSAGES/glib20.mo
 share/locale/vi/LC_MESSAGES/glib20.mo
+share/locale/wa/LC_MESSAGES/glib20.mo
 share/locale/yi/LC_MESSAGES/glib20.mo
 share/locale/zh_CN/LC_MESSAGES/glib20.mo
 share/locale/zh_TW/LC_MESSAGES/glib20.mo
@ -146,94 +161,64 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrm share/locale/zh_CN
@dirrm share/locale/yi/LC_MESSAGES
@dirrm share/locale/yi
+@dirrm share/locale/wa/LC_MESSAGES
+@dirrm share/locale/wa
@dirrm share/locale/vi/LC_MESSAGES
@dirrm share/locale/vi
@dirrm share/locale/uk/LC_MESSAGES
@dirrm share/locale/uk
-@dirrm share/locale/tr/LC_MESSAGES
-@dirrm share/locale/tr
@dirrm share/locale/ta/LC_MESSAGES
@dirrm share/locale/ta
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
+@dirrm share/locale/sr@ije/LC_MESSAGES
+@dirrm share/locale/sr@ije
@dirrm share/locale/sr@Latn/LC_MESSAGES
@dirrm share/locale/sr@Latn
@dirrm share/locale/sr/LC_MESSAGES
@dirrm share/locale/sr
@dirrm share/locale/sq/LC_MESSAGES
@dirrm share/locale/sq
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
@dirrm share/locale/sk/LC_MESSAGES
@dirrm share/locale/sk
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
@dirrm share/locale/ro/LC_MESSAGES
@dirrm share/locale/ro
-@dirrm share/locale/pt_BR/LC_MESSAGES
-@dirrm share/locale/pt_BR
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/nn/LC_MESSAGES
-@dirrm share/locale/nn
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
+@dirrm share/locale/pa/LC_MESSAGES
+@dirrm share/locale/pa
@dirrm share/locale/ms/LC_MESSAGES
@dirrm share/locale/ms
@dirrm share/locale/mn/LC_MESSAGES
@dirrm share/locale/mn
-@dirrm share/locale/ml/LC_MESSAGES
-@dirrm share/locale/ml
@dirrm share/locale/mk/LC_MESSAGES
@dirrm share/locale/mk
@dirrm share/locale/lv/LC_MESSAGES
@dirrm share/locale/lv
-@dirrm share/locale/li/LC_MESSAGES
-@dirrm share/locale/li
-@dirrm share/locale/ko/LC_MESSAGES
-@dirrm share/locale/ko
-@dirrm share/locale/ja/LC_MESSAGES
-@dirrm share/locale/ja
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
+@dirrm share/locale/lt/LC_MESSAGES
+@dirrm share/locale/lt
@dirrm share/locale/is/LC_MESSAGES
@dirrm share/locale/is
-@dirrm share/locale/id/LC_MESSAGES
-@dirrm share/locale/id
+@dirrm share/locale/hr/LC_MESSAGES
+@dirrm share/locale/hr
@dirrm share/locale/hi/LC_MESSAGES
@dirrm share/locale/hi
@dirrm share/locale/he/LC_MESSAGES
@dirrm share/locale/he
-@dirrm share/locale/gl/LC_MESSAGES
-@dirrm share/locale/gl
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
+@dirrm share/locale/gu/LC_MESSAGES
+@dirrm share/locale/gu
+@dirrm share/locale/ga/LC_MESSAGES
+@dirrm share/locale/ga
@dirrm share/locale/fi/LC_MESSAGES
@dirrm share/locale/fi
@dirrm share/locale/fa/LC_MESSAGES
@dirrm share/locale/fa
@dirrm share/locale/eu/LC_MESSAGES
@dirrm share/locale/eu
-@dirrm share/locale/et/LC_MESSAGES
-@dirrm share/locale/et
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
@dirrm share/locale/eo/LC_MESSAGES
@dirrm share/locale/eo
-@dirrm share/locale/el/LC_MESSAGES
-@dirrm share/locale/el
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
+@dirrm share/locale/en_GB/LC_MESSAGES
+@dirrm share/locale/en_GB
+@dirrm share/locale/en_CA/LC_MESSAGES
+@dirrm share/locale/en_CA
@dirrm share/locale/cy/LC_MESSAGES
@dirrm share/locale/cy
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
@dirrm share/locale/ca/LC_MESSAGES
@dirrm share/locale/ca
@dirrm share/locale/bn/LC_MESSAGES
@ -244,13 +229,13 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrm share/locale/be
@dirrm share/locale/az/LC_MESSAGES
@dirrm share/locale/az
+@dirrm share/locale/ar/LC_MESSAGES
+@dirrm share/locale/ar
@dirrm share/locale/am/LC_MESSAGES
@dirrm share/locale/am
-@dirrm share/locale
@dirrm share/glib-2.0/gettext/po
@dirrm share/glib-2.0/gettext
@dirrm share/glib-2.0
-@dirrm share/aclocal
@dirrm lib/pkgconfig
@dirrm lib/glib-2.0/include
@dirrm lib/glib-2.0
--- a/devel/glib2/pkg/PLIST-docs
+++ b/devel/glib2/pkg/PLIST-docs
@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST-docs,v 1.3 2003/12/08 06:05:21 marcm Exp $
+@comment $OpenBSD: PLIST-docs,v 1.4 2004/06/22 03:15:03 marcm Exp $
 share/gtk-doc/html/glib/glib-Arrays.html
 share/gtk-doc/html/glib/glib-Asynchronous-Queues.html
+share/gtk-doc/html/glib/glib-Atomic-Operations.html
 share/gtk-doc/html/glib/glib-Automatic-String-Completion.html
 share/gtk-doc/html/glib/glib-Balanced-Binary-Trees.html
 share/gtk-doc/html/glib/glib-Basic-Types.html
@ -18,6 +19,7 @@ share/gtk-doc/html/glib/glib-File-Utilities.html
 share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html
 share/gtk-doc/html/glib/glib-Hash-Tables.html
 share/gtk-doc/html/glib/glib-Hook-Functions.html
+share/gtk-doc/html/glib/glib-I18N.html
 share/gtk-doc/html/glib/glib-IO-Channels.html
 share/gtk-doc/html/glib/glib-Keyed-Data-Lists.html
 share/gtk-doc/html/glib/glib-Lexical-Scanner.html
@ -55,8 +57,10 @@ share/gtk-doc/html/glib/glib-building.html
 share/gtk-doc/html/glib/glib-changes.html
 share/gtk-doc/html/glib/glib-compiling.html
 share/gtk-doc/html/glib/glib-core.html
+share/gtk-doc/html/glib/glib-cross-compiling.html
 share/gtk-doc/html/glib/glib-data-types.html
 share/gtk-doc/html/glib/glib-fundamentals.html
+share/gtk-doc/html/glib/glib-gettextize.html
 share/gtk-doc/html/glib/glib-resources.html
 share/gtk-doc/html/glib/glib-running.html
 share/gtk-doc/html/glib/glib-utilities.html
@ -69,20 +73,24 @@ share/gtk-doc/html/glib/ix01.html
 share/gtk-doc/html/glib/left.png
 share/gtk-doc/html/glib/mainloop-states.gif
 share/gtk-doc/html/glib/right.png
+share/gtk-doc/html/glib/tools.html
 share/gtk-doc/html/glib/up.png
+share/gtk-doc/html/gobject/GTypeModule.html
+share/gtk-doc/html/gobject/GTypePlugin.html
+share/gtk-doc/html/gobject/glib-genmarshal.html
+share/gtk-doc/html/gobject/glib-mkenums.html
 share/gtk-doc/html/gobject/gobject-Boxed-Types.html
 share/gtk-doc/html/gobject/gobject-Closures.html
 share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html
 share/gtk-doc/html/gobject/gobject-GParamSpec.html
-share/gtk-doc/html/gobject/gobject-GType.html
-share/gtk-doc/html/gobject/gobject-GTypeModule.html
-share/gtk-doc/html/gobject/gobject-GTypePlugin.html
 share/gtk-doc/html/gobject/gobject-Generic-values.html
 share/gtk-doc/html/gobject/gobject-Signals.html
 share/gtk-doc/html/gobject/gobject-Standard-Parameter-and-Value-Types.html
 share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html
+share/gtk-doc/html/gobject/gobject-Type-Information.html
 share/gtk-doc/html/gobject/gobject-Value-arrays.html
 share/gtk-doc/html/gobject/gobject-Varargs-Value-Collection.html
+share/gtk-doc/html/gobject/gobject-query.html
 share/gtk-doc/html/gobject/gobject.devhelp
 share/gtk-doc/html/gobject/home.png
 share/gtk-doc/html/gobject/index.html
@ -92,6 +100,7 @@ share/gtk-doc/html/gobject/left.png
 share/gtk-doc/html/gobject/pr01.html
 share/gtk-doc/html/gobject/right.png
 share/gtk-doc/html/gobject/rn01.html
+share/gtk-doc/html/gobject/rn02.html
 share/gtk-doc/html/gobject/up.png
@dirrm share/gtk-doc/html/gobject
@dirrm share/gtk-doc/html/glib
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2003/09/23 06:12:41 marcm Exp $
+# $OpenBSD: Makefile,v 1.8 2004/06/22 03:15:03 marcm Exp $

 COMMENT=		"library for layout and rendering of text"

-DISTNAME=		pango-1.2.5
+DISTNAME=		pango-1.4.0
 CATEGORIES=		devel x11

 HOMEPAGE=		http://www.gtk.org
@ -14,16 +14,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.2/
+MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.4/
 EXTRACT_SUFX=           .tar.bz2

-LIB_DEPENDS=		glib-2.0.0.8,gmodule-2.0.0.8,gobject-2.0.0.8::devel/glib2
+LIB_DEPENDS=		glib-2.0.400.0,gmodule-2.0.400.0,gobject-2.0.400.0::devel/glib2
 BUILD_DEPENDS=          :pkgconfig-*:devel/pkgconfig

-# library versions (major:minor)
-OBSD_LIB_VERSION=	0:11
-
-SEPARATE_BUILD=		concurrent
 USE_X11=		Yes
 USE_GMAKE=		Yes

@ -33,7 +29,6 @@ CONFIGURE_ARGS+=	--enable-static
 CONFIGURE_ARGS+=	--without-qt
 CONFIGURE_ENV=		CPPFLAGS="-I${X11BASE}/include" \
 			PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig"
-MAKE_ENV=		OBSD_LIB_VERSION="${OBSD_LIB_VERSION}"

 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pango; \
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@ -1,3 +1,3 @@
-MD5 (pango-1.2.5.tar.bz2) = df00fe3e71cd297010f24f439b6c8ee6
-RMD160 (pango-1.2.5.tar.bz2) = d26336635fd3437e4c824dfb32223a9c2f356016
-SHA1 (pango-1.2.5.tar.bz2) = a4e351635895e5d53b49d3db71ac6f54cecaae89
+MD5 (pango-1.4.0.tar.bz2) = 9b5d9a5dcce5b3899d401f9c2cd6873f
+RMD160 (pango-1.4.0.tar.bz2) = c955f0edec937e38728c618bcdeddb6b13b8eb81
+SHA1 (pango-1.4.0.tar.bz2) = 10ea96cb05e0ada51e1b81f68dd1cad56cdd6a99
--- a/devel/pango/patches/patch-Makefile_in
+++ b/devel/pango/patches/patch-Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2004/06/22 03:15:03 marcm Exp $
+--- Makefile.in.orig	2004-04-01 08:29:36.000000000 -0800
+++ Makefile.in	2004-04-01 08:29:50.000000000 -0800
+@@ -233,7 +233,7 @@ target_alias = @target_alias@
+ 
+ AUTOMAKE_OPTIONS = 1.7
+ 
+-SUBDIRS = pango modules examples docs tools tests
+SUBDIRS = pango modules examples docs tools
+ 
+ EXTRA_DIST = \
+ 	pango.pc.in	\
--- a/devel/pango/patches/patch-configure
+++ b/devel/pango/patches/patch-configure
@ -0,0 +1,12 @@
+$OpenBSD: patch-configure,v 1.5 2004/06/22 03:15:03 marcm Exp $
+--- configure.orig	2004-04-01 08:06:37.000000000 -0800
+++ configure	2004-04-01 08:06:59.000000000 -0800
+@@ -8375,7 +8375,7 @@ nto-qnx*)
+ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+-  need_version=yes
+  need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
--- a/devel/pango/patches/patch-examples_Makefile_in
+++ b/devel/pango/patches/patch-examples_Makefile_in
@ -1,12 +1,12 @@
-$OpenBSD: patch-examples_Makefile_in,v 1.8 2003/09/23 06:12:41 marcm Exp $
--- examples/Makefile.in.orig	2003-08-27 08:39:14.000000000 -0700
-+++ examples/Makefile.in	2003-09-05 11:47:52.000000000 -0700
-@@ -418,7 +418,7 @@ pango.modules:
+$OpenBSD: patch-examples_Makefile_in,v 1.9 2004/06/22 03:15:03 marcm Exp $
+--- examples/Makefile.in.orig	2004-04-01 08:20:04.000000000 -0800
+++ examples/Makefile.in	2004-04-01 08:20:57.000000000 -0800
+@@ -580,7 +580,7 @@ pango.modules: $(top_builddir)/pango/pan
 	if find ../modules -name '*.so' | grep 'so' > /dev/null ; then \
           echo "Writing a pango.modules file to use when running examples before installing Pango."; \
 	  (cd ../modules && \
-           ../pango/pango-querymodules `find . -name '*.la' | grep -v \.libs` > ../examples/pango.modules ) ;\
-+           LD_LIBRARY_PATH=../pango/.libs ../pango/pango-querymodules `find . -name '*.so' | grep -v \.libs` > ../examples/pango.modules ) ;\
+-           $(top_builddir)/pango/pango-querymodules `find . -name '*.la' | grep -v \.libs` > ../examples/pango.modules ) ;\
+           LD_LIBRARY_PATH=$(top_builddir)/pango/.libs $(top_builddir)/pango/pango-querymodules `find . -name '*.la' | grep -v \.libs` > ../examples/pango.modules ) ;\
 	else \
           echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
 	  touch pango.modules; \
--- a/devel/pango/patches/patch-ltmain_sh
+++ b/devel/pango/patches/patch-ltmain_sh
@ -1,7 +1,7 @@
-$OpenBSD: patch-ltmain_sh,v 1.3 2003/06/30 03:57:38 marcm Exp $
--- ltmain.sh.orig	Thu Apr 24 16:44:23 2003
-+++ ltmain.sh	Thu Jun 19 09:20:05 2003
-@@ -1290,6 +1290,17 @@ EOF
+$OpenBSD: patch-ltmain_sh,v 1.4 2004/06/22 03:15:03 marcm Exp $
+--- ltmain.sh.orig	2004-02-17 11:55:01.000000000 -0800
+++ ltmain.sh	2004-03-30 22:05:41.000000000 -0800
+@@ -1364,6 +1364,17 @@ EOF
 	continue
 	;;
 
@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.3 2003/06/30 03:57:38 marcm Exp $
       -module)
 	module=yes
 	continue
-@@ -1961,6 +1972,10 @@ EOF
+@@ -2014,6 +2025,10 @@ EOF
 	  fi
 	  continue
 	  ;;
@ -30,7 +30,7 @@ $OpenBSD: patch-ltmain_sh,v 1.3 2003/06/30 03:57:38 marcm Exp $
 	%DEPLIBS%)
 	  alldeplibs=yes
 	  continue
-@@ -2209,10 +2224,6 @@ EOF
+@@ -2262,10 +2277,6 @@ EOF
 	link_static=no # Whether the deplib will be linked statically
 	if test -n "$library_names" &&
 	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
@ -41,7 +41,7 @@ $OpenBSD: patch-ltmain_sh,v 1.3 2003/06/30 03:57:38 marcm Exp $
 	  # This is a shared library
 	
       # Warn about portability, can't link against -module's on some systems (darwin)
-@@ -5705,40 +5716,6 @@ relink_command=\"$relink_command\""
+@@ -5804,40 +5815,6 @@ relink_command=\"$relink_command\""
     # Exit here if they wanted silent mode.
     test "$show" = : && exit 0
 
--- a/devel/pango/patches/patch-modules_Makefile_in
+++ b/devel/pango/patches/patch-modules_Makefile_in
@ -1,15 +1,7 @@
-$OpenBSD: patch-modules_Makefile_in,v 1.5 2003/09/23 06:12:41 marcm Exp $
--- modules/Makefile.in.orig	2003-08-27 08:39:02.000000000 -0700
-+++ modules/Makefile.in	2003-09-05 11:47:52.000000000 -0700
-@@ -119,6 +119,7 @@ WIN32_LIBS = @WIN32_LIBS@
- XFT_CFLAGS = @XFT_CFLAGS@
- XFT_LIBS = @XFT_LIBS@
- ms_librarian = @ms_librarian@
-+moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
- 
- SUBDIRS = \
- 	arabic		\
-@@ -340,21 +341,11 @@ maintainer-clean-generic clean mostlycle
+$OpenBSD: patch-modules_Makefile_in,v 1.6 2004/06/22 03:15:03 marcm Exp $
+--- modules/Makefile.in.orig	2004-03-16 10:11:07.000000000 -0800
+++ modules/Makefile.in	2004-03-30 22:05:41.000000000 -0800
+@@ -539,21 +539,11 @@ uninstall-info: uninstall-info-recursive
 
 
 install-data-local:
--- a/devel/pango/pkg/PFRAG.shared
+++ b/devel/pango/pkg/PFRAG.shared
@ -1,28 +1,13 @@
-@comment $OpenBSD: PFRAG.shared,v 1.5 2003/09/23 06:12:41 marcm Exp $
-lib/pango/1.2.0/modules/pango-arabic-ft2.so
-lib/pango/1.2.0/modules/pango-arabic-x.so
-lib/pango/1.2.0/modules/pango-arabic-xft.so
-lib/pango/1.2.0/modules/pango-basic-ft2.so
-lib/pango/1.2.0/modules/pango-basic-x.so
-lib/pango/1.2.0/modules/pango-basic-xft.so
-lib/pango/1.2.0/modules/pango-bengali-x.so
-lib/pango/1.2.0/modules/pango-devanagari-x.so
-lib/pango/1.2.0/modules/pango-gujarati-x.so
-lib/pango/1.2.0/modules/pango-gurmukhi-x.so
-lib/pango/1.2.0/modules/pango-hangul-x.so
-lib/pango/1.2.0/modules/pango-hangul-xft.so
-lib/pango/1.2.0/modules/pango-hebrew-ft2.so
-lib/pango/1.2.0/modules/pango-hebrew-x.so
-lib/pango/1.2.0/modules/pango-hebrew-xft.so
-lib/pango/1.2.0/modules/pango-indic-ft2.so
-lib/pango/1.2.0/modules/pango-indic-xft.so
-lib/pango/1.2.0/modules/pango-myanmar-x.so
-lib/pango/1.2.0/modules/pango-tamil-x.so
-lib/pango/1.2.0/modules/pango-thai-ft2.so
-lib/pango/1.2.0/modules/pango-thai-x.so
-lib/pango/1.2.0/modules/pango-thai-xft.so
-lib/libpango-1.0.so.0.11
-lib/libpangoft2-1.0.so.0.11
-lib/libpangox-1.0.so.0.11
-lib/libpangoxft-1.0.so.0.11
+@comment $OpenBSD: PFRAG.shared,v 1.6 2004/06/22 03:15:03 marcm Exp $
+lib/pango/1.4.0/modules/pango-arabic-fc.so
+lib/pango/1.4.0/modules/pango-basic-fc.so
+lib/pango/1.4.0/modules/pango-basic-x.so
+lib/pango/1.4.0/modules/pango-hangul-fc.so
+lib/pango/1.4.0/modules/pango-hebrew-fc.so
+lib/pango/1.4.0/modules/pango-indic-fc.so
+lib/pango/1.4.0/modules/pango-thai-fc.so
+lib/libpango-1.0.so.399.1
+lib/libpangoft2-1.0.so.399.1
+lib/libpangox-1.0.so.399.1
+lib/libpangoxft-1.0.so.399.1
 DYNLIBDIR(%D/lib)
--- a/devel/pango/pkg/PLIST
+++ b/devel/pango/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2003/12/08 06:06:31 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.8 2004/06/22 03:15:03 marcm Exp $
 bin/pango-querymodules
 include/pango-1.0/pango/pango-attributes.h
 include/pango-1.0/pango/pango-break.h
@ -11,15 +11,17 @@ include/pango-1.0/pango/pango-fontmap.h
 include/pango-1.0/pango/pango-fontset.h
 include/pango-1.0/pango/pango-glyph-item.h
 include/pango-1.0/pango/pango-glyph.h
-include/pango-1.0/pango/pango-indic.h
 include/pango-1.0/pango/pango-item.h
 include/pango-1.0/pango/pango-layout.h
 include/pango-1.0/pango/pango-modules.h
 include/pango-1.0/pango/pango-ot.h
+include/pango-1.0/pango/pango-script.h
 include/pango-1.0/pango/pango-tabs.h
 include/pango-1.0/pango/pango-types.h
 include/pango-1.0/pango/pango-utils.h
 include/pango-1.0/pango/pango.h
+include/pango-1.0/pango/pangofc-font.h
+include/pango-1.0/pango/pangofc-fontmap.h
 include/pango-1.0/pango/pangoft2.h
 include/pango-1.0/pango/pangox.h
 include/pango-1.0/pango/pangoxft.h
@ -31,56 +33,31 @@ lib/libpangox-1.0.a
 lib/libpangox-1.0.la
 lib/libpangoxft-1.0.a
 lib/libpangoxft-1.0.la
-lib/pango/1.2.0/modules/pango-arabic-ft2.a
-lib/pango/1.2.0/modules/pango-arabic-ft2.la
-lib/pango/1.2.0/modules/pango-arabic-x.a
-lib/pango/1.2.0/modules/pango-arabic-x.la
-lib/pango/1.2.0/modules/pango-arabic-xft.a
-lib/pango/1.2.0/modules/pango-arabic-xft.la
-lib/pango/1.2.0/modules/pango-basic-ft2.a
-lib/pango/1.2.0/modules/pango-basic-ft2.la
-lib/pango/1.2.0/modules/pango-basic-x.a
-lib/pango/1.2.0/modules/pango-basic-x.la
-lib/pango/1.2.0/modules/pango-basic-xft.a
-lib/pango/1.2.0/modules/pango-basic-xft.la
-lib/pango/1.2.0/modules/pango-bengali-x.a
-lib/pango/1.2.0/modules/pango-bengali-x.la
-lib/pango/1.2.0/modules/pango-devanagari-x.a
-lib/pango/1.2.0/modules/pango-devanagari-x.la
-lib/pango/1.2.0/modules/pango-gujarati-x.a
-lib/pango/1.2.0/modules/pango-gujarati-x.la
-lib/pango/1.2.0/modules/pango-gurmukhi-x.a
-lib/pango/1.2.0/modules/pango-gurmukhi-x.la
-lib/pango/1.2.0/modules/pango-hangul-x.a
-lib/pango/1.2.0/modules/pango-hangul-x.la
-lib/pango/1.2.0/modules/pango-hangul-xft.a
-lib/pango/1.2.0/modules/pango-hangul-xft.la
-lib/pango/1.2.0/modules/pango-hebrew-ft2.a
-lib/pango/1.2.0/modules/pango-hebrew-ft2.la
-lib/pango/1.2.0/modules/pango-hebrew-x.a
-lib/pango/1.2.0/modules/pango-hebrew-x.la
-lib/pango/1.2.0/modules/pango-hebrew-xft.a
-lib/pango/1.2.0/modules/pango-hebrew-xft.la
-lib/pango/1.2.0/modules/pango-indic-ft2.a
-lib/pango/1.2.0/modules/pango-indic-ft2.la
-lib/pango/1.2.0/modules/pango-indic-xft.a
-lib/pango/1.2.0/modules/pango-indic-xft.la
-lib/pango/1.2.0/modules/pango-myanmar-x.a
-lib/pango/1.2.0/modules/pango-myanmar-x.la
-lib/pango/1.2.0/modules/pango-tamil-x.a
-lib/pango/1.2.0/modules/pango-tamil-x.la
-lib/pango/1.2.0/modules/pango-thai-ft2.a
-lib/pango/1.2.0/modules/pango-thai-ft2.la
-lib/pango/1.2.0/modules/pango-thai-x.a
-lib/pango/1.2.0/modules/pango-thai-x.la
-lib/pango/1.2.0/modules/pango-thai-xft.a
-lib/pango/1.2.0/modules/pango-thai-xft.la
+lib/pango/1.4.0/modules/pango-arabic-fc.a
+lib/pango/1.4.0/modules/pango-arabic-fc.la
+lib/pango/1.4.0/modules/pango-basic-fc.a
+lib/pango/1.4.0/modules/pango-basic-fc.la
+lib/pango/1.4.0/modules/pango-basic-x.a
+lib/pango/1.4.0/modules/pango-basic-x.la
+lib/pango/1.4.0/modules/pango-hangul-fc.a
+lib/pango/1.4.0/modules/pango-hangul-fc.la
+lib/pango/1.4.0/modules/pango-hebrew-fc.a
+lib/pango/1.4.0/modules/pango-hebrew-fc.la
+lib/pango/1.4.0/modules/pango-indic-fc.a
+lib/pango/1.4.0/modules/pango-indic-fc.la
+lib/pango/1.4.0/modules/pango-thai-fc.a
+lib/pango/1.4.0/modules/pango-thai-fc.la
 lib/pkgconfig/pango.pc
 lib/pkgconfig/pangoft2.pc
 lib/pkgconfig/pangox.pc
 lib/pkgconfig/pangoxft.pc
+man/man1/pango-querymodules.1
 share/examples/pango/pango/pango.modules
 share/examples/pango/pango/pangox.aliases
+share/gtk-doc/html/pango/PangoEngineLang.html
+share/gtk-doc/html/pango/PangoEngineShape.html
+share/gtk-doc/html/pango/PangoFcFont.html
+share/gtk-doc/html/pango/PangoFcFontMap.html
 share/gtk-doc/html/pango/PangoMarkupFormat.html
 share/gtk-doc/html/pango/home.png
 share/gtk-doc/html/pango/index.html
@ -94,20 +71,22 @@ share/gtk-doc/html/pango/pango-Engines.html
 share/gtk-doc/html/pango/pango-Fonts.html
 share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html
 share/gtk-doc/html/pango/pango-Glyph-Storage.html
-share/gtk-doc/html/pango/pango-Indic-Engine-Support.html
 share/gtk-doc/html/pango/pango-Layout-Objects.html
 share/gtk-doc/html/pango/pango-Modules.html
 share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html
+share/gtk-doc/html/pango/pango-Scripts.html
 share/gtk-doc/html/pango/pango-Tab-Stops.html
 share/gtk-doc/html/pango/pango-Text-Attributes.html
 share/gtk-doc/html/pango/pango-Text-Processing.html
 share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html
 share/gtk-doc/html/pango/pango-X-Fonts-and-Rendering.html
 share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html
+share/gtk-doc/html/pango/pango-querymodules.html
 share/gtk-doc/html/pango/pango.devhelp
 share/gtk-doc/html/pango/pango.html
 share/gtk-doc/html/pango/rendering.html
 share/gtk-doc/html/pango/right.png
+share/gtk-doc/html/pango/tools.html
 share/gtk-doc/html/pango/up.png
 %%SHARED%%
@dirrm share/gtk-doc/html/pango
@ -115,8 +94,8 @@ share/gtk-doc/html/pango/up.png
@dirrm share/gtk-doc
@dirrm share/examples/pango/pango
@dirrm share/examples/pango
-@dirrm lib/pango/1.2.0/modules
-@dirrm lib/pango/1.2.0
+@dirrm lib/pango/1.4.0/modules
+@dirrm lib/pango/1.4.0
@dirrm lib/pango
@dirrm include/pango-1.0/pango
@dirrm include/pango-1.0
--- a/x11/gtk+2/Makefile
+++ b/x11/gtk+2/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2004/03/30 15:48:29 sturm Exp $
+# $OpenBSD: Makefile,v 1.15 2004/06/22 03:15:03 marcm Exp $

 NOT_FOR_ARCHS=			${NO_SHARED_ARCHS}

 COMMENT=			"multi-platform graphical toolkit"
 COMMENT-docs=           	"gtk+-2 documentation"

-VERSION=			2.2.4
+VERSION=			2.4.3
 DISTNAME=			gtk+-${VERSION}
 PKGNAME=			gtk+2-${VERSION}
 PKGNAME-docs=			gtk+2-docs-${VERSION}
@ -20,15 +20,15 @@ PERMIT_PACKAGE_FTP=		Yes
 PERMIT_DISTFILES_CDROM=		Yes
 PERMIT_DISTFILES_FTP=		Yes

-MASTER_SITES=			ftp://ftp.gtk.org/pub/gtk/v2.2/
+MASTER_SITES=			ftp://ftp.gtk.org/pub/gtk/v2.4/
 EXTRACT_SUFX=           	.tar.bz2

 MULTI_PACKAGES=         	-docs
 SUBPACKAGE?=

 .if ${SUBPACKAGE} != "-docs"
-LIB_DEPENDS=			glib-2.0.0.8,gmodule-2.0.0.8,gobject-2.0.0.8::devel/glib2 \
-				pango-1.0.0.1,pangox-1.0.0.1,pangoxft-1.0.0.1::devel/pango \
+LIB_DEPENDS=			glib-2.0.400.0,gmodule-2.0.400.0,gobject-2.0.400.0::devel/glib2 \
+				pango-1.0.399.1,pangoft2-1.0.399.1,pangox-1.0.399.1,pangoxft-1.0.399.1::devel/pango \
 				atk-1.0.0.1::devel/atk \
 				tiff.35::graphics/tiff \
 				png.3::graphics/png \
@ -40,15 +40,11 @@ BUILD_DEPENDS=          	:pkgconfig-*:devel/pkgconfig
 PKG_ARCH=			*
 .endif

-# library versions (major:minor)
-OBSD_LIB_VERSION=		0:14
-
 USE_X11=			Yes
 USE_GMAKE=			Yes
 CONFIGURE_STYLE=		gnu
 CONFIGURE_ARGS+= 		--disable-gtk-doc
 CONFIGURE_ENV=			CPPFLAGS="-I${X11BASE}/include/freetype2/ -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
 				LDFLAGS="-L${LOCALBASE}/lib"
-MAKE_ENV=			OBSD_LIB_VERSION="${OBSD_LIB_VERSION}"

 .include <bsd.port.mk>
--- a/x11/gtk+2/distinfo
+++ b/x11/gtk+2/distinfo
@ -1,3 +1,3 @@
-MD5 (gtk+-2.2.4.tar.bz2) = 605332199533e73bc6eec481fb4f1671
-RMD160 (gtk+-2.2.4.tar.bz2) = 4e072c9b78c7efc696ff0981de891761a32182fd
-SHA1 (gtk+-2.2.4.tar.bz2) = ef3d3d9c044f625d8dda25d62dfc0ac50a1024c6
+MD5 (gtk+-2.4.3.tar.bz2) = debfd0fcef08683c0761f13e1ba2dced
+RMD160 (gtk+-2.4.3.tar.bz2) = 0158a395d31501a08eb8f3e10e51b21f1061a878
+SHA1 (gtk+-2.4.3.tar.bz2) = 9712df22a4409e0225aceae884768ba1ae5c4ed4
--- a/x11/gtk+2/patches/patch-Makefile_in
+++ b/x11/gtk+2/patches/patch-Makefile_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2003/06/30 03:59:03 marcm Exp $
--- Makefile.in.orig	Mon Jun  9 14:25:38 2003
-+++ Makefile.in	Thu Jun 19 09:54:26 2003
-@@ -175,7 +175,7 @@ gtktargetlib = @gtktargetlib@
- ms_librarian = @ms_librarian@
- xinput_progs = @xinput_progs@
- 
-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib
- SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
- 
- # require automake 1.4
--- a/x11/gtk+2/patches/patch-configure
+++ b/x11/gtk+2/patches/patch-configure
@ -0,0 +1,25 @@
+$OpenBSD: patch-configure,v 1.5 2004/06/22 03:15:03 marcm Exp $
+--- configure.orig	2004-06-11 06:51:36.000000000 -0600
+++ configure	2004-06-19 19:38:50.000000000 -0600
+@@ -8065,7 +8065,7 @@ nto-qnx*)
+ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+-  need_version=yes
+  need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+@@ -26550,12 +26550,6 @@ echo "$as_me: error: Pango 1.2.0 and Xft
+    { (exit 1); exit 1; }; }
+   fi
+ 
+-  if $PKG_CONFIG --exists xft ; then : ; else
+-    { { echo "$as_me:$LINENO: error: Xft version 2 is required for x11 target" >&5
+-echo "$as_me: error: Xft version 2 is required for x11 target" >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
+-
+   #
+   # If Pango included the shared library dependencies from X11 in
+   # the pkg-config output, then we use that (to avoid duplicates).
--- a/x11/gtk+2/patches/patch-contrib_gdk-pixbuf-xlib_Makefile_in
+++ b/x11/gtk+2/patches/patch-contrib_gdk-pixbuf-xlib_Makefile_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-contrib_gdk-pixbuf-xlib_Makefile_in,v 1.4 2003/06/30 03:59:03 marcm Exp $
--- contrib/gdk-pixbuf-xlib/Makefile.in.orig	Mon Jun  9 14:26:18 2003
-+++ contrib/gdk-pixbuf-xlib/Makefile.in	Thu Jun 19 09:54:26 2003
-@@ -189,7 +189,7 @@ INCLUDES = @STRIP_BEGIN@			\
- 
- libgdk_pixbuf_xlib_2_0_la_LDFLAGS = \
- 	-export-dynamic						\
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+	-version-info $(OBSD_LIB_VERSION)
- 
- 
- libgdk_pixbuf_xlib_2_0_la_LIBADD = \
--- a/x11/gtk+2/patches/patch-demos_Makefile_in
+++ b/x11/gtk+2/patches/patch-demos_Makefile_in
@ -1,12 +1,11 @@
-$OpenBSD: patch-demos_Makefile_in,v 1.4 2003/06/30 03:59:03 marcm Exp $
--- demos/Makefile.in.orig	Mon Jun  9 14:26:13 2003
-+++ demos/Makefile.in	Thu Jun 19 09:54:26 2003
-@@ -983,7 +983,7 @@ maintainer-clean-generic clean mostlycle
- test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
- 	(topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \
- 	  cd $(srcdir) &&				     \
-	      $(pixbuf_csource) --build-list \
-+	      LD_LIBRARY_PATH=$(top_builddir)/gdk-pixbuf/.libs $(pixbuf_csource) --build-list \
- 	        apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/test-inline-pixbufs.h || (rm -f $$curdir/test-inline-pixbufs.h && false))
- $(testpixbuf_OBJECTS): test-inline-pixbufs.h
+$OpenBSD: patch-demos_Makefile_in,v 1.5 2004/06/22 03:15:03 marcm Exp $
+--- demos/Makefile.in.orig	2004-04-01 15:28:47.000000000 -0800
+++ demos/Makefile.in	2004-04-01 15:30:06.000000000 -0800
+@@ -779,6 +779,7 @@ uninstall-info: uninstall-info-recursive
 
+ 
+ test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
+	LD_LIBRARY_PATH=$(top_builddir)/gdk-pixbuf/.libs \
+ 	$(pixbuf_csource) --raw --build-list		\
+ 	        apple_red  $(srcdir)/apple-red.png	\
+                 gnome_foot $(srcdir)/gnome-foot.png	\
--- a/x11/gtk+2/patches/patch-gdk-pixbuf_Makefile_in
+++ b/x11/gtk+2/patches/patch-gdk-pixbuf_Makefile_in
@ -1,39 +1,26 @@
-$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.4 2003/12/08 06:08:43 marcm Exp $
--- gdk-pixbuf/Makefile.in.orig	2003-09-04 10:18:11.000000000 -0700
-+++ gdk-pixbuf/Makefile.in	2003-12-07 10:47:44.000000000 -0800
-@@ -429,7 +429,7 @@ libgdk_pixbuf_2_0_la_SOURCES = @STRIP_BE
- @STRIP_END@
- 
- libgdk_pixbuf_2_0_la_LDFLAGS = @STRIP_BEGIN@ \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
-+	-version-info $(OBSD_LIB_VERSION)    \
- 	@LIBTOOL_EXPORT_OPTIONS@				\
- 	$(no_undefined)						\
- 	$(gdk_pixbuf_symbols)					\
-@@ -1342,17 +1342,6 @@ $(srcdir)/gdk-pixbuf-marshal.c: @REBUILD
- # Running this if cross compiling or if DESTDIR is set is going to
- # not work at all, so skip it
- install-data-local: install-ms-lib install-libtool-import-lib
-	@if $(RUN_QUERY_LOADER_TEST) ; then \
-	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
-	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
+$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.5 2004/06/22 03:15:03 marcm Exp $
+--- gdk-pixbuf/Makefile.in.orig	2004-04-01 14:39:05.000000000 -0800
+++ gdk-pixbuf/Makefile.in	2004-04-01 14:41:40.000000000 -0800
+@@ -1489,13 +1489,6 @@ install-data-hook: install-ms-lib instal
+ 	@if $(RUN_QUERY_LOADER_TEST) ; then \
+ 	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
+ 	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
 -	else \
 -	  echo "***" ; \
 -	  echo "*** Warning: gdk-pixbuf.loaders not built" ; \
 -	  echo "***" ; \
-	  echo "*** Generate this file manually on on host" ; \
+-	  echo "*** Generate this file manually on host" ; \
 -	  echo "*** system using gdk-pixbuf-query-loaders" ; \
 -	  echo "***" ; \
-	fi
+ 	fi
 
- @CROSS_COMPILING_FALSE@all-local: gdk-pixbuf.loaders
- 
-@@ -1360,7 +1349,7 @@ gdk-pixbuf.loaders: $(loader_LTLIBRARIES
- 	LOADERS=`echo libpixbufloader-*.la` ; \
- 	if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \
-           echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \
-	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./gdk-pixbuf.loaders ;\
-+	  LD_LIBRARY_PATH=$(top_builddir)/gdk-pixbuf/.libs $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./gdk-pixbuf.loaders ;\
- 	else \
-           echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
- 	  touch gdk-pixbuf.loaders; \
+ uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+@@ -1507,7 +1500,7 @@ uninstall-local: uninstall-ms-lib uninst
+ @BUILD_DYNAMIC_MODULES_TRUE@	LOADERS=`echo libpixbufloader-*.la` ; \
+ @BUILD_DYNAMIC_MODULES_TRUE@	if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \
+ @BUILD_DYNAMIC_MODULES_TRUE@          echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \
+-@BUILD_DYNAMIC_MODULES_TRUE@	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./gdk-pixbuf.loaders ;\
+@BUILD_DYNAMIC_MODULES_TRUE@	  LD_LIBRARY_PATH=$(top_builddir)/gdk-pixbuf/.libs $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./gdk-pixbuf.loaders ;\
+ @BUILD_DYNAMIC_MODULES_TRUE@	else \
+ @BUILD_DYNAMIC_MODULES_TRUE@          echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
+ @BUILD_DYNAMIC_MODULES_TRUE@	  touch gdk-pixbuf.loaders; \
--- a/x11/gtk+2/patches/patch-gdk-pixbuf_gdk-pixbuf-io_c
+++ b/x11/gtk+2/patches/patch-gdk-pixbuf_gdk-pixbuf-io_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gdk-pixbuf_gdk-pixbuf-io_c,v 1.1 2003/12/08 06:08:43 marcm Exp $
--- gdk-pixbuf/gdk-pixbuf-io.c.orig	2003-12-07 10:40:38.000000000 -0800
-+++ gdk-pixbuf/gdk-pixbuf-io.c	2003-12-07 10:43:24.000000000 -0800
-@@ -224,7 +224,7 @@ gdk_pixbuf_get_module_file (void)
+$OpenBSD: patch-gdk-pixbuf_gdk-pixbuf-io_c,v 1.2 2004/06/22 03:15:03 marcm Exp $
+--- gdk-pixbuf/gdk-pixbuf-io.c.orig	2004-03-15 06:28:45.000000000 -0800
+++ gdk-pixbuf/gdk-pixbuf-io.c	2004-03-30 22:55:18.000000000 -0800
+@@ -229,7 +229,7 @@ gdk_pixbuf_get_module_file (void)
   gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
 
   if (!result)
--- a/x11/gtk+2/patches/patch-gdk_Makefile_in
+++ b/x11/gtk+2/patches/patch-gdk_Makefile_in
@ -1,20 +0,0 @@
-$OpenBSD: patch-gdk_Makefile_in,v 1.4 2003/06/30 03:59:03 marcm Exp $
--- gdk/Makefile.in.orig	Mon Jun  9 14:26:04 2003
-+++ gdk/Makefile.in	Thu Jun 19 09:54:26 2003
-@@ -218,7 +218,6 @@ gtarget = @gdktarget@
- # we use the general approach here
- LDFLAGS = @STRIP_BEGIN@ 						\
- 	@LDFLAGS@							\
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 		\
- 	-export-dynamic 						\
- 	-rpath $(libdir) 						\
- 	$(no_undefined)							\
-@@ -361,7 +360,7 @@ X_CFLAGS = @X_CFLAGS@
- X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
-libgdk_x11_2_0_la_LDFLAGS = 
-+libgdk_x11_2_0_la_LDFLAGS = -version-info $(OBSD_LIB_VERSION)
- libgdk_x11_2_0_la_DEPENDENCIES =  x11/libgdk-x11.la
- libgdk_x11_2_0_la_OBJECTS =  gdk.lo gdkcolor.lo gdkcursor.lo \
- gdkdisplay.lo gdkdnd.lo gdkdraw.lo gdkevents.lo gdkfont.lo gdkgc.lo \
--- a/x11/gtk+2/patches/patch-gtk_Makefile_in
+++ b/x11/gtk+2/patches/patch-gtk_Makefile_in
@ -1,20 +0,0 @@
-$OpenBSD: patch-gtk_Makefile_in,v 1.5 2003/09/23 06:12:41 marcm Exp $
--- gtk/Makefile.in.orig	2003-09-04 10:18:40.000000000 -0700
-+++ gtk/Makefile.in	2003-09-05 13:45:45.000000000 -0700
-@@ -218,7 +218,6 @@ gtarget = @gdktarget@
- libgtkincludedir = $(includedir)/gtk-2.0/gtk
- LDFLAGS = @STRIP_BEGIN@ \
- 	@LDFLAGS@								\
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)			\
- 	-export-dynamic								\
- 	-rpath $(libdir)							\
- 	$(no_undefined)								\
-@@ -689,7 +688,7 @@ X_CFLAGS = @X_CFLAGS@
- X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
-libgtk_x11_2_0_la_LDFLAGS = 
-+libgtk_x11_2_0_la_LDFLAGS = -version-info $(OBSD_LIB_VERSION)
- libgtk_x11_2_0_la_LIBADD = 
- libgtk_x11_2_0_la_OBJECTS =  gtkaccelgroup.lo gtkaccelmap.lo \
- gtkaccellabel.lo gtkaccessible.lo gtkadjustment.lo gtkalignment.lo \
--- a/x11/gtk+2/patches/patch-gtk_stock-icons_Makefile_in
+++ b/x11/gtk+2/patches/patch-gtk_stock-icons_Makefile_in
@ -1,12 +1,12 @@
-$OpenBSD: patch-gtk_stock-icons_Makefile_in,v 1.1 2003/09/23 06:12:41 marcm Exp $
--- gtk/stock-icons/Makefile.in.orig	2003-09-04 10:18:44.000000000 -0700
-+++ gtk/stock-icons/Makefile.in	2003-09-05 14:43:19.000000000 -0700
-@@ -446,7 +446,7 @@ VARIABLES6 = @STRIP_BEGIN@ 									\
- noinst_DATA = gtkstockpixbufs.h
+$OpenBSD: patch-gtk_stock-icons_Makefile_in,v 1.2 2004/06/22 03:15:03 marcm Exp $
+--- gtk/stock-icons/Makefile.in.orig	2004-04-01 14:52:03.000000000 -0800
+++ gtk/stock-icons/Makefile.in	2004-04-01 14:53:17.000000000 -0800
+@@ -573,7 +573,7 @@ noinst_DATA = gtkstockpixbufs.h
 CLEANFILES = $(noinst_DATA)
- @CROSS_COMPILING_TRUE@pixbuf_csource = @CROSS_COMPILING_TRUE@$(GDK_PIXBUF_CSOURCE)
-@CROSS_COMPILING_FALSE@pixbuf_csource = @CROSS_COMPILING_FALSE@GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
-+@CROSS_COMPILING_FALSE@pixbuf_csource = @CROSS_COMPILING_FALSE@LD_LIBRARY_PATH=$(top_builddir)/gdk-pixbuf/.libs GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
- @CROSS_COMPILING_TRUE@pixbuf_csource_deps = 
- @CROSS_COMPILING_FALSE@pixbuf_csource_deps = @CROSS_COMPILING_FALSE@$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders
+ 
+ @CROSS_COMPILING_TRUE@pixbuf_csource = $(GDK_PIXBUF_CSOURCE)
+-@CROSS_COMPILING_FALSE@pixbuf_csource = GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
+@CROSS_COMPILING_FALSE@pixbuf_csource = LD_LIBRARY_PATH=$(top_builddir)/gdk-pixbuf/.libs GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
+ @CROSS_COMPILING_TRUE@pixbuf_csource_deps = 
+ @CROSS_COMPILING_FALSE@pixbuf_csource_deps = $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders 
 
--- a/x11/gtk+2/patches/patch-ltmain_sh
+++ b/x11/gtk+2/patches/patch-ltmain_sh
@ -1,36 +1,30 @@
-$OpenBSD: patch-ltmain_sh,v 1.3 2003/06/30 03:59:03 marcm Exp $
--- ltmain.sh.orig	Thu Apr 24 16:44:23 2003
-+++ ltmain.sh	Thu Jun 19 09:57:10 2003
-@@ -1290,6 +1290,17 @@ EOF
- 	continue
- 	;;
- 
-+      -pthread)
-+	case $host in
-+	*-*-openbsd*)
-+	  deplibs="$deplibs $arg"
-+	  ;;
-+	*)
-+	  continue
-+	  ;;
-+	esac
-+	;;
-+
-       -module)
- 	module=yes
- 	continue
-@@ -1961,6 +1972,10 @@ EOF
+$OpenBSD: patch-ltmain_sh,v 1.4 2004/06/22 03:15:03 marcm Exp $
+--- ltmain.sh.orig	2004-04-08 07:34:47.000000000 -0600
+++ ltmain.sh	2004-06-19 19:39:51.000000000 -0600
+@@ -1847,9 +1847,12 @@ EOF
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"
+ 	    finalize_deplibs="$deplib $finalize_deplibs"
+-	  else
+-	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  if test "$linkmode" = "lib"; then
+	    newdependency_libs="$deplib $newdependency_libs"
+ 	  fi
+	  deplibs="$deplib $deplibs"
+ 	  continue
+ 	  ;;
+ 	-l*)
+@@ -2014,6 +2017,7 @@ EOF
 	  fi
 	  continue
 	  ;;
-+	-pthread)
-+	  continue
-+	  ;;
 +
 	%DEPLIBS%)
 	  alldeplibs=yes
 	  continue
-@@ -2209,10 +2224,6 @@ EOF
+@@ -2262,10 +2266,6 @@ EOF
 	link_static=no # Whether the deplib will be linked statically
 	if test -n "$library_names" &&
 	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
@ -41,7 +35,7 @@ $OpenBSD: patch-ltmain_sh,v 1.3 2003/06/30 03:59:03 marcm Exp $
 	  # This is a shared library
 	
       # Warn about portability, can't link against -module's on some systems (darwin)
-@@ -5705,40 +5716,6 @@ relink_command=\"$relink_command\""
+@@ -5804,40 +5804,6 @@ relink_command=\"$relink_command\""
     # Exit here if they wanted silent mode.
     test "$show" = : && exit 0
 
--- a/x11/gtk+2/patches/patch-modules_input_Makefile_in
+++ b/x11/gtk+2/patches/patch-modules_input_Makefile_in
@ -1,15 +1,10 @@
-$OpenBSD: patch-modules_input_Makefile_in,v 1.6 2003/12/08 06:08:43 marcm Exp $
--- modules/input/Makefile.in.orig	2003-09-04 10:18:53.000000000 -0700
-+++ modules/input/Makefile.in	2003-12-07 10:54:33.000000000 -0800
-@@ -841,22 +841,10 @@ maintainer-clean-generic clean mostlycle
- # Running this if cross compiling or if DESTDIR is set is going to
- # not work at all, so skip it.
- install-data-local:
-	@if $(RUN_QUERY_IMMODULES_TEST) ; then \
-	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
-	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
-	  echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
-	  $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
+$OpenBSD: patch-modules_input_Makefile_in,v 1.7 2004/06/22 03:15:03 marcm Exp $
+--- modules/input/Makefile.in.orig	2004-04-01 15:24:05.000000000 -0800
+++ modules/input/Makefile.in	2004-04-01 15:25:54.000000000 -0800
+@@ -772,19 +772,13 @@ install-data-hook:
+ 	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
+ 	  echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
+ 	  $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
 -	else \
 -	  echo "***" ; \
 -	  echo "*** Warning: gtk.immodules not built" ; \
@ -17,12 +12,13 @@ $OpenBSD: patch-modules_input_Makefile_in,v 1.6 2003/12/08 06:08:43 marcm Exp $
 -	  echo "*** Generate this file manually on host" ; \
 -	  echo "*** system using gtk-query-immodules-2.0" ; \
 -	  echo "***" ; \
-        fi
+         fi
+ 
+ uninstall-local:
+ 	rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
 
 gtk.immodules: Makefile.am $(module_LTLIBRARIES)
-	$(top_builddir)/gtk/gtk-query-immodules-2.0 *.la > gtk.immodules
 +	LD_LIBRARY_PATH=$(top_builddir)/gdk-pixbuf/.libs/:$(top_builddir)/gdk/.libs/:$(top_builddir)/gtk/.libs/ \
-+			$(top_builddir)/gtk/gtk-query-immodules-2.0 *.la > gtk.immodules
+ 	$(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
 
 @CROSS_COMPILING_FALSE@all-local: gtk.immodules
- 
--- a/x11/gtk+2/patches/patch-po_Makefile_in_in
+++ b/x11/gtk+2/patches/patch-po_Makefile_in_in
@ -1,12 +1,12 @@
-$OpenBSD: patch-po_Makefile_in_in,v 1.1 2003/06/12 19:26:36 marcm Exp $
--- po/Makefile.in.in.orig	Thu Apr  3 15:47:45 2003
-+++ po/Makefile.in.in	Thu Apr  3 15:48:04 2003
-@@ -24,7 +24,7 @@ prefix = @prefix@
+$OpenBSD: patch-po_Makefile_in_in,v 1.2 2004/06/22 03:15:03 marcm Exp $
+--- po/Makefile.in.in.orig	2004-01-17 14:18:26.000000000 -0800
+++ po/Makefile.in.in	2004-03-30 22:55:19.000000000 -0800
+@@ -27,7 +27,7 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = @datadir@
 libdir = @libdir@
 -localedir = $(libdir)/locale
 +localedir = $(datadir)/locale
 gnulocaledir = $(datadir)/locale
- gettextsrcdir = $(datadir)/gettext/po
+ gettextsrcdir = $(datadir)/glib-2.0/gettext/po
 subdir = po
--- a/x11/gtk+2/pkg/PFRAG.shared
+++ b/x11/gtk+2/pkg/PFRAG.shared
@ -1,29 +1,30 @@
-@comment $OpenBSD: PFRAG.shared,v 1.5 2003/09/23 06:12:41 marcm Exp $
-lib/gtk-2.0/2.2.0/immodules/im-am-et.so
-lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.so
-lib/gtk-2.0/2.2.0/immodules/im-hangul.so
-lib/gtk-2.0/2.2.0/immodules/im-inuktitut.so
-lib/gtk-2.0/2.2.0/immodules/im-ipa.so
-lib/gtk-2.0/2.2.0/immodules/im-thai-broken.so
-lib/gtk-2.0/2.2.0/immodules/im-ti-er.so
-lib/gtk-2.0/2.2.0/immodules/im-ti-et.so
-lib/gtk-2.0/2.2.0/immodules/im-viqr.so
-lib/gtk-2.0/2.2.0/immodules/im-xim.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.so
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.so
-lib/libgdk-x11-2.0.so.0.14
-lib/libgdk_pixbuf-2.0.so.0.14
-lib/libgdk_pixbuf_xlib-2.0.so.0.14
-lib/libgtk-x11-2.0.so.0.14
+@comment $OpenBSD: PFRAG.shared,v 1.6 2004/06/22 03:15:03 marcm Exp $
+lib/gtk-2.0/2.4.0/immodules/im-am-et.so
+lib/gtk-2.0/2.4.0/immodules/im-cedilla.so
+lib/gtk-2.0/2.4.0/immodules/im-cyrillic-translit.so
+lib/gtk-2.0/2.4.0/immodules/im-inuktitut.so
+lib/gtk-2.0/2.4.0/immodules/im-ipa.so
+lib/gtk-2.0/2.4.0/immodules/im-thai-broken.so
+lib/gtk-2.0/2.4.0/immodules/im-ti-er.so
+lib/gtk-2.0/2.4.0/immodules/im-ti-et.so
+lib/gtk-2.0/2.4.0/immodules/im-viqr.so
+lib/gtk-2.0/2.4.0/immodules/im-xim.so
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-ani.so
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-bmp.so
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-gif.so
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-ico.so
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-jpeg.so
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-pcx.so
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-png.so
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-pnm.so
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-ras.so
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-tga.so
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-tiff.so
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-wbmp.so
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-xbm.so
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-xpm.so
+lib/libgdk-x11-2.0.so.400.3
+lib/libgdk_pixbuf-2.0.so.400.3
+lib/libgdk_pixbuf_xlib-2.0.so.400.3
+lib/libgtk-x11-2.0.so.400.3
 DYNLIBDIR(%D/lib)
--- a/x11/gtk+2/pkg/PLIST
+++ b/x11/gtk+2/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2003/12/08 06:08:43 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.13 2004/06/22 03:15:03 marcm Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 bin/gtk-demo
@ -38,6 +38,7 @@ include/gtk-2.0/gdk/gdkregion.h
 include/gtk-2.0/gdk/gdkrgb.h
 include/gtk-2.0/gdk/gdkscreen.h
 include/gtk-2.0/gdk/gdkselection.h
+include/gtk-2.0/gdk/gdkspawn.h
 include/gtk-2.0/gdk/gdktypes.h
 include/gtk-2.0/gdk/gdkvisual.h
 include/gtk-2.0/gdk/gdkwindow.h
@ -47,6 +48,8 @@ include/gtk-2.0/gtk/gtkaccelgroup.h
 include/gtk-2.0/gtk/gtkaccellabel.h
 include/gtk-2.0/gtk/gtkaccelmap.h
 include/gtk-2.0/gtk/gtkaccessible.h
+include/gtk-2.0/gtk/gtkaction.h
+include/gtk-2.0/gtk/gtkactiongroup.h
 include/gtk-2.0/gtk/gtkadjustment.h
 include/gtk-2.0/gtk/gtkalignment.h
 include/gtk-2.0/gtk/gtkarrow.h
@ -58,6 +61,7 @@ include/gtk-2.0/gtk/gtkbox.h
 include/gtk-2.0/gtk/gtkbutton.h
 include/gtk-2.0/gtk/gtkcalendar.h
 include/gtk-2.0/gtk/gtkcelleditable.h
+include/gtk-2.0/gtk/gtkcelllayout.h
 include/gtk-2.0/gtk/gtkcellrenderer.h
 include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
 include/gtk-2.0/gtk/gtkcellrenderertext.h
@ -66,9 +70,12 @@ include/gtk-2.0/gtk/gtkcheckbutton.h
 include/gtk-2.0/gtk/gtkcheckmenuitem.h
 include/gtk-2.0/gtk/gtkclipboard.h
 include/gtk-2.0/gtk/gtkclist.h
+include/gtk-2.0/gtk/gtkcolorbutton.h
 include/gtk-2.0/gtk/gtkcolorsel.h
 include/gtk-2.0/gtk/gtkcolorseldialog.h
 include/gtk-2.0/gtk/gtkcombo.h
+include/gtk-2.0/gtk/gtkcombobox.h
+include/gtk-2.0/gtk/gtkcomboboxentry.h
 include/gtk-2.0/gtk/gtkcontainer.h
 include/gtk-2.0/gtk/gtkctree.h
 include/gtk-2.0/gtk/gtkcurve.h
@ -78,10 +85,18 @@ include/gtk-2.0/gtk/gtkdnd.h
 include/gtk-2.0/gtk/gtkdrawingarea.h
 include/gtk-2.0/gtk/gtkeditable.h
 include/gtk-2.0/gtk/gtkentry.h
+include/gtk-2.0/gtk/gtkentrycompletion.h
 include/gtk-2.0/gtk/gtkenums.h
 include/gtk-2.0/gtk/gtkeventbox.h
+include/gtk-2.0/gtk/gtkexpander.h
+include/gtk-2.0/gtk/gtkfilechooser.h
+include/gtk-2.0/gtk/gtkfilechooserdialog.h
+include/gtk-2.0/gtk/gtkfilechooserwidget.h
+include/gtk-2.0/gtk/gtkfilefilter.h
 include/gtk-2.0/gtk/gtkfilesel.h
+include/gtk-2.0/gtk/gtkfilesystem.h
 include/gtk-2.0/gtk/gtkfixed.h
+include/gtk-2.0/gtk/gtkfontbutton.h
 include/gtk-2.0/gtk/gtkfontsel.h
 include/gtk-2.0/gtk/gtkframe.h
 include/gtk-2.0/gtk/gtkgamma.h
@ -95,6 +110,7 @@ include/gtk-2.0/gtk/gtkhscale.h
 include/gtk-2.0/gtk/gtkhscrollbar.h
 include/gtk-2.0/gtk/gtkhseparator.h
 include/gtk-2.0/gtk/gtkiconfactory.h
+include/gtk-2.0/gtk/gtkicontheme.h
 include/gtk-2.0/gtk/gtkimage.h
 include/gtk-2.0/gtk/gtkimagemenuitem.h
 include/gtk-2.0/gtk/gtkimcontext.h
@ -129,8 +145,10 @@ include/gtk-2.0/gtk/gtkpreview.h
 include/gtk-2.0/gtk/gtkprivate.h
 include/gtk-2.0/gtk/gtkprogress.h
 include/gtk-2.0/gtk/gtkprogressbar.h
+include/gtk-2.0/gtk/gtkradioaction.h
 include/gtk-2.0/gtk/gtkradiobutton.h
 include/gtk-2.0/gtk/gtkradiomenuitem.h
+include/gtk-2.0/gtk/gtkradiotoolbutton.h
 include/gtk-2.0/gtk/gtkrange.h
 include/gtk-2.0/gtk/gtkrc.h
 include/gtk-2.0/gtk/gtkruler.h
@ -140,6 +158,7 @@ include/gtk-2.0/gtk/gtkscrolledwindow.h
 include/gtk-2.0/gtk/gtkselection.h
 include/gtk-2.0/gtk/gtkseparator.h
 include/gtk-2.0/gtk/gtkseparatormenuitem.h
+include/gtk-2.0/gtk/gtkseparatortoolitem.h
 include/gtk-2.0/gtk/gtksettings.h
 include/gtk-2.0/gtk/gtksignal.h
 include/gtk-2.0/gtk/gtksizegroup.h
@ -161,13 +180,18 @@ include/gtk-2.0/gtk/gtktexttag.h
 include/gtk-2.0/gtk/gtktexttagtable.h
 include/gtk-2.0/gtk/gtktextview.h
 include/gtk-2.0/gtk/gtktipsquery.h
+include/gtk-2.0/gtk/gtktoggleaction.h
 include/gtk-2.0/gtk/gtktogglebutton.h
+include/gtk-2.0/gtk/gtktoggletoolbutton.h
 include/gtk-2.0/gtk/gtktoolbar.h
+include/gtk-2.0/gtk/gtktoolbutton.h
+include/gtk-2.0/gtk/gtktoolitem.h
 include/gtk-2.0/gtk/gtktooltips.h
 include/gtk-2.0/gtk/gtktree.h
 include/gtk-2.0/gtk/gtktreednd.h
 include/gtk-2.0/gtk/gtktreeitem.h
 include/gtk-2.0/gtk/gtktreemodel.h
+include/gtk-2.0/gtk/gtktreemodelfilter.h
 include/gtk-2.0/gtk/gtktreemodelsort.h
 include/gtk-2.0/gtk/gtktreeselection.h
 include/gtk-2.0/gtk/gtktreesortable.h
@ -176,6 +200,7 @@ include/gtk-2.0/gtk/gtktreeview.h
 include/gtk-2.0/gtk/gtktreeviewcolumn.h
 include/gtk-2.0/gtk/gtktypebuiltins.h
 include/gtk-2.0/gtk/gtktypeutils.h
+include/gtk-2.0/gtk/gtkuimanager.h
 include/gtk-2.0/gtk/gtkvbbox.h
 include/gtk-2.0/gtk/gtkvbox.h
 include/gtk-2.0/gtk/gtkversion.h
@ -187,31 +212,30 @@ include/gtk-2.0/gtk/gtkvscrollbar.h
 include/gtk-2.0/gtk/gtkvseparator.h
 include/gtk-2.0/gtk/gtkwidget.h
 include/gtk-2.0/gtk/gtkwindow.h
-lib/gtk-2.0/2.2.0/immodules/im-am-et.la
-lib/gtk-2.0/2.2.0/immodules/im-cedilla.la
-lib/gtk-2.0/2.2.0/immodules/im-cedilla.so
-lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.la
-lib/gtk-2.0/2.2.0/immodules/im-hangul.la
-lib/gtk-2.0/2.2.0/immodules/im-inuktitut.la
-lib/gtk-2.0/2.2.0/immodules/im-ipa.la
-lib/gtk-2.0/2.2.0/immodules/im-thai-broken.la
-lib/gtk-2.0/2.2.0/immodules/im-ti-er.la
-lib/gtk-2.0/2.2.0/immodules/im-ti-et.la
-lib/gtk-2.0/2.2.0/immodules/im-viqr.la
-lib/gtk-2.0/2.2.0/immodules/im-xim.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.la
-lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.la
+lib/gtk-2.0/2.4.0/immodules/im-am-et.la
+lib/gtk-2.0/2.4.0/immodules/im-cedilla.la
+lib/gtk-2.0/2.4.0/immodules/im-cyrillic-translit.la
+lib/gtk-2.0/2.4.0/immodules/im-inuktitut.la
+lib/gtk-2.0/2.4.0/immodules/im-ipa.la
+lib/gtk-2.0/2.4.0/immodules/im-thai-broken.la
+lib/gtk-2.0/2.4.0/immodules/im-ti-er.la
+lib/gtk-2.0/2.4.0/immodules/im-ti-et.la
+lib/gtk-2.0/2.4.0/immodules/im-viqr.la
+lib/gtk-2.0/2.4.0/immodules/im-xim.la
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-ani.la
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-bmp.la
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-gif.la
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-ico.la
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-jpeg.la
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-pcx.la
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-png.la
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-pnm.la
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-ras.la
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-tga.la
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-tiff.la
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-wbmp.la
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-xbm.la
+lib/gtk-2.0/2.4.0/loaders/libpixbufloader-xpm.la
 lib/gtk-2.0/include/gdkconfig.h
 lib/libgdk-x11-2.0.la
 lib/libgdk_pixbuf-2.0.la
@ -224,6 +248,8 @@ lib/pkgconfig/gdk-x11-2.0.pc
 lib/pkgconfig/gtk+-2.0.pc
 lib/pkgconfig/gtk+-x11-2.0.pc
 man/man1/gdk-pixbuf-csource.1
+man/man1/gdk-pixbuf-query-loaders.1
+man/man1/gtk-query-immodules-2.0.1
 share/aclocal/gtk-2.0.m4
 share/gtk-2.0/demo/alphatest.png
 share/gtk-2.0/demo/apple-red.png
@ -235,6 +261,8 @@ share/gtk-2.0/demo/colorsel.c
 share/gtk-2.0/demo/dialog.c
 share/gtk-2.0/demo/drawingarea.c
 share/gtk-2.0/demo/editable_cells.c
+share/gtk-2.0/demo/entry_completion.c
+share/gtk-2.0/demo/expander.c
 share/gtk-2.0/demo/floppybuddy.gif
 share/gtk-2.0/demo/gnome-applets.png
 share/gtk-2.0/demo/gnome-calendar.png
@ -244,8 +272,8 @@ share/gtk-2.0/demo/gnome-gmush.png
 share/gtk-2.0/demo/gnome-gsame.png
 share/gtk-2.0/demo/gnu-keys.png
 share/gtk-2.0/demo/gtk-logo-rgb.gif
+share/gtk-2.0/demo/hypertext.c
 share/gtk-2.0/demo/images.c
-share/gtk-2.0/demo/item_factory.c
 share/gtk-2.0/demo/list_store.c
 share/gtk-2.0/demo/menus.c
 share/gtk-2.0/demo/panes.c
@ -254,64 +282,155 @@ share/gtk-2.0/demo/sizegroup.c
 share/gtk-2.0/demo/stock_browser.c
 share/gtk-2.0/demo/textview.c
 share/gtk-2.0/demo/tree_store.c
+share/gtk-2.0/demo/ui_manager.c
+share/gtk-doc/html/gdk-pixbuf/style.css
+share/gtk-doc/html/gdk/style.css
+share/gtk-doc/html/gtk/style.css
+share/locale/af/LC_MESSAGES/gtk20-properties.mo
+share/locale/af/LC_MESSAGES/gtk20.mo
+share/locale/am/LC_MESSAGES/gtk20-properties.mo
 share/locale/am/LC_MESSAGES/gtk20.mo
+share/locale/ar/LC_MESSAGES/gtk20-properties.mo
 share/locale/ar/LC_MESSAGES/gtk20.mo
+share/locale/az/LC_MESSAGES/gtk20-properties.mo
 share/locale/az/LC_MESSAGES/gtk20.mo
+share/locale/be/LC_MESSAGES/gtk20-properties.mo
 share/locale/be/LC_MESSAGES/gtk20.mo
+share/locale/bg/LC_MESSAGES/gtk20-properties.mo
 share/locale/bg/LC_MESSAGES/gtk20.mo
+share/locale/bn/LC_MESSAGES/gtk20-properties.mo
+share/locale/bn/LC_MESSAGES/gtk20.mo
+share/locale/br/LC_MESSAGES/gtk20-properties.mo
+share/locale/br/LC_MESSAGES/gtk20.mo
+share/locale/ca/LC_MESSAGES/gtk20-properties.mo
 share/locale/ca/LC_MESSAGES/gtk20.mo
+share/locale/cs/LC_MESSAGES/gtk20-properties.mo
 share/locale/cs/LC_MESSAGES/gtk20.mo
+share/locale/cy/LC_MESSAGES/gtk20-properties.mo
 share/locale/cy/LC_MESSAGES/gtk20.mo
+share/locale/da/LC_MESSAGES/gtk20-properties.mo
 share/locale/da/LC_MESSAGES/gtk20.mo
+share/locale/de/LC_MESSAGES/gtk20-properties.mo
 share/locale/de/LC_MESSAGES/gtk20.mo
+share/locale/el/LC_MESSAGES/gtk20-properties.mo
 share/locale/el/LC_MESSAGES/gtk20.mo
+share/locale/en_CA/LC_MESSAGES/gtk20-properties.mo
+share/locale/en_CA/LC_MESSAGES/gtk20.mo
+share/locale/en_GB/LC_MESSAGES/gtk20-properties.mo
 share/locale/en_GB/LC_MESSAGES/gtk20.mo
+share/locale/es/LC_MESSAGES/gtk20-properties.mo
 share/locale/es/LC_MESSAGES/gtk20.mo
+share/locale/et/LC_MESSAGES/gtk20-properties.mo
 share/locale/et/LC_MESSAGES/gtk20.mo
+share/locale/eu/LC_MESSAGES/gtk20-properties.mo
 share/locale/eu/LC_MESSAGES/gtk20.mo
+share/locale/fa/LC_MESSAGES/gtk20-properties.mo
 share/locale/fa/LC_MESSAGES/gtk20.mo
+share/locale/fi/LC_MESSAGES/gtk20-properties.mo
 share/locale/fi/LC_MESSAGES/gtk20.mo
+share/locale/fr/LC_MESSAGES/gtk20-properties.mo
 share/locale/fr/LC_MESSAGES/gtk20.mo
+share/locale/ga/LC_MESSAGES/gtk20-properties.mo
 share/locale/ga/LC_MESSAGES/gtk20.mo
+share/locale/gl/LC_MESSAGES/gtk20-properties.mo
 share/locale/gl/LC_MESSAGES/gtk20.mo
+share/locale/gu/LC_MESSAGES/gtk20-properties.mo
+share/locale/gu/LC_MESSAGES/gtk20.mo
+share/locale/he/LC_MESSAGES/gtk20-properties.mo
 share/locale/he/LC_MESSAGES/gtk20.mo
+share/locale/hi/LC_MESSAGES/gtk20-properties.mo
 share/locale/hi/LC_MESSAGES/gtk20.mo
+share/locale/hr/LC_MESSAGES/gtk20-properties.mo
 share/locale/hr/LC_MESSAGES/gtk20.mo
+share/locale/hu/LC_MESSAGES/gtk20-properties.mo
 share/locale/hu/LC_MESSAGES/gtk20.mo
+share/locale/ia/LC_MESSAGES/gtk20-properties.mo
 share/locale/ia/LC_MESSAGES/gtk20.mo
+share/locale/id/LC_MESSAGES/gtk20-properties.mo
 share/locale/id/LC_MESSAGES/gtk20.mo
+share/locale/is/LC_MESSAGES/gtk20-properties.mo
 share/locale/is/LC_MESSAGES/gtk20.mo
+share/locale/it/LC_MESSAGES/gtk20-properties.mo
 share/locale/it/LC_MESSAGES/gtk20.mo
+share/locale/ja/LC_MESSAGES/gtk20-properties.mo
 share/locale/ja/LC_MESSAGES/gtk20.mo
+share/locale/ko/LC_MESSAGES/gtk20-properties.mo
 share/locale/ko/LC_MESSAGES/gtk20.mo
+share/locale/li/LC_MESSAGES/gtk20-properties.mo
+share/locale/li/LC_MESSAGES/gtk20.mo
+share/locale/lt/LC_MESSAGES/gtk20-properties.mo
 share/locale/lt/LC_MESSAGES/gtk20.mo
+share/locale/lv/LC_MESSAGES/gtk20-properties.mo
 share/locale/lv/LC_MESSAGES/gtk20.mo
+share/locale/mi/LC_MESSAGES/gtk20-properties.mo
+share/locale/mi/LC_MESSAGES/gtk20.mo
+share/locale/mk/LC_MESSAGES/gtk20-properties.mo
 share/locale/mk/LC_MESSAGES/gtk20.mo
+share/locale/ml/LC_MESSAGES/gtk20-properties.mo
 share/locale/ml/LC_MESSAGES/gtk20.mo
+share/locale/mn/LC_MESSAGES/gtk20-properties.mo
 share/locale/mn/LC_MESSAGES/gtk20.mo
+share/locale/mr/LC_MESSAGES/gtk20-properties.mo
+share/locale/mr/LC_MESSAGES/gtk20.mo
+share/locale/ms/LC_MESSAGES/gtk20-properties.mo
 share/locale/ms/LC_MESSAGES/gtk20.mo
+share/locale/ne/LC_MESSAGES/gtk20-properties.mo
 share/locale/ne/LC_MESSAGES/gtk20.mo
+share/locale/nl/LC_MESSAGES/gtk20-properties.mo
 share/locale/nl/LC_MESSAGES/gtk20.mo
+share/locale/nn/LC_MESSAGES/gtk20-properties.mo
 share/locale/nn/LC_MESSAGES/gtk20.mo
+share/locale/no/LC_MESSAGES/gtk20-properties.mo
 share/locale/no/LC_MESSAGES/gtk20.mo
+share/locale/pa/LC_MESSAGES/gtk20-properties.mo
+share/locale/pa/LC_MESSAGES/gtk20.mo
+share/locale/pl/LC_MESSAGES/gtk20-properties.mo
 share/locale/pl/LC_MESSAGES/gtk20.mo
+share/locale/pt/LC_MESSAGES/gtk20-properties.mo
 share/locale/pt/LC_MESSAGES/gtk20.mo
+share/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo
 share/locale/pt_BR/LC_MESSAGES/gtk20.mo
+share/locale/ro/LC_MESSAGES/gtk20-properties.mo
 share/locale/ro/LC_MESSAGES/gtk20.mo
+share/locale/ru/LC_MESSAGES/gtk20-properties.mo
 share/locale/ru/LC_MESSAGES/gtk20.mo
+share/locale/sk/LC_MESSAGES/gtk20-properties.mo
 share/locale/sk/LC_MESSAGES/gtk20.mo
+share/locale/sl/LC_MESSAGES/gtk20-properties.mo
 share/locale/sl/LC_MESSAGES/gtk20.mo
+share/locale/sq/LC_MESSAGES/gtk20-properties.mo
 share/locale/sq/LC_MESSAGES/gtk20.mo
+share/locale/sr/LC_MESSAGES/gtk20-properties.mo
 share/locale/sr/LC_MESSAGES/gtk20.mo
+share/locale/sr@Latn/LC_MESSAGES/gtk20-properties.mo
 share/locale/sr@Latn/LC_MESSAGES/gtk20.mo
+share/locale/sr@ije/LC_MESSAGES/gtk20-properties.mo
+share/locale/sr@ije/LC_MESSAGES/gtk20.mo
+share/locale/sv/LC_MESSAGES/gtk20-properties.mo
 share/locale/sv/LC_MESSAGES/gtk20.mo
+share/locale/ta/LC_MESSAGES/gtk20-properties.mo
 share/locale/ta/LC_MESSAGES/gtk20.mo
+share/locale/th/LC_MESSAGES/gtk20-properties.mo
+share/locale/th/LC_MESSAGES/gtk20.mo
+share/locale/tk/LC_MESSAGES/gtk20-properties.mo
+share/locale/tk/LC_MESSAGES/gtk20.mo
+share/locale/tr/LC_MESSAGES/gtk20-properties.mo
 share/locale/tr/LC_MESSAGES/gtk20.mo
+share/locale/uk/LC_MESSAGES/gtk20-properties.mo
 share/locale/uk/LC_MESSAGES/gtk20.mo
+share/locale/uz/LC_MESSAGES/gtk20-properties.mo
+share/locale/uz/LC_MESSAGES/gtk20.mo
+share/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo
+share/locale/uz@Latn/LC_MESSAGES/gtk20.mo
+share/locale/vi/LC_MESSAGES/gtk20-properties.mo
 share/locale/vi/LC_MESSAGES/gtk20.mo
+share/locale/wa/LC_MESSAGES/gtk20-properties.mo
 share/locale/wa/LC_MESSAGES/gtk20.mo
+share/locale/yi/LC_MESSAGES/gtk20-properties.mo
 share/locale/yi/LC_MESSAGES/gtk20.mo
+share/locale/zh_CN/LC_MESSAGES/gtk20-properties.mo
 share/locale/zh_CN/LC_MESSAGES/gtk20.mo
+share/locale/zh_TW/LC_MESSAGES/gtk20-properties.mo
 share/locale/zh_TW/LC_MESSAGES/gtk20.mo
 share/themes/Default/gtk-2.0-key/gtkrc
 share/themes/Default/gtk-2.0/gtkrc
@ -323,34 +442,42 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
@dirrm share/themes/Default/gtk-2.0
@dirrm share/themes/Default
@dirrm share/themes
-@dirrm share/locale/wa/LC_MESSAGES
-@dirrm share/locale/wa
+@dirrm share/locale/uz@Latn/LC_MESSAGES
+@dirrm share/locale/uz@Latn
+@dirrm share/locale/uz/LC_MESSAGES
+@dirrm share/locale/uz
+@dirrm share/locale/tk/LC_MESSAGES
+@dirrm share/locale/tk
+@dirrm share/locale/th/LC_MESSAGES
+@dirrm share/locale/th
@dirrm share/locale/ne/LC_MESSAGES
@dirrm share/locale/ne
-@dirrm share/locale/lt/LC_MESSAGES
-@dirrm share/locale/lt
+@dirrm share/locale/mr/LC_MESSAGES
+@dirrm share/locale/mr
+@dirrm share/locale/ml/LC_MESSAGES
+@dirrm share/locale/ml
+@dirrm share/locale/mi/LC_MESSAGES
+@dirrm share/locale/mi
+@dirrm share/locale/li/LC_MESSAGES
+@dirrm share/locale/li
@dirrm share/locale/ia/LC_MESSAGES
@dirrm share/locale/ia
@dirrm share/locale/hu/LC_MESSAGES
@dirrm share/locale/hu
-@dirrm share/locale/hr/LC_MESSAGES
-@dirrm share/locale/hr
-@dirrm share/locale/ga/LC_MESSAGES
-@dirrm share/locale/ga
-@dirrm share/locale/en_GB/LC_MESSAGES
-@dirrm share/locale/en_GB
-@dirrm share/locale/ar/LC_MESSAGES
-@dirrm share/locale/ar
+@dirrm share/locale/br/LC_MESSAGES
+@dirrm share/locale/br
+@dirrm share/locale/af/LC_MESSAGES
+@dirrm share/locale/af
@dirrm share/gtk-2.0/demo
@dirrm share/gtk-2.0
@exec mkdir -p %D/lib/gtk-2.0/modules
@dirrm lib/gtk-2.0/modules
@dirrm lib/gtk-2.0/include
-@dirrm lib/gtk-2.0/2.2.0/loaders
-@dirrm lib/gtk-2.0/2.2.0/immodules
-@exec mkdir -p %D/lib/gtk-2.0/2.2.0/engines
-@dirrm lib/gtk-2.0/2.2.0/engines
-@dirrm lib/gtk-2.0/2.2.0
+@dirrm lib/gtk-2.0/2.4.0/loaders
+@dirrm lib/gtk-2.0/2.4.0/immodules
+@exec mkdir -p %D/lib/gtk-2.0/2.4.0/engines
+@dirrm lib/gtk-2.0/2.4.0/engines
+@dirrm lib/gtk-2.0/2.4.0
@dirrm lib/gtk-2.0
@dirrm include/gtk-2.0/gtk
@dirrm include/gtk-2.0/gdk-pixbuf-xlib
--- a/x11/gtk+2/pkg/PLIST-docs
+++ b/x11/gtk+2/pkg/PLIST-docs
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-docs,v 1.5 2003/12/08 06:08:43 marcm Exp $
+@comment $OpenBSD: PLIST-docs,v 1.6 2004/06/22 03:15:03 marcm Exp $
 share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html
 share/gtk-doc/html/gdk-pixbuf/apa.html
 share/gtk-doc/html/gdk-pixbuf/apas02.html
@ -7,6 +7,7 @@ share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Module-Interface.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Versioning.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-animation.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-creating.html
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-csource.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-file-loading.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-file-saving.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-from-drawables.html
@ -17,6 +18,7 @@ share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rendering.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rgb.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-inline.html
+share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-query-loaders.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-refcounting.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-scaling.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-util.html
@ -29,6 +31,7 @@ share/gtk-doc/html/gdk-pixbuf/left.png
 share/gtk-doc/html/gdk-pixbuf/license.html
 share/gtk-doc/html/gdk-pixbuf/right.png
 share/gtk-doc/html/gdk-pixbuf/rn01.html
+share/gtk-doc/html/gdk-pixbuf/rn02.html
 share/gtk-doc/html/gdk-pixbuf/up.png
 share/gtk-doc/html/gdk/GdkDisplay.html
 share/gtk-doc/html/gdk/GdkDisplayManager.html
@ -145,11 +148,14 @@ share/gtk-doc/html/gdk/ur_angle.png
 share/gtk-doc/html/gdk/watch.png
 share/gtk-doc/html/gdk/xterm.png
 share/gtk-doc/html/gtk/AbstractObjects.html
+share/gtk-doc/html/gtk/Actions.html
 share/gtk-doc/html/gtk/ButtonWidgets.html
 share/gtk-doc/html/gtk/DeprecatedObjects.html
 share/gtk-doc/html/gtk/DisplayWidgets.html
 share/gtk-doc/html/gtk/GtkAccelLabel.html
 share/gtk-doc/html/gtk/GtkAccessible.html
+share/gtk-doc/html/gtk/GtkAction.html
+share/gtk-doc/html/gtk/GtkActionGroup.html
 share/gtk-doc/html/gtk/GtkAdjustment.html
 share/gtk-doc/html/gtk/GtkAlignment.html
 share/gtk-doc/html/gtk/GtkArrow.html
@ -162,24 +168,34 @@ share/gtk-doc/html/gtk/GtkCList.html
 share/gtk-doc/html/gtk/GtkCTree.html
 share/gtk-doc/html/gtk/GtkCalendar.html
 share/gtk-doc/html/gtk/GtkCellEditable.html
+share/gtk-doc/html/gtk/GtkCellLayout.html
 share/gtk-doc/html/gtk/GtkCellRenderer.html
 share/gtk-doc/html/gtk/GtkCellRendererPixbuf.html
 share/gtk-doc/html/gtk/GtkCellRendererText.html
 share/gtk-doc/html/gtk/GtkCellRendererToggle.html
 share/gtk-doc/html/gtk/GtkCheckButton.html
 share/gtk-doc/html/gtk/GtkCheckMenuItem.html
+share/gtk-doc/html/gtk/GtkColorButton.html
 share/gtk-doc/html/gtk/GtkColorSelection.html
 share/gtk-doc/html/gtk/GtkColorSelectionDialog.html
 share/gtk-doc/html/gtk/GtkCombo.html
+share/gtk-doc/html/gtk/GtkComboBox.html
+share/gtk-doc/html/gtk/GtkComboBoxEntry.html
 share/gtk-doc/html/gtk/GtkContainer.html
 share/gtk-doc/html/gtk/GtkCurve.html
 share/gtk-doc/html/gtk/GtkDialog.html
 share/gtk-doc/html/gtk/GtkDrawingArea.html
 share/gtk-doc/html/gtk/GtkEditable.html
 share/gtk-doc/html/gtk/GtkEntry.html
+share/gtk-doc/html/gtk/GtkEntryCompletion.html
 share/gtk-doc/html/gtk/GtkEventBox.html
+share/gtk-doc/html/gtk/GtkExpander.html
+share/gtk-doc/html/gtk/GtkFileChooser.html
+share/gtk-doc/html/gtk/GtkFileChooserDialog.html
+share/gtk-doc/html/gtk/GtkFileChooserWidget.html
 share/gtk-doc/html/gtk/GtkFileSelection.html
 share/gtk-doc/html/gtk/GtkFixed.html
+share/gtk-doc/html/gtk/GtkFontButton.html
 share/gtk-doc/html/gtk/GtkFontSelection.html
 share/gtk-doc/html/gtk/GtkFontSelectionDialog.html
 share/gtk-doc/html/gtk/GtkFrame.html
@ -195,6 +211,7 @@ share/gtk-doc/html/gtk/GtkHandleBox.html
 share/gtk-doc/html/gtk/GtkIMContext.html
 share/gtk-doc/html/gtk/GtkIMContextSimple.html
 share/gtk-doc/html/gtk/GtkIMMulticontext.html
+share/gtk-doc/html/gtk/GtkIconTheme.html
 share/gtk-doc/html/gtk/GtkImage.html
 share/gtk-doc/html/gtk/GtkImageMenuItem.html
 share/gtk-doc/html/gtk/GtkInputDialog.html
@ -222,8 +239,10 @@ share/gtk-doc/html/gtk/GtkPlug.html
 share/gtk-doc/html/gtk/GtkPreview.html
 share/gtk-doc/html/gtk/GtkProgress.html
 share/gtk-doc/html/gtk/GtkProgressBar.html
+share/gtk-doc/html/gtk/GtkRadioAction.html
 share/gtk-doc/html/gtk/GtkRadioButton.html
 share/gtk-doc/html/gtk/GtkRadioMenuItem.html
+share/gtk-doc/html/gtk/GtkRadioToolButton.html
 share/gtk-doc/html/gtk/GtkRange.html
 share/gtk-doc/html/gtk/GtkRuler.html
 share/gtk-doc/html/gtk/GtkScale.html
@ -231,6 +250,7 @@ share/gtk-doc/html/gtk/GtkScrollbar.html
 share/gtk-doc/html/gtk/GtkScrolledWindow.html
 share/gtk-doc/html/gtk/GtkSeparator.html
 share/gtk-doc/html/gtk/GtkSeparatorMenuItem.html
+share/gtk-doc/html/gtk/GtkSeparatorToolItem.html
 share/gtk-doc/html/gtk/GtkSettings.html
 share/gtk-doc/html/gtk/GtkSizeGroup.html
 share/gtk-doc/html/gtk/GtkSocket.html
@ -246,18 +266,24 @@ share/gtk-doc/html/gtk/GtkTextTag.html
 share/gtk-doc/html/gtk/GtkTextTagTable.html
 share/gtk-doc/html/gtk/GtkTextView.html
 share/gtk-doc/html/gtk/GtkTipsQuery.html
+share/gtk-doc/html/gtk/GtkToggleAction.html
 share/gtk-doc/html/gtk/GtkToggleButton.html
+share/gtk-doc/html/gtk/GtkToggleToolButton.html
+share/gtk-doc/html/gtk/GtkToolButton.html
+share/gtk-doc/html/gtk/GtkToolItem.html
 share/gtk-doc/html/gtk/GtkToolbar.html
 share/gtk-doc/html/gtk/GtkTooltips.html
 share/gtk-doc/html/gtk/GtkTree.html
 share/gtk-doc/html/gtk/GtkTreeItem.html
 share/gtk-doc/html/gtk/GtkTreeModel.html
+share/gtk-doc/html/gtk/GtkTreeModelFilter.html
 share/gtk-doc/html/gtk/GtkTreeModelSort.html
 share/gtk-doc/html/gtk/GtkTreeSelection.html
 share/gtk-doc/html/gtk/GtkTreeSortable.html
 share/gtk-doc/html/gtk/GtkTreeStore.html
 share/gtk-doc/html/gtk/GtkTreeView.html
 share/gtk-doc/html/gtk/GtkTreeViewColumn.html
+share/gtk-doc/html/gtk/GtkUIManager.html
 share/gtk-doc/html/gtk/GtkVBox.html
 share/gtk-doc/html/gtk/GtkVButtonBox.html
 share/gtk-doc/html/gtk/GtkVPaned.html
@ -284,6 +310,8 @@ share/gtk-doc/html/gtk/TreeWidget.html
 share/gtk-doc/html/gtk/TreeWidgetObjects.html
 share/gtk-doc/html/gtk/WindowWidgets.html
 share/gtk-doc/html/gtk/ch01.html
+share/gtk-doc/html/gtk/checklist-gdkeventexpose-region.html
+share/gtk-doc/html/gtk/checklist-modifiers.html
 share/gtk-doc/html/gtk/gtk-Accelerator-Maps.html
 share/gtk-doc/html/gtk/gtk-Bindings.html
 share/gtk-doc/html/gtk/gtk-Clipboards.html
@ -306,6 +334,12 @@ share/gtk-doc/html/gtk/gtk-changes-1-2.html
 share/gtk-doc/html/gtk/gtk-changes-2-0.html
 share/gtk-doc/html/gtk/gtk-compiling.html
 share/gtk-doc/html/gtk/gtk-framebuffer.html
+share/gtk-doc/html/gtk/gtk-gtkfilefilter.html
+share/gtk-doc/html/gtk/gtk-migrating-GtkAction.html
+share/gtk-doc/html/gtk/gtk-migrating-GtkComboBox.html
+share/gtk-doc/html/gtk/gtk-migrating-GtkFileChooser.html
+share/gtk-doc/html/gtk/gtk-migrating-checklist.html
+share/gtk-doc/html/gtk/gtk-query-immodules-2.0.html
 share/gtk-doc/html/gtk/gtk-question-index.html
 share/gtk-doc/html/gtk/gtk-resources.html
 share/gtk-doc/html/gtk/gtk-running.html
@ -314,12 +348,21 @@ share/gtk-doc/html/gtk/gtk-x11.html
 share/gtk-doc/html/gtk/gtk.devhelp
 share/gtk-doc/html/gtk/gtk.html
 share/gtk-doc/html/gtk/gtkbase.html
+share/gtk-doc/html/gtk/gtkfilechooser-installing-extra-widgets.html
+share/gtk-doc/html/gtk/gtkfilechooser-installing-preview.html
+share/gtk-doc/html/gtk/gtkfilechooser-new-features.html
+share/gtk-doc/html/gtk/gtkfilechooser-selection-modes.html
 share/gtk-doc/html/gtk/gtkobjects.html
 share/gtk-doc/html/gtk/home.png
 share/gtk-doc/html/gtk/index.html
 share/gtk-doc/html/gtk/index.sgml
 share/gtk-doc/html/gtk/ix01.html
 share/gtk-doc/html/gtk/left.png
+share/gtk-doc/html/gtk/migrating-GtkCombo.html
+share/gtk-doc/html/gtk/migrating-gnomeuiinfo.html
+share/gtk-doc/html/gtk/migrating.html
+share/gtk-doc/html/gtk/new-features-GtkComboBox.html
+share/gtk-doc/html/gtk/pt05.html
 share/gtk-doc/html/gtk/right.png
 share/gtk-doc/html/gtk/stock_add_24.png
 share/gtk-doc/html/gtk/stock_align_center_24.png
@ -338,6 +381,7 @@ share/gtk-doc/html/gtk/stock_colorselector_24.png
 share/gtk-doc/html/gtk/stock_convert_24.png
 share/gtk-doc/html/gtk/stock_copy_24.png
 share/gtk-doc/html/gtk/stock_cut_24.png
+share/gtk-doc/html/gtk/stock_dialog_authentication_48.png
 share/gtk-doc/html/gtk/stock_dialog_error_48.png
 share/gtk-doc/html/gtk/stock_dialog_info_48.png
 share/gtk-doc/html/gtk/stock_dialog_question_48.png
@ -353,6 +397,7 @@ share/gtk-doc/html/gtk/stock_help_24.png
 share/gtk-doc/html/gtk/stock_home_24.png
 share/gtk-doc/html/gtk/stock_index_24.png
 share/gtk-doc/html/gtk/stock_jump_to_24.png
+share/gtk-doc/html/gtk/stock_jump_to_rtl_24.png
 share/gtk-doc/html/gtk/stock_last_24.png
 share/gtk-doc/html/gtk/stock_left_arrow_24.png
 share/gtk-doc/html/gtk/stock_new_24.png
@ -365,9 +410,11 @@ share/gtk-doc/html/gtk/stock_print_24.png
 share/gtk-doc/html/gtk/stock_print_preview_24.png
 share/gtk-doc/html/gtk/stock_properties_24.png
 share/gtk-doc/html/gtk/stock_redo_24.png
+share/gtk-doc/html/gtk/stock_redo_rtl_24.png
 share/gtk-doc/html/gtk/stock_refresh_24.png
 share/gtk-doc/html/gtk/stock_remove_24.png
 share/gtk-doc/html/gtk/stock_revert_24.png
+share/gtk-doc/html/gtk/stock_revert_rtl_24.png
 share/gtk-doc/html/gtk/stock_right_arrow_24.png
 share/gtk-doc/html/gtk/stock_save_24.png
 share/gtk-doc/html/gtk/stock_save_as_24.png
@ -384,16 +431,17 @@ share/gtk-doc/html/gtk/stock_text_underline_24.png
 share/gtk-doc/html/gtk/stock_top_24.png
 share/gtk-doc/html/gtk/stock_trash_24.png
 share/gtk-doc/html/gtk/stock_undelete_24.png
+share/gtk-doc/html/gtk/stock_undelete_rtl_24.png
 share/gtk-doc/html/gtk/stock_undo_24.png
+share/gtk-doc/html/gtk/stock_undo_rtl_24.png
 share/gtk-doc/html/gtk/stock_up_arrow_24.png
 share/gtk-doc/html/gtk/stock_yes_20.png
 share/gtk-doc/html/gtk/stock_zoom_1_24.png
 share/gtk-doc/html/gtk/stock_zoom_fit_24.png
 share/gtk-doc/html/gtk/stock_zoom_in_24.png
 share/gtk-doc/html/gtk/stock_zoom_out_24.png
+share/gtk-doc/html/gtk/ui-manager.html
 share/gtk-doc/html/gtk/up.png
@dirrm share/gtk-doc/html/gtk
@dirrm share/gtk-doc/html/gdk-pixbuf
@dirrm share/gtk-doc/html/gdk
-@dirrm share/gtk-doc/html
-@dirrm share/gtk-doc