update to 2.18.3

This switches to the gnome-2.28 release branch.

5 files changed, 34 insertions, 23 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 42862f0023b..0bcd21a00b1 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.188 2009/10/05 08:39:06 sketch Exp $
+# $NetBSD: Makefile,v 1.189 2009/10/21 15:34:06 drochner Exp $
 
-DISTNAME=		gtk+-2.16.6
+DISTNAME=		gtk+-2.18.3
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		2
 CATEGORIES=		x11
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/2.16/ \
-			${MASTER_SITE_GNOME:=sources/gtk+/2.16/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/2.18/ \
+			${MASTER_SITE_GNOME:=sources/gtk+/2.18/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index 91edd6fe3aa..3153052a7f6 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.66 2009/06/14 22:06:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.67 2009/10/21 15:34:06 drochner Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 bin/gtk-builder-convert
@@ -108,6 +108,7 @@ 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/gtkentrybuffer.h
 include/gtk-2.0/gtk/gtkentrycompletion.h
 include/gtk-2.0/gtk/gtkenums.h
 include/gtk-2.0/gtk/gtkeventbox.h
@@ -142,6 +143,7 @@ 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/gtkinfobar.h
 include/gtk-2.0/gtk/gtkinputdialog.h
 include/gtk-2.0/gtk/gtkinvisible.h
 include/gtk-2.0/gtk/gtkitem.h
@@ -335,6 +337,7 @@ share/gtk-2.0/demo/demo.ui
 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_buffer.c
 share/gtk-2.0/demo/entry_completion.c
 share/gtk-2.0/demo/expander.c
 share/gtk-2.0/demo/floppybuddy.gif
@@ -352,8 +355,12 @@ share/gtk-2.0/demo/hypertext.c
 share/gtk-2.0/demo/iconview.c
 share/gtk-2.0/demo/iconview_edit.c
 share/gtk-2.0/demo/images.c
+share/gtk-2.0/demo/infobar.c
+share/gtk-2.0/demo/links.c
 share/gtk-2.0/demo/list_store.c
 share/gtk-2.0/demo/menus.c
+share/gtk-2.0/demo/offscreen_window.c
+share/gtk-2.0/demo/offscreen_window2.c
 share/gtk-2.0/demo/panes.c
 share/gtk-2.0/demo/pickers.c
 share/gtk-2.0/demo/pixbufs.c
@@ -431,6 +438,7 @@ share/gtk-doc/html/gdk/api-index-2-10.html
 share/gtk-doc/html/gdk/api-index-2-12.html
 share/gtk-doc/html/gdk/api-index-2-14.html
 share/gtk-doc/html/gdk/api-index-2-16.html
+share/gtk-doc/html/gdk/api-index-2-18.html
 share/gtk-doc/html/gdk/api-index-2-2.html
 share/gtk-doc/html/gdk/api-index-2-4.html
 share/gtk-doc/html/gdk/api-index-2-6.html
@@ -602,6 +610,7 @@ 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/GtkEntryBuffer.html
 share/gtk-doc/html/gtk/GtkEntryCompletion.html
 share/gtk-doc/html/gtk/GtkEventBox.html
 share/gtk-doc/html/gtk/GtkExpander.html
@@ -632,6 +641,7 @@ share/gtk-doc/html/gtk/GtkIconTheme.html
 share/gtk-doc/html/gtk/GtkIconView.html
 share/gtk-doc/html/gtk/GtkImage.html
 share/gtk-doc/html/gtk/GtkImageMenuItem.html
+share/gtk-doc/html/gtk/GtkInfoBar.html
 share/gtk-doc/html/gtk/GtkInputDialog.html
 share/gtk-doc/html/gtk/GtkInvisible.html
 share/gtk-doc/html/gtk/GtkItem.html
@@ -756,6 +766,7 @@ share/gtk-doc/html/gtk/api-index-2-10.html
 share/gtk-doc/html/gtk/api-index-2-12.html
 share/gtk-doc/html/gtk/api-index-2-14.html
 share/gtk-doc/html/gtk/api-index-2-16.html
+share/gtk-doc/html/gtk/api-index-2-18.html
 share/gtk-doc/html/gtk/api-index-2-2.html
 share/gtk-doc/html/gtk/api-index-2-4.html
 share/gtk-doc/html/gtk/api-index-2-6.html
@@ -887,6 +898,7 @@ share/gtk-doc/html/gtk/gtk-media-record.png
 share/gtk-doc/html/gtk/gtk-media-rewind-ltr.png
 share/gtk-doc/html/gtk/gtk-media-rewind-rtl.png
 share/gtk-doc/html/gtk/gtk-media-stop.png
+share/gtk-doc/html/gtk/gtk-migrating-ClientSideWindows.html
 share/gtk-doc/html/gtk/gtk-migrating-GtkAboutDialog.html
 share/gtk-doc/html/gtk/gtk-migrating-GtkAction.html
 share/gtk-doc/html/gtk/gtk-migrating-GtkAssistant.html
@@ -899,6 +911,7 @@ share/gtk-doc/html/gtk/gtk-migrating-GtkLinkButton.html
 share/gtk-doc/html/gtk/gtk-migrating-GtkRecentChooser.html
 share/gtk-doc/html/gtk/gtk-migrating-checklist.html
 share/gtk-doc/html/gtk/gtk-migrating-entry-icons.html
+share/gtk-doc/html/gtk/gtk-migrating-label-links.html
 share/gtk-doc/html/gtk/gtk-migrating-tooltips.html
 share/gtk-doc/html/gtk/gtk-missing-image.png
 share/gtk-doc/html/gtk/gtk-network.png
@@ -1218,6 +1231,5 @@ share/locale/zh_TW/LC_MESSAGES/gtk20.mo
 share/themes/Default/gtk-2.0-key/gtkrc
 share/themes/Emacs/gtk-2.0-key/gtkrc
 share/themes/Raleigh/gtk-2.0/gtkrc
-@pkgdir lib/gtk-2.0/modules
 @pkgdir lib/gtk-2.0/immodules
 @pkgdir lib/gtk-2.0/2.10.0/filesystems
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 083642b0722..7a806f4a1ad 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.116 2009/08/29 18:00:00 wiz Exp $
+$NetBSD: distinfo,v 1.117 2009/10/21 15:34:06 drochner Exp $
 
-SHA1 (gtk+-2.16.6.tar.bz2) = f69cb48311d60664bac7cf68351c175c7a214ae6
-RMD160 (gtk+-2.16.6.tar.bz2) = 1048704042ffbbabe0de60278f49f8b7700f2d1f
-Size (gtk+-2.16.6.tar.bz2) = 18518781 bytes
-SHA1 (patch-aa) = 507f43c8257607c3ddb194015cc67c5b166a5047
+SHA1 (gtk+-2.18.3.tar.bz2) = a5432017a3116cb66460150d089e8aedbe756641
+RMD160 (gtk+-2.18.3.tar.bz2) = 44b44501d8ef3490787964200b52965d9d282d5c
+Size (gtk+-2.18.3.tar.bz2) = 19069010 bytes
+SHA1 (patch-aa) = 105a5b9d0bad708bcceb6f9a801207f0eff96eb3
 SHA1 (patch-ab) = 075dcdceeeea06d93802643b9bd2c23f0ee32a64
 SHA1 (patch-ac) = 81765fc056a25c5b53a7223ea62f6f98a6da6104
 SHA1 (patch-ad) = b28feb33311f4b42bdeeae257a470edd677d5c15
 SHA1 (patch-ae) = 33e5411076362295329f82e2106e1cd7f0529863
-SHA1 (patch-aj) = 4e36ab908ae14d81bd62c3eb170be87f14bb6a35
+SHA1 (patch-aj) = 40d91c8698981662e6926a27e39006b5ec413133
 SHA1 (patch-gb) = 6c0728eda2d4a59add4f8962bdab4f05022eda79
 SHA1 (patch-iojpeg) = 0042e773df5ed24abea22fa4b15469db0457d88d
 SHA1 (patch-ob) = 51cbaa82d534ca4ea5253e3a938daa3a5d1e05fb
diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
index 23ba74703a9..144f4c51bb5 100644
--- a/x11/gtk2/patches/patch-aa
+++ b/x11/gtk2/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.16 2007/09/16 19:53:26 wiz Exp $
+$NetBSD: patch-aa,v 1.17 2009/10/21 15:34:06 drochner Exp $
 
---- gdk-pixbuf/Makefile.in.orig	2007-09-13 23:40:48.000000000 +0000
+--- gdk-pixbuf/Makefile.in.orig	2009-09-23 04:22:48.000000000 +0200
 +++ gdk-pixbuf/Makefile.in
-@@ -567,7 +567,7 @@ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-
+@@ -1324,7 +1324,7 @@ test_gdk_pixbuf_LDADD = $(LDADDS)
+ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
  gdk_pixbuf_csource_LDADD = $(LDADDS)
- 
  gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
 -gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
 +gdk_pixbuf_query_loaders_LDADD = $(LDADDS) __PTHREAD_FLAGS__
- 
  gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
  
+ #
diff --git a/x11/gtk2/patches/patch-aj b/x11/gtk2/patches/patch-aj
index c15afb655c3..80aec9904df 100644
--- a/x11/gtk2/patches/patch-aj
+++ b/x11/gtk2/patches/patch-aj
@@ -1,10 +1,10 @@
-$NetBSD: patch-aj,v 1.12 2008/10/16 11:10:07 drochner Exp $
+$NetBSD: patch-aj,v 1.13 2009/10/21 15:34:06 drochner Exp $
 
---- Makefile.in.orig	2008-09-05 21:25:07.000000000 +0200
-+++ Makefile.in	2008-09-05 21:25:45.000000000 +0200
-@@ -516,7 +516,7 @@
+--- Makefile.in.orig	2009-09-23 04:22:53.000000000 +0200
++++ Makefile.in
+@@ -464,7 +464,7 @@ XVFB_START = \
+ 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
  	&& DISPLAY=:$$XID && export DISPLAY
-
  
 -SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
 +SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib