svn commit: r313633 - in head: . Mk accessibility/at-poke accessibility/at-spi2-atk accessibility/at-spi2-atk/files accessibility/at-spi2-core accessibility/at-spi2-core/files accessibility/atk acc...

[Koop Mast]

Author: kwm
Date: Fri Mar  8 10:51:34 2013
New Revision: 313633
URL: http://svnweb.freebsd.org/changeset/ports/313633

Log:
  * Update the glib to 2.34.3 and gtk20 to 2.24.17 and gtk30 to 3.6.4 which
    are the latest stable releases.
  * Update vala to the newest stable release 0.18.1, also update a few ports
    in the gtk/gnome stack.
  * The c++ bindings ports for glib, atk, gconf, etc, have now USE_GNOME toggles.
  * Remove pkg-config run depends from glib20 and freetype2. This doesn't
    eliminate pkg-config run dependency completely, a second phase is needed
    and is planned.
  * Support for .:run. and .:build. for USE_GNOME components was added.
    Currently only libxml2 and libxslt support this mechanism.
  * Updates of the telepathy stack and empathy.
  * Trim makefile headers, convert ports to new options, trim off library
    versions for some ports.
  * Fix other ports so they build with the new glib version.
  
  Thanks to miwi and crees for helping out with some exp-runs.
  Approved by:	portmgr (miwi & bapt)
  Obtained from:	gnome team repo

Added:
  head/accessibility/at-spi2-atk/files/
  head/accessibility/at-spi2-atk/files/patch-atk-adaptor_accessible-cache.c   (contents, props changed)
  head/accessibility/at-spi2-core/files/patch-atspi_Makefile.in   (contents, props changed)
  head/devel/dconf-editor/
     - copied from r313631, head/devel/dconf/
  head/devel/dconf/files/patch-dbus-1_Makefile.in   (contents, props changed)
  head/devel/dconf/files/patch-editor_Makefile.in   (contents, props changed)
  head/devel/glib-java/files/patch-src__jni__jg_jnu.c   (contents, props changed)
  head/devel/glib20/files/extra-arch-powerpc64   (contents, props changed)
  head/devel/glib20/files/patch-gio_fam_Makefile.in   (contents, props changed)
  head/devel/glib20/files/patch-gio_glib-compile-schemas.c   (contents, props changed)
  head/devel/glib20/files/patch-gio_tests_include.c   (contents, props changed)
  head/devel/glib20/files/patch-glib_deprecated_gthread.h   (contents, props changed)
  head/devel/glib20/files/patch-glib_gthread-posix.c   (contents, props changed)
  head/devel/glib20/files/patch-glib_tests_gdatetime.c   (contents, props changed)
  head/devel/glib20/files/patch-glib_tests_utils.c   (contents, props changed)
  head/devel/libgee06/
     - copied from r313587, head/devel/libgee/
  head/devel/libopensync/files/
  head/devel/libopensync/files/patch-opensync__opensync_list.c   (contents, props changed)
  head/devel/libsoup/files/patch-tests_coding-test.c   (contents, props changed)
  head/devel/py-gobject/files/patch-gi_pygi-info.c   (contents, props changed)
  head/devel/seed/files/patch-libseed_seed-gtype.c   (contents, props changed)
  head/graphics/colord/
  head/graphics/colord/Makefile   (contents, props changed)
  head/graphics/colord/distinfo   (contents, props changed)
  head/graphics/colord/files/
  head/graphics/colord/files/patch-Makefile.in   (contents, props changed)
  head/graphics/colord/files/patch-client_Makefile.in   (contents, props changed)
  head/graphics/colord/pkg-descr   (contents, props changed)
  head/graphics/colord/pkg-plist   (contents, props changed)
  head/lang/gjs/files/
  head/lang/gjs/files/patch-modules_overrides_GLib.js   (contents, props changed)
  head/misc/amanda32-server/files/patch-common-src_glib-util.c   (contents, props changed)
  head/misc/amanda32-server/files/patch-common-src_glib-util.h   (contents, props changed)
  head/net-im/empathy/files/patch-libempathy_empathy-auth-factory.c   (contents, props changed)
  head/net-im/folks04/
     - copied from r313587, head/net-im/folks/
  head/net-im/loudmouth/files/patch-loudmouth_lm-error.c   (contents, props changed)
  head/net/glib-networking/files/patch-tls_gnutls_gtlsconnection-gnutls.c   (contents, props changed)
  head/print/libgnomecups/files/patch-libgnomecups_gnome-cups-i18n.c   (contents, props changed)
  head/print/libgnomecups/files/patch-libgnomecups_gnome-cups-init.h   (contents, props changed)
  head/security/lasso/files/patch-lasso_errors.c   (contents, props changed)
  head/sysutils/gnome-system-monitor/files/patch-src_interface.h   (contents, props changed)
  head/sysutils/heartbeat/files/patch-include__clplumbing__c1_uuid.h   (contents, props changed)
  head/sysutils/polkit/files/patch-Makefile.in   (contents, props changed)
  head/sysutils/polkit/files/patch-src_polkitagent_polkitagenthelperprivate.c   (contents, props changed)
  head/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendinteractiveauthority.c   (contents, props changed)
  head/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendlocalauthority.c   (contents, props changed)
  head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_gobject_GTypedefs.h   (contents, props changed)
Deleted:
  head/accessibility/at-spi2-core/files/patch-registryd_registry.c
  head/devel/dconf-editor/distinfo
  head/devel/dconf-editor/files/
  head/devel/dconf-editor/pkg-descr
  head/devel/dconf/files/patch-common_shmdir.c
  head/devel/dconf/files/patch-engine_dconf-engine.c
  head/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c
  head/devel/glib20/files/patch-ag
  head/devel/glib20/files/patch-gio_gdesktopappinfo.c
  head/devel/glib20/files/patch-gio_gunixcredentialsmessage.c
  head/devel/glib20/files/patch-gio_libasyncns_asyncns.c
  head/devel/glib20/files/patch-glib_gregex.c
  head/devel/glib20/files/patch-gthread_gthread-posix.c
  head/devel/gnome-common/files/patch-macros2_gnome-autogen.sh
  head/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config
  head/devel/libgee/files/
  head/devel/libgee06/files/
  head/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_io-xbm.c
  head/net-im/empathy/files/patch-src_empathy-chat-window.c
  head/net-im/empathy/files/patch-src_empathy-status-icon.c
  head/net-im/farsight2/files/patch-transmitters_shm_fs-shm-transmitter.c
  head/net-im/folks/files/
  head/net-im/folks04/files/
  head/net-im/libnice/files/
  head/net-im/telepathy-farsight/files/
  head/net-im/telepathy-salut/files/patch-lib_gibber_gibber-xmpp-connection-listener.c
  head/net-im/telepathy-salut/files/patch-src_salut-contact.h
  head/net-im/telepathy-salut/files/patch-src_salut-self.c
  head/sysutils/polkit/files/patch-src_programs_pkexec.c
  head/x11-toolkits/gtk30/files/patch-configure
