Update to 1.3.12.

18 files changed, 141 insertions, 123 deletions

diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index c1b8ac4b55b9..cb47ff5925aa 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	1.3.9
+PORTVERSION=	1.3.12
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@@ -19,8 +19,8 @@ DISTNAME=	gtk+-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	glib-1.3.9:${PORTSDIR}/devel/glib13 \
-		atk.5:${PORTSDIR}/devel/atk \
+LIB_DEPENDS=	glib-1.3.12:${PORTSDIR}/devel/glib13 \
+		atk.9:${PORTSDIR}/devel/atk \
 		pango.0:${PORTSDIR}/x11-toolkits/pango \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
@@ -36,6 +36,7 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 PLIST_SUB=	GTK_VERSION="${PORTVERSION}"
 
 MAN1=		gdk-pixbuf-csource.1
diff --git a/x11-toolkits/gtk13/distinfo b/x11-toolkits/gtk13/distinfo
index 9862e28b26c3..ccd04c1e24c4 100644
--- a/x11-toolkits/gtk13/distinfo
+++ b/x11-toolkits/gtk13/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.3.9.tar.gz) = 741bb0a9caf3d9c4f44a4a4458c07501
+MD5 (gtk+-1.3.12.tar.gz) = b28157683d95bb6dc48489ec2b2cea7b
diff --git a/x11-toolkits/gtk13/files/patch-ad b/x11-toolkits/gtk13/files/patch-ad
index 9c59e21c2577..59fee01c4973 100644
--- a/x11-toolkits/gtk13/files/patch-ad
+++ b/x11-toolkits/gtk13/files/patch-ad
@@ -1,23 +1,23 @@
 
 $FreeBSD$
 
---- gtk/gtkrc.c.orig	Fri Sep 21 22:06:14 2001
-+++ gtk/gtkrc.c	Wed Oct 24 10:31:00 2001
-@@ -359,7 +359,7 @@
+--- gtk/gtkrc.c.orig	Thu Dec 13 21:51:18 2001
++++ gtk/gtkrc.c	Fri Jan 18 11:14:14 2002
+@@ -336,7 +336,7 @@
+       if (im_module_file)
  	result = g_strdup (im_module_file);
        else
- #ifndef G_OS_WIN32
 -	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
 +	result = g_build_filename (GTK_DATA_PREFIX, "etc", "gtk-2.0", "gtk.immodules", NULL);
