[pkgsrc/trunk]: pkgsrc/x11/gtk2 update to 2.14.3, mostly from Juan RP

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6fa773a85b1e
branches:  trunk
changeset: 548455:6fa773a85b1e
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Oct 16 11:10:06 2008 +0000

description:
update to 2.14.3, mostly from Juan RP

This switches to the gnome-2.24 release branch.
Most noteworthy change: gtk includes "gail" now, so it conflicts with
the old devel/gail pkg.

diffstat:

 x11/gtk2/Makefile         |   10 ++-
 x11/gtk2/PLIST            |  110 +++++++++++++++++++++++++++++++++------------
 x11/gtk2/distinfo         |   12 ++--
 x11/gtk2/options.mk       |   11 +++-
 x11/gtk2/patches/patch-ad |   13 -----
 x11/gtk2/patches/patch-ai |   13 -----
 x11/gtk2/patches/patch-aj |   12 ++--
 7 files changed, 105 insertions(+), 76 deletions(-)

diffs (truncated from 470 to 300 lines):

diff -r 877a681c5f8f -r 6fa773a85b1e x11/gtk2/Makefile
--- a/x11/gtk2/Makefile Thu Oct 16 10:55:08 2008 +0000
+++ b/x11/gtk2/Makefile Thu Oct 16 11:10:06 2008 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.161 2008/10/06 17:53:36 tnn Exp $
+# $NetBSD: Makefile,v 1.162 2008/10/16 11:10:06 drochner Exp $
 
