18 files changed, 165 insertions, 207 deletions

diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index cb47ff5925aa..dee696cd409e 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -6,21 +6,23 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	1.3.12
+PORTVERSION=	1.3.13
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-alpha2,} \
+		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
 		ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
 MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:R}
 DISTNAME=	gtk+-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	glib-1.3.12:${PORTSDIR}/devel/glib13 \
-		atk.9:${PORTSDIR}/devel/atk \
+LIB_DEPENDS=	glib-1.3.13:${PORTSDIR}/devel/glib13 \
+		atk.10:${PORTSDIR}/devel/atk \
 		pango.0:${PORTSDIR}/x11-toolkits/pango \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
@@ -28,6 +30,7 @@ LIB_DEPENDS=	glib-1.3.12:${PORTSDIR}/devel/glib13 \
 		intl.1:${PORTSDIR}/devel/gettext
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
+USE_BZIP2=	yes
 NO_LATEST_LINK=	"Unstable, development version."
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/x11-toolkits/gtk13/distinfo b/x11-toolkits/gtk13/distinfo
index ccd04c1e24c4..9c265fc95645 100644
--- a/x11-toolkits/gtk13/distinfo
+++ b/x11-toolkits/gtk13/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.3.12.tar.gz) = b28157683d95bb6dc48489ec2b2cea7b
+MD5 (gnome2/gtk+-1.3.13.tar.bz2) = 1a29b8bed6ff0628045b222f15697f1e
diff --git a/x11-toolkits/gtk13/files/patch-Makefile.in b/x11-toolkits/gtk13/files/patch-Makefile.in
new file mode 100644
index 000000000000..85e372a01c60
--- /dev/null
+++ b/x11-toolkits/gtk13/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Makefile.in	2002/02/12 13:29:11	1.1
++++ Makefile.in	2002/02/12 13:29:28
+@@ -168,7 +168,7 @@
+ 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 contrib
+ SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
+ 
+ # require automake 1.4
diff --git a/x11-toolkits/gtk13/files/patch-ae b/x11-toolkits/gtk13/files/patch-ae
index 49b83e081296..eeb3f3e7be19 100644
--- a/x11-toolkits/gtk13/files/patch-ae
+++ b/x11-toolkits/gtk13/files/patch-ae
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Dec 24 01:02:02 2001
-+++ configure	Fri Jan 18 11:15:57 2002
-@@ -9794,7 +9794,7 @@
+--- configure.orig	Wed Jan 30 05:58:27 2002
++++ configure	Tue Feb 12 11:19:52 2002
+@@ -9783,7 +9783,7 @@
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
+-	         DATADIRNAME=lib
++	         DATADIRNAME=share
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 		INSTOBJEXT=.mo
+ 	      INSTOBJEXT=.mo
diff --git a/x11-toolkits/gtk13/files/patch-ltmain.sh b/x11-toolkits/gtk13/files/patch-ltmain.sh
index 98cb05e4ddb3..91713d2306f8 100644
--- a/x11-toolkits/gtk13/files/patch-ltmain.sh
+++ b/x11-toolkits/gtk13/files/patch-ltmain.sh
@@ -1,9 +1,26 @@
 
 $FreeBSD$
 
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
++	compiler_flags="$compiler_flags -pthread"
++	continue
++	;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2412,6 +2420,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -13,7 +30,7 @@ $FreeBSD$
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist
index 71cdb90ef8bd..4d8c9d541cd3 100644
--- a/x11-toolkits/gtk13/pkg-plist
+++ b/x11-toolkits/gtk13/pkg-plist
@@ -1,5 +1,4 @@
 bin/gdk-pixbuf-csource
-bin/gtk-demo
 bin/gtk-query-immodules-2.0
 etc/gtk-2.0/gtk.immodules
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
@@ -89,7 +88,6 @@ include/gtk-2.0/gtk/gtkhruler.h
 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/gtkhsv.h
 include/gtk-2.0/gtk/gtkiconfactory.h
 include/gtk-2.0/gtk/gtkimage.h
 include/gtk-2.0/gtk/gtkimagemenuitem.h
@@ -183,54 +181,37 @@ 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/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.a
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.a
+lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-hangul.so
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.a
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.a
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.a
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.so
-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.12
+lib/libgdk-x11-1.3.so.13
 lib/libgdk_pixbuf-1.3.a
 lib/libgdk_pixbuf-1.3.so
-lib/libgdk_pixbuf-1.3.so.12
+lib/libgdk_pixbuf-1.3.so.13
 lib/libgdk_pixbuf_xlib-1.3.a
 lib/libgdk_pixbuf_xlib-1.3.so