- #else
- 	result = g_build_filename (get_gtk_win32_directory ("gtk-2.0"), "gtk.immodules", NULL);
- #endif
-@@ -453,7 +453,7 @@
+     }
+ 
+   return result;
+@@ -418,7 +418,7 @@
+     }
    else
      {
- #ifndef G_OS_WIN32
 -      str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
-+      str = g_build_filename (GTK_SYSCONFDIR, "gtkrc", NULL);
- #else
-       str = g_build_filename (get_gtk_win32_directory (""), "gtkrc", NULL);
- #endif
++      str = g_build_filename (GTK_SYSCONFDIR, "gtk", NULL);
+ 
+       gtk_rc_add_default_file (str);
+       g_free (str);
diff --git a/x11-toolkits/gtk13/files/patch-ae b/x11-toolkits/gtk13/files/patch-ae
index 04e0e19df224..49b83e081296 100644
--- a/x11-toolkits/gtk13/files/patch-ae
+++ b/x11-toolkits/gtk13/files/patch-ae
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Apr 17 23:13:16 2001
-+++ configure	Sun Apr 29 14:55:08 2001
-@@ -3842,7 +3842,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
+--- configure.orig	Mon Dec 24 01:02:02 2001
++++ configure	Fri Jan 18 11:15:57 2002
+@@ -9794,7 +9794,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ CATOBJEXT=.mo
 -		   DATADIRNAME=lib
 +		   DATADIRNAME=share
  fi
- rm -f conftest*
- 		INSTOBJEXT=.mo 	
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 		INSTOBJEXT=.mo
diff --git a/x11-toolkits/gtk13/files/patch-ag b/x11-toolkits/gtk13/files/patch-ag
index a7e7df3d7490..cd1b949b71b2 100644
--- a/x11-toolkits/gtk13/files/patch-ag
+++ b/x11-toolkits/gtk13/files/patch-ag
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- gtk/Makefile.in.orig	Wed Oct 24 10:31:32 2001
-+++ gtk/Makefile.in	Wed Oct 24 10:33:05 2001
-@@ -166,7 +166,7 @@
- 
- SUBDIRS = stock-icons
- 
--INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_LIBDIR=\"$(libdir)\"				-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(sysconfdir)\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_VERSION@\"				-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"		-DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"		-DG_DISABLE_CONST_RETURNS				-I$(top_builddir)/gtk					-I$(top_srcdir) -I../gdk				-I$(top_srcdir)/gdk					-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf		@GTK_DEBUG_FLAGS@					@GTK_DEP_CFLAGS@				@STRIP_END@
-+INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_LIBDIR=\"$(libdir)\"				-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_VERSION@\"				-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"		-DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"		-DG_DISABLE_CONST_RETURNS				-I$(top_builddir)/gtk					-I$(top_srcdir) -I../gdk				-I$(top_srcdir)/gdk					-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf		@GTK_DEBUG_FLAGS@					@GTK_DEP_CFLAGS@				@STRIP_END@
- 
- 
- gtarget = @gdktarget@
+--- gtk/Makefile.in.orig	Fri Jan 18 11:03:21 2002
++++ gtk/Makefile.in	Fri Jan 18 11:18:26 2002
+@@ -176,7 +176,7 @@
+ 	-DG_LOG_DOMAIN=\"Gtk\"				\
+ 	-DGTK_LIBDIR=\"$(libdir)\"			\
+ 	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
+-	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
++	-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"	\
+ 	-DGTK_LOCALEDIR=\"$(gtklocaledir)\"		\
+ 	-DGTK_VERSION=\"@GTK_VERSION@\"			\
+ 	-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"	\
diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist
index 2bf7bf0ed34f..71cdb90ef8bd 100644
--- a/x11-toolkits/gtk13/pkg-plist
+++ b/x11-toolkits/gtk13/pkg-plist
@@ -13,7 +13,6 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
 include/gtk-2.0/gdk/gdk.h
 include/gtk-2.0/gdk/gdkcolor.h
 include/gtk-2.0/gdk/gdkcursor.h
-include/gtk-2.0/gdk/gdkcursors.h
 include/gtk-2.0/gdk/gdkdnd.h
 include/gtk-2.0/gdk/gdkdrawable.h
 include/gtk-2.0/gdk/gdkenumtypes.h
@@ -41,6 +40,7 @@ include/gtk-2.0/gtk/gdkconfig.h
 include/gtk-2.0/gtk/gtk.h
 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/gtkadjustment.h
 include/gtk-2.0/gtk/gtkalignment.h
@@ -94,6 +94,7 @@ include/gtk-2.0/gtk/gtkiconfactory.h
 include/gtk-2.0/gtk/gtkimage.h
 include/gtk-2.0/gtk/gtkimagemenuitem.h
 include/gtk-2.0/gtk/gtkimcontext.h
+include/gtk-2.0/gtk/gtkimcontextsimple.h
 include/gtk-2.0/gtk/gtkimmodule.h
 include/gtk-2.0/gtk/gtkimmulticontext.h
 include/gtk-2.0/gtk/gtkinputdialog.h
@@ -220,18 +221,19 @@ lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-xim.a
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-xim.so
 lib/libgdk-x11-1.3.a
 lib/libgdk-x11-1.3.so
-lib/libgdk-x11-1.3.so.9
+lib/libgdk-x11-1.3.so.12
 lib/libgdk_pixbuf-1.3.a
 lib/libgdk_pixbuf-1.3.so
-lib/libgdk_pixbuf-1.3.so.9
+lib/libgdk_pixbuf-1.3.so.12
 lib/libgdk_pixbuf_xlib-1.3.a
 lib/libgdk_pixbuf_xlib-1.3.so
-lib/libgdk_pixbuf_xlib-1.3.so.0
+lib/libgdk_pixbuf_xlib-1.3.so.12
 lib/libgtk-x11-1.3.a
 lib/libgtk-x11-1.3.so
-lib/libgtk-x11-1.3.so.9
+lib/libgtk-x11-1.3.so.12
 libdata/pkgconfig/gdk-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
+libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
 libdata/pkgconfig/gdk-x11-2.0.pc
 libdata/pkgconfig/gtk+-2.0.pc
 libdata/pkgconfig/gtk+-x11-2.0.pc
@@ -244,6 +246,7 @@ share/gtk-2.0/demo/button_box.c
 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/floppybuddy.gif
 share/gtk-2.0/demo/gnome-applets.png
 share/gtk-2.0/demo/gnome-calendar.png
@@ -255,12 +258,14 @@ share/gtk-2.0/demo/gnu-keys.png
 share/gtk-2.0/demo/gtk-logo-rgb.gif
 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
 share/gtk-2.0/demo/pixbufs.c
 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/locale/az/LC_MESSAGES/gtk20.mo
 share/locale/ca/LC_MESSAGES/gtk20.mo
 share/locale/cs/LC_MESSAGES/gtk20.mo
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index c1b8ac4b55b9..cb47ff5925aa 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	1.3.9
+PORTVERSION=	1.3.12
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@@ -19,8 +19,8 @@ DISTNAME=	gtk+-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	glib-1.3.9:${PORTSDIR}/devel/glib13 \
-		atk.5:${PORTSDIR}/devel/atk \
+LIB_DEPENDS=	glib-1.3.12:${PORTSDIR}/devel/glib13 \
+		atk.9:${PORTSDIR}/devel/atk \
 		pango.0:${PORTSDIR}/x11-toolkits/pango \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
@@ -36,6 +36,7 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 PLIST_SUB=	GTK_VERSION="${PORTVERSION}"
 
 MAN1=		gdk-pixbuf-csource.1
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 9862e28b26c3..ccd04c1e24c4 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.3.9.tar.gz) = 741bb0a9caf3d9c4f44a4a4458c07501
+MD5 (gtk+-1.3.12.tar.gz) = b28157683d95bb6dc48489ec2b2cea7b
diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad
index 9c59e21c2577..59fee01c4973 100644
--- a/x11-toolkits/gtk20/files/patch-ad
+++ b/x11-toolkits/gtk20/files/patch-ad
@@ -1,23 +1,23 @@
 
 $FreeBSD$
 