Modified:
  head/Mk/bsd.gnome.mk   (contents, props changed)
  head/UPDATING
  head/accessibility/at-poke/Makefile   (contents, props changed)
  head/accessibility/at-spi2-atk/Makefile   (contents, props changed)
  head/accessibility/at-spi2-atk/distinfo   (contents, props changed)
  head/accessibility/at-spi2-atk/pkg-plist   (contents, props changed)
  head/accessibility/at-spi2-core/Makefile   (contents, props changed)
  head/accessibility/at-spi2-core/distinfo   (contents, props changed)
  head/accessibility/at-spi2-core/pkg-plist   (contents, props changed)
  head/accessibility/atk/Makefile   (contents, props changed)
  head/accessibility/atk/distinfo   (contents, props changed)
  head/accessibility/atk/pkg-plist   (contents, props changed)
  head/accessibility/atkmm/Makefile   (contents, props changed)
  head/accessibility/atkmm/distinfo   (contents, props changed)
  head/accessibility/py-papi/Makefile   (contents, props changed)
  head/archivers/libpar2/Makefile
  head/audio/abraca/Makefile
  head/audio/ario/Makefile   (contents, props changed)
  head/audio/deadbeef-mpris-plugin/Makefile   (contents, props changed)
  head/audio/esound/Makefile
  head/audio/gnomoradio/Makefile   (contents, props changed)
  head/audio/gspeakers/Makefile   (contents, props changed)
  head/audio/last.fm/Makefile   (contents, props changed)
  head/audio/libaudiofile/Makefile   (contents, props changed)
  head/audio/libsmf/Makefile   (contents, props changed)
  head/audio/pms/Makefile   (contents, props changed)
  head/audio/raul/Makefile   (contents, props changed)
  head/audio/taglib-sharp/Makefile   (contents, props changed)
  head/cad/leocad/Makefile
  head/converters/fribidi/Makefile   (contents, props changed)
  head/databases/evolution-data-server/Makefile
  head/databases/libgda2/Makefile   (contents, props changed)
  head/databases/libgda3/Makefile   (contents, props changed)
  head/databases/libgnomedb/Makefile   (contents, props changed)
  head/databases/mdbtools/Makefile   (contents, props changed)
  head/databases/mydumper/Makefile   (contents, props changed)
  head/deskutils/deskbar-applet/Makefile   (contents, props changed)
  head/deskutils/drivel/Makefile   (contents, props changed)
  head/deskutils/ecru/Makefile   (contents, props changed)
  head/deskutils/glabels/Makefile   (contents, props changed)
  head/deskutils/gnome-utils/Makefile   (contents, props changed)
  head/deskutils/gxneur/Makefile
  head/deskutils/pal/Makefile   (contents, props changed)
  head/deskutils/parcellite/Makefile
  head/deskutils/planner/Makefile   (contents, props changed)
  head/deskutils/steadyflow/Makefile
  head/deskutils/superswitcher/Makefile   (contents, props changed)
  head/deskutils/xpad-current/Makefile
  head/devel/Makefile
  head/devel/ORBit2/Makefile   (contents, props changed)
  head/devel/dbus-sharp/Makefile
  head/devel/dconf-editor/Makefile   (contents, props changed)
  head/devel/dconf-editor/pkg-plist   (contents, props changed)
  head/devel/dconf/Makefile   (contents, props changed)
  head/devel/dconf/distinfo   (contents, props changed)
  head/devel/dconf/files/patch-client_Makefile.in   (contents, props changed)
  head/devel/dconf/pkg-plist   (contents, props changed)
  head/devel/desktop-file-utils/Makefile   (contents, props changed)
  head/devel/eggdbus/Makefile   (contents, props changed)
  head/devel/eris/Makefile
  head/devel/g-wrap/Makefile   (contents, props changed)
  head/devel/gconfmm/Makefile   (contents, props changed)
  head/devel/giggle/Makefile   (contents, props changed)
  head/devel/gio-fam-backend/Makefile
  head/devel/gio-fam-backend/distinfo   (contents, props changed)
  head/devel/gio-fam-backend/files/patch-ae
  head/devel/glib-java/Makefile   (contents, props changed)
  head/devel/glib12/Makefile
  head/devel/glib20/Makefile
  head/devel/glib20/distinfo   (contents, props changed)
  head/devel/glib20/files/extra-patch-glib_Makefile.in   (contents, props changed)
  head/devel/glib20/files/extra-patch-glib_gunicollate.c   (contents, props changed)
  head/devel/glib20/files/patch-ae
  head/devel/glib20/files/patch-gio_gunixmount.c   (contents, props changed)
  head/devel/glib20/files/patch-gio_gunixmounts.c   (contents, props changed)
  head/devel/glib20/files/patch-glib-2.0.pc.in   (contents, props changed)
  head/devel/glib20/files/patch-glib_Makefile.in   (contents, props changed)
  head/devel/glib20/files/patch-glib_fix_hidden
  head/devel/glib20/files/patch-gobject_Makefile.in   (contents, props changed)
  head/devel/glib20/pkg-plist   (contents, props changed)
  head/devel/glibmm-reference/Makefile   (contents, props changed)
  head/devel/glibmm/Makefile   (contents, props changed)
  head/devel/glibmm/distinfo   (contents, props changed)
  head/devel/glibmm/pkg-plist   (contents, props changed)
  head/devel/gnome-common/Makefile   (contents, props changed)
  head/devel/gnome-common/distinfo   (contents, props changed)
  head/devel/gnome-common/pkg-plist   (contents, props changed)
  head/devel/gnome-js-common/Makefile   (contents, props changed)
  head/devel/gob2/Makefile   (contents, props changed)
  head/devel/gobject-introspection/Makefile
  head/devel/gobject-introspection/distinfo   (contents, props changed)
  head/devel/gobject-introspection/files/patch-Makefile.in   (contents, props changed)
  head/devel/gobject-introspection/files/patch-configure   (contents, props changed)
  head/devel/gobject-introspection/pkg-plist   (contents, props changed)
  head/devel/gsettings-desktop-schemas/Makefile   (contents, props changed)
  head/devel/guikachu/Makefile   (contents, props changed)
  head/devel/gvfs/Makefile
  head/devel/gvfs/distinfo   (contents, props changed)
  head/devel/gvfs/files/patch-client_Makefile.in   (contents, props changed)
  head/devel/gvfs/files/patch-client_gvfsfusedaemon.c   (contents, props changed)
  head/devel/gvfs/pkg-plist   (contents, props changed)
  head/devel/hs-gio/Makefile   (contents, props changed)
  head/devel/hs-glib/Makefile   (contents, props changed)
  head/devel/json-glib/Makefile   (contents, props changed)
  head/devel/json-glib/distinfo   (contents, props changed)
  head/devel/json-glib/pkg-plist   (contents, props changed)
  head/devel/libIDL/Makefile   (contents, props changed)
  head/devel/libassetml/Makefile   (contents, props changed)
  head/devel/libbonobo/Makefile
  head/devel/libg19draw/Makefile   (contents, props changed)
  head/devel/libgalago/Makefile   (contents, props changed)
  head/devel/libgee/Makefile   (contents, props changed)
  head/devel/libgee/distinfo   (contents, props changed)
  head/devel/libgee/pkg-plist   (contents, props changed)
  head/devel/libgee06/Makefile   (contents, props changed)
  head/devel/libgee06/distinfo   (contents, props changed)
  head/devel/libgee06/pkg-plist   (contents, props changed)
  head/devel/librcc/Makefile
  head/devel/libsigc++20/Makefile   (contents, props changed)
  head/devel/libsoup/Makefile   (contents, props changed)
  head/devel/libsoup/distinfo   (contents, props changed)
  head/devel/libsoup/pkg-plist   (contents, props changed)
  head/devel/libvolume_id/Makefile   (contents, props changed)
  head/devel/libwfut/Makefile   (contents, props changed)
  head/devel/lua-lgi/Makefile
  head/devel/ndesk-dbus-glib/Makefile   (contents, props changed)
  head/devel/ndesk-dbus/Makefile   (contents, props changed)
  head/devel/ndesk-options/Makefile
  head/devel/obby/Makefile   (contents, props changed)
  head/devel/orbitcpp/Makefile   (contents, props changed)
  head/devel/ptlib26/Makefile   (contents, props changed)
  head/devel/py-gobject/Makefile
  head/devel/py-gobject/pkg-plist   (contents, props changed)
  head/devel/py-orbit/Makefile
  head/devel/qt4-corelib/Makefile
  head/devel/regexxer/Makefile   (contents, props changed)
  head/devel/seed/Makefile   (contents, props changed)
  head/devel/valide/Makefile   (contents, props changed)
  head/devel/varconf/Makefile
  head/devel/vtg/Makefile   (contents, props changed)
  head/devel/xfce4-dev-tools/Makefile   (contents, props changed)
  head/editors/abiword/Makefile   (contents, props changed)
  head/emulators/gxmame/Makefile   (contents, props changed)
  head/emulators/open-vm-tools/Makefile
  head/games/gtkradiant/Makefile   (contents, props changed)
  head/games/monkeybubble/Makefile   (contents, props changed)
  head/games/mudmagic/Makefile   (contents, props changed)
  head/games/nlarn/Makefile   (contents, props changed)
  head/graphics/Makefile
  head/graphics/clutter/Makefile   (contents, props changed)
  head/graphics/clutter/pkg-descr   (contents, props changed)
  head/graphics/dia/Makefile   (contents, props changed)
  head/graphics/epdfview/Makefile   (contents, props changed)
  head/graphics/gdk-pixbuf2/Makefile   (contents, props changed)
  head/graphics/gdk-pixbuf2/distinfo   (contents, props changed)
  head/graphics/gdk-pixbuf2/pkg-plist   (contents, props changed)
  head/graphics/glitz/Makefile   (contents, props changed)
  head/graphics/gtk-update-icon-cache/Makefile   (contents, props changed)
  head/graphics/gtk-update-icon-cache/distinfo   (contents, props changed)
  head/graphics/lensfun/Makefile   (contents, props changed)
  head/graphics/libart_lgpl/Makefile   (contents, props changed)
  head/graphics/libchamplain/Makefile   (contents, props changed)
  head/graphics/libsvg-cairo/Makefile   (contents, props changed)
  head/graphics/shotwell/Makefile   (contents, props changed)
  head/irc/irssi-devel/Makefile   (contents, props changed)
  head/irc/irssi/Makefile   (contents, props changed)
  head/irc/minbif/Makefile
  head/irc/smartirc4net/Makefile   (contents, props changed)
  head/irc/xchat/Makefile   (contents, props changed)
  head/japanese/libskk/Makefile   (contents, props changed)
  head/japanese/mozc-server/Makefile   (contents, props changed)
  head/japanese/tomoe/Makefile   (contents, props changed)
  head/lang/gjs/Makefile   (contents, props changed)
  head/lang/gjs/distinfo   (contents, props changed)
  head/lang/gjs/pkg-plist   (contents, props changed)
  head/lang/vala-vapigen/Makefile   (contents, props changed)
  head/lang/vala-vapigen/pkg-plist   (contents, props changed)
  head/lang/vala/Makefile   (contents, props changed)
  head/lang/vala/distinfo   (contents, props changed)
  head/lang/vala/pkg-plist   (contents, props changed)
  head/mail/evolution-exchange/Makefile   (contents, props changed)
  head/mail/evolution/Makefile   (contents, props changed)
  head/mail/gnome-gmail-notifier/Makefile
  head/mail/masqmail/Makefile   (contents, props changed)
  head/mail/notmuch/Makefile
  head/mail/spmfilter/Makefile   (contents, props changed)
  head/misc/amanda26-server/files/patch-common-src::glib-util.c   (contents, props changed)
  head/misc/amanda26-server/files/patch-common-src_glib-util.h   (contents, props changed)
  head/misc/bigboard/Makefile   (contents, props changed)
  head/misc/gnome-mime-data/Makefile   (contents, props changed)
  head/misc/gnomehier/Makefile   (contents, props changed)
  head/misc/gnomehier/files/dirlist   (contents, props changed)
  head/misc/metalink-tools/Makefile   (contents, props changed)
  head/misc/salias/Makefile   (contents, props changed)
  head/misc/shared-mime-info/Makefile
  head/misc/xdelta/Makefile   (contents, props changed)
  head/multimedia/bombono/Makefile   (contents, props changed)
  head/multimedia/gstreamer-plugins/Makefile   (contents, props changed)
  head/multimedia/gstreamer/Makefile   (contents, props changed)
  head/net-im/Makefile
  head/net-im/empathy/Makefile   (contents, props changed)
  head/net-im/empathy/distinfo   (contents, props changed)
  head/net-im/empathy/files/patch-configure   (contents, props changed)
  head/net-im/empathy/pkg-plist   (contents, props changed)
  head/net-im/farsight2/Makefile   (contents, props changed)
  head/net-im/farsight2/distinfo   (contents, props changed)
  head/net-im/farsight2/pkg-plist   (contents, props changed)
  head/net-im/folks/Makefile   (contents, props changed)
  head/net-im/folks/distinfo   (contents, props changed)
  head/net-im/folks/pkg-plist   (contents, props changed)
  head/net-im/folks04/Makefile   (contents, props changed)
  head/net-im/folks04/distinfo   (contents, props changed)
  head/net-im/folks04/pkg-plist   (contents, props changed)
  head/net-im/libnice/Makefile   (contents, props changed)
  head/net-im/libnice/distinfo   (contents, props changed)
  head/net-im/libnice/pkg-plist   (contents, props changed)
  head/net-im/libtelepathy/Makefile   (contents, props changed)
  head/net-im/loudmouth/Makefile   (contents, props changed)
  head/net-im/meanwhile/Makefile   (contents, props changed)
  head/net-im/pidgin-bs/Makefile   (contents, props changed)
  head/net-im/psimedia/Makefile   (contents, props changed)
  head/net-im/telepathy-farsight/Makefile   (contents, props changed)
  head/net-im/telepathy-farsight/distinfo   (contents, props changed)
  head/net-im/telepathy-gabble/Makefile   (contents, props changed)
  head/net-im/telepathy-gabble/distinfo   (contents, props changed)
  head/net-im/telepathy-gabble/pkg-plist   (contents, props changed)
  head/net-im/telepathy-glib/Makefile   (contents, props changed)
  head/net-im/telepathy-glib/distinfo   (contents, props changed)
  head/net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in   (contents, props changed)
  head/net-im/telepathy-glib/pkg-descr   (contents, props changed)
  head/net-im/telepathy-glib/pkg-plist   (contents, props changed)
  head/net-im/telepathy-haze/Makefile   (contents, props changed)
  head/net-im/telepathy-haze/distinfo   (contents, props changed)
  head/net-im/telepathy-haze/pkg-plist   (contents, props changed)
  head/net-im/telepathy-idle/Makefile   (contents, props changed)
  head/net-im/telepathy-idle/distinfo   (contents, props changed)
  head/net-im/telepathy-idle/files/patch-src_idle-server-connection.c   (contents, props changed)
  head/net-im/telepathy-logger/Makefile   (contents, props changed)
  head/net-im/telepathy-logger/distinfo   (contents, props changed)
  head/net-im/telepathy-logger/pkg-plist   (contents, props changed)
  head/net-im/telepathy-mission-control/Makefile   (contents, props changed)
  head/net-im/telepathy-mission-control/distinfo   (contents, props changed)
  head/net-im/telepathy-mission-control/pkg-plist   (contents, props changed)
  head/net-im/telepathy-salut/Makefile   (contents, props changed)
  head/net-im/telepathy-salut/distinfo   (contents, props changed)
  head/net-im/telepathy-salut/pkg-plist   (contents, props changed)
  head/net-mgmt/gsnmp/Makefile   (contents, props changed)
  head/net-mgmt/jnettop/Makefile   (contents, props changed)
  head/net-p2p/rtorrent-devel/Makefile
  head/net-p2p/rtorrent/Makefile
  head/net/glib-networking/Makefile   (contents, props changed)
  head/net/glib-networking/distinfo   (contents, props changed)
  head/net/glib-networking/pkg-descr   (contents, props changed)
  head/net/glib-networking/pkg-plist   (contents, props changed)
  head/net/gnet2/Makefile   (contents, props changed)
  head/net/gq/Makefile   (contents, props changed)
  head/net/gq/files/patch-src::state.c   (contents, props changed)
  head/net/gsk/Makefile   (contents, props changed)
  head/net/gtk-vnc/Makefile   (contents, props changed)
  head/net/libfixbuf/Makefile   (contents, props changed)
  head/net/libnids/Makefile
  head/net/linc/Makefile   (contents, props changed)
  head/net/nbd-server/Makefile
  head/net/packter-agent/Makefile
  head/net/silc-client/Makefile
  head/net/sofia-sip/Makefile
  head/news/pan/Makefile   (contents, props changed)
  head/news/pan/distinfo   (contents, props changed)
  head/polish/gnugadu2/Makefile   (contents, props changed)
  head/ports-mgmt/bpm/Makefile   (contents, props changed)
  head/print/freetype2/Makefile
  head/print/gnome-cups-manager/Makefile   (contents, props changed)
  head/print/libgnomecups/Makefile   (contents, props changed)
  head/print/p5-Font-FreeType/Makefile   (contents, props changed)
  head/print/ttf2pt1/Makefile   (contents, props changed)
  head/security/gpass/Makefile
  head/security/gtkpasman/Makefile   (contents, props changed)
  head/security/pidgin-encryption/Makefile   (contents, props changed)
  head/sysutils/fusefs-cryptofs/Makefile
  head/sysutils/fusefs-sshfs/Makefile
  head/sysutils/fusefs-wdfs/Makefile
  head/sysutils/gnome-system-monitor/Makefile   (contents, props changed)
  head/sysutils/goaccess/Makefile
  head/sysutils/hdup/Makefile   (contents, props changed)
  head/sysutils/nautilus-cd-burner/Makefile   (contents, props changed)
  head/sysutils/polkit-gnome/Makefile   (contents, props changed)
  head/sysutils/polkit-gnome/distinfo   (contents, props changed)
  head/sysutils/polkit-gnome/pkg-plist   (contents, props changed)
  head/sysutils/polkit/Makefile   (contents, props changed)
  head/sysutils/polkit/distinfo   (contents, props changed)
  head/sysutils/polkit/pkg-descr   (contents, props changed)
  head/sysutils/polkit/pkg-plist   (contents, props changed)
  head/sysutils/rdup/Makefile   (contents, props changed)
  head/textproc/enchant/Makefile   (contents, props changed)
  head/textproc/libcroco/Makefile   (contents, props changed)
  head/textproc/libcroco/distinfo   (contents, props changed)
  head/textproc/libcroco/pkg-plist   (contents, props changed)
  head/textproc/libxml/Makefile   (contents, props changed)
  head/textproc/link-grammar/Makefile
  head/textproc/qstardict/Makefile
  head/textproc/sagasu/Makefile   (contents, props changed)
  head/textproc/sary/Makefile   (contents, props changed)
  head/textproc/sdcv/Makefile   (contents, props changed)
  head/textproc/xmlroff/Makefile   (contents, props changed)
  head/www/epiphany-extensions/Makefile
  head/www/nspluginwrapper/Makefile   (contents, props changed)
  head/www/screem/Makefile   (contents, props changed)
  head/www/webkit-gtk2/Makefile   (contents, props changed)
  head/x11-fonts/fontconfig/Makefile   (contents, props changed)
  head/x11-toolkits/gtk-sharp10/Makefile   (contents, props changed)
  head/x11-toolkits/gtk-sharp20/Makefile   (contents, props changed)
  head/x11-toolkits/gtk20/Makefile   (contents, props changed)
  head/x11-toolkits/gtk20/distinfo   (contents, props changed)
  head/x11-toolkits/gtk20/files/patch-gtk_Makefile.in   (contents, props changed)
  head/x11-toolkits/gtk20/pkg-plist   (contents, props changed)
  head/x11-toolkits/gtk30/Makefile   (contents, props changed)
  head/x11-toolkits/gtk30/distinfo   (contents, props changed)
  head/x11-toolkits/gtk30/files/patch-Makefile.in   (contents, props changed)
  head/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in   (contents, props changed)
  head/x11-toolkits/gtk30/pkg-plist   (contents, props changed)
  head/x11-toolkits/gtkada/Makefile   (contents, props changed)
  head/x11-toolkits/gtkextra2/Makefile   (contents, props changed)
  head/x11-toolkits/gtkmm20/Makefile   (contents, props changed)
  head/x11-toolkits/gtkmm30/Makefile   (contents, props changed)
  head/x11-toolkits/libgtk-java/Makefile   (contents, props changed)
  head/x11-toolkits/libgtksourceviewmm/Makefile   (contents, props changed)
  head/x11-toolkits/libzvt/files/patch-gnome-pty-helper.c   (contents, props changed)
  head/x11-toolkits/pango/Makefile   (contents, props changed)
  head/x11-toolkits/pango/distinfo   (contents, props changed)
  head/x11-toolkits/pango/pkg-plist   (contents, props changed)
  head/x11-toolkits/phat/Makefile   (contents, props changed)
  head/x11-toolkits/py-gnome-desktop/Makefile   (contents, props changed)
  head/x11-toolkits/qt4-gui/Makefile
  head/x11-wm/xfce4-session/pkg-plist   (contents, props changed)
  head/x11/avant-window-navigator/Makefile
  head/x11/babl/Makefile   (contents, props changed)
  head/x11/gnome-menus/Makefile   (contents, props changed)
  head/x11/gnome-pie/Makefile
  head/x11/startup-notification/Makefile   (contents, props changed)
  head/x11/tilda/Makefile   (contents, props changed)

