The FreeBSD GNOME team presents a Glib and Gtk+ 3 update.

This update updates Glib20 to 2.36 and Gtk+ 3.8

* The gio-fam-backend port that used gamin for the GFileMonitor API is gone.
  It is replaced by a GIO kqueue implementation developed as part of a NetBSD
  GSoC 2011 project by Dimitry Matveev.
* Fix a bug in the glib20 Makefile so it includes -lintl in the glib-2.0
  pkgconfig file [1]. This broke static linking and newer binutils.
* Add introspection USE_GNOME component which sets GI_SCANNER_DISABLE_CACHE to
  prevent creation of /  root/.cache dir. Defaults to build & run depend,
  but :build and :run switches available.
* New x11-toolkits/pangox-compat port and companion USE_GNOME component for
  pangox support which was removed from the pango port. Add it to ports still
  using pangox API.

Exp-run by:	bapt@
PR:		ports/178958 [1]
Submitted by:	emaste@ [1]

4 files changed, 71 insertions, 99 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index f635ae02b4df..61f3848633f3 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -1,9 +1,9 @@
 # Created by: Vanilla I. Shu <vanilla@MinJe.com.TW>
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.53 2013/01/07 13:35:02 kwm Exp $
+#   $MCom: ports/trunk/x11-toolkits/gtk30/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gtk
-PORTVERSION=	3.6.4
+PORTVERSION=	3.8.2
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
@@ -21,26 +21,24 @@ LATEST_LINK=	gtk30
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
-		${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk
-RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
-		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk
+BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk
 
-USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache
-USES=		gettext
+USE_GNOME=	atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache
+#		introspection:build
+USES=		gettext gmake pathfix pkgconfig
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
-CONFIGURE_ARGS=	--enable-static
-CONFIGURE_ARGS+=--enable-gtk2-dependency --disable-packagekit
+CONFIGURE_ARGS=	--enable-gtk2-dependency --disable-packagekit
 CPPFLAGS+=	-I${LOCALBASE}/include -fno-omit-frame-pointer
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	INTROSPECTION_GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0` ac_cv_path_SED="${SED}"
+CONFIGURE_ENV=	INTROSPECTION_GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0`
 
 GLIB_SCHEMAS=	org.gtk.Demo.gschema.xml \
 		org.gtk.Settings.ColorChooser.gschema.xml \
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index ce56379d420d..6a26d1e5f036 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtk+-3.6.4.tar.xz) = dbda37986f934f986c0bb20f2b0c59f2717a2e5c098370ad69677ff89295f1a1
-SIZE (gnome3/gtk+-3.6.4.tar.xz) = 13275488
+SHA256 (gnome3/gtk+-3.8.2.tar.xz) = 1ca80c9c15a1df95d74cefb8c2afe4682ba272a4b489106f04877be2a7aff297
+SIZE (gnome3/gtk+-3.8.2.tar.xz) = 13701516
diff --git a/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in
index 6eefe2bc7016..862035f409f3 100644
--- a/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in
@@ -1,10 +1,10 @@
---- docs/reference/gtk/Makefile.in.orig	2012-09-25 07:07:36.000000000 +0000
-+++ docs/reference/gtk/Makefile.in	2012-09-25 07:08:14.000000000 +0000
-@@ -822,7 +822,6 @@
+--- docs/reference/gtk/Makefile.in.orig	2013-03-28 10:39:58.000000000 +0000
++++ docs/reference/gtk/Makefile.in	2013-03-28 10:43:09.000000000 +0000
+@@ -852,7 +852,6 @@
  ########################################################################
  man_MANS = \
  	gtk-query-immodules-3.0.1	\
 -	gtk-update-icon-cache.1		\
- 	gtk-launch.1
+ 	gtk-launch.1			\
+ 	broadwayd.1
  
- @ENABLE_MAN_TRUE@XSLTPROC_FLAGS = \
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index a7b16ff8af33..263469f87f3b 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -20,6 +20,8 @@ include/gtk-3.0/gdk/gdkdisplaymanager.h
 include/gtk-3.0/gdk/gdkdnd.h
 include/gtk-3.0/gdk/gdkenumtypes.h
 include/gtk-3.0/gdk/gdkevents.h