---- gtk/gtkrc.c.orig	Fri Sep 21 22:06:14 2001
-+++ gtk/gtkrc.c	Wed Oct 24 10:31:00 2001
-@@ -359,7 +359,7 @@
+--- gtk/gtkrc.c.orig	Thu Dec 13 21:51:18 2001
++++ gtk/gtkrc.c	Fri Jan 18 11:14:14 2002
+@@ -336,7 +336,7 @@
+       if (im_module_file)
  	result = g_strdup (im_module_file);
        else
- #ifndef G_OS_WIN32
 -	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
 +	result = g_build_filename (GTK_DATA_PREFIX, "etc", "gtk-2.0", "gtk.immodules", NULL);
- #else
- 	result = g_build_filename (get_gtk_win32_directory ("gtk-2.0"), "gtk.immodules", NULL);
- #endif
-@@ -453,7 +453,7 @@
+     }
+ 
+   return result;
+@@ -418,7 +418,7 @@
+     }
    else
      {
- #ifndef G_OS_WIN32
 -      str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
-+      str = g_build_filename (GTK_SYSCONFDIR, "gtkrc", NULL);
- #else
-       str = g_build_filename (get_gtk_win32_directory (""), "gtkrc", NULL);
- #endif
++      str = g_build_filename (GTK_SYSCONFDIR, "gtk", NULL);
+ 
+       gtk_rc_add_default_file (str);
+       g_free (str);
diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae
index 04e0e19df224..49b83e081296 100644
--- a/x11-toolkits/gtk20/files/patch-ae
+++ b/x11-toolkits/gtk20/files/patch-ae
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Apr 17 23:13:16 2001
-+++ configure	Sun Apr 29 14:55:08 2001
-@@ -3842,7 +3842,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
+--- configure.orig	Mon Dec 24 01:02:02 2001
++++ configure	Fri Jan 18 11:15:57 2002
+@@ -9794,7 +9794,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ CATOBJEXT=.mo
 -		   DATADIRNAME=lib
 +		   DATADIRNAME=share
  fi
- rm -f conftest*
- 		INSTOBJEXT=.mo 	
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 		INSTOBJEXT=.mo
diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag
index a7e7df3d7490..cd1b949b71b2 100644
--- a/x11-toolkits/gtk20/files/patch-ag
+++ b/x11-toolkits/gtk20/files/patch-ag
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- gtk/Makefile.in.orig	Wed Oct 24 10:31:32 2001
-+++ gtk/Makefile.in	Wed Oct 24 10:33:05 2001
-@@ -166,7 +166,7 @@
- 
- SUBDIRS = stock-icons
- 
--INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_LIBDIR=\"$(libdir)\"				-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(sysconfdir)\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_VERSION@\"				-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"		-DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"		-DG_DISABLE_CONST_RETURNS				-I$(top_builddir)/gtk					-I$(top_srcdir) -I../gdk				-I$(top_srcdir)/gdk					-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf		@GTK_DEBUG_FLAGS@					@GTK_DEP_CFLAGS@				@STRIP_END@
-+INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_LIBDIR=\"$(libdir)\"				-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_VERSION@\"				-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"		-DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"		-DG_DISABLE_CONST_RETURNS				-I$(top_builddir)/gtk					-I$(top_srcdir) -I../gdk				-I$(top_srcdir)/gdk					-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf		@GTK_DEBUG_FLAGS@					@GTK_DEP_CFLAGS@				@STRIP_END@
- 
- 
- gtarget = @gdktarget@
+--- gtk/Makefile.in.orig	Fri Jan 18 11:03:21 2002
++++ gtk/Makefile.in	Fri Jan 18 11:18:26 2002
+@@ -176,7 +176,7 @@
+ 	-DG_LOG_DOMAIN=\"Gtk\"				\
+ 	-DGTK_LIBDIR=\"$(libdir)\"			\
+ 	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
+-	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
++	-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"	\
+ 	-DGTK_LOCALEDIR=\"$(gtklocaledir)\"		\
+ 	-DGTK_VERSION=\"@GTK_VERSION@\"			\
+ 	-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"	\
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 2bf7bf0ed34f..71cdb90ef8bd 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -13,7 +13,6 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
 include/gtk-2.0/gdk/gdk.h
 include/gtk-2.0/gdk/gdkcolor.h
 include/gtk-2.0/gdk/gdkcursor.h
-include/gtk-2.0/gdk/gdkcursors.h
 include/gtk-2.0/gdk/gdkdnd.h
 include/gtk-2.0/gdk/gdkdrawable.h
 include/gtk-2.0/gdk/gdkenumtypes.h
@@ -41,6 +40,7 @@ include/gtk-2.0/gtk/gdkconfig.h
 include/gtk-2.0/gtk/gtk.h
 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/gtkadjustment.h
 include/gtk-2.0/gtk/gtkalignment.h
@@ -94,6 +94,7 @@ include/gtk-2.0/gtk/gtkiconfactory.h
 include/gtk-2.0/gtk/gtkimage.h
 include/gtk-2.0/gtk/gtkimagemenuitem.h
 include/gtk-2.0/gtk/gtkimcontext.h
+include/gtk-2.0/gtk/gtkimcontextsimple.h
 include/gtk-2.0/gtk/gtkimmodule.h
 include/gtk-2.0/gtk/gtkimmulticontext.h
 include/gtk-2.0/gtk/gtkinputdialog.h
@@ -220,18 +221,19 @@ lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-xim.a
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-xim.so
 lib/libgdk-x11-1.3.a
 lib/libgdk-x11-1.3.so
-lib/libgdk-x11-1.3.so.9
+lib/libgdk-x11-1.3.so.12
 lib/libgdk_pixbuf-1.3.a
 lib/libgdk_pixbuf-1.3.so
-lib/libgdk_pixbuf-1.3.so.9
+lib/libgdk_pixbuf-1.3.so.12
 lib/libgdk_pixbuf_xlib-1.3.a
 lib/libgdk_pixbuf_xlib-1.3.so
-lib/libgdk_pixbuf_xlib-1.3.so.0
+lib/libgdk_pixbuf_xlib-1.3.so.12
 lib/libgtk-x11-1.3.a
 lib/libgtk-x11-1.3.so
-lib/libgtk-x11-1.3.so.9
+lib/libgtk-x11-1.3.so.12
 libdata/pkgconfig/gdk-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
+libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
 libdata/pkgconfig/gdk-x11-2.0.pc
 libdata/pkgconfig/gtk+-2.0.pc
 libdata/pkgconfig/gtk+-x11-2.0.pc
@@ -244,6 +246,7 @@ share/gtk-2.0/demo/button_box.c
 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/floppybuddy.gif
 share/gtk-2.0/demo/gnome-applets.png
 share/gtk-2.0/demo/gnome-calendar.png
@@ -255,12 +258,14 @@ share/gtk-2.0/demo/gnu-keys.png
 share/gtk-2.0/demo/gtk-logo-rgb.gif
 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
 share/gtk-2.0/demo/pixbufs.c
 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/locale/az/LC_MESSAGES/gtk20.mo
 share/locale/ca/LC_MESSAGES/gtk20.mo
 share/locale/cs/LC_MESSAGES/gtk20.mo
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index c1b8ac4b55b9..cb47ff5925aa 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	1.3.9
+PORTVERSION=	1.3.12
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@@ -19,8 +19,8 @@ DISTNAME=	gtk+-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	glib-1.3.9:${PORTSDIR}/devel/glib13 \
-		atk.5:${PORTSDIR}/devel/atk \
+LIB_DEPENDS=	glib-1.3.12:${PORTSDIR}/devel/glib13 \
+		atk.9:${PORTSDIR}/devel/atk \
 		pango.0:${PORTSDIR}/x11-toolkits/pango \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
@@ -36,6 +36,7 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 PLIST_SUB=	GTK_VERSION="${PORTVERSION}"
 
 MAN1=		gdk-pixbuf-csource.1
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 9862e28b26c3..ccd04c1e24c4 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.3.9.tar.gz) = 741bb0a9caf3d9c4f44a4a4458c07501
+MD5 (gtk+-1.3.12.tar.gz) = b28157683d95bb6dc48489ec2b2cea7b
diff --git a/x11-toolkits/gtk30/files/patch-ad b/x11-toolkits/gtk30/files/patch-ad
index 9c59e21c2577..59fee01c4973 100644
--- a/x11-toolkits/gtk30/files/patch-ad
+++ b/x11-toolkits/gtk30/files/patch-ad
@@ -1,23 +1,23 @@
 
 $FreeBSD$
 
