aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2009-04-10 05:56:28 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2009-04-10 05:56:28 +0000
commitae52bc80895a23ddbe33b86e75a9cf331ae32ba9 (patch)
tree5538a7d3541f6d56e4bbab9c6329f5b9db64dafb
parent7934df773e0cc2a9924de75dd7cad9cc3d79d4ee (diff)
downloadports-ae52bc80895a23ddbe33b86e75a9cf331ae32ba9.tar.gz
ports-ae52bc80895a23ddbe33b86e75a9cf331ae32ba9.zip
Notes
-rw-r--r--MOVED2
-rw-r--r--Mk/bsd.gecko.mk13
-rw-r--r--Mk/bsd.gnome.mk17
-rw-r--r--accessibility/accerciser/Makefile4
-rw-r--r--accessibility/accerciser/distinfo6
-rw-r--r--accessibility/accerciser/pkg-plist37
-rw-r--r--accessibility/at-spi/Makefile4
-rw-r--r--accessibility/at-spi/distinfo6
-rw-r--r--accessibility/at-spi/pkg-plist10
-rw-r--r--accessibility/atk/Makefile4
-rw-r--r--accessibility/atk/distinfo6
-rw-r--r--accessibility/atk/pkg-plist3
-rw-r--r--accessibility/dasher/Makefile5
-rw-r--r--accessibility/dasher/distinfo6
-rw-r--r--accessibility/dasher/files/patch-configure11
-rw-r--r--accessibility/dasher/pkg-plist68
-rw-r--r--accessibility/gok/Makefile4
-rw-r--r--accessibility/gok/distinfo6
-rw-r--r--accessibility/gok/pkg-plist14
-rw-r--r--accessibility/mousetweaks/Makefile4
-rw-r--r--accessibility/mousetweaks/distinfo6
-rw-r--r--accessibility/mousetweaks/pkg-plist49
-rw-r--r--accessibility/orca/Makefile4
-rw-r--r--accessibility/orca/distinfo6
-rw-r--r--accessibility/orca/files/patch-src_orca_orca.in4
-rw-r--r--accessibility/orca/pkg-plist5
-rw-r--r--archivers/file-roller/Makefile4
-rw-r--r--archivers/file-roller/distinfo6
-rw-r--r--archivers/file-roller/pkg-plist36
-rw-r--r--astro/glunarclock/Makefile7
-rw-r--r--audio/gnome-media/Makefile13
-rw-r--r--audio/gnome-media/distinfo6
-rw-r--r--audio/gnome-media/pkg-plist126
-rw-r--r--audio/pulseaudio/Makefile10
-rw-r--r--audio/pulseaudio/files/patch-src_daemon_main.c24
-rw-r--r--audio/pulseaudio/files/patch-src_daemon_start-pulseaudio-x11.in11
-rw-r--r--audio/pulseaudio/files/patch-src_pulse_context.c11
-rw-r--r--audio/pulseaudio/pkg-plist2
-rw-r--r--audio/rhythmbox/Makefile22
-rw-r--r--audio/rhythmbox/pkg-plist7
-rw-r--r--audio/sound-juicer/Makefile14
-rw-r--r--audio/sound-juicer/distinfo6
-rw-r--r--audio/sound-juicer/pkg-plist15
-rw-r--r--comms/gnokii/Makefile4
-rw-r--r--converters/ical2html/Makefile4
-rw-r--r--converters/pdf2djvu/Makefile4
-rw-r--r--databases/evolution-data-server/Makefile18
-rw-r--r--databases/evolution-data-server/distinfo6
-rw-r--r--databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c18
-rw-r--r--databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in15
-rw-r--r--databases/evolution-data-server/pkg-plist63
-rw-r--r--databases/glom/Makefile12
-rw-r--r--databases/glom/distinfo6
-rw-r--r--databases/glom/files/patch-glom_main.cc14
-rw-r--r--databases/glom/pkg-plist56
-rw-r--r--databases/libgdamm/Makefile8
-rw-r--r--databases/libgdamm/distinfo6
-rw-r--r--databases/libgdamm/pkg-plist223
-rw-r--r--deskutils/deskbar-applet/Makefile5
-rw-r--r--deskutils/deskbar-applet/distinfo6
-rw-r--r--deskutils/deskbar-applet/pkg-plist15
-rw-r--r--deskutils/evolution-jescs/Makefile8
-rw-r--r--deskutils/evolution-jescs/distinfo6
-rw-r--r--deskutils/gnome-main-menu/Makefile7
-rw-r--r--deskutils/gnome-main-menu/files/patch-main-menu_src_main-menu.c10
-rw-r--r--deskutils/gnome-utils/Makefile8
-rw-r--r--deskutils/gnome-utils/distinfo6
-rw-r--r--deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c10
-rw-r--r--deskutils/gnome-utils/files/patch-logview_gtkmessagearea.c11
-rw-r--r--deskutils/gnome-utils/files/patch-logview_logview-manager.c10
-rw-r--r--deskutils/gnome-utils/files/patch-logview_logview-utils.c11
-rw-r--r--deskutils/gnome-utils/pkg-plist64
-rw-r--r--deskutils/gucharmap/Makefile4
-rw-r--r--deskutils/gucharmap/distinfo6
-rw-r--r--deskutils/hamster-applet/Makefile5
-rw-r--r--deskutils/hamster-applet/distinfo6
-rw-r--r--deskutils/hamster-applet/files/patch-hamster_hamster-applet.py10
-rw-r--r--deskutils/hamster-applet/pkg-plist17
-rw-r--r--deskutils/kdepimlibs4/Makefile3
-rw-r--r--deskutils/nautilus-locked-folder/Makefile6
-rw-r--r--deskutils/nautilus-open-terminal/Makefile4
-rw-r--r--deskutils/orage/Makefile3
-rw-r--r--devel/Makefile1
-rw-r--r--devel/anjuta/Makefile54
-rw-r--r--devel/anjuta/distinfo6
-rw-r--r--devel/anjuta/files/patch-global-tags_create_global_tags.sh23
-rw-r--r--devel/anjuta/files/patch-plugins_symbol-db_Makefile.in11
-rw-r--r--devel/anjuta/pkg-plist351
-rw-r--r--devel/bug-buddy/Makefile4
-rw-r--r--devel/bug-buddy/distinfo6
-rw-r--r--devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc37
-rw-r--r--devel/bug-buddy/pkg-plist11
-rw-r--r--devel/devhelp/Makefile9
-rw-r--r--devel/devhelp/distinfo6
-rw-r--r--devel/devhelp/files/patch-src_dh-base.c19
-rw-r--r--devel/devhelp/pkg-plist27
-rw-r--r--devel/gconf2/Makefile4
-rw-r--r--devel/gconf2/distinfo6
-rw-r--r--devel/gconf2/files/patch-ab11
-rw-r--r--devel/gconf2/files/patch-gconf_default.path.in11
-rw-r--r--devel/gconf2/files/patch-gconf_gconfd.c62
-rw-r--r--devel/gconf2/files/patch-gconf_gconftool.c16
-rw-r--r--devel/gio-fam-backend/Makefile5
-rw-r--r--devel/gio-fam-backend/distinfo6
-rw-r--r--devel/glade3/Makefile5
-rw-r--r--devel/glade3/distinfo6
-rw-r--r--devel/glade3/pkg-plist118
-rw-r--r--devel/glib20/Makefile5
-rw-r--r--devel/glib20/distinfo6
-rw-r--r--devel/glib20/pkg-plist1
-rw-r--r--devel/glibmm/Makefile4
-rw-r--r--devel/glibmm/distinfo6
-rw-r--r--devel/glibmm/pkg-plist6
-rw-r--r--devel/gnome-build/Makefile35
-rw-r--r--devel/gnome-build/distinfo3
-rw-r--r--devel/gnome-build/pkg-descr3
-rw-r--r--devel/gnome-build/pkg-plist109
-rw-r--r--devel/gnome-common/Makefile4
-rw-r--r--devel/gnome-common/distinfo6
-rw-r--r--devel/gnome-vfsmm/Makefile4
-rw-r--r--devel/gnome-vfsmm/distinfo6
-rw-r--r--devel/gnome2-hacker-tools/Makefile5
-rw-r--r--devel/gvfs/Makefile4
-rw-r--r--devel/gvfs/distinfo6
-rw-r--r--devel/gvfs/files/patch-configure87
-rw-r--r--devel/gvfs/pkg-plist10
-rw-r--r--devel/libgtop/Makefile4
-rw-r--r--devel/libgtop/distinfo6
-rw-r--r--devel/libgtop/pkg-plist3
-rw-r--r--devel/libical/Makefile2
-rw-r--r--devel/libical/distinfo6
-rw-r--r--devel/libical/files/patch-configure10
-rw-r--r--devel/libical/pkg-plist6
-rw-r--r--devel/libsoup/Makefile15
-rw-r--r--devel/libsoup/distinfo6
-rw-r--r--devel/libsoup/pkg-plist13
-rw-r--r--editors/gedit-plugins/Makefile9
-rw-r--r--editors/gedit-plugins/distinfo6
-rw-r--r--editors/gedit-plugins/pkg-plist22
-rw-r--r--editors/gedit/Makefile18
-rw-r--r--editors/gedit/distinfo6
-rw-r--r--editors/gedit/files/patch-configure18
-rw-r--r--editors/gedit/files/patch-gedit_gedit-module.c11
-rw-r--r--editors/gedit/pkg-plist72
-rw-r--r--editors/mlview/Makefile2
-rw-r--r--games/gnome-games-extra-data/Makefile4
-rw-r--r--games/gnome-games-extra-data/distinfo6
-rw-r--r--games/gnome-games-extra-data/pkg-plist61
-rw-r--r--games/gnome-games/Makefile17
-rw-r--r--games/gnome-games/distinfo6
-rw-r--r--games/gnome-games/pkg-plist737
-rw-r--r--graphics/eog/Makefile4
-rw-r--r--graphics/eog/distinfo6
-rw-r--r--graphics/eog/pkg-plist23
-rw-r--r--graphics/epdfview/Makefile4
-rw-r--r--graphics/evince/Makefile6
-rw-r--r--graphics/evince/distinfo6
-rw-r--r--graphics/evince/pkg-plist258
-rw-r--r--graphics/gimp-app/Makefile6
-rw-r--r--graphics/inkscape/Makefile4
-rw-r--r--graphics/libgnomecanvas/Makefile6
-rw-r--r--graphics/libgnomecanvas/distinfo6
-rw-r--r--graphics/libgnomecanvas/pkg-plist19
-rw-r--r--graphics/libgnomecanvasmm26/Makefile4
-rw-r--r--graphics/libgnomecanvasmm26/distinfo6
-rw-r--r--graphics/librsvg2/Makefile5
-rw-r--r--graphics/librsvg2/distinfo6
-rw-r--r--graphics/librsvg2/files/patch-cmdline-bugfixes29
-rw-r--r--graphics/osg-devel/Makefile3
-rw-r--r--graphics/poppler-gtk/Makefile2
-rw-r--r--graphics/poppler-gtk/pkg-plist2
-rw-r--r--graphics/poppler-qt4/Makefile4
-rw-r--r--graphics/poppler-qt4/pkg-plist1
-rw-r--r--graphics/poppler/Makefile8
-rw-r--r--graphics/poppler/distinfo6
-rw-r--r--graphics/poppler/files/patch-utils_Makefile.in14
-rw-r--r--graphics/poppler/pkg-plist7
-rw-r--r--graphics/py-poppler/Makefile4
-rw-r--r--graphics/py-poppler/distinfo6
-rw-r--r--lang/vala/Makefile10
-rw-r--r--lang/vala/distinfo6
-rw-r--r--lang/vala/pkg-plist73
-rw-r--r--mail/evolution-exchange/Makefile8
-rw-r--r--mail/evolution-exchange/distinfo6
-rw-r--r--mail/evolution-sharp/Makefile2
-rw-r--r--mail/evolution-sharp/distinfo6
-rw-r--r--mail/evolution/Makefile16
-rw-r--r--mail/evolution/distinfo6
-rw-r--r--mail/evolution/files/patch-widgets_misc_e-calendar-item.c41
-rw-r--r--mail/evolution/pkg-plist477
-rw-r--r--mail/mail-notification/pkg-plist2
-rw-r--r--math/gcalctool/Makefile4
-rw-r--r--math/gcalctool/distinfo6
-rw-r--r--math/gcalctool/pkg-plist33
-rw-r--r--misc/gnome-devel-docs/Makefile4
-rw-r--r--misc/gnome-devel-docs/distinfo6
-rw-r--r--misc/gnome-devel-docs/pkg-plist44
-rw-r--r--misc/gnome-icon-theme/Makefile6
-rw-r--r--misc/gnome-icon-theme/distinfo6
-rw-r--r--misc/gnome-icon-theme/pkg-plist26
-rw-r--r--misc/gnome-osd/pkg-plist2
-rw-r--r--misc/gnome-user-docs/Makefile4
-rw-r--r--misc/gnome-user-docs/distinfo6
-rw-r--r--misc/gnome-user-docs/pkg-plist167
-rw-r--r--misc/gnomehier/Makefile4
-rw-r--r--misc/gnomehier/files/dirlist2
-rw-r--r--misc/quick-lounge-applet/Makefile5
-rw-r--r--misc/quick-lounge-applet/distinfo6
-rw-r--r--misc/quick-lounge-applet/pkg-plist114
-rw-r--r--misc/wmcalendar/Makefile4
-rw-r--r--multimedia/cheese/Makefile6
-rw-r--r--multimedia/cheese/distinfo6
-rw-r--r--multimedia/cheese/pkg-plist19
-rw-r--r--multimedia/gxmms/Makefile7
-rw-r--r--multimedia/swfdec-gnome/Makefile4
-rw-r--r--multimedia/swfdec-gnome/distinfo6
-rw-r--r--multimedia/swfdec-gnome/pkg-plist20
-rw-r--r--multimedia/totem-pl-parser/Makefile4
-rw-r--r--multimedia/totem-pl-parser/distinfo6
-rw-r--r--multimedia/totem-pl-parser/pkg-plist13
-rw-r--r--multimedia/totem/Makefile6
-rw-r--r--multimedia/totem/distinfo6
-rw-r--r--multimedia/totem/pkg-plist62
-rw-r--r--net-im/ayttm/Makefile5
-rw-r--r--net-im/empathy/Makefile14
-rw-r--r--net-im/empathy/distinfo6
-rw-r--r--net-im/empathy/pkg-plist95
-rw-r--r--net/gnome-netstatus/Makefile4
-rw-r--r--net/gnome-netstatus/distinfo6
-rw-r--r--net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c28
-rw-r--r--net/gnome-netstatus/pkg-plist34
-rw-r--r--net/gnome-nettool/Makefile7
-rw-r--r--net/gnome-nettool/distinfo6
-rw-r--r--net/gnome-nettool/files/patch-src_info.c197
-rw-r--r--net/gnome-nettool/files/patch-src_utils.c20
-rw-r--r--net/gnome-nettool/pkg-plist15
-rw-r--r--net/libgweather/Makefile4
-rw-r--r--net/libgweather/distinfo6
-rw-r--r--net/libgweather/pkg-plist19
-rw-r--r--net/tsclient/Makefile7
-rw-r--r--net/vinagre/Makefile5
-rw-r--r--net/vinagre/distinfo6
-rw-r--r--net/vinagre/pkg-plist25
-rw-r--r--net/vino/Makefile7
-rw-r--r--net/vino/distinfo6
-rw-r--r--net/vino/files/patch-configure28
-rw-r--r--net/vino/files/patch-server_libvncserver_sockets.c42
-rw-r--r--net/vino/files/patch-server_vino-dbus-listener.c12
-rw-r--r--net/vino/pkg-plist6
-rw-r--r--print/freetype2/Makefile5
-rw-r--r--print/freetype2/distinfo6
-rw-r--r--print/freetype2/pkg-plist1
-rw-r--r--security/gnome-keyring/Makefile5
-rw-r--r--security/gnome-keyring/distinfo6
-rw-r--r--security/gnome-keyring/files/patch-common_gkr-daemon-util.h11
-rw-r--r--security/gnome-keyring/files/patch-configure25
-rw-r--r--security/gnome-keyring/files/patch-egg_egg-asn1.h14
-rw-r--r--security/gnome-keyring/files/patch-pam_gkr-pam-client.c18
-rw-r--r--security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c10
-rw-r--r--security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in11
-rw-r--r--security/gnome-keyring/pkg-plist32
-rw-r--r--security/seahorse-plugins/Makefile17
-rw-r--r--security/seahorse-plugins/distinfo6
-rw-r--r--security/seahorse-plugins/pkg-plist165
-rw-r--r--security/seahorse/Makefile6
-rw-r--r--security/seahorse/distinfo6
-rw-r--r--security/seahorse/files/patch-common_seahorse-registry.c52
-rw-r--r--security/seahorse/files/patch-src_seahorse-generate-select.c14
-rw-r--r--security/seahorse/files/patch-src_seahorse-viewer.c17
-rw-r--r--security/seahorse/pkg-plist151
-rw-r--r--security/tuntun/Makefile2
-rw-r--r--sysutils/Makefile1
-rw-r--r--sysutils/brasero/Makefile28
-rw-r--r--sysutils/brasero/distinfo6
-rw-r--r--sysutils/brasero/files/patch-src_brasero-data-project.c38
-rw-r--r--sysutils/brasero/files/patch-src_scsi-cam.c22
-rw-r--r--sysutils/brasero/pkg-plist64
-rw-r--r--sysutils/bubblemon2/Makefile6
-rw-r--r--sysutils/gconf-editor/Makefile4
-rw-r--r--sysutils/gconf-editor/distinfo6
-rw-r--r--sysutils/gconf-editor/pkg-plist100
-rw-r--r--sysutils/gnome-control-center/Makefile6
-rw-r--r--sysutils/gnome-control-center/distinfo6
-rw-r--r--sysutils/gnome-control-center/pkg-plist55
-rw-r--r--sysutils/gnome-power-manager/Makefile3
-rw-r--r--sysutils/gnome-settings-daemon/Makefile7
-rw-r--r--sysutils/gnome-settings-daemon/distinfo6
-rw-r--r--sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c10
-rw-r--r--sysutils/gnome-settings-daemon/files/patch-plugins_background_gsd-background-manager.c21
-rw-r--r--sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c35
-rw-r--r--sysutils/gnome-settings-daemon/pkg-plist10
-rw-r--r--sysutils/gnome-system-monitor/Makefile4
-rw-r--r--sysutils/gnome-system-monitor/distinfo6
-rw-r--r--sysutils/gnome-system-monitor/pkg-plist23
-rw-r--r--sysutils/gnome-volume-manager/Makefile30
-rw-r--r--sysutils/gnome-volume-manager/distinfo3
-rw-r--r--sysutils/gnome-volume-manager/files/patch-gnome-volume-manager.schemas.in11
-rw-r--r--sysutils/gnome-volume-manager/pkg-descr3
-rw-r--r--sysutils/gnome-volume-manager/pkg-plist115
-rw-r--r--sysutils/nautilus-cd-burner/Makefile5
-rw-r--r--sysutils/pessulus/Makefile6
-rw-r--r--sysutils/pessulus/distinfo6
-rw-r--r--sysutils/pessulus/pkg-plist3
-rw-r--r--sysutils/tracker-client/Makefile6
-rw-r--r--sysutils/tracker-client/pkg-plist14
-rw-r--r--sysutils/tracker-gnome/Makefile2
-rw-r--r--sysutils/tracker-gnome/pkg-plist2
-rw-r--r--textproc/gnome-doc-utils/Makefile4
-rw-r--r--textproc/gnome-doc-utils/distinfo6
-rw-r--r--textproc/gnome-doc-utils/pkg-plist3
-rw-r--r--textproc/ibus/Makefile1
-rw-r--r--textproc/ibus/pkg-plist2
-rw-r--r--textproc/libxml++26/Makefile5
-rw-r--r--textproc/libxml++26/distinfo6
-rw-r--r--textproc/uim-gnome/Makefile2
-rw-r--r--www/Makefile1
-rw-r--r--www/epiphany-extensions/Makefile9
-rw-r--r--www/epiphany-extensions/distinfo6
-rw-r--r--www/epiphany-extensions/pkg-plist4
-rw-r--r--www/epiphany/Makefile16
-rw-r--r--www/epiphany/distinfo6
-rw-r--r--www/epiphany/pkg-plist7
-rw-r--r--www/evolution-webcal/Makefile4
-rw-r--r--www/evolution-webcal/distinfo6
-rw-r--r--www/evolution-webcal/pkg-plist1
-rw-r--r--www/gnome-user-share/Makefile16
-rw-r--r--www/gnome-user-share/distinfo6
-rw-r--r--www/gnome-user-share/pkg-message8
-rw-r--r--www/gnome-user-share/pkg-plist100
-rw-r--r--www/gtkhtml3/Makefile4
-rw-r--r--www/gtkhtml3/distinfo6
-rw-r--r--www/libxul/Makefile56
-rw-r--r--www/libxul/distinfo3
-rw-r--r--www/libxul/files/patch-config-mkdepend-imakemdep.h10
-rw-r--r--www/libxul/files/patch-config_autoconf.mk.in21
-rw-r--r--www/libxul/files/patch-config_mkdepend_Makefile.in10
-rw-r--r--www/libxul/files/patch-config_rules.mk14
-rw-r--r--www/libxul/files/patch-configure38
-rw-r--r--www/libxul/files/patch-embedding_base_nsEmbedAPI.cpp16
-rw-r--r--www/libxul/files/patch-security_coreconf_FreeBSD.mk37
-rw-r--r--www/libxul/files/patch-toolkit_mozapps_installer_packager.mk11
-rw-r--r--www/libxul/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc11
-rw-r--r--www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in54
-rw-r--r--www/libxul/files/patch-xptcall-alpha459
-rw-r--r--www/libxul/files/patch-xptcall-amd64386
-rw-r--r--www/libxul/files/patch-xptcall-sparc64327
-rw-r--r--www/libxul/files/patch-xulrunner_app_mozilla.in18
-rw-r--r--www/libxul/files/patch-xulrunner_installer_libxul.pc.in11
-rw-r--r--www/libxul/pkg-descr7
-rw-r--r--www/mozilla/Makefile5
-rw-r--r--www/mozilla/pkg-deinstall.in2
-rw-r--r--www/mozilla/pkg-install.in2
-rw-r--r--x11-fm/nautilus/Makefile10
-rw-r--r--x11-fm/nautilus/distinfo6
-rw-r--r--x11-fm/nautilus/pkg-plist38
-rw-r--r--x11-fm/py-nautilus/Makefile6
-rw-r--r--x11-fm/velocity/Makefile4
-rw-r--r--x11-themes/gnome-themes/Makefile4
-rw-r--r--x11-themes/gnome-themes/distinfo6
-rw-r--r--x11-themes/gnome-themes/pkg-plist245
-rw-r--r--x11-themes/gtk-engines2/Makefile4
-rw-r--r--x11-themes/gtk-engines2/distinfo6
-rw-r--r--x11-themes/gtk-engines2/pkg-plist4
-rw-r--r--x11-toolkits/eel/Makefile4
-rw-r--r--x11-toolkits/eel/distinfo6
-rw-r--r--x11-toolkits/eel/files/patch-eel_eel-gnome-extensions.c12
-rw-r--r--x11-toolkits/eel/files/patch-eel_eel-stock-dialogs.c28
-rw-r--r--x11-toolkits/eel/pkg-plist2
-rw-r--r--x11-toolkits/gai/Makefile3
-rw-r--r--x11-toolkits/gai/files/patch-gai_Makefile.in2
-rw-r--r--x11-toolkits/gdl/Makefile4
-rw-r--r--x11-toolkits/gdl/distinfo6
-rw-r--r--x11-toolkits/gdl/pkg-plist10
-rw-r--r--x11-toolkits/gtk20/Makefile6
-rw-r--r--x11-toolkits/gtk20/distinfo6
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk-56158316
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_gtkscalebutton.c133
-rw-r--r--x11-toolkits/gtk20/pkg-plist7
-rw-r--r--x11-toolkits/gtk30/Makefile6
-rw-r--r--x11-toolkits/gtk30/distinfo6
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk-56158316
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_gtkscalebutton.c133
-rw-r--r--x11-toolkits/gtk30/pkg-plist7
-rw-r--r--x11-toolkits/gtkmm24/Makefile4
-rw-r--r--x11-toolkits/gtkmm24/distinfo6
-rw-r--r--x11-toolkits/gtkmm24/pkg-plist4
-rw-r--r--x11-toolkits/gtksourceview2/Makefile4
-rw-r--r--x11-toolkits/gtksourceview2/distinfo6
-rw-r--r--x11-toolkits/gtksourceview2/pkg-plist7
-rw-r--r--x11-toolkits/libgnomeuimm26/Makefile4
-rw-r--r--x11-toolkits/libgnomeuimm26/distinfo6
-rw-r--r--x11-toolkits/libpanelappletmm/Makefile2
-rw-r--r--x11-toolkits/libwnck/Makefile4
-rw-r--r--x11-toolkits/libwnck/distinfo6
-rw-r--r--x11-toolkits/libwnck/pkg-plist3
-rw-r--r--x11-toolkits/ocaml-lablgtk2/Makefile2
-rw-r--r--x11-toolkits/pango/Makefile9
-rw-r--r--x11-toolkits/pango/distinfo6
-rw-r--r--x11-toolkits/pango/files/patch-pango-view_Makefile.in11
-rw-r--r--x11-toolkits/pangomm/Makefile4
-rw-r--r--x11-toolkits/pangomm/distinfo6
-rw-r--r--x11-toolkits/py-gnome-desktop/Makefile13
-rw-r--r--x11-toolkits/py-gnome-desktop/distinfo6
-rw-r--r--x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c10
-rw-r--r--x11-toolkits/py-gnome-desktop/pkg-plist10
-rw-r--r--x11-toolkits/py-gnome-extras/Makefile8
-rw-r--r--x11-toolkits/py-gnome-extras/distinfo6
-rw-r--r--x11-toolkits/py-gnome-extras/files/patch-configure679
-rw-r--r--x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs67
-rw-r--r--x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override10
-rw-r--r--x11-toolkits/py-gnome-extras/pkg-plist21
-rw-r--r--x11-toolkits/py-gnome2/Makefile4
-rw-r--r--x11-toolkits/py-gnome2/distinfo6
-rw-r--r--x11-toolkits/py-gtksourceview/Makefile4
-rw-r--r--x11-toolkits/py-gtksourceview/distinfo6
-rw-r--r--x11-toolkits/py-vte/Makefile4
-rw-r--r--x11-toolkits/py-vte/pkg-plist2
-rw-r--r--x11-toolkits/ruby-panelapplet/Makefile4
-rw-r--r--x11-toolkits/vte/Makefile8
-rw-r--r--x11-toolkits/vte/distinfo6
-rw-r--r--x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in17
-rw-r--r--x11-toolkits/vte/files/patch-gnome-pty-helper_configure27
-rw-r--r--x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c26
-rw-r--r--x11-toolkits/vte/files/patch-python_Makefile.in33
-rw-r--r--x11-toolkits/vte/pkg-plist8
-rw-r--r--x11-wm/metacity/Makefile15
-rw-r--r--x11-wm/metacity/distinfo6
-rw-r--r--x11-wm/metacity/files/patch-configure8
-rw-r--r--x11-wm/metacity/files/patch-src_core_main.c51
-rw-r--r--x11-wm/metacity/files/patch-src_core_util.c11
-rw-r--r--x11-wm/metacity/pkg-plist27
-rw-r--r--x11/gdm/Makefile6
-rw-r--r--x11/gdm/distinfo6
-rw-r--r--x11/gdm/files/gdm.in2
-rw-r--r--x11/gdm/files/patch-common_gdm-settings-keys.h10
-rw-r--r--x11/gdm/files/patch-daemon-gdm-server.c73
-rw-r--r--x11/gdm/files/patch-data_gdm.schemas.in.in14
-rw-r--r--x11/gdm/pkg-plist32
-rw-r--r--x11/gnome-applets/Makefile7
-rw-r--r--x11/gnome-applets/distinfo6
-rw-r--r--x11/gnome-applets/pkg-plist246
-rw-r--r--x11/gnome-desktop/Makefile10
-rw-r--r--x11/gnome-desktop/distinfo6
-rw-r--r--x11/gnome-desktop/pkg-plist29
-rw-r--r--x11/gnome-menus/Makefile4
-rw-r--r--x11/gnome-menus/distinfo6
-rw-r--r--x11/gnome-menus/pkg-plist18
-rw-r--r--x11/gnome-panel/Makefile9
-rw-r--r--x11/gnome-panel/distinfo6
-rw-r--r--x11/gnome-panel/pkg-plist79
-rw-r--r--x11/gnome-screensaver/Makefile6
-rw-r--r--x11/gnome-screensaver/distinfo6
-rw-r--r--x11/gnome-session/Makefile4
-rw-r--r--x11/gnome-session/distinfo6
-rw-r--r--x11/gnome-session/files/patch-gnome-session_Makefile.in12
-rw-r--r--x11/gnome-session/pkg-plist29
-rw-r--r--x11/gnome-swallow/Makefile7
-rw-r--r--x11/gnome-terminal/Makefile4
-rw-r--r--x11/gnome-terminal/distinfo6
-rw-r--r--x11/gnome-terminal/pkg-plist14
-rw-r--r--x11/gnome2/Makefile12
-rw-r--r--x11/libgnome/Makefile4
-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/Makefile4
-rw-r--r--x11/libgnomekbd/distinfo6
-rw-r--r--x11/libgnomekbd/pkg-plist2
-rw-r--r--x11/libgnomemm26/Makefile4
-rw-r--r--x11/libgnomemm26/distinfo6
-rw-r--r--x11/libxklavier/Makefile4
-rw-r--r--x11/libxklavier/distinfo6
-rw-r--r--x11/workrave/Makefile6
-rw-r--r--x11/yelp/Makefile9
-rw-r--r--x11/yelp/distinfo6
-rw-r--r--x11/yelp/files/patch-data_man.xml.in12
-rw-r--r--x11/yelp/files/patch-src_yelp-gecko-utils.cpp13
-rw-r--r--x11/yelp/pkg-plist16
-rw-r--r--x11/zenity/Makefile4
-rw-r--r--x11/zenity/distinfo6
-rw-r--r--x11/zenity/pkg-plist16
481 files changed, 7314 insertions, 4267 deletions
diff --git a/MOVED b/MOVED
index 8b7a7f071fe4..0f91ae49793e 100644
--- a/MOVED
+++ b/MOVED
@@ -3907,3 +3907,5 @@ x11-themes/camaelon-nesedah||2009-04-04|Has expired: now included in camaelon
x11-wm/compiz-fusion-plugins-main|x11-wm/compiz-plugins-main|2009-04-08|Dropping the fusion name
x11-wm/compiz-fusion-plugins-extra|x11-wm/compiz-plugins-extra|2009-04-08|Dropping the fusion name
x11-wm/compiz-fusion-plugins-unsupported|x11-wm/compiz-plugins-unsupported|2009-04-08|Dropping the fusion name
+devel/gnome-build||2009-04-10|This port has been merged into anjuta and is now obsolete
+sysutils/gnome-volume-manager||2009-04-10|This port has been obsoleted by Nautilus
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 0084cdcf9d1d..4674db5d4130 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -5,7 +5,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/Mk/bsd.gecko.mk,v 1.12 2008/08/07 04:42:34 mezz Exp $
+# $MCom: ports/Mk/bsd.gecko.mk,v 1.10 2009/04/04 19:54:48 marcus Exp $
#
# 4 column tabs prevent hair loss and tooth decay!
@@ -79,9 +79,11 @@ Gecko_Pre_Include= bsd.gecko.mk
# ${WRKSRC}/configure
# .endif
-_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner flock mozilla
+_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner flock mozilla \
+ libxul
thunderbird_PORTSDIR= mail
+libxul_PLIST= ${LOCALBASE}/lib/libxul/libxul.so
.for gecko in ${_GECKO_ALL}
${gecko}_PORTSDIR?= www
@@ -247,6 +249,7 @@ MAINTAINER?= gnome@FreeBSD.org
MOZILLA?= ${PORTNAME}
MOZILLA_VER?= ${PORTVERSION}
MOZILLA_BIN?= ${PORTNAME}-bin
+MOZILLA_EXEC_NAME?=${MOZILLA}
MOZ_RPATH?= ${MOZILLA}
USE_GNOME+= gtk20 libidl desktopfileutils
USE_ICONV= yes
@@ -272,7 +275,7 @@ GENERIC_MOZCONFIG?= ${.CURDIR}/../../www/mozilla/files/mozconfig-generic.in
PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in
MOZCONFIG?= ${WRKSRC}/.mozconfig
MOZILLA_PLIST_DIRS?= bin include lib share/idl
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
+GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
PKGINSTALL?= ${WRKDIR}/pkg-install
PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall
MASTER_MOZDIR?= ${PORTSDIR}/www/mozilla
@@ -575,10 +578,10 @@ gecko-pre-install:
.endfor
@${REINPLACE_CMD} -e 's|${MOZILLA}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}|; \
s|$${progbase}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}-bin|' \
- ${FAKEDIR}/bin/${MOZILLA}*
+ ${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}*
.endif
@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
- ${FAKEDIR}/bin/${MOZILLA}*
+ ${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}*
${RM} -f ${FAKEDIR}/bin/*.bak
.endif
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 1b53775b1409..c2e31517f30f 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -3,20 +3,15 @@
#
# $FreeBSD$
# $NetBSD: $
-# $MCom: ports/Mk/bsd.gnome.mk,v 1.471 2008/09/01 16:45:46 ahze Exp $
+# $MCom: ports/Mk/bsd.gnome.mk,v 1.479 2009/03/14 05:55:36 marcus Exp $
#
# Please view me with 4 column tabs!
-#######################################################
-#
-# *** WARNING: Disable MARCUSCOM before merge in FreeBSD!
-#
-#MARCUSCOM_CVS=yes
# ======================= USERS =================================
-#
+#
# There are no significant user-definable settings in here.
# This file is a framework to make it easier to create GNOME ports.
-#
+#
# ======================= /USERS ================================
.if !defined(_POSTMKINCLUDED) && !defined(Gnome_Pre_Include)
@@ -356,7 +351,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.7:${PORTSDIR}/x11/gnome-desktop
+gnomedesktop_LIB_DEPENDS= gnome-desktop-2.11:${PORTSDIR}/x11/gnome-desktop
gnomedesktop_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-2.0.pc
gnomedesktop_USE_GNOME_IMPL= libgnomeui gnomedocutils
gnomedesktop_GNOME_DESKTOP_VERSION=2
@@ -393,7 +388,7 @@ gnomepanel_GNOME_DESKTOP_VERSION=2
nautilus2_LIB_DEPENDS= nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus
nautilus2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libnautilus-extension.pc
-nautilus2_USE_GNOME_IMPL=librsvg2 eel2 gnomedesktop desktopfileutils gvfs
+nautilus2_USE_GNOME_IMPL=librsvg2 gnomedesktop desktopfileutils gvfs
nautilus2_GNOME_DESKTOP_VERSION=2
metacity_LIB_DEPENDS= metacity-private.0:${PORTSDIR}/x11-wm/metacity
@@ -502,7 +497,7 @@ gnomedocutils_USE_GNOME_IMPL=libxslt
pygnomedesktop_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-python-desktop-2.0.pc
pygnomedesktop_BUILD_DEPENDS= ${pygnomedesktop_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome-desktop
pygnomedesktop_RUN_DEPENDS= ${pygnomedesktop_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome-desktop
-pygnomedesktop_USE_GNOME_IMPL=pygnome2 libgnomeprintui gtksourceview gnomepanel libwnck nautiluscdburner metacity
+pygnomedesktop_USE_GNOME_IMPL=pygnome2 libgnomeprintui gtksourceview gnomepanel libwnck nautilus2 metacity
gtksharp10_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk-sharp.pc
gtksharp10_BUILD_DEPENDS= ${gtksharp10_DETECT}:${PORTSDIR}/x11-toolkits/gtk-sharp10
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index 7ad0af553276..8afe07d8bd1e 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/accerciser/Makefile,v 1.23 2008/09/23 05:14:40 marcus Exp $
+# $MCom: ports/accessibility/accerciser/Makefile,v 1.26 2009/03/17 13:06:24 kwm Exp $
#
PORTNAME= accerciser
-PORTVERSION= 1.4.0
+PORTVERSION= 1.6.0
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/accerciser/distinfo b/accessibility/accerciser/distinfo
index f82295c923f3..667789dd9ab5 100644
--- a/accessibility/accerciser/distinfo
+++ b/accessibility/accerciser/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/accerciser-1.4.0.tar.bz2) = c46b768906d6a02f83bf96e8843890c1
-SHA256 (gnome2/accerciser-1.4.0.tar.bz2) = ca714cf55dca66637a63725c019afde7082763d281721801a77e600bda5db6c6
-SIZE (gnome2/accerciser-1.4.0.tar.bz2) = 1338182
+MD5 (gnome2/accerciser-1.6.0.tar.bz2) = 04236a82648a4859811f959cc5576d06
+SHA256 (gnome2/accerciser-1.6.0.tar.bz2) = bcfc077c0bf212dfec550baff1db93229eebceafb8f6c1defa60dcd000e61af3
+SIZE (gnome2/accerciser-1.6.0.tar.bz2) = 1341848
diff --git a/accessibility/accerciser/pkg-plist b/accessibility/accerciser/pkg-plist
index f6a5aac4b85d..2d604d0600fc 100644
--- a/accessibility/accerciser/pkg-plist
+++ b/accessibility/accerciser/pkg-plist
@@ -163,12 +163,30 @@ share/gnome/help/accerciser/ca/figures/api_browser.png
share/gnome/help/accerciser/ca/figures/event_monitor.png
share/gnome/help/accerciser/ca/figures/interface_viewer.png
share/gnome/help/accerciser/ca/figures/script_recorder.png
+share/gnome/help/accerciser/cs/accerciser.xml
+share/gnome/help/accerciser/cs/figures/accerciser.png
+share/gnome/help/accerciser/cs/figures/api_browser.png
+share/gnome/help/accerciser/cs/figures/event_monitor.png
+share/gnome/help/accerciser/cs/figures/interface_viewer.png
+share/gnome/help/accerciser/cs/figures/script_recorder.png
+share/gnome/help/accerciser/de/accerciser.xml
+share/gnome/help/accerciser/de/figures/accerciser.png
+share/gnome/help/accerciser/de/figures/api_browser.png
+share/gnome/help/accerciser/de/figures/event_monitor.png
+share/gnome/help/accerciser/de/figures/interface_viewer.png
+share/gnome/help/accerciser/de/figures/script_recorder.png
share/gnome/help/accerciser/en_GB/accerciser.xml
share/gnome/help/accerciser/en_GB/figures/accerciser.png
share/gnome/help/accerciser/en_GB/figures/api_browser.png
share/gnome/help/accerciser/en_GB/figures/event_monitor.png
share/gnome/help/accerciser/en_GB/figures/interface_viewer.png
share/gnome/help/accerciser/en_GB/figures/script_recorder.png
+share/gnome/help/accerciser/el/accerciser.xml
+share/gnome/help/accerciser/el/figures/accerciser.png
+share/gnome/help/accerciser/el/figures/api_browser.png
+share/gnome/help/accerciser/el/figures/event_monitor.png
+share/gnome/help/accerciser/el/figures/interface_viewer.png
+share/gnome/help/accerciser/el/figures/script_recorder.png
share/gnome/help/accerciser/es/accerciser.xml
share/gnome/help/accerciser/es/figures/accerciser.png
share/gnome/help/accerciser/es/figures/api_browser.png
@@ -187,6 +205,12 @@ share/gnome/help/accerciser/oc/figures/api_browser.png
share/gnome/help/accerciser/oc/figures/event_monitor.png
share/gnome/help/accerciser/oc/figures/interface_viewer.png
share/gnome/help/accerciser/oc/figures/script_recorder.png
+share/gnome/help/accerciser/pt_BR/accerciser.xml
+share/gnome/help/accerciser/pt_BR/figures/accerciser.png
+share/gnome/help/accerciser/pt_BR/figures/api_browser.png
+share/gnome/help/accerciser/pt_BR/figures/event_monitor.png
+share/gnome/help/accerciser/pt_BR/figures/interface_viewer.png
+share/gnome/help/accerciser/pt_BR/figures/script_recorder.png
share/gnome/help/accerciser/sv/accerciser.xml
share/gnome/help/accerciser/sv/figures/accerciser.png
share/gnome/help/accerciser/sv/figures/api_browser.png
@@ -211,6 +235,7 @@ share/locale/el/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
+share/locale/eu/LC_MESSAGES/accerciser.mo
share/locale/fi/LC_MESSAGES/accerciser.mo
share/locale/fr/LC_MESSAGES/accerciser.mo
share/locale/gl/LC_MESSAGES/accerciser.mo
@@ -249,22 +274,34 @@ share/locale/zh_HK/LC_MESSAGES/accerciser.mo
share/locale/zh_TW/LC_MESSAGES/accerciser.mo
share/omf/accerciser/accerciser-C.omf
share/omf/accerciser/accerciser-ca.omf
+share/omf/accerciser/accerciser-cs.omf
+share/omf/accerciser/accerciser-de.omf
share/omf/accerciser/accerciser-en_GB.omf
+share/omf/accerciser/accerciser-el.omf
share/omf/accerciser/accerciser-es.omf
share/omf/accerciser/accerciser-fr.omf
share/omf/accerciser/accerciser-oc.omf
+share/omf/accerciser/accerciser-pt_BR.omf
share/omf/accerciser/accerciser-sv.omf
@dirrm share/omf/accerciser
@dirrm share/gnome/help/accerciser/sv/figures
@dirrm share/gnome/help/accerciser/sv
+@dirrm share/gnome/help/accerciser/pt_BR/figures
+@dirrm share/gnome/help/accerciser/pt_BR
@dirrm share/gnome/help/accerciser/oc/figures
@dirrm share/gnome/help/accerciser/oc
@dirrm share/gnome/help/accerciser/fr/figures
@dirrm share/gnome/help/accerciser/fr
@dirrm share/gnome/help/accerciser/es/figures
@dirrm share/gnome/help/accerciser/es
+@dirrm share/gnome/help/accerciser/el/figures
+@dirrm share/gnome/help/accerciser/el
@dirrm share/gnome/help/accerciser/en_GB/figures
@dirrm share/gnome/help/accerciser/en_GB
+@dirrm share/gnome/help/accerciser/de/figures
+@dirrm share/gnome/help/accerciser/de
+@dirrm share/gnome/help/accerciser/cs/figures
+@dirrm share/gnome/help/accerciser/cs
@dirrm share/gnome/help/accerciser/ca/figures
@dirrm share/gnome/help/accerciser/ca
@dirrm share/gnome/help/accerciser/C/figures
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 73a30f595b99..71f4f9ac9670 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/at-spi/Makefile,v 1.81 2009/01/09 21:48:35 kwm Exp $
+# $MCom: ports/accessibility/at-spi/Makefile,v 1.85 2009/03/17 13:55:06 kwm Exp $
#
PORTNAME= at-spi
-PORTVERSION= 1.24.1
+PORTVERSION= 1.26.0
PORTREVISION?= 0
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= GNOME
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
index fb4ceea272c2..a30a7568e93a 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/at-spi-1.24.1.tar.bz2) = 8e98aadfaca757799cb18ea92f40d21a
-SHA256 (gnome2/at-spi-1.24.1.tar.bz2) = f21746c4b4694aec821f545634a3f3bc2a627120fbb9b3aea546f59368025709
-SIZE (gnome2/at-spi-1.24.1.tar.bz2) = 821177
+MD5 (gnome2/at-spi-1.26.0.tar.bz2) = 3f2f7d29b45eff08adf56af0d31d3984
+SHA256 (gnome2/at-spi-1.26.0.tar.bz2) = bb8c9473a277fa75f172fa16fb6ada85f4a919219818fd9c792f1a137bb2644d
+SIZE (gnome2/at-spi-1.26.0.tar.bz2) = 829621
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 066a62d26890..82d8b98515ec 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -102,6 +102,8 @@ share/idl/at-spi-1.0/Accessibility_Text.idl
share/idl/at-spi-1.0/Accessibility_Value.idl
share/locale/ang/LC_MESSAGES/at-spi.mo
share/locale/ar/LC_MESSAGES/at-spi.mo
+share/locale/as/LC_MESSAGES/at-spi.mo
+share/locale/ast/LC_MESSAGES/at-spi.mo
share/locale/az/LC_MESSAGES/at-spi.mo
share/locale/be/LC_MESSAGES/at-spi.mo
share/locale/be@latin/LC_MESSAGES/at-spi.mo
@@ -110,6 +112,7 @@ share/locale/bn/LC_MESSAGES/at-spi.mo
share/locale/bn_IN/LC_MESSAGES/at-spi.mo
share/locale/bs/LC_MESSAGES/at-spi.mo
share/locale/ca/LC_MESSAGES/at-spi.mo
+share/locale/crh/LC_MESSAGES/at-spi.mo
share/locale/cs/LC_MESSAGES/at-spi.mo
share/locale/cy/LC_MESSAGES/at-spi.mo
share/locale/da/LC_MESSAGES/at-spi.mo
@@ -140,6 +143,7 @@ share/locale/ka/LC_MESSAGES/at-spi.mo
share/locale/ko/LC_MESSAGES/at-spi.mo
share/locale/ku/LC_MESSAGES/at-spi.mo
share/locale/lt/LC_MESSAGES/at-spi.mo
+share/locale/lv/LC_MESSAGES/at-spi.mo
share/locale/mk/LC_MESSAGES/at-spi.mo
share/locale/ml/LC_MESSAGES/at-spi.mo
share/locale/mn/LC_MESSAGES/at-spi.mo
@@ -212,9 +216,15 @@ share/locale/zh_TW/LC_MESSAGES/at-spi.mo
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
@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
@dirrmtry share/locale/ang/LC_MESSAGES
@dirrmtry share/locale/ang
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 32193ce1649f..73747e615ba0 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.93 2008/09/22 10:50:30 kwm Exp $
+# $MCom: ports/accessibility/atk/Makefile,v 1.95 2009/03/17 14:03:48 kwm Exp $
#
PORTNAME= atk
-PORTVERSION= 1.24.0
+PORTVERSION= 1.26.0
PORTREVISION?= 0
CATEGORIES= accessibility devel
MASTER_SITES= GNOME
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 1b00330377c9..73c5f03a5c57 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/atk-1.24.0.tar.bz2) = fb0ee9c7f18b15b490a0168b13740a4d
-SHA256 (gnome2/atk-1.24.0.tar.bz2) = 03a0b66efb6d69754ca18c133ca4d489dd8675bf366c03f58cc7b39f55a45d56
-SIZE (gnome2/atk-1.24.0.tar.bz2) = 701798
+MD5 (gnome2/atk-1.26.0.tar.bz2) = 719229408019c548855673840679f156
+SHA256 (gnome2/atk-1.26.0.tar.bz2) = f7993d26c3606a9b0e32d1eebe716f2294ac37fac014c47744e986fc0ff5e6d1
+SIZE (gnome2/atk-1.26.0.tar.bz2) = 719807
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 7aa630dfbb46..28df9d79230e 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -76,6 +76,7 @@ share/locale/ku/LC_MESSAGES/atk10.mo
share/locale/li/LC_MESSAGES/atk10.mo
share/locale/lt/LC_MESSAGES/atk10.mo
share/locale/lv/LC_MESSAGES/atk10.mo
+share/locale/mai/LC_MESSAGES/atk10.mo
share/locale/mk/LC_MESSAGES/atk10.mo
share/locale/ml/LC_MESSAGES/atk10.mo
share/locale/mn/LC_MESSAGES/atk10.mo
@@ -146,6 +147,8 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
@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/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 7badcd4ad624..b53236799ff3 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -3,12 +3,11 @@
# Whom: lewiz <purple@lewiz.net>
#
# $FreeBSD$
-# $MCom: ports/accessibility/dasher/Makefile,v 1.64 2008/06/06 21:38:44 marcus Exp $
+# $MCom: ports/accessibility/dasher/Makefile,v 1.66 2009/03/18 04:59:21 marcus Exp $
#
PORTNAME= dasher
-PORTVERSION= 4.9.0
-PORTREVISION= 1
+PORTVERSION= 4.10.0
PORTEPOCH= 2
CATEGORIES= accessibility editors x11 gnome
MASTER_SITES= GNOME
diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo
index 8a3188f20c6f..08bf978af8fd 100644
--- a/accessibility/dasher/distinfo
+++ b/accessibility/dasher/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/dasher-4.9.0.tar.bz2) = f6f024878f258a9506e62cf717446437
-SHA256 (gnome2/dasher-4.9.0.tar.bz2) = abb15328c95c786390fc9ea5f7470a247880f05b2aacdd3cd083067a0e374a3e
-SIZE (gnome2/dasher-4.9.0.tar.bz2) = 6734895
+MD5 (gnome2/dasher-4.10.0.tar.bz2) = d07fa31c3a8ead147f981efa90193c56
+SHA256 (gnome2/dasher-4.10.0.tar.bz2) = 0aa214914417c61ffd9be30e55ae7290a7aa08c403be607535dae1983c190d77
+SIZE (gnome2/dasher-4.10.0.tar.bz2) = 6645541
diff --git a/accessibility/dasher/files/patch-configure b/accessibility/dasher/files/patch-configure
deleted file mode 100644
index bde9cc59ce4f..000000000000
--- a/accessibility/dasher/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Sun Dec 3 18:59:04 2006
-+++ configure Sun Dec 3 18:59:15 2006
-@@ -23152,7 +23152,7 @@ echo "$as_me:$LINENO: result: $have_prog
- echo "${ECHO_T}$have_prog_gnu_ld" >&6
-
- if [ x"$have_prog_gnu_ld" = xyes ]; then
-- ed_flags="-Wl,--export-dynamic,"
-+ ed_flags="-Wl,--export-dynamic"
- else
- ed_flags=""
- fi
diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist
index 885ff8fd28da..795eee87adac 100644
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@@ -202,6 +202,38 @@ share/gnome/help/dasher/C/figures/prefs2.png
share/gnome/help/dasher/C/figures/prefs3.png
share/gnome/help/dasher/C/figures/prefs4.png
share/gnome/help/dasher/C/figures/prefs5.png
+share/gnome/help/dasher/de/dasher.xml
+share/gnome/help/dasher/de/figures/a-z.gif
+share/gnome/help/dasher/de/figures/aa-az.gif
+share/gnome/help/dasher/de/figures/ala-alz.gif
+share/gnome/help/dasher/de/figures/exampleHad2.png
+share/gnome/help/dasher/de/figures/exampleHad2a.png
+share/gnome/help/dasher/de/figures/exampleHad3a.png
+share/gnome/help/dasher/de/figures/exampleHad4.png
+share/gnome/help/dasher/de/figures/figure2.png
+share/gnome/help/dasher/de/figures/main.png
+share/gnome/help/dasher/de/figures/object.gif
+share/gnome/help/dasher/de/figures/prefs1.png
+share/gnome/help/dasher/de/figures/prefs2.png
+share/gnome/help/dasher/de/figures/prefs3.png
+share/gnome/help/dasher/de/figures/prefs4.png
+share/gnome/help/dasher/de/figures/prefs5.png
+share/gnome/help/dasher/en_GB/dasher.xml
+share/gnome/help/dasher/en_GB/figures/a-z.gif
+share/gnome/help/dasher/en_GB/figures/aa-az.gif
+share/gnome/help/dasher/en_GB/figures/ala-alz.gif
+share/gnome/help/dasher/en_GB/figures/exampleHad2.png
+share/gnome/help/dasher/en_GB/figures/exampleHad2a.png
+share/gnome/help/dasher/en_GB/figures/exampleHad3a.png
+share/gnome/help/dasher/en_GB/figures/exampleHad4.png
+share/gnome/help/dasher/en_GB/figures/figure2.png
+share/gnome/help/dasher/en_GB/figures/main.png
+share/gnome/help/dasher/en_GB/figures/object.gif
+share/gnome/help/dasher/en_GB/figures/prefs1.png
+share/gnome/help/dasher/en_GB/figures/prefs2.png
+share/gnome/help/dasher/en_GB/figures/prefs3.png
+share/gnome/help/dasher/en_GB/figures/prefs4.png
+share/gnome/help/dasher/en_GB/figures/prefs5.png
share/gnome/help/dasher/es/dasher.xml
share/gnome/help/dasher/es/figures/a-z.gif
share/gnome/help/dasher/es/figures/aa-az.gif
@@ -218,6 +250,22 @@ share/gnome/help/dasher/es/figures/prefs2.png
share/gnome/help/dasher/es/figures/prefs3.png
share/gnome/help/dasher/es/figures/prefs4.png
share/gnome/help/dasher/es/figures/prefs5.png
+share/gnome/help/dasher/eu/dasher.xml
+share/gnome/help/dasher/eu/figures/a-z.gif
+share/gnome/help/dasher/eu/figures/aa-az.gif
+share/gnome/help/dasher/eu/figures/ala-alz.gif
+share/gnome/help/dasher/eu/figures/exampleHad2.png
+share/gnome/help/dasher/eu/figures/exampleHad2a.png
+share/gnome/help/dasher/eu/figures/exampleHad3a.png
+share/gnome/help/dasher/eu/figures/exampleHad4.png
+share/gnome/help/dasher/eu/figures/figure2.png
+share/gnome/help/dasher/eu/figures/main.png
+share/gnome/help/dasher/eu/figures/object.gif
+share/gnome/help/dasher/eu/figures/prefs1.png
+share/gnome/help/dasher/eu/figures/prefs2.png
+share/gnome/help/dasher/eu/figures/prefs3.png
+share/gnome/help/dasher/eu/figures/prefs4.png
+share/gnome/help/dasher/eu/figures/prefs5.png
share/gnome/help/dasher/fr/dasher.xml
share/gnome/help/dasher/fr/figures/a-z.gif
share/gnome/help/dasher/fr/figures/aa-az.gif
@@ -284,6 +332,7 @@ share/gnome/help/dasher/sv/figures/prefs4.png
share/gnome/help/dasher/sv/figures/prefs5.png
share/icons/hicolor/48x48/apps/dasher.png
share/icons/hicolor/scalable/apps/dasher.svg
+share/locale/af/LC_MESSAGES/dasher.mo
share/locale/ar/LC_MESSAGES/dasher.mo
share/locale/as/LC_MESSAGES/dasher.mo
share/locale/az/LC_MESSAGES/dasher.mo
@@ -339,6 +388,7 @@ share/locale/oc/LC_MESSAGES/dasher.mo
share/locale/or/LC_MESSAGES/dasher.mo
share/locale/pa/LC_MESSAGES/dasher.mo
share/locale/pl/LC_MESSAGES/dasher.mo
+share/locale/ps/LC_MESSAGES/dasher.mo
share/locale/pt/LC_MESSAGES/dasher.mo
share/locale/pt_BR/LC_MESSAGES/dasher.mo
share/locale/ro/LC_MESSAGES/dasher.mo
@@ -349,9 +399,10 @@ share/locale/sk/LC_MESSAGES/dasher.mo
share/locale/sl/LC_MESSAGES/dasher.mo
share/locale/sq/LC_MESSAGES/dasher.mo
share/locale/sr/LC_MESSAGES/dasher.mo
-share/locale/sr@Latn/LC_MESSAGES/dasher.mo
+share/locale/sr@latin/LC_MESSAGES/dasher.mo
share/locale/sv/LC_MESSAGES/dasher.mo
share/locale/ta/LC_MESSAGES/dasher.mo
+share/locale/te/LC_MESSAGES/dasher.mo
share/locale/th/LC_MESSAGES/dasher.mo
share/locale/tk/LC_MESSAGES/dasher.mo
share/locale/tr/LC_MESSAGES/dasher.mo
@@ -363,7 +414,10 @@ share/locale/zh_CN/LC_MESSAGES/dasher.mo
share/locale/zh_HK/LC_MESSAGES/dasher.mo
share/locale/zh_TW/LC_MESSAGES/dasher.mo
share/omf/dasher/dasher-C.omf
+share/omf/dasher/dasher-de.omf
+share/omf/dasher/dasher-en_GB.omf
share/omf/dasher/dasher-es.omf
+share/omf/dasher/dasher-eu.omf
share/omf/dasher/dasher-fr.omf
share/omf/dasher/dasher-oc.omf
share/omf/dasher/dasher-ru.omf
@@ -377,8 +431,14 @@ share/omf/dasher/dasher-sv.omf
@dirrm share/gnome/help/dasher/oc
@dirrm share/gnome/help/dasher/fr/figures
@dirrm share/gnome/help/dasher/fr
+@dirrm share/gnome/help/dasher/eu/figures
+@dirrm share/gnome/help/dasher/eu
@dirrm share/gnome/help/dasher/es/figures
@dirrm share/gnome/help/dasher/es
+@dirrm share/gnome/help/dasher/en_GB/figures
+@dirrm share/gnome/help/dasher/en_GB
+@dirrm share/gnome/help/dasher/de/figures
+@dirrm share/gnome/help/dasher/de
@dirrm share/gnome/help/dasher/C/figures
@dirrm share/gnome/help/dasher/C
@dirrm share/gnome/help/dasher
@@ -390,10 +450,16 @@ share/omf/dasher/dasher-sv.omf
@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@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/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index cb881c7aa911..6e781044ce73 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger <adamw@freebsd.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/gok/Makefile,v 1.89 2008/09/23 14:59:23 kwm Exp $
+# $MCom: ports/accessibility/gok/Makefile,v 1.92 2009/03/17 14:42:44 kwm Exp $
#
PORTNAME= gok
-PORTVERSION= 2.24.0
+PORTVERSION= 2.26.0
PORTEPOCH= 1
CATEGORIES= accessibility sysutils gnome
MASTER_SITES= GNOME
diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo
index 543df1e91bf2..92a89a3787bf 100644
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gok-2.24.0.tar.bz2) = 3fff3dee0d673eef32ab149d4a0a480e
-SHA256 (gnome2/gok-2.24.0.tar.bz2) = a09d7cbb7843633c993460f4e6b22c7c54166d4257313cd8b79cb77dd2791359
-SIZE (gnome2/gok-2.24.0.tar.bz2) = 1304251
+MD5 (gnome2/gok-2.26.0.tar.bz2) = 8cc28ad6010a977c9ccbe8d5b690f636
+SHA256 (gnome2/gok-2.26.0.tar.bz2) = 787b24c7fe81bc22a3f425bc632a6712e27c616e5d4b8a1cfba9d0fbf721674a
+SIZE (gnome2/gok-2.26.0.tar.bz2) = 1341889
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index 247ac45a6728..e0f421756741 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -496,6 +496,16 @@ share/gnome/help/gok/C/legal.xml
%%DATADIR%%/lv/quit.kbd
%%DATADIR%%/lv/text-operations.kbd
%%DATADIR%%/lv/valuator.kbd
+%%DATADIR%%/mai/gok-controls.kbd
+%%DATADIR%%/mai/hide.kbd
+%%DATADIR%%/mai/launcher.kbd
+%%DATADIR%%/mai/main.kbd
+%%DATADIR%%/mai/mouse.kbd
+%%DATADIR%%/mai/move-resize.kbd
+%%DATADIR%%/mai/numberpad.kbd
+%%DATADIR%%/mai/quit.kbd
+%%DATADIR%%/mai/text-operations.kbd
+%%DATADIR%%/mai/valuator.kbd
%%DATADIR%%/manage.kbd
%%DATADIR%%/mk/gok-controls.kbd
%%DATADIR%%/mk/hide.kbd
@@ -888,6 +898,7 @@ share/locale/ko/LC_MESSAGES/gok.mo
share/locale/ku/LC_MESSAGES/gok.mo
share/locale/lt/LC_MESSAGES/gok.mo
share/locale/lv/LC_MESSAGES/gok.mo
+share/locale/mai/LC_MESSAGES/gok.mo
share/locale/mk/LC_MESSAGES/gok.mo
share/locale/ml/LC_MESSAGES/gok.mo
share/locale/mn/LC_MESSAGES/gok.mo
@@ -959,6 +970,7 @@ share/pixmaps/gok.png
@dirrm %%DATADIR%%/mn
@dirrm %%DATADIR%%/ml
@dirrm %%DATADIR%%/mk
+@dirrm %%DATADIR%%/mai
@dirrm %%DATADIR%%/lv
@dirrm %%DATADIR%%/lt
@dirrm %%DATADIR%%/ku
@@ -1020,6 +1032,8 @@ share/pixmaps/gok.png
@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/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
index 8edd24118eca..171a64c30d1b 100644
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/mousetweaks/Makefile,v 1.22 2008/11/25 01:01:35 marcus Exp $
+# $MCom: ports/accessibility/mousetweaks/Makefile,v 1.26 2009/03/17 16:17:01 kwm Exp $
#
PORTNAME= mousetweaks
-PORTVERSION= 2.24.3
+PORTVERSION= 2.26.0
CATEGORIES= accessibility
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/mousetweaks/distinfo b/accessibility/mousetweaks/distinfo
index ca123fd3ae12..3707c47c9670 100644
--- a/accessibility/mousetweaks/distinfo
+++ b/accessibility/mousetweaks/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/mousetweaks-2.24.3.tar.bz2) = de428acfdbf671007c23d0a18f0a9f96
-SHA256 (gnome2/mousetweaks-2.24.3.tar.bz2) = 81c5fa302cfc19a140df2be8e769508241f51baef3419583fadb6581edfddd21
-SIZE (gnome2/mousetweaks-2.24.3.tar.bz2) = 678291
+MD5 (gnome2/mousetweaks-2.26.0.tar.bz2) = f63556d0db84287118b34e4a1e7421f1
+SHA256 (gnome2/mousetweaks-2.26.0.tar.bz2) = c823e2703bd6aae225dd6abc6704048251e1b1f9d794cec696dab2ced9b968af
+SIZE (gnome2/mousetweaks-2.26.0.tar.bz2) = 1161072
diff --git a/accessibility/mousetweaks/pkg-plist b/accessibility/mousetweaks/pkg-plist
index 4629af66dcf3..20217b8f2e89 100644
--- a/accessibility/mousetweaks/pkg-plist
+++ b/accessibility/mousetweaks/pkg-plist
@@ -19,6 +19,21 @@ share/gnome/help/mousetweaks/C/figures/mouse-a11y-ssc-delay-slider.png
share/gnome/help/mousetweaks/C/figures/mouse-a11y-tab.png
share/gnome/help/mousetweaks/C/legal.xml
share/gnome/help/mousetweaks/C/mousetweaks.xml
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/de/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/de/mousetweaks.xml
share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-checkbox.png
share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-click-type-applet.png
share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-click-type-window.png
@@ -49,6 +64,21 @@ share/gnome/help/mousetweaks/es/figures/mouse-a11y-ssc-checkbox.png
share/gnome/help/mousetweaks/es/figures/mouse-a11y-ssc-delay-slider.png
share/gnome/help/mousetweaks/es/figures/mouse-a11y-tab.png
share/gnome/help/mousetweaks/es/mousetweaks.xml
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/it/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/it/mousetweaks.xml
share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-checkbox.png
share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-click-type-applet.png
share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-click-type-window.png
@@ -80,6 +110,7 @@ share/gnome/help/mousetweaks/sv/figures/mouse-a11y-ssc-delay-slider.png
share/gnome/help/mousetweaks/sv/figures/mouse-a11y-tab.png
share/gnome/help/mousetweaks/sv/mousetweaks.xml
share/locale/ar/LC_MESSAGES/mousetweaks.mo
+share/locale/as/LC_MESSAGES/mousetweaks.mo
share/locale/bg/LC_MESSAGES/mousetweaks.mo
share/locale/bn_IN/LC_MESSAGES/mousetweaks.mo
share/locale/ca/LC_MESSAGES/mousetweaks.mo
@@ -114,11 +145,13 @@ share/locale/pa/LC_MESSAGES/mousetweaks.mo
share/locale/pl/LC_MESSAGES/mousetweaks.mo
share/locale/pt/LC_MESSAGES/mousetweaks.mo
share/locale/pt_BR/LC_MESSAGES/mousetweaks.mo
+share/locale/ro/LC_MESSAGES/mousetweaks.mo
share/locale/ru/LC_MESSAGES/mousetweaks.mo
share/locale/sl/LC_MESSAGES/mousetweaks.mo
share/locale/sq/LC_MESSAGES/mousetweaks.mo
share/locale/sv/LC_MESSAGES/mousetweaks.mo
share/locale/ta/LC_MESSAGES/mousetweaks.mo
+share/locale/te/LC_MESSAGES/mousetweaks.mo
share/locale/th/LC_MESSAGES/mousetweaks.mo
share/locale/tr/LC_MESSAGES/mousetweaks.mo
share/locale/uk/LC_MESSAGES/mousetweaks.mo
@@ -128,16 +161,18 @@ share/locale/zh_HK/LC_MESSAGES/mousetweaks.mo
share/locale/zh_TW/LC_MESSAGES/mousetweaks.mo
%%DATADIR%%/DwellClick.xml
%%DATADIR%%/PointerCapture.xml
-%%DATADIR%%/ctw.glade
%%DATADIR%%/double-click.png
%%DATADIR%%/drag-click.png
-%%DATADIR%%/dwell-click-applet.glade
-%%DATADIR%%/pointer-capture-applet.glade
+%%DATADIR%%/dwell-click-applet.ui
+%%DATADIR%%/mousetweaks.ui
+%%DATADIR%%/pointer-capture-applet.ui
%%DATADIR%%/right-click.png
%%DATADIR%%/single-click.png
share/omf/mousetweaks/mousetweaks-C.omf
+share/omf/mousetweaks/mousetweaks-de.omf
share/omf/mousetweaks/mousetweaks-el.omf
share/omf/mousetweaks/mousetweaks-es.omf
+share/omf/mousetweaks/mousetweaks-it.omf
share/omf/mousetweaks/mousetweaks-oc.omf
share/omf/mousetweaks/mousetweaks-sv.omf
@dirrm share/omf/mousetweaks
@@ -146,18 +181,26 @@ share/omf/mousetweaks/mousetweaks-sv.omf
@dirrm share/gnome/help/mousetweaks/sv
@dirrm share/gnome/help/mousetweaks/oc/figures
@dirrm share/gnome/help/mousetweaks/oc
+@dirrm share/gnome/help/mousetweaks/it/figures
+@dirrm share/gnome/help/mousetweaks/it
@dirrm share/gnome/help/mousetweaks/es/figures
@dirrm share/gnome/help/mousetweaks/es
@dirrm share/gnome/help/mousetweaks/el/figures
@dirrm share/gnome/help/mousetweaks/el
+@dirrm share/gnome/help/mousetweaks/de/figures
+@dirrm share/gnome/help/mousetweaks/de
@dirrm share/gnome/help/mousetweaks/C/figures
@dirrm share/gnome/help/mousetweaks/C
@dirrm share/gnome/help/mousetweaks
@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/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@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/accessibility/orca/Makefile b/accessibility/orca/Makefile
index 94b48da11b79..c4f64c9024e1 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/orca/Makefile,v 1.58 2008/11/25 05:37:04 mezz Exp $
+# $MCom: ports/accessibility/orca/Makefile,v 1.62 2009/03/16 08:07:55 kwm Exp $
#
PORTNAME= orca
-PORTVERSION= 2.24.4
+PORTVERSION= 2.26.0
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo
index 6dec84f5921b..94d4092ea982 100644
--- a/accessibility/orca/distinfo
+++ b/accessibility/orca/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/orca-2.24.4.tar.bz2) = 4a22ec1db15017f58ab465bbe14fafa7
-SHA256 (gnome2/orca-2.24.4.tar.bz2) = 14918d7777970de39a25a3574539d457c1989b5a8259a1c1e0e8dbb3b92ac0b6
-SIZE (gnome2/orca-2.24.4.tar.bz2) = 2125363
+MD5 (gnome2/orca-2.26.0.tar.bz2) = d097f28747943a32d50e3b91eab5c518
+SHA256 (gnome2/orca-2.26.0.tar.bz2) = 4c53b0643341977d6cd706461f80473cae3236678905aab898e773e473e2809d
+SIZE (gnome2/orca-2.26.0.tar.bz2) = 2234371
diff --git a/accessibility/orca/files/patch-src_orca_orca.in b/accessibility/orca/files/patch-src_orca_orca.in
index 400ffd2c9f0f..aa41825f9680 100644
--- a/accessibility/orca/files/patch-src_orca_orca.in
+++ b/accessibility/orca/files/patch-src_orca_orca.in
@@ -1,5 +1,5 @@
---- src/orca/orca.in.orig 2009-01-23 22:35:24.000000000 +0100
-+++ src/orca/orca.in 2009-02-20 23:30:59.000000000 +0100
+--- src/orca/orca.in.orig 2009-01-23 22:39:27.000000000 +0100
++++ src/orca/orca.in 2009-02-21 22:50:38.000000000 +0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
index 3483c5493b5f..8c351e7f1c9a 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -238,6 +238,9 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.pyo
@@ -403,6 +406,7 @@ share/locale/fi/LC_MESSAGES/orca.mo
share/locale/fr/LC_MESSAGES/orca.mo
share/locale/gl/LC_MESSAGES/orca.mo
share/locale/gu/LC_MESSAGES/orca.mo
+share/locale/he/LC_MESSAGES/orca.mo
share/locale/hi/LC_MESSAGES/orca.mo
share/locale/hu/LC_MESSAGES/orca.mo
share/locale/it/LC_MESSAGES/orca.mo
@@ -425,6 +429,7 @@ share/locale/pa/LC_MESSAGES/orca.mo
share/locale/pl/LC_MESSAGES/orca.mo
share/locale/pt/LC_MESSAGES/orca.mo
share/locale/pt_BR/LC_MESSAGES/orca.mo
+share/locale/ro/LC_MESSAGES/orca.mo
share/locale/ru/LC_MESSAGES/orca.mo
share/locale/rw/LC_MESSAGES/orca.mo
share/locale/si/LC_MESSAGES/orca.mo
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index b726713cea96..4c041b95f2d8 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,11 +3,11 @@
# Whom: Anders Nordby <anders@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/archivers/file-roller/Makefile,v 1.150 2008/11/25 16:07:09 marcus Exp $
+# $MCom: ports/archivers/file-roller/Makefile,v 1.155 2009/03/18 04:39:09 marcus Exp $
#
PORTNAME= file-roller
-PORTVERSION= 2.24.3
+PORTVERSION= 2.26.0
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= GNOME
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 2d1f0daf83a1..c6e88ae56cec 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/file-roller-2.24.3.tar.bz2) = 20264b13cd27c6542c8289256d768c9c
-SHA256 (gnome2/file-roller-2.24.3.tar.bz2) = c15956b5348b4066f4e244be10db6f4ef802d316103d1d870c56d4347eb4dca1
-SIZE (gnome2/file-roller-2.24.3.tar.bz2) = 1484687
+MD5 (gnome2/file-roller-2.26.0.tar.bz2) = 795c6b0a2b3b02c5f407b1d9f9b643ef
+SHA256 (gnome2/file-roller-2.26.0.tar.bz2) = 75b523ad80f315731aeb2c87e4d95716c1d20704b2d598eaad8aae3406cb9408
+SIZE (gnome2/file-roller-2.26.0.tar.bz2) = 1509272
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 6f34da63b62f..3e38d045f482 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -1,5 +1,4 @@
bin/file-roller
-lib/nautilus/extensions-2.0/libnautilus-fileroller.a
lib/nautilus/extensions-2.0/libnautilus-fileroller.la
lib/nautilus/extensions-2.0/libnautilus-fileroller.so
libexec/file-roller/isoinfo.sh
@@ -8,21 +7,21 @@ share/applications/file-roller.desktop
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%DATADIR%%/glade/add-options.glade
-%%DATADIR%%/glade/batch-add-files.glade
-%%DATADIR%%/glade/batch-password.glade
-%%DATADIR%%/glade/delete.glade
-%%DATADIR%%/glade/open-with.glade
-%%DATADIR%%/glade/password.glade
-%%DATADIR%%/glade/properties.glade
-%%DATADIR%%/glade/new.glade
-%%DATADIR%%/glade/update.glade
%%DATADIR%%/icons/hicolor/16x16/actions/add-files-to-archive.png
%%DATADIR%%/icons/hicolor/16x16/actions/add-folder-to-archive.png
%%DATADIR%%/icons/hicolor/16x16/actions/extract-archive.png
%%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%%/ui/add-options.ui
+%%DATADIR%%/ui/batch-add-files.ui
+%%DATADIR%%/ui/batch-password.ui
+%%DATADIR%%/ui/delete.ui
+%%DATADIR%%/ui/new.ui
+%%DATADIR%%/ui/open-with.ui
+%%DATADIR%%/ui/password.ui
+%%DATADIR%%/ui/properties.ui
+%%DATADIR%%/ui/update.ui
share/gnome/help/file-roller/C/figures/file-roller_home.png
share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png
share/gnome/help/file-roller/C/figures/file-roller_main_window.png
@@ -48,6 +47,12 @@ share/gnome/help/file-roller/de/figures/file-roller_main_window.png
share/gnome/help/file-roller/de/figures/file-roller_rightarrow.png
share/gnome/help/file-roller/de/figures/file-roller_uparrow.png
share/gnome/help/file-roller/de/file-roller.xml
+share/gnome/help/file-roller/en_GB/figures/file-roller_home.png
+share/gnome/help/file-roller/en_GB/figures/file-roller_leftarrow.png
+share/gnome/help/file-roller/en_GB/figures/file-roller_main_window.png
+share/gnome/help/file-roller/en_GB/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/en_GB/figures/file-roller_uparrow.png
+share/gnome/help/file-roller/en_GB/file-roller.xml
share/gnome/help/file-roller/es/figures/file-roller_home.png
share/gnome/help/file-roller/es/figures/file-roller_leftarrow.png
share/gnome/help/file-roller/es/figures/file-roller_main_window.png
@@ -117,6 +122,7 @@ share/locale/af/LC_MESSAGES/file-roller.mo
share/locale/am/LC_MESSAGES/file-roller.mo
share/locale/ar/LC_MESSAGES/file-roller.mo
share/locale/as/LC_MESSAGES/file-roller.mo
+share/locale/ast/LC_MESSAGES/file-roller.mo
share/locale/az/LC_MESSAGES/file-roller.mo
share/locale/be/LC_MESSAGES/file-roller.mo
share/locale/be@latin/LC_MESSAGES/file-roller.mo
@@ -159,6 +165,7 @@ share/locale/ko/LC_MESSAGES/file-roller.mo
share/locale/ku/LC_MESSAGES/file-roller.mo
share/locale/lt/LC_MESSAGES/file-roller.mo
share/locale/lv/LC_MESSAGES/file-roller.mo
+share/locale/mai/LC_MESSAGES/file-roller.mo
share/locale/mg/LC_MESSAGES/file-roller.mo
share/locale/mk/LC_MESSAGES/file-roller.mo
share/locale/ml/LC_MESSAGES/file-roller.mo
@@ -204,6 +211,7 @@ share/omf/file-roller/file-roller-C.omf
share/omf/file-roller/file-roller-ca.omf
share/omf/file-roller/file-roller-bg.omf
share/omf/file-roller/file-roller-de.omf
+share/omf/file-roller/file-roller-en_GB.omf
share/omf/file-roller/file-roller-es.omf
share/omf/file-roller/file-roller-fi.omf
share/omf/file-roller/file-roller-fr.omf
@@ -235,6 +243,8 @@ share/omf/file-roller/file-roller-vi.omf
@dirrm share/gnome/help/file-roller/fi
@dirrm share/gnome/help/file-roller/es/figures
@dirrm share/gnome/help/file-roller/es
+@dirrm share/gnome/help/file-roller/en_GB/figures
+@dirrm share/gnome/help/file-roller/en_GB
@dirrm share/gnome/help/file-roller/de/figures
@dirrm share/gnome/help/file-roller/de
@dirrm share/gnome/help/file-roller/ca/figures
@@ -244,13 +254,13 @@ share/omf/file-roller/file-roller-vi.omf
@dirrm share/gnome/help/file-roller/C/figures
@dirrm share/gnome/help/file-roller/C
@dirrm share/gnome/help/file-roller
+@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%/icons/hicolor/24x24/actions
@dirrm %%DATADIR%%/icons/hicolor/24x24
@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
@dirrm %%DATADIR%%/icons/hicolor/16x16
@dirrm %%DATADIR%%/icons/hicolor
@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/glade
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry share/applications
@@ -283,6 +293,8 @@ share/omf/file-roller/file-roller-vi.omf
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/hy/LC_MESSAGES
@@ -295,5 +307,7 @@ share/omf/file-roller/file-roller-vi.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/astro/glunarclock/Makefile b/astro/glunarclock/Makefile
index d9b070c86c0e..bb8b80465e57 100644
--- a/astro/glunarclock/Makefile
+++ b/astro/glunarclock/Makefile
@@ -3,7 +3,7 @@
# Whom: Vincent Tantardini <vinc@freebsd-fr.org>
#
# $FreeBSD$
-# $MCom: ports/astro/glunarclock/Makefile,v 1.10 2008/08/23 18:22:58 mezz Exp $
+# $MCom: ports/astro/glunarclock/Makefile,v 1.12 2009/04/07 03:25:51 marcus Exp $
#
PORTNAME= glunarclock
@@ -22,8 +22,9 @@ USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ LIBS="`pkg-config --libs libgnomeui-2.0`"
INSTALLS_OMF= yes
PLIST_SUB= VERSION="${PORTVERSION:R}"
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 74e21e8ff561..1f247fe929b3 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/gnome-media/Makefile,v 1.123 2008/09/24 03:17:39 mezz Exp $
+# $MCom: ports/audio/gnome-media/Makefile,v 1.130 2009/03/17 22:20:16 kwm Exp $
#
PORTNAME= gnome-media
-PORTVERSION= 2.24.0.1
+PORTVERSION= 2.26.0
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,6 +15,10 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Multimedia applications for the GNOME 2 desktop
+LIB_DEPENDS= pulse.0:${PORTSDIR}/audio/pulseaudio \
+ canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
+ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+
USE_BZIP2= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
@@ -23,15 +27,14 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop nautiluscdburner
+USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop
USE_GSTREAMER= cdparanoia esound gconf good
CONFIGURE_ARGS= --enable-ipv6
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= gnome-audio-profiles.schemas \
- gnome-sound-recorder.schemas \
- gnome-volume-control.schemas
+ gnome-sound-recorder.schemas
post-patch:
@${REINPLACE_CMD} -e 's|[$$][(]CDROM_HOST[)]|freebsd|g' \
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index 14cdbe58006a..d98b2233165f 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.24.0.1.tar.bz2) = d0a9b0784872cecd09038aceea22e16f
-SHA256 (gnome2/gnome-media-2.24.0.1.tar.bz2) = bfa79a9bea5ba6f73a6b0a232917bc7eefbed69819e42d0b09372b0c7ed3e853
-SIZE (gnome2/gnome-media-2.24.0.1.tar.bz2) = 2344888
+MD5 (gnome2/gnome-media-2.26.0.tar.bz2) = 3d519bc7d812aed8f6e4288b6d3cdf26
+SHA256 (gnome2/gnome-media-2.26.0.tar.bz2) = 39e7646d0790e05a010da1eb2d7552dcb5311abd72f001477c9c465d7146b9f7
+SIZE (gnome2/gnome-media-2.26.0.tar.bz2) = 2662523
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index 9f18eb4a6317..8905eac3fc05 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -1,7 +1,9 @@
bin/gnome-audio-profiles-properties
bin/gnome-sound-recorder
bin/gnome-volume-control
+bin/gnome-volume-control-applet
bin/gstreamer-properties
+etc/xdg/autostart/gnome-volume-control-applet.desktop
include/gnome-media/profiles/audio-profile-choose.h
include/gnome-media/profiles/audio-profile-edit.h
include/gnome-media/profiles/audio-profile.h
@@ -19,8 +21,27 @@ share/applications/gnome-sound-recorder.desktop
share/applications/gnome-volume-control.desktop
share/applications/gstreamer-properties.desktop
%%DATADIR%%/glade/gnome-audio-profiles.glade2
-%%DATADIR%%/pixmaps/chain-broken.png
-%%DATADIR%%/pixmaps/chain.png
+%%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
+%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-high.svg
+%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-low.svg
+%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-medium.svg
+%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
+%%DATADIR%%/sounds/gnome-sounds-default.xml
share/gnome-sound-recorder/ui/ui.xml
share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
@@ -29,6 +50,8 @@ share/gnome/help/gnome-sound-recorder/ca/figures/grecord_window.png
share/gnome/help/gnome-sound-recorder/ca/gnome-sound-recorder.xml
share/gnome/help/gnome-sound-recorder/de/figures/grecord_window.png
share/gnome/help/gnome-sound-recorder/de/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/en_GB/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/en_GB/gnome-sound-recorder.xml
share/gnome/help/gnome-sound-recorder/es/figures/grecord_window.png
share/gnome/help/gnome-sound-recorder/es/gnome-sound-recorder.xml
share/gnome/help/gnome-sound-recorder/fr/figures/grecord_window.png
@@ -43,25 +66,6 @@ share/gnome/help/gnome-sound-recorder/sv/figures/grecord_window.png
share/gnome/help/gnome-sound-recorder/sv/gnome-sound-recorder.xml
share/gnome/help/gnome-sound-recorder/uk/figures/grecord_window.png
share/gnome/help/gnome-sound-recorder/uk/gnome-sound-recorder.xml
-share/gnome/help/gnome-volume-control/C/figures/gnome-volume-control_window.png
-share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
-share/gnome/help/gnome-volume-control/C/legal.xml
-share/gnome/help/gnome-volume-control/ca/figures/gnome-volume-control_window.png
-share/gnome/help/gnome-volume-control/ca/gnome-volume-control.xml
-share/gnome/help/gnome-volume-control/de/figures/gnome-volume-control_window.png
-share/gnome/help/gnome-volume-control/de/gnome-volume-control.xml
-share/gnome/help/gnome-volume-control/es/figures/gnome-volume-control_window.png
-share/gnome/help/gnome-volume-control/es/gnome-volume-control.xml
-share/gnome/help/gnome-volume-control/fr/figures/gnome-volume-control_window.png
-share/gnome/help/gnome-volume-control/fr/gnome-volume-control.xml
-share/gnome/help/gnome-volume-control/it/figures/gnome-volume-control_window.png
-share/gnome/help/gnome-volume-control/it/gnome-volume-control.xml
-share/gnome/help/gnome-volume-control/oc/figures/gnome-volume-control_window.png
-share/gnome/help/gnome-volume-control/oc/gnome-volume-control.xml
-share/gnome/help/gnome-volume-control/ru/figures/gnome-volume-control_window.png
-share/gnome/help/gnome-volume-control/ru/gnome-volume-control.xml
-share/gnome/help/gnome-volume-control/sv/figures/gnome-volume-control_window.png
-share/gnome/help/gnome-volume-control/sv/gnome-volume-control.xml
share/gnome/help/gstreamer-properties/C/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml
share/gnome/help/gstreamer-properties/C/legal.xml
@@ -69,6 +73,8 @@ share/gnome/help/gstreamer-properties/ca/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/ca/gstreamer-properties.xml
share/gnome/help/gstreamer-properties/de/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/de/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/en_GB/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/en_GB/gstreamer-properties.xml
share/gnome/help/gstreamer-properties/es/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/es/gstreamer-properties.xml
share/gnome/help/gstreamer-properties/fr/figures/gstreamer_properties_window.png
@@ -81,20 +87,26 @@ share/gnome/help/gstreamer-properties/ru/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/ru/gstreamer-properties.xml
share/gnome/help/gstreamer-properties/sv/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/sv/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/th/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/th/gstreamer-properties.xml
share/gstreamer-properties/glade/gstreamer-properties.glade
share/gstreamer-properties/icons/gstreamer-properties.png
share/icons/hicolor/16x16/apps/gnome-sound-recorder.png
-share/icons/hicolor/16x16/devices/gvc-3d-sound.png
-share/icons/hicolor/16x16/devices/gvc-headphones.png
-share/icons/hicolor/16x16/devices/gvc-line-in.png
-share/icons/hicolor/16x16/devices/gvc-tone.png
-share/icons/hicolor/16x16/status/audio-input-microphone-muted.png
+share/icons/hicolor/16x16/apps/gnome-volume-control.png
+share/icons/hicolor/16x16/apps/gnome-volume-control.svg
share/icons/hicolor/22x22/apps/gnome-sound-recorder.png
+share/icons/hicolor/22x22/apps/gnome-volume-control.png
+share/icons/hicolor/22x22/apps/gnome-volume-control.svg
share/icons/hicolor/24x24/apps/gnome-sound-recorder.png
+share/icons/hicolor/24x24/apps/gnome-volume-control.png
share/icons/hicolor/32x32/apps/gnome-sound-recorder.png
+share/icons/hicolor/32x32/apps/gnome-volume-control.png
+share/icons/hicolor/32x32/apps/gnome-volume-control.svg
share/icons/hicolor/48x48/apps/gnome-sound-recorder.png
+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/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
@@ -137,6 +149,7 @@ share/locale/ko/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-media-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-media-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/mai/LC_MESSAGES/gnome-media-2.0.mo
share/locale/mg/LC_MESSAGES/gnome-media-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ml/LC_MESSAGES/gnome-media-2.0.mo
@@ -178,6 +191,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
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-de.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-en_GB.omf
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
@@ -185,30 +199,31 @@ share/omf/gnome-sound-recorder/gnome-sound-recorder-oc.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
-share/omf/gnome-volume-control/gnome-volume-control-C.omf
-share/omf/gnome-volume-control/gnome-volume-control-ca.omf
-share/omf/gnome-volume-control/gnome-volume-control-de.omf
-share/omf/gnome-volume-control/gnome-volume-control-es.omf
-share/omf/gnome-volume-control/gnome-volume-control-fr.omf
-share/omf/gnome-volume-control/gnome-volume-control-it.omf
-share/omf/gnome-volume-control/gnome-volume-control-oc.omf
-share/omf/gnome-volume-control/gnome-volume-control-ru.omf
-share/omf/gnome-volume-control/gnome-volume-control-sv.omf
share/omf/gstreamer-properties/gstreamer-properties-C.omf
share/omf/gstreamer-properties/gstreamer-properties-ca.omf
share/omf/gstreamer-properties/gstreamer-properties-de.omf
+share/omf/gstreamer-properties/gstreamer-properties-en_GB.omf
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-ru.omf
share/omf/gstreamer-properties/gstreamer-properties-sv.omf
+share/omf/gstreamer-properties/gstreamer-properties-th.omf
+share/sounds/gnome/default/alerts/bark.ogg
+share/sounds/gnome/default/alerts/drip.ogg
+share/sounds/gnome/default/alerts/glass.ogg
+share/sounds/gnome/default/alerts/sonar.ogg
+@dirrm share/sounds/gnome/default/alerts
+@dirrm share/sounds/gnome/default
+@dirrm share/sounds/gnome
@dirrm share/omf/gstreamer-properties
-@dirrm share/omf/gnome-volume-control
@dirrm share/omf/gnome-sound-recorder
@dirrm share/gstreamer-properties/icons
@dirrm share/gstreamer-properties/glade
@dirrm share/gstreamer-properties
+@dirrm share/gnome/help/gstreamer-properties/th/figures
+@dirrm share/gnome/help/gstreamer-properties/th
@dirrm share/gnome/help/gstreamer-properties/sv/figures
@dirrm share/gnome/help/gstreamer-properties/sv
@dirrm share/gnome/help/gstreamer-properties/ru/figures
@@ -221,6 +236,8 @@ share/omf/gstreamer-properties/gstreamer-properties-sv.omf
@dirrm share/gnome/help/gstreamer-properties/fr
@dirrm share/gnome/help/gstreamer-properties/es/figures
@dirrm share/gnome/help/gstreamer-properties/es
+@dirrm share/gnome/help/gstreamer-properties/en_GB/figures
+@dirrm share/gnome/help/gstreamer-properties/en_GB
@dirrm share/gnome/help/gstreamer-properties/de/figures
@dirrm share/gnome/help/gstreamer-properties/de
@dirrm share/gnome/help/gstreamer-properties/ca/figures
@@ -228,25 +245,6 @@ share/omf/gstreamer-properties/gstreamer-properties-sv.omf
@dirrm share/gnome/help/gstreamer-properties/C/figures
@dirrm share/gnome/help/gstreamer-properties/C
@dirrm share/gnome/help/gstreamer-properties
-@dirrm share/gnome/help/gnome-volume-control/sv/figures
-@dirrm share/gnome/help/gnome-volume-control/sv
-@dirrm share/gnome/help/gnome-volume-control/ru/figures
-@dirrm share/gnome/help/gnome-volume-control/ru
-@dirrm share/gnome/help/gnome-volume-control/oc/figures
-@dirrm share/gnome/help/gnome-volume-control/oc
-@dirrm share/gnome/help/gnome-volume-control/it/figures
-@dirrm share/gnome/help/gnome-volume-control/it
-@dirrm share/gnome/help/gnome-volume-control/fr/figures
-@dirrm share/gnome/help/gnome-volume-control/fr
-@dirrm share/gnome/help/gnome-volume-control/es/figures
-@dirrm share/gnome/help/gnome-volume-control/es
-@dirrm share/gnome/help/gnome-volume-control/de/figures
-@dirrm share/gnome/help/gnome-volume-control/de
-@dirrm share/gnome/help/gnome-volume-control/ca/figures
-@dirrm share/gnome/help/gnome-volume-control/ca
-@dirrm share/gnome/help/gnome-volume-control/C/figures
-@dirrm share/gnome/help/gnome-volume-control/C
-@dirrm share/gnome/help/gnome-volume-control
@dirrm share/gnome/help/gnome-sound-recorder/uk/figures
@dirrm share/gnome/help/gnome-sound-recorder/uk
@dirrm share/gnome/help/gnome-sound-recorder/sv/figures
@@ -261,6 +259,8 @@ share/omf/gstreamer-properties/gstreamer-properties-sv.omf
@dirrm share/gnome/help/gnome-sound-recorder/fr
@dirrm share/gnome/help/gnome-sound-recorder/es/figures
@dirrm share/gnome/help/gnome-sound-recorder/es
+@dirrm share/gnome/help/gnome-sound-recorder/en_GB/figures
+@dirrm share/gnome/help/gnome-sound-recorder/en_GB
@dirrm share/gnome/help/gnome-sound-recorder/de/figures
@dirrm share/gnome/help/gnome-sound-recorder/de
@dirrm share/gnome/help/gnome-sound-recorder/ca/figures
@@ -270,7 +270,19 @@ share/omf/gstreamer-properties/gstreamer-properties-sv.omf
@dirrm share/gnome/help/gnome-sound-recorder
@dirrm share/gnome-sound-recorder/ui
@dirrm share/gnome-sound-recorder
-@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/icons/hicolor/scalable/status
+@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor/32x32/status
+@dirrm %%DATADIR%%/icons/hicolor/32x32
+@dirrm %%DATADIR%%/icons/hicolor/24x24/status
+@dirrm %%DATADIR%%/icons/hicolor/24x24
+@dirrm %%DATADIR%%/icons/hicolor/22x22/status
+@dirrm %%DATADIR%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/icons/hicolor/16x16/status
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%/glade
@dirrm %%DATADIR%%
@dirrmtry share/applications
@@ -294,6 +306,8 @@ share/omf/gstreamer-properties/gstreamer-properties-sv.omf
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 7921d53290eb..b1d1c031fd7a 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/pulseaudio/Makefile,v 1.10 2008/03/20 16:07:21 mezz Exp $
+# $MCom: ports/audio/pulseaudio/Makefile,v 1.16 2009/04/09 04:36:26 marcus Exp $
#
PORTNAME= pulseaudio
PORTVERSION= 0.9.14
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/
@@ -23,6 +24,7 @@ LIB_DEPENDS= samplerate.1:${PORTSDIR}/audio/libsamplerate \
USE_GNOME= gnometarget gnomehack glib20 intltool ltverhack
USE_XORG= x11 sm
USE_LDCONFIG= yes
+USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libltdl:15 libtool:15
USE_GMAKE= yes
@@ -49,9 +51,9 @@ MAN5= default.pa.5 pulse-client.conf.5 pulse-daemon.conf.5
.include <bsd.port.pre.mk>
-.if ${ARCH} == "sparc64"
-BROKEN= Does not compile on sparc64
-.endif
+#.if ${ARCH} == "sparc64"
+#BROKEN= Does not compile on sparc64
+#.endif
.if defined(WITH_JACK)
LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack
diff --git a/audio/pulseaudio/files/patch-src_daemon_main.c b/audio/pulseaudio/files/patch-src_daemon_main.c
index 1b96327a872d..27b2c4f1a6a8 100644
--- a/audio/pulseaudio/files/patch-src_daemon_main.c
+++ b/audio/pulseaudio/files/patch-src_daemon_main.c
@@ -1,6 +1,6 @@
---- src/daemon/main.c.orig Thu Jul 12 00:04:22 2007
-+++ src/daemon/main.c Thu Jul 12 00:04:40 2007
-@@ -40,6 +40,7 @@
+--- src/daemon/main.c.orig 2009-01-12 18:11:38.000000000 -0500
++++ src/daemon/main.c 2009-03-07 19:56:16.000000000 -0500
+@@ -37,6 +37,7 @@
#include <unistd.h>
#include <locale.h>
#include <sys/types.h>
@@ -8,3 +8,21 @@
#include <liboil/liboil.h>
+@@ -689,7 +690,7 @@ int main(int argc, char *argv[]) {
+ * first take the autospawn lock to make things
+ * synchronous. */
+
+- if ((autospawn_fd = pa_autospawn_lock_init()) < 0) {
++ /*if ((autospawn_fd = pa_autospawn_lock_init()) < 0) {
+ pa_log("Failed to initialize autospawn lock");
+ goto finish;
+ }
+@@ -699,7 +700,7 @@ int main(int argc, char *argv[]) {
+ goto finish;
+ }
+
+- autospawn_locked = TRUE;
++ autospawn_locked = TRUE;*/
+ }
+
+ if (conf->daemonize) {
diff --git a/audio/pulseaudio/files/patch-src_daemon_start-pulseaudio-x11.in b/audio/pulseaudio/files/patch-src_daemon_start-pulseaudio-x11.in
new file mode 100644
index 000000000000..65001b57236c
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_daemon_start-pulseaudio-x11.in
@@ -0,0 +1,11 @@
+--- src/daemon/start-pulseaudio-x11.in.orig 2009-03-07 19:48:47.000000000 -0500
++++ src/daemon/start-pulseaudio-x11.in 2009-03-07 19:48:56.000000000 -0500
+@@ -19,7 +19,7 @@
+
+ set -e
+
+-@PA_BINARY@ --start "$@"
++@PA_BINARY@ -D "$@"
+
+ if [ x"$DISPLAY" != x ] ; then
+
diff --git a/audio/pulseaudio/files/patch-src_pulse_context.c b/audio/pulseaudio/files/patch-src_pulse_context.c
new file mode 100644
index 000000000000..fda93a2a65c7
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_pulse_context.c
@@ -0,0 +1,11 @@
+--- src/pulse/context.c.orig 2009-03-08 14:33:36.000000000 -0400
++++ src/pulse/context.c 2009-03-08 14:33:42.000000000 -0400
+@@ -664,7 +664,7 @@ static int context_autospawn(pa_context
+ n = 0;
+
+ argv[n++] = c->conf->daemon_binary;
+- argv[n++] = "--start";
++ argv[n++] = "-D";
+
+ while (n < MAX_ARGS) {
+ char *a;
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index cc1f9da74da7..71937789252e 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -156,6 +156,4 @@ share/locale/sv/LC_MESSAGES/pulseaudio.mo
@dirrm lib/pulse-%%PULSE_VERSION%%/modules
@dirrm lib/pulse-%%PULSE_VERSION%%
@dirrm include/pulse
-@dirrmtry etc/xdg/autostart
-@dirrmtry etc/xdg
@dirrm etc/pulse
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 0e602a1be13a..3391593c49d8 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.97 2009/04/09 03:24:06 mezz Exp $
#
PORTNAME= rhythmbox
PORTVERSION= 0.12.0
+PORTREVISION= 2
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -22,17 +23,19 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
soup-2.4.1:${PORTSDIR}/devel/libsoup \
- gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
+ gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
+ brasero-media.1:${PORTSDIR}/sysutils/brasero
USE_BZIP2= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner
+USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautilus2
WANT_GNOME= yes
USE_GSTREAMER= flac mp3 gnomevfs gconf jpeg
USE_AUTOTOOLS= libtool:15
-CONFIGURE_ARGS= --disable-vala
+CONFIGURE_ARGS= --disable-vala --with-libbrasero-media \
+ --without-libnautilus-burn
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
CONFIGURE_ENV= LIBS="-lm" \
@@ -48,7 +51,7 @@ OPTIONS= DAAP "Enable iTunes music sharing" off \
VORBIS "Enable Ogg/Vorbis support" on \
LIRC "Enable Infrared syncing support" off \
MTP "Enable MS Media Transfer Protocol support" off \
- GECKO_PLUGIN "Enable iTunes browser plugin" on
+ ITMS_PLUGIN "Enable iTunes browser plugin" on
.include <bsd.port.pre.mk>
@@ -120,20 +123,17 @@ CONFIGURE_ARGS+=--without-ipod
PLIST_SUB+= IPOD="@comment "
.endif
-.if !defined(WITHOUT_GECKO_PLUGIN)
-USE_GECKO= firefox mozilla seamonkey xulrunner<->firefox firefox-devel<->firefox
-.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
-
+.if !defined(WITHOUT_ITMS_PLUGIN)
USE_WEBPLUGINS= gecko18
WEBPLUGINS_FILES=librhythmbox-itms-detection-plugin.so
.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
CONFIGURE_ARGS+=--enable-browser-plugin
CONFIGURE_ENV+= MOZILLA_PLUGINDIR=${WEBPLUGINS_DIR}
-PLIST_SUB+= GECKO_PLUGIN=""
+PLIST_SUB+= ITMS_PLUGIN=""
.else
CONFIGURE_ARGS+=--disable-browser-plugin
-PLIST_SUB+= GECKO_PLUGIN="@comment "
+PLIST_SUB+= ITMS_PLUGIN="@comment "
.endif
.include <bsd.port.post.mk>
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index 202b1e423d29..90fe4bcec855 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -1,8 +1,8 @@
bin/rhythmbox
bin/rhythmbox-client
-%%GECKO_PLUGIN%%%%WEBPLUGINS_DIR%%/librhythmbox-itms-detection-plugin.a
-%%GECKO_PLUGIN%%%%WEBPLUGINS_DIR%%/librhythmbox-itms-detection-plugin.la
-%%GECKO_PLUGIN%%%%WEBPLUGINS_DIR%%/librhythmbox-itms-detection-plugin.so
+%%ITMS_PLUGIN%%%%WEBPLUGINS_DIR%%/librhythmbox-itms-detection-plugin.a
+%%ITMS_PLUGIN%%%%WEBPLUGINS_DIR%%/librhythmbox-itms-detection-plugin.la
+%%ITMS_PLUGIN%%%%WEBPLUGINS_DIR%%/librhythmbox-itms-detection-plugin.so
lib/librhythmbox-core.a
lib/librhythmbox-core.la
lib/librhythmbox-core.so
@@ -44,7 +44,6 @@ lib/rhythmbox/plugins/cd-recorder/cd-recorder.rb-plugin
lib/rhythmbox/plugins/cd-recorder/libcd-recorder.a
lib/rhythmbox/plugins/cd-recorder/libcd-recorder.la
lib/rhythmbox/plugins/cd-recorder/libcd-recorder.so
-lib/rhythmbox/plugins/cd-recorder/recorder.glade
%%DAAP%%lib/rhythmbox/plugins/daap/daap-prefs.glade
%%DAAP%%lib/rhythmbox/plugins/daap/daap-ui.xml
%%DAAP%%lib/rhythmbox/plugins/daap/daap.rb-plugin
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index a81a26f857c4..f5c34744f294 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.87 2008/09/21 06:37:08 kwm Exp $
+# $MCom: ports/audio/sound-juicer/Makefile,v 1.91 2009/03/18 04:24:29 marcus Exp $
#
PORTNAME= sound-juicer
-PORTVERSION= 2.24.0
-PORTREVISION= 1
+PORTVERSION= 2.26.0
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,16 +16,19 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Clean, mean and lean CD ripper for GNOME2
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
+ musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
cdio.8:${PORTSDIR}/sysutils/libcdio \
- tag.6:${PORTSDIR}/audio/taglib
+ tag.6:${PORTSDIR}/audio/taglib \
+ canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+ brasero-media.1:${PORTSDIR}/sysutils/brasero
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
-USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner \
- gnomedocutils
+USE_GNOME= gnomehack intlhack gnomeprefix gconf2 libglade2 gnomedocutils
USE_GSTREAMER= cdparanoia vorbis flac gconf good gio
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-ignore-missing-cd
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index 29caaed87dae..d4a8ce3717b4 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/sound-juicer-2.24.0.tar.bz2) = 504979aadec8df1e59c1050bc968b2aa
-SHA256 (gnome2/sound-juicer-2.24.0.tar.bz2) = 66a6573465c5458daf7802a0aea729af68a2b87a2833ad1798797b6d69e8af5f
-SIZE (gnome2/sound-juicer-2.24.0.tar.bz2) = 1834986
+MD5 (gnome2/sound-juicer-2.26.0.tar.bz2) = 6dd30f5a8119f9698eabd8220d5c5392
+SHA256 (gnome2/sound-juicer-2.26.0.tar.bz2) = 49b6cbe3f74503a0cf0010332d2e6a1723f6e1a5ae3cb74f543147a4a483db66
+SIZE (gnome2/sound-juicer-2.26.0.tar.bz2) = 1989403
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index be4170553fed..14faef6de523 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -4,6 +4,10 @@ share/gnome/help/sound-juicer/C/figures/prefs.png
share/gnome/help/sound-juicer/C/figures/startup.png
share/gnome/help/sound-juicer/C/legal.xml
share/gnome/help/sound-juicer/C/sound-juicer.xml
+share/gnome/help/sound-juicer/ar/figures/prefs.png
+share/gnome/help/sound-juicer/ar/figures/startup.png
+share/gnome/help/sound-juicer/ar/legal.xml
+share/gnome/help/sound-juicer/ar/sound-juicer.xml
share/gnome/help/sound-juicer/ca/figures/prefs.png
share/gnome/help/sound-juicer/ca/figures/startup.png
share/gnome/help/sound-juicer/ca/legal.xml
@@ -24,6 +28,10 @@ share/gnome/help/sound-juicer/es/figures/prefs.png
share/gnome/help/sound-juicer/es/figures/startup.png
share/gnome/help/sound-juicer/es/legal.xml
share/gnome/help/sound-juicer/es/sound-juicer.xml
+share/gnome/help/sound-juicer/eu/figures/prefs.png
+share/gnome/help/sound-juicer/eu/figures/startup.png
+share/gnome/help/sound-juicer/eu/legal.xml
+share/gnome/help/sound-juicer/eu/sound-juicer.xml
share/gnome/help/sound-juicer/fr/figures/prefs.png
share/gnome/help/sound-juicer/fr/figures/startup.png
share/gnome/help/sound-juicer/fr/legal.xml
@@ -96,6 +104,7 @@ share/locale/id/LC_MESSAGES/sound-juicer.mo
share/locale/it/LC_MESSAGES/sound-juicer.mo
share/locale/ja/LC_MESSAGES/sound-juicer.mo
share/locale/ka/LC_MESSAGES/sound-juicer.mo
+share/locale/kn/LC_MESSAGES/sound-juicer.mo
share/locale/ko/LC_MESSAGES/sound-juicer.mo
share/locale/ku/LC_MESSAGES/sound-juicer.mo
share/locale/lt/LC_MESSAGES/sound-juicer.mo
@@ -137,11 +146,13 @@ share/locale/zh_CN/LC_MESSAGES/sound-juicer.mo
share/locale/zh_HK/LC_MESSAGES/sound-juicer.mo
share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo
share/omf/sound-juicer/sound-juicer-C.omf
+share/omf/sound-juicer/sound-juicer-ar.omf
share/omf/sound-juicer/sound-juicer-ca.omf
share/omf/sound-juicer/sound-juicer-de.omf
share/omf/sound-juicer/sound-juicer-el.omf
share/omf/sound-juicer/sound-juicer-en_GB.omf
share/omf/sound-juicer/sound-juicer-es.omf
+share/omf/sound-juicer/sound-juicer-eu.omf
share/omf/sound-juicer/sound-juicer-fr.omf
share/omf/sound-juicer/sound-juicer-nl.omf
share/omf/sound-juicer/sound-juicer-oc.omf
@@ -169,6 +180,8 @@ share/omf/sound-juicer/sound-juicer-uk.omf
@dirrm share/gnome/help/sound-juicer/nl
@dirrm share/gnome/help/sound-juicer/fr/figures
@dirrm share/gnome/help/sound-juicer/fr
+@dirrm share/gnome/help/sound-juicer/eu/figures
+@dirrm share/gnome/help/sound-juicer/eu
@dirrm share/gnome/help/sound-juicer/es/figures
@dirrm share/gnome/help/sound-juicer/es
@dirrm share/gnome/help/sound-juicer/en_GB/figures
@@ -179,6 +192,8 @@ share/omf/sound-juicer/sound-juicer-uk.omf
@dirrm share/gnome/help/sound-juicer/de
@dirrm share/gnome/help/sound-juicer/ca/figures
@dirrm share/gnome/help/sound-juicer/ca
+@dirrm share/gnome/help/sound-juicer/ar/figures
+@dirrm share/gnome/help/sound-juicer/ar
@dirrm share/gnome/help/sound-juicer/C/figures
@dirrm share/gnome/help/sound-juicer/C
@dirrm share/gnome/help/sound-juicer
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index fe5733bb1c49..4ecf7e3149b4 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnokii
PORTVERSION= 0.6.27
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= comms
MASTER_SITES= http://www.gnokii.org/download/gnokii/ \
@@ -53,7 +53,7 @@ OPTIONS= ICAL "Build with IETF iCal support" off \
.include <bsd.port.pre.mk>
.if exists(${LOCALBASE}/lib/libical.so) || defined(WITH_ICAL)
-LIB_DEPENDS+= ical.42:${PORTSDIR}/devel/libical
+LIB_DEPENDS+= ical.43:${PORTSDIR}/devel/libical
.endif
.if ${OSVERSION} < 800069
diff --git a/converters/ical2html/Makefile b/converters/ical2html/Makefile
index 2d44eaa8830d..306c02afc78d 100644
--- a/converters/ical2html/Makefile
+++ b/converters/ical2html/Makefile
@@ -7,14 +7,14 @@
PORTNAME= ical2html
PORTVERSION= 0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= converters
MASTER_SITES= http://www.w3.org/Tools/Ical2html/
MAINTAINER= keiichi@iijlab.net
COMMENT= Manipulation commands for iCalendar files
-LIB_DEPENDS= ical.42:${PORTSDIR}/devel/libical
+LIB_DEPENDS= ical.43:${PORTSDIR}/devel/libical
GNU_CONFIGURE= yes
diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
index 6a643719ef7d..11c3942dc60c 100644
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pdf2djvu
PORTVERSION= 0.4.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX}
@@ -16,7 +16,7 @@ MAINTAINER= darcsis@gmail.com
COMMENT= Pdf2djvu creates DjVu files from PDF files
BUILD_DEPENDS= ${LOCALBASE}/include/pstreams/pstream.h:${PORTSDIR}/devel/pstreams
-LIB_DEPENDS= poppler.3:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS= poppler.4:${PORTSDIR}/graphics/poppler
USE_GMAKE= yes
PLIST_FILES= bin/pdf2djvu
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index e1b229ce08ba..1c90f48bbc35 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/evolution-data-server/Makefile,v 1.164 2009/01/10 01:59:21 mezz Exp $
+# $MCom: ports/databases/evolution-data-server/Makefile,v 1.168 2009/03/17 13:17:16 kwm Exp $
#
PORTNAME= evolution-data-server
-PORTVERSION= 2.24.5
+PORTVERSION= 2.26.0
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,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 \
+ ical.43:${PORTSDIR}/devel/libical \
nss3.1:${PORTSDIR}/security/nss \
tasn1.4:${PORTSDIR}/security/libtasn1 \
sqlite3.8:${PORTSDIR}/databases/sqlite3 \
@@ -39,9 +40,10 @@ CONFIGURE_ARGS= --enable-static \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-PLIST_SUB= VERSION="2.24" EVO_VERSION="1.2"
+PLIST_SUB= VERSION="2.26" EVO_VERSION="1.2"
#OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off
+OPTIONS= WEATHER "Enable weather calendar backend" on
.include <bsd.port.pre.mk>
@@ -49,7 +51,6 @@ PLIST_SUB= VERSION="2.24" EVO_VERSION="1.2"
HEIMDAL_HOME?= ${LOCALBASE}
LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal
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
KRB5_LIB= `/usr/bin/krb5-config gssapi --libs`
@@ -62,6 +63,15 @@ KRB5_LIB= `/usr/bin/krb5-config gssapi --libs`
PLIST_SUB+= IMAP4="@comment "
#.endif
+.if defined(WITH_WEATHER)
+LIB_DEPENDS+= gweather.1:${PORTSDIR}/net/libgweather
+CONFIGURE_ARGS+= --with-weather
+PLIST_SUB+= WEATHER=""
+.else
+CONFIGURE_ARGS+= --without-weather
+PLIST_SUB+= WEATHER="@comment "
+.endif
+
EDS_BDB_MSG= "!!!WARNING!!!: Berkeley Database version is ${BDB_VER}. If this is an upgrade, you may experience problems if you or any other Evolution-data-server users were previously using BDB_VER 41."
pre-everything::
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index 966c8a0f0029..ed4def55e750 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-2.24.5.tar.bz2) = cf12f02b8cc0a15e046c121e6a7250cb
-SHA256 (gnome2/evolution-data-server-2.24.5.tar.bz2) = c2240b96437f36f3656da538df7631510785664a6e7723cbf75ec0f88c3d38d1
-SIZE (gnome2/evolution-data-server-2.24.5.tar.bz2) = 7857405
+MD5 (gnome2/evolution-data-server-2.26.0.tar.bz2) = d010845a4ee9604f050403b106c2f416
+SHA256 (gnome2/evolution-data-server-2.26.0.tar.bz2) = 1e15e964355de7db63f9ee1480c0882ede0d44252ed5778fe65b4e163f7945f0
+SIZE (gnome2/evolution-data-server-2.26.0.tar.bz2) = 7344309
diff --git a/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c
deleted file mode 100644
index 06b6ce249762..000000000000
--- a/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- calendar/libical/src/libical/icaltz-util.c.orig 2008-12-22 04:49:23.000000000 -0500
-+++ calendar/libical/src/libical/icaltz-util.c 2009-01-12 22:33:53.000000000 -0500
-@@ -23,6 +23,15 @@
- #include <string.h>
- #if defined(sun) && defined(__SVR4)
- #include <sys/byteorder.h>
-+#elif defined(__FreeBSD__)
-+#include <sys/endian.h>
-+#define __BYTE_ORDER _BYTE_ORDER
-+#define __LITTLE_ENDIAN _LITTLE_ENDIAN
-+#define __BIG_ENDIAN _BIG_ENDIAN
-+
-+#define bswap_16 bswap16
-+#define bswap_32 bswap32
-+#define bswap_64 bswap64
- #elif defined(_WIN32)
- #define BIG_ENDIAN 'B'
- #define LITTLE_ENDIAN 'l'
diff --git a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
index 0c06d57ce33f..f84db6643729 100644
--- a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
+++ b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in
@@ -1,5 +1,5 @@
---- docs/reference/camel/Makefile.in.orig 2009-02-03 11:31:13.000000000 -0500
-+++ docs/reference/camel/Makefile.in 2009-02-03 11:32:37.000000000 -0500
+--- docs/reference/camel/Makefile.in.orig 2009-01-16 16:16:56.000000000 +0100
++++ docs/reference/camel/Makefile.in 2009-01-16 16:18:31.000000000 +0100
@@ -130,7 +130,7 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LI
GOBJECT_QUERY = @GOBJECT_QUERY@
GREP = @GREP@
@@ -9,14 +9,3 @@
ICONV_CFLAGS = @ICONV_CFLAGS@
ICONV_LIBS = @ICONV_LIBS@
IDL_INCLUDES = @IDL_INCLUDES@
-@@ -686,8 +686,8 @@ install-data-local:
- done; \
- echo '-- Installing $(srcdir)/html/index.sgml' ; \
- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-- which gtkdoc-rebase >/dev/null && \
-- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+# which gtkdoc-rebase >/dev/null && \
-+# gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
- fi
-
- uninstall-local:
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index df48ab873e0c..d8ef379ca612 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -238,6 +238,7 @@ include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-utils.h
include/evolution-data-server-%%VERSION%%/libedataserver/eds-version.h
include/evolution-data-server-%%VERSION%%/libedataserver/md5-utils.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-book-auth-util.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-category-completion.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-categories-dialog.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-cell-renderer-color.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-contact-store.h
@@ -253,51 +254,6 @@ include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-option-menu.
include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector-dialog.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-tree-model-generator.h
-include/evolution-data-server-%%VERSION%%/libical/ical.h
-include/evolution-data-server-%%VERSION%%/libical/icalarray.h
-include/evolution-data-server-%%VERSION%%/libical/icalattach.h
-include/evolution-data-server-%%VERSION%%/libical/icalcalendar.h
-include/evolution-data-server-%%VERSION%%/libical/icalclassify.h
-include/evolution-data-server-%%VERSION%%/libical/icalcluster.h
-include/evolution-data-server-%%VERSION%%/libical/icalcomponent.h
-include/evolution-data-server-%%VERSION%%/libical/icalderivedparameter.h
-include/evolution-data-server-%%VERSION%%/libical/icalderivedproperty.h
-include/evolution-data-server-%%VERSION%%/libical/icalderivedvalue.h
-include/evolution-data-server-%%VERSION%%/libical/icaldirset.h
-include/evolution-data-server-%%VERSION%%/libical/icaldirsetimpl.h
-include/evolution-data-server-%%VERSION%%/libical/icalduration.h
-include/evolution-data-server-%%VERSION%%/libical/icalenums.h
-include/evolution-data-server-%%VERSION%%/libical/icalerror.h
-include/evolution-data-server-%%VERSION%%/libical/icalfileset.h
-include/evolution-data-server-%%VERSION%%/libical/icalfilesetimpl.h
-include/evolution-data-server-%%VERSION%%/libical/icalgauge.h
-include/evolution-data-server-%%VERSION%%/libical/icalgaugeimpl.h
-include/evolution-data-server-%%VERSION%%/libical/icallangbind.h
-include/evolution-data-server-%%VERSION%%/libical/icalmemory.h
-include/evolution-data-server-%%VERSION%%/libical/icalmessage.h
-include/evolution-data-server-%%VERSION%%/libical/icalmime.h
-include/evolution-data-server-%%VERSION%%/libical/icalparameter.h
-include/evolution-data-server-%%VERSION%%/libical/icalparser.h
-include/evolution-data-server-%%VERSION%%/libical/icalperiod.h
-include/evolution-data-server-%%VERSION%%/libical/icalproperty.h
-include/evolution-data-server-%%VERSION%%/libical/icalrecur.h
-include/evolution-data-server-%%VERSION%%/libical/icalrestriction.h
-include/evolution-data-server-%%VERSION%%/libical/icalset.h
-include/evolution-data-server-%%VERSION%%/libical/icalspanlist.h
-include/evolution-data-server-%%VERSION%%/libical/icalss.h
-include/evolution-data-server-%%VERSION%%/libical/icalssyacc.h
-include/evolution-data-server-%%VERSION%%/libical/icaltime.h
-include/evolution-data-server-%%VERSION%%/libical/icaltimezone.h
-include/evolution-data-server-%%VERSION%%/libical/icaltypes.h
-include/evolution-data-server-%%VERSION%%/libical/icaltz-util.h
-include/evolution-data-server-%%VERSION%%/libical/icalvalue.h
-include/evolution-data-server-%%VERSION%%/libical/icalvcal.h
-include/evolution-data-server-%%VERSION%%/libical/port.h
-include/evolution-data-server-%%VERSION%%/libical/pvl.h
-include/evolution-data-server-%%VERSION%%/libical/sspm.h
-include/evolution-data-server-%%VERSION%%/libical/vcaltmp.h
-include/evolution-data-server-%%VERSION%%/libical/vcc.h
-include/evolution-data-server-%%VERSION%%/libical/vobject.h
lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.a
lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.la
lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.so
@@ -366,9 +322,9 @@ lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.so
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.a
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.la
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.so
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.a
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.la
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.so
+%%WEATHER%%lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.a
+%%WEATHER%%lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.la
+%%WEATHER%%lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.so
lib/libcamel-%%EVO_VERSION%%.a
lib/libcamel-%%EVO_VERSION%%.la
lib/libcamel-%%EVO_VERSION%%.so
@@ -554,8 +510,8 @@ share/doc/camel/camel-camel-net-utils.html
share/doc/camel/camel-camel-operation.html
share/doc/camel/camel-camel-process.html
share/doc/camel/camel-camel-provider.html
-share/doc/camel/camel-camel-search-sql-sexp.html
share/doc/camel/camel-camel-search-sql.html
+share/doc/camel/camel-camel-search-sql-sexp.html
share/doc/camel/camel-camel-string-utils.html
share/doc/camel/camel-camel-trie.html
share/doc/camel/camel-camel-uid-cache.html
@@ -727,6 +683,7 @@ 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
@@ -739,7 +696,7 @@ 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%%/weather/Locations.xml
+%%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
@@ -783,7 +740,6 @@ share/locale/ka/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/kn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/ko/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/ku/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/la/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/lt/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/lv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/mk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -842,7 +798,7 @@ 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%%
-@dirrm share/evolution-data-server-%%VERSION%%/weather
+%%WEATHER%%@dirrm share/evolution-data-server-%%VERSION%%/weather
@dirrm share/evolution-data-server-%%VERSION%%/glade
@dirrm share/evolution-data-server-%%VERSION%%
@dirrm share/doc/libedataserverui
@@ -856,7 +812,6 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
@dirrm lib/evolution-data-server-%%EVO_VERSION%%/extensions
@dirrm lib/evolution-data-server-%%EVO_VERSION%%/camel-providers
@dirrm lib/evolution-data-server-%%EVO_VERSION%%
-@dirrm include/evolution-data-server-%%VERSION%%/libical
@dirrm include/evolution-data-server-%%VERSION%%/libedataserverui
@dirrm include/evolution-data-server-%%VERSION%%/libedataserver
@dirrm include/evolution-data-server-%%VERSION%%/libedata-cal
@@ -887,8 +842,6 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
-@dirrmtry share/locale/la/LC_MESSAGES
-@dirrmtry share/locale/la
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index 3f7c98a38597..4ef08f9db73e 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/glom/Makefile,v 1.21 2009/01/09 11:46:25 kwm Exp $
+# $MCom: ports/databases/glom/Makefile,v 1.24 2009/03/17 16:33:41 kwm Exp $
#
PORTNAME= glom
-PORTVERSION= 1.8.7
+PORTVERSION= 1.10.0
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,15 +16,13 @@ MAINTAINER= kwm@FreeBSD.org
COMMENT= GNOME database designer and user interface
LIB_DEPENDS= bakery-2.6:${PORTSDIR}/x11-toolkits/bakery \
- gdamm-3.0.10:${PORTSDIR}/databases/libgdamm \
+ gdamm-4.0.10:${PORTSDIR}/databases/libgdamm \
gtksourceviewmm-2.0.2:${PORTSDIR}/x11-toolkits/libgtksourceviewmm \
- avahi-ui.0:${PORTSDIR}/net/avahi-gtk \
- epc-1.0.2:${PORTSDIR}/www/libepc \
goocanvasmm-0.1.4:${PORTSDIR}/graphics/goocanvasmm
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
- ${LOCALBASE}/libdata/pkgconfig/libgda-postgres-3.0.pc:${PORTSDIR}/databases/libgda3-postgresql
+ ${LOCALBASE}/libdata/pkgconfig/libgda-postgres-4.0.pc:${PORTSDIR}/databases/libgda4-postgresql
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
- ${LOCALBASE}/libdata/pkgconfig/libgda-postgres-3.0.pc:${PORTSDIR}/databases/libgda3-postgresql
+ ${LOCALBASE}/libdata/pkgconfig/libgda-postgres-4.0.pc:${PORTSDIR}/databases/libgda4-postgresql
USE_BZIP2= yes
USE_PYTHON= yes
diff --git a/databases/glom/distinfo b/databases/glom/distinfo
index 1ee0184f9b07..522bfdf6e68e 100644
--- a/databases/glom/distinfo
+++ b/databases/glom/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glom-1.8.7.tar.bz2) = 5ac17e5505f0c519eda63e4cb1fc9be1
-SHA256 (gnome2/glom-1.8.7.tar.bz2) = 6d11cc30e54f84a4ff28e2df0eb3f8799c8db2ea541642aef1685b11a6b2780f
-SIZE (gnome2/glom-1.8.7.tar.bz2) = 3267908
+MD5 (gnome2/glom-1.10.0.tar.bz2) = 8c46a5e087771a0bc45c71d7dd74ec7f
+SHA256 (gnome2/glom-1.10.0.tar.bz2) = a0e03a087cec62ccf440923d44f2f99f83607502bf84aef34dc50c41989fca2a
+SIZE (gnome2/glom-1.10.0.tar.bz2) = 3246293
diff --git a/databases/glom/files/patch-glom_main.cc b/databases/glom/files/patch-glom_main.cc
index 69a77fb592b4..c9143bb8b24e 100644
--- a/databases/glom/files/patch-glom_main.cc
+++ b/databases/glom/files/patch-glom_main.cc
@@ -1,6 +1,6 @@
---- glom/main.cc.orig 2008-08-22 16:36:46.000000000 +0200
-+++ glom/main.cc 2008-09-13 21:23:46.000000000 +0200
-@@ -89,18 +89,19 @@
+--- glom/main.cc.orig 2009-03-16 14:53:55.000000000 +0100
++++ glom/main.cc 2009-03-17 16:22:01.000000000 +0100
+@@ -100,18 +100,19 @@ OptionGroup::OptionGroup()
} //namespace Glom
@@ -22,10 +22,10 @@
WSADATA data;
int errcode = WSAStartup(MAKEWORD(2, 0), &data);
if(errcode != 0)
-@@ -108,6 +109,7 @@
- std::cerr << "Failed to initialize WinSock: " << errcode << std::endl;
- return -1;
- }
+@@ -123,6 +124,7 @@ main(int argc, char* argv[])
+ gchar* installation_dir_c = g_win32_get_package_installation_directory_of_module(NULL);
+ const std::string installation_dir(installation_dir_c);
+ g_free(installation_dir_c);
+# endif
#endif
diff --git a/databases/glom/pkg-plist b/databases/glom/pkg-plist
index a9db6f4b6ebb..682717c2ee83 100644
--- a/databases/glom/pkg-plist
+++ b/databases/glom/pkg-plist
@@ -1,11 +1,53 @@
bin/glom
-lib/libglom.a
-lib/libglom.la
-lib/libglom.so
-lib/libglom.so.0
+include/glom-1.0/libglom/appstate.h
+include/glom-1.0/libglom/data_structure/field.h
+include/glom-1.0/libglom/data_structure/fieldtypes.h
+include/glom-1.0/libglom/data_structure/foundset.h
+include/glom-1.0/libglom/data_structure/glomconversions.h
+include/glom-1.0/libglom/data_structure/groupinfo.h
+include/glom-1.0/libglom/data_structure/iso_codes.h
+include/glom-1.0/libglom/data_structure/layout/custom_title.h
+include/glom-1.0/libglom/data_structure/layout/fieldformatting.h
+include/glom-1.0/libglom/data_structure/layout/layoutgroup.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_button.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_calendarportal.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_field.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_image.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_line.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_notebook.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_placeholder.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_portal.h
+include/glom-1.0/libglom/data_structure/layout/layoutitem_text.h
+include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h
+include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_footer.h
+include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_groupby.h
+include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_header.h
+include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_summary.h
+include/glom-1.0/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h
+include/glom-1.0/libglom/data_structure/layout/usesrelationship.h
+include/glom-1.0/libglom/data_structure/numeric_format.h
+include/glom-1.0/libglom/data_structure/parameternamegenerator.h
+include/glom-1.0/libglom/data_structure/print_layout.h
+include/glom-1.0/libglom/data_structure/privileges.h
+include/glom-1.0/libglom/data_structure/relationship.h
+include/glom-1.0/libglom/data_structure/report.h
+include/glom-1.0/libglom/data_structure/system_prefs.h
+include/glom-1.0/libglom/data_structure/tableinfo.h
+include/glom-1.0/libglom/data_structure/translatable_item.h
+include/glom-1.0/libglom/document/document_glom.h
+include/glom-1.0/libglom/document/view.h
+include/glom-1.0/libglom/libglom_config.h
+include/glom-1.0/libglom/sharedptr.h
+include/glom-1.0/libglom/standard_table_prefs_fields.h
+lib/libglom-1.0.a
+lib/libglom-1.0.la
+lib/libglom-1.0.so
+lib/libglom-1.0.so.0
%%PYTHON_SITELIBDIR%%/glom.a
%%PYTHON_SITELIBDIR%%/glom.la
%%PYTHON_SITELIBDIR%%/glom.so
+libdata/pkgconfig/glom-1.0.pc
share/applications/glom.desktop
%%DATADIR%%/doc/examples/example_film_manager.glom
%%DATADIR%%/doc/examples/example_lesson_planner.glom
@@ -203,3 +245,9 @@ share/omf/glom/glom-sv.omf
@dirrmtry share/locale/rw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrm include/glom-1.0/libglom/document
+@dirrm include/glom-1.0/libglom/data_structure/layout/report_parts
+@dirrm include/glom-1.0/libglom/data_structure/layout
+@dirrm include/glom-1.0/libglom/data_structure
+@dirrm include/glom-1.0/libglom
+@dirrm include/glom-1.0
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 709388663e2f..1e2be16b3ea7 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -3,12 +3,12 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/libgdamm/Makefile,v 1.9 2008/03/17 19:53:24 kwm Exp $
+# $MCom: ports/databases/libgdamm/Makefile,v 1.15 2009/04/09 03:24:07 mezz Exp $
#
PORTNAME= libgdamm
-PORTVERSION= 3.0.1
-PORTREVISION= 0
+PORTVERSION= 3.99.14
+PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack libgda3
+USE_GNOME= gnomehack libgda4
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
diff --git a/databases/libgdamm/distinfo b/databases/libgdamm/distinfo
index de82a37d4ca8..a8b2bd6c3046 100644
--- a/databases/libgdamm/distinfo
+++ b/databases/libgdamm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgdamm-3.0.1.tar.bz2) = 63583ec970e643962474401400e19994
-SHA256 (gnome2/libgdamm-3.0.1.tar.bz2) = 64a537f59157f0a8c804caa5a07b9b8f8676dd966190429ae0f6a04b810e28b9
-SIZE (gnome2/libgdamm-3.0.1.tar.bz2) = 1281602
+MD5 (gnome2/libgdamm-3.99.14.tar.bz2) = 51b680fdf2b724cfd475886c687f5780
+SHA256 (gnome2/libgdamm-3.99.14.tar.bz2) = d5e860afa2927af7be4deabfc97c7ead9c13f2efdab8f1b158f8e4d19bcdefa4
+SIZE (gnome2/libgdamm-3.99.14.tar.bz2) = 830976
diff --git a/databases/libgdamm/pkg-plist b/databases/libgdamm/pkg-plist
index e2fbd839b7eb..6c974cbc08c8 100644
--- a/databases/libgdamm/pkg-plist
+++ b/databases/libgdamm/pkg-plist
@@ -1,136 +1,87 @@
-include/libgdamm-3.0/libgdamm.h
-include/libgdamm-3.0/libgdamm/blob.h
-include/libgdamm-3.0/libgdamm/blobop.h
-include/libgdamm-3.0/libgdamm/client.h
-include/libgdamm-3.0/libgdamm/column.h
-include/libgdamm-3.0/libgdamm/columnindex.h
-include/libgdamm-3.0/libgdamm/command.h
-include/libgdamm-3.0/libgdamm/config.h
-include/libgdamm-3.0/libgdamm/connection.h
-include/libgdamm-3.0/libgdamm/connectionevent.h
-include/libgdamm-3.0/libgdamm/datahandler.h
-include/libgdamm-3.0/libgdamm/datamodel.h
-include/libgdamm-3.0/libgdamm/datamodelarray.h
-include/libgdamm-3.0/libgdamm/datamodelfiltersql.h
-include/libgdamm-3.0/libgdamm/datamodelhash.h
-include/libgdamm-3.0/libgdamm/datamodelimport.h
-include/libgdamm-3.0/libgdamm/datamodelindex.h
-include/libgdamm-3.0/libgdamm/datamodeliter.h
-include/libgdamm-3.0/libgdamm/datamodelquery.h
-include/libgdamm-3.0/libgdamm/datamodelrow.h
-include/libgdamm-3.0/libgdamm/dataproxy.h
-include/libgdamm-3.0/libgdamm/datasourceinfo.h
-include/libgdamm-3.0/libgdamm/dict.h
-include/libgdamm-3.0/libgdamm/dictaggregate.h
-include/libgdamm-3.0/libgdamm/dictconstraint.h
-include/libgdamm-3.0/libgdamm/dictdatabase.h
-include/libgdamm-3.0/libgdamm/dictfield.h
-include/libgdamm-3.0/libgdamm/dictfunction.h
-include/libgdamm-3.0/libgdamm/dicttable.h
-include/libgdamm-3.0/libgdamm/dicttype.h
-include/libgdamm-3.0/libgdamm/entity.h
-include/libgdamm-3.0/libgdamm/entityfield.h
-include/libgdamm-3.0/libgdamm/handlerbin.h
-include/libgdamm-3.0/libgdamm/handlerboolean.h
-include/libgdamm-3.0/libgdamm/handlernumerical.h
-include/libgdamm-3.0/libgdamm/handlerstring.h
-include/libgdamm-3.0/libgdamm/handlertime.h
-include/libgdamm-3.0/libgdamm/handlertype.h
-include/libgdamm-3.0/libgdamm/init.h
-include/libgdamm-3.0/libgdamm/object.h
-include/libgdamm-3.0/libgdamm/parameter.h
-include/libgdamm-3.0/libgdamm/parameterlist.h
-include/libgdamm-3.0/libgdamm/private/blob_p.h
-include/libgdamm-3.0/libgdamm/private/blobop_p.h
-include/libgdamm-3.0/libgdamm/private/client_p.h
-include/libgdamm-3.0/libgdamm/private/column_p.h
-include/libgdamm-3.0/libgdamm/private/columnindex_p.h
-include/libgdamm-3.0/libgdamm/private/command_p.h
-include/libgdamm-3.0/libgdamm/private/connection_p.h
-include/libgdamm-3.0/libgdamm/private/connectionevent_p.h
-include/libgdamm-3.0/libgdamm/private/datahandler_p.h
-include/libgdamm-3.0/libgdamm/private/datamodel_p.h
-include/libgdamm-3.0/libgdamm/private/datamodelarray_p.h
-include/libgdamm-3.0/libgdamm/private/datamodelfiltersql_p.h
-include/libgdamm-3.0/libgdamm/private/datamodelhash_p.h
-include/libgdamm-3.0/libgdamm/private/datamodelimport_p.h
-include/libgdamm-3.0/libgdamm/private/datamodelindex_p.h
-include/libgdamm-3.0/libgdamm/private/datamodeliter_p.h
-include/libgdamm-3.0/libgdamm/private/datamodelquery_p.h
-include/libgdamm-3.0/libgdamm/private/datamodelrow_p.h
-include/libgdamm-3.0/libgdamm/private/dataproxy_p.h
-include/libgdamm-3.0/libgdamm/private/datasourceinfo_p.h
-include/libgdamm-3.0/libgdamm/private/dict_p.h
-include/libgdamm-3.0/libgdamm/private/dictaggregate_p.h
-include/libgdamm-3.0/libgdamm/private/dictconstraint_p.h
-include/libgdamm-3.0/libgdamm/private/dictdatabase_p.h
-include/libgdamm-3.0/libgdamm/private/dictfield_p.h
-include/libgdamm-3.0/libgdamm/private/dictfunction_p.h
-include/libgdamm-3.0/libgdamm/private/dicttable_p.h
-include/libgdamm-3.0/libgdamm/private/dicttype_p.h
-include/libgdamm-3.0/libgdamm/private/entity_p.h
-include/libgdamm-3.0/libgdamm/private/entityfield_p.h
-include/libgdamm-3.0/libgdamm/private/handlerbin_p.h
-include/libgdamm-3.0/libgdamm/private/handlerboolean_p.h
-include/libgdamm-3.0/libgdamm/private/handlernumerical_p.h
-include/libgdamm-3.0/libgdamm/private/handlerstring_p.h
-include/libgdamm-3.0/libgdamm/private/handlertime_p.h
-include/libgdamm-3.0/libgdamm/private/handlertype_p.h
-include/libgdamm-3.0/libgdamm/private/object_p.h
-include/libgdamm-3.0/libgdamm/private/parameter_p.h
-include/libgdamm-3.0/libgdamm/private/parameterlist_p.h
-include/libgdamm-3.0/libgdamm/private/providerinfo_p.h
-include/libgdamm-3.0/libgdamm/private/query_p.h
-include/libgdamm-3.0/libgdamm/private/querycondition_p.h
-include/libgdamm-3.0/libgdamm/private/queryfield_p.h
-include/libgdamm-3.0/libgdamm/private/queryfieldagg_p.h
-include/libgdamm-3.0/libgdamm/private/queryfieldall_p.h
-include/libgdamm-3.0/libgdamm/private/queryfieldfield_p.h
-include/libgdamm-3.0/libgdamm/private/queryfieldfunc_p.h
-include/libgdamm-3.0/libgdamm/private/queryfieldvalue_p.h
-include/libgdamm-3.0/libgdamm/private/queryjoin_p.h
-include/libgdamm-3.0/libgdamm/private/queryobject_p.h
-include/libgdamm-3.0/libgdamm/private/querytarget_p.h
-include/libgdamm-3.0/libgdamm/private/referer_p.h
-include/libgdamm-3.0/libgdamm/private/renderer_p.h
-include/libgdamm-3.0/libgdamm/private/row_p.h
-include/libgdamm-3.0/libgdamm/private/serveroperation_p.h
-include/libgdamm-3.0/libgdamm/private/serverprovider_p.h
-include/libgdamm-3.0/libgdamm/private/transactionstatus_p.h
-include/libgdamm-3.0/libgdamm/private/xmlstorage_p.h
-include/libgdamm-3.0/libgdamm/providerinfo.h
-include/libgdamm-3.0/libgdamm/query.h
-include/libgdamm-3.0/libgdamm/querycondition.h
-include/libgdamm-3.0/libgdamm/queryfield.h
-include/libgdamm-3.0/libgdamm/queryfieldagg.h
-include/libgdamm-3.0/libgdamm/queryfieldall.h
-include/libgdamm-3.0/libgdamm/queryfieldfield.h
-include/libgdamm-3.0/libgdamm/queryfieldfunc.h
-include/libgdamm-3.0/libgdamm/queryfieldvalue.h
-include/libgdamm-3.0/libgdamm/queryjoin.h
-include/libgdamm-3.0/libgdamm/queryobject.h
-include/libgdamm-3.0/libgdamm/querytarget.h
-include/libgdamm-3.0/libgdamm/referer.h
-include/libgdamm-3.0/libgdamm/renderer.h
-include/libgdamm-3.0/libgdamm/row.h
-include/libgdamm-3.0/libgdamm/serveroperation.h
-include/libgdamm-3.0/libgdamm/serverprovider.h
-include/libgdamm-3.0/libgdamm/transactionstatus.h
-include/libgdamm-3.0/libgdamm/value.h
-include/libgdamm-3.0/libgdamm/wrap_init.h
-include/libgdamm-3.0/libgdamm/xmlstorage.h
-lib/libgdamm-3.0.a
-lib/libgdamm-3.0.la
-lib/libgdamm-3.0.so
-lib/libgdamm-3.0.so.10
-lib/libgdamm-3.0/include/libgdammconfig.h
-lib/libgdamm-3.0/proc/m4/convert.m4
-lib/libgdamm-3.0/proc/m4/convert_libgdamm.m4
-libdata/pkgconfig/libgdamm-3.0.pc
-@dirrm lib/libgdamm-3.0/proc/m4
-@dirrm lib/libgdamm-3.0/proc
-@dirrm lib/libgdamm-3.0/include
-@dirrm lib/libgdamm-3.0
-@dirrm include/libgdamm-3.0/libgdamm/private
-@dirrm include/libgdamm-3.0/libgdamm
-@dirrm include/libgdamm-3.0
+include/libgdamm-4.0/libgdamm.h
+include/libgdamm-4.0/libgdamm/batch.h
+include/libgdamm-4.0/libgdamm/blob.h
+include/libgdamm-4.0/libgdamm/blobop.h
+include/libgdamm-4.0/libgdamm/column.h
+include/libgdamm-4.0/libgdamm/config.h
+include/libgdamm-4.0/libgdamm/connection.h
+include/libgdamm-4.0/libgdamm/connectionevent.h
+include/libgdamm-4.0/libgdamm/dataaccesswrapper.h
+include/libgdamm-4.0/libgdamm/datacomparator.h
+include/libgdamm-4.0/libgdamm/datahandler.h
+include/libgdamm-4.0/libgdamm/datamodel.h
+include/libgdamm-4.0/libgdamm/datamodelarray.h
+include/libgdamm-4.0/libgdamm/datamodelimport.h
+include/libgdamm-4.0/libgdamm/datamodeliter.h
+include/libgdamm-4.0/libgdamm/dataproxy.h
+include/libgdamm-4.0/libgdamm/dataselect.h
+include/libgdamm-4.0/libgdamm/handlerbin.h
+include/libgdamm-4.0/libgdamm/handlerboolean.h
+include/libgdamm-4.0/libgdamm/handlernumerical.h
+include/libgdamm-4.0/libgdamm/handlerstring.h
+include/libgdamm-4.0/libgdamm/handlertime.h
+include/libgdamm-4.0/libgdamm/handlertype.h
+include/libgdamm-4.0/libgdamm/holder.h
+include/libgdamm-4.0/libgdamm/init.h
+include/libgdamm-4.0/libgdamm/metastore.h
+include/libgdamm-4.0/libgdamm/metastruct.h
+include/libgdamm-4.0/libgdamm/private/batch_p.h
+include/libgdamm-4.0/libgdamm/private/blob_p.h
+include/libgdamm-4.0/libgdamm/private/blobop_p.h
+include/libgdamm-4.0/libgdamm/private/column_p.h
+include/libgdamm-4.0/libgdamm/private/config_p.h
+include/libgdamm-4.0/libgdamm/private/connection_p.h
+include/libgdamm-4.0/libgdamm/private/connectionevent_p.h
+include/libgdamm-4.0/libgdamm/private/dataaccesswrapper_p.h
+include/libgdamm-4.0/libgdamm/private/datacomparator_p.h
+include/libgdamm-4.0/libgdamm/private/datahandler_p.h
+include/libgdamm-4.0/libgdamm/private/datamodel_p.h
+include/libgdamm-4.0/libgdamm/private/datamodelarray_p.h
+include/libgdamm-4.0/libgdamm/private/datamodelimport_p.h
+include/libgdamm-4.0/libgdamm/private/datamodeliter_p.h
+include/libgdamm-4.0/libgdamm/private/dataproxy_p.h
+include/libgdamm-4.0/libgdamm/private/dataselect_p.h
+include/libgdamm-4.0/libgdamm/private/handlerbin_p.h
+include/libgdamm-4.0/libgdamm/private/handlerboolean_p.h
+include/libgdamm-4.0/libgdamm/private/handlernumerical_p.h
+include/libgdamm-4.0/libgdamm/private/handlerstring_p.h
+include/libgdamm-4.0/libgdamm/private/handlertime_p.h
+include/libgdamm-4.0/libgdamm/private/handlertype_p.h
+include/libgdamm-4.0/libgdamm/private/holder_p.h
+include/libgdamm-4.0/libgdamm/private/metastore_p.h
+include/libgdamm-4.0/libgdamm/private/metastruct_p.h
+include/libgdamm-4.0/libgdamm/private/quarklist_p.h
+include/libgdamm-4.0/libgdamm/private/row_p.h
+include/libgdamm-4.0/libgdamm/private/serveroperation_p.h
+include/libgdamm-4.0/libgdamm/private/serverprovider_p.h
+include/libgdamm-4.0/libgdamm/private/set_p.h
+include/libgdamm-4.0/libgdamm/private/sqlparser_p.h
+include/libgdamm-4.0/libgdamm/private/statement_p.h
+include/libgdamm-4.0/libgdamm/private/transactionstatus_p.h
+include/libgdamm-4.0/libgdamm/private/xatransaction_p.h
+include/libgdamm-4.0/libgdamm/quarklist.h
+include/libgdamm-4.0/libgdamm/row.h
+include/libgdamm-4.0/libgdamm/serveroperation.h
+include/libgdamm-4.0/libgdamm/serverprovider.h
+include/libgdamm-4.0/libgdamm/set.h
+include/libgdamm-4.0/libgdamm/sqlparser.h
+include/libgdamm-4.0/libgdamm/statement.h
+include/libgdamm-4.0/libgdamm/transactionstatus.h
+include/libgdamm-4.0/libgdamm/value.h
+include/libgdamm-4.0/libgdamm/wrap_init.h
+include/libgdamm-4.0/libgdamm/xatransaction.h
+lib/libgdamm-4.0.a
+lib/libgdamm-4.0.la
+lib/libgdamm-4.0.so
+lib/libgdamm-4.0.so.10
+lib/libgdamm-4.0/include/libgdammconfig.h
+lib/libgdamm-4.0/proc/m4/convert.m4
+lib/libgdamm-4.0/proc/m4/convert_libgdamm.m4
+libdata/pkgconfig/libgdamm-4.0.pc
+@dirrm lib/libgdamm-4.0/proc/m4
+@dirrm lib/libgdamm-4.0/proc
+@dirrm lib/libgdamm-4.0/include
+@dirrm lib/libgdamm-4.0
+@dirrm include/libgdamm-4.0/libgdamm/private
+@dirrm include/libgdamm-4.0/libgdamm
+@dirrm include/libgdamm-4.0
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 213e08bd2055..cf342af08f2d 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.94 2008/11/23 02:11:32 marcus Exp $
+# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.99 2009/03/18 04:27:55 marcus Exp $
#
PORTNAME= deskbar-applet
-PORTVERSION= 2.24.3
-PORTREVISION= 1
+PORTVERSION= 2.26.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo
index 3b37be39a234..b038a7cfb542 100644
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/deskbar-applet-2.24.3.tar.bz2) = 8d4d7830967034dd0fae40bb48c0276d
-SHA256 (gnome2/deskbar-applet-2.24.3.tar.bz2) = 8bf875f051553c9cef6ba9c27ad9f7477395e15cf954013cc0fe228e66dda5f6
-SIZE (gnome2/deskbar-applet-2.24.3.tar.bz2) = 933238
+MD5 (gnome2/deskbar-applet-2.26.0.tar.bz2) = 168044d1312bf30e71f2ed587d2bffb6
+SHA256 (gnome2/deskbar-applet-2.26.0.tar.bz2) = 547c80dc1a21b0f4e8b866601623b902448ac81780c2d29a25299a0953e1bc17
+SIZE (gnome2/deskbar-applet-2.26.0.tar.bz2) = 969825
diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist
index 872b990194a7..5635b20f6f9e 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -38,6 +38,9 @@ lib/deskbar-applet/modules-2.20-compatible/iswitch-window.pyo
lib/deskbar-applet/modules-2.20-compatible/mozilla.py
lib/deskbar-applet/modules-2.20-compatible/mozilla.pyc
lib/deskbar-applet/modules-2.20-compatible/mozilla.pyo
+lib/deskbar-applet/modules-2.20-compatible/opensearch.py
+lib/deskbar-applet/modules-2.20-compatible/opensearch.pyc
+lib/deskbar-applet/modules-2.20-compatible/opensearch.pyo
lib/deskbar-applet/modules-2.20-compatible/programs.py
lib/deskbar-applet/modules-2.20-compatible/programs.pyc
lib/deskbar-applet/modules-2.20-compatible/programs.pyo
@@ -311,15 +314,18 @@ libdata/pkgconfig/deskbar-applet.pc
%%DATADIR%%/art/web-search.png
%%DATADIR%%/art/wikipedia.png
%%DATADIR%%/art/yahoo.png
-%%DATADIR%%/mozilla-search.glade
-%%DATADIR%%/prefs-dialog.glade
-%%DATADIR%%/smart-bookmarks.glade
+%%DATADIR%%/mozilla-search.ui
+%%DATADIR%%/prefs-dialog.ui
+%%DATADIR%%/smart-bookmarks.ui
share/gnome/help/deskbar/C/deskbar.xml
share/gnome/help/deskbar/C/figures/deskbar-applet.png
share/gnome/help/deskbar/C/legal.xml
share/gnome/help/deskbar/ca/deskbar.xml
share/gnome/help/deskbar/ca/figures/deskbar-applet.png
share/gnome/help/deskbar/ca/legal.xml
+share/gnome/help/deskbar/de/deskbar.xml
+share/gnome/help/deskbar/de/figures/deskbar-applet.png
+share/gnome/help/deskbar/de/legal.xml
share/gnome/help/deskbar/el/deskbar.xml
share/gnome/help/deskbar/el/figures/deskbar-applet.png
share/gnome/help/deskbar/el/legal.xml
@@ -433,6 +439,7 @@ share/locale/zh_HK/LC_MESSAGES/deskbar-applet.mo
share/locale/zh_TW/LC_MESSAGES/deskbar-applet.mo
share/omf/deskbar/deskbar-C.omf
share/omf/deskbar/deskbar-ca.omf
+share/omf/deskbar/deskbar-de.omf
share/omf/deskbar/deskbar-el.omf
share/omf/deskbar/deskbar-en_GB.omf
share/omf/deskbar/deskbar-es.omf
@@ -467,6 +474,8 @@ share/omf/deskbar/deskbar-zh_CN.omf
@dirrm share/gnome/help/deskbar/en_GB
@dirrm share/gnome/help/deskbar/el/figures
@dirrm share/gnome/help/deskbar/el
+@dirrm share/gnome/help/deskbar/de/figures
+@dirrm share/gnome/help/deskbar/de
@dirrm share/gnome/help/deskbar/ca/figures
@dirrm share/gnome/help/deskbar/ca
@dirrm share/gnome/help/deskbar/C/figures
diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile
index e015fb0bfa01..89d430789aec 100644
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.33 2008/09/27 01:52:59 mezz Exp $
+# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.35 2009/03/16 08:49:02 kwm Exp $
#
PORTNAME= evolution-jescs
-PORTVERSION= 2.24.0
+PORTVERSION= 2.26.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -27,8 +27,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-EVO_VERSION= 2.24
-PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.24"
+EVO_VERSION= 2.26
+PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.26"
post-patch:
@${REINPLACE_CMD} -e 's|libdir/bonobo/servers|prefix/libdata/bonobo/servers|g' \
diff --git a/deskutils/evolution-jescs/distinfo b/deskutils/evolution-jescs/distinfo
index d5cb9a7507ca..51be9408354f 100644
--- a/deskutils/evolution-jescs/distinfo
+++ b/deskutils/evolution-jescs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-jescs-2.24.0.tar.bz2) = ad7e6ec6c47aa7a3fba490f62d0355cf
-SHA256 (gnome2/evolution-jescs-2.24.0.tar.bz2) = 6a796c57b053d7197e5c71f2f50faf02dbe13f676445995c9d0b1a90852475b5
-SIZE (gnome2/evolution-jescs-2.24.0.tar.bz2) = 523349
+MD5 (gnome2/evolution-jescs-2.26.0.tar.bz2) = dd59c0d9589f5ad4755fa4e473d7fe1f
+SHA256 (gnome2/evolution-jescs-2.26.0.tar.bz2) = cff3cf2a9ce7e68d879ef0ba47884ebbe4cdec94b7872f3ef285153bb389a8b9
+SIZE (gnome2/evolution-jescs-2.26.0.tar.bz2) = 537795
diff --git a/deskutils/gnome-main-menu/Makefile b/deskutils/gnome-main-menu/Makefile
index cc23980c4686..baea2f882324 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= 1
+PORTREVISION= 2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -22,8 +22,9 @@ USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack eel2 gnomedesktop
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ LIBS="`pkg-config --libs libgnomeui-2.0`"
GCONF_SCHEMAS= application-browser.schemas slab.schemas
diff --git a/deskutils/gnome-main-menu/files/patch-main-menu_src_main-menu.c b/deskutils/gnome-main-menu/files/patch-main-menu_src_main-menu.c
new file mode 100644
index 000000000000..0f30d84d3ff4
--- /dev/null
+++ b/deskutils/gnome-main-menu/files/patch-main-menu_src_main-menu.c
@@ -0,0 +1,10 @@
+--- main-menu/src/main-menu.c.orig 2009-04-06 23:41:15.000000000 -0400
++++ main-menu/src/main-menu.c 2009-04-06 23:41:27.000000000 -0400
+@@ -24,6 +24,7 @@
+
+ #include <glib.h>
+ #include <panel-applet.h>
++#include <libgnomeui/libgnomeui.h>
+ #include <string.h>
+
+ #include "libslab-utils.h"
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 775db55c2a9f..dc257b3bc725 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.130 2008/10/20 22:42:42 kwm Exp $
+# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.135 2009/03/21 21:35:37 marcus Exp $
#
PORTNAME= gnome-utils
-PORTVERSION= 2.24.1
+PORTVERSION= 2.26.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
@@ -34,6 +35,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 \
baobab.1
GCONF_SCHEMAS= gnome-dictionary.schemas gnome-screenshot.schemas \
- gnome-search-tool.schemas logview.schemas baobab.schemas
+ gnome-search-tool.schemas baobab.schemas \
+ gnome-system-log.schemas
.include <bsd.port.mk>
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index a1a9ef57a8ac..032b1ebd5678 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-utils-2.24.1.tar.bz2) = 232937a4bf5c9ebb1bbc86793871d843
-SHA256 (gnome2/gnome-utils-2.24.1.tar.bz2) = 6b7e29feaa25d5e85fa55a00775e7b3296725ef98b455b8b1d810cf379cfdd00
-SIZE (gnome2/gnome-utils-2.24.1.tar.bz2) = 6410784
+MD5 (gnome2/gnome-utils-2.26.0.tar.bz2) = 667400cfb9bee954028024ac3cf91a09
+SHA256 (gnome2/gnome-utils-2.26.0.tar.bz2) = 8407acc4f1839d86157d4eb19406cb8c0762729af8d0ddcc288844ffc9ecb120
+SIZE (gnome2/gnome-utils-2.26.0.tar.bz2) = 6882359
diff --git a/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c
index 9d1ee8c9c55c..f29974a81f2c 100644
--- a/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c
+++ b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c
@@ -1,9 +1,9 @@
---- gsearchtool/gsearchtool-support.c.orig Thu Jan 5 23:26:25 2006
-+++ gsearchtool/gsearchtool-support.c Thu Jan 5 23:27:04 2006
-@@ -31,6 +31,7 @@
-
+--- gsearchtool/gsearchtool-support.c.orig 2008-12-19 16:53:22.000000000 -0500
++++ gsearchtool/gsearchtool-support.c 2009-02-27 17:30:06.000000000 -0500
+@@ -32,6 +32,7 @@
+ #include <string.h>
#include <glib/gi18n.h>
- #include <glib/gdate.h>
+ #include <glib.h>
+#include <sys/types.h>
#include <regex.h>
#include <gdk/gdkx.h>
diff --git a/deskutils/gnome-utils/files/patch-logview_gtkmessagearea.c b/deskutils/gnome-utils/files/patch-logview_gtkmessagearea.c
new file mode 100644
index 000000000000..2388e3449431
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_gtkmessagearea.c
@@ -0,0 +1,11 @@
+--- logview/gtkmessagearea.c.orig 2009-03-21 17:23:53.000000000 -0400
++++ logview/gtkmessagearea.c 2009-03-21 17:24:08.000000000 -0400
+@@ -33,6 +33,8 @@
+
+ #include "gtkmessagearea.h"
+
++#include <stdlib.h>
++
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
diff --git a/deskutils/gnome-utils/files/patch-logview_logview-manager.c b/deskutils/gnome-utils/files/patch-logview_logview-manager.c
new file mode 100644
index 000000000000..00ec357ef46e
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_logview-manager.c
@@ -0,0 +1,10 @@
+--- logview/logview-manager.c.orig 2009-03-21 17:25:27.000000000 -0400
++++ logview/logview-manager.c 2009-03-21 17:25:37.000000000 -0400
+@@ -25,6 +25,7 @@
+
+ #include <glib/gi18n.h>
+
++#include "logview-app.h"
+ #include "logview-prefs.h"
+ #include "logview-marshal.h"
+
diff --git a/deskutils/gnome-utils/files/patch-logview_logview-utils.c b/deskutils/gnome-utils/files/patch-logview_logview-utils.c
new file mode 100644
index 000000000000..4faad70213df
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_logview-utils.c
@@ -0,0 +1,11 @@
+--- logview/logview-utils.c.orig 2009-03-21 17:22:41.000000000 -0400
++++ logview/logview-utils.c 2009-03-21 17:23:22.000000000 -0400
+@@ -136,7 +136,7 @@ log_read_dates (const char **buffer_line
+ {
+ int current_year, offsetyear, i, n, rangemin, rangemax, timestamp_len = 0;
+ GSList *days = NULL;
+- GDate *date, *newdate;
++ GDate *date = NULL, *newdate;
+ struct tm *tmptm;
+ char *date_string;
+ Day *day;
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 0f71ca4e1454..c53f053ed522 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -71,9 +71,7 @@ share/gnome-2.0/ui/GNOME_DictionaryApplet.xml
share/gnome-dictionary/gnome-dictionary-preferences.glade
share/gnome-dictionary/gnome-dictionary-ui.xml
share/gnome-screenshot/gnome-screenshot.ui
-share/gnome-system-log/gnome-system-log-actions.db
-share/gnome-system-log/gnome-system-log-descript.db
-share/gnome-system-log/gnome-system-log-regexp.db
+%%DATADIR%%/logview-toolbar.xml
share/gnome/help/baobab/C/baobab.xml
share/gnome/help/baobab/C/figures/baobab_fullscan.png
share/gnome/help/baobab/C/figures/baobab_prefs.png
@@ -91,6 +89,14 @@ share/gnome/help/baobab/ca/figures/baobab_ringschart1.png
share/gnome/help/baobab/ca/figures/baobab_ringschart2.png
share/gnome/help/baobab/ca/figures/baobab_treemaps.png
share/gnome/help/baobab/ca/figures/baobab_window.png
+share/gnome/help/baobab/cs/baobab.xml
+share/gnome/help/baobab/cs/figures/baobab_fullscan.png
+share/gnome/help/baobab/cs/figures/baobab_prefs.png
+share/gnome/help/baobab/cs/figures/baobab_remote.png
+share/gnome/help/baobab/cs/figures/baobab_ringschart1.png
+share/gnome/help/baobab/cs/figures/baobab_ringschart2.png
+share/gnome/help/baobab/cs/figures/baobab_treemaps.png
+share/gnome/help/baobab/cs/figures/baobab_window.png
share/gnome/help/baobab/da/baobab.xml
share/gnome/help/baobab/da/figures/baobab_fullscan.png
share/gnome/help/baobab/da/figures/baobab_prefs.png
@@ -123,6 +129,14 @@ share/gnome/help/baobab/es/figures/baobab_ringschart1.png
share/gnome/help/baobab/es/figures/baobab_ringschart2.png
share/gnome/help/baobab/es/figures/baobab_treemaps.png
share/gnome/help/baobab/es/figures/baobab_window.png
+share/gnome/help/baobab/eu/baobab.xml
+share/gnome/help/baobab/eu/figures/baobab_fullscan.png
+share/gnome/help/baobab/eu/figures/baobab_prefs.png
+share/gnome/help/baobab/eu/figures/baobab_remote.png
+share/gnome/help/baobab/eu/figures/baobab_ringschart1.png
+share/gnome/help/baobab/eu/figures/baobab_ringschart2.png
+share/gnome/help/baobab/eu/figures/baobab_treemaps.png
+share/gnome/help/baobab/eu/figures/baobab_window.png
share/gnome/help/baobab/fi/baobab.xml
share/gnome/help/baobab/fi/figures/baobab_fullscan.png
share/gnome/help/baobab/fi/figures/baobab_prefs.png
@@ -155,6 +169,14 @@ share/gnome/help/baobab/oc/figures/baobab_ringschart1.png
share/gnome/help/baobab/oc/figures/baobab_ringschart2.png
share/gnome/help/baobab/oc/figures/baobab_treemaps.png
share/gnome/help/baobab/oc/figures/baobab_window.png
+share/gnome/help/baobab/pl/baobab.xml
+share/gnome/help/baobab/pl/figures/baobab_fullscan.png
+share/gnome/help/baobab/pl/figures/baobab_prefs.png
+share/gnome/help/baobab/pl/figures/baobab_remote.png
+share/gnome/help/baobab/pl/figures/baobab_ringschart1.png
+share/gnome/help/baobab/pl/figures/baobab_ringschart2.png
+share/gnome/help/baobab/pl/figures/baobab_treemaps.png
+share/gnome/help/baobab/pl/figures/baobab_window.png
share/gnome/help/baobab/ru/baobab.xml
share/gnome/help/baobab/ru/figures/baobab_fullscan.png
share/gnome/help/baobab/ru/figures/baobab_prefs.png
@@ -250,6 +272,15 @@ share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-lookup.png
share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-preferences-print.png
share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-preferences-source.png
share/gnome/help/gnome-dictionary/es/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/eu/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/eu/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/eu/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/eu/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/eu/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/eu/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/eu/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/eu/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/eu/gnome-dictionary.xml
share/gnome/help/gnome-dictionary/fi/figures/gnome-dictionary-add-source.png
share/gnome/help/gnome-dictionary/fi/figures/gnome-dictionary-applet-window.png
share/gnome/help/gnome-dictionary/fi/figures/gnome-dictionary-applet.png
@@ -324,6 +355,8 @@ share/gnome/help/gnome-search-tool/en_GB/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/en_GB/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/es/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/eu/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/eu/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/fi/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/fi/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/fr/figures/gnome-search-tool_window.png
@@ -353,6 +386,8 @@ share/gnome/help/gnome-system-log/en_GB/figures/syslog_window.png
share/gnome/help/gnome-system-log/en_GB/gnome-system-log.xml
share/gnome/help/gnome-system-log/es/figures/syslog_window.png
share/gnome/help/gnome-system-log/es/gnome-system-log.xml
+share/gnome/help/gnome-system-log/eu/figures/syslog_window.png
+share/gnome/help/gnome-system-log/eu/gnome-system-log.xml
share/gnome/help/gnome-system-log/fi/figures/syslog_window.png
share/gnome/help/gnome-system-log/fi/gnome-system-log.xml
share/gnome/help/gnome-system-log/fr/figures/syslog_window.png
@@ -371,14 +406,17 @@ share/gnome/help/gnome-system-log/uk/figures/syslog_window.png
share/gnome/help/gnome-system-log/uk/gnome-system-log.xml
share/omf/baobab/baobab-C.omf
share/omf/baobab/baobab-ca.omf
+share/omf/baobab/baobab-cs.omf
share/omf/baobab/baobab-da.omf
share/omf/baobab/baobab-de.omf
share/omf/baobab/baobab-en_GB.omf
share/omf/baobab/baobab-es.omf
+share/omf/baobab/baobab-eu.omf
share/omf/baobab/baobab-fi.omf
share/omf/baobab/baobab-fr.omf
share/omf/baobab/baobab-it.omf
share/omf/baobab/baobab-oc.omf
+share/omf/baobab/baobab-pl.omf
share/omf/baobab/baobab-ru.omf
share/omf/baobab/baobab-sv.omf
share/omf/baobab/baobab-uk.omf
@@ -390,6 +428,7 @@ 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
share/omf/gnome-dictionary/gnome-dictionary-es.omf
+share/omf/gnome-dictionary/gnome-dictionary-eu.omf
share/omf/gnome-dictionary/gnome-dictionary-fi.omf
share/omf/gnome-dictionary/gnome-dictionary-fr.omf
share/omf/gnome-dictionary/gnome-dictionary-it.omf
@@ -402,6 +441,7 @@ share/omf/gnome-search-tool/gnome-search-tool-ca.omf
share/omf/gnome-search-tool/gnome-search-tool-de.omf
share/omf/gnome-search-tool/gnome-search-tool-en_GB.omf
share/omf/gnome-search-tool/gnome-search-tool-es.omf
+share/omf/gnome-search-tool/gnome-search-tool-eu.omf
share/omf/gnome-search-tool/gnome-search-tool-fi.omf
share/omf/gnome-search-tool/gnome-search-tool-it.omf
share/omf/gnome-search-tool/gnome-search-tool-ko.omf
@@ -416,6 +456,7 @@ 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
share/omf/gnome-system-log/gnome-system-log-es.omf
+share/omf/gnome-system-log/gnome-system-log-eu.omf
share/omf/gnome-system-log/gnome-system-log-fi.omf
share/omf/gnome-system-log/gnome-system-log-fr.omf
share/omf/gnome-system-log/gnome-system-log-it.omf
@@ -429,6 +470,7 @@ share/icons/hicolor/24x24/apps/baobab.png
share/icons/hicolor/scalable/apps/baobab.svg
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
share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/be/LC_MESSAGES/gnome-utils-2.0.mo
@@ -528,6 +570,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-system-log/fr
@dirrm share/gnome/help/gnome-system-log/fi/figures
@dirrm share/gnome/help/gnome-system-log/fi
+@dirrm share/gnome/help/gnome-system-log/eu/figures
+@dirrm share/gnome/help/gnome-system-log/eu
@dirrm share/gnome/help/gnome-system-log/es/figures
@dirrm share/gnome/help/gnome-system-log/es
@dirrm share/gnome/help/gnome-system-log/en_GB/figures
@@ -557,6 +601,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-search-tool/fr
@dirrm share/gnome/help/gnome-search-tool/fi/figures
@dirrm share/gnome/help/gnome-search-tool/fi
+@dirrm share/gnome/help/gnome-search-tool/eu/figures
+@dirrm share/gnome/help/gnome-search-tool/eu
@dirrm share/gnome/help/gnome-search-tool/es/figures
@dirrm share/gnome/help/gnome-search-tool/es
@dirrm share/gnome/help/gnome-search-tool/en_GB/figures
@@ -582,6 +628,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-dictionary/fr
@dirrm share/gnome/help/gnome-dictionary/fi/figures
@dirrm share/gnome/help/gnome-dictionary/fi
+@dirrm share/gnome/help/gnome-dictionary/eu/figures
+@dirrm share/gnome/help/gnome-dictionary/eu
@dirrm share/gnome/help/gnome-dictionary/es/figures
@dirrm share/gnome/help/gnome-dictionary/es
@dirrm share/gnome/help/gnome-dictionary/en_GB/figures
@@ -605,6 +653,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/baobab/sv
@dirrm share/gnome/help/baobab/ru/figures
@dirrm share/gnome/help/baobab/ru
+@dirrm share/gnome/help/baobab/pl/figures
+@dirrm share/gnome/help/baobab/pl
@dirrm share/gnome/help/baobab/oc/figures
@dirrm share/gnome/help/baobab/oc
@dirrm share/gnome/help/baobab/it/figures
@@ -613,6 +663,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/baobab/fr
@dirrm share/gnome/help/baobab/fi/figures
@dirrm share/gnome/help/baobab/fi
+@dirrm share/gnome/help/baobab/eu/figures
+@dirrm share/gnome/help/baobab/eu
@dirrm share/gnome/help/baobab/es/figures
@dirrm share/gnome/help/baobab/es
@dirrm share/gnome/help/baobab/en_GB/figures
@@ -621,12 +673,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/baobab/de
@dirrm share/gnome/help/baobab/da/figures
@dirrm share/gnome/help/baobab/da
+@dirrm share/gnome/help/baobab/cs/figures
+@dirrm share/gnome/help/baobab/cs
@dirrm share/gnome/help/baobab/ca/figures
@dirrm share/gnome/help/baobab/ca
@dirrm share/gnome/help/baobab/C/figures
@dirrm share/gnome/help/baobab/C
@dirrm share/gnome/help/baobab
-@dirrm share/gnome-system-log
+@dirrm %%DATADIR%%
@dirrm share/gnome-screenshot
@dirrm share/gnome-dictionary
@dirrm share/gdict-1.0/sources
@@ -667,5 +721,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.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/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index fa73b100d97c..ae88ae1b573e 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gucharmap/Makefile,v 1.57 2008/11/25 05:40:17 mezz Exp $
+# $MCom: ports/deskutils/gucharmap/Makefile,v 1.60 2009/03/16 07:50:48 kwm Exp $
#
PORTNAME= gucharmap
-PORTVERSION= 2.24.3
+PORTVERSION= 2.26.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index d80953f47e05..0b61f2f415d6 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gucharmap-2.24.3.tar.bz2) = 7e02c06f3b8d375e059073af378bf093
-SHA256 (gnome2/gucharmap-2.24.3.tar.bz2) = 6d9cbe1b581bd75eda9947000d8dd10503cc543ce3d49c202fb044236bd6b60a
-SIZE (gnome2/gucharmap-2.24.3.tar.bz2) = 2923913
+MD5 (gnome2/gucharmap-2.26.0.tar.bz2) = c4384767bd11f43ef997bda7d77600a4
+SHA256 (gnome2/gucharmap-2.26.0.tar.bz2) = 7eff30430f3c2a29b2e608d803c109985b3c6218dd1f70d8cbfd0b8dd4c1e1b6
+SIZE (gnome2/gucharmap-2.26.0.tar.bz2) = 2939486
diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index ea6c7b969d6c..95b8bb64e629 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/hamster-applet/Makefile,v 1.13 2008/11/25 16:12:27 marcus Exp $
+# $MCom: ports/deskutils/hamster-applet/Makefile,v 1.18 2009/03/21 21:05:56 marcus Exp $
#
PORTNAME= hamster-applet
-PORTVERSION= 2.24.3
+PORTVERSION= 2.26.0
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/hamster-applet/distinfo b/deskutils/hamster-applet/distinfo
index ae492ee71c05..958527b87fd2 100644
--- a/deskutils/hamster-applet/distinfo
+++ b/deskutils/hamster-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/hamster-applet-2.24.3.tar.bz2) = 34708555bd77fe012419584213911315
-SHA256 (gnome2/hamster-applet-2.24.3.tar.bz2) = f59f0647eab59b852402aeca208fba49aeda515cfbae504309f94a7c59784b22
-SIZE (gnome2/hamster-applet-2.24.3.tar.bz2) = 401534
+MD5 (gnome2/hamster-applet-2.26.0.tar.bz2) = 4e2e5853b1101fa98e69c231a2378ae5
+SHA256 (gnome2/hamster-applet-2.26.0.tar.bz2) = 97930bdbf8ca3f3078709625430401ce6bff644dd3583e958f8ff9472fdd7d2d
+SIZE (gnome2/hamster-applet-2.26.0.tar.bz2) = 421678
diff --git a/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py b/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py
index e61e0f77b1d7..ec54fd792bbd 100644
--- a/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py
+++ b/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py
@@ -1,14 +1,14 @@
---- hamster/hamster-applet.py.orig 2008-08-07 10:22:46.000000000 -0400
-+++ hamster/hamster-applet.py 2008-08-07 10:23:13.000000000 -0400
-@@ -51,10 +51,10 @@ if hasattr(gettext, 'bind_textdomain_cod
+--- hamster/hamster-applet.py.orig 2009-02-13 16:02:00.000000000 -0500
++++ hamster/hamster-applet.py 2009-02-27 19:50:13.000000000 -0500
+@@ -52,10 +52,10 @@ if hasattr(gettext, 'bind_textdomain_cod
gettext.bind_textdomain_codeset('hamster-applet','UTF-8')
gettext.textdomain('hamster-applet')
--locale.bindtextdomain('hamster-applet', abspath(join(hamster.defs.DATA_DIR, "locale")))
+-locale.bindtextdomain('hamster-applet', locale_dir)
-if hasattr(locale, 'bind_textdomain_codeset'):
- locale.bind_textdomain_codeset('hamster-applet','UTF-8')
-locale.textdomain('hamster-applet')
-+#locale.bindtextdomain('hamster-applet', abspath(join(hamster.defs.DATA_DIR, "locale")))
++#locale.bindtextdomain('hamster-applet', locale_dir)
+#if hasattr(locale, 'bind_textdomain_codeset'):
+# locale.bind_textdomain_codeset('hamster-applet','UTF-8')
+#locale.textdomain('hamster-applet')
diff --git a/deskutils/hamster-applet/pkg-plist b/deskutils/hamster-applet/pkg-plist
index 251bc010fd75..12f0f91c0c3d 100644
--- a/deskutils/hamster-applet/pkg-plist
+++ b/deskutils/hamster-applet/pkg-plist
@@ -32,6 +32,9 @@ lib/hamster-applet/hamster-applet
%%PYTHON_SITELIBDIR%%/hamster/eds.py
%%PYTHON_SITELIBDIR%%/hamster/eds.pyc
%%PYTHON_SITELIBDIR%%/hamster/eds.pyo
+%%PYTHON_SITELIBDIR%%/hamster/hamsterdbus.py
+%%PYTHON_SITELIBDIR%%/hamster/hamsterdbus.pyc
+%%PYTHON_SITELIBDIR%%/hamster/hamsterdbus.pyo
%%PYTHON_SITELIBDIR%%/hamster/idle.py
%%PYTHON_SITELIBDIR%%/hamster/idle.pyc
%%PYTHON_SITELIBDIR%%/hamster/idle.pyo
@@ -73,6 +76,7 @@ share/icons/hicolor/32x32/apps/hamster-applet.png
share/icons/hicolor/48x48/apps/hamster-applet.png
share/icons/hicolor/scalable/apps/hamster-applet.svg
share/locale/ar/LC_MESSAGES/hamster-applet.mo
+share/locale/as/LC_MESSAGES/hamster-applet.mo
share/locale/bg/LC_MESSAGES/hamster-applet.mo
share/locale/bn_IN/LC_MESSAGES/hamster-applet.mo
share/locale/ca/LC_MESSAGES/hamster-applet.mo
@@ -95,6 +99,7 @@ share/locale/it/LC_MESSAGES/hamster-applet.mo
share/locale/ja/LC_MESSAGES/hamster-applet.mo
share/locale/kn/LC_MESSAGES/hamster-applet.mo
share/locale/ko/LC_MESSAGES/hamster-applet.mo
+share/locale/ku/LC_MESSAGES/hamster-applet.mo
share/locale/lt/LC_MESSAGES/hamster-applet.mo
share/locale/lv/LC_MESSAGES/hamster-applet.mo
share/locale/mk/LC_MESSAGES/hamster-applet.mo
@@ -102,10 +107,12 @@ share/locale/ml/LC_MESSAGES/hamster-applet.mo
share/locale/mr/LC_MESSAGES/hamster-applet.mo
share/locale/nb/LC_MESSAGES/hamster-applet.mo
share/locale/nl/LC_MESSAGES/hamster-applet.mo
+share/locale/or/LC_MESSAGES/hamster-applet.mo
share/locale/pa/LC_MESSAGES/hamster-applet.mo
share/locale/pl/LC_MESSAGES/hamster-applet.mo
share/locale/pt/LC_MESSAGES/hamster-applet.mo
share/locale/pt_BR/LC_MESSAGES/hamster-applet.mo
+share/locale/ro/LC_MESSAGES/hamster-applet.mo
share/locale/ru/LC_MESSAGES/hamster-applet.mo
share/locale/sl/LC_MESSAGES/hamster-applet.mo
share/locale/sq/LC_MESSAGES/hamster-applet.mo
@@ -113,8 +120,10 @@ share/locale/sr/LC_MESSAGES/hamster-applet.mo
share/locale/sr@latin/LC_MESSAGES/hamster-applet.mo
share/locale/sv/LC_MESSAGES/hamster-applet.mo
share/locale/ta/LC_MESSAGES/hamster-applet.mo
+share/locale/te/LC_MESSAGES/hamster-applet.mo
share/locale/th/LC_MESSAGES/hamster-applet.mo
share/locale/tr/LC_MESSAGES/hamster-applet.mo
+share/locale/vi/LC_MESSAGES/hamster-applet.mo
share/locale/zh_CN/LC_MESSAGES/hamster-applet.mo
share/locale/zh_HK/LC_MESSAGES/hamster-applet.mo
share/locale/zh_TW/LC_MESSAGES/hamster-applet.mo
@@ -125,9 +134,17 @@ share/locale/zh_TW/LC_MESSAGES/hamster-applet.mo
@dirrm lib/hamster-applet
@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/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@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/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index e97e44929ecd..196d7a912f77 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -6,6 +6,7 @@
PORTNAME= kdepimlibs
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,7 +18,7 @@ COMMENT= Libraries for KDE-PIM applications
LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \
sasl2:${PORTSDIR}/security/cyrus-sasl2 \
boost_python:${PORTSDIR}/devel/boost-python \
- ical.42:${PORTSDIR}/devel/libical
+ ical.43:${PORTSDIR}/devel/libical
USE_KDE4= kdelibs akonadi kdeprefix kdehier automoc4
KDE4_BUILDENV= yes
diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile
index 364bf090a580..89bb4fc35d44 100644
--- a/deskutils/nautilus-locked-folder/Makefile
+++ b/deskutils/nautilus-locked-folder/Makefile
@@ -3,12 +3,12 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/nautilus-locked-folder/Makefile,v 1.7 2008/03/18 15:20:20 ahze Exp $
+# $MCom: ports/deskutils/nautilus-locked-folder/Makefile,v 1.9 2009/04/07 03:12:16 marcus Exp $
#
PORTNAME= nautilus-locked-folder
PORTVERSION= 1.0.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils security
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= pav
@@ -18,7 +18,7 @@ COMMENT= Nautilus plugin that allows you to encrypt the contents of a folder
USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
-USE_GNOME= nautilus2
+USE_GNOME= nautilus2 eel2
PKGCONFIGS= gtk+-2.0 libglade-2.0 libnautilus-extension libgnomeui-2.0
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags ${PKGCONFIGS}`" \
LDFLASG="-L${LOCALBASE}/lib `pkg-config --libs ${PKGCONFIGS}`" \
diff --git a/deskutils/nautilus-open-terminal/Makefile b/deskutils/nautilus-open-terminal/Makefile
index a45e9b7ea62f..071ec847410a 100644
--- a/deskutils/nautilus-open-terminal/Makefile
+++ b/deskutils/nautilus-open-terminal/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/nautilus-open-terminal/Makefile,v 1.12 2008/02/28 18:19:56 kwm Exp $
+# $MCom: ports/deskutils/nautilus-open-terminal/Makefile,v 1.14 2009/04/07 03:14:59 marcus Exp $
#
PORTNAME= nautilus-open-terminal
@@ -21,7 +21,7 @@ GNU_CONFIGURE= yes
USE_GNOME= nautilus2 gnomeprefix intlhack gnomehack
USE_GETTEXT= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0`" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= nautilus-open-terminal.schemas
diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index 608fa04b05e5..1790da3c2928 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -7,6 +7,7 @@
PORTNAME= orage
PORTVERSION= 4.6.0
+PORTREVISION= 1
CATEGORIES= deskutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
@@ -39,7 +40,7 @@ CONFIGURE_ARGS+=--with-bdb4=no
.endif
.if defined(WITH_ICAL)
-LIB_DEPENDS+= ical.42:${PORTSDIR}/devel/libical
+LIB_DEPENDS+= ical.43:${PORTSDIR}/devel/libical
.endif
post-patch:
diff --git a/devel/Makefile b/devel/Makefile
index 7335d3cda283..d79607187577 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -436,7 +436,6 @@
SUBDIR += glrparser
SUBDIR += glui
SUBDIR += gmake
- SUBDIR += gnome-build
SUBDIR += gnome-common
SUBDIR += gnome-crash
SUBDIR += gnome-vfs
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index d856a03ada12..265987884197 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.32 2008/11/27 02:17:34 marcus Exp $
+# $MCom: ports/devel/anjuta/Makefile,v 1.37 2009/03/31 13:33:41 kwm Exp $
#
PORTNAME= anjuta
-PORTVERSION= 2.24.2
-PORTREVISION= 0
+PORTVERSION= 2.26.0.1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,42 +19,40 @@ BUILD_DEPENDS= autogen:${PORTSDIR}/devel/autogen \
bash:${PORTSDIR}/shells/bash \
neato:${PORTSDIR}/graphics/graphviz
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
- gbf-1.2:${PORTSDIR}/devel/gnome-build \
- gladeui-1.7:${PORTSDIR}/devel/glade3 \
- neon.28:${PORTSDIR}/www/neon28 \
- devhelp-1.0:${PORTSDIR}/devel/devhelp
+ gladeui-1.9:${PORTSDIR}/devel/glade3 \
+ neon.28:${PORTSDIR}/www/neon28
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
autogen:${PORTSDIR}/devel/autogen \
neato:${PORTSDIR}/graphics/graphviz \
libtool:${PORTSDIR}/devel/libtool15 \
${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
-BROKEN= does not compile
-
USE_BZIP2= yes
USE_AUTOTOOLS= autotools:run
USE_GMAKE= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-USE_GNOME= gnomeprefix gnomehack libgnomeui vte gtksourceview2
+USE_GNOME= gnomeprefix gnomehack libgnomeui vte gtksourceview2 libgda4
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_LDCONFIG= yes
GCONF_SCHEMAS= anjuta-build-basic-autotools-plugin.schemas \
- anjuta-cvs-plugin.schemas anjuta-document-manager.schemas \
+ anjuta-cvs-plugin.schemas \
+ anjuta-document-manager.schemas \
+ anjuta-editor-scintilla.schemas \
+ anjuta-editor-sourceview.schemas \
anjuta-language-cpp-java.schemas \
anjuta-message-manager-plugin.schemas \
- anjuta-editor-sourceview.schemas \
- anjuta-symbol-browser-plugin.schemas \
- anjuta-terminal-plugin.schemas anjuta.schemas
+ anjuta-symbol-db.schemas \
+ anjuta-terminal-plugin.schemas \
+ anjuta.schemas
MAN1= anjuta.1 anjuta_launcher.1
OPTIONS= SVN "Build subversion plugin" off \
- SYMBOL "Build experimental symbol-db plugin" off \
- SCINTILLA "Build scintilla plugin" off
+ DEVHELP "Build devhelp plugin" on
.include <bsd.port.pre.mk>
@@ -75,30 +72,15 @@ CONFIGURE_ARGS+=--disable-plugin-subversion
PLIST_SUB+= SVN="@comment "
.endif
-.if defined(WITH_SCINTILLA)
-USE_GNOME+= libgnomeprintui
-CONFIGURE_ARGS+=--enable-plugin-scintilla
-GCONF_SCHEMAS+= anjuta-editor-scintilla.schemas
-PLIST_SUB+= SCINTILLA=""
-.else
-#CONFIGURE_ARGS+=--disable-plugin-scintilla
-PLIST_SUB+= SCINTILLA="@comment "
-.endif
-
-.if defined(WITH_SYMBOL)
-USE_GNOME+= libgda4
-CONFIGURE_ARGS+=--enable-plugin-symbol-db
-GCONF_SCHEMAS+= anjuta-symbol-db.schemas
-PLIST_SUB+= SYMBOL=""
+.if defined(WITH_DEVHELP)
+LIB_DEPENDS+= devhelp-1.0:${PORTSDIR}/devel/devhelp
+PLIST_SUB+= DEVHELP=""
.else
-CONFIGURE_ARGS+=--disable-plugin-symbol-db
-PLIST_SUB+= SYMBOL="@comment "
+CONFIGURE_ARGS+=--disable-plugin-devhelp
+PLIST_SUB+= DEVHELP="@comment "
.endif
post-configure:
- @${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash| ; \
- s|/usr/local|${PREFIX}|' \
- ${WRKSRC}/global-tags/create_global_tags.sh.in
@${REINPLACE_CMD} -e 's|PKG_PATH|PKG_CONFIG_PATH|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|"make|"gmake|g' \
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index aa83de8919c7..a52aeb6d51b4 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/anjuta-2.24.2.tar.bz2) = d1db75bc1c8d4ab4c9d180767e24e39a
-SHA256 (gnome2/anjuta-2.24.2.tar.bz2) = 7b60753b98a12c5ae85b7fee126d280385ac67dd94a855ab50c17de862df6c68
-SIZE (gnome2/anjuta-2.24.2.tar.bz2) = 6713913
+MD5 (gnome2/anjuta-2.26.0.1.tar.bz2) = 84d3aae494f9866ca7d2a906be82a8df
+SHA256 (gnome2/anjuta-2.26.0.1.tar.bz2) = 9e4778cfd9bdf364ebccdedb9305cbe49fb7bc215ef7b12f9f07db4dfb1e1e1f
+SIZE (gnome2/anjuta-2.26.0.1.tar.bz2) = 7703345
diff --git a/devel/anjuta/files/patch-global-tags_create_global_tags.sh b/devel/anjuta/files/patch-global-tags_create_global_tags.sh
deleted file mode 100644
index f542c83ea557..000000000000
--- a/devel/anjuta/files/patch-global-tags_create_global_tags.sh
+++ /dev/null
@@ -1,23 +0,0 @@
---- global-tags/create_global_tags.sh.in.orig Sun Jul 8 03:39:26 2007
-+++ global-tags/create_global_tags.sh.in Sun Jul 8 03:41:12 2007
-@@ -68,9 +68,9 @@ if ( [ ! -z $PKG_CONFIG ] && [ -x $PKG_C
- ## the packages, which we don't like. We only want cflags relevent
- ## to the packages alone.
- ##
-- PKG_DEFAULT_CONFIG_PATH=`echo $PKG_CONFIG | sed -e 's/\/bin\/pkg-config/\/lib\/pkgconfig'/`
-+ PKG_DEFAULT_CONFIG_PATH=`echo $PKG_CONFIG | sed -e 's/\/bin\/pkg-config/\/libdata\/pkgconfig'/`
- PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PKG_DEFAULT_CONFIG_PATH"
-- PKG_DEFAULT_CONFIG_PATH=`echo $PKG_CONFIG | sed -e 's/\/bin\/pkg-config/\/lib64\/pkgconfig'/`
-+ PKG_DEFAULT_CONFIG_PATH=`echo $PKG_CONFIG | sed -e 's/\/bin\/pkg-config/\/lib\/pkgconfig'/`
- PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PKG_DEFAULT_CONFIG_PATH"
-
- PKG_CONFIG_PATH_PROPER=`echo $PKG_CONFIG_PATH | sed -e 's/\:/ /g'`
-@@ -88,7 +88,7 @@ if ( [ ! -z $PKG_CONFIG ] && [ -x $PKG_C
- for pkg_path in $PKG_CONFIG_PATH_PROPER; do
- for pkg_file in `find "$pkg_path" -name '*.pc' 2>/dev/null`; do
- # echo "Scanning package: $pkg_file"
-- PKG_CFLAGS=`grep -e '^\(\w\+=\|\s*Cflags:\)' "$pkg_file"|sed -e 's/Cflags:\s*"\?\(.*\)"\?\s*/echo "\1"/' -e 's/^\(\w\+\)=\("\([^"]*\)"\|\(.*\)\)/\1="\3\4"/'|sh`
-+ PKG_CFLAGS=`grep -E -e '^([a-zA-Z0-9_]+=|[[:space:]]*Cflags:)' "$pkg_file"|sed -E -e 's/Cflags:[[:space:]]*"?(.*)"?[[:space:]]*/echo "\1"/' -e 's/^([a-zA-Z0-9_]+)=("([^"]*)"|(.*))/\1="\3\4"/'|sh`
- # echo $PKG_CFLAGS
- package=`basename "$pkg_file" '.pc'`
- # if [ ! -e $BASEDIR/tags/$package.anjutatags.gz ] ; then
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_Makefile.in b/devel/anjuta/files/patch-plugins_symbol-db_Makefile.in
new file mode 100644
index 000000000000..a7165a47d238
--- /dev/null
+++ b/devel/anjuta/files/patch-plugins_symbol-db_Makefile.in
@@ -0,0 +1,11 @@
+--- plugins/symbol-db/Makefile.in.orig 2009-02-28 20:29:49.000000000 -0500
++++ plugins/symbol-db/Makefile.in 2009-02-28 20:29:57.000000000 -0500
+@@ -369,7 +369,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = images test
++SUBDIRS = images
+ symbol_db_datadir = $(anjuta_data_dir)
+ symbol_db_data_DATA = tables.sql
+
diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist
index 7aef13fece46..9652918a532d 100644
--- a/devel/anjuta/pkg-plist
+++ b/devel/anjuta/pkg-plist
@@ -1,7 +1,9 @@
bin/anjuta
-bin/anjuta_import.sh
bin/anjuta_launcher
+bin/gbf-am-parse
+bin/gbf-mkfile-parse
include/libanjuta-1.0/libanjuta/anjuta-async-command.h
+include/libanjuta-1.0/libanjuta/anjuta-async-notify.h
include/libanjuta-1.0/libanjuta/anjuta-command.h
include/libanjuta-1.0/libanjuta/anjuta-convert.h
include/libanjuta-1.0/libanjuta/anjuta-debug.h
@@ -27,9 +29,10 @@ include/libanjuta-1.0/libanjuta/anjuta-status.h
include/libanjuta-1.0/libanjuta/anjuta-sync-command.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
include/libanjuta-1.0/libanjuta/anjuta-vcs-status-tree-view.h
include/libanjuta-1.0/libanjuta/anjuta-version.h
-include/libanjuta-1.0/libanjuta/interfaces/ianjuta-bookmark.h
+include/libanjuta-1.0/libanjuta/gbf-project.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-buildable.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-builder.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debug-manager.h
@@ -76,6 +79,7 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-message-view.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-plugin-factory.h
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-stream-loader.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream-savable.h
@@ -96,9 +100,9 @@ lib/anjuta/anjuta-class-gen.plugin
lib/anjuta/anjuta-class-inheritance.plugin
lib/anjuta/anjuta-cvs.plugin
lib/anjuta/anjuta-debug-manager.plugin
-lib/anjuta/anjuta-devhelp.plugin
+%%DEVHELP%%lib/anjuta/anjuta-devhelp.plugin
lib/anjuta/anjuta-document-manager.plugin
-%%SCINTILLA%%lib/anjuta/anjuta-editor.plugin
+lib/anjuta/anjuta-editor.plugin
lib/anjuta/anjuta-file-wizard.plugin
lib/anjuta/anjuta-gdb.plugin
lib/anjuta/anjuta-glade.plugin
@@ -115,12 +119,13 @@ lib/anjuta/anjuta-run-program.plugin
lib/anjuta/anjuta-sample.plugin
lib/anjuta/anjuta-scratchbox.plugin
lib/anjuta/anjuta-search.plugin
+lib/anjuta/anjuta-starter.plugin
%%SVN%%lib/anjuta/anjuta-subversion.plugin
-lib/anjuta/anjuta-symbol-browser.plugin
-lib/anjuta/anjuta-tags
lib/anjuta/anjuta-terminal.plugin
lib/anjuta/anjuta-tools.plugin
lib/anjuta/file-manager.plugin
+lib/anjuta/gbf-am.plugin
+lib/anjuta/gbf-mkfile.plugin
lib/anjuta/git.plugin
lib/anjuta/language-manager.plugin
lib/anjuta/libanjuta-build-basic-autotools.la
@@ -133,12 +138,12 @@ lib/anjuta/libanjuta-cvs-plugin.la
lib/anjuta/libanjuta-cvs-plugin.so
lib/anjuta/libanjuta-debug-manager.la
lib/anjuta/libanjuta-debug-manager.so
-lib/anjuta/libanjuta-devhelp.la
-lib/anjuta/libanjuta-devhelp.so
+%%DEVHELP%%lib/anjuta/libanjuta-devhelp.la
+%%DEVHELP%%lib/anjuta/libanjuta-devhelp.so
lib/anjuta/libanjuta-document-manager.la
lib/anjuta/libanjuta-document-manager.so
-%%SCINTILLA%%lib/anjuta/libanjuta-editor.la
-%%SCINTILLA%%lib/anjuta/libanjuta-editor.so
+lib/anjuta/libanjuta-editor.la
+lib/anjuta/libanjuta-editor.so
lib/anjuta/libanjuta-file-wizard.la
lib/anjuta/libanjuta-file-wizard.so
lib/anjuta/libanjuta-gdb.la
@@ -177,12 +182,12 @@ lib/anjuta/libanjuta-search.la
lib/anjuta/libanjuta-search.so
lib/anjuta/libanjuta-sourceview.la
lib/anjuta/libanjuta-sourceview.so
+lib/anjuta/libanjuta-starter.la
+lib/anjuta/libanjuta-starter.so
%%SVN%%lib/anjuta/libanjuta-subversion.la
%%SVN%%lib/anjuta/libanjuta-subversion.so
-lib/anjuta/libanjuta-symbol-browser.la
-lib/anjuta/libanjuta-symbol-browser.so
-%%SYMBOL%%lib/anjuta/libanjuta-symbol-db.la
-%%SYMBOL%%lib/anjuta/libanjuta-symbol-db.so
+lib/anjuta/libanjuta-symbol-db.la
+lib/anjuta/libanjuta-symbol-db.so
lib/anjuta/libanjuta-terminal.la
lib/anjuta/libanjuta-terminal.so
lib/anjuta/libanjuta-tools.la
@@ -190,21 +195,25 @@ lib/anjuta/libanjuta-tools.so
lib/anjuta/libfile-manager.la
lib/anjuta/libfile-manager.so
lib/anjuta/libfile-manager.so.0
+lib/anjuta/libgbf-am.la
+lib/anjuta/libgbf-am.so
+lib/anjuta/libgbf-mkfile.la
+lib/anjuta/libgbf-mkfile.so
lib/anjuta/liblanguage-manager.la
lib/anjuta/liblanguage-manager.so
lib/anjuta/profiler.plugin
lib/anjuta/sourceview.plugin
-%%SYMBOL%%lib/anjuta/symbol-db.plugin
+lib/anjuta/symbol-db.plugin
lib/glade3/modules/libgladeanjuta.la
lib/glade3/modules/libgladeanjuta.so
-lib/libanjuta-ctags.la
-lib/libanjuta-ctags.so
-lib/libanjuta-ctags.so.0
lib/libanjuta.la
lib/libanjuta.so
lib/libanjuta.so.0
libdata/pkgconfig/libanjuta-1.0.pc
share/anjuta/AUTHORS
+share/anjuta/GBF/AmFiles.pm
+share/anjuta/GBF/General.pm
+share/anjuta/GBF/Make.pm
share/anjuta/anjuta_project.template
share/anjuta/build/automake-c.filters
share/anjuta/class-templates/cc-header.tpl
@@ -217,27 +226,30 @@ share/anjuta/glade/anjuta-class-gen-plugin.glade
share/anjuta/glade/anjuta-cvs-plugin.glade
share/anjuta/glade/anjuta-debug-manager.glade
share/anjuta/glade/anjuta-document-manager.glade
-%%SCINTILLA%%share/anjuta/glade/anjuta-editor-scintilla.glade
+share/anjuta/glade/anjuta-editor-scintilla.glade
share/anjuta/glade/anjuta-editor-sourceview.glade
share/anjuta/glade/anjuta-file-wizard.glade
share/anjuta/glade/anjuta-gdb.glade
share/anjuta/glade/anjuta-git.glade
+share/anjuta/glade/anjuta-glade.glade
share/anjuta/glade/anjuta-language-cpp-java.glade
share/anjuta/glade/anjuta-macro.glade
share/anjuta/glade/anjuta-message-manager-plugin.glade
-share/anjuta/glade/anjuta-project-wizard.glade
+share/anjuta/glade/anjuta-project-wizard.ui
share/anjuta/glade/anjuta-run-program.glade
share/anjuta/glade/anjuta-scratchbox.glade
+share/anjuta/glade/anjuta-scratchbox-panel.png
share/anjuta/glade/anjuta-search.glade
%%SVN%%share/anjuta/glade/anjuta-subversion.glade
-share/anjuta/glade/anjuta-symbol-browser-plugin.glade
-%%SYMBOL%%share/anjuta/glade/anjuta-symbol-db.glade
+share/anjuta/glade/anjuta-symbol-db.glade
share/anjuta/glade/anjuta-terminal-plugin.glade
share/anjuta/glade/anjuta-tools.glade
share/anjuta/glade/anjuta.glade
share/anjuta/glade/applogo.png
share/anjuta/glade/appwizard.png
+share/anjuta/glade/create_dialogs.glade
share/anjuta/glade/file-manager.glade
+share/anjuta/glade/gbf-am-dialogs.glade
share/anjuta/glade/patch-plugin.glade
share/anjuta/glade/profiler-call-graph.glade
share/anjuta/glade/profiler-flat-profile.glade
@@ -248,6 +260,7 @@ share/anjuta/glade/start-with-open.png
share/anjuta/glade/start-with-wizard.png
share/anjuta/gtodo/gtodo.css
share/anjuta/gtodo/gtodo.xsl
+share/anjuta/gtodo/gtodo-plain.xsl
share/anjuta/languages.xml
share/anjuta/layout.xml
share/anjuta/macros.xml
@@ -282,14 +295,16 @@ share/anjuta/project/gcj-logo.png
share/anjuta/project/gcj.wiz
share/anjuta/project/gcj/configure.ac.tpl
share/anjuta/project/gcj/src/Makefile.am.tpl
+share/anjuta/project/gnome-applet.wiz
+share/anjuta/project/gnome-applet/HACKING
+share/anjuta/project/gnome-applet/Makefile.am.tpl
+share/anjuta/project/gnome-applet/autogen.sh
+share/anjuta/project/gnome-applet/configure.ac.tpl
+share/anjuta/project/gnome-applet/src/GNOME_Applet.server.in.in
+share/anjuta/project/gnome-applet/src/Makefile.am.tpl
+share/anjuta/project/gnome-applet/src/main.c
share/anjuta/project/gnome-logo.png
-share/anjuta/project/gnome.wiz
share/anjuta/project/gnome/po/POTFILES.in
-share/anjuta/project/gnome/src/Makefile.am.tpl
-share/anjuta/project/gnome/src/callbacks.c
-share/anjuta/project/gnome/src/callbacks.h
-share/anjuta/project/gnome/src/main.c
-share/anjuta/project/gnome/src/project.glade
share/anjuta/project/gtk-logo.png
share/anjuta/project/gtk.wiz
share/anjuta/project/gtk/po/POTFILES.in
@@ -315,6 +330,7 @@ share/anjuta/project/licenses/BSD
share/anjuta/project/licenses/GPL
share/anjuta/project/licenses/LGPL
share/anjuta/project/licenses/None
+share/anjuta/project/m4/as-ac-expand.m4
share/anjuta/project/minimal.wiz
share/anjuta/project/minimal/Makefile.am.tpl
share/anjuta/project/minimal/autogen.sh
@@ -377,56 +393,10 @@ 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
-%%SCINTILLA%%share/anjuta/properties/Embedded.properties
-%%SCINTILLA%%share/anjuta/properties/SciTEGlobal.properties
-%%SCINTILLA%%share/anjuta/properties/ada.properties
-%%SCINTILLA%%share/anjuta/properties/anjuta.properties
-%%SCINTILLA%%share/anjuta/properties/asm.properties
-%%SCINTILLA%%share/anjuta/properties/asn1.properties
-%%SCINTILLA%%share/anjuta/properties/au3.properties
-%%SCINTILLA%%share/anjuta/properties/ave.properties
-%%SCINTILLA%%share/anjuta/properties/baan.properties
-%%SCINTILLA%%share/anjuta/properties/bullant.properties
-%%SCINTILLA%%share/anjuta/properties/conf.properties
-%%SCINTILLA%%share/anjuta/properties/cpp.properties
-%%SCINTILLA%%share/anjuta/properties/css.properties
-%%SCINTILLA%%share/anjuta/properties/eiffel.properties
-%%SCINTILLA%%share/anjuta/properties/erlang.properties
-%%SCINTILLA%%share/anjuta/properties/escript.properties
-%%SCINTILLA%%share/anjuta/properties/forth.properties
-%%SCINTILLA%%share/anjuta/properties/fortran.properties
-%%SCINTILLA%%share/anjuta/properties/html.properties
-%%SCINTILLA%%share/anjuta/properties/kix.properties
-%%SCINTILLA%%share/anjuta/properties/latex.properties
-%%SCINTILLA%%share/anjuta/properties/lisp.properties
-%%SCINTILLA%%share/anjuta/properties/lot.properties
-%%SCINTILLA%%share/anjuta/properties/lout.properties
-%%SCINTILLA%%share/anjuta/properties/lua.properties
-%%SCINTILLA%%share/anjuta/properties/matlab.properties
-%%SCINTILLA%%share/anjuta/properties/metapost.properties
-%%SCINTILLA%%share/anjuta/properties/mmixal.properties
-%%SCINTILLA%%share/anjuta/properties/nncrontab.properties
-%%SCINTILLA%%share/anjuta/properties/nsis.properties
-%%SCINTILLA%%share/anjuta/properties/others.properties
-%%SCINTILLA%%share/anjuta/properties/pascal.properties
-%%SCINTILLA%%share/anjuta/properties/perl.properties
-%%SCINTILLA%%share/anjuta/properties/pov.properties
-%%SCINTILLA%%share/anjuta/properties/ps.properties
-%%SCINTILLA%%share/anjuta/properties/python.properties
-%%SCINTILLA%%share/anjuta/properties/ruby.properties
-%%SCINTILLA%%share/anjuta/properties/scriptol.properties
-%%SCINTILLA%%share/anjuta/properties/specman.properties
-%%SCINTILLA%%share/anjuta/properties/sql.properties
-%%SCINTILLA%%share/anjuta/properties/styles.properties
-%%SCINTILLA%%share/anjuta/properties/tcl.properties
-%%SCINTILLA%%share/anjuta/properties/tex.properties
-%%SCINTILLA%%share/anjuta/properties/user.properties
-%%SCINTILLA%%share/anjuta/properties/vb.properties
-%%SCINTILLA%%share/anjuta/properties/verilog.properties
-%%SCINTILLA%%share/anjuta/properties/vhdl.properties
-%%SCINTILLA%%share/anjuta/properties/yaml.properties
-share/anjuta/scripts/create_global_tags.sh
-%%SYMBOL%%share/anjuta/tables.sql
+share/anjuta/properties/anjuta.properties
+share/anjuta/properties/styles.properties
+share/anjuta/properties/user.properties
+share/anjuta/tables.sql
share/anjuta/tools/find-fixmes.pl
share/anjuta/tools/prepare-changelog.pl
share/anjuta/tools/tools-2.xml
@@ -434,8 +404,8 @@ share/anjuta/tools/translation-status.pl
share/anjuta/ui/anjuta-build-basic-autotools-plugin.ui
share/anjuta/ui/anjuta-cvs.ui
share/anjuta/ui/anjuta-debug-manager.ui
-share/anjuta/ui/anjuta-devhelp-simple.ui
-share/anjuta/ui/anjuta-devhelp.ui
+%%DEVHELP%%share/anjuta/ui/anjuta-devhelp-simple.ui
+%%DEVHELP%%share/anjuta/ui/anjuta-devhelp.ui
share/anjuta/ui/anjuta-document-manager.ui
share/anjuta/ui/anjuta-git.ui
share/anjuta/ui/anjuta-glade.ui
@@ -450,7 +420,7 @@ share/anjuta/ui/anjuta-run-program.ui
share/anjuta/ui/anjuta-sample.ui
share/anjuta/ui/anjuta-search.ui
%%SVN%%share/anjuta/ui/anjuta-subversion.ui
-share/anjuta/ui/anjuta-symbol-browser-plugin.ui
+share/anjuta/ui/anjuta-symbol-db-plugin.ui
share/anjuta/ui/anjuta-terminal-plugin.ui
share/anjuta/ui/anjuta-tools.ui
share/anjuta/ui/anjuta.ui
@@ -490,6 +460,7 @@ share/doc/libanjuta/action-block.html
share/doc/libanjuta/anjuta-architecture.html
share/doc/libanjuta/anjuta-architecture.png
share/doc/libanjuta/content-block.html
+share/doc/libanjuta/debugger-states.png
share/doc/libanjuta/header-block.html
share/doc/libanjuta/home.png
share/doc/libanjuta/index.html
@@ -585,6 +556,19 @@ share/doc/libanjuta/writing-plugins-simple.html
share/doc/libanjuta/writing-plugins-sources.html
share/doc/libanjuta/writing-plugins.html
share/glade3/catalogs/anjuta-glade.xml
+share/gnome/help/anjuta-build-tutorial/C/anjuta-build-tutorial.xml
+share/gnome/help/anjuta-build-tutorial/C/figures/autotools-process.png
+share/gnome/help/anjuta-build-tutorial/C/figures/build_preferences.png
+share/gnome/help/anjuta-build-tutorial/C/figures/compilation-stages.png
+share/gnome/help/anjuta-build-tutorial/C/figures/configure-dialog.png
+share/gnome/help/anjuta-build-tutorial/C/figures/configure-process.png
+share/gnome/help/anjuta-build-tutorial/C/figures/library-add-pkgconfig.png
+share/gnome/help/anjuta-build-tutorial/C/figures/library-add-properties.png
+share/gnome/help/anjuta-build-tutorial/C/figures/new-project-basic.png
+share/gnome/help/anjuta-build-tutorial/C/figures/new-project-message.png
+share/gnome/help/anjuta-build-tutorial/C/figures/new-project-options.png
+share/gnome/help/anjuta-build-tutorial/C/figures/new-project-select.png
+share/gnome/help/anjuta-build-tutorial/C/figures/new-project-summary.png
share/gnome/help/anjuta-faqs/C/anjuta-faqs.xml
share/gnome/help/anjuta-faqs/C/legal.xml
share/gnome/help/anjuta-manual/C/anjuta-manual.xml
@@ -614,7 +598,10 @@ share/gnome/help/anjuta-manual/C/figures/prefs_print.png
share/gnome/help/anjuta-manual/C/figures/print_dlg.png
share/gnome/help/anjuta-manual/C/figures/print_preview.png
share/gnome/help/anjuta-manual/C/figures/project-window.png
+share/gnome/help/anjuta-manual/C/figures/project_group.png
share/gnome/help/anjuta-manual/C/figures/project_info.png
+share/gnome/help/anjuta-manual/C/figures/project_target.png
+share/gnome/help/anjuta-manual/C/figures/project_target_details.png
share/gnome/help/anjuta-manual/C/figures/registers.png
share/gnome/help/anjuta-manual/C/figures/save_as_file.png
share/gnome/help/anjuta-manual/C/figures/search_expr.png
@@ -631,6 +618,7 @@ share/gnome/help/anjuta-manual/C/figures/stack.png
share/gnome/help/anjuta-manual/C/figures/symbol_browser.png
share/gnome/help/anjuta-manual/C/figures/tool-editor.png
share/gnome/help/anjuta-manual/C/fileoperations.xml
+share/gnome/help/anjuta-manual/C/glade.xml
share/gnome/help/anjuta-manual/C/interface.xml
share/gnome/help/anjuta-manual/C/introduction.xml
share/gnome/help/anjuta-manual/C/legal.xml
@@ -639,6 +627,92 @@ share/gnome/help/anjuta-manual/C/preferences.xml
share/gnome/help/anjuta-manual/C/projects.xml
share/gnome/help/anjuta-manual/C/template.xml
share/gnome/help/anjuta-manual/C/tools.xml
+share/gnome/help/anjuta-manual/de/anjuta-manual.xml
+share/gnome/help/anjuta-manual/de/figures/add_edit_macro.png
+share/gnome/help/anjuta-manual/de/figures/anjuta-in-action.png
+share/gnome/help/anjuta-manual/de/figures/attach.png
+share/gnome/help/anjuta-manual/de/figures/brk_add.png
+share/gnome/help/anjuta-manual/de/figures/brk_dlg.png
+share/gnome/help/anjuta-manual/de/figures/configure_dlg.png
+share/gnome/help/anjuta-manual/de/figures/display_macro.png
+share/gnome/help/anjuta-manual/de/figures/editor_guides.png
+share/gnome/help/anjuta-manual/de/figures/editor_margins.png
+share/gnome/help/anjuta-manual/de/figures/editor_markers.png
+share/gnome/help/anjuta-manual/de/figures/file_menu.png
+share/gnome/help/anjuta-manual/de/figures/insert_text.png
+share/gnome/help/anjuta-manual/de/figures/keyword_macro.png
+share/gnome/help/anjuta-manual/de/figures/local_variables.png
+share/gnome/help/anjuta-manual/de/figures/menubar.png
+share/gnome/help/anjuta-manual/de/figures/message_win.png
+share/gnome/help/anjuta-manual/de/figures/new_file_wizard.png
+share/gnome/help/anjuta-manual/de/figures/open_file.png
+share/gnome/help/anjuta-manual/de/figures/open_file_multiple.png
+share/gnome/help/anjuta-manual/de/figures/prefs_print.png
+share/gnome/help/anjuta-manual/de/figures/print_dlg.png
+share/gnome/help/anjuta-manual/de/figures/print_preview.png
+share/gnome/help/anjuta-manual/de/figures/project-window.png
+share/gnome/help/anjuta-manual/de/figures/project_group.png
+share/gnome/help/anjuta-manual/de/figures/project_info.png
+share/gnome/help/anjuta-manual/de/figures/project_target.png
+share/gnome/help/anjuta-manual/de/figures/project_target_details.png
+share/gnome/help/anjuta-manual/de/figures/registers.png
+share/gnome/help/anjuta-manual/de/figures/save_as_file.png
+share/gnome/help/anjuta-manual/de/figures/search_expr.png
+share/gnome/help/anjuta-manual/de/figures/search_expr_basic.png
+share/gnome/help/anjuta-manual/de/figures/search_file_pattern.png
+share/gnome/help/anjuta-manual/de/figures/search_replace.png
+share/gnome/help/anjuta-manual/de/figures/search_setting.png
+share/gnome/help/anjuta-manual/de/figures/search_target.png
+share/gnome/help/anjuta-manual/de/figures/search_target_action.png
+share/gnome/help/anjuta-manual/de/figures/search_target_in.png
+share/gnome/help/anjuta-manual/de/figures/sharedlibs.png
+share/gnome/help/anjuta-manual/de/figures/signals.png
+share/gnome/help/anjuta-manual/de/figures/stack.png
+share/gnome/help/anjuta-manual/de/figures/symbol_browser.png
+share/gnome/help/anjuta-manual/de/figures/tool-editor.png
+share/gnome/help/anjuta-manual/el/anjuta-manual.xml
+share/gnome/help/anjuta-manual/el/figures/add_edit_macro.png
+share/gnome/help/anjuta-manual/el/figures/anjuta-in-action.png
+share/gnome/help/anjuta-manual/el/figures/attach.png
+share/gnome/help/anjuta-manual/el/figures/brk_add.png
+share/gnome/help/anjuta-manual/el/figures/brk_dlg.png
+share/gnome/help/anjuta-manual/el/figures/configure_dlg.png
+share/gnome/help/anjuta-manual/el/figures/display_macro.png
+share/gnome/help/anjuta-manual/el/figures/editor_guides.png
+share/gnome/help/anjuta-manual/el/figures/editor_margins.png
+share/gnome/help/anjuta-manual/el/figures/editor_markers.png
+share/gnome/help/anjuta-manual/el/figures/file_menu.png
+share/gnome/help/anjuta-manual/el/figures/insert_text.png
+share/gnome/help/anjuta-manual/el/figures/keyword_macro.png
+share/gnome/help/anjuta-manual/el/figures/local_variables.png
+share/gnome/help/anjuta-manual/el/figures/menubar.png
+share/gnome/help/anjuta-manual/el/figures/message_win.png
+share/gnome/help/anjuta-manual/el/figures/new_file_wizard.png
+share/gnome/help/anjuta-manual/el/figures/open_file.png
+share/gnome/help/anjuta-manual/el/figures/open_file_multiple.png
+share/gnome/help/anjuta-manual/el/figures/prefs_print.png
+share/gnome/help/anjuta-manual/el/figures/print_dlg.png
+share/gnome/help/anjuta-manual/el/figures/print_preview.png
+share/gnome/help/anjuta-manual/el/figures/project-window.png
+share/gnome/help/anjuta-manual/el/figures/project_group.png
+share/gnome/help/anjuta-manual/el/figures/project_info.png
+share/gnome/help/anjuta-manual/el/figures/project_target.png
+share/gnome/help/anjuta-manual/el/figures/project_target_details.png
+share/gnome/help/anjuta-manual/el/figures/registers.png
+share/gnome/help/anjuta-manual/el/figures/save_as_file.png
+share/gnome/help/anjuta-manual/el/figures/search_expr.png
+share/gnome/help/anjuta-manual/el/figures/search_expr_basic.png
+share/gnome/help/anjuta-manual/el/figures/search_file_pattern.png
+share/gnome/help/anjuta-manual/el/figures/search_replace.png
+share/gnome/help/anjuta-manual/el/figures/search_setting.png
+share/gnome/help/anjuta-manual/el/figures/search_target.png
+share/gnome/help/anjuta-manual/el/figures/search_target_action.png
+share/gnome/help/anjuta-manual/el/figures/search_target_in.png
+share/gnome/help/anjuta-manual/el/figures/sharedlibs.png
+share/gnome/help/anjuta-manual/el/figures/signals.png
+share/gnome/help/anjuta-manual/el/figures/stack.png
+share/gnome/help/anjuta-manual/el/figures/symbol_browser.png
+share/gnome/help/anjuta-manual/el/figures/tool-editor.png
share/gnome/help/anjuta-manual/es/anjuta-manual.xml
share/gnome/help/anjuta-manual/es/figures/add_edit_macro.png
share/gnome/help/anjuta-manual/es/figures/anjuta-in-action.png
@@ -663,7 +737,10 @@ share/gnome/help/anjuta-manual/es/figures/prefs_print.png
share/gnome/help/anjuta-manual/es/figures/print_dlg.png
share/gnome/help/anjuta-manual/es/figures/print_preview.png
share/gnome/help/anjuta-manual/es/figures/project-window.png
+share/gnome/help/anjuta-manual/es/figures/project_group.png
share/gnome/help/anjuta-manual/es/figures/project_info.png
+share/gnome/help/anjuta-manual/es/figures/project_target.png
+share/gnome/help/anjuta-manual/es/figures/project_target_details.png
share/gnome/help/anjuta-manual/es/figures/registers.png
share/gnome/help/anjuta-manual/es/figures/save_as_file.png
share/gnome/help/anjuta-manual/es/figures/search_expr.png
@@ -679,6 +756,49 @@ share/gnome/help/anjuta-manual/es/figures/signals.png
share/gnome/help/anjuta-manual/es/figures/stack.png
share/gnome/help/anjuta-manual/es/figures/symbol_browser.png
share/gnome/help/anjuta-manual/es/figures/tool-editor.png
+share/gnome/help/anjuta-manual/eu/anjuta-manual.xml
+share/gnome/help/anjuta-manual/eu/figures/add_edit_macro.png
+share/gnome/help/anjuta-manual/eu/figures/anjuta-in-action.png
+share/gnome/help/anjuta-manual/eu/figures/attach.png
+share/gnome/help/anjuta-manual/eu/figures/brk_add.png
+share/gnome/help/anjuta-manual/eu/figures/brk_dlg.png
+share/gnome/help/anjuta-manual/eu/figures/configure_dlg.png
+share/gnome/help/anjuta-manual/eu/figures/display_macro.png
+share/gnome/help/anjuta-manual/eu/figures/editor_guides.png
+share/gnome/help/anjuta-manual/eu/figures/editor_margins.png
+share/gnome/help/anjuta-manual/eu/figures/editor_markers.png
+share/gnome/help/anjuta-manual/eu/figures/file_menu.png
+share/gnome/help/anjuta-manual/eu/figures/insert_text.png
+share/gnome/help/anjuta-manual/eu/figures/keyword_macro.png
+share/gnome/help/anjuta-manual/eu/figures/local_variables.png
+share/gnome/help/anjuta-manual/eu/figures/menubar.png
+share/gnome/help/anjuta-manual/eu/figures/message_win.png
+share/gnome/help/anjuta-manual/eu/figures/new_file_wizard.png
+share/gnome/help/anjuta-manual/eu/figures/open_file.png
+share/gnome/help/anjuta-manual/eu/figures/open_file_multiple.png
+share/gnome/help/anjuta-manual/eu/figures/prefs_print.png
+share/gnome/help/anjuta-manual/eu/figures/print_dlg.png
+share/gnome/help/anjuta-manual/eu/figures/print_preview.png
+share/gnome/help/anjuta-manual/eu/figures/project-window.png
+share/gnome/help/anjuta-manual/eu/figures/project_info.png
+share/gnome/help/anjuta-manual/eu/figures/project_group.png
+share/gnome/help/anjuta-manual/eu/figures/project_target.png
+share/gnome/help/anjuta-manual/eu/figures/project_target_details.png
+share/gnome/help/anjuta-manual/eu/figures/registers.png
+share/gnome/help/anjuta-manual/eu/figures/save_as_file.png
+share/gnome/help/anjuta-manual/eu/figures/search_expr.png
+share/gnome/help/anjuta-manual/eu/figures/search_expr_basic.png
+share/gnome/help/anjuta-manual/eu/figures/search_file_pattern.png
+share/gnome/help/anjuta-manual/eu/figures/search_replace.png
+share/gnome/help/anjuta-manual/eu/figures/search_setting.png
+share/gnome/help/anjuta-manual/eu/figures/search_target.png
+share/gnome/help/anjuta-manual/eu/figures/search_target_action.png
+share/gnome/help/anjuta-manual/eu/figures/search_target_in.png
+share/gnome/help/anjuta-manual/eu/figures/sharedlibs.png
+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/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
@@ -704,6 +824,9 @@ share/gnome/help/anjuta-manual/oc/figures/print_dlg.png
share/gnome/help/anjuta-manual/oc/figures/print_preview.png
share/gnome/help/anjuta-manual/oc/figures/project-window.png
share/gnome/help/anjuta-manual/oc/figures/project_info.png
+share/gnome/help/anjuta-manual/oc/figures/project_group.png
+share/gnome/help/anjuta-manual/oc/figures/project_target.png
+share/gnome/help/anjuta-manual/oc/figures/project_target_details.png
share/gnome/help/anjuta-manual/oc/figures/registers.png
share/gnome/help/anjuta-manual/oc/figures/save_as_file.png
share/gnome/help/anjuta-manual/oc/figures/search_expr.png
@@ -744,6 +867,9 @@ share/gnome/help/anjuta-manual/sv/figures/print_dlg.png
share/gnome/help/anjuta-manual/sv/figures/print_preview.png
share/gnome/help/anjuta-manual/sv/figures/project-window.png
share/gnome/help/anjuta-manual/sv/figures/project_info.png
+share/gnome/help/anjuta-manual/sv/figures/project_group.png
+share/gnome/help/anjuta-manual/sv/figures/project_target.png
+share/gnome/help/anjuta-manual/sv/figures/project_target_details.png
share/gnome/help/anjuta-manual/sv/figures/registers.png
share/gnome/help/anjuta-manual/sv/figures/save_as_file.png
share/gnome/help/anjuta-manual/sv/figures/search_expr.png
@@ -777,6 +903,7 @@ 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/es/LC_MESSAGES/anjuta.mo
+share/locale/eu/LC_MESSAGES/anjuta.mo
share/locale/fi/LC_MESSAGES/anjuta.mo
share/locale/fr/LC_MESSAGES/anjuta.mo
share/locale/ga/LC_MESSAGES/anjuta.mo
@@ -792,6 +919,7 @@ share/locale/ja/LC_MESSAGES/anjuta.mo
share/locale/kn/LC_MESSAGES/anjuta.mo
share/locale/ko/LC_MESSAGES/anjuta.mo
share/locale/lt/LC_MESSAGES/anjuta.mo
+share/locale/lv/LC_MESSAGES/anjuta.mo
share/locale/mk/LC_MESSAGES/anjuta.mo
share/locale/ml/LC_MESSAGES/anjuta.mo
share/locale/mr/LC_MESSAGES/anjuta.mo
@@ -800,6 +928,7 @@ share/locale/nb/LC_MESSAGES/anjuta.mo
share/locale/ne/LC_MESSAGES/anjuta.mo
share/locale/nl/LC_MESSAGES/anjuta.mo
share/locale/oc/LC_MESSAGES/anjuta.mo
+share/locale/or/LC_MESSAGES/anjuta.mo
share/locale/pa/LC_MESSAGES/anjuta.mo
share/locale/pl/LC_MESSAGES/anjuta.mo
share/locale/pt/LC_MESSAGES/anjuta.mo
@@ -813,6 +942,7 @@ share/locale/sq/LC_MESSAGES/anjuta.mo
share/locale/sr/LC_MESSAGES/anjuta.mo
share/locale/sr@latin/LC_MESSAGES/anjuta.mo
share/locale/sv/LC_MESSAGES/anjuta.mo
+share/locale/te/LC_MESSAGES/anjuta.mo
share/locale/th/LC_MESSAGES/anjuta.mo
share/locale/tr/LC_MESSAGES/anjuta.mo
share/locale/uk/LC_MESSAGES/anjuta.mo
@@ -823,7 +953,10 @@ share/locale/zh_TW/LC_MESSAGES/anjuta.mo
share/mime/application/x-anjuta.xml
share/mime/packages/anjuta.xml
share/omf/anjuta-manual/anjuta-manual-C.omf
+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-oc.omf
share/omf/anjuta-manual/anjuta-manual-sv.omf
share/pixmaps/anjuta/anjuta-attach-16.png
@@ -853,6 +986,8 @@ share/pixmaps/anjuta/anjuta-breakpoint-disabled-16.png
share/pixmaps/anjuta/anjuta-breakpoint-enabled-16.png
share/pixmaps/anjuta/anjuta-breakpoint-toggle-16.png
share/pixmaps/anjuta/anjuta-breakpoint-toggle-24.png
+share/pixmaps/anjuta/anjuta-build-16.png
+share/pixmaps/anjuta/anjuta-build-24.png
share/pixmaps/anjuta/anjuta-build-basic-autotools-plugin-48.png
share/pixmaps/anjuta/anjuta-build-basic-autotools-plugin.svg
share/pixmaps/anjuta/anjuta-class-inheritance-plugin-48.png
@@ -865,20 +1000,22 @@ share/pixmaps/anjuta/anjuta-cvs-plugin-48.png
share/pixmaps/anjuta/anjuta-cvs-plugin.svg
share/pixmaps/anjuta/anjuta-debug-manager-plugin-48.png
share/pixmaps/anjuta/anjuta-debug-manager-plugin.svg
-share/pixmaps/anjuta/anjuta-devhelp-plugin-48.png
-share/pixmaps/anjuta/anjuta-devhelp-plugin.svg
+%%DEVHELP%%share/pixmaps/anjuta/anjuta-devhelp-plugin-48.png
+%%DEVHELP%%share/pixmaps/anjuta/anjuta-devhelp-plugin.svg
share/pixmaps/anjuta/anjuta-document-manager-plugin-48.png
share/pixmaps/anjuta/anjuta-document-manager-plugin.svg
-%%SCINTILLA%%share/pixmaps/anjuta/anjuta-editor-scintilla-plugin-48.png
-%%SCINTILLA%%share/pixmaps/anjuta/anjuta-editor-scintilla-plugin.svg
+share/pixmaps/anjuta/anjuta-editor-scintilla-plugin-48.png
+share/pixmaps/anjuta/anjuta-editor-scintilla-plugin.svg
share/pixmaps/anjuta/element-class-16.png
share/pixmaps/anjuta/element-delegate-16.png
share/pixmaps/anjuta/element-enumeration-16.png
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-literal-16.png
share/pixmaps/anjuta/element-method-16.png
+share/pixmaps/anjuta/element-method-24.png
share/pixmaps/anjuta/element-namespace-16.png
share/pixmaps/anjuta/element-property-16.png
share/pixmaps/anjuta/element-structure-16.png
@@ -896,20 +1033,12 @@ share/pixmaps/anjuta/anjuta-gdb.plugin.png
share/pixmaps/anjuta/anjuta-git-plugin-48.png
share/pixmaps/anjuta/anjuta-glade-plugin-48.png
share/pixmaps/anjuta/anjuta-glade-plugin.svg
-share/pixmaps/anjuta/anjuta-go-help-next-16.png
-share/pixmaps/anjuta/anjuta-go-help-next-24.png
-share/pixmaps/anjuta/anjuta-go-help-prev-16.png
-share/pixmaps/anjuta/anjuta-go-help-prev-24.png
share/pixmaps/anjuta/anjuta-go-history-next-16.png
share/pixmaps/anjuta/anjuta-go-history-next-24.png
share/pixmaps/anjuta/anjuta-go-history-prev-16.png
share/pixmaps/anjuta/anjuta-go-history-prev-24.png
share/pixmaps/anjuta/anjuta-go-line-16.png
share/pixmaps/anjuta/anjuta-go-line-24.png
-share/pixmaps/anjuta/anjuta-go-match-next-16.png
-share/pixmaps/anjuta/anjuta-go-match-next-24.png
-share/pixmaps/anjuta/anjuta-go-match-prev-16.png
-share/pixmaps/anjuta/anjuta-go-match-prev-24.png
share/pixmaps/anjuta/anjuta-go-message-next-16.png
share/pixmaps/anjuta/anjuta-go-message-next-24.png
share/pixmaps/anjuta/anjuta-go-message-prev-16.png
@@ -962,9 +1091,7 @@ share/pixmaps/anjuta/anjuta-step-over-24.png
%%SVN%%share/pixmaps/anjuta/anjuta-subversion-plugin.svg
share/pixmaps/anjuta/anjuta-swap-16.png
share/pixmaps/anjuta/anjuta-swap-24.png
-share/pixmaps/anjuta/anjuta-symbol-browser-plugin-48.png
-share/pixmaps/anjuta/anjuta-symbol-browser-plugin.svg
-%%SYMBOL%%share/pixmaps/anjuta/anjuta-symbol-db-plugin-48.png
+share/pixmaps/anjuta/anjuta-symbol-db-plugin-48.png
share/pixmaps/anjuta/anjuta-terminal-plugin-48.png
share/pixmaps/anjuta/anjuta-terminal-plugin.svg
share/pixmaps/anjuta/anjuta-tools-plugin-48.png
@@ -980,9 +1107,12 @@ share/pixmaps/anjuta/breakpoint.png
share/pixmaps/anjuta/class_logo.xpm
share/pixmaps/anjuta/directory-accept.png
share/pixmaps/anjuta/directory.png
+share/pixmaps/anjuta/gbf-am-plugin-48.png
+share/pixmaps/anjuta/gbf-build.png
+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/gtodo_tray.png
share/pixmaps/anjuta/locals.png
share/pixmaps/anjuta/madeinanjuta.xcf
share/pixmaps/anjuta/password.png
@@ -990,24 +1120,40 @@ share/pixmaps/anjuta/pointer.png
share/pixmaps/anjuta/preferences-editor.png
share/pixmaps/anjuta/stack.png
share/pixmaps/anjuta/start-with-import.png
+share/pixmaps/anjuta/starter_logo.png
+share/pixmaps/anjuta/vcs-added.png
+share/pixmaps/anjuta/vcs-conflict.png
+share/pixmaps/anjuta/vcs-deleted.png
+share/pixmaps/anjuta/vcs-ignored.png
+share/pixmaps/anjuta/vcs-modified.png
+share/pixmaps/anjuta/vcs-unversioned.png
+share/pixmaps/anjuta/vcs-updated.png
@dirrm share/pixmaps/anjuta
@dirrm share/omf/anjuta-manual
@dirrm share/gnome/help/anjuta-manual/sv/figures
@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/eu/figures
+@dirrm share/gnome/help/anjuta-manual/eu
@dirrm share/gnome/help/anjuta-manual/es/figures
@dirrm share/gnome/help/anjuta-manual/es
+@dirrm share/gnome/help/anjuta-manual/el/figures
+@dirrm share/gnome/help/anjuta-manual/el
+@dirrm share/gnome/help/anjuta-manual/de/figures
+@dirrm share/gnome/help/anjuta-manual/de
@dirrm share/gnome/help/anjuta-manual/C/figures
@dirrm share/gnome/help/anjuta-manual/C
@dirrm share/gnome/help/anjuta-manual
@dirrm share/gnome/help/anjuta-faqs/C
@dirrm share/gnome/help/anjuta-faqs
+@dirrm share/gnome/help/anjuta-build-tutorial/C/figures
+@dirrm share/gnome/help/anjuta-build-tutorial/C
+@dirrm share/gnome/help/anjuta-build-tutorial
@dirrmtry share/icons/gnome/48x48/mimetypes
@dirrm share/anjuta/ui
@dirrm share/anjuta/tools
-@dirrm share/anjuta/scripts
-%%SCINTILLA%%@dirrm share/anjuta/properties
+@dirrm share/anjuta/properties
@dirrm share/anjuta/project/xlib/src
@dirrm share/anjuta/project/xlib/po
@dirrm share/anjuta/project/xlib-dock/src
@@ -1030,6 +1176,7 @@ share/pixmaps/anjuta/start-with-import.png
@dirrm share/anjuta/project/mkfile/po
@dirrm share/anjuta/project/mkfile
@dirrm share/anjuta/project/minimal
+@dirrm share/anjuta/project/m4
@dirrm share/anjuta/project/licenses
@dirrm share/anjuta/project/java/src
@dirrm share/anjuta/project/java/po
@@ -1040,7 +1187,8 @@ share/pixmaps/anjuta/start-with-import.png
@dirrm share/anjuta/project/gtk/src
@dirrm share/anjuta/project/gtk/po
@dirrm share/anjuta/project/gtk
-@dirrm share/anjuta/project/gnome/src
+@dirrm share/anjuta/project/gnome-applet/src
+@dirrm share/anjuta/project/gnome-applet
@dirrm share/anjuta/project/gnome/po
@dirrm share/anjuta/project/gnome
@dirrm share/anjuta/project/gcj/src
@@ -1060,6 +1208,7 @@ share/pixmaps/anjuta/start-with-import.png
@dirrm share/anjuta/glade
@dirrm share/anjuta/class-templates
@dirrm share/anjuta/build
+@dirrm share/anjuta/GBF
@dirrm share/anjuta
@dirrm share/doc/libanjuta
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@@ -1072,6 +1221,8 @@ share/pixmaps/anjuta/start-with-import.png
@dirrmtry share/applications
@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
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 5362c457bcf7..c38fb093c727 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/bug-buddy/Makefile,v 1.71 2008/11/25 17:43:11 mezz Exp $
+# $MCom: ports/devel/bug-buddy/Makefile,v 1.74 2009/03/18 00:35:01 kwm Exp $
#
PORTNAME= bug-buddy
-PORTVERSION= 2.24.2
+PORTVERSION= 2.26.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index b4d410c17103..a00a22b53d8d 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/bug-buddy-2.24.2.tar.bz2) = faeeb2351398b9284eee794ff6ea9588
-SHA256 (gnome2/bug-buddy-2.24.2.tar.bz2) = d64125505546183d44727e812b0ac7e9c60f0fff0eaf164b874974647067cbb4
-SIZE (gnome2/bug-buddy-2.24.2.tar.bz2) = 1109562
+MD5 (gnome2/bug-buddy-2.26.0.tar.bz2) = f92663a1a819f83e3eb3004f9e8a687a
+SHA256 (gnome2/bug-buddy-2.26.0.tar.bz2) = 91780659fb3f360ed2f2b0804ceb619d9cbc7754115bf50f442bdd2c7dca224c
+SIZE (gnome2/bug-buddy-2.26.0.tar.bz2) = 1051956
diff --git a/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc b/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc
index 801be10640bf..7007a9101cb3 100644
--- a/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc
+++ b/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc
@@ -1,6 +1,6 @@
---- gnome-breakpad/gnome-breakpad.cc.orig 2007-08-16 13:55:38.000000000 -0400
-+++ gnome-breakpad/gnome-breakpad.cc 2007-09-02 19:21:10.000000000 -0400
-@@ -6,8 +6,14 @@
+--- gnome-breakpad/gnome-breakpad.cc.orig 2009-02-16 15:24:48.000000000 +0100
++++ gnome-breakpad/gnome-breakpad.cc 2009-02-22 16:25:50.000000000 +0100
+@@ -25,8 +25,14 @@
#include <cassert>
#include <cstring>
@@ -15,15 +15,15 @@
#include <sys/types.h>
#include <sys/stat.h>
-@@ -114,6 +120,7 @@ find_in_debug_path (const char *filename
+@@ -264,6 +270,7 @@ find_in_debug_path (const char *filename
}
-
+
+#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
static gboolean
elf_has_debug_symbols (const char *filename)
{
-@@ -166,7 +173,7 @@ elf_has_debug_symbols (const char *filen
+@@ -316,7 +323,7 @@ elf_has_debug_symbols (const char *filen
elf_end (elf);
return false;
}
@@ -32,21 +32,24 @@
-@@ -269,9 +276,17 @@ check_if_gdb (void *callback_context)
+@@ -429,11 +436,18 @@ check_if_gdb ()
+ _exit (1);
_exit(0);
}
-
-+#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
- memset(mypath, 0, sizeof(mypath));
-+#ifndef __FreeBSD__
- readlink ("/proc/self/exe", mypath, sizeof(mypath));
+-
++
++#if !defined(__FreeBSD__)
+ mypath = g_file_read_link ("/proc/self/exe", NULL);
+#else
-+ readlink ("/proc/curproc/file", mypath, sizeof(mypath));
++ mypath = g_file_read_link ("/proc/curproc/file", NULL);
+#endif
- has_debug_symbols = elf_has_debug_symbols (mypath);
-+#else
-+ has_debug_symbols = TRUE;
+ if (mypath)
++#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
+ has_debug_symbols = elf_has_debug_symbols (mypath);
+-
++#else
++ has_debug_symbols = TRUE;
+#endif
-
+ g_free (mypath);
if (bugbuddy && gdb && has_debug_symbols) {
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index 7655acd7ebcb..641480473ee2 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -4,14 +4,6 @@ lib/gtk-2.0/modules/libgnomebreakpad.so
share/applications/bug-buddy.desktop
%%DATADIR%%/bug-buddy.gtkbuilder
%%DATADIR%%/bug-buddy.menu
-%%DATADIR%%/bugzilla/gnome.bugzilla
-%%DATADIR%%/bugzilla/gnome/config
-%%DATADIR%%/bugzilla/gnome/mostfreq
-%%DATADIR%%/bugzilla/gnome/products
-%%DATADIR%%/bugzilla/ximian.bugzilla
-%%DATADIR%%/bugzilla/ximian/config
-%%DATADIR%%/bugzilla/ximian/mostfreq
-%%DATADIR%%/bugzilla/ximian/products
%%DATADIR%%/gdb-cmd
share/icons/HighContrastLargePrint/48x48/apps/bug-buddy.png
share/icons/hicolor/16x16/apps/bug-buddy.png
@@ -107,9 +99,6 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
@dirrmtry share/icons/HighContrastLargePrint/48x48/apps
@dirrmtry share/icons/HighContrastLargePrint/48x48
@dirrmtry share/icons/HighContrastLargePrint
-@dirrm %%DATADIR%%/bugzilla/ximian
-@dirrm %%DATADIR%%/bugzilla/gnome
-@dirrm %%DATADIR%%/bugzilla
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 1aea54eb0fca..8b68d782cc2b 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -3,10 +3,10 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/devhelp/Makefile,v 1.10 2009/01/09 22:20:28 kwm Exp $
+# $MCom: ports/devel/devhelp/Makefile,v 1.12 2009/01/11 18:03:38 marcus Exp $
PORTNAME= devhelp
-PORTVERSION= 0.21
+PORTVERSION= 0.22
PORTEPOCH= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
@@ -15,10 +15,11 @@ DIST_SUBDIR= gnome2
MAINTAINER= kwm@FreeBSD.org
COMMENT= Developer help browser for GNOME 2
+LIB_DEPENDS= webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+
USE_BZIP2= yes
USE_XORG= x11
USE_GETTEXT= yes
-USE_GECKO= firefox xulrunner
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui libwnck
USE_AUTOTOOLS= libtool:15
@@ -28,12 +29,10 @@ USE_LDCONFIG= yes
GCONF_SCHEMAS= devhelp.schemas
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-gecko=${GECKO}
OPTIONS= GEDIT "Enable GEdit plug-in support" off
.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
.if defined(WITH_GEDIT)
BUILD_DEPENDS+= gedit:${PORTSDIR}/editors/gedit
diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo
index 406da7173b39..8c21dd82e15f 100644
--- a/devel/devhelp/distinfo
+++ b/devel/devhelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/devhelp-0.21.tar.bz2) = 24ad71080dde0778cb42c30575b5aca6
-SHA256 (gnome2/devhelp-0.21.tar.bz2) = f2f76e1804afcad248216d494ebc331b670851ccf701dacd295baf87f1273c20
-SIZE (gnome2/devhelp-0.21.tar.bz2) = 549576
+MD5 (gnome2/devhelp-0.22.tar.bz2) = 7cdd0688dba0184b6dd2688532af24cb
+SHA256 (gnome2/devhelp-0.22.tar.bz2) = 1fa4b69c99b10de0e27374e18eea7988e3e8f9243020a22a47f79c9ccad92947
+SIZE (gnome2/devhelp-0.22.tar.bz2) = 517581
diff --git a/devel/devhelp/files/patch-src_dh-base.c b/devel/devhelp/files/patch-src_dh-base.c
index ffa3c3b54602..3dbf1c71cf4e 100644
--- a/devel/devhelp/files/patch-src_dh-base.c
+++ b/devel/devhelp/files/patch-src_dh-base.c
@@ -1,13 +1,14 @@
---- src/dh-base.c.orig Tue May 15 13:00:24 2007
-+++ src/dh-base.c Sun Jul 8 03:48:13 2007
-@@ -233,6 +233,10 @@ base_add_books_in_data_dir (DhBase *base
- dir = g_build_filename (data_dir, "devhelp", "books", NULL);
- base_add_books (base, dir);
- g_free (dir);
+--- src/dh-base.c.orig 2008-10-11 00:00:18.000000000 +0200
++++ src/dh-base.c 2009-01-09 23:10:12.000000000 +0100
+@@ -214,6 +214,11 @@ base_add_books_in_data_dir (DhBase
+ dir = g_build_filename (data_dir, "devhelp", "books", NULL);
+ base_add_books (base, dir);
+ g_free (dir);
++
++ dir = g_build_filename (data_dir, "doc", NULL);
++ base_add_books (base, dir);
++ g_free (dir);
+
-+ dir = g_build_filename (data_dir, "doc", NULL);
-+ base_add_books (base, dir);
-+ g_free (dir);
}
static void
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index e657eb546eff..83649fae27a5 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -1,16 +1,13 @@
bin/devhelp
+include/devhelp-1.0/devhelp/dh-assistant-view.h
+include/devhelp-1.0/devhelp/dh-assistant.h
include/devhelp-1.0/devhelp/dh-base.h
include/devhelp-1.0/devhelp/dh-book-tree.h
include/devhelp-1.0/devhelp/dh-error.h
-include/devhelp-1.0/devhelp/dh-html.h
include/devhelp-1.0/devhelp/dh-keyword-model.h
include/devhelp-1.0/devhelp/dh-link.h
-include/devhelp-1.0/devhelp/dh-parser.h
-include/devhelp-1.0/devhelp/dh-preferences.h
include/devhelp-1.0/devhelp/dh-search.h
-include/devhelp-1.0/devhelp/dh-util.h
include/devhelp-1.0/devhelp/dh-window.h
-include/devhelp-1.0/devhelp/eggfindbar.h
%%GEDIT%%lib/gedit-2/plugins/devhelp.gedit-plugin
%%GEDIT%%lib/gedit-2/plugins/devhelp/__init__.py
%%GEDIT%%lib/gedit-2/plugins/devhelp/__init__.pyc
@@ -24,12 +21,11 @@ lib/libdevhelp-1.so
lib/libdevhelp-1.so.0
libdata/pkgconfig/libdevhelp-1.0.pc
share/applications/devhelp.desktop
-share/devhelp/default-prefs.js
-share/devhelp/devhelp.glade
+share/devhelp/assistant/assistant.css
+share/devhelp/assistant/assistant.js
+share/devhelp/devhelp.defaults
share/devhelp/dtd/devhelp-1.dtd
-share/devhelp/images/book_closed.png
-share/devhelp/images/book_open.png
-share/devhelp/images/helpdoc.png
+share/devhelp/ui/devhelp.builder
share/devhelp/ui/window.ui
share/icons/hicolor/16x16/apps/devhelp.png
share/icons/hicolor/22x22/apps/devhelp.png
@@ -72,7 +68,6 @@ share/locale/lt/LC_MESSAGES/devhelp.mo
share/locale/lv/LC_MESSAGES/devhelp.mo
share/locale/mk/LC_MESSAGES/devhelp.mo
share/locale/ml/LC_MESSAGES/devhelp.mo
-share/locale/mr/LC_MESSAGES/devhelp.mo
share/locale/ms/LC_MESSAGES/devhelp.mo
share/locale/nb/LC_MESSAGES/devhelp.mo
share/locale/ne/LC_MESSAGES/devhelp.mo
@@ -82,6 +77,7 @@ share/locale/oc/LC_MESSAGES/devhelp.mo
share/locale/or/LC_MESSAGES/devhelp.mo
share/locale/pa/LC_MESSAGES/devhelp.mo
share/locale/pl/LC_MESSAGES/devhelp.mo
+share/locale/ps/LC_MESSAGES/devhelp.mo
share/locale/pt/LC_MESSAGES/devhelp.mo
share/locale/pt_BR/LC_MESSAGES/devhelp.mo
share/locale/ru/LC_MESSAGES/devhelp.mo
@@ -90,7 +86,7 @@ share/locale/sk/LC_MESSAGES/devhelp.mo
share/locale/sl/LC_MESSAGES/devhelp.mo
share/locale/sq/LC_MESSAGES/devhelp.mo
share/locale/sr/LC_MESSAGES/devhelp.mo
-share/locale/sr@latin/LC_MESSAGES/devhelp.mo
+share/locale/sr@Latn/LC_MESSAGES/devhelp.mo
share/locale/sv/LC_MESSAGES/devhelp.mo
share/locale/ta/LC_MESSAGES/devhelp.mo
share/locale/te/LC_MESSAGES/devhelp.mo
@@ -104,6 +100,7 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
@dirrm share/devhelp/ui
@dirrm share/devhelp/images
@dirrm share/devhelp/dtd
+@dirrm share/devhelp/assistant
@dirrm share/devhelp
@dirrm include/devhelp-1.0/devhelp
@dirrm include/devhelp-1.0
@@ -111,10 +108,12 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
@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/sr@Latn/LC_MESSAGES
+@dirrmtry share/locale/sr@Latn
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@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
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index ed6f8d8cd495..250fbed4fe6e 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gconf2/Makefile,v 1.102 2008/09/23 04:54:38 marcus Exp $
+# $MCom: ports/devel/gconf2/Makefile,v 1.106 2009/03/18 00:42:34 kwm Exp $
#
PORTNAME= gconf2
-PORTVERSION= 2.24.0
+PORTVERSION= 2.26.0
PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index f3cebd9eea58..4330c8a589a6 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/GConf-2.24.0.tar.bz2) = 4971d96f5ba94fe4a69396267bd5afe8
-SHA256 (gnome2/GConf-2.24.0.tar.bz2) = 990003904ee13b2fd98a61d55fa4d0fcb30fb233454a036bb9465f42d1acbb1b
-SIZE (gnome2/GConf-2.24.0.tar.bz2) = 1467817
+MD5 (gnome2/GConf-2.26.0.tar.bz2) = b010f0de356ea093c6a73778b13de956
+SHA256 (gnome2/GConf-2.26.0.tar.bz2) = 2b9fe741f84d78d7c4f18835728facce81f7db656c2c37f669ee61785911da10
+SIZE (gnome2/GConf-2.26.0.tar.bz2) = 1490741
diff --git a/devel/gconf2/files/patch-ab b/devel/gconf2/files/patch-ab
deleted file mode 100644
index 6f25900e7de2..000000000000
--- a/devel/gconf2/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig Sun Aug 4 22:38:39 2002
-+++ Makefile.in Sun Aug 4 22:39:52 2002
-@@ -35,7 +35,7 @@
- DESTDIR =
-
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
-+pkglibdir = $(prefix)/libdata/pkgconfig
- pkgincludedir = $(includedir)/@PACKAGE@
-
- top_builddir = .
diff --git a/devel/gconf2/files/patch-gconf_default.path.in b/devel/gconf2/files/patch-gconf_default.path.in
new file mode 100644
index 000000000000..0b60822c7c27
--- /dev/null
+++ b/devel/gconf2/files/patch-gconf_default.path.in
@@ -0,0 +1,11 @@
+--- gconf/default.path.in.orig 2009-03-06 17:10:54.000000000 -0500
++++ gconf/default.path.in 2009-03-06 17:11:25.000000000 -0500
+@@ -21,7 +21,7 @@ include "$(HOME)/.gconf.path"
+ xml:readwrite:$(HOME)/.gconf
+
+ # Location for system-wide settings that are set by the defaults mechanism
+-xml:readonly:/etc/gconf/gconf.xml.system
++xml:readonly:@sysgconfdir@/gconf.xml.system
+
+ # To read in any defaults settings that the Sys Admin may have created
+ # prior to a desktop system upgrade. The SysAdmin can stick default values
diff --git a/devel/gconf2/files/patch-gconf_gconfd.c b/devel/gconf2/files/patch-gconf_gconfd.c
deleted file mode 100644
index 31a6470a42e5..000000000000
--- a/devel/gconf2/files/patch-gconf_gconfd.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- gconf/gconfd.c.orig 2008-05-10 08:34:31.000000000 -0400
-+++ gconf/gconfd.c 2008-08-16 14:08:05.000000000 -0400
-@@ -123,12 +123,6 @@ static void gconf_handle_segv (int signu
-
- static gboolean in_shutdown = FALSE;
-
--/*
-- * Flag indicating we received a SIGHUP and we should reaload
-- * all sources during the next periodic_cleanup()
-- */
--static gboolean need_db_reload = FALSE;
--
- /*
- * CORBA goo
- */
-@@ -408,6 +402,18 @@ gconf_server_load_sources(void)
- }
- }
-
-+static void
-+reload_db (void)
-+{
-+ gconf_log (GCL_INFO, _("SIGHUP received, reloading all databases"));
-+
-+ logfile_save ();
-+ shutdown_databases ();
-+ init_databases ();
-+ gconf_server_load_sources ();
-+ logfile_read ();
-+}
-+
- /*
- * Signal handlers should not log debug messages as this code is non-reentrant.
- * Please avoid calling gconf_log in this function.
-@@ -471,8 +477,7 @@ signal_handler (int signo)
- case SIGHUP:
- --in_fatal;
-
-- /* reload sources during next periodic_cleanup() */
-- need_db_reload = TRUE;
-+ reload_db ();
- break;
- #endif
-
-@@ -828,17 +833,6 @@ static gboolean need_log_cleanup = FALSE
- static gboolean
- periodic_cleanup_timeout(gpointer data)
- {
-- if (need_db_reload)
-- {
-- gconf_log (GCL_INFO, _("SIGHUP received, reloading all databases"));
--
-- need_db_reload = FALSE;
-- logfile_save ();
-- shutdown_databases ();
-- init_databases ();
-- gconf_server_load_sources ();
-- logfile_read ();
-- }
-
- gconf_log (GCL_DEBUG, "Performing periodic cleanup, expiring cache cruft");
-
diff --git a/devel/gconf2/files/patch-gconf_gconftool.c b/devel/gconf2/files/patch-gconf_gconftool.c
deleted file mode 100644
index f3c3d2fb0867..000000000000
--- a/devel/gconf2/files/patch-gconf_gconftool.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- gconf/gconftool.c.orig Fri Mar 2 17:10:13 2007
-+++ gconf/gconftool.c Tue Mar 6 12:01:04 2007
-@@ -3781,6 +3781,13 @@ do_makefile_install(GConfEngine* conf, c
- }
-
- retval |= do_sync (conf);
-+
-+ /*
-+ * Send all the gconfd-2 processes a SIGHUP so that they reload the
-+ * databases and pick up the added/removed schemas.
-+ */
-+ system("/usr/bin/killall -SIGHUP gconfd-2 >/dev/null 2>&1");
-+
- return retval;
- }
-
diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index 3793ee1b7566..ce167ad0d712 100644
--- a/devel/gio-fam-backend/Makefile
+++ b/devel/gio-fam-backend/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.24 2009/01/09 21:30:35 kwm Exp $
+# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.30 2009/03/27 18:52:46 marcus Exp $
#
PORTNAME= gio-fam-backend
-PORTVERSION= 2.18.4
+PORTVERSION= 2.20.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/}/ \
@@ -29,6 +29,7 @@ GNU_CONFIGURE= yes
USE_GNOME= gnomehack pkgconfig _glib20
USE_FAM= yes
USE_GMAKE= yes
+MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --enable-static --with-libiconv=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lintl" \
diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo
index d16c3b42fe58..975758280f1b 100644
--- a/devel/gio-fam-backend/distinfo
+++ b/devel/gio-fam-backend/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.18.4.tar.bz2) = ec25ed261534d870141000ab73f1a2bf
-SHA256 (gnome2/glib-2.18.4.tar.bz2) = 6aeb2c845e9fdc388943acdaba2f6357e3007c5ffaa8d666904679cfb40de100
-SIZE (gnome2/glib-2.18.4.tar.bz2) = 4809051
+MD5 (gnome2/glib-2.20.0.tar.bz2) = 05188e560dbd8bddd568e24ce10dd003
+SHA256 (gnome2/glib-2.20.0.tar.bz2) = 6fb4269a187bee6f7825c358fd6f0e0e99e6ad71f7f995ddcbfe9466ec8f6631
+SIZE (gnome2/glib-2.20.0.tar.bz2) = 4956969
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index a0fa331285c9..9fc3db3ce1a7 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glade3/Makefile,v 1.38 2007/09/17 15:59:36 ahze Exp $
+# $MCom: ports/devel/glade3/Makefile,v 1.42 2009/04/07 03:05:07 marcus Exp $
#
PORTNAME= glade3
-PORTVERSION= 3.4.5
-PORTREVISION= 1
+PORTVERSION= 3.6.1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/glade3/distinfo b/devel/glade3/distinfo
index b7682725e8f8..b2f41be4d945 100644
--- a/devel/glade3/distinfo
+++ b/devel/glade3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glade3-3.4.5.tar.bz2) = 39924af2e97f55f0a159f930ee4acb1c
-SHA256 (gnome2/glade3-3.4.5.tar.bz2) = 4e83ee1ce3832232f3dfcab9efaf4fa1f7f026d8c63051c68a82d76bbae39c77
-SIZE (gnome2/glade3-3.4.5.tar.bz2) = 1777173
+MD5 (gnome2/glade3-3.6.1.tar.bz2) = b145889e43319dabffe6ae4ac74b2d42
+SHA256 (gnome2/glade3-3.6.1.tar.bz2) = e105d09e8098a0d6d541a7a84a841f8b28b48828236ebed1af6963bf1270feba
+SIZE (gnome2/glade3-3.6.1.tar.bz2) = 2265057
diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist
index 7e0ac368901e..4a1793fc11d2 100644
--- a/devel/glade3/pkg-plist
+++ b/devel/glade3/pkg-plist
@@ -1,30 +1,52 @@
bin/glade-3
+include/libgladeui-1.0/gladeui/glade-accels.h
+include/libgladeui-1.0/gladeui/glade-activatable-editor.h
include/libgladeui-1.0/gladeui/glade-app.h
+include/libgladeui-1.0/gladeui/glade-attributes.h
include/libgladeui-1.0/gladeui/glade-base-editor.h
include/libgladeui-1.0/gladeui/glade-builtins.h
+include/libgladeui-1.0/gladeui/glade-button-editor.h
+include/libgladeui-1.0/gladeui/glade-catalog.h
+include/libgladeui-1.0/gladeui/glade-cell-renderer-button.h
+include/libgladeui-1.0/gladeui/glade-cell-renderer-editor.h
include/libgladeui-1.0/gladeui/glade-clipboard-view.h
include/libgladeui-1.0/gladeui/glade-clipboard.h
+include/libgladeui-1.0/gladeui/glade-column-types.h
include/libgladeui-1.0/gladeui/glade-command.h
include/libgladeui-1.0/gladeui/glade-cursor.h
include/libgladeui-1.0/gladeui/glade-custom.h
include/libgladeui-1.0/gladeui/glade-debug.h
include/libgladeui-1.0/gladeui/glade-design-layout.h
include/libgladeui-1.0/gladeui/glade-design-view.h
+include/libgladeui-1.0/gladeui/glade-displayable-values.h
+include/libgladeui-1.0/gladeui/glade-editable.h
include/libgladeui-1.0/gladeui/glade-editor-property.h
+include/libgladeui-1.0/gladeui/glade-editor-table.h
include/libgladeui-1.0/gladeui/glade-editor.h
+include/libgladeui-1.0/gladeui/glade-entry-editor.h
include/libgladeui-1.0/gladeui/glade-fixed.h
include/libgladeui-1.0/gladeui/glade-gtk.h
+include/libgladeui-1.0/gladeui/glade-icon-factory-editor.h
+include/libgladeui-1.0/gladeui/glade-icon-sources.h
+include/libgladeui-1.0/gladeui/glade-image-editor.h
+include/libgladeui-1.0/gladeui/glade-image-item-editor.h
include/libgladeui-1.0/gladeui/glade-inspector.h
+include/libgladeui-1.0/gladeui/glade-label-editor.h
+include/libgladeui-1.0/gladeui/glade-model-data.h
+include/libgladeui-1.0/gladeui/glade-name-context.h
include/libgladeui-1.0/gladeui/glade-palette-item.h
include/libgladeui-1.0/gladeui/glade-palette.h
include/libgladeui-1.0/gladeui/glade-parameter.h
-include/libgladeui-1.0/gladeui/glade-parser.h
include/libgladeui-1.0/gladeui/glade-placeholder.h
include/libgladeui-1.0/gladeui/glade-project.h
include/libgladeui-1.0/gladeui/glade-property-class.h
include/libgladeui-1.0/gladeui/glade-property.h
include/libgladeui-1.0/gladeui/glade-signal-editor.h
include/libgladeui-1.0/gladeui/glade-signal.h
+include/libgladeui-1.0/gladeui/glade-store-editor.h
+include/libgladeui-1.0/gladeui/glade-text-button.h
+include/libgladeui-1.0/gladeui/glade-tool-button-editor.h
+include/libgladeui-1.0/gladeui/glade-treeview-editor.h
include/libgladeui-1.0/gladeui/glade-utils.h
include/libgladeui-1.0/gladeui/glade-widget-action.h
include/libgladeui-1.0/gladeui/glade-widget-adaptor.h
@@ -40,13 +62,15 @@ lib/glade3/modules/libgladegtk.so
lib/libgladeui-1.a
lib/libgladeui-1.la
lib/libgladeui-1.so
-lib/libgladeui-1.so.7
+lib/libgladeui-1.so.9
libdata/pkgconfig/gladeui-1.0.pc
share/applications/glade-3.desktop
%%DOCSDIR%%/GladeApp.html
+share/doc/gladeui/GladeBaseEditor.html
%%DOCSDIR%%/GladeClipboard.html
%%DOCSDIR%%/GladeClipboardView.html
%%DOCSDIR%%/GladeCommand.html
+share/doc/gladeui/GladeDesignView.html
%%DOCSDIR%%/GladeEditor.html
%%DOCSDIR%%/GladeEditorProperty.html
%%DOCSDIR%%/GladeFixed.html
@@ -55,18 +79,18 @@ share/applications/glade-3.desktop
%%DOCSDIR%%/GladePlaceholder.html
%%DOCSDIR%%/GladeProject.html
%%DOCSDIR%%/GladeWidget.html
+share/doc/gladeui/GladeWidgetAction.html
%%DOCSDIR%%/catalog.html
%%DOCSDIR%%/catalogintro.html
-%%DOCSDIR%%/children.html
%%DOCSDIR%%/core.html
%%DOCSDIR%%/dockables.html
-%%DOCSDIR%%/gladeui-GladeBaseEditor.html
%%DOCSDIR%%/gladeui-GladePropertyClass.html
%%DOCSDIR%%/gladeui-GladeWidgetAdaptor.html
%%DOCSDIR%%/gladeui-glade-parameter.html
%%DOCSDIR%%/gladeui-glade-property.html
%%DOCSDIR%%/gladeui-glade-signal-editor.html
%%DOCSDIR%%/gladeui-glade-utils.html
+share/doc/gladeui/gladeui-glade-xml-utils.html
%%DOCSDIR%%/gladeui.devhelp
%%DOCSDIR%%/gladeui.devhelp2
%%DOCSDIR%%/home.png
@@ -84,6 +108,7 @@ share/applications/glade-3.desktop
%%GNOME:%%%%DATADIR%%/catalogs/bonobo.xml.in
%%GNOME:%%%%DATADIR%%/catalogs/canvas.xml
%%GNOME:%%%%DATADIR%%/catalogs/canvas.xml.in
+%%DATADIR%%/catalogs/glade-catalog.dtd
%%GNOME:%%%%DATADIR%%/catalogs/gnome.xml
%%GNOME:%%%%DATADIR%%/catalogs/gnome.xml.in
%%DATADIR%%/catalogs/gtk+.xml
@@ -118,12 +143,21 @@ share/applications/glade-3.desktop
%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-propertybox.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-aboutdialog.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-accellabel.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-action.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-actiongroup.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-alignment.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-arrow.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-aspectframe.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-assistant.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-button.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-calendar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendereraccel.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrenderercombo.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererpixbuf.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererprogress.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererspin.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrenderertext.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrenderertoggle.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-checkbutton.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-checkmenuitem.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-clist.png
@@ -139,6 +173,7 @@ share/applications/glade-3.desktop
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-dialog.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-drawingarea.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-entry.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-entrycompletion.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-eventbox.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-expander.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserbutton.png
@@ -151,7 +186,6 @@ share/applications/glade-3.desktop
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fontselectiondialog.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-frame.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-gammacurve.png
-%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-gtktextview.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-handlebox.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hbox.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hbuttonbox.png
@@ -160,6 +194,7 @@ share/applications/glade-3.desktop
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hscale.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hscrollbar.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hseparator.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-iconfactory.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-iconview.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-image.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-imagemenuitem.png
@@ -169,6 +204,7 @@ share/applications/glade-3.desktop
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-linkbutton.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-list.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-listitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-liststore.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menu.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menubar.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menuitem.png
@@ -179,12 +215,15 @@ share/applications/glade-3.desktop
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-pagesetupdialog.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-printdialog.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-progressbar.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radioaction.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radiobutton.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radiomenuitem.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radiotoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentaction.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooser.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooserdialog.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-ruler.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-scalebutton.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-scrolledwindow.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-separatormenuitem.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-separatortoolitem.png
@@ -192,21 +231,26 @@ share/applications/glade-3.desktop
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-statusbar.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-table.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-textview.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toggleaction.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-togglebutton.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toggletoolbutton.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolbar.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolbutton.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolitem.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treestore.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treeview.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treeviewcolumn.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vbox.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vbuttonbox.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-viewport.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-volumebutton.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vpaned.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vruler.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vscale.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vscrollbar.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vseparator.png
%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-window.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-windowgroup.png
%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-bonobo-dock.png
%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-bonobo-dockitem.png
%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-about.png
@@ -232,12 +276,21 @@ share/applications/glade-3.desktop
%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-propertybox.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-aboutdialog.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-accellabel.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-action.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-actiongroup.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-alignment.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-arrow.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-aspectframe.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-assistant.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-button.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-calendar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendereraccel.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrenderercombo.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererpixbuf.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererprogress.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererspin.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrenderertext.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrenderertoggle.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-checkbutton.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-checkmenuitem.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-clist.png
@@ -253,6 +306,7 @@ share/applications/glade-3.desktop
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-dialog.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-drawingarea.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-entry.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-entrycompletion.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-eventbox.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-expander.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserbutton.png
@@ -273,6 +327,7 @@ share/applications/glade-3.desktop
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hscale.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hscrollbar.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hseparator.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-iconfactory.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-iconview.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-image.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-imagemenuitem.png
@@ -282,6 +337,7 @@ share/applications/glade-3.desktop
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-linkbutton.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-list.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-listitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-liststore.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menu.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menubar.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menuitem.png
@@ -292,12 +348,15 @@ share/applications/glade-3.desktop
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-pagesetupdialog.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-printdialog.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-progressbar.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radioaction.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radiobutton.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radiomenuitem.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radiotoolbutton.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentaction.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooser.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooserdialog.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-ruler.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-scalebutton.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-scrolledwindow.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-separatormenuitem.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-separatortoolitem.png
@@ -305,21 +364,25 @@ share/applications/glade-3.desktop
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-statusbar.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-table.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-textview.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toggleaction.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-togglebutton.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toggletoolbutton.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolbar.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolbutton.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolitem.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-treestore.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-treeview.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vbox.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vbuttonbox.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-viewport.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-volumebutton.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vpaned.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vruler.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vscale.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vscrollbar.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vseparator.png
%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-window.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-windowgroup.png
%%DATADIR%%/pixmaps/plus.png
%%DATADIR%%/pixmaps/selector.png
share/gnome/help/glade/C/figures/main-window.png
@@ -328,15 +391,27 @@ share/gnome/help/glade/C/legal.xml
share/gnome/help/glade/bg/figures/main-window.png
share/gnome/help/glade/bg/glade.xml
share/gnome/help/glade/bg/legal.xml
+share/gnome/help/glade/de/figures/main-window.png
+share/gnome/help/glade/de/glade.xml
+share/gnome/help/glade/de/legal.xml
+share/gnome/help/glade/el/figures/main-window.png
+share/gnome/help/glade/el/glade.xml
+share/gnome/help/glade/el/legal.xml
share/gnome/help/glade/en_GB/figures/main-window.png
share/gnome/help/glade/en_GB/glade.xml
share/gnome/help/glade/en_GB/legal.xml
+share/gnome/help/glade/eu/figures/main-window.png
+share/gnome/help/glade/eu/glade.xml
+share/gnome/help/glade/eu/legal.xml
share/gnome/help/glade/es/figures/main-window.png
share/gnome/help/glade/es/glade.xml
share/gnome/help/glade/es/legal.xml
share/gnome/help/glade/fr/figures/main-window.png
share/gnome/help/glade/fr/glade.xml
share/gnome/help/glade/fr/legal.xml
+share/gnome/help/glade/hi/figures/main-window.png
+share/gnome/help/glade/hi/glade.xml
+share/gnome/help/glade/hi/legal.xml
share/gnome/help/glade/it/figures/main-window.png
share/gnome/help/glade/it/glade.xml
share/gnome/help/glade/it/legal.xml
@@ -346,6 +421,9 @@ share/gnome/help/glade/oc/legal.xml
share/gnome/help/glade/pt_BR/figures/main-window.png
share/gnome/help/glade/pt_BR/glade.xml
share/gnome/help/glade/pt_BR/legal.xml
+share/gnome/help/glade/ru/figures/main-window.png
+share/gnome/help/glade/ru/glade.xml
+share/gnome/help/glade/ru/legal.xml
share/gnome/help/glade/sv/figures/main-window.png
share/gnome/help/glade/sv/glade.xml
share/gnome/help/glade/sv/legal.xml
@@ -361,6 +439,7 @@ share/locale/bg/LC_MESSAGES/glade3.mo
share/locale/bn/LC_MESSAGES/glade3.mo
share/locale/bn_IN/LC_MESSAGES/glade3.mo
share/locale/ca/LC_MESSAGES/glade3.mo
+share/locale/cs/LC_MESSAGES/glade3.mo
share/locale/da/LC_MESSAGES/glade3.mo
share/locale/de/LC_MESSAGES/glade3.mo
share/locale/el/LC_MESSAGES/glade3.mo
@@ -368,9 +447,11 @@ share/locale/en_CA/LC_MESSAGES/glade3.mo
share/locale/en_GB/LC_MESSAGES/glade3.mo
share/locale/es/LC_MESSAGES/glade3.mo
share/locale/et/LC_MESSAGES/glade3.mo
+share/locale/eu/LC_MESSAGES/glade3.mo
share/locale/fi/LC_MESSAGES/glade3.mo
share/locale/fr/LC_MESSAGES/glade3.mo
share/locale/gl/LC_MESSAGES/glade3.mo
+share/locale/gu/LC_MESSAGES/glade3.mo
share/locale/he/LC_MESSAGES/glade3.mo
share/locale/hi/LC_MESSAGES/glade3.mo
share/locale/hu/LC_MESSAGES/glade3.mo
@@ -378,10 +459,14 @@ share/locale/it/LC_MESSAGES/glade3.mo
share/locale/ja/LC_MESSAGES/glade3.mo
share/locale/ko/LC_MESSAGES/glade3.mo
share/locale/lt/LC_MESSAGES/glade3.mo
+share/locale/lv/LC_MESSAGES/glade3.mo
+share/locale/mai/LC_MESSAGES/glade3.mo
share/locale/mk/LC_MESSAGES/glade3.mo
share/locale/ml/LC_MESSAGES/glade3.mo
+share/locale/mr/LC_MESSAGES/glade3.mo
share/locale/ms/LC_MESSAGES/glade3.mo
share/locale/nb/LC_MESSAGES/glade3.mo
+share/locale/nl/LC_MESSAGES/glade3.mo
share/locale/nn/LC_MESSAGES/glade3.mo
share/locale/oc/LC_MESSAGES/glade3.mo
share/locale/or/LC_MESSAGES/glade3.mo
@@ -406,28 +491,43 @@ share/locale/zh_HK/LC_MESSAGES/glade3.mo
share/locale/zh_TW/LC_MESSAGES/glade3.mo
share/omf/glade/glade-C.omf
share/omf/glade/glade-bg.omf
+share/omf/glade/glade-de.omf
+share/omf/glade/glade-el.omf
share/omf/glade/glade-en_GB.omf
+share/omf/glade/glade-eu.omf
share/omf/glade/glade-es.omf
share/omf/glade/glade-fr.omf
+share/omf/glade/glade-hi.omf
share/omf/glade/glade-it.omf
share/omf/glade/glade-oc.omf
share/omf/glade/glade-pt_BR.omf
+share/omf/glade/glade-ru.omf
share/omf/glade/glade-sv.omf
@dirrm share/omf/glade
@dirrm share/gnome/help/glade/sv/figures
@dirrm share/gnome/help/glade/sv
+@dirrm share/gnome/help/glade/ru/figures
+@dirrm share/gnome/help/glade/ru
@dirrm share/gnome/help/glade/pt_BR/figures
@dirrm share/gnome/help/glade/pt_BR
@dirrm share/gnome/help/glade/oc/figures
@dirrm share/gnome/help/glade/oc
@dirrm share/gnome/help/glade/it/figures
@dirrm share/gnome/help/glade/it
+@dirrm share/gnome/help/glade/hi/figures
+@dirrm share/gnome/help/glade/hi
@dirrm share/gnome/help/glade/fr/figures
@dirrm share/gnome/help/glade/fr
@dirrm share/gnome/help/glade/es/figures
@dirrm share/gnome/help/glade/es
+@dirrm share/gnome/help/glade/eu/figures
+@dirrm share/gnome/help/glade/eu
@dirrm share/gnome/help/glade/en_GB/figures
@dirrm share/gnome/help/glade/en_GB
+@dirrm share/gnome/help/glade/el/figures
+@dirrm share/gnome/help/glade/el
+@dirrm share/gnome/help/glade/de/figures
+@dirrm share/gnome/help/glade/de
@dirrm share/gnome/help/glade/bg/figures
@dirrm share/gnome/help/glade/bg
@dirrm share/gnome/help/glade/C/figures
@@ -449,6 +549,7 @@ share/omf/glade/glade-sv.omf
@dirrm include/libgladeui-1.0
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@@ -457,6 +558,11 @@ share/omf/glade/glade-sv.omf
@dirrmtry share/locale/si
@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/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
-@dirrmtry share/applications
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 33e5a3ed6454..27f26754e845 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.137 2009/01/09 21:30:35 kwm Exp $
+# $MCom: ports/devel/glib20/Makefile,v 1.143 2009/03/27 18:52:46 marcus Exp $
#
# !! DON'T FORGET ABOUT devel/gio-fam-backend !!
PORTNAME= glib
-PORTVERSION= 2.18.4
+PORTVERSION= 2.20.0
PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
@@ -36,6 +36,7 @@ USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig ltverhack
USE_GMAKE= yes
+MAKE_JOBS_SAFE= yes
USE_PYTHON= yes
USE_PERL5= yes
CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index d16c3b42fe58..975758280f1b 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.18.4.tar.bz2) = ec25ed261534d870141000ab73f1a2bf
-SHA256 (gnome2/glib-2.18.4.tar.bz2) = 6aeb2c845e9fdc388943acdaba2f6357e3007c5ffaa8d666904679cfb40de100
-SIZE (gnome2/glib-2.18.4.tar.bz2) = 4809051
+MD5 (gnome2/glib-2.20.0.tar.bz2) = 05188e560dbd8bddd568e24ce10dd003
+SHA256 (gnome2/glib-2.20.0.tar.bz2) = 6fb4269a187bee6f7825c358fd6f0e0e99e6ad71f7f995ddcbfe9466ec8f6631
+SIZE (gnome2/glib-2.20.0.tar.bz2) = 4956969
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 48f0c14e712e..327137a6324a 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -86,6 +86,7 @@ include/glib-2.0/glib/gmessages.h
include/glib-2.0/glib/gnode.h
include/glib-2.0/glib/goption.h
include/glib-2.0/glib/gpattern.h
+include/glib-2.0/glib/gpoll.h
include/glib-2.0/glib/gprimes.h
include/glib-2.0/glib/gprintf.h
include/glib-2.0/glib/gqsort.h
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 437f13cbf92b..d4f6f298e845 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.68 2008/10/21 15:59:45 mezz Exp $
+# $MCom: ports/devel/glibmm/Makefile,v 1.72 2009/03/16 08:23:53 kwm Exp $
#
PORTNAME= glibmm
-PORTVERSION= 2.18.1
+PORTVERSION= 2.20.0
PORTREVISION?= 0
PORTEPOCH= 1
CATEGORIES= devel
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index 61f8ad49d045..f4b636d0b38f 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glibmm-2.18.1.tar.bz2) = 942290a4b77dac3ea18a5b70373fe04c
-SHA256 (gnome2/glibmm-2.18.1.tar.bz2) = 79641fe9ca2ad2ad4c49f2ebe15f360b16cbbff852eaa51c99b8f36b362ce649
-SIZE (gnome2/glibmm-2.18.1.tar.bz2) = 6714825
+MD5 (gnome2/glibmm-2.20.0.tar.bz2) = 38fa409b531144c238b6e2532e351799
+SHA256 (gnome2/glibmm-2.20.0.tar.bz2) = 573ee090bc1eb0ddb8a014021ca284f127d609f8bd1abdbc24cbb5b8287380b0
+SIZE (gnome2/glibmm-2.20.0.tar.bz2) = 4345802
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index c6208677d2fb..f059558d4def 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -9,6 +9,8 @@ include/giomm-%%API_VERSION%%/giomm/datainputstream.h
include/giomm-%%API_VERSION%%/giomm/dataoutputstream.h
include/giomm-%%API_VERSION%%/giomm/desktopappinfo.h
include/giomm-%%API_VERSION%%/giomm/drive.h
+include/giomm-%%API_VERSION%%/giomm/emblem.h
+include/giomm-%%API_VERSION%%/giomm/emblemedicon.h
include/giomm-%%API_VERSION%%/giomm/enums.h
include/giomm-%%API_VERSION%%/giomm/error.h
include/giomm-%%API_VERSION%%/giomm/file.h
@@ -28,6 +30,7 @@ include/giomm-%%API_VERSION%%/giomm/init.h
include/giomm-%%API_VERSION%%/giomm/inputstream.h
include/giomm-%%API_VERSION%%/giomm/loadableicon.h
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/outputstream.h
@@ -40,6 +43,8 @@ include/giomm-%%API_VERSION%%/giomm/private/datainputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/dataoutputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/desktopappinfo_p.h
include/giomm-%%API_VERSION%%/giomm/private/drive_p.h
+include/giomm-%%API_VERSION%%/giomm/private/emblem_p.h
+include/giomm-%%API_VERSION%%/giomm/private/emblemedicon_p.h
include/giomm-%%API_VERSION%%/giomm/private/enums_p.h
include/giomm-%%API_VERSION%%/giomm/private/error_p.h
include/giomm-%%API_VERSION%%/giomm/private/file_p.h
@@ -58,6 +63,7 @@ include/giomm-%%API_VERSION%%/giomm/private/icon_p.h
include/giomm-%%API_VERSION%%/giomm/private/inputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/loadableicon_p.h
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/outputstream_p.h
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
deleted file mode 100644
index aefb73e37044..000000000000
--- a/devel/gnome-build/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for: gnomebuild
-# Date created: 24 July 2001
-# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/devel/gnome-build/Makefile,v 1.9 2008/10/20 03:25:46 mezz Exp $
-#
-
-PORTNAME= gnome-build
-PORTVERSION= 2.24.1
-PORTEPOCH= 1
-CATEGORIES= devel gnome
-MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= A GNOME Build Framework (GBF)
-
-BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext
-LIB_DEPENDS= gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
-RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext
-
-USE_BZIP2= yes
-USE_GETTEXT= yes
-USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui gnomevfs2
-USE_GETTEXT= yes
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-USE_LDCONFIG= yes
-USE_PERL5= yes
-CONFIGURE_ARGS= --enable-compile-warnings=no
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lgnuregex"
-
-.include <bsd.port.mk>
diff --git a/devel/gnome-build/distinfo b/devel/gnome-build/distinfo
deleted file mode 100644
index df535af68f22..000000000000
--- a/devel/gnome-build/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-build-2.24.1.tar.bz2) = b35c918b6c0c70652e9eb1d2e45138f1
-SHA256 (gnome2/gnome-build-2.24.1.tar.bz2) = 35c8bf4ebbe93639400985c92322f1be80de3e193ed1d715443949bb9a5c43a0
-SIZE (gnome2/gnome-build-2.24.1.tar.bz2) = 517031
diff --git a/devel/gnome-build/pkg-descr b/devel/gnome-build/pkg-descr
deleted file mode 100644
index 60385151a1e2..000000000000
--- a/devel/gnome-build/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a GNOME Build Framework (GBF).
-
-WWW: http://www.gnome.org/
diff --git a/devel/gnome-build/pkg-plist b/devel/gnome-build/pkg-plist
deleted file mode 100644
index 60ff88f77411..000000000000
--- a/devel/gnome-build/pkg-plist
+++ /dev/null
@@ -1,109 +0,0 @@
-bin/gbf-am-parse
-bin/gbf-mkfile-parse
-include/gnome-build-1.0/gbf/gbf-backend.h
-include/gnome-build-1.0/gbf/gbf-project-model.h
-include/gnome-build-1.0/gbf/gbf-project-util.h
-include/gnome-build-1.0/gbf/gbf-project-view.h
-include/gnome-build-1.0/gbf/gbf-project.h
-include/gnome-build-1.0/gbf/gbf-tree-data.h
-include/gnome-build-1.0/gbf/gbf-widgets.h
-include/gnome-build-1.0/gbf/glue-plugin.h
-lib/gnome-build-1.0/backends/gbf-am.server
-lib/gnome-build-1.0/backends/gbf-mkfile.server
-lib/gnome-build-1.0/backends/libgbf-am.la
-lib/gnome-build-1.0/backends/libgbf-am.so
-lib/gnome-build-1.0/backends/libgbf-mkfile.la
-lib/gnome-build-1.0/backends/libgbf-mkfile.so
-lib/libgbf-1.la
-lib/libgbf-1.so
-lib/libgbf-1.so.2
-lib/libgbf-widgets-1.la
-lib/libgbf-widgets-1.so
-lib/libgbf-widgets-1.so.2
-libdata/pkgconfig/gnome-build-1.0.pc
-share/gnome-build/GBF/AmFiles.pm
-share/gnome-build/GBF/General.pm
-share/gnome-build/GBF/Make.pm
-share/gnome-build/glade/create_dialogs.glade
-share/gnome-build/glade/gbf-am-dialogs.glade
-share/locale/am/LC_MESSAGES/gbf-1.mo
-share/locale/ar/LC_MESSAGES/gbf-1.mo
-share/locale/az/LC_MESSAGES/gbf-1.mo
-share/locale/be/LC_MESSAGES/gbf-1.mo
-share/locale/bg/LC_MESSAGES/gbf-1.mo
-share/locale/ca/LC_MESSAGES/gbf-1.mo
-share/locale/cs/LC_MESSAGES/gbf-1.mo
-share/locale/da/LC_MESSAGES/gbf-1.mo
-share/locale/de/LC_MESSAGES/gbf-1.mo
-share/locale/dz/LC_MESSAGES/gbf-1.mo
-share/locale/el/LC_MESSAGES/gbf-1.mo
-share/locale/en_CA/LC_MESSAGES/gbf-1.mo
-share/locale/en_GB/LC_MESSAGES/gbf-1.mo
-share/locale/es/LC_MESSAGES/gbf-1.mo
-share/locale/et/LC_MESSAGES/gbf-1.mo
-share/locale/eu/LC_MESSAGES/gbf-1.mo
-share/locale/fi/LC_MESSAGES/gbf-1.mo
-share/locale/fr/LC_MESSAGES/gbf-1.mo
-share/locale/gl/LC_MESSAGES/gbf-1.mo
-share/locale/gu/LC_MESSAGES/gbf-1.mo
-share/locale/he/LC_MESSAGES/gbf-1.mo
-share/locale/hi/LC_MESSAGES/gbf-1.mo
-share/locale/hr/LC_MESSAGES/gbf-1.mo
-share/locale/hu/LC_MESSAGES/gbf-1.mo
-share/locale/it/LC_MESSAGES/gbf-1.mo
-share/locale/ja/LC_MESSAGES/gbf-1.mo
-share/locale/ko/LC_MESSAGES/gbf-1.mo
-share/locale/lt/LC_MESSAGES/gbf-1.mo
-share/locale/lv/LC_MESSAGES/gbf-1.mo
-share/locale/mk/LC_MESSAGES/gbf-1.mo
-share/locale/ml/LC_MESSAGES/gbf-1.mo
-share/locale/mr/LC_MESSAGES/gbf-1.mo
-share/locale/ms/LC_MESSAGES/gbf-1.mo
-share/locale/nb/LC_MESSAGES/gbf-1.mo
-share/locale/ne/LC_MESSAGES/gbf-1.mo
-share/locale/nl/LC_MESSAGES/gbf-1.mo
-share/locale/nn/LC_MESSAGES/gbf-1.mo
-share/locale/oc/LC_MESSAGES/gbf-1.mo
-share/locale/pa/LC_MESSAGES/gbf-1.mo
-share/locale/pl/LC_MESSAGES/gbf-1.mo
-share/locale/pt/LC_MESSAGES/gbf-1.mo
-share/locale/pt_BR/LC_MESSAGES/gbf-1.mo
-share/locale/ru/LC_MESSAGES/gbf-1.mo
-share/locale/rw/LC_MESSAGES/gbf-1.mo
-share/locale/si/LC_MESSAGES/gbf-1.mo
-share/locale/sk/LC_MESSAGES/gbf-1.mo
-share/locale/sl/LC_MESSAGES/gbf-1.mo
-share/locale/sq/LC_MESSAGES/gbf-1.mo
-share/locale/sr/LC_MESSAGES/gbf-1.mo
-share/locale/sr@latin/LC_MESSAGES/gbf-1.mo
-share/locale/sv/LC_MESSAGES/gbf-1.mo
-share/locale/th/LC_MESSAGES/gbf-1.mo
-share/locale/tr/LC_MESSAGES/gbf-1.mo
-share/locale/uk/LC_MESSAGES/gbf-1.mo
-share/locale/vi/LC_MESSAGES/gbf-1.mo
-share/locale/zh_CN/LC_MESSAGES/gbf-1.mo
-share/locale/zh_HK/LC_MESSAGES/gbf-1.mo
-share/locale/zh_TW/LC_MESSAGES/gbf-1.mo
-share/pixmaps/gbf-build.png
-share/pixmaps/gbf-install.png
-@dirrm share/gnome-build/glade
-@dirrm share/gnome-build/GBF
-@dirrm share/gnome-build
-@dirrm lib/gnome-build-1.0/backends
-@dirrm lib/gnome-build-1.0
-@dirrm include/gnome-build-1.0/gbf
-@dirrm include/gnome-build-1.0
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@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
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index efc81d33d5dc..9ad6ec753637 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-common/Makefile,v 1.10 2008/09/27 01:52:59 mezz Exp $
+# $MCom: ports/devel/gnome-common/Makefile,v 1.12 2009/03/20 00:12:35 kwm Exp $
#
PORTNAME= gnome-common
-PORTVERSION= 2.24.0
+PORTVERSION= 2.26.0
CATEGORIES= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo
index dea6ccade4f9..e580c92f4826 100644
--- a/devel/gnome-common/distinfo
+++ b/devel/gnome-common/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-common-2.24.0.tar.bz2) = f72230d19ab9f2fa8923dcb078c69e9a
-SHA256 (gnome2/gnome-common-2.24.0.tar.bz2) = e36fc07118e9d3cc0a4808cfbc6bfbd03ab5ba1ce0a311df9573dbbc0d189bac
-SIZE (gnome2/gnome-common-2.24.0.tar.bz2) = 64560
+MD5 (gnome2/gnome-common-2.26.0.tar.bz2) = 196daa38cb21d91da1d6ec085f1e158b
+SHA256 (gnome2/gnome-common-2.26.0.tar.bz2) = f6233ee73886c5ac31890c1a9b9f216e5f14558467dea7b0a61ef3c4cf51d84d
+SIZE (gnome2/gnome-common-2.26.0.tar.bz2) = 69278
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 31a9fc1a89e3..b4e5b00bf6f2 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.29 2008/09/22 11:45:51 kwm Exp $
+# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.31 2009/03/17 15:22:21 kwm Exp $
#
PORTNAME= gnome-vfsmm
-PORTVERSION= 2.24.0
+PORTVERSION= 2.26.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-vfsmm/distinfo b/devel/gnome-vfsmm/distinfo
index 857e752d8804..9521614ddb65 100644
--- a/devel/gnome-vfsmm/distinfo
+++ b/devel/gnome-vfsmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfsmm-2.24.0.tar.bz2) = f02257451583832c4d67f4accba7ad62
-SHA256 (gnome2/gnome-vfsmm-2.24.0.tar.bz2) = ab2fd9067d631254543f5dd33edf0649983e53073cfc697ce7de5157d4ba80ae
-SIZE (gnome2/gnome-vfsmm-2.24.0.tar.bz2) = 359035
+MD5 (gnome2/gnome-vfsmm-2.26.0.tar.bz2) = d27d34b6a8722c557366729071c1baab
+SHA256 (gnome2/gnome-vfsmm-2.26.0.tar.bz2) = d6a89fc82238bbfd6d3f7e44bcaee73dc197be98635be482a2d2df38ec0446d3
+SIZE (gnome2/gnome-vfsmm-2.26.0.tar.bz2) = 628670
diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile
index 653996967706..6fa5ce4d49f5 100644
--- a/devel/gnome2-hacker-tools/Makefile
+++ b/devel/gnome2-hacker-tools/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome2-hacker-tools/Makefile,v 1.45 2007/09/19 23:27:28 marcus Exp $
+# $MCom: ports/devel/gnome2-hacker-tools/Makefile,v 1.47 2009/03/01 08:15:25 marcus Exp $
#
PORTREVISION= 0
@@ -22,7 +22,8 @@ RUN_DEPENDS= mlview:${PORTSDIR}/editors/mlview \
gtranslator:${PORTSDIR}/devel/gtranslator \
regexxer:${PORTSDIR}/devel/regexxer \
anjuta:${PORTSDIR}/devel/anjuta \
- accerciser:${PORTSDIR}/accessibility/accerciser
+ accerciser:${PORTSDIR}/accessibility/accerciser \
+ valac:${PORTSDIR}/lang/vala
MASTERDIR= ${.CURDIR}/../../x11/gnome2
GNOME_SLAVE= yes
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 77a20974ca62..3687e14e7751 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gvfs/Makefile,v 1.37 2009/01/10 01:59:21 mezz Exp $
+# $MCom: ports/devel/gvfs/Makefile,v 1.43 2009/04/03 10:02:13 kwm Exp $
#
PORTNAME= gvfs
-PORTVERSION= 1.0.3
+PORTVERSION= 1.2.1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index a0397c2d0987..5aa52eec0deb 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gvfs-1.0.3.tar.bz2) = a41e8b7d99e390cef8312f7ce5f312a5
-SHA256 (gnome2/gvfs-1.0.3.tar.bz2) = 17eccded6e096208181e2c7625802526112af23f5b2c7b2a672ab9ccff3a55fd
-SIZE (gnome2/gvfs-1.0.3.tar.bz2) = 920742
+MD5 (gnome2/gvfs-1.2.1.tar.bz2) = df8f624587adfabe7009838ce6d8d5fd
+SHA256 (gnome2/gvfs-1.2.1.tar.bz2) = 0e3c3469721ff1d4296bf4af7e1f131201d2dc6a36c772d99e1630f8cce31da2
+SIZE (gnome2/gvfs-1.2.1.tar.bz2) = 1048427
diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure
index d922ddd4565f..a707a133b21d 100644
--- a/devel/gvfs/files/patch-configure
+++ b/devel/gvfs/files/patch-configure
@@ -1,69 +1,6 @@
---- configure.orig 2008-03-28 17:23:44.000000000 -0400
-+++ configure 2008-03-28 17:24:02.000000000 -0400
-@@ -24617,7 +24617,7 @@ if test "x$enable_http" != "xno"; then
- msg_http=yes
- fi
-
-- if test "x$msg_http" == "xyes"; then
-+ if test "x$msg_http" = "xyes"; then
-
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for HTTP" >&5
-@@ -24885,7 +24885,7 @@ if test "x$enable_fuse" != "xno"; then
- msg_fuse=yes
- fi
-
-- if test "x$msg_fuse" == "xyes"; then
-+ if test "x$msg_fuse" = "xyes"; then
-
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for FUSE" >&5
-@@ -25036,7 +25036,7 @@ if test "x$enable_gconf" != "xno"; then
- msg_gconf=yes
- fi
-
-- if test "x$msg_gconf" == "xyes"; then
-+ if test "x$msg_gconf" = "xyes"; then
-
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for GCONF" >&5
-@@ -25189,7 +25189,7 @@ if test "x$enable_hal" != "xno"; then
- msg_hal=yes
- fi
-
-- if test "x$msg_hal" == "xyes"; then
-+ if test "x$msg_hal" = "xyes"; then
-
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for HAL" >&5
-@@ -25371,7 +25371,7 @@ if test $ac_cv_lib_hal_libhal_get_all_de
- have_hal_fast_init=yes
- fi
-
-- if test "x$have_hal_fast_init" == "xyes"; then
-+ if test "x$have_hal_fast_init" = "xyes"; then
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_HAL_FAST_INIT 1
-@@ -25412,7 +25412,7 @@ if test "x$enable_cdda" != "xno"; then
- msg_cdda=yes
- fi
-
-- if test "x$msg_cdda" == "xyes"; then
-+ if test "x$msg_cdda" = "xyes"; then
-
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for CDDA" >&5
-@@ -25772,7 +25772,7 @@ else
- fi
-
-
-- if test "x$msg_obexftp" == "xyes" -a "x$have_expat" == "xtrue"; then
-+ if test "x$msg_obexftp" = "xyes" -a "x$have_expat" = "xtrue"; then
-
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for OBEXFTP" >&5
-@@ -25936,13 +25936,16 @@ fi
+--- configure.orig 2009-03-02 17:50:05.000000000 -0500
++++ configure 2009-03-02 17:50:44.000000000 -0500
+@@ -26973,6 +26973,9 @@ fi
*-linux*)
use_gphoto2=yes
;;
@@ -73,21 +10,3 @@
*)
use_gphoto2=no
;;
- esac
-
-- if test "x$msg_gphoto2" == "xyes"; then
-- if test "x$use_gphoto2" == "xyes"; then
-+ if test "x$msg_gphoto2" = "xyes"; then
-+ if test "x$use_gphoto2" = "xyes"; then
-
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for GPHOTO2" >&5
-@@ -26098,7 +26101,7 @@ if test "x$enable_keyring" != "xno"; the
- msg_keyring=yes
- fi
-
-- if test "x$msg_keyring" == "xyes"; then
-+ if test "x$msg_keyring" = "xyes"; then
-
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for KEYRING" >&5
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
index 8670f6588266..a10939f60b43 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -23,6 +23,9 @@ lib/gio/modules/libgioremote-volume-monitor.la
lib/gio/modules/libgioremote-volume-monitor.so
lib/gio/modules/libgvfsdbus.la
lib/gio/modules/libgvfsdbus.so
+lib/libgvfscommon-dnssd.la
+lib/libgvfscommon-dnssd.so
+lib/libgvfscommon-dnssd.so.0
lib/libgvfscommon.la
lib/libgvfscommon.so
lib/libgvfscommon.so.0
@@ -53,6 +56,7 @@ share/gvfs/mounts/burn.mount
%%CDDA%%share/gvfs/mounts/cdda.mount
share/gvfs/mounts/computer.mount
share/gvfs/mounts/dav.mount
+share/gvfs/mounts/dav+sd.mount
share/gvfs/mounts/dns-sd.mount
share/gvfs/mounts/ftp.mount
%%GPHOTO2%%share/gvfs/mounts/gphoto2.mount
@@ -66,6 +70,7 @@ share/gvfs/mounts/trash.mount
%%GPHOTO2%%share/gvfs/remote-volume-monitors/gphoto2.monitor
share/gvfs/remote-volume-monitors/hal.monitor
share/locale/ar/LC_MESSAGES/gvfs.mo
+share/locale/as/LC_MESSAGES/gvfs.mo
share/locale/be@latin/LC_MESSAGES/gvfs.mo
share/locale/bg/LC_MESSAGES/gvfs.mo
share/locale/bn_IN/LC_MESSAGES/gvfs.mo
@@ -92,16 +97,19 @@ share/locale/kn/LC_MESSAGES/gvfs.mo
share/locale/ko/LC_MESSAGES/gvfs.mo
share/locale/ku/LC_MESSAGES/gvfs.mo
share/locale/lt/LC_MESSAGES/gvfs.mo
+share/locale/lv/LC_MESSAGES/gvfs.mo
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/nl/LC_MESSAGES/gvfs.mo
share/locale/nn/LC_MESSAGES/gvfs.mo
+share/locale/or/LC_MESSAGES/gvfs.mo
share/locale/pa/LC_MESSAGES/gvfs.mo
share/locale/pl/LC_MESSAGES/gvfs.mo
share/locale/pt/LC_MESSAGES/gvfs.mo
share/locale/pt_BR/LC_MESSAGES/gvfs.mo
+share/locale/ro/LC_MESSAGES/gvfs.mo
share/locale/ru/LC_MESSAGES/gvfs.mo
share/locale/sk/LC_MESSAGES/gvfs.mo
share/locale/sl/LC_MESSAGES/gvfs.mo
@@ -138,3 +146,5 @@ share/locale/zh_TW/LC_MESSAGES/gvfs.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 26dd539a593a..c10af654cf46 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.45 2009/01/10 01:59:21 mezz Exp $
+# $MCom: ports/devel/libgtop/Makefile,v 1.47 2009/03/02 00:41:25 marcus Exp $
#
PORTNAME= libgtop
-PORTVERSION= 2.24.4
+PORTVERSION= 2.26.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index 00ef59d3adf6..6bcefcbda493 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgtop-2.24.4.tar.bz2) = cc2a6fb2c3f7d62ddb0e4040ad82cc5b
-SHA256 (gnome2/libgtop-2.24.4.tar.bz2) = ab7bd7f508e0f2059afedee51c6b0e3efca94d3b72faaa67b01154d3a7e4e470
-SIZE (gnome2/libgtop-2.24.4.tar.bz2) = 765047
+MD5 (gnome2/libgtop-2.26.0.tar.bz2) = a51ff49eddcce4573f7385e4be33158a
+SHA256 (gnome2/libgtop-2.26.0.tar.bz2) = acc11d54614722a752a44237b5e11e9d6508da82c6d7ad25bf97156f5e28a7fd
+SIZE (gnome2/libgtop-2.26.0.tar.bz2) = 791512
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index fa5b9d29dda8..cbba908c8e37 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -133,6 +133,7 @@ share/locale/ka/LC_MESSAGES/libgtop-2.0.mo
share/locale/ko/LC_MESSAGES/libgtop-2.0.mo
share/locale/ku/LC_MESSAGES/libgtop-2.0.mo
share/locale/ky/LC_MESSAGES/libgtop-2.0.mo
+share/locale/la/LC_MESSAGES/libgtop-2.0.mo
share/locale/lt/LC_MESSAGES/libgtop-2.0.mo
share/locale/lv/LC_MESSAGES/libgtop-2.0.mo
share/locale/mg/LC_MESSAGES/libgtop-2.0.mo
@@ -192,6 +193,8 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
@dirrmtry share/locale/mi
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/la/LC_MESSAGES
+@dirrmtry share/locale/la
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index 133c6c239a43..4da57bc26d5c 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libical
-PORTVERSION= 0.42
+PORTVERSION= 0.43
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= freeassociation
diff --git a/devel/libical/distinfo b/devel/libical/distinfo
index 52c8171d353a..de9dfdee215d 100644
--- a/devel/libical/distinfo
+++ b/devel/libical/distinfo
@@ -1,3 +1,3 @@
-MD5 (libical-0.42.tar.gz) = 34395dcc0c0f950f337f7bf183b5ac1a
-SHA256 (libical-0.42.tar.gz) = c5f6458609851501684b3a95bbe36d7565c600eb435d469e107580d8d13c9451
-SIZE (libical-0.42.tar.gz) = 1145477
+MD5 (libical-0.43.tar.gz) = 5f0a1feb60894d0be537aefea5647474
+SHA256 (libical-0.43.tar.gz) = 099f3e29a864de324477983eefaf17a4ef3b4ec8f075f95384db1ac67b6663a6
+SIZE (libical-0.43.tar.gz) = 1145724
diff --git a/devel/libical/files/patch-configure b/devel/libical/files/patch-configure
deleted file mode 100644
index 24b679afd1eb..000000000000
--- a/devel/libical/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig 2007-02-28 05:35:52.000000000 +0800
-+++ configure 2008-02-08 22:57:04.000000000 +0800
-@@ -19553,6 +19553,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/devel/libical/pkg-plist b/devel/libical/pkg-plist
index ae4cdad0a078..e944e299aa44 100644
--- a/devel/libical/pkg-plist
+++ b/devel/libical/pkg-plist
@@ -47,15 +47,15 @@ include/libical/vobject.h
lib/libical.a
lib/libical.la
lib/libical.so
-lib/libical.so.42
+lib/libical.so.43
lib/libicalss.a
lib/libicalss.la
lib/libicalss.so
-lib/libicalss.so.42
+lib/libicalss.so.43
lib/libicalvcal.a
lib/libicalvcal.la
lib/libicalvcal.so
-lib/libicalvcal.so.42
+lib/libicalvcal.so.43
libdata/pkgconfig/libical.pc
share/libical/zoneinfo/Africa/Abidjan.ics
share/libical/zoneinfo/Africa/Accra.ics
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index ddd9c9080129..00fe7d15e043 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libsoup/Makefile,v 1.52 2008/11/25 16:22:57 marcus Exp $
+# $MCom: ports/devel/libsoup/Makefile,v 1.58 2009/03/21 02:38:40 marcus Exp $
#
PORTNAME= libsoup
-PORTVERSION= 2.24.3
+PORTVERSION= 2.26.0
+PORTREVISION= 1
PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
@@ -20,9 +21,11 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
-LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
+LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
+ proxy.0:${PORTSDIR}/net/libproxy \
+ sqlite3.8:${PORTSDIR}/databases/sqlite3
-USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack
+USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack gconf2
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
@@ -47,6 +50,10 @@ pre-everything::
@${ECHO_MSG} " WITHOUT_SSL Disable GnuTLS SSL support"
@${ECHO_MSG} ""
+post-patch:
+ @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.post.mk>
.endif
diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo
index 61e1b4df0e87..a34d4ff800ef 100644
--- a/devel/libsoup/distinfo
+++ b/devel/libsoup/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libsoup-2.24.3.tar.bz2) = 118967f097a7e1e9d5023f1f06e0b65a
-SHA256 (gnome2/libsoup-2.24.3.tar.bz2) = 30055988d990f0f4db4dcffd5088115f1065a6fd7c22b555686449628375376b
-SIZE (gnome2/libsoup-2.24.3.tar.bz2) = 661415
+MD5 (gnome2/libsoup-2.26.0.tar.bz2) = 9df9d2b3304213641d3214a774d75ee1
+SHA256 (gnome2/libsoup-2.26.0.tar.bz2) = 47b749b20717df24393c83adcce9a3a10f0690517c18da8d0a1ddcb410a0ac1d
+SIZE (gnome2/libsoup-2.26.0.tar.bz2) = 736527
diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist
index f753686dcd54..7d6d2a3ed6bf 100644
--- a/devel/libsoup/pkg-plist
+++ b/devel/libsoup/pkg-plist
@@ -3,6 +3,7 @@ include/libsoup-%%VERSION%%/libsoup/soup-auth-domain-basic.h
include/libsoup-%%VERSION%%/libsoup/soup-auth-domain-digest.h
include/libsoup-%%VERSION%%/libsoup/soup-auth-domain.h
include/libsoup-%%VERSION%%/libsoup/soup-auth.h
+include/libsoup-%%VERSION%%/libsoup/soup-cookie-jar-text.h
include/libsoup-%%VERSION%%/libsoup/soup-cookie-jar.h
include/libsoup-%%VERSION%%/libsoup/soup-cookie.h
include/libsoup-%%VERSION%%/libsoup/soup-date.h
@@ -15,7 +16,9 @@ include/libsoup-%%VERSION%%/libsoup/soup-message-headers.h
include/libsoup-%%VERSION%%/libsoup/soup-message.h
include/libsoup-%%VERSION%%/libsoup/soup-method.h
include/libsoup-%%VERSION%%/libsoup/soup-misc.h
+include/libsoup-%%VERSION%%/libsoup/soup-multipart.h
include/libsoup-%%VERSION%%/libsoup/soup-portability.h
+include/libsoup-%%VERSION%%/libsoup/soup-proxy-resolver.h
include/libsoup-%%VERSION%%/libsoup/soup-server.h
include/libsoup-%%VERSION%%/libsoup/soup-session-async.h
include/libsoup-%%VERSION%%/libsoup/soup-session-feature.h
@@ -28,10 +31,20 @@ include/libsoup-%%VERSION%%/libsoup/soup-uri.h
include/libsoup-%%VERSION%%/libsoup/soup-value-utils.h
include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc.h
include/libsoup-%%VERSION%%/libsoup/soup.h
+include/libsoup-gnome-%%VERSION%%/libsoup/soup-cookie-jar-sqlite.h
+include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome-features.h
+include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome.h
lib/libsoup-%%VERSION%%.a
lib/libsoup-%%VERSION%%.la
lib/libsoup-%%VERSION%%.so
lib/libsoup-%%VERSION%%.so.1
+lib/libsoup-gnome-%%VERSION%%.a
+lib/libsoup-gnome-%%VERSION%%.la
+lib/libsoup-gnome-%%VERSION%%.so
+lib/libsoup-gnome-%%VERSION%%.so.1
libdata/pkgconfig/libsoup-%%VERSION%%.pc
+libdata/pkgconfig/libsoup-gnome-%%VERSION%%.pc
+@dirrm include/libsoup-gnome-%%VERSION%%/libsoup
+@dirrm include/libsoup-gnome-%%VERSION%%
@dirrm include/libsoup-%%VERSION%%/libsoup
@dirrm include/libsoup-%%VERSION%%
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 5581f112acbd..7dcb9f3caed5 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/gedit-plugins/Makefile,v 1.33 2008/10/26 20:28:27 marcus Exp $
+# $MCom: ports/editors/gedit-plugins/Makefile,v 1.36 2009/03/17 13:37:37 kwm Exp $
#
PORTNAME= gedit-plugins
-PORTVERSION= 2.22.5
-PORTREVISION= 1
+PORTVERSION= 2.26.0
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -33,6 +32,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= gedit-show-tabbar-plugin.schemas
+OPTIONS= PYTHON "Build plugins that depend on python" off
+
.if defined(PACKAGE_BUILDING)
.undef WITHOUT_GNOME
WITH_GNOME= yes
@@ -40,7 +41,7 @@ WITH_GNOME= yes
.include <bsd.port.pre.mk>
-.if ${HAVE_GNOME:Mpygtksourceview}!="" && ${ARCH}!="sparc64"
+.if ${HAVE_GNOME:Mpygtksourceview}!="" && ${ARCH}!="sparc64" || defined(WITH_PYTHON)
USE_PYTHON= yes
.include "${PORTSDIR}/Mk/bsd.python.mk"
USE_GNOME+= pygtksourceview
diff --git a/editors/gedit-plugins/distinfo b/editors/gedit-plugins/distinfo
index 875e28337cd6..89472e6585d6 100644
--- a/editors/gedit-plugins/distinfo
+++ b/editors/gedit-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-plugins-2.22.5.tar.bz2) = c2104d56b7aa78e14395648f8e235306
-SHA256 (gnome2/gedit-plugins-2.22.5.tar.bz2) = 98cd453525bcb53e725f8e49d5fa387019331e7df2d37101519d177141fbced9
-SIZE (gnome2/gedit-plugins-2.22.5.tar.bz2) = 592942
+MD5 (gnome2/gedit-plugins-2.26.0.tar.bz2) = 9549182efbc98f7601b281fd217061ec
+SHA256 (gnome2/gedit-plugins-2.26.0.tar.bz2) = 548c1570195118d31eaf1ef96ddf39e80e5e29621540e4e6863b8ed1285a4d80
+SIZE (gnome2/gedit-plugins-2.26.0.tar.bz2) = 546291
diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist
index 97d3b375a387..fac2fa52f349 100644
--- a/editors/gedit-plugins/pkg-plist
+++ b/editors/gedit-plugins/pkg-plist
@@ -1,3 +1,4 @@
+lib/gedit-2/plugins/bookmarks.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/bracketcompletion.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/bracketcompletion.py
%%PYTHON%%lib/gedit-2/plugins/bracketcompletion.pyc
@@ -11,11 +12,7 @@ lib/gedit-2/plugins/charmap.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/colorpicker.py
%%PYTHON%%lib/gedit-2/plugins/colorpicker.pyc
%%PYTHON%%lib/gedit-2/plugins/colorpicker.pyo
-%%PYTHON%%lib/gedit-2/plugins/drawspaces.gedit-plugin
-%%PYTHON%%lib/gedit-2/plugins/drawspaces.glade
-%%PYTHON%%lib/gedit-2/plugins/drawspaces.py
-%%PYTHON%%lib/gedit-2/plugins/drawspaces.pyc
-%%PYTHON%%lib/gedit-2/plugins/drawspaces.pyo
+lib/gedit-2/plugins/drawspaces.gedit-plugin
lib/gedit-2/plugins/gpdefs.py
lib/gedit-2/plugins/gpdefs.pyc
lib/gedit-2/plugins/gpdefs.pyo
@@ -23,9 +20,15 @@ lib/gedit-2/plugins/gpdefs.pyo
%%PYTHON%%lib/gedit-2/plugins/joinlines.py
%%PYTHON%%lib/gedit-2/plugins/joinlines.pyc
%%PYTHON%%lib/gedit-2/plugins/joinlines.pyo
+lib/gedit-2/plugins/libbookmarks.a
+lib/gedit-2/plugins/libbookmarks.la
+lib/gedit-2/plugins/libbookmarks.so
lib/gedit-2/plugins/libcharmap.a
lib/gedit-2/plugins/libcharmap.la
lib/gedit-2/plugins/libcharmap.so
+lib/gedit-2/plugins/libdrawspaces.a
+lib/gedit-2/plugins/libdrawspaces.la
+lib/gedit-2/plugins/libdrawspaces.so
lib/gedit-2/plugins/libshowtabbar.a
lib/gedit-2/plugins/libshowtabbar.la
lib/gedit-2/plugins/libshowtabbar.so
@@ -36,7 +39,6 @@ lib/gedit-2/plugins/libshowtabbar.so
%%PYTHON%%lib/gedit-2/plugins/sessionsaver/dialogs.py
%%PYTHON%%lib/gedit-2/plugins/sessionsaver/dialogs.pyc
%%PYTHON%%lib/gedit-2/plugins/sessionsaver/dialogs.pyo
-%%PYTHON%%lib/gedit-2/plugins/sessionsaver/sessionsaver.glade
%%PYTHON%%lib/gedit-2/plugins/sessionsaver/store.py
%%PYTHON%%lib/gedit-2/plugins/sessionsaver/store.pyc
%%PYTHON%%lib/gedit-2/plugins/sessionsaver/store.pyo
@@ -49,6 +51,9 @@ lib/gedit-2/plugins/showtabbar.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/terminal.py
%%PYTHON%%lib/gedit-2/plugins/terminal.pyc
%%PYTHON%%lib/gedit-2/plugins/terminal.pyo
+share/gedit-2/plugins/bookmarks/bookmark.png
+share/gedit-2/plugins/drawspaces/drawspaces.ui
+%%PYTHON%%share/gedit-2/plugins/sessionsaver/sessionsaver.ui
share/locale/ar/LC_MESSAGES/gedit-plugins.mo
share/locale/az/LC_MESSAGES/gedit-plugins.mo
share/locale/be/LC_MESSAGES/gedit-plugins.mo
@@ -113,6 +118,11 @@ share/locale/zh_CN/LC_MESSAGES/gedit-plugins.mo
share/locale/zh_HK/LC_MESSAGES/gedit-plugins.mo
share/locale/zh_TW/LC_MESSAGES/gedit-plugins.mo
%%PYTHON%%@dirrm lib/gedit-2/plugins/sessionsaver
+@dirrm share/gedit-2/plugins/sessionsaver
+@dirrm share/gedit-2/plugins/drawspaces
+@dirrm share/gedit-2/plugins/bookmarks
+@dirrm share/gedit-2/plugins
+@dirrm share/gedit-2
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/rw/LC_MESSAGES
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 92aa6d158841..636185cd11ee 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/gedit/Makefile,v 1.91 2008/11/25 00:59:25 marcus Exp $
+# $MCom: ports/editors/gedit/Makefile,v 1.97 2009/03/16 08:01:49 kwm Exp $
#
PORTNAME= gedit
-PORTVERSION= 2.24.3
+PORTVERSION= 2.26.0
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -54,15 +54,11 @@ CONFIGURE_ARGS+=--disable-python
PLIST_SUB+= PYTHON="@comment "
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|make|${GMAKE}|g' \
- ${WRKSRC}/bindings/python/Makefile.in
-
-pre-build:
- ${MKDIR} ${WRKSRC}/bindings/python/.deps
-.for ff in gedit_la-gedit.Plo gedit_la-geditcommands.Plo gedit_la-geditutils.Plo
- ${TOUCH} ${WRKSRC}/bindings/python/.deps/${ff}
-.endfor
+#pre-build:
+# ${MKDIR} ${WRKSRC}/bindings/python/.deps
+#.for ff in gedit_la-gedit.Plo gedit_la-geditcommands.Plo gedit_la-geditutils.Plo
+# ${TOUCH} ${WRKSRC}/bindings/python/.deps/${ff}
+#.endfor
post-install:
@-update-desktop-database
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index c3d0f1c885ea..14b1f2704313 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-2.24.3.tar.bz2) = 48ed6c5c156791cffc219a7d7390da57
-SHA256 (gnome2/gedit-2.24.3.tar.bz2) = 37f5dc0df169a2e8756b1c29e9283a323a1ec132888493a07c8d4e98c29b16f2
-SIZE (gnome2/gedit-2.24.3.tar.bz2) = 4078641
+MD5 (gnome2/gedit-2.26.0.tar.bz2) = 577b30e6f17f6dce0af7be3e522d6058
+SHA256 (gnome2/gedit-2.26.0.tar.bz2) = c1fde28ba54e2b6b9457b7a21e40f88989428838d2ef6e9fbd496955442d3552
+SIZE (gnome2/gedit-2.26.0.tar.bz2) = 4198506
diff --git a/editors/gedit/files/patch-configure b/editors/gedit/files/patch-configure
deleted file mode 100644
index 6bfadb0af650..000000000000
--- a/editors/gedit/files/patch-configure
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.orig Wed Dec 14 09:07:01 2005
-+++ configure Wed Dec 14 09:07:01 2005
-@@ -22216,6 +22216,7 @@
- if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ LIBS="-lintl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22304,6 +22305,7 @@
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-+LIBS="-lintl $LIBS"
-
- fi
- done
diff --git a/editors/gedit/files/patch-gedit_gedit-module.c b/editors/gedit/files/patch-gedit_gedit-module.c
deleted file mode 100644
index b12781557ee5..000000000000
--- a/editors/gedit/files/patch-gedit_gedit-module.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gedit/gedit-module.c.orig Fri Jan 6 12:19:53 2006
-+++ gedit/gedit-module.c Fri Jan 6 12:20:21 2006
-@@ -142,7 +142,7 @@ gedit_module_unload (GTypeModule *gmodul
-
- gedit_debug_message (DEBUG_PLUGINS, "Unloading %s", module->path);
-
-- g_module_close (module->library);
-+ /*g_module_close (module->library);*/
-
- module->library = NULL;
- module->type = 0;
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index 4648fe458b3a..156f54593334 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -9,18 +9,29 @@ include/gedit-%%VERSION%%/gedit/gedit-encodings.h
include/gedit-%%VERSION%%/gedit/gedit-file-chooser-dialog.h
include/gedit-%%VERSION%%/gedit/gedit-help.h
include/gedit-%%VERSION%%/gedit/gedit-message-area.h
+include/gedit-%%VERSION%%/gedit/gedit-message-bus.h
+include/gedit-%%VERSION%%/gedit/gedit-message-type.h
+include/gedit-%%VERSION%%/gedit/gedit-message.h
include/gedit-%%VERSION%%/gedit/gedit-metadata-manager.h
include/gedit-%%VERSION%%/gedit/gedit-notebook.h
include/gedit-%%VERSION%%/gedit/gedit-panel.h
+include/gedit-%%VERSION%%/gedit/gedit-plugin-loader.h
include/gedit-%%VERSION%%/gedit/gedit-plugin.h
include/gedit-%%VERSION%%/gedit/gedit-prefs-manager-app.h
include/gedit-%%VERSION%%/gedit/gedit-prefs-manager.h
include/gedit-%%VERSION%%/gedit/gedit-progress-message-area.h
include/gedit-%%VERSION%%/gedit/gedit-statusbar.h
+include/gedit-%%VERSION%%/gedit/gedit-status-combo-box.h
include/gedit-%%VERSION%%/gedit/gedit-tab.h
include/gedit-%%VERSION%%/gedit/gedit-utils.h
include/gedit-%%VERSION%%/gedit/gedit-view.h
include/gedit-%%VERSION%%/gedit/gedit-window.h
+lib/gedit-2/plugin-loaders/libcloader.a
+lib/gedit-2/plugin-loaders/libcloader.la
+lib/gedit-2/plugin-loaders/libcloader.so
+%%PYTHON%%lib/gedit-2/plugin-loaders/libpythonloader.a
+%%PYTHON%%lib/gedit-2/plugin-loaders/libpythonloader.la
+%%PYTHON%%lib/gedit-2/plugin-loaders/libpythonloader.so
lib/gedit-2/plugins/changecase.gedit-plugin
lib/gedit-2/plugins/docinfo.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/externaltools.gedit-plugin
@@ -45,8 +56,6 @@ lib/gedit-2/plugins/docinfo.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.py
%%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.pyc
%%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.pyo
-%%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.ui
-%%PYTHON%%lib/gedit-2/plugins/externaltools/tools.ui
lib/gedit-2/plugins/filebrowser.gedit-plugin
lib/gedit-2/plugins/indent.gedit-plugin
lib/gedit-2/plugins/libchangecase.a
@@ -84,6 +93,9 @@ lib/gedit-2/plugins/modelines.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.py
%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.pyc
%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.pyo
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/config.py
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/config.pyc
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/config.pyo
%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.py
%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.pyc
%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.pyo
@@ -131,7 +143,6 @@ lib/gedit-2/plugins/sample.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/snippets/__init__.py
%%PYTHON%%lib/gedit-2/plugins/snippets/__init__.pyc
%%PYTHON%%lib/gedit-2/plugins/snippets/__init__.pyo
-%%PYTHON%%lib/gedit-2/plugins/snippets/snippets.ui
lib/gedit-2/plugins/sort.gedit-plugin
lib/gedit-2/plugins/spell.gedit-plugin
lib/gedit-2/plugins/taglist.gedit-plugin
@@ -143,7 +154,9 @@ share/applications/gedit.desktop
%%DOCSDIR%%/GeditDocument.html
%%DOCSDIR%%/GeditEncodingsOptionMenu.html
%%DOCSDIR%%/GeditFileChooserDialog.html
+%%DOCSDIR%%/GeditMessage.html
%%DOCSDIR%%/GeditMessageArea.html
+%%DOCSDIR%%/GeditMessageBus.html
%%DOCSDIR%%/GeditNotebook.html
%%DOCSDIR%%/GeditPanel.html
%%DOCSDIR%%/GeditPlugin.html
@@ -153,6 +166,7 @@ share/applications/gedit.desktop
%%DOCSDIR%%/GeditView.html
%%DOCSDIR%%/GeditWindow.html
%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/gedit-GeditMessageType.html
%%DOCSDIR%%/gedit-GeditPrintJob.html
%%DOCSDIR%%/gedit-GeditPrintJobPreview.html
%%DOCSDIR%%/gedit-gedit-convert.html
@@ -176,11 +190,16 @@ share/gedit-2/icons/gedit-plugin.png
share/gedit-2/logo/gedit-logo.png
@exec mkdir -p %D/share/gedit-2/plugins/changecase
share/gedit-2/plugins/docinfo/docinfo.ui
+%%PYTHON%%share/gedit-2/plugins/externaltools/ui/tools.ui
+%%PYTHON%%share/gedit-2/plugins/externaltools/ui/outputpanel.ui
share/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml
@exec mkdir -p %D/share/gedit-2/plugins/indent
+share/gedit-2/plugins/modelines/language-mappings
+%%PYTHON%%share/gedit-2/plugins/pythonconsole/ui/config.ui
@exec mkdir -p %D/share/gedit-2/plugins/sample
-%%PYTHON%%share/gedit-2/plugins/snippets/c++.xml
%%PYTHON%%share/gedit-2/plugins/snippets/c.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/chdr.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/cpp.xml
%%PYTHON%%share/gedit-2/plugins/snippets/css.xml
%%PYTHON%%share/gedit-2/plugins/snippets/docbook.xml
%%PYTHON%%share/gedit-2/plugins/snippets/global.xml
@@ -198,19 +217,20 @@ share/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml
%%PYTHON%%share/gedit-2/plugins/snippets/sh.xml
%%PYTHON%%share/gedit-2/plugins/snippets/snippets.xml
%%PYTHON%%share/gedit-2/plugins/snippets/tcl.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/ui/snippets.ui
%%PYTHON%%share/gedit-2/plugins/snippets/xml.xml
share/gedit-2/plugins/sort/sort.ui
share/gedit-2/plugins/spell/languages-dialog.ui
share/gedit-2/plugins/spell/spell-checker.ui
+share/gedit-2/plugins/taglist/HTML.tags.gz
+share/gedit-2/plugins/taglist/Latex.tags.gz
+share/gedit-2/plugins/taglist/XSLT.tags.gz
+share/gedit-2/plugins/taglist/XUL.tags.gz
share/gedit-2/plugins/time/time.ui
%%PYTHON%%share/gedit-2/plugins/tools/build
%%PYTHON%%share/gedit-2/plugins/tools/open-terminal-here
%%PYTHON%%share/gedit-2/plugins/tools/remove-trailing-spaces
%%PYTHON%%share/gedit-2/plugins/tools/run-command
-share/gedit-2/taglist/HTML.tags.gz
-share/gedit-2/taglist/Latex.tags.gz
-share/gedit-2/taglist/XSLT.tags.gz
-share/gedit-2/taglist/XUL.tags.gz
share/gedit-2/ui/gedit-encodings-dialog.ui
share/gedit-2/ui/gedit-open-location-dialog.ui
share/gedit-2/ui/gedit-preferences-dialog.ui
@@ -257,10 +277,6 @@ share/gnome/help/gedit/es/figures/gedit_recent_files_menu_icon.png
share/gnome/help/gedit/es/figures/gedit_window.png
share/gnome/help/gedit/es/gedit.xml
share/gnome/help/gedit/es/legal.xml
-share/gnome/help/gedit/eu/figures/gedit_recent_files_menu_icon.png
-share/gnome/help/gedit/eu/figures/gedit_window.png
-share/gnome/help/gedit/eu/gedit.xml
-share/gnome/help/gedit/eu/legal.xml
share/gnome/help/gedit/fi/figures/gedit_format_bold.png
share/gnome/help/gedit/fi/figures/gedit_format_italic.png
share/gnome/help/gedit/fi/figures/gedit_format_strikethrough.png
@@ -325,9 +341,6 @@ share/gnome/help/gedit/pt_BR/figures/gedit_recent_files_menu_icon.png
share/gnome/help/gedit/pt_BR/figures/gedit_window.png
share/gnome/help/gedit/pt_BR/gedit.xml
share/gnome/help/gedit/pt_BR/legal.xml
-share/gnome/help/gedit/ro/figures/gedit_window.png
-share/gnome/help/gedit/ro/gedit.xml
-share/gnome/help/gedit/ro/legal.xml
share/gnome/help/gedit/ru/figures/gedit_format_bold.png
share/gnome/help/gedit/ru/figures/gedit_format_italic.png
share/gnome/help/gedit/ru/figures/gedit_format_strikethrough.png
@@ -344,6 +357,14 @@ share/gnome/help/gedit/sv/figures/gedit_recent_files_menu_icon.png
share/gnome/help/gedit/sv/figures/gedit_window.png
share/gnome/help/gedit/sv/gedit.xml
share/gnome/help/gedit/sv/legal.xml
+share/gnome/help/gedit/th/figures/gedit_format_bold.png
+share/gnome/help/gedit/th/figures/gedit_format_italic.png
+share/gnome/help/gedit/th/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/th/figures/gedit_format_underline.png
+share/gnome/help/gedit/th/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/th/figures/gedit_window.png
+share/gnome/help/gedit/th/gedit.xml
+share/gnome/help/gedit/th/legal.xml
share/gnome/help/gedit/uk/figures/gedit_format_bold.png
share/gnome/help/gedit/uk/figures/gedit_format_italic.png
share/gnome/help/gedit/uk/figures/gedit_format_strikethrough.png
@@ -380,6 +401,7 @@ share/locale/af/LC_MESSAGES/gedit.mo
share/locale/am/LC_MESSAGES/gedit.mo
share/locale/ar/LC_MESSAGES/gedit.mo
share/locale/as/LC_MESSAGES/gedit.mo
+share/locale/ast/LC_MESSAGES/gedit.mo
share/locale/az/LC_MESSAGES/gedit.mo
share/locale/be/LC_MESSAGES/gedit.mo
share/locale/be@latin/LC_MESSAGES/gedit.mo
@@ -468,7 +490,6 @@ share/omf/gedit/gedit-bg.omf
share/omf/gedit/gedit-da.omf
share/omf/gedit/gedit-de.omf
share/omf/gedit/gedit-es.omf
-share/omf/gedit/gedit-eu.omf
share/omf/gedit/gedit-fi.omf
share/omf/gedit/gedit-fr.omf
share/omf/gedit/gedit-hu.omf
@@ -477,9 +498,9 @@ share/omf/gedit/gedit-ja.omf
share/omf/gedit/gedit-ko.omf
share/omf/gedit/gedit-oc.omf
share/omf/gedit/gedit-pt_BR.omf
-share/omf/gedit/gedit-ro.omf
share/omf/gedit/gedit-ru.omf
share/omf/gedit/gedit-sv.omf
+share/omf/gedit/gedit-th.omf
share/omf/gedit/gedit-uk.omf
share/omf/gedit/gedit-zh_CN.omf
share/omf/gedit/gedit-zh_HK.omf
@@ -493,12 +514,12 @@ share/omf/gedit/gedit-zh_TW.omf
@dirrm share/gnome/help/gedit/zh_CN
@dirrm share/gnome/help/gedit/uk/figures
@dirrm share/gnome/help/gedit/uk
+@dirrm share/gnome/help/gedit/th/figures
+@dirrm share/gnome/help/gedit/th
@dirrm share/gnome/help/gedit/sv/figures
@dirrm share/gnome/help/gedit/sv
@dirrm share/gnome/help/gedit/ru/figures
@dirrm share/gnome/help/gedit/ru
-@dirrm share/gnome/help/gedit/ro/figures
-@dirrm share/gnome/help/gedit/ro
@dirrm share/gnome/help/gedit/pt_BR/figures
@dirrm share/gnome/help/gedit/pt_BR
@dirrm share/gnome/help/gedit/oc/figures
@@ -515,8 +536,6 @@ share/omf/gedit/gedit-zh_TW.omf
@dirrm share/gnome/help/gedit/fr
@dirrm share/gnome/help/gedit/fi/figures
@dirrm share/gnome/help/gedit/fi
-@dirrm share/gnome/help/gedit/eu/figures
-@dirrm share/gnome/help/gedit/eu
@dirrm share/gnome/help/gedit/es/figures
@dirrm share/gnome/help/gedit/es
@dirrm share/gnome/help/gedit/de/figures
@@ -529,16 +548,22 @@ share/omf/gedit/gedit-zh_TW.omf
@dirrm share/gnome/help/gedit/C
@dirrm share/gnome/help/gedit
@dirrm share/gedit-2/ui
-@dirrm share/gedit-2/taglist
%%PYTHON%%@dirrm share/gedit-2/plugins/tools
@dirrm share/gedit-2/plugins/time
+@dirrm share/gedit-2/plugins/taglist
@dirrm share/gedit-2/plugins/spell
@dirrm share/gedit-2/plugins/sort
+%%PYTHON%%@dirrm share/gedit-2/plugins/snippets/ui
%%PYTHON%%@dirrm share/gedit-2/plugins/snippets/lang
%%PYTHON%%@dirrm share/gedit-2/plugins/snippets
@dirrm share/gedit-2/plugins/sample
+%%PYTHON%%@dirrm share/gedit-2/plugins/pythonconsole/ui
+%%PYTHON%%@dirrm share/gedit-2/plugins/pythonconsole
+@dirrm share/gedit-2/plugins/modelines
@dirrm share/gedit-2/plugins/indent
@dirrm share/gedit-2/plugins/filebrowser
+%%PYTHON%%@dirrm share/gedit-2/plugins/externaltools/ui
+%%PYTHON%%@dirrm share/gedit-2/plugins/externaltools
@dirrm share/gedit-2/plugins/docinfo
@dirrm share/gedit-2/plugins/changecase
@dirrm share/gedit-2/plugins
@@ -552,6 +577,7 @@ share/omf/gedit/gedit-zh_TW.omf
%%PYTHON%%@dirrm lib/gedit-2/plugins/pythonconsole
%%PYTHON%%@dirrm lib/gedit-2/plugins/externaltools
@dirrmtry lib/gedit-2/plugins
+@dirrmtry lib/gedit-2/plugin-loaders
@dirrmtry lib/gedit-2
@dirrm include/gedit-%%VERSION%%/gedit
@dirrm include/gedit-%%VERSION%%
@@ -593,5 +619,7 @@ share/omf/gedit/gedit-zh_TW.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/editors/mlview/Makefile b/editors/mlview/Makefile
index 2884ddf0648b..ba5108007566 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -20,7 +20,7 @@ USE_AUTOTOOLS= autoconf:262 libtool:15
USE_GNOME= eel2 gnomehack gnomeprefix gtksourceview
USE_GMAKE= yes
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags gnome-vfs-2.0 libgnomeui-2.0`" LIBS="-L${LOCALBASE}/lib `pkg-config --libs gnome-vfs-2.0 libgnomeui-2.0`"
GCONF_SCHEMAS= mlview.schemas
diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile
index ed3657c41fd2..f63436a4a9d0 100644
--- a/games/gnome-games-extra-data/Makefile
+++ b/games/gnome-games-extra-data/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/games/gnome-games-extra-data/Makefile,v 1.24 2008/09/27 01:52:59 mezz Exp $
+# $MCom: ports/games/gnome-games-extra-data/Makefile,v 1.26 2009/03/16 07:43:04 kwm Exp $
#
PORTNAME= gnome-games-extra-data
-PORTVERSION= 2.24.0
+PORTVERSION= 2.26.0
CATEGORIES= games gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/games/gnome-games-extra-data/distinfo b/games/gnome-games-extra-data/distinfo
index af6078d30b4e..e819c72f189c 100644
--- a/games/gnome-games-extra-data/distinfo
+++ b/games/gnome-games-extra-data/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-games-extra-data-2.24.0.tar.bz2) = 6167bd439e1923c127885e253be4fdbe
-SHA256 (gnome2/gnome-games-extra-data-2.24.0.tar.bz2) = d2e34b861cafcacbbbe28fdb61ef89811d7f6945671369095d2a38e599731369
-SIZE (gnome2/gnome-games-extra-data-2.24.0.tar.bz2) = 4785628
+MD5 (gnome2/gnome-games-extra-data-2.26.0.tar.bz2) = fbcfebfeefd3de4b6883c39a4ce3e0f4
+SHA256 (gnome2/gnome-games-extra-data-2.26.0.tar.bz2) = dcf5a8e8127d7e4d4747cc00d16868d57b1e48bc36883f71afddc744caaf6115
+SIZE (gnome2/gnome-games-extra-data-2.26.0.tar.bz2) = 4089840
diff --git a/games/gnome-games-extra-data/pkg-plist b/games/gnome-games-extra-data/pkg-plist
index 1f979791c5be..81c06ae58bf2 100644
--- a/games/gnome-games-extra-data/pkg-plist
+++ b/games/gnome-games-extra-data/pkg-plist
@@ -1,37 +1,38 @@
-share/gnome-games/same-gnome/themes/2.10/blink.png
-share/gnome-games/same-gnome/themes/2.10/glass.png
-share/gnome-games/same-gnome/themes/2.10/marbles.png
-share/gnome-games/same-gnome/themes/2.10/matrix.png
-share/gnome-games/same-gnome/themes/2.10/rotate.svg
-share/gnome-games-common/cards/anglo_bitmap.svg
share/gnome-games-common/cards/anglo.svg
+share/gnome-games-common/cards/anglo_bitmap.svg
share/gnome-games-common/cards/bellot.svg
share/gnome-games-common/cards/bonded.svg
share/gnome-games-common/cards/dondorf.svg
share/gnome-games-common/cards/gnomangelo.svg
share/gnome-games-common/cards/ornamental.svg
share/gnome-games-common/cards/paris.svg
-share/pixmaps/glines/classic.png
-share/pixmaps/glines/dots.png
-share/pixmaps/glines/gumball.png
-share/pixmaps/glines/pulse.png
-share/pixmaps/gnobots2/cows.png
-share/pixmaps/gnobots2/eggs.png
-share/pixmaps/gnobots2/mice.png
-share/pixmaps/gnometris/5blocks-tig.png
-share/pixmaps/gnometris/5blocks-tim.png
-share/pixmaps/gnometris/5blocks.png
-share/pixmaps/gnometris/7blocks.png
-share/pixmaps/gnometris/7stones-gn.png
-share/pixmaps/gnometris/7stones2-gn.png
-share/pixmaps/iagno/blend.png
-share/pixmaps/iagno/flipblend.png
-share/pixmaps/iagno/metal.png
-share/pixmaps/iagno/metal2.png
-share/pixmaps/iagno/shrink.png
-share/pixmaps/iagno/sunmoon.png
-share/pixmaps/mahjongg/default.png
-share/pixmaps/mahjongg/default2.png
-share/pixmaps/mahjongg/greek-letters.png
-share/pixmaps/mahjongg/maya.png
-share/pixmaps/mahjongg/seta.png
+share/gnome-games-common/cards/tango.svg
+share/gnome-games/glines/pixmaps/classic.png
+share/gnome-games/glines/pixmaps/dots.png
+share/gnome-games/glines/pixmaps/gumball.png
+share/gnome-games/glines/pixmaps/pulse.png
+share/gnome-games/gnobots2/pixmaps/cows.png
+share/gnome-games/gnobots2/pixmaps/eggs.png
+share/gnome-games/gnobots2/pixmaps/mice.png
+share/gnome-games/gnometris/pixmaps/5blocks-tig.png
+share/gnome-games/gnometris/pixmaps/5blocks-tim.png
+share/gnome-games/gnometris/pixmaps/5blocks.png
+share/gnome-games/gnometris/pixmaps/7blocks.png
+share/gnome-games/gnometris/pixmaps/7stones-gn.png
+share/gnome-games/gnometris/pixmaps/7stones2-gn.png
+share/gnome-games/iagno/pixmaps/blend.png
+share/gnome-games/iagno/pixmaps/flipblend.png
+share/gnome-games/iagno/pixmaps/metal.png
+share/gnome-games/iagno/pixmaps/metal2.png
+share/gnome-games/iagno/pixmaps/shrink.png
+share/gnome-games/iagno/pixmaps/sunmoon.png
+share/gnome-games/mahjongg/pixmaps/default.png
+share/gnome-games/mahjongg/pixmaps/default2.png
+share/gnome-games/mahjongg/pixmaps/greek-letters.png
+share/gnome-games/mahjongg/pixmaps/maya.png
+share/gnome-games/mahjongg/pixmaps/seta.png
+share/gnome-games/same-gnome/themes/2.10/blink.png
+share/gnome-games/same-gnome/themes/2.10/glass.png
+share/gnome-games/same-gnome/themes/2.10/marbles.png
+share/gnome-games/same-gnome/themes/2.10/matrix.png
+share/gnome-games/same-gnome/themes/2.10/rotate.svg
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index e946144a495a..297f77ab8d81 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/games/gnome-games/Makefile,v 1.187 2008/11/25 17:39:15 mezz Exp $
+# $MCom: ports/games/gnome-games/Makefile,v 1.192 2009/03/18 00:15:21 kwm Exp $
#
PORTNAME= gnome-games
-PORTVERSION= 2.24.3
-PORTREVISION= 1
+PORTVERSION= 2.26.0
CATEGORIES= games gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -44,12 +43,24 @@ CONFLICTS= sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]*
DSC_FILES= iagno/iagno-client.dsc gnect/data/gnect-client.dsc \
gnibbles/gnibbles-client.dsc
+OPTIONS= CLUTTER "Enable clutter compositing support" on
+
.include <bsd.port.pre.mk>
.if exists(${LOCALBASE}/lib/libavahi-client.a) || defined(WITH_MDNS)
LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app
.endif
+.if !defined(WITHOUT_CLUTTER)
+LIB_DEPENDS+= clutter-gtk-0.8.0:${PORTSDIR}/graphics/clutter-gtk \
+ clutter-cairo-0.8.0:${PORTSDIR}/graphics/clutter-cairo
+CONFIGURE_ARGS+=--enable-clutter
+PLIST_SUB+= CLUTTER=""
+.else
+CONFIGURE_ARGS+=--disable-clutter
+PLIST_SUB+= CLUTTER="@comment "
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \
${WRKSRC}/gnome-sudoku/src/lib/defaults.py.in \
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index 608b7c9cebb6..8933fab7a4e4 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-games-2.24.3.tar.bz2) = e416e2922fe119c41ec224fab97f7909
-SHA256 (gnome2/gnome-games-2.24.3.tar.bz2) = 6ad3c849ea10f47c76cbf9c34a5e413b2549c919c5c388be0c42c59bcf3a388d
-SIZE (gnome2/gnome-games-2.24.3.tar.bz2) = 19195003
+MD5 (gnome2/gnome-games-2.26.0.tar.bz2) = 77e03e0caa57daec39e7cf8e09c87598
+SHA256 (gnome2/gnome-games-2.26.0.tar.bz2) = e7578f0f8fb612cd3afc7016ee9828ae6972b03ff746a396842c96d08081bbe1
+SIZE (gnome2/gnome-games-2.26.0.tar.bz2) = 21575301
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 227ece48bf29..41403a8235aa 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -15,6 +15,94 @@ bin/iagno
bin/mahjongg
bin/same-gnome
bin/sol
+@unexec [ -s %D/share/games/glines.Large.scores ] || rm -f %D/share/games/glines.Large.scores
+@unexec [ -s %D/share/games/glines.Medium.scores ] || rm -f %D/share/games/glines.Medium.scores
+@unexec [ -s %D/share/games/glines.Small.scores ] || rm -f %D/share/games/glines.Small.scores
+@unexec [ -s %D/share/games/gnibbles.1.0.scores ] || rm -f %D/share/games/gnibbles.1.0.scores
+@unexec [ -s %D/share/games/gnibbles.1.1.scores ] || rm -f %D/share/games/gnibbles.1.1.scores
+@unexec [ -s %D/share/games/gnibbles.2.0.scores ] || rm -f %D/share/games/gnibbles.2.0.scores
+@unexec [ -s %D/share/games/gnibbles.2.1.scores ] || rm -f %D/share/games/gnibbles.2.1.scores
+@unexec [ -s %D/share/games/gnibbles.3.0.scores ] || rm -f %D/share/games/gnibbles.3.0.scores
+@unexec [ -s %D/share/games/gnibbles.3.1.scores ] || rm -f %D/share/games/gnibbles.3.1.scores
+@unexec [ -s %D/share/games/gnibbles.4.0.scores ] || rm -f %D/share/games/gnibbles.4.0.scores
+@unexec [ -s %D/share/games/gnibbles.4.1.scores ] || rm -f %D/share/games/gnibbles.4.1.scores
+@unexec [ -s %D/share/games/gnobots2.classic_robots-safe.scores ] || rm -f %D/share/games/gnobots2.classic_robots-safe.scores
+@unexec [ -s %D/share/games/gnobots2.classic_robots-super-safe.scores ] || rm -f %D/share/games/gnobots2.classic_robots-super-safe.scores
+@unexec [ -s %D/share/games/gnobots2.classic_robots.scores ] || rm -f %D/share/games/gnobots2.classic_robots.scores
+@unexec [ -s %D/share/games/gnobots2.nightmare-safe.scores ] || rm -f %D/share/games/gnobots2.nightmare-safe.scores
+@unexec [ -s %D/share/games/gnobots2.nightmare-super-safe.scores ] || rm -f %D/share/games/gnobots2.nightmare-super-safe.scores
+@unexec [ -s %D/share/games/gnobots2.nightmare.scores ] || rm -f %D/share/games/gnobots2.nightmare.scores
+@unexec [ -s %D/share/games/gnobots2.robots2-safe.scores ] || rm -f %D/share/games/gnobots2.robots2-safe.scores
+@unexec [ -s %D/share/games/gnobots2.robots2-super-safe.scores ] || rm -f %D/share/games/gnobots2.robots2-super-safe.scores
+@unexec [ -s %D/share/games/gnobots2.robots2.scores ] || rm -f %D/share/games/gnobots2.robots2.scores
+@unexec [ -s %D/share/games/gnobots2.robots2_easy-safe.scores ] || rm -f %D/share/games/gnobots2.robots2_easy-safe.scores
+@unexec [ -s %D/share/games/gnobots2.robots2_easy-super-safe.scores ] || rm -f %D/share/games/gnobots2.robots2_easy-super-safe.scores
+@unexec [ -s %D/share/games/gnobots2.robots2_easy.scores ] || rm -f %D/share/games/gnobots2.robots2_easy.scores
+@unexec [ -s %D/share/games/gnobots2.robots_with_safe_teleport-safe.scores ] || rm -f %D/share/games/gnobots2.robots_with_safe_teleport-safe.scores
+@unexec [ -s %D/share/games/gnobots2.robots_with_safe_teleport-super-safe.scores ] || rm -f %D/share/games/gnobots2.robots_with_safe_teleport-super-safe.scores
+@unexec [ -s %D/share/games/gnobots2.robots_with_safe_teleport.scores ] || rm -f %D/share/games/gnobots2.robots_with_safe_teleport.scores
+@unexec [ -s %D/share/games/gnometris.scores ] || rm -f %D/share/games/gnometris.scores
+@unexec [ -s %D/share/games/gnomine.Custom.scores ] || rm -f %D/share/games/gnomine.Custom.scores
+@unexec [ -s %D/share/games/gnomine.Large.scores ] || rm -f %D/share/games/gnomine.Large.scores
+@unexec [ -s %D/share/games/gnomine.Medium.scores ] || rm -f %D/share/games/gnomine.Medium.scores
+@unexec [ -s %D/share/games/gnomine.Small.scores ] || rm -f %D/share/games/gnomine.Small.scores
+@unexec [ -s %D/share/games/gnotravex.2x2.scores ] || rm -f %D/share/games/gnotravex.2x2.scores
+@unexec [ -s %D/share/games/gnotravex.3x3.scores ] || rm -f %D/share/games/gnotravex.3x3.scores
+@unexec [ -s %D/share/games/gnotravex.4x4.scores ] || rm -f %D/share/games/gnotravex.4x4.scores
+@unexec [ -s %D/share/games/gnotravex.5x5.scores ] || rm -f %D/share/games/gnotravex.5x5.scores
+@unexec [ -s %D/share/games/gnotravex.6x6.scores ] || rm -f %D/share/games/gnotravex.6x6.scores
+@unexec [ -s %D/share/games/gnotski.1.scores ] || rm -f %D/share/games/gnotski.1.scores
+@unexec [ -s %D/share/games/gnotski.10.scores ] || rm -f %D/share/games/gnotski.10.scores
+@unexec [ -s %D/share/games/gnotski.11.scores ] || rm -f %D/share/games/gnotski.11.scores
+@unexec [ -s %D/share/games/gnotski.12.scores ] || rm -f %D/share/games/gnotski.12.scores
+@unexec [ -s %D/share/games/gnotski.13.scores ] || rm -f %D/share/games/gnotski.13.scores
+@unexec [ -s %D/share/games/gnotski.14.scores ] || rm -f %D/share/games/gnotski.14.scores
+@unexec [ -s %D/share/games/gnotski.15.scores ] || rm -f %D/share/games/gnotski.15.scores
+@unexec [ -s %D/share/games/gnotski.16.scores ] || rm -f %D/share/games/gnotski.16.scores
+@unexec [ -s %D/share/games/gnotski.17.scores ] || rm -f %D/share/games/gnotski.17.scores
+@unexec [ -s %D/share/games/gnotski.18.scores ] || rm -f %D/share/games/gnotski.18.scores
+@unexec [ -s %D/share/games/gnotski.19.scores ] || rm -f %D/share/games/gnotski.19.scores
+@unexec [ -s %D/share/games/gnotski.2.scores ] || rm -f %D/share/games/gnotski.2.scores
+@unexec [ -s %D/share/games/gnotski.20.scores ] || rm -f %D/share/games/gnotski.20.scores
+@unexec [ -s %D/share/games/gnotski.21.scores ] || rm -f %D/share/games/gnotski.21.scores
+@unexec [ -s %D/share/games/gnotski.22.scores ] || rm -f %D/share/games/gnotski.22.scores
+@unexec [ -s %D/share/games/gnotski.23.scores ] || rm -f %D/share/games/gnotski.23.scores
+@unexec [ -s %D/share/games/gnotski.24.scores ] || rm -f %D/share/games/gnotski.24.scores
+@unexec [ -s %D/share/games/gnotski.25.scores ] || rm -f %D/share/games/gnotski.25.scores
+@unexec [ -s %D/share/games/gnotski.26.scores ] || rm -f %D/share/games/gnotski.26.scores
+@unexec [ -s %D/share/games/gnotski.27.scores ] || rm -f %D/share/games/gnotski.27.scores
+@unexec [ -s %D/share/games/gnotski.28.scores ] || rm -f %D/share/games/gnotski.28.scores
+@unexec [ -s %D/share/games/gnotski.29.scores ] || rm -f %D/share/games/gnotski.29.scores
+@unexec [ -s %D/share/games/gnotski.3.scores ] || rm -f %D/share/games/gnotski.3.scores
+@unexec [ -s %D/share/games/gnotski.30.scores ] || rm -f %D/share/games/gnotski.30.scores
+@unexec [ -s %D/share/games/gnotski.31.scores ] || rm -f %D/share/games/gnotski.31.scores
+@unexec [ -s %D/share/games/gnotski.32.scores ] || rm -f %D/share/games/gnotski.32.scores
+@unexec [ -s %D/share/games/gnotski.33.scores ] || rm -f %D/share/games/gnotski.33.scores
+@unexec [ -s %D/share/games/gnotski.34.scores ] || rm -f %D/share/games/gnotski.34.scores
+@unexec [ -s %D/share/games/gnotski.35.scores ] || rm -f %D/share/games/gnotski.35.scores
+@unexec [ -s %D/share/games/gnotski.36.scores ] || rm -f %D/share/games/gnotski.36.scores
+@unexec [ -s %D/share/games/gnotski.37.scores ] || rm -f %D/share/games/gnotski.37.scores
+@unexec [ -s %D/share/games/gnotski.4.scores ] || rm -f %D/share/games/gnotski.4.scores
+@unexec [ -s %D/share/games/gnotski.5.scores ] || rm -f %D/share/games/gnotski.5.scores
+@unexec [ -s %D/share/games/gnotski.6.scores ] || rm -f %D/share/games/gnotski.6.scores
+@unexec [ -s %D/share/games/gnotski.7.scores ] || rm -f %D/share/games/gnotski.7.scores
+@unexec [ -s %D/share/games/gnotski.8.scores ] || rm -f %D/share/games/gnotski.8.scores
+@unexec [ -s %D/share/games/gnotski.9.scores ] || rm -f %D/share/games/gnotski.9.scores
+@unexec [ -s %D/share/games/gtali.Colors.scores ] || rm -f %D/share/games/gtali.Colors.scores
+@unexec [ -s %D/share/games/gtali.Regular.scores ] || rm -f %D/share/games/gtali.Regular.scores
+@unexec [ -s %D/share/games/mahjongg.bridges.scores ] || rm -f %D/share/games/mahjongg.bridges.scores
+@unexec [ -s %D/share/games/mahjongg.cloud.scores ] || rm -f %D/share/games/mahjongg.cloud.scores
+@unexec [ -s %D/share/games/mahjongg.confounding.scores ] || rm -f %D/share/games/mahjongg.confounding.scores
+@unexec [ -s %D/share/games/mahjongg.difficult.scores ] || rm -f %D/share/games/mahjongg.difficult.scores
+@unexec [ -s %D/share/games/mahjongg.dragon.scores ] || rm -f %D/share/games/mahjongg.dragon.scores
+@unexec [ -s %D/share/games/mahjongg.easy.scores ] || rm -f %D/share/games/mahjongg.easy.scores
+@unexec [ -s %D/share/games/mahjongg.pyramid.scores ] || rm -f %D/share/games/mahjongg.pyramid.scores
+@unexec [ -s %D/share/games/mahjongg.tictactoe.scores ] || rm -f %D/share/games/mahjongg.tictactoe.scores
+@unexec [ -s %D/share/games/mahjongg.ziggurat.scores ] || rm -f %D/share/games/mahjongg.ziggurat.scores
+@unexec [ -s %D/share/games/same-gnome.Large.scores ] || rm -f %D/share/games/same-gnome.Large.scores
+@unexec [ -s %D/share/games/same-gnome.Medium.scores ] || rm -f %D/share/games/same-gnome.Medium.scores
+@unexec [ -s %D/share/games/same-gnome.Small.scores ] || rm -f %D/share/games/same-gnome.Small.scores
+@unexec [ -L %D/share/games/same-gnome.scores ] || rm -f %D/share/games/same-gnome.scores
lib/gnome-games/gnome-games-render-cards
%%PYTHON_SITELIBDIR%%/glchess/__init__.py
%%PYTHON_SITELIBDIR%%/glchess/__init__.pyc
@@ -211,9 +299,6 @@ lib/gnome-games/gnome-games-render-cards
%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_generator_gui.py
%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_generator_gui.pyc
%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_generator_gui.pyo
-%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_labeller.py
-%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_labeller.pyc
-%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_labeller.pyo
%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_maker.py
%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_maker.pyc
%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_maker.pyo
@@ -240,94 +325,6 @@ share/applications/iagno.desktop
share/applications/mahjongg.desktop
share/applications/same-gnome.desktop
share/applications/sol.desktop
-@unexec [ -s %D/share/games/glines.Large.scores ] || rm -f %D/share/games/glines.Large.scores
-@unexec [ -s %D/share/games/glines.Medium.scores ] || rm -f %D/share/games/glines.Medium.scores
-@unexec [ -s %D/share/games/glines.Small.scores ] || rm -f %D/share/games/glines.Small.scores
-@unexec [ -s %D/share/games/gnibbles.1.0.scores ] || rm -f %D/share/games/gnibbles.1.0.scores
-@unexec [ -s %D/share/games/gnibbles.1.1.scores ] || rm -f %D/share/games/gnibbles.1.1.scores
-@unexec [ -s %D/share/games/gnibbles.2.0.scores ] || rm -f %D/share/games/gnibbles.2.0.scores
-@unexec [ -s %D/share/games/gnibbles.2.1.scores ] || rm -f %D/share/games/gnibbles.2.1.scores
-@unexec [ -s %D/share/games/gnibbles.3.0.scores ] || rm -f %D/share/games/gnibbles.3.0.scores
-@unexec [ -s %D/share/games/gnibbles.3.1.scores ] || rm -f %D/share/games/gnibbles.3.1.scores
-@unexec [ -s %D/share/games/gnibbles.4.0.scores ] || rm -f %D/share/games/gnibbles.4.0.scores
-@unexec [ -s %D/share/games/gnibbles.4.1.scores ] || rm -f %D/share/games/gnibbles.4.1.scores
-@unexec [ -s %D/share/games/gnobots2.classic_robots-safe.scores ] || rm -f %D/share/games/gnobots2.classic_robots-safe.scores
-@unexec [ -s %D/share/games/gnobots2.classic_robots-super-safe.scores ] || rm -f %D/share/games/gnobots2.classic_robots-super-safe.scores
-@unexec [ -s %D/share/games/gnobots2.classic_robots.scores ] || rm -f %D/share/games/gnobots2.classic_robots.scores
-@unexec [ -s %D/share/games/gnobots2.nightmare-safe.scores ] || rm -f %D/share/games/gnobots2.nightmare-safe.scores
-@unexec [ -s %D/share/games/gnobots2.nightmare-super-safe.scores ] || rm -f %D/share/games/gnobots2.nightmare-super-safe.scores
-@unexec [ -s %D/share/games/gnobots2.nightmare.scores ] || rm -f %D/share/games/gnobots2.nightmare.scores
-@unexec [ -s %D/share/games/gnobots2.robots2-safe.scores ] || rm -f %D/share/games/gnobots2.robots2-safe.scores
-@unexec [ -s %D/share/games/gnobots2.robots2-super-safe.scores ] || rm -f %D/share/games/gnobots2.robots2-super-safe.scores
-@unexec [ -s %D/share/games/gnobots2.robots2.scores ] || rm -f %D/share/games/gnobots2.robots2.scores
-@unexec [ -s %D/share/games/gnobots2.robots2_easy-safe.scores ] || rm -f %D/share/games/gnobots2.robots2_easy-safe.scores
-@unexec [ -s %D/share/games/gnobots2.robots2_easy-super-safe.scores ] || rm -f %D/share/games/gnobots2.robots2_easy-super-safe.scores
-@unexec [ -s %D/share/games/gnobots2.robots2_easy.scores ] || rm -f %D/share/games/gnobots2.robots2_easy.scores
-@unexec [ -s %D/share/games/gnobots2.robots_with_safe_teleport-safe.scores ] || rm -f %D/share/games/gnobots2.robots_with_safe_teleport-safe.scores
-@unexec [ -s %D/share/games/gnobots2.robots_with_safe_teleport-super-safe.scores ] || rm -f %D/share/games/gnobots2.robots_with_safe_teleport-super-safe.scores
-@unexec [ -s %D/share/games/gnobots2.robots_with_safe_teleport.scores ] || rm -f %D/share/games/gnobots2.robots_with_safe_teleport.scores
-@unexec [ -s %D/share/games/gnometris.scores ] || rm -f %D/share/games/gnometris.scores
-@unexec [ -s %D/share/games/gnomine.Custom.scores ] || rm -f %D/share/games/gnomine.Custom.scores
-@unexec [ -s %D/share/games/gnomine.Large.scores ] || rm -f %D/share/games/gnomine.Large.scores
-@unexec [ -s %D/share/games/gnomine.Medium.scores ] || rm -f %D/share/games/gnomine.Medium.scores
-@unexec [ -s %D/share/games/gnomine.Small.scores ] || rm -f %D/share/games/gnomine.Small.scores
-@unexec [ -s %D/share/games/gnotravex.2x2.scores ] || rm -f %D/share/games/gnotravex.2x2.scores
-@unexec [ -s %D/share/games/gnotravex.3x3.scores ] || rm -f %D/share/games/gnotravex.3x3.scores
-@unexec [ -s %D/share/games/gnotravex.4x4.scores ] || rm -f %D/share/games/gnotravex.4x4.scores
-@unexec [ -s %D/share/games/gnotravex.5x5.scores ] || rm -f %D/share/games/gnotravex.5x5.scores
-@unexec [ -s %D/share/games/gnotravex.6x6.scores ] || rm -f %D/share/games/gnotravex.6x6.scores
-@unexec [ -s %D/share/games/gnotski.1.scores ] || rm -f %D/share/games/gnotski.1.scores
-@unexec [ -s %D/share/games/gnotski.10.scores ] || rm -f %D/share/games/gnotski.10.scores
-@unexec [ -s %D/share/games/gnotski.11.scores ] || rm -f %D/share/games/gnotski.11.scores
-@unexec [ -s %D/share/games/gnotski.12.scores ] || rm -f %D/share/games/gnotski.12.scores
-@unexec [ -s %D/share/games/gnotski.13.scores ] || rm -f %D/share/games/gnotski.13.scores
-@unexec [ -s %D/share/games/gnotski.14.scores ] || rm -f %D/share/games/gnotski.14.scores
-@unexec [ -s %D/share/games/gnotski.15.scores ] || rm -f %D/share/games/gnotski.15.scores
-@unexec [ -s %D/share/games/gnotski.16.scores ] || rm -f %D/share/games/gnotski.16.scores
-@unexec [ -s %D/share/games/gnotski.17.scores ] || rm -f %D/share/games/gnotski.17.scores
-@unexec [ -s %D/share/games/gnotski.18.scores ] || rm -f %D/share/games/gnotski.18.scores
-@unexec [ -s %D/share/games/gnotski.19.scores ] || rm -f %D/share/games/gnotski.19.scores
-@unexec [ -s %D/share/games/gnotski.2.scores ] || rm -f %D/share/games/gnotski.2.scores
-@unexec [ -s %D/share/games/gnotski.20.scores ] || rm -f %D/share/games/gnotski.20.scores
-@unexec [ -s %D/share/games/gnotski.21.scores ] || rm -f %D/share/games/gnotski.21.scores
-@unexec [ -s %D/share/games/gnotski.22.scores ] || rm -f %D/share/games/gnotski.22.scores
-@unexec [ -s %D/share/games/gnotski.23.scores ] || rm -f %D/share/games/gnotski.23.scores
-@unexec [ -s %D/share/games/gnotski.24.scores ] || rm -f %D/share/games/gnotski.24.scores
-@unexec [ -s %D/share/games/gnotski.25.scores ] || rm -f %D/share/games/gnotski.25.scores
-@unexec [ -s %D/share/games/gnotski.26.scores ] || rm -f %D/share/games/gnotski.26.scores
-@unexec [ -s %D/share/games/gnotski.27.scores ] || rm -f %D/share/games/gnotski.27.scores
-@unexec [ -s %D/share/games/gnotski.28.scores ] || rm -f %D/share/games/gnotski.28.scores
-@unexec [ -s %D/share/games/gnotski.29.scores ] || rm -f %D/share/games/gnotski.29.scores
-@unexec [ -s %D/share/games/gnotski.3.scores ] || rm -f %D/share/games/gnotski.3.scores
-@unexec [ -s %D/share/games/gnotski.30.scores ] || rm -f %D/share/games/gnotski.30.scores
-@unexec [ -s %D/share/games/gnotski.31.scores ] || rm -f %D/share/games/gnotski.31.scores
-@unexec [ -s %D/share/games/gnotski.32.scores ] || rm -f %D/share/games/gnotski.32.scores
-@unexec [ -s %D/share/games/gnotski.33.scores ] || rm -f %D/share/games/gnotski.33.scores
-@unexec [ -s %D/share/games/gnotski.34.scores ] || rm -f %D/share/games/gnotski.34.scores
-@unexec [ -s %D/share/games/gnotski.35.scores ] || rm -f %D/share/games/gnotski.35.scores
-@unexec [ -s %D/share/games/gnotski.36.scores ] || rm -f %D/share/games/gnotski.36.scores
-@unexec [ -s %D/share/games/gnotski.37.scores ] || rm -f %D/share/games/gnotski.37.scores
-@unexec [ -s %D/share/games/gnotski.4.scores ] || rm -f %D/share/games/gnotski.4.scores
-@unexec [ -s %D/share/games/gnotski.5.scores ] || rm -f %D/share/games/gnotski.5.scores
-@unexec [ -s %D/share/games/gnotski.6.scores ] || rm -f %D/share/games/gnotski.6.scores
-@unexec [ -s %D/share/games/gnotski.7.scores ] || rm -f %D/share/games/gnotski.7.scores
-@unexec [ -s %D/share/games/gnotski.8.scores ] || rm -f %D/share/games/gnotski.8.scores
-@unexec [ -s %D/share/games/gnotski.9.scores ] || rm -f %D/share/games/gnotski.9.scores
-@unexec [ -s %D/share/games/gtali.Colors.scores ] || rm -f %D/share/games/gtali.Colors.scores
-@unexec [ -s %D/share/games/gtali.Regular.scores ] || rm -f %D/share/games/gtali.Regular.scores
-@unexec [ -s %D/share/games/mahjongg.bridges.scores ] || rm -f %D/share/games/mahjongg.bridges.scores
-@unexec [ -s %D/share/games/mahjongg.cloud.scores ] || rm -f %D/share/games/mahjongg.cloud.scores
-@unexec [ -s %D/share/games/mahjongg.confounding.scores ] || rm -f %D/share/games/mahjongg.confounding.scores
-@unexec [ -s %D/share/games/mahjongg.difficult.scores ] || rm -f %D/share/games/mahjongg.difficult.scores
-@unexec [ -s %D/share/games/mahjongg.dragon.scores ] || rm -f %D/share/games/mahjongg.dragon.scores
-@unexec [ -s %D/share/games/mahjongg.easy.scores ] || rm -f %D/share/games/mahjongg.easy.scores
-@unexec [ -s %D/share/games/mahjongg.pyramid.scores ] || rm -f %D/share/games/mahjongg.pyramid.scores
-@unexec [ -s %D/share/games/mahjongg.tictactoe.scores ] || rm -f %D/share/games/mahjongg.tictactoe.scores
-@unexec [ -s %D/share/games/mahjongg.ziggurat.scores ] || rm -f %D/share/games/mahjongg.ziggurat.scores
-@unexec [ -s %D/share/games/same-gnome.Large.scores ] || rm -f %D/share/games/same-gnome.Large.scores
-@unexec [ -s %D/share/games/same-gnome.Medium.scores ] || rm -f %D/share/games/same-gnome.Medium.scores
-@unexec [ -s %D/share/games/same-gnome.Small.scores ] || rm -f %D/share/games/same-gnome.Small.scores
-@unexec [ -L %D/share/games/same-gnome.scores ] || rm -f %D/share/games/same-gnome.scores
share/ggz/gnome-games/about_bg.png
share/ggz/gnome-games/ggz_gtk_admin.svg
share/ggz/gnome-games/ggz_gtk_bot.svg
@@ -357,39 +354,9 @@ share/glchess/network_game.glade
share/glchess/new_game.glade
share/glchess/preferences.glade
share/glchess/save_game.glade
-share/gnect/white_ob.cn4.gz
-share/gnibbles/level001.gnl
-share/gnibbles/level002.gnl
-share/gnibbles/level003.gnl
-share/gnibbles/level004.gnl
-share/gnibbles/level005.gnl
-share/gnibbles/level006.gnl
-share/gnibbles/level007.gnl
-share/gnibbles/level008.gnl
-share/gnibbles/level009.gnl
-share/gnibbles/level010.gnl
-share/gnibbles/level011.gnl
-share/gnibbles/level012.gnl
-share/gnibbles/level013.gnl
-share/gnibbles/level014.gnl
-share/gnibbles/level015.gnl
-share/gnibbles/level016.gnl
-share/gnibbles/level017.gnl
-share/gnibbles/level018.gnl
-share/gnibbles/level019.gnl
-share/gnibbles/level020.gnl
-share/gnibbles/level021.gnl
-share/gnibbles/level022.gnl
-share/gnibbles/level023.gnl
-share/gnibbles/level024.gnl
-share/gnibbles/level025.gnl
-share/gnibbles/level026.gnl
-share/gnobots2/classic_robots.cfg
-share/gnobots2/nightmare.cfg
-share/gnobots2/robots2.cfg
-share/gnobots2/robots2_easy.cfg
-share/gnobots2/robots_with_safe_teleport.cfg
share/gnome-games-common/cards/gnomangelo_bitmap.svg
+share/gnome-games-common/theme-install.ini
+%%DATADIR%%/aisleriot/games/accordion.scm
%%DATADIR%%/aisleriot/games/agnes.scm
%%DATADIR%%/aisleriot/games/athena.scm
%%DATADIR%%/aisleriot/games/auld_lang_syne.scm
@@ -461,6 +428,7 @@ share/gnome-games-common/cards/gnomangelo_bitmap.svg
%%DATADIR%%/aisleriot/games/straight_up.scm
%%DATADIR%%/aisleriot/games/streets_and_alleys.scm
%%DATADIR%%/aisleriot/games/ten_across.scm
+%%DATADIR%%/aisleriot/games/terrace.scm
%%DATADIR%%/aisleriot/games/thieves.scm
%%DATADIR%%/aisleriot/games/thirteen.scm
%%DATADIR%%/aisleriot/games/thumb_and_pouch.scm
@@ -474,6 +442,10 @@ share/gnome-games-common/cards/gnomangelo_bitmap.svg
%%DATADIR%%/aisleriot/games/yield.scm
%%DATADIR%%/aisleriot/games/yukon.scm
%%DATADIR%%/aisleriot/games/zebra.scm
+%%DATADIR%%/blackjack/games/Ameristar.rules
+%%DATADIR%%/blackjack/games/Atlantic_City.rules
+%%DATADIR%%/blackjack/games/Vegas_Downtown.rules
+%%DATADIR%%/blackjack/games/Vegas_Strip.rules
%%DATADIR%%/blackjack/pixmaps/baize.png
%%DATADIR%%/blackjack/pixmaps/blackjack-splash.png
%%DATADIR%%/blackjack/pixmaps/chip-1.svg
@@ -481,15 +453,121 @@ share/gnome-games-common/cards/gnomangelo_bitmap.svg
%%DATADIR%%/blackjack/pixmaps/chip-25.svg
%%DATADIR%%/blackjack/pixmaps/chip-5.svg
%%DATADIR%%/blackjack/pixmaps/white-outline.svg
-%%DATADIR%%/blackjack/rules/Ameristar.rules
-%%DATADIR%%/blackjack/rules/Atlantic_City.rules
-%%DATADIR%%/blackjack/rules/Vegas_Downtown.rules
-%%DATADIR%%/blackjack/rules/Vegas_Strip.rules
-%%DATADIR%%/gnotski/gnotski.svg
+%%DATADIR%%/glines/pixmaps/balls.svg
+%%DATADIR%%/glines/pixmaps/shapes.svg
+%%DATADIR%%/gnect/pixmaps/bg_grotty.jpg
+%%DATADIR%%/gnect/pixmaps/bg_nightfall.jpg
+%%DATADIR%%/gnect/pixmaps/bg_toplight.png
+%%DATADIR%%/gnect/pixmaps/tileset_50x50_catseyes.png
+%%DATADIR%%/gnect/pixmaps/tileset_50x50_glassy.png
+%%DATADIR%%/gnect/pixmaps/tileset_50x50_hcinverse.svg
+%%DATADIR%%/gnect/pixmaps/tileset_50x50_hcontrast.svg
+%%DATADIR%%/gnect/pixmaps/tileset_50x50_square.png
+%%DATADIR%%/gnect/pixmaps/tileset_50x50_sunspot.svg
+%%DATADIR%%/gnect/white_ob.cn4.gz
+%%DATADIR%%/gnibbles/games/level001.gnl
+%%DATADIR%%/gnibbles/games/level002.gnl
+%%DATADIR%%/gnibbles/games/level003.gnl
+%%DATADIR%%/gnibbles/games/level004.gnl
+%%DATADIR%%/gnibbles/games/level005.gnl
+%%DATADIR%%/gnibbles/games/level006.gnl
+%%DATADIR%%/gnibbles/games/level007.gnl
+%%DATADIR%%/gnibbles/games/level008.gnl
+%%DATADIR%%/gnibbles/games/level009.gnl
+%%DATADIR%%/gnibbles/games/level010.gnl
+%%DATADIR%%/gnibbles/games/level011.gnl
+%%DATADIR%%/gnibbles/games/level012.gnl
+%%DATADIR%%/gnibbles/games/level013.gnl
+%%DATADIR%%/gnibbles/games/level014.gnl
+%%DATADIR%%/gnibbles/games/level015.gnl
+%%DATADIR%%/gnibbles/games/level016.gnl
+%%DATADIR%%/gnibbles/games/level017.gnl
+%%DATADIR%%/gnibbles/games/level018.gnl
+%%DATADIR%%/gnibbles/games/level019.gnl
+%%DATADIR%%/gnibbles/games/level020.gnl
+%%DATADIR%%/gnibbles/games/level021.gnl
+%%DATADIR%%/gnibbles/games/level022.gnl
+%%DATADIR%%/gnibbles/games/level023.gnl
+%%DATADIR%%/gnibbles/games/level024.gnl
+%%DATADIR%%/gnibbles/games/level025.gnl
+%%DATADIR%%/gnibbles/games/level026.gnl
+%%DATADIR%%/gnibbles/pixmaps/blank.svg
+%%DATADIR%%/gnibbles/pixmaps/bonus1.svg
+%%DATADIR%%/gnibbles/pixmaps/bonus2.svg
+%%DATADIR%%/gnibbles/pixmaps/bonus3.svg
+%%DATADIR%%/gnibbles/pixmaps/bonus4.svg
+%%DATADIR%%/gnibbles/pixmaps/bonus5.svg
+%%DATADIR%%/gnibbles/pixmaps/diamond.svg
+%%DATADIR%%/gnibbles/pixmaps/gnibbles-logo.svg
+%%DATADIR%%/gnibbles/pixmaps/life.svg
+%%DATADIR%%/gnibbles/pixmaps/questionmark.svg
+%%DATADIR%%/gnibbles/pixmaps/snake-blue.svg
+%%DATADIR%%/gnibbles/pixmaps/snake-cyan.svg
+%%DATADIR%%/gnibbles/pixmaps/snake-green.svg
+%%DATADIR%%/gnibbles/pixmaps/snake-grey.svg
+%%DATADIR%%/gnibbles/pixmaps/snake-magenta.svg
+%%DATADIR%%/gnibbles/pixmaps/snake-red.svg
+%%DATADIR%%/gnibbles/pixmaps/snake-yellow.svg
+%%DATADIR%%/gnibbles/pixmaps/wall-corner-bottom-left.svg
+%%DATADIR%%/gnibbles/pixmaps/wall-corner-bottom-right.svg
+%%DATADIR%%/gnibbles/pixmaps/wall-corner-top-left.svg
+%%DATADIR%%/gnibbles/pixmaps/wall-corner-top-right.svg
+%%DATADIR%%/gnibbles/pixmaps/wall-cross.svg
+%%DATADIR%%/gnibbles/pixmaps/wall-empty.svg
+%%DATADIR%%/gnibbles/pixmaps/wall-straight-side.svg
+%%DATADIR%%/gnibbles/pixmaps/wall-straight-up.svg
+%%DATADIR%%/gnibbles/pixmaps/wall-tee-down.svg
+%%DATADIR%%/gnibbles/pixmaps/wall-tee-left.svg
+%%DATADIR%%/gnibbles/pixmaps/wall-tee-right.svg
+%%DATADIR%%/gnibbles/pixmaps/wall-tee-up.svg
+%%DATADIR%%/gnobots2/games/classic_robots.cfg
+%%DATADIR%%/gnobots2/games/nightmare.cfg
+%%DATADIR%%/gnobots2/games/robots2.cfg
+%%DATADIR%%/gnobots2/games/robots2_easy.cfg
+%%DATADIR%%/gnobots2/games/robots_with_safe_teleport.cfg
+%%DATADIR%%/gnobots2/pixmaps/aieee.png
+%%DATADIR%%/gnobots2/pixmaps/boo.svg
+%%DATADIR%%/gnobots2/pixmaps/gnomes.png
+%%DATADIR%%/gnobots2/pixmaps/robots.svg
+%%DATADIR%%/gnobots2/pixmaps/splat.png
+%%DATADIR%%/gnobots2/pixmaps/ufo.svg
+%%DATADIR%%/gnobots2/pixmaps/yahoo.png
+%%DATADIR%%/gnometris/pixmaps/7blocks-gw.png
+%%DATADIR%%/gnometris/pixmaps/7blocks-tig.png
+%%DATADIR%%/gnometris/pixmaps/gnometris.svg
+%%DATADIR%%/gnomine/pixmaps/bang.svg
+%%DATADIR%%/gnomine/pixmaps/face-cool.svg
+%%DATADIR%%/gnomine/pixmaps/face-sad.svg
+%%DATADIR%%/gnomine/pixmaps/face-smile.svg
+%%DATADIR%%/gnomine/pixmaps/face-win.svg
+%%DATADIR%%/gnomine/pixmaps/face-worried.svg
+%%DATADIR%%/gnomine/pixmaps/flag-question.svg
+%%DATADIR%%/gnomine/pixmaps/flag.svg
+%%DATADIR%%/gnomine/pixmaps/mine.svg
+%%DATADIR%%/gnomine/pixmaps/warning.svg
+%%DATADIR%%/gnotski/pixmaps/gnotski.svg
+%%DATADIR%%/gtali/pixmaps/gnome-dice-1.svg
+%%DATADIR%%/gtali/pixmaps/gnome-dice-2.svg
+%%DATADIR%%/gtali/pixmaps/gnome-dice-3.svg
+%%DATADIR%%/gtali/pixmaps/gnome-dice-4.svg
+%%DATADIR%%/gtali/pixmaps/gnome-dice-5.svg
+%%DATADIR%%/gtali/pixmaps/gnome-dice-6.svg
+%%DATADIR%%/gtali/pixmaps/gnome-dice-none.svg
+%%DATADIR%%/gtali/pixmaps/kismet-none.svg
+%%DATADIR%%/gtali/pixmaps/kismet1.svg
+%%DATADIR%%/gtali/pixmaps/kismet2.svg
+%%DATADIR%%/gtali/pixmaps/kismet3.svg
+%%DATADIR%%/gtali/pixmaps/kismet4.svg
+%%DATADIR%%/gtali/pixmaps/kismet5.svg
+%%DATADIR%%/gtali/pixmaps/kismet6.svg
+%%DATADIR%%/iagno/pixmaps/classic.png
+%%DATADIR%%/iagno/pixmaps/woodtrim.png
%%DATADIR%%/icons/hicolor/24x24/actions/teleport-random.png
%%DATADIR%%/icons/hicolor/24x24/actions/teleport.png
%%DATADIR%%/icons/hicolor/scalable/actions/cards-deal.svg
-%%DATADIR%%/mahjongg/maps/mahjongg.map
+%%DATADIR%%/mahjongg/games/mahjongg.map
+%%DATADIR%%/mahjongg/pixmaps/postmodern.svg
+%%DATADIR%%/mahjongg/pixmaps/smooth.png
%%DATADIR%%/pixmaps/baize.png
%%DATADIR%%/pixmaps/slot.svg
%%DATADIR%%/same-gnome/themes/2.10/planets.png
@@ -526,6 +604,7 @@ share/gnome-sudoku/puzzles/medium
share/gnome-sudoku/puzzles/very_hard
share/gnome-sudoku/select_game.glade
share/gnome-sudoku/tracker.glade
+share/gnome/help/aisleriot/C/accordion.xml
share/gnome/help/aisleriot/C/agnes.xml
share/gnome/help/aisleriot/C/aisleriot.xml
share/gnome/help/aisleriot/C/athena.xml
@@ -601,6 +680,7 @@ share/gnome/help/aisleriot/C/spiderette.xml
share/gnome/help/aisleriot/C/straight_up.xml
share/gnome/help/aisleriot/C/streets_and_alleys.xml
share/gnome/help/aisleriot/C/ten_across.xml
+share/gnome/help/aisleriot/C/terrace.xml
share/gnome/help/aisleriot/C/thieves.xml
share/gnome/help/aisleriot/C/thirteen.xml
share/gnome/help/aisleriot/C/thumb_and_pouch.xml
@@ -623,6 +703,9 @@ share/gnome/help/aisleriot/de/figures/clock-rules.png
share/gnome/help/aisleriot/es/aisleriot.xml
share/gnome/help/aisleriot/es/figures/camelot-goal.png
share/gnome/help/aisleriot/es/figures/clock-rules.png
+share/gnome/help/aisleriot/eu/aisleriot.xml
+share/gnome/help/aisleriot/eu/figures/camelot-goal.png
+share/gnome/help/aisleriot/eu/figures/clock-rules.png
share/gnome/help/aisleriot/fr/aisleriot.xml
share/gnome/help/aisleriot/fr/figures/camelot-goal.png
share/gnome/help/aisleriot/fr/figures/clock-rules.png
@@ -648,9 +731,15 @@ share/gnome/help/blackjack/de/figures/blackjack_win_window.png
share/gnome/help/blackjack/el/blackjack.xml
share/gnome/help/blackjack/el/figures/blackjack_start_window.png
share/gnome/help/blackjack/el/figures/blackjack_win_window.png
+share/gnome/help/blackjack/en_GB/blackjack.xml
+share/gnome/help/blackjack/en_GB/figures/blackjack_start_window.png
+share/gnome/help/blackjack/en_GB/figures/blackjack_win_window.png
share/gnome/help/blackjack/es/blackjack.xml
share/gnome/help/blackjack/es/figures/blackjack_start_window.png
share/gnome/help/blackjack/es/figures/blackjack_win_window.png
+share/gnome/help/blackjack/eu/blackjack.xml
+share/gnome/help/blackjack/eu/figures/blackjack_start_window.png
+share/gnome/help/blackjack/eu/figures/blackjack_win_window.png
share/gnome/help/blackjack/fr/blackjack.xml
share/gnome/help/blackjack/fr/figures/blackjack_start_window.png
share/gnome/help/blackjack/fr/figures/blackjack_win_window.png
@@ -681,11 +770,21 @@ share/gnome/help/glchess/el/figures/new_game.png
share/gnome/help/glchess/el/figures/preferences_game.png
share/gnome/help/glchess/el/figures/preferences_view.png
share/gnome/help/glchess/el/glchess.xml
+share/gnome/help/glchess/en_GB/figures/game.png
+share/gnome/help/glchess/en_GB/figures/new_game.png
+share/gnome/help/glchess/en_GB/figures/preferences_game.png
+share/gnome/help/glchess/en_GB/figures/preferences_view.png
+share/gnome/help/glchess/en_GB/glchess.xml
share/gnome/help/glchess/es/figures/game.png
share/gnome/help/glchess/es/figures/new_game.png
share/gnome/help/glchess/es/figures/preferences_game.png
share/gnome/help/glchess/es/figures/preferences_view.png
share/gnome/help/glchess/es/glchess.xml
+share/gnome/help/glchess/eu/figures/game.png
+share/gnome/help/glchess/eu/figures/new_game.png
+share/gnome/help/glchess/eu/figures/preferences_game.png
+share/gnome/help/glchess/eu/figures/preferences_view.png
+share/gnome/help/glchess/eu/glchess.xml
share/gnome/help/glchess/fr/figures/game.png
share/gnome/help/glchess/fr/figures/new_game.png
share/gnome/help/glchess/fr/figures/preferences_game.png
@@ -732,6 +831,10 @@ share/gnome/help/glines/es/figures/glines-gameover.png
share/gnome/help/glines/es/figures/glines-startgame.png
share/gnome/help/glines/es/figures/preferences.png
share/gnome/help/glines/es/glines.xml
+share/gnome/help/glines/eu/figures/glines-gameover.png
+share/gnome/help/glines/eu/figures/glines-startgame.png
+share/gnome/help/glines/eu/figures/preferences.png
+share/gnome/help/glines/eu/glines.xml
share/gnome/help/glines/fr/figures/glines-gameover.png
share/gnome/help/glines/fr/figures/glines-startgame.png
share/gnome/help/glines/fr/figures/preferences.png
@@ -783,6 +886,11 @@ share/gnome/help/gnect/es/figures/mainwindow.png
share/gnome/help/gnect/es/figures/tables.png
share/gnome/help/gnect/es/figures/tileset.png
share/gnome/help/gnect/es/gnect.xml
+share/gnome/help/gnect/eu/figures/connect.png
+share/gnome/help/gnect/eu/figures/mainwindow.png
+share/gnome/help/gnect/eu/figures/tables.png
+share/gnome/help/gnect/eu/figures/tileset.png
+share/gnome/help/gnect/eu/gnect.xml
share/gnome/help/gnect/fr/figures/connect.png
share/gnome/help/gnect/fr/figures/mainwindow.png
share/gnome/help/gnect/fr/figures/tables.png
@@ -826,6 +934,13 @@ share/gnome/help/gnibbles/de/figures/playing.png
share/gnome/help/gnibbles/de/figures/tables.png
share/gnome/help/gnibbles/de/figures/worm_op.png
share/gnome/help/gnibbles/de/gnibbles.xml
+share/gnome/help/gnibbles/en_GB/figures/connect.png
+share/gnome/help/gnibbles/en_GB/figures/game.png
+share/gnome/help/gnibbles/en_GB/figures/intro.png
+share/gnome/help/gnibbles/en_GB/figures/playing.png
+share/gnome/help/gnibbles/en_GB/figures/tables.png
+share/gnome/help/gnibbles/en_GB/figures/worm_op.png
+share/gnome/help/gnibbles/en_GB/gnibbles.xml
share/gnome/help/gnibbles/es/figures/connect.png
share/gnome/help/gnibbles/es/figures/game.png
share/gnome/help/gnibbles/es/figures/intro.png
@@ -833,6 +948,13 @@ share/gnome/help/gnibbles/es/figures/playing.png
share/gnome/help/gnibbles/es/figures/tables.png
share/gnome/help/gnibbles/es/figures/worm_op.png
share/gnome/help/gnibbles/es/gnibbles.xml
+share/gnome/help/gnibbles/eu/figures/connect.png
+share/gnome/help/gnibbles/eu/figures/game.png
+share/gnome/help/gnibbles/eu/figures/intro.png
+share/gnome/help/gnibbles/eu/figures/playing.png
+share/gnome/help/gnibbles/eu/figures/tables.png
+share/gnome/help/gnibbles/eu/figures/worm_op.png
+share/gnome/help/gnibbles/eu/gnibbles.xml
share/gnome/help/gnibbles/fr/figures/connect.png
share/gnome/help/gnibbles/fr/figures/game.png
share/gnome/help/gnibbles/fr/figures/intro.png
@@ -870,8 +992,12 @@ share/gnome/help/gnobots2/da/gnobots2.xml
share/gnome/help/gnobots2/da/legal.xml
share/gnome/help/gnobots2/de/figures/gnobots2-main.png
share/gnome/help/gnobots2/de/gnobots2.xml
+share/gnome/help/gnobots2/en_GB/figures/gnobots2-main.png
+share/gnome/help/gnobots2/en_GB/gnobots2.xml
share/gnome/help/gnobots2/es/figures/gnobots2-main.png
share/gnome/help/gnobots2/es/gnobots2.xml
+share/gnome/help/gnobots2/eu/figures/gnobots2-main.png
+share/gnome/help/gnobots2/eu/gnobots2.xml
share/gnome/help/gnobots2/fr/figures/gnobots2-main.png
share/gnome/help/gnobots2/fr/gnobots2.xml
share/gnome/help/gnobots2/it/figures/gnobots2-main.png
@@ -913,6 +1039,22 @@ share/gnome/help/gnome-sudoku/de/figures/hints.png
share/gnome/help/gnome-sudoku/de/figures/resuming.png
share/gnome/help/gnome-sudoku/de/figures/starting.png
share/gnome/help/gnome-sudoku/de/gnome-sudoku.xml
+share/gnome/help/gnome-sudoku/el/figures/Print_Sudokus.png
+share/gnome/help/gnome-sudoku/el/figures/always_show_hint.png
+share/gnome/help/gnome-sudoku/el/figures/error_highlighting.png
+share/gnome/help/gnome-sudoku/el/figures/highlighting.png
+share/gnome/help/gnome-sudoku/el/figures/hints.png
+share/gnome/help/gnome-sudoku/el/figures/resuming.png
+share/gnome/help/gnome-sudoku/el/figures/starting.png
+share/gnome/help/gnome-sudoku/el/gnome-sudoku.xml
+share/gnome/help/gnome-sudoku/en_GB/figures/Print_Sudokus.png
+share/gnome/help/gnome-sudoku/en_GB/figures/always_show_hint.png
+share/gnome/help/gnome-sudoku/en_GB/figures/error_highlighting.png
+share/gnome/help/gnome-sudoku/en_GB/figures/highlighting.png
+share/gnome/help/gnome-sudoku/en_GB/figures/hints.png
+share/gnome/help/gnome-sudoku/en_GB/figures/resuming.png
+share/gnome/help/gnome-sudoku/en_GB/figures/starting.png
+share/gnome/help/gnome-sudoku/en_GB/gnome-sudoku.xml
share/gnome/help/gnome-sudoku/es/figures/Print_Sudokus.png
share/gnome/help/gnome-sudoku/es/figures/always_show_hint.png
share/gnome/help/gnome-sudoku/es/figures/error_highlighting.png
@@ -921,6 +1063,14 @@ share/gnome/help/gnome-sudoku/es/figures/hints.png
share/gnome/help/gnome-sudoku/es/figures/resuming.png
share/gnome/help/gnome-sudoku/es/figures/starting.png
share/gnome/help/gnome-sudoku/es/gnome-sudoku.xml
+share/gnome/help/gnome-sudoku/eu/figures/Print_Sudokus.png
+share/gnome/help/gnome-sudoku/eu/figures/always_show_hint.png
+share/gnome/help/gnome-sudoku/eu/figures/error_highlighting.png
+share/gnome/help/gnome-sudoku/eu/figures/highlighting.png
+share/gnome/help/gnome-sudoku/eu/figures/hints.png
+share/gnome/help/gnome-sudoku/eu/figures/resuming.png
+share/gnome/help/gnome-sudoku/eu/figures/starting.png
+share/gnome/help/gnome-sudoku/eu/gnome-sudoku.xml
share/gnome/help/gnome-sudoku/fr/figures/Print_Sudokus.png
share/gnome/help/gnome-sudoku/fr/figures/always_show_hint.png
share/gnome/help/gnome-sudoku/fr/figures/error_highlighting.png
@@ -974,7 +1124,10 @@ share/gnome/help/gnometris/C/legal.xml
share/gnome/help/gnometris/ca/gnometris.xml
share/gnome/help/gnometris/de/gnometris.xml
share/gnome/help/gnometris/el/gnometris.xml
+share/gnome/help/gnometris/en_GB/gnometris.xml
share/gnome/help/gnometris/es/gnometris.xml
+share/gnome/help/gnometris/eu/gnometris.xml
+share/gnome/help/gnometris/fi/gnometris.xml
share/gnome/help/gnometris/fr/gnometris.xml
share/gnome/help/gnometris/it/gnometris.xml
share/gnome/help/gnometris/oc/gnometris.xml
@@ -1022,6 +1175,34 @@ share/gnome/help/gnomine/de/figures/main-window.png
share/gnome/help/gnomine/de/figures/preferences.png
share/gnome/help/gnomine/de/figures/statusbar.png
share/gnome/help/gnomine/de/gnomine.xml
+share/gnome/help/gnomine/el/figures/easy-hints-1.png
+share/gnome/help/gnomine/el/figures/easy-hints-2.png
+share/gnome/help/gnomine/el/figures/easy-hints-3.png
+share/gnome/help/gnomine/el/figures/faces.png
+share/gnome/help/gnomine/el/figures/flags.png
+share/gnome/help/gnomine/el/figures/hard-hints-1.png
+share/gnome/help/gnomine/el/figures/hard-hints-2.png
+share/gnome/help/gnomine/el/figures/hard-hints-3.png
+share/gnome/help/gnomine/el/figures/highscores.png
+share/gnome/help/gnomine/el/figures/imnotsureflagscheckbox.png
+share/gnome/help/gnomine/el/figures/main-window.png
+share/gnome/help/gnomine/el/figures/preferences.png
+share/gnome/help/gnomine/el/figures/statusbar.png
+share/gnome/help/gnomine/el/gnomine.xml
+share/gnome/help/gnomine/en_GB/figures/easy-hints-1.png
+share/gnome/help/gnomine/en_GB/figures/easy-hints-2.png
+share/gnome/help/gnomine/en_GB/figures/easy-hints-3.png
+share/gnome/help/gnomine/en_GB/figures/faces.png
+share/gnome/help/gnomine/en_GB/figures/flags.png
+share/gnome/help/gnomine/en_GB/figures/hard-hints-1.png
+share/gnome/help/gnomine/en_GB/figures/hard-hints-2.png
+share/gnome/help/gnomine/en_GB/figures/hard-hints-3.png
+share/gnome/help/gnomine/en_GB/figures/highscores.png
+share/gnome/help/gnomine/en_GB/figures/imnotsureflagscheckbox.png
+share/gnome/help/gnomine/en_GB/figures/main-window.png
+share/gnome/help/gnomine/en_GB/figures/preferences.png
+share/gnome/help/gnomine/en_GB/figures/statusbar.png
+share/gnome/help/gnomine/en_GB/gnomine.xml
share/gnome/help/gnomine/es/figures/easy-hints-1.png
share/gnome/help/gnomine/es/figures/easy-hints-2.png
share/gnome/help/gnomine/es/figures/easy-hints-3.png
@@ -1036,6 +1217,20 @@ share/gnome/help/gnomine/es/figures/main-window.png
share/gnome/help/gnomine/es/figures/preferences.png
share/gnome/help/gnomine/es/figures/statusbar.png
share/gnome/help/gnomine/es/gnomine.xml
+share/gnome/help/gnomine/eu/figures/easy-hints-1.png
+share/gnome/help/gnomine/eu/figures/easy-hints-2.png
+share/gnome/help/gnomine/eu/figures/easy-hints-3.png
+share/gnome/help/gnomine/eu/figures/faces.png
+share/gnome/help/gnomine/eu/figures/flags.png
+share/gnome/help/gnomine/eu/figures/hard-hints-1.png
+share/gnome/help/gnomine/eu/figures/hard-hints-2.png
+share/gnome/help/gnomine/eu/figures/hard-hints-3.png
+share/gnome/help/gnomine/eu/figures/highscores.png
+share/gnome/help/gnomine/eu/figures/imnotsureflagscheckbox.png
+share/gnome/help/gnomine/eu/figures/main-window.png
+share/gnome/help/gnomine/eu/figures/preferences.png
+share/gnome/help/gnomine/eu/figures/statusbar.png
+share/gnome/help/gnomine/eu/gnomine.xml
share/gnome/help/gnomine/fr/figures/easy-hints-1.png
share/gnome/help/gnomine/fr/figures/easy-hints-2.png
share/gnome/help/gnomine/fr/figures/easy-hints-3.png
@@ -1105,9 +1300,15 @@ share/gnome/help/gnotravex/de/gnotravex.xml
share/gnome/help/gnotravex/el/figures/gnotravex_game.png
share/gnome/help/gnotravex/el/figures/gnotravex_mainwindow.png
share/gnome/help/gnotravex/el/gnotravex.xml
+share/gnome/help/gnotravex/en_GB/figures/gnotravex_game.png
+share/gnome/help/gnotravex/en_GB/figures/gnotravex_mainwindow.png
+share/gnome/help/gnotravex/en_GB/gnotravex.xml
share/gnome/help/gnotravex/es/figures/gnotravex_game.png
share/gnome/help/gnotravex/es/figures/gnotravex_mainwindow.png
share/gnome/help/gnotravex/es/gnotravex.xml
+share/gnome/help/gnotravex/eu/figures/gnotravex_game.png
+share/gnome/help/gnotravex/eu/figures/gnotravex_mainwindow.png
+share/gnome/help/gnotravex/eu/gnotravex.xml
share/gnome/help/gnotravex/fr/figures/gnotravex_game.png
share/gnome/help/gnotravex/fr/figures/gnotravex_mainwindow.png
share/gnome/help/gnotravex/fr/gnotravex.xml
@@ -1133,9 +1334,15 @@ share/gnome/help/gnotski/ca/gnotski.xml
share/gnome/help/gnotski/de/figures/gnotski_start_window.png
share/gnome/help/gnotski/de/figures/gnotski_win.png
share/gnome/help/gnotski/de/gnotski.xml
+share/gnome/help/gnotski/en_GB/figures/gnotski_start_window.png
+share/gnome/help/gnotski/en_GB/figures/gnotski_win.png
+share/gnome/help/gnotski/en_GB/gnotski.xml
share/gnome/help/gnotski/es/figures/gnotski_start_window.png
share/gnome/help/gnotski/es/figures/gnotski_win.png
share/gnome/help/gnotski/es/gnotski.xml
+share/gnome/help/gnotski/eu/figures/gnotski_start_window.png
+share/gnome/help/gnotski/eu/figures/gnotski_win.png
+share/gnome/help/gnotski/eu/gnotski.xml
share/gnome/help/gnotski/fr/figures/gnotski_start_window.png
share/gnome/help/gnotski/fr/figures/gnotski_win.png
share/gnome/help/gnotski/fr/gnotski.xml
@@ -1160,9 +1367,18 @@ share/gnome/help/gtali/da/legal.xml
share/gnome/help/gtali/de/figures/mainwindow.png
share/gnome/help/gtali/de/figures/preferences.png
share/gnome/help/gtali/de/gtali.xml
+share/gnome/help/gtali/el/figures/mainwindow.png
+share/gnome/help/gtali/el/figures/preferences.png
+share/gnome/help/gtali/el/gtali.xml
+share/gnome/help/gtali/en_GB/figures/mainwindow.png
+share/gnome/help/gtali/en_GB/figures/preferences.png
+share/gnome/help/gtali/en_GB/gtali.xml
share/gnome/help/gtali/es/figures/mainwindow.png
share/gnome/help/gtali/es/figures/preferences.png
share/gnome/help/gtali/es/gtali.xml
+share/gnome/help/gtali/eu/figures/mainwindow.png
+share/gnome/help/gtali/eu/figures/preferences.png
+share/gnome/help/gtali/eu/gtali.xml
share/gnome/help/gtali/fr/figures/mainwindow.png
share/gnome/help/gtali/fr/figures/preferences.png
share/gnome/help/gtali/fr/gtali.xml
@@ -1204,6 +1420,22 @@ share/gnome/help/iagno/de/figures/START.png
share/gnome/help/iagno/de/figures/connect.png
share/gnome/help/iagno/de/figures/tables.png
share/gnome/help/iagno/de/iagno.xml
+share/gnome/help/iagno/el/figures/ANIMATION.png
+share/gnome/help/iagno/el/figures/BLOCK.png
+share/gnome/help/iagno/el/figures/FIRST.png
+share/gnome/help/iagno/el/figures/PLAYER.png
+share/gnome/help/iagno/el/figures/START.png
+share/gnome/help/iagno/el/figures/connect.png
+share/gnome/help/iagno/el/figures/tables.png
+share/gnome/help/iagno/el/iagno.xml
+share/gnome/help/iagno/en_GB/figures/ANIMATION.png
+share/gnome/help/iagno/en_GB/figures/BLOCK.png
+share/gnome/help/iagno/en_GB/figures/FIRST.png
+share/gnome/help/iagno/en_GB/figures/PLAYER.png
+share/gnome/help/iagno/en_GB/figures/START.png
+share/gnome/help/iagno/en_GB/figures/connect.png
+share/gnome/help/iagno/en_GB/figures/tables.png
+share/gnome/help/iagno/en_GB/iagno.xml
share/gnome/help/iagno/es/figures/ANIMATION.png
share/gnome/help/iagno/es/figures/BLOCK.png
share/gnome/help/iagno/es/figures/FIRST.png
@@ -1212,6 +1444,14 @@ share/gnome/help/iagno/es/figures/START.png
share/gnome/help/iagno/es/figures/connect.png
share/gnome/help/iagno/es/figures/tables.png
share/gnome/help/iagno/es/iagno.xml
+share/gnome/help/iagno/eu/figures/ANIMATION.png
+share/gnome/help/iagno/eu/figures/BLOCK.png
+share/gnome/help/iagno/eu/figures/FIRST.png
+share/gnome/help/iagno/eu/figures/PLAYER.png
+share/gnome/help/iagno/eu/figures/START.png
+share/gnome/help/iagno/eu/figures/connect.png
+share/gnome/help/iagno/eu/figures/tables.png
+share/gnome/help/iagno/eu/iagno.xml
share/gnome/help/iagno/fr/figures/ANIMATION.png
share/gnome/help/iagno/fr/figures/BLOCK.png
share/gnome/help/iagno/fr/figures/FIRST.png
@@ -1268,11 +1508,26 @@ share/gnome/help/mahjongg/de/figures/no-move.png
share/gnome/help/mahjongg/de/figures/preferences.png
share/gnome/help/mahjongg/de/figures/toolbar.png
share/gnome/help/mahjongg/de/mahjongg.xml
+share/gnome/help/mahjongg/el/figures/mahjongg.png
+share/gnome/help/mahjongg/el/figures/no-move.png
+share/gnome/help/mahjongg/el/figures/preferences.png
+share/gnome/help/mahjongg/el/figures/toolbar.png
+share/gnome/help/mahjongg/el/mahjongg.xml
+share/gnome/help/mahjongg/en_GB/figures/mahjongg.png
+share/gnome/help/mahjongg/en_GB/figures/no-move.png
+share/gnome/help/mahjongg/en_GB/figures/preferences.png
+share/gnome/help/mahjongg/en_GB/figures/toolbar.png
+share/gnome/help/mahjongg/en_GB/mahjongg.xml
share/gnome/help/mahjongg/es/figures/mahjongg.png
share/gnome/help/mahjongg/es/figures/no-move.png
share/gnome/help/mahjongg/es/figures/preferences.png
share/gnome/help/mahjongg/es/figures/toolbar.png
share/gnome/help/mahjongg/es/mahjongg.xml
+share/gnome/help/mahjongg/eu/figures/mahjongg.png
+share/gnome/help/mahjongg/eu/figures/no-move.png
+share/gnome/help/mahjongg/eu/figures/preferences.png
+share/gnome/help/mahjongg/eu/figures/toolbar.png
+share/gnome/help/mahjongg/eu/mahjongg.xml
share/gnome/help/mahjongg/fr/figures/mahjongg.png
share/gnome/help/mahjongg/fr/figures/no-move.png
share/gnome/help/mahjongg/fr/figures/preferences.png
@@ -1313,6 +1568,10 @@ share/gnome/help/same-gnome/es/figures/play.png
share/gnome/help/same-gnome/es/figures/start-up.png
share/gnome/help/same-gnome/es/legal.xml
share/gnome/help/same-gnome/es/same-gnome.xml
+share/gnome/help/same-gnome/eu/figures/play.png
+share/gnome/help/same-gnome/eu/figures/start-up.png
+share/gnome/help/same-gnome/eu/legal.xml
+share/gnome/help/same-gnome/eu/same-gnome.xml
share/gnome/help/same-gnome/fr/figures/play.png
share/gnome/help/same-gnome/fr/figures/start-up.png
share/gnome/help/same-gnome/fr/legal.xml
@@ -1428,6 +1687,8 @@ share/icons/hicolor/scalable/apps/gnome-gnibbles.svg
share/icons/hicolor/scalable/apps/gnome-gnometris.svg
share/icons/hicolor/scalable/apps/gnome-iagno.svg
share/icons/hicolor/scalable/apps/gnome-klotski.svg
+share/icons/hicolor/scalable/apps/gnome-lightsoff.svg
+share/icons/hicolor/scalable/apps/gnome-mahjongg.svg
share/icons/hicolor/scalable/apps/gnome-mines.svg
share/icons/hicolor/scalable/apps/gnome-robots.svg
share/icons/hicolor/scalable/apps/gnome-samegnome.svg
@@ -1473,7 +1734,6 @@ share/locale/ka/LC_MESSAGES/gnome-games.mo
share/locale/kn/LC_MESSAGES/gnome-games.mo
share/locale/ko/LC_MESSAGES/gnome-games.mo
share/locale/ku/LC_MESSAGES/gnome-games.mo
-share/locale/la/LC_MESSAGES/gnome-games.mo
share/locale/lt/LC_MESSAGES/gnome-games.mo
share/locale/lv/LC_MESSAGES/gnome-games.mo
share/locale/mai/LC_MESSAGES/gnome-games.mo
@@ -1517,6 +1777,7 @@ share/omf/aisleriot/aisleriot-C.omf
share/omf/aisleriot/aisleriot-ca.omf
share/omf/aisleriot/aisleriot-de.omf
share/omf/aisleriot/aisleriot-es.omf
+share/omf/aisleriot/aisleriot-eu.omf
share/omf/aisleriot/aisleriot-fr.omf
share/omf/aisleriot/aisleriot-oc.omf
share/omf/aisleriot/aisleriot-ru.omf
@@ -1525,7 +1786,9 @@ share/omf/blackjack/blackjack-C.omf
share/omf/blackjack/blackjack-ca.omf
share/omf/blackjack/blackjack-de.omf
share/omf/blackjack/blackjack-el.omf
+share/omf/blackjack/blackjack-en_GB.omf
share/omf/blackjack/blackjack-es.omf
+share/omf/blackjack/blackjack-eu.omf
share/omf/blackjack/blackjack-fr.omf
share/omf/blackjack/blackjack-oc.omf
share/omf/blackjack/blackjack-sv.omf
@@ -1533,7 +1796,9 @@ share/omf/glchess/glchess-C.omf
share/omf/glchess/glchess-ca.omf
share/omf/glchess/glchess-de.omf
share/omf/glchess/glchess-el.omf
+share/omf/glchess/glchess-en_GB.omf
share/omf/glchess/glchess-es.omf
+share/omf/glchess/glchess-eu.omf
share/omf/glchess/glchess-fr.omf
share/omf/glchess/glchess-oc.omf
share/omf/glchess/glchess-pt_BR.omf
@@ -1544,6 +1809,7 @@ share/omf/glines/glines-ca.omf
share/omf/glines/glines-de.omf
share/omf/glines/glines-en_GB.omf
share/omf/glines/glines-es.omf
+share/omf/glines/glines-eu.omf
share/omf/glines/glines-fr.omf
share/omf/glines/glines-it.omf
share/omf/glines/glines-oc.omf
@@ -1555,6 +1821,7 @@ share/omf/gnect/gnect-ca.omf
share/omf/gnect/gnect-de.omf
share/omf/gnect/gnect-en_GB.omf
share/omf/gnect/gnect-es.omf
+share/omf/gnect/gnect-eu.omf
share/omf/gnect/gnect-fr.omf
share/omf/gnect/gnect-it.omf
share/omf/gnect/gnect-oc.omf
@@ -1562,7 +1829,9 @@ share/omf/gnect/gnect-sv.omf
share/omf/gnibbles/gnibbles-C.omf
share/omf/gnibbles/gnibbles-ca.omf
share/omf/gnibbles/gnibbles-de.omf
+share/omf/gnibbles/gnibbles-en_GB.omf
share/omf/gnibbles/gnibbles-es.omf
+share/omf/gnibbles/gnibbles-eu.omf
share/omf/gnibbles/gnibbles-fr.omf
share/omf/gnibbles/gnibbles-it.omf
share/omf/gnibbles/gnibbles-oc.omf
@@ -1570,7 +1839,9 @@ share/omf/gnibbles/gnibbles-sv.omf
share/omf/gnobots2/gnobots2-C.omf
share/omf/gnobots2/gnobots2-ca.omf
share/omf/gnobots2/gnobots2-de.omf
+share/omf/gnobots2/gnobots2-en_GB.omf
share/omf/gnobots2/gnobots2-es.omf
+share/omf/gnobots2/gnobots2-eu.omf
share/omf/gnobots2/gnobots2-fr.omf
share/omf/gnobots2/gnobots2-it.omf
share/omf/gnobots2/gnobots2-oc.omf
@@ -1581,7 +1852,10 @@ share/omf/gnome-sudoku/gnome-sudoku-C.omf
share/omf/gnome-sudoku/gnome-sudoku-ca.omf
share/omf/gnome-sudoku/gnome-sudoku-da.omf
share/omf/gnome-sudoku/gnome-sudoku-de.omf
+share/omf/gnome-sudoku/gnome-sudoku-el.omf
+share/omf/gnome-sudoku/gnome-sudoku-en_GB.omf
share/omf/gnome-sudoku/gnome-sudoku-es.omf
+share/omf/gnome-sudoku/gnome-sudoku-eu.omf
share/omf/gnome-sudoku/gnome-sudoku-fr.omf
share/omf/gnome-sudoku/gnome-sudoku-it.omf
share/omf/gnome-sudoku/gnome-sudoku-oc.omf
@@ -1592,7 +1866,10 @@ share/omf/gnometris/gnometris-C.omf
share/omf/gnometris/gnometris-ca.omf
share/omf/gnometris/gnometris-de.omf
share/omf/gnometris/gnometris-el.omf
+share/omf/gnometris/gnometris-en_GB.omf
share/omf/gnometris/gnometris-es.omf
+share/omf/gnometris/gnometris-eu.omf
+share/omf/gnometris/gnometris-fi.omf
share/omf/gnometris/gnometris-fr.omf
share/omf/gnometris/gnometris-it.omf
share/omf/gnometris/gnometris-oc.omf
@@ -1600,7 +1877,10 @@ share/omf/gnometris/gnometris-sv.omf
share/omf/gnomine/gnomine-C.omf
share/omf/gnomine/gnomine-ca.omf
share/omf/gnomine/gnomine-de.omf
+share/omf/gnomine/gnomine-el.omf
+share/omf/gnomine/gnomine-en_GB.omf
share/omf/gnomine/gnomine-es.omf
+share/omf/gnomine/gnomine-eu.omf
share/omf/gnomine/gnomine-fr.omf
share/omf/gnomine/gnomine-it.omf
share/omf/gnomine/gnomine-oc.omf
@@ -1609,7 +1889,9 @@ share/omf/gnotravex/gnotravex-C.omf
share/omf/gnotravex/gnotravex-ca.omf
share/omf/gnotravex/gnotravex-de.omf
share/omf/gnotravex/gnotravex-el.omf
+share/omf/gnotravex/gnotravex-en_GB.omf
share/omf/gnotravex/gnotravex-es.omf
+share/omf/gnotravex/gnotravex-eu.omf
share/omf/gnotravex/gnotravex-fr.omf
share/omf/gnotravex/gnotravex-it.omf
share/omf/gnotravex/gnotravex-oc.omf
@@ -1618,7 +1900,9 @@ share/omf/gnotravex/gnotravex-sv.omf
share/omf/gnotski/gnotski-C.omf
share/omf/gnotski/gnotski-ca.omf
share/omf/gnotski/gnotski-de.omf
+share/omf/gnotski/gnotski-en_GB.omf
share/omf/gnotski/gnotski-es.omf
+share/omf/gnotski/gnotski-eu.omf
share/omf/gnotski/gnotski-fr.omf
share/omf/gnotski/gnotski-it.omf
share/omf/gnotski/gnotski-oc.omf
@@ -1626,7 +1910,10 @@ share/omf/gnotski/gnotski-sv.omf
share/omf/gtali/gtali-C.omf
share/omf/gtali/gtali-ca.omf
share/omf/gtali/gtali-de.omf
+share/omf/gtali/gtali-el.omf
+share/omf/gtali/gtali-en_GB.omf
share/omf/gtali/gtali-es.omf
+share/omf/gtali/gtali-eu.omf
share/omf/gtali/gtali-fr.omf
share/omf/gtali/gtali-it.omf
share/omf/gtali/gtali-oc.omf
@@ -1635,7 +1922,10 @@ share/omf/gtali/gtali-sv.omf
share/omf/iagno/iagno-C.omf
share/omf/iagno/iagno-ca.omf
share/omf/iagno/iagno-de.omf
+share/omf/iagno/iagno-el.omf
+share/omf/iagno/iagno-en_GB.omf
share/omf/iagno/iagno-es.omf
+share/omf/iagno/iagno-eu.omf
share/omf/iagno/iagno-fr.omf
share/omf/iagno/iagno-it.omf
share/omf/iagno/iagno-oc.omf
@@ -1644,7 +1934,10 @@ share/omf/iagno/iagno-sv.omf
share/omf/mahjongg/mahjongg-C.omf
share/omf/mahjongg/mahjongg-ca.omf
share/omf/mahjongg/mahjongg-de.omf
+share/omf/mahjongg/mahjongg-el.omf
+share/omf/mahjongg/mahjongg-en_GB.omf
share/omf/mahjongg/mahjongg-es.omf
+share/omf/mahjongg/mahjongg-eu.omf
share/omf/mahjongg/mahjongg-fr.omf
share/omf/mahjongg/mahjongg-it.omf
share/omf/mahjongg/mahjongg-oc.omf
@@ -1654,6 +1947,7 @@ share/omf/same-gnome/same-gnome-ca.omf
share/omf/same-gnome/same-gnome-de.omf
share/omf/same-gnome/same-gnome-en_GB.omf
share/omf/same-gnome/same-gnome-es.omf
+share/omf/same-gnome/same-gnome-eu.omf
share/omf/same-gnome/same-gnome-fr.omf
share/omf/same-gnome/same-gnome-it.omf
share/omf/same-gnome/same-gnome-oc.omf
@@ -1661,97 +1955,8 @@ share/omf/same-gnome/same-gnome-ru.omf
share/omf/same-gnome/same-gnome-sv.omf
share/pixmaps/glchess/board.png
share/pixmaps/glchess/piece.png
-share/pixmaps/glines/balls.svg
-share/pixmaps/glines/shapes.svg
-share/pixmaps/gnect/bg_grotty.jpg
-share/pixmaps/gnect/bg_nightfall.jpg
-share/pixmaps/gnect/bg_toplight.png
-share/pixmaps/gnect/tileset_50x50_catseyes.png
-share/pixmaps/gnect/tileset_50x50_glassy.png
-share/pixmaps/gnect/tileset_50x50_hcinverse.svg
-share/pixmaps/gnect/tileset_50x50_hcontrast.svg
-share/pixmaps/gnect/tileset_50x50_square.png
-share/pixmaps/gnect/tileset_50x50_sunspot.svg
-share/pixmaps/gnibbles/blank.svg
-share/pixmaps/gnibbles/bonus1.svg
-share/pixmaps/gnibbles/bonus2.svg
-share/pixmaps/gnibbles/bonus3.svg
-share/pixmaps/gnibbles/bonus4.svg
-share/pixmaps/gnibbles/bonus5.svg
-share/pixmaps/gnibbles/diamond.svg
-share/pixmaps/gnibbles/gnibbles-logo.svg
-share/pixmaps/gnibbles/life.svg
-share/pixmaps/gnibbles/questionmark.svg
-share/pixmaps/gnibbles/snake-blue.svg
-share/pixmaps/gnibbles/snake-cyan.svg
-share/pixmaps/gnibbles/snake-green.svg
-share/pixmaps/gnibbles/snake-grey.svg
-share/pixmaps/gnibbles/snake-magenta.svg
-share/pixmaps/gnibbles/snake-red.svg
-share/pixmaps/gnibbles/snake-yellow.svg
-share/pixmaps/gnibbles/wall-corner-bottom-left.svg
-share/pixmaps/gnibbles/wall-corner-bottom-right.svg
-share/pixmaps/gnibbles/wall-corner-top-left.svg
-share/pixmaps/gnibbles/wall-corner-top-right.svg
-share/pixmaps/gnibbles/wall-cross.svg
-share/pixmaps/gnibbles/wall-empty.svg
-share/pixmaps/gnibbles/wall-straight-side.svg
-share/pixmaps/gnibbles/wall-straight-up.svg
-share/pixmaps/gnibbles/wall-tee-down.svg
-share/pixmaps/gnibbles/wall-tee-left.svg
-share/pixmaps/gnibbles/wall-tee-right.svg
-share/pixmaps/gnibbles/wall-tee-up.svg
-share/pixmaps/gnobots2/aieee.png
-share/pixmaps/gnobots2/boo.svg
-share/pixmaps/gnobots2/gnomes.png
-share/pixmaps/gnobots2/robots.svg
-share/pixmaps/gnobots2/splat.png
-share/pixmaps/gnobots2/ufo.svg
-share/pixmaps/gnobots2/yahoo.png
share/pixmaps/gnome-sudoku/footprints.png
-share/pixmaps/gnometris/7blocks-gw.png
-share/pixmaps/gnometris/7blocks-tig.png
-share/pixmaps/gnometris/gnometris.svg
-share/pixmaps/gnomine/bang.svg
-share/pixmaps/gnomine/face-cool.svg
-share/pixmaps/gnomine/face-sad.svg
-share/pixmaps/gnomine/face-smile.svg
-share/pixmaps/gnomine/face-win.svg
-share/pixmaps/gnomine/face-worried.svg
-share/pixmaps/gnomine/flag-question.svg
-share/pixmaps/gnomine/flag.svg
-share/pixmaps/gnomine/mine.svg
-share/pixmaps/gnomine/warning.svg
-share/pixmaps/gnotravex/baize.png
-share/pixmaps/gtali/gnome-dice-1.svg
-share/pixmaps/gtali/gnome-dice-2.svg
-share/pixmaps/gtali/gnome-dice-3.svg
-share/pixmaps/gtali/gnome-dice-4.svg
-share/pixmaps/gtali/gnome-dice-5.svg
-share/pixmaps/gtali/gnome-dice-6.svg
-share/pixmaps/gtali/gnome-dice-none.svg
-share/pixmaps/gtali/kismet-none.svg
-share/pixmaps/gtali/kismet1.svg
-share/pixmaps/gtali/kismet2.svg
-share/pixmaps/gtali/kismet3.svg
-share/pixmaps/gtali/kismet4.svg
-share/pixmaps/gtali/kismet5.svg
-share/pixmaps/gtali/kismet6.svg
-share/pixmaps/iagno/classic.png
-share/pixmaps/iagno/woodtrim.png
-share/pixmaps/mahjongg/postmodern.svg
-share/pixmaps/mahjongg/smooth.png
-@dirrm share/pixmaps/mahjongg
-@dirrm share/pixmaps/iagno
-@dirrm share/pixmaps/gtali
-@dirrm share/pixmaps/gnotravex
-@dirrm share/pixmaps/gnomine
-@dirrm share/pixmaps/gnometris
@dirrm share/pixmaps/gnome-sudoku
-@dirrm share/pixmaps/gnobots2
-@dirrm share/pixmaps/gnibbles
-@dirrm share/pixmaps/gnect
-@dirrm share/pixmaps/glines
@dirrm share/pixmaps/glchess
@dirrm share/omf/same-gnome
@dirrm share/omf/mahjongg
@@ -1780,6 +1985,8 @@ share/pixmaps/mahjongg/smooth.png
@dirrm share/gnome/help/same-gnome/it
@dirrm share/gnome/help/same-gnome/fr/figures
@dirrm share/gnome/help/same-gnome/fr
+@dirrm share/gnome/help/same-gnome/eu/figures
+@dirrm share/gnome/help/same-gnome/eu
@dirrm share/gnome/help/same-gnome/es/figures
@dirrm share/gnome/help/same-gnome/es
@dirrm share/gnome/help/same-gnome/en_GB/figures
@@ -1799,8 +2006,14 @@ share/pixmaps/mahjongg/smooth.png
@dirrm share/gnome/help/mahjongg/it
@dirrm share/gnome/help/mahjongg/fr/figures
@dirrm share/gnome/help/mahjongg/fr
+@dirrm share/gnome/help/mahjongg/eu/figures
+@dirrm share/gnome/help/mahjongg/eu
@dirrm share/gnome/help/mahjongg/es/figures
@dirrm share/gnome/help/mahjongg/es
+@dirrm share/gnome/help/mahjongg/en_GB/figures
+@dirrm share/gnome/help/mahjongg/en_GB
+@dirrm share/gnome/help/mahjongg/el/figures
+@dirrm share/gnome/help/mahjongg/el
@dirrm share/gnome/help/mahjongg/de/figures
@dirrm share/gnome/help/mahjongg/de
@dirrm share/gnome/help/mahjongg/ca/figures
@@ -1818,8 +2031,14 @@ share/pixmaps/mahjongg/smooth.png
@dirrm share/gnome/help/iagno/it
@dirrm share/gnome/help/iagno/fr/figures
@dirrm share/gnome/help/iagno/fr
+@dirrm share/gnome/help/iagno/eu/figures
+@dirrm share/gnome/help/iagno/eu
@dirrm share/gnome/help/iagno/es/figures
@dirrm share/gnome/help/iagno/es
+@dirrm share/gnome/help/iagno/en_GB/figures
+@dirrm share/gnome/help/iagno/en_GB
+@dirrm share/gnome/help/iagno/el/figures
+@dirrm share/gnome/help/iagno/el
@dirrm share/gnome/help/iagno/de/figures
@dirrm share/gnome/help/iagno/de
@dirrm share/gnome/help/iagno/ca/figures
@@ -1837,8 +2056,14 @@ share/pixmaps/mahjongg/smooth.png
@dirrm share/gnome/help/gtali/it
@dirrm share/gnome/help/gtali/fr/figures
@dirrm share/gnome/help/gtali/fr
+@dirrm share/gnome/help/gtali/eu/figures
+@dirrm share/gnome/help/gtali/eu
@dirrm share/gnome/help/gtali/es/figures
@dirrm share/gnome/help/gtali/es
+@dirrm share/gnome/help/gtali/en_GB/figures
+@dirrm share/gnome/help/gtali/en_GB
+@dirrm share/gnome/help/gtali/el/figures
+@dirrm share/gnome/help/gtali/el
@dirrm share/gnome/help/gtali/de/figures
@dirrm share/gnome/help/gtali/de
@dirrm share/gnome/help/gtali/da
@@ -1855,8 +2080,12 @@ share/pixmaps/mahjongg/smooth.png
@dirrm share/gnome/help/gnotski/it
@dirrm share/gnome/help/gnotski/fr/figures
@dirrm share/gnome/help/gnotski/fr
+@dirrm share/gnome/help/gnotski/eu/figures
+@dirrm share/gnome/help/gnotski/eu
@dirrm share/gnome/help/gnotski/es/figures
@dirrm share/gnome/help/gnotski/es
+@dirrm share/gnome/help/gnotski/en_GB/figures
+@dirrm share/gnome/help/gnotski/en_GB
@dirrm share/gnome/help/gnotski/de/figures
@dirrm share/gnome/help/gnotski/de
@dirrm share/gnome/help/gnotski/ca/figures
@@ -1874,8 +2103,12 @@ share/pixmaps/mahjongg/smooth.png
@dirrm share/gnome/help/gnotravex/it
@dirrm share/gnome/help/gnotravex/fr/figures
@dirrm share/gnome/help/gnotravex/fr
+@dirrm share/gnome/help/gnotravex/eu/figures
+@dirrm share/gnome/help/gnotravex/eu
@dirrm share/gnome/help/gnotravex/es/figures
@dirrm share/gnome/help/gnotravex/es
+@dirrm share/gnome/help/gnotravex/en_GB/figures
+@dirrm share/gnome/help/gnotravex/en_GB
@dirrm share/gnome/help/gnotravex/el/figures
@dirrm share/gnome/help/gnotravex/el
@dirrm share/gnome/help/gnotravex/de/figures
@@ -1893,8 +2126,14 @@ share/pixmaps/mahjongg/smooth.png
@dirrm share/gnome/help/gnomine/it
@dirrm share/gnome/help/gnomine/fr/figures
@dirrm share/gnome/help/gnomine/fr
+@dirrm share/gnome/help/gnomine/eu/figures
+@dirrm share/gnome/help/gnomine/eu
@dirrm share/gnome/help/gnomine/es/figures
@dirrm share/gnome/help/gnomine/es
+@dirrm share/gnome/help/gnomine/en_GB/figures
+@dirrm share/gnome/help/gnomine/en_GB
+@dirrm share/gnome/help/gnomine/el/figures
+@dirrm share/gnome/help/gnomine/el
@dirrm share/gnome/help/gnomine/de/figures
@dirrm share/gnome/help/gnomine/de
@dirrm share/gnome/help/gnomine/ca/figures
@@ -1906,7 +2145,10 @@ share/pixmaps/mahjongg/smooth.png
@dirrm share/gnome/help/gnometris/oc
@dirrm share/gnome/help/gnometris/it
@dirrm share/gnome/help/gnometris/fr
+@dirrm share/gnome/help/gnometris/fi
+@dirrm share/gnome/help/gnometris/eu
@dirrm share/gnome/help/gnometris/es
+@dirrm share/gnome/help/gnometris/en_GB
@dirrm share/gnome/help/gnometris/el
@dirrm share/gnome/help/gnometris/de
@dirrm share/gnome/help/gnometris/ca
@@ -1924,8 +2166,14 @@ share/pixmaps/mahjongg/smooth.png
@dirrm share/gnome/help/gnome-sudoku/it
@dirrm share/gnome/help/gnome-sudoku/fr/figures
@dirrm share/gnome/help/gnome-sudoku/fr
+@dirrm share/gnome/help/gnome-sudoku/eu/figures
+@dirrm share/gnome/help/gnome-sudoku/eu
@dirrm share/gnome/help/gnome-sudoku/es/figures
@dirrm share/gnome/help/gnome-sudoku/es
+@dirrm share/gnome/help/gnome-sudoku/en_GB/figures
+@dirrm share/gnome/help/gnome-sudoku/en_GB
+@dirrm share/gnome/help/gnome-sudoku/el/figures
+@dirrm share/gnome/help/gnome-sudoku/el
@dirrm share/gnome/help/gnome-sudoku/de/figures
@dirrm share/gnome/help/gnome-sudoku/de
@dirrm share/gnome/help/gnome-sudoku/da/figures
@@ -1943,8 +2191,12 @@ share/pixmaps/mahjongg/smooth.png
@dirrm share/gnome/help/gnobots2/it
@dirrm share/gnome/help/gnobots2/fr/figures
@dirrm share/gnome/help/gnobots2/fr
+@dirrm share/gnome/help/gnobots2/eu/figures
+@dirrm share/gnome/help/gnobots2/eu
@dirrm share/gnome/help/gnobots2/es/figures
@dirrm share/gnome/help/gnobots2/es
+@dirrm share/gnome/help/gnobots2/en_GB/figures
+@dirrm share/gnome/help/gnobots2/en_GB
@dirrm share/gnome/help/gnobots2/de/figures
@dirrm share/gnome/help/gnobots2/de
@dirrm share/gnome/help/gnobots2/da
@@ -1961,8 +2213,12 @@ share/pixmaps/mahjongg/smooth.png
@dirrm share/gnome/help/gnibbles/it
@dirrm share/gnome/help/gnibbles/fr/figures
@dirrm share/gnome/help/gnibbles/fr
+@dirrm share/gnome/help/gnibbles/eu/figures
+@dirrm share/gnome/help/gnibbles/eu
@dirrm share/gnome/help/gnibbles/es/figures
@dirrm share/gnome/help/gnibbles/es
+@dirrm share/gnome/help/gnibbles/en_GB/figures
+@dirrm share/gnome/help/gnibbles/en_GB
@dirrm share/gnome/help/gnibbles/de/figures
@dirrm share/gnome/help/gnibbles/de
@dirrm share/gnome/help/gnibbles/ca/figures
@@ -1978,6 +2234,8 @@ share/pixmaps/mahjongg/smooth.png
@dirrm share/gnome/help/gnect/it
@dirrm share/gnome/help/gnect/fr/figures
@dirrm share/gnome/help/gnect/fr
+@dirrm share/gnome/help/gnect/eu/figures
+@dirrm share/gnome/help/gnect/eu
@dirrm share/gnome/help/gnect/es/figures
@dirrm share/gnome/help/gnect/es
@dirrm share/gnome/help/gnect/en_GB/figures
@@ -2001,6 +2259,8 @@ share/pixmaps/mahjongg/smooth.png
@dirrm share/gnome/help/glines/it
@dirrm share/gnome/help/glines/fr/figures
@dirrm share/gnome/help/glines/fr
+@dirrm share/gnome/help/glines/eu/figures
+@dirrm share/gnome/help/glines/eu
@dirrm share/gnome/help/glines/es/figures
@dirrm share/gnome/help/glines/es
@dirrm share/gnome/help/glines/en_GB/figures
@@ -2022,8 +2282,12 @@ share/pixmaps/mahjongg/smooth.png
@dirrm share/gnome/help/glchess/oc
@dirrm share/gnome/help/glchess/fr/figures
@dirrm share/gnome/help/glchess/fr
+@dirrm share/gnome/help/glchess/eu/figures
+@dirrm share/gnome/help/glchess/eu
@dirrm share/gnome/help/glchess/es/figures
@dirrm share/gnome/help/glchess/es
+@dirrm share/gnome/help/glchess/en_GB/figures
+@dirrm share/gnome/help/glchess/en_GB
@dirrm share/gnome/help/glchess/el/figures
@dirrm share/gnome/help/glchess/el
@dirrm share/gnome/help/glchess/de/figures
@@ -2039,8 +2303,12 @@ share/pixmaps/mahjongg/smooth.png
@dirrm share/gnome/help/blackjack/oc
@dirrm share/gnome/help/blackjack/fr/figures
@dirrm share/gnome/help/blackjack/fr
+@dirrm share/gnome/help/blackjack/eu/figures
+@dirrm share/gnome/help/blackjack/eu
@dirrm share/gnome/help/blackjack/es/figures
@dirrm share/gnome/help/blackjack/es
+@dirrm share/gnome/help/blackjack/en_GB/figures
+@dirrm share/gnome/help/blackjack/en_GB
@dirrm share/gnome/help/blackjack/el/figures
@dirrm share/gnome/help/blackjack/el
@dirrm share/gnome/help/blackjack/de/figures
@@ -2058,6 +2326,8 @@ share/pixmaps/mahjongg/smooth.png
@dirrm share/gnome/help/aisleriot/oc
@dirrm share/gnome/help/aisleriot/fr/figures
@dirrm share/gnome/help/aisleriot/fr
+@dirrm share/gnome/help/aisleriot/eu/figures
+@dirrm share/gnome/help/aisleriot/eu
@dirrm share/gnome/help/aisleriot/es/figures
@dirrm share/gnome/help/aisleriot/es
@dirrm share/gnome/help/aisleriot/de/figures
@@ -2074,7 +2344,8 @@ share/pixmaps/mahjongg/smooth.png
@dirrm %%DATADIR%%/same-gnome/themes
@dirrm %%DATADIR%%/same-gnome
@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/mahjongg/maps
+@dirrm %%DATADIR%%/mahjongg/pixmaps
+@dirrm %%DATADIR%%/mahjongg/games
@dirrm %%DATADIR%%/mahjongg
@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
@dirrm %%DATADIR%%/icons/hicolor/scalable
@@ -2082,18 +2353,34 @@ share/pixmaps/mahjongg/smooth.png
@dirrm %%DATADIR%%/icons/hicolor/24x24
@dirrm %%DATADIR%%/icons/hicolor
@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/iagno/pixmaps
+@dirrm %%DATADIR%%/iagno
+@dirrm %%DATADIR%%/gtali/pixmaps
+@dirrm %%DATADIR%%/gtali
+@dirrm %%DATADIR%%/gnotski/pixmaps
@dirrm %%DATADIR%%/gnotski
-@dirrm %%DATADIR%%/blackjack/rules
+@dirrm %%DATADIR%%/gnomine/pixmaps
+@dirrm %%DATADIR%%/gnomine
+@dirrm %%DATADIR%%/gnometris/pixmaps
+@dirrm %%DATADIR%%/gnometris
+@dirrm %%DATADIR%%/gnobots2/pixmaps
+@dirrm %%DATADIR%%/gnobots2/games
+@dirrm %%DATADIR%%/gnobots2
+@dirrm %%DATADIR%%/gnibbles/pixmaps
+@dirrm %%DATADIR%%/gnibbles/games
+@dirrm %%DATADIR%%/gnibbles
+@dirrm %%DATADIR%%/gnect/pixmaps
+@dirrm %%DATADIR%%/gnect
+@dirrm %%DATADIR%%/glines/pixmaps
+@dirrm %%DATADIR%%/glines
@dirrm %%DATADIR%%/blackjack/pixmaps
+@dirrm %%DATADIR%%/blackjack/games
@dirrm %%DATADIR%%/blackjack
@dirrm %%DATADIR%%/aisleriot/games
@dirrm %%DATADIR%%/aisleriot
@dirrm share/gnome-games-common/cards
@dirrm share/gnome-games-common
@dirrm %%DATADIR%%
-@dirrm share/gnobots2
-@dirrm share/gnibbles
-@dirrm share/gnect
@dirrm share/glchess
@dirrmtry share/ggz/gnome-games
@dirrmtry share/ggz
@@ -2130,8 +2417,6 @@ share/pixmaps/mahjongg/smooth.png
@dirrmtry share/locale/mr
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
-@dirrmtry share/locale/la/LC_MESSAGES
-@dirrmtry share/locale/la
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 64fd381296e7..a5f6fa7b35ba 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/eog/Makefile,v 1.88 2008/11/25 16:26:59 marcus Exp $
+# $MCom: ports/graphics/eog/Makefile,v 1.92 2009/03/17 18:17:48 kwm Exp $
#
PORTNAME= eog
-PORTVERSION= 2.24.3.1
+PORTVERSION= 2.26.0
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index b3a1649efb69..3e5e3e3272a1 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eog-2.24.3.1.tar.bz2) = 8c303bc4e10f88c7bbd18ecf539731fe
-SHA256 (gnome2/eog-2.24.3.1.tar.bz2) = 727d3a25acf9f77f2d444c31a09924f545ccb5d2a6fd5d52e43383bc188496b3
-SIZE (gnome2/eog-2.24.3.1.tar.bz2) = 2253386
+MD5 (gnome2/eog-2.26.0.tar.bz2) = 5d513046f80bc989e715243d8cee2825
+SHA256 (gnome2/eog-2.26.0.tar.bz2) = f88eab10382b2e48f51d70e2f2b7250798df7cc9a23a9cc97855e8ade6a497a0
+SIZE (gnome2/eog-2.26.0.tar.bz2) = 2418149
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index 66e1a4e9c6de..971722944178 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -2,6 +2,7 @@ bin/eog
include/eog-2.20/eog/eog-application.h
include/eog-2.20/eog/eog-debug.h
include/eog-2.20/eog/eog-dialog.h
+include/eog-2.20/eog/eog-enums.h
include/eog-2.20/eog/eog-error-message-area.h
include/eog-2.20/eog/eog-exif-details.h
include/eog-2.20/eog/eog-exif-util.h
@@ -39,7 +40,7 @@ share/applications/eog.desktop
%%DOCSDIR%%/EogFileChooser.html
%%DOCSDIR%%/EogImage.html
%%DOCSDIR%%/EogImageSaveInfo.html
-%%DOCSDIR%%/EogJobSaveAs.html
+%%DOCSDIR%%/EogJobCopy.html
%%DOCSDIR%%/EogListStore.html
%%DOCSDIR%%/EogMessageArea.html
%%DOCSDIR%%/EogMetadataReaderJpg.html
@@ -90,9 +91,9 @@ share/applications/eog.desktop
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
-%%DATADIR%%/eog-image-properties-dialog.glade
-%%DATADIR%%/eog-multiple-save-as-dialog.glade
-%%DATADIR%%/eog-preferences-dialog.glade
+%%DATADIR%%/eog-image-properties-dialog.ui
+%%DATADIR%%/eog-multiple-save-as-dialog.ui
+%%DATADIR%%/eog-preferences-dialog.ui
%%DATADIR%%/eog-toolbar.xml
%%DATADIR%%/eog-ui.xml
%%DATADIR%%/gtkrc
@@ -169,6 +170,10 @@ share/gnome/help/eog/pa/eog.xml
share/gnome/help/eog/pa/figures/eog_save_as_window.png
share/gnome/help/eog/pa/figures/eog_start_window.png
share/gnome/help/eog/pa/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/pl/eog.xml
+share/gnome/help/eog/pl/figures/eog_save_as_window.png
+share/gnome/help/eog/pl/figures/eog_start_window.png
+share/gnome/help/eog/pl/figures/eog_toolbar_editor_window.png
share/gnome/help/eog/pt_BR/eog.xml
share/gnome/help/eog/pt_BR/figures/eog_save_as_window.png
share/gnome/help/eog/pt_BR/figures/eog_start_window.png
@@ -247,6 +252,7 @@ share/locale/ks/LC_MESSAGES/eog.mo
share/locale/ku/LC_MESSAGES/eog.mo
share/locale/lt/LC_MESSAGES/eog.mo
share/locale/lv/LC_MESSAGES/eog.mo
+share/locale/mai/LC_MESSAGES/eog.mo
share/locale/mg/LC_MESSAGES/eog.mo
share/locale/mk/LC_MESSAGES/eog.mo
share/locale/ml/LC_MESSAGES/eog.mo
@@ -282,6 +288,8 @@ share/locale/tk/LC_MESSAGES/eog.mo
share/locale/tr/LC_MESSAGES/eog.mo
share/locale/ug/LC_MESSAGES/eog.mo
share/locale/uk/LC_MESSAGES/eog.mo
+share/locale/uz/LC_MESSAGES/eog.mo
+share/locale/uz@cyrillic/LC_MESSAGES/eog.mo
share/locale/vi/LC_MESSAGES/eog.mo
share/locale/wa/LC_MESSAGES/eog.mo
share/locale/xh/LC_MESSAGES/eog.mo
@@ -303,6 +311,7 @@ share/omf/eog/eog-ja.omf
share/omf/eog/eog-ko.omf
share/omf/eog/eog-oc.omf
share/omf/eog/eog-pa.omf
+share/omf/eog/eog-pl.omf
share/omf/eog/eog-pt_BR.omf
share/omf/eog/eog-ru.omf
share/omf/eog/eog-sv.omf
@@ -325,6 +334,8 @@ share/omf/eog/eog-zh_TW.omf
@dirrm share/gnome/help/eog/ru
@dirrm share/gnome/help/eog/pt_BR/figures
@dirrm share/gnome/help/eog/pt_BR
+@dirrm share/gnome/help/eog/pl/figures
+@dirrm share/gnome/help/eog/pl
@dirrm share/gnome/help/eog/pa/figures
@dirrm share/gnome/help/eog/pa
@dirrm share/gnome/help/eog/oc/figures
@@ -384,6 +395,8 @@ share/omf/eog/eog-zh_TW.omf
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@@ -404,6 +417,8 @@ share/omf/eog/eog-zh_TW.omf
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/ks/LC_MESSAGES
diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile
index 134ad98d968c..c0ac24cac496 100644
--- a/graphics/epdfview/Makefile
+++ b/graphics/epdfview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= epdfview
PORTVERSION= 0.1.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics print gnome
MASTER_SITES= http://trac.emma-soft.com/epdfview/chrome/site/releases/ \
LOCAL/chinsan
@@ -16,7 +16,7 @@ MAINTAINER= chinsan@FreeBSD.org
COMMENT= A lightweight PDF document viewer
BUILD_DEPENDS= cppunit-config:${PORTSDIR}/devel/cppunit
-LIB_DEPENDS= poppler-glib.3:${PORTSDIR}/graphics/poppler-gtk
+LIB_DEPENDS= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 7d5931ad9eaf..4ab6249b2a52 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/evince/Makefile,v 1.114 2008/11/25 16:19:07 marcus Exp $
+# $MCom: ports/graphics/evince/Makefile,v 1.120 2009/03/17 18:25:18 kwm Exp $
#
PORTNAME= evince
-PORTVERSION= 2.24.2
+PORTVERSION= 2.26.0
CATEGORIES= graphics print gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,7 +15,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 multi-format document viewer
-LIB_DEPENDS= poppler-glib.3:${PORTSDIR}/graphics/poppler-gtk \
+LIB_DEPENDS= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk \
spectre.1:${PORTSDIR}/print/libspectre
USE_LDCONFIG= yes
diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo
index caeb882f6080..1f46e64b1075 100644
--- a/graphics/evince/distinfo
+++ b/graphics/evince/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evince-2.24.2.tar.bz2) = f0f9e06a93516b238ee24ac38d68b57c
-SHA256 (gnome2/evince-2.24.2.tar.bz2) = aa6f29c93413e206b0e30fc241b4e5aa8d67c94baff50b9b92147543516e6bce
-SIZE (gnome2/evince-2.24.2.tar.bz2) = 1717166
+MD5 (gnome2/evince-2.26.0.tar.bz2) = 11c440e48702231e40066a78aae56f84
+SHA256 (gnome2/evince-2.26.0.tar.bz2) = c1b92f887abcacd3e38b84ba6abefeefc7730bf6b90d21304f020199db2e54f3
+SIZE (gnome2/evince-2.26.0.tar.bz2) = 1856736
diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist
index 38808c3f49b2..6cc5588fdd69 100644
--- a/graphics/evince/pkg-plist
+++ b/graphics/evince/pkg-plist
@@ -1,110 +1,102 @@
bin/evince
bin/evince-thumbnailer
-include/evince-2.20/evince/ev-async-renderer.h
-include/evince-2.20/evince/ev-attachment.h
-include/evince-2.20/evince/ev-document-find.h
-include/evince-2.20/evince/ev-document-fonts.h
-include/evince-2.20/evince/ev-document-forms.h
-include/evince-2.20/evince/ev-document-images.h
-include/evince-2.20/evince/ev-document-info.h
-include/evince-2.20/evince/ev-document-links.h
-include/evince-2.20/evince/ev-document-misc.h
-include/evince-2.20/evince/ev-document-security.h
-include/evince-2.20/evince/ev-document-thumbnails.h
-include/evince-2.20/evince/ev-document-transition.h
-include/evince-2.20/evince/ev-document.h
-include/evince-2.20/evince/ev-file-exporter.h
-include/evince-2.20/evince/ev-file-helpers.h
-include/evince-2.20/evince/ev-form-field.h
-include/evince-2.20/evince/ev-image.h
-include/evince-2.20/evince/ev-link-action.h
-include/evince-2.20/evince/ev-link-dest.h
-include/evince-2.20/evince/ev-link.h
-include/evince-2.20/evince/ev-page.h
-include/evince-2.20/evince/ev-render-context.h
-include/evince-2.20/evince/ev-selection.h
-include/evince-2.20/evince/ev-transition-effect.h
-%%COMICS%%lib/evince/backends/comicsdocument.evince-backend
-%%DJVU%%lib/evince/backends/djvudocument.evince-backend
-%%DVI%%lib/evince/backends/dvidocument.evince-backend
-%%IMPRESS%%lib/evince/backends/impressdocument.evince-backend
-%%COMICS%%lib/evince/backends/libcomicsdocument.a
-%%COMICS%%lib/evince/backends/libcomicsdocument.la
-%%COMICS%%lib/evince/backends/libcomicsdocument.so
-%%DJVU%%lib/evince/backends/libdjvudocument.a
-%%DJVU%%lib/evince/backends/libdjvudocument.la
-%%DJVU%%lib/evince/backends/libdjvudocument.so
-%%DVI%%lib/evince/backends/libdvidocument.a
-%%DVI%%lib/evince/backends/libdvidocument.la
-%%DVI%%lib/evince/backends/libdvidocument.so
-%%IMPRESS%%lib/evince/backends/libimpressdocument.a
-%%IMPRESS%%lib/evince/backends/libimpressdocument.la
-%%IMPRESS%%lib/evince/backends/libimpressdocument.so
-lib/evince/backends/libpdfdocument.a
-lib/evince/backends/libpdfdocument.la
-lib/evince/backends/libpdfdocument.so
-lib/evince/backends/libpsdocument.a
-lib/evince/backends/libpsdocument.la
-lib/evince/backends/libpsdocument.so
-lib/evince/backends/libtiffdocument.a
-lib/evince/backends/libtiffdocument.la
-lib/evince/backends/libtiffdocument.so
-lib/evince/backends/pdfdocument.evince-backend
-lib/evince/backends/psdocument.evince-backend
-lib/evince/backends/tiffdocument.evince-backend
+include/evince/2.25/evince-document.h
+include/evince/2.25/evince-view.h
+include/evince/2.25/libdocument/ev-async-renderer.h
+include/evince/2.25/libdocument/ev-attachment.h
+include/evince/2.25/libdocument/ev-backends-manager.h
+include/evince/2.25/libdocument/ev-document-factory.h
+include/evince/2.25/libdocument/ev-document-find.h
+include/evince/2.25/libdocument/ev-document-fonts.h
+include/evince/2.25/libdocument/ev-document-forms.h
+include/evince/2.25/libdocument/ev-document-images.h
+include/evince/2.25/libdocument/ev-document-info.h
+include/evince/2.25/libdocument/ev-document-layers.h
+include/evince/2.25/libdocument/ev-document-links.h
+include/evince/2.25/libdocument/ev-document-misc.h
+include/evince/2.25/libdocument/ev-document-security.h
+include/evince/2.25/libdocument/ev-document-thumbnails.h
+include/evince/2.25/libdocument/ev-document-transition.h
+include/evince/2.25/libdocument/ev-document-type-builtins.h
+include/evince/2.25/libdocument/ev-document.h
+include/evince/2.25/libdocument/ev-file-exporter.h
+include/evince/2.25/libdocument/ev-file-helpers.h
+include/evince/2.25/libdocument/ev-form-field.h
+include/evince/2.25/libdocument/ev-image.h
+include/evince/2.25/libdocument/ev-init.h
+include/evince/2.25/libdocument/ev-layer.h
+include/evince/2.25/libdocument/ev-link-action.h
+include/evince/2.25/libdocument/ev-link-dest.h
+include/evince/2.25/libdocument/ev-link.h
+include/evince/2.25/libdocument/ev-page.h
+include/evince/2.25/libdocument/ev-render-context.h
+include/evince/2.25/libdocument/ev-selection.h
+include/evince/2.25/libdocument/ev-transition-effect.h
+include/evince/2.25/libdocument/ev-version.h
+include/evince/2.25/libview/ev-job-scheduler.h
+include/evince/2.25/libview/ev-jobs.h
+include/evince/2.25/libview/ev-page-cache.h
+include/evince/2.25/libview/ev-view-type-builtins.h
+include/evince/2.25/libview/ev-view.h
+%%COMICS%%lib/evince/1/backends/comicsdocument.evince-backend
+%%DJVU%%lib/evince/1/backends/djvudocument.evince-backend
+%%DVI%%lib/evince/1/backends/dvidocument.evince-backend
+%%IMPRESS%%lib/evince/1/backends/impressdocument.evince-backend
+%%COMICS%%lib/evince/1/backends/libcomicsdocument.a
+%%COMICS%%lib/evince/1/backends/libcomicsdocument.la
+%%COMICS%%lib/evince/1/backends/libcomicsdocument.so
+%%DJVU%%lib/evince/1/backends/libdjvudocument.a
+%%DJVU%%lib/evince/1/backends/libdjvudocument.la
+%%DJVU%%lib/evince/1/backends/libdjvudocument.so
+%%DVI%%lib/evince/1/backends/libdvidocument.a
+%%DVI%%lib/evince/1/backends/libdvidocument.la
+%%DVI%%lib/evince/1/backends/libdvidocument.so
+%%IMPRESS%%lib/evince/1/backends/libimpressdocument.a
+%%IMPRESS%%lib/evince/1/backends/libimpressdocument.la
+%%IMPRESS%%lib/evince/1/backends/libimpressdocument.so
+lib/evince/1/backends/libpdfdocument.a
+lib/evince/1/backends/libpdfdocument.la
+lib/evince/1/backends/libpdfdocument.so
+lib/evince/1/backends/libpsdocument.a
+lib/evince/1/backends/libpsdocument.la
+lib/evince/1/backends/libpsdocument.so
+lib/evince/1/backends/libtiffdocument.a
+lib/evince/1/backends/libtiffdocument.la
+lib/evince/1/backends/libtiffdocument.so
+lib/evince/1/backends/pdfdocument.evince-backend
+lib/evince/1/backends/psdocument.evince-backend
+lib/evince/1/backends/tiffdocument.evince-backend
%%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.a
%%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.la
%%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.so
-lib/libevbackend.a
-lib/libevbackend.la
-lib/libevbackend.so
-lib/libevbackend.so.0
+lib/libevdocument.a
+lib/libevdocument.la
+lib/libevdocument.so
+lib/libevdocument.so.1
+lib/libevview.a
+lib/libevview.la
+lib/libevview.so
+lib/libevview.so.1
+libdata/pkgconfig/evince-document-2.25.pc
+libdata/pkgconfig/evince-view-2.25.pc
share/applications/evince.desktop
-%%DOCSDIR%%/EvAttachment.html
%%DOCSDIR%%/EvNavigationAction.html
%%DOCSDIR%%/EvNavigationActionWidget.html
%%DOCSDIR%%/EvPageAction.html
%%DOCSDIR%%/EvPageActionWidget.html
%%DOCSDIR%%/EvWindow.html
%%DOCSDIR%%/evince-EvHistory.html
-%%DOCSDIR%%/evince-EvImage.html
-%%DOCSDIR%%/evince-EvJobFind.html
-%%DOCSDIR%%/evince-EvPasswordDialog.html
%%DOCSDIR%%/evince-EvPasswordView.html
-%%DOCSDIR%%/evince-EvRenderContext.html
%%DOCSDIR%%/evince-EvSidebar.html
%%DOCSDIR%%/evince-EvSidebarAttachments.html
%%DOCSDIR%%/evince-EvSidebarLinks.html
%%DOCSDIR%%/evince-EvSidebarThumbnails.html
-%%DOCSDIR%%/evince-EvTooltip.html
-%%DOCSDIR%%/evince-ev-async-renderer.html
-%%DOCSDIR%%/evince-ev-document-factory.html
-%%DOCSDIR%%/evince-ev-document-find.html
-%%DOCSDIR%%/evince-ev-document-fonts.html
-%%DOCSDIR%%/evince-ev-document-images.html
-%%DOCSDIR%%/evince-ev-document-info.html
-%%DOCSDIR%%/evince-ev-document-links.html
-%%DOCSDIR%%/evince-ev-document-misc.html
-%%DOCSDIR%%/evince-ev-document-security.html
-%%DOCSDIR%%/evince-ev-document-thumbnails.html
-%%DOCSDIR%%/evince-ev-document-transition.html
-%%DOCSDIR%%/evince-ev-document.html
-%%DOCSDIR%%/evince-ev-file-exporter.html
-%%DOCSDIR%%/evince-ev-file-helpers.html
-%%DOCSDIR%%/evince-ev-link-action.html
-%%DOCSDIR%%/evince-ev-link-dest.html
-%%DOCSDIR%%/evince-ev-link.html
%%DOCSDIR%%/evince-ev-metadata-manager.html
-%%DOCSDIR%%/evince-ev-page-cache.html
-%%DOCSDIR%%/evince-ev-pixbuf-cache.html
%%DOCSDIR%%/evince-ev-properties-dialog.html
%%DOCSDIR%%/evince-ev-properties-fonts.html
-%%DOCSDIR%%/evince-ev-selection.html
%%DOCSDIR%%/evince-ev-sidebar-page.html
%%DOCSDIR%%/evince-ev-stock-icons.html
%%DOCSDIR%%/evince-ev-utils.html
-%%DOCSDIR%%/evince-ev-view-accessible.html
-%%DOCSDIR%%/evince-ev-view.html
%%DOCSDIR%%/evince-ev-window-title.html
%%DOCSDIR%%/evince.devhelp
%%DOCSDIR%%/evince.devhelp2
@@ -114,14 +106,64 @@ share/applications/evince.desktop
%%DOCSDIR%%/ix01.html
%%DOCSDIR%%/left.png
%%DOCSDIR%%/pt01.html
-%%DOCSDIR%%/pt02.html
-%%DOCSDIR%%/pt03.html
-%%DOCSDIR%%/pt04.html
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
-%%DATADIR%%/evince-password.glade
-%%DATADIR%%/evince-properties.glade
+share/doc/libevdocument/EvAttachment.html
+share/doc/libevdocument/EvFormFieldSignature.html
+share/doc/libevdocument/EvImage.html
+share/doc/libevdocument/EvLayer.html
+share/doc/libevdocument/EvPage.html
+share/doc/libevdocument/EvRenderContext.html
+share/doc/libevdocument/data.html
+share/doc/libevdocument/helper.html
+share/doc/libevdocument/home.png
+share/doc/libevdocument/index.html
+share/doc/libevdocument/index.sgml
+share/doc/libevdocument/interfaces.html
+share/doc/libevdocument/left.png
+share/doc/libevdocument/libevdocument-ev-async-renderer.html
+share/doc/libevdocument/libevdocument-ev-backends-manager.html
+share/doc/libevdocument/libevdocument-ev-document-factory.html
+share/doc/libevdocument/libevdocument-ev-document-find.html
+share/doc/libevdocument/libevdocument-ev-document-fonts.html
+share/doc/libevdocument/libevdocument-ev-document-forms.html
+share/doc/libevdocument/libevdocument-ev-document-images.html
+share/doc/libevdocument/libevdocument-ev-document-info.html
+share/doc/libevdocument/libevdocument-ev-document-layers.html
+share/doc/libevdocument/libevdocument-ev-document-links.html
+share/doc/libevdocument/libevdocument-ev-document-misc.html
+share/doc/libevdocument/libevdocument-ev-document-security.html
+share/doc/libevdocument/libevdocument-ev-document-thumbnails.html
+share/doc/libevdocument/libevdocument-ev-document-transition.html
+share/doc/libevdocument/libevdocument-ev-document.html
+share/doc/libevdocument/libevdocument-ev-file-exporter.html
+share/doc/libevdocument/libevdocument-ev-file-helpers.html
+share/doc/libevdocument/libevdocument-ev-init.html
+share/doc/libevdocument/libevdocument-ev-link-action.html
+share/doc/libevdocument/libevdocument-ev-link-dest.html
+share/doc/libevdocument/libevdocument-ev-link.html
+share/doc/libevdocument/libevdocument-ev-selection.html
+share/doc/libevdocument/libevdocument-ev-transition-effect.html
+share/doc/libevdocument/libevdocument.devhelp
+share/doc/libevdocument/libevdocument.devhelp2
+share/doc/libevdocument/right.png
+share/doc/libevdocument/style.css
+share/doc/libevdocument/up.png
+share/doc/libevview/EvJobExport.html
+share/doc/libevview/ch01.html
+share/doc/libevview/home.png
+share/doc/libevview/index.html
+share/doc/libevview/index.sgml
+share/doc/libevview/left.png
+share/doc/libevview/libevview-ev-job-scheduler.html
+share/doc/libevview/libevview-ev-page-cache.html
+share/doc/libevview/libevview-ev-view.html
+share/doc/libevview/libevview.devhelp
+share/doc/libevview/libevview.devhelp2
+share/doc/libevview/right.png
+share/doc/libevview/style.css
+share/doc/libevview/up.png
%%DATADIR%%/evince-toolbar.xml
%%DATADIR%%/evince-ui.xml
%%DATADIR%%/hand-open.png
@@ -130,6 +172,7 @@ share/applications/evince.desktop
%%DATADIR%%/icons/hicolor/16x16/actions/zoom-fit-page.png
%%DATADIR%%/icons/hicolor/16x16/actions/zoom-fit-width.png
%%DATADIR%%/icons/hicolor/16x16/actions/zoom.png
+%%DATADIR%%/icons/hicolor/22x22/actions/eye.png
%%DATADIR%%/icons/hicolor/22x22/actions/view-page-continuous.png
%%DATADIR%%/icons/hicolor/22x22/actions/view-page-facing.png
%%DATADIR%%/icons/hicolor/22x22/actions/zoom-fit-page.png
@@ -151,6 +194,8 @@ share/gnome/help/evince/bg/evince.xml
share/gnome/help/evince/bg/figures/evince_start_window.png
share/gnome/help/evince/ca/evince.xml
share/gnome/help/evince/ca/figures/evince_start_window.png
+share/gnome/help/evince/cs/evince.xml
+share/gnome/help/evince/cs/figures/evince_start_window.png
share/gnome/help/evince/de/evince.xml
share/gnome/help/evince/de/figures/evince_start_window.png
share/gnome/help/evince/el/evince.xml
@@ -159,6 +204,8 @@ share/gnome/help/evince/en_GB/evince.xml
share/gnome/help/evince/en_GB/figures/evince_start_window.png
share/gnome/help/evince/es/evince.xml
share/gnome/help/evince/es/figures/evince_start_window.png
+share/gnome/help/evince/eu/evince.xml
+share/gnome/help/evince/eu/figures/evince_start_window.png
share/gnome/help/evince/fi/evince.xml
share/gnome/help/evince/fi/figures/evince_start_window.png
share/gnome/help/evince/fr/evince.xml
@@ -181,8 +228,6 @@ share/gnome/help/evince/sv/evince.xml
share/gnome/help/evince/sv/figures/evince_start_window.png
share/gnome/help/evince/uk/evince.xml
share/gnome/help/evince/uk/figures/evince_start_window.png
-share/gnome/help/evince/vi/evince.xml
-share/gnome/help/evince/vi/figures/evince_start_window.png
share/gnome/help/evince/zh_CN/evince.xml
share/gnome/help/evince/zh_CN/figures/evince_start_window.png
share/icons/hicolor/16x16/apps/evince.png
@@ -190,10 +235,11 @@ share/icons/hicolor/22x22/apps/evince.png
share/icons/hicolor/24x24/apps/evince.png
share/icons/hicolor/48x48/apps/evince.png
share/icons/hicolor/scalable/apps/evince.svg
+share/locale/af/LC_MESSAGES/evince.mo
share/locale/ar/LC_MESSAGES/evince.mo
share/locale/as/LC_MESSAGES/evince.mo
+share/locale/ast/LC_MESSAGES/evince.mo
share/locale/be/LC_MESSAGES/evince.mo
-share/locale/be@latin/LC_MESSAGES/evince.mo
share/locale/bg/LC_MESSAGES/evince.mo
share/locale/bn/LC_MESSAGES/evince.mo
share/locale/bn_IN/LC_MESSAGES/evince.mo
@@ -229,6 +275,7 @@ share/locale/ks/LC_MESSAGES/evince.mo
share/locale/ku/LC_MESSAGES/evince.mo
share/locale/lt/LC_MESSAGES/evince.mo
share/locale/lv/LC_MESSAGES/evince.mo
+share/locale/mai/LC_MESSAGES/evince.mo
share/locale/mg/LC_MESSAGES/evince.mo
share/locale/mk/LC_MESSAGES/evince.mo
share/locale/ml/LC_MESSAGES/evince.mo
@@ -252,7 +299,6 @@ share/locale/sk/LC_MESSAGES/evince.mo
share/locale/sl/LC_MESSAGES/evince.mo
share/locale/sq/LC_MESSAGES/evince.mo
share/locale/sr/LC_MESSAGES/evince.mo
-share/locale/sr@latin/LC_MESSAGES/evince.mo
share/locale/sv/LC_MESSAGES/evince.mo
share/locale/ta/LC_MESSAGES/evince.mo
share/locale/te/LC_MESSAGES/evince.mo
@@ -267,10 +313,12 @@ share/locale/zh_TW/LC_MESSAGES/evince.mo
share/omf/evince/evince-C.omf
share/omf/evince/evince-bg.omf
share/omf/evince/evince-ca.omf
+share/omf/evince/evince-cs.omf
share/omf/evince/evince-de.omf
share/omf/evince/evince-el.omf
share/omf/evince/evince-en_GB.omf
share/omf/evince/evince-es.omf
+share/omf/evince/evince-eu.omf
share/omf/evince/evince-fi.omf
share/omf/evince/evince-fr.omf
share/omf/evince/evince-it.omf
@@ -282,13 +330,12 @@ share/omf/evince/evince-ru.omf
share/omf/evince/evince-sr.omf
share/omf/evince/evince-sv.omf
share/omf/evince/evince-uk.omf
-share/omf/evince/evince-vi.omf
share/omf/evince/evince-zh_CN.omf
+share/locale/be@latin/LC_MESSAGES/evince.mo
+share/locale/sr@latin/LC_MESSAGES/evince.mo
@dirrm share/omf/evince
@dirrm share/gnome/help/evince/zh_CN/figures
@dirrm share/gnome/help/evince/zh_CN
-@dirrm share/gnome/help/evince/vi/figures
-@dirrm share/gnome/help/evince/vi
@dirrm share/gnome/help/evince/uk/figures
@dirrm share/gnome/help/evince/uk
@dirrm share/gnome/help/evince/sv/figures
@@ -311,6 +358,8 @@ share/omf/evince/evince-zh_CN.omf
@dirrm share/gnome/help/evince/fr
@dirrm share/gnome/help/evince/fi/figures
@dirrm share/gnome/help/evince/fi
+@dirrm share/gnome/help/evince/eu/figures
+@dirrm share/gnome/help/evince/eu
@dirrm share/gnome/help/evince/es/figures
@dirrm share/gnome/help/evince/es
@dirrm share/gnome/help/evince/en_GB/figures
@@ -319,6 +368,8 @@ share/omf/evince/evince-zh_CN.omf
@dirrm share/gnome/help/evince/el
@dirrm share/gnome/help/evince/de/figures
@dirrm share/gnome/help/evince/de
+@dirrm share/gnome/help/evince/cs/figures
+@dirrm share/gnome/help/evince/cs
@dirrm share/gnome/help/evince/ca/figures
@dirrm share/gnome/help/evince/ca
@dirrm share/gnome/help/evince/bg/figures
@@ -339,12 +390,17 @@ share/omf/evince/evince-zh_CN.omf
@dirrm %%DATADIR%%/icons/hicolor
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%
+@dirrm share/doc/libevview
+@dirrm share/doc/libevdocument
@dirrm %%DOCSDIR%%
@dirrmtry share/applications
-@dirrm lib/evince/backends
+@dirrm lib/evince/1/backends
+@dirrm lib/evince/1
@dirrm lib/evince
-@dirrm include/evince-2.20/evince
-@dirrm include/evince-2.20
+@dirrm include/evince/2.25/libview
+@dirrm include/evince/2.25/libdocument
+@dirrm include/evince/2.25
+@dirrm include/evince
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -365,6 +421,8 @@ share/omf/evince/evince-zh_CN.omf
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/ks/LC_MESSAGES
@@ -375,5 +433,7 @@ share/omf/evince/evince-zh_CN.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/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 1e368d3e10cc..91c4d9b78fe9 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,12 +3,12 @@
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/graphics/gimp-app/Makefile,v 1.30 2009/01/04 22:16:26 marcus Exp $
+# $MCom: ports/graphics/gimp-app/Makefile,v 1.35 2009/04/09 03:24:07 mezz Exp $
#
PORTNAME= gimp-app
DISTVERSION= 2.6.6
-PORTREVISION?= 0
+PORTREVISION?= 1
PORTEPOCH?= 1
CATEGORIES?= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -27,7 +27,7 @@ COMMENT= A GNU Image Manipulation Program
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \
wmf.2:${PORTSDIR}/graphics/libwmf \
- poppler-glib.3:${PORTSDIR}/graphics/poppler-gtk \
+ poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk \
aa.1:${PORTSDIR}/graphics/aalib \
mng.1:${PORTSDIR}/graphics/libmng \
png.5:${PORTSDIR}/graphics/png \
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index b6cabb82671e..b9753f1c65b4 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -7,7 +7,7 @@
PORTNAME= inkscape
PORTVERSION= 0.46
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics gnome
MASTER_SITES= SF
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --without-gnome-vfs
.endif
.if defined(WITH_POPPLER)
-LIB_DEPENDS+= poppler-glib.3:${PORTSDIR}/graphics/poppler-gtk
+LIB_DEPENDS+= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk
CONFIGURE_ARGS+= --enable-poppler-cairo
.else
CONFIGURE_ARGS+= --disable-poppler-cairo
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 130a5d9c0927..5e0e5555c4c4 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.72 2008/08/23 18:22:59 mezz Exp $
+# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.75 2009/03/18 04:18:22 marcus Exp $
#
PORTNAME= libgnomecanvas
-PORTVERSION= 2.20.1.1
-PORTREVISION?= 2
+PORTVERSION= 2.26.0
+PORTREVISION?= 0
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index ed7f2ccdb2a7..8d3fd7340489 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomecanvas-2.20.1.1.tar.bz2) = 948ed771d2957d24a0c9a414e9581055
-SHA256 (gnome2/libgnomecanvas-2.20.1.1.tar.bz2) = 70f906d52d98b7b45e95fd59ef10f06579b75ee9e70e67edabd30a4f6e5d6fe3
-SIZE (gnome2/libgnomecanvas-2.20.1.1.tar.bz2) = 583565
+MD5 (gnome2/libgnomecanvas-2.26.0.tar.bz2) = 9bbc635e5ae70e63af071af74ba7e72f
+SHA256 (gnome2/libgnomecanvas-2.26.0.tar.bz2) = 80b480acc33d7303f651e9c5bc8fea51c9e9a9ed59ebfdbbb730dd798bcbc58d
+SIZE (gnome2/libgnomecanvas-2.26.0.tar.bz2) = 600470
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index aa4944b3dc1d..2574460771da 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -23,6 +23,7 @@ libdata/pkgconfig/libgnomecanvas-2.0.pc
share/locale/am/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ang/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ar/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/as/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/be/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/bg/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -30,6 +31,7 @@ share/locale/bn/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/bn_IN/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/bs/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ca/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/crh/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/cs/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/cy/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/da/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -63,10 +65,12 @@ share/locale/ku/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/li/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/lt/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/lv/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/mai/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/mg/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/mk/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ml/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/mn/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/mr/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ms/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/nb/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ne/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -85,10 +89,11 @@ share/locale/sk/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/sl/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/sq/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/sr/LC_MESSAGES/libgnomecanvas-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/sr@ije/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/sv/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ta/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/te/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/th/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/tr/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/tt/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -110,19 +115,31 @@ share/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.mo
@dirrmtry share/locale/xh
@dirrmtry share/locale/tt/LC_MESSAGES
@dirrmtry share/locale/tt
+@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/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
@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/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
@dirrmtry share/locale/ang/LC_MESSAGES
@dirrmtry share/locale/ang
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index 8c28d25b7afa..588cca98d806 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.20 2008/08/05 18:12:26 marcus Exp $
+# $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.22 2009/03/17 15:05:06 kwm Exp $
#
PORTNAME= libgnomecanvasmm
-PORTVERSION= 2.23.1
+PORTVERSION= 2.26.0
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/libgnomecanvasmm26/distinfo b/graphics/libgnomecanvasmm26/distinfo
index 5a6e8df1b5bb..d3ee6249ba17 100644
--- a/graphics/libgnomecanvasmm26/distinfo
+++ b/graphics/libgnomecanvasmm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomecanvasmm-2.23.1.tar.bz2) = 9990eb5560db197e16be3497873fe1d9
-SHA256 (gnome2/libgnomecanvasmm-2.23.1.tar.bz2) = a9983c587cf92671c49f089a588e9e8e902ff5e735e596f4e72e99fb975aff5e
-SIZE (gnome2/libgnomecanvasmm-2.23.1.tar.bz2) = 325751
+MD5 (gnome2/libgnomecanvasmm-2.26.0.tar.bz2) = a148c99311d46397de6e4a31736771ab
+SHA256 (gnome2/libgnomecanvasmm-2.26.0.tar.bz2) = 996577f97f459a574919e15ba7fee6af8cda38a87a98289e9a4f54752d83e918
+SIZE (gnome2/libgnomecanvasmm-2.26.0.tar.bz2) = 327215
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 258b607da179..a9e5e0549aee 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,12 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/librsvg2/Makefile,v 1.3 2008/09/23 20:34:45 mezz Exp $
+# $MCom: ports/graphics/librsvg2/Makefile,v 1.123 2009/03/17 14:48:53 kwm Exp $
#
PORTNAME= librsvg2
-PORTVERSION= 2.22.3
-PORTREVISION= 2
+PORTVERSION= 2.26.0
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index c57c3f32d69e..0807c3d1b7b5 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/librsvg-2.22.3.tar.bz2) = c4ec4fdb2b1842e221ca39127e85682d
-SHA256 (gnome2/librsvg-2.22.3.tar.bz2) = 63f7cc948b60447c76e6797a2d521cba308ed42c673bd4b2212e1f0b4cd60f0a
-SIZE (gnome2/librsvg-2.22.3.tar.bz2) = 491576
+MD5 (gnome2/librsvg-2.26.0.tar.bz2) = 65dbd726a514fe8b797d26254b8efc1e
+SHA256 (gnome2/librsvg-2.26.0.tar.bz2) = fdcab5f0d86198d8cbd4ffe5b333076f75e707f6d7e4af5e87a8644ff7533bea
+SIZE (gnome2/librsvg-2.26.0.tar.bz2) = 477499
diff --git a/graphics/librsvg2/files/patch-cmdline-bugfixes b/graphics/librsvg2/files/patch-cmdline-bugfixes
deleted file mode 100644
index b70108aa3eb5..000000000000
--- a/graphics/librsvg2/files/patch-cmdline-bugfixes
+++ /dev/null
@@ -1,29 +0,0 @@
---- librsvg-2.22.2~/rsvg-convert.c 2007-07-01 23:43:44.000000000 +1000
-+++ rsvg-convert.c 2008-10-20 16:52:27.000000000 +1100
-@@ -31,6 +31,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <locale.h>
-
- #include "rsvg.h"
- #include "rsvg-cairo.h"
-@@ -52,7 +53,7 @@
- display_error (GError * err)
- {
- if (err) {
-- g_print ("%s", err->message);
-+ g_print ("%s\n", err->message);
- g_error_free (err);
- }
- }
-@@ -165,6 +166,9 @@
- {NULL}
- };
-
-+ /* Set the locale so that UTF-8 filenames work */
-+ setlocale(LC_ALL, "");
-+
- g_thread_init(NULL);
-
- g_option_context = g_option_context_new (_("- SVG Converter"));
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 592be64f9716..edfd9227212f 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= osg
PORTVERSION= 2.9.2
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.openscenegraph.org/downloads/developer_releases/ \
http://mirror.amdmi3.ru/
@@ -188,7 +189,7 @@ PLIST_SUB+= SVG="@comment "
.if defined(WITH_PDF)
FORCE_PC_REQUIRE+=POPPLER
-LIB_DEPENDS+= poppler-glib.3:${PORTSDIR}/graphics/poppler-gtk
+LIB_DEPENDS+= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk
PLIST_SUB+= PDF=""
.else
FORCE_PC_IGNORE+=POPPLER
diff --git a/graphics/poppler-gtk/Makefile b/graphics/poppler-gtk/Makefile
index 2d84af0222fe..4aa68e618d09 100644
--- a/graphics/poppler-gtk/Makefile
+++ b/graphics/poppler-gtk/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/poppler-gtk/Makefile,v 1.1 2008/06/16 21:36:00 mezz Exp $
+# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.9 2009/04/09 03:24:07 mezz Exp $
#
PORTREVISION= 0
diff --git a/graphics/poppler-gtk/pkg-plist b/graphics/poppler-gtk/pkg-plist
index 2ca48e539647..84f07119b04d 100644
--- a/graphics/poppler-gtk/pkg-plist
+++ b/graphics/poppler-gtk/pkg-plist
@@ -10,7 +10,7 @@ include/poppler/glib/poppler.h
lib/libpoppler-glib.a
lib/libpoppler-glib.la
lib/libpoppler-glib.so
-lib/libpoppler-glib.so.3
+lib/libpoppler-glib.so.4
libdata/pkgconfig/poppler-glib.pc
%%DOCSDIR%%/poppler/ch01.html
%%DOCSDIR%%/poppler/home.png
diff --git a/graphics/poppler-qt4/Makefile b/graphics/poppler-qt4/Makefile
index 2a73bd96ff64..6eb1d743ace9 100644
--- a/graphics/poppler-qt4/Makefile
+++ b/graphics/poppler-qt4/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/poppler-qt4/Makefile,v 1.3 2008/06/20 17:48:14 mezz Exp $
+# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.7 2009/04/07 03:27:48 marcus Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= -qt4
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/poppler-qt4/pkg-plist b/graphics/poppler-qt4/pkg-plist
index d49be20711e6..d20d75d3e7c2 100644
--- a/graphics/poppler-qt4/pkg-plist
+++ b/graphics/poppler-qt4/pkg-plist
@@ -4,6 +4,7 @@ include/poppler/qt4/poppler-form.h
include/poppler/qt4/poppler-link.h
include/poppler/qt4/poppler-optcontent.h
include/poppler/qt4/poppler-page-transition.h
+include/poppler/qt4/poppler-page-transition-private.h
include/poppler/qt4/poppler-qt4.h
lib/libpoppler-qt4.a
lib/libpoppler-qt4.la
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index cdb137f73bb7..3f083d61e97c 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,12 +3,12 @@
# Whom: marcus@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/poppler/Makefile,v 1.8 2008/06/20 17:47:36 mezz Exp $
+# $MCom: ports/graphics/poppler/Makefile,v 1.44 2009/03/14 05:12:31 marcus Exp $
#
PORTNAME= poppler
-PORTVERSION= 0.8.7
-PORTREVISION?= 1
+PORTVERSION= 0.10.5
+PORTREVISION?= 0
CATEGORIES= graphics print
MASTER_SITES= http://poppler.freedesktop.org/
@@ -36,7 +36,7 @@ OPTIONS= CAIRO "Enable cairo output backend" on
.include <bsd.port.pre.mk>
.if defined(SLAVEPORT)
-LIB_DEPENDS+= poppler.3:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS+= poppler.4:${PORTSDIR}/graphics/poppler
.if ${SLAVEPORT}=="gtk"
CONFIGURE_ARGS+=--enable-poppler-glib
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index 7083d1f67d6d..900de9a128c4 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-0.8.7.tar.gz) = 9af81429d6f8639c357a5eed25583365
-SHA256 (poppler-0.8.7.tar.gz) = 3f96dee17eecf16cfd3cae711819f07b42fcc512c3151cc8b911b19ccecf22f7
-SIZE (poppler-0.8.7.tar.gz) = 1469587
+MD5 (poppler-0.10.5.tar.gz) = 125f671a19707861132fb03e73b61184
+SHA256 (poppler-0.10.5.tar.gz) = cfd4115f787cac7f0f673be48e95c645a323dc5b6b756280e47e28faa5d98d92
+SIZE (poppler-0.10.5.tar.gz) = 1516687
diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in
index 72154021da8d..e0faea3d198e 100644
--- a/graphics/poppler/files/patch-utils_Makefile.in
+++ b/graphics/poppler/files/patch-utils_Makefile.in
@@ -1,6 +1,6 @@
---- utils/Makefile.in.orig 2008-03-27 08:18:44.000000000 -0400
-+++ utils/Makefile.in 2008-03-27 08:19:51.000000000 -0400
-@@ -58,48 +58,48 @@
+--- utils/Makefile.in.orig 2009-02-26 18:44:48.000000000 -0500
++++ utils/Makefile.in 2009-02-26 18:45:57.000000000 -0500
+@@ -61,50 +61,50 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
pdffonts_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
@@ -14,7 +14,8 @@
-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+pdfimages_DEPENDENCIES = \
$(am__DEPENDENCIES_1)
- am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) $(am__objects_1)
+ am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
+ $(am__objects_1)
pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
pdfinfo_LDADD = $(LDADD)
-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
@@ -49,7 +50,8 @@
-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+pdftops_DEPENDENCIES = \
$(am__DEPENDENCIES_1)
- am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) $(am__objects_1)
+ am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \
+ $(am__objects_1)
pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
pdftotext_LDADD = $(LDADD)
-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
@@ -57,7 +59,7 @@
$(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -302,7 +302,7 @@
+@@ -320,7 +320,7 @@ INCLUDES = \
$(ABIWORD_CFLAGS)
LDADD = \
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index 34676e685587..1ea3318716f2 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -1,6 +1,5 @@
include/poppler/Annot.h
include/poppler/Array.h
-include/poppler/BaseFile.h
include/poppler/BuiltinFont.h
include/poppler/BuiltinFontTables.h
include/poppler/CMap.h
@@ -8,14 +7,15 @@ include/poppler/Catalog.h
include/poppler/CharCodeToUnicode.h
include/poppler/CharTypes.h
include/poppler/CompactFontTables.h
+include/poppler/DateInfo.h
include/poppler/Decrypt.h
include/poppler/Dict.h
include/poppler/Error.h
include/poppler/ErrorCodes.h
+include/poppler/FileSpec.h
include/poppler/FontEncodingTables.h
include/poppler/FontInfo.h
include/poppler/Form.h
-include/poppler/Function.cc
include/poppler/Function.h
include/poppler/Gfx.h
include/poppler/GfxFont.h
@@ -23,7 +23,6 @@ include/poppler/GfxState.h
include/poppler/GlobalParams.h
include/poppler/JArithmeticDecoder.h
include/poppler/JBIG2Stream.h
-include/poppler/JPXStream.h
include/poppler/Lexer.h
include/poppler/Link.h
include/poppler/Movie.h
@@ -94,7 +93,7 @@ include/poppler/splash/SplashXPathScanner.h
lib/libpoppler.a
lib/libpoppler.la
lib/libpoppler.so
-lib/libpoppler.so.3
+lib/libpoppler.so.4
%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
libdata/pkgconfig/poppler-splash.pc
libdata/pkgconfig/poppler.pc
diff --git a/graphics/py-poppler/Makefile b/graphics/py-poppler/Makefile
index 48dee84d87cc..b628e1100389 100644
--- a/graphics/py-poppler/Makefile
+++ b/graphics/py-poppler/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= poppler
-PORTVERSION= 0.8.1
+PORTVERSION= 0.10.0
CATEGORIES= graphics python
MASTER_SITES= http://www.gnome.org/~gianmt/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ DISTNAME= py${PORTNAME}-${PORTVERSION}
MAINTAINER= romain@blogreen.org
COMMENT= Python bindings for the Poppler PDF rendering library
-LIB_DEPENDS= poppler-glib.3:${PORTSDIR}/graphics/poppler-gtk
+LIB_DEPENDS= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk
USE_PYTHON= yes
GNU_CONFIGURE= yes
diff --git a/graphics/py-poppler/distinfo b/graphics/py-poppler/distinfo
index f84017df32ca..01aa38ef8ee7 100644
--- a/graphics/py-poppler/distinfo
+++ b/graphics/py-poppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (pypoppler-0.8.1.tar.gz) = 43891cdfe5fc174a2df661810f00177f
-SHA256 (pypoppler-0.8.1.tar.gz) = ffa8b3743159f9e4894f5bb8f5553abc81eb67835671e1f2d62b791f5c22153f
-SIZE (pypoppler-0.8.1.tar.gz) = 336578
+MD5 (pypoppler-0.10.0.tar.gz) = df7ec4ed7c9573b56391c9d6e0661695
+SHA256 (pypoppler-0.10.0.tar.gz) = 1c09814a457375da607aa400cd8774b98c016c760ea513e3a22357cf4fca63b1
+SIZE (pypoppler-0.10.0.tar.gz) = 292043
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index aec22e811374..1303a3c31840 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/lang/vala/Makefile,v 1.20 2008/11/03 22:50:31 mezz Exp $
+# $MCom: ports/lang/vala/Makefile,v 1.23 2009/03/31 14:27:07 kwm Exp $
#
PORTNAME= vala
-PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTVERSION= 0.6.0
CATEGORIES= lang gnome
MASTER_SITES= GNOME
@@ -22,16 +21,17 @@ GNU_CONFIGURE= yes
USE_GETTEXT= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}" LDFLAGS="-L${LOCALBASE}/lib"
USE_BISON= build
-MAN1= valac.1
USE_LDCONFIG= yes
+MAN1= valac.1
+
.include <bsd.port.pre.mk>
.if defined(WITH_VAPIGEN)
CONFIGURE_ARGS+=--enable-vapigen
BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
-MAN1= vala-gen-introspect.1 vapigen.1
+MAN1+= vala-gen-introspect.1 vapigen.1
PLIST_SUB+= VAPIGEN=""
.else
CONFIGURE_ARGS+=--disable-vapigen
diff --git a/lang/vala/distinfo b/lang/vala/distinfo
index 709febd399f4..431fb1648131 100644
--- a/lang/vala/distinfo
+++ b/lang/vala/distinfo
@@ -1,3 +1,3 @@
-MD5 (vala-0.4.0.tar.bz2) = 9aea32dc66e42895d7cbebe79b6dc6d5
-SHA256 (vala-0.4.0.tar.bz2) = 0a08ba289566e4d69b937c6bc29e43ba99b445811583b08bdef8d4b52e8a7d0c
-SIZE (vala-0.4.0.tar.bz2) = 1431282
+MD5 (vala-0.6.0.tar.bz2) = 9e5888a79757eb0f47df118b39762ed6
+SHA256 (vala-0.6.0.tar.bz2) = 9d1cb3661e6c15059e4eecce323b3f118c243d1f17a1883e2b2d7ca0a16987e5
+SIZE (vala-0.6.0.tar.bz2) = 1592884
diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist
index 2657234948c0..1b9041854eeb 100644
--- a/lang/vala/pkg-plist
+++ b/lang/vala/pkg-plist
@@ -65,32 +65,32 @@ include/vala-1.0/gee/readonlylist.h
include/vala-1.0/gee/readonlymap.h
include/vala-1.0/gee/readonlyset.h
include/vala-1.0/gee/set.h
-include/vala-1.0/gobject/valaccodearraycreationexpressionbinding.h
-include/vala-1.0/gobject/valaccodeassignmentbinding.h
-include/vala-1.0/gobject/valaccodebinding.h
-include/vala-1.0/gobject/valaccodeclassbinding.h
+include/vala-1.0/gobject/valaccodearraymodule.h
+include/vala-1.0/gobject/valaccodeassignmentmodule.h
+include/vala-1.0/gobject/valaccodebasemodule.h
include/vala-1.0/gobject/valaccodecompiler.h
-include/vala-1.0/gobject/valaccodecreationmethodbinding.h
-include/vala-1.0/gobject/valaccodedynamicmethodbinding.h
-include/vala-1.0/gobject/valaccodedynamicpropertybinding.h
-include/vala-1.0/gobject/valaccodedynamicsignalbinding.h
-include/vala-1.0/gobject/valaccodeelementaccessbinding.h
-include/vala-1.0/gobject/valaccodeexpressionbinding.h
+include/vala-1.0/gobject/valaccodecontrolflowmodule.h
+include/vala-1.0/gobject/valaccodedeclarationspace.h
+include/vala-1.0/gobject/valaccodedelegatemodule.h
include/vala-1.0/gobject/valaccodegenerator.h
-include/vala-1.0/gobject/valaccodegeneratorsignal.h
-include/vala-1.0/gobject/valaccodegeneratorsourcefile.h
-include/vala-1.0/gobject/valaccodegeneratorstruct.h
-include/vala-1.0/gobject/valaccodeinterfacebinding.h
-include/vala-1.0/gobject/valaccodeinvocationexpressionbinding.h
-include/vala-1.0/gobject/valaccodememberaccessbinding.h
-include/vala-1.0/gobject/valaccodemethodbinding.h
-include/vala-1.0/gobject/valaccodeobjecttypesymbolbinding.h
-include/vala-1.0/gobject/valaccodetypesymbolbinding.h
+include/vala-1.0/gobject/valaccodememberaccessmodule.h
+include/vala-1.0/gobject/valaccodemethodcallmodule.h
+include/vala-1.0/gobject/valaccodemethodmodule.h
+include/vala-1.0/gobject/valaccodemodule.h
+include/vala-1.0/gobject/valaccodestructmodule.h
include/vala-1.0/gobject/valaclassregisterfunction.h
+include/vala-1.0/gobject/valadbusclientmodule.h
+include/vala-1.0/gobject/valadbusmodule.h
+include/vala-1.0/gobject/valadbusservermodule.h
+include/vala-1.0/gobject/valagasyncmodule.h
+include/vala-1.0/gobject/valagerrormodule.h
include/vala-1.0/gobject/valagirwriter.h
+include/vala-1.0/gobject/valagobjectmodule.h
+include/vala-1.0/gobject/valagsignalmodule.h
+include/vala-1.0/gobject/valagtypemodule.h
include/vala-1.0/gobject/valainterfaceregisterfunction.h
+include/vala-1.0/gobject/valastructregisterfunction.h
include/vala-1.0/gobject/valatyperegisterfunction.h
-include/vala-1.0/vala/vala.h
include/vala-1.0/vala/valaaddressofexpression.h
include/vala-1.0/vala/valaarraycreationexpression.h
include/vala-1.0/vala/valaarraylengthfield.h
@@ -99,24 +99,23 @@ include/vala-1.0/vala/valaarrayresizemethod.h
include/vala-1.0/vala/valaarraytype.h
include/vala-1.0/vala/valaassignment.h
include/vala-1.0/vala/valaattribute.h
-include/vala-1.0/vala/valaattributeprocessor.h
include/vala-1.0/vala/valabaseaccess.h
include/vala-1.0/vala/valabasicblock.h
include/vala-1.0/vala/valabinaryexpression.h
include/vala-1.0/vala/valablock.h
include/vala-1.0/vala/valabooleanliteral.h
+include/vala-1.0/vala/valabooleantype.h
include/vala-1.0/vala/valabreakstatement.h
include/vala-1.0/vala/valacastexpression.h
include/vala-1.0/vala/valacatchclause.h
-include/vala-1.0/vala/valacfgbuilder.h
include/vala-1.0/vala/valacharacterliteral.h
include/vala-1.0/vala/valaclass.h
include/vala-1.0/vala/valaclasstype.h
-include/vala-1.0/vala/valacodebinding.h
include/vala-1.0/vala/valacodecontext.h
include/vala-1.0/vala/valacodegenerator.h
include/vala-1.0/vala/valacodenode.h
include/vala-1.0/vala/valacodevisitor.h
+include/vala-1.0/vala/valacodewriter.h
include/vala-1.0/vala/valaconditionalexpression.h
include/vala-1.0/vala/valaconstant.h
include/vala-1.0/vala/valaconstructor.h
@@ -136,6 +135,7 @@ include/vala-1.0/vala/valaelementaccess.h
include/vala-1.0/vala/valaemptystatement.h
include/vala-1.0/vala/valaenum.h
include/vala-1.0/vala/valaenumvalue.h
+include/vala-1.0/vala/valaenumvaluetype.h
include/vala-1.0/vala/valaerrorcode.h
include/vala-1.0/vala/valaerrordomain.h
include/vala-1.0/vala/valaerrortype.h
@@ -143,12 +143,15 @@ include/vala-1.0/vala/valaexpression.h
include/vala-1.0/vala/valaexpressionstatement.h
include/vala-1.0/vala/valafield.h
include/vala-1.0/vala/valafieldprototype.h
+include/vala-1.0/vala/valafloatingtype.h
+include/vala-1.0/vala/valaflowanalyzer.h
include/vala-1.0/vala/valaforeachstatement.h
include/vala-1.0/vala/valaformalparameter.h
include/vala-1.0/vala/valaforstatement.h
include/vala-1.0/vala/valagenieparser.h
include/vala-1.0/vala/valageniescanner.h
include/vala-1.0/vala/valagenietokentype.h
+include/vala-1.0/vala/valagenerictype.h
include/vala-1.0/vala/valaifstatement.h
include/vala-1.0/vala/valainitializerlist.h
include/vala-1.0/vala/valainstancecast.h
@@ -156,9 +159,7 @@ include/vala-1.0/vala/valaintegerliteral.h
include/vala-1.0/vala/valaintegertype.h
include/vala-1.0/vala/valainterface.h
include/vala-1.0/vala/valainterfacetype.h
-include/vala-1.0/vala/valainterfacewriter.h
include/vala-1.0/vala/valainvalidtype.h
-include/vala-1.0/vala/valainvocationexpression.h
include/vala-1.0/vala/valalambdaexpression.h
include/vala-1.0/vala/valaliteral.h
include/vala-1.0/vala/valalocalvariable.h
@@ -168,8 +169,8 @@ include/vala-1.0/vala/valamember.h
include/vala-1.0/vala/valamemberaccess.h
include/vala-1.0/vala/valamemberinitializer.h
include/vala-1.0/vala/valamethod.h
+include/vala-1.0/vala/valamethodcall.h
include/vala-1.0/vala/valamethodtype.h
-include/vala-1.0/vala/valanamedargument.h
include/vala-1.0/vala/valanamespace.h
include/vala-1.0/vala/valanullchecker.h
include/vala-1.0/vala/valanullliteral.h
@@ -177,8 +178,8 @@ include/vala-1.0/vala/valanulltype.h
include/vala-1.0/vala/valaobjectcreationexpression.h
include/vala-1.0/vala/valaobjecttype.h
include/vala-1.0/vala/valaobjecttypesymbol.h
-include/vala-1.0/vala/valaparenthesizedexpression.h
include/vala-1.0/vala/valaparser.h
+include/vala-1.0/vala/valaphifunction.h
include/vala-1.0/vala/valapointerindirection.h
include/vala-1.0/vala/valapointertype.h
include/vala-1.0/vala/valapostfixexpression.h
@@ -200,8 +201,10 @@ include/vala-1.0/vala/valasourcefilecycle.h
include/vala-1.0/vala/valasourcelocation.h
include/vala-1.0/vala/valasourcereference.h
include/vala-1.0/vala/valastatement.h
+include/vala-1.0/vala/valastatementlist.h
include/vala-1.0/vala/valastringliteral.h
include/vala-1.0/vala/valastruct.h
+include/vala-1.0/vala/valastructvaluetype.h
include/vala-1.0/vala/valaswitchlabel.h
include/vala-1.0/vala/valaswitchsection.h
include/vala-1.0/vala/valaswitchstatement.h
@@ -214,7 +217,6 @@ include/vala-1.0/vala/valatuple.h
include/vala-1.0/vala/valatypecheck.h
include/vala-1.0/vala/valatypeofexpression.h
include/vala-1.0/vala/valatypeparameter.h
-include/vala-1.0/vala/valatypeparametertype.h
include/vala-1.0/vala/valatypesymbol.h
include/vala-1.0/vala/valaunaryexpression.h
include/vala-1.0/vala/valaunresolvedsymbol.h
@@ -223,6 +225,7 @@ include/vala-1.0/vala/valausingdirective.h
include/vala-1.0/vala/valavaluetype.h
include/vala-1.0/vala/valavoidtype.h
include/vala-1.0/vala/valawhilestatement.h
+include/vala-1.0/vala/valayieldstatement.h
lib/libvala.la
lib/libvala.so
lib/libvala.so.0
@@ -250,6 +253,8 @@ share/devhelp/books/vala/vala.devhelp2
%%DATADIR%%/vapi/curses.vapi
%%DATADIR%%/vapi/dbus-glib-1.vapi
%%DATADIR%%/vapi/enchant.vapi
+%%DATADIR%%/vapi/fuse.deps
+%%DATADIR%%/vapi/fuse.vapi
%%DATADIR%%/vapi/gconf-2.0.vapi
%%DATADIR%%/vapi/gdk-2.0.deps
%%DATADIR%%/vapi/gdk-2.0.vapi
@@ -267,6 +272,7 @@ share/devhelp/books/vala/vala.devhelp2
%%DATADIR%%/vapi/gnome-desktop-2.0.vapi
%%DATADIR%%/vapi/gnome-keyring-1.vapi
%%DATADIR%%/vapi/gnome-vfs-2.0.vapi
+%%DATADIR%%/vapi/gobject-2.0.vapi
%%DATADIR%%/vapi/goocanvas.deps
%%DATADIR%%/vapi/goocanvas.vapi
%%DATADIR%%/vapi/gsl.vapi
@@ -318,6 +324,7 @@ share/devhelp/books/vala/vala.devhelp2
%%DATADIR%%/vapi/hildon-fm-2.vapi
%%DATADIR%%/vapi/json-glib-1.0.vapi
%%DATADIR%%/vapi/libbonoboui-2.0.vapi
+%%DATADIR%%/vapi/libdaemon.vapi
%%DATADIR%%/vapi/libepc-1.0.vapi
%%DATADIR%%/vapi/libftdi.deps
%%DATADIR%%/vapi/libftdi.vapi
@@ -332,8 +339,11 @@ share/devhelp/books/vala/vala.devhelp2
%%DATADIR%%/vapi/libnotify.deps
%%DATADIR%%/vapi/libnotify.vapi
%%DATADIR%%/vapi/liboobs-1.vapi
+%%DATADIR%%/vapi/libosso.vapi
%%DATADIR%%/vapi/libpanelapplet-2.0.deps
%%DATADIR%%/vapi/libpanelapplet-2.0.vapi
+%%DATADIR%%/vapi/librsvg-2.0.deps
+%%DATADIR%%/vapi/librsvg-2.0.vapi
%%DATADIR%%/vapi/libsexy.deps
%%DATADIR%%/vapi/libsexy.vapi
%%DATADIR%%/vapi/libsoup-2.2.vapi
@@ -344,12 +354,17 @@ share/devhelp/books/vala/vala.devhelp2
%%DATADIR%%/vapi/libwnck-1.0.vapi
%%DATADIR%%/vapi/libxml-2.0.vapi
%%DATADIR%%/vapi/loudmouth-1.0.vapi
+%%DATADIR%%/vapi/lua.vapi
+%%DATADIR%%/vapi/mysql.vapi
%%DATADIR%%/vapi/pango.deps
%%DATADIR%%/vapi/pango.vapi
%%DATADIR%%/vapi/pangocairo.deps
%%DATADIR%%/vapi/pangocairo.vapi
%%DATADIR%%/vapi/poppler-glib.deps
%%DATADIR%%/vapi/poppler-glib.vapi
+%%DATADIR%%/vapi/posix.vapi
+%%DATADIR%%/vapi/raptor.vapi
+%%DATADIR%%/vapi/rasqal.vapi
%%DATADIR%%/vapi/sdl-gfx.vapi
%%DATADIR%%/vapi/sdl-image.vapi
%%DATADIR%%/vapi/sdl-mixer.vapi
@@ -362,6 +377,7 @@ share/devhelp/books/vala/vala.devhelp2
%%DATADIR%%/vapi/tracker-indexer-module-1.0.vapi
%%DATADIR%%/vapi/unique-1.0.deps
%%DATADIR%%/vapi/unique-1.0.vapi
+%%DATADIR%%/vapi/v4l2.vapi
%%DATADIR%%/vapi/vala-1.0.vapi
%%DATADIR%%/vapi/vte.deps
%%DATADIR%%/vapi/vte.vapi
@@ -372,7 +388,6 @@ share/devhelp/books/vala/vala.devhelp2
@dirrmtry share/devhelp/books
@dirrmtry share/devhelp
%%VAPIGEN%%@dirrm lib/vala
-@dirrm lib/pkgconfig
@dirrm include/vala-1.0/vala
@dirrm include/vala-1.0/gobject
@dirrm include/vala-1.0/gee
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 708aba5d1b79..a2fe9ca0bd66 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger, based off kiesel's ximian-exchange port
#
# $FreeBSD$
-# $MCom: ports/mail/evolution-exchange/Makefile,v 1.129 2008/11/25 05:34:10 mezz Exp $
+# $MCom: ports/mail/evolution-exchange/Makefile,v 1.133 2009/03/17 16:01:03 kwm Exp $
#
PORTNAME= evolution-exchange
-PORTVERSION= 2.24.5
+PORTVERSION= 2.26.0
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -32,8 +32,8 @@ CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \
--disable-compile-warnings \
--with-libdb=${LOCALBASE}
-EVO_VERSION= 2.24
-VERSION= 2.24
+EVO_VERSION= 2.26
+VERSION= 2.26
PLIST_SUB= VERSION=${VERSION} EVO_VERSION=${EVO_VERSION} \
EDS_VERSION="1.2"
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index eaa1cfe61aab..746e7ec259c9 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-exchange-2.24.5.tar.bz2) = 7a9d0da44196b8f3fac728f2d00ac5ec
-SHA256 (gnome2/evolution-exchange-2.24.5.tar.bz2) = 77612dc59d50c2ca05f3655149bbd7c617535babe574fee0d2c892c165c6f3cc
-SIZE (gnome2/evolution-exchange-2.24.5.tar.bz2) = 937408
+MD5 (gnome2/evolution-exchange-2.26.0.tar.bz2) = 845f0a74e4565a6639f3b8adb736cbc1
+SHA256 (gnome2/evolution-exchange-2.26.0.tar.bz2) = 677c363f5c983b0cf64ed167904ad063c87785a9da666cb35cac6c12b1d9d3a0
+SIZE (gnome2/evolution-exchange-2.26.0.tar.bz2) = 945729
diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile
index e7ec284cdcd8..176f460afef1 100644
--- a/mail/evolution-sharp/Makefile
+++ b/mail/evolution-sharp/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= evolution-sharp
-PORTVERSION= 0.18.1
+PORTVERSION= 0.20.0
CATEGORIES= mail gnome
MASTER_SITES= GNOME
diff --git a/mail/evolution-sharp/distinfo b/mail/evolution-sharp/distinfo
index adcb78423e4d..0900c63d9425 100644
--- a/mail/evolution-sharp/distinfo
+++ b/mail/evolution-sharp/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-sharp-0.18.1.tar.bz2) = 85fb9417093e54ef1da7c8248f94472e
-SHA256 (evolution-sharp-0.18.1.tar.bz2) = bf0258f2d73a7bacafb94dde87b4806f4b6bf9d94a96d98fa1cea09026d215c4
-SIZE (evolution-sharp-0.18.1.tar.bz2) = 317001
+MD5 (evolution-sharp-0.20.0.tar.bz2) = ca4f75a795aa2af36c4573971c0534f7
+SHA256 (evolution-sharp-0.20.0.tar.bz2) = 3a09c724e7c9c14d2a8ca18ad3d2686c8e80347adc8eaf0b72a598ab2980b111
+SIZE (evolution-sharp-0.20.0.tar.bz2) = 334986
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index a94c35a474e5..923e453a45ec 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/mail/evolution/Makefile,v 1.186 2008/11/25 05:29:01 mezz Exp $
+# $MCom: ports/mail/evolution/Makefile,v 1.192 2009/03/17 14:37:43 kwm Exp $
#
PORTNAME= evolution
-PORTVERSION= 2.24.5
-PORTREVISION= 1
+PORTVERSION= 2.26.0
+PORTREVISION= 0
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -28,7 +28,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \
USE_AUTOTOOLS= libtool:15
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-USE_LDCONFIG= ${PREFIX}/lib/evolution/${EVO_VERSION}
+USE_LDCONFIG= yes
+LDCONFIG_DIRS= %%PREFIX%%/lib/evolution/%%VERSION%%
CONFIGURE_ARGS= --enable-nss=yes \
--enable-mono=no \
--with-sub-version=" FreeBSD GNOME Team Port"
@@ -46,7 +47,7 @@ GCONF_SCHEMAS= apps_evolution_addressbook.schemas \
bogo-junk-plugin.schemas \
evolution-mail.schemas
-EVO_VERSION= 2.24
+EVO_VERSION= 2.26
PLIST_SUB= VERSION=${EVO_VERSION} \
PORTVERSION=2.12
@@ -56,6 +57,9 @@ OPTIONS= PILOT "Enable Palm Pilot sync support" off \
.include <bsd.port.pre.mk>
+USE_LDCONFIG= ${PREFIX}/lib/evolution/${EVO_VERSION}
+.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
+
.if defined(WITH_PILOT)
LIB_DEPENDS+= gpilotdconduit.2:${PORTSDIR}/palm/gnome-pilot
CONFIGURE_ARGS+= --with-pisock=${LOCALBASE} \
@@ -97,7 +101,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr/sbin|${LOCALBASE}/bin|g' \
${WRKSRC}/plugins/sa-junk-plugin/em-junk-filter.c
-post-install:
+post-install: install-ldconfig-file
${MKDIR} ${PREFIX}/include/evolution-${EVO_VERSION}/composer
${INSTALL_DATA} ${WRKSRC}/composer/e-msg*.h ${PREFIX}/include/evolution-${EVO_VERSION}/composer
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 4c826fe3783b..ec93f5216431 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.24.5.tar.bz2) = a8fe850565aef43b9e99f73aa02a9d3e
-SHA256 (gnome2/evolution-2.24.5.tar.bz2) = 9892a49d0a2659af550299d9d57dd076a52d428f4f68457c352ec69fcc911e01
-SIZE (gnome2/evolution-2.24.5.tar.bz2) = 32657364
+MD5 (gnome2/evolution-2.26.0.tar.bz2) = 97234b1ecded0232a1b68d2fc03b0252
+SHA256 (gnome2/evolution-2.26.0.tar.bz2) = 74a2d936ba8330d0abe059062bb84446f379c605480c0c404575e419926d5004
+SIZE (gnome2/evolution-2.26.0.tar.bz2) = 32677910
diff --git a/mail/evolution/files/patch-widgets_misc_e-calendar-item.c b/mail/evolution/files/patch-widgets_misc_e-calendar-item.c
deleted file mode 100644
index 9959443a918d..000000000000
--- a/mail/evolution/files/patch-widgets_misc_e-calendar-item.c
+++ /dev/null
@@ -1,41 +0,0 @@
---- widgets/misc/e-calendar-item.c.orig 2009-03-04 22:45:32.000000000 -0500
-+++ widgets/misc/e-calendar-item.c 2009-03-04 22:50:13.000000000 -0500
-@@ -1505,12 +1505,12 @@ e_calendar_item_draw_day_numbers (ECalen
- if (week_num >= 10) {
- digit = week_num / 10;
- text_x -= calitem->week_number_digit_widths[digit];
-- num_chars += sprintf (&buffer[num_chars], "%Id", digit);
-+ num_chars += sprintf (&buffer[num_chars], "%d", digit);
- }
-
- digit = week_num % 10;
- text_x -= calitem->week_number_digit_widths[digit] + 6;
-- num_chars += sprintf (&buffer[num_chars], "%Id", digit);
-+ num_chars += sprintf (&buffer[num_chars], "%d", digit);
-
- cairo_save (cr);
- gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_ACTIVE]);
-@@ -1618,12 +1618,12 @@ e_calendar_item_draw_day_numbers (ECalen
- if (day_num >= 10) {
- digit = day_num / 10;
- day_x -= calitem->digit_widths[digit];
-- num_chars += sprintf (&buffer[num_chars], "%Id", digit);
-+ num_chars += sprintf (&buffer[num_chars], "%d", digit);
- }
-
- digit = day_num % 10;
- day_x -= calitem->digit_widths[digit];
-- num_chars += sprintf (&buffer[num_chars], "%Id", digit);
-+ num_chars += sprintf (&buffer[num_chars], "%d", digit);
-
- cairo_save (cr);
- if (fg_color) {
-@@ -1958,7 +1958,7 @@ e_calendar_item_recalc_sizes (ECalendar
- gchar locale_digit[5];
- int locale_digit_len;
-
-- locale_digit_len = sprintf (locale_digit, "%Id", digit);
-+ locale_digit_len = sprintf (locale_digit, "%d", digit);
-
- pango_layout_set_text (layout, locale_digit, locale_digit_len);
- pango_layout_get_pixel_size (layout, &width, NULL);
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 732482f662d0..9ed41eb95f9a 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -30,6 +30,7 @@ include/evolution-%%VERSION%%/e-util/e-import.h
include/evolution-%%VERSION%%/e-util/e-logger.h
include/evolution-%%VERSION%%/e-util/e-menu.h
include/evolution-%%VERSION%%/e-util/e-mktemp.h
+include/evolution-%%VERSION%%/e-util/e-non-intrusive-error-dialog.h
include/evolution-%%VERSION%%/e-util/e-plugin-ui.h
include/evolution-%%VERSION%%/e-util/e-plugin.h
include/evolution-%%VERSION%%/e-util/e-popup.h
@@ -404,9 +405,6 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.a
lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.a
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.a
lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.so
@@ -468,7 +466,6 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.xml
lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.xml
lib/evolution/%%VERSION%%/plugins/org-gnome-mark-all-read.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-mark-calendar-offline.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.xml
lib/evolution/%%VERSION%%/plugins/org-gnome-prefer-plain.eplug
@@ -497,6 +494,7 @@ share/applications/evolution.desktop
%%DATADIR%%/%%VERSION%%/addresstypes.xml
%%DATADIR%%/%%VERSION%%/caltypes.xml
%%DATADIR%%/%%VERSION%%/default/C/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/default/ca/mail/local/Inbox
%%DATADIR%%/%%VERSION%%/default/cs/mail/local/Inbox
%%DATADIR%%/%%VERSION%%/default/de/mail/local/Inbox
%%DATADIR%%/%%VERSION%%/default/es/mail/local/Inbox
@@ -599,6 +597,7 @@ share/applications/evolution.desktop
%%DATADIR%%/%%VERSION%%/glade/task-details-page.glade
%%DATADIR%%/%%VERSION%%/glade/task-page.glade
%%DATADIR%%/%%VERSION%%/help/quickref/C/quickref.pdf
+%%DATADIR%%/%%VERSION%%/help/quickref/ca/quickref.pdf
%%DATADIR%%/%%VERSION%%/help/quickref/cs/quickref.pdf
%%DATADIR%%/%%VERSION%%/help/quickref/de/quickref.pdf
%%DATADIR%%/%%VERSION%%/help/quickref/es/quickref.pdf
@@ -712,23 +711,16 @@ share/applications/evolution.desktop
%%DATADIR%%/%%VERSION%%/weather/category_weather_sun_16.png
%%DATADIR%%/%%VERSION%%/weather/category_weather_tstorm_16.png
share/gnome/help/evolution/C/evolution.xml
-share/gnome/help/evolution/C/figures/Screenshot-Evolution-mailer-Preferences.png
-share/gnome/help/evolution/C/figures/Screenshot-Free-Busy.png
share/gnome/help/evolution/C/figures/account_editor_a.png
-share/gnome/help/evolution/C/figures/addrs_book_a.png
share/gnome/help/evolution/C/figures/attach_reminder_a.png
-share/gnome/help/evolution/C/figures/calendar.png
share/gnome/help/evolution/C/figures/categories_a.png
share/gnome/help/evolution/C/figures/collap_head_a.png
share/gnome/help/evolution/C/figures/config-cal.png
share/gnome/help/evolution/C/figures/config-mail.png
-share/gnome/help/evolution/C/figures/contact-editor.png
-share/gnome/help/evolution/C/figures/contact.png
share/gnome/help/evolution/C/figures/contacts_mainwindow_a.png
share/gnome/help/evolution/C/figures/delgt-add.png
+share/gnome/help/evolution/C/figures/evo_Wcal_prop_a.png
share/gnome/help/evolution/C/figures/evo_account_editor_a.png
-share/gnome/help/evolution/C/figures/evo_account_info_a.png
-share/gnome/help/evolution/C/figures/evo_add_rule_a.png
share/gnome/help/evolution/C/figures/evo_adv_search_a.png
share/gnome/help/evolution/C/figures/evo_allday_a.png
share/gnome/help/evolution/C/figures/evo_attachreminder_plugin.png
@@ -742,6 +734,7 @@ share/gnome/help/evolution/C/figures/evo_cal_callout_a.png
share/gnome/help/evolution/C/figures/evo_cal_prop_a.png
share/gnome/help/evolution/C/figures/evo_calender_appointmnt.png
share/gnome/help/evolution/C/figures/evo_calstatus_a.png
+share/gnome/help/evolution/C/figures/evo_caltasks_a.png
share/gnome/help/evolution/C/figures/evo_contacteditor_a.png
share/gnome/help/evolution/C/figures/evo_crash_recovery.png
share/gnome/help/evolution/C/figures/evo_custom_header.png
@@ -751,7 +744,7 @@ share/gnome/help/evolution/C/figures/evo_dialog-info.png
share/gnome/help/evolution/C/figures/evo_dialog-warning.png
share/gnome/help/evolution/C/figures/evo_edit_rule_a.png
share/gnome/help/evolution/C/figures/evo_edit_search.png
-share/gnome/help/evolution/C/figures/evo_email_a.png
+share/gnome/help/evolution/C/figures/evo_exchng_mapi.png
share/gnome/help/evolution/C/figures/evo_flag_follow_up_a.png
share/gnome/help/evolution/C/figures/evo_gwreceive_a.png
share/gnome/help/evolution/C/figures/evo_gwreceiveedit_a.png
@@ -761,6 +754,7 @@ share/gnome/help/evolution/C/figures/evo_identity_a.png
share/gnome/help/evolution/C/figures/evo_identityedit_a.png
share/gnome/help/evolution/C/figures/evo_imapheader_a.png
share/gnome/help/evolution/C/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/C/figures/evo_import.png
share/gnome/help/evolution/C/figures/evo_import_asst_a.png
share/gnome/help/evolution/C/figures/evo_junk_a.png
share/gnome/help/evolution/C/figures/evo_label_a.png
@@ -779,7 +773,6 @@ share/gnome/help/evolution/C/figures/evo_newmess_a.png
share/gnome/help/evolution/C/figures/evo_offline.png
share/gnome/help/evolution/C/figures/evo_popreceive_a.png
share/gnome/help/evolution/C/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/C/figures/evo_receive_setup2_a.png
share/gnome/help/evolution/C/figures/evo_receive_setup_a.png
share/gnome/help/evolution/C/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/C/figures/evo_rule_a.png
@@ -791,10 +784,6 @@ share/gnome/help/evolution/C/figures/evo_sendstatus_a.png
share/gnome/help/evolution/C/figures/evo_shd_memo_a.png
share/gnome/help/evolution/C/figures/evo_timezone_a.png
share/gnome/help/evolution/C/figures/evo_usereceive_a.png
-share/gnome/help/evolution/C/figures/exchange-delegation.png
-share/gnome/help/evolution/C/figures/exchange-identity.png
-share/gnome/help/evolution/C/figures/exchange-receive-options.png
-share/gnome/help/evolution/C/figures/exchange-receive.png
share/gnome/help/evolution/C/figures/exchg-identity.png
share/gnome/help/evolution/C/figures/exchng-identity.png
share/gnome/help/evolution/C/figures/exchng-rec-mail.png
@@ -804,52 +793,30 @@ share/gnome/help/evolution/C/figures/exchng-rec-options.png
share/gnome/help/evolution/C/figures/exchng-settings.png
share/gnome/help/evolution/C/figures/filter-new-fig.png
share/gnome/help/evolution/C/figures/free_busy.png
-share/gnome/help/evolution/C/figures/full-1.png
-share/gnome/help/evolution/C/figures/full-2.png
-share/gnome/help/evolution/C/figures/full-3.png
-share/gnome/help/evolution/C/figures/full-4.png
-share/gnome/help/evolution/C/figures/full-5.png
-share/gnome/help/evolution/C/figures/full-6.png
-share/gnome/help/evolution/C/figures/full-7.png
share/gnome/help/evolution/C/figures/google_cal_view.png
-share/gnome/help/evolution/C/figures/mail-druid-pic.png
-share/gnome/help/evolution/C/figures/mail-inbox.png
share/gnome/help/evolution/C/figures/mail-threaded.png
-share/gnome/help/evolution/C/figures/mail_mainwindow_a.png
share/gnome/help/evolution/C/figures/mailer_preferences.png
-share/gnome/help/evolution/C/figures/mainwindow-pic.png
share/gnome/help/evolution/C/figures/minus.png
-share/gnome/help/evolution/C/figures/newmsg.png
share/gnome/help/evolution/C/figures/plus.png
share/gnome/help/evolution/C/figures/proxy-cal.png
share/gnome/help/evolution/C/figures/proxy-login.png
share/gnome/help/evolution/C/figures/quick_add_a.png
share/gnome/help/evolution/C/figures/quick_reference.png
-share/gnome/help/evolution/C/figures/replymsg.png
-share/gnome/help/evolution/C/figures/schedule.png
share/gnome/help/evolution/C/figures/stock_search.png
share/gnome/help/evolution/C/figures/sub-others-folder.png
share/gnome/help/evolution/C/figures/sub-pub-fold.png
share/gnome/help/evolution/C/figures/ver_view_a.png
-share/gnome/help/evolution/C/figures/vfolder-createrule-fig.png
share/gnome/help/evolution/cs/evolution.xml
-share/gnome/help/evolution/cs/figures/Screenshot-Evolution-mailer-Preferences.png
-share/gnome/help/evolution/cs/figures/Screenshot-Free-Busy.png
share/gnome/help/evolution/cs/figures/account_editor_a.png
-share/gnome/help/evolution/cs/figures/addrs_book_a.png
share/gnome/help/evolution/cs/figures/attach_reminder_a.png
-share/gnome/help/evolution/cs/figures/calendar.png
share/gnome/help/evolution/cs/figures/categories_a.png
share/gnome/help/evolution/cs/figures/collap_head_a.png
share/gnome/help/evolution/cs/figures/config-cal.png
share/gnome/help/evolution/cs/figures/config-mail.png
-share/gnome/help/evolution/cs/figures/contact-editor.png
-share/gnome/help/evolution/cs/figures/contact.png
share/gnome/help/evolution/cs/figures/contacts_mainwindow_a.png
share/gnome/help/evolution/cs/figures/delgt-add.png
+share/gnome/help/evolution/cs/figures/evo_Wcal_prop_a.png
share/gnome/help/evolution/cs/figures/evo_account_editor_a.png
-share/gnome/help/evolution/cs/figures/evo_account_info_a.png
-share/gnome/help/evolution/cs/figures/evo_add_rule_a.png
share/gnome/help/evolution/cs/figures/evo_adv_search_a.png
share/gnome/help/evolution/cs/figures/evo_allday_a.png
share/gnome/help/evolution/cs/figures/evo_attachreminder_plugin.png
@@ -863,6 +830,7 @@ share/gnome/help/evolution/cs/figures/evo_cal_callout_a.png
share/gnome/help/evolution/cs/figures/evo_cal_prop_a.png
share/gnome/help/evolution/cs/figures/evo_calender_appointmnt.png
share/gnome/help/evolution/cs/figures/evo_calstatus_a.png
+share/gnome/help/evolution/cs/figures/evo_caltasks_a.png
share/gnome/help/evolution/cs/figures/evo_contacteditor_a.png
share/gnome/help/evolution/cs/figures/evo_crash_recovery.png
share/gnome/help/evolution/cs/figures/evo_custom_header.png
@@ -872,7 +840,7 @@ share/gnome/help/evolution/cs/figures/evo_dialog-info.png
share/gnome/help/evolution/cs/figures/evo_dialog-warning.png
share/gnome/help/evolution/cs/figures/evo_edit_rule_a.png
share/gnome/help/evolution/cs/figures/evo_edit_search.png
-share/gnome/help/evolution/cs/figures/evo_email_a.png
+share/gnome/help/evolution/cs/figures/evo_exchng_mapi.png
share/gnome/help/evolution/cs/figures/evo_flag_follow_up_a.png
share/gnome/help/evolution/cs/figures/evo_gwreceive_a.png
share/gnome/help/evolution/cs/figures/evo_gwreceiveedit_a.png
@@ -882,6 +850,7 @@ share/gnome/help/evolution/cs/figures/evo_identity_a.png
share/gnome/help/evolution/cs/figures/evo_identityedit_a.png
share/gnome/help/evolution/cs/figures/evo_imapheader_a.png
share/gnome/help/evolution/cs/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/cs/figures/evo_import.png
share/gnome/help/evolution/cs/figures/evo_import_asst_a.png
share/gnome/help/evolution/cs/figures/evo_junk_a.png
share/gnome/help/evolution/cs/figures/evo_label_a.png
@@ -900,7 +869,6 @@ share/gnome/help/evolution/cs/figures/evo_newmess_a.png
share/gnome/help/evolution/cs/figures/evo_offline.png
share/gnome/help/evolution/cs/figures/evo_popreceive_a.png
share/gnome/help/evolution/cs/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/cs/figures/evo_receive_setup2_a.png
share/gnome/help/evolution/cs/figures/evo_receive_setup_a.png
share/gnome/help/evolution/cs/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/cs/figures/evo_rule_a.png
@@ -912,10 +880,6 @@ share/gnome/help/evolution/cs/figures/evo_sendstatus_a.png
share/gnome/help/evolution/cs/figures/evo_shd_memo_a.png
share/gnome/help/evolution/cs/figures/evo_timezone_a.png
share/gnome/help/evolution/cs/figures/evo_usereceive_a.png
-share/gnome/help/evolution/cs/figures/exchange-delegation.png
-share/gnome/help/evolution/cs/figures/exchange-identity.png
-share/gnome/help/evolution/cs/figures/exchange-receive-options.png
-share/gnome/help/evolution/cs/figures/exchange-receive.png
share/gnome/help/evolution/cs/figures/exchg-identity.png
share/gnome/help/evolution/cs/figures/exchng-identity.png
share/gnome/help/evolution/cs/figures/exchng-rec-mail.png
@@ -925,52 +889,30 @@ share/gnome/help/evolution/cs/figures/exchng-rec-options.png
share/gnome/help/evolution/cs/figures/exchng-settings.png
share/gnome/help/evolution/cs/figures/filter-new-fig.png
share/gnome/help/evolution/cs/figures/free_busy.png
-share/gnome/help/evolution/cs/figures/full-1.png
-share/gnome/help/evolution/cs/figures/full-2.png
-share/gnome/help/evolution/cs/figures/full-3.png
-share/gnome/help/evolution/cs/figures/full-4.png
-share/gnome/help/evolution/cs/figures/full-5.png
-share/gnome/help/evolution/cs/figures/full-6.png
-share/gnome/help/evolution/cs/figures/full-7.png
share/gnome/help/evolution/cs/figures/google_cal_view.png
-share/gnome/help/evolution/cs/figures/mail-druid-pic.png
-share/gnome/help/evolution/cs/figures/mail-inbox.png
share/gnome/help/evolution/cs/figures/mail-threaded.png
-share/gnome/help/evolution/cs/figures/mail_mainwindow_a.png
share/gnome/help/evolution/cs/figures/mailer_preferences.png
-share/gnome/help/evolution/cs/figures/mainwindow-pic.png
share/gnome/help/evolution/cs/figures/minus.png
-share/gnome/help/evolution/cs/figures/newmsg.png
share/gnome/help/evolution/cs/figures/plus.png
share/gnome/help/evolution/cs/figures/proxy-cal.png
share/gnome/help/evolution/cs/figures/proxy-login.png
share/gnome/help/evolution/cs/figures/quick_add_a.png
share/gnome/help/evolution/cs/figures/quick_reference.png
-share/gnome/help/evolution/cs/figures/replymsg.png
-share/gnome/help/evolution/cs/figures/schedule.png
share/gnome/help/evolution/cs/figures/stock_search.png
share/gnome/help/evolution/cs/figures/sub-others-folder.png
share/gnome/help/evolution/cs/figures/sub-pub-fold.png
share/gnome/help/evolution/cs/figures/ver_view_a.png
-share/gnome/help/evolution/cs/figures/vfolder-createrule-fig.png
share/gnome/help/evolution/de/evolution.xml
-share/gnome/help/evolution/de/figures/Screenshot-Evolution-mailer-Preferences.png
-share/gnome/help/evolution/de/figures/Screenshot-Free-Busy.png
share/gnome/help/evolution/de/figures/account_editor_a.png
-share/gnome/help/evolution/de/figures/addrs_book_a.png
share/gnome/help/evolution/de/figures/attach_reminder_a.png
-share/gnome/help/evolution/de/figures/calendar.png
share/gnome/help/evolution/de/figures/categories_a.png
share/gnome/help/evolution/de/figures/collap_head_a.png
share/gnome/help/evolution/de/figures/config-cal.png
share/gnome/help/evolution/de/figures/config-mail.png
-share/gnome/help/evolution/de/figures/contact-editor.png
-share/gnome/help/evolution/de/figures/contact.png
share/gnome/help/evolution/de/figures/contacts_mainwindow_a.png
share/gnome/help/evolution/de/figures/delgt-add.png
+share/gnome/help/evolution/de/figures/evo_Wcal_prop_a.png
share/gnome/help/evolution/de/figures/evo_account_editor_a.png
-share/gnome/help/evolution/de/figures/evo_account_info_a.png
-share/gnome/help/evolution/de/figures/evo_add_rule_a.png
share/gnome/help/evolution/de/figures/evo_adv_search_a.png
share/gnome/help/evolution/de/figures/evo_allday_a.png
share/gnome/help/evolution/de/figures/evo_attachreminder_plugin.png
@@ -984,6 +926,7 @@ share/gnome/help/evolution/de/figures/evo_cal_callout_a.png
share/gnome/help/evolution/de/figures/evo_cal_prop_a.png
share/gnome/help/evolution/de/figures/evo_calender_appointmnt.png
share/gnome/help/evolution/de/figures/evo_calstatus_a.png
+share/gnome/help/evolution/de/figures/evo_caltasks_a.png
share/gnome/help/evolution/de/figures/evo_contacteditor_a.png
share/gnome/help/evolution/de/figures/evo_crash_recovery.png
share/gnome/help/evolution/de/figures/evo_custom_header.png
@@ -993,7 +936,7 @@ share/gnome/help/evolution/de/figures/evo_dialog-info.png
share/gnome/help/evolution/de/figures/evo_dialog-warning.png
share/gnome/help/evolution/de/figures/evo_edit_rule_a.png
share/gnome/help/evolution/de/figures/evo_edit_search.png
-share/gnome/help/evolution/de/figures/evo_email_a.png
+share/gnome/help/evolution/de/figures/evo_exchng_mapi.png
share/gnome/help/evolution/de/figures/evo_flag_follow_up_a.png
share/gnome/help/evolution/de/figures/evo_gwreceive_a.png
share/gnome/help/evolution/de/figures/evo_gwreceiveedit_a.png
@@ -1003,6 +946,7 @@ share/gnome/help/evolution/de/figures/evo_identity_a.png
share/gnome/help/evolution/de/figures/evo_identityedit_a.png
share/gnome/help/evolution/de/figures/evo_imapheader_a.png
share/gnome/help/evolution/de/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/de/figures/evo_import.png
share/gnome/help/evolution/de/figures/evo_import_asst_a.png
share/gnome/help/evolution/de/figures/evo_junk_a.png
share/gnome/help/evolution/de/figures/evo_label_a.png
@@ -1021,7 +965,6 @@ share/gnome/help/evolution/de/figures/evo_newmess_a.png
share/gnome/help/evolution/de/figures/evo_offline.png
share/gnome/help/evolution/de/figures/evo_popreceive_a.png
share/gnome/help/evolution/de/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/de/figures/evo_receive_setup2_a.png
share/gnome/help/evolution/de/figures/evo_receive_setup_a.png
share/gnome/help/evolution/de/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/de/figures/evo_rule_a.png
@@ -1033,10 +976,6 @@ share/gnome/help/evolution/de/figures/evo_sendstatus_a.png
share/gnome/help/evolution/de/figures/evo_shd_memo_a.png
share/gnome/help/evolution/de/figures/evo_timezone_a.png
share/gnome/help/evolution/de/figures/evo_usereceive_a.png
-share/gnome/help/evolution/de/figures/exchange-delegation.png
-share/gnome/help/evolution/de/figures/exchange-identity.png
-share/gnome/help/evolution/de/figures/exchange-receive-options.png
-share/gnome/help/evolution/de/figures/exchange-receive.png
share/gnome/help/evolution/de/figures/exchg-identity.png
share/gnome/help/evolution/de/figures/exchng-identity.png
share/gnome/help/evolution/de/figures/exchng-rec-mail.png
@@ -1046,52 +985,30 @@ share/gnome/help/evolution/de/figures/exchng-rec-options.png
share/gnome/help/evolution/de/figures/exchng-settings.png
share/gnome/help/evolution/de/figures/filter-new-fig.png
share/gnome/help/evolution/de/figures/free_busy.png
-share/gnome/help/evolution/de/figures/full-1.png
-share/gnome/help/evolution/de/figures/full-2.png
-share/gnome/help/evolution/de/figures/full-3.png
-share/gnome/help/evolution/de/figures/full-4.png
-share/gnome/help/evolution/de/figures/full-5.png
-share/gnome/help/evolution/de/figures/full-6.png
-share/gnome/help/evolution/de/figures/full-7.png
share/gnome/help/evolution/de/figures/google_cal_view.png
-share/gnome/help/evolution/de/figures/mail-druid-pic.png
-share/gnome/help/evolution/de/figures/mail-inbox.png
share/gnome/help/evolution/de/figures/mail-threaded.png
-share/gnome/help/evolution/de/figures/mail_mainwindow_a.png
share/gnome/help/evolution/de/figures/mailer_preferences.png
-share/gnome/help/evolution/de/figures/mainwindow-pic.png
share/gnome/help/evolution/de/figures/minus.png
-share/gnome/help/evolution/de/figures/newmsg.png
share/gnome/help/evolution/de/figures/plus.png
share/gnome/help/evolution/de/figures/proxy-cal.png
share/gnome/help/evolution/de/figures/proxy-login.png
share/gnome/help/evolution/de/figures/quick_add_a.png
share/gnome/help/evolution/de/figures/quick_reference.png
-share/gnome/help/evolution/de/figures/replymsg.png
-share/gnome/help/evolution/de/figures/schedule.png
share/gnome/help/evolution/de/figures/stock_search.png
share/gnome/help/evolution/de/figures/sub-others-folder.png
share/gnome/help/evolution/de/figures/sub-pub-fold.png
share/gnome/help/evolution/de/figures/ver_view_a.png
-share/gnome/help/evolution/de/figures/vfolder-createrule-fig.png
share/gnome/help/evolution/el/evolution.xml
-share/gnome/help/evolution/el/figures/Screenshot-Evolution-mailer-Preferences.png
-share/gnome/help/evolution/el/figures/Screenshot-Free-Busy.png
share/gnome/help/evolution/el/figures/account_editor_a.png
-share/gnome/help/evolution/el/figures/addrs_book_a.png
share/gnome/help/evolution/el/figures/attach_reminder_a.png
-share/gnome/help/evolution/el/figures/calendar.png
share/gnome/help/evolution/el/figures/categories_a.png
share/gnome/help/evolution/el/figures/collap_head_a.png
share/gnome/help/evolution/el/figures/config-cal.png
share/gnome/help/evolution/el/figures/config-mail.png
-share/gnome/help/evolution/el/figures/contact-editor.png
-share/gnome/help/evolution/el/figures/contact.png
share/gnome/help/evolution/el/figures/contacts_mainwindow_a.png
share/gnome/help/evolution/el/figures/delgt-add.png
+share/gnome/help/evolution/el/figures/evo_Wcal_prop_a.png
share/gnome/help/evolution/el/figures/evo_account_editor_a.png
-share/gnome/help/evolution/el/figures/evo_account_info_a.png
-share/gnome/help/evolution/el/figures/evo_add_rule_a.png
share/gnome/help/evolution/el/figures/evo_adv_search_a.png
share/gnome/help/evolution/el/figures/evo_allday_a.png
share/gnome/help/evolution/el/figures/evo_attachreminder_plugin.png
@@ -1105,6 +1022,7 @@ share/gnome/help/evolution/el/figures/evo_cal_callout_a.png
share/gnome/help/evolution/el/figures/evo_cal_prop_a.png
share/gnome/help/evolution/el/figures/evo_calender_appointmnt.png
share/gnome/help/evolution/el/figures/evo_calstatus_a.png
+share/gnome/help/evolution/el/figures/evo_caltasks_a.png
share/gnome/help/evolution/el/figures/evo_contacteditor_a.png
share/gnome/help/evolution/el/figures/evo_crash_recovery.png
share/gnome/help/evolution/el/figures/evo_custom_header.png
@@ -1114,7 +1032,7 @@ share/gnome/help/evolution/el/figures/evo_dialog-info.png
share/gnome/help/evolution/el/figures/evo_dialog-warning.png
share/gnome/help/evolution/el/figures/evo_edit_rule_a.png
share/gnome/help/evolution/el/figures/evo_edit_search.png
-share/gnome/help/evolution/el/figures/evo_email_a.png
+share/gnome/help/evolution/el/figures/evo_exchng_mapi.png
share/gnome/help/evolution/el/figures/evo_flag_follow_up_a.png
share/gnome/help/evolution/el/figures/evo_gwreceive_a.png
share/gnome/help/evolution/el/figures/evo_gwreceiveedit_a.png
@@ -1124,6 +1042,7 @@ share/gnome/help/evolution/el/figures/evo_identity_a.png
share/gnome/help/evolution/el/figures/evo_identityedit_a.png
share/gnome/help/evolution/el/figures/evo_imapheader_a.png
share/gnome/help/evolution/el/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/el/figures/evo_import.png
share/gnome/help/evolution/el/figures/evo_import_asst_a.png
share/gnome/help/evolution/el/figures/evo_junk_a.png
share/gnome/help/evolution/el/figures/evo_label_a.png
@@ -1142,7 +1061,6 @@ share/gnome/help/evolution/el/figures/evo_newmess_a.png
share/gnome/help/evolution/el/figures/evo_offline.png
share/gnome/help/evolution/el/figures/evo_popreceive_a.png
share/gnome/help/evolution/el/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/el/figures/evo_receive_setup2_a.png
share/gnome/help/evolution/el/figures/evo_receive_setup_a.png
share/gnome/help/evolution/el/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/el/figures/evo_rule_a.png
@@ -1154,10 +1072,6 @@ share/gnome/help/evolution/el/figures/evo_sendstatus_a.png
share/gnome/help/evolution/el/figures/evo_shd_memo_a.png
share/gnome/help/evolution/el/figures/evo_timezone_a.png
share/gnome/help/evolution/el/figures/evo_usereceive_a.png
-share/gnome/help/evolution/el/figures/exchange-delegation.png
-share/gnome/help/evolution/el/figures/exchange-identity.png
-share/gnome/help/evolution/el/figures/exchange-receive-options.png
-share/gnome/help/evolution/el/figures/exchange-receive.png
share/gnome/help/evolution/el/figures/exchg-identity.png
share/gnome/help/evolution/el/figures/exchng-identity.png
share/gnome/help/evolution/el/figures/exchng-rec-mail.png
@@ -1167,52 +1081,30 @@ share/gnome/help/evolution/el/figures/exchng-rec-options.png
share/gnome/help/evolution/el/figures/exchng-settings.png
share/gnome/help/evolution/el/figures/filter-new-fig.png
share/gnome/help/evolution/el/figures/free_busy.png
-share/gnome/help/evolution/el/figures/full-1.png
-share/gnome/help/evolution/el/figures/full-2.png
-share/gnome/help/evolution/el/figures/full-3.png
-share/gnome/help/evolution/el/figures/full-4.png
-share/gnome/help/evolution/el/figures/full-5.png
-share/gnome/help/evolution/el/figures/full-6.png
-share/gnome/help/evolution/el/figures/full-7.png
share/gnome/help/evolution/el/figures/google_cal_view.png
-share/gnome/help/evolution/el/figures/mail-druid-pic.png
-share/gnome/help/evolution/el/figures/mail-inbox.png
share/gnome/help/evolution/el/figures/mail-threaded.png
-share/gnome/help/evolution/el/figures/mail_mainwindow_a.png
share/gnome/help/evolution/el/figures/mailer_preferences.png
-share/gnome/help/evolution/el/figures/mainwindow-pic.png
share/gnome/help/evolution/el/figures/minus.png
-share/gnome/help/evolution/el/figures/newmsg.png
share/gnome/help/evolution/el/figures/plus.png
share/gnome/help/evolution/el/figures/proxy-cal.png
share/gnome/help/evolution/el/figures/proxy-login.png
share/gnome/help/evolution/el/figures/quick_add_a.png
share/gnome/help/evolution/el/figures/quick_reference.png
-share/gnome/help/evolution/el/figures/replymsg.png
-share/gnome/help/evolution/el/figures/schedule.png
share/gnome/help/evolution/el/figures/stock_search.png
share/gnome/help/evolution/el/figures/sub-others-folder.png
share/gnome/help/evolution/el/figures/sub-pub-fold.png
share/gnome/help/evolution/el/figures/ver_view_a.png
-share/gnome/help/evolution/el/figures/vfolder-createrule-fig.png
share/gnome/help/evolution/en_GB/evolution.xml
-share/gnome/help/evolution/en_GB/figures/Screenshot-Evolution-mailer-Preferences.png
-share/gnome/help/evolution/en_GB/figures/Screenshot-Free-Busy.png
share/gnome/help/evolution/en_GB/figures/account_editor_a.png
-share/gnome/help/evolution/en_GB/figures/addrs_book_a.png
share/gnome/help/evolution/en_GB/figures/attach_reminder_a.png
-share/gnome/help/evolution/en_GB/figures/calendar.png
share/gnome/help/evolution/en_GB/figures/categories_a.png
share/gnome/help/evolution/en_GB/figures/collap_head_a.png
share/gnome/help/evolution/en_GB/figures/config-cal.png
share/gnome/help/evolution/en_GB/figures/config-mail.png
-share/gnome/help/evolution/en_GB/figures/contact-editor.png
-share/gnome/help/evolution/en_GB/figures/contact.png
share/gnome/help/evolution/en_GB/figures/contacts_mainwindow_a.png
share/gnome/help/evolution/en_GB/figures/delgt-add.png
+share/gnome/help/evolution/en_GB/figures/evo_Wcal_prop_a.png
share/gnome/help/evolution/en_GB/figures/evo_account_editor_a.png
-share/gnome/help/evolution/en_GB/figures/evo_account_info_a.png
-share/gnome/help/evolution/en_GB/figures/evo_add_rule_a.png
share/gnome/help/evolution/en_GB/figures/evo_adv_search_a.png
share/gnome/help/evolution/en_GB/figures/evo_allday_a.png
share/gnome/help/evolution/en_GB/figures/evo_attachreminder_plugin.png
@@ -1226,6 +1118,7 @@ share/gnome/help/evolution/en_GB/figures/evo_cal_callout_a.png
share/gnome/help/evolution/en_GB/figures/evo_cal_prop_a.png
share/gnome/help/evolution/en_GB/figures/evo_calender_appointmnt.png
share/gnome/help/evolution/en_GB/figures/evo_calstatus_a.png
+share/gnome/help/evolution/en_GB/figures/evo_caltasks_a.png
share/gnome/help/evolution/en_GB/figures/evo_contacteditor_a.png
share/gnome/help/evolution/en_GB/figures/evo_crash_recovery.png
share/gnome/help/evolution/en_GB/figures/evo_custom_header.png
@@ -1235,7 +1128,7 @@ share/gnome/help/evolution/en_GB/figures/evo_dialog-info.png
share/gnome/help/evolution/en_GB/figures/evo_dialog-warning.png
share/gnome/help/evolution/en_GB/figures/evo_edit_rule_a.png
share/gnome/help/evolution/en_GB/figures/evo_edit_search.png
-share/gnome/help/evolution/en_GB/figures/evo_email_a.png
+share/gnome/help/evolution/en_GB/figures/evo_exchng_mapi.png
share/gnome/help/evolution/en_GB/figures/evo_flag_follow_up_a.png
share/gnome/help/evolution/en_GB/figures/evo_gwreceive_a.png
share/gnome/help/evolution/en_GB/figures/evo_gwreceiveedit_a.png
@@ -1245,6 +1138,7 @@ share/gnome/help/evolution/en_GB/figures/evo_identity_a.png
share/gnome/help/evolution/en_GB/figures/evo_identityedit_a.png
share/gnome/help/evolution/en_GB/figures/evo_imapheader_a.png
share/gnome/help/evolution/en_GB/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/en_GB/figures/evo_import.png
share/gnome/help/evolution/en_GB/figures/evo_import_asst_a.png
share/gnome/help/evolution/en_GB/figures/evo_junk_a.png
share/gnome/help/evolution/en_GB/figures/evo_label_a.png
@@ -1263,7 +1157,6 @@ share/gnome/help/evolution/en_GB/figures/evo_newmess_a.png
share/gnome/help/evolution/en_GB/figures/evo_offline.png
share/gnome/help/evolution/en_GB/figures/evo_popreceive_a.png
share/gnome/help/evolution/en_GB/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/en_GB/figures/evo_receive_setup2_a.png
share/gnome/help/evolution/en_GB/figures/evo_receive_setup_a.png
share/gnome/help/evolution/en_GB/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/en_GB/figures/evo_rule_a.png
@@ -1275,10 +1168,6 @@ share/gnome/help/evolution/en_GB/figures/evo_sendstatus_a.png
share/gnome/help/evolution/en_GB/figures/evo_shd_memo_a.png
share/gnome/help/evolution/en_GB/figures/evo_timezone_a.png
share/gnome/help/evolution/en_GB/figures/evo_usereceive_a.png
-share/gnome/help/evolution/en_GB/figures/exchange-delegation.png
-share/gnome/help/evolution/en_GB/figures/exchange-identity.png
-share/gnome/help/evolution/en_GB/figures/exchange-receive-options.png
-share/gnome/help/evolution/en_GB/figures/exchange-receive.png
share/gnome/help/evolution/en_GB/figures/exchg-identity.png
share/gnome/help/evolution/en_GB/figures/exchng-identity.png
share/gnome/help/evolution/en_GB/figures/exchng-rec-mail.png
@@ -1288,52 +1177,30 @@ share/gnome/help/evolution/en_GB/figures/exchng-rec-options.png
share/gnome/help/evolution/en_GB/figures/exchng-settings.png
share/gnome/help/evolution/en_GB/figures/filter-new-fig.png
share/gnome/help/evolution/en_GB/figures/free_busy.png
-share/gnome/help/evolution/en_GB/figures/full-1.png
-share/gnome/help/evolution/en_GB/figures/full-2.png
-share/gnome/help/evolution/en_GB/figures/full-3.png
-share/gnome/help/evolution/en_GB/figures/full-4.png
-share/gnome/help/evolution/en_GB/figures/full-5.png
-share/gnome/help/evolution/en_GB/figures/full-6.png
-share/gnome/help/evolution/en_GB/figures/full-7.png
share/gnome/help/evolution/en_GB/figures/google_cal_view.png
-share/gnome/help/evolution/en_GB/figures/mail-druid-pic.png
-share/gnome/help/evolution/en_GB/figures/mail-inbox.png
share/gnome/help/evolution/en_GB/figures/mail-threaded.png
-share/gnome/help/evolution/en_GB/figures/mail_mainwindow_a.png
share/gnome/help/evolution/en_GB/figures/mailer_preferences.png
-share/gnome/help/evolution/en_GB/figures/mainwindow-pic.png
share/gnome/help/evolution/en_GB/figures/minus.png
-share/gnome/help/evolution/en_GB/figures/newmsg.png
share/gnome/help/evolution/en_GB/figures/plus.png
share/gnome/help/evolution/en_GB/figures/proxy-cal.png
share/gnome/help/evolution/en_GB/figures/proxy-login.png
share/gnome/help/evolution/en_GB/figures/quick_add_a.png
share/gnome/help/evolution/en_GB/figures/quick_reference.png
-share/gnome/help/evolution/en_GB/figures/replymsg.png
-share/gnome/help/evolution/en_GB/figures/schedule.png
share/gnome/help/evolution/en_GB/figures/stock_search.png
share/gnome/help/evolution/en_GB/figures/sub-others-folder.png
share/gnome/help/evolution/en_GB/figures/sub-pub-fold.png
share/gnome/help/evolution/en_GB/figures/ver_view_a.png
-share/gnome/help/evolution/en_GB/figures/vfolder-createrule-fig.png
share/gnome/help/evolution/es/evolution.xml
-share/gnome/help/evolution/es/figures/Screenshot-Evolution-mailer-Preferences.png
-share/gnome/help/evolution/es/figures/Screenshot-Free-Busy.png
share/gnome/help/evolution/es/figures/account_editor_a.png
-share/gnome/help/evolution/es/figures/addrs_book_a.png
share/gnome/help/evolution/es/figures/attach_reminder_a.png
-share/gnome/help/evolution/es/figures/calendar.png
share/gnome/help/evolution/es/figures/categories_a.png
share/gnome/help/evolution/es/figures/collap_head_a.png
share/gnome/help/evolution/es/figures/config-cal.png
share/gnome/help/evolution/es/figures/config-mail.png
-share/gnome/help/evolution/es/figures/contact-editor.png
-share/gnome/help/evolution/es/figures/contact.png
share/gnome/help/evolution/es/figures/contacts_mainwindow_a.png
share/gnome/help/evolution/es/figures/delgt-add.png
+share/gnome/help/evolution/es/figures/evo_Wcal_prop_a.png
share/gnome/help/evolution/es/figures/evo_account_editor_a.png
-share/gnome/help/evolution/es/figures/evo_account_info_a.png
-share/gnome/help/evolution/es/figures/evo_add_rule_a.png
share/gnome/help/evolution/es/figures/evo_adv_search_a.png
share/gnome/help/evolution/es/figures/evo_allday_a.png
share/gnome/help/evolution/es/figures/evo_attachreminder_plugin.png
@@ -1347,6 +1214,7 @@ share/gnome/help/evolution/es/figures/evo_cal_callout_a.png
share/gnome/help/evolution/es/figures/evo_cal_prop_a.png
share/gnome/help/evolution/es/figures/evo_calender_appointmnt.png
share/gnome/help/evolution/es/figures/evo_calstatus_a.png
+share/gnome/help/evolution/es/figures/evo_caltasks_a.png
share/gnome/help/evolution/es/figures/evo_contacteditor_a.png
share/gnome/help/evolution/es/figures/evo_crash_recovery.png
share/gnome/help/evolution/es/figures/evo_custom_header.png
@@ -1356,7 +1224,7 @@ share/gnome/help/evolution/es/figures/evo_dialog-info.png
share/gnome/help/evolution/es/figures/evo_dialog-warning.png
share/gnome/help/evolution/es/figures/evo_edit_rule_a.png
share/gnome/help/evolution/es/figures/evo_edit_search.png
-share/gnome/help/evolution/es/figures/evo_email_a.png
+share/gnome/help/evolution/es/figures/evo_exchng_mapi.png
share/gnome/help/evolution/es/figures/evo_flag_follow_up_a.png
share/gnome/help/evolution/es/figures/evo_gwreceive_a.png
share/gnome/help/evolution/es/figures/evo_gwreceiveedit_a.png
@@ -1366,6 +1234,7 @@ share/gnome/help/evolution/es/figures/evo_identity_a.png
share/gnome/help/evolution/es/figures/evo_identityedit_a.png
share/gnome/help/evolution/es/figures/evo_imapheader_a.png
share/gnome/help/evolution/es/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/es/figures/evo_import.png
share/gnome/help/evolution/es/figures/evo_import_asst_a.png
share/gnome/help/evolution/es/figures/evo_junk_a.png
share/gnome/help/evolution/es/figures/evo_label_a.png
@@ -1384,7 +1253,6 @@ share/gnome/help/evolution/es/figures/evo_newmess_a.png
share/gnome/help/evolution/es/figures/evo_offline.png
share/gnome/help/evolution/es/figures/evo_popreceive_a.png
share/gnome/help/evolution/es/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/es/figures/evo_receive_setup2_a.png
share/gnome/help/evolution/es/figures/evo_receive_setup_a.png
share/gnome/help/evolution/es/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/es/figures/evo_rule_a.png
@@ -1396,10 +1264,6 @@ share/gnome/help/evolution/es/figures/evo_sendstatus_a.png
share/gnome/help/evolution/es/figures/evo_shd_memo_a.png
share/gnome/help/evolution/es/figures/evo_timezone_a.png
share/gnome/help/evolution/es/figures/evo_usereceive_a.png
-share/gnome/help/evolution/es/figures/exchange-delegation.png
-share/gnome/help/evolution/es/figures/exchange-identity.png
-share/gnome/help/evolution/es/figures/exchange-receive-options.png
-share/gnome/help/evolution/es/figures/exchange-receive.png
share/gnome/help/evolution/es/figures/exchg-identity.png
share/gnome/help/evolution/es/figures/exchng-identity.png
share/gnome/help/evolution/es/figures/exchng-rec-mail.png
@@ -1409,52 +1273,126 @@ share/gnome/help/evolution/es/figures/exchng-rec-options.png
share/gnome/help/evolution/es/figures/exchng-settings.png
share/gnome/help/evolution/es/figures/filter-new-fig.png
share/gnome/help/evolution/es/figures/free_busy.png
-share/gnome/help/evolution/es/figures/full-1.png
-share/gnome/help/evolution/es/figures/full-2.png
-share/gnome/help/evolution/es/figures/full-3.png
-share/gnome/help/evolution/es/figures/full-4.png
-share/gnome/help/evolution/es/figures/full-5.png
-share/gnome/help/evolution/es/figures/full-6.png
-share/gnome/help/evolution/es/figures/full-7.png
share/gnome/help/evolution/es/figures/google_cal_view.png
-share/gnome/help/evolution/es/figures/mail-druid-pic.png
-share/gnome/help/evolution/es/figures/mail-inbox.png
share/gnome/help/evolution/es/figures/mail-threaded.png
-share/gnome/help/evolution/es/figures/mail_mainwindow_a.png
share/gnome/help/evolution/es/figures/mailer_preferences.png
-share/gnome/help/evolution/es/figures/mainwindow-pic.png
share/gnome/help/evolution/es/figures/minus.png
-share/gnome/help/evolution/es/figures/newmsg.png
share/gnome/help/evolution/es/figures/plus.png
share/gnome/help/evolution/es/figures/proxy-cal.png
share/gnome/help/evolution/es/figures/proxy-login.png
share/gnome/help/evolution/es/figures/quick_add_a.png
share/gnome/help/evolution/es/figures/quick_reference.png
-share/gnome/help/evolution/es/figures/replymsg.png
-share/gnome/help/evolution/es/figures/schedule.png
share/gnome/help/evolution/es/figures/stock_search.png
share/gnome/help/evolution/es/figures/sub-others-folder.png
share/gnome/help/evolution/es/figures/sub-pub-fold.png
share/gnome/help/evolution/es/figures/ver_view_a.png
-share/gnome/help/evolution/es/figures/vfolder-createrule-fig.png
+share/gnome/help/evolution/eu/evolution.xml
+share/gnome/help/evolution/eu/figures/account_editor_a.png
+share/gnome/help/evolution/eu/figures/attach_reminder_a.png
+share/gnome/help/evolution/eu/figures/categories_a.png
+share/gnome/help/evolution/eu/figures/collap_head_a.png
+share/gnome/help/evolution/eu/figures/config-cal.png
+share/gnome/help/evolution/eu/figures/config-mail.png
+share/gnome/help/evolution/eu/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/eu/figures/delgt-add.png
+share/gnome/help/evolution/eu/figures/evo_Wcal_prop_a.png
+share/gnome/help/evolution/eu/figures/evo_account_editor_a.png
+share/gnome/help/evolution/eu/figures/evo_adv_search_a.png
+share/gnome/help/evolution/eu/figures/evo_allday_a.png
+share/gnome/help/evolution/eu/figures/evo_attachreminder_plugin.png
+share/gnome/help/evolution/eu/figures/evo_backup.png
+share/gnome/help/evolution/eu/figures/evo_backup_prgsbar.png
+share/gnome/help/evolution/eu/figures/evo_backup_warning.png
+share/gnome/help/evolution/eu/figures/evo_blink.png
+share/gnome/help/evolution/eu/figures/evo_cal_a.png
+share/gnome/help/evolution/eu/figures/evo_cal_advsearch.png
+share/gnome/help/evolution/eu/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/eu/figures/evo_cal_prop_a.png
+share/gnome/help/evolution/eu/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/eu/figures/evo_calstatus_a.png
+share/gnome/help/evolution/eu/figures/evo_caltasks_a.png
+share/gnome/help/evolution/eu/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/eu/figures/evo_crash_recovery.png
+share/gnome/help/evolution/eu/figures/evo_custom_header.png
+share/gnome/help/evolution/eu/figures/evo_debuglogs_a.png
+share/gnome/help/evolution/eu/figures/evo_delegate_permission_a.png
+share/gnome/help/evolution/eu/figures/evo_dialog-info.png
+share/gnome/help/evolution/eu/figures/evo_dialog-warning.png
+share/gnome/help/evolution/eu/figures/evo_edit_rule_a.png
+share/gnome/help/evolution/eu/figures/evo_edit_search.png
+share/gnome/help/evolution/eu/figures/evo_exchng_mapi.png
+share/gnome/help/evolution/eu/figures/evo_flag_follow_up_a.png
+share/gnome/help/evolution/eu/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/eu/figures/evo_gwreceiveedit_a.png
+share/gnome/help/evolution/eu/figures/evo_gwreceiveoptedit_a.png
+share/gnome/help/evolution/eu/figures/evo_gwstatustrack.png
+share/gnome/help/evolution/eu/figures/evo_identity_a.png
+share/gnome/help/evolution/eu/figures/evo_identityedit_a.png
+share/gnome/help/evolution/eu/figures/evo_imapheader_a.png
+share/gnome/help/evolution/eu/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/eu/figures/evo_import.png
+share/gnome/help/evolution/eu/figures/evo_import_asst_a.png
+share/gnome/help/evolution/eu/figures/evo_junk_a.png
+share/gnome/help/evolution/eu/figures/evo_label_a.png
+share/gnome/help/evolution/eu/figures/evo_labels_a.png
+share/gnome/help/evolution/eu/figures/evo_mail_a.png
+share/gnome/help/evolution/eu/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/eu/figures/evo_mail_notifier.png
+share/gnome/help/evolution/eu/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/eu/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/eu/figures/evo_memo_a.png
+share/gnome/help/evolution/eu/figures/evo_mereceive_a.png
+share/gnome/help/evolution/eu/figures/evo_message_filters_a.png
+share/gnome/help/evolution/eu/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/eu/figures/evo_newmail.png
+share/gnome/help/evolution/eu/figures/evo_newmess_a.png
+share/gnome/help/evolution/eu/figures/evo_offline.png
+share/gnome/help/evolution/eu/figures/evo_popreceive_a.png
+share/gnome/help/evolution/eu/figures/evo_proxyadd_a.png
+share/gnome/help/evolution/eu/figures/evo_receive_setup_a.png
+share/gnome/help/evolution/eu/figures/evo_rmdrnotes_a.png
+share/gnome/help/evolution/eu/figures/evo_rule_a.png
+share/gnome/help/evolution/eu/figures/evo_select_add_folder.png
+share/gnome/help/evolution/eu/figures/evo_select_folder.png
+share/gnome/help/evolution/eu/figures/evo_send_option_a.png
+share/gnome/help/evolution/eu/figures/evo_send_setup_a.png
+share/gnome/help/evolution/eu/figures/evo_sendstatus_a.png
+share/gnome/help/evolution/eu/figures/evo_shd_memo_a.png
+share/gnome/help/evolution/eu/figures/evo_timezone_a.png
+share/gnome/help/evolution/eu/figures/evo_usereceive_a.png
+share/gnome/help/evolution/eu/figures/exchg-identity.png
+share/gnome/help/evolution/eu/figures/exchng-identity.png
+share/gnome/help/evolution/eu/figures/exchng-rec-mail.png
+share/gnome/help/evolution/eu/figures/exchng-rec-mails.png
+share/gnome/help/evolution/eu/figures/exchng-rec-option.png
+share/gnome/help/evolution/eu/figures/exchng-rec-options.png
+share/gnome/help/evolution/eu/figures/exchng-settings.png
+share/gnome/help/evolution/eu/figures/filter-new-fig.png
+share/gnome/help/evolution/eu/figures/free_busy.png
+share/gnome/help/evolution/eu/figures/google_cal_view.png
+share/gnome/help/evolution/eu/figures/mail-threaded.png
+share/gnome/help/evolution/eu/figures/mailer_preferences.png
+share/gnome/help/evolution/eu/figures/minus.png
+share/gnome/help/evolution/eu/figures/plus.png
+share/gnome/help/evolution/eu/figures/proxy-cal.png
+share/gnome/help/evolution/eu/figures/proxy-login.png
+share/gnome/help/evolution/eu/figures/quick_add_a.png
+share/gnome/help/evolution/eu/figures/quick_reference.png
+share/gnome/help/evolution/eu/figures/stock_search.png
+share/gnome/help/evolution/eu/figures/sub-others-folder.png
+share/gnome/help/evolution/eu/figures/sub-pub-fold.png
+share/gnome/help/evolution/eu/figures/ver_view_a.png
share/gnome/help/evolution/fr/evolution.xml
-share/gnome/help/evolution/fr/figures/Screenshot-Evolution-mailer-Preferences.png
-share/gnome/help/evolution/fr/figures/Screenshot-Free-Busy.png
share/gnome/help/evolution/fr/figures/account_editor_a.png
-share/gnome/help/evolution/fr/figures/addrs_book_a.png
share/gnome/help/evolution/fr/figures/attach_reminder_a.png
-share/gnome/help/evolution/fr/figures/calendar.png
share/gnome/help/evolution/fr/figures/categories_a.png
share/gnome/help/evolution/fr/figures/collap_head_a.png
share/gnome/help/evolution/fr/figures/config-cal.png
share/gnome/help/evolution/fr/figures/config-mail.png
-share/gnome/help/evolution/fr/figures/contact-editor.png
-share/gnome/help/evolution/fr/figures/contact.png
share/gnome/help/evolution/fr/figures/contacts_mainwindow_a.png
share/gnome/help/evolution/fr/figures/delgt-add.png
+share/gnome/help/evolution/fr/figures/evo_Wcal_prop_a.png
share/gnome/help/evolution/fr/figures/evo_account_editor_a.png
-share/gnome/help/evolution/fr/figures/evo_account_info_a.png
-share/gnome/help/evolution/fr/figures/evo_add_rule_a.png
share/gnome/help/evolution/fr/figures/evo_adv_search_a.png
share/gnome/help/evolution/fr/figures/evo_allday_a.png
share/gnome/help/evolution/fr/figures/evo_attachreminder_plugin.png
@@ -1468,6 +1406,7 @@ share/gnome/help/evolution/fr/figures/evo_cal_callout_a.png
share/gnome/help/evolution/fr/figures/evo_cal_prop_a.png
share/gnome/help/evolution/fr/figures/evo_calender_appointmnt.png
share/gnome/help/evolution/fr/figures/evo_calstatus_a.png
+share/gnome/help/evolution/fr/figures/evo_caltasks_a.png
share/gnome/help/evolution/fr/figures/evo_contacteditor_a.png
share/gnome/help/evolution/fr/figures/evo_crash_recovery.png
share/gnome/help/evolution/fr/figures/evo_custom_header.png
@@ -1477,7 +1416,7 @@ share/gnome/help/evolution/fr/figures/evo_dialog-info.png
share/gnome/help/evolution/fr/figures/evo_dialog-warning.png
share/gnome/help/evolution/fr/figures/evo_edit_rule_a.png
share/gnome/help/evolution/fr/figures/evo_edit_search.png
-share/gnome/help/evolution/fr/figures/evo_email_a.png
+share/gnome/help/evolution/fr/figures/evo_exchng_mapi.png
share/gnome/help/evolution/fr/figures/evo_flag_follow_up_a.png
share/gnome/help/evolution/fr/figures/evo_gwreceive_a.png
share/gnome/help/evolution/fr/figures/evo_gwreceiveedit_a.png
@@ -1487,6 +1426,7 @@ share/gnome/help/evolution/fr/figures/evo_identity_a.png
share/gnome/help/evolution/fr/figures/evo_identityedit_a.png
share/gnome/help/evolution/fr/figures/evo_imapheader_a.png
share/gnome/help/evolution/fr/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/fr/figures/evo_import.png
share/gnome/help/evolution/fr/figures/evo_import_asst_a.png
share/gnome/help/evolution/fr/figures/evo_junk_a.png
share/gnome/help/evolution/fr/figures/evo_label_a.png
@@ -1505,7 +1445,6 @@ share/gnome/help/evolution/fr/figures/evo_newmess_a.png
share/gnome/help/evolution/fr/figures/evo_offline.png
share/gnome/help/evolution/fr/figures/evo_popreceive_a.png
share/gnome/help/evolution/fr/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/fr/figures/evo_receive_setup2_a.png
share/gnome/help/evolution/fr/figures/evo_receive_setup_a.png
share/gnome/help/evolution/fr/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/fr/figures/evo_rule_a.png
@@ -1517,10 +1456,6 @@ share/gnome/help/evolution/fr/figures/evo_sendstatus_a.png
share/gnome/help/evolution/fr/figures/evo_shd_memo_a.png
share/gnome/help/evolution/fr/figures/evo_timezone_a.png
share/gnome/help/evolution/fr/figures/evo_usereceive_a.png
-share/gnome/help/evolution/fr/figures/exchange-delegation.png
-share/gnome/help/evolution/fr/figures/exchange-identity.png
-share/gnome/help/evolution/fr/figures/exchange-receive-options.png
-share/gnome/help/evolution/fr/figures/exchange-receive.png
share/gnome/help/evolution/fr/figures/exchg-identity.png
share/gnome/help/evolution/fr/figures/exchng-identity.png
share/gnome/help/evolution/fr/figures/exchng-rec-mail.png
@@ -1530,52 +1465,30 @@ share/gnome/help/evolution/fr/figures/exchng-rec-options.png
share/gnome/help/evolution/fr/figures/exchng-settings.png
share/gnome/help/evolution/fr/figures/filter-new-fig.png
share/gnome/help/evolution/fr/figures/free_busy.png
-share/gnome/help/evolution/fr/figures/full-1.png
-share/gnome/help/evolution/fr/figures/full-2.png
-share/gnome/help/evolution/fr/figures/full-3.png
-share/gnome/help/evolution/fr/figures/full-4.png
-share/gnome/help/evolution/fr/figures/full-5.png
-share/gnome/help/evolution/fr/figures/full-6.png
-share/gnome/help/evolution/fr/figures/full-7.png
share/gnome/help/evolution/fr/figures/google_cal_view.png
-share/gnome/help/evolution/fr/figures/mail-druid-pic.png
-share/gnome/help/evolution/fr/figures/mail-inbox.png
share/gnome/help/evolution/fr/figures/mail-threaded.png
-share/gnome/help/evolution/fr/figures/mail_mainwindow_a.png
share/gnome/help/evolution/fr/figures/mailer_preferences.png
-share/gnome/help/evolution/fr/figures/mainwindow-pic.png
share/gnome/help/evolution/fr/figures/minus.png
-share/gnome/help/evolution/fr/figures/newmsg.png
share/gnome/help/evolution/fr/figures/plus.png
share/gnome/help/evolution/fr/figures/proxy-cal.png
share/gnome/help/evolution/fr/figures/proxy-login.png
share/gnome/help/evolution/fr/figures/quick_add_a.png
share/gnome/help/evolution/fr/figures/quick_reference.png
-share/gnome/help/evolution/fr/figures/replymsg.png
-share/gnome/help/evolution/fr/figures/schedule.png
share/gnome/help/evolution/fr/figures/stock_search.png
share/gnome/help/evolution/fr/figures/sub-others-folder.png
share/gnome/help/evolution/fr/figures/sub-pub-fold.png
share/gnome/help/evolution/fr/figures/ver_view_a.png
-share/gnome/help/evolution/fr/figures/vfolder-createrule-fig.png
share/gnome/help/evolution/mk/evolution.xml
-share/gnome/help/evolution/mk/figures/Screenshot-Evolution-mailer-Preferences.png
-share/gnome/help/evolution/mk/figures/Screenshot-Free-Busy.png
share/gnome/help/evolution/mk/figures/account_editor_a.png
-share/gnome/help/evolution/mk/figures/addrs_book_a.png
share/gnome/help/evolution/mk/figures/attach_reminder_a.png
-share/gnome/help/evolution/mk/figures/calendar.png
share/gnome/help/evolution/mk/figures/categories_a.png
share/gnome/help/evolution/mk/figures/collap_head_a.png
share/gnome/help/evolution/mk/figures/config-cal.png
share/gnome/help/evolution/mk/figures/config-mail.png
-share/gnome/help/evolution/mk/figures/contact-editor.png
-share/gnome/help/evolution/mk/figures/contact.png
share/gnome/help/evolution/mk/figures/contacts_mainwindow_a.png
share/gnome/help/evolution/mk/figures/delgt-add.png
+share/gnome/help/evolution/mk/figures/evo_Wcal_prop_a.png
share/gnome/help/evolution/mk/figures/evo_account_editor_a.png
-share/gnome/help/evolution/mk/figures/evo_account_info_a.png
-share/gnome/help/evolution/mk/figures/evo_add_rule_a.png
share/gnome/help/evolution/mk/figures/evo_adv_search_a.png
share/gnome/help/evolution/mk/figures/evo_allday_a.png
share/gnome/help/evolution/mk/figures/evo_attachreminder_plugin.png
@@ -1589,6 +1502,7 @@ share/gnome/help/evolution/mk/figures/evo_cal_callout_a.png
share/gnome/help/evolution/mk/figures/evo_cal_prop_a.png
share/gnome/help/evolution/mk/figures/evo_calender_appointmnt.png
share/gnome/help/evolution/mk/figures/evo_calstatus_a.png
+share/gnome/help/evolution/mk/figures/evo_caltasks_a.png
share/gnome/help/evolution/mk/figures/evo_contacteditor_a.png
share/gnome/help/evolution/mk/figures/evo_crash_recovery.png
share/gnome/help/evolution/mk/figures/evo_custom_header.png
@@ -1598,7 +1512,7 @@ share/gnome/help/evolution/mk/figures/evo_dialog-info.png
share/gnome/help/evolution/mk/figures/evo_dialog-warning.png
share/gnome/help/evolution/mk/figures/evo_edit_rule_a.png
share/gnome/help/evolution/mk/figures/evo_edit_search.png
-share/gnome/help/evolution/mk/figures/evo_email_a.png
+share/gnome/help/evolution/mk/figures/evo_exchng_mapi.png
share/gnome/help/evolution/mk/figures/evo_flag_follow_up_a.png
share/gnome/help/evolution/mk/figures/evo_gwreceive_a.png
share/gnome/help/evolution/mk/figures/evo_gwreceiveedit_a.png
@@ -1608,6 +1522,7 @@ share/gnome/help/evolution/mk/figures/evo_identity_a.png
share/gnome/help/evolution/mk/figures/evo_identityedit_a.png
share/gnome/help/evolution/mk/figures/evo_imapheader_a.png
share/gnome/help/evolution/mk/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/mk/figures/evo_import.png
share/gnome/help/evolution/mk/figures/evo_import_asst_a.png
share/gnome/help/evolution/mk/figures/evo_junk_a.png
share/gnome/help/evolution/mk/figures/evo_label_a.png
@@ -1626,7 +1541,6 @@ share/gnome/help/evolution/mk/figures/evo_newmess_a.png
share/gnome/help/evolution/mk/figures/evo_offline.png
share/gnome/help/evolution/mk/figures/evo_popreceive_a.png
share/gnome/help/evolution/mk/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/mk/figures/evo_receive_setup2_a.png
share/gnome/help/evolution/mk/figures/evo_receive_setup_a.png
share/gnome/help/evolution/mk/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/mk/figures/evo_rule_a.png
@@ -1638,10 +1552,6 @@ share/gnome/help/evolution/mk/figures/evo_sendstatus_a.png
share/gnome/help/evolution/mk/figures/evo_shd_memo_a.png
share/gnome/help/evolution/mk/figures/evo_timezone_a.png
share/gnome/help/evolution/mk/figures/evo_usereceive_a.png
-share/gnome/help/evolution/mk/figures/exchange-delegation.png
-share/gnome/help/evolution/mk/figures/exchange-identity.png
-share/gnome/help/evolution/mk/figures/exchange-receive-options.png
-share/gnome/help/evolution/mk/figures/exchange-receive.png
share/gnome/help/evolution/mk/figures/exchg-identity.png
share/gnome/help/evolution/mk/figures/exchng-identity.png
share/gnome/help/evolution/mk/figures/exchng-rec-mail.png
@@ -1651,52 +1561,30 @@ share/gnome/help/evolution/mk/figures/exchng-rec-options.png
share/gnome/help/evolution/mk/figures/exchng-settings.png
share/gnome/help/evolution/mk/figures/filter-new-fig.png
share/gnome/help/evolution/mk/figures/free_busy.png
-share/gnome/help/evolution/mk/figures/full-1.png
-share/gnome/help/evolution/mk/figures/full-2.png
-share/gnome/help/evolution/mk/figures/full-3.png
-share/gnome/help/evolution/mk/figures/full-4.png
-share/gnome/help/evolution/mk/figures/full-5.png
-share/gnome/help/evolution/mk/figures/full-6.png
-share/gnome/help/evolution/mk/figures/full-7.png
share/gnome/help/evolution/mk/figures/google_cal_view.png
-share/gnome/help/evolution/mk/figures/mail-druid-pic.png
-share/gnome/help/evolution/mk/figures/mail-inbox.png
share/gnome/help/evolution/mk/figures/mail-threaded.png
-share/gnome/help/evolution/mk/figures/mail_mainwindow_a.png
share/gnome/help/evolution/mk/figures/mailer_preferences.png
-share/gnome/help/evolution/mk/figures/mainwindow-pic.png
share/gnome/help/evolution/mk/figures/minus.png
-share/gnome/help/evolution/mk/figures/newmsg.png
share/gnome/help/evolution/mk/figures/plus.png
share/gnome/help/evolution/mk/figures/proxy-cal.png
share/gnome/help/evolution/mk/figures/proxy-login.png
share/gnome/help/evolution/mk/figures/quick_add_a.png
share/gnome/help/evolution/mk/figures/quick_reference.png
-share/gnome/help/evolution/mk/figures/replymsg.png
-share/gnome/help/evolution/mk/figures/schedule.png
share/gnome/help/evolution/mk/figures/stock_search.png
share/gnome/help/evolution/mk/figures/sub-others-folder.png
share/gnome/help/evolution/mk/figures/sub-pub-fold.png
share/gnome/help/evolution/mk/figures/ver_view_a.png
-share/gnome/help/evolution/mk/figures/vfolder-createrule-fig.png
share/gnome/help/evolution/oc/evolution.xml
-share/gnome/help/evolution/oc/figures/Screenshot-Evolution-mailer-Preferences.png
-share/gnome/help/evolution/oc/figures/Screenshot-Free-Busy.png
share/gnome/help/evolution/oc/figures/account_editor_a.png
-share/gnome/help/evolution/oc/figures/addrs_book_a.png
share/gnome/help/evolution/oc/figures/attach_reminder_a.png
-share/gnome/help/evolution/oc/figures/calendar.png
share/gnome/help/evolution/oc/figures/categories_a.png
share/gnome/help/evolution/oc/figures/collap_head_a.png
share/gnome/help/evolution/oc/figures/config-cal.png
share/gnome/help/evolution/oc/figures/config-mail.png
-share/gnome/help/evolution/oc/figures/contact-editor.png
-share/gnome/help/evolution/oc/figures/contact.png
share/gnome/help/evolution/oc/figures/contacts_mainwindow_a.png
share/gnome/help/evolution/oc/figures/delgt-add.png
+share/gnome/help/evolution/oc/figures/evo_Wcal_prop_a.png
share/gnome/help/evolution/oc/figures/evo_account_editor_a.png
-share/gnome/help/evolution/oc/figures/evo_account_info_a.png
-share/gnome/help/evolution/oc/figures/evo_add_rule_a.png
share/gnome/help/evolution/oc/figures/evo_adv_search_a.png
share/gnome/help/evolution/oc/figures/evo_allday_a.png
share/gnome/help/evolution/oc/figures/evo_attachreminder_plugin.png
@@ -1710,6 +1598,7 @@ share/gnome/help/evolution/oc/figures/evo_cal_callout_a.png
share/gnome/help/evolution/oc/figures/evo_cal_prop_a.png
share/gnome/help/evolution/oc/figures/evo_calender_appointmnt.png
share/gnome/help/evolution/oc/figures/evo_calstatus_a.png
+share/gnome/help/evolution/oc/figures/evo_caltasks_a.png
share/gnome/help/evolution/oc/figures/evo_contacteditor_a.png
share/gnome/help/evolution/oc/figures/evo_crash_recovery.png
share/gnome/help/evolution/oc/figures/evo_custom_header.png
@@ -1719,7 +1608,7 @@ share/gnome/help/evolution/oc/figures/evo_dialog-info.png
share/gnome/help/evolution/oc/figures/evo_dialog-warning.png
share/gnome/help/evolution/oc/figures/evo_edit_rule_a.png
share/gnome/help/evolution/oc/figures/evo_edit_search.png
-share/gnome/help/evolution/oc/figures/evo_email_a.png
+share/gnome/help/evolution/oc/figures/evo_exchng_mapi.png
share/gnome/help/evolution/oc/figures/evo_flag_follow_up_a.png
share/gnome/help/evolution/oc/figures/evo_gwreceive_a.png
share/gnome/help/evolution/oc/figures/evo_gwreceiveedit_a.png
@@ -1729,6 +1618,7 @@ share/gnome/help/evolution/oc/figures/evo_identity_a.png
share/gnome/help/evolution/oc/figures/evo_identityedit_a.png
share/gnome/help/evolution/oc/figures/evo_imapheader_a.png
share/gnome/help/evolution/oc/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/oc/figures/evo_import.png
share/gnome/help/evolution/oc/figures/evo_import_asst_a.png
share/gnome/help/evolution/oc/figures/evo_junk_a.png
share/gnome/help/evolution/oc/figures/evo_label_a.png
@@ -1747,7 +1637,6 @@ share/gnome/help/evolution/oc/figures/evo_newmess_a.png
share/gnome/help/evolution/oc/figures/evo_offline.png
share/gnome/help/evolution/oc/figures/evo_popreceive_a.png
share/gnome/help/evolution/oc/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/oc/figures/evo_receive_setup2_a.png
share/gnome/help/evolution/oc/figures/evo_receive_setup_a.png
share/gnome/help/evolution/oc/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/oc/figures/evo_rule_a.png
@@ -1759,10 +1648,6 @@ share/gnome/help/evolution/oc/figures/evo_sendstatus_a.png
share/gnome/help/evolution/oc/figures/evo_shd_memo_a.png
share/gnome/help/evolution/oc/figures/evo_timezone_a.png
share/gnome/help/evolution/oc/figures/evo_usereceive_a.png
-share/gnome/help/evolution/oc/figures/exchange-delegation.png
-share/gnome/help/evolution/oc/figures/exchange-identity.png
-share/gnome/help/evolution/oc/figures/exchange-receive-options.png
-share/gnome/help/evolution/oc/figures/exchange-receive.png
share/gnome/help/evolution/oc/figures/exchg-identity.png
share/gnome/help/evolution/oc/figures/exchng-identity.png
share/gnome/help/evolution/oc/figures/exchng-rec-mail.png
@@ -1772,52 +1657,30 @@ share/gnome/help/evolution/oc/figures/exchng-rec-options.png
share/gnome/help/evolution/oc/figures/exchng-settings.png
share/gnome/help/evolution/oc/figures/filter-new-fig.png
share/gnome/help/evolution/oc/figures/free_busy.png
-share/gnome/help/evolution/oc/figures/full-1.png
-share/gnome/help/evolution/oc/figures/full-2.png
-share/gnome/help/evolution/oc/figures/full-3.png
-share/gnome/help/evolution/oc/figures/full-4.png
-share/gnome/help/evolution/oc/figures/full-5.png
-share/gnome/help/evolution/oc/figures/full-6.png
-share/gnome/help/evolution/oc/figures/full-7.png
share/gnome/help/evolution/oc/figures/google_cal_view.png
-share/gnome/help/evolution/oc/figures/mail-druid-pic.png
-share/gnome/help/evolution/oc/figures/mail-inbox.png
share/gnome/help/evolution/oc/figures/mail-threaded.png
-share/gnome/help/evolution/oc/figures/mail_mainwindow_a.png
share/gnome/help/evolution/oc/figures/mailer_preferences.png
-share/gnome/help/evolution/oc/figures/mainwindow-pic.png
share/gnome/help/evolution/oc/figures/minus.png
-share/gnome/help/evolution/oc/figures/newmsg.png
share/gnome/help/evolution/oc/figures/plus.png
share/gnome/help/evolution/oc/figures/proxy-cal.png
share/gnome/help/evolution/oc/figures/proxy-login.png
share/gnome/help/evolution/oc/figures/quick_add_a.png
share/gnome/help/evolution/oc/figures/quick_reference.png
-share/gnome/help/evolution/oc/figures/replymsg.png
-share/gnome/help/evolution/oc/figures/schedule.png
share/gnome/help/evolution/oc/figures/stock_search.png
share/gnome/help/evolution/oc/figures/sub-others-folder.png
share/gnome/help/evolution/oc/figures/sub-pub-fold.png
share/gnome/help/evolution/oc/figures/ver_view_a.png
-share/gnome/help/evolution/oc/figures/vfolder-createrule-fig.png
share/gnome/help/evolution/ru/evolution.xml
-share/gnome/help/evolution/ru/figures/Screenshot-Evolution-mailer-Preferences.png
-share/gnome/help/evolution/ru/figures/Screenshot-Free-Busy.png
share/gnome/help/evolution/ru/figures/account_editor_a.png
-share/gnome/help/evolution/ru/figures/addrs_book_a.png
share/gnome/help/evolution/ru/figures/attach_reminder_a.png
-share/gnome/help/evolution/ru/figures/calendar.png
share/gnome/help/evolution/ru/figures/categories_a.png
share/gnome/help/evolution/ru/figures/collap_head_a.png
share/gnome/help/evolution/ru/figures/config-cal.png
share/gnome/help/evolution/ru/figures/config-mail.png
-share/gnome/help/evolution/ru/figures/contact-editor.png
-share/gnome/help/evolution/ru/figures/contact.png
share/gnome/help/evolution/ru/figures/contacts_mainwindow_a.png
share/gnome/help/evolution/ru/figures/delgt-add.png
+share/gnome/help/evolution/ru/figures/evo_Wcal_prop_a.png
share/gnome/help/evolution/ru/figures/evo_account_editor_a.png
-share/gnome/help/evolution/ru/figures/evo_account_info_a.png
-share/gnome/help/evolution/ru/figures/evo_add_rule_a.png
share/gnome/help/evolution/ru/figures/evo_adv_search_a.png
share/gnome/help/evolution/ru/figures/evo_allday_a.png
share/gnome/help/evolution/ru/figures/evo_attachreminder_plugin.png
@@ -1831,6 +1694,7 @@ share/gnome/help/evolution/ru/figures/evo_cal_callout_a.png
share/gnome/help/evolution/ru/figures/evo_cal_prop_a.png
share/gnome/help/evolution/ru/figures/evo_calender_appointmnt.png
share/gnome/help/evolution/ru/figures/evo_calstatus_a.png
+share/gnome/help/evolution/ru/figures/evo_caltasks_a.png
share/gnome/help/evolution/ru/figures/evo_contacteditor_a.png
share/gnome/help/evolution/ru/figures/evo_crash_recovery.png
share/gnome/help/evolution/ru/figures/evo_custom_header.png
@@ -1840,7 +1704,7 @@ share/gnome/help/evolution/ru/figures/evo_dialog-info.png
share/gnome/help/evolution/ru/figures/evo_dialog-warning.png
share/gnome/help/evolution/ru/figures/evo_edit_rule_a.png
share/gnome/help/evolution/ru/figures/evo_edit_search.png
-share/gnome/help/evolution/ru/figures/evo_email_a.png
+share/gnome/help/evolution/ru/figures/evo_exchng_mapi.png
share/gnome/help/evolution/ru/figures/evo_flag_follow_up_a.png
share/gnome/help/evolution/ru/figures/evo_gwreceive_a.png
share/gnome/help/evolution/ru/figures/evo_gwreceiveedit_a.png
@@ -1850,6 +1714,7 @@ share/gnome/help/evolution/ru/figures/evo_identity_a.png
share/gnome/help/evolution/ru/figures/evo_identityedit_a.png
share/gnome/help/evolution/ru/figures/evo_imapheader_a.png
share/gnome/help/evolution/ru/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/ru/figures/evo_import.png
share/gnome/help/evolution/ru/figures/evo_import_asst_a.png
share/gnome/help/evolution/ru/figures/evo_junk_a.png
share/gnome/help/evolution/ru/figures/evo_label_a.png
@@ -1868,7 +1733,6 @@ share/gnome/help/evolution/ru/figures/evo_newmess_a.png
share/gnome/help/evolution/ru/figures/evo_offline.png
share/gnome/help/evolution/ru/figures/evo_popreceive_a.png
share/gnome/help/evolution/ru/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/ru/figures/evo_receive_setup2_a.png
share/gnome/help/evolution/ru/figures/evo_receive_setup_a.png
share/gnome/help/evolution/ru/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/ru/figures/evo_rule_a.png
@@ -1880,10 +1744,6 @@ share/gnome/help/evolution/ru/figures/evo_sendstatus_a.png
share/gnome/help/evolution/ru/figures/evo_shd_memo_a.png
share/gnome/help/evolution/ru/figures/evo_timezone_a.png
share/gnome/help/evolution/ru/figures/evo_usereceive_a.png
-share/gnome/help/evolution/ru/figures/exchange-delegation.png
-share/gnome/help/evolution/ru/figures/exchange-identity.png
-share/gnome/help/evolution/ru/figures/exchange-receive-options.png
-share/gnome/help/evolution/ru/figures/exchange-receive.png
share/gnome/help/evolution/ru/figures/exchg-identity.png
share/gnome/help/evolution/ru/figures/exchng-identity.png
share/gnome/help/evolution/ru/figures/exchng-rec-mail.png
@@ -1893,52 +1753,30 @@ share/gnome/help/evolution/ru/figures/exchng-rec-options.png
share/gnome/help/evolution/ru/figures/exchng-settings.png
share/gnome/help/evolution/ru/figures/filter-new-fig.png
share/gnome/help/evolution/ru/figures/free_busy.png
-share/gnome/help/evolution/ru/figures/full-1.png
-share/gnome/help/evolution/ru/figures/full-2.png
-share/gnome/help/evolution/ru/figures/full-3.png
-share/gnome/help/evolution/ru/figures/full-4.png
-share/gnome/help/evolution/ru/figures/full-5.png
-share/gnome/help/evolution/ru/figures/full-6.png
-share/gnome/help/evolution/ru/figures/full-7.png
share/gnome/help/evolution/ru/figures/google_cal_view.png
-share/gnome/help/evolution/ru/figures/mail-druid-pic.png
-share/gnome/help/evolution/ru/figures/mail-inbox.png
share/gnome/help/evolution/ru/figures/mail-threaded.png
-share/gnome/help/evolution/ru/figures/mail_mainwindow_a.png
share/gnome/help/evolution/ru/figures/mailer_preferences.png
-share/gnome/help/evolution/ru/figures/mainwindow-pic.png
share/gnome/help/evolution/ru/figures/minus.png
-share/gnome/help/evolution/ru/figures/newmsg.png
share/gnome/help/evolution/ru/figures/plus.png
share/gnome/help/evolution/ru/figures/proxy-cal.png
share/gnome/help/evolution/ru/figures/proxy-login.png
share/gnome/help/evolution/ru/figures/quick_add_a.png
share/gnome/help/evolution/ru/figures/quick_reference.png
-share/gnome/help/evolution/ru/figures/replymsg.png
-share/gnome/help/evolution/ru/figures/schedule.png
share/gnome/help/evolution/ru/figures/stock_search.png
share/gnome/help/evolution/ru/figures/sub-others-folder.png
share/gnome/help/evolution/ru/figures/sub-pub-fold.png
share/gnome/help/evolution/ru/figures/ver_view_a.png
-share/gnome/help/evolution/ru/figures/vfolder-createrule-fig.png
share/gnome/help/evolution/sv/evolution.xml
-share/gnome/help/evolution/sv/figures/Screenshot-Evolution-mailer-Preferences.png
-share/gnome/help/evolution/sv/figures/Screenshot-Free-Busy.png
share/gnome/help/evolution/sv/figures/account_editor_a.png
-share/gnome/help/evolution/sv/figures/addrs_book_a.png
share/gnome/help/evolution/sv/figures/attach_reminder_a.png
-share/gnome/help/evolution/sv/figures/calendar.png
share/gnome/help/evolution/sv/figures/categories_a.png
share/gnome/help/evolution/sv/figures/collap_head_a.png
share/gnome/help/evolution/sv/figures/config-cal.png
share/gnome/help/evolution/sv/figures/config-mail.png
-share/gnome/help/evolution/sv/figures/contact-editor.png
-share/gnome/help/evolution/sv/figures/contact.png
share/gnome/help/evolution/sv/figures/contacts_mainwindow_a.png
share/gnome/help/evolution/sv/figures/delgt-add.png
+share/gnome/help/evolution/sv/figures/evo_Wcal_prop_a.png
share/gnome/help/evolution/sv/figures/evo_account_editor_a.png
-share/gnome/help/evolution/sv/figures/evo_account_info_a.png
-share/gnome/help/evolution/sv/figures/evo_add_rule_a.png
share/gnome/help/evolution/sv/figures/evo_adv_search_a.png
share/gnome/help/evolution/sv/figures/evo_allday_a.png
share/gnome/help/evolution/sv/figures/evo_attachreminder_plugin.png
@@ -1952,6 +1790,7 @@ share/gnome/help/evolution/sv/figures/evo_cal_callout_a.png
share/gnome/help/evolution/sv/figures/evo_cal_prop_a.png
share/gnome/help/evolution/sv/figures/evo_calender_appointmnt.png
share/gnome/help/evolution/sv/figures/evo_calstatus_a.png
+share/gnome/help/evolution/sv/figures/evo_caltasks_a.png
share/gnome/help/evolution/sv/figures/evo_contacteditor_a.png
share/gnome/help/evolution/sv/figures/evo_crash_recovery.png
share/gnome/help/evolution/sv/figures/evo_custom_header.png
@@ -1961,7 +1800,7 @@ share/gnome/help/evolution/sv/figures/evo_dialog-info.png
share/gnome/help/evolution/sv/figures/evo_dialog-warning.png
share/gnome/help/evolution/sv/figures/evo_edit_rule_a.png
share/gnome/help/evolution/sv/figures/evo_edit_search.png
-share/gnome/help/evolution/sv/figures/evo_email_a.png
+share/gnome/help/evolution/sv/figures/evo_exchng_mapi.png
share/gnome/help/evolution/sv/figures/evo_flag_follow_up_a.png
share/gnome/help/evolution/sv/figures/evo_gwreceive_a.png
share/gnome/help/evolution/sv/figures/evo_gwreceiveedit_a.png
@@ -1971,6 +1810,7 @@ share/gnome/help/evolution/sv/figures/evo_identity_a.png
share/gnome/help/evolution/sv/figures/evo_identityedit_a.png
share/gnome/help/evolution/sv/figures/evo_imapheader_a.png
share/gnome/help/evolution/sv/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/sv/figures/evo_import.png
share/gnome/help/evolution/sv/figures/evo_import_asst_a.png
share/gnome/help/evolution/sv/figures/evo_junk_a.png
share/gnome/help/evolution/sv/figures/evo_label_a.png
@@ -1989,7 +1829,6 @@ share/gnome/help/evolution/sv/figures/evo_newmess_a.png
share/gnome/help/evolution/sv/figures/evo_offline.png
share/gnome/help/evolution/sv/figures/evo_popreceive_a.png
share/gnome/help/evolution/sv/figures/evo_proxyadd_a.png
-share/gnome/help/evolution/sv/figures/evo_receive_setup2_a.png
share/gnome/help/evolution/sv/figures/evo_receive_setup_a.png
share/gnome/help/evolution/sv/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/sv/figures/evo_rule_a.png
@@ -2001,10 +1840,6 @@ share/gnome/help/evolution/sv/figures/evo_sendstatus_a.png
share/gnome/help/evolution/sv/figures/evo_shd_memo_a.png
share/gnome/help/evolution/sv/figures/evo_timezone_a.png
share/gnome/help/evolution/sv/figures/evo_usereceive_a.png
-share/gnome/help/evolution/sv/figures/exchange-delegation.png
-share/gnome/help/evolution/sv/figures/exchange-identity.png
-share/gnome/help/evolution/sv/figures/exchange-receive-options.png
-share/gnome/help/evolution/sv/figures/exchange-receive.png
share/gnome/help/evolution/sv/figures/exchg-identity.png
share/gnome/help/evolution/sv/figures/exchng-identity.png
share/gnome/help/evolution/sv/figures/exchng-rec-mail.png
@@ -2014,34 +1849,19 @@ share/gnome/help/evolution/sv/figures/exchng-rec-options.png
share/gnome/help/evolution/sv/figures/exchng-settings.png
share/gnome/help/evolution/sv/figures/filter-new-fig.png
share/gnome/help/evolution/sv/figures/free_busy.png
-share/gnome/help/evolution/sv/figures/full-1.png
-share/gnome/help/evolution/sv/figures/full-2.png
-share/gnome/help/evolution/sv/figures/full-3.png
-share/gnome/help/evolution/sv/figures/full-4.png
-share/gnome/help/evolution/sv/figures/full-5.png
-share/gnome/help/evolution/sv/figures/full-6.png
-share/gnome/help/evolution/sv/figures/full-7.png
share/gnome/help/evolution/sv/figures/google_cal_view.png
-share/gnome/help/evolution/sv/figures/mail-druid-pic.png
-share/gnome/help/evolution/sv/figures/mail-inbox.png
share/gnome/help/evolution/sv/figures/mail-threaded.png
-share/gnome/help/evolution/sv/figures/mail_mainwindow_a.png
share/gnome/help/evolution/sv/figures/mailer_preferences.png
-share/gnome/help/evolution/sv/figures/mainwindow-pic.png
share/gnome/help/evolution/sv/figures/minus.png
-share/gnome/help/evolution/sv/figures/newmsg.png
share/gnome/help/evolution/sv/figures/plus.png
share/gnome/help/evolution/sv/figures/proxy-cal.png
share/gnome/help/evolution/sv/figures/proxy-login.png
share/gnome/help/evolution/sv/figures/quick_add_a.png
share/gnome/help/evolution/sv/figures/quick_reference.png
-share/gnome/help/evolution/sv/figures/replymsg.png
-share/gnome/help/evolution/sv/figures/schedule.png
share/gnome/help/evolution/sv/figures/stock_search.png
share/gnome/help/evolution/sv/figures/sub-others-folder.png
share/gnome/help/evolution/sv/figures/sub-pub-fold.png
share/gnome/help/evolution/sv/figures/ver_view_a.png
-share/gnome/help/evolution/sv/figures/vfolder-createrule-fig.png
share/icons/hicolor/16x16/apps/evolution-mail.png
share/icons/hicolor/16x16/apps/evolution-memos.png
share/icons/hicolor/16x16/apps/evolution-tasks.png
@@ -2069,6 +1889,7 @@ share/idl/evolution-%%VERSION%%/Evolution-Mail.idl
share/idl/evolution-%%VERSION%%/Evolution-Shell.idl
share/idl/evolution-%%VERSION%%/Evolution.idl
share/idl/evolution-%%VERSION%%/evolution-calendar.idl
+share/locale/af/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/as/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -2113,6 +1934,7 @@ share/locale/ko/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/ku/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/lt/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/lv/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/mai/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/mk/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/ml/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/mn/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -2158,6 +1980,7 @@ share/omf/evolution/evolution-de.omf
share/omf/evolution/evolution-el.omf
share/omf/evolution/evolution-en_GB.omf
share/omf/evolution/evolution-es.omf
+share/omf/evolution/evolution-eu.omf
share/omf/evolution/evolution-fr.omf
share/omf/evolution/evolution-mk.omf
share/omf/evolution/evolution-oc.omf
@@ -2175,6 +1998,8 @@ share/omf/evolution/evolution-sv.omf
@dirrm share/gnome/help/evolution/mk
@dirrm share/gnome/help/evolution/fr/figures
@dirrm share/gnome/help/evolution/fr
+@dirrm share/gnome/help/evolution/eu/figures
+@dirrm share/gnome/help/evolution/eu
@dirrm share/gnome/help/evolution/es/figures
@dirrm share/gnome/help/evolution/es
@dirrm share/gnome/help/evolution/en_GB/figures
@@ -2231,6 +2056,7 @@ share/omf/evolution/evolution-sv.omf
@dirrm %%DATADIR%%/%%VERSION%%/help/quickref/es
@dirrm %%DATADIR%%/%%VERSION%%/help/quickref/de
@dirrm %%DATADIR%%/%%VERSION%%/help/quickref/cs
+@dirrm %%DATADIR%%/%%VERSION%%/help/quickref/ca
@dirrm %%DATADIR%%/%%VERSION%%/help/quickref/C
@dirrm %%DATADIR%%/%%VERSION%%/help/quickref
@dirrm %%DATADIR%%/%%VERSION%%/help
@@ -2292,6 +2118,9 @@ share/omf/evolution/evolution-sv.omf
@dirrm %%DATADIR%%/%%VERSION%%/default/cs/mail/local
@dirrm %%DATADIR%%/%%VERSION%%/default/cs/mail
@dirrm %%DATADIR%%/%%VERSION%%/default/cs
+@dirrm %%DATADIR%%/%%VERSION%%/default/ca/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/ca/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/ca
@dirrm %%DATADIR%%/%%VERSION%%/default/C/mail/local
@dirrm %%DATADIR%%/%%VERSION%%/default/C/mail
@dirrm %%DATADIR%%/%%VERSION%%/default/C
@@ -2339,6 +2168,8 @@ share/omf/evolution/evolution-sv.omf
@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/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/mail/mail-notification/pkg-plist b/mail/mail-notification/pkg-plist
index f24cd2327bf6..aa5729cbb5af 100644
--- a/mail/mail-notification/pkg-plist
+++ b/mail/mail-notification/pkg-plist
@@ -41,6 +41,4 @@ share/locale/sv/LC_MESSAGES/mail-notification.mo
@dirrm share/gnome/help/mail-notification/C/figures
@dirrm share/gnome/help/mail-notification/C
@dirrm share/gnome/help/mail-notification
-@dirrmtry etc/xdg/autostart
-@dirrmtry etc/xdg
@dirrmtry share/applications
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index a1c4f8073122..3ee59b9c52da 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/math/gcalctool/Makefile,v 1.106 2008/11/25 16:31:13 marcus Exp $
+# $MCom: ports/math/gcalctool/Makefile,v 1.110 2009/03/17 23:29:40 kwm Exp $
#
PORTNAME= gcalctool
-PORTVERSION= 5.24.3.1
+PORTVERSION= 5.26.0
PORTEPOCH= 2
CATEGORIES= math gnome
MASTER_SITES= GNOME
diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo
index 8f68c59e150d..4d900f9f37f3 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gcalctool-5.24.3.1.tar.bz2) = ef4ae0a4473e163567e763d2ed0b8589
-SHA256 (gnome2/gcalctool-5.24.3.1.tar.bz2) = a3860c3c7e4c3bcc12ca2ab09f15aa19e4f803de6d16fb92cd600215ed52e39e
-SIZE (gnome2/gcalctool-5.24.3.1.tar.bz2) = 1795492
+MD5 (gnome2/gcalctool-5.26.0.tar.bz2) = c2162ac18e9c1dae145cb79e677023c5
+SHA256 (gnome2/gcalctool-5.26.0.tar.bz2) = 3e1aafb46e8eef36a7bc9c60b3fa00bb3ff80f1fee7980f8077a9451faebf8f4
+SIZE (gnome2/gcalctool-5.26.0.tar.bz2) = 1994858
diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist
index c27628c66b3f..d40960c5f767 100644
--- a/math/gcalctool/pkg-plist
+++ b/math/gcalctool/pkg-plist
@@ -2,10 +2,12 @@ bin/gcalctool
bin/gnome-calculator
share/applications/gcalctool.desktop
%%DATADIR%%/gcalctool.glade
+%%DATADIR%%/financial.glade
share/gnome/help/gcalctool/C/figures/gcalctool_advanced_window.png
share/gnome/help/gcalctool/C/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/C/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/C/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/C/figures/gcalctool_programming_window.png
share/gnome/help/gcalctool/C/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/C/gcalctool.xml
share/gnome/help/gcalctool/C/legal.xml
@@ -13,96 +15,119 @@ share/gnome/help/gcalctool/bg/figures/gcalctool_advanced_window.png
share/gnome/help/gcalctool/bg/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/bg/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/bg/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/bg/figures/gcalctool_programming_window.png
share/gnome/help/gcalctool/bg/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/bg/gcalctool.xml
share/gnome/help/gcalctool/ca/figures/gcalctool_advanced_window.png
share/gnome/help/gcalctool/ca/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/ca/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/ca/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/ca/figures/gcalctool_programming_window.png
share/gnome/help/gcalctool/ca/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/ca/gcalctool.xml
share/gnome/help/gcalctool/de/figures/gcalctool_advanced_window.png
share/gnome/help/gcalctool/de/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/de/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/de/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/de/figures/gcalctool_programming_window.png
share/gnome/help/gcalctool/de/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/de/gcalctool.xml
share/gnome/help/gcalctool/es/figures/gcalctool_advanced_window.png
share/gnome/help/gcalctool/es/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/es/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/es/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/es/figures/gcalctool_programming_window.png
share/gnome/help/gcalctool/es/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/es/gcalctool.xml
+share/gnome/help/gcalctool/eu/figures/gcalctool_advanced_window.png
+share/gnome/help/gcalctool/eu/figures/gcalctool_basic_window.png
+share/gnome/help/gcalctool/eu/figures/gcalctool_financial_window.png
+share/gnome/help/gcalctool/eu/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/eu/figures/gcalctool_programming_window.png
+share/gnome/help/gcalctool/eu/figures/gcalctool_scientific_window.png
+share/gnome/help/gcalctool/eu/gcalctool.xml
share/gnome/help/gcalctool/fr/figures/gcalctool_advanced_window.png
share/gnome/help/gcalctool/fr/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/fr/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/fr/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/fr/figures/gcalctool_programming_window.png
share/gnome/help/gcalctool/fr/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/fr/gcalctool.xml
share/gnome/help/gcalctool/it/figures/gcalctool_advanced_window.png
share/gnome/help/gcalctool/it/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/it/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/it/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/it/figures/gcalctool_programming_window.png
share/gnome/help/gcalctool/it/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/it/gcalctool.xml
share/gnome/help/gcalctool/ja/figures/gcalctool_advanced_window.png
share/gnome/help/gcalctool/ja/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/ja/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/ja/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/ja/figures/gcalctool_programming_window.png
share/gnome/help/gcalctool/ja/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/ja/gcalctool.xml
share/gnome/help/gcalctool/ko/figures/gcalctool_advanced_window.png
share/gnome/help/gcalctool/ko/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/ko/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/ko/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/ko/figures/gcalctool_programming_window.png
share/gnome/help/gcalctool/ko/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/ko/gcalctool.xml
share/gnome/help/gcalctool/oc/figures/gcalctool_advanced_window.png
share/gnome/help/gcalctool/oc/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/oc/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/oc/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/oc/figures/gcalctool_programming_window.png
share/gnome/help/gcalctool/oc/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/oc/gcalctool.xml
share/gnome/help/gcalctool/pt_BR/figures/gcalctool_advanced_window.png
share/gnome/help/gcalctool/pt_BR/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/pt_BR/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/pt_BR/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/pt_BR/figures/gcalctool_programming_window.png
share/gnome/help/gcalctool/pt_BR/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/pt_BR/gcalctool.xml
share/gnome/help/gcalctool/ru/figures/gcalctool_advanced_window.png
share/gnome/help/gcalctool/ru/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/ru/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/ru/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/ru/figures/gcalctool_programming_window.png
share/gnome/help/gcalctool/ru/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/ru/gcalctool.xml
share/gnome/help/gcalctool/sv/figures/gcalctool_advanced_window.png
share/gnome/help/gcalctool/sv/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/sv/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/sv/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/sv/figures/gcalctool_programming_window.png
share/gnome/help/gcalctool/sv/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/sv/gcalctool.xml
share/gnome/help/gcalctool/zh_CN/figures/gcalctool_advanced_window.png
share/gnome/help/gcalctool/zh_CN/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/zh_CN/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/zh_CN/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/zh_CN/figures/gcalctool_programming_window.png
share/gnome/help/gcalctool/zh_CN/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/zh_CN/gcalctool.xml
share/gnome/help/gcalctool/zh_HK/figures/gcalctool_advanced_window.png
share/gnome/help/gcalctool/zh_HK/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/zh_HK/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/zh_HK/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/zh_HK/figures/gcalctool_programming_window.png
share/gnome/help/gcalctool/zh_HK/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/zh_HK/gcalctool.xml
share/gnome/help/gcalctool/zh_TW/figures/gcalctool_advanced_window.png
share/gnome/help/gcalctool/zh_TW/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/zh_TW/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/zh_TW/figures/gcalctool_menu_symbol.png
+share/gnome/help/gcalctool/zh_TW/figures/gcalctool_programming_window.png
share/gnome/help/gcalctool/zh_TW/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/zh_TW/gcalctool.xml
share/locale/af/LC_MESSAGES/gcalctool.mo
share/locale/am/LC_MESSAGES/gcalctool.mo
share/locale/ar/LC_MESSAGES/gcalctool.mo
share/locale/as/LC_MESSAGES/gcalctool.mo
+share/locale/ast/LC_MESSAGES/gcalctool.mo
share/locale/az/LC_MESSAGES/gcalctool.mo
share/locale/be/LC_MESSAGES/gcalctool.mo
share/locale/be@latin/LC_MESSAGES/gcalctool.mo
@@ -142,6 +167,7 @@ share/locale/ko/LC_MESSAGES/gcalctool.mo
share/locale/ku/LC_MESSAGES/gcalctool.mo
share/locale/lt/LC_MESSAGES/gcalctool.mo
share/locale/lv/LC_MESSAGES/gcalctool.mo
+share/locale/mai/LC_MESSAGES/gcalctool.mo
share/locale/mg/LC_MESSAGES/gcalctool.mo
share/locale/mk/LC_MESSAGES/gcalctool.mo
share/locale/ml/LC_MESSAGES/gcalctool.mo
@@ -184,6 +210,7 @@ share/omf/gcalctool/gcalctool-bg.omf
share/omf/gcalctool/gcalctool-ca.omf
share/omf/gcalctool/gcalctool-de.omf
share/omf/gcalctool/gcalctool-es.omf
+share/omf/gcalctool/gcalctool-eu.omf
share/omf/gcalctool/gcalctool-fr.omf
share/omf/gcalctool/gcalctool-it.omf
share/omf/gcalctool/gcalctool-ja.omf
@@ -218,6 +245,8 @@ share/omf/gcalctool/gcalctool-zh_TW.omf
@dirrm share/gnome/help/gcalctool/it
@dirrm share/gnome/help/gcalctool/fr/figures
@dirrm share/gnome/help/gcalctool/fr
+@dirrm share/gnome/help/gcalctool/eu/figures
+@dirrm share/gnome/help/gcalctool/eu
@dirrm share/gnome/help/gcalctool/es/figures
@dirrm share/gnome/help/gcalctool/es
@dirrm share/gnome/help/gcalctool/de/figures
@@ -249,6 +278,8 @@ share/omf/gcalctool/gcalctool-zh_TW.omf
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/en_US/LC_MESSAGES
@@ -259,5 +290,7 @@ share/omf/gcalctool/gcalctool-zh_TW.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/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile
index 86557ab19a23..cc755adc7d53 100644
--- a/misc/gnome-devel-docs/Makefile
+++ b/misc/gnome-devel-docs/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.8 2008/12/18 04:06:57 mezz Exp $
+# $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.10 2009/03/18 04:45:17 marcus Exp $
#
PORTNAME= gnome-devel-docs
-PORTVERSION= 2.24.1
+PORTVERSION= 2.26.0
CATEGORIES= misc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/misc/gnome-devel-docs/distinfo b/misc/gnome-devel-docs/distinfo
index 20370c2cd81f..eb71a6e0377b 100644
--- a/misc/gnome-devel-docs/distinfo
+++ b/misc/gnome-devel-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-devel-docs-2.24.1.tar.bz2) = 8bee78fac9f816e485cb888cd65f2a9e
-SHA256 (gnome2/gnome-devel-docs-2.24.1.tar.bz2) = 49b1a3b0205db641783b8033a95d5b7faf7831a537c9d4521c081d0c90fd8390
-SIZE (gnome2/gnome-devel-docs-2.24.1.tar.bz2) = 3012400
+MD5 (gnome2/gnome-devel-docs-2.26.0.tar.bz2) = 122e1a90a2ff7bdea199ad9cb477c7a5
+SHA256 (gnome2/gnome-devel-docs-2.26.0.tar.bz2) = 000a6c42331190c0ce622ed491deffcf909d43b92eac5180a2b95d7392592c2e
+SIZE (gnome2/gnome-devel-docs-2.26.0.tar.bz2) = 3420092
diff --git a/misc/gnome-devel-docs/pkg-plist b/misc/gnome-devel-docs/pkg-plist
index c7193d9b6aa0..3017ede02ff5 100644
--- a/misc/gnome-devel-docs/pkg-plist
+++ b/misc/gnome-devel-docs/pkg-plist
@@ -1,3 +1,27 @@
+share/gnome/help/accessibility-devel-guide/C/accessibility-devel-guide.xml
+share/gnome/help/accessibility-devel-guide/C/figures/GNOME_desktop_Accessibility.png
+share/gnome/help/accessibility-devel-guide/C/figures/at-arch.png
+share/gnome/help/accessibility-devel-guide/C/figures/badfocus1.png
+share/gnome/help/accessibility-devel-guide/C/figures/badfocus2.png
+share/gnome/help/accessibility-devel-guide/C/figures/badfocus3.png
+share/gnome/help/accessibility-devel-guide/C/figures/colour_and_arrows.png
+share/gnome/help/accessibility-devel-guide/C/figures/colour_only.png
+share/gnome/help/accessibility-devel-guide/C/figures/depend1.png
+share/gnome/help/accessibility-devel-guide/C/figures/depend1a.png
+share/gnome/help/accessibility-devel-guide/C/figures/depend2.png
+share/gnome/help/accessibility-devel-guide/C/figures/depend2a.png
+share/gnome/help/accessibility-devel-guide/C/figures/depend3.png
+share/gnome/help/accessibility-devel-guide/C/figures/goodfocus.png
+share/gnome/help/accessibility-devel-guide/C/figures/goodfocus2.png
+share/gnome/help/accessibility-devel-guide/C/figures/goodfocus3.png
+share/gnome/help/accessibility-devel-guide/C/figures/label_above.png
+share/gnome/help/accessibility-devel-guide/C/figures/label_below.png
+share/gnome/help/accessibility-devel-guide/C/figures/label_left.png
+share/gnome/help/accessibility-devel-guide/C/figures/label_right.png
+share/gnome/help/accessibility-devel-guide/C/figures/nodrop.png
+share/gnome/help/accessibility-devel-guide/C/gad.xml
+share/gnome/help/accessibility-devel-guide/C/gtest.xml
+share/gnome/help/accessibility-devel-guide/C/legal.xml
share/gnome/help/gdp-handbook/C/builddocs.xml
share/gnome/help/gdp-handbook/C/callout_procedure.xml
share/gnome/help/gdp-handbook/C/contexthelp.xml
@@ -277,7 +301,12 @@ share/gnome/help/hig-book/C/images/windows-titlebar.png
share/gnome/help/hig-book/C/images/windows-toolbox-large.png
share/gnome/help/hig-book/C/images/windows-toolbox-small.png
share/gnome/help/integration-guide/C/integration-guide.xml
+share/gnome/help/integration-guide/cs/integration-guide.xml
+share/gnome/help/integration-guide/en_GB/integration-guide.xml
share/gnome/help/integration-guide/es/integration-guide.xml
+share/gnome/help/integration-guide/pt_BR/integration-guide.xml
+share/gnome/help/integration-guide/sv/integration-guide.xml
+share/gnome/help/integration-guide/zh_CN/integration-guide.xml
share/gnome/help/optimization-guide/C/figures/massif-after.png
share/gnome/help/optimization-guide/C/figures/massif-before.png
share/gnome/help/optimization-guide/C/optimization-guide.xml
@@ -356,11 +385,17 @@ share/gnome/help/platform-overview/ru/ipc-network.xml
share/gnome/help/platform-overview/ru/legal-fdl.xml
share/gnome/help/platform-overview/ru/platform-overview.xml
share/gnome/help/platform-overview/ru/platform.xml
+share/omf/accessibility-devel-guide/accessibility-devel-guide-C.omf
share/omf/gdp-handbook/gdp-handbook-C.omf
share/omf/gdp-style-guide/gdp-style-guide-C.omf
share/omf/hig-book/hig-book-C.omf
share/omf/integration-guide/integration-guide-C.omf
+share/omf/integration-guide/integration-guide-cs.omf
+share/omf/integration-guide/integration-guide-en_GB.omf
share/omf/integration-guide/integration-guide-es.omf
+share/omf/integration-guide/integration-guide-pt_BR.omf
+share/omf/integration-guide/integration-guide-sv.omf
+share/omf/integration-guide/integration-guide-zh_CN.omf
share/omf/optimization-guide/optimization-guide-C.omf
share/omf/platform-overview/platform-overview-C.omf
share/omf/platform-overview/platform-overview-es.omf
@@ -374,6 +409,7 @@ share/omf/platform-overview/platform-overview-ru.omf
@dirrm share/omf/hig-book
@dirrm share/omf/gdp-style-guide
@dirrm share/omf/gdp-handbook
+@dirrm share/omf/accessibility-devel-guide
@dirrm share/gnome/help/platform-overview/ru/figures
@dirrm share/gnome/help/platform-overview/ru
@dirrm share/gnome/help/platform-overview/oc/figures
@@ -390,7 +426,12 @@ share/omf/platform-overview/platform-overview-ru.omf
@dirrm share/gnome/help/optimization-guide/C/figures
@dirrm share/gnome/help/optimization-guide/C
@dirrm share/gnome/help/optimization-guide
+@dirrm share/gnome/help/integration-guide/zh_CN
+@dirrm share/gnome/help/integration-guide/sv
+@dirrm share/gnome/help/integration-guide/pt_BR
@dirrm share/gnome/help/integration-guide/es
+@dirrm share/gnome/help/integration-guide/en_GB
+@dirrm share/gnome/help/integration-guide/cs
@dirrm share/gnome/help/integration-guide/C
@dirrm share/gnome/help/integration-guide
@dirrm share/gnome/help/hig-book/C/images
@@ -401,3 +442,6 @@ share/omf/platform-overview/platform-overview-ru.omf
@dirrm share/gnome/help/gdp-style-guide
@dirrm share/gnome/help/gdp-handbook/C
@dirrm share/gnome/help/gdp-handbook
+@dirrm share/gnome/help/accessibility-devel-guide/C/figures
+@dirrm share/gnome/help/accessibility-devel-guide/C
+@dirrm share/gnome/help/accessibility-devel-guide
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index dc8284fb42dc..ed6d32a9ff3b 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.123 2008/09/29 16:17:39 marcus Exp $
+# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.129 2009/03/21 04:24:51 marcus Exp $
#
PORTNAME= gnome-icon-theme
-PORTVERSION= 2.24.0
-PORTREVISION= 2
+PORTVERSION= 2.26.0
+PORTREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo
index 5852c1efc661..1b7fb55d0885 100644
--- a/misc/gnome-icon-theme/distinfo
+++ b/misc/gnome-icon-theme/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-icon-theme-2.24.0.tar.bz2) = 17ba571e5dd83434dc5b2b06ada7b56e
-SHA256 (gnome2/gnome-icon-theme-2.24.0.tar.bz2) = b71f89f9ead65a7d3ccb92f6a6c2fb1719be25d6661dd67a14b5d820ee6831b2
-SIZE (gnome2/gnome-icon-theme-2.24.0.tar.bz2) = 3486226
+MD5 (gnome2/gnome-icon-theme-2.26.0.tar.bz2) = 36a4e5e1b2c7c053779a9a399f6146a2
+SHA256 (gnome2/gnome-icon-theme-2.26.0.tar.bz2) = 4320c937d4d211ac39633aa39b55e770b9a996697c857e2b8033c40323384709
+SIZE (gnome2/gnome-icon-theme-2.26.0.tar.bz2) = 3456985
diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist
index 61585e0842b6..f05db21812cd 100644
--- a/misc/gnome-icon-theme/pkg-plist
+++ b/misc/gnome-icon-theme/pkg-plist
@@ -337,9 +337,7 @@ share/icons/gnome/16x16/actions/zoom-fit-best.png
share/icons/gnome/16x16/actions/zoom-in.png
share/icons/gnome/16x16/actions/zoom-original.png
share/icons/gnome/16x16/actions/zoom-out.png
-share/icons/gnome/16x16/animations/gnome-spinner-rest.png
share/icons/gnome/16x16/animations/gnome-spinner.png
-share/icons/gnome/16x16/animations/process-idle.png
share/icons/gnome/16x16/animations/process-working.png
share/icons/gnome/16x16/apps/access.png
share/icons/gnome/16x16/apps/accessibility-directory.png
@@ -2078,9 +2076,7 @@ share/icons/gnome/22x22/actions/zoom-fit-best.png
share/icons/gnome/22x22/actions/zoom-in.png
share/icons/gnome/22x22/actions/zoom-original.png
share/icons/gnome/22x22/actions/zoom-out.png
-share/icons/gnome/22x22/animations/gnome-spinner-rest.png
share/icons/gnome/22x22/animations/gnome-spinner.png
-share/icons/gnome/22x22/animations/process-idle.png
share/icons/gnome/22x22/animations/process-working.png
share/icons/gnome/22x22/apps/access.png
share/icons/gnome/22x22/apps/accessibility-directory.png
@@ -3051,10 +3047,6 @@ share/icons/gnome/24x24/actions/zoom-fit-best.png
share/icons/gnome/24x24/actions/zoom-in.png
share/icons/gnome/24x24/actions/zoom-original.png
share/icons/gnome/24x24/actions/zoom-out.png
-share/icons/gnome/24x24/animations/gnome-spinner-rest.png
-share/icons/gnome/24x24/animations/gnome-spinner.png
-share/icons/gnome/24x24/animations/process-idle.png
-share/icons/gnome/24x24/animations/process-working.png
share/icons/gnome/24x24/apps/access.png
share/icons/gnome/24x24/apps/accessibility-directory.png
share/icons/gnome/24x24/apps/accessories-calculator.png
@@ -4636,9 +4628,7 @@ share/icons/gnome/32x32/actions/zoom-fit-best.png
share/icons/gnome/32x32/actions/zoom-in.png
share/icons/gnome/32x32/actions/zoom-original.png
share/icons/gnome/32x32/actions/zoom-out.png
-share/icons/gnome/32x32/animations/gnome-spinner-rest.png
share/icons/gnome/32x32/animations/gnome-spinner.png
-share/icons/gnome/32x32/animations/process-idle.png
share/icons/gnome/32x32/animations/process-working.png
share/icons/gnome/32x32/apps/access.png
share/icons/gnome/32x32/apps/accessibility-directory.png
@@ -5260,25 +5250,12 @@ share/icons/gnome/32x32/status/weather-snow.png
share/icons/gnome/32x32/status/weather-storm.png
share/icons/gnome/32x32/status/xfce-trash_full.png
share/icons/gnome/32x32/stock/generic/stock_person.png
-share/icons/gnome/48x48/actions/appointment-new.png
-share/icons/gnome/48x48/actions/appointment.png
-share/icons/gnome/48x48/actions/gnome-stock-mail-new.png
share/icons/gnome/48x48/actions/mail-mark-junk.png
share/icons/gnome/48x48/actions/mail-mark-not-junk.png
-share/icons/gnome/48x48/actions/mail-message-new.png
-share/icons/gnome/48x48/actions/mail-send-receive.png
-share/icons/gnome/48x48/actions/mail_new.png
share/icons/gnome/48x48/actions/mail_spam.png
-share/icons/gnome/48x48/actions/stock_mail-compose.png
-share/icons/gnome/48x48/actions/stock_mail-send-receive.png
-share/icons/gnome/48x48/actions/stock_new-appointment.png
share/icons/gnome/48x48/actions/stock_not-spam.png
share/icons/gnome/48x48/actions/stock_spam.png
-share/icons/gnome/48x48/animations/gnome-searchtool-animation-rest.png
-share/icons/gnome/48x48/animations/gnome-searchtool-animation.png
-share/icons/gnome/48x48/animations/gnome-spinner-rest.png
share/icons/gnome/48x48/animations/gnome-spinner.png
-share/icons/gnome/48x48/animations/process-idle.png
share/icons/gnome/48x48/animations/process-working.png
share/icons/gnome/48x48/apps/applets-screenshooter.png
share/icons/gnome/48x48/apps/palm-pilot-sync.png
@@ -6365,6 +6342,8 @@ share/icons/gnome/scalable/status/weather-snow.svg
share/icons/gnome/scalable/status/weather-storm.svg
share/icons/gnome/scalable/status/xfce-trash_full.svg
share/icons/gnome/scalable/stock/generic/stock_person.svg
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/icons/gnome/scalable/stock/generic
@@ -6474,3 +6453,4 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
@dirrmtry share/icons/gnome/16x16/actions
@dirrmtry share/icons/gnome/16x16
@dirrmtry share/icons/gnome
+@dirrmtry share/icons
diff --git a/misc/gnome-osd/pkg-plist b/misc/gnome-osd/pkg-plist
index 26ff6f4e0f90..8cdcddabc763 100644
--- a/misc/gnome-osd/pkg-plist
+++ b/misc/gnome-osd/pkg-plist
@@ -45,8 +45,6 @@ share/pixmaps/gnome-osd.png
share/locale/cs/LC_MESSAGES/gnome-osd.mo
share/locale/ja/LC_MESSAGES/gnome-osd.mo
share/locale/pt/LC_MESSAGES/gnome-osd.mo
-@dirrmtry etc/xdg/autostart
-@dirrmtry etc/xdg
@dirrm share/gnome-osd
@dirrm %%PYTHON_SITELIBDIR%%/gnomeosd
@dirrmtry %%PYTHON_SITELIBDIR%%
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index 28a7b3248bd4..66ddc2e0b959 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnome-user-docs/Makefile,v 1.47 2009/01/09 21:41:58 kwm Exp $
+# $MCom: ports/misc/gnome-user-docs/Makefile,v 1.50 2009/03/17 18:00:46 kwm Exp $
#
PORTNAME= gnome-user-docs
-PORTVERSION= 2.24.2
+PORTVERSION= 2.26.0
CATEGORIES= misc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo
index e07eff905d6f..426541be9496 100644
--- a/misc/gnome-user-docs/distinfo
+++ b/misc/gnome-user-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-user-docs-2.24.2.tar.bz2) = c387144f39c05152bb0771ae2b07a4d8
-SHA256 (gnome2/gnome-user-docs-2.24.2.tar.bz2) = c8e05a98d723356fa72681bf90f7a27a666ff6468a9489d7f6ea682a0390ab3a
-SIZE (gnome2/gnome-user-docs-2.24.2.tar.bz2) = 13192540
+MD5 (gnome2/gnome-user-docs-2.26.0.tar.bz2) = 3735096cf4b076696ebed217bf600190
+SHA256 (gnome2/gnome-user-docs-2.26.0.tar.bz2) = 266c870e7e97b340d9bb59de95fd96b58e01288e93729d1e34ae020d9f837f70
+SIZE (gnome2/gnome-user-docs-2.26.0.tar.bz2) = 14112318
diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist
index b666615fcac6..14bd90500c5b 100644
--- a/misc/gnome-user-docs/pkg-plist
+++ b/misc/gnome-user-docs/pkg-plist
@@ -201,6 +201,45 @@ share/gnome/help/gnome-access-guide/es/figures/tabbed_section.png
share/gnome/help/gnome-access-guide/es/figures/text_box.png
share/gnome/help/gnome-access-guide/es/figures/tree.png
share/gnome/help/gnome-access-guide/es/gnome-access-guide.xml
+share/gnome/help/gnome-access-guide/eu/figures/Braille_Tab.png
+share/gnome/help/gnome-access-guide/eu/figures/General_Tab.png
+share/gnome/help/gnome-access-guide/eu/figures/KeyBindings_Tab.png
+share/gnome/help/gnome-access-guide/eu/figures/KeyBindings_Tab_Unbound.png
+share/gnome/help/gnome-access-guide/eu/figures/KeyEcho_Tab.png
+share/gnome/help/gnome-access-guide/eu/figures/Magnifier_Advanced.png
+share/gnome/help/gnome-access-guide/eu/figures/Magnifier_Tab.png
+share/gnome/help/gnome-access-guide/eu/figures/MainWindow.png
+share/gnome/help/gnome-access-guide/eu/figures/Pronunciation_Tab.png
+share/gnome/help/gnome-access-guide/eu/figures/RPM_search_gnome_common.png
+share/gnome/help/gnome-access-guide/eu/figures/Speech_Tab.png
+share/gnome/help/gnome-access-guide/eu/figures/TextAttributes_Tab.png
+share/gnome/help/gnome-access-guide/eu/figures/accessx.png
+share/gnome/help/gnome-access-guide/eu/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/eu/figures/button.png
+share/gnome/help/gnome-access-guide/eu/figures/check_box.png
+share/gnome/help/gnome-access-guide/eu/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/eu/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/eu/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/eu/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/eu/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/eu/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/eu/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/eu/figures/radio_button.png
+share/gnome/help/gnome-access-guide/eu/figures/slider.png
+share/gnome/help/gnome-access-guide/eu/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/eu/figures/spin_box.png
+share/gnome/help/gnome-access-guide/eu/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/eu/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/eu/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/eu/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/eu/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/eu/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/eu/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/eu/figures/stickywindowlock.png
+share/gnome/help/gnome-access-guide/eu/figures/tabbed_section.png
+share/gnome/help/gnome-access-guide/eu/figures/text_box.png
+share/gnome/help/gnome-access-guide/eu/figures/tree.png
+share/gnome/help/gnome-access-guide/eu/gnome-access-guide.xml
share/gnome/help/gnome-access-guide/fi/figures/Braille_Tab.png
share/gnome/help/gnome-access-guide/fi/figures/General_Tab.png
share/gnome/help/gnome-access-guide/fi/figures/KeyBindings_Tab.png
@@ -474,6 +513,45 @@ share/gnome/help/gnome-access-guide/sv/figures/tabbed_section.png
share/gnome/help/gnome-access-guide/sv/figures/text_box.png
share/gnome/help/gnome-access-guide/sv/figures/tree.png
share/gnome/help/gnome-access-guide/sv/gnome-access-guide.xml
+share/gnome/help/gnome-access-guide/zh_CN/figures/Braille_Tab.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/General_Tab.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/KeyBindings_Tab.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/KeyBindings_Tab_Unbound.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/KeyEcho_Tab.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/Magnifier_Advanced.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/Magnifier_Tab.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/MainWindow.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/Pronunciation_Tab.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/RPM_search_gnome_common.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/Speech_Tab.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/TextAttributes_Tab.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/accessx.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/button.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/check_box.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/radio_button.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/slider.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/spin_box.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/stickywindowlock.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/tabbed_section.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/text_box.png
+share/gnome/help/gnome-access-guide/zh_CN/figures/tree.png
+share/gnome/help/gnome-access-guide/zh_CN/gnome-access-guide.xml
share/gnome/help/system-admin-guide/C/appendixa.xml
share/gnome/help/system-admin-guide/C/appendixb.xml
share/gnome/help/system-admin-guide/C/fontconfig.xml
@@ -493,6 +571,7 @@ share/gnome/help/system-admin-guide/ca/system-admin-guide.xml
share/gnome/help/system-admin-guide/de/system-admin-guide.xml
share/gnome/help/system-admin-guide/el/system-admin-guide.xml
share/gnome/help/system-admin-guide/es/system-admin-guide.xml
+share/gnome/help/system-admin-guide/eu/system-admin-guide.xml
share/gnome/help/system-admin-guide/fi/system-admin-guide.xml
share/gnome/help/system-admin-guide/fr/system-admin-guide.xml
share/gnome/help/system-admin-guide/it/system-admin-guide.xml
@@ -735,6 +814,83 @@ share/gnome/help/user-guide/bg/gospanel.xml
share/gnome/help/user-guide/bg/gosstartsession.xml
share/gnome/help/user-guide/bg/gostools.xml
share/gnome/help/user-guide/bg/user-guide.xml
+share/gnome/help/user-guide/cs/figures/ask_pointer.png
+share/gnome/help/user-guide/cs/figures/busy_pointer.png
+share/gnome/help/user-guide/cs/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/cs/figures/copy_pointer.png
+share/gnome/help/user-guide/cs/figures/force_quit.png
+share/gnome/help/user-guide/cs/figures/four_hide_button.png
+share/gnome/help/user-guide/cs/figures/gedit_window.png
+share/gnome/help/user-guide/cs/figures/gnome_panel.png
+share/gnome/help/user-guide/cs/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/cs/figures/ibeam_pointer.png
+share/gnome/help/user-guide/cs/figures/link_pointer.png
+share/gnome/help/user-guide/cs/figures/lockscreen_icon.png
+share/gnome/help/user-guide/cs/figures/logout_icon.png
+share/gnome/help/user-guide/cs/figures/menu_bar_applet.png
+share/gnome/help/user-guide/cs/figures/menu_panel.png
+share/gnome/help/user-guide/cs/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/cs/figures/move_pointer.png
+share/gnome/help/user-guide/cs/figures/movewindow_pointer.png
+share/gnome/help/user-guide/cs/figures/naut_browser_mode.png
+share/gnome/help/user-guide/cs/figures/naut_button_bar.png
+share/gnome/help/user-guide/cs/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/cs/figures/naut_emblem.png
+share/gnome/help/user-guide/cs/figures/naut_go_to_location.png
+share/gnome/help/user-guide/cs/figures/naut_link_emblem.png
+share/gnome/help/user-guide/cs/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/cs/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/cs/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/cs/figures/naut_refine_search.png
+share/gnome/help/user-guide/cs/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/cs/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/cs/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/cs/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/cs/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/cs/figures/naut_search_bar.png
+share/gnome/help/user-guide/cs/figures/naut_search_results.png
+share/gnome/help/user-guide/cs/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/cs/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/cs/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/cs/figures/naut_spatial_view.png
+share/gnome/help/user-guide/cs/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/cs/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/cs/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/cs/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/cs/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/cs/figures/normal_pointer.png
+share/gnome/help/user-guide/cs/figures/not_available_pointer.png
+share/gnome/help/user-guide/cs/figures/notification_area_icon.png
+share/gnome/help/user-guide/cs/figures/open_drawer.png
+share/gnome/help/user-guide/cs/figures/openwindows_menu.png
+share/gnome/help/user-guide/cs/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/cs/figures/resize_pointer.png
+share/gnome/help/user-guide/cs/figures/run_button.png
+share/gnome/help/user-guide/cs/figures/sample_applet.png
+share/gnome/help/user-guide/cs/figures/screenshot_button.png
+share/gnome/help/user-guide/cs/figures/searchtool_button.png
+share/gnome/help/user-guide/cs/figures/show_desktop_button.png
+share/gnome/help/user-guide/cs/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/cs/figures/titlebar_window.png
+share/gnome/help/user-guide/cs/figures/typical_menu.png
+share/gnome/help/user-guide/cs/figures/window_list_applet.png
+share/gnome/help/user-guide/cs/figures/window_list_group_applet.png
+share/gnome/help/user-guide/cs/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/cs/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/cs/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/cs/figures/yelp_preferences.png
+share/gnome/help/user-guide/cs/figures/yelp_window.png
+share/gnome/help/user-guide/cs/glossary.xml
+share/gnome/help/user-guide/cs/gosbasic.xml
+share/gnome/help/user-guide/cs/goscustdesk.xml
+share/gnome/help/user-guide/cs/goseditmainmenu.xml
+share/gnome/help/user-guide/cs/gosfeedback.xml
+share/gnome/help/user-guide/cs/gosnautilus.xml
+share/gnome/help/user-guide/cs/gosoverview.xml
+share/gnome/help/user-guide/cs/gospanel.xml
+share/gnome/help/user-guide/cs/gosstartsession.xml
+share/gnome/help/user-guide/cs/gostools.xml
+share/gnome/help/user-guide/cs/user-guide.xml
share/gnome/help/user-guide/de/figures/ask_pointer.png
share/gnome/help/user-guide/de/figures/busy_pointer.png
share/gnome/help/user-guide/de/figures/com_file_manager_menu.png
@@ -2049,6 +2205,7 @@ share/omf/gnome-access-guide/gnome-access-guide-de.omf
share/omf/gnome-access-guide/gnome-access-guide-el.omf
share/omf/gnome-access-guide/gnome-access-guide-en_GB.omf
share/omf/gnome-access-guide/gnome-access-guide-es.omf
+share/omf/gnome-access-guide/gnome-access-guide-eu.omf
share/omf/gnome-access-guide/gnome-access-guide-fi.omf
share/omf/gnome-access-guide/gnome-access-guide-fr.omf
share/omf/gnome-access-guide/gnome-access-guide-hu.omf
@@ -2056,11 +2213,13 @@ share/omf/gnome-access-guide/gnome-access-guide-it.omf
share/omf/gnome-access-guide/gnome-access-guide-oc.omf
share/omf/gnome-access-guide/gnome-access-guide-pt.omf
share/omf/gnome-access-guide/gnome-access-guide-sv.omf
+share/omf/gnome-access-guide/gnome-access-guide-zh_CN.omf
share/omf/system-admin-guide/system-admin-guide-C.omf
share/omf/system-admin-guide/system-admin-guide-ca.omf
share/omf/system-admin-guide/system-admin-guide-de.omf
share/omf/system-admin-guide/system-admin-guide-el.omf
share/omf/system-admin-guide/system-admin-guide-es.omf
+share/omf/system-admin-guide/system-admin-guide-eu.omf
share/omf/system-admin-guide/system-admin-guide-fi.omf
share/omf/system-admin-guide/system-admin-guide-fr.omf
share/omf/system-admin-guide/system-admin-guide-it.omf
@@ -2074,6 +2233,7 @@ share/omf/system-admin-guide/system-admin-guide-zh_CN.omf
share/omf/user-guide/user-guide-C.omf
share/omf/user-guide/user-guide-ar.omf
share/omf/user-guide/user-guide-bg.omf
+share/omf/user-guide/user-guide-cs.omf
share/omf/user-guide/user-guide-de.omf
share/omf/user-guide/user-guide-el.omf
share/omf/user-guide/user-guide-es.omf
@@ -2128,6 +2288,8 @@ share/omf/user-guide/user-guide-zh_CN.omf
@dirrm share/gnome/help/user-guide/el
@dirrm share/gnome/help/user-guide/de/figures
@dirrm share/gnome/help/user-guide/de
+@dirrm share/gnome/help/user-guide/cs/figures
+@dirrm share/gnome/help/user-guide/cs
@dirrm share/gnome/help/user-guide/bg/figures
@dirrm share/gnome/help/user-guide/bg
@dirrm share/gnome/help/user-guide/ar/figures
@@ -2145,12 +2307,15 @@ share/omf/user-guide/user-guide-zh_CN.omf
@dirrm share/gnome/help/system-admin-guide/it
@dirrm share/gnome/help/system-admin-guide/fr
@dirrm share/gnome/help/system-admin-guide/fi
+@dirrm share/gnome/help/system-admin-guide/eu
@dirrm share/gnome/help/system-admin-guide/es
@dirrm share/gnome/help/system-admin-guide/el
@dirrm share/gnome/help/system-admin-guide/de
@dirrm share/gnome/help/system-admin-guide/ca
@dirrm share/gnome/help/system-admin-guide/C
@dirrm share/gnome/help/system-admin-guide
+@dirrm share/gnome/help/gnome-access-guide/zh_CN/figures
+@dirrm share/gnome/help/gnome-access-guide/zh_CN
@dirrm share/gnome/help/gnome-access-guide/sv/figures
@dirrm share/gnome/help/gnome-access-guide/sv
@dirrm share/gnome/help/gnome-access-guide/pt/figures
@@ -2165,6 +2330,8 @@ share/omf/user-guide/user-guide-zh_CN.omf
@dirrm share/gnome/help/gnome-access-guide/fr
@dirrm share/gnome/help/gnome-access-guide/fi/figures
@dirrm share/gnome/help/gnome-access-guide/fi
+@dirrm share/gnome/help/gnome-access-guide/eu/figures
+@dirrm share/gnome/help/gnome-access-guide/eu
@dirrm share/gnome/help/gnome-access-guide/es/figures
@dirrm share/gnome/help/gnome-access-guide/es
@dirrm share/gnome/help/gnome-access-guide/en_GB/figures
diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile
index 5e90ba27d9f4..8774c9c39048 100644
--- a/misc/gnomehier/Makefile
+++ b/misc/gnomehier/Makefile
@@ -3,13 +3,13 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnomehier/Makefile,v 1.31 2008/12/26 23:27:22 marcus Exp $
+# $MCom: ports/misc/gnomehier/Makefile,v 1.34 2009/04/09 03:24:08 mezz Exp $
#
# !!DON'T BUMP PORTREVISION ON MTREE CHANGES ANYMORE!!
PORTNAME= gnomehier
PORTVERSION= 2.3
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= misc gnome
MASTER_SITES= # none
DISTFILES= # none
diff --git a/misc/gnomehier/files/dirlist b/misc/gnomehier/files/dirlist
index a526d5bc8e39..9ef1b4c8f0f6 100644
--- a/misc/gnomehier/files/dirlist
+++ b/misc/gnomehier/files/dirlist
@@ -17,6 +17,8 @@ etc/sound
etc/sound/events
etc/vfs
etc/vfs/modules
+etc/xdg
+etc/xdg/autostart
include/gconf
include/gdkcardimage
include/gnome-1.0
diff --git a/misc/quick-lounge-applet/Makefile b/misc/quick-lounge-applet/Makefile
index ecd5c2fd814d..ee6ef3d9525d 100644
--- a/misc/quick-lounge-applet/Makefile
+++ b/misc/quick-lounge-applet/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/quick-lounge-applet/Makefile,v 1.11 2007/05/19 21:36:14 marcus Exp $
+# $MCom: ports/misc/quick-lounge-applet/Makefile,v 1.13 2009/02/21 13:44:22 kwm Exp $
#
PORTNAME= quick-lounge-applet
-PORTVERSION= 2.12.5
-PORTREVISION= 1
+PORTVERSION= 2.13.2
CATEGORIES= misc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/misc/quick-lounge-applet/distinfo b/misc/quick-lounge-applet/distinfo
index 104443864006..48e058b71451 100644
--- a/misc/quick-lounge-applet/distinfo
+++ b/misc/quick-lounge-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/quick-lounge-applet-2.12.5.tar.bz2) = b9ff8cd8a6eb4665e1e36b150c88e8cf
-SHA256 (gnome2/quick-lounge-applet-2.12.5.tar.bz2) = e409be78403fa54a405d8e610eac1b061ea6fad7ba8a0b84d1aa8a2e7475c5ba
-SIZE (gnome2/quick-lounge-applet-2.12.5.tar.bz2) = 282017
+MD5 (gnome2/quick-lounge-applet-2.13.2.tar.bz2) = 033723a90f6ce15d1340ee542631607c
+SHA256 (gnome2/quick-lounge-applet-2.13.2.tar.bz2) = 7f43fa3b12cc517fa947399a5d93feee72280c71f5698ba9abd207d7e6771a9a
+SIZE (gnome2/quick-lounge-applet-2.13.2.tar.bz2) = 405000
diff --git a/misc/quick-lounge-applet/pkg-plist b/misc/quick-lounge-applet/pkg-plist
index 79d8c3bb8dc6..a78f6d018d17 100644
--- a/misc/quick-lounge-applet/pkg-plist
+++ b/misc/quick-lounge-applet/pkg-plist
@@ -8,98 +8,12 @@ share/gnome/help/quick-lounge/C/figures/quick-lounge_up.png
share/gnome/help/quick-lounge/C/figures/quick-lounge_window.png
share/gnome/help/quick-lounge/C/legal.xml
share/gnome/help/quick-lounge/C/quick-lounge.xml
-share/gnome/help/quick-lounge/de/figures/quick-lounge_down.png
-share/gnome/help/quick-lounge/de/figures/quick-lounge_end.png
-share/gnome/help/quick-lounge/de/figures/quick-lounge_more.png
-share/gnome/help/quick-lounge/de/figures/quick-lounge_start.png
-share/gnome/help/quick-lounge/de/figures/quick-lounge_up.png
-share/gnome/help/quick-lounge/de/figures/quick-lounge_window.png
-share/gnome/help/quick-lounge/de/legal.xml
-share/gnome/help/quick-lounge/de/quick-lounge.xml
-share/gnome/help/quick-lounge/es/figures/quick-lounge_down.png
-share/gnome/help/quick-lounge/es/figures/quick-lounge_end.png
-share/gnome/help/quick-lounge/es/figures/quick-lounge_more.png
-share/gnome/help/quick-lounge/es/figures/quick-lounge_start.png
-share/gnome/help/quick-lounge/es/figures/quick-lounge_up.png
-share/gnome/help/quick-lounge/es/figures/quick-lounge_window.png
-share/gnome/help/quick-lounge/es/legal.xml
-share/gnome/help/quick-lounge/es/quick-lounge.xml
share/gnome/help/quick-lounge/fr/figures/quick-lounge_down.png
share/gnome/help/quick-lounge/fr/figures/quick-lounge_end.png
-share/gnome/help/quick-lounge/fr/figures/quick-lounge_more.png
share/gnome/help/quick-lounge/fr/figures/quick-lounge_start.png
share/gnome/help/quick-lounge/fr/figures/quick-lounge_up.png
share/gnome/help/quick-lounge/fr/figures/quick-lounge_window.png
-share/gnome/help/quick-lounge/fr/legal.xml
share/gnome/help/quick-lounge/fr/quick-lounge.xml
-share/gnome/help/quick-lounge/it/figures/quick-lounge_down.png
-share/gnome/help/quick-lounge/it/figures/quick-lounge_end.png
-share/gnome/help/quick-lounge/it/figures/quick-lounge_more.png
-share/gnome/help/quick-lounge/it/figures/quick-lounge_start.png
-share/gnome/help/quick-lounge/it/figures/quick-lounge_up.png
-share/gnome/help/quick-lounge/it/figures/quick-lounge_window.png
-share/gnome/help/quick-lounge/it/legal.xml
-share/gnome/help/quick-lounge/it/quick-lounge.xml
-share/gnome/help/quick-lounge/ja/figures/quick-lounge_down.png
-share/gnome/help/quick-lounge/ja/figures/quick-lounge_end.png
-share/gnome/help/quick-lounge/ja/figures/quick-lounge_more.png
-share/gnome/help/quick-lounge/ja/figures/quick-lounge_start.png
-share/gnome/help/quick-lounge/ja/figures/quick-lounge_up.png
-share/gnome/help/quick-lounge/ja/figures/quick-lounge_window.png
-share/gnome/help/quick-lounge/ja/legal.xml
-share/gnome/help/quick-lounge/ja/quick-lounge.xml
-share/gnome/help/quick-lounge/ko/figures/quick-lounge_down.png
-share/gnome/help/quick-lounge/ko/figures/quick-lounge_end.png
-share/gnome/help/quick-lounge/ko/figures/quick-lounge_more.png
-share/gnome/help/quick-lounge/ko/figures/quick-lounge_start.png
-share/gnome/help/quick-lounge/ko/figures/quick-lounge_up.png
-share/gnome/help/quick-lounge/ko/figures/quick-lounge_window.png
-share/gnome/help/quick-lounge/ko/legal.xml
-share/gnome/help/quick-lounge/ko/quick-lounge.xml
-share/gnome/help/quick-lounge/sv/figures/quick-lounge_down.png
-share/gnome/help/quick-lounge/sv/figures/quick-lounge_end.png
-share/gnome/help/quick-lounge/sv/figures/quick-lounge_more.png
-share/gnome/help/quick-lounge/sv/figures/quick-lounge_start.png
-share/gnome/help/quick-lounge/sv/figures/quick-lounge_up.png
-share/gnome/help/quick-lounge/sv/figures/quick-lounge_window.png
-share/gnome/help/quick-lounge/sv/legal.xml
-share/gnome/help/quick-lounge/sv/quick-lounge.xml
-share/gnome/help/quick-lounge/zh_CN/figures/quick-lounge_down.png
-share/gnome/help/quick-lounge/zh_CN/figures/quick-lounge_end.png
-share/gnome/help/quick-lounge/zh_CN/figures/quick-lounge_more.png
-share/gnome/help/quick-lounge/zh_CN/figures/quick-lounge_start.png
-share/gnome/help/quick-lounge/zh_CN/figures/quick-lounge_up.png
-share/gnome/help/quick-lounge/zh_CN/figures/quick-lounge_window.png
-share/gnome/help/quick-lounge/zh_CN/legal.xml
-share/gnome/help/quick-lounge/zh_CN/quick-lounge.xml
-share/gnome/help/quick-lounge/zh_HK/figures/quick-lounge_down.png
-share/gnome/help/quick-lounge/zh_HK/figures/quick-lounge_end.png
-share/gnome/help/quick-lounge/zh_HK/figures/quick-lounge_more.png
-share/gnome/help/quick-lounge/zh_HK/figures/quick-lounge_start.png
-share/gnome/help/quick-lounge/zh_HK/figures/quick-lounge_up.png
-share/gnome/help/quick-lounge/zh_HK/figures/quick-lounge_window.png
-share/gnome/help/quick-lounge/zh_HK/legal.xml
-share/gnome/help/quick-lounge/zh_HK/quick-lounge.xml
-share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_down.png
-share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_end.png
-share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_more.png
-share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_start.png
-share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_up.png
-share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_window.png
-share/gnome/help/quick-lounge/zh_TW/legal.xml
-share/gnome/help/quick-lounge/zh_TW/quick-lounge.xml
-share/omf/quick-lounge-applet/quick-lounge-C.omf
-share/omf/quick-lounge-applet/quick-lounge-de.omf
-share/omf/quick-lounge-applet/quick-lounge-es.omf
-share/omf/quick-lounge-applet/quick-lounge-fr.omf
-share/omf/quick-lounge-applet/quick-lounge-it.omf
-share/omf/quick-lounge-applet/quick-lounge-ja.omf
-share/omf/quick-lounge-applet/quick-lounge-ko.omf
-share/omf/quick-lounge-applet/quick-lounge-sv.omf
-share/omf/quick-lounge-applet/quick-lounge-zh_CN.omf
-share/omf/quick-lounge-applet/quick-lounge-zh_HK.omf
-share/omf/quick-lounge-applet/quick-lounge-zh_TW.omf
-share/quick-lounge-applet/glade/quick-lounge.glade
share/icons/hicolor/48x48/apps/quick-lounge-applet.png
share/locale/ar/LC_MESSAGES/quick-lounge-applet.mo
share/locale/az/LC_MESSAGES/quick-lounge-applet.mo
@@ -107,6 +21,7 @@ share/locale/bg/LC_MESSAGES/quick-lounge-applet.mo
share/locale/bs/LC_MESSAGES/quick-lounge-applet.mo
share/locale/ca/LC_MESSAGES/quick-lounge-applet.mo
share/locale/cs/LC_MESSAGES/quick-lounge-applet.mo
+share/locale/da/LC_MESSAGES/quick-lounge-applet.mo
share/locale/de/LC_MESSAGES/quick-lounge-applet.mo
share/locale/dz/LC_MESSAGES/quick-lounge-applet.mo
share/locale/el/LC_MESSAGES/quick-lounge-applet.mo
@@ -143,33 +58,18 @@ share/locale/tr/LC_MESSAGES/quick-lounge-applet.mo
share/locale/uk/LC_MESSAGES/quick-lounge-applet.mo
share/locale/vi/LC_MESSAGES/quick-lounge-applet.mo
share/locale/zh_CN/LC_MESSAGES/quick-lounge-applet.mo
+share/quick-lounge-applet/ui/add-from-menu.ui
+share/quick-lounge-applet/ui/desktop-entry-editor.ui
+share/quick-lounge-applet/ui/link-entry-editor.ui
+share/quick-lounge-applet/ui/properties.ui
+@dirrm share/quick-lounge-applet/ui
+@dirrm share/quick-lounge-applet
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrm share/quick-lounge-applet/glade
-@dirrm share/quick-lounge-applet
-@dirrm share/omf/quick-lounge-applet
-@dirrm share/gnome/help/quick-lounge/zh_TW/figures
-@dirrm share/gnome/help/quick-lounge/zh_TW
-@dirrm share/gnome/help/quick-lounge/zh_HK/figures
-@dirrm share/gnome/help/quick-lounge/zh_HK
-@dirrm share/gnome/help/quick-lounge/zh_CN/figures
-@dirrm share/gnome/help/quick-lounge/zh_CN
-@dirrm share/gnome/help/quick-lounge/sv/figures
-@dirrm share/gnome/help/quick-lounge/sv
-@dirrm share/gnome/help/quick-lounge/ko/figures
-@dirrm share/gnome/help/quick-lounge/ko
-@dirrm share/gnome/help/quick-lounge/ja/figures
-@dirrm share/gnome/help/quick-lounge/ja
-@dirrm share/gnome/help/quick-lounge/it/figures
-@dirrm share/gnome/help/quick-lounge/it
@dirrm share/gnome/help/quick-lounge/fr/figures
@dirrm share/gnome/help/quick-lounge/fr
-@dirrm share/gnome/help/quick-lounge/es/figures
-@dirrm share/gnome/help/quick-lounge/es
-@dirrm share/gnome/help/quick-lounge/de/figures
-@dirrm share/gnome/help/quick-lounge/de
@dirrm share/gnome/help/quick-lounge/C/figures
@dirrm share/gnome/help/quick-lounge/C
@dirrm share/gnome/help/quick-lounge
diff --git a/misc/wmcalendar/Makefile b/misc/wmcalendar/Makefile
index a3f10702ac19..cff718154346 100644
--- a/misc/wmcalendar/Makefile
+++ b/misc/wmcalendar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmcalendar
PORTVERSION= 0.5.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= misc windowmaker
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= xride@FreeBSD.org
COMMENT= A dockable calendar with interface to iCalendar based calendars
-LIB_DEPENDS= ical.42:${PORTSDIR}/devel/libical
+LIB_DEPENDS= ical.43:${PORTSDIR}/devel/libical
WRKSRC= ${WRKDIR}/${DISTNAME}/Src
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index 8f01674454ef..f5372ddaedad 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -3,11 +3,11 @@
# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/cheese/Makefile,v 1.26 2008/11/25 16:34:26 marcus Exp $
+# $MCom: ports/multimedia/cheese/Makefile,v 1.31 2009/03/17 15:53:49 kwm Exp $
#
PORTNAME= cheese
-PORTVERSION= 2.24.3
+PORTVERSION= 2.26.0
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -21,7 +21,7 @@ USE_XORG= xxf86vm
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix intlhack evolutiondataserver librsvg2 \
- gnomedocutils
+ gnomedocutils gnomedesktop
USE_GETTEXT= yes
USE_GSTREAMER= good
INSTALLS_OMF= yes
diff --git a/multimedia/cheese/distinfo b/multimedia/cheese/distinfo
index faa73cadb157..5a55476313f1 100644
--- a/multimedia/cheese/distinfo
+++ b/multimedia/cheese/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/cheese-2.24.3.tar.bz2) = 833d580c2dd2f1b9a0702b6e5c864e2a
-SHA256 (gnome2/cheese-2.24.3.tar.bz2) = b8f2823a534d8f0f3b4178c55bff84b6244b7b2d45cfc4dace58651579d948f7
-SIZE (gnome2/cheese-2.24.3.tar.bz2) = 3056191
+MD5 (gnome2/cheese-2.26.0.tar.bz2) = 17c991c695c3a7549da6e42d1b327d79
+SHA256 (gnome2/cheese-2.26.0.tar.bz2) = 297c7aa579e14c1c22fbbc19254fbefca3b79ef8e6643856c83be0fdb8721412
+SIZE (gnome2/cheese-2.26.0.tar.bz2) = 3234803
diff --git a/multimedia/cheese/pkg-plist b/multimedia/cheese/pkg-plist
index 8f16b450236b..581e89e55eda 100644
--- a/multimedia/cheese/pkg-plist
+++ b/multimedia/cheese/pkg-plist
@@ -46,9 +46,15 @@ share/gnome/help/cheese/C/legal.xml
share/gnome/help/cheese/ca/cheese.xml
share/gnome/help/cheese/ca/figures/cheese-effects-screenshot.jpg
share/gnome/help/cheese/ca/figures/cheese-screenshot.jpg
+share/gnome/help/cheese/de/cheese.xml
+share/gnome/help/cheese/de/figures/cheese-effects-screenshot.jpg
+share/gnome/help/cheese/de/figures/cheese-screenshot.jpg
share/gnome/help/cheese/el/cheese.xml
share/gnome/help/cheese/el/figures/cheese-effects-screenshot.jpg
share/gnome/help/cheese/el/figures/cheese-screenshot.jpg
+share/gnome/help/cheese/en_GB/cheese.xml
+share/gnome/help/cheese/en_GB/figures/cheese-effects-screenshot.jpg
+share/gnome/help/cheese/en_GB/figures/cheese-screenshot.jpg
share/gnome/help/cheese/es/cheese.xml
share/gnome/help/cheese/es/figures/cheese-effects-screenshot.jpg
share/gnome/help/cheese/es/figures/cheese-screenshot.jpg
@@ -80,6 +86,7 @@ share/icons/hicolor/32x32/apps/cheese.png
share/icons/hicolor/48x48/apps/cheese.png
share/icons/hicolor/scalable/apps/cheese.svg
share/locale/ar/LC_MESSAGES/cheese.mo
+share/locale/as/LC_MESSAGES/cheese.mo
share/locale/be@latin/LC_MESSAGES/cheese.mo
share/locale/bg/LC_MESSAGES/cheese.mo
share/locale/bn_IN/LC_MESSAGES/cheese.mo
@@ -106,7 +113,9 @@ share/locale/it/LC_MESSAGES/cheese.mo
share/locale/ja/LC_MESSAGES/cheese.mo
share/locale/kn/LC_MESSAGES/cheese.mo
share/locale/ko/LC_MESSAGES/cheese.mo
+share/locale/ku/LC_MESSAGES/cheese.mo
share/locale/lt/LC_MESSAGES/cheese.mo
+share/locale/lv/LC_MESSAGES/cheese.mo
share/locale/mk/LC_MESSAGES/cheese.mo
share/locale/ml/LC_MESSAGES/cheese.mo
share/locale/mr/LC_MESSAGES/cheese.mo
@@ -138,7 +147,9 @@ share/locale/zh_HK/LC_MESSAGES/cheese.mo
share/locale/zh_TW/LC_MESSAGES/cheese.mo
share/omf/cheese/cheese-C.omf
share/omf/cheese/cheese-ca.omf
+share/omf/cheese/cheese-de.omf
share/omf/cheese/cheese-el.omf
+share/omf/cheese/cheese-en_GB.omf
share/omf/cheese/cheese-es.omf
share/omf/cheese/cheese-fr.omf
share/omf/cheese/cheese-nl.omf
@@ -164,8 +175,12 @@ share/omf/cheese/cheese-th.omf
@dirrm share/gnome/help/cheese/fr
@dirrm share/gnome/help/cheese/es/figures
@dirrm share/gnome/help/cheese/es
+@dirrm share/gnome/help/cheese/en_GB/figures
+@dirrm share/gnome/help/cheese/en_GB
@dirrm share/gnome/help/cheese/el/figures
@dirrm share/gnome/help/cheese/el
+@dirrm share/gnome/help/cheese/de/figures
+@dirrm share/gnome/help/cheese/de
@dirrm share/gnome/help/cheese/ca/figures
@dirrm share/gnome/help/cheese/ca
@dirrm share/gnome/help/cheese/C/figures
@@ -204,9 +219,13 @@ share/omf/cheese/cheese-th.omf
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@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/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/multimedia/gxmms/Makefile b/multimedia/gxmms/Makefile
index e42afee928b4..0a011b7aaeb8 100644
--- a/multimedia/gxmms/Makefile
+++ b/multimedia/gxmms/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gxmms
PORTVERSION= 0.2.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= multimedia gnome
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -22,7 +22,8 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ LIBS="`pkg-config --libs libgnomeui-2.0`"
.include <bsd.port.mk>
diff --git a/multimedia/swfdec-gnome/Makefile b/multimedia/swfdec-gnome/Makefile
index d0b33dd1b49f..559bca0354bc 100644
--- a/multimedia/swfdec-gnome/Makefile
+++ b/multimedia/swfdec-gnome/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/swfdec-gnome/Makefile,v 1.13 2008/09/23 15:22:49 kwm Exp $
+# $MCom: ports/multimedia/swfdec-gnome/Makefile,v 1.17 2009/03/17 16:41:17 kwm Exp $
#
PORTNAME= swfdec-gnome
-PORTVERSION= 2.24.0
+PORTVERSION= 2.26.0
CATEGORIES= multimedia
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/multimedia/swfdec-gnome/distinfo b/multimedia/swfdec-gnome/distinfo
index 75725a460ccd..451f89d48c1d 100644
--- a/multimedia/swfdec-gnome/distinfo
+++ b/multimedia/swfdec-gnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/swfdec-gnome-2.24.0.tar.bz2) = e5807265a3123f952e0950985ad86412
-SHA256 (gnome2/swfdec-gnome-2.24.0.tar.bz2) = 3d702291d3229f6efea1c054fe02c4d2f6ca6b34a0680af76ecb0bf060833b4a
-SIZE (gnome2/swfdec-gnome-2.24.0.tar.bz2) = 157558
+MD5 (gnome2/swfdec-gnome-2.26.0.tar.bz2) = 53d611d9a76a06a703650c4b73fd44cc
+SHA256 (gnome2/swfdec-gnome-2.26.0.tar.bz2) = bf48dcadd9ca015f40a9aaa9cc94d402e9daf7c88b747789c79fcc921e9e1626
+SIZE (gnome2/swfdec-gnome-2.26.0.tar.bz2) = 193839
diff --git a/multimedia/swfdec-gnome/pkg-plist b/multimedia/swfdec-gnome/pkg-plist
index e303acba8b80..15e18fdd91ff 100644
--- a/multimedia/swfdec-gnome/pkg-plist
+++ b/multimedia/swfdec-gnome/pkg-plist
@@ -8,6 +8,7 @@ share/icons/hicolor/32x32/apps/swfdec-gnome.png
share/icons/hicolor/48x48/apps/swfdec-gnome.png
share/icons/hicolor/scalable/apps/swfdec-gnome.svg
share/locale/ar/LC_MESSAGES/swfdec-gnome.mo
+share/locale/as/LC_MESSAGES/swfdec-gnome.mo
share/locale/be@latin/LC_MESSAGES/swfdec-gnome.mo
share/locale/bg/LC_MESSAGES/swfdec-gnome.mo
share/locale/bn_IN/LC_MESSAGES/swfdec-gnome.mo
@@ -29,7 +30,10 @@ share/locale/hi/LC_MESSAGES/swfdec-gnome.mo
share/locale/hu/LC_MESSAGES/swfdec-gnome.mo
share/locale/it/LC_MESSAGES/swfdec-gnome.mo
share/locale/ja/LC_MESSAGES/swfdec-gnome.mo
+share/locale/kk/LC_MESSAGES/swfdec-gnome.mo
+share/locale/kn/LC_MESSAGES/swfdec-gnome.mo
share/locale/ko/LC_MESSAGES/swfdec-gnome.mo
+share/locale/ku/LC_MESSAGES/swfdec-gnome.mo
share/locale/lt/LC_MESSAGES/swfdec-gnome.mo
share/locale/mk/LC_MESSAGES/swfdec-gnome.mo
share/locale/ml/LC_MESSAGES/swfdec-gnome.mo
@@ -37,10 +41,13 @@ share/locale/mr/LC_MESSAGES/swfdec-gnome.mo
share/locale/nb/LC_MESSAGES/swfdec-gnome.mo
share/locale/nl/LC_MESSAGES/swfdec-gnome.mo
share/locale/nn/LC_MESSAGES/swfdec-gnome.mo
+share/locale/or/LC_MESSAGES/swfdec-gnome.mo
share/locale/pa/LC_MESSAGES/swfdec-gnome.mo
share/locale/pl/LC_MESSAGES/swfdec-gnome.mo
+share/locale/ps/LC_MESSAGES/swfdec-gnome.mo
share/locale/pt/LC_MESSAGES/swfdec-gnome.mo
share/locale/pt_BR/LC_MESSAGES/swfdec-gnome.mo
+share/locale/ro/LC_MESSAGES/swfdec-gnome.mo
share/locale/ru/LC_MESSAGES/swfdec-gnome.mo
share/locale/sl/LC_MESSAGES/swfdec-gnome.mo
share/locale/sq/LC_MESSAGES/swfdec-gnome.mo
@@ -48,6 +55,7 @@ share/locale/sr/LC_MESSAGES/swfdec-gnome.mo
share/locale/sr@latin/LC_MESSAGES/swfdec-gnome.mo
share/locale/sv/LC_MESSAGES/swfdec-gnome.mo
share/locale/ta/LC_MESSAGES/swfdec-gnome.mo
+share/locale/te/LC_MESSAGES/swfdec-gnome.mo
share/locale/th/LC_MESSAGES/swfdec-gnome.mo
share/locale/tr/LC_MESSAGES/swfdec-gnome.mo
share/locale/uk/LC_MESSAGES/swfdec-gnome.mo
@@ -62,13 +70,25 @@ share/locale/zh_TW/LC_MESSAGES/swfdec-gnome.mo
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@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/sr/LC_MESSAGES
@dirrmtry share/locale/sr
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@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/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index 4c48ed39f1fd..333869c5f252 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/totem-pl-parser/Makefile,v 1.19 2008/12/14 17:56:46 mezz Exp $
+# $MCom: ports/multimedia/totem-pl-parser/Makefile,v 1.24 2009/03/31 13:10:18 kwm Exp $
#
PORTNAME= totem-pl-parser
-PORTVERSION= 2.24.4
+PORTVERSION= 2.26.1
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/multimedia/totem-pl-parser/distinfo b/multimedia/totem-pl-parser/distinfo
index bc429d53f9f2..0a99b9cc1462 100644
--- a/multimedia/totem-pl-parser/distinfo
+++ b/multimedia/totem-pl-parser/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-pl-parser-2.24.4.tar.bz2) = cff146663fe307a7d929e08ab0e4b3ca
-SHA256 (gnome2/totem-pl-parser-2.24.4.tar.bz2) = e43eefb7d169e54da889d32fe2a82756087c095a4317a469f616082d44286bb6
-SIZE (gnome2/totem-pl-parser-2.24.4.tar.bz2) = 621645
+MD5 (gnome2/totem-pl-parser-2.26.1.tar.bz2) = 269a003146eaca6b9af0b90ad592571f
+SHA256 (gnome2/totem-pl-parser-2.26.1.tar.bz2) = 448cb2b631b1a7b9a627627e7ea27d1bae7cf70496db58ab4467892a4c8c51ce
+SIZE (gnome2/totem-pl-parser-2.26.1.tar.bz2) = 632881
diff --git a/multimedia/totem-pl-parser/pkg-plist b/multimedia/totem-pl-parser/pkg-plist
index 37f9d0608852..18e2fccb0f27 100644
--- a/multimedia/totem-pl-parser/pkg-plist
+++ b/multimedia/totem-pl-parser/pkg-plist
@@ -13,7 +13,10 @@ lib/libtotem-plparser.so
lib/libtotem-plparser.so.12
libdata/pkgconfig/totem-plparser-mini.pc
libdata/pkgconfig/totem-plparser.pc
-%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/TotemPlParser.html
+%%DOCSDIR%%/api-index-deprecated.html
+%%DOCSDIR%%/api-index-full.html
+%%DOCSDIR%%/api-reference.html
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
@@ -21,12 +24,12 @@ libdata/pkgconfig/totem-plparser.pc
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/totem-pl-parser-totem-disc.html
-%%DOCSDIR%%/totem-pl-parser-totem-pl-parser.html
%%DOCSDIR%%/totem-pl-parser.devhelp
%%DOCSDIR%%/totem-pl-parser.devhelp2
%%DOCSDIR%%/up.png
share/locale/am/LC_MESSAGES/totem-pl-parser.mo
share/locale/ar/LC_MESSAGES/totem-pl-parser.mo
+share/locale/as/LC_MESSAGES/totem-pl-parser.mo
share/locale/az/LC_MESSAGES/totem-pl-parser.mo
share/locale/be/LC_MESSAGES/totem-pl-parser.mo
share/locale/be@latin/LC_MESSAGES/totem-pl-parser.mo
@@ -61,6 +64,7 @@ share/locale/is/LC_MESSAGES/totem-pl-parser.mo
share/locale/it/LC_MESSAGES/totem-pl-parser.mo
share/locale/ja/LC_MESSAGES/totem-pl-parser.mo
share/locale/ka/LC_MESSAGES/totem-pl-parser.mo
+share/locale/kn/LC_MESSAGES/totem-pl-parser.mo
share/locale/ko/LC_MESSAGES/totem-pl-parser.mo
share/locale/ku/LC_MESSAGES/totem-pl-parser.mo
share/locale/lt/LC_MESSAGES/totem-pl-parser.mo
@@ -78,6 +82,7 @@ share/locale/oc/LC_MESSAGES/totem-pl-parser.mo
share/locale/or/LC_MESSAGES/totem-pl-parser.mo
share/locale/pa/LC_MESSAGES/totem-pl-parser.mo
share/locale/pl/LC_MESSAGES/totem-pl-parser.mo
+share/locale/ps/LC_MESSAGES/totem-pl-parser.mo
share/locale/pt/LC_MESSAGES/totem-pl-parser.mo
share/locale/pt_BR/LC_MESSAGES/totem-pl-parser.mo
share/locale/ro/LC_MESSAGES/totem-pl-parser.mo
@@ -120,6 +125,8 @@ share/locale/zh_TW/LC_MESSAGES/totem-pl-parser.mo
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@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
@@ -134,3 +141,5 @@ share/locale/zh_TW/LC_MESSAGES/totem-pl-parser.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index d630663eaefa..d631230b3a24 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -3,11 +3,11 @@
# Whom: Hendrik Scholz <hendrik@scholz.net>
#
# $FreeBSD$
-# $MCom: ports/multimedia/totem/Makefile,v 1.118 2008/11/09 11:58:37 kwm Exp $
+# $MCom: ports/multimedia/totem/Makefile,v 1.126 2009/04/03 10:17:44 kwm Exp $
#
PORTNAME= totem
-PORTVERSION= 2.24.4
+PORTVERSION= 2.26.1
PORTREVISION?= 0
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
@@ -27,7 +27,7 @@ USE_PYTHON= yes
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils \
- nautiluscdburner ltverhack pygtk2
+ nautilus2 ltverhack pygtk2
GNOME_DESKTOP_VERSION=2
WANT_GSTREAMER= yes
INSTALLS_ICONS= yes
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 4b07ac80fdcb..0781cf6b0262 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-2.24.4.tar.bz2) = f5d96849a4ca0a4edce9bd6f62b93f7d
-SHA256 (gnome2/totem-2.24.4.tar.bz2) = 31d30ec19c11a22c9ce4d9923388a9c750c6afd92158a0070856a8e88aabaaa3
-SIZE (gnome2/totem-2.24.4.tar.bz2) = 2603181
+MD5 (gnome2/totem-2.26.1.tar.bz2) = 410d14957f48ae179c03e5c663607536
+SHA256 (gnome2/totem-2.26.1.tar.bz2) = 1f312290c68ddb4211ca338d7c41a06b57b39ebc242f2d0bdc135a8e88348237
+SIZE (gnome2/totem-2.26.1.tar.bz2) = 3084948
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 1f01058d5ea0..cd5233e3b045 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -2,9 +2,6 @@ bin/totem
bin/totem-audio-preview
bin/totem-video-indexer
bin/totem-video-thumbnailer
-%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-basic-plugin.a
-%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-basic-plugin.la
-%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-basic-plugin.so
%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.a
%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.la
%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.so
@@ -84,6 +81,24 @@ lib/totem/plugins/youtube/youtube.ui
%%BROWSER_PLUGINS%%libexec/totem-plugin-viewer
libexec/totem/totem-bugreport.py
share/applications/totem.desktop
+%%DOCSDIR%%/TotemCellRendererVideo.html
+%%DOCSDIR%%/TotemObject.html
+%%DOCSDIR%%/TotemPlugin.html
+%%DOCSDIR%%/TotemVideoList.html
+%%DOCSDIR%%/api-index-deprecated.html
+%%DOCSDIR%%/api-index-full.html
+%%DOCSDIR%%/core-api.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/totem-Interface.html
+%%DOCSDIR%%/totem.devhelp
+%%DOCSDIR%%/totem.devhelp2
+%%DOCSDIR%%/up.png
+%%DOCSDIR%%/widget-api.html
share/gnome/help/totem/C/figures/totem_next_button.png
share/gnome/help/totem/C/figures/totem_pause_button.png
share/gnome/help/totem/C/figures/totem_play_button.png
@@ -106,6 +121,15 @@ share/gnome/help/totem/ca/figures/totem_start_window.png
share/gnome/help/totem/ca/figures/totem_volume_maximum_button.png
share/gnome/help/totem/ca/figures/totem_volume_mute_button.png
share/gnome/help/totem/ca/totem.xml
+share/gnome/help/totem/cs/figures/totem_next_button.png
+share/gnome/help/totem/cs/figures/totem_pause_button.png
+share/gnome/help/totem/cs/figures/totem_play_button.png
+share/gnome/help/totem/cs/figures/totem_previous_button.png
+share/gnome/help/totem/cs/figures/totem_show_playlist_button.png
+share/gnome/help/totem/cs/figures/totem_start_window.png
+share/gnome/help/totem/cs/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/cs/figures/totem_volume_mute_button.png
+share/gnome/help/totem/cs/totem.xml
share/gnome/help/totem/de/figures/totem_next_button.png
share/gnome/help/totem/de/figures/totem_pause_button.png
share/gnome/help/totem/de/figures/totem_play_button.png
@@ -142,6 +166,15 @@ share/gnome/help/totem/es/figures/totem_start_window.png
share/gnome/help/totem/es/figures/totem_volume_maximum_button.png
share/gnome/help/totem/es/figures/totem_volume_mute_button.png
share/gnome/help/totem/es/totem.xml
+share/gnome/help/totem/eu/figures/totem_next_button.png
+share/gnome/help/totem/eu/figures/totem_pause_button.png
+share/gnome/help/totem/eu/figures/totem_play_button.png
+share/gnome/help/totem/eu/figures/totem_previous_button.png
+share/gnome/help/totem/eu/figures/totem_show_playlist_button.png
+share/gnome/help/totem/eu/figures/totem_start_window.png
+share/gnome/help/totem/eu/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/eu/figures/totem_volume_mute_button.png
+share/gnome/help/totem/eu/totem.xml
share/gnome/help/totem/fr/figures/totem_next_button.png
share/gnome/help/totem/fr/figures/totem_pause_button.png
share/gnome/help/totem/fr/figures/totem_play_button.png
@@ -251,14 +284,21 @@ share/gnome/help/totem/zh_TW/figures/totem_volume_maximum_button.png
share/gnome/help/totem/zh_TW/figures/totem_volume_mute_button.png
share/gnome/help/totem/zh_TW/totem.xml
share/icons/hicolor/16x16/apps/totem.png
+share/icons/hicolor/16x16/devices/totem-tv.png
share/icons/hicolor/22x22/apps/totem.png
+share/icons/hicolor/22x22/devices/totem-tv.png
share/icons/hicolor/24x24/apps/totem.png
+share/icons/hicolor/24x24/devices/totem-tv.png
share/icons/hicolor/32x32/apps/totem.png
+share/icons/hicolor/32x32/devices/totem-tv.png
share/icons/hicolor/48x48/apps/totem.png
+share/icons/hicolor/48x48/devices/totem-tv.png
share/icons/hicolor/scalable/apps/totem.svg
+share/icons/hicolor/scalable/devices/totem-tv.svg
share/locale/am/LC_MESSAGES/totem.mo
share/locale/ar/LC_MESSAGES/totem.mo
share/locale/as/LC_MESSAGES/totem.mo
+share/locale/ast/LC_MESSAGES/totem.mo
share/locale/az/LC_MESSAGES/totem.mo
share/locale/be/LC_MESSAGES/totem.mo
share/locale/be@latin/LC_MESSAGES/totem.mo
@@ -296,9 +336,9 @@ share/locale/ka/LC_MESSAGES/totem.mo
share/locale/kn/LC_MESSAGES/totem.mo
share/locale/ko/LC_MESSAGES/totem.mo
share/locale/ku/LC_MESSAGES/totem.mo
-share/locale/la/LC_MESSAGES/totem.mo
share/locale/lt/LC_MESSAGES/totem.mo
share/locale/lv/LC_MESSAGES/totem.mo
+share/locale/mai/LC_MESSAGES/totem.mo
share/locale/mg/LC_MESSAGES/totem.mo
share/locale/mk/LC_MESSAGES/totem.mo
share/locale/ml/LC_MESSAGES/totem.mo
@@ -312,6 +352,7 @@ share/locale/oc/LC_MESSAGES/totem.mo
share/locale/or/LC_MESSAGES/totem.mo
share/locale/pa/LC_MESSAGES/totem.mo
share/locale/pl/LC_MESSAGES/totem.mo
+share/locale/ps/LC_MESSAGES/totem.mo
share/locale/pt/LC_MESSAGES/totem.mo
share/locale/pt_BR/LC_MESSAGES/totem.mo
share/locale/ro/LC_MESSAGES/totem.mo
@@ -339,10 +380,12 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
share/omf/totem/totem-C.omf
share/omf/totem/totem-bg.omf
share/omf/totem/totem-ca.omf
+share/omf/totem/totem-cs.omf
share/omf/totem/totem-de.omf
share/omf/totem/totem-el.omf
share/omf/totem/totem-en_GB.omf
share/omf/totem/totem-es.omf
+share/omf/totem/totem-eu.omf
share/omf/totem/totem-fr.omf
share/omf/totem/totem-it.omf
share/omf/totem/totem-ja.omf
@@ -395,6 +438,8 @@ share/vala/vapi/totem.vapi
@dirrm share/gnome/help/totem/it
@dirrm share/gnome/help/totem/fr/figures
@dirrm share/gnome/help/totem/fr
+@dirrm share/gnome/help/totem/eu/figures
+@dirrm share/gnome/help/totem/eu
@dirrm share/gnome/help/totem/es/figures
@dirrm share/gnome/help/totem/es
@dirrm share/gnome/help/totem/en_GB/figures
@@ -403,6 +448,8 @@ share/vala/vapi/totem.vapi
@dirrm share/gnome/help/totem/el
@dirrm share/gnome/help/totem/de/figures
@dirrm share/gnome/help/totem/de
+@dirrm share/gnome/help/totem/cs/figures
+@dirrm share/gnome/help/totem/cs
@dirrm share/gnome/help/totem/ca/figures
@dirrm share/gnome/help/totem/ca
@dirrm share/gnome/help/totem/bg/figures
@@ -410,6 +457,7 @@ share/vala/vapi/totem.vapi
@dirrm share/gnome/help/totem/C/figures
@dirrm share/gnome/help/totem/C
@dirrm share/gnome/help/totem
+@dirrm %%DOCSDIR%%
@dirrmtry share/applications
@dirrm libexec/totem
@dirrm lib/totem/plugins/youtube
@@ -444,12 +492,16 @@ share/vala/vapi/totem.vapi
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@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/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@@ -458,5 +510,7 @@ share/vala/vapi/totem.vapi
@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/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index ec85bf3811bf..b169ad98e5b7 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ayttm
PORTVERSION= 0.5.0.45
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
@@ -54,10 +55,12 @@ post-patch:
@${REINPLACE_CMD} -e 's|-L/usr/local/lib||g ; \
s|-lpthread|${PTHREAD_LIBS}|g ; \
/CFLAGS=/s|-pthread|${PTHREAD_CFLAGS}|g ; \
+ s|-DGTK_DISABLE_DEPRECATED||g ; \
/LIBS=/s|-L/usr/X11R6/lib||g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e \
's|/gnome/apps/Internet|/applications|g' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e \
- 's|-L/usr/local/lib/pth/||g' ${WRKSRC}/src/Makefile.in
+ 's|-L/usr/local/lib/pth/||g ; \
+ s|-lproxy|../libproxy/libproxy.a|g' ${WRKSRC}/src/Makefile.in
.include <bsd.port.post.mk>
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index 0b30f438ca4b..627e6e19ba2e 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net-im/empathy/Makefile,v 1.16 2008/10/20 23:38:20 kwm Exp $
+# $MCom: ports/net-im/empathy/Makefile,v 1.22 2009/03/30 19:03:24 marcus Exp $
PORTNAME= empathy
-PORTVERSION= 2.24.1
+PORTVERSION= 2.26.0.1
CATEGORIES= net-im gnome
MASTER_SITES= GNOME
@@ -16,7 +16,10 @@ COMMENT= GNOME IM client based around telepathy
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
LIB_DEPENDS= missioncontrol-server.1:${PORTSDIR}/net-im/telepathy-mission-control \
aspell.16:${PORTSDIR}/textproc/aspell \
- telepathy.2:${PORTSDIR}/net-im/libtelepathy
+ telepathy.2:${PORTSDIR}/net-im/libtelepathy \
+ telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
+ telepathy-farsight.0:${PORTSDIR}/net-im/telepathy-farsight \
+ canberra-gtk.0:${PORTSDIR}/audio/libcanberra
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
USE_GMAKE= yes
@@ -25,6 +28,7 @@ USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_GNOME= evolutiondataserver gnomehack gnomeprefix pygtk2 ltverhack \
gnomepanel
+USE_GSTREAMER= yes
USE_AUTOTOOLS= libtool:15
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
@@ -65,7 +69,7 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-haze:${PORTSDIR}/net-im/telepathy-h
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|$${datadir}/gtk-doc/html|${DOCSDIR}|' \
- ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|$${datadir}/gtk-doc/html|${DOCSDIR}|g ; \
+ s|-Werror||g' ${WRKSRC}/configure
.include <bsd.port.post.mk>
diff --git a/net-im/empathy/distinfo b/net-im/empathy/distinfo
index 756da0a564c4..8bd4e142df70 100644
--- a/net-im/empathy/distinfo
+++ b/net-im/empathy/distinfo
@@ -1,3 +1,3 @@
-MD5 (empathy-2.24.1.tar.bz2) = 98d1ef485b23a75a9a115547ca2da66a
-SHA256 (empathy-2.24.1.tar.bz2) = 24b675e389fb91898bd2924f8b35db7e7aef4c40bbb69412e445048dd9e18123
-SIZE (empathy-2.24.1.tar.bz2) = 1761446
+MD5 (empathy-2.26.0.1.tar.bz2) = e3b0e891c7eac3d6f3eb85373a6f4e25
+SHA256 (empathy-2.26.0.1.tar.bz2) = 02c5648cf48ddd726aba4a484b8c2317af846f9c01d61e2b3700f30e8944b390
+SIZE (empathy-2.26.0.1.tar.bz2) = 2181144
diff --git a/net-im/empathy/pkg-plist b/net-im/empathy/pkg-plist
index e90370f07944..24d08c2c8b0e 100644
--- a/net-im/empathy/pkg-plist
+++ b/net-im/empathy/pkg-plist
@@ -4,11 +4,14 @@ include/libempathy-gtk/empathy-account-chooser.h
include/libempathy-gtk/empathy-account-widget-irc.h
include/libempathy-gtk/empathy-account-widget-sip.h
include/libempathy-gtk/empathy-account-widget.h
+include/libempathy-gtk/empathy-audio-sink.h
+include/libempathy-gtk/empathy-audio-src.h
include/libempathy-gtk/empathy-avatar-chooser.h
include/libempathy-gtk/empathy-avatar-image.h
include/libempathy-gtk/empathy-cell-renderer-activatable.h
include/libempathy-gtk/empathy-cell-renderer-expander.h
include/libempathy-gtk/empathy-cell-renderer-text.h
+include/libempathy-gtk/empathy-chat-text-view.h
include/libempathy-gtk/empathy-chat-view.h
include/libempathy-gtk/empathy-chat.h
include/libempathy-gtk/empathy-conf.h
@@ -16,6 +19,7 @@ include/libempathy-gtk/empathy-contact-dialogs.h
include/libempathy-gtk/empathy-contact-list-store.h
include/libempathy-gtk/empathy-contact-list-view.h
include/libempathy-gtk/empathy-contact-menu.h
+include/libempathy-gtk/empathy-contact-selector.h
include/libempathy-gtk/empathy-contact-widget.h
include/libempathy-gtk/empathy-geometry.h
include/libempathy-gtk/empathy-gtk-enum-types.h
@@ -31,16 +35,22 @@ include/libempathy-gtk/empathy-spell.h
include/libempathy-gtk/empathy-theme-boxes.h
include/libempathy-gtk/empathy-theme-irc.h
include/libempathy-gtk/empathy-theme-manager.h
-include/libempathy-gtk/empathy-theme.h
include/libempathy-gtk/empathy-ui-utils.h
+include/libempathy-gtk/empathy-video-src.h
+include/libempathy-gtk/empathy-video-widget.h
+include/libempathy/empathy-account-manager.h
+include/libempathy/empathy-call-factory.h
+include/libempathy/empathy-call-handler.h
include/libempathy/empathy-chatroom-manager.h
include/libempathy/empathy-chatroom.h
include/libempathy/empathy-contact-factory.h
include/libempathy/empathy-contact-groups.h
include/libempathy/empathy-contact-list.h
include/libempathy/empathy-contact-manager.h
+include/libempathy/empathy-contact-monitor.h
include/libempathy/empathy-contact.h
include/libempathy/empathy-debug.h
+include/libempathy/empathy-dispatch-operation.h
include/libempathy/empathy-dispatcher.h
include/libempathy/empathy-enum-types.h
include/libempathy/empathy-idle.h
@@ -48,6 +58,8 @@ include/libempathy/empathy-irc-network-manager.h
include/libempathy/empathy-irc-network.h
include/libempathy/empathy-irc-server.h
include/libempathy/empathy-log-manager.h
+include/libempathy/empathy-log-store-empathy.h
+include/libempathy/empathy-log-store.h
include/libempathy/empathy-message.h
include/libempathy/empathy-status-presets.h
include/libempathy/empathy-time.h
@@ -55,19 +67,21 @@ include/libempathy/empathy-tp-call.h
include/libempathy/empathy-tp-chat.h
include/libempathy/empathy-tp-contact-factory.h
include/libempathy/empathy-tp-contact-list.h
+include/libempathy/empathy-tp-file.h
include/libempathy/empathy-tp-group.h
include/libempathy/empathy-tp-roomlist.h
include/libempathy/empathy-tp-tube.h
include/libempathy/empathy-tube-handler.h
+include/libempathy/empathy-types.h
include/libempathy/empathy-utils.h
lib/libempathy-gtk.a
lib/libempathy-gtk.la
lib/libempathy-gtk.so
-lib/libempathy-gtk.so.15
+lib/libempathy-gtk.so.19
lib/libempathy.a
lib/libempathy.la
lib/libempathy.so
-lib/libempathy.so.14
+lib/libempathy.so.23
%%PYTHON_SITELIBDIR%%/empathy.a
%%PYTHON_SITELIBDIR%%/empathy.la
%%PYTHON_SITELIBDIR%%/empathy.so
@@ -88,16 +102,20 @@ share/doc/libempathy-gtk/EmpathyCellRendererActivatable.html
share/doc/libempathy-gtk/EmpathyCellRendererExpander.html
share/doc/libempathy-gtk/EmpathyCellRendererText.html
share/doc/libempathy-gtk/EmpathyChat.html
-share/doc/libempathy-gtk/EmpathyChatView.html
+share/doc/libempathy-gtk/EmpathyChatTextView.html
share/doc/libempathy-gtk/EmpathyConf.html
share/doc/libempathy-gtk/EmpathyContactListStore.html
share/doc/libempathy-gtk/EmpathyContactListView.html
+share/doc/libempathy-gtk/EmpathyContactSelector.html
+share/doc/libempathy-gtk/EmpathyGstAudioSink.html
+share/doc/libempathy-gtk/EmpathyGstAudioSrc.html
+share/doc/libempathy-gtk/EmpathyGstVideoSrc.html
share/doc/libempathy-gtk/EmpathyPresenceChooser.html
share/doc/libempathy-gtk/EmpathySmileyManager.html
-share/doc/libempathy-gtk/EmpathyTheme.html
share/doc/libempathy-gtk/EmpathyThemeBoxes.html
share/doc/libempathy-gtk/EmpathyThemeIrc.html
share/doc/libempathy-gtk/EmpathyThemeManager.html
+share/doc/libempathy-gtk/EmpathyVideoWidget.html
share/doc/libempathy-gtk/home.png
share/doc/libempathy-gtk/index.html
share/doc/libempathy-gtk/index.sgml
@@ -106,6 +124,7 @@ share/doc/libempathy-gtk/left.png
share/doc/libempathy-gtk/libempathy-gtk-empathy-account-widget-irc.html
share/doc/libempathy-gtk/libempathy-gtk-empathy-account-widget-sip.html
share/doc/libempathy-gtk/libempathy-gtk-empathy-account-widget.html
+share/doc/libempathy-gtk/libempathy-gtk-empathy-chat-view.html
share/doc/libempathy-gtk/libempathy-gtk-empathy-contact-dialogs.html
share/doc/libempathy-gtk/libempathy-gtk-empathy-contact-menu.html
share/doc/libempathy-gtk/libempathy-gtk-empathy-contact-widget.html
@@ -127,22 +146,29 @@ share/doc/libempathy-gtk/pt02.html
share/doc/libempathy-gtk/right.png
share/doc/libempathy-gtk/style.css
share/doc/libempathy-gtk/up.png
+share/doc/libempathy/EmpathyAccountManager.html
+share/doc/libempathy/EmpathyCallFactory.html
+share/doc/libempathy/EmpathyCallHandler.html
share/doc/libempathy/EmpathyChatroom.html
share/doc/libempathy/EmpathyChatroomManager.html
share/doc/libempathy/EmpathyContact.html
share/doc/libempathy/EmpathyContactFactory.html
share/doc/libempathy/EmpathyContactManager.html
+share/doc/libempathy/EmpathyContactMonitor.html
share/doc/libempathy/EmpathyDispatcher.html
+share/doc/libempathy/EmpathyDispatchOperation.html
share/doc/libempathy/EmpathyIdle.html
share/doc/libempathy/EmpathyIrcNetwork.html
share/doc/libempathy/EmpathyIrcNetworkManager.html
share/doc/libempathy/EmpathyIrcServer.html
share/doc/libempathy/EmpathyLogManager.html
+share/doc/libempathy/EmpathyLogStoreEmpathy.html
share/doc/libempathy/EmpathyMessage.html
share/doc/libempathy/EmpathyTpCall.html
share/doc/libempathy/EmpathyTpChat.html
share/doc/libempathy/EmpathyTpContactFactory.html
share/doc/libempathy/EmpathyTpContactList.html
+share/doc/libempathy/EmpathyTpFile.html
share/doc/libempathy/EmpathyTpGroup.html
share/doc/libempathy/EmpathyTpRoomlist.html
share/doc/libempathy/EmpathyTpTube.html
@@ -154,8 +180,11 @@ share/doc/libempathy/ix01.html
share/doc/libempathy/left.png
share/doc/libempathy/libempathy-empathy-contact-groups.html
share/doc/libempathy/libempathy-empathy-contact-list.html
+share/doc/libempathy/libempathy-empathy-enum-types.html
+share/doc/libempathy/libempathy-empathy-log-store.html
share/doc/libempathy/libempathy-empathy-status-presets.html
share/doc/libempathy/libempathy-empathy-time.html
+share/doc/libempathy/libempathy-empathy-types.html
share/doc/libempathy/libempathy-empathy-utils.html
share/doc/libempathy/libempathy-hierarchy.html
share/doc/libempathy/libempathy.devhelp
@@ -187,7 +216,9 @@ share/doc/libempathy/up.png
%%DATADIR%%/empathy-contact-dialogs.glade
%%DATADIR%%/empathy-contact-groups.dtd
%%DATADIR%%/empathy-contact-widget.glade
+%%DATADIR%%/empathy-ft-manager.glade
%%DATADIR%%/empathy-irc-networks.dtd
+%%DATADIR%%/empathy-import-dialog.glade
%%DATADIR%%/empathy-log-manager.xsl
%%DATADIR%%/empathy-log-window.glade
%%DATADIR%%/empathy-main-window.glade
@@ -283,6 +314,7 @@ share/doc/libempathy/up.png
%%DATADIR%%/icons/hicolor/48x48/status/empathy-extended-away.png
%%DATADIR%%/icons/hicolor/48x48/status/empathy-offline.png
%%DATADIR%%/icons/hicolor/48x48/status/empathy-pending.png
+%%DATADIR%%/icons/hicolor/icon-theme.cache
%%DATADIR%%/icons/hicolor/scalable/apps/im-ekiga.svg
%%DATADIR%%/icons/hicolor/scalable/apps/im-gadugadu.svg
%%DATADIR%%/icons/hicolor/scalable/apps/im-gizmo.svg
@@ -302,23 +334,33 @@ share/doc/libempathy/up.png
%%DATADIR%%/irc-networks.xml
share/gnome/help/empathy/C/empathy.xml
share/gnome/help/empathy/C/figures/empathy-main-window.png
-share/gnome/help/empathy/C/figures/empathy-new-account.png
share/gnome/help/empathy/C/legal.xml
+share/gnome/help/empathy/ca/empathy.xml
+share/gnome/help/empathy/ca/figures/empathy-main-window.png
+share/gnome/help/empathy/ca/figures/empathy-new-account.png
share/gnome/help/empathy/cs/empathy.xml
share/gnome/help/empathy/cs/figures/empathy-main-window.png
-share/gnome/help/empathy/cs/figures/empathy-new-account.png
share/gnome/help/empathy/de/empathy.xml
share/gnome/help/empathy/de/figures/empathy-main-window.png
share/gnome/help/empathy/de/figures/empathy-new-account.png
+share/gnome/help/empathy/el/empathy.xml
+share/gnome/help/empathy/el/figures/empathy-main-window.png
+share/gnome/help/empathy/el/figures/empathy-new-account.png
+share/gnome/help/empathy/en_GB/empathy.xml
+share/gnome/help/empathy/en_GB/figures/empathy-main-window.png
share/gnome/help/empathy/es/empathy.xml
share/gnome/help/empathy/es/figures/empathy-main-window.png
share/gnome/help/empathy/es/figures/empathy-new-account.png
+share/gnome/help/empathy/fi/empathy.xml
+share/gnome/help/empathy/fi/figures/empathy-main-window.png
+share/gnome/help/empathy/fi/figures/empathy-new-account.png
share/gnome/help/empathy/fr/empathy.xml
share/gnome/help/empathy/fr/figures/empathy-main-window.png
share/gnome/help/empathy/fr/figures/empathy-new-account.png
share/gnome/help/empathy/it/empathy.xml
share/gnome/help/empathy/it/figures/empathy-main-window.png
-share/gnome/help/empathy/it/figures/empathy-new-account.png
+share/gnome/help/empathy/ru/empathy.xml
+share/gnome/help/empathy/ru/figures/empathy-main-window.png
share/gnome/help/empathy/sv/empathy.xml
share/gnome/help/empathy/sv/figures/empathy-main-window.png
share/gnome/help/empathy/sv/figures/empathy-new-account.png
@@ -329,7 +371,9 @@ share/icons/hicolor/32x32/apps/empathy.png
share/icons/hicolor/48x48/apps/empathy.png
share/icons/hicolor/scalable/apps/empathy.svg
share/locale/ar/LC_MESSAGES/empathy.mo
+share/locale/as/LC_MESSAGES/empathy.mo
share/locale/az/LC_MESSAGES/empathy.mo
+share/locale/be@latin/LC_MESSAGES/empathy.mo
share/locale/bg/LC_MESSAGES/empathy.mo
share/locale/bn_IN/LC_MESSAGES/empathy.mo
share/locale/ca/LC_MESSAGES/empathy.mo
@@ -357,7 +401,10 @@ share/locale/it/LC_MESSAGES/empathy.mo
share/locale/ja/LC_MESSAGES/empathy.mo
share/locale/kn/LC_MESSAGES/empathy.mo
share/locale/ko/LC_MESSAGES/empathy.mo
+share/locale/ku/LC_MESSAGES/empathy.mo
share/locale/lt/LC_MESSAGES/empathy.mo
+share/locale/lv/LC_MESSAGES/empathy.mo
+share/locale/mai/LC_MESSAGES/empathy.mo
share/locale/mk/LC_MESSAGES/empathy.mo
share/locale/ml/LC_MESSAGES/empathy.mo
share/locale/mr/LC_MESSAGES/empathy.mo
@@ -366,16 +413,21 @@ share/locale/nb/LC_MESSAGES/empathy.mo
share/locale/ne/LC_MESSAGES/empathy.mo
share/locale/nl/LC_MESSAGES/empathy.mo
share/locale/oc/LC_MESSAGES/empathy.mo
+share/locale/or/LC_MESSAGES/empathy.mo
share/locale/pa/LC_MESSAGES/empathy.mo
share/locale/pl/LC_MESSAGES/empathy.mo
+share/locale/ps/LC_MESSAGES/empathy.mo
share/locale/pt/LC_MESSAGES/empathy.mo
share/locale/pt_BR/LC_MESSAGES/empathy.mo
+share/locale/ro/LC_MESSAGES/empathy.mo
share/locale/ru/LC_MESSAGES/empathy.mo
share/locale/sl/LC_MESSAGES/empathy.mo
share/locale/sq/LC_MESSAGES/empathy.mo
share/locale/sr/LC_MESSAGES/empathy.mo
share/locale/sr@latin/LC_MESSAGES/empathy.mo
share/locale/sv/LC_MESSAGES/empathy.mo
+share/locale/ta/LC_MESSAGES/empathy.mo
+share/locale/te/LC_MESSAGES/empathy.mo
share/locale/th/LC_MESSAGES/empathy.mo
share/locale/tr/LC_MESSAGES/empathy.mo
share/locale/uk/LC_MESSAGES/empathy.mo
@@ -400,27 +452,42 @@ share/mission-control/profiles/sipphone.profile
share/mission-control/profiles/sofiasip.profile
share/mission-control/profiles/yahoo.profile
share/omf/empathy/empathy-C.omf
+share/omf/empathy/empathy-ca.omf
share/omf/empathy/empathy-cs.omf
share/omf/empathy/empathy-de.omf
+share/omf/empathy/empathy-el.omf
+share/omf/empathy/empathy-en_GB.omf
share/omf/empathy/empathy-es.omf
+share/omf/empathy/empathy-fi.omf
share/omf/empathy/empathy-fr.omf
share/omf/empathy/empathy-it.omf
+share/omf/empathy/empathy-ru.omf
share/omf/empathy/empathy-sv.omf
@dirrm share/omf/empathy
@dirrm share/mission-control/profiles
@dirrm share/mission-control
@dirrm share/gnome/help/empathy/sv/figures
@dirrm share/gnome/help/empathy/sv
+@dirrm share/gnome/help/empathy/ru/figures
+@dirrm share/gnome/help/empathy/ru
@dirrm share/gnome/help/empathy/it/figures
@dirrm share/gnome/help/empathy/it
@dirrm share/gnome/help/empathy/fr/figures
@dirrm share/gnome/help/empathy/fr
+@dirrm share/gnome/help/empathy/fi/figures
+@dirrm share/gnome/help/empathy/fi
@dirrm share/gnome/help/empathy/es/figures
@dirrm share/gnome/help/empathy/es
+@dirrm share/gnome/help/empathy/en_GB/figures
+@dirrm share/gnome/help/empathy/en_GB
+@dirrm share/gnome/help/empathy/el/figures
+@dirrm share/gnome/help/empathy/el
@dirrm share/gnome/help/empathy/de/figures
@dirrm share/gnome/help/empathy/de
@dirrm share/gnome/help/empathy/cs/figures
@dirrm share/gnome/help/empathy/cs
+@dirrm share/gnome/help/empathy/ca/figures
+@dirrm share/gnome/help/empathy/ca
@dirrm share/gnome/help/empathy/C/figures
@dirrm share/gnome/help/empathy/C
@dirrm share/gnome/help/empathy
@@ -455,13 +522,25 @@ share/omf/empathy/empathy-sv.omf
@dirrm include/libempathy
@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/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/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@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/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 0b7b3de5c126..7f14c35a3604 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/gnome-netstatus/Makefile,v 1.50 2008/09/22 23:33:17 kwm Exp $
+# $MCom: ports/net/gnome-netstatus/Makefile,v 1.52 2009/03/08 19:32:04 marcus Exp $
#
PORTNAME= gnome-netstatus
-PORTVERSION= 2.12.2
+PORTVERSION= 2.26.0
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo
index 72f18f1c2715..818e6650a3e8 100644
--- a/net/gnome-netstatus/distinfo
+++ b/net/gnome-netstatus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-netstatus-2.12.2.tar.bz2) = f1f9e18b48d46adb32c9002e4325f80e
-SHA256 (gnome2/gnome-netstatus-2.12.2.tar.bz2) = 50c8b1abe1e5d813cf651bf12d1b39b00b22fadc0ee886135e5f9a08e3969943
-SIZE (gnome2/gnome-netstatus-2.12.2.tar.bz2) = 525222
+MD5 (gnome2/gnome-netstatus-2.26.0.tar.bz2) = f116157535ec185f0ea7503fafc5edd6
+SHA256 (gnome2/gnome-netstatus-2.26.0.tar.bz2) = 17169ef602037ac40e5d6b43a7add0593c9fe3f04da65aa06d70c59bc6bbccd8
+SIZE (gnome2/gnome-netstatus-2.26.0.tar.bz2) = 552061
diff --git a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
index dca19039a579..0c9c78b83b65 100644
--- a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
+++ b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
@@ -1,5 +1,5 @@
---- src/netstatus-sysdeps.c.orig 2007-02-13 04:39:19.000000000 -0500
-+++ src/netstatus-sysdeps.c 2008-04-23 13:07:24.000000000 -0400
+--- src/netstatus-sysdeps.c.orig 2009-03-08 00:25:52.000000000 -0500
++++ src/netstatus-sysdeps.c 2009-03-08 15:24:33.000000000 -0400
@@ -37,13 +37,26 @@
#ifdef __FreeBSD__
@@ -162,24 +162,24 @@
*signal_strength = 0;
+#if __FreeBSD_version < 800036
- if (g_strncasecmp (iface, "an", 2) &&
- g_strncasecmp (iface, "wi", 2) &&
- g_strncasecmp (iface, "ath", 3) &&
- g_strncasecmp (iface, "ndis", 4) &&
-+ g_strncasecmp (iface, "ural", 4) &&
-+ g_strncasecmp (iface, "ral", 3) &&
- g_strncasecmp (iface, "ipw", 3) &&
- g_strncasecmp (iface, "iwi", 3) &&
-+ g_strncasecmp (iface, "rum", 3) &&
-+ g_strncasecmp (iface, "ray", 3) &&
- g_strncasecmp (iface, "acx", 3))
+ if (g_ascii_strncasecmp (iface, "an", 2) &&
+ g_ascii_strncasecmp (iface, "wi", 2) &&
+ g_ascii_strncasecmp (iface, "ath", 3) &&
+ g_ascii_strncasecmp (iface, "ndis", 4) &&
++ g_ascii_strncasecmp (iface, "ural", 4) &&
++ g_ascii_strncasecmp (iface, "ral", 3) &&
+ g_ascii_strncasecmp (iface, "ipw", 3) &&
+ g_ascii_strncasecmp (iface, "iwi", 3) &&
++ g_ascii_strncasecmp (iface, "rum", 3) &&
++ g_ascii_strncasecmp (iface, "ray", 3) &&
+ g_ascii_strncasecmp (iface, "acx", 3))
+#else
+ if (g_strncasecmp (iface, "wlan", 4))
+#endif
return error_message;
+#if __FreeBSD_version < 700046
- if (g_strncasecmp (iface, "an", 2) == 0)
+ if (g_ascii_strncasecmp (iface, "an", 2) == 0)
{
error_message = get_an_data (iface, signal_strength);
*is_wireless = TRUE;
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
index 9cb23623a744..b3c64e8bcbd5 100644
--- a/net/gnome-netstatus/pkg-plist
+++ b/net/gnome-netstatus/pkg-plist
@@ -32,6 +32,13 @@ share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-tx.png
share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-txrx.png
share/gnome/help/gnome-netstatus/de/gnome-netstatus.xml
share/gnome/help/gnome-netstatus/de/legal.xml
+share/gnome/help/gnome-netstatus/el/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/el/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/el/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/el/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/el/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/el/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/el/gnome-netstatus.xml
share/gnome/help/gnome-netstatus/en_GB/figures/gnome-netstatus-disconn.png
share/gnome/help/gnome-netstatus/en_GB/figures/gnome-netstatus-error.png
share/gnome/help/gnome-netstatus/en_GB/figures/gnome-netstatus-idle.png
@@ -153,6 +160,7 @@ share/omf/gnome-netstatus/gnome-netstatus-C.omf
share/omf/gnome-netstatus/gnome-netstatus-ca.omf
share/omf/gnome-netstatus/gnome-netstatus-bg.omf
share/omf/gnome-netstatus/gnome-netstatus-de.omf
+share/omf/gnome-netstatus/gnome-netstatus-el.omf
share/omf/gnome-netstatus/gnome-netstatus-en_GB.omf
share/omf/gnome-netstatus/gnome-netstatus-es.omf
share/omf/gnome-netstatus/gnome-netstatus-fr.omf
@@ -182,11 +190,13 @@ share/icons/hicolor/48x48/apps/gnome-netstatus-txrx.png
share/locale/af/LC_MESSAGES/gnome-netstatus.mo
share/locale/ar/LC_MESSAGES/gnome-netstatus.mo
share/locale/az/LC_MESSAGES/gnome-netstatus.mo
+share/locale/be@latin/LC_MESSAGES/gnome-netstatus.mo
share/locale/bg/LC_MESSAGES/gnome-netstatus.mo
share/locale/bn/LC_MESSAGES/gnome-netstatus.mo
share/locale/bn_IN/LC_MESSAGES/gnome-netstatus.mo
share/locale/bs/LC_MESSAGES/gnome-netstatus.mo
share/locale/ca/LC_MESSAGES/gnome-netstatus.mo
+share/locale/crh/LC_MESSAGES/gnome-netstatus.mo
share/locale/cs/LC_MESSAGES/gnome-netstatus.mo
share/locale/cy/LC_MESSAGES/gnome-netstatus.mo
share/locale/da/LC_MESSAGES/gnome-netstatus.mo
@@ -215,9 +225,12 @@ share/locale/it/LC_MESSAGES/gnome-netstatus.mo
share/locale/ja/LC_MESSAGES/gnome-netstatus.mo
share/locale/ka/LC_MESSAGES/gnome-netstatus.mo
share/locale/kn/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ku/LC_MESSAGES/gnome-netstatus.mo
share/locale/ko/LC_MESSAGES/gnome-netstatus.mo
share/locale/lt/LC_MESSAGES/gnome-netstatus.mo
share/locale/lv/LC_MESSAGES/gnome-netstatus.mo
+share/locale/mg/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ml/LC_MESSAGES/gnome-netstatus.mo
share/locale/mn/LC_MESSAGES/gnome-netstatus.mo
share/locale/mr/LC_MESSAGES/gnome-netstatus.mo
share/locale/ms/LC_MESSAGES/gnome-netstatus.mo
@@ -226,19 +239,23 @@ share/locale/ne/LC_MESSAGES/gnome-netstatus.mo
share/locale/nl/LC_MESSAGES/gnome-netstatus.mo
share/locale/nn/LC_MESSAGES/gnome-netstatus.mo
share/locale/oc/LC_MESSAGES/gnome-netstatus.mo
+share/locale/or/LC_MESSAGES/gnome-netstatus.mo
share/locale/pa/LC_MESSAGES/gnome-netstatus.mo
share/locale/pl/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ps/LC_MESSAGES/gnome-netstatus.mo
share/locale/pt/LC_MESSAGES/gnome-netstatus.mo
share/locale/pt_BR/LC_MESSAGES/gnome-netstatus.mo
share/locale/ro/LC_MESSAGES/gnome-netstatus.mo
share/locale/ru/LC_MESSAGES/gnome-netstatus.mo
share/locale/rw/LC_MESSAGES/gnome-netstatus.mo
share/locale/sk/LC_MESSAGES/gnome-netstatus.mo
+share/locale/sl/LC_MESSAGES/gnome-netstatus.mo
share/locale/sq/LC_MESSAGES/gnome-netstatus.mo
share/locale/sr/LC_MESSAGES/gnome-netstatus.mo
share/locale/sr@latin/LC_MESSAGES/gnome-netstatus.mo
share/locale/sv/LC_MESSAGES/gnome-netstatus.mo
share/locale/ta/LC_MESSAGES/gnome-netstatus.mo
+share/locale/te/LC_MESSAGES/gnome-netstatus.mo
share/locale/th/LC_MESSAGES/gnome-netstatus.mo
share/locale/tr/LC_MESSAGES/gnome-netstatus.mo
share/locale/uk/LC_MESSAGES/gnome-netstatus.mo
@@ -248,6 +265,7 @@ share/locale/vi/LC_MESSAGES/gnome-netstatus.mo
share/locale/wa/LC_MESSAGES/gnome-netstatus.mo
share/locale/xh/LC_MESSAGES/gnome-netstatus.mo
share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-netstatus.mo
share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
@dirrm share/omf/gnome-netstatus
@dirrm share/gnome/help/gnome-netstatus/zh_TW/figures
@@ -282,6 +300,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
@dirrm share/gnome/help/gnome-netstatus/es
@dirrm share/gnome/help/gnome-netstatus/en_GB/figures
@dirrm share/gnome/help/gnome-netstatus/en_GB
+@dirrm share/gnome/help/gnome-netstatus/el/figures
+@dirrm share/gnome/help/gnome-netstatus/el
@dirrm share/gnome/help/gnome-netstatus/de/figures
@dirrm share/gnome/help/gnome-netstatus/de
@dirrm share/gnome/help/gnome-netstatus/ca/figures
@@ -292,21 +312,35 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
@dirrm share/gnome/help/gnome-netstatus/C
@dirrm share/gnome/help/gnome-netstatus
@dirrm share/gnome-netstatus
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
@dirrmtry share/locale/uz@cyrillic
+@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/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/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 328b54c1acc1..26c071b3d45e 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/gnome-nettool/Makefile,v 1.44 2008/09/22 23:38:56 kwm Exp $
+# $MCom: ports/net/gnome-nettool/Makefile,v 1.50 2009/04/01 04:33:15 marcus Exp $
#
PORTNAME= gnome-nettool
-PORTVERSION= 2.22.1
-PORTEPOCH= 1
+PORTVERSION= 2.26.1
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,6 +15,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A GNOME utility that provides network information statistics
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop
+
USE_BZIP2= yes
USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
USE_GMAKE= yes
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index dcc612d6ddbd..6f4d384b5012 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-nettool-2.22.1.tar.bz2) = afcaff8ebc76b5f352902ed424dc2856
-SHA256 (gnome2/gnome-nettool-2.22.1.tar.bz2) = 90938c337575ce0f008a46a9f89f24bc6c04f5384337475fe3d5b960594c31b1
-SIZE (gnome2/gnome-nettool-2.22.1.tar.bz2) = 600085
+MD5 (gnome2/gnome-nettool-2.26.1.tar.bz2) = 476a0ffe807cfc374732d944efc83058
+SHA256 (gnome2/gnome-nettool-2.26.1.tar.bz2) = d8e71f2df9da5d5ba38c408f7646e92a89acc9a4a6af791cd1e9256c9b3af08f
+SIZE (gnome2/gnome-nettool-2.26.1.tar.bz2) = 611892
diff --git a/net/gnome-nettool/files/patch-src_info.c b/net/gnome-nettool/files/patch-src_info.c
index 74eb698a4665..88a107e6f825 100644
--- a/net/gnome-nettool/files/patch-src_info.c
+++ b/net/gnome-nettool/files/patch-src_info.c
@@ -1,5 +1,5 @@
---- src/info.c.orig Fri Dec 1 10:36:15 2006
-+++ src/info.c Mon Dec 18 17:32:19 2006
+--- src/info.c.orig 2008-12-08 23:29:39.000000000 -0500
++++ src/info.c 2009-02-27 16:33:49.000000000 -0500
@@ -20,6 +20,10 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
@@ -11,19 +11,17 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
-@@ -38,6 +42,11 @@
+@@ -37,6 +41,9 @@
#include <sys/ioctl.h>
#include <stdlib.h>
#include <net/if.h>
+#ifdef __FreeBSD__
-+#include <sys/sysctl.h>
-+#include <net/if_dl.h>
+#include <net/if_media.h>
+#endif
- #include "info.h"
- #include "utils.h"
-@@ -58,6 +67,7 @@ static InfoInterfaceDescription info_ifa
+ #include <glibtop.h>
+ #include <glibtop/netlist.h>
+@@ -61,6 +68,7 @@ static InfoInterfaceDescription info_ifa
{ N_("Ethernet Interface"), INFO_INTERFACE_ETH, "16_ethernet.xpm", "eth", NULL },
{ N_("Wireless Interface"), INFO_INTERFACE_WLAN, "wavelan-16.png", "wlan", NULL },
{ N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "ppp", NULL },
@@ -31,7 +29,7 @@
{ N_("Parallel Line Interface"), INFO_INTERFACE_PLIP, "16_plip.xpm", "plip", NULL },
{ N_("Infrared Interface"), INFO_INTERFACE_IRLAN, "irda-16.png", "irlan", NULL },
{ N_("Loopback Interface"), INFO_INTERFACE_LO, "16_loopback.xpm", "lo", NULL },
-@@ -128,9 +138,42 @@ info_get_interface_from_dev_name (const
+@@ -131,9 +139,42 @@ info_get_interface_from_dev_name (const
{
gint i;
gchar *path;
@@ -76,184 +74,3 @@
(*iface) = g_strdup_printf ("%s (%s)", _(info_iface_desc[i].name), dev_name);
if (info_iface_desc[i].pixbuf == NULL) {
path = g_build_filename (PIXMAPS_DIR, info_iface_desc[i].icon, NULL);
-@@ -218,38 +261,87 @@ info_nic_update_stats (gpointer data)
- gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10];
- */
- gchar iface[30]; /*, flags[30]; */
-- gchar rx_bytes[16], rx_pkt[10], rx_error[10], rx_drop[10], rx_fifo[10];
-- gchar frame[10], compressed[10], multicast[10];
-- gchar tx_bytes[16], tx_pkt[10], tx_error[10], tx_drop[10], tx_fifo[10];
-+ gchar rx_bytes[16], rx_pkt[10], rx_error[10];
-+ gchar tx_bytes[16], tx_pkt[10], tx_error[10];
- gchar collissions[10];
-+#if defined(__linux__)
-+ gchar rx_drop[10], rx_fifo[10];
-+ gchar frame[10], compressed[10], multicast[10];
-+ gchar tx_drop[10], tx_fifo[10];
-+#elif defined(__FreeBSD__)
-+ char *p;
-+ gchar **tokens, **argv;
-+ int i;
-+ int pipe_out;
-+#endif
-
- GIOChannel *io = NULL;
- gchar *line;
- gboolean title = TRUE;
- const gchar *text;
- gchar *text_tx_bytes, *text_rx_bytes;
--
-+
- g_return_val_if_fail (info != NULL, FALSE);
-
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (info->combo));
- text = info_get_nic (info);
- if (!text)
- return FALSE;
--
-+
- #if defined(__linux__)
- io = g_io_channel_new_file ("/proc/net/dev", "r", NULL);
--
-+#elif defined(__FreeBSD__)
-+ if (!g_shell_parse_argv ("/usr/bin/netstat -in -b -f link", NULL, &argv, NULL)) {
-+ return FALSE;
-+ }
-+ if (!g_spawn_async_with_pipes (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL, &pipe_out, NULL, NULL)) {
-+ g_strfreev (argv);
-+ return FALSE;
-+ }
-+
-+ g_strfreev (argv);
-+
-+ io = g_io_channel_unix_new (pipe_out);
-+#endif /* defined(__linux__) */
-+
- while (g_io_channel_read_line (io, &line, NULL, NULL, NULL) == G_IO_STATUS_NORMAL) {
- if (title) {
- title = FALSE;
- g_free (line);
- continue;
- }
-+#if defined(__linux__)
- line = g_strdelimit (line, ":", ' ');
- sscanf (line, "%s %s %s %s %s %s %s %s %s %s %s %s %s %s %s", iface,
- rx_bytes, rx_pkt, rx_error, rx_drop, rx_fifo, frame,
- compressed, multicast,
- tx_bytes, tx_pkt, tx_error, tx_drop, tx_fifo, collissions);
-+#elif defined(__FreeBSD__)
-+ tokens = (gchar **) g_malloc0 (sizeof (gchar *) * 12);
-+ p = strtok (line, " \t\n");
-+ /* We only care about 11 fields for now */
-+ for (i = 0; i < 11 && p; i++, p = strtok (NULL, " \t\n")) {
-+ tokens[i] = g_strdup (p);
-+ }
-+
-+ if (i == 0 || i < 10) {
-+ g_free (line);
-+ g_strfreev (tokens);
-+ continue;
-+ }
-+
-+ g_strlcpy (iface, tokens[0], sizeof (iface));
-+
-+ g_strlcpy (collissions, tokens[--i], sizeof (collissions));
-+ g_strlcpy (tx_bytes, tokens[--i], sizeof (tx_bytes));
-+ g_strlcpy (tx_error, tokens[--i], sizeof (tx_error));
-+ g_strlcpy (tx_pkt, tokens[--i], sizeof (tx_pkt));
-+ g_strlcpy (rx_bytes, tokens[--i], sizeof (rx_bytes));
-+ g_strlcpy (rx_error, tokens[--i], sizeof (rx_error));
-+ g_strlcpy (rx_pkt, tokens[--i], sizeof (rx_pkt));
-+
-+ g_strfreev (tokens);
-+#endif /* defined(__linux__) */
-
- if (g_ascii_strcasecmp (iface, text) == 0) {
- /*
-@@ -277,7 +369,9 @@ info_nic_update_stats (gpointer data)
- }
-
- g_io_channel_unref (io);
--#endif /* defined(__linux__) */
-+#if defined(__FreeBSD__)
-+ close (pipe_out);
-+#endif /* defined(__FreeBSD__) */
-
- return TRUE;
- }
-@@ -425,8 +519,19 @@ info_get_nic_information (const gchar *n
- #ifdef __linux__
- mii_data_result data;
- #endif
-+#ifdef __FreeBSD__
-+ gint hwmib[6];
-+ size_t hwlen;
-+ gchar *hwbuf;
-+ guchar *hwptr;
-+ struct if_msghdr *hwifm;
-+ struct sockaddr_dl *hwsinptr;
-+#endif
-
-- getifaddrs (&ifa0);
-+ if (getifaddrs (&ifa0) != 0) {
-+ g_warning ("getifaddrs failed: %s", g_strerror (errno));
-+ goto fail;
-+ }
-
- for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) {
- if (strcmp (ifr6->ifa_name, nic) != 0) {
-@@ -510,6 +615,45 @@ info_get_nic_information (const gchar *n
- (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[3],
- (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[4],
- (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[5]);
-+#elif defined(__FreeBSD__)
-+ hwmib[0] = CTL_NET;
-+ hwmib[1] = AF_ROUTE;
-+ hwmib[2] = 0;
-+ hwmib[3] = AF_LINK;
-+ hwmib[4] = NET_RT_IFLIST;
-+ if ((hwmib[5] = if_nametoindex (nic)) == 0) {
-+ g_sprintf (dst, NOT_AVAILABLE);
-+ goto hwfail;
-+ }
-+ if (sysctl (hwmib, 6, NULL, &hwlen, NULL, 0) < 0) {
-+ g_sprintf (dst, NOT_AVAILABLE);
-+ goto hwfail;
-+ }
-+ if ((hwbuf = g_malloc (hwlen)) == NULL) {
-+ g_sprintf (dst, NOT_AVAILABLE);
-+ goto hwfail;
-+ }
-+ if (sysctl (hwmib, 6, hwbuf, &hwlen, NULL, 0) < 0) {
-+ g_sprintf (dst, NOT_AVAILABLE);
-+ goto hwfail;
-+ }
-+
-+ hwifm = (struct if_msghdr *) hwbuf;
-+ hwsinptr = (struct sockaddr_dl *) (hwifm + 1);
-+ hwptr = (guchar *) LLADDR (hwsinptr);
-+ if (*hwptr != 0 || *(hwptr + 1) != 0 ||
-+ *(hwptr + 2) != 0 || *(hwptr + 3) != 0 ||
-+ *(hwptr + 4) != 0 || *(hwptr + 5) != 0) {
-+ g_sprintf (dst, "%02x:%02x:%02x:%02x:%02x:%02x",
-+ *hwptr, *(hwptr + 1), *(hwptr + 2),
-+ *(hwptr + 3), *(hwptr + 4), *(hwptr + 5));
-+ }
-+ else {
-+ g_sprintf (dst, NOT_AVAILABLE);
-+ }
-+ g_free (hwbuf);
-+
-+hwfail:
- #else
- g_sprintf (dst, NOT_AVAILABLE);
- #endif /* SIOCGIFHWADDR */
-@@ -625,6 +769,8 @@ info_get_nic_information (const gchar *n
- }
-
- freeifaddrs (ifa0);
-+fail:
-+ ;
- }
-
- static gint *
diff --git a/net/gnome-nettool/files/patch-src_utils.c b/net/gnome-nettool/files/patch-src_utils.c
deleted file mode 100644
index 921c780498c1..000000000000
--- a/net/gnome-nettool/files/patch-src_utils.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/utils.c.orig Fri May 6 16:10:28 2005
-+++ src/utils.c Sun Jul 3 17:48:12 2005
-@@ -24,6 +24,8 @@
- on GNOME 2.0 */
-
- #include "utils.h"
-+#include <stdlib.h>
-+#include <limits.h>
- #include <string.h>
- #include <glib/gi18n.h>
-
-@@ -240,7 +242,7 @@ util_legible_bytes (gchar *bytes)
- const gchar *unit = "B";
- gchar *result;
-
-- sscanf (bytes, "%lld", &rx);
-+ rx = strtoull (bytes, (char **)NULL, 10);
- short_rx = rx * 10;
-
- if (rx > 1125899906842624ull) {
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index 9ba878e67375..39446f94d070 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -14,20 +14,26 @@ share/gnome/help/gnome-nettool/C/legal.xml
share/gnome/help/gnome-nettool/ca/gnome-nettool.xml
share/gnome/help/gnome-nettool/cs/gnome-nettool.xml
share/gnome/help/gnome-nettool/da/gnome-nettool.xml
+share/gnome/help/gnome-nettool/de/gnome-nettool.xml
+share/gnome/help/gnome-nettool/en_GB/gnome-nettool.xml
share/gnome/help/gnome-nettool/es/gnome-nettool.xml
share/gnome/help/gnome-nettool/fr/gnome-nettool.xml
share/gnome/help/gnome-nettool/oc/gnome-nettool.xml
share/gnome/help/gnome-nettool/pa/gnome-nettool.xml
+share/gnome/help/gnome-nettool/pt_BR/gnome-nettool.xml
share/gnome/help/gnome-nettool/sv/gnome-nettool.xml
share/gnome/help/gnome-nettool/uk/gnome-nettool.xml
share/gnome/help/gnome-nettool/vi/gnome-nettool.xml
+share/gnome/help/gnome-nettool/zh_CN/gnome-nettool.xml
share/icons/hicolor/16x16/apps/gnome-nettool.png
share/icons/hicolor/22x22/apps/gnome-nettool.png
share/icons/hicolor/24x24/apps/gnome-nettool.png
share/icons/hicolor/32x32/apps/gnome-nettool.png
share/icons/hicolor/scalable/apps/gnome-nettool.svg
+share/locale/af/LC_MESSAGES/gnome-nettool.mo
share/locale/ar/LC_MESSAGES/gnome-nettool.mo
share/locale/as/LC_MESSAGES/gnome-nettool.mo
+share/locale/ast/LC_MESSAGES/gnome-nettool.mo
share/locale/az/LC_MESSAGES/gnome-nettool.mo
share/locale/bg/LC_MESSAGES/gnome-nettool.mo
share/locale/bn/LC_MESSAGES/gnome-nettool.mo
@@ -78,6 +84,7 @@ share/locale/oc/LC_MESSAGES/gnome-nettool.mo
share/locale/or/LC_MESSAGES/gnome-nettool.mo
share/locale/pa/LC_MESSAGES/gnome-nettool.mo
share/locale/pl/LC_MESSAGES/gnome-nettool.mo
+share/locale/ps/LC_MESSAGES/gnome-nettool.mo
share/locale/pt/LC_MESSAGES/gnome-nettool.mo
share/locale/pt_BR/LC_MESSAGES/gnome-nettool.mo
share/locale/ro/LC_MESSAGES/gnome-nettool.mo
@@ -107,22 +114,30 @@ share/omf/gnome-nettool/gnome-nettool-C.omf
share/omf/gnome-nettool/gnome-nettool-ca.omf
share/omf/gnome-nettool/gnome-nettool-cs.omf
share/omf/gnome-nettool/gnome-nettool-da.omf
+share/omf/gnome-nettool/gnome-nettool-de.omf
+share/omf/gnome-nettool/gnome-nettool-en_GB.omf
share/omf/gnome-nettool/gnome-nettool-es.omf
share/omf/gnome-nettool/gnome-nettool-fr.omf
share/omf/gnome-nettool/gnome-nettool-oc.omf
share/omf/gnome-nettool/gnome-nettool-pa.omf
+share/omf/gnome-nettool/gnome-nettool-pt_BR.omf
share/omf/gnome-nettool/gnome-nettool-sv.omf
share/omf/gnome-nettool/gnome-nettool-uk.omf
share/omf/gnome-nettool/gnome-nettool-vi.omf
+share/omf/gnome-nettool/gnome-nettool-zh_CN.omf
share/pixmaps/gnome-nettool.png
@dirrm share/omf/gnome-nettool
+@dirrm share/gnome/help/gnome-nettool/zh_CN
@dirrm share/gnome/help/gnome-nettool/vi
@dirrm share/gnome/help/gnome-nettool/uk
@dirrm share/gnome/help/gnome-nettool/sv
+@dirrm share/gnome/help/gnome-nettool/pt_BR
@dirrm share/gnome/help/gnome-nettool/pa
@dirrm share/gnome/help/gnome-nettool/oc
@dirrm share/gnome/help/gnome-nettool/fr
@dirrm share/gnome/help/gnome-nettool/es
+@dirrm share/gnome/help/gnome-nettool/en_GB
+@dirrm share/gnome/help/gnome-nettool/de
@dirrm share/gnome/help/gnome-nettool/da
@dirrm share/gnome/help/gnome-nettool/cs
@dirrm share/gnome/help/gnome-nettool/ca
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index 02403b0f37b0..63fa56282dc2 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/libgweather/Makefile,v 1.21 2008/11/25 17:04:51 mezz Exp $
+# $MCom: ports/net/libgweather/Makefile,v 1.25 2009/03/17 23:07:29 kwm Exp $
#
PORTNAME= libgweather
-PORTVERSION= 2.24.3
+PORTVERSION= 2.26.0
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/libgweather/distinfo b/net/libgweather/distinfo
index 636956b1061e..cfe463151c37 100644
--- a/net/libgweather/distinfo
+++ b/net/libgweather/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgweather-2.24.3.tar.bz2) = ab29ea93a87339bb1571434fe2086789
-SHA256 (libgweather-2.24.3.tar.bz2) = fff7f1fa447156951ce6f01ed88f52b891c1ca6c65ff215f56a501e8aa917fcb
-SIZE (libgweather-2.24.3.tar.bz2) = 7094107
+MD5 (libgweather-2.26.0.tar.bz2) = b96016d7b35c66cf251189e9851ee252
+SHA256 (libgweather-2.26.0.tar.bz2) = c1efdeb59fe87145d13d99b7bb6f51b56505081fb2ebc2f7fe7dc3f7699da45e
+SIZE (libgweather-2.26.0.tar.bz2) = 6536099
diff --git a/net/libgweather/pkg-plist b/net/libgweather/pkg-plist
index eaa4b04adcb5..049dc64a0c0a 100644
--- a/net/libgweather/pkg-plist
+++ b/net/libgweather/pkg-plist
@@ -12,6 +12,24 @@ lib/libgweather.la
lib/libgweather.so
lib/libgweather.so.1
libdata/pkgconfig/gweather.pc
+%%DOCSDIR%%/GWeatherLocationEntry.html
+%%DOCSDIR%%/GWeatherTimezoneMenu.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libgweather-gweather-gconf.html
+%%DOCSDIR%%/libgweather-gweather-location.html
+%%DOCSDIR%%/libgweather-gweather-prefs.html
+%%DOCSDIR%%/libgweather-gweather-timezone.html
+%%DOCSDIR%%/libgweather-gweather-xml.html
+%%DOCSDIR%%/libgweather-weather.html
+%%DOCSDIR%%/libgweather.devhelp
+%%DOCSDIR%%/libgweather.devhelp2
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
%%DATADIR%%/Locations.ang.xml
%%DATADIR%%/Locations.ar.xml
%%DATADIR%%/Locations.as.xml
@@ -191,6 +209,7 @@ share/locale/zh_CN/LC_MESSAGES/libgweather.mo
share/locale/zh_HK/LC_MESSAGES/libgweather.mo
share/locale/zh_TW/LC_MESSAGES/libgweather.mo
@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%
@dirrm include/libgweather
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index c18274452e9c..013a84a64e15 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tsclient
PORTVERSION= 0.150
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net gnome
MASTER_SITES= SF
@@ -25,8 +25,9 @@ USE_GNOME= gtk20
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ LIBS="`pkg-config --libs libgnomeui-2.0`"
MAN1= tsclient.1
PORTDOCS= COPYING NEWS README
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index fe5e59d677cb..de6059a78ab2 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/vinagre/Makefile,v 1.20 2008/12/31 21:16:54 mezz Exp $
+# $MCom: ports/net/vinagre/Makefile,v 1.24 2009/03/18 00:32:18 kwm Exp $
#
PORTNAME= vinagre
-PORTVERSION= 2.24.2
-PORTREVISION= 1
+PORTVERSION= 2.26.0
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
index d08ef1d64156..8f873d515440 100644
--- a/net/vinagre/distinfo
+++ b/net/vinagre/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vinagre-2.24.2.tar.bz2) = 330a65e0277a2c8fe746e2091c3198ce
-SHA256 (gnome2/vinagre-2.24.2.tar.bz2) = 57b4be4c8bfeeb1493e96b728ec6a4ac29b3e01217b03ce9b194e1932f538959
-SIZE (gnome2/vinagre-2.24.2.tar.bz2) = 1450774
+MD5 (gnome2/vinagre-2.26.0.tar.bz2) = 6930bec2968c96dfb3407d6492ae42d4
+SHA256 (gnome2/vinagre-2.26.0.tar.bz2) = 3308e8072335370aa88201cbac23896c3f6118669c2fc531b7f7e8b62fb89c3e
+SIZE (gnome2/vinagre-2.26.0.tar.bz2) = 1412103
diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist
index 1b13279b6f25..b9943a89a7e4 100644
--- a/net/vinagre/pkg-plist
+++ b/net/vinagre/pkg-plist
@@ -18,6 +18,8 @@ share/gnome/help/vinagre/cs/figures/vinagre-screenshot.png
share/gnome/help/vinagre/cs/vinagre.xml
share/gnome/help/vinagre/de/figures/vinagre-screenshot.png
share/gnome/help/vinagre/de/vinagre.xml
+share/gnome/help/vinagre/en_GB/figures/vinagre-screenshot.png
+share/gnome/help/vinagre/en_GB/vinagre.xml
share/gnome/help/vinagre/es/figures/vinagre-screenshot.png
share/gnome/help/vinagre/es/vinagre.xml
share/gnome/help/vinagre/fr/figures/vinagre-screenshot.png
@@ -28,6 +30,8 @@ share/gnome/help/vinagre/oc/figures/vinagre-screenshot.png
share/gnome/help/vinagre/oc/vinagre.xml
share/gnome/help/vinagre/pt/figures/vinagre-screenshot.png
share/gnome/help/vinagre/pt/vinagre.xml
+share/gnome/help/vinagre/pt_BR/figures/vinagre-screenshot.png
+share/gnome/help/vinagre/pt_BR/vinagre.xml
share/gnome/help/vinagre/sq/figures/vinagre-screenshot.png
share/gnome/help/vinagre/sq/vinagre.xml
share/gnome/help/vinagre/sv/figures/vinagre-screenshot.png
@@ -37,22 +41,28 @@ share/gnome/help/vinagre/th/vinagre.xml
share/icons/hicolor/16x16/apps/vinagre.png
share/icons/hicolor/16x16/mimetypes/application-x-remote-connection.png
share/icons/hicolor/16x16/mimetypes/application-x-vnc.png
+share/icons/hicolor/16x16/status/view-minimize.png
share/icons/hicolor/22x22/apps/vinagre.png
share/icons/hicolor/22x22/mimetypes/application-x-remote-connection.png
share/icons/hicolor/22x22/mimetypes/application-x-vnc.png
+share/icons/hicolor/22x22/status/view-minimize.png
share/icons/hicolor/24x24/apps/vinagre.png
share/icons/hicolor/24x24/mimetypes/application-x-remote-connection.png
share/icons/hicolor/24x24/mimetypes/application-x-vnc.png
share/icons/hicolor/32x32/apps/vinagre.png
share/icons/hicolor/32x32/mimetypes/application-x-remote-connection.png
share/icons/hicolor/32x32/mimetypes/application-x-vnc.png
+share/icons/hicolor/32x32/status/view-minimize.png
share/icons/hicolor/48x48/apps/vinagre.png
share/icons/hicolor/48x48/mimetypes/application-x-remote-connection.png
share/icons/hicolor/48x48/mimetypes/application-x-vnc.png
+share/icons/hicolor/48x48/status/view-minimize.png
share/icons/hicolor/scalable/apps/vinagre.svg
share/icons/hicolor/scalable/mimetypes/application-x-remote-connection.svg
share/icons/hicolor/scalable/mimetypes/application-x-vnc.svg
share/locale/ar/LC_MESSAGES/vinagre.mo
+share/locale/as/LC_MESSAGES/vinagre.mo
+share/locale/ast/LC_MESSAGES/vinagre.mo
share/locale/be@latin/LC_MESSAGES/vinagre.mo
share/locale/bg/LC_MESSAGES/vinagre.mo
share/locale/bn_IN/LC_MESSAGES/vinagre.mo
@@ -78,6 +88,7 @@ share/locale/kn/LC_MESSAGES/vinagre.mo
share/locale/ko/LC_MESSAGES/vinagre.mo
share/locale/ku/LC_MESSAGES/vinagre.mo
share/locale/lt/LC_MESSAGES/vinagre.mo
+share/locale/lv/LC_MESSAGES/vinagre.mo
share/locale/mk/LC_MESSAGES/vinagre.mo
share/locale/ml/LC_MESSAGES/vinagre.mo
share/locale/mr/LC_MESSAGES/vinagre.mo
@@ -90,6 +101,7 @@ share/locale/pa/LC_MESSAGES/vinagre.mo
share/locale/pl/LC_MESSAGES/vinagre.mo
share/locale/pt/LC_MESSAGES/vinagre.mo
share/locale/pt_BR/LC_MESSAGES/vinagre.mo
+share/locale/ro/LC_MESSAGES/vinagre.mo
share/locale/ru/LC_MESSAGES/vinagre.mo
share/locale/si/LC_MESSAGES/vinagre.mo
share/locale/sl/LC_MESSAGES/vinagre.mo
@@ -98,6 +110,7 @@ share/locale/sr/LC_MESSAGES/vinagre.mo
share/locale/sr@latin/LC_MESSAGES/vinagre.mo
share/locale/sv/LC_MESSAGES/vinagre.mo
share/locale/ta/LC_MESSAGES/vinagre.mo
+share/locale/te/LC_MESSAGES/vinagre.mo
share/locale/th/LC_MESSAGES/vinagre.mo
share/locale/tr/LC_MESSAGES/vinagre.mo
share/locale/vi/LC_MESSAGES/vinagre.mo
@@ -112,11 +125,13 @@ share/omf/vinagre/vinagre-C.omf
share/omf/vinagre/vinagre-ca.omf
share/omf/vinagre/vinagre-cs.omf
share/omf/vinagre/vinagre-de.omf
+share/omf/vinagre/vinagre-en_GB.omf
share/omf/vinagre/vinagre-es.omf
share/omf/vinagre/vinagre-fr.omf
share/omf/vinagre/vinagre-it.omf
share/omf/vinagre/vinagre-oc.omf
share/omf/vinagre/vinagre-pt.omf
+share/omf/vinagre/vinagre-pt_BR.omf
share/omf/vinagre/vinagre-sq.omf
share/omf/vinagre/vinagre-sv.omf
share/omf/vinagre/vinagre-th.omf
@@ -131,6 +146,8 @@ share/omf/vinagre/vinagre-th.omf
@dirrm share/gnome/help/vinagre/sv
@dirrm share/gnome/help/vinagre/sq/figures
@dirrm share/gnome/help/vinagre/sq
+@dirrm share/gnome/help/vinagre/pt_BR/figures
+@dirrm share/gnome/help/vinagre/pt_BR
@dirrm share/gnome/help/vinagre/pt/figures
@dirrm share/gnome/help/vinagre/pt
@dirrm share/gnome/help/vinagre/oc/figures
@@ -141,6 +158,8 @@ share/omf/vinagre/vinagre-th.omf
@dirrm share/gnome/help/vinagre/fr
@dirrm share/gnome/help/vinagre/es/figures
@dirrm share/gnome/help/vinagre/es
+@dirrm share/gnome/help/vinagre/en_GB/figures
+@dirrm share/gnome/help/vinagre/en_GB
@dirrm share/gnome/help/vinagre/de/figures
@dirrm share/gnome/help/vinagre/de
@dirrm share/gnome/help/vinagre/cs/figures
@@ -158,6 +177,8 @@ share/omf/vinagre/vinagre-th.omf
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@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
@@ -172,3 +193,7 @@ share/omf/vinagre/vinagre-th.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/net/vino/Makefile b/net/vino/Makefile
index 94df0bf63f40..0f1edaa04b55 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,11 +3,11 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $MCom: ports/net/vino/Makefile,v 1.63 2008/10/20 23:08:47 kwm Exp $
+# $MCom: ports/net/vino/Makefile,v 1.68 2009/03/18 00:27:09 kwm Exp $
#
PORTNAME= vino
-PORTVERSION= 2.24.1
+PORTVERSION= 2.26.0
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,7 +15,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= VNC server that allows for remote access to your GNOME desktop
-LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls
+LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \
+ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/net/vino/distinfo b/net/vino/distinfo
index 7abd78a63129..b2e2fc19385f 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vino-2.24.1.tar.bz2) = b373292a7a5443d7fad1cce5eb07f37f
-SHA256 (gnome2/vino-2.24.1.tar.bz2) = 4522c3969b64330b893de9a3257b4f7462975644b5e6cc57e9113d1f0c9c4a77
-SIZE (gnome2/vino-2.24.1.tar.bz2) = 674201
+MD5 (gnome2/vino-2.26.0.tar.bz2) = 7a10464824d8446411b90c162d34401e
+SHA256 (gnome2/vino-2.26.0.tar.bz2) = 1dfad6b20f99b3f8c79b265c2e71e19ad206317e38b1d167debb41fc9e6d94fb
+SIZE (gnome2/vino-2.26.0.tar.bz2) = 710542
diff --git a/net/vino/files/patch-configure b/net/vino/files/patch-configure
new file mode 100644
index 000000000000..c7da75af74e6
--- /dev/null
+++ b/net/vino/files/patch-configure
@@ -0,0 +1,28 @@
+--- configure.orig 2009-02-27 20:32:40.000000000 -0500
++++ configure 2009-02-27 20:34:44.000000000 -0500
+@@ -17882,6 +17882,8 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
++ #include <sys/types.h>
++ #include <sys/socket.h>
+ #include <ifaddrs.h>
+
+ int
+@@ -17896,6 +17898,7 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
++have_getifaddrs=yes
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+@@ -17921,7 +17924,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- if test $"$have_getifaddrs" = "yes"; then
++ if test x"$have_getifaddrs" = x"yes"; then
+ HAVE_GETIFADDRS_TRUE=
+ HAVE_GETIFADDRS_FALSE='#'
+ else
diff --git a/net/vino/files/patch-server_libvncserver_sockets.c b/net/vino/files/patch-server_libvncserver_sockets.c
index b182a2c4fc91..348ea91d3deb 100644
--- a/net/vino/files/patch-server_libvncserver_sockets.c
+++ b/net/vino/files/patch-server_libvncserver_sockets.c
@@ -1,22 +1,30 @@
-Index: server/libvncserver/sockets.c
-diff -u -p server/libvncserver/sockets.c.orig server/libvncserver/sockets.c
---- server/libvncserver/sockets.c.orig Tue Jan 2 22:34:50 2007
-+++ server/libvncserver/sockets.c Sun Mar 25 22:52:02 2007
-@@ -560,6 +560,7 @@ ListenOnTCPPort(port, localOnly)
-
- #ifdef ENABLE_IPV6
- struct sockaddr_in6 addr_in6;
+--- server/libvncserver/sockets.c.orig 2009-02-13 08:11:38.000000000 -0500
++++ server/libvncserver/sockets.c 2009-03-07 20:19:28.000000000 -0500
+@@ -668,6 +669,11 @@ NewSocketListenTCP(struct sockaddr *addr
+ {
+ int sock = -1;
+ int one = 1;
++#ifdef ENABLE_IPV6
++#ifdef IPV6_V6ONLY
+ int off = 0;
++#endif
++#endif
- memset(&addr_in6, 0, sizeof(addr_in6));
- addr_in6.sin6_family = AF_INET6;
-@@ -570,6 +571,9 @@ ListenOnTCPPort(port, localOnly)
- addrlen = sizeof(addr_in6);
+ if ((sock = socket(addr->sa_family, SOCK_STREAM, 0)) < 0)
+ return -1;
+@@ -677,6 +683,15 @@ NewSocketListenTCP(struct sockaddr *addr
+ return -1;
+ }
- sock = socket(AF_INET6, SOCK_STREAM, 0);
++#ifdef ENABLE_IPV6
+#ifdef IPV6_V6ONLY
-+ setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof(off));
++ if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof(off)) < 0) {
++ close(sock);
++ return -1;
++ }
+#endif
- #endif
-
- if (sock < 0) {
++#endif
++
+ if (bind(sock, addr, len) < 0) {
+ close(sock);
+ return -1;
diff --git a/net/vino/files/patch-server_vino-dbus-listener.c b/net/vino/files/patch-server_vino-dbus-listener.c
new file mode 100644
index 000000000000..8057b9410179
--- /dev/null
+++ b/net/vino/files/patch-server_vino-dbus-listener.c
@@ -0,0 +1,12 @@
+--- server/vino-dbus-listener.c.orig 2009-02-27 20:36:08.000000000 -0500
++++ server/vino-dbus-listener.c 2009-02-27 20:36:30.000000000 -0500
+@@ -35,6 +35,9 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <netdb.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <net/if.h>
+ #include <arpa/inet.h>
+
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index 2db9574163d6..1cde6837570c 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -1,10 +1,11 @@
bin/vino-passwd
bin/vino-preferences
+etc/xdg/autostart/vino-server.desktop
libexec/vino-server
share/applications/vino-preferences.desktop
-share/gnome/autostart/vino-server.desktop
share/locale/ar/LC_MESSAGES/vino.mo
share/locale/as/LC_MESSAGES/vino.mo
+share/locale/ast/LC_MESSAGES/vino.mo
share/locale/az/LC_MESSAGES/vino.mo
share/locale/be@latin/LC_MESSAGES/vino.mo
share/locale/bg/LC_MESSAGES/vino.mo
@@ -80,6 +81,7 @@ share/locale/zh_HK/LC_MESSAGES/vino.mo
share/locale/zh_TW/LC_MESSAGES/vino.mo
%%DATADIR%%/vino-preferences.glade
%%DATADIR%%/vino-prompt.glade
+%%DATADIR%%/webservices
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -108,5 +110,7 @@ share/locale/zh_TW/LC_MESSAGES/vino.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/print/freetype2/Makefile b/print/freetype2/Makefile
index c51b6c21a2e8..6af782d4f7ee 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -3,11 +3,11 @@
# Whom: jseger@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/print/freetype2/Makefile,v 1.11 2007/07/06 16:59:40 marcus Exp $
+# $MCom: ports/print/freetype2/Makefile,v 1.16 2009/04/09 03:24:09 mezz Exp $
#
PORTNAME= freetype2
-PORTVERSION= 2.3.7
+PORTVERSION= 2.3.9
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
@@ -24,6 +24,7 @@ COMMENT= A free and portable TrueType font rendering engine
USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
USE_GMAKE= yes
+MAKE_JOBS_SAFE= yes
MAKE_ENV= TOP=""
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo
index 57ec2a28a9ab..90082855f2fd 100644
--- a/print/freetype2/distinfo
+++ b/print/freetype2/distinfo
@@ -1,3 +1,3 @@
-MD5 (freetype-2.3.7.tar.bz2) = 83306194817ebdea554133b4232a34aa
-SHA256 (freetype-2.3.7.tar.bz2) = 4ecf879eb69fc323669981f02aebff1e3045de415303e86ee67f2080cb3ee888
-SIZE (freetype-2.3.7.tar.bz2) = 1310542
+MD5 (freetype-2.3.9.tar.bz2) = d76233108aca9c9606cdbd341562ad9a
+SHA256 (freetype-2.3.9.tar.bz2) = 51a033bce9904d73e0821e8e2bba24bd319619d7d1b2e9eeccac611580242ab6
+SIZE (freetype-2.3.9.tar.bz2) = 1363190
diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist
index 612adeb35a4c..fd0ccd25e710 100644
--- a/print/freetype2/pkg-plist
+++ b/print/freetype2/pkg-plist
@@ -5,6 +5,7 @@ include/freetype2/freetype/config/ftmodule.h
include/freetype2/freetype/config/ftoption.h
include/freetype2/freetype/config/ftstdlib.h
include/freetype2/freetype/freetype.h
+include/freetype2/freetype/ftadvanc.h
include/freetype2/freetype/ftbbox.h
include/freetype2/freetype/ftbdf.h
include/freetype2/freetype/ftbitmap.h
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index ccccabba4c4d..def4e8097bc8 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/security/gnome-keyring/Makefile,v 1.71 2009/01/10 01:59:21 mezz Exp $
+# $MCom: ports/security/gnome-keyring/Makefile,v 1.76 2009/03/15 00:23:43 marcus Exp $
#
PORTNAME= gnome-keyring
-PORTVERSION= 2.24.1
-PORTREVISION= 2
+PORTVERSION= 2.26.0
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index ca5144c4a5e6..f34ad439b1c5 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-2.24.1.tar.bz2) = aa5552dc129f3509ee39145b7f0bf977
-SHA256 (gnome2/gnome-keyring-2.24.1.tar.bz2) = 3c9eb7f45dd0026340635b9e1ee18c36a47541610aa5a7ef604ca645aa4763f9
-SIZE (gnome2/gnome-keyring-2.24.1.tar.bz2) = 1125993
+MD5 (gnome2/gnome-keyring-2.26.0.tar.bz2) = 0395fcf79b990465030a2795dcddacb9
+SHA256 (gnome2/gnome-keyring-2.26.0.tar.bz2) = 7acda11db2eb07b2f68a1a506203fe95141954acb10c394850418fd04ed80a07
+SIZE (gnome2/gnome-keyring-2.26.0.tar.bz2) = 1211953
diff --git a/security/gnome-keyring/files/patch-common_gkr-daemon-util.h b/security/gnome-keyring/files/patch-common_gkr-daemon-util.h
deleted file mode 100644
index ebc3f9680b4c..000000000000
--- a/security/gnome-keyring/files/patch-common_gkr-daemon-util.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/gkr-daemon-util.h.orig 2008-08-04 13:36:06.000000000 -0400
-+++ common/gkr-daemon-util.h 2008-08-04 13:36:18.000000000 -0400
-@@ -26,6 +26,8 @@
-
- G_BEGIN_DECLS
-
-+#include <sys/types.h>
-+
- #include <glib.h>
- #include <glib-object.h>
-
diff --git a/security/gnome-keyring/files/patch-configure b/security/gnome-keyring/files/patch-configure
index 75016a356fcb..9aff6d9ebf19 100644
--- a/security/gnome-keyring/files/patch-configure
+++ b/security/gnome-keyring/files/patch-configure
@@ -1,24 +1,15 @@
---- configure.orig 2008-07-22 21:14:15.000000000 -0400
-+++ configure 2008-07-22 21:14:35.000000000 -0400
-@@ -25963,7 +25963,7 @@ fi
-
- dbus_status=$DBUS_VERSION
- fi
-- if test "$enable_dbus" == "yes"; then
-+ if test "$enable_dbus" = "yes"; then
- WITH_DBUS_TRUE=
- WITH_DBUS_FALSE='#'
- else
-@@ -27001,7 +27001,7 @@ if test "${enable_tests+set}" = set; the
- fi
-
+--- configure.orig 2009-02-24 21:18:47.000000000 +0100
++++ configure 2009-02-24 21:19:24.000000000 +0100
+@@ -18069,7 +18069,7 @@
+ { echo "$as_me:$LINENO: checking build test tools, unit tests, and -Werror" >&5
+ echo $ECHO_N "checking build test tools, unit tests, and -Werror... $ECHO_C" >&6; }
-if test "$enable_tests" == "yes"; then
+if test "$enable_tests" = "yes"; then
- echo "building tests and unit tests"
cat >>confdefs.h <<_ACEOF
-@@ -27014,7 +27014,7 @@ else
+ #define WITH_TESTS 1
+@@ -18085,7 +18085,7 @@
tests_status="no"
fi
@@ -27,7 +18,7 @@
WITH_TESTS_TRUE=
WITH_TESTS_FALSE='#'
else
-@@ -27029,7 +27029,7 @@ if test "${enable_coverage+set}" = set;
+@@ -18100,7 +18100,7 @@
fi
diff --git a/security/gnome-keyring/files/patch-egg_egg-asn1.h b/security/gnome-keyring/files/patch-egg_egg-asn1.h
new file mode 100644
index 000000000000..a3d4296af2e4
--- /dev/null
+++ b/security/gnome-keyring/files/patch-egg_egg-asn1.h
@@ -0,0 +1,14 @@
+--- egg/egg-asn1.h.orig 2009-02-25 16:40:49.000000000 -0500
++++ egg/egg-asn1.h 2009-02-25 16:41:21.000000000 -0500
+@@ -75,9 +75,9 @@ gchar* egg_asn1_read_dn
+ gchar* egg_asn1_read_dn_part (ASN1_TYPE asn, const gchar *part, const gchar *match);
+
+
+-glong egg_asn1_time_parse_utc (const gchar* value);
++time_t egg_asn1_time_parse_utc (const gchar* value);
+
+-glong egg_asn1_time_parse_general (const gchar* value);
++time_t egg_asn1_time_parse_general (const gchar* value);
+
+
+ typedef void (*EggAsn1DnCallback) (guint index, GQuark oid, const guchar *value,
diff --git a/security/gnome-keyring/files/patch-pam_gkr-pam-client.c b/security/gnome-keyring/files/patch-pam_gkr-pam-client.c
deleted file mode 100644
index 05a0306e6913..000000000000
--- a/security/gnome-keyring/files/patch-pam_gkr-pam-client.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- pam/gkr-pam-client.c.orig 2008-10-07 12:25:23.000000000 -0400
-+++ pam/gkr-pam-client.c 2008-10-07 12:38:36.000000000 -0400
-@@ -96,12 +96,12 @@ check_peer_same_uid (int sock)
- struct xucred xuc;
- socklen_t xuc_len = sizeof (xuc);
-
-- if (getsockopt (sock, SOL_SOCKET, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 &&
-- xuc_len == sizeof (xuc)) {
-+ if (getsockopt (sock, 0, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 &&
-+ xuc.cr_version == XUCRED_VERSION) {
- uid = xuc.cr_uid;
- } else {
- syslog (GKR_LOG_ERR, "could not get gnome-keyring-daemon socket credentials, "
-- "(returned len %d/%d)\n", xuc_len, (int)sizeof (xuc));
-+ "(returned version %d/%d)\n", xuc.cr_version, XUCRED_VERSION);
- return -1;
- }
-
diff --git a/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c b/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c
deleted file mode 100644
index 57d2f1888016..000000000000
--- a/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- pkcs11/gkr-pkcs11-module.c.orig 2008-02-11 21:26:56.000000000 -0500
-+++ pkcs11/gkr-pkcs11-module.c 2008-02-11 21:27:08.000000000 -0500
-@@ -36,6 +36,7 @@
- #include <sys/socket.h>
- #include <sys/un.h>
-
-+#include <string.h>
- #include <stdlib.h>
- #include <stdint.h>
- #include <pthread.h>
diff --git a/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in
new file mode 100644
index 000000000000..32ffb1b09819
--- /dev/null
+++ b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in
@@ -0,0 +1,11 @@
+--- pkcs11/rpc-layer/Makefile.in.orig 2009-02-24 21:22:45.000000000 +0100
++++ pkcs11/rpc-layer/Makefile.in 2009-02-24 21:22:52.000000000 +0100
+@@ -348,7 +348,7 @@ gck_rpc_daemon_standalone_SOURCES = \
+ gck-rpc-daemon-standalone.c
+
+ gck_rpc_daemon_standalone_LDADD = \
+- -ldl libgck-rpc-layer.la \
++ libgck-rpc-layer.la \
+ $(top_builddir)/common/libgkr-common.la
+
+ all: all-am
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index 2b3fe4715134..9ba05cb2fa2c 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -1,5 +1,13 @@
bin/gnome-keyring
bin/gnome-keyring-daemon
+etc/xdg/autostart/gnome-keyring-daemon.desktop
+include/gcr/gcr-certificate-basics-widget.h
+include/gcr/gcr-certificate-details-widget.h
+include/gcr/gcr-certificate.h
+include/gcr/gcr-importer.h
+include/gcr/gcr-parser.h
+include/gcr/gcr-types.h
+include/gcr/gcr.h
include/gnome-keyring-1/gnome-keyring-memory.h
include/gnome-keyring-1/gnome-keyring-result.h
include/gnome-keyring-1/gnome-keyring.h
@@ -7,9 +15,22 @@ include/gp11/gp11.h
include/gp11/pkcs11.h
include/gp11/pkcs11g.h
include/gp11/pkcs11n.h
+lib/gnome-keyring/devel/gck-ssh-store-standalone.a
+lib/gnome-keyring/devel/gck-ssh-store-standalone.la
+lib/gnome-keyring/devel/gck-ssh-store-standalone.so
+lib/gnome-keyring/devel/gck-user-store-standalone.a
+lib/gnome-keyring/devel/gck-user-store-standalone.la
+lib/gnome-keyring/devel/gck-user-store-standalone.so
lib/gnome-keyring/gnome-keyring-pkcs11.a
lib/gnome-keyring/gnome-keyring-pkcs11.la
lib/gnome-keyring/gnome-keyring-pkcs11.so
+lib/gnome-keyring/standalone/gck-roots-store-standalone.a
+lib/gnome-keyring/standalone/gck-roots-store-standalone.la
+lib/gnome-keyring/standalone/gck-roots-store-standalone.so
+lib/libgcr.a
+lib/libgcr.la
+lib/libgcr.so
+lib/libgcr.so.0
lib/libgnome-keyring.a
lib/libgnome-keyring.la
lib/libgnome-keyring.so
@@ -21,6 +42,7 @@ lib/libgp11.so.0
lib/pam_gnome_keyring.a
lib/pam_gnome_keyring.la
lib/pam_gnome_keyring.so
+libdata/pkgconfig/gcr-0.pc
libdata/pkgconfig/gnome-keyring-1.pc
libdata/pkgconfig/gp11-0.pc
libexec/gnome-keyring-ask
@@ -63,7 +85,10 @@ share/doc/gp11/left.png
share/doc/gp11/right.png
share/doc/gp11/style.css
share/doc/gp11/up.png
+share/gcr/ui/gcr-certificate-basics-widget.ui
+share/gcr/ui/gcr-import-dialog.ui
share/locale/ar/LC_MESSAGES/gnome-keyring.mo
+share/locale/ast/LC_MESSAGES/gnome-keyring.mo
share/locale/az/LC_MESSAGES/gnome-keyring.mo
share/locale/be/LC_MESSAGES/gnome-keyring.mo
share/locale/be@latin/LC_MESSAGES/gnome-keyring.mo
@@ -139,9 +164,14 @@ share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
@dirrm share/doc/gp11
@dirrm %%DOCSDIR%%
+@dirrm lib/gnome-keyring/standalone
+@dirrm lib/gnome-keyring/devel
@dirrm lib/gnome-keyring
@dirrm include/gp11
@dirrm include/gnome-keyring-1
+@dirrm include/gcr
+@dirrm share/gcr/ui
+@dirrm share/gcr
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@@ -166,3 +196,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.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
diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile
index 15527cbd175d..478708eb1900 100644
--- a/security/seahorse-plugins/Makefile
+++ b/security/seahorse-plugins/Makefile
@@ -3,12 +3,11 @@
# Whom: Dave McKay <dave@mu.org>
#
# $FreeBSD$
-# $MCom: ports/security/seahorse-plugins/Makefile,v 1.4 2008/10/20 03:02:56 mezz Exp $
+# $MCom: ports/security/seahorse-plugins/Makefile,v 1.10 2009/03/30 05:54:57 marcus Exp $
#
PORTNAME= seahorse-plugins
-PORTVERSION= 2.24.1
-PORTREVISION= 2
+PORTVERSION= 2.26.0
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -21,7 +20,7 @@ LIB_DEPENDS= cryptui.0:${PORTSDIR}/security/seahorse
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_GECKO= firefox xulrunner
+USE_GECKO= firefox libxul
USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
@@ -39,6 +38,12 @@ MAN1= seahorse-agent.1 seahorse-tool.1
.include <bsd.port.pre.mk>
+.if ${GECKO}=="libxul"
+CONFIGURE_ARGS+=--with-gecko=libxul-unstable
+.else
+CONFIGURE_ARGS+=--with-gecko=${GECKO}
+.endif
+
.if !defined(WITHOUT_GEDIT)
BUILD_DEPENDS+= gedit:${PORTSDIR}/editors/gedit
RUN_DEPENDS+= gedit:${PORTSDIR}/editors/gedit
@@ -60,7 +65,7 @@ CONFIGURE_ARGS+=--disable-nautilus
.if !defined(WITHOUT_EPIPHANY)
BUILD_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany
RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany
-PLIST_SUB+= EPIPHANY="" EPHY_VERSION="2.24"
+PLIST_SUB+= EPIPHANY="" EPHY_VERSION="2.26"
.else
CONFIGURE_ARGS+=--disable-epiphany
PLIST_SUB+= EPHY="@comment "
@@ -76,6 +81,8 @@ PLIST_SUB+= APPLET="@comment "
post-patch:
@${REINPLACE_CMD} -e 's|" == "|" = "|g' \
+ -e 's|epiphany-2.24|epiphany-2.26|g' \
+ -e 's|2.24|2.26|g' \
${WRKSRC}/configure
post-install:
diff --git a/security/seahorse-plugins/distinfo b/security/seahorse-plugins/distinfo
index e9ffdd587f4a..7897b7b5507a 100644
--- a/security/seahorse-plugins/distinfo
+++ b/security/seahorse-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seahorse-plugins-2.24.1.tar.bz2) = 842b7b7424c2a5cfe56db5960133f0a1
-SHA256 (gnome2/seahorse-plugins-2.24.1.tar.bz2) = 0a9ee63adc7ad01e9c3d9a3432d467a4df24889b7bd41b065e89bec74ccd7676
-SIZE (gnome2/seahorse-plugins-2.24.1.tar.bz2) = 1843996
+MD5 (gnome2/seahorse-plugins-2.26.0.tar.bz2) = 8936feb29cf9e4b935d1059ee4e416c6
+SHA256 (gnome2/seahorse-plugins-2.26.0.tar.bz2) = b56c3c947204dac0802332332feea6eee282616a654b92d3135340cb842bf377
+SIZE (gnome2/seahorse-plugins-2.26.0.tar.bz2) = 1350051
diff --git a/security/seahorse-plugins/pkg-plist b/security/seahorse-plugins/pkg-plist
index f17cd1ca5426..1ff664f8cc7b 100644
--- a/security/seahorse-plugins/pkg-plist
+++ b/security/seahorse-plugins/pkg-plist
@@ -28,166 +28,24 @@ share/gnome/help/seahorse-applet/oc/seahorse-applet.xml
share/gnome/help/seahorse-applet/ru/seahorse-applet.xml
share/gnome/help/seahorse-applet/sv/seahorse-applet.xml
share/gnome/help/seahorse-applet/vi/seahorse-applet.xml
-share/gnome/help/seahorse-plugins/C/figures/export.png
-share/gnome/help/seahorse-plugins/C/figures/file-manager.png
-share/gnome/help/seahorse-plugins/C/figures/generate.png
-share/gnome/help/seahorse-plugins/C/figures/import.png
-share/gnome/help/seahorse-plugins/C/figures/key-manager.png
-share/gnome/help/seahorse-plugins/C/figures/key-properties.png
-share/gnome/help/seahorse-plugins/C/figures/passphrase.png
-share/gnome/help/seahorse-plugins/C/figures/preferences.png
-share/gnome/help/seahorse-plugins/C/figures/recipients.png
-share/gnome/help/seahorse-plugins/C/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/C/figures/signature.png
-share/gnome/help/seahorse-plugins/C/figures/text-editor.png
share/gnome/help/seahorse-plugins/C/legal.xml
share/gnome/help/seahorse-plugins/C/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/cs/figures/export.png
-share/gnome/help/seahorse-plugins/cs/figures/file-manager.png
-share/gnome/help/seahorse-plugins/cs/figures/generate.png
-share/gnome/help/seahorse-plugins/cs/figures/import.png
-share/gnome/help/seahorse-plugins/cs/figures/key-manager.png
-share/gnome/help/seahorse-plugins/cs/figures/key-properties.png
-share/gnome/help/seahorse-plugins/cs/figures/passphrase.png
-share/gnome/help/seahorse-plugins/cs/figures/preferences.png
-share/gnome/help/seahorse-plugins/cs/figures/recipients.png
-share/gnome/help/seahorse-plugins/cs/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/cs/figures/signature.png
-share/gnome/help/seahorse-plugins/cs/figures/text-editor.png
+share/gnome/help/seahorse-plugins/ca/seahorse-plugins.xml
share/gnome/help/seahorse-plugins/cs/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/de/figures/export.png
-share/gnome/help/seahorse-plugins/de/figures/file-manager.png
-share/gnome/help/seahorse-plugins/de/figures/generate.png
-share/gnome/help/seahorse-plugins/de/figures/import.png
-share/gnome/help/seahorse-plugins/de/figures/key-manager.png
-share/gnome/help/seahorse-plugins/de/figures/key-properties.png
-share/gnome/help/seahorse-plugins/de/figures/passphrase.png
-share/gnome/help/seahorse-plugins/de/figures/preferences.png
-share/gnome/help/seahorse-plugins/de/figures/recipients.png
-share/gnome/help/seahorse-plugins/de/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/de/figures/signature.png
-share/gnome/help/seahorse-plugins/de/figures/text-editor.png
share/gnome/help/seahorse-plugins/de/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/el/figures/export.png
-share/gnome/help/seahorse-plugins/el/figures/file-manager.png
-share/gnome/help/seahorse-plugins/el/figures/generate.png
-share/gnome/help/seahorse-plugins/el/figures/import.png
-share/gnome/help/seahorse-plugins/el/figures/key-manager.png
-share/gnome/help/seahorse-plugins/el/figures/key-properties.png
-share/gnome/help/seahorse-plugins/el/figures/passphrase.png
-share/gnome/help/seahorse-plugins/el/figures/preferences.png
-share/gnome/help/seahorse-plugins/el/figures/recipients.png
-share/gnome/help/seahorse-plugins/el/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/el/figures/signature.png
-share/gnome/help/seahorse-plugins/el/figures/text-editor.png
share/gnome/help/seahorse-plugins/el/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/en_GB/figures/export.png
-share/gnome/help/seahorse-plugins/en_GB/figures/file-manager.png
-share/gnome/help/seahorse-plugins/en_GB/figures/generate.png
-share/gnome/help/seahorse-plugins/en_GB/figures/import.png
-share/gnome/help/seahorse-plugins/en_GB/figures/key-manager.png
-share/gnome/help/seahorse-plugins/en_GB/figures/key-properties.png
-share/gnome/help/seahorse-plugins/en_GB/figures/passphrase.png
-share/gnome/help/seahorse-plugins/en_GB/figures/preferences.png
-share/gnome/help/seahorse-plugins/en_GB/figures/recipients.png
-share/gnome/help/seahorse-plugins/en_GB/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/en_GB/figures/signature.png
-share/gnome/help/seahorse-plugins/en_GB/figures/text-editor.png
share/gnome/help/seahorse-plugins/en_GB/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/es/figures/export.png
-share/gnome/help/seahorse-plugins/es/figures/file-manager.png
-share/gnome/help/seahorse-plugins/es/figures/generate.png
-share/gnome/help/seahorse-plugins/es/figures/import.png
-share/gnome/help/seahorse-plugins/es/figures/key-manager.png
-share/gnome/help/seahorse-plugins/es/figures/key-properties.png
-share/gnome/help/seahorse-plugins/es/figures/passphrase.png
-share/gnome/help/seahorse-plugins/es/figures/preferences.png
-share/gnome/help/seahorse-plugins/es/figures/recipients.png
-share/gnome/help/seahorse-plugins/es/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/es/figures/signature.png
-share/gnome/help/seahorse-plugins/es/figures/text-editor.png
share/gnome/help/seahorse-plugins/es/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/fr/figures/export.png
-share/gnome/help/seahorse-plugins/fr/figures/file-manager.png
-share/gnome/help/seahorse-plugins/fr/figures/generate.png
-share/gnome/help/seahorse-plugins/fr/figures/import.png
-share/gnome/help/seahorse-plugins/fr/figures/key-manager.png
-share/gnome/help/seahorse-plugins/fr/figures/key-properties.png
-share/gnome/help/seahorse-plugins/fr/figures/passphrase.png
-share/gnome/help/seahorse-plugins/fr/figures/preferences.png
-share/gnome/help/seahorse-plugins/fr/figures/recipients.png
-share/gnome/help/seahorse-plugins/fr/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/fr/figures/signature.png
-share/gnome/help/seahorse-plugins/fr/figures/text-editor.png
share/gnome/help/seahorse-plugins/fr/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/it/figures/export.png
-share/gnome/help/seahorse-plugins/it/figures/file-manager.png
-share/gnome/help/seahorse-plugins/it/figures/generate.png
-share/gnome/help/seahorse-plugins/it/figures/import.png
-share/gnome/help/seahorse-plugins/it/figures/key-manager.png
-share/gnome/help/seahorse-plugins/it/figures/key-properties.png
-share/gnome/help/seahorse-plugins/it/figures/passphrase.png
-share/gnome/help/seahorse-plugins/it/figures/preferences.png
-share/gnome/help/seahorse-plugins/it/figures/recipients.png
-share/gnome/help/seahorse-plugins/it/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/it/figures/signature.png
-share/gnome/help/seahorse-plugins/it/figures/text-editor.png
share/gnome/help/seahorse-plugins/it/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/oc/figures/export.png
-share/gnome/help/seahorse-plugins/oc/figures/file-manager.png
-share/gnome/help/seahorse-plugins/oc/figures/generate.png
-share/gnome/help/seahorse-plugins/oc/figures/import.png
-share/gnome/help/seahorse-plugins/oc/figures/key-manager.png
-share/gnome/help/seahorse-plugins/oc/figures/key-properties.png
-share/gnome/help/seahorse-plugins/oc/figures/passphrase.png
-share/gnome/help/seahorse-plugins/oc/figures/preferences.png
-share/gnome/help/seahorse-plugins/oc/figures/recipients.png
-share/gnome/help/seahorse-plugins/oc/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/oc/figures/signature.png
-share/gnome/help/seahorse-plugins/oc/figures/text-editor.png
share/gnome/help/seahorse-plugins/oc/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/ru/figures/export.png
-share/gnome/help/seahorse-plugins/ru/figures/file-manager.png
-share/gnome/help/seahorse-plugins/ru/figures/generate.png
-share/gnome/help/seahorse-plugins/ru/figures/import.png
-share/gnome/help/seahorse-plugins/ru/figures/key-manager.png
-share/gnome/help/seahorse-plugins/ru/figures/key-properties.png
-share/gnome/help/seahorse-plugins/ru/figures/passphrase.png
-share/gnome/help/seahorse-plugins/ru/figures/preferences.png
-share/gnome/help/seahorse-plugins/ru/figures/recipients.png
-share/gnome/help/seahorse-plugins/ru/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/ru/figures/signature.png
-share/gnome/help/seahorse-plugins/ru/figures/text-editor.png
share/gnome/help/seahorse-plugins/ru/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/sv/figures/export.png
-share/gnome/help/seahorse-plugins/sv/figures/file-manager.png
-share/gnome/help/seahorse-plugins/sv/figures/generate.png
-share/gnome/help/seahorse-plugins/sv/figures/import.png
-share/gnome/help/seahorse-plugins/sv/figures/key-manager.png
-share/gnome/help/seahorse-plugins/sv/figures/key-properties.png
-share/gnome/help/seahorse-plugins/sv/figures/passphrase.png
-share/gnome/help/seahorse-plugins/sv/figures/preferences.png
-share/gnome/help/seahorse-plugins/sv/figures/recipients.png
-share/gnome/help/seahorse-plugins/sv/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/sv/figures/signature.png
-share/gnome/help/seahorse-plugins/sv/figures/text-editor.png
share/gnome/help/seahorse-plugins/sv/seahorse-plugins.xml
-share/gnome/help/seahorse-plugins/vi/figures/export.png
-share/gnome/help/seahorse-plugins/vi/figures/file-manager.png
-share/gnome/help/seahorse-plugins/vi/figures/generate.png
-share/gnome/help/seahorse-plugins/vi/figures/import.png
-share/gnome/help/seahorse-plugins/vi/figures/key-manager.png
-share/gnome/help/seahorse-plugins/vi/figures/key-properties.png
-share/gnome/help/seahorse-plugins/vi/figures/passphrase.png
-share/gnome/help/seahorse-plugins/vi/figures/preferences.png
-share/gnome/help/seahorse-plugins/vi/figures/recipients.png
-share/gnome/help/seahorse-plugins/vi/figures/seahorse-window.png
-share/gnome/help/seahorse-plugins/vi/figures/signature.png
-share/gnome/help/seahorse-plugins/vi/figures/text-editor.png
share/gnome/help/seahorse-plugins/vi/seahorse-plugins.xml
share/icons/hicolor/48x48/apps/seahorse-applet.png
share/icons/hicolor/scalable/apps/seahorse-applet.svg
share/locale/ar/LC_MESSAGES/seahorse-plugins.mo
+share/locale/as/LC_MESSAGES/seahorse-plugins.mo
share/locale/az/LC_MESSAGES/seahorse-plugins.mo
share/locale/be@latin/LC_MESSAGES/seahorse-plugins.mo
share/locale/bg/LC_MESSAGES/seahorse-plugins.mo
@@ -217,6 +75,7 @@ share/locale/it/LC_MESSAGES/seahorse-plugins.mo
share/locale/ja/LC_MESSAGES/seahorse-plugins.mo
share/locale/kn/LC_MESSAGES/seahorse-plugins.mo
share/locale/ko/LC_MESSAGES/seahorse-plugins.mo
+share/locale/ku/LC_MESSAGES/seahorse-plugins.mo
share/locale/lt/LC_MESSAGES/seahorse-plugins.mo
share/locale/lv/LC_MESSAGES/seahorse-plugins.mo
share/locale/mk/LC_MESSAGES/seahorse-plugins.mo
@@ -261,6 +120,7 @@ share/omf/seahorse-applet/seahorse-applet-ru.omf
share/omf/seahorse-applet/seahorse-applet-sv.omf
share/omf/seahorse-applet/seahorse-applet-vi.omf
share/omf/seahorse-plugins/seahorse-plugins-C.omf
+share/omf/seahorse-plugins/seahorse-plugins-ca.omf
share/omf/seahorse-plugins/seahorse-plugins-cs.omf
share/omf/seahorse-plugins/seahorse-plugins-de.omf
share/omf/seahorse-plugins/seahorse-plugins-el.omf
@@ -325,29 +185,18 @@ share/pixmaps/seahorse-plugins/scalable/seahorse-sign.svg
@dirrmtry share/pixmaps/seahorse-plugins
@dirrm share/omf/seahorse-plugins
@dirrm share/omf/seahorse-applet
-@dirrm share/gnome/help/seahorse-plugins/vi/figures
@dirrm share/gnome/help/seahorse-plugins/vi
-@dirrm share/gnome/help/seahorse-plugins/sv/figures
@dirrm share/gnome/help/seahorse-plugins/sv
-@dirrm share/gnome/help/seahorse-plugins/ru/figures
@dirrm share/gnome/help/seahorse-plugins/ru
-@dirrm share/gnome/help/seahorse-plugins/oc/figures
@dirrm share/gnome/help/seahorse-plugins/oc
-@dirrm share/gnome/help/seahorse-plugins/it/figures
@dirrm share/gnome/help/seahorse-plugins/it
-@dirrm share/gnome/help/seahorse-plugins/fr/figures
@dirrm share/gnome/help/seahorse-plugins/fr
-@dirrm share/gnome/help/seahorse-plugins/es/figures
@dirrm share/gnome/help/seahorse-plugins/es
-@dirrm share/gnome/help/seahorse-plugins/en_GB/figures
@dirrm share/gnome/help/seahorse-plugins/en_GB
-@dirrm share/gnome/help/seahorse-plugins/el/figures
@dirrm share/gnome/help/seahorse-plugins/el
-@dirrm share/gnome/help/seahorse-plugins/de/figures
@dirrm share/gnome/help/seahorse-plugins/de
-@dirrm share/gnome/help/seahorse-plugins/cs/figures
@dirrm share/gnome/help/seahorse-plugins/cs
-@dirrm share/gnome/help/seahorse-plugins/C/figures
+@dirrm share/gnome/help/seahorse-plugins/ca
@dirrm share/gnome/help/seahorse-plugins/C
@dirrm share/gnome/help/seahorse-plugins
@dirrm share/gnome/help/seahorse-applet/vi
@@ -378,9 +227,13 @@ share/pixmaps/seahorse-plugins/scalable/seahorse-sign.svg
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@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/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 7e20072ec6b4..c81e5742037f 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -3,12 +3,11 @@
# Whom: Dave McKay <dave@mu.org>
#
# $FreeBSD$
-# $MCom: ports/security/seahorse/Makefile,v 1.73 2008/11/24 02:44:50 marcus Exp $
+# $MCom: ports/security/seahorse/Makefile,v 1.79 2009/03/15 01:01:47 marcus Exp $
#
PORTNAME= seahorse
-PORTVERSION= 2.24.1
-PORTREVISION= 1
+PORTVERSION= 2.26.0
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -23,6 +22,7 @@ LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme \
gnome-keyring:${PORTSDIR}/security/gnome-keyring \
soup-2.4.1:${PORTSDIR}/devel/libsoup
+USE_XORG= sm
USE_LDCONFIG= yes
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 0ca292a08fc0..5c23c096aad3 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seahorse-2.24.1.tar.bz2) = b35076c2ae46aa58d9b1ca76fe929515
-SHA256 (gnome2/seahorse-2.24.1.tar.bz2) = b86c045fe1d8cf7a3fd56e078175e32cd94154eb77f9fe2a4a4e1f1aa13a5d04
-SIZE (gnome2/seahorse-2.24.1.tar.bz2) = 2197087
+MD5 (gnome2/seahorse-2.26.0.tar.bz2) = ddecca2181d4c9f0dfbe412b68508e5d
+SHA256 (gnome2/seahorse-2.26.0.tar.bz2) = 7918c4fff6fa3d5fc303fdbd6bc7e7579ce47010174550d4e7fc9e0b3e69540e
+SIZE (gnome2/seahorse-2.26.0.tar.bz2) = 2151482
diff --git a/security/seahorse/files/patch-common_seahorse-registry.c b/security/seahorse/files/patch-common_seahorse-registry.c
index a9b0cc424a6e..d3ab78c0de42 100644
--- a/security/seahorse/files/patch-common_seahorse-registry.c
+++ b/security/seahorse/files/patch-common_seahorse-registry.c
@@ -1,6 +1,6 @@
---- common/seahorse-registry.c.orig 2008-11-23 18:26:38.000000000 -0500
-+++ common/seahorse-registry.c 2008-11-23 19:20:08.000000000 -0500
-@@ -49,6 +49,25 @@ cleanup_registry (void *unused)
+--- common/seahorse-registry.c.orig 2009-02-14 19:20:38.000000000 +0100
++++ common/seahorse-registry.c 2009-02-24 21:15:26.000000000 +0100
+@@ -51,6 +51,25 @@
registry_singleton = NULL;
}
@@ -26,51 +26,19 @@
static void
keys_to_list (gpointer key, gpointer value, gpointer user_data)
{
-@@ -61,6 +80,7 @@ register_type_for_category (SeahorseRegi
+@@ -63,13 +82,14 @@
+ gpointer value, GDestroyNotify destroy_func)
{
- SeahorseRegistryPrivate *pv = SEAHORSE_REGISTRY_GET_PRIVATE (registry);
GHashTable *set;
+ SeahorseRegistryType *rtype;
- g_return_if_fail (SEAHORSE_IS_REGISTRY (registry));
+ g_return_if_fail (table);
g_return_if_fail (category);
-@@ -68,11 +88,14 @@ register_type_for_category (SeahorseRegi
- set = g_hash_table_lookup (pv->categories, category);
+ set = g_hash_table_lookup (table, GUINT_TO_POINTER (category));
if (!set) {
-- set = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, NULL);
-+ set = g_hash_table_new_full (registry_hash, registry_equal, (GDestroyNotify) g_free, NULL);
- g_hash_table_replace (pv->categories, g_strdup (category), set);
+- set = g_hash_table_new_full (g_direct_hash, g_direct_equal, destroy_func, NULL);
++ set = g_hash_table_new_full (registry_hash, registry_equal, destroy_func, NULL);
+ g_hash_table_replace (table, GUINT_TO_POINTER (category), set);
}
-+
-+ rtype = g_new (SeahorseRegistryType, 1);
-+ rtype->type = type;
-- g_hash_table_replace (set, GUINT_TO_POINTER (type), NO_VALUE);
-+ g_hash_table_replace (set, rtype, NO_VALUE);
- }
-
- static GList*
-@@ -115,6 +138,7 @@ lookup_types (SeahorseRegistry *registry
-
- /* Go through each item in list and make sure it exists in this cat */
- for (l = types; l; l = l ? g_list_next (l) : types) {
-+ SeahorseRegistryType *rtype;
- type = l;
- if (!g_hash_table_lookup (set, type->data)) {
- l = g_list_previous (l);
-@@ -224,8 +248,12 @@ seahorse_registry_find_type (SeahorseReg
- va_end (cats);
-
- type = 0;
-- if (types)
-- type = GPOINTER_TO_UINT (types->data);
-+ if (types) {
-+ SeahorseRegistryType *rtype;
-+
-+ rtype = (SeahorseRegistryType *) types->data;
-+ type = rtype->type;
-+ }
- g_list_free (types);
- return type;
- }
diff --git a/security/seahorse/files/patch-src_seahorse-generate-select.c b/security/seahorse/files/patch-src_seahorse-generate-select.c
deleted file mode 100644
index 7de1b7ff476d..000000000000
--- a/security/seahorse/files/patch-src_seahorse-generate-select.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/seahorse-generate-select.c.orig 2008-11-23 18:28:34.000000000 -0500
-+++ src/seahorse-generate-select.c 2008-11-23 18:29:30.000000000 -0500
-@@ -197,8 +197,10 @@ static GObject * seahorse_generate_selec
- GList* typ_it;
- typ_collection = types;
- for (typ_it = typ_collection; typ_it != NULL; typ_it = typ_it->next) {
-+ SeahorseRegistryType *rtype;
- GType typ;
-- typ = GPOINTER_TO_INT (typ_it->data);
-+ rtype = (SeahorseRegistryType *) typ_it->data;
-+ typ = rtype->type;
- {
- SeahorseGenerator* generator;
- gint _tmp5;
diff --git a/security/seahorse/files/patch-src_seahorse-viewer.c b/security/seahorse/files/patch-src_seahorse-viewer.c
deleted file mode 100644
index 5acb2e00d676..000000000000
--- a/security/seahorse/files/patch-src_seahorse-viewer.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/seahorse-viewer.c.orig 2008-11-23 18:27:49.000000000 -0500
-+++ src/seahorse-viewer.c 2008-11-23 18:28:27.000000000 -0500
-@@ -556,10 +556,13 @@ seahorse_viewer_constructor (GType type,
- /* Setup the commands */
- types = seahorse_registry_find_types (seahorse_registry_get (), "commands", NULL, NULL);
- for (l = types; l; l = g_list_next (l)) {
-- GType typ = GPOINTER_TO_INT (l->data);
-+ SeahorseRegistryType *rtype = (SeahorseRegistryType *) l->data;
-+ GType typ;
- SeahorseCommands *commands;
- GtkActionGroup *actions;
- const gchar *uidef;
-+
-+ typ = rtype->type;
-
- /* Add each commands to our hash table */
- commands = g_object_new (typ, "view", self, NULL);
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index a94f07390a6f..0f64a8613cca 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -1,5 +1,6 @@
bin/seahorse
bin/seahorse-daemon
+etc/xdg/autostart/seahorse-daemon.desktop
include/libcryptui/cryptui-key-chooser.h
include/libcryptui/cryptui-key-combo.h
include/libcryptui/cryptui-key-list.h
@@ -15,136 +16,50 @@ lib/seahorse/xloadimage
libdata/pkgconfig/cryptui-0.0.pc
share/applications/seahorse.desktop
share/dbus-1/services/org.gnome.seahorse.service
-share/gnome/help/seahorse/C/figures/export.png
-share/gnome/help/seahorse/C/figures/file-manager.png
-share/gnome/help/seahorse/C/figures/generate.png
-share/gnome/help/seahorse/C/figures/import.png
-share/gnome/help/seahorse/C/figures/key-manager.png
-share/gnome/help/seahorse/C/figures/key-properties.png
-share/gnome/help/seahorse/C/figures/passphrase.png
-share/gnome/help/seahorse/C/figures/preferences.png
-share/gnome/help/seahorse/C/figures/recipients.png
+share/doc/libcryptui/ch01.html
+share/doc/libcryptui/home.png
+share/doc/libcryptui/index.html
+share/doc/libcryptui/index.sgml
+share/doc/libcryptui/left.png
+share/doc/libcryptui/libcryptui-CryptUIKeyChooser.html
+share/doc/libcryptui/libcryptui-CryptUIKeyStore.html
+share/doc/libcryptui/libcryptui-CryptUIKeyset.html
+share/doc/libcryptui/libcryptui-cryptui-defines.html
+share/doc/libcryptui/libcryptui-cryptui-key-combo.html
+share/doc/libcryptui/libcryptui-cryptui-key-list.html
+share/doc/libcryptui/libcryptui-cryptui-marshal.html
+share/doc/libcryptui/libcryptui-cryptui.html
+share/doc/libcryptui/libcryptui.devhelp
+share/doc/libcryptui/libcryptui.devhelp2
+share/doc/libcryptui/right.png
+share/doc/libcryptui/style.css
+share/doc/libcryptui/up.png
share/gnome/help/seahorse/C/figures/seahorse-window.png
-share/gnome/help/seahorse/C/figures/signature.png
-share/gnome/help/seahorse/C/figures/text-editor.png
share/gnome/help/seahorse/C/legal.xml
share/gnome/help/seahorse/C/seahorse.xml
-share/gnome/help/seahorse/de/figures/export.png
-share/gnome/help/seahorse/de/figures/file-manager.png
-share/gnome/help/seahorse/de/figures/generate.png
-share/gnome/help/seahorse/de/figures/import.png
-share/gnome/help/seahorse/de/figures/key-manager.png
-share/gnome/help/seahorse/de/figures/key-properties.png
-share/gnome/help/seahorse/de/figures/passphrase.png
-share/gnome/help/seahorse/de/figures/preferences.png
-share/gnome/help/seahorse/de/figures/recipients.png
+share/gnome/help/seahorse/ca/figures/seahorse-window.png
+share/gnome/help/seahorse/ca/seahorse.xml
share/gnome/help/seahorse/de/figures/seahorse-window.png
-share/gnome/help/seahorse/de/figures/signature.png
-share/gnome/help/seahorse/de/figures/text-editor.png
share/gnome/help/seahorse/de/seahorse.xml
-share/gnome/help/seahorse/en_GB/figures/export.png
-share/gnome/help/seahorse/en_GB/figures/file-manager.png
-share/gnome/help/seahorse/en_GB/figures/generate.png
-share/gnome/help/seahorse/en_GB/figures/import.png
-share/gnome/help/seahorse/en_GB/figures/key-manager.png
-share/gnome/help/seahorse/en_GB/figures/key-properties.png
-share/gnome/help/seahorse/en_GB/figures/passphrase.png
-share/gnome/help/seahorse/en_GB/figures/preferences.png
-share/gnome/help/seahorse/en_GB/figures/recipients.png
+share/gnome/help/seahorse/el/figures/seahorse-window.png
+share/gnome/help/seahorse/el/seahorse.xml
share/gnome/help/seahorse/en_GB/figures/seahorse-window.png
-share/gnome/help/seahorse/en_GB/figures/signature.png
-share/gnome/help/seahorse/en_GB/figures/text-editor.png
share/gnome/help/seahorse/en_GB/seahorse.xml
-share/gnome/help/seahorse/es/figures/export.png
-share/gnome/help/seahorse/es/figures/file-manager.png
-share/gnome/help/seahorse/es/figures/generate.png
-share/gnome/help/seahorse/es/figures/import.png
-share/gnome/help/seahorse/es/figures/key-manager.png
-share/gnome/help/seahorse/es/figures/key-properties.png
-share/gnome/help/seahorse/es/figures/passphrase.png
-share/gnome/help/seahorse/es/figures/preferences.png
-share/gnome/help/seahorse/es/figures/recipients.png
share/gnome/help/seahorse/es/figures/seahorse-window.png
-share/gnome/help/seahorse/es/figures/signature.png
-share/gnome/help/seahorse/es/figures/text-editor.png
share/gnome/help/seahorse/es/seahorse.xml
-share/gnome/help/seahorse/fr/figures/export.png
-share/gnome/help/seahorse/fr/figures/file-manager.png
-share/gnome/help/seahorse/fr/figures/generate.png
-share/gnome/help/seahorse/fr/figures/import.png
-share/gnome/help/seahorse/fr/figures/key-manager.png
-share/gnome/help/seahorse/fr/figures/key-properties.png
-share/gnome/help/seahorse/fr/figures/passphrase.png
-share/gnome/help/seahorse/fr/figures/preferences.png
-share/gnome/help/seahorse/fr/figures/recipients.png
+share/gnome/help/seahorse/eu/figures/seahorse-window.png
+share/gnome/help/seahorse/eu/seahorse.xml
share/gnome/help/seahorse/fr/figures/seahorse-window.png
-share/gnome/help/seahorse/fr/figures/signature.png
-share/gnome/help/seahorse/fr/figures/text-editor.png
share/gnome/help/seahorse/fr/seahorse.xml
-share/gnome/help/seahorse/it/figures/export.png
-share/gnome/help/seahorse/it/figures/file-manager.png
-share/gnome/help/seahorse/it/figures/generate.png
-share/gnome/help/seahorse/it/figures/import.png
-share/gnome/help/seahorse/it/figures/key-manager.png
-share/gnome/help/seahorse/it/figures/key-properties.png
-share/gnome/help/seahorse/it/figures/passphrase.png
-share/gnome/help/seahorse/it/figures/preferences.png
-share/gnome/help/seahorse/it/figures/recipients.png
share/gnome/help/seahorse/it/figures/seahorse-window.png
-share/gnome/help/seahorse/it/figures/signature.png
-share/gnome/help/seahorse/it/figures/text-editor.png
share/gnome/help/seahorse/it/seahorse.xml
-share/gnome/help/seahorse/oc/figures/export.png
-share/gnome/help/seahorse/oc/figures/file-manager.png
-share/gnome/help/seahorse/oc/figures/generate.png
-share/gnome/help/seahorse/oc/figures/import.png
-share/gnome/help/seahorse/oc/figures/key-manager.png
-share/gnome/help/seahorse/oc/figures/key-properties.png
-share/gnome/help/seahorse/oc/figures/passphrase.png
-share/gnome/help/seahorse/oc/figures/preferences.png
-share/gnome/help/seahorse/oc/figures/recipients.png
share/gnome/help/seahorse/oc/figures/seahorse-window.png
-share/gnome/help/seahorse/oc/figures/signature.png
-share/gnome/help/seahorse/oc/figures/text-editor.png
share/gnome/help/seahorse/oc/seahorse.xml
-share/gnome/help/seahorse/ru/figures/export.png
-share/gnome/help/seahorse/ru/figures/file-manager.png
-share/gnome/help/seahorse/ru/figures/generate.png
-share/gnome/help/seahorse/ru/figures/import.png
-share/gnome/help/seahorse/ru/figures/key-manager.png
-share/gnome/help/seahorse/ru/figures/key-properties.png
-share/gnome/help/seahorse/ru/figures/passphrase.png
-share/gnome/help/seahorse/ru/figures/preferences.png
-share/gnome/help/seahorse/ru/figures/recipients.png
share/gnome/help/seahorse/ru/figures/seahorse-window.png
-share/gnome/help/seahorse/ru/figures/signature.png
-share/gnome/help/seahorse/ru/figures/text-editor.png
share/gnome/help/seahorse/ru/seahorse.xml
-share/gnome/help/seahorse/sv/figures/export.png
-share/gnome/help/seahorse/sv/figures/file-manager.png
-share/gnome/help/seahorse/sv/figures/generate.png
-share/gnome/help/seahorse/sv/figures/import.png
-share/gnome/help/seahorse/sv/figures/key-manager.png
-share/gnome/help/seahorse/sv/figures/key-properties.png
-share/gnome/help/seahorse/sv/figures/passphrase.png
-share/gnome/help/seahorse/sv/figures/preferences.png
-share/gnome/help/seahorse/sv/figures/recipients.png
share/gnome/help/seahorse/sv/figures/seahorse-window.png
-share/gnome/help/seahorse/sv/figures/signature.png
-share/gnome/help/seahorse/sv/figures/text-editor.png
share/gnome/help/seahorse/sv/seahorse.xml
-share/gnome/help/seahorse/vi/figures/export.png
-share/gnome/help/seahorse/vi/figures/file-manager.png
-share/gnome/help/seahorse/vi/figures/generate.png
-share/gnome/help/seahorse/vi/figures/import.png
-share/gnome/help/seahorse/vi/figures/key-manager.png
-share/gnome/help/seahorse/vi/figures/key-properties.png
-share/gnome/help/seahorse/vi/figures/passphrase.png
-share/gnome/help/seahorse/vi/figures/preferences.png
-share/gnome/help/seahorse/vi/figures/recipients.png
share/gnome/help/seahorse/vi/figures/seahorse-window.png
-share/gnome/help/seahorse/vi/figures/signature.png
-share/gnome/help/seahorse/vi/figures/text-editor.png
share/gnome/help/seahorse/vi/seahorse.xml
share/icons/hicolor/16x16/apps/seahorse-preferences.png
share/icons/hicolor/16x16/apps/seahorse.png
@@ -185,6 +100,7 @@ share/locale/hu/LC_MESSAGES/seahorse.mo
share/locale/it/LC_MESSAGES/seahorse.mo
share/locale/ja/LC_MESSAGES/seahorse.mo
share/locale/kn/LC_MESSAGES/seahorse.mo
+share/locale/ku/LC_MESSAGES/seahorse.mo
share/locale/ko/LC_MESSAGES/seahorse.mo
share/locale/lt/LC_MESSAGES/seahorse.mo
share/locale/lv/LC_MESSAGES/seahorse.mo
@@ -221,9 +137,12 @@ share/locale/zh_CN/LC_MESSAGES/seahorse.mo
share/locale/zh_HK/LC_MESSAGES/seahorse.mo
share/locale/zh_TW/LC_MESSAGES/seahorse.mo
share/omf/seahorse/seahorse-C.omf
+share/omf/seahorse/seahorse-ca.omf
share/omf/seahorse/seahorse-de.omf
+share/omf/seahorse/seahorse-el.omf
share/omf/seahorse/seahorse-en_GB.omf
share/omf/seahorse/seahorse-es.omf
+share/omf/seahorse/seahorse-eu.omf
share/omf/seahorse/seahorse-fr.omf
share/omf/seahorse/seahorse-it.omf
share/omf/seahorse/seahorse-oc.omf
@@ -263,7 +182,8 @@ share/pixmaps/seahorse/scalable/seahorse-sign.svg
%%DATADIR%%/glade/seahorse-change-passphrase.glade
%%DATADIR%%/glade/seahorse-expires.glade
%%DATADIR%%/glade/seahorse-generate-select.glade
-%%DATADIR%%/glade/seahorse-gkeyring-item-properties.glade
+%%DATADIR%%/glade/seahorse-gkr-item-properties.glade
+%%DATADIR%%/glade/seahorse-gkr-keyring.glade
%%DATADIR%%/glade/seahorse-key-manager.glade
%%DATADIR%%/glade/seahorse-key-manager.ui
%%DATADIR%%/glade/seahorse-keyserver-results.glade
@@ -301,15 +221,22 @@ share/pixmaps/seahorse/scalable/seahorse-sign.svg
@dirrm share/gnome/help/seahorse/it
@dirrm share/gnome/help/seahorse/fr/figures
@dirrm share/gnome/help/seahorse/fr
+@dirrm share/gnome/help/seahorse/eu/figures
+@dirrm share/gnome/help/seahorse/eu
@dirrm share/gnome/help/seahorse/es/figures
@dirrm share/gnome/help/seahorse/es
@dirrm share/gnome/help/seahorse/en_GB/figures
@dirrm share/gnome/help/seahorse/en_GB
+@dirrm share/gnome/help/seahorse/el/figures
+@dirrm share/gnome/help/seahorse/el
@dirrm share/gnome/help/seahorse/de/figures
@dirrm share/gnome/help/seahorse/de
+@dirrm share/gnome/help/seahorse/ca/figures
+@dirrm share/gnome/help/seahorse/ca
@dirrm share/gnome/help/seahorse/C/figures
@dirrm share/gnome/help/seahorse/C
@dirrm share/gnome/help/seahorse
+@dirrm share/doc/libcryptui
@dirrmtry share/applications
@dirrm lib/seahorse
@dirrm include/libcryptui
@@ -327,6 +254,8 @@ share/pixmaps/seahorse/scalable/seahorse-sign.svg
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/security/tuntun/Makefile b/security/tuntun/Makefile
index 450737825e0c..acdfb884cea4 100644
--- a/security/tuntun/Makefile
+++ b/security/tuntun/Makefile
@@ -14,6 +14,8 @@ MAINTAINER= anderson@cnpm.embrapa.br
COMMENT= A Gnome applet gui for OpenVPN
GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \
+ LIBS="`pkg-config --libs libgnomeui-2.0`"
CONFIGURE_ARGS= --libdir=${PREFIX}/libdata/servers
USE_GMAKE= yes
diff --git a/sysutils/Makefile b/sysutils/Makefile
index a31f4047b56d..ca23562019b8 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -296,7 +296,6 @@
SUBDIR += gnome-settings-daemon
SUBDIR += gnome-system-monitor
SUBDIR += gnome-system-tools
- SUBDIR += gnome-volume-manager
SUBDIR += gnome_subr
SUBDIR += gnomebaker
SUBDIR += gnomefind
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index d915447a33ca..1121385058d9 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/brasero/Makefile,v 1.34 2009/01/09 22:03:01 kwm Exp $
+# $MCom: ports/sysutils/brasero/Makefile,v 1.43 2009/03/22 00:17:29 marcus Exp $
PORTNAME= brasero
-PORTVERSION= 0.8.4
-PORTREVISION= 3
+PORTVERSION= 2.26.0
+PORTREVISION= 1
CATEGORIES= sysutils audio multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,20 +17,36 @@ COMMENT= CD/DVD mastering tool for the GNOME desktop
LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \
totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser
+RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
+ cdrdao:${PORTSDIR}/sysutils/cdrdao
USE_GETTEXT= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GNOME= gnomehier nautiluscdburner
+USE_XORG= sm
+USE_GNOME= intlhack gnomeprefix gnomehack nautilus2
USE_GSTREAMER= gconf core
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-CONFIGURE_ARGS= --disable-inotify
+CONFIGURE_ARGS= --disable-inotify --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_CAM_LIB_H=1" \
LDFLAGS="-L${LOCALBASE}/lib"
MAN1= brasero.1
GCONF_SCHEMAS= brasero.schemas
-.include <bsd.port.mk>
+OPTIONS= LIBBURNIA "Enable libburnia plug-ins" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_LIBBURNIA)
+LIB_DEPENDS+= burn.4:${PORTSDIR}/devel/libburn \
+ isofs.6:${PORTSDIR}/devel/libisofs
+CONFIGURE_ARGS+=--enable-libburnia
+PLIST_SUB+= LIBBURNIA=""
+.else
+PLIST_SUB+= LIBBURNIA="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo
index c63fa75cf437..d1776af4b68c 100644
--- a/sysutils/brasero/distinfo
+++ b/sysutils/brasero/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/brasero-0.8.4.tar.bz2) = 5d0ad796e1f7b68a31f8757f1b3f9aef
-SHA256 (gnome2/brasero-0.8.4.tar.bz2) = 6cbe0367e9049f6c93d67f6d9a48b530430e52d3d48ec3ae4b9bc96b79870bba
-SIZE (gnome2/brasero-0.8.4.tar.bz2) = 2755878
+MD5 (gnome2/brasero-2.26.0.tar.bz2) = ef968fe98874da4e26b61591ee57be4a
+SHA256 (gnome2/brasero-2.26.0.tar.bz2) = a1d3568f4e6d68e824884c0e06acd38fdd6cf142231ca6ded2647b95ab289c8a
+SIZE (gnome2/brasero-2.26.0.tar.bz2) = 3129146
diff --git a/sysutils/brasero/files/patch-src_brasero-data-project.c b/sysutils/brasero/files/patch-src_brasero-data-project.c
deleted file mode 100644
index e1f559f12ce1..000000000000
--- a/sysutils/brasero/files/patch-src_brasero-data-project.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/brasero-data-project.c.orig 2008-12-14 07:53:07.000000000 -0500
-+++ src/brasero-data-project.c 2009-02-27 01:26:42.000000000 -0500
-@@ -545,7 +545,7 @@ brasero_data_project_uri_to_nodes (Brase
- if (graft)
- break;
-
-- dirname (parent);
-+ parent = dirname (parent);
- }
-
- if (!graft) {
-@@ -721,7 +721,7 @@ brasero_data_project_uri_has_parent (Bra
- return TRUE;
- }
-
-- dirname (parent);
-+ parent = dirname (parent);
- }
-
- g_free (parent);
-@@ -795,7 +795,7 @@ brasero_data_project_uri_is_graft_needed
- * node is missing. */
- graft_parent = g_hash_table_lookup (priv->grafts, parent);
- while (parent && !graft_parent) {
-- dirname (parent);
-+ parent = dirname (parent);
- graft_parent = g_hash_table_lookup (priv->grafts, parent);
- }
- g_free (parent);
-@@ -2787,7 +2787,7 @@ brasero_data_project_add_excluded_uri (B
- break;
-
- graft = NULL;
-- dirname (parent_uri);
-+ parent_uri = dirname (parent_uri);
- }
- g_free (parent_uri);
-
diff --git a/sysutils/brasero/files/patch-src_scsi-cam.c b/sysutils/brasero/files/patch-src_scsi-cam.c
deleted file mode 100644
index 74546979f326..000000000000
--- a/sysutils/brasero/files/patch-src_scsi-cam.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/scsi-cam.c.orig 2009-01-13 21:35:42.000000000 -0500
-+++ src/scsi-cam.c 2009-01-13 21:36:01.000000000 -0500
-@@ -62,7 +62,7 @@ typedef struct _BraseroScsiCmd BraseroSc
- #define BRASERO_SCSI_CMD_OPCODE_OFF 0
- #define BRASERO_SCSI_CMD_SET_OPCODE(command) (command->cmd [BRASERO_SCSI_CMD_OPCODE_OFF] = command->info->opcode)
-
--#define OPEN_FLAGS O_RDWR /*|O_EXCL */|O_NONBLOCK
-+#define OPEN_FLAGS O_RDONLY /*|O_EXCL */|O_NONBLOCK
-
- BraseroScsiResult
- brasero_scsi_command_issue_sync (gpointer command,
-@@ -158,8 +158,8 @@ brasero_device_handle_open (const gchar
-
- g_assert (path != NULL);
-
-- if (exclusive)
-- flags |= O_EXCL;
-+/* if (exclusive)
-+ flags |= O_EXCL;*/
-
- /* cam_open_device() fails unless we use O_RDWR */
- cam = cam_open_device (path, O_RDWR);
diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist
index 20c2908fd45d..b2536ed17af0 100644
--- a/sysutils/brasero/pkg-plist
+++ b/sysutils/brasero/pkg-plist
@@ -1,4 +1,12 @@
bin/brasero
+include/brasero/brasero-drive-selection.h
+include/brasero/brasero-drive.h
+include/brasero/brasero-media.h
+include/brasero/brasero-medium-monitor.h
+include/brasero/brasero-medium-selection.h
+include/brasero/brasero-medium.h
+include/brasero/brasero-units.h
+include/brasero/brasero-volume.h
lib/brasero/plugins/libbrasero-burn-uri.la
lib/brasero/plugins/libbrasero-burn-uri.so
lib/brasero/plugins/libbrasero-cdrdao.la
@@ -19,6 +27,10 @@ lib/brasero/plugins/libbrasero-genisoimage.la
lib/brasero/plugins/libbrasero-genisoimage.so
lib/brasero/plugins/libbrasero-growisofs.la
lib/brasero/plugins/libbrasero-growisofs.so
+%%LIBBURNIA%%lib/brasero/plugins/libbrasero-libburn.la
+%%LIBBURNIA%%lib/brasero/plugins/libbrasero-libburn.so
+%%LIBBURNIA%%lib/brasero/plugins/libbrasero-libisofs.la
+%%LIBBURNIA%%lib/brasero/plugins/libbrasero-libisofs.so
lib/brasero/plugins/libbrasero-local-track.la
lib/brasero/plugins/libbrasero-local-track.so
lib/brasero/plugins/libbrasero-mkisofs.la
@@ -39,10 +51,15 @@ lib/brasero/plugins/libbrasero-vob.la
lib/brasero/plugins/libbrasero-vob.so
lib/brasero/plugins/libbrasero-wodim.la
lib/brasero/plugins/libbrasero-wodim.so
+lib/libbrasero-media.la
+lib/libbrasero-media.so
+lib/libbrasero-media.so.1
lib/nautilus/extensions-2.0/libnautilus-brasero-extension.la
lib/nautilus/extensions-2.0/libnautilus-brasero-extension.so
+libdata/pkgconfig/libbrasero-media.pc
share/applications/brasero.desktop
share/applications/brasero-copy-medium.desktop
+share/applications/brasero-nautilus.desktop
share/applications/brasero-open-image.desktop
share/applications/brasero-open-playlist.desktop
share/applications/brasero-open-project.desktop
@@ -201,6 +218,24 @@ share/applications/brasero-open-project.desktop
%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-90.svg
%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-95.svg
%%DATADIR%%/logo.png
+%%DOCSDIR%%/BraseroDrive.html
+%%DOCSDIR%%/BraseroDriveSelection.html
+%%DOCSDIR%%/BraseroMedium.html
+%%DOCSDIR%%/BraseroMediumMonitor.html
+%%DOCSDIR%%/BraseroMediumSelection.html
+%%DOCSDIR%%/BraseroVolume.html
+%%DOCSDIR%%/brasero-brasero-media.html
+%%DOCSDIR%%/brasero-brasero-units.html
+%%DOCSDIR%%/brasero.devhelp
+%%DOCSDIR%%/brasero.devhelp2
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
share/gnome/help/brasero/C/brasero.xml
share/gnome/help/brasero/C/figures/brasero_main.png
share/gnome/help/brasero/C/legal.xml
@@ -208,6 +243,8 @@ share/gnome/help/brasero/de/brasero.xml
share/gnome/help/brasero/de/figures/brasero_main.png
share/gnome/help/brasero/el/brasero.xml
share/gnome/help/brasero/el/figures/brasero_main.png
+share/gnome/help/brasero/en_GB/brasero.xml
+share/gnome/help/brasero/en_GB/figures/brasero_main.png
share/gnome/help/brasero/es/brasero.xml
share/gnome/help/brasero/es/figures/brasero_main.png
share/gnome/help/brasero/fr/brasero.xml
@@ -227,6 +264,8 @@ share/icons/hicolor/32x32/apps/brasero.png
share/icons/hicolor/48x48/apps/brasero.png
share/icons/hicolor/scalable/apps/brasero.svg
share/locale/ar/LC_MESSAGES/brasero.mo
+share/locale/bg/LC_MESSAGES/brasero.mo
+share/locale/bn_IN/LC_MESSAGES/brasero.mo
share/locale/ca/LC_MESSAGES/brasero.mo
share/locale/cs/LC_MESSAGES/brasero.mo
share/locale/da/LC_MESSAGES/brasero.mo
@@ -236,18 +275,27 @@ share/locale/el/LC_MESSAGES/brasero.mo
share/locale/en_GB/LC_MESSAGES/brasero.mo
share/locale/es/LC_MESSAGES/brasero.mo
share/locale/et/LC_MESSAGES/brasero.mo
+share/locale/eu/LC_MESSAGES/brasero.mo
share/locale/fi/LC_MESSAGES/brasero.mo
share/locale/fr/LC_MESSAGES/brasero.mo
share/locale/gl/LC_MESSAGES/brasero.mo
+share/locale/gu/LC_MESSAGES/brasero.mo
share/locale/he/LC_MESSAGES/brasero.mo
+share/locale/hi/LC_MESSAGES/brasero.mo
share/locale/hu/LC_MESSAGES/brasero.mo
share/locale/it/LC_MESSAGES/brasero.mo
share/locale/ja/LC_MESSAGES/brasero.mo
+share/locale/kn/LC_MESSAGES/brasero.mo
+share/locale/ko/LC_MESSAGES/brasero.mo
share/locale/lt/LC_MESSAGES/brasero.mo
+share/locale/lv/LC_MESSAGES/brasero.mo
share/locale/mk/LC_MESSAGES/brasero.mo
+share/locale/ml/LC_MESSAGES/brasero.mo
+share/locale/mr/LC_MESSAGES/brasero.mo
share/locale/nb/LC_MESSAGES/brasero.mo
share/locale/nl/LC_MESSAGES/brasero.mo
share/locale/oc/LC_MESSAGES/brasero.mo
+share/locale/or/LC_MESSAGES/brasero.mo
share/locale/pa/LC_MESSAGES/brasero.mo
share/locale/pl/LC_MESSAGES/brasero.mo
share/locale/pt/LC_MESSAGES/brasero.mo
@@ -258,7 +306,10 @@ share/locale/sl/LC_MESSAGES/brasero.mo
share/locale/sr/LC_MESSAGES/brasero.mo
share/locale/sr@latin/LC_MESSAGES/brasero.mo
share/locale/sv/LC_MESSAGES/brasero.mo
+share/locale/ta/LC_MESSAGES/brasero.mo
+share/locale/te/LC_MESSAGES/brasero.mo
share/locale/th/LC_MESSAGES/brasero.mo
+share/locale/vi/LC_MESSAGES/brasero.mo
share/locale/zh_CN/LC_MESSAGES/brasero.mo
share/locale/zh_HK/LC_MESSAGES/brasero.mo
share/locale/zh_TW/LC_MESSAGES/brasero.mo
@@ -266,6 +317,7 @@ share/mime/packages/brasero.xml
share/omf/brasero/brasero-C.omf
share/omf/brasero/brasero-de.omf
share/omf/brasero/brasero-el.omf
+share/omf/brasero/brasero-en_GB.omf
share/omf/brasero/brasero-es.omf
share/omf/brasero/brasero-fr.omf
share/omf/brasero/brasero-it.omf
@@ -285,6 +337,8 @@ share/omf/brasero/brasero-sv.omf
@dirrm share/gnome/help/brasero/fr
@dirrm share/gnome/help/brasero/es/figures
@dirrm share/gnome/help/brasero/es
+@dirrm share/gnome/help/brasero/en_GB/figures
+@dirrm share/gnome/help/brasero/en_GB
@dirrm share/gnome/help/brasero/el/figures
@dirrm share/gnome/help/brasero/el
@dirrm share/gnome/help/brasero/de/figures
@@ -292,6 +346,7 @@ share/omf/brasero/brasero-sv.omf
@dirrm share/gnome/help/brasero/C/figures
@dirrm share/gnome/help/brasero/C
@dirrm share/gnome/help/brasero
+@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/icons/hicolor/16x16/status
@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
@dirrm %%DATADIR%%/icons/hicolor/16x16
@@ -315,17 +370,22 @@ share/omf/brasero/brasero-sv.omf
@dirrmtry share/applications
@dirrm lib/brasero/plugins
@dirrm lib/brasero
+@dirrm include/brasero
@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
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
+@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/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/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/sysutils/bubblemon2/Makefile b/sysutils/bubblemon2/Makefile
index 13d1db2207b8..44465b4f5858 100644
--- a/sysutils/bubblemon2/Makefile
+++ b/sysutils/bubblemon2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bubblemon2
PORTVERSION= 2.0.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= SAVANNAH/bubblemon
DISTNAME= bubblemon-${PORTVERSION}
@@ -20,8 +20,8 @@ LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop
USE_GNOME= gnomehack gnomepanel gnomeprefix gnometarget intlhack
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
+ LDFLAGS="-L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0`"
MAN1= bubblemon-gnome2.1
MANLANG= "" hu sv
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index b70b81a1d423..703e9dc1f5b8 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.73 2008/10/20 03:33:50 mezz Exp $
+# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.76 2009/03/18 04:05:53 marcus Exp $
#
PORTNAME= gconf-editor
-PORTVERSION= 2.24.1
+PORTVERSION= 2.26.0
PORTEPOCH= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index be688026ef07..55794c7fc31d 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconf-editor-2.24.1.tar.bz2) = 2fe93cb2ac8ea0d34860cc6d059076d8
-SHA256 (gnome2/gconf-editor-2.24.1.tar.bz2) = 7d63d9f4c23da91b2b06fe264ff4d1c40c20563220525837de7bb2dc442821fb
-SIZE (gnome2/gconf-editor-2.24.1.tar.bz2) = 1142041
+MD5 (gnome2/gconf-editor-2.26.0.tar.bz2) = 2dc76415b22d805cfacfcd5fb98f185c
+SHA256 (gnome2/gconf-editor-2.26.0.tar.bz2) = 2801ff7d595039292850d4f7d87b3f7c950e92dbcb39facfe62c6fb184640e1f
+SIZE (gnome2/gconf-editor-2.26.0.tar.bz2) = 1262213
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index 0847ce9d5ddd..f8ccc624fe97 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -8,35 +8,124 @@ share/applications/gconf-editor.desktop
%%DATADIR%%/icons/hicolor/16x16/status/type-schema.png
%%DATADIR%%/icons/hicolor/16x16/status/type-string.png
%%DATADIR%%/icons/hicolor/16x16/status/type-undefined.png
+share/gnome/help/gconf-editor/C/figures/entry-blank.png
+share/gnome/help/gconf-editor/C/figures/entry-bool.png
+share/gnome/help/gconf-editor/C/figures/entry-list.png
+share/gnome/help/gconf-editor/C/figures/entry-number.png
+share/gnome/help/gconf-editor/C/figures/entry-schema.png
+share/gnome/help/gconf-editor/C/figures/entry-string.png
share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/C/gconf-editor.xml
share/gnome/help/gconf-editor/C/legal.xml
+share/gnome/help/gconf-editor/ca/figures/entry-blank.png
+share/gnome/help/gconf-editor/ca/figures/entry-bool.png
+share/gnome/help/gconf-editor/ca/figures/entry-list.png
+share/gnome/help/gconf-editor/ca/figures/entry-number.png
+share/gnome/help/gconf-editor/ca/figures/entry-schema.png
+share/gnome/help/gconf-editor/ca/figures/entry-string.png
share/gnome/help/gconf-editor/ca/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/ca/gconf-editor.xml
+share/gnome/help/gconf-editor/de/figures/entry-blank.png
+share/gnome/help/gconf-editor/de/figures/entry-bool.png
+share/gnome/help/gconf-editor/de/figures/entry-list.png
+share/gnome/help/gconf-editor/de/figures/entry-number.png
+share/gnome/help/gconf-editor/de/figures/entry-schema.png
+share/gnome/help/gconf-editor/de/figures/entry-string.png
share/gnome/help/gconf-editor/de/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/de/gconf-editor.xml
+share/gnome/help/gconf-editor/el/figures/entry-blank.png
+share/gnome/help/gconf-editor/el/figures/entry-bool.png
+share/gnome/help/gconf-editor/el/figures/entry-list.png
+share/gnome/help/gconf-editor/el/figures/entry-number.png
+share/gnome/help/gconf-editor/el/figures/entry-schema.png
+share/gnome/help/gconf-editor/el/figures/entry-string.png
+share/gnome/help/gconf-editor/el/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/el/gconf-editor.xml
+share/gnome/help/gconf-editor/en_GB/figures/entry-blank.png
+share/gnome/help/gconf-editor/en_GB/figures/entry-bool.png
+share/gnome/help/gconf-editor/en_GB/figures/entry-list.png
+share/gnome/help/gconf-editor/en_GB/figures/entry-number.png
+share/gnome/help/gconf-editor/en_GB/figures/entry-schema.png
+share/gnome/help/gconf-editor/en_GB/figures/entry-string.png
+share/gnome/help/gconf-editor/en_GB/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/en_GB/gconf-editor.xml
+share/gnome/help/gconf-editor/es/figures/entry-blank.png
+share/gnome/help/gconf-editor/es/figures/entry-bool.png
+share/gnome/help/gconf-editor/es/figures/entry-list.png
+share/gnome/help/gconf-editor/es/figures/entry-number.png
+share/gnome/help/gconf-editor/es/figures/entry-schema.png
+share/gnome/help/gconf-editor/es/figures/entry-string.png
share/gnome/help/gconf-editor/es/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/es/gconf-editor.xml
+share/gnome/help/gconf-editor/fr/figures/entry-blank.png
+share/gnome/help/gconf-editor/fr/figures/entry-bool.png
+share/gnome/help/gconf-editor/fr/figures/entry-list.png
+share/gnome/help/gconf-editor/fr/figures/entry-number.png
+share/gnome/help/gconf-editor/fr/figures/entry-schema.png
+share/gnome/help/gconf-editor/fr/figures/entry-string.png
share/gnome/help/gconf-editor/fr/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/fr/gconf-editor.xml
+share/gnome/help/gconf-editor/it/figures/entry-blank.png
+share/gnome/help/gconf-editor/it/figures/entry-bool.png
+share/gnome/help/gconf-editor/it/figures/entry-list.png
+share/gnome/help/gconf-editor/it/figures/entry-number.png
+share/gnome/help/gconf-editor/it/figures/entry-schema.png
+share/gnome/help/gconf-editor/it/figures/entry-string.png
share/gnome/help/gconf-editor/it/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/it/gconf-editor.xml
+share/gnome/help/gconf-editor/oc/figures/entry-blank.png
+share/gnome/help/gconf-editor/oc/figures/entry-bool.png
+share/gnome/help/gconf-editor/oc/figures/entry-list.png
+share/gnome/help/gconf-editor/oc/figures/entry-number.png
+share/gnome/help/gconf-editor/oc/figures/entry-schema.png
+share/gnome/help/gconf-editor/oc/figures/entry-string.png
share/gnome/help/gconf-editor/oc/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/oc/gconf-editor.xml
+share/gnome/help/gconf-editor/pt_BR/figures/entry-blank.png
+share/gnome/help/gconf-editor/pt_BR/figures/entry-bool.png
+share/gnome/help/gconf-editor/pt_BR/figures/entry-list.png
+share/gnome/help/gconf-editor/pt_BR/figures/entry-number.png
+share/gnome/help/gconf-editor/pt_BR/figures/entry-schema.png
+share/gnome/help/gconf-editor/pt_BR/figures/entry-string.png
share/gnome/help/gconf-editor/pt_BR/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/pt_BR/gconf-editor.xml
+share/gnome/help/gconf-editor/ru/figures/entry-blank.png
+share/gnome/help/gconf-editor/ru/figures/entry-bool.png
+share/gnome/help/gconf-editor/ru/figures/entry-list.png
+share/gnome/help/gconf-editor/ru/figures/entry-number.png
+share/gnome/help/gconf-editor/ru/figures/entry-schema.png
+share/gnome/help/gconf-editor/ru/figures/entry-string.png
share/gnome/help/gconf-editor/ru/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/ru/gconf-editor.xml
+share/gnome/help/gconf-editor/sv/figures/entry-blank.png
+share/gnome/help/gconf-editor/sv/figures/entry-bool.png
+share/gnome/help/gconf-editor/sv/figures/entry-list.png
+share/gnome/help/gconf-editor/sv/figures/entry-number.png
+share/gnome/help/gconf-editor/sv/figures/entry-schema.png
+share/gnome/help/gconf-editor/sv/figures/entry-string.png
share/gnome/help/gconf-editor/sv/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/sv/gconf-editor.xml
+share/gnome/help/gconf-editor/th/figures/entry-blank.png
+share/gnome/help/gconf-editor/th/figures/entry-bool.png
+share/gnome/help/gconf-editor/th/figures/entry-list.png
+share/gnome/help/gconf-editor/th/figures/entry-number.png
+share/gnome/help/gconf-editor/th/figures/entry-schema.png
+share/gnome/help/gconf-editor/th/figures/entry-string.png
share/gnome/help/gconf-editor/th/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/th/gconf-editor.xml
+share/gnome/help/gconf-editor/uk/figures/entry-blank.png
+share/gnome/help/gconf-editor/uk/figures/entry-bool.png
+share/gnome/help/gconf-editor/uk/figures/entry-list.png
+share/gnome/help/gconf-editor/uk/figures/entry-number.png
+share/gnome/help/gconf-editor/uk/figures/entry-schema.png
+share/gnome/help/gconf-editor/uk/figures/entry-string.png
share/gnome/help/gconf-editor/uk/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/uk/gconf-editor.xml
share/icons/hicolor/48x48/apps/gconf-editor.png
share/locale/am/LC_MESSAGES/gconf-editor.mo
share/locale/ar/LC_MESSAGES/gconf-editor.mo
share/locale/as/LC_MESSAGES/gconf-editor.mo
+share/locale/ast/LC_MESSAGES/gconf-editor.mo
share/locale/az/LC_MESSAGES/gconf-editor.mo
share/locale/be/LC_MESSAGES/gconf-editor.mo
share/locale/be@latin/LC_MESSAGES/gconf-editor.mo
@@ -91,6 +180,7 @@ share/locale/oc/LC_MESSAGES/gconf-editor.mo
share/locale/or/LC_MESSAGES/gconf-editor.mo
share/locale/pa/LC_MESSAGES/gconf-editor.mo
share/locale/pl/LC_MESSAGES/gconf-editor.mo
+share/locale/ps/LC_MESSAGES/gconf-editor.mo
share/locale/pt/LC_MESSAGES/gconf-editor.mo
share/locale/pt_BR/LC_MESSAGES/gconf-editor.mo
share/locale/ro/LC_MESSAGES/gconf-editor.mo
@@ -117,6 +207,8 @@ share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
share/omf/gconf-editor/gconf-editor-C.omf
share/omf/gconf-editor/gconf-editor-ca.omf
share/omf/gconf-editor/gconf-editor-de.omf
+share/omf/gconf-editor/gconf-editor-el.omf
+share/omf/gconf-editor/gconf-editor-en_GB.omf
share/omf/gconf-editor/gconf-editor-es.omf
share/omf/gconf-editor/gconf-editor-fr.omf
share/omf/gconf-editor/gconf-editor-it.omf
@@ -145,6 +237,10 @@ share/omf/gconf-editor/gconf-editor-uk.omf
@dirrm share/gnome/help/gconf-editor/fr
@dirrm share/gnome/help/gconf-editor/es/figures
@dirrm share/gnome/help/gconf-editor/es
+@dirrm share/gnome/help/gconf-editor/en_GB/figures
+@dirrm share/gnome/help/gconf-editor/en_GB
+@dirrm share/gnome/help/gconf-editor/el/figures
+@dirrm share/gnome/help/gconf-editor/el
@dirrm share/gnome/help/gconf-editor/de/figures
@dirrm share/gnome/help/gconf-editor/de
@dirrm share/gnome/help/gconf-editor/ca/figures
@@ -172,6 +268,8 @@ share/omf/gconf-editor/gconf-editor-uk.omf
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@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
@@ -186,5 +284,7 @@ share/omf/gconf-editor/gconf-editor-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/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 5c04d9169623..226e5daed045 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.185 2008/09/24 21:51:29 mezz Exp $
+# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.189 2009/03/18 00:23:38 kwm Exp $
#
PORTNAME= gnome-control-center
-PORTVERSION= 2.24.0.1
+PORTVERSION= 2.26.0
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --enable-gstreamer=0.10
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-GCONF_SCHEMAS= control-center.schemas
+GCONF_SCHEMAS= control-center.schemas fontilus.schemas
.if defined(PACKAGE_BUILDING)
.undef WITHOUT_GNOME
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index b44bbd7bb3d9..4bd79e50c1e6 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-control-center-2.24.0.1.tar.bz2) = dcaf6e91fddbb1d57d045a4de34ec25c
-SHA256 (gnome2/gnome-control-center-2.24.0.1.tar.bz2) = fa5d1ba5cb2f88d3c689c8a2bceb57508777a23cff020dcf2de67ad81b0fe57d
-SIZE (gnome2/gnome-control-center-2.24.0.1.tar.bz2) = 2113356
+MD5 (gnome2/gnome-control-center-2.26.0.tar.bz2) = eed8feccc37712e34d88bd3b20e46962
+SHA256 (gnome2/gnome-control-center-2.26.0.tar.bz2) = 62fb84ea1053971a53c5259b92eb3a282c2f317f72f761ed4dff434ed0e99c05
+SIZE (gnome2/gnome-control-center-2.26.0.tar.bz2) = 2262324
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 84ba2af16290..569150975fdc 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -6,11 +6,12 @@ bin/gnome-at-visual
bin/gnome-control-center
bin/gnome-default-applications-properties
bin/gnome-display-properties
+bin/gnome-font-viewer
bin/gnome-keybinding-properties
bin/gnome-keyboard-properties
bin/gnome-mouse-properties
-bin/gnome-network-preferences
-bin/gnome-sound-properties
+bin/gnome-network-properties
+bin/gnome-thumbnail-font
bin/gnome-typing-monitor
bin/gnome-window-properties
etc/xdg/autostart/gnome-at-session.desktop
@@ -32,9 +33,9 @@ share/applications/default-applications.desktop
share/applications/display-properties.desktop
%%ABOUTME%%share/applications/gnome-about-me.desktop
share/applications/gnome-appearance-properties.desktop
-share/applications/gnome-network-preferences.desktop
+share/applications/gnome-font-viewer.desktop
+share/applications/gnome-network-properties.desktop
share/applications/gnome-settings-mouse.desktop
-share/applications/gnome-settings-sound.desktop
share/applications/gnome-theme-installer.desktop
share/applications/gnomecc.desktop
share/applications/keybinding.desktop
@@ -46,13 +47,13 @@ share/desktop-directories/gnomecc.directory
%%DATADIR%%/glade/at-enable-dialog.glade
%%DATADIR%%/glade/display-capplet.glade
%%ABOUTME%%%%DATADIR%%/glade/gnome-about-me.glade
+%%ABOUTME%%%%DATADIR%%/glade/gnome-about-me-fingerprint.glade
%%DATADIR%%/glade/gnome-default-applications-properties.glade
%%DATADIR%%/glade/gnome-keybinding-properties.glade
%%DATADIR%%/glade/gnome-keyboard-properties.glade
%%DATADIR%%/glade/gnome-mouse-properties.glade
-%%DATADIR%%/glade/gnome-network-preferences.glade
+%%DATADIR%%/glade/gnome-network-properties.glade
%%DATADIR%%/glade/gnome-window-properties.glade
-%%DATADIR%%/glade/sound-properties.glade
%%DATADIR%%/keybindings/00-multimedia-key.xml
%%DATADIR%%/keybindings/01-desktop-key.xml
%%DATADIR%%/pixmaps/at-startup.png
@@ -94,10 +95,12 @@ share/gnome/help/control-center/C/config-kbd.xml
share/gnome/help/control-center/C/config-keybindings.xml
share/gnome/help/control-center/C/config-mouse.xml
share/gnome/help/control-center/C/config-screensaver.xml
-share/gnome/help/control-center/C/config-sound.xml
share/gnome/help/control-center/C/config-themes.xml
share/gnome/help/control-center/C/control-center.xml
share/gnome/help/control-center/ca/control-center.xml
+share/gnome/help/control-center/ca@valencia/control-center.xml
+share/gnome/help/control-center/cs/control-center.xml
+share/gnome/help/control-center/de/control-center.xml
share/gnome/help/control-center/en_GB/control-center.xml
share/gnome/help/control-center/es/control-center.xml
share/gnome/help/control-center/fr/control-center.xml
@@ -114,33 +117,28 @@ share/gnome/help/control-center/uk/control-center.xml
share/gnome/help/control-center/vi/control-center.xml
share/gnome/help/control-center/zh_CN/control-center.xml
share/icons/hicolor/16x16/apps/gnome-display-properties.png
-share/icons/hicolor/16x16/apps/gnome-network-preferences.png
+share/icons/hicolor/16x16/apps/gnome-network-properties.png
share/icons/hicolor/16x16/apps/gnome-settings-default-applications.png
-share/icons/hicolor/16x16/apps/gnome-sound-properties.png
share/icons/hicolor/22x22/apps/gnome-display-properties.png
-share/icons/hicolor/22x22/apps/gnome-network-preferences.png
+share/icons/hicolor/22x22/apps/gnome-network-properties.png
share/icons/hicolor/22x22/apps/gnome-settings-default-applications.png
-share/icons/hicolor/22x22/apps/gnome-sound-properties.png
share/icons/hicolor/24x24/apps/gnome-display-properties.png
-share/icons/hicolor/24x24/apps/gnome-network-preferences.png
+share/icons/hicolor/24x24/apps/gnome-network-properties.png
share/icons/hicolor/24x24/apps/gnome-settings-default-applications.png
-share/icons/hicolor/24x24/apps/gnome-sound-properties.png
share/icons/hicolor/32x32/apps/gnome-display-properties.png
-share/icons/hicolor/32x32/apps/gnome-network-preferences.png
+share/icons/hicolor/32x32/apps/gnome-network-properties.png
share/icons/hicolor/32x32/apps/gnome-settings-default-applications.png
-share/icons/hicolor/32x32/apps/gnome-sound-properties.png
-share/icons/hicolor/48x48/apps/gnome-network-preferences.png
+share/icons/hicolor/48x48/apps/gnome-network-properties.png
share/icons/hicolor/48x48/apps/gnome-settings-default-applications.png
-share/icons/hicolor/48x48/apps/gnome-sound-properties.png
share/icons/hicolor/48x48/apps/typing-monitor.png
share/icons/hicolor/scalable/apps/gnome-display-properties.svg
-share/icons/hicolor/scalable/apps/gnome-network-preferences.svg
-share/icons/hicolor/scalable/apps/gnome-sound-properties.svg
+share/icons/hicolor/scalable/apps/gnome-network-properties.svg
share/icons/hicolor/scalable/apps/typing-monitor.svg
share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/as/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ast/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/az/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/be/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/be@latin/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -150,6 +148,7 @@ share/locale/bn_IN/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/br/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/da/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -181,6 +180,7 @@ share/locale/ko/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/mai/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/mg/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ml/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -213,6 +213,8 @@ share/locale/te/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/th/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/uz/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -224,6 +226,9 @@ share/mime/application/x-gnome-theme-package.xml
share/mime/packages/gnome-theme-package.xml
share/omf/control-center/control-center-C.omf
share/omf/control-center/control-center-ca.omf
+share/omf/control-center/control-center-ca@valencia.omf
+share/omf/control-center/control-center-cs.omf
+share/omf/control-center/control-center-de.omf
share/omf/control-center/control-center-en_GB.omf
share/omf/control-center/control-center-es.omf
share/omf/control-center/control-center-fr.omf
@@ -255,6 +260,9 @@ share/omf/control-center/control-center-zh_CN.omf
@dirrm share/gnome/help/control-center/fr
@dirrm share/gnome/help/control-center/es
@dirrm share/gnome/help/control-center/en_GB
+@dirrm share/gnome/help/control-center/de
+@dirrm share/gnome/help/control-center/cs
+@dirrm share/gnome/help/control-center/ca@valencia
@dirrm share/gnome/help/control-center/ca
@dirrm share/gnome/help/control-center/C
@dirrm share/gnome/help/control-center
@@ -266,7 +274,6 @@ share/omf/control-center/control-center-zh_CN.omf
@dirrmtry share/applications
@dirrm lib/window-manager-settings
@dirrm include/gnome-window-settings-2.0
-@dirrmtry etc/xdg/autostart
@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
@@ -277,6 +284,8 @@ share/omf/control-center/control-center-zh_CN.omf
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -293,13 +302,19 @@ share/omf/control-center/control-center-zh_CN.omf
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@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/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/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index fcc7deb97d97..9eccabebf5a4 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.50 2008/11/19 19:49:56 mezz Exp $
+# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.52 2009/03/07 18:42:22 marcus Exp $
#
PORTNAME= gnome-power-manager
PORTVERSION= 2.24.4
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 78f670a8e3f5..e86d4ec00dcb 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.31 2008/11/25 16:39:52 marcus Exp $
+# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.37 2009/03/17 14:00:07 kwm Exp $
#
PORTNAME= gnome-settings-daemon
-PORTVERSION= 2.24.1
+PORTVERSION= 2.26.0
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,6 +15,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 settings daemon
+LIB_DEPENDS= pulse.0:${PORTSDIR}/audio/pulseaudio
+
USE_XORG= xxf86misc
USE_BZIP2= yes
USE_GMAKE= yes
@@ -31,6 +33,7 @@ GCONF_SCHEMAS= apps_gnome_settings_daemon_keybindings.schemas \
apps_gnome_settings_daemon_xrandr.schemas \
apps_gnome_settings_daemon_screensaver.schemas \
desktop_gnome_font_rendering.schemas \
+ desktop_gnome_keybindings.schemas \
gnome-settings-daemon.schemas
.include <bsd.port.mk>
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index bdcc78e1d6a5..e075a7705eb3 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-settings-daemon-2.24.1.tar.bz2) = 841447fa690a3a4712e9ddaec2584824
-SHA256 (gnome2/gnome-settings-daemon-2.24.1.tar.bz2) = a2a5132a5b9d0bef52010ea45b14560b6344f591ce3296ed555165332cce9a70
-SIZE (gnome2/gnome-settings-daemon-2.24.1.tar.bz2) = 1131518
+MD5 (gnome2/gnome-settings-daemon-2.26.0.tar.bz2) = c3a2934deccfcf13de15507d4be802d3
+SHA256 (gnome2/gnome-settings-daemon-2.26.0.tar.bz2) = 20502568f82ce92bc26122ceafae0f63ed71bfba0366db03c163c8567db2a103
+SIZE (gnome2/gnome-settings-daemon-2.26.0.tar.bz2) = 1143867
diff --git a/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c b/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c
deleted file mode 100644
index 6fce0da1831a..000000000000
--- a/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/typing-break/gsd-typing-break-manager.c.orig 2008-01-14 01:20:09.000000000 +0100
-+++ plugins/typing-break/gsd-typing-break-manager.c 2008-01-14 01:20:37.000000000 +0100
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
-+#include <sys/signal.h>
-
- #include <locale.h>
-
diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_background_gsd-background-manager.c b/sysutils/gnome-settings-daemon/files/patch-plugins_background_gsd-background-manager.c
deleted file mode 100644
index 8820c1482a96..000000000000
--- a/sysutils/gnome-settings-daemon/files/patch-plugins_background_gsd-background-manager.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- plugins/background/gsd-background-manager.c.orig 2008-11-03 13:25:29.000000000 -0600
-+++ plugins/background/gsd-background-manager.c 2008-11-03 13:28:16.000000000 -0600
-@@ -160,6 +160,18 @@
- GdkDisplay *display;
- int n_screens;
- int i;
-+ GConfClient *client;
-+ gboolean enabled;
-+
-+ client = gconf_client_get_default ();
-+
-+ enabled = gconf_client_get_bool (client,
-+ "/desktop/gnome/background/draw_background",
-+ NULL);
-+ g_object_unref (client);
-+
-+ if (!enabled)
-+ return FALSE;
-
- if (nautilus_is_running ()) {
- return;
diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c b/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c
index 1db1bb16efe8..73931511df77 100644
--- a/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c
+++ b/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c
@@ -1,26 +1,11 @@
---- plugins/media-keys/gsd-media-keys-manager.c.orig 2008-01-29 15:58:30.000000000 -0600
-+++ plugins/media-keys/gsd-media-keys-manager.c 2008-01-29 16:00:55.000000000 -0600
-@@ -667,7 +667,11 @@
- if ((command != NULL) && (strcmp (command, "") != 0)) {
- execute (manager, command, FALSE, FALSE);
- } else {
-+#if __FreeBSD__
-+ execute (manager, "cdcontrol eject", FALSE, FALSE);
-+#else
- execute (manager, "eject -T", FALSE, FALSE);
-+#endif
- }
+--- plugins/media-keys/gsd-media-keys-manager.c.orig 2009-02-04 16:33:14.000000000 -0500
++++ plugins/media-keys/gsd-media-keys-manager.c 2009-02-27 14:05:26.000000000 -0500
+@@ -64,6 +64,8 @@
- g_free (command);
-@@ -869,7 +873,11 @@
- do_mail_action (manager);
- break;
- case SLEEP_KEY:
-+#if __FreeBSD__
-+ do_sleep_action ("zzz", "xset dpms force off");
-+#else
- do_sleep_action ("apm", "xset dpms force off");
-+#endif
- break;
- case SCREENSAVER_KEY:
- if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) {
+ #if defined(__OpenBSD__)
+ # define EJECT_COMMAND "eject -t /dev/cd0"
++#elif defined(__FreeBSD__)
++# define EJECT_COMMAND "cdcontrol eject"
+ #else
+ # define EJECT_COMMAND "eject -T"
+ #endif
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
index 9711a5722e9f..dd7b5a3e25f9 100644
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ b/sysutils/gnome-settings-daemon/pkg-plist
@@ -1,5 +1,6 @@
etc/xdg/autostart/gnome-settings-daemon.desktop
include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
+include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-plugin.h
lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/background.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/clipboard.gnome-settings-plugin
@@ -67,6 +68,7 @@ lib/gnome-settings-daemon-2.0/xsettings.gnome-settings-plugin
libdata/pkgconfig/gnome-settings-daemon.pc
libexec/gnome-settings-daemon
share/dbus-1/services/org.gnome.SettingsDaemon.service
+share/gnome-control-center/keybindings/50-accessibility.xml
%%DATADIR%%/acme-eject.png
%%DATADIR%%/acme.glade
%%DATADIR%%/gsd-a11y-preferences-dialog.glade
@@ -85,6 +87,8 @@ share/icons/hicolor/scalable/apps/gsd-xrandr.svg
share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/ar/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/as/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/ast/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/az/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/be/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/be@latin/LC_MESSAGES/gnome-settings-daemon.mo
@@ -169,8 +173,6 @@ share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
@dirrm lib/gnome-settings-daemon-2.0
@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
@dirrm include/gnome-settings-daemon-2.0
-@dirrmtry etc/xdg/autostart
-@dirrmtry etc/xdg
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -201,3 +203,7 @@ share/locale/zu/LC_MESSAGES/gnome-settings-daemon.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/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 033de770e297..15449b0689dc 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.128 2008/10/21 03:42:01 mezz Exp $
+# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.132 2009/03/17 16:06:07 kwm Exp $
#
PORTNAME= gnome-system-monitor
-PORTVERSION= 2.24.4
+PORTVERSION= 2.26.0.1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index cde9aea0608d..b2fda80f472a 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-monitor-2.24.4.tar.bz2) = 870bff7aac0b39cb33ac5078ef576639
-SHA256 (gnome2/gnome-system-monitor-2.24.4.tar.bz2) = f894f81df717ff9b1f8eb052c0e47fa54ca45a3a65ba2331564793ea59caf17e
-SIZE (gnome2/gnome-system-monitor-2.24.4.tar.bz2) = 1981017
+MD5 (gnome2/gnome-system-monitor-2.26.0.1.tar.bz2) = 553de9c4912f4af25f92a3380626c0f1
+SHA256 (gnome2/gnome-system-monitor-2.26.0.1.tar.bz2) = 6b78e253e848b0652e76bfacae300e2b02f4f3081e418f3f19aa54fe337ee6f5
+SIZE (gnome2/gnome-system-monitor-2.26.0.1.tar.bz2) = 2217159
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index 089a05cb097f..f77bc953585e 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -57,6 +57,20 @@ share/gnome/help/gnome-system-monitor/ca/figures/sortMenu2.png
share/gnome/help/gnome-system-monitor/ca/figures/systemMonitor.png
share/gnome/help/gnome-system-monitor/ca/figures/viewMenu.png
share/gnome/help/gnome-system-monitor/ca/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/de/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/de/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/de/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/de/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/de/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/de/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/de/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/de/figures/processListing.png
+share/gnome/help/gnome-system-monitor/de/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/de/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/de/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/de/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/de/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/de/gnome-system-monitor.xml
share/gnome/help/gnome-system-monitor/es/figures/addColumn.png
share/gnome/help/gnome-system-monitor/es/figures/changePriority.png
share/gnome/help/gnome-system-monitor/es/figures/colorPanel.png
@@ -129,6 +143,8 @@ share/gnome/help/gnome-system-monitor/sv/figures/viewMenu.png
share/gnome/help/gnome-system-monitor/sv/gnome-system-monitor.xml
share/locale/am/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/as/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ast/LC_MESSAGES/gnome-system-monitor.mo
share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
share/locale/be/LC_MESSAGES/gnome-system-monitor.mo
share/locale/be@latin/LC_MESSAGES/gnome-system-monitor.mo
@@ -209,6 +225,7 @@ share/omf/gnome-system-monitor/gnome-system-monitor-C.omf
share/omf/gnome-system-monitor/gnome-system-monitor-ar.omf
share/omf/gnome-system-monitor/gnome-system-monitor-bg.omf
share/omf/gnome-system-monitor/gnome-system-monitor-ca.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-de.omf
share/omf/gnome-system-monitor/gnome-system-monitor-es.omf
share/omf/gnome-system-monitor/gnome-system-monitor-fr.omf
share/omf/gnome-system-monitor/gnome-system-monitor-oc.omf
@@ -229,6 +246,8 @@ share/pixmaps/gnome-system-monitor/upload.svg
@dirrm share/gnome/help/gnome-system-monitor/fr
@dirrm share/gnome/help/gnome-system-monitor/es/figures
@dirrm share/gnome/help/gnome-system-monitor/es
+@dirrm share/gnome/help/gnome-system-monitor/de/figures
+@dirrm share/gnome/help/gnome-system-monitor/de
@dirrm share/gnome/help/gnome-system-monitor/ca/figures
@dirrm share/gnome/help/gnome-system-monitor/ca
@dirrm share/gnome/help/gnome-system-monitor/bg/figures
@@ -267,3 +286,7 @@ share/pixmaps/gnome-system-monitor/upload.svg
@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/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile
deleted file mode 100644
index fc60be536115..000000000000
--- a/sysutils/gnome-volume-manager/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for: gnome-volume-manager
-# Date created: 02 May 2006
-# Whom: Jean-Yves Lefort <jylefort@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.26 2008/09/24 03:12:47 mezz Exp $
-#
-
-PORTNAME= gnome-volume-manager
-PORTVERSION= 2.24.1
-CATEGORIES= sysutils gnome
-MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Automatically mount removable media, and more
-
-LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \
- notify.1:${PORTSDIR}/devel/libnotify
-
-USE_BZIP2= yes
-USE_GNOME= gnomeprefix gnomehack intlhack nautilus2
-USE_GMAKE= yes
-USE_GETTEXT= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --disable-multiuser
-GCONF_SCHEMAS= gnome-volume-manager.schemas
-
-.include <bsd.port.mk>
diff --git a/sysutils/gnome-volume-manager/distinfo b/sysutils/gnome-volume-manager/distinfo
deleted file mode 100644
index de3b415ce339..000000000000
--- a/sysutils/gnome-volume-manager/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-volume-manager-2.24.1.tar.bz2) = ef99c49214a2e265b127470b1da97392
-SHA256 (gnome2/gnome-volume-manager-2.24.1.tar.bz2) = 139e9a2c3013098f76537607d4ffb2d2bca93bdcdff8b49f5017713b88e9bae1
-SIZE (gnome2/gnome-volume-manager-2.24.1.tar.bz2) = 374678
diff --git a/sysutils/gnome-volume-manager/files/patch-gnome-volume-manager.schemas.in b/sysutils/gnome-volume-manager/files/patch-gnome-volume-manager.schemas.in
deleted file mode 100644
index 94af083a163b..000000000000
--- a/sysutils/gnome-volume-manager/files/patch-gnome-volume-manager.schemas.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-volume-manager.schemas.in.orig Wed Jun 7 21:41:12 2006
-+++ gnome-volume-manager.schemas.in Wed Jun 7 21:41:40 2006
-@@ -227,7 +227,7 @@
- <key>/schemas/desktop/gnome/volume_manager/autoprinter_command</key>
- <applyto>/desktop/gnome/volume_manager/autoprinter_command</applyto>
- <type>string</type>
-- <default>gnome-printer-add hal://%h</default>
-+ <default>gnome-cups-add hal://%h</default>
- <locale name="C">
- <short>printer command</short>
- <long>Command to run when a printer is connected.</long>
diff --git a/sysutils/gnome-volume-manager/pkg-descr b/sysutils/gnome-volume-manager/pkg-descr
deleted file mode 100644
index b8ce9b76814d..000000000000
--- a/sysutils/gnome-volume-manager/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-gnome-volume-manager is a desktop-level daemon that enforces volume-related
-policy in response to events received from HAL. Its goal is to implement all
-functionality as a state-machine in response to asynchronous events from HAL.
diff --git a/sysutils/gnome-volume-manager/pkg-plist b/sysutils/gnome-volume-manager/pkg-plist
deleted file mode 100644
index 8749fe230302..000000000000
--- a/sysutils/gnome-volume-manager/pkg-plist
+++ /dev/null
@@ -1,115 +0,0 @@
-bin/gnome-volume-properties
-etc/xdg/autostart/gnome-volume-manager.desktop
-libexec/gnome-volume-manager
-share/applications/gnome-volume-properties.desktop
-%%DATADIR%%/gnome-volume-properties.glade
-share/locale/ang/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ar/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/az/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/be@latin/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/bg/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/bn/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/bs/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ca/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/cs/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/cy/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/da/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/de/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/dz/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/el/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/en_CA/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/en_GB/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/es/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/et/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/eu/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/fa/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/fi/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/fr/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/gl/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/gu/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/he/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/hi/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/hr/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/hu/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/id/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/is/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/it/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ja/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ka/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/kn/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ko/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ku/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/la/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/lt/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/lv/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/mg/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/mk/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ml/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/mn/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/mr/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ms/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/nb/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ne/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/nl/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/nn/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/oc/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/or/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/pa/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/pl/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/pt/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ro/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ru/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/rw/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/si/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/sk/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/sl/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/sq/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/sr/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/sv/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ta/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/te/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/th/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/tr/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/uk/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/vi/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/xh/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.mo
-@dirrm %%DATADIR%%
-@dirrmtry share/applications
-@dirrmtry etc/xdg/autostart
-@dirrmtry etc/xdg
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@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/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/la/LC_MESSAGES
-@dirrmtry share/locale/la
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@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/ang/LC_MESSAGES
-@dirrmtry share/locale/ang
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index ae80ed4ae28b..a21e97bb118b 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.144 2008/09/24 03:36:45 mezz Exp $
+# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.147 2009/04/07 03:11:00 marcus Exp $
#
PORTNAME= nautilus-cd-burner
PORTVERSION= 2.24.0
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -25,7 +26,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack \
- desktopfileutils ltasneededhack
+ desktopfileutils ltasneededhack eel2
USE_CDRTOOLS= yes
INSTALLS_ICONS= yes
USE_AUTOTOOLS= libtool:15
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
index d8239b97adc7..edc2bb3e0a87 100644
--- a/sysutils/pessulus/Makefile
+++ b/sysutils/pessulus/Makefile
@@ -3,12 +3,11 @@
# Whom: FreeBSD GNOME Team
#
# $FreeBSD$
-# $MCom: ports/sysutils/pessulus/Makefile,v 1.18 2008/09/22 10:47:05 kwm Exp $
+# $MCom: ports/sysutils/pessulus/Makefile,v 1.21 2009/03/17 22:42:37 kwm Exp $
#
PORTNAME= pessulus
-PORTVERSION= 2.24.0
-PORTREVISION= 1
+PORTVERSION= 2.26.0
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,6 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A lockdown editor for GNOME
USE_GMAKE= yes
+USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix intlhack pygnome2 pygnomedesktop
WANT_GNOME= yes
USE_PYTHON= yes
diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo
index 790dd7e20cc7..abf262cb9b22 100644
--- a/sysutils/pessulus/distinfo
+++ b/sysutils/pessulus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pessulus-2.24.0.tar.gz) = 51cb01f858a6b18faf3cb7715ef3432f
-SHA256 (gnome2/pessulus-2.24.0.tar.gz) = e24152ffdc138ade07c47c698d6ee2e1717ed7ed5bd49385bc16346832069442
-SIZE (gnome2/pessulus-2.24.0.tar.gz) = 212787
+MD5 (gnome2/pessulus-2.26.0.tar.bz2) = c7614fec0aa77f1a928080e7633741a0
+SHA256 (gnome2/pessulus-2.26.0.tar.bz2) = 774df341c1898c0f9b58d43708e14016184fdbfc7947288ef62c137208b6a079
+SIZE (gnome2/pessulus-2.26.0.tar.bz2) = 165600
diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist
index 2845c890ac58..71afc8f83f36 100644
--- a/sysutils/pessulus/pkg-plist
+++ b/sysutils/pessulus/pkg-plist
@@ -62,6 +62,7 @@ share/locale/bg/LC_MESSAGES/pessulus.mo
share/locale/bn/LC_MESSAGES/pessulus.mo
share/locale/bn_IN/LC_MESSAGES/pessulus.mo
share/locale/ca/LC_MESSAGES/pessulus.mo
+share/locale/crh/LC_MESSAGES/pessulus.mo
share/locale/cs/LC_MESSAGES/pessulus.mo
share/locale/cy/LC_MESSAGES/pessulus.mo
share/locale/da/LC_MESSAGES/pessulus.mo
@@ -143,6 +144,8 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index 6cbc3ff4f7fd..dc210a22370e 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -3,12 +3,12 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/tracker-client/Makefile,v 1.7 2008/06/16 22:18:40 mezz Exp $
+# $MCom: ports/sysutils/tracker-client/Makefile,v 1.6 2009/02/27 00:23:22 marcus Exp $
#
PORTNAME= tracker
PORTVERSION= 0.6.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.gnome.org/~jamiemcc/tracker/
PKGNAMESUFFIX?= -client
@@ -18,7 +18,7 @@ COMMENT= Object database, tag/metadata database, search tool and indexer
LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
- poppler-glib.3:${PORTSDIR}/graphics/poppler-gtk \
+ poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk \
exif.12:${PORTSDIR}/graphics/libexif \
wv-1.2.4:${PORTSDIR}/textproc/wv \
gmime-2.0.4:${PORTSDIR}/mail/gmime2 \
diff --git a/sysutils/tracker-client/pkg-plist b/sysutils/tracker-client/pkg-plist
index 13723729115d..3daea5a6c3ba 100644
--- a/sysutils/tracker-client/pkg-plist
+++ b/sysutils/tracker-client/pkg-plist
@@ -163,12 +163,6 @@ share/locale/zh_CN/LC_MESSAGES/tracker.mo
@dirrm %%DATADIR%%/services
@dirrm %%DATADIR%%/languages
@dirrm %%DATADIR%%
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
@dirrm lib/tracker/thumbnailers/image
@dirrm lib/tracker/thumbnailers/application
@dirrm lib/tracker/thumbnailers
@@ -177,5 +171,9 @@ share/locale/zh_CN/LC_MESSAGES/tracker.mo
@dirrm lib/tracker/filters
@dirrm lib/tracker/extract-modules
@dirrm lib/tracker
-@dirrmtry etc/xdg/autostart
-@dirrmtry etc/xdg
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@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/sysutils/tracker-gnome/Makefile b/sysutils/tracker-gnome/Makefile
index b264447632e1..49e16313a195 100644
--- a/sysutils/tracker-gnome/Makefile
+++ b/sysutils/tracker-gnome/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/tracker-gnome/Makefile,v 1.1 2008/03/30 20:39:09 ahze Exp $
+# $MCom: ports/sysutils/tracker-gnome/Makefile,v 1.2 2009/04/09 03:24:09 mezz Exp $
PORTREVISION= 2
diff --git a/sysutils/tracker-gnome/pkg-plist b/sysutils/tracker-gnome/pkg-plist
index c782373bf0c0..a6d62ab27d95 100644
--- a/sysutils/tracker-gnome/pkg-plist
+++ b/sysutils/tracker-gnome/pkg-plist
@@ -14,5 +14,3 @@ share/applications/tracker-search-tool.desktop
@dirrmtry %%DATADIR%%/icons
@dirrmtry %%DATADIR%%
@dirrmtry share/applications
-@dirrmtry etc/xdg/autostart
-@dirrmtry etc/xdg
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 47cfe417c232..9dbf7f618bae 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.61 2009/01/09 21:33:07 kwm Exp $
+# $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.64 2009/03/17 17:42:07 kwm Exp $
#
PORTNAME= gnome-doc-utils
-PORTVERSION= 0.14.2
+PORTVERSION= 0.16.0
CATEGORIES= textproc gnome
MASTER_SITES= GNOME
diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo
index b4c4638c8b75..be728e4f9952 100644
--- a/textproc/gnome-doc-utils/distinfo
+++ b/textproc/gnome-doc-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-doc-utils-0.14.2.tar.bz2) = d7a7d8646f34571704e4be62e5c7107f
-SHA256 (gnome-doc-utils-0.14.2.tar.bz2) = 0a1ebce8b5cdee44addde6f95625aa6bd5bfe6c8014485e8ec505c686fab1f7f
-SIZE (gnome-doc-utils-0.14.2.tar.bz2) = 619515
+MD5 (gnome-doc-utils-0.16.0.tar.bz2) = 45971197fd48147ee928462d5b74f234
+SHA256 (gnome-doc-utils-0.16.0.tar.bz2) = 87d2178a7192165f8d3a125f4baf114329c82cf33f3a0317cecf4c3f9e05829e
+SIZE (gnome-doc-utils-0.16.0.tar.bz2) = 625895
diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist
index 7373c22c10ef..786631717549 100644
--- a/textproc/gnome-doc-utils/pkg-plist
+++ b/textproc/gnome-doc-utils/pkg-plist
@@ -70,6 +70,7 @@ share/gnome/help/gnome-doc-xslt/C/legal.xml
share/gnome/help/gnome-doc-xslt/C/theme.xml
share/gnome/help/gnome-doc-xslt/C/translating.xml
share/locale/ar/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/as/LC_MESSAGES/gnome-doc-utils.mo
share/locale/be@latin/LC_MESSAGES/gnome-doc-utils.mo
share/locale/bg/LC_MESSAGES/gnome-doc-utils.mo
share/locale/bn/LC_MESSAGES/gnome-doc-utils.mo
@@ -234,3 +235,5 @@ share/xml2po/xhtml.pyc
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index e36f36af16f1..384aa8499d8a 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ibus
PORTVERSION= 1.1.0.20090311
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/textproc/ibus/pkg-plist b/textproc/ibus/pkg-plist
index a530f35d36ca..2d6a8c905bdd 100644
--- a/textproc/ibus/pkg-plist
+++ b/textproc/ibus/pkg-plist
@@ -263,5 +263,3 @@ share/pixmaps/ibus.svg
@dirrm %%PYTHON_SITELIBDIR%%/ibus/interface
@dirrm %%PYTHON_SITELIBDIR%%/ibus
@dirrm include/ibus-1.0
-@dirrmtry etc/xdg/autostart
-@dirrmtry etc/xdg
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index 95987d91cd79..957974713d98 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -4,11 +4,11 @@
# Whom: Ying-Chieh Liao <ijliao@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/textproc/libxml++26/Makefile,v 1.33 2009/01/09 21:44:43 kwm Exp $
+# $MCom: ports/textproc/libxml++26/Makefile,v 1.35 2009/03/17 14:57:40 kwm Exp $
#
PORTNAME= libxml++
-PORTVERSION= 2.24.3
+PORTVERSION= 2.26.0
CATEGORIES= textproc
MASTER_SITES= GNOME
@@ -21,6 +21,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LATEST_LINK= libxml++26
USE_GMAKE= yes
+USE_BZIP2= yes
USE_GNOME= gnomehack libxml2 pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/textproc/libxml++26/distinfo b/textproc/libxml++26/distinfo
index b2a2c5840c70..f0192b4bf907 100644
--- a/textproc/libxml++26/distinfo
+++ b/textproc/libxml++26/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxml++-2.24.3.tar.gz) = 2ceb2f1783dfb3df51b78a561658d592
-SHA256 (libxml++-2.24.3.tar.gz) = 6ddbb5e4fedf15393267efbc8b34dedead0e44eb88551316c8e863d92df0ed37
-SIZE (libxml++-2.24.3.tar.gz) = 874109
+MD5 (libxml++-2.26.0.tar.bz2) = a52fc7e6e44bb5cc187672930b843f72
+SHA256 (libxml++-2.26.0.tar.bz2) = 3287545d7e40bb24451f1afac6c77d545433d7efaf01ca8a60bcf9f6eacaf80a
+SIZE (libxml++-2.26.0.tar.bz2) = 616345
diff --git a/textproc/uim-gnome/Makefile b/textproc/uim-gnome/Makefile
index 5aed58507f30..84a5da48964b 100644
--- a/textproc/uim-gnome/Makefile
+++ b/textproc/uim-gnome/Makefile
@@ -15,6 +15,8 @@ RUN_DEPENDS= uim-pref-gtk:${PORTSDIR}/textproc/uim-gtk
MASTERDIR= ${.CURDIR}/../../textproc/uim
PKGDIR= ${.CURDIR}
+CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \
+ LIBS="`pkg-config --libs libgnomeui-2.0`"
CONFIGURE_ARGS= --with-gtk2 --enable-gnome-applet
UIM_SLAVE= yes
diff --git a/www/Makefile b/www/Makefile
index b8596d44ae81..a38af050586a 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -323,6 +323,7 @@
SUBDIR += libgtkhtml
SUBDIR += libmicrohttpd
SUBDIR += libwww
+ SUBDIR += libxul
SUBDIR += lifetype
SUBDIR += lightsquid
SUBDIR += lighttpd
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index c82ce8221b9c..264b57a8eb60 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany-extensions/Makefile,v 1.110 2008/10/21 01:27:34 kwm Exp $
+# $MCom: ports/www/epiphany-extensions/Makefile,v 1.114 2009/03/30 21:05:52 marcus Exp $
#
PORTNAME= epiphany-extensions
-PORTVERSION= 2.24.3
+PORTVERSION= 2.26.0
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -21,7 +21,7 @@ RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_GECKO= firefox xulrunner
+USE_GECKO= firefox libxul
USE_GNOME= gnomeprefix gnomehack intlhack
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
@@ -35,7 +35,8 @@ GCONF_SCHEMAS= smart-bookmarks.schemas
EPHY_EXTENSIONS=all,rss
EPHY_VERSION= ${PORTVERSION:R}
-PLIST_SUB= VERSION=${EPHY_VERSION} EPHY_VERSION=${EPHY_VERSION}
+#PLIST_SUB= VERSION=${EPHY_VERSION} EPHY_VERSION=${EPHY_VERSION}
+PLIST_SUB= VERSION=2.26 EPHY_VERSION=2.26
OPTIONS= OPENSP "Enable OpenSP SGML support" off
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index f22e95164f9c..90e8e1a6924a 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-extensions-2.24.3.tar.bz2) = 5d1ca2c5847d066df26657319def1d3a
-SHA256 (gnome2/epiphany-extensions-2.24.3.tar.bz2) = 5356d972f32601359446860d49bb0adadea62461d9c02ec8187474a02640a87e
-SIZE (gnome2/epiphany-extensions-2.24.3.tar.bz2) = 1024664
+MD5 (gnome2/epiphany-extensions-2.26.0.tar.bz2) = 88f194ed26e8d1cea20b500dc4e1998e
+SHA256 (gnome2/epiphany-extensions-2.26.0.tar.bz2) = fbdaddfb6fb873e0671994b638b16b15a14f3e2b53f8f92ee25c3a031e94067a
+SIZE (gnome2/epiphany-extensions-2.26.0.tar.bz2) = 1025108
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index b1021240d76f..8864ff24eae5 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -82,6 +82,7 @@ share/epiphany/icons/hicolor/32x32/status/feed-presence.png
share/epiphany/icons/hicolor/scalable/status/feed-presence.svg
share/gnome/help/epiphany-extensions/C/epiphany-extensions.xml
share/gnome/help/epiphany-extensions/C/figures/epi-ext-action-create.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-action-use.png
share/gnome/help/epiphany-extensions/C/figures/epi-ext-adblocker.png
share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-back.png
share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-close-2.png
@@ -103,6 +104,7 @@ share/gnome/help/epiphany-extensions/C/figures/epi-ext-tabgroups.png
share/gnome/help/epiphany-extensions/C/legal.xml
share/gnome/help/epiphany-extensions/es/epiphany-extensions.xml
share/gnome/help/epiphany-extensions/es/figures/epi-ext-action-create.png
+share/gnome/help/epiphany-extensions/es/figures/epi-ext-action-use.png
share/gnome/help/epiphany-extensions/es/figures/epi-ext-adblocker.png
share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-back.png
share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-close-2.png
@@ -123,6 +125,7 @@ share/gnome/help/epiphany-extensions/es/figures/epi-ext-sidebar.png
share/gnome/help/epiphany-extensions/es/figures/epi-ext-tabgroups.png
share/gnome/help/epiphany-extensions/oc/epiphany-extensions.xml
share/gnome/help/epiphany-extensions/oc/figures/epi-ext-action-create.png
+share/gnome/help/epiphany-extensions/oc/figures/epi-ext-action-use.png
share/gnome/help/epiphany-extensions/oc/figures/epi-ext-adblocker.png
share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-back.png
share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-close-2.png
@@ -143,6 +146,7 @@ share/gnome/help/epiphany-extensions/oc/figures/epi-ext-sidebar.png
share/gnome/help/epiphany-extensions/oc/figures/epi-ext-tabgroups.png
share/gnome/help/epiphany-extensions/sv/epiphany-extensions.xml
share/gnome/help/epiphany-extensions/sv/figures/epi-ext-action-create.png
+share/gnome/help/epiphany-extensions/sv/figures/epi-ext-action-use.png
share/gnome/help/epiphany-extensions/sv/figures/epi-ext-adblocker.png
share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-back.png
share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-close-2.png
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index fc20a74840fa..44d54a5d4b6d 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany/Makefile,v 1.188 2008/11/27 01:59:20 marcus Exp $
+# $MCom: ports/www/epiphany/Makefile,v 1.195 2009/03/30 03:15:21 marcus Exp $
#
PORTNAME= epiphany
-PORTVERSION= 2.24.3
-PORTREVISION?= 1
+PORTVERSION= 2.26.0
+PORTREVISION?= 0
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
notify.1:${PORTSDIR}/devel/libnotify
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
- ${LOCALBASE}/share/themes/LowContrast/index.theme:${PORTSDIR}/x11-themes/gnome-themes
+ ${LOCALBASE}/share/icons/HighContrastLargePrint/index.theme:${PORTSDIR}/x11-themes/gnome-themes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
@@ -60,9 +60,10 @@ EXTRA_LIBS+= `pkg-config --libs WebKitGtk`
CONFLICTS= epiphany-[1-9]*
PLIST_SUB+= GECKO="@comment "
.else
-USE_GECKO+= firefox xulrunner
+USE_GECKO+= firefox libxul
CONFIGURE_ARGS+= --with-gecko=${GECKO} \
- --with-engine=mozilla
+ --with-engine=mozilla \
+ --with-gecko-home=${LOCALBASE}/lib/${GECKO}
.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
CONFLICTS= epiphany-webkit-[1-9]*
PLIST_SUB+= GECKO=""
@@ -94,7 +95,8 @@ post-patch:
@${REINPLACE_CMD} -e 's|WebKitGdk|WebKitGtk|' ${WRKSRC}/configure
@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
's|-lpthread|${PTHREAD_LIBS}|g'
- @${REINPLACE_CMD} -e 's|execinfo.h|#|g' \
+ @${REINPLACE_CMD} -e 's|execinfo.h|#|g ; \
+ s|-ldl"$$|"|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|/lib/mozilla/plugins"|/lib/browser_plugins/symlinks/gecko18"|' \
${WRKSRC}/embed/mozilla/mozilla-embed-single.cpp
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 37c7edb5e033..0df9a8f8975c 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-2.24.3.tar.bz2) = af51614c7b78f8b8c68e9ece3d8f4d8f
-SHA256 (gnome2/epiphany-2.24.3.tar.bz2) = cc6ff7b30911bf80d8d72d6db7cc7ecbf51b2f5bb66796b79da33f8f680402ac
-SIZE (gnome2/epiphany-2.24.3.tar.bz2) = 5722991
+MD5 (gnome2/epiphany-2.26.0.tar.bz2) = 98043cd7332fd3025e9b69f65904e5a4
+SHA256 (gnome2/epiphany-2.26.0.tar.bz2) = e0d801b967c94828c8389e36588be1db9a077830019169f6f9730708ae1d59e5
+SIZE (gnome2/epiphany-2.26.0.tar.bz2) = 5626038
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 51bc2d1fdb07..2fb28143e18f 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -39,7 +39,8 @@ include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-version.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-window.h
%%GECKO%%lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.la
%%GECKO%%lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.so
-libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
+@comment libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
+libdata/pkgconfig/epiphany-2.26.pc
share/aclocal/epiphany.m4
share/applications/bme.desktop
share/applications/epiphany.desktop
@@ -278,13 +279,13 @@ share/locale/mn/LC_MESSAGES/epiphany.mo
share/locale/mr/LC_MESSAGES/epiphany.mo
share/locale/ms/LC_MESSAGES/epiphany.mo
share/locale/nb/LC_MESSAGES/epiphany.mo
-share/locale/ne/LC_MESSAGES/epiphany.mo
share/locale/nl/LC_MESSAGES/epiphany.mo
share/locale/nn/LC_MESSAGES/epiphany.mo
share/locale/oc/LC_MESSAGES/epiphany.mo
share/locale/or/LC_MESSAGES/epiphany.mo
share/locale/pa/LC_MESSAGES/epiphany.mo
share/locale/pl/LC_MESSAGES/epiphany.mo
+share/locale/ps/LC_MESSAGES/epiphany.mo
share/locale/pt/LC_MESSAGES/epiphany.mo
share/locale/pt_BR/LC_MESSAGES/epiphany.mo
share/locale/ro/LC_MESSAGES/epiphany.mo
@@ -416,6 +417,8 @@ share/pygtk/2.0/defs/epiphany.defs
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@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
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index 5f66b838d2fc..136a3b1b6e02 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@rainbow-runner.nl>
#
# $FreeBSD$
-# $MCom: ports/www/evolution-webcal/Makefile,v 1.58 2008/09/23 15:37:03 kwm Exp $
+# $MCom: ports/www/evolution-webcal/Makefile,v 1.61 2009/03/17 17:15:04 kwm Exp $
#
PORTNAME= evolution-webcal
-PORTVERSION= 2.24.0
+PORTVERSION= 2.26.0
CATEGORIES= www gnome
MASTER_SITES= GNOME
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo
index cd6b33201b3e..c57481dbbab9 100644
--- a/www/evolution-webcal/distinfo
+++ b/www/evolution-webcal/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-webcal-2.24.0.tar.bz2) = 8030ebaefb18050c079a71dc23701d82
-SHA256 (evolution-webcal-2.24.0.tar.bz2) = 370278680634f65717df9cef98f9a731eb93d58d303f322be51d7b38b1ff29a9
-SIZE (evolution-webcal-2.24.0.tar.bz2) = 153766
+MD5 (evolution-webcal-2.26.0.tar.bz2) = a36036a94dd043f57a6d84ab9b6c732c
+SHA256 (evolution-webcal-2.26.0.tar.bz2) = d37e47aad820aa6f457bec42ea4b3c6f01fba85f3573204353c001dfed3d4bb6
+SIZE (evolution-webcal-2.26.0.tar.bz2) = 155281
diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist
index f8b5a4ad950e..13c66d80768b 100644
--- a/www/evolution-webcal/pkg-plist
+++ b/www/evolution-webcal/pkg-plist
@@ -1,4 +1,5 @@
libexec/evolution-webcal
+share/locale/af/LC_MESSAGES/evolution-webcal.mo
share/locale/ar/LC_MESSAGES/evolution-webcal.mo
share/locale/as/LC_MESSAGES/evolution-webcal.mo
share/locale/az/LC_MESSAGES/evolution-webcal.mo
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 0d820afb4956..9e0bc6e9af8e 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gnome-user-share/Makefile,v 1.8 2008/02/24 20:36:08 marcus Exp $
+# $MCom: ports/www/gnome-user-share/Makefile,v 1.14 2009/03/17 13:35:33 kwm Exp $
#
PORTNAME= gnome-user-share
-PORTVERSION= 0.31
-PORTREVISION= 2
+PORTVERSION= 2.26.0
+PORTREVISION= 0
CATEGORIES= www deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,16 +16,18 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Personal file-sharing service for the GNOME Desktop
-LIB_DEPENDS= avahi-client:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS= avahi-client:${PORTSDIR}/net/avahi-app \
+ notify.1:${PORTSDIR}/devel/libnotify
+RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_dnssd.so:${PORTSDIR}/www/mod_dnssd
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_APACHE= 2.0+
-USE_GNOME= gnomeprefix gnomehack intlhack libglade2 gconf2
+USE_APACHE= 2.2+
+USE_GNOME= gnomeprefix gnomehack intlhack libglade2 gconf2 gnomedocutils
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CONFIGURE_ARGS= --disable-howl --with-modules-path=${LOCALBASE}/${APACHEMODDIR}
+CONFIGURE_ARGS= --with-modules-path=${LOCALBASE}/${APACHEMODDIR}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/gnome-user-share/distinfo b/www/gnome-user-share/distinfo
index 02f8edd7970b..e02044498cab 100644
--- a/www/gnome-user-share/distinfo
+++ b/www/gnome-user-share/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-user-share-0.31.tar.bz2) = 81d2b3d6c0694e5669330d8ad5c8a4b0
-SHA256 (gnome2/gnome-user-share-0.31.tar.bz2) = 4a00702d6f653ad461445adedf8c26720dd8a24fcfffff55e9ede30010cbb622
-SIZE (gnome2/gnome-user-share-0.31.tar.bz2) = 345185
+MD5 (gnome2/gnome-user-share-2.26.0.tar.bz2) = c99133b74a81a78ac0e4e10ef73fada7
+SHA256 (gnome2/gnome-user-share-2.26.0.tar.bz2) = 405be1ffbec4f865846746ab016e6816a58d9e2f2545fae48c31d4999c94d5f6
+SIZE (gnome2/gnome-user-share-2.26.0.tar.bz2) = 644020
diff --git a/www/gnome-user-share/pkg-message b/www/gnome-user-share/pkg-message
index 4fe34b829c7b..84e4725071cf 100644
--- a/www/gnome-user-share/pkg-message
+++ b/www/gnome-user-share/pkg-message
@@ -1,10 +1,4 @@
-In order to take full advantage of gnome-user-share, you must have
-devel/gnome-vfs built with mDNS support. If you do not, simply rebuild
-devel/gnome-vfs after gnome-user-share is installed:
-
-# portupgrade -f devel/gnome-vfs
-
-Finally, run gnome-file-share-properties as the user with which you want
+Run gnome-file-share-properties as the user with which you want
to use gnome-user-share, then logout and log back into GNOME. Now everything
under ~/Public should be shared. You can view this by opening Nautilus, and
clicking on the Network icon under Computer.
diff --git a/www/gnome-user-share/pkg-plist b/www/gnome-user-share/pkg-plist
index 49552523dc4b..447088a2ca0b 100644
--- a/www/gnome-user-share/pkg-plist
+++ b/www/gnome-user-share/pkg-plist
@@ -2,17 +2,60 @@ bin/gnome-file-share-properties
etc/xdg/autostart/gnome-user-share.desktop
libexec/gnome-user-share
share/applications/gnome-user-share-properties.desktop
-share/gnome-user-share/dav_groupfile
-share/gnome-user-share/dav_user.conf
-share/gnome-user-share/dav_user_2.0.conf
-share/gnome-user-share/dav_user_2.2.conf
-share/gnome-user-share/file-share-properties.ui
+%%DATADIR%%/dav_groupfile
+%%DATADIR%%/dav_user_2.0.conf
+%%DATADIR%%/dav_user_2.2.conf
+%%DATADIR%%/file-share-properties.ui
+share/gnome/help/gnome-user-share/C/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/C/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/C/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/C/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/C/gnome-user-share.xml
+share/gnome/help/gnome-user-share/C/legal.xml
+share/gnome/help/gnome-user-share/de/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/de/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/de/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/de/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/de/gnome-user-share.xml
+share/gnome/help/gnome-user-share/de/legal.xml
+share/gnome/help/gnome-user-share/el/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/el/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/el/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/el/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/el/gnome-user-share.xml
+share/gnome/help/gnome-user-share/el/legal.xml
+share/gnome/help/gnome-user-share/en_GB/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/en_GB/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/en_GB/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/en_GB/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/en_GB/gnome-user-share.xml
+share/gnome/help/gnome-user-share/en_GB/legal.xml
+share/gnome/help/gnome-user-share/es/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/es/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/es/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/es/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/es/gnome-user-share.xml
+share/gnome/help/gnome-user-share/es/legal.xml
+share/gnome/help/gnome-user-share/it/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/it/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/it/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/it/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/it/gnome-user-share.xml
+share/gnome/help/gnome-user-share/it/legal.xml
+share/gnome/help/gnome-user-share/sv/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/sv/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/sv/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/sv/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/sv/gnome-user-share.xml
+share/gnome/help/gnome-user-share/sv/legal.xml
share/icons/hicolor/16x16/apps/gnome-obex-server.png
share/icons/hicolor/22x22/apps/gnome-obex-server.png
share/icons/hicolor/32x32/apps/gnome-obex-server.png
share/icons/hicolor/48x48/apps/gnome-obex-server.png
share/locale/ar/LC_MESSAGES/gnome-user-share.mo
+share/locale/as/LC_MESSAGES/gnome-user-share.mo
share/locale/bg/LC_MESSAGES/gnome-user-share.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-user-share.mo
share/locale/ca/LC_MESSAGES/gnome-user-share.mo
share/locale/cs/LC_MESSAGES/gnome-user-share.mo
share/locale/da/LC_MESSAGES/gnome-user-share.mo
@@ -27,38 +70,79 @@ share/locale/fi/LC_MESSAGES/gnome-user-share.mo
share/locale/fr/LC_MESSAGES/gnome-user-share.mo
share/locale/gl/LC_MESSAGES/gnome-user-share.mo
share/locale/gu/LC_MESSAGES/gnome-user-share.mo
+share/locale/he/LC_MESSAGES/gnome-user-share.mo
+share/locale/hi/LC_MESSAGES/gnome-user-share.mo
share/locale/hu/LC_MESSAGES/gnome-user-share.mo
share/locale/it/LC_MESSAGES/gnome-user-share.mo
share/locale/ja/LC_MESSAGES/gnome-user-share.mo
share/locale/ko/LC_MESSAGES/gnome-user-share.mo
share/locale/lt/LC_MESSAGES/gnome-user-share.mo
share/locale/mk/LC_MESSAGES/gnome-user-share.mo
+share/locale/ml/LC_MESSAGES/gnome-user-share.mo
+share/locale/mr/LC_MESSAGES/gnome-user-share.mo
share/locale/nb/LC_MESSAGES/gnome-user-share.mo
share/locale/ne/LC_MESSAGES/gnome-user-share.mo
share/locale/nl/LC_MESSAGES/gnome-user-share.mo
share/locale/oc/LC_MESSAGES/gnome-user-share.mo
+share/locale/or/LC_MESSAGES/gnome-user-share.mo
share/locale/pa/LC_MESSAGES/gnome-user-share.mo
share/locale/pl/LC_MESSAGES/gnome-user-share.mo
share/locale/pt/LC_MESSAGES/gnome-user-share.mo
share/locale/pt_BR/LC_MESSAGES/gnome-user-share.mo
+share/locale/ro/LC_MESSAGES/gnome-user-share.mo
share/locale/ru/LC_MESSAGES/gnome-user-share.mo
share/locale/rw/LC_MESSAGES/gnome-user-share.mo
share/locale/sk/LC_MESSAGES/gnome-user-share.mo
share/locale/sl/LC_MESSAGES/gnome-user-share.mo
share/locale/sq/LC_MESSAGES/gnome-user-share.mo
share/locale/sv/LC_MESSAGES/gnome-user-share.mo
+share/locale/ta/LC_MESSAGES/gnome-user-share.mo
+share/locale/te/LC_MESSAGES/gnome-user-share.mo
+share/locale/th/LC_MESSAGES/gnome-user-share.mo
share/locale/tr/LC_MESSAGES/gnome-user-share.mo
share/locale/uk/LC_MESSAGES/gnome-user-share.mo
share/locale/vi/LC_MESSAGES/gnome-user-share.mo
share/locale/zh_CN/LC_MESSAGES/gnome-user-share.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-user-share.mo
share/locale/zh_TW/LC_MESSAGES/gnome-user-share.mo
-@dirrm share/gnome-user-share
+share/omf/gnome-user-share/gnome-user-share-C.omf
+share/omf/gnome-user-share/gnome-user-share-de.omf
+share/omf/gnome-user-share/gnome-user-share-el.omf
+share/omf/gnome-user-share/gnome-user-share-en_GB.omf
+share/omf/gnome-user-share/gnome-user-share-es.omf
+share/omf/gnome-user-share/gnome-user-share-it.omf
+share/omf/gnome-user-share/gnome-user-share-sv.omf
+@dirrm share/omf/gnome-user-share
+@dirrm share/gnome/help/gnome-user-share/sv/figures
+@dirrm share/gnome/help/gnome-user-share/sv
+@dirrm share/gnome/help/gnome-user-share/it/figures
+@dirrm share/gnome/help/gnome-user-share/it
+@dirrm share/gnome/help/gnome-user-share/es/figures
+@dirrm share/gnome/help/gnome-user-share/es
+@dirrm share/gnome/help/gnome-user-share/en_GB/figures
+@dirrm share/gnome/help/gnome-user-share/en_GB
+@dirrm share/gnome/help/gnome-user-share/el/figures
+@dirrm share/gnome/help/gnome-user-share/el
+@dirrm share/gnome/help/gnome-user-share/de/figures
+@dirrm share/gnome/help/gnome-user-share/de
+@dirrm share/gnome/help/gnome-user-share/C/figures
+@dirrm share/gnome/help/gnome-user-share/C
+@dirrm share/gnome/help/gnome-user-share
+@dirrm %%DATADIR%%
@dirrmtry share/applications
+@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/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 etc/xdg/autostart
-@dirrmtry etc/xdg
+@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/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 7d76b67bf298..4475410756c1 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gtkhtml3/Makefile,v 1.142 2008/11/25 01:16:48 marcus Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.146 2009/03/17 13:10:04 kwm Exp $
#
PORTNAME= gtkhtml3
-PORTVERSION= 3.24.5
+PORTVERSION= 3.26.0
CATEGORIES= www gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index f719e184f69b..6b91c93c475e 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.24.5.tar.bz2) = 1a8ad3813fbdc918b3b6fbf448af153b
-SHA256 (gnome2/gtkhtml-3.24.5.tar.bz2) = b6ae7311b9412030649cbfc9b3ed240842343e95bf52c4c99069b14192128079
-SIZE (gnome2/gtkhtml-3.24.5.tar.bz2) = 1473717
+MD5 (gnome2/gtkhtml-3.26.0.tar.bz2) = 75d3b6dcd939c2ddcad8aa255ab76f90
+SHA256 (gnome2/gtkhtml-3.26.0.tar.bz2) = 1049b36358f998a2f9748117edf53f4153113084934395c2672d7471d8bd48e4
+SIZE (gnome2/gtkhtml-3.26.0.tar.bz2) = 1472290
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
new file mode 100644
index 000000000000..e58782500d39
--- /dev/null
+++ b/www/libxul/Makefile
@@ -0,0 +1,56 @@
+# New ports collection makefile for: xulrunner
+# Date created: 2006-02-20
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/www/libxul/Makefile,v 1.25 2009/04/07 17:47:01 marcus Exp $
+#
+
+PORTNAME= libxul
+PORTVERSION= 1.9.0.7
+PORTREVISION?= 2
+CATEGORIES?= www devel
+MASTER_SITES= ${MASTER_SITE_MOZILLA}
+MASTER_SITE_SUBDIR= xulrunner/releases/${PORTVERSION}/source/
+DISTNAME= xulrunner-${PORTVERSION}-source
+
+MAINTAINER?= gnome@FreeBSD.org
+COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps
+
+LIB_DEPENDS?= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+
+CONFLICTS= mozilla-[0-9]* xulrunner-[0-9]*
+GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
+ lib/${MOZILLA}/include lib/${MOZILLA}/lib \
+ lib/${MOZILLA}/sdk/idl lib/${MOZILLA}/sdk/include
+
+WANT_GNOME= yes
+WANT_PERL= yes
+ALL_TARGET= default
+HAS_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GMAKE= yes
+LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
+
+PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig
+MOZ_OPTIONS?= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
+ --disable-javaxpcom --enable-canvas \
+ --enable-system-cairo
+MOZ_EXTENSIONS= default,cookie,permissions
+OPTIONS= # Empty, used for generic gecko OPTIONS
+USE_GECKO_OPTIONS= java debug logging optimized_cflags
+USE_GECKO= gecko
+MOZILLA_EXEC_NAME=xulrunner
+MOZ_TOOLKIT= cairo-gtk2
+USE_MOZILLA= -png -nss -dbm -jpeg
+MOZ_PKGCONFIG_FILES= libxul-embedding-unstable libxul-embedding \
+ libxul-unstable libxul mozilla-gtkmozembed-embedding \
+ mozilla-gtkmozembed mozilla-js mozilla-nss mozilla-plugin
+
+post-build:
+ @${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2| ; \
+ s|%sdkdir%|%sdkdir%/sdk|g ; \
+ s|%%MOZ_LIBDIR%%|${PREFIX}/lib/${MOZILLA}|g" \
+ ${WRKSRC}/xulrunner/installer/*.pc.in || ${TRUE}
+
+.include <bsd.port.mk>
diff --git a/www/libxul/distinfo b/www/libxul/distinfo
new file mode 100644
index 000000000000..5c4a36a6de68
--- /dev/null
+++ b/www/libxul/distinfo
@@ -0,0 +1,3 @@
+MD5 (xulrunner-1.9.0.7-source.tar.bz2) = 9875c9237b532009df8e91c3785539a3
+SHA256 (xulrunner-1.9.0.7-source.tar.bz2) = 300749986499629fdab5b271c35eb53f42753a3586ef474500d52bd3386cad9b
+SIZE (xulrunner-1.9.0.7-source.tar.bz2) = 37066129
diff --git a/www/libxul/files/patch-config-mkdepend-imakemdep.h b/www/libxul/files/patch-config-mkdepend-imakemdep.h
new file mode 100644
index 000000000000..b688e664475d
--- /dev/null
+++ b/www/libxul/files/patch-config-mkdepend-imakemdep.h
@@ -0,0 +1,10 @@
+--- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998
++++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003
+@@ -278,4 +278,7 @@
+ "-D__i386__",
+ # endif
++# if defined(__amd64__) || defined(__x86_64__)
++ "-D__amd64__ -D__x86_64__",
++# endif
+ # ifdef __GNUC__
+ "-traditional",
diff --git a/www/libxul/files/patch-config_autoconf.mk.in b/www/libxul/files/patch-config_autoconf.mk.in
new file mode 100644
index 000000000000..b39d9bacf0d7
--- /dev/null
+++ b/www/libxul/files/patch-config_autoconf.mk.in
@@ -0,0 +1,21 @@
+--- config/autoconf.mk.in.orig 2007-08-28 12:02:43.000000000 -0400
++++ config/autoconf.mk.in 2007-09-26 14:21:51.000000000 -0400
+@@ -58,14 +58,14 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir = @includedir@/%%MOZILLA%%
+ libdir = @libdir@
+ datadir = @datadir@
+ mandir = @mandir@
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir = $(datadir)/idl/%%MOZILLA%%
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/%%MOZILLA%%
++sdkdir = $(libdir)/%%MOZILLA%%
+
+ DIST = $(DEPTH)/dist
+ LIBXUL_SDK = @LIBXUL_SDK@
diff --git a/www/libxul/files/patch-config_mkdepend_Makefile.in b/www/libxul/files/patch-config_mkdepend_Makefile.in
new file mode 100644
index 000000000000..8da7e48ab0df
--- /dev/null
+++ b/www/libxul/files/patch-config_mkdepend_Makefile.in
@@ -0,0 +1,10 @@
+--- config/mkdepend/Makefile.in.orig Sun Apr 18 14:17:26 2004
++++ config/mkdepend/Makefile.in Sun Dec 12 09:42:11 2004
+@@ -73,6 +73,7 @@
+ include $(topsrcdir)/config/rules.mk
+
+ HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS += $(XCFLAGS)
+
+ ifdef GNU_CC
+ _GCCDIR = $(shell $(CC) -print-file-name=include)
diff --git a/www/libxul/files/patch-config_rules.mk b/www/libxul/files/patch-config_rules.mk
new file mode 100644
index 000000000000..16cb6ae1192e
--- /dev/null
+++ b/www/libxul/files/patch-config_rules.mk
@@ -0,0 +1,14 @@
+--- config/rules.mk.orig Sun May 18 16:10:18 2003
++++ config/rules.mk Sun Jul 20 18:07:26 2003
+@@ -448,7 +448,11 @@
+
+ ifeq ($(OS_ARCH),FreeBSD)
+ ifdef IS_COMPONENT
++ifneq (,$(filter alpha ia64,$(OS_TEST)))
++EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
++else
+ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
++endif
+ endif
+ endif
+
diff --git a/www/libxul/files/patch-configure b/www/libxul/files/patch-configure
new file mode 100644
index 000000000000..768a178142d2
--- /dev/null
+++ b/www/libxul/files/patch-configure
@@ -0,0 +1,38 @@
+--- configure.orig 2008-05-28 11:31:02.000000000 -0700
++++ configure 2008-07-26 07:27:03.712894513 -0700
+@@ -10808,7 +10808,7 @@
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-liconv $LIBS"
++LIBS="-L$LOCALBASE/lib -liconv $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 10814 "configure"
+ #include "confdefs.h"
+@@ -10839,7 +10839,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- _ICONV_LIBS="$_ICONV_LIBS -liconv"
++ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
+ else
+ echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
+@@ -10849,7 +10849,7 @@
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-liconv $LIBS"
++LIBS="-L$LOCALBASE/lib -liconv $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 10855 "configure"
+ #include "confdefs.h"
+@@ -10880,7 +10880,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- _ICONV_LIBS="$_ICONV_LIBS -liconv"
++ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
+ else
+ echo "$ac_t""no" 1>&6
+ fi
diff --git a/www/libxul/files/patch-embedding_base_nsEmbedAPI.cpp b/www/libxul/files/patch-embedding_base_nsEmbedAPI.cpp
new file mode 100644
index 000000000000..2cc9823fed1c
--- /dev/null
+++ b/www/libxul/files/patch-embedding_base_nsEmbedAPI.cpp
@@ -0,0 +1,16 @@
+--- embedding/base/nsEmbedAPI.cpp.orig 2007-10-09 20:00:30.000000000 -0400
++++ embedding/base/nsEmbedAPI.cpp 2007-10-09 20:01:45.000000000 -0400
+@@ -53,7 +53,12 @@ static PRBool sRegistryIniti
+ static PRUint32 sInitCounter = 0;
+
+ #define HACK_AROUND_THREADING_ISSUES
+-//#define HACK_AROUND_NONREENTRANT_INITXPCOM
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#if __FreeBSD_version < 700042
++#define HACK_AROUND_NONREENTRANT_INITXPCOM
++#endif
++#endif
+
+ #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM
+ // XXX hack class to clean up XPCOM when this module is unloaded
diff --git a/www/libxul/files/patch-security_coreconf_FreeBSD.mk b/www/libxul/files/patch-security_coreconf_FreeBSD.mk
new file mode 100644
index 000000000000..5c76b5af5ebf
--- /dev/null
+++ b/www/libxul/files/patch-security_coreconf_FreeBSD.mk
@@ -0,0 +1,37 @@
+--- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003
++++ security/coreconf/FreeBSD.mk Thu Jul 8 12:56:24 2004
+@@ -35,16 +35,18 @@
+
+ include $(CORE_DEPTH)/coreconf/UNIX.mk
+
+-DEFAULT_COMPILER = gcc
+-CC = gcc
+-CCC = g++
++CCC = ${CXX}
+ RANLIB = ranlib
+
+ ifeq ($(OS_TEST),alpha)
+ CPU_ARCH = alpha
+ else
++ifeq ($(OS_TEST),amd64)
++CPU_ARCH = amd64
++else
+ CPU_ARCH = x86
+ endif
++endif
+
+ OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+
+@@ -71,7 +73,11 @@
+ DLL_SUFFIX = so.1.0
+ endif
+
+-MKSHLIB = $(CC) $(DSO_LDOPTS)
++ifneq (,$(filter alpha ia64,$(OS_TEST)))
++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
++else
++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
++endif
+ ifdef MAPFILE
+ # Add LD options to restrict exported symbols to those in the map file
+ endif
diff --git a/www/libxul/files/patch-toolkit_mozapps_installer_packager.mk b/www/libxul/files/patch-toolkit_mozapps_installer_packager.mk
new file mode 100644
index 000000000000..635c3c79c13c
--- /dev/null
+++ b/www/libxul/files/patch-toolkit_mozapps_installer_packager.mk
@@ -0,0 +1,11 @@
+--- toolkit/mozapps/installer/packager.mk.orig 2007-09-26 13:45:01.000000000 -0400
++++ toolkit/mozapps/installer/packager.mk 2007-09-26 13:47:29.000000000 -0400
+@@ -409,7 +409,7 @@
+ (cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
+ (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
+ # The dist/include has module subdirectories that we need to flatten
+- find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
++ find $(DIST)/include -type f -o -type l -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
+ # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
+ $(NSINSTALL) -D $(DESTDIR)$(idldir)/stable
+ $(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable
diff --git a/www/libxul/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc b/www/libxul/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc
new file mode 100644
index 000000000000..ebe5474ca275
--- /dev/null
+++ b/www/libxul/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc
@@ -0,0 +1,11 @@
+--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004
+@@ -8,7 +8,7 @@
+ * 1 is AddRef
+ * 2 is Release
+ */
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64)
+ NS_IMETHOD Stub3();
+ NS_IMETHOD Stub4();
+ NS_IMETHOD Stub5();
diff --git a/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
new file mode 100644
index 000000000000..cf4ffb04e511
--- /dev/null
+++ b/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
@@ -0,0 +1,54 @@
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004
+@@ -49,6 +49,9 @@
+ ifeq (86,$(findstring 86,$(OS_TEST)))
+ CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
+ endif
++ifeq (x86_64,$(OS_TEST))
++CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
++endif
+ endif
+ #
+ # New code for Linux, et. al., with gcc
+@@ -60,7 +63,7 @@
+ endif
+ endif
+ # IA64 Linux
+-ifneq (,$(filter Linux,$(OS_ARCH)))
++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
+ ifneq (,$(findstring ia64,$(OS_TEST)))
+ CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
+ ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
+@@ -106,9 +109,15 @@
+ ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
+ endif
+ #
++# FreeBSD/Alpha
++#
++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
++CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
++endif
++#
+ # Linux/Alpha
+ #
+-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))
++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
+ endif
+ #
+@@ -294,6 +303,15 @@
+ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
+ CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
+ ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
++endif
++#
++# FreeBSD/SPARC64
++#
++ifeq ($(OS_ARCH),FreeBSD)
++ifneq (,$(findstring sparc,$(OS_TEST)))
++CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
++ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
++endif
+ endif
+ #
+ # Solaris/SPARC
diff --git a/www/libxul/files/patch-xptcall-alpha b/www/libxul/files/patch-xptcall-alpha
new file mode 100644
index 000000000000..29631a98e61e
--- /dev/null
+++ b/www/libxul/files/patch-xptcall-alpha
@@ -0,0 +1,459 @@
+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003
+@@ -0,0 +1,184 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Netscape Public License
++ * Version 1.1 (the "License"); you may not use this file except in
++ * compliance with the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/NPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is mozilla.org code.
++ *
++ * The Initial Developer of the Original Code is
++ * Netscape Communications Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 1998
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the NPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the NPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++/* Platform specific code to invoke XPCOM methods on native objects */
++
++/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
++
++#include "xptcprivate.h"
++
++/* Prototype specifies unmangled function name and disables unused warning */
++static void
++invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
++__asm__("invoke_copy_to_stack") __attribute__((unused));
++
++static void
++invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
++{
++ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer
++
++ for(PRUint32 i = 0; i < paramCount; i++, d++, s++)
++ {
++ if(s->IsPtrData())
++ {
++ *d = (PRUint64)s->ptr;
++ continue;
++ }
++ switch(s->type)
++ {
++ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break;
++ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break;
++ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break;
++ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break;
++ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break;
++ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break;
++ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break;
++ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break;
++ case nsXPTType::T_FLOAT :
++ if(i < NUM_ARG_REGS)
++ {
++ // convert floats to doubles if they are to be passed
++ // via registers so we can just deal with doubles later
++ union { PRUint64 u64; double d; } t;
++ t.d = (double)s->val.f;
++ *d = t.u64;
++ }
++ else
++ // otherwise copy to stack normally
++ *d = (PRUint64)s->val.u32;
++ break;
++ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break;
++ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break;
++ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break;
++ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break;
++ default:
++ // all the others are plain pointer types
++ *d = (PRUint64)s->val.p;
++ break;
++ }
++ }
++}
++
++/*
++ * XPTC_PUBLIC_API(nsresult)
++ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
++ * PRUint32 paramCount, nsXPTCVariant* params, void* vt)
++ */
++__asm__(
++ "#### XPTC_InvokeByIndex ####\n"
++".text\n\t"
++ ".align 5\n\t"
++ ".globl XPTC_InvokeByIndex\n\t"
++ ".ent XPTC_InvokeByIndex\n"
++"XPTC_InvokeByIndex:\n\t"
++ ".frame $15,32,$26,0\n\t"
++ ".mask 0x4008000,-32\n\t"
++ "ldgp $29,0($27)\n"
++"$XPTC_InvokeByIndex..ng:\n\t"
++ "subq $30,32,$30\n\t"
++ "stq $26,0($30)\n\t"
++ "stq $15,8($30)\n\t"
++ "bis $30,$30,$15\n\t"
++ ".prologue 1\n\t"
++
++ /*
++ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1
++ * parameters. (+1 for "this" pointer) Room for at least 6 parameters
++ * is required for storage of those passed via registers.
++ */
++
++ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */
++ "cmplt $2,$18,$1\n\t"
++ "cmovne $1,$18,$2\n\t"
++ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */
++ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */
++ "subq $30,$1,$30\n\t"
++
++ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */
++ "stq $17,16($15)\n\t" /* save "methodIndex" */
++
++ "addq $30,8,$16\n\t" /* pass stack pointer */
++ "bis $18,$18,$17\n\t" /* pass "paramCount" */
++ "bis $19,$19,$18\n\t" /* pass "params" */
++ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */
++
++ /*
++ * Copy the first 6 parameters to registers and remove from stack frame.
++ * Both the integer and floating point registers are set for each parameter
++ * except the first which is the "this" pointer. (integer only)
++ * The floating point registers are all set as doubles since the
++ * invoke_copy_to_stack function should have converted the floats.
++ */
++ "ldq $16,0($30)\n\t" /* integer registers */
++ "ldq $17,8($30)\n\t"
++ "ldq $18,16($30)\n\t"
++ "ldq $19,24($30)\n\t"
++ "ldq $20,32($30)\n\t"
++ "ldq $21,40($30)\n\t"
++ "ldt $f17,8($30)\n\t" /* floating point registers */
++ "ldt $f18,16($30)\n\t"
++ "ldt $f19,24($30)\n\t"
++ "ldt $f20,32($30)\n\t"
++ "ldt $f21,40($30)\n\t"
++
++ "addq $30,48,$30\n\t" /* remove params from stack */
++
++ /*
++ * Call the virtual function with the constructed stack frame.
++ */
++ "bis $16,$16,$1\n\t" /* load "this" */
++ "ldq $2,16($15)\n\t" /* load "methodIndex" */
++ "ldq $1,0($1)\n\t" /* load vtable */
++#if 0
++ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */
++#else
++ "mulq $2, 8, $2\n\t"
++ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */
++#endif
++ "addq $1,$2,$1\n\t"
++ "ldq $27,0($1)\n\t" /* load address of function */
++ "jsr $26,($27),0\n\t" /* call virtual function */
++ "ldgp $29,0($26)\n\t"
++
++ "bis $15,$15,$30\n\t"
++ "ldq $26,0($30)\n\t"
++ "ldq $15,8($30)\n\t"
++ "addq $30,32,$30\n\t"
++ "ret $31,($26),1\n\t"
++ ".end XPTC_InvokeByIndex"
++ );
++
+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003
+@@ -0,0 +1,269 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ * The contents of this file are subject to the Netscape Public License
++ * Version 1.1 (the "License"); you may not use this file except in
++ * compliance with the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/NPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is mozilla.org code.
++ *
++ * The Initial Developer of the Original Code is
++ * Netscape Communications Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 1999
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
++ * of those above. If you wish to allow use of your version of this file only
++ * under the terms of either the GPL or the LGPL, and not to allow others to
++ * use your version of this file under the terms of the NPL, indicate your
++ * decision by deleting the provisions above and replace them with the notice
++ * and other provisions required by the GPL or the LGPL. If you do not delete
++ * the provisions above, a recipient may use your version of this file under
++ * the terms of any one of the NPL, the GPL or the LGPL.
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++/* Implement shared vtbl methods. */
++
++/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
++
++#include <sys/types.h>
++#include <machine/cpu.h>
++#include "xptcprivate.h"
++
++/* Prototype specifies unmangled function name and disables unused warning */
++static nsresult
++PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
++__asm__("PrepareAndDispatch") __attribute__((unused));
++
++static nsresult
++PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
++{
++ const PRUint8 PARAM_BUFFER_COUNT = 16;
++ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer
++
++ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
++ nsXPTCMiniVariant* dispatchParams = NULL;
++ nsIInterfaceInfo* iface_info = NULL;
++ const nsXPTMethodInfo* info;
++ PRUint8 paramCount;
++ PRUint8 i;
++ nsresult result = NS_ERROR_FAILURE;
++
++ NS_ASSERTION(self,"no self");
++
++ self->GetInterfaceInfo(&iface_info);
++ NS_ASSERTION(iface_info,"no interface info");
++
++ iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
++ NS_ASSERTION(info,"no interface info");
++
++ paramCount = info->GetParamCount();
++
++ // setup variant array pointer
++ if(paramCount > PARAM_BUFFER_COUNT)
++ dispatchParams = new nsXPTCMiniVariant[paramCount];
++ else
++ dispatchParams = paramBuffer;
++ NS_ASSERTION(dispatchParams,"no place for params");
++
++ // args[0] to args[NUM_ARG_REGS] hold floating point register values
++ PRUint64* ap = args + NUM_ARG_REGS;
++ for(i = 0; i < paramCount; i++, ap++)
++ {
++ const nsXPTParamInfo& param = info->GetParam(i);
++ const nsXPTType& type = param.GetType();
++ nsXPTCMiniVariant* dp = &dispatchParams[i];
++
++ if(param.IsOut() || !type.IsArithmetic())
++ {
++ dp->val.p = (void*) *ap;
++ continue;
++ }
++ // else
++ switch(type)
++ {
++ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break;
++ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break;
++ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break;
++ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break;
++ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break;
++ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break;
++ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break;
++ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break;
++ case nsXPTType::T_FLOAT :
++ if(i < NUM_ARG_REGS)
++ {
++ // floats passed via registers are stored as doubles
++ // in the first NUM_ARG_REGS entries in args
++ dp->val.u64 = (PRUint64) args[i];
++ dp->val.f = (float) dp->val.d; // convert double to float
++ }
++ else
++ dp->val.u32 = (PRUint32) *ap;
++ break;
++ case nsXPTType::T_DOUBLE :
++ // doubles passed via registers are also stored
++ // in the first NUM_ARG_REGS entries in args
++ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap;
++ break;
++ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break;
++ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break;
++ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break;
++ default:
++ NS_ASSERTION(0, "bad type");
++ break;
++ }
++ }
++
++ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
++
++ NS_RELEASE(iface_info);
++
++ if(dispatchParams != paramBuffer)
++ delete [] dispatchParams;
++
++ return result;
++}
++
++/*
++ * SharedStub()
++ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is
++ * passed to this function via $1 to preserve the argument registers.
++ */
++__asm__(
++ "#### SharedStub ####\n"
++".text\n\t"
++ ".align 5\n\t"
++ ".ent SharedStub\n"
++"SharedStub:\n\t"
++ ".frame $30,96,$26,0\n\t"
++ ".mask 0x4000000,-96\n\t"
++ "ldgp $29,0($27)\n"
++"$SharedStub..ng:\n\t"
++ "subq $30,96,$30\n\t"
++ "stq $26,0($30)\n\t"
++ ".prologue 1\n\t"
++
++ /*
++ * Store arguments passed via registers to the stack.
++ * Floating point registers are stored as doubles and converted
++ * to floats in PrepareAndDispatch if necessary.
++ */
++ "stt $f17,16($30)\n\t" /* floating point registers */
++ "stt $f18,24($30)\n\t"
++ "stt $f19,32($30)\n\t"
++ "stt $f20,40($30)\n\t"
++ "stt $f21,48($30)\n\t"
++ "stq $17,56($30)\n\t" /* integer registers */
++ "stq $18,64($30)\n\t"
++ "stq $19,72($30)\n\t"
++ "stq $20,80($30)\n\t"
++ "stq $21,88($30)\n\t"
++
++ /*
++ * Call PrepareAndDispatch function.
++ */
++ "bis $1,$1,$17\n\t" /* pass "methodIndex" */
++ "addq $30,16,$18\n\t" /* pass "args" */
++ "bsr $26,$PrepareAndDispatch..ng\n\t"
++
++ "ldq $26,0($30)\n\t"
++ "addq $30,96,$30\n\t"
++ "ret $31,($26),1\n\t"
++ ".end SharedStub"
++ );
++
++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
++/*
++ * nsresult nsXPTCStubBase::Stub##n()
++ * Sets register $1 to "methodIndex" and jumps to SharedStub.
++ */
++#define STUB_ENTRY(n) \
++__asm__( \
++ "#### Stub"#n" ####\n" \
++".text\n\t" \
++ ".align 5\n\t" \
++ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \
++ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \
++"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \
++ ".frame $30,0,$26,0\n\t" \
++ "ldgp $29,0($27)\n" \
++"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \
++ ".prologue 1\n\t" \
++ "lda $1,"#n"\n\t" \
++ "br $31,$SharedStub..ng\n\t" \
++ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \
++ ); \
++__asm__( \
++ "#### Stub"#n" ####\n" \
++".text\n\t" \
++ ".align 5\n\t" \
++ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \
++ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \
++"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \
++ ".frame $30,0,$26,0\n\t" \
++ "ldgp $29,0($27)\n" \
++"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \
++ ".prologue 1\n\t" \
++ "lda $1,"#n"\n\t" \
++ "br $31,$SharedStub..ng\n\t" \
++ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \
++ ); \
++__asm__( \
++ "#### Stub"#n" ####\n" \
++".text\n\t" \
++ ".align 5\n\t" \
++ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \
++ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \
++"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \
++ ".frame $30,0,$26,0\n\t" \
++ "ldgp $29,0($27)\n" \
++"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \
++ ".prologue 1\n\t" \
++ "lda $1,"#n"\n\t" \
++ "br $31,$SharedStub..ng\n\t" \
++ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \
++ );
++#else
++/*
++ * nsresult nsXPTCStubBase::Stub##n()
++ * Sets register $1 to "methodIndex" and jumps to SharedStub.
++ */
++#define STUB_ENTRY(n) \
++nsresult nsXPTCStubBase::Stub##n() \
++{ \
++ nsresult result; \
++__asm__ __volatile__( \
++ "ldah $29,0($27)\n\t" \
++ "lda $29,0($29)\n\t" \
++ "lda $1, "#n"\n\t" \
++ "br $31, $SharedStub..ng\n\t" \
++ "mov $0, %0\n\t" \
++ : "=r" (result) \
++ ); \
++ return result; \
++}
++#endif
++
++#define SENTINEL_ENTRY(n) \
++nsresult nsXPTCStubBase::Sentinel##n() \
++{ \
++ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
++ return NS_ERROR_NOT_IMPLEMENTED; \
++}
++
++#include "xptcstubsdef.inc"
++
diff --git a/www/libxul/files/patch-xptcall-amd64 b/www/libxul/files/patch-xptcall-amd64
new file mode 100644
index 000000000000..3227cad02182
--- /dev/null
+++ b/www/libxul/files/patch-xptcall-amd64
@@ -0,0 +1,386 @@
+--- /dev/null Wed Dec 31 16:00:00 1969
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003
+@@ -0,0 +1,174 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++// Platform specific code to invoke XPCOM methods on native objects
++
++#include "xptcprivate.h"
++
++// 6 integral parameters are passed in registers
++const PRUint32 GPR_COUNT = 6;
++
++// 8 floating point parameters are passed in SSE registers
++const PRUint32 FPR_COUNT = 8;
++
++// Remember that these 'words' are 64-bit long
++static inline void
++invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s,
++ PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack)
++{
++ nr_gpr = 1; // skip one GP register for 'that'
++ nr_fpr = 0;
++ nr_stack = 0;
++
++ /* Compute number of eightbytes of class MEMORY. */
++ for (uint32 i = 0; i < paramCount; i++, s++) {
++ if (!s->IsPtrData()
++ && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) {
++ if (nr_fpr < FPR_COUNT)
++ nr_fpr++;
++ else
++ nr_stack++;
++ }
++ else {
++ if (nr_gpr < GPR_COUNT)
++ nr_gpr++;
++ else
++ nr_stack++;
++ }
++ }
++}
++
++static void
++invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s,
++ PRUint64 * gpregs, double * fpregs)
++{
++ PRUint32 nr_gpr = 1; // skip one GP register for 'that'
++ PRUint32 nr_fpr = 0;
++ PRUint64 value;
++
++ for (uint32 i = 0; i < paramCount; i++, s++) {
++ if (s->IsPtrData())
++ value = (PRUint64) s->ptr;
++ else {
++ switch (s->type) {
++ case nsXPTType::T_FLOAT: break;
++ case nsXPTType::T_DOUBLE: break;
++ case nsXPTType::T_I8: value = s->val.i8; break;
++ case nsXPTType::T_I16: value = s->val.i16; break;
++ case nsXPTType::T_I32: value = s->val.i32; break;
++ case nsXPTType::T_I64: value = s->val.i64; break;
++ case nsXPTType::T_U8: value = s->val.u8; break;
++ case nsXPTType::T_U16: value = s->val.u16; break;
++ case nsXPTType::T_U32: value = s->val.u32; break;
++ case nsXPTType::T_U64: value = s->val.u64; break;
++ case nsXPTType::T_BOOL: value = s->val.b; break;
++ case nsXPTType::T_CHAR: value = s->val.c; break;
++ case nsXPTType::T_WCHAR: value = s->val.wc; break;
++ default: value = (PRUint64) s->val.p; break;
++ }
++ }
++
++ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
++ if (nr_fpr < FPR_COUNT)
++ fpregs[nr_fpr++] = s->val.d;
++ else {
++ *((double *)d) = s->val.d;
++ d++;
++ }
++ }
++ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
++ if (nr_fpr < FPR_COUNT)
++ // The value in %xmm register is already prepared to
++ // be retrieved as a float. Therefore, we pass the
++ // value verbatim, as a double without conversion.
++ fpregs[nr_fpr++] = s->val.d;
++ else {
++ *((float *)d) = s->val.f;
++ d++;
++ }
++ }
++ else {
++ if (nr_gpr < GPR_COUNT)
++ gpregs[nr_gpr++] = value;
++ else
++ *d++ = value;
++ }
++ }
++}
++
++extern "C"
++XPTC_PUBLIC_API(nsresult)
++XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex,
++ PRUint32 paramCount, nsXPTCVariant * params)
++{
++ PRUint32 nr_gpr, nr_fpr, nr_stack;
++ invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack);
++
++ // Stack, if used, must be 16-bytes aligned
++ if (nr_stack)
++ nr_stack = (nr_stack + 1) & ~1;
++
++ // Load parameters to stack, if necessary
++ PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8);
++ PRUint64 gpregs[GPR_COUNT];
++ double fpregs[FPR_COUNT];
++ invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs);
++
++ // Load FPR registers from fpregs[]
++ register double d0 asm("xmm0");
++ register double d1 asm("xmm1");
++ register double d2 asm("xmm2");
++ register double d3 asm("xmm3");
++ register double d4 asm("xmm4");
++ register double d5 asm("xmm5");
++ register double d6 asm("xmm6");
++ register double d7 asm("xmm7");
++
++ switch (nr_fpr) {
++#define ARG_FPR(N) \
++ case N+1: d##N = fpregs[N];
++ ARG_FPR(7);
++ ARG_FPR(6);
++ ARG_FPR(5);
++ ARG_FPR(4);
++ ARG_FPR(3);
++ ARG_FPR(2);
++ ARG_FPR(1);
++ ARG_FPR(0);
++ case 0:;
++#undef ARG_FPR
++ }
++
++ // Load GPR registers from gpregs[]
++ register PRUint64 a0 asm("rdi");
++ register PRUint64 a1 asm("rsi");
++ register PRUint64 a2 asm("rdx");
++ register PRUint64 a3 asm("rcx");
++ register PRUint64 a4 asm("r8");
++ register PRUint64 a5 asm("r9");
++
++ switch (nr_gpr) {
++#define ARG_GPR(N) \
++ case N+1: a##N = gpregs[N];
++ ARG_GPR(5);
++ ARG_GPR(4);
++ ARG_GPR(3);
++ ARG_GPR(2);
++ ARG_GPR(1);
++ case 1: a0 = (PRUint64) that;
++ case 0:;
++#undef ARG_GPR
++ }
++
++ // Ensure that assignments to SSE registers won't be optimized away
++ asm("" ::
++ "x" (d0), "x" (d1), "x" (d2), "x" (d3),
++ "x" (d4), "x" (d5), "x" (d6), "x" (d7));
++
++ // Get pointer to method
++ PRUint64 methodAddress = *((PRUint64 *)that);
++ methodAddress += 8 * methodIndex;
++ methodAddress = *((PRUint64 *)methodAddress);
++
++ typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64);
++ PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5);
++ return result;
++}
+--- /dev/null Wed Dec 31 16:00:00 1969
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp Thu Oct 16 23:01:08 2003
+@@ -0,0 +1,206 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++
++// Implement shared vtbl methods.
++
++#include "xptcprivate.h"
++
++// The Linux/x86-64 ABI passes the first 6 integral parameters and the
++// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx,
++// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the
++// caller. The rest of the parameters are passed in the callers stack
++// area.
++
++const PRUint32 PARAM_BUFFER_COUNT = 16;
++const PRUint32 GPR_COUNT = 6;
++const PRUint32 FPR_COUNT = 8;
++
++// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
++//
++// - 'args[]' contains the arguments passed on stack
++// - 'gpregs[]' contains the arguments passed in integer registers
++// - 'fpregs[]' contains the arguments passed in floating point registers
++//
++// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
++// and then the method gets called.
++
++extern "C" nsresult
++PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex,
++ PRUint64 * args, PRUint64 * gpregs, double *fpregs)
++{
++ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
++ nsXPTCMiniVariant* dispatchParams = NULL;
++ nsIInterfaceInfo* iface_info = NULL;
++ const nsXPTMethodInfo* info;
++ PRUint32 paramCount;
++ PRUint32 i;
++ nsresult result = NS_ERROR_FAILURE;
++
++ NS_ASSERTION(self,"no self");
++
++ self->GetInterfaceInfo(&iface_info);
++ NS_ASSERTION(iface_info,"no interface info");
++ if (! iface_info)
++ return NS_ERROR_UNEXPECTED;
++
++ iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
++ NS_ASSERTION(info,"no method info");
++ if (! info)
++ return NS_ERROR_UNEXPECTED;
++
++ paramCount = info->GetParamCount();
++
++ // setup variant array pointer
++ if(paramCount > PARAM_BUFFER_COUNT)
++ dispatchParams = new nsXPTCMiniVariant[paramCount];
++ else
++ dispatchParams = paramBuffer;
++
++ NS_ASSERTION(dispatchParams,"no place for params");
++ if (! dispatchParams)
++ return NS_ERROR_OUT_OF_MEMORY;
++
++ PRUint64* ap = args;
++ PRUint32 nr_gpr = 1; // skip one GPR register for 'that'
++ PRUint32 nr_fpr = 0;
++ PRUint64 value;
++
++ for(i = 0; i < paramCount; i++) {
++ const nsXPTParamInfo& param = info->GetParam(i);
++ const nsXPTType& type = param.GetType();
++ nsXPTCMiniVariant* dp = &dispatchParams[i];
++
++ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
++ if (nr_fpr < FPR_COUNT)
++ dp->val.d = fpregs[nr_fpr++];
++ else
++ dp->val.d = *(double*) ap++;
++ continue;
++ }
++ else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
++ if (nr_fpr < FPR_COUNT)
++ // The value in %xmm register is already prepared to
++ // be retrieved as a float. Therefore, we pass the
++ // value verbatim, as a double without conversion.
++ dp->val.d = *(double*) ap++;
++ else
++ dp->val.f = *(float*) ap++;
++ continue;
++ }
++ else {
++ if (nr_gpr < GPR_COUNT)
++ value = gpregs[nr_gpr++];
++ else
++ value = *ap++;
++ }
++
++ if (param.IsOut() || !type.IsArithmetic()) {
++ dp->val.p = (void*) value;
++ continue;
++ }
++
++ switch (type) {
++ case nsXPTType::T_I8: dp->val.i8 = (PRInt8) value; break;
++ case nsXPTType::T_I16: dp->val.i16 = (PRInt16) value; break;
++ case nsXPTType::T_I32: dp->val.i32 = (PRInt32) value; break;
++ case nsXPTType::T_I64: dp->val.i64 = (PRInt64) value; break;
++ case nsXPTType::T_U8: dp->val.u8 = (PRUint8) value; break;
++ case nsXPTType::T_U16: dp->val.u16 = (PRUint16) value; break;
++ case nsXPTType::T_U32: dp->val.u32 = (PRUint32) value; break;
++ case nsXPTType::T_U64: dp->val.u64 = (PRUint64) value; break;
++ case nsXPTType::T_BOOL: dp->val.b = (PRBool) value; break;
++ case nsXPTType::T_CHAR: dp->val.c = (char) value; break;
++ case nsXPTType::T_WCHAR: dp->val.wc = (wchar_t) value; break;
++
++ default:
++ NS_ASSERTION(0, "bad type");
++ break;
++ }
++ }
++
++ result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams);
++
++ NS_RELEASE(iface_info);
++
++ if (dispatchParams != paramBuffer)
++ delete [] dispatchParams;
++
++ return result;
++}
++
++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
++// Linux/x86-64 uses gcc >= 3.1
++#define STUB_ENTRY(n) \
++asm(".section \".text\"\n\t" \
++ ".align 2\n\t" \
++ ".if " #n " < 10\n\t" \
++ ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
++ ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \
++ "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \
++ ".elseif " #n " < 100\n\t" \
++ ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
++ ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \
++ "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \
++ ".elseif " #n " < 1000\n\t" \
++ ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
++ ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \
++ "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \
++ ".else\n\t" \
++ ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \
++ ".endif\n\t" \
++ "movl $" #n ", %eax\n\t" \
++ "jmp SharedStub\n\t" \
++ ".if " #n " < 10\n\t" \
++ ".size _ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
++ ".elseif " #n " < 100\n\t" \
++ ".size _ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
++ ".else\n\t" \
++ ".size _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
++ ".endif");
++
++// static nsresult SharedStub(PRUint32 methodIndex)
++asm(".section \".text\"\n\t"
++ ".align 2\n\t"
++ ".type SharedStub,@function\n\t"
++ "SharedStub:\n\t"
++ // make room for gpregs (48), fpregs (64)
++ "pushq %rbp\n\t"
++ "movq %rsp,%rbp\n\t"
++ "subq $112,%rsp\n\t"
++ // save GP registers
++ "movq %rdi,-112(%rbp)\n\t"
++ "movq %rsi,-104(%rbp)\n\t"
++ "movq %rdx, -96(%rbp)\n\t"
++ "movq %rcx, -88(%rbp)\n\t"
++ "movq %r8 , -80(%rbp)\n\t"
++ "movq %r9 , -72(%rbp)\n\t"
++ "leaq -112(%rbp),%rcx\n\t"
++ // save FP registers
++ "movsd %xmm0,-64(%rbp)\n\t"
++ "movsd %xmm1,-56(%rbp)\n\t"
++ "movsd %xmm2,-48(%rbp)\n\t"
++ "movsd %xmm3,-40(%rbp)\n\t"
++ "movsd %xmm4,-32(%rbp)\n\t"
++ "movsd %xmm5,-24(%rbp)\n\t"
++ "movsd %xmm6,-16(%rbp)\n\t"
++ "movsd %xmm7, -8(%rbp)\n\t"
++ "leaq -64(%rbp),%r8\n\t"
++ // rdi has the 'self' pointer already
++ "movl %eax,%esi\n\t"
++ "leaq 16(%rbp),%rdx\n\t"
++ "call PrepareAndDispatch\n\t"
++ "leave\n\t"
++ "ret\n\t"
++ ".size SharedStub,.-SharedStub");
++
++#define SENTINEL_ENTRY(n) \
++nsresult nsXPTCStubBase::Sentinel##n() \
++{ \
++ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
++ return NS_ERROR_NOT_IMPLEMENTED; \
++}
++
++#include "xptcstubsdef.inc"
++
++#else
++#error "can't find a compiler to use"
++#endif /* __GNUC__ */
diff --git a/www/libxul/files/patch-xptcall-sparc64 b/www/libxul/files/patch-xptcall-sparc64
new file mode 100644
index 000000000000..9599a8a71336
--- /dev/null
+++ b/www/libxul/files/patch-xptcall-sparc64
@@ -0,0 +1,327 @@
+--- /dev/null Mon May 26 13:22:00 2003
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003
+@@ -0,0 +1,123 @@
++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
++ *
++ * The contents of this file are subject to the Mozilla Public
++ * License Version 1.1 (the "License"); you may not use this file
++ * except in compliance with the License. You may obtain a copy of
++ * the License at http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS
++ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
++ * implied. See the License for the specific language governing
++ * rights and limitations under the License.
++ *
++ * The Original Code is mozilla.org code.
++ *
++ * The Initial Developer of the Original Code is Netscape
++ * Communications Corporation. Portions created by Netscape are
++ * Copyright (C) 2001 Netscape Communications Corporation. All
++ * Rights Reserved.
++ *
++ * Contributor(s):
++ * Stuart Parmenter <pavlov@netscape.com>
++ */
++
++/* Implement shared vtbl methods. */
++
++#include "xptcprivate.h"
++
++#if defined(sparc) || defined(__sparc__)
++
++extern "C" nsresult
++PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args)
++{
++
++#define PARAM_BUFFER_COUNT 16
++
++ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
++ nsXPTCMiniVariant* dispatchParams = NULL;
++ nsIInterfaceInfo* iface_info = NULL;
++ const nsXPTMethodInfo* info;
++ PRUint8 paramCount;
++ PRUint8 i;
++ nsresult result = NS_ERROR_FAILURE;
++
++ NS_ASSERTION(self,"no self");
++
++ self->GetInterfaceInfo(&iface_info);
++ NS_ASSERTION(iface_info,"no interface info");
++
++ iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
++ NS_ASSERTION(info,"no interface info");
++
++ paramCount = info->GetParamCount();
++
++ // setup variant array pointer
++ if(paramCount > PARAM_BUFFER_COUNT)
++ dispatchParams = new nsXPTCMiniVariant[paramCount];
++ else
++ dispatchParams = paramBuffer;
++ NS_ASSERTION(dispatchParams,"no place for params");
++
++ PRUint64* ap = args;
++ for(i = 0; i < paramCount; i++, ap++)
++ {
++ const nsXPTParamInfo& param = info->GetParam(i);
++ const nsXPTType& type = param.GetType();
++ nsXPTCMiniVariant* dp = &dispatchParams[i];
++
++ if(param.IsOut() || !type.IsArithmetic())
++ {
++ dp->val.p = (void*) *ap;
++ continue;
++ }
++ // else
++ switch(type)
++ {
++ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break;
++ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break;
++ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break;
++ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break;
++ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break;
++ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break;
++ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break;
++ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break;
++ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break;
++ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break;
++ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break;
++ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break;
++ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break;
++ default:
++ NS_ASSERTION(0, "bad type");
++ break;
++ }
++ }
++
++ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
++
++ NS_RELEASE(iface_info);
++
++ if(dispatchParams != paramBuffer)
++ delete [] dispatchParams;
++
++ return result;
++}
++
++extern "C" int SharedStub(int, int*);
++
++#define STUB_ENTRY(n) \
++nsresult nsXPTCStubBase::Stub##n() \
++{ \
++ int dummy; /* defeat tail-call optimization */ \
++ return SharedStub(n, &dummy); \
++}
++
++#define SENTINEL_ENTRY(n) \
++nsresult nsXPTCStubBase::Sentinel##n() \
++{ \
++ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
++ return NS_ERROR_NOT_IMPLEMENTED; \
++}
++
++#include "xptcstubsdef.inc"
++
++#endif /* sparc || __sparc__ */
+--- /dev/null Mon May 26 13:22:00 2003
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003
+@@ -0,0 +1,104 @@
++/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
++ *
++ * The contents of this file are subject to the Mozilla Public
++ * License Version 1.1 (the "License"); you may not use this file
++ * except in compliance with the License. You may obtain a copy of
++ * the License at http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS
++ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
++ * implied. See the License for the specific language governing
++ * rights and limitations under the License.
++ *
++ * The Original Code is mozilla.org code.
++ *
++ * The Initial Developer of the Original Code is Netscape
++ * Communications Corporation. Portions created by Netscape are
++ * Copyright (C) 2001 Netscape Communications Corporation. All
++ * Rights Reserved.
++ *
++ * Contributor(s):
++ * Stuart Parmenter <pavlov@netscape.com>
++ * Chris Seawood <cls@seawood.org>
++ */
++
++/*
++ Platform specific code to invoke XPCOM methods on native objects
++ for sparcv9 Solaris.
++
++ See the SPARC Compliance Definition (SCD) Chapter 3
++ for more information about what is going on here, including
++ the use of BIAS (0x7ff).
++ The SCD is available from http://www.sparc.com/.
++*/
++
++ .global XPTC_InvokeByIndex
++ .type XPTC_InvokeByIndex, #function
++
++/*
++ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
++ PRUint32 paramCount, nsXPTCVariant* params);
++
++*/
++XPTC_InvokeByIndex:
++ save %sp,-(128 + 64),%sp ! room for the register window and
++ ! struct pointer, rounded up to 0 % 64
++ sll %i2,4,%l0 ! assume the worst case
++ ! paramCount * 2 * 8 bytes
++ cmp %l0, 0 ! are there any args? If not,
++ be .invoke ! no need to copy args to stack
++ nop
++
++ sub %sp,%l0,%sp ! create the additional stack space
++ add %sp,0x7ff+136,%o0 ! step past the register window, the
++ ! struct result pointer and the 'this' slot
++ mov %i2,%o1 ! paramCount
++ call invoke_copy_to_stack
++ mov %i3,%o2 ! params
++
++!
++! load arguments from stack into the outgoing registers
++! BIAS is 0x7ff (2047)
++!
++
++! load the %o1..5 64bit (extended word) output registers registers
++ ldx [%sp + 0x7ff + 136],%o1 ! %i1
++ ldx [%sp + 0x7ff + 144],%o2 ! %i2
++ ldx [%sp + 0x7ff + 152],%o3 ! %i3
++ ldx [%sp + 0x7ff + 160],%o4 ! %i4
++ ldx [%sp + 0x7ff + 168],%o5 ! %i5
++
++! load the even number double registers starting with %d2
++ ldd [%sp + 0x7ff + 136],%f2
++ ldd [%sp + 0x7ff + 144],%f4
++ ldd [%sp + 0x7ff + 152],%f6
++ ldd [%sp + 0x7ff + 160],%f8
++ ldd [%sp + 0x7ff + 168],%f10
++ ldd [%sp + 0x7ff + 176],%f12
++ ldd [%sp + 0x7ff + 184],%f14
++ ldd [%sp + 0x7ff + 192],%f16
++ ldd [%sp + 0x7ff + 200],%f18
++ ldd [%sp + 0x7ff + 208],%f20
++ ldd [%sp + 0x7ff + 216],%f22
++ ldd [%sp + 0x7ff + 224],%f24
++ ldd [%sp + 0x7ff + 232],%f26
++ ldd [%sp + 0x7ff + 240],%f28
++ ldd [%sp + 0x7ff + 248],%f30
++
++!
++! calculate the target address from the vtable
++!
++.invoke:
++ sll %i1,3,%l0 ! index *= 8
++! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes)
++ ldx [%i0],%l1 ! *that --> address of vtable
++ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address
++
++ jmpl %l0,%o7 ! call the routine
++ mov %i0,%o0 ! move 'this' pointer to out register
++
++ mov %o0,%i0 ! propagate return value
++ ret
++ restore
++
++ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
+--- /dev/null Mon May 26 14:00:00 2003
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003
+@@ -0,0 +1,91 @@
++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
++ *
++ * The contents of this file are subject to the Mozilla Public
++ * License Version 1.1 (the "License"); you may not use this file
++ * except in compliance with the License. You may obtain a copy of
++ * the License at http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS
++ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
++ * implied. See the License for the specific language governing
++ * rights and limitations under the License.
++ *
++ * The Original Code is mozilla.org code.
++ *
++ * The Initial Developer of the Original Code is Netscape
++ * Communications Corporation. Portions created by Netscape are
++ * Copyright (C) 2001 Netscape Communications Corporation. All
++ * Rights Reserved.
++ *
++ * Contributor(s):
++ * Stuart Parmenter <pavlov@netscape.com>
++ * Chris Seawood <cls@seawood.org>
++ */
++
++
++/* Platform specific code to invoke XPCOM methods on native objects */
++
++#include "xptcprivate.h"
++
++#if !defined(__sparc) && !defined(__sparc__)
++#error "This code is for Sparc only"
++#endif
++
++/* Prototype specifies unmangled function name */
++extern "C" PRUint64
++invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s);
++
++extern "C" PRUint64
++invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
++{
++ /*
++ We need to copy the parameters for this function to locals and use them
++ from there since the parameters occupy the same stack space as the stack
++ we're trying to populate.
++ */
++ PRUint64 *l_d = d;
++ nsXPTCVariant *l_s = s;
++ PRUint64 l_paramCount = paramCount;
++ PRUint64 regCount = 0; // return the number of registers to load from the stack
++
++ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++)
++ {
++ if (regCount < 5) regCount++;
++
++ if (l_s->IsPtrData())
++ {
++ *l_d = (PRUint64)l_s->ptr;
++ continue;
++ }
++ switch (l_s->type)
++ {
++ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break;
++ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break;
++ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break;
++ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break;
++
++ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break;
++ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break;
++ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break;
++ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break;
++
++ /* in the case of floats, we want to put the bits in to the
++ 64bit space right justified... floats in the paramter array on
++ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip
++ the space that would be occupied by %f0, %f2, etc.
++ */
++ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break;
++ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break;
++ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break;
++ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break;
++ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break;
++
++ default:
++ // all the others are plain pointer types
++ *((void**)l_d) = l_s->val.p;
++ break;
++ }
++ }
++
++ return regCount;
++}
diff --git a/www/libxul/files/patch-xulrunner_app_mozilla.in b/www/libxul/files/patch-xulrunner_app_mozilla.in
new file mode 100644
index 000000000000..1839a79d7d0a
--- /dev/null
+++ b/www/libxul/files/patch-xulrunner_app_mozilla.in
@@ -0,0 +1,18 @@
+--- xulrunner/app/mozilla.in.orig Wed Oct 11 18:25:16 2006
++++ xulrunner/app/mozilla.in Wed Oct 11 18:25:48 2006
+@@ -193,12 +193,12 @@
+ done #others arg
+
+ #???: needs check if othersopt begin with -* ?
+-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+ # Last argument seems to be a local file/directory
+ # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
+ # If it is just "relatively" (./file) specified, make it absolutely
+- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+-elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
++ [ `expr -e X"${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
++elif [ `expr -e X"${_optLast}" : '.*:/.*'` -gt 0 -o -n X"${_optOthers}" ]; then #???? like before...
+ _NEW_WINDOW=1
+ fi
+
diff --git a/www/libxul/files/patch-xulrunner_installer_libxul.pc.in b/www/libxul/files/patch-xulrunner_installer_libxul.pc.in
new file mode 100644
index 000000000000..690ce9ce955d
--- /dev/null
+++ b/www/libxul/files/patch-xulrunner_installer_libxul.pc.in
@@ -0,0 +1,11 @@
+--- xulrunner/installer/libxul.pc.in.orig 2007-08-03 10:46:28.000000000 -0400
++++ xulrunner/installer/libxul.pc.in 2009-03-29 15:17:17.000000000 -0400
+@@ -12,5 +12,5 @@ Name: libxul
+ Description: The Mozilla Runtime and Embedding Engine
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
+-Cflags: -I${includedir}/${includetype} -fshort-wchar
+\ No newline at end of file
++Libs: -L${sdkdir}/lib -L%%MOZ_LIBDIR%% -lxpcomglue_s -lxul -lxpcom
++Cflags: -I${includedir}/${includetype} -fshort-wchar
diff --git a/www/libxul/pkg-descr b/www/libxul/pkg-descr
new file mode 100644
index 000000000000..a4c33d7dfb77
--- /dev/null
+++ b/www/libxul/pkg-descr
@@ -0,0 +1,7 @@
+Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications
+that are as rich as Firefox and Thunderbird. It will provide mechanisms for
+installing, upgrading, and uninstalling these applications. XULRunner will
+also provide libxul, a solution which allows the embedding of Mozilla
+technologies in other projects and products.
+
+WWW: http://developer.mozilla.org/en/docs/XULRunner
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 21dd5873e51e..366d8379734e 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -3,11 +3,11 @@
# Whom: eivind/dima/jseger
#
# $FreeBSD$
-# $MCom: ports-stable/www/mozilla/Makefile,v 1.22 2008/08/07 04:42:36 mezz Exp $
+# $MCom: ports/www/mozilla/Makefile,v 1.55 2009/04/09 03:12:52 mezz Exp $
PORTNAME= mozilla
PORTVERSION= 1.7.13
-PORTREVISION?= 10
+PORTREVISION?= 11
PORTEPOCH= 2
CATEGORIES?= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
@@ -24,6 +24,7 @@ DEPRECATED= The mozilla team has shifted the development branch of mozilla to \
seamonkey, this port is outdated and has many vulnerabilities. \
Please consider using www/seamonkey or www/firefox instead.
+CONFLICTS= libxul-[0-9]*
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/dist/bin
USE_GMAKE= yes
USE_BZIP2= yes
diff --git a/www/mozilla/pkg-deinstall.in b/www/mozilla/pkg-deinstall.in
index ea9cd3dcb04a..2544ee4ed3a2 100644
--- a/www/mozilla/pkg-deinstall.in
+++ b/www/mozilla/pkg-deinstall.in
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $MCom: ports-stable/www/mozilla/pkg-deinstall.in,v 1.13 2008/07/30 15:56:57 mezz Exp $
+# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.25 2008/07/26 19:07:07 ahze Exp $
#
# Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>)
diff --git a/www/mozilla/pkg-install.in b/www/mozilla/pkg-install.in
index 6f787fe716a1..b2c8186701c4 100644
--- a/www/mozilla/pkg-install.in
+++ b/www/mozilla/pkg-install.in
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $MCom: ports-stable/www/mozilla/pkg-install.in,v 1.15 2008/08/04 05:01:00 mezz Exp $
+# $MCom: ports/www/mozilla/pkg-install.in,v 1.26 2008/08/04 16:58:03 mezz Exp $
#
# Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>)
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 5f501e1755a8..abf357e11ede 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,11 +3,11 @@
# Whom: ade, archie
#
# $FreeBSD$
-# $MCom: ports/x11-fm/nautilus/Makefile,v 1.171 2008/11/25 01:09:55 marcus Exp $
+# $MCom: ports/x11-fm/nautilus/Makefile,v 1.177 2009/04/03 09:50:59 kwm Exp $
#
PORTNAME= nautilus
-PORTVERSION= 2.24.2
+PORTVERSION= 2.26.1
CATEGORIES= x11-fm gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,13 +15,15 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT?= File manager for the GNOME desktop
-LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \
+ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
+ exempi.3:${PORTSDIR}/textproc/exempi
INSTALLS_ICONS= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop eel2 \
+USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \
librsvg2 desktopfileutils ltverhack gvfs ltasneededhack
GNOME_DESKTOP_VERSION=2
USE_LDCONFIG= yes
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index 94a77816c213..63e552518b93 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-2.24.2.tar.bz2) = 783e5f7be6391d6c46b4725e38af475a
-SHA256 (gnome2/nautilus-2.24.2.tar.bz2) = a793ebe4245656f0ae23d5a87895555182f62943e02e9667303ad20c4e690c1d
-SIZE (gnome2/nautilus-2.24.2.tar.bz2) = 5356516
+MD5 (gnome2/nautilus-2.26.1.tar.bz2) = 5d75f5de2806e9003e36a4613866b8d1
+SHA256 (gnome2/nautilus-2.26.1.tar.bz2) = 86c8839ad5c8a1c5674eb3617bbe15e9c9bb2358a7435a0e2d22cd25ab7718ff
+SIZE (gnome2/nautilus-2.26.1.tar.bz2) = 5925125
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 367c06b74c6b..513932c9554a 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -17,9 +17,9 @@ lib/libnautilus-extension.a
lib/libnautilus-extension.la
lib/libnautilus-extension.so
lib/libnautilus-extension.so.1
-libdata/bonobo/servers/Nautilus_shell.server
libdata/pkgconfig/libnautilus-extension.pc
share/applications/nautilus-autorun-software.desktop
+share/applications/nautilus-browser.desktop
share/applications/nautilus-computer.desktop
share/applications/nautilus-file-management-properties.desktop
share/applications/nautilus-folder-handler.desktop
@@ -68,6 +68,7 @@ share/locale/br/LC_MESSAGES/nautilus.mo
share/locale/bs/LC_MESSAGES/nautilus.mo
share/locale/ca/LC_MESSAGES/nautilus.mo
share/locale/ca@valencia/LC_MESSAGES/nautilus.mo
+share/locale/crh/LC_MESSAGES/nautilus.mo
share/locale/cs/LC_MESSAGES/nautilus.mo
share/locale/cy/LC_MESSAGES/nautilus.mo
share/locale/da/LC_MESSAGES/nautilus.mo
@@ -87,12 +88,14 @@ share/locale/fur/LC_MESSAGES/nautilus.mo
share/locale/ga/LC_MESSAGES/nautilus.mo
share/locale/gl/LC_MESSAGES/nautilus.mo
share/locale/gu/LC_MESSAGES/nautilus.mo
+share/locale/ha/LC_MESSAGES/nautilus.mo
share/locale/he/LC_MESSAGES/nautilus.mo
share/locale/hi/LC_MESSAGES/nautilus.mo
share/locale/hr/LC_MESSAGES/nautilus.mo
share/locale/hu/LC_MESSAGES/nautilus.mo
share/locale/hy/LC_MESSAGES/nautilus.mo
share/locale/id/LC_MESSAGES/nautilus.mo
+share/locale/ig/LC_MESSAGES/nautilus.mo
share/locale/io/LC_MESSAGES/nautilus.mo
share/locale/is/LC_MESSAGES/nautilus.mo
share/locale/it/LC_MESSAGES/nautilus.mo
@@ -105,6 +108,7 @@ share/locale/ku/LC_MESSAGES/nautilus.mo
share/locale/li/LC_MESSAGES/nautilus.mo
share/locale/lt/LC_MESSAGES/nautilus.mo
share/locale/lv/LC_MESSAGES/nautilus.mo
+share/locale/mai/LC_MESSAGES/nautilus.mo
share/locale/mg/LC_MESSAGES/nautilus.mo
share/locale/mi/LC_MESSAGES/nautilus.mo
share/locale/mk/LC_MESSAGES/nautilus.mo
@@ -141,18 +145,22 @@ share/locale/th/LC_MESSAGES/nautilus.mo
share/locale/tk/LC_MESSAGES/nautilus.mo
share/locale/tr/LC_MESSAGES/nautilus.mo
share/locale/uk/LC_MESSAGES/nautilus.mo
+share/locale/uz/LC_MESSAGES/nautilus.mo
+share/locale/uz@cyrillic/LC_MESSAGES/nautilus.mo
share/locale/vi/LC_MESSAGES/nautilus.mo
share/locale/wa/LC_MESSAGES/nautilus.mo
share/locale/xh/LC_MESSAGES/nautilus.mo
share/locale/yi/LC_MESSAGES/nautilus.mo
+share/locale/yo/LC_MESSAGES/nautilus.mo
share/locale/zh_CN/LC_MESSAGES/nautilus.mo
share/locale/zh_HK/LC_MESSAGES/nautilus.mo
share/locale/zh_TW/LC_MESSAGES/nautilus.mo
share/locale/zu/LC_MESSAGES/nautilus.mo
share/mime/packages/nautilus.xml
%%DATADIR%%/browser.xml
-%%DATADIR%%/glade/nautilus-bookmarks-window.glade
-%%DATADIR%%/glade/nautilus-file-management-properties.glade
+%%DATADIR%%/icons/hicolor/16x16/emblems/emblem-note.png
+%%DATADIR%%/icons/hicolor/24x24/emblems/emblem-note.png
+%%DATADIR%%/icons/hicolor/48x48/emblems/emblem-note.png
%%DATADIR%%/nautilus-extras.placeholder
%%DATADIR%%/nautilus-suggested.placeholder
%%DATADIR%%/patterns/blue_gray_rough.png
@@ -186,6 +194,8 @@ share/mime/packages/nautilus.xml
%%DATADIR%%/patterns/stucco.jpg
%%DATADIR%%/patterns/terracotta.png
%%DATADIR%%/patterns/wavy_white.png
+%%DATADIR%%/ui/nautilus-bookmarks-window.ui
+%%DATADIR%%/ui/nautilus-file-management-properties.ui
%%DATADIR%%/ui/nautilus-desktop-icon-view-ui.xml
%%DATADIR%%/ui/nautilus-directory-view-ui.xml
%%DATADIR%%/ui/nautilus-icon-view-ui.xml
@@ -200,12 +210,18 @@ share/pixmaps/nautilus/colors.png
share/pixmaps/nautilus/emblems.png
share/pixmaps/nautilus/erase.png
share/pixmaps/nautilus/knob.png
-share/pixmaps/nautilus/note-indicator.png
share/pixmaps/nautilus/thumbnail_frame.png
@dirrm share/pixmaps/nautilus
@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%/patterns
-@dirrm %%DATADIR%%/glade
+@dirrmtry %%DATADIR%%/icons/hicolor/48x48/emblems
+@dirrmtry %%DATADIR%%/icons/hicolor/48x48
+@dirrmtry %%DATADIR%%/icons/hicolor/24x24/emblems
+@dirrmtry %%DATADIR%%/icons/hicolor/24x24
+@dirrmtry %%DATADIR%%/icons/hicolor/16x16/emblems
+@dirrmtry %%DATADIR%%/icons/hicolor/16x16
+@dirrmtry %%DATADIR%%/icons/hicolor
+@dirrmtry %%DATADIR%%/icons
@dirrm %%DATADIR%%
@dirrmtry share/applications
@exec /bin/mkdir -p %D/lib/nautilus/extensions-2.0
@@ -222,10 +238,14 @@ share/pixmaps/nautilus/thumbnail_frame.png
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/yo/LC_MESSAGES
+@dirrmtry share/locale/yo
@dirrmtry share/locale/yi/LC_MESSAGES
@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -248,18 +268,26 @@ share/pixmaps/nautilus/thumbnail_frame.png
@dirrmtry share/locale/mi
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/km/LC_MESSAGES
@dirrmtry share/locale/km
@dirrmtry share/locale/io/LC_MESSAGES
@dirrmtry share/locale/io
+@dirrmtry share/locale/ig/LC_MESSAGES
+@dirrmtry share/locale/ig
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/ha/LC_MESSAGES
+@dirrmtry share/locale/ha
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/x11-fm/py-nautilus/Makefile b/x11-fm/py-nautilus/Makefile
index 81dcc2879438..090b127a21fb 100644
--- a/x11-fm/py-nautilus/Makefile
+++ b/x11-fm/py-nautilus/Makefile
@@ -3,7 +3,7 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-fm/py-nautilus/Makefile,v 1.9 2009/01/10 01:59:22 mezz Exp $
+# $MCom: ports/x11-fm/py-nautilus/Makefile,v 1.11 2009/04/07 17:54:12 marcus Exp $
#
PORTNAME= nautilus
@@ -17,13 +17,11 @@ DISTNAME= nautilus-python-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Python nautilus bindings
-LIB_DEPENDS= nautilus-extension:${PORTSDIR}/x11-fm/nautilus
-
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_PYTHON= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack pygnome2
+USE_GNOME= gnomeprefix gnomehack pygnome2 eel2 nautilus2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-fm/velocity/Makefile b/x11-fm/velocity/Makefile
index 4014894fa00f..e5fcd2e5bb8c 100644
--- a/x11-fm/velocity/Makefile
+++ b/x11-fm/velocity/Makefile
@@ -7,7 +7,7 @@
PORTNAME= velocity
PORTVERSION= 0.1.0b
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-fm
MASTER_SITES= http://www.jarrodkoehler.com/velocity/
DISTNAME= velocity-0.1.0beta
@@ -19,6 +19,8 @@ WRKSRC= ${WRKDIR}/velocity-0.1.0
USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
USE_GNOME= libgnomeui gnomedesktop librsvg2
+CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \
+ LIBS="`pkg-config --libs libgnomeui-2.0`"
.include <bsd.port.pre.mk>
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 227441524610..d0ccd33b270d 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.152 2008/10/20 23:11:42 kwm Exp $
+# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.157 2009/03/18 04:13:56 marcus Exp $
#
PORTNAME= gnome-themes
-PORTVERSION= 2.24.3
+PORTVERSION= 2.26.0
CATEGORIES= x11-themes gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo
index 7aaa42274091..5a44fa7dd57a 100644
--- a/x11-themes/gnome-themes/distinfo
+++ b/x11-themes/gnome-themes/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-themes-2.24.3.tar.bz2) = c986db988da6ca6dcf1032c1c9736e29
-SHA256 (gnome2/gnome-themes-2.24.3.tar.bz2) = 8f13e281a2b4363a980de2edbf16cd1ce0c895f84496f00758c29e00c929bf97
-SIZE (gnome2/gnome-themes-2.24.3.tar.bz2) = 1505357
+MD5 (gnome2/gnome-themes-2.26.0.tar.bz2) = 3f841154544867585504153d57df1fda
+SHA256 (gnome2/gnome-themes-2.26.0.tar.bz2) = 434052b3236d07da0b3b9fec7591917484dbf8fe61dd7113aeaaf58e724b54aa
+SIZE (gnome2/gnome-themes-2.26.0.tar.bz2) = 1431670
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index d3578f536c79..a3cbb80f6f2d 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -349,10 +349,7 @@ share/icons/HighContrast-SVG/48x48/animations/process-idle.png
share/icons/HighContrast-SVG/48x48/animations/process-working.png
share/icons/HighContrast-SVG/index.theme
share/icons/HighContrast-SVG/scalable/actions/add.svg
-share/icons/HighContrast-SVG/scalable/actions/address-book-new.svg
share/icons/HighContrast-SVG/scalable/actions/application-exit.svg
-share/icons/HighContrast-SVG/scalable/actions/appointment-new.svg
-share/icons/HighContrast-SVG/scalable/actions/appointment.svg
share/icons/HighContrast-SVG/scalable/actions/back.svg
share/icons/HighContrast-SVG/scalable/actions/bookmark-view.svg
share/icons/HighContrast-SVG/scalable/actions/bottom.svg
@@ -366,7 +363,6 @@ share/icons/HighContrast-SVG/scalable/actions/dialog-ok.svg
share/icons/HighContrast-SVG/scalable/actions/document-new.svg
share/icons/HighContrast-SVG/scalable/actions/document-open-recent.svg
share/icons/HighContrast-SVG/scalable/actions/document-open.svg
-share/icons/HighContrast-SVG/scalable/actions/document-page-setup.svg
share/icons/HighContrast-SVG/scalable/actions/document-print-preview.svg
share/icons/HighContrast-SVG/scalable/actions/document-print.svg
share/icons/HighContrast-SVG/scalable/actions/document-properties.svg
@@ -382,7 +378,6 @@ share/icons/HighContrast-SVG/scalable/actions/edit-find-replace.svg
share/icons/HighContrast-SVG/scalable/actions/edit-find.svg
share/icons/HighContrast-SVG/scalable/actions/edit-paste.svg
share/icons/HighContrast-SVG/scalable/actions/edit-redo.svg
-share/icons/HighContrast-SVG/scalable/actions/edit-select-all.svg
share/icons/HighContrast-SVG/scalable/actions/edit-undo.svg
share/icons/HighContrast-SVG/scalable/actions/editclear.svg
share/icons/HighContrast-SVG/scalable/actions/editcopy.svg
@@ -408,8 +403,6 @@ share/icons/HighContrast-SVG/scalable/actions/format-justify-fill.svg
share/icons/HighContrast-SVG/scalable/actions/format-justify-left.svg
share/icons/HighContrast-SVG/scalable/actions/format-justify-right.svg
share/icons/HighContrast-SVG/scalable/actions/format-text-bold.svg
-share/icons/HighContrast-SVG/scalable/actions/format-text-direction-ltr.svg
-share/icons/HighContrast-SVG/scalable/actions/format-text-direction-rtl.svg
share/icons/HighContrast-SVG/scalable/actions/format-text-italic.svg
share/icons/HighContrast-SVG/scalable/actions/format-text-strikethrough.svg
share/icons/HighContrast-SVG/scalable/actions/format-text-underline.svg
@@ -422,7 +415,6 @@ share/icons/HighContrast-SVG/scalable/actions/gnome-shutdown.svg
share/icons/HighContrast-SVG/scalable/actions/gnome-stock-mail-fwd.svg
share/icons/HighContrast-SVG/scalable/actions/gnome-stock-mail-new.svg
share/icons/HighContrast-SVG/scalable/actions/gnome-stock-mail-rpl.svg
-share/icons/HighContrast-SVG/scalable/actions/gnome-stock-mail-snd.svg
share/icons/HighContrast-SVG/scalable/actions/gnome-stock-text-indent.svg
share/icons/HighContrast-SVG/scalable/actions/gnome-stock-text-unindent.svg
share/icons/HighContrast-SVG/scalable/actions/go-bottom.svg
@@ -498,7 +490,6 @@ share/icons/HighContrast-SVG/scalable/actions/gtk-revert-to-saved-ltr.svg
share/icons/HighContrast-SVG/scalable/actions/gtk-revert-to-saved-rtl.svg
share/icons/HighContrast-SVG/scalable/actions/gtk-save-as.svg
share/icons/HighContrast-SVG/scalable/actions/gtk-save.svg
-share/icons/HighContrast-SVG/scalable/actions/gtk-select-all.svg
share/icons/HighContrast-SVG/scalable/actions/gtk-sort-ascending.svg
share/icons/HighContrast-SVG/scalable/actions/gtk-sort-descending.svg
share/icons/HighContrast-SVG/scalable/actions/gtk-spell-check.svg
@@ -509,6 +500,7 @@ share/icons/HighContrast-SVG/scalable/actions/gtk-undo-ltr.svg
share/icons/HighContrast-SVG/scalable/actions/gtk-unindent-ltr.svg
share/icons/HighContrast-SVG/scalable/actions/gtk-unindent-rtl.svg
share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-100.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-fit.svg
share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-in.svg
share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-out.svg
share/icons/HighContrast-SVG/scalable/actions/help-about.svg
@@ -516,7 +508,6 @@ share/icons/HighContrast-SVG/scalable/actions/help-contents.svg
share/icons/HighContrast-SVG/scalable/actions/help-faq.svg
share/icons/HighContrast-SVG/scalable/actions/history-view.svg
share/icons/HighContrast-SVG/scalable/actions/insert-image.svg
-share/icons/HighContrast-SVG/scalable/actions/insert-link.svg
share/icons/HighContrast-SVG/scalable/actions/insert-object.svg
share/icons/HighContrast-SVG/scalable/actions/insert-text.svg
share/icons/HighContrast-SVG/scalable/actions/kfind.svg
@@ -527,21 +518,16 @@ share/icons/HighContrast-SVG/scalable/actions/list-remove.svg
share/icons/HighContrast-SVG/scalable/actions/lock.svg
share/icons/HighContrast-SVG/scalable/actions/mail-forward.svg
share/icons/HighContrast-SVG/scalable/actions/mail-mark-important.svg
-share/icons/HighContrast-SVG/scalable/actions/mail-mark-junk.svg
-share/icons/HighContrast-SVG/scalable/actions/mail-mark-notjunk.svg
share/icons/HighContrast-SVG/scalable/actions/mail-mark-read.svg
share/icons/HighContrast-SVG/scalable/actions/mail-mark-unread.svg
share/icons/HighContrast-SVG/scalable/actions/mail-message-new.svg
share/icons/HighContrast-SVG/scalable/actions/mail-reply-all.svg
share/icons/HighContrast-SVG/scalable/actions/mail-reply-sender.svg
share/icons/HighContrast-SVG/scalable/actions/mail-send-receive.svg
-share/icons/HighContrast-SVG/scalable/actions/mail-send.svg
share/icons/HighContrast-SVG/scalable/actions/mail_forward.svg
share/icons/HighContrast-SVG/scalable/actions/mail_new.svg
share/icons/HighContrast-SVG/scalable/actions/mail_reply.svg
share/icons/HighContrast-SVG/scalable/actions/mail_replyall.svg
-share/icons/HighContrast-SVG/scalable/actions/mail_send.svg
-share/icons/HighContrast-SVG/scalable/actions/mail_spam.svg
share/icons/HighContrast-SVG/scalable/actions/media-eject.svg
share/icons/HighContrast-SVG/scalable/actions/media-playback-pause.svg
share/icons/HighContrast-SVG/scalable/actions/media-playback-start.svg
@@ -597,7 +583,6 @@ share/icons/HighContrast-SVG/scalable/actions/stock_mail-forward.svg
share/icons/HighContrast-SVG/scalable/actions/stock_mail-reply-to-all.svg
share/icons/HighContrast-SVG/scalable/actions/stock_mail-reply.svg
share/icons/HighContrast-SVG/scalable/actions/stock_mail-send-receive.svg
-share/icons/HighContrast-SVG/scalable/actions/stock_mail-send.svg
share/icons/HighContrast-SVG/scalable/actions/stock_media-fwd.svg
share/icons/HighContrast-SVG/scalable/actions/stock_media-next.svg
share/icons/HighContrast-SVG/scalable/actions/stock_media-pause.svg
@@ -606,15 +591,12 @@ share/icons/HighContrast-SVG/scalable/actions/stock_media-prev.svg
share/icons/HighContrast-SVG/scalable/actions/stock_media-rec.svg
share/icons/HighContrast-SVG/scalable/actions/stock_media-rew.svg
share/icons/HighContrast-SVG/scalable/actions/stock_media-stop.svg
-share/icons/HighContrast-SVG/scalable/actions/stock_new-address-book.svg
-share/icons/HighContrast-SVG/scalable/actions/stock_new-appointment.svg
share/icons/HighContrast-SVG/scalable/actions/stock_new-bcard.svg
share/icons/HighContrast-SVG/scalable/actions/stock_new-dir.svg
share/icons/HighContrast-SVG/scalable/actions/stock_new-text.svg
share/icons/HighContrast-SVG/scalable/actions/stock_new-window.svg
share/icons/HighContrast-SVG/scalable/actions/stock_paste.svg
share/icons/HighContrast-SVG/scalable/actions/stock_print-preview.svg
-share/icons/HighContrast-SVG/scalable/actions/stock_print-setup.svg
share/icons/HighContrast-SVG/scalable/actions/stock_print.svg
share/icons/HighContrast-SVG/scalable/actions/stock_properties.svg
share/icons/HighContrast-SVG/scalable/actions/stock_redo.svg
@@ -624,8 +606,6 @@ share/icons/HighContrast-SVG/scalable/actions/stock_save-as.svg
share/icons/HighContrast-SVG/scalable/actions/stock_save.svg
share/icons/HighContrast-SVG/scalable/actions/stock_search-and-replace.svg
share/icons/HighContrast-SVG/scalable/actions/stock_search.svg
-share/icons/HighContrast-SVG/scalable/actions/stock_select-all.svg
-share/icons/HighContrast-SVG/scalable/actions/stock_spam.svg
share/icons/HighContrast-SVG/scalable/actions/stock_spellcheck.svg
share/icons/HighContrast-SVG/scalable/actions/stock_stop.svg
share/icons/HighContrast-SVG/scalable/actions/stock_text-strikethrough.svg
@@ -644,6 +624,7 @@ share/icons/HighContrast-SVG/scalable/actions/stock_up.svg
share/icons/HighContrast-SVG/scalable/actions/stock_zoom-1.svg
share/icons/HighContrast-SVG/scalable/actions/stock_zoom-in.svg
share/icons/HighContrast-SVG/scalable/actions/stock_zoom-out.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_zoom-page.svg
share/icons/HighContrast-SVG/scalable/actions/stop.svg
share/icons/HighContrast-SVG/scalable/actions/system-lock-screen.svg
share/icons/HighContrast-SVG/scalable/actions/system-log-out.svg
@@ -667,6 +648,7 @@ share/icons/HighContrast-SVG/scalable/actions/view-sort-descending.svg
share/icons/HighContrast-SVG/scalable/actions/viewmag+.svg
share/icons/HighContrast-SVG/scalable/actions/viewmag-.svg
share/icons/HighContrast-SVG/scalable/actions/viewmag1.svg
+share/icons/HighContrast-SVG/scalable/actions/viewmagfit.svg
share/icons/HighContrast-SVG/scalable/actions/window-close.svg
share/icons/HighContrast-SVG/scalable/actions/window-new.svg
share/icons/HighContrast-SVG/scalable/actions/window_fullscreen.svg
@@ -675,6 +657,7 @@ share/icons/HighContrast-SVG/scalable/actions/window_nofullscreen.svg
share/icons/HighContrast-SVG/scalable/actions/xfce-system-exit.svg
share/icons/HighContrast-SVG/scalable/actions/xfce-system-lock.svg
share/icons/HighContrast-SVG/scalable/actions/zoom-best-fit.svg
+share/icons/HighContrast-SVG/scalable/actions/zoom-fit-best.svg
share/icons/HighContrast-SVG/scalable/actions/zoom-in.svg
share/icons/HighContrast-SVG/scalable/actions/zoom-original.svg
share/icons/HighContrast-SVG/scalable/actions/zoom-out.svg
@@ -682,15 +665,11 @@ share/icons/HighContrast-SVG/scalable/apps/access.svg
share/icons/HighContrast-SVG/scalable/apps/accessibility-directory.svg
share/icons/HighContrast-SVG/scalable/apps/accessories-calculator.svg
share/icons/HighContrast-SVG/scalable/apps/accessories-character-map.svg
-share/icons/HighContrast-SVG/scalable/apps/accessories-dictionary.svg
share/icons/HighContrast-SVG/scalable/apps/accessories-text-editor.svg
share/icons/HighContrast-SVG/scalable/apps/arts.svg
-share/icons/HighContrast-SVG/scalable/apps/background.svg
-share/icons/HighContrast-SVG/scalable/apps/browser.svg
share/icons/HighContrast-SVG/scalable/apps/bug-buddy.svg
share/icons/HighContrast-SVG/scalable/apps/calc.svg
share/icons/HighContrast-SVG/scalable/apps/config-language.svg
-share/icons/HighContrast-SVG/scalable/apps/email.svg
share/icons/HighContrast-SVG/scalable/apps/file-manager.svg
share/icons/HighContrast-SVG/scalable/apps/fonts.svg
share/icons/HighContrast-SVG/scalable/apps/glchess.svg
@@ -699,13 +678,9 @@ share/icons/HighContrast-SVG/scalable/apps/gnome-character-map.svg
share/icons/HighContrast-SVG/scalable/apps/gnome-help.svg
share/icons/HighContrast-SVG/scalable/apps/gnome-mixer.svg
share/icons/HighContrast-SVG/scalable/apps/gnome-monitor.svg
-share/icons/HighContrast-SVG/scalable/apps/gnome-session.svg
share/icons/HighContrast-SVG/scalable/apps/gnome-settings-accessibility-technologies.svg
-share/icons/HighContrast-SVG/scalable/apps/gnome-settings-background.svg
share/icons/HighContrast-SVG/scalable/apps/gnome-settings-font.svg
-share/icons/HighContrast-SVG/scalable/apps/gnome-settings-theme.svg
share/icons/HighContrast-SVG/scalable/apps/gnome-terminal.svg
-share/icons/HighContrast-SVG/scalable/apps/gnome-window-manager.svg
share/icons/HighContrast-SVG/scalable/apps/gtk-help.svg
share/icons/HighContrast-SVG/scalable/apps/gucharmap.svg
share/icons/HighContrast-SVG/scalable/apps/help-browser.svg
@@ -716,7 +691,6 @@ share/icons/HighContrast-SVG/scalable/apps/internet-news-reader.svg
share/icons/HighContrast-SVG/scalable/apps/internet-web-browser.svg
share/icons/HighContrast-SVG/scalable/apps/kcalc.svg
share/icons/HighContrast-SVG/scalable/apps/kcharselect.svg
-share/icons/HighContrast-SVG/scalable/apps/kcmkwm.svg
share/icons/HighContrast-SVG/scalable/apps/kcmsound.svg
share/icons/HighContrast-SVG/scalable/apps/kedit.svg
share/icons/HighContrast-SVG/scalable/apps/kfm.svg
@@ -724,74 +698,46 @@ share/icons/HighContrast-SVG/scalable/apps/khelpcenter.svg
share/icons/HighContrast-SVG/scalable/apps/konsole.svg
share/icons/HighContrast-SVG/scalable/apps/kscreensaver.svg
share/icons/HighContrast-SVG/scalable/apps/ksysguard.svg
-share/icons/HighContrast-SVG/scalable/apps/kwin.svg
share/icons/HighContrast-SVG/scalable/apps/locale.svg
-share/icons/HighContrast-SVG/scalable/apps/mail_generic.svg
share/icons/HighContrast-SVG/scalable/apps/multimedia-volume-control.svg
share/icons/HighContrast-SVG/scalable/apps/multimedia.svg
share/icons/HighContrast-SVG/scalable/apps/openterm.svg
share/icons/HighContrast-SVG/scalable/apps/orca.svg
share/icons/HighContrast-SVG/scalable/apps/preferences-desktop-accessibility.svg
share/icons/HighContrast-SVG/scalable/apps/preferences-desktop-font.svg
-share/icons/HighContrast-SVG/scalable/apps/preferences-desktop-keyboard.svg
share/icons/HighContrast-SVG/scalable/apps/preferences-desktop-locale.svg
-share/icons/HighContrast-SVG/scalable/apps/preferences-desktop-multimedia.svg
share/icons/HighContrast-SVG/scalable/apps/preferences-desktop-screensaver.svg
-share/icons/HighContrast-SVG/scalable/apps/preferences-desktop-theme.svg
-share/icons/HighContrast-SVG/scalable/apps/preferences-desktop-wallpaper.svg
share/icons/HighContrast-SVG/scalable/apps/preferences-system-network-proxy.svg
share/icons/HighContrast-SVG/scalable/apps/preferences-system-session.svg
share/icons/HighContrast-SVG/scalable/apps/preferences-system-windows.svg
-share/icons/HighContrast-SVG/scalable/apps/proxy-config.svg
-share/icons/HighContrast-SVG/scalable/apps/proxy.svg
-share/icons/HighContrast-SVG/scalable/apps/redhat-email.svg
share/icons/HighContrast-SVG/scalable/apps/redhat-filemanager.svg
-share/icons/HighContrast-SVG/scalable/apps/redhat-web-browser.svg
share/icons/HighContrast-SVG/scalable/apps/screensaver.svg
share/icons/HighContrast-SVG/scalable/apps/stock_help.svg
-share/icons/HighContrast-SVG/scalable/apps/stock_proxy.svg
-share/icons/HighContrast-SVG/scalable/apps/style.svg
share/icons/HighContrast-SVG/scalable/apps/susehelpcenter.svg
share/icons/HighContrast-SVG/scalable/apps/system-file-manager.svg
-share/icons/HighContrast-SVG/scalable/apps/system-software-update.svg
share/icons/HighContrast-SVG/scalable/apps/terminal.svg
share/icons/HighContrast-SVG/scalable/apps/text-editor.svg
share/icons/HighContrast-SVG/scalable/apps/tomboy.svg
-share/icons/HighContrast-SVG/scalable/apps/update-manager.svg
share/icons/HighContrast-SVG/scalable/apps/utilities-system-monitor.svg
share/icons/HighContrast-SVG/scalable/apps/utilities-terminal.svg
share/icons/HighContrast-SVG/scalable/apps/volume-knob.svg
-share/icons/HighContrast-SVG/scalable/apps/wallpaper.svg
-share/icons/HighContrast-SVG/scalable/apps/web-browser.svg
share/icons/HighContrast-SVG/scalable/apps/xfce-filemanager.svg
-share/icons/HighContrast-SVG/scalable/apps/xfce-mail.svg
share/icons/HighContrast-SVG/scalable/apps/xfce-terminal.svg
-share/icons/HighContrast-SVG/scalable/apps/xfce4-backdrop.svg
share/icons/HighContrast-SVG/scalable/apps/xfce4-mixer.svg
-share/icons/HighContrast-SVG/scalable/apps/xfce4-session.svg
-share/icons/HighContrast-SVG/scalable/apps/xfwm4.svg
share/icons/HighContrast-SVG/scalable/apps/xscreensaver.svg
-share/icons/HighContrast-SVG/scalable/apps/zen-icon.svg
share/icons/HighContrast-SVG/scalable/categories/applications-accessories.svg
share/icons/HighContrast-SVG/scalable/categories/applications-development.svg
-share/icons/HighContrast-SVG/scalable/categories/applications-engineering.svg
share/icons/HighContrast-SVG/scalable/categories/applications-games.svg
share/icons/HighContrast-SVG/scalable/categories/applications-graphics.svg
share/icons/HighContrast-SVG/scalable/categories/applications-internet.svg
share/icons/HighContrast-SVG/scalable/categories/applications-multimedia.svg
-share/icons/HighContrast-SVG/scalable/categories/applications-office.svg
-share/icons/HighContrast-SVG/scalable/categories/applications-other.svg
-share/icons/HighContrast-SVG/scalable/categories/applications-science.svg
share/icons/HighContrast-SVG/scalable/categories/applications-system.svg
-share/icons/HighContrast-SVG/scalable/categories/applications-utilities.svg
-share/icons/HighContrast-SVG/scalable/categories/gnome-applications.svg
share/icons/HighContrast-SVG/scalable/categories/gnome-control-center.svg
share/icons/HighContrast-SVG/scalable/categories/gnome-devel.svg
share/icons/HighContrast-SVG/scalable/categories/gnome-globe.svg
share/icons/HighContrast-SVG/scalable/categories/gnome-graphics.svg
share/icons/HighContrast-SVG/scalable/categories/gnome-joystick.svg
share/icons/HighContrast-SVG/scalable/categories/gnome-multimedia.svg
-share/icons/HighContrast-SVG/scalable/categories/gnome-other.svg
share/icons/HighContrast-SVG/scalable/categories/gnome-settings.svg
share/icons/HighContrast-SVG/scalable/categories/gnome-system.svg
share/icons/HighContrast-SVG/scalable/categories/gnome-util.svg
@@ -803,38 +749,30 @@ share/icons/HighContrast-SVG/scalable/categories/package_games.svg
share/icons/HighContrast-SVG/scalable/categories/package_graphics.svg
share/icons/HighContrast-SVG/scalable/categories/package_multimedia.svg
share/icons/HighContrast-SVG/scalable/categories/package_network.svg
-share/icons/HighContrast-SVG/scalable/categories/package_office.svg
share/icons/HighContrast-SVG/scalable/categories/package_settings.svg
share/icons/HighContrast-SVG/scalable/categories/package_system.svg
share/icons/HighContrast-SVG/scalable/categories/package_utilities.svg
share/icons/HighContrast-SVG/scalable/categories/preferences-desktop-peripherals.svg
-share/icons/HighContrast-SVG/scalable/categories/preferences-desktop-personal.svg
share/icons/HighContrast-SVG/scalable/categories/preferences-desktop.svg
-share/icons/HighContrast-SVG/scalable/categories/preferences-other.svg
-share/icons/HighContrast-SVG/scalable/categories/preferences-system-network.svg
share/icons/HighContrast-SVG/scalable/categories/preferences-system.svg
share/icons/HighContrast-SVG/scalable/categories/redhat-accessories.svg
share/icons/HighContrast-SVG/scalable/categories/redhat-games.svg
share/icons/HighContrast-SVG/scalable/categories/redhat-graphics.svg
share/icons/HighContrast-SVG/scalable/categories/redhat-internet.svg
-share/icons/HighContrast-SVG/scalable/categories/redhat-office.svg
share/icons/HighContrast-SVG/scalable/categories/redhat-preferences.svg
share/icons/HighContrast-SVG/scalable/categories/redhat-programming.svg
share/icons/HighContrast-SVG/scalable/categories/redhat-sound_video.svg
share/icons/HighContrast-SVG/scalable/categories/redhat-system_settings.svg
share/icons/HighContrast-SVG/scalable/categories/redhat-system_tools.svg
share/icons/HighContrast-SVG/scalable/categories/stock_internet.svg
-share/icons/HighContrast-SVG/scalable/categories/system-help.svg
share/icons/HighContrast-SVG/scalable/categories/xfce-games.svg
share/icons/HighContrast-SVG/scalable/categories/xfce-graphics.svg
share/icons/HighContrast-SVG/scalable/categories/xfce-internet.svg
share/icons/HighContrast-SVG/scalable/categories/xfce-multimedia.svg
-share/icons/HighContrast-SVG/scalable/categories/xfce-office.svg
share/icons/HighContrast-SVG/scalable/categories/xfce-system-settings.svg
share/icons/HighContrast-SVG/scalable/categories/xfce-utils.svg
share/icons/HighContrast-SVG/scalable/categories/xfce4-settings.svg
share/icons/HighContrast-SVG/scalable/devices/3floppy_unmount.svg
-share/icons/HighContrast-SVG/scalable/devices/audio-card.svg
share/icons/HighContrast-SVG/scalable/devices/audio-input-microphone.svg
share/icons/HighContrast-SVG/scalable/devices/battery.svg
share/icons/HighContrast-SVG/scalable/devices/camera-photo.svg
@@ -883,19 +821,16 @@ share/icons/HighContrast-SVG/scalable/devices/gnome-dev-removable-usb.svg
share/icons/HighContrast-SVG/scalable/devices/gnome-dev-removable.svg
share/icons/HighContrast-SVG/scalable/devices/gnome-dev-wavelan.svg
share/icons/HighContrast-SVG/scalable/devices/gnome-fs-client.svg
-share/icons/HighContrast-SVG/scalable/devices/gnome-modem.svg
share/icons/HighContrast-SVG/scalable/devices/gnome-stock-mic.svg
share/icons/HighContrast-SVG/scalable/devices/gtk-cdrom.svg
share/icons/HighContrast-SVG/scalable/devices/gtk-floppy.svg
share/icons/HighContrast-SVG/scalable/devices/gtk-harddisk.svg
share/icons/HighContrast-SVG/scalable/devices/harddrive.svg
share/icons/HighContrast-SVG/scalable/devices/hdd_unmount.svg
-share/icons/HighContrast-SVG/scalable/devices/input-gaming.svg
share/icons/HighContrast-SVG/scalable/devices/input-keyboard.svg
share/icons/HighContrast-SVG/scalable/devices/input-mouse.svg
share/icons/HighContrast-SVG/scalable/devices/input-tablet.svg
share/icons/HighContrast-SVG/scalable/devices/ipod_mount.svg
-share/icons/HighContrast-SVG/scalable/devices/joystick.svg
share/icons/HighContrast-SVG/scalable/devices/keyboard.svg
share/icons/HighContrast-SVG/scalable/devices/kjobviewer.svg
share/icons/HighContrast-SVG/scalable/devices/kxkb.svg
@@ -904,7 +839,6 @@ share/icons/HighContrast-SVG/scalable/devices/media-flash.svg
share/icons/HighContrast-SVG/scalable/devices/media-floppy.svg
share/icons/HighContrast-SVG/scalable/devices/media-optical.svg
share/icons/HighContrast-SVG/scalable/devices/media-tape.svg
-share/icons/HighContrast-SVG/scalable/devices/modem.svg
share/icons/HighContrast-SVG/scalable/devices/mouse.svg
share/icons/HighContrast-SVG/scalable/devices/multimedia-player.svg
share/icons/HighContrast-SVG/scalable/devices/network-wired.svg
@@ -929,23 +863,23 @@ share/icons/HighContrast-SVG/scalable/devices/xfce4-keyboard.svg
share/icons/HighContrast-SVG/scalable/devices/xfce4-mouse.svg
share/icons/HighContrast-SVG/scalable/devices/yast_HD.svg
share/icons/HighContrast-SVG/scalable/devices/yast_idetude.svg
-share/icons/HighContrast-SVG/scalable/devices/yast_joystick.svg
share/icons/HighContrast-SVG/scalable/devices/yast_mouse.svg
share/icons/HighContrast-SVG/scalable/devices/yast_printer.svg
-share/icons/HighContrast-SVG/scalable/devices/yast_soundcard.svg
share/icons/HighContrast-SVG/scalable/emblems/emblem-default.svg
share/icons/HighContrast-SVG/scalable/emblems/emblem-documents.svg
share/icons/HighContrast-SVG/scalable/emblems/emblem-downloads.svg
share/icons/HighContrast-SVG/scalable/emblems/emblem-favorite.svg
share/icons/HighContrast-SVG/scalable/emblems/emblem-important.svg
share/icons/HighContrast-SVG/scalable/emblems/emblem-mail.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-noread.svg
share/icons/HighContrast-SVG/scalable/emblems/emblem-nowrite.svg
share/icons/HighContrast-SVG/scalable/emblems/emblem-photos.svg
share/icons/HighContrast-SVG/scalable/emblems/emblem-readonly.svg
share/icons/HighContrast-SVG/scalable/emblems/emblem-symbolic-link.svg
share/icons/HighContrast-SVG/scalable/emblems/emblem-system.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-unreadable.svg
share/icons/HighContrast-SVG/scalable/emblems/stock_mail-priority-high.svg
-share/icons/HighContrast-SVG/scalable/emotes/face-glasses.svg
+share/icons/HighContrast-SVG/scalable/emotes/face-cool.svg
share/icons/HighContrast-SVG/scalable/emotes/face-plain.svg
share/icons/HighContrast-SVG/scalable/emotes/face-sad.svg
share/icons/HighContrast-SVG/scalable/emotes/face-smile-big.svg
@@ -953,6 +887,7 @@ share/icons/HighContrast-SVG/scalable/emotes/face-smile.svg
share/icons/HighContrast-SVG/scalable/emotes/face-surprise.svg
share/icons/HighContrast-SVG/scalable/emotes/face-wink.svg
share/icons/HighContrast-SVG/scalable/emotes/stock_smiley-1.svg
+share/icons/HighContrast-SVG/scalable/emotes/stock_smiley-15.svg
share/icons/HighContrast-SVG/scalable/emotes/stock_smiley-2.svg
share/icons/HighContrast-SVG/scalable/emotes/stock_smiley-3.svg
share/icons/HighContrast-SVG/scalable/emotes/stock_smiley-4.svg
@@ -964,6 +899,8 @@ share/icons/HighContrast-SVG/scalable/mimetypes/application-x-executable.svg
share/icons/HighContrast-SVG/scalable/mimetypes/ascii.svg
share/icons/HighContrast-SVG/scalable/mimetypes/audio-x-generic.svg
share/icons/HighContrast-SVG/scalable/mimetypes/binary.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/contents2.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/document.svg
share/icons/HighContrast-SVG/scalable/mimetypes/empty.svg
share/icons/HighContrast-SVG/scalable/mimetypes/exec.svg
share/icons/HighContrast-SVG/scalable/mimetypes/font-x-generic.svg
@@ -973,17 +910,33 @@ share/icons/HighContrast-SVG/scalable/mimetypes/font_truetype.svg
share/icons/HighContrast-SVG/scalable/mimetypes/font_type1.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-fs-executable.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-fs-regular.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-magicpoint.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-msword.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-ogg.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-pdf.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-postscript.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-rtf.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.ms-excel.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.ms-powerpoint.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.stardivision.calc.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.stardivision.impress.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.stardivision.writer.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.calc.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.impress.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.writer.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-wordperfect.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-abiword.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-applix-spreadsheet.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-applix-word.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-dvi.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-executable.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-font-afm.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-font-bdf.svg
@@ -992,14 +945,19 @@ share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-font-pc
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-font-sunos-news.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-font-ttf.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-gnumeric.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-gzpostscript.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-killustrator.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-kpresenter.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-kspread.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-kword.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-ms-dos-executable.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-perl.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-php.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-python-bytecode.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-scribus.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-shellscript.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-shockwave-flash.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-tex.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-xhtml+xml.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-audio.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-image.svg
@@ -1008,6 +966,8 @@ share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-text-vnd.wap.wml.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-text-x-csh.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-text-x-python.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-text-x-sh.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-text-x-vcalendar.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-text-x-vcard.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-text-x-zsh.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-text.svg
share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-video.svg
@@ -1016,23 +976,37 @@ share/icons/HighContrast-SVG/scalable/mimetypes/gtk-file.svg
share/icons/HighContrast-SVG/scalable/mimetypes/html.svg
share/icons/HighContrast-SVG/scalable/mimetypes/image-x-generic.svg
share/icons/HighContrast-SVG/scalable/mimetypes/image.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/kpresenter_kpr.svg
share/icons/HighContrast-SVG/scalable/mimetypes/mime_ascii.svg
share/icons/HighContrast-SVG/scalable/mimetypes/misc.svg
share/icons/HighContrast-SVG/scalable/mimetypes/package_editors.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/package_wordprocessing.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/plan.svg
share/icons/HighContrast-SVG/scalable/mimetypes/shellscript.svg
share/icons/HighContrast-SVG/scalable/mimetypes/sound.svg
share/icons/HighContrast-SVG/scalable/mimetypes/spreadsheet.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/stock_addressbook.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/stock_calendar.svg
share/icons/HighContrast-SVG/scalable/mimetypes/stock_script.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/template_source.svg
share/icons/HighContrast-SVG/scalable/mimetypes/text-html.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/text-x-generic-template.svg
share/icons/HighContrast-SVG/scalable/mimetypes/text-x-generic.svg
share/icons/HighContrast-SVG/scalable/mimetypes/text-x-preview.svg
share/icons/HighContrast-SVG/scalable/mimetypes/text-x-script.svg
share/icons/HighContrast-SVG/scalable/mimetypes/txt.svg
share/icons/HighContrast-SVG/scalable/mimetypes/txt2.svg
share/icons/HighContrast-SVG/scalable/mimetypes/unknown.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/vcalendar.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/vcard.svg
share/icons/HighContrast-SVG/scalable/mimetypes/video-x-generic.svg
share/icons/HighContrast-SVG/scalable/mimetypes/video.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/wordprocessing.svg
share/icons/HighContrast-SVG/scalable/mimetypes/www.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/x-office-address-book.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/x-office-calendar.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/x-office-document.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/x-office-presentation.svg
share/icons/HighContrast-SVG/scalable/mimetypes/x-office-spreadsheet.svg
share/icons/HighContrast-SVG/scalable/places/desktop.svg
share/icons/HighContrast-SVG/scalable/places/distributor-logo.svg
@@ -1074,6 +1048,7 @@ share/icons/HighContrast-SVG/scalable/places/server.svg
share/icons/HighContrast-SVG/scalable/places/start-here.svg
share/icons/HighContrast-SVG/scalable/places/stock_folder.svg
share/icons/HighContrast-SVG/scalable/places/trashcan_empty.svg
+share/icons/HighContrast-SVG/scalable/places/user-bookmarks.svg
share/icons/HighContrast-SVG/scalable/places/user-desktop.svg
share/icons/HighContrast-SVG/scalable/places/user-home.svg
share/icons/HighContrast-SVG/scalable/places/user-trash.svg
@@ -1082,6 +1057,8 @@ share/icons/HighContrast-SVG/scalable/status/audio-volume-high.svg
share/icons/HighContrast-SVG/scalable/status/audio-volume-low.svg
share/icons/HighContrast-SVG/scalable/status/audio-volume-medium.svg
share/icons/HighContrast-SVG/scalable/status/audio-volume-muted.svg
+share/icons/HighContrast-SVG/scalable/status/battery-caution.svg
+share/icons/HighContrast-SVG/scalable/status/battery-low.svg
share/icons/HighContrast-SVG/scalable/status/connect_no.svg
share/icons/HighContrast-SVG/scalable/status/dialog-error.svg
share/icons/HighContrast-SVG/scalable/status/dialog-information.svg
@@ -1109,15 +1086,15 @@ share/icons/HighContrast-SVG/scalable/status/image-missing.svg
share/icons/HighContrast-SVG/scalable/status/important.svg
share/icons/HighContrast-SVG/scalable/status/info.svg
share/icons/HighContrast-SVG/scalable/status/mail-attachment.svg
+share/icons/HighContrast-SVG/scalable/status/media-playlist-repeat.svg
+share/icons/HighContrast-SVG/scalable/status/media-playlist-shuffle.svg
share/icons/HighContrast-SVG/scalable/status/messagebox_critical.svg
share/icons/HighContrast-SVG/scalable/status/messagebox_info.svg
share/icons/HighContrast-SVG/scalable/status/messagebox_warning.svg
share/icons/HighContrast-SVG/scalable/status/network-offline.svg
share/icons/HighContrast-SVG/scalable/status/network-online.svg
share/icons/HighContrast-SVG/scalable/status/nm-no-connection.svg
-share/icons/HighContrast-SVG/scalable/status/security-high.svg
-share/icons/HighContrast-SVG/scalable/status/security-low.svg
-share/icons/HighContrast-SVG/scalable/status/security-medium.svg
+share/icons/HighContrast-SVG/scalable/status/printer-printing.svg
share/icons/HighContrast-SVG/scalable/status/software-update-available.svg
share/icons/HighContrast-SVG/scalable/status/software-update-urgent.svg
share/icons/HighContrast-SVG/scalable/status/stock_attach.svg
@@ -1125,11 +1102,9 @@ share/icons/HighContrast-SVG/scalable/status/stock_dialog-error.svg
share/icons/HighContrast-SVG/scalable/status/stock_dialog-info.svg
share/icons/HighContrast-SVG/scalable/status/stock_dialog-question.svg
share/icons/HighContrast-SVG/scalable/status/stock_dialog-warning.svg
-share/icons/HighContrast-SVG/scalable/status/stock_lock-broken.svg
-share/icons/HighContrast-SVG/scalable/status/stock_lock-ok.svg
-share/icons/HighContrast-SVG/scalable/status/stock_lock-open.svg
-share/icons/HighContrast-SVG/scalable/status/stock_lock.svg
share/icons/HighContrast-SVG/scalable/status/stock_open.svg
+share/icons/HighContrast-SVG/scalable/status/stock_repeat.svg
+share/icons/HighContrast-SVG/scalable/status/stock_shuffle.svg
share/icons/HighContrast-SVG/scalable/status/stock_trash_full.svg
share/icons/HighContrast-SVG/scalable/status/stock_volume-0.svg
share/icons/HighContrast-SVG/scalable/status/stock_volume-max.svg
@@ -1137,8 +1112,28 @@ share/icons/HighContrast-SVG/scalable/status/stock_volume-med.svg
share/icons/HighContrast-SVG/scalable/status/stock_volume-min.svg
share/icons/HighContrast-SVG/scalable/status/stock_volume-mute.svg
share/icons/HighContrast-SVG/scalable/status/stock_volume.svg
+share/icons/HighContrast-SVG/scalable/status/stock_weather-cloudy.svg
+share/icons/HighContrast-SVG/scalable/status/stock_weather-few-clouds.svg
+share/icons/HighContrast-SVG/scalable/status/stock_weather-fog.svg
+share/icons/HighContrast-SVG/scalable/status/stock_weather-night-clear.svg
+share/icons/HighContrast-SVG/scalable/status/stock_weather-night-few-clouds.svg
+share/icons/HighContrast-SVG/scalable/status/stock_weather-showers.svg
+share/icons/HighContrast-SVG/scalable/status/stock_weather-snow.svg
+share/icons/HighContrast-SVG/scalable/status/stock_weather-storm.svg
+share/icons/HighContrast-SVG/scalable/status/stock_weather-sunny.svg
+share/icons/HighContrast-SVG/scalable/status/sunny.svg
share/icons/HighContrast-SVG/scalable/status/trashcan_full.svg
share/icons/HighContrast-SVG/scalable/status/user-trash-full.svg
+share/icons/HighContrast-SVG/scalable/status/weather-clear-night.svg
+share/icons/HighContrast-SVG/scalable/status/weather-clear.svg
+share/icons/HighContrast-SVG/scalable/status/weather-few-clouds-night.svg
+share/icons/HighContrast-SVG/scalable/status/weather-few-clouds.svg
+share/icons/HighContrast-SVG/scalable/status/weather-fog.svg
+share/icons/HighContrast-SVG/scalable/status/weather-overcast.svg
+share/icons/HighContrast-SVG/scalable/status/weather-showers-scattered.svg
+share/icons/HighContrast-SVG/scalable/status/weather-showers.svg
+share/icons/HighContrast-SVG/scalable/status/weather-snow.svg
+share/icons/HighContrast-SVG/scalable/status/weather-storm.svg
share/icons/HighContrast-SVG/scalable/status/xfce-trash_full.svg
share/icons/HighContrast/index.theme
share/icons/HighContrastInverse/index.theme
@@ -1469,9 +1464,9 @@ share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-gzip
share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-jar.png
share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-killustrator.png
share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-lha.png
+share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-lhz.png
share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-lzma-compressed-tar.png
share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-lzma.png
-share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-lhz.png
share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-ms-dos-executable.png
share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-rar.png
share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-rpm.png
@@ -1592,8 +1587,11 @@ share/icons/HighContrastLargePrintInverse/48x48/actions/gtk-execute.png
share/icons/HighContrastLargePrintInverse/48x48/actions/gtk-home.png
share/icons/HighContrastLargePrintInverse/48x48/actions/gtk-media-pause.png
share/icons/HighContrastLargePrintInverse/48x48/actions/gtk-refresh.png
+share/icons/HighContrastLargePrintInverse/48x48/actions/insert-image.png
+share/icons/HighContrastLargePrintInverse/48x48/actions/insert-text.png
share/icons/HighContrastLargePrintInverse/48x48/actions/kfind.png
share/icons/HighContrastLargePrintInverse/48x48/actions/kfm_home.png
+share/icons/HighContrastLargePrintInverse/48x48/actions/mail-send-receive.png
share/icons/HighContrastLargePrintInverse/48x48/actions/media-playback-pause.png
share/icons/HighContrastLargePrintInverse/48x48/actions/player_pause.png
share/icons/HighContrastLargePrintInverse/48x48/actions/redhat-home.png
@@ -1603,6 +1601,7 @@ share/icons/HighContrastLargePrintInverse/48x48/actions/reload_all_tabs.png
share/icons/HighContrastLargePrintInverse/48x48/actions/reload_page.png
share/icons/HighContrastLargePrintInverse/48x48/actions/search.png
share/icons/HighContrastLargePrintInverse/48x48/actions/stock_home.png
+share/icons/HighContrastLargePrintInverse/48x48/actions/stock_mail-send-receive.png
share/icons/HighContrastLargePrintInverse/48x48/actions/stock_media-pause.png
share/icons/HighContrastLargePrintInverse/48x48/actions/stock_new-tab.png
share/icons/HighContrastLargePrintInverse/48x48/actions/stock_refresh.png
@@ -1701,8 +1700,8 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/panel-force-quit.png
share/icons/HighContrastLargePrintInverse/48x48/apps/perfmeter.png
share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-accessibility.png
share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-font.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-keyboard.png
share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-keyboard-shortcuts.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-keyboard.png
share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-locale.png
share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-sound.png
share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-theme.png
@@ -1824,6 +1823,7 @@ share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-printer.png
share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-removable-1394.png
share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-removable-usb.png
share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-removable.png
+share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-wavelan.png
share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-fs-client.png
share/icons/HighContrastLargePrintInverse/48x48/devices/gtk-cdrom.png
share/icons/HighContrastLargePrintInverse/48x48/devices/gtk-floppy.png
@@ -1839,6 +1839,7 @@ share/icons/HighContrastLargePrintInverse/48x48/devices/media-cdrom.png
share/icons/HighContrastLargePrintInverse/48x48/devices/media-floppy.png
share/icons/HighContrastLargePrintInverse/48x48/devices/media-optical.png
share/icons/HighContrastLargePrintInverse/48x48/devices/mouse.png
+share/icons/HighContrastLargePrintInverse/48x48/devices/network-wireless.png
share/icons/HighContrastLargePrintInverse/48x48/devices/printer-remote.png
share/icons/HighContrastLargePrintInverse/48x48/devices/printer.png
share/icons/HighContrastLargePrintInverse/48x48/devices/printer1.png
@@ -1868,6 +1869,7 @@ share/icons/HighContrastLargePrintInverse/48x48/mimetypes/audio-x-generic.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/binary.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/contents2.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/deb.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/document.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/empty.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/exec.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/folder_tar.png
@@ -1878,11 +1880,26 @@ share/icons/HighContrastLargePrintInverse/48x48/mimetypes/font_truetype.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/font_type1.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-fs-executable.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-fs-regular.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-magicpoint.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-msword.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-ogg.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-pdf.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-postscript.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-rtf.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.stardivision.impress.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-wordperfect.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-7z-compressed.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-abiword.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-applix-word.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-archive.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-arj.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png
@@ -1893,6 +1910,7 @@ share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-cpio-compressed.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-cpio.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-deb.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-dvi.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-executable.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-font-afm.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-font-bdf.png
@@ -1901,22 +1919,28 @@ share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-font-sunos-news.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-font-ttf.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-gzip.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-gzpostscript.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-jar.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-killustrator.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-kpresenter.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-kword.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-lha.png
-share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-lzma.png
-share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-lzma-compressed-tar.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-lhz.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-lzma-compressed-tar.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-lzma.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-ms-dos-executable.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-rar.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-rpm.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-scribus.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-shockwave-flash.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-stuffit.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-tar.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-tarz.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-tex.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-zip.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-vcalendar.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-vcard.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-video.png
@@ -1925,25 +1949,36 @@ share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-package.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gtk-file.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/image-x-generic.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/image.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/kpresenter_kpr.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/mime_ascii.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/misc.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/package-x-generic.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/package.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/package_editors.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/package_wordprocessing.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/plan.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/rpm.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/sound.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/stock_addressbook.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/stock_calendar.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/tar.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/template_source.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/text-x-generic-template.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/text-x-generic.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/text-x-preview.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/tgz.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/txt.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/txt2.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/unknown.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/vcalendar.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/vcard.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/video-x-generic.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/video.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/wordprocessing.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/x-office-address-book.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/x-office-calendar.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/x-office-document.png
+share/icons/HighContrastLargePrintInverse/48x48/mimetypes/x-office-presentation.png
share/icons/HighContrastLargePrintInverse/48x48/mimetypes/zip.png
share/icons/HighContrastLargePrintInverse/48x48/places/desktop.png
share/icons/HighContrastLargePrintInverse/48x48/places/distributor-logo.png
@@ -1994,6 +2029,8 @@ share/icons/HighContrastLargePrintInverse/48x48/status/audio-volume-high.png
share/icons/HighContrastLargePrintInverse/48x48/status/audio-volume-low.png
share/icons/HighContrastLargePrintInverse/48x48/status/audio-volume-medium.png
share/icons/HighContrastLargePrintInverse/48x48/status/audio-volume-muted.png
+share/icons/HighContrastLargePrintInverse/48x48/status/battery-caution.png
+share/icons/HighContrastLargePrintInverse/48x48/status/battery-low.png
share/icons/HighContrastLargePrintInverse/48x48/status/edittrash.png
share/icons/HighContrastLargePrintInverse/48x48/status/folder-drag-accept.icon
share/icons/HighContrastLargePrintInverse/48x48/status/folder-drag-accept.png
@@ -2001,6 +2038,12 @@ share/icons/HighContrastLargePrintInverse/48x48/status/gnome-fs-directory-accept
share/icons/HighContrastLargePrintInverse/48x48/status/gnome-fs-directory-accept.png
share/icons/HighContrastLargePrintInverse/48x48/status/gnome-fs-trash-full.png
share/icons/HighContrastLargePrintInverse/48x48/status/gnome-stock-trash-full.png
+share/icons/HighContrastLargePrintInverse/48x48/status/media-playlist-repeat.png
+share/icons/HighContrastLargePrintInverse/48x48/status/media-playlist-shuffle.png
+share/icons/HighContrastLargePrintInverse/48x48/status/printer-error.png
+share/icons/HighContrastLargePrintInverse/48x48/status/printer-printing.png
+share/icons/HighContrastLargePrintInverse/48x48/status/stock_repeat.png
+share/icons/HighContrastLargePrintInverse/48x48/status/stock_shuffle.png
share/icons/HighContrastLargePrintInverse/48x48/status/stock_trash_full.png
share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume-0.png
share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume-max.png
@@ -2008,8 +2051,28 @@ share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume-med.png
share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume-min.png
share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume-mute.png
share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume.png
+share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-cloudy.png
+share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-few-clouds.png
+share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-fog.png
+share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-night-clear.png
+share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-night-few-clouds.png
+share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-showers.png
+share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-snow.png
+share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-storm.png
+share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-sunny.png
+share/icons/HighContrastLargePrintInverse/48x48/status/sunny.png
share/icons/HighContrastLargePrintInverse/48x48/status/trashcan_full.png
share/icons/HighContrastLargePrintInverse/48x48/status/user-trash-full.png
+share/icons/HighContrastLargePrintInverse/48x48/status/weather-clear-night.png
+share/icons/HighContrastLargePrintInverse/48x48/status/weather-clear.png
+share/icons/HighContrastLargePrintInverse/48x48/status/weather-few-clouds-night.png
+share/icons/HighContrastLargePrintInverse/48x48/status/weather-few-clouds.png
+share/icons/HighContrastLargePrintInverse/48x48/status/weather-fog.png
+share/icons/HighContrastLargePrintInverse/48x48/status/weather-overcast.png
+share/icons/HighContrastLargePrintInverse/48x48/status/weather-showers-scattered.png
+share/icons/HighContrastLargePrintInverse/48x48/status/weather-showers.png
+share/icons/HighContrastLargePrintInverse/48x48/status/weather-snow.png
+share/icons/HighContrastLargePrintInverse/48x48/status/weather-storm.png
share/icons/HighContrastLargePrintInverse/48x48/status/xfce-trash_full.png
share/icons/HighContrastLargePrintInverse/index.theme
share/icons/LargePrint/index.theme
@@ -2161,6 +2224,8 @@ share/icons/Mist/scalable/status/gnome-fs-directory-visiting.svg
share/icons/Mist/scalable/status/stock_open.svg
share/locale/am/LC_MESSAGES/gnome-themes.mo
share/locale/ar/LC_MESSAGES/gnome-themes.mo
+share/locale/as/LC_MESSAGES/gnome-themes.mo
+share/locale/ast/LC_MESSAGES/gnome-themes.mo
share/locale/az/LC_MESSAGES/gnome-themes.mo
share/locale/be/LC_MESSAGES/gnome-themes.mo
share/locale/be@latin/LC_MESSAGES/gnome-themes.mo
@@ -2169,6 +2234,7 @@ share/locale/bn/LC_MESSAGES/gnome-themes.mo
share/locale/bn_IN/LC_MESSAGES/gnome-themes.mo
share/locale/bs/LC_MESSAGES/gnome-themes.mo
share/locale/ca/LC_MESSAGES/gnome-themes.mo
+share/locale/crh/LC_MESSAGES/gnome-themes.mo
share/locale/cs/LC_MESSAGES/gnome-themes.mo
share/locale/cy/LC_MESSAGES/gnome-themes.mo
share/locale/da/LC_MESSAGES/gnome-themes.mo
@@ -2229,6 +2295,7 @@ share/locale/sr/LC_MESSAGES/gnome-themes.mo
share/locale/sr@latin/LC_MESSAGES/gnome-themes.mo
share/locale/sv/LC_MESSAGES/gnome-themes.mo
share/locale/ta/LC_MESSAGES/gnome-themes.mo
+share/locale/te/LC_MESSAGES/gnome-themes.mo
share/locale/th/LC_MESSAGES/gnome-themes.mo
share/locale/tr/LC_MESSAGES/gnome-themes.mo
share/locale/ug/LC_MESSAGES/gnome-themes.mo
@@ -2519,7 +2586,7 @@ share/themes/Inverted/metacity-1/metacity-theme-1.xml
share/themes/LargePrint/gtk-2.0/gtkrc
share/themes/LargePrint/index.theme.disabled
share/themes/LowContrast/gtk-2.0/gtkrc
-share/themes/LowContrast/index.theme
+share/themes/LowContrast/index.theme.disabled
share/themes/LowContrastLargePrint/gtk-2.0/gtkrc
share/themes/LowContrastLargePrint/index.theme.disabled
share/themes/LowContrastLargePrint/pixmaps/double-click-maybe.png
@@ -2779,6 +2846,8 @@ share/themes/Simple/gtk-2.0/gtkrc
@dirrmtry share/locale/xh
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@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
@@ -2799,7 +2868,13 @@ share/themes/Simple/gtk-2.0/gtkrc
@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
@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/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 8dc7e4f64b5b..f63c2892915a 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.69 2009/01/10 01:59:22 mezz Exp $
+# $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.74 2009/04/09 03:24:10 mezz Exp $
#
PORTNAME= gtk-engines2
-PORTVERSION= 2.16.1
+PORTVERSION= 2.18.0
CATEGORIES= x11-themes
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo
index a4ebdd5b8ad0..e0683a261980 100644
--- a/x11-themes/gtk-engines2/distinfo
+++ b/x11-themes/gtk-engines2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk-engines-2.16.1.tar.bz2) = acf5a9792507d0cb3b29a3ce6333d003
-SHA256 (gnome2/gtk-engines-2.16.1.tar.bz2) = 5ce5bd23df9c26444c92d415935622d5f1f7c1c9669ec5165607de05125dc2c1
-SIZE (gnome2/gtk-engines-2.16.1.tar.bz2) = 588253
+MD5 (gnome2/gtk-engines-2.18.0.tar.bz2) = 6a7ac01fc9f9429bfb126e068e74eb4f
+SHA256 (gnome2/gtk-engines-2.18.0.tar.bz2) = a969c132c69c0d807316561cf08c8a5267fa18993d6f3617fe626586338c077f
+SIZE (gnome2/gtk-engines-2.18.0.tar.bz2) = 604860
diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist
index 963a26e62de9..3b10b4365a87 100644
--- a/x11-themes/gtk-engines2/pkg-plist
+++ b/x11-themes/gtk-engines2/pkg-plist
@@ -32,6 +32,7 @@ share/gtk-engines/mist.xml
share/gtk-engines/redmond95.xml
share/gtk-engines/thinice.xml
share/locale/ar/LC_MESSAGES/gtk-engines.mo
+share/locale/as/LC_MESSAGES/gtk-engines.mo
share/locale/be@latin/LC_MESSAGES/gtk-engines.mo
share/locale/bg/LC_MESSAGES/gtk-engines.mo
share/locale/bn_IN/LC_MESSAGES/gtk-engines.mo
@@ -69,6 +70,7 @@ share/locale/pa/LC_MESSAGES/gtk-engines.mo
share/locale/pl/LC_MESSAGES/gtk-engines.mo
share/locale/pt/LC_MESSAGES/gtk-engines.mo
share/locale/pt_BR/LC_MESSAGES/gtk-engines.mo
+share/locale/ro/LC_MESSAGES/gtk-engines.mo
share/locale/ru/LC_MESSAGES/gtk-engines.mo
share/locale/si/LC_MESSAGES/gtk-engines.mo
share/locale/sl/LC_MESSAGES/gtk-engines.mo
@@ -125,3 +127,5 @@ share/themes/ThinIce/gtk-2.0/gtkrc
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index fb6e22c418a5..7a1169fab370 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/eel/Makefile,v 1.80 2008/10/20 21:37:09 mezz Exp $
+# $MCom: ports/x11-toolkits/eel/Makefile,v 1.84 2009/03/17 13:40:09 kwm Exp $
#
PORTNAME= eel
-PORTVERSION= 2.24.1
+PORTVERSION= 2.26.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo
index aa469fcbd173..524cb219e365 100644
--- a/x11-toolkits/eel/distinfo
+++ b/x11-toolkits/eel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eel-2.24.1.tar.bz2) = b591df36af8f1b23dd175be33b5de073
-SHA256 (gnome2/eel-2.24.1.tar.bz2) = 32cde7b589b49f439d82f76b6456983d36de7d20688f7c6ac2fdae4ce354e629
-SIZE (gnome2/eel-2.24.1.tar.bz2) = 596529
+MD5 (gnome2/eel-2.26.0.tar.bz2) = dfa105ccabd53efe4166dcfac75e2393
+SHA256 (gnome2/eel-2.26.0.tar.bz2) = 11ad07d8d371f9165fab6cc5462f59cd253f9cc835d77a54330fecafe9c0a555
+SIZE (gnome2/eel-2.26.0.tar.bz2) = 596217
diff --git a/x11-toolkits/eel/files/patch-eel_eel-gnome-extensions.c b/x11-toolkits/eel/files/patch-eel_eel-gnome-extensions.c
deleted file mode 100644
index 3d6922deda5e..000000000000
--- a/x11-toolkits/eel/files/patch-eel_eel-gnome-extensions.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- eel/eel-gnome-extensions.c.orig Mon Mar 21 06:20:58 2005
-+++ eel/eel-gnome-extensions.c Mon Mar 21 06:21:00 2005
-@@ -246,7 +246,9 @@
- IconSelectionData *selection_data;
-
- selection_data = (IconSelectionData *) callback_data;
-+ GDK_THREADS_ENTER ();
- gtk_widget_destroy (selection_data->dialog);
-+ GDK_THREADS_LEAVE ();
- g_free (selection_data);
- return FALSE;
- }
diff --git a/x11-toolkits/eel/files/patch-eel_eel-stock-dialogs.c b/x11-toolkits/eel/files/patch-eel_eel-stock-dialogs.c
index f1389b939964..4a0ce9c74ecc 100644
--- a/x11-toolkits/eel/files/patch-eel_eel-stock-dialogs.c
+++ b/x11-toolkits/eel/files/patch-eel_eel-stock-dialogs.c
@@ -1,6 +1,6 @@
---- eel/eel-stock-dialogs.c.orig Mon Mar 21 06:35:10 2005
-+++ eel/eel-stock-dialogs.c Mon Mar 21 06:36:23 2005
-@@ -104,6 +104,8 @@
+--- eel/eel-stock-dialogs.c.orig 2008-10-07 11:34:27.000000000 +0200
++++ eel/eel-stock-dialogs.c 2009-02-22 16:33:40.000000000 +0100
+@@ -96,6 +96,8 @@ timed_wait_delayed_close_timeout_callbac
{
guint handler_id;
@@ -9,7 +9,7 @@
handler_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (callback_data),
"eel-stock-dialogs/delayed_close_handler_timeout_id"));
-@@ -113,6 +115,8 @@
+@@ -105,6 +107,8 @@ timed_wait_delayed_close_timeout_callbac
gtk_object_destroy (GTK_OBJECT (callback_data));
@@ -18,23 +18,3 @@
return FALSE;
}
-@@ -202,7 +206,10 @@
-
- wait = callback_data;
-
-+ GDK_THREADS_ENTER ();
-+
- if (gnome_authentication_manager_dialog_is_visible ()) {
-+ GDK_THREADS_LEAVE ();
- return TRUE;
- }
-
-@@ -249,6 +256,8 @@
-
- wait->timeout_handler_id = 0;
- wait->dialog = dialog;
-+
-+ GDK_THREADS_LEAVE ();
-
- return FALSE;
- }
diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist
index 628987f36aab..0f0359203909 100644
--- a/x11-toolkits/eel/pkg-plist
+++ b/x11-toolkits/eel/pkg-plist
@@ -25,9 +25,7 @@ include/eel-2/eel/eel-i18n.h
include/eel-2/eel/eel-image-table.h
include/eel-2/eel/eel-labeled-image.h
include/eel-2/eel/eel-marshal.h
-include/eel-2/eel/eel-mount-operation.h
include/eel-2/eel/eel-pango-extensions.h
-include/eel-2/eel/eel-preferences-glade.h
include/eel-2/eel/eel-preferences.h
include/eel-2/eel/eel-self-checks.h
include/eel-2/eel/eel-stock-dialogs.h
diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile
index 9f1a26991742..06c4e6f38667 100644
--- a/x11-toolkits/gai/Makefile
+++ b/x11-toolkits/gai/Makefile
@@ -22,7 +22,8 @@ USE_GL= gl
USE_SDL= sdl
USE_GNOME= gnomepanel
GNU_CONFIGURE= yes
-CONFIGURE_ENV= SDLCONF=${SDL_CONFIG}
+CONFIGURE_ENV= SDLCONF=${SDL_CONFIG} \
+ CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`"
PLIST_FILES= include/gai/gai.h lib/libgai.so.${PORTVERSION} \
lib/libgai.so.0 lib/libgai.so libdata/pkgconfig/gai.pc \
diff --git a/x11-toolkits/gai/files/patch-gai_Makefile.in b/x11-toolkits/gai/files/patch-gai_Makefile.in
index 11088b83c594..047c61c98d80 100644
--- a/x11-toolkits/gai/files/patch-gai_Makefile.in
+++ b/x11-toolkits/gai/files/patch-gai_Makefile.in
@@ -5,7 +5,7 @@
# Makefile for the General Applet Interface Library
-CFLAGS += -Wall -O2 -I.. @GTK_CFLAGS@ @SDL_CFLAGS@ @GNOME_CFLAGS@ @GL_CFLAGS@
-+CFLAGS += -Wall -fPIC -I.. @GTK_CFLAGS@ @SDL_CFLAGS@ @GNOME_CFLAGS@ @GL_CFLAGS@
++CFLAGS += -Wall -fPIC -I.. @GTK_CFLAGS@ @SDL_CFLAGS@ @GNOME_CFLAGS@ @GL_CFLAGS@ @CPPFLAGS@
-LDFLAGS += -g -fPIC -L/usr/X11R6/lib -lX11 @SYSTEM_SPECIFIC_LIBS@ @GTK_LIBS@ @GTHREAD_CFLAGS@ @PANGO_CFLAGS@
+LDFLAGS += -fPIC -L$(LOCALBASE)/lib -lX11 @SYSTEM_SPECIFIC_LIBS@ @GTK_LIBS@ @GTHREAD_CFLAGS@ @PANGO_CFLAGS@
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 70aed9a09a6d..d4f7b154dbd3 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.18 2008/09/22 18:02:25 marcus Exp $
+# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.22 2009/03/17 18:08:56 kwm Exp $
#
PORTNAME= gdl
-PORTVERSION= 2.24.0
+PORTVERSION= 2.26.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo
index 482befef9a78..3a73d7506861 100644
--- a/x11-toolkits/gdl/distinfo
+++ b/x11-toolkits/gdl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gdl-2.24.0.tar.bz2) = 1d5cd4af1f4041394169d643316646bf
-SHA256 (gdl-2.24.0.tar.bz2) = c175ac5faa1c3e27464f71f80c632bb3a960aa03ccd748736aead20adc31a112
-SIZE (gdl-2.24.0.tar.bz2) = 551420
+MD5 (gdl-2.26.0.tar.bz2) = 8915b8808d88e12c1bb53e84f50e6707
+SHA256 (gdl-2.26.0.tar.bz2) = ed69d46a1eb490b28812c2cc28769d74e8664ed7617c579806c6146ff9addb54
+SIZE (gdl-2.26.0.tar.bz2) = 541006
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index 4411d89a5de2..62b61374997e 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -31,7 +31,6 @@ libdata/pkgconfig/gdl-1.0.pc
%%DOCSDIR%%/GdlDockPlaceholder.html
%%DOCSDIR%%/GdlDockTablabel.html
%%DOCSDIR%%/GdlSwitcher.html
-%%DOCSDIR%%/gdl-gdl-stock.html
%%DOCSDIR%%/gdl-gdl-tools.html
%%DOCSDIR%%/gdl-main.html
%%DOCSDIR%%/gdl.devhelp
@@ -46,6 +45,7 @@ libdata/pkgconfig/gdl-1.0.pc
share/gdl/glade/layout.glade
share/locale/am/LC_MESSAGES/gdl-1.mo
share/locale/ar/LC_MESSAGES/gdl-1.mo
+share/locale/ast/LC_MESSAGES/gdl-1.mo
share/locale/az/LC_MESSAGES/gdl-1.mo
share/locale/bg/LC_MESSAGES/gdl-1.mo
share/locale/ca/LC_MESSAGES/gdl-1.mo
@@ -63,6 +63,7 @@ share/locale/fi/LC_MESSAGES/gdl-1.mo
share/locale/fr/LC_MESSAGES/gdl-1.mo
share/locale/ga/LC_MESSAGES/gdl-1.mo
share/locale/gl/LC_MESSAGES/gdl-1.mo
+share/locale/gu/LC_MESSAGES/gdl-1.mo
share/locale/he/LC_MESSAGES/gdl-1.mo
share/locale/hi/LC_MESSAGES/gdl-1.mo
share/locale/hr/LC_MESSAGES/gdl-1.mo
@@ -79,11 +80,13 @@ share/locale/nb/LC_MESSAGES/gdl-1.mo
share/locale/ne/LC_MESSAGES/gdl-1.mo
share/locale/nl/LC_MESSAGES/gdl-1.mo
share/locale/oc/LC_MESSAGES/gdl-1.mo
+share/locale/or/LC_MESSAGES/gdl-1.mo
share/locale/pa/LC_MESSAGES/gdl-1.mo
share/locale/pl/LC_MESSAGES/gdl-1.mo
share/locale/ps/LC_MESSAGES/gdl-1.mo
share/locale/pt/LC_MESSAGES/gdl-1.mo
share/locale/pt_BR/LC_MESSAGES/gdl-1.mo
+share/locale/ro/LC_MESSAGES/gdl-1.mo
share/locale/ru/LC_MESSAGES/gdl-1.mo
share/locale/rw/LC_MESSAGES/gdl-1.mo
share/locale/si/LC_MESSAGES/gdl-1.mo
@@ -93,6 +96,7 @@ share/locale/sq/LC_MESSAGES/gdl-1.mo
share/locale/sr/LC_MESSAGES/gdl-1.mo
share/locale/sr@latin/LC_MESSAGES/gdl-1.mo
share/locale/sv/LC_MESSAGES/gdl-1.mo
+share/locale/te/LC_MESSAGES/gdl-1.mo
share/locale/th/LC_MESSAGES/gdl-1.mo
share/locale/tr/LC_MESSAGES/gdl-1.mo
share/locale/uk/LC_MESSAGES/gdl-1.mo
@@ -107,6 +111,8 @@ share/locale/zh_TW/LC_MESSAGES/gdl-1.mo
@dirrm include/libgdl-1.0
@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
@@ -121,3 +127,5 @@ share/locale/zh_TW/LC_MESSAGES/gdl-1.mo
@dirrmtry share/locale/mr
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index a50209f21134..559629b4721d 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,12 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.147 2009/01/08 17:38:06 kwm Exp $
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.152 2009/03/13 16:20:57 kwm Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.14.7
-PORTREVISION?= 1
+PORTVERSION= 2.16.0
+PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index a7d8aa722018..837351c54a8f 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.14.7.tar.bz2) = fb1614d4b2adba7b078e2e799b5db604
-SHA256 (gnome2/gtk+-2.14.7.tar.bz2) = e82f4728e52dbafc35713b755eb863a47dc155334912dda0240dc3de9cb07e14
-SIZE (gnome2/gtk+-2.14.7.tar.bz2) = 17475873
+MD5 (gnome2/gtk+-2.16.0.tar.bz2) = 139528802794287427fd4d18875b5cf5
+SHA256 (gnome2/gtk+-2.16.0.tar.bz2) = ff25cbf43dd5c5f8cddc1b2094505c1d079a576b873a6d3d6b62d95da1bdd1d7
+SIZE (gnome2/gtk+-2.16.0.tar.bz2) = 17978429
diff --git a/x11-toolkits/gtk20/files/patch-gtk-561583 b/x11-toolkits/gtk20/files/patch-gtk-561583
deleted file mode 100644
index f9a547805fcf..000000000000
--- a/x11-toolkits/gtk20/files/patch-gtk-561583
+++ /dev/null
@@ -1,16 +0,0 @@
---- gdk/x11/gdkscreen-x11.orig 2009-02-18 15:29:15.000000000 -0500
-+++ gdk/x11/gdkscreen-x11.c 2009-02-18 15:30:03.000000000 -0500
-@@ -915,11 +915,12 @@
- return;
- #endif
-
-+ _gdk_x11_screen_process_monitors_change (screen);
-+
- if (width == gdk_screen_get_width (screen) &&
- height == gdk_screen_get_height (screen))
- return;
-
-- _gdk_x11_screen_process_monitors_change (screen);
- g_signal_emit_by_name (screen, "size_changed");
- }
-
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkscalebutton.c b/x11-toolkits/gtk20/files/patch-gtk_gtkscalebutton.c
new file mode 100644
index 000000000000..eb85ae27856e
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtkscalebutton.c
@@ -0,0 +1,133 @@
+--- gtk/gtkscalebutton.c 2009/03/06 14:06:46 22478
++++ gtk/gtkscalebutton.c 2009/03/18 21:19:07 22574
+@@ -119,6 +119,8 @@
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
++static void gtk_scale_button_set_orientation_private (GtkScaleButton *button,
++ GtkOrientation orientation);
+ static gboolean gtk_scale_button_scroll (GtkWidget *widget,
+ GdkEventScroll *event);
+ static void gtk_scale_button_screen_changed (GtkWidget *widget,
+@@ -434,7 +436,7 @@
+ switch (prop_id)
+ {
+ case PROP_ORIENTATION:
+- gtk_scale_button_set_orientation (button, g_value_get_enum (value));
++ gtk_scale_button_set_orientation_private (button, g_value_get_enum (value));
+ break;
+ case PROP_VALUE:
+ gtk_scale_button_set_value (button, g_value_get_double (value));
+@@ -739,54 +741,9 @@
+ gtk_scale_button_set_orientation (GtkScaleButton *button,
+ GtkOrientation orientation)
+ {
+- GtkScaleButtonPrivate *priv;
+-
+ g_return_if_fail (GTK_IS_SCALE_BUTTON (button));
+
+- priv = button->priv;
+-
+- if (orientation != priv->orientation)
+- {
+- priv->orientation = orientation;
+-
+- gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box),
+- orientation);
+- gtk_container_child_set (GTK_CONTAINER (priv->box),
+- button->plus_button,
+- "pack-type",
+- orientation == GTK_ORIENTATION_VERTICAL ?
+- GTK_PACK_START : GTK_PACK_END,
+- NULL);
+- gtk_container_child_set (GTK_CONTAINER (priv->box),
+- button->minus_button,
+- "pack-type",
+- orientation == GTK_ORIENTATION_VERTICAL ?
+- GTK_PACK_END : GTK_PACK_START,
+- NULL);
+-
+- gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->scale),
+- orientation);
+-
+- if (orientation == GTK_ORIENTATION_VERTICAL)
+- {
+- gtk_widget_set_size_request (GTK_WIDGET (priv->scale),
+- -1, SCALE_SIZE);
+- gtk_range_set_inverted (GTK_RANGE (priv->scale), TRUE);
+- }
+- else
+- {
+- gtk_widget_set_size_request (GTK_WIDGET (priv->scale),
+- SCALE_SIZE, -1);
+- gtk_range_set_inverted (GTK_RANGE (priv->scale), FALSE);
+- }
+-
+- /* FIXME: without this, the popup window appears as a square
+- * after changing the orientation
+- */
+- gtk_window_resize (GTK_WINDOW (priv->dock), 1, 1);
+-
+- g_object_notify (G_OBJECT (button), "orientation");
+- }
++ gtk_scale_button_set_orientation_private (button, orientation);
+ }
+
+ /**
+@@ -843,6 +800,56 @@
+ return button->priv->dock;
+ }
+
++static void
++gtk_scale_button_set_orientation_private (GtkScaleButton *button,
++ GtkOrientation orientation)
++{
++ GtkScaleButtonPrivate *priv = button->priv;
++
++ if (orientation != priv->orientation)
++ {
++ priv->orientation = orientation;
++
++ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box),
++ orientation);
++ gtk_container_child_set (GTK_CONTAINER (priv->box),
++ button->plus_button,
++ "pack-type",
++ orientation == GTK_ORIENTATION_VERTICAL ?
++ GTK_PACK_START : GTK_PACK_END,
++ NULL);
++ gtk_container_child_set (GTK_CONTAINER (priv->box),
++ button->minus_button,
++ "pack-type",
++ orientation == GTK_ORIENTATION_VERTICAL ?
++ GTK_PACK_END : GTK_PACK_START,
++ NULL);
++
++ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->scale),
++ orientation);
++
++ if (orientation == GTK_ORIENTATION_VERTICAL)
++ {
++ gtk_widget_set_size_request (GTK_WIDGET (priv->scale),
++ -1, SCALE_SIZE);
++ gtk_range_set_inverted (GTK_RANGE (priv->scale), TRUE);
++ }
++ else
++ {
++ gtk_widget_set_size_request (GTK_WIDGET (priv->scale),
++ SCALE_SIZE, -1);
++ gtk_range_set_inverted (GTK_RANGE (priv->scale), FALSE);
++ }
++
++ /* FIXME: without this, the popup window appears as a square
++ * after changing the orientation
++ */
++ gtk_window_resize (GTK_WINDOW (priv->dock), 1, 1);
++
++ g_object_notify (G_OBJECT (button), "orientation");
++ }
++}
++
+ /*
+ * button callbacks.
+ */
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index f916fc6fda4f..830f0e739210 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -66,6 +66,7 @@ include/gtk-2.0/gtk/gtkaccelmap.h
include/gtk-2.0/gtk/gtkaccessible.h
include/gtk-2.0/gtk/gtkaction.h
include/gtk-2.0/gtk/gtkactiongroup.h
+include/gtk-2.0/gtk/gtkactivatable.h
include/gtk-2.0/gtk/gtkadjustment.h
include/gtk-2.0/gtk/gtkalignment.h
include/gtk-2.0/gtk/gtkarrow.h
@@ -168,6 +169,7 @@ include/gtk-2.0/gtk/gtknotebook.h
include/gtk-2.0/gtk/gtkobject.h
include/gtk-2.0/gtk/gtkoldeditable.h
include/gtk-2.0/gtk/gtkoptionmenu.h
+include/gtk-2.0/gtk/gtkorientable.h
include/gtk-2.0/gtk/gtkpagesetup.h
include/gtk-2.0/gtk/gtkpaned.h
include/gtk-2.0/gtk/gtkpapersize.h
@@ -435,6 +437,7 @@ share/gtk-2.0/demo/pickers.c
share/gtk-2.0/demo/pixbufs.c
share/gtk-2.0/demo/printing.c
share/gtk-2.0/demo/rotated_text.c
+share/gtk-2.0/demo/search_entry.c
share/gtk-2.0/demo/sizegroup.c
share/gtk-2.0/demo/stock_browser.c
share/gtk-2.0/demo/textscroll.c
@@ -475,6 +478,8 @@ share/locale/ca/LC_MESSAGES/gtk20-properties.mo
share/locale/ca/LC_MESSAGES/gtk20.mo
share/locale/ca@valencia/LC_MESSAGES/gtk20-properties.mo
share/locale/ca@valencia/LC_MESSAGES/gtk20.mo
+share/locale/crh/LC_MESSAGES/gtk20-properties.mo
+share/locale/crh/LC_MESSAGES/gtk20.mo
share/locale/cs/LC_MESSAGES/gtk20-properties.mo
share/locale/cs/LC_MESSAGES/gtk20.mo
share/locale/cy/LC_MESSAGES/gtk20-properties.mo
@@ -722,6 +727,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrmtry share/locale/hy
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index a50209f21134..559629b4721d 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,12 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.147 2009/01/08 17:38:06 kwm Exp $
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.152 2009/03/13 16:20:57 kwm Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.14.7
-PORTREVISION?= 1
+PORTVERSION= 2.16.0
+PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index a7d8aa722018..837351c54a8f 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.14.7.tar.bz2) = fb1614d4b2adba7b078e2e799b5db604
-SHA256 (gnome2/gtk+-2.14.7.tar.bz2) = e82f4728e52dbafc35713b755eb863a47dc155334912dda0240dc3de9cb07e14
-SIZE (gnome2/gtk+-2.14.7.tar.bz2) = 17475873
+MD5 (gnome2/gtk+-2.16.0.tar.bz2) = 139528802794287427fd4d18875b5cf5
+SHA256 (gnome2/gtk+-2.16.0.tar.bz2) = ff25cbf43dd5c5f8cddc1b2094505c1d079a576b873a6d3d6b62d95da1bdd1d7
+SIZE (gnome2/gtk+-2.16.0.tar.bz2) = 17978429
diff --git a/x11-toolkits/gtk30/files/patch-gtk-561583 b/x11-toolkits/gtk30/files/patch-gtk-561583
deleted file mode 100644
index f9a547805fcf..000000000000
--- a/x11-toolkits/gtk30/files/patch-gtk-561583
+++ /dev/null
@@ -1,16 +0,0 @@
---- gdk/x11/gdkscreen-x11.orig 2009-02-18 15:29:15.000000000 -0500
-+++ gdk/x11/gdkscreen-x11.c 2009-02-18 15:30:03.000000000 -0500
-@@ -915,11 +915,12 @@
- return;
- #endif
-
-+ _gdk_x11_screen_process_monitors_change (screen);
-+
- if (width == gdk_screen_get_width (screen) &&
- height == gdk_screen_get_height (screen))
- return;
-
-- _gdk_x11_screen_process_monitors_change (screen);
- g_signal_emit_by_name (screen, "size_changed");
- }
-
diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkscalebutton.c b/x11-toolkits/gtk30/files/patch-gtk_gtkscalebutton.c
new file mode 100644
index 000000000000..eb85ae27856e
--- /dev/null
+++ b/x11-toolkits/gtk30/files/patch-gtk_gtkscalebutton.c
@@ -0,0 +1,133 @@
+--- gtk/gtkscalebutton.c 2009/03/06 14:06:46 22478
++++ gtk/gtkscalebutton.c 2009/03/18 21:19:07 22574
+@@ -119,6 +119,8 @@
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
++static void gtk_scale_button_set_orientation_private (GtkScaleButton *button,
++ GtkOrientation orientation);
+ static gboolean gtk_scale_button_scroll (GtkWidget *widget,
+ GdkEventScroll *event);
+ static void gtk_scale_button_screen_changed (GtkWidget *widget,
+@@ -434,7 +436,7 @@
+ switch (prop_id)
+ {
+ case PROP_ORIENTATION:
+- gtk_scale_button_set_orientation (button, g_value_get_enum (value));
++ gtk_scale_button_set_orientation_private (button, g_value_get_enum (value));
+ break;
+ case PROP_VALUE:
+ gtk_scale_button_set_value (button, g_value_get_double (value));
+@@ -739,54 +741,9 @@
+ gtk_scale_button_set_orientation (GtkScaleButton *button,
+ GtkOrientation orientation)
+ {
+- GtkScaleButtonPrivate *priv;
+-
+ g_return_if_fail (GTK_IS_SCALE_BUTTON (button));
+
+- priv = button->priv;
+-
+- if (orientation != priv->orientation)
+- {
+- priv->orientation = orientation;
+-
+- gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box),
+- orientation);
+- gtk_container_child_set (GTK_CONTAINER (priv->box),
+- button->plus_button,
+- "pack-type",
+- orientation == GTK_ORIENTATION_VERTICAL ?
+- GTK_PACK_START : GTK_PACK_END,
+- NULL);
+- gtk_container_child_set (GTK_CONTAINER (priv->box),
+- button->minus_button,
+- "pack-type",
+- orientation == GTK_ORIENTATION_VERTICAL ?
+- GTK_PACK_END : GTK_PACK_START,
+- NULL);
+-
+- gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->scale),
+- orientation);
+-
+- if (orientation == GTK_ORIENTATION_VERTICAL)
+- {
+- gtk_widget_set_size_request (GTK_WIDGET (priv->scale),
+- -1, SCALE_SIZE);
+- gtk_range_set_inverted (GTK_RANGE (priv->scale), TRUE);
+- }
+- else
+- {
+- gtk_widget_set_size_request (GTK_WIDGET (priv->scale),
+- SCALE_SIZE, -1);
+- gtk_range_set_inverted (GTK_RANGE (priv->scale), FALSE);
+- }
+-
+- /* FIXME: without this, the popup window appears as a square
+- * after changing the orientation
+- */
+- gtk_window_resize (GTK_WINDOW (priv->dock), 1, 1);
+-
+- g_object_notify (G_OBJECT (button), "orientation");
+- }
++ gtk_scale_button_set_orientation_private (button, orientation);
+ }
+
+ /**
+@@ -843,6 +800,56 @@
+ return button->priv->dock;
+ }
+
++static void
++gtk_scale_button_set_orientation_private (GtkScaleButton *button,
++ GtkOrientation orientation)
++{
++ GtkScaleButtonPrivate *priv = button->priv;
++
++ if (orientation != priv->orientation)
++ {
++ priv->orientation = orientation;
++
++ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box),
++ orientation);
++ gtk_container_child_set (GTK_CONTAINER (priv->box),
++ button->plus_button,
++ "pack-type",
++ orientation == GTK_ORIENTATION_VERTICAL ?
++ GTK_PACK_START : GTK_PACK_END,
++ NULL);
++ gtk_container_child_set (GTK_CONTAINER (priv->box),
++ button->minus_button,
++ "pack-type",
++ orientation == GTK_ORIENTATION_VERTICAL ?
++ GTK_PACK_END : GTK_PACK_START,
++ NULL);
++
++ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->scale),
++ orientation);
++
++ if (orientation == GTK_ORIENTATION_VERTICAL)
++ {
++ gtk_widget_set_size_request (GTK_WIDGET (priv->scale),
++ -1, SCALE_SIZE);
++ gtk_range_set_inverted (GTK_RANGE (priv->scale), TRUE);
++ }
++ else
++ {
++ gtk_widget_set_size_request (GTK_WIDGET (priv->scale),
++ SCALE_SIZE, -1);
++ gtk_range_set_inverted (GTK_RANGE (priv->scale), FALSE);
++ }
++
++ /* FIXME: without this, the popup window appears as a square
++ * after changing the orientation
++ */
++ gtk_window_resize (GTK_WINDOW (priv->dock), 1, 1);
++
++ g_object_notify (G_OBJECT (button), "orientation");
++ }
++}
++
+ /*
+ * button callbacks.
+ */
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index f916fc6fda4f..830f0e739210 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -66,6 +66,7 @@ include/gtk-2.0/gtk/gtkaccelmap.h
include/gtk-2.0/gtk/gtkaccessible.h
include/gtk-2.0/gtk/gtkaction.h
include/gtk-2.0/gtk/gtkactiongroup.h
+include/gtk-2.0/gtk/gtkactivatable.h
include/gtk-2.0/gtk/gtkadjustment.h
include/gtk-2.0/gtk/gtkalignment.h
include/gtk-2.0/gtk/gtkarrow.h
@@ -168,6 +169,7 @@ include/gtk-2.0/gtk/gtknotebook.h
include/gtk-2.0/gtk/gtkobject.h
include/gtk-2.0/gtk/gtkoldeditable.h
include/gtk-2.0/gtk/gtkoptionmenu.h
+include/gtk-2.0/gtk/gtkorientable.h
include/gtk-2.0/gtk/gtkpagesetup.h
include/gtk-2.0/gtk/gtkpaned.h
include/gtk-2.0/gtk/gtkpapersize.h
@@ -435,6 +437,7 @@ share/gtk-2.0/demo/pickers.c
share/gtk-2.0/demo/pixbufs.c
share/gtk-2.0/demo/printing.c
share/gtk-2.0/demo/rotated_text.c
+share/gtk-2.0/demo/search_entry.c
share/gtk-2.0/demo/sizegroup.c
share/gtk-2.0/demo/stock_browser.c
share/gtk-2.0/demo/textscroll.c
@@ -475,6 +478,8 @@ share/locale/ca/LC_MESSAGES/gtk20-properties.mo
share/locale/ca/LC_MESSAGES/gtk20.mo
share/locale/ca@valencia/LC_MESSAGES/gtk20-properties.mo
share/locale/ca@valencia/LC_MESSAGES/gtk20.mo
+share/locale/crh/LC_MESSAGES/gtk20-properties.mo
+share/locale/crh/LC_MESSAGES/gtk20.mo
share/locale/cs/LC_MESSAGES/gtk20-properties.mo
share/locale/cs/LC_MESSAGES/gtk20.mo
share/locale/cy/LC_MESSAGES/gtk20-properties.mo
@@ -722,6 +727,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrmtry share/locale/hy
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index ef71ec3fbd37..a8662cc45902 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -3,11 +3,11 @@
# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.42 2008/11/18 06:51:19 marcus Exp $
+# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.46 2009/03/17 15:18:15 kwm Exp $
#
PORTNAME= gtkmm
-PORTVERSION= 2.14.3
+PORTVERSION= 2.16.0
PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index 5c77592fc96f..98ae79afc752 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkmm-2.14.3.tar.bz2) = 10039f35d7f815d47f926a13cefe65d6
-SHA256 (gnome2/gtkmm-2.14.3.tar.bz2) = 24b18105636cea1033658a0a5f7e86783d0e620590aa359a005ba64d055559a2
-SIZE (gnome2/gtkmm-2.14.3.tar.bz2) = 8667875
+MD5 (gnome2/gtkmm-2.16.0.tar.bz2) = a82e3b5b93008421ff67df16d1e51ec2
+SHA256 (gnome2/gtkmm-2.16.0.tar.bz2) = 9994e6a92f7086adb58aba0431f29a766218f806b9db95359dad59a0615f95bf
+SIZE (gnome2/gtkmm-2.16.0.tar.bz2) = 9313258
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index fea6c20e19d0..acf9e6def421 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -102,6 +102,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/accellabel.h
include/gtkmm-%%API_VERSION%%/gtkmm/accelmap.h
include/gtkmm-%%API_VERSION%%/gtkmm/action.h
include/gtkmm-%%API_VERSION%%/gtkmm/actiongroup.h
+include/gtkmm-%%API_VERSION%%/gtkmm/activatable.h
include/gtkmm-%%API_VERSION%%/gtkmm/adjustment.h
include/gtkmm-%%API_VERSION%%/gtkmm/alignment.h
include/gtkmm-%%API_VERSION%%/gtkmm/arrow.h
@@ -185,6 +186,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/misc.h
include/gtkmm-%%API_VERSION%%/gtkmm/notebook.h
include/gtkmm-%%API_VERSION%%/gtkmm/object.h
include/gtkmm-%%API_VERSION%%/gtkmm/optionmenu.h
+include/gtkmm-%%API_VERSION%%/gtkmm/orientable.h
include/gtkmm-%%API_VERSION%%/gtkmm/pagesetup.h
include/gtkmm-%%API_VERSION%%/gtkmm/pagesetupunixdialog.h
include/gtkmm-%%API_VERSION%%/gtkmm/paned.h
@@ -202,6 +204,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/accelgroup_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/accellabel_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/action_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/actiongroup_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/activatable_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/adjustment_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/alignment_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/arrow_p.h
@@ -279,6 +282,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/misc_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/notebook_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/object_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/optionmenu_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/orientable_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/pagesetup_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/pagesetupunixdialog_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/paned_p.h
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index 728749e891c7..707deec3ad3d 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.67 2008/11/02 18:21:19 marcus Exp $
+# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.72 2009/04/09 03:24:10 mezz Exp $
#
PORTNAME= gtksourceview2
-PORTVERSION= 2.4.2
+PORTVERSION= 2.6.0
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
diff --git a/x11-toolkits/gtksourceview2/distinfo b/x11-toolkits/gtksourceview2/distinfo
index 7d9895cb9c68..04fd78d2715d 100644
--- a/x11-toolkits/gtksourceview2/distinfo
+++ b/x11-toolkits/gtksourceview2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtksourceview-2.4.2.tar.bz2) = aece5dcb1e2e7ca1855f95eb48f30443
-SHA256 (gnome2/gtksourceview-2.4.2.tar.bz2) = 49cd6b1bc4b3aa20dee0445d5b1a7d4bf4329414a9025a84681db01390172cbf
-SIZE (gnome2/gtksourceview-2.4.2.tar.bz2) = 923948
+MD5 (gnome2/gtksourceview-2.6.0.tar.bz2) = dd065ab2e96e51aade949249c5556439
+SHA256 (gnome2/gtksourceview-2.6.0.tar.bz2) = 92ddd976721e26377eaa59fea07707a0caa85eb874500868c1e6fdd9a21fe0dd
+SIZE (gnome2/gtksourceview-2.6.0.tar.bz2) = 976669
diff --git a/x11-toolkits/gtksourceview2/pkg-plist b/x11-toolkits/gtksourceview2/pkg-plist
index 9a0140320448..012ade348b60 100644
--- a/x11-toolkits/gtksourceview2/pkg-plist
+++ b/x11-toolkits/gtksourceview2/pkg-plist
@@ -16,12 +16,14 @@ lib/libgtksourceview-2.0.so.0
libdata/pkgconfig/gtksourceview-2.0.pc
share/gtksourceview-2.0/language-specs/R.lang
share/gtksourceview-2.0/language-specs/ada.lang
+share/gtksourceview-2.0/language-specs/asp.lang
share/gtksourceview-2.0/language-specs/awk.lang
share/gtksourceview-2.0/language-specs/boo.lang
share/gtksourceview-2.0/language-specs/c.lang
share/gtksourceview-2.0/language-specs/changelog.lang
share/gtksourceview-2.0/language-specs/chdr.lang
share/gtksourceview-2.0/language-specs/check.sh
+share/gtksourceview-2.0/language-specs/cmake.lang
share/gtksourceview-2.0/language-specs/convert.py
share/gtksourceview-2.0/language-specs/cpp.lang
share/gtksourceview-2.0/language-specs/csharp.lang
@@ -31,6 +33,7 @@ share/gtksourceview-2.0/language-specs/def.lang
share/gtksourceview-2.0/language-specs/desktop.lang
share/gtksourceview-2.0/language-specs/diff.lang
share/gtksourceview-2.0/language-specs/docbook.lang
+share/gtksourceview-2.0/language-specs/dosbatch.lang
share/gtksourceview-2.0/language-specs/dot.lang
share/gtksourceview-2.0/language-specs/dpatch.lang
share/gtksourceview-2.0/language-specs/dtd.lang
@@ -59,6 +62,7 @@ share/gtksourceview-2.0/language-specs/m4.lang
share/gtksourceview-2.0/language-specs/makefile.lang
share/gtksourceview-2.0/language-specs/msil.lang
share/gtksourceview-2.0/language-specs/nemerle.lang
+share/gtksourceview-2.0/language-specs/nsis.lang
share/gtksourceview-2.0/language-specs/objc.lang
share/gtksourceview-2.0/language-specs/ocaml.lang
share/gtksourceview-2.0/language-specs/ocl.lang
@@ -68,6 +72,7 @@ share/gtksourceview-2.0/language-specs/perl.lang
share/gtksourceview-2.0/language-specs/php.lang
share/gtksourceview-2.0/language-specs/pkgconfig.lang
share/gtksourceview-2.0/language-specs/po.lang
+share/gtksourceview-2.0/language-specs/prolog.lang
share/gtksourceview-2.0/language-specs/python.lang
share/gtksourceview-2.0/language-specs/rpmspec.lang
share/gtksourceview-2.0/language-specs/ruby.lang
@@ -75,6 +80,7 @@ share/gtksourceview-2.0/language-specs/scheme.lang
share/gtksourceview-2.0/language-specs/sh.lang
share/gtksourceview-2.0/language-specs/sql.lang
share/gtksourceview-2.0/language-specs/styles.rng
+share/gtksourceview-2.0/language-specs/t2t.lang
share/gtksourceview-2.0/language-specs/tcl.lang
share/gtksourceview-2.0/language-specs/texinfo.lang
share/gtksourceview-2.0/language-specs/vala.lang
@@ -85,6 +91,7 @@ share/gtksourceview-2.0/language-specs/xml.lang
share/gtksourceview-2.0/language-specs/xslt.lang
share/gtksourceview-2.0/language-specs/yacc.lang
share/gtksourceview-2.0/styles/classic.xml
+share/gtksourceview-2.0/styles/cobalt.xml
share/gtksourceview-2.0/styles/kate.xml
share/gtksourceview-2.0/styles/oblivion.xml
share/gtksourceview-2.0/styles/styles.rng
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index 2bbc2d76bc11..0f09f9b1f7b1 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.16 2008/09/22 11:36:49 kwm Exp $
+# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.18 2009/03/17 16:02:12 kwm Exp $
#
PORTNAME= libgnomeuimm
-PORTVERSION= 2.24.0
+PORTVERSION= 2.26.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgnomeuimm26/distinfo b/x11-toolkits/libgnomeuimm26/distinfo
index 2c1080fc7656..12ed4522cfb6 100644
--- a/x11-toolkits/libgnomeuimm26/distinfo
+++ b/x11-toolkits/libgnomeuimm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeuimm-2.24.0.tar.bz2) = e4caf43ee829200bef9ad87415ae39a5
-SHA256 (gnome2/libgnomeuimm-2.24.0.tar.bz2) = 7715ce5648ef7cdf231077fd4e9d8953b30ab70d31dec2efdaa6accd98a2e732
-SIZE (gnome2/libgnomeuimm-2.24.0.tar.bz2) = 381746
+MD5 (gnome2/libgnomeuimm-2.26.0.tar.bz2) = 7a9c8426a227a80ca70f2c976fcb1ae3
+SHA256 (gnome2/libgnomeuimm-2.26.0.tar.bz2) = d2993a6c70e5049971bf1163765c459ce1c3b0999c8e686267e3e544442322a3
+SIZE (gnome2/libgnomeuimm-2.26.0.tar.bz2) = 337722
diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index 11c74ea588e4..d677ca7f5b38 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -26,6 +26,8 @@ USE_GNOME= gnomehack lthack gnomepanel
USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
+CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \
+ LIBS="`pkg-config --libs libgnomeui-2.0`"
PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index dd74382215a3..bad736de1e33 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.114 2008/11/25 17:24:09 mezz Exp $
+# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.117 2009/03/17 22:51:24 kwm Exp $
#
PORTNAME= libwnck
-PORTVERSION= 2.24.2
+PORTVERSION= 2.26.0
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index 6306502f25d3..4299aded9bbe 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libwnck-2.24.2.tar.bz2) = 1c939b1722579e5b7adc37068e77d72a
-SHA256 (gnome2/libwnck-2.24.2.tar.bz2) = 35c12f983e64c88c37c261eb6b55b7c59a5ef4dbb04525162f0753ea8e9127f2
-SIZE (gnome2/libwnck-2.24.2.tar.bz2) = 693227
+MD5 (gnome2/libwnck-2.26.0.tar.bz2) = 73873bf666fc18dff04d66c48400b0c5
+SHA256 (gnome2/libwnck-2.26.0.tar.bz2) = b47a9252da2f5a32e171a8ecfc4fe74a9fa241fdc68a6bc063935573be8939dc
+SIZE (gnome2/libwnck-2.26.0.tar.bz2) = 707479
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index bcc92275f72a..168881d9e0c3 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -18,6 +18,7 @@ lib/libwnck-1.so.22
libdata/pkgconfig/libwnck-1.0.pc
share/locale/am/LC_MESSAGES/libwnck.mo
share/locale/ar/LC_MESSAGES/libwnck.mo
+share/locale/as/LC_MESSAGES/libwnck.mo
share/locale/az/LC_MESSAGES/libwnck.mo
share/locale/be/LC_MESSAGES/libwnck.mo
share/locale/be@latin/LC_MESSAGES/libwnck.mo
@@ -130,3 +131,5 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile
index e8f62c1d7de5..5686ae6981d6 100644
--- a/x11-toolkits/ocaml-lablgtk2/Makefile
+++ b/x11-toolkits/ocaml-lablgtk2/Makefile
@@ -22,6 +22,8 @@ USE_GMAKE= yes
USE_GNOME= gtk20
USE_OCAML= yes
+BROKEN= does not build with GNOME 2.26
+
OPTIONS= GLADE "With glade support" ON \
GNOMECANVAS "With gnomecanvas support" ON \
GNOMEPANEL "With gnomepanel support" ON \
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 8cf3b149f472..6fd6e3c0f364 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/pango/Makefile,v 1.133 2008/12/18 02:44:05 mezz Exp $
+# $MCom: ports/x11-toolkits/pango/Makefile,v 1.139 2009/03/27 18:56:24 marcus Exp $
#
PORTNAME= pango
-PORTVERSION= 1.22.4
-PORTREVISION?= 0
+PORTVERSION= 1.24.0
+PORTREVISION?= 2
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME \
ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
@@ -28,6 +28,7 @@ RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \
USE_GETTEXT= yes
USE_GMAKE= yes
+MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack glib20 ltverhack referencehack
@@ -44,7 +45,7 @@ PLIST_SUB= VERSION="1.6.0"
FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf
FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir
-MAN1= pango-querymodules.1
+MAN1= pango-view.1 pango-querymodules.1 preload.1
.if defined(WITHOUT_X11)
CONFIGURE_ARGS+= --with-x=no
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 45e017171aff..3ea90a967301 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pango-1.22.4.tar.bz2) = 7c3f3748052799746d73c6d3a0cc1205
-SHA256 (gnome2/pango-1.22.4.tar.bz2) = ff47d7ed8360ebef5fa4b8d3ccf45e014bc8793743bca2a96635a3c34eeaa534
-SIZE (gnome2/pango-1.22.4.tar.bz2) = 1496168
+MD5 (gnome2/pango-1.24.0.tar.bz2) = d209f41079833cd2ef2c5e580ab9c5ee
+SHA256 (gnome2/pango-1.24.0.tar.bz2) = 7a0af222b8f07defbf492246b7f7ba386025ab504f2ec4abc408d3d6fa4d4b95
+SIZE (gnome2/pango-1.24.0.tar.bz2) = 1520527
diff --git a/x11-toolkits/pango/files/patch-pango-view_Makefile.in b/x11-toolkits/pango/files/patch-pango-view_Makefile.in
new file mode 100644
index 000000000000..1a865c134f35
--- /dev/null
+++ b/x11-toolkits/pango/files/patch-pango-view_Makefile.in
@@ -0,0 +1,11 @@
+--- pango-view/Makefile.in.orig 2009-03-20 23:09:47.000000000 -0400
++++ pango-view/Makefile.in 2009-03-20 23:10:27.000000000 -0400
+@@ -727,7 +727,7 @@ $(srcdir)/pango-view.1: ../configure.in
+ (test -f "$@" || echo help2man is required to generate this file. >> "$@"));
+
+ install-data-hook:
+- @cd "$(DESTDIR)$(man1dir)" && gzip -c pango-view.1 > preload.1.gz && $(RM) preload.1
++ @cd "$(DESTDIR)$(man1dir)" && cp -p pango-view.1 preload.1
+
+ uninstall-hook:
+ $(RM) "$(DESTDIR)$(man1dir)/pango-view.1.gz"
diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile
index e8c61109ead6..782570ccf582 100644
--- a/x11-toolkits/pangomm/Makefile
+++ b/x11-toolkits/pangomm/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/pangomm/Makefile,v 1.7 2008/11/10 19:57:21 kwm Exp $
+# $MCom: ports/x11-toolkits/pangomm/Makefile,v 1.9 2009/03/13 14:42:38 kwm Exp $
#
PORTNAME= pangomm
-PORTVERSION= 2.14.1
+PORTVERSION= 2.24.0
PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
diff --git a/x11-toolkits/pangomm/distinfo b/x11-toolkits/pangomm/distinfo
index 650cc75a9861..5e4dcdf249cc 100644
--- a/x11-toolkits/pangomm/distinfo
+++ b/x11-toolkits/pangomm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pangomm-2.14.1.tar.bz2) = c67228ea93dd977394d2872b61754b53
-SHA256 (gnome2/pangomm-2.14.1.tar.bz2) = d7724d878242f7313086e23f774f5ae021f6ff8d0bd393d6c704ad89362c3557
-SIZE (gnome2/pangomm-2.14.1.tar.bz2) = 984848
+MD5 (gnome2/pangomm-2.24.0.tar.bz2) = fa0f44c37499433455857becad4bbcda
+SHA256 (gnome2/pangomm-2.24.0.tar.bz2) = 0f0a45644bd11a3e354b52c3823a635cf0ebf2123fe7fa48e728e6aa5699039e
+SIZE (gnome2/pangomm-2.24.0.tar.bz2) = 996057
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index 51ddec0080ba..e5e6a44ebceb 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.79 2008/12/20 05:39:21 marcus Exp $
+# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.86 2009/03/15 00:39:36 marcus Exp $
#
PORTNAME= gnome
-PORTVERSION= 2.24.1
+PORTVERSION= 2.26.0
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,17 +23,18 @@ BUILD_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy
LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
- gnome-keyring:${PORTSDIR}/security/gnome-keyring
+ gnome-keyring:${PORTSDIR}/security/gnome-keyring \
+ evdocument.1:${PORTSDIR}/graphics/evince
RUN_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy
USE_BZIP2= yes
USE_GMAKE= yes
USE_PYTHON= yes
USE_GNOME= gnomehack libgnomeprintui gnomepanel gnomedesktop \
- gtksourceview libwnck nautiluscdburner pygnome2 metacity \
+ gtksourceview libwnck nautilus2 pygnome2 metacity \
evolutiondataserver
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-metacity
+CONFIGURE_ARGS= --enable-metacity --disable-nautilusburn
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -54,7 +55,7 @@ post-patch:
.if !defined(NOPORTDOCS)
post-install:
${MKDIR} ${EG_DST_DIR}
- ${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xf -
+ ${TAR} -C ${EG_SRC_DIR} --exclude *nautilusburn* -cf - . | ${TAR} -C ${EG_DST_DIR} -xf -
${CHOWN} -R ${BINOWN}:${BINGRP} ${EG_DST_DIR}
${CHMOD} -R go-w ${EG_DST_DIR}
.endif
diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo
index 42b6dc6c2fea..7c842b1e4979 100644
--- a/x11-toolkits/py-gnome-desktop/distinfo
+++ b/x11-toolkits/py-gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-desktop-2.24.1.tar.bz2) = 3eac6b859bff98148b021c9d11224ca5
-SHA256 (gnome2/gnome-python-desktop-2.24.1.tar.bz2) = 2f10ec51126493b88f5c2e3336a9cacca740bc25fc9b8b2d871a21b21b5e8748
-SIZE (gnome2/gnome-python-desktop-2.24.1.tar.bz2) = 621325
+MD5 (gnome2/gnome-python-desktop-2.26.0.tar.bz2) = fbcf4ef5ec4a8c4eec4d390c5889c80f
+SHA256 (gnome2/gnome-python-desktop-2.26.0.tar.bz2) = 400a5401a591e271c3357d0a8cb05a7927b4c218130497d06f75df9763d4efd8
+SIZE (gnome2/gnome-python-desktop-2.26.0.tar.bz2) = 571939
diff --git a/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c b/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c
deleted file mode 100644
index de4572f7febf..000000000000
--- a/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtop/gtop.c.orig Wed May 18 00:54:59 2005
-+++ gtop/gtop.c Wed May 18 00:54:12 2005
-@@ -44,6 +44,7 @@
-
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
-
-
diff --git a/x11-toolkits/py-gnome-desktop/pkg-plist b/x11-toolkits/py-gnome-desktop/pkg-plist
index cdc0b502be3b..2d7723f572f5 100644
--- a/x11-toolkits/py-gnome-desktop/pkg-plist
+++ b/x11-toolkits/py-gnome-desktop/pkg-plist
@@ -1,6 +1,8 @@
%%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/evince.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/evince.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/evolution/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/evolution/ebook.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/evolution/ebook.so
@@ -33,8 +35,6 @@
%%PYTHON_SITELIBDIR%%/gtk-2.0/mediaprofiles.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/metacity.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/metacity.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/rsvg.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/rsvg.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.py
@@ -101,25 +101,21 @@ libdata/pkgconfig/gnome-python-desktop-2.0.pc
%%PORTDOCS%%share/examples/py-gnome/keyring-async.py
%%PORTDOCS%%share/examples/py-gnome/keyring.py
%%PORTDOCS%%share/examples/py-gnome/mediaprofiles/profiles.py
-%%PORTDOCS%%share/examples/py-gnome/nautilusburn/blank_disc.py
-%%PORTDOCS%%share/examples/py-gnome/nautilusburn/drive_selection.py
-%%PORTDOCS%%share/examples/py-gnome/nautilusburn/write_iso.py
%%PORTDOCS%%share/examples/py-gnome/rsvg/rsvg-cairo.py
%%PORTDOCS%%share/examples/py-gnome/wnck_example.py
share/pygtk/2.0/defs/_gnomedesktop.defs
share/pygtk/2.0/defs/applet.defs
share/pygtk/2.0/defs/art.defs
share/pygtk/2.0/defs/ebook.defs
+share/pygtk/2.0/defs/evince.defs
share/pygtk/2.0/defs/gnomekeyring.defs
share/pygtk/2.0/defs/gtksourceview.defs
share/pygtk/2.0/defs/mediaprofiles.defs
share/pygtk/2.0/defs/metacity.defs
-share/pygtk/2.0/defs/nautilus_burn.defs
share/pygtk/2.0/defs/print.defs
share/pygtk/2.0/defs/printui.defs
share/pygtk/2.0/defs/wnck.defs
%%PORTDOCS%%@dirrm share/examples/py-gnome/rsvg
-%%PORTDOCS%%@dirrm share/examples/py-gnome/nautilusburn
%%PORTDOCS%%@dirrm share/examples/py-gnome/mediaprofiles
%%PORTDOCS%%@dirrm share/examples/py-gnome/gtksourceview
%%PORTDOCS%%@dirrm share/examples/py-gnome/gnomeprint
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index e494fff56031..8acb4662d2a2 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -3,12 +3,12 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.45 2008/10/21 14:16:43 kwm Exp $
+# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.48 2009/04/07 03:08:53 marcus Exp $
#
PORTNAME= gnome
-PORTVERSION= 2.19.1
-PORTREVISION= 5
+PORTVERSION= 2.25.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//}
@@ -29,7 +29,7 @@ USE_GECKO= firefox seamonkey xulrunner mozilla
USE_BZIP2= yes
USE_GMAKE= yes
USE_PYTHON= yes
-USE_GNOME= gnomehack libgtkhtml pygnome2 libgda3
+USE_GNOME= gnomehack libgtkhtml pygnome2 libgda4
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gtkmozembed=${GECKO}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/py-gnome-extras/distinfo b/x11-toolkits/py-gnome-extras/distinfo
index c16b77d8ddb3..71fc1395ff05 100644
--- a/x11-toolkits/py-gnome-extras/distinfo
+++ b/x11-toolkits/py-gnome-extras/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-extras-2.19.1.tar.bz2) = 08896c63d71ce44d20fafbaf9c0edc78
-SHA256 (gnome2/gnome-python-extras-2.19.1.tar.bz2) = c5f74f4c46dbb379d119d6f74ca4a47653af251bea176dc7a0ecacccb88339f0
-SIZE (gnome2/gnome-python-extras-2.19.1.tar.bz2) = 361721
+MD5 (gnome2/gnome-python-extras-2.25.3.tar.bz2) = 9f3b7ec5c57130b96061cb486b79c076
+SHA256 (gnome2/gnome-python-extras-2.25.3.tar.bz2) = ca346264e00e193f0866cabd8801d3b7ce70dae7b8b296e41e5b3a45c9b0275c
+SIZE (gnome2/gnome-python-extras-2.25.3.tar.bz2) = 370489
diff --git a/x11-toolkits/py-gnome-extras/files/patch-configure b/x11-toolkits/py-gnome-extras/files/patch-configure
index 407ce7f1767c..04f5b256944c 100644
--- a/x11-toolkits/py-gnome-extras/files/patch-configure
+++ b/x11-toolkits/py-gnome-extras/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Sun Feb 25 16:31:03 2007
-+++ configure Sat Jul 21 20:04:43 2007
-@@ -1550,7 +1550,7 @@
+--- configure.orig 2009-02-28 16:14:05.000000000 -0500
++++ configure 2009-02-28 16:21:48.000000000 -0500
+@@ -1721,7 +1721,7 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-tags[=TAGS] include additional configurations [automatic]
@@ -9,14 +9,667 @@
package that provides libgtkmozembed
Some influential environment variables:
-@@ -22072,8 +22072,9 @@
- xulrunner) mozpackage_required_version=1.8 ;;
- firefox) mozpackage_required_version=1.0 ;;
- mozilla) mozpackage_required_version=1.2b ;;
-+ seamonkey) mozpackage_required_version=1.1.3 ;;
- *) { { echo "$as_me:$LINENO: error: --with-gtkmozembed argument must be either 'mozilla', 'firefox', or 'xulrunner'" >&5
--echo "$as_me: error: --with-gtkmozembed argument must be either 'mozilla', 'firefox', or 'xulrunner'" >&2;}
-+echo "$as_me: error: --with-gtkmozembed argument must be either 'mozilla', 'firefox', 'seamonkey' or 'xulrunner'" >&2;}
- { (exit 1); exit 1; }; }
- esac
+@@ -22428,6 +22428,150 @@ fi
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
++
++
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5
++$as_echo_n "checking for GTKMOZEMBED... " >&6; }
++
++if test -n "$GTKMOZEMBED_CFLAGS"; then
++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKMOZEMBED_LIBS"; then
++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>&1`
++ else
++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++ build_gtkmozembed=false
++elif test $pkg_failed = untried; then
++ build_gtkmozembed=false
++else
++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ build_gtkmozembed=true; mozpackage=seamonkey
++fi
++
++elif test $pkg_failed = untried; then
++
++
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5
++$as_echo_n "checking for GTKMOZEMBED... " >&6; }
++
++if test -n "$GTKMOZEMBED_CFLAGS"; then
++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKMOZEMBED_LIBS"; then
++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>&1`
++ else
++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ build_gtkmozembed=false
+ elif test $pkg_failed = untried; then
+ build_gtkmozembed=false
+@@ -22436,6 +22580,14 @@ else
+ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
++ build_gtkmozembed=true; mozpackage=seamonkey
++fi
++
++else
++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
+ build_gtkmozembed=true; mozpackage=mozilla
+ fi
+
+@@ -22506,6 +22658,150 @@ fi
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
++
++
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5
++$as_echo_n "checking for GTKMOZEMBED... " >&6; }
++
++if test -n "$GTKMOZEMBED_CFLAGS"; then
++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKMOZEMBED_LIBS"; then
++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>&1`
++ else
++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++ build_gtkmozembed=false
++elif test $pkg_failed = untried; then
++ build_gtkmozembed=false
++else
++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ build_gtkmozembed=true; mozpackage=seamonkey
++fi
++
++elif test $pkg_failed = untried; then
++
++
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5
++$as_echo_n "checking for GTKMOZEMBED... " >&6; }
++
++if test -n "$GTKMOZEMBED_CFLAGS"; then
++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKMOZEMBED_LIBS"; then
++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>&1`
++ else
++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ build_gtkmozembed=false
+ elif test $pkg_failed = untried; then
+ build_gtkmozembed=false
+@@ -22514,6 +22810,14 @@ else
+ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
++ build_gtkmozembed=true; mozpackage=seamonkey
++fi
++
++else
++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
+ build_gtkmozembed=true; mozpackage=mozilla
+ fi
+
+@@ -22658,6 +22962,150 @@ fi
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
++
++
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5
++$as_echo_n "checking for GTKMOZEMBED... " >&6; }
++
++if test -n "$GTKMOZEMBED_CFLAGS"; then
++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKMOZEMBED_LIBS"; then
++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>&1`
++ else
++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++ build_gtkmozembed=false
++elif test $pkg_failed = untried; then
++ build_gtkmozembed=false
++else
++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ build_gtkmozembed=true; mozpackage=seamonkey
++fi
++
++elif test $pkg_failed = untried; then
++
++
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5
++$as_echo_n "checking for GTKMOZEMBED... " >&6; }
++
++if test -n "$GTKMOZEMBED_CFLAGS"; then
++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKMOZEMBED_LIBS"; then
++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>&1`
++ else
++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ build_gtkmozembed=false
+ elif test $pkg_failed = untried; then
+ build_gtkmozembed=false
+@@ -22666,6 +23114,14 @@ else
+ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
++ build_gtkmozembed=true; mozpackage=seamonkey
++fi
++
++else
++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
+ build_gtkmozembed=true; mozpackage=mozilla
+ fi
+
+@@ -22736,6 +23192,150 @@ fi
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
++
++
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5
++$as_echo_n "checking for GTKMOZEMBED... " >&6; }
++
++if test -n "$GTKMOZEMBED_CFLAGS"; then
++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKMOZEMBED_LIBS"; then
++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>&1`
++ else
++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++ build_gtkmozembed=false
++elif test $pkg_failed = untried; then
++ build_gtkmozembed=false
++else
++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ build_gtkmozembed=true; mozpackage=seamonkey
++fi
++
++elif test $pkg_failed = untried; then
++
++
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5
++$as_echo_n "checking for GTKMOZEMBED... " >&6; }
++
++if test -n "$GTKMOZEMBED_CFLAGS"; then
++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GTKMOZEMBED_LIBS"; then
++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>&1`
++ else
++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3
++ gtk+-2.0 >= 2.4.0" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ build_gtkmozembed=false
+ elif test $pkg_failed = untried; then
+ build_gtkmozembed=false
+@@ -22744,6 +23344,14 @@ else
+ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
++ build_gtkmozembed=true; mozpackage=seamonkey
++fi
++
++else
++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
+ build_gtkmozembed=true; mozpackage=mozilla
+ fi
diff --git a/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs b/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs
deleted file mode 100644
index b0b5dae6237e..000000000000
--- a/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs
+++ /dev/null
@@ -1,67 +0,0 @@
---- gdl/gdl.defs.orig 2007-06-05 14:52:30.000000000 +0000
-+++ gdl/gdl.defs 2008-10-21 15:47:07.000000000 +0000
-@@ -81,17 +81,6 @@
- (gtype-id "GDL_TYPE_DOCK_TABLABEL")
- )
-
--(ifdef HAVE_GDL_0_7
--
--(define-object Icons
-- (in-module "Gdl")
-- (parent "GObject")
-- (c-name "GdlIcons")
-- (gtype-id "GDL_TYPE_ICONS")
--)
--
--) ; ifdef HAVE_GDL_0_7
--
- ;; Enumerations and flags ...
-
- (ifdef HAVE_GDL_0_7
-@@ -924,46 +913,3 @@
- (return-type "none")
- )
-
--;; From gdl-icons.h
--
--(ifdef HAVE_GDL_0_7
--
--(define-function gdl_icons_new
-- (is-constructor-of "GdlIcons")
-- (c-name "gdl_icons_new")
-- (return-type "GdlIcons*")
-- (parameters
-- '("int" "icon_size")
-- )
--)
--
--(define-function gdl_icons_get_type
-- (c-name "gdl_icons_get_type")
-- (return-type "GType")
--)
--
--(define-method get_folder_icon
-- (of-object "GdlIcons")
-- (c-name "gdl_icons_get_folder_icon")
-- (return-type "GdkPixbuf*")
--)
--
--(define-method get_uri_icon
-- (of-object "GdlIcons")
-- (c-name "gdl_icons_get_uri_icon")
-- (return-type "GdkPixbuf*")
-- (parameters
-- '("const-char*" "uri")
-- )
--)
--
--(define-method get_mime_icon
-- (of-object "GdlIcons")
-- (c-name "gdl_icons_get_mime_icon")
-- (return-type "GdkPixbuf*")
-- (parameters
-- '("const-char*" "mime_type")
-- )
--)
--
--) ; ifdef HAVE_GDL_0_7
diff --git a/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override b/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override
deleted file mode 100644
index 16e67fe1efc5..000000000000
--- a/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override
+++ /dev/null
@@ -1,10 +0,0 @@
---- gdl/gdl.override.orig 2007-06-05 14:52:30.000000000 +0000
-+++ gdl/gdl.override 2008-10-21 15:47:07.000000000 +0000
-@@ -6,7 +6,6 @@ headers
- #include <pygtk/pygtk.h>
- #include <gdl/gdl-dock.h>
- #include <gdl/libgdltypebuiltins.h>
--#include <gdl/gdl-icons.h>
- #ifndef HAVE_GDL_0_7
- # include <gdl/gdl-dock-bar.h>
- #endif
diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist
index 012275817bae..8564adea3250 100644
--- a/x11-toolkits/py-gnome-extras/pkg-plist
+++ b/x11-toolkits/py-gnome-extras/pkg-plist
@@ -1,4 +1,4 @@
-include/pygda-3.0/pygdavalue_conversions.h
+include/pygda-4.0/pygdavalue_conversions.h
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyo
@@ -24,17 +24,7 @@ include/pygda-3.0/pygdavalue_conversions.h
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.so
libdata/pkgconfig/gnome-python-extras-2.0.pc
-libdata/pkgconfig/pygda-3.0.pc
-%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/class-gtkmozembed.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/gtkmozembed-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/pygtkmozembed.devhelp
-%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/class-gtkspell.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/gtkspell-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/pygtkspell.devhelp
+libdata/pkgconfig/pygda-4.0.pc
%%PORTDOCS%%share/examples/py-gnome/egg/recent/Bonobo_Sample_Hello.xml
%%PORTDOCS%%share/examples/py-gnome/egg/recent/bonobo-view.py
%%PORTDOCS%%share/examples/py-gnome/egg/recent/gtk-view.py
@@ -45,7 +35,7 @@ libdata/pkgconfig/pygda-3.0.pc
%%PORTDOCS%%share/examples/py-gnome/gdl/gdl_test.py
%%PORTDOCS%%share/examples/py-gnome/gksu2/simple.py
%%PORTDOCS%%share/examples/py-gnome/gtkhtml2/simple-browser.py
-%%PORTDOCS%%share/examples/py-gnome/gtkspell/gtkspell.py
+%%PORTDOCS%%share/examples/py-gnome/gtkspell/spell.py
%%PORTDOCS%%share/examples/py-gnome/gtkspell/test.py
share/pygtk/2.0/argtypes/gda-arg-types.py
share/pygtk/2.0/argtypes/gda-arg-types.pyc
@@ -60,9 +50,6 @@ share/pygtk/2.0/defs/trayicon.defs
%%PORTDOCS%%@dirrm share/examples/py-gnome/gdl
%%PORTDOCS%%@dirrm share/examples/py-gnome/egg/recent
%%PORTDOCS%%@dirrm share/examples/py-gnome/egg
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkspell
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkmozembed
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/egg
-@dirrm include/pygda-3.0
+@dirrm include/pygda-4.0
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 1b9cd91b4e0c..ae7de1b6e1bb 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.52 2008/09/22 12:16:45 kwm Exp $
+# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.55 2009/03/15 00:16:38 marcus Exp $
#
PORTNAME= gnome
-PORTVERSION= 2.22.3
+PORTVERSION= 2.26.0
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo
index f93a875bb83a..82938c9822e2 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-2.22.3.tar.bz2) = ab12d94954a57de39b25eb7903d8429c
-SHA256 (gnome2/gnome-python-2.22.3.tar.bz2) = a1763ef40aa0fc152e1afe6be6b01d69ba305273bd4bd44cad018da42d1bb559
-SIZE (gnome2/gnome-python-2.22.3.tar.bz2) = 588459
+MD5 (gnome2/gnome-python-2.26.0.tar.bz2) = 452b8489eed892d09c506c17efd597f1
+SHA256 (gnome2/gnome-python-2.26.0.tar.bz2) = 7b15e68979afe72224e4e2928c1656f2e4d3c8c3ba3d69487e6179bb46947e04
+SIZE (gnome2/gnome-python-2.26.0.tar.bz2) = 523096
diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
index 837371f7d625..6bbca5f5dd3e 100644
--- a/x11-toolkits/py-gtksourceview/Makefile
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -3,11 +3,11 @@
# Whom: Mezz <mezz@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.14 2008/09/21 06:34:35 kwm Exp $
+# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.17 2009/03/24 13:38:04 kwm Exp $
#
PORTNAME= gtksourceview
-PORTVERSION= 2.4.0
+PORTVERSION= 2.6.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gtksourceview/distinfo b/x11-toolkits/py-gtksourceview/distinfo
index daf8d55238f3..e07fe304f190 100644
--- a/x11-toolkits/py-gtksourceview/distinfo
+++ b/x11-toolkits/py-gtksourceview/distinfo
@@ -1,3 +1,3 @@
-MD5 (pygtksourceview-2.4.0.tar.bz2) = 436e2ec467035a8cd174b794932e4cdc
-SHA256 (pygtksourceview-2.4.0.tar.bz2) = 437fb779bc0bd9a43806ee7b3a406a1329800e54489cd9579ea0a101870df791
-SIZE (pygtksourceview-2.4.0.tar.bz2) = 271360
+MD5 (pygtksourceview-2.6.0.tar.bz2) = 5587a1865bd5c785c6f34095c57cc96b
+SHA256 (pygtksourceview-2.6.0.tar.bz2) = 77acb735fee997a1638c79256b9dcf592566d066b54a72eb4321909f98f66178
+SIZE (pygtksourceview-2.6.0.tar.bz2) = 271314
diff --git a/x11-toolkits/py-vte/Makefile b/x11-toolkits/py-vte/Makefile
index 5710557fc6c3..73993810c4bb 100644
--- a/x11-toolkits/py-vte/Makefile
+++ b/x11-toolkits/py-vte/Makefile
@@ -3,10 +3,10 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-vte/Makefile,v 1.1 2007/02/18 19:12:57 mezz Exp $
+# $MCom: ports/x11-toolkits/py-vte/Makefile,v 1.3 2009/02/24 19:42:18 kwm Exp $
#
-PORTREVISION= 2
+PORTREVISION= 0
CATEGORIES= x11-toolkits gnome python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/py-vte/pkg-plist b/x11-toolkits/py-vte/pkg-plist
index d67a8a180e60..d726d02a6075 100644
--- a/x11-toolkits/py-vte/pkg-plist
+++ b/x11-toolkits/py-vte/pkg-plist
@@ -1,3 +1,5 @@
%%PYTHON_SITELIBDIR%%/gtk-2.0/vtemodule.a
%%PYTHON_SITELIBDIR%%/gtk-2.0/vtemodule.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/vtemodule.so
+libdata/pkgconfig/pyvte.pc
+share/pygtk/2.0/defs/vte.defs
diff --git a/x11-toolkits/ruby-panelapplet/Makefile b/x11-toolkits/ruby-panelapplet/Makefile
index fba7f469e111..4721c3c1af11 100644
--- a/x11-toolkits/ruby-panelapplet/Makefile
+++ b/x11-toolkits/ruby-panelapplet/Makefile
@@ -3,7 +3,7 @@
# Whom: Mezz <mezz@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/ruby-panelapplet/Makefile,v 1.2 2005/10/17 07:05:43 mezz Exp $
+# $MCom: ports/x11-toolkits/ruby-panelapplet/Makefile,v 1.4 2009/04/07 04:06:54 marcus Exp $
#
PORTNAME= panelapplet
@@ -24,6 +24,8 @@ USE_RUBY= yes
USE_GNOME= gnomepanel
USE_RUBY_EXTCONF= yes
+BROKEN= does not build with GNOME 2.26.
+
.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
WRKSRC= ${RUBY_GNOME_WRKSRC}/panel-applet
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 3eb38350af11..277b44db6328 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/vte/Makefile,v 1.91 2008/09/22 23:42:39 kwm Exp $
+# $MCom: ports/x11-toolkits/vte/Makefile,v 1.94 2009/03/16 07:57:41 kwm Exp $
#
PORTNAME= vte
-PORTVERSION= 0.17.4
+PORTVERSION= 0.20.0
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
@@ -27,8 +27,8 @@ USE_AUTOTOOLS= libtool:15
USE_GETTEXT= yes
USE_GNOME?= gnomeprefix gnomehack gtk20 ltverhack referencehack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
+ LDFLAGS="-L${LOCALBASE}/lib"
+# BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS?=--disable-python \
--disable-freetypetest
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index f703509a9b03..f716a7305113 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vte-0.17.4.tar.bz2) = ec6cb2668db7146eae7cfc48af98f3ed
-SHA256 (gnome2/vte-0.17.4.tar.bz2) = 50ae10aea7fa99c9ae296031782c18ac15663e84eb6ecd94cd0a18c7843987d2
-SIZE (gnome2/vte-0.17.4.tar.bz2) = 1084847
+MD5 (gnome2/vte-0.20.0.tar.bz2) = 12dde859bc98e039336baff6e9e6b15b
+SHA256 (gnome2/vte-0.20.0.tar.bz2) = 6612c72fe73279a23e296a70e19b3f5dd270c6d16cf0cc6a191475c1a16846f7
+SIZE (gnome2/vte-0.20.0.tar.bz2) = 1089171
diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
index 8f838a9b007f..5534225003e7 100644
--- a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
+++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
@@ -1,22 +1,5 @@
--- gnome-pty-helper/Makefile.in.orig 2007-07-29 17:20:13.000000000 -0400
+++ gnome-pty-helper/Makefile.in 2007-07-29 17:25:47.000000000 -0400
-@@ -107,6 +107,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
-+BSD_PTHREAD_LIBS = @BSD_PTHREAD_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -271,7 +272,7 @@ clean-libexecPROGRAMS:
- -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
- gnome-pty-helper$(EXEEXT): $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_DEPENDENCIES)
- @rm -f gnome-pty-helper$(EXEEXT)
-- $(LINK) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS)
-+ $(LINK) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) $(BSD_PTHREAD_LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
@@ -584,8 +585,8 @@ uninstall-am: uninstall-libexecPROGRAMS
diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure
deleted file mode 100644
index 70091c3aa2f7..000000000000
--- a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure
+++ /dev/null
@@ -1,27 +0,0 @@
---- gnome-pty-helper/configure.orig 2008-09-08 19:30:02.000000000 -0400
-+++ gnome-pty-helper/configure 2008-09-08 19:31:21.000000000 -0400
-@@ -673,6 +673,7 @@ AMTAR
- am__tar
- am__untar
- CC
-+BSD_PTHREAD_LIBS
- CFLAGS
- LDFLAGS
- CPPFLAGS
-@@ -8434,6 +8435,7 @@ AMTAR!$AMTAR$ac_delim
- am__tar!$am__tar$ac_delim
- am__untar!$am__untar$ac_delim
- CC!$CC$ac_delim
-+BSD_PTHREAD_LIBS!$BSD_PTHREAD_LIBS$ac_delim
- CFLAGS!$CFLAGS$ac_delim
- LDFLAGS!$LDFLAGS$ac_delim
- CPPFLAGS!$CPPFLAGS$ac_delim
-@@ -8470,7 +8472,7 @@ LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c b/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c
deleted file mode 100644
index 6be543a31e05..000000000000
--- a/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- gnome-pty-helper/gnome-pty-helper.c.orig Tue Feb 14 03:58:10 2006
-+++ gnome-pty-helper/gnome-pty-helper.c Sat Feb 25 16:38:04 2006
-@@ -95,12 +95,12 @@ static pty_info *pty_list;
- #endif /* CMSG_DATA */
-
- static struct cmsghdr *cmptr;
--static int CONTROLLEN;
-+static socklen_t CONTROLLEN;
-
- static int
- init_msg_pass (void)
- {
-- CONTROLLEN = (CMSG_DATA (cmptr) - (unsigned char *)cmptr) + sizeof(int);
-+ CONTROLLEN = CMSG_SPACE (sizeof (int));
- cmptr = malloc (CONTROLLEN);
-
- if (cmptr)
-@@ -128,7 +128,7 @@ pass_fd (int client_fd, int fd)
-
- cmptr->cmsg_level = SOL_SOCKET;
- cmptr->cmsg_type = SCM_RIGHTS;
-- cmptr->cmsg_len = CONTROLLEN;
-+ cmptr->cmsg_len = CMSG_LEN (sizeof (fd));
- *(int *)CMSG_DATA (cmptr) = fd;
-
- if (sendmsg (client_fd, &msg, 0) != 1)
diff --git a/x11-toolkits/vte/files/patch-python_Makefile.in b/x11-toolkits/vte/files/patch-python_Makefile.in
index 10ee93b1347b..d8c01a7483df 100644
--- a/x11-toolkits/vte/files/patch-python_Makefile.in
+++ b/x11-toolkits/vte/files/patch-python_Makefile.in
@@ -1,19 +1,36 @@
---- python/Makefile.in.orig Tue Feb 27 12:46:42 2007
-+++ python/Makefile.in Tue Feb 27 12:47:11 2007
-@@ -61,7 +61,6 @@
+--- python/Makefile.in.orig 2009-03-16 08:49:19.000000000 +0100
++++ python/Makefile.in 2009-03-16 08:51:17.000000000 +0100
+@@ -56,7 +56,6 @@
LTLIBRARIES = $(pythonsiteexec_LTLIBRARIES)
am__DEPENDENCIES_1 =
@BUILD_PYTHON_MODULES_TRUE@vtemodule_la_DEPENDENCIES = \
-@BUILD_PYTHON_MODULES_TRUE@ $(top_builddir)/src/libvte.la \
@BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \
@BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \
- @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \
-@@ -303,7 +302,7 @@
+ @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1)
+@@ -290,11 +289,11 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = vte.defs pyvte.pc.in vte.override cat.py unrealize.py vte-demo.py
+-defsdir = $(datadir)/pygtk/2.0/defs
+-defs_DATA = vte.defs
+-pkgconfigdir = $(prefix)/libdata/pkgconfig
+-pkgconfig_DATA = pyvte.pc
+-PYTHON_MODULES = vtemodule.la
++@BUILD_PYTHON_MODULES_TRUE@defsdir = $(datadir)/pygtk/2.0/defs
++@BUILD_PYTHON_MODULES_TRUE@defs_DATA = vte.defs
++@BUILD_PYTHON_MODULES_TRUE@pkgconfigdir = $(prefix)/libdata/pkgconfig
++@BUILD_PYTHON_MODULES_TRUE@pkgconfig_DATA = pyvte.pc
++@BUILD_PYTHON_MODULES_TRUE@PYTHON_MODULES = vtemodule.la
+ @BUILD_PYTHON_MODULES_TRUE@pythonsiteexecdir = $(pyexecdir)/gtk-2.0
+ @BUILD_PYTHON_MODULES_TRUE@pythonsiteexec_LTLIBRARIES = $(PYTHON_MODULES)
@BUILD_PYTHON_MODULES_TRUE@CLEANFILES = vte.c
- @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_CFLAGS = $(VTE_CFLAGS) $(X_CFLAGS) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS)
- @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_SOURCES = vtemodule.c
+@@ -305,7 +304,7 @@
+ # we do this to suport building with -Wl,-z,defs which errors on
+ # vtemodule.so as we cannot include $(PYTHON_LIBS) due to bug 410986.
+ @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initvte $(PYTHON_LDFLAGS) $(AM_LDFLAGS)
-@BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LIBADD = $(top_builddir)/src/libvte.la $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS)
+@BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LIBADD = -lvte $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS)
- @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initvte
@BUILD_PYTHON_MODULES_TRUE@nodist_vtemodule_la_SOURCES = vte.c
all: all-am
+
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index 15cb7dfbb283..d4337b16529b 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -11,19 +11,15 @@ lib/libvte.so
lib/libvte.so.9
lib/vte/decset
lib/vte/interpret
-lib/vte/iso8859mode
-lib/vte/nativeecho
lib/vte/osc
lib/vte/slowcat
-lib/vte/utf8echo
-lib/vte/utf8mode
-lib/vte/vterdb
lib/vte/window
libdata/pkgconfig/vte.pc
libexec/gnome-pty-helper
share/locale/am/LC_MESSAGES/vte.mo
share/locale/ang/LC_MESSAGES/vte.mo
share/locale/ar/LC_MESSAGES/vte.mo
+share/locale/as/LC_MESSAGES/vte.mo
share/locale/az/LC_MESSAGES/vte.mo
share/locale/be/LC_MESSAGES/vte.mo
share/locale/be@latin/LC_MESSAGES/vte.mo
@@ -138,5 +134,7 @@ share/locale/zh_TW/LC_MESSAGES/vte.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
@dirrmtry share/locale/ang/LC_MESSAGES
@dirrmtry share/locale/ang
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index f81ad05c167d..115be9eea549 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -3,12 +3,11 @@
# Whom: Garrett Rooney <rooneg@electricjellyfish.net>
#
# $FreeBSD$
-# $MCom: ports/x11-wm/metacity/Makefile,v 1.140 2008/10/08 04:21:46 marcus Exp $
+# $MCom: ports/x11-wm/metacity/Makefile,v 1.145 2009/03/26 17:34:42 marcus Exp $
#
PORTNAME= metacity
-PORTVERSION= 2.24.0
-PORTREVISION= 1
+PORTVERSION= 2.26.0
CATEGORIES= x11-wm
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,7 +15,9 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A window manager for the adult in you
+BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity
LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity
CONFLICTS= expocity-[0-9]*
USE_BZIP2= yes
@@ -32,7 +33,11 @@ MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
GCONF_SCHEMAS= metacity.schemas
-MAN1= metacity-theme-viewer.1 metacity-window-demo.1 \
- metacity.1
+MAN1= metacity-message.1 metacity-theme-viewer.1 \
+ metacity-window-demo.1 metacity.1
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|-Werror||g' \
+ ${WRKSRC}/configure
.include <bsd.port.mk>
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index a6116af821aa..092049327eaa 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/metacity-2.24.0.tar.bz2) = d4aa782d5f71b6c42514b239684a4aa3
-SHA256 (gnome2/metacity-2.24.0.tar.bz2) = 90eed0a36aae302db52af12220c4cf863c9cccebd233015104f2d88cb17ec076
-SIZE (gnome2/metacity-2.24.0.tar.bz2) = 2160557
+MD5 (gnome2/metacity-2.26.0.tar.bz2) = eafb624e79fbcdab6da59acc222430b1
+SHA256 (gnome2/metacity-2.26.0.tar.bz2) = 29ba16411899d963bae69a4d72d37dec38a33e62412fe769d497de4555559078
+SIZE (gnome2/metacity-2.26.0.tar.bz2) = 2289848
diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure
index 155c6ecfc4a7..dc37d41d93d6 100644
--- a/x11-wm/metacity/files/patch-configure
+++ b/x11-wm/metacity/files/patch-configure
@@ -1,9 +1,9 @@
---- configure.orig 2008-09-23 00:55:36.000000000 -0400
-+++ configure 2008-09-23 00:55:52.000000000 -0400
-@@ -31530,7 +31530,7 @@ metacity-$VERSION:
+--- configure.orig 2009-03-17 18:59:17.000000000 +0100
++++ configure 2009-03-17 19:00:03.000000000 +0100
+@@ -23806,7 +23806,7 @@
"
- METACITY_MINOR_VERSION=24
+ METACITY_MINOR_VERSION=26
-if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then
+if test $(( $(echo $METACITY_MINOR_VERSION) %2)) = "1"; then
stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2))
diff --git a/x11-wm/metacity/files/patch-src_core_main.c b/x11-wm/metacity/files/patch-src_core_main.c
deleted file mode 100644
index db73c224f1bd..000000000000
--- a/x11-wm/metacity/files/patch-src_core_main.c
+++ /dev/null
@@ -1,51 +0,0 @@
---- src/core/main.c.orig 2008-10-08 00:10:39.000000000 -0400
-+++ src/core/main.c 2008-10-08 00:18:44.000000000 -0400
-@@ -312,6 +312,23 @@ void meta_select_display (gchar *display
- /* DO NOT FREE envVar, putenv() sucks */
- putenv (envVar);
- }
-+
-+static
-+void meta_finalize (void)
-+{
-+ meta_display_close (meta_get_display (),
-+ CurrentTime); /* I doubt correct timestamps matter here */
-+
-+ meta_session_shutdown ();
-+}
-+
-+static
-+void sigterm_handler (int signum)
-+{
-+ meta_finalize ();
-+
-+ exit (meta_exit_code);
-+}
-
- /**
- * This is where the story begins. It parses commandline options and
-@@ -352,6 +369,11 @@ main (int argc, char **argv)
- g_strerror (errno));
- #endif
-
-+ act.sa_handler = &sigterm_handler;
-+ if (sigaction (SIGTERM, &act, NULL) < 0)
-+ g_printerr ("Failed to register SIGTERM handler: %s\n",
-+ g_strerror (errno));
-+
- if (g_getenv ("METACITY_VERBOSE"))
- meta_set_verbose (TRUE);
- if (g_getenv ("METACITY_DEBUG"))
-@@ -478,11 +500,8 @@ main (int argc, char **argv)
-
- g_main_loop_run (meta_main_loop);
-
-- meta_display_close (meta_get_display (),
-- CurrentTime); /* I doubt correct timestamps matter here */
-+ meta_finalize ();
-
-- meta_session_shutdown ();
--
- if (meta_restart_after_quit)
- {
- GError *err;
diff --git a/x11-wm/metacity/files/patch-src_core_util.c b/x11-wm/metacity/files/patch-src_core_util.c
deleted file mode 100644
index b1799e3516d5..000000000000
--- a/x11-wm/metacity/files/patch-src_core_util.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core/util.c.orig 2008-02-27 05:42:51.000000000 +0100
-+++ src/core/util.c 2008-03-21 21:16:14.000000000 +0100
-@@ -23,7 +23,7 @@
- */
-
- #define _GNU_SOURCE
--#define _POSIX_C_SOURCE /* for fdopen() */
-+#define _POSIX_C_SOURCE 1 /* for fdopen() */
-
- #include <config.h>
- #include "util.h"
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index 9ea1d2734b78..82b209e925f7 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -18,10 +18,12 @@ libexec/metacity-dialog
share/applications/metacity.desktop
share/gnome-control-center/keybindings/50-metacity-desktop-key.xml
share/gnome-control-center/keybindings/50-metacity-key.xml
+share/gnome/help/creating-metacity-themes/C/creating-metacity-themes.xml
share/gnome/wm-properties/metacity-wm.desktop
share/locale/am/LC_MESSAGES/metacity.mo
share/locale/ar/LC_MESSAGES/metacity.mo
share/locale/as/LC_MESSAGES/metacity.mo
+share/locale/ast/LC_MESSAGES/metacity.mo
share/locale/az/LC_MESSAGES/metacity.mo
share/locale/be/LC_MESSAGES/metacity.mo
share/locale/be@latin/LC_MESSAGES/metacity.mo
@@ -30,6 +32,7 @@ share/locale/bn/LC_MESSAGES/metacity.mo
share/locale/bn_IN/LC_MESSAGES/metacity.mo
share/locale/bs/LC_MESSAGES/metacity.mo
share/locale/ca/LC_MESSAGES/metacity.mo
+share/locale/ca@valencia/LC_MESSAGES/metacity.mo
share/locale/cs/LC_MESSAGES/metacity.mo
share/locale/cy/LC_MESSAGES/metacity.mo
share/locale/da/LC_MESSAGES/metacity.mo
@@ -47,12 +50,14 @@ share/locale/fr/LC_MESSAGES/metacity.mo
share/locale/ga/LC_MESSAGES/metacity.mo
share/locale/gl/LC_MESSAGES/metacity.mo
share/locale/gu/LC_MESSAGES/metacity.mo
+share/locale/ha/LC_MESSAGES/metacity.mo
share/locale/he/LC_MESSAGES/metacity.mo
share/locale/hi/LC_MESSAGES/metacity.mo
share/locale/hr/LC_MESSAGES/metacity.mo
share/locale/hu/LC_MESSAGES/metacity.mo
share/locale/hy/LC_MESSAGES/metacity.mo
share/locale/id/LC_MESSAGES/metacity.mo
+share/locale/ig/LC_MESSAGES/metacity.mo
share/locale/is/LC_MESSAGES/metacity.mo
share/locale/it/LC_MESSAGES/metacity.mo
share/locale/ja/LC_MESSAGES/metacity.mo
@@ -60,8 +65,10 @@ share/locale/ka/LC_MESSAGES/metacity.mo
share/locale/kn/LC_MESSAGES/metacity.mo
share/locale/ko/LC_MESSAGES/metacity.mo
share/locale/ku/LC_MESSAGES/metacity.mo
+share/locale/la/LC_MESSAGES/metacity.mo
share/locale/lt/LC_MESSAGES/metacity.mo
share/locale/lv/LC_MESSAGES/metacity.mo
+share/locale/mai/LC_MESSAGES/metacity.mo
share/locale/mg/LC_MESSAGES/metacity.mo
share/locale/mk/LC_MESSAGES/metacity.mo
share/locale/ml/LC_MESSAGES/metacity.mo
@@ -89,6 +96,7 @@ share/locale/sr/LC_MESSAGES/metacity.mo
share/locale/sr@latin/LC_MESSAGES/metacity.mo
share/locale/sv/LC_MESSAGES/metacity.mo
share/locale/ta/LC_MESSAGES/metacity.mo
+share/locale/te/LC_MESSAGES/metacity.mo
share/locale/th/LC_MESSAGES/metacity.mo
share/locale/tk/LC_MESSAGES/metacity.mo
share/locale/tr/LC_MESSAGES/metacity.mo
@@ -96,6 +104,7 @@ share/locale/uk/LC_MESSAGES/metacity.mo
share/locale/vi/LC_MESSAGES/metacity.mo
share/locale/wa/LC_MESSAGES/metacity.mo
share/locale/xh/LC_MESSAGES/metacity.mo
+share/locale/yo/LC_MESSAGES/metacity.mo
share/locale/zh_CN/LC_MESSAGES/metacity.mo
share/locale/zh_HK/LC_MESSAGES/metacity.mo
share/locale/zh_TW/LC_MESSAGES/metacity.mo
@@ -218,13 +227,19 @@ share/themes/Simple/metacity-1/minimize.png
@dirrmtry share/themes/AgingGorilla
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%
+@dirrm share/gnome/help/creating-metacity-themes/C
+@dirrm share/gnome/help/creating-metacity-themes
@dirrm include/metacity-1/metacity-private
@dirrm include/metacity-1
@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/yo/LC_MESSAGES
+@dirrmtry share/locale/yo
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@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
@@ -237,15 +252,27 @@ share/themes/Simple/metacity-1/minimize.png
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/la/LC_MESSAGES
+@dirrmtry share/locale/la
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ig/LC_MESSAGES
+@dirrmtry share/locale/ig
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/ha/LC_MESSAGES
+@dirrmtry share/locale/ha
@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/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/x11/gdm/Makefile b/x11/gdm/Makefile
index 8e00f2c136f0..e3f413599dc6 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gdm/Makefile,v 1.142 2009/01/10 01:59:22 mezz Exp $
+# $MCom: ports/x11/gdm/Makefile,v 1.148 2009/03/18 04:02:31 marcus Exp $
#
PORTNAME= gdm
-PORTVERSION= 2.24.1
-PORTREVISION= 6
+PORTVERSION= 2.26.0
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 70511a9d1f11..8cdc2bc522cc 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.24.1.tar.bz2) = 31139d7a79096463b127b4790058b056
-SHA256 (gnome2/gdm-2.24.1.tar.bz2) = 8869f464818a1626e481bba5c562bdb972ffb74f1a9da91d01199fa860ee040f
-SIZE (gnome2/gdm-2.24.1.tar.bz2) = 2579979
+MD5 (gnome2/gdm-2.26.0.tar.bz2) = b1a8db2f0e058d3c7b4c9a4600839a14
+SHA256 (gnome2/gdm-2.26.0.tar.bz2) = 34b9e36eaaa004f47b3e67924537cba1bdfe6ae467d8f0d30028ae7e6ef34627
+SIZE (gnome2/gdm-2.26.0.tar.bz2) = 2552457
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index 23ab71b4beaa..2aa2cf3d9969 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
#!/bin/sh
# $FreeBSD$
-# $MCom: ports/x11/gdm/files/gdm.in,v 1.32 2008/08/17 17:31:43 marcus Exp $
+# $MCom: ports/x11/gdm/files/gdm.in,v 1.35 2009/04/09 03:24:09 mezz Exp $
# PROVIDE: gdm
# REQUIRE: LOGIN cleanvar moused syscons dbus hald
diff --git a/x11/gdm/files/patch-common_gdm-settings-keys.h b/x11/gdm/files/patch-common_gdm-settings-keys.h
deleted file mode 100644
index 06ebc0800e18..000000000000
--- a/x11/gdm/files/patch-common_gdm-settings-keys.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- common/gdm-settings-keys.h.orig 2008-02-20 16:27:34.000000000 -0500
-+++ common/gdm-settings-keys.h 2008-02-25 22:23:35.000000000 -0500
-@@ -30,6 +30,7 @@ G_BEGIN_DECLS
- #define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
- #define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
- #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"
-+#define GDM_KEY_VT "daemon/VT"
-
- #define GDM_KEY_XDMCP_ENABLE "xdmcp/Enable"
- #define GDM_KEY_MAX_PENDING "xdmcp/MaxPending"
diff --git a/x11/gdm/files/patch-daemon-gdm-server.c b/x11/gdm/files/patch-daemon-gdm-server.c
deleted file mode 100644
index 079c62c66b6a..000000000000
--- a/x11/gdm/files/patch-daemon-gdm-server.c
+++ /dev/null
@@ -1,73 +0,0 @@
---- daemon/gdm-server.c.orig 2008-03-17 19:11:00.000000000 -0400
-+++ daemon/gdm-server.c 2008-08-25 16:11:10.000000000 -0400
-@@ -44,6 +44,10 @@
- #include "gdm-common.h"
- #include "gdm-signal-handler.h"
-
-+#include "gdm-settings.h"
-+#include "gdm-settings-direct.h"
-+#include "gdm-settings-keys.h"
-+
- #include "gdm-server.h"
-
- extern char **environ;
-@@ -77,6 +81,7 @@ struct GdmServerPrivate
- char *parent_display_name;
- char *parent_auth_file;
- char *chosen_hostname;
-+ char *vt;
-
- guint child_watch_id;
- };
-@@ -306,7 +311,7 @@ gdm_server_resolve_command_line (GdmServ
- argv[len++] = g_strdup ("tcp");
- }
-
-- if (vtarg != NULL && ! gotvtarg) {
-+ if (vtarg != NULL && ! gotvtarg && strncmp (server->priv->display_name, ":0", 2) == 0) {
- argv[len++] = g_strdup (vtarg);
- }
-
-@@ -673,7 +678,7 @@ gdm_server_start (GdmServer *server)
- gboolean res;
-
- /* fork X server process */
-- res = gdm_server_spawn (server, NULL);
-+ res = gdm_server_spawn (server, server->priv->vt);
-
- return res;
- }
-@@ -925,12 +930,33 @@ static void
- gdm_server_init (GdmServer *server)
- {
-
-+ int vt;
-+ gboolean has_vt;
-+ GdmSettings *settings = NULL;
- server->priv = GDM_SERVER_GET_PRIVATE (server);
-
-+
-+ settings = gdm_settings_new();
-+ if (settings == NULL) {
-+ g_assert ("Unable to initialize settings");
-+ }
-+
-+ if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
-+ g_assert ("Unable to initialize settings");
-+ }
-+
-+ has_vt = gdm_settings_direct_get_int (GDM_KEY_VT, &vt);
-+
-+ g_object_unref (settings);
-+
- server->priv->pid = -1;
- server->priv->command = g_strdup (X_SERVER " -br -verbose");
- server->priv->log_dir = g_strdup (LOGDIR);
-
-+ if (has_vt) {
-+ server->priv->vt = g_strdup_printf ("vt %d", vt);
-+ }
-+
- add_ready_handler (server);
- }
-
diff --git a/x11/gdm/files/patch-data_gdm.schemas.in.in b/x11/gdm/files/patch-data_gdm.schemas.in.in
deleted file mode 100644
index ae5572ddde3e..000000000000
--- a/x11/gdm/files/patch-data_gdm.schemas.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- data/gdm.schemas.in.in.orig 2007-12-13 12:14:19.000000000 -0500
-+++ data/gdm.schemas.in.in 2007-12-13 12:15:05.000000000 -0500
-@@ -11,6 +11,11 @@
- <signature>s</signature>
- <default>gdm</default>
- </schema>
-+ <schema>
-+ <key>daemon/VT</key>
-+ <signature>i</signature>
-+ <default>9</default>
-+ </schema>
-
- <schema>
- <key>xdmcp/Enable</key>
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 88d9237bd8e7..cfe404abd8bd 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -46,6 +46,7 @@ share/gnome/help/gdm/de/gdm.xml
share/gnome/help/gdm/en_GB/gdm.xml
share/gnome/help/gdm/es/gdm.xml
share/gnome/help/gdm/fr/gdm.xml
+share/gnome/help/gdm/it/gdm.xml
share/gnome/help/gdm/ko/gdm.xml
share/gnome/help/gdm/oc/gdm.xml
share/gnome/help/gdm/ru/gdm.xml
@@ -58,13 +59,16 @@ share/locale/af/LC_MESSAGES/gdm.mo
share/locale/am/LC_MESSAGES/gdm.mo
share/locale/ar/LC_MESSAGES/gdm.mo
share/locale/as/LC_MESSAGES/gdm.mo
+share/locale/ast/LC_MESSAGES/gdm.mo
share/locale/az/LC_MESSAGES/gdm.mo
share/locale/be/LC_MESSAGES/gdm.mo
+share/locale/be@latin/LC_MESSAGES/gdm.mo
share/locale/bg/LC_MESSAGES/gdm.mo
share/locale/bn/LC_MESSAGES/gdm.mo
share/locale/bn_IN/LC_MESSAGES/gdm.mo
share/locale/bs/LC_MESSAGES/gdm.mo
share/locale/ca/LC_MESSAGES/gdm.mo
+share/locale/crh/LC_MESSAGES/gdm.mo
share/locale/cs/LC_MESSAGES/gdm.mo
share/locale/cy/LC_MESSAGES/gdm.mo
share/locale/da/LC_MESSAGES/gdm.mo
@@ -96,7 +100,6 @@ share/locale/ka/LC_MESSAGES/gdm.mo
share/locale/kn/LC_MESSAGES/gdm.mo
share/locale/ko/LC_MESSAGES/gdm.mo
share/locale/ku/LC_MESSAGES/gdm.mo
-share/locale/la/LC_MESSAGES/gdm.mo
share/locale/lt/LC_MESSAGES/gdm.mo
share/locale/lv/LC_MESSAGES/gdm.mo
share/locale/mai/LC_MESSAGES/gdm.mo
@@ -134,6 +137,8 @@ share/locale/te/LC_MESSAGES/gdm.mo
share/locale/th/LC_MESSAGES/gdm.mo
share/locale/tr/LC_MESSAGES/gdm.mo
share/locale/uk/LC_MESSAGES/gdm.mo
+share/locale/uz/LC_MESSAGES/gdm.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gdm.mo
share/locale/vi/LC_MESSAGES/gdm.mo
share/locale/wa/LC_MESSAGES/gdm.mo
share/locale/xh/LC_MESSAGES/gdm.mo
@@ -141,6 +146,17 @@ share/locale/zh_CN/LC_MESSAGES/gdm.mo
share/locale/zh_HK/LC_MESSAGES/gdm.mo
share/locale/zh_TW/LC_MESSAGES/gdm.mo
share/locale/zu/LC_MESSAGES/gdm.mo
+share/omf/gdm/gdm-C.omf
+share/omf/gdm/gdm-de.omf
+share/omf/gdm/gdm-en_GB.omf
+share/omf/gdm/gdm-es.omf
+share/omf/gdm/gdm-fr.omf
+share/omf/gdm/gdm-it.omf
+share/omf/gdm/gdm-ko.omf
+share/omf/gdm/gdm-oc.omf
+share/omf/gdm/gdm-ru.omf
+share/omf/gdm/gdm-sv.omf
+share/omf/gdm/gdm-uk.omf
share/pixmaps/faces/astronaut.jpg
share/pixmaps/faces/baseball.png
share/pixmaps/faces/butterfly.png
@@ -174,11 +190,13 @@ share/pixmaps/nohost.png
@exec mkdir -p %D/share/xsessions
@dirrmtry share/xsessions
@dirrm share/pixmaps/faces
+@dirrm share/omf/gdm
@dirrm share/gnome/help/gdm/uk
@dirrm share/gnome/help/gdm/sv
@dirrm share/gnome/help/gdm/ru
@dirrm share/gnome/help/gdm/oc
@dirrm share/gnome/help/gdm/ko
+@dirrm share/gnome/help/gdm/it
@dirrm share/gnome/help/gdm/fr
@dirrm share/gnome/help/gdm/es
@dirrm share/gnome/help/gdm/en_GB
@@ -210,6 +228,10 @@ share/pixmaps/nohost.png
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/uz/LC_MESSAGES
+@dirrmtry share/locale/uz
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -232,8 +254,6 @@ share/pixmaps/nohost.png
@dirrmtry share/locale/mg
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
-@dirrmtry share/locale/la/LC_MESSAGES
-@dirrmtry share/locale/la
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/hy/LC_MESSAGES
@@ -242,7 +262,13 @@ share/pixmaps/nohost.png
@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
@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/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index bd0ef7ff8d1c..e615a286de74 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-applets/Makefile,v 1.193 2008/12/20 20:05:50 marcus Exp $
+# $MCom: ports/x11/gnome-applets/Makefile,v 1.197 2009/03/17 13:00:26 kwm Exp $
#
PORTNAME= gnome-applets
-PORTVERSION= 2.24.3.1
+PORTVERSION= 2.26.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -36,7 +36,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel gnomedocutils \
WANT_GNOME= yes
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gstreamer=0.10
+CONFIGURE_ARGS= --with-gstreamer=0.10 \
+ --enable-mixer-applet
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
OS_SYS="/usr/include"
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 257b814fd25d..62fe9e66ee2e 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.24.3.1.tar.bz2) = 9d60394e9feedb754838e5087ddaee97
-SHA256 (gnome2/gnome-applets-2.24.3.1.tar.bz2) = b9a3d207b78755c49c49bf780815f3b25fd16b6c23f3815cdeb41b5c7d685185
-SIZE (gnome2/gnome-applets-2.24.3.1.tar.bz2) = 7880607
+MD5 (gnome2/gnome-applets-2.26.0.tar.bz2) = eed64366b0a1f4032506ac7221ce898a
+SHA256 (gnome2/gnome-applets-2.26.0.tar.bz2) = fec614c75bf26daab73489eae26021f358cfe371f0b70ea1d1ad32a5d6e1761e
+SIZE (gnome2/gnome-applets-2.26.0.tar.bz2) = 8602310
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 68f004ac32c3..2a93c03d1c47 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -147,6 +147,30 @@ share/gnome/help/accessx-status/ca/figures/accessx_sticky-keys.png
share/gnome/help/accessx-status/ca/figures/accessx_sticky-meta-key.png
share/gnome/help/accessx-status/ca/figures/accessx_sticky-shift-key.png
share/gnome/help/accessx-status/ca/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/cs/accessx-status.xml
+share/gnome/help/accessx-status/cs/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/cs/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/cs/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/cs/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/cs/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/cs/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/cs/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/cs/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/cs/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/cs/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/cs/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/de/accessx-status.xml
+share/gnome/help/accessx-status/de/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/de/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/de/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/de/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/de/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/de/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/de/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/de/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/de/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/de/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/de/figures/accessx_sticky-windows-key.png
share/gnome/help/accessx-status/el/accessx-status.xml
share/gnome/help/accessx-status/el/figures/accessx-status-applet.png
share/gnome/help/accessx-status/el/figures/accessx-status-disabled.png
@@ -183,6 +207,18 @@ share/gnome/help/accessx-status/es/figures/accessx_sticky-keys.png
share/gnome/help/accessx-status/es/figures/accessx_sticky-meta-key.png
share/gnome/help/accessx-status/es/figures/accessx_sticky-shift-key.png
share/gnome/help/accessx-status/es/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/eu/accessx-status.xml
+share/gnome/help/accessx-status/eu/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/eu/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/eu/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/eu/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/eu/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/eu/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/eu/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/eu/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/eu/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/eu/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/eu/figures/accessx_sticky-windows-key.png
share/gnome/help/accessx-status/fi/accessx-status.xml
share/gnome/help/accessx-status/fi/figures/accessx-status-applet.png
share/gnome/help/accessx-status/fi/figures/accessx-status-disabled.png
@@ -316,6 +352,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-credits-hal.png
%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-preferences.png
%%BATTERY%%share/gnome/help/battstat/es/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/eu/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/eu/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/eu/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/eu/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/eu/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/eu/figures/context-menu.png
%%BATTERY%%share/gnome/help/battstat/fi/battstat.xml
%%BATTERY%%share/gnome/help/battstat/fi/figures/battstat-applet-expanded.png
%%BATTERY%%share/gnome/help/battstat/fi/figures/battstat-applet.png
@@ -395,6 +437,12 @@ share/gnome/help/char-palette/es/figures/charpalette_applet.png
share/gnome/help/char-palette/es/figures/charpalette_chargroup.png
share/gnome/help/char-palette/es/figures/charpick-preferences.png
share/gnome/help/char-palette/es/figures/charpick_characters.png
+share/gnome/help/char-palette/eu/char-palette.xml
+share/gnome/help/char-palette/eu/figures/charpalette_applet.png
+share/gnome/help/char-palette/eu/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/eu/figures/charpick-preferences.png
+share/gnome/help/char-palette/eu/figures/charpick_characters.png
+share/gnome/help/cpufreq-applet/eu/cpufreq-applet.xml
share/gnome/help/char-palette/fi/char-palette.xml
share/gnome/help/char-palette/fi/figures/charpalette_applet.png
share/gnome/help/char-palette/fi/figures/charpalette_chargroup.png
@@ -450,6 +498,10 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
%%COMMANDER%%share/gnome/help/command-line/C/figures/prefs-macros.png
%%COMMANDER%%share/gnome/help/command-line/C/figures/prefs.png
%%COMMANDER%%share/gnome/help/command-line/C/legal.xml
+%%COMMANDER%%share/gnome/help/command-line/de/command-line.xml
+%%COMMANDER%%share/gnome/help/command-line/de/figures/command-line.png
+%%COMMANDER%%share/gnome/help/command-line/de/figures/prefs-macros.png
+%%COMMANDER%%share/gnome/help/command-line/de/figures/prefs.png
%%COMMANDER%%share/gnome/help/command-line/el/command-line.xml
%%COMMANDER%%share/gnome/help/command-line/el/figures/command-line.png
%%COMMANDER%%share/gnome/help/command-line/el/figures/prefs-macros.png
@@ -462,6 +514,10 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
%%COMMANDER%%share/gnome/help/command-line/es/figures/command-line.png
%%COMMANDER%%share/gnome/help/command-line/es/figures/prefs-macros.png
%%COMMANDER%%share/gnome/help/command-line/es/figures/prefs.png
+%%COMMANDER%%share/gnome/help/command-line/eu/command-line.xml
+%%COMMANDER%%share/gnome/help/command-line/eu/figures/command-line.png
+%%COMMANDER%%share/gnome/help/command-line/eu/figures/prefs-macros.png
+%%COMMANDER%%share/gnome/help/command-line/eu/figures/prefs.png
%%COMMANDER%%share/gnome/help/command-line/fr/command-line.xml
%%COMMANDER%%share/gnome/help/command-line/fr/figures/command-line.png
%%COMMANDER%%share/gnome/help/command-line/fr/figures/prefs-macros.png
@@ -537,6 +593,15 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector-both.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/eu/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/eu/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/eu/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/eu/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/eu/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/eu/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/eu/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/eu/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/eu/figures/cpufreq-applet.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/fi/cpufreq-applet.xml
%%CPUFREQ%%share/gnome/help/cpufreq-applet/fi/figures/cpufreq-100.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/fi/figures/cpufreq-25.png
@@ -627,26 +692,6 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-selector-both.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-selector.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/cpufreq-applet.xml
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-100.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-25.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-50.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-75.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet-preferences-smp.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet-preferences.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet-selector-both.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet-selector.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/cpufreq-applet.xml
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-100.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-25.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-50.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-75.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet-preferences-smp.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet-preferences.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet-selector-both.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet-selector.png
-%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet.png
share/gnome/help/drivemount/C/drivemount.xml
share/gnome/help/drivemount/C/figures/drivemount-applet_eject.png
share/gnome/help/drivemount/C/figures/drivemount-applet_example.png
@@ -672,6 +717,12 @@ share/gnome/help/drivemount/es/figures/drivemount-applet_example.png
share/gnome/help/drivemount/es/figures/drivemount-applet_mount.png
share/gnome/help/drivemount/es/figures/drivemount-applet_open.png
share/gnome/help/drivemount/es/figures/drivemount-applet_status.png
+share/gnome/help/drivemount/eu/drivemount.xml
+share/gnome/help/drivemount/eu/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/eu/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/eu/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/eu/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/eu/figures/drivemount-applet_status.png
share/gnome/help/drivemount/fi/drivemount.xml
share/gnome/help/drivemount/fi/figures/drivemount-applet_eject.png
share/gnome/help/drivemount/fi/figures/drivemount-applet_example.png
@@ -739,6 +790,8 @@ share/gnome/help/geyes/bg/figures/geyes_applet.png
share/gnome/help/geyes/bg/geyes.xml
share/gnome/help/geyes/ca/figures/geyes_applet.png
share/gnome/help/geyes/ca/geyes.xml
+share/gnome/help/geyes/cs/figures/geyes_applet.png
+share/gnome/help/geyes/cs/geyes.xml
share/gnome/help/geyes/da/figures/geyes_applet.png
share/gnome/help/geyes/da/geyes.xml
share/gnome/help/geyes/de/figures/geyes_applet.png
@@ -747,6 +800,8 @@ share/gnome/help/geyes/en_GB/figures/geyes_applet.png
share/gnome/help/geyes/en_GB/geyes.xml
share/gnome/help/geyes/es/figures/geyes_applet.png
share/gnome/help/geyes/es/geyes.xml
+share/gnome/help/geyes/eu/figures/geyes_applet.png
+share/gnome/help/geyes/eu/geyes.xml
share/gnome/help/geyes/fi/figures/geyes_applet.png
share/gnome/help/geyes/fi/geyes.xml
share/gnome/help/geyes/fr/figures/geyes_applet.png
@@ -766,9 +821,12 @@ share/gnome/help/geyes/uk/geyes.xml
share/gnome/help/gswitchit/C/gswitchit.xml
share/gnome/help/gswitchit/C/legal.xml
share/gnome/help/gswitchit/ca/gswitchit.xml
+share/gnome/help/gswitchit/cs/gswitchit.xml
+share/gnome/help/gswitchit/de/gswitchit.xml
share/gnome/help/gswitchit/el/gswitchit.xml
share/gnome/help/gswitchit/en_GB/gswitchit.xml
share/gnome/help/gswitchit/es/gswitchit.xml
+share/gnome/help/gswitchit/eu/gswitchit.xml
share/gnome/help/gswitchit/fi/gswitchit.xml
share/gnome/help/gswitchit/fr/gswitchit.xml
share/gnome/help/gswitchit/oc/gswitchit.xml
@@ -836,6 +894,21 @@ share/gnome/help/gweather/es/figures/stock_weather-snow.png
share/gnome/help/gweather/es/figures/stock_weather-storm.png
share/gnome/help/gweather/es/figures/stock_weather-sunny.png
share/gnome/help/gweather/es/gweather.xml
+share/gnome/help/gweather/eu/figures/gweather-details.png
+share/gnome/help/gweather/eu/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/eu/figures/gweather-prefs-general.png
+share/gnome/help/gweather/eu/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/eu/figures/gweather_applet.png
+share/gnome/help/gweather/eu/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/eu/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/eu/figures/stock_weather-fog.png
+share/gnome/help/gweather/eu/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/eu/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/eu/figures/stock_weather-showers.png
+share/gnome/help/gweather/eu/figures/stock_weather-snow.png
+share/gnome/help/gweather/eu/figures/stock_weather-storm.png
+share/gnome/help/gweather/eu/figures/stock_weather-sunny.png
+share/gnome/help/gweather/eu/gweather.xml
share/gnome/help/gweather/fi/figures/gweather-details.png
share/gnome/help/gweather/fi/figures/gweather-menu-prefs.png
share/gnome/help/gweather/fi/figures/gweather-prefs-general.png
@@ -986,8 +1059,25 @@ share/gnome/help/gweather/uk/figures/stock_weather-snow.png
share/gnome/help/gweather/uk/figures/stock_weather-storm.png
share/gnome/help/gweather/uk/figures/stock_weather-sunny.png
share/gnome/help/gweather/uk/gweather.xml
+share/gnome/help/gweather/zh_CN/figures/gweather-details.png
+share/gnome/help/gweather/zh_CN/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/zh_CN/figures/gweather-prefs-general.png
+share/gnome/help/gweather/zh_CN/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/zh_CN/figures/gweather_applet.png
+share/gnome/help/gweather/zh_CN/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/zh_CN/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/zh_CN/figures/stock_weather-fog.png
+share/gnome/help/gweather/zh_CN/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/zh_CN/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/zh_CN/figures/stock_weather-showers.png
+share/gnome/help/gweather/zh_CN/figures/stock_weather-snow.png
+share/gnome/help/gweather/zh_CN/figures/stock_weather-storm.png
+share/gnome/help/gweather/zh_CN/figures/stock_weather-sunny.png
+share/gnome/help/gweather/zh_CN/gweather.xml
%%PYTHON%%share/gnome/help/invest-applet/C/invest-applet.xml
%%PYTHON%%share/gnome/help/invest-applet/C/legal.xml
+%%PYTHON%%share/gnome/help/invest-applet/en_GB/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/de/invest-applet.xml
%%PYTHON%%share/gnome/help/invest-applet/el/invest-applet.xml
%%PYTHON%%share/gnome/help/invest-applet/es/invest-applet.xml
%%PYTHON%%share/gnome/help/invest-applet/fi/invest-applet.xml
@@ -997,6 +1087,8 @@ share/gnome/help/mixer_applet2/C/legal.xml
share/gnome/help/mixer_applet2/C/mixer_applet2.xml
share/gnome/help/mixer_applet2/ca/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/ca/mixer_applet2.xml
+share/gnome/help/mixer_applet2/cs/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/cs/mixer_applet2.xml
share/gnome/help/mixer_applet2/de/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/de/mixer_applet2.xml
share/gnome/help/mixer_applet2/el/figures/volumecontrol_applet.png
@@ -1005,6 +1097,8 @@ share/gnome/help/mixer_applet2/en_GB/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/en_GB/mixer_applet2.xml
share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/es/mixer_applet2.xml
+share/gnome/help/mixer_applet2/eu/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/eu/mixer_applet2.xml
share/gnome/help/mixer_applet2/fi/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/fi/mixer_applet2.xml
share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png
@@ -1036,6 +1130,10 @@ share/gnome/help/multiload/ca/figures/multiload-preferences.png
share/gnome/help/multiload/ca/figures/system-monitor-applet_window.png
share/gnome/help/multiload/ca/figures/system_monitor.png
share/gnome/help/multiload/ca/multiload.xml
+share/gnome/help/multiload/de/figures/multiload-preferences.png
+share/gnome/help/multiload/de/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/de/figures/system_monitor.png
+share/gnome/help/multiload/de/multiload.xml
share/gnome/help/multiload/en_GB/figures/multiload-preferences.png
share/gnome/help/multiload/en_GB/figures/system-monitor-applet_window.png
share/gnome/help/multiload/en_GB/figures/system_monitor.png
@@ -1044,6 +1142,10 @@ share/gnome/help/multiload/es/figures/multiload-preferences.png
share/gnome/help/multiload/es/figures/system-monitor-applet_window.png
share/gnome/help/multiload/es/figures/system_monitor.png
share/gnome/help/multiload/es/multiload.xml
+share/gnome/help/multiload/eu/figures/multiload-preferences.png
+share/gnome/help/multiload/eu/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/eu/figures/system_monitor.png
+share/gnome/help/multiload/eu/multiload.xml
share/gnome/help/multiload/fi/figures/multiload-preferences.png
share/gnome/help/multiload/fi/figures/system-monitor-applet_window.png
share/gnome/help/multiload/fi/figures/system_monitor.png
@@ -1056,10 +1158,6 @@ share/gnome/help/multiload/ko/figures/multiload-preferences.png
share/gnome/help/multiload/ko/figures/system-monitor-applet_window.png
share/gnome/help/multiload/ko/figures/system_monitor.png
share/gnome/help/multiload/ko/multiload.xml
-share/gnome/help/multiload/nl/figures/multiload-preferences.png
-share/gnome/help/multiload/nl/figures/system-monitor-applet_window.png
-share/gnome/help/multiload/nl/figures/system_monitor.png
-share/gnome/help/multiload/nl/multiload.xml
share/gnome/help/multiload/oc/figures/multiload-preferences.png
share/gnome/help/multiload/oc/figures/system-monitor-applet_window.png
share/gnome/help/multiload/oc/figures/system_monitor.png
@@ -1121,6 +1219,12 @@ share/gnome/help/stickynotes_applet/es/figures/stickynotes-note-prefs.png
share/gnome/help/stickynotes_applet/es/figures/stickynotes-prefs.png
share/gnome/help/stickynotes_applet/es/figures/stickynotes_applet.png
share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/eu/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/eu/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/eu/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/eu/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/eu/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/eu/stickynotes_applet.xml
share/gnome/help/stickynotes_applet/fi/figures/stickynote-right-menu-lock.png
share/gnome/help/stickynotes_applet/fi/figures/stickynote-right-menu-new.png
share/gnome/help/stickynotes_applet/fi/figures/stickynotes-note-prefs.png
@@ -1180,6 +1284,8 @@ share/gnome/help/trashapplet/C/legal.xml
share/gnome/help/trashapplet/C/trashapplet.xml
share/gnome/help/trashapplet/ca/figures/trash-applet.png
share/gnome/help/trashapplet/ca/trashapplet.xml
+share/gnome/help/trashapplet/cs/figures/trash-applet.png
+share/gnome/help/trashapplet/cs/trashapplet.xml
share/gnome/help/trashapplet/da/figures/trash-applet.png
share/gnome/help/trashapplet/da/trashapplet.xml
share/gnome/help/trashapplet/de/figures/trash-applet.png
@@ -1190,6 +1296,8 @@ share/gnome/help/trashapplet/en_GB/figures/trash-applet.png
share/gnome/help/trashapplet/en_GB/trashapplet.xml
share/gnome/help/trashapplet/es/figures/trash-applet.png
share/gnome/help/trashapplet/es/trashapplet.xml
+share/gnome/help/trashapplet/eu/figures/trash-applet.png
+share/gnome/help/trashapplet/eu/trashapplet.xml
share/gnome/help/trashapplet/fi/figures/trash-applet.png
share/gnome/help/trashapplet/fi/trashapplet.xml
share/gnome/help/trashapplet/fr/figures/trash-applet.png
@@ -1212,10 +1320,6 @@ share/gnome/help/trashapplet/sv/figures/trash-applet.png
share/gnome/help/trashapplet/sv/trashapplet.xml
share/gnome/help/trashapplet/uk/figures/trash-applet.png
share/gnome/help/trashapplet/uk/trashapplet.xml
-share/gnome/help/trashapplet/zh_HK/figures/trash-applet.png
-share/gnome/help/trashapplet/zh_HK/trashapplet.xml
-share/gnome/help/trashapplet/zh_TW/figures/trash-applet.png
-share/gnome/help/trashapplet/zh_TW/trashapplet.xml
%%CPUFREQ%%share/icons/hicolor/16x16/apps/gnome-cpu-frequency-applet.png
share/icons/hicolor/16x16/apps/gnome-eyes-applet.png
share/icons/hicolor/16x16/apps/gnome-sticky-notes-applet.png
@@ -1237,6 +1341,7 @@ share/icons/hicolor/48x48/apps/ax-applet.png
share/icons/hicolor/scalable/apps/gnome-eyes-applet.svg
share/icons/hicolor/scalable/apps/gnome-sticky-notes-applet.svg
%%PYTHON%%share/icons/hicolor/scalable/apps/invest-applet.svg
+share/locale/af/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/am/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/as/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1341,9 +1446,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
share/omf/accessx-status/accessx-status-C.omf
share/omf/accessx-status/accessx-status-bg.omf
share/omf/accessx-status/accessx-status-ca.omf
+share/omf/accessx-status/accessx-status-cs.omf
+share/omf/accessx-status/accessx-status-de.omf
share/omf/accessx-status/accessx-status-el.omf
share/omf/accessx-status/accessx-status-en_GB.omf
share/omf/accessx-status/accessx-status-es.omf
+share/omf/accessx-status/accessx-status-eu.omf
share/omf/accessx-status/accessx-status-fi.omf
share/omf/accessx-status/accessx-status-fr.omf
share/omf/accessx-status/accessx-status-it.omf
@@ -1358,6 +1466,7 @@ share/omf/accessx-status/accessx-status-uk.omf
%%BATTERY%%share/omf/battstat/battstat-el.omf
%%BATTERY%%share/omf/battstat/battstat-en_GB.omf
%%BATTERY%%share/omf/battstat/battstat-es.omf
+%%BATTERY%%share/omf/battstat/battstat-eu.omf
%%BATTERY%%share/omf/battstat/battstat-fi.omf
%%BATTERY%%share/omf/battstat/battstat-fr.omf
%%BATTERY%%share/omf/battstat/battstat-ko.omf
@@ -1372,6 +1481,7 @@ share/omf/char-palette/char-palette-ca.omf
share/omf/char-palette/char-palette-de.omf
share/omf/char-palette/char-palette-en_GB.omf
share/omf/char-palette/char-palette-es.omf
+share/omf/char-palette/char-palette-eu.omf
share/omf/char-palette/char-palette-fi.omf
share/omf/char-palette/char-palette-fr.omf
share/omf/char-palette/char-palette-it.omf
@@ -1383,9 +1493,11 @@ share/omf/char-palette/char-palette-ru.omf
share/omf/char-palette/char-palette-sv.omf
share/omf/char-palette/char-palette-uk.omf
%%COMMANDER%%share/omf/command-line/command-line-C.omf
+%%COMMANDER%%share/omf/command-line/command-line-de.omf
%%COMMANDER%%share/omf/command-line/command-line-el.omf
%%COMMANDER%%share/omf/command-line/command-line-en_GB.omf
%%COMMANDER%%share/omf/command-line/command-line-es.omf
+%%COMMANDER%%share/omf/command-line/command-line-eu.omf
%%COMMANDER%%share/omf/command-line/command-line-fr.omf
%%COMMANDER%%share/omf/command-line/command-line-ko.omf
%%COMMANDER%%share/omf/command-line/command-line-oc.omf
@@ -1397,6 +1509,7 @@ share/omf/char-palette/char-palette-uk.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-de.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-en_GB.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-es.omf
+%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-eu.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-fi.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-fr.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-nl.omf
@@ -1406,12 +1519,11 @@ share/omf/char-palette/char-palette-uk.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-sv.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-uk.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-zh_CN.omf
-%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-zh_HK.omf
-%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-zh_TW.omf
share/omf/drivemount/drivemount-C.omf
share/omf/drivemount/drivemount-de.omf
share/omf/drivemount/drivemount-en_GB.omf
share/omf/drivemount/drivemount-es.omf
+share/omf/drivemount/drivemount-eu.omf
share/omf/drivemount/drivemount-fi.omf
share/omf/drivemount/drivemount-fr.omf
share/omf/drivemount/drivemount-it.omf
@@ -1425,10 +1537,12 @@ share/omf/drivemount/drivemount-zh_CN.omf
share/omf/geyes/geyes-C.omf
share/omf/geyes/geyes-bg.omf
share/omf/geyes/geyes-ca.omf
+share/omf/geyes/geyes-cs.omf
share/omf/geyes/geyes-da.omf
share/omf/geyes/geyes-de.omf
share/omf/geyes/geyes-en_GB.omf
share/omf/geyes/geyes-es.omf
+share/omf/geyes/geyes-eu.omf
share/omf/geyes/geyes-fi.omf
share/omf/geyes/geyes-fr.omf
share/omf/geyes/geyes-it.omf
@@ -1439,9 +1553,12 @@ share/omf/geyes/geyes-sv.omf
share/omf/geyes/geyes-uk.omf
share/omf/gswitchit/gswitchit-C.omf
share/omf/gswitchit/gswitchit-ca.omf
+share/omf/gswitchit/gswitchit-cs.omf
+share/omf/gswitchit/gswitchit-de.omf
share/omf/gswitchit/gswitchit-el.omf
share/omf/gswitchit/gswitchit-en_GB.omf
share/omf/gswitchit/gswitchit-es.omf
+share/omf/gswitchit/gswitchit-eu.omf
share/omf/gswitchit/gswitchit-fi.omf
share/omf/gswitchit/gswitchit-fr.omf
share/omf/gswitchit/gswitchit-oc.omf
@@ -1452,6 +1569,7 @@ share/omf/gweather/gweather-C.omf
share/omf/gweather/gweather-de.omf
share/omf/gweather/gweather-en_GB.omf
share/omf/gweather/gweather-es.omf
+share/omf/gweather/gweather-eu.omf
share/omf/gweather/gweather-fi.omf
share/omf/gweather/gweather-fr.omf
share/omf/gweather/gweather-ko.omf
@@ -1462,17 +1580,22 @@ share/omf/gweather/gweather-pt_BR.omf
share/omf/gweather/gweather-ru.omf
share/omf/gweather/gweather-sv.omf
share/omf/gweather/gweather-uk.omf
+share/omf/gweather/gweather-zh_CN.omf
%%PYTHON%%share/omf/invest-applet/invest-applet-C.omf
+%%PYTHON%%share/omf/invest-applet/invest-applet-de.omf
+%%PYTHON%%share/omf/invest-applet/invest-applet-en_GB.omf
%%PYTHON%%share/omf/invest-applet/invest-applet-el.omf
%%PYTHON%%share/omf/invest-applet/invest-applet-es.omf
%%PYTHON%%share/omf/invest-applet/invest-applet-fi.omf
%%PYTHON%%share/omf/invest-applet/invest-applet-sv.omf
share/omf/mixer_applet2/mixer_applet2-C.omf
share/omf/mixer_applet2/mixer_applet2-ca.omf
+share/omf/mixer_applet2/mixer_applet2-cs.omf
share/omf/mixer_applet2/mixer_applet2-de.omf
share/omf/mixer_applet2/mixer_applet2-el.omf
share/omf/mixer_applet2/mixer_applet2-en_GB.omf
share/omf/mixer_applet2/mixer_applet2-es.omf
+share/omf/mixer_applet2/mixer_applet2-eu.omf
share/omf/mixer_applet2/mixer_applet2-fi.omf
share/omf/mixer_applet2/mixer_applet2-fr.omf
share/omf/mixer_applet2/mixer_applet2-hu.omf
@@ -1486,12 +1609,13 @@ share/omf/mixer_applet2/mixer_applet2-sv.omf
share/omf/mixer_applet2/mixer_applet2-uk.omf
share/omf/multiload/multiload-C.omf
share/omf/multiload/multiload-ca.omf
+share/omf/multiload/multiload-de.omf
share/omf/multiload/multiload-en_GB.omf
share/omf/multiload/multiload-es.omf
+share/omf/multiload/multiload-eu.omf
share/omf/multiload/multiload-fi.omf
share/omf/multiload/multiload-fr.omf
share/omf/multiload/multiload-ko.omf
-share/omf/multiload/multiload-nl.omf
share/omf/multiload/multiload-oc.omf
share/omf/multiload/multiload-pa.omf
share/omf/multiload/multiload-pt_BR.omf
@@ -1504,6 +1628,7 @@ share/omf/stickynotes_applet/stickynotes_applet-de.omf
share/omf/stickynotes_applet/stickynotes_applet-el.omf
share/omf/stickynotes_applet/stickynotes_applet-en_GB.omf
share/omf/stickynotes_applet/stickynotes_applet-es.omf
+share/omf/stickynotes_applet/stickynotes_applet-eu.omf
share/omf/stickynotes_applet/stickynotes_applet-fi.omf
share/omf/stickynotes_applet/stickynotes_applet-fr.omf
share/omf/stickynotes_applet/stickynotes_applet-ko.omf
@@ -1515,11 +1640,13 @@ share/omf/stickynotes_applet/stickynotes_applet-sv.omf
share/omf/stickynotes_applet/stickynotes_applet-uk.omf
share/omf/trashapplet/trashapplet-C.omf
share/omf/trashapplet/trashapplet-ca.omf
+share/omf/trashapplet/trashapplet-cs.omf
share/omf/trashapplet/trashapplet-da.omf
share/omf/trashapplet/trashapplet-de.omf
share/omf/trashapplet/trashapplet-el.omf
share/omf/trashapplet/trashapplet-en_GB.omf
share/omf/trashapplet/trashapplet-es.omf
+share/omf/trashapplet/trashapplet-eu.omf
share/omf/trashapplet/trashapplet-fi.omf
share/omf/trashapplet/trashapplet-fr.omf
share/omf/trashapplet/trashapplet-hu.omf
@@ -1531,8 +1658,6 @@ share/omf/trashapplet/trashapplet-pt_BR.omf
share/omf/trashapplet/trashapplet-ru.omf
share/omf/trashapplet/trashapplet-sv.omf
share/omf/trashapplet/trashapplet-uk.omf
-share/omf/trashapplet/trashapplet-zh_HK.omf
-share/omf/trashapplet/trashapplet-zh_TW.omf
share/pixmaps/accessx-status-applet/ax-applet.png
share/pixmaps/accessx-status-applet/ax-bouncekeys.png
share/pixmaps/accessx-status-applet/ax-key-base.png
@@ -1682,10 +1807,6 @@ share/xmodmap/xmodmap.yu
@dirrm share/omf/char-palette
%%BATTERY%%@dirrm share/omf/battstat
@dirrm share/omf/accessx-status
-@dirrm share/gnome/help/trashapplet/zh_TW/figures
-@dirrm share/gnome/help/trashapplet/zh_TW
-@dirrm share/gnome/help/trashapplet/zh_HK/figures
-@dirrm share/gnome/help/trashapplet/zh_HK
@dirrm share/gnome/help/trashapplet/uk/figures
@dirrm share/gnome/help/trashapplet/uk
@dirrm share/gnome/help/trashapplet/sv/figures
@@ -1708,6 +1829,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/trashapplet/fr
@dirrm share/gnome/help/trashapplet/fi/figures
@dirrm share/gnome/help/trashapplet/fi
+@dirrm share/gnome/help/trashapplet/eu/figures
+@dirrm share/gnome/help/trashapplet/eu
@dirrm share/gnome/help/trashapplet/es/figures
@dirrm share/gnome/help/trashapplet/es
@dirrm share/gnome/help/trashapplet/en_GB/figures
@@ -1718,6 +1841,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/trashapplet/de
@dirrm share/gnome/help/trashapplet/da/figures
@dirrm share/gnome/help/trashapplet/da
+@dirrm share/gnome/help/trashapplet/cs/figures
+@dirrm share/gnome/help/trashapplet/cs
@dirrm share/gnome/help/trashapplet/ca/figures
@dirrm share/gnome/help/trashapplet/ca
@dirrm share/gnome/help/trashapplet/C/figures
@@ -1741,6 +1866,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/stickynotes_applet/fr
@dirrm share/gnome/help/stickynotes_applet/fi/figures
@dirrm share/gnome/help/stickynotes_applet/fi
+@dirrm share/gnome/help/stickynotes_applet/eu/figures
+@dirrm share/gnome/help/stickynotes_applet/eu
@dirrm share/gnome/help/stickynotes_applet/es/figures
@dirrm share/gnome/help/stickynotes_applet/es
@dirrm share/gnome/help/stickynotes_applet/en_GB/figures
@@ -1766,18 +1893,20 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/multiload/pa
@dirrm share/gnome/help/multiload/oc/figures
@dirrm share/gnome/help/multiload/oc
-@dirrm share/gnome/help/multiload/nl/figures
-@dirrm share/gnome/help/multiload/nl
@dirrm share/gnome/help/multiload/ko/figures
@dirrm share/gnome/help/multiload/ko
@dirrm share/gnome/help/multiload/fr/figures
@dirrm share/gnome/help/multiload/fr
@dirrm share/gnome/help/multiload/fi/figures
@dirrm share/gnome/help/multiload/fi
+@dirrm share/gnome/help/multiload/eu/figures
+@dirrm share/gnome/help/multiload/eu
@dirrm share/gnome/help/multiload/es/figures
@dirrm share/gnome/help/multiload/es
@dirrm share/gnome/help/multiload/en_GB/figures
@dirrm share/gnome/help/multiload/en_GB
+@dirrm share/gnome/help/multiload/de/figures
+@dirrm share/gnome/help/multiload/de
@dirrm share/gnome/help/multiload/ca/figures
@dirrm share/gnome/help/multiload/ca
@dirrm share/gnome/help/multiload/C/figures
@@ -1805,6 +1934,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/mixer_applet2/fr
@dirrm share/gnome/help/mixer_applet2/fi/figures
@dirrm share/gnome/help/mixer_applet2/fi
+@dirrm share/gnome/help/mixer_applet2/eu/figures
+@dirrm share/gnome/help/mixer_applet2/eu
@dirrm share/gnome/help/mixer_applet2/es/figures
@dirrm share/gnome/help/mixer_applet2/es
@dirrm share/gnome/help/mixer_applet2/en_GB/figures
@@ -1813,6 +1944,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/mixer_applet2/el
@dirrm share/gnome/help/mixer_applet2/de/figures
@dirrm share/gnome/help/mixer_applet2/de
+@dirrm share/gnome/help/mixer_applet2/cs/figures
+@dirrm share/gnome/help/mixer_applet2/cs
@dirrm share/gnome/help/mixer_applet2/ca/figures
@dirrm share/gnome/help/mixer_applet2/ca
@dirrm share/gnome/help/mixer_applet2/C/figures
@@ -1822,8 +1955,12 @@ share/xmodmap/xmodmap.yu
%%PYTHON%%@dirrm share/gnome/help/invest-applet/fi
%%PYTHON%%@dirrm share/gnome/help/invest-applet/es
%%PYTHON%%@dirrm share/gnome/help/invest-applet/el
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/en_GB
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/de
%%PYTHON%%@dirrm share/gnome/help/invest-applet/C
%%PYTHON%%@dirrm share/gnome/help/invest-applet
+@dirrm share/gnome/help/gweather/zh_CN/figures
+@dirrm share/gnome/help/gweather/zh_CN
@dirrm share/gnome/help/gweather/uk/figures
@dirrm share/gnome/help/gweather/uk
@dirrm share/gnome/help/gweather/sv/figures
@@ -1844,6 +1981,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/gweather/fr
@dirrm share/gnome/help/gweather/fi/figures
@dirrm share/gnome/help/gweather/fi
+@dirrm share/gnome/help/gweather/eu/figures
+@dirrm share/gnome/help/gweather/eu
@dirrm share/gnome/help/gweather/es/figures
@dirrm share/gnome/help/gweather/es
@dirrm share/gnome/help/gweather/en_GB/figures
@@ -1859,9 +1998,12 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/gswitchit/oc
@dirrm share/gnome/help/gswitchit/fr
@dirrm share/gnome/help/gswitchit/fi
+@dirrm share/gnome/help/gswitchit/eu
@dirrm share/gnome/help/gswitchit/es
@dirrm share/gnome/help/gswitchit/en_GB
@dirrm share/gnome/help/gswitchit/el
+@dirrm share/gnome/help/gswitchit/de
+@dirrm share/gnome/help/gswitchit/cs
@dirrm share/gnome/help/gswitchit/ca
@dirrm share/gnome/help/gswitchit/C
@dirrm share/gnome/help/gswitchit
@@ -1881,6 +2023,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/geyes/fr
@dirrm share/gnome/help/geyes/fi/figures
@dirrm share/gnome/help/geyes/fi
+@dirrm share/gnome/help/geyes/eu/figures
+@dirrm share/gnome/help/geyes/eu
@dirrm share/gnome/help/geyes/es/figures
@dirrm share/gnome/help/geyes/es
@dirrm share/gnome/help/geyes/en_GB/figures
@@ -1889,6 +2033,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/geyes/de
@dirrm share/gnome/help/geyes/da/figures
@dirrm share/gnome/help/geyes/da
+@dirrm share/gnome/help/geyes/cs/figures
+@dirrm share/gnome/help/geyes/cs
@dirrm share/gnome/help/geyes/ca/figures
@dirrm share/gnome/help/geyes/ca
@dirrm share/gnome/help/geyes/bg/figures
@@ -1916,6 +2062,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/drivemount/fr
@dirrm share/gnome/help/drivemount/fi/figures
@dirrm share/gnome/help/drivemount/fi
+@dirrm share/gnome/help/drivemount/eu/figures
+@dirrm share/gnome/help/drivemount/eu
@dirrm share/gnome/help/drivemount/es/figures
@dirrm share/gnome/help/drivemount/es
@dirrm share/gnome/help/drivemount/en_GB/figures
@@ -1925,10 +2073,6 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/drivemount/C/figures
@dirrm share/gnome/help/drivemount/C
@dirrm share/gnome/help/drivemount
-%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_TW/figures
-%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_TW
-%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_HK/figures
-%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_HK
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_CN/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_CN
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures
@@ -1947,6 +2091,8 @@ share/xmodmap/xmodmap.yu
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fi/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fi
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/eu/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/eu
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB/figures
@@ -1970,12 +2116,16 @@ share/xmodmap/xmodmap.yu
%%COMMANDER%%@dirrm share/gnome/help/command-line/ko
%%COMMANDER%%@dirrm share/gnome/help/command-line/fr/figures
%%COMMANDER%%@dirrm share/gnome/help/command-line/fr
+%%COMMANDER%%@dirrm share/gnome/help/command-line/eu/figures
+%%COMMANDER%%@dirrm share/gnome/help/command-line/eu
%%COMMANDER%%@dirrm share/gnome/help/command-line/es/figures
%%COMMANDER%%@dirrm share/gnome/help/command-line/es
%%COMMANDER%%@dirrm share/gnome/help/command-line/en_GB/figures
%%COMMANDER%%@dirrm share/gnome/help/command-line/en_GB
%%COMMANDER%%@dirrm share/gnome/help/command-line/el/figures
%%COMMANDER%%@dirrm share/gnome/help/command-line/el
+%%COMMANDER%%@dirrm share/gnome/help/command-line/de/figures
+%%COMMANDER%%@dirrm share/gnome/help/command-line/de
%%COMMANDER%%@dirrm share/gnome/help/command-line/C/figures
%%COMMANDER%%@dirrm share/gnome/help/command-line/C
%%COMMANDER%%@dirrm share/gnome/help/command-line
@@ -1999,6 +2149,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/char-palette/fr
@dirrm share/gnome/help/char-palette/fi/figures
@dirrm share/gnome/help/char-palette/fi
+@dirrm share/gnome/help/char-palette/eu/figures
+@dirrm share/gnome/help/char-palette/eu
@dirrm share/gnome/help/char-palette/es/figures
@dirrm share/gnome/help/char-palette/es
@dirrm share/gnome/help/char-palette/en_GB/figures
@@ -2028,6 +2180,8 @@ share/xmodmap/xmodmap.yu
%%BATTERY%%@dirrm share/gnome/help/battstat/fr
%%BATTERY%%@dirrm share/gnome/help/battstat/fi/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/fi
+%%BATTERY%%@dirrm share/gnome/help/battstat/eu/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/eu
%%BATTERY%%@dirrm share/gnome/help/battstat/es/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/es
%%BATTERY%%@dirrm share/gnome/help/battstat/en_GB/figures
@@ -2057,12 +2211,18 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/accessx-status/fr
@dirrm share/gnome/help/accessx-status/fi/figures
@dirrm share/gnome/help/accessx-status/fi
+@dirrm share/gnome/help/accessx-status/eu/figures
+@dirrm share/gnome/help/accessx-status/eu
@dirrm share/gnome/help/accessx-status/es/figures
@dirrm share/gnome/help/accessx-status/es
@dirrm share/gnome/help/accessx-status/en_GB/figures
@dirrm share/gnome/help/accessx-status/en_GB
@dirrm share/gnome/help/accessx-status/el/figures
@dirrm share/gnome/help/accessx-status/el
+@dirrm share/gnome/help/accessx-status/de/figures
+@dirrm share/gnome/help/accessx-status/de
+@dirrm share/gnome/help/accessx-status/cs/figures
+@dirrm share/gnome/help/accessx-status/cs
@dirrm share/gnome/help/accessx-status/ca/figures
@dirrm share/gnome/help/accessx-status/ca
@dirrm share/gnome/help/accessx-status/bg/figures
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 5f9b0ada3b83..e75c0a5c1839 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-desktop/Makefile,v 1.154 2008/11/25 17:20:55 mezz Exp $
+# $MCom: ports/x11/gnome-desktop/Makefile,v 1.158 2009/03/17 23:02:03 kwm Exp $
#
PORTNAME= gnome-desktop
-PORTVERSION= 2.24.3
+PORTVERSION= 2.26.0
PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
@@ -40,6 +40,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN1= gnome-about.1
+post-patch:
+ @${REINPLACE_CMD} -e 's|xsltproc -o| xsltproc --nonet -o|g' \
+ ${WRKSRC}/desktop-docs/fdl/Makefile.in \
+ ${WRKSRC}/desktop-docs/gpl/Makefile.in \
+ ${WRKSRC}/desktop-docs/lgpl/Makefile.in
+
.include <bsd.port.mk>
.endif
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 960bf3767cad..23ed78cda401 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-desktop-2.24.3.tar.bz2) = 27579963a56d1d35a22e30c21666a500
-SHA256 (gnome2/gnome-desktop-2.24.3.tar.bz2) = 03b1e08ee1318820f538864e8db492a245848bd727da1412a62de51d4cb76e89
-SIZE (gnome2/gnome-desktop-2.24.3.tar.bz2) = 1509505
+MD5 (gnome2/gnome-desktop-2.26.0.tar.bz2) = 796fc830e0baff24381809a7abe012f8
+SHA256 (gnome2/gnome-desktop-2.26.0.tar.bz2) = 3b3fe18bc30ad60f1bbbb2bc2d2ec14a2f9babb9312eb4834395b5839b7d7ee9
+SIZE (gnome2/gnome-desktop-2.26.0.tar.bz2) = 3186127
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 9f51fab3dcd6..778cfb503f38 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -1,15 +1,16 @@
bin/gnome-about
include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
+include/gnome-desktop-2.0/libgnome/gnome-desktop-utils.h
include/gnome-desktop-2.0/libgnomeui/gnome-bg.h
-include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
-include/gnome-desktop-2.0/libgnomeui/gnome-hint.h
+include/gnome-desktop-2.0/libgnomeui/gnome-bg-crossfade.h
+include/gnome-desktop-2.0/libgnomeui/gnome-desktop-thumbnail.h
include/gnome-desktop-2.0/libgnomeui/gnome-rr-config.h
include/gnome-desktop-2.0/libgnomeui/gnome-rr-labeler.h
include/gnome-desktop-2.0/libgnomeui/gnome-rr.h
lib/libgnome-desktop-2.a
lib/libgnome-desktop-2.la
lib/libgnome-desktop-2.so
-lib/libgnome-desktop-2.so.7
+lib/libgnome-desktop-2.so.11
libdata/pkgconfig/gnome-desktop-2.0.pc
share/applications/gnome-about.desktop
share/gnome-about/contributors.list
@@ -29,6 +30,7 @@ share/gnome/help/fdl/C/fdl.xml
share/gnome/help/fdl/ar/fdl.xml
share/gnome/help/fdl/de/fdl.xml
share/gnome/help/fdl/es/fdl.xml
+share/gnome/help/fdl/eu/fdl.xml
share/gnome/help/fdl/fr/fdl.xml
share/gnome/help/fdl/hu/fdl.xml
share/gnome/help/fdl/ko/fdl.xml
@@ -42,6 +44,7 @@ share/gnome/help/gpl/ca/gpl.xml
share/gnome/help/gpl/cs/gpl.xml
share/gnome/help/gpl/de/gpl.xml
share/gnome/help/gpl/es/gpl.xml
+share/gnome/help/gpl/eu/gpl.xml
share/gnome/help/gpl/fi/gpl.xml
share/gnome/help/gpl/fr/gpl.xml
share/gnome/help/gpl/hu/gpl.xml
@@ -56,6 +59,7 @@ share/gnome/help/lgpl/C/lgpl.xml
share/gnome/help/lgpl/ar/lgpl.xml
share/gnome/help/lgpl/de/lgpl.xml
share/gnome/help/lgpl/es/lgpl.xml
+share/gnome/help/lgpl/eu/lgpl.xml
share/gnome/help/lgpl/fi/lgpl.xml
share/gnome/help/lgpl/fr/lgpl.xml
share/gnome/help/lgpl/hu/lgpl.xml
@@ -69,6 +73,7 @@ share/gnome/help/lgpl/zh_CN/lgpl.xml
share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/as/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ast/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -79,6 +84,7 @@ share/locale/bn_IN/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/br/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/crh/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -104,10 +110,12 @@ share/locale/hr/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/hy/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ig/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ka/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/kk/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -153,6 +161,7 @@ share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ur/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/uz/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/uz@cyrillic/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -167,6 +176,7 @@ share/omf/fdl/fdl-C.omf
share/omf/fdl/fdl-ar.omf
share/omf/fdl/fdl-de.omf
share/omf/fdl/fdl-es.omf
+share/omf/fdl/fdl-eu.omf
share/omf/fdl/fdl-fr.omf
share/omf/fdl/fdl-hu.omf
share/omf/fdl/fdl-ko.omf
@@ -180,6 +190,7 @@ share/omf/gpl/gpl-ca.omf
share/omf/gpl/gpl-cs.omf
share/omf/gpl/gpl-de.omf
share/omf/gpl/gpl-es.omf
+share/omf/gpl/gpl-eu.omf
share/omf/gpl/gpl-fi.omf
share/omf/gpl/gpl-fr.omf
share/omf/gpl/gpl-hu.omf
@@ -194,6 +205,7 @@ share/omf/lgpl/lgpl-C.omf
share/omf/lgpl/lgpl-ar.omf
share/omf/lgpl/lgpl-de.omf
share/omf/lgpl/lgpl-es.omf
+share/omf/lgpl/lgpl-eu.omf
share/omf/lgpl/lgpl-fi.omf
share/omf/lgpl/lgpl-fr.omf
share/omf/lgpl/lgpl-hu.omf
@@ -289,6 +301,7 @@ share/pixmaps/vnterm.xpm
@dirrm share/gnome/help/lgpl/hu
@dirrm share/gnome/help/lgpl/fr
@dirrm share/gnome/help/lgpl/fi
+@dirrm share/gnome/help/lgpl/eu
@dirrm share/gnome/help/lgpl/es
@dirrm share/gnome/help/lgpl/de
@dirrm share/gnome/help/lgpl/ar
@@ -302,6 +315,7 @@ share/pixmaps/vnterm.xpm
@dirrm share/gnome/help/gpl/hu
@dirrm share/gnome/help/gpl/fr
@dirrm share/gnome/help/gpl/fi
+@dirrm share/gnome/help/gpl/eu
@dirrm share/gnome/help/gpl/es
@dirrm share/gnome/help/gpl/de
@dirrm share/gnome/help/gpl/cs
@@ -314,6 +328,7 @@ share/pixmaps/vnterm.xpm
@dirrm share/gnome/help/fdl/ko
@dirrm share/gnome/help/fdl/hu
@dirrm share/gnome/help/fdl/fr
+@dirrm share/gnome/help/fdl/eu
@dirrm share/gnome/help/fdl/es
@dirrm share/gnome/help/fdl/de
@dirrm share/gnome/help/fdl/ar
@@ -364,15 +379,23 @@ share/pixmaps/vnterm.xpm
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/ig/LC_MESSAGES
+@dirrmtry share/locale/ig
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
@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/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 264061e79925..bc8a9fc65565 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-menus/Makefile,v 1.88 2008/11/25 17:27:09 mezz Exp $
+# $MCom: ports/x11/gnome-menus/Makefile,v 1.92 2009/03/17 22:49:00 kwm Exp $
#
PORTNAME= gnome-menus
-PORTVERSION= 2.24.2
+PORTVERSION= 2.26.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index 7786cd23a623..565c10d6f128 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-menus-2.24.2.tar.bz2) = ca8e25b031fd7024b3f9abe1c6865d2c
-SHA256 (gnome2/gnome-menus-2.24.2.tar.bz2) = c28cc72e69164533e4a64270486d18b58184920ec4f4b288758758a373d45d3c
-SIZE (gnome2/gnome-menus-2.24.2.tar.bz2) = 453261
+MD5 (gnome2/gnome-menus-2.26.0.tar.bz2) = 55fd07e67d8334de2e03e4e23c011452
+SHA256 (gnome2/gnome-menus-2.26.0.tar.bz2) = 84a97b6d74b14e27888a0f54759e570cb701400c5b176471871bc08a6acafb15
+SIZE (gnome2/gnome-menus-2.26.0.tar.bz2) = 460779
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index 117cf47d31ab..9c9e270edb4a 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -30,6 +30,7 @@ share/desktop-directories/Utility.directory
share/desktop-directories/X-GNOME-Menu-Applications.directory
share/desktop-directories/X-GNOME-Menu-System.directory
share/desktop-directories/X-GNOME-Other.directory
+share/gnome-menus/examples/gnome-menus-ls.py
share/locale/af/LC_MESSAGES/gnome-menus.mo
share/locale/ar/LC_MESSAGES/gnome-menus.mo
share/locale/as/LC_MESSAGES/gnome-menus.mo
@@ -41,6 +42,7 @@ share/locale/bn/LC_MESSAGES/gnome-menus.mo
share/locale/bn_IN/LC_MESSAGES/gnome-menus.mo
share/locale/br/LC_MESSAGES/gnome-menus.mo
share/locale/ca/LC_MESSAGES/gnome-menus.mo
+share/locale/crh/LC_MESSAGES/gnome-menus.mo
share/locale/cs/LC_MESSAGES/gnome-menus.mo
share/locale/cy/LC_MESSAGES/gnome-menus.mo
share/locale/da/LC_MESSAGES/gnome-menus.mo
@@ -61,12 +63,14 @@ share/locale/ga/LC_MESSAGES/gnome-menus.mo
share/locale/gl/LC_MESSAGES/gnome-menus.mo
share/locale/gn/LC_MESSAGES/gnome-menus.mo
share/locale/gu/LC_MESSAGES/gnome-menus.mo
+share/locale/ha/LC_MESSAGES/gnome-menus.mo
share/locale/he/LC_MESSAGES/gnome-menus.mo
share/locale/hi/LC_MESSAGES/gnome-menus.mo
share/locale/hr/LC_MESSAGES/gnome-menus.mo
share/locale/hu/LC_MESSAGES/gnome-menus.mo
share/locale/hy/LC_MESSAGES/gnome-menus.mo
share/locale/id/LC_MESSAGES/gnome-menus.mo
+share/locale/ig/LC_MESSAGES/gnome-menus.mo
share/locale/io/LC_MESSAGES/gnome-menus.mo
share/locale/is/LC_MESSAGES/gnome-menus.mo
share/locale/it/LC_MESSAGES/gnome-menus.mo
@@ -116,15 +120,18 @@ share/locale/uk/LC_MESSAGES/gnome-menus.mo
share/locale/uz@cyrillic/LC_MESSAGES/gnome-menus.mo
share/locale/vi/LC_MESSAGES/gnome-menus.mo
share/locale/xh/LC_MESSAGES/gnome-menus.mo
+share/locale/yo/LC_MESSAGES/gnome-menus.mo
share/locale/zh_CN/LC_MESSAGES/gnome-menus.mo
share/locale/zh_HK/LC_MESSAGES/gnome-menus.mo
share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
+@dirrm share/gnome-menus/examples
+@dirrm share/gnome-menus
@dirrmtry share/desktop-directories
@dirrm include/gnome-menus
-@dirrmtry etc/xdg/menus
-@dirrmtry etc/xdg
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/yo/LC_MESSAGES
+@dirrmtry share/locale/yo
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
@@ -157,14 +164,20 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/kk
@dirrmtry share/locale/io/LC_MESSAGES
@dirrmtry share/locale/io
+@dirrmtry share/locale/ig/LC_MESSAGES
+@dirrmtry share/locale/ig
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/ha/LC_MESSAGES
+@dirrmtry share/locale/ha
@dirrmtry share/locale/gn/LC_MESSAGES
@dirrmtry share/locale/gn
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@@ -173,3 +186,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+@dirrmtry etc/xdg/menus
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 8e4ac0fcd1ab..6b28ff3f50a8 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-panel/Makefile,v 1.195 2009/01/10 01:59:22 mezz Exp $
+# $MCom: ports/x11/gnome-panel/Makefile,v 1.199 2009/03/17 23:22:06 kwm Exp $
#
PORTNAME= gnome-panel
-PORTVERSION= 2.24.3
+PORTVERSION= 2.26.0
PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
@@ -67,6 +67,11 @@ post-patch:
@${FIND} ${WRKSRC} -type f | \
${XARGS} -n 10 ${REINPLACE_CMD} -e \
's|"applications.menu"|"gnome-applications.menu"|'
+ @${REINPLACE_CMD} -e 's|xsltproc -o| xsltproc --nonet -o|g' \
+ ${WRKSRC}/help/clock/Makefile.in \
+ ${WRKSRC}/help/fish/Makefile.in \
+ ${WRKSRC}/help/window-list/Makefile.in \
+ ${WRKSRC}/help/workspace-switcher/Makefile.in
.include <bsd.port.post.mk>
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index dcd7fed718a1..3b6a87d5285e 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.24.3.tar.bz2) = 7a1ae8f3489c67708e2520823808649f
-SHA256 (gnome2/gnome-panel-2.24.3.tar.bz2) = 2b52f9cd5b3e028f5e67b75af6c484f21cd208e4403041ea1b4d831d67fc21b0
-SIZE (gnome2/gnome-panel-2.24.3.tar.bz2) = 3354686
+MD5 (gnome2/gnome-panel-2.26.0.tar.bz2) = 27965de9b12952b22b7e232af6acb0de
+SHA256 (gnome2/gnome-panel-2.26.0.tar.bz2) = e8e21b008d4afcebfc3241d0f91dd2dcc0b171b16f5675fc1b7ed699e79b56f3
+SIZE (gnome2/gnome-panel-2.26.0.tar.bz2) = 3421179
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 38e96fc0ae9f..9c17f80b1cc3 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -18,7 +18,6 @@ lib/libpanel-applet-2.so.0
libdata/bonobo/servers/GNOME_ClockApplet_Factory.server
libdata/bonobo/servers/GNOME_FishApplet_Factory.server
libdata/bonobo/servers/GNOME_NotificationAreaApplet.server
-libdata/bonobo/servers/GNOME_Panel.server
libdata/bonobo/servers/GNOME_Wncklet_Factory.server
libdata/pkgconfig/libpanelapplet-2.0.pc
libexec/clock-applet
@@ -73,15 +72,24 @@ share/gnome/help/clock/ar/legal.xml
share/gnome/help/clock/ca/clock.xml
share/gnome/help/clock/ca/figures/clock_applet.png
share/gnome/help/clock/ca/legal.xml
+share/gnome/help/clock/cs/clock.xml
+share/gnome/help/clock/cs/figures/clock_applet.png
+share/gnome/help/clock/cs/legal.xml
share/gnome/help/clock/de/clock.xml
share/gnome/help/clock/de/figures/clock_applet.png
share/gnome/help/clock/de/legal.xml
share/gnome/help/clock/el/clock.xml
share/gnome/help/clock/el/figures/clock_applet.png
share/gnome/help/clock/el/legal.xml
+share/gnome/help/clock/en_GB/clock.xml
+share/gnome/help/clock/en_GB/figures/clock_applet.png
+share/gnome/help/clock/en_GB/legal.xml
share/gnome/help/clock/es/clock.xml
share/gnome/help/clock/es/figures/clock_applet.png
share/gnome/help/clock/es/legal.xml
+share/gnome/help/clock/eu/clock.xml
+share/gnome/help/clock/eu/figures/clock_applet.png
+share/gnome/help/clock/eu/legal.xml
share/gnome/help/clock/fi/clock.xml
share/gnome/help/clock/fi/figures/clock_applet.png
share/gnome/help/clock/fi/legal.xml
@@ -130,10 +138,6 @@ share/gnome/help/clock/zh_CN/legal.xml
share/gnome/help/clock/zh_TW/clock.xml
share/gnome/help/clock/zh_TW/figures/clock_applet.png
share/gnome/help/clock/zh_TW/legal.xml
-share/gnome/help/fish-applet-2/de/figures/fish_applet.png
-share/gnome/help/fish-applet-2/de/figures/fish_settings.png
-share/gnome/help/fish-applet-2/de/fish-applet-2.xml
-share/gnome/help/fish-applet-2/de/legal.xml
share/gnome/help/fish-applet-2/ja/figures/fish_applet.png
share/gnome/help/fish-applet-2/ja/fish-applet-2.xml
share/gnome/help/fish-applet-2/ja/legal.xml
@@ -157,9 +161,15 @@ share/gnome/help/fish/de/legal.xml
share/gnome/help/fish/el/figures/fish_applet.png
share/gnome/help/fish/el/fish.xml
share/gnome/help/fish/el/legal.xml
+share/gnome/help/fish/en_GB/figures/fish_applet.png
+share/gnome/help/fish/en_GB/fish.xml
+share/gnome/help/fish/en_GB/legal.xml
share/gnome/help/fish/es/figures/fish_applet.png
share/gnome/help/fish/es/fish.xml
share/gnome/help/fish/es/legal.xml
+share/gnome/help/fish/eu/figures/fish_applet.png
+share/gnome/help/fish/eu/fish.xml
+share/gnome/help/fish/eu/legal.xml
share/gnome/help/fish/fi/figures/fish_applet.png
share/gnome/help/fish/fi/fish.xml
share/gnome/help/fish/fi/legal.xml
@@ -190,14 +200,13 @@ share/gnome/help/fish/uk/legal.xml
share/gnome/help/window-list/C/window-list.xml
share/gnome/help/window-list/ar/window-list.xml
share/gnome/help/window-list/ca/window-list.xml
+share/gnome/help/window-list/cs/window-list.xml
share/gnome/help/window-list/da/window-list.xml
-share/gnome/help/window-list/de/figures/window_list_applet.png
-share/gnome/help/window-list/de/figures/window_list_group.png
-share/gnome/help/window-list/de/figures/window_list_group_applet.png
-share/gnome/help/window-list/de/legal.xml
share/gnome/help/window-list/de/window-list.xml
share/gnome/help/window-list/el/window-list.xml
+share/gnome/help/window-list/en_GB/window-list.xml
share/gnome/help/window-list/es/window-list.xml
+share/gnome/help/window-list/eu/window-list.xml
share/gnome/help/window-list/fi/window-list.xml
share/gnome/help/window-list/fr/window-list.xml
share/gnome/help/window-list/it/window-list.xml
@@ -221,13 +230,13 @@ share/gnome/help/window-list/zh_TW/window-list.xml
share/gnome/help/workspace-switcher/C/workspace-switcher.xml
share/gnome/help/workspace-switcher/ar/workspace-switcher.xml
share/gnome/help/workspace-switcher/ca/workspace-switcher.xml
+share/gnome/help/workspace-switcher/cs/workspace-switcher.xml
share/gnome/help/workspace-switcher/da/workspace-switcher.xml
-share/gnome/help/workspace-switcher/de/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/de/figures/workspacelist_applet.png
-share/gnome/help/workspace-switcher/de/legal.xml
share/gnome/help/workspace-switcher/de/workspace-switcher.xml
share/gnome/help/workspace-switcher/el/workspace-switcher.xml
+share/gnome/help/workspace-switcher/en_GB/workspace-switcher.xml
share/gnome/help/workspace-switcher/es/workspace-switcher.xml
+share/gnome/help/workspace-switcher/eu/workspace-switcher.xml
share/gnome/help/workspace-switcher/fi/workspace-switcher.xml
share/gnome/help/workspace-switcher/fr/workspace-switcher.xml
share/gnome/help/workspace-switcher/it/workspace-switcher.xml
@@ -323,6 +332,7 @@ share/locale/br/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ca@valencia/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/crh/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo
@@ -342,12 +352,14 @@ share/locale/fur/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/gu/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ha/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/hr/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/hy/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ig/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/is/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
@@ -402,6 +414,7 @@ share/locale/vi/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/yi/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/yo/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@@ -409,9 +422,12 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
share/omf/clock/clock-C.omf
share/omf/clock/clock-ar.omf
share/omf/clock/clock-ca.omf
+share/omf/clock/clock-cs.omf
share/omf/clock/clock-de.omf
share/omf/clock/clock-el.omf
+share/omf/clock/clock-en_GB.omf
share/omf/clock/clock-es.omf
+share/omf/clock/clock-eu.omf
share/omf/clock/clock-fi.omf
share/omf/clock/clock-fr.omf
share/omf/clock/clock-it.omf
@@ -432,7 +448,9 @@ share/omf/fish/fish-C.omf
share/omf/fish/fish-ca.omf
share/omf/fish/fish-de.omf
share/omf/fish/fish-el.omf
+share/omf/fish/fish-en_GB.omf
share/omf/fish/fish-es.omf
+share/omf/fish/fish-eu.omf
share/omf/fish/fish-fi.omf
share/omf/fish/fish-fr.omf
share/omf/fish/fish-it.omf
@@ -442,24 +460,24 @@ share/omf/fish/fish-ru.omf
share/omf/fish/fish-sv.omf
share/omf/fish/fish-th.omf
share/omf/fish/fish-uk.omf
-share/omf/gnome-panel/fish-applet-2-de.omf
share/omf/gnome-panel/fish-applet-2-ja.omf
share/omf/gnome-panel/fish-applet-2-zh_CN.omf
share/omf/gnome-panel/fish-applet-2-zh_TW.omf
-share/omf/gnome-panel/window-list-de.omf
share/omf/gnome-panel/window-list-ja.omf
share/omf/gnome-panel/window-list-zh_TW.omf
-share/omf/gnome-panel/workspace-switcher-de.omf
share/omf/gnome-panel/workspace-switcher-ja.omf
share/omf/gnome-panel/workspace-switcher-zh_CN.omf
share/omf/gnome-panel/workspace-switcher-zh_TW.omf
share/omf/window-list/window-list-C.omf
share/omf/window-list/window-list-ar.omf
share/omf/window-list/window-list-ca.omf
+share/omf/window-list/window-list-cs.omf
share/omf/window-list/window-list-da.omf
share/omf/window-list/window-list-de.omf
share/omf/window-list/window-list-el.omf
+share/omf/window-list/window-list-en_GB.omf
share/omf/window-list/window-list-es.omf
+share/omf/window-list/window-list-eu.omf
share/omf/window-list/window-list-fi.omf
share/omf/window-list/window-list-fr.omf
share/omf/window-list/window-list-it.omf
@@ -474,10 +492,13 @@ share/omf/window-list/window-list-zh_CN.omf
share/omf/workspace-switcher/workspace-switcher-C.omf
share/omf/workspace-switcher/workspace-switcher-ar.omf
share/omf/workspace-switcher/workspace-switcher-ca.omf
+share/omf/workspace-switcher/workspace-switcher-cs.omf
share/omf/workspace-switcher/workspace-switcher-da.omf
share/omf/workspace-switcher/workspace-switcher-de.omf
share/omf/workspace-switcher/workspace-switcher-el.omf
+share/omf/workspace-switcher/workspace-switcher-en_GB.omf
share/omf/workspace-switcher/workspace-switcher-es.omf
+share/omf/workspace-switcher/workspace-switcher-eu.omf
share/omf/workspace-switcher/workspace-switcher-fi.omf
share/omf/workspace-switcher/workspace-switcher-fr.omf
share/omf/workspace-switcher/workspace-switcher-it.omf
@@ -514,11 +535,13 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
@dirrm share/gnome/help/workspace-switcher/it
@dirrm share/gnome/help/workspace-switcher/fr
@dirrm share/gnome/help/workspace-switcher/fi
+@dirrm share/gnome/help/workspace-switcher/eu
@dirrm share/gnome/help/workspace-switcher/es
+@dirrm share/gnome/help/workspace-switcher/en_GB
@dirrm share/gnome/help/workspace-switcher/el
-@dirrm share/gnome/help/workspace-switcher/de/figures
@dirrm share/gnome/help/workspace-switcher/de
@dirrm share/gnome/help/workspace-switcher/da
+@dirrm share/gnome/help/workspace-switcher/cs
@dirrm share/gnome/help/workspace-switcher/ca
@dirrm share/gnome/help/workspace-switcher/ar
@dirrm share/gnome/help/workspace-switcher/C
@@ -538,11 +561,13 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
@dirrm share/gnome/help/window-list/it
@dirrm share/gnome/help/window-list/fr
@dirrm share/gnome/help/window-list/fi
+@dirrm share/gnome/help/window-list/eu
@dirrm share/gnome/help/window-list/es
+@dirrm share/gnome/help/window-list/en_GB
@dirrm share/gnome/help/window-list/el
-@dirrm share/gnome/help/window-list/de/figures
@dirrm share/gnome/help/window-list/de
@dirrm share/gnome/help/window-list/da
+@dirrm share/gnome/help/window-list/cs
@dirrm share/gnome/help/window-list/ca
@dirrm share/gnome/help/window-list/ar
@dirrm share/gnome/help/window-list/C
@@ -565,8 +590,12 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
@dirrm share/gnome/help/fish/fr
@dirrm share/gnome/help/fish/fi/figures
@dirrm share/gnome/help/fish/fi
+@dirrm share/gnome/help/fish/eu/figures
+@dirrm share/gnome/help/fish/eu
@dirrm share/gnome/help/fish/es/figures
@dirrm share/gnome/help/fish/es
+@dirrm share/gnome/help/fish/en_GB/figures
+@dirrm share/gnome/help/fish/en_GB
@dirrm share/gnome/help/fish/el/figures
@dirrm share/gnome/help/fish/el
@dirrm share/gnome/help/fish/de/figures
@@ -581,8 +610,6 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
@dirrm share/gnome/help/fish-applet-2/zh_CN
@dirrm share/gnome/help/fish-applet-2/ja/figures
@dirrm share/gnome/help/fish-applet-2/ja
-@dirrm share/gnome/help/fish-applet-2/de/figures
-@dirrm share/gnome/help/fish-applet-2/de
@dirrm share/gnome/help/fish-applet-2
@dirrm share/gnome/help/fish
@dirrm share/gnome/help/clock/zh_TW/figures
@@ -617,12 +644,18 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
@dirrm share/gnome/help/clock/fr
@dirrm share/gnome/help/clock/fi/figures
@dirrm share/gnome/help/clock/fi
+@dirrm share/gnome/help/clock/eu/figures
+@dirrm share/gnome/help/clock/eu
@dirrm share/gnome/help/clock/es/figures
@dirrm share/gnome/help/clock/es
+@dirrm share/gnome/help/clock/en_GB/figures
+@dirrm share/gnome/help/clock/en_GB
@dirrm share/gnome/help/clock/el/figures
@dirrm share/gnome/help/clock/el
@dirrm share/gnome/help/clock/de/figures
@dirrm share/gnome/help/clock/de
+@dirrm share/gnome/help/clock/cs/figures
+@dirrm share/gnome/help/clock/cs
@dirrm share/gnome/help/clock/ca/figures
@dirrm share/gnome/help/clock/ca
@dirrm share/gnome/help/clock/ar/figures
@@ -639,6 +672,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/yo/LC_MESSAGES
+@dirrmtry share/locale/yo
@dirrmtry share/locale/yi/LC_MESSAGES
@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@@ -675,12 +710,18 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ig/LC_MESSAGES
+@dirrmtry share/locale/ig
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/ha/LC_MESSAGES
+@dirrmtry share/locale/ha
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index c9035bd7bcd1..f405f4aa5db6 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.99 2009/01/02 19:17:35 marcus Exp $
+# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.106 2009/03/18 20:43:54 marcus Exp $
#
PORTNAME= gnome-screensaver
-PORTVERSION= 2.24.1
-PORTREVISION= 1
+PORTVERSION= 2.26.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -23,6 +22,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
+USE_XORG= xtst xxf86vm
USE_GNOME= gnomeprefix gnomehack intlhack gnomemenus libgnomekbd \
gnomedesktop
CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index c788f1277214..8bd268f47938 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-screensaver-2.24.1.tar.bz2) = f0b9cc3108bb9105141a8c22b56bf615
-SHA256 (gnome2/gnome-screensaver-2.24.1.tar.bz2) = c8cf26fc1d402269b7030abadfdf2c6103391cf30466b3d30bc99671f4c89f7e
-SIZE (gnome2/gnome-screensaver-2.24.1.tar.bz2) = 2058780
+MD5 (gnome2/gnome-screensaver-2.26.0.tar.bz2) = f9c5144defc80991b18c653c029001d6
+SHA256 (gnome2/gnome-screensaver-2.26.0.tar.bz2) = cb2fb89feaed0706291278d386839c0b5a850eba58ad989942eff0fc806646b6
+SIZE (gnome2/gnome-screensaver-2.26.0.tar.bz2) = 2044980
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 42d48bf169bb..4e349abf1d5d 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-session/Makefile,v 1.164 2008/11/25 19:25:49 marcus Exp $
+# $MCom: ports/x11/gnome-session/Makefile,v 1.169 2009/03/17 22:56:03 kwm Exp $
#
PORTNAME= gnome-session
-PORTVERSION= 2.24.3
+PORTVERSION= 2.26.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME \
http://www.marcuscom.com/downloads/:local
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index a354d53b9211..ec640615bbf0 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnome2/gnome-session-2.24.3.tar.bz2) = 5daf3307ec791953436484696b263093
-SHA256 (gnome2/gnome-session-2.24.3.tar.bz2) = 2d59d979467459261cc741c64ce2ba6aaccd7a31cccb5b13b2ea46858e1bc636
-SIZE (gnome2/gnome-session-2.24.3.tar.bz2) = 792300
+MD5 (gnome2/gnome-session-2.26.0.tar.bz2) = e17dbce7446b3e42fac2b1cea7dedffd
+SHA256 (gnome2/gnome-session-2.26.0.tar.bz2) = 0a161c419718b83e18200fe51e7e5f827b9b72a5ef055782c8c896c550a7881b
+SIZE (gnome2/gnome-session-2.26.0.tar.bz2) = 829541
MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5
SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508
SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in
index 7e78d6ed5deb..7febc702d2bf 100644
--- a/x11/gnome-session/files/patch-gnome-session_Makefile.in
+++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in
@@ -1,10 +1,10 @@
---- gnome-session/Makefile.in.orig 2008-08-20 14:29:34.000000000 -0400
-+++ gnome-session/Makefile.in 2008-08-20 14:29:56.000000000 -0400
-@@ -332,6 +332,7 @@ test_client_dbus_LDADD = \
+--- gnome-session/Makefile.in.orig 2009-02-21 19:46:07.000000000 +0100
++++ gnome-session/Makefile.in 2009-02-21 19:46:57.000000000 +0100
+@@ -317,6 +317,7 @@
gnome_session_LDADD = \
- -lSM -lICE \
-+ -lexecinfo \
libgsmutil.la \
++ -lexecinfo \
$(top_builddir)/egg/libeggdesktopfile.la \
- $(GNOME_SESSION_LIBS) \
+ $(SM_LIBS) \
+ $(ICE_LIBS) \
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 6612cb2a9c39..0f34e4d46c2e 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -2,25 +2,25 @@ bin/gnome-session
bin/gnome-session-properties
bin/gnome-session-save
bin/gnome-wm
+etc/xdg/autostart/at-spi-registryd-wrapper.desktop
+etc/xdg/autostart/gnome-settings-daemon-helper.desktop
lib/gnome-session/helpers/at-spi-registryd-wrapper
-lib/gnome-session/helpers/gnome-keyring-daemon-wrapper
lib/gnome-session/helpers/gnome-session-splash
lib/gnome-session/helpers/gnome-settings-daemon-helper
share/applications/session-properties.desktop
%%DATADIR%%/gsm-inhibit-dialog.glade
%%DATADIR%%/session-properties.glade
-share/gnome/autostart/at-spi-registryd-wrapper.desktop
-share/gnome/autostart/gnome-keyring-daemon-wrapper.desktop
share/gnome/autostart/gnome-session-splash.desktop
-share/gnome/autostart/gnome-settings-daemon-helper.desktop
share/icons/hicolor/16x16/apps/session-properties.png
share/icons/hicolor/22x22/apps/session-properties.png
share/icons/hicolor/24x24/apps/session-properties.png
share/icons/hicolor/32x32/apps/session-properties.png
+share/icons/hicolor/48x48/apps/session-properties.png
share/icons/hicolor/scalable/apps/session-properties.svg
share/locale/af/LC_MESSAGES/gnome-session-2.0.mo
share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/as/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ast/LC_MESSAGES/gnome-session-2.0.mo
share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
@@ -30,6 +30,7 @@ share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bn_IN/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/crh/LC_MESSAGES/gnome-session-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo
share/locale/da/LC_MESSAGES/gnome-session-2.0.mo
@@ -49,12 +50,14 @@ share/locale/fur/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/gu/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ha/LC_MESSAGES/gnome-session-2.0.mo
share/locale/he/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hy/LC_MESSAGES/gnome-session-2.0.mo
share/locale/id/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ig/LC_MESSAGES/gnome-session-2.0.mo
share/locale/is/LC_MESSAGES/gnome-session-2.0.mo
share/locale/it/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-session-2.0.mo
@@ -80,6 +83,7 @@ share/locale/oc/LC_MESSAGES/gnome-session-2.0.mo
share/locale/or/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ps/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ro/LC_MESSAGES/gnome-session-2.0.mo
@@ -98,9 +102,12 @@ share/locale/th/LC_MESSAGES/gnome-session-2.0.mo
share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/uz/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-session-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/yo/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
@@ -136,8 +143,12 @@ share/xsessions/gnome.desktop
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/yo/LC_MESSAGES
+@dirrmtry share/locale/yo
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -146,6 +157,8 @@ share/xsessions/gnome.desktop
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/nso/LC_MESSAGES
@@ -158,15 +171,23 @@ share/xsessions/gnome.desktop
@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ig/LC_MESSAGES
+@dirrmtry share/locale/ig
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/ha/LC_MESSAGES
+@dirrmtry share/locale/ha
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
@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/x11/gnome-swallow/Makefile b/x11/gnome-swallow/Makefile
index e40d26b4d61b..79fdeb2e5a50 100644
--- a/x11/gnome-swallow/Makefile
+++ b/x11/gnome-swallow/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-swallow
PORTVERSION= 1.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 gnome
MASTER_SITES= http://interreality.org/~tetron/technology/swallow/
@@ -18,8 +18,9 @@ USE_XORG= x11
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomepanel
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ LIBS="`pkg-config --libs libgnomeui-2.0`"
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 5d986c1cb820..3105abf40848 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-terminal/Makefile,v 1.113 2008/11/25 05:43:25 mezz Exp $
+# $MCom: ports/x11/gnome-terminal/Makefile,v 1.116 2009/03/16 07:48:29 kwm Exp $
#
PORTNAME= gnome-terminal
-PORTVERSION= 2.24.3
+PORTVERSION= 2.26.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index b6a0a74d8a9a..7991565065b4 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-terminal-2.24.3.tar.bz2) = 03f099985da576d774075e30430d29da
-SHA256 (gnome2/gnome-terminal-2.24.3.tar.bz2) = a6648afc17449de08f37befa9d0319a6c47463c7a389d54f22fa363204e1513e
-SIZE (gnome2/gnome-terminal-2.24.3.tar.bz2) = 1872490
+MD5 (gnome2/gnome-terminal-2.26.0.tar.bz2) = 013e51a2c4dd7dde5db49587952065ae
+SHA256 (gnome2/gnome-terminal-2.26.0.tar.bz2) = ea99c8eba63d348514cc0042f0f3c7df3e03498aa316a9458bed1cd2f0efb6ce
+SIZE (gnome2/gnome-terminal-2.26.0.tar.bz2) = 1969827
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index bef6f9e81cc3..8db648f547e4 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -1,5 +1,4 @@
bin/gnome-terminal
-libdata/bonobo/servers/gnome-terminal.server
share/applications/gnome-terminal.desktop
%%DATADIR%%/encodings-dialog.ui
%%DATADIR%%/keybinding-editor.ui
@@ -7,6 +6,7 @@ share/applications/gnome-terminal.desktop
%%DATADIR%%/profile-new-dialog.ui
%%DATADIR%%/profile-preferences.ui
%%DATADIR%%/skey-challenge.ui
+%%DATADIR%%/terminal.about
%%DATADIR%%/terminal.xml
share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png
@@ -22,6 +22,9 @@ share/gnome/help/gnome-terminal/ca/gnome-terminal.xml
share/gnome/help/gnome-terminal/cs/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/cs/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/cs/gnome-terminal.xml
+share/gnome/help/gnome-terminal/da/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/da/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/da/gnome-terminal.xml
share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/de/gnome-terminal.xml
@@ -71,16 +74,15 @@ share/gnome/help/gnome-terminal/zh_TW/legal.xml
share/locale/am/LC_MESSAGES/gnome-terminal.mo
share/locale/ar/LC_MESSAGES/gnome-terminal.mo
share/locale/as/LC_MESSAGES/gnome-terminal.mo
+share/locale/ast/LC_MESSAGES/gnome-terminal.mo
share/locale/az/LC_MESSAGES/gnome-terminal.mo
share/locale/be/LC_MESSAGES/gnome-terminal.mo
share/locale/be@latin/LC_MESSAGES/gnome-terminal.mo
share/locale/bg/LC_MESSAGES/gnome-terminal.mo
-share/locale/bn/LC_MESSAGES/gnome-terminal.mo
share/locale/bn_IN/LC_MESSAGES/gnome-terminal.mo
share/locale/bs/LC_MESSAGES/gnome-terminal.mo
share/locale/ca/LC_MESSAGES/gnome-terminal.mo
share/locale/cs/LC_MESSAGES/gnome-terminal.mo
-share/locale/cy/LC_MESSAGES/gnome-terminal.mo
share/locale/da/LC_MESSAGES/gnome-terminal.mo
share/locale/de/LC_MESSAGES/gnome-terminal.mo
share/locale/dz/LC_MESSAGES/gnome-terminal.mo
@@ -102,7 +104,6 @@ share/locale/hi/LC_MESSAGES/gnome-terminal.mo
share/locale/hr/LC_MESSAGES/gnome-terminal.mo
share/locale/hu/LC_MESSAGES/gnome-terminal.mo
share/locale/hy/LC_MESSAGES/gnome-terminal.mo
-share/locale/id/LC_MESSAGES/gnome-terminal.mo
share/locale/it/LC_MESSAGES/gnome-terminal.mo
share/locale/ja/LC_MESSAGES/gnome-terminal.mo
share/locale/ka/LC_MESSAGES/gnome-terminal.mo
@@ -154,6 +155,7 @@ share/omf/gnome-terminal/gnome-terminal-C.omf
share/omf/gnome-terminal/gnome-terminal-bg.omf
share/omf/gnome-terminal/gnome-terminal-ca.omf
share/omf/gnome-terminal/gnome-terminal-cs.omf
+share/omf/gnome-terminal/gnome-terminal-da.omf
share/omf/gnome-terminal/gnome-terminal-de.omf
share/omf/gnome-terminal/gnome-terminal-es.omf
share/omf/gnome-terminal/gnome-terminal-fr.omf
@@ -197,6 +199,8 @@ share/omf/gnome-terminal/gnome-terminal-zh_TW.omf
@dirrm share/gnome/help/gnome-terminal/es
@dirrm share/gnome/help/gnome-terminal/de/figures
@dirrm share/gnome/help/gnome-terminal/de
+@dirrm share/gnome/help/gnome-terminal/da/figures
+@dirrm share/gnome/help/gnome-terminal/da
@dirrm share/gnome/help/gnome-terminal/cs/figures
@dirrm share/gnome/help/gnome-terminal/cs
@dirrm share/gnome/help/gnome-terminal/ca/figures
@@ -242,5 +246,7 @@ share/omf/gnome-terminal/gnome-terminal-zh_TW.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/x11/gnome2/Makefile b/x11/gnome2/Makefile
index a623ea6240dc..682a0f55291f 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome2/Makefile,v 1.260 2008/11/27 02:18:33 marcus Exp $
+# $MCom: ports/x11/gnome2/Makefile,v 1.264 2009/03/18 20:45:35 marcus Exp $
#
PORTNAME= gnome2
-PORTVERSION= 2.24.3
-PORTREVISION?= 1
+PORTVERSION= 2.26.0
+PORTREVISION?= 0
CATEGORIES?= x11 gnome
MASTER_SITES= # empty
DISTFILES= # empty
@@ -36,7 +36,6 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
file-roller:${PORTSDIR}/archivers/file-roller \
${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
gok:${PORTSDIR}/accessibility/gok \
- nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \
gcalctool:${PORTSDIR}/math/gcalctool \
${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
${LOCALBASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \
@@ -45,7 +44,7 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
${LOCALBASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \
network-admin:${PORTSDIR}/sysutils/gnome-system-tools \
vino-passwd:${PORTSDIR}/net/vino \
- exchange-connector-setup-2.24:${PORTSDIR}/mail/evolution-exchange \
+ exchange-connector-setup-2.26:${PORTSDIR}/mail/evolution-exchange \
${LOCALBASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \
${LOCALBASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \
totem:${PORTSDIR}/multimedia/totem \
@@ -54,7 +53,6 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
evince:${PORTSDIR}/graphics/evince \
alacarte:${PORTSDIR}/deskutils/alacarte \
gnome-power-manager:${PORTSDIR}/sysutils/gnome-power-manager \
- ${LOCALBASE}/libexec/gnome-volume-manager:${PORTSDIR}/sysutils/gnome-volume-manager \
orca:${PORTSDIR}/accessibility/orca \
gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon \
@@ -91,6 +89,8 @@ RUN_DEPENDS+= empathy:${PORTSDIR}/net-im/empathy \
gnome-nettool:${PORTSDIR}/net/gnome-nettool \
swfdec-player:${PORTSDIR}/multimedia/swfdec-gnome \
vinagre:${PORTSDIR}/net/vinagre \
+ brasero:${PORTSDIR}/sysutils/brasero \
+ gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \
${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \
${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet
.if ${ARCH} == "i386"
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 8e3e7dbd5a43..e10b10efb941 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,11 +3,11 @@
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnome/Makefile,v 1.123 2008/09/22 23:01:20 kwm Exp $
+# $MCom: ports/x11/libgnome/Makefile,v 1.126 2009/03/18 04:20:56 marcus Exp $
#
PORTNAME= libgnome
-PORTVERSION= 2.24.1
+PORTVERSION= 2.26.0
PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index e5cf9bc925b2..9490458f33bc 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnome-2.24.1.tar.bz2) = 3b2a30329898b37b2461b3aa886e5ad9
-SHA256 (gnome2/libgnome-2.24.1.tar.bz2) = 16c05ef6b1bbb057ceea512300de35f2d704609d7a3cacfd5301bc1a138e015a
-SIZE (gnome2/libgnome-2.24.1.tar.bz2) = 1416606
+MD5 (gnome2/libgnome-2.26.0.tar.bz2) = a5634fe9ddc54bbb726cbaaa35abc0b9
+SHA256 (gnome2/libgnome-2.26.0.tar.bz2) = 2ef0287ab19fd34a7d20bc8beef86bb22db13cfc414367cb48e6121b8163e318
+SIZE (gnome2/libgnome-2.26.0.tar.bz2) = 1414016
diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in
index f55e2fb51067..a0dc080c84b6 100644
--- a/x11/libgnome/files/pkg-deinstall.in
+++ b/x11/libgnome/files/pkg-deinstall.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.17 2008/08/06 04:22:51 mezz Exp $
+# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.20 2009/04/09 03:24:10 mezz Exp $
#
# Restore gconf keys of gnomevfs2.
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index d65cdfdd8fa5..b948e7525d12 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -29,6 +29,7 @@ share/gnome-background-properties/gnome-default.xml
share/locale/am/LC_MESSAGES/libgnome-2.0.mo
share/locale/ar/LC_MESSAGES/libgnome-2.0.mo
share/locale/as/LC_MESSAGES/libgnome-2.0.mo
+share/locale/ast/LC_MESSAGES/libgnome-2.0.mo
share/locale/az/LC_MESSAGES/libgnome-2.0.mo
share/locale/be/LC_MESSAGES/libgnome-2.0.mo
share/locale/bg/LC_MESSAGES/libgnome-2.0.mo
@@ -36,6 +37,7 @@ share/locale/bn/LC_MESSAGES/libgnome-2.0.mo
share/locale/bn_IN/LC_MESSAGES/libgnome-2.0.mo
share/locale/bs/LC_MESSAGES/libgnome-2.0.mo
share/locale/ca/LC_MESSAGES/libgnome-2.0.mo
+share/locale/crh/LC_MESSAGES/libgnome-2.0.mo
share/locale/cs/LC_MESSAGES/libgnome-2.0.mo
share/locale/cy/LC_MESSAGES/libgnome-2.0.mo
share/locale/da/LC_MESSAGES/libgnome-2.0.mo
@@ -147,7 +149,11 @@ share/pixmaps/backgrounds/gnome/background-default.jpg
@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
@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/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index c44b33b8c0be..84008c371885 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnomekbd/Makefile,v 1.26 2008/09/23 05:27:25 mezz Exp $
+# $MCom: ports/x11/libgnomekbd/Makefile,v 1.29 2009/03/14 05:54:11 marcus Exp $
#
PORTNAME= libgnomekbd
-PORTVERSION= 2.24.0
+PORTVERSION= 2.26.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index 32e53cb8becf..1d9ecc89cba2 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomekbd-2.24.0.tar.bz2) = 43e4d090bc67a1984bebf551637783fd
-SHA256 (gnome2/libgnomekbd-2.24.0.tar.bz2) = 60f093b4fcbdfa12212d6e29dc2f7802a3234d8035f45efed4b426c0bb293c5a
-SIZE (gnome2/libgnomekbd-2.24.0.tar.bz2) = 411322
+MD5 (gnome2/libgnomekbd-2.26.0.tar.bz2) = aee58c088c4fd980e1bf813ea813c156
+SHA256 (gnome2/libgnomekbd-2.26.0.tar.bz2) = 26a53552f3eaeda8d386e31622ba605944eb97dfe5ffa834dc0708761811364f
+SIZE (gnome2/libgnomekbd-2.26.0.tar.bz2) = 413560
diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist
index 5801f0641b34..cd3c2506f340 100644
--- a/x11/libgnomekbd/pkg-plist
+++ b/x11/libgnomekbd/pkg-plist
@@ -44,6 +44,7 @@ share/locale/ja/LC_MESSAGES/libgnomekbd.mo
share/locale/ka/LC_MESSAGES/libgnomekbd.mo
share/locale/ko/LC_MESSAGES/libgnomekbd.mo
share/locale/lt/LC_MESSAGES/libgnomekbd.mo
+share/locale/lv/LC_MESSAGES/libgnomekbd.mo
share/locale/mk/LC_MESSAGES/libgnomekbd.mo
share/locale/ml/LC_MESSAGES/libgnomekbd.mo
share/locale/mr/LC_MESSAGES/libgnomekbd.mo
@@ -56,6 +57,7 @@ share/locale/pa/LC_MESSAGES/libgnomekbd.mo
share/locale/pl/LC_MESSAGES/libgnomekbd.mo
share/locale/pt/LC_MESSAGES/libgnomekbd.mo
share/locale/pt_BR/LC_MESSAGES/libgnomekbd.mo
+share/locale/ro/LC_MESSAGES/libgnomekbd.mo
share/locale/ru/LC_MESSAGES/libgnomekbd.mo
share/locale/si/LC_MESSAGES/libgnomekbd.mo
share/locale/sl/LC_MESSAGES/libgnomekbd.mo
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index 4906549ec1b6..3d838a319cb5 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnomemm26/Makefile,v 1.18 2008/09/22 11:12:42 kwm Exp $
+# $MCom: ports/x11/libgnomemm26/Makefile,v 1.20 2009/03/17 15:00:20 kwm Exp $
#
PORTNAME= libgnomemm
-PORTVERSION= 2.24.0
+PORTVERSION= 2.26.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo
index d3e15fb80280..6bcc7405235b 100644
--- a/x11/libgnomemm26/distinfo
+++ b/x11/libgnomemm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomemm-2.24.0.tar.bz2) = e77dd1df8e2eb1652d28e30d7c5252a4
-SHA256 (gnome2/libgnomemm-2.24.0.tar.bz2) = ef3f8bd78bd17651dc336620c942c57f78ab0fd09ec6d50df27ea90aac6c0ffd
-SIZE (gnome2/libgnomemm-2.24.0.tar.bz2) = 311206
+MD5 (gnome2/libgnomemm-2.26.0.tar.bz2) = 4801c2b60d73b08ea01fe79aafc678df
+SHA256 (gnome2/libgnomemm-2.26.0.tar.bz2) = aa8072914c53dc7b04c3eca904768a04fff8fa7f207568fe78a0a09865651e08
+SIZE (gnome2/libgnomemm-2.26.0.tar.bz2) = 299697
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 90d4f717cf5f..876c0abcfb1d 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/libxklavier/Makefile,v 1.45 2008/09/07 00:58:39 marcus Exp $
+# $MCom: ports/x11/libxklavier/Makefile,v 1.47 2009/03/21 04:28:11 marcus Exp $
#
PORTNAME= libxklavier
-PORTVERSION= 3.8
+PORTVERSION= 3.9
PORTEPOCH= 1
CATEGORIES= x11 gnome
MASTER_SITES= SF
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 5cf7ba3d0c2a..b5b0fc861e4d 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxklavier-3.8.tar.bz2) = e4f1b9e600c4159f39d38ab94d56cf9b
-SHA256 (libxklavier-3.8.tar.bz2) = 68c29039109fa84e64b87338de97f4259a6a486710c8eb8d6d0bf4347a09dd2e
-SIZE (libxklavier-3.8.tar.bz2) = 343107
+MD5 (libxklavier-3.9.tar.bz2) = c8ff3ba6daf899be7ec2a626894852b9
+SHA256 (libxklavier-3.9.tar.bz2) = 462a4e427f201a23de194f824dce70c84867464956f2f6c8dd4a5e07f1f4a554
+SIZE (libxklavier-3.9.tar.bz2) = 339409
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 3d89cfc5d43f..e8aee92caac5 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -7,7 +7,7 @@
PORTNAME= workrave
PORTVERSION= 1.8.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= SF
@@ -22,7 +22,9 @@ USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 intltool
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ LIBS="`pkg-config --libs libgnomeui-2.0`"
CONFIGURE_ARGS= --enable-gconf
.include <bsd.port.pre.mk>
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 504dc0087f3d..caf527020b72 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/yelp/Makefile,v 1.129 2008/09/23 04:41:44 mezz Exp $
+# $MCom: ports/x11/yelp/Makefile,v 1.133 2009/03/30 03:32:43 marcus Exp $
#
PORTNAME= yelp
-PORTVERSION= 2.24.0
+PORTVERSION= 2.26.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,7 +18,7 @@ COMMENT= A help browser for the GNOME 2 desktop
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
rarian.0:${PORTSDIR}/textproc/rarian
-USE_GECKO= firefox xulrunner
+USE_GECKO= firefox libxul
USE_GETTEXT= yes
USE_BZIP2= yes
USE_XORG= ice
@@ -28,7 +28,8 @@ GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-gecko=${GECKO}
+CONFIGURE_ARGS= --with-gecko=${GECKO} \
+ --with-gecko-home=${LOCALBASE}/lib/${GECKO}
MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
GCONF_SCHEMAS= yelp.schemas
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index 95bed6317d13..adc47cac83fc 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/yelp-2.24.0.tar.bz2) = 15eb2f538d970600c1e0a461f7d88b55
-SHA256 (gnome2/yelp-2.24.0.tar.bz2) = 7566177d23c3cac7725981f2d04de22923499318a067044158cff17f43957a0a
-SIZE (gnome2/yelp-2.24.0.tar.bz2) = 1023876
+MD5 (gnome2/yelp-2.26.0.tar.bz2) = 3413fd051c5ecbfe98819a8fb4ac83dd
+SHA256 (gnome2/yelp-2.26.0.tar.bz2) = 0c5a91a206b26ef714e9929404f1711caadcee481299566011b4ae4232d151d0
+SIZE (gnome2/yelp-2.26.0.tar.bz2) = 1021362
diff --git a/x11/yelp/files/patch-data_man.xml.in b/x11/yelp/files/patch-data_man.xml.in
deleted file mode 100644
index 06670069c9e2..000000000000
--- a/x11/yelp/files/patch-data_man.xml.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- data/man.xml.in.orig Tue Dec 6 17:03:27 2005
-+++ data/man.xml.in Tue Dec 6 17:05:52 2005
-@@ -39,6 +39,9 @@
- <toc id="Man-man9" sect="9">
- <_title>Kernel Routines</_title>
- </toc>
-+ <toc id="Man-mann" sect="n">
-+ <_title>Tcl/Tk Functions</_title>
-+ </toc>
- </toc>
-
- <toc id="Man-man4" sect="4">
diff --git a/x11/yelp/files/patch-src_yelp-gecko-utils.cpp b/x11/yelp/files/patch-src_yelp-gecko-utils.cpp
new file mode 100644
index 000000000000..2c4d781ee470
--- /dev/null
+++ b/x11/yelp/files/patch-src_yelp-gecko-utils.cpp
@@ -0,0 +1,13 @@
+--- src/yelp-gecko-utils.cpp.orig 2009-03-29 23:21:59.000000000 -0400
++++ src/yelp-gecko-utils.cpp 2009-03-29 23:25:48.000000000 -0400
+@@ -28,8 +28,10 @@
+ #include <nsStringAPI.h>
+
+ #ifdef HAVE_GECKO_1_9
++#ifdef XPCOM_GLUE
+ #include <gtkmozembed_glue.cpp>
+ #endif
++#endif
+
+ #include <gtkmozembed.h>
+ #include <gtkmozembed_internal.h>
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index f3a82cdf8807..23e7fa35e807 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -6,6 +6,7 @@ share/locale/af/LC_MESSAGES/yelp.mo
share/locale/am/LC_MESSAGES/yelp.mo
share/locale/ar/LC_MESSAGES/yelp.mo
share/locale/as/LC_MESSAGES/yelp.mo
+share/locale/ast/LC_MESSAGES/yelp.mo
share/locale/az/LC_MESSAGES/yelp.mo
share/locale/be/LC_MESSAGES/yelp.mo
share/locale/be@latin/LC_MESSAGES/yelp.mo
@@ -48,9 +49,11 @@ share/locale/ko/LC_MESSAGES/yelp.mo
share/locale/ks/LC_MESSAGES/yelp.mo
share/locale/ku/LC_MESSAGES/yelp.mo
share/locale/ky/LC_MESSAGES/yelp.mo
+share/locale/la/LC_MESSAGES/yelp.mo
share/locale/li/LC_MESSAGES/yelp.mo
share/locale/lt/LC_MESSAGES/yelp.mo
share/locale/lv/LC_MESSAGES/yelp.mo
+share/locale/mai/LC_MESSAGES/yelp.mo
share/locale/mg/LC_MESSAGES/yelp.mo
share/locale/mk/LC_MESSAGES/yelp.mo
share/locale/ml/LC_MESSAGES/yelp.mo
@@ -67,6 +70,7 @@ share/locale/oc/LC_MESSAGES/yelp.mo
share/locale/or/LC_MESSAGES/yelp.mo
share/locale/pa/LC_MESSAGES/yelp.mo
share/locale/pl/LC_MESSAGES/yelp.mo
+share/locale/ps/LC_MESSAGES/yelp.mo
share/locale/pt/LC_MESSAGES/yelp.mo
share/locale/pt_BR/LC_MESSAGES/yelp.mo
share/locale/ro/LC_MESSAGES/yelp.mo
@@ -86,6 +90,8 @@ share/locale/th/LC_MESSAGES/yelp.mo
share/locale/tr/LC_MESSAGES/yelp.mo
share/locale/ug/LC_MESSAGES/yelp.mo
share/locale/uk/LC_MESSAGES/yelp.mo
+share/locale/uz/LC_MESSAGES/yelp.mo
+share/locale/uz@cyrillic/LC_MESSAGES/yelp.mo
share/locale/vi/LC_MESSAGES/yelp.mo
share/locale/wa/LC_MESSAGES/yelp.mo
share/locale/xh/LC_MESSAGES/yelp.mo
@@ -131,6 +137,8 @@ share/locale/zu/LC_MESSAGES/yelp.mo
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@@ -141,6 +149,8 @@ share/locale/zu/LC_MESSAGES/yelp.mo
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/nso/LC_MESSAGES
@@ -151,6 +161,10 @@ share/locale/zu/LC_MESSAGES/yelp.mo
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/la/LC_MESSAGES
+@dirrmtry share/locale/la
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@@ -165,5 +179,7 @@ share/locale/zu/LC_MESSAGES/yelp.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/x11/zenity/Makefile b/x11/zenity/Makefile
index f01374a87132..7f3d5d0f10aa 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,11 +3,11 @@
# Whom: Franz Klammer <klammer@webonaut.com>
#
# $FreeBSD$
-# $MCom: ports/x11/zenity/Makefile,v 1.96 2008/09/23 15:27:31 kwm Exp $
+# $MCom: ports/x11/zenity/Makefile,v 1.98 2009/03/17 22:47:07 kwm Exp $
#
PORTNAME= zenity
-PORTVERSION= 2.24.1
+PORTVERSION= 2.26.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index 43b430271479..8da51c4de29b 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/zenity-2.24.1.tar.bz2) = a7ade5ff47716f4328d5e0547596dfb6
-SHA256 (gnome2/zenity-2.24.1.tar.bz2) = 11b73384397547df7638b49309d49ba74575fdded628dbaac467c5c3c975daa2
-SIZE (gnome2/zenity-2.24.1.tar.bz2) = 2242771
+MD5 (gnome2/zenity-2.26.0.tar.bz2) = 6660ce6dac0a6ca495a0e954cb6b40a2
+SHA256 (gnome2/zenity-2.26.0.tar.bz2) = fc619215ca90cab48efae7bdf524d1de690b75832f07f3cbcb6d5c3910d402a1
+SIZE (gnome2/zenity-2.26.0.tar.bz2) = 2454415
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 0be5035d2e48..1c49882ffc5c 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -61,6 +61,18 @@ share/gnome/help/zenity/es/figures/zenity-question-screenshot.png
share/gnome/help/zenity/es/figures/zenity-text-screenshot.png
share/gnome/help/zenity/es/figures/zenity-warning-screenshot.png
share/gnome/help/zenity/es/zenity.xml
+share/gnome/help/zenity/eu/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/eu/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/eu/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/eu/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/eu/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/eu/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/eu/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/eu/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/eu/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/eu/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/eu/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/eu/zenity.xml
share/gnome/help/zenity/fi/figures/zenity-calendar-screenshot.png
share/gnome/help/zenity/fi/figures/zenity-entry-screenshot.png
share/gnome/help/zenity/fi/figures/zenity-error-screenshot.png
@@ -190,6 +202,7 @@ share/locale/oc/LC_MESSAGES/zenity.mo
share/locale/or/LC_MESSAGES/zenity.mo
share/locale/pa/LC_MESSAGES/zenity.mo
share/locale/pl/LC_MESSAGES/zenity.mo
+share/locale/ps/LC_MESSAGES/zenity.mo
share/locale/pt/LC_MESSAGES/zenity.mo
share/locale/pt_BR/LC_MESSAGES/zenity.mo
share/locale/ro/LC_MESSAGES/zenity.mo
@@ -218,6 +231,7 @@ share/omf/zenity/zenity-bg.omf
share/omf/zenity/zenity-de.omf
share/omf/zenity/zenity-en_GB.omf
share/omf/zenity/zenity-es.omf
+share/omf/zenity/zenity-eu.omf
share/omf/zenity/zenity-fi.omf
share/omf/zenity/zenity-fr.omf
share/omf/zenity/zenity-oc.omf
@@ -254,6 +268,8 @@ share/omf/zenity/zenity-uk.omf
@dirrm share/gnome/help/zenity/fr
@dirrm share/gnome/help/zenity/fi/figures
@dirrm share/gnome/help/zenity/fi
+@dirrm share/gnome/help/zenity/eu/figures
+@dirrm share/gnome/help/zenity/eu
@dirrm share/gnome/help/zenity/es/figures
@dirrm share/gnome/help/zenity/es
@dirrm share/gnome/help/zenity/en_GB/figures