+include/gtk-3.0/gdk/gdkframeclock.h
+include/gtk-3.0/gdk/gdkframetimings.h
 include/gtk-3.0/gdk/gdkkeys.h
 include/gtk-3.0/gdk/gdkkeysyms-compat.h
 include/gtk-3.0/gdk/gdkkeysyms.h
@@ -57,9 +59,54 @@ include/gtk-3.0/gdk/x11/gdkx11selection.h
 include/gtk-3.0/gdk/x11/gdkx11utils.h
 include/gtk-3.0/gdk/x11/gdkx11visual.h
 include/gtk-3.0/gdk/x11/gdkx11window.h
+include/gtk-3.0/gtk/a11y/gtkarrowaccessible.h
+include/gtk-3.0/gtk/a11y/gtkbooleancellaccessible.h
+include/gtk-3.0/gtk/a11y/gtkbuttonaccessible.h
+include/gtk-3.0/gtk/a11y/gtkcellaccessible.h
+include/gtk-3.0/gtk/a11y/gtkcellaccessibleparent.h
+include/gtk-3.0/gtk/a11y/gtkcheckmenuitemaccessible.h
+include/gtk-3.0/gtk/a11y/gtkcomboboxaccessible.h
+include/gtk-3.0/gtk/a11y/gtkcontaineraccessible.h
+include/gtk-3.0/gtk/a11y/gtkcontainercellaccessible.h
+include/gtk-3.0/gtk/a11y/gtkentryaccessible.h
+include/gtk-3.0/gtk/a11y/gtkexpanderaccessible.h
+include/gtk-3.0/gtk/a11y/gtkframeaccessible.h
+include/gtk-3.0/gtk/a11y/gtkiconviewaccessible.h
+include/gtk-3.0/gtk/a11y/gtkimageaccessible.h
+include/gtk-3.0/gtk/a11y/gtkimagecellaccessible.h
+include/gtk-3.0/gtk/a11y/gtklabelaccessible.h
+include/gtk-3.0/gtk/a11y/gtklevelbaraccessible.h
+include/gtk-3.0/gtk/a11y/gtklinkbuttonaccessible.h
+include/gtk-3.0/gtk/a11y/gtklockbuttonaccessible.h
+include/gtk-3.0/gtk/a11y/gtkmenuaccessible.h
+include/gtk-3.0/gtk/a11y/gtkmenuitemaccessible.h
+include/gtk-3.0/gtk/a11y/gtkmenushellaccessible.h
+include/gtk-3.0/gtk/a11y/gtknotebookaccessible.h
+include/gtk-3.0/gtk/a11y/gtknotebookpageaccessible.h
+include/gtk-3.0/gtk/a11y/gtkpanedaccessible.h
+include/gtk-3.0/gtk/a11y/gtkprogressbaraccessible.h
+include/gtk-3.0/gtk/a11y/gtkradiobuttonaccessible.h
+include/gtk-3.0/gtk/a11y/gtkradiomenuitemaccessible.h
+include/gtk-3.0/gtk/a11y/gtkrangeaccessible.h
+include/gtk-3.0/gtk/a11y/gtkrenderercellaccessible.h
+include/gtk-3.0/gtk/a11y/gtkscaleaccessible.h
+include/gtk-3.0/gtk/a11y/gtkscalebuttonaccessible.h
+include/gtk-3.0/gtk/a11y/gtkscrolledwindowaccessible.h
+include/gtk-3.0/gtk/a11y/gtkspinbuttonaccessible.h
+include/gtk-3.0/gtk/a11y/gtkspinneraccessible.h
+include/gtk-3.0/gtk/a11y/gtkstatusbaraccessible.h
+include/gtk-3.0/gtk/a11y/gtkswitchaccessible.h
+include/gtk-3.0/gtk/a11y/gtktextcellaccessible.h
+include/gtk-3.0/gtk/a11y/gtktextviewaccessible.h
+include/gtk-3.0/gtk/a11y/gtktogglebuttonaccessible.h
+include/gtk-3.0/gtk/a11y/gtktoplevelaccessible.h
+include/gtk-3.0/gtk/a11y/gtktreeviewaccessible.h
+include/gtk-3.0/gtk/a11y/gtkwidgetaccessible.h
+include/gtk-3.0/gtk/a11y/gtkwindowaccessible.h
 include/gtk-3.0/gtk/deprecated/gtkcolorsel.h
 include/gtk-3.0/gtk/deprecated/gtkcolorseldialog.h
 include/gtk-3.0/gtk/deprecated/gtkfontsel.h
