diff -ruN gtkextra.orig/CVS/Entries gtkextra/CVS/Entries
--- gtkextra.orig/CVS/Entries	Wed Jun 15 14:26:57 2005
+++ gtkextra/CVS/Entries	Sat May 21 22:00:37 2005
@@ -1,5 +1,5 @@
+/Makefile/1.20/Fri Jul  9 17:43:04 2004//
+/distinfo/1.9/Thu Mar 18 14:46:30 2004//
+/pkg-descr/1.2/Thu Jul  5 08:47:52 2001//
+/pkg-plist/1.8/Wed Dec  5 10:50:21 2001//
 D/files////
-/Makefile/1.20/Wed Jun 15 18:26:56 2005//
-/distinfo/1.9/Wed Jun 15 18:26:56 2005//
-/pkg-descr/1.2/Wed Jun 15 18:26:56 2005//
-/pkg-plist/1.8/Wed Jun 15 18:26:56 2005//
diff -ruN gtkextra.orig/Makefile gtkextra/Makefile
--- gtkextra.orig/Makefile	Wed Jun 15 14:26:56 2005
+++ gtkextra/Makefile	Wed Jun 15 03:54:20 2005
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtkextra
-PORTVERSION=	0.99.17
-PORTREVISION=	1
+PORTVERSION=	2.0.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://gtkextra.sourceforge.net/src/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -18,8 +17,8 @@
 COMMENT=	A useful widget set complementary to GTK+
 
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=13
-USE_GNOME=	gtk12
+USE_LIBTOOL_VER=15
+USE_GNOME=	gtk20 gnomehack
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff -ruN gtkextra.orig/distinfo gtkextra/distinfo
--- gtkextra.orig/distinfo	Wed Jun 15 14:26:56 2005
+++ gtkextra/distinfo	Wed Jun 15 03:14:04 2005
@@ -1,2 +1,2 @@
-MD5 (gtk+extra-0.99.17.tar.gz) = 390e622c12a5c7f7845ee144ae13ab93
-SIZE (gtk+extra-0.99.17.tar.gz) = 426952
+MD5 (gtk+extra-2.0.0.tar.gz) = 84390b9900a01d6153f2c40730ce59c1
+SIZE (gtk+extra-2.0.0.tar.gz) = 894220
diff -ruN gtkextra.orig/pkg-plist gtkextra/pkg-plist
--- gtkextra.orig/pkg-plist	Wed Jun 15 14:26:56 2005
+++ gtkextra/pkg-plist	Wed Jun 15 03:54:27 2005
@@ -1,39 +1,53 @@
-bin/gtkextra-config
-include/gtkextra/gtkbordercombo.h
-include/gtkextra/gtkcharsel.h
-include/gtkextra/gtkcheckitem.h
-include/gtkextra/gtkcolorcombo.h
-include/gtkextra/gtkcombobox.h
-include/gtkextra/gtkdirtree.h
-include/gtkextra/gtkextra.h
-include/gtkextra/gtkextrafeatures.h
-include/gtkextra/gtkfileicons.h
-include/gtkextra/gtkfilelist.h
-include/gtkextra/gtkfontcombo.h
-include/gtkextra/gtkiconfilesel.h
-include/gtkextra/gtkiconlist.h
-include/gtkextra/gtkitementry.h
-include/gtkextra/gtkplot.h
-include/gtkextra/gtkplot3d.h
-include/gtkextra/gtkplotbar.h
-include/gtkextra/gtkplotbox.h
-include/gtkextra/gtkplotcanvas.h
-include/gtkextra/gtkplotcsurface.h
-include/gtkextra/gtkplotdata.h
-include/gtkextra/gtkplotdt.h
-include/gtkextra/gtkplotflux.h
-include/gtkextra/gtkplotgdk.h
-include/gtkextra/gtkplotpc.h
-include/gtkextra/gtkplotpixmap.h
-include/gtkextra/gtkplotpolar.h
-include/gtkextra/gtkplotprint.h
-include/gtkextra/gtkplotps.h
-include/gtkextra/gtkplotsurface.h
-include/gtkextra/gtkpsfont.h
-include/gtkextra/gtksheet.h
-include/gtkextra/gtktogglecombo.h
-lib/libgtkextra.a
-lib/libgtkextra.so
-lib/libgtkextra.so.17
-share/aclocal/gtkextra.m4
-@dirrm include/gtkextra
+include/gtkextra-2.0/gtkextra/gdk-pixbuf-hacks.h
+include/gtkextra-2.0/gtkextra/gtkbordercombo.h
+include/gtkextra-2.0/gtkextra/gtkcharsel.h
+include/gtkextra-2.0/gtkextra/gtkcheckitem.h
+include/gtkextra-2.0/gtkextra/gtkcolorcombo.h
+include/gtkextra-2.0/gtkextra/gtkcombobutton.h
+include/gtkextra-2.0/gtkextra/gtkdirtree.h
+include/gtkextra-2.0/gtkextra/gtkextra-marshal.h
+include/gtkextra-2.0/gtkextra/gtkextra.h
+include/gtkextra-2.0/gtkextra/gtkextrafeatures.h
+include/gtkextra-2.0/gtkextra/gtkextraicons.h
+include/gtkextra-2.0/gtkextra/gtkextratypebuiltins.h
+include/gtkextra-2.0/gtkextra/gtkfileicons.h
+include/gtkextra-2.0/gtkextra/gtkfilelist.h
+include/gtkextra-2.0/gtkextra/gtkfontcombo.h
+include/gtkextra-2.0/gtkextra/gtkiconfilesel.h
+include/gtkextra-2.0/gtkextra/gtkiconlist.h
+include/gtkextra-2.0/gtkextra/gtkitementry.h
+include/gtkextra-2.0/gtkextra/gtkplot.h
+include/gtkextra-2.0/gtkextra/gtkplot3d.h
+include/gtkextra-2.0/gtkextra/gtkplotarray.h
+include/gtkextra-2.0/gtkextra/gtkplotbar.h
+include/gtkextra-2.0/gtkextra/gtkplotbox.h
+include/gtkextra-2.0/gtkextra/gtkplotbubble.h
+include/gtkextra-2.0/gtkextra/gtkplotcandle.h
+include/gtkextra-2.0/gtkextra/gtkplotcanvas.h
+include/gtkextra-2.0/gtkextra/gtkplotcanvasellipse.h
+include/gtkextra-2.0/gtkextra/gtkplotcanvasline.h
+include/gtkextra-2.0/gtkextra/gtkplotcanvaspixmap.h
+include/gtkextra-2.0/gtkextra/gtkplotcanvasplot.h
+include/gtkextra-2.0/gtkextra/gtkplotcanvasrectangle.h
+include/gtkextra-2.0/gtkextra/gtkplotcanvastext.h
+include/gtkextra-2.0/gtkextra/gtkplotcsurface.h
+include/gtkextra-2.0/gtkextra/gtkplotdata.h
+include/gtkextra-2.0/gtkextra/gtkplotdt.h
+include/gtkextra-2.0/gtkextra/gtkplotflux.h
+include/gtkextra-2.0/gtkextra/gtkplotgdk.h
+include/gtkextra-2.0/gtkextra/gtkplotpc.h
+include/gtkextra-2.0/gtkextra/gtkplotpixmap.h
+include/gtkextra-2.0/gtkextra/gtkplotpolar.h
+include/gtkextra-2.0/gtkextra/gtkplotprint.h
+include/gtkextra-2.0/gtkextra/gtkplotps.h
+include/gtkextra-2.0/gtkextra/gtkplotsegment.h
+include/gtkextra-2.0/gtkextra/gtkplotsurface.h
+include/gtkextra-2.0/gtkextra/gtkpsfont.h
+include/gtkextra-2.0/gtkextra/gtksheet.h
+include/gtkextra-2.0/gtkextra/gtktogglecombo.h
+lib/libgtkextra-x11-2.0.a
+lib/libgtkextra-x11-2.0.so
+lib/libgtkextra-x11-2.0.so.0
+libdata/pkgconfig/gtkextra-2.0.pc
+@dirrm include/gtkextra-2.0/gtkextra
+@dirrm include/gtkextra-2.0