---- gtk/gtkrc.c.orig	Fri Sep 21 22:06:14 2001
-+++ gtk/gtkrc.c	Wed Oct 24 10:31:00 2001
-@@ -359,7 +359,7 @@
+--- gtk/gtkrc.c.orig	Thu Dec 13 21:51:18 2001
++++ gtk/gtkrc.c	Fri Jan 18 11:14:14 2002
+@@ -336,7 +336,7 @@
+       if (im_module_file)
  	result = g_strdup (im_module_file);
        else
- #ifndef G_OS_WIN32
 -	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
 +	result = g_build_filename (GTK_DATA_PREFIX, "etc", "gtk-2.0", "gtk.immodules", NULL);
- #else
- 	result = g_build_filename (get_gtk_win32_directory ("gtk-2.0"), "gtk.immodules", NULL);
- #endif
-@@ -453,7 +453,7 @@
+     }
+ 
+   return result;
+@@ -418,7 +418,7 @@
+     }
    else
      {
- #ifndef G_OS_WIN32
 -      str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
-+      str = g_build_filename (GTK_SYSCONFDIR, "gtkrc", NULL);
- #else
-       str = g_build_filename (get_gtk_win32_directory (""), "gtkrc", NULL);
- #endif
++      str = g_build_filename (GTK_SYSCONFDIR, "gtk", NULL);
+ 
+       gtk_rc_add_default_file (str);
+       g_free (str);
diff --git a/x11-toolkits/gtk30/files/patch-ae b/x11-toolkits/gtk30/files/patch-ae
index 04e0e19df224..49b83e081296 100644
--- a/x11-toolkits/gtk30/files/patch-ae
+++ b/x11-toolkits/gtk30/files/patch-ae
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Apr 17 23:13:16 2001
-+++ configure	Sun Apr 29 14:55:08 2001
-@@ -3842,7 +3842,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
+--- configure.orig	Mon Dec 24 01:02:02 2001
++++ configure	Fri Jan 18 11:15:57 2002
+@@ -9794,7 +9794,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ CATOBJEXT=.mo
 -		   DATADIRNAME=lib
 +		   DATADIRNAME=share
  fi
- rm -f conftest*
- 		INSTOBJEXT=.mo 	
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 		INSTOBJEXT=.mo
diff --git a/x11-toolkits/gtk30/files/patch-ag b/x11-toolkits/gtk30/files/patch-ag
index a7e7df3d7490..cd1b949b71b2 100644
--- a/x11-toolkits/gtk30/files/patch-ag
+++ b/x11-toolkits/gtk30/files/patch-ag
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- gtk/Makefile.in.orig	Wed Oct 24 10:31:32 2001
-+++ gtk/Makefile.in	Wed Oct 24 10:33:05 2001
-@@ -166,7 +166,7 @@
- 
- SUBDIRS = stock-icons
- 
--INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_LIBDIR=\"$(libdir)\"				-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(sysconfdir)\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_VERSION@\"				-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"		-DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"		-DG_DISABLE_CONST_RETURNS				-I$(top_builddir)/gtk					-I$(top_srcdir) -I../gdk				-I$(top_srcdir)/gdk					-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf		@GTK_DEBUG_FLAGS@					@GTK_DEP_CFLAGS@				@STRIP_END@
-+INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_LIBDIR=\"$(libdir)\"				-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_VERSION@\"				-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"		-DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"		-DG_DISABLE_CONST_RETURNS				-I$(top_builddir)/gtk					-I$(top_srcdir) -I../gdk				-I$(top_srcdir)/gdk					-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf		@GTK_DEBUG_FLAGS@					@GTK_DEP_CFLAGS@				@STRIP_END@
- 
- 
- gtarget = @gdktarget@
+--- gtk/Makefile.in.orig	Fri Jan 18 11:03:21 2002
++++ gtk/Makefile.in	Fri Jan 18 11:18:26 2002
+@@ -176,7 +176,7 @@
+ 	-DG_LOG_DOMAIN=\"Gtk\"				\
+ 	-DGTK_LIBDIR=\"$(libdir)\"			\
+ 	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
+-	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
++	-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"	\
+ 	-DGTK_LOCALEDIR=\"$(gtklocaledir)\"		\
+ 	-DGTK_VERSION=\"@GTK_VERSION@\"			\
+ 	-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"	\
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 2bf7bf0ed34f..71cdb90ef8bd 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -13,7 +13,6 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
 include/gtk-2.0/gdk/gdk.h
 include/gtk-2.0/gdk/gdkcolor.h
 include/gtk-2.0/gdk/gdkcursor.h
-include/gtk-2.0/gdk/gdkcursors.h
 include/gtk-2.0/gdk/gdkdnd.h
 include/gtk-2.0/gdk/gdkdrawable.h
 include/gtk-2.0/gdk/gdkenumtypes.h
@@ -41,6 +40,7 @@ include/gtk-2.0/gtk/gdkconfig.h
 include/gtk-2.0/gtk/gtk.h
 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/gtkadjustment.h
 include/gtk-2.0/gtk/gtkalignment.h
@@ -94,6 +94,7 @@ include/gtk-2.0/gtk/gtkiconfactory.h
 include/gtk-2.0/gtk/gtkimage.h
 include/gtk-2.0/gtk/gtkimagemenuitem.h
 include/gtk-2.0/gtk/gtkimcontext.h
+include/gtk-2.0/gtk/gtkimcontextsimple.h
 include/gtk-2.0/gtk/gtkimmodule.h
 include/gtk-2.0/gtk/gtkimmulticontext.h
 include/gtk-2.0/gtk/gtkinputdialog.h
@@ -220,18 +221,19 @@ lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-xim.a
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-xim.so
 lib/libgdk-x11-1.3.a
 lib/libgdk-x11-1.3.so
-lib/libgdk-x11-1.3.so.9
+lib/libgdk-x11-1.3.so.12
 lib/libgdk_pixbuf-1.3.a
 lib/libgdk_pixbuf-1.3.so
-lib/libgdk_pixbuf-1.3.so.9
+lib/libgdk_pixbuf-1.3.so.12
 lib/libgdk_pixbuf_xlib-1.3.a
 lib/libgdk_pixbuf_xlib-1.3.so
-lib/libgdk_pixbuf_xlib-1.3.so.0
+lib/libgdk_pixbuf_xlib-1.3.so.12
 lib/libgtk-x11-1.3.a
 lib/libgtk-x11-1.3.so
-lib/libgtk-x11-1.3.so.9
+lib/libgtk-x11-1.3.so.12
 libdata/pkgconfig/gdk-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
+libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
 libdata/pkgconfig/gdk-x11-2.0.pc
 libdata/pkgconfig/gtk+-2.0.pc
 libdata/pkgconfig/gtk+-x11-2.0.pc
@@ -244,6 +246,7 @@ share/gtk-2.0/demo/button_box.c
 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/floppybuddy.gif
 share/gtk-2.0/demo/gnome-applets.png
 share/gtk-2.0/demo/gnome-calendar.png
@@ -255,12 +258,14 @@ share/gtk-2.0/demo/gnu-keys.png
 share/gtk-2.0/demo/gtk-logo-rgb.gif
 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
 share/gtk-2.0/demo/pixbufs.c
 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/locale/az/LC_MESSAGES/gtk20.mo
 share/locale/ca/LC_MESSAGES/gtk20.mo
 share/locale/cs/LC_MESSAGES/gtk20.mo