+include/gtk-3.0/gtk/deprecated/gtkgradient.h
 include/gtk-3.0/gtk/deprecated/gtkhandlebox.h
 include/gtk-3.0/gtk/deprecated/gtkhbbox.h
 include/gtk-3.0/gtk/deprecated/gtkhbox.h
@@ -70,6 +117,7 @@ include/gtk-3.0/gtk/deprecated/gtkhseparator.h
 include/gtk-3.0/gtk/deprecated/gtkhsv.h
 include/gtk-3.0/gtk/deprecated/gtkrc.h
 include/gtk-3.0/gtk/deprecated/gtkstyle.h
+include/gtk-3.0/gtk/deprecated/gtksymboliccolor.h
 include/gtk-3.0/gtk/deprecated/gtktable.h
 include/gtk-3.0/gtk/deprecated/gtktearoffmenuitem.h
 include/gtk-3.0/gtk/deprecated/gtkvbbox.h
@@ -78,6 +126,7 @@ include/gtk-3.0/gtk/deprecated/gtkvpaned.h
 include/gtk-3.0/gtk/deprecated/gtkvscale.h
 include/gtk-3.0/gtk/deprecated/gtkvscrollbar.h
 include/gtk-3.0/gtk/deprecated/gtkvseparator.h
+include/gtk-3.0/gtk/gtk-a11y.h
 include/gtk-3.0/gtk/gtk.h
 include/gtk-3.0/gtk/gtkaboutdialog.h
 include/gtk-3.0/gtk/gtkaccelgroup.h
@@ -158,7 +207,6 @@ include/gtk-3.0/gtk/gtkfontchooser.h
 include/gtk-3.0/gtk/gtkfontchooserdialog.h
 include/gtk-3.0/gtk/gtkfontchooserwidget.h
 include/gtk-3.0/gtk/gtkframe.h
-include/gtk-3.0/gtk/gtkgradient.h
 include/gtk-3.0/gtk/gtkgrid.h
 include/gtk-3.0/gtk/gtkiconfactory.h
 include/gtk-3.0/gtk/gtkicontheme.h
@@ -239,7 +287,6 @@ include/gtk-3.0/gtk/gtkstylecontext.h
 include/gtk-3.0/gtk/gtkstyleproperties.h
 include/gtk-3.0/gtk/gtkstyleprovider.h
 include/gtk-3.0/gtk/gtkswitch.h
-include/gtk-3.0/gtk/gtksymboliccolor.h
 include/gtk-3.0/gtk/gtktestutils.h
 include/gtk-3.0/gtk/gtktextattributes.h
 include/gtk-3.0/gtk/gtktextbuffer.h
@@ -355,87 +402,13 @@ share/aclocal/gtk-3.0.m4
 share/gir-1.0/Gdk-3.0.gir
 share/gir-1.0/GdkX11-3.0.gir
 share/gir-1.0/Gtk-3.0.gir