Modified: head/Mk/bsd.gnome.mk
==============================================================================
--- head/Mk/bsd.gnome.mk	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/Mk/bsd.gnome.mk	Fri Mar  8 10:51:34 2013	(r313633)
@@ -1,9 +1,9 @@
-#-*- tab-width: 4; -*-
+#-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4
 #
 # $FreeBSD$
 #	$NetBSD: $
-#     $MCom: ports/Mk/bsd.gnome.mk,v 1.549 2011/06/10 22:16:59 mezz Exp $
+#     $MCom: ports/Mk/bsd.gnome.mk,v 1.574 2012/12/18 12:15:14 kwm Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -78,7 +78,7 @@ _USE_GNOME_ALL+= bonobo gconf gdkpixbuf 
 		libgda libghttp libglade libxml imlib oaf orbit
 
 # GNOME 2 components
-_USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gal2 \
+_USE_GNOME_ALL+= atk atspi cairo desktopfileutils eel2 evolutiondataserver gal2 \
 		gdkpixbuf2 gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop \
 		gnomedesktopsharp20 gnomedocutils gnomemenus gnomepanel gnomesharp20 \
 		gnomespeech gnomevfs2 gtk-update-icon-cache gtk20 gtkhtml3 gtksharp10 \
@@ -93,11 +93,18 @@ _USE_GNOME_ALL+= atk atspi desktopfileut
 # GNOME 3 components
 _USE_GNOME_ALL+= dconf gtk30
 
+# C++ bindings
+_USE_GNOME_ALL+=atkmm cairomm gconfmm gconfmm26 glibmm gtkmm20 gtkmm24 \
+		gtkmm30 libgdamm \
+		libgtksourceviewmm libxml++ libxml++26 libsigc++12 libsigc++20 \
+		pangomm
+
 GNOME_MAKEFILEIN?=	Makefile.in
 SCROLLKEEPER_DIR=	/var/db/rarian
 gnomehack_PRE_PATCH=	${FIND} ${WRKSRC} -name "${GNOME_MAKEFILEIN}*" -type f | ${XARGS} ${REINPLACE_CMD} -e \
 				's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
 				 s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
+				 s|{libdir}/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 				 s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 				 s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 				 s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
@@ -129,6 +136,67 @@ gnomeprefix_CONFIGURE_ARGS=--localstated
 			   --with-gconf-source=${GCONF_CONFIG_SOURCE}
 gnomeprefix_USE_GNOME_IMPL=gnomehier
 