-lib/libgdk_pixbuf_xlib-1.3.so.12
+lib/libgdk_pixbuf_xlib-1.3.so.13
 lib/libgtk-x11-1.3.a
 lib/libgtk-x11-1.3.so
-lib/libgtk-x11-1.3.so.12
+lib/libgtk-x11-1.3.so.13
 libdata/pkgconfig/gdk-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -238,34 +219,6 @@ libdata/pkgconfig/gdk-x11-2.0.pc
 libdata/pkgconfig/gtk+-2.0.pc
 libdata/pkgconfig/gtk+-x11-2.0.pc
 share/aclocal/gtk-2.0.m4
-share/gtk-2.0/demo/alphatest.png
-share/gtk-2.0/demo/apple-red.png
-share/gtk-2.0/demo/appwindow.c
-share/gtk-2.0/demo/background.jpg
-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
-share/gtk-2.0/demo/gnome-foot.png
-share/gtk-2.0/demo/gnome-gimp.png
-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/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
@@ -290,6 +243,7 @@ share/locale/it/LC_MESSAGES/gtk20.mo
 share/locale/ja/LC_MESSAGES/gtk20.mo
 share/locale/ko/LC_MESSAGES/gtk20.mo
 share/locale/lt/LC_MESSAGES/gtk20.mo
+share/locale/ms/LC_MESSAGES/gtk20.mo
 share/locale/nl/LC_MESSAGES/gtk20.mo
 share/locale/nn/LC_MESSAGES/gtk20.mo
 share/locale/no/LC_MESSAGES/gtk20.mo
@@ -311,8 +265,6 @@ share/locale/zh_CN/LC_MESSAGES/gtk20.mo
 share/locale/zh_TW/LC_MESSAGES/gtk20.mo
 @dirrm share/themes/Default/gtk-2.0
 @dirrm share/themes/Default
-@dirrm share/gtk-2.0/demo
-@dirrm share/gtk-2.0
 @dirrm lib/gtk-2.0/immodules/%%GTK_VERSION%%
 @dirrm lib/gtk-2.0/immodules
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index cb47ff5925aa..dee696cd409e 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -6,21 +6,23 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	1.3.12
+PORTVERSION=	1.3.13
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-alpha2,} \
+		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
 		ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
 MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:R}
 DISTNAME=	gtk+-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	glib-1.3.12:${PORTSDIR}/devel/glib13 \
-		atk.9:${PORTSDIR}/devel/atk \
+LIB_DEPENDS=	glib-1.3.13:${PORTSDIR}/devel/glib13 \
+		atk.10:${PORTSDIR}/devel/atk \
 		pango.0:${PORTSDIR}/x11-toolkits/pango \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
@@ -28,6 +30,7 @@ LIB_DEPENDS=	glib-1.3.12:${PORTSDIR}/devel/glib13 \
 		intl.1:${PORTSDIR}/devel/gettext
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
+USE_BZIP2=	yes
 NO_LATEST_LINK=	"Unstable, development version."
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index ccd04c1e24c4..9c265fc95645 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.3.12.tar.gz) = b28157683d95bb6dc48489ec2b2cea7b
+MD5 (gnome2/gtk+-1.3.13.tar.bz2) = 1a29b8bed6ff0628045b222f15697f1e
diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in
new file mode 100644
index 000000000000..85e372a01c60
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Makefile.in	2002/02/12 13:29:11	1.1
++++ Makefile.in	2002/02/12 13:29:28
+@@ -168,7 +168,7 @@
+ 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 contrib
+ SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
+ 
+ # require automake 1.4
diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae
index 49b83e081296..eeb3f3e7be19 100644
--- a/x11-toolkits/gtk20/files/patch-ae
+++ b/x11-toolkits/gtk20/files/patch-ae
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Dec 24 01:02:02 2001
-+++ configure	Fri Jan 18 11:15:57 2002
-@@ -9794,7 +9794,7 @@
+--- configure.orig	Wed Jan 30 05:58:27 2002
++++ configure	Tue Feb 12 11:19:52 2002
+@@ -9783,7 +9783,7 @@
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
+-	         DATADIRNAME=lib
++	         DATADIRNAME=share
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 		INSTOBJEXT=.mo
+ 	      INSTOBJEXT=.mo
diff --git a/x11-toolkits/gtk20/files/patch-ltmain.sh b/x11-toolkits/gtk20/files/patch-ltmain.sh
index 98cb05e4ddb3..91713d2306f8 100644
--- a/x11-toolkits/gtk20/files/patch-ltmain.sh
+++ b/x11-toolkits/gtk20/files/patch-ltmain.sh
@@ -1,9 +1,26 @@
 
 $FreeBSD$
 
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
++	compiler_flags="$compiler_flags -pthread"
++	continue
++	;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2412,6 +2420,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -13,7 +30,7 @@ $FreeBSD$
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 71cdb90ef8bd..4d8c9d541cd3 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,5 +1,4 @@
 bin/gdk-pixbuf-csource