-DISTNAME=              gtk+-2.12.12
+DISTNAME=              gtk+-2.14.3
 PKGNAME=               ${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=            x11
-MASTER_SITES=          ftp://ftp.gtk.org/pub/gtk/2.12/ \
-                       ${MASTER_SITE_GNOME:=sources/gtk+/2.12/}
+MASTER_SITES=          ftp://ftp.gtk.org/pub/gtk/2.14/ \
+                       ${MASTER_SITE_GNOME:=sources/gtk+/2.14/}
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
@@ -14,6 +14,7 @@
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 CONFLICTS=             gtk2-engines<2.6.0
+CONFLICTS+=            gail-[0-9]*
 
 BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.2.0
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.13.5
@@ -89,6 +90,7 @@
        ${ECHO} >>${BUILDLINK_DIR}/bin/which "exit 0"
        ${CHMOD} +x ${BUILDLINK_DIR}/bin/which
 
+.include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff -r 877a681c5f8f -r 6fa773a85b1e x11/gtk2/PLIST
--- a/x11/gtk2/PLIST    Thu Oct 16 10:55:08 2008 +0000
+++ b/x11/gtk2/PLIST    Thu Oct 16 11:10:06 2008 +0000
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.58 2008/06/13 10:36:09 drochner Exp $
+@comment $NetBSD: PLIST,v 1.59 2008/10/16 11:10:06 drochner Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 bin/gtk-builder-convert
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
 bin/gtk-update-icon-cache
+include/gail-1.0/gail/gailwidget.h
+include/gail-1.0/libgail-util/gail-util.h
+include/gail-1.0/libgail-util/gailmisc.h
+include/gail-1.0/libgail-util/gailtextutil.h
 ${PLIST.x11}include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
 ${PLIST.x11}include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -19,7 +23,7 @@
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
 include/gtk-2.0/gdk/gdk.h
-include/gtk-2.0/gdk/gdkalias.h
+include/gtk-2.0/gdk/gdkapplaunchcontext.h
 include/gtk-2.0/gdk/gdkcairo.h
 include/gtk-2.0/gdk/gdkcolor.h
 include/gtk-2.0/gdk/gdkcursor.h
@@ -46,6 +50,7 @@
 include/gtk-2.0/gdk/gdkscreen.h
 include/gtk-2.0/gdk/gdkselection.h
 include/gtk-2.0/gdk/gdkspawn.h
+include/gtk-2.0/gdk/gdktestutils.h
 include/gtk-2.0/gdk/gdktypes.h
 include/gtk-2.0/gdk/gdkvisual.h
 include/gtk-2.0/gdk/gdkwindow.h
@@ -111,7 +116,6 @@
 include/gtk-2.0/gtk/gtkfilechooserwidget.h
 include/gtk-2.0/gtk/gtkfilefilter.h
 include/gtk-2.0/gtk/gtkfilesel.h
-include/gtk-2.0/gtk/gtkfilesystem.h
 include/gtk-2.0/gtk/gtkfixed.h
 include/gtk-2.0/gtk/gtkfontbutton.h
 include/gtk-2.0/gtk/gtkfontsel.h
@@ -126,6 +130,7 @@
 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/gtkicontheme.h
 include/gtk-2.0/gtk/gtkiconview.h
@@ -155,6 +160,7 @@
 include/gtk-2.0/gtk/gtkmessagedialog.h
 include/gtk-2.0/gtk/gtkmisc.h
 include/gtk-2.0/gtk/gtkmodules.h
+include/gtk-2.0/gtk/gtkmountoperation.h
 include/gtk-2.0/gtk/gtknotebook.h
 include/gtk-2.0/gtk/gtkobject.h
 include/gtk-2.0/gtk/gtkoldeditable.h
@@ -195,6 +201,7 @@
 include/gtk-2.0/gtk/gtkseparatormenuitem.h
 include/gtk-2.0/gtk/gtkseparatortoolitem.h
 include/gtk-2.0/gtk/gtksettings.h
+include/gtk-2.0/gtk/gtkshow.h
 include/gtk-2.0/gtk/gtksignal.h
 include/gtk-2.0/gtk/gtksizegroup.h
 include/gtk-2.0/gtk/gtksocket.h
@@ -205,6 +212,7 @@
 include/gtk-2.0/gtk/gtkstyle.h
 include/gtk-2.0/gtk/gtktable.h
 include/gtk-2.0/gtk/gtktearoffmenuitem.h
+include/gtk-2.0/gtk/gtktestutils.h
 include/gtk-2.0/gtk/gtktext.h
 include/gtk-2.0/gtk/gtktextbuffer.h
 include/gtk-2.0/gtk/gtktextbufferrichtext.h
@@ -223,6 +231,7 @@
 include/gtk-2.0/gtk/gtktoolbar.h
 include/gtk-2.0/gtk/gtktoolbutton.h
 include/gtk-2.0/gtk/gtktoolitem.h
+include/gtk-2.0/gtk/gtktoolshell.h
 include/gtk-2.0/gtk/gtktooltip.h
 include/gtk-2.0/gtk/gtktooltips.h
 include/gtk-2.0/gtk/gtktree.h
@@ -255,6 +264,7 @@
 include/gtk-unix-print-2.0/gtk/gtkprinter.h
 include/gtk-unix-print-2.0/gtk/gtkprintjob.h
 include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
+include/gtk-unix-print-2.0/gtk/gtkunixprint.h
 lib/gtk-2.0/2.10.0/engines/libpixmap.la
 lib/gtk-2.0/2.10.0/immodules/im-am-et.la
 lib/gtk-2.0/2.10.0/immodules/im-cedilla.la
@@ -270,6 +280,7 @@
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.la
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.la
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.la
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.la
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.la
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.la
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.la
@@ -285,20 +296,23 @@
 lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.la
 lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.la
 lib/gtk-2.0/include/gdkconfig.h
+lib/gtk-2.0/modules/libferret.la
+lib/gtk-2.0/modules/libgail.la
+lib/libgailutil.la
 ${PLIST.quartz}lib/libgdk-quartz-2.0.la
 ${PLIST.x11}lib/libgdk-x11-2.0.la
 lib/libgdk_pixbuf-2.0.la
 ${PLIST.x11}lib/libgdk_pixbuf_xlib-2.0.la
 ${PLIST.quartz}lib/libgtk-quartz-2.0.la
 ${PLIST.x11}lib/libgtk-x11-2.0.la
+lib/pkgconfig/gail.pc
 lib/pkgconfig/gdk-2.0.pc
 lib/pkgconfig/gdk-pixbuf-2.0.pc
+lib/pkgconfig/gtk+-2.0.pc
+lib/pkgconfig/gtk+-unix-print-2.0.pc
 ${PLIST.x11}lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
 ${PLIST.quartz}lib/pkgconfig/gdk-quartz-2.0.pc
 ${PLIST.x11}lib/pkgconfig/gdk-x11-2.0.pc
-lib/pkgconfig/gtk+-2.0.pc
-${PLIST.quartz}lib/pkgconfig/gtk+-quartz-2.0.pc
-lib/pkgconfig/gtk+-unix-print-2.0.pc
 ${PLIST.x11}lib/pkgconfig/gtk+-x11-2.0.pc
 libdata/gtk-2.0/im-multipress.conf
 man/man1/gdk-pixbuf-csource.1
@@ -352,10 +366,31 @@
 share/gtk-2.0/demo/textview.c
 share/gtk-2.0/demo/tree_store.c
 share/gtk-2.0/demo/ui_manager.c
+share/gtk-doc/html/gail-libgail-util/gail-libgail-util-GailMisc.html
+share/gtk-doc/html/gail-libgail-util/gail-libgail-util-GailTextUtil.html
+share/gtk-doc/html/gail-libgail-util/gail-libgail-util.devhelp
+share/gtk-doc/html/gail-libgail-util/gail-libgail-util.devhelp2
+share/gtk-doc/html/gail-libgail-util/home.png
+share/gtk-doc/html/gail-libgail-util/index.html
+share/gtk-doc/html/gail-libgail-util/index.sgml
+share/gtk-doc/html/gail-libgail-util/left.png
+share/gtk-doc/html/gail-libgail-util/libgail-util-main.html
+share/gtk-doc/html/gail-libgail-util/right.png
+share/gtk-doc/html/gail-libgail-util/style.css
+share/gtk-doc/html/gail-libgail-util/up.png
 share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html
 share/gtk-doc/html/gdk-pixbuf/apa.html
 share/gtk-doc/html/gdk-pixbuf/apas02.html
 share/gtk-doc/html/gdk-pixbuf/apas03.html
+share/gtk-doc/html/gdk-pixbuf/api-index-2-10.html
+share/gtk-doc/html/gdk-pixbuf/api-index-2-12.html
+share/gtk-doc/html/gdk-pixbuf/api-index-2-14.html
+share/gtk-doc/html/gdk-pixbuf/api-index-2-2.html
+share/gtk-doc/html/gdk-pixbuf/api-index-2-4.html
+share/gtk-doc/html/gdk-pixbuf/api-index-2-6.html
+share/gtk-doc/html/gdk-pixbuf/api-index-2-8.html
+share/gtk-doc/html/gdk-pixbuf/api-index-deprecated.html
+share/gtk-doc/html/gdk-pixbuf/api-index-full.html
 share/gtk-doc/html/gdk-pixbuf/composite.png
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Module-Interface.html
 share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Versioning.html
@@ -381,12 +416,6 @@
 share/gtk-doc/html/gdk-pixbuf/home.png
 share/gtk-doc/html/gdk-pixbuf/index.html
 share/gtk-doc/html/gdk-pixbuf/index.sgml
-share/gtk-doc/html/gdk-pixbuf/ix01.html
-share/gtk-doc/html/gdk-pixbuf/ix02.html
-share/gtk-doc/html/gdk-pixbuf/ix03.html
-share/gtk-doc/html/gdk-pixbuf/ix04.html
-share/gtk-doc/html/gdk-pixbuf/ix05.html
-share/gtk-doc/html/gdk-pixbuf/ix06.html
 share/gtk-doc/html/gdk-pixbuf/left.png
 share/gtk-doc/html/gdk-pixbuf/license.html
 share/gtk-doc/html/gdk-pixbuf/right.png
@@ -398,6 +427,15 @@
 share/gtk-doc/html/gdk/GdkDisplayManager.html
 share/gtk-doc/html/gdk/GdkScreen.html
 share/gtk-doc/html/gdk/X_cursor.png
+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-2.html
+share/gtk-doc/html/gdk/api-index-2-4.html
+share/gtk-doc/html/gdk/api-index-2-6.html
+share/gtk-doc/html/gdk/api-index-2-8.html
+share/gtk-doc/html/gdk/api-index-deprecated.html
+share/gtk-doc/html/gdk/api-index-full.html
 share/gtk-doc/html/gdk/arrow.png
 share/gtk-doc/html/gdk/based_arrow_down.png
 share/gtk-doc/html/gdk/based_arrow_up.png
@@ -424,6 +462,7 @@
 share/gtk-doc/html/gdk/draped_box.png
 share/gtk-doc/html/gdk/exchange.png
 share/gtk-doc/html/gdk/fleur.png
+share/gtk-doc/html/gdk/gdk-Application-launching.html
 share/gtk-doc/html/gdk/gdk-Bitmaps-and-Pixmaps.html
 share/gtk-doc/html/gdk/gdk-Cairo-Interaction.html
 share/gtk-doc/html/gdk/gdk-Colormaps-and-Colors.html
@@ -445,6 +484,7 @@
 share/gtk-doc/html/gdk/gdk-Points-Rectangles-and-Regions.html
 share/gtk-doc/html/gdk/gdk-Properties-and-Atoms.html
 share/gtk-doc/html/gdk/gdk-Selections.html
+share/gtk-doc/html/gdk/gdk-Testing.html
 share/gtk-doc/html/gdk/gdk-Threads.html
 share/gtk-doc/html/gdk/gdk-Visuals.html
 share/gtk-doc/html/gdk/gdk-Windows.html
@@ -461,14 +501,6 @@
 share/gtk-doc/html/gdk/index.html
 share/gtk-doc/html/gdk/index.sgml
 share/gtk-doc/html/gdk/iron_cross.png
-share/gtk-doc/html/gdk/ix01.html
-share/gtk-doc/html/gdk/ix02.html
-share/gtk-doc/html/gdk/ix03.html
-share/gtk-doc/html/gdk/ix04.html
-share/gtk-doc/html/gdk/ix05.html
-share/gtk-doc/html/gdk/ix06.html
-share/gtk-doc/html/gdk/ix07.html
-share/gtk-doc/html/gdk/ix08.html
 share/gtk-doc/html/gdk/left.png
 share/gtk-doc/html/gdk/left_ptr.png
 share/gtk-doc/html/gdk/left_side.png
@@ -672,6 +704,7 @@
 share/gtk-doc/html/gtk/GtkToggleToolButton.html
 share/gtk-doc/html/gtk/GtkToolButton.html
 share/gtk-doc/html/gtk/GtkToolItem.html
+share/gtk-doc/html/gtk/GtkToolShell.html
 share/gtk-doc/html/gtk/GtkToolbar.html
 share/gtk-doc/html/gtk/GtkTooltip.html
 share/gtk-doc/html/gtk/GtkTooltips.html
@@ -715,6 +748,15 @@
 share/gtk-doc/html/gtk/TreeWidgetObjects.html
 share/gtk-doc/html/gtk/WindowWidgets.html
 share/gtk-doc/html/gtk/accel-label.png
+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-2.html
+share/gtk-doc/html/gtk/api-index-2-4.html
+share/gtk-doc/html/gtk/api-index-2-6.html
+share/gtk-doc/html/gtk/api-index-2-8.html
+share/gtk-doc/html/gtk/api-index-deprecated.html
+share/gtk-doc/html/gtk/api-index-full.html
 share/gtk-doc/html/gtk/assistant.png
 share/gtk-doc/html/gtk/button.png
 share/gtk-doc/html/gtk/ch01.html
@@ -740,6 +782,7 @@
 share/gtk-doc/html/gtk/gtk-Clipboards.html
 share/gtk-doc/html/gtk/gtk-Drag-and-Drop.html
 share/gtk-doc/html/gtk/gtk-Feature-Test-Macros.html
+share/gtk-doc/html/gtk/gtk-Filesystem-utilities.html
 share/gtk-doc/html/gtk/gtk-General.html
 share/gtk-doc/html/gtk/gtk-Graphics-Contexts.html
 share/gtk-doc/html/gtk/gtk-GtkPaperSize.html
@@ -752,6 +795,7 @@
 share/gtk-doc/html/gtk/gtk-Signals.html
 share/gtk-doc/html/gtk/gtk-Standard-Enumerations.html
 share/gtk-doc/html/gtk/gtk-Stock-Items.html
+share/gtk-doc/html/gtk/gtk-Testing.html
 share/gtk-doc/html/gtk/gtk-Themeable-Stock-Images.html
 share/gtk-doc/html/gtk/gtk-Types.html
 share/gtk-doc/html/gtk/gtk-about.png
@@ -858,7 +902,11 @@
 share/gtk-doc/html/gtk/gtk-osx.html
 share/gtk-doc/html/gtk/gtk-paste.png
 share/gtk-doc/html/gtk/gtk-preferences.png
+share/gtk-doc/html/gtk/gtk-print-error.png
+share/gtk-doc/html/gtk/gtk-print-paused.png
 share/gtk-doc/html/gtk/gtk-print-preview.png