+atkmm_DETECT=		${LOCALBASE}/libdata/pkgconfig/atkmm-1.6.pc
+atkmm_LIB_DEPENDS=	atkmm-1.6:${PORTSDIR}/accessibility/atkmm
+atkmm_USE_GNOME_IMPL=	glibmm atk
+
+libxml++_DETECT=		${LOCALBASE}/libdata/pkgconfig/libxml++-1.0.pc
+libxml++_LIB_DEPENDS=		xml++-1.0:${PORTSDIR}/textproc/libxml++
+libxml++_USE_GNOME_IMPL=	libxml2
+
+libxml++26_DETECT=		${LOCALBASE}/libdata/pkgconfig/libxml++-2.6.pc
+libxml++26_LIB_DEPENDS=		xml++-2.6:${PORTSDIR}/textproc/libxml++26
+libxml++26_USE_GNOME_IMPL=	glibmm libxml2
+
+cairo_DETECT=		${LOCALBASE}/libdata/pkgconfig/cairo.pc
+cairo_LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo
+
+cairomm_DETECT=		${LOCALBASE}/libdata/pkgconfig/cairomm-1.0.pc
+cairomm_LIB_DEPENDS=	cairomm-1.0:${PORTSDIR}/graphics/cairomm
+cairomm_USE_GNOME_IMPL=	cairo libxml++26
+
+gconfmm_DETECT=		${LOCALBASE}/libdata/pkgconfig/gconfmm-2.0.pc
+gconfmm_LIB_DEPENDS=	gconfmm-2.0:${PORTSDIR}/devel/gconfmm
+gconfmm_USE_GNOME_IMPL=	gtkmm20 gconf2
+
+gconfmm26_DETECT=		${LOCALBASE}/libdata/pkgconfig/gconfmm-2.6.pc
+gconfmm26_LIB_DEPENDS=		gconfmm-2.6:${PORTSDIR}/devel/gconfmm26
+gconfmm26_USE_GNOME_IMPL=	glibmm gconf2
+
+glibmm_DETECT=		${LOCALBASE}/libdata/pkgconfig/glibmm-2.4.pc
+glibmm_LIB_DEPENDS=	glibmm-2.4:${PORTSDIR}/devel/glibmm
+glibmm_USE_GNOME_IMPL=	libsigc++20 glib20
+
+gtkmm20_DETECT=		${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc
+gtkmm20_LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20
+gtkmm20_USE_GNOME_IMPL=	libsigc++12 gtk20
+
+gtkmm24_DETECT=		${LOCALBASE}/libdata/pkgconfig/gtkmm-2.4.pc
+gtkmm24_LIB_DEPENDS=	gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
+gtkmm24_USE_GNOME_IMPL=	glibmm cairomm atkmm pangomm gtk20
+
+gtkmm30_DETECT=		${LOCALBASE}/libdata/pkgconfig/gtkmm-3.0.pc
+gtkmm30_LIB_DEPENDS=	gtkmm-3.0:${PORTSDIR}/x11-toolkits/gtkmm30
+gtkmm30_USE_GNOME_IMPL=	glibmm cairomm atkmm pangomm gtk30
+
+libgdamm_DETECT=	${LOCALBASE}/libdata/pkgconfig/libgdamm-4.0.pc
+libgdamm_LIB_DEPENDS=	gdamm-4.0:${PORTSDIR}/databases/libgdamm
+libgdamm_USE_GNOME_IMPL=libgda4 glibmm
+
+libgtksourceviewmm_DETECT=		${LOCALBASE}/libdata/pkgconfig/gtksourceviewmm-2.0.pc
+libgtksourceviewmm_LIB_DEPENDS=		gtksourceviewmm-2.0:${PORTSDIR}/x11-toolkits/libgtksourceviewmm
+libgtksourceviewmm_USE_GNOME_IMPL=	gtksourceview2 gtkmm24
+
+libsigc++12_DETECT=		${LOCALBASE}/libdata/pkgconfig/sigc++-1.2.pc
+libsigc++12_LIB_DEPENDS=	sigc-1.2:${PORTSDIR}/devel/libsigc++12
+
+libsigc++20_DETECT=		${LOCALBASE}/libdata/pkgconfig/sigc++-2.0.pc
+libsigc++20_LIB_DEPENDS=	sigc-2.0:${PORTSDIR}/devel/libsigc++20
+
+pangomm_DETECT=		${LOCALBASE}/libdata/pkgconfig/pangomm-1.4.pc
+pangomm_LIB_DEPENDS=	pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm
+pangomm_USE_GNOME_IMPL=	pango glibmm cairomm
+
 ESD_CONFIG?=		${LOCALBASE}/bin/esd-config
 esound_LIB_DEPENDS=	esd.2:${PORTSDIR}/audio/esound
 esound_CONFIGURE_ENV=	ESD_CONFIG="${ESD_CONFIG}"
@@ -143,7 +211,6 @@ glib12_LIB_DEPENDS=	glib-12.3:${PORTSDIR
 glib12_CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 glib12_MAKE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 glib12_DETECT=		${GLIB_CONFIG}
-glib12_USE_GNOME_IMPL=	pkgconfig
 
 GTK_CONFIG?=		${LOCALBASE}/bin/gtk12-config
 gtk12_LIB_DEPENDS=	gtk-12.2:${PORTSDIR}/x11-toolkits/gtk12
@@ -246,9 +313,9 @@ libglade_MAKE_ENV=	LIBGLADE_CONFIG="${LI
 libglade_DETECT=	${LIBGLADE_CONFIG}
 libglade_USE_GNOME_IMPL=gnomedb
 
-_glib20_LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20
+_glib20_LIB_DEPENDS=	glib-2.0:${PORTSDIR}/devel/glib20 \
+			pcre:${PORTSDIR}/devel/pcre
 _glib20_DETECT=		${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc
-_glib20_USE_GNOME_IMPL=	pkgconfig
 
 glib20_RUN_DEPENDS=	${LOCALBASE}/lib/gio/modules/libgiofam.so:${PORTSDIR}/devel/gio-fam-backend
 glib20_DETECT=		${LOCALBASE}/lib/gio/modules/libgiofam.so
@@ -301,11 +368,14 @@ libglade2_LIB_DEPENDS=	glade-2.0.0:${POR
 libglade2_DETECT=	${LOCALBASE}/libdata/pkgconfig/libglade-2.0.pc
 libglade2_USE_GNOME_IMPL=libxml2 gtk20
 
+libxml2_BUILD_DEPENDS=	xml2-config:${PORTSDIR}/textproc/libxml2
 libxml2_LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
+libxml2_RUN_DEPENDS=	xml2-config:${PORTSDIR}/textproc/libxml2
 libxml2_DETECT=		${LOCALBASE}/libdata/pkgconfig/libxml-2.0.pc
-libxml2_USE_GNOME_IMPL=	pkgconfig
 
+libxslt_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 libxslt_LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt
+libxslt_RUN_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 libxslt_DETECT=		${LOCALBASE}/libdata/pkgconfig/libxslt.pc
 libxslt_USE_GNOME_IMPL=	libxml2
 
@@ -327,7 +397,6 @@ libgnomecanvas_USE_GNOME_IMPL=	libglade2
 
 libartlgpl2_LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl
 libartlgpl2_DETECT=		${LOCALBASE}/libdata/pkgconfig/libart-2.0.pc
-libartlgpl2_USE_GNOME_IMPL=	pkgconfig
 
 libgnomeprint_LIB_DEPENDS=	gnomeprint-2-2.0:${PORTSDIR}/print/libgnomeprint
 libgnomeprint_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgnomeprint-2.2.pc
@@ -364,16 +433,17 @@ libgtkhtml_USE_GNOME_IMPL=libxslt gnomev
 gnomedesktop_LIB_DEPENDS=	gnome-desktop-2.17:${PORTSDIR}/x11/gnome-desktop
 gnomedesktop_DETECT=		${LOCALBASE}/libdata/pkgconfig/gnome-desktop-2.0.pc
 gnomedesktop_USE_GNOME_IMPL=	gconf2 gnomedocutils pygtk2
-gnomedesktop_GNOME_DESKTOP_VERSION=2
 
 gnomedesktopsharp20_DETECT=		${LOCALBASE}/libdata/pkgconfig/gnome-desktop-sharp-2.0.pc
 gnomedesktopsharp20_BUILD_DEPENDS=	${gnomedesktopsharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-desktop-sharp20
 gnomedesktopsharp20_RUN_DEPENDS=	${gnomedesktopsharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-desktop-sharp20
 gnomedesktopsharp20_USE_GNOME_IMPL=	gnomesharp20 gnomepanel gtkhtml3 librsvg2 vte libgnomeprintui gtksourceview2 gnomepanel libwnck nautiluscdburner
+gnomedesktopsharp20_GNOME_DESKTOP_VERSION=2
 
 libwnck_LIB_DEPENDS=	wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck
 libwnck_DETECT=		${LOCALBASE}/libdata/pkgconfig/libwnck-1.0.pc
 libwnck_USE_GNOME_IMPL=	gtk20
+libwnck_GNOME_DESKTOP_VERSION=2
 
 vte_LIB_DEPENDS=	vte.9:${PORTSDIR}/x11-toolkits/vte
 vte_DETECT=		${LOCALBASE}/libdata/pkgconfig/vte.pc
@@ -397,13 +467,14 @@ gnomepanel_USE_GNOME_IMPL=gnomedesktop l
 gnomepanel_GNOME_DESKTOP_VERSION=2
 
 nautilus2_LIB_DEPENDS=	nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus
-nautilus2_DETECT=	${LOCALBASE}/libdata/pkgconfig/libnautilus-extension.pc
+nautilus2_DETECT=	${LOCALBASE}/share/gir-1.0/Nautilus-2.0.gir
 nautilus2_USE_GNOME_IMPL=librsvg2 gnomedesktop desktopfileutils gvfs
 nautilus2_GNOME_DESKTOP_VERSION=2
 
 metacity_LIB_DEPENDS=	metacity-private.0:${PORTSDIR}/x11-wm/metacity
 metacity_DETECT=	${LOCALBASE}/libdata/pkgconfig/libmetacity-private.pc
 metacity_USE_GNOME_IMPL=gconf2
+metacity_GNOME_DESKTOP_VERSION=2
 
 gal2_LIB_DEPENDS=	gal-2.4.0:${PORTSDIR}/x11-toolkits/gal2
 gal2_DETECT=		${LOCALBASE}/libdata/pkgconfig/gal-2.4.pc
@@ -412,6 +483,7 @@ gal2_USE_GNOME_IMPL=gnomeui libgnomeprin
 gnomecontrolcenter2_LIB_DEPENDS=gnome-window-settings.1:${PORTSDIR}/sysutils/gnome-control-center
 gnomecontrolcenter2_DETECT=${LOCALBASE}/libdata/pkgconfig/gnome-window-settings-2.0.pc
 gnomecontrolcenter2_USE_GNOME_IMPL=metacity gnomemenus desktopfileutils libgnomekbd gnomedesktop librsvg2
+gnomecontrolcenter2_GNOME_DESKTOP_VERSION=2
 
 libgda2_LIB_DEPENDS=	gda-2.3:${PORTSDIR}/databases/libgda2
 libgda2_DETECT=			${LOCALBASE}/libdata/pkgconfig/libgda.pc
@@ -485,6 +557,7 @@ gnomespeech_USE_GNOME_IMPL=libbonobo
 evolutiondataserver_LIB_DEPENDS=edataserverui-1.2.11:${PORTSDIR}/databases/evolution-data-server
 evolutiondataserver_DETECT=		${LOCALBASE}/libdata/pkgconfig/evolution-data-server-1.2.pc
 evolutiondataserver_USE_GNOME_IMPL=gconf2 libxml2
+evolutiondataserver_GNOME_DESKTOP_VERSION=2
 
 desktopfileutils_BUILD_DEPENDS=update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
 desktopfileutils_RUN_DEPENDS=update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
@@ -494,10 +567,13 @@ desktopfileutils_USE_GNOME_IMPL=glib20
 nautiluscdburner_LIB_DEPENDS=nautilus-burn.4:${PORTSDIR}/sysutils/nautilus-cd-burner
 nautiluscdburner_DETECT=	${LOCALBASE}/libdata/pkgconfig/libnautilus-burn.pc
 nautiluscdburner_USE_GNOME_IMPL=nautilus2 desktopfileutils
+nautiluscdburner_GNOME_DESKTOP_VERSION=2
 
-gnomemenus_LIB_DEPENDS=		gnome-menu.2:${PORTSDIR}/x11/gnome-menus
+gnomemenus_BUILD_DEPENDS=	gnome-menus<=2.39.0:${PORTSDIR}/x11/gnome-menus
+gnomemenus_RUN_DEPENDS=		gnome-menus<=2.39.0:${PORTSDIR}/x11/gnome-menus
 gnomemenus_DETECT=			${LOCALBASE}/libdata/pkgconfig/libgnome-menu.pc
 gnomemenus_USE_GNOME_IMPL=	glib20
+gnomemenus_GNOME_DESKTOP_VERSION=2
 
 pygnomeextras_DETECT=		${LOCALBASE}/libdata/pkgconfig/gnome-python-extras-2.0.pc
 pygnomeextras_BUILD_DEPENDS=	${pygnomeextras_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome-extras
@@ -513,6 +589,7 @@ pygnomedesktop_DETECT=		${LOCALBASE}/lib
 pygnomedesktop_BUILD_DEPENDS=	${pygnomedesktop_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome-desktop
 pygnomedesktop_RUN_DEPENDS=	${pygnomedesktop_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome-desktop
 pygnomedesktop_USE_GNOME_IMPL=pygnome2 libgnomeprintui gtksourceview gnomepanel libwnck nautilus2 metacity
+pygnomedesktop_GNOME_DESKTOP_VERSION=2
 
 gtksharp10_DETECT=			${LOCALBASE}/libdata/pkgconfig/gtk-sharp.pc
 gtksharp10_BUILD_DEPENDS=	${gtksharp10_DETECT}:${PORTSDIR}/x11-toolkits/gtk-sharp10
@@ -529,9 +606,10 @@ gnomesharp20_BUILD_DEPENDS=	${gnomesharp
 gnomesharp20_RUN_DEPENDS=	${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-sharp20
 gnomesharp20_USE_GNOME_IMPL=	gnomepanel gtkhtml3 gtksharp20 librsvg2 vte
 
-libgnomekbd_DETECT=			${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc
+libgnomekbd_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc
 libgnomekbd_LIB_DEPENDS=	gnomekbd.4:${PORTSDIR}/x11/libgnomekbd
 libgnomekbd_USE_GNOME_IMPL=	gconf2
+libgnomekbd_GNOME_DESKTOP_VERSION=2
 
 pygtksourceview_DETECT=		${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc
 pygtksourceview_BUILD_DEPENDS=	${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview
@@ -734,34 +812,45 @@ USE_CSTD=	gnu89
 GNOME_PRE_PATCH+=	${lthacks_PRE_PATCH}
 CONFIGURE_ENV+=		${lthacks_CONFIGURE_ENV}
 . endif
-. for component in ${_USE_GNOME_ALL}
-.  if ${_USE_GNOME:M${component}}!=""
+
+. for component in ${_USE_GNOME:O:u}
+.  if defined(${component}_PATCH_DEPENDS)
 PATCH_DEPENDS+=	${${component}_PATCH_DEPENDS}
-FETCH_DEPENDS+=	${${component}_FETCH_DEPENDS}
-EXTRACT_DEPENDS+=${${component}_EXTRACT_DEPENDS}
+.  endif
+
+.  if defined(${component}_DETECT)
+.   if ${USE_GNOME:M${component}\:build}!=""
 BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
-.  if defined(MARCUSCOM_CVS)
-.   if !defined(NODEPENDS)
-LIB_DEPENDS+=	${${component}_LIB_DEPENDS}
+.   elif ${USE_GNOME:M${component}\:run}!=""
 RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
-.   endif
-.  else
+.   else
+.    if defined(${component}_LIB_DEPENDS)
 LIB_DEPENDS+=	${${component}_LIB_DEPENDS}
+.    else
+BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
 RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
+.    endif
+.   endif
 .  endif
 
+.  if defined(${component}_CONFIGURE_ARGS)
 CONFIGURE_ARGS+=${${component}_CONFIGURE_ARGS}
+.  endif
+
+.  if defined(${component}_CONFIGURE_ENV)
 CONFIGURE_ENV+=	${${component}_CONFIGURE_ENV}
+.  endif
+
+.  if defined(${component}_MAKE_ENV)
 MAKE_ENV+=	${${component}_MAKE_ENV}
+.  endif
 
-.    if !defined(CONFIGURE_TARGET) && defined(${component}_CONFIGURE_TARGET)
+.  if !defined(CONFIGURE_TARGET) && defined(${component}_CONFIGURE_TARGET)
 CONFIGURE_TARGET=	${${component}_CONFIGURE_TARGET}
-.    endif
+.  endif
 
-.    if defined(${component}_PRE_PATCH)
+.  if defined(${component}_PRE_PATCH)
 GNOME_PRE_PATCH+=	; ${${component}_PRE_PATCH}
-.    endif
-
 .  endif
 . endfor
 .endif
@@ -835,9 +924,9 @@ gnome-post-install:
 		${ECHO_CMD} "share/glib-2.0/schemas/$${i}" >> ${TMPPLIST}; \
 	done
 	@${ECHO_CMD} "@exec glib-compile-schemas %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \
-		>> ${TMPPLIST}; \
-	${ECHO_CMD} "@unexec glib-compile-schemas --uninstall %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \
-		>> ${TMPPLIST};
+			>> ${TMPPLIST}; \
+	${ECHO_CMD} "@unexec glib-compile-schemas %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \
+			>> ${TMPPLIST};
 .endif
 
 .  if defined(INSTALLS_OMF)

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/UPDATING	Fri Mar  8 10:51:34 2013	(r313633)
@@ -5,6 +5,22 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20130308:
+  AFFECTS: users of net-im/folks and devel/libgee
+  AUTHOR: kwm at FreeBSD.org
+
+  folks and libgee have been repocopied net-im/folks04 and devel/libgee06 
+  respectively. Please do the following according to package manager used.
+
+  # portmaster -o devel/libgee06 devel/libgee
+  # portmaster -o net-im/folks04 net-im/folks
+    or
+  # portupgrade -fo devel/libgee06 devel/libgee
+  # portupgrade -fo net-im/folks04 net-im/folks
+    or
+  # pkg set -o devel/libgee:devel/libgee06
+  # pkg set -o net-im/folks:net-im/folks04
+
 20130307:
   AFFECTS: users of textproc/elasticsearch
   AUTHOR: tj at FreeBSD.org

Modified: head/accessibility/at-poke/Makefile
==============================================================================
--- head/accessibility/at-poke/Makefile	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/accessibility/at-poke/Makefile	Fri Mar  8 10:51:34 2013	(r313633)
@@ -21,4 +21,7 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' ${WRKSRC}/src/eventlog.h
+
 .include <bsd.port.mk>

Modified: head/accessibility/at-spi2-atk/Makefile
==============================================================================
--- head/accessibility/at-spi2-atk/Makefile	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/accessibility/at-spi2-atk/Makefile	Fri Mar  8 10:51:34 2013	(r313633)
@@ -1,34 +1,34 @@
-# New ports collection makefile for:   at-spi
-# Date Created:			12 April 2002
-# Whom:				Maxim Sobolev <sobomax at FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax at FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/accessibility/at-spi2-atk/Makefile,v 1.16 2010/11/16 11:53:13 kwm Exp $
-#
+#   $MCom: ports/accessibility/at-spi2-atk/Makefile,v 1.38 2012/12/16 22:36:25 kwm Exp $
 
 PORTNAME=	at-spi2-atk
-PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTVERSION=	2.6.2
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	Assisted Technology Provider module for GTK+
 
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core
+LICENSE=	LGPL21
 
-LICENSE=        LGPL21
-LICENSE_FILE=   ${WRKSRC}/COPYING
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
+BUILD_DEPENDS=	at-spi2-core>=2.1.4:${PORTSDIR}/accessibility/at-spi2-core
+LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus
+RUN_DEPENDS=	at-spi2-core>=2.1.4:${PORTSDIR}/accessibility/at-spi2-core
+
+CONFLICTS=	at-spi-1.[0-9]*
+PORTSCOUT=	limitw:1,even
+
+USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomehier intlhack gconf2 libxml2
+USE_GNOME=	gnomehack gnomehier intlhack glib20 atk
+USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-static
+USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-GCONF_SCHEMAS=	at-spi2.schemas
+CONFIGURE_ARGS=	--enable-p2p
+GLIB_SCHEMAS=	org.a11y.atspi.gschema.xml
 
 .include <bsd.port.mk>

Modified: head/accessibility/at-spi2-atk/distinfo
==============================================================================
--- head/accessibility/at-spi2-atk/distinfo	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/accessibility/at-spi2-atk/distinfo	Fri Mar  8 10:51:34 2013	(r313633)
@@ -1,2 +1,2 @@
-SHA256 (gnome2/at-spi2-atk-0.4.1.tar.bz2) = ad885b257f9e12bc1cfb0f21bd1075c00bdedca3f66d01b57401ecb12c9f411c
-SIZE (gnome2/at-spi2-atk-0.4.1.tar.bz2) = 337286
+SHA256 (gnome3/at-spi2-atk-2.6.2.tar.xz) = 496c8432e8ab82735145f9af5d45209e9b708bf3c94e527ee091d08641a9bcfa
+SIZE (gnome3/at-spi2-atk-2.6.2.tar.xz) = 274748

Added: head/accessibility/at-spi2-atk/files/patch-atk-adaptor_accessible-cache.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/accessibility/at-spi2-atk/files/patch-atk-adaptor_accessible-cache.c	Fri Mar  8 10:51:34 2013	(r313633)
@@ -0,0 +1,11 @@
+--- atk-adaptor/accessible-cache.c.orig	2012-11-21 23:46:32.000000000 +0000
++++ atk-adaptor/accessible-cache.c	2012-11-21 23:47:06.000000000 +0000
+@@ -362,7 +362,7 @@
+           if (!child)
+             {
+               g_static_rec_mutex_unlock (&cache_mutex);
+-              return;
++              return FALSE;
+             }
+ 
+           g_object_ref (child);

Modified: head/accessibility/at-spi2-atk/pkg-plist
==============================================================================
--- head/accessibility/at-spi2-atk/pkg-plist	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/accessibility/at-spi2-atk/pkg-plist	Fri Mar  8 10:51:34 2013	(r313633)
@@ -1,63 +1,14 @@
-lib/gtk-2.0/modules/at-spi-dbus/modules/libatk-bridge.a
-lib/gtk-2.0/modules/at-spi-dbus/modules/libatk-bridge.la
-lib/gtk-2.0/modules/at-spi-dbus/modules/libatk-bridge.so
-lib/gtk-3.0/modules/at-spi-dbus/modules/libatk-bridge.a
-lib/gtk-3.0/modules/at-spi-dbus/modules/libatk-bridge.la
-lib/gtk-3.0/modules/at-spi-dbus/modules/libatk-bridge.so
-share/gnome/autostart/atk-bridge.desktop
-share/locale/ar/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ast/LC_MESSAGES/at-spi2-atk.mo
-share/locale/bg/LC_MESSAGES/at-spi2-atk.mo
-share/locale/bn/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ca/LC_MESSAGES/at-spi2-atk.mo
-share/locale/cs/LC_MESSAGES/at-spi2-atk.mo
-share/locale/cy/LC_MESSAGES/at-spi2-atk.mo
-share/locale/de/LC_MESSAGES/at-spi2-atk.mo
-share/locale/el/LC_MESSAGES/at-spi2-atk.mo
-share/locale/en at shaw/LC_MESSAGES/at-spi2-atk.mo
-share/locale/en_GB/LC_MESSAGES/at-spi2-atk.mo
-share/locale/es/LC_MESSAGES/at-spi2-atk.mo
-share/locale/et/LC_MESSAGES/at-spi2-atk.mo
-share/locale/eu/LC_MESSAGES/at-spi2-atk.mo
-share/locale/fi/LC_MESSAGES/at-spi2-atk.mo
-share/locale/fr/LC_MESSAGES/at-spi2-atk.mo
-share/locale/gl/LC_MESSAGES/at-spi2-atk.mo
-share/locale/he/LC_MESSAGES/at-spi2-atk.mo
-share/locale/hu/LC_MESSAGES/at-spi2-atk.mo
-share/locale/it/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ko/LC_MESSAGES/at-spi2-atk.mo
-share/locale/lt/LC_MESSAGES/at-spi2-atk.mo
-share/locale/nb/LC_MESSAGES/at-spi2-atk.mo
-share/locale/nl/LC_MESSAGES/at-spi2-atk.mo
-share/locale/nn/LC_MESSAGES/at-spi2-atk.mo
-share/locale/pl/LC_MESSAGES/at-spi2-atk.mo
-share/locale/pt/LC_MESSAGES/at-spi2-atk.mo
-share/locale/pt_BR/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ro/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ru/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sk/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sl/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sr/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sr at latin/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sv/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ta/LC_MESSAGES/at-spi2-atk.mo
-share/locale/th/LC_MESSAGES/at-spi2-atk.mo
-share/locale/uk/LC_MESSAGES/at-spi2-atk.mo
-share/locale/vi/LC_MESSAGES/at-spi2-atk.mo
-share/locale/zh_CN/LC_MESSAGES/at-spi2-atk.mo
-share/locale/zh_HK/LC_MESSAGES/at-spi2-atk.mo
-share/locale/zh_TW/LC_MESSAGES/at-spi2-atk.mo
- at dirrm lib/gtk-2.0/modules/at-spi-dbus/modules
- at dirrm lib/gtk-2.0/modules/at-spi-dbus
- at dirrm lib/gtk-3.0/modules/at-spi-dbus/modules
- at dirrm lib/gtk-3.0/modules/at-spi-dbus
- at dirrmtry lib/gtk-3.0/modules
- at dirrmtry lib/gtk-3.0
- at dirrmtry share/locale/zh_HK/LC_MESSAGES
- at dirrmtry share/locale/zh_HK
- at dirrmtry share/locale/sr at latin/LC_MESSAGES
- at dirrmtry share/locale/sr at latin
- at dirrmtry share/locale/en at shaw/LC_MESSAGES
- at dirrmtry share/locale/en at shaw
- at dirrmtry share/locale/ast/LC_MESSAGES
- at dirrmtry share/locale/ast
+include/at-spi2-atk/2.0/atk-bridge.h
+lib/libatk-bridge-2.0.la
+lib/libatk-bridge-2.0.so
+lib/libatk-bridge-2.0.so.0
+lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
+lib/gtk-2.0/modules/libatk-bridge.la
+lib/gtk-2.0/modules/libatk-bridge.so
+libdata/pkgconfig/atk-bridge-2.0.pc
+ at dirrmtry lib/gtk-2.0/modules
+ at dirrmtry lib/gtk-2.0
+ at dirrmtry lib/gnome-settings-daemon-3.0/gtk-modules
+ at dirrmtry lib/gnome-settings-daemon-3.0
+ at dirrm include/at-spi2-atk/2.0
+ at dirrm include/at-spi2-atk

Modified: head/accessibility/at-spi2-core/Makefile
==============================================================================
--- head/accessibility/at-spi2-core/Makefile	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/accessibility/at-spi2-core/Makefile	Fri Mar  8 10:51:34 2013	(r313633)
@@ -1,28 +1,33 @@
 # Created by: Maxim Sobolev <sobomax at FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/accessibility/at-spi2-core/Makefile,v 1.17 2010/11/16 11:48:22 kwm Exp $
+#   $MCom: ports/accessibility/at-spi2-core/Makefile,v 1.41 2012/12/16 22:36:25 kwm Exp $
 
 PORTNAME=	at-spi2-core
-PORTVERSION=	0.4.1
+PORTVERSION=	2.6.3
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	Assistive Technology Service Provider Interface
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus
 
-USE_BZIP2=	yes
+PORTSCOUT=	limitw:1,even
+
+USE_XZ=		yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomehier intlhack
-USE_XORG=	x11 xi xtst
+USE_GNOME=	gnomehack gnomehier glib20 intlhack
+USE_PKGCONFIG=	build
+USE_XORG=	x11 xi xtst xext
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-static
-
+CONFIGURE_ARGS=	--enable-static \
+		--disable-xevie
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 

Modified: head/accessibility/at-spi2-core/distinfo
==============================================================================
--- head/accessibility/at-spi2-core/distinfo	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/accessibility/at-spi2-core/distinfo	Fri Mar  8 10:51:34 2013	(r313633)
@@ -1,2 +1,2 @@
-SHA256 (gnome2/at-spi2-core-0.4.1.tar.bz2) = e3f10134851691b4c0878c2bdb778e21ded01e140b7a930d1958513c775765f9
-SIZE (gnome2/at-spi2-core-0.4.1.tar.bz2) = 277204
+SHA256 (gnome3/at-spi2-core-2.6.3.tar.xz) = fc4487ae46e847cfd057b329b852cf99923772ecd2ddc29f29670c9f2b15d0ea
+SIZE (gnome3/at-spi2-core-2.6.3.tar.xz) = 445084

Added: head/accessibility/at-spi2-core/files/patch-atspi_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/accessibility/at-spi2-core/files/patch-atspi_Makefile.in	Fri Mar  8 10:51:34 2013	(r313633)
@@ -0,0 +1,10 @@
+--- atspi/Makefile.in.orig	2011-01-24 00:11:24.000000000 +0000
++++ atspi/Makefile.in	2011-01-24 00:13:25.000000000 +0000
+@@ -897,6 +897,7 @@
+ @HAVE_INTROSPECTION_TRUE@		--nsversion=2.0 \
+ @HAVE_INTROSPECTION_TRUE@		-I$(top_builddir) \
+ @HAVE_INTROSPECTION_TRUE@		-I$(top_srcdir) \
++ at HAVE_INTROSPECTION_TRUE@		$(CPPFLAGS) \
+ @HAVE_INTROSPECTION_TRUE@		--include=GLib-2.0 \
+ @HAVE_INTROSPECTION_TRUE@		--include=GObject-2.0 \
+ @HAVE_INTROSPECTION_TRUE@		--libtool="$(top_builddir)/libtool" \

Modified: head/accessibility/at-spi2-core/pkg-plist
==============================================================================
--- head/accessibility/at-spi2-core/pkg-plist	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/accessibility/at-spi2-core/pkg-plist	Fri Mar  8 10:51:34 2013	(r313633)
@@ -1,6 +1,171 @@
-bin/at-spi-dbus-bus
 etc/at-spi2/accessibility.conf
 etc/xdg/autostart/at-spi-dbus-bus.desktop
+include/at-spi-2.0/atspi/atspi.h
+include/at-spi-2.0/atspi/atspi-accessible.h
+include/at-spi-2.0/atspi/atspi-action.h
+include/at-spi-2.0/atspi/atspi-application.h
+include/at-spi-2.0/atspi/atspi-collection.h
+include/at-spi-2.0/atspi/atspi-component.h
+include/at-spi-2.0/atspi/atspi-constants.h
+include/at-spi-2.0/atspi/atspi-device-listener.h
+include/at-spi-2.0/atspi/atspi-device-listener-private.h
+include/at-spi-2.0/atspi/atspi-document.h
+include/at-spi-2.0/atspi/atspi-editabletext.h
+include/at-spi-2.0/atspi/atspi-event-listener.h
+include/at-spi-2.0/atspi/atspi-event-listener-private.h
+include/at-spi-2.0/atspi/atspi-gmain.c
+include/at-spi-2.0/atspi/atspi-gmain.h
+include/at-spi-2.0/atspi/atspi-hyperlink.h
+include/at-spi-2.0/atspi/atspi-hypertext.h
+include/at-spi-2.0/atspi/atspi-image.h
+include/at-spi-2.0/atspi/atspi-misc.h
+include/at-spi-2.0/atspi/atspi-matchrule.h
+include/at-spi-2.0/atspi/atspi-object.h
+include/at-spi-2.0/atspi/atspi-private.h
+include/at-spi-2.0/atspi/atspi-registry.h
+include/at-spi-2.0/atspi/atspi-relation.h
+include/at-spi-2.0/atspi/atspi-selection.h
+include/at-spi-2.0/atspi/atspi-stateset.h
+include/at-spi-2.0/atspi/atspi-table.h
+include/at-spi-2.0/atspi/atspi-text.h
+include/at-spi-2.0/atspi/atspi-types.h
+include/at-spi-2.0/atspi/atspi-value.h
+lib/girepository-1.0/Atspi-2.0.typelib
+lib/libatspi.a
+lib/libatspi.la
+lib/libatspi.so
+lib/libatspi.so.0
+libdata/pkgconfig/atspi-2.pc
+libexec/at-spi-bus-launcher
 libexec/at-spi2-registryd
+share/dbus-1/services/org.a11y.Bus.service
 share/dbus-1/services/org.a11y.atspi.Registry.service
+share/gir-1.0/Atspi-2.0.gir
+share/gtk-doc/html/libatspi/AtspiAccessible.html
+share/gtk-doc/html/libatspi/AtspiDeviceListener.html
+share/gtk-doc/html/libatspi/AtspiEventListener.html
+share/gtk-doc/html/libatspi/AtspiHyperlink.html
+share/gtk-doc/html/libatspi/AtspiMatchRule.html
+share/gtk-doc/html/libatspi/AtspiObject.html
+share/gtk-doc/html/libatspi/AtspiRelation.html
+share/gtk-doc/html/libatspi/AtspiStateSet.html
+share/gtk-doc/html/libatspi/annotation-glossary.html
+share/gtk-doc/html/libatspi/api-index-full.html
+share/gtk-doc/html/libatspi/ch01.html
+share/gtk-doc/html/libatspi/home.png
+share/gtk-doc/html/libatspi/index.html
+share/gtk-doc/html/libatspi/index.sgml
+share/gtk-doc/html/libatspi/left.png
+share/gtk-doc/html/libatspi/libatspi-AtspiApplication.html
+share/gtk-doc/html/libatspi/libatspi-atspi-action.html
+share/gtk-doc/html/libatspi/libatspi-atspi-collection.html
+share/gtk-doc/html/libatspi/libatspi-atspi-component.html
+share/gtk-doc/html/libatspi/libatspi-atspi-constants.html
+share/gtk-doc/html/libatspi/libatspi-atspi-document.html
+share/gtk-doc/html/libatspi/libatspi-atspi-editabletext.html
+share/gtk-doc/html/libatspi/libatspi-atspi-hypertext.html
+share/gtk-doc/html/libatspi/libatspi-atspi-image.html
+share/gtk-doc/html/libatspi/libatspi-atspi-listener-private.html
+share/gtk-doc/html/libatspi/libatspi-atspi-misc-private.html
+share/gtk-doc/html/libatspi/libatspi-atspi-misc.html
+share/gtk-doc/html/libatspi/libatspi-atspi-registry.html
+share/gtk-doc/html/libatspi/libatspi-atspi-selection.html
+share/gtk-doc/html/libatspi/libatspi-atspi-table.html
+share/gtk-doc/html/libatspi/libatspi-atspi-text.html
+share/gtk-doc/html/libatspi/libatspi-atspi-types.html
+share/gtk-doc/html/libatspi/libatspi-atspi-value.html
+share/gtk-doc/html/libatspi/libatspi.devhelp2
+share/gtk-doc/html/libatspi/object-tree.html
+share/gtk-doc/html/libatspi/right.png
+share/gtk-doc/html/libatspi/style.css
+share/gtk-doc/html/libatspi/up.png
+share/locale/an/LC_MESSAGES/at-spi2-core.mo
+share/locale/as/LC_MESSAGES/at-spi2-core.mo
+share/locale/ast/LC_MESSAGES/at-spi2-core.mo
+share/locale/be/LC_MESSAGES/at-spi2-core.mo
+share/locale/bg/LC_MESSAGES/at-spi2-core.mo
+share/locale/bn_IN/LC_MESSAGES/at-spi2-core.mo
+share/locale/ca/LC_MESSAGES/at-spi2-core.mo
+share/locale/ca at valencia/LC_MESSAGES/at-spi2-core.mo
+share/locale/cs/LC_MESSAGES/at-spi2-core.mo
+share/locale/da/LC_MESSAGES/at-spi2-core.mo
+share/locale/de/LC_MESSAGES/at-spi2-core.mo
+share/locale/el/LC_MESSAGES/at-spi2-core.mo
+share/locale/en_CA/LC_MESSAGES/at-spi2-core.mo
+share/locale/en_GB/LC_MESSAGES/at-spi2-core.mo
+share/locale/eo/LC_MESSAGES/at-spi2-core.mo
+share/locale/es/LC_MESSAGES/at-spi2-core.mo
+share/locale/et/LC_MESSAGES/at-spi2-core.mo
+share/locale/eu/LC_MESSAGES/at-spi2-core.mo
+share/locale/fa/LC_MESSAGES/at-spi2-core.mo
+share/locale/fi/LC_MESSAGES/at-spi2-core.mo
+share/locale/fr/LC_MESSAGES/at-spi2-core.mo
+share/locale/gl/LC_MESSAGES/at-spi2-core.mo
+share/locale/gu/LC_MESSAGES/at-spi2-core.mo
+share/locale/he/LC_MESSAGES/at-spi2-core.mo
+share/locale/hi/LC_MESSAGES/at-spi2-core.mo
+share/locale/hu/LC_MESSAGES/at-spi2-core.mo
+share/locale/id/LC_MESSAGES/at-spi2-core.mo
+share/locale/it/LC_MESSAGES/at-spi2-core.mo
+share/locale/ja/LC_MESSAGES/at-spi2-core.mo
+share/locale/km/LC_MESSAGES/at-spi2-core.mo
+share/locale/kn/LC_MESSAGES/at-spi2-core.mo
+share/locale/ko/LC_MESSAGES/at-spi2-core.mo
+share/locale/lt/LC_MESSAGES/at-spi2-core.mo
+share/locale/lv/LC_MESSAGES/at-spi2-core.mo
+share/locale/ml/LC_MESSAGES/at-spi2-core.mo
+share/locale/mr/LC_MESSAGES/at-spi2-core.mo
+share/locale/ms/LC_MESSAGES/at-spi2-core.mo
+share/locale/nb/LC_MESSAGES/at-spi2-core.mo
+share/locale/nl/LC_MESSAGES/at-spi2-core.mo
+share/locale/or/LC_MESSAGES/at-spi2-core.mo
+share/locale/pa/LC_MESSAGES/at-spi2-core.mo
+share/locale/pl/LC_MESSAGES/at-spi2-core.mo
+share/locale/pt/LC_MESSAGES/at-spi2-core.mo
+share/locale/pt_BR/LC_MESSAGES/at-spi2-core.mo
+share/locale/ro/LC_MESSAGES/at-spi2-core.mo
+share/locale/ru/LC_MESSAGES/at-spi2-core.mo
+share/locale/sk/LC_MESSAGES/at-spi2-core.mo
+share/locale/sl/LC_MESSAGES/at-spi2-core.mo
+share/locale/sq/LC_MESSAGES/at-spi2-core.mo
+share/locale/sr/LC_MESSAGES/at-spi2-core.mo
+share/locale/sr at latin/LC_MESSAGES/at-spi2-core.mo
+share/locale/sv/LC_MESSAGES/at-spi2-core.mo
+share/locale/ta/LC_MESSAGES/at-spi2-core.mo
+share/locale/te/LC_MESSAGES/at-spi2-core.mo
+share/locale/tr/LC_MESSAGES/at-spi2-core.mo
+share/locale/ug/LC_MESSAGES/at-spi2-core.mo
+share/locale/uk/LC_MESSAGES/at-spi2-core.mo
+share/locale/uz at cyrillic/LC_MESSAGES/at-spi2-core.mo
+share/locale/vi/LC_MESSAGES/at-spi2-core.mo
+share/locale/zh_CN/LC_MESSAGES/at-spi2-core.mo
+share/locale/zh_HK/LC_MESSAGES/at-spi2-core.mo
+share/locale/zh_TW/LC_MESSAGES/at-spi2-core.mo
+ at dirrmtry share/locale/uz at cyrillic/LC_MESSAGES
+ at dirrmtry share/locale/uz at cyrillic
+ at dirrmtry share/locale/ug/LC_MESSAGES
+ at dirrmtry share/locale/ug
+ at dirrmtry share/locale/te/LC_MESSAGES
+ at dirrmtry share/locale/te
+ at dirrmtry share/locale/sr at latin/LC_MESSAGES
+ at dirrmtry share/locale/sr at latin
+ at dirrmtry share/locale/mr/LC_MESSAGES
+ at dirrmtry share/locale/mr
+ at dirrmtry share/locale/km/LC_MESSAGES
+ at dirrmtry share/locale/km
+ at dirrmtry share/locale/ca at valencia/LC_MESSAGES
+ at dirrmtry share/locale/ca at valencia
+ at dirrmtry share/locale/bn_IN/LC_MESSAGES
+ at dirrmtry share/locale/bn_IN
+ at dirrmtry share/locale/ast/LC_MESSAGES
+ at dirrmtry share/locale/ast
+ at dirrmtry share/locale/as/LC_MESSAGES
+ at dirrmtry share/locale/as
+ at dirrmtry share/locale/an/LC_MESSAGES
+ at dirrmtry share/locale/an
+ at dirrm share/gtk-doc/html/libatspi
+ at dirrmtry share/gtk-doc/html
+ at dirrmtry share/gtk-doc
+ at dirrm include/at-spi-2.0/atspi
+ at dirrm include/at-spi-2.0
 @dirrm etc/at-spi2

Modified: head/accessibility/atk/Makefile
==============================================================================
--- head/accessibility/atk/Makefile	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/accessibility/atk/Makefile	Fri Mar  8 10:51:34 2013	(r313633)
@@ -1,9 +1,9 @@
 # Created by: Maxim Sobolev <sobomax at FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/accessibility/atk/Makefile,v 1.114 2011/06/13 20:32:27 kwm Exp $
+#   $MCom: ports/accessibility/atk/Makefile,v 1.123 2012/10/07 09:00:37 kwm Exp $
 
 PORTNAME=	atk
-PORTVERSION=	2.0.1
+PORTVERSION=	2.6.0
 PORTREVISION?=	0
 CATEGORIES=	accessibility devel
 MASTER_SITES=	GNOME
@@ -22,16 +22,16 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack glib20 ltverhack referencehack
+USE_GNOME=	gnomehier gnomehack glib20 ltverhack referencehack
+USE_PKGCONFIG=	build
 CONFIGURE_ARGS=	--enable-static \
-		--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	AUTOCONF=${TRUE} AUTOMAKE=${TRUE}
 
 post-patch:
-	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/tests//" \
+	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/tests docs//" \
 		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>

Modified: head/accessibility/atk/distinfo
==============================================================================
--- head/accessibility/atk/distinfo	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/accessibility/atk/distinfo	Fri Mar  8 10:51:34 2013	(r313633)
@@ -1,2 +1,2 @@
-SHA256 (gnome2/atk-2.0.1.tar.xz) = 4588867bb9eb788b2cf3399d3a2d5e4898193a9027436f6cffc9c18a627452a1
-SIZE (gnome2/atk-2.0.1.tar.xz) = 586516
+SHA256 (gnome2/atk-2.6.0.tar.xz) = eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f
+SIZE (gnome2/atk-2.6.0.tar.xz) = 609136

Modified: head/accessibility/atk/pkg-plist
==============================================================================
--- head/accessibility/atk/pkg-plist	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/accessibility/atk/pkg-plist	Fri Mar  8 10:51:34 2013	(r313633)
@@ -28,6 +28,7 @@ include/atk-1.0/atk/atktable.h
 include/atk-1.0/atk/atktext.h
 include/atk-1.0/atk/atkutil.h
 include/atk-1.0/atk/atkvalue.h
+include/atk-1.0/atk/atkwindow.h
 lib/girepository-1.0/Atk-1.0.typelib
 lib/libatk-1.0.a
 lib/libatk-1.0.la
@@ -55,9 +56,9 @@ share/locale/da/LC_MESSAGES/atk10.mo
 share/locale/de/LC_MESSAGES/atk10.mo
 share/locale/dz/LC_MESSAGES/atk10.mo
 share/locale/el/LC_MESSAGES/atk10.mo
+share/locale/en at shaw/LC_MESSAGES/atk10.mo
 share/locale/en_CA/LC_MESSAGES/atk10.mo
 share/locale/en_GB/LC_MESSAGES/atk10.mo
-share/locale/en at shaw/LC_MESSAGES/atk10.mo
 share/locale/eo/LC_MESSAGES/atk10.mo
 share/locale/es/LC_MESSAGES/atk10.mo
 share/locale/et/LC_MESSAGES/atk10.mo
@@ -79,6 +80,7 @@ share/locale/it/LC_MESSAGES/atk10.mo
 share/locale/ja/LC_MESSAGES/atk10.mo
 share/locale/ka/LC_MESSAGES/atk10.mo
 share/locale/kk/LC_MESSAGES/atk10.mo
+share/locale/km/LC_MESSAGES/atk10.mo
 share/locale/kn/LC_MESSAGES/atk10.mo
 share/locale/ko/LC_MESSAGES/atk10.mo
 share/locale/ku/LC_MESSAGES/atk10.mo
@@ -99,9 +101,9 @@ share/locale/oc/LC_MESSAGES/atk10.mo
 share/locale/or/LC_MESSAGES/atk10.mo
 share/locale/pa/LC_MESSAGES/atk10.mo
 share/locale/pl/LC_MESSAGES/atk10.mo
+share/locale/ps/LC_MESSAGES/atk10.mo
 share/locale/pt/LC_MESSAGES/atk10.mo
 share/locale/pt_BR/LC_MESSAGES/atk10.mo
-share/locale/ps/LC_MESSAGES/atk10.mo
 share/locale/ro/LC_MESSAGES/atk10.mo
 share/locale/ru/LC_MESSAGES/atk10.mo
 share/locale/rw/LC_MESSAGES/atk10.mo
@@ -110,8 +112,8 @@ share/locale/sk/LC_MESSAGES/atk10.mo
 share/locale/sl/LC_MESSAGES/atk10.mo
 share/locale/sq/LC_MESSAGES/atk10.mo
 share/locale/sr/LC_MESSAGES/atk10.mo
-share/locale/sr at latin/LC_MESSAGES/atk10.mo
 share/locale/sr at ije/LC_MESSAGES/atk10.mo
+share/locale/sr at latin/LC_MESSAGES/atk10.mo
 share/locale/sv/LC_MESSAGES/atk10.mo
 share/locale/ta/LC_MESSAGES/atk10.mo
 share/locale/te/LC_MESSAGES/atk10.mo
@@ -129,10 +131,6 @@ share/locale/zh_CN/LC_MESSAGES/atk10.mo
 share/locale/zh_HK/LC_MESSAGES/atk10.mo
 share/locale/zh_TW/LC_MESSAGES/atk10.mo
 share/locale/zu/LC_MESSAGES/atk10.mo
- at dirrm include/atk-1.0/atk
- at dirrm include/atk-1.0
- at dirrmtry share/gir-1.0
- at dirrmtry lib/girepository-1.0
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -165,6 +163,8 @@ share/locale/zu/LC_MESSAGES/atk10.mo
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+ at dirrmtry share/locale/km/LC_MESSAGES
+ at dirrmtry share/locale/km
 @dirrmtry share/locale/kk/LC_MESSAGES
 @dirrmtry share/locale/kk
 @dirrmtry share/locale/hy/LC_MESSAGES
@@ -183,3 +183,5 @@ share/locale/zu/LC_MESSAGES/atk10.mo
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
+ at dirrm include/atk-1.0/atk
+ at dirrm include/atk-1.0

Modified: head/accessibility/atkmm/Makefile
==============================================================================
--- head/accessibility/atkmm/Makefile	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/accessibility/atkmm/Makefile	Fri Mar  8 10:51:34 2013	(r313633)
@@ -1,26 +1,21 @@
-# New ports collection makefile for:	atkmm
-# Date created:				24 June 2010
-# Whom:					Koop Mast <kwm at FreeBSD.org>
-#
+# Created by: Koop Mast <kwm at FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/accessibility/atkmm/Makefile,v 1.10 2011/06/11 18:55:54 mezz Exp $
-#
+#   $MCom: ports/accessibility/atkmm/Makefile,v 1.12 2012/09/01 23:02:08 mezz Exp $
 
 PORTNAME=	atkmm
-PORTVERSION=	2.22.5
+PORTVERSION=	2.22.6
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	C++ wrapper for ATK API library
 
-LIB_DEPENDS=	glibmm-2.4.1:${PORTSDIR}/devel/glibmm
-
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
-USE_GNOME=	gnomehack atk
+USE_GNOME=	gnomehack atk glibmm
+USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

Modified: head/accessibility/atkmm/distinfo
==============================================================================
--- head/accessibility/atkmm/distinfo	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/accessibility/atkmm/distinfo	Fri Mar  8 10:51:34 2013	(r313633)
@@ -1,2 +1,2 @@
-SHA256 (atkmm-2.22.5.tar.bz2) = 61e03e5e67952c8fd9919049fae680bd0f2a1547344394f36b98b05b34b7be6c
-SIZE (atkmm-2.22.5.tar.bz2) = 715419
+SHA256 (atkmm-2.22.6.tar.xz) = 0a74295106b9e3ae552b169eb4e098b8b825c4115045b9d5134a6c79a238aeb6
+SIZE (atkmm-2.22.6.tar.xz) = 562892

Modified: head/accessibility/py-papi/Makefile
==============================================================================
--- head/accessibility/py-papi/Makefile	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/accessibility/py-papi/Makefile	Fri Mar  8 10:51:34 2013	(r313633)
@@ -15,6 +15,7 @@ MAINTAINER=	mva at FreeBSD.org
 COMMENT=	ATK accessibility wrapper for python
 
 USE_GNOME=	atk
+USE_PKGCONFIG=	build
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 

Modified: head/archivers/libpar2/Makefile
==============================================================================
--- head/archivers/libpar2/Makefile	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/archivers/libpar2/Makefile	Fri Mar  8 10:51:34 2013	(r313633)
@@ -18,6 +18,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 USE_LDCONFIG=	yes
+USE_PKGCONFIG=	build
 
 OPTIONS_DEFINE=	ENABLECANCEL
 OPTIONS_DEFAULT=	ENABLECANCEL

Modified: head/audio/abraca/Makefile
==============================================================================
--- head/audio/abraca/Makefile	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/audio/abraca/Makefile	Fri Mar  8 10:51:34 2013	(r313633)
@@ -3,7 +3,7 @@
 
 PORTNAME=	abraca
 PORTVERSION=	0.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://cloud.github.com/downloads/Abraca/Abraca/
 
@@ -12,10 +12,11 @@ COMMENT=	Abraca is a GTK2 client for the
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/valac:${PORTSDIR}/lang/vala
 LIB_DEPENDS=	xmmsclient:${PORTSDIR}/audio/xmms2 \
-		gee:${PORTSDIR}/devel/libgee
+		gee:${PORTSDIR}/devel/libgee06
 
 USE_SCONS=	yes
 USE_GNOME=	gtk30
+USE_PKGCONFIG=	build
 
 SCONS_ARGS=	MANDIR=${MANPREFIX}/man
 

Modified: head/audio/ario/Makefile
==============================================================================
--- head/audio/ario/Makefile	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/audio/ario/Makefile	Fri Mar  8 10:51:34 2013	(r313633)
@@ -47,4 +47,11 @@ CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--disable-nls
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|glib/gslist.h|glib.h|g ; \
+		 s|glib/gkeyfile.h>|glib.h>|g' \
+		${WRKSRC}/src/ario-util.h \
+		${WRKSRC}/src/plugins/ario-plugin-info.c \
+		${WRKSRC}/src/ario-profiles.h
+
 .include <bsd.port.mk>

Modified: head/audio/deadbeef-mpris-plugin/Makefile
==============================================================================
--- head/audio/deadbeef-mpris-plugin/Makefile	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/audio/deadbeef-mpris-plugin/Makefile	Fri Mar  8 10:51:34 2013	(r313633)
@@ -24,4 +24,7 @@ USE_GNOME=	glib20
 
 WRKSRC=		${WRKDIR}/deadbeef-${PORTVERSION}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|-Werror||g' ${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>

Modified: head/audio/esound/Makefile
==============================================================================
--- head/audio/esound/Makefile	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/audio/esound/Makefile	Fri Mar  8 10:51:34 2013	(r313633)
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	esound
-# Date created:		19 July 1998
-# Whom:			Vanilla I. Shu <vanilla at FreeBSD.org>
-#
+# Created by: Vanilla I. Shu <vanilla at FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/audio/esound/Makefile,v 1.1 2008/11/20 19:38:24 marcus Exp $
-#
 
 PORTNAME=	esound
 PORTVERSION=	0.2.41
@@ -21,6 +17,7 @@ LIB_DEPENDS=	audiofile.0:${PORTSDIR}/aud
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack
+USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_ENV=	JW=false

Modified: head/audio/gnomoradio/Makefile
==============================================================================
--- head/audio/gnomoradio/Makefile	Fri Mar  8 10:22:23 2013	(r313632)
+++ head/audio/gnomoradio/Makefile	Fri Mar  8 10:51:34 2013	(r313633)
@@ -35,5 +35,9 @@ post-patch:
 		${WRKSRC}/roboradio/mp3/Makefile.in
 	@${REINPLACE_CMD} -e 's|static char|static const char|' \
 		${WRKSRC}/gnomoradio/*.xpm
+	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***