-bin/gtk-demo
 bin/gtk-query-immodules-2.0
 etc/gtk-2.0/gtk.immodules
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
@@ -89,7 +88,6 @@ include/gtk-2.0/gtk/gtkhruler.h
 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/gtkhsv.h
 include/gtk-2.0/gtk/gtkiconfactory.h
 include/gtk-2.0/gtk/gtkimage.h
 include/gtk-2.0/gtk/gtkimagemenuitem.h
@@ -183,54 +181,37 @@ 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/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.a
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.a
+lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-hangul.so
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.a
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.a
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.a
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.so
-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.12
+lib/libgdk-x11-1.3.so.13
 lib/libgdk_pixbuf-1.3.a
 lib/libgdk_pixbuf-1.3.so
-lib/libgdk_pixbuf-1.3.so.12
+lib/libgdk_pixbuf-1.3.so.13
 lib/libgdk_pixbuf_xlib-1.3.a
 lib/libgdk_pixbuf_xlib-1.3.so
-lib/libgdk_pixbuf_xlib-1.3.so.12
+lib/libgdk_pixbuf_xlib-1.3.so.13
 lib/libgtk-x11-1.3.a
 lib/libgtk-x11-1.3.so
-lib/libgtk-x11-1.3.so.12
+lib/libgtk-x11-1.3.so.13
 libdata/pkgconfig/gdk-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -238,34 +219,6 @@ libdata/pkgconfig/gdk-x11-2.0.pc
 libdata/pkgconfig/gtk+-2.0.pc
 libdata/pkgconfig/gtk+-x11-2.0.pc
 share/aclocal/gtk-2.0.m4
-share/gtk-2.0/demo/alphatest.png
-share/gtk-2.0/demo/apple-red.png
-share/gtk-2.0/demo/appwindow.c
-share/gtk-2.0/demo/background.jpg
-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
-share/gtk-2.0/demo/gnome-foot.png
-share/gtk-2.0/demo/gnome-gimp.png
-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/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
@@ -290,6 +243,7 @@ share/locale/it/LC_MESSAGES/gtk20.mo
 share/locale/ja/LC_MESSAGES/gtk20.mo
 share/locale/ko/LC_MESSAGES/gtk20.mo
 share/locale/lt/LC_MESSAGES/gtk20.mo
+share/locale/ms/LC_MESSAGES/gtk20.mo
 share/locale/nl/LC_MESSAGES/gtk20.mo
 share/locale/nn/LC_MESSAGES/gtk20.mo
 share/locale/no/LC_MESSAGES/gtk20.mo
@@ -311,8 +265,6 @@ share/locale/zh_CN/LC_MESSAGES/gtk20.mo
 share/locale/zh_TW/LC_MESSAGES/gtk20.mo
 @dirrm share/themes/Default/gtk-2.0
 @dirrm share/themes/Default
-@dirrm share/gtk-2.0/demo
-@dirrm share/gtk-2.0
 @dirrm lib/gtk-2.0/immodules/%%GTK_VERSION%%
 @dirrm lib/gtk-2.0/immodules
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index cb47ff5925aa..dee696cd409e 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -6,21 +6,23 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	1.3.12
+PORTVERSION=	1.3.13
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-alpha2,} \
+		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
 		ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
 MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:R}
 DISTNAME=	gtk+-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	glib-1.3.12:${PORTSDIR}/devel/glib13 \
-		atk.9:${PORTSDIR}/devel/atk \
+LIB_DEPENDS=	glib-1.3.13:${PORTSDIR}/devel/glib13 \
+		atk.10:${PORTSDIR}/devel/atk \
 		pango.0:${PORTSDIR}/x11-toolkits/pango \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