-share/gtk-3.0/demo/alphatest.png
-share/gtk-3.0/demo/apple-red.png
-share/gtk-3.0/demo/application.c
-share/gtk-3.0/demo/application.ui
-share/gtk-3.0/demo/appwindow.c
-share/gtk-3.0/demo/assistant.c
-share/gtk-3.0/demo/background.jpg
-share/gtk-3.0/demo/builder.c
-share/gtk-3.0/demo/button_box.c
-share/gtk-3.0/demo/changedisplay.c
-share/gtk-3.0/demo/clipboard.c
-share/gtk-3.0/demo/colorsel.c
-share/gtk-3.0/demo/combobox.c
-share/gtk-3.0/demo/css_accordion.c
-share/gtk-3.0/demo/css_accordion.css
-share/gtk-3.0/demo/css_basics.c
-share/gtk-3.0/demo/css_basics.css
-share/gtk-3.0/demo/css_multiplebgs.c
-share/gtk-3.0/demo/css_multiplebgs.css
-share/gtk-3.0/demo/css_pixbufs.c
-share/gtk-3.0/demo/css_pixbufs.css
-share/gtk-3.0/demo/css_shadows.c
-share/gtk-3.0/demo/css_shadows.css
-share/gtk-3.0/demo/cssview.css
-share/gtk-3.0/demo/demo.ui
-share/gtk-3.0/demo/dialog.c
-share/gtk-3.0/demo/drawingarea.c
-share/gtk-3.0/demo/editable_cells.c
-share/gtk-3.0/demo/entry_buffer.c
-share/gtk-3.0/demo/entry_completion.c
-share/gtk-3.0/demo/expander.c
-share/gtk-3.0/demo/fancy.css
-share/gtk-3.0/demo/floppybuddy.gif
-share/gtk-3.0/demo/gnome-applets.png
-share/gtk-3.0/demo/gnome-calendar.png
-share/gtk-3.0/demo/gnome-foot.png
-share/gtk-3.0/demo/gnome-fs-directory.png
-share/gtk-3.0/demo/gnome-fs-regular.png
-share/gtk-3.0/demo/gnome-gimp.png
-share/gtk-3.0/demo/gnome-gmush.png
-share/gtk-3.0/demo/gnome-gsame.png
-share/gtk-3.0/demo/gnu-keys.png
-share/gtk-3.0/demo/gtk-logo-24.png
-share/gtk-3.0/demo/gtk-logo-48.png
-share/gtk-3.0/demo/gtk-logo-rgb.gif
-share/gtk-3.0/demo/hypertext.c
-share/gtk-3.0/demo/iconview.c
-share/gtk-3.0/demo/iconview_edit.c
-share/gtk-3.0/demo/images.c
-share/gtk-3.0/demo/infobar.c
-share/gtk-3.0/demo/links.c
-share/gtk-3.0/demo/list_store.c
-share/gtk-3.0/demo/menus.c
-share/gtk-3.0/demo/menus.ui
-share/gtk-3.0/demo/offscreen_window.c
-share/gtk-3.0/demo/offscreen_window2.c
-share/gtk-3.0/demo/overlay.c
-share/gtk-3.0/demo/panes.c
-share/gtk-3.0/demo/pickers.c
-share/gtk-3.0/demo/pixbufs.c
-share/gtk-3.0/demo/printing.c
-share/gtk-3.0/demo/reset.css
-share/gtk-3.0/demo/rotated_text.c
-share/gtk-3.0/demo/search_entry.c
-share/gtk-3.0/demo/sizegroup.c
-share/gtk-3.0/demo/spinner.c
-share/gtk-3.0/demo/stock_browser.c
-share/gtk-3.0/demo/textscroll.c
-share/gtk-3.0/demo/textview.c
-share/gtk-3.0/demo/theming_custom_css.c
-share/gtk-3.0/demo/theming_style_classes.c
-share/gtk-3.0/demo/theming.ui
-share/gtk-3.0/demo/toolpalette.c
-share/gtk-3.0/demo/transparent.c
-share/gtk-3.0/demo/tree_store.c
-share/gtk-3.0/demo/ui_manager.c
 share/gtk-3.0/gtkbuilder.rng
 share/locale/af/LC_MESSAGES/gtk30-properties.mo
 share/locale/af/LC_MESSAGES/gtk30.mo
 share/locale/am/LC_MESSAGES/gtk30-properties.mo
 share/locale/am/LC_MESSAGES/gtk30.mo
+share/locale/an/LC_MESSAGES/gtk30-properties.mo
+share/locale/an/LC_MESSAGES/gtk30.mo
 share/locale/ang/LC_MESSAGES/gtk30-properties.mo
 share/locale/ang/LC_MESSAGES/gtk30.mo
 share/locale/ar/LC_MESSAGES/gtk30-properties.mo
@@ -741,8 +714,8 @@ share/themes/Emacs/gtk-3.0/gtk-keys.css
 @dirrmtry share/locale/as
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang
-@dirrm share/gtk-3.0/demo
-@dirrm share/gtk-3.0
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
 @exec /bin/mkdir -p %D/lib/gtk-3.0/modules
 @exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/engines
 @exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/loaders
@@ -757,6 +730,7 @@ share/themes/Emacs/gtk-3.0/gtk-keys.css
 @dirrm include/gtk-3.0/unix-print/gtk
 @dirrm include/gtk-3.0/unix-print
 @dirrm include/gtk-3.0/gtk/deprecated
+@dirrm include/gtk-3.0/gtk/a11y
 @dirrm include/gtk-3.0/gtk
 @dirrm include/gtk-3.0/gdk/x11
 @dirrm include/gtk-3.0/gdk