4 files changed, 9 insertions, 21 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 030de25d73a..27723db685c 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.85 2005/06/22 00:45:29 grant Exp $
+# $NetBSD: Makefile,v 1.86 2005/06/26 19:43:54 jmmv Exp $
 #
 
-DISTNAME=		gtk+-2.6.7
+DISTNAME=		gtk+-2.6.8
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.6/ \
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index 16a9d2c6a22..605966753b9 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2005/03/02 15:39:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.40 2005/06/26 19:43:54 jmmv Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 bin/gtk-demo
@@ -797,6 +797,7 @@ share/gtk-2.0/demo/button_box.c
 share/gtk-2.0/demo/changedisplay.c
 share/gtk-2.0/demo/clipboard.c
 share/gtk-2.0/demo/colorsel.c
+share/gtk-2.0/demo/combobox.c
 share/gtk-2.0/demo/dialog.c
 share/gtk-2.0/demo/drawingarea.c
 share/gtk-2.0/demo/editable_cells.c
@@ -819,6 +820,7 @@ share/gtk-2.0/demo/images.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/pickers.c
 share/gtk-2.0/demo/pixbufs.c
 share/gtk-2.0/demo/rotated_text.c
 share/gtk-2.0/demo/sizegroup.c
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 1b22a40a843..05358780bcc 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.47 2005/05/18 15:28:04 jmmv Exp $
+$NetBSD: distinfo,v 1.48 2005/06/26 19:43:54 jmmv Exp $
 
-SHA1 (gtk+-2.6.7.tar.bz2) = 3a583ae6b468ded5dfcdc87cbd4f487d56b3e2c7
-RMD160 (gtk+-2.6.7.tar.bz2) = c664442d779f7fd1668a0294aa66d687f34601e4
-Size (gtk+-2.6.7.tar.bz2) = 11424614 bytes
+SHA1 (gtk+-2.6.8.tar.bz2) = f0c754aa62d25604cc1e8c3f112eda8da7fbd981
+RMD160 (gtk+-2.6.8.tar.bz2) = 13ac60f4b61b20d1c23eb86c31cdb9780e63cff1
+Size (gtk+-2.6.8.tar.bz2) = 11648931 bytes
 SHA1 (patch-aa) = 4991da77c0d8ad79ca616c7e6d80449863725b00
 SHA1 (patch-ab) = 213b38a1a3939194ac5c54234a1deccf935db368
 SHA1 (patch-ac) = d9a47653b8db5ffae28dc233aea0dc15399eea79
@@ -11,4 +11,3 @@ SHA1 (patch-ae) = 1fdeeef405b2045f26335f0bb607e3c3d24b3ae6
 SHA1 (patch-af) = 6797fd34be0a34368f6edede2321562678b112ff
 SHA1 (patch-ag) = dc4d72a39e426b880ca69ba8bc499fdaf42e0da8
 SHA1 (patch-ah) = 486d6601d6dba04830a8645c6a5791755e6538d9
-SHA1 (patch-ai) = 86caf0f12b0892593bf679117a3f17f342f7f9ca
diff --git a/x11/gtk2/patches/patch-ai b/x11/gtk2/patches/patch-ai
deleted file mode 100644
index 64c8af44cda..00000000000
--- a/x11/gtk2/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.9 2005/05/18 15:28:04 jmmv Exp $
-
---- gtk/xdgmime/xdgmimemagic.c.orig	2004-12-09 17:26:52.000000000 +0000
-+++ gtk/xdgmime/xdgmimemagic.c
-@@ -47,8 +47,6 @@
- #define	TRUE	(!FALSE)
- #endif
- 
--extern int errno;
--
- typedef struct XdgMimeMagicMatch XdgMimeMagicMatch;
- typedef struct XdgMimeMagicMatchlet XdgMimeMagicMatchlet;
-