@@ -28,6 +30,7 @@ LIB_DEPENDS=	glib-1.3.12:${PORTSDIR}/devel/glib13 \
 		intl.1:${PORTSDIR}/devel/gettext
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
+USE_BZIP2=	yes
 NO_LATEST_LINK=	"Unstable, development version."
 USE_X_PREFIX=	yes
 USE_XPM=	yes
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index ccd04c1e24c4..9c265fc95645 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.3.12.tar.gz) = b28157683d95bb6dc48489ec2b2cea7b
+MD5 (gnome2/gtk+-1.3.13.tar.bz2) = 1a29b8bed6ff0628045b222f15697f1e
diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in
new file mode 100644
index 000000000000..85e372a01c60
--- /dev/null
+++ b/x11-toolkits/gtk30/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Makefile.in	2002/02/12 13:29:11	1.1
++++ Makefile.in	2002/02/12 13:29:28
+@@ -168,7 +168,7 @@
+ 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 contrib
+ SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
+ 
+ # require automake 1.4
diff --git a/x11-toolkits/gtk30/files/patch-ae b/x11-toolkits/gtk30/files/patch-ae
index 49b83e081296..eeb3f3e7be19 100644
--- a/x11-toolkits/gtk30/files/patch-ae
+++ b/x11-toolkits/gtk30/files/patch-ae
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Dec 24 01:02:02 2001
-+++ configure	Fri Jan 18 11:15:57 2002
-@@ -9794,7 +9794,7 @@
+--- configure.orig	Wed Jan 30 05:58:27 2002
++++ configure	Tue Feb 12 11:19:52 2002
+@@ -9783,7 +9783,7 @@
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
+-	         DATADIRNAME=lib
++	         DATADIRNAME=share
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 		INSTOBJEXT=.mo
+ 	      INSTOBJEXT=.mo
diff --git a/x11-toolkits/gtk30/files/patch-ltmain.sh b/x11-toolkits/gtk30/files/patch-ltmain.sh
index 98cb05e4ddb3..91713d2306f8 100644
--- a/x11-toolkits/gtk30/files/patch-ltmain.sh
+++ b/x11-toolkits/gtk30/files/patch-ltmain.sh
@@ -1,9 +1,26 @@
 
 $FreeBSD$
 
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
++	compiler_flags="$compiler_flags -pthread"
++	continue
++	;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2412,6 +2420,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -13,7 +30,7 @@ $FreeBSD$
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 71cdb90ef8bd..4d8c9d541cd3 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,5 +1,4 @@
 bin/gdk-pixbuf-csource
-bin/gtk-demo
 bin/gtk-query-immodules-2.0
 etc/gtk-2.0/gtk.immodules
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
@@ -89,7 +88,6 @@ include/gtk-2.0/gtk/gtkhruler.h
 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/gtkhsv.h
 include/gtk-2.0/gtk/gtkiconfactory.h
 include/gtk-2.0/gtk/gtkimage.h
 include/gtk-2.0/gtk/gtkimagemenuitem.h
@@ -183,54 +181,37 @@ 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/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.a
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.a
+lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-hangul.so
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.a
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.a
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.a
 lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.so
-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.12
+lib/libgdk-x11-1.3.so.13
 lib/libgdk_pixbuf-1.3.a
 lib/libgdk_pixbuf-1.3.so
-lib/libgdk_pixbuf-1.3.so.12
+lib/libgdk_pixbuf-1.3.so.13
 lib/libgdk_pixbuf_xlib-1.3.a
 lib/libgdk_pixbuf_xlib-1.3.so
-lib/libgdk_pixbuf_xlib-1.3.so.12
+lib/libgdk_pixbuf_xlib-1.3.so.13
 lib/libgtk-x11-1.3.a
 lib/libgtk-x11-1.3.so
-lib/libgtk-x11-1.3.so.12
+lib/libgtk-x11-1.3.so.13
 libdata/pkgconfig/gdk-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -238,34 +219,6 @@ libdata/pkgconfig/gdk-x11-2.0.pc
 libdata/pkgconfig/gtk+-2.0.pc
 libdata/pkgconfig/gtk+-x11-2.0.pc
 share/aclocal/gtk-2.0.m4
-share/gtk-2.0/demo/alphatest.png
-share/gtk-2.0/demo/apple-red.png
-share/gtk-2.0/demo/appwindow.c
-share/gtk-2.0/demo/background.jpg
-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
-share/gtk-2.0/demo/gnome-foot.png
-share/gtk-2.0/demo/gnome-gimp.png
-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/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
@@ -290,6 +243,7 @@ share/locale/it/LC_MESSAGES/gtk20.mo
 share/locale/ja/LC_MESSAGES/gtk20.mo
 share/locale/ko/LC_MESSAGES/gtk20.mo
 share/locale/lt/LC_MESSAGES/gtk20.mo
+share/locale/ms/LC_MESSAGES/gtk20.mo
 share/locale/nl/LC_MESSAGES/gtk20.mo
 share/locale/nn/LC_MESSAGES/gtk20.mo
 share/locale/no/LC_MESSAGES/gtk20.mo
@@ -311,8 +265,6 @@ share/locale/zh_CN/LC_MESSAGES/gtk20.mo
 share/locale/zh_TW/LC_MESSAGES/gtk20.mo
 @dirrm share/themes/Default/gtk-2.0
 @dirrm share/themes/Default
-@dirrm share/gtk-2.0/demo
-@dirrm share/gtk-2.0
 @dirrm lib/gtk-2.0/immodules/%%GTK_VERSION%%
 @dirrm lib/gtk-2.0/immodules
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders