aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED7
-rw-r--r--Mk/bsd.gnome.mk10
-rw-r--r--UPDATING17
-rw-r--r--accessibility/Makefile4
-rw-r--r--accessibility/accerciser/Makefile5
-rw-r--r--accessibility/accerciser/distinfo6
-rw-r--r--accessibility/accerciser/pkg-plist14
-rw-r--r--accessibility/at-spi/Makefile8
-rw-r--r--accessibility/at-spi/distinfo6
-rw-r--r--accessibility/at-spi/files/patch-registryd_registry-main.c10
-rw-r--r--accessibility/at-spi/pkg-plist5
-rw-r--r--accessibility/at-spi2-atk/Makefile30
-rw-r--r--accessibility/at-spi2-atk/distinfo3
-rw-r--r--accessibility/at-spi2-atk/pkg-descr9
-rw-r--r--accessibility/at-spi2-atk/pkg-plist6
-rw-r--r--accessibility/at-spi2-core/Makefile30
-rw-r--r--accessibility/at-spi2-core/distinfo3
-rw-r--r--accessibility/at-spi2-core/pkg-descr10
-rw-r--r--accessibility/at-spi2-core/pkg-plist2
-rw-r--r--accessibility/atk/Makefile7
-rw-r--r--accessibility/atk/distinfo6
-rw-r--r--accessibility/atk/pkg-plist12
-rw-r--r--accessibility/gir-repository-atk/Makefile15
-rw-r--r--accessibility/gnome-mag/Makefile5
-rw-r--r--accessibility/gnome-mag/distinfo6
-rw-r--r--accessibility/gnome-mag/pkg-plist7
-rw-r--r--accessibility/gok/Makefile10
-rw-r--r--accessibility/gok/distinfo6
-rw-r--r--accessibility/gok/pkg-plist20
-rw-r--r--accessibility/mousetweaks/Makefile7
-rw-r--r--accessibility/mousetweaks/distinfo6
-rw-r--r--accessibility/mousetweaks/pkg-plist4
-rw-r--r--accessibility/orca/Makefile13
-rw-r--r--accessibility/orca/distinfo6
-rw-r--r--accessibility/orca/pkg-plist32
-rw-r--r--accessibility/py-atspi/Makefile33
-rw-r--r--accessibility/py-atspi/distinfo3
-rw-r--r--accessibility/py-atspi/pkg-descr8
-rw-r--r--accessibility/py-atspi/pkg-plist98
-rw-r--r--archivers/file-roller/Makefile5
-rw-r--r--archivers/file-roller/distinfo6
-rw-r--r--archivers/file-roller/pkg-plist13
-rw-r--r--astro/glunarclock/Makefile4
-rw-r--r--audio/beast/files/patch-birnet_birnetthreadimpl.cc17
-rw-r--r--audio/gnome-media/Makefile12
-rw-r--r--audio/gnome-media/distinfo6
-rw-r--r--audio/gnome-media/pkg-plist31
-rw-r--r--audio/istream/Makefile4
-rw-r--r--audio/libcanberra/Makefile4
-rw-r--r--audio/libcanberra/distinfo6
-rw-r--r--audio/libcanberra/files/patch-src_oss.c14
-rw-r--r--audio/rhythmbox/Makefile7
-rw-r--r--audio/rhythmbox/distinfo6
-rw-r--r--audio/rhythmbox/pkg-plist40
-rw-r--r--audio/sound-juicer/Makefile5
-rw-r--r--audio/sound-juicer/distinfo6
-rw-r--r--audio/sound-juicer/pkg-plist3
-rw-r--r--databases/evolution-data-server/Makefile24
-rw-r--r--databases/evolution-data-server/distinfo6
-rw-r--r--databases/evolution-data-server/files/patch-camel_providers_imapx_Makefile.in13
-rw-r--r--databases/evolution-data-server/files/patch-camel_providers_imapx_camel-imapx-tokens.txt8
-rw-r--r--databases/evolution-data-server/files/patch-configure15
-rw-r--r--databases/evolution-data-server/pkg-plist172
-rw-r--r--databases/libgda4/Makefile11
-rw-r--r--databases/libgda4/distinfo6
-rw-r--r--databases/libgda4/files/patch-libgda_Makefile.in12
-rw-r--r--databases/libgda4/pkg-plist2
-rw-r--r--deskutils/alacarte/Makefile5
-rw-r--r--deskutils/alacarte/distinfo6
-rw-r--r--deskutils/alacarte/pkg-plist2
-rw-r--r--deskutils/contacts/Makefile4
-rw-r--r--deskutils/deskbar-applet/Makefile5
-rw-r--r--deskutils/deskbar-applet/distinfo6
-rw-r--r--deskutils/deskbar-applet/pkg-plist3
-rw-r--r--deskutils/evolution-jescs/Makefile2
-rw-r--r--deskutils/fusenshi/files/patch-src_wnd_fusenshieditdialog.cpp16
-rw-r--r--deskutils/fusenshi/files/patch-src_wnd_propertydialog.cpp15
-rw-r--r--deskutils/glabels/Makefile7
-rw-r--r--deskutils/glabels/distinfo6
-rw-r--r--deskutils/glabels/pkg-plist146
-rw-r--r--deskutils/global-menu/Makefile4
-rw-r--r--deskutils/gnome-main-menu/Makefile5
-rw-r--r--deskutils/gnome-utils/Makefile6
-rw-r--r--deskutils/gnome-utils/distinfo6
-rw-r--r--deskutils/gnome-utils/pkg-plist26
-rw-r--r--deskutils/gnote/Makefile6
-rw-r--r--deskutils/gnote/distinfo6
-rw-r--r--deskutils/gnote/files/patch-libtomboy_tomboyutil.c14
-rw-r--r--deskutils/gnote/files/patch-src_debug.cpp2
-rw-r--r--deskutils/gnote/files/patch-src_noterenamedialog.cpp20
-rw-r--r--deskutils/gnote/files/patch-src_sharp_datetime.cpp26
-rw-r--r--deskutils/gnote/pkg-plist45
-rw-r--r--deskutils/gucharmap/Makefile5
-rw-r--r--deskutils/gucharmap/distinfo6
-rw-r--r--deskutils/gucharmap/pkg-plist3
-rw-r--r--deskutils/hamster-applet/Makefile8
-rw-r--r--deskutils/hamster-applet/distinfo6
-rw-r--r--deskutils/hamster-applet/files/patch-hamster_hamster-applet.py23
-rw-r--r--deskutils/hamster-applet/files/patch-src_hamster-applet.py22
-rw-r--r--deskutils/hamster-applet/pkg-plist136
-rw-r--r--deskutils/labyrinth/Makefile2
-rw-r--r--deskutils/nautilus-actions/Makefile18
-rw-r--r--deskutils/nautilus-actions/distinfo6
-rw-r--r--deskutils/nautilus-actions/files/extra-patch-configure8
-rw-r--r--deskutils/nautilus-actions/pkg-plist53
-rw-r--r--deskutils/nautilus-sendto/Makefile28
-rw-r--r--deskutils/nautilus-sendto/distinfo6
-rw-r--r--deskutils/nautilus-sendto/pkg-plist25
-rw-r--r--deskutils/osmo/Makefile4
-rw-r--r--devel/ORBit2/Makefile4
-rw-r--r--devel/ORBit2/distinfo6
-rw-r--r--devel/anjuta-extras/Makefile5
-rw-r--r--devel/anjuta-extras/distinfo6
-rw-r--r--devel/anjuta-extras/pkg-plist23
-rw-r--r--devel/anjuta/Makefile9
-rw-r--r--devel/anjuta/distinfo6
-rw-r--r--devel/anjuta/files/patch-Makefile.in6
-rw-r--r--devel/anjuta/files/patch-plugins_symbol-db_plugin.c11
-rw-r--r--devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h11
-rw-r--r--devel/anjuta/pkg-plist232
-rw-r--r--devel/bug-buddy/Makefile7
-rw-r--r--devel/bug-buddy/distinfo6
-rw-r--r--devel/bug-buddy/pkg-plist2
-rw-r--r--devel/dbus-glib/Makefile2
-rw-r--r--devel/dbus-glib/distinfo6
-rw-r--r--devel/dbus-glib/pkg-plist1
-rw-r--r--devel/dbus/Makefile4
-rw-r--r--devel/dbus/distinfo6
-rw-r--r--devel/dbus/files/patch-bus_dir-watch-kqueue.c11
-rw-r--r--devel/dbus/files/patch-dbus_dbus-connection.c67
-rw-r--r--devel/devhelp/Makefile5
-rw-r--r--devel/devhelp/distinfo6
-rw-r--r--devel/devhelp/pkg-plist13
-rw-r--r--devel/gconf2/Makefile6
-rw-r--r--devel/gconf2/distinfo6
-rw-r--r--devel/gconf2/pkg-plist6
-rw-r--r--devel/gio-fam-backend/Makefile5
-rw-r--r--devel/gio-fam-backend/distinfo6
-rw-r--r--devel/gio-fam-backend/files/patch-ae30
-rw-r--r--devel/gio-fam-backend/files/patch-gio_fam_Makefile.in19
-rw-r--r--devel/gio-fam-backend/pkg-plist2
-rw-r--r--devel/gir-repository/Makefile10
-rw-r--r--devel/gir-repository/bsd.gir.mk74
-rw-r--r--devel/gir-repository/files/patch-gir_Makefile.in13
-rw-r--r--devel/glib20/Makefile7
-rw-r--r--devel/glib20/distinfo6
-rw-r--r--devel/glib20/files/patch-ae37
-rw-r--r--devel/glib20/files/patch-gio_gunixvolume.c10
-rw-r--r--devel/glib20/pkg-plist24
-rw-r--r--devel/glibmm/Makefile4
-rw-r--r--devel/glibmm/distinfo6
-rw-r--r--devel/glibmm/pkg-plist40
-rw-r--r--devel/gnome-js-common/Makefile6
-rw-r--r--devel/gnome-js-common/distinfo6
-rw-r--r--devel/gnome-vfs/Makefile6
-rw-r--r--devel/gnome-vfs/distinfo6
-rw-r--r--devel/gnome-vfs/pkg-deinstall.in2
-rw-r--r--devel/gnome-vfs/pkg-install.in2
-rw-r--r--devel/gnome-vfs/pkg-plist3
-rw-r--r--devel/gnome2-hacker-tools/Makefile2
-rw-r--r--devel/gob2/Makefile2
-rw-r--r--devel/gob2/distinfo6
-rw-r--r--devel/gob2/files/patch-src_out.c16
-rw-r--r--devel/gobject-introspection/Makefile7
-rw-r--r--devel/gobject-introspection/distinfo6
-rw-r--r--devel/gobject-introspection/files/patch-200912072632
-rw-r--r--devel/gobject-introspection/files/patch-2010010766
-rw-r--r--devel/gobject-introspection/files/patch-gir_Makefile.in7
-rw-r--r--devel/gobject-introspection/files/patch-girepository_girnode.c12
-rw-r--r--devel/gobject-introspection/pkg-plist6
-rw-r--r--devel/gvfs/Makefile5
-rw-r--r--devel/gvfs/distinfo6
-rw-r--r--devel/gvfs/files/patch-configure27
-rw-r--r--devel/gvfs/pkg-plist10
-rw-r--r--devel/json-glib/Makefile4
-rw-r--r--devel/json-glib/distinfo6
-rw-r--r--devel/libIDL/Makefile4
-rw-r--r--devel/libIDL/distinfo6
-rw-r--r--devel/libbonobo/Makefile4
-rw-r--r--devel/libbonobo/distinfo6
-rw-r--r--devel/libbonobo/pkg-plist6
-rw-r--r--devel/libgdata/Makefile14
-rw-r--r--devel/libgdata/distinfo6
-rw-r--r--devel/libgdata/pkg-descr4
-rw-r--r--devel/libgdata/pkg-plist21
-rw-r--r--devel/libgsf-gnome/Makefile4
-rw-r--r--devel/libgsf/Makefile6
-rw-r--r--devel/libgsf/distinfo6
-rw-r--r--devel/libgsf/pkg-plist2
-rw-r--r--devel/libgtop/Makefile6
-rw-r--r--devel/libgtop/distinfo6
-rw-r--r--devel/libgtop/files/patch-sysdeps_freebsd_procwd.c38
-rw-r--r--devel/libgtop/pkg-plist6
-rw-r--r--devel/liboobs/Makefile19
-rw-r--r--devel/liboobs/distinfo6
-rw-r--r--devel/liboobs/files/patch-src_oobs-group.c27
-rw-r--r--devel/liboobs/files/patch-src_oobs-user.c42
-rw-r--r--devel/liboobs/pkg-plist48
-rw-r--r--devel/libsigc++20/Makefile4
-rw-r--r--devel/libsigc++20/distinfo6
-rw-r--r--devel/libsigc++20/pkg-plist327
-rw-r--r--devel/libsoup/Makefile10
-rw-r--r--devel/libsoup/distinfo6
-rw-r--r--devel/libsoup/pkg-plist1
-rw-r--r--devel/mm-common/Makefile4
-rw-r--r--devel/mm-common/distinfo6
-rw-r--r--devel/mm-common/pkg-plist54
-rw-r--r--devel/py-dbus/Makefile5
-rw-r--r--devel/py-dbus/distinfo6
-rw-r--r--devel/py-gobject/Makefile6
-rw-r--r--devel/py-gobject/distinfo6
-rw-r--r--devel/py-gobject/pkg-plist34
-rw-r--r--devel/seed/Makefile33
-rw-r--r--devel/seed/distinfo6
-rw-r--r--devel/seed/files/Seed.js203
-rw-r--r--devel/seed/files/patch-libseed_seed-importer.c12
-rw-r--r--devel/seed/files/patch-modules_gettext_seed-gettext.c6
-rw-r--r--devel/seed/files/patch-modules_os_seed-os.c8
-rw-r--r--devel/seed/pkg-plist82
-rw-r--r--editors/gedit-plugins/Makefile14
-rw-r--r--editors/gedit-plugins/distinfo6
-rw-r--r--editors/gedit-plugins/pkg-plist127
-rw-r--r--editors/gedit/Makefile8
-rw-r--r--editors/gedit/distinfo6
-rw-r--r--editors/gedit/pkg-plist63
-rw-r--r--editors/gnome2-office/Makefile2
-rw-r--r--finance/gnucash/Makefile4
-rw-r--r--ftp/gwget/Makefile4
-rw-r--r--ftp/gwget/files/patch-configure24
-rw-r--r--games/gcompris/Makefile3
-rw-r--r--games/gcompris/pkg-plist1
-rw-r--r--games/gnome-games-extra-data/Makefile7
-rw-r--r--games/gnome-games-extra-data/distinfo6
-rw-r--r--games/gnome-games-extra-data/pkg-plist11
-rw-r--r--games/gnome-games/Makefile39
-rw-r--r--games/gnome-games/distinfo6
-rw-r--r--games/gnome-games/files/patch-blackjack_src_game.cpp10
-rw-r--r--games/gnome-games/files/patch-blackjack_src_player.cpp75
-rw-r--r--games/gnome-games/pkg-install8
-rw-r--r--games/gnome-games/pkg-plist1184
-rw-r--r--graphics/cairo/Makefile4
-rw-r--r--graphics/cairo/distinfo6
-rw-r--r--graphics/clutter-gtk/Makefile6
-rw-r--r--graphics/clutter-gtk/distinfo6
-rw-r--r--graphics/clutter/Makefile8
-rw-r--r--graphics/clutter/distinfo6
-rw-r--r--graphics/clutter/pkg-plist44
-rw-r--r--graphics/eog-plugins/Makefile6
-rw-r--r--graphics/eog-plugins/distinfo6
-rw-r--r--graphics/eog-plugins/pkg-plist17
-rw-r--r--graphics/eog/Makefile5
-rw-r--r--graphics/eog/distinfo6
-rw-r--r--graphics/eog/pkg-plist27
-rw-r--r--graphics/evince/Makefile8
-rw-r--r--graphics/evince/distinfo6
-rw-r--r--graphics/evince/pkg-plist282
-rw-r--r--graphics/libart_lgpl/Makefile2
-rw-r--r--graphics/libart_lgpl/distinfo6
-rw-r--r--graphics/libchamplain/Makefile17
-rw-r--r--graphics/libchamplain/distinfo6
-rw-r--r--graphics/libgnomecanvas/Makefile7
-rw-r--r--graphics/libgnomecanvas/distinfo6
-rw-r--r--graphics/libgnomecanvas/pkg-plist10
-rw-r--r--graphics/librsvg2/Makefile41
-rw-r--r--graphics/librsvg2/distinfo6
-rw-r--r--graphics/librsvg2/files/patch-moz-plugin_Makefile.in11
-rw-r--r--graphics/librsvg2/pkg-plist4
-rw-r--r--graphics/poppler-gtk/Makefile4
-rw-r--r--graphics/poppler-qt/Makefile4
-rw-r--r--graphics/poppler-qt4/Makefile4
-rw-r--r--graphics/poppler/Makefile6
-rw-r--r--graphics/poppler/distinfo6
-rw-r--r--graphics/py-clutter-gtk/Makefile8
-rw-r--r--graphics/py-clutter-gtk/distinfo6
-rw-r--r--graphics/py-clutter-gtk/pkg-plist2
-rw-r--r--graphics/py-clutter/Makefile4
-rw-r--r--graphics/py-clutter/files/patch-clutter_cluttermodule.c33
-rw-r--r--graphics/solang/Makefile2
-rw-r--r--graphics/solang/pkg-plist1
-rw-r--r--irc/xchat-gnome/Makefile3
-rw-r--r--irc/xchat/Makefile6
-rw-r--r--lang/gjs/Makefile5
-rw-r--r--lang/gjs/distinfo6
-rw-r--r--lang/gjs/pkg-plist7
-rw-r--r--lang/vala/Makefile5
-rw-r--r--lang/vala/distinfo6
-rw-r--r--lang/vala/pkg-plist22
-rw-r--r--mail/contact-lookup-applet/Makefile5
-rw-r--r--mail/evolution-exchange/Makefile22
-rw-r--r--mail/evolution-exchange/distinfo6
-rw-r--r--mail/evolution-exchange/files/patch-eplugin_exchange-operations.c24
-rw-r--r--mail/evolution-exchange/pkg-plist141
-rw-r--r--mail/evolution-mapi/Makefile7
-rw-r--r--mail/evolution-mapi/distinfo6
-rw-r--r--mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c24
-rw-r--r--mail/evolution-mapi/pkg-plist49
-rw-r--r--mail/evolution/Makefile59
-rw-r--r--mail/evolution/distinfo6
-rw-r--r--mail/evolution/files/fix-plugins.sh49
-rw-r--r--mail/evolution/files/patch-aa45
-rw-r--r--mail/evolution/files/patch-mail_em-migrate.c11
-rw-r--r--mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c19
-rw-r--r--mail/evolution/files/patch-plugins_exchange-operations_Makefile.in10
-rw-r--r--mail/evolution/pkg-plist564
-rw-r--r--math/gcalctool/Makefile6
-rw-r--r--math/gcalctool/distinfo6
-rw-r--r--math/gcalctool/files/patch-src_gcalccmd.c92
-rw-r--r--math/gcalctool/pkg-descr6
-rw-r--r--math/gcalctool/pkg-plist707
-rw-r--r--misc/Makefile1
-rw-r--r--misc/bigboard/Makefile2
-rw-r--r--misc/gnome-devel-docs/Makefile4
-rw-r--r--misc/gnome-devel-docs/distinfo6
-rw-r--r--misc/gnome-devel-docs/pkg-plist84
-rw-r--r--misc/gnome-icon-theme-extras/Makefile30
-rw-r--r--misc/gnome-icon-theme-extras/distinfo3
-rw-r--r--misc/gnome-icon-theme-extras/pkg-descr2
-rw-r--r--misc/gnome-icon-theme-extras/pkg-plist110
-rw-r--r--misc/gnome-icon-theme/Makefile16
-rw-r--r--misc/gnome-icon-theme/distinfo6
-rw-r--r--misc/gnome-icon-theme/pkg-plist4259
-rw-r--r--misc/gnome-user-docs/Makefile4
-rw-r--r--misc/gnome-user-docs/distinfo6
-rw-r--r--misc/gnome-user-docs/pkg-plist122
-rw-r--r--misc/uf-view/Makefile2
-rw-r--r--misc/xiphos/Makefile1
-rw-r--r--multimedia/Makefile1
-rw-r--r--multimedia/cheese/Makefile12
-rw-r--r--multimedia/cheese/distinfo6
-rw-r--r--multimedia/cheese/files/patch-configure225
-rw-r--r--multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c436
-rw-r--r--multimedia/cheese/files/patch-src_cheese-webcam.c40
-rw-r--r--multimedia/cheese/pkg-plist60
-rw-r--r--multimedia/clutter-gst/Makefile5
-rw-r--r--multimedia/clutter-gst/distinfo6
-rw-r--r--multimedia/clutter-gst/pkg-plist14
-rw-r--r--multimedia/gmerlin/Makefile1
-rw-r--r--multimedia/gxmms/Makefile4
-rw-r--r--multimedia/swfdec-gnome/Makefile5
-rw-r--r--multimedia/swfdec-gnome/distinfo6
-rw-r--r--multimedia/swfdec-gnome/pkg-plist8
-rw-r--r--multimedia/totem-pl-parser/Makefile7
-rw-r--r--multimedia/totem-pl-parser/distinfo6
-rw-r--r--multimedia/totem-pl-parser/pkg-plist16
-rw-r--r--multimedia/totem-xine/Makefile21
-rw-r--r--multimedia/totem/Makefile35
-rw-r--r--multimedia/totem/distinfo6
-rw-r--r--multimedia/totem/pkg-plist69
-rw-r--r--net-im/empathy/Makefile27
-rw-r--r--net-im/empathy/distinfo6
-rw-r--r--net-im/empathy/files/patch-configure11
-rw-r--r--net-im/empathy/pkg-plist404
-rw-r--r--net-im/gnomeicu/Makefile4
-rw-r--r--net-im/gossip/Makefile5
-rw-r--r--net-im/libpurple/Makefile16
-rw-r--r--net-im/telepathy-mission-control/Makefile8
-rw-r--r--net-im/telepathy-mission-control/distinfo6
-rw-r--r--net-p2p/museekplus/files/patch-Tools_SConscript13
-rw-r--r--net/desktop-data-model/Makefile2
-rw-r--r--net/gnome-netstatus/Makefile5
-rw-r--r--net/gnome-netstatus/distinfo6
-rw-r--r--net/gnome-netstatus/pkg-plist10
-rw-r--r--net/gnome-nettool/Makefile5
-rw-r--r--net/gnome-nettool/distinfo6
-rw-r--r--net/gnome-nettool/pkg-plist3
-rw-r--r--net/libgweather/Makefile9
-rw-r--r--net/libgweather/distinfo6
-rw-r--r--net/libgweather/pkg-plist366
-rw-r--r--net/link-monitor-applet/Makefile4
-rw-r--r--net/vinagre/Makefile5
-rw-r--r--net/vinagre/distinfo6
-rw-r--r--net/vinagre/files/patch-plugins_vnc_vinagre-vnc-listener-dialog.c11
-rw-r--r--net/vinagre/pkg-plist21
-rw-r--r--net/vino/Makefile5
-rw-r--r--net/vino/distinfo6
-rw-r--r--net/vino/files/patch-configure16
-rw-r--r--net/vino/pkg-plist5
-rw-r--r--palm/gnome-pilot/Makefile4
-rw-r--r--ports-mgmt/Makefile3
-rw-r--r--ports-mgmt/gnome-packagekit/Makefile50
-rw-r--r--ports-mgmt/gnome-packagekit/distinfo3
-rw-r--r--ports-mgmt/gnome-packagekit/files/patch-data_gnome-packagekit.schemas.in11
-rw-r--r--ports-mgmt/gnome-packagekit/pkg-descr4
-rw-r--r--ports-mgmt/gnome-packagekit/pkg-plist499
-rw-r--r--ports-mgmt/packagekit-qt4/Makefile20
-rw-r--r--ports-mgmt/packagekit-qt4/pkg-plist15
-rw-r--r--ports-mgmt/packagekit/Makefile127
-rw-r--r--ports-mgmt/packagekit/distinfo3
-rw-r--r--ports-mgmt/packagekit/files/patch-etc_Vendor.conf11
-rw-r--r--ports-mgmt/packagekit/files/patch-src_pk-backend-spawn.c11
-rw-r--r--ports-mgmt/packagekit/files/patch-src_pk-lsof.c11
-rw-r--r--ports-mgmt/packagekit/pkg-descr4
-rw-r--r--ports-mgmt/packagekit/pkg-plist455
-rw-r--r--print/Makefile1
-rw-r--r--print/cups-pk-helper/Makefile25
-rw-r--r--print/cups-pk-helper/distinfo3
-rw-r--r--print/cups-pk-helper/pkg-descr4
-rw-r--r--print/cups-pk-helper/pkg-plist4
-rw-r--r--print/freetype2/Makefile10
-rw-r--r--print/freetype2/distinfo6
-rw-r--r--print/freetype2/files/patch-builds::unix::freetype-config.in16
-rw-r--r--print/libgnomeprint/Makefile5
-rw-r--r--print/libgnomeprint/distinfo6
-rw-r--r--print/libgnomeprint/pkg-plist20
-rw-r--r--print/libspectre/Makefile17
-rw-r--r--print/libspectre/distinfo6
-rw-r--r--print/py-cups/Makefile4
-rw-r--r--print/py-cups/distinfo6
-rw-r--r--print/system-config-printer/Makefile13
-rw-r--r--print/system-config-printer/distinfo6
-rw-r--r--print/system-config-printer/files/patch-applet.py17
-rw-r--r--print/system-config-printer/files/patch-cupshelpers_cupshelpers.py16
-rw-r--r--print/system-config-printer/files/patch-pysmb.py19
-rw-r--r--print/system-config-printer/files/patch-system-config-printer.py40
-rw-r--r--print/system-config-printer/pkg-plist58
-rw-r--r--science/gerris/files/patch-src_dx.c18
-rw-r--r--security/Makefile1
-rw-r--r--security/gnome-keyring/Makefile8
-rw-r--r--security/gnome-keyring/distinfo6
-rw-r--r--security/gnome-keyring/files/patch-daemon_control_gkd-control-client.c11
-rw-r--r--security/gnome-keyring/files/patch-daemon_keyrings_gkr-keyrings.c10
-rw-r--r--security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c11
-rw-r--r--security/gnome-keyring/files/patch-egg_egg-unix-credentials.c44
-rw-r--r--security/gnome-keyring/pkg-plist90
-rw-r--r--security/libgnome-keyring/Makefile28
-rw-r--r--security/libgnome-keyring/distinfo3
-rw-r--r--security/libgnome-keyring/pkg-descr3
-rw-r--r--security/libgnome-keyring/pkg-plist88
-rw-r--r--security/seahorse-plugins/Makefile28
-rw-r--r--security/seahorse-plugins/distinfo6
-rw-r--r--security/seahorse-plugins/pkg-plist21
-rw-r--r--security/seahorse/Makefile8
-rw-r--r--security/seahorse/distinfo6
-rw-r--r--security/seahorse/files/patch-daemon_seahorse-hkp-server.c13
-rw-r--r--security/seahorse/files/patch-pgp_seahorse-gpgme-source.c10
-rw-r--r--security/seahorse/files/patch-ssh_seahorse-ssh-operation.c19
-rw-r--r--security/seahorse/pkg-plist9
-rw-r--r--security/tuntun/Makefile5
-rw-r--r--sysutils/Makefile1
-rw-r--r--sysutils/brasero/Makefile12
-rw-r--r--sysutils/brasero/distinfo6
-rw-r--r--sysutils/brasero/files/patch-libbrasero-burn_burn-process.c10
-rw-r--r--sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c27
-rw-r--r--sysutils/brasero/pkg-plist30
-rw-r--r--sysutils/bubblemon2/Makefile4
-rw-r--r--sysutils/gconf-editor/Makefile5
-rw-r--r--sysutils/gconf-editor/distinfo6
-rw-r--r--sysutils/gconf-editor/pkg-plist3
-rw-r--r--sysutils/gnome-control-center/Makefile5
-rw-r--r--sysutils/gnome-control-center/distinfo6
-rw-r--r--sysutils/gnome-control-center/files/patch-configure12
-rw-r--r--sysutils/gnome-control-center/pkg-plist39
-rw-r--r--sysutils/gnome-power-manager/Makefile21
-rw-r--r--sysutils/gnome-power-manager/distinfo6
-rw-r--r--sysutils/gnome-power-manager/files/patch-applets_brightness_Makefile.in10
-rw-r--r--sysutils/gnome-power-manager/files/patch-applets_inhibit_Makefile.in10
-rw-r--r--sysutils/gnome-power-manager/files/patch-configure25
-rw-r--r--sysutils/gnome-power-manager/files/patch-libhal-glib_libhal-gdevice.c11
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_Makefile.in62
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_gpm-array-float.h14
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_gpm-button.c37
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c12
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_gpm-dpms.c11
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_gpm-load.c15
-rw-r--r--sysutils/gnome-power-manager/pkg-descr4
-rw-r--r--sysutils/gnome-power-manager/pkg-plist396
-rw-r--r--sysutils/gnome-settings-daemon/Makefile5
-rw-r--r--sysutils/gnome-settings-daemon/distinfo6
-rw-r--r--sysutils/gnome-settings-daemon/files/patch-plugins_housekeeping_gsd-disk-space.c10
-rw-r--r--sysutils/gnome-settings-daemon/pkg-plist20
-rw-r--r--sysutils/gnome-system-monitor/Makefile5
-rw-r--r--sysutils/gnome-system-monitor/distinfo6
-rw-r--r--sysutils/gnome-system-monitor/pkg-plist23
-rw-r--r--sysutils/gnome-system-tools/Makefile5
-rw-r--r--sysutils/gnome-system-tools/distinfo6
-rw-r--r--sysutils/gnome-system-tools/files/patch-src_users_user-settings.c44
-rw-r--r--sysutils/gnome-system-tools/pkg-plist8
-rw-r--r--sysutils/hal-info/Makefile5
-rw-r--r--sysutils/hal-info/distinfo6
-rw-r--r--sysutils/hal-info/files/patch-configure123
-rw-r--r--sysutils/hal-info/pkg-plist7
-rw-r--r--sysutils/hal/Makefile7
-rw-r--r--sysutils/hal/distinfo6
-rw-r--r--sysutils/hal/files/hald.in4
-rw-r--r--sysutils/hal/files/patch-Makefile.in30
-rw-r--r--sysutils/hal/files/patch-config.h.in12
-rw-r--r--sysutils/hal/files/patch-configure398
-rw-r--r--sysutils/hal/files/patch-configure.in64
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_Makefile.am14
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_Makefile.in109
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_addons_Makefile.in93
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_addons_addon-mouse.c374
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c388
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_clock111
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-acpi.c90
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-computer.c26
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-devd.c56
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-devtree.c77
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-scsi.c11
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-storage.h13
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-usb.c188
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-usb.h10
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-usb2.c396
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-usb2.h40
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-volume.c113
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_osspec.c32
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am74
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in636
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-hiddev.c37
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-mouse.c315
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c39
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-device.c211
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c155
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c228
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c93
-rw-r--r--sysutils/hal/files/patch-hald_hf-storage.c242
-rw-r--r--sysutils/hal/pkg-plist9
-rw-r--r--sysutils/pessulus/Makefile5
-rw-r--r--sysutils/pessulus/distinfo6
-rw-r--r--sysutils/pessulus/pkg-plist8
-rw-r--r--sysutils/polkit-gnome/Makefile6
-rw-r--r--sysutils/polkit-gnome/pkg-plist24
-rw-r--r--sysutils/sensors-applet/Makefile4
-rw-r--r--sysutils/system-tools-backends/Makefile5
-rw-r--r--sysutils/system-tools-backends/distinfo6
-rw-r--r--sysutils/system-tools-backends/files/patch-Users_Users.pm366
-rw-r--r--sysutils/system-tools-backends/files/patch-Utils_Platform.pm18
-rw-r--r--sysutils/system-tools-backends/pkg-plist37
-rw-r--r--sysutils/tracker-client/Makefile6
-rw-r--r--sysutils/tracker-client/pkg-plist12
-rw-r--r--sysutils/upower/Makefile48
-rw-r--r--sysutils/upower/distinfo3
-rw-r--r--sysutils/upower/files/patch-src_freebsd_up-backend.c19
-rw-r--r--sysutils/upower/files/patch-src_up-daemon.c20
-rw-r--r--sysutils/upower/files/patch-src_up-polkit.c20
-rw-r--r--sysutils/upower/pkg-descr6
-rw-r--r--sysutils/upower/pkg-plist55
-rw-r--r--textproc/Makefile1
-rw-r--r--textproc/gnome-doc-utils/Makefile4
-rw-r--r--textproc/gnome-doc-utils/distinfo6
-rw-r--r--textproc/gnome-doc-utils/files/patch-configure10
-rw-r--r--textproc/gnome-doc-utils/pkg-plist189
-rw-r--r--textproc/gtk-doc/Makefile4
-rw-r--r--textproc/gtk-doc/distinfo6
-rw-r--r--textproc/gtk-doc/pkg-plist15
-rw-r--r--textproc/libxml++26-reference/Makefile24
-rw-r--r--textproc/libxml++26-reference/pkg-descr3
-rw-r--r--textproc/libxml++26-reference/pkg-plist4
-rw-r--r--textproc/libxml++26/Makefile28
-rw-r--r--textproc/libxml++26/distinfo6
-rw-r--r--textproc/libxml++26/pkg-plist308
-rw-r--r--textproc/libxml2/Makefile4
-rw-r--r--textproc/libxml2/distinfo6
-rw-r--r--textproc/libxml2/files/patch-aa16
-rw-r--r--textproc/libxml2/files/patch-configure17
-rw-r--r--textproc/libxml2/files/patch-xmlIO.c20
-rw-r--r--textproc/uim-gnome/Makefile3
-rw-r--r--textproc/uim/Makefile2
-rw-r--r--www/Makefile1
-rw-r--r--www/epiphany-extensions/Makefile20
-rw-r--r--www/epiphany-extensions/distinfo6
-rw-r--r--www/epiphany-extensions/pkg-descr13
-rw-r--r--www/epiphany-extensions/pkg-plist43
-rw-r--r--www/epiphany/Makefile16
-rw-r--r--www/epiphany/distinfo6
-rw-r--r--www/epiphany/files/patch-embed_ephy-embed-prefs.c15
-rw-r--r--www/epiphany/files/patch-embed_ephy-embed.c72
-rw-r--r--www/epiphany/pkg-plist21
-rw-r--r--www/evolution-webcal/Makefile5
-rw-r--r--www/evolution-webcal/distinfo6
-rw-r--r--www/evolution-webcal/pkg-plist9
-rw-r--r--www/gir-repository-webkit/Makefile16
-rw-r--r--www/gnome-user-share/Makefile9
-rw-r--r--www/gnome-user-share/distinfo6
-rw-r--r--www/gnome-user-share/files/patch-configure39
-rw-r--r--www/gnome-user-share/pkg-plist9
-rw-r--r--www/gtkhtml3/Makefile5
-rw-r--r--www/gtkhtml3/distinfo6
-rw-r--r--www/gtkhtml3/pkg-plist7
-rw-r--r--www/kazehakase/Makefile2
-rw-r--r--www/libepc/Makefile4
-rw-r--r--www/libepc/distinfo6
-rw-r--r--www/libepc/files/patch-configure20
-rw-r--r--www/libepc/pkg-plist28
-rw-r--r--www/midori/Makefile5
-rw-r--r--www/midori/distinfo6
-rw-r--r--www/midori/pkg-plist1
-rw-r--r--www/netsurf/Makefile1
-rw-r--r--www/osb-nrcit/Makefile1
-rw-r--r--www/webkit-gtk2/Makefile22
-rw-r--r--www/webkit-gtk2/distinfo6
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h14
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp20
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h65
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp11
-rw-r--r--www/webkit-gtk2/files/patch-JavaScriptCore-runtime_JSValue.h30
-rw-r--r--www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h11
-rw-r--r--www/webkit-gtk2/files/patch-add-gzip35
-rw-r--r--www/webkit-gtk2/files/patch-webkitnetworkresponse215
-rw-r--r--www/webkit-gtk2/pkg-plist92
-rw-r--r--x11-fm/gentoo/Makefile2
-rw-r--r--x11-fm/nautilus/Makefile15
-rw-r--r--x11-fm/nautilus/distinfo6
-rw-r--r--x11-fm/nautilus/pkg-plist3
-rw-r--r--x11-themes/gnome-backgrounds/Makefile4
-rw-r--r--x11-themes/gnome-backgrounds/distinfo6
-rw-r--r--x11-themes/gnome-backgrounds/pkg-plist6
-rw-r--r--x11-themes/gnome-themes/Makefile13
-rw-r--r--x11-themes/gnome-themes/distinfo6
-rw-r--r--x11-themes/gnome-themes/pkg-plist62
-rw-r--r--x11-themes/gtk-engines2/Makefile5
-rw-r--r--x11-themes/gtk-engines2/distinfo6
-rw-r--r--x11-themes/gtk-engines2/pkg-plist5
-rw-r--r--x11-toolkits/Makefile3
-rw-r--r--x11-toolkits/eel/Makefile4
-rw-r--r--x11-toolkits/eel/files/patch-eel_eel-background.c29
-rw-r--r--x11-toolkits/gai/Makefile4
-rw-r--r--x11-toolkits/gdl/Makefile5
-rw-r--r--x11-toolkits/gdl/distinfo6
-rw-r--r--x11-toolkits/gdl/pkg-plist6
-rw-r--r--x11-toolkits/gir-repository-gtk20/Makefile15
-rw-r--r--x11-toolkits/gir-repository-libwnck/Makefile15
-rw-r--r--x11-toolkits/gir-repository-pango/Makefile15
-rw-r--r--x11-toolkits/gnome-desktop-sharp20/Makefile2
-rw-r--r--x11-toolkits/gnome-sharp20/Makefile5
-rw-r--r--x11-toolkits/gtk-sharp10/Makefile4
-rw-r--r--x11-toolkits/gtk20/Makefile9
-rw-r--r--x11-toolkits/gtk20/distinfo6
-rw-r--r--x11-toolkits/gtk20/files/patch-ah6
-rw-r--r--x11-toolkits/gtk20/files/patch-configure14
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_Makefile.in9
-rw-r--r--x11-toolkits/gtk20/pkg-plist16
-rw-r--r--x11-toolkits/gtk30/Makefile9
-rw-r--r--x11-toolkits/gtk30/distinfo6
-rw-r--r--x11-toolkits/gtk30/files/patch-ah6
-rw-r--r--x11-toolkits/gtk30/files/patch-configure14
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_Makefile.in9
-rw-r--r--x11-toolkits/gtk30/pkg-plist16
-rw-r--r--x11-toolkits/gtkdatabox/Makefile2
-rw-r--r--x11-toolkits/gtkglext/Makefile7
-rw-r--r--x11-toolkits/gtkmm24/Makefile6
-rw-r--r--x11-toolkits/gtkmm24/distinfo6
-rw-r--r--x11-toolkits/gtkmm24/pkg-plist13
-rw-r--r--x11-toolkits/gtksourceview2/Makefile10
-rw-r--r--x11-toolkits/gtksourceview2/distinfo6
-rw-r--r--x11-toolkits/gtksourceview2/pkg-plist22
-rw-r--r--x11-toolkits/libbonoboui/Makefile6
-rw-r--r--x11-toolkits/libbonoboui/distinfo6
-rw-r--r--x11-toolkits/libbonoboui/pkg-plist6
-rw-r--r--x11-toolkits/libgail-gnome/Makefile7
-rw-r--r--x11-toolkits/libgail-gnome/distinfo6
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile5
-rw-r--r--x11-toolkits/libgnomeprintui/distinfo6
-rw-r--r--x11-toolkits/libgnomeprintui/pkg-plist19
-rw-r--r--x11-toolkits/libgnomeui/Makefile6
-rw-r--r--x11-toolkits/libgnomeui/distinfo6
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist6
-rw-r--r--x11-toolkits/libwnck/Makefile8
-rw-r--r--x11-toolkits/libwnck/distinfo6
-rw-r--r--x11-toolkits/libwnck/pkg-plist8
-rw-r--r--x11-toolkits/pango/Makefile12
-rw-r--r--x11-toolkits/pango/distinfo6
-rw-r--r--x11-toolkits/pango/files/patch-64bit_safe48
-rw-r--r--x11-toolkits/pango/pkg-plist8
-rw-r--r--x11-toolkits/pangomm/Makefile6
-rw-r--r--x11-toolkits/pangomm/distinfo6
-rw-r--r--x11-toolkits/py-gnome-desktop/Makefile10
-rw-r--r--x11-toolkits/py-gnome-desktop/distinfo6
-rw-r--r--x11-toolkits/py-gnome2/Makefile5
-rw-r--r--x11-toolkits/py-gnome2/distinfo6
-rw-r--r--x11-toolkits/py-gtk2/Makefile6
-rw-r--r--x11-toolkits/py-gtk2/distinfo6
-rw-r--r--x11-toolkits/py-gtk2/pkg-plist3
-rw-r--r--x11-toolkits/py-gtksourceview/Makefile9
-rw-r--r--x11-toolkits/py-gtksourceview/distinfo6
-rw-r--r--x11-toolkits/py-vte/Makefile2
-rw-r--r--x11-toolkits/unique/Makefile10
-rw-r--r--x11-toolkits/unique/distinfo6
-rw-r--r--x11-toolkits/unique/pkg-plist1
-rw-r--r--x11-toolkits/vte/Makefile6
-rw-r--r--x11-toolkits/vte/distinfo6
-rw-r--r--x11-toolkits/vte/files/patch-configure14
-rw-r--r--x11-toolkits/vte/pkg-plist3
-rw-r--r--x11-wm/compiz/Makefile2
-rw-r--r--x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c11
-rw-r--r--x11-wm/emerald/Makefile1
-rw-r--r--x11-wm/metacity/Makefile13
-rw-r--r--x11-wm/metacity/distinfo6
-rw-r--r--x11-wm/metacity/files/patch-configure8
-rw-r--r--x11-wm/mutter/Makefile14
-rw-r--r--x11-wm/mutter/distinfo6
-rw-r--r--x11-wm/mutter/files/patch-src_core_main.c14
-rw-r--r--x11-wm/mutter/pkg-plist7
-rw-r--r--x11/Makefile1
-rw-r--r--x11/avant-window-navigator-gnome/Makefile1
-rw-r--r--x11/avant-window-navigator/Makefile2
-rw-r--r--x11/gdm/Makefile10
-rw-r--r--x11/gdm/distinfo6
-rw-r--r--x11/gdm/files/gdm.in4
-rw-r--r--x11/gdm/files/gdm.pam.in2
-rw-r--r--x11/gdm/files/patch-common_gdm-address.c22
-rw-r--r--x11/gdm/files/patch-configure138
-rw-r--r--x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c100
-rw-r--r--x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c37
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-greeter-login-window.c155
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c30
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c28
-rw-r--r--x11/gdm/files/patch-gui_user-switch-applet_Makefile.in11
-rw-r--r--x11/gdm/files/patch-hal-keyboard104
-rw-r--r--x11/gdm/files/patch-hal-keyboard.240
-rw-r--r--x11/gdm/pkg-install6
-rw-r--r--x11/gdm/pkg-plist9
-rw-r--r--x11/gir-repository-gnome-menus/Makefile15
-rw-r--r--x11/gnome-applets/Makefile5
-rw-r--r--x11/gnome-applets/distinfo6
-rw-r--r--x11/gnome-applets/pkg-plist106
-rw-r--r--x11/gnome-desktop/Makefile6
-rw-r--r--x11/gnome-desktop/distinfo6
-rw-r--r--x11/gnome-desktop/pkg-plist5
-rw-r--r--x11/gnome-launch-box/Makefile2
-rw-r--r--x11/gnome-menus/Makefile6
-rw-r--r--x11/gnome-menus/distinfo6
-rw-r--r--x11/gnome-menus/pkg-plist9
-rw-r--r--x11/gnome-panel/Makefile9
-rw-r--r--x11/gnome-panel/distinfo6
-rw-r--r--x11/gnome-panel/files/patch-configure59
-rw-r--r--x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c59
-rw-r--r--x11/gnome-panel/pkg-plist24
-rw-r--r--x11/gnome-screensaver/Makefile5
-rw-r--r--x11/gnome-screensaver/distinfo6
-rw-r--r--x11/gnome-screensaver/pkg-plist3
-rw-r--r--x11/gnome-session/Makefile8
-rw-r--r--x11/gnome-session/distinfo6
-rw-r--r--x11/gnome-session/files/patch-configure85
-rw-r--r--x11/gnome-session/files/patch-configure.in18
-rw-r--r--x11/gnome-session/files/patch-gnome-session_Makefile.am21
-rw-r--r--x11/gnome-session/files/patch-gnome-session_Makefile.in35
-rw-r--r--x11/gnome-session/files/patch-gnome-session_gsm-logout-dialog.c66
-rw-r--r--x11/gnome-session/files/patch-gnome-session_gsm-manager.c150
-rw-r--r--x11/gnome-session/files/patch-gnome-session_gsm-power-manager.c483
-rw-r--r--x11/gnome-session/files/patch-gnome-session_gsm-power-manager.h90
-rw-r--r--x11/gnome-session/pkg-plist14
-rw-r--r--x11/gnome-shell/Makefile13
-rw-r--r--x11/gnome-shell/distinfo6
-rw-r--r--x11/gnome-shell/pkg-plist53
-rw-r--r--x11/gnome-swallow/Makefile4
-rw-r--r--x11/gnome-terminal/Makefile8
-rw-r--r--x11/gnome-terminal/distinfo6
-rw-r--r--x11/gnome-terminal/files/patch-src_terminal-screen.c2
-rw-r--r--x11/gnome-terminal/pkg-plist4
-rw-r--r--x11/gnome2-fifth-toe/Makefile2
-rw-r--r--x11/gnome2-lite/Makefile2
-rw-r--r--x11/gnome2-power-tools/Makefile4
-rw-r--r--x11/gnome2/Makefile14
-rw-r--r--x11/libgnome/Makefile6
-rw-r--r--x11/libgnome/distinfo6
-rw-r--r--x11/libgnome/files/pkg-deinstall.in2
-rw-r--r--x11/libgnome/pkg-plist6
-rw-r--r--x11/libgnomekbd/Makefile8
-rw-r--r--x11/libgnomekbd/distinfo6
-rw-r--r--x11/libgnomekbd/pkg-plist9
-rw-r--r--x11/libgnomemm26/Makefile5
-rw-r--r--x11/libgnomemm26/distinfo6
-rw-r--r--x11/libxklavier/Makefile5
-rw-r--r--x11/libxklavier/distinfo6
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c27
-rw-r--r--x11/lxpanel/Makefile2
-rw-r--r--x11/workrave/Makefile4
-rw-r--r--x11/yelp/Makefile5
-rw-r--r--x11/yelp/distinfo6
-rw-r--r--x11/yelp/pkg-plist3
-rw-r--r--x11/zenity/Makefile5
-rw-r--r--x11/zenity/distinfo6
-rw-r--r--x11/zenity/pkg-plist2
774 files changed, 13701 insertions, 16658 deletions
diff --git a/MOVED b/MOVED
index 1ea6d96c52ad..7e40ec2acca1 100644
--- a/MOVED
+++ b/MOVED
@@ -4384,3 +4384,10 @@ security/vpnd||2010-05-02|Has expired: This software is no longer developed
textproc/isearch||2010-05-02|Has expired: abandoned upstream, uses an obsolete version of GCC, not used by any other port
www/caudium12||2010-05-02|Has expired: No longer maintained upstream, please switch to www/caudium14
www/p5-Catalyst-Plugin-Cache-FileCache||2010-05-02|Has expired: Deprecated by module author in favor of www/p5-Catalyst-Plugin-Cache
+accessibility/gir-repository-atk|accessibility/atk|2010-05-10|Now installed by accessibility/atk
+multimedia/totem-xine|multimedia/totem|2010-05-10|Totem xine backend is dead for quite some time
+www/gir-repository-webkit|www/webkit-gtk2|2010-05-10|Now installed by www/webkit-gtk2
+x11-toolkits/gir-repository-gtk20|x11-toolkits/gtk20|2010-05-10|Now installed by x11-toolkits/gtk20
+x11-toolkits/gir-repository-libwnck|x11-toolkits/libwnck|2010-05-10|Now installed by x11-toolkits/libwnck
+x11-toolkits/gir-repository-pango|x11-toolkits/pango|2010-05-10|Now installed by x11-toolkits/pango
+x11/gir-repository-gnome-menus|x11/gnome-menus|2010-05-10|Now installed by x11/gnome-menus
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 492a34e67088..50055734875e 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -3,7 +3,7 @@
#
# $FreeBSD$
# $NetBSD: $
-# $MCom: ports/Mk/bsd.gnome.mk,v 1.486 2009/09/12 01:23:12 marcus Exp $
+# $MCom: ports/Mk/bsd.gnome.mk,v 1.490 2010/03/14 18:13:44 marcus Exp $
#
# Please view me with 4 column tabs!
@@ -358,7 +358,7 @@ libgtkhtml_LIB_DEPENDS= gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml
libgtkhtml_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc
libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2
-gnomedesktop_LIB_DEPENDS= gnome-desktop-2.11:${PORTSDIR}/x11/gnome-desktop
+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
@@ -390,7 +390,7 @@ eel2_USE_GNOME_IMPL= gnomedesktop
gnomepanel_LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnome-panel
gnomepanel_DETECT= ${LOCALBASE}/libdata/pkgconfig/libpanelapplet-2.0.pc
-gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils librsvg2 libgnomeui
+gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils librsvg2 libbonoboui
gnomepanel_GNOME_DESKTOP_VERSION=2
nautilus2_LIB_DEPENDS= nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus
@@ -468,7 +468,7 @@ intlhack_USE_GNOME_IMPL=intltool
gtkhtml3_LIB_DEPENDS= gtkhtml-3.14.19:${PORTSDIR}/www/gtkhtml3
gtkhtml3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-3.14.pc
-gtkhtml3_USE_GNOME_IMPL=libgnomeui
+gtkhtml3_USE_GNOME_IMPL=libglade2
gnomespeech_LIB_DEPENDS=gnomespeech.7:${PORTSDIR}/accessibility/gnome-speech
gnomespeech_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-speech-1.0.pc
@@ -476,7 +476,7 @@ gnomespeech_USE_GNOME_IMPL=libbonobo
evolutiondataserver_LIB_DEPENDS=edataserver-1.2.11:${PORTSDIR}/databases/evolution-data-server
evolutiondataserver_DETECT= ${LOCALBASE}/libdata/pkgconfig/evolution-data-server-1.2.pc
-evolutiondataserver_USE_GNOME_IMPL=libgnomeui
+evolutiondataserver_USE_GNOME_IMPL=gconf2 libxml2
desktopfileutils_BUILD_DEPENDS=update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
desktopfileutils_RUN_DEPENDS=update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
diff --git a/UPDATING b/UPDATING
index 04ef03caf3fa..d2e1561f459b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,23 @@ 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.
+201005010:
+ AFFECTS: users of security/gnome-keyring
+ AUTHOR: kwm@FreeBSD.org
+
+ libgnome-keyring was split out of the gnome-keyring package.
+ Do the following before doing your normal upgrade steps.
+
+ pkg_delete -f "gnome-keyring-*"
+
+ portmaster security/gnome-keyring
+
+ or
+
+ portupgrade -R -x gnome-keyring -x libgnome-keyring gnome-keyring
+ pkg_deinstall -fO gnome-keyring
+ portinstall security/gnome-keyring
+
20100506:
AFFECTS: users of mail/nullmailer on FreeBSD 6.x
AUTHOR: glarkin@FreeBSD.org
diff --git a/accessibility/Makefile b/accessibility/Makefile
index 93fa48510ee2..aa8e839667d5 100644
--- a/accessibility/Makefile
+++ b/accessibility/Makefile
@@ -7,11 +7,12 @@
SUBDIR += at-poke
SUBDIR += at-spi
SUBDIR += at-spi-reference
+ SUBDIR += at-spi2-core
+ SUBDIR += at-spi2-atk
SUBDIR += atk
SUBDIR += atk-reference
SUBDIR += dasher
SUBDIR += eflite
- SUBDIR += gir-repository-atk
SUBDIR += gnome-mag
SUBDIR += gnome-speech
SUBDIR += gnopernicus
@@ -24,6 +25,7 @@
SUBDIR += linux-f8-atk
SUBDIR += mousetweaks
SUBDIR += orca
+ SUBDIR += py-atspi
SUBDIR += py-papi
SUBDIR += qt4-accessible
SUBDIR += ruby-atk
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index 58ffe6d423c7..7b7c61e390eb 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/accerciser/Makefile,v 1.33 2009/09/22 05:13:26 avl Exp $
+# $MCom: ports/accessibility/accerciser/Makefile,v 1.36 2010/04/27 21:38:19 kwm Exp $
#
PORTNAME= accerciser
-PORTVERSION= 1.8.0
-PORTREVISION= 2
+PORTVERSION= 1.10.1
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/accerciser/distinfo b/accessibility/accerciser/distinfo
index edee6d31dd74..607f178c4083 100644
--- a/accessibility/accerciser/distinfo
+++ b/accessibility/accerciser/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/accerciser-1.8.0.tar.bz2) = ede1d36e9820fa441bcc24cb634d59cc
-SHA256 (gnome2/accerciser-1.8.0.tar.bz2) = 27fcd0e8c5d40f70e00b38bb8f2223b5fb7ef3708075f96d0d051991c259832a
-SIZE (gnome2/accerciser-1.8.0.tar.bz2) = 1508187
+MD5 (gnome2/accerciser-1.10.1.tar.bz2) = 15b14e77108c2fc9ffbef59e9d6cb5b7
+SHA256 (gnome2/accerciser-1.10.1.tar.bz2) = c6e6ac40a8a119d7f071fa5e7e6086f5dc8b6f407921b3938b2cc2115ea1a6a4
+SIZE (gnome2/accerciser-1.10.1.tar.bz2) = 1536982
diff --git a/accessibility/accerciser/pkg-plist b/accessibility/accerciser/pkg-plist
index 44a4a663520f..bbef2642dc5c 100644
--- a/accessibility/accerciser/pkg-plist
+++ b/accessibility/accerciser/pkg-plist
@@ -229,6 +229,12 @@ share/gnome/help/accerciser/uk/figures/api_browser.png
share/gnome/help/accerciser/uk/figures/event_monitor.png
share/gnome/help/accerciser/uk/figures/interface_viewer.png
share/gnome/help/accerciser/uk/figures/script_recorder.png
+share/gnome/help/accerciser/zh_CN/accerciser.xml
+share/gnome/help/accerciser/zh_CN/figures/accerciser.png
+share/gnome/help/accerciser/zh_CN/figures/api_browser.png
+share/gnome/help/accerciser/zh_CN/figures/event_monitor.png
+share/gnome/help/accerciser/zh_CN/figures/interface_viewer.png
+share/gnome/help/accerciser/zh_CN/figures/script_recorder.png
share/icons/hicolor/16x16/apps/accerciser.png
share/icons/hicolor/22x22/apps/accerciser.png
share/icons/hicolor/32x32/apps/accerciser.png
@@ -236,6 +242,7 @@ share/icons/hicolor/48x48/apps/accerciser.png
share/icons/hicolor/scalable/apps/accerciser.svg
share/locale/ar/LC_MESSAGES/accerciser.mo
share/locale/bg/LC_MESSAGES/accerciser.mo
+share/locale/br/LC_MESSAGES/accerciser.mo
share/locale/bn/LC_MESSAGES/accerciser.mo
share/locale/bn_IN/LC_MESSAGES/accerciser.mo
share/locale/ca/LC_MESSAGES/accerciser.mo
@@ -245,6 +252,7 @@ share/locale/da/LC_MESSAGES/accerciser.mo
share/locale/de/LC_MESSAGES/accerciser.mo
share/locale/dz/LC_MESSAGES/accerciser.mo
share/locale/el/LC_MESSAGES/accerciser.mo
+share/locale/en@shaw/LC_MESSAGES/accerciser.mo
share/locale/en_CA/LC_MESSAGES/accerciser.mo
share/locale/en_GB/LC_MESSAGES/accerciser.mo
share/locale/es/LC_MESSAGES/accerciser.mo
@@ -257,6 +265,7 @@ share/locale/gu/LC_MESSAGES/accerciser.mo
share/locale/he/LC_MESSAGES/accerciser.mo
share/locale/hi/LC_MESSAGES/accerciser.mo
share/locale/hu/LC_MESSAGES/accerciser.mo
+share/locale/id/LC_MESSAGES/accerciser.mo
share/locale/it/LC_MESSAGES/accerciser.mo
share/locale/ja/LC_MESSAGES/accerciser.mo
share/locale/kn/LC_MESSAGES/accerciser.mo
@@ -301,7 +310,10 @@ share/omf/accerciser/accerciser-oc.omf
share/omf/accerciser/accerciser-pt_BR.omf
share/omf/accerciser/accerciser-sv.omf
share/omf/accerciser/accerciser-uk.omf
+share/omf/accerciser/accerciser-zh_CN.omf
@dirrm share/omf/accerciser
+@dirrm share/gnome/help/accerciser/zh_CN/figures
+@dirrm share/gnome/help/accerciser/zh_CN
@dirrm share/gnome/help/accerciser/uk/figures
@dirrm share/gnome/help/accerciser/uk
@dirrm share/gnome/help/accerciser/sv/figures
@@ -351,6 +363,8 @@ share/omf/accerciser/accerciser-uk.omf
@dirrmtry share/locale/mai
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index af09daef0123..597b629b389a 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/at-spi/Makefile,v 1.89 2009/10/19 07:50:44 avl Exp $
+# $MCom: ports/accessibility/at-spi/Makefile,v 1.99 2010/04/26 11:38:24 kwm Exp $
#
PORTNAME= at-spi
-PORTVERSION= 1.28.1
-PORTREVISION?= 2
+PORTVERSION= 1.30.1
+PORTREVISION?= 0
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack gnomehier intlhack gtk20 libbonobo
+USE_GNOME= gnomehack gnomehier intlhack gtk20 gconf2 libbonobo
USE_XORG= x11 xtst
USE_PYTHON= yes
USE_LDCONFIG= yes
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
index eea948f939b3..5417c1352aa7 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/at-spi-1.28.1.tar.bz2) = ff29958339cbff5a0e0f34e4761e7633
-SHA256 (gnome2/at-spi-1.28.1.tar.bz2) = b776a85290dcfd485f0307c8fcc71a74a07874e5edbf7bba31d599e6dab3d2be
-SIZE (gnome2/at-spi-1.28.1.tar.bz2) = 843057
+MD5 (gnome2/at-spi-1.30.1.tar.bz2) = 29fdf7934e98efda5fe0ab74ab4d3f29
+SHA256 (gnome2/at-spi-1.30.1.tar.bz2) = 8dbe3f3b6028f01afd841859e49c0bf159a1ccca1f90be2647365062c5d0346d
+SIZE (gnome2/at-spi-1.30.1.tar.bz2) = 836847
diff --git a/accessibility/at-spi/files/patch-registryd_registry-main.c b/accessibility/at-spi/files/patch-registryd_registry-main.c
new file mode 100644
index 000000000000..ac903d9f4e22
--- /dev/null
+++ b/accessibility/at-spi/files/patch-registryd_registry-main.c
@@ -0,0 +1,10 @@
+--- registryd/registry-main.c.orig 2010-02-27 00:19:33.000000000 -0500
++++ registryd/registry-main.c 2010-02-27 00:21:10.000000000 -0500
+@@ -198,6 +198,7 @@ main (int argc, char **argv)
+ * has been set. If we have not been relocated, we will exit if the
+ * at-spi-dbus key has been set.
+ */
++ g_type_init ();
+ gconf_client = gconf_client_get_default ();
+ #ifdef RELOCATE
+ need_to_quit = !gconf_client_get_bool (gconf_client, CORBA_GCONF_KEY, NULL);
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index fba0e27320c7..f4a0de914eb6 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -121,6 +121,7 @@ share/locale/da/LC_MESSAGES/at-spi.mo
share/locale/de/LC_MESSAGES/at-spi.mo
share/locale/dz/LC_MESSAGES/at-spi.mo
share/locale/el/LC_MESSAGES/at-spi.mo
+share/locale/en@shaw/LC_MESSAGES/at-spi.mo
share/locale/en_CA/LC_MESSAGES/at-spi.mo
share/locale/en_GB/LC_MESSAGES/at-spi.mo
share/locale/eo/LC_MESSAGES/at-spi.mo
@@ -216,8 +217,12 @@ share/locale/zh_TW/LC_MESSAGES/at-spi.mo
@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/crh/LC_MESSAGES
diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile
new file mode 100644
index 000000000000..d498feba7cc6
--- /dev/null
+++ b/accessibility/at-spi2-atk/Makefile
@@ -0,0 +1,30 @@
+# New ports collection makefile for: at-spi
+# Date Created: 12 April 2002
+# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/accessibility/at-spi2-atk/Makefile,v 1.6 2010/04/01 12:23:26 kwm Exp $
+#
+
+PORTNAME= at-spi2-atk
+PORTVERSION= 0.1.8
+CATEGORIES= accessibility x11-toolkits
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@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
+
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack gnomehier intlhack gtk20 libxml2
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-static
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.mk>
diff --git a/accessibility/at-spi2-atk/distinfo b/accessibility/at-spi2-atk/distinfo
new file mode 100644
index 000000000000..6c0a2ff5560e
--- /dev/null
+++ b/accessibility/at-spi2-atk/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/at-spi2-atk-0.1.8.tar.bz2) = dbf92538b4e83bcd0a5f42adb9143411
+SHA256 (gnome2/at-spi2-atk-0.1.8.tar.bz2) = 7ccfb43ec166814aa3daf0bf1b894d07b766d05c30860ef3db759f2dab72f2eb
+SIZE (gnome2/at-spi2-atk-0.1.8.tar.bz2) = 292459
diff --git a/accessibility/at-spi2-atk/pkg-descr b/accessibility/at-spi2-atk/pkg-descr
new file mode 100644
index 000000000000..1524ccfd79ff
--- /dev/null
+++ b/accessibility/at-spi2-atk/pkg-descr
@@ -0,0 +1,9 @@
+This is the Gnome Accessibility Project's Assistive Technology
+Service Provider Interface. It allows accessibility applications
+and assistive technologies to announce their respective existence
+to each other.
+
+This port contains the GTK+ module needed to interface with the SPI
+framework.
+
+WWW: http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus
diff --git a/accessibility/at-spi2-atk/pkg-plist b/accessibility/at-spi2-atk/pkg-plist
new file mode 100644
index 000000000000..fb9bd01547e3
--- /dev/null
+++ b/accessibility/at-spi2-atk/pkg-plist
@@ -0,0 +1,6 @@
+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
+share/gnome/autostart/atk-bridge.desktop
+@dirrm lib/gtk-2.0/modules/at-spi-dbus/modules
+@dirrm lib/gtk-2.0/modules/at-spi-dbus
diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile
new file mode 100644
index 000000000000..226555b6cea8
--- /dev/null
+++ b/accessibility/at-spi2-core/Makefile
@@ -0,0 +1,30 @@
+# New ports collection makefile for: at-spi
+# Date Created: 12 April 2002
+# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/accessibility/at-spi2-core/Makefile,v 1.8 2010/04/01 12:15:44 kwm Exp $
+#
+
+PORTNAME= at-spi2-core
+PORTVERSION= 0.1.8
+CATEGORIES= accessibility x11-toolkits
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= An Assistive Technology Service Provider Interface
+
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack gnomehier intlhack
+USE_XORG= x11 xi xtst
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-static
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.mk>
diff --git a/accessibility/at-spi2-core/distinfo b/accessibility/at-spi2-core/distinfo
new file mode 100644
index 000000000000..19194d321fa6
--- /dev/null
+++ b/accessibility/at-spi2-core/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/at-spi2-core-0.1.8.tar.bz2) = 6f333474d4e03ee3317ed9b5006752b0
+SHA256 (gnome2/at-spi2-core-0.1.8.tar.bz2) = 2bb33f5ccff315df5d5c1513502e31f186394346b3446f4be2396dad3b1da9d3
+SIZE (gnome2/at-spi2-core-0.1.8.tar.bz2) = 281367
diff --git a/accessibility/at-spi2-core/pkg-descr b/accessibility/at-spi2-core/pkg-descr
new file mode 100644
index 000000000000..6df23cda643b
--- /dev/null
+++ b/accessibility/at-spi2-core/pkg-descr
@@ -0,0 +1,10 @@
+This is the Gnome Accessibility Project's Assistive Technology
+Service Provider Interface. It allows accessibility applications
+and assistive technologies to announce their respective existence
+to each other.
+
+This version of at-spi is a major break from previous versions.
+It has been completely rewritten to use D-Bus rather than
+ORBIT / CORBA for its transport protocol.
+
+WWW: http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus
diff --git a/accessibility/at-spi2-core/pkg-plist b/accessibility/at-spi2-core/pkg-plist
new file mode 100644
index 000000000000..6c2efa7513f1
--- /dev/null
+++ b/accessibility/at-spi2-core/pkg-plist
@@ -0,0 +1,2 @@
+libexec/at-spi2-registryd
+share/dbus-1/services/org.a11y.atspi.Registry.service
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index a7ffb928f8ab..e9becc95c60b 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/atk/Makefile,v 1.98 2009/09/22 10:49:14 kwm Exp $
+# $MCom: ports/accessibility/atk/Makefile,v 1.104 2010/04/02 16:56:50 kwm Exp $
#
PORTNAME= atk
-PORTVERSION= 1.28.0
+PORTVERSION= 1.30.0
PORTREVISION?= 0
CATEGORIES= accessibility devel
MASTER_SITES= GNOME
@@ -20,7 +20,10 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
+BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+
USE_GETTEXT= yes
+USE_GMAKE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack glib20 ltverhack referencehack
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 24d0842d72b9..93c451b49e77 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/atk-1.28.0.tar.bz2) = 010a85478adc053c016a0a5c9bb52004
-SHA256 (gnome2/atk-1.28.0.tar.bz2) = e4da9fe580d2d55f4e77a138c553b4b32654dfb06bf0715592cc9dbd6355fe87
-SIZE (gnome2/atk-1.28.0.tar.bz2) = 715100
+MD5 (gnome2/atk-1.30.0.tar.bz2) = 548d413775819fef425410739041cac3
+SHA256 (gnome2/atk-1.30.0.tar.bz2) = 92b9b1213cafc68fe9c3806273b968c26423237d7b1f631dd83dc5270b8c268c
+SIZE (gnome2/atk-1.30.0.tar.bz2) = 746014
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 650d450dd8db..2a74d8c74a6c 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -14,11 +14,13 @@ include/atk-1.0/atk/atknoopobject.h
include/atk-1.0/atk/atknoopobjectfactory.h
include/atk-1.0/atk/atkobject.h
include/atk-1.0/atk/atkobjectfactory.h
+include/atk-1.0/atk/atkplug.h
include/atk-1.0/atk/atkregistry.h
include/atk-1.0/atk/atkrelation.h
include/atk-1.0/atk/atkrelationset.h
include/atk-1.0/atk/atkrelationtype.h
include/atk-1.0/atk/atkselection.h
+include/atk-1.0/atk/atksocket.h
include/atk-1.0/atk/atkstate.h
include/atk-1.0/atk/atkstateset.h
include/atk-1.0/atk/atkstreamablecontent.h
@@ -26,15 +28,18 @@ 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
+lib/girepository-1.0/Atk-1.0.typelib
lib/libatk-1.0.a
lib/libatk-1.0.la
lib/libatk-1.0.so
lib/libatk-1.0.so.0
libdata/pkgconfig/atk.pc
+share/gir-1.0/Atk-1.0.gir
share/locale/af/LC_MESSAGES/atk10.mo
share/locale/am/LC_MESSAGES/atk10.mo
share/locale/ar/LC_MESSAGES/atk10.mo
share/locale/as/LC_MESSAGES/atk10.mo
+share/locale/ast/LC_MESSAGES/atk10.mo
share/locale/az/LC_MESSAGES/atk10.mo
share/locale/be/LC_MESSAGES/atk10.mo
share/locale/be@latin/LC_MESSAGES/atk10.mo
@@ -52,6 +57,7 @@ share/locale/dz/LC_MESSAGES/atk10.mo
share/locale/el/LC_MESSAGES/atk10.mo
share/locale/en_CA/LC_MESSAGES/atk10.mo
share/locale/en_GB/LC_MESSAGES/atk10.mo
+share/locale/en@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
@@ -122,6 +128,8 @@ share/locale/zh_HK/LC_MESSAGES/atk10.mo
share/locale/zh_TW/LC_MESSAGES/atk10.mo
@dirrm include/atk-1.0/atk
@dirrm include/atk-1.0
+@dirrmtry share/gir-1.0
+@dirrmtry lib/girepository-1.0
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/yi/LC_MESSAGES
@@ -152,6 +160,8 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@@ -160,5 +170,7 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/accessibility/gir-repository-atk/Makefile b/accessibility/gir-repository-atk/Makefile
deleted file mode 100644
index b9bc8ffccba4..000000000000
--- a/accessibility/gir-repository-atk/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# New ports collection makefile for: gir-repository-atk
-# Date created: 07 September 2009
-# Whom: Alexander Logvinov <avl@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/accessibility/gir-repository-atk/Makefile,v 1.1 2009/09/16 02:05:10 avl Exp $
-#
-
-CATEGORIES= accessibility
-
-MASTERDIR= ${.CURDIR}/../../devel/gir-repository
-
-PKGNAMESUFFIX= -atk
-
-.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 02812ad15bac..9deae2e06924 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/gnome-mag/Makefile,v 1.47 2009/09/26 12:48:44 marcus Exp $
+# $MCom: ports/accessibility/gnome-mag/Makefile,v 1.51 2010/04/01 11:23:47 kwm Exp $
#
PORTNAME= gnome-mag
-PORTVERSION= 0.15.9
-PORTREVISION= 2
+PORTVERSION= 0.16.1
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/gnome-mag/distinfo b/accessibility/gnome-mag/distinfo
index 9fa4321bc36f..7ef3c2a18fc2 100644
--- a/accessibility/gnome-mag/distinfo
+++ b/accessibility/gnome-mag/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-mag-0.15.9.tar.bz2) = db651bbd63f4ae3cfeb344c42f80d206
-SHA256 (gnome2/gnome-mag-0.15.9.tar.bz2) = 6f921419143088587dce201afd972a60317ade269e47b0d67a38872a7615a025
-SIZE (gnome2/gnome-mag-0.15.9.tar.bz2) = 532685
+MD5 (gnome2/gnome-mag-0.16.1.tar.bz2) = bbe177dadfd64c071b5670956ed703ae
+SHA256 (gnome2/gnome-mag-0.16.1.tar.bz2) = 92541c30a70a6cf59ec3fb3f46d27a598173984f786f7c6bc1bd3e4be65ad3fa
+SIZE (gnome2/gnome-mag-0.16.1.tar.bz2) = 546444
diff --git a/accessibility/gnome-mag/pkg-plist b/accessibility/gnome-mag/pkg-plist
index d641626add8e..ec49119a99a1 100644
--- a/accessibility/gnome-mag/pkg-plist
+++ b/accessibility/gnome-mag/pkg-plist
@@ -9,6 +9,7 @@ lib/orbit-2.0/GNOME_Magnifier_module.la
lib/orbit-2.0/GNOME_Magnifier_module.so
libdata/bonobo/servers/GNOME_Magnifier.server
libdata/pkgconfig/gnome-mag-1.0.pc
+share/dbus-1/services/org.freedesktop.gnome.Magnifier.service
%%DATADIR%%/1_32/appstart.xpm
%%DATADIR%%/1_32/bottom_left_corner.xpm
%%DATADIR%%/1_32/bottom_side.xpm
@@ -28,6 +29,8 @@ libdata/pkgconfig/gnome-mag-1.0.pc
%%DATADIR%%/1_32/top_side.xpm
%%DATADIR%%/1_32/up.xpm
%%DATADIR%%/1_32/xterm.xpm
+%%DATADIR%%/dbus/org.freedesktop.gnome.Magnifier
+%%DATADIR%%/dbus/org.freedesktop.gnome.ZoomRegion
%%DATADIR%%/default-cursor.xpm
share/idl/gnome-mag-1.0/GNOME_Magnifier.idl
share/locale/ang/LC_MESSAGES/gnome-mag.mo
@@ -50,6 +53,7 @@ share/locale/da/LC_MESSAGES/gnome-mag.mo
share/locale/de/LC_MESSAGES/gnome-mag.mo
share/locale/dz/LC_MESSAGES/gnome-mag.mo
share/locale/el/LC_MESSAGES/gnome-mag.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-mag.mo
share/locale/en_CA/LC_MESSAGES/gnome-mag.mo
share/locale/en_GB/LC_MESSAGES/gnome-mag.mo
share/locale/eo/LC_MESSAGES/gnome-mag.mo
@@ -119,6 +123,7 @@ share/locale/zh_CN/LC_MESSAGES/gnome-mag.mo
share/locale/zh_HK/LC_MESSAGES/gnome-mag.mo
share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
@dirrm share/idl/gnome-mag-1.0
+@dirrm %%DATADIR%%/dbus
@dirrm %%DATADIR%%/1_32
@dirrm %%DATADIR%%
@dirrm %%DOCSDIR%%/reference/html
@@ -154,6 +159,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index fd7ae5e6deb0..a8ca60a47af1 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger <adamw@freebsd.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/gok/Makefile,v 1.106 2009/10/19 19:03:32 kwm Exp $
+# $MCom: ports/accessibility/gok/Makefile,v 1.110 2010/04/02 16:53:04 kwm Exp $
#
PORTNAME= gok
-PORTVERSION= 2.28.1
-PORTREVISION= 2
+PORTVERSION= 2.30.0
PORTEPOCH= 1
CATEGORIES= accessibility sysutils gnome
MASTER_SITES= GNOME
@@ -17,13 +16,14 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME On-Screen Keyboard (GOK)
-LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
USE_BZIP2= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui atspi libwnck \
- gnomespeech
+ gnomespeech libxml2
USE_GMAKE= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo
index 52f56cb2e9ad..7f03e9291a64 100644
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gok-2.28.1.tar.bz2) = d7305f12c703e13eeaed796f996dbc86
-SHA256 (gnome2/gok-2.28.1.tar.bz2) = 121ab98605b0981c131cdc49bf190ba81e9a9d5c720fa94ed2fb3193f121e904
-SIZE (gnome2/gok-2.28.1.tar.bz2) = 1588038
+MD5 (gnome2/gok-2.30.0.tar.bz2) = 853c7825eb62d7c425f5a0efdc07412a
+SHA256 (gnome2/gok-2.30.0.tar.bz2) = 6fe6e116dc663d7f2132b44fc9959ce2e9a26e5259eea860db6829c736a386b6
+SIZE (gnome2/gok-2.30.0.tar.bz2) = 1544165
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index a80237b5f3f6..9de62b639997 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -7,7 +7,6 @@ share/applications/gok.desktop
%%DOCSDIR%%/ch02.html
%%DOCSDIR%%/ch03.html
%%DOCSDIR%%/ch04.html
-%%DOCSDIR%%/gok-GokButton.html
%%DOCSDIR%%/gok-arraylist.html
%%DOCSDIR%%/gok-callbacks.html
%%DOCSDIR%%/gok-command-common.html
@@ -20,6 +19,7 @@ share/applications/gok.desktop
%%DOCSDIR%%/gok-global.html
%%DOCSDIR%%/gok-gok-action.html
%%DOCSDIR%%/gok-gok-branchback-stack.html
+%%DOCSDIR%%/gok-gok-button.html
%%DOCSDIR%%/gok-gok-chunker.html
%%DOCSDIR%%/gok-gok-control.html
%%DOCSDIR%%/gok-gok-data.html
@@ -260,6 +260,16 @@ share/gnome/help/gok/C/legal.xml
%%DATADIR%%/el/text-operations.kbd
%%DATADIR%%/el/valuator.kbd
%%DATADIR%%/empty.png
+%%DATADIR%%/en@shaw/gok-controls.kbd
+%%DATADIR%%/en@shaw/hide.kbd
+%%DATADIR%%/en@shaw/launcher.kbd
+%%DATADIR%%/en@shaw/main.kbd
+%%DATADIR%%/en@shaw/mouse.kbd
+%%DATADIR%%/en@shaw/move-resize.kbd
+%%DATADIR%%/en@shaw/numberpad.kbd
+%%DATADIR%%/en@shaw/quit.kbd
+%%DATADIR%%/en@shaw/text-operations.kbd
+%%DATADIR%%/en@shaw/valuator.kbd
%%DATADIR%%/en_CA/gok-controls.kbd
%%DATADIR%%/en_CA/hide.kbd
%%DATADIR%%/en_CA/launcher.kbd
@@ -360,7 +370,8 @@ share/gnome/help/gok/C/legal.xml
%%DATADIR%%/gl/quit.kbd
%%DATADIR%%/gl/text-operations.kbd
%%DATADIR%%/gl/valuator.kbd
-%%DATADIR%%/glade/gok.glade2
+%%DATADIR%%/gok-editor.ui
+%%DATADIR%%/gok-settingsdialog.ui
%%DATADIR%%/gok.rc
%%DATADIR%%/goklogo.png
%%DATADIR%%/gu/gok-controls.kbd
@@ -885,6 +896,7 @@ share/locale/da/LC_MESSAGES/gok.mo
share/locale/de/LC_MESSAGES/gok.mo
share/locale/dz/LC_MESSAGES/gok.mo
share/locale/el/LC_MESSAGES/gok.mo
+share/locale/en@shaw/LC_MESSAGES/gok.mo
share/locale/en_CA/LC_MESSAGES/gok.mo
share/locale/en_GB/LC_MESSAGES/gok.mo
share/locale/es/LC_MESSAGES/gok.mo
@@ -1000,7 +1012,6 @@ share/sounds/freedesktop/stereo/goksound2.wav
@dirrm %%DATADIR%%/hi
@dirrm %%DATADIR%%/he
@dirrm %%DATADIR%%/gu
-@dirrm %%DATADIR%%/glade
@dirrm %%DATADIR%%/gl
@dirrm %%DATADIR%%/ga
@dirrm %%DATADIR%%/fr
@@ -1011,6 +1022,7 @@ share/sounds/freedesktop/stereo/goksound2.wav
@dirrm %%DATADIR%%/es
@dirrm %%DATADIR%%/en_GB
@dirrm %%DATADIR%%/en_CA
+@dirrm %%DATADIR%%/en@shaw
@dirrm %%DATADIR%%/el
@dirrm %%DATADIR%%/dz
@dirrm %%DATADIR%%/de
@@ -1052,6 +1064,8 @@ share/sounds/freedesktop/stereo/goksound2.wav
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
index 7d407ae23f6a..57e6d61de7f9 100644
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/mousetweaks/Makefile,v 1.37 2009/10/19 18:20:53 kwm Exp $
+# $MCom: ports/accessibility/mousetweaks/Makefile,v 1.46 2010/04/27 14:33:35 kwm Exp $
#
PORTNAME= mousetweaks
-PORTVERSION= 2.28.2
-PORTREVISION= 2
+PORTVERSION= 2.30.1
CATEGORIES= accessibility
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,7 +15,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Mouse accessibility enhancements for the GNOME desktop
-USE_XORG= xfixes
+USE_XORG= x11 xfixes xcursor xtst
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack atspi
USE_GMAKE= yes
diff --git a/accessibility/mousetweaks/distinfo b/accessibility/mousetweaks/distinfo
index 8f92bb12af84..9761bc77c084 100644
--- a/accessibility/mousetweaks/distinfo
+++ b/accessibility/mousetweaks/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/mousetweaks-2.28.2.tar.bz2) = c8f8a2a57f02133adb6069f74bbd0004
-SHA256 (gnome2/mousetweaks-2.28.2.tar.bz2) = c91de97198055e14c335980322b6c25c8c545baa74088a627930c5b0801f091e
-SIZE (gnome2/mousetweaks-2.28.2.tar.bz2) = 2049091
+MD5 (gnome2/mousetweaks-2.30.1.tar.bz2) = ba764f315df090bb5c99474b36ae768d
+SHA256 (gnome2/mousetweaks-2.30.1.tar.bz2) = 6bd16a59b248a68ae0c99e185400eba58c3dac82a99ca2cc7c60e775accd01e6
+SIZE (gnome2/mousetweaks-2.30.1.tar.bz2) = 2195351
diff --git a/accessibility/mousetweaks/pkg-plist b/accessibility/mousetweaks/pkg-plist
index e57b12ea5ccc..6e757d17ee07 100644
--- a/accessibility/mousetweaks/pkg-plist
+++ b/accessibility/mousetweaks/pkg-plist
@@ -186,6 +186,7 @@ share/gnome/help/mousetweaks/zh_CN/figures/mouse-a11y-tab.png
share/gnome/help/mousetweaks/zh_CN/mousetweaks.xml
share/locale/ar/LC_MESSAGES/mousetweaks.mo
share/locale/as/LC_MESSAGES/mousetweaks.mo
+share/locale/ast/LC_MESSAGES/mousetweaks.mo
share/locale/bg/LC_MESSAGES/mousetweaks.mo
share/locale/bn/LC_MESSAGES/mousetweaks.mo
share/locale/bn_IN/LC_MESSAGES/mousetweaks.mo
@@ -196,6 +197,7 @@ share/locale/da/LC_MESSAGES/mousetweaks.mo
share/locale/de/LC_MESSAGES/mousetweaks.mo
share/locale/el/LC_MESSAGES/mousetweaks.mo
share/locale/en_GB/LC_MESSAGES/mousetweaks.mo
+share/locale/en@shaw/LC_MESSAGES/mousetweaks.mo
share/locale/es/LC_MESSAGES/mousetweaks.mo
share/locale/et/LC_MESSAGES/mousetweaks.mo
share/locale/eu/LC_MESSAGES/mousetweaks.mo
@@ -300,6 +302,8 @@ share/omf/mousetweaks/mousetweaks-zh_CN.omf
@dirrmtry share/locale/mr
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index cb11184ecf80..e804fbf03c7b 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/orca/Makefile,v 1.73 2009/10/19 20:01:51 kwm Exp $
+# $MCom: ports/accessibility/orca/Makefile,v 1.84 2010/04/26 10:45:56 kwm Exp $
#
PORTNAME= orca
-PORTVERSION= 2.28.3
-PORTREVISION= 2
+PORTVERSION= 2.30.1
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,9 +15,11 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Scriptable screen reader
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \
+ ${PYTHON_SITELIBDIR}/pyatspi/__init__.py:${PORTSDIR}/accessibility/at-spi
LIB_DEPENDS= gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \
+ ${PYTHON_SITELIBDIR}/pyatspi/__init__.py:${PORTSDIR}/accessibility/at-spi
LATEST_LINK= gnome-orca
@@ -26,7 +27,7 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_PYTHON= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack libgnomeui atspi gnomespeech pygnome2 \
+USE_GNOME= gnomeprefix gnomehack libgnomeui gnomespeech pygnome2 \
pygnomedesktop
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo
index 67db2a2ab2f7..c98b383299d0 100644
--- a/accessibility/orca/distinfo
+++ b/accessibility/orca/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/orca-2.28.3.tar.bz2) = 6097051064e7a24dcf335410d4a020dc
-SHA256 (gnome2/orca-2.28.3.tar.bz2) = f94f76bb618ae4ce76c37e8077b3d5e81350c4ac899a224fa70d5e5a4d6014e2
-SIZE (gnome2/orca-2.28.3.tar.bz2) = 2173461
+MD5 (gnome2/orca-2.30.1.tar.bz2) = 316e825174c15858ea54cc136536c1f7
+SHA256 (gnome2/orca-2.30.1.tar.bz2) = 0493e0fb7a9b3e65ee0c349751d5295020aa25277a8b0545710317a1add2645b
+SIZE (gnome2/orca-2.30.1.tar.bz2) = 2265634
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
index d25909de608e..d2ddc3b7b4c4 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -62,6 +62,9 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.py
%%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyc
%%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyo
+%%PYTHON_SITELIBDIR%%/orca/gsmag.py
+%%PYTHON_SITELIBDIR%%/orca/gsmag.pyc
+%%PYTHON_SITELIBDIR%%/orca/gsmag.pyo
%%PYTHON_SITELIBDIR%%/orca/httpserver.py
%%PYTHON_SITELIBDIR%%/orca/httpserver.pyc
%%PYTHON_SITELIBDIR%%/orca/httpserver.pyo
@@ -143,6 +146,18 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.py
%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/formatting.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/formatting.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/formatting.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/speech_generator.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla.pyo
@@ -260,6 +275,9 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script_settings.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script_settings.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script_settings.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/speech_generator.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/speech_generator.pyo
@@ -326,9 +344,15 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script_settings.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script_settings.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script_settings.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.py
%%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyo
@@ -489,6 +513,7 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner
@@ -499,6 +524,7 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts
@dirrm %%PYTHON_SITELIBDIR%%/orca
diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
new file mode 100644
index 000000000000..9cd15f28eb39
--- /dev/null
+++ b/accessibility/py-atspi/Makefile
@@ -0,0 +1,33 @@
+# New ports collection makefile for: at-spi
+# Date Created: 12 April 2002
+# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/accessibility/py-atspi/Makefile,v 1.5 2010/04/01 12:24:50 kwm Exp $
+#
+
+PORTNAME= atspi
+PORTVERSION= 0.1.8
+CATEGORIES= accessibility x11-toolkits
+MASTER_SITES= GNOME
+MASTER_SITE_SUBDIR= sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DISTNAME= pyatspi-${PORTVERSION}
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Python API for the D-BUS based SPI framework
+
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+RUN_DEPENDS= ${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core
+
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack gnomehier intlhack gtk20 libxml2
+GNU_CONFIGURE= yes
+USE_PYTHON= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.mk>
diff --git a/accessibility/py-atspi/distinfo b/accessibility/py-atspi/distinfo
new file mode 100644
index 000000000000..dde4f0b69753
--- /dev/null
+++ b/accessibility/py-atspi/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/pyatspi-0.1.8.tar.bz2) = 01f6a0d4879e6d65bce20ae4927b6d45
+SHA256 (gnome2/pyatspi-0.1.8.tar.bz2) = e984b0e587fb28813e92a3b3b08228b47b410f48d8474da05fbf8e327274d55a
+SIZE (gnome2/pyatspi-0.1.8.tar.bz2) = 306278
diff --git a/accessibility/py-atspi/pkg-descr b/accessibility/py-atspi/pkg-descr
new file mode 100644
index 000000000000..151f94c993e2
--- /dev/null
+++ b/accessibility/py-atspi/pkg-descr
@@ -0,0 +1,8 @@
+This is the Gnome Accessibility Project's Assistive Technology
+Service Provider Interface. It allows accessibility applications
+and assistive technologies to announce their respective existence
+to each other.
+
+This port is the Python API to interface with the D-BUS based SPI framework.
+
+WWW: http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus
diff --git a/accessibility/py-atspi/pkg-plist b/accessibility/py-atspi/pkg-plist
new file mode 100644
index 000000000000..d2c66630deb8
--- /dev/null
+++ b/accessibility/py-atspi/pkg-plist
@@ -0,0 +1,98 @@
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/Accessibility.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/Accessibility.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/Accessibility.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/__init__.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/accessible.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/accessible.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/accessible.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/action.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/action.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/action.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/appevent.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/appevent.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/appevent.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/application.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/application.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/application.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/__init__.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/bus.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/bus.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/bus.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/proxy.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/proxy.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/proxy.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/cache.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/cache.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/cache.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/collection.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/collection.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/collection.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/component.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/component.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/component.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/constants.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/constants.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/constants.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/deviceevent.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/deviceevent.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/deviceevent.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/document.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/document.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/document.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/editabletext.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/editabletext.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/editabletext.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/enum.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/enum.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/enum.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/exceptions.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/factory.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/factory.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/factory.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hyperlink.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hyperlink.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hyperlink.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hypertext.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hypertext.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hypertext.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/image.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/image.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/image.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/interfaces.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/interfaces.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/interfaces.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/registry.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/registry.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/registry.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/relation.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/relation.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/relation.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/role.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/role.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/role.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/selection.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/selection.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/selection.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/state.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/state.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/state.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/table.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/table.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/table.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/text.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/text.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/text.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/utils.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/utils.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/utils.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/value.py
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/value.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi_dbus/value.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils
+@dirrm %%PYTHON_SITELIBDIR%%/pyatspi_dbus
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index b34d949f31cd..603e7adce37b 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,12 +3,11 @@
# Whom: Anders Nordby <anders@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/archivers/file-roller/Makefile,v 1.165 2009/10/19 19:48:22 kwm Exp $
+# $MCom: ports/archivers/file-roller/Makefile,v 1.177 2010/04/27 22:36:37 kwm Exp $
#
PORTNAME= file-roller
-PORTVERSION= 2.28.2
-PORTREVISION= 3
+PORTVERSION= 2.30.1.1
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= GNOME
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 0cb3a4ad4638..2e7379e9d828 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/file-roller-2.28.2.tar.bz2) = fce19505b34e4adf78149d3595fb8fe4
-SHA256 (gnome2/file-roller-2.28.2.tar.bz2) = 718726466df0bb8c561b6af0ef7fdc1121e1385197ec14fcc396f431daffbb2c
-SIZE (gnome2/file-roller-2.28.2.tar.bz2) = 1749187
+MD5 (gnome2/file-roller-2.30.1.1.tar.bz2) = a29a82396caf8c5726d7f0256e0ba02a
+SHA256 (gnome2/file-roller-2.30.1.1.tar.bz2) = 4a8bf476fa89b52fa2e7bec4c824ebc03136bbcb55ab3694dfe6e1c1aef401b4
+SIZE (gnome2/file-roller-2.30.1.1.tar.bz2) = 1816845
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 9620fa5da34a..b45025293667 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -10,6 +10,7 @@ share/applications/file-roller.desktop
%%DATADIR%%/icons/hicolor/24x24/actions/add-files-to-archive.png
%%DATADIR%%/icons/hicolor/24x24/actions/add-folder-to-archive.png
%%DATADIR%%/icons/hicolor/24x24/actions/extract-archive.png
+%%DATADIR%%/packages.match
%%DATADIR%%/ui/add-options.ui
%%DATADIR%%/ui/batch-add-files.ui
%%DATADIR%%/ui/batch-password.ui
@@ -122,6 +123,12 @@ share/gnome/help/file-roller/vi/figures/file-roller_main_window.png
share/gnome/help/file-roller/vi/figures/file-roller_rightarrow.png
share/gnome/help/file-roller/vi/figures/file-roller_uparrow.png
share/gnome/help/file-roller/vi/file-roller.xml
+share/gnome/help/file-roller/zh_CN/figures/file-roller_home.png
+share/gnome/help/file-roller/zh_CN/figures/file-roller_leftarrow.png
+share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png
+share/gnome/help/file-roller/zh_CN/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/zh_CN/figures/file-roller_uparrow.png
+share/gnome/help/file-roller/zh_CN/file-roller.xml
share/icons/hicolor/16x16/apps/file-roller.png
share/icons/hicolor/22x22/apps/file-roller.png
share/icons/hicolor/24x24/apps/file-roller.png
@@ -148,6 +155,7 @@ share/locale/da/LC_MESSAGES/file-roller.mo
share/locale/de/LC_MESSAGES/file-roller.mo
share/locale/dz/LC_MESSAGES/file-roller.mo
share/locale/el/LC_MESSAGES/file-roller.mo
+share/locale/en@shaw/LC_MESSAGES/file-roller.mo
share/locale/en_CA/LC_MESSAGES/file-roller.mo
share/locale/en_GB/LC_MESSAGES/file-roller.mo
share/locale/es/LC_MESSAGES/file-roller.mo
@@ -236,7 +244,10 @@ share/omf/file-roller/file-roller-ru.omf
share/omf/file-roller/file-roller-sv.omf
share/omf/file-roller/file-roller-uk.omf
share/omf/file-roller/file-roller-vi.omf
+share/omf/file-roller/file-roller-zh_CN.omf
@dirrm share/omf/file-roller
+@dirrm share/gnome/help/file-roller/zh_CN/figures
+@dirrm share/gnome/help/file-roller/zh_CN
@dirrm share/gnome/help/file-roller/vi/figures
@dirrm share/gnome/help/file-roller/vi
@dirrm share/gnome/help/file-roller/uk/figures
@@ -322,6 +333,8 @@ share/omf/file-roller/file-roller-vi.omf
@dirrmtry share/locale/hy
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile
index b71fcef7b10f..f5613b59df67 100644
--- a/astro/glunarclock/Makefile
+++ b/astro/glunarclock/Makefile
@@ -8,7 +8,7 @@
PORTNAME= glunarclock
PORTVERSION= 0.32.4
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= astro gnome
MASTER_SITES= SF
@@ -17,7 +17,7 @@ COMMENT= GNOME applet that displays the current phase of the Moon
LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier
-USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack
+USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack libgnomeui
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
diff --git a/audio/beast/files/patch-birnet_birnetthreadimpl.cc b/audio/beast/files/patch-birnet_birnetthreadimpl.cc
new file mode 100644
index 000000000000..5e4968b1eef2
--- /dev/null
+++ b/audio/beast/files/patch-birnet_birnetthreadimpl.cc
@@ -0,0 +1,17 @@
+Description: Correct signature for the g_atomic_pointer_get() function.
+Author: Jakub Wilk <ubanus@users.sf.net>
+Bug-Debian: http://bugs.debian.org/540681
+
+Index: beast-0.7.1/birnet/birnetthreadimpl.cc
+===================================================================
+--- birnet/birnetthreadimpl.cc.orig 2009-12-16 20:21:24.000000000 +0100
++++ birnet/birnetthreadimpl.cc 2009-12-16 20:26:16.000000000 +0100
+@@ -1491,7 +1491,7 @@
+
+ #ifdef g_atomic_pointer_get
+ static void*
+-(g_atomic_pointer_get) (volatile void **atomic)
++(g_atomic_pointer_get) (void * volatile *atomic)
+ {
+ return (void*) g_atomic_pointer_get (atomic);
+ }
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index dc0e894f18e8..526ae780718a 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/gnome-media/Makefile,v 1.147 2009/11/26 06:20:13 marcus Exp $
+# $MCom: ports/audio/gnome-media/Makefile,v 1.151 2010/04/02 01:29:55 avl Exp $
#
PORTNAME= gnome-media
-PORTVERSION= 2.28.5
-PORTREVISION= 2
+PORTVERSION= 2.30.0
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -29,8 +28,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libxml2 libglade2 \
- gconf2
+USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libxml2 gconf2
USE_GSTREAMER= gconf good
CONFIGURE_ARGS= --disable-gstmix
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -39,4 +37,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= gnome-audio-profiles.schemas \
gnome-sound-recorder.schemas
+post-patch:
+ @${REINPLACE_CMD} -e 's|have_gladeui=true|have_gladeui=false|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.mk>
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index a754d2d8b8ec..5a2389c24a4b 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.28.5.tar.bz2) = 8dbdd10388f1557da209d8aef7b85f0d
-SHA256 (gnome2/gnome-media-2.28.5.tar.bz2) = 1d6a34b54aa01e811ac32ed7d24432b3beaffffc2c6278de412c7931f5488153
-SIZE (gnome2/gnome-media-2.28.5.tar.bz2) = 2604259
+MD5 (gnome2/gnome-media-2.30.0.tar.bz2) = 027b11fb8b126ab1b25def6b9e121bd3
+SHA256 (gnome2/gnome-media-2.30.0.tar.bz2) = 994cd9b88ff22e4815585629b14efc828a95284900809b0b4f8ebcde0c6e2926
+SIZE (gnome2/gnome-media-2.30.0.tar.bz2) = 2707711
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index ea15b8a6b211..dd6d9a556d36 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -9,9 +9,6 @@ include/gnome-media/profiles/audio-profile-edit.h
include/gnome-media/profiles/audio-profile.h
include/gnome-media/profiles/audio-profiles-edit.h
include/gnome-media/profiles/gnome-media-profiles.h
-lib/libglade/2.0/libgnome-media-profiles.a
-lib/libglade/2.0/libgnome-media-profiles.la
-lib/libglade/2.0/libgnome-media-profiles.so
lib/libgnome-media-profiles.a
lib/libgnome-media-profiles.la
lib/libgnome-media-profiles.so
@@ -20,7 +17,8 @@ libdata/pkgconfig/gnome-media-profiles.pc
share/applications/gnome-sound-recorder.desktop
share/applications/gnome-volume-control.desktop
share/applications/gstreamer-properties.desktop
-%%DATADIR%%/glade/gnome-audio-profiles.glade2
+%%DATADIR%%/gnome-audio-profile-edit.ui
+%%DATADIR%%/gnome-audio-profile-new.ui
%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png
%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png
%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-medium.png
@@ -51,10 +49,22 @@ share/gnome/help/gnome-audio-profiles/de/figures/gnome-audio-profiles-profile-wi
share/gnome/help/gnome-audio-profiles/de/figures/gnome-audio-profiles-profiles-window.png
share/gnome/help/gnome-audio-profiles/de/gnome-audio-profiles.xml
share/gnome/help/gnome-audio-profiles/de/legal.xml
+share/gnome/help/gnome-audio-profiles/el/figures/gnome-audio-profiles-profile-window.png
+share/gnome/help/gnome-audio-profiles/el/figures/gnome-audio-profiles-profiles-window.png
+share/gnome/help/gnome-audio-profiles/el/gnome-audio-profiles.xml
+share/gnome/help/gnome-audio-profiles/el/legal.xml
share/gnome/help/gnome-audio-profiles/es/figures/gnome-audio-profiles-profile-window.png
share/gnome/help/gnome-audio-profiles/es/figures/gnome-audio-profiles-profiles-window.png
share/gnome/help/gnome-audio-profiles/es/gnome-audio-profiles.xml
share/gnome/help/gnome-audio-profiles/es/legal.xml
+share/gnome/help/gnome-audio-profiles/fr/figures/gnome-audio-profiles-profile-window.png
+share/gnome/help/gnome-audio-profiles/fr/figures/gnome-audio-profiles-profiles-window.png
+share/gnome/help/gnome-audio-profiles/fr/gnome-audio-profiles.xml
+share/gnome/help/gnome-audio-profiles/fr/legal.xml
+share/gnome/help/gnome-audio-profiles/sv/figures/gnome-audio-profiles-profile-window.png
+share/gnome/help/gnome-audio-profiles/sv/figures/gnome-audio-profiles-profiles-window.png
+share/gnome/help/gnome-audio-profiles/sv/gnome-audio-profiles.xml
+share/gnome/help/gnome-audio-profiles/sv/legal.xml
share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
share/gnome/help/gnome-sound-recorder/C/legal.xml
@@ -137,6 +147,7 @@ share/icons/hicolor/48x48/apps/gnome-volume-control.png
share/icons/hicolor/48x48/apps/gstreamer-properties.png
share/icons/hicolor/scalable/apps/gnome-sound-recorder.svg
share/icons/hicolor/scalable/apps/gnome-volume-control.svg
+share/locale/af/LC_MESSAGES/gnome-media-2.0.mo
share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
share/locale/as/LC_MESSAGES/gnome-media-2.0.mo
@@ -224,7 +235,10 @@ share/locale/zh_HK/LC_MESSAGES/gnome-media-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
share/omf/gnome-audio-profiles/gnome-audio-profiles-C.omf
share/omf/gnome-audio-profiles/gnome-audio-profiles-de.omf
+share/omf/gnome-audio-profiles/gnome-audio-profiles-el.omf
share/omf/gnome-audio-profiles/gnome-audio-profiles-es.omf
+share/omf/gnome-audio-profiles/gnome-audio-profiles-fr.omf
+share/omf/gnome-audio-profiles/gnome-audio-profiles-sv.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-C.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-ca.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-cs.omf
@@ -236,7 +250,6 @@ share/omf/gnome-sound-recorder/gnome-sound-recorder-es.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-fr.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-it.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-oc.omf
-share/omf/gstreamer-properties/gstreamer-properties-pt_BR.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-ru.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-sv.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-uk.omf
@@ -251,6 +264,7 @@ share/omf/gstreamer-properties/gstreamer-properties-es.omf
share/omf/gstreamer-properties/gstreamer-properties-fr.omf
share/omf/gstreamer-properties/gstreamer-properties-it.omf
share/omf/gstreamer-properties/gstreamer-properties-oc.omf
+share/omf/gstreamer-properties/gstreamer-properties-pt_BR.omf
share/omf/gstreamer-properties/gstreamer-properties-ru.omf
share/omf/gstreamer-properties/gstreamer-properties-sv.omf
share/omf/gstreamer-properties/gstreamer-properties-th.omf
@@ -332,8 +346,14 @@ share/sounds/gnome/default/alerts/sonar.ogg
@dirrm share/gnome/help/gnome-sound-recorder/C/figures
@dirrm share/gnome/help/gnome-sound-recorder/C
@dirrm share/gnome/help/gnome-sound-recorder
+@dirrm share/gnome/help/gnome-audio-profiles/sv/figures
+@dirrm share/gnome/help/gnome-audio-profiles/sv
+@dirrm share/gnome/help/gnome-audio-profiles/fr/figures
+@dirrm share/gnome/help/gnome-audio-profiles/fr
@dirrm share/gnome/help/gnome-audio-profiles/es/figures
@dirrm share/gnome/help/gnome-audio-profiles/es
+@dirrm share/gnome/help/gnome-audio-profiles/el/figures
+@dirrm share/gnome/help/gnome-audio-profiles/el
@dirrm share/gnome/help/gnome-audio-profiles/de/figures
@dirrm share/gnome/help/gnome-audio-profiles/de
@dirrm share/gnome/help/gnome-audio-profiles/C/figures
@@ -354,7 +374,6 @@ share/sounds/gnome/default/alerts/sonar.ogg
@dirrm %%DATADIR%%/icons/hicolor/16x16
@dirrm %%DATADIR%%/icons/hicolor
@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/glade
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrm include/gnome-media/profiles
diff --git a/audio/istream/Makefile b/audio/istream/Makefile
index 514697ff952b..df49665b4bac 100644
--- a/audio/istream/Makefile
+++ b/audio/istream/Makefile
@@ -7,7 +7,7 @@
PORTNAME= istream
PORTVERSION= 0.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://www.jochen-baier.de/istream/
@@ -15,7 +15,7 @@ MAINTAINER= pav@FreeBSD.org
COMMENT= Internet radio player applet for GNOME Panel
USE_GMAKE= yes
-USE_GNOME= gnomepanel
+USE_GNOME= gnomepanel libgnomeui
USE_GSTREAMER= yes
USE_XORG= xtst
GNU_CONFIGURE= yes
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 3d0acb9477bc..d3d7fcb8c28c 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= libcanberra
-PORTVERSION= 0.22
-PORTREVISION= 3
+PORTVERSION= 0.23
+PORTREVISION= 1
CATEGORIES= audio devel
MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/
diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo
index f771edecc145..55a248f02acd 100644
--- a/audio/libcanberra/distinfo
+++ b/audio/libcanberra/distinfo
@@ -1,3 +1,3 @@
-MD5 (libcanberra-0.22.tar.gz) = e24e2f956fedfbcc58edfa40471b18d8
-SHA256 (libcanberra-0.22.tar.gz) = 6a87737c3d045549a4a9c789cfc565a48185a586aa1a59243dea6421e9978581
-SIZE (libcanberra-0.22.tar.gz) = 459404
+MD5 (libcanberra-0.23.tar.gz) = 83fb2fb7608c77f91904e12a867534fd
+SHA256 (libcanberra-0.23.tar.gz) = a7d0cf282a9fc8d1e41c082b72a2bf4cf86a6d599f0262484bac95bab57a0960
+SIZE (libcanberra-0.23.tar.gz) = 460205
diff --git a/audio/libcanberra/files/patch-src_oss.c b/audio/libcanberra/files/patch-src_oss.c
index d4b910a3c0a8..098792d93125 100644
--- a/audio/libcanberra/files/patch-src_oss.c
+++ b/audio/libcanberra/files/patch-src_oss.c
@@ -1,11 +1,11 @@
---- src/oss.c.orig 2009-08-26 21:58:16.000000000 -0400
-+++ src/oss.c 2009-11-25 20:47:07.000000000 -0500
-@@ -260,7 +260,7 @@ static int open_oss(ca_context *c, struc
- val = AFMT_S16_NE;
- break;
+--- src/oss.c.orig 2010-02-19 18:39:40.000000000 -0500
++++ src/oss.c 2010-03-14 15:04:16.000000000 -0400
+@@ -262,7 +262,7 @@ static int open_oss(ca_context *c, struc
+ val = AFMT_S16_NE;
+ break;
case CA_SAMPLE_S16RE:
-#if __BYTE_ORDER == __LITTLE_ENDIAN
+#if _BYTE_ORDER == _LITTLE_ENDIAN
- val = AFMT_S16_BE;
+ val = AFMT_S16_BE;
#else
- val = AFMT_S16_LE;
+ val = AFMT_S16_LE;
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 8cbd870c106c..9ebe2a037c18 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.103 2009/11/22 22:09:39 marcus Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.107 2010/04/08 23:16:25 kwm Exp $
#
PORTNAME= rhythmbox
-PORTVERSION= 0.12.7
-PORTREVISION= 2
+PORTVERSION= 0.12.8
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
id3tag.0:${PORTSDIR}/audio/libid3tag \
- totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser \
+ totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
soup-2.4.1:${PORTSDIR}/devel/libsoup \
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index 15b1590d0500..b5815fc039bc 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/rhythmbox-0.12.7.tar.bz2) = db53503383a988b1d201d1b4da6a5087
-SHA256 (gnome2/rhythmbox-0.12.7.tar.bz2) = 4ab28b93b2e9d7bc9338194ba6e01549362fdd5b0cf2806da091fbfb2c2a8362
-SIZE (gnome2/rhythmbox-0.12.7.tar.bz2) = 5224160
+MD5 (gnome2/rhythmbox-0.12.8.tar.bz2) = 3e24108119264a0cbd8b4ccbd7732173
+SHA256 (gnome2/rhythmbox-0.12.8.tar.bz2) = 1752fab135808aa78a9afde78448e992020c58c07701f43c989fbabfc6352213
+SIZE (gnome2/rhythmbox-0.12.8.tar.bz2) = 5358950
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index 0b57d1ee7c51..142d513e4910 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -12,6 +12,9 @@ lib/librhythmbox-core.so.0
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/EmbeddedCoverArtSearch.py
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/EmbeddedCoverArtSearch.pyc
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/EmbeddedCoverArtSearch.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LastFMCoverArtSearch.py
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LastFMCoverArtSearch.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LastFMCoverArtSearch.pyo
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.py
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyc
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyo
@@ -25,6 +28,7 @@ lib/librhythmbox-core.so.0
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyc
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyo
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/artdisplay.rb-plugin
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/lastfm_red_small.png
%%PYTHON%%lib/rhythmbox/plugins/artdisplay/rhythmbox-missing-artwork.svg
lib/rhythmbox/plugins/audiocd/album-info.ui
lib/rhythmbox/plugins/audiocd/audiocd-ui.xml
@@ -260,12 +264,15 @@ share/dbus-1/services/org.gnome.Rhythmbox.service
%%DOCSDIR%%/RBPlayerGstTee.html
%%DOCSDIR%%/RBPlaylistManager.html
%%DOCSDIR%%/RBPlaylistSource.html
+%%DOCSDIR%%/RBPlugin.html
%%DOCSDIR%%/RBPropertyView.html
%%DOCSDIR%%/RBQueryCreator.html
%%DOCSDIR%%/RBRandomPlayOrder.html
%%DOCSDIR%%/RBRating.html
%%DOCSDIR%%/RBRemovableMediaManager.html
+%%DOCSDIR%%/RBRemovableMediaSource.html
%%DOCSDIR%%/RBSearchEntry.html
+%%DOCSDIR%%/RBShell.html
%%DOCSDIR%%/RBShellClipboard.html
%%DOCSDIR%%/RBShellPlayer.html
%%DOCSDIR%%/RBShellPreferences.html
@@ -274,12 +281,17 @@ share/dbus-1/services/org.gnome.Rhythmbox.service
%%DOCSDIR%%/RBSourceHeader.html
%%DOCSDIR%%/RBSourceList.html
%%DOCSDIR%%/RBSourceListModel.html
+%%DOCSDIR%%/RBSourceSearch.html
+%%DOCSDIR%%/RBSourceSearchBasic.html
+%%DOCSDIR%%/RBStaticPlaylistSource.html
%%DOCSDIR%%/RBStatusbar.html
+%%DOCSDIR%%/RBStreamingSource.html
%%DOCSDIR%%/RBStringValueMap.html
%%DOCSDIR%%/RBURIDialog.html
%%DOCSDIR%%/RhythmDB.html
%%DOCSDIR%%/RhythmDBImportJob.html
%%DOCSDIR%%/RhythmDBPropertyModel.html
+%%DOCSDIR%%/RhythmDBQueryModel.html
%%DOCSDIR%%/RhythmDBQueryResults.html
%%DOCSDIR%%/ch01.html
%%DOCSDIR%%/ch02.html
@@ -292,9 +304,7 @@ share/dbus-1/services/org.gnome.Rhythmbox.service
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
%%DOCSDIR%%/left.png
-%%DOCSDIR%%/rhythmbox-RBPodcastSource.html
%%DOCSDIR%%/rhythmbox-RBSourceGroup.html
-%%DOCSDIR%%/rhythmbox-eel-gconf-extensions.html
%%DOCSDIR%%/rhythmbox-rb-async-queue-watch.html
%%DOCSDIR%%/rhythmbox-rb-builder-helpers.html
%%DOCSDIR%%/rhythmbox-rb-debug.html
@@ -302,14 +312,9 @@ share/dbus-1/services/org.gnome.Rhythmbox.service
%%DOCSDIR%%/rhythmbox-rb-file-helpers.html
%%DOCSDIR%%/rhythmbox-rb-header.html
%%DOCSDIR%%/rhythmbox-rb-rating-helper.html
-%%DOCSDIR%%/rhythmbox-rb-removable-media-source.html
-%%DOCSDIR%%/rhythmbox-rb-shell.html
-%%DOCSDIR%%/rhythmbox-rb-static-playlist-source.html
-%%DOCSDIR%%/rhythmbox-rb-streaming-source.html
+%%DOCSDIR%%/rhythmbox-rb-text-helpers.html
%%DOCSDIR%%/rhythmbox-rb-tree-dnd.html
%%DOCSDIR%%/rhythmbox-rb-util.html
-%%DOCSDIR%%/rhythmbox-rhythmdb-query-model.html
-%%DOCSDIR%%/rhythmbox-rhythmdb-tree.html
%%DOCSDIR%%/rhythmbox.devhelp
%%DOCSDIR%%/rhythmbox.devhelp2
%%DOCSDIR%%/right.png
@@ -443,6 +448,20 @@ share/gnome/help/rhythmbox/oc/figures/rb-volume-changer.png
share/gnome/help/rhythmbox/oc/figures/rb-window-small.png
share/gnome/help/rhythmbox/oc/figures/rb-window.png
share/gnome/help/rhythmbox/oc/rhythmbox.xml
+share/gnome/help/rhythmbox/pt/figures/rb-iradio-main.png
+share/gnome/help/rhythmbox/pt/figures/rb-notification-area-menu.png
+share/gnome/help/rhythmbox/pt/figures/rb-notification-window.png
+share/gnome/help/rhythmbox/pt/figures/rb-notification-zone.png
+share/gnome/help/rhythmbox/pt/figures/rb-podcast-main.png
+share/gnome/help/rhythmbox/pt/figures/rb-statusbar.png
+share/gnome/help/rhythmbox/pt/figures/rb-toolbar-prevplaynext.png
+share/gnome/help/rhythmbox/pt/figures/rb-toolbar-repeat.png
+share/gnome/help/rhythmbox/pt/figures/rb-toolbar-shuffle.png
+share/gnome/help/rhythmbox/pt/figures/rb-toolbar.png
+share/gnome/help/rhythmbox/pt/figures/rb-volume-changer.png
+share/gnome/help/rhythmbox/pt/figures/rb-window-small.png
+share/gnome/help/rhythmbox/pt/figures/rb-window.png
+share/gnome/help/rhythmbox/pt/rhythmbox.xml
share/gnome/help/rhythmbox/ru/figures/rb-iradio-main.png
share/gnome/help/rhythmbox/ru/figures/rb-notification-area-menu.png
share/gnome/help/rhythmbox/ru/figures/rb-notification-window.png
@@ -502,6 +521,7 @@ share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml
share/icons/hicolor/16x16/apps/rhythmbox.png
share/icons/hicolor/22x22/apps/rhythmbox.png
share/icons/hicolor/24x24/apps/rhythmbox.png
+share/icons/hicolor/24x24/places/music-library.png
share/icons/hicolor/32x32/apps/rhythmbox.png
share/icons/hicolor/48x48/apps/rhythmbox.png
share/icons/hicolor/scalable/apps/rhythmbox.svg
@@ -586,6 +606,7 @@ share/omf/rhythmbox/rhythmbox-es.omf
share/omf/rhythmbox/rhythmbox-fr.omf
share/omf/rhythmbox/rhythmbox-it.omf
share/omf/rhythmbox/rhythmbox-oc.omf
+share/omf/rhythmbox/rhythmbox-pt.omf
share/omf/rhythmbox/rhythmbox-ru.omf
share/omf/rhythmbox/rhythmbox-sv.omf
share/omf/rhythmbox/rhythmbox-uk.omf
@@ -603,6 +624,7 @@ share/rhythmbox/icons/hicolor/16x16/actions/playlist-new.png
share/rhythmbox/icons/hicolor/16x16/actions/podcast-new.png
share/rhythmbox/icons/hicolor/16x16/places/library-internet-radio.png
share/rhythmbox/icons/hicolor/16x16/places/library-podcast.png
+share/rhythmbox/icons/hicolor/16x16/places/music-library.png
share/rhythmbox/icons/hicolor/16x16/places/playlist-automatic.png
share/rhythmbox/icons/hicolor/16x16/places/playlist.png
share/rhythmbox/icons/hicolor/16x16/status/rhythmbox-no-star.png
@@ -688,6 +710,8 @@ share/rhythmbox/uri-new.ui
@dirrm share/gnome/help/rhythmbox/sv
@dirrm share/gnome/help/rhythmbox/ru/figures
@dirrm share/gnome/help/rhythmbox/ru
+@dirrm share/gnome/help/rhythmbox/pt/figures
+@dirrm share/gnome/help/rhythmbox/pt
@dirrm share/gnome/help/rhythmbox/oc/figures
@dirrm share/gnome/help/rhythmbox/oc
@dirrm share/gnome/help/rhythmbox/it/figures
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index acf84df22ca5..eb1383a5cd4d 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -3,12 +3,11 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/sound-juicer/Makefile,v 1.96 2009/11/26 08:20:43 marcus Exp $
+# $MCom: ports/audio/sound-juicer/Makefile,v 1.98 2010/04/01 12:47:54 kwm Exp $
#
PORTNAME= sound-juicer
-PORTVERSION= 2.28.1
-PORTREVISION= 3
+PORTVERSION= 2.28.2
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index 6433beb16e83..5490698b19a9 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/sound-juicer-2.28.1.tar.bz2) = 680c036ca9b062fe198fada30edbf534
-SHA256 (gnome2/sound-juicer-2.28.1.tar.bz2) = 3142cce899812c6fb8c7145d52323f07d6ecfd6ca0503f4c7a32a12c00b8910c
-SIZE (gnome2/sound-juicer-2.28.1.tar.bz2) = 2159961
+MD5 (gnome2/sound-juicer-2.28.2.tar.bz2) = b40da7b2888d0c658fcfdff104ac8bbb
+SHA256 (gnome2/sound-juicer-2.28.2.tar.bz2) = f4dde2db5bfbae023ff5042257600f9acdb42626f878a079c271cc838eefae30
+SIZE (gnome2/sound-juicer-2.28.2.tar.bz2) = 2193659
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index db0061e36e6c..8237c6f3a029 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -76,6 +76,7 @@ share/icons/hicolor/48x48/apps/sound-juicer.png
share/icons/hicolor/scalable/apps/sound-juicer.svg
share/locale/ar/LC_MESSAGES/sound-juicer.mo
share/locale/as/LC_MESSAGES/sound-juicer.mo
+share/locale/ast/LC_MESSAGES/sound-juicer.mo
share/locale/az/LC_MESSAGES/sound-juicer.mo
share/locale/be/LC_MESSAGES/sound-juicer.mo
share/locale/be@latin/LC_MESSAGES/sound-juicer.mo
@@ -243,5 +244,7 @@ share/omf/sound-juicer/sound-juicer-uk.omf
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 394835c07d98..873a9f8592d7 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/evolution-data-server/Makefile,v 1.181 2009/10/18 04:17:46 marcus Exp $
+# $MCom: ports/databases/evolution-data-server/Makefile,v 1.194 2010/04/26 13:45:12 kwm Exp $
#
PORTNAME= evolution-data-server
-PORTVERSION= 2.28.2
-PORTREVISION= 2
+PORTVERSION= 2.30.1
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,6 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= The data backends for the Evolution integrated mail/PIM suite
LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
ical.43:${PORTSDIR}/devel/libical \
nss3.1:${PORTSDIR}/security/nss \
tasn1.4:${PORTSDIR}/security/libtasn1 \
@@ -27,33 +27,34 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= build
USE_GETTEXT= yes
-USE_GNOME= gnomeprefix gnomehack intlhack ltverhack ltasneededhack \
- libglade2 libbonobo
+USE_GNOME= gnomeprefix gnomehack intlhack ltverhack ltasneededhack gconf2 \
+ libxml2
USE_OPENLDAP= yes
USE_AUTOTOOLS= libtool:22
USE_BDB= 41+
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static \
- --enable-nss=yes \
--enable-gnome-keyring=yes \
--with-openldap=yes \
--with-libdb=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-PLIST_SUB= VERSION="2.28" EVO_VERSION="1.2"
+PLIST_SUB= VERSION="2.30" EVO_VERSION="1.2"
#OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off
OPTIONS= WEATHER "Enable weather calendar backend" on
.include <bsd.port.pre.mk>
-.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL)
-HEIMDAL_HOME?= ${LOCALBASE}
+.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) || defined(NO_KERBEROS)
+HEIMDAL_HOME?= ${LOCALBASE}
LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal
-CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include
+CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME} \
+ --with-krb5-includes=${HEIMDAL_HOME}/include
+KRB5_LIB= `${HEIMDAL_HOME}/bin/krb5-config gssapi --libs`
.elif !defined(NO_KERBEROS)
-CONFIGURE_ARGS+= --with-krb5=/usr
+CONFIGURE_ARGS+= --with-krb5=/usr
KRB5_LIB= `/usr/bin/krb5-config gssapi --libs`
.endif
@@ -83,6 +84,7 @@ pre-everything::
post-patch:
@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g ; \
s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g ; \
+ s|-Wl,--no-undefined||g ; \
s|-Wmissing-include-dirs||g' \
${WRKSRC}/configure
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index b6f634ba1f21..cd82fa631e3b 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-2.28.2.tar.bz2) = 416248e60b1bec3f913a6857576cbcb0
-SHA256 (gnome2/evolution-data-server-2.28.2.tar.bz2) = 12e3ba23e4021a70be9cb6d418d1966883ee940bfa1a298294b036bde90faf2c
-SIZE (gnome2/evolution-data-server-2.28.2.tar.bz2) = 22319961
+MD5 (gnome2/evolution-data-server-2.30.1.tar.bz2) = f177441d6fd4ef8c9a92d5706d290f10
+SHA256 (gnome2/evolution-data-server-2.30.1.tar.bz2) = b2ebeac36931fbee6fb747ee535a61243dd99fa15bc472ca239f2b01cc88795e
+SIZE (gnome2/evolution-data-server-2.30.1.tar.bz2) = 4636784
diff --git a/databases/evolution-data-server/files/patch-camel_providers_imapx_Makefile.in b/databases/evolution-data-server/files/patch-camel_providers_imapx_Makefile.in
new file mode 100644
index 000000000000..0e1321d75ee0
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_providers_imapx_Makefile.in
@@ -0,0 +1,13 @@
+Our gperf (2.7.2) doesn't understand --output-file.
+
+--- camel/providers/imapx/Makefile.in.orig 2010-04-26 14:33:56.000000000 +0200
++++ camel/providers/imapx/Makefile.in 2010-04-26 14:35:10.000000000 +0200
+@@ -914,7 +914,7 @@ uninstall-am: uninstall-camel_providerDA
+
+
+ camel-imapx-tokenise.h: camel-imapx-tokens.txt
+- @GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< --output-file=$@
++ @GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< > $@
+
+ -include $(top_srcdir)/git.mk
+
diff --git a/databases/evolution-data-server/files/patch-camel_providers_imapx_camel-imapx-tokens.txt b/databases/evolution-data-server/files/patch-camel_providers_imapx_camel-imapx-tokens.txt
new file mode 100644
index 000000000000..8ce6381e9d83
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_providers_imapx_camel-imapx-tokens.txt
@@ -0,0 +1,8 @@
+--- camel/providers/imapx/camel-imapx-tokens.txt.orig 2010-04-26 14:25:22.000000000 +0200
++++ camel/providers/imapx/camel-imapx-tokens.txt 2010-04-26 14:25:32.000000000 +0200
+@@ -1,5 +1,3 @@
+-/* This contains all of the keywords we care about. These
+- can be converted to an id very efficiently */
+ struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; };
+ struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len);
+ %%
diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure
index 65af28acc7b9..5273840934bb 100644
--- a/databases/evolution-data-server/files/patch-configure
+++ b/databases/evolution-data-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2009-08-24 10:39:07.000000000 +0200
-+++ configure 2009-08-24 10:44:47.000000000 +0200
-@@ -15988,6 +15988,14 @@ cat >>confdefs.h <<\_ACEOF
+--- configure.orig 2009-12-25 20:21:00.000000000 +0100
++++ configure 2009-12-25 20:21:01.000000000 +0100
+@@ -15968,6 +15968,14 @@
_ACEOF
;;
@@ -15,12 +15,3 @@
*)
os_win32=no
NO_UNDEFINED=''
-@@ -24777,7 +24785,7 @@ idldir='${datadir}'/idl/evolution-data-s
- imagesdir='${datadir}'/pixmaps/evolution-data-server
-
-
--serverdir="$libdir/bonobo/servers"
-+serverdir="$prefix/libdata/bonobo/servers"
-
-
- extensiondir='${libdir}'/evolution-data-server-$API_VERSION/extensions
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index 3845563c6623..8d112f6add3a 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -79,7 +79,6 @@ include/evolution-data-server-%%VERSION%%/camel/camel-sasl-anonymous.h
include/evolution-data-server-%%VERSION%%/camel/camel-sasl-cram-md5.h
include/evolution-data-server-%%VERSION%%/camel/camel-sasl-digest-md5.h
include/evolution-data-server-%%VERSION%%/camel/camel-sasl-gssapi.h
-include/evolution-data-server-%%VERSION%%/camel/camel-sasl-kerberos4.h
include/evolution-data-server-%%VERSION%%/camel/camel-sasl-login.h
include/evolution-data-server-%%VERSION%%/camel/camel-sasl-ntlm.h
include/evolution-data-server-%%VERSION%%/camel/camel-sasl-plain.h
@@ -120,39 +119,6 @@ include/evolution-data-server-%%VERSION%%/camel/camel-vee-store.h
include/evolution-data-server-%%VERSION%%/camel/camel-vee-summary.h
include/evolution-data-server-%%VERSION%%/camel/camel-vtrash-folder.h
include/evolution-data-server-%%VERSION%%/camel/camel.h
-include/evolution-data-server-%%VERSION%%/exchange/e-folder-exchange.h
-include/evolution-data-server-%%VERSION%%/exchange/e-folder.h
-include/evolution-data-server-%%VERSION%%/exchange/e-storage.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-autoconfig.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-context.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-freebusy.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-global-catalog-ldap.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-global-catalog.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-http-utils.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-marshal.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-operation.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-properties.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-propnames.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-restriction.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-result.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-security-descriptor.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-sid.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-types.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-uri.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-utils.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-validate.h
-include/evolution-data-server-%%VERSION%%/exchange/e2k-xml-utils.h
-include/evolution-data-server-%%VERSION%%/exchange/exchange-account.h
-include/evolution-data-server-%%VERSION%%/exchange/exchange-constants.h
-include/evolution-data-server-%%VERSION%%/exchange/exchange-esource.h
-include/evolution-data-server-%%VERSION%%/exchange/exchange-folder-size.h
-include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy-foreign.h
-include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy-somedav.h
-include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy-webdav.h
-include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy.h
-include/evolution-data-server-%%VERSION%%/exchange/exchange-oof.h
-include/evolution-data-server-%%VERSION%%/exchange/exchange-types.h
-include/evolution-data-server-%%VERSION%%/exchange/mapi.h
include/evolution-data-server-%%VERSION%%/google/libgdata-google/gdata-google-service.h
include/evolution-data-server-%%VERSION%%/google/libgdata/gdata-entry.h
include/evolution-data-server-%%VERSION%%/google/libgdata/gdata-feed.h
@@ -171,6 +137,7 @@ include/evolution-data-server-%%VERSION%%/libebackend/e-data-server-module.h
include/evolution-data-server-%%VERSION%%/libebackend/e-db3-utils.h
include/evolution-data-server-%%VERSION%%/libebackend/e-dbhash.h
include/evolution-data-server-%%VERSION%%/libebackend/e-file-cache.h
+include/evolution-data-server-%%VERSION%%/libebackend/e-offline-listener.h
include/evolution-data-server-%%VERSION%%/libebook/e-address-western.h
include/evolution-data-server-%%VERSION%%/libebook/e-book-query.h
include/evolution-data-server-%%VERSION%%/libebook/e-book-types.h
@@ -189,7 +156,6 @@ include/evolution-data-server-%%VERSION%%/libecal/e-cal-types.h
include/evolution-data-server-%%VERSION%%/libecal/e-cal-util.h
include/evolution-data-server-%%VERSION%%/libecal/e-cal-view.h
include/evolution-data-server-%%VERSION%%/libecal/e-cal.h
-include/evolution-data-server-%%VERSION%%/libedata-book/Evolution-DataServer-Addressbook.h
include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-cache.h
include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-db-cache.h
include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-factory.h
@@ -201,11 +167,9 @@ include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book-factory.h
include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book-types.h
include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book-view.h
include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book.h
-include/evolution-data-server-%%VERSION%%/libedata-cal/Evolution-DataServer-Calendar.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-cache.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-factory.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-file-store.h
-include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-loader-factory.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sexp.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-store.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sync.h
@@ -213,12 +177,12 @@ include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-util.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-common.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-factory.h
+include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-types.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-view.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-account-list.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-account.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-categories.h
-include/evolution-data-server-%%VERSION%%/libedataserver/e-component-listener.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-data-server-util.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-flag.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-iconv.h
@@ -265,6 +229,10 @@ lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.a
lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.la
lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.so
lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.urls
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimapx.a
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimapx.la
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimapx.so
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimapx.urls
%%IMAP4%%lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.a
%%IMAP4%%lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.la
%%IMAP4%%lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.so
@@ -355,7 +323,7 @@ lib/libedata-book-%%EVO_VERSION%%.so.2
lib/libedata-cal-%%EVO_VERSION%%.a
lib/libedata-cal-%%EVO_VERSION%%.la
lib/libedata-cal-%%EVO_VERSION%%.so
-lib/libedata-cal-%%EVO_VERSION%%.so.6
+lib/libedata-cal-%%EVO_VERSION%%.so.7
lib/libedataserver-%%EVO_VERSION%%.a
lib/libedataserver-%%EVO_VERSION%%.la
lib/libedataserver-%%EVO_VERSION%%.so
@@ -368,10 +336,6 @@ lib/libegroupwise-%%EVO_VERSION%%.a
lib/libegroupwise-%%EVO_VERSION%%.la
lib/libegroupwise-%%EVO_VERSION%%.so
lib/libegroupwise-%%EVO_VERSION%%.so.13
-lib/libexchange-storage-%%EVO_VERSION%%.a
-lib/libexchange-storage-%%EVO_VERSION%%.la
-lib/libexchange-storage-%%EVO_VERSION%%.so
-lib/libexchange-storage-%%EVO_VERSION%%.so.3
lib/libgdata-%%EVO_VERSION%%.a
lib/libgdata-%%EVO_VERSION%%.la
lib/libgdata-%%EVO_VERSION%%.so
@@ -380,7 +344,6 @@ lib/libgdata-google-%%EVO_VERSION%%.a
lib/libgdata-google-%%EVO_VERSION%%.la
lib/libgdata-google-%%EVO_VERSION%%.so
lib/libgdata-google-%%EVO_VERSION%%.so.1
-libdata/bonobo/servers/GNOME_Evolution_DataServer_%%EVO_VERSION%%.server
libdata/pkgconfig/camel-%%EVO_VERSION%%.pc
libdata/pkgconfig/camel-provider-%%EVO_VERSION%%.pc
libdata/pkgconfig/evolution-data-server-%%EVO_VERSION%%.pc
@@ -392,12 +355,14 @@ libdata/pkgconfig/libedata-cal-%%EVO_VERSION%%.pc
libdata/pkgconfig/libedataserver-%%EVO_VERSION%%.pc
libdata/pkgconfig/libedataserverui-%%EVO_VERSION%%.pc
libdata/pkgconfig/libegroupwise-%%EVO_VERSION%%.pc
-libdata/pkgconfig/libexchange-storage-%%EVO_VERSION%%.pc
libdata/pkgconfig/libgdata-%%EVO_VERSION%%.pc
libdata/pkgconfig/libgdata-google-%%EVO_VERSION%%.pc
libexec/camel-index-control-%%EVO_VERSION%%
libexec/camel-lock-helper-%%EVO_VERSION%%
-libexec/evolution-data-server-%%VERSION%%
+libexec/e-addressbook-factory
+libexec/e-calendar-factory
+share/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service
+share/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
share/doc/camel/Addresses.html
share/doc/camel/ClassTree.html
share/doc/camel/Crypto.html
@@ -406,18 +371,31 @@ share/doc/camel/Filters.html
share/doc/camel/Folders.html
share/doc/camel/Fundamentals.html
share/doc/camel/MIME.html
-share/doc/camel/SearchFolders.html
+share/doc/camel/Search-Folders.html
share/doc/camel/Services.html
share/doc/camel/Storage.html
-share/doc/camel/StreamFilters.html
+share/doc/camel/Stream-Filters.html
share/doc/camel/Streams.html
share/doc/camel/Utilities.html
+share/doc/camel/api-index-2.22.html
+share/doc/camel/api-index-2.24.html
+share/doc/camel/api-index-2.26.html
+share/doc/camel/api-index-2.28.html
+share/doc/camel/api-index-2.30.html
+share/doc/camel/api-index-deprecated.html
+share/doc/camel/api-index-full.html
share/doc/camel/camel-CamelAddress.html
share/doc/camel/camel-CamelCertDB.html
share/doc/camel/camel-CamelCipherContext.html
share/doc/camel/camel-CamelDB.html
share/doc/camel/camel-CamelDataCache.html
share/doc/camel/camel-CamelDataWrapper.html
+share/doc/camel/camel-CamelDigestFolder.html
+share/doc/camel/camel-CamelDigestStore.html
+share/doc/camel/camel-CamelDigestSummary.html
+share/doc/camel/camel-CamelDiscoDiary.html
+share/doc/camel/camel-CamelDiscoFolder.html
+share/doc/camel/camel-CamelDiscoStore.html
share/doc/camel/camel-CamelFilterDriver.html
share/doc/camel/camel-CamelFolder.html
share/doc/camel/camel-CamelFolderSearch.html
@@ -466,7 +444,6 @@ share/doc/camel/camel-CamelSaslAnonymous.html
share/doc/camel/camel-CamelSaslCramMd5.html
share/doc/camel/camel-CamelSaslDigestMd5.html
share/doc/camel/camel-CamelSaslGssapi.html
-share/doc/camel/camel-CamelSaslKerberos4.html
share/doc/camel/camel-CamelSaslLogin.html
share/doc/camel/camel-CamelSaslNTLM.html
share/doc/camel/camel-CamelSaslPOPB4SMTP.html
@@ -501,7 +478,6 @@ share/doc/camel/camel-camel-exception.html
share/doc/camel/camel-camel-file-utils.html
share/doc/camel/camel-camel-filter-search.html
share/doc/camel/camel-camel-folder-thread.html
-share/doc/camel/camel-camel-i18n.html
share/doc/camel/camel-camel-iconv.html
share/doc/camel/camel-camel-junk-plugin.html
share/doc/camel/camel-camel-list-utils.html
@@ -521,44 +497,53 @@ share/doc/camel/camel-camel-uid-cache.html
share/doc/camel/camel-camel-url-scanner.html
share/doc/camel/camel-camel-url.html
share/doc/camel/camel-camel-utf8.html
+share/doc/camel/camel-camel.html
share/doc/camel/camel.devhelp
share/doc/camel/camel.devhelp2
share/doc/camel/classes.html
share/doc/camel/home.png
share/doc/camel/index.html
share/doc/camel/index.sgml
-share/doc/camel/ix01.html
-share/doc/camel/ix02.html
share/doc/camel/left.png
share/doc/camel/right.png
share/doc/camel/style.css
share/doc/camel/up.png
-share/doc/libebackend/EFileCache.html
+share/doc/libebackend/api-index-2.24.html
+share/doc/libebackend/api-index-2.26.html
+share/doc/libebackend/api-index-2.28.html
+share/doc/libebackend/api-index-2.30.html
share/doc/libebackend/ch01.html
share/doc/libebackend/home.png
share/doc/libebackend/index.html
share/doc/libebackend/index.sgml
+share/doc/libebackend/ix01.html
share/doc/libebackend/left.png
+share/doc/libebackend/libebackend-EOfflineListener.html
share/doc/libebackend/libebackend-e-data-server-module.html
share/doc/libebackend/libebackend-e-db3-utils.html
share/doc/libebackend/libebackend-e-dbhash.html
+share/doc/libebackend/libebackend-e-file-cache.html
share/doc/libebackend/libebackend.devhelp
share/doc/libebackend/libebackend.devhelp2
share/doc/libebackend/right.png
share/doc/libebackend/style.css
share/doc/libebackend/up.png
share/doc/libebook/EBook.html
-share/doc/libebook/EBookListener.html
share/doc/libebook/EBookView.html
-share/doc/libebook/EBookViewListener.html
share/doc/libebook/EContact.html
share/doc/libebook/EDestination.html
share/doc/libebook/EVCard.html
+share/doc/libebook/api-index-1.12.html
+share/doc/libebook/api-index-2.22.html
+share/doc/libebook/api-index-2.24.html
+share/doc/libebook/api-index-2.26.html
+share/doc/libebook/api-index-2.28.html
+share/doc/libebook/api-index-2.30.html
+share/doc/libebook/api-index-full.html
share/doc/libebook/ch01.html
share/doc/libebook/home.png
share/doc/libebook/index.html
share/doc/libebook/index.sgml
-share/doc/libebook/ix01.html
share/doc/libebook/left.png
share/doc/libebook/libebook-EAddressWestern.html
share/doc/libebook/libebook-ENameWestern.html
@@ -571,14 +556,18 @@ share/doc/libebook/style.css
share/doc/libebook/up.png
share/doc/libecal/ECal.html
share/doc/libecal/ECalComponent.html
-share/doc/libecal/ECalListener.html
share/doc/libecal/ECalView.html
-share/doc/libecal/ECalViewListener.html
+share/doc/libecal/api-index-1.12.html
+share/doc/libecal/api-index-2.22.html
+share/doc/libecal/api-index-2.24.html
+share/doc/libecal/api-index-2.26.html
+share/doc/libecal/api-index-2.28.html
+share/doc/libecal/api-index-2.30.html
+share/doc/libecal/api-index-full.html
share/doc/libecal/ch01.html
share/doc/libecal/home.png
share/doc/libecal/index.html
share/doc/libecal/index.sgml
-share/doc/libecal/ix01.html
share/doc/libecal/left.png
share/doc/libecal/libecal-e-cal-check-timezones.html
share/doc/libecal/libecal-e-cal-recur.html
@@ -599,12 +588,21 @@ share/doc/libedata-book/EBookBackendSummary.html
share/doc/libedata-book/EBookBackendSync.html
share/doc/libedata-book/EDataBook.html
share/doc/libedata-book/EDataBookView.html
+share/doc/libedata-book/api-index-1.12.html
+share/doc/libedata-book/api-index-2.22.html
+share/doc/libedata-book/api-index-2.24.html
+share/doc/libedata-book/api-index-2.26.html
+share/doc/libedata-book/api-index-2.28.html
+share/doc/libedata-book/api-index-2.30.html
+share/doc/libedata-book/api-index-full.html
share/doc/libedata-book/ch01.html
share/doc/libedata-book/home.png
share/doc/libedata-book/index.html
share/doc/libedata-book/index.sgml
-share/doc/libedata-book/ix01.html
share/doc/libedata-book/left.png
+share/doc/libedata-book/libedata-book-EDataBookFactory.html
+share/doc/libedata-book/libedata-book-e-book-backend-db-cache.html
+share/doc/libedata-book/libedata-book-ximian-vcard.html
share/doc/libedata-book/libedata-book.devhelp
share/doc/libedata-book/libedata-book.devhelp2
share/doc/libedata-book/right.png
@@ -616,14 +614,24 @@ share/doc/libedata-cal/ECalBackendFactory.html
share/doc/libedata-cal/ECalBackendSExp.html
share/doc/libedata-cal/ECalBackendSync.html
share/doc/libedata-cal/EDataCal.html
-share/doc/libedata-cal/EDataCalFactory.html
-share/doc/libedata-cal/EDataCalView.html
+share/doc/libedata-cal/api-index-1.12.html
+share/doc/libedata-cal/api-index-2.22.html
+share/doc/libedata-cal/api-index-2.24.html
+share/doc/libedata-cal/api-index-2.26.html
+share/doc/libedata-cal/api-index-2.28.html
+share/doc/libedata-cal/api-index-2.30.html
+share/doc/libedata-cal/api-index-full.html
share/doc/libedata-cal/ch01.html
share/doc/libedata-cal/home.png
share/doc/libedata-cal/index.html
share/doc/libedata-cal/index.sgml
-share/doc/libedata-cal/ix01.html
share/doc/libedata-cal/left.png
+share/doc/libedata-cal/libedata-cal-ECalBackendFileStore.html
+share/doc/libedata-cal/libedata-cal-ECalBackendLoaderFactory.html
+share/doc/libedata-cal/libedata-cal-ECalBackendStore.html
+share/doc/libedata-cal/libedata-cal-EDataCalFactory.html
+share/doc/libedata-cal/libedata-cal-EDataCalView.html
+share/doc/libedata-cal/libedata-cal-e-cal-backend-util.html
share/doc/libedata-cal/libedata-cal.devhelp
share/doc/libedata-cal/libedata-cal.devhelp2
share/doc/libedata-cal/right.png
@@ -631,22 +639,28 @@ share/doc/libedata-cal/style.css
share/doc/libedata-cal/up.png
share/doc/libedataserver/EAccount.html
share/doc/libedataserver/EAccountList.html
-share/doc/libedataserver/EComponentListener.html
share/doc/libedataserver/EIterator.html
share/doc/libedataserver/EList.html
share/doc/libedataserver/EListIterator.html
share/doc/libedataserver/ESource.html
share/doc/libedataserver/ESourceGroup.html
share/doc/libedataserver/ESourceList.html
+share/doc/libedataserver/api-index-1.12.html
+share/doc/libedataserver/api-index-2.22.html
+share/doc/libedataserver/api-index-2.24.html
+share/doc/libedataserver/api-index-2.26.html
+share/doc/libedataserver/api-index-2.28.html
+share/doc/libedataserver/api-index-2.30.html
+share/doc/libedataserver/api-index-full.html
share/doc/libedataserver/ch01.html
share/doc/libedataserver/home.png
share/doc/libedataserver/index.html
share/doc/libedataserver/index.sgml
-share/doc/libedataserver/ix01.html
share/doc/libedataserver/left.png
share/doc/libedataserver/libedataserver-EFlag.html
share/doc/libedataserver/libedataserver-EProxy.html
share/doc/libedataserver/libedataserver-ESExp.html
+share/doc/libedataserver/libedataserver-Version-Information.html
share/doc/libedataserver/libedataserver-e-categories.html
share/doc/libedataserver/libedataserver-e-iconv.html
share/doc/libedataserver/libedataserver-e-memory.html
@@ -676,12 +690,22 @@ share/doc/libedataserverui/ESourceOptionMenu.html
share/doc/libedataserverui/ESourceSelector.html
share/doc/libedataserverui/ESourceSelectorDialog.html
share/doc/libedataserverui/ETreeModelGenerator.html
+share/doc/libedataserverui/api-index-1.12.html
+share/doc/libedataserverui/api-index-2.22.html
+share/doc/libedataserverui/api-index-2.24.html
+share/doc/libedataserverui/api-index-2.26.html
+share/doc/libedataserverui/api-index-2.28.html
+share/doc/libedataserverui/api-index-2.30.html
+share/doc/libedataserverui/api-index-full.html
share/doc/libedataserverui/ch01.html
share/doc/libedataserverui/home.png
share/doc/libedataserverui/index.html
share/doc/libedataserverui/index.sgml
-share/doc/libedataserverui/ix01.html
share/doc/libedataserverui/left.png
+share/doc/libedataserverui/libedataserverui-ECategoryCompletion.html
+share/doc/libedataserverui/libedataserverui-ECellRendererColor.html
+share/doc/libedataserverui/libedataserverui-e-book-auth-util.html
+share/doc/libedataserverui/libedataserverui-e-data-server-ui-marshal.html
share/doc/libedataserverui/libedataserverui-e-passwords.html
share/doc/libedataserverui/libedataserverui.devhelp
share/doc/libedataserverui/libedataserverui.devhelp2
@@ -689,12 +713,9 @@ share/doc/libedataserverui/right.png
share/doc/libedataserverui/style.css
share/doc/libedataserverui/up.png
share/evolution-data-server-%%VERSION%%/evolutionperson.schema
-share/evolution-data-server-%%VERSION%%/glade/e-categories-dialog.glade
-share/evolution-data-server-%%VERSION%%/glade/e-name-selector-dialog.glade
+share/evolution-data-server-%%VERSION%%/ui/e-categories-dialog.ui
+share/evolution-data-server-%%VERSION%%/ui/e-name-selector-dialog.ui
%%WEATHER%%share/evolution-data-server-%%VERSION%%/weather/Locations.xml
-share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Addressbook.idl
-share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Calendar.idl
-share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer.idl
share/locale/am/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/ar/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/as/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -716,6 +737,7 @@ share/locale/el/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/en_AU/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/en_CA/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/en@shaw/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/es/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/et/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/eu/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -795,9 +817,8 @@ share/pixmaps/evolution-data-server/category_strategies_16.png
share/pixmaps/evolution-data-server/category_suppliers_16.png
share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
@dirrm share/pixmaps/evolution-data-server
-@dirrm share/idl/evolution-data-server-%%EVO_VERSION%%
%%WEATHER%%@dirrm share/evolution-data-server-%%VERSION%%/weather
-@dirrm share/evolution-data-server-%%VERSION%%/glade
+@dirrm share/evolution-data-server-%%VERSION%%/ui
@dirrm share/evolution-data-server-%%VERSION%%
@dirrm share/doc/libedataserverui
@dirrm share/doc/libedataserver
@@ -821,7 +842,6 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
@dirrm include/evolution-data-server-%%VERSION%%/google/libgdata-google
@dirrm include/evolution-data-server-%%VERSION%%/google/libgdata
@dirrm include/evolution-data-server-%%VERSION%%/google
-@dirrm include/evolution-data-server-%%VERSION%%/exchange
@dirrm include/evolution-data-server-%%VERSION%%/camel
@dirrm include/evolution-data-server-%%VERSION%%
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -844,10 +864,10 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/ast/LC_MESSAGES
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 8150342718d9..2ce848039d61 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/databases/libgda4/Makefile,v 1.2 2009/04/18 20:16:29 marcus Exp $
+# $MCom: ports/databases/libgda4/Makefile,v 1.5 2010/03/14 19:24:27 marcus Exp $
#
PORTNAME= libgda4
-PORTVERSION?= 4.0.7
-PORTREVISION?= 1
+PORTVERSION?= 4.0.8
+PORTREVISION?= 0
CATEGORIES= databases gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/4$//}/${PORTVERSION:R}
@@ -23,9 +23,11 @@ LIBGDA4_SLAVE?= no
.if !defined(REFERENCE_PORT)
+BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
soup-2.4.1:${PORTSDIR}/devel/libsoup \
json-glib-1.0.0:${PORTSDIR}/devel/json-glib
+RUN_DEPENDS= ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection
USE_AUTOTOOLS= libtool:22
USE_GETTEXT= yes
@@ -33,7 +35,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack glib20 libxslt intlhack referencehack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --without-sybase
+CONFIGURE_ARGS= --without-sybase \
+ --enable-introspection
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/databases/libgda4/distinfo b/databases/libgda4/distinfo
index 0c6322167af2..eed091dfa0ea 100644
--- a/databases/libgda4/distinfo
+++ b/databases/libgda4/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgda-4.0.7.tar.bz2) = 875e41166eecde04b075fa451a6773ad
-SHA256 (gnome2/libgda-4.0.7.tar.bz2) = dffffc6524ecac05a4c891a9c3fca99abce9fb1bc368933a542d6afaf3ba8240
-SIZE (gnome2/libgda-4.0.7.tar.bz2) = 8198052
+MD5 (gnome2/libgda-4.0.8.tar.bz2) = 3e4a55f370805cda9ac415211da4aacc
+SHA256 (gnome2/libgda-4.0.8.tar.bz2) = c731cd8015f63a3bff37341cb8ffc4d8086a535d960af098194968ac87555788
+SIZE (gnome2/libgda-4.0.8.tar.bz2) = 8229914
diff --git a/databases/libgda4/files/patch-libgda_Makefile.in b/databases/libgda4/files/patch-libgda_Makefile.in
new file mode 100644
index 000000000000..e33d5924a1d5
--- /dev/null
+++ b/databases/libgda4/files/patch-libgda_Makefile.in
@@ -0,0 +1,12 @@
+--- libgda/Makefile.in.orig 2010-03-21 03:57:28.000000000 -0400
++++ libgda/Makefile.in 2010-03-21 03:58:29.000000000 -0400
+@@ -1349,7 +1349,8 @@ dist-hook:
+ @HAVE_INTROSPECTION_TRUE@ --include=GL-1.0 \
+ @HAVE_INTROSPECTION_TRUE@ --include=GObject-2.0 \
+ @HAVE_INTROSPECTION_TRUE@ --include=libxml2-2.0 \
+-@HAVE_INTROSPECTION_TRUE@ --library=gda-@GDA_ABI_VERSION@ \
++@HAVE_INTROSPECTION_TRUE@ --libtool="$(LIBTOOL)" \
++@HAVE_INTROSPECTION_TRUE@ --library=libgda-@GDA_ABI_VERSION@.la \
+ @HAVE_INTROSPECTION_TRUE@ $(INCLUDE_CFLAGS) \
+ @HAVE_INTROSPECTION_TRUE@ --output $@ \
+ @HAVE_INTROSPECTION_TRUE@ $(addprefix $(srcdir)/, $(gda_headers)) \
diff --git a/databases/libgda4/pkg-plist b/databases/libgda4/pkg-plist
index cdd203c443ca..90fa9176857d 100644
--- a/databases/libgda4/pkg-plist
+++ b/databases/libgda4/pkg-plist
@@ -103,6 +103,7 @@ include/libgda-%%VERSION%%/libgda/virtual/gda-virtual-provider.h
include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-data-model.h
include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-hub.h
include/libgda-%%VERSION%%/libgda/virtual/libgda-virtual.h
+lib/girepository-1.0/Gda-4.0.typelib
lib/libgda-%%VERSION%%.a
lib/libgda-%%VERSION%%.la
lib/libgda-%%VERSION%%.so
@@ -122,6 +123,7 @@ libdata/pkgconfig/libgda-%%VERSION%%.pc
libdata/pkgconfig/libgda-report-%%VERSION%%.pc
libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc
libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
+share/gir-1.0/Gda-4.0.gir
share/libgda-%%VERSION%%/dtd/libgda-array.dtd
share/libgda-%%VERSION%%/dtd/libgda-paramlist.dtd
share/libgda-%%VERSION%%/dtd/libgda-server-operation.dtd
diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index 22246ec7e70e..4cbe482ddf37 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -3,12 +3,11 @@
# Whom: FreeBSD GNOME Team
#
# $FreeBSD$
-# $MCom: ports/deskutils/alacarte/Makefile,v 1.23 2009/09/21 16:31:27 kwm Exp $
+# $MCom: ports/deskutils/alacarte/Makefile,v 1.25 2010/03/29 13:19:00 avl Exp $
#
PORTNAME= alacarte
-PORTVERSION= 0.12.4
-PORTREVISION= 2
+PORTVERSION= 0.13.1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/alacarte/distinfo b/deskutils/alacarte/distinfo
index cbfdedd10ff9..f1a887f4efc0 100644
--- a/deskutils/alacarte/distinfo
+++ b/deskutils/alacarte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/alacarte-0.12.4.tar.bz2) = 914f863f6bd152b4ab6407d07d853f45
-SHA256 (gnome2/alacarte-0.12.4.tar.bz2) = f5bccd47d96b22ee73cf537d86bb90cb7b7e0f70ac68253fe512540e5bf64823
-SIZE (gnome2/alacarte-0.12.4.tar.bz2) = 189318
+MD5 (gnome2/alacarte-0.13.1.tar.bz2) = b45232eaf093e7e1fbf99b335d8b880c
+SHA256 (gnome2/alacarte-0.13.1.tar.bz2) = 76bfea066ee7e0d2b7d878d4da6452594cf9b41039c8748de06a982c162f150f
+SIZE (gnome2/alacarte-0.13.1.tar.bz2) = 190512
diff --git a/deskutils/alacarte/pkg-plist b/deskutils/alacarte/pkg-plist
index d1f33097c240..f967a1736daa 100644
--- a/deskutils/alacarte/pkg-plist
+++ b/deskutils/alacarte/pkg-plist
@@ -41,6 +41,7 @@ share/locale/da/LC_MESSAGES/alacarte.mo
share/locale/de/LC_MESSAGES/alacarte.mo
share/locale/dz/LC_MESSAGES/alacarte.mo
share/locale/el/LC_MESSAGES/alacarte.mo
+share/locale/en@shaw/LC_MESSAGES/alacarte.mo
share/locale/en_CA/LC_MESSAGES/alacarte.mo
share/locale/en_GB/LC_MESSAGES/alacarte.mo
share/locale/eo/LC_MESSAGES/alacarte.mo
@@ -75,6 +76,7 @@ share/locale/mk/LC_MESSAGES/alacarte.mo
share/locale/ml/LC_MESSAGES/alacarte.mo
share/locale/mn/LC_MESSAGES/alacarte.mo
share/locale/mr/LC_MESSAGES/alacarte.mo
+share/locale/ms/LC_MESSAGES/alacarte.mo
share/locale/nb/LC_MESSAGES/alacarte.mo
share/locale/nds/LC_MESSAGES/alacarte.mo
share/locale/nl/LC_MESSAGES/alacarte.mo
diff --git a/deskutils/contacts/Makefile b/deskutils/contacts/Makefile
index 08a7b5710f30..a571e1ddb86d 100644
--- a/deskutils/contacts/Makefile
+++ b/deskutils/contacts/Makefile
@@ -7,7 +7,7 @@
PORTNAME= contacts
PORTVERSION= 0.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils gnome
MASTER_SITES= http://pimlico-project.org/sources/${PORTNAME}/
DIST_SUBDIR= gnome2
@@ -18,7 +18,7 @@ COMMENT= Simple yet powerful address book based on Evolution data server
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
USE_GMAKE= yes
-USE_GNOME= gtk20 gnomehier evolutiondataserver
+USE_GNOME= gtk20 gnomehier evolutiondataserver gnomevfs2
USE_AUTOTOOLS= libtool:22
GCONF_SCHEMAS= contacts.schemas
MAN1= ${PORTNAME}.1
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 82342ec8dd7d..0dc1b6c4a94e 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.109 2009/09/22 10:54:20 kwm Exp $
+# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.114 2010/05/02 11:44:22 kwm Exp $
#
PORTNAME= deskbar-applet
-PORTVERSION= 2.28.0
-PORTREVISION= 2
+PORTVERSION= 2.30.1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo
index 1120f841d3f8..01879e9f78e3 100644
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/deskbar-applet-2.28.0.tar.bz2) = dae686b2958688f15bb365afd8485c8e
-SHA256 (gnome2/deskbar-applet-2.28.0.tar.bz2) = bdac5c8a3595078911c1aba9f1013c936cdaaed41efbd87d092dfbc04b0ea2cb
-SIZE (gnome2/deskbar-applet-2.28.0.tar.bz2) = 1087593
+MD5 (gnome2/deskbar-applet-2.30.1.tar.bz2) = 80ba002fb063a9f034cc82d7099932e5
+SHA256 (gnome2/deskbar-applet-2.30.1.tar.bz2) = 0754e15db1b5295dbb7e4134bafe06ffad054cf09d8f3034b95b14a0af534a89
+SIZE (gnome2/deskbar-applet-2.30.1.tar.bz2) = 1064879
diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist
index 48f9ee60b1ae..e2850c7fa3d1 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -383,6 +383,7 @@ share/locale/da/LC_MESSAGES/deskbar-applet.mo
share/locale/de/LC_MESSAGES/deskbar-applet.mo
share/locale/dz/LC_MESSAGES/deskbar-applet.mo
share/locale/el/LC_MESSAGES/deskbar-applet.mo
+share/locale/en@shaw/LC_MESSAGES/deskbar-applet.mo
share/locale/en_CA/LC_MESSAGES/deskbar-applet.mo
share/locale/en_GB/LC_MESSAGES/deskbar-applet.mo
share/locale/es/LC_MESSAGES/deskbar-applet.mo
@@ -530,6 +531,8 @@ share/omf/deskbar/deskbar-zh_CN.omf
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile
index f59be24ac7f2..6de434d343fe 100644
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@@ -19,6 +19,8 @@ COMMENT= Sun Java Enterprise System Calendar Server provider for Evolution
BUILD_DEPENDS= evolution:${PORTSDIR}/mail/evolution
RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution
+IGNORE= Doesn't build or work with Evolution 2.30
+
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/deskutils/fusenshi/files/patch-src_wnd_fusenshieditdialog.cpp b/deskutils/fusenshi/files/patch-src_wnd_fusenshieditdialog.cpp
new file mode 100644
index 000000000000..a8812353c682
--- /dev/null
+++ b/deskutils/fusenshi/files/patch-src_wnd_fusenshieditdialog.cpp
@@ -0,0 +1,16 @@
+--- src/wnd/fusenshieditdialog.cpp.orig 2007-06-25 08:19:21.000000000 +0200
++++ src/wnd/fusenshieditdialog.cpp 2010-04-07 17:50:35.000000000 +0200
+@@ -423,10 +423,10 @@ void FusenshiEditDialog::on_fontname_cli
+ fontdlg.set_title(_("Font:"));
+ fontdlg.set_transient_for(*this);
+ fontdlg.get_apply_button()->hide();
+-
+- fontdlg.get_font_selection()->set_font_name(m_cFontName.get_text());
++
++ fontdlg.set_font_name(m_cFontName.get_text());
+
+ if (Gtk::RESPONSE_OK == fontdlg.run()) {
+- m_cFontName.set_text(fontdlg.get_font_selection()->get_font_name());
++ m_cFontName.set_text(fontdlg.get_font_name());
+ }
+ }
diff --git a/deskutils/fusenshi/files/patch-src_wnd_propertydialog.cpp b/deskutils/fusenshi/files/patch-src_wnd_propertydialog.cpp
new file mode 100644
index 000000000000..0cbe0cba901b
--- /dev/null
+++ b/deskutils/fusenshi/files/patch-src_wnd_propertydialog.cpp
@@ -0,0 +1,15 @@
+--- src/wnd/propertydialog.cpp.orig 2010-04-07 17:27:39.000000000 +0200
++++ src/wnd/propertydialog.cpp 2010-04-07 17:28:12.000000000 +0200
+@@ -471,10 +471,10 @@ void PropertyDialog::on_fontname_clicked
+ fontdlg.set_transient_for(*this);
+ fontdlg.get_apply_button()->hide();
+
+- fontdlg.get_font_selection()->set_font_name(m_cFontName.get_text());
++ fontdlg.set_font_name(m_cFontName.get_text());
+
+ if (Gtk::RESPONSE_OK == fontdlg.run()) {
+- m_cFontName.set_text(fontdlg.get_font_selection()->get_font_name());
++ m_cFontName.set_text(fontdlg.get_font_name());
+ }
+ }
+
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index 47253825a844..077ee90b2c0a 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -3,14 +3,13 @@
# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
#
# $FreeBSD$
-# $MCom: ports/deskutils/glabels/Makefile,v 1.7 2007/05/19 21:36:02 marcus Exp $
+# $MCom: ports/deskutils/glabels/Makefile,v 1.10 2010/04/03 19:25:49 kwm Exp $
#
PORTNAME= glabels
-PORTVERSION= 2.2.5
-PORTREVISION= 3
+PORTVERSION= 2.2.7
CATEGORIES= deskutils
-MASTER_SITES= SF
+MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= A program to create labels and business cards
diff --git a/deskutils/glabels/distinfo b/deskutils/glabels/distinfo
index c009458e8771..c2077c207dde 100644
--- a/deskutils/glabels/distinfo
+++ b/deskutils/glabels/distinfo
@@ -1,3 +1,3 @@
-MD5 (glabels-2.2.5.tar.gz) = a98932cce677f72af8cba2add00adfe3
-SHA256 (glabels-2.2.5.tar.gz) = 9b9a1ce1262de99a12cc2a07bf89840fd3b950778e3269ae0d30e14ce58d91bc
-SIZE (glabels-2.2.5.tar.gz) = 2043669
+MD5 (glabels-2.2.7.tar.gz) = 0830d3734b74e79946af59747ac097a5
+SHA256 (glabels-2.2.7.tar.gz) = 7ea7ea9f265aca8689a6bf1951650b25c0ac20148dfc535dc7ac37c01eb81b53
+SIZE (glabels-2.2.7.tar.gz) = 3808294
diff --git a/deskutils/glabels/pkg-plist b/deskutils/glabels/pkg-plist
index 00f25a9d327d..8ac833822ec0 100644
--- a/deskutils/glabels/pkg-plist
+++ b/deskutils/glabels/pkg-plist
@@ -40,27 +40,28 @@ share/doc/libglabels/libglabels.devhelp2
share/doc/libglabels/right.png
share/doc/libglabels/style.css
share/doc/libglabels/up.png
-share/glabels/dtd/glabels-2.2.dtd
-share/glabels/glade/merge-properties-dialog.glade
-share/glabels/glade/new-label-dialog.glade
-share/glabels/glade/object-editor.glade
-share/glabels/glade/prefs-dialog.glade
-share/glabels/glade/print-custom-widget.glade
-share/glabels/glade/property-bar.glade
-share/glabels/glade/template-designer.glade
-share/glabels/glade/wdgt-media-select.glade
-share/glabels/glade/wdgt-rotate-label.glade
-share/glabels/templates/avery-iso-templates.xml
-share/glabels/templates/avery-other-templates.xml
-share/glabels/templates/avery-us-templates.xml
-share/glabels/templates/brother-other-templates.xml
-share/glabels/templates/categories.xml
-share/glabels/templates/dymo-other-templates.xml
-share/glabels/templates/misc-iso-templates.xml
-share/glabels/templates/misc-other-templates.xml
-share/glabels/templates/misc-us-templates.xml
-share/glabels/templates/paper-sizes.xml
-share/glabels/templates/zweckform-iso-templates.xml
+%%DATADIR%%/dtd/glabels-2.2.dtd
+%%DATADIR%%/glade/merge-properties-dialog.glade
+%%DATADIR%%/glade/new-label-dialog.glade
+%%DATADIR%%/glade/object-editor.glade
+%%DATADIR%%/glade/prefs-dialog.glade
+%%DATADIR%%/glade/print-custom-widget.glade
+%%DATADIR%%/glade/property-bar.glade
+%%DATADIR%%/glade/template-designer.glade
+%%DATADIR%%/glade/wdgt-media-select.glade
+%%DATADIR%%/glade/wdgt-rotate-label.glade
+%%DATADIR%%/templates/avery-iso-templates.xml
+%%DATADIR%%/templates/avery-other-templates.xml
+%%DATADIR%%/templates/avery-us-templates.xml
+%%DATADIR%%/templates/brother-other-templates.xml
+%%DATADIR%%/templates/categories.xml
+%%DATADIR%%/templates/dymo-other-templates.xml
+%%DATADIR%%/templates/misc-iso-templates.xml
+%%DATADIR%%/templates/misc-other-templates.xml
+%%DATADIR%%/templates/misc-us-templates.xml
+%%DATADIR%%/templates/paper-sizes.xml
+%%DATADIR%%/templates/pearl-templates.xml
+%%DATADIR%%/templates/zweckform-iso-templates.xml
share/gnome/help/glabels/C/figures/glabels-template-cd.png
share/gnome/help/glabels/C/figures/glabels-template-label.png
share/gnome/help/glabels/C/figures/glabels-template-layout.png
@@ -73,12 +74,88 @@ share/gnome/help/glabels/C/figures/merge-ex2-1.png
share/gnome/help/glabels/C/figures/merge-ex2-2.png
share/gnome/help/glabels/C/figures/merge-ex2-3.png
share/gnome/help/glabels/C/figures/merge-ex2-4.png
+share/gnome/help/glabels/C/figures/merge-ex3-1.png
+share/gnome/help/glabels/C/figures/merge-ex3-2.png
share/gnome/help/glabels/C/figures/object-editor-sidebar.png
share/gnome/help/glabels/C/figures/print-copies.png
share/gnome/help/glabels/C/figures/print-merge.png
share/gnome/help/glabels/C/glabels.xml
share/gnome/help/glabels/C/legal.xml
+share/gnome/help/glabels/cs/figures/glabels-template-cd.png
+share/gnome/help/glabels/cs/figures/glabels-template-label.png
+share/gnome/help/glabels/cs/figures/glabels-template-layout.png
+share/gnome/help/glabels/cs/figures/main-window-empty.png
+share/gnome/help/glabels/cs/figures/merge-ex1-1.png
+share/gnome/help/glabels/cs/figures/merge-ex1-2.png
+share/gnome/help/glabels/cs/figures/merge-ex1-3.png
+share/gnome/help/glabels/cs/figures/merge-ex1-4.png
+share/gnome/help/glabels/cs/figures/merge-ex2-1.png
+share/gnome/help/glabels/cs/figures/merge-ex2-2.png
+share/gnome/help/glabels/cs/figures/merge-ex2-3.png
+share/gnome/help/glabels/cs/figures/merge-ex2-4.png
+share/gnome/help/glabels/cs/figures/merge-ex3-1.png
+share/gnome/help/glabels/cs/figures/merge-ex3-2.png
+share/gnome/help/glabels/cs/figures/object-editor-sidebar.png
+share/gnome/help/glabels/cs/figures/print-copies.png
+share/gnome/help/glabels/cs/figures/print-merge.png
+share/gnome/help/glabels/cs/glabels.xml
+share/gnome/help/glabels/de/figures/glabels-template-cd.png
+share/gnome/help/glabels/de/figures/glabels-template-label.png
+share/gnome/help/glabels/de/figures/glabels-template-layout.png
+share/gnome/help/glabels/de/figures/main-window-empty.png
+share/gnome/help/glabels/de/figures/merge-ex1-1.png
+share/gnome/help/glabels/de/figures/merge-ex1-2.png
+share/gnome/help/glabels/de/figures/merge-ex1-3.png
+share/gnome/help/glabels/de/figures/merge-ex1-4.png
+share/gnome/help/glabels/de/figures/merge-ex2-1.png
+share/gnome/help/glabels/de/figures/merge-ex2-2.png
+share/gnome/help/glabels/de/figures/merge-ex2-3.png
+share/gnome/help/glabels/de/figures/merge-ex2-4.png
+share/gnome/help/glabels/de/figures/merge-ex3-1.png
+share/gnome/help/glabels/de/figures/merge-ex3-2.png
+share/gnome/help/glabels/de/figures/object-editor-sidebar.png
+share/gnome/help/glabels/de/figures/print-copies.png
+share/gnome/help/glabels/de/figures/print-merge.png
+share/gnome/help/glabels/de/glabels.xml
+share/gnome/help/glabels/es/figures/glabels-template-cd.png
+share/gnome/help/glabels/es/figures/glabels-template-label.png
+share/gnome/help/glabels/es/figures/glabels-template-layout.png
+share/gnome/help/glabels/es/figures/main-window-empty.png
+share/gnome/help/glabels/es/figures/merge-ex1-1.png
+share/gnome/help/glabels/es/figures/merge-ex1-2.png
+share/gnome/help/glabels/es/figures/merge-ex1-3.png
+share/gnome/help/glabels/es/figures/merge-ex1-4.png
+share/gnome/help/glabels/es/figures/merge-ex2-1.png
+share/gnome/help/glabels/es/figures/merge-ex2-2.png
+share/gnome/help/glabels/es/figures/merge-ex2-3.png
+share/gnome/help/glabels/es/figures/merge-ex2-4.png
+share/gnome/help/glabels/es/figures/merge-ex3-1.png
+share/gnome/help/glabels/es/figures/merge-ex3-2.png
+share/gnome/help/glabels/es/figures/object-editor-sidebar.png
+share/gnome/help/glabels/es/figures/print-copies.png
+share/gnome/help/glabels/es/figures/print-merge.png
+share/gnome/help/glabels/es/glabels.xml
+share/gnome/help/glabels/fr/figures/glabels-template-cd.png
+share/gnome/help/glabels/fr/figures/glabels-template-label.png
+share/gnome/help/glabels/fr/figures/glabels-template-layout.png
+share/gnome/help/glabels/fr/figures/main-window-empty.png
+share/gnome/help/glabels/fr/figures/merge-ex1-1.png
+share/gnome/help/glabels/fr/figures/merge-ex1-2.png
+share/gnome/help/glabels/fr/figures/merge-ex1-3.png
+share/gnome/help/glabels/fr/figures/merge-ex1-4.png
+share/gnome/help/glabels/fr/figures/merge-ex2-1.png
+share/gnome/help/glabels/fr/figures/merge-ex2-2.png
+share/gnome/help/glabels/fr/figures/merge-ex2-3.png
+share/gnome/help/glabels/fr/figures/merge-ex2-4.png
+share/gnome/help/glabels/fr/figures/merge-ex3-1.png
+share/gnome/help/glabels/fr/figures/merge-ex3-2.png
+share/gnome/help/glabels/fr/figures/object-editor-sidebar.png
+share/gnome/help/glabels/fr/figures/print-copies.png
+share/gnome/help/glabels/fr/figures/print-merge.png
+share/gnome/help/glabels/fr/glabels.xml
+share/locale/ca/LC_MESSAGES/glabels.mo
share/locale/cs/LC_MESSAGES/glabels.mo
+share/locale/da/LC_MESSAGES/glabels.mo
share/locale/de/LC_MESSAGES/glabels.mo
share/locale/eo/LC_MESSAGES/glabels.mo
share/locale/es/LC_MESSAGES/glabels.mo
@@ -89,12 +166,19 @@ share/locale/ko/LC_MESSAGES/glabels.mo
share/locale/pl/LC_MESSAGES/glabels.mo
share/locale/pt_BR/LC_MESSAGES/glabels.mo
share/locale/ru/LC_MESSAGES/glabels.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/glabels.mo
+share/locale/sl/LC_MESSAGES/glabels.mo
+share/locale/sv/LC_MESSAGES/glabels.mo
+share/locale/zh_CN/LC_MESSAGES/glabels.mo
+share/locale/zh_TW/LC_MESSAGES/glabels.mo
share/mime-info/glabels.keys
share/mime-info/glabels.mime
share/mime/application/x-glabels.xml
share/mime/packages/glabels.xml
share/omf/glabels/glabels-C.omf
+share/omf/glabels/glabels-cs.omf
+share/omf/glabels/glabels-de.omf
+share/omf/glabels/glabels-es.omf
+share/omf/glabels/glabels-fr.omf
share/pixmaps/glabels-application-x-glabels.png
share/pixmaps/glabels.png
share/pixmaps/glabels/ex-1layout.png
@@ -106,18 +190,24 @@ share/pixmaps/glabels/glabels-about-logo.png
share/pixmaps/glabels/glabels-splash.png
@dirrm share/pixmaps/glabels
@dirrm share/omf/glabels
+@dirrm share/gnome/help/glabels/fr/figures
+@dirrm share/gnome/help/glabels/fr
+@dirrm share/gnome/help/glabels/es/figures
+@dirrm share/gnome/help/glabels/es
+@dirrm share/gnome/help/glabels/de/figures
+@dirrm share/gnome/help/glabels/de
+@dirrm share/gnome/help/glabels/cs/figures
+@dirrm share/gnome/help/glabels/cs
@dirrm share/gnome/help/glabels/C/figures
@dirrm share/gnome/help/glabels/C
@dirrm share/gnome/help/glabels
-@dirrm share/glabels/templates
-@dirrm share/glabels/glade
-@dirrm share/glabels/dtd
-@dirrm share/glabels
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/dtd
+@dirrm %%DATADIR%%
@dirrm share/doc/libglabels
@dirrmtry share/applications
@dirrm include/libglabels
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile
index 914f1c969a69..cf95dcaa7dbb 100644
--- a/deskutils/global-menu/Makefile
+++ b/deskutils/global-menu/Makefile
@@ -7,13 +7,15 @@
PORTNAME= gnome-globalmenu
PORTVERSION= 0.7.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils
MASTER_SITES= http://gnome2-globalmenu.googlecode.com/files/
MAINTAINER= gustau.perez@gmail.com
COMMENT= Global menu for gnome
+LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify
+
USE_GNOME= gnomepanel gnomedesktop
USE_BZIP2= yes
diff --git a/deskutils/gnome-main-menu/Makefile b/deskutils/gnome-main-menu/Makefile
index 5bbb690f450a..7384c67d1952 100644
--- a/deskutils/gnome-main-menu/Makefile
+++ b/deskutils/gnome-main-menu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-main-menu
PORTVERSION= 0.9.12
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,7 +18,8 @@ COMMENT= Provides easy access to sets of GNOME applications
LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop
USE_BZIP2= yes
-USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack eel2 gnomedesktop
+USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack eel2 gnomedesktop \
+ libgnomeui
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 3f317e27a861..56d6661d5e46 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.143 2009/10/22 14:08:07 kwm Exp $
+# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.147 2010/04/01 13:45:39 kwm Exp $
#
PORTNAME= gnome-utils
-PORTVERSION= 2.28.3
-PORTREVISION= 2
+PORTVERSION= 2.30.0
PORTEPOCH= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
@@ -29,6 +28,7 @@ USE_LDCONFIG= yes
INSTALLS_ICONS= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel ltverhack
USE_AUTOTOOLS= libtool:22
+CONFIGURE_ARGS= --enable-maintainer-flags=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 73565d3f4b05..712ca37a663d 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-utils-2.28.3.tar.bz2) = ccfd36710952fa5280612c1c00e915e8
-SHA256 (gnome2/gnome-utils-2.28.3.tar.bz2) = 35f4456fbefda17d39cacb788298e5c1bae29c06a1bd0477b5dc16400255bfd9
-SIZE (gnome2/gnome-utils-2.28.3.tar.bz2) = 6862868
+MD5 (gnome2/gnome-utils-2.30.0.tar.bz2) = c6d779ddccf99cbe0667b578078dd011
+SHA256 (gnome2/gnome-utils-2.30.0.tar.bz2) = 745bb25fce536dc5337e7b5cbcbce9eee66b3cc0c500de302759b98ebcef6a8f
+SIZE (gnome2/gnome-utils-2.30.0.tar.bz2) = 7608826
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 743d7417c4ae..541c1ef5a1cd 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -264,6 +264,15 @@ share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-lookup.png
share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-preferences-print.png
share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-preferences-source.png
share/gnome/help/gnome-dictionary/cs/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/da/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/da/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/da/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/da/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/da/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/da/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/da/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/da/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/da/gnome-dictionary.xml
share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-add-source.png
share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-applet-window.png
share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-applet.png
@@ -421,6 +430,8 @@ share/gnome/help/gnome-system-log/C/gnome-system-log.xml
share/gnome/help/gnome-system-log/C/legal.xml
share/gnome/help/gnome-system-log/ca/figures/syslog_window.png
share/gnome/help/gnome-system-log/ca/gnome-system-log.xml
+share/gnome/help/gnome-system-log/cs/figures/syslog_window.png
+share/gnome/help/gnome-system-log/cs/gnome-system-log.xml
share/gnome/help/gnome-system-log/de/figures/syslog_window.png
share/gnome/help/gnome-system-log/de/gnome-system-log.xml
share/gnome/help/gnome-system-log/el/figures/syslog_window.png
@@ -472,6 +483,7 @@ share/omf/baobab/baobab-zh_TW.omf
share/omf/gnome-dictionary/gnome-dictionary-C.omf
share/omf/gnome-dictionary/gnome-dictionary-ca.omf
share/omf/gnome-dictionary/gnome-dictionary-cs.omf
+share/omf/gnome-dictionary/gnome-dictionary-da.omf
share/omf/gnome-dictionary/gnome-dictionary-de.omf
share/omf/gnome-dictionary/gnome-dictionary-el.omf
share/omf/gnome-dictionary/gnome-dictionary-en_GB.omf
@@ -504,6 +516,7 @@ share/omf/gnome-search-tool/gnome-search-tool-uk.omf
share/omf/gnome-search-tool/gnome-search-tool-zh_CN.omf
share/omf/gnome-system-log/gnome-system-log-C.omf
share/omf/gnome-system-log/gnome-system-log-ca.omf
+share/omf/gnome-system-log/gnome-system-log-cs.omf
share/omf/gnome-system-log/gnome-system-log-de.omf
share/omf/gnome-system-log/gnome-system-log-el.omf
share/omf/gnome-system-log/gnome-system-log-en_GB.omf
@@ -521,6 +534,7 @@ share/omf/gnome-system-log/gnome-system-log-zh_CN.omf
share/pixmaps/gsearchtool/thumbnail_frame.png
share/icons/hicolor/24x24/apps/baobab.png
share/icons/hicolor/scalable/apps/baobab.svg
+share/locale/af/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/as/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ast/LC_MESSAGES/gnome-utils-2.0.mo
@@ -535,6 +549,7 @@ share/locale/br/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ca@valencia/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/crh/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/da/LC_MESSAGES/gnome-utils-2.0.mo
@@ -543,6 +558,7 @@ share/locale/dz/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/el/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/en_CA/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/es/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/et/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/eu/LC_MESSAGES/gnome-utils-2.0.mo
@@ -559,6 +575,7 @@ share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/id/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/kn/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-utils-2.0.mo
@@ -586,6 +603,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ro/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ru/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/rw/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/sk/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/sl/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/sq/LC_MESSAGES/gnome-utils-2.0.mo
@@ -636,6 +654,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-system-log/el
@dirrm share/gnome/help/gnome-system-log/de/figures
@dirrm share/gnome/help/gnome-system-log/de
+@dirrm share/gnome/help/gnome-system-log/cs/figures
+@dirrm share/gnome/help/gnome-system-log/cs
@dirrm share/gnome/help/gnome-system-log/ca/figures
@dirrm share/gnome/help/gnome-system-log/ca
@dirrm share/gnome/help/gnome-system-log/C/figures
@@ -702,6 +722,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-dictionary/el
@dirrm share/gnome/help/gnome-dictionary/de/figures
@dirrm share/gnome/help/gnome-dictionary/de
+@dirrm share/gnome/help/gnome-dictionary/da/figures
+@dirrm share/gnome/help/gnome-dictionary/da
@dirrm share/gnome/help/gnome-dictionary/cs/figures
@dirrm share/gnome/help/gnome-dictionary/cs
@dirrm share/gnome/help/gnome-dictionary/ca/figures
@@ -769,6 +791,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/ps/LC_MESSAGES
@@ -785,6 +809,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index ddea564dae71..99667b5d849e 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -3,12 +3,11 @@
# Whom: Mezz <mezz@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnote/Makefile,v 1.6 2009/11/28 17:54:22 kwm Exp $
+# $MCom: ports/deskutils/gnote/Makefile,v 1.11 2010/03/14 05:52:37 marcus Exp $
#
PORTNAME= gnote
-PORTVERSION= 0.6.3
-PORTREVISION= 3
+PORTVERSION= 0.7.2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
@@ -21,6 +20,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
USE_GMAKE= yes
+USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix gconf2 intltool ltverhack gnomepanel
USE_GETTEXT= yes
INSTALLS_OMF= yes
diff --git a/deskutils/gnote/distinfo b/deskutils/gnote/distinfo
index 550f6e2a8497..83b9f1491ed7 100644
--- a/deskutils/gnote/distinfo
+++ b/deskutils/gnote/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnote-0.6.3.tar.gz) = 84df707352eae288d1d8536796ab41f8
-SHA256 (gnote-0.6.3.tar.gz) = affd34cef21883ab831b901a82804dd3bde03dc621ec4cda7ddb2f5b66ce13d9
-SIZE (gnote-0.6.3.tar.gz) = 1754426
+MD5 (gnote-0.7.2.tar.bz2) = c4e1a93896cb8610d2e08c72d41f1777
+SHA256 (gnote-0.7.2.tar.bz2) = ef46a1bade7bf684615b32e5bf35c100d646456e40ac2e9cab871e6dff0d2a4c
+SIZE (gnote-0.7.2.tar.bz2) = 1364579
diff --git a/deskutils/gnote/files/patch-libtomboy_tomboyutil.c b/deskutils/gnote/files/patch-libtomboy_tomboyutil.c
new file mode 100644
index 000000000000..2252cd007efa
--- /dev/null
+++ b/deskutils/gnote/files/patch-libtomboy_tomboyutil.c
@@ -0,0 +1,14 @@
+--- libtomboy/tomboyutil.c.orig 2010-03-14 00:35:24.000000000 -0500
++++ libtomboy/tomboyutil.c 2010-03-14 00:36:19.000000000 -0500
+@@ -153,9 +153,9 @@ tomboy_window_override_user_time (GtkWin
+ void
+ tomboy_window_present_hardcore (GtkWindow *window)
+ {
+- if (!GTK_WIDGET_REALIZED (window))
++ if (!gtk_widget_get_realized (window))
+ gtk_widget_realize (GTK_WIDGET (window));
+- else if (GTK_WIDGET_VISIBLE (window))
++ else if (gtk_widget_get_visible (window))
+ tomboy_window_move_to_current_workspace (window);
+
+ tomboy_window_override_user_time (window);
diff --git a/deskutils/gnote/files/patch-src_debug.cpp b/deskutils/gnote/files/patch-src_debug.cpp
index cb2fe38059f6..69c81272cbb6 100644
--- a/deskutils/gnote/files/patch-src_debug.cpp
+++ b/deskutils/gnote/files/patch-src_debug.cpp
@@ -5,7 +5,7 @@
// boost::recursive_mutex::scoped_lock lock(mutex);
char buf[128];
- snprintf(buf, 128, "(%d) ", (int)pthread_self());
-+ snprintf(buf, 128, "(%d) ", (pthread_t)pthread_self());
++ snprintf(buf, 128, "(%ld) ", (pthread_t)pthread_self());
fwrite(buf, 1, strlen(buf), stderr);
fwrite(prefix, 1, strlen(prefix), stderr);
diff --git a/deskutils/gnote/files/patch-src_noterenamedialog.cpp b/deskutils/gnote/files/patch-src_noterenamedialog.cpp
new file mode 100644
index 000000000000..0e7002990f23
--- /dev/null
+++ b/deskutils/gnote/files/patch-src_noterenamedialog.cpp
@@ -0,0 +1,20 @@
+--- src/noterenamedialog.cpp.orig 2010-03-14 00:32:43.000000000 -0500
++++ src/noterenamedialog.cpp 2010-03-14 00:33:46.000000000 -0500
+@@ -63,6 +63,8 @@ private:
+ Gtk::TreeModelColumn<Note::Ptr> m_column_note;
+ };
+
++ModelColumnRecord model_column_record;
++
+ ModelColumnRecord::ModelColumnRecord()
+ : Gtk::TreeModelColumnRecord()
+ , m_column_selected()
+@@ -152,7 +154,7 @@ NoteRenameDialog::NoteRenameDialog(const
+ *renamed_note->get_window(),
+ false,
+ false)
+- , m_notes_model(Gtk::ListStore::create(ModelColumnRecord()))
++ , m_notes_model(Gtk::ListStore::create(model_column_record))
+ , m_dont_rename_button(_("_Don't Rename Links"), true)
+ , m_rename_button(_("_Rename Links"), true)
+ , m_select_all_button(_("Select All"))
diff --git a/deskutils/gnote/files/patch-src_sharp_datetime.cpp b/deskutils/gnote/files/patch-src_sharp_datetime.cpp
index 71ce22078876..d2a7601b83ab 100644
--- a/deskutils/gnote/files/patch-src_sharp_datetime.cpp
+++ b/deskutils/gnote/files/patch-src_sharp_datetime.cpp
@@ -1,12 +1,28 @@
---- src/sharp/datetime.cpp.orig 2009-07-21 22:13:30.000000000 -0500
-+++ src/sharp/datetime.cpp 2009-07-21 22:25:29.000000000 -0500
-@@ -69,14 +69,14 @@
+--- src/sharp/datetime.cpp.orig 2009-12-28 12:46:01.000000000 +0100
++++ src/sharp/datetime.cpp 2010-02-14 15:47:21.000000000 +0100
+@@ -69,28 +69,28 @@ namespace sharp {
+ int DateTime::day() const
+ {
+ struct tm result;
+- localtime_r(&m_date.tv_sec, &result);
++ localtime_r((const time_t *)&m_date.tv_sec, &result);
+ return result.tm_mday;
+ }
+
+ int DateTime::month() const
+ {
+ struct tm result;
+- localtime_r(&m_date.tv_sec, &result);
++ localtime_r((const time_t *)&m_date.tv_sec, &result);
+ return result.tm_mon + 1;
+ }
+
int DateTime::year() const
{
struct tm result;
- localtime_r(&m_date.tv_sec, &result);
+ localtime_r((const time_t *)&m_date.tv_sec, &result);
- return result.tm_year;
+ return result.tm_year + 1900;
}
int DateTime::day_of_year() const
@@ -17,7 +33,7 @@
return result.tm_yday;
}
-@@ -95,14 +95,14 @@
+@@ -109,14 +109,14 @@ namespace sharp {
std::string DateTime::to_string(const char * format) const
{
struct tm result;
diff --git a/deskutils/gnote/pkg-plist b/deskutils/gnote/pkg-plist
index 3b73c506f712..bfd5fd72bbd1 100644
--- a/deskutils/gnote/pkg-plist
+++ b/deskutils/gnote/pkg-plist
@@ -14,6 +14,9 @@ lib/gnote/addins/%%VERSION%%/fixedwidth.so
lib/gnote/addins/%%VERSION%%/inserttimestamp.a
lib/gnote/addins/%%VERSION%%/inserttimestamp.la
lib/gnote/addins/%%VERSION%%/inserttimestamp.so
+lib/gnote/addins/%%VERSION%%/libnoteoftheday.a
+lib/gnote/addins/%%VERSION%%/libnoteoftheday.la
+lib/gnote/addins/%%VERSION%%/libnoteoftheday.so
lib/gnote/addins/%%VERSION%%/printnotes.a
lib/gnote/addins/%%VERSION%%/printnotes.la
lib/gnote/addins/%%VERSION%%/printnotes.so
@@ -130,6 +133,25 @@ share/gnome/help/gnote/sv/figures/note-template.png
share/gnome/help/gnote/sv/figures/notebook-icon.png
share/gnome/help/gnote/sv/gnote.xml
share/gnome/help/gnote/sv/legal.xml
+share/gnome/help/gnote/zh_CN/figures/add-notebook-search.png
+share/gnome/help/gnote/zh_CN/figures/add-to-notebook.png
+share/gnome/help/gnote/zh_CN/figures/delete-notebook.png
+share/gnome/help/gnote/zh_CN/figures/gnote-main-menu.png
+share/gnome/help/gnote/zh_CN/figures/gnote-new-note.png
+share/gnome/help/gnote/zh_CN/figures/gnote-panel.png
+share/gnome/help/gnote/zh_CN/figures/gnote-pindown.png
+share/gnome/help/gnote/zh_CN/figures/gnote-pinup.png
+share/gnome/help/gnote/zh_CN/figures/gnote-preferences-add-ins.png
+share/gnome/help/gnote/zh_CN/figures/gnote-preferences-editing.png
+share/gnome/help/gnote/zh_CN/figures/gnote-preferences-hotkeys.png
+share/gnome/help/gnote/zh_CN/figures/gnote-preferences-synchronization.png
+share/gnome/help/gnote/zh_CN/figures/gnote-tools.png
+share/gnome/help/gnote/zh_CN/figures/move-notes-search.png
+share/gnome/help/gnote/zh_CN/figures/new-notebook.png
+share/gnome/help/gnote/zh_CN/figures/note-template.png
+share/gnome/help/gnote/zh_CN/figures/notebook-icon.png
+share/gnome/help/gnote/zh_CN/gnote.xml
+share/gnome/help/gnote/zh_CN/legal.xml
%%DATADIR%%/GNOME_GnoteApplet.xml
%%DATADIR%%/UIManagerLayout.xml
%%DATADIR%%/exporttohtml.xsl
@@ -163,9 +185,11 @@ share/icons/hicolor/48x48/apps/gnote.png
share/icons/hicolor/scalable/apps/gnote.svg
share/locale/ar/LC_MESSAGES/gnote.mo
share/locale/as/LC_MESSAGES/gnote.mo
+share/locale/bg/LC_MESSAGES/gnote.mo
share/locale/bn_IN/LC_MESSAGES/gnote.mo
share/locale/ca/LC_MESSAGES/gnote.mo
share/locale/cs/LC_MESSAGES/gnote.mo
+share/locale/da/LC_MESSAGES/gnote.mo
share/locale/de/LC_MESSAGES/gnote.mo
share/locale/el/LC_MESSAGES/gnote.mo
share/locale/en_GB/LC_MESSAGES/gnote.mo
@@ -174,6 +198,7 @@ share/locale/fr/LC_MESSAGES/gnote.mo
share/locale/gl/LC_MESSAGES/gnote.mo
share/locale/gu/LC_MESSAGES/gnote.mo
share/locale/he/LC_MESSAGES/gnote.mo
+share/locale/hi/LC_MESSAGES/gnote.mo
share/locale/hu/LC_MESSAGES/gnote.mo
share/locale/id/LC_MESSAGES/gnote.mo
share/locale/it/LC_MESSAGES/gnote.mo
@@ -181,6 +206,7 @@ share/locale/ja/LC_MESSAGES/gnote.mo
share/locale/kn/LC_MESSAGES/gnote.mo
share/locale/ko/LC_MESSAGES/gnote.mo
share/locale/lt/LC_MESSAGES/gnote.mo
+share/locale/ml/LC_MESSAGES/gnote.mo
share/locale/mr/LC_MESSAGES/gnote.mo
share/locale/or/LC_MESSAGES/gnote.mo
share/locale/pa/LC_MESSAGES/gnote.mo
@@ -199,15 +225,8 @@ share/omf/gnote/gnote-de.omf
share/omf/gnote/gnote-el.omf
share/omf/gnote/gnote-es.omf
share/omf/gnote/gnote-sv.omf
+share/omf/gnote/gnote-zh_CN.omf
@dirrm share/omf/gnote
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
@dirrm %%DATADIR%%/icons/hicolor/scalable
@dirrm %%DATADIR%%/icons/hicolor/48x48/actions
@@ -226,6 +245,8 @@ share/omf/gnote/gnote-sv.omf
@dirrm %%DATADIR%%/icons/hicolor
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%
+@dirrm share/gnome/help/gnote/zh_CN/figures
+@dirrm share/gnome/help/gnote/zh_CN
@dirrm share/gnome/help/gnote/sv/figures
@dirrm share/gnome/help/gnote/sv
@dirrm share/gnome/help/gnote/es/figures
@@ -242,3 +263,11 @@ share/omf/gnote/gnote-sv.omf
@dirrmtry lib/gnote/addins/%%VERSION%%
@dirrmtry lib/gnote/addins
@dirrmtry lib/gnote
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 12191c372035..cfb97606d49a 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gucharmap/Makefile,v 1.65 2009/11/28 05:58:59 mezz Exp $
+# $MCom: ports/deskutils/gucharmap/Makefile,v 1.70 2010/04/26 22:29:26 kwm Exp $
#
PORTNAME= gucharmap
-PORTVERSION= 2.28.2
-PORTREVISION= 2
+PORTVERSION= 2.30.1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index 2aaafc1e7280..c05093c957f2 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gucharmap-2.28.2.tar.bz2) = d4ff2195141ca71aebfeb766e18d9607
-SHA256 (gnome2/gucharmap-2.28.2.tar.bz2) = 52987a32ee962f9670c8c46a90a7e37d218aeb60e39957ca400fbd5f514d8328
-SIZE (gnome2/gucharmap-2.28.2.tar.bz2) = 3071897
+MD5 (gnome2/gucharmap-2.30.1.tar.bz2) = cd3b342fb75b4bd9df2327c247aa457b
+SHA256 (gnome2/gucharmap-2.30.1.tar.bz2) = 016c5158c67eeb43e2f8a3bdfa32341beb039f7ef917f912f0ae56ee5bfe60f9
+SIZE (gnome2/gucharmap-2.30.1.tar.bz2) = 3101481
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
index c7930f9bbdac..d29b7f645184 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -100,6 +100,7 @@ share/locale/da/LC_MESSAGES/gucharmap.mo
share/locale/de/LC_MESSAGES/gucharmap.mo
share/locale/dz/LC_MESSAGES/gucharmap.mo
share/locale/el/LC_MESSAGES/gucharmap.mo
+share/locale/en@shaw/LC_MESSAGES/gucharmap.mo
share/locale/en_CA/LC_MESSAGES/gucharmap.mo
share/locale/en_GB/LC_MESSAGES/gucharmap.mo
share/locale/eo/LC_MESSAGES/gucharmap.mo
@@ -248,6 +249,8 @@ share/omf/gucharmap/gucharmap-zh_TW.omf
@dirrmtry share/locale/mi
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index 7e0220e8ed8b..66a44af2b18d 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/hamster-applet/Makefile,v 1.29 2009/10/20 17:53:42 kwm Exp $
+# $MCom: ports/deskutils/hamster-applet/Makefile,v 1.40 2010/04/27 14:26:32 kwm Exp $
#
PORTNAME= hamster-applet
-PORTVERSION= 2.28.2
-PORTREVISION= 2
+PORTVERSION= 2.30.1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,7 +16,8 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Time management applet for the GNOME Desktop
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
+ ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/deskutils/hamster-applet/distinfo b/deskutils/hamster-applet/distinfo
index c5c856d23127..66ca9c86cd8f 100644
--- a/deskutils/hamster-applet/distinfo
+++ b/deskutils/hamster-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/hamster-applet-2.28.2.tar.bz2) = 8268f2fff714fcc49b63da66d4e89ba5
-SHA256 (gnome2/hamster-applet-2.28.2.tar.bz2) = bed7b97ee37e6669298670121dcf06a1456b9b827099158becf645008702e608
-SIZE (gnome2/hamster-applet-2.28.2.tar.bz2) = 518003
+MD5 (gnome2/hamster-applet-2.30.1.tar.bz2) = 4f1ae4223344bb1c209676c2d31665e2
+SHA256 (gnome2/hamster-applet-2.30.1.tar.bz2) = a21994de512e17b176ff802c162dc1d26b25d8908c6108d47cd3c5c283fe4b3c
+SIZE (gnome2/hamster-applet-2.30.1.tar.bz2) = 600397
diff --git a/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py b/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py
deleted file mode 100644
index 6d436ef15360..000000000000
--- a/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py
+++ /dev/null
@@ -1,23 +0,0 @@
---- hamster/hamster-applet.py.orig 2009-07-19 21:41:20.000000000 +1000
-+++ hamster/hamster-applet.py 2009-07-19 21:41:46.000000000 +1000
-@@ -37,14 +37,14 @@ from hamster import defs
- from hamster.configuration import runtime
-
- # Setup i18n
--locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
-+#locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
-
--for module in (gettext, locale):
-- module.bindtextdomain('hamster-applet', locale_dir)
-- module.textdomain('hamster-applet')
-+#for module in (gettext, locale):
-+# module.bindtextdomain('hamster-applet', locale_dir)
-+# module.textdomain('hamster-applet')
-
-- if hasattr(module, 'bind_textdomain_codeset'):
-- module.bind_textdomain_codeset('hamster-applet','UTF-8')
-+# if hasattr(module, 'bind_textdomain_codeset'):
-+# module.bind_textdomain_codeset('hamster-applet','UTF-8')
-
-
- from hamster.applet import HamsterApplet
diff --git a/deskutils/hamster-applet/files/patch-src_hamster-applet.py b/deskutils/hamster-applet/files/patch-src_hamster-applet.py
new file mode 100644
index 000000000000..0bb718d095b6
--- /dev/null
+++ b/deskutils/hamster-applet/files/patch-src_hamster-applet.py
@@ -0,0 +1,22 @@
+--- src/hamster-applet.py.orig 2010-01-29 17:37:34.000000000 +0800
++++ src/hamster-applet.py 2010-01-29 17:38:21.000000000 +0800
+@@ -95,13 +95,13 @@ if __name__ == "__main__":
+ from hamster.configuration import runtime, dialogs
+
+ # Setup i18n
+- locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
+- for module in (gettext, locale):
+- module.bindtextdomain('hamster-applet', locale_dir)
+- module.textdomain('hamster-applet')
++# locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
++# for module in (gettext, locale):
++# module.bindtextdomain('hamster-applet', locale_dir)
++# module.textdomain('hamster-applet')
+
+- if hasattr(module, 'bind_textdomain_codeset'):
+- module.bind_textdomain_codeset('hamster-applet','UTF-8')
++# if hasattr(module, 'bind_textdomain_codeset'):
++# module.bind_textdomain_codeset('hamster-applet','UTF-8')
+
+ gtk.window_set_default_icon_name("hamster-applet")
+
diff --git a/deskutils/hamster-applet/pkg-plist b/deskutils/hamster-applet/pkg-plist
index 15387400920f..981c2fc9107f 100644
--- a/deskutils/hamster-applet/pkg-plist
+++ b/deskutils/hamster-applet/pkg-plist
@@ -1,7 +1,6 @@
+bin/gnome-time-tracker
+bin/hamster-standalone
lib/hamster-applet/hamster-applet
-%%PYTHON_SITELIBDIR%%/hamster/KeyBinder.py
-%%PYTHON_SITELIBDIR%%/hamster/KeyBinder.pyc
-%%PYTHON_SITELIBDIR%%/hamster/KeyBinder.pyo
%%PYTHON_SITELIBDIR%%/hamster/__init__.py
%%PYTHON_SITELIBDIR%%/hamster/__init__.pyc
%%PYTHON_SITELIBDIR%%/hamster/__init__.pyo
@@ -49,9 +48,21 @@ lib/hamster-applet/hamster-applet
%%PYTHON_SITELIBDIR%%/hamster/keybinder/__init__.pyo
%%PYTHON_SITELIBDIR%%/hamster/keybinder/_keybinder.la
%%PYTHON_SITELIBDIR%%/hamster/keybinder/_keybinder.so
+%%PYTHON_SITELIBDIR%%/hamster/overview_activities.py
+%%PYTHON_SITELIBDIR%%/hamster/overview_activities.pyc
+%%PYTHON_SITELIBDIR%%/hamster/overview_activities.pyo
+%%PYTHON_SITELIBDIR%%/hamster/overview_totals.py
+%%PYTHON_SITELIBDIR%%/hamster/overview_totals.pyc
+%%PYTHON_SITELIBDIR%%/hamster/overview_totals.pyo
+%%PYTHON_SITELIBDIR%%/hamster/overview.py
+%%PYTHON_SITELIBDIR%%/hamster/overview.pyc
+%%PYTHON_SITELIBDIR%%/hamster/overview.pyo
%%PYTHON_SITELIBDIR%%/hamster/preferences.py
%%PYTHON_SITELIBDIR%%/hamster/preferences.pyc
%%PYTHON_SITELIBDIR%%/hamster/preferences.pyo
+%%PYTHON_SITELIBDIR%%/hamster/pytweener.py
+%%PYTHON_SITELIBDIR%%/hamster/pytweener.pyc
+%%PYTHON_SITELIBDIR%%/hamster/pytweener.pyo
%%PYTHON_SITELIBDIR%%/hamster/reports.py
%%PYTHON_SITELIBDIR%%/hamster/reports.pyc
%%PYTHON_SITELIBDIR%%/hamster/reports.pyo
@@ -64,9 +75,33 @@ lib/hamster-applet/hamster-applet
%%PYTHON_SITELIBDIR%%/hamster/stuff.py
%%PYTHON_SITELIBDIR%%/hamster/stuff.pyc
%%PYTHON_SITELIBDIR%%/hamster/stuff.pyo
-%%PYTHON_SITELIBDIR%%/hamster/widgets.py
-%%PYTHON_SITELIBDIR%%/hamster/widgets.pyc
-%%PYTHON_SITELIBDIR%%/hamster/widgets.pyo
+%%PYTHON_SITELIBDIR%%/hamster/widgets/__init__.py
+%%PYTHON_SITELIBDIR%%/hamster/widgets/__init__.pyc
+%%PYTHON_SITELIBDIR%%/hamster/widgets/__init__.pyo
+%%PYTHON_SITELIBDIR%%/hamster/widgets/activityentry.py
+%%PYTHON_SITELIBDIR%%/hamster/widgets/activityentry.pyc
+%%PYTHON_SITELIBDIR%%/hamster/widgets/activityentry.pyo
+%%PYTHON_SITELIBDIR%%/hamster/widgets/dateinput.py
+%%PYTHON_SITELIBDIR%%/hamster/widgets/dateinput.pyc
+%%PYTHON_SITELIBDIR%%/hamster/widgets/dateinput.pyo
+%%PYTHON_SITELIBDIR%%/hamster/widgets/dayline.py
+%%PYTHON_SITELIBDIR%%/hamster/widgets/dayline.pyc
+%%PYTHON_SITELIBDIR%%/hamster/widgets/dayline.pyo
+%%PYTHON_SITELIBDIR%%/hamster/widgets/facttree.py
+%%PYTHON_SITELIBDIR%%/hamster/widgets/facttree.pyc
+%%PYTHON_SITELIBDIR%%/hamster/widgets/facttree.pyo
+%%PYTHON_SITELIBDIR%%/hamster/widgets/reportchooserdialog.py
+%%PYTHON_SITELIBDIR%%/hamster/widgets/reportchooserdialog.pyc
+%%PYTHON_SITELIBDIR%%/hamster/widgets/reportchooserdialog.pyo
+%%PYTHON_SITELIBDIR%%/hamster/widgets/tags.py
+%%PYTHON_SITELIBDIR%%/hamster/widgets/tags.pyc
+%%PYTHON_SITELIBDIR%%/hamster/widgets/tags.pyo
+%%PYTHON_SITELIBDIR%%/hamster/widgets/timechart.py
+%%PYTHON_SITELIBDIR%%/hamster/widgets/timechart.pyc
+%%PYTHON_SITELIBDIR%%/hamster/widgets/timechart.pyo
+%%PYTHON_SITELIBDIR%%/hamster/widgets/timeinput.py
+%%PYTHON_SITELIBDIR%%/hamster/widgets/timeinput.pyc
+%%PYTHON_SITELIBDIR%%/hamster/widgets/timeinput.pyo
libdata/bonobo/servers/Hamster_Applet.server
share/gnome-control-center/keybindings/99-hamster-applet.xml
%%DATADIR%%/Hamster_Applet.xml
@@ -77,8 +112,76 @@ share/gnome-control-center/keybindings/99-hamster-applet.xml
%%DATADIR%%/art/stock_calendar-view-week.png
%%DATADIR%%/edit_activity.ui
%%DATADIR%%/hamster.db
+%%DATADIR%%/hamster.ui
+%%DATADIR%%/overview.ui
+%%DATADIR%%/overview_totals.ui
%%DATADIR%%/preferences.ui
%%DATADIR%%/stats.ui
+share/applications/hamster-standalone.desktop
+share/gnome/help/hamster-applet/C/backup.page
+share/gnome/help/hamster-applet/C/figures/hamster-logo.png
+share/gnome/help/hamster-applet/C/index.page
+share/gnome/help/hamster-applet/C/input.page
+share/gnome/help/hamster-applet/C/legal.xml
+share/gnome/help/hamster-applet/C/merge.page
+share/gnome/help/hamster-applet/C/reports.page
+share/gnome/help/hamster-applet/C/statistics.page
+share/gnome/help/hamster-applet/cs/backup.page
+share/gnome/help/hamster-applet/cs/figures/hamster-logo.png
+share/gnome/help/hamster-applet/cs/index.page
+share/gnome/help/hamster-applet/cs/input.page
+share/gnome/help/hamster-applet/cs/legal.xml
+share/gnome/help/hamster-applet/cs/merge.page
+share/gnome/help/hamster-applet/cs/reports.page
+share/gnome/help/hamster-applet/cs/statistics.page
+share/gnome/help/hamster-applet/de/backup.page
+share/gnome/help/hamster-applet/de/figures/hamster-logo.png
+share/gnome/help/hamster-applet/de/index.page
+share/gnome/help/hamster-applet/de/input.page
+share/gnome/help/hamster-applet/de/legal.xml
+share/gnome/help/hamster-applet/de/merge.page
+share/gnome/help/hamster-applet/de/reports.page
+share/gnome/help/hamster-applet/de/statistics.page
+share/gnome/help/hamster-applet/el/backup.page
+share/gnome/help/hamster-applet/el/figures/hamster-logo.png
+share/gnome/help/hamster-applet/el/index.page
+share/gnome/help/hamster-applet/el/input.page
+share/gnome/help/hamster-applet/el/legal.xml
+share/gnome/help/hamster-applet/el/merge.page
+share/gnome/help/hamster-applet/el/reports.page
+share/gnome/help/hamster-applet/el/statistics.page
+share/gnome/help/hamster-applet/es/backup.page
+share/gnome/help/hamster-applet/es/figures/hamster-logo.png
+share/gnome/help/hamster-applet/es/index.page
+share/gnome/help/hamster-applet/es/input.page
+share/gnome/help/hamster-applet/es/legal.xml
+share/gnome/help/hamster-applet/es/merge.page
+share/gnome/help/hamster-applet/es/reports.page
+share/gnome/help/hamster-applet/es/statistics.page
+share/gnome/help/hamster-applet/fr/backup.page
+share/gnome/help/hamster-applet/fr/figures/hamster-logo.png
+share/gnome/help/hamster-applet/fr/index.page
+share/gnome/help/hamster-applet/fr/input.page
+share/gnome/help/hamster-applet/fr/legal.xml
+share/gnome/help/hamster-applet/fr/merge.page
+share/gnome/help/hamster-applet/fr/reports.page
+share/gnome/help/hamster-applet/fr/statistics.page
+share/gnome/help/hamster-applet/zh_HK/backup.page
+share/gnome/help/hamster-applet/zh_HK/figures/hamster-logo.png
+share/gnome/help/hamster-applet/zh_HK/index.page
+share/gnome/help/hamster-applet/zh_HK/input.page
+share/gnome/help/hamster-applet/zh_HK/legal.xml
+share/gnome/help/hamster-applet/zh_HK/merge.page
+share/gnome/help/hamster-applet/zh_HK/reports.page
+share/gnome/help/hamster-applet/zh_HK/statistics.page
+share/gnome/help/hamster-applet/zh_TW/backup.page
+share/gnome/help/hamster-applet/zh_TW/figures/hamster-logo.png
+share/gnome/help/hamster-applet/zh_TW/index.page
+share/gnome/help/hamster-applet/zh_TW/input.page
+share/gnome/help/hamster-applet/zh_TW/legal.xml
+share/gnome/help/hamster-applet/zh_TW/merge.page
+share/gnome/help/hamster-applet/zh_TW/reports.page
+share/gnome/help/hamster-applet/zh_TW/statistics.page
share/icons/hicolor/16x16/apps/hamster-applet.png
share/icons/hicolor/22x22/apps/hamster-applet.png
share/icons/hicolor/32x32/apps/hamster-applet.png
@@ -97,6 +200,7 @@ share/locale/da/LC_MESSAGES/hamster-applet.mo
share/locale/de/LC_MESSAGES/hamster-applet.mo
share/locale/el/LC_MESSAGES/hamster-applet.mo
share/locale/en_GB/LC_MESSAGES/hamster-applet.mo
+share/locale/en@shaw/LC_MESSAGES/hamster-applet.mo
share/locale/es/LC_MESSAGES/hamster-applet.mo
share/locale/et/LC_MESSAGES/hamster-applet.mo
share/locale/eu/LC_MESSAGES/hamster-applet.mo
@@ -144,9 +248,27 @@ share/locale/zh_HK/LC_MESSAGES/hamster-applet.mo
share/locale/zh_TW/LC_MESSAGES/hamster-applet.mo
@dirrm %%DATADIR%%/art
@dirrm %%DATADIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/hamster/widgets
@dirrm %%PYTHON_SITELIBDIR%%/hamster/keybinder
@dirrm %%PYTHON_SITELIBDIR%%/hamster
@dirrm lib/hamster-applet
+@dirrm share/gnome/help/hamster-applet/zh_TW/figures
+@dirrm share/gnome/help/hamster-applet/zh_TW
+@dirrm share/gnome/help/hamster-applet/zh_HK/figures
+@dirrm share/gnome/help/hamster-applet/zh_HK
+@dirrm share/gnome/help/hamster-applet/fr/figures
+@dirrm share/gnome/help/hamster-applet/fr
+@dirrm share/gnome/help/hamster-applet/es/figures
+@dirrm share/gnome/help/hamster-applet/es
+@dirrm share/gnome/help/hamster-applet/el/figures
+@dirrm share/gnome/help/hamster-applet/el
+@dirrm share/gnome/help/hamster-applet/de/figures
+@dirrm share/gnome/help/hamster-applet/de
+@dirrm share/gnome/help/hamster-applet/cs/figures
+@dirrm share/gnome/help/hamster-applet/cs
+@dirrm share/gnome/help/hamster-applet/C/figures
+@dirrm share/gnome/help/hamster-applet/C
+@dirrm share/gnome/help/hamster-applet
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@@ -161,6 +283,8 @@ share/locale/zh_TW/LC_MESSAGES/hamster-applet.mo
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/deskutils/labyrinth/Makefile b/deskutils/labyrinth/Makefile
index 0b273429dc67..981d1429c216 100644
--- a/deskutils/labyrinth/Makefile
+++ b/deskutils/labyrinth/Makefile
@@ -7,7 +7,7 @@
PORTNAME= labyrinth
PORTVERSION= 0.4.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils python
MASTER_SITES= GOOGLE_CODE
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index 7db60efe0fbd..ca2dccaf735c 100644
--- a/deskutils/nautilus-actions/Makefile
+++ b/deskutils/nautilus-actions/Makefile
@@ -3,24 +3,23 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/nautilus-actions/Makefile,v 1.14 2009/11/09 09:08:28 kwm Exp $
+# $MCom: ports/deskutils/nautilus-actions/Makefile,v 1.21 2010/04/16 23:41:09 kwm Exp $
#
PORTNAME= nautilus-actions
-PORTVERSION= 1.12.3
-PORTREVISION= 2
+PORTVERSION= 2.30.2
CATEGORIES= deskutils
-MASTER_SITES= GNOME \
- http://www.nautilus-actions.org/downloads/ \
- ftp://pwi.dyndns.biz/pub/tarballs/nautilus-actions/
+MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Extension for Nautilus to configure programs to launch on files
LIB_DEPENDS= uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
INSTALLS_ICONS= yes
+USE_BZIP2= yes
USE_GETTEXT= yes
USE_GNOME= nautilus2 intlhack
USE_GMAKE= yes
@@ -29,8 +28,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-nautilus-extdir=${LOCALBASE}/lib/nautilus/extensions-2.0
-PORTDOCS= AUTHORS COPYING ChangeLog ChangeLog-2008 INSTALL MAINTAINERS \
- NEWS README TODO objects-hierarchy.odg
+PORTDOCS= AUTHORS COPYING ChangeLog ChangeLog-2008 ChangeLog-2009 INSTALL \
+ MAINTAINERS NEWS README TODO export-format-id io-provider-id \
+ objects-hierarchy.odg
.include <bsd.port.pre.mk>
@@ -47,4 +47,4 @@ post-patch:
${WRKSRC}/Makefile.in ${WRKSRC}/doc/Makefile.in
.endif
-.include <bsd.port.post.mk>>
+.include <bsd.port.post.mk>
diff --git a/deskutils/nautilus-actions/distinfo b/deskutils/nautilus-actions/distinfo
index 55072d4f5cdf..62567bb6b69f 100644
--- a/deskutils/nautilus-actions/distinfo
+++ b/deskutils/nautilus-actions/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-actions-1.12.3.tar.gz) = aea47f3750725ccd9bb677cd0649055c
-SHA256 (nautilus-actions-1.12.3.tar.gz) = 953c8d91bc7bd488cecd393f3b46ecc7b720c14ae2ca33931db8b195e57acb04
-SIZE (nautilus-actions-1.12.3.tar.gz) = 1005638
+MD5 (nautilus-actions-2.30.2.tar.bz2) = 65e5b23b5f831af9e1b1a7c0fd1cd0bd
+SHA256 (nautilus-actions-2.30.2.tar.bz2) = 0cc0b55a1d4932c9f20bc741e1f9452090c31b0486435e913c89c2a954a4bbe8
+SIZE (nautilus-actions-2.30.2.tar.bz2) = 964943
diff --git a/deskutils/nautilus-actions/files/extra-patch-configure b/deskutils/nautilus-actions/files/extra-patch-configure
index 898bb4fc64f9..577f55c12dd1 100644
--- a/deskutils/nautilus-actions/files/extra-patch-configure
+++ b/deskutils/nautilus-actions/files/extra-patch-configure
@@ -1,15 +1,15 @@
--- configure.orig 2009-10-19 21:06:41.000000000 +1000
+++ configure 2009-10-19 23:38:22.000000000 +1000
-@@ -4710,7 +4710,7 @@
+@@ -4718,7 +4718,7 @@
_ac_warning_def=error
-- _ac_compliant_def="-ansi -pedantic -Wno-overlength-strings"
-+ _ac_compliant_def="-ansi -pedantic"
+- _ac_compliant_def="-ansi -Wno-overlength-strings -Wformat=2"
++ _ac_compliant_def="-ansi -Wformat=2"
# Check whether --enable-compile-warnings was given.
-@@ -4800,7 +4800,7 @@
+@@ -4808,7 +4808,7 @@
done
unset option
if test "$enable_compile_warnings" = "error" ; then
diff --git a/deskutils/nautilus-actions/pkg-plist b/deskutils/nautilus-actions/pkg-plist
index 76ae4b1c2ab4..b6613890314b 100644
--- a/deskutils/nautilus-actions/pkg-plist
+++ b/deskutils/nautilus-actions/pkg-plist
@@ -1,8 +1,43 @@
bin/nautilus-actions-config-tool
bin/nautilus-actions-new
+bin/nautilus-actions-run
bin/nautilus-actions-schemas
-lib/nautilus/extensions-2.0/libnautilus-actions.la
-lib/nautilus/extensions-2.0/libnautilus-actions.so
+include/nautilus-actions/na-core-utils.h
+include/nautilus-actions/na-data-boxed.h
+include/nautilus-actions/na-data-def.h
+include/nautilus-actions/na-data-types.h
+include/nautilus-actions/na-dbus.h
+include/nautilus-actions/na-extension.h
+include/nautilus-actions/na-gconf-monitor.h
+include/nautilus-actions/na-gconf-utils.h
+include/nautilus-actions/na-icontext.h
+include/nautilus-actions/na-iduplicable.h
+include/nautilus-actions/na-iexporter.h
+include/nautilus-actions/na-ifactory-object-data.h
+include/nautilus-actions/na-ifactory-object.h
+include/nautilus-actions/na-ifactory-provider-provider.h
+include/nautilus-actions/na-ifactory-provider.h
+include/nautilus-actions/na-iimporter.h
+include/nautilus-actions/na-iio-provider.h
+include/nautilus-actions/na-object-action.h
+include/nautilus-actions/na-object-api.h
+include/nautilus-actions/na-object-id.h
+include/nautilus-actions/na-object-item.h
+include/nautilus-actions/na-object-menu.h
+include/nautilus-actions/na-object-profile.h
+include/nautilus-actions/na-object.h
+lib/nautilus-actions/libna-core.la
+lib/nautilus-actions/libna-core.so
+lib/nautilus-actions/libna-io-desktop.la
+lib/nautilus-actions/libna-io-desktop.so
+lib/nautilus-actions/libna-io-gconf.la
+lib/nautilus-actions/libna-io-gconf.so
+lib/nautilus-actions/libna-io-xml.la
+lib/nautilus-actions/libna-io-xml.so
+lib/nautilus/extensions-2.0/libnautilus-actions-menu.la
+lib/nautilus/extensions-2.0/libnautilus-actions-menu.so
+lib/nautilus/extensions-2.0/libnautilus-actions-tracker.la
+lib/nautilus/extensions-2.0/libnautilus-actions-tracker.so
share/applications/nact.desktop
share/icons/hicolor/16x16/apps/nautilus-actions.png
share/icons/hicolor/22x22/apps/nautilus-actions.png
@@ -55,11 +90,20 @@ share/locale/vi/LC_MESSAGES/nautilus-actions.mo
share/locale/zh_CN/LC_MESSAGES/nautilus-actions.mo
share/locale/zh_HK/LC_MESSAGES/nautilus-actions.mo
share/locale/zh_TW/LC_MESSAGES/nautilus-actions.mo
-%%DATADIR%%/nautilus-actions.schemas
+%%DATADIR%%/locked.png
+%%DATADIR%%/na-importer-ask.ui
+%%DATADIR%%/nact-assistant-export.ui
+%%DATADIR%%/nact-preferences.ui
%%DATADIR%%/nautilus-actions-config-tool.actions
%%DATADIR%%/nautilus-actions-config-tool.ui
-%%DATADIR%%/nact-assistant-export.ui
+%%DATADIR%%/nautilus-actions-confs.schemas
+%%DATADIR%%/nautilus-actions-maintainer.actions
+%%DATADIR%%/nautilus-actions-prefs.schemas
+%%DATADIR%%/transparent.png
@dirrm %%DATADIR%%
+@dirrm lib/nautilus-actions
+@dirrm include/nautilus-actions
+@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@@ -72,4 +116,3 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-actions.mo
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
-@dirrmtry share/applications
diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index c48514eb9156..fb1cce45d685 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -3,34 +3,46 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.22 2009/11/18 18:50:49 kwm Exp $
+# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.25 2010/04/10 23:24:02 kwm Exp $
PORTNAME= nautilus-sendto
-PORTVERSION= 2.28.2
-PORTREVISION= 4
+PORTVERSION= 2.28.4
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Integration between nautilus, evolution, and pidgin
-BUILD_DEPENDS= empathy:${PORTSDIR}/net-im/empathy
-RUN_DEPENDS= empathy:${PORTSDIR}/net-im/empathy
-
MAN1= nautilus-sendto.1
GCONF_SCHEMAS= nst.schemas
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GNOME= intlhack gnomeprefix gnometarget nautilus2 gnomehack
+USE_GNOME= intlhack gnomeprefix gnometarget nautilus2 gnomehack \
+ evolutiondataserver
USE_GETTEXT= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --with-plugins="${SENDTO_PLUGINS}"
+
+OPTIONS= PIDGIN "Build pidgin sendto plugin" off
+
+# check configure script for allowed_plugins="..." for new plugins
+SENDTO_PLUGINS= bluetooth evolution gajim nautilus-burn removable-devices
+
+# Not these plugins:
+# empathy (moved to empathy port) upnp
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/bin/pidgin)
+.if defined(WITH_PIDGIN)
+SENDTO_PLUGINS:=${SENDTO_PLUGINS} pidgin
+LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
RUN_DEPENDS+= pidgin:${PORTSDIR}/net-im/pidgin
+PLIST_SUB+= PIDGIN=""
+.else
+PLIST_SUB+= PIDGIN="@comment "
.endif
.include <bsd.port.post.mk>
diff --git a/deskutils/nautilus-sendto/distinfo b/deskutils/nautilus-sendto/distinfo
index 022045f2ed34..6361c56f4b45 100644
--- a/deskutils/nautilus-sendto/distinfo
+++ b/deskutils/nautilus-sendto/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-sendto-2.28.2.tar.bz2) = b37ab6eec43d95bef42bb8ed67ae290f
-SHA256 (nautilus-sendto-2.28.2.tar.bz2) = 0fa992b9a4489b712465e82eb182db3eaea9280397871f9d95849c25d1c33893
-SIZE (nautilus-sendto-2.28.2.tar.bz2) = 423429
+MD5 (nautilus-sendto-2.28.4.tar.bz2) = e68236367190d01a31d11fb746822bed
+SHA256 (nautilus-sendto-2.28.4.tar.bz2) = ff6b1a73f7e662fb49c3a1aee59a5c17fc96c23fcf63c3b10b6142eaef344f06
+SIZE (nautilus-sendto-2.28.4.tar.bz2) = 436967
diff --git a/deskutils/nautilus-sendto/pkg-plist b/deskutils/nautilus-sendto/pkg-plist
index c4b82e754979..816f0b08933f 100644
--- a/deskutils/nautilus-sendto/pkg-plist
+++ b/deskutils/nautilus-sendto/pkg-plist
@@ -4,14 +4,12 @@ lib/nautilus-sendto/plugins/libnstbluetooth.la
lib/nautilus-sendto/plugins/libnstbluetooth.so
lib/nautilus-sendto/plugins/libnstburn.la
lib/nautilus-sendto/plugins/libnstburn.so
-lib/nautilus-sendto/plugins/libnstempathy.la
-lib/nautilus-sendto/plugins/libnstempathy.so
lib/nautilus-sendto/plugins/libnstevolution.la
lib/nautilus-sendto/plugins/libnstevolution.so
lib/nautilus-sendto/plugins/libnstgajim.la
lib/nautilus-sendto/plugins/libnstgajim.so
-lib/nautilus-sendto/plugins/libnstpidgin.la
-lib/nautilus-sendto/plugins/libnstpidgin.so
+%%PIDGIN%%lib/nautilus-sendto/plugins/libnstpidgin.la
+%%PIDGIN%%lib/nautilus-sendto/plugins/libnstpidgin.so
lib/nautilus-sendto/plugins/libnstremovable_devices.la
lib/nautilus-sendto/plugins/libnstremovable_devices.so
lib/nautilus/extensions-2.0/libnautilus-sendto.la
@@ -29,12 +27,14 @@ libdata/pkgconfig/nautilus-sendto.pc
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
+share/locale/af/LC_MESSAGES/nautilus-sendto.mo
share/locale/ar/LC_MESSAGES/nautilus-sendto.mo
share/locale/as/LC_MESSAGES/nautilus-sendto.mo
share/locale/ast/LC_MESSAGES/nautilus-sendto.mo
-share/locale/be@latin/LC_MESSAGES/nautilus-sendto.mo
share/locale/be/LC_MESSAGES/nautilus-sendto.mo
+share/locale/be@latin/LC_MESSAGES/nautilus-sendto.mo
share/locale/bg/LC_MESSAGES/nautilus-sendto.mo
+share/locale/bn/LC_MESSAGES/nautilus-sendto.mo
share/locale/bn_IN/LC_MESSAGES/nautilus-sendto.mo
share/locale/br/LC_MESSAGES/nautilus-sendto.mo
share/locale/ca/LC_MESSAGES/nautilus-sendto.mo
@@ -43,6 +43,7 @@ share/locale/da/LC_MESSAGES/nautilus-sendto.mo
share/locale/de/LC_MESSAGES/nautilus-sendto.mo
share/locale/dz/LC_MESSAGES/nautilus-sendto.mo
share/locale/el/LC_MESSAGES/nautilus-sendto.mo
+share/locale/en@shaw/LC_MESSAGES/nautilus-sendto.mo
share/locale/en_CA/LC_MESSAGES/nautilus-sendto.mo
share/locale/en_GB/LC_MESSAGES/nautilus-sendto.mo
share/locale/es/LC_MESSAGES/nautilus-sendto.mo
@@ -61,9 +62,12 @@ share/locale/ka/LC_MESSAGES/nautilus-sendto.mo
share/locale/kn/LC_MESSAGES/nautilus-sendto.mo
share/locale/ko/LC_MESSAGES/nautilus-sendto.mo
share/locale/lt/LC_MESSAGES/nautilus-sendto.mo
+share/locale/lv/LC_MESSAGES/nautilus-sendto.mo
share/locale/mk/LC_MESSAGES/nautilus-sendto.mo
+share/locale/ml/LC_MESSAGES/nautilus-sendto.mo
share/locale/mr/LC_MESSAGES/nautilus-sendto.mo
share/locale/nb/LC_MESSAGES/nautilus-sendto.mo
+share/locale/nds/LC_MESSAGES/nautilus-sendto.mo
share/locale/ne/LC_MESSAGES/nautilus-sendto.mo
share/locale/nl/LC_MESSAGES/nautilus-sendto.mo
share/locale/oc/LC_MESSAGES/nautilus-sendto.mo
@@ -78,6 +82,8 @@ share/locale/rw/LC_MESSAGES/nautilus-sendto.mo
share/locale/sk/LC_MESSAGES/nautilus-sendto.mo
share/locale/sl/LC_MESSAGES/nautilus-sendto.mo
share/locale/sq/LC_MESSAGES/nautilus-sendto.mo
+share/locale/sr/LC_MESSAGES/nautilus-sendto.mo
+share/locale/sr@latin/LC_MESSAGES/nautilus-sendto.mo
share/locale/sv/LC_MESSAGES/nautilus-sendto.mo
share/locale/ta/LC_MESSAGES/nautilus-sendto.mo
share/locale/te/LC_MESSAGES/nautilus-sendto.mo
@@ -85,6 +91,7 @@ share/locale/th/LC_MESSAGES/nautilus-sendto.mo
share/locale/uk/LC_MESSAGES/nautilus-sendto.mo
share/locale/vi/LC_MESSAGES/nautilus-sendto.mo
share/locale/zh_CN/LC_MESSAGES/nautilus-sendto.mo
+share/locale/zh_HK/LC_MESSAGES/nautilus-sendto.mo
share/locale/zh_TW/LC_MESSAGES/nautilus-sendto.mo
share/nautilus-sendto/ui/nautilus-sendto.ui
@dirrm %%DOCSDIR%%
@@ -93,14 +100,22 @@ share/nautilus-sendto/ui/nautilus-sendto.ui
@dirrm lib/nautilus-sendto/plugins
@dirrm lib/nautilus-sendto
@dirrm include/nautilus-sendto
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/deskutils/osmo/Makefile b/deskutils/osmo/Makefile
index 23eee381b7bf..864c86039a5f 100644
--- a/deskutils/osmo/Makefile
+++ b/deskutils/osmo/Makefile
@@ -35,6 +35,10 @@ POFILES= ca cs de el es fi fr hu it ja lt nl pl pt \
MSGFMT= ${LOCALBASE}/bin/msgfmt
+post-patch:
+ @${REINPLACE_CMD} -e 's|-DGTK_DISABLE_DEPRECATED||g' \
+ ${WRKSRC}/src/Makefile.in
+
pre-install:
# workaround to problem in po makefile
.for p in ${POFILES}
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index c1e7a0529148..e71b399bece7 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -3,11 +3,11 @@
# Whom: Chia-liang Kao <clkao@CirX.ORG>
#
# $FreeBSD$
-# $MCom: ports/devel/ORBit2/Makefile,v 1.53 2008/09/21 06:32:52 kwm Exp $
+# $MCom: ports/devel/ORBit2/Makefile,v 1.55 2010/04/02 17:37:25 kwm Exp $
#
PORTNAME= ORBit2
-PORTVERSION= 2.14.17
+PORTVERSION= 2.14.18
PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index 4749ec89f565..b4e655b065bb 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/ORBit2-2.14.17.tar.bz2) = 10bfb957fa4a8935a0b4afaee7d71df7
-SHA256 (gnome2/ORBit2-2.14.17.tar.bz2) = 62bfce3f678f9347a19c766944e8aef7b89bc32b25ac23eb3e4c25929ce8974c
-SIZE (gnome2/ORBit2-2.14.17.tar.bz2) = 747503
+MD5 (gnome2/ORBit2-2.14.18.tar.bz2) = 3e80596171b1ea652707219c7144ff53
+SHA256 (gnome2/ORBit2-2.14.18.tar.bz2) = c6148edd8044255aeed9ab1d1eeb3c39edd0aa1ace5d33cf6831b80d11f1ab7c
+SIZE (gnome2/ORBit2-2.14.18.tar.bz2) = 747701
diff --git a/devel/anjuta-extras/Makefile b/devel/anjuta-extras/Makefile
index e99f9645ee5c..2223a250c84e 100644
--- a/devel/anjuta-extras/Makefile
+++ b/devel/anjuta-extras/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/anjuta-extras/Makefile,v 1.3 2009/09/22 10:27:21 kwm Exp $
+# $MCom: ports/devel/anjuta-extras/Makefile,v 1.7 2010/04/29 15:08:31 kwm Exp $
#
PORTNAME= anjuta-extras
-PORTVERSION= 2.28.0
-PORTREVISION= 2
+PORTVERSION= 2.30.1.0
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/anjuta-extras/distinfo b/devel/anjuta-extras/distinfo
index 79a77a4979d1..70c891199e11 100644
--- a/devel/anjuta-extras/distinfo
+++ b/devel/anjuta-extras/distinfo
@@ -1,3 +1,3 @@
-MD5 (anjuta-extras-2.28.0.tar.bz2) = c67db4abb5a873fdbe8f4fed59b2a9da
-SHA256 (anjuta-extras-2.28.0.tar.bz2) = 7b7aa28ca598e17024a41fb29582e6cf2efcc1a273b00e84994f21900e288b49
-SIZE (anjuta-extras-2.28.0.tar.bz2) = 2939244
+MD5 (anjuta-extras-2.30.1.0.tar.bz2) = c76a0843896890e054b063551fa431eb
+SHA256 (anjuta-extras-2.30.1.0.tar.bz2) = 6a8f37de883d05596d7b416a10d49d737c735a7dd0767ce4b804480255cfe808
+SIZE (anjuta-extras-2.30.1.0.tar.bz2) = 2873072
diff --git a/devel/anjuta-extras/pkg-plist b/devel/anjuta-extras/pkg-plist
index 660a35dda8d4..d274e65150ba 100644
--- a/devel/anjuta-extras/pkg-plist
+++ b/devel/anjuta-extras/pkg-plist
@@ -5,23 +5,18 @@ lib/anjuta/anjuta-scratchbox.plugin
lib/anjuta/libanjuta-class-inheritance.a
lib/anjuta/libanjuta-class-inheritance.la
lib/anjuta/libanjuta-class-inheritance.so
-lib/anjuta/libanjuta-class-inheritance.so.0
lib/anjuta/libanjuta-editor.a
lib/anjuta/libanjuta-editor.la
lib/anjuta/libanjuta-editor.so
-lib/anjuta/libanjuta-editor.so.0
lib/anjuta/libanjuta-profiler.a
lib/anjuta/libanjuta-profiler.la
lib/anjuta/libanjuta-profiler.so
-lib/anjuta/libanjuta-profiler.so.0
lib/anjuta/libanjuta-sample.a
lib/anjuta/libanjuta-sample.la
lib/anjuta/libanjuta-sample.so
-lib/anjuta/libanjuta-sample.so.0
lib/anjuta/libanjuta-scratchbox.a
lib/anjuta/libanjuta-scratchbox.la
lib/anjuta/libanjuta-scratchbox.so
-lib/anjuta/libanjuta-scratchbox.so.0
lib/anjuta/profiler.plugin
share/anjuta/glade/anjuta-editor-scintilla.ui
share/anjuta/glade/anjuta-scratchbox-panel.png
@@ -106,3 +101,21 @@ share/pixmaps/anjuta/anjuta-sample-plugin-48.png
share/pixmaps/anjuta/anjuta-sample-plugin.svg
share/pixmaps/anjuta/anjuta-scratchbox-48.png
@dirrm share/anjuta/properties
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 8d192aa7534d..beaa922dd866 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -3,12 +3,11 @@
# Whom: Dmitry Sivachenko <demon@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/anjuta/Makefile,v 1.49 2009/10/19 19:29:48 kwm Exp $
+# $MCom: ports/devel/anjuta/Makefile,v 1.58 2010/04/28 08:11:36 kwm Exp $
#
PORTNAME= anjuta
-PORTVERSION= 2.28.2.0
-PORTREVISION= 2
+PORTVERSION= 2.30.1.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -44,6 +43,7 @@ USE_GNOME= gnomeprefix gnomehack vte gtksourceview2 libgda4
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --with-symbol-db-shm=/tmp
USE_LDCONFIG= yes
GCONF_SCHEMAS= anjuta-build-basic-autotools-plugin.schemas \
anjuta-cvs-plugin.schemas \
@@ -102,6 +102,9 @@ CONFIGURE_ARGS+=--disable-plugin-devhelp
PLIST_SUB+= DEVHELP=""
.endif
+post-patch:
+ @${RM} ${WRKSRC}/plugins/debug-manager/anjuta-debug-manager.schemas
+
post-configure:
@${REINPLACE_CMD} -e 's|PKG_PATH|PKG_CONFIG_PATH|g' \
${WRKSRC}/configure
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index 83b82e458c32..325fbb165322 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/anjuta-2.28.2.0.tar.bz2) = 3f61d85938d1352125f05a1167183721
-SHA256 (gnome2/anjuta-2.28.2.0.tar.bz2) = 6d8216fb1fe2541e7a3080c0ffb62bc0527c296ce97a1bd25d2064a8522f664a
-SIZE (gnome2/anjuta-2.28.2.0.tar.bz2) = 7521022
+MD5 (gnome2/anjuta-2.30.1.0.tar.bz2) = 433a159761a7d56f4b767054cc90c8fc
+SHA256 (gnome2/anjuta-2.30.1.0.tar.bz2) = 3c64d80723e2a60311405e83b1b0cab94d07003a579f47cdb1f8073dcfb4e3c1
+SIZE (gnome2/anjuta-2.30.1.0.tar.bz2) = 9404450
diff --git a/devel/anjuta/files/patch-Makefile.in b/devel/anjuta/files/patch-Makefile.in
index 27b564d7c381..b0d1cdbdcc0b 100644
--- a/devel/anjuta/files/patch-Makefile.in
+++ b/devel/anjuta/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2010-02-14 13:38:48.000000000 -0500
-+++ Makefile.in 2010-02-14 13:39:18.000000000 -0500
-@@ -482,17 +482,17 @@ uninstall-anjuta_dataDATA:
+--- Makefile.in.orig 2009-12-23 12:28:03.000000000 +0100
++++ Makefile.in 2009-12-23 12:31:34.000000000 +0100
+@@ -490,17 +490,17 @@ uninstall-anjuta_dataDATA:
echo " ( cd '$(DESTDIR)$(anjuta_datadir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(anjuta_datadir)" && rm -f $$files
install-anjutadocDATA: $(anjutadoc_DATA)
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_plugin.c b/devel/anjuta/files/patch-plugins_symbol-db_plugin.c
deleted file mode 100644
index d19ef6d15a0a..000000000000
--- a/devel/anjuta/files/patch-plugins_symbol-db_plugin.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/symbol-db/plugin.c.orig 2009-04-17 01:08:28.000000000 -0400
-+++ plugins/symbol-db/plugin.c 2009-04-17 01:09:11.000000000 -0400
-@@ -1510,7 +1510,7 @@ do_check_offline_files_changed (SymbolDB
- GHashTable *prj_elements_hash;
- GPtrArray *to_add_files = NULL;
- gint i;
-- gint real_added ;
-+ gint real_added = 0;
-
- pm = anjuta_shell_get_interface (ANJUTA_PLUGIN (sdb_plugin)->shell,
- IAnjutaProjectManager, NULL);
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h
deleted file mode 100644
index cecb81021faf..000000000000
--- a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/symbol-db/symbol-db-engine-priv.h.orig 2009-04-15 19:40:20.000000000 -0400
-+++ plugins/symbol-db/symbol-db-engine-priv.h 2009-04-15 19:40:34.000000000 -0400
-@@ -47,7 +47,7 @@
-
- #define CTAGS_MARKER "#_#\n"
-
--#define SHARED_MEMORY_PREFIX "/dev/shm"
-+#define SHARED_MEMORY_PREFIX "/tmp"
-
- #define THREADS_MAX_CONCURRENT 2
- #define TRIGGER_SIGNALS_DELAY 100
diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist
index dd4922aca066..fad84d4dbec9 100644
--- a/devel/anjuta/pkg-plist
+++ b/devel/anjuta/pkg-plist
@@ -14,7 +14,6 @@ include/libanjuta-1.0/libanjuta/anjuta-enum-types.h
include/libanjuta-1.0/libanjuta/anjuta-error.h
include/libanjuta-1.0/libanjuta/anjuta-launcher.h
include/libanjuta-1.0/libanjuta/anjuta-marshal.h
-include/libanjuta-1.0/libanjuta/anjuta-message-area.h
include/libanjuta-1.0/libanjuta/anjuta-plugin-description.h
include/libanjuta-1.0/libanjuta/anjuta-plugin-handle.h
include/libanjuta-1.0/libanjuta/anjuta-plugin-manager.h
@@ -23,12 +22,14 @@ include/libanjuta-1.0/libanjuta/anjuta-preferences-dialog.h
include/libanjuta-1.0/libanjuta/anjuta-preferences.h
include/libanjuta-1.0/libanjuta/anjuta-profile-manager.h
include/libanjuta-1.0/libanjuta/anjuta-profile.h
+include/libanjuta-1.0/libanjuta/anjuta-project.h
include/libanjuta-1.0/libanjuta/anjuta-save-prompt.h
include/libanjuta-1.0/libanjuta/anjuta-serializer.h
include/libanjuta-1.0/libanjuta/anjuta-session.h
include/libanjuta-1.0/libanjuta/anjuta-shell.h
include/libanjuta-1.0/libanjuta/anjuta-status.h
include/libanjuta-1.0/libanjuta/anjuta-sync-command.h
+include/libanjuta-1.0/libanjuta/anjuta-tabber.h
include/libanjuta-1.0/libanjuta/anjuta-ui.h
include/libanjuta-1.0/libanjuta/anjuta-utils.h
include/libanjuta-1.0/libanjuta/anjuta-vcs-status.h
@@ -59,6 +60,7 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-language.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-line-mode.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-search.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-selection.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-tip.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-view.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-zoom.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor.h
@@ -83,6 +85,8 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-preferences.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-print.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project-backend.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project-manager.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-provider.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream-loader.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream-savable.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream.h
@@ -102,6 +106,7 @@ lib/anjuta/anjuta-class-gen.plugin
lib/anjuta/anjuta-cvs.plugin
lib/anjuta/anjuta-debug-manager.plugin
%%DEVHELP%%lib/anjuta/anjuta-devhelp.plugin
+lib/anjuta/dir-project.plugin
lib/anjuta/anjuta-document-manager.plugin
lib/anjuta/anjuta-file-wizard.plugin
lib/anjuta/anjuta-gdb.plugin
@@ -125,6 +130,8 @@ lib/anjuta/file-manager.plugin
lib/anjuta/gbf-am.plugin
lib/anjuta/gbf-mkfile.plugin
lib/anjuta/git.plugin
+lib/anjuta/js_debugger.plugin
+lib/anjuta/js_support_plugin.plugin
lib/anjuta/language-manager.plugin
lib/anjuta/libanjuta-build-basic-autotools.la
lib/anjuta/libanjuta-build-basic-autotools.so
@@ -180,12 +187,18 @@ lib/anjuta/libanjuta-terminal.la
lib/anjuta/libanjuta-terminal.so
lib/anjuta/libanjuta-tools.la
lib/anjuta/libanjuta-tools.so
+lib/anjuta/libdir-project.la
+lib/anjuta/libdir-project.so
lib/anjuta/libfile-manager.la
lib/anjuta/libfile-manager.so
lib/anjuta/libgbf-am.la
lib/anjuta/libgbf-am.so
lib/anjuta/libgbf-mkfile.la
lib/anjuta/libgbf-mkfile.so
+lib/anjuta/libjs_debugger.la
+lib/anjuta/libjs_debugger.so
+lib/anjuta/libjs-support-plugin.la
+lib/anjuta/libjs-support-plugin.so
lib/anjuta/liblanguage-manager.la
lib/anjuta/liblanguage-manager.so
lib/anjuta/sourceview.plugin
@@ -217,6 +230,7 @@ share/anjuta/glade/anjuta-file-wizard.ui
share/anjuta/glade/anjuta-git.ui
share/anjuta/glade/anjuta-glade.glade
share/anjuta/glade/anjuta-language-cpp-java.ui
+share/anjuta/glade/anjuta-language-javascript.ui
share/anjuta/glade/anjuta-macro.ui
share/anjuta/glade/anjuta-message-manager-plugin.ui
share/anjuta/glade/anjuta-project-wizard.ui
@@ -262,6 +276,7 @@ share/anjuta/project/cpp/po/POTFILES.in
share/anjuta/project/cpp/src/Makefile.am.tpl
share/anjuta/project/cpp/src/cvsignore
share/anjuta/project/cpp/src/main.cc
+share/anjuta/project/directory/project.anjuta
share/anjuta/project/django-logo.png
share/anjuta/project/django.wiz
share/anjuta/project/gcj-logo.png
@@ -299,6 +314,16 @@ share/anjuta/project/java/po/POTFILES.in
share/anjuta/project/java/project.anjuta
share/anjuta/project/java/src/Makefile.am.tpl
share/anjuta/project/java/src/main.java
+share/anjuta/project/js.wiz
+share/anjuta/project/js_minimal/Makefile.am.tpl
+share/anjuta/project/js_minimal/autogen.sh
+share/anjuta/project/js_minimal/configure.ac.tpl
+share/anjuta/project/js_minimal/project.anjuta
+share/anjuta/project/js_minimal/src/Makefile.am.tpl
+share/anjuta/project/js_minimal/src/debug.c
+share/anjuta/project/js_minimal/src/debug.h
+share/anjuta/project/js_minimal/src/main.c
+share/anjuta/project/js_minimal/src/main.js
share/anjuta/project/library.wiz
share/anjuta/project/library/configure.ac.tpl
share/anjuta/project/library/po/POTFILES.in
@@ -375,7 +400,7 @@ share/anjuta/project/xlib/configure.ac.tpl
share/anjuta/project/xlib/po/POTFILES.in
share/anjuta/project/xlib/src/Makefile.am.tpl
share/anjuta/project/xlib/src/main.c
-share/anjuta/tables-from-1-to-228.sql
+share/anjuta/sources.list
share/anjuta/tables.sql
share/anjuta/tools/find-fixmes.pl
share/anjuta/tools/prepare-changelog.pl
@@ -391,6 +416,7 @@ share/anjuta/ui/anjuta-git.xml
share/anjuta/ui/anjuta-glade.ui
share/anjuta/ui/anjuta-gtodo.ui
share/anjuta/ui/anjuta-language-support-cpp-java.xml
+share/anjuta/ui/anjuta-language-javascript.xml
share/anjuta/ui/anjuta-loader-plugin.ui
share/anjuta/ui/anjuta-macro.xml
share/anjuta/ui/anjuta-message-manager.xml
@@ -402,7 +428,7 @@ share/anjuta/ui/anjuta-search.xml
share/anjuta/ui/anjuta-symbol-db-plugin.xml
share/anjuta/ui/anjuta-terminal-plugin.xml
share/anjuta/ui/anjuta-tools.xml
-share/anjuta/ui/anjuta.ui
+share/anjuta/ui/anjuta.xml
share/anjuta/ui/file-manager.xml
share/anjuta/welcome.txt
share/applications/anjuta.desktop
@@ -416,9 +442,11 @@ share/applications/anjuta.desktop
%%PORTDOCS%%%%DOCSDIR%%/ScintillaDoc.html
%%PORTDOCS%%%%DOCSDIR%%/TODO
share/doc/libanjuta/AnjutaAsyncCommand.html
+share/doc/libanjuta/AnjutaCModule.html
+share/doc/libanjuta/AnjutaCPluginFactory.html
+share/doc/libanjuta/AnjutaCellRendererCaptionedImage.html
share/doc/libanjuta/AnjutaCommand.html
share/doc/libanjuta/AnjutaLauncher.html
-share/doc/libanjuta/AnjutaMessageArea.html
share/doc/libanjuta/AnjutaPlugin.html
share/doc/libanjuta/AnjutaPluginHandle.html
share/doc/libanjuta/AnjutaPluginManager.html
@@ -429,10 +457,68 @@ share/doc/libanjuta/AnjutaProfileManager.html
share/doc/libanjuta/AnjutaSavePrompt.html
share/doc/libanjuta/AnjutaSerializer.html
share/doc/libanjuta/AnjutaSession.html
+share/doc/libanjuta/AnjutaShell.html
share/doc/libanjuta/AnjutaStatus.html
share/doc/libanjuta/AnjutaSyncCommand.html
-share/doc/libanjuta/AnjutaVcsStatusTreeView.html
share/doc/libanjuta/AnjutaUI.html
+share/doc/libanjuta/AnjutaVcsStatusTreeView.html
+share/doc/libanjuta/ESplash.html
+share/doc/libanjuta/IAnjutaBuildable.html
+share/doc/libanjuta/IAnjutaBuilder.html
+share/doc/libanjuta/IAnjutaDebugManager.html
+share/doc/libanjuta/IAnjutaDebugger.html
+share/doc/libanjuta/IAnjutaDebuggerBreakpoint.html
+share/doc/libanjuta/IAnjutaDebuggerInstruction.html
+share/doc/libanjuta/IAnjutaDebuggerMemory.html
+share/doc/libanjuta/IAnjutaDebuggerRegister.html
+share/doc/libanjuta/IAnjutaDebuggerVariable.html
+share/doc/libanjuta/IAnjutaDocument.html
+share/doc/libanjuta/IAnjutaDocumentManager.html
+share/doc/libanjuta/IAnjutaEditor.html
+share/doc/libanjuta/IAnjutaEditorAssist.html
+share/doc/libanjuta/IAnjutaEditorCell.html
+share/doc/libanjuta/IAnjutaEditorCellStyle.html
+share/doc/libanjuta/IAnjutaEditorComment.html
+share/doc/libanjuta/IAnjutaEditorConvert.html
+share/doc/libanjuta/IAnjutaEditorFactory.html
+share/doc/libanjuta/IAnjutaEditorFolds.html
+share/doc/libanjuta/IAnjutaEditorGoto.html
+share/doc/libanjuta/IAnjutaEditorHover.html
+share/doc/libanjuta/IAnjutaEditorLanguage.html
+share/doc/libanjuta/IAnjutaEditorLineMode.html
+share/doc/libanjuta/IAnjutaEditorSearch.html
+share/doc/libanjuta/IAnjutaEditorSelection.html
+share/doc/libanjuta/IAnjutaEditorView.html
+share/doc/libanjuta/IAnjutaEditorZoom.html
+share/doc/libanjuta/IAnjutaEnvironment.html
+share/doc/libanjuta/IAnjutaFile.html
+share/doc/libanjuta/IAnjutaFileLoader.html
+share/doc/libanjuta/IAnjutaFileManager.html
+share/doc/libanjuta/IAnjutaFileSavable.html
+share/doc/libanjuta/IAnjutaHelp.html
+share/doc/libanjuta/IAnjutaIndicable.html
+share/doc/libanjuta/IAnjutaIterable.html
+share/doc/libanjuta/IAnjutaIterableTree.html
+share/doc/libanjuta/IAnjutaLanguage.html
+share/doc/libanjuta/IAnjutaLanguageSupport.html
+share/doc/libanjuta/IAnjutaLoader.html
+share/doc/libanjuta/IAnjutaMacro.html
+share/doc/libanjuta/IAnjutaMarkable.html
+share/doc/libanjuta/IAnjutaMessageManager.html
+share/doc/libanjuta/IAnjutaMessageView.html
+share/doc/libanjuta/IAnjutaPluginFactory.html
+share/doc/libanjuta/IAnjutaPreferences.html
+share/doc/libanjuta/IAnjutaPrint.html
+share/doc/libanjuta/IAnjutaProjectManager.html
+share/doc/libanjuta/IAnjutaStream.html
+share/doc/libanjuta/IAnjutaStreamLoader.html
+share/doc/libanjuta/IAnjutaStreamSavable.html
+share/doc/libanjuta/IAnjutaSymbol.html
+share/doc/libanjuta/IAnjutaSymbolManager.html
+share/doc/libanjuta/IAnjutaTerminal.html
+share/doc/libanjuta/IAnjutaTodo.html
+share/doc/libanjuta/IAnjutaVcs.html
+share/doc/libanjuta/IAnjutaWizard.html
share/doc/libanjuta/action-block.html
share/doc/libanjuta/anjuta-architecture.html
share/doc/libanjuta/anjuta-architecture.png
@@ -443,82 +529,20 @@ share/doc/libanjuta/home.png
share/doc/libanjuta/index.html
share/doc/libanjuta/index.sgml
share/doc/libanjuta/left.png
-share/doc/libanjuta/libanjuta-AnjutaCellRendererCaptionedImage.html
-share/doc/libanjuta/libanjuta-ESplash.html
-share/doc/libanjuta/libanjuta-anjuta-c-module.html
-share/doc/libanjuta/libanjuta-anjuta-c-plugin-factory.html
+share/doc/libanjuta/libanjuta-AnjutaPluginDescription.html
+share/doc/libanjuta/libanjuta-Debugging.html
+share/doc/libanjuta/libanjuta-Program-resources.html
+share/doc/libanjuta/libanjuta-Utilities.html
share/doc/libanjuta/libanjuta-anjuta-convert.html
-share/doc/libanjuta/libanjuta-anjuta-debug.html
share/doc/libanjuta/libanjuta-anjuta-encodings.html
share/doc/libanjuta/libanjuta-anjuta-enum-types.html
share/doc/libanjuta/libanjuta-anjuta-error.html
share/doc/libanjuta/libanjuta-anjuta-marshal.html
-share/doc/libanjuta/libanjuta-anjuta-plugin-description.html
-share/doc/libanjuta/libanjuta-anjuta-shell.html
share/doc/libanjuta/libanjuta-anjuta-utils-priv.html
-share/doc/libanjuta/libanjuta-anjuta-utils.html
share/doc/libanjuta/libanjuta-anjuta-version.html
share/doc/libanjuta/libanjuta-api.html
-share/doc/libanjuta/libanjuta-ianjuta-bookmark.html
-share/doc/libanjuta/libanjuta-ianjuta-buildable.html
-share/doc/libanjuta/libanjuta-ianjuta-builder.html
-share/doc/libanjuta/libanjuta-ianjuta-debug-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-debugger-breakpoint.html
-share/doc/libanjuta/libanjuta-ianjuta-environment.html
-share/doc/libanjuta/libanjuta-ianjuta-debugger-instruction.html
-share/doc/libanjuta/libanjuta-ianjuta-debugger-memory.html
-share/doc/libanjuta/libanjuta-ianjuta-debugger-register.html
-share/doc/libanjuta/libanjuta-ianjuta-debugger-variable.html
-share/doc/libanjuta/libanjuta-ianjuta-debugger.html
-share/doc/libanjuta/libanjuta-ianjuta-document-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-document.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-assist.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-cell-style.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-cell.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-comment.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-convert.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-factory.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-folds.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-goto.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-hover.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-language.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-line-mode.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-search.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-selection.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-view.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-zoom.html
-share/doc/libanjuta/libanjuta-ianjuta-editor.html
-share/doc/libanjuta/libanjuta-ianjuta-file-loader.html
-share/doc/libanjuta/libanjuta-ianjuta-file-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-file-savable.html
-share/doc/libanjuta/libanjuta-ianjuta-file.html
-share/doc/libanjuta/libanjuta-ianjuta-help.html
-share/doc/libanjuta/libanjuta-ianjuta-indicable.html
-share/doc/libanjuta/libanjuta-ianjuta-iterable-tree.html
-share/doc/libanjuta/libanjuta-ianjuta-iterable.html
-share/doc/libanjuta/libanjuta-ianjuta-language-support.html
-share/doc/libanjuta/libanjuta-ianjuta-language.html
-share/doc/libanjuta/libanjuta-ianjuta-loader.html
-share/doc/libanjuta/libanjuta-ianjuta-macro.html
-share/doc/libanjuta/libanjuta-ianjuta-markable.html
-share/doc/libanjuta/libanjuta-ianjuta-message-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-message-view.html
-share/doc/libanjuta/libanjuta-ianjuta-plugin-factory.html
-share/doc/libanjuta/libanjuta-ianjuta-preferences.html
-share/doc/libanjuta/libanjuta-ianjuta-print.html
-share/doc/libanjuta/libanjuta-ianjuta-project-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-stream-loader.html
-share/doc/libanjuta/libanjuta-ianjuta-stream-savable.html
-share/doc/libanjuta/libanjuta-ianjuta-stream.html
-share/doc/libanjuta/libanjuta-ianjuta-symbol-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-symbol.html
-share/doc/libanjuta/libanjuta-ianjuta-terminal.html
-share/doc/libanjuta/libanjuta-ianjuta-todo.html
-share/doc/libanjuta/libanjuta-ianjuta-vcs.html
-share/doc/libanjuta/libanjuta-ianjuta-wizard.html
share/doc/libanjuta/libanjuta-internal-api.html
share/doc/libanjuta/libanjuta-libanjuta-iface-marshallers.html
-share/doc/libanjuta/libanjuta-resources.html
share/doc/libanjuta/libanjuta.devhelp
share/doc/libanjuta/libanjuta.devhelp2
share/doc/libanjuta/object-hierarchy.html
@@ -777,6 +801,49 @@ share/gnome/help/anjuta-manual/eu/figures/signals.png
share/gnome/help/anjuta-manual/eu/figures/stack.png
share/gnome/help/anjuta-manual/eu/figures/symbol_browser.png
share/gnome/help/anjuta-manual/eu/figures/tool-editor.png
+share/gnome/help/anjuta-manual/fr/anjuta-manual.xml
+share/gnome/help/anjuta-manual/fr/figures/add_edit_macro.png
+share/gnome/help/anjuta-manual/fr/figures/anjuta-in-action.png
+share/gnome/help/anjuta-manual/fr/figures/attach.png
+share/gnome/help/anjuta-manual/fr/figures/brk_add.png
+share/gnome/help/anjuta-manual/fr/figures/brk_dlg.png
+share/gnome/help/anjuta-manual/fr/figures/configure_dlg.png
+share/gnome/help/anjuta-manual/fr/figures/display_macro.png
+share/gnome/help/anjuta-manual/fr/figures/editor_guides.png
+share/gnome/help/anjuta-manual/fr/figures/editor_margins.png
+share/gnome/help/anjuta-manual/fr/figures/editor_markers.png
+share/gnome/help/anjuta-manual/fr/figures/file_menu.png
+share/gnome/help/anjuta-manual/fr/figures/insert_text.png
+share/gnome/help/anjuta-manual/fr/figures/keyword_macro.png
+share/gnome/help/anjuta-manual/fr/figures/local_variables.png
+share/gnome/help/anjuta-manual/fr/figures/menubar.png
+share/gnome/help/anjuta-manual/fr/figures/message_win.png
+share/gnome/help/anjuta-manual/fr/figures/new_file_wizard.png
+share/gnome/help/anjuta-manual/fr/figures/open_file.png
+share/gnome/help/anjuta-manual/fr/figures/open_file_multiple.png
+share/gnome/help/anjuta-manual/fr/figures/prefs_print.png
+share/gnome/help/anjuta-manual/fr/figures/print_dlg.png
+share/gnome/help/anjuta-manual/fr/figures/print_preview.png
+share/gnome/help/anjuta-manual/fr/figures/project-window.png
+share/gnome/help/anjuta-manual/fr/figures/project_group.png
+share/gnome/help/anjuta-manual/fr/figures/project_info.png
+share/gnome/help/anjuta-manual/fr/figures/project_target.png
+share/gnome/help/anjuta-manual/fr/figures/project_target_details.png
+share/gnome/help/anjuta-manual/fr/figures/registers.png
+share/gnome/help/anjuta-manual/fr/figures/save_as_file.png
+share/gnome/help/anjuta-manual/fr/figures/search_expr.png
+share/gnome/help/anjuta-manual/fr/figures/search_expr_basic.png
+share/gnome/help/anjuta-manual/fr/figures/search_file_pattern.png
+share/gnome/help/anjuta-manual/fr/figures/search_replace.png
+share/gnome/help/anjuta-manual/fr/figures/search_setting.png
+share/gnome/help/anjuta-manual/fr/figures/search_target.png
+share/gnome/help/anjuta-manual/fr/figures/search_target_action.png
+share/gnome/help/anjuta-manual/fr/figures/search_target_in.png
+share/gnome/help/anjuta-manual/fr/figures/sharedlibs.png
+share/gnome/help/anjuta-manual/fr/figures/signals.png
+share/gnome/help/anjuta-manual/fr/figures/stack.png
+share/gnome/help/anjuta-manual/fr/figures/symbol_browser.png
+share/gnome/help/anjuta-manual/fr/figures/tool-editor.png
share/gnome/help/anjuta-manual/oc/anjuta-manual.xml
share/gnome/help/anjuta-manual/oc/figures/add_edit_macro.png
share/gnome/help/anjuta-manual/oc/figures/anjuta-in-action.png
@@ -1010,6 +1077,7 @@ share/locale/dz/LC_MESSAGES/anjuta.mo
share/locale/el/LC_MESSAGES/anjuta.mo
share/locale/en_CA/LC_MESSAGES/anjuta.mo
share/locale/en_GB/LC_MESSAGES/anjuta.mo
+share/locale/en@shaw/LC_MESSAGES/anjuta.mo
share/locale/es/LC_MESSAGES/anjuta.mo
share/locale/eu/LC_MESSAGES/anjuta.mo
share/locale/fi/LC_MESSAGES/anjuta.mo
@@ -1067,6 +1135,7 @@ share/omf/anjuta-manual/anjuta-manual-de.omf
share/omf/anjuta-manual/anjuta-manual-el.omf
share/omf/anjuta-manual/anjuta-manual-es.omf
share/omf/anjuta-manual/anjuta-manual-eu.omf
+share/omf/anjuta-manual/anjuta-manual-fr.omf
share/omf/anjuta-manual/anjuta-manual-oc.omf
share/omf/anjuta-manual/anjuta-manual-sv.omf
share/omf/anjuta-manual/anjuta-manual-th.omf
@@ -1122,11 +1191,20 @@ share/pixmaps/anjuta/element-event-16.png
share/pixmaps/anjuta/element-field-16.png
share/pixmaps/anjuta/element-interface-16.png
share/pixmaps/anjuta/element-interface-24.png
+share/pixmaps/anjuta/element-interface-private-16.png
+share/pixmaps/anjuta/element-interface-protected-16.png
+share/pixmaps/anjuta/element-interface-public-16.png
share/pixmaps/anjuta/element-literal-16.png
share/pixmaps/anjuta/element-method-16.png
share/pixmaps/anjuta/element-method-24.png
+share/pixmaps/anjuta/element-method-private-16.png
+share/pixmaps/anjuta/element-method-protected-16.png
+share/pixmaps/anjuta/element-method-public-16.png
share/pixmaps/anjuta/element-namespace-16.png
share/pixmaps/anjuta/element-property-16.png
+share/pixmaps/anjuta/element-property-private-16.png
+share/pixmaps/anjuta/element-property-protected-16.png
+share/pixmaps/anjuta/element-property-public-16.png
share/pixmaps/anjuta/element-structure-16.png
share/pixmaps/anjuta/anjuta-editor-sourceview-plugin-48.png
share/pixmaps/anjuta/anjuta-file-manager-plugin-48.png
@@ -1209,6 +1287,7 @@ share/pixmaps/anjuta/anjuta_logo.png
share/pixmaps/anjuta/anjuta_splash.png
share/pixmaps/anjuta/breakpoint.png
share/pixmaps/anjuta/class_logo.xpm
+share/pixmaps/anjuta/dir-project-plugin-48.png
share/pixmaps/anjuta/directory-accept.png
share/pixmaps/anjuta/directory.png
share/pixmaps/anjuta/gbf-am-plugin-48.png
@@ -1217,6 +1296,8 @@ share/pixmaps/anjuta/gbf-install.png
share/pixmaps/anjuta/gbf-mkfile-plugin-48.png
share/pixmaps/anjuta/gtodo-about.png
share/pixmaps/anjuta/gtodo-edit.png
+share/pixmaps/anjuta/js_debugger.png
+share/pixmaps/anjuta/js_support_plugin.png
share/pixmaps/anjuta/locals.png
share/pixmaps/anjuta/madeinanjuta.xcf
share/pixmaps/anjuta/password.png
@@ -1244,6 +1325,8 @@ share/pixmaps/anjuta/vcs-updated.png
@dirrm share/gnome/help/anjuta-manual/sv
@dirrm share/gnome/help/anjuta-manual/oc/figures
@dirrm share/gnome/help/anjuta-manual/oc
+@dirrm share/gnome/help/anjuta-manual/fr/figures
+@dirrm share/gnome/help/anjuta-manual/fr
@dirrm share/gnome/help/anjuta-manual/eu/figures
@dirrm share/gnome/help/anjuta-manual/eu
@dirrm share/gnome/help/anjuta-manual/es/figures
@@ -1290,6 +1373,8 @@ share/pixmaps/anjuta/vcs-updated.png
@dirrm share/anjuta/project/library/src
@dirrm share/anjuta/project/library/po
@dirrm share/anjuta/project/library
+@dirrm share/anjuta/project/js_minimal/src
+@dirrm share/anjuta/project/js_minimal
@dirrm share/anjuta/project/java/src
@dirrm share/anjuta/project/java/po
@dirrm share/anjuta/project/java
@@ -1305,6 +1390,7 @@ share/pixmaps/anjuta/vcs-updated.png
@dirrm share/anjuta/project/gnome
@dirrm share/anjuta/project/gcj/src
@dirrm share/anjuta/project/gcj
+@dirrm share/anjuta/project/directory
@dirrm share/anjuta/project/cpp/src
@dirrm share/anjuta/project/cpp/po
@dirrm share/anjuta/project/cpp
@@ -1328,6 +1414,8 @@ share/pixmaps/anjuta/vcs-updated.png
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@dirrmtry share/applications
+@dirrmtry share/icons/gnome/scalable/mimetypes
+@dirrmtry share/icons/gnome/scalable
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@@ -1344,6 +1432,8 @@ share/pixmaps/anjuta/vcs-updated.png
@dirrmtry share/locale/mr
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index fb3ac54007a1..126966185f99 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/bug-buddy/Makefile,v 1.78 2009/09/21 16:26:07 kwm Exp $
+# $MCom: ports/devel/bug-buddy/Makefile,v 1.81 2010/03/30 07:21:31 avl Exp $
#
PORTNAME= bug-buddy
-PORTVERSION= 2.28.0
-PORTREVISION= 2
+PORTVERSION= 2.30.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -24,7 +23,7 @@ USE_GETTEXT= yes
INSTALLS_ICONS= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack \
+USE_GNOME= gnomeprefix gnomehack intlhack libbonobo \
gnomedocutils evolutiondataserver
GNOME_DESKTOP_VERSION=2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index c321c0c3b85f..9f4e9f0e4a4b 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/bug-buddy-2.28.0.tar.bz2) = ee9c586fee2e6b8ce3b787e696f37100
-SHA256 (gnome2/bug-buddy-2.28.0.tar.bz2) = 6ec0c21a09d9eb2a5f05a60261c6c70a0cd35e8887598418402fd17f83c1b294
-SIZE (gnome2/bug-buddy-2.28.0.tar.bz2) = 1186863
+MD5 (gnome2/bug-buddy-2.30.0.tar.bz2) = da34ace8a806cd1c901ae960184e2997
+SHA256 (gnome2/bug-buddy-2.30.0.tar.bz2) = 6e81a55bd252f552aa4aea180b8dbceb0898d2bf173e330c5c09f8fbdba66b05
+SIZE (gnome2/bug-buddy-2.30.0.tar.bz2) = 1192441
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index 848f49b65e13..32c3dfcc8d0b 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -15,6 +15,7 @@ share/locale/af/LC_MESSAGES/bug-buddy.mo
share/locale/am/LC_MESSAGES/bug-buddy.mo
share/locale/ar/LC_MESSAGES/bug-buddy.mo
share/locale/as/LC_MESSAGES/bug-buddy.mo
+share/locale/ast/LC_MESSAGES/bug-buddy.mo
share/locale/az/LC_MESSAGES/bug-buddy.mo
share/locale/be/LC_MESSAGES/bug-buddy.mo
share/locale/be@latin/LC_MESSAGES/bug-buddy.mo
@@ -30,6 +31,7 @@ share/locale/da/LC_MESSAGES/bug-buddy.mo
share/locale/de/LC_MESSAGES/bug-buddy.mo
share/locale/dz/LC_MESSAGES/bug-buddy.mo
share/locale/el/LC_MESSAGES/bug-buddy.mo
+share/locale/en@shaw/LC_MESSAGES/bug-buddy.mo
share/locale/en_CA/LC_MESSAGES/bug-buddy.mo
share/locale/en_GB/LC_MESSAGES/bug-buddy.mo
share/locale/es/LC_MESSAGES/bug-buddy.mo
diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile
index 8e1e354a58ab..23bf5e4cd603 100644
--- a/devel/dbus-glib/Makefile
+++ b/devel/dbus-glib/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= dbus
-PORTVERSION= 0.84
+PORTVERSION= 0.86
CATEGORIES= devel gnome
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-glib/
PKGNAMESUFFIX= -glib
diff --git a/devel/dbus-glib/distinfo b/devel/dbus-glib/distinfo
index a2aacc0dfdd9..b80bc36f7929 100644
--- a/devel/dbus-glib/distinfo
+++ b/devel/dbus-glib/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-glib-0.84.tar.gz) = 69fbe31fb3ee778715dff44cdd5178bf
-SHA256 (dbus-glib-0.84.tar.gz) = 60ca7df1626cc7220863f22fab1ab63e0d904daf737f3b43fc26e8e77774b7a9
-SIZE (dbus-glib-0.84.tar.gz) = 679310
+MD5 (dbus-glib-0.86.tar.gz) = cd0ab148fb0c786fc88be49d19971f50
+SHA256 (dbus-glib-0.86.tar.gz) = 5351a6e7f38ffc641c34b4a4cdd9bed1c1dc7043a501096bac00a2876ea90bdc
+SIZE (dbus-glib-0.86.tar.gz) = 694242
diff --git a/devel/dbus-glib/pkg-plist b/devel/dbus-glib/pkg-plist
index 12df955e95ba..3008d679cabc 100644
--- a/devel/dbus-glib/pkg-plist
+++ b/devel/dbus-glib/pkg-plist
@@ -15,6 +15,7 @@ libexec/dbus-bash-completion-helper
%%DOCSDIR%%/ch02.html
%%DOCSDIR%%/ch03.html
%%DOCSDIR%%/dbus-binding-tool.html
+%%DOCSDIR%%/dbus-glib-DBus-GLib-low-level.html
%%DOCSDIR%%/dbus-glib-DBus-GObject-related-functions.html
%%DOCSDIR%%/dbus-glib-DBusGConnection.html
%%DOCSDIR%%/dbus-glib-DBusGError.html
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index db3447fc0ebb..b10aa5aec70b 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/dbus/Makefile,v 1.34 2009/11/28 06:03:52 mezz Exp $
+# $MCom: ports/devel/dbus/Makefile,v 1.41 2010/04/04 22:03:28 marcus Exp $
#
PORTNAME= dbus
-PORTVERSION?= 1.2.16
+PORTVERSION?= 1.2.24
PORTREVISION?= 1
CATEGORIES= devel gnome
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index 1623b43edf79..09097b134e4b 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-1.2.16.tar.gz) = c7a47b851ebe02f6726b65b78d1b730b
-SHA256 (dbus-1.2.16.tar.gz) = 968a31c16a6c4bbbdb603cbaa3d60d6d19bc8ae30c0ed55d7f8c2e254413e4c8
-SIZE (dbus-1.2.16.tar.gz) = 1576209
+MD5 (dbus-1.2.24.tar.gz) = 565346cecd9cfecf1463540c6086cc2c
+SHA256 (dbus-1.2.24.tar.gz) = f12c748f4a703655e3d4c3db94cdf5a752a0cd0b36958c715804373bd3595c48
+SIZE (dbus-1.2.24.tar.gz) = 1673774
diff --git a/devel/dbus/files/patch-bus_dir-watch-kqueue.c b/devel/dbus/files/patch-bus_dir-watch-kqueue.c
new file mode 100644
index 000000000000..b65d9ab84bdf
--- /dev/null
+++ b/devel/dbus/files/patch-bus_dir-watch-kqueue.c
@@ -0,0 +1,11 @@
+--- bus/dir-watch-kqueue.c.orig 2010-04-04 17:59:18.000000000 -0400
++++ bus/dir-watch-kqueue.c 2010-04-04 17:59:55.000000000 -0400
+@@ -169,7 +169,7 @@ bus_set_watched_dirs (BusContext *contex
+ */
+ for (i = 0; new_dirs[i]; i++)
+ {
+- for (j = 0; i < num_fds; j++)
++ for (j = 0; j < num_fds; j++)
+ {
+ if (dirs[j] && strcmp (new_dirs[i], dirs[j]) == 0)
+ {
diff --git a/devel/dbus/files/patch-dbus_dbus-connection.c b/devel/dbus/files/patch-dbus_dbus-connection.c
new file mode 100644
index 000000000000..b992b9e5e83f
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_dbus-connection.c
@@ -0,0 +1,67 @@
+--- dbus/dbus-connection.c.orig 2010-03-13 17:21:40.000000000 -0500
++++ dbus/dbus-connection.c 2010-03-13 17:25:28.000000000 -0500
+@@ -2280,7 +2280,7 @@ _dbus_connection_block_pending_call (DBu
+ DBusConnection *connection;
+ dbus_uint32_t client_serial;
+ DBusTimeout *timeout;
+- int timeout_milliseconds, elapsed_milliseconds;
++ int timeout_milliseconds, elapsed_milliseconds, remain_milliseconds;
+
+ _dbus_assert (pending != NULL);
+
+@@ -2360,6 +2360,10 @@ _dbus_connection_block_pending_call (DBu
+ _dbus_get_current_time (&tv_sec, &tv_usec);
+ elapsed_milliseconds = (tv_sec - start_tv_sec) * 1000 +
+ (tv_usec - start_tv_usec) / 1000;
++ if (timeout_milliseconds != -1)
++ remain_milliseconds = timeout_milliseconds - elapsed_milliseconds;
++ else
++ remain_milliseconds = -1;
+
+ if (!_dbus_connection_get_is_connected_unlocked (connection))
+ {
+@@ -2386,7 +2390,7 @@ _dbus_connection_block_pending_call (DBu
+ */
+ _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
+
+- _dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds);
++ _dbus_memory_pause_based_on_timeout (remain_milliseconds);
+ }
+ else
+ {
+@@ -2394,7 +2398,7 @@ _dbus_connection_block_pending_call (DBu
+ _dbus_connection_do_iteration_unlocked (connection,
+ DBUS_ITERATION_DO_READING |
+ DBUS_ITERATION_BLOCK,
+- timeout_milliseconds - elapsed_milliseconds);
++ remain_milliseconds);
+ }
+
+ goto recheck_status;
+@@ -2403,7 +2407,7 @@ _dbus_connection_block_pending_call (DBu
+ _dbus_verbose ("dbus_connection_send_with_reply_and_block(): clock set backward\n");
+ else if (elapsed_milliseconds < timeout_milliseconds)
+ {
+- _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", timeout_milliseconds - elapsed_milliseconds);
++ _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", remain_milliseconds);
+
+ if (status == DBUS_DISPATCH_NEED_MEMORY)
+ {
+@@ -2413,7 +2417,7 @@ _dbus_connection_block_pending_call (DBu
+ */
+ _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
+
+- _dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds);
++ _dbus_memory_pause_based_on_timeout (remain_milliseconds);
+ }
+ else
+ {
+@@ -2421,7 +2425,7 @@ _dbus_connection_block_pending_call (DBu
+ _dbus_connection_do_iteration_unlocked (connection,
+ DBUS_ITERATION_DO_READING |
+ DBUS_ITERATION_BLOCK,
+- timeout_milliseconds - elapsed_milliseconds);
++ remain_milliseconds);
+ }
+
+ goto recheck_status;
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 82edb28f70e4..372f966b1682 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -3,11 +3,10 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/devhelp/Makefile,v 1.28 2009/10/19 20:06:46 kwm Exp $
+# $MCom: ports/devel/devhelp/Makefile,v 1.32 2010/03/30 15:51:07 avl Exp $
PORTNAME= devhelp
-PORTVERSION= 2.28.1
-PORTREVISION= 2
+PORTVERSION= 2.30.0
PORTEPOCH= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo
index e3a67f645fd4..2603e5a1a97c 100644
--- a/devel/devhelp/distinfo
+++ b/devel/devhelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/devhelp-2.28.1.tar.bz2) = b9ec14ddf74c4b9924da77b62c345cf8
-SHA256 (gnome2/devhelp-2.28.1.tar.bz2) = 09a0f048cc5b4517e92d74d6ffcd4a17f4bb2c4c236739154fb24b60958862d9
-SIZE (gnome2/devhelp-2.28.1.tar.bz2) = 473458
+MD5 (gnome2/devhelp-2.30.0.tar.bz2) = a24087cd1b4fe6722ec05f6e88104ace
+SHA256 (gnome2/devhelp-2.30.0.tar.bz2) = 4e40dac8d8e5008fd7fe4113688d3ae9031eace7f0e10857a3bbbf103d875953
+SIZE (gnome2/devhelp-2.30.0.tar.bz2) = 484771
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index 7bffc1827b6a..12e1413725ea 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -35,6 +35,7 @@ share/icons/hicolor/48x48/apps/devhelp.png
share/icons/hicolor/scalable/apps/devhelp.svg
share/locale/am/LC_MESSAGES/devhelp.mo
share/locale/ar/LC_MESSAGES/devhelp.mo
+share/locale/ast/LC_MESSAGES/devhelp.mo
share/locale/az/LC_MESSAGES/devhelp.mo
share/locale/be/LC_MESSAGES/devhelp.mo
share/locale/be@latin/LC_MESSAGES/devhelp.mo
@@ -50,6 +51,7 @@ share/locale/dz/LC_MESSAGES/devhelp.mo
share/locale/el/LC_MESSAGES/devhelp.mo
share/locale/en_CA/LC_MESSAGES/devhelp.mo
share/locale/en_GB/LC_MESSAGES/devhelp.mo
+share/locale/en@shaw/LC_MESSAGES/devhelp.mo
share/locale/es/LC_MESSAGES/devhelp.mo
share/locale/et/LC_MESSAGES/devhelp.mo
share/locale/fi/LC_MESSAGES/devhelp.mo
@@ -104,9 +106,9 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
@dirrm share/devhelp/dtd
@dirrm share/devhelp/assistant
@dirrm share/devhelp
-%%GEDIT%%@dirrm lib/gedit-2/plugins/devhelp
@dirrm include/devhelp-1.0/devhelp
@dirrm include/devhelp-1.0
+@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@@ -115,16 +117,14 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
@dirrmtry share/locale/ps/LC_MESSAGES
@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@@ -133,4 +133,5 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
-@dirrmtry share/applications
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index a4b8bc53387d..010c80cd955b 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gconf2/Makefile,v 1.109 2009/09/22 20:20:31 kwm Exp $
+# $MCom: ports/devel/gconf2/Makefile,v 1.111 2010/04/01 15:59:40 kwm Exp $
#
PORTNAME= gconf2
-PORTVERSION= 2.28.0
-PORTREVISION?= 2
+PORTVERSION= 2.28.1
+PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index c7a6a52de645..d216af850702 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/GConf-2.28.0.tar.bz2) = ad2aeb9c7d906b274954c51a615caeac
-SHA256 (gnome2/GConf-2.28.0.tar.bz2) = d057dcfe2bfb2a80e592349c2a78d7dce12d19542aeced466c64fb701c806ac8
-SIZE (gnome2/GConf-2.28.0.tar.bz2) = 1476190
+MD5 (gnome2/GConf-2.28.1.tar.bz2) = 27663faf0af4f6a6d534de9270f6d24a
+SHA256 (gnome2/GConf-2.28.1.tar.bz2) = 53c477f9086057b0c84816a1c979e01537b862fbcacb6af4b62f8cffec4b3000
+SIZE (gnome2/GConf-2.28.1.tar.bz2) = 1476141
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 7daafae699e4..eb8bec29974a 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -36,6 +36,7 @@ share/dbus-1/services/org.gnome.GConf.service
share/locale/am/LC_MESSAGES/GConf2.mo
share/locale/ar/LC_MESSAGES/GConf2.mo
share/locale/as/LC_MESSAGES/GConf2.mo
+share/locale/ast/LC_MESSAGES/GConf2.mo
share/locale/az/LC_MESSAGES/GConf2.mo
share/locale/be/LC_MESSAGES/GConf2.mo
share/locale/bg/LC_MESSAGES/GConf2.mo
@@ -50,6 +51,7 @@ share/locale/da/LC_MESSAGES/GConf2.mo
share/locale/de/LC_MESSAGES/GConf2.mo
share/locale/dz/LC_MESSAGES/GConf2.mo
share/locale/el/LC_MESSAGES/GConf2.mo
+share/locale/en@shaw/LC_MESSAGES/GConf2.mo
share/locale/en_CA/LC_MESSAGES/GConf2.mo
share/locale/en_GB/LC_MESSAGES/GConf2.mo
share/locale/es/LC_MESSAGES/GConf2.mo
@@ -146,11 +148,15 @@ share/sgml/gconf/gconf-1.0.dtd
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index 958a701f4eda..8808b41e293c 100644
--- a/devel/gio-fam-backend/Makefile
+++ b/devel/gio-fam-backend/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.41 2009/10/07 22:03:54 kwm Exp $
+# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.52 2010/05/04 09:44:51 kwm Exp $
#
PORTNAME= gio-fam-backend
-PORTVERSION= 2.22.4
+PORTVERSION= 2.24.1
+PORTREVISION= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo
index c53a132c2daf..3a080dc7dc69 100644
--- a/devel/gio-fam-backend/distinfo
+++ b/devel/gio-fam-backend/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.22.4.tar.bz2) = d91bcbe27556430ddecce65086355708
-SHA256 (gnome2/glib-2.22.4.tar.bz2) = 0d1f6bf8aaeab772f2370229eefda45bef434e3f29a7d1d8e5dfafeaa1d8ad14
-SIZE (gnome2/glib-2.22.4.tar.bz2) = 5012207
+MD5 (gnome2/glib-2.24.1.tar.bz2) = 6a7db81c9a2cffe6a34dadb57d7ba2d2
+SHA256 (gnome2/glib-2.24.1.tar.bz2) = 014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04
+SIZE (gnome2/glib-2.24.1.tar.bz2) = 5332511
diff --git a/devel/gio-fam-backend/files/patch-ae b/devel/gio-fam-backend/files/patch-ae
new file mode 100644
index 000000000000..a6d6851b09cf
--- /dev/null
+++ b/devel/gio-fam-backend/files/patch-ae
@@ -0,0 +1,30 @@
+--- configure.orig 2010-03-03 21:31:46.000000000 -0500
++++ configure 2010-03-03 21:47:47.000000000 -0500
+@@ -714,6 +714,9 @@ ac_includes_default="\
+ #ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
++#ifdef HAVE_SYS_PARAM_H
++# include <sys/param.h>
++#endif
+ #ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+@@ -23020,7 +23023,7 @@ _ACEOF
+ fi
+ done
+
+-for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
++for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+@@ -25631,6 +25634,8 @@ fi
+ ;;
+ esac
+ fi
++ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
++ G_THREAD_LIBS="${PTHREAD_LIBS}"
+
+ if test x"$G_THREAD_CFLAGS" = x; then
+
diff --git a/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in b/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in
index 0f6a9e25ead1..44250d545fcb 100644
--- a/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in
+++ b/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in
@@ -1,7 +1,7 @@
---- gio/fam/Makefile.in.orig 2008-01-07 19:40:38.000000000 -0500
-+++ gio/fam/Makefile.in 2008-01-07 19:41:53.000000000 -0500
-@@ -59,9 +59,8 @@ am__installdirs = "$(DESTDIR)$(giomodule
- giomoduleLTLIBRARIES_INSTALL = $(INSTALL)
+--- gio/fam/Makefile.in.orig 2010-01-28 10:40:29.000000000 -0500
++++ gio/fam/Makefile.in 2010-01-28 10:43:26.000000000 -0500
+@@ -76,9 +76,8 @@ am__base_list = \
+ am__installdirs = "$(DESTDIR)$(giomoduledir)"
LTLIBRARIES = $(giomodule_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
@@ -12,7 +12,7 @@
$(am__DEPENDENCIES_1)
am__objects_1 =
am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
-@@ -321,9 +320,9 @@ libgiofam_la_CFLAGS = \
+@@ -369,9 +368,9 @@ libgiofam_la_CFLAGS = \
libgiofam_la_LDFLAGS = $(module_flags)
libgiofam_la_LIBADD = \
@@ -25,3 +25,12 @@
$(GLIB_LIBS) \
$(FAM_LIBS) \
$(NULL)
+@@ -776,7 +775,7 @@ check-local: test
+
+ install-data-hook:
+ if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \
+- $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \
++ gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \
+ fi
+
+ uninstall-local:
diff --git a/devel/gio-fam-backend/pkg-plist b/devel/gio-fam-backend/pkg-plist
index 7e06d5a98ee3..f3ca7da86f63 100644
--- a/devel/gio-fam-backend/pkg-plist
+++ b/devel/gio-fam-backend/pkg-plist
@@ -1,3 +1,5 @@
lib/gio/modules/libgiofam.a
lib/gio/modules/libgiofam.la
lib/gio/modules/libgiofam.so
+@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+@unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
diff --git a/devel/gir-repository/Makefile b/devel/gir-repository/Makefile
index 42c957336882..eaa4c25945eb 100644
--- a/devel/gir-repository/Makefile
+++ b/devel/gir-repository/Makefile
@@ -3,7 +3,7 @@
# Whom: Pawel Worach <pawel.worach@gmail.com>
#
# $FreeBSD$
-# $MCom: ports/devel/gir-repository/Makefile,v 1.9 2009/11/09 09:29:14 kwm Exp $
+# $MCom: ports/devel/gir-repository/Makefile,v 1.16 2010/03/14 01:32:00 kwm Exp $
#
MASTER_SITES= # Empty
@@ -16,11 +16,7 @@ COMMENT= Introspection information for various libraries
NO_BUILD= yes
-RUN_DEPENDS= ${GIRDIR}/${atk_GIR}.gir:${PORTSDIR}/${atk_CATEGORY}/gir-repository-atk \
- ${GIRDIR}/${pango_GIR}.gir:${PORTSDIR}/${pango_CATEGORY}/gir-repository-pango \
- ${GIRDIR}/${poppler_GIR}.gir:${PORTSDIR}/${poppler_CATEGORY}/gir-repository-poppler \
- ${GIRDIR}/${gtk20_GIR}.gir:${PORTSDIR}/${gtk20_CATEGORY}/gir-repository-gtk20 \
- ${GIRDIR}/${webkit_GIR}.gir:${PORTSDIR}/${webkit_CATEGORY}/gir-repository-webkit \
+RUN_DEPENDS= ${GIRDIR}/${poppler_GIR}.gir:${PORTSDIR}/${poppler_CATEGORY}/gir-repository-poppler \
${GIRDIR}/${libsoup_GIR}.gir:${PORTSDIR}/${libsoup_CATEGORY}/gir-repository-libsoup \
${GIRDIR}/${dbus_GIR}.gir:${PORTSDIR}/${dbus_CATEGORY}/gir-repository-dbus \
${GIRDIR}/${gconf2_GIR}.gir:${PORTSDIR}/${gconf2_CATEGORY}/gir-repository-gconf2 \
@@ -31,8 +27,6 @@ RUN_DEPENDS= ${GIRDIR}/${atk_GIR}.gir:${PORTSDIR}/${atk_CATEGORY}/gir-repository
${GIRDIR}/${gtksourceview2_GIR}.gir:${PORTSDIR}/${gtksourceview2_CATEGORY}/gir-repository-gtksourceview2 \
${GIRDIR}/${vte_GIR}.gir:${PORTSDIR}/${vte_CATEGORY}/gir-repository-vte \
${GIRDIR}/${avahi_GIR}.gir:${PORTSDIR}/${avahi_CATEGORY}/gir-repository-avahi \
- ${GIRDIR}/${gnomemenus_GIR}.gir:${PORTSDIR}/${gnomemenus_CATEGORY}/gir-repository-gnome-menus \
- ${GIRDIR}/${libwnck_GIR}.gir:${PORTSDIR}/${libwnck_CATEGORY}/gir-repository-libwnck \
${GIRDIR}/${goocanvas_GIR}.gir:${PORTSDIR}/${goocanvas_CATEGORY}/gir-repository-goocanvas
do-install: # empty
diff --git a/devel/gir-repository/bsd.gir.mk b/devel/gir-repository/bsd.gir.mk
index 4c419ff538fe..d8457a6bbd6b 100644
--- a/devel/gir-repository/bsd.gir.mk
+++ b/devel/gir-repository/bsd.gir.mk
@@ -1,27 +1,14 @@
PORTNAME= gir-repository
PORTVERSION= 0.6.5
-PORTREVISION?= 3
+PORTREVISION?= 4
MAINTAINER= gnome@FreeBSD.org
GIRDIR= ${LOCALBASE}/share/gir-1.0
-atk_CATEGORY= accessibility
-atk_GIR= Atk-1.0
-
-pango_CATEGORY= x11-toolkits
-pango_GIR= Pango-1.0
-
poppler_CATEGORY= graphics
poppler_GIR= Poppler-0.8
-gtk20_CATEGORY= x11-toolkits
-gtk20_GIR= Gtk-2.0
-gtk20_GIR_TMPL= gtk
-
-webkit_CATEGORY= www
-webkit_GIR= WebKit-1.0
-
libsoup_CATEGORY= devel
libsoup_GIR= Soup-2.4
libsoup_GIR_TMPL= soup
@@ -53,12 +40,6 @@ vte_GIR= Vte-1.0
avahi_CATEGORY= net
avahi_GIR= Avahi-0.6
-gnomemenus_CATEGORY= x11
-gnomemenus_GIR= GMenu-2.0
-
-libwnck_CATEGORY= x11-toolkits
-libwnck_GIR= Wnck-1.0
-
goocanvas_CATEGORY= graphics
goocanvas_GIR= GooCanvas-0.10
@@ -92,38 +73,13 @@ _USE_GIR_ALL= dbus atk pango pangoxft poppler gtk gconf soup babl nautilusextens
gstreamer gstbufferlist_h gstreamer_plugins_base gtksourceview vte \
goocanvas gssdp gupnp avahi unique gmenu wnck
-.if ${GIR_NAME} == "atk"
-USE_GNOME+= atk
-GIR_FILES= Atk-1.0
-.endif
-
-.if ${GIR_NAME} == "pango"
-USE_GNOME+= pango
-GIR_FILES= Pango-1.0 PangoFT2-1.0 PangoCairo-1.0 PangoX-1.0 PangoXft-1.0
-DEP_NAMES+= pangoxft
-.endif
-
.if ${GIR_NAME} == "poppler"
LIB_DEPENDS+= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk
-USE_GIR= gtk20 pango
+USE_GNOME+= gtk20
GIR_FILES= Poppler-0.8
CLEAR_DEPS+= Gdk-2.0
.endif
-.if ${GIR_NAME} == "gtk20"
-USE_GNOME+= gtk20
-USE_GIR= atk pango
-GIR_FILES= Gdk-2.0 Gtk-2.0 GdkPixbuf-2.0
-LIB_FILES= Gdk Gtk
-DEP_NAMES= gtk
-.endif
-
-.if ${GIR_NAME} == "webkit"
-LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
-USE_GIR= gtk20 libsoup
-GIR_FILES= WebKit-1.0 JSCore-1.0
-.endif
-
.if ${GIR_NAME} == "libsoup"
LIB_DEPENDS+= soup-2.4.1:${PORTSDIR}/devel/libsoup
GIR_FILES= Soup-2.4
@@ -143,9 +99,9 @@ GIR_FILES= Babl-0.1
.if ${GIR_NAME} == "nautilus"
USE_GNOME+= nautilus2
-USE_GIR= gtk20
GIR_FILES= Nautilus-1.0
DEP_NAMES= nautilusextension
+CLEAR_DEPS+= Gtk-2.0
.endif
.if ${GIR_NAME} == "gnomekeyring"
@@ -155,9 +111,10 @@ GIR_FILES= GnomeKeyring-2.0
.if ${GIR_NAME} == "libnotify"
LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify
-USE_GIR= gtk20
+USE_GNOME+= gtk20
GIR_FILES= Notify-0.4
DEP_NAMES= notify
+CLEAR_DEPS+= Gtk-2.0
.endif
.if ${GIR_NAME} == "dbus"
@@ -168,15 +125,15 @@ LIB_FILES= DBus
.if ${GIR_NAME} == "gtksourceview2"
USE_GNOME+= gtksourceview2
-USE_GIR= gtk20
GIR_FILES= GtkSource-2.2
DEP_NAMES= gtksourceview
+CLEAR_DEPS+= Gtk-2.0
.endif
.if ${GIR_NAME} == "vte"
USE_GNOME+= vte
-USE_GIR= gtk20
GIR_FILES= Vte-1.0
+CLEAR_DEPS+= Gtk-2.0
.endif
.if ${GIR_NAME} == "avahi"
@@ -184,24 +141,11 @@ LIB_DEPENDS+= avahi-gobject.0:${PORTSDIR}/net/avahi-app
GIR_FILES= Avahi-0.6 AvahiCore-0.6
.endif
-.if ${GIR_NAME} == "gnomemenus"
-USE_GNOME+= gnomemenus
-USE_GIR= gtk20
-GIR_FILES= GMenu-2.0
-DEP_NAMES= gmenu
-.endif
-
-.if ${GIR_NAME} == "libwnck"
-USE_GNOME+= libwnck
-USE_GIR= gtk20
-GIR_FILES= Wnck-1.0
-DEP_NAMES= wnck
-.endif
-
.if ${GIR_NAME} == "goocanvas"
LIB_DEPENDS+= goocanvas.3:${PORTSDIR}/graphics/goocanvas
-USE_GIR= gtk20
+USE_GNOME+= gtk20
GIR_FILES= GooCanvas-0.10
+CLEAR_DEPS+= Gtk-2.0
.endif
. for component in ${USE_GIR:C/^([^:]+).*/\1/}
diff --git a/devel/gir-repository/files/patch-gir_Makefile.in b/devel/gir-repository/files/patch-gir_Makefile.in
index ec37f1636cd1..5c559acda3b4 100644
--- a/devel/gir-repository/files/patch-gir_Makefile.in
+++ b/devel/gir-repository/files/patch-gir_Makefile.in
@@ -1,5 +1,5 @@
---- gir/Makefile.in.orig 2010-03-24 14:45:41.000000000 +0100
-+++ gir/Makefile.in 2010-03-24 14:45:41.000000000 +0100
+--- gir/Makefile.in.orig 2009-09-09 21:31:46.000000000 +0200
++++ gir/Makefile.in 2010-04-07 15:17:19.000000000 +0200
@@ -86,7 +86,7 @@ host_triplet = @host@
@BUILD_GSSDP_TRUE@am__append_33 = GSSDP-1.0.gir
@BUILD_GUPNP_TRUE@am__append_34 = GUPnP-1.0.gir
@@ -27,6 +27,15 @@
@BUILD_UNIQUE_TRUE@UNIQUE_INCLUDEDIR = `pkg-config --variable=includedir unique-1.0`/unique-1.0/unique
@BUILD_NAUTILUS_TRUE@NAUTILUS_INCLUDEDIR = `pkg-config --variable=includedir libnautilus-extension`/nautilus/libnautilus-extension
@BUILD_WNCK_TRUE@WNCK_INCLUDEDIR = `pkg-config --variable=includedir libwnck-1.0`/libwnck-1.0/libwnck
+@@ -1083,7 +1083,7 @@ uninstall-am: uninstall-dist_girDATA uni
+ @BUILD_PANGOXFT_TRUE@@BUILD_PANGO_TRUE@ --pkg freetype2 \
+ @BUILD_PANGOXFT_TRUE@@BUILD_PANGO_TRUE@ --pkg pangox \
+ @BUILD_PANGOXFT_TRUE@@BUILD_PANGO_TRUE@ $(PANGO_INCLUDEDIR)/pango/pangox.h
+-@BUILD_POPPLER_TRUE@Poppler-0.8.gir: Gdk-2.0.gir Pango-1.0.gir $(INTROSPECTION_SCANNER)
++@BUILD_POPPLER_TRUE@Poppler-0.8.gir: Gdk-2.0.gir $(INTROSPECTION_SCANNER)
+ @BUILD_POPPLER_TRUE@ $(INTROSPECTION_SCANNER) -v --namespace Poppler --nsversion=0.8 \
+ @BUILD_POPPLER_TRUE@ --add-include-path=$(srcdir) --add-include-path=. \
+ @BUILD_POPPLER_TRUE@ --include=GObject-2.0 \
@@ -1384,16 +1384,16 @@ uninstall-am: uninstall-dist_girDATA uni
@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --output $@ \
@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ $(GSTFFT_INCLUDEDIR)/gst/fft/*h
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index da8461a0fe8d..116d8e44e3b6 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,12 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glib20/Makefile,v 1.155 2009/10/07 22:03:54 kwm Exp $
+# $MCom: ports/devel/glib20/Makefile,v 1.166 2010/05/04 09:44:51 kwm Exp $
#
# !! DON'T FORGET ABOUT devel/gio-fam-backend !!
PORTNAME= glib
-PORTVERSION= 2.22.4
+PORTVERSION= 2.24.1
PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
@@ -73,6 +73,9 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/glib/gutils.c
+post-install:
+ -${PREFIX}/bin/gio-querymodules ${PREFIX}/lib/gio/modules
+
.include <bsd.port.post.mk>
.endif
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index c53a132c2daf..3a080dc7dc69 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.22.4.tar.bz2) = d91bcbe27556430ddecce65086355708
-SHA256 (gnome2/glib-2.22.4.tar.bz2) = 0d1f6bf8aaeab772f2370229eefda45bef434e3f29a7d1d8e5dfafeaa1d8ad14
-SIZE (gnome2/glib-2.22.4.tar.bz2) = 5012207
+MD5 (gnome2/glib-2.24.1.tar.bz2) = 6a7db81c9a2cffe6a34dadb57d7ba2d2
+SHA256 (gnome2/glib-2.24.1.tar.bz2) = 014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04
+SIZE (gnome2/glib-2.24.1.tar.bz2) = 5332511
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 4699afdbedd4..a6d6851b09cf 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,28 +1,25 @@
---- configure.orig 2009-09-05 10:54:38.000000000 +0200
-+++ configure 2009-09-05 10:56:40.000000000 +0200
-@@ -29571,6 +29571,12 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
+--- configure.orig 2010-03-03 21:31:46.000000000 -0500
++++ configure 2010-03-03 21:47:47.000000000 -0500
+@@ -714,6 +714,9 @@ ac_includes_default="\
+ #ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
++# include <sys/param.h>
+#endif
-+#ifdef HAVE_SYS_MOUNT_H
-+#include <sys/mount.h>
-+#endif
- int
- main ()
- {
-@@ -31611,7 +31617,7 @@ done
-
-
+ #ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+@@ -23020,7 +23023,7 @@ _ACEOF
+ fi
+ done
-for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
+for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
- do
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -39943,6 +39949,8 @@ fi
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+@@ -25631,6 +25634,8 @@ fi
;;
esac
fi
diff --git a/devel/glib20/files/patch-gio_gunixvolume.c b/devel/glib20/files/patch-gio_gunixvolume.c
index 377a7d6b5686..b22563047d84 100644
--- a/devel/glib20/files/patch-gio_gunixvolume.c
+++ b/devel/glib20/files/patch-gio_gunixvolume.c
@@ -1,6 +1,6 @@
---- gio/gunixvolume.c.orig 2007-12-23 15:43:17.000000000 -0500
-+++ gio/gunixvolume.c 2007-12-23 15:47:08.000000000 -0500
-@@ -387,9 +387,13 @@ g_unix_volume_eject (GVolume *volume,
+--- gio/gunixvolume.c.orig 2009-11-30 04:35:27.000000000 +0100
++++ gio/gunixvolume.c 2009-12-08 19:32:03.000000000 +0100
+@@ -465,9 +465,14 @@ g_unix_volume_eject (GVolume
gpointer user_data)
{
GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
@@ -8,8 +8,8 @@
+ char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL};
+ argv[2] = unix_volume->device_path;
+#else
- char *argv[] = {"eject", NULL, NULL};
--
+ char *argv[] = { "eject", NULL, NULL };
+
argv[1] = unix_volume->device_path;
+#endif
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 4e011916cd1a..a760ba254490 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -1,3 +1,4 @@
+bin/gio-querymodules
bin/glib-genmarshal
bin/glib-gettextize
bin/glib-mkenums
@@ -5,7 +6,9 @@ bin/gobject-query
bin/gtester
bin/gtester-report
include/gio-unix-2.0/gio/gdesktopappinfo.h
+include/gio-unix-2.0/gio/gfiledescriptorbased.h
include/gio-unix-2.0/gio/gunixconnection.h
+include/gio-unix-2.0/gio/gunixfdlist.h
include/gio-unix-2.0/gio/gunixfdmessage.h
include/gio-unix-2.0/gio/gunixinputstream.h
include/gio-unix-2.0/gio/gunixmounts.h
@@ -17,7 +20,11 @@ include/glib-2.0/gio/gasyncresult.h
include/glib-2.0/gio/gbufferedinputstream.h
include/glib-2.0/gio/gbufferedoutputstream.h
include/glib-2.0/gio/gcancellable.h
+include/glib-2.0/gio/gcharsetconverter.h
include/glib-2.0/gio/gcontenttype.h
+include/glib-2.0/gio/gconverter.h
+include/glib-2.0/gio/gconverterinputstream.h
+include/glib-2.0/gio/gconverteroutputstream.h
include/glib-2.0/gio/gdatainputstream.h
include/glib-2.0/gio/gdataoutputstream.h
include/glib-2.0/gio/gdrive.h
@@ -76,6 +83,8 @@ include/glib-2.0/gio/gthreadedsocketservice.h
include/glib-2.0/gio/gvfs.h
include/glib-2.0/gio/gvolume.h
include/glib-2.0/gio/gvolumemonitor.h
+include/glib-2.0/gio/gzlibcompressor.h
+include/glib-2.0/gio/gzlibdecompressor.h
include/glib-2.0/glib-object.h
include/glib-2.0/glib.h
include/glib-2.0/glib/galloca.h
@@ -84,6 +93,7 @@ include/glib-2.0/glib/gasyncqueue.h
include/glib-2.0/glib/gatomic.h
include/glib-2.0/glib/gbacktrace.h
include/glib-2.0/glib/gbase64.h
+include/glib-2.0/glib/gbitlock.h
include/glib-2.0/glib/gbookmarkfile.h
include/glib-2.0/glib/gcache.h
include/glib-2.0/glib/gchecksum.h
@@ -138,6 +148,8 @@ include/glib-2.0/glib/gtypes.h
include/glib-2.0/glib/gunicode.h
include/glib-2.0/glib/gurifuncs.h
include/glib-2.0/glib/gutils.h
+include/glib-2.0/glib/gvariant.h
+include/glib-2.0/glib/gvarianttype.h
include/glib-2.0/glib/gwin32.h
include/glib-2.0/glibconfig.h
include/glib-2.0/gmodule.h
@@ -190,9 +202,11 @@ share/aclocal/glib-2.0.m4
share/aclocal/glib-gettext.m4
share/glib-2.0/gettext/mkinstalldirs
share/glib-2.0/gettext/po/Makefile.in.in
+share/locale/af/LC_MESSAGES/glib20.mo
share/locale/am/LC_MESSAGES/glib20.mo
share/locale/ar/LC_MESSAGES/glib20.mo
share/locale/as/LC_MESSAGES/glib20.mo
+share/locale/ast/LC_MESSAGES/glib20.mo
share/locale/az/LC_MESSAGES/glib20.mo
share/locale/be/LC_MESSAGES/glib20.mo
share/locale/be@latin/LC_MESSAGES/glib20.mo
@@ -210,6 +224,7 @@ share/locale/dz/LC_MESSAGES/glib20.mo
share/locale/el/LC_MESSAGES/glib20.mo
share/locale/en_CA/LC_MESSAGES/glib20.mo
share/locale/en_GB/LC_MESSAGES/glib20.mo
+share/locale/en@shaw/LC_MESSAGES/glib20.mo
share/locale/eo/LC_MESSAGES/glib20.mo
share/locale/es/LC_MESSAGES/glib20.mo
share/locale/et/LC_MESSAGES/glib20.mo
@@ -243,6 +258,7 @@ share/locale/mn/LC_MESSAGES/glib20.mo
share/locale/mr/LC_MESSAGES/glib20.mo
share/locale/ms/LC_MESSAGES/glib20.mo
share/locale/nb/LC_MESSAGES/glib20.mo
+share/locale/nds/LC_MESSAGES/glib20.mo
share/locale/ne/LC_MESSAGES/glib20.mo
share/locale/nl/LC_MESSAGES/glib20.mo
share/locale/nn/LC_MESSAGES/glib20.mo
@@ -282,6 +298,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrm share/glib-2.0/gettext
@dirrm share/glib-2.0
@exec mkdir -p %D/lib/gio/modules
+@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+@unexec /bin/rm -f %D/lib/gio/modules/giomodule.cache
@dirrmtry lib/gio/modules
@dirrmtry lib/gio
@dirrm include/glib-2.0/gobject
@@ -314,6 +332,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@@ -324,6 +344,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrmtry share/locale/ku
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@@ -332,5 +354,7 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 2ea3d95b2512..4866b4a3a0ac 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glibmm/Makefile,v 1.82 2009/09/21 19:47:13 kwm Exp $
+# $MCom: ports/devel/glibmm/Makefile,v 1.90 2010/05/04 12:45:00 kwm Exp $
#
PORTNAME= glibmm
-PORTVERSION= 2.22.1
+PORTVERSION= 2.24.2
PORTREVISION?= 0
PORTEPOCH= 1
CATEGORIES= devel
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index 96ae66df32bd..b114a6abd3a1 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glibmm-2.22.1.tar.bz2) = 1a96c7fde75ddbb421bc23fb4aa7adba
-SHA256 (gnome2/glibmm-2.22.1.tar.bz2) = f105ff4afdcdf7da7f310affdbe698058958f01e94ab65ac1c35e46e20ecb6c0
-SIZE (gnome2/glibmm-2.22.1.tar.bz2) = 3480822
+MD5 (gnome2/glibmm-2.24.2.tar.bz2) = 48861fec006c2bd8e301d8e44cd12d3c
+SHA256 (gnome2/glibmm-2.24.2.tar.bz2) = d4687c0b27f9c9f955a5306649008a1f8d8935edff916278fb7b65b44292ff7a
+SIZE (gnome2/glibmm-2.24.2.tar.bz2) = 4481414
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index ba8a266b3414..3cb8d30b0675 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -27,7 +27,10 @@ include/giomm-%%API_VERSION%%/giomm/fileoutputstream.h
include/giomm-%%API_VERSION%%/giomm/filterinputstream.h
include/giomm-%%API_VERSION%%/giomm/filteroutputstream.h
include/giomm-%%API_VERSION%%/giomm/icon.h
+include/giomm-%%API_VERSION%%/giomm/inetaddress.h
+include/giomm-%%API_VERSION%%/giomm/inetsocketaddress.h
include/giomm-%%API_VERSION%%/giomm/init.h
+include/giomm-%%API_VERSION%%/giomm/initable.h
include/giomm-%%API_VERSION%%/giomm/inputstream.h
include/giomm-%%API_VERSION%%/giomm/iostream.h
include/giomm-%%API_VERSION%%/giomm/loadableicon.h
@@ -35,6 +38,8 @@ include/giomm-%%API_VERSION%%/giomm/memoryinputstream.h
include/giomm-%%API_VERSION%%/giomm/memoryoutputstream.h
include/giomm-%%API_VERSION%%/giomm/mount.h
include/giomm-%%API_VERSION%%/giomm/mountoperation.h
+include/giomm-%%API_VERSION%%/giomm/networkaddress.h
+include/giomm-%%API_VERSION%%/giomm/networkservice.h
include/giomm-%%API_VERSION%%/giomm/outputstream.h
include/giomm-%%API_VERSION%%/giomm/private/appinfo_p.h
include/giomm-%%API_VERSION%%/giomm/private/asyncresult_p.h
@@ -63,6 +68,9 @@ include/giomm-%%API_VERSION%%/giomm/private/fileoutputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/filterinputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/filteroutputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/icon_p.h
+include/giomm-%%API_VERSION%%/giomm/private/inetaddress_p.h
+include/giomm-%%API_VERSION%%/giomm/private/inetsocketaddress_p.h
+include/giomm-%%API_VERSION%%/giomm/private/initable_p.h
include/giomm-%%API_VERSION%%/giomm/private/inputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/iostream_p.h
include/giomm-%%API_VERSION%%/giomm/private/loadableicon_p.h
@@ -70,23 +78,51 @@ include/giomm-%%API_VERSION%%/giomm/private/memoryinputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/memoryoutputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/mount_p.h
include/giomm-%%API_VERSION%%/giomm/private/mountoperation_p.h
+include/giomm-%%API_VERSION%%/giomm/private/networkaddress_p.h
+include/giomm-%%API_VERSION%%/giomm/private/networkservice_p.h
include/giomm-%%API_VERSION%%/giomm/private/outputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/resolver_p.h
include/giomm-%%API_VERSION%%/giomm/private/seekable_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socket_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socketaddress_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socketaddressenumerator_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socketclient_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socketconnectable_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socketconnection_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socketlistener_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socketservice_p.h
+include/giomm-%%API_VERSION%%/giomm/private/srvtarget_p.h
+include/giomm-%%API_VERSION%%/giomm/private/tcpconnection_p.h
include/giomm-%%API_VERSION%%/giomm/private/themedicon_p.h
+include/giomm-%%API_VERSION%%/giomm/private/threadedsocketservice_p.h
+include/giomm-%%API_VERSION%%/giomm/private/unixconnection_p.h
include/giomm-%%API_VERSION%%/giomm/private/unixinputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/unixoutputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/volume_p.h
include/giomm-%%API_VERSION%%/giomm/private/volumemonitor_p.h
+include/giomm-%%API_VERSION%%/giomm/resolver.h
include/giomm-%%API_VERSION%%/giomm/seekable.h
+include/giomm-%%API_VERSION%%/giomm/socket.h
+include/giomm-%%API_VERSION%%/giomm/socketaddress.h
+include/giomm-%%API_VERSION%%/giomm/socketaddressenumerator.h
+include/giomm-%%API_VERSION%%/giomm/socketclient.h
+include/giomm-%%API_VERSION%%/giomm/socketconnectable.h
+include/giomm-%%API_VERSION%%/giomm/socketconnection.h
+include/giomm-%%API_VERSION%%/giomm/socketlistener.h
+include/giomm-%%API_VERSION%%/giomm/socketservice.h
+include/giomm-%%API_VERSION%%/giomm/srvtarget.h
+include/giomm-%%API_VERSION%%/giomm/tcpconnection.h
include/giomm-%%API_VERSION%%/giomm/themedicon.h
+include/giomm-%%API_VERSION%%/giomm/threadedsocketservice.h
+include/giomm-%%API_VERSION%%/giomm/unixconnection.h
include/giomm-%%API_VERSION%%/giomm/unixinputstream.h
include/giomm-%%API_VERSION%%/giomm/unixoutputstream.h
include/giomm-%%API_VERSION%%/giomm/volume.h
include/giomm-%%API_VERSION%%/giomm/volumemonitor.h
include/giomm-%%API_VERSION%%/giomm/wrap_init.h
-include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs/generate_extra_defs.h
include/glibmm-%%API_VERSION%%/glibmm.h
include/glibmm-%%API_VERSION%%/glibmm/arrayhandle.h
+include/glibmm-%%API_VERSION%%/glibmm/balancedtree.h
include/glibmm-%%API_VERSION%%/glibmm/checksum.h
include/glibmm-%%API_VERSION%%/glibmm/class.h
include/glibmm-%%API_VERSION%%/glibmm/containerhandle_shared.h
@@ -119,6 +155,7 @@ include/glibmm-%%API_VERSION%%/glibmm/optionentry.h
include/glibmm-%%API_VERSION%%/glibmm/optiongroup.h
include/glibmm-%%API_VERSION%%/glibmm/pattern.h
include/glibmm-%%API_VERSION%%/glibmm/priorities.h
+include/glibmm-%%API_VERSION%%/glibmm/private/balancedtree_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/checksum_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/convert_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/date_p.h
@@ -169,6 +206,7 @@ include/glibmm-%%API_VERSION%%/glibmm/value_custom.h
include/glibmm-%%API_VERSION%%/glibmm/valuearray.h
include/glibmm-%%API_VERSION%%/glibmm/wrap.h
include/glibmm-%%API_VERSION%%/glibmm/wrap_init.h
+include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs/generate_extra_defs.h
lib/giomm-%%API_VERSION%%/include/giommconfig.h
lib/glibmm-%%API_VERSION%%/include/glibmmconfig.h
lib/glibmm-%%VERSION%%/proc/generate_wrap_init.pl
diff --git a/devel/gnome-js-common/Makefile b/devel/gnome-js-common/Makefile
index ab20f1719349..67508cf1de43 100644
--- a/devel/gnome-js-common/Makefile
+++ b/devel/gnome-js-common/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Logvinov <avl@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-js-common/Makefile,v 1.1 2009/07/30 02:40:56 avl Exp $
+# $MCom: ports/devel/gnome-js-common/Makefile,v 1.3 2010/01/01 03:30:52 avl Exp $
#
PORTNAME= gnome-js-common
-PORTVERSION= 0.1.1
+PORTVERSION= 0.1.2
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -27,7 +27,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|== x|= x|g' \
${WRKSRC}/configure
.if !defined(NOPORTDOCS)
- @${REINPLACE_CMD} -e 's|$${prefix}/doc/gnome_js_common|$${datarootdir}/doc/${PORTNAME}|' \
+ @${REINPLACE_CMD} -e 's|$${prefix}/share/doc/gnome_js_common|${DOCSDIR}|' \
${WRKSRC}/Makefile.in
.else
@${REINPLACE_CMD} -e 's|install-gnome_js_commondocDATA ||g' ${WRKSRC}/Makefile.in
diff --git a/devel/gnome-js-common/distinfo b/devel/gnome-js-common/distinfo
index ff081cb56a13..c154f3bfea44 100644
--- a/devel/gnome-js-common/distinfo
+++ b/devel/gnome-js-common/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-js-common-0.1.1.tar.bz2) = 4f1c409a0be66d0df9dcdf15e9cf70ff
-SHA256 (gnome2/gnome-js-common-0.1.1.tar.bz2) = 6cad015cda5abfd2bccd6b95714ca39c83ca69ca7e6f7326dc75763a758dc8db
-SIZE (gnome2/gnome-js-common-0.1.1.tar.bz2) = 274010
+MD5 (gnome2/gnome-js-common-0.1.2.tar.bz2) = a4147d24622ab0f1d01e9921a3bf501b
+SHA256 (gnome2/gnome-js-common-0.1.2.tar.bz2) = 1765be99f3d83cc57e1ec13a2bb963469b8e91b60239eeaab61d66d7744496e6
+SIZE (gnome2/gnome-js-common-0.1.2.tar.bz2) = 283520
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 9b0be1a68379..3b41a8b8f81c 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfs/Makefile,v 1.187 2009/10/10 16:04:54 marcus Exp $
+# $MCom: ports/devel/gnome-vfs/Makefile,v 1.189 2010/04/01 14:24:30 kwm Exp $
#
PORTNAME= gnome-vfs
-PORTVERSION= 2.24.2
-PORTREVISION?= 2
+PORTVERSION= 2.24.3
+PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 63d1710811e0..5a89b547e6a7 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.24.2.tar.bz2) = 371d13e7306eb82e3fe3748a7584c440
-SHA256 (gnome2/gnome-vfs-2.24.2.tar.bz2) = 50ecf5f37d377492e8943a3c359ffe64176d4e7f045e9980790eca999a1c6856
-SIZE (gnome2/gnome-vfs-2.24.2.tar.bz2) = 1859173
+MD5 (gnome2/gnome-vfs-2.24.3.tar.bz2) = 646a2672c6e7e4ebff6a798b0fb7cc90
+SHA256 (gnome2/gnome-vfs-2.24.3.tar.bz2) = 3b0f342e79813bfc11d8e636db96b3ffd16c9ca48b07306410e09a3fd1065b4a
+SIZE (gnome2/gnome-vfs-2.24.3.tar.bz2) = 1830456
diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in
index 0b97e9c55c64..6567e62042f2 100644
--- a/devel/gnome-vfs/pkg-deinstall.in
+++ b/devel/gnome-vfs/pkg-deinstall.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.23 2009/11/28 05:58:59 mezz Exp $
+# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.26 2010/04/02 21:50:06 kwm Exp $
#
# Restore gconf keys of libgnome.
diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in
index 018b36eccbf9..0fc15088ae8b 100644
--- a/devel/gnome-vfs/pkg-install.in
+++ b/devel/gnome-vfs/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.23 2009/11/28 05:58:59 mezz Exp $
+# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.26 2010/04/02 21:50:06 kwm Exp $
#
# Restore gconf keys of libgnome.
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 31ce344648e6..d270094942f7 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -127,6 +127,7 @@ share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/dz/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/en_CA/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -234,6 +235,8 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile
index 56e45f4c086d..6fa5ce4d49f5 100644
--- a/devel/gnome2-hacker-tools/Makefile
+++ b/devel/gnome2-hacker-tools/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/devel/gnome2-hacker-tools/Makefile,v 1.47 2009/03/01 08:15:25 marcus Exp $
#
-PORTREVISION= 2
+PORTREVISION= 0
CATEGORIES= devel gnome
PKGNAMESUFFIX= -hacker-tools
diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile
index 5ee9e37f7de2..7e8b8a130d9c 100644
--- a/devel/gob2/Makefile
+++ b/devel/gob2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gob2
-PORTVERSION= 2.0.16
+PORTVERSION= 2.0.17
CATEGORIES= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gob2/distinfo b/devel/gob2/distinfo
index 609b1e7e05b3..70489c464fc7 100644
--- a/devel/gob2/distinfo
+++ b/devel/gob2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gob2-2.0.16.tar.gz) = cced6d709df6fad3baf8831f027d62d5
-SHA256 (gnome2/gob2-2.0.16.tar.gz) = 2c7f57d8ab7837e82290e96fcdb4dd97a2e82acb21f4508fe9be2f6f8e6a293b
-SIZE (gnome2/gob2-2.0.16.tar.gz) = 257508
+MD5 (gnome2/gob2-2.0.17.tar.gz) = 05fa7384b30ebb2921430b2615d2c2e5
+SHA256 (gnome2/gob2-2.0.17.tar.gz) = 80b4683af653809970ef237fa45427b203653edf0dd5e3dc8897433e9c29346c
+SIZE (gnome2/gob2-2.0.17.tar.gz) = 274156
diff --git a/devel/gob2/files/patch-src_out.c b/devel/gob2/files/patch-src_out.c
new file mode 100644
index 000000000000..14f6637c68e4
--- /dev/null
+++ b/devel/gob2/files/patch-src_out.c
@@ -0,0 +1,16 @@
+--- src/out.c.orig 2009-07-10 16:43:05.000000000 +0200
++++ src/out.c 2009-11-27 14:07:58.000000000 +0100
+@@ -69,6 +69,13 @@
+ } else
+ g_assert_not_reached();
+
++ /*
++ * According to clang developers #line 0 is not allowed by the C spec.
++ * Gcc does accept it though. http://llvm.org/bugs/show_bug.cgi?id=5603
++ */
++ if (line == 0)
++ line += 1;
++
+ fprintf(fp, "#line %d \"%s\"\n", line, filename);
+ }
+
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 3ee455c39804..56fe63a36283 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Logvinov <avl@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gobject-introspection/Makefile,v 1.3 2009/09/06 07:37:44 avl Exp $
+# $MCom: ports/devel/gobject-introspection/Makefile,v 1.8 2010/04/22 15:11:23 kwm Exp $
#
PORTNAME= gobject-introspection
-PORTVERSION= 0.6.7
+PORTVERSION= 0.6.10
CATEGORIES= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,7 +16,8 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Generate interface introspection data for GObject libraries
BUILD_DEPENDS= flex:${PORTSDIR}/textproc/flex
-LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi
+LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi \
+ cairo.2:${PORTSDIR}/graphics/cairo
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index e3eccda319b7..73ae07e84f39 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gobject-introspection-0.6.7.tar.bz2) = 41205c14cbd86632806578448e29bd30
-SHA256 (gnome2/gobject-introspection-0.6.7.tar.bz2) = c97ca4e978b0583999775640e9e9f97b64a5880ad2a6adc3ce903207b616f24a
-SIZE (gnome2/gobject-introspection-0.6.7.tar.bz2) = 579956
+MD5 (gnome2/gobject-introspection-0.6.10.tar.bz2) = cdf7af644a0407c3fd2d57ba2bb3549f
+SHA256 (gnome2/gobject-introspection-0.6.10.tar.bz2) = 36bd511a4d45967f95526f94708b3f4367e9d344aa11f3206fe6edb7fc3a8d4b
+SIZE (gnome2/gobject-introspection-0.6.10.tar.bz2) = 550501
diff --git a/devel/gobject-introspection/files/patch-20091207 b/devel/gobject-introspection/files/patch-20091207
deleted file mode 100644
index fa0b93cf3086..000000000000
--- a/devel/gobject-introspection/files/patch-20091207
+++ /dev/null
@@ -1,2632 +0,0 @@
-From 804f59f40c027cf1fb2944764adea564dff07678 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Mon, 07 Dec 2009 23:35:06 +0000
-Subject: Allow stack allocating GIBaseInfo, add stack retrieval variants
-
-We don't want to malloc each GIBaseInfo when they can be used in
-function invocation; instead, allow stack allocation.
-
-There were a lot of structure typedefs which were actually just
-exactly the same as GIBaseInfo, with the one exception of GITypeInfo.
-
-Instead, just put the single GITypeInfo boolean inside GIBaseInfo
-as a bit in a bitfield.
-
-GIBaseInfo is still opaque publicly; GIRealInfo is the new
-internal structure.
-
-Using this, add new functions to retrieve arguments and argument types
-on the stack.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=604074
----
-diff --git a/girepository/ginfo.c b/girepository/ginfo.c
-index 2aacb76..b11cc8f 100644
---- girepository/ginfo.c
-+++ girepository/ginfo.c
-@@ -28,11 +28,19 @@
- #include "gtypelib.h"
- #include "ginfo.h"
-
--struct _GIBaseInfo
-+typedef struct _GIRealInfo GIRealInfo;
-+
-+/**
-+ * We just use one structure for all of the info object
-+ * types; in general, we should be reading data directly
-+ * from the typelib, and not having computed data in
-+ * per-type structures.
-+ */
-+struct _GIRealInfo
- {
- /* Keep this part in sync with GIUnresolvedInfo below */
-- gint type;
-- gint ref_count;
-+ gint32 type;
-+ gint32 ref_count;
- GIRepository *repository;
- GIBaseInfo *container;
-
-@@ -40,13 +48,18 @@ struct _GIBaseInfo
-
- GTypelib *typelib;
- guint32 offset;
-+
-+ guint32 type_is_embedded : 1; /* Used by GITypeInfo */
-+ guint32 reserved : 31;
-+
-+ gpointer reserved2[4];
- };
-
- struct _GIUnresolvedInfo
- {
- /* Keep this part in sync with GIBaseInfo above */
-- gint type;
-- gint ref_count;
-+ gint32 type;
-+ gint32 ref_count;
- GIRepository *repository;
- GIBaseInfo *container;
-
-@@ -56,137 +69,68 @@ struct _GIUnresolvedInfo
- const gchar *namespace;
- };
-
--struct _GICallableInfo
--{
-- GIBaseInfo base;
--};
--
--struct _GIFunctionInfo
--{
-- GICallableInfo callable;
--};
--
--struct _GICallbackInfo
--{
-- GICallableInfo callable;
--};
--
--struct _GIRegisteredTypeInfo
--{
-- GIBaseInfo base;
--};
--
--struct _GIStructInfo
--{
-- GIRegisteredTypeInfo registered;
--};
--
--struct _GIEnumInfo
--{
-- GIRegisteredTypeInfo registered;
--};
--
--struct _GIObjectInfo
--{
-- GIRegisteredTypeInfo registered;
--};
--
--struct _GIInterfaceInfo
--{
-- GIRegisteredTypeInfo registered;
--};
--
--struct _GIConstantInfo
--{
-- GIBaseInfo base;
--};
--
--struct _GIValueInfo
--{
-- GIBaseInfo base;
--};
--
--struct _GISignalInfo
--{
-- GICallableInfo callable;
--};
--
--struct _GIVFuncInfo
--{
-- GICallableInfo callable;
--};
--
--struct _GIPropertyInfo
--{
-- GIBaseInfo base;
--};
--
--struct _GIFieldInfo
-+static void
-+g_info_init (GIRealInfo *info,
-+ GIInfoType type,
-+ GIRepository *repository,
-+ GIBaseInfo *container,
-+ GTypelib *typelib,
-+ guint32 offset)
- {
-- GIBaseInfo base;
--};
-+ memset (info, 0, sizeof (GIRealInfo));
-
--struct _GIArgInfo
--{
-- GIBaseInfo base;
--};
-+ /* Invalid refcount used to flag stack-allocated infos */
-+ info->ref_count = 0xFFFF;
-+ info->type = type;
-
--struct _GITypeInfo
--{
-- GIBaseInfo base;
-- gboolean is_embedded;
--};
-+ info->typelib = typelib;
-+ info->offset = offset;
-
--struct _GIUnionInfo
--{
-- GIRegisteredTypeInfo registered;
--};
-+ if (container)
-+ info->container = container;
-
-+ g_assert (G_IS_IREPOSITORY (repository));
-+ info->repository = repository;
-+}
-
- /* info creation */
- GIBaseInfo *
- g_info_new_full (GIInfoType type,
-- GIRepository *repository,
-- GIBaseInfo *container,
-- GTypelib *typelib,
-- guint32 offset)
-+ GIRepository *repository,
-+ GIBaseInfo *container,
-+ GTypelib *typelib,
-+ guint32 offset)
- {
-- GIBaseInfo *info;
-+ GIRealInfo *info;
-
- g_return_val_if_fail (container != NULL || repository != NULL, NULL);
-
-- if (type == GI_INFO_TYPE_TYPE)
-- info = (GIBaseInfo *)g_new0 (GITypeInfo, 1);
-- else
-- info = g_new0 (GIBaseInfo, 1);
--
-+ info = g_new (GIRealInfo, 1);
-+
-+ g_info_init (info, type, repository, container, typelib, offset);
- info->ref_count = 1;
-- info->type = type;
--
-- info->typelib = typelib;
-- info->offset = offset;
-
-- if (container)
-- info->container = g_base_info_ref (container);
-+ if (container && ((GIRealInfo *) container)->ref_count != 0xFFFF)
-+ g_base_info_ref (info->container);
-
-- info->repository = g_object_ref (repository);
-+ g_object_ref (info->repository);
-
-- return info;
-+ return (GIBaseInfo*)info;
- }
-
- GIBaseInfo *
- g_info_new (GIInfoType type,
-- GIBaseInfo *container,
-- GTypelib *typelib,
-- guint32 offset)
-+ GIBaseInfo *container,
-+ GTypelib *typelib,
-+ guint32 offset)
- {
-- return g_info_new_full (type, container->repository, container, typelib, offset);
-+ return g_info_new_full (type, ((GIRealInfo*)container)->repository, container, typelib, offset);
- }
-
- static GIBaseInfo *
- g_info_from_entry (GIRepository *repository,
-- GTypelib *typelib,
-- guint16 index)
-+ GTypelib *typelib,
-+ guint16 index)
- {
- GIBaseInfo *result;
- DirEntry *entry = g_typelib_get_dir_entry (typelib, index);
-@@ -200,31 +144,34 @@ g_info_from_entry (GIRepository *repository,
-
- result = g_irepository_find_by_name (repository, namespace, name);
- if (result == NULL)
-- {
-- GIUnresolvedInfo *unresolved;
-+ {
-+ GIUnresolvedInfo *unresolved;
-
-- unresolved = g_new0 (GIUnresolvedInfo, 1);
-+ unresolved = g_new0 (GIUnresolvedInfo, 1);
-
-- unresolved->type = GI_INFO_TYPE_UNRESOLVED;
-- unresolved->ref_count = 1;
-- unresolved->repository = g_object_ref (repository);
-- unresolved->container = NULL;
-- unresolved->name = name;
-- unresolved->namespace = namespace;
-+ unresolved->type = GI_INFO_TYPE_UNRESOLVED;
-+ unresolved->ref_count = 1;
-+ unresolved->repository = g_object_ref (repository);
-+ unresolved->container = NULL;
-+ unresolved->name = name;
-+ unresolved->namespace = namespace;
-
-- return (GIBaseInfo*)unresolved;
-- }
-- return result;
-+ return (GIBaseInfo *)unresolved;
-+ }
-+ return (GIBaseInfo *)result;
- }
-
-- return result;
-+ return (GIBaseInfo *)result;
- }
-
- /* GIBaseInfo functions */
- GIBaseInfo *
- g_base_info_ref (GIBaseInfo *info)
- {
-- info->ref_count++;
-+ GIRealInfo *rinfo = (GIRealInfo*)info;
-+
-+ g_assert (rinfo->ref_count != 0xFFFF);
-+ ((GIRealInfo*)info)->ref_count++;
-
- return info;
- }
-@@ -232,18 +179,20 @@ g_base_info_ref (GIBaseInfo *info)
- void
- g_base_info_unref (GIBaseInfo *info)
- {
-- g_assert (info->ref_count > 0);
-- info->ref_count--;
-+ GIRealInfo *rinfo = (GIRealInfo*)info;
-+
-+ g_assert (rinfo->ref_count > 0 && rinfo->ref_count != 0xFFFF);
-+ rinfo->ref_count--;
-
-- if (!info->ref_count)
-+ if (!rinfo->ref_count)
- {
-- if (info->container)
-- g_base_info_unref (info->container);
-+ if (rinfo->container && ((GIRealInfo *) rinfo->container)->ref_count != 0xFFFF)
-+ g_base_info_unref (rinfo->container);
-
-- if (info->repository)
-- g_object_unref (info->repository);
-+ if (rinfo->repository)
-+ g_object_unref (rinfo->repository);
-
-- g_free (info);
-+ g_free (rinfo);
- }
- }
-
-@@ -251,14 +200,15 @@ GIInfoType
- g_base_info_get_type (GIBaseInfo *info)
- {
-
-- return info->type;
-+ return ((GIRealInfo*)info)->type;
- }
-
- const gchar *
- g_base_info_get_name (GIBaseInfo *info)
- {
-- g_assert (info->ref_count > 0);
-- switch (info->type)
-+ GIRealInfo *rinfo = (GIRealInfo*)info;
-+ g_assert (rinfo->ref_count > 0);
-+ switch (rinfo->type)
- {
- case GI_INFO_TYPE_FUNCTION:
- case GI_INFO_TYPE_CALLBACK:
-@@ -272,64 +222,64 @@ g_base_info_get_name (GIBaseInfo *info)
- case GI_INFO_TYPE_ERROR_DOMAIN:
- case GI_INFO_TYPE_UNION:
- {
-- CommonBlob *blob = (CommonBlob *)&info->typelib->data[info->offset];
-+ CommonBlob *blob = (CommonBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return g_typelib_get_string (info->typelib, blob->name);
-+ return g_typelib_get_string (rinfo->typelib, blob->name);
- }
- break;
-
- case GI_INFO_TYPE_VALUE:
- {
-- ValueBlob *blob = (ValueBlob *)&info->typelib->data[info->offset];
-+ ValueBlob *blob = (ValueBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return g_typelib_get_string (info->typelib, blob->name);
-+ return g_typelib_get_string (rinfo->typelib, blob->name);
- }
- break;
-
- case GI_INFO_TYPE_SIGNAL:
- {
-- SignalBlob *blob = (SignalBlob *)&info->typelib->data[info->offset];
-+ SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return g_typelib_get_string (info->typelib, blob->name);
-+ return g_typelib_get_string (rinfo->typelib, blob->name);
- }
- break;
-
- case GI_INFO_TYPE_PROPERTY:
- {
-- PropertyBlob *blob = (PropertyBlob *)&info->typelib->data[info->offset];
-+ PropertyBlob *blob = (PropertyBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return g_typelib_get_string (info->typelib, blob->name);
-+ return g_typelib_get_string (rinfo->typelib, blob->name);
- }
- break;
-
- case GI_INFO_TYPE_VFUNC:
- {
-- VFuncBlob *blob = (VFuncBlob *)&info->typelib->data[info->offset];
-+ VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return g_typelib_get_string (info->typelib, blob->name);
-+ return g_typelib_get_string (rinfo->typelib, blob->name);
- }
- break;
-
- case GI_INFO_TYPE_FIELD:
- {
-- FieldBlob *blob = (FieldBlob *)&info->typelib->data[info->offset];
-+ FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return g_typelib_get_string (info->typelib, blob->name);
-+ return g_typelib_get_string (rinfo->typelib, blob->name);
- }
- break;
-
- case GI_INFO_TYPE_ARG:
- {
-- ArgBlob *blob = (ArgBlob *)&info->typelib->data[info->offset];
-+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return g_typelib_get_string (info->typelib, blob->name);
-+ return g_typelib_get_string (rinfo->typelib, blob->name);
- }
- break;
- case GI_INFO_TYPE_UNRESOLVED:
- {
-- GIUnresolvedInfo *unresolved = (GIUnresolvedInfo *)info;
-+ GIUnresolvedInfo *unresolved = (GIUnresolvedInfo *)info;
-
-- return unresolved->name;
-+ return unresolved->name;
- }
- break;
- case GI_INFO_TYPE_TYPE:
-@@ -344,24 +294,26 @@ g_base_info_get_name (GIBaseInfo *info)
- const gchar *
- g_base_info_get_namespace (GIBaseInfo *info)
- {
-- Header *header = (Header *)info->typelib->data;
-+ GIRealInfo *rinfo = (GIRealInfo*) info;
-+ Header *header = (Header *)rinfo->typelib->data;
-
-- g_assert (info->ref_count > 0);
-+ g_assert (rinfo->ref_count > 0);
-
-- if (info->type == GI_INFO_TYPE_UNRESOLVED)
-+ if (rinfo->type == GI_INFO_TYPE_UNRESOLVED)
- {
- GIUnresolvedInfo *unresolved = (GIUnresolvedInfo *)info;
-
- return unresolved->namespace;
- }
-
-- return g_typelib_get_string (info->typelib, header->namespace);
-+ return g_typelib_get_string (rinfo->typelib, header->namespace);
- }
-
- gboolean
- g_base_info_is_deprecated (GIBaseInfo *info)
- {
-- switch (info->type)
-+ GIRealInfo *rinfo = (GIRealInfo*) info;
-+ switch (rinfo->type)
- {
- case GI_INFO_TYPE_FUNCTION:
- case GI_INFO_TYPE_CALLBACK:
-@@ -374,33 +326,33 @@ g_base_info_is_deprecated (GIBaseInfo *info)
- case GI_INFO_TYPE_CONSTANT:
- case GI_INFO_TYPE_ERROR_DOMAIN:
- {
-- CommonBlob *blob = (CommonBlob *)&info->typelib->data[info->offset];
-+ CommonBlob *blob = (CommonBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return blob->deprecated;
-+ return blob->deprecated;
- }
- break;
-
- case GI_INFO_TYPE_VALUE:
- {
-- ValueBlob *blob = (ValueBlob *)&info->typelib->data[info->offset];
-+ ValueBlob *blob = (ValueBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return blob->deprecated;
-+ return blob->deprecated;
- }
- break;
-
- case GI_INFO_TYPE_SIGNAL:
- {
-- SignalBlob *blob = (SignalBlob *)&info->typelib->data[info->offset];
-+ SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return blob->deprecated;
-+ return blob->deprecated;
- }
- break;
-
- case GI_INFO_TYPE_PROPERTY:
- {
-- PropertyBlob *blob = (PropertyBlob *)&info->typelib->data[info->offset];
-+ PropertyBlob *blob = (PropertyBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return blob->deprecated;
-+ return blob->deprecated;
- }
- break;
-
-@@ -426,7 +378,7 @@ g_base_info_is_deprecated (GIBaseInfo *info)
- */
- const gchar *
- g_base_info_get_attribute (GIBaseInfo *info,
-- const gchar *name)
-+ const gchar *name)
- {
- GIAttributeIter iter = { 0, };
- gchar *curname, *curvalue;
-@@ -455,15 +407,14 @@ cmp_attribute (const void *av,
- }
-
- static AttributeBlob *
--find_first_attribute (GIBaseInfo *info)
-+find_first_attribute (GIRealInfo *rinfo)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-+ Header *header = (Header *)rinfo->typelib->data;
- AttributeBlob blob, *first, *res, *previous;
-
-- blob.offset = base->offset;
-+ blob.offset = rinfo->offset;
-
-- first = (AttributeBlob *) &base->typelib->data[header->attributes];
-+ first = (AttributeBlob *) &rinfo->typelib->data[header->attributes];
-
- res = bsearch (&blob, first, header->n_attributes,
- header->attribute_blob_size, cmp_attribute);
-@@ -472,7 +423,7 @@ find_first_attribute (GIBaseInfo *info)
- return NULL;
-
- previous = res - 1;
-- while (previous >= first && previous->offset == base->offset)
-+ while (previous >= first && previous->offset == rinfo->offset)
- {
- res = previous;
- previous = res - 1;
-@@ -520,23 +471,23 @@ g_base_info_iterate_attributes (GIBaseInfo *info,
- gchar **name,
- gchar **value)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
- AttributeBlob *next, *after;
-
-- after = (AttributeBlob *) &base->typelib->data[header->attributes +
-+ after = (AttributeBlob *) &rinfo->typelib->data[header->attributes +
- header->n_attributes * header->attribute_blob_size];
-
- if (iter->data != NULL)
- next = (AttributeBlob *) iter->data;
- else
-- next = find_first_attribute (info);
-+ next = find_first_attribute (rinfo);
-
-- if (next == NULL || next->offset != base->offset || next >= after)
-+ if (next == NULL || next->offset != rinfo->offset || next >= after)
- return FALSE;
-
-- *name = (gchar*) g_typelib_get_string (base->typelib, next->name);
-- *value = (gchar*) g_typelib_get_string (base->typelib, next->value);
-+ *name = (gchar*) g_typelib_get_string (rinfo->typelib, next->name);
-+ *value = (gchar*) g_typelib_get_string (rinfo->typelib, next->value);
- iter->data = next + 1;
-
- return TRUE;
-@@ -545,13 +496,13 @@ g_base_info_iterate_attributes (GIBaseInfo *info,
- GIBaseInfo *
- g_base_info_get_container (GIBaseInfo *info)
- {
-- return info->container;
-+ return ((GIRealInfo*)info)->container;
- }
-
- GTypelib *
- g_base_info_get_typelib (GIBaseInfo *info)
- {
-- return info->typelib;
-+ return ((GIRealInfo*)info)->typelib;
- }
-
- /*
-@@ -571,25 +522,27 @@ gboolean
- g_base_info_equal (GIBaseInfo *info1, GIBaseInfo *info2)
- {
- /* Compare the TypeLib pointers, which are mmapped. */
-- return info1->typelib->data + info1->offset == info2->typelib->data + info2->offset;
-+ GIRealInfo *rinfo1 = (GIRealInfo*)info1;
-+ GIRealInfo *rinfo2 = (GIRealInfo*)info2;
-+ return rinfo1->typelib->data + rinfo1->offset == rinfo2->typelib->data + rinfo2->offset;
- }
-
- /* GIFunctionInfo functions */
- const gchar *
- g_function_info_get_symbol (GIFunctionInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- FunctionBlob *blob = (FunctionBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ FunctionBlob *blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return g_typelib_get_string (base->typelib, blob->symbol);
-+ return g_typelib_get_string (rinfo->typelib, blob->symbol);
- }
-
- GIFunctionInfoFlags
- g_function_info_get_flags (GIFunctionInfo *info)
- {
- GIFunctionInfoFlags flags;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- FunctionBlob *blob = (FunctionBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ FunctionBlob *blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset];
-
- flags = 0;
-
-@@ -618,9 +571,9 @@ g_function_info_get_flags (GIFunctionInfo *info)
- GIPropertyInfo *
- g_function_info_get_property (GIFunctionInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- FunctionBlob *blob = (FunctionBlob *)&base->typelib->data[base->offset];
-- GIInterfaceInfo *container = (GIInterfaceInfo *)base->container;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ FunctionBlob *blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset];
-+ GIInterfaceInfo *container = (GIInterfaceInfo *)rinfo->container;
-
- return g_interface_info_get_property (container, blob->index);
- }
-@@ -628,20 +581,21 @@ g_function_info_get_property (GIFunctionInfo *info)
- GIVFuncInfo *
- g_function_info_get_vfunc (GIFunctionInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- FunctionBlob *blob = (FunctionBlob *)&base->typelib->data[base->offset];
-- GIInterfaceInfo *container = (GIInterfaceInfo *)base->container;
-+ GIRealInfo *rinfo = (GIRealInfo*)info;
-+ FunctionBlob *blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset];
-+ GIInterfaceInfo *container = (GIInterfaceInfo *)rinfo->container;
-
- return g_interface_info_get_vfunc (container, blob->index);
- }
-
--
- /* GICallableInfo functions */
- static guint32
- signature_offset (GICallableInfo *info)
- {
-+ GIRealInfo *rinfo = (GIRealInfo*)info;
- int sigoff = -1;
-- switch (info->base.type)
-+
-+ switch (rinfo->type)
- {
- case GI_INFO_TYPE_FUNCTION:
- sigoff = G_STRUCT_OFFSET (FunctionBlob, signature);
-@@ -657,23 +611,32 @@ signature_offset (GICallableInfo *info)
- break;
- }
- if (sigoff >= 0)
-- return *(guint32 *)&info->base.typelib->data[info->base.offset + sigoff];
-+ return *(guint32 *)&rinfo->typelib->data[rinfo->offset + sigoff];
- return 0;
- }
-
- GITypeInfo *
- g_type_info_new (GIBaseInfo *container,
-- GTypelib *typelib,
-- guint32 offset)
-+ GTypelib *typelib,
-+ guint32 offset)
- {
- SimpleTypeBlob *type = (SimpleTypeBlob *)&typelib->data[offset];
-- GITypeInfo *type_info;
-
-- type_info = (GITypeInfo *) g_info_new (GI_INFO_TYPE_TYPE, container, typelib,
-- (type->flags.reserved == 0 && type->flags.reserved2 == 0) ? offset : type->offset);
-- type_info->is_embedded = FALSE;
-+ return (GITypeInfo *) g_info_new (GI_INFO_TYPE_TYPE, container, typelib,
-+ (type->flags.reserved == 0 && type->flags.reserved2 == 0) ? offset : type->offset);
-+}
-
-- return type_info;
-+static void
-+g_type_info_init (GIBaseInfo *info,
-+ GIBaseInfo *container,
-+ GTypelib *typelib,
-+ guint32 offset)
-+{
-+ GIRealInfo *rinfo = (GIRealInfo*)container;
-+ SimpleTypeBlob *type = (SimpleTypeBlob *)&typelib->data[offset];
-+
-+ g_info_init ((GIRealInfo*)info, GI_INFO_TYPE_TYPE, rinfo->repository, container, typelib,
-+ (type->flags.reserved == 0 && type->flags.reserved2 == 0) ? offset : type->offset);
- }
-
- /**
-@@ -689,12 +652,36 @@ g_type_info_new (GIBaseInfo *container,
- GITypeInfo *
- g_callable_info_get_return_type (GICallableInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
- guint32 offset;
-
- offset = signature_offset (info);
-
-- return g_type_info_new (base, base->typelib, offset);
-+ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, offset);
-+}
-+
-+
-+/**
-+ * g_callable_info_load_return_type:
-+ * @info: a #GICallableInfo
-+ * @type: (out caller-allocates): Initialized with return type of @info
-+ *
-+ * Get information about a return value of callable; this
-+ * function is a variant of g_callable_info_get_return_type() designed for stack
-+ * allocation.
-+ *
-+ * The initialized @type must not be referenced after @info is deallocated.
-+ */
-+void
-+g_callable_info_load_return_type (GICallableInfo *info,
-+ GITypeInfo *type)
-+{
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ guint32 offset;
-+
-+ offset = signature_offset (info);
-+
-+ g_type_info_init (type, (GIBaseInfo*)info, rinfo->typelib, offset);
- }
-
- /**
-@@ -708,8 +695,8 @@ g_callable_info_get_return_type (GICallableInfo *info)
- gboolean
- g_callable_info_may_return_null (GICallableInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- SignatureBlob *blob = (SignatureBlob *)&base->typelib->data[signature_offset (info)];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ SignatureBlob *blob = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)];
-
- return blob->may_return_null;
- }
-@@ -726,8 +713,8 @@ g_callable_info_may_return_null (GICallableInfo *info)
- GITransfer
- g_callable_info_get_caller_owns (GICallableInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- SignatureBlob *blob = (SignatureBlob *)&base->typelib->data[signature_offset (info)];
-+ GIRealInfo *rinfo = (GIRealInfo*) info;
-+ SignatureBlob *blob = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)];
-
- if (blob->caller_owns_return_value)
- return GI_TRANSFER_EVERYTHING;
-@@ -748,12 +735,12 @@ g_callable_info_get_caller_owns (GICallableInfo *info)
- gint
- g_callable_info_get_n_args (GICallableInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
- gint offset;
- SignatureBlob *blob;
-
- offset = signature_offset (info);
-- blob = (SignatureBlob *)&base->typelib->data[offset];
-+ blob = (SignatureBlob *)&rinfo->typelib->data[offset];
-
- return blob->n_arguments;
- }
-@@ -769,24 +756,51 @@ g_callable_info_get_n_args (GICallableInfo *info)
- */
- GIArgInfo *
- g_callable_info_get_arg (GICallableInfo *info,
-- gint n)
-+ gint n)
-+{
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ gint offset;
-+
-+ offset = signature_offset (info);
-+
-+ return (GIArgInfo *) g_info_new (GI_INFO_TYPE_ARG, (GIBaseInfo*)info, rinfo->typelib,
-+ offset + header->signature_blob_size + n * header->arg_blob_size);
-+}
-+
-+/**
-+ * g_callable_info_load_arg:
-+ * @info: a #GICallableInfo
-+ * @n: the argument index to fetch
-+ * @arg: (out caller-allocates): Initialize with argument number @n
-+ *
-+ * Get information about a particular argument of this callable; this
-+ * function is a variant of g_callable_info_get_arg() designed for stack
-+ * allocation.
-+ *
-+ * The initialized @arg must not be referenced after @info is deallocated.
-+ */
-+void
-+g_callable_info_load_arg (GICallableInfo *info,
-+ gint n,
-+ GIArgInfo *arg)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
- gint offset;
-
- offset = signature_offset (info);
-
-- return (GIArgInfo *) g_info_new (GI_INFO_TYPE_ARG, base, base->typelib,
-- offset + header->signature_blob_size + n * header->arg_blob_size);
-+ g_info_init ((GIRealInfo*)arg, GI_INFO_TYPE_ARG, rinfo->repository, (GIBaseInfo*)info, rinfo->typelib,
-+ offset + header->signature_blob_size + n * header->arg_blob_size);
- }
-
- /* GIArgInfo function */
- GIDirection
- g_arg_info_get_direction (GIArgInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (blob->in && blob->out)
- return GI_DIRECTION_INOUT;
-@@ -799,8 +813,8 @@ g_arg_info_get_direction (GIArgInfo *info)
- gboolean
- g_arg_info_is_return_value (GIArgInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->return_value;
- }
-@@ -808,8 +822,8 @@ g_arg_info_is_return_value (GIArgInfo *info)
- gboolean
- g_arg_info_is_dipper (GIArgInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->dipper;
- }
-@@ -817,8 +831,8 @@ g_arg_info_is_dipper (GIArgInfo *info)
- gboolean
- g_arg_info_is_optional (GIArgInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->optional;
- }
-@@ -826,8 +840,8 @@ g_arg_info_is_optional (GIArgInfo *info)
- gboolean
- g_arg_info_may_be_null (GIArgInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->allow_none;
- }
-@@ -835,8 +849,8 @@ g_arg_info_may_be_null (GIArgInfo *info)
- GITransfer
- g_arg_info_get_ownership_transfer (GIArgInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (blob->transfer_ownership)
- return GI_TRANSFER_EVERYTHING;
-@@ -849,8 +863,8 @@ g_arg_info_get_ownership_transfer (GIArgInfo *info)
- GIScopeType
- g_arg_info_get_scope (GIArgInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->scope;
- }
-@@ -858,8 +872,8 @@ g_arg_info_get_scope (GIArgInfo *info)
- gint
- g_arg_info_get_closure (GIArgInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->closure;
- }
-@@ -867,32 +881,57 @@ g_arg_info_get_closure (GIArgInfo *info)
- gint
- g_arg_info_get_destroy (GIArgInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->destroy;
- }
-
-+/**
-+ * g_arg_info_get_type:
-+ * @info: A #GIArgInfo
-+ *
-+ * Returns: (transfer full): Information about the type of argument @info
-+ */
- GITypeInfo *
- g_arg_info_get_type (GIArgInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-
-- return g_type_info_new (base, base->typelib, base->offset + G_STRUCT_OFFSET (ArgBlob, arg_type));
-+ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + G_STRUCT_OFFSET (ArgBlob, arg_type));
-+}
-+
-+/**
-+ * g_arg_info_load_type:
-+ * @info: A #GIArgInfo
-+ * @type: (out caller-allocates): Initialized with information about type of @info
-+ *
-+ * Get information about a the type of given argument @info; this
-+ * function is a variant of g_arg_info_get_type() designed for stack
-+ * allocation.
-+ *
-+ * The initialized @type must not be referenced after @info is deallocated.
-+ */
-+void
-+g_arg_info_load_type (GIArgInfo *info,
-+ GITypeInfo *type)
-+{
-+ GIRealInfo *rinfo = (GIRealInfo*) info;
-+ g_type_info_init (type, (GIBaseInfo*)info, rinfo->typelib, rinfo->offset + G_STRUCT_OFFSET (ArgBlob, arg_type));
- }
-
- /* GITypeInfo functions */
- gboolean
- g_type_info_is_pointer (GITypeInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (type->flags.reserved == 0 && type->flags.reserved2 == 0)
- return type->flags.pointer;
- else
- {
-- InterfaceTypeBlob *iface = (InterfaceTypeBlob *)&base->typelib->data[base->offset];
-+ InterfaceTypeBlob *iface = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return iface->pointer;
- }
-@@ -901,16 +940,16 @@ g_type_info_is_pointer (GITypeInfo *info)
- GITypeTag
- g_type_info_get_tag (GITypeInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- if (info->is_embedded)
-+ if (rinfo->type_is_embedded)
- return GI_TYPE_TAG_INTERFACE;
- else if (type->flags.reserved == 0 && type->flags.reserved2 == 0)
- return type->flags.tag;
- else
- {
-- InterfaceTypeBlob *iface = (InterfaceTypeBlob *)&base->typelib->data[base->offset];
-+ InterfaceTypeBlob *iface = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return iface->tag;
- }
-@@ -918,49 +957,58 @@ g_type_info_get_tag (GITypeInfo *info)
-
- GITypeInfo *
- g_type_info_get_param_type (GITypeInfo *info,
-- gint n)
-+ gint n)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
- {
-- ParamTypeBlob *param = (ParamTypeBlob *)&base->typelib->data[base->offset];
-+ ParamTypeBlob *param = (ParamTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- switch (param->tag)
-- {
-- case GI_TYPE_TAG_ARRAY:
-- case GI_TYPE_TAG_GLIST:
-- case GI_TYPE_TAG_GSLIST:
-- case GI_TYPE_TAG_GHASH:
-- return g_type_info_new (base, base->typelib,
-- base->offset + sizeof (ParamTypeBlob)
-- + sizeof (SimpleTypeBlob) * n);
-- break;
--
-- default: ;
-- }
-+ {
-+ case GI_TYPE_TAG_ARRAY:
-+ case GI_TYPE_TAG_GLIST:
-+ case GI_TYPE_TAG_GSLIST:
-+ case GI_TYPE_TAG_GHASH:
-+ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib,
-+ rinfo->offset + sizeof (ParamTypeBlob)
-+ + sizeof (SimpleTypeBlob) * n);
-+ break;
-+ default:
-+ break;
-+ }
- }
--
-+
- return NULL;
- }
-
-+/**
-+ * g_type_info_get_interface:
-+ * @info: A #GITypeInfo
-+ *
-+ * For types which have #GI_TYPE_TAG_INTERFACE such as GObjects and boxed values,
-+ * this function returns full information about the referenced type. You can then
-+ * inspect the type of the returned #GIBaseInfo to further query whether it is
-+ * a concrete GObject, a GInterface, a structure, etc. using g_base_info_get_type().
-+ */
- GIBaseInfo *
- g_type_info_get_interface (GITypeInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- if (info->is_embedded)
-- return (GIBaseInfo *) g_info_new (type->offset, base, base->typelib,
-- base->offset);
-+ if (rinfo->type_is_embedded)
-+ return (GIBaseInfo *) g_info_new (type->offset, (GIBaseInfo*)info, rinfo->typelib,
-+ rinfo->offset);
-
- if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
- {
-- InterfaceTypeBlob *blob = (InterfaceTypeBlob *)&base->typelib->data[base->offset];
-+ InterfaceTypeBlob *blob = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (blob->tag == GI_TYPE_TAG_INTERFACE)
-- return g_info_from_entry (base->repository, base->typelib, blob->interface);
-+ return g_info_from_entry (rinfo->repository, rinfo->typelib, blob->interface);
- }
-
- return NULL;
-@@ -969,12 +1017,12 @@ g_type_info_get_interface (GITypeInfo *info)
- gint
- g_type_info_get_array_length (GITypeInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
- {
-- ArrayTypeBlob *blob = (ArrayTypeBlob *)&base->typelib->data[base->offset];
-+ ArrayTypeBlob *blob = (ArrayTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (blob->tag == GI_TYPE_TAG_ARRAY)
- {
-@@ -989,12 +1037,12 @@ g_type_info_get_array_length (GITypeInfo *info)
- gint
- g_type_info_get_array_fixed_size (GITypeInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
- {
-- ArrayTypeBlob *blob = (ArrayTypeBlob *)&base->typelib->data[base->offset];
-+ ArrayTypeBlob *blob = (ArrayTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (blob->tag == GI_TYPE_TAG_ARRAY)
- {
-@@ -1009,12 +1057,12 @@ g_type_info_get_array_fixed_size (GITypeInfo *info)
- gboolean
- g_type_info_is_zero_terminated (GITypeInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
- {
-- ArrayTypeBlob *blob = (ArrayTypeBlob *)&base->typelib->data[base->offset];
-+ ArrayTypeBlob *blob = (ArrayTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (blob->tag == GI_TYPE_TAG_ARRAY)
- return blob->zero_terminated;
-@@ -1026,12 +1074,12 @@ g_type_info_is_zero_terminated (GITypeInfo *info)
- gint
- g_type_info_get_n_error_domains (GITypeInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
- {
-- ErrorTypeBlob *blob = (ErrorTypeBlob *)&base->typelib->data[base->offset];
-+ ErrorTypeBlob *blob = (ErrorTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (blob->tag == GI_TYPE_TAG_ERROR)
- return blob->n_domains;
-@@ -1042,19 +1090,19 @@ g_type_info_get_n_error_domains (GITypeInfo *info)
-
- GIErrorDomainInfo *
- g_type_info_get_error_domain (GITypeInfo *info,
-- gint n)
-+ gint n)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
- {
-- ErrorTypeBlob *blob = (ErrorTypeBlob *)&base->typelib->data[base->offset];
-+ ErrorTypeBlob *blob = (ErrorTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (blob->tag == GI_TYPE_TAG_ERROR)
-- return (GIErrorDomainInfo *) g_info_from_entry (base->repository,
-- base->typelib,
-- blob->domains[n]);
-+ return (GIErrorDomainInfo *) g_info_from_entry (rinfo->repository,
-+ rinfo->typelib,
-+ blob->domains[n]);
- }
-
- return NULL;
-@@ -1065,20 +1113,20 @@ g_type_info_get_error_domain (GITypeInfo *info,
- const gchar *
- g_error_domain_info_get_quark (GIErrorDomainInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ErrorDomainBlob *blob = (ErrorDomainBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ErrorDomainBlob *blob = (ErrorDomainBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return g_typelib_get_string (base->typelib, blob->get_quark);
-+ return g_typelib_get_string (rinfo->typelib, blob->get_quark);
- }
-
- GIInterfaceInfo *
- g_error_domain_info_get_codes (GIErrorDomainInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ErrorDomainBlob *blob = (ErrorDomainBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ErrorDomainBlob *blob = (ErrorDomainBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return (GIInterfaceInfo *) g_info_from_entry (base->repository,
-- base->typelib, blob->error_codes);
-+ return (GIInterfaceInfo *) g_info_from_entry (rinfo->repository,
-+ rinfo->typelib, blob->error_codes);
- }
-
-
-@@ -1086,8 +1134,8 @@ g_error_domain_info_get_codes (GIErrorDomainInfo *info)
- glong
- g_value_info_get_value (GIValueInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ValueBlob *blob = (ValueBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ValueBlob *blob = (ValueBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return (glong)blob->value;
- }
-@@ -1098,8 +1146,8 @@ g_field_info_get_flags (GIFieldInfo *info)
- {
- GIFieldInfoFlags flags;
-
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- FieldBlob *blob = (FieldBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset];
-
- flags = 0;
-
-@@ -1115,8 +1163,8 @@ g_field_info_get_flags (GIFieldInfo *info)
- gint
- g_field_info_get_size (GIFieldInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- FieldBlob *blob = (FieldBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->bits;
- }
-@@ -1124,8 +1172,8 @@ g_field_info_get_size (GIFieldInfo *info)
- gint
- g_field_info_get_offset (GIFieldInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- FieldBlob *blob = (FieldBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->struct_offset;
- }
-@@ -1133,33 +1181,33 @@ g_field_info_get_offset (GIFieldInfo *info)
- GITypeInfo *
- g_field_info_get_type (GIFieldInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- FieldBlob *blob = (FieldBlob *)&base->typelib->data[base->offset];
-- GITypeInfo *type_info;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset];
-+ GIRealInfo *type_info;
-
- if (blob->has_embedded_type)
- {
-- type_info = (GITypeInfo *) g_info_new (GI_INFO_TYPE_TYPE,
-- (GIBaseInfo*)info, base->typelib,
-- base->offset + header->field_blob_size);
-- type_info->is_embedded = TRUE;
-+ type_info = (GIRealInfo *) g_info_new (GI_INFO_TYPE_TYPE,
-+ (GIBaseInfo*)info, rinfo->typelib,
-+ rinfo->offset + header->field_blob_size);
-+ type_info->type_is_embedded = TRUE;
- }
- else
-- return g_type_info_new (base, base->typelib, base->offset + G_STRUCT_OFFSET (FieldBlob, type));
-+ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + G_STRUCT_OFFSET (FieldBlob, type));
-
-- return type_info;
-+ return (GIBaseInfo*)type_info;
- }
-
- /* GIRegisteredTypeInfo functions */
- const gchar *
- g_registered_type_info_get_type_name (GIRegisteredTypeInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- RegisteredTypeBlob *blob = (RegisteredTypeBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ RegisteredTypeBlob *blob = (RegisteredTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (blob->gtype_name)
-- return g_typelib_get_string (base->typelib, blob->gtype_name);
-+ return g_typelib_get_string (rinfo->typelib, blob->gtype_name);
-
- return NULL;
- }
-@@ -1167,11 +1215,11 @@ g_registered_type_info_get_type_name (GIRegisteredTypeInfo *info)
- const gchar *
- g_registered_type_info_get_type_init (GIRegisteredTypeInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- RegisteredTypeBlob *blob = (RegisteredTypeBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ RegisteredTypeBlob *blob = (RegisteredTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (blob->gtype_init)
-- return g_typelib_get_string (base->typelib, blob->gtype_init);
-+ return g_typelib_get_string (rinfo->typelib, blob->gtype_init);
-
- return NULL;
- }
-@@ -1181,6 +1229,7 @@ g_registered_type_info_get_g_type (GIRegisteredTypeInfo *info)
- {
- const char *type_init;
- GType (* get_type_func) (void);
-+ GIRealInfo *rinfo = (GIRealInfo*)info;
-
- type_init = g_registered_type_info_get_type_init (info);
-
-@@ -1190,7 +1239,7 @@ g_registered_type_info_get_g_type (GIRegisteredTypeInfo *info)
- return G_TYPE_OBJECT;
-
- get_type_func = NULL;
-- if (!g_typelib_symbol (((GIBaseInfo*)info)->typelib,
-+ if (!g_typelib_symbol (rinfo->typelib,
- type_init,
- (void**) &get_type_func))
- return G_TYPE_NONE;
-@@ -1202,8 +1251,8 @@ g_registered_type_info_get_g_type (GIRegisteredTypeInfo *info)
- gint
- g_struct_info_get_n_fields (GIStructInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_fields;
- }
-@@ -1212,15 +1261,15 @@ static gint32
- g_struct_get_field_offset (GIStructInfo *info,
- gint n)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- guint32 offset = base->offset + header->struct_blob_size;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ guint32 offset = rinfo->offset + header->struct_blob_size;
- gint i;
- FieldBlob *field_blob;
-
- for (i = 0; i < n; i++)
- {
-- field_blob = (FieldBlob *)&base->typelib->data[offset];
-+ field_blob = (FieldBlob *)&rinfo->typelib->data[offset];
- offset += header->field_blob_size;
- if (field_blob->has_embedded_type)
- offset += header->callback_blob_size;
-@@ -1231,19 +1280,19 @@ g_struct_get_field_offset (GIStructInfo *info,
-
- GIFieldInfo *
- g_struct_info_get_field (GIStructInfo *info,
-- gint n)
-+ gint n)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-
-- return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, base, base->typelib,
-- g_struct_get_field_offset (info, n));
-+ return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib,
-+ g_struct_get_field_offset (info, n));
- }
-
- gint
- g_struct_info_get_n_methods (GIStructInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_methods;
- }
-@@ -1252,35 +1301,35 @@ GIFunctionInfo *
- g_struct_info_get_method (GIStructInfo *info,
- gint n)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset];
-- Header *header = (Header *)base->typelib->data;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset];
-+ Header *header = (Header *)rinfo->typelib->data;
- gint offset;
-
-- offset = g_struct_get_field_offset (info, blob->n_fields)
-- + n * header->function_blob_size;
-- return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base,
-- base->typelib, offset);
-+ offset = g_struct_get_field_offset (info, blob->n_fields) + n * header->function_blob_size;
-+ return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info,
-+ rinfo->typelib, offset);
- }
-
- static GIFunctionInfo *
- find_method (GIBaseInfo *base,
-- guint32 offset,
-- gint n_methods,
-- const gchar *name)
-+ guint32 offset,
-+ gint n_methods,
-+ const gchar *name)
- {
- /* FIXME hash */
-- Header *header = (Header *)base->typelib->data;
-+ GIRealInfo *rinfo = (GIRealInfo*)base;
-+ Header *header = (Header *)rinfo->typelib->data;
- gint i;
-
- for (i = 0; i < n_methods; i++)
- {
-- FunctionBlob *fblob = (FunctionBlob *)&base->typelib->data[offset];
-- const gchar *fname = (const gchar *)&base->typelib->data[fblob->name];
-+ FunctionBlob *fblob = (FunctionBlob *)&rinfo->typelib->data[offset];
-+ const gchar *fname = (const gchar *)&rinfo->typelib->data[fblob->name];
-
- if (strcmp (name, fname) == 0)
-- return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base,
-- base->typelib, offset);
-+ return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base,
-+ rinfo->typelib, offset);
-
- offset += header->function_blob_size;
- }
-@@ -1293,21 +1342,21 @@ g_struct_info_find_method (GIStructInfo *info,
- const gchar *name)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->struct_blob_size
-+ offset = rinfo->offset + header->struct_blob_size
- + blob->n_fields * header->field_blob_size;
-
-- return find_method (base, offset, blob->n_methods, name);
-+ return find_method ((GIBaseInfo*)info, offset, blob->n_methods, name);
- }
-
- gsize
- g_struct_info_get_size (GIStructInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->size;
- }
-@@ -1315,8 +1364,8 @@ g_struct_info_get_size (GIStructInfo *info)
- gsize
- g_struct_info_get_alignment (GIStructInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->alignment;
- }
-@@ -1334,8 +1383,8 @@ g_struct_info_get_alignment (GIStructInfo *info)
- gboolean
- g_struct_info_is_gtype_struct (GIStructInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->is_gtype_struct;
- }
-@@ -1343,8 +1392,8 @@ g_struct_info_is_gtype_struct (GIStructInfo *info)
- gint
- g_enum_info_get_n_values (GIEnumInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- EnumBlob *blob = (EnumBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ EnumBlob *blob = (EnumBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_values;
- }
-@@ -1353,13 +1402,13 @@ GIValueInfo *
- g_enum_info_get_value (GIEnumInfo *info,
- gint n)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
- gint offset;
-
-- offset = base->offset + header->enum_blob_size
-+ offset = rinfo->offset + header->enum_blob_size
- + n * header->value_blob_size;
-- return (GIValueInfo *) g_info_new (GI_INFO_TYPE_VALUE, base, base->typelib, offset);
-+ return (GIValueInfo *) g_info_new (GI_INFO_TYPE_VALUE, (GIBaseInfo*)info, rinfo->typelib, offset);
- }
-
- /**
-@@ -1378,8 +1427,8 @@ g_enum_info_get_value (GIEnumInfo *info,
- GITypeTag
- g_enum_info_get_storage_type (GIEnumInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- EnumBlob *blob = (EnumBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ EnumBlob *blob = (EnumBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->storage_type;
- }
-@@ -1388,12 +1437,12 @@ g_enum_info_get_storage_type (GIEnumInfo *info)
- GIObjectInfo *
- g_object_info_get_parent (GIObjectInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (blob->parent)
-- return (GIObjectInfo *) g_info_from_entry (base->repository,
-- base->typelib, blob->parent);
-+ return (GIObjectInfo *) g_info_from_entry (rinfo->repository,
-+ rinfo->typelib, blob->parent);
- else
- return NULL;
- }
-@@ -1401,34 +1450,34 @@ g_object_info_get_parent (GIObjectInfo *info)
- gboolean
- g_object_info_get_abstract (GIObjectInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
- return blob->abstract != 0;
- }
-
- const gchar *
- g_object_info_get_type_name (GIObjectInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return g_typelib_get_string (base->typelib, blob->gtype_name);
-+ return g_typelib_get_string (rinfo->typelib, blob->gtype_name);
- }
-
- const gchar *
- g_object_info_get_type_init (GIObjectInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return g_typelib_get_string (base->typelib, blob->gtype_init);
-+ return g_typelib_get_string (rinfo->typelib, blob->gtype_init);
- }
-
- gint
- g_object_info_get_n_interfaces (GIObjectInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_interfaces;
- }
-@@ -1437,18 +1486,18 @@ GIInterfaceInfo *
- g_object_info_get_interface (GIObjectInfo *info,
- gint n)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return (GIInterfaceInfo *) g_info_from_entry (base->repository,
-- base->typelib, blob->interfaces[n]);
-+ return (GIInterfaceInfo *) g_info_from_entry (rinfo->repository,
-+ rinfo->typelib, blob->interfaces[n]);
- }
-
- gint
- g_object_info_get_n_fields (GIObjectInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_fields;
- }
-@@ -1458,22 +1507,22 @@ g_object_info_get_field (GIObjectInfo *info,
- gint n)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->object_blob_size
-+ offset = rinfo->offset + header->object_blob_size
- + (blob->n_interfaces + blob->n_interfaces % 2) * 2
- + n * header->field_blob_size;
-
-- return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, base, base->typelib, offset);
-+ return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, offset);
- }
-
- gint
- g_object_info_get_n_properties (GIObjectInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_properties;
- }
-@@ -1483,24 +1532,24 @@ g_object_info_get_property (GIObjectInfo *info,
- gint n)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->object_blob_size
-+ offset = rinfo->offset + header->object_blob_size
- + (blob->n_interfaces + blob->n_interfaces % 2) * 2
- + blob->n_fields * header->field_blob_size
- + n * header->property_blob_size;
-
-- return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, base,
-- base->typelib, offset);
-+ return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, (GIBaseInfo*)info,
-+ rinfo->typelib, offset);
- }
-
- gint
- g_object_info_get_n_methods (GIObjectInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_methods;
- }
-@@ -1510,18 +1559,18 @@ g_object_info_get_method (GIObjectInfo *info,
- gint n)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->object_blob_size
-+ offset = rinfo->offset + header->object_blob_size
- + (blob->n_interfaces + blob->n_interfaces % 2) * 2
- + blob->n_fields * header->field_blob_size
- + blob->n_properties * header->property_blob_size
- + n * header->function_blob_size;
-
-- return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base,
-- base->typelib, offset);
-+ return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info,
-+ rinfo->typelib, offset);
- }
-
- GIFunctionInfo *
-@@ -1529,23 +1578,23 @@ g_object_info_find_method (GIObjectInfo *info,
- const gchar *name)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->object_blob_size
-+ offset = rinfo->offset + header->object_blob_size
- + (blob->n_interfaces + blob->n_interfaces % 2) * 2
- + blob->n_fields * header->field_blob_size +
- + blob->n_properties * header->property_blob_size;
-
-- return find_method (base, offset, blob->n_methods, name);
-+ return find_method ((GIBaseInfo*)info, offset, blob->n_methods, name);
- }
-
- gint
- g_object_info_get_n_signals (GIObjectInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_signals;
- }
-@@ -1555,26 +1604,26 @@ g_object_info_get_signal (GIObjectInfo *info,
- gint n)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->object_blob_size
-+ offset = rinfo->offset + header->object_blob_size
- + (blob->n_interfaces + blob->n_interfaces % 2) * 2
- + blob->n_fields * header->field_blob_size
- + blob->n_properties * header->property_blob_size
- + blob->n_methods * header->function_blob_size
- + n * header->signal_blob_size;
-
-- return (GISignalInfo *) g_info_new (GI_INFO_TYPE_SIGNAL, base,
-- base->typelib, offset);
-+ return (GISignalInfo *) g_info_new (GI_INFO_TYPE_SIGNAL, (GIBaseInfo*)info,
-+ rinfo->typelib, offset);
- }
-
- gint
- g_object_info_get_n_vfuncs (GIObjectInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_vfuncs;
- }
-@@ -1584,11 +1633,11 @@ g_object_info_get_vfunc (GIObjectInfo *info,
- gint n)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->object_blob_size
-+ offset = rinfo->offset + header->object_blob_size
- + (blob->n_interfaces + blob->n_interfaces % 2) * 2
- + blob->n_fields * header->field_blob_size
- + blob->n_properties * header->property_blob_size
-@@ -1596,28 +1645,28 @@ g_object_info_get_vfunc (GIObjectInfo *info,
- + blob->n_signals * header->signal_blob_size
- + n * header->vfunc_blob_size;
-
-- return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, base,
-- base->typelib, offset);
-+ return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*)info,
-+ rinfo->typelib, offset);
- }
-
- static GIVFuncInfo *
--find_vfunc (GIBaseInfo *base,
-+find_vfunc (GIRealInfo *rinfo,
- guint32 offset,
- gint n_vfuncs,
- const gchar *name)
- {
- /* FIXME hash */
-- Header *header = (Header *)base->typelib->data;
-+ Header *header = (Header *)rinfo->typelib->data;
- gint i;
-
- for (i = 0; i < n_vfuncs; i++)
- {
-- VFuncBlob *fblob = (VFuncBlob *)&base->typelib->data[offset];
-- const gchar *fname = (const gchar *)&base->typelib->data[fblob->name];
-+ VFuncBlob *fblob = (VFuncBlob *)&rinfo->typelib->data[offset];
-+ const gchar *fname = (const gchar *)&rinfo->typelib->data[fblob->name];
-
- if (strcmp (name, fname) == 0)
-- return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, base,
-- base->typelib, offset);
-+ return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*) rinfo,
-+ rinfo->typelib, offset);
-
- offset += header->vfunc_blob_size;
- }
-@@ -1643,25 +1692,25 @@ g_object_info_find_vfunc (GIObjectInfo *info,
- const gchar *name)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->object_blob_size
-+ offset = rinfo->offset + header->object_blob_size
- + (blob->n_interfaces + blob->n_interfaces % 2) * 2
- + blob->n_fields * header->field_blob_size
- + blob->n_properties * header->property_blob_size
- + blob->n_methods * header->function_blob_size
- + blob->n_signals * header->signal_blob_size;
-
-- return find_vfunc (base, offset, blob->n_vfuncs, name);
-+ return find_vfunc (rinfo, offset, blob->n_vfuncs, name);
- }
-
- gint
- g_object_info_get_n_constants (GIObjectInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_constants;
- }
-@@ -1671,11 +1720,11 @@ g_object_info_get_constant (GIObjectInfo *info,
- gint n)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->object_blob_size
-+ offset = rinfo->offset + header->object_blob_size
- + (blob->n_interfaces + blob->n_interfaces % 2) * 2
- + blob->n_fields * header->field_blob_size
- + blob->n_properties * header->property_blob_size
-@@ -1684,8 +1733,8 @@ g_object_info_get_constant (GIObjectInfo *info,
- + blob->n_vfuncs * header->vfunc_blob_size
- + n * header->constant_blob_size;
-
-- return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, base,
-- base->typelib, offset);
-+ return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info,
-+ rinfo->typelib, offset);
- }
-
- /**
-@@ -1700,12 +1749,12 @@ g_object_info_get_constant (GIObjectInfo *info,
- GIStructInfo *
- g_object_info_get_class_struct (GIObjectInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (blob->gtype_struct)
-- return (GIStructInfo *) g_info_from_entry (base->repository,
-- base->typelib, blob->gtype_struct);
-+ return (GIStructInfo *) g_info_from_entry (rinfo->repository,
-+ rinfo->typelib, blob->gtype_struct);
- else
- return NULL;
- }
-@@ -1714,8 +1763,8 @@ g_object_info_get_class_struct (GIObjectInfo *info)
- gint
- g_interface_info_get_n_prerequisites (GIInterfaceInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_prerequisites;
- }
-@@ -1724,19 +1773,19 @@ GIBaseInfo *
- g_interface_info_get_prerequisite (GIInterfaceInfo *info,
- gint n)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- return g_info_from_entry (base->repository,
-- base->typelib, blob->prerequisites[n]);
-+ return g_info_from_entry (rinfo->repository,
-+ rinfo->typelib, blob->prerequisites[n]);
- }
-
-
- gint
- g_interface_info_get_n_properties (GIInterfaceInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_properties;
- }
-@@ -1746,23 +1795,23 @@ g_interface_info_get_property (GIInterfaceInfo *info,
- gint n)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->interface_blob_size
-+ offset = rinfo->offset + header->interface_blob_size
- + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2
- + n * header->property_blob_size;
-
-- return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, base,
-- base->typelib, offset);
-+ return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, (GIBaseInfo*)info,
-+ rinfo->typelib, offset);
- }
-
- gint
- g_interface_info_get_n_methods (GIInterfaceInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_methods;
- }
-@@ -1772,17 +1821,17 @@ g_interface_info_get_method (GIInterfaceInfo *info,
- gint n)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->interface_blob_size
-+ offset = rinfo->offset + header->interface_blob_size
- + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2
- + blob->n_properties * header->property_blob_size
- + n * header->function_blob_size;
-
-- return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base,
-- base->typelib, offset);
-+ return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info,
-+ rinfo->typelib, offset);
- }
-
- GIFunctionInfo *
-@@ -1790,22 +1839,22 @@ g_interface_info_find_method (GIInterfaceInfo *info,
- const gchar *name)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->interface_blob_size
-+ offset = rinfo->offset + header->interface_blob_size
- + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2
- + blob->n_properties * header->property_blob_size;
-
-- return find_method (base, offset, blob->n_methods, name);
-+ return find_method ((GIBaseInfo*)info, offset, blob->n_methods, name);
- }
-
- gint
- g_interface_info_get_n_signals (GIInterfaceInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_signals;
- }
-@@ -1815,25 +1864,25 @@ g_interface_info_get_signal (GIInterfaceInfo *info,
- gint n)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->interface_blob_size
-+ offset = rinfo->offset + header->interface_blob_size
- + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2
- + blob->n_properties * header->property_blob_size
- + blob->n_methods * header->function_blob_size
- + n * header->signal_blob_size;
-
-- return (GISignalInfo *) g_info_new (GI_INFO_TYPE_SIGNAL, base,
-- base->typelib, offset);
-+ return (GISignalInfo *) g_info_new (GI_INFO_TYPE_SIGNAL, (GIBaseInfo*)info,
-+ rinfo->typelib, offset);
- }
-
- gint
- g_interface_info_get_n_vfuncs (GIInterfaceInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_vfuncs;
- }
-@@ -1843,19 +1892,19 @@ g_interface_info_get_vfunc (GIInterfaceInfo *info,
- gint n)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->interface_blob_size
-+ offset = rinfo->offset + header->interface_blob_size
- + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2
- + blob->n_properties * header->property_blob_size
- + blob->n_methods * header->function_blob_size
- + blob->n_signals * header->signal_blob_size
- + n * header->vfunc_blob_size;
-
-- return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, base,
-- base->typelib, offset);
-+ return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*)info,
-+ rinfo->typelib, offset);
- }
-
- /**
-@@ -1873,24 +1922,24 @@ g_interface_info_find_vfunc (GIInterfaceInfo *info,
- const gchar *name)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->interface_blob_size
-+ offset = rinfo->offset + header->interface_blob_size
- + (blob->n_prerequisites + blob->n_prerequisites % 2) * 2
- + blob->n_properties * header->property_blob_size
- + blob->n_methods * header->function_blob_size
- + blob->n_signals * header->signal_blob_size;
-
-- return find_vfunc (base, offset, blob->n_vfuncs, name);
-+ return find_vfunc (rinfo, offset, blob->n_vfuncs, name);
- }
-
- gint
- g_interface_info_get_n_constants (GIInterfaceInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_constants;
- }
-@@ -1900,11 +1949,11 @@ g_interface_info_get_constant (GIInterfaceInfo *info,
- gint n)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->interface_blob_size
-+ offset = rinfo->offset + header->interface_blob_size
- + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2
- + blob->n_properties * header->property_blob_size
- + blob->n_methods * header->function_blob_size
-@@ -1912,8 +1961,8 @@ g_interface_info_get_constant (GIInterfaceInfo *info,
- + blob->n_vfuncs * header->vfunc_blob_size
- + n * header->constant_blob_size;
-
-- return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, base,
-- base->typelib, offset);
-+ return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info,
-+ rinfo->typelib, offset);
- }
-
- /**
-@@ -1927,12 +1976,12 @@ g_interface_info_get_constant (GIInterfaceInfo *info,
- GIStructInfo *
- g_interface_info_get_iface_struct (GIInterfaceInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (blob->gtype_struct)
-- return (GIStructInfo *) g_info_from_entry (base->repository,
-- base->typelib, blob->gtype_struct);
-+ return (GIStructInfo *) g_info_from_entry (rinfo->repository,
-+ rinfo->typelib, blob->gtype_struct);
- else
- return NULL;
- }
-@@ -1942,8 +1991,8 @@ GParamFlags
- g_property_info_get_flags (GIPropertyInfo *info)
- {
- GParamFlags flags;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- PropertyBlob *blob = (PropertyBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ PropertyBlob *blob = (PropertyBlob *)&rinfo->typelib->data[rinfo->offset];
-
- flags = 0;
-
-@@ -1965,9 +2014,9 @@ g_property_info_get_flags (GIPropertyInfo *info)
- GITypeInfo *
- g_property_info_get_type (GIPropertyInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-
-- return g_type_info_new (base, base->typelib, base->offset + G_STRUCT_OFFSET (PropertyBlob, type));
-+ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + G_STRUCT_OFFSET (PropertyBlob, type));
- }
-
-
-@@ -1977,8 +2026,8 @@ g_signal_info_get_flags (GISignalInfo *info)
- {
- GSignalFlags flags;
-
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- SignalBlob *blob = (SignalBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset];
-
- flags = 0;
-
-@@ -2009,11 +2058,11 @@ g_signal_info_get_flags (GISignalInfo *info)
- GIVFuncInfo *
- g_signal_info_get_class_closure (GISignalInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- SignalBlob *blob = (SignalBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (blob->has_class_closure)
-- return g_interface_info_get_vfunc ((GIInterfaceInfo *)base->container, blob->class_closure);
-+ return g_interface_info_get_vfunc ((GIInterfaceInfo *)rinfo->container, blob->class_closure);
-
- return NULL;
- }
-@@ -2021,8 +2070,8 @@ g_signal_info_get_class_closure (GISignalInfo *info)
- gboolean
- g_signal_info_true_stops_emit (GISignalInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- SignalBlob *blob = (SignalBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->true_stops_emit;
- }
-@@ -2033,8 +2082,8 @@ g_vfunc_info_get_flags (GIVFuncInfo *info)
- {
- GIVFuncInfoFlags flags;
-
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- VFuncBlob *blob = (VFuncBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset];
-
- flags = 0;
-
-@@ -2053,8 +2102,8 @@ g_vfunc_info_get_flags (GIVFuncInfo *info)
- gint
- g_vfunc_info_get_offset (GIVFuncInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- VFuncBlob *blob = (VFuncBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->struct_offset;
- }
-@@ -2062,11 +2111,11 @@ g_vfunc_info_get_offset (GIVFuncInfo *info)
- GISignalInfo *
- g_vfunc_info_get_signal (GIVFuncInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- VFuncBlob *blob = (VFuncBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (blob->class_closure)
-- return g_interface_info_get_signal ((GIInterfaceInfo *)base->container, blob->signal);
-+ return g_interface_info_get_signal ((GIInterfaceInfo *)rinfo->container, blob->signal);
-
- return NULL;
- }
-@@ -2085,9 +2134,9 @@ g_vfunc_info_get_signal (GIVFuncInfo *info)
- GIFunctionInfo *
- g_vfunc_info_get_invoker (GIVFuncInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- VFuncBlob *blob = (VFuncBlob *)&base->typelib->data[base->offset];
-- GIBaseInfo *container = base->container;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset];
-+ GIBaseInfo *container = rinfo->container;
- GIInfoType parent_type;
-
- /* 1023 = 0x3ff is the maximum of the 10 bits for invoker index */
-@@ -2107,80 +2156,80 @@ g_vfunc_info_get_invoker (GIVFuncInfo *info)
- GITypeInfo *
- g_constant_info_get_type (GIConstantInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-
-- return g_type_info_new (base, base->typelib, base->offset + 8);
-+ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + 8);
- }
-
- gint
- g_constant_info_get_value (GIConstantInfo *info,
- GArgument *value)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- ConstantBlob *blob = (ConstantBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ ConstantBlob *blob = (ConstantBlob *)&rinfo->typelib->data[rinfo->offset];
-
- /* FIXME non-basic types ? */
- if (blob->type.flags.reserved == 0 && blob->type.flags.reserved2 == 0)
- {
- if (blob->type.flags.pointer)
-- value->v_pointer = g_memdup (&base->typelib->data[blob->offset], blob->size);
-+ value->v_pointer = g_memdup (&rinfo->typelib->data[blob->offset], blob->size);
- else
- {
- switch (blob->type.flags.tag)
- {
- case GI_TYPE_TAG_BOOLEAN:
-- value->v_boolean = *(gboolean*)&base->typelib->data[blob->offset];
-+ value->v_boolean = *(gboolean*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_INT8:
-- value->v_int8 = *(gint8*)&base->typelib->data[blob->offset];
-+ value->v_int8 = *(gint8*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_UINT8:
-- value->v_uint8 = *(guint8*)&base->typelib->data[blob->offset];
-+ value->v_uint8 = *(guint8*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_INT16:
-- value->v_int16 = *(gint16*)&base->typelib->data[blob->offset];
-+ value->v_int16 = *(gint16*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_UINT16:
-- value->v_uint16 = *(guint16*)&base->typelib->data[blob->offset];
-+ value->v_uint16 = *(guint16*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_INT32:
-- value->v_int32 = *(gint32*)&base->typelib->data[blob->offset];
-+ value->v_int32 = *(gint32*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_UINT32:
-- value->v_uint32 = *(guint32*)&base->typelib->data[blob->offset];
-+ value->v_uint32 = *(guint32*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_INT64:
-- value->v_int64 = *(gint64*)&base->typelib->data[blob->offset];
-+ value->v_int64 = *(gint64*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_UINT64:
-- value->v_uint64 = *(guint64*)&base->typelib->data[blob->offset];
-+ value->v_uint64 = *(guint64*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_FLOAT:
-- value->v_float = *(gfloat*)&base->typelib->data[blob->offset];
-+ value->v_float = *(gfloat*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_DOUBLE:
-- value->v_double = *(gdouble*)&base->typelib->data[blob->offset];
-+ value->v_double = *(gdouble*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_TIME_T:
-- value->v_long = *(long*)&base->typelib->data[blob->offset];
-+ value->v_long = *(long*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_SHORT:
-- value->v_short = *(gshort*)&base->typelib->data[blob->offset];
-+ value->v_short = *(gshort*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_USHORT:
-- value->v_ushort = *(gushort*)&base->typelib->data[blob->offset];
-+ value->v_ushort = *(gushort*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_INT:
-- value->v_int = *(gint*)&base->typelib->data[blob->offset];
-+ value->v_int = *(gint*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_UINT:
-- value->v_uint = *(guint*)&base->typelib->data[blob->offset];
-+ value->v_uint = *(guint*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_LONG:
-- value->v_long = *(glong*)&base->typelib->data[blob->offset];
-+ value->v_long = *(glong*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_ULONG:
-- value->v_ulong = *(gulong*)&base->typelib->data[blob->offset];
-+ value->v_ulong = *(gulong*)&rinfo->typelib->data[blob->offset];
- break;
- }
- }
-@@ -2193,8 +2242,8 @@ g_constant_info_get_value (GIConstantInfo *info,
- gint
- g_union_info_get_n_fields (GIUnionInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_fields;
- }
-@@ -2203,19 +2252,19 @@ GIFieldInfo *
- g_union_info_get_field (GIUnionInfo *info,
- gint n)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-
-- return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, base, base->typelib,
-- base->offset + header->union_blob_size +
-+ return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib,
-+ rinfo->offset + header->union_blob_size +
- n * header->field_blob_size);
- }
-
- gint
- g_union_info_get_n_methods (GIUnionInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->n_functions;
- }
-@@ -2224,23 +2273,23 @@ GIFunctionInfo *
- g_union_info_get_method (GIUnionInfo *info,
- gint n)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-- Header *header = (Header *)base->typelib->data;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
-+ Header *header = (Header *)rinfo->typelib->data;
- gint offset;
-
-- offset = base->offset + header->union_blob_size
-+ offset = rinfo->offset + header->union_blob_size
- + blob->n_fields * header->field_blob_size
- + n * header->function_blob_size;
-- return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base,
-- base->typelib, offset);
-+ return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info,
-+ rinfo->typelib, offset);
- }
-
- gboolean
- g_union_info_is_discriminated (GIUnionInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->discriminated;
- }
-@@ -2248,8 +2297,8 @@ g_union_info_is_discriminated (GIUnionInfo *info)
- gint
- g_union_info_get_discriminator_offset (GIUnionInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->discriminator_offset;
- }
-@@ -2257,30 +2306,30 @@ g_union_info_get_discriminator_offset (GIUnionInfo *info)
- GITypeInfo *
- g_union_info_get_discriminator_type (GIUnionInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-
-- return g_type_info_new (base, base->typelib, base->offset + 24);
-+ return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + 24);
- }
-
- GIConstantInfo *
- g_union_info_get_discriminator (GIUnionInfo *info,
- gint n)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
-
- if (blob->discriminated)
- {
-- Header *header = (Header *)base->typelib->data;
-+ Header *header = (Header *)rinfo->typelib->data;
- gint offset;
-
-- offset = base->offset + header->union_blob_size
-+ offset = rinfo->offset + header->union_blob_size
- + blob->n_fields * header->field_blob_size
- + blob->n_functions * header->function_blob_size
- + n * header->constant_blob_size;
-
-- return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, base,
-- base->typelib, offset);
-+ return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info,
-+ rinfo->typelib, offset);
- }
-
- return NULL;
-@@ -2291,21 +2340,21 @@ g_union_info_find_method (GIUnionInfo *info,
- const gchar *name)
- {
- gint offset;
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- Header *header = (Header *)base->typelib->data;
-- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ Header *header = (Header *)rinfo->typelib->data;
-+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
-
-- offset = base->offset + header->union_blob_size
-+ offset = rinfo->offset + header->union_blob_size
- + blob->n_fields * header->field_blob_size;
-
-- return find_method (base, offset, blob->n_functions, name);
-+ return find_method ((GIBaseInfo*)info, offset, blob->n_functions, name);
- }
-
- gsize
- g_union_info_get_size (GIUnionInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->size;
- }
-@@ -2313,8 +2362,8 @@ g_union_info_get_size (GIUnionInfo *info)
- gsize
- g_union_info_get_alignment (GIUnionInfo *info)
- {
-- GIBaseInfo *base = (GIBaseInfo *)info;
-- UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-+ GIRealInfo *rinfo = (GIRealInfo *)info;
-+ UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
-
- return blob->alignment;
- }
-diff --git a/girepository/girepository.h b/girepository/girepository.h
-index c30418a..93cf126 100644
---- girepository/girepository.h
-+++ girepository/girepository.h
-@@ -27,37 +27,55 @@
-
- G_BEGIN_DECLS
-
--#define G_TYPE_IREPOSITORY (g_irepository_get_type ())
--#define G_IREPOSITORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_IREPOSITORY, GIRepository))
-+#define G_TYPE_IREPOSITORY (g_irepository_get_type ())
-+#define G_IREPOSITORY(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_IREPOSITORY, GIRepository))
-+#define G_IREPOSITORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), G_TYPE_IREPOSITORY, GIRepositoryClass))
-+#define G_IS_IREPOSITORY(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_IREPOSITORY))
-+#define G_IS_IREPOSITORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), G_TYPE_IREPOSITORY))
-+#define G_IREPOSITORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), G_TYPE_IREPOSITORY, GIRepositoryClass))
-
- typedef struct _GIRepository GIRepository;
- typedef struct _GIRepositoryClass GIRepositoryClass;
- typedef struct _GIRepositoryPrivate GIRepositoryPrivate;
--typedef struct _GIBaseInfo GIBaseInfo;
--typedef struct _GICallableInfo GICallableInfo;
--typedef struct _GIFunctionInfo GIFunctionInfo;
--typedef struct _GICallbackInfo GICallbackInfo;
--typedef struct _GIRegisteredTypeInfo GIRegisteredTypeInfo;
--typedef struct _GIStructInfo GIStructInfo;
--typedef struct _GIUnionInfo GIUnionInfo;
--typedef struct _GIEnumInfo GIEnumInfo;
--typedef struct _GIObjectInfo GIObjectInfo;
--typedef struct _GIInterfaceInfo GIInterfaceInfo;
--typedef struct _GIConstantInfo GIConstantInfo;
--typedef struct _GIValueInfo GIValueInfo;
--typedef struct _GISignalInfo GISignalInfo;
--typedef struct _GIVFuncInfo GIVFuncInfo;
--typedef struct _GIPropertyInfo GIPropertyInfo;
--typedef struct _GIFieldInfo GIFieldInfo;
--typedef struct _GIArgInfo GIArgInfo;
--typedef struct _GITypeInfo GITypeInfo;
--typedef struct _GIErrorDomainInfo GIErrorDomainInfo;
-+
-+typedef struct _GIBaseInfoStub GIBaseInfo;
-+
-+struct _GIBaseInfoStub {
-+ gint32 dummy1;
-+ gint32 dummy2;
-+ gpointer dummy3;
-+ gpointer dummy4;
-+ gpointer dummy5;
-+ guint32 dummy6;
-+ guint32 dummy7;
-+ gpointer padding[4];
-+};
-+
-+typedef GIBaseInfo GICallableInfo;
-+typedef GIBaseInfo GIFunctionInfo;
-+typedef GIBaseInfo GICallbackInfo;
-+typedef GIBaseInfo GIRegisteredTypeInfo;
-+typedef GIBaseInfo GIStructInfo;
-+typedef GIBaseInfo GIUnionInfo;
-+typedef GIBaseInfo GIEnumInfo;
-+typedef GIBaseInfo GIObjectInfo;
-+typedef GIBaseInfo GIInterfaceInfo;
-+typedef GIBaseInfo GIConstantInfo;
-+typedef GIBaseInfo GIValueInfo;
-+typedef GIBaseInfo GISignalInfo;
-+typedef GIBaseInfo GIVFuncInfo;
-+typedef GIBaseInfo GIPropertyInfo;
-+typedef GIBaseInfo GIFieldInfo;
-+typedef GIBaseInfo GIArgInfo;
-+typedef GIBaseInfo GITypeInfo;
-+typedef GIBaseInfo GIErrorDomainInfo;
-+
- typedef struct _GIUnresolvedInfo GIUnresolvedInfo;
- typedef struct _GTypelib GTypelib;
-
- struct _GIRepository
- {
-- GObject parent;
-+ GObject parent;
-
- /*< private >*/
- GIRepositoryPrivate *priv;
-@@ -282,11 +300,16 @@ typedef enum {
- } GITransfer;
-
- GITypeInfo * g_callable_info_get_return_type (GICallableInfo *info);
-+void g_callable_info_load_return_type (GICallableInfo *info,
-+ GITypeInfo *type);
- GITransfer g_callable_info_get_caller_owns (GICallableInfo *info);
- gboolean g_callable_info_may_return_null (GICallableInfo *info);
- gint g_callable_info_get_n_args (GICallableInfo *info);
- GIArgInfo * g_callable_info_get_arg (GICallableInfo *info,
-- gint n);
-+ gint n);
-+void g_callable_info_load_arg (GICallableInfo *info,
-+ gint n,
-+ GIArgInfo *arg);
-
- /* GIArgInfo */
-
-@@ -317,6 +340,8 @@ GIScopeType g_arg_info_get_scope (GIArgInfo *info);
- gint g_arg_info_get_closure (GIArgInfo *info);
- gint g_arg_info_get_destroy (GIArgInfo *info);
- GITypeInfo * g_arg_info_get_type (GIArgInfo *info);
-+void g_arg_info_load_type (GIArgInfo *info,
-+ GITypeInfo *type);
-
-
- /* GITypeInfo */
---
-cgit v0.8.3.1
diff --git a/devel/gobject-introspection/files/patch-20100107 b/devel/gobject-introspection/files/patch-20100107
deleted file mode 100644
index 570d2c7c7591..000000000000
--- a/devel/gobject-introspection/files/patch-20100107
+++ /dev/null
@@ -1,66 +0,0 @@
-From e7b9f873f0152136af60753598077156e7ae1545 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 07 Jan 2010 21:12:15 +0000
-Subject: Correctly cast to a CommonBlob when looking up embedded types
-
-When looking at an embedded type (e.g. a Callback after a Field), the
-offset we put in the info structure was to the CallbackBlob itself.
-
-However the code in g_type_info_get_interface assumed that the offset
-was to a SimpleTypeBlob, which it wasn't.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=606180
----
-diff --git a/girepository/ginfo.c b/girepository/ginfo.c
-index b11cc8f..ed2fc93 100644
---- girepository/ginfo.c
-+++ girepository/ginfo.c
-@@ -997,18 +997,38 @@ GIBaseInfo *
- g_type_info_get_interface (GITypeInfo *info)
- {
- GIRealInfo *rinfo = (GIRealInfo *)info;
-- SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-
-+ /* For embedded types, the given offset is a pointer to the actual blob,
-+ * after the end of the field. In that case we know it's a "subclass" of
-+ * CommonBlob, so use that to determine the info type.
-+ */
- if (rinfo->type_is_embedded)
-- return (GIBaseInfo *) g_info_new (type->offset, (GIBaseInfo*)info, rinfo->typelib,
-- rinfo->offset);
-+ {
-+ CommonBlob *common = (CommonBlob *)&rinfo->typelib->data[rinfo->offset];
-+ GIInfoType info_type;
-
-- if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
-+ switch (common->blob_type)
-+ {
-+ case BLOB_TYPE_CALLBACK:
-+ info_type = GI_INFO_TYPE_CALLBACK;
-+ break;
-+ default:
-+ g_assert_not_reached ();
-+ return NULL;
-+ }
-+ return (GIBaseInfo *) g_info_new (info_type, (GIBaseInfo*)info, rinfo->typelib,
-+ rinfo->offset);
-+ }
-+ else
- {
-- InterfaceTypeBlob *blob = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset];
--
-- if (blob->tag == GI_TYPE_TAG_INTERFACE)
-- return g_info_from_entry (rinfo->repository, rinfo->typelib, blob->interface);
-+ SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-+ if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
-+ {
-+ InterfaceTypeBlob *blob = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-+
-+ if (blob->tag == GI_TYPE_TAG_INTERFACE)
-+ return g_info_from_entry (rinfo->repository, rinfo->typelib, blob->interface);
-+ }
- }
-
- return NULL;
---
-cgit v0.8.3.1
diff --git a/devel/gobject-introspection/files/patch-gir_Makefile.in b/devel/gobject-introspection/files/patch-gir_Makefile.in
index cf8ce2b3d94f..9e9ef5b8c9bd 100644
--- a/devel/gobject-introspection/files/patch-gir_Makefile.in
+++ b/devel/gobject-introspection/files/patch-gir_Makefile.in
@@ -1,11 +1,12 @@
---- gir/Makefile.in.orig 2009-12-18 18:25:43.000000000 +0100
-+++ gir/Makefile.in 2009-12-18 18:25:54.000000000 +0100
-@@ -359,13 +359,12 @@ GLib_2_0_gir_SCANNERFLAGS = --noclosure
+--- gir/Makefile.in.orig 2010-03-10 17:14:45.000000000 +0000
++++ gir/Makefile.in 2010-03-10 17:17:53.000000000 +0000
+@@ -400,14 +400,13 @@ GLib_2_0_gir_SCANNERFLAGS = --noclosure
GLib_2_0_gir_PACKAGES = glib-2.0
GLib_2_0_gir_CFLAGS = $(CPPFLAGS) \
-I$(GLIB_INCLUDEDIR) \
- -I$(GLIB_LIBDIR)/glib-2.0/include \
-DGETTEXT_PACKAGE=Dummy \
+ -DGLIB_COMPILATION \
-D__G_I18N_LIB_H__
GLib_2_0_gir_ASSERTIONS = $(srcdir)/GLib-2.0.xpath
diff --git a/devel/gobject-introspection/files/patch-girepository_girnode.c b/devel/gobject-introspection/files/patch-girepository_girnode.c
deleted file mode 100644
index f566de3d6208..000000000000
--- a/devel/gobject-introspection/files/patch-girepository_girnode.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- girepository/girnode.c.orig 2009-07-09 21:20:46.000000000 +0400
-+++ girepository/girnode.c 2009-12-09 16:12:24.000000000 +0300
-@@ -2288,7 +2288,8 @@
- break;
- case GI_TYPE_TAG_DOUBLE:
- blob->size = sizeof (gdouble);
-- *(gdouble*)&data[blob->offset] = (gdouble) parse_float_value (constant->value);
-+ gdouble tmp = parse_float_value (constant->value);
-+ memcpy (&data[blob->offset], &tmp, blob->size);
- break;
- case GI_TYPE_TAG_UTF8:
- case GI_TYPE_TAG_FILENAME:
diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist
index 8083b30ec40f..8543297adaef 100644
--- a/devel/gobject-introspection/pkg-plist
+++ b/devel/gobject-introspection/pkg-plist
@@ -4,6 +4,7 @@ bin/g-ir-scanner
include/gobject-introspection-1.0/girepository.h
include/gobject-introspection-1.0/girffi.h
lib/girepository-1.0/Everything-1.0.typelib
+lib/girepository-1.0/GIMarshallingTests-1.0.typelib
lib/girepository-1.0/GIRepository-2.0.typelib
lib/girepository-1.0/GL-1.0.typelib
lib/girepository-1.0/GLib-2.0.typelib
@@ -85,10 +86,15 @@ lib/libgirepository-everything-1.0.a
lib/libgirepository-everything-1.0.la
lib/libgirepository-everything-1.0.so
lib/libgirepository-everything-1.0.so.1
+lib/libgirepository-gimarshallingtests-1.0.a
+lib/libgirepository-gimarshallingtests-1.0.la
+lib/libgirepository-gimarshallingtests-1.0.so
+lib/libgirepository-gimarshallingtests-1.0.so.1
libdata/pkgconfig/gobject-introspection-1.0.pc
libdata/pkgconfig/gobject-introspection-no-export-1.0.pc
share/aclocal/introspection.m4
share/gir-1.0/Everything-1.0.gir
+share/gir-1.0/GIMarshallingTests-1.0.gir
share/gir-1.0/GIRepository-2.0.gir
share/gir-1.0/GL-1.0.gir
share/gir-1.0/GLib-2.0.gir
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index b1627f5b7101..9efb186dacb0 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gvfs/Makefile,v 1.54 2009/10/19 19:42:40 kwm Exp $
+# $MCom: ports/devel/gvfs/Makefile,v 1.61 2010/04/26 12:09:46 kwm Exp $
#
PORTNAME= gvfs
-PORTVERSION= 1.4.3
-PORTREVISION= 2
+PORTVERSION= 1.6.1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index 4fd7047efa4a..830b1de2c377 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gvfs-1.4.3.tar.bz2) = 2624e5e7d45efd6b742e90bfde24cd20
-SHA256 (gnome2/gvfs-1.4.3.tar.bz2) = 3ca9ccab2efb2699b72a1f346d3533fc727b5ea2692af6c86adfd9532d6ba15d
-SIZE (gnome2/gvfs-1.4.3.tar.bz2) = 1263024
+MD5 (gnome2/gvfs-1.6.1.tar.bz2) = dcaae9fafbb7df9df4e92f895849921a
+SHA256 (gnome2/gvfs-1.6.1.tar.bz2) = ad75b4a1e0d61ecc271af2f015d665709cebcf22e86b9bbe0cc7ce8a33b8d8d6
+SIZE (gnome2/gvfs-1.6.1.tar.bz2) = 1364399
diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure
index 0b1b2a2ab9f7..cee0fc7d7a69 100644
--- a/devel/gvfs/files/patch-configure
+++ b/devel/gvfs/files/patch-configure
@@ -1,16 +1,6 @@
---- configure.orig 2009-04-24 00:15:09.000000000 -0400
-+++ configure 2009-04-24 00:16:04.000000000 -0400
-@@ -26973,6 +26973,9 @@ fi
- *-linux*)
- use_gphoto2=yes
- ;;
-+ *-freebsd*)
-+ use_gphoto2=yes
-+ ;;
- *)
- use_gphoto2=no
- ;;
-@@ -28018,7 +28021,7 @@ if test "${ac_cv_lib_archive_archive_ent
+--- configure.orig 2010-03-30 10:14:50.000000000 +0200
++++ configure 2010-03-30 10:16:26.000000000 +0200
+@@ -20312,7 +20312,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -19,7 +9,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28094,7 +28097,7 @@ _ACEOF
+@@ -20388,7 +20388,7 @@
if test x$with_archive_libs != x/usr/lib; then
ARCHIVE_LIBS="-L$with_archive_libs -larchive"
else
@@ -28,3 +18,12 @@
fi
else
{ $as_echo "$as_me:$LINENO: checking for archive_entry_filetype in -larchive" >&5
+@@ -20397,7 +20397,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-larchive $LIBS"
++LIBS="-larchive -lcrypto -lmd $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
index 77685a582e98..1be92a4632e6 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -74,6 +74,7 @@ share/gvfs/mounts/trash.mount
share/gvfs/remote-volume-monitors/hal.monitor
share/locale/ar/LC_MESSAGES/gvfs.mo
share/locale/as/LC_MESSAGES/gvfs.mo
+share/locale/ast/LC_MESSAGES/gvfs.mo
share/locale/be@latin/LC_MESSAGES/gvfs.mo
share/locale/bg/LC_MESSAGES/gvfs.mo
share/locale/bn/LC_MESSAGES/gvfs.mo
@@ -84,6 +85,7 @@ share/locale/cs/LC_MESSAGES/gvfs.mo
share/locale/da/LC_MESSAGES/gvfs.mo
share/locale/de/LC_MESSAGES/gvfs.mo
share/locale/el/LC_MESSAGES/gvfs.mo
+share/locale/en@shaw/LC_MESSAGES/gvfs.mo
share/locale/en_GB/LC_MESSAGES/gvfs.mo
share/locale/es/LC_MESSAGES/gvfs.mo
share/locale/et/LC_MESSAGES/gvfs.mo
@@ -96,6 +98,7 @@ share/locale/gu/LC_MESSAGES/gvfs.mo
share/locale/he/LC_MESSAGES/gvfs.mo
share/locale/hi/LC_MESSAGES/gvfs.mo
share/locale/hu/LC_MESSAGES/gvfs.mo
+share/locale/id/LC_MESSAGES/gvfs.mo
share/locale/it/LC_MESSAGES/gvfs.mo
share/locale/ja/LC_MESSAGES/gvfs.mo
share/locale/kn/LC_MESSAGES/gvfs.mo
@@ -108,6 +111,7 @@ share/locale/mk/LC_MESSAGES/gvfs.mo
share/locale/ml/LC_MESSAGES/gvfs.mo
share/locale/mr/LC_MESSAGES/gvfs.mo
share/locale/nb/LC_MESSAGES/gvfs.mo
+share/locale/nds/LC_MESSAGES/gvfs.mo
share/locale/nl/LC_MESSAGES/gvfs.mo
share/locale/nn/LC_MESSAGES/gvfs.mo
share/locale/or/LC_MESSAGES/gvfs.mo
@@ -144,17 +148,23 @@ share/locale/zh_TW/LC_MESSAGES/gvfs.mo
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile
index f2f8fb42d983..f086065352e6 100644
--- a/devel/json-glib/Makefile
+++ b/devel/json-glib/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/json-glib/Makefile,v 1.5 2009/10/30 11:35:48 kwm Exp $
+# $MCom: ports/devel/json-glib/Makefile,v 1.8 2010/03/20 01:19:18 marcus Exp $
#
PORTNAME= json-glib
-PORTVERSION= 0.10.0
+PORTVERSION= 0.10.4
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/json-glib/distinfo b/devel/json-glib/distinfo
index c027848241ce..3cea6fe6f6d9 100644
--- a/devel/json-glib/distinfo
+++ b/devel/json-glib/distinfo
@@ -1,3 +1,3 @@
-MD5 (json-glib-0.10.0.tar.bz2) = f000d8d41e4dc172ef5f40e2adb97bfd
-SHA256 (json-glib-0.10.0.tar.bz2) = 029b700f1ad0960bb4954944357fe8b516487860d43fbe56853dce44fc114a64
-SIZE (json-glib-0.10.0.tar.bz2) = 415877
+MD5 (json-glib-0.10.4.tar.bz2) = cb207a673438d1bc833eca6fc93f80e1
+SHA256 (json-glib-0.10.4.tar.bz2) = efd8b341d3f9e03cc35b7e2eb353b8336cf7a5560ad273b07e85f7a7a46d5ed9
+SIZE (json-glib-0.10.4.tar.bz2) = 389457
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index fa674a10f115..604680a89fd7 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libIDL/Makefile,v 1.5 2006/07/24 14:11:11 ahze Exp $
+# $MCom: ports/devel/libIDL/Makefile,v 1.7 2010/04/02 17:27:42 kwm Exp $
#
PORTNAME= libIDL
-PORTVERSION= 0.8.13
+PORTVERSION= 0.8.14
CATEGORIES= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/libIDL/distinfo b/devel/libIDL/distinfo
index 3fded63f8ade..da1dff7937b1 100644
--- a/devel/libIDL/distinfo
+++ b/devel/libIDL/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libIDL-0.8.13.tar.bz2) = b43b289a859eb38a710f70622c46e571
-SHA256 (gnome2/libIDL-0.8.13.tar.bz2) = bccc7e10dae979518ff012f8464e47ec4b3558a5456a94c8679653aa0b262b71
-SIZE (gnome2/libIDL-0.8.13.tar.bz2) = 386468
+MD5 (gnome2/libIDL-0.8.14.tar.bz2) = bb8e10a218fac793a52d404d14adedcb
+SHA256 (gnome2/libIDL-0.8.14.tar.bz2) = c5d24d8c096546353fbc7cedf208392d5a02afe9d56ebcc1cccb258d7c4d2220
+SIZE (gnome2/libIDL-0.8.14.tar.bz2) = 427149
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index cb8647126e7b..3a93b3ce1570 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libbonobo/Makefile,v 1.79 2009/09/26 13:41:58 marcus Exp $
+# $MCom: ports/devel/libbonobo/Makefile,v 1.81 2010/04/02 18:10:40 kwm Exp $
#
PORTNAME= libbonobo
-PORTVERSION= 2.24.2
+PORTVERSION= 2.24.3
PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 866b1d4cbf5b..dbbb5091b584 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libbonobo-2.24.2.tar.bz2) = 5c7c5ea9c2f78a3c1e9ff2f1e27ad751
-SHA256 (gnome2/libbonobo-2.24.2.tar.bz2) = 95c0230a31a657e1873fc601318bbaa16722986699219317053f1cd1aa2a28bf
-SIZE (gnome2/libbonobo-2.24.2.tar.bz2) = 1435635
+MD5 (gnome2/libbonobo-2.24.3.tar.bz2) = b217cef6a187505290c66c5bf8225d38
+SHA256 (gnome2/libbonobo-2.24.3.tar.bz2) = 5310957fa90691689c0557218b8833f681666cae160bd84e1f2c2705189a4ebe
+SIZE (gnome2/libbonobo-2.24.3.tar.bz2) = 1354929
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index da47a7f20a8b..161fb13c9378 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -98,6 +98,7 @@ share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl
share/locale/am/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ar/LC_MESSAGES/libbonobo-2.0.mo
share/locale/as/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/ast/LC_MESSAGES/libbonobo-2.0.mo
share/locale/az/LC_MESSAGES/libbonobo-2.0.mo
share/locale/be/LC_MESSAGES/libbonobo-2.0.mo
share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo
@@ -113,6 +114,7 @@ share/locale/da/LC_MESSAGES/libbonobo-2.0.mo
share/locale/de/LC_MESSAGES/libbonobo-2.0.mo
share/locale/dz/LC_MESSAGES/libbonobo-2.0.mo
share/locale/el/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/en@shaw/LC_MESSAGES/libbonobo-2.0.mo
share/locale/en_CA/LC_MESSAGES/libbonobo-2.0.mo
share/locale/en_GB/LC_MESSAGES/libbonobo-2.0.mo
share/locale/eo/LC_MESSAGES/libbonobo-2.0.mo
@@ -213,11 +215,15 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index 80afa4d002b8..d14ef303dead 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -3,19 +3,21 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgdata/Makefile,v 1.3 2009/11/22 20:17:49 kwm Exp $
+# $MCom: ports/devel/libgdata/Makefile,v 1.9 2010/03/30 11:24:13 kwm Exp $
#
PORTNAME= libgdata
-PORTVERSION= 0.5.1
-PORTREVISION= 2
+PORTVERSION= 0.6.4
CATEGORIES= devel
MASTER_SITES= GNOME
MAINTAINER= kwm@FreeBSD.org
COMMENT= GLib based implimentation of the GData protocol
+BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup \
+ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup
+RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup
USE_BZIP2= yes
USE_LDCONFIG= yes
@@ -23,13 +25,9 @@ USE_GETTEXT= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
USE_AUTOTOOLS= libtool:22
-USE_GNOME= intltool
+USE_GNOME= gnomehack intltool ltverhack glib20
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+=--with-html-dir="${PREFIX}/share/doc"
-post-patch:
- @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile.in
-
.include <bsd.port.mk>
diff --git a/devel/libgdata/distinfo b/devel/libgdata/distinfo
index f04c6f721466..49d1b0deb532 100644
--- a/devel/libgdata/distinfo
+++ b/devel/libgdata/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgdata-0.5.1.tar.bz2) = fc9be11d2f823bb16d6e03e2a0dda85d
-SHA256 (libgdata-0.5.1.tar.bz2) = 2b90f206063405ae6cf579ed3a090b0130e849e1ead02b2ad2ed4fc6d7f585a0
-SIZE (libgdata-0.5.1.tar.bz2) = 956689
+MD5 (libgdata-0.6.4.tar.bz2) = 7efdef75d1b59177d119f689522d00ba
+SHA256 (libgdata-0.6.4.tar.bz2) = 56c3f3cbd0bf8c410ebdff2d8a57eeb1db7dbc1bb342bf6f43f89700ef517d9d
+SIZE (libgdata-0.6.4.tar.bz2) = 1003963
diff --git a/devel/libgdata/pkg-descr b/devel/libgdata/pkg-descr
index 748252c4cb8b..1603f5ea0f9c 100644
--- a/devel/libgdata/pkg-descr
+++ b/devel/libgdata/pkg-descr
@@ -1,8 +1,8 @@
libgdata is a GLib-based library for accessing online service APIs using the
GData protocol - most notably, Google's services. It provides APIs to access
-the common Google services, and has full asynchronous support.
+the common Google services, and has full asynchronous support.
-A link with more information about the GData protocol is available on the
+A link with more information about the GData protocol is available on the
website.
WWW: http://live.gnome.org/libgdata
diff --git a/devel/libgdata/pkg-plist b/devel/libgdata/pkg-plist
index 93d8dd06c693..6ebbc629022c 100644
--- a/devel/libgdata/pkg-plist
+++ b/devel/libgdata/pkg-plist
@@ -2,7 +2,6 @@ include/libgdata/gdata/atom/gdata-author.h
include/libgdata/gdata/atom/gdata-category.h
include/libgdata/gdata/atom/gdata-generator.h
include/libgdata/gdata/atom/gdata-link.h
-include/libgdata/gdata/exif/gdata-exif-tags.h
include/libgdata/gdata/gd/gdata-gd-email-address.h
include/libgdata/gdata/gd/gdata-gd-im-address.h
include/libgdata/gdata/gd/gdata-gd-name.h
@@ -25,7 +24,6 @@ include/libgdata/gdata/gdata-service.h
include/libgdata/gdata/gdata-types.h
include/libgdata/gdata/gdata-upload-stream.h
include/libgdata/gdata/gdata.h
-include/libgdata/gdata/georss/gdata-georss-where.h
include/libgdata/gdata/media/gdata-media-category.h
include/libgdata/gdata/media/gdata-media-content.h
include/libgdata/gdata/media/gdata-media-credit.h
@@ -50,9 +48,11 @@ include/libgdata/gdata/services/documents/gdata-documents-spreadsheet.h
include/libgdata/gdata/services/documents/gdata-documents-text.h
include/libgdata/gdata/services/picasaweb/gdata-picasaweb-album.h
include/libgdata/gdata/services/picasaweb/gdata-picasaweb-enums.h
+include/libgdata/gdata/services/picasaweb/gdata-picasaweb-feed.h
include/libgdata/gdata/services/picasaweb/gdata-picasaweb-file.h
include/libgdata/gdata/services/picasaweb/gdata-picasaweb-query.h
include/libgdata/gdata/services/picasaweb/gdata-picasaweb-service.h
+include/libgdata/gdata/services/picasaweb/gdata-picasaweb-user.h
include/libgdata/gdata/services/youtube/gdata-youtube-content.h
include/libgdata/gdata/services/youtube/gdata-youtube-credit.h
include/libgdata/gdata/services/youtube/gdata-youtube-enums.h
@@ -60,10 +60,11 @@ include/libgdata/gdata/services/youtube/gdata-youtube-query.h
include/libgdata/gdata/services/youtube/gdata-youtube-service.h
include/libgdata/gdata/services/youtube/gdata-youtube-state.h
include/libgdata/gdata/services/youtube/gdata-youtube-video.h
+lib/girepository-1.0/GData-0.0.typelib
lib/libgdata.a
lib/libgdata.la
lib/libgdata.so
-lib/libgdata.so.6
+lib/libgdata.so.7
libdata/pkgconfig/libgdata.pc
share/doc/gdata/GDataAccessHandler.html
share/doc/gdata/GDataAccessRule.html
@@ -90,6 +91,7 @@ share/doc/gdata/GDataEntry.html
share/doc/gdata/GDataFeed.html
share/doc/gdata/GDataGDEmailAddress.html
share/doc/gdata/GDataGDIMAddress.html
+share/doc/gdata/GDataGDName.html
share/doc/gdata/GDataGDOrganization.html
share/doc/gdata/GDataGDPhoneNumber.html
share/doc/gdata/GDataGDPostalAddress.html
@@ -142,6 +144,10 @@ share/doc/gdata/ix02.html
share/doc/gdata/ix03.html
share/doc/gdata/ix04.html
share/doc/gdata/ix05.html
+share/doc/gdata/ix06.html
+share/doc/gdata/ix07.html
+share/doc/gdata/ix08.html
+share/doc/gdata/ix09.html
share/doc/gdata/left.png
share/doc/gdata/pt01.html
share/doc/gdata/pt02.html
@@ -152,7 +158,9 @@ share/doc/gdata/right.png
share/doc/gdata/structure.png
share/doc/gdata/style.css
share/doc/gdata/up.png
+share/gir-1.0/GData-0.0.gir
share/locale/ca/LC_MESSAGES/gdata.mo
+share/locale/cs/LC_MESSAGES/gdata.mo
share/locale/de/LC_MESSAGES/gdata.mo
share/locale/el/LC_MESSAGES/gdata.mo
share/locale/en_GB/LC_MESSAGES/gdata.mo
@@ -161,13 +169,18 @@ share/locale/eu/LC_MESSAGES/gdata.mo
share/locale/fr/LC_MESSAGES/gdata.mo
share/locale/gl/LC_MESSAGES/gdata.mo
share/locale/hu/LC_MESSAGES/gdata.mo
+share/locale/it/LC_MESSAGES/gdata.mo
+share/locale/ja/LC_MESSAGES/gdata.mo
share/locale/nb/LC_MESSAGES/gdata.mo
share/locale/pa/LC_MESSAGES/gdata.mo
share/locale/pl/LC_MESSAGES/gdata.mo
share/locale/pt/LC_MESSAGES/gdata.mo
share/locale/pt_BR/LC_MESSAGES/gdata.mo
+share/locale/ru/LC_MESSAGES/gdata.mo
+share/locale/sl/LC_MESSAGES/gdata.mo
share/locale/sv/LC_MESSAGES/gdata.mo
share/locale/uk/LC_MESSAGES/gdata.mo
+share/locale/zh_CN/LC_MESSAGES/gdata.mo
share/locale/zh_HK/LC_MESSAGES/gdata.mo
share/locale/zh_TW/LC_MESSAGES/gdata.mo
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@@ -190,9 +203,7 @@ share/locale/zh_TW/LC_MESSAGES/gdata.mo
@dirrm include/libgdata/gdata/services/calendar
@dirrm include/libgdata/gdata/services
@dirrm include/libgdata/gdata/media
-@dirrm include/libgdata/gdata/georss
@dirrm include/libgdata/gdata/gd
-@dirrm include/libgdata/gdata/exif
@dirrm include/libgdata/gdata/atom
@dirrm include/libgdata/gdata
@dirrm include/libgdata
diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile
index 22e51f667a45..bef568f619a4 100644
--- a/devel/libgsf-gnome/Makefile
+++ b/devel/libgsf-gnome/Makefile
@@ -3,10 +3,10 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.12 2008/09/09 00:08:35 kwm Exp $
+# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.14 2010/04/10 08:51:16 kwm Exp $
#
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= devel gnome
PKGNAMESUFFIX= -gnome
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 9d62a3abac78..ea9f824e7151 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgsf/Makefile,v 1.33 2009/01/08 01:28:46 marcus Exp $
+# $MCom: ports/devel/libgsf/Makefile,v 1.35 2010/04/10 08:51:15 kwm Exp $
#
PORTNAME= libgsf
-PORTVERSION= 1.14.17
-PORTREVISION?= 1
+PORTVERSION= 1.14.18
+PORTREVISION?= 0
CATEGORIES?= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index 298265cdfa63..d8ec46584559 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgsf-1.14.17.tar.bz2) = d7a14096085e36fb4c3f43e3f38478f8
-SHA256 (gnome2/libgsf-1.14.17.tar.bz2) = 10c6b69149e424ac5f325eb247fdf640ddd949952f21b99a890e73f9d4276876
-SIZE (gnome2/libgsf-1.14.17.tar.bz2) = 612455
+MD5 (gnome2/libgsf-1.14.18.tar.bz2) = 2c15d875b1931c40c7e7a2368f3ed948
+SHA256 (gnome2/libgsf-1.14.18.tar.bz2) = 16d29e82f7eba68f919f2588ea5328973490fe6d4a7a5f160e8af89b387c9a95
+SIZE (gnome2/libgsf-1.14.18.tar.bz2) = 611584
diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist
index a8fab0c18134..46a940712fc4 100644
--- a/devel/libgsf/pkg-plist
+++ b/devel/libgsf/pkg-plist
@@ -93,6 +93,7 @@ share/doc/gsf/right.png
share/doc/gsf/sources.html
share/doc/gsf/style.css
share/doc/gsf/up.png
+share/locale/cs/LC_MESSAGES/libgsf.mo
share/locale/de/LC_MESSAGES/libgsf.mo
share/locale/en_GB/LC_MESSAGES/libgsf.mo
share/locale/es/LC_MESSAGES/libgsf.mo
@@ -101,6 +102,7 @@ share/locale/fr/LC_MESSAGES/libgsf.mo
share/locale/nb/LC_MESSAGES/libgsf.mo
share/locale/oc/LC_MESSAGES/libgsf.mo
share/locale/pa/LC_MESSAGES/libgsf.mo
+share/locale/pl/LC_MESSAGES/libgsf.mo
share/locale/pt/LC_MESSAGES/libgsf.mo
share/locale/pt_BR/LC_MESSAGES/libgsf.mo
share/locale/sl/LC_MESSAGES/libgsf.mo
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 00c04df42293..65bed90efe41 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgtop/Makefile,v 1.52 2009/09/21 09:27:35 kwm Exp $
+# $MCom: ports/devel/libgtop/Makefile,v 1.56 2010/05/02 00:04:47 marcus Exp $
#
PORTNAME= libgtop
-PORTVERSION= 2.28.0
+PORTVERSION= 2.28.1
PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= GNOME
@@ -39,7 +39,7 @@ PKGMESSAGE= ${FILESDIR}/pkg-message
RUN_DEPENDS+= lsof:${PORTSDIR}/sysutils/lsof
.endif
-post-patch:
+post-configure:
@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
post-install:
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index be335ea4e84c..f6fedf2c05e3 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgtop-2.28.0.tar.bz2) = f74fabd765452e9a6893852afa93a7c7
-SHA256 (gnome2/libgtop-2.28.0.tar.bz2) = 22a9c6241c5a65e267a995a4a60ba483dcc629a4873e746b463e6eb6466975b3
-SIZE (gnome2/libgtop-2.28.0.tar.bz2) = 793153
+MD5 (gnome2/libgtop-2.28.1.tar.bz2) = 994c299b6dba330524a67ea45776b3ab
+SHA256 (gnome2/libgtop-2.28.1.tar.bz2) = 0a7e0e7d736a608a5ed25f8e475a87bf38e61dbef66822e25e8ef50705cf70f6
+SIZE (gnome2/libgtop-2.28.1.tar.bz2) = 760104
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
index 8fd7ffffffc9..f29ef64d7c64 100644
--- a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
@@ -1,5 +1,5 @@
---- sysdeps/freebsd/procwd.c.orig 2009-12-13 18:53:02.827740000 -0500
-+++ sysdeps/freebsd/procwd.c 2009-12-13 18:59:27.000000000 -0500
+--- sysdeps/freebsd/procwd.c.orig 2009-04-19 19:51:00.000000000 +0200
++++ sysdeps/freebsd/procwd.c 2010-05-07 13:17:54.000000000 +0200
@@ -27,6 +27,9 @@
#include <sys/sysctl.h>
#include <sys/param.h>
@@ -19,13 +19,19 @@
static GPtrArray *
parse_output(const char *output, glibtop_proc_wd *buf)
{
-@@ -101,10 +104,14 @@ glibtop_get_proc_wd_s(glibtop *server, g
+@@ -97,24 +100,39 @@ parse_output(const char *output, glibtop
+ char**
+ glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid)
+ {
+- char path[MAXPATHLEN];
++ int exe_mib[4];
++ size_t len;
#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
struct kinfo_file *freep, *kif;
GPtrArray *dirs;
-+#ifndef HAVE_KINFO_GETFILE
- size_t len;
+- size_t len;
- int i;
++#ifndef HAVE_KINFO_GETFILE
int name[4];
#else
+ int cnt;
@@ -35,15 +41,31 @@
char *output;
#endif
-@@ -115,6 +122,7 @@ glibtop_get_proc_wd_s(glibtop *server, g
- buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
+ memset (buf, 0, sizeof (glibtop_proc_wd));
++ len = 0;
+
+- g_snprintf(path, sizeof(path), "/proc/%u/file", pid);
+- if (safe_readlink(path, buf->exe, sizeof(buf->exe)))
+- buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
++ exe_mib[0] = CTL_KERN;
++ exe_mib[1] = KERN_PROC;
++ exe_mib[2] = KERN_PROC_PATHNAME;
++ exe_mib[3] = pid;
++
++ if (sysctl(exe_mib, 4, NULL, &len, NULL, 0) == 0) {
++ if (len > sizeof(buf->exe))
++ len = sizeof(buf->exe);
++ if (sysctl(exe_mib, 4, buf->exe, &len, NULL, 0) == 0)
++ buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
++ }
#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
+#ifndef HAVE_KINFO_GETFILE
++ len = 0;
name[0] = CTL_KERN;
name[1] = KERN_PROC;
name[2] = KERN_PROC_FILEDESC;
-@@ -127,10 +135,21 @@ glibtop_get_proc_wd_s(glibtop *server, g
+@@ -127,10 +145,21 @@ glibtop_get_proc_wd_s(glibtop *server, g
g_free(freep);
return NULL;
}
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index bb4b9e1d1580..5c1a377e9a4c 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -98,6 +98,7 @@ libdata/pkgconfig/libgtop-2.0.pc
share/locale/am/LC_MESSAGES/libgtop-2.0.mo
share/locale/ar/LC_MESSAGES/libgtop-2.0.mo
share/locale/as/LC_MESSAGES/libgtop-2.0.mo
+share/locale/ast/LC_MESSAGES/libgtop-2.0.mo
share/locale/az/LC_MESSAGES/libgtop-2.0.mo
share/locale/be/LC_MESSAGES/libgtop-2.0.mo
share/locale/bg/LC_MESSAGES/libgtop-2.0.mo
@@ -112,6 +113,7 @@ share/locale/da/LC_MESSAGES/libgtop-2.0.mo
share/locale/de/LC_MESSAGES/libgtop-2.0.mo
share/locale/dz/LC_MESSAGES/libgtop-2.0.mo
share/locale/el/LC_MESSAGES/libgtop-2.0.mo
+share/locale/en@shaw/LC_MESSAGES/libgtop-2.0.mo
share/locale/en_CA/LC_MESSAGES/libgtop-2.0.mo
share/locale/en_GB/LC_MESSAGES/libgtop-2.0.mo
share/locale/eo/LC_MESSAGES/libgtop-2.0.mo
@@ -205,11 +207,15 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index 5e775e6678a1..6219641f4493 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/liboobs/Makefile,v 1.38 2009/11/28 05:59:00 mezz Exp $
+# $MCom: ports/devel/liboobs/Makefile,v 1.46 2010/04/01 22:27:34 kwm Exp $
#
PORTNAME= liboobs
-PORTVERSION= 2.22.2
+PORTVERSION= 2.30.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -21,10 +21,21 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
RUN_DEPENDS= ${LOCALBASE}/etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf:${PORTSDIR}/sysutils/system-tools-backends
USE_BZIP2= yes
+USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack glib20
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc --with-hal
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+# disable utmpx detection on early 9.x and below.
+# We still have only utmp there
+post-patch:
+.if ${OSVERSION} < 900007
+ @${REINPLACE_CMD} -e 's|utmpx|utmp|g' \
+ ${WRKSRC}/configure
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/liboobs/distinfo b/devel/liboobs/distinfo
index 7521018e6f82..9fc0f08d30b4 100644
--- a/devel/liboobs/distinfo
+++ b/devel/liboobs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/liboobs-2.22.2.tar.bz2) = 84d20702942635e3bebc0c1c35bdad43
-SHA256 (gnome2/liboobs-2.22.2.tar.bz2) = 34a972fab68255902d4c1f82ba16dfbf673f9933f78c68b4551883b63984c58b
-SIZE (gnome2/liboobs-2.22.2.tar.bz2) = 364260
+MD5 (gnome2/liboobs-2.30.0.tar.bz2) = 69ee6d329cd919c69aae3dae7302b796
+SHA256 (gnome2/liboobs-2.30.0.tar.bz2) = b0c18e038a6c1eba15c68a8e9fabfc21144c9240c17f3bd19042bae1ea04a5ce
+SIZE (gnome2/liboobs-2.30.0.tar.bz2) = 369402
diff --git a/devel/liboobs/files/patch-src_oobs-group.c b/devel/liboobs/files/patch-src_oobs-group.c
index 6abd8b711ddc..0a7384b90d9c 100644
--- a/devel/liboobs/files/patch-src_oobs-group.c
+++ b/devel/liboobs/files/patch-src_oobs-group.c
@@ -1,25 +1,10 @@
---- oobs/oobs-group.c.orig Fri Sep 15 18:41:04 2006
-+++ oobs/oobs-group.c Tue Oct 31 23:12:40 2006
-@@ -18,7 +18,12 @@
- * Authors: Carlos Garnacho Parro <carlosg@gnome.org>
- */
+--- oobs/oobs-group.c.orig 2010-01-11 13:34:52.000000000 -0500
++++ oobs/oobs-group.c 2010-01-18 02:04:34.000000000 -0500
+@@ -21,6 +21,7 @@
-+#if defined(HAVE_CONFIG_H)
-+#include <config.h>
-+#endif
-+
+ #include <string.h>
#include <glib-object.h>
+#include <unistd.h>
- #include "oobs-session.h"
- #include "oobs-group.h"
- #include "oobs-user.h"
-@@ -27,7 +32,9 @@
- #include "oobs-groupsconfig-private.h"
- #include "oobs-defines.h"
- #include "utils.h"
-+#ifdef HAVE_CRYPT_H
- #include <crypt.h>
-+#endif
-
- #define OOBS_GROUP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), OOBS_TYPE_GROUP, OobsGroupPrivate))
+ #include <dbus/dbus.h>
+ #include "oobs-object-private.h"
diff --git a/devel/liboobs/files/patch-src_oobs-user.c b/devel/liboobs/files/patch-src_oobs-user.c
index 2096814ee3a6..a7215c4effbb 100644
--- a/devel/liboobs/files/patch-src_oobs-user.c
+++ b/devel/liboobs/files/patch-src_oobs-user.c
@@ -1,13 +1,9 @@
---- oobs/oobs-user.c
-+++ oobs/oobs-user.c
-@@ -18,13 +18,28 @@
- * Authors: Carlos Garnacho Parro <carlosg@gnome.org>
+--- oobs/oobs-user.c.orig 2010-01-31 17:36:52.000000000 +0000
++++ oobs/oobs-user.c 2010-01-31 17:40:21.000000000 +0000
+@@ -19,13 +19,24 @@
+ * Milan Bouchet-Valat <nalimilan@club.fr>.
*/
-+#if defined(HAVE_CONFIG_H)
-+#include <config.h>
-+#endif
-+
+#ifdef __FreeBSD__
+# include <sys/param.h>
+# if __FreeBSD_version >= 900007
@@ -22,42 +18,28 @@
#include <string.h>
+#ifdef HAVE_CRYPT_H
#include <crypt.h>
--#include <utmp.h>
+#endif
+#ifdef HAVE_UTMPX_H
-+#include <utmpx.h>
+ #include <utmpx.h>
+#endif
+ #include "oobs-object-private.h"
#include "oobs-usersconfig.h"
- #include "oobs-user.h"
-@@ -811,7 +826,8 @@
+@@ -1252,6 +1263,7 @@ oobs_user_set_locale (OobsUser *user, co
gboolean
oobs_user_get_active (OobsUser *user)
{
-- struct utmp *entry;
+#ifdef HAVE_UTMPX_H
-+ struct utmpx *entry;
+ struct utmpx *entry;
const gchar *login;
gboolean match = FALSE;
-
-@@ -819,14 +835,18 @@
-
- login = oobs_user_get_login_name (user);
-
-- while (!match && (entry = getutent ()) != NULL)
-+ setutxent ();
-+ while (!match && (entry = getutxent ()) != NULL)
- {
- match = (entry->ut_type == USER_PROCESS &&
- strcmp (entry->ut_user, login) == 0);
- }
-
- /* close utmp */
-- endutent ();
-+ endutxent ();
+@@ -1272,6 +1284,9 @@ oobs_user_get_active (OobsUser *user)
+ endutxent ();
return match;
+#else
+ return FALSE;
+#endif
}
+
+ /**
diff --git a/devel/liboobs/pkg-plist b/devel/liboobs/pkg-plist
index 11e1ab182ef1..0b3354023c23 100644
--- a/devel/liboobs/pkg-plist
+++ b/devel/liboobs/pkg-plist
@@ -1,3 +1,6 @@
+include/liboobs-1.0/oobs/oobs-defines.h
+include/liboobs-1.0/oobs/oobs-enum-types.h
+include/liboobs-1.0/oobs/oobs-error.h
include/liboobs-1.0/oobs/oobs-group.h
include/liboobs-1.0/oobs/oobs-groupsconfig.h
include/liboobs-1.0/oobs/oobs-hostsconfig.h
@@ -32,5 +35,50 @@ lib/liboobs-1.la
lib/liboobs-1.so
lib/liboobs-1.so.4
libdata/pkgconfig/liboobs-1.pc
+%%DOCSDIR%%/OobsGroup.html
+%%DOCSDIR%%/OobsGroupsConfig.html
+%%DOCSDIR%%/OobsHostsConfig.html
+%%DOCSDIR%%/OobsIface.html
+%%DOCSDIR%%/OobsIfaceEthernet.html
+%%DOCSDIR%%/OobsIfaceIRLan.html
+%%DOCSDIR%%/OobsIfacePPP.html
+%%DOCSDIR%%/OobsIfacePlip.html
+%%DOCSDIR%%/OobsIfaceWireless.html
+%%DOCSDIR%%/OobsIfacesConfig.html
+%%DOCSDIR%%/OobsList.html
+%%DOCSDIR%%/OobsNFSConfig.html
+%%DOCSDIR%%/OobsNTPConfig.html
+%%DOCSDIR%%/OobsNTPServer.html
+%%DOCSDIR%%/OobsObject.html
+%%DOCSDIR%%/OobsSMBConfig.html
+%%DOCSDIR%%/OobsSelfConfig.html
+%%DOCSDIR%%/OobsService.html
+%%DOCSDIR%%/OobsServicesConfig.html
+%%DOCSDIR%%/OobsSession.html
+%%DOCSDIR%%/OobsShare.html
+%%DOCSDIR%%/OobsShareNFS.html
+%%DOCSDIR%%/OobsShareSMB.html
+%%DOCSDIR%%/OobsStaticHost.html
+%%DOCSDIR%%/OobsTimeConfig.html
+%%DOCSDIR%%/OobsUser.html
+%%DOCSDIR%%/OobsUsersConfig.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
+%%DOCSDIR%%/ch05.html
+%%DOCSDIR%%/ch06.html
+%%DOCSDIR%%/ch07.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/liboobs-OobsError.html
+%%DOCSDIR%%/liboobs.devhelp
+%%DOCSDIR%%/liboobs.devhelp2
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
+@dirrm %%DOCSDIR%%
@dirrm include/liboobs-1.0/oobs
@dirrm include/liboobs-1.0
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index fa5b31d4f4eb..166478ed5b02 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libsigc++20/Makefile,v 1.11 2008/03/10 15:08:22 ahze Exp $
+# $MCom: ports/devel/libsigc++20/Makefile,v 1.14 2010/04/16 21:30:41 kwm Exp $
#
PORTNAME= libsigc++
-PORTVERSION= 2.2.4.2
+PORTVERSION= 2.2.6
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/libsigc++20/distinfo b/devel/libsigc++20/distinfo
index aabdf5ab5932..08cb059bd5be 100644
--- a/devel/libsigc++20/distinfo
+++ b/devel/libsigc++20/distinfo
@@ -1,3 +1,3 @@
-MD5 (libsigc++-2.2.4.2.tar.bz2) = 545edbb7b54eec4f723323d3158c0e0c
-SHA256 (libsigc++-2.2.4.2.tar.bz2) = 998e4af392090a0db15102ba0f753fc6fc636574956c8292eb615a2a7823e201
-SIZE (libsigc++-2.2.4.2.tar.bz2) = 3596750
+MD5 (libsigc++-2.2.6.tar.bz2) = d216ef85785e0d17eda9b0326cfdcf71
+SHA256 (libsigc++-2.2.6.tar.bz2) = 93bfd6fc867c99dd3cad695908b45d35b640c6cd12dace43bfa38e48e9a54caa
+SIZE (libsigc++-2.2.6.tar.bz2) = 3741979
diff --git a/devel/libsigc++20/pkg-plist b/devel/libsigc++20/pkg-plist
index 98efa486cbdc..c546bc3d23e3 100644
--- a/devel/libsigc++20/pkg-plist
+++ b/devel/libsigc++20/pkg-plist
@@ -55,369 +55,363 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01const__reference__wrapper_3_01T__wrapped_01_4_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01const__reference__wrapper_3_01T__wrapped_01_4_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01const__reference__wrapper_3_01T__wrapped_01_4_01_4__coll__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01reference__wrapper_3_01T__wrapped_01_4_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01reference__wrapper_3_01T__wrapped_01_4_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01reference__wrapper_3_01T__wrapped_01_4_01_4__coll__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor0-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor0__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor1-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor1__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor2-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor2__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor3-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor3__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor5-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor5__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor6-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor6__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor7-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor7__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor0-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor0__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor1-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor1__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor2-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor2__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor3-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor3__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor5-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor5__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor6-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor6__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor7-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor7__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor0-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor0__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor1-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor1__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor2-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor2__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor3-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor3__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor5-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor5__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor6-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor6__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor7-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor7__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor0-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor0__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor1-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor1__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor2-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor2__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor3-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor3__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor5-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor5__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor6-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor6__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor7-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor7__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__limit__reference-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__limit__reference.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__limit__reference_3_01T__type_00_01true_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__limit__reference_3_01T__type_00_01true_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__limit__reference_3_01T__type_00_01true_01_4__coll__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor0-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor0__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor1-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor1__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor2-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor2__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor3-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor3__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor5-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor5__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor6-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor6__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor7-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor7__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__limit__reference-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__limit__reference.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__limit__reference_3_01T__type_00_01true_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__limit__reference_3_01T__type_00_01true_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__limit__reference_3_01T__type_00_01true_01_4__coll__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor0-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor0__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor1-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor1__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor2-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor2__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor3-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor3__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor5-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor5__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor6-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor6__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor7-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor7__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1limit__reference-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1limit__reference.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1limit__reference_3_01T__type_00_01true_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1limit__reference_3_01T__type_00_01true_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1limit__reference_3_01T__type_00_01true_01_4__coll__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor0-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor0__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor1-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor1__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor2-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor2__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor3-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor3__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor5-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor5__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor6-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor6__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor7-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor7__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor0-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor0__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor1-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor1__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor2-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor2__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor3-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor3__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor5-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor5__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor6-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor6__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor7-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor7__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal0-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal0__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal1-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal1__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal2-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal2__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal3-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal3__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal5-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal5__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal6-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal6__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal7-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal7__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_1_1accumulated-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_1_1accumulated.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_1_1accumulated__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_1_1accumulated__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar01b49059ecd092e1ea927a389afae4ab.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar16a14c152bc5ff346d9997f7152c0448.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar1b790d5e11b1dad6454242a5312e335f.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar29f8b5e4157f634b1dbf70d8cd079888.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar1da4c680404aa7c8c338bb136fd6dbea.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar2a3f9cda8e57479189997c283e69f5ff.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar3adb4b941bace89a3f952c380bedda11.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar7957dbdb3fb3ed3bc11f56050bf6381e.png
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar7d6bfb7a6739ae4708a549aeb7c1fd19.png
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar9961ee865f5739f77a6f717c5be690ae.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar821f8b15c79da4460a4c99304ac8d504.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arbe5eef28da7cedf7c98aeec3dbe6d6b8.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arcf6cb51783c363bfae7c4a91d9685109.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__are33def4d0c1a12dcbfd220489302db67.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5_00_01T__arg6_00_01nil_01_4.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5_00_01nil_00_01nil_01_4.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_01nil_00_01nil_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00c513da473cf7720ea302b4c9ac3312b.png
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_0488c44ad57d300eb0d26f65a9505ffdc.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_0ad52bc79df5ba2b4d7e5b497ba915039.html
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_0b160353f4ad061f559297e128c4d0646.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_0d3a462cf1a3aee09f94ea984d7d5fb39.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_0d729ce48b1328d982e0ee754652fed04.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_012ff7d4b06d3103f927940079a2066cad.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_011e4fe3321f9150dc130b7a3b2213423b.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_014f61314713a22a7e37f830f31ddcbf93.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01756aafa66a891f219b67f866edb12f89.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01852c349c390cefa04662a850d84c0a94.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4_1_1accumulated.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_2834c669b9a4f4ae3cbd91fd9ea54658.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_3b1bb4b094860c314af671799b3adaab.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_dc4a103abb90b58689e91ed00e1a72ef.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4_1_1accumulated.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_02af42f0cb3d98cb6a4ad4230b22bbff2.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_08a1617e39a89dfb3d657c3c5cb6673b1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil810e579b3e82014b3c1a16450bdb6023.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_093dc18e43ee4275c7bebd699f7376cb7.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil1ce68760f5323ed9c9884b19387edf66.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4_1_1accumulated-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4_1_1accumulated.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot0-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot0__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot1-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot1__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot2-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot2__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot3-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot3__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot5-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot5__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot6-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot6__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot7-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot7__coll__graph.png
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg511b8698fc2891db58bb2a8bf0969f659.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot7__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg519ed0b830799ecdfb1e59a58e3902913.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg52ee407c118db89bb94aca248ba922de3.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg55fd8828cf1e28d31ca1331678509a180.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5_00_01T__arg6_00_01nil_01_4.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5_00_01nil_00_01nil_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5_00_01nil_00_01nil_01_4.html
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5aeb6f23fed93d951563913dc5fa02580.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_01nil_00_01nil_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_5a581d99b458267d85dd19f245bddca4.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_41a20cc46cbca7c5e1f6e6dab34f9c0b.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__base-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__base.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__base__coll__graph.png
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__base__inherit__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__limit__reference-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__limit__reference.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__limit__reference_3_01T__type_00_01true_01_4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__limit__reference_3_01T__type_00_01true_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__limit__reference_3_01T__type_00_01true_01_4__coll__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor0-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor0__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor1-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor1__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor2-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor2__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor3-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor3__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor4-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor4__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor5-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor5__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor6-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor6__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor7-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor7__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/doxygen.css
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/doxygen.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/functions.html
@@ -457,28 +451,18 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/graph_legend.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/graph_legend.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__adaptors.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__adaptors.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__bind.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__bind.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__compose.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__compose.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__exception__catch.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__exception__catch.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__group__.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__group__.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__hide.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__hide.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__lambdas.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__lambdas.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__mem__fun.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__mem__fun.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__ptr__fun.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__ptr__fun.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__retype.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__retype.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__sigcfunctors.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__signal.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__slot.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__slot.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/hierarchy.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/index.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit__graph__0.png
@@ -534,67 +518,66 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/namespaces.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/namespacesigc.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__base.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__base__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__base__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__functor-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__functor.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__functor__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__functor__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adapts-members.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adapts.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adapts__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adapts__inherit__graph.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T0834e37f8bd5c0361c59dcde65b688ff.html
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T0960d75154b94d71b8dc83e697de0977.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T1564029be5092b4f54029884f8072971.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T3d8983f4d98069f4e23a772a1fcb079e.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T436ea37e3d0376f65064cb6eeb85bc6f.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T4b2da9832015a0e3ce25e0dca6b9ceb1.html
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T5d526f12c92849dac4a70f282eec9dc2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T67d342ad48aefc8493f51afa1b5195cc.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T69acdb40ccadd9132b5b22be14f1d570.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T723f3b4044979b2b751d7da0157d7605.png
%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_