aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2009-11-28 20:06:37 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2009-11-28 20:06:37 +0000
commitf76d32b8e89fed7c0e459c1a7fe7a4b57661b01c (patch)
treead29e6808ff698f84e08dab8e047f0ae72838df9
parent873cae3ab41a109b6f9cf9f4149f101d6d996235 (diff)
downloadports-f76d32b8e89fed7c0e459c1a7fe7a4b57661b01c.tar.gz
ports-f76d32b8e89fed7c0e459c1a7fe7a4b57661b01c.zip
Notes
-rw-r--r--MOVED2
-rw-r--r--Mk/bsd.gnome.mk19
-rw-r--r--accessibility/Makefile1
-rw-r--r--accessibility/accerciser/Makefile5
-rw-r--r--accessibility/accerciser/distinfo6
-rw-r--r--accessibility/accerciser/pkg-plist34
-rw-r--r--accessibility/at-spi/Makefile6
-rw-r--r--accessibility/at-spi/distinfo6
-rw-r--r--accessibility/at-spi/pkg-plist12
-rw-r--r--accessibility/atk/Makefile4
-rw-r--r--accessibility/atk/distinfo6
-rw-r--r--accessibility/atk/pkg-plist3
-rw-r--r--accessibility/gir-repository-atk/Makefile15
-rw-r--r--accessibility/gnome-mag/Makefile4
-rw-r--r--accessibility/gnome-mag/distinfo6
-rw-r--r--accessibility/gnome-mag/pkg-plist3
-rw-r--r--accessibility/gok/Makefile11
-rw-r--r--accessibility/gok/distinfo6
-rw-r--r--accessibility/gok/pkg-plist24
-rw-r--r--accessibility/mousetweaks/Makefile5
-rw-r--r--accessibility/mousetweaks/distinfo6
-rw-r--r--accessibility/mousetweaks/pkg-plist49
-rw-r--r--accessibility/orca/Makefile5
-rw-r--r--accessibility/orca/distinfo6
-rw-r--r--accessibility/orca/files/patch-src_orca_orca.in36
-rw-r--r--accessibility/orca/pkg-plist115
-rw-r--r--archivers/file-roller/Makefile5
-rw-r--r--archivers/file-roller/distinfo6
-rw-r--r--archivers/file-roller/files/patch-src_fr-enum-types.c11
-rw-r--r--archivers/file-roller/pkg-plist16
-rw-r--r--audio/audacity-devel/Makefile1
-rw-r--r--audio/audacity-devel/files/patch-src_AudacityApp.cpp30
-rw-r--r--audio/freedesktop-sound-theme/Makefile7
-rw-r--r--audio/freedesktop-sound-theme/distinfo6
-rw-r--r--audio/freedesktop-sound-theme/pkg-plist75
-rw-r--r--audio/gmpc-wikipedia/Makefile3
-rw-r--r--audio/gnome-media/Makefile58
-rw-r--r--audio/gnome-media/distinfo6
-rw-r--r--audio/gnome-media/pkg-plist199
-rw-r--r--audio/gstreamer-plugins-cdparanoia/Makefile4
-rw-r--r--audio/libcanberra/Makefile7
-rw-r--r--audio/libcanberra/distinfo6
-rw-r--r--audio/libcanberra/files/patch-Makefile.in28
-rw-r--r--audio/libcanberra/files/patch-configure27
-rw-r--r--audio/libcanberra/files/patch-src_libcanberra-login-sound.desktop.in30
-rw-r--r--audio/libcanberra/files/patch-src_oss.c23
-rw-r--r--audio/libcanberra/pkg-plist32
-rw-r--r--audio/pulseaudio/Makefile8
-rw-r--r--audio/pulseaudio/distinfo6
-rw-r--r--audio/pulseaudio/files/patch-configure22
-rw-r--r--audio/pulseaudio/files/patch-src_pulsecore_shm.c17
-rw-r--r--audio/pulseaudio/files/patch-src_tests_rtstutter.c27
-rw-r--r--audio/pulseaudio/pkg-plist6
-rw-r--r--audio/rhythmbox/Makefile5
-rw-r--r--audio/sound-juicer/Makefile9
-rw-r--r--audio/sound-juicer/distinfo6
-rw-r--r--audio/sound-juicer/pkg-plist17
-rw-r--r--cad/geda-gattrib/Makefile5
-rw-r--r--converters/pdf2djvu/Makefile3
-rw-r--r--databases/evolution-data-server/Makefile14
-rw-r--r--databases/evolution-data-server/distinfo6
-rw-r--r--databases/evolution-data-server/files/patch-configure43
-rw-r--r--databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in21
-rw-r--r--databases/evolution-data-server/pkg-plist19
-rw-r--r--databases/glom/Makefile9
-rw-r--r--databases/glom/distinfo6
-rw-r--r--databases/glom/pkg-plist132
-rw-r--r--databases/libgdamm/Makefile11
-rw-r--r--databases/libgdamm/distinfo6
-rw-r--r--databases/libgdamm/pkg-plist7
-rw-r--r--databases/mysql-gui-tools/Makefile8
-rw-r--r--databases/mysql-gui-tools/files/patch-query-browser-configure.in21
-rw-r--r--deskutils/Makefile1
-rw-r--r--deskutils/alacarte/Makefile5
-rw-r--r--deskutils/alacarte/distinfo6
-rw-r--r--deskutils/alacarte/pkg-plist11
-rw-r--r--deskutils/deskbar-applet/Makefile7
-rw-r--r--deskutils/deskbar-applet/distinfo6
-rw-r--r--deskutils/deskbar-applet/pkg-plist164
-rw-r--r--deskutils/evolution-jescs/Makefile9
-rw-r--r--deskutils/evolution-jescs/distinfo6
-rw-r--r--deskutils/evolution-jescs/pkg-plist15
-rw-r--r--deskutils/gnome-utils/Makefile18
-rw-r--r--deskutils/gnome-utils/distinfo6
-rw-r--r--deskutils/gnome-utils/files/patch-logview_gtkmessagearea.c11
-rw-r--r--deskutils/gnome-utils/pkg-plist59
-rw-r--r--deskutils/gnote/Makefile60
-rw-r--r--deskutils/gnote/distinfo3
-rw-r--r--deskutils/gnote/files/patch-src_sharp_datetime.cpp36
-rw-r--r--deskutils/gnote/pkg-descr6
-rw-r--r--deskutils/gnote/pkg-plist244
-rw-r--r--deskutils/gnotime/Makefile8
-rw-r--r--deskutils/gucharmap/Makefile5
-rw-r--r--deskutils/gucharmap/distinfo6
-rw-r--r--deskutils/gucharmap/pkg-plist7
-rw-r--r--deskutils/hamster-applet/Makefile5
-rw-r--r--deskutils/hamster-applet/distinfo6
-rw-r--r--deskutils/hamster-applet/files/patch-hamster___init__.py10
-rw-r--r--deskutils/hamster-applet/files/patch-hamster_hamster-applet.py36
-rw-r--r--deskutils/hamster-applet/pkg-plist41
-rw-r--r--deskutils/nautilus-actions/Makefile33
-rw-r--r--deskutils/nautilus-actions/distinfo6
-rw-r--r--deskutils/nautilus-actions/files/extra-patch-configure20
-rw-r--r--deskutils/nautilus-actions/pkg-plist40
-rw-r--r--deskutils/nautilus-locked-folder/Makefile6
-rw-r--r--deskutils/nautilus-open-terminal/Makefile5
-rw-r--r--deskutils/nautilus-open-terminal/distinfo6
-rw-r--r--deskutils/nautilus-open-terminal/pkg-plist11
-rw-r--r--deskutils/nautilus-sendto/Makefile11
-rw-r--r--deskutils/nautilus-sendto/distinfo6
-rw-r--r--deskutils/nautilus-sendto/pkg-plist39
-rw-r--r--devel/Makefile11
-rw-r--r--devel/anjuta-extras/Makefile33
-rw-r--r--devel/anjuta-extras/distinfo3
-rw-r--r--devel/anjuta-extras/pkg-descr3
-rw-r--r--devel/anjuta-extras/pkg-plist108
-rw-r--r--devel/anjuta/Makefile22
-rw-r--r--devel/anjuta/distinfo6
-rw-r--r--devel/anjuta/files/patch-Makefile.in6
-rw-r--r--devel/anjuta/files/patch-plugins_symbol-db_Makefile.in11
-rw-r--r--devel/anjuta/files/patch-plugins_symbol-db_plugin.h11
-rw-r--r--devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c35
-rw-r--r--devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h12
-rw-r--r--devel/anjuta/pkg-plist252
-rw-r--r--devel/bug-buddy/Makefile7
-rw-r--r--devel/bug-buddy/distinfo6
-rw-r--r--devel/bug-buddy/pkg-plist7
-rw-r--r--devel/dbus/Makefile6
-rw-r--r--devel/dbus/distinfo6
-rw-r--r--devel/dbus/files/patch-configure13
-rw-r--r--devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c75
-rw-r--r--devel/devhelp/Makefile16
-rw-r--r--devel/devhelp/distinfo6
-rw-r--r--devel/devhelp/pkg-plist18
-rw-r--r--devel/eggdbus/Makefile37
-rw-r--r--devel/eggdbus/distinfo3
-rw-r--r--devel/eggdbus/files/patch-src_eggbus_Makefile.in10
-rw-r--r--devel/eggdbus/pkg-descr8
-rw-r--r--devel/eggdbus/pkg-plist36
-rw-r--r--devel/gconf2/Makefile8
-rw-r--r--devel/gconf2/distinfo6
-rw-r--r--devel/gconf2/pkg-plist5
-rw-r--r--devel/gconfmm26/Makefile5
-rw-r--r--devel/gconfmm26/distinfo6
-rw-r--r--devel/gio-fam-backend/Makefile4
-rw-r--r--devel/gio-fam-backend/distinfo6
-rw-r--r--devel/gir-repository-dbus/Makefile15
-rw-r--r--devel/gir-repository-gconf2/Makefile15
-rw-r--r--devel/gir-repository-libnotify/Makefile15
-rw-r--r--devel/gir-repository-libsoup/Makefile15
-rw-r--r--devel/gir-repository/Makefile40
-rw-r--r--devel/gir-repository/bsd.gir.mk254
-rw-r--r--devel/gir-repository/distinfo3
-rw-r--r--devel/gir-repository/files/patch-gir_Makefile.in39
-rw-r--r--devel/gir-repository/pkg-descr1
-rw-r--r--devel/glib20/Makefile4
-rw-r--r--devel/glib20/distinfo6
-rw-r--r--devel/glib20/files/extra-patch-glib_Makefile.in8
-rw-r--r--devel/glib20/files/patch-ae14
-rw-r--r--devel/glib20/files/patch-gio_libasyncns_asyncns.c11
-rw-r--r--devel/glib20/files/patch-glib_Makefile.in22
-rw-r--r--devel/glib20/files/patch-gobject_Makefile.in22
-rw-r--r--devel/glib20/pkg-plist25
-rw-r--r--devel/glibmm-reference/Makefile2
-rw-r--r--devel/glibmm-reference/pkg-plist11
-rw-r--r--devel/glibmm/Makefile10
-rw-r--r--devel/glibmm/distinfo6
-rw-r--r--devel/glibmm/files/patch-docs::reference::beautify_docs.pl20
-rw-r--r--devel/glibmm/pkg-plist97
-rw-r--r--devel/gnome-common/Makefile4
-rw-r--r--devel/gnome-common/distinfo6
-rw-r--r--devel/gnome-js-common/Makefile36
-rw-r--r--devel/gnome-js-common/distinfo3
-rw-r--r--devel/gnome-js-common/pkg-descr2
-rw-r--r--devel/gnome-js-common/pkg-plist10
-rw-r--r--devel/gnome-vfs/Makefile6
-rw-r--r--devel/gnome-vfs/distinfo6
-rw-r--r--devel/gnome-vfs/files/patch-configure38
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c19
-rw-r--r--devel/gnome-vfs/pkg-deinstall.in2
-rw-r--r--devel/gnome-vfs/pkg-install.in2
-rw-r--r--devel/gnome-vfs/pkg-plist3
-rw-r--r--devel/gobject-introspection/Makefile36
-rw-r--r--devel/gobject-introspection/distinfo3
-rw-r--r--devel/gobject-introspection/files/patch-gir_Makefile.in14
-rw-r--r--devel/gobject-introspection/pkg-descr9
-rw-r--r--devel/gobject-introspection/pkg-plist109
-rw-r--r--devel/gvfs/Makefile5
-rw-r--r--devel/gvfs/distinfo6
-rw-r--r--devel/gvfs/pkg-plist10
-rw-r--r--devel/json-glib/Makefile12
-rw-r--r--devel/json-glib/distinfo6
-rw-r--r--devel/json-glib/files/patch-json-glib_json-object.c21
-rw-r--r--devel/json-glib/pkg-plist13
-rw-r--r--devel/libbonobo/Makefile4
-rw-r--r--devel/libbonobo/distinfo6
-rw-r--r--devel/libbonobo/pkg-plist5
-rw-r--r--devel/libgdata/Makefile4
-rw-r--r--devel/libgdata/distinfo6
-rw-r--r--devel/libgdata/pkg-plist125
-rw-r--r--devel/libgtop/Makefile4
-rw-r--r--devel/libgtop/distinfo6
-rw-r--r--devel/libgtop/pkg-plist24
-rw-r--r--devel/liboobs/Makefile6
-rw-r--r--devel/libpthread-stubs/Makefile1
-rw-r--r--devel/libpthread-stubs/files/patch-stubs.c28
-rw-r--r--devel/libsoup/Makefile7
-rw-r--r--devel/libsoup/distinfo6
-rw-r--r--devel/libsoup/pkg-plist4
-rw-r--r--devel/mm-common/Makefile26
-rw-r--r--devel/mm-common/distinfo3
-rw-r--r--devel/mm-common/pkg-descr14
-rw-r--r--devel/mm-common/pkg-plist77
-rw-r--r--devel/py-gobject/Makefile11
-rw-r--r--devel/py-gobject/distinfo6
-rw-r--r--devel/py-gobject/files/patch-pygobject-2.0.pc.in11
-rw-r--r--devel/py-gobject/pkg-plist104
-rw-r--r--devel/seed/Makefile54
-rw-r--r--devel/seed/distinfo3
-rw-r--r--devel/seed/files/patch-libseed_seed-importer.c49
-rw-r--r--devel/seed/files/patch-modules_gettext_seed-gettext.c27
-rw-r--r--devel/seed/files/patch-modules_os_seed-os.c77
-rw-r--r--devel/seed/pkg-descr7
-rw-r--r--devel/seed/pkg-plist187
-rw-r--r--editors/abiword-docs/Makefile4
-rw-r--r--editors/abiword-docs/distinfo6
-rw-r--r--editors/abiword-docs/files/patch-configure11
-rw-r--r--editors/abiword-docs/pkg-plist484
-rw-r--r--editors/abiword/Makefile112
-rw-r--r--editors/abiword/distinfo6
-rw-r--r--editors/abiword/files/patch-Makefile.in11
-rw-r--r--editors/abiword/files/patch-abiword.desktop19
-rw-r--r--editors/abiword/files/patch-an38
-rw-r--r--editors/abiword/files/patch-aq27
-rw-r--r--editors/abiword/files/patch-configure2627
-rw-r--r--editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp19
-rw-r--r--editors/abiword/files/patch-src_af_xap_unix_xap_UnixTableWidget.cpp13
-rw-r--r--editors/abiword/files/patch-src_wp_ap_unix_ap_UnixApp.cpp11
-rw-r--r--editors/abiword/files/patch-src_wp_xp_ie-imp-MsWord-97.cpp78
-rw-r--r--editors/abiword/pkg-plist129
-rw-r--r--editors/gedit-plugins/Makefile4
-rw-r--r--editors/gedit-plugins/distinfo6
-rw-r--r--editors/gedit/Makefile5
-rw-r--r--editors/gedit/distinfo6
-rw-r--r--editors/gedit/pkg-plist41
-rw-r--r--editors/mlview/Makefile4
-rw-r--r--ftp/gwget/Makefile6
-rw-r--r--ftp/gwget/distinfo6
-rw-r--r--ftp/gwget/files/patch-configure37
-rw-r--r--ftp/gwget/pkg-plist4
-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-plist6
-rw-r--r--games/gnome-games/Makefile30
-rw-r--r--games/gnome-games/distinfo6
-rw-r--r--games/gnome-games/pkg-plist141
-rw-r--r--graphics/Makefile7
-rw-r--r--graphics/clutter-box2d/Makefile8
-rw-r--r--graphics/clutter-box2d/distinfo6
-rw-r--r--graphics/clutter-box2d/files/patch-clutter-box2d_Makefile.in11
-rw-r--r--graphics/clutter-box2d/pkg-plist26
-rw-r--r--graphics/clutter-cairo/Makefile30
-rw-r--r--graphics/clutter-cairo/distinfo3
-rw-r--r--graphics/clutter-cairo/pkg-descr6
-rw-r--r--graphics/clutter-cairo/pkg-plist8
-rw-r--r--graphics/clutter-gtk/Makefile15
-rw-r--r--graphics/clutter-gtk/distinfo6
-rw-r--r--graphics/clutter-gtk/pkg-plist36
-rw-r--r--graphics/clutter-qt/Makefile34
-rw-r--r--graphics/clutter-qt/distinfo3
-rw-r--r--graphics/clutter-qt/pkg-descr3
-rw-r--r--graphics/clutter-qt/pkg-plist7
-rw-r--r--graphics/clutter/Makefile12
-rw-r--r--graphics/clutter/distinfo6
-rw-r--r--graphics/clutter/pkg-plist216
-rw-r--r--graphics/eog-plugins/Makefile57
-rw-r--r--graphics/eog-plugins/distinfo3
-rw-r--r--graphics/eog-plugins/pkg-descr2
-rw-r--r--graphics/eog-plugins/pkg-plist75
-rw-r--r--graphics/eog/Makefile28
-rw-r--r--graphics/eog/distinfo6
-rw-r--r--graphics/eog/pkg-plist19
-rw-r--r--graphics/evince/Makefile11
-rw-r--r--graphics/evince/distinfo6
-rw-r--r--graphics/evince/pkg-plist50
-rw-r--r--graphics/gambas2-gb-pdf/Makefile1
-rw-r--r--graphics/gambas2-gb-pdf/files/patch-gb.pdf_src_CPdfDocument.cpp19
-rw-r--r--graphics/gimp-app/Makefile6
-rw-r--r--graphics/gimp-app/distinfo6
-rw-r--r--graphics/gimp-app/pkg-plist16
-rw-r--r--graphics/gimp/Makefile4
-rw-r--r--graphics/gir-repository-goocanvas/Makefile15
-rw-r--r--graphics/gir-repository-poppler/Makefile15
-rw-r--r--graphics/inkscape/Makefile6
-rw-r--r--graphics/inkscape/distinfo6
-rw-r--r--graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp247
-rw-r--r--graphics/inkscape/pkg-plist291
-rw-r--r--graphics/libchamplain/Makefile56
-rw-r--r--graphics/libchamplain/distinfo3
-rw-r--r--graphics/libchamplain/pkg-descr10
-rw-r--r--graphics/libchamplain/pkg-plist93
-rw-r--r--graphics/librsvg2/Makefile8
-rw-r--r--graphics/nip2/Makefile4
-rw-r--r--graphics/p5-clutter/Makefile68
-rw-r--r--graphics/p5-clutter/distinfo6
-rw-r--r--graphics/p5-clutter/pkg-plist46
-rw-r--r--graphics/poppler-data/Makefile2
-rw-r--r--graphics/poppler-data/distinfo6
-rw-r--r--graphics/poppler-data/pkg-plist65
-rw-r--r--graphics/poppler-gtk/Makefile4
-rw-r--r--graphics/poppler-gtk/pkg-plist5
-rw-r--r--graphics/poppler-qt4/Makefile4
-rw-r--r--graphics/poppler-utils/Makefile4
-rw-r--r--graphics/poppler/Makefile21
-rw-r--r--graphics/poppler/distinfo6
-rw-r--r--graphics/poppler/files/patch-utils_Makefile.in21
-rw-r--r--graphics/poppler/pkg-plist12
-rw-r--r--graphics/py-clutter-gtk/Makefile37
-rw-r--r--graphics/py-clutter-gtk/distinfo3
-rw-r--r--graphics/py-clutter-gtk/pkg-descr3
-rw-r--r--graphics/py-clutter-gtk/pkg-plist10
-rw-r--r--graphics/py-clutter/Makefile22
-rw-r--r--graphics/py-clutter/distinfo6
-rw-r--r--graphics/py-clutter/pkg-plist26
-rw-r--r--graphics/py-gimp/Makefile4
-rw-r--r--lang/Makefile1
-rw-r--r--lang/gjs/Makefile36
-rw-r--r--lang/gjs/distinfo3
-rw-r--r--lang/gjs/pkg-descr3
-rw-r--r--lang/gjs/pkg-plist70
-rw-r--r--lang/vala/Makefile4
-rw-r--r--lang/vala/distinfo6
-rw-r--r--lang/vala/pkg-plist260
-rw-r--r--mail/Makefile2
-rw-r--r--mail/evolution-exchange/Makefile10
-rw-r--r--mail/evolution-exchange/distinfo6
-rw-r--r--mail/evolution-exchange/pkg-plist6
-rw-r--r--mail/evolution-mapi/Makefile45
-rw-r--r--mail/evolution-mapi/distinfo3
-rw-r--r--mail/evolution-mapi/pkg-descr1
-rw-r--r--mail/evolution-mapi/pkg-plist101
-rw-r--r--mail/evolution-sharp/Makefile2
-rw-r--r--mail/evolution/Makefile15
-rw-r--r--mail/evolution/distinfo6
-rw-r--r--mail/evolution/files/patch-aa48
-rw-r--r--mail/evolution/files/patch-mail_em-utils.h10
-rw-r--r--mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c34
-rw-r--r--mail/evolution/pkg-plist755
-rw-r--r--mail/libmapi/Makefile76
-rw-r--r--mail/libmapi/distinfo3
-rw-r--r--mail/libmapi/pkg-descr12
-rw-r--r--mail/libmapi/pkg-plist119
-rw-r--r--math/gcalctool/Makefile7
-rw-r--r--math/gcalctool/distinfo6
-rw-r--r--math/gcalctool/pkg-plist4
-rw-r--r--misc/gnome-devel-docs/Makefile4
-rw-r--r--misc/gnome-devel-docs/distinfo6
-rw-r--r--misc/gnome-devel-docs/pkg-plist606
-rw-r--r--misc/gnome-icon-theme/Makefile5
-rw-r--r--misc/gnome-icon-theme/distinfo6
-rw-r--r--misc/gnome-icon-theme/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-plist83
-rw-r--r--misc/hicolor-icon-theme/Makefile7
-rw-r--r--misc/hicolor-icon-theme/distinfo6
-rw-r--r--misc/hicolor-icon-theme/files/patch-Makefile.in11
-rw-r--r--misc/hicolor-icon-theme/files/pkg-install.in2
-rw-r--r--misc/shared-mime-info/Makefile5
-rw-r--r--misc/shared-mime-info/distinfo6
-rw-r--r--misc/shared-mime-info/files/patch-Makefile.in9
-rw-r--r--misc/shared-mime-info/pkg-plist19
-rw-r--r--misc/uf-view/Makefile4
-rw-r--r--multimedia/cheese/Makefile5
-rw-r--r--multimedia/cheese/distinfo6
-rw-r--r--multimedia/cheese/pkg-plist150
-rw-r--r--multimedia/clutter-gst/Makefile8
-rw-r--r--multimedia/clutter-gst/distinfo6
-rw-r--r--multimedia/clutter-gst/pkg-plist27
-rw-r--r--multimedia/gstreamer-plugins/Makefile4
-rw-r--r--multimedia/gstreamer-plugins/Makefile.common2
-rw-r--r--multimedia/gstreamer-plugins/distinfo6
-rw-r--r--multimedia/gstreamer-plugins/files/patch-Makefile.in12
-rw-r--r--multimedia/gstreamer-plugins/files/patch-gst-libs_gst_audio_Makefile.in11
-rw-r--r--multimedia/gstreamer-plugins/pkg-plist26
-rw-r--r--multimedia/gstreamer/Makefile10
-rw-r--r--multimedia/gstreamer/distinfo6
-rw-r--r--multimedia/gstreamer/files/patch-Makefile.in16
-rw-r--r--multimedia/gstreamer/pkg-plist12
-rw-r--r--multimedia/gstreamermm/Makefile4
-rw-r--r--multimedia/gstreamermm/distinfo6
-rw-r--r--multimedia/gstreamermm/pkg-plist24
-rw-r--r--multimedia/swfdec-gnome/Makefile7
-rw-r--r--multimedia/swfdec-gnome/distinfo6
-rw-r--r--multimedia/swfdec-gnome/pkg-plist10
-rw-r--r--multimedia/totem-pl-parser/Makefile11
-rw-r--r--multimedia/totem-pl-parser/distinfo6
-rw-r--r--multimedia/totem-pl-parser/pkg-plist9
-rw-r--r--multimedia/totem/Makefile27
-rw-r--r--multimedia/totem/distinfo6
-rw-r--r--multimedia/totem/files/patch-help_Makefile.in11
-rw-r--r--multimedia/totem/pkg-plist31
-rw-r--r--net-im/empathy/Makefile37
-rw-r--r--net-im/empathy/distinfo6
-rw-r--r--net-im/empathy/files/patch-libempathy_emapth-tp-file.c10
-rw-r--r--net-im/empathy/pkg-plist816
-rw-r--r--net-im/telepathy-mission-control/Makefile12
-rw-r--r--net-im/telepathy-mission-control/distinfo6
-rw-r--r--net-im/telepathy-mission-control/files/patch-src_Makefile.in10
-rw-r--r--net-im/telepathy-mission-control/files/patch-src_mcd-debug.c11
-rw-r--r--net-im/telepathy-mission-control/files/patch-src_mcd-debug.h11
-rw-r--r--net-im/telepathy-mission-control/files/patch-util_mc-tool.c35
-rw-r--r--net-im/telepathy-mission-control/pkg-plist117
-rw-r--r--net/Makefile1
-rw-r--r--net/desktop-data-model/Makefile4
-rw-r--r--net/gir-repository-avahi/Makefile15
-rw-r--r--net/gnome-netstatus/Makefile6
-rw-r--r--net/gnome-netstatus/distinfo6
-rw-r--r--net/gnome-netstatus/pkg-plist23
-rw-r--r--net/gnome-nettool/Makefile5
-rw-r--r--net/gnome-nettool/distinfo6
-rw-r--r--net/gnome-nettool/files/patch-src_nettool.c22
-rw-r--r--net/gnome-nettool/pkg-plist9
-rw-r--r--net/gtk-vnc/Makefile4
-rw-r--r--net/gtk-vnc/distinfo6
-rw-r--r--net/gtk-vnc/pkg-plist13
-rw-r--r--net/libgweather/Makefile5
-rw-r--r--net/libgweather/distinfo6
-rw-r--r--net/libgweather/pkg-plist7
-rw-r--r--net/libproxy-mozjs/Makefile8
-rw-r--r--net/libproxy-webkit/Makefile4
-rw-r--r--net/liferea/Makefile4
-rw-r--r--net/vinagre/Makefile24
-rw-r--r--net/vinagre/distinfo6
-rw-r--r--net/vinagre/pkg-plist137
-rw-r--r--net/vino/Makefile5
-rw-r--r--net/vino/distinfo6
-rw-r--r--net/vino/files/patch-server_vino-dbus-listener.c11
-rw-r--r--net/vino/pkg-plist12
-rw-r--r--palm/synce-gvfs/Makefile2
-rw-r--r--palm/synce-gvfs/distinfo6
-rw-r--r--palm/synce-gvfs/pkg-plist3
-rw-r--r--print/freetype2/Makefile5
-rw-r--r--print/freetype2/distinfo6
-rw-r--r--print/freetype2/files/patch-src-cff_cffload.c47
-rw-r--r--print/freetype2/files/patch-src-lzw_ftzopen.c14
-rw-r--r--print/freetype2/files/patch-src-sfnt_ttcmap.c52
-rw-r--r--print/freetype2/files/patch-src-smooth_ftsmooth.c27
-rw-r--r--print/libspectre/Makefile5
-rw-r--r--print/libspectre/distinfo6
-rw-r--r--security/Makefile1
-rw-r--r--security/gir-repository-gnome-keyring/Makefile15
-rw-r--r--security/gnome-keyring/Makefile20
-rw-r--r--security/gnome-keyring/distinfo6
-rw-r--r--security/gnome-keyring/pkg-plist1
-rw-r--r--security/seahorse-plugins/Makefile21
-rw-r--r--security/seahorse-plugins/distinfo6
-rw-r--r--security/seahorse-plugins/pkg-plist17
-rw-r--r--security/seahorse/Makefile7
-rw-r--r--security/seahorse/distinfo6
-rw-r--r--security/seahorse/pkg-plist116
-rw-r--r--security/tuntun/Makefile2
-rw-r--r--sysutils/Makefile2
-rw-r--r--sysutils/brasero/Makefile8
-rw-r--r--sysutils/brasero/distinfo6
-rw-r--r--sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c27
-rw-r--r--sysutils/brasero/pkg-plist149
-rw-r--r--sysutils/consolekit/Makefile10
-rw-r--r--sysutils/consolekit/distinfo6
-rw-r--r--sysutils/consolekit/files/patch-data_ConsoleKit.conf20
-rw-r--r--sysutils/consolekit/files/patch-src_ck-run-programs.c10
-rw-r--r--sysutils/consolekit/files/patch-tools_ck-log-system-start.c60
-rw-r--r--sysutils/consolekit/pkg-plist5
-rw-r--r--sysutils/eiciel/Makefile4
-rw-r--r--sysutils/gconf-editor/Makefile5
-rw-r--r--sysutils/gconf-editor/distinfo6
-rw-r--r--sysutils/gconf-editor/pkg-plist28
-rw-r--r--sysutils/gnome-control-center/Makefile16
-rw-r--r--sysutils/gnome-control-center/distinfo6
-rw-r--r--sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c19
-rw-r--r--sysutils/gnome-control-center/pkg-plist51
-rw-r--r--sysutils/gnome-power-manager/Makefile4
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c12
-rw-r--r--sysutils/gnome-settings-daemon/Makefile16
-rw-r--r--sysutils/gnome-settings-daemon/distinfo6
-rw-r--r--sysutils/gnome-settings-daemon/pkg-plist22
-rw-r--r--sysutils/gnome-system-monitor/Makefile6
-rw-r--r--sysutils/gnome-system-monitor/distinfo6
-rw-r--r--sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp16
-rw-r--r--sysutils/gnome-system-monitor/pkg-plist40
-rw-r--r--sysutils/gnome-system-tools/Makefile8
-rw-r--r--sysutils/gnome-system-tools/distinfo6
-rw-r--r--sysutils/gnome-system-tools/pkg-plist117
-rw-r--r--sysutils/hal/Makefile25
-rw-r--r--sysutils/hal/distinfo6
-rw-r--r--sysutils/hal/files/hald.in5
-rw-r--r--sysutils/hal/files/patch-configure462
-rw-r--r--sysutils/hal/files/patch-configure.in37
-rw-r--r--sysutils/hal/files/patch-consolekit0366
-rw-r--r--sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi19
-rw-r--r--sysutils/hal/files/patch-hal.conf.in25
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_Makefile.in16
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c173
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-computer.c26
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-scsi.c11
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-usb2.c49
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-volume.c15
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am10
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in32
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c68
-rw-r--r--sysutils/hal/files/patch-hald_hf-storage.c81
-rw-r--r--sysutils/hal/pkg-plist4
-rw-r--r--sysutils/nautilus-cd-burner/Makefile6
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-configure27
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c10
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-src_make-iso.c38
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c48
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h10
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c44
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h10
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c29
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c11
-rw-r--r--sysutils/pessulus/Makefile5
-rw-r--r--sysutils/pessulus/distinfo6
-rw-r--r--sysutils/pessulus/pkg-plist16
-rw-r--r--sysutils/polkit-gnome/Makefile32
-rw-r--r--sysutils/polkit-gnome/distinfo3
-rw-r--r--sysutils/polkit-gnome/pkg-descr5
-rw-r--r--sysutils/polkit-gnome/pkg-plist66
-rw-r--r--sysutils/polkit/Makefile66
-rw-r--r--sysutils/polkit/distinfo3
-rw-r--r--sysutils/polkit/files/patch-data_Makefile.in11
-rw-r--r--sysutils/polkit/files/patch-src_polkitbackend_Makefile.in15
-rw-r--r--sysutils/polkit/pkg-descr4
-rw-r--r--sysutils/polkit/pkg-install12
-rw-r--r--sysutils/polkit/pkg-plist82
-rw-r--r--sysutils/system-tools-backends/Makefile7
-rw-r--r--sysutils/system-tools-backends/distinfo6
-rw-r--r--sysutils/system-tools-backends/files/patch-Users_Users.pm26
-rw-r--r--sysutils/system-tools-backends/files/patch-policykit46
-rw-r--r--sysutils/system-tools-backends/pkg-plist45
-rw-r--r--sysutils/tracker-client/Makefile37
-rw-r--r--sysutils/tracker-client/distinfo6
-rw-r--r--sysutils/tracker-client/files/patch-src_libtracker-common_tracker-albumart.c12
-rw-r--r--sysutils/tracker-client/files/patch-src_libtracker-common_tracker-type-utils.c13
-rw-r--r--sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in18
-rw-r--r--sysutils/tracker-client/files/patch-src_text-filters__Makefile.in11
-rw-r--r--sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in29
-rw-r--r--sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in37
-rw-r--r--sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in31
-rw-r--r--sysutils/tracker-client/files/patch-src_trackerd_tracker-utils.c14
-rw-r--r--sysutils/tracker-client/pkg-plist203
-rw-r--r--sysutils/tracker-gnome/Makefile4
-rw-r--r--sysutils/tracker-gnome/pkg-plist3
-rw-r--r--sysutils/tracker-libtrackergtk/Makefile4
-rw-r--r--sysutils/tracker-libtrackergtk/pkg-plist2
-rw-r--r--sysutils/tracker/Makefile5
-rw-r--r--textproc/gnome-doc-utils/Makefile9
-rw-r--r--textproc/gnome-doc-utils/distinfo6
-rw-r--r--textproc/gnome-doc-utils/pkg-plist259
-rw-r--r--textproc/gnome-translate/Makefile4
-rw-r--r--www/Makefile2
-rw-r--r--www/epiphany-extensions/Makefile23
-rw-r--r--www/epiphany-extensions/distinfo6
-rw-r--r--www/epiphany-extensions/pkg-plist107
-rw-r--r--www/epiphany/Makefile67
-rw-r--r--www/epiphany/distinfo6
-rw-r--r--www/epiphany/files/extra-patch-embed_ephy-embed-prefs.c12
-rw-r--r--www/epiphany/files/patch-embed_ephy-embed-utils.c10
-rw-r--r--www/epiphany/files/patch-embed_ephy-web-view.c14
-rw-r--r--www/epiphany/files/patch-src_ephy-window.c35
-rw-r--r--www/epiphany/pkg-plist58
-rw-r--r--www/evolution-webcal/Makefile5
-rw-r--r--www/evolution-webcal/distinfo6
-rw-r--r--www/evolution-webcal/pkg-plist6
-rw-r--r--www/galeon/Makefile59
-rw-r--r--www/galeon/distinfo3
-rw-r--r--www/galeon/files/patch-bookmarks_bookmarks-import-druid-konqueror.c10
-rw-r--r--www/galeon/files/patch-src_Makefile.in10
-rw-r--r--www/galeon/files/patch-src_galeon-main.c11
-rw-r--r--www/galeon/files/patch-ui_Makefile.in12
-rw-r--r--www/galeon/pkg-descr4
-rw-r--r--www/galeon/pkg-plist244
-rw-r--r--www/gnome-user-share/Makefile11
-rw-r--r--www/gnome-user-share/distinfo6
-rw-r--r--www/gnome-user-share/files/patch-configure61
-rw-r--r--www/gnome-user-share/files/patch-src_user_share.c48
-rw-r--r--www/gnome-user-share/pkg-plist50
-rw-r--r--www/gtkhtml3/Makefile15
-rw-r--r--www/gtkhtml3/distinfo6
-rw-r--r--www/gtkhtml3/pkg-plist7
-rw-r--r--www/kazehakase/Makefile29
-rw-r--r--www/kazehakase/distinfo6
-rw-r--r--www/kazehakase/files/patch-src_net_kz-http.c11
-rw-r--r--www/kazehakase/pkg-plist4
-rw-r--r--www/midori/Makefile9
-rw-r--r--www/midori/distinfo6
-rw-r--r--www/midori/pkg-plist47
-rw-r--r--www/p5-Gtk2-WebKit/Makefile2
-rw-r--r--www/webkit-gtk2/Makefile81
-rw-r--r--www/webkit-gtk2/distinfo6
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h11
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp20
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h65
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp11
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_yarr_RegexJIT.h11
-rw-r--r--www/webkit-gtk2/files/patch-GNUmakefile.in13
-rw-r--r--www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h11
-rw-r--r--www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in8
-rw-r--r--www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp8
-rw-r--r--www/webkit-gtk2/files/patch-cairo30
-rw-r--r--www/webkit-gtk2/files/patch-configure20
-rw-r--r--www/webkit-gtk2/pkg-plist233
-rw-r--r--www/webkit-sharp/Makefile2
-rw-r--r--x11-fm/Makefile1
-rw-r--r--x11-fm/gir-repository-nautilus/Makefile15
-rw-r--r--x11-fm/nautilus/Makefile7
-rw-r--r--x11-fm/nautilus/distinfo6
-rw-r--r--x11-fm/nautilus/files/patch-configure22
-rw-r--r--x11-fm/nautilus/files/patch-data_nautilus.desktop.in.in (renamed from x11-fm/nautilus/files/patch-nautilus.desktop.in.in)4
-rw-r--r--x11-fm/nautilus/files/patch-src_nautilus-file-management-properties.ui11
-rw-r--r--x11-fm/nautilus/pkg-plist1
-rw-r--r--x11-fonts/fontconfig-reference/Makefile2
-rw-r--r--x11-fonts/fontconfig-reference/Makefile.man18
-rw-r--r--x11-fonts/fontconfig/Makefile6
-rw-r--r--x11-fonts/fontconfig/distinfo6
-rw-r--r--x11-fonts/fontconfig/files/fc-query.157
-rw-r--r--x11-fonts/fontconfig/files/fc-scan.152
-rw-r--r--x11-fonts/fontconfig/files/patch-Makefile.in10
-rw-r--r--x11-fonts/fontconfig/pkg-plist2
-rw-r--r--x11-fonts/libXft/Makefile2
-rw-r--r--x11-fonts/libXft/distinfo6
-rw-r--r--x11-themes/gnome-backgrounds/Makefile4
-rw-r--r--x11-themes/gnome-backgrounds/distinfo6
-rw-r--r--x11-themes/gnome-backgrounds/pkg-plist6
-rw-r--r--x11-themes/gnome-themes/Makefile7
-rw-r--r--x11-themes/gnome-themes/distinfo6
-rw-r--r--x11-themes/gnome-themes/pkg-plist19
-rw-r--r--x11-themes/gtk-engines2/Makefile5
-rw-r--r--x11-themes/gtk-engines2/distinfo6
-rw-r--r--x11-themes/gtk-engines2/pkg-plist8
-rw-r--r--x11-toolkits/Makefile5
-rw-r--r--x11-toolkits/gauche-gtk/Makefile6
-rw-r--r--x11-toolkits/gdl/Makefile7
-rw-r--r--x11-toolkits/gdl/distinfo6
-rw-r--r--x11-toolkits/gdl/pkg-plist21
-rw-r--r--x11-toolkits/gir-repository-gtk20/Makefile15
-rw-r--r--x11-toolkits/gir-repository-gtksourceview2/Makefile15
-rw-r--r--x11-toolkits/gir-repository-libwnck/Makefile15
-rw-r--r--x11-toolkits/gir-repository-pango/Makefile15
-rw-r--r--x11-toolkits/gir-repository-vte/Makefile15
-rw-r--r--x11-toolkits/gtk20/Makefile6
-rw-r--r--x11-toolkits/gtk20/distinfo6
-rw-r--r--x11-toolkits/gtk20/files/patch-ah12
-rw-r--r--x11-toolkits/gtk20/files/patch-ai16
-rw-r--r--x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in13
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_Makefile.in14
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c6
-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-ah12
-rw-r--r--x11-toolkits/gtk30/files/patch-ai16
-rw-r--r--x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in13
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_Makefile.in14
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c6
-rw-r--r--x11-toolkits/gtk30/pkg-plist7
-rw-r--r--x11-toolkits/gtkada-gcc/Makefile4
-rw-r--r--x11-toolkits/gtkextra2/Makefile2
-rw-r--r--x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c108
-rw-r--r--x11-toolkits/gtkmm24-reference/Makefile5
-rw-r--r--x11-toolkits/gtkmm24-reference/pkg-plist2
-rw-r--r--x11-toolkits/gtkmm24/Makefile18
-rw-r--r--x11-toolkits/gtkmm24/distinfo6
-rw-r--r--x11-toolkits/gtkmm24/pkg-plist52
-rw-r--r--x11-toolkits/gtksourceview2/Makefile6
-rw-r--r--x11-toolkits/gtksourceview2/distinfo6
-rw-r--r--x11-toolkits/gtksourceview2/pkg-plist7
-rw-r--r--x11-toolkits/libbonoboui/Makefile6
-rw-r--r--x11-toolkits/libbonoboui/distinfo6
-rw-r--r--x11-toolkits/libbonoboui/pkg-plist4
-rw-r--r--x11-toolkits/libgnomeui/Makefile6
-rw-r--r--x11-toolkits/libgnomeui/distinfo6
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist3
-rw-r--r--x11-toolkits/libgnomeuimm26/Makefile5
-rw-r--r--x11-toolkits/libgnomeuimm26/distinfo6
-rw-r--r--x11-toolkits/libwnck/Makefile6
-rw-r--r--x11-toolkits/libwnck/distinfo6
-rw-r--r--x11-toolkits/libwnck/pkg-plist4
-rw-r--r--x11-toolkits/pango/Makefile17
-rw-r--r--x11-toolkits/pango/distinfo6
-rw-r--r--x11-toolkits/pango/files/extra-patch-gcc188
-rw-r--r--x11-toolkits/pango/files/patch-pango-view_Makefile.in11
-rw-r--r--x11-toolkits/pangomm/Makefile15
-rw-r--r--x11-toolkits/pangomm/distinfo6
-rw-r--r--x11-toolkits/pangomm/pkg-plist6
-rw-r--r--x11-toolkits/py-gnome-desktop/Makefile9
-rw-r--r--x11-toolkits/py-gnome-desktop/distinfo6
-rw-r--r--x11-toolkits/py-gnome-desktop/pkg-plist12
-rw-r--r--x11-toolkits/py-gnome-extras/Makefile12
-rw-r--r--x11-toolkits/py-gnome-extras/files/patch-configure675
-rw-r--r--x11-toolkits/py-gnome-extras/pkg-plist2
-rw-r--r--x11-toolkits/py-gnome2/Makefile5
-rw-r--r--x11-toolkits/py-gnome2/distinfo6
-rw-r--r--x11-toolkits/py-gnome2/pkg-plist1
-rw-r--r--x11-toolkits/py-gtk2/Makefile8
-rw-r--r--x11-toolkits/py-gtk2/distinfo6
-rw-r--r--x11-toolkits/py-gtk2/pkg-plist8
-rw-r--r--x11-toolkits/py-gtksourceview/Makefile5
-rw-r--r--x11-toolkits/py-gtksourceview/distinfo6
-rw-r--r--x11-toolkits/slgtk/Makefile2
-rw-r--r--x11-toolkits/slgtk/files/patch-src_slirprc-gtk.sl11
-rw-r--r--x11-toolkits/unique/Makefile14
-rw-r--r--x11-toolkits/unique/distinfo6
-rw-r--r--x11-toolkits/unique/pkg-plist2
-rw-r--r--x11-toolkits/vte/Makefile4
-rw-r--r--x11-toolkits/vte/distinfo6
-rw-r--r--x11-toolkits/vte/files/patch-python_Makefile.in25
-rw-r--r--x11-toolkits/vte/pkg-plist12
-rw-r--r--x11-toolkits/wxgtk24/Makefile2
-rw-r--r--x11-toolkits/wxgtk24/files/patch-src-gtk-gsockgtk.cpp18
-rw-r--r--x11-toolkits/wxgtk26/Makefile2
-rw-r--r--x11-toolkits/wxgtk26/files/patch-src-gtk-gsockgtk.cpp16
-rw-r--r--x11-toolkits/wxgtk28/Makefile2
-rw-r--r--x11-toolkits/wxgtk28/files/patch-include__wx__gtk__win_gtk.h12
-rw-r--r--x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp16
-rw-r--r--x11-toolkits/wxgtk29/Makefile2
-rw-r--r--x11-toolkits/wxgtk29/files/patch-include__wx__gtk__win_gtk.h12
-rw-r--r--x11-toolkits/wxgtk29/files/patch-src-gtk-gsockgtk.cpp16
-rw-r--r--x11-wm/Makefile1
-rw-r--r--x11-wm/compiz/Makefile5
-rw-r--r--x11-wm/metacity/Makefile9
-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.c24
-rw-r--r--x11-wm/metacity/pkg-plist2
-rw-r--r--x11-wm/mutter/Makefile44
-rw-r--r--x11-wm/mutter/distinfo3
-rw-r--r--x11-wm/mutter/files/patch-src_core_main.c14
-rw-r--r--x11-wm/mutter/pkg-descr7
-rw-r--r--x11-wm/mutter/pkg-plist180
-rw-r--r--x11/Makefile3
-rw-r--r--x11/gdm/Makefile17
-rw-r--r--x11/gdm/distinfo6
-rw-r--r--x11/gdm/files/gdm.in2
-rw-r--r--x11/gdm/files/gdm.pam.in2
-rw-r--r--x11/gdm/files/patch-configure109
-rw-r--r--x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c42
-rw-r--r--x11/gdm/files/patch-daemon_gdm-display-access-file.c12
-rw-r--r--x11/gdm/files/patch-daemon_gdm-session-worker.c20
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-greeter-login-window.c155
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c28
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c25
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-user.c12
-rw-r--r--x11/gdm/files/patch-hal-keyboard31
-rw-r--r--x11/gdm/pkg-install4
-rw-r--r--x11/gdm/pkg-plist14
-rw-r--r--x11/gir-repository-babl/Makefile15
-rw-r--r--x11/gir-repository-gnome-menus/Makefile15
-rw-r--r--x11/gnome-applets/Makefile8
-rw-r--r--x11/gnome-applets/distinfo6
-rw-r--r--x11/gnome-applets/files/patch-stickynotes_stickynotes.ui20
-rw-r--r--x11/gnome-applets/pkg-plist135
-rw-r--r--x11/gnome-desktop/Makefile13
-rw-r--r--x11/gnome-desktop/distinfo6
-rw-r--r--x11/gnome-desktop/pkg-plist10
-rw-r--r--x11/gnome-menus/Makefile6
-rw-r--r--x11/gnome-menus/distinfo6
-rw-r--r--x11/gnome-menus/files/patch-util_Makefile.in10
-rw-r--r--x11/gnome-menus/pkg-plist3
-rw-r--r--x11/gnome-panel/Makefile17
-rw-r--r--x11/gnome-panel/distinfo6
-rw-r--r--x11/gnome-panel/files/patch-applets_clock_clock.c16
-rw-r--r--x11/gnome-panel/files/patch-config.h.in11
-rw-r--r--x11/gnome-panel/files/patch-configure68
-rw-r--r--x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c59
-rw-r--r--x11/gnome-panel/pkg-plist155
-rw-r--r--x11/gnome-screensaver/Makefile5
-rw-r--r--x11/gnome-screensaver/distinfo6
-rw-r--r--x11/gnome-screensaver/files/patch-data_Makefile.in8
-rw-r--r--x11/gnome-screensaver/pkg-plist40
-rw-r--r--x11/gnome-session/Makefile13
-rw-r--r--x11/gnome-session/distinfo6
-rw-r--r--x11/gnome-session/files/patch-configure85
-rw-r--r--x11/gnome-session/files/patch-configure.in18
-rw-r--r--x11/gnome-session/files/patch-gnome-session_Makefile.am21
-rw-r--r--x11/gnome-session/files/patch-gnome-session_Makefile.in41
-rw-r--r--x11/gnome-session/files/patch-gnome-session_gsm-logout-dialog.c66
-rw-r--r--x11/gnome-session/files/patch-gnome-session_gsm-manager.c150
-rw-r--r--x11/gnome-session/files/patch-gnome-session_gsm-power-manager.c483
-rw-r--r--x11/gnome-session/files/patch-gnome-session_gsm-power-manager.h90
-rw-r--r--x11/gnome-session/pkg-plist12
-rw-r--r--x11/gnome-shell/Makefile49
-rw-r--r--x11/gnome-shell/distinfo3
-rw-r--r--x11/gnome-shell/files/patch-src_Makefile.in18
-rw-r--r--x11/gnome-shell/files/patch-src_gdmuser_gdm-user-manager.c11
-rw-r--r--x11/gnome-shell/files/patch-src_gnome-shell.in8
-rw-r--r--x11/gnome-shell/pkg-descr3
-rw-r--r--x11/gnome-shell/pkg-message33
-rw-r--r--x11/gnome-shell/pkg-plist76
-rw-r--r--x11/gnome-terminal/Makefile10
-rw-r--r--x11/gnome-terminal/distinfo6
-rw-r--r--x11/gnome-terminal/files/patch-src_terminal-screen.c23
-rw-r--r--x11/gnome-terminal/pkg-plist6
-rw-r--r--x11/gnome2-lite/Makefile9
-rw-r--r--x11/gnome2/Makefile14
-rw-r--r--x11/libgnome/Makefile6
-rw-r--r--x11/libgnome/distinfo6
-rw-r--r--x11/libgnome/files/pkg-deinstall.in2
-rw-r--r--x11/libgnome/pkg-plist5
-rw-r--r--x11/libgnomekbd/Makefile7
-rw-r--r--x11/libgnomekbd/distinfo6
-rw-r--r--x11/libgnomekbd/pkg-plist17
-rw-r--r--x11/libgnomemm26/Makefile5
-rw-r--r--x11/libgnomemm26/distinfo6
-rw-r--r--x11/libxklavier/Makefile7
-rw-r--r--x11/libxklavier/distinfo6
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c27
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier_props.c15
-rw-r--r--x11/libxklavier/pkg-plist1
-rw-r--r--x11/yelp/Makefile12
-rw-r--r--x11/yelp/distinfo6
-rw-r--r--x11/yelp/pkg-plist18
-rw-r--r--x11/zenity/Makefile7
-rw-r--r--x11/zenity/distinfo6
-rw-r--r--x11/zenity/pkg-plist120
826 files changed, 17940 insertions, 7493 deletions
diff --git a/MOVED b/MOVED
index 1fd2cc73011d..6044da68da19 100644
--- a/MOVED
+++ b/MOVED
@@ -4224,3 +4224,5 @@ lang/erlang-doc||2009-11-27|Documentation now part of lang/erlang package
devel/gtkmozedit||2009-11-27|No longer under development, does not build with libxul
audio/exaile-devel|audio/exaile|2009-11-28|main port updated to latest stable version
finance/p5-HTML-Query|www/p5-HTML-Query|2009-11-28|Moved to www category
+graphics/clutter-cairo|graphics/clutter|2009-11-28|This port is obsolete, all functionality is now in graphics/clutter
+www/galeon||2009-11-28|This port is obsolete; similar functionality can be found in www/epiphany
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 5b1360f9121b..492a34e67088 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -3,10 +3,17 @@
#
# $FreeBSD$
# $NetBSD: $
-# $MCom: ports/Mk/bsd.gnome.mk,v 1.479 2009/03/14 05:55:36 marcus Exp $
+# $MCom: ports/Mk/bsd.gnome.mk,v 1.486 2009/09/12 01:23:12 marcus Exp $
#
# Please view me with 4 column tabs!
+#######################################################
+#
+# *** WARNING: Disable MARCUSCOM before merge in FreeBSD!
+# Please also remove this section before merging into FreeBSD.
+#
+#MARCUSCOM_CVS=yes
+
# ======================= USERS =================================
#
# There are no significant user-definable settings in here.
@@ -353,7 +360,7 @@ libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2
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_USE_GNOME_IMPL= gconf2 gnomedocutils pygtk2
gnomedesktop_GNOME_DESKTOP_VERSION=2
gnomedesktopsharp20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-sharp-2.0.pc
@@ -383,7 +390,7 @@ eel2_USE_GNOME_IMPL= gnomedesktop
gnomepanel_LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnome-panel
gnomepanel_DETECT= ${LOCALBASE}/libdata/pkgconfig/libpanelapplet-2.0.pc
-gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils librsvg2
+gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils librsvg2 libgnomeui
gnomepanel_GNOME_DESKTOP_VERSION=2
nautilus2_LIB_DEPENDS= nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus
@@ -401,7 +408,7 @@ gal2_USE_GNOME_IMPL=gnomeui libgnomeprintui
gnomecontrolcenter2_LIB_DEPENDS=gnome-window-settings.1:${PORTSDIR}/sysutils/gnome-control-center
gnomecontrolcenter2_DETECT=${LOCALBASE}/libdata/pkgconfig/gnome-window-settings-2.0.pc
-gnomecontrolcenter2_USE_GNOME_IMPL=metacity nautilus2 gnomemenus desktopfileutils libgnomekbd gnomepanel
+gnomecontrolcenter2_USE_GNOME_IMPL=metacity gnomemenus desktopfileutils libgnomekbd gnomedesktop librsvg2
libgda2_LIB_DEPENDS= gda-2.3:${PORTSDIR}/databases/libgda2
libgda2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda.pc
@@ -515,8 +522,8 @@ gnomesharp20_RUN_DEPENDS= ${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-
gnomesharp20_USE_GNOME_IMPL= gnomepanel gtkhtml3 gtksharp20 librsvg2 vte
libgnomekbd_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc
-libgnomekbd_LIB_DEPENDS= gnomekbd.3:${PORTSDIR}/x11/libgnomekbd
-libgnomekbd_USE_GNOME_IMPL= libgnomeui
+libgnomekbd_LIB_DEPENDS= gnomekbd.4:${PORTSDIR}/x11/libgnomekbd
+libgnomekbd_USE_GNOME_IMPL= gconf2
pygtksourceview_DETECT= ${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc
pygtksourceview_BUILD_DEPENDS= ${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview
diff --git a/accessibility/Makefile b/accessibility/Makefile
index 90c715b4510a..c937b4301792 100644
--- a/accessibility/Makefile
+++ b/accessibility/Makefile
@@ -11,6 +11,7 @@
SUBDIR += atk-reference
SUBDIR += dasher
SUBDIR += eflite
+ SUBDIR += gir-repository-atk
SUBDIR += gnome-mag
SUBDIR += gnome-speech
SUBDIR += gnopernicus
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index a1b8a757847d..525e019fb118 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/accessibility/accerciser/Makefile,v 1.1 2009/04/15 09:45:46 kwm Exp $
+# $MCom: ports/accessibility/accerciser/Makefile,v 1.33 2009/09/22 05:13:26 avl Exp $
#
PORTNAME= accerciser
-PORTVERSION= 1.6.1
-PORTREVISION= 1
+PORTVERSION= 1.8.0
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/accerciser/distinfo b/accessibility/accerciser/distinfo
index 121515aa8a2f..edee6d31dd74 100644
--- a/accessibility/accerciser/distinfo
+++ b/accessibility/accerciser/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/accerciser-1.6.1.tar.bz2) = 9dd36435858f6eaf63694eb16584e777
-SHA256 (gnome2/accerciser-1.6.1.tar.bz2) = 22c362a04025c876d5b454b7016edc888b737098d93b23e18f9f7cd59ba7ecf0
-SIZE (gnome2/accerciser-1.6.1.tar.bz2) = 1345128
+MD5 (gnome2/accerciser-1.8.0.tar.bz2) = ede1d36e9820fa441bcc24cb634d59cc
+SHA256 (gnome2/accerciser-1.8.0.tar.bz2) = 27fcd0e8c5d40f70e00b38bb8f2223b5fb7ef3708075f96d0d051991c259832a
+SIZE (gnome2/accerciser-1.8.0.tar.bz2) = 1508187
diff --git a/accessibility/accerciser/pkg-plist b/accessibility/accerciser/pkg-plist
index 2d604d0600fc..44a4a663520f 100644
--- a/accessibility/accerciser/pkg-plist
+++ b/accessibility/accerciser/pkg-plist
@@ -139,16 +139,16 @@ bin/accerciser
%%DATADIR%%/plugindata/validate/basic.py
%%DATADIR%%/plugins/api_view.py
%%DATADIR%%/plugins/console.py
-%%DATADIR%%/plugins/event_monitor.glade
%%DATADIR%%/plugins/event_monitor.py
-%%DATADIR%%/plugins/interface_view.glade
+%%DATADIR%%/plugins/event_monitor.ui
%%DATADIR%%/plugins/interface_view.py
+%%DATADIR%%/plugins/interface_view.ui
%%DATADIR%%/plugins/ipython_view.py
%%DATADIR%%/plugins/quick_select.py
-%%DATADIR%%/plugins/script_recorder.glade
%%DATADIR%%/plugins/script_recorder.py
-%%DATADIR%%/plugins/validate.glade
+%%DATADIR%%/plugins/script_recorder.ui
%%DATADIR%%/plugins/validate.py
+%%DATADIR%%/plugins/validate.ui
share/applications/accerciser.desktop
share/gnome/help/accerciser/C/accerciser.xml
share/gnome/help/accerciser/C/figures/accerciser.png
@@ -199,6 +199,12 @@ share/gnome/help/accerciser/fr/figures/api_browser.png
share/gnome/help/accerciser/fr/figures/event_monitor.png
share/gnome/help/accerciser/fr/figures/interface_viewer.png
share/gnome/help/accerciser/fr/figures/script_recorder.png
+share/gnome/help/accerciser/it/accerciser.xml
+share/gnome/help/accerciser/it/figures/accerciser.png
+share/gnome/help/accerciser/it/figures/api_browser.png
+share/gnome/help/accerciser/it/figures/event_monitor.png
+share/gnome/help/accerciser/it/figures/interface_viewer.png
+share/gnome/help/accerciser/it/figures/script_recorder.png
share/gnome/help/accerciser/oc/accerciser.xml
share/gnome/help/accerciser/oc/figures/accerciser.png
share/gnome/help/accerciser/oc/figures/api_browser.png
@@ -217,6 +223,12 @@ share/gnome/help/accerciser/sv/figures/api_browser.png
share/gnome/help/accerciser/sv/figures/event_monitor.png
share/gnome/help/accerciser/sv/figures/interface_viewer.png
share/gnome/help/accerciser/sv/figures/script_recorder.png
+share/gnome/help/accerciser/uk/accerciser.xml
+share/gnome/help/accerciser/uk/figures/accerciser.png
+share/gnome/help/accerciser/uk/figures/api_browser.png
+share/gnome/help/accerciser/uk/figures/event_monitor.png
+share/gnome/help/accerciser/uk/figures/interface_viewer.png
+share/gnome/help/accerciser/uk/figures/script_recorder.png
share/icons/hicolor/16x16/apps/accerciser.png
share/icons/hicolor/22x22/apps/accerciser.png
share/icons/hicolor/32x32/apps/accerciser.png
@@ -227,6 +239,7 @@ share/locale/bg/LC_MESSAGES/accerciser.mo
share/locale/bn/LC_MESSAGES/accerciser.mo
share/locale/bn_IN/LC_MESSAGES/accerciser.mo
share/locale/ca/LC_MESSAGES/accerciser.mo
+share/locale/ca@valencia/LC_MESSAGES/accerciser.mo
share/locale/cs/LC_MESSAGES/accerciser.mo
share/locale/da/LC_MESSAGES/accerciser.mo
share/locale/de/LC_MESSAGES/accerciser.mo
@@ -235,6 +248,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/et/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
@@ -248,6 +262,7 @@ share/locale/ja/LC_MESSAGES/accerciser.mo
share/locale/kn/LC_MESSAGES/accerciser.mo
share/locale/lt/LC_MESSAGES/accerciser.mo
share/locale/lv/LC_MESSAGES/accerciser.mo
+share/locale/mai/LC_MESSAGES/accerciser.mo
share/locale/mk/LC_MESSAGES/accerciser.mo
share/locale/ml/LC_MESSAGES/accerciser.mo
share/locale/mr/LC_MESSAGES/accerciser.mo
@@ -259,6 +274,7 @@ share/locale/pa/LC_MESSAGES/accerciser.mo
share/locale/pl/LC_MESSAGES/accerciser.mo
share/locale/pt/LC_MESSAGES/accerciser.mo
share/locale/pt_BR/LC_MESSAGES/accerciser.mo
+share/locale/ro/LC_MESSAGES/accerciser.mo
share/locale/ru/LC_MESSAGES/accerciser.mo
share/locale/si/LC_MESSAGES/accerciser.mo
share/locale/sl/LC_MESSAGES/accerciser.mo
@@ -280,16 +296,22 @@ 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-it.omf
share/omf/accerciser/accerciser-oc.omf
share/omf/accerciser/accerciser-pt_BR.omf
share/omf/accerciser/accerciser-sv.omf
+share/omf/accerciser/accerciser-uk.omf
@dirrm share/omf/accerciser
+@dirrm share/gnome/help/accerciser/uk/figures
+@dirrm share/gnome/help/accerciser/uk
@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/it/figures
+@dirrm share/gnome/help/accerciser/it
@dirrm share/gnome/help/accerciser/fr/figures
@dirrm share/gnome/help/accerciser/fr
@dirrm share/gnome/help/accerciser/es/figures
@@ -325,9 +347,13 @@ share/omf/accerciser/accerciser-sv.omf
@dirrmtry share/locale/si
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@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
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 30cf22024a57..ab549e0c2714 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/at-spi/Makefile,v 1.85 2009/03/17 13:55:06 kwm Exp $
+# $MCom: ports/accessibility/at-spi/Makefile,v 1.89 2009/10/19 07:50:44 avl Exp $
#
PORTNAME= at-spi
-PORTVERSION= 1.26.0
-PORTREVISION?= 1
+PORTVERSION= 1.28.1
+PORTREVISION?= 0
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
index a30a7568e93a..eea948f939b3 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/at-spi-1.28.1.tar.bz2) = ff29958339cbff5a0e0f34e4761e7633
+SHA256 (gnome2/at-spi-1.28.1.tar.bz2) = b776a85290dcfd485f0307c8fcc71a74a07874e5edbf7bba31d599e6dab3d2be
+SIZE (gnome2/at-spi-1.28.1.tar.bz2) = 843057
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 82d8b98515ec..fba0e27320c7 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -1,3 +1,4 @@
+etc/xdg/autostart/at-spi-registryd.desktop
include/at-spi-1.0/cspi/spi-impl.h
include/at-spi-1.0/cspi/spi-listener.h
include/at-spi-1.0/cspi/spi-roletypes.h
@@ -112,6 +113,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/ca@valencia/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
@@ -140,17 +142,19 @@ share/locale/is/LC_MESSAGES/at-spi.mo
share/locale/it/LC_MESSAGES/at-spi.mo
share/locale/ja/LC_MESSAGES/at-spi.mo
share/locale/ka/LC_MESSAGES/at-spi.mo
+share/locale/kn/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/mai/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
share/locale/mr/LC_MESSAGES/at-spi.mo
share/locale/ms/LC_MESSAGES/at-spi.mo
share/locale/nb/LC_MESSAGES/at-spi.mo
-share/locale/nds_DE/LC_MESSAGES/at-spi.mo
+share/locale/nds/LC_MESSAGES/at-spi.mo
share/locale/ne/LC_MESSAGES/at-spi.mo
share/locale/nl/LC_MESSAGES/at-spi.mo
share/locale/nn/LC_MESSAGES/at-spi.mo
@@ -208,8 +212,8 @@ share/locale/zh_TW/LC_MESSAGES/at-spi.mo
@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
-@dirrmtry share/locale/nds_DE/LC_MESSAGES
-@dirrmtry share/locale/nds_DE
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/ku/LC_MESSAGES
@@ -218,6 +222,8 @@ share/locale/zh_TW/LC_MESSAGES/at-spi.mo
@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
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 1ddee5de38bd..a7ffb928f8ab 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.95 2009/03/17 14:03:48 kwm Exp $
+# $MCom: ports/accessibility/atk/Makefile,v 1.98 2009/09/22 10:49:14 kwm Exp $
#
PORTNAME= atk
-PORTVERSION= 1.26.0
+PORTVERSION= 1.28.0
PORTREVISION?= 0
CATEGORIES= accessibility devel
MASTER_SITES= GNOME
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 73c5f03a5c57..24d0842d72b9 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/atk-1.28.0.tar.bz2) = 010a85478adc053c016a0a5c9bb52004
+SHA256 (gnome2/atk-1.28.0.tar.bz2) = e4da9fe580d2d55f4e77a138c553b4b32654dfb06bf0715592cc9dbd6355fe87
+SIZE (gnome2/atk-1.28.0.tar.bz2) = 715100
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 28df9d79230e..650d450dd8db 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -43,6 +43,7 @@ share/locale/bn/LC_MESSAGES/atk10.mo
share/locale/bn_IN/LC_MESSAGES/atk10.mo
share/locale/bs/LC_MESSAGES/atk10.mo
share/locale/ca/LC_MESSAGES/atk10.mo
+share/locale/ca@valencia/LC_MESSAGES/atk10.mo
share/locale/cs/LC_MESSAGES/atk10.mo
share/locale/cy/LC_MESSAGES/atk10.mo
share/locale/da/LC_MESSAGES/atk10.mo
@@ -153,6 +154,8 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
@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
diff --git a/accessibility/gir-repository-atk/Makefile b/accessibility/gir-repository-atk/Makefile
new file mode 100644
index 000000000000..b9bc8ffccba4
--- /dev/null
+++ b/accessibility/gir-repository-atk/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-atk
+# Date created: 07 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/accessibility/gir-repository-atk/Makefile,v 1.1 2009/09/16 02:05:10 avl Exp $
+#
+
+CATEGORIES= accessibility
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -atk
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 98345e7a5714..f50f084f07bb 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/gnome-mag/Makefile,v 1.44 2008/09/23 20:13:54 mezz Exp $
+# $MCom: ports/accessibility/gnome-mag/Makefile,v 1.47 2009/09/26 12:48:44 marcus Exp $
#
PORTNAME= gnome-mag
-PORTVERSION= 0.15.8
+PORTVERSION= 0.15.9
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/gnome-mag/distinfo b/accessibility/gnome-mag/distinfo
index f8373da3e74c..9fa4321bc36f 100644
--- a/accessibility/gnome-mag/distinfo
+++ b/accessibility/gnome-mag/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-mag-0.15.8.tar.bz2) = 654232f153051e2052d96007b8bdd273
-SHA256 (gnome2/gnome-mag-0.15.8.tar.bz2) = c9ed20c85f9be37e5b90eb326e7093e46e34962ec67528f93dbd22033bd0dee2
-SIZE (gnome2/gnome-mag-0.15.8.tar.bz2) = 504849
+MD5 (gnome2/gnome-mag-0.15.9.tar.bz2) = db651bbd63f4ae3cfeb344c42f80d206
+SHA256 (gnome2/gnome-mag-0.15.9.tar.bz2) = 6f921419143088587dce201afd972a60317ade269e47b0d67a38872a7615a025
+SIZE (gnome2/gnome-mag-0.15.9.tar.bz2) = 532685
diff --git a/accessibility/gnome-mag/pkg-plist b/accessibility/gnome-mag/pkg-plist
index ffacd9c6bd12..d641626add8e 100644
--- a/accessibility/gnome-mag/pkg-plist
+++ b/accessibility/gnome-mag/pkg-plist
@@ -77,6 +77,7 @@ share/locale/ku/LC_MESSAGES/gnome-mag.mo
share/locale/ky/LC_MESSAGES/gnome-mag.mo
share/locale/lt/LC_MESSAGES/gnome-mag.mo
share/locale/lv/LC_MESSAGES/gnome-mag.mo
+share/locale/mai/LC_MESSAGES/gnome-mag.mo
share/locale/mg/LC_MESSAGES/gnome-mag.mo
share/locale/mi/LC_MESSAGES/gnome-mag.mo
share/locale/mk/LC_MESSAGES/gnome-mag.mo
@@ -147,6 +148,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
@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/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index f313b9134bee..5a60d280ca85 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger <adamw@freebsd.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/gok/Makefile,v 1.92 2009/03/17 14:42:44 kwm Exp $
+# $MCom: ports/accessibility/gok/Makefile,v 1.106 2009/10/19 19:03:32 kwm Exp $
#
PORTNAME= gok
-PORTVERSION= 2.26.0
-PORTREVISION= 1
+PORTVERSION= 2.28.1
PORTEPOCH= 1
CATEGORIES= accessibility sysutils gnome
MASTER_SITES= GNOME
@@ -17,6 +16,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME On-Screen Keyboard (GOK)
+LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra
+
USE_BZIP2= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
@@ -30,8 +31,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= gok.schemas
-post-patch:
- @${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
- ${WRKSRC}/gok/word-complete.c
-
.include <bsd.port.mk>
diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo
index 92a89a3787bf..52f56cb2e9ad 100644
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/gok-2.28.1.tar.bz2) = d7305f12c703e13eeaed796f996dbc86
+SHA256 (gnome2/gok-2.28.1.tar.bz2) = 121ab98605b0981c131cdc49bf190ba81e9a9d5c720fa94ed2fb3193f121e904
+SIZE (gnome2/gok-2.28.1.tar.bz2) = 1588038
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index e0f421756741..a80237b5f3f6 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -7,6 +7,7 @@ share/applications/gok.desktop
%%DOCSDIR%%/ch02.html
%%DOCSDIR%%/ch03.html
%%DOCSDIR%%/ch04.html
+%%DOCSDIR%%/gok-GokButton.html
%%DOCSDIR%%/gok-arraylist.html
%%DOCSDIR%%/gok-callbacks.html
%%DOCSDIR%%/gok-command-common.html
@@ -24,6 +25,7 @@ share/applications/gok.desktop
%%DOCSDIR%%/gok-gok-data.html
%%DOCSDIR%%/gok-gok-editor.html
%%DOCSDIR%%/gok-gok-feedback.html
+%%DOCSDIR%%/gok-gok-gconf-keys.html
%%DOCSDIR%%/gok-gok-gconf.html
%%DOCSDIR%%/gok-gok-key.html
%%DOCSDIR%%/gok-gok-keyboard.html
@@ -183,6 +185,16 @@ share/gnome/help/gok/C/legal.xml
%%DATADIR%%/ca/quit.kbd
%%DATADIR%%/ca/text-operations.kbd
%%DATADIR%%/ca/valuator.kbd
+%%DATADIR%%/ca@valencia/gok-controls.kbd
+%%DATADIR%%/ca@valencia/hide.kbd
+%%DATADIR%%/ca@valencia/launcher.kbd
+%%DATADIR%%/ca@valencia/main.kbd
+%%DATADIR%%/ca@valencia/mouse.kbd
+%%DATADIR%%/ca@valencia/move-resize.kbd
+%%DATADIR%%/ca@valencia/numberpad.kbd
+%%DATADIR%%/ca@valencia/quit.kbd
+%%DATADIR%%/ca@valencia/text-operations.kbd
+%%DATADIR%%/ca@valencia/valuator.kbd
%%DATADIR%%/cs/gok-controls.kbd
%%DATADIR%%/cs/hide.kbd
%%DATADIR%%/cs/launcher.kbd
@@ -351,8 +363,6 @@ share/gnome/help/gok/C/legal.xml
%%DATADIR%%/glade/gok.glade2
%%DATADIR%%/gok.rc
%%DATADIR%%/goklogo.png
-%%DATADIR%%/goksound1.wav
-%%DATADIR%%/goksound2.wav
%%DATADIR%%/gu/gok-controls.kbd
%%DATADIR%%/gu/hide.kbd
%%DATADIR%%/gu/launcher.kbd
@@ -868,6 +878,7 @@ share/locale/bg/LC_MESSAGES/gok.mo
share/locale/bn/LC_MESSAGES/gok.mo
share/locale/bn_IN/LC_MESSAGES/gok.mo
share/locale/ca/LC_MESSAGES/gok.mo
+share/locale/ca@valencia/LC_MESSAGES/gok.mo
share/locale/cs/LC_MESSAGES/gok.mo
share/locale/cy/LC_MESSAGES/gok.mo
share/locale/da/LC_MESSAGES/gok.mo
@@ -935,6 +946,10 @@ share/locale/zh_HK/LC_MESSAGES/gok.mo
share/locale/zh_TW/LC_MESSAGES/gok.mo
share/omf/gok/gok-C.omf
share/pixmaps/gok.png
+share/sounds/freedesktop/stereo/goksound1.wav
+share/sounds/freedesktop/stereo/goksound2.wav
+@dirrmtry share/sounds/freedesktop/stereo
+@dirrmtry share/sounds/freedesktop
@dirrm share/omf/gok
@dirrm %%DATADIR%%/zh_TW
@dirrm %%DATADIR%%/zh_HK
@@ -1002,6 +1017,7 @@ share/pixmaps/gok.png
@dirrm %%DATADIR%%/da
@dirrm %%DATADIR%%/cy
@dirrm %%DATADIR%%/cs
+@dirrm %%DATADIR%%/ca@valencia
@dirrm %%DATADIR%%/ca
@dirrm %%DATADIR%%/bn_IN
@dirrm %%DATADIR%%/bn
@@ -1014,9 +1030,9 @@ share/pixmaps/gok.png
@dirrm %%DATADIR%%/am
@dirrm %%DATADIR%%/C
@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%
@dirrm share/gnome/help/gok/C
@dirrm share/gnome/help/gok
-@dirrm %%DOCSDIR%%
@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@@ -1038,6 +1054,8 @@ share/pixmaps/gok.png
@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/as/LC_MESSAGES
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
index e77e35d45be0..564f1c841d90 100644
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/mousetweaks/Makefile,v 1.26 2009/03/17 16:17:01 kwm Exp $
+# $MCom: ports/accessibility/mousetweaks/Makefile,v 1.37 2009/10/19 18:20:53 kwm Exp $
#
PORTNAME= mousetweaks
-PORTVERSION= 2.26.3
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= accessibility
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/mousetweaks/distinfo b/accessibility/mousetweaks/distinfo
index 1b013c0b848c..e55e4e0f202c 100644
--- a/accessibility/mousetweaks/distinfo
+++ b/accessibility/mousetweaks/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/mousetweaks-2.26.3.tar.bz2) = e4d5941b555de97c8880ea8b01310776
-SHA256 (gnome2/mousetweaks-2.26.3.tar.bz2) = 16a490d155643fbe71b78e7d9b0044acb080e3bb14a39aa7ad5eb296d24d3277
-SIZE (gnome2/mousetweaks-2.26.3.tar.bz2) = 1172768
+MD5 (gnome2/mousetweaks-2.28.1.tar.bz2) = a6d786f4df2be96202d76c4c0e6ba43c
+SHA256 (gnome2/mousetweaks-2.28.1.tar.bz2) = 8e99c8af3676ae913edd168aaca612401c7cf8dc22f0ba7cc21d5f1ca87c5874
+SIZE (gnome2/mousetweaks-2.28.1.tar.bz2) = 2013922
diff --git a/accessibility/mousetweaks/pkg-plist b/accessibility/mousetweaks/pkg-plist
index a99f67432030..36ddc5ae8ed2 100644
--- a/accessibility/mousetweaks/pkg-plist
+++ b/accessibility/mousetweaks/pkg-plist
@@ -19,6 +19,36 @@ 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/ca/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/ca/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/ca/mousetweaks.xml
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-checkbox.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-click-type-applet.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-click-type-window.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-ctw-checkbox.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-delay-slider.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-gesture-mapping.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-mode-choice.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-dwell-motion-treshold.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-pointer-capture-context-menu.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-pointer-capture-locked.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-pointer-capture-preferences.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-ssc-checkbox.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-ssc-delay-slider.png
+share/gnome/help/mousetweaks/cs/figures/mouse-a11y-tab.png
+share/gnome/help/mousetweaks/cs/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
@@ -142,8 +172,10 @@ 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/LC_MESSAGES/mousetweaks.mo
share/locale/bn_IN/LC_MESSAGES/mousetweaks.mo
share/locale/ca/LC_MESSAGES/mousetweaks.mo
+share/locale/ca@valencia/LC_MESSAGES/mousetweaks.mo
share/locale/cs/LC_MESSAGES/mousetweaks.mo
share/locale/da/LC_MESSAGES/mousetweaks.mo
share/locale/de/LC_MESSAGES/mousetweaks.mo
@@ -164,6 +196,7 @@ share/locale/ja/LC_MESSAGES/mousetweaks.mo
share/locale/kn/LC_MESSAGES/mousetweaks.mo
share/locale/ko/LC_MESSAGES/mousetweaks.mo
share/locale/lt/LC_MESSAGES/mousetweaks.mo
+share/locale/mai/LC_MESSAGES/mousetweaks.mo
share/locale/mk/LC_MESSAGES/mousetweaks.mo
share/locale/ml/LC_MESSAGES/mousetweaks.mo
share/locale/mr/LC_MESSAGES/mousetweaks.mo
@@ -180,6 +213,8 @@ 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/sr/LC_MESSAGES/mousetweaks.mo
+share/locale/sr@latin/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
@@ -200,6 +235,8 @@ share/locale/zh_TW/LC_MESSAGES/mousetweaks.mo
%%DATADIR%%/right-click.png
%%DATADIR%%/single-click.png
share/omf/mousetweaks/mousetweaks-C.omf
+share/omf/mousetweaks/mousetweaks-ca.omf
+share/omf/mousetweaks/mousetweaks-cs.omf
share/omf/mousetweaks/mousetweaks-de.omf
share/omf/mousetweaks/mousetweaks-el.omf
share/omf/mousetweaks/mousetweaks-en_GB.omf
@@ -224,6 +261,10 @@ share/omf/mousetweaks/mousetweaks-sv.omf
@dirrm share/gnome/help/mousetweaks/en_GB
@dirrm share/gnome/help/mousetweaks/el/figures
@dirrm share/gnome/help/mousetweaks/el
+@dirrm share/gnome/help/mousetweaks/cs/figures
+@dirrm share/gnome/help/mousetweaks/cs
+@dirrm share/gnome/help/mousetweaks/ca/figures
+@dirrm share/gnome/help/mousetweaks/ca
@dirrm share/gnome/help/mousetweaks/de/figures
@dirrm share/gnome/help/mousetweaks/de
@dirrm share/gnome/help/mousetweaks/C/figures
@@ -233,12 +274,16 @@ share/omf/mousetweaks/mousetweaks-sv.omf
@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/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
-@dirrmtry share/locale/kn/LC_MESSAGES
-@dirrmtry share/locale/kn
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@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/as/LC_MESSAGES
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index 4e43ff008dd6..b7d9457c2223 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/accessibility/orca/Makefile,v 1.3 2009/04/15 09:42:54 kwm Exp $
+# $MCom: ports/accessibility/orca/Makefile,v 1.73 2009/10/19 20:01:51 kwm Exp $
#
PORTNAME= orca
-PORTVERSION= 2.26.3
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo
index ab063f748d2d..54a70a5566ee 100644
--- a/accessibility/orca/distinfo
+++ b/accessibility/orca/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/orca-2.26.3.tar.bz2) = 72dbf273bedd214e9023725690fb61b7
-SHA256 (gnome2/orca-2.26.3.tar.bz2) = 27a51f210cc18c9ebe1741bb87c8da5abd9b2fc8664a7accd241ed07f024b7d8
-SIZE (gnome2/orca-2.26.3.tar.bz2) = 2250070
+MD5 (gnome2/orca-2.28.1.tar.bz2) = f1f8682b66fc0c122d344ddd9a4787ad
+SHA256 (gnome2/orca-2.28.1.tar.bz2) = dace4d689b4fbae507d0fa0a9c485cc51e72844048c50ea77bb0c9161b246fcd
+SIZE (gnome2/orca-2.28.1.tar.bz2) = 2176412
diff --git a/accessibility/orca/files/patch-src_orca_orca.in b/accessibility/orca/files/patch-src_orca_orca.in
index aa41825f9680..be06e2fd4a31 100644
--- a/accessibility/orca/files/patch-src_orca_orca.in
+++ b/accessibility/orca/files/patch-src_orca_orca.in
@@ -1,21 +1,15 @@
---- 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
- #
- # Orca
- #
+--- src/orca/orca.in.orig 2009-07-17 10:44:34.000000000 +1000
++++ src/orca/orca.in 2009-07-17 10:46:14.000000000 +1000
@@ -30,7 +30,7 @@
# Set the user's $PATH for this script.
#
--export PATH="${PATH}:/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/X11R6/bin"
-+export PATH="${PATH}:/usr/bin:/usr/sbin:/bin:/usr/local/bin"
+-PATH="${PATH}:/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/X11R6/bin"
++PATH="${PATH}:/usr/bin:/usr/sbin:/bin:/usr/local/bin"
+ export PATH
# Save the arguments away.
- #
-@@ -83,7 +83,7 @@
+@@ -84,7 +84,7 @@ restoreXmodmap()
cleanup()
{
USERID=`id | cut -f2 -d= | cut -f1 -d\(`
@@ -24,21 +18,3 @@
egrep "orca[.]orca|OAFIID[:]GNOME_Speech|OAFIID[:]GNOME_Magnifier|festival [-][-]server"|\
grep -v grep | awk '{ print $1 }'`
IFS='
-@@ -137,7 +137,7 @@
- fi
- fi
-
--if [ `grep -c "\-q" <<< $ARGS` -gt 0 ] ; then
-+if [ `echo $ARGS | grep -c "\-q"` -gt 0 ] ; then
- # If the user has done -q or --quit, that means to tell any
- # existing orca process to quit. So, we just do a cleanup.
- #
-@@ -154,7 +154,7 @@
- if [ "x$ARGS" = "x" ] ; then
- CLEANUP=1
- else
-- CLEANUP=`egrep -c "\-s|\-t|\-n|\-u|\-e|\-d" <<< $ARGS`
-+ CLEANUP=`echo $ARGS | egrep -c "\-s|\-t|\-n|\-u|\-e|\-d"`
- fi
-
- # Clean up before running orca to get anything that might
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
index 73fa5f45a32a..d25909de608e 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -17,11 +17,9 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/braille.py
%%PYTHON_SITELIBDIR%%/orca/braille.pyc
%%PYTHON_SITELIBDIR%%/orca/braille.pyo
-%%PYTHON_SITELIBDIR%%/orca/braillegenerator.py
-%%PYTHON_SITELIBDIR%%/orca/braillegenerator.pyc
-%%PYTHON_SITELIBDIR%%/orca/braillegenerator.pyo
-%%PYTHON_SITELIBDIR%%/orca/brlmodule.la
-%%PYTHON_SITELIBDIR%%/orca/brlmodule.so
+%%PYTHON_SITELIBDIR%%/orca/braille_generator.py
+%%PYTHON_SITELIBDIR%%/orca/braille_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/braille_generator.pyo
%%PYTHON_SITELIBDIR%%/orca/brlmon.py
%%PYTHON_SITELIBDIR%%/orca/brlmon.pyc
%%PYTHON_SITELIBDIR%%/orca/brlmon.pyo
@@ -55,6 +53,12 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/focus_tracking_presenter.py
%%PYTHON_SITELIBDIR%%/orca/focus_tracking_presenter.pyc
%%PYTHON_SITELIBDIR%%/orca/focus_tracking_presenter.pyo
+%%PYTHON_SITELIBDIR%%/orca/formatting.py
+%%PYTHON_SITELIBDIR%%/orca/formatting.pyc
+%%PYTHON_SITELIBDIR%%/orca/formatting.pyo
+%%PYTHON_SITELIBDIR%%/orca/generator.py
+%%PYTHON_SITELIBDIR%%/orca/generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/generator.pyo
%%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.py
%%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyc
%%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyo
@@ -85,9 +89,9 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.py
%%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.pyc
%%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.pyo
-%%PYTHON_SITELIBDIR%%/orca/orca_glade.py
-%%PYTHON_SITELIBDIR%%/orca/orca_glade.pyc
-%%PYTHON_SITELIBDIR%%/orca/orca_glade.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_gtkbuilder.py
+%%PYTHON_SITELIBDIR%%/orca/orca_gtkbuilder.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_gtkbuilder.pyo
%%PYTHON_SITELIBDIR%%/orca/orca_gui_find.py
%%PYTHON_SITELIBDIR%%/orca/orca_gui_find.pyc
%%PYTHON_SITELIBDIR%%/orca/orca_gui_find.pyo
@@ -160,21 +164,24 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/formatting.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/formatting.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/formatting.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/where_am_i.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/where_am_i.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/where_am_i.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.pyo
@@ -184,9 +191,6 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/speech_generator.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/speech_generator.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/where_am_i.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/where_am_i.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/where_am_i.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.pyo
@@ -220,12 +224,12 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/formatting.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/formatting.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/formatting.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/speech_generator.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/speech_generator.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/speech_generator.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.pyo
@@ -247,6 +251,21 @@ bin/orca
%%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/packagemanager/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/braille_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/braille_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/braille_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/speech_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/tutorialgenerator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/tutorialgenerator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/tutorialgenerator.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
@@ -259,9 +278,6 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/where_am_i.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/where_am_i.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/where_am_i.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.pyo
@@ -280,6 +296,9 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/braille_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/braille_generator.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/braille_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/formatting.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/formatting.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/formatting.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.pyo
@@ -292,6 +311,9 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/formatting.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/formatting.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/formatting.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.pyo
@@ -301,9 +323,9 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/where_am_i.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/where_am_i.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/where_am_i.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.pyo
@@ -322,6 +344,9 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/formatting.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/formatting.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/formatting.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.pyo
@@ -334,24 +359,18 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/where_am_i.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/where_am_i.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/where_am_i.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/formatting.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/formatting.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/formatting.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.pyo
@@ -361,15 +380,18 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/settings.py
%%PYTHON_SITELIBDIR%%/orca/settings.pyc
%%PYTHON_SITELIBDIR%%/orca/settings.pyo
+%%PYTHON_SITELIBDIR%%/orca/sound.py
+%%PYTHON_SITELIBDIR%%/orca/sound.pyc
+%%PYTHON_SITELIBDIR%%/orca/sound.pyo
%%PYTHON_SITELIBDIR%%/orca/speech.py
%%PYTHON_SITELIBDIR%%/orca/speech.pyc
%%PYTHON_SITELIBDIR%%/orca/speech.pyo
+%%PYTHON_SITELIBDIR%%/orca/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/speech_generator.pyo
%%PYTHON_SITELIBDIR%%/orca/speechdispatcherfactory.py
%%PYTHON_SITELIBDIR%%/orca/speechdispatcherfactory.pyc
%%PYTHON_SITELIBDIR%%/orca/speechdispatcherfactory.pyo
-%%PYTHON_SITELIBDIR%%/orca/speechgenerator.py
-%%PYTHON_SITELIBDIR%%/orca/speechgenerator.pyc
-%%PYTHON_SITELIBDIR%%/orca/speechgenerator.pyo
%%PYTHON_SITELIBDIR%%/orca/speechserver.py
%%PYTHON_SITELIBDIR%%/orca/speechserver.pyc
%%PYTHON_SITELIBDIR%%/orca/speechserver.pyo
@@ -397,6 +419,7 @@ share/locale/bg/LC_MESSAGES/orca.mo
share/locale/bn/LC_MESSAGES/orca.mo
share/locale/bn_IN/LC_MESSAGES/orca.mo
share/locale/ca/LC_MESSAGES/orca.mo
+share/locale/ca@valencia/LC_MESSAGES/orca.mo
share/locale/cs/LC_MESSAGES/orca.mo
share/locale/cy/LC_MESSAGES/orca.mo
share/locale/da/LC_MESSAGES/orca.mo
@@ -410,6 +433,7 @@ share/locale/et/LC_MESSAGES/orca.mo
share/locale/eu/LC_MESSAGES/orca.mo
share/locale/fi/LC_MESSAGES/orca.mo
share/locale/fr/LC_MESSAGES/orca.mo
+share/locale/ga/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
@@ -453,11 +477,13 @@ share/locale/vi/LC_MESSAGES/orca.mo
share/locale/zh_CN/LC_MESSAGES/orca.mo
share/locale/zh_HK/LC_MESSAGES/orca.mo
share/locale/zh_TW/LC_MESSAGES/orca.mo
-%%DATADIR%%/glade/orca-find.glade
-%%DATADIR%%/glade/orca-mainwin.glade
-%%DATADIR%%/glade/orca-quit.glade
-%%DATADIR%%/glade/orca-setup.glade
-@dirrm %%DATADIR%%/glade
+%%DATADIR%%/ui/orca-advanced-magnification.ui
+%%DATADIR%%/ui/orca-find.ui
+%%DATADIR%%/ui/orca-mainwin.ui
+%%DATADIR%%/ui/orca-preferences-warning.ui
+%%DATADIR%%/ui/orca-quit.ui
+%%DATADIR%%/ui/orca-setup.ui
+@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge
@@ -467,6 +493,7 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool
@@ -493,5 +520,7 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
@dirrmtry share/locale/mai
@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
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 34ab3fba5fd7..cbb5ea45be75 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,12 +3,11 @@
# Whom: Anders Nordby <anders@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/archivers/file-roller/Makefile,v 1.3 2009/04/15 22:32:08 kwm Exp $
+# $MCom: ports/archivers/file-roller/Makefile,v 1.165 2009/10/19 19:48:22 kwm Exp $
#
PORTNAME= file-roller
-PORTVERSION= 2.26.3
-PORTREVISION= 1
+PORTVERSION= 2.28.1
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= GNOME
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 65bcd8a96ce5..16df3f09f4a2 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/file-roller-2.26.3.tar.bz2) = 1876e9807a12c37f9bb2d00807905755
-SHA256 (gnome2/file-roller-2.26.3.tar.bz2) = 06ec16ab8b1c9d0a1b3d40d2d63cd8170776bcc44ffa1f48e0403a9e23aef769
-SIZE (gnome2/file-roller-2.26.3.tar.bz2) = 1561967
+MD5 (gnome2/file-roller-2.28.1.tar.bz2) = fcba40a9aa04386dec961a2f776777c5
+SHA256 (gnome2/file-roller-2.28.1.tar.bz2) = ce1b18d0ec5e383ef64def91b67c96cebd8adfb99ac3b4bcac0ae40c90a12250
+SIZE (gnome2/file-roller-2.28.1.tar.bz2) = 1736551
diff --git a/archivers/file-roller/files/patch-src_fr-enum-types.c b/archivers/file-roller/files/patch-src_fr-enum-types.c
deleted file mode 100644
index d1d08ea534a3..000000000000
--- a/archivers/file-roller/files/patch-src_fr-enum-types.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/fr-enum-types.c.orig 2009-06-30 20:34:58.000000000 +1000
-+++ src/fr-enum-types.c 2009-06-30 20:35:02.000000000 +1000
-@@ -4,7 +4,7 @@
- #include <glib-object.h>
-
- /* enumerations from "../../src/typedefs.h" */
--#include "../../src/typedefs.h"
-+#include "typedefs.h"
- GType
- fr_compression_get_type (void)
- {
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 394d0d64f1ab..2ce94a5fff60 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -2,6 +2,7 @@ bin/file-roller
%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-fileroller.la
%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-fileroller.so
libexec/file-roller/isoinfo.sh
+libexec/file-roller/rpm2cpio
share/applications/file-roller.desktop
%%DATADIR%%/icons/hicolor/16x16/actions/add-files-to-archive.png
%%DATADIR%%/icons/hicolor/16x16/actions/add-folder-to-archive.png
@@ -37,6 +38,12 @@ share/gnome/help/file-roller/ca/figures/file-roller_main_window.png
share/gnome/help/file-roller/ca/figures/file-roller_rightarrow.png
share/gnome/help/file-roller/ca/figures/file-roller_uparrow.png
share/gnome/help/file-roller/ca/file-roller.xml
+share/gnome/help/file-roller/cs/figures/file-roller_home.png
+share/gnome/help/file-roller/cs/figures/file-roller_leftarrow.png
+share/gnome/help/file-roller/cs/figures/file-roller_main_window.png
+share/gnome/help/file-roller/cs/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/cs/figures/file-roller_uparrow.png
+share/gnome/help/file-roller/cs/file-roller.xml
share/gnome/help/file-roller/de/figures/file-roller_home.png
share/gnome/help/file-roller/de/figures/file-roller_leftarrow.png
share/gnome/help/file-roller/de/figures/file-roller_main_window.png
@@ -134,6 +141,7 @@ share/locale/bn_IN/LC_MESSAGES/file-roller.mo
share/locale/br/LC_MESSAGES/file-roller.mo
share/locale/bs/LC_MESSAGES/file-roller.mo
share/locale/ca/LC_MESSAGES/file-roller.mo
+share/locale/ca@valencia/LC_MESSAGES/file-roller.mo
share/locale/cs/LC_MESSAGES/file-roller.mo
share/locale/cy/LC_MESSAGES/file-roller.mo
share/locale/da/LC_MESSAGES/file-roller.mo
@@ -162,6 +170,7 @@ share/locale/is/LC_MESSAGES/file-roller.mo
share/locale/it/LC_MESSAGES/file-roller.mo
share/locale/ja/LC_MESSAGES/file-roller.mo
share/locale/ka/LC_MESSAGES/file-roller.mo
+share/locale/kk/LC_MESSAGES/file-roller.mo
share/locale/kn/LC_MESSAGES/file-roller.mo
share/locale/ko/LC_MESSAGES/file-roller.mo
share/locale/ku/LC_MESSAGES/file-roller.mo
@@ -211,6 +220,7 @@ share/locale/zh_HK/LC_MESSAGES/file-roller.mo
share/locale/zh_TW/LC_MESSAGES/file-roller.mo
share/omf/file-roller/file-roller-C.omf
share/omf/file-roller/file-roller-ca.omf
+share/omf/file-roller/file-roller-cs.omf
share/omf/file-roller/file-roller-bg.omf
share/omf/file-roller/file-roller-de.omf
share/omf/file-roller/file-roller-el.omf
@@ -252,6 +262,8 @@ share/omf/file-roller/file-roller-vi.omf
@dirrm share/gnome/help/file-roller/el
@dirrm share/gnome/help/file-roller/de/figures
@dirrm share/gnome/help/file-roller/de
+@dirrm share/gnome/help/file-roller/cs/figures
+@dirrm share/gnome/help/file-roller/cs
@dirrm share/gnome/help/file-roller/ca/figures
@dirrm share/gnome/help/file-roller/ca
@dirrm share/gnome/help/file-roller/bg/figures
@@ -301,12 +313,16 @@ share/omf/file-roller/file-roller-vi.omf
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@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/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
diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile
index ce04285e23ab..9968bf25a6ce 100644
--- a/audio/audacity-devel/Makefile
+++ b/audio/audacity-devel/Makefile
@@ -6,6 +6,7 @@
PORTNAME= audacity
PORTVERSION= 1.3.9
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
SF/${PORTNAME}/${PORTNAME}-unstable/${PORTVERSION}
diff --git a/audio/audacity-devel/files/patch-src_AudacityApp.cpp b/audio/audacity-devel/files/patch-src_AudacityApp.cpp
new file mode 100644
index 000000000000..8026532a212a
--- /dev/null
+++ b/audio/audacity-devel/files/patch-src_AudacityApp.cpp
@@ -0,0 +1,30 @@
+--- src/AudacityApp.cpp.orig 2009-11-27 00:27:29.000000000 +0100
++++ src/AudacityApp.cpp 2009-11-27 00:48:36.000000000 +0100
+@@ -23,6 +23,15 @@ It handles initialization and terminatio
+
+ #include "Audacity.h" // This should always be included first
+
++/*
++ * Get Gtk.h and Glib.h included and working around that glib got
++ * a GSocket class now
++ */
++#include <dlfcn.h>
++#define GSocket GlibGSocket
++#include <gtk/gtk.h>
++#undef GSocket
++
+ #include <wx/defs.h>
+ #include <wx/app.h>
+ #include <wx/docview.h>
+@@ -328,8 +337,11 @@ void QuitAudacity()
+ // Most of this was taken from nsNativeAppSupportUnix.cpp from Mozilla.
+ ///////////////////////////////////////////////////////////////////////////////
+
++/* moved up so it doesn't undefs GSocket from wxgtk */
++/*
+ #include <dlfcn.h>
+ #include <gtk/gtk.h>
++*/
+
+ typedef struct _GnomeProgram GnomeProgram;
+ typedef struct _GnomeModuleInfo GnomeModuleInfo;
diff --git a/audio/freedesktop-sound-theme/Makefile b/audio/freedesktop-sound-theme/Makefile
index 35afe0e2a925..7b2d23ae6432 100644
--- a/audio/freedesktop-sound-theme/Makefile
+++ b/audio/freedesktop-sound-theme/Makefile
@@ -3,13 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/freedesktop-sound-theme/Makefile,v 1.2 2008/12/21 20:39:32 marcus Exp $
+# $MCom: ports/audio/freedesktop-sound-theme/Makefile,v 1.6 2009/11/27 22:09:57 marcus Exp $
#
PORTNAME= freedesktop-sound-theme
-PORTVERSION= 0.2
+PORTVERSION= 0.7
CATEGORIES= audio gnome
-MASTER_SITES= http://people.freedesktop.org/~mccann/dist/
+MASTER_SITES= LOCAL
+MASTER_SITE_SUBDIR= kwm
DISTNAME= sound-theme-freedesktop-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/audio/freedesktop-sound-theme/distinfo b/audio/freedesktop-sound-theme/distinfo
index decd5b7ce5d6..4d0c659a3ffa 100644
--- a/audio/freedesktop-sound-theme/distinfo
+++ b/audio/freedesktop-sound-theme/distinfo
@@ -1,3 +1,3 @@
-MD5 (sound-theme-freedesktop-0.2.tar.bz2) = 45c8383071d5c6514aa1899e2d0fc675
-SHA256 (sound-theme-freedesktop-0.2.tar.bz2) = cc7b5320bef9088d77aa11e6041bf6019152dac51cc7beef7a256484faf5b683
-SIZE (sound-theme-freedesktop-0.2.tar.bz2) = 852304
+MD5 (sound-theme-freedesktop-0.7.tar.bz2) = c55786fdc4455f7437cc6fe49ea13ed8
+SHA256 (sound-theme-freedesktop-0.7.tar.bz2) = 5a0d064fa4a6880438e46739ce8a8eebb9b8a0a7da723fc37585bbc18a076404
+SIZE (sound-theme-freedesktop-0.7.tar.bz2) = 505168
diff --git a/audio/freedesktop-sound-theme/pkg-plist b/audio/freedesktop-sound-theme/pkg-plist
index 43a95d6b96a2..b950de745b36 100644
--- a/audio/freedesktop-sound-theme/pkg-plist
+++ b/audio/freedesktop-sound-theme/pkg-plist
@@ -1,43 +1,38 @@
share/sounds/freedesktop/index.theme
-share/sounds/freedesktop/stereo/audio-channel-front-center.ogg
-share/sounds/freedesktop/stereo/audio-channel-front-left.ogg
-share/sounds/freedesktop/stereo/audio-channel-front-right.ogg
-share/sounds/freedesktop/stereo/audio-channel-rear-center.ogg
-share/sounds/freedesktop/stereo/audio-channel-rear-left.ogg
-share/sounds/freedesktop/stereo/audio-channel-rear-right.ogg
-share/sounds/freedesktop/stereo/audio-channel-side-left.ogg
-share/sounds/freedesktop/stereo/audio-channel-side-right.ogg
-share/sounds/freedesktop/stereo/audio-test-signal.ogg
-share/sounds/freedesktop/stereo/battery-low.ogg
-share/sounds/freedesktop/stereo/bell.ogg
-share/sounds/freedesktop/stereo/button-pressed.ogg
-share/sounds/freedesktop/stereo/button-toggle-off.ogg
-share/sounds/freedesktop/stereo/button-toggle-on.ogg
-share/sounds/freedesktop/stereo/complete-media-burn.ogg
-share/sounds/freedesktop/stereo/desktop-login.ogg
-share/sounds/freedesktop/stereo/desktop-logout.ogg
-share/sounds/freedesktop/stereo/dialog-cancel.ogg
-share/sounds/freedesktop/stereo/dialog-error.ogg
-share/sounds/freedesktop/stereo/dialog-information.ogg
-share/sounds/freedesktop/stereo/dialog-ok.ogg
-share/sounds/freedesktop/stereo/dialog-question.ogg
-share/sounds/freedesktop/stereo/dialog-warning.ogg
-share/sounds/freedesktop/stereo/link-pressed.ogg
-share/sounds/freedesktop/stereo/menu-click.ogg
-share/sounds/freedesktop/stereo/message-new-email.ogg
-share/sounds/freedesktop/stereo/message-new-instant.ogg
-share/sounds/freedesktop/stereo/phone-incoming-call.ogg
-share/sounds/freedesktop/stereo/phone-outgoing-busy.ogg
-share/sounds/freedesktop/stereo/power-unplug.ogg
-share/sounds/freedesktop/stereo/service-login.ogg
-share/sounds/freedesktop/stereo/service-logout.ogg
-share/sounds/freedesktop/stereo/suspend-error.ogg
-share/sounds/freedesktop/stereo/trash-empty.ogg
-share/sounds/freedesktop/stereo/window-close.ogg
-share/sounds/freedesktop/stereo/window-maximized.ogg
-share/sounds/freedesktop/stereo/window-minimized.ogg
-share/sounds/freedesktop/stereo/window-move-start.ogg
-share/sounds/freedesktop/stereo/window-move-stop.ogg
-share/sounds/freedesktop/stereo/window-slide.ogg
+share/sounds/freedesktop/stereo/alarm-clock-elapsed.oga
+share/sounds/freedesktop/stereo/audio-channel-front-center.oga
+share/sounds/freedesktop/stereo/audio-channel-front-left.oga
+share/sounds/freedesktop/stereo/audio-channel-front-right.oga
+share/sounds/freedesktop/stereo/audio-channel-rear-center.oga
+share/sounds/freedesktop/stereo/audio-channel-rear-left.oga
+share/sounds/freedesktop/stereo/audio-channel-rear-right.oga
+share/sounds/freedesktop/stereo/audio-channel-side-left.oga
+share/sounds/freedesktop/stereo/audio-channel-side-right.oga
+share/sounds/freedesktop/stereo/audio-test-signal.oga
+share/sounds/freedesktop/stereo/audio-volume-change.oga
+share/sounds/freedesktop/stereo/bell.oga
+share/sounds/freedesktop/stereo/camera-shutter.oga
+share/sounds/freedesktop/stereo/complete.oga
+share/sounds/freedesktop/stereo/device-added.oga
+share/sounds/freedesktop/stereo/device-removed.oga
+share/sounds/freedesktop/stereo/dialog-error.oga
+share/sounds/freedesktop/stereo/dialog-information.oga
+share/sounds/freedesktop/stereo/dialog-warning.oga
+share/sounds/freedesktop/stereo/message-new-instant.oga
+share/sounds/freedesktop/stereo/message.oga
+share/sounds/freedesktop/stereo/network-connectivity-established.oga
+share/sounds/freedesktop/stereo/network-connectivity-lost.oga
+share/sounds/freedesktop/stereo/phone-incoming-call.oga
+share/sounds/freedesktop/stereo/phone-outgoing-busy.oga
+share/sounds/freedesktop/stereo/phone-outgoing-calling.oga
+share/sounds/freedesktop/stereo/power-plug.oga
+share/sounds/freedesktop/stereo/power-unplug.oga
+share/sounds/freedesktop/stereo/screen-capture.oga
+share/sounds/freedesktop/stereo/service-login.oga
+share/sounds/freedesktop/stereo/service-logout.oga
+share/sounds/freedesktop/stereo/suspend-error.oga
+share/sounds/freedesktop/stereo/trash-empty.oga
+share/sounds/freedesktop/stereo/window-attention.oga
+share/sounds/freedesktop/stereo/window-question.oga
@dirrm share/sounds/freedesktop/stereo
@dirrm share/sounds/freedesktop
diff --git a/audio/gmpc-wikipedia/Makefile b/audio/gmpc-wikipedia/Makefile
index 189908b845f0..a6700ecf7572 100644
--- a/audio/gmpc-wikipedia/Makefile
+++ b/audio/gmpc-wikipedia/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gmpc-wikipedia
PORTVERSION= 0.19.0
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
http://freebsd.unixfreunde.de/sources/
@@ -16,7 +17,7 @@ COMMENT= Wikipedia info for gmpc
LIB_DEPENDS= mpd:${PORTSDIR}/audio/libmpd \
curl.5:${PORTSDIR}/ftp/curl \
- webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+ webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
RUN_DEPEND= gmpc:${PORTSDIR}/audio/gmpc
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 986ce70212d6..83548a6d5b65 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/gnome-media/Makefile,v 1.130 2009/03/17 22:20:16 kwm Exp $
+# $MCom: ports/audio/gnome-media/Makefile,v 1.147 2009/11/26 06:20:13 marcus Exp $
#
PORTNAME= gnome-media
-PORTVERSION= 2.26.0
-PORTREVISION= 7
+PORTVERSION= 2.28.1
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,7 +16,9 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Multimedia applications for the GNOME 2 desktop
+BUILD_DEPENDS= xml2po:${PORTSDIR}/textproc/gnome-doc-utils
LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
+ pulse.0:${PORTSDIR}/audio/pulseaudio \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
USE_BZIP2= yes
@@ -27,58 +29,14 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libgnomeui libxml2 \
+USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libxml2 libglade2 \
gconf2
USE_GSTREAMER= gconf good
+CONFIGURE_ARGS= --disable-gstmix
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= gnome-audio-profiles.schemas \
gnome-sound-recorder.schemas
-OPTIONS= ESOUND "Enable the EsounD module" on \
- IPV6 "Enable support for IPv6" on \
- PULSEAUDIO "Enable the PulseAudio module" on
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_ESOUND)
-USE_GSTREAMER+= esound
-PLIST_SUB+= VUMETER=""
-.else
-CONFIGURE_ARGS+=--disable-esound --disable-esdtest
-PLIST_SUB+= VUMETER="@comment "
-.endif
-
-.if defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=--disable-ipv6
-.endif
-
-.if defined(WITH_PULSEAUDIO)
-LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
-PLIST_SUB+= PULSE=""
-.else
-CONFIGURE_ARGS+=--disable-pulseaudio
-PLIST_SUB+= PULSE="@comment "
-.endif
-
-.if defined(WITH_ESOUND) && defined(WITHOUT_PULSEAUDIO)
-CONFIGURE_ARGS+=--enable-gstmix
-PLIST_SUB+= GSTMIX=""
-GCONF_SCHEMAS+= gnome-volume-control.schemas
-.else
-CONFIGURE_ARGS+=--disable-gstmix
-PLIST_SUB+= GSTMIX="@comment "
-.endif
-
-.if defined(WITH_ESOUND) || defined(WITH_PULSEAUDIO)
-PLIST_SUB+= GVC=""
-.else
-PLIST_SUB+= GVC="@comment "
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|== "xyes|= "xyes|g' \
- ${WRKSRC}/configure
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index d98b2233165f..a06e5462aef4 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/gnome-media-2.28.1.tar.bz2) = 44fa273824cb18bb3118756d4bef69e6
+SHA256 (gnome2/gnome-media-2.28.1.tar.bz2) = 1a1efc4f8f0b127cde4839d64343a5041c00ffb87597d45aabd4e22c4422eed0
+SIZE (gnome2/gnome-media-2.28.1.tar.bz2) = 2557601
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index a6f55e16f2f9..b00877874fb1 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -1,9 +1,9 @@
bin/gnome-audio-profiles-properties
bin/gnome-sound-recorder
-%%GVC%%bin/gnome-volume-control
-%%GVC%%bin/gnome-volume-control-applet
+bin/gnome-volume-control
+bin/gnome-volume-control-applet
bin/gstreamer-properties
-%%GVC%%etc/xdg/autostart/gnome-volume-control-applet.desktop
+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
@@ -18,40 +18,46 @@ lib/libgnome-media-profiles.so
lib/libgnome-media-profiles.so.0
libdata/pkgconfig/gnome-media-profiles.pc
share/applications/gnome-sound-recorder.desktop
-%%GVC%%share/applications/gnome-volume-control.desktop
+share/applications/gnome-volume-control.desktop
share/applications/gstreamer-properties.desktop
%%DATADIR%%/glade/gnome-audio-profiles.glade2
-%%GVC%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png
-%%GVC%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png
-%%GVC%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-medium.png
-%%GVC%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-muted.png
-%%GVC%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-high.png
-%%GVC%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-low.png
-%%GVC%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-medium.png
-%%GVC%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-muted.png
-%%GVC%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-high.png
-%%GVC%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-low.png
-%%GVC%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-medium.png
-%%GVC%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-muted.png
-%%GVC%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-high.png
-%%GVC%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-low.png
-%%GVC%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-medium.png
-%%GVC%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-muted.png
-%%GVC%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-high.svg
-%%GVC%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-low.svg
-%%GVC%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-medium.svg
-%%GVC%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
-%%GSTMIX%%%%DATADIR%%/pixmaps/chain-broken.png
-%%GSTMIX%%%%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-audio-profiles/C/figures/gnome-audio-profiles-profile-window.png
+share/gnome/help/gnome-audio-profiles/C/figures/gnome-audio-profiles-profiles-window.png
+share/gnome/help/gnome-audio-profiles/C/gnome-audio-profiles.xml
+share/gnome/help/gnome-audio-profiles/C/legal.xml
share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
share/gnome/help/gnome-sound-recorder/C/legal.xml
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/cs/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/cs/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/el/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/el/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
@@ -68,32 +74,19 @@ 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
-%%GSTMIX%%share/gnome/help/gnome-volume-control/C/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/C/legal.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/ca/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/ca/gnome-volume-control.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/de/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/de/gnome-volume-control.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/es/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/es/gnome-volume-control.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/fr/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/fr/gnome-volume-control.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/it/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/it/gnome-volume-control.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/oc/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/oc/gnome-volume-control.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/ru/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/ru/gnome-volume-control.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/sv/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/sv/gnome-volume-control.xml
+share/gnome/help/gnome-sound-recorder/zh_CN/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/zh_CN/gnome-sound-recorder.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
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/cs/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/cs/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/el/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/el/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
@@ -104,38 +97,38 @@ share/gnome/help/gstreamer-properties/it/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/it/gstreamer-properties.xml
share/gnome/help/gstreamer-properties/oc/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/oc/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/pt_BR/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/pt_BR/gstreamer-properties.xml
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/gnome/help/gstreamer-properties/zh_CN/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/zh_CN/gstreamer-properties.xml
+share/gstreamer-properties/gstreamer-properties.ui
share/gstreamer-properties/icons/gstreamer-properties.png
share/icons/hicolor/16x16/apps/gnome-sound-recorder.png
-%%GVC%%share/icons/hicolor/16x16/apps/gnome-volume-control.png
-%%GVC%%share/icons/hicolor/16x16/apps/gnome-volume-control.svg
-%%GSTMIX%%share/icons/hicolor/16x16/devices/gvc-3d-sound.png
-%%GSTMIX%%share/icons/hicolor/16x16/devices/gvc-headphones.png
-%%GSTMIX%%share/icons/hicolor/16x16/devices/gvc-line-in.png
-%%GSTMIX%%share/icons/hicolor/16x16/devices/gvc-tone.png
-%%GSTMIX%%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
-%%GVC%%share/icons/hicolor/22x22/apps/gnome-volume-control.png
-%%GVC%%share/icons/hicolor/22x22/apps/gnome-volume-control.svg
+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
-%%GVC%%share/icons/hicolor/24x24/apps/gnome-volume-control.png
+share/icons/hicolor/24x24/apps/gnome-volume-control.png
share/icons/hicolor/32x32/apps/gnome-sound-recorder.png
-%%GVC%%share/icons/hicolor/32x32/apps/gnome-volume-control.png
-%%GVC%%share/icons/hicolor/32x32/apps/gnome-volume-control.svg
+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
-%%GVC%%share/icons/hicolor/48x48/apps/gnome-volume-control.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
-%%GVC%%share/icons/hicolor/scalable/apps/gnome-volume-control.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
+share/locale/ast/LC_MESSAGES/gnome-media-2.0.mo
share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
share/locale/be/LC_MESSAGES/gnome-media-2.0.mo
share/locale/be@latin/LC_MESSAGES/gnome-media-2.0.mo
@@ -145,6 +138,7 @@ share/locale/bn_IN/LC_MESSAGES/gnome-media-2.0.mo
share/locale/br/LC_MESSAGES/gnome-media-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-media-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-media-2.0.mo
share/locale/da/LC_MESSAGES/gnome-media-2.0.mo
@@ -214,29 +208,27 @@ share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-media-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
+share/omf/gnome-audio-profiles/gnome-audio-profiles-C.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-C.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-ca.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-cs.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-de.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-el.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
share/omf/gnome-sound-recorder/gnome-sound-recorder-oc.omf
+share/omf/gstreamer-properties/gstreamer-properties-pt_BR.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-ru.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-sv.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-uk.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-C.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-ca.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-de.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-es.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-fr.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-it.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-oc.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-ru.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-sv.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-zh_CN.omf
share/omf/gstreamer-properties/gstreamer-properties-C.omf
share/omf/gstreamer-properties/gstreamer-properties-ca.omf
+share/omf/gstreamer-properties/gstreamer-properties-cs.omf
share/omf/gstreamer-properties/gstreamer-properties-de.omf
+share/omf/gstreamer-properties/gstreamer-properties-el.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
@@ -245,6 +237,7 @@ 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/omf/gstreamer-properties/gstreamer-properties-zh_CN.omf
share/sounds/gnome/default/alerts/bark.ogg
share/sounds/gnome/default/alerts/drip.ogg
share/sounds/gnome/default/alerts/glass.ogg
@@ -253,17 +246,20 @@ share/sounds/gnome/default/alerts/sonar.ogg
@dirrm share/sounds/gnome/default
@dirrm share/sounds/gnome
@dirrm share/omf/gstreamer-properties
-%%GSTMIX%%@dirrm share/omf/gnome-volume-control
@dirrm share/omf/gnome-sound-recorder
+@dirrm share/omf/gnome-audio-profiles
@dirrm share/gstreamer-properties/icons
-@dirrm share/gstreamer-properties/glade
@dirrm share/gstreamer-properties
+@dirrm share/gnome/help/gstreamer-properties/zh_CN/figures
+@dirrm share/gnome/help/gstreamer-properties/zh_CN
@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
@dirrm share/gnome/help/gstreamer-properties/ru
+@dirrm share/gnome/help/gstreamer-properties/pt_BR/figures
+@dirrm share/gnome/help/gstreamer-properties/pt_BR
@dirrm share/gnome/help/gstreamer-properties/oc/figures
@dirrm share/gnome/help/gstreamer-properties/oc
@dirrm share/gnome/help/gstreamer-properties/it/figures
@@ -274,32 +270,19 @@ share/sounds/gnome/default/alerts/sonar.ogg
@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/el/figures
+@dirrm share/gnome/help/gstreamer-properties/el
@dirrm share/gnome/help/gstreamer-properties/de/figures
@dirrm share/gnome/help/gstreamer-properties/de
+@dirrm share/gnome/help/gstreamer-properties/cs/figures
+@dirrm share/gnome/help/gstreamer-properties/cs
@dirrm share/gnome/help/gstreamer-properties/ca/figures
@dirrm share/gnome/help/gstreamer-properties/ca
@dirrm share/gnome/help/gstreamer-properties/C/figures
@dirrm share/gnome/help/gstreamer-properties/C
@dirrm share/gnome/help/gstreamer-properties
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/sv/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/sv
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/ru/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/ru
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/oc/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/oc
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/it/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/it
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/fr/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/fr
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/es/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/es
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/de/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/de
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/ca/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/ca
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/C/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/C
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control
+@dirrm share/gnome/help/gnome-sound-recorder/zh_CN/figures
+@dirrm share/gnome/help/gnome-sound-recorder/zh_CN
@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
@@ -316,29 +299,35 @@ share/sounds/gnome/default/alerts/sonar.ogg
@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/el/figures
+@dirrm share/gnome/help/gnome-sound-recorder/el
@dirrm share/gnome/help/gnome-sound-recorder/de/figures
@dirrm share/gnome/help/gnome-sound-recorder/de
+@dirrm share/gnome/help/gnome-sound-recorder/cs/figures
+@dirrm share/gnome/help/gnome-sound-recorder/cs
@dirrm share/gnome/help/gnome-sound-recorder/ca/figures
@dirrm share/gnome/help/gnome-sound-recorder/ca
@dirrm share/gnome/help/gnome-sound-recorder/C/figures
@dirrm share/gnome/help/gnome-sound-recorder/C
@dirrm share/gnome/help/gnome-sound-recorder
+@dirrm share/gnome/help/gnome-audio-profiles/C/figures
+@dirrm share/gnome/help/gnome-audio-profiles/C
+@dirrm share/gnome/help/gnome-audio-profiles
@dirrm share/gnome-sound-recorder/ui
@dirrm share/gnome-sound-recorder
@dirrm %%DATADIR%%/sounds
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/scalable/status
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/scalable
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/32x32/status
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/32x32
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/24x24/status
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/24x24
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/22x22/status
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/22x22
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/16x16/status
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/16x16
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor
-%%GVC%%@dirrm %%DATADIR%%/icons
-%%GSTMIX%%@dirrm %%DATADIR%%/pixmaps
+@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
@@ -368,9 +357,13 @@ share/sounds/gnome/default/alerts/sonar.ogg
@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/audio/gstreamer-plugins-cdparanoia/Makefile b/audio/gstreamer-plugins-cdparanoia/Makefile
index 01ca95b19746..fff94ddd0cad 100644
--- a/audio/gstreamer-plugins-cdparanoia/Makefile
+++ b/audio/gstreamer-plugins-cdparanoia/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/gstreamer-plugins-cdparanoia/Makefile,v 1.6 2008/03/21 04:01:31 ahze Exp $
+# $MCom: ports/audio/gstreamer-plugins-cdparanoia/Makefile,v 1.8 2009/11/17 19:08:45 kwm Exp $
#
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= audio
COMMENT= Gstreamer CDDA extraction (aka audio ripping) plugin
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 827f9b310a47..77c66579ecb3 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libcanberra
-PORTVERSION= 0.10
-PORTREVISION= 5
+PORTVERSION= 0.22
CATEGORIES= audio devel
MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/
@@ -20,7 +19,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20 ltverhack gconf2
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22 libltdl:22
-CONFIGURE_ARGS= --disable-lynx
+CONFIGURE_ARGS= --disable-lynx --disable-tdb
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -29,6 +28,8 @@ GCONF_SCHEMAS= libcanberra.schemas
OPTIONS= PULSE "Enable Pulse Audio support" off \
GSTREAMER "Enable GStreamer audio support" off
+PLIST_SUB= VERSION=${PORTVERSION}
+
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_PULSE)
diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo
index 7adb467b8697..f771edecc145 100644
--- a/audio/libcanberra/distinfo
+++ b/audio/libcanberra/distinfo
@@ -1,3 +1,3 @@
-MD5 (libcanberra-0.10.tar.gz) = 2623370bfcecaeecaeb85e5ec445f340
-SHA256 (libcanberra-0.10.tar.gz) = b0e3cb59e605412a52352cf9cf36344b165463d4e65916c95deb73fc51838272
-SIZE (libcanberra-0.10.tar.gz) = 826222
+MD5 (libcanberra-0.22.tar.gz) = e24e2f956fedfbcc58edfa40471b18d8
+SHA256 (libcanberra-0.22.tar.gz) = 6a87737c3d045549a4a9c789cfc565a48185a586aa1a59243dea6421e9978581
+SIZE (libcanberra-0.22.tar.gz) = 459404
diff --git a/audio/libcanberra/files/patch-Makefile.in b/audio/libcanberra/files/patch-Makefile.in
deleted file mode 100644
index bd5972c313b2..000000000000
--- a/audio/libcanberra/files/patch-Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.in.orig 2008-12-20 13:42:12.000000000 -0500
-+++ Makefile.in 2008-12-20 20:43:22.000000000 -0500
-@@ -271,7 +271,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- dist_doc_DATA = README
- EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
--SUBDIRS = src gtkdoc libltdl doc
-+SUBDIRS = src gtkdoc doc
- MAINTAINERCLEANFILES = README
- noinst_DATA = README
- pkgconfigdir = $(prefix)/libdata/pkgconfig
-@@ -794,11 +794,11 @@ uninstall-am: uninstall-dist_docDATA uni
-
-
- @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
--@GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \
--@GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \
--@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
--@GCONF_SCHEMAS_INSTALL_TRUE@ done \
--@GCONF_SCHEMAS_INSTALL_TRUE@ fi
-+@GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \
-+@GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \
-+@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/$$p ; \
-+@GCONF_SCHEMAS_INSTALL_TRUE@ done ; \
-+@GCONF_SCHEMAS_INSTALL_TRUE@ fi
- @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
-
- README:
diff --git a/audio/libcanberra/files/patch-configure b/audio/libcanberra/files/patch-configure
deleted file mode 100644
index 7d643125157c..000000000000
--- a/audio/libcanberra/files/patch-configure
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.orig 2008-12-19 19:07:23.000000000 -0500
-+++ configure 2008-12-19 19:08:01.000000000 -0500
-@@ -791,7 +791,6 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
-
--enable_option_checking=no
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
- GTK_DOC_USE_LIBTOOL_FALSE
-@@ -878,7 +877,6 @@ USE_VERSION_SCRIPT_FALSE
- USE_VERSION_SCRIPT_TRUE
- OS_IS_WIN32_FALSE
- OS_IS_WIN32_TRUE
--subdirs
- LIBLTDL
- LTDLINCL
- LIBTOOL
-@@ -1054,7 +1052,7 @@ TDB_CFLAGS
- TDB_LIBS
- VORBIS_CFLAGS
- VORBIS_LIBS'
--ac_subdirs_all='libltdl'
-+
-
- # Initialize some variables set by options.
- ac_init_help=
diff --git a/audio/libcanberra/files/patch-src_libcanberra-login-sound.desktop.in b/audio/libcanberra/files/patch-src_libcanberra-login-sound.desktop.in
deleted file mode 100644
index c779f3f6e450..000000000000
--- a/audio/libcanberra/files/patch-src_libcanberra-login-sound.desktop.in
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5081594cb8cbb69fc282260388b2bb0164ce31dd Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sun, 14 Dec 2008 22:04:01 +0100
-Subject: [PATCH] Run lc-l-s in "Application" phase of gnome-session
-
-There is no need to make g-s wait for this lc-l-s when it plays the
-welcome tune. Hence move it to "Application" phase instead of "Desktop"
-phase.
-
-This is a result of a discussion with Behdad Esfahbod to optimize the
-login time.
----
- src/libcanberra-login-sound.desktop.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/libcanberra-login-sound.desktop.in b/src/libcanberra-login-sound.desktop.in
-index 5b4cf7f..9fcf357 100644
---- src/libcanberra-login-sound.desktop.in
-+++ src/libcanberra-login-sound.desktop.in
-@@ -4,6 +4,6 @@ Name=GNOME Login Sound
- Exec=@bindir@/canberra-gtk-play --id="desktop-login" --description="GNOME Login"
- OnlyShowIn=GNOME;
- AutostartCondition=GNOME /desktop/gnome/sound/event_sounds
--X-GNOME-Autostart-Phase=Desktop
-+X-GNOME-Autostart-Phase=Application
- X-GNOME-Provides=login-sound
- X-GNOME-Autostart-Notify=true
---
-1.6.0.5
-
diff --git a/audio/libcanberra/files/patch-src_oss.c b/audio/libcanberra/files/patch-src_oss.c
index ec8bdc3c4011..d4b910a3c0a8 100644
--- a/audio/libcanberra/files/patch-src_oss.c
+++ b/audio/libcanberra/files/patch-src_oss.c
@@ -1,15 +1,6 @@
---- src/oss.c.orig 2008-09-01 19:53:47.000000000 -0400
-+++ src/oss.c 2008-12-21 13:51:09.000000000 -0500
-@@ -235,7 +235,7 @@ static int open_oss(ca_context *c, struc
- ca_return_val_if_fail(c, CA_ERROR_INVALID);
- ca_return_val_if_fail(c->private, CA_ERROR_STATE);
- ca_return_val_if_fail(out, CA_ERROR_INVALID);
-- ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) > 2, CA_ERROR_NOTSUPPORTED);
-+ ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) <= 2, CA_ERROR_NOTSUPPORTED);
-
- p = PRIVATE(c);
-
-@@ -258,7 +258,7 @@ static int open_oss(ca_context *c, struc
+--- src/oss.c.orig 2009-08-26 21:58:16.000000000 -0400
++++ src/oss.c 2009-11-25 20:47:07.000000000 -0500
+@@ -260,7 +260,7 @@ static int open_oss(ca_context *c, struc
val = AFMT_S16_NE;
break;
case CA_SAMPLE_S16RE:
@@ -18,11 +9,3 @@
val = AFMT_S16_BE;
#else
val = AFMT_S16_LE;
-@@ -423,6 +423,7 @@ int driver_play(ca_context *c, uint32_t
- out->callback = cb;
- out->userdata = userdata;
- out->pipe_fd[0] = out->pipe_fd[1] = -1;
-+ out->pcm = -1;
-
- if (pipe(out->pipe_fd) < 0) {
- ret = CA_ERROR_SYSTEM;
diff --git a/audio/libcanberra/pkg-plist b/audio/libcanberra/pkg-plist
index 816a75992ec4..e32487a18e5e 100644
--- a/audio/libcanberra/pkg-plist
+++ b/audio/libcanberra/pkg-plist
@@ -15,18 +15,18 @@ lib/libcanberra.so.0
%%GSTREAMER%%lib/libcanberra/libcanberra-gstreamer.a
%%GSTREAMER%%lib/libcanberra/libcanberra-gstreamer.la
%%GSTREAMER%%lib/libcanberra/libcanberra-gstreamer.so
-lib/libcanberra/libcanberra-multi.a
-lib/libcanberra/libcanberra-multi.la
-lib/libcanberra/libcanberra-multi.so
-lib/libcanberra/libcanberra-null.a
-lib/libcanberra/libcanberra-null.la
-lib/libcanberra/libcanberra-null.so
-lib/libcanberra/libcanberra-oss.a
-lib/libcanberra/libcanberra-oss.la
-lib/libcanberra/libcanberra-oss.so
-%%PULSE%%lib/libcanberra/libcanberra-pulse.a
-%%PULSE%%lib/libcanberra/libcanberra-pulse.la
-%%PULSE%%lib/libcanberra/libcanberra-pulse.so
+lib/libcanberra-%%VERSION%%/libcanberra-multi.a
+lib/libcanberra-%%VERSION%%/libcanberra-multi.la
+lib/libcanberra-%%VERSION%%/libcanberra-multi.so
+lib/libcanberra-%%VERSION%%/libcanberra-null.a
+lib/libcanberra-%%VERSION%%/libcanberra-null.la
+lib/libcanberra-%%VERSION%%/libcanberra-null.so
+lib/libcanberra-%%VERSION%%/libcanberra-oss.a
+lib/libcanberra-%%VERSION%%/libcanberra-oss.la
+lib/libcanberra-%%VERSION%%/libcanberra-oss.so
+%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.a
+%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.la
+%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.so
libdata/pkgconfig/libcanberra-gtk.pc
libdata/pkgconfig/libcanberra.pc
%%DOCSDIR%%/README
@@ -42,8 +42,14 @@ libdata/pkgconfig/libcanberra.pc
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
+share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
share/gnome/autostart/libcanberra-login-sound.desktop
share/gnome/shutdown/libcanberra-logout-sound.sh
+share/vala/vapi/libcanberra-gtk.vapi
+share/vala/vapi/libcanberra.vapi
@dirrmtry share/gnome/shutdown
+@dirrmtry share/gdm/autostart/LoginWindow
+@dirrmtry share/gdm/autostart
+@dirrmtry share/gdm
@dirrm %%DOCSDIR%%
-@dirrm lib/libcanberra
+@dirrm lib/libcanberra-%%VERSION%%
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index fd3a0acfc8fb..bab70c26ba67 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -3,11 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/audio/pulseaudio/Makefile,v 1.5 2009/07/20 21:26:40 marcus Exp $
+# $MCom: ports/audio/pulseaudio/Makefile,v 1.21 2009/11/28 19:08:20 marcus Exp $
+#
+# !!!NOTE!!! Any PORTVERSION update to this port must be accompanied by
+# PORTREVISION bumps to audio/gnome-media, sysutils/gnome-settings-daemon,
+# and audio/gstreamer-plugins-pulse.
#
PORTNAME= pulseaudio
-PORTVERSION= 0.9.19
+PORTVERSION= 0.9.21
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index c516046fca19..8529bce24ed9 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,3 +1,3 @@
-MD5 (pulseaudio-0.9.19.tar.gz) = 02adc2b99252675f0271db3b9edd432e
-SHA256 (pulseaudio-0.9.19.tar.gz) = e47e27083deb79571fb2b9215874ddc26d77c3dec2a7dc8de5ecec9058e4b806
-SIZE (pulseaudio-0.9.19.tar.gz) = 2029090
+MD5 (pulseaudio-0.9.21.tar.gz) = 76e623c4c72e2258bc8bdeb1599bad74
+SHA256 (pulseaudio-0.9.21.tar.gz) = 94e22356ac70ee95388ae58da90d88c6b3186d1938618d21671627ff56cee254
+SIZE (pulseaudio-0.9.21.tar.gz) = 2056896
diff --git a/audio/pulseaudio/files/patch-configure b/audio/pulseaudio/files/patch-configure
index 5130810053df..21a97d9124cc 100644
--- a/audio/pulseaudio/files/patch-configure
+++ b/audio/pulseaudio/files/patch-configure
@@ -1,27 +1,23 @@
---- configure.orig 2008-07-26 15:15:12.000000000 -0400
-+++ configure 2008-07-26 15:15:35.000000000 -0400
-@@ -25321,6 +25321,7 @@ $as_echo_n "checking whether to check fo
+--- configure.orig 2009-11-24 16:31:47.000000000 +0100
++++ configure 2009-11-24 16:32:35.000000000 +0100
+@@ -13586,6 +13586,7 @@
check_inconsistencies=yes
case "${host_cpu}-${host_os}" in
*-darwin*) check_inconsistencies=no ;;
+ *-freebsd*) check_inconsistencies=no ;;
esac
if test x"$GCC" != xyes -o "x$check_inconsistencies" != xyes ; then
- { $as_echo "$as_me:$LINENO: result: no" >&5
-@@ -32654,9 +32655,9 @@ _ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+@@ -18007,7 +18008,7 @@
else
-- { { $as_echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5
--$as_echo "$as_me: error: *** libatomic-ops headers not found" >&2;}
-- { (exit 1); exit 1; }; }
-+# { { $as_echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5
-+#$as_echo "$as_me: error: *** libatomic-ops headers not found" >&2;}
-+# { (exit 1); exit 1; }; }
+- as_fn_error "*** libatomic-ops headers not found" "$LINENO" 5
++# as_fn_error "*** libatomic-ops headers not found" "$LINENO" 5
fi
-@@ -32664,9 +32665,9 @@ done
+@@ -18015,9 +18016,9 @@
# Win32 does not need the lib and breaks horribly if we try to include it
@@ -32,5 +28,5 @@
+# LIBS="$LIBS -latomic_ops"
+# fi
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_shm.c b/audio/pulseaudio/files/patch-src_pulsecore_shm.c
index 549091ccc487..4dfa3a3a9392 100644
--- a/audio/pulseaudio/files/patch-src_pulsecore_shm.c
+++ b/audio/pulseaudio/files/patch-src_pulsecore_shm.c
@@ -1,7 +1,7 @@
---- src/pulsecore/shm.c.orig 2007-10-28 15:13:53.000000000 -0400
-+++ src/pulsecore/shm.c 2008-01-01 16:19:19.000000000 -0500
-@@ -80,7 +80,7 @@ struct shm_marker {
- };
+--- src/pulsecore/shm.c.orig 2009-08-19 10:17:06.000000000 +0800
++++ src/pulsecore/shm.c 2009-11-11 21:25:03.000000000 +0800
+@@ -91,7 +91,7 @@
+ #define SHM_MARKER_SIZE PA_ALIGN(sizeof(struct shm_marker))
static char *segment_name(char *fn, size_t l, unsigned id) {
- pa_snprintf(fn, l, "/pulse-shm-%u", id);
@@ -9,3 +9,12 @@
return fn;
}
+@@ -142,7 +142,7 @@
+ pa_random(&m->id, sizeof(m->id));
+ segment_name(fn, sizeof(fn), m->id);
+
+- if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0444)) < 0) {
++ if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0644)) < 0) {
+ pa_log("shm_open() failed: %s", pa_cstrerror(errno));
+ goto fail;
+ }
diff --git a/audio/pulseaudio/files/patch-src_tests_rtstutter.c b/audio/pulseaudio/files/patch-src_tests_rtstutter.c
new file mode 100644
index 000000000000..c80737b1946f
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_tests_rtstutter.c
@@ -0,0 +1,27 @@
+--- src/tests/rtstutter.c.orig 2009-07-23 15:40:47.000000000 +0200
++++ src/tests/rtstutter.c 2009-11-24 16:26:36.000000000 +0100
+@@ -31,6 +31,11 @@
+ #include <string.h>
+ #include <pthread.h>
+
++#ifdef HAVE_PTHREAD_SETAFFINITY_NP
++#include <sys/param.h>
++#include <sys/cpuset.h>
++#endif
++
+ #include <pulse/timeval.h>
+ #include <pulse/gccmacro.h>
+
+@@ -44,8 +49,12 @@
+
+ static void* work(void *p) {
+ #ifdef HAVE_PTHREAD_SETAFFINITY_NP
++#ifdef __FreeBSD__
++ cpuset_t mask;
++#else
+ cpu_set_t mask;
+ #endif
++#endif
+ struct sched_param param;
+
+ pa_log_notice("CPU%i: Created thread.", PA_PTR_TO_UINT(p));
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index b42a03710b05..8be11434795d 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -11,6 +11,7 @@ bin/parecord
bin/pasuspender
bin/pax11publish
bin/pulseaudio
+bin/start-pulseaudio-kde
bin/start-pulseaudio-x11
etc/dbus-1/system.d/pulseaudio-system.conf
@unexec if cmp -s %D/etc/pulse/client.conf %D/etc/pulse/client.conf-dist; then rm -f %D/etc/pulse/client.conf; fi
@@ -26,12 +27,14 @@ etc/pulse/default.pa-dist
etc/pulse/system.pa-dist
@exec [ -f %B/system.pa ] || cp %B/%f %B/system.pa
etc/xdg/autostart/pulseaudio.desktop
+etc/xdg/autostart/pulseaudio-kde.desktop
%%AVAHI%%include/pulse/browser.h
include/pulse/cdecl.h
include/pulse/channelmap.h
include/pulse/context.h
include/pulse/def.h
include/pulse/error.h
+include/pulse/ext-device-manager.h
include/pulse/ext-stream-restore.h
include/pulse/gccmacro.h
include/pulse/glib-mainloop.h
@@ -81,6 +84,8 @@ lib/libpulsedsp.a
lib/libpulsedsp.so
%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.a
%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.a
+lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so
lib/pulse-%%PULSE_VERSION%%/modules/libcli.a
lib/pulse-%%PULSE_VERSION%%/modules/libcli.so
lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.a
@@ -230,6 +235,7 @@ share/locale/fi/LC_MESSAGES/pulseaudio.mo
share/locale/fr/LC_MESSAGES/pulseaudio.mo
share/locale/gu/LC_MESSAGES/pulseaudio.mo
share/locale/hi/LC_MESSAGES/pulseaudio.mo
+share/locale/hu/LC_MESSAGES/pulseaudio.mo
share/locale/it/LC_MESSAGES/pulseaudio.mo
share/locale/ja/LC_MESSAGES/pulseaudio.mo
share/locale/kn/LC_MESSAGES/pulseaudio.mo
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 37cc23244101..94b1c4f3879b 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.97 2009/04/09 03:24:06 mezz Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.103 2009/11/22 22:09:39 marcus Exp $
#
PORTNAME= rhythmbox
PORTVERSION= 0.12.6
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -23,7 +24,7 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
soup-2.4.1:${PORTSDIR}/devel/libsoup \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
- brasero-media.1:${PORTSDIR}/sysutils/brasero
+ brasero-media.2:${PORTSDIR}/sysutils/brasero
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 058f98d97d9b..e918f875668b 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.91 2009/03/18 04:24:29 marcus Exp $
+# $MCom: ports/audio/sound-juicer/Makefile,v 1.96 2009/11/26 08:20:43 marcus Exp $
#
PORTNAME= sound-juicer
-PORTVERSION= 2.26.1
-PORTREVISION= 2
+PORTVERSION= 2.28.1
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -19,11 +18,11 @@ 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.12:${PORTSDIR}/sysutils/libcdio \
+ cdio.8:${PORTSDIR}/sysutils/libcdio \
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
+ brasero-media.2:${PORTSDIR}/sysutils/brasero
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index 7c4e36f21280..6433beb16e83 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/sound-juicer-2.26.1.tar.bz2) = 68d085cb577af88553f2dcaf3a0fc2a1
-SHA256 (gnome2/sound-juicer-2.26.1.tar.bz2) = 5e6220158270b5f76e6a9f74f597837b41000c695e4ae81254dd945024c0c9e5
-SIZE (gnome2/sound-juicer-2.26.1.tar.bz2) = 1993986
+MD5 (gnome2/sound-juicer-2.28.1.tar.bz2) = 680c036ca9b062fe198fada30edbf534
+SHA256 (gnome2/sound-juicer-2.28.1.tar.bz2) = 3142cce899812c6fb8c7145d52323f07d6ecfd6ca0503f4c7a32a12c00b8910c
+SIZE (gnome2/sound-juicer-2.28.1.tar.bz2) = 2159961
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index 14faef6de523..db0061e36e6c 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -12,6 +12,10 @@ 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
share/gnome/help/sound-juicer/ca/sound-juicer.xml
+share/gnome/help/sound-juicer/cs/figures/prefs.png
+share/gnome/help/sound-juicer/cs/figures/startup.png
+share/gnome/help/sound-juicer/cs/legal.xml
+share/gnome/help/sound-juicer/cs/sound-juicer.xml
share/gnome/help/sound-juicer/de/figures/prefs.png
share/gnome/help/sound-juicer/de/figures/startup.png
share/gnome/help/sound-juicer/de/legal.xml
@@ -80,6 +84,7 @@ share/locale/bn/LC_MESSAGES/sound-juicer.mo
share/locale/bn_IN/LC_MESSAGES/sound-juicer.mo
share/locale/br/LC_MESSAGES/sound-juicer.mo
share/locale/ca/LC_MESSAGES/sound-juicer.mo
+share/locale/ca@valencia/LC_MESSAGES/sound-juicer.mo
share/locale/cs/LC_MESSAGES/sound-juicer.mo
share/locale/cy/LC_MESSAGES/sound-juicer.mo
share/locale/da/LC_MESSAGES/sound-juicer.mo
@@ -88,12 +93,14 @@ share/locale/dz/LC_MESSAGES/sound-juicer.mo
share/locale/el/LC_MESSAGES/sound-juicer.mo
share/locale/en_CA/LC_MESSAGES/sound-juicer.mo
share/locale/en_GB/LC_MESSAGES/sound-juicer.mo
+share/locale/en@shaw/LC_MESSAGES/sound-juicer.mo
share/locale/es/LC_MESSAGES/sound-juicer.mo
share/locale/et/LC_MESSAGES/sound-juicer.mo
share/locale/eu/LC_MESSAGES/sound-juicer.mo
share/locale/fa/LC_MESSAGES/sound-juicer.mo
share/locale/fi/LC_MESSAGES/sound-juicer.mo
share/locale/fr/LC_MESSAGES/sound-juicer.mo
+share/locale/ga/LC_MESSAGES/sound-juicer.mo
share/locale/gl/LC_MESSAGES/sound-juicer.mo
share/locale/gu/LC_MESSAGES/sound-juicer.mo
share/locale/he/LC_MESSAGES/sound-juicer.mo
@@ -109,6 +116,7 @@ share/locale/ko/LC_MESSAGES/sound-juicer.mo
share/locale/ku/LC_MESSAGES/sound-juicer.mo
share/locale/lt/LC_MESSAGES/sound-juicer.mo
share/locale/lv/LC_MESSAGES/sound-juicer.mo
+share/locale/mai/LC_MESSAGES/sound-juicer.mo
share/locale/mk/LC_MESSAGES/sound-juicer.mo
share/locale/ml/LC_MESSAGES/sound-juicer.mo
share/locale/mn/LC_MESSAGES/sound-juicer.mo
@@ -148,6 +156,7 @@ 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-cs.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
@@ -190,6 +199,8 @@ share/omf/sound-juicer/sound-juicer-uk.omf
@dirrm share/gnome/help/sound-juicer/el
@dirrm share/gnome/help/sound-juicer/de/figures
@dirrm share/gnome/help/sound-juicer/de
+@dirrm share/gnome/help/sound-juicer/cs/figures
+@dirrm share/gnome/help/sound-juicer/cs
@dirrm share/gnome/help/sound-juicer/ca/figures
@dirrm share/gnome/help/sound-juicer/ca
@dirrm share/gnome/help/sound-juicer/ar/figures
@@ -218,10 +229,16 @@ share/omf/sound-juicer/sound-juicer-uk.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/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/cad/geda-gattrib/Makefile b/cad/geda-gattrib/Makefile
index 10d249c5d77a..b3329919a90f 100644
--- a/cad/geda-gattrib/Makefile
+++ b/cad/geda-gattrib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gattrib
PORTVERSION= 1.4.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= cad
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/release/v1.4/${PORTVERSION}/ \
@@ -45,5 +45,8 @@ post-patch:
@${REINPLACE_CMD} -E \
-e "s,^(DATADIR[[:space:]]*=[[:space:]]*)gEDA,\1geda," \
${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|>n_bytes|>x_n_bytes|g' \
+ -e 's|>text_size|>x_text_size|g' \
+ ${WRKSRC}/src/gtkitementry_2_2.c
.include <bsd.port.mk>
diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
index dc6b66241b39..7e0fcc12984b 100644
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pdf2djvu
PORTVERSION= 0.5.11
+PORTREVISION= 1
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX}
@@ -15,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.4:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS= poppler.5:${PORTSDIR}/graphics/poppler
LIB_DEPENDS+= djvulibre.22:${PORTSDIR}/graphics/djvulibre-nox11
GNU_CONFIGURE= yes
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 58a2d25f99c9..2adf3caedf0d 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/databases/evolution-data-server/Makefile,v 1.5 2009/04/15 23:04:33 kwm Exp $
+# $MCom: ports/databases/evolution-data-server/Makefile,v 1.181 2009/10/18 04:17:46 marcus Exp $
#
PORTNAME= evolution-data-server
-PORTVERSION= 2.26.3
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -27,8 +26,8 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= build
USE_GETTEXT= yes
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui ltverhack \
- ltasneededhack
+USE_GNOME= gnomeprefix gnomehack intlhack ltverhack ltasneededhack \
+ libglade2 libbonobo
USE_OPENLDAP= yes
USE_AUTOTOOLS= libtool:22
USE_BDB= 41+
@@ -41,7 +40,7 @@ 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.26" EVO_VERSION="1.2"
+PLIST_SUB= VERSION="2.28" EVO_VERSION="1.2"
#OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off
OPTIONS= WEATHER "Enable weather calendar backend" on
@@ -82,7 +81,8 @@ pre-everything::
post-patch:
@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g ; \
- s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g' \
+ s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g ; \
+ s|-Wmissing-include-dirs||g' \
${WRKSRC}/configure
.include <bsd.port.post.mk>
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index a5f1370abf2e..0d7cab157173 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-2.26.3.tar.bz2) = 01205605a598253bc227ff360c7c3dad
-SHA256 (gnome2/evolution-data-server-2.26.3.tar.bz2) = ed2698d64dc663900b50f7a461d79c25e310462b7d41b1073257cbf950e75071
-SIZE (gnome2/evolution-data-server-2.26.3.tar.bz2) = 7167764
+MD5 (gnome2/evolution-data-server-2.28.1.tar.bz2) = ea516bef48900020c4f137514123e34d
+SHA256 (gnome2/evolution-data-server-2.28.1.tar.bz2) = 651de21c10765d4b6503ff59aa50c8b9e1bc704d94341d9a275e3b50d68dae8a
+SIZE (gnome2/evolution-data-server-2.28.1.tar.bz2) = 22309681
diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure
index 3fac0e9046c9..65af28acc7b9 100644
--- a/databases/evolution-data-server/files/patch-configure
+++ b/databases/evolution-data-server/files/patch-configure
@@ -1,30 +1,21 @@
---- configure.orig Mon Jun 18 23:55:48 2007
-+++ configure Mon Jun 18 23:56:20 2007
-@@ -24562,6 +24562,14 @@ case "$host" in
- # AC_CACHE_VAL(have_addrinfo, [have_addrinfo=yes])
- # AC_DEFINE(_WIN32_WINNT, 0x501, [To get getaddrinfo etc declarations])
- ;;
-+*freebsd*)
-+ os_win32=no
-+ NO_UNDEFINED=''
-+ SOCKET_LIBS=''
-+ DL_LIB=''
-+ SOFTOKN3_LIB='-lsoftokn3'
-+ LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
-+ ;;
- *) os_win32=no
- NO_UNDEFINED=''
- SOCKET_LIBS=''
-@@ -28651,7 +28659,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <netdb.h>
--
-+ #include <stdio.h>
+--- configure.orig 2009-08-24 10:39:07.000000000 +0200
++++ configure 2009-08-24 10:44:47.000000000 +0200
+@@ -15988,6 +15988,14 @@ cat >>confdefs.h <<\_ACEOF
+ _ACEOF
- int
- main ()
-@@ -33825,7 +33833,7 @@ idldir='${datadir}'/idl/evolution-data-s
+ ;;
++*freebsd*)
++ os_win32=no
++ NO_UNDEFINED=''
++ SOCKET_LIBS=''
++ DL_LIB=''
++ SOFTOKN3_LIB='-lsoftokn3'
++ LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
++ ;;
+ *)
+ os_win32=no
+ NO_UNDEFINED=''
+@@ -24777,7 +24785,7 @@ idldir='${datadir}'/idl/evolution-data-s
imagesdir='${datadir}'/pixmaps/evolution-data-server
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 d536fff6de55..69da393ce0cd 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,22 +1,11 @@
---- docs/reference/camel/Makefile.in.orig 2009-07-04 12:06:59.000000000 +0200
-+++ docs/reference/camel/Makefile.in 2009-07-04 12:23:53.000000000 +0200
-@@ -127,7 +127,7 @@
+--- docs/reference/camel/Makefile.in.orig 2009-07-27 22:42:25.000000000 +0200
++++ docs/reference/camel/Makefile.in 2009-07-27 22:42:50.000000000 +0200
+@@ -137,7 +137,7 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LI
GOBJECT_QUERY = @GOBJECT_QUERY@
GREP = @GREP@
HAVE_JW = @HAVE_JW@
-HTML_DIR = $(datadir)/gtk-doc/html
-+HTML_DIR = $(prefix)/share/doc
- ICONV_CFLAGS = @ICONV_CFLAGS@
++HTML_DIR = $(datadir)/doc
ICONV_LIBS = @ICONV_LIBS@
IDL_INCLUDES = @IDL_INCLUDES@
-@@ -731,8 +731,9 @@
- mv -f $${installdir}/$(DOC_MODULE).devhelp \
- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
- fi; \
-- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
-+ cp -R html/* $(HTML_DIR)/camel; \
- fi
-+# $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
-
- uninstall-local:
- @if test -n "$(DOC_MODULE_VERSION)"; then \
+ INSTALL = @INSTALL@
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index c76030056e2f..3845563c6623 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -183,6 +183,7 @@ include/evolution-data-server-%%VERSION%%/libebook/e-vcard.h
include/evolution-data-server-%%VERSION%%/libecal/e-cal-check-timezones.h
include/evolution-data-server-%%VERSION%%/libecal/e-cal-component.h
include/evolution-data-server-%%VERSION%%/libecal/e-cal-recur.h
+include/evolution-data-server-%%VERSION%%/libecal/e-cal-system-timezone.h
include/evolution-data-server-%%VERSION%%/libecal/e-cal-time-util.h
include/evolution-data-server-%%VERSION%%/libecal/e-cal-types.h
include/evolution-data-server-%%VERSION%%/libecal/e-cal-util.h
@@ -203,8 +204,10 @@ include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book.h
include/evolution-data-server-%%VERSION%%/libedata-cal/Evolution-DataServer-Calendar.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-cache.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-factory.h
+include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-file-store.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-loader-factory.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sexp.h
+include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-store.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sync.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-util.h
include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend.h
@@ -579,6 +582,7 @@ share/doc/libecal/ix01.html
share/doc/libecal/left.png
share/doc/libecal/libecal-e-cal-check-timezones.html
share/doc/libecal/libecal-e-cal-recur.html
+share/doc/libecal/libecal-e-cal-system-timezone.html
share/doc/libecal/libecal-e-cal-time-util.html
share/doc/libecal/libecal-e-cal-types.html
share/doc/libecal/libecal-e-cal-util.html
@@ -601,9 +605,6 @@ share/doc/libedata-book/index.html
share/doc/libedata-book/index.sgml
share/doc/libedata-book/ix01.html
share/doc/libedata-book/left.png
-share/doc/libedata-book/libedata-book-EDataBookFactory.html
-share/doc/libedata-book/libedata-book-e-book-backend-db-cache.html
-share/doc/libedata-book/libedata-book-ximian-vcard.html
share/doc/libedata-book/libedata-book.devhelp
share/doc/libedata-book/libedata-book.devhelp2
share/doc/libedata-book/right.png
@@ -623,7 +624,6 @@ share/doc/libedata-cal/index.html
share/doc/libedata-cal/index.sgml
share/doc/libedata-cal/ix01.html
share/doc/libedata-cal/left.png
-share/doc/libedata-cal/libedata-cal-e-cal-backend-util.html
share/doc/libedata-cal/libedata-cal.devhelp
share/doc/libedata-cal/libedata-cal.devhelp2
share/doc/libedata-cal/right.png
@@ -647,7 +647,6 @@ share/doc/libedataserver/left.png
share/doc/libedataserver/libedataserver-EFlag.html
share/doc/libedataserver/libedataserver-EProxy.html
share/doc/libedataserver/libedataserver-ESExp.html
-share/doc/libedataserver/libedataserver-Version-Information.html
share/doc/libedataserver/libedataserver-e-categories.html
share/doc/libedataserver/libedataserver-e-iconv.html
share/doc/libedataserver/libedataserver-e-memory.html
@@ -683,10 +682,6 @@ share/doc/libedataserverui/index.html
share/doc/libedataserverui/index.sgml
share/doc/libedataserverui/ix01.html
share/doc/libedataserverui/left.png
-share/doc/libedataserverui/libedataserverui-ECategoryCompletion.html
-share/doc/libedataserverui/libedataserverui-ECellRendererColor.html
-share/doc/libedataserverui/libedataserverui-e-book-auth-util.html
-share/doc/libedataserverui/libedataserverui-e-data-server-ui-marshal.html
share/doc/libedataserverui/libedataserverui-e-passwords.html
share/doc/libedataserverui/libedataserverui.devhelp
share/doc/libedataserverui/libedataserverui.devhelp2
@@ -703,6 +698,7 @@ share/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer.idl
share/locale/am/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/ar/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/as/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ast/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/be/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/bg/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -710,6 +706,7 @@ share/locale/bn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/bn_IN/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/bs/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ca@valencia/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/cy/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/da/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -849,7 +846,11 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
@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/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index d17c97aee9ab..1aee75e0e9ef 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/glom/Makefile,v 1.24 2009/03/17 16:33:41 kwm Exp $
+# $MCom: ports/databases/glom/Makefile,v 1.28 2009/10/11 10:43:05 kwm Exp $
#
PORTNAME= glom
-PORTVERSION= 1.10.1
-PORTREVISION= 1
+PORTVERSION= 1.12.2
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,8 +15,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= kwm@FreeBSD.org
COMMENT= GNOME database designer and user interface
-LIB_DEPENDS= bakery-2.6:${PORTSDIR}/x11-toolkits/bakery \
- gdamm-4.0.11:${PORTSDIR}/databases/libgdamm \
+LIB_DEPENDS= gdamm-4.0.12:${PORTSDIR}/databases/libgdamm \
+ gconfmm-2.0.1:${PORTSDIR}/devel/gconfmm \
gtksourceviewmm-2.0.2:${PORTSDIR}/x11-toolkits/libgtksourceviewmm \
avahi-ui.0:${PORTSDIR}/net/avahi-gtk \
epc-1.0.2:${PORTSDIR}/www/libepc \
diff --git a/databases/glom/distinfo b/databases/glom/distinfo
index 4a78945d7f56..2672d73d664e 100644
--- a/databases/glom/distinfo
+++ b/databases/glom/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glom-1.10.1.tar.bz2) = 611a9cc73aadd1ff5fdc4dd81e240822
-SHA256 (gnome2/glom-1.10.1.tar.bz2) = 76018d2e942ee7581b58c45bb045d35ff465ab3efd86d4bfecd6c8f543b96ce6
-SIZE (gnome2/glom-1.10.1.tar.bz2) = 3308723
+MD5 (gnome2/glom-1.12.2.tar.bz2) = 8f4de116f28501decc0df956ee003809
+SHA256 (gnome2/glom-1.12.2.tar.bz2) = 5ce8bc49d9d6402db540d14c8c16a2407cbf7a588139a4e2942442ead1952992
+SIZE (gnome2/glom-1.12.2.tar.bz2) = 3239342
diff --git a/databases/glom/pkg-plist b/databases/glom/pkg-plist
index 682717c2ee83..b916528825c9 100644
--- a/databases/glom/pkg-plist
+++ b/databases/glom/pkg-plist
@@ -1,59 +1,57 @@
bin/glom
-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
+include/glom-1.12/libglom/appstate.h
+include/glom-1.12/libglom/data_structure/field.h
+include/glom-1.12/libglom/data_structure/fieldtypes.h
+include/glom-1.12/libglom/data_structure/foundset.h
+include/glom-1.12/libglom/data_structure/glomconversions.h
+include/glom-1.12/libglom/data_structure/groupinfo.h
+include/glom-1.12/libglom/data_structure/layout/custom_title.h
+include/glom-1.12/libglom/data_structure/layout/fieldformatting.h
+include/glom-1.12/libglom/data_structure/layout/layoutgroup.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_button.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_calendarportal.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_field.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_image.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_line.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_notebook.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_placeholder.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_portal.h
+include/glom-1.12/libglom/data_structure/layout/layoutitem_text.h
+include/glom-1.12/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h
+include/glom-1.12/libglom/data_structure/layout/report_parts/layoutitem_footer.h
+include/glom-1.12/libglom/data_structure/layout/report_parts/layoutitem_groupby.h
+include/glom-1.12/libglom/data_structure/layout/report_parts/layoutitem_header.h
+include/glom-1.12/libglom/data_structure/layout/report_parts/layoutitem_summary.h
+include/glom-1.12/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h
+include/glom-1.12/libglom/data_structure/layout/usesrelationship.h
+include/glom-1.12/libglom/data_structure/numeric_format.h
+include/glom-1.12/libglom/data_structure/parameternamegenerator.h
+include/glom-1.12/libglom/data_structure/print_layout.h
+include/glom-1.12/libglom/data_structure/privileges.h
+include/glom-1.12/libglom/data_structure/relationship.h
+include/glom-1.12/libglom/data_structure/report.h
+include/glom-1.12/libglom/data_structure/system_prefs.h
+include/glom-1.12/libglom/data_structure/tableinfo.h
+include/glom-1.12/libglom/data_structure/translatable_item.h
+include/glom-1.12/libglom/document/bakery/document.h
+include/glom-1.12/libglom/document/bakery/document_xml.h
+include/glom-1.12/libglom/document/bakery/view/view.h
+include/glom-1.12/libglom/document/bakery/view/view_composite.h
+include/glom-1.12/libglom/document/bakery/view/viewbase.h
+include/glom-1.12/libglom/document/document.h
+include/glom-1.12/libglom/document/view.h
+include/glom-1.12/libglom/init.h
+include/glom-1.12/libglom/libglom_config.h
+include/glom-1.12/libglom/sharedptr.h
+include/glom-1.12/libglom/standard_table_prefs_fields.h
+lib/libglom-1.12.la
+lib/libglom-1.12.so
+lib/libglom-1.12.so.0
+%%PYTHON_SITELIBDIR%%/glom_1_12.la
+%%PYTHON_SITELIBDIR%%/glom_1_12.so
+libdata/pkgconfig/glom-1.12.pc
share/applications/glom.desktop
-%%DATADIR%%/doc/examples/example_film_manager.glom
-%%DATADIR%%/doc/examples/example_lesson_planner.glom
-%%DATADIR%%/doc/examples/example_music_collection.glom
-%%DATADIR%%/doc/examples/example_project_manager.glom
-%%DATADIR%%/doc/examples/example_smallbusiness.glom
%%DATADIR%%/glade/glom_developer.glade
%%DATADIR%%/glade/glom.glade
%%DATADIR%%/glom_document.dtd
@@ -68,6 +66,12 @@ share/applications/glom.desktop
%%DATADIR%%/pixmaps/glom-text.png
%%DATADIR%%/xslt/print_details_to_html.xsl
%%DATADIR%%/xslt/print_report_to_html.xsl
+%%DOCSDIR%%/examples/README
+%%DOCSDIR%%/examples/example_film_manager.glom
+%%DOCSDIR%%/examples/example_lesson_planner.glom
+%%DOCSDIR%%/examples/example_music_collection.glom
+%%DOCSDIR%%/examples/example_project_manager.glom
+%%DOCSDIR%%/examples/example_smallbusiness.glom
share/gnome/help/glom/C/figures/glom_data_details.png
share/gnome/help/glom/C/figures/glom_data_list.png
share/gnome/help/glom/C/figures/glom_design_fields.png
@@ -176,8 +180,6 @@ share/gnome/help/glom/sv/figures/glom_tables.png
share/gnome/help/glom/sv/figures/start.png
share/gnome/help/glom/sv/glom.xml
share/gnome/help/glom/sv/legal.xml
-share/mime-info/glom.keys
-share/mime-info/glom.mime
share/icons/hicolor/16x16/apps/glom.png
share/icons/hicolor/22x22/apps/glom.png
share/icons/hicolor/24x24/apps/glom.png
@@ -211,6 +213,7 @@ share/locale/sv/LC_MESSAGES/glom.mo
share/locale/tr/LC_MESSAGES/glom.mo
share/locale/vi/LC_MESSAGES/glom.mo
share/locale/zh_CN/LC_MESSAGES/glom.mo
+share/mime/application/x-glom.xml
share/mime/packages/glom.xml
share/omf/glom/glom-C.omf
share/omf/glom/glom-de.omf
@@ -232,11 +235,10 @@ share/omf/glom/glom-sv.omf
@dirrm share/gnome/help/glom/C/figures
@dirrm share/gnome/help/glom/C
@dirrm share/gnome/help/glom
+@dirrm %%DOCSDIR%%/examples
@dirrm %%DATADIR%%/xslt
@dirrm %%DATADIR%%/pixmaps
@dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%/doc/examples
-@dirrm %%DATADIR%%/doc
@dirrm %%DATADIR%%
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@@ -245,9 +247,11 @@ 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
+@dirrm include/glom-1.12/libglom/document/bakery/view
+@dirrm include/glom-1.12/libglom/document/bakery
+@dirrm include/glom-1.12/libglom/document
+@dirrm include/glom-1.12/libglom/data_structure/layout/report_parts
+@dirrm include/glom-1.12/libglom/data_structure/layout
+@dirrm include/glom-1.12/libglom/data_structure
+@dirrm include/glom-1.12/libglom
+@dirrm include/glom-1.12
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 04ec0e84c7d0..b13efa3b6b81 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -3,12 +3,11 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/libgdamm/Makefile,v 1.15 2009/04/09 03:24:07 mezz Exp $
+# $MCom: ports/databases/libgdamm/Makefile,v 1.18 2009/11/28 05:58:58 mezz Exp $
#
PORTNAME= libgdamm
-PORTVERSION= 3.99.16
-PORTREVISION= 1
+PORTVERSION= 3.99.17.1
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -25,10 +24,6 @@ USE_GMAKE= yes
USE_GNOME= gnomehack libgda4
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --enable-static
-
-post-patch:
- @${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \
- ${WRKSRC}/tools/extra_defs_gen/Makefile.in
+CONFIGURE_ARGS= --enable-static --disable-documentation
.include <bsd.port.mk>
diff --git a/databases/libgdamm/distinfo b/databases/libgdamm/distinfo
index ca5bd9a3096f..52ebba84dced 100644
--- a/databases/libgdamm/distinfo
+++ b/databases/libgdamm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgdamm-3.99.16.tar.bz2) = 975e90bfaa21491c71cbe12741b24ba2
-SHA256 (gnome2/libgdamm-3.99.16.tar.bz2) = 37189b5ebbfb05f9b2916bc6f36bf770139dcf9c983b65d2c47eb6d337e38a3d
-SIZE (gnome2/libgdamm-3.99.16.tar.bz2) = 836649
+MD5 (gnome2/libgdamm-3.99.17.1.tar.bz2) = 227d838905b45e8ccd6440cf661630fc
+SHA256 (gnome2/libgdamm-3.99.17.1.tar.bz2) = d3078223d4589ee69af94a649a156a933cc8b058fc24064fd440724f234a50db
+SIZE (gnome2/libgdamm-3.99.17.1.tar.bz2) = 924028
diff --git a/databases/libgdamm/pkg-plist b/databases/libgdamm/pkg-plist
index 8a308210e842..8458fdd6eaab 100644
--- a/databases/libgdamm/pkg-plist
+++ b/databases/libgdamm/pkg-plist
@@ -67,19 +67,16 @@ 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/throw_exception.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.11
+lib/libgdamm-4.0.so.12
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
diff --git a/databases/mysql-gui-tools/Makefile b/databases/mysql-gui-tools/Makefile
index 174cf5e1f63f..3c3e695883f0 100644
--- a/databases/mysql-gui-tools/Makefile
+++ b/databases/mysql-gui-tools/Makefile
@@ -8,6 +8,7 @@
PORTNAME= mysql-gui-tools
PORTVERSION= 5.0r14
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQLGUITools
@@ -24,15 +25,16 @@ OPTIONS= QUERY_BROWSER "Build the MySQL Query Browser" on \
ADMINISTRATOR "Build the MySQL Administrator" on
USE_AUTOTOOLS= autoconf:262 libtool:22 automake:110
-USE_GNOME= gnomelibs libglade2 gtkhtml3 libgnomeprint intlhack gtksourceview
+USE_GNOME= libgnome libglade2 gtkhtml3 libgnomeprint intlhack gtksourceview
USE_GL= gl glut
USE_GMAKE= yes
DATADIR= ${PREFIX}/share/mysql-gui
-CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib
HAS_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
CONFIGURE_ARGS+= --with-gtkhtml=libgtkhtml-3.14
.include <bsd.port.pre.mk>
diff --git a/databases/mysql-gui-tools/files/patch-query-browser-configure.in b/databases/mysql-gui-tools/files/patch-query-browser-configure.in
new file mode 100644
index 000000000000..0d86b9fd38c3
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-query-browser-configure.in
@@ -0,0 +1,21 @@
+--- query-browser/configure.in.orig 2009-09-27 23:40:34.000000000 +0200
++++ query-browser/configure.in 2009-09-27 23:41:02.000000000 +0200
+@@ -66,7 +66,7 @@
+ gtkhtml=$withval, gtkhtml=libgtkhtml-3.0)
+
+
+-PKG_CHECK_MODULES(GLIB, [glib-2.0 libxml-2.0 >= 2.6.2])
++PKG_CHECK_MODULES(GLIB, [glib-2.0 libxml-2.0 >= 2.6.2 libgnome-2.0])
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+
+@@ -74,7 +74,8 @@
+ gthread-2.0
+ libxml-2.0 >= 2.6.2
+ $gtkhtml
+- gtkmm-2.4])
++ gtkmm-2.4
++ libgnome-2.0])
+ AC_SUBST(GNOME_CFLAGS)
+ AC_SUBST(GNOME_LIBS)
+
diff --git a/deskutils/Makefile b/deskutils/Makefile
index 715677bf98db..d63bfd33261f 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -87,6 +87,7 @@
SUBDIR += gnome-main-menu
SUBDIR += gnome-pim
SUBDIR += gnome-utils
+ SUBDIR += gnote
SUBDIR += gnotime
SUBDIR += gnustep-notebook
SUBDIR += gnustep-wrapper
diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index 160fd0d66f3b..ac1437ec6f54 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -3,12 +3,11 @@
# Whom: FreeBSD GNOME Team
#
# $FreeBSD$
-# $MCom: ports/deskutils/alacarte/Makefile,v 1.20 2008/09/29 15:18:59 marcus Exp $
+# $MCom: ports/deskutils/alacarte/Makefile,v 1.23 2009/09/21 16:31:27 kwm Exp $
#
PORTNAME= alacarte
-PORTVERSION= 0.12.1
-PORTREVISION= 1
+PORTVERSION= 0.12.4
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/alacarte/distinfo b/deskutils/alacarte/distinfo
index 81768f0d66bd..cbfdedd10ff9 100644
--- a/deskutils/alacarte/distinfo
+++ b/deskutils/alacarte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/alacarte-0.12.1.tar.bz2) = c6d77f7e5ee6129532e4bb1a35a07194
-SHA256 (gnome2/alacarte-0.12.1.tar.bz2) = 1991b715431e792976644cc49c90b44dd010245b6c54312b67e0587bcb741d19
-SIZE (gnome2/alacarte-0.12.1.tar.bz2) = 181165
+MD5 (gnome2/alacarte-0.12.4.tar.bz2) = 914f863f6bd152b4ab6407d07d853f45
+SHA256 (gnome2/alacarte-0.12.4.tar.bz2) = f5bccd47d96b22ee73cf537d86bb90cb7b7e0f70ac68253fe512540e5bf64823
+SIZE (gnome2/alacarte-0.12.4.tar.bz2) = 189318
diff --git a/deskutils/alacarte/pkg-plist b/deskutils/alacarte/pkg-plist
index ad24394728e3..d1f33097c240 100644
--- a/deskutils/alacarte/pkg-plist
+++ b/deskutils/alacarte/pkg-plist
@@ -31,9 +31,12 @@ share/locale/bem/LC_MESSAGES/alacarte.mo
share/locale/bg/LC_MESSAGES/alacarte.mo
share/locale/bn/LC_MESSAGES/alacarte.mo
share/locale/bn_IN/LC_MESSAGES/alacarte.mo
+share/locale/br/LC_MESSAGES/alacarte.mo
share/locale/ca/LC_MESSAGES/alacarte.mo
+share/locale/ca@valencia/LC_MESSAGES/alacarte.mo
share/locale/crh/LC_MESSAGES/alacarte.mo
share/locale/cs/LC_MESSAGES/alacarte.mo
+share/locale/cy/LC_MESSAGES/alacarte.mo
share/locale/da/LC_MESSAGES/alacarte.mo
share/locale/de/LC_MESSAGES/alacarte.mo
share/locale/dz/LC_MESSAGES/alacarte.mo
@@ -66,12 +69,14 @@ share/locale/ko/LC_MESSAGES/alacarte.mo
share/locale/ku/LC_MESSAGES/alacarte.mo
share/locale/lt/LC_MESSAGES/alacarte.mo
share/locale/lv/LC_MESSAGES/alacarte.mo
+share/locale/mai/LC_MESSAGES/alacarte.mo
share/locale/mg/LC_MESSAGES/alacarte.mo
share/locale/mk/LC_MESSAGES/alacarte.mo
share/locale/ml/LC_MESSAGES/alacarte.mo
share/locale/mn/LC_MESSAGES/alacarte.mo
share/locale/mr/LC_MESSAGES/alacarte.mo
share/locale/nb/LC_MESSAGES/alacarte.mo
+share/locale/nds/LC_MESSAGES/alacarte.mo
share/locale/nl/LC_MESSAGES/alacarte.mo
share/locale/nn/LC_MESSAGES/alacarte.mo
share/locale/oc/LC_MESSAGES/alacarte.mo
@@ -119,10 +124,14 @@ share/locale/zh_TW/LC_MESSAGES/alacarte.mo
@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@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/kk/LC_MESSAGES
@@ -135,6 +144,8 @@ share/locale/zh_TW/LC_MESSAGES/alacarte.mo
@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
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/bem/LC_MESSAGES
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 10e7eb670859..7a6b189d719f 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/deskutils/deskbar-applet/Makefile,v 1.3 2009/04/15 15:18:16 kwm Exp $
+# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.109 2009/09/22 10:54:20 kwm Exp $
#
PORTNAME= deskbar-applet
-PORTVERSION= 2.26.2
-PORTREVISION= 1
+PORTVERSION= 2.28.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,7 +17,7 @@ COMMENT= Omnipresent versatile search interface
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \
- ${PYTHON_SITELIBDIR}/simplejson-2.0.9-py${PYTHON_VER}-${OPSYS:L}-${_OSRELEASE}-${ARCH}.egg:${PORTSDIR}/devel/py-simplejson
+ ${LOCALBASE}/share/doc/py26-simplejson:${PORTSDIR}/devel/py-simplejson
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo
index 0ec54762fd40..1120f841d3f8 100644
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/deskbar-applet-2.26.2.tar.bz2) = 82bca281838b38b3d9c682ab839b7b6b
-SHA256 (gnome2/deskbar-applet-2.26.2.tar.bz2) = 9c40f81d96c172311f4ca4c05c6718401d0958a3eb0dd7bee1dae580be0d78f6
-SIZE (gnome2/deskbar-applet-2.26.2.tar.bz2) = 981493
+MD5 (gnome2/deskbar-applet-2.28.0.tar.bz2) = dae686b2958688f15bb365afd8485c8e
+SHA256 (gnome2/deskbar-applet-2.28.0.tar.bz2) = bdac5c8a3595078911c1aba9f1013c936cdaaed41efbd87d092dfbc04b0ea2cb
+SIZE (gnome2/deskbar-applet-2.28.0.tar.bz2) = 1087593
diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist
index 5635b20f6f9e..48f9ee60b1ae 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -1,70 +1,70 @@
-lib/deskbar-applet/deskbar-applet
-lib/deskbar-applet/modules-2.20-compatible/beagle-live.py
-lib/deskbar-applet/modules-2.20-compatible/beagle-live.pyc
-lib/deskbar-applet/modules-2.20-compatible/beagle-live.pyo
-lib/deskbar-applet/modules-2.20-compatible/beagle-static.py
-lib/deskbar-applet/modules-2.20-compatible/beagle-static.pyc
-lib/deskbar-applet/modules-2.20-compatible/beagle-static.pyo
-lib/deskbar-applet/modules-2.20-compatible/calculator.py
-lib/deskbar-applet/modules-2.20-compatible/calculator.pyc
-lib/deskbar-applet/modules-2.20-compatible/calculator.pyo
-lib/deskbar-applet/modules-2.20-compatible/desklicious.py
-lib/deskbar-applet/modules-2.20-compatible/desklicious.pyc
-lib/deskbar-applet/modules-2.20-compatible/desklicious.pyo
-lib/deskbar-applet/modules-2.20-compatible/epiphany.py
-lib/deskbar-applet/modules-2.20-compatible/epiphany.pyc
-lib/deskbar-applet/modules-2.20-compatible/epiphany.pyo
-%%EVO%%lib/deskbar-applet/modules-2.20-compatible/evolution.py
-%%EVO%%lib/deskbar-applet/modules-2.20-compatible/evolution.pyc
-%%EVO%%lib/deskbar-applet/modules-2.20-compatible/evolution.pyo
-lib/deskbar-applet/modules-2.20-compatible/files.py
-lib/deskbar-applet/modules-2.20-compatible/files.pyc
-lib/deskbar-applet/modules-2.20-compatible/files.pyo
-lib/deskbar-applet/modules-2.20-compatible/gdmactions.py
-lib/deskbar-applet/modules-2.20-compatible/gdmactions.pyc
-lib/deskbar-applet/modules-2.20-compatible/gdmactions.pyo
-lib/deskbar-applet/modules-2.20-compatible/googlecodesearch.py
-lib/deskbar-applet/modules-2.20-compatible/googlecodesearch.pyc
-lib/deskbar-applet/modules-2.20-compatible/googlecodesearch.pyo
-lib/deskbar-applet/modules-2.20-compatible/googlesearch.py
-lib/deskbar-applet/modules-2.20-compatible/googlesearch.pyc
-lib/deskbar-applet/modules-2.20-compatible/googlesearch.pyo
-lib/deskbar-applet/modules-2.20-compatible/history.py
-lib/deskbar-applet/modules-2.20-compatible/history.pyc
-lib/deskbar-applet/modules-2.20-compatible/history.pyo
-lib/deskbar-applet/modules-2.20-compatible/iswitch-window.py
-lib/deskbar-applet/modules-2.20-compatible/iswitch-window.pyc
-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
-lib/deskbar-applet/modules-2.20-compatible/recent.py
-lib/deskbar-applet/modules-2.20-compatible/recent.pyc
-lib/deskbar-applet/modules-2.20-compatible/recent.pyo
-lib/deskbar-applet/modules-2.20-compatible/templates.py
-lib/deskbar-applet/modules-2.20-compatible/templates.pyc
-lib/deskbar-applet/modules-2.20-compatible/templates.pyo
-lib/deskbar-applet/modules-2.20-compatible/tomboy.py
-lib/deskbar-applet/modules-2.20-compatible/tomboy.pyc
-lib/deskbar-applet/modules-2.20-compatible/tomboy.pyo
-lib/deskbar-applet/modules-2.20-compatible/twitter.py
-lib/deskbar-applet/modules-2.20-compatible/twitter.pyc
-lib/deskbar-applet/modules-2.20-compatible/twitter.pyo
-lib/deskbar-applet/modules-2.20-compatible/web_address.py
-lib/deskbar-applet/modules-2.20-compatible/web_address.pyc
-lib/deskbar-applet/modules-2.20-compatible/web_address.pyo
-lib/deskbar-applet/modules-2.20-compatible/wikipedia-suggest.py
-lib/deskbar-applet/modules-2.20-compatible/wikipedia-suggest.pyc
-lib/deskbar-applet/modules-2.20-compatible/wikipedia-suggest.pyo
-lib/deskbar-applet/modules-2.20-compatible/yahoo.py
-lib/deskbar-applet/modules-2.20-compatible/yahoo.pyc
-lib/deskbar-applet/modules-2.20-compatible/yahoo.pyo
+libexec/deskbar-applet/deskbar-applet
+libexec/deskbar-applet/modules-2.20-compatible/beagle-live.py
+libexec/deskbar-applet/modules-2.20-compatible/beagle-live.pyc
+libexec/deskbar-applet/modules-2.20-compatible/beagle-live.pyo
+libexec/deskbar-applet/modules-2.20-compatible/beagle-static.py
+libexec/deskbar-applet/modules-2.20-compatible/beagle-static.pyc
+libexec/deskbar-applet/modules-2.20-compatible/beagle-static.pyo
+libexec/deskbar-applet/modules-2.20-compatible/calculator.py
+libexec/deskbar-applet/modules-2.20-compatible/calculator.pyc
+libexec/deskbar-applet/modules-2.20-compatible/calculator.pyo
+libexec/deskbar-applet/modules-2.20-compatible/desklicious.py
+libexec/deskbar-applet/modules-2.20-compatible/desklicious.pyc
+libexec/deskbar-applet/modules-2.20-compatible/desklicious.pyo
+libexec/deskbar-applet/modules-2.20-compatible/epiphany.py
+libexec/deskbar-applet/modules-2.20-compatible/epiphany.pyc
+libexec/deskbar-applet/modules-2.20-compatible/epiphany.pyo
+%%EVO%%libexec/deskbar-applet/modules-2.20-compatible/evolution.py
+%%EVO%%libexec/deskbar-applet/modules-2.20-compatible/evolution.pyc
+%%EVO%%libexec/deskbar-applet/modules-2.20-compatible/evolution.pyo
+libexec/deskbar-applet/modules-2.20-compatible/files.py
+libexec/deskbar-applet/modules-2.20-compatible/files.pyc
+libexec/deskbar-applet/modules-2.20-compatible/files.pyo
+libexec/deskbar-applet/modules-2.20-compatible/gdmactions.py
+libexec/deskbar-applet/modules-2.20-compatible/gdmactions.pyc
+libexec/deskbar-applet/modules-2.20-compatible/gdmactions.pyo
+libexec/deskbar-applet/modules-2.20-compatible/googlecodesearch.py
+libexec/deskbar-applet/modules-2.20-compatible/googlecodesearch.pyc
+libexec/deskbar-applet/modules-2.20-compatible/googlecodesearch.pyo
+libexec/deskbar-applet/modules-2.20-compatible/googlesearch.py
+libexec/deskbar-applet/modules-2.20-compatible/googlesearch.pyc
+libexec/deskbar-applet/modules-2.20-compatible/googlesearch.pyo
+libexec/deskbar-applet/modules-2.20-compatible/history.py
+libexec/deskbar-applet/modules-2.20-compatible/history.pyc
+libexec/deskbar-applet/modules-2.20-compatible/history.pyo
+libexec/deskbar-applet/modules-2.20-compatible/iswitch-window.py
+libexec/deskbar-applet/modules-2.20-compatible/iswitch-window.pyc
+libexec/deskbar-applet/modules-2.20-compatible/iswitch-window.pyo
+libexec/deskbar-applet/modules-2.20-compatible/mozilla.py
+libexec/deskbar-applet/modules-2.20-compatible/mozilla.pyc
+libexec/deskbar-applet/modules-2.20-compatible/mozilla.pyo
+libexec/deskbar-applet/modules-2.20-compatible/opensearch.py
+libexec/deskbar-applet/modules-2.20-compatible/opensearch.pyc
+libexec/deskbar-applet/modules-2.20-compatible/opensearch.pyo
+libexec/deskbar-applet/modules-2.20-compatible/programs.py
+libexec/deskbar-applet/modules-2.20-compatible/programs.pyc
+libexec/deskbar-applet/modules-2.20-compatible/programs.pyo
+libexec/deskbar-applet/modules-2.20-compatible/recent.py
+libexec/deskbar-applet/modules-2.20-compatible/recent.pyc
+libexec/deskbar-applet/modules-2.20-compatible/recent.pyo
+libexec/deskbar-applet/modules-2.20-compatible/templates.py
+libexec/deskbar-applet/modules-2.20-compatible/templates.pyc
+libexec/deskbar-applet/modules-2.20-compatible/templates.pyo
+libexec/deskbar-applet/modules-2.20-compatible/tomboy.py
+libexec/deskbar-applet/modules-2.20-compatible/tomboy.pyc
+libexec/deskbar-applet/modules-2.20-compatible/tomboy.pyo
+libexec/deskbar-applet/modules-2.20-compatible/twitter.py
+libexec/deskbar-applet/modules-2.20-compatible/twitter.pyc
+libexec/deskbar-applet/modules-2.20-compatible/twitter.pyo
+libexec/deskbar-applet/modules-2.20-compatible/web_address.py
+libexec/deskbar-applet/modules-2.20-compatible/web_address.pyc
+libexec/deskbar-applet/modules-2.20-compatible/web_address.pyo
+libexec/deskbar-applet/modules-2.20-compatible/wikipedia-suggest.py
+libexec/deskbar-applet/modules-2.20-compatible/wikipedia-suggest.pyc
+libexec/deskbar-applet/modules-2.20-compatible/wikipedia-suggest.pyo
+libexec/deskbar-applet/modules-2.20-compatible/yahoo.py
+libexec/deskbar-applet/modules-2.20-compatible/yahoo.pyc
+libexec/deskbar-applet/modules-2.20-compatible/yahoo.pyo
%%PYTHON_SITELIBDIR%%/deskbar/__init__.py
%%PYTHON_SITELIBDIR%%/deskbar/__init__.pyc
%%PYTHON_SITELIBDIR%%/deskbar/__init__.pyo
@@ -176,11 +176,6 @@ lib/deskbar-applet/modules-2.20-compatible/yahoo.pyo
%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution/__init__.pyo
%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution/_evolution.la
%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution/_evolution.so
-%%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/__init__.py
-%%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/__init__.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/_gdmclient.la
-%%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient/_gdmclient.so
%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Action.py
%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Action.pyc
%%PYTHON_SITELIBDIR%%/deskbar/interfaces/Action.pyo
@@ -323,6 +318,12 @@ 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/cs/deskbar.xml
+share/gnome/help/deskbar/cs/figures/deskbar-applet.png
+share/gnome/help/deskbar/cs/legal.xml
+share/gnome/help/deskbar/da/deskbar.xml
+share/gnome/help/deskbar/da/figures/deskbar-applet.png
+share/gnome/help/deskbar/da/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
@@ -373,7 +374,9 @@ share/locale/be@latin/LC_MESSAGES/deskbar-applet.mo
share/locale/bg/LC_MESSAGES/deskbar-applet.mo
share/locale/bn/LC_MESSAGES/deskbar-applet.mo
share/locale/bn_IN/LC_MESSAGES/deskbar-applet.mo
+share/locale/br/LC_MESSAGES/deskbar-applet.mo
share/locale/ca/LC_MESSAGES/deskbar-applet.mo
+share/locale/ca@valencia/LC_MESSAGES/deskbar-applet.mo
share/locale/cs/LC_MESSAGES/deskbar-applet.mo
share/locale/cy/LC_MESSAGES/deskbar-applet.mo
share/locale/da/LC_MESSAGES/deskbar-applet.mo
@@ -388,6 +391,7 @@ share/locale/eu/LC_MESSAGES/deskbar-applet.mo
share/locale/fa/LC_MESSAGES/deskbar-applet.mo
share/locale/fi/LC_MESSAGES/deskbar-applet.mo
share/locale/fr/LC_MESSAGES/deskbar-applet.mo
+share/locale/ga/LC_MESSAGES/deskbar-applet.mo
share/locale/gl/LC_MESSAGES/deskbar-applet.mo
share/locale/gu/LC_MESSAGES/deskbar-applet.mo
share/locale/he/LC_MESSAGES/deskbar-applet.mo
@@ -403,6 +407,7 @@ share/locale/ko/LC_MESSAGES/deskbar-applet.mo
share/locale/ku/LC_MESSAGES/deskbar-applet.mo
share/locale/lt/LC_MESSAGES/deskbar-applet.mo
share/locale/lv/LC_MESSAGES/deskbar-applet.mo
+share/locale/mai/LC_MESSAGES/deskbar-applet.mo
share/locale/mg/LC_MESSAGES/deskbar-applet.mo
share/locale/mk/LC_MESSAGES/deskbar-applet.mo
share/locale/ml/LC_MESSAGES/deskbar-applet.mo
@@ -439,6 +444,8 @@ 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-cs.omf
+share/omf/deskbar/deskbar-da.omf
share/omf/deskbar/deskbar-de.omf
share/omf/deskbar/deskbar-el.omf
share/omf/deskbar/deskbar-en_GB.omf
@@ -476,6 +483,10 @@ share/omf/deskbar/deskbar-zh_CN.omf
@dirrm share/gnome/help/deskbar/el
@dirrm share/gnome/help/deskbar/de/figures
@dirrm share/gnome/help/deskbar/de
+@dirrm share/gnome/help/deskbar/da/figures
+@dirrm share/gnome/help/deskbar/da
+@dirrm share/gnome/help/deskbar/cs/figures
+@dirrm share/gnome/help/deskbar/cs
@dirrm share/gnome/help/deskbar/ca/figures
@dirrm share/gnome/help/deskbar/ca
@dirrm share/gnome/help/deskbar/C/figures
@@ -489,7 +500,6 @@ share/omf/deskbar/deskbar-zh_CN.omf
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/osutils
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/interfaces
-@dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers/gdmclient
%%EVO%%@dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers/evolution
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers/actions
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers
@@ -498,8 +508,8 @@ share/omf/deskbar/deskbar-zh_CN.omf
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/core/_userdirs
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/core
@dirrm %%PYTHON_SITELIBDIR%%/deskbar
-@dirrm lib/deskbar-applet/modules-2.20-compatible
-@dirrm lib/deskbar-applet
+@dirrm libexec/deskbar-applet/modules-2.20-compatible
+@dirrm libexec/deskbar-applet
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@@ -516,10 +526,14 @@ share/omf/deskbar/deskbar-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
diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile
index 14907b1648a0..e2fb016a615f 100644
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.35 2009/03/16 08:49:02 kwm Exp $
+# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.40 2009/11/28 05:58:58 mezz Exp $
#
PORTNAME= evolution-jescs
-PORTVERSION= 2.26.0
-PORTREVISION= 1
+PORTVERSION= 2.28.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -29,8 +28,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_JOBS_UNSAFE= yes
-EVO_VERSION= 2.26
-PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.26"
+EVO_VERSION= 2.28
+PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.28"
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 51be9408354f..8014e79bad97 100644
--- a/deskutils/evolution-jescs/distinfo
+++ b/deskutils/evolution-jescs/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/evolution-jescs-2.28.0.tar.bz2) = d1231c8d51502930e910dc2b17f7c947
+SHA256 (gnome2/evolution-jescs-2.28.0.tar.bz2) = 0441955260762aedbc705776c738c25b43855c2511c7a7b20ed806a140c40948
+SIZE (gnome2/evolution-jescs-2.28.0.tar.bz2) = 602247
diff --git a/deskutils/evolution-jescs/pkg-plist b/deskutils/evolution-jescs/pkg-plist
index cad1ae2c81b1..7f2c3db67d31 100644
--- a/deskutils/evolution-jescs/pkg-plist
+++ b/deskutils/evolution-jescs/pkg-plist
@@ -17,6 +17,7 @@ share/icons/hicolor/24x24/apps/sun-connector.png
share/icons/hicolor/32x32/apps/sun-connector.png
share/icons/hicolor/48x48/apps/sun-connector.png
share/locale/ar/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/bn_IN/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/de/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
@@ -26,12 +27,19 @@ share/locale/en_GB/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/es/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/fi/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/fr/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/gu/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/hi/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/ja/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/kn/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/ko/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/ml/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/mr/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/nb/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/nl/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/oc/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/pa/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/pl/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/pt/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/pt_BR/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
@@ -40,6 +48,9 @@ share/locale/rw/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/sk/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/sq/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/sv/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/te/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/th/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/uk/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/vi/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
@@ -53,9 +64,13 @@ share/locale/zh_TW/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
@dirrmtry share/evolution/%%EVO_VERSION%%/icons/hicolor/16x16/categories
@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
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index c270dd8b41c2..f32fb60bc060 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.135 2009/03/21 21:35:37 marcus Exp $
+# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.143 2009/10/22 14:08:07 kwm Exp $
#
PORTNAME= gnome-utils
-PORTVERSION= 2.26.0
-PORTREVISION= 2
+PORTVERSION= 2.28.1
PORTEPOCH= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
@@ -17,7 +16,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 support utilities
-LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
+ canberra-gtk.0:${PORTSDIR}/audio/libcanberra
USE_BZIP2= yes
USE_GETTEXT= yes
@@ -26,16 +26,18 @@ USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \
- libgnomeprintui gnomedesktop ltverhack
+USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel ltverhack
USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 \
- baobab.1
+MAN1= gnome-dictionary.1 gnome-screenshot.1 gnome-search-tool.1 \
+ gnome-system-log.1 baobab.1
GCONF_SCHEMAS= gnome-dictionary.schemas gnome-screenshot.schemas \
gnome-search-tool.schemas baobab.schemas \
gnome-system-log.schemas
+post-patch:
+ @${RM} ${WRKSRC}/gsearchtool/gnome-search-tool.schemas
+
.include <bsd.port.mk>
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 032b1ebd5678..971b781997a3 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/gnome-utils-2.28.1.tar.bz2) = 3c811993191ae0bbf8666405a504288a
+SHA256 (gnome2/gnome-utils-2.28.1.tar.bz2) = 15fc1d7e01b959ba9f412fa28ca020ddd3e0dfbd6b73918ec75ce6d0e9492ea9
+SIZE (gnome2/gnome-utils-2.28.1.tar.bz2) = 6827650
diff --git a/deskutils/gnome-utils/files/patch-logview_gtkmessagearea.c b/deskutils/gnome-utils/files/patch-logview_gtkmessagearea.c
deleted file mode 100644
index 2388e3449431..000000000000
--- a/deskutils/gnome-utils/files/patch-logview_gtkmessagearea.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/pkg-plist b/deskutils/gnome-utils/pkg-plist
index c53f053ed522..e113189d5f8f 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -62,15 +62,18 @@ share/applications/gnome-dictionary.desktop
share/applications/gnome-screenshot.desktop
share/applications/gnome-search-tool.desktop
share/applications/gnome-system-log.desktop
-share/baobab/pixmaps/baobab.glade
+share/baobab/baobab-dialog-scan-props.ui
+share/baobab/baobab-main-window.ui
share/baobab/pixmaps/shot.png
share/gdict-1.0/sources/default.desktop
share/gdict-1.0/sources/spanish.desktop
share/gdict-1.0/sources/thai.desktop
share/gnome-2.0/ui/GNOME_DictionaryApplet.xml
-share/gnome-dictionary/gnome-dictionary-preferences.glade
+share/gnome-dictionary/gnome-dictionary-preferences.ui
+share/gnome-dictionary/gnome-dictionary-source.ui
share/gnome-dictionary/gnome-dictionary-ui.xml
share/gnome-screenshot/gnome-screenshot.ui
+%%DATADIR%%/logview-filter.ui
%%DATADIR%%/logview-toolbar.xml
share/gnome/help/baobab/C/baobab.xml
share/gnome/help/baobab/C/figures/baobab_fullscan.png
@@ -113,6 +116,14 @@ share/gnome/help/baobab/de/figures/baobab_ringschart1.png
share/gnome/help/baobab/de/figures/baobab_ringschart2.png
share/gnome/help/baobab/de/figures/baobab_treemaps.png
share/gnome/help/baobab/de/figures/baobab_window.png
+share/gnome/help/baobab/el/baobab.xml
+share/gnome/help/baobab/el/figures/baobab_fullscan.png
+share/gnome/help/baobab/el/figures/baobab_prefs.png
+share/gnome/help/baobab/el/figures/baobab_remote.png
+share/gnome/help/baobab/el/figures/baobab_ringschart1.png
+share/gnome/help/baobab/el/figures/baobab_ringschart2.png
+share/gnome/help/baobab/el/figures/baobab_treemaps.png
+share/gnome/help/baobab/el/figures/baobab_window.png
share/gnome/help/baobab/en_GB/baobab.xml
share/gnome/help/baobab/en_GB/figures/baobab_fullscan.png
share/gnome/help/baobab/en_GB/figures/baobab_prefs.png
@@ -201,6 +212,14 @@ share/gnome/help/baobab/uk/figures/baobab_ringschart1.png
share/gnome/help/baobab/uk/figures/baobab_ringschart2.png
share/gnome/help/baobab/uk/figures/baobab_treemaps.png
share/gnome/help/baobab/uk/figures/baobab_window.png
+share/gnome/help/baobab/zh_CN/baobab.xml
+share/gnome/help/baobab/zh_CN/figures/baobab_fullscan.png
+share/gnome/help/baobab/zh_CN/figures/baobab_prefs.png
+share/gnome/help/baobab/zh_CN/figures/baobab_remote.png
+share/gnome/help/baobab/zh_CN/figures/baobab_ringschart1.png
+share/gnome/help/baobab/zh_CN/figures/baobab_ringschart2.png
+share/gnome/help/baobab/zh_CN/figures/baobab_treemaps.png
+share/gnome/help/baobab/zh_CN/figures/baobab_window.png
share/gnome/help/baobab/zh_HK/baobab.xml
share/gnome/help/baobab/zh_HK/figures/baobab_fullscan.png
share/gnome/help/baobab/zh_HK/figures/baobab_prefs.png
@@ -236,6 +255,15 @@ share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-lookup.png
share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-preferences-print.png
share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-preferences-source.png
share/gnome/help/gnome-dictionary/ca/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/cs/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/cs/gnome-dictionary.xml
share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-add-source.png
share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-applet-window.png
share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-applet.png
@@ -349,8 +377,12 @@ share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/C/legal.xml
share/gnome/help/gnome-search-tool/ca/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/ca/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/cs/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/cs/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/de/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/de/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/el/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/el/gnome-search-tool.xml
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
@@ -409,6 +441,7 @@ 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-el.omf
share/omf/baobab/baobab-en_GB.omf
share/omf/baobab/baobab-es.omf
share/omf/baobab/baobab-eu.omf
@@ -420,10 +453,12 @@ share/omf/baobab/baobab-pl.omf
share/omf/baobab/baobab-ru.omf
share/omf/baobab/baobab-sv.omf
share/omf/baobab/baobab-uk.omf
+share/omf/baobab/baobab-zh_CN.omf
share/omf/baobab/baobab-zh_HK.omf
share/omf/baobab/baobab-zh_TW.omf
share/omf/gnome-dictionary/gnome-dictionary-C.omf
share/omf/gnome-dictionary/gnome-dictionary-ca.omf
+share/omf/gnome-dictionary/gnome-dictionary-cs.omf
share/omf/gnome-dictionary/gnome-dictionary-de.omf
share/omf/gnome-dictionary/gnome-dictionary-el.omf
share/omf/gnome-dictionary/gnome-dictionary-en_GB.omf
@@ -438,7 +473,9 @@ share/omf/gnome-dictionary/gnome-dictionary-sv.omf
share/omf/gnome-dictionary/gnome-dictionary-uk.omf
share/omf/gnome-search-tool/gnome-search-tool-C.omf
share/omf/gnome-search-tool/gnome-search-tool-ca.omf
+share/omf/gnome-search-tool/gnome-search-tool-cs.omf
share/omf/gnome-search-tool/gnome-search-tool-de.omf
+share/omf/gnome-search-tool/gnome-search-tool-el.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
@@ -478,8 +515,10 @@ share/locale/be@latin/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/bn/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/bn_IN/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/br/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/da/LC_MESSAGES/gnome-utils-2.0.mo
@@ -504,7 +543,6 @@ share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/id/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/ka/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/kn/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-utils-2.0.mo
@@ -531,7 +569,6 @@ share/locale/pt_BR/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ro/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ru/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/rw/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/si/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/sk/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/sl/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/sq/LC_MESSAGES/gnome-utils-2.0.mo
@@ -607,8 +644,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-search-tool/es
@dirrm share/gnome/help/gnome-search-tool/en_GB/figures
@dirrm share/gnome/help/gnome-search-tool/en_GB
+@dirrm share/gnome/help/gnome-search-tool/el/figures
+@dirrm share/gnome/help/gnome-search-tool/el
@dirrm share/gnome/help/gnome-search-tool/de/figures
@dirrm share/gnome/help/gnome-search-tool/de
+@dirrm share/gnome/help/gnome-search-tool/cs/figures
+@dirrm share/gnome/help/gnome-search-tool/cs
@dirrm share/gnome/help/gnome-search-tool/ca/figures
@dirrm share/gnome/help/gnome-search-tool/ca
@dirrm share/gnome/help/gnome-search-tool/C/figures
@@ -638,6 +679,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-dictionary/el
@dirrm share/gnome/help/gnome-dictionary/de/figures
@dirrm share/gnome/help/gnome-dictionary/de
+@dirrm share/gnome/help/gnome-dictionary/cs/figures
+@dirrm share/gnome/help/gnome-dictionary/cs
@dirrm share/gnome/help/gnome-dictionary/ca/figures
@dirrm share/gnome/help/gnome-dictionary/ca
@dirrm share/gnome/help/gnome-dictionary/C/figures
@@ -647,6 +690,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/baobab/zh_TW
@dirrm share/gnome/help/baobab/zh_HK/figures
@dirrm share/gnome/help/baobab/zh_HK
+@dirrm share/gnome/help/baobab/zh_CN/figures
+@dirrm share/gnome/help/baobab/zh_CN
@dirrm share/gnome/help/baobab/uk/figures
@dirrm share/gnome/help/baobab/uk
@dirrm share/gnome/help/baobab/sv/figures
@@ -669,6 +714,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/baobab/es
@dirrm share/gnome/help/baobab/en_GB/figures
@dirrm share/gnome/help/baobab/en_GB
+@dirrm share/gnome/help/baobab/el/figures
+@dirrm share/gnome/help/baobab/el
@dirrm share/gnome/help/baobab/de/figures
@dirrm share/gnome/help/baobab/de
@dirrm share/gnome/help/baobab/da/figures
@@ -699,8 +746,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/ps/LC_MESSAGES
@@ -717,6 +762,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@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
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
new file mode 100644
index 000000000000..d5f32f010eb3
--- /dev/null
+++ b/deskutils/gnote/Makefile
@@ -0,0 +1,60 @@
+# New ports collection makefile for: gnote
+# Date created: 20 July 2009
+# Whom: Mezz <mezz@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/deskutils/gnote/Makefile,v 1.6 2009/11/28 17:54:22 kwm Exp $
+#
+
+PORTNAME= gnote
+PORTVERSION= 0.6.3
+CATEGORIES= deskutils gnome
+MASTER_SITES= GNOME
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= A port of Tomboy to C++, note taking application
+
+LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
+ gtkspell.0:${PORTSDIR}/textproc/gtkspell \
+ boost_filesystem.4:${PORTSDIR}/devel/boost-libs \
+ uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
+
+USE_GMAKE= yes
+USE_GNOME= gnomehack gnomeprefix gconf2 intltool ltverhack gnomepanel
+USE_GETTEXT= yes
+INSTALLS_OMF= yes
+GCONF_SCHEMAS= gnote.schemas
+USE_AUTOTOOLS= libtool:22
+INSTALLS_ICONS= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ PANELAPPLET_LIBDIR="${PREFIX}/libdata"
+CONFIGURE_ARGS= --disable-dbus
+DOCS= AUTHORS COPYING ChangeLog NEWS README TODO
+MAN1= gnote.1
+
+.if !defined(WITHOUT_APPLET)
+LIB_DEPENDS+= panelappletmm-2.6:${PORTSDIR}/x11-toolkits/libpanelappletmm
+CONFIGURE_ARGS+=--enable-applet
+PLIST_SUB+= APPLET=""
+.else
+CONFIGURE_ARGS+=--disable-applet
+PLIST_SUB+= APPLET="@comment "
+.endif
+
+PLIST_SUB+= VERSION=${PORTVERSION}
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|/usr/include/boost|${LOCALBASE}/include/boost|g' \
+ ${WRKSRC}/configure
+
+.ifndef (NOPORTDOCS)
+post-install:
+ @${MKDIR} ${DOCSDIR}
+.for i in ${DOCS}
+ @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/deskutils/gnote/distinfo b/deskutils/gnote/distinfo
new file mode 100644
index 000000000000..550f6e2a8497
--- /dev/null
+++ b/deskutils/gnote/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnote-0.6.3.tar.gz) = 84df707352eae288d1d8536796ab41f8
+SHA256 (gnote-0.6.3.tar.gz) = affd34cef21883ab831b901a82804dd3bde03dc621ec4cda7ddb2f5b66ce13d9
+SIZE (gnote-0.6.3.tar.gz) = 1754426
diff --git a/deskutils/gnote/files/patch-src_sharp_datetime.cpp b/deskutils/gnote/files/patch-src_sharp_datetime.cpp
new file mode 100644
index 000000000000..71ce22078876
--- /dev/null
+++ b/deskutils/gnote/files/patch-src_sharp_datetime.cpp
@@ -0,0 +1,36 @@
+--- src/sharp/datetime.cpp.orig 2009-07-21 22:13:30.000000000 -0500
++++ src/sharp/datetime.cpp 2009-07-21 22:25:29.000000000 -0500
+@@ -69,14 +69,14 @@
+ int DateTime::year() const
+ {
+ struct tm result;
+- localtime_r(&m_date.tv_sec, &result);
++ localtime_r((const time_t *)&m_date.tv_sec, &result);
+ return result.tm_year;
+ }
+
+ int DateTime::day_of_year() const
+ {
+ struct tm result;
+- localtime_r(&m_date.tv_sec, &result);
++ localtime_r((const time_t *)&m_date.tv_sec, &result);
+ return result.tm_yday;
+ }
+
+@@ -95,14 +95,14 @@
+ std::string DateTime::to_string(const char * format) const
+ {
+ struct tm result;
+- return _to_string(format, localtime_r(&m_date.tv_sec, &result));
++ return _to_string(format, localtime_r((const time_t *)&m_date.tv_sec, &result));
+ }
+
+
+ std::string DateTime::to_short_time_string() const
+ {
+ struct tm result;
+- return _to_string("%R", localtime_r(&m_date.tv_sec, &result));
++ return _to_string("%R", localtime_r((const time_t *)&m_date.tv_sec, &result));
+ }
+
+ std::string DateTime::to_iso8601() const
diff --git a/deskutils/gnote/pkg-descr b/deskutils/gnote/pkg-descr
new file mode 100644
index 000000000000..5dd92d2479af
--- /dev/null
+++ b/deskutils/gnote/pkg-descr
@@ -0,0 +1,6 @@
+Gnote is a port of Tomboy to C++.
+
+It is the same note taking application, including most of the add-ins (more
+are to come). Synchronization support is being worked on.
+
+WWW: http://live.gnome.org/Gnote
diff --git a/deskutils/gnote/pkg-plist b/deskutils/gnote/pkg-plist
new file mode 100644
index 000000000000..3b73c506f712
--- /dev/null
+++ b/deskutils/gnote/pkg-plist
@@ -0,0 +1,244 @@
+bin/gnote
+lib/gnote/addins/%%VERSION%%/backlinks.a
+lib/gnote/addins/%%VERSION%%/backlinks.la
+lib/gnote/addins/%%VERSION%%/backlinks.so
+lib/gnote/addins/%%VERSION%%/bugzilla.a
+lib/gnote/addins/%%VERSION%%/bugzilla.la
+lib/gnote/addins/%%VERSION%%/bugzilla.so
+lib/gnote/addins/%%VERSION%%/exporttohtml.a
+lib/gnote/addins/%%VERSION%%/exporttohtml.la
+lib/gnote/addins/%%VERSION%%/exporttohtml.so
+lib/gnote/addins/%%VERSION%%/fixedwidth.a
+lib/gnote/addins/%%VERSION%%/fixedwidth.la
+lib/gnote/addins/%%VERSION%%/fixedwidth.so
+lib/gnote/addins/%%VERSION%%/inserttimestamp.a
+lib/gnote/addins/%%VERSION%%/inserttimestamp.la
+lib/gnote/addins/%%VERSION%%/inserttimestamp.so
+lib/gnote/addins/%%VERSION%%/printnotes.a
+lib/gnote/addins/%%VERSION%%/printnotes.la
+lib/gnote/addins/%%VERSION%%/printnotes.so
+lib/gnote/addins/%%VERSION%%/stickynoteimport.a
+lib/gnote/addins/%%VERSION%%/stickynoteimport.la
+lib/gnote/addins/%%VERSION%%/stickynoteimport.so
+lib/gnote/addins/%%VERSION%%/tomboyimport.a
+lib/gnote/addins/%%VERSION%%/tomboyimport.la
+lib/gnote/addins/%%VERSION%%/tomboyimport.so
+lib/gnote/addins/%%VERSION%%/underline.a
+lib/gnote/addins/%%VERSION%%/underline.la
+lib/gnote/addins/%%VERSION%%/underline.so
+%%APPLET%%libdata/bonobo/servers/GNOME_GnoteApplet.server
+%%APPLET%%libexec/gnote-applet
+share/applications/gnote.desktop
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+share/gnome/help/gnote/C/figures/add-notebook-search.png
+share/gnome/help/gnote/C/figures/add-to-notebook.png
+share/gnome/help/gnote/C/figures/delete-notebook.png
+share/gnome/help/gnote/C/figures/gnote-main-menu.png
+share/gnome/help/gnote/C/figures/gnote-new-note.png
+share/gnome/help/gnote/C/figures/gnote-panel.png
+share/gnome/help/gnote/C/figures/gnote-pindown.png
+share/gnome/help/gnote/C/figures/gnote-pinup.png
+share/gnome/help/gnote/C/figures/gnote-preferences-add-ins.png
+share/gnome/help/gnote/C/figures/gnote-preferences-editing.png
+share/gnome/help/gnote/C/figures/gnote-preferences-hotkeys.png
+share/gnome/help/gnote/C/figures/gnote-preferences-synchronization.png
+share/gnome/help/gnote/C/figures/gnote-tools.png
+share/gnome/help/gnote/C/figures/move-notes-search.png
+share/gnome/help/gnote/C/figures/new-notebook.png
+share/gnome/help/gnote/C/figures/note-template.png
+share/gnome/help/gnote/C/figures/notebook-icon.png
+share/gnome/help/gnote/C/gnote.xml
+share/gnome/help/gnote/C/legal.xml
+share/gnome/help/gnote/de/figures/add-notebook-search.png
+share/gnome/help/gnote/de/figures/add-to-notebook.png
+share/gnome/help/gnote/de/figures/delete-notebook.png
+share/gnome/help/gnote/de/figures/gnote-main-menu.png
+share/gnome/help/gnote/de/figures/gnote-new-note.png
+share/gnome/help/gnote/de/figures/gnote-panel.png
+share/gnome/help/gnote/de/figures/gnote-pindown.png
+share/gnome/help/gnote/de/figures/gnote-pinup.png
+share/gnome/help/gnote/de/figures/gnote-preferences-add-ins.png
+share/gnome/help/gnote/de/figures/gnote-preferences-editing.png
+share/gnome/help/gnote/de/figures/gnote-preferences-hotkeys.png
+share/gnome/help/gnote/de/figures/gnote-preferences-synchronization.png
+share/gnome/help/gnote/de/figures/gnote-tools.png
+share/gnome/help/gnote/de/figures/move-notes-search.png
+share/gnome/help/gnote/de/figures/new-notebook.png
+share/gnome/help/gnote/de/figures/note-template.png
+share/gnome/help/gnote/de/figures/notebook-icon.png
+share/gnome/help/gnote/de/gnote.xml
+share/gnome/help/gnote/de/legal.xml
+share/gnome/help/gnote/el/figures/add-notebook-search.png
+share/gnome/help/gnote/el/figures/add-to-notebook.png
+share/gnome/help/gnote/el/figures/delete-notebook.png
+share/gnome/help/gnote/el/figures/gnote-main-menu.png
+share/gnome/help/gnote/el/figures/gnote-new-note.png
+share/gnome/help/gnote/el/figures/gnote-panel.png
+share/gnome/help/gnote/el/figures/gnote-pindown.png
+share/gnome/help/gnote/el/figures/gnote-pinup.png
+share/gnome/help/gnote/el/figures/gnote-preferences-add-ins.png
+share/gnome/help/gnote/el/figures/gnote-preferences-editing.png
+share/gnome/help/gnote/el/figures/gnote-preferences-hotkeys.png
+share/gnome/help/gnote/el/figures/gnote-preferences-synchronization.png
+share/gnome/help/gnote/el/figures/gnote-tools.png
+share/gnome/help/gnote/el/figures/move-notes-search.png
+share/gnome/help/gnote/el/figures/new-notebook.png
+share/gnome/help/gnote/el/figures/note-template.png
+share/gnome/help/gnote/el/figures/notebook-icon.png
+share/gnome/help/gnote/el/gnote.xml
+share/gnome/help/gnote/el/legal.xml
+share/gnome/help/gnote/es/figures/add-notebook-search.png
+share/gnome/help/gnote/es/figures/add-to-notebook.png
+share/gnome/help/gnote/es/figures/delete-notebook.png
+share/gnome/help/gnote/es/figures/gnote-main-menu.png
+share/gnome/help/gnote/es/figures/gnote-new-note.png
+share/gnome/help/gnote/es/figures/gnote-panel.png
+share/gnome/help/gnote/es/figures/gnote-pindown.png
+share/gnome/help/gnote/es/figures/gnote-pinup.png
+share/gnome/help/gnote/es/figures/gnote-preferences-add-ins.png
+share/gnome/help/gnote/es/figures/gnote-preferences-editing.png
+share/gnome/help/gnote/es/figures/gnote-preferences-hotkeys.png
+share/gnome/help/gnote/es/figures/gnote-preferences-synchronization.png
+share/gnome/help/gnote/es/figures/gnote-tools.png
+share/gnome/help/gnote/es/figures/move-notes-search.png
+share/gnome/help/gnote/es/figures/new-notebook.png
+share/gnome/help/gnote/es/figures/note-template.png
+share/gnome/help/gnote/es/figures/notebook-icon.png
+share/gnome/help/gnote/es/gnote.xml
+share/gnome/help/gnote/es/legal.xml
+share/gnome/help/gnote/sv/figures/add-notebook-search.png
+share/gnome/help/gnote/sv/figures/add-to-notebook.png
+share/gnome/help/gnote/sv/figures/delete-notebook.png
+share/gnome/help/gnote/sv/figures/gnote-main-menu.png
+share/gnome/help/gnote/sv/figures/gnote-new-note.png
+share/gnome/help/gnote/sv/figures/gnote-panel.png
+share/gnome/help/gnote/sv/figures/gnote-pindown.png
+share/gnome/help/gnote/sv/figures/gnote-pinup.png
+share/gnome/help/gnote/sv/figures/gnote-preferences-add-ins.png
+share/gnome/help/gnote/sv/figures/gnote-preferences-editing.png
+share/gnome/help/gnote/sv/figures/gnote-preferences-hotkeys.png
+share/gnome/help/gnote/sv/figures/gnote-preferences-synchronization.png
+share/gnome/help/gnote/sv/figures/gnote-tools.png
+share/gnome/help/gnote/sv/figures/move-notes-search.png
+share/gnome/help/gnote/sv/figures/new-notebook.png
+share/gnome/help/gnote/sv/figures/note-template.png
+share/gnome/help/gnote/sv/figures/notebook-icon.png
+share/gnome/help/gnote/sv/gnote.xml
+share/gnome/help/gnote/sv/legal.xml
+%%DATADIR%%/GNOME_GnoteApplet.xml
+%%DATADIR%%/UIManagerLayout.xml
+%%DATADIR%%/exporttohtml.xsl
+%%DATADIR%%/icons/hicolor/16x16/actions/note-new.png
+%%DATADIR%%/icons/hicolor/16x16/actions/notebook-new.png
+%%DATADIR%%/icons/hicolor/16x16/apps/bug.png
+%%DATADIR%%/icons/hicolor/16x16/places/note.png
+%%DATADIR%%/icons/hicolor/16x16/places/notebook.png
+%%DATADIR%%/icons/hicolor/16x16/status/pin-active.png
+%%DATADIR%%/icons/hicolor/16x16/status/pin-down.png
+%%DATADIR%%/icons/hicolor/16x16/status/pin-up.png
+%%DATADIR%%/icons/hicolor/22x22/actions/filter-note-all.png
+%%DATADIR%%/icons/hicolor/22x22/actions/filter-note-unfiled.png
+%%DATADIR%%/icons/hicolor/22x22/actions/note-new.png
+%%DATADIR%%/icons/hicolor/22x22/actions/notebook-new.png
+%%DATADIR%%/icons/hicolor/22x22/places/note.png
+%%DATADIR%%/icons/hicolor/22x22/places/notebook.png
+%%DATADIR%%/icons/hicolor/24x24/actions/filter-note-all.png
+%%DATADIR%%/icons/hicolor/24x24/actions/filter-note-unfiled.png
+%%DATADIR%%/icons/hicolor/24x24/actions/note-new.png
+%%DATADIR%%/icons/hicolor/24x24/actions/notebook-new.png
+%%DATADIR%%/icons/hicolor/24x24/places/note.png
+%%DATADIR%%/icons/hicolor/24x24/places/notebook.png
+%%DATADIR%%/icons/hicolor/48x48/actions/notebook-new.png
+%%DATADIR%%/icons/hicolor/scalable/actions/notebook-new.svg
+share/icons/hicolor/16x16/apps/gnote.png
+share/icons/hicolor/22x22/apps/gnote.png
+share/icons/hicolor/24x24/apps/gnote.png
+share/icons/hicolor/32x32/apps/gnote.png
+share/icons/hicolor/48x48/apps/gnote.png
+share/icons/hicolor/scalable/apps/gnote.svg
+share/locale/ar/LC_MESSAGES/gnote.mo
+share/locale/as/LC_MESSAGES/gnote.mo
+share/locale/bn_IN/LC_MESSAGES/gnote.mo
+share/locale/ca/LC_MESSAGES/gnote.mo
+share/locale/cs/LC_MESSAGES/gnote.mo
+share/locale/de/LC_MESSAGES/gnote.mo
+share/locale/el/LC_MESSAGES/gnote.mo
+share/locale/en_GB/LC_MESSAGES/gnote.mo
+share/locale/es/LC_MESSAGES/gnote.mo
+share/locale/fr/LC_MESSAGES/gnote.mo
+share/locale/gl/LC_MESSAGES/gnote.mo
+share/locale/gu/LC_MESSAGES/gnote.mo
+share/locale/he/LC_MESSAGES/gnote.mo
+share/locale/hu/LC_MESSAGES/gnote.mo
+share/locale/id/LC_MESSAGES/gnote.mo
+share/locale/it/LC_MESSAGES/gnote.mo
+share/locale/ja/LC_MESSAGES/gnote.mo
+share/locale/kn/LC_MESSAGES/gnote.mo
+share/locale/ko/LC_MESSAGES/gnote.mo
+share/locale/lt/LC_MESSAGES/gnote.mo
+share/locale/mr/LC_MESSAGES/gnote.mo
+share/locale/or/LC_MESSAGES/gnote.mo
+share/locale/pa/LC_MESSAGES/gnote.mo
+share/locale/pl/LC_MESSAGES/gnote.mo
+share/locale/pt/LC_MESSAGES/gnote.mo
+share/locale/pt_BR/LC_MESSAGES/gnote.mo
+share/locale/ru/LC_MESSAGES/gnote.mo
+share/locale/sl/LC_MESSAGES/gnote.mo
+share/locale/sv/LC_MESSAGES/gnote.mo
+share/locale/ta/LC_MESSAGES/gnote.mo
+share/locale/te/LC_MESSAGES/gnote.mo
+share/locale/th/LC_MESSAGES/gnote.mo
+share/locale/zh_CN/LC_MESSAGES/gnote.mo
+share/omf/gnote/gnote-C.omf
+share/omf/gnote/gnote-de.omf
+share/omf/gnote/gnote-el.omf
+share/omf/gnote/gnote-es.omf
+share/omf/gnote/gnote-sv.omf
+@dirrm share/omf/gnote
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
+@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor/48x48/actions
+@dirrm %%DATADIR%%/icons/hicolor/48x48
+@dirrm %%DATADIR%%/icons/hicolor/24x24/places
+@dirrm %%DATADIR%%/icons/hicolor/24x24/actions
+@dirrm %%DATADIR%%/icons/hicolor/24x24
+@dirrm %%DATADIR%%/icons/hicolor/22x22/places
+@dirrm %%DATADIR%%/icons/hicolor/22x22/actions
+@dirrm %%DATADIR%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/icons/hicolor/16x16/status
+@dirrm %%DATADIR%%/icons/hicolor/16x16/places
+@dirrm %%DATADIR%%/icons/hicolor/16x16/apps
+@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
+@dirrm share/gnome/help/gnote/sv/figures
+@dirrm share/gnome/help/gnote/sv
+@dirrm share/gnome/help/gnote/es/figures
+@dirrm share/gnome/help/gnote/es
+@dirrm share/gnome/help/gnote/el/figures
+@dirrm share/gnome/help/gnote/el
+@dirrm share/gnome/help/gnote/de/figures
+@dirrm share/gnome/help/gnote/de
+@dirrm share/gnome/help/gnote/C/figures
+@dirrm share/gnome/help/gnote/C
+@dirrm share/gnome/help/gnote
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
+@dirrmtry lib/gnote/addins/%%VERSION%%
+@dirrmtry lib/gnote/addins
+@dirrmtry lib/gnote
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index c550b2c24a9e..107bdeeee48d 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -3,12 +3,12 @@
# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnotime/Makefile,v 1.21 2007/05/19 21:36:03 marcus Exp $
+# $MCom: ports/deskutils/gnotime/Makefile,v 1.24 2009/11/28 05:58:58 mezz Exp $
#
PORTNAME= gnotime
PORTVERSION= 2.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils gnome
MASTER_SITES= SF/gttr/${PORTNAME}/${PORTNAME}-${PORTVERSION}:gttr SF/gttr/${PORTNAME}/${PORTNAME}-${PORTVERSION}:qof
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:gttr \
@@ -36,8 +36,8 @@ GCONF_SCHEMAS= gnotime.schemas
QOF_DISTNAME= qof-0.7.5
QOF_WRKSRC= ${WRKDIR}/${QOF_DISTNAME}
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
+LDFLAGS= -L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0`
LIBQOF_CFLAGS= -I${QOF_WRKSRC}/qof
LIBQOF_LIBS= -L${QOF_WRKSRC}/qof/.libs -lqof
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 24d864751137..2083002801d3 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gucharmap/Makefile,v 1.60 2009/03/16 07:50:48 kwm Exp $
+# $MCom: ports/deskutils/gucharmap/Makefile,v 1.65 2009/11/28 05:58:59 mezz Exp $
#
PORTNAME= gucharmap
-PORTVERSION= 2.26.3.1
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index 821a8b6c86f2..c790d1e64c28 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gucharmap-2.26.3.1.tar.bz2) = 3d13ad452860b1facc9765713bc96d33
-SHA256 (gnome2/gucharmap-2.26.3.1.tar.bz2) = 4dc5406543b93068a9cb9debdd3be96cd28301ce8c8562ba8fcfefca2f1fb2ff
-SIZE (gnome2/gucharmap-2.26.3.1.tar.bz2) = 3059234
+MD5 (gnome2/gucharmap-2.28.1.tar.bz2) = 409a08462fab85daa5523e950a794561
+SHA256 (gnome2/gucharmap-2.28.1.tar.bz2) = 91e909a1223b60a466ca2001b41de43ca7e26104d7f4da6422ecbdc07970eee3
+SIZE (gnome2/gucharmap-2.28.1.tar.bz2) = 3073003
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
index e95a9862a4d3..c7930f9bbdac 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -83,14 +83,17 @@ share/locale/af/LC_MESSAGES/gucharmap.mo
share/locale/am/LC_MESSAGES/gucharmap.mo
share/locale/ar/LC_MESSAGES/gucharmap.mo
share/locale/as/LC_MESSAGES/gucharmap.mo
+share/locale/ast/LC_MESSAGES/gucharmap.mo
share/locale/az/LC_MESSAGES/gucharmap.mo
share/locale/be/LC_MESSAGES/gucharmap.mo
share/locale/be@latin/LC_MESSAGES/gucharmap.mo
share/locale/bg/LC_MESSAGES/gucharmap.mo
share/locale/bn/LC_MESSAGES/gucharmap.mo
share/locale/bn_IN/LC_MESSAGES/gucharmap.mo
+share/locale/br/LC_MESSAGES/gucharmap.mo
share/locale/bs/LC_MESSAGES/gucharmap.mo
share/locale/ca/LC_MESSAGES/gucharmap.mo
+share/locale/ca@valencia/LC_MESSAGES/gucharmap.mo
share/locale/cs/LC_MESSAGES/gucharmap.mo
share/locale/cy/LC_MESSAGES/gucharmap.mo
share/locale/da/LC_MESSAGES/gucharmap.mo
@@ -247,9 +250,13 @@ share/omf/gucharmap/gucharmap-zh_TW.omf
@dirrmtry share/locale/mai
@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/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index 1c4b6d266f48..4598213908cc 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/hamster-applet/Makefile,v 1.18 2009/03/21 21:05:56 marcus Exp $
+# $MCom: ports/deskutils/hamster-applet/Makefile,v 1.29 2009/10/20 17:53:42 kwm Exp $
#
PORTNAME= hamster-applet
-PORTVERSION= 2.26.3
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/hamster-applet/distinfo b/deskutils/hamster-applet/distinfo
index 65ee0405391c..0e5ed6463cb3 100644
--- a/deskutils/hamster-applet/distinfo
+++ b/deskutils/hamster-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/hamster-applet-2.26.3.tar.bz2) = bc40602ef88e23e0a8c37c7086e953e7
-SHA256 (gnome2/hamster-applet-2.26.3.tar.bz2) = c0b7e444b8981593723cc3ab3063450f2a96d5f295a4011ae9d37e28754a3f76
-SIZE (gnome2/hamster-applet-2.26.3.tar.bz2) = 428731
+MD5 (gnome2/hamster-applet-2.28.1.tar.bz2) = f4c68e02b487b9e0d284e63a411d8cdd
+SHA256 (gnome2/hamster-applet-2.28.1.tar.bz2) = ab9ae10380aeb0aea09e42fd5e7ebd7b09116c0608740b5fa9eda8433d9e31c9
+SIZE (gnome2/hamster-applet-2.28.1.tar.bz2) = 517073
diff --git a/deskutils/hamster-applet/files/patch-hamster___init__.py b/deskutils/hamster-applet/files/patch-hamster___init__.py
deleted file mode 100644
index a277063e0211..000000000000
--- a/deskutils/hamster-applet/files/patch-hamster___init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- hamster/__init__.py.orig 2008-08-07 10:53:47.000000000 -0400
-+++ hamster/__init__.py 2008-08-07 10:54:01.000000000 -0400
-@@ -74,6 +74,7 @@ if not exists(USER_HAMSTER_DIR):
- if not exists(HAMSTER_DB):
- print "Database not found in %s - installing default from %s!" % (HAMSTER_DB, SHARED_DATA_DIR)
- copyfile(join(SHARED_DATA_DIR, DB_FILE), HAMSTER_DB)
-+ os.chmod(HAMSTER_DB, 0644)
-
- # Init storage
-
diff --git a/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py b/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py
index ec54fd792bbd..6d436ef15360 100644
--- a/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py
+++ b/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py
@@ -1,17 +1,23 @@
---- 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')
+--- hamster/hamster-applet.py.orig 2009-07-19 21:41:20.000000000 +1000
++++ hamster/hamster-applet.py 2009-07-19 21:41:46.000000000 +1000
+@@ -37,14 +37,14 @@ from hamster import defs
+ from hamster.configuration import runtime
--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', locale_dir)
-+#if hasattr(locale, 'bind_textdomain_codeset'):
-+# locale.bind_textdomain_codeset('hamster-applet','UTF-8')
-+#locale.textdomain('hamster-applet')
+ # Setup i18n
+-locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
++#locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
- hamster.__init_db()
- import hamster.applet
+-for module in (gettext, locale):
+- module.bindtextdomain('hamster-applet', locale_dir)
+- module.textdomain('hamster-applet')
++#for module in (gettext, locale):
++# module.bindtextdomain('hamster-applet', locale_dir)
++# module.textdomain('hamster-applet')
+
+- if hasattr(module, 'bind_textdomain_codeset'):
+- module.bind_textdomain_codeset('hamster-applet','UTF-8')
++# if hasattr(module, 'bind_textdomain_codeset'):
++# module.bind_textdomain_codeset('hamster-applet','UTF-8')
+
+
+ from hamster.applet import HamsterApplet
diff --git a/deskutils/hamster-applet/pkg-plist b/deskutils/hamster-applet/pkg-plist
index 34e12f41bd17..15387400920f 100644
--- a/deskutils/hamster-applet/pkg-plist
+++ b/deskutils/hamster-applet/pkg-plist
@@ -1,7 +1,4 @@
lib/hamster-applet/hamster-applet
-%%PYTHON_SITELIBDIR%%/hamster/Configuration.py
-%%PYTHON_SITELIBDIR%%/hamster/Configuration.pyc
-%%PYTHON_SITELIBDIR%%/hamster/Configuration.pyo
%%PYTHON_SITELIBDIR%%/hamster/KeyBinder.py
%%PYTHON_SITELIBDIR%%/hamster/KeyBinder.pyc
%%PYTHON_SITELIBDIR%%/hamster/KeyBinder.pyo
@@ -11,15 +8,15 @@ lib/hamster-applet/hamster-applet
%%PYTHON_SITELIBDIR%%/hamster/about.py
%%PYTHON_SITELIBDIR%%/hamster/about.pyc
%%PYTHON_SITELIBDIR%%/hamster/about.pyo
-%%PYTHON_SITELIBDIR%%/hamster/add_custom_fact.py
-%%PYTHON_SITELIBDIR%%/hamster/add_custom_fact.pyc
-%%PYTHON_SITELIBDIR%%/hamster/add_custom_fact.pyo
%%PYTHON_SITELIBDIR%%/hamster/applet.py
%%PYTHON_SITELIBDIR%%/hamster/applet.pyc
%%PYTHON_SITELIBDIR%%/hamster/applet.pyo
%%PYTHON_SITELIBDIR%%/hamster/charting.py
%%PYTHON_SITELIBDIR%%/hamster/charting.pyc
%%PYTHON_SITELIBDIR%%/hamster/charting.pyo
+%%PYTHON_SITELIBDIR%%/hamster/configuration.py
+%%PYTHON_SITELIBDIR%%/hamster/configuration.pyc
+%%PYTHON_SITELIBDIR%%/hamster/configuration.pyo
%%PYTHON_SITELIBDIR%%/hamster/db.py
%%PYTHON_SITELIBDIR%%/hamster/db.pyc
%%PYTHON_SITELIBDIR%%/hamster/db.pyo
@@ -29,12 +26,21 @@ lib/hamster-applet/hamster-applet
%%PYTHON_SITELIBDIR%%/hamster/dispatcher.py
%%PYTHON_SITELIBDIR%%/hamster/dispatcher.pyc
%%PYTHON_SITELIBDIR%%/hamster/dispatcher.pyo
+%%PYTHON_SITELIBDIR%%/hamster/edit_activity.py
+%%PYTHON_SITELIBDIR%%/hamster/edit_activity.pyc
+%%PYTHON_SITELIBDIR%%/hamster/edit_activity.pyo
%%PYTHON_SITELIBDIR%%/hamster/eds.py
%%PYTHON_SITELIBDIR%%/hamster/eds.pyc
%%PYTHON_SITELIBDIR%%/hamster/eds.pyo
+%%PYTHON_SITELIBDIR%%/hamster/graphics.py
+%%PYTHON_SITELIBDIR%%/hamster/graphics.pyc
+%%PYTHON_SITELIBDIR%%/hamster/graphics.pyo
%%PYTHON_SITELIBDIR%%/hamster/hamsterdbus.py
%%PYTHON_SITELIBDIR%%/hamster/hamsterdbus.pyc
%%PYTHON_SITELIBDIR%%/hamster/hamsterdbus.pyo
+%%PYTHON_SITELIBDIR%%/hamster/i18n.py
+%%PYTHON_SITELIBDIR%%/hamster/i18n.pyc
+%%PYTHON_SITELIBDIR%%/hamster/i18n.pyo
%%PYTHON_SITELIBDIR%%/hamster/idle.py
%%PYTHON_SITELIBDIR%%/hamster/idle.pyc
%%PYTHON_SITELIBDIR%%/hamster/idle.pyo
@@ -58,18 +64,21 @@ lib/hamster-applet/hamster-applet
%%PYTHON_SITELIBDIR%%/hamster/stuff.py
%%PYTHON_SITELIBDIR%%/hamster/stuff.pyc
%%PYTHON_SITELIBDIR%%/hamster/stuff.pyo
+%%PYTHON_SITELIBDIR%%/hamster/widgets.py
+%%PYTHON_SITELIBDIR%%/hamster/widgets.pyc
+%%PYTHON_SITELIBDIR%%/hamster/widgets.pyo
libdata/bonobo/servers/Hamster_Applet.server
share/gnome-control-center/keybindings/99-hamster-applet.xml
%%DATADIR%%/Hamster_Applet.xml
-%%DATADIR%%/add_custom_fact.glade
+%%DATADIR%%/applet.ui
%%DATADIR%%/art/hamster-applet.png
%%DATADIR%%/art/stock_calendar-view-day.png
%%DATADIR%%/art/stock_calendar-view-month.png
%%DATADIR%%/art/stock_calendar-view-week.png
+%%DATADIR%%/edit_activity.ui
%%DATADIR%%/hamster.db
-%%DATADIR%%/menu.glade
-%%DATADIR%%/preferences.glade
-%%DATADIR%%/stats.glade
+%%DATADIR%%/preferences.ui
+%%DATADIR%%/stats.ui
share/icons/hicolor/16x16/apps/hamster-applet.png
share/icons/hicolor/22x22/apps/hamster-applet.png
share/icons/hicolor/32x32/apps/hamster-applet.png
@@ -77,7 +86,9 @@ 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/be/LC_MESSAGES/hamster-applet.mo
share/locale/bg/LC_MESSAGES/hamster-applet.mo
+share/locale/bn/LC_MESSAGES/hamster-applet.mo
share/locale/bn_IN/LC_MESSAGES/hamster-applet.mo
share/locale/ca/LC_MESSAGES/hamster-applet.mo
share/locale/ca@valencia/LC_MESSAGES/hamster-applet.mo
@@ -103,6 +114,7 @@ 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/mai/LC_MESSAGES/hamster-applet.mo
share/locale/mk/LC_MESSAGES/hamster-applet.mo
share/locale/ml/LC_MESSAGES/hamster-applet.mo
share/locale/mr/LC_MESSAGES/hamster-applet.mo
@@ -115,6 +127,7 @@ 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/si/LC_MESSAGES/hamster-applet.mo
share/locale/sl/LC_MESSAGES/hamster-applet.mo
share/locale/sq/LC_MESSAGES/hamster-applet.mo
share/locale/sr/LC_MESSAGES/hamster-applet.mo
@@ -123,8 +136,8 @@ 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/uk/LC_MESSAGES/hamster-applet.mo
share/locale/tr/LC_MESSAGES/hamster-applet.mo
+share/locale/uk/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
@@ -140,10 +153,12 @@ share/locale/zh_TW/LC_MESSAGES/hamster-applet.mo
@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/si/LC_MESSAGES
+@dirrmtry share/locale/si
@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/ca@valencia/LC_MESSAGES
diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index eaaf7cabd6f0..9ca311974ecb 100644
--- a/deskutils/nautilus-actions/Makefile
+++ b/deskutils/nautilus-actions/Makefile
@@ -3,19 +3,21 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/nautilus-actions/Makefile,v 1.7 2008/03/18 14:45:27 ahze Exp $
+# $MCom: ports/deskutils/nautilus-actions/Makefile,v 1.14 2009/11/09 09:08:28 kwm Exp $
#
PORTNAME= nautilus-actions
-PORTVERSION= 1.4.1
-PORTREVISION= 3
+PORTVERSION= 1.12.3
CATEGORIES= deskutils
-MASTER_SITES= ftp://ftp2.grumz.net/grumz/
+MASTER_SITES= GNOME \
+ http://www.nautilus-actions.org/downloads/ \
+ ftp://pwi.dyndns.biz/pub/tarballs/nautilus-actions/
-MAINTAINER= ahze@FreeBSD.org
+MAINTAINER= gnome@FreeBSD.org
COMMENT= Extension for Nautilus to configure programs to launch on files
-LIB_DEPENDS= uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS= uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \
+ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
INSTALLS_ICONS= yes
USE_GETTEXT= yes
@@ -26,7 +28,22 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-nautilus-extdir=${LOCALBASE}/lib/nautilus/extensions-2.0
+PORTDOCS= AUTHORS COPYING ChangeLog ChangeLog-2008 INSTALL MAINTAINERS \
+ NEWS README TODO objects-hierarchy.odg
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 700000
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure
+.endif
+
post-patch:
- @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+.if defined(NOPORTDOCS)
+ @${REINPLACE_CMD} -e 's| install-dist_pkgdocDATA||g' \
+ ${WRKSRC}/Makefile.in ${WRKSRC}/doc/Makefile.in
+.else
+ @${REINPLACE_CMD} -e 's|doc/@PACKAGE@-@VERSION@|doc/@PACKAGE@|g' \
+ ${WRKSRC}/Makefile.in ${WRKSRC}/doc/Makefile.in
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>>
diff --git a/deskutils/nautilus-actions/distinfo b/deskutils/nautilus-actions/distinfo
index 1e16b870728d..55072d4f5cdf 100644
--- a/deskutils/nautilus-actions/distinfo
+++ b/deskutils/nautilus-actions/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-actions-1.4.1.tar.gz) = 3e4af1af386bc2141dc509999767b207
-SHA256 (nautilus-actions-1.4.1.tar.gz) = d481748d64b606f6412b8a3b0701070a8989440f28bb370f392f20d6f3a3cd69
-SIZE (nautilus-actions-1.4.1.tar.gz) = 866736
+MD5 (nautilus-actions-1.12.3.tar.gz) = aea47f3750725ccd9bb677cd0649055c
+SHA256 (nautilus-actions-1.12.3.tar.gz) = 953c8d91bc7bd488cecd393f3b46ecc7b720c14ae2ca33931db8b195e57acb04
+SIZE (nautilus-actions-1.12.3.tar.gz) = 1005638
diff --git a/deskutils/nautilus-actions/files/extra-patch-configure b/deskutils/nautilus-actions/files/extra-patch-configure
new file mode 100644
index 000000000000..898bb4fc64f9
--- /dev/null
+++ b/deskutils/nautilus-actions/files/extra-patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig 2009-10-19 21:06:41.000000000 +1000
++++ configure 2009-10-19 23:38:22.000000000 +1000
+@@ -4710,7 +4710,7 @@
+
+
+ _ac_warning_def=error
+- _ac_compliant_def="-ansi -pedantic -Wno-overlength-strings"
++ _ac_compliant_def="-ansi -pedantic"
+
+
+ # Check whether --enable-compile-warnings was given.
+@@ -4800,7 +4800,7 @@
+ done
+ unset option
+ if test "$enable_compile_warnings" = "error" ; then
+- warning_flags="$warning_flags -Werror"
++ warning_flags="$warning_flags"
+ fi
+ ;;
+ *)
diff --git a/deskutils/nautilus-actions/pkg-plist b/deskutils/nautilus-actions/pkg-plist
index d6cc9f69fcc7..76ae4b1c2ab4 100644
--- a/deskutils/nautilus-actions/pkg-plist
+++ b/deskutils/nautilus-actions/pkg-plist
@@ -1,6 +1,6 @@
-bin/nautilus-actions-config
-bin/nautilus-actions-convert
-bin/nautilus-actions-new-config
+bin/nautilus-actions-config-tool
+bin/nautilus-actions-new
+bin/nautilus-actions-schemas
lib/nautilus/extensions-2.0/libnautilus-actions.la
lib/nautilus/extensions-2.0/libnautilus-actions.so
share/applications/nact.desktop
@@ -12,36 +12,64 @@ share/icons/hicolor/scalable/apps/nautilus-actions.svg
share/locale/ar/LC_MESSAGES/nautilus-actions.mo
share/locale/bg/LC_MESSAGES/nautilus-actions.mo
share/locale/bn/LC_MESSAGES/nautilus-actions.mo
+share/locale/bn_IN/LC_MESSAGES/nautilus-actions.mo
share/locale/ca/LC_MESSAGES/nautilus-actions.mo
share/locale/cs/LC_MESSAGES/nautilus-actions.mo
share/locale/da/LC_MESSAGES/nautilus-actions.mo
share/locale/de/LC_MESSAGES/nautilus-actions.mo
share/locale/dz/LC_MESSAGES/nautilus-actions.mo
+share/locale/el/LC_MESSAGES/nautilus-actions.mo
share/locale/en_CA/LC_MESSAGES/nautilus-actions.mo
share/locale/en_GB/LC_MESSAGES/nautilus-actions.mo
share/locale/es/LC_MESSAGES/nautilus-actions.mo
+share/locale/eu/LC_MESSAGES/nautilus-actions.mo
share/locale/fi/LC_MESSAGES/nautilus-actions.mo
share/locale/fr/LC_MESSAGES/nautilus-actions.mo
share/locale/gl/LC_MESSAGES/nautilus-actions.mo
share/locale/gu/LC_MESSAGES/nautilus-actions.mo
share/locale/he/LC_MESSAGES/nautilus-actions.mo
+share/locale/hi/LC_MESSAGES/nautilus-actions.mo
+share/locale/it/LC_MESSAGES/nautilus-actions.mo
share/locale/ja/LC_MESSAGES/nautilus-actions.mo
+share/locale/kn/LC_MESSAGES/nautilus-actions.mo
+share/locale/ko/LC_MESSAGES/nautilus-actions.mo
share/locale/lt/LC_MESSAGES/nautilus-actions.mo
share/locale/lv/LC_MESSAGES/nautilus-actions.mo
+share/locale/mk/LC_MESSAGES/nautilus-actions.mo
+share/locale/mr/LC_MESSAGES/nautilus-actions.mo
share/locale/nb/LC_MESSAGES/nautilus-actions.mo
share/locale/nl/LC_MESSAGES/nautilus-actions.mo
+share/locale/oc/LC_MESSAGES/nautilus-actions.mo
+share/locale/or/LC_MESSAGES/nautilus-actions.mo
share/locale/pa/LC_MESSAGES/nautilus-actions.mo
+share/locale/pl/LC_MESSAGES/nautilus-actions.mo
+share/locale/pt/LC_MESSAGES/nautilus-actions.mo
share/locale/pt_BR/LC_MESSAGES/nautilus-actions.mo
+share/locale/ru/LC_MESSAGES/nautilus-actions.mo
+share/locale/sl/LC_MESSAGES/nautilus-actions.mo
share/locale/sv/LC_MESSAGES/nautilus-actions.mo
+share/locale/ta/LC_MESSAGES/nautilus-actions.mo
+share/locale/te/LC_MESSAGES/nautilus-actions.mo
share/locale/th/LC_MESSAGES/nautilus-actions.mo
share/locale/vi/LC_MESSAGES/nautilus-actions.mo
share/locale/zh_CN/LC_MESSAGES/nautilus-actions.mo
share/locale/zh_HK/LC_MESSAGES/nautilus-actions.mo
share/locale/zh_TW/LC_MESSAGES/nautilus-actions.mo
-share/nautilus-actions/nact/nautilus-actions-config.glade
-@dirrm share/nautilus-actions/nact
-@dirrm share/nautilus-actions
+%%DATADIR%%/nautilus-actions.schemas
+%%DATADIR%%/nautilus-actions-config-tool.actions
+%%DATADIR%%/nautilus-actions-config-tool.ui
+%%DATADIR%%/nact-assistant-export.ui
+@dirrm %%DATADIR%%
@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/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile
index b0261d2d36a1..ddb87b03e20e 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.9 2009/04/07 03:12:16 marcus Exp $
+# $MCom: ports/deskutils/nautilus-locked-folder/Makefile,v 1.12 2009/11/28 05:58:59 mezz Exp $
#
PORTNAME= nautilus-locked-folder
PORTVERSION= 1.0.0
-PORTREVISION= 7
+PORTREVISION= 8
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:22
GNU_CONFIGURE= yes
-USE_GNOME= nautilus2 eel2
+USE_GNOME= nautilus2 eel2 libgnomeui
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 2e3d5d350c49..e0f1d98d90ac 100644
--- a/deskutils/nautilus-open-terminal/Makefile
+++ b/deskutils/nautilus-open-terminal/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/nautilus-open-terminal/Makefile,v 1.14 2009/04/07 03:14:59 marcus Exp $
+# $MCom: ports/deskutils/nautilus-open-terminal/Makefile,v 1.17 2009/08/09 15:30:27 ahze Exp $
#
PORTNAME= nautilus-open-terminal
-PORTVERSION= 0.13
-PORTREVISION= 1
+PORTVERSION= 0.17
CATEGORIES= deskutils
MASTER_SITES= GNOME
diff --git a/deskutils/nautilus-open-terminal/distinfo b/deskutils/nautilus-open-terminal/distinfo
index 46a826c2d090..dc8bd2de6e18 100644
--- a/deskutils/nautilus-open-terminal/distinfo
+++ b/deskutils/nautilus-open-terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-open-terminal-0.13.tar.bz2) = 412d61dc1a6c70235afd3735476f3401
-SHA256 (nautilus-open-terminal-0.13.tar.bz2) = 5951e4fefc0fac55e4358f05af4bf61d7f88be170dcef7a5c3d985030f9b5c23
-SIZE (nautilus-open-terminal-0.13.tar.bz2) = 272946
+MD5 (nautilus-open-terminal-0.17.tar.bz2) = 944115a2a05e62db02ed719b9133a354
+SHA256 (nautilus-open-terminal-0.17.tar.bz2) = 3926049d0ad5fc8e9b0b5b5b284087eb7182545f76a7fd6dbf5496aced80b24b
+SIZE (nautilus-open-terminal-0.17.tar.bz2) = 271362
diff --git a/deskutils/nautilus-open-terminal/pkg-plist b/deskutils/nautilus-open-terminal/pkg-plist
index 0120726b2c13..d0cd0cf83507 100644
--- a/deskutils/nautilus-open-terminal/pkg-plist
+++ b/deskutils/nautilus-open-terminal/pkg-plist
@@ -2,8 +2,9 @@ lib/nautilus/extensions-2.0/libnautilus-open-terminal.a
lib/nautilus/extensions-2.0/libnautilus-open-terminal.la
lib/nautilus/extensions-2.0/libnautilus-open-terminal.so
share/locale/ar/LC_MESSAGES/nautilus-open-terminal.mo
-share/locale/be@latin/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/as/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/be/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/be@latin/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/bg/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/bn_IN/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/ca/LC_MESSAGES/nautilus-open-terminal.mo
@@ -26,6 +27,7 @@ share/locale/hu/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/it/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/ja/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/ka/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/kn/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/ko/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/lt/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/mk/LC_MESSAGES/nautilus-open-terminal.mo
@@ -38,8 +40,8 @@ share/locale/oc/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/or/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/pa/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/pl/LC_MESSAGES/nautilus-open-terminal.mo
-share/locale/pt_BR/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/pt/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/pt_BR/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/ro/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/ru/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/rw/LC_MESSAGES/nautilus-open-terminal.mo
@@ -49,12 +51,15 @@ share/locale/sr/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/sr@Latn/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/sv/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/ta/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/te/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/th/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/tr/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/uk/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/vi/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/zh_CN/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/zh_TW/LC_MESSAGES/nautilus-open-terminal.mo
+@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
@@ -67,3 +72,5 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-open-terminal.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/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index 2ff3c99ca768..2f72f9977f17 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -3,21 +3,18 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/deskutils/nautilus-sendto/Makefile,v 1.4 2009/04/20 06:12:55 marcus Exp $
+# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.22 2009/11/18 18:50:49 kwm Exp $
PORTNAME= nautilus-sendto
-PORTVERSION= 1.1.5
-PORTREVISION= 1
+PORTVERSION= 2.28.2
CATEGORIES= deskutils
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Integration between nautilus, evolution, and pidgin
-BUILD_DEPENDS= evolution:${PORTSDIR}/mail/evolution \
- empathy:${PORTSDIR}/net-im/empathy
-RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution \
- empathy:${PORTSDIR}/net-im/empathy
+BUILD_DEPENDS= empathy:${PORTSDIR}/net-im/empathy
+RUN_DEPENDS= empathy:${PORTSDIR}/net-im/empathy
MAN1= nautilus-sendto.1
GCONF_SCHEMAS= nst.schemas
diff --git a/deskutils/nautilus-sendto/distinfo b/deskutils/nautilus-sendto/distinfo
index 2df241891600..022045f2ed34 100644
--- a/deskutils/nautilus-sendto/distinfo
+++ b/deskutils/nautilus-sendto/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-sendto-1.1.5.tar.bz2) = 8a5b342850bb84b63c7df033ef478654
-SHA256 (nautilus-sendto-1.1.5.tar.bz2) = 0beae480795f46c3b42817b12018348cd6c93949dd5a103ddf9fc26153c3a597
-SIZE (nautilus-sendto-1.1.5.tar.bz2) = 365803
+MD5 (nautilus-sendto-2.28.2.tar.bz2) = b37ab6eec43d95bef42bb8ed67ae290f
+SHA256 (nautilus-sendto-2.28.2.tar.bz2) = 0fa992b9a4489b712465e82eb182db3eaea9280397871f9d95849c25d1c33893
+SIZE (nautilus-sendto-2.28.2.tar.bz2) = 423429
diff --git a/deskutils/nautilus-sendto/pkg-plist b/deskutils/nautilus-sendto/pkg-plist
index 192e078295f9..fc0bf1843bf2 100644
--- a/deskutils/nautilus-sendto/pkg-plist
+++ b/deskutils/nautilus-sendto/pkg-plist
@@ -1,7 +1,5 @@
bin/nautilus-sendto
-lib/evolution/2.26/plugins/liborg-gnome-evolution-send-attachments-to.la
-lib/evolution/2.26/plugins/liborg-gnome-evolution-send-attachments-to.so
-lib/evolution/2.26/plugins/org-gnome-evolution-send-attachments-to.eplug
+include/nautilus-sendto/nautilus-sendto-plugin.h
lib/nautilus-sendto/plugins/libnstbluetooth.la
lib/nautilus-sendto/plugins/libnstbluetooth.so
lib/nautilus-sendto/plugins/libnstburn.la
@@ -10,20 +8,35 @@ lib/nautilus-sendto/plugins/libnstempathy.la
lib/nautilus-sendto/plugins/libnstempathy.so
lib/nautilus-sendto/plugins/libnstevolution.la
lib/nautilus-sendto/plugins/libnstevolution.so
+lib/nautilus-sendto/plugins/libnstgajim.la
+lib/nautilus-sendto/plugins/libnstgajim.so
%%PIDGIN%%lib/nautilus-sendto/plugins/libnstpidgin.la
%%PIDGIN%%lib/nautilus-sendto/plugins/libnstpidgin.so
lib/nautilus-sendto/plugins/libnstremovable_devices.la
lib/nautilus-sendto/plugins/libnstremovable_devices.so
lib/nautilus/extensions-2.0/libnautilus-sendto.la
lib/nautilus/extensions-2.0/libnautilus-sendto.so
-%%PIDGIN%%lib/pidgin/nautilus.la
-%%PIDGIN%%lib/pidgin/nautilus.so
-share/nautilus-sendto/glade/nautilus-sendto.glade
+libdata/pkgconfig/nautilus-sendto.pc
+%%DOCSDIR%%/api-index-full.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/nautilus-sendto-nautilus-sendto-plugin.html
+%%DOCSDIR%%/nautilus-sendto.devhelp
+%%DOCSDIR%%/nautilus-sendto.devhelp2
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
share/locale/ar/LC_MESSAGES/nautilus-sendto.mo
+share/locale/as/LC_MESSAGES/nautilus-sendto.mo
share/locale/ast/LC_MESSAGES/nautilus-sendto.mo
share/locale/be@latin/LC_MESSAGES/nautilus-sendto.mo
share/locale/be/LC_MESSAGES/nautilus-sendto.mo
share/locale/bg/LC_MESSAGES/nautilus-sendto.mo
+share/locale/bn_IN/LC_MESSAGES/nautilus-sendto.mo
+share/locale/br/LC_MESSAGES/nautilus-sendto.mo
share/locale/ca/LC_MESSAGES/nautilus-sendto.mo
share/locale/cs/LC_MESSAGES/nautilus-sendto.mo
share/locale/da/LC_MESSAGES/nautilus-sendto.mo
@@ -40,10 +53,12 @@ share/locale/fr/LC_MESSAGES/nautilus-sendto.mo
share/locale/gl/LC_MESSAGES/nautilus-sendto.mo
share/locale/gu/LC_MESSAGES/nautilus-sendto.mo
share/locale/he/LC_MESSAGES/nautilus-sendto.mo
+share/locale/hi/LC_MESSAGES/nautilus-sendto.mo
share/locale/hu/LC_MESSAGES/nautilus-sendto.mo
share/locale/it/LC_MESSAGES/nautilus-sendto.mo
share/locale/ja/LC_MESSAGES/nautilus-sendto.mo
share/locale/ka/LC_MESSAGES/nautilus-sendto.mo
+share/locale/kn/LC_MESSAGES/nautilus-sendto.mo
share/locale/ko/LC_MESSAGES/nautilus-sendto.mo
share/locale/lt/LC_MESSAGES/nautilus-sendto.mo
share/locale/mk/LC_MESSAGES/nautilus-sendto.mo
@@ -64,15 +79,21 @@ share/locale/sk/LC_MESSAGES/nautilus-sendto.mo
share/locale/sl/LC_MESSAGES/nautilus-sendto.mo
share/locale/sq/LC_MESSAGES/nautilus-sendto.mo
share/locale/sv/LC_MESSAGES/nautilus-sendto.mo
+share/locale/ta/LC_MESSAGES/nautilus-sendto.mo
+share/locale/te/LC_MESSAGES/nautilus-sendto.mo
share/locale/th/LC_MESSAGES/nautilus-sendto.mo
share/locale/uk/LC_MESSAGES/nautilus-sendto.mo
share/locale/vi/LC_MESSAGES/nautilus-sendto.mo
share/locale/zh_CN/LC_MESSAGES/nautilus-sendto.mo
share/locale/zh_TW/LC_MESSAGES/nautilus-sendto.mo
-@dirrm share/nautilus-sendto/glade
+share/nautilus-sendto/ui/nautilus-sendto.ui
+@dirrm %%DOCSDIR%%
+@dirrm share/nautilus-sendto/ui
@dirrm share/nautilus-sendto
@dirrm lib/nautilus-sendto/plugins
@dirrm lib/nautilus-sendto
+@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
@@ -81,7 +102,11 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-sendto.mo
@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
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
@dirrmtry share/locale/ast/LC_MESSAGES
@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/devel/Makefile b/devel/Makefile
index 947be9938cc7..f28b664dde25 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -37,6 +37,7 @@
SUBDIR += allegro
SUBDIR += allegro-devel
SUBDIR += anjuta
+ SUBDIR += anjuta-extras
SUBDIR += antlr
SUBDIR += antlrworks
SUBDIR += apache-ant
@@ -309,6 +310,7 @@
SUBDIR += ecore-main
SUBDIR += ecos-tools
SUBDIR += eet
+ SUBDIR += eggdbus
SUBDIR += egypt
SUBDIR += eieio
SUBDIR += eiffelstudio
@@ -437,6 +439,11 @@
SUBDIR += giggle
SUBDIR += gindent
SUBDIR += gio-fam-backend
+ SUBDIR += gir-repository
+ SUBDIR += gir-repository-dbus
+ SUBDIR += gir-repository-gconf2
+ SUBDIR += gir-repository-libnotify
+ SUBDIR += gir-repository-libsoup
SUBDIR += git
SUBDIR += gittrac
SUBDIR += glade2
@@ -455,6 +462,7 @@
SUBDIR += gmake
SUBDIR += gnome-common
SUBDIR += gnome-crash
+ SUBDIR += gnome-js-common
SUBDIR += gnome-vfs
SUBDIR += gnome-vfs-monikers
SUBDIR += gnome-vfs-reference
@@ -466,6 +474,7 @@
SUBDIR += gnustep
SUBDIR += gnustep-make
SUBDIR += gob2
+ SUBDIR += gobject-introspection
SUBDIR += goffice
SUBDIR += goffice04
SUBDIR += goffice06
@@ -876,6 +885,7 @@
SUBDIR += mkmf
SUBDIR += ml-doc
SUBDIR += mm
+ SUBDIR += mm-common
SUBDIR += mob
SUBDIR += mono-addins
SUBDIR += mono-tools
@@ -2835,6 +2845,7 @@
SUBDIR += sdlmm
SUBDIR += sdts++
SUBDIR += sedsed
+ SUBDIR += seed
SUBDIR += semantic
SUBDIR += sfio
SUBDIR += sfml
diff --git a/devel/anjuta-extras/Makefile b/devel/anjuta-extras/Makefile
new file mode 100644
index 000000000000..17be5db63d92
--- /dev/null
+++ b/devel/anjuta-extras/Makefile
@@ -0,0 +1,33 @@
+# New ports collection makefile for: anjuta-extras
+# Date created: 8 May 2009
+# Whom: Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/anjuta-extras/Makefile,v 1.3 2009/09/22 10:27:21 kwm Exp $
+#
+
+PORTNAME= anjuta-extras
+PORTVERSION= 2.28.0
+CATEGORIES= devel
+MASTER_SITES= GNOME
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Extra anjuta plugins.
+
+BUILD_DEPENDS= neato:${PORTSDIR}/graphics/graphviz
+LIB_DEPENDS= anjuta.0:${PORTSDIR}/devel/anjuta
+RUN_DEPENDS= neato:${PORTSDIR}/graphics/graphviz
+
+USE_BZIP2= yes
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+USE_GMAKE= yes
+USE_GNOME= intltool
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \
+ LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=--disable-plugin-valgrind \
+ --localedir=${PREFIX}/share
+
+GCONF_SCHEMAS= anjuta-editor-scintilla.schemas
+
+.include <bsd.port.mk>
diff --git a/devel/anjuta-extras/distinfo b/devel/anjuta-extras/distinfo
new file mode 100644
index 000000000000..79a77a4979d1
--- /dev/null
+++ b/devel/anjuta-extras/distinfo
@@ -0,0 +1,3 @@
+MD5 (anjuta-extras-2.28.0.tar.bz2) = c67db4abb5a873fdbe8f4fed59b2a9da
+SHA256 (anjuta-extras-2.28.0.tar.bz2) = 7b7aa28ca598e17024a41fb29582e6cf2efcc1a273b00e84994f21900e288b49
+SIZE (anjuta-extras-2.28.0.tar.bz2) = 2939244
diff --git a/devel/anjuta-extras/pkg-descr b/devel/anjuta-extras/pkg-descr
new file mode 100644
index 000000000000..5c0d44664cdd
--- /dev/null
+++ b/devel/anjuta-extras/pkg-descr
@@ -0,0 +1,3 @@
+Extra plugins for the Anjuta IDE.
+
+WWW: http://anjuta.org/
diff --git a/devel/anjuta-extras/pkg-plist b/devel/anjuta-extras/pkg-plist
new file mode 100644
index 000000000000..660a35dda8d4
--- /dev/null
+++ b/devel/anjuta-extras/pkg-plist
@@ -0,0 +1,108 @@
+lib/anjuta/anjuta-class-inheritance.plugin
+lib/anjuta/anjuta-editor.plugin
+lib/anjuta/anjuta-sample.plugin
+lib/anjuta/anjuta-scratchbox.plugin
+lib/anjuta/libanjuta-class-inheritance.a
+lib/anjuta/libanjuta-class-inheritance.la
+lib/anjuta/libanjuta-class-inheritance.so
+lib/anjuta/libanjuta-class-inheritance.so.0
+lib/anjuta/libanjuta-editor.a
+lib/anjuta/libanjuta-editor.la
+lib/anjuta/libanjuta-editor.so
+lib/anjuta/libanjuta-editor.so.0
+lib/anjuta/libanjuta-profiler.a
+lib/anjuta/libanjuta-profiler.la
+lib/anjuta/libanjuta-profiler.so
+lib/anjuta/libanjuta-profiler.so.0
+lib/anjuta/libanjuta-sample.a
+lib/anjuta/libanjuta-sample.la
+lib/anjuta/libanjuta-sample.so
+lib/anjuta/libanjuta-sample.so.0
+lib/anjuta/libanjuta-scratchbox.a
+lib/anjuta/libanjuta-scratchbox.la
+lib/anjuta/libanjuta-scratchbox.so
+lib/anjuta/libanjuta-scratchbox.so.0
+lib/anjuta/profiler.plugin
+share/anjuta/glade/anjuta-editor-scintilla.ui
+share/anjuta/glade/anjuta-scratchbox-panel.png
+share/anjuta/glade/anjuta-scratchbox.ui
+share/anjuta/glade/profiler-call-graph.ui
+share/anjuta/glade/profiler-flat-profile.ui
+share/anjuta/glade/profiler-function-call-tree.ui
+share/anjuta/glade/profiler.ui
+share/anjuta/properties/anjuta.properties
+share/anjuta/properties/styles.properties
+share/anjuta/properties/user.properties
+share/anjuta/ui/anjuta-sample.ui
+share/anjuta/ui/profiler.xml
+share/locale/ar/LC_MESSAGES/anjuta-extras.mo
+share/locale/az/LC_MESSAGES/anjuta-extras.mo
+share/locale/be/LC_MESSAGES/anjuta-extras.mo
+share/locale/be@latin/LC_MESSAGES/anjuta-extras.mo
+share/locale/bg/LC_MESSAGES/anjuta-extras.mo
+share/locale/ca/LC_MESSAGES/anjuta-extras.mo
+share/locale/cs/LC_MESSAGES/anjuta-extras.mo
+share/locale/da/LC_MESSAGES/anjuta-extras.mo
+share/locale/de/LC_MESSAGES/anjuta-extras.mo
+share/locale/dz/LC_MESSAGES/anjuta-extras.mo
+share/locale/el/LC_MESSAGES/anjuta-extras.mo
+share/locale/en_CA/LC_MESSAGES/anjuta-extras.mo
+share/locale/en_GB/LC_MESSAGES/anjuta-extras.mo
+share/locale/es/LC_MESSAGES/anjuta-extras.mo
+share/locale/eu/LC_MESSAGES/anjuta-extras.mo
+share/locale/fi/LC_MESSAGES/anjuta-extras.mo
+share/locale/fr/LC_MESSAGES/anjuta-extras.mo
+share/locale/ga/LC_MESSAGES/anjuta-extras.mo
+share/locale/gl/LC_MESSAGES/anjuta-extras.mo
+share/locale/gu/LC_MESSAGES/anjuta-extras.mo
+share/locale/he/LC_MESSAGES/anjuta-extras.mo
+share/locale/hi/LC_MESSAGES/anjuta-extras.mo
+share/locale/hr/LC_MESSAGES/anjuta-extras.mo
+share/locale/hu/LC_MESSAGES/anjuta-extras.mo
+share/locale/id/LC_MESSAGES/anjuta-extras.mo
+share/locale/it/LC_MESSAGES/anjuta-extras.mo
+share/locale/ja/LC_MESSAGES/anjuta-extras.mo
+share/locale/kn/LC_MESSAGES/anjuta-extras.mo
+share/locale/ko/LC_MESSAGES/anjuta-extras.mo
+share/locale/lt/LC_MESSAGES/anjuta-extras.mo
+share/locale/lv/LC_MESSAGES/anjuta-extras.mo
+share/locale/mk/LC_MESSAGES/anjuta-extras.mo
+share/locale/ml/LC_MESSAGES/anjuta-extras.mo
+share/locale/mr/LC_MESSAGES/anjuta-extras.mo
+share/locale/ms/LC_MESSAGES/anjuta-extras.mo
+share/locale/nb/LC_MESSAGES/anjuta-extras.mo
+share/locale/ne/LC_MESSAGES/anjuta-extras.mo
+share/locale/nl/LC_MESSAGES/anjuta-extras.mo
+share/locale/oc/LC_MESSAGES/anjuta-extras.mo
+share/locale/or/LC_MESSAGES/anjuta-extras.mo
+share/locale/pa/LC_MESSAGES/anjuta-extras.mo
+share/locale/pl/LC_MESSAGES/anjuta-extras.mo
+share/locale/pt/LC_MESSAGES/anjuta-extras.mo
+share/locale/pt_BR/LC_MESSAGES/anjuta-extras.mo
+share/locale/ru/LC_MESSAGES/anjuta-extras.mo
+share/locale/rw/LC_MESSAGES/anjuta-extras.mo
+share/locale/si/LC_MESSAGES/anjuta-extras.mo
+share/locale/sk/LC_MESSAGES/anjuta-extras.mo
+share/locale/sl/LC_MESSAGES/anjuta-extras.mo
+share/locale/sq/LC_MESSAGES/anjuta-extras.mo
+share/locale/sr/LC_MESSAGES/anjuta-extras.mo
+share/locale/sr@latin/LC_MESSAGES/anjuta-extras.mo
+share/locale/sv/LC_MESSAGES/anjuta-extras.mo
+share/locale/te/LC_MESSAGES/anjuta-extras.mo
+share/locale/th/LC_MESSAGES/anjuta-extras.mo
+share/locale/tr/LC_MESSAGES/anjuta-extras.mo
+share/locale/uk/LC_MESSAGES/anjuta-extras.mo
+share/locale/vi/LC_MESSAGES/anjuta-extras.mo
+share/locale/zh_CN/LC_MESSAGES/anjuta-extras.mo
+share/locale/zh_HK/LC_MESSAGES/anjuta-extras.mo
+share/locale/zh_TW/LC_MESSAGES/anjuta-extras.mo
+share/pixmaps/anjuta/anjuta-class-inheritance-plugin-48.png
+share/pixmaps/anjuta/anjuta-class-inheritance-plugin.svg
+share/pixmaps/anjuta/anjuta-editor-scintilla-plugin-48.png
+share/pixmaps/anjuta/anjuta-editor-scintilla-plugin.svg
+share/pixmaps/anjuta/anjuta-profiler-plugin-48.png
+share/pixmaps/anjuta/anjuta-profiler-plugin.svg
+share/pixmaps/anjuta/anjuta-sample-plugin-48.png
+share/pixmaps/anjuta/anjuta-sample-plugin.svg
+share/pixmaps/anjuta/anjuta-scratchbox-48.png
+@dirrm share/anjuta/properties
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 1dbd17468242..68a7acc88d59 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -3,12 +3,11 @@
# Whom: Dmitry Sivachenko <demon@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/devel/anjuta/Makefile,v 1.6 2009/04/20 04:42:30 marcus Exp $
+# $MCom: ports/devel/anjuta/Makefile,v 1.49 2009/10/19 19:29:48 kwm Exp $
#
PORTNAME= anjuta
-PORTVERSION= 2.26.2.2
-PORTREVISION= 2
+PORTVERSION= 2.28.1.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,16 +17,14 @@ COMMENT= Integrated Development Environment for C and C++
BUILD_DEPENDS= autogen:${PORTSDIR}/devel/autogen \
bash:${PORTSDIR}/shells/bash \
- p5-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
- neato:${PORTSDIR}/graphics/graphviz
+ p5-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
gladeui-1.9:${PORTSDIR}/devel/glade3 \
neon.28:${PORTSDIR}/www/neon28 \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
- gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
+ gdl-1.3:${PORTSDIR}/x11-toolkits/gdl
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
autogen:${PORTSDIR}/devel/autogen \
- neato:${PORTSDIR}/graphics/graphviz \
p5-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
libtool:${PORTSDIR}/devel/libtool22 \
${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \
@@ -40,23 +37,24 @@ USE_GETTEXT= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_PERL5= yes
-USE_GNOME= gnomeprefix gnomehack libgnomeui vte gtksourceview2 libgda4
+USE_GNOME= gnomeprefix gnomehack 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-debug-manager.schemas \
anjuta-document-manager.schemas \
- anjuta-editor-scintilla.schemas \
anjuta-editor-sourceview.schemas \
anjuta-language-cpp-java.schemas \
anjuta-message-manager-plugin.schemas \
anjuta-symbol-db.schemas \
anjuta-terminal-plugin.schemas \
- anjuta.schemas
+ file-manager.schemas \
+ preferences.schemas
-MAN1= anjuta.1 anjuta_launcher.1
+MAN1= anjuta.1 anjuta-launcher.1
OPTIONS= SVN "Build subversion plugin" off \
DEVHELP "Build devhelp plugin" on
@@ -91,7 +89,7 @@ PLIST_SUB+= SVN="@comment "
.endif
.if defined(WITH_DEVHELP)
-LIB_DEPENDS+= devhelp-1.0:${PORTSDIR}/devel/devhelp
+LIB_DEPENDS+= devhelp-1.1:${PORTSDIR}/devel/devhelp
PLIST_SUB+= DEVHELP=""
.else
CONFIGURE_ARGS+=--disable-plugin-devhelp
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index d043f94001a4..2dcc77555581 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/anjuta-2.26.2.2.tar.bz2) = 8b05a4ee536b8057e38434efeaf468ff
-SHA256 (gnome2/anjuta-2.26.2.2.tar.bz2) = 38161201bb4a69d5be84f67c61fca023251c293fb6a7352166483e61f815d9e4
-SIZE (gnome2/anjuta-2.26.2.2.tar.bz2) = 7787006
+MD5 (gnome2/anjuta-2.28.1.0.tar.bz2) = 610624984bd62ee1e280090900a0ada7
+SHA256 (gnome2/anjuta-2.28.1.0.tar.bz2) = 31c888c2a51e8e103c71b6563324d2fc5ffad2ad08df7a42c82d1e1a55931b02
+SIZE (gnome2/anjuta-2.28.1.0.tar.bz2) = 7537430
diff --git a/devel/anjuta/files/patch-Makefile.in b/devel/anjuta/files/patch-Makefile.in
index 132cd27555dd..02a91a3ecd9e 100644
--- a/devel/anjuta/files/patch-Makefile.in
+++ b/devel/anjuta/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2008-09-22 14:17:35.000000000 -0400
-+++ Makefile.in 2008-09-22 14:20:32.000000000 -0400
-@@ -505,14 +505,14 @@ uninstall-anjuta_dataDATA:
+--- Makefile.in.orig 2009-09-22 12:00:07.000000000 +0200
++++ Makefile.in 2009-09-22 12:02:56.000000000 +0200
+@@ -434,14 +434,14 @@ uninstall-anjuta_dataDATA:
rm -f "$(DESTDIR)$(anjuta_datadir)/$$f"; \
done
install-anjutadocDATA: $(anjutadoc_DATA)
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_Makefile.in b/devel/anjuta/files/patch-plugins_symbol-db_Makefile.in
deleted file mode 100644
index a7165a47d238..000000000000
--- a/devel/anjuta/files/patch-plugins_symbol-db_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/patch-plugins_symbol-db_plugin.h b/devel/anjuta/files/patch-plugins_symbol-db_plugin.h
deleted file mode 100644
index 10565abef21e..000000000000
--- a/devel/anjuta/files/patch-plugins_symbol-db_plugin.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/symbol-db/plugin.h.orig 2009-04-17 01:02:20.000000000 -0400
-+++ plugins/symbol-db/plugin.h 2009-04-17 01:02:37.000000000 -0400
-@@ -49,7 +49,7 @@ typedef struct _SymbolDBPluginClass Symb
- #include "symbol-db-prefs.h"
-
- /* a sort of 'default' value for ctags executable. User must have it installed */
--#define CTAGS_PATH "/usr/bin/ctags"
-+#define CTAGS_PATH "%%LOCALBASE%%/bin/exctags"
-
- struct _SymbolDBPlugin {
- AnjutaPlugin parent;
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c
index 1b6405e7555a..b50d375a1ae4 100644
--- a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c
+++ b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c
@@ -1,6 +1,6 @@
---- plugins/symbol-db/symbol-db-engine-core.c.orig 2009-03-18 04:24:07.000000000 -0400
-+++ plugins/symbol-db/symbol-db-engine-core.c 2009-04-20 00:40:52.000000000 -0400
-@@ -1486,7 +1486,7 @@ sdb_engine_ctags_output_thread (gpointer
+--- plugins/symbol-db/symbol-db-engine-core.c.orig 2009-08-27 09:17:03.000000000 +0200
++++ plugins/symbol-db/symbol-db-engine-core.c 2009-08-27 17:32:35.000000000 +0200
+@@ -1504,7 +1504,7 @@ sdb_engine_ctags_output_thread (gpointer
/* found out a new marker */
marker_ptr = strstr (marker_ptr + len_marker, CTAGS_MARKER);
@@ -9,27 +9,18 @@
}
else
{
-@@ -1644,7 +1644,7 @@ sdb_engine_ctags_launcher_create (Symbol
- anjuta_launcher_set_encoding (priv->ctags_launcher, NULL);
-
- g_signal_connect (G_OBJECT (priv->ctags_launcher), "child-exited",
-- G_CALLBACK (on_scan_files_end_1), NULL);
-+ G_CALLBACK (on_scan_files_end_1), dbe);
-
- exe_string = g_strdup_printf ("%s --sort=no --fields=afmiKlnsStz --c++-kinds=+p "
- "--filter=yes --filter-terminator='"CTAGS_MARKER"'",
-@@ -1810,8 +1810,8 @@ sdb_engine_scan_files_1 (SymbolDBEngine
- gchar *temp_file;
+@@ -1831,8 +1831,8 @@ sdb_engine_scan_files_1 (SymbolDBEngine
+ gint i = 0;
while (TRUE)
{
-- temp_file = g_strdup_printf ("/anjuta-%d_%ld.tags", getpid (),
-- time (NULL));
-+ temp_file = g_strdup_printf ("%s/anjuta-%d_%ld.tags", SHARED_MEMORY_PREFIX, getpid (),
-+ (long) time (NULL));
+- temp_file = g_strdup_printf ("/anjuta-%d_%ld%d.tags", getpid (),
+- time (NULL), i++);
++ temp_file = g_strdup_printf ("%s/anjuta-%d_%ld%d.tags", SHARED_MEMORY_PREFIX, getpid (),
++ (long) time (NULL), i++);
gchar *test;
test = g_strconcat (SHARED_MEMORY_PREFIX, temp_file, NULL);
if (g_file_test (test, G_FILE_TEST_EXISTS) == TRUE)
-@@ -1831,12 +1831,12 @@ sdb_engine_scan_files_1 (SymbolDBEngine
+@@ -1852,12 +1852,12 @@ sdb_engine_scan_files_1 (SymbolDBEngine
priv->shared_mem_str = temp_file;
if ((priv->shared_mem_fd =
@@ -44,7 +35,7 @@
priv->shared_mem_file = fdopen (priv->shared_mem_fd, "a+b");
/*DEBUG_PRINT ("temp_file %s", temp_file);*/
-@@ -2419,7 +2419,7 @@ sdb_engine_init (SymbolDBEngine * object
+@@ -2446,7 +2446,7 @@ sdb_engine_init (SymbolDBEngine * object
static void
sdb_engine_unlink_shared_files (gpointer key, gpointer value, gpointer user_data)
{
@@ -53,7 +44,7 @@
}
static void
-@@ -2508,7 +2508,7 @@ sdb_engine_finalize (GObject * object)
+@@ -2535,7 +2535,7 @@ sdb_engine_finalize (GObject * object)
if (priv->shared_mem_str)
{
@@ -62,7 +53,7 @@
g_free (priv->shared_mem_str);
priv->shared_mem_str = NULL;
}
-@@ -5834,12 +5834,12 @@ symbol_db_engine_update_buffer_symbols (
+@@ -6059,12 +6059,12 @@ symbol_db_engine_update_buffer_symbols (
* target buffer one */
base_filename = g_filename_display_basename (relative_path);
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h
index 3d9398a872c1..fe850697cfac 100644
--- a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h
+++ b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h
@@ -1,11 +1,11 @@
---- plugins/symbol-db/symbol-db-prefs.h.orig 2009-04-17 01:06:07.000000000 -0400
-+++ plugins/symbol-db/symbol-db-prefs.h 2009-04-17 01:06:34.000000000 -0400
-@@ -40,7 +40,7 @@ typedef struct _SymbolDBPrefsPriv Symbol
- #include "symbol-db-system.h"
+--- plugins/symbol-db/symbol-db-prefs.h.orig 2009-07-27 16:14:31.000000000 +0200
++++ plugins/symbol-db/symbol-db-prefs.h 2009-07-28 00:10:49.000000000 +0200
+@@ -41,7 +41,7 @@ typedef struct _SymbolDBPrefsPriv Symbol
+ /*
-#define CTAGS_PREFS "preferences_entry:text:/usr/bin/ctags:0:symboldb.ctags"
-+#define CTAGS_PREFS "preferences_entry:text:%%LOCALBASE%%/bin/exctags:0:symboldb.ctags"
++#define CTAGS_PREFS "preferences_entry:text:%%LOCALBASE%%/bin/ctags:0:symboldb.ctags"
#define CTAGS_PREFS_KEY "symboldb.ctags"
+ */
#define PROJECT_AUTOSCAN "symboldb.scan_prj_pkgs"
- #define PARALLEL_SCAN "symboldb.parallel_scan"
diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist
index b44719d46c33..a3f1299584f4 100644
--- a/devel/anjuta/pkg-plist
+++ b/devel/anjuta/pkg-plist
@@ -1,10 +1,12 @@
bin/anjuta
-bin/anjuta_launcher
+bin/anjuta-launcher
+bin/anjuta-tags
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-command-queue.h
include/libanjuta-1.0/libanjuta/anjuta-convert.h
include/libanjuta-1.0/libanjuta/anjuta-debug.h
include/libanjuta-1.0/libanjuta/anjuta-encodings.h
@@ -97,12 +99,10 @@ include/libanjuta-1.0/libanjuta/libanjuta.h
include/libanjuta-1.0/libanjuta/resources.h
lib/anjuta/anjuta-build-basic-autotools.plugin
lib/anjuta/anjuta-class-gen.plugin
-lib/anjuta/anjuta-class-inheritance.plugin
lib/anjuta/anjuta-cvs.plugin
lib/anjuta/anjuta-debug-manager.plugin
%%DEVHELP%%lib/anjuta/anjuta-devhelp.plugin
lib/anjuta/anjuta-document-manager.plugin
-lib/anjuta/anjuta-editor.plugin
lib/anjuta/anjuta-file-wizard.plugin
lib/anjuta/anjuta-gdb.plugin
lib/anjuta/anjuta-glade.plugin
@@ -116,8 +116,6 @@ lib/anjuta/anjuta-project-import.plugin
lib/anjuta/anjuta-project-manager.plugin
lib/anjuta/anjuta-project-wizard.plugin
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
@@ -132,8 +130,6 @@ lib/anjuta/libanjuta-build-basic-autotools.la
lib/anjuta/libanjuta-build-basic-autotools.so
lib/anjuta/libanjuta-class-gen.la
lib/anjuta/libanjuta-class-gen.so
-lib/anjuta/libanjuta-class-inheritance.la
-lib/anjuta/libanjuta-class-inheritance.so
lib/anjuta/libanjuta-cvs-plugin.la
lib/anjuta/libanjuta-cvs-plugin.so
lib/anjuta/libanjuta-debug-manager.la
@@ -142,8 +138,6 @@ lib/anjuta/libanjuta-debug-manager.so
%%DEVHELP%%lib/anjuta/libanjuta-devhelp.so
lib/anjuta/libanjuta-document-manager.la
lib/anjuta/libanjuta-document-manager.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
@@ -164,8 +158,6 @@ lib/anjuta/libanjuta-message-view.la
lib/anjuta/libanjuta-message-view.so
lib/anjuta/libanjuta-patch.la
lib/anjuta/libanjuta-patch.so
-lib/anjuta/libanjuta-profiler.la
-lib/anjuta/libanjuta-profiler.so
lib/anjuta/libanjuta-project-import.la
lib/anjuta/libanjuta-project-import.so
lib/anjuta/libanjuta-project-manager.la
@@ -174,10 +166,6 @@ lib/anjuta/libanjuta-project-wizard.la
lib/anjuta/libanjuta-project-wizard.so
lib/anjuta/libanjuta-run-program.la
lib/anjuta/libanjuta-run-program.so
-lib/anjuta/libanjuta-sample.la
-lib/anjuta/libanjuta-sample.so
-lib/anjuta/libanjuta-scratchbox.la
-lib/anjuta/libanjuta-scratchbox.so
lib/anjuta/libanjuta-search.la
lib/anjuta/libanjuta-search.so
lib/anjuta/libanjuta-sourceview.la
@@ -194,14 +182,12 @@ lib/anjuta/libanjuta-tools.la
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
lib/anjuta/symbol-db.plugin
lib/glade3/modules/libgladeanjuta.la
@@ -221,40 +207,33 @@ share/anjuta/class-templates/cc-source.tpl
share/anjuta/class-templates/go-header.tpl
share/anjuta/class-templates/go-source.tpl
share/anjuta/gdb.init
-share/anjuta/glade/anjuta-build-basic-autotools-plugin.glade
-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
-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-build-basic-autotools-plugin.ui
+share/anjuta/glade/anjuta-class-gen-plugin.ui
+share/anjuta/glade/anjuta-cvs-plugin.ui
+share/anjuta/glade/anjuta-debug-manager.ui
+share/anjuta/glade/anjuta-document-manager.ui
+share/anjuta/glade/anjuta-editor-sourceview.ui
+share/anjuta/glade/anjuta-file-wizard.ui
+share/anjuta/glade/anjuta-git.ui
share/anjuta/glade/anjuta-glade.glade
-share/anjuta/glade/anjuta-language-cpp-java.glade
-share/anjuta/glade/anjuta-macro.glade
-share/anjuta/glade/anjuta-message-manager-plugin.glade
+share/anjuta/glade/anjuta-language-cpp-java.ui
+share/anjuta/glade/anjuta-macro.ui
+share/anjuta/glade/anjuta-message-manager-plugin.ui
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-db.glade
-share/anjuta/glade/anjuta-terminal-plugin.glade
-share/anjuta/glade/anjuta-tools.glade
-share/anjuta/glade/anjuta.glade
+share/anjuta/glade/anjuta-run-program.ui
+share/anjuta/glade/anjuta-search.ui
+%%SVN%%share/anjuta/glade/anjuta-subversion.ui
+share/anjuta/glade/anjuta-symbol-db.ui
+share/anjuta/glade/anjuta-terminal-plugin.ui
+share/anjuta/glade/anjuta-tools.ui
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
-share/anjuta/glade/profiler-function-call-tree.glade
-share/anjuta/glade/profiler.glade
+share/anjuta/glade/create_dialogs.ui
+share/anjuta/glade/file-manager.ui
+share/anjuta/glade/gbf-am-dialogs.ui
+share/anjuta/glade/patch-plugin.ui
+share/anjuta/glade/preferences.ui
+share/anjuta/glade/project-import.ui
share/anjuta/glade/start-with-import.png
share/anjuta/glade/start-with-open.png
share/anjuta/glade/start-with-wizard.png
@@ -271,16 +250,10 @@ share/anjuta/project/anjuta-plugin/configure.ac.tpl
share/anjuta/project/anjuta-plugin/po/POTFILES.in
share/anjuta/project/anjuta-plugin/src/Makefile.am.tpl
share/anjuta/project/anjuta-plugin/src/plugin.c
-share/anjuta/project/anjuta-plugin/src/plugin.glade
share/anjuta/project/anjuta-plugin/src/plugin.h
share/anjuta/project/anjuta-plugin/src/plugin.plugin.in
share/anjuta/project/anjuta-plugin/src/plugin.ui
-share/anjuta/project/anjuta-plugin-vala.wiz
-share/anjuta/project/anjuta-plugin-vala/configure.ac.tpl
-share/anjuta/project/anjuta-plugin-vala/po/POTFILES.in
-share/anjuta/project/anjuta-plugin-vala/src/Makefile.am.tpl
-share/anjuta/project/anjuta-plugin-vala/src/config.vapi
-share/anjuta/project/anjuta-plugin-vala/src/plugin.vala
+share/anjuta/project/anjuta-plugin/src/plugin.xml
share/anjuta/project/appwiz_sdl.png
share/anjuta/project/cpp-logo.png
share/anjuta/project/cpp.wiz
@@ -312,13 +285,13 @@ share/anjuta/project/gtk/src/Makefile.am.tpl
share/anjuta/project/gtk/src/callbacks.c
share/anjuta/project/gtk/src/callbacks.h
share/anjuta/project/gtk/src/main.c
-share/anjuta/project/gtk/src/project.glade
+share/anjuta/project/gtk/src/project.ui
share/anjuta/project/gtkmm-logo.png
share/anjuta/project/gtkmm.wiz
share/anjuta/project/gtkmm/po/POTFILES.in
share/anjuta/project/gtkmm/src/Makefile.am.tpl
share/anjuta/project/gtkmm/src/main.cc
-share/anjuta/project/gtkmm/src/project.glade
+share/anjuta/project/gtkmm/src/project.ui
share/anjuta/project/java-logo.png
share/anjuta/project/java.wiz
share/anjuta/project/java/configure.ac.tpl
@@ -326,13 +299,22 @@ share/anjuta/project/java/po/POTFILES.in
share/anjuta/project/java/project.anjuta
share/anjuta/project/java/src/Makefile.am.tpl
share/anjuta/project/java/src/main.java
+share/anjuta/project/library.wiz
+share/anjuta/project/library/configure.ac.tpl
+share/anjuta/project/library/po/POTFILES.in
+share/anjuta/project/library/src/Makefile.am.tpl
+share/anjuta/project/library/src/lib.c
+share/anjuta/project/library/src/lib.h
+share/anjuta/project/library/src/library.pc.in
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/m4/ac-define-dir.m4
share/anjuta/project/minimal.wiz
share/anjuta/project/minimal/Makefile.am.tpl
+share/anjuta/project/minimal/anjuta.session
share/anjuta/project/minimal/autogen.sh
share/anjuta/project/minimal/configure.ac.tpl
share/anjuta/project/minimal/project.anjuta
@@ -393,39 +375,35 @@ share/anjuta/project/xlib/configure.ac.tpl
share/anjuta/project/xlib/po/POTFILES.in
share/anjuta/project/xlib/src/Makefile.am.tpl
share/anjuta/project/xlib/src/main.c
-share/anjuta/properties/anjuta.properties
-share/anjuta/properties/styles.properties
-share/anjuta/properties/user.properties
+share/anjuta/tables-from-1-to-228.sql
share/anjuta/tables.sql
share/anjuta/tools/find-fixmes.pl
share/anjuta/tools/prepare-changelog.pl
share/anjuta/tools/tools-2.xml
share/anjuta/tools/translation-status.pl
-share/anjuta/ui/anjuta-build-basic-autotools-plugin.ui
+share/anjuta/ui/anjuta-build-basic-autotools-plugin.xml
share/anjuta/ui/anjuta-cvs.ui
-share/anjuta/ui/anjuta-debug-manager.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-debug-manager.xml
+share/anjuta/ui/anjuta-devhelp-simple.ui
+share/anjuta/ui/anjuta-devhelp.ui
+share/anjuta/ui/anjuta-document-manager.xml
+share/anjuta/ui/anjuta-git.xml
share/anjuta/ui/anjuta-glade.ui
share/anjuta/ui/anjuta-gtodo.ui
-share/anjuta/ui/anjuta-language-support-cpp-java.ui
+share/anjuta/ui/anjuta-language-support-cpp-java.xml
share/anjuta/ui/anjuta-loader-plugin.ui
-share/anjuta/ui/anjuta-macro.ui
-share/anjuta/ui/anjuta-message-manager.ui
-share/anjuta/ui/anjuta-patch.ui
-share/anjuta/ui/anjuta-project-manager.ui
-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-db-plugin.ui
-share/anjuta/ui/anjuta-terminal-plugin.ui
-share/anjuta/ui/anjuta-tools.ui
+share/anjuta/ui/anjuta-macro.xml
+share/anjuta/ui/anjuta-message-manager.xml
+share/anjuta/ui/anjuta-patch.xml
+share/anjuta/ui/anjuta-project-manager.xml
+share/anjuta/ui/anjuta-run-program.xml
+share/anjuta/ui/anjuta-search.xml
+%%SVN%%share/anjuta/ui/anjuta-subversion.xml
+share/anjuta/ui/anjuta-symbol-db-plugin.xml
+share/anjuta/ui/anjuta-terminal-plugin.xml
+share/anjuta/ui/anjuta-tools.xml
share/anjuta/ui/anjuta.ui
-share/anjuta/ui/file-manager.ui
-share/anjuta/ui/profiler.ui
+share/anjuta/ui/file-manager.xml
share/anjuta/welcome.txt
share/applications/anjuta.desktop
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
@@ -438,7 +416,6 @@ share/applications/anjuta.desktop
%%PORTDOCS%%%%DOCSDIR%%/ScintillaDoc.html
%%PORTDOCS%%%%DOCSDIR%%/TODO
share/doc/libanjuta/AnjutaAsyncCommand.html
-share/doc/libanjuta/AnjutaCellRendererCaptionedImage.html
share/doc/libanjuta/AnjutaCommand.html
share/doc/libanjuta/AnjutaLauncher.html
share/doc/libanjuta/AnjutaMessageArea.html
@@ -466,6 +443,7 @@ share/doc/libanjuta/home.png
share/doc/libanjuta/index.html
share/doc/libanjuta/index.sgml
share/doc/libanjuta/left.png
+share/doc/libanjuta/libanjuta-AnjutaCellRendererCaptionedImage.html
share/doc/libanjuta/libanjuta-ESplash.html
share/doc/libanjuta/libanjuta-anjuta-c-module.html
share/doc/libanjuta/libanjuta-anjuta-c-plugin-factory.html
@@ -885,6 +863,49 @@ share/gnome/help/anjuta-manual/sv/figures/signals.png
share/gnome/help/anjuta-manual/sv/figures/stack.png
share/gnome/help/anjuta-manual/sv/figures/symbol_browser.png
share/gnome/help/anjuta-manual/sv/figures/tool-editor.png
+share/gnome/help/anjuta-manual/th/anjuta-manual.xml
+share/gnome/help/anjuta-manual/th/figures/add_edit_macro.png
+share/gnome/help/anjuta-manual/th/figures/anjuta-in-action.png
+share/gnome/help/anjuta-manual/th/figures/attach.png
+share/gnome/help/anjuta-manual/th/figures/brk_add.png
+share/gnome/help/anjuta-manual/th/figures/brk_dlg.png
+share/gnome/help/anjuta-manual/th/figures/configure_dlg.png
+share/gnome/help/anjuta-manual/th/figures/display_macro.png
+share/gnome/help/anjuta-manual/th/figures/editor_guides.png
+share/gnome/help/anjuta-manual/th/figures/editor_margins.png
+share/gnome/help/anjuta-manual/th/figures/editor_markers.png
+share/gnome/help/anjuta-manual/th/figures/file_menu.png
+share/gnome/help/anjuta-manual/th/figures/insert_text.png
+share/gnome/help/anjuta-manual/th/figures/keyword_macro.png
+share/gnome/help/anjuta-manual/th/figures/local_variables.png
+share/gnome/help/anjuta-manual/th/figures/menubar.png
+share/gnome/help/anjuta-manual/th/figures/message_win.png
+share/gnome/help/anjuta-manual/th/figures/new_file_wizard.png
+share/gnome/help/anjuta-manual/th/figures/open_file.png
+share/gnome/help/anjuta-manual/th/figures/open_file_multiple.png
+share/gnome/help/anjuta-manual/th/figures/prefs_print.png
+share/gnome/help/anjuta-manual/th/figures/print_dlg.png
+share/gnome/help/anjuta-manual/th/figures/print_preview.png
+share/gnome/help/anjuta-manual/th/figures/project-window.png
+share/gnome/help/anjuta-manual/th/figures/project_group.png
+share/gnome/help/anjuta-manual/th/figures/project_info.png
+share/gnome/help/anjuta-manual/th/figures/project_target.png
+share/gnome/help/anjuta-manual/th/figures/project_target_details.png
+share/gnome/help/anjuta-manual/th/figures/registers.png
+share/gnome/help/anjuta-manual/th/figures/save_as_file.png
+share/gnome/help/anjuta-manual/th/figures/search_expr.png
+share/gnome/help/anjuta-manual/th/figures/search_expr_basic.png
+share/gnome/help/anjuta-manual/th/figures/search_file_pattern.png
+share/gnome/help/anjuta-manual/th/figures/search_replace.png
+share/gnome/help/anjuta-manual/th/figures/search_setting.png
+share/gnome/help/anjuta-manual/th/figures/search_target.png
+share/gnome/help/anjuta-manual/th/figures/search_target_action.png
+share/gnome/help/anjuta-manual/th/figures/search_target_in.png
+share/gnome/help/anjuta-manual/th/figures/sharedlibs.png
+share/gnome/help/anjuta-manual/th/figures/signals.png
+share/gnome/help/anjuta-manual/th/figures/stack.png
+share/gnome/help/anjuta-manual/th/figures/symbol_browser.png
+share/gnome/help/anjuta-manual/th/figures/tool-editor.png
share/gnome/help/anjuta-manual/uk/anjuta-manual.xml
share/gnome/help/anjuta-manual/uk/figures/add_edit_macro.png
share/gnome/help/anjuta-manual/uk/figures/anjuta-in-action.png
@@ -928,6 +949,49 @@ share/gnome/help/anjuta-manual/uk/figures/signals.png
share/gnome/help/anjuta-manual/uk/figures/stack.png
share/gnome/help/anjuta-manual/uk/figures/symbol_browser.png
share/gnome/help/anjuta-manual/uk/figures/tool-editor.png
+share/gnome/help/anjuta-manual/zh_CN/anjuta-manual.xml
+share/gnome/help/anjuta-manual/zh_CN/figures/add_edit_macro.png
+share/gnome/help/anjuta-manual/zh_CN/figures/anjuta-in-action.png
+share/gnome/help/anjuta-manual/zh_CN/figures/attach.png
+share/gnome/help/anjuta-manual/zh_CN/figures/brk_add.png
+share/gnome/help/anjuta-manual/zh_CN/figures/brk_dlg.png
+share/gnome/help/anjuta-manual/zh_CN/figures/configure_dlg.png
+share/gnome/help/anjuta-manual/zh_CN/figures/display_macro.png
+share/gnome/help/anjuta-manual/zh_CN/figures/editor_guides.png
+share/gnome/help/anjuta-manual/zh_CN/figures/editor_margins.png
+share/gnome/help/anjuta-manual/zh_CN/figures/editor_markers.png
+share/gnome/help/anjuta-manual/zh_CN/figures/file_menu.png
+share/gnome/help/anjuta-manual/zh_CN/figures/insert_text.png
+share/gnome/help/anjuta-manual/zh_CN/figures/keyword_macro.png
+share/gnome/help/anjuta-manual/zh_CN/figures/local_variables.png
+share/gnome/help/anjuta-manual/zh_CN/figures/menubar.png
+share/gnome/help/anjuta-manual/zh_CN/figures/message_win.png
+share/gnome/help/anjuta-manual/zh_CN/figures/new_file_wizard.png
+share/gnome/help/anjuta-manual/zh_CN/figures/open_file.png
+share/gnome/help/anjuta-manual/zh_CN/figures/open_file_multiple.png
+share/gnome/help/anjuta-manual/zh_CN/figures/prefs_print.png
+share/gnome/help/anjuta-manual/zh_CN/figures/print_dlg.png
+share/gnome/help/anjuta-manual/zh_CN/figures/print_preview.png
+share/gnome/help/anjuta-manual/zh_CN/figures/project-window.png
+share/gnome/help/anjuta-manual/zh_CN/figures/project_group.png
+share/gnome/help/anjuta-manual/zh_CN/figures/project_info.png
+share/gnome/help/anjuta-manual/zh_CN/figures/project_target.png
+share/gnome/help/anjuta-manual/zh_CN/figures/project_target_details.png
+share/gnome/help/anjuta-manual/zh_CN/figures/registers.png
+share/gnome/help/anjuta-manual/zh_CN/figures/save_as_file.png
+share/gnome/help/anjuta-manual/zh_CN/figures/search_expr.png
+share/gnome/help/anjuta-manual/zh_CN/figures/search_expr_basic.png
+share/gnome/help/anjuta-manual/zh_CN/figures/search_file_pattern.png
+share/gnome/help/anjuta-manual/zh_CN/figures/search_replace.png
+share/gnome/help/anjuta-manual/zh_CN/figures/search_setting.png
+share/gnome/help/anjuta-manual/zh_CN/figures/search_target.png
+share/gnome/help/anjuta-manual/zh_CN/figures/search_target_action.png
+share/gnome/help/anjuta-manual/zh_CN/figures/search_target_in.png
+share/gnome/help/anjuta-manual/zh_CN/figures/sharedlibs.png
+share/gnome/help/anjuta-manual/zh_CN/figures/signals.png
+share/gnome/help/anjuta-manual/zh_CN/figures/stack.png
+share/gnome/help/anjuta-manual/zh_CN/figures/symbol_browser.png
+share/gnome/help/anjuta-manual/zh_CN/figures/tool-editor.png
share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-anjuta.png
share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-anjuta.svg
share/icons/hicolor/48x48/apps/anjuta.png
@@ -938,6 +1002,7 @@ share/locale/be/LC_MESSAGES/anjuta.mo
share/locale/be@latin/LC_MESSAGES/anjuta.mo
share/locale/bg/LC_MESSAGES/anjuta.mo
share/locale/ca/LC_MESSAGES/anjuta.mo
+share/locale/ca@valencia/LC_MESSAGES/anjuta.mo
share/locale/cs/LC_MESSAGES/anjuta.mo
share/locale/da/LC_MESSAGES/anjuta.mo
share/locale/de/LC_MESSAGES/anjuta.mo
@@ -963,6 +1028,7 @@ 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/mai/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
@@ -1002,7 +1068,9 @@ 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/omf/anjuta-manual/anjuta-manual-th.omf
share/omf/anjuta-manual/anjuta-manual-uk.omf
+share/omf/anjuta-manual/anjuta-manual-zh_CN.omf
share/pixmaps/anjuta/anjuta-attach-16.png
share/pixmaps/anjuta/anjuta-attach-24.png
share/pixmaps/anjuta/anjuta-block-end-16.png
@@ -1034,8 +1102,6 @@ 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
-share/pixmaps/anjuta/anjuta-class-inheritance-plugin.svg
share/pixmaps/anjuta/anjuta-complete-16.png
share/pixmaps/anjuta/anjuta-complete-24.png
share/pixmaps/anjuta/anjuta-complete-auto-16.png
@@ -1048,8 +1114,6 @@ share/pixmaps/anjuta/anjuta-debug-manager-plugin.svg
%%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
-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
@@ -1109,8 +1173,6 @@ share/pixmaps/anjuta/anjuta-patch-plugin.svg
share/pixmaps/anjuta/anjuta-pcmark-16.png
share/pixmaps/anjuta/anjuta-preferences-general-48.png
share/pixmaps/anjuta/anjuta-preferences-general.svg
-share/pixmaps/anjuta/anjuta-profiler-plugin-48.png
-share/pixmaps/anjuta/anjuta-profiler-plugin.svg
share/pixmaps/anjuta/anjuta-project-import-plugin-48.png
share/pixmaps/anjuta/anjuta-project-import-plugin.svg
share/pixmaps/anjuta/anjuta-project-manager-plugin-48.png
@@ -1120,9 +1182,6 @@ share/pixmaps/anjuta/anjuta-project-wizard-plugin.svg
share/pixmaps/anjuta/anjuta-run-to-cursor-16.png
share/pixmaps/anjuta/anjuta-run-to-cursor-24.png
share/pixmaps/anjuta/anjuta-run-program-48.png
-share/pixmaps/anjuta/anjuta-sample-plugin-48.png
-share/pixmaps/anjuta/anjuta-sample-plugin.svg
-share/pixmaps/anjuta/anjuta-scratchbox-48.png
share/pixmaps/anjuta/anjuta-search-plugin-48.png
share/pixmaps/anjuta/anjuta-search-plugin.svg
share/pixmaps/anjuta/anjuta-step-into-16.png
@@ -1174,8 +1233,12 @@ 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/zh_CN/figures
+@dirrm share/gnome/help/anjuta-manual/zh_CN
@dirrm share/gnome/help/anjuta-manual/uk/figures
@dirrm share/gnome/help/anjuta-manual/uk
+@dirrm share/gnome/help/anjuta-manual/th/figures
+@dirrm share/gnome/help/anjuta-manual/th
@dirrm share/gnome/help/anjuta-manual/sv/figures
@dirrm share/gnome/help/anjuta-manual/sv
@dirrm share/gnome/help/anjuta-manual/oc/figures
@@ -1199,7 +1262,6 @@ share/pixmaps/anjuta/vcs-updated.png
@dirrmtry share/icons/gnome/48x48/mimetypes
@dirrm share/anjuta/ui
@dirrm share/anjuta/tools
-@dirrm share/anjuta/properties
@dirrm share/anjuta/project/xlib/src
@dirrm share/anjuta/project/xlib/po
@dirrm share/anjuta/project/xlib-dock/src
@@ -1224,6 +1286,9 @@ share/pixmaps/anjuta/vcs-updated.png
@dirrm share/anjuta/project/minimal
@dirrm share/anjuta/project/m4
@dirrm share/anjuta/project/licenses
+@dirrm share/anjuta/project/library/src
+@dirrm share/anjuta/project/library/po
+@dirrm share/anjuta/project/library
@dirrm share/anjuta/project/java/src
@dirrm share/anjuta/project/java/po
@dirrm share/anjuta/project/java
@@ -1242,9 +1307,6 @@ share/pixmaps/anjuta/vcs-updated.png
@dirrm share/anjuta/project/cpp/src
@dirrm share/anjuta/project/cpp/po
@dirrm share/anjuta/project/cpp
-@dirrm share/anjuta/project/anjuta-plugin-vala/src
-@dirrm share/anjuta/project/anjuta-plugin-vala/po
-@dirrm share/anjuta/project/anjuta-plugin-vala
@dirrm share/anjuta/project/anjuta-plugin/src
@dirrm share/anjuta/project/anjuta-plugin/po
@dirrm share/anjuta/project/anjuta-plugin
@@ -1279,7 +1341,11 @@ share/pixmaps/anjuta/vcs-updated.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/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index a41ec889d279..c3250344b196 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/bug-buddy/Makefile,v 1.74 2009/03/18 00:35:01 kwm Exp $
+# $MCom: ports/devel/bug-buddy/Makefile,v 1.78 2009/09/21 16:26:07 kwm Exp $
#
PORTNAME= bug-buddy
-PORTVERSION= 2.26.0
-PORTREVISION= 1
+PORTVERSION= 2.28.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -24,7 +23,7 @@ USE_GETTEXT= yes
INSTALLS_ICONS= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack gnomemenus \
+USE_GNOME= gnomeprefix gnomehack intlhack \
gnomedocutils evolutiondataserver
GNOME_DESKTOP_VERSION=2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index a00a22b53d8d..c321c0c3b85f 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/bug-buddy-2.28.0.tar.bz2) = ee9c586fee2e6b8ce3b787e696f37100
+SHA256 (gnome2/bug-buddy-2.28.0.tar.bz2) = 6ec0c21a09d9eb2a5f05a60261c6c70a0cd35e8887598418402fd17f83c1b294
+SIZE (gnome2/bug-buddy-2.28.0.tar.bz2) = 1186863
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index 641480473ee2..848f49b65e13 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -3,7 +3,6 @@ lib/gtk-2.0/modules/libgnomebreakpad.la
lib/gtk-2.0/modules/libgnomebreakpad.so
share/applications/bug-buddy.desktop
%%DATADIR%%/bug-buddy.gtkbuilder
-%%DATADIR%%/bug-buddy.menu
%%DATADIR%%/gdb-cmd
share/icons/HighContrastLargePrint/48x48/apps/bug-buddy.png
share/icons/hicolor/16x16/apps/bug-buddy.png
@@ -24,6 +23,7 @@ share/locale/bn/LC_MESSAGES/bug-buddy.mo
share/locale/bn_IN/LC_MESSAGES/bug-buddy.mo
share/locale/bs/LC_MESSAGES/bug-buddy.mo
share/locale/ca/LC_MESSAGES/bug-buddy.mo
+share/locale/ca@valencia/LC_MESSAGES/bug-buddy.mo
share/locale/cs/LC_MESSAGES/bug-buddy.mo
share/locale/cy/LC_MESSAGES/bug-buddy.mo
share/locale/da/LC_MESSAGES/bug-buddy.mo
@@ -56,6 +56,7 @@ share/locale/ku/LC_MESSAGES/bug-buddy.mo
share/locale/ky/LC_MESSAGES/bug-buddy.mo
share/locale/lt/LC_MESSAGES/bug-buddy.mo
share/locale/lv/LC_MESSAGES/bug-buddy.mo
+share/locale/mai/LC_MESSAGES/bug-buddy.mo
share/locale/mg/LC_MESSAGES/bug-buddy.mo
share/locale/mk/LC_MESSAGES/bug-buddy.mo
share/locale/ml/LC_MESSAGES/bug-buddy.mo
@@ -125,12 +126,16 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.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/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@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
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 39c8a33cf3f1..db3447fc0ebb 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/dbus/Makefile,v 1.34 2009/11/28 06:03:52 mezz Exp $
#
PORTNAME= dbus
-PORTVERSION?= 1.2.4.6
+PORTVERSION?= 1.2.16
PORTREVISION?= 1
CATEGORIES= devel gnome
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
-DISTNAME= dbus-${PORTVERSION}permissive
MAINTAINER= gnome@FreeBSD.org
COMMENT= A message bus system for inter-application communication
@@ -59,6 +59,8 @@ post-patch:
@${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
${WRKSRC}/dbus/Makefile.in \
${WRKSRC}/tools/Makefile.in
+ @${REINPLACE_CMD} -e 's|THREAD_LIBS -lrt|THREAD_LIBS|g' \
+ ${WRKSRC}/configure
.if !defined(DBUS_SLAVE)
post-install:
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index c4e9b0edf4da..1623b43edf79 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-1.2.4.6permissive.tar.gz) = 1a158fe326b078d1377a977121888496
-SHA256 (dbus-1.2.4.6permissive.tar.gz) = a2da2c9da52be6de6c6f1e1c3c3f3a960992b0c82d47661606c11d7aef76f7b1
-SIZE (dbus-1.2.4.6permissive.tar.gz) = 1575270
+MD5 (dbus-1.2.16.tar.gz) = c7a47b851ebe02f6726b65b78d1b730b
+SHA256 (dbus-1.2.16.tar.gz) = 968a31c16a6c4bbbdb603cbaa3d60d6d19bc8ae30c0ed55d7f8c2e254413e4c8
+SIZE (dbus-1.2.16.tar.gz) = 1576209
diff --git a/devel/dbus/files/patch-configure b/devel/dbus/files/patch-configure
deleted file mode 100644
index 0161d4625f7d..000000000000
--- a/devel/dbus/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig 2009-01-13 07:43:11.194080000 +0000
-+++ configure 2009-01-13 07:43:26.270082000 +0000
-@@ -20956,10 +20956,6 @@ if test "x$GCC" = "xyes"; then
- *[\ \ ]-Wno-sign-compare[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wno-sign-compare" ;;
- esac
-- case " $CFLAGS " in
-- *[\ \ ]-Wno-pointer-sign[\ \ ]*) ;;
-- *) CFLAGS="$CFLAGS -Wno-pointer-sign" ;;
-- esac
-
- # http://bugs.freedesktop.org/show_bug.cgi?id=19195
- case " $CFLAGS " in
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
deleted file mode 100644
index aa623c158889..000000000000
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
+++ /dev/null
@@ -1,75 +0,0 @@
---- dbus/dbus-sysdeps-unix.c.orig 2008-08-06 13:00:29.000000000 -0400
-+++ dbus/dbus-sysdeps-unix.c 2008-08-10 15:04:32.000000000 -0400
-@@ -1041,9 +1041,9 @@ write_credentials_byte (int
- int bytes_written;
- char buf[1] = { '\0' };
- #if defined(HAVE_CMSGCRED)
-- struct {
-+ union {
- struct cmsghdr hdr;
-- struct cmsgcred cred;
-+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
- } cmsg;
- struct iovec iov;
- struct msghdr msg;
-@@ -1054,10 +1054,10 @@ write_credentials_byte (int
- msg.msg_iov = &iov;
- msg.msg_iovlen = 1;
-
-- msg.msg_control = &cmsg;
-- msg.msg_controllen = sizeof (cmsg);
-+ msg.msg_control = (caddr_t) &cmsg;
-+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
- memset (&cmsg, 0, sizeof (cmsg));
-- cmsg.hdr.cmsg_len = sizeof (cmsg);
-+ cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
- cmsg.hdr.cmsg_level = SOL_SOCKET;
- cmsg.hdr.cmsg_type = SCM_CREDS;
- #endif
-@@ -1133,9 +1133,9 @@ _dbus_read_credentials_socket (int
- pid_read = DBUS_PID_UNSET;
-
- #ifdef HAVE_CMSGCRED
-- struct {
-+ union {
- struct cmsghdr hdr;
-- struct cmsgcred cred;
-+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
- } cmsg;
-
- #elif defined(LOCAL_CREDS)
-@@ -1172,8 +1172,8 @@ _dbus_read_credentials_socket (int
-
- #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
- memset (&cmsg, 0, sizeof (cmsg));
-- msg.msg_control = &cmsg;
-- msg.msg_controllen = sizeof (cmsg);
-+ msg.msg_control = (caddr_t) &cmsg;
-+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
- #endif
-
- again:
-@@ -1211,7 +1211,8 @@ _dbus_read_credentials_socket (int
- }
-
- #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
-- if (cmsg.hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS)
-+ if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred))
-+ || cmsg.hdr.cmsg_type != SCM_CREDS)
- {
- dbus_set_error (error, DBUS_ERROR_FAILED,
- "Message from recvmsg() was not SCM_CREDS");
-@@ -1238,8 +1239,11 @@ _dbus_read_credentials_socket (int
- cr_len, (int) sizeof (cr), _dbus_strerror (errno));
- }
- #elif defined(HAVE_CMSGCRED)
-- pid_read = cmsg.cred.cmcred_pid;
-- uid_read = cmsg.cred.cmcred_euid;
-+ struct cmsgcred *cred;
-+
-+ cred = (struct cmsgcred *) CMSG_DATA (&cmsg);
-+ pid_read = cred->cmcred_pid;
-+ uid_read = cred->cmcred_euid;
- #elif defined(LOCAL_CREDS)
- pid_read = DBUS_PID_UNSET;
- uid_read = cmsg.cred.sc_uid;
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index a55316e6b9f5..a48696ab08f5 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -3,20 +3,20 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/devhelp/Makefile,v 1.12 2009/01/11 18:03:38 marcus Exp $
+# $MCom: ports/devel/devhelp/Makefile,v 1.28 2009/10/19 20:06:46 kwm Exp $
PORTNAME= devhelp
-PORTVERSION= 0.23
-PORTREVISION= 1
+PORTVERSION= 2.28.1
PORTEPOCH= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
-MAINTAINER= kwm@FreeBSD.org
+MAINTAINER= gnome@FreeBSD.org
COMMENT= Developer help browser for GNOME 2
-LIB_DEPENDS= webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \
+ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
USE_BZIP2= yes
USE_XORG= x11
@@ -47,6 +47,12 @@ post-patch:
.if defined(WITHOUT_GEDIT)
@${REINPLACE_CMD} -e 's|gedit-plugin||' \
${WRKSRC}/misc/Makefile.in
+ @${REINPLACE_CMD} -e 's|-DGTK_DISABLE_SINGLE_INCLUDES||g' \
+ ${WRKSRC}/src/Makefile.in
.endif
+post-install:
+ @${MKDIR} ${PREFIX}/etc/gconf/schemas
+ @${CP} ${WRKSRC}/data/devhelp.schemas ${PREFIX}/etc/gconf/schemas
+
.include <bsd.port.post.mk>
diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo
index b6375c8b8771..e3a67f645fd4 100644
--- a/devel/devhelp/distinfo
+++ b/devel/devhelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/devhelp-0.23.tar.bz2) = 704c0c90616aeb1c52ca3af1df93fde6
-SHA256 (gnome2/devhelp-0.23.tar.bz2) = 60f336ac396f67a0cce70d71ea931545727ab48e9d09bf36415098965f9a7ef2
-SIZE (gnome2/devhelp-0.23.tar.bz2) = 521287
+MD5 (gnome2/devhelp-2.28.1.tar.bz2) = b9ec14ddf74c4b9924da77b62c345cf8
+SHA256 (gnome2/devhelp-2.28.1.tar.bz2) = 09a0f048cc5b4517e92d74d6ffcd4a17f4bb2c4c236739154fb24b60958862d9
+SIZE (gnome2/devhelp-2.28.1.tar.bz2) = 473458
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index 83649fae27a5..4c31e71d237f 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -18,7 +18,7 @@ include/devhelp-1.0/devhelp/dh-window.h
lib/libdevhelp-1.a
lib/libdevhelp-1.la
lib/libdevhelp-1.so
-lib/libdevhelp-1.so.0
+lib/libdevhelp-1.so.1
libdata/pkgconfig/libdevhelp-1.0.pc
share/applications/devhelp.desktop
share/devhelp/assistant/assistant.css
@@ -42,6 +42,7 @@ share/locale/bg/LC_MESSAGES/devhelp.mo
share/locale/bn/LC_MESSAGES/devhelp.mo
share/locale/bn_IN/LC_MESSAGES/devhelp.mo
share/locale/ca/LC_MESSAGES/devhelp.mo
+share/locale/ca@valencia/LC_MESSAGES/devhelp.mo
share/locale/cs/LC_MESSAGES/devhelp.mo
share/locale/da/LC_MESSAGES/devhelp.mo
share/locale/de/LC_MESSAGES/devhelp.mo
@@ -66,6 +67,7 @@ share/locale/kn/LC_MESSAGES/devhelp.mo
share/locale/ko/LC_MESSAGES/devhelp.mo
share/locale/lt/LC_MESSAGES/devhelp.mo
share/locale/lv/LC_MESSAGES/devhelp.mo
+share/locale/mai/LC_MESSAGES/devhelp.mo
share/locale/mk/LC_MESSAGES/devhelp.mo
share/locale/ml/LC_MESSAGES/devhelp.mo
share/locale/ms/LC_MESSAGES/devhelp.mo
@@ -80,13 +82,14 @@ 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/ro/LC_MESSAGES/devhelp.mo
share/locale/ru/LC_MESSAGES/devhelp.mo
share/locale/rw/LC_MESSAGES/devhelp.mo
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@Latn/LC_MESSAGES/devhelp.mo
+share/locale/sr@latin/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
@@ -98,7 +101,6 @@ share/locale/zh_CN/LC_MESSAGES/devhelp.mo
share/locale/zh_HK/LC_MESSAGES/devhelp.mo
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
@@ -108,18 +110,24 @@ 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@Latn/LC_MESSAGES
-@dirrmtry share/locale/sr@Latn
+@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/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
@dirrmtry share/locale/ps/LC_MESSAGES
@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/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
diff --git a/devel/eggdbus/Makefile b/devel/eggdbus/Makefile
new file mode 100644
index 000000000000..bb2d7ffdcb2b
--- /dev/null
+++ b/devel/eggdbus/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: eggdbus
+# Date Created: 30 Juli 2009
+# Whom: Koop Mast<kwm@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/eggdbus/Makefile,v 1.3 2009/11/24 01:46:27 marcus Exp $
+#
+
+PORTNAME= eggdbus
+PORTVERSION= 0.6
+CATEGORIES= devel
+MASTER_SITES= http://hal.freedesktop.org/releases/
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= D-Bus bindings for GObject
+
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+
+USE_GNOME= pkgconfig glib20 gnomehack
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+CONFIGURE_ARGS= --localstatedir=/var
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+.if defined(NO_INSTALL_MANPAGES)
+CONFIGURE_ARGS+=--disable-man-pages
+.else
+BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1/catalog:${PORTSDIR}/textproc/docbook-410 \
+ xsltproc:${PORTSDIR}/textproc/libxslt \
+ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+
+MAN1= eggdbus-binding-tool.1
+.endif
+
+.include <bsd.port.mk>
diff --git a/devel/eggdbus/distinfo b/devel/eggdbus/distinfo
new file mode 100644
index 000000000000..7dcd0ff13e4d
--- /dev/null
+++ b/devel/eggdbus/distinfo
@@ -0,0 +1,3 @@
+MD5 (eggdbus-0.6.tar.gz) = b43d2a6c523fcb8b9d0b0300c4222386
+SHA256 (eggdbus-0.6.tar.gz) = 045b1904c90a5acb2ddc93504cdbc5e1317c8021bbf919cea3bf18a686911085
+SIZE (eggdbus-0.6.tar.gz) = 801596
diff --git a/devel/eggdbus/files/patch-src_eggbus_Makefile.in b/devel/eggdbus/files/patch-src_eggbus_Makefile.in
new file mode 100644
index 000000000000..6bdce7098404
--- /dev/null
+++ b/devel/eggdbus/files/patch-src_eggbus_Makefile.in
@@ -0,0 +1,10 @@
+--- src/eggdbus/Makefile.in.orig 2009-11-23 20:50:34.000000000 -0500
++++ src/eggdbus/Makefile.in 2009-11-23 20:50:53.000000000 -0500
+@@ -1375,6 +1375,7 @@ eggdbus-built-sources.stamp : eggdbus-bi
+ --dbus-namespace org.freedesktop.DBus \
+ --interfaces-only \
+ --no-types-header \
++ --include-header "unistd.h" \
+ --include-header "eggdbus/eggdbustypes.h" \
+ --include-header "eggdbus/eggdbusinterface.h" \
+ --include-header "eggdbus/eggdbusinterfaceproxy.h" \
diff --git a/devel/eggdbus/pkg-descr b/devel/eggdbus/pkg-descr
new file mode 100644
index 000000000000..18b956511201
--- /dev/null
+++ b/devel/eggdbus/pkg-descr
@@ -0,0 +1,8 @@
+EggDBus aims to be an easy-to-use set of GObject bindings for interacting
+with DBus. Currently, this interaction is done using libdbus-1 but that
+is subject to change.
+
+See http://mail.gnome.org/archives/gtk-devel-list/2008-December/msg00059.html
+for more on the goals and design of EggDBus.
+
+WWW: http://cgit.freedesktop.org/~david/eggdbus
diff --git a/devel/eggdbus/pkg-plist b/devel/eggdbus/pkg-plist
new file mode 100644
index 000000000000..50899d59543a
--- /dev/null
+++ b/devel/eggdbus/pkg-plist
@@ -0,0 +1,36 @@
+bin/eggdbus-binding-tool
+bin/eggdbus-glib-genmarshal
+include/eggdbus-1/eggdbus/eggdbus.h
+include/eggdbus-1/eggdbus/eggdbusarrayseq.h
+include/eggdbus-1/eggdbus/eggdbusbus.h
+include/eggdbus-1/eggdbus/eggdbusbusnametracker.h
+include/eggdbus-1/eggdbus/eggdbusconnection.h
+include/eggdbus-1/eggdbus/eggdbusenumtypes.h
+include/eggdbus-1/eggdbus/eggdbuserror.h
+include/eggdbus-1/eggdbus/eggdbushashmap.h
+include/eggdbus-1/eggdbus/eggdbusinterface.h
+include/eggdbus-1/eggdbus/eggdbusinterfaceproxy.h
+include/eggdbus-1/eggdbus/eggdbusintrospectable.h
+include/eggdbus-1/eggdbus/eggdbusmessage.h
+include/eggdbus-1/eggdbus/eggdbusmethodinvocation.h
+include/eggdbus-1/eggdbus/eggdbusmisctypes.h
+include/eggdbus-1/eggdbus/eggdbusobjectpath.h
+include/eggdbus-1/eggdbus/eggdbusobjectproxy.h
+include/eggdbus-1/eggdbus/eggdbuspeer.h
+include/eggdbus-1/eggdbus/eggdbusproperties.h
+include/eggdbus-1/eggdbus/eggdbusreleasenamereply.h
+include/eggdbus-1/eggdbus/eggdbusrequestnameflags.h
+include/eggdbus-1/eggdbus/eggdbusrequestnamereply.h
+include/eggdbus-1/eggdbus/eggdbussignature.h
+include/eggdbus-1/eggdbus/eggdbusstartservicebynamereply.h
+include/eggdbus-1/eggdbus/eggdbusstructure.h
+include/eggdbus-1/eggdbus/eggdbustypes.h
+include/eggdbus-1/eggdbus/eggdbusutils.h
+include/eggdbus-1/eggdbus/eggdbusvariant.h
+lib/libeggdbus-1.a
+lib/libeggdbus-1.la
+lib/libeggdbus-1.so
+lib/libeggdbus-1.so.0
+libdata/pkgconfig/eggdbus-1.pc
+@dirrm include/eggdbus-1/eggdbus
+@dirrm include/eggdbus-1
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index d10f2f895b1b..435f06057bb5 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gconf2/Makefile,v 1.106 2009/03/18 00:42:34 kwm Exp $
+# $MCom: ports/devel/gconf2/Makefile,v 1.109 2009/09/22 20:20:31 kwm Exp $
#
PORTNAME= gconf2
-PORTVERSION= 2.26.2
-PORTREVISION?= 1
+PORTVERSION= 2.28.0
+PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,7 +23,7 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
- polkit.2:${PORTSDIR}/sysutils/policykit
+ polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index 743208212228..c7a6a52de645 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/GConf-2.26.2.tar.bz2) = 8b55d58dab13e821e048627aa4f92b8b
-SHA256 (gnome2/GConf-2.26.2.tar.bz2) = 717af270db891088394d154e3e22acc01af382306624c83679a4f8d6ba8467ed
-SIZE (gnome2/GConf-2.26.2.tar.bz2) = 1474738
+MD5 (gnome2/GConf-2.28.0.tar.bz2) = ad2aeb9c7d906b274954c51a615caeac
+SHA256 (gnome2/GConf-2.28.0.tar.bz2) = d057dcfe2bfb2a80e592349c2a78d7dce12d19542aeced466c64fb701c806ac8
+SIZE (gnome2/GConf-2.28.0.tar.bz2) = 1476190
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 85be04736253..7daafae699e4 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -31,7 +31,6 @@ libexec/gconf-sanity-check-2
libexec/gconfd-2
%%LDAP%%share/GConf/schema/evoldap.schema
share/aclocal/gconf-2.m4
-share/PolicyKit/policy/org.gnome.gconf.defaults.policy
share/dbus-1/system-services/org.gnome.GConf.Defaults.service
share/dbus-1/services/org.gnome.GConf.service
share/locale/am/LC_MESSAGES/GConf2.mo
@@ -44,6 +43,7 @@ share/locale/bn/LC_MESSAGES/GConf2.mo
share/locale/bn_IN/LC_MESSAGES/GConf2.mo
share/locale/bs/LC_MESSAGES/GConf2.mo
share/locale/ca/LC_MESSAGES/GConf2.mo
+share/locale/ca@valencia/LC_MESSAGES/GConf2.mo
share/locale/cs/LC_MESSAGES/GConf2.mo
share/locale/cy/LC_MESSAGES/GConf2.mo
share/locale/da/LC_MESSAGES/GConf2.mo
@@ -113,6 +113,7 @@ share/locale/yi/LC_MESSAGES/GConf2.mo
share/locale/zh_CN/LC_MESSAGES/GConf2.mo
share/locale/zh_HK/LC_MESSAGES/GConf2.mo
share/locale/zh_TW/LC_MESSAGES/GConf2.mo
+share/polkit-1/actions/org.gnome.gconf.defaults.policy
share/sgml/gconf/gconf-1.0.dtd
@dirrm share/sgml/gconf
%%LDAP%%@dirrm share/GConf/schema
@@ -147,6 +148,8 @@ share/sgml/gconf/gconf-1.0.dtd
@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/as/LC_MESSAGES
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 933e606c09d0..375ba134425a 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -3,12 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/devel/gconfmm26/Makefile,v 1.23 2008/09/22 11:47:53 kwm Exp $
+# $MCom: ports/devel/gconfmm26/Makefile,v 1.25 2009/09/22 20:58:48 kwm Exp $
#
PORTNAME= gconfmm
-PORTVERSION= 2.24.0
-PORTREVISION= 1
+PORTVERSION= 2.28.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gconfmm26/distinfo b/devel/gconfmm26/distinfo
index 20aa775d8721..31e15f82d845 100644
--- a/devel/gconfmm26/distinfo
+++ b/devel/gconfmm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconfmm-2.24.0.tar.bz2) = cd2c3c919dbf8f90f703680d2fa088b2
-SHA256 (gnome2/gconfmm-2.24.0.tar.bz2) = d801f3422411269b4234e97589d8c90a2495336320e608c5aab4a277c0010baa
-SIZE (gnome2/gconfmm-2.24.0.tar.bz2) = 298222
+MD5 (gnome2/gconfmm-2.28.0.tar.bz2) = dad2999d8bbf88cf581fa512041d735e
+SHA256 (gnome2/gconfmm-2.28.0.tar.bz2) = 3daa3719f773cfc9fcee84766f60eab4579209978425221997120662bd621a52
+SIZE (gnome2/gconfmm-2.28.0.tar.bz2) = 305888
diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index 474177b1a214..aaf2e1cb863b 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.30 2009/03/27 18:52:46 marcus Exp $
+# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.41 2009/10/07 22:03:54 kwm Exp $
#
PORTNAME= gio-fam-backend
-PORTVERSION= 2.20.5
+PORTVERSION= 2.22.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo
index ef73e57d56ec..30b626bb630c 100644
--- a/devel/gio-fam-backend/distinfo
+++ b/devel/gio-fam-backend/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.20.5.tar.bz2) = 4c178b91d82ef80a2da3c26b772569c0
-SHA256 (gnome2/glib-2.20.5.tar.bz2) = 88f092769df5ce9f784c1068a3055ede00ada503317653984101d5393de63655
-SIZE (gnome2/glib-2.20.5.tar.bz2) = 5037738
+MD5 (gnome2/glib-2.22.2.tar.bz2) = 846a86c74b74d5b16826aa5508940f9b
+SHA256 (gnome2/glib-2.22.2.tar.bz2) = a4a41d02fc2d3f5effa1fc3466918e0b3ab60e9eb0a08139b997f2649cbacca3
+SIZE (gnome2/glib-2.22.2.tar.bz2) = 5490926
diff --git a/devel/gir-repository-dbus/Makefile b/devel/gir-repository-dbus/Makefile
new file mode 100644
index 000000000000..48cb73e4361d
--- /dev/null
+++ b/devel/gir-repository-dbus/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-dbus
+# Date created: 12 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/gir-repository-dbus/Makefile,v 1.1 2009/09/16 02:05:10 avl Exp $
+#
+
+CATEGORIES= devel
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -dbus
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/devel/gir-repository-gconf2/Makefile b/devel/gir-repository-gconf2/Makefile
new file mode 100644
index 000000000000..5707e4f18a47
--- /dev/null
+++ b/devel/gir-repository-gconf2/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-gconf2
+# Date created: 12 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/gir-repository-gconf2/Makefile,v 1.1 2009/09/16 02:05:10 avl Exp $
+#
+
+CATEGORIES= devel
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -gconf2
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/devel/gir-repository-libnotify/Makefile b/devel/gir-repository-libnotify/Makefile
new file mode 100644
index 000000000000..606ca0e3408a
--- /dev/null
+++ b/devel/gir-repository-libnotify/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-libnotify
+# Date created: 12 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/gir-repository-libnotify/Makefile,v 1.1 2009/09/16 02:05:11 avl Exp $
+#
+
+CATEGORIES= devel
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -libnotify
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/devel/gir-repository-libsoup/Makefile b/devel/gir-repository-libsoup/Makefile
new file mode 100644
index 000000000000..a6017638d5db
--- /dev/null
+++ b/devel/gir-repository-libsoup/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-libsoup
+# Date created: 07 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/gir-repository-libsoup/Makefile,v 1.1 2009/09/16 02:05:11 avl Exp $
+#
+
+CATEGORIES= devel
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -libsoup
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/devel/gir-repository/Makefile b/devel/gir-repository/Makefile
new file mode 100644
index 000000000000..42c957336882
--- /dev/null
+++ b/devel/gir-repository/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for: gir-repository
+# Date created: 14 Aug 2009
+# Whom: Pawel Worach <pawel.worach@gmail.com>
+#
+# $FreeBSD$
+# $MCom: ports/devel/gir-repository/Makefile,v 1.9 2009/11/09 09:29:14 kwm Exp $
+#
+
+MASTER_SITES= # Empty
+DISTFILES= # None
+PATCHDIR= # None
+
+CATEGORIES= devel gnome
+
+COMMENT= Introspection information for various libraries
+
+NO_BUILD= yes
+
+RUN_DEPENDS= ${GIRDIR}/${atk_GIR}.gir:${PORTSDIR}/${atk_CATEGORY}/gir-repository-atk \
+ ${GIRDIR}/${pango_GIR}.gir:${PORTSDIR}/${pango_CATEGORY}/gir-repository-pango \
+ ${GIRDIR}/${poppler_GIR}.gir:${PORTSDIR}/${poppler_CATEGORY}/gir-repository-poppler \
+ ${GIRDIR}/${gtk20_GIR}.gir:${PORTSDIR}/${gtk20_CATEGORY}/gir-repository-gtk20 \
+ ${GIRDIR}/${webkit_GIR}.gir:${PORTSDIR}/${webkit_CATEGORY}/gir-repository-webkit \
+ ${GIRDIR}/${libsoup_GIR}.gir:${PORTSDIR}/${libsoup_CATEGORY}/gir-repository-libsoup \
+ ${GIRDIR}/${dbus_GIR}.gir:${PORTSDIR}/${dbus_CATEGORY}/gir-repository-dbus \
+ ${GIRDIR}/${gconf2_GIR}.gir:${PORTSDIR}/${gconf2_CATEGORY}/gir-repository-gconf2 \
+ ${GIRDIR}/${babl_GIR}.gir:${PORTSDIR}/${babl_CATEGORY}/gir-repository-babl \
+ ${GIRDIR}/${nautilus_GIR}.gir:${PORTSDIR}/${nautilus_CATEGORY}/gir-repository-nautilus \
+ ${GIRDIR}/${gnomekeyring_GIR}.gir:${PORTSDIR}/${gnomekeyring_CATEGORY}/gir-repository-gnome-keyring \
+ ${GIRDIR}/${libnotify_GIR}.gir:${PORTSDIR}/${libnotify_CATEGORY}/gir-repository-libnotify \
+ ${GIRDIR}/${gtksourceview2_GIR}.gir:${PORTSDIR}/${gtksourceview2_CATEGORY}/gir-repository-gtksourceview2 \
+ ${GIRDIR}/${vte_GIR}.gir:${PORTSDIR}/${vte_CATEGORY}/gir-repository-vte \
+ ${GIRDIR}/${avahi_GIR}.gir:${PORTSDIR}/${avahi_CATEGORY}/gir-repository-avahi \
+ ${GIRDIR}/${gnomemenus_GIR}.gir:${PORTSDIR}/${gnomemenus_CATEGORY}/gir-repository-gnome-menus \
+ ${GIRDIR}/${libwnck_GIR}.gir:${PORTSDIR}/${libwnck_CATEGORY}/gir-repository-libwnck \
+ ${GIRDIR}/${goocanvas_GIR}.gir:${PORTSDIR}/${goocanvas_CATEGORY}/gir-repository-goocanvas
+
+do-install: # empty
+
+.include "${.CURDIR}/../../devel/gir-repository/bsd.gir.mk"
diff --git a/devel/gir-repository/bsd.gir.mk b/devel/gir-repository/bsd.gir.mk
new file mode 100644
index 000000000000..d4791b84417e
--- /dev/null
+++ b/devel/gir-repository/bsd.gir.mk
@@ -0,0 +1,254 @@
+PORTNAME= gir-repository
+PORTVERSION= 0.6.5
+PORTREVISION?= 3
+
+MAINTAINER= gnome@FreeBSD.org
+
+GIRDIR= ${LOCALBASE}/share/gir-1.0
+
+atk_CATEGORY= accessibility
+atk_GIR= Atk-1.0
+
+pango_CATEGORY= x11-toolkits
+pango_GIR= Pango-1.0
+
+poppler_CATEGORY= graphics
+poppler_GIR= Poppler-0.8
+
+gtk20_CATEGORY= x11-toolkits
+gtk20_GIR= Gtk-2.0
+gtk20_GIR_TMPL= gtk
+
+webkit_CATEGORY= www
+webkit_GIR= WebKit-1.0
+
+libsoup_CATEGORY= devel
+libsoup_GIR= Soup-2.4
+libsoup_GIR_TMPL= soup
+
+dbus_CATEGORY= devel
+dbus_GIR= DBus-1.0
+
+gconf2_CATEGORY= devel
+gconf2_GIR= GConf-2.0
+
+babl_CATEGORY= x11
+babl_GIR= Babl-0.0
+
+nautilus_CATEGORY= x11-fm
+nautilus_GIR= Nautilus-1.0
+
+gnomekeyring_CATEGORY= security
+gnomekeyring_GIR= GnomeKeyring-2.0
+
+libnotify_CATEGORY= devel
+libnotify_GIR= Notify-0.4
+
+gtksourceview2_CATEGORY= x11-toolkits
+gtksourceview2_GIR= GtkSource-2.2
+
+vte_CATEGORY= x11-toolkits
+vte_GIR= Vte-1.0
+
+avahi_CATEGORY= net
+avahi_GIR= Avahi-0.6
+
+gnomemenus_CATEGORY= x11
+gnomemenus_GIR= GMenu-2.0
+
+libwnck_CATEGORY= x11-toolkits
+libwnck_GIR= Wnck-1.0
+
+goocanvas_CATEGORY= graphics
+goocanvas_GIR= GooCanvas-0.10
+
+.if defined(PKGNAMESUFFIX)
+
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome2
+
+COMMENT?= Introspection information for ${GIR_NAME}
+
+BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+RUN_DEPENDS= ${GIRDIR}/Everything-1.0.gir:${PORTSDIR}/devel/gobject-introspection
+
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack pkgconfig
+
+GIR_NAME= ${PKGNAMESUFFIX:S/-//g}
+DEP_NAMES= ${GIR_NAME}
+
+GIRDIR_REL= ${GIRDIR:S,^${LOCALBASE}/,,}
+TYPELIBDIR_REL= lib/girepository-1.0
+
+PLIST= ${NONEXISTENT}
+
+# This list is used to enable/disable gir modules in the configure script.
+# So all girs should be here even if we don't use them.
+_USE_GIR_ALL= dbus atk pango pangoxft poppler gtk gconf soup babl nautilusextension \
+ gnomekeyring webkit notify gnio clutter clutter_gtk clutter_cairo \
+ gstreamer gstbufferlist_h gstreamer_plugins_base gtksourceview vte \
+ goocanvas gssdp gupnp avahi unique gmenu wnck
+
+.if ${GIR_NAME} == "atk"
+USE_GNOME+= atk
+GIR_FILES= Atk-1.0
+.endif
+
+.if ${GIR_NAME} == "pango"
+USE_GNOME+= pango
+GIR_FILES= Pango-1.0 PangoFT2-1.0 PangoCairo-1.0 PangoX-1.0 PangoXft-1.0
+DEP_NAMES+= pangoxft
+.endif
+
+.if ${GIR_NAME} == "poppler"
+LIB_DEPENDS+= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk
+USE_GIR= gtk20 pango
+GIR_FILES= Poppler-0.8
+CLEAR_DEPS+= Gdk-2.0
+.endif
+
+.if ${GIR_NAME} == "gtk20"
+USE_GNOME+= gtk20
+USE_GIR= atk pango
+GIR_FILES= Gdk-2.0 Gtk-2.0 GdkPixbuf-2.0
+LIB_FILES= Gdk Gtk
+DEP_NAMES= gtk
+.endif
+
+.if ${GIR_NAME} == "webkit"
+LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
+USE_GIR= gtk20 libsoup
+GIR_FILES= WebKit-1.0 JSCore-1.0
+.endif
+
+.if ${GIR_NAME} == "libsoup"
+LIB_DEPENDS+= soup-2.4.1:${PORTSDIR}/devel/libsoup
+GIR_FILES= Soup-2.4
+DEP_NAMES= soup
+.endif
+
+.if ${GIR_NAME} == "gconf2"
+USE_GNOME+= gconf2
+GIR_FILES= GConf-2.0
+DEP_NAMES= gconf
+.endif
+
+.if ${GIR_NAME} == "babl"
+LIB_DEPENDS+= babl-0.0.0:${PORTSDIR}/x11/babl
+GIR_FILES= Babl-0.0
+.endif
+
+.if ${GIR_NAME} == "nautilus"
+USE_GNOME+= nautilus2
+USE_GIR= gtk20
+GIR_FILES= Nautilus-1.0
+DEP_NAMES= nautilusextension
+.endif
+
+.if ${GIR_NAME} == "gnomekeyring"
+LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
+GIR_FILES= GnomeKeyring-2.0
+.endif
+
+.if ${GIR_NAME} == "libnotify"
+LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify
+USE_GIR= gtk20
+GIR_FILES= Notify-0.4
+DEP_NAMES= notify
+.endif
+
+.if ${GIR_NAME} == "dbus"
+LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+GIR_FILES= DBus-1.0
+LIB_FILES= DBus
+.endif
+
+.if ${GIR_NAME} == "gtksourceview2"
+USE_GNOME+= gtksourceview2
+USE_GIR= gtk20
+GIR_FILES= GtkSource-2.2
+DEP_NAMES= gtksourceview
+.endif
+
+.if ${GIR_NAME} == "vte"
+USE_GNOME+= vte
+USE_GIR= gtk20
+GIR_FILES= Vte-1.0
+.endif
+
+.if ${GIR_NAME} == "avahi"
+LIB_DEPENDS+= avahi-gobject.0:${PORTSDIR}/net/avahi-app
+GIR_FILES= Avahi-0.6 AvahiCore-0.6
+.endif
+
+.if ${GIR_NAME} == "gnomemenus"
+USE_GNOME+= gnomemenus
+USE_GIR= gtk20
+GIR_FILES= GMenu-2.0
+DEP_NAMES= gmenu
+.endif
+
+.if ${GIR_NAME} == "libwnck"
+USE_GNOME+= libwnck
+USE_GIR= gtk20
+GIR_FILES= Wnck-1.0
+DEP_NAMES= wnck
+.endif
+
+.if ${GIR_NAME} == "goocanvas"
+LIB_DEPENDS+= goocanvas.3:${PORTSDIR}/graphics/goocanvas
+USE_GIR= gtk20
+GIR_FILES= GooCanvas-0.10
+.endif
+
+. for component in ${USE_GIR:C/^([^:]+).*/\1/}
+CLEAR_DEPS+= ${${component}_GIR}
+BUILD_DEPENDS+= ${GIRDIR}/${${component}_GIR}.gir:${PORTSDIR}/${${component}_CATEGORY}/gir-repository-${component}
+RUN_DEPENDS+= ${GIRDIR}/${${component}_GIR}.gir:${PORTSDIR}/${${component}_CATEGORY}/gir-repository-${component}
+. endfor
+
+pre-patch:
+# disable all components
+.for component in ${_USE_GIR_ALL}
+ @${REINPLACE_CMD} -e 's|have_${component}=true|have_${component}=false|g' \
+ ${WRKSRC}/configure
+.endfor
+.if defined(DEP_NAMES)
+# enable components
+.for component in ${DEP_NAMES}
+ @${REINPLACE_CMD} -e 's|have_${component}=false|have_${component}=true|g' \
+ ${WRKSRC}/configure
+.endfor
+.endif
+
+post-configure:
+.if defined(CLEAR_DEPS)
+# clear Makefile targets
+. for dep in ${CLEAR_DEPS}
+ @${REINPLACE_CMD} -e 's|${dep}.gir||g' \
+ ${WRKSRC}/gir/Makefile
+. endfor
+.endif
+
+.if !target(post-install-script)
+post-install-script:
+# build plist
+.for gir in ${GIR_FILES}
+ @${ECHO} ${TYPELIBDIR_REL}/${gir}.typelib >> ${TMPPLIST}
+ @${ECHO} ${GIRDIR_REL}/${gir}.gir >> ${TMPPLIST}
+.endfor
+.for lib in ${LIB_FILES}
+ @${ECHO} lib/libgirepo-${lib}-custom.a >> ${TMPPLIST}
+ @${ECHO} lib/libgirepo-${lib}-custom.la >> ${TMPPLIST}
+ @${ECHO} lib/libgirepo-${lib}-custom.so >> ${TMPPLIST}
+.endfor
+ @${ECHO_CMD} "@unexec rmdir %D/${TYPELIBDIR_REL} 2>/dev/null || true" >> ${TMPPLIST}
+ @${ECHO_CMD} "@unexec rmdir %D/${GIRDIR_REL} 2>/dev/null || true" >> ${TMPPLIST}
+.endif
+
+.endif
+
+.include <bsd.port.mk>
diff --git a/devel/gir-repository/distinfo b/devel/gir-repository/distinfo
new file mode 100644
index 000000000000..4854a4c38c10
--- /dev/null
+++ b/devel/gir-repository/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gir-repository-0.6.5.tar.bz2) = f161fa1ae161e81117af6f4bb79bf344
+SHA256 (gnome2/gir-repository-0.6.5.tar.bz2) = cbeadc6c701f376134c9fe288fe0d95a725d9fa398daaeeb6621c35e8bafcae1
+SIZE (gnome2/gir-repository-0.6.5.tar.bz2) = 264148
diff --git a/devel/gir-repository/files/patch-gir_Makefile.in b/devel/gir-repository/files/patch-gir_Makefile.in
new file mode 100644
index 000000000000..0e35a1b80a26
--- /dev/null
+++ b/devel/gir-repository/files/patch-gir_Makefile.in
@@ -0,0 +1,39 @@
+--- gir/Makefile.in.orig 2009-09-10 16:15:05.000000000 -0400
++++ gir/Makefile.in 2009-09-10 17:32:05.000000000 -0400
+@@ -413,7 +413,7 @@ libgirepo_DBus_custom_la_SOURCES = \
+
+ @BUILD_GCONF_TRUE@GCONF_INCLUDEDIR = `pkg-config --variable=includedir gconf-2.0`/gconf/2
+ @BUILD_SOUP_TRUE@SOUP_INCLUDEDIR = `pkg-config --variable=includedir libsoup-2.4`/libsoup-2.4
+-@BUILD_SOUP_TRUE@SOUP_HDRS = $(shell echo $(SOUP_INCLUDEDIR)/libsoup/*.h | sed -re 's,[^ \t]+/soup-(gnome[a-z-]*|cookie-jar-sqlite)\.h[ \t]?,,g')
++@BUILD_SOUP_TRUE@SOUP_HDRS = $(shell echo $(SOUP_INCLUDEDIR)/libsoup/*.h | sed -Ee 's,[^ \t]+/soup-(gnome[a-z-]*|cookie-jar-sqlite)\.h[ \t]?,,g')
+ @BUILD_GNOMEKEYRING_TRUE@GNOMEKEYRING_INCLUDEDIR = `pkg-config --variable=includedir gnome-keyring-1`/gnome-keyring-1
+
+ # pango
+@@ -1384,16 +1384,16 @@ uninstall-am: uninstall-dist_girDATA uni
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --output $@ \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ $(GSTFFT_INCLUDEDIR)/gst/fft/*h
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@GstInterfaces-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
+-@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ $(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstInterfaces --nsversion=0.10 \
++@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ $(DEBUG) csh -c "$(INTROSPECTION_SCANNER) -v --namespace GstInterfaces --nsversion=0.10 \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --add-include-path=$(srcdir) --add-include-path=. \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --include=Gst-0.10 \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --library=gstinterfaces-0.10 \
+-@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --libtool="$(LIBTOOL)" \
++@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --libtool=\"$(LIBTOOL)\" \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --pkg gobject-2.0 \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --pkg gstreamer-0.10 \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --pkg gstreamer-interfaces-0.10 \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --output $@ \
+-@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ $(GSTINTERFACES_INCLUDEDIR)/gst/interfaces/{colorbalance,colorbalancechannel,interfaces-enumtypes,mixer,mixeroptions,mixertrack,navigation,propertyprobe,tuner,tunerchannel,tunernorm,videoorientation,xoverlay}*h
++@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ $(GSTINTERFACES_INCLUDEDIR)/gst/interfaces/{colorbalance,colorbalancechannel,interfaces-enumtypes,mixer,mixeroptions,mixertrack,navigation,propertyprobe,tuner,tunerchannel,tunernorm,videoorientation,xoverlay}*h"
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@GstNetbuffer-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ $(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstNetbuffer --nsversion=0.10 \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --add-include-path=$(srcdir) --add-include-path=. \
+@@ -1479,6 +1479,7 @@ uninstall-am: uninstall-dist_girDATA uni
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --include=Gst-0.10 \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --include=GstBase-0.10 \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --library=gstvideo-0.10 \
++@BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --library=gstbasevideo-0.10 \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --libtool="$(LIBTOOL)" \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --pkg gobject-2.0 \
+ @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@ --pkg gstreamer-0.10 \
diff --git a/devel/gir-repository/pkg-descr b/devel/gir-repository/pkg-descr
new file mode 100644
index 000000000000..8371c3027d98
--- /dev/null
+++ b/devel/gir-repository/pkg-descr
@@ -0,0 +1 @@
+This is a repository of GIR interface description files.
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 3324b19ee89d..2d9de63ed894 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.143 2009/03/27 18:52:46 marcus Exp $
+# $MCom: ports/devel/glib20/Makefile,v 1.155 2009/10/07 22:03:54 kwm Exp $
#
# !! DON'T FORGET ABOUT devel/gio-fam-backend !!
PORTNAME= glib
-PORTVERSION= 2.20.5
+PORTVERSION= 2.22.2
PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index ef73e57d56ec..30b626bb630c 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.20.5.tar.bz2) = 4c178b91d82ef80a2da3c26b772569c0
-SHA256 (gnome2/glib-2.20.5.tar.bz2) = 88f092769df5ce9f784c1068a3055ede00ada503317653984101d5393de63655
-SIZE (gnome2/glib-2.20.5.tar.bz2) = 5037738
+MD5 (gnome2/glib-2.22.2.tar.bz2) = 846a86c74b74d5b16826aa5508940f9b
+SHA256 (gnome2/glib-2.22.2.tar.bz2) = a4a41d02fc2d3f5effa1fc3466918e0b3ab60e9eb0a08139b997f2649cbacca3
+SIZE (gnome2/glib-2.22.2.tar.bz2) = 5490926
diff --git a/devel/glib20/files/extra-patch-glib_Makefile.in b/devel/glib20/files/extra-patch-glib_Makefile.in
index 4791780e29cc..01f856f74c03 100644
--- a/devel/glib20/files/extra-patch-glib_Makefile.in
+++ b/devel/glib20/files/extra-patch-glib_Makefile.in
@@ -1,11 +1,11 @@
---- glib/Makefile.in.orig 2008-12-01 16:15:34.000000000 -0500
-+++ glib/Makefile.in 2008-12-01 16:16:03.000000000 -0500
-@@ -272,7 +272,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
+--- glib/Makefile.in.orig 2009-05-31 13:14:18.000000000 +0200
++++ glib/Makefile.in 2009-05-31 13:15:08.000000000 +0200
+@@ -272,7 +272,7 @@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -licui18n
+ LIBASYNCNS_LIBADD = @LIBASYNCNS_LIBADD@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 0345b8acd046..4699afdbedd4 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig 2008-11-24 13:44:42.000000000 -0600
-+++ configure 2008-11-24 13:50:51.000000000 -0600
-@@ -29576,6 +29576,12 @@
+--- configure.orig 2009-09-05 10:54:38.000000000 +0200
++++ configure 2009-09-05 10:56:40.000000000 +0200
+@@ -29571,6 +29571,12 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -13,16 +13,16 @@
int
main ()
{
-@@ -31407,7 +31413,7 @@
+@@ -31611,7 +31617,7 @@ done
--for ac_func in chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
-+for ac_func in chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
+-for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
++for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
do
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -36810,6 +36816,8 @@
+@@ -39943,6 +39949,8 @@ fi
;;
esac
fi
diff --git a/devel/glib20/files/patch-gio_libasyncns_asyncns.c b/devel/glib20/files/patch-gio_libasyncns_asyncns.c
new file mode 100644
index 000000000000..966dd27a689b
--- /dev/null
+++ b/devel/glib20/files/patch-gio_libasyncns_asyncns.c
@@ -0,0 +1,11 @@
+--- gio/libasyncns/asyncns.c.orig 2009-05-05 15:25:10.000000000 -0400
++++ gio/libasyncns/asyncns.c 2009-05-05 15:25:51.000000000 -0400
+@@ -35,6 +35,8 @@
+ #include <errno.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
++#include <sys/time.h>
++#include <sys/resource.h>
+ #include <pwd.h>
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in
new file mode 100644
index 000000000000..8dd7ae74bb82
--- /dev/null
+++ b/devel/glib20/files/patch-glib_Makefile.in
@@ -0,0 +1,22 @@
+--- glib/Makefile.in.orig 2009-09-30 09:37:39.000000000 +0200
++++ glib/Makefile.in 2009-09-30 09:38:48.000000000 +0200
+@@ -1396,7 +1396,7 @@
+
+ info-am:
+
+-install-data-am: install-data-local install-dist_gdbSCRIPTS \
++install-data-am: install-data-local \
+ install-glibincludeHEADERS install-glibsubincludeHEADERS
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+@@ -1603,9 +1603,7 @@
+ libglib-gdb.py: libglib-gdb.py.in
+ sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
+
+-install-data-hook: libglib-gdb.py
+- mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
+- $(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
++install-data-hook:
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/files/patch-gobject_Makefile.in b/devel/glib20/files/patch-gobject_Makefile.in
new file mode 100644
index 000000000000..b8842a6f46e4
--- /dev/null
+++ b/devel/glib20/files/patch-gobject_Makefile.in
@@ -0,0 +1,22 @@
+--- gobject/Makefile.in.orig 2009-09-30 09:39:51.000000000 +0200
++++ gobject/Makefile.in 2009-09-30 09:40:17.000000000 +0200
+@@ -1186,7 +1186,7 @@ info: info-recursive
+
+ info-am:
+
+-install-data-am: install-data-local install-dist_gdbSCRIPTS \
++install-data-am: install-data-local \
+ install-libgobjectincludeHEADERS
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+@@ -1393,9 +1393,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
+ uninstall-gdb:
+ -rm -r $(DESTDIR)$(datadir)/gdb
+
+-install-data-hook: libgobject-gdb.py
+- mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)
+- $(INSTALL) libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
++install-data-hook:
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index b52b531e14c9..4e011916cd1a 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -5,10 +5,14 @@ bin/gobject-query
bin/gtester
bin/gtester-report
include/gio-unix-2.0/gio/gdesktopappinfo.h
+include/gio-unix-2.0/gio/gunixconnection.h
+include/gio-unix-2.0/gio/gunixfdmessage.h
include/gio-unix-2.0/gio/gunixinputstream.h
include/gio-unix-2.0/gio/gunixmounts.h
include/gio-unix-2.0/gio/gunixoutputstream.h
+include/gio-unix-2.0/gio/gunixsocketaddress.h
include/glib-2.0/gio/gappinfo.h
+include/glib-2.0/gio/gasyncinitable.h
include/glib-2.0/gio/gasyncresult.h
include/glib-2.0/gio/gbufferedinputstream.h
include/glib-2.0/gio/gbufferedoutputstream.h
@@ -25,12 +29,16 @@ include/glib-2.0/gio/gfileenumerator.h
include/glib-2.0/gio/gfileicon.h
include/glib-2.0/gio/gfileinfo.h
include/glib-2.0/gio/gfileinputstream.h
+include/glib-2.0/gio/gfileiostream.h
include/glib-2.0/gio/gfilemonitor.h
include/glib-2.0/gio/gfilenamecompleter.h
include/glib-2.0/gio/gfileoutputstream.h
include/glib-2.0/gio/gfilterinputstream.h
include/glib-2.0/gio/gfilteroutputstream.h
include/glib-2.0/gio/gicon.h
+include/glib-2.0/gio/ginetaddress.h
+include/glib-2.0/gio/ginetsocketaddress.h
+include/glib-2.0/gio/ginitable.h
include/glib-2.0/gio/ginputstream.h
include/glib-2.0/gio/gio.h
include/glib-2.0/gio/gioenums.h
@@ -38,6 +46,7 @@ include/glib-2.0/gio/gioenumtypes.h
include/glib-2.0/gio/gioerror.h
include/glib-2.0/gio/giomodule.h
include/glib-2.0/gio/gioscheduler.h
+include/glib-2.0/gio/giostream.h
include/glib-2.0/gio/giotypes.h
include/glib-2.0/gio/gloadableicon.h
include/glib-2.0/gio/gmemoryinputstream.h
@@ -45,10 +54,25 @@ include/glib-2.0/gio/gmemoryoutputstream.h
include/glib-2.0/gio/gmount.h
include/glib-2.0/gio/gmountoperation.h
include/glib-2.0/gio/gnativevolumemonitor.h
+include/glib-2.0/gio/gnetworkaddress.h
+include/glib-2.0/gio/gnetworkservice.h
include/glib-2.0/gio/goutputstream.h
+include/glib-2.0/gio/gresolver.h
include/glib-2.0/gio/gseekable.h
include/glib-2.0/gio/gsimpleasyncresult.h
+include/glib-2.0/gio/gsocket.h
+include/glib-2.0/gio/gsocketaddress.h
+include/glib-2.0/gio/gsocketaddressenumerator.h
+include/glib-2.0/gio/gsocketclient.h
+include/glib-2.0/gio/gsocketconnectable.h
+include/glib-2.0/gio/gsocketconnection.h
+include/glib-2.0/gio/gsocketcontrolmessage.h
+include/glib-2.0/gio/gsocketlistener.h
+include/glib-2.0/gio/gsocketservice.h
+include/glib-2.0/gio/gsrvtarget.h
+include/glib-2.0/gio/gtcpconnection.h
include/glib-2.0/gio/gthemedicon.h
+include/glib-2.0/gio/gthreadedsocketservice.h
include/glib-2.0/gio/gvfs.h
include/glib-2.0/gio/gvolume.h
include/glib-2.0/gio/gvolumemonitor.h
@@ -72,6 +96,7 @@ include/glib-2.0/glib/gerror.h
include/glib-2.0/glib/gfileutils.h
include/glib-2.0/glib/ghash.h
include/glib-2.0/glib/ghook.h
+include/glib-2.0/glib/ghostutils.h
include/glib-2.0/glib/gi18n-lib.h
include/glib-2.0/glib/gi18n.h
include/glib-2.0/glib/giochannel.h
diff --git a/devel/glibmm-reference/Makefile b/devel/glibmm-reference/Makefile
index 374530532064..08cf80637676 100644
--- a/devel/glibmm-reference/Makefile
+++ b/devel/glibmm-reference/Makefile
@@ -18,8 +18,6 @@ DOCSDIR= ${PREFIX}/share/doc/glibmm-2.4
post-patch:
@${FIND} ${WRKSRC}/examples -name Makefile.in \
| ${XARGS} ${REINPLACE_CMD} -e '/^install-am:/ s| all-am||'
- @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-gmmproc_binSCRIPTS||' \
- ${WRKSRC}/docs/reference/Makefile.in
post-build:
@${TOUCH} ${WRKSRC}/docs/reference/html/index.html
diff --git a/devel/glibmm-reference/pkg-plist b/devel/glibmm-reference/pkg-plist
index 5c869b97fd41..47b85bb36caa 100644
--- a/devel/glibmm-reference/pkg-plist
+++ b/devel/glibmm-reference/pkg-plist
@@ -1,7 +1,10 @@
-%%PORTDOCS%%lib/glibmm-%%API_VERSION%%/proc/doxygen_to_devhelp.xsl
-%%PORTDOCS%%share/devhelp/books/glibmm-%%API_VERSION%%/glibmm-%%API_VERSION%%.devhelp
+%%PORTDOCS%%share/glibmm-%%API_VERSION%%/doctool/doc-install.pl
+%%PORTDOCS%%share/glibmm-%%API_VERSION%%/doctool/doc-postprocess.pl
+%%PORTDOCS%%share/glibmm-%%API_VERSION%%/doctool/doxygen.css
+%%PORTDOCS%%share/glibmm-%%API_VERSION%%/doctool/tagfile-to-devhelp2.xsl
+%%PORTDOCS%%share/devhelp/books/glibmm-%%API_VERSION%%/glibmm-%%API_VERSION%%.devhelp2
%%PORTDOCS%%@dirrmtry share/devhelp/books/glibmm-%%API_VERSION%%
%%PORTDOCS%%@dirrmtry share/devhelp/books
%%PORTDOCS%%@dirrmtry share/devhelp
-%%PORTDOCS%%@dirrmtry lib/glibmm-%%API_VERSION%%/proc
-%%PORTDOCS%%@dirrmtry lib/glibmm-%%API_VERSION%%
+%%PORTDOCS%%@dirrmtry share/glibmm-%%API_VERSION%%/doctool
+%%PORTDOCS%%@dirrmtry share/glibmm-%%API_VERSION%%
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index a933b8da6341..2ea3d95b2512 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.72 2009/03/16 08:23:53 kwm Exp $
+# $MCom: ports/devel/glibmm/Makefile,v 1.82 2009/09/21 19:47:13 kwm Exp $
#
PORTNAME= glibmm
-PORTVERSION= 2.20.1
+PORTVERSION= 2.22.1
PORTREVISION?= 0
PORTEPOCH= 1
CATEGORIES= devel
@@ -31,17 +31,13 @@ USE_GNOME= gnomehack glib20 ltverhack
USE_PERL5= yes
USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --enable-static
+CONFIGURE_ARGS= --enable-static --disable-documentation
post-patch:
.for d in docs examples tests
@${REINPLACE_CMD} -e '/^SUBDIRS = /s/${d}//' ${WRKSRC}/Makefile.in
.endfor
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/docs/reference/beautify_docs.pl \
- ${PREFIX}/lib/glibmm-2.4/proc
-
.include <bsd.port.mk>
.endif
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index c24857233b1f..96ae66df32bd 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glibmm-2.20.1.tar.bz2) = 6d5e3cf93543754881cd80df796ca358
-SHA256 (gnome2/glibmm-2.20.1.tar.bz2) = 8436e9f775a6ee0b4dd407fb6cb708a76e90e6255fe2fffffcd5f885d865651b
-SIZE (gnome2/glibmm-2.20.1.tar.bz2) = 7608179
+MD5 (gnome2/glibmm-2.22.1.tar.bz2) = 1a96c7fde75ddbb421bc23fb4aa7adba
+SHA256 (gnome2/glibmm-2.22.1.tar.bz2) = f105ff4afdcdf7da7f310affdbe698058958f01e94ab65ac1c35e46e20ecb6c0
+SIZE (gnome2/glibmm-2.22.1.tar.bz2) = 3480822
diff --git a/devel/glibmm/files/patch-docs::reference::beautify_docs.pl b/devel/glibmm/files/patch-docs::reference::beautify_docs.pl
deleted file mode 100644
index bbb320452629..000000000000
--- a/devel/glibmm/files/patch-docs::reference::beautify_docs.pl
+++ /dev/null
@@ -1,20 +0,0 @@
---- docs/reference/beautify_docs.pl.in.orig Thu Feb 12 02:52:02 2004
-+++ docs/reference/beautify_docs.pl.in Thu Feb 12 03:00:08 2004
-@@ -25,7 +25,7 @@
- my ($file) = @_;
- my @outbuf;
-
-- open(FILE, '<', $file);
-+ open(FILE, "<$file");
-
- while(<FILE>)
- {
-@@ -71,7 +71,7 @@
- push(@outbuf, $_);
- }
-
-- open(FILE, '>', $file);
-+ open(FILE, ">$file");
-
- # write the whole buffer back
- print FILE "$_" foreach(@outbuf);
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index f059558d4def..ba8a266b3414 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -20,6 +20,7 @@ include/giomm-%%API_VERSION%%/giomm/fileenumerator.h
include/giomm-%%API_VERSION%%/giomm/fileicon.h
include/giomm-%%API_VERSION%%/giomm/fileinfo.h
include/giomm-%%API_VERSION%%/giomm/fileinputstream.h
+include/giomm-%%API_VERSION%%/giomm/fileiostream.h
include/giomm-%%API_VERSION%%/giomm/filemonitor.h
include/giomm-%%API_VERSION%%/giomm/filenamecompleter.h
include/giomm-%%API_VERSION%%/giomm/fileoutputstream.h
@@ -28,6 +29,7 @@ include/giomm-%%API_VERSION%%/giomm/filteroutputstream.h
include/giomm-%%API_VERSION%%/giomm/icon.h
include/giomm-%%API_VERSION%%/giomm/init.h
include/giomm-%%API_VERSION%%/giomm/inputstream.h
+include/giomm-%%API_VERSION%%/giomm/iostream.h
include/giomm-%%API_VERSION%%/giomm/loadableicon.h
include/giomm-%%API_VERSION%%/giomm/memoryinputstream.h
include/giomm-%%API_VERSION%%/giomm/memoryoutputstream.h
@@ -54,6 +56,7 @@ include/giomm-%%API_VERSION%%/giomm/private/fileenumerator_p.h
include/giomm-%%API_VERSION%%/giomm/private/fileicon_p.h
include/giomm-%%API_VERSION%%/giomm/private/fileinfo_p.h
include/giomm-%%API_VERSION%%/giomm/private/fileinputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/fileiostream_p.h
include/giomm-%%API_VERSION%%/giomm/private/filemonitor_p.h
include/giomm-%%API_VERSION%%/giomm/private/filenamecompleter_p.h
include/giomm-%%API_VERSION%%/giomm/private/fileoutputstream_p.h
@@ -61,6 +64,7 @@ include/giomm-%%API_VERSION%%/giomm/private/filterinputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/filteroutputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/icon_p.h
include/giomm-%%API_VERSION%%/giomm/private/inputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/iostream_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
@@ -80,6 +84,7 @@ include/giomm-%%API_VERSION%%/giomm/unixoutputstream.h
include/giomm-%%API_VERSION%%/giomm/volume.h
include/giomm-%%API_VERSION%%/giomm/volumemonitor.h
include/giomm-%%API_VERSION%%/giomm/wrap_init.h
+include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs/generate_extra_defs.h
include/glibmm-%%API_VERSION%%/glibmm.h
include/glibmm-%%API_VERSION%%/glibmm/arrayhandle.h
include/glibmm-%%API_VERSION%%/glibmm/checksum.h
@@ -134,6 +139,7 @@ include/glibmm-%%API_VERSION%%/glibmm/private/spawn_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/thread_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/unicode_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/uriutils_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/valuearray_p.h
include/glibmm-%%API_VERSION%%/glibmm/property.h
include/glibmm-%%API_VERSION%%/glibmm/propertyproxy.h
include/glibmm-%%API_VERSION%%/glibmm/propertyproxy_base.h
@@ -160,54 +166,53 @@ include/glibmm-%%API_VERSION%%/glibmm/utility.h
include/glibmm-%%API_VERSION%%/glibmm/value.h
include/glibmm-%%API_VERSION%%/glibmm/value_basictypes.h
include/glibmm-%%API_VERSION%%/glibmm/value_custom.h
+include/glibmm-%%API_VERSION%%/glibmm/valuearray.h
include/glibmm-%%API_VERSION%%/glibmm/wrap.h
include/glibmm-%%API_VERSION%%/glibmm/wrap_init.h
-include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs/generate_extra_defs.h
lib/giomm-%%API_VERSION%%/include/giommconfig.h
lib/glibmm-%%API_VERSION%%/include/glibmmconfig.h
-lib/glibmm-%%API_VERSION%%/proc/beautify_docs.pl
-lib/glibmm-%%API_VERSION%%/proc/generate_wrap_init.pl
-lib/glibmm-%%API_VERSION%%/proc/gmmproc
-lib/glibmm-%%API_VERSION%%/proc/m4/base.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_boxedtype.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_boxedtype_static.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_generic.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_gobject.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_gtkobject.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_interface.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_opaque_copyable.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_opaque_refcounted.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_shared.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/compare.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert_atk.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert_base.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert_gdk.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert_gio.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert_glib.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert_gtk.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert_gtkmm.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert_pango.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/ctor.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/doc.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/enum.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/gerror.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/list.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/member.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/method.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/property.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/signal.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/vfunc.m4
-lib/glibmm-%%API_VERSION%%/proc/pm/DocsParser.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/Enum.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/Function.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/FunctionBase.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/GtkDefs.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/Object.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/Output.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/Property.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/Util.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/WrapParser.pm
+lib/glibmm-%%VERSION%%/proc/generate_wrap_init.pl
+lib/glibmm-%%VERSION%%/proc/gmmproc
+lib/glibmm-%%VERSION%%/proc/m4/base.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_boxedtype.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_boxedtype_static.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_generic.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_gobject.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_gtkobject.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_interface.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_opaque_copyable.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_opaque_refcounted.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_shared.m4
+lib/glibmm-%%VERSION%%/proc/m4/compare.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert_atk.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert_base.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert_gdk.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert_gio.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert_glib.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert_gtk.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert_gtkmm.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert_pango.m4
+lib/glibmm-%%VERSION%%/proc/m4/ctor.m4
+lib/glibmm-%%VERSION%%/proc/m4/doc.m4
+lib/glibmm-%%VERSION%%/proc/m4/enum.m4
+lib/glibmm-%%VERSION%%/proc/m4/gerror.m4
+lib/glibmm-%%VERSION%%/proc/m4/list.m4
+lib/glibmm-%%VERSION%%/proc/m4/member.m4
+lib/glibmm-%%VERSION%%/proc/m4/method.m4
+lib/glibmm-%%VERSION%%/proc/m4/property.m4
+lib/glibmm-%%VERSION%%/proc/m4/signal.m4
+lib/glibmm-%%VERSION%%/proc/m4/vfunc.m4
+lib/glibmm-%%VERSION%%/proc/pm/DocsParser.pm
+lib/glibmm-%%VERSION%%/proc/pm/Enum.pm
+lib/glibmm-%%VERSION%%/proc/pm/Function.pm
+lib/glibmm-%%VERSION%%/proc/pm/FunctionBase.pm
+lib/glibmm-%%VERSION%%/proc/pm/GtkDefs.pm
+lib/glibmm-%%VERSION%%/proc/pm/Object.pm
+lib/glibmm-%%VERSION%%/proc/pm/Output.pm
+lib/glibmm-%%VERSION%%/proc/pm/Property.pm
+lib/glibmm-%%VERSION%%/proc/pm/Util.pm
+lib/glibmm-%%VERSION%%/proc/pm/WrapParser.pm
lib/libgiomm-%%VERSION%%.a
lib/libgiomm-%%VERSION%%.la
lib/libgiomm-%%VERSION%%.so
@@ -223,16 +228,16 @@ lib/libglibmm_generate_extra_defs-%%VERSION%%.so.1
libdata/pkgconfig/giomm-%%API_VERSION%%.pc
libdata/pkgconfig/glibmm-%%API_VERSION%%.pc
share/aclocal/glibmm_check_perl.m4
-@dirrm lib/glibmm-%%API_VERSION%%/proc/pm
@dirrm lib/glibmm-%%API_VERSION%%/proc/m4
+@dirrm lib/glibmm-%%API_VERSION%%/proc/pm
@dirrm lib/glibmm-%%API_VERSION%%/proc
@dirrm lib/glibmm-%%API_VERSION%%/include
@dirrm lib/glibmm-%%API_VERSION%%
@dirrm lib/giomm-%%API_VERSION%%/include
@dirrm lib/giomm-%%API_VERSION%%
-@dirrm include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs
@dirrm include/glibmm-%%API_VERSION%%/glibmm/private
@dirrm include/glibmm-%%API_VERSION%%/glibmm
+@dirrm include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs
@dirrm include/glibmm-%%API_VERSION%%
@dirrm include/giomm-%%API_VERSION%%/giomm/private
@dirrm include/giomm-%%API_VERSION%%/giomm
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 9ad6ec753637..76fd94e90ff3 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.12 2009/03/20 00:12:35 kwm Exp $
+# $MCom: ports/devel/gnome-common/Makefile,v 1.15 2009/09/26 13:41:58 marcus Exp $
#
PORTNAME= gnome-common
-PORTVERSION= 2.26.0
+PORTVERSION= 2.28.0
CATEGORIES= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo
index e580c92f4826..44876af2b061 100644
--- a/devel/gnome-common/distinfo
+++ b/devel/gnome-common/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/gnome-common-2.28.0.tar.bz2) = 30daabb0ca4898fea2647999e7813e8f
+SHA256 (gnome2/gnome-common-2.28.0.tar.bz2) = dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1
+SIZE (gnome2/gnome-common-2.28.0.tar.bz2) = 151535
diff --git a/devel/gnome-js-common/Makefile b/devel/gnome-js-common/Makefile
new file mode 100644
index 000000000000..ab20f1719349
--- /dev/null
+++ b/devel/gnome-js-common/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for: gnome-js-common
+# Date created: 19 July 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/gnome-js-common/Makefile,v 1.1 2009/07/30 02:40:56 avl Exp $
+#
+
+PORTNAME= gnome-js-common
+PORTVERSION= 0.1.1
+CATEGORIES= devel gnome
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME JavaScript common modules and tests
+
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_GMAKE= yes
+USE_GETTEXT= yes
+USE_GNOME= gnomehack intltool
+
+PORTDOCS= AUTHORS COPYING INSTALL NEWS README ChangeLog
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|== x|= x|g' \
+ ${WRKSRC}/configure
+.if !defined(NOPORTDOCS)
+ @${REINPLACE_CMD} -e 's|$${prefix}/doc/gnome_js_common|$${datarootdir}/doc/${PORTNAME}|' \
+ ${WRKSRC}/Makefile.in
+.else
+ @${REINPLACE_CMD} -e 's|install-gnome_js_commondocDATA ||g' ${WRKSRC}/Makefile.in
+.endif
+
+.include <bsd.port.mk>
diff --git a/devel/gnome-js-common/distinfo b/devel/gnome-js-common/distinfo
new file mode 100644
index 000000000000..ff081cb56a13
--- /dev/null
+++ b/devel/gnome-js-common/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gnome-js-common-0.1.1.tar.bz2) = 4f1c409a0be66d0df9dcdf15e9cf70ff
+SHA256 (gnome2/gnome-js-common-0.1.1.tar.bz2) = 6cad015cda5abfd2bccd6b95714ca39c83ca69ca7e6f7326dc75763a758dc8db
+SIZE (gnome2/gnome-js-common-0.1.1.tar.bz2) = 274010
diff --git a/devel/gnome-js-common/pkg-descr b/devel/gnome-js-common/pkg-descr
new file mode 100644
index 000000000000..c4c542fcb006
--- /dev/null
+++ b/devel/gnome-js-common/pkg-descr
@@ -0,0 +1,2 @@
+gnome-js-common is a module holding tests and JavaScript code useful
+or common to both Seed and gjs.
diff --git a/devel/gnome-js-common/pkg-plist b/devel/gnome-js-common/pkg-plist
new file mode 100644
index 000000000000..ad5ece3c146d
--- /dev/null
+++ b/devel/gnome-js-common/pkg-plist
@@ -0,0 +1,10 @@
+lib/gnome-js/ArrayUtils.js
+lib/gnome-js/JSON.js
+lib/gnome-js/lang.js
+lib/gnome-js/signals.js
+lib/gnome-js/tweener/equations.js
+lib/gnome-js/tweener/tweenList.js
+lib/gnome-js/tweener/tweener.js
+libdata/pkgconfig/gnome-js-common.pc
+@dirrm lib/gnome-js/tweener
+@dirrm lib/gnome-js
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 71376861d658..82041177a925 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfs/Makefile,v 1.185 2008/09/22 10:26:54 kwm Exp $
+# $MCom: ports/devel/gnome-vfs/Makefile,v 1.187 2009/10/10 16:04:54 marcus Exp $
#
PORTNAME= gnome-vfs
-PORTVERSION= 2.24.1
-PORTREVISION?= 1
+PORTVERSION= 2.24.2
+PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index ea83731f7f7e..63d1710811e0 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.24.1.tar.bz2) = 100f9af16dc659e375ee8da45175a28d
-SHA256 (gnome2/gnome-vfs-2.24.1.tar.bz2) = bc59144e303b152b84b86f209347a3e87a91d5ed7172d8503ee19c232dcabeb6
-SIZE (gnome2/gnome-vfs-2.24.1.tar.bz2) = 1936704
+MD5 (gnome2/gnome-vfs-2.24.2.tar.bz2) = 371d13e7306eb82e3fe3748a7584c440
+SHA256 (gnome2/gnome-vfs-2.24.2.tar.bz2) = 50ecf5f37d377492e8943a3c359ffe64176d4e7f045e9980790eca999a1c6856
+SIZE (gnome2/gnome-vfs-2.24.2.tar.bz2) = 1859173
diff --git a/devel/gnome-vfs/files/patch-configure b/devel/gnome-vfs/files/patch-configure
index df7bc5e67603..7865fc3fbb2c 100644
--- a/devel/gnome-vfs/files/patch-configure
+++ b/devel/gnome-vfs/files/patch-configure
@@ -1,41 +1,41 @@
---- configure.orig Mon Feb 12 14:15:37 2007
-+++ configure Mon Feb 12 14:15:37 2007
-@@ -5708,7 +5708,7 @@ fi
+--- configure.orig 2009-10-10 11:55:11.000000000 -0400
++++ configure 2009-10-10 11:55:14.000000000 -0400
+@@ -8433,7 +8433,7 @@ fi
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
+ inttypes.h stdint.h unistd.h sys/sysmacros.h
do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -22101,6 +22101,8 @@ echo $ECHO_N "checking for LC_MESSAGES..
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+@@ -14864,6 +14864,8 @@ $as_echo_n "checking for LC_MESSAGES...
if test "${am_cv_val_LC_MESSAGES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22147,6 +22149,7 @@ am_cv_val_LC_MESSAGES=no
- fi
- rm -f conftest.err conftest.$ac_objext \
+@@ -14911,6 +14913,7 @@ fi
+ rm -rf conftest.dSYM
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
- echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
- echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
-@@ -23612,6 +23615,7 @@ if test `eval echo '${'$as_ac_var'}'` =
+ { $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+ $as_echo "$am_cv_val_LC_MESSAGES" >&6; }
+@@ -16395,6 +16398,7 @@ as_val=`eval 'as_val=${'$as_ac_var'}
cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
+ LIBS="-lintl $LIBS"
have_ngettext=yes
else
- echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-@@ -33364,7 +33368,7 @@ if test "${openssl_libs+set}" = set; the
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+@@ -26068,7 +26072,7 @@ if test "${openssl_libs+set}" = set; the
+ $as_echo_n "(cached) " >&6
else
- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
@@ -43,8 +43,8 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33662,7 +33666,7 @@ if test "${openssl_libs+set}" = set; the
- echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -26363,7 +26367,7 @@ if test "${openssl_libs+set}" = set; the
+ $as_echo_n "(cached) " >&6
else
- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c
index c7fb1cf36dba..90fb33a41d77 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c
@@ -1,11 +1,18 @@
---- libgnomevfs/gnome-vfs-filesystem-type.c.orig 2007-09-17 14:48:45.000000000 -0400
-+++ libgnomevfs/gnome-vfs-filesystem-type.c 2007-09-17 14:50:06.000000000 -0400
-@@ -65,6 +65,8 @@ static struct FSInfo fs_data[] = {
- { "msdosfs" , N_("MSDOS Volume"), 0 },
+--- libgnomevfs/gnome-vfs-filesystem-type.c.orig 2009-10-08 10:03:36.000000000 -0400
++++ libgnomevfs/gnome-vfs-filesystem-type.c 2009-10-10 11:57:06.000000000 -0400
+@@ -70,6 +70,7 @@ static struct FSInfo fs_data[] = {
{ "nfs" , N_("NFS Network Volume"), 1 },
{ "ntfs" , N_("Windows NT Volume"), 0 },
+ { "ntfs-3g" , N_("Windows NT Volume"), 1 },
+ { "nullfs" , N_("BSD Loopback Volume"), 1 },
-+ { "zfs" , N_("ZFS Volume"), 1 },
+ { "nilfs2" , N_("NILFS Linux Volume"), 1 },
{ "nwfs" , N_("Netware Volume"), 0 },
{ "proc" , N_("System Volume"), 0 },
- { "procfs" , N_("System Volume"), 0 },
+@@ -90,6 +91,7 @@ static struct FSInfo fs_data[] = {
+ { "xenix" , N_("Xenix Volume"), 0 },
+ { "xfs" , N_("XFS Linux Volume"), 1 },
+ { "xiafs" , N_("XIAFS Volume"), 0 },
++ { "zfs" , N_("ZFS Volume"), 1 },
+ { "cifs" , N_("CIFS Volume"), 1 },
+ };
+
diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in
index 402f3449c6f9..0b97e9c55c64 100644
--- a/devel/gnome-vfs/pkg-deinstall.in
+++ b/devel/gnome-vfs/pkg-deinstall.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.20 2008/08/06 04:22:49 mezz Exp $
+# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.23 2009/11/28 05:58:59 mezz Exp $
#
# Restore gconf keys of libgnome.
diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in
index 19bf94479dab..018b36eccbf9 100644
--- a/devel/gnome-vfs/pkg-install.in
+++ b/devel/gnome-vfs/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.20 2008/08/06 04:22:49 mezz Exp $
+# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.23 2009/11/28 05:58:59 mezz Exp $
#
# Restore gconf keys of libgnome.
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 3a4d8fcbb7fe..31ce344648e6 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -120,6 +120,7 @@ share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/bn_IN/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -235,6 +236,8 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
@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/ast/LC_MESSAGES
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
new file mode 100644
index 000000000000..65c75bb77d53
--- /dev/null
+++ b/devel/gobject-introspection/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for: gobject-introspection
+# Date created: 19 July 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/gobject-introspection/Makefile,v 1.3 2009/09/06 07:37:44 avl Exp $
+#
+
+PORTNAME= gobject-introspection
+PORTVERSION= 0.6.5
+CATEGORIES= devel
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Generate interface introspection data for GObject libraries
+
+BUILD_DEPENDS= flex:${PORTSDIR}/textproc/flex
+LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi
+
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack glib20
+USE_PYTHON= yes
+USE_BISON= both
+USE_GETTEXT= yes
+USE_AUTOTOOLS= libtool:22
+USE_LDCONFIG= yes
+
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+MAN1= g-ir-compiler.1 g-ir-generate.1 g-ir-scanner.1
+
+.include <bsd.port.mk>
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
new file mode 100644
index 000000000000..e0e1e85cd07d
--- /dev/null
+++ b/devel/gobject-introspection/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gobject-introspection-0.6.5.tar.bz2) = c946cddf10f02a3aea483967ab6de605
+SHA256 (gnome2/gobject-introspection-0.6.5.tar.bz2) = fe1702200d45958cdfe3707952d64c3a541628b1203a9b2644db0ee2c6d5df79
+SIZE (gnome2/gobject-introspection-0.6.5.tar.bz2) = 608305
diff --git a/devel/gobject-introspection/files/patch-gir_Makefile.in b/devel/gobject-introspection/files/patch-gir_Makefile.in
new file mode 100644
index 000000000000..87ed2f06b2b8
--- /dev/null
+++ b/devel/gobject-introspection/files/patch-gir_Makefile.in
@@ -0,0 +1,14 @@
+--- gir/Makefile.in.orig 2009-08-29 18:41:56.000000000 -0400
++++ gir/Makefile.in 2009-08-29 18:49:29.000000000 -0400
+@@ -737,10 +737,9 @@ GLib-2.0.gir: $(SCANNER_BIN) $(SCANNER_L
+ --pkg glib-2.0 \
+ $(CPPFLAGS) \
+ -I$(GLIB_INCLUDEDIR) \
+- -I$(GLIB_LIBDIR)/glib-2.0/include \
+ -DGETTEXT_PACKAGE=Dummy \
+ -D__G_I18N_LIB_H__ \
+- $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
++ $(GLIB_INCLUDEDIR)/glibconfig.h \
+ $(srcdir)/glib-2.0.c \
+ -DGLIB_COMPILATION \
+ $(GLIB_INCLUDEDIR)/glib/*.h
diff --git a/devel/gobject-introspection/pkg-descr b/devel/gobject-introspection/pkg-descr
new file mode 100644
index 000000000000..9416d171f6da
--- /dev/null
+++ b/devel/gobject-introspection/pkg-descr
@@ -0,0 +1,9 @@
+GObject Introspection is a project for providing machine readable introspection
+data of the API of C libraries. This introspection data can be used in several
+different use cases, for example automatic code generation for bindings, API
+verification and documentation generation.
+
+GObject Introspection contains tools to generate and handle the introspection
+data.
+
+WWW: http://live.gnome.org/GObjectIntrospection
diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist
new file mode 100644
index 000000000000..7c39f85b51f8
--- /dev/null
+++ b/devel/gobject-introspection/pkg-plist
@@ -0,0 +1,109 @@
+bin/g-ir-compiler
+bin/g-ir-generate
+bin/g-ir-scanner
+include/gobject-introspection-1.0/girepository.h
+include/gobject-introspection-1.0/girffi.h
+lib/girepository-1.0/Everything-1.0.typelib
+lib/girepository-1.0/GIRepository-2.0.typelib
+lib/girepository-1.0/GL-1.0.typelib
+lib/girepository-1.0/GLib-2.0.typelib
+lib/girepository-1.0/GModule-2.0.typelib
+lib/girepository-1.0/GObject-2.0.typelib
+lib/girepository-1.0/Gio-2.0.typelib
+lib/girepository-1.0/cairo-1.0.typelib
+lib/girepository-1.0/fontconfig-2.0.typelib
+lib/girepository-1.0/freetype2-2.0.typelib
+lib/girepository-1.0/libxml2-2.0.typelib
+lib/girepository-1.0/xfixes-4.0.typelib
+lib/girepository-1.0/xft-2.0.typelib
+lib/girepository-1.0/xlib-2.0.typelib
+lib/gobject-introspection/giscanner/__init__.py
+lib/gobject-introspection/giscanner/__init__.pyc
+lib/gobject-introspection/giscanner/__init__.pyo
+lib/gobject-introspection/giscanner/_giscanner.a
+lib/gobject-introspection/giscanner/_giscanner.la
+lib/gobject-introspection/giscanner/_giscanner.so
+lib/gobject-introspection/giscanner/annotationparser.py
+lib/gobject-introspection/giscanner/annotationparser.pyc
+lib/gobject-introspection/giscanner/annotationparser.pyo
+lib/gobject-introspection/giscanner/ast.py
+lib/gobject-introspection/giscanner/ast.pyc
+lib/gobject-introspection/giscanner/ast.pyo
+lib/gobject-introspection/giscanner/cachestore.py
+lib/gobject-introspection/giscanner/cachestore.pyc
+lib/gobject-introspection/giscanner/cachestore.pyo
+lib/gobject-introspection/giscanner/config.py
+lib/gobject-introspection/giscanner/config.pyc
+lib/gobject-introspection/giscanner/config.pyo
+lib/gobject-introspection/giscanner/dumper.py
+lib/gobject-introspection/giscanner/dumper.pyc
+lib/gobject-introspection/giscanner/dumper.pyo
+lib/gobject-introspection/giscanner/girparser.py
+lib/gobject-introspection/giscanner/girparser.pyc
+lib/gobject-introspection/giscanner/girparser.pyo
+lib/gobject-introspection/giscanner/girwriter.py
+lib/gobject-introspection/giscanner/girwriter.pyc
+lib/gobject-introspection/giscanner/girwriter.pyo
+lib/gobject-introspection/giscanner/glibast.py
+lib/gobject-introspection/giscanner/glibast.pyc
+lib/gobject-introspection/giscanner/glibast.pyo
+lib/gobject-introspection/giscanner/glibtransformer.py
+lib/gobject-introspection/giscanner/glibtransformer.pyc
+lib/gobject-introspection/giscanner/glibtransformer.pyo
+lib/gobject-introspection/giscanner/libtoolimporter.py
+lib/gobject-introspection/giscanner/libtoolimporter.pyc
+lib/gobject-introspection/giscanner/libtoolimporter.pyo
+lib/gobject-introspection/giscanner/minixpath.py
+lib/gobject-introspection/giscanner/minixpath.pyc
+lib/gobject-introspection/giscanner/minixpath.pyo
+lib/gobject-introspection/giscanner/odict.py
+lib/gobject-introspection/giscanner/odict.pyc
+lib/gobject-introspection/giscanner/odict.pyo
+lib/gobject-introspection/giscanner/scannermain.py
+lib/gobject-introspection/giscanner/scannermain.pyc
+lib/gobject-introspection/giscanner/scannermain.pyo
+lib/gobject-introspection/giscanner/shlibs.py
+lib/gobject-introspection/giscanner/shlibs.pyc
+lib/gobject-introspection/giscanner/shlibs.pyo
+lib/gobject-introspection/giscanner/sourcescanner.py
+lib/gobject-introspection/giscanner/sourcescanner.pyc
+lib/gobject-introspection/giscanner/sourcescanner.pyo
+lib/gobject-introspection/giscanner/transformer.py
+lib/gobject-introspection/giscanner/transformer.pyc
+lib/gobject-introspection/giscanner/transformer.pyo
+lib/gobject-introspection/giscanner/utils.py
+lib/gobject-introspection/giscanner/utils.pyc
+lib/gobject-introspection/giscanner/utils.pyo
+lib/gobject-introspection/giscanner/xmlwriter.py
+lib/gobject-introspection/giscanner/xmlwriter.pyc
+lib/gobject-introspection/giscanner/xmlwriter.pyo
+lib/libgirepository-1.0.a
+lib/libgirepository-1.0.la
+lib/libgirepository-1.0.so
+lib/libgirepository-1.0.so.0
+lib/libgirepository-everything-1.0.a
+lib/libgirepository-everything-1.0.la
+lib/libgirepository-everything-1.0.so
+lib/libgirepository-everything-1.0.so.1
+libdata/pkgconfig/gobject-introspection-1.0.pc
+libdata/pkgconfig/gobject-introspection-no-export-1.0.pc
+share/aclocal/introspection.m4
+share/gir-1.0/Everything-1.0.gir
+share/gir-1.0/GIRepository-2.0.gir
+share/gir-1.0/GL-1.0.gir
+share/gir-1.0/GLib-2.0.gir
+share/gir-1.0/GModule-2.0.gir
+share/gir-1.0/GObject-2.0.gir
+share/gir-1.0/Gio-2.0.gir
+share/gir-1.0/cairo-1.0.gir
+share/gir-1.0/fontconfig-2.0.gir
+share/gir-1.0/freetype2-2.0.gir
+share/gir-1.0/libxml2-2.0.gir
+share/gir-1.0/xfixes-4.0.gir
+share/gir-1.0/xft-2.0.gir
+share/gir-1.0/xlib-2.0.gir
+@dirrm include/gobject-introspection-1.0
+@dirrmtry lib/girepository-1.0
+@dirrm lib/gobject-introspection/giscanner
+@dirrm lib/gobject-introspection
+@dirrmtry share/gir-1.0
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 7e6774502fa5..e0a5d7acdc20 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/devel/gvfs/Makefile,v 1.2 2009/04/24 04:38:36 marcus Exp $
+# $MCom: ports/devel/gvfs/Makefile,v 1.54 2009/10/19 19:42:40 kwm Exp $
#
PORTNAME= gvfs
-PORTVERSION= 1.2.3
-PORTREVISION= 2
+PORTVERSION= 1.4.1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index 27474efc6b6c..36690bfa939d 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gvfs-1.2.3.tar.bz2) = 04a7f9c892b962cfedf0637dd2b01196
-SHA256 (gnome2/gvfs-1.2.3.tar.bz2) = 395d480c1b64504ba75a8deb70ef6790f2ff07538fca73ef1d26a996223e5879
-SIZE (gnome2/gvfs-1.2.3.tar.bz2) = 1041079
+MD5 (gnome2/gvfs-1.4.1.tar.bz2) = 6eff809d50e618f289d5192724a049de
+SHA256 (gnome2/gvfs-1.4.1.tar.bz2) = e281b1d173cecd53948317b73b458b3cffcf0cdaa7ee1568aa71db30c4e31ea5
+SIZE (gnome2/gvfs-1.4.1.tar.bz2) = 1249982
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
index a10939f60b43..77685a582e98 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -12,6 +12,7 @@ bin/gvfs-open
bin/gvfs-rename
bin/gvfs-rm
bin/gvfs-save
+bin/gvfs-set-attribute
bin/gvfs-trash
bin/gvfs-tree
etc/profile.d/gvfs-bash-completion.sh
@@ -43,12 +44,14 @@ libexec/gvfsd-ftp
%%GPHOTO2%%libexec/gvfsd-gphoto2
libexec/gvfsd-http
libexec/gvfsd-localtest
+libexec/gvfsd-metadata
libexec/gvfsd-network
libexec/gvfsd-sftp
%%SMB%%libexec/gvfsd-smb
%%SMB%%libexec/gvfsd-smb-browse
libexec/gvfsd-trash
share/dbus-1/services/gvfs-daemon.service
+share/dbus-1/services/gvfs-metadata.service
%%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
%%ARCHIVE%%share/gvfs/mounts/archive.mount
@@ -73,8 +76,10 @@ 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/LC_MESSAGES/gvfs.mo
share/locale/bn_IN/LC_MESSAGES/gvfs.mo
share/locale/ca/LC_MESSAGES/gvfs.mo
+share/locale/ca@valencia/LC_MESSAGES/gvfs.mo
share/locale/cs/LC_MESSAGES/gvfs.mo
share/locale/da/LC_MESSAGES/gvfs.mo
share/locale/de/LC_MESSAGES/gvfs.mo
@@ -98,6 +103,7 @@ 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/mai/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
@@ -140,8 +146,12 @@ share/locale/zh_TW/LC_MESSAGES/gvfs.mo
@dirrmtry share/locale/sr@latin
@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/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
diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile
index 37d5331423db..ad53b2667d02 100644
--- a/devel/json-glib/Makefile
+++ b/devel/json-glib/Makefile
@@ -3,20 +3,22 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/json-glib/Makefile,v 1.5 2009/10/30 11:35:48 kwm Exp $
#
PORTNAME= json-glib
-PORTVERSION= 0.6.2
-PORTREVISION= 1
+PORTVERSION= 0.8.2
CATEGORIES= devel
-MASTER_SITES= http://folks.o-hand.com/~ebassi/sources/ \
- ${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= marcus:local
+MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= JSON (RFC 4627) interface for Glib
+BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
+RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
+
USE_GMAKE= yes
+USE_BZIP2= yes
USE_GNOME= glib20 gnomehack gnomeprefix ltverhack
USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
diff --git a/devel/json-glib/distinfo b/devel/json-glib/distinfo
index 8068b304c217..6d40520cedca 100644
--- a/devel/json-glib/distinfo
+++ b/devel/json-glib/distinfo
@@ -1,3 +1,3 @@
-MD5 (json-glib-0.6.2.tar.gz) = d98f5580035ad0b37fa11896053a57af
-SHA256 (json-glib-0.6.2.tar.gz) = 7befca7f7d7d65cbb260eacd86eff2c1dcae8d859ae2c3e3002e2536d02b2c49
-SIZE (json-glib-0.6.2.tar.gz) = 453865
+MD5 (json-glib-0.8.2.tar.bz2) = 5fcd08da526a60d28d0ced4524799231
+SHA256 (json-glib-0.8.2.tar.bz2) = 51d64ee2f70e7d8d67eca4c1b35575dd7aa2a08dad7662e53d6c6c60af7a3dde
+SIZE (json-glib-0.8.2.tar.bz2) = 392020
diff --git a/devel/json-glib/files/patch-json-glib_json-object.c b/devel/json-glib/files/patch-json-glib_json-object.c
deleted file mode 100644
index b01ae9261354..000000000000
--- a/devel/json-glib/files/patch-json-glib_json-object.c
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/json-glib/json-gobject.c b/json-glib/json-gobject.c
-index 15e9ed5..eeb571c 100644
---- json-glib/json-gobject.c
-+++ json-glib/json-gobject.c
-@@ -189,7 +189,7 @@ json_deserialize_pspec (GValue *value,
- {
- JsonArray *array = json_node_get_array (node);
- guint i, array_len = json_array_get_length (array);
-- GPtrArray *str_array = g_ptr_array_sized_new (array_len);
-+ GPtrArray *str_array = g_ptr_array_sized_new (array_len + 1);
-
- for (i = 0; i < array_len; i++)
- {
-@@ -201,6 +201,7 @@ json_deserialize_pspec (GValue *value,
- if (json_node_get_string (val) != NULL);
- g_ptr_array_add (str_array, (gpointer) json_node_get_string (val));
- }
-+ g_ptr_array_add (str_array, NULL);
-
- g_value_set_boxed (value, str_array->pdata);
-
diff --git a/devel/json-glib/pkg-plist b/devel/json-glib/pkg-plist
index 41dae00996b1..9a9ef319cbb6 100644
--- a/devel/json-glib/pkg-plist
+++ b/devel/json-glib/pkg-plist
@@ -5,6 +5,7 @@ include/json-glib-1.0/json-glib/json-gobject.h
include/json-glib-1.0/json-glib/json-parser.h
include/json-glib-1.0/json-glib/json-types.h
include/json-glib-1.0/json-glib/json-version.h
+lib/girepository-1.0/Json-1.0.typelib
lib/libjson-glib-1.0.a
lib/libjson-glib-1.0.la
lib/libjson-glib-1.0.so
@@ -12,20 +13,25 @@ lib/libjson-glib-1.0.so.0
libdata/pkgconfig/json-glib-1.0.pc
%%DOCSDIR%%/JsonGenerator.html
%%DOCSDIR%%/JsonParser.html
+%%DOCSDIR%%/annotation-glossary.html
%%DOCSDIR%%/ch01.html
%%DOCSDIR%%/ch02.html
%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
%%DOCSDIR%%/ix01.html
%%DOCSDIR%%/ix02.html
+%%DOCSDIR%%/ix03.html
+%%DOCSDIR%%/ix04.html
+%%DOCSDIR%%/ix05.html
%%DOCSDIR%%/json-advanced.html
%%DOCSDIR%%/json-base.html
%%DOCSDIR%%/json-glib-GObject-integration.html
-%%DOCSDIR%%/json-glib-JsonArray.html
-%%DOCSDIR%%/json-glib-JsonNode.html
-%%DOCSDIR%%/json-glib-JsonObject.html
+%%DOCSDIR%%/json-glib-JSON-Array.html
+%%DOCSDIR%%/json-glib-JSON-Node.html
+%%DOCSDIR%%/json-glib-JSON-Object.html
%%DOCSDIR%%/json-glib-Versioning-information.html
%%DOCSDIR%%/json-glib.devhelp
%%DOCSDIR%%/json-glib.devhelp2
@@ -37,6 +43,7 @@ libdata/pkgconfig/json-glib-1.0.pc
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
+share/gir-1.0/Json-1.0.gir
@dirrm %%DOCSDIR%%
@dirrm include/json-glib-1.0/json-glib
@dirrm include/json-glib-1.0
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index bb6585a84f0b..cb8647126e7b 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libbonobo/Makefile,v 1.76 2008/09/22 15:01:51 kwm Exp $
+# $MCom: ports/devel/libbonobo/Makefile,v 1.79 2009/09/26 13:41:58 marcus Exp $
#
PORTNAME= libbonobo
-PORTVERSION= 2.24.1
+PORTVERSION= 2.24.2
PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 86b00a131c95..866b1d4cbf5b 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libbonobo-2.24.1.tar.bz2) = 8868b6083392964a6969547ceb8d7cd1
-SHA256 (gnome2/libbonobo-2.24.1.tar.bz2) = 42b2ac58b86b2cc93fbbc65f94a3d1fcf5e8f33f728384653b30dbe456e91274
-SIZE (gnome2/libbonobo-2.24.1.tar.bz2) = 1464385
+MD5 (gnome2/libbonobo-2.24.2.tar.bz2) = 5c7c5ea9c2f78a3c1e9ff2f1e27ad751
+SHA256 (gnome2/libbonobo-2.24.2.tar.bz2) = 95c0230a31a657e1873fc601318bbaa16722986699219317053f1cd1aa2a28bf
+SIZE (gnome2/libbonobo-2.24.2.tar.bz2) = 1435635
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index 6242f7f60d4c..da47a7f20a8b 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -103,8 +103,10 @@ share/locale/be/LC_MESSAGES/libbonobo-2.0.mo
share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo
share/locale/bn/LC_MESSAGES/libbonobo-2.0.mo
share/locale/bn_IN/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/br/LC_MESSAGES/libbonobo-2.0.mo
share/locale/bs/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ca/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/libbonobo-2.0.mo
share/locale/cs/LC_MESSAGES/libbonobo-2.0.mo
share/locale/cy/LC_MESSAGES/libbonobo-2.0.mo
share/locale/da/LC_MESSAGES/libbonobo-2.0.mo
@@ -132,6 +134,7 @@ share/locale/is/LC_MESSAGES/libbonobo-2.0.mo
share/locale/it/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ja/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ka/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/kn/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ko/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ku/LC_MESSAGES/libbonobo-2.0.mo
share/locale/li/LC_MESSAGES/libbonobo-2.0.mo
@@ -212,6 +215,8 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
@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/as/LC_MESSAGES
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index d0d65267908c..b29e951f4ba3 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/libgdata/Makefile,v 1.3 2009/11/22 20:17:49 kwm Exp $
#
PORTNAME= libgdata
-PORTVERSION= 0.3.0
-PORTREVISION= 1
+PORTVERSION= 0.5.1
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/libgdata/distinfo b/devel/libgdata/distinfo
index 5abc3becc4fd..f04c6f721466 100644
--- a/devel/libgdata/distinfo
+++ b/devel/libgdata/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgdata-0.3.0.tar.bz2) = 54c4de90fd00cd6685cbdd8c5054abb7
-SHA256 (libgdata-0.3.0.tar.bz2) = 3f1eafefe20edb0f62bde8de4449702e2e0d4ae3323e5ec546543401bf372972
-SIZE (libgdata-0.3.0.tar.bz2) = 520977
+MD5 (libgdata-0.5.1.tar.bz2) = fc9be11d2f823bb16d6e03e2a0dda85d
+SHA256 (libgdata-0.5.1.tar.bz2) = 2b90f206063405ae6cf579ed3a090b0130e849e1ead02b2ad2ed4fc6d7f585a0
+SIZE (libgdata-0.5.1.tar.bz2) = 956689
diff --git a/devel/libgdata/pkg-plist b/devel/libgdata/pkg-plist
index b8c377bae37e..93d8dd06c693 100644
--- a/devel/libgdata/pkg-plist
+++ b/devel/libgdata/pkg-plist
@@ -1,17 +1,36 @@
+include/libgdata/gdata/atom/gdata-author.h
+include/libgdata/gdata/atom/gdata-category.h
+include/libgdata/gdata/atom/gdata-generator.h
+include/libgdata/gdata/atom/gdata-link.h
+include/libgdata/gdata/exif/gdata-exif-tags.h
+include/libgdata/gdata/gd/gdata-gd-email-address.h
+include/libgdata/gdata/gd/gdata-gd-im-address.h
+include/libgdata/gdata/gd/gdata-gd-name.h
+include/libgdata/gdata/gd/gdata-gd-organization.h
+include/libgdata/gdata/gd/gdata-gd-phone-number.h
+include/libgdata/gdata/gd/gdata-gd-postal-address.h
+include/libgdata/gdata/gd/gdata-gd-reminder.h
+include/libgdata/gdata/gd/gdata-gd-when.h
+include/libgdata/gdata/gd/gdata-gd-where.h
+include/libgdata/gdata/gd/gdata-gd-who.h
include/libgdata/gdata/gdata-access-handler.h
include/libgdata/gdata/gdata-access-rule.h
-include/libgdata/gdata/gdata-atom.h
+include/libgdata/gdata/gdata-download-stream.h
include/libgdata/gdata/gdata-entry.h
include/libgdata/gdata/gdata-enums.h
include/libgdata/gdata/gdata-feed.h
-include/libgdata/gdata/gdata-gdata.h
-include/libgdata/gdata/gdata-media-rss.h
include/libgdata/gdata/gdata-parsable.h
-include/libgdata/gdata/gdata-parser.h
include/libgdata/gdata/gdata-query.h
include/libgdata/gdata/gdata-service.h
include/libgdata/gdata/gdata-types.h
+include/libgdata/gdata/gdata-upload-stream.h
include/libgdata/gdata/gdata.h
+include/libgdata/gdata/georss/gdata-georss-where.h
+include/libgdata/gdata/media/gdata-media-category.h
+include/libgdata/gdata/media/gdata-media-content.h
+include/libgdata/gdata/media/gdata-media-credit.h
+include/libgdata/gdata/media/gdata-media-enums.h
+include/libgdata/gdata/media/gdata-media-thumbnail.h
include/libgdata/gdata/services/calendar/gdata-calendar-calendar.h
include/libgdata/gdata/services/calendar/gdata-calendar-event.h
include/libgdata/gdata/services/calendar/gdata-calendar-feed.h
@@ -20,33 +39,83 @@ include/libgdata/gdata/services/calendar/gdata-calendar-service.h
include/libgdata/gdata/services/contacts/gdata-contacts-contact.h
include/libgdata/gdata/services/contacts/gdata-contacts-query.h
include/libgdata/gdata/services/contacts/gdata-contacts-service.h
+include/libgdata/gdata/services/documents/gdata-documents-entry.h
+include/libgdata/gdata/services/documents/gdata-documents-enums.h
+include/libgdata/gdata/services/documents/gdata-documents-feed.h
+include/libgdata/gdata/services/documents/gdata-documents-folder.h
+include/libgdata/gdata/services/documents/gdata-documents-presentation.h
+include/libgdata/gdata/services/documents/gdata-documents-query.h
+include/libgdata/gdata/services/documents/gdata-documents-service.h
+include/libgdata/gdata/services/documents/gdata-documents-spreadsheet.h
+include/libgdata/gdata/services/documents/gdata-documents-text.h
+include/libgdata/gdata/services/picasaweb/gdata-picasaweb-album.h
+include/libgdata/gdata/services/picasaweb/gdata-picasaweb-enums.h
+include/libgdata/gdata/services/picasaweb/gdata-picasaweb-file.h
+include/libgdata/gdata/services/picasaweb/gdata-picasaweb-query.h
+include/libgdata/gdata/services/picasaweb/gdata-picasaweb-service.h
+include/libgdata/gdata/services/youtube/gdata-youtube-content.h
+include/libgdata/gdata/services/youtube/gdata-youtube-credit.h
include/libgdata/gdata/services/youtube/gdata-youtube-enums.h
include/libgdata/gdata/services/youtube/gdata-youtube-query.h
include/libgdata/gdata/services/youtube/gdata-youtube-service.h
+include/libgdata/gdata/services/youtube/gdata-youtube-state.h
include/libgdata/gdata/services/youtube/gdata-youtube-video.h
-include/libgdata/gdata/services/youtube/gdata-youtube.h
lib/libgdata.a
lib/libgdata.la
lib/libgdata.so
-lib/libgdata.so.4
+lib/libgdata.so.6
libdata/pkgconfig/libgdata.pc
share/doc/gdata/GDataAccessHandler.html
share/doc/gdata/GDataAccessRule.html
+share/doc/gdata/GDataAuthor.html
share/doc/gdata/GDataCalendarCalendar.html
share/doc/gdata/GDataCalendarEvent.html
share/doc/gdata/GDataCalendarFeed.html
share/doc/gdata/GDataCalendarQuery.html
share/doc/gdata/GDataCalendarService.html
+share/doc/gdata/GDataCategory.html
share/doc/gdata/GDataContactsContact.html
share/doc/gdata/GDataContactsQuery.html
share/doc/gdata/GDataContactsService.html
+share/doc/gdata/GDataDocumentsEntry.html
+share/doc/gdata/GDataDocumentsFeed.html
+share/doc/gdata/GDataDocumentsFolder.html
+share/doc/gdata/GDataDocumentsPresentation.html
+share/doc/gdata/GDataDocumentsQuery.html
+share/doc/gdata/GDataDocumentsService.html
+share/doc/gdata/GDataDocumentsSpreadsheet.html
+share/doc/gdata/GDataDocumentsText.html
+share/doc/gdata/GDataDownloadStream.html
share/doc/gdata/GDataEntry.html
share/doc/gdata/GDataFeed.html
+share/doc/gdata/GDataGDEmailAddress.html
+share/doc/gdata/GDataGDIMAddress.html
+share/doc/gdata/GDataGDOrganization.html
+share/doc/gdata/GDataGDPhoneNumber.html
+share/doc/gdata/GDataGDPostalAddress.html
+share/doc/gdata/GDataGDReminder.html
+share/doc/gdata/GDataGDWhen.html
+share/doc/gdata/GDataGDWhere.html
+share/doc/gdata/GDataGDWho.html
+share/doc/gdata/GDataGenerator.html
+share/doc/gdata/GDataLink.html
+share/doc/gdata/GDataMediaCategory.html
+share/doc/gdata/GDataMediaContent.html
+share/doc/gdata/GDataMediaCredit.html
+share/doc/gdata/GDataMediaThumbnail.html
share/doc/gdata/GDataParsable.html
+share/doc/gdata/GDataPicasaWebAlbum.html
+share/doc/gdata/GDataPicasaWebFile.html
+share/doc/gdata/GDataPicasaWebQuery.html
+share/doc/gdata/GDataPicasaWebService.html
share/doc/gdata/GDataQuery.html
share/doc/gdata/GDataService.html
+share/doc/gdata/GDataUploadStream.html
+share/doc/gdata/GDataYouTubeContent.html
+share/doc/gdata/GDataYouTubeCredit.html
share/doc/gdata/GDataYouTubeQuery.html
share/doc/gdata/GDataYouTubeService.html
+share/doc/gdata/GDataYouTubeState.html
share/doc/gdata/GDataYouTubeVideo.html
share/doc/gdata/api-index-full.html
share/doc/gdata/ch01.html
@@ -56,11 +125,13 @@ share/doc/gdata/ch04.html
share/doc/gdata/ch05.html
share/doc/gdata/ch06.html
share/doc/gdata/ch07.html
-share/doc/gdata/gdata-Atom-API.html
-share/doc/gdata/gdata-GData-API.html
+share/doc/gdata/ch08.html
+share/doc/gdata/ch09.html
+share/doc/gdata/ch10.html
+share/doc/gdata/ch11.html
+share/doc/gdata/ch12.html
+share/doc/gdata/data-flow.png
share/doc/gdata/gdata-GData-Types.html
-share/doc/gdata/gdata-Media-RSS-API.html
-share/doc/gdata/gdata-YouTube-API.html
share/doc/gdata/gdata-overview.html
share/doc/gdata/gdata.devhelp
share/doc/gdata/gdata.devhelp2
@@ -70,26 +141,58 @@ share/doc/gdata/index.sgml
share/doc/gdata/ix02.html
share/doc/gdata/ix03.html
share/doc/gdata/ix04.html
+share/doc/gdata/ix05.html
share/doc/gdata/left.png
-share/doc/gdata/object-tree.html
+share/doc/gdata/pt01.html
+share/doc/gdata/pt02.html
+share/doc/gdata/pt03.html
+share/doc/gdata/pt04.html
+share/doc/gdata/pt05.html
share/doc/gdata/right.png
share/doc/gdata/structure.png
share/doc/gdata/style.css
share/doc/gdata/up.png
+share/locale/ca/LC_MESSAGES/gdata.mo
share/locale/de/LC_MESSAGES/gdata.mo
share/locale/el/LC_MESSAGES/gdata.mo
share/locale/en_GB/LC_MESSAGES/gdata.mo
share/locale/es/LC_MESSAGES/gdata.mo
+share/locale/eu/LC_MESSAGES/gdata.mo
+share/locale/fr/LC_MESSAGES/gdata.mo
share/locale/gl/LC_MESSAGES/gdata.mo
+share/locale/hu/LC_MESSAGES/gdata.mo
+share/locale/nb/LC_MESSAGES/gdata.mo
+share/locale/pa/LC_MESSAGES/gdata.mo
+share/locale/pl/LC_MESSAGES/gdata.mo
+share/locale/pt/LC_MESSAGES/gdata.mo
+share/locale/pt_BR/LC_MESSAGES/gdata.mo
share/locale/sv/LC_MESSAGES/gdata.mo
+share/locale/uk/LC_MESSAGES/gdata.mo
+share/locale/zh_HK/LC_MESSAGES/gdata.mo
+share/locale/zh_TW/LC_MESSAGES/gdata.mo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/gl/LC_MESSAGES
@dirrmtry share/locale/gl
@dirrmtry share/locale/el/LC_MESSAGES
@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
@dirrm share/doc/gdata
@dirrm include/libgdata/gdata/services/youtube
+@dirrm include/libgdata/gdata/services/picasaweb
+@dirrm include/libgdata/gdata/services/documents
@dirrm include/libgdata/gdata/services/contacts
@dirrm include/libgdata/gdata/services/calendar
@dirrm include/libgdata/gdata/services
+@dirrm include/libgdata/gdata/media
+@dirrm include/libgdata/gdata/georss
+@dirrm include/libgdata/gdata/gd
+@dirrm include/libgdata/gdata/exif
+@dirrm include/libgdata/gdata/atom
@dirrm include/libgdata/gdata
@dirrm include/libgdata
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 261e52bda9ff..df81a5e98a3f 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/devel/libgtop/Makefile,v 1.1 2009/04/15 13:33:33 kwm Exp $
+# $MCom: ports/devel/libgtop/Makefile,v 1.52 2009/09/21 09:27:35 kwm Exp $
#
PORTNAME= libgtop
-PORTVERSION= 2.26.1
+PORTVERSION= 2.28.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index c104c4de753c..be335ea4e84c 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgtop-2.26.1.tar.bz2) = 49fe5c91a6bbc103a0a05c6854a6cc11
-SHA256 (gnome2/libgtop-2.26.1.tar.bz2) = 7762730a99c652695d8e2137a90519ce86fa245e22217dbf8d660ab4ed464385
-SIZE (gnome2/libgtop-2.26.1.tar.bz2) = 767089
+MD5 (gnome2/libgtop-2.28.0.tar.bz2) = f74fabd765452e9a6893852afa93a7c7
+SHA256 (gnome2/libgtop-2.28.0.tar.bz2) = 22a9c6241c5a65e267a995a4a60ba483dcc629a4873e746b463e6eb6466975b3
+SIZE (gnome2/libgtop-2.28.0.tar.bz2) = 793153
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index 0424bed88b3a..bb4b9e1d1580 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -48,6 +48,10 @@ lib/libgtop-2.0.la
lib/libgtop-2.0.so
lib/libgtop-2.0.so.7
libdata/pkgconfig/libgtop-2.0.pc
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
%%DOCSDIR%%/libgtop-Close.html
%%DOCSDIR%%/libgtop-Command.html
%%DOCSDIR%%/libgtop-GlibTop-Server.html
@@ -57,9 +61,17 @@ libdata/pkgconfig/libgtop-2.0.pc
%%DOCSDIR%%/libgtop-PPP.html
%%DOCSDIR%%/libgtop-Shared-Memory-Limits.html
%%DOCSDIR%%/libgtop-Uptime.html
+%%DOCSDIR%%/libgtop-cpu.html
+%%DOCSDIR%%/libgtop-fsusage.html
+%%DOCSDIR%%/libgtop-lib.html
+%%DOCSDIR%%/libgtop-loadavg.html
+%%DOCSDIR%%/libgtop-mem.html
+%%DOCSDIR%%/libgtop-mountlist.html
+%%DOCSDIR%%/libgtop-msg-limits.html
%%DOCSDIR%%/libgtop-open.html
%%DOCSDIR%%/libgtop-parameter.html
%%DOCSDIR%%/libgtop-procargs.html
+%%DOCSDIR%%/libgtop-prockernel.html
%%DOCSDIR%%/libgtop-proclist.html
%%DOCSDIR%%/libgtop-procmap.html
%%DOCSDIR%%/libgtop-procmem.html
@@ -71,12 +83,18 @@ libdata/pkgconfig/libgtop-2.0.pc
%%DOCSDIR%%/libgtop-procuid.html
%%DOCSDIR%%/libgtop-sem-limits.html
%%DOCSDIR%%/libgtop-signal.html
+%%DOCSDIR%%/libgtop-swap.html
%%DOCSDIR%%/libgtop-sysdeps.html
%%DOCSDIR%%/libgtop-sysinfo.html
%%DOCSDIR%%/libgtop-union.html
%%DOCSDIR%%/libgtop-version.html
%%DOCSDIR%%/libgtop-white-paper-overview.html
%%DOCSDIR%%/libgtop-white-paper.html
+%%DOCSDIR%%/libgtop.devhelp
+%%DOCSDIR%%/libgtop.devhelp2
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
share/locale/am/LC_MESSAGES/libgtop-2.0.mo
share/locale/ar/LC_MESSAGES/libgtop-2.0.mo
share/locale/as/LC_MESSAGES/libgtop-2.0.mo
@@ -87,6 +105,7 @@ share/locale/bn/LC_MESSAGES/libgtop-2.0.mo
share/locale/bn_IN/LC_MESSAGES/libgtop-2.0.mo
share/locale/bs/LC_MESSAGES/libgtop-2.0.mo
share/locale/ca/LC_MESSAGES/libgtop-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/libgtop-2.0.mo
share/locale/cs/LC_MESSAGES/libgtop-2.0.mo
share/locale/cy/LC_MESSAGES/libgtop-2.0.mo
share/locale/da/LC_MESSAGES/libgtop-2.0.mo
@@ -120,6 +139,7 @@ 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/mai/LC_MESSAGES/libgtop-2.0.mo
share/locale/mg/LC_MESSAGES/libgtop-2.0.mo
share/locale/mi/LC_MESSAGES/libgtop-2.0.mo
share/locale/mk/LC_MESSAGES/libgtop-2.0.mo
@@ -177,6 +197,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/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/la/LC_MESSAGES
@dirrmtry share/locale/la
@dirrmtry share/locale/ky/LC_MESSAGES
@@ -185,6 +207,8 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
@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/as/LC_MESSAGES
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index 340410688a8e..5e775e6678a1 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/liboobs/Makefile,v 1.35 2008/03/09 18:52:59 mezz Exp $
+# $MCom: ports/devel/liboobs/Makefile,v 1.38 2009/11/28 05:59:00 mezz Exp $
#
PORTNAME= liboobs
@@ -15,10 +15,10 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Wrapping library to the System Tools Backends
-BUILD_DEPENDS= ${LOCALBASE}/etc/dbus-1/system.d/system-tools-backends.conf:${PORTSDIR}/sysutils/system-tools-backends
+BUILD_DEPENDS= ${LOCALBASE}/etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf:${PORTSDIR}/sysutils/system-tools-backends
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
hal.1:${PORTSDIR}/sysutils/hal
-RUN_DEPENDS= ${LOCALBASE}/etc/dbus-1/system.d/system-tools-backends.conf:${PORTSDIR}/sysutils/system-tools-backends
+RUN_DEPENDS= ${LOCALBASE}/etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf:${PORTSDIR}/sysutils/system-tools-backends
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/devel/libpthread-stubs/Makefile b/devel/libpthread-stubs/Makefile
index 9775387b1fd0..95a0b70ae139 100644
--- a/devel/libpthread-stubs/Makefile
+++ b/devel/libpthread-stubs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libpthread-stubs
PORTVERSION= 0.3
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/devel/libpthread-stubs/files/patch-stubs.c b/devel/libpthread-stubs/files/patch-stubs.c
new file mode 100644
index 000000000000..4290eb2e6987
--- /dev/null
+++ b/devel/libpthread-stubs/files/patch-stubs.c
@@ -0,0 +1,28 @@
+XXX This is a big hack as we cannot define pthread_condattr_{init,destroy}
+here, or we will conflict with the weak symbols in libthr. The way our linker
+works, the weak symbols will be resolved here, and pthread_condattr functions
+will not work even in threaded applications.
+
+I am working to get these symbols added to libc, but in the meantime, this
+is needed to avoid crashes in threaded applications which make use of
+pthread_condattr*.
+--- stubs.c.orig 2009-11-27 17:15:30.000000000 -0500
++++ stubs.c 2009-11-27 17:16:29.000000000 -0500
+@@ -91,7 +91,7 @@ int pthread_cond_destroy() __attribute__
+ # endif
+ #endif
+
+-#ifndef HAVE_PTHREAD_CONDATTR_INIT
++#if 0
+ #define NEED_ZERO_STUB
+ # ifdef SUPPORT_ATTRIBUTE_ALIAS
+ int pthread_condattr_init() __attribute__ ((weak, alias ("__pthread_zero_stub")));
+@@ -100,7 +100,7 @@ int pthread_condattr_init() __attribute_
+ # endif
+ #endif
+
+-#ifndef HAVE_PTHREAD_CONDATTR_DESTROY
++#if 0
+ #define NEED_ZERO_STUB
+ # ifdef SUPPORT_ATTRIBUTE_ALIAS
+ int pthread_condattr_destroy() __attribute__ ((weak, alias ("__pthread_zero_stub")));
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 3daa76db37bb..b53aa9cb5327 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/devel/libsoup/Makefile,v 1.9 2009/04/15 21:49:46 kwm Exp $
+# $MCom: ports/devel/libsoup/Makefile,v 1.71 2009/10/20 00:22:57 kwm Exp $
#
PORTNAME= libsoup
-PORTVERSION= 2.26.3
-PORTREVISION?= 2
+PORTVERSION= 2.28.1
+PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -22,6 +22,7 @@ USE_BZIP2= yes
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
proxy.0:${PORTSDIR}/net/libproxy \
+ gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \
sqlite3.8:${PORTSDIR}/databases/sqlite3
USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack gconf2
diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo
index c554558dec6b..c1c072c0f167 100644
--- a/devel/libsoup/distinfo
+++ b/devel/libsoup/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libsoup-2.26.3.tar.bz2) = 19f15636380a9a08a0f071cc53069b80
-SHA256 (gnome2/libsoup-2.26.3.tar.bz2) = e6662e56e6987124891db62325622bc46fd5dcd42458285d5ead5afc6d5be1dc
-SIZE (gnome2/libsoup-2.26.3.tar.bz2) = 686248
+MD5 (gnome2/libsoup-2.28.1.tar.bz2) = 6c303cae11bde065497992d2444cc96a
+SHA256 (gnome2/libsoup-2.28.1.tar.bz2) = 615f154998a65c1d9611a0e6c16c1f30df799da83437f1ff7b4baa57e5067a80
+SIZE (gnome2/libsoup-2.28.1.tar.bz2) = 703258
diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist
index dae15588f582..08c75d5f119b 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-content-sniffer.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
@@ -17,9 +18,10 @@ 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-password-manager.h
include/libsoup-%%VERSION%%/libsoup/soup-portability.h
-include/libsoup-%%VERSION%%/libsoup/soup-proxy-uri-resolver.h
include/libsoup-%%VERSION%%/libsoup/soup-proxy-resolver.h
+include/libsoup-%%VERSION%%/libsoup/soup-proxy-uri-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
diff --git a/devel/mm-common/Makefile b/devel/mm-common/Makefile
new file mode 100644
index 000000000000..f0a1f4f15d88
--- /dev/null
+++ b/devel/mm-common/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for: mm-common
+# Date Created: 27 Aug 2009
+# Whom: Koop Mast<kwm@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/mm-common/Makefile,v 1.6 2009/09/21 18:58:15 kwm Exp $
+#
+
+PORTNAME= mm-common
+PORTVERSION= 0.8
+CATEGORIES= devel gnome
+MASTER_SITES= GNOME
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Common build infrastructure for the GNOME C++ binding libraries
+
+LIB_DEPENDS= curl.5:${PORTSDIR}/ftp/curl
+
+USE_GNOME= gnomehack
+USE_BZIP2= yes
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+
+MAN1= mm-common-prepare.1
+
+.include <bsd.port.mk>
diff --git a/devel/mm-common/distinfo b/devel/mm-common/distinfo
new file mode 100644
index 000000000000..5d13a0e23209
--- /dev/null
+++ b/devel/mm-common/distinfo
@@ -0,0 +1,3 @@
+MD5 (mm-common-0.8.tar.bz2) = 2a335530f02c35dec1deea4b3627b725
+SHA256 (mm-common-0.8.tar.bz2) = 604c9b94629a4300e399ba72b497bedf1bf3c92b33ab8e688c32f70afe38e3c8
+SIZE (mm-common-0.8.tar.bz2) = 529592
diff --git a/devel/mm-common/pkg-descr b/devel/mm-common/pkg-descr
new file mode 100644
index 000000000000..ec53b63e0baa
--- /dev/null
+++ b/devel/mm-common/pkg-descr
@@ -0,0 +1,14 @@
+This module is part of the GNOME C++ bindings effort <http://www.gtkmm.org/>.
+
+The mm-common module provides the build infrastructure and utilities
+shared among the GNOME C++ binding libraries. It is only a required
+dependency for building the C++ bindings from the gnome.org version
+control repository. An installation of mm-common is not required for
+building tarball releases, unless configured to use maintainer-mode.
+
+Release archives of mm-common include the Doxygen tag file for the
+GNU C++ Library reference documentation. It is covered by the same
+licence as the source code it was extracted from. More information
+is available at <http://gcc.gnu.org/onlinedocs/libstdc++/>.
+
+WWW: http://www.gtkmm.org
diff --git a/devel/mm-common/pkg-plist b/devel/mm-common/pkg-plist
new file mode 100644
index 000000000000..b5ea4637b363
--- /dev/null
+++ b/devel/mm-common/pkg-plist
@@ -0,0 +1,77 @@
+bin/mm-common-prepare
+share/aclocal/mm-common.m4
+share/aclocal/mm-dietlib.m4
+share/aclocal/mm-doc.m4
+share/aclocal/mm-module.m4
+share/aclocal/mm-pkg.m4
+share/aclocal/mm-warnings.m4
+share/doc/mm-common/README
+share/doc/mm-common/skeletonmm/.gitignore
+share/doc/mm-common/skeletonmm/AUTHORS
+share/doc/mm-common/skeletonmm/COPYING
+share/doc/mm-common/skeletonmm/ChangeLog
+share/doc/mm-common/skeletonmm/Makefile.am
+share/doc/mm-common/skeletonmm/README
+share/doc/mm-common/skeletonmm/autogen.sh
+share/doc/mm-common/skeletonmm/build/.gitignore
+share/doc/mm-common/skeletonmm/codegen/Makefile.am
+share/doc/mm-common/skeletonmm/codegen/extradefs/generate_extra_defs_skeleton.cc
+share/doc/mm-common/skeletonmm/codegen/m4/convert.m4
+share/doc/mm-common/skeletonmm/codegen/m4/convert_skeleton.m4
+share/doc/mm-common/skeletonmm/codegen/m4/filelist.am
+share/doc/mm-common/skeletonmm/configure.ac
+share/doc/mm-common/skeletonmm/doc/Makefile.am
+share/doc/mm-common/skeletonmm/doc/reference/.gitignore
+share/doc/mm-common/skeletonmm/doc/reference/Doxyfile.in
+share/doc/mm-common/skeletonmm/examples/.gitignore
+share/doc/mm-common/skeletonmm/examples/Makefile.am
+share/doc/mm-common/skeletonmm/examples/example/example.cc
+share/doc/mm-common/skeletonmm/skeleton/.gitignore
+share/doc/mm-common/skeletonmm/skeleton/skeletonmm-uninstalled.pc.in
+share/doc/mm-common/skeletonmm/skeleton/skeletonmm.h
+share/doc/mm-common/skeletonmm/skeleton/skeletonmm.pc.in
+share/doc/mm-common/skeletonmm/skeleton/skeletonmm/Makefile.am
+share/doc/mm-common/skeletonmm/skeleton/skeletonmm/filelist.am
+share/doc/mm-common/skeletonmm/skeleton/skeletonmm/private/.gitignore
+share/doc/mm-common/skeletonmm/skeleton/skeletonmm/wrap_init.h
+share/doc/mm-common/skeletonmm/skeleton/skeletonmmconfig.h.in
+share/doc/mm-common/skeletonmm/skeleton/src/Makefile.am
+share/doc/mm-common/skeletonmm/skeleton/src/filelist.am
+share/doc/mm-common/skeletonmm/skeleton/src/skeleton.ccg
+share/doc/mm-common/skeletonmm/skeleton/src/skeleton.defs
+share/doc/mm-common/skeletonmm/skeleton/src/skeleton.hg
+share/doc/mm-common/skeletonmm/skeleton/src/skeleton_docs.xml
+share/doc/mm-common/skeletonmm/skeleton/src/skeleton_docs_override.xml
+share/doc/mm-common/skeletonmm/skeleton/src/skeleton_enum.defs
+share/doc/mm-common/skeletonmm/skeleton/src/skeleton_extra.defs
+share/doc/mm-common/skeletonmm/skeleton/src/skeleton_method.defs
+share/doc/mm-common/skeletonmm/skeletonmm.doap
+share/mm-common/build/compile-binding.am
+share/mm-common/build/dist-changelog.am
+share/mm-common/build/doc-reference.am
+share/mm-common/build/generate-binding.am
+share/mm-common/doctags/libstdc++.tag
+share/mm-common/doctool/doc-install.pl
+share/mm-common/doctool/doc-postprocess.pl
+share/mm-common/doctool/doxygen.css
+share/mm-common/doctool/tagfile-to-devhelp2.xsl
+libdata/pkgconfig/mm-common-libstdc++.pc
+@dirrm share/mm-common/doctool
+@dirrm share/mm-common/doctags
+@dirrm share/mm-common/build
+@dirrm share/mm-common
+@dirrm share/doc/mm-common/skeletonmm/skeleton/src
+@dirrm share/doc/mm-common/skeletonmm/skeleton/skeletonmm/private
+@dirrm share/doc/mm-common/skeletonmm/skeleton/skeletonmm
+@dirrm share/doc/mm-common/skeletonmm/skeleton
+@dirrm share/doc/mm-common/skeletonmm/doc/reference
+@dirrm share/doc/mm-common/skeletonmm/doc
+@dirrm share/doc/mm-common/skeletonmm/examples/example
+@dirrm share/doc/mm-common/skeletonmm/examples
+@dirrm share/doc/mm-common/skeletonmm/build
+@dirrm share/doc/mm-common/skeletonmm/codegen/m4
+@dirrm share/doc/mm-common/skeletonmm/codegen/extradefs
+@dirrm share/doc/mm-common/skeletonmm/codegen
+@dirrm share/doc/mm-common/skeletonmm
+@dirrm share/doc/mm-common
+@dirrmtry share/aclocal
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 0a6f1c55a573..b7c2855cac04 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/py-gobject/Makefile,v 1.29 2009/01/04 22:11:03 marcus Exp $
+# $MCom: ports/devel/py-gobject/Makefile,v 1.35 2009/09/23 21:44:30 kwm Exp $
#
PORTNAME= gobject
-PORTVERSION= 2.16.1
+PORTVERSION= 2.20.0
CATEGORIES= devel python
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,6 +18,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Python bindings for GObject
+LIB_DEPENDS= girepository-1.0.0:${PORTSDIR}/devel/gobject-introspection
+
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack glib20
@@ -27,5 +29,10 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-docs
CONFLICTS= py*-gtk-0*
+PLIST_SUB= PYTHON_VER="${PYTHON_VER}"
+
+post-install:
+ @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+ ${PREFIX}/share/pygobject/2.0/codegen
.include <bsd.port.mk>
diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo
index abf2aa2dd37c..1e5e2e37b052 100644
--- a/devel/py-gobject/distinfo
+++ b/devel/py-gobject/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygobject-2.16.1.tar.bz2) = 8e26f2572e6b72dbd2591677055f8d30
-SHA256 (gnome2/pygobject-2.16.1.tar.bz2) = ee229c642759470a242c7f6ce3bd969a7484496f95570a8783859b03d6d79cc5
-SIZE (gnome2/pygobject-2.16.1.tar.bz2) = 522347
+MD5 (gnome2/pygobject-2.20.0.tar.bz2) = 10e1fb79be3d698476a28b1e1b0c5640
+SHA256 (gnome2/pygobject-2.20.0.tar.bz2) = 41e923a3f4426a3e19f6d154c424e3dac6f39defca77af602ac6272ce270fa81
+SIZE (gnome2/pygobject-2.20.0.tar.bz2) = 666287
diff --git a/devel/py-gobject/files/patch-pygobject-2.0.pc.in b/devel/py-gobject/files/patch-pygobject-2.0.pc.in
new file mode 100644
index 000000000000..76ee71ccdca0
--- /dev/null
+++ b/devel/py-gobject/files/patch-pygobject-2.0.pc.in
@@ -0,0 +1,11 @@
+--- pygobject-2.0.pc.in.orig 2008-09-03 15:31:23.000000000 +0000
++++ pygobject-2.0.pc.in 2008-09-03 15:31:43.000000000 +0000
+@@ -10,7 +10,7 @@
+ # install additional headers.
+ pygtkincludedir=${includedir}/pygtk-2.0
+ fixxref=${datadir}/pygobject/xsl/fixxref.py
+-pygdocs=${datadir}/gtk-doc/html/pygobject
++pygdocs=${datadir}/doc/pygobject
+ defsdir=${datadir}/pygobject/2.0/defs
+ codegendir=${datadir}/pygobject/2.0/codegen
+
diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist
index 63a4cceb85d4..c6b65ccf14e2 100644
--- a/devel/py-gobject/pkg-plist
+++ b/devel/py-gobject/pkg-plist
@@ -1,9 +1,10 @@
bin/pygobject-codegen-2.0
+include/pygobject/bank.h
include/pygtk-2.0/pyglib.h
include/pygtk-2.0/pygobject.h
-lib/libpyglib-2.0.la
-lib/libpyglib-2.0.so
-lib/libpyglib-2.0.so.0
+lib/libpyglib-2.0-python%%PYTHON_VER%%.la
+lib/libpyglib-2.0-python%%PYTHON_VER%%.so
+lib/libpyglib-2.0-python%%PYTHON_VER%%.so.0
%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyo
@@ -14,6 +15,32 @@ lib/libpyglib-2.0.so.0
%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/_gio.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/btypes.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/btypes.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/btypes.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/importer.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/importer.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/importer.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/module.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/module.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/module.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gdk.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gdk.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gdk.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gtk.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gtk.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gtk.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repo.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repo.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repository.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repository.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repository.pyo
%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.pyo
@@ -38,12 +65,53 @@ lib/libpyglib-2.0.so.0
%%PYTHON_SITELIBDIR%%/pygtk.pyc
%%PYTHON_SITELIBDIR%%/pygtk.pyo
libdata/pkgconfig/pygobject-2.0.pc
+share/doc/pygobject/class-gioappinfo.html
+share/doc/pygobject/class-gioapplaunchcontext.html
+share/doc/pygobject/class-gioasyncresult.html
+share/doc/pygobject/class-giobufferedinputstream.html
+share/doc/pygobject/class-giobufferedoutputstream.html
+share/doc/pygobject/class-giocancellable.html
+share/doc/pygobject/class-giodatainputstream.html
+share/doc/pygobject/class-giodataoutputstream.html
+share/doc/pygobject/class-giodrive.html
+share/doc/pygobject/class-gioemblem.html
+share/doc/pygobject/class-gioemblemedicon.html
+share/doc/pygobject/class-giofile.html
+share/doc/pygobject/class-giofileattributeinfo.html
+share/doc/pygobject/class-giofileenumerator.html
+share/doc/pygobject/class-giofileicon.html
+share/doc/pygobject/class-giofileinfo.html
+share/doc/pygobject/class-giofileinputstream.html
+share/doc/pygobject/class-giofilemonitor.html
+share/doc/pygobject/class-giofileoutputstream.html
+share/doc/pygobject/class-giofilterinputstream.html
+share/doc/pygobject/class-giofilteroutputstream.html
+share/doc/pygobject/class-gioicon.html
+share/doc/pygobject/class-gioinputstream.html
+share/doc/pygobject/class-gioloadableicon.html
+share/doc/pygobject/class-giomemoryinputstream.html
+share/doc/pygobject/class-giomemoryoutputstream.html
+share/doc/pygobject/class-giomount.html
+share/doc/pygobject/class-giomountoperation.html
+share/doc/pygobject/class-giooutputstream.html
+share/doc/pygobject/class-gioseekable.html
+share/doc/pygobject/class-giosimpleasyncresult.html
+share/doc/pygobject/class-giothemedicon.html
+share/doc/pygobject/class-giounixinputstream.html
+share/doc/pygobject/class-giounixoutputstream.html
+share/doc/pygobject/class-giovolume.html
+share/doc/pygobject/class-giovolumemonitor.html
share/doc/pygobject/class-glibmaincontext.html
share/doc/pygobject/class-glibmainloop.html
share/doc/pygobject/class-gobject.html
share/doc/pygobject/class-gobjectgboxed.html
share/doc/pygobject/class-gobjectginterface.html
share/doc/pygobject/class-gobjectgpointer.html
+share/doc/pygobject/gio-class-reference.html
+share/doc/pygobject/gio-constants.html
+share/doc/pygobject/gio-functions.html
+share/doc/pygobject/giounix-class-reference.html
+share/doc/pygobject/glib-class-reference.html
share/doc/pygobject/glib-constants.html
share/doc/pygobject/glib-functions.html
share/doc/pygobject/gobject-class-reference.html
@@ -60,53 +128,66 @@ share/pygobject/2.0/codegen/__init__.pyo
share/pygobject/2.0/codegen/argtypes.py
share/pygobject/2.0/codegen/argtypes.pyc
share/pygobject/2.0/codegen/argtypes.pyo
+share/pygobject/2.0/codegen/code-coverage.py
+share/pygobject/2.0/codegen/code-coverage.pyc
share/pygobject/2.0/codegen/codegen.py
share/pygobject/2.0/codegen/codegen.pyc
-share/pygobject/2.0/codegen/codegen.pyo
share/pygobject/2.0/codegen/createdefs.py
share/pygobject/2.0/codegen/createdefs.pyc
-share/pygobject/2.0/codegen/createdefs.pyo
share/pygobject/2.0/codegen/definitions.py
share/pygobject/2.0/codegen/definitions.pyc
share/pygobject/2.0/codegen/definitions.pyo
+share/pygobject/2.0/codegen/defsconvert.py
+share/pygobject/2.0/codegen/defsconvert.pyc
+share/pygobject/2.0/codegen/defsgen.py
+share/pygobject/2.0/codegen/defsgen.pyc
share/pygobject/2.0/codegen/defsparser.py
share/pygobject/2.0/codegen/defsparser.pyc
share/pygobject/2.0/codegen/defsparser.pyo
share/pygobject/2.0/codegen/docextract.py
share/pygobject/2.0/codegen/docextract.pyc
share/pygobject/2.0/codegen/docextract.pyo
+share/pygobject/2.0/codegen/docextract_to_xml.py
+share/pygobject/2.0/codegen/docextract_to_xml.pyc
share/pygobject/2.0/codegen/docgen.py
share/pygobject/2.0/codegen/docgen.pyc
-share/pygobject/2.0/codegen/docgen.pyo
share/pygobject/2.0/codegen/h2def.py
share/pygobject/2.0/codegen/h2def.pyc
-share/pygobject/2.0/codegen/h2def.pyo
share/pygobject/2.0/codegen/mergedefs.py
share/pygobject/2.0/codegen/mergedefs.pyc
-share/pygobject/2.0/codegen/mergedefs.pyo
+share/pygobject/2.0/codegen/missingdefs.py
+share/pygobject/2.0/codegen/missingdefs.pyc
share/pygobject/2.0/codegen/mkskel.py
share/pygobject/2.0/codegen/mkskel.pyc
-share/pygobject/2.0/codegen/mkskel.pyo
share/pygobject/2.0/codegen/override.py
share/pygobject/2.0/codegen/override.pyc
share/pygobject/2.0/codegen/override.pyo
share/pygobject/2.0/codegen/reversewrapper.py
share/pygobject/2.0/codegen/reversewrapper.pyc
share/pygobject/2.0/codegen/reversewrapper.pyo
+share/pygobject/2.0/codegen/scanvirtuals.py
+share/pygobject/2.0/codegen/scanvirtuals.pyc
share/pygobject/2.0/codegen/scmexpr.py
share/pygobject/2.0/codegen/scmexpr.pyc
-share/pygobject/2.0/codegen/scmexpr.pyo
share/pygobject/2.0/defs/gappinfo.override
share/pygobject/2.0/defs/gapplaunchcontext.override
+share/pygobject/2.0/defs/gbufferedinputstream.override
+share/pygobject/2.0/defs/gdatainputstream.override
+share/pygobject/2.0/defs/gdrive.override
share/pygobject/2.0/defs/gfile.override
share/pygobject/2.0/defs/gfileattribute.override
share/pygobject/2.0/defs/gfileenumerator.override
share/pygobject/2.0/defs/gfileinfo.override
+share/pygobject/2.0/defs/gfileinputstream.override
+share/pygobject/2.0/defs/gfileoutputstream.override
share/pygobject/2.0/defs/gicon.override
share/pygobject/2.0/defs/ginputstream.override
share/pygobject/2.0/defs/gio-types.defs
share/pygobject/2.0/defs/gio.defs
share/pygobject/2.0/defs/gio.override
+share/pygobject/2.0/defs/gmemoryinputstream.override
+share/pygobject/2.0/defs/gmemoryoutputstream.override
+share/pygobject/2.0/defs/gmount.override
share/pygobject/2.0/defs/goutputstream.override
share/pygobject/2.0/defs/gvolume.override
share/pygobject/2.0/defs/gvolumemonitor.override
@@ -128,6 +209,9 @@ share/pygobject/xsl/ref-html-style.xsl
@dirrm share/doc/pygobject
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/glib
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/girepository
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gio
@dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0
@dirrmtry include/pygtk-2.0
+@dirrm include/pygobject
diff --git a/devel/seed/Makefile b/devel/seed/Makefile
new file mode 100644
index 000000000000..98cda886ac78
--- /dev/null
+++ b/devel/seed/Makefile
@@ -0,0 +1,54 @@
+# New ports collection makefile for: seed
+# Date created: 19 July 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/seed/Makefile,v 1.8 2009/10/19 19:33:26 kwm Exp $
+#
+
+PORTNAME= seed
+PORTVERSION= 2.28.1
+CATEGORIES= devel gnome
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= GObject JavaScriptCore bridge
+
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-js-common.pc:${PORTSDIR}/devel/gnome-js-common
+LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi \
+ webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \
+ girepository-1.0.0:${PORTSDIR}/devel/gobject-introspection \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+ sqlite3.8:${PORTSDIR}/databases/sqlite3 \
+ mpfr.3:${PORTSDIR}/math/mpfr
+
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_GETTEXT= yes
+USE_GNOME= gnomehack gtk20 intltool libxml2
+USE_LDCONFIG= yes
+USE_AUTOTOOLS= libtool:22
+USE_GMAKE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=--enable-gtk-doc=no
+
+MAN1= seed.1
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|== x|= x|g' \
+ ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|reference||g' ${WRKSRC}/doc/Makefile.in
+ @${FIND} ${WRKSRC}/examples -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|$$(datadir)/doc/seed/examples|${EXAMPLESDIR}|g'
+.if defined(NOPORTEXAMPLES)
+ @${REINPLACE_CMD} -e 's|examples||g' \
+ ${WRKSRC}/Makefile.in
+.endif
+.if defined(NOPORTDOCS)
+ @${REINPLACE_CMD} -e 's| install-seeddocDATA||g ; s|doc$$||g' \
+ ${WRKSRC}/Makefile.in
+.endif
+
+.include <bsd.port.mk>
diff --git a/devel/seed/distinfo b/devel/seed/distinfo
new file mode 100644
index 000000000000..3733f839437a
--- /dev/null
+++ b/devel/seed/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/seed-2.28.1.tar.bz2) = ac2b3e2789528510632154ed08380790
+SHA256 (gnome2/seed-2.28.1.tar.bz2) = c5018a9e4267d7b52c690ceb088f8c4573670460d6d5bc413afcc13510d4f4f2
+SIZE (gnome2/seed-2.28.1.tar.bz2) = 839512
diff --git a/devel/seed/files/patch-libseed_seed-importer.c b/devel/seed/files/patch-libseed_seed-importer.c
new file mode 100644
index 000000000000..c216fa88c4a2
--- /dev/null
+++ b/devel/seed/files/patch-libseed_seed-importer.c
@@ -0,0 +1,49 @@
+--- libseed/seed-importer.c.orig 2009-08-10 16:23:35.000000000 -0400
++++ libseed/seed-importer.c 2009-08-22 14:36:00.000000000 -0400
+@@ -22,6 +22,8 @@
+
+ #include <gio/gio.h>
+ #include <string.h>
++#include <stdlib.h>
++#include <unistd.h>
+
+ #include "seed-private.h"
+
+@@ -637,8 +639,9 @@ seed_importer_handle_file (JSContextRef
+ JSValueRef js_file_dirname;
+ JSObjectRef global, c_global;
+ JSStringRef file_contents, file_name;
+- gchar *contents, *walk, *file_path, *canonical, *absolute_path;
++ gchar *contents, *walk, *file_path, *canonical, *absolute_path, *normalp;
+ gchar *normalized_path;
++ gsize path_max;
+
+ file_path = g_build_filename (dir, file, NULL);
+ canonical = seed_importer_canonicalize_path (file_path);
+@@ -692,15 +695,24 @@ seed_importer_handle_file (JSContextRef
+ g_path_get_dirname (file_path), NULL);
+ }
+
+- normalized_path = canonicalize_file_name (absolute_path);
++#ifdef PATH_MAX
++ path_max = PATH_MAX;
++#else
++ path_max = pathconf (absolute_path, _PC_PATH_MAX);
++ if (path_max <= 0)
++ path_max = 4096;
++#endif
++ normalized_path = (gchar *) g_malloc (path_max);
++ normalp = realpath (absolute_path, normalized_path);
+
+- js_file_dirname = seed_value_from_string (ctx, normalized_path, NULL);
++ js_file_dirname = seed_value_from_string (ctx, normalp, NULL);
+
+ seed_object_set_property (nctx, global, "__script_path__", js_file_dirname);
+
+ g_hash_table_insert (file_imports, canonical, global);
+ g_free (file_path);
+ g_free (absolute_path);
++ g_free (normalized_path);
+
+ JSEvaluateScript (nctx, file_contents, NULL, file_name, 0, exception);
+
diff --git a/devel/seed/files/patch-modules_gettext_seed-gettext.c b/devel/seed/files/patch-modules_gettext_seed-gettext.c
new file mode 100644
index 000000000000..999f1d97a905
--- /dev/null
+++ b/devel/seed/files/patch-modules_gettext_seed-gettext.c
@@ -0,0 +1,27 @@
+--- modules/gettext/seed-gettext.c.orig 2009-07-26 19:23:31.000000000 -0400
++++ modules/gettext/seed-gettext.c 2009-07-26 19:25:12.000000000 -0400
+@@ -293,12 +293,24 @@ seed_module_init(SeedEngine *local_eng)
+ DEFINE_ENUM_MEMBER(ns_ref, LC_MONETARY);
+ DEFINE_ENUM_MEMBER(ns_ref, LC_MESSAGES);
+ DEFINE_ENUM_MEMBER(ns_ref, LC_ALL);
++#ifdef LC_PAPER
+ DEFINE_ENUM_MEMBER(ns_ref, LC_PAPER);
++#endif
++#ifdef LC_NAME
+ DEFINE_ENUM_MEMBER(ns_ref, LC_NAME);
++#endif
++#ifdef LC_ADDRESS
+ DEFINE_ENUM_MEMBER(ns_ref, LC_ADDRESS);
++#endif
++#ifdef LC_TELEPHONE
+ DEFINE_ENUM_MEMBER(ns_ref, LC_TELEPHONE);
++#endif
++#ifdef LC_MEASUREMENT
+ DEFINE_ENUM_MEMBER(ns_ref, LC_MEASUREMENT);
++#endif
++#ifdef LC_IDENTIFICATION
+ DEFINE_ENUM_MEMBER(ns_ref, LC_IDENTIFICATION);
++#endif
+ DEFINE_ENUM_MEMBER(ns_ref, LC_CTYPE);
+
+ return ns_ref;
diff --git a/devel/seed/files/patch-modules_os_seed-os.c b/devel/seed/files/patch-modules_os_seed-os.c
new file mode 100644
index 000000000000..1aec71b71988
--- /dev/null
+++ b/devel/seed/files/patch-modules_os_seed-os.c
@@ -0,0 +1,77 @@
+--- modules/os/seed-os.c.orig 2009-08-10 16:23:35.000000000 -0400
++++ modules/os/seed-os.c 2009-08-22 14:43:42.000000000 -0400
+@@ -31,6 +31,10 @@
+ #include <sys/utsname.h>
+
+ #include <sys/types.h>
++#include <sys/ioctl.h>
++#include <termios.h>
++#include <libutil.h>
++#include <unistd.h>
+
+ #include <fcntl.h>
+
+@@ -54,18 +58,32 @@ seed_os_realpath (SeedContext ctx,
+ const SeedValue arguments[],
+ SeedException * exception)
+ {
++ SeedValue sv;
+ gchar *arg;
++ gchar *resolved_path;
+ gchar *ret;
++ gsize path_max;
+
+ if (argument_count != 1)
+ {
+ EXPECTED_EXCEPTION("os.realpath", "1 argument");
+ }
+ arg = seed_value_to_string (ctx, arguments[0], exception);
+- ret = canonicalize_file_name(arg);
++#ifdef PATH_MAX
++ path_max = PATH_MAX;
++#else
++ path_max = pathconf (arg, _PC_PATH_MAX);
++ if (path_max <= 0)
++ path_max = 4096;
++#endif
++ resolved_path = (gchar *) g_malloc (path_max);
++ ret = realpath(arg, resolved_path);
+ g_free (arg);
+
+- return seed_value_from_string (ctx, ret, exception);
++ sv = seed_value_from_string (ctx, ret, exception);
++ g_free (resolved_path);
++
++ return sv;
+ }
+
+ SeedValue
+@@ -702,6 +720,7 @@ seed_os_fdatasync (SeedContext ctx,
+ const SeedValue arguments[],
+ SeedException * exception)
+ {
++#if !defined(__FreeBSD__)
+ gint fd;
+
+ if (argument_count != 1)
+@@ -711,6 +730,10 @@ seed_os_fdatasync (SeedContext ctx,
+ fd = seed_value_to_int (ctx, arguments[0], exception);
+
+ return seed_value_from_int (ctx, fdatasync (fd), exception);
++#else
++ errno = ENOSYS;
++ return seed_value_from_int (ctx, -1, exception);
++#endif
+ }
+
+ SeedValue
+@@ -1112,7 +1135,9 @@ seed_module_init(SeedEngine * eng)
+ #if defined (O_DIRECT)
+ OS_DEFINE_QUICK_ENUM (O_DIRECT);
+ #endif
++#if defined (O_DIRECTORY)
+ OS_DEFINE_QUICK_ENUM (O_DIRECTORY);
++#endif
+ OS_DEFINE_QUICK_ENUM (O_NOFOLLOW);
+ #if defined (O_NOATIME)
+ OS_DEFINE_QUICK_ENUM (O_NOATIME);
diff --git a/devel/seed/pkg-descr b/devel/seed/pkg-descr
new file mode 100644
index 000000000000..ffc081bb3543
--- /dev/null
+++ b/devel/seed/pkg-descr
@@ -0,0 +1,7 @@
+Seed is a library and interpreter, dynamically bridging (through
+GObjectIntrospection) the WebKit JavaScriptCore engine, with the GNOME
+platform. Seed serves as something which enables you to write standalone
+applications in JavaScript, or easily enable your application to be extensible
+in JavaScript.
+
+WWW: http://live.gnome.org/Seed
diff --git a/devel/seed/pkg-plist b/devel/seed/pkg-plist
new file mode 100644
index 000000000000..54621017c52a
--- /dev/null
+++ b/devel/seed/pkg-plist
@@ -0,0 +1,187 @@
+bin/seed
+include/seed/seed-debug.h
+include/seed/seed-module.h
+include/seed/seed.h
+lib/libseed.a
+lib/libseed.la
+lib/libseed.so
+lib/libseed.so.0
+lib/seed/libseed_cairo.a
+lib/seed/libseed_cairo.la
+lib/seed/libseed_cairo.so
+lib/seed/libseed_canvas.a
+lib/seed/libseed_canvas.la
+lib/seed/libseed_canvas.so
+lib/seed/libseed_dbusnative.a
+lib/seed/libseed_dbusnative.la
+lib/seed/libseed_dbusnative.so
+lib/seed/libseed_example.a
+lib/seed/libseed_example.la
+lib/seed/libseed_example.so
+lib/seed/libseed_ffi.a
+lib/seed/libseed_ffi.la
+lib/seed/libseed_ffi.so
+lib/seed/libseed_gettext.a
+lib/seed/libseed_gettext.la
+lib/seed/libseed_gettext.so
+lib/seed/libseed_gtkbuilder.a
+lib/seed/libseed_gtkbuilder.la
+lib/seed/libseed_gtkbuilder.so
+lib/seed/libseed_libxml.a
+lib/seed/libseed_libxml.la
+lib/seed/libseed_libxml.so
+lib/seed/libseed_mpfr.a
+lib/seed/libseed_mpfr.la
+lib/seed/libseed_mpfr.so
+lib/seed/libseed_multiprocessing.a
+lib/seed/libseed_multiprocessing.la
+lib/seed/libseed_multiprocessing.so
+lib/seed/libseed_os.a
+lib/seed/libseed_os.la
+lib/seed/libseed_os.so
+lib/seed/libseed_readline.a
+lib/seed/libseed_readline.la
+lib/seed/libseed_readline.so
+lib/seed/libseed_sandbox.a
+lib/seed/libseed_sandbox.la
+lib/seed/libseed_sandbox.so
+lib/seed/libseed_sqlite.a
+lib/seed/libseed_sqlite.la
+lib/seed/libseed_sqlite.so
+libdata/pkgconfig/seed.pc
+%%DATADIR%%/dbus.js
+%%DATADIR%%/extensions/Clutter.js
+%%DATADIR%%/extensions/GObject.js
+%%DATADIR%%/extensions/Gio.js
+%%DATADIR%%/extensions/Gst.js
+%%DATADIR%%/extensions/Gtk.js
+%%DATADIR%%/extensions/Seed.js
+%%DATADIR%%/extensions/xml.js
+%%DATADIR%%/lang.js
+%%PORTEXAMPLES%%%%DATADIR%%/repl.js
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE
+%%PORTDOCS%%%%DOCSDIR%%/conventions.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Gnio-server.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Gnio.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/HACKING
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/accelgroup.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/actions.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/async-quine.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserSettings.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserStatusbar.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserTab.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserToolbar.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserView.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/COPYING
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/TabbedBrowser.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/main.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cairo.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calculator-mpfr.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calculator.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-1.0.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-cairo-1.0.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-cogl-1.0.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/clutter-pad.ui
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/animated-rectangle.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/box2d.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/cairo.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/pink-stage.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/spring.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/main.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/redhand.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/ShaderEditor.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/ShaderView.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/bob.jpg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/default.glsl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/main.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbus/dbus-banshee.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbus/dbus-consolekit.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbus/dbus-networkmanager.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbus/networkManagerIfaces.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gconf.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gdkpixbufloader.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/env.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/pretty.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/thread.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/timeout.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/timer.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/twitter.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtkplug.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtktextview.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtktreeview.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/json-packing.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/json-reddit.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ls.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/n-oscillator.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify-test.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/glut-teapot.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/seed-gears.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/triangle-actor.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pango-fontset.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pango.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poppler.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quine.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/repl.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/soup.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threaded-repl.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/video.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vte-test.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/sample.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/weather.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/xml-dom.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/xml-tree.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/xml-xpath.js
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/mapping/enum-mapping.png
+%%PORTDOCS%%%%DOCSDIR%%/mapping/mapping.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/canvas.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/gtkbuilder/html/gtkbuilder-funcs.xml
+%%PORTDOCS%%%%DOCSDIR%%/modules/multiprocessing.html
+%%PORTDOCS%%%%DOCSDIR%%/modules/readline/html/readline-funcs.xml
+%%PORTDOCS%%%%DOCSDIR%%/modules/sandbox/html/sandbox-funcs.xml
+%%PORTDOCS%%%%DOCSDIR%%/modules/sqlite/html/sqlite-funcs.xml
+%%PORTDOCS%%%%DOCSDIR%%/runtime.html
+%%PORTDOCS%%%%DOCSDIR%%/sh.css
+%%PORTDOCS%%%%DOCSDIR%%/sh.js
+%%PORTDOCS%%%%DOCSDIR%%/sh_js.js
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/1.js
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/1.png
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/2.js
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/2.png
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/3.js
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/3.png
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/4.png
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/packing.png
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/packing.svg
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tutorial.html
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/browser
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clutter-pad/examples
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clutter-pad
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clutter-shader
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dbus
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/glib
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/opengl
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/xml
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/mapping
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/modules/gtkbuilder/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/modules/gtkbuilder
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/modules/readline/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/modules/readline
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/modules/sandbox/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/modules/sandbox
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/modules/sqlite/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/modules/sqlite
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/modules
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm include/seed
+@dirrm lib/seed
+@dirrm %%DATADIR%%/extensions
+@dirrm %%DATADIR%%
diff --git a/editors/abiword-docs/Makefile b/editors/abiword-docs/Makefile
index a38f66152494..57912702523e 100644
--- a/editors/abiword-docs/Makefile
+++ b/editors/abiword-docs/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/editors/abiword-docs/Makefile,v 1.1 2009/11/10 14:08:20 kwm Exp $
#
PORTNAME= abiword-docs
-PORTVERSION= 2.6.8
-PORTREVISION= 1
+PORTVERSION= 2.8.1
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
MASTER_SITE_SUBDIR= abiword
diff --git a/editors/abiword-docs/distinfo b/editors/abiword-docs/distinfo
index 37d31545f378..7563a0f824a6 100644
--- a/editors/abiword-docs/distinfo
+++ b/editors/abiword-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (AbiWord/abiword-docs-2.6.8.tar.gz) = 5698c79cfa179f4b15c82a699d11a309
-SHA256 (AbiWord/abiword-docs-2.6.8.tar.gz) = 44c58521d00a142bc79d9b6e19fccc753a89c2ce4806bae883977b734ce1edc8
-SIZE (AbiWord/abiword-docs-2.6.8.tar.gz) = 1440398
+MD5 (AbiWord/abiword-docs-2.8.1.tar.gz) = 6a6d8260004280687b862e3b9777c338
+SHA256 (AbiWord/abiword-docs-2.8.1.tar.gz) = e181a0678067d86fc8da53b20921c9f2b7aca5bf38214b909a47843886b24377
+SIZE (AbiWord/abiword-docs-2.8.1.tar.gz) = 1461900
diff --git a/editors/abiword-docs/files/patch-configure b/editors/abiword-docs/files/patch-configure
new file mode 100644
index 000000000000..4273e56a5a19
--- /dev/null
+++ b/editors/abiword-docs/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig 2009-10-28 18:13:56.000000000 +0100
++++ configure 2009-10-28 18:14:55.000000000 +0100
+@@ -2548,7 +2548,7 @@
+
+
+
+-if test "x$ABIWORD" == "x"; then
++if test "x$ABIWORD" \= "x"; then
+ { { $as_echo "$as_me:$LINENO: error: abiword not found in PATH" >&5
+ $as_echo "$as_me: error: abiword not found in PATH" >&2;}
+ { (exit 1); exit 1; }; }
diff --git a/editors/abiword-docs/pkg-plist b/editors/abiword-docs/pkg-plist
index 2a34df7f146f..baaa6e872556 100644
--- a/editors/abiword-docs/pkg-plist
+++ b/editors/abiword-docs/pkg-plist
@@ -1,242 +1,242 @@
-share/abiword-2.6/help/en-US/aboutos.html
-share/abiword-2.6/help/en-US/azindex.html
-share/abiword-2.6/help/en-US/credits.html
-share/abiword-2.6/help/en-US/fdl.html
-share/abiword-2.6/help/en-US/histyle.css
-share/abiword-2.6/help/en-US/howto/howtobidi.html
-share/abiword-2.6/help/en-US/howto/howtodocs.html
-share/abiword-2.6/help/en-US/howto/howtodocument.html
-share/abiword-2.6/help/en-US/howto/howtoexporthtml.html
-share/abiword-2.6/help/en-US/howto/howtohistory.html
-share/abiword-2.6/help/en-US/howto/howtolists.html
-share/abiword-2.6/help/en-US/howto/howtomailmerge.html
-share/abiword-2.6/help/en-US/howto/howtonormaltemplate.html
-share/abiword-2.6/help/en-US/howto/howtoprefs.html
-share/abiword-2.6/help/en-US/howto/howtorevisions.html
-share/abiword-2.6/help/en-US/howto/howtotables.html
-share/abiword-2.6/help/en-US/howto/howtotranslation.html
-share/abiword-2.6/help/en-US/howto/howtoweb.html
-share/abiword-2.6/help/en-US/howto/howtoword.html
-share/abiword-2.6/help/en-US/howto/index.html
-share/abiword-2.6/help/en-US/index.html
-share/abiword-2.6/help/en-US/info/index.html
-share/abiword-2.6/help/en-US/info/infoformats.html
-share/abiword-2.6/help/en-US/info/infomsdi.html
-share/abiword-2.6/help/en-US/info/inforequirements.html
-share/abiword-2.6/help/en-US/info/infosections.html
-share/abiword-2.6/help/en-US/info/infospelling.html
-share/abiword-2.6/help/en-US/interface/dialogbackgroundcolor.html
-share/abiword-2.6/help/en-US/interface/dialogbookmark.html
-share/abiword-2.6/help/en-US/interface/dialogbreak.html
-share/abiword-2.6/help/en-US/interface/dialogchangecase.html
-share/abiword-2.6/help/en-US/interface/dialogcolumns.html
-share/abiword-2.6/help/en-US/interface/dialogdateandtime.html
-share/abiword-2.6/help/en-US/interface/dialogfield.html
-share/abiword-2.6/help/en-US/interface/dialogfind.html
-share/abiword-2.6/help/en-US/interface/dialogfont.html
-share/abiword-2.6/help/en-US/interface/dialogformatfootnotes.html
-share/abiword-2.6/help/en-US/interface/dialogformatheaderfooters.html
-share/abiword-2.6/help/en-US/interface/dialogformattable.html
-share/abiword-2.6/help/en-US/interface/dialogformattextbox.html
-share/abiword-2.6/help/en-US/interface/dialoggoto.html
-share/abiword-2.6/help/en-US/interface/dialoghtmlexport.html
-share/abiword-2.6/help/en-US/interface/dialoghyperlink.html
-share/abiword-2.6/help/en-US/interface/dialogimageproperties.html
-share/abiword-2.6/help/en-US/interface/dialoginserttable.html
-share/abiword-2.6/help/en-US/interface/dialoglanguage.html
-share/abiword-2.6/help/en-US/interface/dialoglists.html
-share/abiword-2.6/help/en-US/interface/dialogmailmerge.html
-share/abiword-2.6/help/en-US/interface/dialogmailmergetool.html
-share/abiword-2.6/help/en-US/interface/dialogmarkrevisions.html
-share/abiword-2.6/help/en-US/interface/dialogmergecells.html
-share/abiword-2.6/help/en-US/interface/dialogmodifystyle.html
-share/abiword-2.6/help/en-US/interface/dialognew.html
-share/abiword-2.6/help/en-US/interface/dialognewstyle.html
-share/abiword-2.6/help/en-US/interface/dialogopenlinux.html
-share/abiword-2.6/help/en-US/interface/dialogpagenumbers.html
-share/abiword-2.6/help/en-US/interface/dialogpagesetup.html
-share/abiword-2.6/help/en-US/interface/dialogparagraph.html
-share/abiword-2.6/help/en-US/interface/dialogplugins.html
-share/abiword-2.6/help/en-US/interface/dialogpreferences.html
-share/abiword-2.6/help/en-US/interface/dialogprint.html
-share/abiword-2.6/help/en-US/interface/dialogproperties.html
-share/abiword-2.6/help/en-US/interface/dialogreplace.html
-share/abiword-2.6/help/en-US/interface/dialogsavelinux.html
-share/abiword-2.6/help/en-US/interface/dialogscreencolor.html
-share/abiword-2.6/help/en-US/interface/dialogselectrevision.html
-share/abiword-2.6/help/en-US/interface/dialogspelling.html
-share/abiword-2.6/help/en-US/interface/dialogstyles.html
-share/abiword-2.6/help/en-US/interface/dialogsymbol.html
-share/abiword-2.6/help/en-US/interface/dialogtabs.html
-share/abiword-2.6/help/en-US/interface/dialogviewdocument.html
-share/abiword-2.6/help/en-US/interface/dialogwordcount.html
-share/abiword-2.6/help/en-US/interface/dialogzoom.html
-share/abiword-2.6/help/en-US/interface/index.html
-share/abiword-2.6/help/en-US/interface/menucontextual.html
-share/abiword-2.6/help/en-US/interface/menuedit.html
-share/abiword-2.6/help/en-US/interface/menufile.html
-share/abiword-2.6/help/en-US/interface/menuformat.html
-share/abiword-2.6/help/en-US/interface/menuhelp.html
-share/abiword-2.6/help/en-US/interface/menuinsert.html
-share/abiword-2.6/help/en-US/interface/menutable.html
-share/abiword-2.6/help/en-US/interface/menutools.html
-share/abiword-2.6/help/en-US/interface/menuview.html
-share/abiword-2.6/help/en-US/interface/menuwindow.html
-share/abiword-2.6/help/en-US/interface/rulers.html
-share/abiword-2.6/help/en-US/interface/toolbarextra.html
-share/abiword-2.6/help/en-US/interface/toolbarformatting.html
-share/abiword-2.6/help/en-US/interface/toolbarstandard.html
-share/abiword-2.6/help/en-US/interface/toolbartable.html
-share/abiword-2.6/help/en-US/interface/workspace.html
-share/abiword-2.6/help/en-US/introduction.html
-share/abiword-2.6/help/en-US/plugins/index.html
-share/abiword-2.6/help/en-US/problems/index.html
-share/abiword-2.6/help/en-US/problems/problemsbugs.html
-share/abiword-2.6/help/en-US/problems/problemsfaq.html
-share/abiword-2.6/help/en-US/problems/problemshelp.html
-share/abiword-2.6/help/en-US/search.html
-share/abiword-2.6/help/en-US/style.css
-share/abiword-2.6/help/en-US/tutorial/index.html
-share/abiword-2.6/help/en-US/tutorial/intro.html
-share/abiword-2.6/help/en-US/tutorial/window.html
-share/abiword-2.6/help/fr-FR/aboutos.html
-share/abiword-2.6/help/fr-FR/credits.html
-share/abiword-2.6/help/fr-FR/fdl.html
-share/abiword-2.6/help/fr-FR/histyle.css
-share/abiword-2.6/help/fr-FR/howto/howtonormaltemplate.html
-share/abiword-2.6/help/fr-FR/howto/howtotables.html
-share/abiword-2.6/help/fr-FR/howto/howtoweb.html
-share/abiword-2.6/help/fr-FR/howto/howtoword.html
-share/abiword-2.6/help/fr-FR/howto/index.html
-share/abiword-2.6/help/fr-FR/index.html
-share/abiword-2.6/help/fr-FR/info/index.html
-share/abiword-2.6/help/fr-FR/info/infoformats.html
-share/abiword-2.6/help/fr-FR/info/infomsdi.html
-share/abiword-2.6/help/fr-FR/info/inforequirements.html
-share/abiword-2.6/help/fr-FR/info/infosections.html
-share/abiword-2.6/help/fr-FR/info/infospelling.html
-share/abiword-2.6/help/fr-FR/interface/dialogactivatewindow.html
-share/abiword-2.6/help/fr-FR/interface/dialogbackgroundcolor.html
-share/abiword-2.6/help/fr-FR/interface/dialogbookmark.html
-share/abiword-2.6/help/fr-FR/interface/dialogbreak.html
-share/abiword-2.6/help/fr-FR/interface/dialogchangecase.html
-share/abiword-2.6/help/fr-FR/interface/dialogcolumns.html
-share/abiword-2.6/help/fr-FR/interface/dialogdateandtime.html
-share/abiword-2.6/help/fr-FR/interface/dialogfield.html
-share/abiword-2.6/help/fr-FR/interface/dialogfind.html
-share/abiword-2.6/help/fr-FR/interface/dialogfont.html
-share/abiword-2.6/help/fr-FR/interface/dialogformatheaderfooters.html
-share/abiword-2.6/help/fr-FR/interface/dialoggoto.html
-share/abiword-2.6/help/fr-FR/interface/dialoghyperlink.html
-share/abiword-2.6/help/fr-FR/interface/dialogimageproperties.html
-share/abiword-2.6/help/fr-FR/interface/dialoglanguage.html
-share/abiword-2.6/help/fr-FR/interface/dialoglists.html
-share/abiword-2.6/help/fr-FR/interface/dialogmodifystyle.html
-share/abiword-2.6/help/fr-FR/interface/dialognew.html
-share/abiword-2.6/help/fr-FR/interface/dialognewstyle.html
-share/abiword-2.6/help/fr-FR/interface/dialogopenlinux.html
-share/abiword-2.6/help/fr-FR/interface/dialogpagenumbers.html
-share/abiword-2.6/help/fr-FR/interface/dialogpagesetup.html
-share/abiword-2.6/help/fr-FR/interface/dialogparagraph.html
-share/abiword-2.6/help/fr-FR/interface/dialogplugins.html
-share/abiword-2.6/help/fr-FR/interface/dialogpreferences.html
-share/abiword-2.6/help/fr-FR/interface/dialogreplace.html
-share/abiword-2.6/help/fr-FR/interface/dialogsavelinux.html
-share/abiword-2.6/help/fr-FR/interface/dialogscreencolor.html
-share/abiword-2.6/help/fr-FR/interface/dialogspelling.html
-share/abiword-2.6/help/fr-FR/interface/dialogstyles.html
-share/abiword-2.6/help/fr-FR/interface/dialogsymbol.html
-share/abiword-2.6/help/fr-FR/interface/dialogtabs.html
-share/abiword-2.6/help/fr-FR/interface/dialogwordcount.html
-share/abiword-2.6/help/fr-FR/interface/dialogzoom.html
-share/abiword-2.6/help/fr-FR/interface/index.html
-share/abiword-2.6/help/fr-FR/interface/menucontextual.html
-share/abiword-2.6/help/fr-FR/interface/menuedit.html
-share/abiword-2.6/help/fr-FR/interface/menufile.html
-share/abiword-2.6/help/fr-FR/interface/menuformat.html
-share/abiword-2.6/help/fr-FR/interface/menuhelp.html
-share/abiword-2.6/help/fr-FR/interface/menuinsert.html
-share/abiword-2.6/help/fr-FR/interface/menutools.html
-share/abiword-2.6/help/fr-FR/interface/menuview.html
-share/abiword-2.6/help/fr-FR/interface/menuweb.html
-share/abiword-2.6/help/fr-FR/interface/menuwindow.html
-share/abiword-2.6/help/fr-FR/interface/rulers.html
-share/abiword-2.6/help/fr-FR/interface/toolbarextra.html
-share/abiword-2.6/help/fr-FR/interface/toolbarformatting.html
-share/abiword-2.6/help/fr-FR/interface/toolbarstandard.html
-share/abiword-2.6/help/fr-FR/interface/workspace.html
-share/abiword-2.6/help/fr-FR/introduction.html
-share/abiword-2.6/help/fr-FR/plugins/index.html
-share/abiword-2.6/help/fr-FR/style.css
-share/abiword-2.6/help/fr-FR/tutorial/index.html
-share/abiword-2.6/help/pl-PL/aboutos.html
-share/abiword-2.6/help/pl-PL/credits.html
-share/abiword-2.6/help/pl-PL/fdl.html
-share/abiword-2.6/help/pl-PL/fdl_pl.html
-share/abiword-2.6/help/pl-PL/histyle.css
-share/abiword-2.6/help/pl-PL/howto/howtonormaltemplate.html
-share/abiword-2.6/help/pl-PL/howto/howtotables.html
-share/abiword-2.6/help/pl-PL/howto/howtoweb.html
-share/abiword-2.6/help/pl-PL/howto/howtoword.html
-share/abiword-2.6/help/pl-PL/howto/index.html
-share/abiword-2.6/help/pl-PL/index.html
-share/abiword-2.6/help/pl-PL/info/index.html
-share/abiword-2.6/help/pl-PL/info/infoformats.html
-share/abiword-2.6/help/pl-PL/info/infomsdi.html
-share/abiword-2.6/help/pl-PL/info/inforequirements.html
-share/abiword-2.6/help/pl-PL/info/infosections.html
-share/abiword-2.6/help/pl-PL/interface/dialogactivatewindow.html
-share/abiword-2.6/help/pl-PL/interface/dialogbookmark.html
-share/abiword-2.6/help/pl-PL/interface/dialogfont.html
-share/abiword-2.6/help/pl-PL/interface/dialogformatheaderfooters.html
-share/abiword-2.6/help/pl-PL/interface/dialoggoto.html
-share/abiword-2.6/help/pl-PL/interface/dialoghyperlink.html
-share/abiword-2.6/help/pl-PL/interface/dialogmodifystyle.html
-share/abiword-2.6/help/pl-PL/interface/dialognew.html
-share/abiword-2.6/help/pl-PL/interface/dialogparagraph.html
-share/abiword-2.6/help/pl-PL/interface/dialogwordcount.html
-share/abiword-2.6/help/pl-PL/interface/dialogzoom.html
-share/abiword-2.6/help/pl-PL/interface/index.html
-share/abiword-2.6/help/pl-PL/interface/menucontextual.html
-share/abiword-2.6/help/pl-PL/interface/menuedit.html
-share/abiword-2.6/help/pl-PL/interface/menufile.html
-share/abiword-2.6/help/pl-PL/interface/menuformat.html
-share/abiword-2.6/help/pl-PL/interface/menuhelp.html
-share/abiword-2.6/help/pl-PL/interface/menuinsert.html
-share/abiword-2.6/help/pl-PL/interface/menutools.html
-share/abiword-2.6/help/pl-PL/interface/menuweb.html
-share/abiword-2.6/help/pl-PL/interface/menuwindow.html
-share/abiword-2.6/help/pl-PL/interface/rulers.html
-share/abiword-2.6/help/pl-PL/interface/toolbarextra.html
-share/abiword-2.6/help/pl-PL/interface/toolbarformatting.html
-share/abiword-2.6/help/pl-PL/interface/toolbarstandard.html
-share/abiword-2.6/help/pl-PL/interface/workspace.html
-share/abiword-2.6/help/pl-PL/introduction.html
-share/abiword-2.6/help/pl-PL/plugins/index.html
-share/abiword-2.6/help/pl-PL/problems/index.html
-share/abiword-2.6/help/pl-PL/problems/problemsbugs.html
-share/abiword-2.6/help/pl-PL/problems/problemsfaq.html
-share/abiword-2.6/help/pl-PL/problems/problemshelp.html
-share/abiword-2.6/help/pl-PL/style.css
-share/abiword-2.6/help/pl-PL/tutorial/index.html
-@dirrm share/abiword-2.6/help/pl-PL/tutorial
-@dirrm share/abiword-2.6/help/pl-PL/problems
-@dirrm share/abiword-2.6/help/pl-PL/plugins
-@dirrm share/abiword-2.6/help/pl-PL/interface
-@dirrm share/abiword-2.6/help/pl-PL/info
-@dirrm share/abiword-2.6/help/pl-PL/howto
-@dirrm share/abiword-2.6/help/pl-PL
-@dirrm share/abiword-2.6/help/fr-FR/tutorial
-@dirrm share/abiword-2.6/help/fr-FR/plugins
-@dirrm share/abiword-2.6/help/fr-FR/interface
-@dirrm share/abiword-2.6/help/fr-FR/info
-@dirrm share/abiword-2.6/help/fr-FR/howto
-@dirrm share/abiword-2.6/help/fr-FR
-@dirrm share/abiword-2.6/help/en-US/tutorial
-@dirrm share/abiword-2.6/help/en-US/problems
-@dirrm share/abiword-2.6/help/en-US/plugins
-@dirrm share/abiword-2.6/help/en-US/interface
-@dirrm share/abiword-2.6/help/en-US/info
-@dirrm share/abiword-2.6/help/en-US/howto
-@dirrm share/abiword-2.6/help/en-US
-@dirrm share/abiword-2.6/help
+share/abiword-2.8/help/en-US/aboutos.html
+share/abiword-2.8/help/en-US/azindex.html
+share/abiword-2.8/help/en-US/credits.html
+share/abiword-2.8/help/en-US/fdl.html
+share/abiword-2.8/help/en-US/histyle.css
+share/abiword-2.8/help/en-US/howto/howtobidi.html
+share/abiword-2.8/help/en-US/howto/howtodocs.html
+share/abiword-2.8/help/en-US/howto/howtodocument.html
+share/abiword-2.8/help/en-US/howto/howtoexporthtml.html
+share/abiword-2.8/help/en-US/howto/howtohistory.html
+share/abiword-2.8/help/en-US/howto/howtolists.html
+share/abiword-2.8/help/en-US/howto/howtomailmerge.html
+share/abiword-2.8/help/en-US/howto/howtonormaltemplate.html
+share/abiword-2.8/help/en-US/howto/howtoprefs.html
+share/abiword-2.8/help/en-US/howto/howtorevisions.html
+share/abiword-2.8/help/en-US/howto/howtotables.html
+share/abiword-2.8/help/en-US/howto/howtotranslation.html
+share/abiword-2.8/help/en-US/howto/howtoweb.html
+share/abiword-2.8/help/en-US/howto/howtoword.html
+share/abiword-2.8/help/en-US/howto/index.html
+share/abiword-2.8/help/en-US/index.html
+share/abiword-2.8/help/en-US/info/index.html
+share/abiword-2.8/help/en-US/info/infoformats.html
+share/abiword-2.8/help/en-US/info/infomsdi.html
+share/abiword-2.8/help/en-US/info/inforequirements.html
+share/abiword-2.8/help/en-US/info/infosections.html
+share/abiword-2.8/help/en-US/info/infospelling.html
+share/abiword-2.8/help/en-US/interface/dialogbackgroundcolor.html
+share/abiword-2.8/help/en-US/interface/dialogbookmark.html
+share/abiword-2.8/help/en-US/interface/dialogbreak.html
+share/abiword-2.8/help/en-US/interface/dialogchangecase.html
+share/abiword-2.8/help/en-US/interface/dialogcolumns.html
+share/abiword-2.8/help/en-US/interface/dialogdateandtime.html
+share/abiword-2.8/help/en-US/interface/dialogfield.html
+share/abiword-2.8/help/en-US/interface/dialogfind.html
+share/abiword-2.8/help/en-US/interface/dialogfont.html
+share/abiword-2.8/help/en-US/interface/dialogformatfootnotes.html
+share/abiword-2.8/help/en-US/interface/dialogformatheaderfooters.html
+share/abiword-2.8/help/en-US/interface/dialogformattable.html
+share/abiword-2.8/help/en-US/interface/dialogformattextbox.html
+share/abiword-2.8/help/en-US/interface/dialoggoto.html
+share/abiword-2.8/help/en-US/interface/dialoghtmlexport.html
+share/abiword-2.8/help/en-US/interface/dialoghyperlink.html
+share/abiword-2.8/help/en-US/interface/dialogimageproperties.html
+share/abiword-2.8/help/en-US/interface/dialoginserttable.html
+share/abiword-2.8/help/en-US/interface/dialoglanguage.html
+share/abiword-2.8/help/en-US/interface/dialoglists.html
+share/abiword-2.8/help/en-US/interface/dialogmailmerge.html
+share/abiword-2.8/help/en-US/interface/dialogmailmergetool.html
+share/abiword-2.8/help/en-US/interface/dialogmarkrevisions.html
+share/abiword-2.8/help/en-US/interface/dialogmergecells.html
+share/abiword-2.8/help/en-US/interface/dialogmodifystyle.html
+share/abiword-2.8/help/en-US/interface/dialognew.html
+share/abiword-2.8/help/en-US/interface/dialognewstyle.html
+share/abiword-2.8/help/en-US/interface/dialogopenlinux.html
+share/abiword-2.8/help/en-US/interface/dialogpagenumbers.html
+share/abiword-2.8/help/en-US/interface/dialogpagesetup.html
+share/abiword-2.8/help/en-US/interface/dialogparagraph.html
+share/abiword-2.8/help/en-US/interface/dialogplugins.html
+share/abiword-2.8/help/en-US/interface/dialogpreferences.html
+share/abiword-2.8/help/en-US/interface/dialogprint.html
+share/abiword-2.8/help/en-US/interface/dialogproperties.html
+share/abiword-2.8/help/en-US/interface/dialogreplace.html
+share/abiword-2.8/help/en-US/interface/dialogsavelinux.html
+share/abiword-2.8/help/en-US/interface/dialogscreencolor.html
+share/abiword-2.8/help/en-US/interface/dialogselectrevision.html
+share/abiword-2.8/help/en-US/interface/dialogspelling.html
+share/abiword-2.8/help/en-US/interface/dialogstyles.html
+share/abiword-2.8/help/en-US/interface/dialogsymbol.html
+share/abiword-2.8/help/en-US/interface/dialogtabs.html
+share/abiword-2.8/help/en-US/interface/dialogviewdocument.html
+share/abiword-2.8/help/en-US/interface/dialogwordcount.html
+share/abiword-2.8/help/en-US/interface/dialogzoom.html
+share/abiword-2.8/help/en-US/interface/index.html
+share/abiword-2.8/help/en-US/interface/menucontextual.html
+share/abiword-2.8/help/en-US/interface/menuedit.html
+share/abiword-2.8/help/en-US/interface/menufile.html
+share/abiword-2.8/help/en-US/interface/menuformat.html
+share/abiword-2.8/help/en-US/interface/menuhelp.html
+share/abiword-2.8/help/en-US/interface/menuinsert.html
+share/abiword-2.8/help/en-US/interface/menutable.html
+share/abiword-2.8/help/en-US/interface/menutools.html
+share/abiword-2.8/help/en-US/interface/menuview.html
+share/abiword-2.8/help/en-US/interface/menuwindow.html
+share/abiword-2.8/help/en-US/interface/rulers.html
+share/abiword-2.8/help/en-US/interface/toolbarextra.html
+share/abiword-2.8/help/en-US/interface/toolbarformatting.html
+share/abiword-2.8/help/en-US/interface/toolbarstandard.html
+share/abiword-2.8/help/en-US/interface/toolbartable.html
+share/abiword-2.8/help/en-US/interface/workspace.html
+share/abiword-2.8/help/en-US/introduction.html
+share/abiword-2.8/help/en-US/plugins/index.html
+share/abiword-2.8/help/en-US/problems/index.html
+share/abiword-2.8/help/en-US/problems/problemsbugs.html
+share/abiword-2.8/help/en-US/problems/problemsfaq.html
+share/abiword-2.8/help/en-US/problems/problemshelp.html
+share/abiword-2.8/help/en-US/search.html
+share/abiword-2.8/help/en-US/style.css
+share/abiword-2.8/help/en-US/tutorial/index.html
+share/abiword-2.8/help/en-US/tutorial/intro.html
+share/abiword-2.8/help/en-US/tutorial/window.html
+share/abiword-2.8/help/fr-FR/aboutos.html
+share/abiword-2.8/help/fr-FR/credits.html
+share/abiword-2.8/help/fr-FR/fdl.html
+share/abiword-2.8/help/fr-FR/histyle.css
+share/abiword-2.8/help/fr-FR/howto/howtonormaltemplate.html
+share/abiword-2.8/help/fr-FR/howto/howtotables.html
+share/abiword-2.8/help/fr-FR/howto/howtoweb.html
+share/abiword-2.8/help/fr-FR/howto/howtoword.html
+share/abiword-2.8/help/fr-FR/howto/index.html
+share/abiword-2.8/help/fr-FR/index.html
+share/abiword-2.8/help/fr-FR/info/index.html
+share/abiword-2.8/help/fr-FR/info/infoformats.html
+share/abiword-2.8/help/fr-FR/info/infomsdi.html
+share/abiword-2.8/help/fr-FR/info/inforequirements.html
+share/abiword-2.8/help/fr-FR/info/infosections.html
+share/abiword-2.8/help/fr-FR/info/infospelling.html
+share/abiword-2.8/help/fr-FR/interface/dialogactivatewindow.html
+share/abiword-2.8/help/fr-FR/interface/dialogbackgroundcolor.html
+share/abiword-2.8/help/fr-FR/interface/dialogbookmark.html
+share/abiword-2.8/help/fr-FR/interface/dialogbreak.html
+share/abiword-2.8/help/fr-FR/interface/dialogchangecase.html
+share/abiword-2.8/help/fr-FR/interface/dialogcolumns.html
+share/abiword-2.8/help/fr-FR/interface/dialogdateandtime.html
+share/abiword-2.8/help/fr-FR/interface/dialogfield.html
+share/abiword-2.8/help/fr-FR/interface/dialogfind.html
+share/abiword-2.8/help/fr-FR/interface/dialogfont.html
+share/abiword-2.8/help/fr-FR/interface/dialogformatheaderfooters.html
+share/abiword-2.8/help/fr-FR/interface/dialoggoto.html
+share/abiword-2.8/help/fr-FR/interface/dialoghyperlink.html
+share/abiword-2.8/help/fr-FR/interface/dialogimageproperties.html
+share/abiword-2.8/help/fr-FR/interface/dialoglanguage.html
+share/abiword-2.8/help/fr-FR/interface/dialoglists.html
+share/abiword-2.8/help/fr-FR/interface/dialogmodifystyle.html
+share/abiword-2.8/help/fr-FR/interface/dialognew.html
+share/abiword-2.8/help/fr-FR/interface/dialognewstyle.html
+share/abiword-2.8/help/fr-FR/interface/dialogopenlinux.html
+share/abiword-2.8/help/fr-FR/interface/dialogpagenumbers.html
+share/abiword-2.8/help/fr-FR/interface/dialogpagesetup.html
+share/abiword-2.8/help/fr-FR/interface/dialogparagraph.html
+share/abiword-2.8/help/fr-FR/interface/dialogplugins.html
+share/abiword-2.8/help/fr-FR/interface/dialogpreferences.html
+share/abiword-2.8/help/fr-FR/interface/dialogreplace.html
+share/abiword-2.8/help/fr-FR/interface/dialogsavelinux.html
+share/abiword-2.8/help/fr-FR/interface/dialogscreencolor.html
+share/abiword-2.8/help/fr-FR/interface/dialogspelling.html
+share/abiword-2.8/help/fr-FR/interface/dialogstyles.html
+share/abiword-2.8/help/fr-FR/interface/dialogsymbol.html
+share/abiword-2.8/help/fr-FR/interface/dialogtabs.html
+share/abiword-2.8/help/fr-FR/interface/dialogwordcount.html
+share/abiword-2.8/help/fr-FR/interface/dialogzoom.html
+share/abiword-2.8/help/fr-FR/interface/index.html
+share/abiword-2.8/help/fr-FR/interface/menucontextual.html
+share/abiword-2.8/help/fr-FR/interface/menuedit.html
+share/abiword-2.8/help/fr-FR/interface/menufile.html
+share/abiword-2.8/help/fr-FR/interface/menuformat.html
+share/abiword-2.8/help/fr-FR/interface/menuhelp.html
+share/abiword-2.8/help/fr-FR/interface/menuinsert.html
+share/abiword-2.8/help/fr-FR/interface/menutools.html
+share/abiword-2.8/help/fr-FR/interface/menuview.html
+share/abiword-2.8/help/fr-FR/interface/menuweb.html
+share/abiword-2.8/help/fr-FR/interface/menuwindow.html
+share/abiword-2.8/help/fr-FR/interface/rulers.html
+share/abiword-2.8/help/fr-FR/interface/toolbarextra.html
+share/abiword-2.8/help/fr-FR/interface/toolbarformatting.html
+share/abiword-2.8/help/fr-FR/interface/toolbarstandard.html
+share/abiword-2.8/help/fr-FR/interface/workspace.html
+share/abiword-2.8/help/fr-FR/introduction.html
+share/abiword-2.8/help/fr-FR/plugins/index.html
+share/abiword-2.8/help/fr-FR/style.css
+share/abiword-2.8/help/fr-FR/tutorial/index.html
+share/abiword-2.8/help/pl-PL/aboutos.html
+share/abiword-2.8/help/pl-PL/credits.html
+share/abiword-2.8/help/pl-PL/fdl.html
+share/abiword-2.8/help/pl-PL/fdl_pl.html
+share/abiword-2.8/help/pl-PL/histyle.css
+share/abiword-2.8/help/pl-PL/howto/howtonormaltemplate.html
+share/abiword-2.8/help/pl-PL/howto/howtotables.html
+share/abiword-2.8/help/pl-PL/howto/howtoweb.html
+share/abiword-2.8/help/pl-PL/howto/howtoword.html
+share/abiword-2.8/help/pl-PL/howto/index.html
+share/abiword-2.8/help/pl-PL/index.html
+share/abiword-2.8/help/pl-PL/info/index.html
+share/abiword-2.8/help/pl-PL/info/infoformats.html
+share/abiword-2.8/help/pl-PL/info/infomsdi.html
+share/abiword-2.8/help/pl-PL/info/inforequirements.html
+share/abiword-2.8/help/pl-PL/info/infosections.html
+share/abiword-2.8/help/pl-PL/interface/dialogactivatewindow.html
+share/abiword-2.8/help/pl-PL/interface/dialogbookmark.html
+share/abiword-2.8/help/pl-PL/interface/dialogfont.html
+share/abiword-2.8/help/pl-PL/interface/dialogformatheaderfooters.html
+share/abiword-2.8/help/pl-PL/interface/dialoggoto.html
+share/abiword-2.8/help/pl-PL/interface/dialoghyperlink.html
+share/abiword-2.8/help/pl-PL/interface/dialogmodifystyle.html
+share/abiword-2.8/help/pl-PL/interface/dialognew.html
+share/abiword-2.8/help/pl-PL/interface/dialogparagraph.html
+share/abiword-2.8/help/pl-PL/interface/dialogwordcount.html
+share/abiword-2.8/help/pl-PL/interface/dialogzoom.html
+share/abiword-2.8/help/pl-PL/interface/index.html
+share/abiword-2.8/help/pl-PL/interface/menucontextual.html
+share/abiword-2.8/help/pl-PL/interface/menuedit.html
+share/abiword-2.8/help/pl-PL/interface/menufile.html
+share/abiword-2.8/help/pl-PL/interface/menuformat.html
+share/abiword-2.8/help/pl-PL/interface/menuhelp.html
+share/abiword-2.8/help/pl-PL/interface/menuinsert.html
+share/abiword-2.8/help/pl-PL/interface/menutools.html
+share/abiword-2.8/help/pl-PL/interface/menuweb.html
+share/abiword-2.8/help/pl-PL/interface/menuwindow.html
+share/abiword-2.8/help/pl-PL/interface/rulers.html
+share/abiword-2.8/help/pl-PL/interface/toolbarextra.html
+share/abiword-2.8/help/pl-PL/interface/toolbarformatting.html
+share/abiword-2.8/help/pl-PL/interface/toolbarstandard.html
+share/abiword-2.8/help/pl-PL/interface/workspace.html
+share/abiword-2.8/help/pl-PL/introduction.html
+share/abiword-2.8/help/pl-PL/plugins/index.html
+share/abiword-2.8/help/pl-PL/problems/index.html
+share/abiword-2.8/help/pl-PL/problems/problemsbugs.html
+share/abiword-2.8/help/pl-PL/problems/problemsfaq.html
+share/abiword-2.8/help/pl-PL/problems/problemshelp.html
+share/abiword-2.8/help/pl-PL/style.css
+share/abiword-2.8/help/pl-PL/tutorial/index.html
+@dirrm share/abiword-2.8/help/pl-PL/tutorial
+@dirrm share/abiword-2.8/help/pl-PL/problems
+@dirrm share/abiword-2.8/help/pl-PL/plugins
+@dirrm share/abiword-2.8/help/pl-PL/interface
+@dirrm share/abiword-2.8/help/pl-PL/info
+@dirrm share/abiword-2.8/help/pl-PL/howto
+@dirrm share/abiword-2.8/help/pl-PL
+@dirrm share/abiword-2.8/help/fr-FR/tutorial
+@dirrm share/abiword-2.8/help/fr-FR/plugins
+@dirrm share/abiword-2.8/help/fr-FR/interface
+@dirrm share/abiword-2.8/help/fr-FR/info
+@dirrm share/abiword-2.8/help/fr-FR/howto
+@dirrm share/abiword-2.8/help/fr-FR
+@dirrm share/abiword-2.8/help/en-US/tutorial
+@dirrm share/abiword-2.8/help/en-US/problems
+@dirrm share/abiword-2.8/help/en-US/plugins
+@dirrm share/abiword-2.8/help/en-US/interface
+@dirrm share/abiword-2.8/help/en-US/info
+@dirrm share/abiword-2.8/help/en-US/howto
+@dirrm share/abiword-2.8/help/en-US
+@dirrm share/abiword-2.8/help
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 9f2cb9239852..fd825fe3ca95 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/abiword/Makefile,v 1.11 2008/08/19 00:45:06 marcus Exp $
+# $MCom: ports/editors/abiword/Makefile,v 1.13 2009/11/10 13:56:18 kwm Exp $
#
PORTNAME= abiword
-PORTVERSION= 2.6.8
-PORTREVISION= 4
+PORTVERSION= 2.8.1
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
MASTER_SITE_SUBDIR= abiword
@@ -17,86 +16,85 @@ DIST_SUBDIR= AbiWord
MAINTAINER= gnome@FreeBSD.org
COMMENT= An open-source, cross-platform WYSIWYG word processor
-# unzip is needed during the installation process
-BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
png.5:${PORTSDIR}/graphics/png \
wv-1.2:${PORTSDIR}/textproc/wv \
jpeg.10:${PORTSDIR}/graphics/jpeg \
fribidi.3:${PORTSDIR}/converters/fribidi \
- goffice-0.4:${PORTSDIR}/devel/goffice04
+ goffice-0.8.7:${PORTSDIR}/devel/goffice
RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSerif.ttf:${PORTSDIR}/x11-fonts/dejavu
USE_GMAKE= yes
USE_ICONV= yes
-USE_GNOME= gnomehack libglade2 libxml2 libgnomeprintui desktopfileutils
+USE_GNOME= gnomehack libxml2 gtk20 desktopfileutils
WANT_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-popt=${LOCALBASE} \
- --with-zlib=${LOCALBASE} \
- --with-libpng=${LOCALBASE} \
- --with-libiconv=${LOCALBASE} \
- --with-libjpeg-prefix=${LOCALBASE} \
- --disable-peer-config
-MAKEFILE= GNUmakefile
-GNOME_MAKEFILEIN=GNUmakefile.in
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --without-gnomevfs --disable-collab-backend-xmpp \
+ --disable-collab-backend-sugar
+USE_LDCONFIG= yes
+INSTALLS_ICONS= yes
-ABIVERSION= 2.6
+ABIVERSION= 2.8
PLIST_SUB+= ABIVERSION=${ABIVERSION}
+OPTIONS= DEBUG "Enable debug" off \
+ BOOST "Build with boost" on \
+ GUCHARMAP "Use Gucharmap as the symbol insertion tool" on \
+ SPELLCHECK "Enable spell checking support" on \
+ CLIPART "Install clipart" on \
+ TEMPLATES "Install additional templates" on
+
+.include <bsd.port.pre.mk>
+
.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+= --enable-debug \
- --enable-symbols
+CONFIGURE_ARGS+= --enable-debug --enable-symbols
.endif
-.ifndef(WITHOUT_GTKSPELL)
-LIB_DEPENDS+= enchant.1:${PORTSDIR}/textproc/enchant
-CONFIGURE_ARGS+= --enable-spellcheck
-PLIST_SUB+= DICT:=""
+.if defined(WITH_BOOST)
+CONFIGURE_ARGS+= --with-boost
+LIB_DEPENDS+= boost_system.4:${PORTSDIR}/devel/boost-libs
.else
-CONFIGURE_ARGS+= --disable-spellcheck
-PLIST_SUB+= DICT:="@comment "
+CONFIGURE_ARGS+= --without-boost
.endif
-.include <bsd.port.pre.mk>
-
-#.if ${HAVE_GNOME:Mlibgnomeui}!=""
-#USE_GNOME+= libgnomeui
-#CONFIGURE_ARGS+= --enable-gnomeui
-#PKGNAMESUFFIX:= -gnome
-#.else
-#CONFIGURE_ARGS+= --disable-gnomeui
-#.endif
+.if defined(WITH_SPELLCHECK)
+LIB_DEPENDS+= enchant.1:${PORTSDIR}/textproc/enchant
+CONFIGURE_ARGS+= --enable-spell
+PLIST_SUB+= DICT=""
+.else
+CONFIGURE_ARGS+= --disable-spell
+PLIST_SUB+= DICT="@comment "
+.endif
-#.if (defined(WITH_GUCHARMAP) || \
-# exists(${LOCALBASE}/libdata/pkgconfig/gucharmap.pc)) && \
-# !defined(WITHOUT_GUCHARMAP)
-#LIB_DEPENDS+= gucharmap.6:${PORTSDIR}/deskutils/gucharmap
-#CONFIGURE_ARGS+= --enable-gucharmap
-#.else
-CONFIGURE_ARGS+= --disable-gucharmap
-#.endif
+.if defined(WITH_GUCHARMAP)
+LIB_DEPENDS+= gucharmap.7:${PORTSDIR}/deskutils/gucharmap
+CONFIGURE_ARGS+= --with-gucharmap
+.else
+CONFIGURE_ARGS+= --without-gucharmap
+.endif
-pre-everything::
- @${ECHO_MSG} ""
- @${ECHO_MSG} "AbiWord2 has the following tunable option(s):"
- @${ECHO_MSG} " WITH_DEBUG=yes Enable debug."
-# @${ECHO_MSG} " WITH_GUCHARMAP=yes Enable use of Gucharmap as the symbol insertion tool (default: auto)"
- @${ECHO_MSG} " WITHOUT_GTKSPELL=yes Don't use Enchant, but still enable spellchecking and install the dictionary."
- @${ECHO_MSG} ""
+.if defined(WITH_TEMPLATES)
+CONFIGURE_ARGS+= --enable-templates
+PLIST_SUB+= TEMPLATES=""
+.else
+CONFIGURE_ARGS+= --disable-templates
+PLIST_SUB+= TEMPLATES="@comment "
+.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|-ansi||g ; s|-pedantic||g ; \
- s|/usr/X11R6|${LOCALBASE}|g' \
- ${WRKSRC}/configure
- @${FIND} ${WRKSRC}/src/config/platforms -name "*.mk" | ${XARGS} \
- ${REINPLACE_CMD} 's|-ansi||g ; s|-pedantic||g'
- @${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \
- 's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \
- s|[(]datadir[)]/icons|(datadir)/pixmaps|g'
+.if defined(WITH_CLIPART)
+CONFIGURE_ARGS+= --enable-clipart
+PLIST_SUB+= CLIPART=""
+.else
+CONFIGURE_ARGS+= --disable-clipart
+PLIST_SUB+= CLIPART="@comment "
+.endif
post-install:
@${MKDIR} ${PREFIX}/lib/${PORTNAME}-${ABIVERSION}/plugins
@-update-desktop-database
+ @${MKDIR} ${PREFIX}/share/mime-info/packages
+ @-update-mime-database ${PREFIX}/share/mime-info
.include <bsd.port.post.mk>
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index bd08a2ad98d3..e4fe4f2e4772 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,3 +1,3 @@
-MD5 (AbiWord/abiword-2.6.8.tar.gz) = fab04d8ef999c303f720197adf261310
-SHA256 (AbiWord/abiword-2.6.8.tar.gz) = b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93
-SIZE (AbiWord/abiword-2.6.8.tar.gz) = 9516443
+MD5 (AbiWord/abiword-2.8.1.tar.gz) = 284fe25289c160c3797b527a8aacad12
+SHA256 (AbiWord/abiword-2.8.1.tar.gz) = f51b614b1202cf63a5f7ede093d31d638ece3c8e76da4036cc4aed589a9cd2ec
+SIZE (AbiWord/abiword-2.8.1.tar.gz) = 8618745
diff --git a/editors/abiword/files/patch-Makefile.in b/editors/abiword/files/patch-Makefile.in
new file mode 100644
index 000000000000..cb470743befa
--- /dev/null
+++ b/editors/abiword/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2009-10-28 18:39:23.000000000 +0100
++++ Makefile.in 2009-10-28 18:39:42.000000000 +0100
+@@ -418,7 +418,7 @@ DIST_SUBDIRS = goffice-bits src plugins
+ @WITH_GOFFICE_BUILTIN_TRUE@SUBDIRS = goffice-bits src plugins user
+ @EMBEDDED_HILDON_FALSE@@TOOLKIT_GTK_TRUE@desktopdir = $(datadir)/applications
+ @EMBEDDED_HILDON_FALSE@@TOOLKIT_GTK_TRUE@desktop_DATA = abiword.desktop
+-@TOOLKIT_GTK_TRUE@mimedir = @ABIWORD_DATADIR@/mime-info
++@TOOLKIT_GTK_TRUE@mimedir = $(datadir)/mime-info
+ @TOOLKIT_GTK_TRUE@mime_DATA = abiword.keys
+ @TOOLKIT_GTK_TRUE@pkgconfigdir = $(prefix)/libdata/pkgconfig
+ @TOOLKIT_GTK_TRUE@pkgconfig_DATA = abiword-$(ABIWORD_SERIES).pc
diff --git a/editors/abiword/files/patch-abiword.desktop b/editors/abiword/files/patch-abiword.desktop
index 427bc52c7b10..787b935038af 100644
--- a/editors/abiword/files/patch-abiword.desktop
+++ b/editors/abiword/files/patch-abiword.desktop
@@ -1,16 +1,11 @@
---- abiword.desktop.orig 2008-04-01 15:30:19.000000000 -0500
-+++ abiword.desktop 2008-04-01 15:31:19.000000000 -0500
-@@ -3,11 +3,11 @@
- Icon=abiword_48.png
- Terminal=false
- Type=Application
--Categories=Application;Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
-+Categories=Application;Office;WordProcessor;GNOME;GTK;
+--- abiword.desktop.orig 2009-06-21 15:28:21.000000000 +0200
++++ abiword.desktop 2009-10-27 22:41:05.000000000 +0100
+@@ -6,7 +6,7 @@ Type=Application
+ Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
StartupNotify=true
- Encoding=UTF-8
X-Desktop-File-Install-Version=0.9
--MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;
-+MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;
+-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab;
++MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab;
Name=AbiWord
GenericName=Word Processor
- Comment=AbiWord Word Processor
+ Comment=Compose, edit, and view documents
diff --git a/editors/abiword/files/patch-an b/editors/abiword/files/patch-an
deleted file mode 100644
index 5e9e8c01d301..000000000000
--- a/editors/abiword/files/patch-an
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/Makefile.orig 2008-04-01 15:43:32.000000000 -0500
-+++ src/Makefile 2008-04-01 15:45:09.000000000 -0500
-@@ -52,6 +52,7 @@
-
- ## Set the following to a list of pathnames to be copied to $(CANONDIR)
- CANON_TOPLEVELFILES= $(ABI_ROOT)/COPYING $(ABI_ROOT)/user/wp/readme.txt $(ABI_ROOT)/user/wp/readme.abw
-+CANON_TLF_NOTDIR= $(notdir $(CANON_TOPLEVELFILES))
-
- ## Set the following to a list of directories (probably a subset of DIRS)
- ## that have work to do.
-@@ -62,6 +63,9 @@
- @for k in $(CANON_TOPLEVELFILES); do \
- $(ABICOPY) $$k $(CANONDIR); \
- done
-+ @for k in $(CANON_TLF_NOTDIR); do \
-+ $(ABICHMOD) ugo=r $(CANONDIR)/$$k; \
-+ done
- @for k in $(CANON_SubDirs); do \
- $(MAKE) ABI_ROOT=$(ABI_ROOT) -C $$k canonical; \
- done
-@@ -83,6 +87,7 @@
- ifeq ($(ABI_OPT_PSPELL),1)
- echo "Using Pspell build, not installing ispell hash files"
- else
-+ @(cd $(CANONDIR)/dictionary; $(ABICHMOD) ugo=r *)
- # We currently only ship american.hash
- @$(subst xxxx,$(CANONDIR)/dictionary,$(VERIFY_DIRECTORY))
- @$(ABICOPY) $(ABI_ROOT)/../abidistfiles/dictionary/$(OS_ENDIAN).american.hash $(CANONDIR)/dictionary/american.hash
-@@ -92,7 +97,8 @@
- ifeq ($(ABI_NATIVE),unix)
- # icons for X window manager use
- @$(subst xxxx,$(CANONDIR)/icons,$(VERIFY_DIRECTORY))
-- (cd $(ABI_ROOT)/../abidistfiles/icons; cp abi* $(CANONDIR)/icons)
-+ (cd $(ABI_ROOT)/../abidistfiles/icons; $(ABICOPY) abi* $(CANONDIR)/icons)
-+ @(cd $(CANONDIR)/icons; $(ABICHMOD) ugo=r abi*)
- endif
-
- @$(subst xxxx,$(CANONDIR)/clipart,$(VERIFY_DIRECTORY))
diff --git a/editors/abiword/files/patch-aq b/editors/abiword/files/patch-aq
deleted file mode 100644
index 41ad3e2580b4..000000000000
--- a/editors/abiword/files/patch-aq
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/config/abi_defs.mk.orig 2008-04-01 15:33:21.000000000 -0500
-+++ src/config/abi_defs.mk 2008-04-01 15:34:24.000000000 -0500
-@@ -213,11 +213,11 @@
- ## INSTALL program...
-
- define MAKE_OBJDIR
--if test ! -d $(@D); then rm -rf $(@D); mkdir -p $(@D); fi
-+if test ! -d $(@D); then rm -rf $(@D); $(ABIMKDIR) -p $(@D); fi
- endef
-
- define VERIFY_DIRECTORY
--if test ! -d xxxx; then rm -rf xxxx; mkdir -p xxxx; fi
-+if test ! -d xxxx; then rm -rf xxxx; $(ABIMKDIR) -p xxxx; fi
- endef
-
- ifeq ($(OS_NAME), WIN32)
-@@ -262,7 +262,9 @@
- ##################################################################
- ##################################################################
-
--ABICOPY=cp
-+ABICOPY = cp
-+ABICHMOD = chmod
-+ABIMKDIR = mkdir -m u=rwx,go=rx
-
- ifdef ABISOURCE_LICENSED_TRADEMARKS
- ABI_TMDEFS= -DABISOURCE_LICENSED_TRADEMARKS
diff --git a/editors/abiword/files/patch-configure b/editors/abiword/files/patch-configure
new file mode 100644
index 000000000000..a5af7a58e8c2
--- /dev/null
+++ b/editors/abiword/files/patch-configure
@@ -0,0 +1,2627 @@
+--- configure.orig 2009-10-30 15:04:48.000000000 +0100
++++ configure 2009-10-30 15:12:38.000000000 +0100
+@@ -16626,9 +16626,9 @@
+ xp_funcs='localeconv strcspn strncasecmp strtoul' # "sqrt" test fails, hmm
+ funcs=
+
+-if test "$PLATFORM" == "cocoa"; then
++if test "$PLATFORM" = "cocoa"; then
+ funcs="$cocoa_funcs $xp_funcs"
+-elif test "$PLATFORM" == "unix"; then
++elif test "$PLATFORM" = "unix"; then
+
+ for ac_header in sys/time.h
+ do
+@@ -17114,7 +17114,7 @@
+ esac
+
+ funcs="$unix_funcs $xp_funcs"
+-elif test "$PLATFORM" == "win"; then
++elif test "$PLATFORM" = "win"; then
+ funcs="$win_funcs $xp_funcs"
+ fi
+
+@@ -17233,7 +17233,7 @@
+ # Check whether --enable-default-plugins was given.
+ if test "${enable_default_plugins+set}" = set; then
+ enableval=$enable_default_plugins;
+- if test "$enableval" == "no"; then
++ if test "$enableval" = "no"; then
+ abi_cv_disable_default_plugins="yes"
+ fi
+
+@@ -17243,11 +17243,11 @@
+ # Check whether --enable-plugins was given.
+ if test "${enable_plugins+set}" = set; then
+ enableval=$enable_plugins;
+- if test "$enableval" == "no"; then
++ if test "$enableval" = "no"; then
+ abi_cv_disable_exports="yes"
+ abi_cv_disable_default_plugins="yes"
+ abi_cv_plugins=""
+- elif test "$enableval" == "yes"; then
++ elif test "$enableval" = "yes"; then
+ # auto-detect which plugins can be built
+ abi_cv_plugins="auto"
+ else
+@@ -17261,9 +17261,9 @@
+ # Check whether --enable-builtin-plugins was given.
+ if test "${enable_builtin_plugins+set}" = set; then
+ enableval=$enable_builtin_plugins;
+- if test "$enableval" == "no"; then
++ if test "$enableval" = "no"; then
+ abi_cv_builtin_plugins=""
+- elif test "$enableval" == "yes"; then
++ elif test "$enableval" = "yes"; then
+ # just build default plugins
+ abi_cv_builtin_plugins=""
+ else
+@@ -17298,8 +17298,8 @@
+ fi
+
+
+-if test "$abi_cv_print" == "yes" &&
+- test "$TOOLKIT" == "gtk"; then
++if test "$abi_cv_print" = "yes" &&
++ test "$TOOLKIT" = "gtk"; then
+ opt_pkgs="$opt_pkgs"
+ fi
+
+@@ -17427,7 +17427,7 @@
+ else
+
+ # autodetect
+- if test "$TOOLKIT" == "gtk"; then
++ if test "$TOOLKIT" = "gtk"; then
+ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$enchant_req \"") >&5
+ ($PKG_CONFIG --exists --print-errors " $enchant_req ") 2>&5
+@@ -17449,7 +17449,7 @@
+ fi
+
+
+-if test "$abi_cv_spell" == "yes"; then
++if test "$abi_cv_spell" = "yes"; then
+ opt_pkgs="$opt_pkgs $enchant_req"
+ fi
+
+@@ -17517,7 +17517,7 @@
+ #
+ # deferred from the "enable-embedded"
+ #
+-if test "$abi_cv_embedded_platform" == "hildon"; then
++if test "$abi_cv_embedded_platform" = "hildon"; then
+ opt_pkgs="$opt_pkgs $hildon_pkgs"
+ fi
+
+@@ -17525,7 +17525,7 @@
+ # Check whether --enable-debug was given.
+ if test "${enable_debug+set}" = set; then
+ enableval=$enable_debug;
+- if test "$enableval" == "yes"; then
++ if test "$enableval" = "yes"; then
+ abi_cv_debug="yes"
+ fi
+
+@@ -17549,7 +17549,7 @@
+ else
+
+ # use gnomevfs if detected
+- if test "$TOOLKIT" == "gtk"; then
++ if test "$TOOLKIT" = "gtk"; then
+ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$gnomevfs_req \"") >&5
+ ($PKG_CONFIG --exists --print-errors " $gnomevfs_req ") 2>&5
+@@ -17571,7 +17571,7 @@
+ fi
+
+
+-if test "$abi_cv_gnomevfs" == "yes"; then
++if test "$abi_cv_gnomevfs" = "yes"; then
+ opt_pkgs="$opt_pkgs $gnomevfs_req"
+ fi
+
+@@ -17602,7 +17602,7 @@
+ fi
+
+
+-if test "$abi_cv_gio" == "yes"; then
++if test "$abi_cv_gio" = "yes"; then
+ opt_pkgs="$opt_pkgs $gio_req"
+ fi
+
+@@ -17615,7 +17615,7 @@
+ else
+
+ # use goffice if detected
+- if test "$TOOLKIT" == "gtk"; then
++ if test "$TOOLKIT" = "gtk"; then
+ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$goffice_req \"") >&5
+ ($PKG_CONFIG --exists --print-errors " $goffice_req ") 2>&5
+@@ -17637,8 +17637,8 @@
+
+ GOFFICE_BUILTIN_CPPFLAGS=
+ GOFFICE_BUILTIN_LIBS=
+-if test "$PLATFORM" == "unix" && \
+- test "$abi_cv_goffice" == "yes"; then
++if test "$PLATFORM" = "unix" && \
++ test "$abi_cv_goffice" = "yes"; then
+ opt_pkgs="$opt_pkgs $goffice_req"
+ else
+ GOFFICE_BUILTIN_CPPFLAGS='-I${top_srcdir}/goffice-bits'
+@@ -17656,7 +17656,7 @@
+ else
+
+ # use gucharmap if detected
+- if test "$TOOLKIT" == "gtk"; then
++ if test "$TOOLKIT" = "gtk"; then
+ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$gucharmap_req \"") >&5
+ ($PKG_CONFIG --exists --print-errors " $gucharmap_req ") 2>&5
+@@ -17678,7 +17678,7 @@
+ fi
+
+
+-if test "$abi_cv_gucharmap" == "yes"; then
++if test "$abi_cv_gucharmap" = "yes"; then
+ opt_pkgs="$opt_pkgs $gucharmap_req"
+ fi
+
+@@ -17712,7 +17712,7 @@
+ # Check whether --with-abisdk was given.
+ if test "${with_abisdk+set}" = set; then
+ withval=$with_abisdk;
+- if test "x$withval" == "x"; then
++ if test "x$withval" = "x"; then
+ { { $as_echo "$as_me:$LINENO: error: The AbiSDK path must be specified." >&5
+ $as_echo "$as_me: error: The AbiSDK path must be specified." >&2;}
+ { (exit 1); exit 1; }; }
+@@ -18331,13 +18331,13 @@
+ deps_pkgs="$xp_pkgs $opt_pkgs"
+ SYSTEM_LIBS=
+ SYSTEM_CFLAGS=
+-if test "$TOOLKIT" == "win"; then
++if test "$TOOLKIT" = "win"; then
+ deps_pkgs="$deps_pkgs $win_pkgs"
+ # nonstandard dlls go below the blank line
+ SYSTEM_LIBS="-ladvapi32 -lcomctl32 -lcomdlg32 -lgdi32 -lkernel32 -lole32 -loleaut32 -lshell32 -luser32 -luuid -lversion -lwinspool \
+ -lpng12 -lz -ljpeg"
+ SYSTEM_CFLAGS="-mthreads"
+-elif test "$TOOLKIT" == "cocoa"; then
++elif test "$TOOLKIT" = "cocoa"; then
+ deps_pkgs="$deps_pkgs $cocoa_pkgs"
+ SYSTEM_LIBS="-framework Cocoa"
+ # Extract the first word of "convert", so it can be a program name with args.
+@@ -18493,7 +18493,7 @@
+ $as_echo "yes" >&6; }
+ :
+ fi
+-if test "$TOOLKIT" == "gtk"; then
++if test "$TOOLKIT" = "gtk"; then
+
+ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for GTK214" >&5
+@@ -18561,7 +18561,7 @@
+ $as_echo "yes" >&6; }
+ abi_cv_gtk214=yes
+ fi
+- if test "$abi_cv_gtk214" == "yes" ; then
++ if test "$abi_cv_gtk214" = "yes" ; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_GTK214 1
+@@ -18570,7 +18570,7 @@
+ fi
+ fi
+
+-if test "$TOOLKIT" == "gtk" -o "$TOOLKIT" == "cocoa"; then
++if test "$TOOLKIT" = "gtk" -o "$TOOLKIT" = "cocoa"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_CAIRO 1
+@@ -18578,7 +18578,7 @@
+
+ WITH_CAIRO=1
+ fi
+- if test "$WITH_CAIRO" == "1"; then
++ if test "$WITH_CAIRO" = "1"; then
+ WITH_CAIRO_TRUE=
+ WITH_CAIRO_FALSE='#'
+ else
+@@ -18589,7 +18589,7 @@
+
+
+
+-if test "$abi_cv_gio" == "yes"; then
++if test "$abi_cv_gio" = "yes"; then
+
+ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for GSFGI" >&5
+@@ -18657,7 +18657,7 @@
+ $as_echo "yes" >&6; }
+ abi_cv_gsf_gio=yes
+ fi
+- if test "$abi_cv_gsf_gio" == "yes" ; then
++ if test "$abi_cv_gsf_gio" = "yes" ; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_GSF_GIO 1
+@@ -18753,7 +18753,7 @@
+
+ ABIWORD_HEADERSDIR="${includedir}/${PACKAGE_NAME}-${ABIWORD_SERIES}"
+
+-if test "$TOOLKIT" == "cocoa"; then
++if test "$TOOLKIT" = "cocoa"; then
+ ABIWORD_CONTENTSDIR="/AbiWord.app/Contents"
+
+ ABIWORD_DATADIR="${ABIWORD_CONTENTSDIR}/Resources"
+@@ -18779,7 +18779,7 @@
+
+ # maybe just switch on TOOLKIT instead of the fancy TARGET defines
+ # also for embedded, e.g. hildon would set TOOLKIT_GTK and TOOLKIT_HILDON
+- if test "$TOOLKIT" == "cocoa"; then
++ if test "$TOOLKIT" = "cocoa"; then
+ TOOLKIT_COCOA_TRUE=
+ TOOLKIT_COCOA_FALSE='#'
+ else
+@@ -18787,7 +18787,7 @@
+ TOOLKIT_COCOA_FALSE=
+ fi
+
+- if test "$TOOLKIT" == "gtk"; then
++ if test "$TOOLKIT" = "gtk"; then
+ TOOLKIT_GTK_TRUE=
+ TOOLKIT_GTK_FALSE='#'
+ else
+@@ -18795,7 +18795,7 @@
+ TOOLKIT_GTK_FALSE=
+ fi
+
+- if test "$TOOLKIT" == "win"; then
++ if test "$TOOLKIT" = "win"; then
+ TOOLKIT_WIN_TRUE=
+ TOOLKIT_WIN_FALSE='#'
+ else
+@@ -18804,15 +18804,15 @@
+ fi
+
+
+-if test "$enable_dynamic" == ""; then
++if test "$enable_dynamic" = ""; then
+ enable_dynamic="no"
+ fi
+
+-if test "$enable_static" == ""; then
++if test "$enable_static" = ""; then
+ enable_static="no"
+ fi
+
+-if test "$TOOLKIT" == "win"; then
++if test "$TOOLKIT" = "win"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define TOOLKIT_WIN 1
+@@ -18831,7 +18831,7 @@
+ # override static/dynamic, on win32 only static is possible
+ enable_dynamic="no"
+ enable_static="yes"
+-elif test "$TOOLKIT" == "cocoa"; then
++elif test "$TOOLKIT" = "cocoa"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define TOOLKIT_COCOA 1
+@@ -18847,7 +18847,7 @@
+ _ACEOF
+
+ fi
+- if test "$enable_dynamic" == "yes"; then
++ if test "$enable_dynamic" = "yes"; then
+ ENABLE_DYNAMIC_TRUE=
+ ENABLE_DYNAMIC_FALSE='#'
+ else
+@@ -18855,7 +18855,7 @@
+ ENABLE_DYNAMIC_FALSE=
+ fi
+
+- if test "$enable_static" == "yes"; then
++ if test "$enable_static" = "yes"; then
+ ENABLE_STATIC_TRUE=
+ ENABLE_STATIC_FALSE='#'
+ else
+@@ -18974,22 +18974,22 @@
+ :
+ fi
+ PLUGIN_CFLAGS="$PLUGIN_CFLAGS "'${WP_CPPFLAGS} -DABI_DLL'
+-if test "$TOOLKIT" == "gtk" &&
+- test "$enable_dynamic" == "yes"; then
++if test "$TOOLKIT" = "gtk" &&
++ test "$enable_dynamic" = "yes"; then
+ # link plugins to work around gcc visibility issue with
+ # derived classes in dlopened modules
+ PLUGIN_LIBS="$PLUGIN_LIBS "'-L${top_builddir}/src'" -labiword-$ABIWORD_SERIES"
+-elif test "$TOOLKIT" == "win"; then
++elif test "$TOOLKIT" = "win"; then
+ PLUGIN_CFLAGS="$PLUGIN_CFLAGS "'-D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0500'
+ # link plugins to the executable so they can be loaded
+ PLUGIN_LIBS="$PLUGIN_LIBS "'-L${top_builddir}/src -labiword'
+-elif test "$TOOLKIT" == "cocoa" ; then
++elif test "$TOOLKIT" = "cocoa" ; then
+ PLUGIN_LIBS="$PLUGIN_LIBS "'-L${top_builddir}/src'" -labiword-$ABIWORD_SERIES"
+ fi
+
+
+
+-if test "$abi_cv_disable_exports" == "yes"; then
++if test "$abi_cv_disable_exports" = "yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define DISABLE_EXPORTS 1
+@@ -18997,14 +18997,14 @@
+
+ fi
+
+-if test "$abi_cv_menubutton" == "yes"; then
++if test "$abi_cv_menubutton" = "yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_MENUBUTTON 1
+ _ACEOF
+
+ fi
+- if test "$abi_cv_menubutton" == "yes"; then
++ if test "$abi_cv_menubutton" = "yes"; then
+ ENABLE_MENUBUTTON_TRUE=
+ ENABLE_MENUBUTTON_FALSE='#'
+ else
+@@ -19013,14 +19013,14 @@
+ fi
+
+
+-if test "$abi_cv_print" == "yes"; then
++if test "$abi_cv_print" = "yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_PRINT 1
+ _ACEOF
+
+ fi
+- if test "$abi_cv_print" == "yes"; then
++ if test "$abi_cv_print" = "yes"; then
+ ENABLE_PRINT_TRUE=
+ ENABLE_PRINT_FALSE='#'
+ else
+@@ -19029,7 +19029,7 @@
+ fi
+
+
+-if test "$abi_cv_spell" == "yes"; then
++if test "$abi_cv_spell" = "yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_SPELL 1
+@@ -19042,7 +19042,7 @@
+ _ACEOF
+
+ fi
+- if test "$abi_cv_spell" == "yes"; then
++ if test "$abi_cv_spell" = "yes"; then
+ ENABLE_SPELL_TRUE=
+ ENABLE_SPELL_FALSE='#'
+ else
+@@ -19051,14 +19051,14 @@
+ fi
+
+
+-if test "$abi_cv_statusbar" == "yes"; then
++if test "$abi_cv_statusbar" = "yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_STATUSBAR 1
+ _ACEOF
+
+ fi
+- if test "$abi_cv_statusbar" == "yes"; then
++ if test "$abi_cv_statusbar" = "yes"; then
+ ENABLE_STATUSBAR_TRUE=
+ ENABLE_STATUSBAR_FALSE='#'
+ else
+@@ -19074,7 +19074,7 @@
+ _ACEOF
+
+ fi
+- if test "$abi_cv_embedded_target" == "EMBEDDED_TARGET_HILDON"; then
++ if test "$abi_cv_embedded_target" = "EMBEDDED_TARGET_HILDON"; then
+ EMBEDDED_HILDON_TRUE=
+ EMBEDDED_HILDON_FALSE='#'
+ else
+@@ -19083,14 +19083,14 @@
+ fi
+
+
+-if test "$abi_cv_emacs_keybinding" == "yes"; then
++if test "$abi_cv_emacs_keybinding" = "yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_EMACS_KEYBINDING 1
+ _ACEOF
+
+ fi
+- if test "$abi_cv_emacs_keybinding" == "yes"; then
++ if test "$abi_cv_emacs_keybinding" = "yes"; then
+ ENABLE_EMACS_KEYBINDING_TRUE=
+ ENABLE_EMACS_KEYBINDING_FALSE='#'
+ else
+@@ -19099,14 +19099,14 @@
+ fi
+
+
+-if test "$abi_cv_vi_keybinding" == "yes"; then
++if test "$abi_cv_vi_keybinding" = "yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_VI_KEYBINDING 1
+ _ACEOF
+
+ fi
+- if test "$abi_cv_vi_keybinding" == "yes"; then
++ if test "$abi_cv_vi_keybinding" = "yes"; then
+ ENABLE_VI_KEYBINDING_TRUE=
+ ENABLE_VI_KEYBINDING_FALSE='#'
+ else
+@@ -19115,7 +19115,7 @@
+ fi
+
+
+- if test "$abi_cv_clipart" == "yes"; then
++ if test "$abi_cv_clipart" = "yes"; then
+ ENABLE_CLIPART_TRUE=
+ ENABLE_CLIPART_FALSE='#'
+ else
+@@ -19123,7 +19123,7 @@
+ ENABLE_CLIPART_FALSE=
+ fi
+
+- if test "$abi_cv_templates" == "yes"; then
++ if test "$abi_cv_templates" = "yes"; then
+ ENABLE_TEMPLATES_TRUE=
+ ENABLE_TEMPLATES_FALSE='#'
+ else
+@@ -19132,7 +19132,7 @@
+ fi
+
+
+-if test "$abi_cv_debug" == "yes"; then
++if test "$abi_cv_debug" = "yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define DEBUG 1
+@@ -19145,7 +19145,7 @@
+ _ACEOF
+
+ fi
+- if test "$abi_cv_debug" == "yes"; then
++ if test "$abi_cv_debug" = "yes"; then
+ DEBUG_TRUE=
+ DEBUG_FALSE='#'
+ else
+@@ -19158,7 +19158,7 @@
+ # Optional dependencies handling
+ #
+
+-if test "$abi_cv_gnomevfs" == "yes"; then
++if test "$abi_cv_gnomevfs" = "yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_GNOMEVFS 1
+@@ -19166,7 +19166,7 @@
+
+ fi
+
+-if test "$abi_cv_gio" == "yes"; then
++if test "$abi_cv_gio" = "yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_GIO 1
+@@ -19174,14 +19174,14 @@
+
+ fi
+
+-if test "$abi_cv_goffice" == "yes"; then
++if test "$abi_cv_goffice" = "yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_GOFFICE 1
+ _ACEOF
+
+ fi
+- if test "$TOOLKIT" == "gtk" && test "$abi_cv_goffice" != "yes"; then
++ if test "$TOOLKIT" = "gtk" && test "$abi_cv_goffice" != "yes"; then
+ WITH_GOFFICE_BUILTIN_TRUE=
+ WITH_GOFFICE_BUILTIN_FALSE='#'
+ else
+@@ -19191,14 +19191,14 @@
+
+
+
+-if test "$abi_cv_gucharmap" == "yes"; then
++if test "$abi_cv_gucharmap" = "yes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define WITH_GUCHARMAP 1
+ _ACEOF
+
+ fi
+- if test "$abi_cv_gucharmap" == "yes"; then
++ if test "$abi_cv_gucharmap" = "yes"; then
+ WITH_GUCHARMAP_TRUE=
+ WITH_GUCHARMAP_FALSE='#'
+ else
+@@ -19216,7 +19216,7 @@
+
+
+ PLUGINS=
+-if test "$abi_cv_plugins" == "auto"; then
++if test "$abi_cv_plugins" = "auto"; then
+
+ # which plugins to auto-enable
+ # this creates variables like "enable_wordperfect=auto"
+@@ -19259,7 +19259,7 @@
+ BUILTIN_PLUGINS_LA="$BUILTIN_PLUGINS_LA ../../plugins/$plugin/$plugin.la"
+ done
+
+- if test "$enable_loadbindings_builtin" == "yes"; then
++ if test "$enable_loadbindings_builtin" = "yes"; then
+ LOADBINDINGS_BUILTIN_TRUE=
+ LOADBINDINGS_BUILTIN_FALSE='#'
+ else
+@@ -19267,7 +19267,7 @@
+ LOADBINDINGS_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_paint_builtin" == "yes"; then
++ if test "$enable_paint_builtin" = "yes"; then
+ PAINT_BUILTIN_TRUE=
+ PAINT_BUILTIN_FALSE='#'
+ else
+@@ -19275,7 +19275,7 @@
+ PAINT_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_hrtext_builtin" == "yes"; then
++ if test "$enable_hrtext_builtin" = "yes"; then
+ HRTEXT_BUILTIN_TRUE=
+ HRTEXT_BUILTIN_FALSE='#'
+ else
+@@ -19283,7 +19283,7 @@
+ HRTEXT_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_pdb_builtin" == "yes"; then
++ if test "$enable_pdb_builtin" = "yes"; then
+ PDB_BUILTIN_TRUE=
+ PDB_BUILTIN_FALSE='#'
+ else
+@@ -19291,7 +19291,7 @@
+ PDB_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_goffice_builtin" == "yes"; then
++ if test "$enable_goffice_builtin" = "yes"; then
+ GOFFICE_BUILTIN_TRUE=
+ GOFFICE_BUILTIN_FALSE='#'
+ else
+@@ -19299,7 +19299,7 @@
+ GOFFICE_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_gimp_builtin" == "yes"; then
++ if test "$enable_gimp_builtin" = "yes"; then
+ GIMP_BUILTIN_TRUE=
+ GIMP_BUILTIN_FALSE='#'
+ else
+@@ -19307,7 +19307,7 @@
+ GIMP_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_mif_builtin" == "yes"; then
++ if test "$enable_mif_builtin" = "yes"; then
+ MIF_BUILTIN_TRUE=
+ MIF_BUILTIN_FALSE='#'
+ else
+@@ -19315,7 +19315,7 @@
+ MIF_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_mht_builtin" == "yes"; then
++ if test "$enable_mht_builtin" = "yes"; then
+ MHT_BUILTIN_TRUE=
+ MHT_BUILTIN_FALSE='#'
+ else
+@@ -19323,7 +19323,7 @@
+ MHT_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_applix_builtin" == "yes"; then
++ if test "$enable_applix_builtin" = "yes"; then
+ APPLIX_BUILTIN_TRUE=
+ APPLIX_BUILTIN_FALSE='#'
+ else
+@@ -19331,7 +19331,7 @@
+ APPLIX_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_docbook_builtin" == "yes"; then
++ if test "$enable_docbook_builtin" = "yes"; then
+ DOCBOOK_BUILTIN_TRUE=
+ DOCBOOK_BUILTIN_FALSE='#'
+ else
+@@ -19339,7 +19339,7 @@
+ DOCBOOK_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_wikipedia_builtin" == "yes"; then
++ if test "$enable_wikipedia_builtin" = "yes"; then
+ WIKIPEDIA_BUILTIN_TRUE=
+ WIKIPEDIA_BUILTIN_FALSE='#'
+ else
+@@ -19347,7 +19347,7 @@
+ WIKIPEDIA_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_babelfish_builtin" == "yes"; then
++ if test "$enable_babelfish_builtin" = "yes"; then
+ BABELFISH_BUILTIN_TRUE=
+ BABELFISH_BUILTIN_FALSE='#'
+ else
+@@ -19355,7 +19355,7 @@
+ BABELFISH_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_command_builtin" == "yes"; then
++ if test "$enable_command_builtin" = "yes"; then
+ COMMAND_BUILTIN_TRUE=
+ COMMAND_BUILTIN_FALSE='#'
+ else
+@@ -19363,7 +19363,7 @@
+ COMMAND_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_garble_builtin" == "yes"; then
++ if test "$enable_garble_builtin" = "yes"; then
+ GARBLE_BUILTIN_TRUE=
+ GARBLE_BUILTIN_FALSE='#'
+ else
+@@ -19371,7 +19371,7 @@
+ GARBLE_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_ots_builtin" == "yes"; then
++ if test "$enable_ots_builtin" = "yes"; then
+ OTS_BUILTIN_TRUE=
+ OTS_BUILTIN_FALSE='#'
+ else
+@@ -19379,7 +19379,7 @@
+ OTS_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_google_builtin" == "yes"; then
++ if test "$enable_google_builtin" = "yes"; then
+ GOOGLE_BUILTIN_TRUE=
+ GOOGLE_BUILTIN_FALSE='#'
+ else
+@@ -19387,7 +19387,7 @@
+ GOOGLE_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_opendocument_builtin" == "yes"; then
++ if test "$enable_opendocument_builtin" = "yes"; then
+ OPENDOCUMENT_BUILTIN_TRUE=
+ OPENDOCUMENT_BUILTIN_FALSE='#'
+ else
+@@ -19395,7 +19395,7 @@
+ OPENDOCUMENT_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_wordperfect_builtin" == "yes"; then
++ if test "$enable_wordperfect_builtin" = "yes"; then
+ WORDPERFECT_BUILTIN_TRUE=
+ WORDPERFECT_BUILTIN_FALSE='#'
+ else
+@@ -19403,7 +19403,7 @@
+ WORDPERFECT_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_urldict_builtin" == "yes"; then
++ if test "$enable_urldict_builtin" = "yes"; then
+ URLDICT_BUILTIN_TRUE=
+ URLDICT_BUILTIN_FALSE='#'
+ else
+@@ -19411,7 +19411,7 @@
+ URLDICT_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_psion_builtin" == "yes"; then
++ if test "$enable_psion_builtin" = "yes"; then
+ PSION_BUILTIN_TRUE=
+ PSION_BUILTIN_FALSE='#'
+ else
+@@ -19419,7 +19419,7 @@
+ PSION_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_opml_builtin" == "yes"; then
++ if test "$enable_opml_builtin" = "yes"; then
+ OPML_BUILTIN_TRUE=
+ OPML_BUILTIN_FALSE='#'
+ else
+@@ -19427,7 +19427,7 @@
+ OPML_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_eml_builtin" == "yes"; then
++ if test "$enable_eml_builtin" = "yes"; then
+ EML_BUILTIN_TRUE=
+ EML_BUILTIN_FALSE='#'
+ else
+@@ -19435,7 +19435,7 @@
+ EML_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_collab_builtin" == "yes"; then
++ if test "$enable_collab_builtin" = "yes"; then
+ COLLAB_BUILTIN_TRUE=
+ COLLAB_BUILTIN_FALSE='#'
+ else
+@@ -19443,7 +19443,7 @@
+ COLLAB_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_pdf_builtin" == "yes"; then
++ if test "$enable_pdf_builtin" = "yes"; then
+ PDF_BUILTIN_TRUE=
+ PDF_BUILTIN_FALSE='#'
+ else
+@@ -19451,7 +19451,7 @@
+ PDF_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_wmf_builtin" == "yes"; then
++ if test "$enable_wmf_builtin" = "yes"; then
+ WMF_BUILTIN_TRUE=
+ WMF_BUILTIN_FALSE='#'
+ else
+@@ -19459,7 +19459,7 @@
+ WMF_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_t602_builtin" == "yes"; then
++ if test "$enable_t602_builtin" = "yes"; then
+ T602_BUILTIN_TRUE=
+ T602_BUILTIN_FALSE='#'
+ else
+@@ -19467,7 +19467,7 @@
+ T602_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_mswrite_builtin" == "yes"; then
++ if test "$enable_mswrite_builtin" = "yes"; then
+ MSWRITE_BUILTIN_TRUE=
+ MSWRITE_BUILTIN_FALSE='#'
+ else
+@@ -19475,7 +19475,7 @@
+ MSWRITE_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_clarisworks_builtin" == "yes"; then
++ if test "$enable_clarisworks_builtin" = "yes"; then
+ CLARISWORKS_BUILTIN_TRUE=
+ CLARISWORKS_BUILTIN_FALSE='#'
+ else
+@@ -19483,7 +19483,7 @@
+ CLARISWORKS_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_freetranslation_builtin" == "yes"; then
++ if test "$enable_freetranslation_builtin" = "yes"; then
+ FREETRANSLATION_BUILTIN_TRUE=
+ FREETRANSLATION_BUILTIN_FALSE='#'
+ else
+@@ -19491,7 +19491,7 @@
+ FREETRANSLATION_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_aiksaurus_builtin" == "yes"; then
++ if test "$enable_aiksaurus_builtin" = "yes"; then
+ AIKSAURUS_BUILTIN_TRUE=
+ AIKSAURUS_BUILTIN_FALSE='#'
+ else
+@@ -19499,7 +19499,7 @@
+ AIKSAURUS_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_hancom_builtin" == "yes"; then
++ if test "$enable_hancom_builtin" = "yes"; then
+ HANCOM_BUILTIN_TRUE=
+ HANCOM_BUILTIN_FALSE='#'
+ else
+@@ -19507,7 +19507,7 @@
+ HANCOM_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_iscii_builtin" == "yes"; then
++ if test "$enable_iscii_builtin" = "yes"; then
+ ISCII_BUILTIN_TRUE=
+ ISCII_BUILTIN_FALSE='#'
+ else
+@@ -19515,7 +19515,7 @@
+ ISCII_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_openxml_builtin" == "yes"; then
++ if test "$enable_openxml_builtin" = "yes"; then
+ OPENXML_BUILTIN_TRUE=
+ OPENXML_BUILTIN_FALSE='#'
+ else
+@@ -19523,7 +19523,7 @@
+ OPENXML_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_gdict_builtin" == "yes"; then
++ if test "$enable_gdict_builtin" = "yes"; then
+ GDICT_BUILTIN_TRUE=
+ GDICT_BUILTIN_FALSE='#'
+ else
+@@ -19531,7 +19531,7 @@
+ GDICT_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_s5_builtin" == "yes"; then
++ if test "$enable_s5_builtin" = "yes"; then
+ S5_BUILTIN_TRUE=
+ S5_BUILTIN_FALSE='#'
+ else
+@@ -19539,7 +19539,7 @@
+ S5_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_mathview_builtin" == "yes"; then
++ if test "$enable_mathview_builtin" = "yes"; then
+ MATHVIEW_BUILTIN_TRUE=
+ MATHVIEW_BUILTIN_FALSE='#'
+ else
+@@ -19547,7 +19547,7 @@
+ MATHVIEW_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_gda_builtin" == "yes"; then
++ if test "$enable_gda_builtin" = "yes"; then
+ GDA_BUILTIN_TRUE=
+ GDA_BUILTIN_FALSE='#'
+ else
+@@ -19555,7 +19555,7 @@
+ GDA_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_grammar_builtin" == "yes"; then
++ if test "$enable_grammar_builtin" = "yes"; then
+ GRAMMAR_BUILTIN_TRUE=
+ GRAMMAR_BUILTIN_FALSE='#'
+ else
+@@ -19563,7 +19563,7 @@
+ GRAMMAR_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_bmp_builtin" == "yes"; then
++ if test "$enable_bmp_builtin" = "yes"; then
+ BMP_BUILTIN_TRUE=
+ BMP_BUILTIN_FALSE='#'
+ else
+@@ -19571,7 +19571,7 @@
+ BMP_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_openwriter_builtin" == "yes"; then
++ if test "$enable_openwriter_builtin" "yes"; then
+ OPENWRITER_BUILTIN_TRUE=
+ OPENWRITER_BUILTIN_FALSE='#'
+ else
+@@ -19579,7 +19579,7 @@
+ OPENWRITER_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_latex_builtin" == "yes"; then
++ if test "$enable_latex_builtin" = "yes"; then
+ LATEX_BUILTIN_TRUE=
+ LATEX_BUILTIN_FALSE='#'
+ else
+@@ -19587,7 +19587,7 @@
+ LATEX_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_presentation_builtin" == "yes"; then
++ if test "$enable_presentation_builtin" = "yes"; then
+ PRESENTATION_BUILTIN_TRUE=
+ PRESENTATION_BUILTIN_FALSE='#'
+ else
+@@ -19595,7 +19595,7 @@
+ PRESENTATION_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_rsvg_builtin" == "yes"; then
++ if test "$enable_rsvg_builtin" = "yes"; then
+ RSVG_BUILTIN_TRUE=
+ RSVG_BUILTIN_FALSE='#'
+ else
+@@ -19603,7 +19603,7 @@
+ RSVG_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_wml_builtin" == "yes"; then
++ if test "$enable_wml_builtin" = "yes"; then
+ WML_BUILTIN_TRUE=
+ WML_BUILTIN_FALSE='#'
+ else
+@@ -19611,7 +19611,7 @@
+ WML_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_passepartout_builtin" == "yes"; then
++ if test "$enable_passepartout_builtin" = "yes"; then
+ PASSEPARTOUT_BUILTIN_TRUE=
+ PASSEPARTOUT_BUILTIN_FALSE='#'
+ else
+@@ -19619,7 +19619,7 @@
+ PASSEPARTOUT_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_wpg_builtin" == "yes"; then
++ if test "$enable_wpg_builtin" = "yes"; then
+ WPG_BUILTIN_TRUE=
+ WPG_BUILTIN_FALSE='#'
+ else
+@@ -19627,7 +19627,7 @@
+ WPG_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_xslfo_builtin" == "yes"; then
++ if test "$enable_xslfo_builtin" = "yes"; then
+ XSLFO_BUILTIN_TRUE=
+ XSLFO_BUILTIN_FALSE='#'
+ else
+@@ -19635,7 +19635,7 @@
+ XSLFO_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_kword_builtin" == "yes"; then
++ if test "$enable_kword_builtin" = "yes"; then
+ KWORD_BUILTIN_TRUE=
+ KWORD_BUILTIN_FALSE='#'
+ else
+@@ -19643,7 +19643,7 @@
+ KWORD_BUILTIN_FALSE=
+ fi
+
+- if test "$enable_sdw_builtin" == "yes"; then
++ if test "$enable_sdw_builtin" = "yes"; then
+ SDW_BUILTIN_TRUE=
+ SDW_BUILTIN_FALSE='#'
+ else
+@@ -19670,15 +19670,15 @@
+
+ else
+
+- test "$enable_loadbindings" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: loadbindings plugin: dependencies not satisfied - $loadbindings_pkgs" >&5
++ test "$enable_loadbindings" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: loadbindings plugin: dependencies not satisfied - $loadbindings_pkgs" >&5
+ $as_echo "$as_me: WARNING: loadbindings plugin: dependencies not satisfied - $loadbindings_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_loadbindings" == "yes" || \
+- test "$loadbindings_deps" == "yes"; then
++if test "$enable_loadbindings" = "yes" || \
++ test "$loadbindings_deps" = "yes"; then
+
+
+ pkg_failed=no
+@@ -19790,12 +19790,12 @@
+ :
+ fi
+
+-test "$enable_loadbindings" == "auto" && PLUGINS="$PLUGINS loadbindings"
++test "$enable_loadbindings" = "auto" && PLUGINS="$PLUGINS loadbindings"
+
+ LOADBINDINGS_CFLAGS="$LOADBINDINGS_CFLAGS "'${PLUGIN_CFLAGS}'
+ LOADBINDINGS_LIBS="$LOADBINDINGS_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_loadbindings_builtin" == "yes"; then
++if test "$enable_loadbindings_builtin" = "yes"; then
+ LOADBINDINGS_CFLAGS="$LOADBINDINGS_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -19810,17 +19810,17 @@
+
+ if test "$enable_paint" != ""; then
+
+-test "$enable_paint" == "auto" && PLUGINS="$PLUGINS paint"
++test "$enable_paint" = "auto" && PLUGINS="$PLUGINS paint"
+
+ # TODO check for libpng
+-if test "$TOOLKIT" == "win"; then
++if test "$TOOLKIT" = "win"; then
+ PAINT_LIBS="-lgdi32 -lpng12"
+ fi
+
+ PAINT_CFLAGS="$PAINT_CFLAGS "'${PLUGIN_CFLAGS}'
+ PAINT_LIBS="$PAINT_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_paint_builtin" == "yes"; then
++if test "$enable_paint_builtin" = "yes"; then
+ PAINT_CFLAGS="$PAINT_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -19835,12 +19835,12 @@
+
+ if test "$enable_hrtext" != ""; then
+
+-test "$enable_hrtext" == "auto" && PLUGINS="$PLUGINS hrtext"
++test "$enable_hrtext" = "auto" && PLUGINS="$PLUGINS hrtext"
+
+ HRTEXT_CFLAGS="$HRTEXT_CFLAGS "'${PLUGIN_CFLAGS}'
+ HRTEXT_LIBS="$HRTEXT_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_hrtext_builtin" == "yes"; then
++if test "$enable_hrtext_builtin" = "yes"; then
+ HRTEXT_CFLAGS="$HRTEXT_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -19866,15 +19866,15 @@
+
+ else
+
+- test "$enable_pdb" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: pdb plugin: dependencies not satisfied - $pdb_pkgs" >&5
++ test "$enable_pdb" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: pdb plugin: dependencies not satisfied - $pdb_pkgs" >&5
+ $as_echo "$as_me: WARNING: pdb plugin: dependencies not satisfied - $pdb_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_pdb" == "yes" || \
+- test "$pdb_deps" == "yes"; then
++if test "$enable_pdb" = "yes" || \
++ test "$pdb_deps" = "yes"; then
+
+
+ pkg_failed=no
+@@ -19986,12 +19986,12 @@
+ :
+ fi
+
+-test "$enable_pdb" == "auto" && PLUGINS="$PLUGINS pdb"
++test "$enable_pdb" = "auto" && PLUGINS="$PLUGINS pdb"
+
+ PDB_CFLAGS="$PDB_CFLAGS "'${PLUGIN_CFLAGS}'
+ PDB_LIBS="$PDB_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_pdb_builtin" == "yes"; then
++if test "$enable_pdb_builtin" = "yes"; then
+ PDB_CFLAGS="$PDB_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -20027,14 +20027,14 @@
+
+ { $as_echo "$as_me:$LINENO: checking for gtk toolkit" >&5
+ $as_echo_n "checking for gtk toolkit... " >&6; }
+- if test "$TOOLKIT" == "gtk"; then
++ if test "$TOOLKIT" = "gtk"; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
+ goffice_deps="yes"
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+- if test "$enable_goffice" == "auto"; then
++ if test "$enable_goffice" = "auto"; then
+ { $as_echo "$as_me:$LINENO: WARNING: goffice plugin: only supported with gtk" >&5
+ $as_echo "$as_me: WARNING: goffice plugin: only supported with gtk" >&2;}
+ else
+@@ -20046,17 +20046,17 @@
+
+ else
+
+- test "$enable_goffice" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: goffice plugin: dependencies not satisfied - $goffice_pkgs" >&5
++ test "$enable_goffice" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: goffice plugin: dependencies not satisfied - $goffice_pkgs" >&5
+ $as_echo "$as_me: WARNING: goffice plugin: dependencies not satisfied - $goffice_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_goffice" == "yes" || \
+- test "$goffice_deps" == "yes"; then
++if test "$enable_goffice" = "yes" || \
++ test "$goffice_deps" = "yes"; then
+
+-if test "$enable_goffice_builtin" == "yes"; then
++if test "$enable_goffice_builtin" = "yes"; then
+ { { $as_echo "$as_me:$LINENO: error: goffice plugin: static linking not supported" >&5
+ $as_echo "$as_me: error: goffice plugin: static linking not supported" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -20172,7 +20172,7 @@
+ :
+ fi
+
+-test "$enable_goffice" == "auto" && PLUGINS="$PLUGINS goffice"
++test "$enable_goffice" = "auto" && PLUGINS="$PLUGINS goffice"
+
+ GOFFICE_CFLAGS="$GOFFICE_CFLAGS "'${PLUGIN_CFLAGS}'
+ GOFFICE_LIBS="$GOFFICE_LIBS "'${PLUGIN_LIBS}'
+@@ -20188,12 +20188,12 @@
+
+ if test "$enable_gimp" != ""; then
+
+-test "$enable_gimp" == "auto" && PLUGINS="$PLUGINS gimp"
++test "$enable_gimp" = "auto" && PLUGINS="$PLUGINS gimp"
+
+ GIMP_CFLAGS="$GIMP_CFLAGS "'${PLUGIN_CFLAGS}'
+ GIMP_LIBS="$GIMP_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_gimp_builtin" == "yes"; then
++if test "$enable_gimp_builtin" = "yes"; then
+ GIMP_CFLAGS="$GIMP_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -20208,12 +20208,12 @@
+
+ if test "$enable_mif" != ""; then
+
+-test "$enable_mif" == "auto" && PLUGINS="$PLUGINS mif"
++test "$enable_mif" = "auto" && PLUGINS="$PLUGINS mif"
+
+ MIF_CFLAGS="$MIF_CFLAGS "'${PLUGIN_CFLAGS}'
+ MIF_LIBS="$MIF_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_mif_builtin" == "yes"; then
++if test "$enable_mif_builtin" = "yes"; then
+ MIF_CFLAGS="$MIF_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -20270,19 +20270,19 @@
+
+ else
+
+- test "$enable_mht" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: mht plugin: dependencies not satisfied - $mht_pkgs" >&5
++ test "$enable_mht" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: mht plugin: dependencies not satisfied - $mht_pkgs" >&5
+ $as_echo "$as_me: WARNING: mht plugin: dependencies not satisfied - $mht_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_mht" == "yes" || \
+- test "$mht_deps" == "yes"; then
++if test "$enable_mht" = "yes" || \
++ test "$mht_deps" = "yes"; then
+
+-test "$enable_mht" == "auto" && PLUGINS="$PLUGINS mht"
++test "$enable_mht" = "auto" && PLUGINS="$PLUGINS mht"
+
+-if test "$enable_mht_builtin" == "yes"; then
++if test "$enable_mht_builtin" = "yes"; then
+ { { $as_echo "$as_me:$LINENO: error: mht plugin: static linking not supported" >&5
+ $as_echo "$as_me: error: mht plugin: static linking not supported" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -20612,27 +20612,27 @@
+ # Settings
+ #
+
+-if test "$mht_cv_inter7eps" == "yes" &&
+- test "$inter7eps_found" == "no"; then
++if test "$mht_cv_inter7eps" = "yes" &&
++ test "$inter7eps_found" = "no"; then
+ { { $as_echo "$as_me:$LINENO: error: MHT plugin: error - inter7 EPS headers not found" >&5
+ $as_echo "$as_me: error: MHT plugin: error - inter7 EPS headers not found" >&2;}
+ { (exit 1); exit 1; }; }
+-elif test "$mht_cv_inter7eps" == "auto"; then
++elif test "$mht_cv_inter7eps" = "auto"; then
+ mht_cv_inter7eps="$inter7eps_found"
+ fi
+-if test "$mht_cv_inter7eps" == "yes"; then
++if test "$mht_cv_inter7eps" = "yes"; then
+ MHT_OPT_LIBS="$MHT_OPT_LIBS -leps"
+ fi
+
+-if test "$mht_cv_libtidy" == "yes" &&
+- test "$libtidy_found" == "no"; then
++if test "$mht_cv_libtidy" = "yes" &&
++ test "$libtidy_found" = "no"; then
+ { { $as_echo "$as_me:$LINENO: error: MHT plugin: error - libtidy headers not found" >&5
+ $as_echo "$as_me: error: MHT plugin: error - libtidy headers not found" >&2;}
+ { (exit 1); exit 1; }; }
+-elif test "$mht_cv_libtidy" == "auto"; then
++elif test "$mht_cv_libtidy" = "auto"; then
+ mht_cv_libtidy="$libtidy_found"
+ fi
+-if test "$mht_cv_libtidy" == "yes"; then
++if test "$mht_cv_libtidy" = "yes"; then
+ MHT_OPT_LIBS="$MHT_OPT_LIBS -ltidy"
+ fi
+
+@@ -20763,7 +20763,7 @@
+ ABI_XHTML_XML2_FALSE=
+ fi
+
+- if test "$mht_cv_inter7eps" == "yes"; then
++ if test "$mht_cv_inter7eps" = "yes"; then
+ ABI_XHTML_MHT_TRUE=
+ ABI_XHTML_MHT_FALSE='#'
+ else
+@@ -20771,7 +20771,7 @@
+ ABI_XHTML_MHT_FALSE=
+ fi
+
+- if test "$mht_cv_libtidy" == "yes"; then
++ if test "$mht_cv_libtidy" = "yes"; then
+ ABI_XHTML_TIDY_TRUE=
+ ABI_XHTML_TIDY_FALSE='#'
+ else
+@@ -20797,15 +20797,15 @@
+
+ else
+
+- test "$enable_applix" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: applix plugin: dependencies not satisfied - $applix_pkgs" >&5
++ test "$enable_applix" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: applix plugin: dependencies not satisfied - $applix_pkgs" >&5
+ $as_echo "$as_me: WARNING: applix plugin: dependencies not satisfied - $applix_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_applix" == "yes" || \
+- test "$applix_deps" == "yes"; then
++if test "$enable_applix" = "yes" || \
++ test "$applix_deps" = "yes"; then
+
+
+ pkg_failed=no
+@@ -20917,12 +20917,12 @@
+ :
+ fi
+
+-test "$enable_applix" == "auto" && PLUGINS="$PLUGINS applix"
++test "$enable_applix" = "auto" && PLUGINS="$PLUGINS applix"
+
+ APPLIX_CFLAGS="$APPLIX_CFLAGS "'${PLUGIN_CFLAGS}'
+ APPLIX_LIBS="$APPLIX_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_applix_builtin" == "yes"; then
++if test "$enable_applix_builtin" = "yes"; then
+ APPLIX_CFLAGS="$APPLIX_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -20948,15 +20948,15 @@
+
+ else
+
+- test "$enable_docbook" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: docbook plugin: dependencies not satisfied - $docbook_pkgs" >&5
++ test "$enable_docbook" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: docbook plugin: dependencies not satisfied - $docbook_pkgs" >&5
+ $as_echo "$as_me: WARNING: docbook plugin: dependencies not satisfied - $docbook_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_docbook" == "yes" || \
+- test "$docbook_deps" == "yes"; then
++if test "$enable_docbook" = "yes" || \
++ test "$docbook_deps" = "yes"; then
+
+ { $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+ $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+@@ -21131,12 +21131,12 @@
+ :
+ fi
+
+-test "$enable_docbook" == "auto" && PLUGINS="$PLUGINS docbook"
++test "$enable_docbook" = "auto" && PLUGINS="$PLUGINS docbook"
+
+ DOCBOOK_CFLAGS="$DOCBOOK_CFLAGS "'${PLUGIN_CFLAGS}'
+ DOCBOOK_LIBS="$DOCBOOK_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_docbook_builtin" == "yes"; then
++if test "$enable_docbook_builtin" = "yes"; then
+ DOCBOOK_CFLAGS="$DOCBOOK_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -21151,12 +21151,12 @@
+
+ if test "$enable_wikipedia" != ""; then
+
+-test "$enable_wikipedia" == "auto" && PLUGINS="$PLUGINS wikipedia"
++test "$enable_wikipedia" = "auto" && PLUGINS="$PLUGINS wikipedia"
+
+ WIKIPEDIA_CFLAGS="$WIKIPEDIA_CFLAGS "'${PLUGIN_CFLAGS}'
+ WIKIPEDIA_LIBS="$WIKIPEDIA_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_wikipedia_builtin" == "yes"; then
++if test "$enable_wikipedia_builtin" = "yes"; then
+ WIKIPEDIA_CFLAGS="$WIKIPEDIA_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -21171,12 +21171,12 @@
+
+ if test "$enable_babelfish" != ""; then
+
+-test "$enable_babelfish" == "auto" && PLUGINS="$PLUGINS babelfish"
++test "$enable_babelfish" = "auto" && PLUGINS="$PLUGINS babelfish"
+
+ BABELFISH_CFLAGS="$BABELFISH_CFLAGS "'${PLUGIN_CFLAGS}'
+ BABELFISH_LIBS="$BABELFISH_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_babelfish_builtin" == "yes"; then
++if test "$enable_babelfish_builtin" = "yes"; then
+ BABELFISH_CFLAGS="$BABELFISH_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -21618,10 +21618,10 @@
+ fi
+ fi
+
+-if test "$enable_command" == "yes" || \
+- test "$command_deps" == "yes"; then
++if test "$enable_command" = "yes" || \
++ test "$command_deps" = "yes"; then
+
+-if test "$enable_command_builtin" == "yes"; then
++if test "$enable_command_builtin" = "yes"; then
+ { { $as_echo "$as_me:$LINENO: error: command plugin: static linking not supported" >&5
+ $as_echo "$as_me: error: command plugin: static linking not supported" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -21639,7 +21639,7 @@
+ COMMAND_LIBS="-lreadline -lhistory $COMMAND_LIBS"
+ fi
+
+-test "$enable_command" == "auto" && PLUGINS="$PLUGINS command"
++test "$enable_command" = "auto" && PLUGINS="$PLUGINS command"
+
+ COMMAND_CFLAGS="$COMMAND_CFLAGS "'${PLUGIN_CFLAGS}'
+ COMMAND_LIBS="$COMMAND_LIBS "'${PLUGIN_LIBS}'
+@@ -21666,15 +21666,15 @@
+
+ else
+
+- test "$enable_garble" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: garble plugin: dependencies not satisfied - $garble_pkgs" >&5
++ test "$enable_garble" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: garble plugin: dependencies not satisfied - $garble_pkgs" >&5
+ $as_echo "$as_me: WARNING: garble plugin: dependencies not satisfied - $garble_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_garble" == "yes" || \
+- test "$garble_deps" == "yes"; then
++if test "$enable_garble" = "yes" || \
++ test "$garble_deps" = "yes"; then
+
+ { $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+ $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+@@ -21849,12 +21849,12 @@
+ :
+ fi
+
+-test "$enable_garble" == "auto" && PLUGINS="$PLUGINS garble"
++test "$enable_garble" = "auto" && PLUGINS="$PLUGINS garble"
+
+ GARBLE_CFLAGS="$GARBLE_CFLAGS "'${PLUGIN_CFLAGS}'
+ GARBLE_LIBS="$GARBLE_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_garble_builtin" == "yes"; then
++if test "$enable_garble_builtin" = "yes"; then
+ GARBLE_CFLAGS="$GARBLE_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -21880,19 +21880,19 @@
+
+ else
+
+- test "$enable_ots" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: ots plugin: dependencies not satisfied - $ots_pkgs" >&5
++ test "$enable_ots" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: ots plugin: dependencies not satisfied - $ots_pkgs" >&5
+ $as_echo "$as_me: WARNING: ots plugin: dependencies not satisfied - $ots_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_ots" == "yes" || \
+- test "$ots_deps" == "yes"; then
++if test "$enable_ots" = "yes" || \
++ test "$ots_deps" = "yes"; then
+
+-test "$enable_ots" == "auto" && PLUGINS="$PLUGINS ots"
++test "$enable_ots" = "auto" && PLUGINS="$PLUGINS ots"
+
+-if test "$enable_ots_builtin" == "yes"; then
++if test "$enable_ots_builtin" = "yes"; then
+ { { $as_echo "$as_me:$LINENO: error: ots plugin: static linking not supported" >&5
+ $as_echo "$as_me: error: ots plugin: static linking not supported" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -22022,12 +22022,12 @@
+
+ if test "$enable_google" != ""; then
+
+-test "$enable_google" == "auto" && PLUGINS="$PLUGINS google"
++test "$enable_google" = "auto" && PLUGINS="$PLUGINS google"
+
+ GOOGLE_CFLAGS="$GOOGLE_CFLAGS "'${PLUGIN_CFLAGS}'
+ GOOGLE_LIBS="$GOOGLE_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_google_builtin" == "yes"; then
++if test "$enable_google_builtin" = "yes"; then
+ GOOGLE_CFLAGS="$GOOGLE_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -22053,15 +22053,15 @@
+
+ else
+
+- test "$enable_opendocument" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: opendocument plugin: dependencies not satisfied - $opendocument_pkgs" >&5
++ test "$enable_opendocument" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: opendocument plugin: dependencies not satisfied - $opendocument_pkgs" >&5
+ $as_echo "$as_me: WARNING: opendocument plugin: dependencies not satisfied - $opendocument_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_opendocument" == "yes" || \
+- test "$opendocument_deps" == "yes"; then
++if test "$enable_opendocument" = "yes" || \
++ test "$opendocument_deps" = "yes"; then
+
+
+ pkg_failed=no
+@@ -22173,12 +22173,12 @@
+ :
+ fi
+
+-test "$enable_opendocument" == "auto" && PLUGINS="$PLUGINS opendocument"
++test "$enable_opendocument" = "auto" && PLUGINS="$PLUGINS opendocument"
+
+ OPENDOCUMENT_CFLAGS="$OPENDOCUMENT_CFLAGS "'${PLUGIN_CFLAGS}'
+ OPENDOCUMENT_LIBS="$OPENDOCUMENT_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_opendocument_builtin" == "yes"; then
++if test "$enable_opendocument_builtin" = "yes"; then
+ OPENDOCUMENT_CFLAGS="$OPENDOCUMENT_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -22209,17 +22209,17 @@
+
+ else
+
+- test "$enable_wordperfect" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: wordperfect plugin: dependencies not satisfied - $wordperfect_pkgs" >&5
++ test "$enable_wordperfect" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: wordperfect plugin: dependencies not satisfied - $wordperfect_pkgs" >&5
+ $as_echo "$as_me: WARNING: wordperfect plugin: dependencies not satisfied - $wordperfect_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_wordperfect" == "yes" || \
+- test "$wordperfect_deps" == "yes"; then
++if test "$enable_wordperfect" = "yes" || \
++ test "$wordperfect_deps" = "yes"; then
+
+-if test "$enable_wordperfect_builtin" == "yes"; then
++if test "$enable_wordperfect_builtin" = "yes"; then
+ { { $as_echo "$as_me:$LINENO: error: wordperfect plugin: static linking not supported" >&5
+ $as_echo "$as_me: error: wordperfect plugin: static linking not supported" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -22349,7 +22349,7 @@
+ :
+ fi
+
+-test "$enable_wordperfect" == "auto" && PLUGINS="$PLUGINS wordperfect"
++test "$enable_wordperfect" = "auto" && PLUGINS="$PLUGINS wordperfect"
+
+ WORDPERFECT_CFLAGS="$WORDPERFECT_CFLAGS "'${PLUGIN_CFLAGS}'"$WPS_DEFINE"
+ WORDPERFECT_LIBS="$WORDPERFECT_LIBS "'${PLUGIN_LIBS}'
+@@ -22365,12 +22365,12 @@
+
+ if test "$enable_urldict" != ""; then
+
+-test "$enable_urldict" == "auto" && PLUGINS="$PLUGINS urldict"
++test "$enable_urldict" = "auto" && PLUGINS="$PLUGINS urldict"
+
+ URLDICT_CFLAGS="$URLDICT_CFLAGS "'${PLUGIN_CFLAGS}'
+ URLDICT_LIBS="$URLDICT_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_urldict_builtin" == "yes"; then
++if test "$enable_urldict_builtin" = "yes"; then
+ URLDICT_CFLAGS="$URLDICT_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -22479,8 +22479,8 @@
+
+ if test "$enable_psion" != ""; then
+
+- if test "$psiconvconfig" == ""; then
+- if test "$enable_psion" == "yes"; then
++ if test "$psiconvconfig" = ""; then
++ if test "$enable_psion" = "yes"; then
+ { { $as_echo "$as_me:$LINENO: error: psiconv plugin: program psiconv-config not found in path" >&5
+ $as_echo "$as_me: error: psiconv plugin: program psiconv-config not found in path" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -22509,10 +22509,10 @@
+ fi
+ fi
+
+-if test "$enable_psion" == "yes" || \
+- test "$psion_deps" == "yes"; then
++if test "$enable_psion" = "yes" || \
++ test "$psion_deps" = "yes"; then
+
+-if test "$enable_psion_builtin" == "yes"; then
++if test "$enable_psion_builtin" = "yes"; then
+ { { $as_echo "$as_me:$LINENO: error: psion plugin: static linking not supported" >&5
+ $as_echo "$as_me: error: psion plugin: static linking not supported" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -22520,7 +22520,7 @@
+
+ { $as_echo "$as_me:$LINENO: checking for psiconv >= ${psiconv_major_req}.${psiconv_minor_req}.${psiconv_micro_req}" >&5
+ $as_echo_n "checking for psiconv >= ${psiconv_major_req}.${psiconv_minor_req}.${psiconv_micro_req}... " >&6; }
+-if test "$psion_deps" == "yes"; then
++if test "$psion_deps" = "yes"; then
+ { $as_echo "$as_me:$LINENO: result: version ${psiconv_major_found}.${psiconv_minor_found}.${psiconv_micro_found} (ok)" >&5
+ $as_echo "version ${psiconv_major_found}.${psiconv_minor_found}.${psiconv_micro_found} (ok)" >&6; }
+ PSION_CFLAGS=`$psiconvconfig --cflags`
+@@ -22531,7 +22531,7 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+-test "$enable_psion" == "auto" && PLUGINS="$PLUGINS psion"
++test "$enable_psion" = "auto" && PLUGINS="$PLUGINS psion"
+
+ PSION_CFLAGS="$PSION_CFLAGS "'${PLUGIN_CFLAGS}'
+ PSION_LIBS="$PSION_LIBS "'${PLUGIN_LIBS}'
+@@ -22547,12 +22547,12 @@
+
+ if test "$enable_opml" != ""; then
+
+-test "$enable_opml" == "auto" && PLUGINS="$PLUGINS opml"
++test "$enable_opml" = "auto" && PLUGINS="$PLUGINS opml"
+
+ OPML_CFLAGS="$OPML_CFLAGS "'${PLUGIN_CFLAGS}'
+ OPML_LIBS="$OPML_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_opml_builtin" == "yes"; then
++if test "$enable_opml_builtin" = "yes"; then
+ OPML_CFLAGS="$OPML_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -22567,12 +22567,12 @@
+
+ if test "$enable_eml" != ""; then
+
+-test "$enable_eml" == "auto" && PLUGINS="$PLUGINS eml"
++test "$enable_eml" = "auto" && PLUGINS="$PLUGINS eml"
+
+ EML_CFLAGS="$EML_CFLAGS "'${PLUGIN_CFLAGS}'
+ EML_LIBS="$EML_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_eml_builtin" == "yes"; then
++if test "$enable_eml_builtin" = "yes"; then
+ EML_CFLAGS="$EML_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -22617,7 +22617,7 @@
+
+ fi
+
+-test "$enable_collab_backend_telepathy" == "yes" && collab_pkgs="$collab_pkgs $collab_telepathy_req"
++test "$enable_collab_backend_telepathy" = "yes" && collab_pkgs="$collab_pkgs $collab_telepathy_req"
+ { $as_echo "$as_me:$LINENO: checking for collab telepathy backend" >&5
+ $as_echo_n "checking for collab telepathy backend... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_collab_backend_telepathy" >&5
+@@ -22644,7 +22644,7 @@
+
+ fi
+
+-test "$enable_collab_backend_xmpp" == "yes" && collab_pkgs="$collab_pkgs $collab_xmpp_req"
++test "$enable_collab_backend_xmpp" = "yes" && collab_pkgs="$collab_pkgs $collab_xmpp_req"
+ { $as_echo "$as_me:$LINENO: checking for collab xmpp backend" >&5
+ $as_echo_n "checking for collab xmpp backend... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_collab_backend_xmpp" >&5
+@@ -23020,7 +23020,7 @@
+
+ fi
+
+-test "$enable_collab_backend_sugar" == "yes" && collab_pkgs="$collab_pkgs $collab_sugar_req"
++test "$enable_collab_backend_sugar" = "yes" && collab_pkgs="$collab_pkgs $collab_sugar_req"
+ { $as_echo "$as_me:$LINENO: checking for collab sugar backend" >&5
+ $as_echo_n "checking for collab sugar backend... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_collab_backend_sugar" >&5
+@@ -23370,7 +23370,7 @@
+
+ fi
+
+-test "$enable_collab_backend_service" == "yes" && collab_pkgs="$collab_pkgs $collab_service_req"
++test "$enable_collab_backend_service" = "yes" && collab_pkgs="$collab_pkgs $collab_service_req"
+ { $as_echo "$as_me:$LINENO: checking for collab service backend" >&5
+ $as_echo_n "checking for collab service backend... " >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_collab_backend_service" >&5
+@@ -23409,17 +23409,17 @@
+
+ fi
+
+-if test "$enable_collab" == "yes" || \
+- test "$collab_deps" == "yes"; then
++if test "$enable_collab" = "yes" || \
++ test "$collab_deps" = "yes"; then
+
+-if test "$enable_collab_builtin" == "yes"; then
++if test "$enable_collab_builtin" = "yes"; then
+ { { $as_echo "$as_me:$LINENO: error: collab plugin: static linking not supported" >&5
+ $as_echo "$as_me: error: collab plugin: static linking not supported" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ # HACK, no way to detect, check only if explicitely enabled
+-if test "$enable_collab" == "yes"; then
++if test "$enable_collab" = "yes"; then
+ # check for various boost libs, needs to be done before
+
+
+@@ -23807,48 +23807,48 @@
+ :
+ fi
+
+-if test "$enable_collab_backend_fake" == "yes"; then
++if test "$enable_collab_backend_fake" = "yes"; then
+ COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_FAKE"
+ COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_FAKE"
+ fi
+-if test "$enable_collab_backend_telepathy" == "yes"; then
++if test "$enable_collab_backend_telepathy" = "yes"; then
+ COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_TELEPATHY"
+ COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_TELEPATHY"
+ fi
+-if test "$enable_collab_backend_xmpp" == "yes"; then
++if test "$enable_collab_backend_xmpp" = "yes"; then
+ COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_XMPP"
+ COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_XMPP"
+ fi
+-if test "$enable_collab_backend_tcp" == "yes"; then
++if test "$enable_collab_backend_tcp" = "yes"; then
+ COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_TCP"
+ COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_TCP"
+ fi
+-if test "$enable_collab_backend_sugar" == "yes"; then
++if test "$enable_collab_backend_sugar" = "yes"; then
+ COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_SUGAR"
+ COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_SUGAR"
+ fi
+-if test "$enable_collab_backend_service" == "yes"; then
++if test "$enable_collab_backend_service" = "yes"; then
+ COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_SERVICE -DSOUP24"
+ COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_SERVICE"
+ fi
+-if test "$enable_collab_record_always" == "yes"; then
++if test "$enable_collab_record_always" = "yes"; then
+ COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_RECORD_ALWAYS"
+ COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_RECORD_ALWAYS"
+ fi
+
+-if test "$enable_collab_backend_tcp" == "yes" || \
+- test "$enable_collab_backend_service" == "yes"; then
++if test "$enable_collab_backend_tcp" = "yes" || \
++ test "$enable_collab_backend_service" = "yes"; then
+ COLLAB_LIBS="$COLLAB_LIBS -lgcrypt -pthread"
+ fi
+
+-test "$enable_collab" == "auto" && PLUGINS="$PLUGINS collab"
++test "$enable_collab" = "auto" && PLUGINS="$PLUGINS collab"
+
+ COLLAB_CFLAGS="$COLLAB_CFLAGS "'${PLUGIN_CFLAGS}'
+ COLLAB_LIBS="$COLLAB_LIBS "'${PLUGIN_LIBS}'
+
+ fi # plugin conditional
+
+- if test "$enable_collab_backend_fake" == "yes"; then
++ if test "$enable_collab_backend_fake" = "yes"; then
+ COLLAB_BACKEND_FAKE_TRUE=
+ COLLAB_BACKEND_FAKE_FALSE='#'
+ else
+@@ -23856,7 +23856,7 @@
+ COLLAB_BACKEND_FAKE_FALSE=
+ fi
+
+- if test "$enable_collab_backend_telepathy" == "yes"; then
++ if test "$enable_collab_backend_telepathy" = "yes"; then
+ COLLAB_BACKEND_TELEPATHY_TRUE=
+ COLLAB_BACKEND_TELEPATHY_FALSE='#'
+ else
+@@ -23864,7 +23864,7 @@
+ COLLAB_BACKEND_TELEPATHY_FALSE=
+ fi
+
+- if test "$enable_collab_backend_xmpp" == "yes"; then
++ if test "$enable_collab_backend_xmpp" = "yes"; then
+ COLLAB_BACKEND_XMPP_TRUE=
+ COLLAB_BACKEND_XMPP_FALSE='#'
+ else
+@@ -23872,7 +23872,7 @@
+ COLLAB_BACKEND_XMPP_FALSE=
+ fi
+
+- if test "$enable_collab_backend_tcp" == "yes"; then
++ if test "$enable_collab_backend_tcp" = "yes"; then
+ COLLAB_BACKEND_TCP_TRUE=
+ COLLAB_BACKEND_TCP_FALSE='#'
+ else
+@@ -23880,7 +23880,7 @@
+ COLLAB_BACKEND_TCP_FALSE=
+ fi
+
+- if test "$enable_collab_backend_sugar" == "yes"; then
++ if test "$enable_collab_backend_sugar" = "yes"; then
+ COLLAB_BACKEND_SUGAR_TRUE=
+ COLLAB_BACKEND_SUGAR_FALSE='#'
+ else
+@@ -23888,7 +23888,7 @@
+ COLLAB_BACKEND_SUGAR_FALSE=
+ fi
+
+- if test "$enable_collab_backend_service" == "yes"; then
++ if test "$enable_collab_backend_service" = "yes"; then
+ COLLAB_BACKEND_SERVICE_TRUE=
+ COLLAB_BACKEND_SERVICE_FALSE='#'
+ else
+@@ -23896,7 +23896,7 @@
+ COLLAB_BACKEND_SERVICE_FALSE=
+ fi
+
+- if test "$enable_collab_record_always" == "yes"; then
++ if test "$enable_collab_record_always" = "yes"; then
+ COLLAB_RECORD_ALWAYS_TRUE=
+ COLLAB_RECORD_ALWAYS_FALSE='#'
+ else
+@@ -23929,15 +23929,15 @@
+
+ else
+
+- test "$enable_pdf" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: pdf plugin: dependencies not satisfied - $pdf_pkgs" >&5
++ test "$enable_pdf" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: pdf plugin: dependencies not satisfied - $pdf_pkgs" >&5
+ $as_echo "$as_me: WARNING: pdf plugin: dependencies not satisfied - $pdf_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_pdf" == "yes" || \
+- test "$pdf_deps" == "yes"; then
++if test "$enable_pdf" = "yes" || \
++ test "$pdf_deps" = "yes"; then
+
+
+ pkg_failed=no
+@@ -24049,12 +24049,12 @@
+ :
+ fi
+
+-test "$enable_pdf" == "auto" && PLUGINS="$PLUGINS pdf"
++test "$enable_pdf" = "auto" && PLUGINS="$PLUGINS pdf"
+
+ PDF_CFLAGS="$PDF_CFLAGS "'${PLUGIN_CFLAGS}'
+ PDF_LIBS="$PDF_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_pdf_builtin" == "yes"; then
++if test "$enable_pdf_builtin" = "yes"; then
+ PDF_CFLAGS="$PDF_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -24163,8 +24163,8 @@
+
+ if test "$enable_wmf" != ""; then
+
+- if test "$libwmfconfig" == ""; then
+- if test "$enable_wmf" == "yes"; then
++ if test "$libwmfconfig" = ""; then
++ if test "$enable_wmf" = "yes"; then
+ { { $as_echo "$as_me:$LINENO: error: wmf plugin: program libwmf-config not found in path" >&5
+ $as_echo "$as_me: error: wmf plugin: program libwmf-config not found in path" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -24193,10 +24193,10 @@
+ fi
+ fi
+
+-if test "$enable_wmf" == "yes" || \
+- test "$wmf_deps" == "yes"; then
++if test "$enable_wmf" = "yes" || \
++ test "$wmf_deps" = "yes"; then
+
+-if test "$enable_wmf_builtin" == "yes"; then
++if test "$enable_wmf_builtin" = "yes"; then
+ { { $as_echo "$as_me:$LINENO: error: wmf plugin: static linking not supported" >&5
+ $as_echo "$as_me: error: wmf plugin: static linking not supported" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -24204,7 +24204,7 @@
+
+ { $as_echo "$as_me:$LINENO: checking for libwmf >= ${libwmf_major_req}.${libwmf_minor_req}.${libwmf_micro_req}" >&5
+ $as_echo_n "checking for libwmf >= ${libwmf_major_req}.${libwmf_minor_req}.${libwmf_micro_req}... " >&6; }
+-if test "$wmf_deps" == "yes"; then
++if test "$wmf_deps" = "yes"; then
+ { $as_echo "$as_me:$LINENO: result: version ${libwmf_major_found}.${libwmf_minor_found}.${libwmf_micro_found} (ok)" >&5
+ $as_echo "version ${libwmf_major_found}.${libwmf_minor_found}.${libwmf_micro_found} (ok)" >&6; }
+ WMF_CFLAGS=`$libwmfconfig --cflags`
+@@ -24215,7 +24215,7 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+-test "$enable_wmf" == "auto" && PLUGINS="$PLUGINS wmf"
++test "$enable_wmf" = "auto" && PLUGINS="$PLUGINS wmf"
+
+ WMF_CFLAGS="$WMF_CFLAGS "'${PLUGIN_CFLAGS}'
+ WMF_LIBS="$WMF_LIBS "'${PLUGIN_LIBS}'
+@@ -24242,15 +24242,15 @@
+
+ else
+
+- test "$enable_t602" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: t602 plugin: dependencies not satisfied - $t602_pkgs" >&5
++ test "$enable_t602" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: t602 plugin: dependencies not satisfied - $t602_pkgs" >&5
+ $as_echo "$as_me: WARNING: t602 plugin: dependencies not satisfied - $t602_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_t602" == "yes" || \
+- test "$t602_deps" == "yes"; then
++if test "$enable_t602" = "yes" || \
++ test "$t602_deps" = "yes"; then
+
+
+ pkg_failed=no
+@@ -24362,12 +24362,12 @@
+ :
+ fi
+
+-test "$enable_t602" == "auto" && PLUGINS="$PLUGINS t602"
++test "$enable_t602" = "auto" && PLUGINS="$PLUGINS t602"
+
+ T602_CFLAGS="$T602_CFLAGS "'${PLUGIN_CFLAGS}'
+ T602_LIBS="$T602_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_t602_builtin" == "yes"; then
++if test "$enable_t602_builtin" = "yes"; then
+ T602_CFLAGS="$T602_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -24393,15 +24393,15 @@
+
+ else
+
+- test "$enable_mswrite" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: mswrite plugin: dependencies not satisfied - $mswrite_pkgs" >&5
++ test "$enable_mswrite" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: mswrite plugin: dependencies not satisfied - $mswrite_pkgs" >&5
+ $as_echo "$as_me: WARNING: mswrite plugin: dependencies not satisfied - $mswrite_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_mswrite" == "yes" || \
+- test "$mswrite_deps" == "yes"; then
++if test "$enable_mswrite" = "yes" || \
++ test "$mswrite_deps" = "yes"; then
+
+
+ pkg_failed=no
+@@ -24513,12 +24513,12 @@
+ :
+ fi
+
+-test "$enable_mswrite" == "auto" && PLUGINS="$PLUGINS mswrite"
++test "$enable_mswrite" = "auto" && PLUGINS="$PLUGINS mswrite"
+
+ MSWRITE_CFLAGS="$MSWRITE_CFLAGS "'${PLUGIN_CFLAGS}'
+ MSWRITE_LIBS="$MSWRITE_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_mswrite_builtin" == "yes"; then
++if test "$enable_mswrite_builtin" = "yes"; then
+ MSWRITE_CFLAGS="$MSWRITE_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -24544,15 +24544,15 @@
+
+ else
+
+- test "$enable_clarisworks" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: clarisworks plugin: dependencies not satisfied - $clarisworks_pkgs" >&5
++ test "$enable_clarisworks" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: clarisworks plugin: dependencies not satisfied - $clarisworks_pkgs" >&5
+ $as_echo "$as_me: WARNING: clarisworks plugin: dependencies not satisfied - $clarisworks_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_clarisworks" == "yes" || \
+- test "$clarisworks_deps" == "yes"; then
++if test "$enable_clarisworks" = "yes" || \
++ test "$clarisworks_deps" = "yes"; then
+
+
+ pkg_failed=no
+@@ -24664,12 +24664,12 @@
+ :
+ fi
+
+-test "$enable_clarisworks" == "auto" && PLUGINS="$PLUGINS clarisworks"
++test "$enable_clarisworks" = "auto" && PLUGINS="$PLUGINS clarisworks"
+
+ CLARISWORKS_CFLAGS="$CLARISWORKS_CFLAGS "'${PLUGIN_CFLAGS}'
+ CLARISWORKS_LIBS="$CLARISWORKS_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_clarisworks_builtin" == "yes"; then
++if test "$enable_clarisworks_builtin" = "yes"; then
+ CLARISWORKS_CFLAGS="$CLARISWORKS_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -24684,12 +24684,12 @@
+
+ if test "$enable_freetranslation" != ""; then
+
+-test "$enable_freetranslation" == "auto" && PLUGINS="$PLUGINS freetranslation"
++test "$enable_freetranslation" = "auto" && PLUGINS="$PLUGINS freetranslation"
+
+ FREETRANSLATION_CFLAGS="$FREETRANSLATION_CFLAGS "'${PLUGIN_CFLAGS}'
+ FREETRANSLATION_LIBS="$FREETRANSLATION_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_freetranslation_builtin" == "yes"; then
++if test "$enable_freetranslation_builtin" = "yes"; then
+ FREETRANSLATION_CFLAGS="$FREETRANSLATION_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -24712,7 +24712,7 @@
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+
+- if test "$TOOLKIT" == "gtk"; then
++ if test "$TOOLKIT" = "gtk"; then
+ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$aiksaurus_gtk_pkgs \"") >&5
+ ($PKG_CONFIG --exists --print-errors " $aiksaurus_gtk_pkgs ") 2>&5
+@@ -24724,7 +24724,7 @@
+
+ else
+
+- test "$enable_aiksaurus" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: aiksaurus plugin: dependencies not satisfied - $aiksaurus_gtk_pkgs" >&5
++ test "$enable_aiksaurus" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: aiksaurus plugin: dependencies not satisfied - $aiksaurus_gtk_pkgs" >&5
+ $as_echo "$as_me: WARNING: aiksaurus plugin: dependencies not satisfied - $aiksaurus_gtk_pkgs" >&2;}
+
+ fi
+@@ -24734,17 +24734,17 @@
+
+ else
+
+- test "$enable_aiksaurus" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: aiksaurus plugin: dependencies not satisfied - $aiksaurus_pkgs" >&5
++ test "$enable_aiksaurus" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: aiksaurus plugin: dependencies not satisfied - $aiksaurus_pkgs" >&5
+ $as_echo "$as_me: WARNING: aiksaurus plugin: dependencies not satisfied - $aiksaurus_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_aiksaurus" == "yes" || \
+- test "$aiksaurus_deps" == "yes"; then
++if test "$enable_aiksaurus" = "yes" || \
++ test "$aiksaurus_deps" = "yes"; then
+
+-if test "$enable_aiksaurus_builtin" == "yes"; then
++if test "$enable_aiksaurus_builtin" = "yes"; then
+ { { $as_echo "$as_me:$LINENO: error: aiksaurus plugin: static linking not supported" >&5
+ $as_echo "$as_me: error: aiksaurus plugin: static linking not supported" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -24860,7 +24860,7 @@
+ :
+ fi
+
+-if test "$TOOLKIT" == "gtk"; then
++if test "$TOOLKIT" = "gtk"; then
+
+ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for AIKSAURUS_GTK" >&5
+@@ -24974,7 +24974,7 @@
+ AIKSAURUS_LIBS="$AIKSAURUS_LIBS $AIKSAURUS_GTK_LIBS"
+ fi
+
+-test "$enable_aiksaurus" == "auto" && PLUGINS="$PLUGINS aiksaurus"
++test "$enable_aiksaurus" = "auto" && PLUGINS="$PLUGINS aiksaurus"
+
+ AIKSAURUS_CFLAGS="$AIKSAURUS_CFLAGS "'${PLUGIN_CFLAGS}'
+ AIKSAURUS_LIBS="$AIKSAURUS_LIBS "'${PLUGIN_LIBS}'
+@@ -25001,15 +25001,15 @@
+
+ else
+
+- test "$enable_hancom" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: hancom plugin: dependencies not satisfied - $hancom_pkgs" >&5
++ test "$enable_hancom" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: hancom plugin: dependencies not satisfied - $hancom_pkgs" >&5
+ $as_echo "$as_me: WARNING: hancom plugin: dependencies not satisfied - $hancom_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_hancom" == "yes" || \
+- test "$hancom_deps" == "yes"; then
++if test "$enable_hancom" = "yes" || \
++ test "$hancom_deps" = "yes"; then
+
+
+ pkg_failed=no
+@@ -25121,12 +25121,12 @@
+ :
+ fi
+
+-test "$enable_hancom" == "auto" && PLUGINS="$PLUGINS hancom"
++test "$enable_hancom" = "auto" && PLUGINS="$PLUGINS hancom"
+
+ HANCOM_CFLAGS="$HANCOM_CFLAGS "'${PLUGIN_CFLAGS}'
+ HANCOM_LIBS="$HANCOM_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_hancom_builtin" == "yes"; then
++if test "$enable_hancom_builtin" = "yes"; then
+ HANCOM_CFLAGS="$HANCOM_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -25141,12 +25141,12 @@
+
+ if test "$enable_iscii" != ""; then
+
+-test "$enable_iscii" == "auto" && PLUGINS="$PLUGINS iscii"
++test "$enable_iscii" = "auto" && PLUGINS="$PLUGINS iscii"
+
+ ISCII_CFLAGS="$ISCII_CFLAGS "'${PLUGIN_CFLAGS}'
+ ISCII_LIBS="$ISCII_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_iscii_builtin" == "yes"; then
++if test "$enable_iscii_builtin" = "yes"; then
+ ISCII_CFLAGS="$ISCII_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -25312,7 +25312,7 @@
+
+ else
+
+- if test "$enable_openxml" == "auto"; then
++ if test "$enable_openxml" = "auto"; then
+ { $as_echo "$as_me:$LINENO: WARNING: openxml plugin: \`boost/shared_ptr.hpp' not found, install boost or specify CPPFLAGS to include custom locations" >&5
+ $as_echo "$as_me: WARNING: openxml plugin: \`boost/shared_ptr.hpp' not found, install boost or specify CPPFLAGS to include custom locations" >&2;}
+ else
+@@ -25333,15 +25333,15 @@
+
+ else
+
+- test "$enable_openxml" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: openxml plugin: dependencies not satisfied - $openxml_pkgs" >&5
++ test "$enable_openxml" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: openxml plugin: dependencies not satisfied - $openxml_pkgs" >&5
+ $as_echo "$as_me: WARNING: openxml plugin: dependencies not satisfied - $openxml_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_openxml" == "yes" || \
+- test "$openxml_deps" == "yes"; then
++if test "$enable_openxml" = "yes" || \
++ test "$openxml_deps" = "yes"; then
+
+
+ pkg_failed=no
+@@ -25453,12 +25453,12 @@
+ :
+ fi
+
+-test "$enable_openxml" == "auto" && PLUGINS="$PLUGINS openxml"
++test "$enable_openxml" = "auto" && PLUGINS="$PLUGINS openxml"
+
+ OPENXML_CFLAGS="$OPENXML_CFLAGS "'${PLUGIN_CFLAGS}'
+ OPENXML_LIBS="$OPENXML_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_openxml_builtin" == "yes"; then
++if test "$enable_openxml_builtin" = "yes"; then
+ OPENXML_CFLAGS="$OPENXML_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -25476,14 +25476,14 @@
+
+ { $as_echo "$as_me:$LINENO: checking for unix/gtk platform" >&5
+ $as_echo_n "checking for unix/gtk platform... " >&6; }
+-if test "$TOOLKIT" == "gtk"; then
++if test "$TOOLKIT" = "gtk"; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
+ gdict_deps="yes"
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+- if test "$enable_gdict" == "auto"; then
++ if test "$enable_gdict" = "auto"; then
+ { $as_echo "$as_me:$LINENO: WARNING: gdict plugin: only supported on UNIX/gtk platforms" >&5
+ $as_echo "$as_me: WARNING: gdict plugin: only supported on UNIX/gtk platforms" >&2;}
+ else
+@@ -25495,8 +25495,8 @@
+
+ fi
+
+-if test "$enable_gdict" == "yes" || \
+- test "$gdict_deps" == "yes"; then
++if test "$enable_gdict" = "yes" || \
++ test "$gdict_deps" = "yes"; then
+
+ { $as_echo "$as_me:$LINENO: checking for pid_t" >&5
+ $as_echo_n "checking for pid_t... " >&6; }
+@@ -25603,7 +25603,7 @@
+ fi
+
+
+-test "$enable_gdict" == "auto" && PLUGINS="$PLUGINS gdict"
++test "$enable_gdict" = "auto" && PLUGINS="$PLUGINS gdict"
+
+ GDICT_CFLAGS="$GDICT_CFLAGS "'${PLUGIN_CFLAGS} -DUSE_FORK_AND_EXEC_METHOD=1'
+ GDICT_LIBS='${PLUGIN_LIBS}'
+@@ -25623,12 +25623,12 @@
+
+ if test "$enable_s5" != ""; then
+
+-test "$enable_s5" == "auto" && PLUGINS="$PLUGINS s5"
++test "$enable_s5" = "auto" && PLUGINS="$PLUGINS s5"
+
+ S5_CFLAGS="$S5_CFLAGS "'${PLUGIN_CFLAGS}'
+ S5_LIBS="$S5_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_s5_builtin" == "yes"; then
++if test "$enable_s5_builtin" = "yes"; then
+ S5_CFLAGS="$S5_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -25957,17 +25957,17 @@
+
+ else
+
+- test "$enable_mathview" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: mathview plugin: dependencies not satisfied - $mathview_pkgs" >&5
++ test "$enable_mathview" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: mathview plugin: dependencies not satisfied - $mathview_pkgs" >&5
+ $as_echo "$as_me: WARNING: mathview plugin: dependencies not satisfied - $mathview_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_mathview" == "yes" || \
+- test "$mathview_deps" == "yes"; then
++if test "$enable_mathview" = "yes" || \
++ test "$mathview_deps" = "yes"; then
+
+-if test "$enable_mathview_builtin" == "yes"; then
++if test "$enable_mathview_builtin" = "yes"; then
+ { { $as_echo "$as_me:$LINENO: error: mathview plugin: static linking not supported" >&5
+ $as_echo "$as_me: error: mathview plugin: static linking not supported" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -26083,7 +26083,7 @@
+ :
+ fi
+
+-test "$enable_mathview" == "auto" && PLUGINS="$PLUGINS mathview"
++test "$enable_mathview" = "auto" && PLUGINS="$PLUGINS mathview"
+
+ MATHVIEW_CFLAGS="$MATHVIEW_CFLAGS $HASHMAP_CFLAGS "'${PLUGIN_CFLAGS}'
+ MATHVIEW_LIBS="$MATHVIEW_LIBS "'${PLUGIN_LIBS}'
+@@ -26371,14 +26371,14 @@
+
+ { $as_echo "$as_me:$LINENO: checking for gtk toolkit" >&5
+ $as_echo_n "checking for gtk toolkit... " >&6; }
+- if test "$TOOLKIT" == "gtk"; then
++ if test "$TOOLKIT" = "gtk"; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
+ gda_deps="yes"
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+- if test "$enable_gda" == "auto"; then
++ if test "$enable_gda" = "auto"; then
+ { $as_echo "$as_me:$LINENO: WARNING: gda plugin: only supported with gtk" >&5
+ $as_echo "$as_me: WARNING: gda plugin: only supported with gtk" >&2;}
+ else
+@@ -26390,17 +26390,17 @@
+
+ else
+
+- test "$enable_gda" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: gda plugin: dependencies not satisfied - $gda_pkgs" >&5
++ test "$enable_gda" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: gda plugin: dependencies not satisfied - $gda_pkgs" >&5
+ $as_echo "$as_me: WARNING: gda plugin: dependencies not satisfied - $gda_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_gda" == "yes" || \
+- test "$gda_deps" == "yes"; then
++if test "$enable_gda" = "yes" || \
++ test "$gda_deps" = "yes"; then
+
+-if test "$enable_gda_builtin" == "yes"; then
++if test "$enable_gda_builtin" = "yes"; then
+ { { $as_echo "$as_me:$LINENO: error: gda plugin: static linking not supported" >&5
+ $as_echo "$as_me: error: gda plugin: static linking not supported" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -26516,7 +26516,7 @@
+ :
+ fi
+
+-test "$enable_gda" == "auto" && PLUGINS="$PLUGINS gda"
++test "$enable_gda" = "auto" && PLUGINS="$PLUGINS gda"
+
+ GDA_CFLAGS="$GDA_CFLAGS "'${PLUGIN_CFLAGS}'
+ GDA_LIBS="$GDA_LIBS "'${PLUGIN_LIBS}'
+@@ -26530,7 +26530,7 @@
+ grammar_pkgs='link-grammar >= 4.2.1'
+ grammar_deps="no"
+
+-if test "$enable_grammar" != "" && test "$abi_cv_spell" == "yes"; then
++if test "$enable_grammar" != "" && test "$abi_cv_spell" = "yes"; then
+
+ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$grammar_pkgs \"") >&5
+@@ -26543,17 +26543,17 @@
+
+ else
+
+- test "$enable_grammar" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: grammar plugin: dependencies not satisfied - $grammar_pkgs" >&5
++ test "$enable_grammar" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: grammar plugin: dependencies not satisfied - $grammar_pkgs" >&5
+ $as_echo "$as_me: WARNING: grammar plugin: dependencies not satisfied - $grammar_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_grammar" == "yes" || \
+- test "$grammar_deps" == "yes"; then
++if test "$enable_grammar" = "yes" || \
++ test "$grammar_deps" = "yes"; then
+
+-if test "$enable_grammar_builtin" == "yes"; then
++if test "$enable_grammar_builtin" = "yes"; then
+ { { $as_echo "$as_me:$LINENO: error: grammar plugin: static linking not supported" >&5
+ $as_echo "$as_me: error: grammar plugin: static linking not supported" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -26669,7 +26669,7 @@
+ :
+ fi
+
+-test "$enable_grammar" == "auto" && PLUGINS="$PLUGINS grammar"
++test "$enable_grammar" = "auto" && PLUGINS="$PLUGINS grammar"
+
+ GRAMMAR_CFLAGS="$GRAMMAR_CFLAGS "'${PLUGIN_CFLAGS}'
+ GRAMMAR_LIBS="$GRAMMAR_LIBS "'${PLUGIN_LIBS}'
+@@ -26690,19 +26690,19 @@
+
+ fi
+
+-if test "$enable_bmp" == "yes" || \
+- test "$bmp_deps" == "yes"; then
++if test "$enable_bmp" = "yes" || \
++ test "$bmp_deps" = "yes"; then
+
+ # TODO check for libpng, well abiword links to it anyways
+
+ BMP_CFLAGS="$BMP_CFLAGS "'${PLUGIN_CFLAGS}'
+ BMP_LIBS="$BMP_LIBS "'${PLUGIN_LIBS} -lpng12'
+
+-if test "$enable_bmp_builtin" == "yes"; then
++if test "$enable_bmp_builtin" = "yes"; then
+ BMP_CFLAGS="$BMP_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+-test "$enable_bmp" == "auto" && PLUGINS="$PLUGINS bmp"
++test "$enable_bmp" = "auto" && PLUGINS="$PLUGINS bmp"
+
+ fi
+
+@@ -26726,15 +26726,15 @@
+
+ else
+
+- test "$enable_openwriter" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: openwriter plugin: dependencies not satisfied - $openwriter_pkgs" >&5
++ test "$enable_openwriter" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: openwriter plugin: dependencies not satisfied - $openwriter_pkgs" >&5
+ $as_echo "$as_me: WARNING: openwriter plugin: dependencies not satisfied - $openwriter_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_openwriter" == "yes" || \
+- test "$openwriter_deps" == "yes"; then
++if test "$enable_openwriter" = "yes" || \
++ test "$openwriter_deps" = "yes"; then
+
+
+ pkg_failed=no
+@@ -26846,12 +26846,12 @@
+ :
+ fi
+
+-test "$enable_openwriter" == "auto" && PLUGINS="$PLUGINS openwriter"
++test "$enable_openwriter" = "auto" && PLUGINS="$PLUGINS openwriter"
+
+ OPENWRITER_CFLAGS="$OPENWRITER_CFLAGS "'${PLUGIN_CFLAGS}'
+ OPENWRITER_LIBS="$OPENWRITER_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_openwriter_builtin" == "yes"; then
++if test "$enable_openwriter_builtin" = "yes"; then
+ OPENWRITER_CFLAGS="$OPENWRITER_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -26880,7 +26880,7 @@
+ abi_cv_libxslt="no"
+
+ fi
+- if test "$abi_cv_libxslt" == "yes"; then
++ if test "$abi_cv_libxslt" = "yes"; then
+ HAVE_LIBXSLT_TRUE=
+ HAVE_LIBXSLT_FALSE='#'
+ else
+@@ -26891,9 +26891,9 @@
+
+ if test "$enable_latex" != ""; then
+
+-test "$enable_latex" == "auto" && PLUGINS="$PLUGINS latex"
++test "$enable_latex" = "auto" && PLUGINS="$PLUGINS latex"
+
+-if test "$abi_cv_libxslt" == "yes"; then
++if test "$abi_cv_libxslt" = "yes"; then
+
+ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for LIBXSLT" >&5
+@@ -27123,7 +27123,7 @@
+ LATEX_CFLAGS="$LATEX_CFLAGS "'${PLUGIN_CFLAGS}'
+ LATEX_LIBS="$LATEX_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_latex_builtin" == "yes"; then
++if test "$enable_latex_builtin" = "yes"; then
+ LATEX_CFLAGS="$LATEX_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -27138,12 +27138,12 @@
+
+ if test "$enable_presentation" != ""; then
+
+-test "$enable_presentation" == "auto" && PLUGINS="$PLUGINS presentation"
++test "$enable_presentation" = "auto" && PLUGINS="$PLUGINS presentation"
+
+ PRESENTATION_CFLAGS="$PRESENTATION_CFLAGS "'${PLUGIN_CFLAGS}'
+ PRESENTATION_LIBS="$PRESENTATION_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_presentation_builtin" == "yes"; then
++if test "$enable_presentation_builtin" = "yes"; then
+ PRESENTATION_CFLAGS="$PRESENTATION_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -27156,9 +27156,9 @@
+ rsvg_pkgs="librsvg-2.0 >= 2.0 glib-2.0"
+ rsvg_deps="no"
+
+-if test "$TOOLKIT" == "gtk"; then
++if test "$TOOLKIT" = "gtk"; then
+
+- if test "$enable_rsvg" == "auto"; then
++ if test "$enable_rsvg" = "auto"; then
+ { $as_echo "$as_me:$LINENO: WARNING: rsvg plugin: not needed with gtk" >&5
+ $as_echo "$as_me: WARNING: rsvg plugin: not needed with gtk" >&2;}
+ fi
+@@ -27178,17 +27178,17 @@
+
+ else
+
+- test "$enable_rsvg" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: rsvg plugin: dependencies not satisfied - $rsvg_pkgs" >&5
++ test "$enable_rsvg" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: rsvg plugin: dependencies not satisfied - $rsvg_pkgs" >&5
+ $as_echo "$as_me: WARNING: rsvg plugin: dependencies not satisfied - $rsvg_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_rsvg" == "yes" || \
+- test "$rsvg_deps" == "yes"; then
++if test "$enable_rsvg" = "yes" || \
++ test "$rsvg_deps" = "yes"; then
+
+-if test "$enable_rsvg_builtin" == "yes"; then
++if test "$enable_rsvg_builtin" = "yes"; then
+ { { $as_echo "$as_me:$LINENO: error: rsvg plugin: static linking not supported" >&5
+ $as_echo "$as_me: error: rsvg plugin: static linking not supported" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -27304,7 +27304,7 @@
+ :
+ fi
+
+-test "$enable_rsvg" == "auto" && PLUGINS="$PLUGINS rsvg"
++test "$enable_rsvg" = "auto" && PLUGINS="$PLUGINS rsvg"
+
+ RSVG_CFLAGS="$RSVG_CFLAGS "'${PLUGIN_CFLAGS}'
+ RSVG_LIBS="$RSVG_LIBS "'${PLUGIN_LIBS}'
+@@ -27331,15 +27331,15 @@
+
+ else
+
+- test "$enable_wml" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: wml plugin: dependencies not satisfied - $wml_pkgs" >&5
++ test "$enable_wml" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: wml plugin: dependencies not satisfied - $wml_pkgs" >&5
+ $as_echo "$as_me: WARNING: wml plugin: dependencies not satisfied - $wml_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_wml" == "yes" || \
+- test "$wml_deps" == "yes"; then
++if test "$enable_wml" = "yes" || \
++ test "$wml_deps" = "yes"; then
+
+
+ pkg_failed=no
+@@ -27451,12 +27451,12 @@
+ :
+ fi
+
+-test "$enable_wml" == "auto" && PLUGINS="$PLUGINS wml"
++test "$enable_wml" = "auto" && PLUGINS="$PLUGINS wml"
+
+ WML_CFLAGS="$WML_CFLAGS "'${PLUGIN_CFLAGS}'
+ WML_LIBS="$WML_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_wml_builtin" == "yes"; then
++if test "$enable_wml_builtin" = "yes"; then
+ WML_CFLAGS="$WML_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -27471,12 +27471,12 @@
+
+ if test "$enable_passepartout" != ""; then
+
+-test "$enable_passepartout" == "auto" && PLUGINS="$PLUGINS passepartout"
++test "$enable_passepartout" = "auto" && PLUGINS="$PLUGINS passepartout"
+
+ PASSEPARTOUT_CFLAGS="$PASSEPARTOUT_CFLAGS "'${PLUGIN_CFLAGS}'
+ PASSEPARTOUT_LIBS="$PASSEPARTOUT_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_passepartout_builtin" == "yes"; then
++if test "$enable_passepartout_builtin" = "yes"; then
+ PASSEPARTOUT_CFLAGS="$PASSEPARTOUT_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -27502,17 +27502,17 @@
+
+ else
+
+- test "$enable_wpg" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: wpg plugin: dependencies not satisfied - $wpg_pkgs" >&5
++ test "$enable_wpg" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: wpg plugin: dependencies not satisfied - $wpg_pkgs" >&5
+ $as_echo "$as_me: WARNING: wpg plugin: dependencies not satisfied - $wpg_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_wpg" == "yes" || \
+- test "$wpg_deps" == "yes"; then
++if test "$enable_wpg" = "yes" || \
++ test "$wpg_deps" = "yes"; then
+
+-if test "$enable_wpg_builtin" == "yes"; then
++if test "$enable_wpg_builtin" = "yes"; then
+ { { $as_echo "$as_me:$LINENO: error: wpg plugin: static linking not supported" >&5
+ $as_echo "$as_me: error: wpg plugin: static linking not supported" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -27628,7 +27628,7 @@
+ :
+ fi
+
+-test "$enable_wpg" == "auto" && PLUGINS="$PLUGINS wpg"
++test "$enable_wpg" = "auto" && PLUGINS="$PLUGINS wpg"
+
+ WPG_CFLAGS="$WPG_CFLAGS "'${PLUGIN_CFLAGS}'
+ WPG_LIBS="$WPG_LIBS "'${PLUGIN_LIBS}'
+@@ -27655,15 +27655,15 @@
+
+ else
+
+- test "$enable_xslfo" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: xslfo plugin: dependencies not satisfied - $xslfo_pkgs" >&5
++ test "$enable_xslfo" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: xslfo plugin: dependencies not satisfied - $xslfo_pkgs" >&5
+ $as_echo "$as_me: WARNING: xslfo plugin: dependencies not satisfied - $xslfo_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_xslfo" == "yes" || \
+- test "$xslfo_deps" == "yes"; then
++if test "$enable_xslfo" = "yes" || \
++ test "$xslfo_deps" = "yes"; then
+
+
+ pkg_failed=no
+@@ -27775,12 +27775,12 @@
+ :
+ fi
+
+-test "$enable_xslfo" == "auto" && PLUGINS="$PLUGINS xslfo"
++test "$enable_xslfo" = "auto" && PLUGINS="$PLUGINS xslfo"
+
+ XSLFO_CFLAGS="$XSLFO_CFLAGS "'${PLUGIN_CFLAGS}'
+ XSLFO_LIBS="$XSLFO_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_xslfo_builtin" == "yes"; then
++if test "$enable_xslfo_builtin" = "yes"; then
+ XSLFO_CFLAGS="$XSLFO_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
+@@ -27806,15 +27806,15 @@
+
+ else
+
+- test "$enable_kword" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: kword plugin: dependencies not satisfied - $kword_pkgs" >&5
++ test "$enable_kword" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: kword plugin: dependencies not satisfied - $kword_pkgs" >&5
+ $as_echo "$as_me: WARNING: kword plugin: dependencies not satisfied - $kword_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_kword" == "yes" || \
+- test "$kword_deps" == "yes"; then
++if test "$enable_kword" = "yes" || \
++ test "$kword_deps" = "yes"; then
+
+
+ pkg_failed=no
+@@ -27926,7 +27926,7 @@
+ :
+ fi
+
+-test "$enable_kword" == "auto" && PLUGINS="$PLUGINS kword"
++test "$enable_kword" = "auto" && PLUGINS="$PLUGINS kword"
+
+ KWORD_CFLAGS="$KWORD_CFLAGS "'${PLUGIN_CFLAGS}'
+ KWORD_LIBS="$KWORD_LIBS "'${PLUGIN_LIBS}'
+@@ -27957,15 +27957,15 @@
+
+ else
+
+- test "$enable_sdw" == "auto" && { $as_echo "$as_me:$LINENO: WARNING: sdw plugin: dependencies not satisfied - $sdw_pkgs" >&5
++ test "$enable_sdw" = "auto" && { $as_echo "$as_me:$LINENO: WARNING: sdw plugin: dependencies not satisfied - $sdw_pkgs" >&5
+ $as_echo "$as_me: WARNING: sdw plugin: dependencies not satisfied - $sdw_pkgs" >&2;}
+
+ fi
+
+ fi
+
+-if test "$enable_sdw" == "yes" || \
+- test "$sdw_deps" == "yes"; then
++if test "$enable_sdw" = "yes" || \
++ test "$sdw_deps" = "yes"; then
+
+
+ pkg_failed=no
+@@ -28077,12 +28077,12 @@
+ :
+ fi
+
+-test "$enable_sdw" == "auto" && PLUGINS="$PLUGINS sdw"
++test "$enable_sdw" = "auto" && PLUGINS="$PLUGINS sdw"
+
+ SDW_CFLAGS="$SDW_CFLAGS "'${PLUGIN_CFLAGS}'
+ SDW_LIBS="$SDW_LIBS "'${PLUGIN_LIBS}'
+
+-if test "$enable_sdw_builtin" == "yes"; then
++if test "$enable_sdw_builtin" = "yes"; then
+ SDW_CFLAGS="$SDW_CFLAGS -DABI_PLUGIN_BUILTIN"
+ fi
+
diff --git a/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp b/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp
index 634dbfd9c8e3..fbbca1b6ce8f 100644
--- a/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp
+++ b/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp
@@ -1,19 +1,6 @@
---- src/af/util/xp/ut_iconv.cpp.orig 2008-04-04 09:41:47.000000000 -0500
-+++ src/af/util/xp/ut_iconv.cpp 2008-04-04 09:43:43.000000000 -0500
-@@ -230,10 +230,10 @@
- // we special-case the win32 build, otherwise spelling and other stuff
- // just doesn't work
- return "UCS-2LE";
--#elif defined(_LIBICONV_H)
-+#elif defined(_LIBICONV_H) || defined(__FreeBSD__)
- // libiconv seems to prefer UCS-2-INTERNAL to UCS-2BE and UCS-2LE
- return "UCS-2-INTERNAL";
--#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNXNTO__) || defined(__NetBSD__)
-+#elif defined(__OpenBSD__) || defined(__QNXNTO__) || defined(__NetBSD__)
- // we special case the BSDs since spelling just doesn't work
- return "UCS2";
- #else
-@@ -253,10 +253,10 @@
+--- src/af/util/xp/ut_iconv.cpp.orig 2009-06-25 02:52:27.000000000 +0200
++++ src/af/util/xp/ut_iconv.cpp 2009-10-27 22:43:07.000000000 +0100
+@@ -264,10 +264,10 @@ const char * ucs4Internal ()
// we special-case the win32 build, otherwise spelling and other stuff
// just doesn't work
return "UCS-4LE";
diff --git a/editors/abiword/files/patch-src_af_xap_unix_xap_UnixTableWidget.cpp b/editors/abiword/files/patch-src_af_xap_unix_xap_UnixTableWidget.cpp
deleted file mode 100644
index 40d60607f904..000000000000
--- a/editors/abiword/files/patch-src_af_xap_unix_xap_UnixTableWidget.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/af/xap/unix/xap_UnixTableWidget.cpp.orig 2008-08-13 00:22:24.000000000 +0200
-+++ src/af/xap/unix/xap_UnixTableWidget.cpp 2009-03-10 19:42:33.000000000 +0100
-@@ -123,7 +123,9 @@ abi_table_resize(AbiTable* table)
- g_return_if_fail(table);
-
- if (table->selected_rows == 0 && table->selected_cols == 0)
-- text = g_strdup(table->szCancel);
-+ // RIVERA changed as suggested by uwog (OSX X11 was crashing)
-+ //text = g_strdup(table->szCancel);
-+ text = (table->szCancel ? g_strdup(table->szCancel) : NULL);
- else
- {
- UT_UTF8String prText = "%d x %d ";
diff --git a/editors/abiword/files/patch-src_wp_ap_unix_ap_UnixApp.cpp b/editors/abiword/files/patch-src_wp_ap_unix_ap_UnixApp.cpp
deleted file mode 100644
index 8d22dcbebefa..000000000000
--- a/editors/abiword/files/patch-src_wp_ap_unix_ap_UnixApp.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wp/ap/unix/ap_UnixApp.cpp.orig 2008-04-01 15:41:39.000000000 -0500
-+++ src/wp/ap/unix/ap_UnixApp.cpp 2008-04-01 15:41:46.000000000 -0500
-@@ -1240,7 +1240,7 @@
- GNOME_PARAM_APP_DATADIR, PREFIX "/" PACKAGE "-" ABIWORD_SERIES,
- GNOME_PARAM_APP_LIBDIR, PREFIX "/" PACKAGE "-" ABIWORD_SERIES,
- GNOME_PARAM_POPT_TABLE, AP_Args::options,
-- GNOME_PARAM_NONE);
-+ (void *)0);
- #ifdef LOGFILE
- fprintf(logfile,"gnome_program_init completed \n");
- #endif
diff --git a/editors/abiword/files/patch-src_wp_xp_ie-imp-MsWord-97.cpp b/editors/abiword/files/patch-src_wp_xp_ie-imp-MsWord-97.cpp
deleted file mode 100644
index 1d7a5fec4441..000000000000
--- a/editors/abiword/files/patch-src_wp_xp_ie-imp-MsWord-97.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
---- src/wp/impexp/xp/ie_imp_MsWord_97.cpp.orig 2008-04-18 23:12:21.000000000 +0200
-+++ src/wp/impexp/xp/ie_imp_MsWord_97.cpp 2009-03-25 10:50:53.000000000 +0100
-@@ -354,6 +354,7 @@ typedef enum {
- F_TOC_FROM_RANGE,
- F_DATEINAME,
- F_SPEICHERDAT,
-+ F_MERGEFIELD,
- F_OTHER
- } Doc_Field_t;
-
-@@ -399,7 +400,7 @@ static Doc_Field_Mapping_t s_Tokens[] =
- {"NUMCHARS", F_NUMCHARS},
- {"NUMPAGES", F_NUMPAGES},
- {"NUMWORDS", F_NUMWORDS},
--
-+ {"MERGEFIELD", F_MERGEFIELD},
- // these below aren't handled by AbiWord, but they're known about
- {"HYPERLINK", F_HYPERLINK},
- {"PAGEREF", F_PAGEREF},
-@@ -3336,7 +3337,7 @@ int IE_Imp_MsWord_97::_beginChar (wvPars
- // inserting a symbol char ...
- iFontType = ps->fonts.ffn[achp->ftcSym].chs;
- }
-- else if(ps->fonts.ffn)
-+ else if(ps->fonts.ffn && (achp->ftcAscii < ps->fonts.nostrings))
- {
- iFontType = ps->fonts.ffn[achp->ftcAscii].chs;
- }
-@@ -3637,6 +3638,49 @@ bool IE_Imp_MsWord_97::_handleFieldEnd (
- tokenIndex = s_mapNameToField (token);
- switch (tokenIndex)
- {
-+ case F_MERGEFIELD:
-+ {
-+ const gchar* atts[5];
-+ atts[0] = "type";
-+ atts[1] = "mail_merge";
-+ atts[2] = "param";
-+ atts[3] = 0;
-+ atts[4] = 0;
-+
-+ token = strtok (NULL, "\"\" ");
-+
-+ UT_return_val_if_fail(f->argument[f->fieldI - 1] == 0x15, false);
-+
-+ f->argument[f->fieldI - 1] = 0;
-+ UT_UCS2Char * a = f->argument;
-+
-+ UT_UTF8String param;
-+
-+ if(*a == 0x14)
-+ {
-+ a++;
-+ }
-+
-+ while(*a)
-+ {
-+ if (!((171 == *a) || (187 == *a))) {
-+ // @argument looks like <<FieldName>>.
-+ // strip off the '<<' (171) and '>>' (187)
-+ param.appendUCS2(a, 1);
-+ }
-+
-+ a++;
-+ }
-+
-+ atts[3] = param.utf8_str();
-+
-+ if (!_appendObject (PTO_Field, static_cast<const gchar**>(&atts[0])))
-+ {
-+ UT_DEBUGMSG(("Dom: couldn't append field (type = '%s')\n", atts[1]));
-+ }
-+ }
-+ break;
-+
- case F_HYPERLINK:
- {
- token = strtok (NULL, "\"\" ");
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index c6a8e8338225..5f71fc93d15c 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -1,42 +1,92 @@
bin/abiword
include/abiword-%%ABIVERSION%%/abiwidget.h
+include/abiword-%%ABIVERSION%%/libabiword.h
include/abiword-%%ABIVERSION%%/xap_UnixTableWidget.h
+lib/abiword-%%ABIVERSION%%/plugins/opendocument.a
+lib/abiword-%%ABIVERSION%%/plugins/opendocument.la
+lib/abiword-%%ABIVERSION%%/plugins/opendocument.so
+lib/libabiword-%%ABIVERSION%%.a
+lib/libabiword-%%ABIVERSION%%.la
+lib/libabiword-%%ABIVERSION%%.so
libdata/pkgconfig/abiword-%%ABIVERSION%%.pc
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Break.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Field.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_FormatFootnotes.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_FormatFrame.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_FormatTOC.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_FormatTable.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Goto.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_HdrFtr.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_InsertTable.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Insert_DateTime.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Latex.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_MailMerge.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_MetaData.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_New.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Options.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Options_ColorSel.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_PageNumbers.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_PageSetup.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Replace.glade
-%%DICT:%%share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Spell.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Styles.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Stylist.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Stylist_modal.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_Tab.glade
-share/abiword-%%ABIVERSION%%/glade/ap_UnixDialog_WordCount.glade
-share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_DocComparison.glade
-share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_Encoding.glade
-share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_History.glade
-share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_Image.glade
-share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_Language.glade
-share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_ListDocuments.glade
-share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_Password.glade
-share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_PluginManager.glade
-share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_WindowMore.glade
-share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_Zoom.glade
+%%CLIPART%%share/abiword-2.8/clipart/book.png
+%%CLIPART%%share/abiword-2.8/clipart/chip.png
+%%CLIPART%%share/abiword-2.8/clipart/fun.png
+%%CLIPART%%share/abiword-2.8/clipart/gear.png
+%%CLIPART%%share/abiword-2.8/clipart/gnomea.png
+%%CLIPART%%share/abiword-2.8/clipart/gnomeb.png
+%%CLIPART%%share/abiword-2.8/clipart/gnomec.png
+%%CLIPART%%share/abiword-2.8/clipart/gnomecorner.png
+%%CLIPART%%share/abiword-2.8/clipart/gnomed.png
+%%CLIPART%%share/abiword-2.8/clipart/gnomedecor1.png
+%%CLIPART%%share/abiword-2.8/clipart/gnomedecor2.png
+%%CLIPART%%share/abiword-2.8/clipart/gnomee.png
+%%CLIPART%%share/abiword-2.8/clipart/gnomeflowers.png
+%%CLIPART%%share/abiword-2.8/clipart/gnomeline.png
+%%CLIPART%%share/abiword-2.8/clipart/idea.png
+%%CLIPART%%share/abiword-2.8/clipart/lamp.png
+%%CLIPART%%share/abiword-2.8/clipart/monitor.png
+%%CLIPART%%share/abiword-2.8/clipart/music1.png
+%%CLIPART%%share/abiword-2.8/clipart/pinceau.png
+%%CLIPART%%share/abiword-2.8/clipart/simca.png
+%%CLIPART%%share/abiword-2.8/clipart/surprise.png
+%%CLIPART%%share/abiword-2.8/clipart/together.png
+%%CLIPART%%share/abiword-2.8/clipart/toolbox.png
+%%CLIPART%%share/abiword-2.8/clipart/tree.png
+%%CLIPART%%share/abiword-2.8/clipart/tux_bordelais.png
+%%CLIPART%%share/abiword-2.8/clipart/weather.png
+%%CLIPART%%share/abiword-2.8/clipart/write.png
+share/abiword-%%ABIVERSION%%/system.profile-ro
+share/abiword-%%ABIVERSION%%/system.profile-ro-RO
+%%TEMPLATES%%share/abiword-2.8/templates/A4.awt
+%%TEMPLATES%%share/abiword-2.8/templates/Business-Letter.awt
+%%TEMPLATES%%share/abiword-2.8/templates/Business-Report.awt
+%%TEMPLATES%%share/abiword-2.8/templates/Employee-Directory.awt
+%%TEMPLATES%%share/abiword-2.8/templates/Fax-Coversheet.awt
+%%TEMPLATES%%share/abiword-2.8/templates/Friendly-Letter.awt
+%%TEMPLATES%%share/abiword-2.8/templates/Memo.awt
+%%TEMPLATES%%share/abiword-2.8/templates/Press-Release.awt
+%%TEMPLATES%%share/abiword-2.8/templates/Resume.awt
+%%TEMPLATES%%share/abiword-2.8/templates/Two-Columns.awt
+%%TEMPLATES%%share/abiword-2.8/templates/US-Letter.awt
+share/abiword-%%ABIVERSION%%/templates/normal.awt-ro
+share/abiword-%%ABIVERSION%%/templates/normal.awt-ro_RO
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Annotation.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Break.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Field.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_FormatFootnotes.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_FormatFrame.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_FormatTOC.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_FormatTable.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Goto.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_HdrFtr.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_InsertTable.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Insert_DateTime.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Latex.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_MailMerge.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_MetaData.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_New.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Options.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Options_ColorSel.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_PageNumbers.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_PageSetup.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Replace.xml
+%%DICT%%share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Spell.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Styles.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Stylist.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Stylist_modal.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_Tab.xml
+share/abiword-%%ABIVERSION%%/ui/ap_UnixDialog_WordCount.xml
+share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_DocComparison.xml
+share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_Encoding.xml
+share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_History.xml
+share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_Image.xml
+share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_Language.xml
+share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_ListDocuments.xml
+share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_Password.xml
+share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_PluginManager.xml
+share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_WindowMore.xml
+share/abiword-%%ABIVERSION%%/ui/xap_UnixDlg_Zoom.xml
share/abiword-%%ABIVERSION%%/readme.abw
share/abiword-%%ABIVERSION%%/readme.txt
share/abiword-%%ABIVERSION%%/strings/am-ET.strings
@@ -45,7 +95,6 @@ share/abiword-%%ABIVERSION%%/strings/ast-ES.strings
share/abiword-%%ABIVERSION%%/strings/ayc-BO.strings
share/abiword-%%ABIVERSION%%/strings/aym-BO.strings
share/abiword-%%ABIVERSION%%/strings/be-BY.strings
-share/abiword-%%ABIVERSION%%/strings/be@latin.strings
share/abiword-%%ABIVERSION%%/strings/bg-BG.strings
share/abiword-%%ABIVERSION%%/strings/br-FR.strings
share/abiword-%%ABIVERSION%%/strings/ca-ES.strings
@@ -88,7 +137,6 @@ share/abiword-%%ABIVERSION%%/strings/ne-NP.strings
share/abiword-%%ABIVERSION%%/strings/nl-NL.strings
share/abiword-%%ABIVERSION%%/strings/nn-NO.strings
share/abiword-%%ABIVERSION%%/strings/pl-PL.strings
-share/abiword-%%ABIVERSION%%/strings/ps.strings
share/abiword-%%ABIVERSION%%/strings/pt-BR.strings
share/abiword-%%ABIVERSION%%/strings/pt-PT.strings
share/abiword-%%ABIVERSION%%/strings/quh-BO.strings
@@ -242,16 +290,19 @@ share/abiword-%%ABIVERSION%%/templates/normal.awt-yi
share/abiword-%%ABIVERSION%%/templates/normal.awt-zh_CN
share/abiword-%%ABIVERSION%%/templates/normal.awt-zh_TW
share/applications/abiword.desktop
+share/icons/abiword_48.png
share/mime-info/abiword.keys
-share/pixmaps/abiword_48.png
@dirrmtry share/applications
+@dirrm share/abiword-%%ABIVERSION%%/ui
@dirrm share/abiword-%%ABIVERSION%%/templates
@dirrm share/abiword-%%ABIVERSION%%/strings
-@dirrm share/abiword-%%ABIVERSION%%/glade
+%%CLIPART%%@dirrm share/abiword-%%ABIVERSION%%/clipart
@dirrm share/abiword-%%ABIVERSION%%
@exec /bin/mkdir -p %D/lib/abiword-%%ABIVERSION%%/plugins
@dirrmtry lib/abiword-%%ABIVERSION%%/plugins
@dirrmtry lib/abiword-%%ABIVERSION%%
@dirrm include/abiword-%%ABIVERSION%%
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime-info > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime-info > /dev/null || /usr/bin/true
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index d15420327274..4d95690bba4d 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/gedit-plugins/Makefile,v 1.36 2009/03/17 13:37:37 kwm Exp $
+# $MCom: ports/editors/gedit-plugins/Makefile,v 1.39 2009/09/26 08:15:15 avl Exp $
#
PORTNAME= gedit-plugins
-PORTVERSION= 2.26.3
+PORTVERSION= 2.28.0
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/editors/gedit-plugins/distinfo b/editors/gedit-plugins/distinfo
index 2e027ef85a0e..c981f360b9e5 100644
--- a/editors/gedit-plugins/distinfo
+++ b/editors/gedit-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-plugins-2.26.3.tar.bz2) = 141f0375676a2018f1dbe11ba0e2d3ea
-SHA256 (gnome2/gedit-plugins-2.26.3.tar.bz2) = 86b3c5c1dcee826a8ac693dc9e4203af3027cee419394f9ac4e2be1dab637036
-SIZE (gnome2/gedit-plugins-2.26.3.tar.bz2) = 557042
+MD5 (gnome2/gedit-plugins-2.28.0.tar.bz2) = 7a0068ef250f2cfe8d60a5cf0e7a7c93
+SHA256 (gnome2/gedit-plugins-2.28.0.tar.bz2) = d615d2f26e66d7a23f37205089096a60faa2cb6e9108f9034cf2e66b940bf2ca
+SIZE (gnome2/gedit-plugins-2.28.0.tar.bz2) = 541165
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 0ecc96fe8cb0..88f8ec02702e 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/editors/gedit/Makefile,v 1.11 2009/04/15 10:30:46 kwm Exp $
+# $MCom: ports/editors/gedit/Makefile,v 1.109 2009/11/10 10:18:25 kwm Exp $
#
PORTNAME= gedit
-PORTVERSION= 2.26.3
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 4942a2b00410..b62cfcc9fe16 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-2.26.3.tar.bz2) = 0cdaad6b02af250c9c110010d0a708b2
-SHA256 (gnome2/gedit-2.26.3.tar.bz2) = 955be93a9c5d01849ab1e723c7bc6c25474a8ca5997396bae6fa0feb2bbdcb53
-SIZE (gnome2/gedit-2.26.3.tar.bz2) = 4527425
+MD5 (gnome2/gedit-2.28.1.tar.bz2) = 5de5239114d662ecd90340a409b68bc5
+SHA256 (gnome2/gedit-2.28.1.tar.bz2) = 77a0bda7c38ed2b3c72ea0e78ae21d71cc27116e0aba1616f734bf85562e81f0
+SIZE (gnome2/gedit-2.28.1.tar.bz2) = 4635002
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index 501109437df4..df6419e6eae1 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -1,6 +1,7 @@
bin/gedit
bin/gnome-text-editor
include/gedit-%%VERSION%%/gedit/gedit-app.h
+include/gedit-%%VERSION%%/gedit/gedit-commands.h
include/gedit-%%VERSION%%/gedit/gedit-convert.h
include/gedit-%%VERSION%%/gedit/gedit-debug.h
include/gedit-%%VERSION%%/gedit/gedit-document.h
@@ -8,7 +9,6 @@ include/gedit-%%VERSION%%/gedit/gedit-encodings-option-menu.h
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
@@ -73,9 +73,6 @@ lib/gedit-2/plugins/libindent.so
lib/gedit-2/plugins/libmodelines.a
lib/gedit-2/plugins/libmodelines.la
lib/gedit-2/plugins/libmodelines.so
-lib/gedit-2/plugins/libsample.a
-lib/gedit-2/plugins/libsample.la
-lib/gedit-2/plugins/libsample.so
lib/gedit-2/plugins/libsort.a
lib/gedit-2/plugins/libsort.la
lib/gedit-2/plugins/libsort.so
@@ -99,7 +96,19 @@ lib/gedit-2/plugins/modelines.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.py
%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.pyc
%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.pyo
-lib/gedit-2/plugins/sample.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/quickopen.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/quickopen/__init__.py
+%%PYTHON%%lib/gedit-2/plugins/quickopen/__init__.pyc
+%%PYTHON%%lib/gedit-2/plugins/quickopen/__init__.pyo
+%%PYTHON%%lib/gedit-2/plugins/quickopen/popup.py
+%%PYTHON%%lib/gedit-2/plugins/quickopen/popup.pyc
+%%PYTHON%%lib/gedit-2/plugins/quickopen/popup.pyo
+%%PYTHON%%lib/gedit-2/plugins/quickopen/virtualdirs.py
+%%PYTHON%%lib/gedit-2/plugins/quickopen/virtualdirs.pyc
+%%PYTHON%%lib/gedit-2/plugins/quickopen/virtualdirs.pyo
+%%PYTHON%%lib/gedit-2/plugins/quickopen/windowhelper.py
+%%PYTHON%%lib/gedit-2/plugins/quickopen/windowhelper.pyc
+%%PYTHON%%lib/gedit-2/plugins/quickopen/windowhelper.pyo
%%PYTHON%%lib/gedit-2/plugins/snippets.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/snippets/Document.py
%%PYTHON%%lib/gedit-2/plugins/snippets/Document.pyc
@@ -155,7 +164,6 @@ share/applications/gedit.desktop
%%DOCSDIR%%/GeditEncodingsOptionMenu.html
%%DOCSDIR%%/GeditFileChooserDialog.html
%%DOCSDIR%%/GeditMessage.html
-%%DOCSDIR%%/GeditMessageArea.html
%%DOCSDIR%%/GeditMessageBus.html
%%DOCSDIR%%/GeditNotebook.html
%%DOCSDIR%%/GeditPanel.html
@@ -190,13 +198,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/tools/build
+%%PYTHON%%share/gedit-2/plugins/externaltools/tools/open-terminal-here
+%%PYTHON%%share/gedit-2/plugins/externaltools/tools/remove-trailing-spaces
+%%PYTHON%%share/gedit-2/plugins/externaltools/tools/run-command
%%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/chdr.xml
%%PYTHON%%share/gedit-2/plugins/snippets/cpp.xml
@@ -227,13 +238,9 @@ 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/plugins/time/gedit-time-dialog.ui
+share/gedit-2/plugins/time/gedit-time-setup-dialog.ui
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
share/gedit-2/ui/gedit-print-preferences.ui
share/gedit-2/ui/gedit-search-dialog.ui
@@ -444,6 +451,7 @@ share/locale/bn_IN/LC_MESSAGES/gedit.mo
share/locale/br/LC_MESSAGES/gedit.mo
share/locale/bs/LC_MESSAGES/gedit.mo
share/locale/ca/LC_MESSAGES/gedit.mo
+share/locale/ca@valencia/LC_MESSAGES/gedit.mo
share/locale/crh/LC_MESSAGES/gedit.mo
share/locale/cs/LC_MESSAGES/gedit.mo
share/locale/cy/LC_MESSAGES/gedit.mo
@@ -453,6 +461,7 @@ share/locale/dz/LC_MESSAGES/gedit.mo
share/locale/el/LC_MESSAGES/gedit.mo
share/locale/en_CA/LC_MESSAGES/gedit.mo
share/locale/en_GB/LC_MESSAGES/gedit.mo
+share/locale/eo/LC_MESSAGES/gedit.mo
share/locale/es/LC_MESSAGES/gedit.mo
share/locale/et/LC_MESSAGES/gedit.mo
share/locale/eu/LC_MESSAGES/gedit.mo
@@ -594,7 +603,6 @@ share/omf/gedit/gedit-zh_TW.omf
@dirrm share/gnome/help/gedit/C
@dirrm share/gnome/help/gedit
@dirrm share/gedit-2/ui
-%%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
@@ -602,13 +610,13 @@ share/omf/gedit/gedit-zh_TW.omf
%%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/tools
%%PYTHON%%@dirrm share/gedit-2/plugins/externaltools
@dirrm share/gedit-2/plugins/docinfo
@dirrm share/gedit-2/plugins/changecase
@@ -620,6 +628,7 @@ share/omf/gedit/gedit-zh_TW.omf
@dirrmtry share/applications
@dirrmtry libexec/gedit-2
%%PYTHON%%@dirrm lib/gedit-2/plugins/snippets
+%%PYTHON%%@dirrm lib/gedit-2/plugins/quickopen
%%PYTHON%%@dirrm lib/gedit-2/plugins/pythonconsole
%%PYTHON%%@dirrm lib/gedit-2/plugins/externaltools
@dirrmtry lib/gedit-2/plugins
@@ -663,6 +672,8 @@ share/omf/gedit/gedit-zh_TW.omf
@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
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index 8515db9401d5..963f4e4efe10 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mlview
PORTVERSION= 0.8
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,7 +17,7 @@ COMMENT= A tree oriented XML editor for Gnome
USE_BZIP2= yes
USE_AUTOTOOLS= autoconf:262 libtool:22
-USE_GNOME= eel2 gnomehack gnomeprefix gtksourceview
+USE_GNOME= eel2 gnomehack gnomeprefix gtksourceview libgnomeui
USE_GMAKE= yes
USE_LDCONFIG= yes
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`"
diff --git a/ftp/gwget/Makefile b/ftp/gwget/Makefile
index 2a4cb75ab636..c7b34c9c3228 100644
--- a/ftp/gwget/Makefile
+++ b/ftp/gwget/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gwget
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.4
CATEGORIES= ftp gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack gtk20 gconf2 libgnomeui \
- libglade2 desktopfileutils
+ desktopfileutils
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+= --disable-libnotify
BUILD_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany
RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany
CONFIGURE_ARGS+= --enable-epiphany-extension
-PLIST_SUB+= EPIPHANY="" EPHY_VERSION="2.26"
+PLIST_SUB+= EPIPHANY="" EPHY_VERSION="2.28"
.else
CONFIGURE_ARGS+= --disable-epiphany-extension
PLIST_SUB+= EPIPHANY="@comment "
diff --git a/ftp/gwget/distinfo b/ftp/gwget/distinfo
index 234f647e0d28..72a1cfa0defa 100644
--- a/ftp/gwget/distinfo
+++ b/ftp/gwget/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gwget-1.0.2.tar.bz2) = 52b518ea58b3bd618db0c58910ee5ccc
-SHA256 (gnome2/gwget-1.0.2.tar.bz2) = 2e28da869f85dcf18a38f005d58ed3470cf097a886231b000c239742a5a1dace
-SIZE (gnome2/gwget-1.0.2.tar.bz2) = 433897
+MD5 (gnome2/gwget-1.0.4.tar.bz2) = b65ebc752cad068e747ae6ef45fafdcc
+SHA256 (gnome2/gwget-1.0.4.tar.bz2) = a65b2b2b3befb6cf34a697a13111b35498a6d63f9a9b048a22b8654f35ef643f
+SIZE (gnome2/gwget-1.0.4.tar.bz2) = 444843
diff --git a/ftp/gwget/files/patch-configure b/ftp/gwget/files/patch-configure
deleted file mode 100644
index 369e2a4489a7..000000000000
--- a/ftp/gwget/files/patch-configure
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.orig 2009-10-02 13:58:38.000000000 +1000
-+++ configure 2009-10-02 13:59:21.000000000 +1000
-@@ -1653,10 +1653,10 @@
- Config database for installing schema files.
- --with-gconf-schema-file-dir=dir
- Directory for installing schema files.
-- --with-epiphany-version[=1.6|1.8|1.10|2.14|2.16|2.18|2.20|2.22|2.24|2.26]
-+ --with-epiphany-version[=1.6|1.8|1.10|2.14|2.16|2.18|2.20|2.22|2.24|2.26|2.28]
- Whether to use epiphany version 1.6 or 1.8 or 1.10
- or 2.14 or 2.16 or 2.18 or 2.20 or 2.22 or 2.24 or
-- 2.26 (default 1.6)
-+ 2.26 or 2.28 (default 1.6)
- --with-extension-prefix=path Epiphany extension prefix
-
- Some influential environment variables:
-@@ -14861,7 +14861,9 @@
-
-
- EPHY_AUTODETECT="(autodetect)"
--if pkg-config --exists epiphany-2.26; then
-+if pkg-config --exists epiphany-2.28; then
-+ EPHY_VER=2.28
-+elif pkg-config --exists epiphany-2.26; then
- EPHY_VER=2.26
- elif pkg-config --exists epiphany-2.25; then
- EPHY_VER=2.25
-@@ -14976,6 +14978,10 @@
- EPIPHANY_PKGCONFIG=epiphany-2.26
- EPIPHANY_REQUIRED=2.26
- EPIPHANY_SHORTVER=226
-+elif test "x$EPHY_VER" = "x2.28"; then
-+ EPIPHANY_PKGCONFIG=epiphany-2.28
-+ EPIPHANY_REQUIRED=2.28
-+ EPIPHANY_SHORTVER=228
- else
- { $as_echo "$as_me:$LINENO: result: no epiphany installed" >&5
- $as_echo "no epiphany installed" >&6; }
diff --git a/ftp/gwget/pkg-plist b/ftp/gwget/pkg-plist
index 449e8e82756b..97a126eb251d 100644
--- a/ftp/gwget/pkg-plist
+++ b/ftp/gwget/pkg-plist
@@ -7,8 +7,8 @@ share/dbus-1/services/org.gnome.gwget.service
%%DATADIR%%/gwget-large.png
%%DATADIR%%/downloading.png
%%DATADIR%%/newdownload.png
-%%DATADIR%%/preferences.glade
-%%DATADIR%%/gwget.glade
+%%DATADIR%%/preferences.ui
+%%DATADIR%%/gwget.ui
%%EPIPHANY%%lib/epiphany/%%EPHY_VERSION%%/extensions/gwget.xml
%%EPIPHANY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libgwgetextension.a
%%EPIPHANY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libgwgetextension.la
diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile
index f63436a4a9d0..ddb3e7c8b858 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.26 2009/03/16 07:43:04 kwm Exp $
+# $MCom: ports/games/gnome-games-extra-data/Makefile,v 1.29 2009/09/26 13:41:59 marcus Exp $
#
PORTNAME= gnome-games-extra-data
-PORTVERSION= 2.26.0
+PORTVERSION= 2.28.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 e819c72f189c..ceb06a79c92f 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.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
+MD5 (gnome2/gnome-games-extra-data-2.28.0.tar.bz2) = a9f6ca8a2ae28659feb4ee3254020115
+SHA256 (gnome2/gnome-games-extra-data-2.28.0.tar.bz2) = 8432f372f09476ed2d2bfe639001937452c5b4c10258e342fa6fda4ed91cfe70
+SIZE (gnome2/gnome-games-extra-data-2.28.0.tar.bz2) = 4104502
diff --git a/games/gnome-games-extra-data/pkg-plist b/games/gnome-games-extra-data/pkg-plist
index 81c06ae58bf2..c18ecd60fd2c 100644
--- a/games/gnome-games-extra-data/pkg-plist
+++ b/games/gnome-games-extra-data/pkg-plist
@@ -11,9 +11,9 @@ 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/gnobots2/themes/cows.png
+share/gnome-games/gnobots2/themes/eggs.png
+share/gnome-games/gnobots2/themes/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
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index cdeb5eaa845e..c9d684f6b8e8 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-stable/games/gnome-games/Makefile,v 1.3 2009/04/16 01:48:53 kwm Exp $
+# $MCom: ports/games/gnome-games/Makefile,v 1.206 2009/10/20 10:40:07 avl Exp $
#
PORTNAME= gnome-games
-PORTVERSION= 2.26.3
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= games gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,6 +16,8 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= The game applications package for the GNOME 2 Desktop Environment
LIB_DEPENDS= guile.20:${PORTSDIR}/lang/guile \
+ clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \
+ clutter-glx-1.0.0:${PORTSDIR}/graphics/clutter \
ggzmod.5:${PORTSDIR}/games/ggz-client-libs
USE_BZIP2= yes
@@ -30,22 +31,25 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui \
USE_GSTREAMER= vorbis ogg
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-sound=gstreamer \
- --disable-tests
+ --disable-tests \
+ --enable-introspection=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= aisleriot.schemas blackjack.schemas glchess.schemas \
glines.schemas gnect.schemas gnibbles.schemas \
- gnobots2.schemas gnometris.schemas gnomine.schemas \
- gnotravex.schemas gnotski.schemas gtali.schemas \
- iagno.schemas mahjongg.schemas same-gnome.schemas
+ gnobots2.schemas gnome-sudoku.schemas gnometris.schemas \
+ gnomine.schemas gnotravex.schemas gnotski.schemas \
+ gtali.schemas iagno.schemas mahjongg.schemas same-gnome.schemas
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
+MAN6= blackjack.6 glchess.6 glines.6 gnect.6 gnibbles.6 gnobots2.6 \
+ gnome-sudoku.6 gnometris.6 gnomine.6 gnotravex.6 gnotski.6 \
+ gtali.6 iagno.6 mahjongg.6 same-gnome.6 sol.6
.include <bsd.port.pre.mk>
@@ -53,16 +57,6 @@ OPTIONS= CLUTTER "Enable clutter compositing support" on
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 ba45f0b5d90a..a7d7dcfbe92a 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-games-2.26.3.tar.bz2) = 32c69a25671d8d23b19f234efcc177ca
-SHA256 (gnome2/gnome-games-2.26.3.tar.bz2) = f29849507bd2a29a747b73f412fcbc8c74f3a9b5bf38d4b763b4242ac84cf46f
-SIZE (gnome2/gnome-games-2.26.3.tar.bz2) = 24664606
+MD5 (gnome2/gnome-games-2.28.1.tar.bz2) = c67497debd70aa8847874616660dae48
+SHA256 (gnome2/gnome-games-2.28.1.tar.bz2) = a6c2010ebb8418babba7942ae347f2c6ed2a587e56905156d88c2fc3607042b9
+SIZE (gnome2/gnome-games-2.28.1.tar.bz2) = 25391923
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index a32380c8bd62..35eaf4454237 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -194,6 +194,9 @@ lib/gnome-games/gnome-games-render-cards
%%PYTHON_SITELIBDIR%%/glchess/history.py
%%PYTHON_SITELIBDIR%%/glchess/history.pyc
%%PYTHON_SITELIBDIR%%/glchess/history.pyo
+%%PYTHON_SITELIBDIR%%/glchess/i18n.py
+%%PYTHON_SITELIBDIR%%/glchess/i18n.pyc
+%%PYTHON_SITELIBDIR%%/glchess/i18n.pyo
%%PYTHON_SITELIBDIR%%/glchess/main.py
%%PYTHON_SITELIBDIR%%/glchess/main.pyc
%%PYTHON_SITELIBDIR%%/glchess/main.pyo
@@ -218,12 +221,9 @@ lib/gnome-games/gnome-games-render-cards
%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/__init__.py
%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/__init__.pyc
%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/__init__.pyo
-%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/builtin_models.py
-%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/builtin_models.pyc
-%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/builtin_models.pyo
-%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/new_models.py
-%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/new_models.pyc
-%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/new_models.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/models.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/models.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/models.pyo
%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/opengl.py
%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/opengl.pyc
%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/opengl.pyo
@@ -248,6 +248,9 @@ lib/gnome-games/gnome-games-render-cards
%%PYTHON_SITELIBDIR%%/gnome_sudoku/colors.py
%%PYTHON_SITELIBDIR%%/gnome_sudoku/colors.pyc
%%PYTHON_SITELIBDIR%%/gnome_sudoku/colors.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/dancer.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/dancer.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/dancer.pyo
%%PYTHON_SITELIBDIR%%/gnome_sudoku/defaults.py
%%PYTHON_SITELIBDIR%%/gnome_sudoku/defaults.pyc
%%PYTHON_SITELIBDIR%%/gnome_sudoku/defaults.pyo
@@ -275,9 +278,9 @@ lib/gnome-games/gnome-games-render-cards
%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/gconf_wrapper.py
%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/gconf_wrapper.pyc
%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/gconf_wrapper.pyo
-%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/image_extras.py
-%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/image_extras.pyc
-%%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/image_extras.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/number_box.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/number_box.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/number_box.pyo
%%PYTHON_SITELIBDIR%%/gnome_sudoku/main.py
%%PYTHON_SITELIBDIR%%/gnome_sudoku/main.pyc
%%PYTHON_SITELIBDIR%%/gnome_sudoku/main.pyo
@@ -346,24 +349,26 @@ share/ggz/gnome-games/gnibbles-client.dsc
share/ggz/gnome-games/iagno-client.dsc
@exec %%LOCALBASE%%/bin/ggz-config -D --install --modfile=%D/share/ggz/gnome-games/iagno-client.dsc --force
share/glchess/ai.xml
-share/glchess/chess_view.glade
-share/glchess/glchess.glade
-share/glchess/load_game.glade
-share/glchess/log.glade
-share/glchess/network_game.glade
-share/glchess/new_game.glade
-share/glchess/preferences.glade
-share/glchess/save_game.glade
+share/glchess/chess_view.ui
+share/glchess/glchess.ui
+share/glchess/load_game.ui
+share/glchess/log.ui
+share/glchess/network_game.ui
+share/glchess/network_new_server.ui
+share/glchess/new_game.ui
+share/glchess/preferences.ui
+share/glchess/save_game.ui
+share/glchess/textures/board.png
+share/glchess/textures/piece.png
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
-%%DATADIR%%/aisleriot/games/aunt_mary.scm
%%DATADIR%%/aisleriot/games/backbone.scm
%%DATADIR%%/aisleriot/games/bakers_dozen.scm
%%DATADIR%%/aisleriot/games/bakers_game.scm
+%%DATADIR%%/aisleriot/games/bear_river.scm
%%DATADIR%%/aisleriot/games/beleaguered_castle.scm
%%DATADIR%%/aisleriot/games/block_ten.scm
%%DATADIR%%/aisleriot/games/bristol.scm
@@ -389,6 +394,7 @@ share/gnome-games-common/theme-install.ini
%%DATADIR%%/aisleriot/games/freecell.scm
%%DATADIR%%/aisleriot/games/gaps.scm
%%DATADIR%%/aisleriot/games/gay_gordons.scm
+%%DATADIR%%/aisleriot/games/giant.scm
%%DATADIR%%/aisleriot/games/glenwood.scm
%%DATADIR%%/aisleriot/games/gold_mine.scm
%%DATADIR%%/aisleriot/games/golf.scm
@@ -526,11 +532,11 @@ share/gnome-games-common/theme-install.ini
%%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/themes/ufo.svg
+%%DATADIR%%/gnobots2/themes/boo.svg
+%%DATADIR%%/gnobots2/themes/gnomes.png
+%%DATADIR%%/gnobots2/themes/robots.svg
%%DATADIR%%/gnobots2/pixmaps/yahoo.png
%%DATADIR%%/gnometris/pixmaps/7blocks-gw.png
%%DATADIR%%/gnometris/pixmaps/7blocks-tig.png
@@ -562,8 +568,13 @@ share/gnome-games-common/theme-install.ini
%%DATADIR%%/gtali/pixmaps/kismet6.svg
%%DATADIR%%/iagno/pixmaps/classic.png
%%DATADIR%%/iagno/pixmaps/woodtrim.png
+%%DATADIR%%/icons/hicolor/16x16/actions/cards-deal.png
+%%DATADIR%%/icons/hicolor/22x22/actions/cards-deal.png
+%%DATADIR%%/icons/hicolor/24x24/actions/cards-deal.png
%%DATADIR%%/icons/hicolor/24x24/actions/teleport-random.png
%%DATADIR%%/icons/hicolor/24x24/actions/teleport.png
+%%DATADIR%%/icons/hicolor/32x32/actions/cards-deal.png
+%%DATADIR%%/icons/hicolor/48x48/actions/cards-deal.png
%%DATADIR%%/icons/hicolor/scalable/actions/cards-deal.svg
%%DATADIR%%/mahjongg/games/mahjongg.map
%%DATADIR%%/mahjongg/pixmaps/postmodern.svg
@@ -596,14 +607,15 @@ share/gnome-games-common/theme-install.ini
%%DATADIR%%/sounds/turn.ogg
%%DATADIR%%/sounds/victory.ogg
%%DATADIR%%/sounds/yahoo.ogg
-share/gnome-sudoku/print_games.glade
-share/gnome-sudoku/puzzle_generator.glade
+share/gnome-sudoku/images/footprints.png
+share/gnome-sudoku/print_games.ui
+share/gnome-sudoku/puzzle_generator.ui
share/gnome-sudoku/puzzles/easy
share/gnome-sudoku/puzzles/hard
share/gnome-sudoku/puzzles/medium
share/gnome-sudoku/puzzles/very_hard
-share/gnome-sudoku/select_game.glade
-share/gnome-sudoku/tracker.glade
+share/gnome-sudoku/select_game.ui
+share/gnome-sudoku/tracker.ui
share/gnome/help/aisleriot/C/accordion.xml
share/gnome/help/aisleriot/C/agnes.xml
share/gnome/help/aisleriot/C/aisleriot.xml
@@ -611,6 +623,7 @@ share/gnome/help/aisleriot/C/athena.xml
share/gnome/help/aisleriot/C/auld_lang_syne.xml
share/gnome/help/aisleriot/C/aunt_mary.xml
share/gnome/help/aisleriot/C/backbone.xml
+share/gnome/help/aisleriot/C/bear_river.xml
share/gnome/help/aisleriot/C/bakers_dozen.xml
share/gnome/help/aisleriot/C/bakers_game.xml
share/gnome/help/aisleriot/C/beleaguered_castle.xml
@@ -641,6 +654,7 @@ share/gnome/help/aisleriot/C/fourteen.xml
share/gnome/help/aisleriot/C/freecell.xml
share/gnome/help/aisleriot/C/gaps.xml
share/gnome/help/aisleriot/C/gay_gordons.xml
+share/gnome/help/aisleriot/C/giant.xml
share/gnome/help/aisleriot/C/glenwood.xml
share/gnome/help/aisleriot/C/gold_mine.xml
share/gnome/help/aisleriot/C/golf.xml
@@ -728,6 +742,9 @@ share/gnome/help/blackjack/C/legal.xml
share/gnome/help/blackjack/ca/blackjack.xml
share/gnome/help/blackjack/ca/figures/blackjack_start_window.png
share/gnome/help/blackjack/ca/figures/blackjack_win_window.png
+share/gnome/help/blackjack/cs/blackjack.xml
+share/gnome/help/blackjack/cs/figures/blackjack_start_window.png
+share/gnome/help/blackjack/cs/figures/blackjack_win_window.png
share/gnome/help/blackjack/da/blackjack.xml
share/gnome/help/blackjack/da/figures/blackjack_start_window.png
share/gnome/help/blackjack/da/figures/blackjack_win_window.png
@@ -766,6 +783,11 @@ share/gnome/help/glchess/ca/figures/new_game.png
share/gnome/help/glchess/ca/figures/preferences_game.png
share/gnome/help/glchess/ca/figures/preferences_view.png
share/gnome/help/glchess/ca/glchess.xml
+share/gnome/help/glchess/cs/figures/game.png
+share/gnome/help/glchess/cs/figures/new_game.png
+share/gnome/help/glchess/cs/figures/preferences_game.png
+share/gnome/help/glchess/cs/figures/preferences_view.png
+share/gnome/help/glchess/cs/glchess.xml
share/gnome/help/glchess/de/figures/game.png
share/gnome/help/glchess/de/figures/new_game.png
share/gnome/help/glchess/de/figures/preferences_game.png
@@ -915,6 +937,11 @@ 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/fi/figures/connect.png
+share/gnome/help/gnect/fi/figures/mainwindow.png
+share/gnome/help/gnect/fi/figures/tables.png
+share/gnome/help/gnect/fi/figures/tileset.png
+share/gnome/help/gnect/fi/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
@@ -972,8 +999,6 @@ share/gnome/help/gnibbles/el/figures/playing.png
share/gnome/help/gnibbles/el/figures/tables.png
share/gnome/help/gnibbles/el/figures/worm_op.png
share/gnome/help/gnibbles/el/gnibbles.xml
-share/gnome/help/gnobots2/el/figures/gnobots2-main.png
-share/gnome/help/gnobots2/el/gnobots2.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
@@ -1028,10 +1053,12 @@ share/gnome/help/gnobots2/C/gnobots2.xml
share/gnome/help/gnobots2/C/legal.xml
share/gnome/help/gnobots2/ca/figures/gnobots2-main.png
share/gnome/help/gnobots2/ca/gnobots2.xml
-share/gnome/help/gnobots2/da/gnobots2.xml
-share/gnome/help/gnobots2/da/legal.xml
+share/gnome/help/gnobots2/cs/figures/gnobots2-main.png
+share/gnome/help/gnobots2/cs/gnobots2.xml
share/gnome/help/gnobots2/de/figures/gnobots2-main.png
share/gnome/help/gnobots2/de/gnobots2.xml
+share/gnome/help/gnobots2/el/figures/gnobots2-main.png
+share/gnome/help/gnobots2/el/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
@@ -1375,6 +1402,9 @@ share/gnome/help/gnotravex/ca/gnotravex.xml
share/gnome/help/gnotravex/cs/figures/gnotravex_game.png
share/gnome/help/gnotravex/cs/figures/gnotravex_mainwindow.png
share/gnome/help/gnotravex/cs/gnotravex.xml
+share/gnome/help/gnotravex/da/figures/gnotravex_game.png
+share/gnome/help/gnotravex/da/figures/gnotravex_mainwindow.png
+share/gnome/help/gnotravex/da/gnotravex.xml
share/gnome/help/gnotravex/de/figures/gnotravex_game.png
share/gnome/help/gnotravex/de/figures/gnotravex_mainwindow.png
share/gnome/help/gnotravex/de/gnotravex.xml
@@ -1449,8 +1479,9 @@ share/gnome/help/gtali/C/legal.xml
share/gnome/help/gtali/ca/figures/mainwindow.png
share/gnome/help/gtali/ca/figures/preferences.png
share/gnome/help/gtali/ca/gtali.xml
-share/gnome/help/gtali/da/gtali.xml
-share/gnome/help/gtali/da/legal.xml
+share/gnome/help/gtali/cs/figures/mainwindow.png
+share/gnome/help/gtali/cs/figures/preferences.png
+share/gnome/help/gtali/cs/gtali.xml
share/gnome/help/gtali/de/figures/mainwindow.png
share/gnome/help/gtali/de/figures/preferences.png
share/gnome/help/gtali/de/gtali.xml
@@ -1834,7 +1865,6 @@ 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
@@ -1851,7 +1881,9 @@ share/locale/be/LC_MESSAGES/gnome-games.mo
share/locale/bg/LC_MESSAGES/gnome-games.mo
share/locale/bn/LC_MESSAGES/gnome-games.mo
share/locale/bn_IN/LC_MESSAGES/gnome-games.mo
+share/locale/br/LC_MESSAGES/gnome-games.mo
share/locale/ca/LC_MESSAGES/gnome-games.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-games.mo
share/locale/cs/LC_MESSAGES/gnome-games.mo
share/locale/cy/LC_MESSAGES/gnome-games.mo
share/locale/da/LC_MESSAGES/gnome-games.mo
@@ -1932,6 +1964,7 @@ share/omf/aisleriot/aisleriot-ru.omf
share/omf/aisleriot/aisleriot-sv.omf
share/omf/blackjack/blackjack-C.omf
share/omf/blackjack/blackjack-ca.omf
+share/omf/blackjack/blackjack-cs.omf
share/omf/blackjack/blackjack-da.omf
share/omf/blackjack/blackjack-de.omf
share/omf/blackjack/blackjack-el.omf
@@ -1943,6 +1976,7 @@ share/omf/blackjack/blackjack-oc.omf
share/omf/blackjack/blackjack-sv.omf
share/omf/glchess/glchess-C.omf
share/omf/glchess/glchess-ca.omf
+share/omf/glchess/glchess-cs.omf
share/omf/glchess/glchess-de.omf
share/omf/glchess/glchess-el.omf
share/omf/glchess/glchess-en_GB.omf
@@ -1975,6 +2009,7 @@ share/omf/gnect/gnect-el.omf
share/omf/gnect/gnect-en_GB.omf
share/omf/gnect/gnect-es.omf
share/omf/gnect/gnect-eu.omf
+share/omf/gnect/gnect-fi.omf
share/omf/gnect/gnect-fr.omf
share/omf/gnect/gnect-it.omf
share/omf/gnect/gnect-oc.omf
@@ -1993,6 +2028,7 @@ share/omf/gnibbles/gnibbles-oc.omf
share/omf/gnibbles/gnibbles-sv.omf
share/omf/gnobots2/gnobots2-C.omf
share/omf/gnobots2/gnobots2-ca.omf
+share/omf/gnobots2/gnobots2-cs.omf
share/omf/gnobots2/gnobots2-de.omf
share/omf/gnobots2/gnobots2-el.omf
share/omf/gnobots2/gnobots2-en_GB.omf
@@ -2002,8 +2038,6 @@ share/omf/gnobots2/gnobots2-fr.omf
share/omf/gnobots2/gnobots2-it.omf
share/omf/gnobots2/gnobots2-oc.omf
share/omf/gnobots2/gnobots2-sv.omf
-share/omf/gnome-games/gnobots2-da.omf
-share/omf/gnome-games/gtali-da.omf
share/omf/gnome-sudoku/gnome-sudoku-C.omf
share/omf/gnome-sudoku/gnome-sudoku-ca.omf
share/omf/gnome-sudoku/gnome-sudoku-cs.omf
@@ -2049,6 +2083,7 @@ share/omf/gnomine/gnomine-zh_CN.omf
share/omf/gnotravex/gnotravex-C.omf
share/omf/gnotravex/gnotravex-ca.omf
share/omf/gnotravex/gnotravex-cs.omf
+share/omf/gnotravex/gnotravex-da.omf
share/omf/gnotravex/gnotravex-de.omf
share/omf/gnotravex/gnotravex-el.omf
share/omf/gnotravex/gnotravex-en_GB.omf
@@ -2073,6 +2108,7 @@ share/omf/gnotski/gnotski-oc.omf
share/omf/gnotski/gnotski-sv.omf
share/omf/gtali/gtali-C.omf
share/omf/gtali/gtali-ca.omf
+share/omf/gtali/gtali-cs.omf
share/omf/gtali/gtali-de.omf
share/omf/gtali/gtali-el.omf
share/omf/gtali/gtali-en_GB.omf
@@ -2121,11 +2157,6 @@ share/omf/same-gnome/same-gnome-it.omf
share/omf/same-gnome/same-gnome-oc.omf
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/gnome-sudoku/footprints.png
-@dirrm share/pixmaps/gnome-sudoku
-@dirrm share/pixmaps/glchess
@dirrm share/omf/same-gnome
@dirrm share/omf/mahjongg
@dirrm share/omf/iagno
@@ -2135,7 +2166,6 @@ share/pixmaps/gnome-sudoku/footprints.png
@dirrm share/omf/gnomine
@dirrm share/omf/gnometris
@dirrm share/omf/gnome-sudoku
-@dirrm share/omf/gnome-games
@dirrm share/omf/gnobots2
@dirrm share/omf/gnibbles
@dirrm share/omf/gnect
@@ -2242,7 +2272,8 @@ share/pixmaps/gnome-sudoku/footprints.png
@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
+@dirrm share/gnome/help/gtali/cs/figures
+@dirrm share/gnome/help/gtali/cs
@dirrm share/gnome/help/gtali/ca/figures
@dirrm share/gnome/help/gtali/ca
@dirrm share/gnome/help/gtali/C/figures
@@ -2293,6 +2324,8 @@ share/pixmaps/gnome-sudoku/footprints.png
@dirrm share/gnome/help/gnotravex/el
@dirrm share/gnome/help/gnotravex/de/figures
@dirrm share/gnome/help/gnotravex/de
+@dirrm share/gnome/help/gnotravex/da/figures
+@dirrm share/gnome/help/gnotravex/da
@dirrm share/gnome/help/gnotravex/cs/figures
@dirrm share/gnome/help/gnotravex/cs
@dirrm share/gnome/help/gnotravex/ca/figures
@@ -2391,7 +2424,8 @@ share/pixmaps/gnome-sudoku/footprints.png
@dirrm share/gnome/help/gnobots2/el
@dirrm share/gnome/help/gnobots2/de/figures
@dirrm share/gnome/help/gnobots2/de
-@dirrm share/gnome/help/gnobots2/da
+@dirrm share/gnome/help/gnobots2/cs/figures
+@dirrm share/gnome/help/gnobots2/cs
@dirrm share/gnome/help/gnobots2/ca/figures
@dirrm share/gnome/help/gnobots2/ca
@dirrm share/gnome/help/gnobots2/C/figures
@@ -2430,6 +2464,8 @@ share/pixmaps/gnome-sudoku/footprints.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/fi/figures
+@dirrm share/gnome/help/gnect/fi
@dirrm share/gnome/help/gnect/eu/figures
@dirrm share/gnome/help/gnect/eu
@dirrm share/gnome/help/gnect/es/figures
@@ -2496,6 +2532,8 @@ share/pixmaps/gnome-sudoku/footprints.png
@dirrm share/gnome/help/glchess/el
@dirrm share/gnome/help/glchess/de/figures
@dirrm share/gnome/help/glchess/de
+@dirrm share/gnome/help/glchess/cs/figures
+@dirrm share/gnome/help/glchess/cs
@dirrm share/gnome/help/glchess/ca/figures
@dirrm share/gnome/help/glchess/ca
@dirrm share/gnome/help/glchess/C/figures
@@ -2519,6 +2557,8 @@ share/pixmaps/gnome-sudoku/footprints.png
@dirrm share/gnome/help/blackjack/de
@dirrm share/gnome/help/blackjack/da/figures
@dirrm share/gnome/help/blackjack/da
+@dirrm share/gnome/help/blackjack/cs/figures
+@dirrm share/gnome/help/blackjack/cs
@dirrm share/gnome/help/blackjack/ca/figures
@dirrm share/gnome/help/blackjack/ca
@dirrm share/gnome/help/blackjack/C/figures
@@ -2546,6 +2586,7 @@ share/pixmaps/gnome-sudoku/footprints.png
@dirrm share/gnome/help/aisleriot/C
@dirrm share/gnome/help/aisleriot
@dirrm share/gnome-sudoku/puzzles
+@dirrm share/gnome-sudoku/images
@dirrm share/gnome-sudoku
@dirrm %%DATADIR%%/sounds
@dirrm %%DATADIR%%/same-gnome/themes/2.10
@@ -2557,8 +2598,16 @@ share/pixmaps/gnome-sudoku/footprints.png
@dirrm %%DATADIR%%/mahjongg
@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor/48x48/actions
+@dirrm %%DATADIR%%/icons/hicolor/48x48
+@dirrm %%DATADIR%%/icons/hicolor/32x32/actions
+@dirrm %%DATADIR%%/icons/hicolor/32x32
@dirrm %%DATADIR%%/icons/hicolor/24x24/actions
@dirrm %%DATADIR%%/icons/hicolor/24x24
+@dirrm %%DATADIR%%/icons/hicolor/22x22/actions
+@dirrm %%DATADIR%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
+@dirrm %%DATADIR%%/icons/hicolor/16x16
@dirrm %%DATADIR%%/icons/hicolor
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%/iagno/pixmaps
@@ -2571,6 +2620,7 @@ share/pixmaps/gnome-sudoku/footprints.png
@dirrm %%DATADIR%%/gnomine
@dirrm %%DATADIR%%/gnometris/pixmaps
@dirrm %%DATADIR%%/gnometris
+@dirrm %%DATADIR%%/gnobots2/themes
@dirrm %%DATADIR%%/gnobots2/pixmaps
@dirrm %%DATADIR%%/gnobots2/games
@dirrm %%DATADIR%%/gnobots2
@@ -2589,6 +2639,7 @@ share/pixmaps/gnome-sudoku/footprints.png
@dirrm share/gnome-games-common/cards
@dirrm share/gnome-games-common
@dirrm %%DATADIR%%
+@dirrm share/glchess/textures
@dirrm share/glchess
@dirrmtry share/ggz/gnome-games
@dirrmtry share/ggz
@@ -2629,6 +2680,8 @@ share/pixmaps/gnome-sudoku/footprints.png
@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/as/LC_MESSAGES
diff --git a/graphics/Makefile b/graphics/Makefile
index 5849d7ff304a..8e9af790ba8e 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -71,8 +71,8 @@
SUBDIR += claraocr
SUBDIR += clutter
SUBDIR += clutter-box2d
- SUBDIR += clutter-cairo
SUBDIR += clutter-gtk
+ SUBDIR += clutter-qt
SUBDIR += comical
SUBDIR += comix
SUBDIR += compupic
@@ -124,6 +124,7 @@
SUBDIR += enblend
SUBDIR += enfle
SUBDIR += eog
+ SUBDIR += eog-plugins
SUBDIR += epdfview
SUBDIR += epeg
SUBDIR += epix
@@ -243,6 +244,8 @@
SUBDIR += gimp-manual-pdf
SUBDIR += gimpfx-foundry
SUBDIR += gimpshop
+ SUBDIR += gir-repository-goocanvas
+ SUBDIR += gir-repository-poppler
SUBDIR += giram
SUBDIR += gkrellkam
SUBDIR += gkrellkam2
@@ -409,6 +412,7 @@
SUBDIR += libaux
SUBDIR += libboard
SUBDIR += libcaca
+ SUBDIR += libchamplain
SUBDIR += libdrm
SUBDIR += libdmtx
SUBDIR += libemf
@@ -729,6 +733,7 @@
SUBDIR += py-cgkit
SUBDIR += py-chart
SUBDIR += py-clutter
+ SUBDIR += py-clutter-gtk
SUBDIR += py-editobj
SUBDIR += py-exif
SUBDIR += py-exiv2
diff --git a/graphics/clutter-box2d/Makefile b/graphics/clutter-box2d/Makefile
index 62e6422bb1d5..179361268e25 100644
--- a/graphics/clutter-box2d/Makefile
+++ b/graphics/clutter-box2d/Makefile
@@ -6,21 +6,21 @@
#
PORTNAME= clutter-box2d
-PORTVERSION= 0.8.2
-PORTREVISION= 1
+PORTVERSION= 0.10.0
CATEGORIES= graphics
-MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/0.8/
+MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/0.10/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Clutter Box2D integration library
-LIB_DEPENDS= clutter-glx-0.8:${PORTSDIR}/graphics/clutter
+LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack ltverhack gnomeprefix
USE_XORG= xp x11
USE_LDCONFIG= yes
+CONFIGURE_ARGS= --enable-introspection=no
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/graphics/clutter-box2d/distinfo b/graphics/clutter-box2d/distinfo
index 14b196a3f1f8..63f714655812 100644
--- a/graphics/clutter-box2d/distinfo
+++ b/graphics/clutter-box2d/distinfo
@@ -1,3 +1,3 @@
-MD5 (clutter-box2d-0.8.2.tar.gz) = 393a42b95f2ede8e17361acdbddde1f6
-SHA256 (clutter-box2d-0.8.2.tar.gz) = 676baaae6c4de7f79e51a2167ef5571136c709fe4ff52bd919c13e2b93e80a91
-SIZE (clutter-box2d-0.8.2.tar.gz) = 491985
+MD5 (clutter-box2d-0.10.0.tar.gz) = 293912473cc5fcb9f0ad8b2da1be1b79
+SHA256 (clutter-box2d-0.10.0.tar.gz) = 21d3a9b74f9fc4417914b5a4d61f503f77cc732f1ef565586b358dd275e3cc5b
+SIZE (clutter-box2d-0.10.0.tar.gz) = 491980
diff --git a/graphics/clutter-box2d/files/patch-clutter-box2d_Makefile.in b/graphics/clutter-box2d/files/patch-clutter-box2d_Makefile.in
new file mode 100644
index 000000000000..f74166a09a26
--- /dev/null
+++ b/graphics/clutter-box2d/files/patch-clutter-box2d_Makefile.in
@@ -0,0 +1,11 @@
+--- clutter-box2d/Makefile.in.orig 2009-08-07 16:28:57.000000000 +0200
++++ clutter-box2d/Makefile.in 2009-08-07 16:29:26.000000000 +0200
+@@ -269,7 +269,7 @@
+ EXTRA_DIST = \
+ clutter-box2d-marshal.list
+
+-BUILT_GIRSOURCES = ClutterBox2D-@CLUTTER_BOX2D_API_VERSION@.gir
++BUILT_GIRSOURCES = # ClutterBox2D-@CLUTTER_BOX2D_API_VERSION@.gir
+
+ # INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
+ # install anything - we need to install inside our prefix.
diff --git a/graphics/clutter-box2d/pkg-plist b/graphics/clutter-box2d/pkg-plist
index f4bc604a466b..0caba7fba29a 100644
--- a/graphics/clutter-box2d/pkg-plist
+++ b/graphics/clutter-box2d/pkg-plist
@@ -1,14 +1,14 @@
-include/clutter-0.8/clutter-box2d/clutter-box2d-collision.h
-include/clutter-0.8/clutter-box2d/clutter-box2d-contact.h
-include/clutter-0.8/clutter-box2d/clutter-box2d-joint.h
-include/clutter-0.8/clutter-box2d/clutter-box2d-marshal.h
-include/clutter-0.8/clutter-box2d/clutter-box2d-util.h
-include/clutter-0.8/clutter-box2d/clutter-box2d.h
-lib/libclutter-box2d-0.8.a
-lib/libclutter-box2d-0.8.la
-lib/libclutter-box2d-0.8.so
-lib/libclutter-box2d-0.8.so.0
-libdata/pkgconfig/clutter-box2d-0.8.pc
+include/clutter-1.0/clutter-box2d/clutter-box2d-collision.h
+include/clutter-1.0/clutter-box2d/clutter-box2d-contact.h
+include/clutter-1.0/clutter-box2d/clutter-box2d-joint.h
+include/clutter-1.0/clutter-box2d/clutter-box2d-marshal.h
+include/clutter-1.0/clutter-box2d/clutter-box2d-util.h
+include/clutter-1.0/clutter-box2d/clutter-box2d.h
+lib/libclutter-box2d-0.10.a
+lib/libclutter-box2d-0.10.la
+lib/libclutter-box2d-0.10.so
+lib/libclutter-box2d-0.10.so.0
+libdata/pkgconfig/clutter-box2d-0.10.pc
%%DOCSDIR%%/ClutterBox2D.html
%%DOCSDIR%%/ch01.html
%%DOCSDIR%%/ch02.html
@@ -25,5 +25,5 @@ libdata/pkgconfig/clutter-box2d-0.8.pc
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
@dirrmtry %%DOCSDIR%%
-@dirrm include/clutter-0.8/clutter-box2d
-@dirrmtry include/clutter-0.8
+@dirrm include/clutter-1.0/clutter-box2d
+@dirrmtry include/clutter-1.0
diff --git a/graphics/clutter-cairo/Makefile b/graphics/clutter-cairo/Makefile
deleted file mode 100644
index 4cf5a64233d9..000000000000
--- a/graphics/clutter-cairo/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for: clutter-cairo
-# Date created: 2008-12-25
-# Whom: Martin Wilke <miwi@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= clutter-cairo
-PORTVERSION= 0.8.2
-PORTREVISION= 1
-CATEGORIES= graphics
-MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/0.8/
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Clutter Cairo integrarion library
-
-LIB_DEPENDS= clutter-glx-0.8:${PORTSDIR}/graphics/clutter \
- cairo.2:${PORTSDIR}/graphics/cairo
-
-USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
-USE_GNOME= gnomehack ltverhack
-USE_XORG= xp x11
-USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-
-.include <bsd.port.mk>
diff --git a/graphics/clutter-cairo/distinfo b/graphics/clutter-cairo/distinfo
deleted file mode 100644
index 48533613d055..000000000000
--- a/graphics/clutter-cairo/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (clutter-cairo-0.8.2.tar.gz) = c3bfae082d007be37d9725e5e7b4a30b
-SHA256 (clutter-cairo-0.8.2.tar.gz) = 8d036be4a5834185b2c1bca6fc8db790f240daf70c71c3536439dbb422ee8aea
-SIZE (clutter-cairo-0.8.2.tar.gz) = 341500
diff --git a/graphics/clutter-cairo/pkg-descr b/graphics/clutter-cairo/pkg-descr
deleted file mode 100644
index 935ad2670494..000000000000
--- a/graphics/clutter-cairo/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-An experimental clutter cairo 'drawable' actor. Sucks a bit as renders
-cairo via an image surface and thus no real cairo rendering
-acceleration. Experiments with glitz and sharing GL contexts for such
-acceleration proved problematic. Needs more investigation.
-
-WWW: http://clutter-project.org/
diff --git a/graphics/clutter-cairo/pkg-plist b/graphics/clutter-cairo/pkg-plist
deleted file mode 100644
index 7bdd83b11fe4..000000000000
--- a/graphics/clutter-cairo/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-include/clutter-0.8/clutter-cairo/clutter-cairo.h
-lib/libclutter-cairo-0.8.a
-lib/libclutter-cairo-0.8.la
-lib/libclutter-cairo-0.8.so
-lib/libclutter-cairo-0.8.so.0
-libdata/pkgconfig/clutter-cairo-0.8.pc
-@dirrm include/clutter-0.8/clutter-cairo
-@dirrmtry include/clutter-0.8
diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile
index b0e1642410dd..7fa00ebd27b6 100644
--- a/graphics/clutter-gtk/Makefile
+++ b/graphics/clutter-gtk/Makefile
@@ -6,16 +6,19 @@
#
PORTNAME= clutter-gtk
-PORTVERSION= 0.8.3
-PORTREVISION= 1
+PORTVERSION= 0.10.2
+PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/0.8/
+MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/
MAINTAINER= gnome@FreeBSD.org
COMMENT= GTK+ Integration library for Clutter
-LIB_DEPENDS= clutter-glx-0.8:${PORTSDIR}/graphics/clutter
+BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
+USE_BZIP2= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack gtk20 ltverhack gnomeprefix
@@ -26,4 +29,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+post-patch:
+ @${REINPLACE_CMD} -e 's|clutter-x11-0.9|clutter-x11-1.0|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.mk>
diff --git a/graphics/clutter-gtk/distinfo b/graphics/clutter-gtk/distinfo
index 9ca4bfdf73dc..1fe426c8bab6 100644
--- a/graphics/clutter-gtk/distinfo
+++ b/graphics/clutter-gtk/distinfo
@@ -1,3 +1,3 @@
-MD5 (clutter-gtk-0.8.3.tar.gz) = 3f080e19660aec48e4e1e3e3ec2f032a
-SHA256 (clutter-gtk-0.8.3.tar.gz) = 87222d784c97848a605d5edce9eb9162ea2dcbeb7700d53896aae8ecb8f41602
-SIZE (clutter-gtk-0.8.3.tar.gz) = 390360
+MD5 (clutter-gtk-0.10.2.tar.bz2) = bb275b07f722631ff1764dd212843d11
+SHA256 (clutter-gtk-0.10.2.tar.bz2) = de2af20d44d2237811f27ee081b9df999a0af30ee0d410cd7c2872622386b0c9
+SIZE (clutter-gtk-0.10.2.tar.bz2) = 314372
diff --git a/graphics/clutter-gtk/pkg-plist b/graphics/clutter-gtk/pkg-plist
index b0c75a844c22..4652f55cd4b3 100644
--- a/graphics/clutter-gtk/pkg-plist
+++ b/graphics/clutter-gtk/pkg-plist
@@ -1,25 +1,41 @@
-include/clutter-0.8/clutter-gtk/gtk-clutter-embed.h
-include/clutter-0.8/clutter-gtk/gtk-clutter-util.h
-lib/libclutter-gtk-0.8.a
-lib/libclutter-gtk-0.8.la
-lib/libclutter-gtk-0.8.so
-lib/libclutter-gtk-0.8.so.0
-libdata/pkgconfig/clutter-gtk-0.8.pc
+include/clutter-1.0/clutter-gtk/clutter-gtk.h
+include/clutter-1.0/clutter-gtk/gtk-clutter-embed.h
+include/clutter-1.0/clutter-gtk/gtk-clutter-scrollable.h
+include/clutter-1.0/clutter-gtk/gtk-clutter-util.h
+include/clutter-1.0/clutter-gtk/gtk-clutter-viewport.h
+include/clutter-1.0/clutter-gtk/gtk-clutter-zoomable.h
+lib/girepository-1.0/GtkClutter-0.10.typelib
+lib/libclutter-gtk-0.10.a
+lib/libclutter-gtk-0.10.la
+lib/libclutter-gtk-0.10.so
+lib/libclutter-gtk-0.10.so.0
+libdata/pkgconfig/clutter-gtk-0.10.pc
%%DOCSDIR%%/GtkClutterEmbed.html
+%%DOCSDIR%%/GtkClutterScrollable.html
+%%DOCSDIR%%/GtkClutterViewport.html
+%%DOCSDIR%%/GtkClutterZoomable.html
%%DOCSDIR%%/ch01.html
%%DOCSDIR%%/ch02.html
%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
%%DOCSDIR%%/clutter-gtk-Utility-Functions.html
%%DOCSDIR%%/clutter-gtk.devhelp
%%DOCSDIR%%/clutter-gtk.devhelp2
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/ix01.html
+%%DOCSDIR%%/ix02.html
+%%DOCSDIR%%/ix03.html
+%%DOCSDIR%%/ix04.html
+%%DOCSDIR%%/ix05.html
+%%DOCSDIR%%/ix06.html
%%DOCSDIR%%/left.png
%%DOCSDIR%%/license.html
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
-@dirrmtry %%DOCSDIR%%
-@dirrm include/clutter-0.8/clutter-gtk
-@dirrmtry include/clutter-0.8
+share/gir-1.0/GtkClutter-0.10.gir
+@dirrm %%DOCSDIR%%
+@dirrm include/clutter-1.0/clutter-gtk
+@dirrm include/clutter-1.0
diff --git a/graphics/clutter-qt/Makefile b/graphics/clutter-qt/Makefile
new file mode 100644
index 000000000000..1fc197b881e4
--- /dev/null
+++ b/graphics/clutter-qt/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for: clutter-qt
+# Date created: 04 Aug 2009
+# Whom: Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= clutter-qt
+PORTVERSION= 1.0.0
+CATEGORIES= graphics
+MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= QT+ Integration library for Clutter
+
+LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
+
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_AUTOTOOLS= libtool:22
+USE_QT_VER= 4
+QT_COMPONENTS= corelib gui moc_build
+USE_GNOME= gnomehack
+USE_LDCONFIG= yes
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+post-patch:
+ @${RM} ${WRKSRC}/examples/moc_testqt.cc \
+ ${WRKSRC}/clutter-qt/moc_clutter-qt.cc
+
+.include <bsd.port.mk>
diff --git a/graphics/clutter-qt/distinfo b/graphics/clutter-qt/distinfo
new file mode 100644
index 000000000000..645f395e2620
--- /dev/null
+++ b/graphics/clutter-qt/distinfo
@@ -0,0 +1,3 @@
+MD5 (clutter-qt-1.0.0.tar.bz2) = 656e0eaa088547c01aa6e716f84e7340
+SHA256 (clutter-qt-1.0.0.tar.bz2) = b1599c270e98128e64bc0c0293e97af092f705c23896bcb20c5c1fd662c92155
+SIZE (clutter-qt-1.0.0.tar.bz2) = 270984
diff --git a/graphics/clutter-qt/pkg-descr b/graphics/clutter-qt/pkg-descr
new file mode 100644
index 000000000000..1dc727b9e847
--- /dev/null
+++ b/graphics/clutter-qt/pkg-descr
@@ -0,0 +1,3 @@
+QT+ Integration library for Clutter.
+
+WWW: http://clutter-project.org/
diff --git a/graphics/clutter-qt/pkg-plist b/graphics/clutter-qt/pkg-plist
new file mode 100644
index 000000000000..dd40b2c08a26
--- /dev/null
+++ b/graphics/clutter-qt/pkg-plist
@@ -0,0 +1,7 @@
+include/clutter-1.0/clutter-qt/clutter-qt.h
+lib/libclutter-qt-1.0.a
+lib/libclutter-qt-1.0.la
+lib/libclutter-qt-1.0.so
+lib/libclutter-qt-1.0.so.0
+libdata/pkgconfig/clutter-qt-1.0.pc
+@dirrm include/clutter-1.0/clutter-qt
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index deed407bf6ad..6f0bc5607c09 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -6,23 +6,25 @@
#
PORTNAME= clutter
-PORTVERSION= 0.8.8
-PORTREVISION= 1
+PORTVERSION= 1.0.8
CATEGORIES= graphics
-MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/0.8/
+MASTER_SITES= GNOME \
+ http://www.clutter-project.org/sources/${PORTNAME}/1.0/
MAINTAINER= gnome@FreeBSD.org
COMMENT= OpenGL based interactive canvas library
-LIB_DEPENDS= json-glib-1.0:${PORTSDIR}/devel/json-glib
+BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Pango-1.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-pango
+RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Pango-1.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-pango
USE_GMAKE= yes
+USE_BZIP2= yes
USE_AUTOTOOLS= libtool:22
USE_GNOME= pkgconfig gtk20 gnomehack ltverhack gnomeprefix
USE_GL= gl
USE_XORG= glproto x11 xfixes xdamage xcomposite xi
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --with-x --with-json=check
+CONFIGURE_ARGS= --with-x --with-json=internal
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/graphics/clutter/distinfo b/graphics/clutter/distinfo
index 594a0ac3d3fc..c9568ee481c2 100644
--- a/graphics/clutter/distinfo
+++ b/graphics/clutter/distinfo
@@ -1,3 +1,3 @@
-MD5 (clutter-0.8.8.tar.gz) = 4a77d29cc9584577c9c732f3b8c30543
-SHA256 (clutter-0.8.8.tar.gz) = f1a9cff7e0ddd60f8d53b89d0b44b90778335f69af53863907e3db2520fe5083
-SIZE (clutter-0.8.8.tar.gz) = 2153665
+MD5 (clutter-1.0.8.tar.bz2) = 687f9699ea5590091282034a936c6dc7
+SHA256 (clutter-1.0.8.tar.bz2) = 54fa3b64b7e0539d07a09eb751c5d945a4cedc8d2beb355a51ea7f04ae637501
+SIZE (clutter-1.0.8.tar.bz2) = 2017907
diff --git a/graphics/clutter/pkg-plist b/graphics/clutter/pkg-plist
index 618fe1d03391..5312850e8120 100644
--- a/graphics/clutter/pkg-plist
+++ b/graphics/clutter/pkg-plist
@@ -1,93 +1,124 @@
-include/clutter-0.8/clutter/clutter-actor.h
-include/clutter-0.8/clutter/clutter-alpha.h
-include/clutter-0.8/clutter/clutter-backend.h
-include/clutter-0.8/clutter/clutter-behaviour-bspline.h
-include/clutter-0.8/clutter/clutter-behaviour-depth.h
-include/clutter-0.8/clutter/clutter-behaviour-ellipse.h
-include/clutter-0.8/clutter/clutter-behaviour-opacity.h
-include/clutter-0.8/clutter/clutter-behaviour-path.h
-include/clutter-0.8/clutter/clutter-behaviour-rotate.h
-include/clutter-0.8/clutter/clutter-behaviour-scale.h
-include/clutter-0.8/clutter/clutter-behaviour.h
-include/clutter-0.8/clutter/clutter-child-meta.h
-include/clutter-0.8/clutter/clutter-clone-texture.h
-include/clutter-0.8/clutter/clutter-color.h
-include/clutter-0.8/clutter/clutter-container.h
-include/clutter-0.8/clutter/clutter-deprecated.h
-include/clutter-0.8/clutter/clutter-effect.h
-include/clutter-0.8/clutter/clutter-entry.h
-include/clutter-0.8/clutter/clutter-enum-types.h
-include/clutter-0.8/clutter/clutter-event.h
-include/clutter-0.8/clutter/clutter-feature.h
-include/clutter-0.8/clutter/clutter-fixed.h
-include/clutter-0.8/clutter/clutter-frame-source.h
-include/clutter-0.8/clutter/clutter-group.h
-include/clutter-0.8/clutter/clutter-json.h
-include/clutter-0.8/clutter/clutter-keysyms.h
-include/clutter-0.8/clutter/clutter-label.h
-include/clutter-0.8/clutter/clutter-list-model.h
-include/clutter-0.8/clutter/clutter-main.h
-include/clutter-0.8/clutter/clutter-media.h
-include/clutter-0.8/clutter/clutter-model.h
-include/clutter-0.8/clutter/clutter-rectangle.h
-include/clutter-0.8/clutter/clutter-score.h
-include/clutter-0.8/clutter/clutter-script.h
-include/clutter-0.8/clutter/clutter-scriptable.h
-include/clutter-0.8/clutter/clutter-shader.h
-include/clutter-0.8/clutter/clutter-stage-manager.h
-include/clutter-0.8/clutter/clutter-stage.h
-include/clutter-0.8/clutter/clutter-texture.h
-include/clutter-0.8/clutter/clutter-timeline.h
-include/clutter-0.8/clutter/clutter-timeout-pool.h
-include/clutter-0.8/clutter/clutter-types.h
-include/clutter-0.8/clutter/clutter-units.h
-include/clutter-0.8/clutter/clutter-util.h
-include/clutter-0.8/clutter/clutter-version.h
-include/clutter-0.8/clutter/clutter.h
-include/clutter-0.8/clutter/glx/clutter-glx-texture-pixmap.h
-include/clutter-0.8/clutter/glx/clutter-glx.h
-include/clutter-0.8/clutter/pangoclutter.h
-include/clutter-0.8/clutter/x11/clutter-x11-enum-types.h
-include/clutter-0.8/clutter/x11/clutter-x11-texture-pixmap.h
-include/clutter-0.8/clutter/x11/clutter-x11.h
-include/clutter-0.8/cogl/cogl-defines-gl.h
-include/clutter-0.8/cogl/cogl.h
-lib/libclutter-glx-0.8.a
-lib/libclutter-glx-0.8.la
-lib/libclutter-glx-0.8.so
-lib/libclutter-glx-0.8.so.0
-libdata/pkgconfig/clutter-0.8.pc
-libdata/pkgconfig/clutter-glx-0.8.pc
-libdata/pkgconfig/clutter-x11-0.8.pc
+include/clutter-1.0/clutter/clutter-actor.h
+include/clutter-1.0/clutter/clutter-alpha.h
+include/clutter-1.0/clutter/clutter-animatable.h
+include/clutter-1.0/clutter/clutter-animation.h
+include/clutter-1.0/clutter/clutter-backend.h
+include/clutter-1.0/clutter/clutter-behaviour-depth.h
+include/clutter-1.0/clutter/clutter-behaviour-ellipse.h
+include/clutter-1.0/clutter/clutter-behaviour-opacity.h
+include/clutter-1.0/clutter/clutter-behaviour-path.h
+include/clutter-1.0/clutter/clutter-behaviour-rotate.h
+include/clutter-1.0/clutter/clutter-behaviour-scale.h
+include/clutter-1.0/clutter/clutter-behaviour.h
+include/clutter-1.0/clutter/clutter-binding-pool.h
+include/clutter-1.0/clutter/clutter-cairo-texture.h
+include/clutter-1.0/clutter/clutter-child-meta.h
+include/clutter-1.0/clutter/clutter-clone.h
+include/clutter-1.0/clutter/clutter-color.h
+include/clutter-1.0/clutter/clutter-container.h
+include/clutter-1.0/clutter/clutter-deprecated.h
+include/clutter-1.0/clutter/clutter-enum-types.h
+include/clutter-1.0/clutter/clutter-event.h
+include/clutter-1.0/clutter/clutter-feature.h
+include/clutter-1.0/clutter/clutter-fixed.h
+include/clutter-1.0/clutter/clutter-frame-source.h
+include/clutter-1.0/clutter/clutter-group.h
+include/clutter-1.0/clutter/clutter-interval.h
+include/clutter-1.0/clutter/clutter-json.h
+include/clutter-1.0/clutter/clutter-keysyms.h
+include/clutter-1.0/clutter/clutter-list-model.h
+include/clutter-1.0/clutter/clutter-main.h
+include/clutter-1.0/clutter/clutter-media.h
+include/clutter-1.0/clutter/clutter-model.h
+include/clutter-1.0/clutter/clutter-path.h
+include/clutter-1.0/clutter/clutter-rectangle.h
+include/clutter-1.0/clutter/clutter-score.h
+include/clutter-1.0/clutter/clutter-script.h
+include/clutter-1.0/clutter/clutter-scriptable.h
+include/clutter-1.0/clutter/clutter-shader-types.h
+include/clutter-1.0/clutter/clutter-shader.h
+include/clutter-1.0/clutter/clutter-stage-manager.h
+include/clutter-1.0/clutter/clutter-stage.h
+include/clutter-1.0/clutter/clutter-text.h
+include/clutter-1.0/clutter/clutter-texture.h
+include/clutter-1.0/clutter/clutter-timeline.h
+include/clutter-1.0/clutter/clutter-timeout-pool.h
+include/clutter-1.0/clutter/clutter-types.h
+include/clutter-1.0/clutter/clutter-units.h
+include/clutter-1.0/clutter/clutter-util.h
+include/clutter-1.0/clutter/clutter-version.h
+include/clutter-1.0/clutter/clutter.h
+include/clutter-1.0/clutter/glx/clutter-glx-texture-pixmap.h
+include/clutter-1.0/clutter/glx/clutter-glx.h
+include/clutter-1.0/clutter/json/json-generator.h
+include/clutter-1.0/clutter/json/json-glib.h
+include/clutter-1.0/clutter/json/json-marshal.h
+include/clutter-1.0/clutter/json/json-parser.h
+include/clutter-1.0/clutter/json/json-types.h
+include/clutter-1.0/clutter/x11/clutter-x11-enum-types.h
+include/clutter-1.0/clutter/x11/clutter-x11-texture-pixmap.h
+include/clutter-1.0/clutter/x11/clutter-x11.h
+include/clutter-1.0/cogl/cogl-bitmap.h
+include/clutter-1.0/cogl/cogl-color.h
+include/clutter-1.0/cogl/cogl-debug.h
+include/clutter-1.0/cogl/cogl-defines-gl.h
+include/clutter-1.0/cogl/cogl-deprecated.h
+include/clutter-1.0/cogl/cogl-enum-types.h
+include/clutter-1.0/cogl/cogl-fixed.h
+include/clutter-1.0/cogl/cogl-material.h
+include/clutter-1.0/cogl/cogl-matrix.h
+include/clutter-1.0/cogl/cogl-offscreen.h
+include/clutter-1.0/cogl/cogl-pango.h
+include/clutter-1.0/cogl/cogl-path.h
+include/clutter-1.0/cogl/cogl-shader.h
+include/clutter-1.0/cogl/cogl-texture.h
+include/clutter-1.0/cogl/cogl-types.h
+include/clutter-1.0/cogl/cogl-vertex-buffer.h
+include/clutter-1.0/cogl/cogl.h
+lib/girepository-1.0/Clutter-1.0.typelib
+lib/girepository-1.0/Cogl-1.0.typelib
+lib/girepository-1.0/ClutterJson-1.0.typelib
+lib/libclutter-glx-1.0.a
+lib/libclutter-glx-1.0.la
+lib/libclutter-glx-1.0.so
+lib/libclutter-glx-1.0.so.0
+libdata/pkgconfig/clutter-1.0.pc
+libdata/pkgconfig/clutter-glx-1.0.pc
+libdata/pkgconfig/clutter-x11-1.0.pc
+libdata/pkgconfig/cogl-1.0.pc
+libdata/pkgconfig/cogl-gl-1.0.pc
%%DOCSDIR%%/ClutterActor.html
%%DOCSDIR%%/ClutterAlpha.html
+%%DOCSDIR%%/ClutterAnimatable.html
%%DOCSDIR%%/ClutterBehaviour.html
-%%DOCSDIR%%/ClutterBehaviourBspline.html
%%DOCSDIR%%/ClutterBehaviourDepth.html
%%DOCSDIR%%/ClutterBehaviourEllipse.html
%%DOCSDIR%%/ClutterBehaviourOpacity.html
%%DOCSDIR%%/ClutterBehaviourPath.html
%%DOCSDIR%%/ClutterBehaviourRotate.html
%%DOCSDIR%%/ClutterBehaviourScale.html
+%%DOCSDIR%%/ClutterCairoTexture.html
%%DOCSDIR%%/ClutterChildMeta.html
-%%DOCSDIR%%/ClutterCloneTexture.html
+%%DOCSDIR%%/ClutterClone.html
%%DOCSDIR%%/ClutterContainer.html
-%%DOCSDIR%%/ClutterEntry.html
%%DOCSDIR%%/ClutterGroup.html
-%%DOCSDIR%%/ClutterLabel.html
%%DOCSDIR%%/ClutterListModel.html
%%DOCSDIR%%/ClutterMedia.html
%%DOCSDIR%%/ClutterModel.html
%%DOCSDIR%%/ClutterModelIter.html
+%%DOCSDIR%%/ClutterPath.html
%%DOCSDIR%%/ClutterRectangle.html
%%DOCSDIR%%/ClutterScore.html
%%DOCSDIR%%/ClutterScript.html
+%%DOCSDIR%%/ClutterScriptable.html
%%DOCSDIR%%/ClutterShader.html
%%DOCSDIR%%/ClutterStage.html
+%%DOCSDIR%%/ClutterText.html
%%DOCSDIR%%/ClutterTexture.html
%%DOCSDIR%%/ClutterTimeline.html
%%DOCSDIR%%/actor-box.png
-%%DOCSDIR%%/alpha-func.png
+%%DOCSDIR%%/additionaldocs.html
+%%DOCSDIR%%/annotation-glossary.html
%%DOCSDIR%%/building-clutter.html
%%DOCSDIR%%/ch01.html
%%DOCSDIR%%/ch02.html
@@ -98,21 +129,24 @@ libdata/pkgconfig/clutter-x11-0.8.pc
%%DOCSDIR%%/ch07.html
%%DOCSDIR%%/ch08.html
%%DOCSDIR%%/ch09.html
-%%DOCSDIR%%/clutter-Clutter-Effects.html
%%DOCSDIR%%/clutter-ClutterBackend.html
-%%DOCSDIR%%/clutter-ClutterScriptable.html
%%DOCSDIR%%/clutter-Colors.html
+%%DOCSDIR%%/clutter-EGL-Specific-Support.html
+%%DOCSDIR%%/clutter-EGLX-Specific-Support.html
%%DOCSDIR%%/clutter-Events.html
-%%DOCSDIR%%/clutter-Fixed-Point-Support.html
+%%DOCSDIR%%/clutter-GLX-Specific-Support.html
%%DOCSDIR%%/clutter-General.html
+%%DOCSDIR%%/clutter-Implicit-Animations.html
+%%DOCSDIR%%/clutter-Key-Bindings.html
%%DOCSDIR%%/clutter-Unit-conversion.html
%%DOCSDIR%%/clutter-Utilities.html
+%%DOCSDIR%%/clutter-Value-intervals.html
%%DOCSDIR%%/clutter-Versioning-Macros.html
%%DOCSDIR%%/clutter-Win32-Specific-Support.html
%%DOCSDIR%%/clutter-X11-Specific-Support.html
%%DOCSDIR%%/clutter-animation-behaviours.html
%%DOCSDIR%%/clutter-animation-conclusion.html
-%%DOCSDIR%%/clutter-animation-effects.html
+%%DOCSDIR%%/clutter-animation-implicit.html
%%DOCSDIR%%/clutter-animation-timelines.html
%%DOCSDIR%%/clutter-animations.html
%%DOCSDIR%%/clutter-overview.html
@@ -120,34 +154,52 @@ libdata/pkgconfig/clutter-x11-0.8.pc
%%DOCSDIR%%/clutter.devhelp
%%DOCSDIR%%/clutter.devhelp2
%%DOCSDIR%%/clutteranimation.html
+%%DOCSDIR%%/clutterbackends.html
%%DOCSDIR%%/clutterbase.html
+%%DOCSDIR%%/clutterglossary.html
+%%DOCSDIR%%/clutterobjecthierarchy.html
+%%DOCSDIR%%/clutterobjectindex.html
+%%DOCSDIR%%/clutterobjects.html
+%%DOCSDIR%%/cluttertools.html
%%DOCSDIR%%/creating-your-own-behaviours.html
+%%DOCSDIR%%/easing-modes.png
%%DOCSDIR%%/event-flow.png
+%%DOCSDIR%%/go01.html
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/iterating-paths.html
%%DOCSDIR%%/ix01.html
%%DOCSDIR%%/ix02.html
%%DOCSDIR%%/ix03.html
%%DOCSDIR%%/ix04.html
%%DOCSDIR%%/ix05.html
%%DOCSDIR%%/ix06.html
+%%DOCSDIR%%/ix07.html
%%DOCSDIR%%/left.png
%%DOCSDIR%%/license.html
+%%DOCSDIR%%/migrating-ClutterEffect.html
+%%DOCSDIR%%/migrating-ClutterPath.html
+%%DOCSDIR%%/migration.html
%%DOCSDIR%%/path-alpha-func.png
-%%DOCSDIR%%/pt05.html
-%%DOCSDIR%%/pt06.html
-%%DOCSDIR%%/pt07.html
+%%DOCSDIR%%/pt10.html
%%DOCSDIR%%/right.png
+%%DOCSDIR%%/running-clutter.html
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
+%%DOCSDIR%%/using-cairo.html
share/doc/cogl/ch01.html
+share/doc/cogl/cogl-Blend-Strings.html
+share/doc/cogl/cogl-Color-Type.html
+share/doc/cogl/cogl-Fixed-Point-API.html
share/doc/cogl/cogl-General-API.html
+share/doc/cogl/cogl-Materials.html
+share/doc/cogl/cogl-Matrices.html
share/doc/cogl/cogl-Offscreen-Buffers.html
share/doc/cogl/cogl-Primitives.html
share/doc/cogl/cogl-Shaders-and-Programmable-Pipeline.html
share/doc/cogl/cogl-Textures.html
-share/doc/cogl/cogl-Utility-API.html
+share/doc/cogl/cogl-Vertex-Buffers.html
share/doc/cogl/cogl.devhelp
share/doc/cogl/cogl.devhelp2
share/doc/cogl/home.png
@@ -159,10 +211,14 @@ share/doc/cogl/license.html
share/doc/cogl/right.png
share/doc/cogl/style.css
share/doc/cogl/up.png
+share/gir-1.0/Clutter-1.0.gir
+share/gir-1.0/ClutterJson-1.0.gir
+share/gir-1.0/Cogl-1.0.gir
@dirrm share/doc/cogl
-@dirrmtry %%DOCSDIR%%
-@dirrm include/clutter-0.8/cogl
-@dirrm include/clutter-0.8/clutter/x11
-@dirrm include/clutter-0.8/clutter/glx
-@dirrmtry include/clutter-0.8/clutter
-@dirrmtry include/clutter-0.8
+@dirrm %%DOCSDIR%%
+@dirrm include/clutter-1.0/clutter/x11
+@dirrm include/clutter-1.0/clutter/json
+@dirrm include/clutter-1.0/clutter/glx
+@dirrm include/clutter-1.0/clutter
+@dirrm include/clutter-1.0/cogl
+@dirrm include/clutter-1.0
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
new file mode 100644
index 000000000000..aec0aa46cdca
--- /dev/null
+++ b/graphics/eog-plugins/Makefile
@@ -0,0 +1,57 @@
+# New ports collection makefile for: eog-plugins
+# Date created: 28 August 2009
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/eog-plugins/Makefile,v 1.5 2009/10/20 12:03:34 avl Exp $
+#
+
+PORTNAME= eog-plugins
+PORTVERSION= 2.28.1
+CATEGORIES= graphics gnome
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Plug-ins for the Eye of GNOME image viewer application
+
+BUILD_DEPENDS= eog:${PORTSDIR}/graphics/eog
+RUN_DEPENDS= eog:${PORTSDIR}/graphics/eog
+
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_GNOME= gnomeprefix gnomehack intlhack gtk20
+WANT_GNOME= yes
+USE_GETTEXT= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_CHAMPLAIN) || \
+ (exists(${LOCALBASE}/lib/libchamplain-0.4.so)) || defined(WITH_CHAMPLIAN)
+LIB_DEPENDS+= champlain-0.4.1:${PORTSDIR}/graphics/libchamplain
+PLIST_SUB+= CHAMPLAIN=""
+.else
+PLUST_SUB+= CHAMPLAIN="@comment "
+.endif
+
+.if !defined(WITHOUT_EXIF) || (exists(${LOCALBASE}/lib/libexif.so.12) || \
+ defined(WITH_EXIF))
+LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif
+PLIST_SUB+= EXIF=""
+.else
+PLIST_SUB+= EXIF="@comment "
+.endif
+
+.if ${HAVE_GNOME:Mpygnome2}!=""
+USE_GNOME+= pygnome2
+CONFIGURE_ARGS+=--enable-python
+PLIST_SUB+= PYTHON=""
+.else
+CONFIGURE_ARGS+=--disable-python
+PLIST_SUB+= PYTHON="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/graphics/eog-plugins/distinfo b/graphics/eog-plugins/distinfo
new file mode 100644
index 000000000000..f93de94ff87c
--- /dev/null
+++ b/graphics/eog-plugins/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/eog-plugins-2.28.1.tar.bz2) = 570857f4f9a32df31c64e5410125f98c
+SHA256 (gnome2/eog-plugins-2.28.1.tar.bz2) = cc15a7da85ebbe77701484e038be620858f00ed8696f69c8824ea769e74b1bee
+SIZE (gnome2/eog-plugins-2.28.1.tar.bz2) = 307193
diff --git a/graphics/eog-plugins/pkg-descr b/graphics/eog-plugins/pkg-descr
new file mode 100644
index 000000000000..7eed446bbbff
--- /dev/null
+++ b/graphics/eog-plugins/pkg-descr
@@ -0,0 +1,2 @@
+EoG-plugins is a collection of plugins for use with the Eye of GNOME Image
+Viewer.
diff --git a/graphics/eog-plugins/pkg-plist b/graphics/eog-plugins/pkg-plist
new file mode 100644
index 000000000000..b91fe7e6ba82
--- /dev/null
+++ b/graphics/eog-plugins/pkg-plist
@@ -0,0 +1,75 @@
+%%CHAMPLAIN%%lib/eog/plugins/champlain.eog-plugin
+%%PYTHON%%lib/eog/plugins/console.py
+%%PYTHON%%lib/eog/plugins/console.pyc
+%%PYTHON%%lib/eog/plugins/console.pyo
+%%EXIF%%lib/eog/plugins/exif-display.eog-plugin
+%%EXIF%%lib/eog/plugins/exif-display/exif-display-config.ui
+%%EXIF%%lib/eog/plugins/exif-display/exif-display.ui
+lib/eog/plugins/fit-to-width.eog-plugin
+%%CHAMPLAIN%%lib/eog/plugins/libchamplain.la
+%%CHAMPLAIN%%lib/eog/plugins/libchamplain.so
+%%EXIF%%lib/eog/plugins/libexif-display.la
+%%EXIF%%lib/eog/plugins/libexif-display.so
+lib/eog/plugins/libfit-to-width.la
+lib/eog/plugins/libfit-to-width.so
+%%PYTHON%%lib/eog/plugins/pythonconsole.eog-plugin
+%%PYTHON%%lib/eog/plugins/pythonconsole.py
+%%PYTHON%%lib/eog/plugins/pythonconsole.pyc
+%%PYTHON%%lib/eog/plugins/pythonconsole.pyo
+%%PYTHON%%lib/eog/plugins/slideshowshuffle.eog-plugin
+%%PYTHON%%lib/eog/plugins/slideshowshuffle.py
+%%PYTHON%%lib/eog/plugins/slideshowshuffle.pyc
+%%PYTHON%%lib/eog/plugins/slideshowshuffle.pyo
+share/locale/ar/LC_MESSAGES/eog-plugins.mo
+share/locale/as/LC_MESSAGES/eog-plugins.mo
+share/locale/be@latin/LC_MESSAGES/eog-plugins.mo
+share/locale/bg/LC_MESSAGES/eog-plugins.mo
+share/locale/bn_IN/LC_MESSAGES/eog-plugins.mo
+share/locale/ca/LC_MESSAGES/eog-plugins.mo
+share/locale/cs/LC_MESSAGES/eog-plugins.mo
+share/locale/da/LC_MESSAGES/eog-plugins.mo
+share/locale/de/LC_MESSAGES/eog-plugins.mo
+share/locale/el/LC_MESSAGES/eog-plugins.mo
+share/locale/en_GB/LC_MESSAGES/eog-plugins.mo
+share/locale/es/LC_MESSAGES/eog-plugins.mo
+share/locale/eu/LC_MESSAGES/eog-plugins.mo
+share/locale/fi/LC_MESSAGES/eog-plugins.mo
+share/locale/fr/LC_MESSAGES/eog-plugins.mo
+share/locale/gl/LC_MESSAGES/eog-plugins.mo
+share/locale/gu/LC_MESSAGES/eog-plugins.mo
+share/locale/hu/LC_MESSAGES/eog-plugins.mo
+share/locale/it/LC_MESSAGES/eog-plugins.mo
+share/locale/ja/LC_MESSAGES/eog-plugins.mo
+share/locale/kn/LC_MESSAGES/eog-plugins.mo
+share/locale/lt/LC_MESSAGES/eog-plugins.mo
+share/locale/mk/LC_MESSAGES/eog-plugins.mo
+share/locale/ml/LC_MESSAGES/eog-plugins.mo
+share/locale/mr/LC_MESSAGES/eog-plugins.mo
+share/locale/nb/LC_MESSAGES/eog-plugins.mo
+share/locale/or/LC_MESSAGES/eog-plugins.mo
+share/locale/pa/LC_MESSAGES/eog-plugins.mo
+share/locale/pl/LC_MESSAGES/eog-plugins.mo
+share/locale/pt/LC_MESSAGES/eog-plugins.mo
+share/locale/pt_BR/LC_MESSAGES/eog-plugins.mo
+share/locale/sl/LC_MESSAGES/eog-plugins.mo
+share/locale/sq/LC_MESSAGES/eog-plugins.mo
+share/locale/sv/LC_MESSAGES/eog-plugins.mo
+share/locale/ta/LC_MESSAGES/eog-plugins.mo
+share/locale/te/LC_MESSAGES/eog-plugins.mo
+share/locale/vi/LC_MESSAGES/eog-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/eog-plugins.mo
+share/locale/zh_HK/LC_MESSAGES/eog-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/eog-plugins.mo
+@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/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@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
+%%EXIF%%@dirrm lib/eog/plugins/exif-display
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 9983c551255c..2cf5c806b357 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/eog/Makefile,v 1.8 2009/04/15 12:29:15 kwm Exp $
+# $MCom: ports/graphics/eog/Makefile,v 1.105 2009/10/20 00:34:26 kwm Exp $
#
PORTNAME= eog
-PORTVERSION= 2.26.3
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,12 +15,14 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= The Eye Of Gnome image viewer
-LIB_DEPENDS= lcms.1:${PORTSDIR}/graphics/lcms
+BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
+RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack librsvg2 desktopfileutils \
gnomedesktop
+WANT_GNOME= yes
INSTALLS_ICONS= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
@@ -34,9 +35,28 @@ GCONF_SCHEMAS= eog.schemas
.include <bsd.port.pre.mk>
+_WITH_EXIF= no
+_WITH_EXEMPI= no
+
.if !defined(WITHOUT_EXIF) || (exists(${LOCALBASE}/lib/libexif.so.12) || \
defined(WITH_EXIF))
LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif
+PLIST_SUB+= EXIF=""
+_WITH_EXIF= yes
+.else
+PLIST_SUB+= EXIF="@comment "
+.endif
+
+.if !defined(WITHOUT_EXEMPI) || (exists(${LOCALBASE}/lib/libexempi.so)) || \
+ defined(WITH_EXEMPI)
+LIB_DEPENDS+= exempi.3:${PORTSDIR}/textproc/exempi
+_WITH_EXEMPI= yes
+.endif
+
+.if ${_WITH_EXIF}=="yes" || ${_WITH_EXEMPI}=="yes"
+PLIST_SUB+= EXIFEXEMPI=""
+.else
+PLIST_SUB+= EXIFEXEMPI="@comment "
.endif
.if ${HAVE_GNOME:Mpygnome2}!=""
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index 7e6f06052cf6..16dd7f89426b 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eog-2.26.3.tar.bz2) = 0660a0ce0fa4a46656fad84d61895917
-SHA256 (gnome2/eog-2.26.3.tar.bz2) = 67889e7598263146d835bce277df0dd67b6c5a14ad963790ce09ced55897effe
-SIZE (gnome2/eog-2.26.3.tar.bz2) = 2446417
+MD5 (gnome2/eog-2.28.1.tar.bz2) = efb488a22cbb0ca70f4b6a0f2d8aa83e
+SHA256 (gnome2/eog-2.28.1.tar.bz2) = e30b2f8f05d74acd715f1a93467cc3200850033338ddad05b6b06db8386ad27e
+SIZE (gnome2/eog-2.28.1.tar.bz2) = 2677525
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index 55d8c67c1c01..f7832164f571 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -4,8 +4,8 @@ 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
+%%EXIFEXEMPI%%include/eog-2.20/eog/eog-exif-details.h
+%%EXIF%%include/eog-2.20/eog/eog-exif-util.h
include/eog-2.20/eog/eog-file-chooser.h
include/eog-2.20/eog/eog-image-save-info.h
include/eog-2.20/eog/eog-image.h
@@ -45,7 +45,6 @@ share/applications/eog.desktop
%%DOCSDIR%%/EogMessageArea.html
%%DOCSDIR%%/EogMetadataReaderJpg.html
%%DOCSDIR%%/EogMetadataReaderPng.html
-%%DOCSDIR%%/EogPixbufCellRenderer.html
%%DOCSDIR%%/EogPlugin.html
%%DOCSDIR%%/EogPluginManager.html
%%DOCSDIR%%/EogPreferencesDialog.html
@@ -126,6 +125,10 @@ share/gnome/help/eog/ca/eog.xml
share/gnome/help/eog/ca/figures/eog_save_as_window.png
share/gnome/help/eog/ca/figures/eog_start_window.png
share/gnome/help/eog/ca/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/cs/eog.xml
+share/gnome/help/eog/cs/figures/eog_save_as_window.png
+share/gnome/help/eog/cs/figures/eog_start_window.png
+share/gnome/help/eog/cs/figures/eog_toolbar_editor_window.png
share/gnome/help/eog/da/eog.xml
share/gnome/help/eog/da/figures/eog_save_as_window.png
share/gnome/help/eog/da/figures/eog_start_window.png
@@ -215,14 +218,17 @@ share/locale/af/LC_MESSAGES/eog.mo
share/locale/am/LC_MESSAGES/eog.mo
share/locale/ar/LC_MESSAGES/eog.mo
share/locale/as/LC_MESSAGES/eog.mo
+share/locale/ast/LC_MESSAGES/eog.mo
share/locale/az/LC_MESSAGES/eog.mo
share/locale/be/LC_MESSAGES/eog.mo
share/locale/be@latin/LC_MESSAGES/eog.mo
share/locale/bg/LC_MESSAGES/eog.mo
share/locale/bn/LC_MESSAGES/eog.mo
share/locale/bn_IN/LC_MESSAGES/eog.mo
+share/locale/br/LC_MESSAGES/eog.mo
share/locale/bs/LC_MESSAGES/eog.mo
share/locale/ca/LC_MESSAGES/eog.mo
+share/locale/ca@valencia/LC_MESSAGES/eog.mo
share/locale/cs/LC_MESSAGES/eog.mo
share/locale/cy/LC_MESSAGES/eog.mo
share/locale/da/LC_MESSAGES/eog.mo
@@ -304,6 +310,7 @@ share/locale/zu/LC_MESSAGES/eog.mo
share/omf/eog/eog-C.omf
share/omf/eog/eog-ar.omf
share/omf/eog/eog-ca.omf
+share/omf/eog/eog-cs.omf
share/omf/eog/eog-da.omf
share/omf/eog/eog-de.omf
share/omf/eog/eog-el.omf
@@ -365,6 +372,8 @@ share/omf/eog/eog-zh_TW.omf
@dirrm share/gnome/help/eog/de
@dirrm share/gnome/help/eog/da/figures
@dirrm share/gnome/help/eog/da
+@dirrm share/gnome/help/eog/cs/figures
+@dirrm share/gnome/help/eog/cs
@dirrm share/gnome/help/eog/ca/figures
@dirrm share/gnome/help/eog/ca
@dirrm share/gnome/help/eog/ar/figures
@@ -434,9 +443,13 @@ share/omf/eog/eog-zh_TW.omf
@dirrmtry share/locale/fur
@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/graphics/evince/Makefile b/graphics/evince/Makefile
index 889245f59e5d..0006adb23281 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/evince/Makefile,v 1.7 2009/04/16 08:20:58 kwm Exp $
+# $MCom: ports/graphics/evince/Makefile,v 1.130 2009/10/19 19:57:01 kwm Exp $
#
PORTNAME= evince
-PORTVERSION= 2.26.2
-PORTREVISION= 2
+PORTVERSION= 2.28.1
CATEGORIES= graphics print gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,8 +15,10 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 multi-format document viewer
+BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
LIB_DEPENDS= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk \
spectre.1:${PORTSDIR}/print/libspectre
+RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
USE_LDCONFIG= yes
USE_BZIP2= yes
@@ -30,9 +31,9 @@ USE_GNOME= gnomehack intlhack gnomeprefix desktopfileutils \
gnomedocutils ltasneededhack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-print=gtk
-GCONF_SCHEMAS= evince.schemas evince-thumbnailer.schemas \
+GCONF_SCHEMAS= evince.schemas \
+ evince-thumbnailer.schemas \
evince-thumbnailer-ps.schemas
MAN1= evince.1
diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo
index a422f9c5c4ee..2c95413b7667 100644
--- a/graphics/evince/distinfo
+++ b/graphics/evince/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evince-2.26.2.tar.bz2) = ed8b9fb5c5d6feafd19f0114b736c9ef
-SHA256 (gnome2/evince-2.26.2.tar.bz2) = 5165adb77af7dd355c600bc1fce4bcc7de2538ed02d0f87028660096a61af489
-SIZE (gnome2/evince-2.26.2.tar.bz2) = 2033141
+MD5 (gnome2/evince-2.28.1.tar.bz2) = 3f0bf750825f5455d307ec21a27d1f3e
+SHA256 (gnome2/evince-2.28.1.tar.bz2) = c64047d4dc8424b613274651a5ef6bc78d306fc71bef36a3e033c07ddc2487a6
+SIZE (gnome2/evince-2.28.1.tar.bz2) = 2033193
diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist
index 6cc5588fdd69..1d1a6d126ec9 100644
--- a/graphics/evince/pkg-plist
+++ b/graphics/evince/pkg-plist
@@ -1,10 +1,13 @@
bin/evince
+bin/evince-previewer
bin/evince-thumbnailer
include/evince/2.25/evince-document.h
include/evince/2.25/evince-view.h
+include/evince/2.25/libdocument/ev-annotation.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-annotations.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
@@ -14,6 +17,7 @@ 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-print.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
@@ -28,6 +32,7 @@ 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-mapping.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
@@ -36,6 +41,7 @@ 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-stock-icons.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
@@ -90,12 +96,11 @@ share/applications/evince.desktop
%%DOCSDIR%%/evince-EvSidebar.html
%%DOCSDIR%%/evince-EvSidebarAttachments.html
%%DOCSDIR%%/evince-EvSidebarLinks.html
+%%DOCSDIR%%/evince-EvSidebarPage.html
%%DOCSDIR%%/evince-EvSidebarThumbnails.html
%%DOCSDIR%%/evince-ev-metadata-manager.html
%%DOCSDIR%%/evince-ev-properties-dialog.html
%%DOCSDIR%%/evince-ev-properties-fonts.html
-%%DOCSDIR%%/evince-ev-sidebar-page.html
-%%DOCSDIR%%/evince-ev-stock-icons.html
%%DOCSDIR%%/evince-ev-utils.html
%%DOCSDIR%%/evince-ev-window-title.html
%%DOCSDIR%%/evince.devhelp
@@ -109,12 +114,25 @@ share/applications/evince.desktop
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
+share/doc/libevdocument/EvAsyncRenderer.html
share/doc/libevdocument/EvAttachment.html
+share/doc/libevdocument/EvDocument.html
+share/doc/libevdocument/EvDocumentFind.html
+share/doc/libevdocument/EvDocumentFonts.html
+share/doc/libevdocument/EvDocumentForms.html
+share/doc/libevdocument/EvDocumentImages.html
+share/doc/libevdocument/EvDocumentLayers.html
+share/doc/libevdocument/EvDocumentLinks.html
+share/doc/libevdocument/EvDocumentSecurity.html
+share/doc/libevdocument/EvDocumentThumbnails.html
+share/doc/libevdocument/EvDocumentTransition.html
+share/doc/libevdocument/EvFileExporter.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/EvSelection.html
share/doc/libevdocument/data.html
share/doc/libevdocument/helper.html
share/doc/libevdocument/home.png
@@ -122,48 +140,37 @@ 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-EvJobPrint.html
share/doc/libevview/libevview-ev-job-scheduler.html
share/doc/libevview/libevview-ev-page-cache.html
+share/doc/libevview/libevview-ev-stock-icons.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-previewer-ui.xml
%%DATADIR%%/evince-toolbar.xml
%%DATADIR%%/evince-ui.xml
%%DATADIR%%/hand-open.png
@@ -185,8 +192,11 @@ share/doc/libevview/up.png
%%DATADIR%%/icons/hicolor/24x24/actions/zoom.png
%%DATADIR%%/icons/hicolor/32x32/actions/view-page-continuous.png
%%DATADIR%%/icons/hicolor/32x32/actions/view-page-facing.png
+%%DATADIR%%/icons/hicolor/48x48/actions/close.png
%%DATADIR%%/icons/hicolor/48x48/actions/view-page-continuous.png
%%DATADIR%%/icons/hicolor/48x48/actions/view-page-facing.png
+%%DATADIR%%/icons/hicolor/48x48/actions/resize-se.png
+%%DATADIR%%/icons/hicolor/48x48/actions/resize-sw.png
share/gnome/help/evince/C/evince.xml
share/gnome/help/evince/C/figures/evince_start_window.png
share/gnome/help/evince/C/legal.xml
@@ -228,6 +238,8 @@ 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
@@ -245,6 +257,7 @@ share/locale/bn/LC_MESSAGES/evince.mo
share/locale/bn_IN/LC_MESSAGES/evince.mo
share/locale/br/LC_MESSAGES/evince.mo
share/locale/ca/LC_MESSAGES/evince.mo
+share/locale/ca@valencia/LC_MESSAGES/evince.mo
share/locale/cs/LC_MESSAGES/evince.mo
share/locale/cy/LC_MESSAGES/evince.mo
share/locale/da/LC_MESSAGES/evince.mo
@@ -330,6 +343,7 @@ 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
@@ -338,6 +352,8 @@ share/locale/sr@latin/LC_MESSAGES/evince.mo
@dirrm share/gnome/help/evince/zh_CN
@dirrm share/gnome/help/evince/uk/figures
@dirrm share/gnome/help/evince/uk
+@dirrm share/gnome/help/evince/vi/figures
+@dirrm share/gnome/help/evince/vi
@dirrm share/gnome/help/evince/sv/figures
@dirrm share/gnome/help/evince/sv
@dirrm share/gnome/help/evince/sr/figures
@@ -429,6 +445,8 @@ share/locale/sr@latin/LC_MESSAGES/evince.mo
@dirrmtry share/locale/ks
@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
diff --git a/graphics/gambas2-gb-pdf/Makefile b/graphics/gambas2-gb-pdf/Makefile
index fbf3e104c220..1626b91aa770 100644
--- a/graphics/gambas2-gb-pdf/Makefile
+++ b/graphics/gambas2-gb-pdf/Makefile
@@ -5,6 +5,7 @@
# $FreeBSD$
#
+PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -gb-pdf
diff --git a/graphics/gambas2-gb-pdf/files/patch-gb.pdf_src_CPdfDocument.cpp b/graphics/gambas2-gb-pdf/files/patch-gb.pdf_src_CPdfDocument.cpp
new file mode 100644
index 000000000000..65d1f7c279fc
--- /dev/null
+++ b/graphics/gambas2-gb-pdf/files/patch-gb.pdf_src_CPdfDocument.cpp
@@ -0,0 +1,19 @@
+--- gb.pdf/src/CPdfDocument.cpp.orig 2009-09-27 18:30:35.000000000 +0200
++++ gb.pdf/src/CPdfDocument.cpp 2009-09-27 20:10:45.000000000 +0200
+@@ -510,9 +510,15 @@ END_PROPERTY
+ BEGIN_PROPERTY(PDFINFO_format)
+
+ char *ctx=NULL;
++ double version;
++ int major, minor;
++
++ major = THIS->doc->getPDFMajorVersion();
++ minor = THIS->doc->getPDFMinorVersion();
++ version = (double)(major + minor *0.1);
+
+ GB.Alloc(POINTER(&ctx),16*sizeof(char));
+- snprintf(ctx,16*sizeof(char),"%.2g",THIS->doc->getPDFVersion());
++ snprintf(ctx,16*sizeof(char),"%.2g", version);
+ GB.ReturnNewZeroString(ctx);
+ GB.Free(POINTER(&ctx));
+
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 4e2daa606904..c4649a361481 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,11 +3,11 @@
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/graphics/gimp-app/Makefile,v 1.35 2009/04/09 03:24:07 mezz Exp $
+# $MCom: ports/graphics/gimp-app/Makefile,v 1.48 2009/09/23 15:44:49 kwm Exp $
#
PORTNAME= gimp-app
-DISTVERSION= 2.6.6
+DISTVERSION= 2.6.7
PORTREVISION?= 3
PORTEPOCH?= 1
CATEGORIES?= graphics gnome
@@ -132,7 +132,7 @@ USE_GNOME+= libgnomeui
.endif
.if defined(WITH_HELPBROWSER)
-LIB_DEPENDS+= webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
CONFIGURE_ARGS+= --with-webkit
PLIST_SUB+= HELPBROWSER=""
.else
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index bc2404b24b45..d1bcbd18a7f7 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-2.6.6.tar.bz2) = 23d880dd09cd62c936ed04666a53f8e4
-SHA256 (gimp-2.6.6.tar.bz2) = 53c261fa5045f4ca4b5e887a1eb394d28ebb08d108f065ef55bde33c892f0751
-SIZE (gimp-2.6.6.tar.bz2) = 16075908
+MD5 (gimp-2.6.7.tar.bz2) = 77ed86a8de9b48587efb24f2b115ad38
+SHA256 (gimp-2.6.7.tar.bz2) = a401c5fbe59e812413cb4d0b37607680089bf254056d8b5853aa79e03a6fe115
+SIZE (gimp-2.6.7.tar.bz2) = 16341756
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 3b4a4ef60482..dfba40fd50ec 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1856,6 +1856,8 @@ share/locale/km/LC_MESSAGES/gimp20-script-fu.mo
share/locale/km/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/km/LC_MESSAGES/gimp20-tips.mo
share/locale/km/LC_MESSAGES/gimp20.mo
+share/locale/kn/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/kn/LC_MESSAGES/gimp20.mo
share/locale/ko/LC_MESSAGES/gimp20-libgimp.mo
share/locale/ko/LC_MESSAGES/gimp20-python.mo
share/locale/ko/LC_MESSAGES/gimp20-script-fu.mo
@@ -1877,6 +1879,12 @@ share/locale/mk/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/mk/LC_MESSAGES/gimp20-tips.mo
share/locale/mk/LC_MESSAGES/gimp20.mo
share/locale/ml/LC_MESSAGES/gimp20.mo
+share/locale/mr/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/mr/LC_MESSAGES/gimp20-python.mo
+share/locale/mr/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/mr/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/mr/LC_MESSAGES/gimp20-tips.mo
+share/locale/mr/LC_MESSAGES/gimp20.mo
share/locale/ms/LC_MESSAGES/gimp20-libgimp.mo
share/locale/ms/LC_MESSAGES/gimp20-python.mo
share/locale/ms/LC_MESSAGES/gimp20-script-fu.mo
@@ -1912,6 +1920,9 @@ share/locale/oc/LC_MESSAGES/gimp20-python.mo
share/locale/oc/LC_MESSAGES/gimp20-script-fu.mo
share/locale/oc/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/oc/LC_MESSAGES/gimp20.mo
+share/locale/or/LC_MESSAGES/gimp20-python.mo
+share/locale/or/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/or/LC_MESSAGES/gimp20.mo
share/locale/pa/LC_MESSAGES/gimp20-libgimp.mo
share/locale/pa/LC_MESSAGES/gimp20-python.mo
share/locale/pa/LC_MESSAGES/gimp20-script-fu.mo
@@ -1954,6 +1965,7 @@ share/locale/rw/LC_MESSAGES/gimp20-script-fu.mo
share/locale/rw/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/rw/LC_MESSAGES/gimp20-tips.mo
share/locale/rw/LC_MESSAGES/gimp20.mo
+share/locale/si/LC_MESSAGES/gimp20.mo
share/locale/sk/LC_MESSAGES/gimp20-libgimp.mo
share/locale/sk/LC_MESSAGES/gimp20-python.mo
share/locale/sk/LC_MESSAGES/gimp20-script-fu.mo
@@ -2088,10 +2100,14 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
@dirrmtry share/locale/tt
@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/km/LC_MESSAGES
@dirrmtry share/locale/km
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 219a73d5d2e2..2b4e67790b12 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -3,11 +3,11 @@
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/gimp/Makefile,v 1.3 2007/12/02 18:43:48 ahze Exp $
+# $MCom: ports/graphics/gimp/Makefile,v 1.16 2009/08/25 00:05:58 marcus Exp $
#
PORTNAME= gimp
-DISTVERSION?= 2.6.6
+DISTVERSION?= 2.6.7
PORTREVISION?= 0
PORTEPOCH?= 2
CATEGORIES= graphics gnome
diff --git a/graphics/gir-repository-goocanvas/Makefile b/graphics/gir-repository-goocanvas/Makefile
new file mode 100644
index 000000000000..27c8c023565d
--- /dev/null
+++ b/graphics/gir-repository-goocanvas/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-goocanvas
+# Date created: 12 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/gir-repository-goocanvas/Makefile,v 1.1 2009/09/16 02:05:11 avl Exp $
+#
+
+CATEGORIES= graphics
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -goocanvas
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/graphics/gir-repository-poppler/Makefile b/graphics/gir-repository-poppler/Makefile
new file mode 100644
index 000000000000..6e5ae914b846
--- /dev/null
+++ b/graphics/gir-repository-poppler/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-poppler
+# Date created: 07 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/gir-repository-poppler/Makefile,v 1.1 2009/09/16 02:05:11 avl Exp $
+#
+
+CATEGORIES= graphics
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -poppler
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index e1cc2c565461..829239635e16 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= inkscape
-PORTVERSION= 0.46
-PORTREVISION= 6
+PORTVERSION= 0.47
CATEGORIES= graphics gnome
MASTER_SITES= SF
@@ -20,6 +19,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
gc.1:${PORTSDIR}/devel/boehm-gc \
gtkspell.0:${PORTSDIR}/textproc/gtkspell \
lcms.1:${PORTSDIR}/graphics/lcms \
+ wpg-0.1.1:${PORTSDIR}/graphics/libwpg \
Magick++.2:${PORTSDIR}/graphics/ImageMagick
RUN_DEPENDS= ${SITE_PERL}/XML/XQL.pm:${PORTSDIR}/textproc/p5-XML-XQL
@@ -52,7 +52,7 @@ CONFIGURE_ARGS+= --without-gnome-vfs
LIB_DEPENDS+= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk
CONFIGURE_ARGS+= --enable-poppler-cairo
.else
-CONFIGURE_ARGS+= --disable-poppler-cairo
+CONFIGURE_ARGS+= --enable-poppler-cairo=no
.endif
post-patch:
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 8c4a0083cce5..1ac697e42100 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,3 +1,3 @@
-MD5 (inkscape-0.46.tar.bz2) = 59997096c3640b2601c2b4afba8a3d75
-SHA256 (inkscape-0.46.tar.bz2) = f2ea624b98544b9d780bae1b5f042eae97bbd2779c7779ba21390b7bf6a9ca8e
-SIZE (inkscape-0.46.tar.bz2) = 13368645
+MD5 (inkscape-0.47.tar.bz2) = 7b497c8f673e40b05295a29f6e2111f4
+SHA256 (inkscape-0.47.tar.bz2) = 4985bc5bf1938d818fee31c72151a2d889300c0be00fab5dc94ccd84df39ef3a
+SIZE (inkscape-0.47.tar.bz2) = 20742550
diff --git a/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp b/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp
index c23c83ed53eb..82eb4bc8f8c2 100644
--- a/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp
+++ b/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp
@@ -1,164 +1,89 @@
---- src/extension/internal/pdfinput/pdf-parser.cpp 2008/03/29 09:49:50 18077
-+++ src/extension/internal/pdfinput/pdf-parser.cpp 2008/06/12 18:14:25 18894
-@@ -2191,6 +2191,151 @@
+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2009-11-26 03:14:38.000000000 +0100
++++ src/extension/internal/pdfinput/pdf-parser.cpp 2009-11-26 03:14:47.000000000 +0100
+@@ -809,7 +809,7 @@ void PdfParser::opSetExtGState(Object ar
+ blendingColorSpace = NULL;
+ isolated = knockout = gFalse;
+ if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
+- blendingColorSpace = GfxColorSpace::parse(&obj5);
++ blendingColorSpace = GfxColorSpace::parse(&obj5,(Gfx*)this);
+ }
+ obj5.free();
+ if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
+@@ -1009,9 +1009,9 @@ void PdfParser::opSetFillColorSpace(Obje
+ state->setFillPattern(NULL);
+ res->lookupColorSpace(args[0].getName(), &obj);
+ if (obj.isNull()) {
+- colorSpace = GfxColorSpace::parse(&args[0]);
++ colorSpace = GfxColorSpace::parse(&args[0],(Gfx*)this);
+ } else {
+- colorSpace = GfxColorSpace::parse(&obj);
++ colorSpace = GfxColorSpace::parse(&obj,(Gfx*)this);
}
- }
+ obj.free();
+ if (colorSpace) {
+@@ -1032,9 +1032,9 @@ void PdfParser::opSetStrokeColorSpace(Ob
+ state->setStrokePattern(NULL);
+ res->lookupColorSpace(args[0].getName(), &obj);
+ if (obj.isNull()) {
+- colorSpace = GfxColorSpace::parse(&args[0]);
++ colorSpace = GfxColorSpace::parse(&args[0],(Gfx*)this);
+ } else {
+- colorSpace = GfxColorSpace::parse(&obj);
++ colorSpace = GfxColorSpace::parse(&obj,(Gfx*)this);
+ }
+ obj.free();
+ if (colorSpace) {
+@@ -1101,7 +1101,7 @@ void PdfParser::opSetFillColorN(Object a
+ builder->updateStyle(state);
+ }
+ if (args[numArgs-1].isName() &&
+- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
++ (pattern = res->lookupPattern(args[numArgs-1].getName(),(Gfx*)this))) {
+ state->setFillPattern(pattern);
+ builder->updateStyle(state);
+ }
+@@ -1145,7 +1145,7 @@ void PdfParser::opSetStrokeColorN(Object
+ builder->updateStyle(state);
+ }
+ if (args[numArgs-1].isName() &&
+- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
++ (pattern = res->lookupPattern(args[numArgs-1].getName(),(Gfx*)this))) {
+ state->setStrokePattern(pattern);
+ builder->updateStyle(state);
+ }
+@@ -1543,7 +1543,7 @@ void PdfParser::opShFill(Object args[],
+ double *matrix = NULL;
+ GBool savedState = gFalse;
-+
-+#if 1
-+
-+/**
-+ * This is for the change to GfxFont's getNextChar() call.
-+ * Thanks to tsdgeos for the fix.
-+ * Miklos, does this look ok?
-+ */
-+
-+void PdfParser::doShowText(GooString *s) {
-+ GfxFont *font;
-+ int wMode;
-+ double riseX, riseY;
-+ CharCode code;
-+ Unicode *u = NULL;
-+ double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, lineX, lineY;
-+ double originX, originY, tOriginX, tOriginY;
-+ double oldCTM[6], newCTM[6];
-+ double *mat;
-+ Object charProc;
-+ Dict *resDict;
-+ Parser *oldParser;
-+ char *p;
-+ int len, n, uLen, nChars, nSpaces, i;
-+
-+ font = state->getFont();
-+ wMode = font->getWMode();
-+
-+ builder->beginString(state, s);
-+
-+ // handle a Type 3 char
-+ if (font->getType() == fontType3 && 0) {//out->interpretType3Chars()) {
-+ mat = state->getCTM();
-+ for (i = 0; i < 6; ++i) {
-+ oldCTM[i] = mat[i];
-+ }
-+ mat = state->getTextMat();
-+ newCTM[0] = mat[0] * oldCTM[0] + mat[1] * oldCTM[2];
-+ newCTM[1] = mat[0] * oldCTM[1] + mat[1] * oldCTM[3];
-+ newCTM[2] = mat[2] * oldCTM[0] + mat[3] * oldCTM[2];
-+ newCTM[3] = mat[2] * oldCTM[1] + mat[3] * oldCTM[3];
-+ mat = font->getFontMatrix();
-+ newCTM[0] = mat[0] * newCTM[0] + mat[1] * newCTM[2];
-+ newCTM[1] = mat[0] * newCTM[1] + mat[1] * newCTM[3];
-+ newCTM[2] = mat[2] * newCTM[0] + mat[3] * newCTM[2];
-+ newCTM[3] = mat[2] * newCTM[1] + mat[3] * newCTM[3];
-+ newCTM[0] *= state->getFontSize();
-+ newCTM[1] *= state->getFontSize();
-+ newCTM[2] *= state->getFontSize();
-+ newCTM[3] *= state->getFontSize();
-+ newCTM[0] *= state->getHorizScaling();
-+ newCTM[2] *= state->getHorizScaling();
-+ state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
-+ curX = state->getCurX();
-+ curY = state->getCurY();
-+ lineX = state->getLineX();
-+ lineY = state->getLineY();
-+ oldParser = parser;
-+ p = s->getCString();
-+ len = s->getLength();
-+ while (len > 0) {
-+ n = font->getNextChar(p, len, &code,
-+ &u, &uLen,
-+ &dx, &dy, &originX, &originY);
-+ dx = dx * state->getFontSize() + state->getCharSpace();
-+ if (n == 1 && *p == ' ') {
-+ dx += state->getWordSpace();
-+ }
-+ dx *= state->getHorizScaling();
-+ dy *= state->getFontSize();
-+ state->textTransformDelta(dx, dy, &tdx, &tdy);
-+ state->transform(curX + riseX, curY + riseY, &x, &y);
-+ saveState();
-+ state->setCTM(newCTM[0], newCTM[1], newCTM[2], newCTM[3], x, y);
-+ //~ the CTM concat values here are wrong (but never used)
-+ //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
-+ if (0){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
-+ code, u, uLen)) {*/
-+ ((Gfx8BitFont *)font)->getCharProc(code, &charProc);
-+ if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
-+ pushResources(resDict);
-+ }
-+ if (charProc.isStream()) {
-+ //parse(&charProc, gFalse); // TODO: parse into SVG font
-+ } else {
-+ error(getPos(), "Missing or bad Type3 CharProc entry");
-+ }
-+ //out->endType3Char(state);
-+ if (resDict) {
-+ popResources();
-+ }
-+ charProc.free();
-+ }
-+ restoreState();
-+ // GfxState::restore() does *not* restore the current position,
-+ // so we deal with it here using (curX, curY) and (lineX, lineY)
-+ curX += tdx;
-+ curY += tdy;
-+ state->moveTo(curX, curY);
-+ state->textSetPos(lineX, lineY);
-+ p += n;
-+ len -= n;
-+ }
-+ parser = oldParser;
-+
-+ } else {
-+ state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
-+ p = s->getCString();
-+ len = s->getLength();
-+ while (len > 0) {
-+ n = font->getNextChar(p, len, &code,
-+ &u, &uLen,
-+ &dx, &dy, &originX, &originY);
-+
-+ if (wMode) {
-+ dx *= state->getFontSize();
-+ dy = dy * state->getFontSize() + state->getCharSpace();
-+ if (n == 1 && *p == ' ') {
-+ dy += state->getWordSpace();
-+ }
-+ } else {
-+ dx = dx * state->getFontSize() + state->getCharSpace();
-+ if (n == 1 && *p == ' ') {
-+ dx += state->getWordSpace();
-+ }
-+ dx *= state->getHorizScaling();
-+ dy *= state->getFontSize();
-+ }
-+ state->textTransformDelta(dx, dy, &tdx, &tdy);
-+ originX *= state->getFontSize();
-+ originY *= state->getFontSize();
-+ state->textTransformDelta(originX, originY, &tOriginX, &tOriginY);
-+ builder->addChar(state, state->getCurX() + riseX, state->getCurY() + riseY,
-+ dx, dy, tOriginX, tOriginY, code, n, u, uLen);
-+ state->shift(tdx, tdy);
-+ p += n;
-+ len -= n;
-+ }
-+ }
-+
-+ builder->endString(state);
-+}
-+
-+#else /* !POPPLER_NEW_GFXFONT */
-+
- void PdfParser::doShowText(GooString *s) {
- GfxFont *font;
- int wMode;
-@@ -2325,6 +2470,9 @@
- builder->endString(state);
- }
+- if (!(shading = res->lookupShading(args[0].getName()))) {
++ if (!(shading = res->lookupShading(args[0].getName(),(Gfx*)this))) {
+ return;
+ }
-+#endif /* POPPLER_NEW_GFXFONT */
-+
-+
- //------------------------------------------------------------------------
- // XObject operators
- //------------------------------------------------------------------------
+@@ -2507,7 +2655,7 @@ void PdfParser::doImage(Object *ref, Str
+ }
+ }
+ if (!obj1.isNull()) {
+- colorSpace = GfxColorSpace::parse(&obj1);
++ colorSpace = GfxColorSpace::parse(&obj1,(Gfx*)this);
+ } else if (csMode == streamCSDeviceGray) {
+ colorSpace = new GfxDeviceGrayColorSpace();
+ } else if (csMode == streamCSDeviceRGB) {
+@@ -2592,7 +2740,7 @@ void PdfParser::doImage(Object *ref, Str
+ obj2.free();
+ }
+ }
+- maskColorSpace = GfxColorSpace::parse(&obj1);
++ maskColorSpace = GfxColorSpace::parse(&obj1,(Gfx*)this);
+ obj1.free();
+ if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
+ goto err1;
+@@ -2767,7 +2915,7 @@ void PdfParser::doForm(Object *str) {
+ if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
+ transpGroup = gTrue;
+ if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
+- blendingColorSpace = GfxColorSpace::parse(&obj3);
++ blendingColorSpace = GfxColorSpace::parse(&obj3,(Gfx*)this);
+ }
+ obj3.free();
+ if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
diff --git a/graphics/inkscape/pkg-plist b/graphics/inkscape/pkg-plist
index c5f974c76901..2f5925c0d7e5 100644
--- a/graphics/inkscape/pkg-plist
+++ b/graphics/inkscape/pkg-plist
@@ -14,6 +14,7 @@ share/applications/inkscape.desktop
%%DATADIR%%/examples/car.svgz
%%DATADIR%%/examples/data_uri.svg
%%DATADIR%%/examples/eastern-motive-P4G.svg
+%%DATADIR%%/examples/filters.svg
%%DATADIR%%/examples/flow-go.svg
%%DATADIR%%/examples/flowsample.svg
%%DATADIR%%/examples/gallardo.svgz
@@ -23,17 +24,20 @@ share/applications/inkscape.desktop
%%DATADIR%%/examples/i18n.svg
%%DATADIR%%/examples/istest.pov
%%DATADIR%%/examples/l-systems.svgz
-%%DATADIR%%/examples/lighting_effects.svg
+%%DATADIR%%/examples/lighting_filters.svg
%%DATADIR%%/examples/live-path-effects-curvestitch.svg
%%DATADIR%%/examples/live-path-effects-gears.svg
%%DATADIR%%/examples/live-path-effects-pathalongpath.svg
%%DATADIR%%/examples/markers.svg
+%%DATADIR%%/examples/replace-hue.svg
%%DATADIR%%/examples/rope-3D.svg
%%DATADIR%%/examples/stars.svgz
+%%DATADIR%%/examples/svgfont.svg
%%DATADIR%%/examples/tesselation-P3.svg
%%DATADIR%%/examples/text-on-path.svg
%%DATADIR%%/examples/tiger.svgz
-%%DATADIR%%/examples/turbulence_effects.svg
+%%DATADIR%%/examples/tref.svg
+%%DATADIR%%/examples/turbulence_filters.svg
%%DATADIR%%/extensions/Barcode/Base.py
%%DATADIR%%/extensions/Barcode/Code128.py
%%DATADIR%%/extensions/Barcode/Code39.py
@@ -45,17 +49,119 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/Barcode/UPCA.py
%%DATADIR%%/extensions/Barcode/UPCE.py
%%DATADIR%%/extensions/Barcode/__init__.py
+%%DATADIR%%/extensions/Inkscape.pm
+%%DATADIR%%/extensions/Poly3DObjects/cube.obj
+%%DATADIR%%/extensions/Poly3DObjects/cuboct.obj
+%%DATADIR%%/extensions/Poly3DObjects/dodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/great_dodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/great_rhombicosidodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/great_rhombicuboct.obj
+%%DATADIR%%/extensions/Poly3DObjects/great_stel_dodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/icos.obj
+%%DATADIR%%/extensions/Poly3DObjects/icosidodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/jessens_orthog_icos.obj
+%%DATADIR%%/extensions/Poly3DObjects/methane.obj
+%%DATADIR%%/extensions/Poly3DObjects/oct.obj
+%%DATADIR%%/extensions/Poly3DObjects/rh_axes.obj
+%%DATADIR%%/extensions/Poly3DObjects/rhomb_dodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/rhomb_triacont.obj
+%%DATADIR%%/extensions/Poly3DObjects/small_rhombicosidodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/small_rhombicuboct.obj
+%%DATADIR%%/extensions/Poly3DObjects/small_triam_icos.obj
+%%DATADIR%%/extensions/Poly3DObjects/snub_cube.obj
+%%DATADIR%%/extensions/Poly3DObjects/snub_dodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/szilassi.obj
+%%DATADIR%%/extensions/Poly3DObjects/tet.obj
+%%DATADIR%%/extensions/Poly3DObjects/trunc_cube.obj
+%%DATADIR%%/extensions/Poly3DObjects/trunc_dodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/trunc_icos.obj
+%%DATADIR%%/extensions/Poly3DObjects/trunc_oct.obj
+%%DATADIR%%/extensions/Poly3DObjects/trunc_tet.obj
%%DATADIR%%/extensions/SpSVG.pm
%%DATADIR%%/extensions/addnodes.inx
%%DATADIR%%/extensions/addnodes.py
%%DATADIR%%/extensions/ai_input.inx
-%%DATADIR%%/extensions/ai_output.inx
%%DATADIR%%/extensions/aisvg.inx
%%DATADIR%%/extensions/aisvg.xslt
+%%DATADIR%%/extensions/alphabet_soup/2.svg
+%%DATADIR%%/extensions/alphabet_soup/3.svg
+%%DATADIR%%/extensions/alphabet_soup/6.svg
+%%DATADIR%%/extensions/alphabet_soup/7.svg
+%%DATADIR%%/extensions/alphabet_soup/Cblob.svg
+%%DATADIR%%/extensions/alphabet_soup/Chook.svg
+%%DATADIR%%/extensions/alphabet_soup/Ctail.svg
+%%DATADIR%%/extensions/alphabet_soup/Delta.svg
+%%DATADIR%%/extensions/alphabet_soup/Eb.svg
+%%DATADIR%%/extensions/alphabet_soup/Eserif.svg
+%%DATADIR%%/extensions/alphabet_soup/Et.svg
+%%DATADIR%%/extensions/alphabet_soup/G.svg
+%%DATADIR%%/extensions/alphabet_soup/IBSerif.svg
+%%DATADIR%%/extensions/alphabet_soup/ITSerif.svg
+%%DATADIR%%/extensions/alphabet_soup/Lb.svg
+%%DATADIR%%/extensions/alphabet_soup/Lt.svg
+%%DATADIR%%/extensions/alphabet_soup/Ocross.svg
+%%DATADIR%%/extensions/alphabet_soup/Oterm.svg
+%%DATADIR%%/extensions/alphabet_soup/P.svg
+%%DATADIR%%/extensions/alphabet_soup/Q.svg
+%%DATADIR%%/extensions/alphabet_soup/Rblock.svg
+%%DATADIR%%/extensions/alphabet_soup/Tb.svg
+%%DATADIR%%/extensions/alphabet_soup/Tt.svg
+%%DATADIR%%/extensions/alphabet_soup/U.svg
+%%DATADIR%%/extensions/alphabet_soup/Vser.svg
+%%DATADIR%%/extensions/alphabet_soup/Xh.svg
+%%DATADIR%%/extensions/alphabet_soup/Xne.svg
+%%DATADIR%%/extensions/alphabet_soup/Xnw.svg
+%%DATADIR%%/extensions/alphabet_soup/Xvb.svg
+%%DATADIR%%/extensions/alphabet_soup/Xvt.svg
+%%DATADIR%%/extensions/alphabet_soup/a.svg
+%%DATADIR%%/extensions/alphabet_soup/abase.svg
+%%DATADIR%%/extensions/alphabet_soup/acap.svg
+%%DATADIR%%/extensions/alphabet_soup/b.svg
+%%DATADIR%%/extensions/alphabet_soup/bar.svg
+%%DATADIR%%/extensions/alphabet_soup/bar2.svg
+%%DATADIR%%/extensions/alphabet_soup/barcap.svg
+%%DATADIR%%/extensions/alphabet_soup/c.svg
+%%DATADIR%%/extensions/alphabet_soup/cross.svg
+%%DATADIR%%/extensions/alphabet_soup/cserif.svg
+%%DATADIR%%/extensions/alphabet_soup/e.svg
+%%DATADIR%%/extensions/alphabet_soup/epsilon.svg
+%%DATADIR%%/extensions/alphabet_soup/f.svg
+%%DATADIR%%/extensions/alphabet_soup/gamma.svg
+%%DATADIR%%/extensions/alphabet_soup/h.svg
+%%DATADIR%%/extensions/alphabet_soup/h2.svg
+%%DATADIR%%/extensions/alphabet_soup/hcap.svg
+%%DATADIR%%/extensions/alphabet_soup/idot.svg
+%%DATADIR%%/extensions/alphabet_soup/j.svg
+%%DATADIR%%/extensions/alphabet_soup/k.svg
+%%DATADIR%%/extensions/alphabet_soup/l.svg
+%%DATADIR%%/extensions/alphabet_soup/lserif.svg
+%%DATADIR%%/extensions/alphabet_soup/m.svg
+%%DATADIR%%/extensions/alphabet_soup/mcap.svg
+%%DATADIR%%/extensions/alphabet_soup/n.svg
+%%DATADIR%%/extensions/alphabet_soup/o.svg
+%%DATADIR%%/extensions/alphabet_soup/ocap.svg
+%%DATADIR%%/extensions/alphabet_soup/question.svg
+%%DATADIR%%/extensions/alphabet_soup/r.svg
+%%DATADIR%%/extensions/alphabet_soup/rcap.svg
+%%DATADIR%%/extensions/alphabet_soup/s.svg
+%%DATADIR%%/extensions/alphabet_soup/serif.svg
+%%DATADIR%%/extensions/alphabet_soup/t.svg
+%%DATADIR%%/extensions/alphabet_soup/tserif.svg
+%%DATADIR%%/extensions/alphabet_soup/v.svg
+%%DATADIR%%/extensions/alphabet_soup/vcap.svg
+%%DATADIR%%/extensions/alphabet_soup/vserl.svg
+%%DATADIR%%/extensions/alphabet_soup/vserr.svg
+%%DATADIR%%/extensions/alphabet_soup/x.svg
+%%DATADIR%%/extensions/alphabet_soup/y.svg
+%%DATADIR%%/extensions/alphabet_soup/yogh.svg
+%%DATADIR%%/extensions/alphabet_soup/z.svg
%%DATADIR%%/extensions/bezmisc.py
-%%DATADIR%%/extensions/cdr2svg.sh
+%%DATADIR%%/extensions/ccx_input.inx
%%DATADIR%%/extensions/cdr_input.inx
+%%DATADIR%%/extensions/cdt_input.inx
+%%DATADIR%%/extensions/cgm_input.inx
%%DATADIR%%/extensions/chardataeffect.py
+%%DATADIR%%/extensions/cmx_input.inx
%%DATADIR%%/extensions/color_brighter.inx
%%DATADIR%%/extensions/color_brighter.py
%%DATADIR%%/extensions/color_custom.inx
@@ -94,6 +200,8 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/color_rgbbarrel.py
%%DATADIR%%/extensions/coloreffect.py
%%DATADIR%%/extensions/colors.xml
+%%DATADIR%%/extensions/convert2dashes.inx
+%%DATADIR%%/extensions/convert2dashes.py
%%DATADIR%%/extensions/cspsubdiv.py
%%DATADIR%%/extensions/cubicsuperpath.py
%%DATADIR%%/extensions/dia.inx
@@ -102,28 +210,35 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/dimension.py
%%DATADIR%%/extensions/dots.inx
%%DATADIR%%/extensions/dots.py
+%%DATADIR%%/extensions/draw_from_triangle.inx
+%%DATADIR%%/extensions/draw_from_triangle.py
%%DATADIR%%/extensions/dxf_input.inx
+%%DATADIR%%/extensions/dxf_input.py
%%DATADIR%%/extensions/dxf_outlines.inx
%%DATADIR%%/extensions/dxf_outlines.py
%%DATADIR%%/extensions/dxf_output.inx
+%%DATADIR%%/extensions/dxf_templates.py
%%DATADIR%%/extensions/edge3d.inx
%%DATADIR%%/extensions/edge3d.py
%%DATADIR%%/extensions/embed_raster_in_svg.pl
%%DATADIR%%/extensions/embedimage.inx
%%DATADIR%%/extensions/embedimage.py
%%DATADIR%%/extensions/eps_input.inx
-%%DATADIR%%/extensions/epsi_output.inx
%%DATADIR%%/extensions/eqtexsvg.inx
%%DATADIR%%/extensions/eqtexsvg.py
%%DATADIR%%/extensions/export_gimp_palette.inx
%%DATADIR%%/extensions/export_gimp_palette.py
%%DATADIR%%/extensions/extractimage.inx
%%DATADIR%%/extensions/extractimage.py
+%%DATADIR%%/extensions/extrude.inx
+%%DATADIR%%/extensions/extrude.py
%%DATADIR%%/extensions/ffgeom.py
-%%DATADIR%%/extensions/fig2svg.sh
+%%DATADIR%%/extensions/fig2dev-ext.py
%%DATADIR%%/extensions/fig_input.inx
%%DATADIR%%/extensions/flatten.inx
%%DATADIR%%/extensions/flatten.py
+%%DATADIR%%/extensions/foldablebox.inx
+%%DATADIR%%/extensions/foldablebox.py
%%DATADIR%%/extensions/fractalize.inx
%%DATADIR%%/extensions/fractalize.py
%%DATADIR%%/extensions/funcplot.inx
@@ -132,12 +247,18 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/gears.py
%%DATADIR%%/extensions/gimp_xcf.inx
%%DATADIR%%/extensions/gimp_xcf.py
+%%DATADIR%%/extensions/grid_cartesian.inx
+%%DATADIR%%/extensions/grid_cartesian.py
+%%DATADIR%%/extensions/grid_polar.inx
+%%DATADIR%%/extensions/grid_polar.py
+%%DATADIR%%/extensions/guides_creator.inx
+%%DATADIR%%/extensions/guides_creator.py
%%DATADIR%%/extensions/handles.inx
%%DATADIR%%/extensions/handles.py
+%%DATADIR%%/extensions/hpgl_output.inx
+%%DATADIR%%/extensions/hpgl_output.py
%%DATADIR%%/extensions/ill2svg.pl
%%DATADIR%%/extensions/inkex.py
-%%DATADIR%%/extensions/inkscape-shadow-white.sh
-%%DATADIR%%/extensions/inkscape-shadow.sh
%%DATADIR%%/extensions/inkscape_help_askaquestion.inx
%%DATADIR%%/extensions/inkscape_help_commandline.inx
%%DATADIR%%/extensions/inkscape_help_faq.inx
@@ -146,8 +267,13 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/inkscape_help_relnotes.inx
%%DATADIR%%/extensions/inkscape_help_reportabug.inx
%%DATADIR%%/extensions/inkscape_help_svgspec.inx
+%%DATADIR%%/extensions/inkweb.js
+%%DATADIR%%/extensions/inkwebeffect.py
%%DATADIR%%/extensions/interp.inx
%%DATADIR%%/extensions/interp.py
+%%DATADIR%%/extensions/interp_att_g.inx
+%%DATADIR%%/extensions/interp_att_g.py
+%%DATADIR%%/extensions/launch_webbrowser.py
%%DATADIR%%/extensions/lindenmayer.inx
%%DATADIR%%/extensions/lindenmayer.py
%%DATADIR%%/extensions/lorem_ipsum.inx
@@ -160,35 +286,52 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/motion.py
%%DATADIR%%/extensions/outline2svg.inx
%%DATADIR%%/extensions/outline2svg.pl
+%%DATADIR%%/extensions/param_curves.inx
+%%DATADIR%%/extensions/param_curves.py
%%DATADIR%%/extensions/pathalongpath.inx
%%DATADIR%%/extensions/pathalongpath.py
%%DATADIR%%/extensions/pathmodifier.py
-%%DATADIR%%/extensions/pdf_output.inx.txt
-%%DATADIR%%/extensions/pdf_output_via_gs_on_win32.inx.txt
+%%DATADIR%%/extensions/pathscatter.inx
+%%DATADIR%%/extensions/pathscatter.py
%%DATADIR%%/extensions/perfectboundcover.inx
%%DATADIR%%/extensions/perfectboundcover.py
%%DATADIR%%/extensions/perspective.inx
%%DATADIR%%/extensions/perspective.py
+%%DATADIR%%/extensions/plt_input.inx
+%%DATADIR%%/extensions/plt_output.inx
+%%DATADIR%%/extensions/plt_output.py
+%%DATADIR%%/extensions/polyhedron_3d.inx
+%%DATADIR%%/extensions/polyhedron_3d.py
+%%DATADIR%%/extensions/printing-marks.inx
+%%DATADIR%%/extensions/printing-marks.py
%%DATADIR%%/extensions/ps2dxf.sh
-%%DATADIR%%/extensions/ps2epsi.sh
-%%DATADIR%%/extensions/ps2pdf.cmd
-%%DATADIR%%/extensions/ps2pdf.sh
+%%DATADIR%%/extensions/ps2pdf-ext.py
%%DATADIR%%/extensions/ps_input.inx
%%DATADIR%%/extensions/pturtle.py
%%DATADIR%%/extensions/radiusrand.inx
%%DATADIR%%/extensions/radiusrand.py
-%%DATADIR%%/extensions/randompnt.inx
-%%DATADIR%%/extensions/randompos.inx
+%%DATADIR%%/extensions/render_alphabetsoup.inx
+%%DATADIR%%/extensions/render_alphabetsoup.py
+%%DATADIR%%/extensions/render_alphabetsoup_config.py
%%DATADIR%%/extensions/render_barcode.inx
%%DATADIR%%/extensions/render_barcode.py
+%%DATADIR%%/extensions/restack.inx
+%%DATADIR%%/extensions/restack.py
%%DATADIR%%/extensions/rtree.inx
%%DATADIR%%/extensions/rtree.py
%%DATADIR%%/extensions/rubberstretch.inx
%%DATADIR%%/extensions/rubberstretch.py
+%%DATADIR%%/extensions/run_command.py
+%%DATADIR%%/extensions/scour.inkscape.py
+%%DATADIR%%/extensions/scour.inx
+%%DATADIR%%/extensions/scour.py
%%DATADIR%%/extensions/simplepath.py
%%DATADIR%%/extensions/simplepath.rb
%%DATADIR%%/extensions/simplestyle.py
%%DATADIR%%/extensions/simpletransform.py
+%%DATADIR%%/extensions/sk1_input.inx
+%%DATADIR%%/extensions/sk1_output.inx
+%%DATADIR%%/extensions/sk1_output.py
%%DATADIR%%/extensions/sk2svg.sh
%%DATADIR%%/extensions/sk_input.inx
%%DATADIR%%/extensions/spirograph.inx
@@ -201,8 +344,11 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/svg2xaml.xsl
%%DATADIR%%/extensions/svg_and_media_zip_output.inx
%%DATADIR%%/extensions/svg_and_media_zip_output.py
-%%DATADIR%%/extensions/svgz_input.inx
-%%DATADIR%%/extensions/svgz_output.inx
+%%DATADIR%%/extensions/svg_regex.py
+%%DATADIR%%/extensions/svgcalendar.inx
+%%DATADIR%%/extensions/svgcalendar.py
+%%DATADIR%%/extensions/text_braille.inx
+%%DATADIR%%/extensions/text_braille.py
%%DATADIR%%/extensions/text_flipcase.inx
%%DATADIR%%/extensions/text_flipcase.py
%%DATADIR%%/extensions/text_lowercase.inx
@@ -217,19 +363,21 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/text_titlecase.py
%%DATADIR%%/extensions/text_uppercase.inx
%%DATADIR%%/extensions/text_uppercase.py
+%%DATADIR%%/extensions/triangle.inx
+%%DATADIR%%/extensions/triangle.py
%%DATADIR%%/extensions/txt2svg.inx
%%DATADIR%%/extensions/txt2svg.pl
-%%DATADIR%%/extensions/webbrowser_askaquestion.py
-%%DATADIR%%/extensions/webbrowser_commandline.py
-%%DATADIR%%/extensions/webbrowser_faq.py
-%%DATADIR%%/extensions/webbrowser_keys.py
-%%DATADIR%%/extensions/webbrowser_manual.py
-%%DATADIR%%/extensions/webbrowser_relnotes.py
-%%DATADIR%%/extensions/webbrowser_reportabug.py
-%%DATADIR%%/extensions/webbrowser_svgspec.py
+%%DATADIR%%/extensions/uniconv-ext.py
+%%DATADIR%%/extensions/uniconv_output.py
+%%DATADIR%%/extensions/web-set-att.inx
+%%DATADIR%%/extensions/web-set-att.py
+%%DATADIR%%/extensions/web-transmit-att.inx
+%%DATADIR%%/extensions/web-transmit-att.py
%%DATADIR%%/extensions/whirl.inx
%%DATADIR%%/extensions/whirl.py
%%DATADIR%%/extensions/wmf_input.inx
+%%DATADIR%%/extensions/wmf_output.inx
+%%DATADIR%%/extensions/wmf_output.py
%%DATADIR%%/extensions/xaml2svg.inx
%%DATADIR%%/extensions/xaml2svg.xsl
%%DATADIR%%/extensions/xaml2svg/Makefile.am
@@ -240,10 +388,13 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/xaml2svg/properties.xsl
%%DATADIR%%/extensions/xaml2svg/shapes.xsl
%%DATADIR%%/extensions/xaml2svg/transform.xsl
+%%DATADIR%%/extensions/yocto_css.py
+%%DATADIR%%/filters/README
+%%DATADIR%%/filters/filters.svg
+%%DATADIR%%/filters/filters.svg.h
%%DATADIR%%/fonts/README
%%DATADIR%%/gradients/README
-%%DATADIR%%/icons/README.icon_themes
-%%DATADIR%%/icons/README.legacy_icons
+%%DATADIR%%/icons/README
%%DATADIR%%/icons/feBlend-icon.png
%%DATADIR%%/icons/feBlend-icon.svg
%%DATADIR%%/icons/feColorMatrix-icon.png
@@ -276,7 +427,8 @@ share/applications/inkscape.desktop
%%DATADIR%%/icons/inkscape.file.png
%%DATADIR%%/icons/inkscape.file.svg
%%DATADIR%%/icons/inkscape.svg
-%%DATADIR%%/icons/legacy_icons.svg
+%%DATADIR%%/icons/remove-color.png
+%%DATADIR%%/icons/remove-color.svg
%%DATADIR%%/icons/tango_icons.svg
%%DATADIR%%/icons/ticotico.jpg
%%DATADIR%%/keys/acd-canvas.xml
@@ -296,12 +448,14 @@ share/applications/inkscape.desktop
%%DATADIR%%/palettes/Hilite.gpl
%%DATADIR%%/palettes/Khaki.gpl
%%DATADIR%%/palettes/LaTeX-Beamer.gpl
+%%DATADIR%%/palettes/MATLAB-Jet-72.gpl
%%DATADIR%%/palettes/README
%%DATADIR%%/palettes/Reds.gpl
%%DATADIR%%/palettes/Royal.gpl
%%DATADIR%%/palettes/Tango-Palette.gpl
%%DATADIR%%/palettes/Topographic.gpl
%%DATADIR%%/palettes/Ubuntu.gpl
+%%DATADIR%%/palettes/echo-palette.gpl
%%DATADIR%%/palettes/inkscape.gpl
%%DATADIR%%/palettes/svg.gpl
%%DATADIR%%/palettes/webhex.gpl
@@ -309,16 +463,29 @@ share/applications/inkscape.desktop
%%DATADIR%%/palettes/windowsXP.gpl
%%DATADIR%%/patterns/README
%%DATADIR%%/patterns/patterns.svg
+%%DATADIR%%/patterns/patterns.svg.h
+%%DATADIR%%/screens/about.be.svg
%%DATADIR%%/screens/about.bg.svg
%%DATADIR%%/screens/about.br.svg
+%%DATADIR%%/screens/about.ca.svg
+%%DATADIR%%/screens/about.cs.svg
+%%DATADIR%%/screens/about.de.svg
+%%DATADIR%%/screens/about.es.svg
+%%DATADIR%%/screens/about.eu.svg
+%%DATADIR%%/screens/about.fi.svg
+%%DATADIR%%/screens/about.fr.svg
%%DATADIR%%/screens/about.gl.svg
+%%DATADIR%%/screens/about.hu.svg
%%DATADIR%%/screens/about.it.svg
+%%DATADIR%%/screens/about.nl.svg
+%%DATADIR%%/screens/about.pl.svg
%%DATADIR%%/screens/about.pt_BR.svg
%%DATADIR%%/screens/about.ru.svg
%%DATADIR%%/screens/about.sk.svg
%%DATADIR%%/screens/about.sl.svg
%%DATADIR%%/screens/about.sr.svg
%%DATADIR%%/screens/about.sr@latin.svg
+%%DATADIR%%/screens/about.uk.svg
%%DATADIR%%/screens/about.svg
%%DATADIR%%/templates/A4.svg
%%DATADIR%%/templates/A4_landscape.svg
@@ -334,6 +501,7 @@ share/applications/inkscape.desktop
%%DATADIR%%/templates/black_opaque.svg
%%DATADIR%%/templates/business_card_85x54mm.svg
%%DATADIR%%/templates/business_card_90x50mm.svg
+%%DATADIR%%/templates/default.be.svg
%%DATADIR%%/templates/default.ca.svg
%%DATADIR%%/templates/default.cs.svg
%%DATADIR%%/templates/default.de.svg
@@ -344,7 +512,9 @@ share/applications/inkscape.desktop
%%DATADIR%%/templates/default.fr.svg
%%DATADIR%%/templates/default.hu.svg
%%DATADIR%%/templates/default.it.svg
+%%DATADIR%%/templates/default.ja.svg
%%DATADIR%%/templates/default.lt.svg
+%%DATADIR%%/templates/default.nl.svg
%%DATADIR%%/templates/default.pl.svg
%%DATADIR%%/templates/default.pt_BR.svg
%%DATADIR%%/templates/default.sk.svg
@@ -369,20 +539,37 @@ share/applications/inkscape.desktop
%%DATADIR%%/templates/web_banner_728x90.svg
%%DATADIR%%/templates/white_opaque.svg
%%DATADIR%%/tutorials/README
+%%DATADIR%%/tutorials/edge3d.svg
%%DATADIR%%/tutorials/gpl-2.svg
%%DATADIR%%/tutorials/making_markers.svg
%%DATADIR%%/tutorials/oldguitar.jpg
+%%DATADIR%%/tutorials/potrace-ca.png
%%DATADIR%%/tutorials/potrace-de.png
+%%DATADIR%%/tutorials/potrace-en.png
+%%DATADIR%%/tutorials/potrace-es.png
+%%DATADIR%%/tutorials/potrace-eu.png
%%DATADIR%%/tutorials/potrace-fr.png
+%%DATADIR%%/tutorials/potrace-hu.png
+%%DATADIR%%/tutorials/potrace-ja.png
+%%DATADIR%%/tutorials/potrace-pl.png
+%%DATADIR%%/tutorials/potrace-pt_BR.png
%%DATADIR%%/tutorials/potrace-ru.png
+%%DATADIR%%/tutorials/potrace-sk.png
+%%DATADIR%%/tutorials/potrace-sl.png
+%%DATADIR%%/tutorials/potrace-vi.png
+%%DATADIR%%/tutorials/potrace-zh_CN.png
+%%DATADIR%%/tutorials/potrace-zh_TW.png
%%DATADIR%%/tutorials/potrace.png
%%DATADIR%%/tutorials/tutorial-advanced.ca.svg
%%DATADIR%%/tutorials/tutorial-advanced.cs.svg
%%DATADIR%%/tutorials/tutorial-advanced.de.svg
%%DATADIR%%/tutorials/tutorial-advanced.es.svg
+%%DATADIR%%/tutorials/tutorial-advanced.eu.svg
%%DATADIR%%/tutorials/tutorial-advanced.fr.svg
+%%DATADIR%%/tutorials/tutorial-advanced.hu.svg
%%DATADIR%%/tutorials/tutorial-advanced.it.svg
%%DATADIR%%/tutorials/tutorial-advanced.ja.svg
+%%DATADIR%%/tutorials/tutorial-advanced.pl.svg
%%DATADIR%%/tutorials/tutorial-advanced.pt_BR.svg
%%DATADIR%%/tutorials/tutorial-advanced.ru.svg
%%DATADIR%%/tutorials/tutorial-advanced.sk.svg
@@ -390,16 +577,22 @@ share/applications/inkscape.desktop
%%DATADIR%%/tutorials/tutorial-advanced.svg
%%DATADIR%%/tutorials/tutorial-advanced.vi.svg
%%DATADIR%%/tutorials/tutorial-advanced.zh_CN.svg
+%%DATADIR%%/tutorials/tutorial-advanced.zh_TW.svg
%%DATADIR%%/tutorials/tutorial-basic.bg.svg
%%DATADIR%%/tutorials/tutorial-basic.ca.svg
%%DATADIR%%/tutorials/tutorial-basic.cs.svg
%%DATADIR%%/tutorials/tutorial-basic.da.svg
%%DATADIR%%/tutorials/tutorial-basic.de.svg
+%%DATADIR%%/tutorials/tutorial-basic.eo.svg
%%DATADIR%%/tutorials/tutorial-basic.es.svg
+%%DATADIR%%/tutorials/tutorial-basic.eu.svg
%%DATADIR%%/tutorials/tutorial-basic.fr.svg
+%%DATADIR%%/tutorials/tutorial-basic.hu.svg
%%DATADIR%%/tutorials/tutorial-basic.it.svg
%%DATADIR%%/tutorials/tutorial-basic.ja.svg
+%%DATADIR%%/tutorials/tutorial-basic.nl.svg
%%DATADIR%%/tutorials/tutorial-basic.nn.svg
+%%DATADIR%%/tutorials/tutorial-basic.pl.svg
%%DATADIR%%/tutorials/tutorial-basic.pt_BR.svg
%%DATADIR%%/tutorials/tutorial-basic.ru.svg
%%DATADIR%%/tutorials/tutorial-basic.sk.svg
@@ -408,31 +601,54 @@ share/applications/inkscape.desktop
%%DATADIR%%/tutorials/tutorial-basic.tr.svg
%%DATADIR%%/tutorials/tutorial-basic.vi.svg
%%DATADIR%%/tutorials/tutorial-basic.zh_CN.svg
+%%DATADIR%%/tutorials/tutorial-basic.zh_TW.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.ca.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.cs.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.de.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.es.svg
+%%DATADIR%%/tutorials/tutorial-calligraphy.eu.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.fr.svg
+%%DATADIR%%/tutorials/tutorial-calligraphy.hu.svg
+%%DATADIR%%/tutorials/tutorial-calligraphy.ja.svg
+%%DATADIR%%/tutorials/tutorial-calligraphy.pl.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.pt_BR.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.ru.svg
+%%DATADIR%%/tutorials/tutorial-calligraphy.sk.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.sl.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.vi.svg
+%%DATADIR%%/tutorials/tutorial-calligraphy.zh_TW.svg
%%DATADIR%%/tutorials/tutorial-elements.ca.svg
%%DATADIR%%/tutorials/tutorial-elements.de.svg
%%DATADIR%%/tutorials/tutorial-elements.es.svg
+%%DATADIR%%/tutorials/tutorial-elements.eu.svg
%%DATADIR%%/tutorials/tutorial-elements.fr.svg
+%%DATADIR%%/tutorials/tutorial-elements.hu.svg
+%%DATADIR%%/tutorials/tutorial-elements.ja.svg
+%%DATADIR%%/tutorials/tutorial-elements.pl.svg
%%DATADIR%%/tutorials/tutorial-elements.pt_BR.svg
%%DATADIR%%/tutorials/tutorial-elements.ru.svg
+%%DATADIR%%/tutorials/tutorial-elements.sk.svg
%%DATADIR%%/tutorials/tutorial-elements.sl.svg
%%DATADIR%%/tutorials/tutorial-elements.svg
+%%DATADIR%%/tutorials/tutorial-elements.zh_TW.svg
+%%DATADIR%%/tutorials/tutorial-interpolate.de.svg
+%%DATADIR%%/tutorials/tutorial-interpolate.fr.svg
+%%DATADIR%%/tutorials/tutorial-interpolate.hu.svg
+%%DATADIR%%/tutorials/tutorial-interpolate.pl.svg
+%%DATADIR%%/tutorials/tutorial-interpolate.sl.svg
+%%DATADIR%%/tutorials/tutorial-interpolate.svg
+%%DATADIR%%/tutorials/tutorial-interpolate.vi.svg
%%DATADIR%%/tutorials/tutorial-shapes.ca.svg
%%DATADIR%%/tutorials/tutorial-shapes.cs.svg
%%DATADIR%%/tutorials/tutorial-shapes.de.svg
%%DATADIR%%/tutorials/tutorial-shapes.es.svg
+%%DATADIR%%/tutorials/tutorial-shapes.eu.svg
%%DATADIR%%/tutorials/tutorial-shapes.fr.svg
+%%DATADIR%%/tutorials/tutorial-shapes.hu.svg
%%DATADIR%%/tutorials/tutorial-shapes.it.svg
%%DATADIR%%/tutorials/tutorial-shapes.ja.svg
+%%DATADIR%%/tutorials/tutorial-shapes.pl.svg
%%DATADIR%%/tutorials/tutorial-shapes.pt_BR.svg
%%DATADIR%%/tutorials/tutorial-shapes.ru.svg
%%DATADIR%%/tutorials/tutorial-shapes.sk.svg
@@ -440,25 +656,38 @@ share/applications/inkscape.desktop
%%DATADIR%%/tutorials/tutorial-shapes.svg
%%DATADIR%%/tutorials/tutorial-shapes.vi.svg
%%DATADIR%%/tutorials/tutorial-shapes.zh_CN.svg
+%%DATADIR%%/tutorials/tutorial-shapes.zh_TW.svg
%%DATADIR%%/tutorials/tutorial-tips.ca.svg
%%DATADIR%%/tutorials/tutorial-tips.de.svg
%%DATADIR%%/tutorials/tutorial-tips.es.svg
+%%DATADIR%%/tutorials/tutorial-tips.eu.svg
%%DATADIR%%/tutorials/tutorial-tips.fr.svg
+%%DATADIR%%/tutorials/tutorial-tips.hu.svg
%%DATADIR%%/tutorials/tutorial-tips.it.svg
+%%DATADIR%%/tutorials/tutorial-tips.ja.svg
+%%DATADIR%%/tutorials/tutorial-tips.pl.svg
%%DATADIR%%/tutorials/tutorial-tips.pt_BR.svg
%%DATADIR%%/tutorials/tutorial-tips.ru.svg
%%DATADIR%%/tutorials/tutorial-tips.sk.svg
%%DATADIR%%/tutorials/tutorial-tips.sl.svg
%%DATADIR%%/tutorials/tutorial-tips.svg
+%%DATADIR%%/tutorials/tutorial-tips.vi.svg
+%%DATADIR%%/tutorials/tutorial-tips.zh_TW.svg
%%DATADIR%%/tutorials/tutorial-tracing.ca.svg
%%DATADIR%%/tutorials/tutorial-tracing.de.svg
%%DATADIR%%/tutorials/tutorial-tracing.es.svg
+%%DATADIR%%/tutorials/tutorial-tracing.eu.svg
%%DATADIR%%/tutorials/tutorial-tracing.fr.svg
+%%DATADIR%%/tutorials/tutorial-tracing.hu.svg
+%%DATADIR%%/tutorials/tutorial-tracing.ja.svg
+%%DATADIR%%/tutorials/tutorial-tracing.pl.svg
%%DATADIR%%/tutorials/tutorial-tracing.pt_BR.svg
%%DATADIR%%/tutorials/tutorial-tracing.ru.svg
+%%DATADIR%%/tutorials/tutorial-tracing.sk.svg
%%DATADIR%%/tutorials/tutorial-tracing.sl.svg
%%DATADIR%%/tutorials/tutorial-tracing.svg
%%DATADIR%%/tutorials/tutorial-tracing.vi.svg
+%%DATADIR%%/tutorials/tutorial-tracing.zh_TW.svg
%%DATADIR%%/tutorials/tux.png
%%DATADIR%%/ui/keybindings.rc
%%DATADIR%%/ui/menus-bars.xml
@@ -495,6 +724,7 @@ share/locale/gl/LC_MESSAGES/inkscape.mo
share/locale/he/LC_MESSAGES/inkscape.mo
share/locale/hr/LC_MESSAGES/inkscape.mo
share/locale/hu/LC_MESSAGES/inkscape.mo
+share/locale/hy/LC_MESSAGES/inkscape.mo
share/locale/id/LC_MESSAGES/inkscape.mo
share/locale/it/LC_MESSAGES/inkscape.mo
share/locale/ja/LC_MESSAGES/inkscape.mo
@@ -538,7 +768,10 @@ share/pixmaps/inkscape.png
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%/gradients
@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%/filters
@dirrm %%DATADIR%%/extensions/xaml2svg
+@dirrm %%DATADIR%%/extensions/alphabet_soup
+@dirrm %%DATADIR%%/extensions/Poly3DObjects
@dirrm %%DATADIR%%/extensions/Barcode
@dirrm %%DATADIR%%/extensions
@dirrm %%DATADIR%%/examples
@@ -555,6 +788,8 @@ share/pixmaps/inkscape.png
@dirrmtry share/locale/rw
@dirrmtry share/locale/km/LC_MESSAGES
@dirrmtry share/locale/km
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
@dirrmtry share/locale/en_US@piglatin/LC_MESSAGES
@dirrmtry share/locale/en_US@piglatin
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
new file mode 100644
index 000000000000..a0b786e28fc4
--- /dev/null
+++ b/graphics/libchamplain/Makefile
@@ -0,0 +1,56 @@
+# New ports collection makefile for: libchamplain
+# Date Created: 04 Aug 2009
+# Whom: Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/libchamplain/Makefile,v 1.11 2009/10/27 11:50:35 kwm Exp $
+#
+
+PORTNAME= libchamplain
+PORTVERSION= 0.4.2
+CATEGORIES= graphics
+MASTER_SITES= GNOME
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= A C library aimed to provide a Gtk+ widget to display rasterized maps and markers
+
+BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \
+ clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \
+ soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup
+
+USE_BZIP2= yes
+USE_GNOME= pkgconfig gtk20 gnomehack ltverhack:1
+USE_AUTOTOOLS= libtool:22
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+# python bindings and mono need to be ported to clutter 1.0 first.
+# And clutter 1.0 versions of py-clutter and clutter-sharp need to
+# get released upstream too.
+CONFIGURE_ARGS+=--enable-managed=no
+
+PLIST_SUB= VERSION=${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+
+.if !defined(WITHOUT_PYTHON)
+USE_PYTHON= yes
+PYCLUTTER_GTK= ${LOCALBASE}/libdata/pkgconfig/pyclutter-gtk-0.9.pc
+BUILD_DEPENDS+= ${PYCLUTTER_GTK}:${PORTSDIR}/graphics/py-clutter-gtk
+RUN_DEPENDS+= ${PYCLUTTER_GTK}:${PORTSDIR}/graphics/py-clutter-gtk
+CONFIGURE_ARGS+= --enable-python=yes
+PLIST_SUB+= PYTHON=""
+.else
+CONFIGURE_ARGS+= --enable-python=no
+PLIST_SUB+= PYTHON="@comment "
+.endif
+
+.pre-everything:
+ @${ECHO_CMD} ""
+ @${ECHO_CMD} "Specify WITHOUT_PYTHON=yes to disable python bindings"
+ @${ECHO_CMD} ""
+
+.include <bsd.port.mk>
diff --git a/graphics/libchamplain/distinfo b/graphics/libchamplain/distinfo
new file mode 100644
index 000000000000..0dc58e456827
--- /dev/null
+++ b/graphics/libchamplain/distinfo
@@ -0,0 +1,3 @@
+MD5 (libchamplain-0.4.2.tar.bz2) = 20bd6c479ba4ba17d413a689d82923d9
+SHA256 (libchamplain-0.4.2.tar.bz2) = 2b1f8fc49e306a3a6da3ef3fea8630c76cecdffbfa53c251e7e15af8f4b8d77f
+SIZE (libchamplain-0.4.2.tar.bz2) = 519743
diff --git a/graphics/libchamplain/pkg-descr b/graphics/libchamplain/pkg-descr
new file mode 100644
index 000000000000..c93152a7d963
--- /dev/null
+++ b/graphics/libchamplain/pkg-descr
@@ -0,0 +1,10 @@
+Libchamplain is a C library providing a ClutterActor to display maps. It also
+provides a Gtk+ widget to display maps in Gtk+ applications. Mono, Python and
+Perl bindings are available.
+
+It supports numerous free map sources such as OpenStreetMap [1],
+OpenAerialMap [2] and Maps for free [3].
+[1] http://www.openstreetmap.org/ [2] http://www.openaerialmap.org/
+[3] http://www.maps-for-free.com/
+
+WWW: http://projects.gnome.org/libchamplain/
diff --git a/graphics/libchamplain/pkg-plist b/graphics/libchamplain/pkg-plist
new file mode 100644
index 000000000000..1ecbf217c6b7
--- /dev/null
+++ b/graphics/libchamplain/pkg-plist
@@ -0,0 +1,93 @@
+include/libchamplain-%%VERSION%%/champlain/champlain-base-marker.h
+include/libchamplain-%%VERSION%%/champlain/champlain-cache.h
+include/libchamplain-%%VERSION%%/champlain/champlain-defines.h
+include/libchamplain-%%VERSION%%/champlain/champlain-enum-types.h
+include/libchamplain-%%VERSION%%/champlain/champlain-layer.h
+include/libchamplain-%%VERSION%%/champlain/champlain-map-source-desc.h
+include/libchamplain-%%VERSION%%/champlain/champlain-map-source-factory.h
+include/libchamplain-%%VERSION%%/champlain/champlain-map-source.h
+include/libchamplain-%%VERSION%%/champlain/champlain-marker.h
+include/libchamplain-%%VERSION%%/champlain/champlain-network-map-source.h
+include/libchamplain-%%VERSION%%/champlain/champlain-point.h
+include/libchamplain-%%VERSION%%/champlain/champlain-polygon.h
+include/libchamplain-%%VERSION%%/champlain/champlain-selection-layer.h
+include/libchamplain-%%VERSION%%/champlain/champlain-tile.h
+include/libchamplain-%%VERSION%%/champlain/champlain-version.h
+include/libchamplain-%%VERSION%%/champlain/champlain-view.h
+include/libchamplain-%%VERSION%%/champlain/champlain-zoom-level.h
+include/libchamplain-%%VERSION%%/champlain/champlain.h
+include/libchamplain-gtk-%%VERSION%%/champlain-gtk/champlain-gtk.h
+include/libchamplain-gtk-%%VERSION%%/champlain-gtk/gtk-champlain-embed.h
+lib/girepository-1.0/Champlain-%%VERSION%%.typelib
+lib/girepository-1.0/GtkChamplain-%%VERSION%%.typelib
+lib/libchamplain-%%VERSION%%.a
+lib/libchamplain-%%VERSION%%.la
+lib/libchamplain-%%VERSION%%.so
+lib/libchamplain-%%VERSION%%.so.1
+lib/libchamplain-gtk-%%VERSION%%.a
+lib/libchamplain-gtk-%%VERSION%%.la
+lib/libchamplain-gtk-%%VERSION%%.so
+lib/libchamplain-gtk-%%VERSION%%.so.1
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/champlain.a
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/champlain.la
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/champlain.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/champlaingtk.a
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/champlaingtk.la
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/champlaingtk.so
+libdata/pkgconfig/champlain-%%VERSION%%.pc
+libdata/pkgconfig/champlain-gtk-%%VERSION%%.pc
+share/gir-1.0/Champlain-%%VERSION%%.gir
+share/gir-1.0/GtkChamplain-%%VERSION%%.gir
+share/gtk-doc/html/libchamplain-gtk/GtkChamplainEmbed.html
+share/gtk-doc/html/libchamplain-gtk/ch01.html
+share/gtk-doc/html/libchamplain-gtk/home.png
+share/gtk-doc/html/libchamplain-gtk/index.html
+share/gtk-doc/html/libchamplain-gtk/index.sgml
+share/gtk-doc/html/libchamplain-gtk/left.png
+share/gtk-doc/html/libchamplain-gtk/libchamplain-gtk.devhelp
+share/gtk-doc/html/libchamplain-gtk/libchamplain-gtk.devhelp2
+share/gtk-doc/html/libchamplain-gtk/right.png
+share/gtk-doc/html/libchamplain-gtk/style.css
+share/gtk-doc/html/libchamplain-gtk/up.png
+share/gtk-doc/html/libchamplain/ChamplainBaseMarker.html
+share/gtk-doc/html/libchamplain/ChamplainCache.html
+share/gtk-doc/html/libchamplain/ChamplainLayer.html
+share/gtk-doc/html/libchamplain/ChamplainMapSource.html
+share/gtk-doc/html/libchamplain/ChamplainMapSourceFactory.html
+share/gtk-doc/html/libchamplain/ChamplainMarker.html
+share/gtk-doc/html/libchamplain/ChamplainNetworkMapSource.html
+share/gtk-doc/html/libchamplain/ChamplainPolygon.html
+share/gtk-doc/html/libchamplain/ChamplainSelectionLayer.html
+share/gtk-doc/html/libchamplain/ChamplainTile.html
+share/gtk-doc/html/libchamplain/ChamplainView.html
+share/gtk-doc/html/libchamplain/ch01.html
+share/gtk-doc/html/libchamplain/ch02.html
+share/gtk-doc/html/libchamplain/ch03.html
+share/gtk-doc/html/libchamplain/home.png
+share/gtk-doc/html/libchamplain/index.html
+share/gtk-doc/html/libchamplain/index.sgml
+share/gtk-doc/html/libchamplain/ix01.html
+share/gtk-doc/html/libchamplain/ix02.html
+share/gtk-doc/html/libchamplain/ix03.html
+share/gtk-doc/html/libchamplain/ix04.html
+share/gtk-doc/html/libchamplain/ix05.html
+share/gtk-doc/html/libchamplain/ix06.html
+share/gtk-doc/html/libchamplain/ix07.html
+share/gtk-doc/html/libchamplain/ix08.html
+share/gtk-doc/html/libchamplain/left.png
+share/gtk-doc/html/libchamplain/libchamplain-Champlain.html
+share/gtk-doc/html/libchamplain/libchamplain-ChamplainPoint.html
+share/gtk-doc/html/libchamplain/libchamplain-ChamplainVersion.html
+share/gtk-doc/html/libchamplain/libchamplain.devhelp
+share/gtk-doc/html/libchamplain/libchamplain.devhelp2
+share/gtk-doc/html/libchamplain/right.png
+share/gtk-doc/html/libchamplain/style.css
+share/gtk-doc/html/libchamplain/up.png
+@dirrm share/gtk-doc/html/libchamplain
+@dirrm share/gtk-doc/html/libchamplain-gtk
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
+@dirrm include/libchamplain-gtk-%%VERSION%%/champlain-gtk
+@dirrm include/libchamplain-gtk-%%VERSION%%
+@dirrm include/libchamplain-%%VERSION%%/champlain
+@dirrm include/libchamplain-%%VERSION%%
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index e911912734ba..a5e5611a34f7 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,7 +3,7 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/librsvg2/Makefile,v 1.5 2009/04/20 05:55:53 marcus Exp $
+# $MCom: ports/graphics/librsvg2/Makefile,v 1.128 2009/11/28 05:59:01 mezz Exp $
#
PORTNAME= librsvg2
@@ -47,10 +47,8 @@ OPTIONS= MOZILLA_PLUGIN "Enable the SVG browser plug-in" on
.if defined(WITH_MOZILLA_PLUGIN)
USE_GECKO= libxul seamonkey
-USE_WEBPLUGINS= gecko*
+USE_WEBPLUGINS= gecko19
WEBPLUGINS_FILES=libmozsvgdec.so
-.include "${PORTSDIR}/Mk/bsd.gecko.mk"
-.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
CONFIGURE_ENV+= MOZILLA_CONFIG=no
CONFIGURE_ARGS+=--enable-mozilla-plugin=yes
@@ -63,7 +61,7 @@ PLIST_SUB+= PLUGIN="@comment "
post-patch:
.if defined(WITH_MOZILLA_PLUGIN)
-.if ${GECKO:Mlibxul}==""
+.if "${GECKO:Mlibxul}"
@${REINPLACE_CMD} -e 's|mozilla-plugin|${GECKO}-plugin|g' \
${WRKSRC}/configure
.endif
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index d9864d6a9457..1e0a5dcb4442 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nip2
PORTVERSION= 7.14.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
@@ -39,5 +39,7 @@ MAN1= nip2.1
post-patch:
${REINPLACE_CMD} -e 's, malkovich,,' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|n_bytes|x_n_bytes|g' -e 's|text_size|x_text_size|g' \
+ ${WRKSRC}/src/gtkitementry.c
.include <bsd.port.mk>
diff --git a/graphics/p5-clutter/Makefile b/graphics/p5-clutter/Makefile
index a5c106d1a573..9df24a3b405e 100644
--- a/graphics/p5-clutter/Makefile
+++ b/graphics/p5-clutter/Makefile
@@ -6,10 +6,9 @@
#
PORTNAME= clutter
-PORTVERSION= 0.8.2.0
-PORTREVISION= 1
+PORTVERSION= 1.0.1
CATEGORIES= graphics perl5
-MASTER_SITES= http://www.clutter-project.org/sources/clutter-perl/0.8/
+MASTER_SITES= http://www.clutter-project.org/sources/clutter-perl/${PORTVERSION:R}/
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-perl-${PORTVERSION}
@@ -18,40 +17,45 @@ COMMENT= Perl bindings to the Clutter OpenGL canvas
BUILD_DEPENDS= ${SITE_PERL}/ExtUtils/Depends.pm:${PORTSDIR}/devel/p5-ExtUtils-Depends \
p5-ExtUtils-PkgConfig>=1.03:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
- p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
- ${SITE_PERL}/${PERL_ARCH}/Cairo.pm:${PORTSDIR}/graphics/p5-Cairo \
- p5-GStreamer>=0.09:${PORTSDIR}/multimedia/p5-GStreamer
-LIB_DEPENDS= clutter-glx-0.8:${PORTSDIR}/graphics/clutter \
- clutter-gst-0.8:${PORTSDIR}/multimedia/clutter-gst \
- clutter-cairo-0.8:${PORTSDIR}/graphics/clutter-cairo \
- clutter-gtk-0.8:${PORTSDIR}/graphics/clutter-gtk
+ ${SITE_PERL}/${PERL_ARCH}/Pango.pm:${PORTSDIR}/x11-toolkits/p5-Pango \
+ ${SITE_PERL}/${PERL_ARCH}/Glib.pm:${PORTSDIR}/devel/p5-Glib2 \
+ ${SITE_PERL}/${PERL_ARCH}/Cairo.pm:${PORTSDIR}/graphics/p5-Cairo
+LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
+RUN_DEPENDS= ${SITE_PERL}/ExtUtils/Depends.pm:${PORTSDIR}/devel/p5-ExtUtils-Depends \
+ p5-ExtUtils-PkgConfig>=1.03:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
+ ${SITE_PERL}/${PERL_ARCH}/Pango.pm:${PORTSDIR}/x11-toolkits/p5-Pango \
+ ${SITE_PERL}/${PERL_ARCH}/Glib.pm:${PORTSDIR}/devel/p5-Glib2 \
+ ${SITE_PERL}/${PERL_ARCH}/Cairo.pm:${PORTSDIR}/graphics/p5-Cairo
+USE_BZIP2= yes
PERL_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/Clutter-0.820
+WRKSRC= ${WRKDIR}/${PORTNAME}-perl-${PORTVERSION}
MAN3= Clutter.3 Clutter::Actor.3 Clutter::ActorBox.3 Clutter::Alpha.3 \
- Clutter::Angle.3 Clutter::Backend.3 Clutter::Behaviour.3 \
- Clutter::Behaviour::Bspline.3 Clutter::Behaviour::Depth.3 \
- Clutter::Behaviour::Ellipse.3 Clutter::Behaviour::Opacity.3 \
- Clutter::Behaviour::Path.3 Clutter::Behaviour::Rotate.3 \
- Clutter::Behaviour::Scale.3 Clutter::ChildMeta.3 \
- Clutter::Cogl.3 Clutter::Cogl::Handle.3 \
- Clutter::Cogl::Texture.3 Clutter::Color.3 \
- Clutter::Container.3 Clutter::Container::ForeachFunc.3 \
- Clutter::Cookbook.3 Clutter::Effect.3 Clutter::Entry.3 \
- Clutter::Event.3 Clutter::Event::Button.3 Clutter::Event::Crossing.3 \
- Clutter::Event::Key.3 Clutter::Event::Motion.3 Clutter::Event::Scroll.3 \
- Clutter::Event::StageState.3 Clutter::Fixed.3 Clutter::Geometry.3 \
- Clutter::Group.3 Clutter::Gst.3 Clutter::Gst::Audio.3 \
- Clutter::Gst::VideoSink.3 Clutter::Gst::VideoTexture.3 Clutter::Gtk.3 \
- Clutter::Keysyms.3 Clutter::Knot.3 Clutter::Label.3 Clutter::ListModel.3 \
+ Clutter::Animation.3 Clutter::Backend.3 Clutter::Behaviour.3 \
+ Clutter::Behaviour::Depth.3 Clutter::Behaviour::Ellipse.3 \
+ Clutter::Behaviour::Opacity.3 Clutter::Behaviour::Path.3 \
+ Clutter::Behaviour::Rotate.3 Clutter::Behaviour::Scale.3 \
+ Clutter::BindingPool.3 Clutter::Cairo.3 Clutter::CairoTexture.3 \
+ Clutter::ChildMeta.3 Clutter::Clone.3 Clutter::Cogl.3 \
+ Clutter::Cogl::Color.3 Clutter::Cogl::Handle.3 \
+ Clutter::Cogl::Material.3 Clutter::Cogl::MaterialLayer.3 \
+ Clutter::Cogl::Matrix.3 Clutter::Cogl::Pango.3 Clutter::Cogl::Path.3 \
+ Clutter::Cogl::Program.3 Clutter::Cogl::Shader.3 \
+ Clutter::Cogl::Texture.3 Clutter::Color.3 Clutter::Container.3 \
+ Clutter::Container::ForeachFunc.3 Clutter::Cookbook.3 Clutter::Event.3 \
+ Clutter::Event::Button.3 Clutter::Event::Crossing.3 \
+ Clutter::Event::Key.3 Clutter::Event::Motion.3 \
+ Clutter::Event::Scroll.3 Clutter::Event::StageState.3 \
+ Clutter::Geometry.3 Clutter::Group.3 Clutter::Interval.3 \
+ Clutter::Keysyms.3 Clutter::Knot.3 Clutter::ListModel.3 \
Clutter::Media.3 Clutter::Model.3 Clutter::Model::Iter.3 \
- Clutter::ParamSpec.3 Clutter::Rectangle.3 Clutter::Score.3 \
- Clutter::Script.3 Clutter::Shader.3 Clutter::Stage.3 Clutter::StageManager.3 \
- Clutter::Texture.3 Clutter::Texture::Cairo.3 Clutter::Texture::Clone.3 \
- Clutter::Threads.3 Clutter::Timeline.3 Clutter::Units.3 \
- Clutter::Vertex.3 Clutter::index.3 Clutter::main.3 Clutter::version.3 \
- Gtk2::ClutterEmbed.3 Gtk2::ClutterUtil.3 Gtk2::ClutterTexture.3
+ Clutter::ParamSpec.3 Clutter::Path.3 Clutter::Path::Node.3 \
+ Clutter::Rectangle.3 Clutter::Score.3 Clutter::Script.3 \
+ Clutter::Shader.3 Clutter::Stage.3 Clutter::StageManager.3 \
+ Clutter::Text.3 Clutter::Texture.3 Clutter::Threads.3 \
+ Clutter::Timeline.3 Clutter::Units.3 Clutter::Vertex.3 \
+ Clutter::index.3 Clutter::main.3 Clutter::version.3
.include <bsd.port.mk>
diff --git a/graphics/p5-clutter/distinfo b/graphics/p5-clutter/distinfo
index 7a3fa26b878a..1f956d0171a7 100644
--- a/graphics/p5-clutter/distinfo
+++ b/graphics/p5-clutter/distinfo
@@ -1,3 +1,3 @@
-MD5 (clutter-perl-0.8.2.0.tar.gz) = e424a19e000d42b886046bd889bd39f0
-SHA256 (clutter-perl-0.8.2.0.tar.gz) = 1eff9fb0c18441690ae83533bccc44f4fa5c24e01bb572fd996a9bf7ece29be4
-SIZE (clutter-perl-0.8.2.0.tar.gz) = 90861
+MD5 (clutter-perl-1.0.1.tar.bz2) = 0dbc0d830e1290deabe52c0133ad7059
+SHA256 (clutter-perl-1.0.1.tar.bz2) = 30f23665dde4e438bb98f2bf7fa3ff927f70471c3c34c801be911dcbd9ee9368
+SIZE (clutter-perl-1.0.1.tar.bz2) = 86160
diff --git a/graphics/p5-clutter/pkg-plist b/graphics/p5-clutter/pkg-plist
index e88b97a1908b..5e9cf51c9f17 100644
--- a/graphics/p5-clutter/pkg-plist
+++ b/graphics/p5-clutter/pkg-plist
@@ -2,26 +2,35 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Actor.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/ActorBox.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Alpha.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Angle.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Animation.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Backend.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Behaviour.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Behaviour/Bspline.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Behaviour/Depth.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Behaviour/Ellipse.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Behaviour/Opacity.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Behaviour/Path.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Behaviour/Rotate.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Behaviour/Scale.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/BindingPool.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cairo.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/CairoTexture.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/ChildMeta.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Clone.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Color.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Handle.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Material.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/MaterialLayer.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Matrix.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Pango.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Path.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Program.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Shader.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Texture.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Color.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Container.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Container/ForeachFunc.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cookbook.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Effect.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Entry.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Event.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Event/Button.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Event/Crossing.pod
@@ -29,27 +38,24 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Event/Motion.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Event/Scroll.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Event/StageState.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Fixed.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Geometry.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Group.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Gst.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Gst/Audio.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Gst/VideoSink.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Gst/VideoTexture.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Gtk.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/Files.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/clutter-perl-autogen.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/clutter-perl.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/clutter-perl.typemap
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/clutter.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/clutterperl-autogen.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/clutterperl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/clutterperl.typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/doctypes
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Interval.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Keysyms.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Knot.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Label.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/ListModel.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Media.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Model.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Model/Iter.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/ParamSpec.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Path.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Path/Node.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Rectangle.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Score.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Script.pod
@@ -57,9 +63,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Stage.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/StageManager.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/TestHelper.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Text.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Texture.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Texture/Cairo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Texture/Clone.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Threads.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Timeline.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Units.pod
@@ -67,18 +72,13 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/index.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/main.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/version.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ClutterEmbed.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ClutterTexture.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ClutterUtil.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clutter/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clutter/Clutter.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clutter/Clutter.so
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Clutter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Texture
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Path/
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Model
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Gst
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Event
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Container
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl
diff --git a/graphics/poppler-data/Makefile b/graphics/poppler-data/Makefile
index b7865a0c6ae0..ee3a3e940264 100644
--- a/graphics/poppler-data/Makefile
+++ b/graphics/poppler-data/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= poppler-data
-PORTVERSION= 0.2.1
+PORTVERSION= 0.3.1
CATEGORIES= graphics
MASTER_SITES= http://poppler.freedesktop.org/
diff --git a/graphics/poppler-data/distinfo b/graphics/poppler-data/distinfo
index af3209ad57a6..3a4f70deef05 100644
--- a/graphics/poppler-data/distinfo
+++ b/graphics/poppler-data/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-data-0.2.1.tar.gz) = bca78b8786746c7b48b324283992d658
-SHA256 (poppler-data-0.2.1.tar.gz) = 890dbadf44aee07999c050fcbe0c4ea8b32fba0e8b573c439dd7de8476a1a660
-SIZE (poppler-data-0.2.1.tar.gz) = 4067562
+MD5 (poppler-data-0.3.1.tar.gz) = 1222399ddebf74482e10be815c8df035
+SHA256 (poppler-data-0.3.1.tar.gz) = b5e4c0671156e540462d0095fd0ba8302602314120e153c0246080110d9f0ff3
+SIZE (poppler-data-0.3.1.tar.gz) = 2618617
diff --git a/graphics/poppler-data/pkg-plist b/graphics/poppler-data/pkg-plist
index 7b6cf2768797..9e874e1c8a90 100644
--- a/graphics/poppler-data/pkg-plist
+++ b/graphics/poppler-data/pkg-plist
@@ -4,36 +4,20 @@ share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-2
share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-3
share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-4
share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-5
-share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-B5pc
-share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-ETenms-B5
-share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-CID
-share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-Host
-share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-Mac
-share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-UCS2
+share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-6
share/poppler/cMap/Adobe-CNS1/B5-H
share/poppler/cMap/Adobe-CNS1/B5-V
share/poppler/cMap/Adobe-CNS1/B5pc-H
-share/poppler/cMap/Adobe-CNS1/B5pc-UCS2
-share/poppler/cMap/Adobe-CNS1/B5pc-UCS2C
share/poppler/cMap/Adobe-CNS1/B5pc-V
share/poppler/cMap/Adobe-CNS1/CNS-EUC-H
share/poppler/cMap/Adobe-CNS1/CNS-EUC-V
-share/poppler/cMap/Adobe-CNS1/CNS01-RKSJ-H
-share/poppler/cMap/Adobe-CNS1/CNS02-RKSJ-H
-share/poppler/cMap/Adobe-CNS1/CNS03-RKSJ-H
-share/poppler/cMap/Adobe-CNS1/CNS04-RKSJ-H
-share/poppler/cMap/Adobe-CNS1/CNS05-RKSJ-H
-share/poppler/cMap/Adobe-CNS1/CNS06-RKSJ-H
-share/poppler/cMap/Adobe-CNS1/CNS07-RKSJ-H
share/poppler/cMap/Adobe-CNS1/CNS1-H
share/poppler/cMap/Adobe-CNS1/CNS1-V
-share/poppler/cMap/Adobe-CNS1/CNS15-RKSJ-H
share/poppler/cMap/Adobe-CNS1/CNS2-H
share/poppler/cMap/Adobe-CNS1/CNS2-V
share/poppler/cMap/Adobe-CNS1/ETHK-B5-H
share/poppler/cMap/Adobe-CNS1/ETHK-B5-V
share/poppler/cMap/Adobe-CNS1/ETen-B5-H
-share/poppler/cMap/Adobe-CNS1/ETen-B5-UCS2
share/poppler/cMap/Adobe-CNS1/ETen-B5-V
share/poppler/cMap/Adobe-CNS1/ETenms-B5-H
share/poppler/cMap/Adobe-CNS1/ETenms-B5-V
@@ -49,8 +33,6 @@ share/poppler/cMap/Adobe-CNS1/HKm471-B5-H
share/poppler/cMap/Adobe-CNS1/HKm471-B5-V
share/poppler/cMap/Adobe-CNS1/HKscs-B5-H
share/poppler/cMap/Adobe-CNS1/HKscs-B5-V
-share/poppler/cMap/Adobe-CNS1/UCS2-B5pc
-share/poppler/cMap/Adobe-CNS1/UCS2-ETen-B5
share/poppler/cMap/Adobe-CNS1/UniCNS-UCS2-H
share/poppler/cMap/Adobe-CNS1/UniCNS-UCS2-V
share/poppler/cMap/Adobe-CNS1/UniCNS-UTF16-H
@@ -65,19 +47,11 @@ share/poppler/cMap/Adobe-GB1/Adobe-GB1-2
share/poppler/cMap/Adobe-GB1/Adobe-GB1-3
share/poppler/cMap/Adobe-GB1/Adobe-GB1-4
share/poppler/cMap/Adobe-GB1/Adobe-GB1-5
-share/poppler/cMap/Adobe-GB1/Adobe-GB1-GBK-EUC
-share/poppler/cMap/Adobe-GB1/Adobe-GB1-GBpc-EUC
-share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-CID
-share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-Host
-share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-Mac
-share/poppler/cMap/Adobe-GB1/Adobe-GB1-UCS2
share/poppler/cMap/Adobe-GB1/GB-EUC-H
share/poppler/cMap/Adobe-GB1/GB-EUC-V
share/poppler/cMap/Adobe-GB1/GB-H
-share/poppler/cMap/Adobe-GB1/GB-RKSJ-H
share/poppler/cMap/Adobe-GB1/GB-V
share/poppler/cMap/Adobe-GB1/GBK-EUC-H
-share/poppler/cMap/Adobe-GB1/GBK-EUC-UCS2
share/poppler/cMap/Adobe-GB1/GBK-EUC-V
share/poppler/cMap/Adobe-GB1/GBK2K-H
share/poppler/cMap/Adobe-GB1/GBK2K-V
@@ -86,16 +60,11 @@ share/poppler/cMap/Adobe-GB1/GBKp-EUC-V
share/poppler/cMap/Adobe-GB1/GBT-EUC-H
share/poppler/cMap/Adobe-GB1/GBT-EUC-V
share/poppler/cMap/Adobe-GB1/GBT-H
-share/poppler/cMap/Adobe-GB1/GBT-RKSJ-H
share/poppler/cMap/Adobe-GB1/GBT-V
share/poppler/cMap/Adobe-GB1/GBTpc-EUC-H
share/poppler/cMap/Adobe-GB1/GBTpc-EUC-V
share/poppler/cMap/Adobe-GB1/GBpc-EUC-H
-share/poppler/cMap/Adobe-GB1/GBpc-EUC-UCS2
-share/poppler/cMap/Adobe-GB1/GBpc-EUC-UCS2C
share/poppler/cMap/Adobe-GB1/GBpc-EUC-V
-share/poppler/cMap/Adobe-GB1/UCS2-GBK-EUC
-share/poppler/cMap/Adobe-GB1/UCS2-GBpc-EUC
share/poppler/cMap/Adobe-GB1/UniGB-UCS2-H
share/poppler/cMap/Adobe-GB1/UniGB-UCS2-V
share/poppler/cMap/Adobe-GB1/UniGB-UTF16-H
@@ -104,7 +73,6 @@ share/poppler/cMap/Adobe-GB1/UniGB-UTF32-H
share/poppler/cMap/Adobe-GB1/UniGB-UTF32-V
share/poppler/cMap/Adobe-GB1/UniGB-UTF8-H
share/poppler/cMap/Adobe-GB1/UniGB-UTF8-V
-share/poppler/cMap/Adobe-HongKong1/HK-RKSJ-H
share/poppler/cMap/Adobe-Japan1/78-EUC-H
share/poppler/cMap/Adobe-Japan1/78-EUC-V
share/poppler/cMap/Adobe-Japan1/78-H
@@ -115,13 +83,10 @@ share/poppler/cMap/Adobe-Japan1/78ms-RKSJ-H
share/poppler/cMap/Adobe-Japan1/78ms-RKSJ-V
share/poppler/cMap/Adobe-Japan1/83pv-RKSJ-H
share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-H
-share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-UCS2
share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-V
share/poppler/cMap/Adobe-Japan1/90msp-RKSJ-H
share/poppler/cMap/Adobe-Japan1/90msp-RKSJ-V
share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-H
-share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-UCS2
-share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-UCS2C
share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-V
share/poppler/cMap/Adobe-Japan1/Add-H
share/poppler/cMap/Adobe-Japan1/Add-RKSJ-H
@@ -134,14 +99,6 @@ share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-3
share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-4
share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-5
share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-6
-share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-90ms-RKSJ
-share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-90pv-RKSJ
-share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-CID
-share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-Host
-share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-Mac
-share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-PS-H
-share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-PS-V
-share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-UCS2
share/poppler/cMap/Adobe-Japan1/EUC-H
share/poppler/cMap/Adobe-Japan1/EUC-V
share/poppler/cMap/Adobe-Japan1/Ext-H
@@ -154,7 +111,6 @@ share/poppler/cMap/Adobe-Japan1/Hiragana
share/poppler/cMap/Adobe-Japan1/Hojo-EUC-H
share/poppler/cMap/Adobe-Japan1/Hojo-EUC-V
share/poppler/cMap/Adobe-Japan1/Hojo-H
-share/poppler/cMap/Adobe-Japan1/Hojo-RKSJ-H
share/poppler/cMap/Adobe-Japan1/Hojo-V
share/poppler/cMap/Adobe-Japan1/Katakana
share/poppler/cMap/Adobe-Japan1/NWP-H
@@ -162,8 +118,6 @@ share/poppler/cMap/Adobe-Japan1/NWP-V
share/poppler/cMap/Adobe-Japan1/RKSJ-H
share/poppler/cMap/Adobe-Japan1/RKSJ-V
share/poppler/cMap/Adobe-Japan1/Roman
-share/poppler/cMap/Adobe-Japan1/UCS2-90ms-RKSJ
-share/poppler/cMap/Adobe-Japan1/UCS2-90pv-RKSJ
share/poppler/cMap/Adobe-Japan1/UniHojo-UCS2-H
share/poppler/cMap/Adobe-Japan1/UniHojo-UCS2-V
share/poppler/cMap/Adobe-Japan1/UniHojo-UTF16-H
@@ -201,31 +155,18 @@ share/poppler/cMap/Adobe-Japan2/Adobe-Japan2-0
share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-0
share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-1
share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-2
-share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-CID
-share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-Host
-share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-Mac
-share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-KSCms-UHC
-share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-KSCpc-EUC
-share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-UCS2
share/poppler/cMap/Adobe-Korea1/KSC-EUC-H
share/poppler/cMap/Adobe-Korea1/KSC-EUC-V
share/poppler/cMap/Adobe-Korea1/KSC-H
share/poppler/cMap/Adobe-Korea1/KSC-Johab-H
share/poppler/cMap/Adobe-Korea1/KSC-Johab-V
-share/poppler/cMap/Adobe-Korea1/KSC-RKSJ-H
share/poppler/cMap/Adobe-Korea1/KSC-V
-share/poppler/cMap/Adobe-Korea1/KSC2-RKSJ-H
share/poppler/cMap/Adobe-Korea1/KSCms-UHC-H
share/poppler/cMap/Adobe-Korea1/KSCms-UHC-HW-H
share/poppler/cMap/Adobe-Korea1/KSCms-UHC-HW-V
-share/poppler/cMap/Adobe-Korea1/KSCms-UHC-UCS2
share/poppler/cMap/Adobe-Korea1/KSCms-UHC-V
share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-H
-share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-UCS2
-share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-UCS2C
share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-V
-share/poppler/cMap/Adobe-Korea1/UCS2-KSCms-UHC
-share/poppler/cMap/Adobe-Korea1/UCS2-KSCpc-EUC
share/poppler/cMap/Adobe-Korea1/UniKS-UCS2-H
share/poppler/cMap/Adobe-Korea1/UniKS-UCS2-V
share/poppler/cMap/Adobe-Korea1/UniKS-UTF16-H
@@ -234,11 +175,9 @@ share/poppler/cMap/Adobe-Korea1/UniKS-UTF32-H
share/poppler/cMap/Adobe-Korea1/UniKS-UTF32-V
share/poppler/cMap/Adobe-Korea1/UniKS-UTF8-H
share/poppler/cMap/Adobe-Korea1/UniKS-UTF8-V
-share/poppler/cMap/Adobe-Vietnam1/TCVN-RKSJ-H
share/poppler/cidToUnicode/Adobe-CNS1
share/poppler/cidToUnicode/Adobe-GB1
share/poppler/cidToUnicode/Adobe-Japan1
-share/poppler/cidToUnicode/Adobe-Japan2
share/poppler/cidToUnicode/Adobe-Korea1
share/poppler/nameToUnicode/Bulgarian
share/poppler/nameToUnicode/Greek
@@ -263,11 +202,9 @@ share/poppler/unicodeMap/Windows-1255
@dirrm share/poppler/unicodeMap
@dirrm share/poppler/nameToUnicode
@dirrm share/poppler/cidToUnicode
-@dirrm share/poppler/cMap/Adobe-Vietnam1
@dirrm share/poppler/cMap/Adobe-Korea1
@dirrm share/poppler/cMap/Adobe-Japan2
@dirrm share/poppler/cMap/Adobe-Japan1
-@dirrm share/poppler/cMap/Adobe-HongKong1
@dirrm share/poppler/cMap/Adobe-GB1
@dirrm share/poppler/cMap/Adobe-CNS1
@dirrm share/poppler/cMap
diff --git a/graphics/poppler-gtk/Makefile b/graphics/poppler-gtk/Makefile
index 2f72a68775ea..59244c75a4ad 100644
--- a/graphics/poppler-gtk/Makefile
+++ b/graphics/poppler-gtk/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.9 2009/04/09 03:24:07 mezz Exp $
+# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.16 2009/08/02 17:54:08 marcus Exp $
#
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= -gtk
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/poppler-gtk/pkg-plist b/graphics/poppler-gtk/pkg-plist
index 84f07119b04d..6bb080493e3d 100644
--- a/graphics/poppler-gtk/pkg-plist
+++ b/graphics/poppler-gtk/pkg-plist
@@ -1,10 +1,12 @@
include/poppler/glib/poppler-action.h
include/poppler/glib/poppler-annot.h
include/poppler/glib/poppler-attachment.h
+include/poppler/glib/poppler-date.h
include/poppler/glib/poppler-document.h
include/poppler/glib/poppler-enums.h
include/poppler/glib/poppler-features.h
include/poppler/glib/poppler-form-field.h
+include/poppler/glib/poppler-layer.h
include/poppler/glib/poppler-page.h
include/poppler/glib/poppler.h
lib/libpoppler-glib.a
@@ -18,10 +20,13 @@ libdata/pkgconfig/poppler-glib.pc
%%DOCSDIR%%/poppler/index.sgml
%%DOCSDIR%%/poppler/left.png
%%DOCSDIR%%/poppler/poppler-poppler-action.html
+%%DOCSDIR%%/poppler/poppler-poppler-annot.html
%%DOCSDIR%%/poppler/poppler-poppler-attachment.html
%%DOCSDIR%%/poppler/poppler-poppler-document.html
%%DOCSDIR%%/poppler/poppler-poppler-enums.html
+%%DOCSDIR%%/poppler/poppler-poppler-features.html
%%DOCSDIR%%/poppler/poppler-poppler-form-field.html
+%%DOCSDIR%%/poppler/poppler-poppler-layer.html
%%DOCSDIR%%/poppler/poppler-poppler-page.html
%%DOCSDIR%%/poppler/poppler-poppler.html
%%DOCSDIR%%/poppler/poppler.devhelp
diff --git a/graphics/poppler-qt4/Makefile b/graphics/poppler-qt4/Makefile
index 6eb1d743ace9..c4234f6af7f0 100644
--- a/graphics/poppler-qt4/Makefile
+++ b/graphics/poppler-qt4/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.7 2009/04/07 03:27:48 marcus Exp $
+# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.11 2009/08/02 17:55:19 marcus Exp $
#
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= -qt4
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile
index fc4b9f04774f..d054ca843a9e 100644
--- a/graphics/poppler-utils/Makefile
+++ b/graphics/poppler-utils/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Nottebrock <lofi@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/poppler-utils/Makefile,v 1.1 2007/06/20 17:12:04 ahze Exp $
+# $MCom: ports/graphics/poppler-utils/Makefile,v 1.3 2009/08/27 14:48:12 kwm Exp $
#
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= -utils
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 1655ecbd0e8a..d3758582c102 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,12 +3,12 @@
# Whom: marcus@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/graphics/poppler/Makefile,v 1.44 2009/03/14 05:12:31 marcus Exp $
+# $MCom: ports/graphics/poppler/Makefile,v 1.56 2009/11/22 04:24:49 marcus Exp $
#
PORTNAME= poppler
-PORTVERSION= 0.10.6
-PORTREVISION?= 1
+PORTVERSION= 0.12.2
+PORTREVISION?= 0
CATEGORIES= graphics print
MASTER_SITES= http://poppler.freedesktop.org/
@@ -16,7 +16,8 @@ MAINTAINER?= gnome@FreeBSD.org
COMMENT?= A PDF rendering library
LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \
- fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
+ lcms.1:${PORTSDIR}/graphics/lcms
RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data
USE_GMAKE= yes
@@ -30,13 +31,14 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
.if !defined(SLAVEPORT)
-OPTIONS= CAIRO "Enable cairo output backend" on
+OPTIONS= CAIRO "Enable cairo output backend" on \
+ OPENJPEG "Enable JPEG 2000 support" on
.endif
.include <bsd.port.pre.mk>
.if defined(SLAVEPORT)
-LIB_DEPENDS+= poppler.4:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS+= poppler.5:${PORTSDIR}/graphics/poppler
.if ${SLAVEPORT}=="gtk"
CONFIGURE_ARGS+=--enable-poppler-glib
@@ -95,6 +97,13 @@ PLIST_SUB+= CAIRO="@comment "
LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo
PLIST_SUB+= CAIRO=""
.endif
+
+.if defined(WITHOUT_OPENJPEG)
+CONFIGURE_ARGS+=--disable-libopenjpeg
+.else
+CONFIGURE_ARGS+=--enable-libopenjpeg
+LIB_DEPENDS+= openjpeg.2:${PORTSDIR}/graphics/openjpeg
+.endif
.endif
post-patch:
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index 6fb5fcf40115..bb6a38c85184 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-0.10.6.tar.gz) = e1a2d98ba5a4199f20d7637a7d79a829
-SHA256 (poppler-0.10.6.tar.gz) = bcd78d674c4166af069afdb27af810c012e13cfd2b7b21f9dce63dd3f62bded1
-SIZE (poppler-0.10.6.tar.gz) = 1527715
+MD5 (poppler-0.12.2.tar.gz) = 60c00b55acf7dd389bf256d178af70bf
+SHA256 (poppler-0.12.2.tar.gz) = bebfb8c0b091f44026a0c0d61790a0490b04b3c0132f82bd0b39e861bdaf2719
+SIZE (poppler-0.12.2.tar.gz) = 1614984
diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in
index e0faea3d198e..4a621ba6eec3 100644
--- a/graphics/poppler/files/patch-utils_Makefile.in
+++ b/graphics/poppler/files/patch-utils_Makefile.in
@@ -1,13 +1,15 @@
---- 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)
+--- utils/Makefile.in.orig 2009-10-22 20:33:17.000000000 +0200
++++ utils/Makefile.in 2009-10-22 20:33:49.000000000 +0200
+@@ -64,7 +64,7 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
pdffonts_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+pdffonts_DEPENDENCIES = \
$(am__DEPENDENCIES_1)
- am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+@@ -73,19 +73,19 @@ am_pdfimages_OBJECTS = pdfimages.$(OBJEX
$(am__objects_1)
pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
pdfimages_LDADD = $(LDADD)
@@ -25,11 +27,12 @@
@BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \
@BUILD_ABIWORD_OUTPUT_TRUE@ $(am__objects_1)
pdftoabw_OBJECTS = $(am_pdftoabw_OBJECTS)
- pdftoabw_LDADD = $(LDADD)
--pdftoabw_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdftoabw_DEPENDENCIES = \
+-am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
++am__DEPENDENCIES_2 = \
$(am__DEPENDENCIES_1)
- am_pdftohtml_OBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \
+ @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_DEPENDENCIES = \
+ @BUILD_ABIWORD_OUTPUT_TRUE@ $(am__DEPENDENCIES_2) \
+@@ -94,25 +94,25 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX
HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
pdftohtml_LDADD = $(LDADD)
@@ -59,7 +62,7 @@
$(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -320,7 +320,7 @@ INCLUDES = \
+@@ -382,7 +382,7 @@ INCLUDES = \
$(ABIWORD_CFLAGS)
LDADD = \
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index 1ea3318716f2..5ccd2f4ab8da 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -20,6 +20,7 @@ include/poppler/Function.h
include/poppler/Gfx.h
include/poppler/GfxFont.h
include/poppler/GfxState.h
+include/poppler/GfxState_helpers.h
include/poppler/GlobalParams.h
include/poppler/JArithmeticDecoder.h
include/poppler/JBIG2Stream.h
@@ -39,6 +40,7 @@ include/poppler/PSTokenizer.h
include/poppler/Page.h
include/poppler/PageTransition.h
include/poppler/Parser.h
+include/poppler/PopplerCache.h
include/poppler/PreScanOutputDev.h
include/poppler/ProfileData.h
include/poppler/SecurityHandler.h
@@ -56,6 +58,11 @@ include/poppler/UnicodeMapTables.h
include/poppler/UnicodeTypeTable.h
include/poppler/XRef.h
include/poppler/XpdfPluginAPI.h
+include/poppler/fofi/FoFiBase.h
+include/poppler/fofi/FoFiEncodings.h
+include/poppler/fofi/FoFiTrueType.h
+include/poppler/fofi/FoFiType1.h
+include/poppler/fofi/FoFiType1C.h
include/poppler/goo/FixedPoint.h
include/poppler/goo/GooHash.h
include/poppler/goo/GooList.h
@@ -63,8 +70,10 @@ include/poppler/goo/GooMutex.h
include/poppler/goo/GooString.h
include/poppler/goo/GooTimer.h
include/poppler/goo/GooVector.h
+include/poppler/goo/PNGWriter.h
include/poppler/goo/gfile.h
include/poppler/goo/gmem.h
+include/poppler/goo/gstrtod.h
include/poppler/goo/gtypes.h
include/poppler/poppler-config.h
include/poppler/splash/Splash.h
@@ -93,10 +102,11 @@ include/poppler/splash/SplashXPathScanner.h
lib/libpoppler.a
lib/libpoppler.la
lib/libpoppler.so
-lib/libpoppler.so.4
+lib/libpoppler.so.5
%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
libdata/pkgconfig/poppler-splash.pc
libdata/pkgconfig/poppler.pc
@dirrm include/poppler/splash
@dirrm include/poppler/goo
+@dirrm include/poppler/fofi
@dirrm include/poppler
diff --git a/graphics/py-clutter-gtk/Makefile b/graphics/py-clutter-gtk/Makefile
new file mode 100644
index 000000000000..f39b76c4b92f
--- /dev/null
+++ b/graphics/py-clutter-gtk/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: py-clutter-gtk
+# Date created: 04 Sep 2009
+# Whom: Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/py-clutter-gtk/Makefile,v 1.1 2009/09/06 11:27:11 kwm Exp $
+#
+
+PORTNAME= clutter
+PORTVERSION= 0.9.3
+CATEGORIES= graphics
+#MASTER_SITES= http://www.clutter-project.org/sources/pyclutter/${PORTVERSION:R}/
+MASTER_SITES= LOCAL/kwm
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX= gtk
+DISTNAME= py${PORTNAME}-gtk-${PORTVERSION}
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Python modules for Clutter-gtk toolkit
+
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/__init__.py:${PORTSDIR}/devel/py-gobject \
+ ${LOCALBASE}/libdata/pkgconfig/pyclutter-1.0.pc:${PORTSDIR}/graphics/py-clutter
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/__init__.py:${PORTSDIR}/devel/py-gobject \
+ ${LOCALBASE}/libdata/pkgconfig/pyclutter-1.0.pc:${PORTSDIR}/graphics/py-clutter
+LIB_DEPENDS= clutter-gtk-0.10:${PORTSDIR}/graphics/clutter-gtk
+
+USE_GMAKE= yes
+USE_AUTOTOOLS= libtool:22
+USE_GNOME= gnomehack pygnome2 pygtk2
+USE_PYTHON= 2.5+
+CONFIGURE_ARGS= --disable-docs
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+.include <bsd.port.mk>
diff --git a/graphics/py-clutter-gtk/distinfo b/graphics/py-clutter-gtk/distinfo
new file mode 100644
index 000000000000..847fdb293e35
--- /dev/null
+++ b/graphics/py-clutter-gtk/distinfo
@@ -0,0 +1,3 @@
+MD5 (pyclutter-gtk-0.9.3.tar.gz) = bd384f40119f7af5b3ec5eb28da14855
+SHA256 (pyclutter-gtk-0.9.3.tar.gz) = 8e05bc93254f3f5b0bcbaea73f58101a7b980b574018a97f9413f2af4eb9e443
+SIZE (pyclutter-gtk-0.9.3.tar.gz) = 312307
diff --git a/graphics/py-clutter-gtk/pkg-descr b/graphics/py-clutter-gtk/pkg-descr
new file mode 100644
index 000000000000..9fdb41a52785
--- /dev/null
+++ b/graphics/py-clutter-gtk/pkg-descr
@@ -0,0 +1,3 @@
+Python bindings for clutter-gtk
+
+WWW: http://www.clutter-project.org
diff --git a/graphics/py-clutter-gtk/pkg-plist b/graphics/py-clutter-gtk/pkg-plist
new file mode 100644
index 000000000000..2db5df914615
--- /dev/null
+++ b/graphics/py-clutter-gtk/pkg-plist
@@ -0,0 +1,10 @@
+%%PYTHON_SITELIBDIR%%/cluttergtk/__init__.py
+%%PYTHON_SITELIBDIR%%/cluttergtk/__init__.pyc
+%%PYTHON_SITELIBDIR%%/cluttergtk/__init__.pyo
+%%PYTHON_SITELIBDIR%%/cluttergtk/_cluttergtk.a
+%%PYTHON_SITELIBDIR%%/cluttergtk/_cluttergtk.la
+%%PYTHON_SITELIBDIR%%/cluttergtk/_cluttergtk.so
+libdata/pkgconfig/pyclutter-gtk-0.9.pc
+share/pyclutter/1.0/defs/cluttergtk.defs
+share/pyclutter/1.0/defs/cluttergtk-types.defs
+@dirrm %%PYTHON_SITELIBDIR%%/cluttergtk
diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile
index cd825b085989..cb55e9cbf429 100644
--- a/graphics/py-clutter/Makefile
+++ b/graphics/py-clutter/Makefile
@@ -3,35 +3,31 @@
# Whom: Martin Wilke <miwi@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/graphics/py-clutter/Makefile,v 1.3 2009/09/26 13:41:59 marcus Exp $
#
PORTNAME= clutter
-PORTVERSION= 0.8.2
-PORTREVISION= 2
+PORTVERSION= 1.0.0
CATEGORIES= graphics
-MASTER_SITES= http://www.clutter-project.org/sources/pyclutter/0.8/
+MASTER_SITES= http://www.clutter-project.org/sources/pyclutter/${PORTVERSION:R}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py${PORTNAME}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Python modules for Clutter toolkit
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer \
- ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/__init__.py:${PORTSDIR}/devel/py-gobject \
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/__init__.py:${PORTSDIR}/devel/py-gobject \
${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer \
- ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/__init__.py:${PORTSDIR}/devel/py-gobject \
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/__init__.py:${PORTSDIR}/devel/py-gobject \
${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
-LIB_DEPENDS= clutter-glx-0.8:${PORTSDIR}/graphics/clutter \
- clutter-gst-0.8:${PORTSDIR}/multimedia/clutter-gst \
- clutter-cairo-0.8:${PORTSDIR}/graphics/clutter-cairo \
- clutter-gtk-0.8:${PORTSDIR}/graphics/clutter-gtk
+LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
+USE_BZIP2= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack pygnome2 pygtk2
-USE_GSTREAMER= yes
-USE_PYTHON= 2.4+
+USE_PYTHON= 2.5+
+CONFIGURE_ARGS= --disable-docs
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/graphics/py-clutter/distinfo b/graphics/py-clutter/distinfo
index 0d124af462dc..c501d34423ea 100644
--- a/graphics/py-clutter/distinfo
+++ b/graphics/py-clutter/distinfo
@@ -1,3 +1,3 @@
-MD5 (pyclutter-0.8.2.tar.gz) = 6aebbda8e69ea547dda11819ca913f85
-SHA256 (pyclutter-0.8.2.tar.gz) = d3022ddf29a1c774ba40ae31bf73d05fbb783c52f54610c9be1be3a3f06abb7a
-SIZE (pyclutter-0.8.2.tar.gz) = 552778
+MD5 (pyclutter-1.0.0.tar.bz2) = 1cfbb64eceef6828e47e9a64689ffa41
+SHA256 (pyclutter-1.0.0.tar.bz2) = 1c916bc9ab1c98803fecc23ac0276cc02e95a047aa42f7defe05dca81912b537
+SIZE (pyclutter-1.0.0.tar.bz2) = 422185
diff --git a/graphics/py-clutter/pkg-plist b/graphics/py-clutter/pkg-plist
index 983f1758303d..954ad348d3e0 100644
--- a/graphics/py-clutter/pkg-plist
+++ b/graphics/py-clutter/pkg-plist
@@ -11,32 +11,11 @@ include/pyclutter-1.0/pyclutter/pyclutter.h
%%PYTHON_SITELIBDIR%%/clutter/keysyms.py
%%PYTHON_SITELIBDIR%%/clutter/keysyms.pyc
%%PYTHON_SITELIBDIR%%/clutter/keysyms.pyo
-%%PYTHON_SITELIBDIR%%/cluttercairo/__init__.py
-%%PYTHON_SITELIBDIR%%/cluttercairo/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cluttercairo/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cluttercairo/_cluttercairo.a
-%%PYTHON_SITELIBDIR%%/cluttercairo/_cluttercairo.la
-%%PYTHON_SITELIBDIR%%/cluttercairo/_cluttercairo.so
-%%PYTHON_SITELIBDIR%%/cluttergst/__init__.py
-%%PYTHON_SITELIBDIR%%/cluttergst/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cluttergst/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cluttergst/_cluttergst.a
-%%PYTHON_SITELIBDIR%%/cluttergst/_cluttergst.la
-%%PYTHON_SITELIBDIR%%/cluttergst/_cluttergst.so
-%%PYTHON_SITELIBDIR%%/cluttergtk/__init__.py
-%%PYTHON_SITELIBDIR%%/cluttergtk/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cluttergtk/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cluttergtk/_cluttergtk.a
-%%PYTHON_SITELIBDIR%%/cluttergtk/_cluttergtk.la
-%%PYTHON_SITELIBDIR%%/cluttergtk/_cluttergtk.so
-libdata/pkgconfig/pyclutter-0.8.pc
+libdata/pkgconfig/pyclutter-1.0.pc
share/pyclutter/1.0/defs/clutter-base-types.defs
share/pyclutter/1.0/defs/clutter-base.defs
share/pyclutter/1.0/defs/clutter-types.defs
share/pyclutter/1.0/defs/clutter.defs
-share/pyclutter/1.0/defs/cluttercairo.defs
-share/pyclutter/1.0/defs/cluttergst.defs
-share/pyclutter/1.0/defs/cluttergtk.defs
share/pyclutter/1.0/defs/cogl-base-types.defs
share/pyclutter/1.0/defs/cogl-base.defs
share/pyclutter/1.0/defs/cogl-types.defs
@@ -44,9 +23,6 @@ share/pyclutter/1.0/defs/cogl.defs
@dirrm share/pyclutter/1.0/defs
@dirrm share/pyclutter/1.0
@dirrm share/pyclutter
-@dirrm %%PYTHON_SITELIBDIR%%/cluttergst
-@dirrm %%PYTHON_SITELIBDIR%%/cluttergtk
-@dirrm %%PYTHON_SITELIBDIR%%/cluttercairo
@dirrm %%PYTHON_SITELIBDIR%%/clutter
@dirrmtry %%PYTHON_SITELIBDIR%%
@dirrm include/pyclutter-1.0/pyclutter
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index 434c157cd189..a1758fd1eef3 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -3,9 +3,9 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/py-gimp/Makefile,v 1.4 2007/10/24 21:22:00 ahze Exp $
+# $MCom: ports/graphics/py-gimp/Makefile,v 1.6 2009/08/25 00:06:39 marcus Exp $
-PORTREVISION= 1
+PORTREVISION= 0
PORTEPOCH= 0
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/lang/Makefile b/lang/Makefile
index 7b25b966b9f8..8e54f6b35d1e 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -96,6 +96,7 @@
SUBDIR += gdc
SUBDIR += gforth
SUBDIR += ghc
+ SUBDIR += gjs
SUBDIR += gnat
SUBDIR += gnat-doc-html
SUBDIR += gnat-doc-info
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
new file mode 100644
index 000000000000..606e2ec70f98
--- /dev/null
+++ b/lang/gjs/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for: gjs
+# Date created: 14 Aug 2009
+# Whom: Pawel Worach <pawel.worach@gmail.com>
+#
+# $FreeBSD$
+# $MCom: ports/lang/gjs/Makefile,v 1.2 2009/08/27 16:02:10 kwm Exp $
+#
+
+PORTNAME= gjs
+PORTVERSION= 0.4
+CATEGORIES= lang gnome
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME Javascript binding
+
+BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+
+USE_GECKO= libxul
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_PYTHON= build
+USE_AUTOTOOLS= libtool:22
+USE_GNOME= gnomeprefix gnomehack intlhack glib20 ltverhack
+USE_LDCONFIG= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+post-patch:
+ ${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g' \
+ ${WRKSRC}/scripts/make-tests
+
+.include <bsd.port.mk>
diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo
new file mode 100644
index 000000000000..a3a0e979a38e
--- /dev/null
+++ b/lang/gjs/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gjs-0.4.tar.bz2) = 584594b22e433d56d660a7dda650809d
+SHA256 (gnome2/gjs-0.4.tar.bz2) = 78c3116cfb0feba08c79b4beea4b6ef16bfca3be9b59efcfa7e6eca79911aca6
+SIZE (gnome2/gjs-0.4.tar.bz2) = 401868
diff --git a/lang/gjs/pkg-descr b/lang/gjs/pkg-descr
new file mode 100644
index 000000000000..5b4871abcb68
--- /dev/null
+++ b/lang/gjs/pkg-descr
@@ -0,0 +1,3 @@
+JavaScript bindings based on gobject-introspection.
+
+WWW: http://live.gnome.org/Gjs
diff --git a/lang/gjs/pkg-plist b/lang/gjs/pkg-plist
new file mode 100644
index 000000000000..47c9e7359ffe
--- /dev/null
+++ b/lang/gjs/pkg-plist
@@ -0,0 +1,70 @@
+bin/gjs
+bin/gjs-console
+include/gjs-1.0/gjs-dbus/dbus-proxy.h
+include/gjs-1.0/gjs-dbus/dbus.h
+include/gjs-1.0/gjs/context.h
+include/gjs-1.0/gjs/gi/arg.h
+include/gjs-1.0/gjs/gi/boxed.h
+include/gjs-1.0/gjs/gi/closure.h
+include/gjs-1.0/gjs/gi/enumeration.h
+include/gjs-1.0/gjs/gi/function.h
+include/gjs-1.0/gjs/gi/keep-alive.h
+include/gjs-1.0/gjs/gi/ns.h
+include/gjs-1.0/gjs/gi/object.h
+include/gjs-1.0/gjs/gi/param.h
+include/gjs-1.0/gjs/gi/repo.h
+include/gjs-1.0/gjs/gi/union.h
+include/gjs-1.0/gjs/gi/value.h
+include/gjs-1.0/gjs/gjs.h
+include/gjs-1.0/gjs/importer.h
+include/gjs-1.0/gjs/jsapi-util.h
+include/gjs-1.0/gjs/mem.h
+include/gjs-1.0/gjs/native.h
+lib/gjs-1.0/console.a
+lib/gjs-1.0/console.la
+lib/gjs-1.0/console.so
+lib/gjs-1.0/dbusNative.a
+lib/gjs-1.0/dbusNative.la
+lib/gjs-1.0/dbusNative.so
+lib/gjs-1.0/debugger.a
+lib/gjs-1.0/debugger.la
+lib/gjs-1.0/debugger.so
+lib/gjs-1.0/gettextNative.a
+lib/gjs-1.0/gettextNative.la
+lib/gjs-1.0/gettextNative.so
+lib/gjs-1.0/gi.a
+lib/gjs-1.0/gi.la
+lib/gjs-1.0/gi.so
+lib/gjs-1.0/mainloop.a
+lib/gjs-1.0/mainloop.la
+lib/gjs-1.0/mainloop.so
+lib/libgjs-dbus.a
+lib/libgjs-dbus.la
+lib/libgjs-dbus.so
+lib/libgjs-dbus.so.0
+lib/libgjs-gi.a
+lib/libgjs-gi.la
+lib/libgjs-gi.so
+lib/libgjs-gi.so.0
+lib/libgjs.a
+lib/libgjs.la
+lib/libgjs.so
+lib/libgjs.so.0
+libdata/pkgconfig/gjs-1.0.pc
+libdata/pkgconfig/gjs-dbus-1.0.pc
+libdata/pkgconfig/gjs-gi-1.0.pc
+share/gjs-1.0/dbus.js
+share/gjs-1.0/gettext.js
+share/gjs-1.0/jsUnit.js
+share/gjs-1.0/lang.js
+share/gjs-1.0/signals.js
+share/gjs-1.0/tweener/equations.js
+share/gjs-1.0/tweener/tweenList.js
+share/gjs-1.0/tweener/tweener.js
+@dirrm share/gjs-1.0/tweener
+@dirrm share/gjs-1.0
+@dirrm lib/gjs-1.0
+@dirrm include/gjs-1.0/gjs/gi
+@dirrm include/gjs-1.0/gjs
+@dirrm include/gjs-1.0/gjs-dbus
+@dirrm include/gjs-1.0
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 1e83f7244413..b8780de86193 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/lang/vala/Makefile,v 1.23 2009/03/31 14:27:07 kwm Exp $
+# $MCom: ports/lang/vala/Makefile,v 1.29 2009/11/26 21:21:05 marcus Exp $
#
PORTNAME= vala
-PORTVERSION= 0.6.1
+PORTVERSION= 0.7.8
CATEGORIES= lang gnome
MASTER_SITES= GNOME
diff --git a/lang/vala/distinfo b/lang/vala/distinfo
index cbf419051c97..cdc36e141b1e 100644
--- a/lang/vala/distinfo
+++ b/lang/vala/distinfo
@@ -1,3 +1,3 @@
-MD5 (vala-0.6.1.tar.bz2) = 592009ea10fa35ebb6bd472bb4198654
-SHA256 (vala-0.6.1.tar.bz2) = 601a6eaa30c9bec41fd3aa470e01f4d2734a6b330ca01a2dd688bd67d517c33f
-SIZE (vala-0.6.1.tar.bz2) = 1595689
+MD5 (vala-0.7.8.tar.bz2) = accd0d350c6d6de7527a0a65c40f8be2
+SHA256 (vala-0.7.8.tar.bz2) = b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747
+SIZE (vala-0.7.8.tar.bz2) = 1949627
diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist
index 1b9041854eeb..b45e17f66c0e 100644
--- a/lang/vala/pkg-plist
+++ b/lang/vala/pkg-plist
@@ -2,235 +2,15 @@
bin/valac
%%VAPIGEN%%bin/vapicheck
%%VAPIGEN%%bin/vapigen
-include/vala-1.0/ccode/valaccodeassignment.h
-include/vala-1.0/ccode/valaccodebinaryexpression.h
-include/vala-1.0/ccode/valaccodeblock.h
-include/vala-1.0/ccode/valaccodebreakstatement.h
-include/vala-1.0/ccode/valaccodecasestatement.h
-include/vala-1.0/ccode/valaccodecastexpression.h
-include/vala-1.0/ccode/valaccodecommaexpression.h
-include/vala-1.0/ccode/valaccodecomment.h
-include/vala-1.0/ccode/valaccodeconditionalexpression.h
-include/vala-1.0/ccode/valaccodeconstant.h
-include/vala-1.0/ccode/valaccodecontinuestatement.h
-include/vala-1.0/ccode/valaccodedeclaration.h
-include/vala-1.0/ccode/valaccodedeclarator.h
-include/vala-1.0/ccode/valaccodedostatement.h
-include/vala-1.0/ccode/valaccodeelementaccess.h
-include/vala-1.0/ccode/valaccodeemptystatement.h
-include/vala-1.0/ccode/valaccodeenum.h
-include/vala-1.0/ccode/valaccodeenumvalue.h
-include/vala-1.0/ccode/valaccodeexpression.h
-include/vala-1.0/ccode/valaccodeexpressionstatement.h
-include/vala-1.0/ccode/valaccodeformalparameter.h
-include/vala-1.0/ccode/valaccodeforstatement.h
-include/vala-1.0/ccode/valaccodefragment.h
-include/vala-1.0/ccode/valaccodefunction.h
-include/vala-1.0/ccode/valaccodefunctioncall.h
-include/vala-1.0/ccode/valaccodefunctiondeclarator.h
-include/vala-1.0/ccode/valaccodegotostatement.h
-include/vala-1.0/ccode/valaccodeidentifier.h
-include/vala-1.0/ccode/valaccodeifstatement.h
-include/vala-1.0/ccode/valaccodeincludedirective.h
-include/vala-1.0/ccode/valaccodeinitializerlist.h
-include/vala-1.0/ccode/valaccodelabel.h
-include/vala-1.0/ccode/valaccodelinedirective.h
-include/vala-1.0/ccode/valaccodemacroreplacement.h
-include/vala-1.0/ccode/valaccodememberaccess.h
-include/vala-1.0/ccode/valaccodemodifiers.h
-include/vala-1.0/ccode/valaccodenewline.h
-include/vala-1.0/ccode/valaccodenode.h
-include/vala-1.0/ccode/valaccodeoncesection.h
-include/vala-1.0/ccode/valaccodeparenthesizedexpression.h
-include/vala-1.0/ccode/valaccodereturnstatement.h
-include/vala-1.0/ccode/valaccodestatement.h
-include/vala-1.0/ccode/valaccodestruct.h
-include/vala-1.0/ccode/valaccodeswitchstatement.h
-include/vala-1.0/ccode/valaccodetypedefinition.h
-include/vala-1.0/ccode/valaccodeunaryexpression.h
-include/vala-1.0/ccode/valaccodevariabledeclarator.h
-include/vala-1.0/ccode/valaccodewhilestatement.h
-include/vala-1.0/ccode/valaccodewriter.h
-include/vala-1.0/gee/arraylist.h
-include/vala-1.0/gee/collection.h
-include/vala-1.0/gee/collectionobject.h
-include/vala-1.0/gee/hashmap.h
-include/vala-1.0/gee/hashset.h
-include/vala-1.0/gee/iterable.h
-include/vala-1.0/gee/iterator.h
-include/vala-1.0/gee/list.h
-include/vala-1.0/gee/map.h
-include/vala-1.0/gee/readonlycollection.h
-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/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/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/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/valaaddressofexpression.h
-include/vala-1.0/vala/valaarraycreationexpression.h
-include/vala-1.0/vala/valaarraylengthfield.h
-include/vala-1.0/vala/valaarraymovemethod.h
-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/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/valacharacterliteral.h
-include/vala-1.0/vala/valaclass.h
-include/vala-1.0/vala/valaclasstype.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
-include/vala-1.0/vala/valacontinuestatement.h
-include/vala-1.0/vala/valacreationmethod.h
-include/vala-1.0/vala/valadatatype.h
-include/vala-1.0/vala/valadeclarationstatement.h
-include/vala-1.0/vala/valadelegate.h
-include/vala-1.0/vala/valadelegatetype.h
-include/vala-1.0/vala/valadeletestatement.h
-include/vala-1.0/vala/valadestructor.h
-include/vala-1.0/vala/valadostatement.h
-include/vala-1.0/vala/valadynamicmethod.h
-include/vala-1.0/vala/valadynamicproperty.h
-include/vala-1.0/vala/valadynamicsignal.h
-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
-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
-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/valainvalidtype.h
-include/vala-1.0/vala/valalambdaexpression.h
-include/vala-1.0/vala/valaliteral.h
-include/vala-1.0/vala/valalocalvariable.h
-include/vala-1.0/vala/valalockable.h
-include/vala-1.0/vala/valalockstatement.h
-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/valanamespace.h
-include/vala-1.0/vala/valanullchecker.h
-include/vala-1.0/vala/valanullliteral.h
-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/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
-include/vala-1.0/vala/valaproperty.h
-include/vala-1.0/vala/valapropertyaccessor.h
-include/vala-1.0/vala/valarealliteral.h
-include/vala-1.0/vala/valareferencetransferexpression.h
-include/vala-1.0/vala/valareferencetype.h
-include/vala-1.0/vala/valareport.h
-include/vala-1.0/vala/valareturnstatement.h
-include/vala-1.0/vala/valascanner.h
-include/vala-1.0/vala/valascope.h
-include/vala-1.0/vala/valasemanticanalyzer.h
-include/vala-1.0/vala/valasignal.h
-include/vala-1.0/vala/valasignaltype.h
-include/vala-1.0/vala/valasizeofexpression.h
-include/vala-1.0/vala/valasourcefile.h
-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
-include/vala-1.0/vala/valasymbol.h
-include/vala-1.0/vala/valasymbolresolver.h
-include/vala-1.0/vala/valathrowstatement.h
-include/vala-1.0/vala/valatokentype.h
-include/vala-1.0/vala/valatrystatement.h
-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/valatypesymbol.h
-include/vala-1.0/vala/valaunaryexpression.h
-include/vala-1.0/vala/valaunresolvedsymbol.h
-include/vala-1.0/vala/valaunresolvedtype.h
-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
+include/vala-1.0/vala.h
+include/vala-1.0/valaccode.h
+include/vala-1.0/valacodegen.h
+include/vala-1.0/valagee.h
lib/libvala.la
lib/libvala.so
lib/libvala.so.0
-libdata/pkgconfig/vala-1.0.pc
%%VAPIGEN%%lib/vala/gen-introspect
+libdata/pkgconfig/vala-1.0.pc
share/devhelp/books/vala/attributes.html
share/devhelp/books/vala/classes.html
share/devhelp/books/vala/default.css
@@ -247,11 +27,20 @@ share/devhelp/books/vala/statements.html
share/devhelp/books/vala/structs.html
share/devhelp/books/vala/types.html
share/devhelp/books/vala/vala.devhelp2
+%%DATADIR%%/vapi/alsa.vapi
%%DATADIR%%/vapi/atk.vapi
%%DATADIR%%/vapi/bzlib.vapi
+%%DATADIR%%/vapi/cairo-xcb.deps
+%%DATADIR%%/vapi/cairo-xcb.vapi
%%DATADIR%%/vapi/cairo.vapi
+%%DATADIR%%/vapi/clutter-1.0.deps
+%%DATADIR%%/vapi/clutter-1.0.vapi
+%%DATADIR%%/vapi/clutter-json-1.0.vapi
+%%DATADIR%%/vapi/cogl-1.0.deps
+%%DATADIR%%/vapi/cogl-1.0.vapi
%%DATADIR%%/vapi/curses.vapi
%%DATADIR%%/vapi/dbus-glib-1.vapi
+%%DATADIR%%/vapi/dconf.vapi
%%DATADIR%%/vapi/enchant.vapi
%%DATADIR%%/vapi/fuse.deps
%%DATADIR%%/vapi/fuse.vapi
@@ -265,13 +54,16 @@ share/devhelp/books/vala/vala.devhelp2
%%DATADIR%%/vapi/gio-2.0.vapi
%%DATADIR%%/vapi/gio-unix-2.0.deps
%%DATADIR%%/vapi/gio-unix-2.0.vapi
+%%DATADIR%%/vapi/gl-1.0.vapi
%%DATADIR%%/vapi/glib-2.0.vapi
%%DATADIR%%/vapi/gmodule-2.0.vapi
+%%DATADIR%%/vapi/gnet-2.0.deps
%%DATADIR%%/vapi/gnet-2.0.vapi
%%DATADIR%%/vapi/gnome-desktop-2.0.deps
%%DATADIR%%/vapi/gnome-desktop-2.0.vapi
%%DATADIR%%/vapi/gnome-keyring-1.vapi
%%DATADIR%%/vapi/gnome-vfs-2.0.vapi
+%%DATADIR%%/vapi/gnutls.vapi
%%DATADIR%%/vapi/gobject-2.0.vapi
%%DATADIR%%/vapi/goocanvas.deps
%%DATADIR%%/vapi/goocanvas.vapi
@@ -328,6 +120,10 @@ share/devhelp/books/vala/vala.devhelp2
%%DATADIR%%/vapi/libepc-1.0.vapi
%%DATADIR%%/vapi/libftdi.deps
%%DATADIR%%/vapi/libftdi.vapi
+%%DATADIR%%/vapi/libgda-4.0.deps
+%%DATADIR%%/vapi/libgda-4.0.vapi
+%%DATADIR%%/vapi/libgdata.deps
+%%DATADIR%%/vapi/libgdata.vapi
%%DATADIR%%/vapi/libglade-2.0.deps
%%DATADIR%%/vapi/libglade-2.0.vapi
%%DATADIR%%/vapi/libgnome-2.0.vapi
@@ -336,12 +132,14 @@ share/devhelp/books/vala/vala.devhelp2
%%DATADIR%%/vapi/libgnomeui-2.0.vapi
%%DATADIR%%/vapi/libgsf-1.deps
%%DATADIR%%/vapi/libgsf-1.vapi
+%%DATADIR%%/vapi/libnl-1.vapi
%%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/libpq.vapi
%%DATADIR%%/vapi/librsvg-2.0.deps
%%DATADIR%%/vapi/librsvg-2.0.vapi
%%DATADIR%%/vapi/libsexy.deps
@@ -349,10 +147,14 @@ share/devhelp/books/vala/vala.devhelp2
%%DATADIR%%/vapi/libsoup-2.2.vapi
%%DATADIR%%/vapi/libsoup-2.4.deps
%%DATADIR%%/vapi/libsoup-2.4.vapi
+%%DATADIR%%/vapi/libusb-1.0.deps
+%%DATADIR%%/vapi/libusb-1.0.vapi
%%DATADIR%%/vapi/libusb.vapi
%%DATADIR%%/vapi/libwnck-1.0.deps
%%DATADIR%%/vapi/libwnck-1.0.vapi
%%DATADIR%%/vapi/libxml-2.0.vapi
+%%DATADIR%%/vapi/linux.deps
+%%DATADIR%%/vapi/linux.vapi
%%DATADIR%%/vapi/loudmouth-1.0.vapi
%%DATADIR%%/vapi/lua.vapi
%%DATADIR%%/vapi/mysql.vapi
@@ -365,6 +167,8 @@ share/devhelp/books/vala/vala.devhelp2
%%DATADIR%%/vapi/posix.vapi
%%DATADIR%%/vapi/raptor.vapi
%%DATADIR%%/vapi/rasqal.vapi
+%%DATADIR%%/vapi/rest.deps
+%%DATADIR%%/vapi/rest.vapi
%%DATADIR%%/vapi/sdl-gfx.vapi
%%DATADIR%%/vapi/sdl-image.vapi
%%DATADIR%%/vapi/sdl-mixer.vapi
@@ -383,13 +187,11 @@ share/devhelp/books/vala/vala.devhelp2
%%DATADIR%%/vapi/vte.vapi
%%DATADIR%%/vapi/webkit-1.0.deps
%%DATADIR%%/vapi/webkit-1.0.vapi
+%%DATADIR%%/vapi/x11.vapi
+%%DATADIR%%/vapi/xcb.vapi
%%DATADIR%%/vapi/zlib.vapi
@dirrm share/devhelp/books/vala
@dirrmtry share/devhelp/books
@dirrmtry share/devhelp
%%VAPIGEN%%@dirrm lib/vala
-@dirrm include/vala-1.0/vala
-@dirrm include/vala-1.0/gobject
-@dirrm include/vala-1.0/gee
-@dirrm include/vala-1.0/ccode
@dirrm include/vala-1.0
diff --git a/mail/Makefile b/mail/Makefile
index eb33b7259161..4f407d8d5642 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -120,6 +120,7 @@
SUBDIR += esmtp
SUBDIR += evolution
SUBDIR += evolution-exchange
+ SUBDIR += evolution-mapi
SUBDIR += evolution-sharp
SUBDIR += exact
SUBDIR += exilog
@@ -213,6 +214,7 @@
SUBDIR += libdomainkeys
SUBDIR += libesmtp
SUBDIR += libetpan
+ SUBDIR += libmapi
SUBDIR += libnewmail
SUBDIR += libpst
SUBDIR += librfc822
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 4e9cbcf09cb5..2d2672df76ac 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger, based off kiesel's ximian-exchange port
#
# $FreeBSD$
-# $MCom: ports-stable/mail/evolution-exchange/Makefile,v 1.3 2009/04/16 01:14:40 kwm Exp $
+# $MCom: ports/mail/evolution-exchange/Makefile,v 1.146 2009/10/18 05:41:36 marcus Exp $
#
PORTNAME= evolution-exchange
-PORTVERSION= 2.26.3
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -33,8 +32,8 @@ CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \
--disable-compile-warnings \
--with-libdb=${LOCALBASE}
-EVO_VERSION= 2.26
-VERSION= 2.26
+EVO_VERSION= 2.28
+VERSION= 2.28
PLIST_SUB= VERSION=${VERSION} EVO_VERSION=${EVO_VERSION} \
EDS_VERSION="1.2"
@@ -52,6 +51,7 @@ IGNORE= build fails when ${LOCALBASE}/include/mapi.h exists in system, run pkg_i
post-patch:
@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g' \
+ -e 's|-Wmissing-include-dirs||g' \
${WRKSRC}/configure
.include <bsd.port.post.mk>
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index 6cba0d97afdb..55fbcfeb1db4 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-exchange-2.26.3.tar.bz2) = 6ee035bfcafeef0aba01b459092eeec7
-SHA256 (gnome2/evolution-exchange-2.26.3.tar.bz2) = 525f41539fc060bbe53f92fe2902eb7877a62803548bb96118c5a64ec4cebd8d
-SIZE (gnome2/evolution-exchange-2.26.3.tar.bz2) = 962297
+MD5 (gnome2/evolution-exchange-2.28.1.tar.bz2) = fa8892c4859018b464a33acaf3383e91
+SHA256 (gnome2/evolution-exchange-2.28.1.tar.bz2) = 247a176723789a9ce9bd36cafa29b7d470abcb5aa8f9426f350c7f93adb98984
+SIZE (gnome2/evolution-exchange-2.28.1.tar.bz2) = 965508
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index 141c0232c604..2242adac753e 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -81,6 +81,7 @@ share/locale/bg/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/bn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/bn_IN/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/ca@valencia/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/cy/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/da/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -109,6 +110,7 @@ share/locale/ko/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/ku/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/lt/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/lv/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/mai/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/mk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/ml/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/mn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -166,10 +168,14 @@ share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.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
@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/as/LC_MESSAGES
diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
new file mode 100644
index 000000000000..1b8346e01cb6
--- /dev/null
+++ b/mail/evolution-mapi/Makefile
@@ -0,0 +1,45 @@
+# New ports collection makefile for: evolution-mapi
+# Date created: 24 Mar, 2009
+# Whom: Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/mail/evolution-mapi/Makefile,v 1.5 2009/10/19 18:17:14 kwm Exp $
+#
+
+PORTNAME= evolution-mapi
+PORTVERSION= 0.28.1
+CATEGORIES= mail gnome
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Evolution plugin to connect to Microsoft Exchange servers
+
+BUILD_DEPENDS= ${PKGFILES}:${PORTSDIR}/mail/evolution
+LIB_DEPENDS= mapi.0:${PORTSDIR}/mail/libmapi
+RUN_DEPENDS= ${PKGFILES}:${PORTSDIR}/mail/evolution
+
+PKGFILES= ${LOCALBASE}/libdata/pkgconfig/evolution-plugin.pc
+
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= evolutiondataserver
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+EVO_VERSION= 2.28
+EDS_VERSION= 1.2
+PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION=${EDS_VERSION}
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+ ${WRKSRC}/src/libexchangemapi/Makefile.in
+ @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
+ ${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff --git a/mail/evolution-mapi/distinfo b/mail/evolution-mapi/distinfo
new file mode 100644
index 000000000000..d4f34a1644a8
--- /dev/null
+++ b/mail/evolution-mapi/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/evolution-mapi-0.28.1.tar.bz2) = 9a165a3e12f9f8a77e54914837ef5359
+SHA256 (gnome2/evolution-mapi-0.28.1.tar.bz2) = 72829d7616d31014d31f5f0ccdea74c55b8d0626da6d549f6730004aa83cbf68
+SIZE (gnome2/evolution-mapi-0.28.1.tar.bz2) = 505155
diff --git a/mail/evolution-mapi/pkg-descr b/mail/evolution-mapi/pkg-descr
new file mode 100644
index 000000000000..21610bb5434c
--- /dev/null
+++ b/mail/evolution-mapi/pkg-descr
@@ -0,0 +1 @@
+WWW: http://www.go-evolution.org/MAPIProvider
diff --git a/mail/evolution-mapi/pkg-plist b/mail/evolution-mapi/pkg-plist
new file mode 100644
index 000000000000..26dcf1428520
--- /dev/null
+++ b/mail/evolution-mapi/pkg-plist
@@ -0,0 +1,101 @@
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-defs.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-folder.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-connection.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-utils.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-cal-utils.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-cal-tz-utils.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-cal-recur-utils.h
+lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelmapi.la
+lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelmapi.so
+lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelmapi.urls
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendmapi.la
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendmapi.so
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendmapigal.la
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendmapigal.so
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libecalbackendmapi.la
+lib/evolution-data-server-%%EDS_VERSION%%/extensions/libecalbackendmapi.so
+lib/evolution/%%EVO_VERSION%%/plugins/liborg-gnome-exchange-mapi.la
+lib/evolution/%%EVO_VERSION%%/plugins/liborg-gnome-exchange-mapi.so
+lib/evolution/%%EVO_VERSION%%/plugins/org-gnome-exchange-mapi.eplug
+lib/libexchangemapi-1.0.la
+lib/libexchangemapi-1.0.so
+lib/libexchangemapi-1.0.so.0
+share/locale/as/LC_MESSAGES/evolution-mapi.mo
+share/locale/bg/LC_MESSAGES/evolution-mapi.mo
+share/locale/bn_IN/LC_MESSAGES/evolution-mapi.mo
+share/locale/ca/LC_MESSAGES/evolution-mapi.mo
+share/locale/ca@valencia/LC_MESSAGES/evolution-mapi.mo
+share/locale/cs/LC_MESSAGES/evolution-mapi.mo
+share/locale/da/LC_MESSAGES/evolution-mapi.mo
+share/locale/de/LC_MESSAGES/evolution-mapi.mo
+share/locale/el/LC_MESSAGES/evolution-mapi.mo
+share/locale/en_GB/LC_MESSAGES/evolution-mapi.mo
+share/locale/es/LC_MESSAGES/evolution-mapi.mo
+share/locale/et/LC_MESSAGES/evolution-mapi.mo
+share/locale/eu/LC_MESSAGES/evolution-mapi.mo
+share/locale/fi/LC_MESSAGES/evolution-mapi.mo
+share/locale/fr/LC_MESSAGES/evolution-mapi.mo
+share/locale/gl/LC_MESSAGES/evolution-mapi.mo
+share/locale/gu/LC_MESSAGES/evolution-mapi.mo
+share/locale/he/LC_MESSAGES/evolution-mapi.mo
+share/locale/hi/LC_MESSAGES/evolution-mapi.mo
+share/locale/hu/LC_MESSAGES/evolution-mapi.mo
+share/locale/it/LC_MESSAGES/evolution-mapi.mo
+share/locale/ja/LC_MESSAGES/evolution-mapi.mo
+share/locale/kn/LC_MESSAGES/evolution-mapi.mo
+share/locale/ko/LC_MESSAGES/evolution-mapi.mo
+share/locale/lt/LC_MESSAGES/evolution-mapi.mo
+share/locale/mai/LC_MESSAGES/evolution-mapi.mo
+share/locale/ml/LC_MESSAGES/evolution-mapi.mo
+share/locale/mr/LC_MESSAGES/evolution-mapi.mo
+share/locale/nb/LC_MESSAGES/evolution-mapi.mo
+share/locale/nl/LC_MESSAGES/evolution-mapi.mo
+share/locale/or/LC_MESSAGES/evolution-mapi.mo
+share/locale/pa/LC_MESSAGES/evolution-mapi.mo
+share/locale/pl/LC_MESSAGES/evolution-mapi.mo
+share/locale/pt/LC_MESSAGES/evolution-mapi.mo
+share/locale/pt_BR/LC_MESSAGES/evolution-mapi.mo
+share/locale/ro/LC_MESSAGES/evolution-mapi.mo
+share/locale/ru/LC_MESSAGES/evolution-mapi.mo
+share/locale/si/LC_MESSAGES/evolution-mapi.mo
+share/locale/sk/LC_MESSAGES/evolution-mapi.mo
+share/locale/sl/LC_MESSAGES/evolution-mapi.mo
+share/locale/sr/LC_MESSAGES/evolution-mapi.mo
+share/locale/sr@latin/LC_MESSAGES/evolution-mapi.mo
+share/locale/sv/LC_MESSAGES/evolution-mapi.mo
+share/locale/ta/LC_MESSAGES/evolution-mapi.mo
+share/locale/te/LC_MESSAGES/evolution-mapi.mo
+share/locale/th/LC_MESSAGES/evolution-mapi.mo
+share/locale/tr/LC_MESSAGES/evolution-mapi.mo
+share/locale/uk/LC_MESSAGES/evolution-mapi.mo
+share/locale/vi/LC_MESSAGES/evolution-mapi.mo
+share/locale/zh_CN/LC_MESSAGES/evolution-mapi.mo
+share/locale/zh_HK/LC_MESSAGES/evolution-mapi.mo
+share/locale/zh_TW/LC_MESSAGES/evolution-mapi.mo
+libdata/pkgconfig/libexchangemapi-1.0.pc
+share/evolution-data-server-%%EVO_VERSION%%/mapi/tz-mapi-to-ical
+share/evolution-data-server-%%EVO_VERSION%%/mapi/tz-ical-to-mapi
+@dirrmtry share/local/zh_TW/LC_MESSAGES
+@dirrmtry share/local/zh_TW
+@dirrmtry share/local/zh_HK/LC_MESSAGES
+@dirrmtry share/local/zh_HK
+@dirrmtry share/local/zh_CN/LC_MESSAGES
+@dirrmtry share/local/zh_CN
+@dirrmtry share/local/te/LC_MESSAGES
+@dirrmtry share/local/te
+@dirrmtry share/local/sr@latin/LC_MESSAGES
+@dirrmtry share/local/sr@latin
+@dirrmtry share/local/si/LC_MESSAGES
+@dirrmtry share/local/si
+@dirrmtry share/local/mr/LC_MESSAGES
+@dirrmtry share/local/mr
+@dirrmtry share/local/mai/LC_MESSAGES
+@dirrmtry share/local/mai
+@dirrmtry share/local/ca@valencia/LC_MESSAGES
+@dirrmtry share/local/ca@valencia
+@dirrmtry share/local/bn_IN/LC_MESSAGES
+@dirrmtry share/local/bn_IN
+@dirrmtry share/local/as/LC_MESSAGES
+@dirrmtry share/local/as
+@dirrm share/evolution-data-server-%%EVO_VERSION%%/mapi
+@dirrm include/evolution-data-server-%%EVO_VERSION%%/mapi
diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile
index 38d858c774bc..b03c7a0141fe 100644
--- a/mail/evolution-sharp/Makefile
+++ b/mail/evolution-sharp/Makefile
@@ -15,6 +15,8 @@ MASTER_SITES= GNOME
MAINTAINER= bsd-sharp@googlegroups.com
COMMENT= Mono bindings for evolution
+BROKEN= Doesn't accept current evolution version
+
BUILD_DEPENDS= evolution:${PORTSDIR}/mail/evolution
RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 2efccc09f603..4b1da19b9829 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,12 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/mail/evolution/Makefile,v 1.3 2009/04/16 01:08:59 kwm Exp $
+# $MCom: ports/mail/evolution/Makefile,v 1.204 2009/10/18 05:39:30 marcus Exp $
#
PORTNAME= evolution
-PORTVERSION= 2.26.3
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -24,7 +23,7 @@ USE_GMAKE= yes
USE_BISON= build
USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \
- desktopfileutils gnomedocutils ltasneededhack
+ desktopfileutils gnomedocutils ltasneededhack gnomedesktop
USE_AUTOTOOLS= libtool:22
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
@@ -32,6 +31,7 @@ USE_LDCONFIG= yes
LDCONFIG_DIRS= %%PREFIX%%/lib/evolution/%%VERSION%%
CONFIGURE_ARGS= --enable-nss=yes \
--enable-mono=no \
+ --disable-nm \
--with-sub-version=" FreeBSD GNOME Team Port"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -47,7 +47,7 @@ GCONF_SCHEMAS= apps_evolution_addressbook.schemas \
bogo-junk-plugin.schemas \
evolution-mail.schemas
-EVO_VERSION= 2.26
+EVO_VERSION= 2.28
PLIST_SUB= VERSION=${EVO_VERSION} \
PORTVERSION=2.12
@@ -93,6 +93,7 @@ CONFIGURE_ARGS+= --with-krb5=${LOCALBASE}
post-patch:
@${REINPLACE_CMD} -e '/^plugins_standard_always/s/audio-inline//' \
+ -e 's|-Wmissing-include-dirs||g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|stdlib.n|stdlib.h|' \
${WRKSRC}/iconv-detect.c
@@ -101,8 +102,4 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr/sbin|${LOCALBASE}/bin|g' \
${WRKSRC}/plugins/sa-junk-plugin/em-junk-filter.c
-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
-
.include <bsd.port.post.mk>
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index fa11bd62cc09..6fa96677d8c9 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.26.3.tar.bz2) = fcc487503ab91b9e25fd529abc87fdae
-SHA256 (gnome2/evolution-2.26.3.tar.bz2) = e37f8d21a8aa201e9a3d91a110ec9d4dc3feae978be45b0c16cf93adacd5605b
-SIZE (gnome2/evolution-2.26.3.tar.bz2) = 36427464
+MD5 (gnome2/evolution-2.28.1.tar.bz2) = 15043e64f22000f6f0bf57e0373c7169
+SHA256 (gnome2/evolution-2.28.1.tar.bz2) = 5faf63e769f41ee9e4d857f5ac3bcae1fe45c57a3dbd4873402281c3aec7a135
+SIZE (gnome2/evolution-2.28.1.tar.bz2) = 29728219
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index ef43e24cddc7..44b3591906fe 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,23 +1,23 @@
---- configure.orig 2007-10-28 12:24:23.000000000 -0500
-+++ configure 2007-10-28 12:26:19.000000000 -0500
-@@ -23831,6 +23831,16 @@
- SOFTOKN3_LIB=''
- HAL_REQUIREMENT=''
- ;;
+--- configure.orig 2009-08-24 11:10:44.000000000 +0200
++++ configure 2009-08-24 11:13:05.000000000 +0200
+@@ -16389,6 +16389,16 @@ case "$host" in
+ SOFTOKN3_LIB=''
+ HAL_REQUIREMENT=''
+ ;;
+*freebsd*) os_win32=no
-+ NO_UNDEFINED=''
-+ SOCKET_LIBS=''
-+ SOEXT='.so'
-+ SA_JUNK_PLUGIN=sa-junk-plugin
-+ BF_JUNK_PLUGIN=bogo-junk-plugin
-+ DL_LIB=''
-+ SOFTOKN3_LIB='-lsoftokn3'
-+ HAL_REQUIREMENT='hal'
-+ ;;
- *) os_win32=no
- NO_UNDEFINED=''
- SOEXT='.so'
-@@ -25449,6 +25459,7 @@
++ NO_UNDEFINED=''
++ SOCKET_LIBS=''
++ SOEXT='.so'
++ SA_JUNK_PLUGIN=sa-junk-plugin
++ BF_JUNK_PLUGIN=bogo-junk-plugin
++ DL_LIB=''
++ SOFTOKN3_LIB='-lsoftokn3'
++ HAL_REQUIREMENT='hal'
++ ;;
+ *)
+ os_win32=no
+ NO_UNDEFINED=''
+@@ -18403,6 +18413,7 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
@@ -25,16 +25,16 @@
#define BUFSIZE (sizeof(struct hostent)+10)
-@@ -29382,7 +29393,7 @@
- LDFLAGS_save="$LDFLAGS"
+@@ -22101,7 +22112,7 @@ if test "x${with_krb5}" != "xno"; then
+ LIBS_save="$LIBS"
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
+ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
sunlibs="-lkrb5 -lgss"
- { echo "$as_me:$LINENO: checking for Kerberos 5" >&5
- echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6; }
-@@ -37936,7 +37947,7 @@
+ { $as_echo "$as_me:$LINENO: checking for Kerberos 5" >&5
+ $as_echo_n "checking for Kerberos 5... " >&6; }
+@@ -30112,7 +30123,7 @@ componentdir="$privlibdir/components"
idldir='${datadir}'/idl/evolution-$BASE_VERSION
diff --git a/mail/evolution/files/patch-mail_em-utils.h b/mail/evolution/files/patch-mail_em-utils.h
deleted file mode 100644
index b3e7b9ffbe25..000000000000
--- a/mail/evolution/files/patch-mail_em-utils.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- mail/em-utils.h.orig Tue Aug 3 16:59:46 2004
-+++ mail/em-utils.h Tue Aug 3 17:00:04 2004
-@@ -23,6 +23,7 @@
- #ifndef __EM_UTILS_H__
- #define __EM_UTILS_H__
-
-+#include <sys/types.h>
- #include <glib.h>
-
- #ifdef __cplusplus
diff --git a/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c b/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c
deleted file mode 100644
index 800f60386963..000000000000
--- a/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- widgets/e-timezone-dialog/e-timezone-dialog.c.orig 2007-11-30 05:24:05.000000000 +0100
-+++ widgets/e-timezone-dialog/e-timezone-dialog.c 2007-12-21 16:24:39.000000000 +0100
-@@ -82,7 +82,9 @@
-
- #ifndef G_OS_WIN32 /* Declared properly in time.h already */
- extern char *tzname[2];
-+#ifndef __BSD_VISIBLE
- extern long timezone;
-+#endif
- extern int daylight;
- #endif
-
-@@ -326,9 +328,20 @@
- get_local_timezone(void)
- {
- icaltimezone *zone;
-+ long offset;
-+#ifdef __BSD_VISIBLE
-+ time_t tt;
-+ struct tm tm;
-+#endif
-
- tzset();
-- zone = icaltimezone_get_builtin_timezone_from_offset (-timezone, tzname[0]);
-+#ifdef __BSD_VISIBLE
-+ localtime_r (&tt, &tm);
-+ offset = tm.tm_gmtoff;
-+#else
-+ offset = -timezone;
-+#endif
-+ zone = icaltimezone_get_builtin_timezone_from_offset (offset, tzname[0]);
-
- return zone;
- }
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 9ed41eb95f9a..7f20b345c6c8 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -2,32 +2,111 @@ bin/evolution
include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-config.h
include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-menu.h
include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-popup.h
+include/evolution-%%VERSION%%/calendar/gui/cal-editor-utils.h
+include/evolution-%%VERSION%%/calendar/gui/cal-search-bar.h
+include/evolution-%%VERSION%%/calendar/gui/calendar-config-keys.h
+include/evolution-%%VERSION%%/calendar/gui/calendar-config.h
+include/evolution-%%VERSION%%/calendar/gui/comp-util.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/alarm-dialog.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/alarm-list-dialog.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/cal-attachment-select-file.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/cal-prefs-dialog.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/calendar-setup.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/cancel-comp.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/changed-comp.h
include/evolution-%%VERSION%%/calendar/gui/dialogs/comp-editor-page.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/comp-editor-util.h
include/evolution-%%VERSION%%/calendar/gui/dialogs/comp-editor.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/copy-source-dialog.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/delete-comp.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/delete-error.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/e-delegate-dialog.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/e-send-options-utils.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/event-editor.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/event-page.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/memo-editor.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/memo-page.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/recur-comp.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/recurrence-page.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/save-comp.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/schedule-page.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/select-source-dialog.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/send-comp.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/task-details-page.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/task-editor.h
+include/evolution-%%VERSION%%/calendar/gui/dialogs/task-page.h
+include/evolution-%%VERSION%%/calendar/gui/e-alarm-list.h
+include/evolution-%%VERSION%%/calendar/gui/e-attachment-handler-calendar.h
include/evolution-%%VERSION%%/calendar/gui/e-cal-config.h
+include/evolution-%%VERSION%%/calendar/gui/e-cal-event.h
+include/evolution-%%VERSION%%/calendar/gui/e-cal-model-calendar.h
+include/evolution-%%VERSION%%/calendar/gui/e-cal-model.h
include/evolution-%%VERSION%%/calendar/gui/e-cal-popup.h
+include/evolution-%%VERSION%%/calendar/gui/e-calendar-view.h
+include/evolution-%%VERSION%%/calendar/gui/e-cell-date-edit-text.h
+include/evolution-%%VERSION%%/calendar/gui/e-comp-editor-registry.h
+include/evolution-%%VERSION%%/calendar/gui/e-date-edit-config.h
+include/evolution-%%VERSION%%/calendar/gui/e-date-time-list.h
+include/evolution-%%VERSION%%/calendar/gui/e-day-view-config.h
+include/evolution-%%VERSION%%/calendar/gui/e-day-view-layout.h
+include/evolution-%%VERSION%%/calendar/gui/e-day-view-main-item.h
+include/evolution-%%VERSION%%/calendar/gui/e-day-view-time-item.h
+include/evolution-%%VERSION%%/calendar/gui/e-day-view-top-item.h
+include/evolution-%%VERSION%%/calendar/gui/e-day-view.h
+include/evolution-%%VERSION%%/calendar/gui/e-meeting-attendee.h
+include/evolution-%%VERSION%%/calendar/gui/e-meeting-list-view.h
+include/evolution-%%VERSION%%/calendar/gui/e-meeting-store.h
+include/evolution-%%VERSION%%/calendar/gui/e-meeting-time-sel-item.h
+include/evolution-%%VERSION%%/calendar/gui/e-meeting-time-sel.h
+include/evolution-%%VERSION%%/calendar/gui/e-meeting-types.h
+include/evolution-%%VERSION%%/calendar/gui/e-meeting-utils.h
+include/evolution-%%VERSION%%/calendar/gui/e-mini-calendar-config.h
+include/evolution-%%VERSION%%/calendar/gui/e-select-names-editable.h
+include/evolution-%%VERSION%%/calendar/gui/e-select-names-renderer.h
+include/evolution-%%VERSION%%/calendar/gui/e-timezone-entry.h
+include/evolution-%%VERSION%%/calendar/gui/e-week-view-config.h
+include/evolution-%%VERSION%%/calendar/gui/e-week-view-event-item.h
+include/evolution-%%VERSION%%/calendar/gui/e-week-view-layout.h
+include/evolution-%%VERSION%%/calendar/gui/e-week-view-main-item.h
+include/evolution-%%VERSION%%/calendar/gui/e-week-view-titles-item.h
+include/evolution-%%VERSION%%/calendar/gui/e-week-view.h
+include/evolution-%%VERSION%%/calendar/gui/goto.h
include/evolution-%%VERSION%%/calendar/gui/itip-utils.h
+include/evolution-%%VERSION%%/calendar/gui/misc.h
+include/evolution-%%VERSION%%/calendar/gui/tag-calendar.h
+include/evolution-%%VERSION%%/calendar/gui/weekday-picker.h
+include/evolution-%%VERSION%%/composer/e-composer-actions.h
+include/evolution-%%VERSION%%/composer/e-composer-autosave.h
+include/evolution-%%VERSION%%/composer/e-composer-common.h
+include/evolution-%%VERSION%%/composer/e-composer-from-header.h
+include/evolution-%%VERSION%%/composer/e-composer-header-table.h
+include/evolution-%%VERSION%%/composer/e-composer-header.h
+include/evolution-%%VERSION%%/composer/e-composer-name-header.h
+include/evolution-%%VERSION%%/composer/e-composer-post-header.h
+include/evolution-%%VERSION%%/composer/e-composer-private.h
+include/evolution-%%VERSION%%/composer/e-composer-text-header.h
include/evolution-%%VERSION%%/composer/e-msg-composer.h
include/evolution-%%VERSION%%/e-conduit/e-pilot-map.h
include/evolution-%%VERSION%%/e-conduit/e-pilot-util.h
include/evolution-%%VERSION%%/e-util/e-bconf-map.h
+include/evolution-%%VERSION%%/e-util/e-binding.h
include/evolution-%%VERSION%%/e-util/e-bit-array.h
include/evolution-%%VERSION%%/e-util/e-categories-config.h
-include/evolution-%%VERSION%%/e-util/e-config-listener.h
include/evolution-%%VERSION%%/e-util/e-config.h
include/evolution-%%VERSION%%/e-util/e-corba-utils.h
include/evolution-%%VERSION%%/e-util/e-cursor.h
+include/evolution-%%VERSION%%/e-util/e-datetime-format.h
include/evolution-%%VERSION%%/e-util/e-dialog-utils.h
include/evolution-%%VERSION%%/e-util/e-dialog-widgets.h
include/evolution-%%VERSION%%/e-util/e-error.h
include/evolution-%%VERSION%%/e-util/e-event.h
include/evolution-%%VERSION%%/e-util/e-folder-map.h
include/evolution-%%VERSION%%/e-util/e-fsutils.h
-include/evolution-%%VERSION%%/e-util/e-gui-utils.h
include/evolution-%%VERSION%%/e-util/e-html-utils.h
include/evolution-%%VERSION%%/e-util/e-icon-factory.h
include/evolution-%%VERSION%%/e-util/e-import.h
include/evolution-%%VERSION%%/e-util/e-logger.h
+include/evolution-%%VERSION%%/e-util/e-marshal.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
@@ -45,13 +124,33 @@ include/evolution-%%VERSION%%/e-util/e-text-event-processor-emacs-like.h
include/evolution-%%VERSION%%/e-util/e-text-event-processor-types.h
include/evolution-%%VERSION%%/e-util/e-text-event-processor.h
include/evolution-%%VERSION%%/e-util/e-util-labels.h
-include/evolution-%%VERSION%%/e-util/e-util-marshal.h
include/evolution-%%VERSION%%/e-util/e-util.h
include/evolution-%%VERSION%%/e-util/e-xml-utils.h
+include/evolution-%%VERSION%%/filter/filter-code.h
+include/evolution-%%VERSION%%/filter/filter-colour.h
+include/evolution-%%VERSION%%/filter/filter-datespec.h
+include/evolution-%%VERSION%%/filter/filter-element.h
+include/evolution-%%VERSION%%/filter/filter-file.h
+include/evolution-%%VERSION%%/filter/filter-input.h
+include/evolution-%%VERSION%%/filter/filter-int.h
+include/evolution-%%VERSION%%/filter/filter-option.h
+include/evolution-%%VERSION%%/filter/filter-part.h
+include/evolution-%%VERSION%%/filter/filter-rule.h
+include/evolution-%%VERSION%%/filter/rule-context.h
+include/evolution-%%VERSION%%/filter/rule-editor.h
include/evolution-%%VERSION%%/mail/Evolution-Mail.h
+include/evolution-%%VERSION%%/mail/e-mail-attachment-bar.h
+include/evolution-%%VERSION%%/mail/e-mail-search-bar.h
+include/evolution-%%VERSION%%/mail/e-searching-tokenizer.h
+include/evolution-%%VERSION%%/mail/em-account-editor.h
include/evolution-%%VERSION%%/mail/em-composer-utils.h
include/evolution-%%VERSION%%/mail/em-config.h
include/evolution-%%VERSION%%/mail/em-event.h
+include/evolution-%%VERSION%%/mail/em-filter-context.h
+include/evolution-%%VERSION%%/mail/em-filter-editor.h
+include/evolution-%%VERSION%%/mail/em-filter-folder-element.h
+include/evolution-%%VERSION%%/mail/em-filter-rule.h
+include/evolution-%%VERSION%%/mail/em-filter-source-element.h
include/evolution-%%VERSION%%/mail/em-folder-browser.h
include/evolution-%%VERSION%%/mail/em-folder-tree-model.h
include/evolution-%%VERSION%%/mail/em-folder-tree.h
@@ -70,14 +169,17 @@ include/evolution-%%VERSION%%/mail/em-junk-hook.h
include/evolution-%%VERSION%%/mail/em-menu.h
include/evolution-%%VERSION%%/mail/em-message-browser.h
include/evolution-%%VERSION%%/mail/em-popup.h
+include/evolution-%%VERSION%%/mail/em-search-context.h
include/evolution-%%VERSION%%/mail/em-stripsig-filter.h
include/evolution-%%VERSION%%/mail/em-sync-stream.h
include/evolution-%%VERSION%%/mail/em-utils.h
include/evolution-%%VERSION%%/mail/mail-autofilter.h
include/evolution-%%VERSION%%/mail/mail-component.h
include/evolution-%%VERSION%%/mail/mail-config.h
+include/evolution-%%VERSION%%/mail/mail-folder-cache.h
include/evolution-%%VERSION%%/mail/mail-mt.h
include/evolution-%%VERSION%%/mail/mail-ops.h
+include/evolution-%%VERSION%%/mail/mail-send-recv.h
include/evolution-%%VERSION%%/mail/mail-session.h
include/evolution-%%VERSION%%/mail/mail-tools.h
include/evolution-%%VERSION%%/mail/mail-vfolder.h
@@ -94,7 +196,16 @@ include/evolution-%%VERSION%%/menus/gal-view-new-dialog.h
include/evolution-%%VERSION%%/menus/gal-view.h
include/evolution-%%VERSION%%/misc/e-account-combo-box.h
include/evolution-%%VERSION%%/misc/e-activity-handler.h
-include/evolution-%%VERSION%%/misc/e-attachment-bar.h
+include/evolution-%%VERSION%%/misc/e-attachment-button.h
+include/evolution-%%VERSION%%/misc/e-attachment-dialog.h
+include/evolution-%%VERSION%%/misc/e-attachment-handler-image.h
+include/evolution-%%VERSION%%/misc/e-attachment-handler-sendto.h
+include/evolution-%%VERSION%%/misc/e-attachment-handler.h
+include/evolution-%%VERSION%%/misc/e-attachment-icon-view.h
+include/evolution-%%VERSION%%/misc/e-attachment-paned.h
+include/evolution-%%VERSION%%/misc/e-attachment-store.h
+include/evolution-%%VERSION%%/misc/e-attachment-tree-view.h
+include/evolution-%%VERSION%%/misc/e-attachment-view.h
include/evolution-%%VERSION%%/misc/e-attachment.h
include/evolution-%%VERSION%%/misc/e-calendar-item.h
include/evolution-%%VERSION%%/misc/e-calendar.h
@@ -113,7 +224,7 @@ include/evolution-%%VERSION%%/misc/e-config-page.h
include/evolution-%%VERSION%%/misc/e-cursors.h
include/evolution-%%VERSION%%/misc/e-dateedit.h
include/evolution-%%VERSION%%/misc/e-dropdown-button.h
-include/evolution-%%VERSION%%/misc/e-expander.h
+include/evolution-%%VERSION%%/misc/e-filter-bar.h
include/evolution-%%VERSION%%/misc/e-gui-utils.h
include/evolution-%%VERSION%%/misc/e-hsv-utils.h
include/evolution-%%VERSION%%/misc/e-icon-entry.h
@@ -292,6 +403,10 @@ lib/evolution/%%VERSION%%/libevolution-addressbook-importers.a
lib/evolution/%%VERSION%%/libevolution-addressbook-importers.la
lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so
lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so.0
+lib/evolution/%%VERSION%%/libevolution-cal-shared.a
+lib/evolution/%%VERSION%%/libevolution-cal-shared.la
+lib/evolution/%%VERSION%%/libevolution-cal-shared.so
+lib/evolution/%%VERSION%%/libevolution-cal-shared.so.0
lib/evolution/%%VERSION%%/libevolution-calendar-a11y.a
lib/evolution/%%VERSION%%/libevolution-calendar-a11y.la
lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so
@@ -304,6 +419,10 @@ lib/evolution/%%VERSION%%/libevolution-mail-importers.a
lib/evolution/%%VERSION%%/libevolution-mail-importers.la
lib/evolution/%%VERSION%%/libevolution-mail-importers.so
lib/evolution/%%VERSION%%/libevolution-mail-importers.so.0
+lib/evolution/%%VERSION%%/libevolution-mail-shared.a
+lib/evolution/%%VERSION%%/libevolution-mail-shared.la
+lib/evolution/%%VERSION%%/libevolution-mail-shared.so
+lib/evolution/%%VERSION%%/libevolution-mail-shared.so.0
lib/evolution/%%VERSION%%/libevolution-smime.a
lib/evolution/%%VERSION%%/libevolution-smime.la
lib/evolution/%%VERSION%%/libevolution-smime.so
@@ -366,9 +485,6 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-caldav.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-google.a
lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-google.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-google.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.a
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.a
lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so
@@ -378,9 +494,6 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.a
lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-face.a
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-face.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-face.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.a
lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.so
@@ -429,6 +542,9 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-templates.a
lib/evolution/%%VERSION%%/plugins/liborg-gnome-templates.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-templates.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-vcard-inline.a
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-vcard-inline.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-vcard-inline.so
lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-backup-restore.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-backup-restore.xml
@@ -445,14 +561,12 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-attachment-reminder.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-bbdb.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-caldav.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-google.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-mail-attachments-import-ics.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-startup-wizard.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-webdav.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-ab-subscription.xml
lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-cal-subscription.xml
lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-operations.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-tasks-subscription.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-face.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-folder-permissions.xml
lib/evolution/%%VERSION%%/plugins/org-gnome-folder-subscription.xml
lib/evolution/%%VERSION%%/plugins/org-gnome-groupwise-features.eplug
@@ -476,6 +590,7 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-save-calendar.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-select-one-source.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-subject-thread.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-templates.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-vcard-inline.eplug
lib/evolution/%%VERSION%%/plugins/templates.glade
libdata/bonobo/servers/GNOME_Evolution_Addressbook.server
libdata/bonobo/servers/GNOME_Evolution_Calendar.server
@@ -509,6 +624,7 @@ share/applications/evolution.desktop
%%DATADIR%%/%%VERSION%%/default/nl/mail/local/Inbox
%%DATADIR%%/%%VERSION%%/default/pl/mail/local/Inbox
%%DATADIR%%/%%VERSION%%/default/pt/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/default/ro/mail/local/Inbox
%%DATADIR%%/%%VERSION%%/default/sr/mail/local/Inbox
%%DATADIR%%/%%VERSION%%/default/sr@latin/mail/local/Inbox
%%DATADIR%%/%%VERSION%%/default/sv/mail/local/Inbox
@@ -526,13 +642,13 @@ share/applications/evolution.desktop
%%DATADIR%%/%%VERSION%%/errors/org-gnome-backup-restore.error
%%DATADIR%%/%%VERSION%%/errors/org-gnome-default-mailer.error
%%DATADIR%%/%%VERSION%%/errors/org-gnome-exchange-operations.error
-%%DATADIR%%/%%VERSION%%/errors/org-gnome-face.errors.xml
%%DATADIR%%/%%VERSION%%/errors/org-gnome-itip-formatter.error
-%%DATADIR%%/%%VERSION%%/errors/org-gnome-mail-retract-errors.xml
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-mail-retract.error
%%DATADIR%%/%%VERSION%%/errors/org-gnome-mailing-list-actions.error
-%%DATADIR%%/%%VERSION%%/errors/org-gnome-proxy-errors.xml
-%%DATADIR%%/%%VERSION%%/errors/org-gnome-proxy-login-errors.xml
-%%DATADIR%%/%%VERSION%%/errors/org-gnome-shared-folder.errors.xml
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-process-meeting.error
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-proxy-login.error
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-proxy.error
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-shared-folder.error
%%DATADIR%%/%%VERSION%%/errors/shell.error
%%DATADIR%%/%%VERSION%%/etspec/e-addressbook-view.etspec
%%DATADIR%%/%%VERSION%%/etspec/e-cal-list-view.etspec
@@ -548,8 +664,6 @@ share/applications/evolution.desktop
%%DATADIR%%/%%VERSION%%/glade/contact-editor.glade
%%DATADIR%%/%%VERSION%%/glade/contact-list-editor.glade
%%DATADIR%%/%%VERSION%%/glade/e-active-connection-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/e-attachment.glade
-%%DATADIR%%/%%VERSION%%/glade/e-contact-print.glade
%%DATADIR%%/%%VERSION%%/glade/e-delegate-dialog.glade
%%DATADIR%%/%%VERSION%%/glade/e-foreign-folder-dialog.glade
%%DATADIR%%/%%VERSION%%/glade/e-itip-control.glade
@@ -569,21 +683,17 @@ share/applications/evolution.desktop
%%DATADIR%%/%%VERSION%%/glade/exchange-permissions-dialog.glade
%%DATADIR%%/%%VERSION%%/glade/exchange-send-options.glade
%%DATADIR%%/%%VERSION%%/glade/filter.glade
-%%DATADIR%%/%%VERSION%%/glade/fulladdr.glade
%%DATADIR%%/%%VERSION%%/glade/fullname.glade
-%%DATADIR%%/%%VERSION%%/glade/gal-categories.glade
%%DATADIR%%/%%VERSION%%/glade/gal-define-views.glade
%%DATADIR%%/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade
%%DATADIR%%/%%VERSION%%/glade/gal-view-new-dialog.glade
%%DATADIR%%/%%VERSION%%/glade/goto-dialog.glade
-%%DATADIR%%/%%VERSION%%/glade/im.glade
%%DATADIR%%/%%VERSION%%/glade/imap-headers.glade
%%DATADIR%%/%%VERSION%%/glade/import.glade
%%DATADIR%%/%%VERSION%%/glade/junk-settings.glade
%%DATADIR%%/%%VERSION%%/glade/ldap-config.glade
%%DATADIR%%/%%VERSION%%/glade/mail-config.glade
%%DATADIR%%/%%VERSION%%/glade/mail-dialogs.glade
-%%DATADIR%%/%%VERSION%%/glade/meeting-page.glade
%%DATADIR%%/%%VERSION%%/glade/memo-page.glade
%%DATADIR%%/%%VERSION%%/glade/org-gnome-email-custom-header.glade
%%DATADIR%%/%%VERSION%%/glade/properties.glade
@@ -622,6 +732,7 @@ share/applications/evolution.desktop
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places/mail-inbox.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places/mail-outbox.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places/mail-sent.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/status/wrapped.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/go-today.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-day.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-list.png
@@ -711,51 +822,31 @@ 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/account_editor_a.png
share/gnome/help/evolution/C/figures/attach_reminder_a.png
+share/gnome/help/evolution/C/figures/calendar_preference_display.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/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_adv_search_a.png
-share/gnome/help/evolution/C/figures/evo_allday_a.png
share/gnome/help/evolution/C/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/C/figures/evo_backup.png
share/gnome/help/evolution/C/figures/evo_backup_prgsbar.png
share/gnome/help/evolution/C/figures/evo_backup_warning.png
share/gnome/help/evolution/C/figures/evo_blink.png
-share/gnome/help/evolution/C/figures/evo_cal_a.png
-share/gnome/help/evolution/C/figures/evo_cal_advsearch.png
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
-share/gnome/help/evolution/C/figures/evo_debuglogs_a.png
share/gnome/help/evolution/C/figures/evo_delegate_permission_a.png
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_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
-share/gnome/help/evolution/C/figures/evo_gwreceiveoptedit_a.png
share/gnome/help/evolution/C/figures/evo_gwstatustrack.png
-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
share/gnome/help/evolution/C/figures/evo_labels_a.png
@@ -765,93 +856,64 @@ share/gnome/help/evolution/C/figures/evo_mail_notifier.png
share/gnome/help/evolution/C/figures/evo_maildirreceive_a.png
share/gnome/help/evolution/C/figures/evo_mboxreceive_a.png
share/gnome/help/evolution/C/figures/evo_memo_a.png
-share/gnome/help/evolution/C/figures/evo_mereceive_a.png
-share/gnome/help/evolution/C/figures/evo_message_filters_a.png
share/gnome/help/evolution/C/figures/evo_mhreceive_a.png
share/gnome/help/evolution/C/figures/evo_newmail.png
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_setup_a.png
-share/gnome/help/evolution/C/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/C/figures/evo_rule_a.png
-share/gnome/help/evolution/C/figures/evo_select_add_folder.png
-share/gnome/help/evolution/C/figures/evo_select_folder.png
share/gnome/help/evolution/C/figures/evo_send_option_a.png
share/gnome/help/evolution/C/figures/evo_send_setup_a.png
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/exchg-identity.png
-share/gnome/help/evolution/C/figures/exchng-identity.png
-share/gnome/help/evolution/C/figures/exchng-rec-mail.png
+share/gnome/help/evolution/C/figures/evolution_contact_preference.png
+share/gnome/help/evolution/C/figures/evolution_mail_preference.png
share/gnome/help/evolution/C/figures/exchng-rec-mails.png
-share/gnome/help/evolution/C/figures/exchng-rec-option.png
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/folder_plus.png
+share/gnome/help/evolution/C/figures/folder_size_mapi.png
+share/gnome/help/evolution/C/figures/folder_size_preference.png
share/gnome/help/evolution/C/figures/google_cal_view.png
-share/gnome/help/evolution/C/figures/mail-threaded.png
+share/gnome/help/evolution/C/figures/groupwise_resend.png
+share/gnome/help/evolution/C/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/C/figures/local_ics_calendar.png
share/gnome/help/evolution/C/figures/mailer_preferences.png
+share/gnome/help/evolution/C/figures/meeting.png
share/gnome/help/evolution/C/figures/minus.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/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/cs/evolution.xml
-share/gnome/help/evolution/cs/figures/account_editor_a.png
share/gnome/help/evolution/cs/figures/attach_reminder_a.png
+share/gnome/help/evolution/cs/figures/calendar_preference_display.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/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_adv_search_a.png
-share/gnome/help/evolution/cs/figures/evo_allday_a.png
share/gnome/help/evolution/cs/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/cs/figures/evo_backup.png
share/gnome/help/evolution/cs/figures/evo_backup_prgsbar.png
share/gnome/help/evolution/cs/figures/evo_backup_warning.png
share/gnome/help/evolution/cs/figures/evo_blink.png
-share/gnome/help/evolution/cs/figures/evo_cal_a.png
-share/gnome/help/evolution/cs/figures/evo_cal_advsearch.png
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
-share/gnome/help/evolution/cs/figures/evo_debuglogs_a.png
share/gnome/help/evolution/cs/figures/evo_delegate_permission_a.png
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_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
-share/gnome/help/evolution/cs/figures/evo_gwreceiveoptedit_a.png
share/gnome/help/evolution/cs/figures/evo_gwstatustrack.png
-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
share/gnome/help/evolution/cs/figures/evo_labels_a.png
@@ -861,93 +923,64 @@ share/gnome/help/evolution/cs/figures/evo_mail_notifier.png
share/gnome/help/evolution/cs/figures/evo_maildirreceive_a.png
share/gnome/help/evolution/cs/figures/evo_mboxreceive_a.png
share/gnome/help/evolution/cs/figures/evo_memo_a.png
-share/gnome/help/evolution/cs/figures/evo_mereceive_a.png
-share/gnome/help/evolution/cs/figures/evo_message_filters_a.png
share/gnome/help/evolution/cs/figures/evo_mhreceive_a.png
share/gnome/help/evolution/cs/figures/evo_newmail.png
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_setup_a.png
-share/gnome/help/evolution/cs/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/cs/figures/evo_rule_a.png
-share/gnome/help/evolution/cs/figures/evo_select_add_folder.png
-share/gnome/help/evolution/cs/figures/evo_select_folder.png
share/gnome/help/evolution/cs/figures/evo_send_option_a.png
share/gnome/help/evolution/cs/figures/evo_send_setup_a.png
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/exchg-identity.png
-share/gnome/help/evolution/cs/figures/exchng-identity.png
-share/gnome/help/evolution/cs/figures/exchng-rec-mail.png
+share/gnome/help/evolution/cs/figures/evolution_contact_preference.png
+share/gnome/help/evolution/cs/figures/evolution_mail_preference.png
share/gnome/help/evolution/cs/figures/exchng-rec-mails.png
-share/gnome/help/evolution/cs/figures/exchng-rec-option.png
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/folder_plus.png
+share/gnome/help/evolution/cs/figures/folder_size_mapi.png
+share/gnome/help/evolution/cs/figures/folder_size_preference.png
share/gnome/help/evolution/cs/figures/google_cal_view.png
-share/gnome/help/evolution/cs/figures/mail-threaded.png
+share/gnome/help/evolution/cs/figures/groupwise_resend.png
+share/gnome/help/evolution/cs/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/cs/figures/local_ics_calendar.png
share/gnome/help/evolution/cs/figures/mailer_preferences.png
+share/gnome/help/evolution/cs/figures/meeting.png
share/gnome/help/evolution/cs/figures/minus.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/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/de/evolution.xml
-share/gnome/help/evolution/de/figures/account_editor_a.png
share/gnome/help/evolution/de/figures/attach_reminder_a.png
+share/gnome/help/evolution/de/figures/calendar_preference_display.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/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_adv_search_a.png
-share/gnome/help/evolution/de/figures/evo_allday_a.png
share/gnome/help/evolution/de/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/de/figures/evo_backup.png
share/gnome/help/evolution/de/figures/evo_backup_prgsbar.png
share/gnome/help/evolution/de/figures/evo_backup_warning.png
share/gnome/help/evolution/de/figures/evo_blink.png
-share/gnome/help/evolution/de/figures/evo_cal_a.png
-share/gnome/help/evolution/de/figures/evo_cal_advsearch.png
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
-share/gnome/help/evolution/de/figures/evo_debuglogs_a.png
share/gnome/help/evolution/de/figures/evo_delegate_permission_a.png
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_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
-share/gnome/help/evolution/de/figures/evo_gwreceiveoptedit_a.png
share/gnome/help/evolution/de/figures/evo_gwstatustrack.png
-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
share/gnome/help/evolution/de/figures/evo_labels_a.png
@@ -957,93 +990,64 @@ share/gnome/help/evolution/de/figures/evo_mail_notifier.png
share/gnome/help/evolution/de/figures/evo_maildirreceive_a.png
share/gnome/help/evolution/de/figures/evo_mboxreceive_a.png
share/gnome/help/evolution/de/figures/evo_memo_a.png
-share/gnome/help/evolution/de/figures/evo_mereceive_a.png
-share/gnome/help/evolution/de/figures/evo_message_filters_a.png
share/gnome/help/evolution/de/figures/evo_mhreceive_a.png
share/gnome/help/evolution/de/figures/evo_newmail.png
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_setup_a.png
-share/gnome/help/evolution/de/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/de/figures/evo_rule_a.png
-share/gnome/help/evolution/de/figures/evo_select_add_folder.png
-share/gnome/help/evolution/de/figures/evo_select_folder.png
share/gnome/help/evolution/de/figures/evo_send_option_a.png
share/gnome/help/evolution/de/figures/evo_send_setup_a.png
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/exchg-identity.png
-share/gnome/help/evolution/de/figures/exchng-identity.png
-share/gnome/help/evolution/de/figures/exchng-rec-mail.png
+share/gnome/help/evolution/de/figures/evolution_contact_preference.png
+share/gnome/help/evolution/de/figures/evolution_mail_preference.png
share/gnome/help/evolution/de/figures/exchng-rec-mails.png
-share/gnome/help/evolution/de/figures/exchng-rec-option.png
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/folder_plus.png
+share/gnome/help/evolution/de/figures/folder_size_mapi.png
+share/gnome/help/evolution/de/figures/folder_size_preference.png
share/gnome/help/evolution/de/figures/google_cal_view.png
-share/gnome/help/evolution/de/figures/mail-threaded.png
+share/gnome/help/evolution/de/figures/groupwise_resend.png
+share/gnome/help/evolution/de/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/de/figures/local_ics_calendar.png
share/gnome/help/evolution/de/figures/mailer_preferences.png
+share/gnome/help/evolution/de/figures/meeting.png
share/gnome/help/evolution/de/figures/minus.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/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/el/evolution.xml
-share/gnome/help/evolution/el/figures/account_editor_a.png
share/gnome/help/evolution/el/figures/attach_reminder_a.png
+share/gnome/help/evolution/el/figures/calendar_preference_display.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/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_adv_search_a.png
-share/gnome/help/evolution/el/figures/evo_allday_a.png
share/gnome/help/evolution/el/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/el/figures/evo_backup.png
share/gnome/help/evolution/el/figures/evo_backup_prgsbar.png
share/gnome/help/evolution/el/figures/evo_backup_warning.png
share/gnome/help/evolution/el/figures/evo_blink.png
-share/gnome/help/evolution/el/figures/evo_cal_a.png
-share/gnome/help/evolution/el/figures/evo_cal_advsearch.png
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
-share/gnome/help/evolution/el/figures/evo_debuglogs_a.png
share/gnome/help/evolution/el/figures/evo_delegate_permission_a.png
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_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
-share/gnome/help/evolution/el/figures/evo_gwreceiveoptedit_a.png
share/gnome/help/evolution/el/figures/evo_gwstatustrack.png
-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
share/gnome/help/evolution/el/figures/evo_labels_a.png
@@ -1053,93 +1057,64 @@ share/gnome/help/evolution/el/figures/evo_mail_notifier.png
share/gnome/help/evolution/el/figures/evo_maildirreceive_a.png
share/gnome/help/evolution/el/figures/evo_mboxreceive_a.png
share/gnome/help/evolution/el/figures/evo_memo_a.png
-share/gnome/help/evolution/el/figures/evo_mereceive_a.png
-share/gnome/help/evolution/el/figures/evo_message_filters_a.png
share/gnome/help/evolution/el/figures/evo_mhreceive_a.png
share/gnome/help/evolution/el/figures/evo_newmail.png
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_setup_a.png
-share/gnome/help/evolution/el/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/el/figures/evo_rule_a.png
-share/gnome/help/evolution/el/figures/evo_select_add_folder.png
-share/gnome/help/evolution/el/figures/evo_select_folder.png
share/gnome/help/evolution/el/figures/evo_send_option_a.png
share/gnome/help/evolution/el/figures/evo_send_setup_a.png
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/exchg-identity.png
-share/gnome/help/evolution/el/figures/exchng-identity.png
-share/gnome/help/evolution/el/figures/exchng-rec-mail.png
+share/gnome/help/evolution/el/figures/evolution_contact_preference.png
+share/gnome/help/evolution/el/figures/evolution_mail_preference.png
share/gnome/help/evolution/el/figures/exchng-rec-mails.png
-share/gnome/help/evolution/el/figures/exchng-rec-option.png
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/folder_plus.png
+share/gnome/help/evolution/el/figures/folder_size_mapi.png
+share/gnome/help/evolution/el/figures/folder_size_preference.png
share/gnome/help/evolution/el/figures/google_cal_view.png
-share/gnome/help/evolution/el/figures/mail-threaded.png
+share/gnome/help/evolution/el/figures/groupwise_resend.png
+share/gnome/help/evolution/el/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/el/figures/local_ics_calendar.png
share/gnome/help/evolution/el/figures/mailer_preferences.png
+share/gnome/help/evolution/el/figures/meeting.png
share/gnome/help/evolution/el/figures/minus.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/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/en_GB/evolution.xml
-share/gnome/help/evolution/en_GB/figures/account_editor_a.png
share/gnome/help/evolution/en_GB/figures/attach_reminder_a.png
+share/gnome/help/evolution/en_GB/figures/calendar_preference_display.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/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_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
-share/gnome/help/evolution/en_GB/figures/evo_backup.png
share/gnome/help/evolution/en_GB/figures/evo_backup_prgsbar.png
share/gnome/help/evolution/en_GB/figures/evo_backup_warning.png
share/gnome/help/evolution/en_GB/figures/evo_blink.png
-share/gnome/help/evolution/en_GB/figures/evo_cal_a.png
-share/gnome/help/evolution/en_GB/figures/evo_cal_advsearch.png
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
-share/gnome/help/evolution/en_GB/figures/evo_debuglogs_a.png
share/gnome/help/evolution/en_GB/figures/evo_delegate_permission_a.png
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_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
-share/gnome/help/evolution/en_GB/figures/evo_gwreceiveoptedit_a.png
share/gnome/help/evolution/en_GB/figures/evo_gwstatustrack.png
-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
share/gnome/help/evolution/en_GB/figures/evo_labels_a.png
@@ -1149,93 +1124,64 @@ share/gnome/help/evolution/en_GB/figures/evo_mail_notifier.png
share/gnome/help/evolution/en_GB/figures/evo_maildirreceive_a.png
share/gnome/help/evolution/en_GB/figures/evo_mboxreceive_a.png
share/gnome/help/evolution/en_GB/figures/evo_memo_a.png
-share/gnome/help/evolution/en_GB/figures/evo_mereceive_a.png
-share/gnome/help/evolution/en_GB/figures/evo_message_filters_a.png
share/gnome/help/evolution/en_GB/figures/evo_mhreceive_a.png
share/gnome/help/evolution/en_GB/figures/evo_newmail.png
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_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
-share/gnome/help/evolution/en_GB/figures/evo_select_add_folder.png
-share/gnome/help/evolution/en_GB/figures/evo_select_folder.png
share/gnome/help/evolution/en_GB/figures/evo_send_option_a.png
share/gnome/help/evolution/en_GB/figures/evo_send_setup_a.png
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/exchg-identity.png
-share/gnome/help/evolution/en_GB/figures/exchng-identity.png
-share/gnome/help/evolution/en_GB/figures/exchng-rec-mail.png
+share/gnome/help/evolution/en_GB/figures/evolution_contact_preference.png
+share/gnome/help/evolution/en_GB/figures/evolution_mail_preference.png
share/gnome/help/evolution/en_GB/figures/exchng-rec-mails.png
-share/gnome/help/evolution/en_GB/figures/exchng-rec-option.png
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/folder_plus.png
+share/gnome/help/evolution/en_GB/figures/folder_size_mapi.png
+share/gnome/help/evolution/en_GB/figures/folder_size_preference.png
share/gnome/help/evolution/en_GB/figures/google_cal_view.png
-share/gnome/help/evolution/en_GB/figures/mail-threaded.png
+share/gnome/help/evolution/en_GB/figures/groupwise_resend.png
+share/gnome/help/evolution/en_GB/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/en_GB/figures/local_ics_calendar.png
share/gnome/help/evolution/en_GB/figures/mailer_preferences.png
+share/gnome/help/evolution/en_GB/figures/meeting.png
share/gnome/help/evolution/en_GB/figures/minus.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/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/es/evolution.xml
-share/gnome/help/evolution/es/figures/account_editor_a.png
share/gnome/help/evolution/es/figures/attach_reminder_a.png
+share/gnome/help/evolution/es/figures/calendar_preference_display.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/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_adv_search_a.png
-share/gnome/help/evolution/es/figures/evo_allday_a.png
share/gnome/help/evolution/es/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/es/figures/evo_backup.png
share/gnome/help/evolution/es/figures/evo_backup_prgsbar.png
share/gnome/help/evolution/es/figures/evo_backup_warning.png
share/gnome/help/evolution/es/figures/evo_blink.png
-share/gnome/help/evolution/es/figures/evo_cal_a.png
-share/gnome/help/evolution/es/figures/evo_cal_advsearch.png
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
-share/gnome/help/evolution/es/figures/evo_debuglogs_a.png
share/gnome/help/evolution/es/figures/evo_delegate_permission_a.png
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_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
-share/gnome/help/evolution/es/figures/evo_gwreceiveoptedit_a.png
share/gnome/help/evolution/es/figures/evo_gwstatustrack.png
-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
share/gnome/help/evolution/es/figures/evo_labels_a.png
@@ -1245,93 +1191,64 @@ share/gnome/help/evolution/es/figures/evo_mail_notifier.png
share/gnome/help/evolution/es/figures/evo_maildirreceive_a.png
share/gnome/help/evolution/es/figures/evo_mboxreceive_a.png
share/gnome/help/evolution/es/figures/evo_memo_a.png
-share/gnome/help/evolution/es/figures/evo_mereceive_a.png
-share/gnome/help/evolution/es/figures/evo_message_filters_a.png
share/gnome/help/evolution/es/figures/evo_mhreceive_a.png
share/gnome/help/evolution/es/figures/evo_newmail.png
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_setup_a.png
-share/gnome/help/evolution/es/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/es/figures/evo_rule_a.png
-share/gnome/help/evolution/es/figures/evo_select_add_folder.png
-share/gnome/help/evolution/es/figures/evo_select_folder.png
share/gnome/help/evolution/es/figures/evo_send_option_a.png
share/gnome/help/evolution/es/figures/evo_send_setup_a.png
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/exchg-identity.png
-share/gnome/help/evolution/es/figures/exchng-identity.png
-share/gnome/help/evolution/es/figures/exchng-rec-mail.png
+share/gnome/help/evolution/es/figures/evolution_contact_preference.png
+share/gnome/help/evolution/es/figures/evolution_mail_preference.png
share/gnome/help/evolution/es/figures/exchng-rec-mails.png
-share/gnome/help/evolution/es/figures/exchng-rec-option.png
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/folder_plus.png
+share/gnome/help/evolution/es/figures/folder_size_mapi.png
+share/gnome/help/evolution/es/figures/folder_size_preference.png
share/gnome/help/evolution/es/figures/google_cal_view.png
-share/gnome/help/evolution/es/figures/mail-threaded.png
+share/gnome/help/evolution/es/figures/groupwise_resend.png
+share/gnome/help/evolution/es/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/es/figures/local_ics_calendar.png
share/gnome/help/evolution/es/figures/mailer_preferences.png
+share/gnome/help/evolution/es/figures/meeting.png
share/gnome/help/evolution/es/figures/minus.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/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/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/calendar_preference_display.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
@@ -1341,93 +1258,64 @@ 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/evolution_contact_preference.png
+share/gnome/help/evolution/eu/figures/evolution_mail_preference.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/folder_plus.png
+share/gnome/help/evolution/eu/figures/folder_size_mapi.png
+share/gnome/help/evolution/eu/figures/folder_size_preference.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/groupwise_resend.png
+share/gnome/help/evolution/eu/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/eu/figures/local_ics_calendar.png
share/gnome/help/evolution/eu/figures/mailer_preferences.png
+share/gnome/help/evolution/eu/figures/meeting.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/account_editor_a.png
share/gnome/help/evolution/fr/figures/attach_reminder_a.png
+share/gnome/help/evolution/fr/figures/calendar_preference_display.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/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_adv_search_a.png
-share/gnome/help/evolution/fr/figures/evo_allday_a.png
share/gnome/help/evolution/fr/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/fr/figures/evo_backup.png
share/gnome/help/evolution/fr/figures/evo_backup_prgsbar.png
share/gnome/help/evolution/fr/figures/evo_backup_warning.png
share/gnome/help/evolution/fr/figures/evo_blink.png
-share/gnome/help/evolution/fr/figures/evo_cal_a.png
-share/gnome/help/evolution/fr/figures/evo_cal_advsearch.png
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
-share/gnome/help/evolution/fr/figures/evo_debuglogs_a.png
share/gnome/help/evolution/fr/figures/evo_delegate_permission_a.png
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_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
-share/gnome/help/evolution/fr/figures/evo_gwreceiveoptedit_a.png
share/gnome/help/evolution/fr/figures/evo_gwstatustrack.png
-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
share/gnome/help/evolution/fr/figures/evo_labels_a.png
@@ -1437,93 +1325,64 @@ share/gnome/help/evolution/fr/figures/evo_mail_notifier.png
share/gnome/help/evolution/fr/figures/evo_maildirreceive_a.png
share/gnome/help/evolution/fr/figures/evo_mboxreceive_a.png
share/gnome/help/evolution/fr/figures/evo_memo_a.png
-share/gnome/help/evolution/fr/figures/evo_mereceive_a.png
-share/gnome/help/evolution/fr/figures/evo_message_filters_a.png
share/gnome/help/evolution/fr/figures/evo_mhreceive_a.png
share/gnome/help/evolution/fr/figures/evo_newmail.png
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_setup_a.png
-share/gnome/help/evolution/fr/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/fr/figures/evo_rule_a.png
-share/gnome/help/evolution/fr/figures/evo_select_add_folder.png
-share/gnome/help/evolution/fr/figures/evo_select_folder.png
share/gnome/help/evolution/fr/figures/evo_send_option_a.png
share/gnome/help/evolution/fr/figures/evo_send_setup_a.png
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/exchg-identity.png
-share/gnome/help/evolution/fr/figures/exchng-identity.png
-share/gnome/help/evolution/fr/figures/exchng-rec-mail.png
+share/gnome/help/evolution/fr/figures/evolution_contact_preference.png
+share/gnome/help/evolution/fr/figures/evolution_mail_preference.png
share/gnome/help/evolution/fr/figures/exchng-rec-mails.png
-share/gnome/help/evolution/fr/figures/exchng-rec-option.png
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/folder_plus.png
+share/gnome/help/evolution/fr/figures/folder_size_mapi.png
+share/gnome/help/evolution/fr/figures/folder_size_preference.png
share/gnome/help/evolution/fr/figures/google_cal_view.png
-share/gnome/help/evolution/fr/figures/mail-threaded.png
+share/gnome/help/evolution/fr/figures/groupwise_resend.png
+share/gnome/help/evolution/fr/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/fr/figures/local_ics_calendar.png
share/gnome/help/evolution/fr/figures/mailer_preferences.png
+share/gnome/help/evolution/fr/figures/meeting.png
share/gnome/help/evolution/fr/figures/minus.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/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/mk/evolution.xml
-share/gnome/help/evolution/mk/figures/account_editor_a.png
share/gnome/help/evolution/mk/figures/attach_reminder_a.png
+share/gnome/help/evolution/mk/figures/calendar_preference_display.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/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_adv_search_a.png
-share/gnome/help/evolution/mk/figures/evo_allday_a.png
share/gnome/help/evolution/mk/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/mk/figures/evo_backup.png
share/gnome/help/evolution/mk/figures/evo_backup_prgsbar.png
share/gnome/help/evolution/mk/figures/evo_backup_warning.png
share/gnome/help/evolution/mk/figures/evo_blink.png
-share/gnome/help/evolution/mk/figures/evo_cal_a.png
-share/gnome/help/evolution/mk/figures/evo_cal_advsearch.png
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
-share/gnome/help/evolution/mk/figures/evo_debuglogs_a.png
share/gnome/help/evolution/mk/figures/evo_delegate_permission_a.png
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_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
-share/gnome/help/evolution/mk/figures/evo_gwreceiveoptedit_a.png
share/gnome/help/evolution/mk/figures/evo_gwstatustrack.png
-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
share/gnome/help/evolution/mk/figures/evo_labels_a.png
@@ -1533,93 +1392,64 @@ share/gnome/help/evolution/mk/figures/evo_mail_notifier.png
share/gnome/help/evolution/mk/figures/evo_maildirreceive_a.png
share/gnome/help/evolution/mk/figures/evo_mboxreceive_a.png
share/gnome/help/evolution/mk/figures/evo_memo_a.png
-share/gnome/help/evolution/mk/figures/evo_mereceive_a.png
-share/gnome/help/evolution/mk/figures/evo_message_filters_a.png
share/gnome/help/evolution/mk/figures/evo_mhreceive_a.png
share/gnome/help/evolution/mk/figures/evo_newmail.png
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_setup_a.png
-share/gnome/help/evolution/mk/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/mk/figures/evo_rule_a.png
-share/gnome/help/evolution/mk/figures/evo_select_add_folder.png
-share/gnome/help/evolution/mk/figures/evo_select_folder.png
share/gnome/help/evolution/mk/figures/evo_send_option_a.png
share/gnome/help/evolution/mk/figures/evo_send_setup_a.png
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/exchg-identity.png
-share/gnome/help/evolution/mk/figures/exchng-identity.png
-share/gnome/help/evolution/mk/figures/exchng-rec-mail.png
+share/gnome/help/evolution/mk/figures/evolution_contact_preference.png
+share/gnome/help/evolution/mk/figures/evolution_mail_preference.png
share/gnome/help/evolution/mk/figures/exchng-rec-mails.png
-share/gnome/help/evolution/mk/figures/exchng-rec-option.png
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/folder_plus.png
+share/gnome/help/evolution/mk/figures/folder_size_mapi.png
+share/gnome/help/evolution/mk/figures/folder_size_preference.png
share/gnome/help/evolution/mk/figures/google_cal_view.png
-share/gnome/help/evolution/mk/figures/mail-threaded.png
+share/gnome/help/evolution/mk/figures/groupwise_resend.png
+share/gnome/help/evolution/mk/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/mk/figures/local_ics_calendar.png
share/gnome/help/evolution/mk/figures/mailer_preferences.png
+share/gnome/help/evolution/mk/figures/meeting.png
share/gnome/help/evolution/mk/figures/minus.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/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/oc/evolution.xml
-share/gnome/help/evolution/oc/figures/account_editor_a.png
share/gnome/help/evolution/oc/figures/attach_reminder_a.png
+share/gnome/help/evolution/oc/figures/calendar_preference_display.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/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_adv_search_a.png
-share/gnome/help/evolution/oc/figures/evo_allday_a.png
share/gnome/help/evolution/oc/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/oc/figures/evo_backup.png
share/gnome/help/evolution/oc/figures/evo_backup_prgsbar.png
share/gnome/help/evolution/oc/figures/evo_backup_warning.png
share/gnome/help/evolution/oc/figures/evo_blink.png
-share/gnome/help/evolution/oc/figures/evo_cal_a.png
-share/gnome/help/evolution/oc/figures/evo_cal_advsearch.png
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
-share/gnome/help/evolution/oc/figures/evo_debuglogs_a.png
share/gnome/help/evolution/oc/figures/evo_delegate_permission_a.png
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_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
-share/gnome/help/evolution/oc/figures/evo_gwreceiveoptedit_a.png
share/gnome/help/evolution/oc/figures/evo_gwstatustrack.png
-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
share/gnome/help/evolution/oc/figures/evo_labels_a.png
@@ -1629,93 +1459,64 @@ share/gnome/help/evolution/oc/figures/evo_mail_notifier.png
share/gnome/help/evolution/oc/figures/evo_maildirreceive_a.png
share/gnome/help/evolution/oc/figures/evo_mboxreceive_a.png
share/gnome/help/evolution/oc/figures/evo_memo_a.png
-share/gnome/help/evolution/oc/figures/evo_mereceive_a.png
-share/gnome/help/evolution/oc/figures/evo_message_filters_a.png
share/gnome/help/evolution/oc/figures/evo_mhreceive_a.png
share/gnome/help/evolution/oc/figures/evo_newmail.png
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_setup_a.png
-share/gnome/help/evolution/oc/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/oc/figures/evo_rule_a.png
-share/gnome/help/evolution/oc/figures/evo_select_add_folder.png
-share/gnome/help/evolution/oc/figures/evo_select_folder.png
share/gnome/help/evolution/oc/figures/evo_send_option_a.png
share/gnome/help/evolution/oc/figures/evo_send_setup_a.png
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/exchg-identity.png
-share/gnome/help/evolution/oc/figures/exchng-identity.png
-share/gnome/help/evolution/oc/figures/exchng-rec-mail.png
+share/gnome/help/evolution/oc/figures/evolution_contact_preference.png
+share/gnome/help/evolution/oc/figures/evolution_mail_preference.png
share/gnome/help/evolution/oc/figures/exchng-rec-mails.png
-share/gnome/help/evolution/oc/figures/exchng-rec-option.png
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/folder_plus.png
+share/gnome/help/evolution/oc/figures/folder_size_mapi.png
+share/gnome/help/evolution/oc/figures/folder_size_preference.png
share/gnome/help/evolution/oc/figures/google_cal_view.png
-share/gnome/help/evolution/oc/figures/mail-threaded.png
+share/gnome/help/evolution/oc/figures/groupwise_resend.png
+share/gnome/help/evolution/oc/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/oc/figures/local_ics_calendar.png
share/gnome/help/evolution/oc/figures/mailer_preferences.png
+share/gnome/help/evolution/oc/figures/meeting.png
share/gnome/help/evolution/oc/figures/minus.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/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/ru/evolution.xml
-share/gnome/help/evolution/ru/figures/account_editor_a.png
share/gnome/help/evolution/ru/figures/attach_reminder_a.png
+share/gnome/help/evolution/ru/figures/calendar_preference_display.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/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_adv_search_a.png
-share/gnome/help/evolution/ru/figures/evo_allday_a.png
share/gnome/help/evolution/ru/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/ru/figures/evo_backup.png
share/gnome/help/evolution/ru/figures/evo_backup_prgsbar.png
share/gnome/help/evolution/ru/figures/evo_backup_warning.png
share/gnome/help/evolution/ru/figures/evo_blink.png
-share/gnome/help/evolution/ru/figures/evo_cal_a.png
-share/gnome/help/evolution/ru/figures/evo_cal_advsearch.png
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
-share/gnome/help/evolution/ru/figures/evo_debuglogs_a.png
share/gnome/help/evolution/ru/figures/evo_delegate_permission_a.png
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_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
-share/gnome/help/evolution/ru/figures/evo_gwreceiveoptedit_a.png
share/gnome/help/evolution/ru/figures/evo_gwstatustrack.png
-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
share/gnome/help/evolution/ru/figures/evo_labels_a.png
@@ -1725,93 +1526,64 @@ share/gnome/help/evolution/ru/figures/evo_mail_notifier.png
share/gnome/help/evolution/ru/figures/evo_maildirreceive_a.png
share/gnome/help/evolution/ru/figures/evo_mboxreceive_a.png
share/gnome/help/evolution/ru/figures/evo_memo_a.png
-share/gnome/help/evolution/ru/figures/evo_mereceive_a.png
-share/gnome/help/evolution/ru/figures/evo_message_filters_a.png
share/gnome/help/evolution/ru/figures/evo_mhreceive_a.png
share/gnome/help/evolution/ru/figures/evo_newmail.png
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_setup_a.png
-share/gnome/help/evolution/ru/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/ru/figures/evo_rule_a.png
-share/gnome/help/evolution/ru/figures/evo_select_add_folder.png
-share/gnome/help/evolution/ru/figures/evo_select_folder.png
share/gnome/help/evolution/ru/figures/evo_send_option_a.png
share/gnome/help/evolution/ru/figures/evo_send_setup_a.png
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/exchg-identity.png
-share/gnome/help/evolution/ru/figures/exchng-identity.png
-share/gnome/help/evolution/ru/figures/exchng-rec-mail.png
+share/gnome/help/evolution/ru/figures/evolution_contact_preference.png
+share/gnome/help/evolution/ru/figures/evolution_mail_preference.png
share/gnome/help/evolution/ru/figures/exchng-rec-mails.png
-share/gnome/help/evolution/ru/figures/exchng-rec-option.png
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/folder_plus.png
+share/gnome/help/evolution/ru/figures/folder_size_mapi.png
+share/gnome/help/evolution/ru/figures/folder_size_preference.png
share/gnome/help/evolution/ru/figures/google_cal_view.png
-share/gnome/help/evolution/ru/figures/mail-threaded.png
+share/gnome/help/evolution/ru/figures/groupwise_resend.png
+share/gnome/help/evolution/ru/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/ru/figures/local_ics_calendar.png
share/gnome/help/evolution/ru/figures/mailer_preferences.png
+share/gnome/help/evolution/ru/figures/meeting.png
share/gnome/help/evolution/ru/figures/minus.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/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/sv/evolution.xml
-share/gnome/help/evolution/sv/figures/account_editor_a.png
share/gnome/help/evolution/sv/figures/attach_reminder_a.png
+share/gnome/help/evolution/sv/figures/calendar_preference_display.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/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_adv_search_a.png
-share/gnome/help/evolution/sv/figures/evo_allday_a.png
share/gnome/help/evolution/sv/figures/evo_attachreminder_plugin.png
-share/gnome/help/evolution/sv/figures/evo_backup.png
share/gnome/help/evolution/sv/figures/evo_backup_prgsbar.png
share/gnome/help/evolution/sv/figures/evo_backup_warning.png
share/gnome/help/evolution/sv/figures/evo_blink.png
-share/gnome/help/evolution/sv/figures/evo_cal_a.png
-share/gnome/help/evolution/sv/figures/evo_cal_advsearch.png
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
-share/gnome/help/evolution/sv/figures/evo_debuglogs_a.png
share/gnome/help/evolution/sv/figures/evo_delegate_permission_a.png
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_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
-share/gnome/help/evolution/sv/figures/evo_gwreceiveoptedit_a.png
share/gnome/help/evolution/sv/figures/evo_gwstatustrack.png
-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
share/gnome/help/evolution/sv/figures/evo_labels_a.png
@@ -1821,46 +1593,37 @@ share/gnome/help/evolution/sv/figures/evo_mail_notifier.png
share/gnome/help/evolution/sv/figures/evo_maildirreceive_a.png
share/gnome/help/evolution/sv/figures/evo_mboxreceive_a.png
share/gnome/help/evolution/sv/figures/evo_memo_a.png
-share/gnome/help/evolution/sv/figures/evo_mereceive_a.png
-share/gnome/help/evolution/sv/figures/evo_message_filters_a.png
share/gnome/help/evolution/sv/figures/evo_mhreceive_a.png
share/gnome/help/evolution/sv/figures/evo_newmail.png
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_setup_a.png
-share/gnome/help/evolution/sv/figures/evo_rmdrnotes_a.png
share/gnome/help/evolution/sv/figures/evo_rule_a.png
-share/gnome/help/evolution/sv/figures/evo_select_add_folder.png
-share/gnome/help/evolution/sv/figures/evo_select_folder.png
share/gnome/help/evolution/sv/figures/evo_send_option_a.png
share/gnome/help/evolution/sv/figures/evo_send_setup_a.png
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/exchg-identity.png
-share/gnome/help/evolution/sv/figures/exchng-identity.png
-share/gnome/help/evolution/sv/figures/exchng-rec-mail.png
+share/gnome/help/evolution/sv/figures/evolution_contact_preference.png
+share/gnome/help/evolution/sv/figures/evolution_mail_preference.png
share/gnome/help/evolution/sv/figures/exchng-rec-mails.png
-share/gnome/help/evolution/sv/figures/exchng-rec-option.png
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/folder_plus.png
+share/gnome/help/evolution/sv/figures/folder_size_mapi.png
+share/gnome/help/evolution/sv/figures/folder_size_preference.png
share/gnome/help/evolution/sv/figures/google_cal_view.png
-share/gnome/help/evolution/sv/figures/mail-threaded.png
+share/gnome/help/evolution/sv/figures/groupwise_resend.png
+share/gnome/help/evolution/sv/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/sv/figures/local_ics_calendar.png
share/gnome/help/evolution/sv/figures/mailer_preferences.png
+share/gnome/help/evolution/sv/figures/meeting.png
share/gnome/help/evolution/sv/figures/minus.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/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/icons/hicolor/16x16/apps/evolution-mail.png
share/icons/hicolor/16x16/apps/evolution-memos.png
@@ -1902,6 +1665,7 @@ share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/bn_IN/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/bs/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/ca@valencia/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/cy/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/da/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -2040,6 +1804,7 @@ share/omf/evolution/evolution-sv.omf
@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/apps
@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions
@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/status
@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places
@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/apps
@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions
@@ -2076,6 +1841,9 @@ share/omf/evolution/evolution-sv.omf
@dirrm %%DATADIR%%/%%VERSION%%/default/sr/mail/local
@dirrm %%DATADIR%%/%%VERSION%%/default/sr/mail
@dirrm %%DATADIR%%/%%VERSION%%/default/sr
+@dirrm %%DATADIR%%/%%VERSION%%/default/ro/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/ro/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/ro
@dirrm %%DATADIR%%/%%VERSION%%/default/pt/mail/local
@dirrm %%DATADIR%%/%%VERSION%%/default/pt/mail
@dirrm %%DATADIR%%/%%VERSION%%/default/pt
@@ -2140,6 +1908,7 @@ share/omf/evolution/evolution-sv.omf
@dirrm include/evolution-%%VERSION%%/misc
@dirrm include/evolution-%%VERSION%%/menus
@dirrm include/evolution-%%VERSION%%/mail
+@dirrm include/evolution-%%VERSION%%/filter
@dirrm include/evolution-%%VERSION%%/e-util
@dirrm include/evolution-%%VERSION%%/e-conduit
@dirrm include/evolution-%%VERSION%%/composer
@@ -2174,6 +1943,8 @@ share/omf/evolution/evolution-sv.omf
@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
diff --git a/mail/libmapi/Makefile b/mail/libmapi/Makefile
new file mode 100644
index 000000000000..dbe082a80c0b
--- /dev/null
+++ b/mail/libmapi/Makefile
@@ -0,0 +1,76 @@
+# New ports collection makefile for: libmapi
+# Date created: 1 May 2009
+# Whom: Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libmapi
+PORTVERSION= 0.8.2
+CATEGORIES= mail
+MASTER_SITES= SF
+MASTER_SITE_SUBDIR=openchange/libmapi/${PORTNAME}-${PORTVERSION}/
+DISTNAME= ${PORTNAME}-${PORTVERSION}-${CODENAME}
+
+MAINTAINER= kwm@FreeBSD.org
+COMMENT= Open Source implementation of Microsoft Exchange protocols
+
+BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
+ ${HOSTCONFIG}:${PORTSDIR}/net/samba4-devel \
+ pidl:${PORTSDIR}/devel/p5-Parse-Pidl
+LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \
+ ical.43:${PORTSDIR}/devel/libical \
+ tdb.1:${PORTSDIR}/databases/tdb \
+ talloc.1:${PORTSDIR}/devel/talloc
+RUN_DEPENDS= ${HOSTCONFIG}:${PORTSDIR}/net/samba4-devel
+
+HOSTCONFIG= ${LOCALBASE}/libdata/pkgconfig/samba-hostconfig.pc
+
+CODENAME= ROMULUS
+USE_GMAKE= yes
+USE_GNOME= pkgconfig
+USE_PYTHON= yes
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --with-samba=${LOCALBASE}
+
+OPTIONS= BOOST "Enable libmapi++ (needs boost)" yes \
+ DOXYGEN "Enble building documentation" no
+
+.include <bsd.port.pre.mk>
+
+CONFIGURE_ARGS+= --disable-swig-perl
+CONFIGURE_ARGS+= --disable-pymapi
+
+.if exists(${LOCALBASE}/lib/libboost_thread.so)
+WITH_BOOST=yes
+.endif
+
+.if defined(WITH_BOOST)
+LIB_DEPENDS+= boost_thread.4:${PORTSDIR}/devel/boost-libs
+PLIST_SUB+= BOOST=""
+.else
+PLIST_SUB+= BOOST="@comment "
+.endif
+
+.if defined(WITH_DOXYGEN) || exists(${LOCALBASE}/bin/doxygen)
+BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen
+PLIST_SUB+= DOXYGEN=""
+.else
+PLIST_SUB+= DOXYGEN="@comment "
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|/bin/sh|${LOCALBASE}/bin/bash|g' \
+ ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+ ${WRKSRC}/Makefile
+
+post-install:
+.for i in libmapi libmapiadmin libmapiproxy libmapiserver libmapistore libocpf
+ @${LN} -fs ${PREFIX}/lib/${i}.so.0.8 ${PREFIX}/lib/${i}.so.0
+.endfor
+
+.include <bsd.port.post.mk>
diff --git a/mail/libmapi/distinfo b/mail/libmapi/distinfo
new file mode 100644
index 000000000000..abf1d13dd538
--- /dev/null
+++ b/mail/libmapi/distinfo
@@ -0,0 +1,3 @@
+MD5 (libmapi-0.8.2-ROMULUS.tar.gz) = b956870860cd786a0793bd89783df185
+SHA256 (libmapi-0.8.2-ROMULUS.tar.gz) = 82dfe90fdc5ba0b34950719ea0ea9cc1cf7835bd1a9127fd177435e1eeba0ffa
+SIZE (libmapi-0.8.2-ROMULUS.tar.gz) = 1529269
diff --git a/mail/libmapi/pkg-descr b/mail/libmapi/pkg-descr
new file mode 100644
index 000000000000..2f78882e5b79
--- /dev/null
+++ b/mail/libmapi/pkg-descr
@@ -0,0 +1,12 @@
+The OpenChange MAPI library aims to provide interoperability with an
+Open Source implementation of Microsoft Exchange protocols under UNIX/Linux.
+The current implementation offers a client-side library which can be used in
+existing messaging clients and offer native compatibility with Exchange Servers
+up to 2007.
+
+MAPI stands for Messaging Application Programming Interface and is used in the
+Microsoft Exchange Server groupware server. This solution works with Outlook
+and provides collaborative features such as a messaging server, shared
+calendars, contact databases, public folders and tasks.
+
+WWW: http://www.openchange.org
diff --git a/mail/libmapi/pkg-plist b/mail/libmapi/pkg-plist
new file mode 100644
index 000000000000..7bac15f50679
--- /dev/null
+++ b/mail/libmapi/pkg-plist
@@ -0,0 +1,119 @@
+bin/exchange2ical
+bin/exchange2mbox
+bin/locale_codepage
+bin/mapiprofile
+bin/mapitest
+bin/openchangeclient
+bin/openchangemapidump
+bin/openchangepfadmin
+bin/schemaIDGUID
+include/gen_ndr/exchange.h
+include/gen_ndr/property.h
+%%BOOST%%include/libmapi++/attachment.h
+%%BOOST%%include/libmapi++/clibmapi.h
+%%BOOST%%include/libmapi++/folder.h
+%%BOOST%%include/libmapi++/impl/message.ipp
+%%BOOST%%include/libmapi++/impl/object.ipp
+%%BOOST%%include/libmapi++/impl/session.ipp
+%%BOOST%%include/libmapi++/libmapi++.h
+%%BOOST%%include/libmapi++/mapi_exception.h
+%%BOOST%%include/libmapi++/message.h
+%%BOOST%%include/libmapi++/message_store.h
+%%BOOST%%include/libmapi++/object.h
+%%BOOST%%include/libmapi++/profile.h
+%%BOOST%%include/libmapi++/property_container.h
+%%BOOST%%include/libmapi++/session.h
+include/libmapi/dlinklist.h
+include/libmapi/emsmdb.h
+include/libmapi/libmapi.h
+include/libmapi/mapi_ctx.h
+include/libmapi/mapi_id_array.h
+include/libmapi/mapi_nameid.h
+include/libmapi/mapi_notification.h
+include/libmapi/mapi_object.h
+include/libmapi/mapi_profile.h
+include/libmapi/mapi_provider.h
+include/libmapi/mapicode.h
+include/libmapi/mapidefs.h
+include/libmapi/nspi.h
+include/libmapi/proto.h
+include/libmapi/socket/netif.h
+include/libmapi/version.h
+include/libmapiadmin/libmapiadmin.h
+include/libmapiadmin/proto.h
+include/libmapiproxy.h
+include/libmapiserver.h
+include/libocpf/ocpf.h
+include/libocpf/proto.h
+include/mapistore/mapistore.h
+include/mapistore/mapistore_errors.h
+lib/libmapi.so
+lib/libmapi.so.0
+lib/libmapi.so.0.8
+lib/libmapiadmin.so
+lib/libmapiadmin.so.0
+lib/libmapiadmin.so.0.8
+lib/libmapiproxy.so
+lib/libmapiproxy.so.0
+lib/libmapiproxy.so.0.8
+lib/libmapiserver.so
+lib/libmapiserver.so.0
+lib/libmapiserver.so.0.8
+lib/libmapistore.so
+lib/libmapistore.so.0
+lib/libmapistore.so.0.8
+lib/libocpf.so
+lib/libocpf.so.0
+lib/libocpf.so.0.8
+lib/mapistore_backends/mapistore_sqlite3.so
+lib/nagios/check_exchange
+libdata/pkgconfig/libmapi.pc
+libdata/pkgconfig/libmapiadmin.pc
+libdata/pkgconfig/libmapiproxy.pc
+libdata/pkgconfig/libmapiserver.pc
+libdata/pkgconfig/libocpf.pc
+%%PYTHON_SITELIBDIR%%/openchange/__init__.py
+%%PYTHON_SITELIBDIR%%/openchange/mailbox.py
+%%PYTHON_SITELIBDIR%%/openchange/provision.py
+%%PYTHON_SITELIBDIR%%/openchange/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/openchange/tests/test_mailbox.py
+%%PYTHON_SITELIBDIR%%/openchange/tests/test_provision.py
+modules/dcerpc_mapiproxy/mpm_cache.so
+modules/dcerpc_mapiproxy/mpm_downgrade.so
+modules/dcerpc_mapiproxy/mpm_dummy.so
+modules/dcerpc_mapiproxy/mpm_pack.so
+modules/dcerpc_mapiproxy_server/exchange_ds_rfr.so
+modules/dcerpc_mapiproxy_server/exchange_emsmdb.so
+modules/dcerpc_mapiproxy_server/exchange_nsp.so
+modules/dcerpc_server/dcesrv_mapiproxy.so
+modules/torture/openchange.so
+share/setup/AD/oc_provision_configuration.ldif
+share/setup/AD/oc_provision_schema.ldif
+share/setup/AD/oc_provision_schema_ADSC.ldif
+share/setup/AD/oc_provision_schema_modify.ldif
+share/setup/AD/prefixMap.txt
+share/setup/openchangedb/oc_provision_openchange_init.ldif
+share/setup/openchangedb/oc_provision_openchange_mailbox.ldif
+share/setup/profiles/oc_profiles_init.ldif
+share/setup/profiles/oc_profiles_schema.ldif
+@dirrm share/setup/profiles
+@dirrm share/setup/openchangedb
+@dirrm share/setup/AD
+@dirrm share/setup
+@dirrm %%PYTHON_SITELIBDIR%%/openchange/tests
+@dirrm %%PYTHON_SITELIBDIR%%/openchange
+@dirrm modules/torture
+@dirrm modules/dcerpc_server
+@dirrm modules/dcerpc_mapiproxy_server
+@dirrm modules/dcerpc_mapiproxy
+@dirrmtry modules
+@dirrm lib/nagios
+@dirrm lib/mapistore_backends
+@dirrm include/mapistore
+@dirrm include/libocpf
+@dirrm include/libmapiadmin
+@dirrm include/libmapi/socket
+@dirrm include/libmapi
+%%BOOST%%@dirrm include/libmapi++/impl
+%%BOOST%%@dirrm include/libmapi++
+@dirrm include/gen_ndr
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 59199f5fa4ce..212264dcc05b 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/math/gcalctool/Makefile,v 1.110 2009/03/17 23:29:40 kwm Exp $
+# $MCom: ports/math/gcalctool/Makefile,v 1.123 2009/10/18 23:25:02 avl Exp $
#
PORTNAME= gcalctool
-PORTVERSION= 5.26.3
-PORTREVISION= 1
+PORTVERSION= 5.28.1
PORTEPOCH= 2
CATEGORIES= math gnome
MASTER_SITES= GNOME
@@ -23,7 +22,7 @@ INSTALLS_OMF= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
-USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gnomedocutils libglade2
+USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gnomedocutils gtk20
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo
index a80a5e477383..027e0e5ccb7b 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gcalctool-5.26.3.tar.bz2) = 4208595c1992c50a7f71882a23e76190
-SHA256 (gnome2/gcalctool-5.26.3.tar.bz2) = cd0e3190d322fbbdd494efbdec5ca82e52f92264ed393d842fbfcddba16530da
-SIZE (gnome2/gcalctool-5.26.3.tar.bz2) = 2042869
+MD5 (gnome2/gcalctool-5.28.1.tar.bz2) = c75cdccfa3a1dc7052dbec33f83809fe
+SHA256 (gnome2/gcalctool-5.28.1.tar.bz2) = a960bd46a5faffd8c8cd6dac71be281aec4454d8954062fd26269ed8615f7731
+SIZE (gnome2/gcalctool-5.28.1.tar.bz2) = 2209471
diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist
index b8724cd4e423..b2e862d86bb0 100644
--- a/math/gcalctool/pkg-plist
+++ b/math/gcalctool/pkg-plist
@@ -1,8 +1,8 @@
bin/gcalctool
bin/gnome-calculator
share/applications/gcalctool.desktop
-%%DATADIR%%/gcalctool.glade
-%%DATADIR%%/financial.glade
+%%DATADIR%%/gcalctool.ui
+%%DATADIR%%/financial.ui
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
diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile
index e92b93641f2d..334505528af9 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-stable/misc/gnome-devel-docs/Makefile,v 1.1 2009/04/16 07:49:58 kwm Exp $
+# $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.14 2009/11/20 07:35:13 avl Exp $
#
PORTNAME= gnome-devel-docs
-PORTVERSION= 2.26.2
+PORTVERSION= 2.28.1
CATEGORIES= misc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/misc/gnome-devel-docs/distinfo b/misc/gnome-devel-docs/distinfo
index e124b8337eb1..37d567ccdabd 100644
--- a/misc/gnome-devel-docs/distinfo
+++ b/misc/gnome-devel-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-devel-docs-2.26.2.tar.bz2) = e07e79a0cf5c55c7a30ef6929aed7f1c
-SHA256 (gnome2/gnome-devel-docs-2.26.2.tar.bz2) = 535f704a60fa49695b8f6a4a12f4efec627fa853e50a90ac4c229bdaeaa4920c
-SIZE (gnome2/gnome-devel-docs-2.26.2.tar.bz2) = 3500795
+MD5 (gnome2/gnome-devel-docs-2.28.1.tar.bz2) = 8099366db75003bfa9aa940f32a5ea76
+SHA256 (gnome2/gnome-devel-docs-2.28.1.tar.bz2) = 3b3e6a8a94d94d1226a415f81b9949e4754a709a386def80374c0d9ec0838f82
+SIZE (gnome2/gnome-devel-docs-2.28.1.tar.bz2) = 4190798
diff --git a/misc/gnome-devel-docs/pkg-plist b/misc/gnome-devel-docs/pkg-plist
index 792b3a28f831..83938ecaa128 100644
--- a/misc/gnome-devel-docs/pkg-plist
+++ b/misc/gnome-devel-docs/pkg-plist
@@ -22,6 +22,27 @@ 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/accessibility-devel-guide/es/accessibility-devel-guide.xml
+share/gnome/help/accessibility-devel-guide/es/figures/at-arch.png
+share/gnome/help/accessibility-devel-guide/es/figures/badfocus1.png
+share/gnome/help/accessibility-devel-guide/es/figures/badfocus2.png
+share/gnome/help/accessibility-devel-guide/es/figures/badfocus3.png
+share/gnome/help/accessibility-devel-guide/es/figures/colour_and_arrows.png
+share/gnome/help/accessibility-devel-guide/es/figures/colour_only.png
+share/gnome/help/accessibility-devel-guide/es/figures/depend1a.png
+share/gnome/help/accessibility-devel-guide/es/figures/depend1.png
+share/gnome/help/accessibility-devel-guide/es/figures/depend2a.png
+share/gnome/help/accessibility-devel-guide/es/figures/depend2.png
+share/gnome/help/accessibility-devel-guide/es/figures/depend3.png
+share/gnome/help/accessibility-devel-guide/es/figures/GNOME_desktop_Accessibility.png
+share/gnome/help/accessibility-devel-guide/es/figures/goodfocus2.png
+share/gnome/help/accessibility-devel-guide/es/figures/goodfocus3.png
+share/gnome/help/accessibility-devel-guide/es/figures/goodfocus.png
+share/gnome/help/accessibility-devel-guide/es/figures/label_above.png
+share/gnome/help/accessibility-devel-guide/es/figures/label_below.png
+share/gnome/help/accessibility-devel-guide/es/figures/label_left.png
+share/gnome/help/accessibility-devel-guide/es/figures/label_right.png
+share/gnome/help/accessibility-devel-guide/es/figures/nodrop.png
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
@@ -300,6 +321,546 @@ share/gnome/help/hig-book/C/images/windows-sdi.png
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/hig-book/de/hig-book.xml
+share/gnome/help/hig-book/de/images/controls-buttons.png
+share/gnome/help/hig-book/de/images/controls-check-box-ambiguous.png
+share/gnome/help/hig-book/de/images/controls-check-boxes-mixed.png
+share/gnome/help/hig-book/de/images/controls-check-boxes.png
+share/gnome/help/hig-book/de/images/controls-combo.png
+share/gnome/help/hig-book/de/images/controls-frames.png
+share/gnome/help/hig-book/de/images/controls-list-checkbox.png
+share/gnome/help/hig-book/de/images/controls-list.png
+share/gnome/help/hig-book/de/images/controls-locked.png
+share/gnome/help/hig-book/de/images/controls-notebook-list.png
+share/gnome/help/hig-book/de/images/controls-notebook-tabs.png
+share/gnome/help/hig-book/de/images/controls-notebook.png
+share/gnome/help/hig-book/de/images/controls-old-frames.png
+share/gnome/help/hig-book/de/images/controls-option-menu.png
+share/gnome/help/hig-book/de/images/controls-progress-indeterminate.png
+share/gnome/help/hig-book/de/images/controls-progress-time.png
+share/gnome/help/hig-book/de/images/controls-progress-typical.png
+share/gnome/help/hig-book/de/images/controls-radio-button-mixed.png
+share/gnome/help/hig-book/de/images/controls-radio-buttons.png
+share/gnome/help/hig-book/de/images/controls-sensitivity.png
+share/gnome/help/hig-book/de/images/controls-slider-spinbox.png
+share/gnome/help/hig-book/de/images/controls-slider.png
+share/gnome/help/hig-book/de/images/controls-spin-box.png
+share/gnome/help/hig-book/de/images/controls-status-bar-interactive.png
+share/gnome/help/hig-book/de/images/controls-status-bar.png
+share/gnome/help/hig-book/de/images/controls-text-choose.png
+share/gnome/help/hig-book/de/images/controls-text-prompt.png
+share/gnome/help/hig-book/de/images/controls-text.png
+share/gnome/help/hig-book/de/images/controls-toggle-button-mixed.png
+share/gnome/help/hig-book/de/images/controls-toggle-buttons.png
+share/gnome/help/hig-book/de/images/controls-tree-checkbox.png
+share/gnome/help/hig-book/de/images/controls-tree.png
+share/gnome/help/hig-book/de/images/desktop-applications-menu.png
+share/gnome/help/hig-book/de/images/feedback-checklist-running.png
+share/gnome/help/hig-book/de/images/feedback-pointers-busy.png
+share/gnome/help/hig-book/de/images/icon-design-process-1.png
+share/gnome/help/hig-book/de/images/icon-design-process-10.png
+share/gnome/help/hig-book/de/images/icon-design-process-11.png
+share/gnome/help/hig-book/de/images/icon-design-process-12.png
+share/gnome/help/hig-book/de/images/icon-design-process-2.png
+share/gnome/help/hig-book/de/images/icon-design-process-3.png
+share/gnome/help/hig-book/de/images/icon-design-process-4.png
+share/gnome/help/hig-book/de/images/icon-design-process-5.png
+share/gnome/help/hig-book/de/images/icon-design-process-6.png
+share/gnome/help/hig-book/de/images/icon-design-process-7.png
+share/gnome/help/hig-book/de/images/icon-design-process-8.png
+share/gnome/help/hig-book/de/images/icon-design-process-9.png
+share/gnome/help/hig-book/de/images/icons-applications.png
+share/gnome/help/hig-book/de/images/icons-evolution.png
+share/gnome/help/hig-book/de/images/icons-gedit.png
+share/gnome/help/hig-book/de/images/icons-floppy-dissected.png
+share/gnome/help/hig-book/de/images/icons-font-selection-good.png
+share/gnome/help/hig-book/de/images/icons-font-selection-poor.png
+share/gnome/help/hig-book/de/images/icons-gnumeric.png
+share/gnome/help/hig-book/de/images/icons-hc-book-blur.png
+share/gnome/help/hig-book/de/images/icons-hc-book.png
+share/gnome/help/hig-book/de/images/icons-hc-cdrom-blur.png
+share/gnome/help/hig-book/de/images/icons-hc-cdrom.png
+share/gnome/help/hig-book/de/images/icons-hc-copy-blur.png
+share/gnome/help/hig-book/de/images/icons-hc-copy.png
+share/gnome/help/hig-book/de/images/icons-hc-metaphors.png
+share/gnome/help/hig-book/de/images/icons-lowcontrast-levels.png
+share/gnome/help/hig-book/de/images/icons-menu.png
+share/gnome/help/hig-book/de/images/icons-nautilus.png
+share/gnome/help/hig-book/de/images/icons-objects.png
+share/gnome/help/hig-book/de/images/icons-perspective-shelf.png
+share/gnome/help/hig-book/de/images/icons-perspective-table.png
+share/gnome/help/hig-book/de/images/icons-shut-down.png
+share/gnome/help/hig-book/de/images/icons-silhouette.png
+share/gnome/help/hig-book/de/images/icons-sodipodi.png
+share/gnome/help/hig-book/de/images/icons-style-aqua.png
+share/gnome/help/hig-book/de/images/icons-style-gnome.png
+share/gnome/help/hig-book/de/images/icons-style-java.png
+share/gnome/help/hig-book/de/images/icons-system-log.png
+share/gnome/help/hig-book/de/images/icons-toolbar.png
+share/gnome/help/hig-book/de/images/icons-underline-text.png
+share/gnome/help/hig-book/de/images/icons-word-processor.png
+share/gnome/help/hig-book/de/images/input-accesskeys-shortcuts.png
+share/gnome/help/hig-book/de/images/input-drag-cursor-copy.png
+share/gnome/help/hig-book/de/images/input-drag-cursor-link.png
+share/gnome/help/hig-book/de/images/input-drag-cursor-move.png
+share/gnome/help/hig-book/de/images/input-drag-cursor-nodrop.png
+share/gnome/help/hig-book/de/images/input-drag-cursor-query.png
+share/gnome/help/hig-book/de/images/input-drag-cursor.png
+share/gnome/help/hig-book/de/images/input-drag-select-files.png
+share/gnome/help/hig-book/de/images/input-drag-select-graphics.png
+share/gnome/help/hig-book/de/images/input-pointing-devices.png
+share/gnome/help/hig-book/de/images/menus-application.png
+share/gnome/help/hig-book/de/images/menus-bookmarks.png
+share/gnome/help/hig-book/de/images/menus-checkbox-group.png
+share/gnome/help/hig-book/de/images/menus-command-group.png
+share/gnome/help/hig-book/de/images/menus-dropdown.png
+share/gnome/help/hig-book/de/images/menus-edit.png
+share/gnome/help/hig-book/de/images/menus-file.png
+share/gnome/help/hig-book/de/images/menus-format.png
+share/gnome/help/hig-book/de/images/menus-go-browser.png
+share/gnome/help/hig-book/de/images/menus-go-document.png
+share/gnome/help/hig-book/de/images/menus-help.png
+share/gnome/help/hig-book/de/images/menus-insert.png
+share/gnome/help/hig-book/de/images/menus-popup.png
+share/gnome/help/hig-book/de/images/menus-radiobutton-group.png
+share/gnome/help/hig-book/de/images/menus-submenu.png
+share/gnome/help/hig-book/de/images/menus-view.png
+share/gnome/help/hig-book/de/images/menus-windows.png
+share/gnome/help/hig-book/de/images/windows-mdi.png
+share/gnome/help/hig-book/de/images/toolbars-configure-menu.png
+share/gnome/help/hig-book/de/images/toolbars-mail.png
+share/gnome/help/hig-book/de/images/toolbars-labels-below.png
+share/gnome/help/hig-book/de/images/toolbars-labels-beside.png
+share/gnome/help/hig-book/de/images/visdes-button-label.png
+share/gnome/help/hig-book/de/images/visdes-colorblind-deutan.png
+share/gnome/help/hig-book/de/images/visdes-colorblind-normal.png
+share/gnome/help/hig-book/de/images/visdes-colorblind-tritan.png
+share/gnome/help/hig-book/de/images/visdes-large-icon-label.png
+share/gnome/help/hig-book/de/images/visdes-layout-annotated.png
+share/gnome/help/hig-book/de/images/visdes-layout-good.png
+share/gnome/help/hig-book/de/images/visdes-layout-poor.png
+share/gnome/help/hig-book/de/images/visdes-list-label.png
+share/gnome/help/hig-book/de/images/visdes-other-labels.png
+share/gnome/help/hig-book/de/images/windows-sdi.png
+share/gnome/help/hig-book/de/images/visdes-palette-1.png
+share/gnome/help/hig-book/de/images/visdes-palette-10.png
+share/gnome/help/hig-book/de/images/visdes-palette-11.png
+share/gnome/help/hig-book/de/images/visdes-palette-12.png
+share/gnome/help/hig-book/de/images/visdes-palette-13.png
+share/gnome/help/hig-book/de/images/visdes-palette-14.png
+share/gnome/help/hig-book/de/images/visdes-palette-15.png
+share/gnome/help/hig-book/de/images/visdes-palette-16.png
+share/gnome/help/hig-book/de/images/visdes-palette-17.png
+share/gnome/help/hig-book/de/images/visdes-palette-18.png
+share/gnome/help/hig-book/de/images/visdes-palette-19.png
+share/gnome/help/hig-book/de/images/visdes-palette-2.png
+share/gnome/help/hig-book/de/images/visdes-palette-20.png
+share/gnome/help/hig-book/de/images/visdes-palette-21.png
+share/gnome/help/hig-book/de/images/visdes-palette-22.png
+share/gnome/help/hig-book/de/images/visdes-palette-23.png
+share/gnome/help/hig-book/de/images/visdes-palette-24.png
+share/gnome/help/hig-book/de/images/visdes-palette-25.png
+share/gnome/help/hig-book/de/images/visdes-palette-26.png
+share/gnome/help/hig-book/de/images/visdes-palette-27.png
+share/gnome/help/hig-book/de/images/visdes-palette-28.png
+share/gnome/help/hig-book/de/images/visdes-palette-29.png
+share/gnome/help/hig-book/de/images/visdes-palette-3.png
+share/gnome/help/hig-book/de/images/visdes-palette-30.png
+share/gnome/help/hig-book/de/images/visdes-palette-31.png
+share/gnome/help/hig-book/de/images/visdes-palette-32.png
+share/gnome/help/hig-book/de/images/visdes-palette-4.png
+share/gnome/help/hig-book/de/images/visdes-palette-5.png
+share/gnome/help/hig-book/de/images/visdes-palette-6.png
+share/gnome/help/hig-book/de/images/visdes-palette-7.png
+share/gnome/help/hig-book/de/images/visdes-palette-8.png
+share/gnome/help/hig-book/de/images/visdes-palette-9.png
+share/gnome/help/hig-book/de/images/visdes-palette.png
+share/gnome/help/hig-book/de/images/visdes-radiobutton-label.png
+share/gnome/help/hig-book/de/images/visdes-small-icon-label.png
+share/gnome/help/hig-book/de/images/visdes-textbox-label.png
+share/gnome/help/hig-book/de/images/windows-alert-authentication.png
+share/gnome/help/hig-book/de/images/windows-alert-buttons.png
+share/gnome/help/hig-book/de/images/windows-alert-confirmation.png
+share/gnome/help/hig-book/de/images/windows-alert-error.png
+share/gnome/help/hig-book/de/images/windows-alert-information.png
+share/gnome/help/hig-book/de/images/windows-alert-save.png
+share/gnome/help/hig-book/de/images/windows-alert-spacing.png
+share/gnome/help/hig-book/de/images/windows-alert-text.png
+share/gnome/help/hig-book/de/images/windows-assistant-first-page.png
+share/gnome/help/hig-book/de/images/windows-dialog-tabbed.png
+share/gnome/help/hig-book/de/images/windows-assistant-middle-page.png
+share/gnome/help/hig-book/de/images/windows-explicit-apply.png
+share/gnome/help/hig-book/de/images/windows-preferences.png
+share/gnome/help/hig-book/de/images/windows-primary.png
+share/gnome/help/hig-book/de/images/windows-progress-checklist-done.png
+share/gnome/help/hig-book/de/images/windows-progress-checklist-start.png
+share/gnome/help/hig-book/de/images/windows-progress-checklist.png
+share/gnome/help/hig-book/de/images/windows-progress-copy-file.png
+share/gnome/help/hig-book/de/images/windows-progress.png
+share/gnome/help/hig-book/de/images/windows-properties.png
+share/gnome/help/hig-book/de/images/windows-titlebar.png
+share/gnome/help/hig-book/de/images/windows-toolbox-large.png
+share/gnome/help/hig-book/de/images/windows-toolbox-small.png
+share/gnome/help/hig-book/el/hig-book.xml
+share/gnome/help/hig-book/el/images/controls-buttons.png
+share/gnome/help/hig-book/el/images/controls-check-box-ambiguous.png
+share/gnome/help/hig-book/el/images/controls-check-boxes-mixed.png
+share/gnome/help/hig-book/el/images/controls-check-boxes.png
+share/gnome/help/hig-book/el/images/controls-combo.png
+share/gnome/help/hig-book/el/images/controls-frames.png
+share/gnome/help/hig-book/el/images/controls-list-checkbox.png
+share/gnome/help/hig-book/el/images/controls-list.png
+share/gnome/help/hig-book/el/images/controls-locked.png
+share/gnome/help/hig-book/el/images/controls-notebook-list.png
+share/gnome/help/hig-book/el/images/controls-notebook-tabs.png
+share/gnome/help/hig-book/el/images/controls-notebook.png
+share/gnome/help/hig-book/el/images/controls-old-frames.png
+share/gnome/help/hig-book/el/images/controls-option-menu.png
+share/gnome/help/hig-book/el/images/controls-progress-indeterminate.png
+share/gnome/help/hig-book/el/images/controls-progress-time.png
+share/gnome/help/hig-book/el/images/controls-progress-typical.png
+share/gnome/help/hig-book/el/images/controls-radio-button-mixed.png
+share/gnome/help/hig-book/el/images/controls-radio-buttons.png
+share/gnome/help/hig-book/el/images/controls-sensitivity.png
+share/gnome/help/hig-book/el/images/controls-slider-spinbox.png
+share/gnome/help/hig-book/el/images/controls-slider.png
+share/gnome/help/hig-book/el/images/controls-spin-box.png
+share/gnome/help/hig-book/el/images/controls-status-bar-interactive.png
+share/gnome/help/hig-book/el/images/controls-status-bar.png
+share/gnome/help/hig-book/el/images/controls-text-choose.png
+share/gnome/help/hig-book/el/images/controls-text-prompt.png
+share/gnome/help/hig-book/el/images/controls-text.png
+share/gnome/help/hig-book/el/images/controls-toggle-button-mixed.png
+share/gnome/help/hig-book/el/images/controls-toggle-buttons.png
+share/gnome/help/hig-book/el/images/controls-tree-checkbox.png
+share/gnome/help/hig-book/el/images/controls-tree.png
+share/gnome/help/hig-book/el/images/desktop-applications-menu.png
+share/gnome/help/hig-book/el/images/feedback-checklist-running.png
+share/gnome/help/hig-book/el/images/feedback-pointers-busy.png
+share/gnome/help/hig-book/el/images/icon-design-process-1.png
+share/gnome/help/hig-book/el/images/icon-design-process-10.png
+share/gnome/help/hig-book/el/images/icon-design-process-11.png
+share/gnome/help/hig-book/el/images/icon-design-process-12.png
+share/gnome/help/hig-book/el/images/icon-design-process-2.png
+share/gnome/help/hig-book/el/images/icon-design-process-3.png
+share/gnome/help/hig-book/el/images/icon-design-process-4.png
+share/gnome/help/hig-book/el/images/icon-design-process-5.png
+share/gnome/help/hig-book/el/images/icon-design-process-6.png
+share/gnome/help/hig-book/el/images/icon-design-process-7.png
+share/gnome/help/hig-book/el/images/icon-design-process-8.png
+share/gnome/help/hig-book/el/images/icon-design-process-9.png
+share/gnome/help/hig-book/el/images/icons-applications.png
+share/gnome/help/hig-book/el/images/icons-evolution.png
+share/gnome/help/hig-book/el/images/icons-gedit.png
+share/gnome/help/hig-book/el/images/icons-floppy-dissected.png
+share/gnome/help/hig-book/el/images/icons-font-selection-good.png
+share/gnome/help/hig-book/el/images/icons-font-selection-poor.png
+share/gnome/help/hig-book/el/images/icons-gnumeric.png
+share/gnome/help/hig-book/el/images/icons-hc-book-blur.png
+share/gnome/help/hig-book/el/images/icons-hc-book.png
+share/gnome/help/hig-book/el/images/icons-hc-cdrom-blur.png
+share/gnome/help/hig-book/el/images/icons-hc-cdrom.png
+share/gnome/help/hig-book/el/images/icons-hc-copy-blur.png
+share/gnome/help/hig-book/el/images/icons-hc-copy.png
+share/gnome/help/hig-book/el/images/icons-hc-metaphors.png
+share/gnome/help/hig-book/el/images/icons-lowcontrast-levels.png
+share/gnome/help/hig-book/el/images/icons-menu.png
+share/gnome/help/hig-book/el/images/icons-nautilus.png
+share/gnome/help/hig-book/el/images/icons-objects.png
+share/gnome/help/hig-book/el/images/icons-perspective-shelf.png
+share/gnome/help/hig-book/el/images/icons-perspective-table.png
+share/gnome/help/hig-book/el/images/icons-shut-down.png
+share/gnome/help/hig-book/el/images/icons-silhouette.png
+share/gnome/help/hig-book/el/images/icons-sodipodi.png
+share/gnome/help/hig-book/el/images/icons-style-aqua.png
+share/gnome/help/hig-book/el/images/icons-style-gnome.png
+share/gnome/help/hig-book/el/images/icons-style-java.png
+share/gnome/help/hig-book/el/images/icons-system-log.png
+share/gnome/help/hig-book/el/images/icons-toolbar.png
+share/gnome/help/hig-book/el/images/icons-underline-text.png
+share/gnome/help/hig-book/el/images/icons-word-processor.png
+share/gnome/help/hig-book/el/images/input-accesskeys-shortcuts.png
+share/gnome/help/hig-book/el/images/input-drag-cursor-copy.png
+share/gnome/help/hig-book/el/images/input-drag-cursor-link.png
+share/gnome/help/hig-book/el/images/input-drag-cursor-move.png
+share/gnome/help/hig-book/el/images/input-drag-cursor-nodrop.png
+share/gnome/help/hig-book/el/images/input-drag-cursor-query.png
+share/gnome/help/hig-book/el/images/input-drag-cursor.png
+share/gnome/help/hig-book/el/images/input-drag-select-files.png
+share/gnome/help/hig-book/el/images/input-drag-select-graphics.png
+share/gnome/help/hig-book/el/images/input-pointing-devices.png
+share/gnome/help/hig-book/el/images/menus-application.png
+share/gnome/help/hig-book/el/images/menus-bookmarks.png
+share/gnome/help/hig-book/el/images/menus-checkbox-group.png
+share/gnome/help/hig-book/el/images/menus-command-group.png
+share/gnome/help/hig-book/el/images/menus-dropdown.png
+share/gnome/help/hig-book/el/images/menus-edit.png
+share/gnome/help/hig-book/el/images/menus-file.png
+share/gnome/help/hig-book/el/images/menus-format.png
+share/gnome/help/hig-book/el/images/menus-go-browser.png
+share/gnome/help/hig-book/el/images/menus-go-document.png
+share/gnome/help/hig-book/el/images/menus-help.png
+share/gnome/help/hig-book/el/images/menus-insert.png
+share/gnome/help/hig-book/el/images/menus-popup.png
+share/gnome/help/hig-book/el/images/menus-radiobutton-group.png
+share/gnome/help/hig-book/el/images/menus-submenu.png
+share/gnome/help/hig-book/el/images/menus-view.png
+share/gnome/help/hig-book/el/images/menus-windows.png
+share/gnome/help/hig-book/el/images/windows-mdi.png
+share/gnome/help/hig-book/el/images/toolbars-configure-menu.png
+share/gnome/help/hig-book/el/images/toolbars-mail.png
+share/gnome/help/hig-book/el/images/toolbars-labels-below.png
+share/gnome/help/hig-book/el/images/toolbars-labels-beside.png
+share/gnome/help/hig-book/el/images/visdes-button-label.png
+share/gnome/help/hig-book/el/images/visdes-colorblind-deutan.png
+share/gnome/help/hig-book/el/images/visdes-colorblind-normal.png
+share/gnome/help/hig-book/el/images/visdes-colorblind-tritan.png
+share/gnome/help/hig-book/el/images/visdes-large-icon-label.png
+share/gnome/help/hig-book/el/images/visdes-layout-annotated.png
+share/gnome/help/hig-book/el/images/visdes-layout-good.png
+share/gnome/help/hig-book/el/images/visdes-layout-poor.png
+share/gnome/help/hig-book/el/images/visdes-list-label.png
+share/gnome/help/hig-book/el/images/visdes-other-labels.png
+share/gnome/help/hig-book/el/images/windows-sdi.png
+share/gnome/help/hig-book/el/images/visdes-palette-1.png
+share/gnome/help/hig-book/el/images/visdes-palette-10.png
+share/gnome/help/hig-book/el/images/visdes-palette-11.png
+share/gnome/help/hig-book/el/images/visdes-palette-12.png
+share/gnome/help/hig-book/el/images/visdes-palette-13.png
+share/gnome/help/hig-book/el/images/visdes-palette-14.png
+share/gnome/help/hig-book/el/images/visdes-palette-15.png
+share/gnome/help/hig-book/el/images/visdes-palette-16.png
+share/gnome/help/hig-book/el/images/visdes-palette-17.png
+share/gnome/help/hig-book/el/images/visdes-palette-18.png
+share/gnome/help/hig-book/el/images/visdes-palette-19.png
+share/gnome/help/hig-book/el/images/visdes-palette-2.png
+share/gnome/help/hig-book/el/images/visdes-palette-20.png
+share/gnome/help/hig-book/el/images/visdes-palette-21.png
+share/gnome/help/hig-book/el/images/visdes-palette-22.png
+share/gnome/help/hig-book/el/images/visdes-palette-23.png
+share/gnome/help/hig-book/el/images/visdes-palette-24.png
+share/gnome/help/hig-book/el/images/visdes-palette-25.png
+share/gnome/help/hig-book/el/images/visdes-palette-26.png
+share/gnome/help/hig-book/el/images/visdes-palette-27.png
+share/gnome/help/hig-book/el/images/visdes-palette-28.png
+share/gnome/help/hig-book/el/images/visdes-palette-29.png
+share/gnome/help/hig-book/el/images/visdes-palette-3.png
+share/gnome/help/hig-book/el/images/visdes-palette-30.png
+share/gnome/help/hig-book/el/images/visdes-palette-31.png
+share/gnome/help/hig-book/el/images/visdes-palette-32.png
+share/gnome/help/hig-book/el/images/visdes-palette-4.png
+share/gnome/help/hig-book/el/images/visdes-palette-5.png
+share/gnome/help/hig-book/el/images/visdes-palette-6.png
+share/gnome/help/hig-book/el/images/visdes-palette-7.png
+share/gnome/help/hig-book/el/images/visdes-palette-8.png
+share/gnome/help/hig-book/el/images/visdes-palette-9.png
+share/gnome/help/hig-book/el/images/visdes-palette.png
+share/gnome/help/hig-book/el/images/visdes-radiobutton-label.png
+share/gnome/help/hig-book/el/images/visdes-small-icon-label.png
+share/gnome/help/hig-book/el/images/visdes-textbox-label.png
+share/gnome/help/hig-book/el/images/windows-alert-authentication.png
+share/gnome/help/hig-book/el/images/windows-alert-buttons.png
+share/gnome/help/hig-book/el/images/windows-alert-confirmation.png
+share/gnome/help/hig-book/el/images/windows-alert-error.png
+share/gnome/help/hig-book/el/images/windows-alert-information.png
+share/gnome/help/hig-book/el/images/windows-alert-save.png
+share/gnome/help/hig-book/el/images/windows-alert-spacing.png
+share/gnome/help/hig-book/el/images/windows-alert-text.png
+share/gnome/help/hig-book/el/images/windows-assistant-first-page.png
+share/gnome/help/hig-book/el/images/windows-dialog-tabbed.png
+share/gnome/help/hig-book/el/images/windows-assistant-middle-page.png
+share/gnome/help/hig-book/el/images/windows-explicit-apply.png
+share/gnome/help/hig-book/el/images/windows-preferences.png
+share/gnome/help/hig-book/el/images/windows-primary.png
+share/gnome/help/hig-book/el/images/windows-progress-checklist-done.png
+share/gnome/help/hig-book/el/images/windows-progress-checklist-start.png
+share/gnome/help/hig-book/el/images/windows-progress-checklist.png
+share/gnome/help/hig-book/el/images/windows-progress-copy-file.png
+share/gnome/help/hig-book/el/images/windows-progress.png
+share/gnome/help/hig-book/el/images/windows-properties.png
+share/gnome/help/hig-book/el/images/windows-titlebar.png
+share/gnome/help/hig-book/el/images/windows-toolbox-large.png
+share/gnome/help/hig-book/el/images/windows-toolbox-small.png
+share/gnome/help/hig-book/es/hig-book.xml
+share/gnome/help/hig-book/es/images/controls-buttons.png
+share/gnome/help/hig-book/es/images/controls-check-box-ambiguous.png
+share/gnome/help/hig-book/es/images/controls-check-boxes-mixed.png
+share/gnome/help/hig-book/es/images/controls-check-boxes.png
+share/gnome/help/hig-book/es/images/controls-combo.png
+share/gnome/help/hig-book/es/images/controls-frames.png
+share/gnome/help/hig-book/es/images/controls-list-checkbox.png
+share/gnome/help/hig-book/es/images/controls-list.png
+share/gnome/help/hig-book/es/images/controls-locked.png
+share/gnome/help/hig-book/es/images/controls-notebook-list.png
+share/gnome/help/hig-book/es/images/controls-notebook-tabs.png
+share/gnome/help/hig-book/es/images/controls-notebook.png
+share/gnome/help/hig-book/es/images/controls-old-frames.png
+share/gnome/help/hig-book/es/images/controls-option-menu.png
+share/gnome/help/hig-book/es/images/controls-progress-indeterminate.png
+share/gnome/help/hig-book/es/images/controls-progress-time.png
+share/gnome/help/hig-book/es/images/controls-progress-typical.png
+share/gnome/help/hig-book/es/images/controls-radio-button-mixed.png
+share/gnome/help/hig-book/es/images/controls-radio-buttons.png
+share/gnome/help/hig-book/es/images/controls-sensitivity.png
+share/gnome/help/hig-book/es/images/controls-slider-spinbox.png
+share/gnome/help/hig-book/es/images/controls-slider.png
+share/gnome/help/hig-book/es/images/controls-spin-box.png
+share/gnome/help/hig-book/es/images/controls-status-bar-interactive.png
+share/gnome/help/hig-book/es/images/controls-status-bar.png
+share/gnome/help/hig-book/es/images/controls-text-choose.png
+share/gnome/help/hig-book/es/images/controls-text-prompt.png
+share/gnome/help/hig-book/es/images/controls-text.png
+share/gnome/help/hig-book/es/images/controls-toggle-button-mixed.png
+share/gnome/help/hig-book/es/images/controls-toggle-buttons.png
+share/gnome/help/hig-book/es/images/controls-tree-checkbox.png
+share/gnome/help/hig-book/es/images/controls-tree.png
+share/gnome/help/hig-book/es/images/desktop-applications-menu.png
+share/gnome/help/hig-book/es/images/feedback-checklist-running.png
+share/gnome/help/hig-book/es/images/feedback-pointers-busy.png
+share/gnome/help/hig-book/es/images/icon-design-process-1.png
+share/gnome/help/hig-book/es/images/icon-design-process-10.png
+share/gnome/help/hig-book/es/images/icon-design-process-11.png
+share/gnome/help/hig-book/es/images/icon-design-process-12.png
+share/gnome/help/hig-book/es/images/icon-design-process-2.png
+share/gnome/help/hig-book/es/images/icon-design-process-3.png
+share/gnome/help/hig-book/es/images/icon-design-process-4.png
+share/gnome/help/hig-book/es/images/icon-design-process-5.png
+share/gnome/help/hig-book/es/images/icon-design-process-6.png
+share/gnome/help/hig-book/es/images/icon-design-process-7.png
+share/gnome/help/hig-book/es/images/icon-design-process-8.png
+share/gnome/help/hig-book/es/images/icon-design-process-9.png
+share/gnome/help/hig-book/es/images/icons-applications.png
+share/gnome/help/hig-book/es/images/icons-evolution.png
+share/gnome/help/hig-book/es/images/icons-gedit.png
+share/gnome/help/hig-book/es/images/icons-floppy-dissected.png
+share/gnome/help/hig-book/es/images/icons-font-selection-good.png
+share/gnome/help/hig-book/es/images/icons-font-selection-poor.png
+share/gnome/help/hig-book/es/images/icons-gnumeric.png
+share/gnome/help/hig-book/es/images/icons-hc-book-blur.png
+share/gnome/help/hig-book/es/images/icons-hc-book.png
+share/gnome/help/hig-book/es/images/icons-hc-cdrom-blur.png
+share/gnome/help/hig-book/es/images/icons-hc-cdrom.png
+share/gnome/help/hig-book/es/images/icons-hc-copy-blur.png
+share/gnome/help/hig-book/es/images/icons-hc-copy.png
+share/gnome/help/hig-book/es/images/icons-hc-metaphors.png
+share/gnome/help/hig-book/es/images/icons-lowcontrast-levels.png
+share/gnome/help/hig-book/es/images/icons-menu.png
+share/gnome/help/hig-book/es/images/icons-nautilus.png
+share/gnome/help/hig-book/es/images/icons-objects.png
+share/gnome/help/hig-book/es/images/icons-perspective-shelf.png
+share/gnome/help/hig-book/es/images/icons-perspective-table.png
+share/gnome/help/hig-book/es/images/icons-shut-down.png
+share/gnome/help/hig-book/es/images/icons-silhouette.png
+share/gnome/help/hig-book/es/images/icons-sodipodi.png
+share/gnome/help/hig-book/es/images/icons-style-aqua.png
+share/gnome/help/hig-book/es/images/icons-style-gnome.png
+share/gnome/help/hig-book/es/images/icons-style-java.png
+share/gnome/help/hig-book/es/images/icons-system-log.png
+share/gnome/help/hig-book/es/images/icons-toolbar.png
+share/gnome/help/hig-book/es/images/icons-underline-text.png
+share/gnome/help/hig-book/es/images/icons-word-processor.png
+share/gnome/help/hig-book/es/images/input-accesskeys-shortcuts.png
+share/gnome/help/hig-book/es/images/input-drag-cursor-copy.png
+share/gnome/help/hig-book/es/images/input-drag-cursor-link.png
+share/gnome/help/hig-book/es/images/input-drag-cursor-move.png
+share/gnome/help/hig-book/es/images/input-drag-cursor-nodrop.png
+share/gnome/help/hig-book/es/images/input-drag-cursor-query.png
+share/gnome/help/hig-book/es/images/input-drag-cursor.png
+share/gnome/help/hig-book/es/images/input-drag-select-files.png
+share/gnome/help/hig-book/es/images/input-drag-select-graphics.png
+share/gnome/help/hig-book/es/images/input-pointing-devices.png
+share/gnome/help/hig-book/es/images/menus-application.png
+share/gnome/help/hig-book/es/images/menus-bookmarks.png
+share/gnome/help/hig-book/es/images/menus-checkbox-group.png
+share/gnome/help/hig-book/es/images/menus-command-group.png
+share/gnome/help/hig-book/es/images/menus-dropdown.png
+share/gnome/help/hig-book/es/images/menus-edit.png
+share/gnome/help/hig-book/es/images/menus-file.png
+share/gnome/help/hig-book/es/images/menus-format.png
+share/gnome/help/hig-book/es/images/menus-go-browser.png
+share/gnome/help/hig-book/es/images/menus-go-document.png
+share/gnome/help/hig-book/es/images/menus-help.png
+share/gnome/help/hig-book/es/images/menus-insert.png
+share/gnome/help/hig-book/es/images/menus-popup.png
+share/gnome/help/hig-book/es/images/menus-radiobutton-group.png
+share/gnome/help/hig-book/es/images/menus-submenu.png
+share/gnome/help/hig-book/es/images/menus-view.png
+share/gnome/help/hig-book/es/images/menus-windows.png
+share/gnome/help/hig-book/es/images/windows-mdi.png
+share/gnome/help/hig-book/es/images/toolbars-configure-menu.png
+share/gnome/help/hig-book/es/images/toolbars-mail.png
+share/gnome/help/hig-book/es/images/toolbars-labels-below.png
+share/gnome/help/hig-book/es/images/toolbars-labels-beside.png
+share/gnome/help/hig-book/es/images/visdes-button-label.png
+share/gnome/help/hig-book/es/images/visdes-colorblind-deutan.png
+share/gnome/help/hig-book/es/images/visdes-colorblind-normal.png
+share/gnome/help/hig-book/es/images/visdes-colorblind-tritan.png
+share/gnome/help/hig-book/es/images/visdes-large-icon-label.png
+share/gnome/help/hig-book/es/images/visdes-layout-annotated.png
+share/gnome/help/hig-book/es/images/visdes-layout-good.png
+share/gnome/help/hig-book/es/images/visdes-layout-poor.png
+share/gnome/help/hig-book/es/images/visdes-list-label.png
+share/gnome/help/hig-book/es/images/visdes-other-labels.png
+share/gnome/help/hig-book/es/images/windows-sdi.png
+share/gnome/help/hig-book/es/images/visdes-palette-1.png
+share/gnome/help/hig-book/es/images/visdes-palette-10.png
+share/gnome/help/hig-book/es/images/visdes-palette-11.png
+share/gnome/help/hig-book/es/images/visdes-palette-12.png
+share/gnome/help/hig-book/es/images/visdes-palette-13.png
+share/gnome/help/hig-book/es/images/visdes-palette-14.png
+share/gnome/help/hig-book/es/images/visdes-palette-15.png
+share/gnome/help/hig-book/es/images/visdes-palette-16.png
+share/gnome/help/hig-book/es/images/visdes-palette-17.png
+share/gnome/help/hig-book/es/images/visdes-palette-18.png
+share/gnome/help/hig-book/es/images/visdes-palette-19.png
+share/gnome/help/hig-book/es/images/visdes-palette-2.png
+share/gnome/help/hig-book/es/images/visdes-palette-20.png
+share/gnome/help/hig-book/es/images/visdes-palette-21.png
+share/gnome/help/hig-book/es/images/visdes-palette-22.png
+share/gnome/help/hig-book/es/images/visdes-palette-23.png
+share/gnome/help/hig-book/es/images/visdes-palette-24.png
+share/gnome/help/hig-book/es/images/visdes-palette-25.png
+share/gnome/help/hig-book/es/images/visdes-palette-26.png
+share/gnome/help/hig-book/es/images/visdes-palette-27.png
+share/gnome/help/hig-book/es/images/visdes-palette-28.png
+share/gnome/help/hig-book/es/images/visdes-palette-29.png
+share/gnome/help/hig-book/es/images/visdes-palette-3.png
+share/gnome/help/hig-book/es/images/visdes-palette-30.png
+share/gnome/help/hig-book/es/images/visdes-palette-31.png
+share/gnome/help/hig-book/es/images/visdes-palette-32.png
+share/gnome/help/hig-book/es/images/visdes-palette-4.png
+share/gnome/help/hig-book/es/images/visdes-palette-5.png
+share/gnome/help/hig-book/es/images/visdes-palette-6.png
+share/gnome/help/hig-book/es/images/visdes-palette-7.png
+share/gnome/help/hig-book/es/images/visdes-palette-8.png
+share/gnome/help/hig-book/es/images/visdes-palette-9.png
+share/gnome/help/hig-book/es/images/visdes-palette.png
+share/gnome/help/hig-book/es/images/visdes-radiobutton-label.png
+share/gnome/help/hig-book/es/images/visdes-small-icon-label.png
+share/gnome/help/hig-book/es/images/visdes-textbox-label.png
+share/gnome/help/hig-book/es/images/windows-alert-authentication.png
+share/gnome/help/hig-book/es/images/windows-alert-buttons.png
+share/gnome/help/hig-book/es/images/windows-alert-confirmation.png
+share/gnome/help/hig-book/es/images/windows-alert-error.png
+share/gnome/help/hig-book/es/images/windows-alert-information.png
+share/gnome/help/hig-book/es/images/windows-alert-save.png
+share/gnome/help/hig-book/es/images/windows-alert-spacing.png
+share/gnome/help/hig-book/es/images/windows-alert-text.png
+share/gnome/help/hig-book/es/images/windows-assistant-first-page.png
+share/gnome/help/hig-book/es/images/windows-dialog-tabbed.png
+share/gnome/help/hig-book/es/images/windows-assistant-middle-page.png
+share/gnome/help/hig-book/es/images/windows-explicit-apply.png
+share/gnome/help/hig-book/es/images/windows-preferences.png
+share/gnome/help/hig-book/es/images/windows-primary.png
+share/gnome/help/hig-book/es/images/windows-progress-checklist-done.png
+share/gnome/help/hig-book/es/images/windows-progress-checklist-start.png
+share/gnome/help/hig-book/es/images/windows-progress-checklist.png
+share/gnome/help/hig-book/es/images/windows-progress-copy-file.png
+share/gnome/help/hig-book/es/images/windows-progress.png
+share/gnome/help/hig-book/es/images/windows-properties.png
+share/gnome/help/hig-book/es/images/windows-titlebar.png
+share/gnome/help/hig-book/es/images/windows-toolbox-large.png
+share/gnome/help/hig-book/es/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/de/integration-guide.xml
@@ -316,6 +877,18 @@ share/gnome/help/optimization-guide/C/optimization-guide.xml
share/gnome/help/optimization-guide/C/optimization-harmful.xml
share/gnome/help/optimization-guide/C/optimization-intro.xml
share/gnome/help/optimization-guide/C/optimization-massif.xml
+share/gnome/help/optimization-guide/de/optimization-guide.xml
+share/gnome/help/optimization-guide/de/optimization-harmful.xml
+share/gnome/help/optimization-guide/de/optimization-massif.xml
+share/gnome/help/optimization-guide/de/optimization-intro.xml
+share/gnome/help/optimization-guide/de/figures/massif-after.png
+share/gnome/help/optimization-guide/de/figures/massif-before.png
+share/gnome/help/optimization-guide/es/optimization-guide.xml
+share/gnome/help/optimization-guide/es/optimization-harmful.xml
+share/gnome/help/optimization-guide/es/optimization-massif.xml
+share/gnome/help/optimization-guide/es/optimization-intro.xml
+share/gnome/help/optimization-guide/es/figures/massif-after.png
+share/gnome/help/optimization-guide/es/figures/massif-before.png
share/gnome/help/platform-overview/C/apx-modules.xml
share/gnome/help/platform-overview/C/bindings.xml
share/gnome/help/platform-overview/C/core-tech.xml
@@ -328,6 +901,18 @@ share/gnome/help/platform-overview/C/ipc-network.xml
share/gnome/help/platform-overview/C/legal-fdl.xml
share/gnome/help/platform-overview/C/platform-overview.xml
share/gnome/help/platform-overview/C/platform.xml
+share/gnome/help/platform-overview/cs/apx-modules.xml
+share/gnome/help/platform-overview/cs/bindings.xml
+share/gnome/help/platform-overview/cs/core-tech.xml
+share/gnome/help/platform-overview/cs/desktop-tech.xml
+share/gnome/help/platform-overview/cs/figures/graphics.png
+share/gnome/help/platform-overview/cs/figures/i18n.png
+share/gnome/help/platform-overview/cs/figures/pango.png
+share/gnome/help/platform-overview/cs/intro.xml
+share/gnome/help/platform-overview/cs/ipc-network.xml
+share/gnome/help/platform-overview/cs/legal-fdl.xml
+share/gnome/help/platform-overview/cs/platform-overview.xml
+share/gnome/help/platform-overview/cs/platform.xml
share/gnome/help/platform-overview/de/apx-modules.xml
share/gnome/help/platform-overview/de/bindings.xml
share/gnome/help/platform-overview/de/core-tech.xml
@@ -413,9 +998,13 @@ 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/accessibility-devel-guide/accessibility-devel-guide-es.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/hig-book/hig-book-de.omf
+share/omf/hig-book/hig-book-el.omf
+share/omf/hig-book/hig-book-es.omf
share/omf/integration-guide/integration-guide-C.omf
share/omf/integration-guide/integration-guide-cs.omf
share/omf/integration-guide/integration-guide-de.omf
@@ -427,7 +1016,10 @@ 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/optimization-guide/optimization-guide-de.omf
+share/omf/optimization-guide/optimization-guide-es.omf
share/omf/platform-overview/platform-overview-C.omf
+share/omf/platform-overview/platform-overview-cs.omf
share/omf/platform-overview/platform-overview-de.omf
share/omf/platform-overview/platform-overview-el.omf
share/omf/platform-overview/platform-overview-es.omf
@@ -456,9 +1048,15 @@ share/omf/platform-overview/platform-overview-ru.omf
@dirrm share/gnome/help/platform-overview/el
@dirrm share/gnome/help/platform-overview/de/figures
@dirrm share/gnome/help/platform-overview/de
+@dirrm share/gnome/help/platform-overview/cs/figures
+@dirrm share/gnome/help/platform-overview/cs
@dirrm share/gnome/help/platform-overview/C/figures
@dirrm share/gnome/help/platform-overview/C
@dirrm share/gnome/help/platform-overview
+@dirrm share/gnome/help/optimization-guide/es/figures
+@dirrm share/gnome/help/optimization-guide/es
+@dirrm share/gnome/help/optimization-guide/de/figures
+@dirrm share/gnome/help/optimization-guide/de
@dirrm share/gnome/help/optimization-guide/C/figures
@dirrm share/gnome/help/optimization-guide/C
@dirrm share/gnome/help/optimization-guide
@@ -473,6 +1071,12 @@ share/omf/platform-overview/platform-overview-ru.omf
@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/es/images
+@dirrm share/gnome/help/hig-book/es
+@dirrm share/gnome/help/hig-book/el/images
+@dirrm share/gnome/help/hig-book/el
+@dirrm share/gnome/help/hig-book/de/images
+@dirrm share/gnome/help/hig-book/de
@dirrm share/gnome/help/hig-book/C/images
@dirrm share/gnome/help/hig-book/C
@dirrm share/gnome/help/hig-book
@@ -481,6 +1085,8 @@ 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/es/figures
+@dirrm share/gnome/help/accessibility-devel-guide/es
@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 bce4533c6896..cdb22100cbcb 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.129 2009/03/21 04:24:51 marcus Exp $
+# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.132 2009/09/22 19:52:55 kwm Exp $
#
PORTNAME= gnome-icon-theme
-PORTVERSION= 2.26.0
-PORTREVISION= 2
+PORTVERSION= 2.28.0
CATEGORIES= misc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo
index 1b7fb55d0885..b96715bbe735 100644
--- a/misc/gnome-icon-theme/distinfo
+++ b/misc/gnome-icon-theme/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/gnome-icon-theme-2.28.0.tar.bz2) = 1b6a782e3f733a5dbb8e62e87a7bdc61
+SHA256 (gnome2/gnome-icon-theme-2.28.0.tar.bz2) = 31ecbd459ae059672793e46c773742897cb95e22ca5900ccdfb2a22aa30f3884
+SIZE (gnome2/gnome-icon-theme-2.28.0.tar.bz2) = 3433171
diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist
index f05db21812cd..4128fac46bf2 100644
--- a/misc/gnome-icon-theme/pkg-plist
+++ b/misc/gnome-icon-theme/pkg-plist
@@ -6342,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/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/kk/LC_MESSAGES
@dirrmtry share/locale/kk
@dirrmtry share/locale/fur/LC_MESSAGES
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index cabc173c4816..ec7c5a971af4 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-stable/misc/gnome-user-docs/Makefile,v 1.1 2009/04/16 07:43:13 kwm Exp $
+# $MCom: ports/misc/gnome-user-docs/Makefile,v 1.55 2009/11/20 06:14:35 avl Exp $
#
PORTNAME= gnome-user-docs
-PORTVERSION= 2.26.2
+PORTVERSION= 2.28.1
CATEGORIES= misc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo
index 1cce20efa31f..8ca835ff5bdb 100644
--- a/misc/gnome-user-docs/distinfo
+++ b/misc/gnome-user-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-user-docs-2.26.2.tar.bz2) = b259de6dcb6a0421fcb28a66e3d20da1
-SHA256 (gnome2/gnome-user-docs-2.26.2.tar.bz2) = 2feb6430305b0cdc55ef48a3e93c79033e6b76334a980cc1ec6963f977221a98
-SIZE (gnome2/gnome-user-docs-2.26.2.tar.bz2) = 15332554
+MD5 (gnome2/gnome-user-docs-2.28.1.tar.bz2) = 7aa5a691744e2447276728c7e466b3d5
+SHA256 (gnome2/gnome-user-docs-2.28.1.tar.bz2) = 89c7a9fef42feb0cc565efd123989b6a8cab75f575d99538a02b5e8b7a5cc175
+SIZE (gnome2/gnome-user-docs-2.28.1.tar.bz2) = 17624463
diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist
index 89f48f0df7ee..86e55959fee4 100644
--- a/misc/gnome-user-docs/pkg-plist
+++ b/misc/gnome-user-docs/pkg-plist
@@ -607,6 +607,7 @@ share/gnome/help/system-admin-guide/C/sessions.xml
share/gnome/help/system-admin-guide/C/system-admin-guide.xml
share/gnome/help/system-admin-guide/C/themes.xml
share/gnome/help/system-admin-guide/ca/system-admin-guide.xml
+share/gnome/help/system-admin-guide/cs/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
@@ -1161,6 +1162,83 @@ share/gnome/help/user-guide/es/gospanel.xml
share/gnome/help/user-guide/es/gosstartsession.xml
share/gnome/help/user-guide/es/gostools.xml
share/gnome/help/user-guide/es/user-guide.xml
+share/gnome/help/user-guide/eu/figures/ask_pointer.png
+share/gnome/help/user-guide/eu/figures/busy_pointer.png
+share/gnome/help/user-guide/eu/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/eu/figures/copy_pointer.png
+share/gnome/help/user-guide/eu/figures/force_quit.png
+share/gnome/help/user-guide/eu/figures/four_hide_button.png
+share/gnome/help/user-guide/eu/figures/gedit_window.png
+share/gnome/help/user-guide/eu/figures/gnome_panel.png
+share/gnome/help/user-guide/eu/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/eu/figures/ibeam_pointer.png
+share/gnome/help/user-guide/eu/figures/link_pointer.png
+share/gnome/help/user-guide/eu/figures/lockscreen_icon.png
+share/gnome/help/user-guide/eu/figures/logout_icon.png
+share/gnome/help/user-guide/eu/figures/menu_bar_applet.png
+share/gnome/help/user-guide/eu/figures/menu_panel.png
+share/gnome/help/user-guide/eu/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/eu/figures/move_pointer.png
+share/gnome/help/user-guide/eu/figures/movewindow_pointer.png
+share/gnome/help/user-guide/eu/figures/naut_browser_mode.png
+share/gnome/help/user-guide/eu/figures/naut_button_bar.png
+share/gnome/help/user-guide/eu/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/eu/figures/naut_emblem.png
+share/gnome/help/user-guide/eu/figures/naut_go_to_location.png
+share/gnome/help/user-guide/eu/figures/naut_link_emblem.png
+share/gnome/help/user-guide/eu/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/eu/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/eu/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/eu/figures/naut_refine_search.png
+share/gnome/help/user-guide/eu/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/eu/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/eu/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/eu/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/eu/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/eu/figures/naut_search_bar.png
+share/gnome/help/user-guide/eu/figures/naut_search_results.png
+share/gnome/help/user-guide/eu/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/eu/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/eu/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/eu/figures/naut_spatial_view.png
+share/gnome/help/user-guide/eu/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/eu/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/eu/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/eu/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/eu/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/eu/figures/normal_pointer.png
+share/gnome/help/user-guide/eu/figures/not_available_pointer.png
+share/gnome/help/user-guide/eu/figures/notification_area_icon.png
+share/gnome/help/user-guide/eu/figures/open_drawer.png
+share/gnome/help/user-guide/eu/figures/openwindows_menu.png
+share/gnome/help/user-guide/eu/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/eu/figures/resize_pointer.png
+share/gnome/help/user-guide/eu/figures/run_button.png
+share/gnome/help/user-guide/eu/figures/sample_applet.png
+share/gnome/help/user-guide/eu/figures/screenshot_button.png
+share/gnome/help/user-guide/eu/figures/searchtool_button.png
+share/gnome/help/user-guide/eu/figures/show_desktop_button.png
+share/gnome/help/user-guide/eu/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/eu/figures/titlebar_window.png
+share/gnome/help/user-guide/eu/figures/typical_menu.png
+share/gnome/help/user-guide/eu/figures/window_list_applet.png
+share/gnome/help/user-guide/eu/figures/window_list_group_applet.png
+share/gnome/help/user-guide/eu/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/eu/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/eu/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/eu/figures/yelp_preferences.png
+share/gnome/help/user-guide/eu/figures/yelp_window.png
+share/gnome/help/user-guide/eu/glossary.xml
+share/gnome/help/user-guide/eu/gosbasic.xml
+share/gnome/help/user-guide/eu/goscustdesk.xml
+share/gnome/help/user-guide/eu/goseditmainmenu.xml
+share/gnome/help/user-guide/eu/gosfeedback.xml
+share/gnome/help/user-guide/eu/gosnautilus.xml
+share/gnome/help/user-guide/eu/gosoverview.xml
+share/gnome/help/user-guide/eu/gospanel.xml
+share/gnome/help/user-guide/eu/gosstartsession.xml
+share/gnome/help/user-guide/eu/gostools.xml
+share/gnome/help/user-guide/eu/user-guide.xml
share/gnome/help/user-guide/fi/figures/ask_pointer.png
share/gnome/help/user-guide/fi/figures/busy_pointer.png
share/gnome/help/user-guide/fi/figures/com_file_manager_menu.png
@@ -2256,6 +2334,7 @@ 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-cs.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
@@ -2277,6 +2356,7 @@ 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
+share/omf/user-guide/user-guide-eu.omf
share/omf/user-guide/user-guide-fi.omf
share/omf/user-guide/user-guide-fr.omf
share/omf/user-guide/user-guide-hu.omf
@@ -2322,6 +2402,8 @@ share/omf/user-guide/user-guide-zh_CN.omf
@dirrm share/gnome/help/user-guide/fr
@dirrm share/gnome/help/user-guide/fi/figures
@dirrm share/gnome/help/user-guide/fi
+@dirrm share/gnome/help/user-guide/eu/figures
+@dirrm share/gnome/help/user-guide/eu
@dirrm share/gnome/help/user-guide/es/figures
@dirrm share/gnome/help/user-guide/es
@dirrm share/gnome/help/user-guide/el/figures
@@ -2351,6 +2433,7 @@ share/omf/user-guide/user-guide-zh_CN.omf
@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/cs
@dirrm share/gnome/help/system-admin-guide/ca
@dirrm share/gnome/help/system-admin-guide/C
@dirrm share/gnome/help/system-admin-guide
diff --git a/misc/hicolor-icon-theme/Makefile b/misc/hicolor-icon-theme/Makefile
index 53346d40601a..f799390c769a 100644
--- a/misc/hicolor-icon-theme/Makefile
+++ b/misc/hicolor-icon-theme/Makefile
@@ -3,12 +3,11 @@
# Whom: marcus@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/misc/hicolor-icon-theme/Makefile,v 1.7 2006/12/07 07:33:37 marcus Exp $
+# $MCom: ports/misc/hicolor-icon-theme/Makefile,v 1.9 2009/09/26 12:53:31 marcus Exp $
#
PORTNAME= hicolor-icon-theme
-PORTVERSION= 0.10
-PORTREVISION= 2
+PORTVERSION= 0.11
CATEGORIES= misc gnome
MASTER_SITES= http://icon-theme.freedesktop.org/releases/
@@ -26,7 +25,7 @@ PLIST= ${WRKDIR}/pkg-plist
# Update the below from Makefile.in each release
ICON_SIZES= 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 \
- 128x128 192x192 scalable
+ 128x128 192x192 256x256 scalable
ICON_CONTEXTS= actions animations apps categories devices emblems emotes \
filesystems intl mimetypes places status stock
STOCK_SUBS= chart code data form image io media navigation net object table text
diff --git a/misc/hicolor-icon-theme/distinfo b/misc/hicolor-icon-theme/distinfo
index 4b7c9993bff1..8e66928f54db 100644
--- a/misc/hicolor-icon-theme/distinfo
+++ b/misc/hicolor-icon-theme/distinfo
@@ -1,3 +1,3 @@
-MD5 (hicolor-icon-theme-0.10.tar.gz) = 3534f7b8e59785c7d5bfa923e85510a7
-SHA256 (hicolor-icon-theme-0.10.tar.gz) = 9d73af8f61240fbb3c522321582cd693c5b81ef344067a3949f0aa624610adee
-SIZE (hicolor-icon-theme-0.10.tar.gz) = 33616
+MD5 (hicolor-icon-theme-0.11.tar.gz) = 5cf5527e803a554f43319ee53c771e0b
+SHA256 (hicolor-icon-theme-0.11.tar.gz) = 44eb1f158a9b2a92cd626541a24c44387162b3d792e4b238c84e6f3d8ed1dd9a
+SIZE (hicolor-icon-theme-0.11.tar.gz) = 38020
diff --git a/misc/hicolor-icon-theme/files/patch-Makefile.in b/misc/hicolor-icon-theme/files/patch-Makefile.in
new file mode 100644
index 000000000000..f021cf385548
--- /dev/null
+++ b/misc/hicolor-icon-theme/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2009-09-26 08:47:08.000000000 -0400
++++ Makefile.in 2009-09-26 08:47:18.000000000 -0400
+@@ -10,7 +10,7 @@ distdir = $(PACKAGE)-$(VERSION)
+ FILES = README Makefile.in configure.ac configure install-sh index.theme ChangeLog COPYING
+
+ ICON_SIZES = 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 \
+- 128x128 192x192 scalable
++ 128x128 192x192 256x256 scalable
+ ICON_CONTEXTS = actions animations apps categories devices emblems emotes filesystems intl mimetypes places status stock
+ STOCK_SUBS = chart code data form image io media navigation net object table text
+
diff --git a/misc/hicolor-icon-theme/files/pkg-install.in b/misc/hicolor-icon-theme/files/pkg-install.in
index d8fd041ee014..f4e85f91cc97 100644
--- a/misc/hicolor-icon-theme/files/pkg-install.in
+++ b/misc/hicolor-icon-theme/files/pkg-install.in
@@ -1,6 +1,6 @@
#!/bin/sh
# $FreeBSD$
-# $MCom: ports/misc/hicolor-icon-theme/files/pkg-install.in,v 1.4 2007/02/16 18:14:25 mezz Exp $
+# $MCom: ports/misc/hicolor-icon-theme/files/pkg-install.in,v 1.7 2009/09/26 13:42:00 marcus Exp $
PATH=/bin:/usr/bin:/usr/sbin
diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile
index 2cae46c32d06..d66d22809cbc 100644
--- a/misc/shared-mime-info/Makefile
+++ b/misc/shared-mime-info/Makefile
@@ -3,12 +3,11 @@
# Whom: olgeni@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/misc/shared-mime-info/Makefile,v 1.13 2008/02/01 04:17:52 mezz Exp $
+# $MCom: ports/misc/shared-mime-info/Makefile,v 1.16 2009/11/28 05:59:02 mezz Exp $
#
PORTNAME= shared-mime-info
-PORTVERSION= 0.60
-PORTREVISION= 1
+PORTVERSION= 0.70
CATEGORIES= misc gnome
MASTER_SITES= http://people.freedesktop.org/~hadess/
diff --git a/misc/shared-mime-info/distinfo b/misc/shared-mime-info/distinfo
index 5bdb7e038744..6a6ac375cb27 100644
--- a/misc/shared-mime-info/distinfo
+++ b/misc/shared-mime-info/distinfo
@@ -1,3 +1,3 @@
-MD5 (shared-mime-info-0.60.tar.bz2) = 339b8c284a3b7c153adea985b419030e
-SHA256 (shared-mime-info-0.60.tar.bz2) = a0d0a948fbb8d0de576876791d53efd1c5e8dd782eb9e5369cafc06c3969de22
-SIZE (shared-mime-info-0.60.tar.bz2) = 457377
+MD5 (shared-mime-info-0.70.tar.bz2) = 9032d98f14b8e13e0fea4bf45ca23401
+SHA256 (shared-mime-info-0.70.tar.bz2) = 0f9a3a6af30c43611db7b7873b91e96197ffc0c89b8e1ee16bc9f893e12c0ca0
+SIZE (shared-mime-info-0.70.tar.bz2) = 497575
diff --git a/misc/shared-mime-info/files/patch-Makefile.in b/misc/shared-mime-info/files/patch-Makefile.in
index 2e09d6c41c89..0219b47bf7b4 100644
--- a/misc/shared-mime-info/files/patch-Makefile.in
+++ b/misc/shared-mime-info/files/patch-Makefile.in
@@ -13,12 +13,3 @@
uninstall-hook:
for media in text application image audio inode video message model multipart x-epoc x-content; do rm -f "$(DESTDIR)$(datadir)/mime/$${media}/"*.xml; done
-@@ -956,7 +960,7 @@ uninstall-hook:
- rm -f "$(DESTDIR)$(datadir)/mime/types"
-
- all: check
-- make -C po shared-mime-info.pot
-+ $(MAKE) -C po shared-mime-info.pot
-
- check: freedesktop.org.xml
- if test -n $(XMLLINT) ; then \
diff --git a/misc/shared-mime-info/pkg-plist b/misc/shared-mime-info/pkg-plist
index 1879473182d3..09b39e459197 100644
--- a/misc/shared-mime-info/pkg-plist
+++ b/misc/shared-mime-info/pkg-plist
@@ -22,6 +22,7 @@ share/locale/it/LC_MESSAGES/shared-mime-info.mo
share/locale/ja/LC_MESSAGES/shared-mime-info.mo
share/locale/ko/LC_MESSAGES/shared-mime-info.mo
share/locale/lt/LC_MESSAGES/shared-mime-info.mo
+share/locale/lv/LC_MESSAGES/shared-mime-info.mo
share/locale/ms/LC_MESSAGES/shared-mime-info.mo
share/locale/nb/LC_MESSAGES/shared-mime-info.mo
share/locale/nl/LC_MESSAGES/shared-mime-info.mo
@@ -51,8 +52,10 @@ share/mime/application/javascript.xml
share/mime/application/mac-binhex40.xml
share/mime/application/mathematica.xml
share/mime/application/mbox.xml
+share/mime/application/metalink+xml.xml
share/mime/application/msword-template.xml
share/mime/application/msword.xml
+share/mime/application/mxf.xml
share/mime/application/octet-stream.xml
share/mime/application/oda.xml
share/mime/application/ogg.xml
@@ -75,6 +78,8 @@ share/mime/application/sieve.xml
share/mime/application/smil.xml
share/mime/application/vnd.corel-draw.xml
share/mime/application/vnd.emusic-emusic_package.xml
+share/mime/application/vnd.google-earth.kml+xml.xml
+share/mime/application/vnd.google-earth.kmz.xml
share/mime/application/vnd.hp-hpgl.xml
share/mime/application/vnd.hp-pcl.xml
share/mime/application/vnd.lotus-1-2-3.xml
@@ -150,6 +155,7 @@ share/mime/application/x-bzpdf.xml
share/mime/application/x-bzpostscript.xml
share/mime/application/x-cb7.xml
share/mime/application/x-cbr.xml
+share/mime/application/x-cbt.xml
share/mime/application/x-cbz.xml
share/mime/application/x-cd-image.xml
share/mime/application/x-cdrdao-toc.xml
@@ -225,6 +231,10 @@ share/mime/application/x-java.xml
share/mime/application/x-jbuilder-project.xml
share/mime/application/x-karbon.xml
share/mime/application/x-kchart.xml
+share/mime/application/x-kexi-connectiondata.xml
+share/mime/application/x-kexiproject-shortcut.xml
+share/mime/application/x-kexiproject-sqlite2.xml
+share/mime/application/x-kexiproject-sqlite3.xml
share/mime/application/x-kformula.xml
share/mime/application/x-killustrator.xml
share/mime/application/x-kivio.xml
@@ -242,6 +252,7 @@ share/mime/application/x-lha.xml
share/mime/application/x-lhz.xml
share/mime/application/x-linguist.xml
share/mime/application/x-lyx.xml
+share/mime/application/x-lzip.xml
share/mime/application/x-lzma-compressed-tar.xml
share/mime/application/x-lzma.xml
share/mime/application/x-lzop.xml
@@ -300,6 +311,8 @@ share/mime/application/x-slp.xml
share/mime/application/x-smaf.xml
share/mime/application/x-sms-rom.xml
share/mime/application/x-snes-rom.xml
+share/mime/application/x-spss-por.xml
+share/mime/application/x-spss-sav.xml
share/mime/application/x-sqlite2.xml
share/mime/application/x-sqlite3.xml
share/mime/application/x-stuffit.xml
@@ -321,10 +334,13 @@ share/mime/application/x-tzo.xml
share/mime/application/x-ufraw.xml
share/mime/application/x-ustar.xml
share/mime/application/x-wais-source.xml
+share/mime/application/x-windows-themepack.xml
share/mime/application/x-wpg.xml
share/mime/application/x-x509-ca-cert.xml
share/mime/application/x-xbel.xml
share/mime/application/x-xliff.xml
+share/mime/application/x-xz-compressed-tar.xml
+share/mime/application/x-xz.xml
share/mime/application/x-zerosize.xml
share/mime/application/x-zoo.xml
share/mime/application/xhtml+xml.xml
@@ -392,6 +408,7 @@ share/mime/image/gif.xml
share/mime/image/ief.xml
share/mime/image/jp2.xml
share/mime/image/jpeg.xml
+share/mime/image/openraster.xml
share/mime/image/png.xml
share/mime/image/rle.xml
share/mime/image/svg+xml-compressed.xml
@@ -613,11 +630,13 @@ share/mime/x-content/blank-hddvd.xml
share/mime/x-content/image-dcf.xml
share/mime/x-content/image-picturecd.xml
share/mime/x-content/software.xml
+share/mime/x-content/unix-software.xml
share/mime/x-content/video-bluray.xml
share/mime/x-content/video-dvd.xml
share/mime/x-content/video-hddvd.xml
share/mime/x-content/video-svcd.xml
share/mime/x-content/video-vcd.xml
+share/mime/x-content/win32-software.xml
share/mime/x-epoc/x-sisx-app.xml
@unexec [ -f %D/share/mime/XMLnamespaces ] && rm -f %D/share/mime/XMLnamespaces || true
@unexec [ -f %D/share/mime/aliases ] && rm -f %D/share/mime/aliases || true
diff --git a/misc/uf-view/Makefile b/misc/uf-view/Makefile
index 1c14d3bb51d7..e47c37ec1170 100644
--- a/misc/uf-view/Makefile
+++ b/misc/uf-view/Makefile
@@ -7,7 +7,7 @@
PORTNAME= uf-view
PORTVERSION= 2.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= misc
MASTER_SITES= http://www.hadess.net/files/software/uf-view/
@@ -15,7 +15,7 @@ MAINTAINER= mcgee@wam.umd.edu
COMMENT= A gTK+ viewer for the User Friendly and several other popular comics
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier gnomevfs2 gnomedesktop
+USE_GNOME= gnomeprefix gnomehack gnomehier gnomevfs2 gnomedesktop libgnomeui
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index 3bc01a3cb6cd..b0c2cc40fedb 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -3,12 +3,11 @@
# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/cheese/Makefile,v 1.31 2009/03/17 15:53:49 kwm Exp $
+# $MCom: ports/multimedia/cheese/Makefile,v 1.44 2009/10/19 20:24:12 kwm Exp $
#
PORTNAME= cheese
-PORTVERSION= 2.26.3
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/multimedia/cheese/distinfo b/multimedia/cheese/distinfo
index b1d2fb36ace8..0700030e84f3 100644
--- a/multimedia/cheese/distinfo
+++ b/multimedia/cheese/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/cheese-2.26.3.tar.bz2) = c00fbf9e79e39cb95af57c0a6cf9ce88
-SHA256 (gnome2/cheese-2.26.3.tar.bz2) = 4abcc6c34530b19a477e9431a120b0b2a296f4f4cbc20d5cb9e5ddad50347003
-SIZE (gnome2/cheese-2.26.3.tar.bz2) = 3213208
+MD5 (gnome2/cheese-2.28.1.tar.bz2) = 9accb0d6fa3f1f7644bade886c6078c3
+SHA256 (gnome2/cheese-2.28.1.tar.bz2) = a1a2bb43c161829cbd1f87753abf26ed6d5fb79cd1ab9723dd65865d33950df4
+SIZE (gnome2/cheese-2.28.1.tar.bz2) = 4852259
diff --git a/multimedia/cheese/pkg-plist b/multimedia/cheese/pkg-plist
index e9419afbaab7..361917ff7467 100644
--- a/multimedia/cheese/pkg-plist
+++ b/multimedia/cheese/pkg-plist
@@ -18,10 +18,22 @@ share/applications/cheese.desktop
%%DATADIR%%/effects/warptv.png
%%DATADIR%%/gtkrc
%%DATADIR%%/icons/hicolor/16x16/actions/browse-webcam-effects.png
+%%DATADIR%%/icons/hicolor/16x16/actions/cheese-take-burst.png
+%%DATADIR%%/icons/hicolor/16x16/actions/cheese-take-photo.png
%%DATADIR%%/icons/hicolor/22x22/actions/browse-webcam-effects.png
+%%DATADIR%%/icons/hicolor/22x22/actions/cheese-take-burst.png
+%%DATADIR%%/icons/hicolor/22x22/actions/cheese-take-photo.png
%%DATADIR%%/icons/hicolor/24x24/actions/browse-webcam-effects.png
+%%DATADIR%%/icons/hicolor/24x24/actions/cheese-take-burst.png
+%%DATADIR%%/icons/hicolor/24x24/actions/cheese-take-photo.png
%%DATADIR%%/icons/hicolor/32x32/actions/browse-webcam-effects.png
+%%DATADIR%%/icons/hicolor/32x32/actions/cheese-take-burst.png
+%%DATADIR%%/icons/hicolor/32x32/actions/cheese-take-photo.png
%%DATADIR%%/icons/hicolor/48x48/actions/browse-webcam-effects.png
+%%DATADIR%%/icons/hicolor/48x48/actions/cheese-take-burst.png
+%%DATADIR%%/icons/hicolor/48x48/actions/cheese-take-photo.png
+%%DATADIR%%/icons/hicolor/scalable/actions/cheese-take-burst.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/cheese-take-photo.svg
%%DATADIR%%/icons/hicolor/scalable/actions/browse-webcam-effects.svg
%%DATADIR%%/pixmaps/camera-icon.svg
%%DATADIR%%/pixmaps/cheese-1.svg
@@ -40,58 +52,129 @@ share/dbus-1/services/org.gnome.Cheese.service
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
share/gnome/help/cheese/C/cheese.xml
-share/gnome/help/cheese/C/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/C/figures/cheese-screenshot.jpg
+share/gnome/help/cheese/C/figures/cheese-effects.jpg
+share/gnome/help/cheese/C/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/C/figures/cheese-main.jpg
+share/gnome/help/cheese/C/figures/cheese-preferences.jpg
+share/gnome/help/cheese/C/figures/cheese-share.jpg
+share/gnome/help/cheese/C/figures/cheese-wide.jpg
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/ca/figures/cheese-effects.jpg
+share/gnome/help/cheese/ca/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/ca/figures/cheese-main.jpg
+share/gnome/help/cheese/ca/figures/cheese-preferences.jpg
+share/gnome/help/cheese/ca/figures/cheese-share.jpg
+share/gnome/help/cheese/ca/figures/cheese-wide.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/de/figures/cheese-effects.jpg
+share/gnome/help/cheese/de/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/de/figures/cheese-main.jpg
+share/gnome/help/cheese/de/figures/cheese-preferences.jpg
+share/gnome/help/cheese/de/figures/cheese-share.jpg
+share/gnome/help/cheese/de/figures/cheese-wide.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/el/figures/cheese-effects.jpg
+share/gnome/help/cheese/el/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/el/figures/cheese-main.jpg
+share/gnome/help/cheese/el/figures/cheese-preferences.jpg
+share/gnome/help/cheese/el/figures/cheese-share.jpg
+share/gnome/help/cheese/el/figures/cheese-wide.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/en_GB/figures/cheese-effects.jpg
+share/gnome/help/cheese/en_GB/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/en_GB/figures/cheese-main.jpg
+share/gnome/help/cheese/en_GB/figures/cheese-preferences.jpg
+share/gnome/help/cheese/en_GB/figures/cheese-share.jpg
+share/gnome/help/cheese/en_GB/figures/cheese-wide.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
+share/gnome/help/cheese/es/figures/cheese-effects.jpg
+share/gnome/help/cheese/es/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/es/figures/cheese-main.jpg
+share/gnome/help/cheese/es/figures/cheese-preferences.jpg
+share/gnome/help/cheese/es/figures/cheese-share.jpg
+share/gnome/help/cheese/es/figures/cheese-wide.jpg
share/gnome/help/cheese/fr/cheese.xml
-share/gnome/help/cheese/fr/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/fr/figures/cheese-screenshot.jpg
+share/gnome/help/cheese/fr/figures/cheese-effects.jpg
+share/gnome/help/cheese/fr/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/fr/figures/cheese-main.jpg
+share/gnome/help/cheese/fr/figures/cheese-preferences.jpg
+share/gnome/help/cheese/fr/figures/cheese-share.jpg
+share/gnome/help/cheese/fr/figures/cheese-wide.jpg
+share/gnome/help/cheese/it/cheese.xml
+share/gnome/help/cheese/it/figures/cheese-effects.jpg
+share/gnome/help/cheese/it/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/it/figures/cheese-main.jpg
+share/gnome/help/cheese/it/figures/cheese-preferences.jpg
+share/gnome/help/cheese/it/figures/cheese-share.jpg
+share/gnome/help/cheese/it/figures/cheese-wide.jpg
share/gnome/help/cheese/nl/cheese.xml
-share/gnome/help/cheese/nl/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/nl/figures/cheese-screenshot.jpg
+share/gnome/help/cheese/nl/figures/cheese-effects.jpg
+share/gnome/help/cheese/nl/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/nl/figures/cheese-main.jpg
+share/gnome/help/cheese/nl/figures/cheese-preferences.jpg
+share/gnome/help/cheese/nl/figures/cheese-share.jpg
+share/gnome/help/cheese/nl/figures/cheese-wide.jpg
share/gnome/help/cheese/oc/cheese.xml
-share/gnome/help/cheese/oc/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/oc/figures/cheese-screenshot.jpg
+share/gnome/help/cheese/oc/figures/cheese-effects.jpg
+share/gnome/help/cheese/oc/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/oc/figures/cheese-main.jpg
+share/gnome/help/cheese/oc/figures/cheese-preferences.jpg
+share/gnome/help/cheese/oc/figures/cheese-share.jpg
+share/gnome/help/cheese/oc/figures/cheese-wide.jpg
share/gnome/help/cheese/pt_BR/cheese.xml
-share/gnome/help/cheese/pt_BR/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/pt_BR/figures/cheese-screenshot.jpg
+share/gnome/help/cheese/pt_BR/figures/cheese-effects.jpg
+share/gnome/help/cheese/pt_BR/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/pt_BR/figures/cheese-main.jpg
+share/gnome/help/cheese/pt_BR/figures/cheese-preferences.jpg
+share/gnome/help/cheese/pt_BR/figures/cheese-share.jpg
+share/gnome/help/cheese/pt_BR/figures/cheese-wide.jpg
share/gnome/help/cheese/ru/cheese.xml
-share/gnome/help/cheese/ru/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/ru/figures/cheese-screenshot.jpg
+share/gnome/help/cheese/ru/figures/cheese-effects.jpg
+share/gnome/help/cheese/ru/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/ru/figures/cheese-main.jpg
+share/gnome/help/cheese/ru/figures/cheese-preferences.jpg
+share/gnome/help/cheese/ru/figures/cheese-share.jpg
+share/gnome/help/cheese/ru/figures/cheese-wide.jpg
share/gnome/help/cheese/sv/cheese.xml
-share/gnome/help/cheese/sv/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/sv/figures/cheese-screenshot.jpg
+share/gnome/help/cheese/sv/figures/cheese-effects.jpg
+share/gnome/help/cheese/sv/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/sv/figures/cheese-main.jpg
+share/gnome/help/cheese/sv/figures/cheese-preferences.jpg
+share/gnome/help/cheese/sv/figures/cheese-share.jpg
+share/gnome/help/cheese/sv/figures/cheese-wide.jpg
share/gnome/help/cheese/th/cheese.xml
-share/gnome/help/cheese/th/figures/cheese-effects-screenshot.jpg
-share/gnome/help/cheese/th/figures/cheese-screenshot.jpg
+share/gnome/help/cheese/th/figures/cheese-effects.jpg
+share/gnome/help/cheese/th/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/th/figures/cheese-main.jpg
+share/gnome/help/cheese/th/figures/cheese-preferences.jpg
+share/gnome/help/cheese/th/figures/cheese-share.jpg
+share/gnome/help/cheese/th/figures/cheese-wide.jpg
+share/gnome/help/cheese/zh_CN/cheese.xml
+share/gnome/help/cheese/zh_CN/figures/cheese-effects.jpg
+share/gnome/help/cheese/zh_CN/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/zh_CN/figures/cheese-main.jpg
+share/gnome/help/cheese/zh_CN/figures/cheese-preferences.jpg
+share/gnome/help/cheese/zh_CN/figures/cheese-share.jpg
+share/gnome/help/cheese/zh_CN/figures/cheese-wide.jpg
share/icons/hicolor/16x16/apps/cheese.png
share/icons/hicolor/22x22/apps/cheese.png
share/icons/hicolor/24x24/apps/cheese.png
+share/icons/hicolor/256x256/apps/cheese.png
share/icons/hicolor/32x32/apps/cheese.png
share/icons/hicolor/48x48/apps/cheese.png
share/icons/hicolor/scalable/apps/cheese.svg
+share/locale/af/LC_MESSAGES/cheese.mo
share/locale/ar/LC_MESSAGES/cheese.mo
share/locale/as/LC_MESSAGES/cheese.mo
+share/locale/ast/LC_MESSAGES/cheese.mo
share/locale/be/LC_MESSAGES/cheese.mo
share/locale/be@latin/LC_MESSAGES/cheese.mo
share/locale/bg/LC_MESSAGES/cheese.mo
+share/locale/bn/LC_MESSAGES/cheese.mo
share/locale/bn_IN/LC_MESSAGES/cheese.mo
share/locale/ca/LC_MESSAGES/cheese.mo
+share/locale/ca@valencia/LC_MESSAGES/cheese.mo
share/locale/cs/LC_MESSAGES/cheese.mo
share/locale/da/LC_MESSAGES/cheese.mo
share/locale/de/LC_MESSAGES/cheese.mo
@@ -117,6 +200,7 @@ 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/mai/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
@@ -153,13 +237,19 @@ 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-it.omf
share/omf/cheese/cheese-nl.omf
share/omf/cheese/cheese-oc.omf
share/omf/cheese/cheese-pt_BR.omf
share/omf/cheese/cheese-ru.omf
share/omf/cheese/cheese-sv.omf
share/omf/cheese/cheese-th.omf
+share/omf/cheese/cheese-zh_CN.omf
@dirrm share/omf/cheese
+@dirrmtry share/icons/hicolor/256x256/apps
+@dirrmtry share/icons/hicolor/256x256
+@dirrm share/gnome/help/cheese/zh_CN/figures
+@dirrm share/gnome/help/cheese/zh_CN
@dirrm share/gnome/help/cheese/th/figures
@dirrm share/gnome/help/cheese/th
@dirrm share/gnome/help/cheese/sv/figures
@@ -172,6 +262,8 @@ share/omf/cheese/cheese-th.omf
@dirrm share/gnome/help/cheese/oc
@dirrm share/gnome/help/cheese/nl/figures
@dirrm share/gnome/help/cheese/nl
+@dirrm share/gnome/help/cheese/it/figures
+@dirrm share/gnome/help/cheese/it
@dirrm share/gnome/help/cheese/fr/figures
@dirrm share/gnome/help/cheese/fr
@dirrm share/gnome/help/cheese/es/figures
@@ -220,15 +312,21 @@ share/omf/cheese/cheese-th.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
@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/be/LC_MESSAGES
@dirrmtry share/locale/be
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index 82e142906423..dff9410d5ecc 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= clutter-gst
-PORTVERSION= 0.8.0
-PORTREVISION= 1
+PORTVERSION= 0.10.0
CATEGORIES= multimedia
-MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/0.8/
+MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/0.10/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Clutter GStreamer integration
-LIB_DEPENDS= clutter-glx-0.8:${PORTSDIR}/graphics/clutter
+LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
USE_GMAKE= yes
+USE_BZIP2= yes
USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack ltverhack gnomeprefix
USE_GSTREAMER= yes
diff --git a/multimedia/clutter-gst/distinfo b/multimedia/clutter-gst/distinfo
index d12d766cb656..cef7aa3a43f7 100644
--- a/multimedia/clutter-gst/distinfo
+++ b/multimedia/clutter-gst/distinfo
@@ -1,3 +1,3 @@
-MD5 (clutter-gst-0.8.0.tar.gz) = 9ebf9bbe406757472952743ca01870f3
-SHA256 (clutter-gst-0.8.0.tar.gz) = 9e2ccee1380e6712997a6660ef41da8ca6f03d477244562b98d97c0e716a2458
-SIZE (clutter-gst-0.8.0.tar.gz) = 496402
+MD5 (clutter-gst-0.10.0.tar.bz2) = 876317e3f445bd28fcb9206b2272c102
+SHA256 (clutter-gst-0.10.0.tar.bz2) = 8d946f62b6b26de111fc23a885c377e47b157d169408bbae47c662ab9a494108
+SIZE (clutter-gst-0.10.0.tar.bz2) = 399277
diff --git a/multimedia/clutter-gst/pkg-plist b/multimedia/clutter-gst/pkg-plist
index 764ec2380d4b..b813b75004cb 100644
--- a/multimedia/clutter-gst/pkg-plist
+++ b/multimedia/clutter-gst/pkg-plist
@@ -1,15 +1,14 @@
-include/clutter-0.8/clutter-gst/clutter-gst-audio.h
-include/clutter-0.8/clutter-gst/clutter-gst-shaders.h
-include/clutter-0.8/clutter-gst/clutter-gst-util.h
-include/clutter-0.8/clutter-gst/clutter-gst-version.h
-include/clutter-0.8/clutter-gst/clutter-gst-video-sink.h
-include/clutter-0.8/clutter-gst/clutter-gst-video-texture.h
-include/clutter-0.8/clutter-gst/clutter-gst.h
-lib/libclutter-gst-0.8.a
-lib/libclutter-gst-0.8.la
-lib/libclutter-gst-0.8.so
-lib/libclutter-gst-0.8.so.0
-libdata/pkgconfig/clutter-gst-0.8.pc
+include/clutter-1.0/clutter-gst/clutter-gst-audio.h
+include/clutter-1.0/clutter-gst/clutter-gst-util.h
+include/clutter-1.0/clutter-gst/clutter-gst-version.h
+include/clutter-1.0/clutter-gst/clutter-gst-video-sink.h
+include/clutter-1.0/clutter-gst/clutter-gst-video-texture.h
+include/clutter-1.0/clutter-gst/clutter-gst.h
+lib/libclutter-gst-0.10.a
+lib/libclutter-gst-0.10.la
+lib/libclutter-gst-0.10.so
+lib/libclutter-gst-0.10.so.0
+libdata/pkgconfig/clutter-gst-0.10.pc
%%DOCSDIR%%/ClutterGstAudio.html
%%DOCSDIR%%/ClutterGstVideoSink.html
%%DOCSDIR%%/ClutterGstVideoTexture.html
@@ -28,5 +27,5 @@ libdata/pkgconfig/clutter-gst-0.8.pc
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
@dirrmtry %%DOCSDIR%%
-@dirrm include/clutter-0.8/clutter-gst
-@dirrmtry include/clutter-0.8
+@dirrm include/clutter-1.0/clutter-gst
+@dirrmtry include/clutter-1.0
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 02afba3672e9..9c19a38f3dd4 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -3,7 +3,7 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.111 2008/03/21 04:01:30 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.118 2009/11/17 19:08:45 kwm Exp $
#
PORTNAME= gstreamer
@@ -31,7 +31,7 @@ LIB_DEPENDS+= gstreamer-0.10.0:${PORTSDIR}/multimedia/gstreamer \
CFLAGS:= ${CFLAGS} -O2 -Wno-format
-BASE_PORTVERSION= 0.10.24
+BASE_PORTVERSION= 0.10.25
BASE_DISTNAME= gst-plugins-base-${BASE_PORTVERSION}
BASE_DISTFILE= ${BASE_DISTNAME}${EXTRACT_SUFX}
BAD_PORTVERSION= 0.10.14
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index fa2ecdbe3e18..dce462887116 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -1,5 +1,5 @@
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.68 2008/03/21 04:14:19 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.76 2009/11/17 19:08:45 kwm Exp $
# base
BASE_GST_ALL_PLUGINS= \
alsa \
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index 0c197fd828ce..71b261c16c5b 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1,6 +1,6 @@
-MD5 (gst-plugins-base-0.10.24.tar.bz2) = a3ec977c9c6602caacc2d3a7c12a17bf
-SHA256 (gst-plugins-base-0.10.24.tar.bz2) = 6f566e8ce0911e0fae99dc7435c3fc3a14d0253578a88e87a28c0e2584372761
-SIZE (gst-plugins-base-0.10.24.tar.bz2) = 2199169
+MD5 (gst-plugins-base-0.10.25.tar.bz2) = d29669dd79276c5cd94e1613c03cd9ab
+SHA256 (gst-plugins-base-0.10.25.tar.bz2) = 0ab2f7e1d818e7af1be99c4eae02ba69d4a1b8f7e3527929a6426f1daa0d4607
+SIZE (gst-plugins-base-0.10.25.tar.bz2) = 2241145
MD5 (gst-plugins-bad-0.10.14.tar.bz2) = 6be38b04fc76cdfef3a3b02b8434efa2
SHA256 (gst-plugins-bad-0.10.14.tar.bz2) = cd6811522302d8e7549990ccc0edd371f6695daa566b65f338079f5fa5ce6bd9
SIZE (gst-plugins-bad-0.10.14.tar.bz2) = 2781487
diff --git a/multimedia/gstreamer-plugins/files/patch-Makefile.in b/multimedia/gstreamer-plugins/files/patch-Makefile.in
index 7ed1748b3b1e..e20f7d21852b 100644
--- a/multimedia/gstreamer-plugins/files/patch-Makefile.in
+++ b/multimedia/gstreamer-plugins/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2008-10-02 22:46:23.000000000 +0000
-+++ Makefile.in 2008-10-12 17:59:39.000000000 +0000
-@@ -359,19 +359,15 @@
+--- Makefile.in.orig 2009-11-09 10:37:05.000000000 +0100
++++ Makefile.in 2009-11-09 10:37:34.000000000 +0100
+@@ -397,19 +397,15 @@
gst-libs \
gst sys $(SUBDIRS_EXT) \
tools \
@@ -8,10 +8,10 @@
- docs \
po \
common \
- m4 \
- pkgconfig
+ m4
DIST_SUBDIRS = \
+ pkgconfig \
- docs \
gst-libs \
gst sys ext \
@@ -19,4 +19,4 @@
- tests \
po \
common \
- m4 \
+ m4
diff --git a/multimedia/gstreamer-plugins/files/patch-gst-libs_gst_audio_Makefile.in b/multimedia/gstreamer-plugins/files/patch-gst-libs_gst_audio_Makefile.in
new file mode 100644
index 000000000000..ccbc28e5d4aa
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-gst-libs_gst_audio_Makefile.in
@@ -0,0 +1,11 @@
+--- gst-libs/gst/audio/Makefile.in.orig 2009-08-05 14:51:57.000000000 +0200
++++ gst-libs/gst/audio/Makefile.in 2009-08-05 14:52:32.000000000 +0200
+@@ -932,7 +932,7 @@ uninstall-am: uninstall-libLTLIBRARIES \
+ $^ > $@
+
+ %-enumtypes.c: $(glib_enum_headers)
+- @if test "x$(glib_enum_headers)" == "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi
++ @if test "x$(glib_enum_headers)" = "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi
+ glib-mkenums \
+ --fhead "#include \"$*-enumtypes.h\"\n$(enum_headers)" \
+ --fprod "\n/* enumerations from \"@filename@\" */" \
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index b30c0b4c63f7..7fc53c08c347 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -28,6 +28,7 @@ include/gstreamer-%%VERSION%%/gst/interfaces/mixeroptions.h
include/gstreamer-%%VERSION%%/gst/interfaces/mixertrack.h
include/gstreamer-%%VERSION%%/gst/interfaces/navigation.h
include/gstreamer-%%VERSION%%/gst/interfaces/propertyprobe.h
+include/gstreamer-%%VERSION%%/gst/interfaces/streamvolume.h
include/gstreamer-%%VERSION%%/gst/interfaces/tuner.h
include/gstreamer-%%VERSION%%/gst/interfaces/tunerchannel.h
include/gstreamer-%%VERSION%%/gst/interfaces/tunernorm.h
@@ -65,6 +66,18 @@ include/gstreamer-%%VERSION%%/gst/video/gstvideofilter.h
include/gstreamer-%%VERSION%%/gst/video/gstvideosink.h
include/gstreamer-%%VERSION%%/gst/video/video.h
include/gstreamer-%%VERSION%%/gst/video/video-enumtypes.h
+lib/girepository-1.0/GstApp-%%VERSION%%.typelib
+lib/girepository-1.0/GstAudio-%%VERSION%%.typelib
+lib/girepository-1.0/GstFft-%%VERSION%%.typelib
+lib/girepository-1.0/GstInterfaces-%%VERSION%%.typelib
+lib/girepository-1.0/GstNetbuffer-%%VERSION%%.typelib
+lib/girepository-1.0/GstPbutils-%%VERSION%%.typelib
+lib/girepository-1.0/GstRiff-%%VERSION%%.typelib
+lib/girepository-1.0/GstRtp-%%VERSION%%.typelib
+lib/girepository-1.0/GstRtsp-%%VERSION%%.typelib
+lib/girepository-1.0/GstSdp-%%VERSION%%.typelib
+lib/girepository-1.0/GstTag-%%VERSION%%.typelib
+lib/girepository-1.0/GstVideo-%%VERSION%%.typelib
lib/gstreamer-%%VERSION%%/libgstadder.la
lib/gstreamer-%%VERSION%%/libgstadder.so
lib/gstreamer-%%VERSION%%/libgstapp.la
@@ -175,6 +188,18 @@ libdata/pkgconfig/gstreamer-rtsp-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-sdp-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-tag-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-video-%%VERSION%%.pc
+share/gir-1.0/GstApp-%%VERSION%%.gir
+share/gir-1.0/GstAudio-%%VERSION%%.gir
+share/gir-1.0/GstFft-%%VERSION%%.gir
+share/gir-1.0/GstInterfaces-%%VERSION%%.gir
+share/gir-1.0/GstNetbuffer-%%VERSION%%.gir
+share/gir-1.0/GstPbutils-%%VERSION%%.gir
+share/gir-1.0/GstRiff-%%VERSION%%.gir
+share/gir-1.0/GstRtp-%%VERSION%%.gir
+share/gir-1.0/GstRtsp-%%VERSION%%.gir
+share/gir-1.0/GstSdp-%%VERSION%%.gir
+share/gir-1.0/GstTag-%%VERSION%%.gir
+share/gir-1.0/GstVideo-%%VERSION%%.gir
share/locale/af/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
share/locale/bg/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
@@ -184,6 +209,7 @@ share/locale/da/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
share/locale/de/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
share/locale/es/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/eu/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
share/locale/fi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
share/locale/fr/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
share/locale/hu/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index d1093b081b16..2edaa4a97c43 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -3,11 +3,11 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer/Makefile,v 1.59 2008/03/21 03:53:00 ahze Exp $
+# $MCom: ports/multimedia/gstreamer/Makefile,v 1.67 2009/11/12 16:18:30 kwm Exp $
#
PORTNAME= gstreamer
-PORTVERSION= 0.10.24
+PORTVERSION= 0.10.25
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/ \
GNOME
@@ -15,8 +15,10 @@ MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/ \
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Development framework for creating media applications
-BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
+ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
+RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
CFLAGS:= ${CFLAGS} -O2 -Wno-format
USE_BISON= build
@@ -50,7 +52,7 @@ MAN1= gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \
LIB_DEPENDS+= check.0:${PORTSDIR}/devel/libcheck
PLIST_SUB+= CHECK=""
.else
-CONFIGURE_ARGS+=--without-check
+CONFIGURE_ARGS+=--disable-check
PLIST_SUB+= CHECK="@comment "
.endif
diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo
index e9a656fda3fc..78be8dfa99d3 100644
--- a/multimedia/gstreamer/distinfo
+++ b/multimedia/gstreamer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gstreamer-0.10.24.tar.bz2) = 178d3326c96c360c9a15751bd5d73a6c
-SHA256 (gstreamer-0.10.24.tar.bz2) = ee8e22ff368333e668904133b40622702a1c687872e8ee5e06df9a5aad71963c
-SIZE (gstreamer-0.10.24.tar.bz2) = 2982027
+MD5 (gstreamer-0.10.25.tar.bz2) = 88544e034a051baf472983791d233076
+SHA256 (gstreamer-0.10.25.tar.bz2) = 39b2ba7b3bfa8df6d998a9461e7091c27757e36a53e93969d7d9982a56526578
+SIZE (gstreamer-0.10.25.tar.bz2) = 3045572
diff --git a/multimedia/gstreamer/files/patch-Makefile.in b/multimedia/gstreamer/files/patch-Makefile.in
index 49b34c4553bf..fe7d89f4cacf 100644
--- a/multimedia/gstreamer/files/patch-Makefile.in
+++ b/multimedia/gstreamer/files/patch-Makefile.in
@@ -1,18 +1,18 @@
---- Makefile.in.orig Tue Jun 5 11:28:51 2007
-+++ Makefile.in Tue Jun 5 11:29:23 2007
-@@ -431,7 +431,6 @@
+--- Makefile.in.orig 2009-10-19 00:06:14.000000000 +0200
++++ Makefile.in 2009-10-19 00:07:47.000000000 +0200
+@@ -397,7 +397,6 @@ aclocaldir = $(datadir)/aclocal
aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
- SUBDIRS = \
+ SUBDIRS = pkgconfig \
gst libs plugins tools tests \
- docs \
- pkgconfig po \
+ po \
common
-@@ -439,7 +438,6 @@
+@@ -405,7 +404,6 @@ SUBDIRS = pkgconfig \
# These are all the possible subdirs
- DIST_SUBDIRS = \
+ DIST_SUBDIRS = pkgconfig \
gst libs plugins tools tests \
- docs \
- pkgconfig po \
+ po \
common
diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist
index bb7d05af7c48..0d7821cf7875 100644
--- a/multimedia/gstreamer/pkg-plist
+++ b/multimedia/gstreamer/pkg-plist
@@ -23,6 +23,7 @@ include/gstreamer-%%VERSION%%/gst/base/gsttypefindhelper.h
%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstbufferstraw.h
%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstcheck.h
%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstconsistencychecker.h
+%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/internal-check.h
include/gstreamer-%%VERSION%%/gst/controller/gstcontroller.h
include/gstreamer-%%VERSION%%/gst/controller/gstcontrolsource.h
include/gstreamer-%%VERSION%%/gst/controller/gstinterpolationcontrolsource.h
@@ -88,6 +89,11 @@ include/gstreamer-%%VERSION%%/gst/net/gstnet.h
include/gstreamer-%%VERSION%%/gst/net/gstnetclientclock.h
include/gstreamer-%%VERSION%%/gst/net/gstnettimepacket.h
include/gstreamer-%%VERSION%%/gst/net/gstnettimeprovider.h
+lib/girepository-1.0/Gst-0.10.typelib
+lib/girepository-1.0/GstBase-0.10.typelib
+%%CHECK%%lib/girepository-1.0/GstCheck-0.10.typelib
+lib/girepository-1.0/GstController-0.10.typelib
+lib/girepository-1.0/GstNet-0.10.typelib
lib/gstreamer-%%VERSION%%/libgstcoreelements.la
lib/gstreamer-%%VERSION%%/libgstcoreelements.so
lib/gstreamer-%%VERSION%%/libgstcoreindexers.la
@@ -123,6 +129,11 @@ libdata/pkgconfig/gstreamer-controller-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-dataprotocol-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-net-%%VERSION%%.pc
share/aclocal/gst-element-check-%%VERSION%%.m4
+share/gir-1.0/Gst-0.10.gir
+share/gir-1.0/GstBase-0.10.gir
+%%CHECK%%share/gir-1.0/GstCheck-0.10.gir
+share/gir-1.0/GstController-0.10.gir
+share/gir-1.0/GstNet-0.10.gir
share/locale/af/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/be/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@@ -132,6 +143,7 @@ share/locale/cs/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/da/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/de/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/gstreamer-%%VERSION%%.mo
+share/locale/eu/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/es/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/fi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/fr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
diff --git a/multimedia/gstreamermm/Makefile b/multimedia/gstreamermm/Makefile
index 2a3d33a91c0e..d44a3e11d0e9 100644
--- a/multimedia/gstreamermm/Makefile
+++ b/multimedia/gstreamermm/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamermm/Makefile,v 1.2 2008/03/15 21:09:37 ahze Exp $
+# $MCom: ports/multimedia/gstreamermm/Makefile,v 1.6 2009/09/26 13:42:00 marcus Exp $
PORTNAME= gstreamermm
-PORTVERSION= 0.10.2
+PORTVERSION= 0.10.5
CATEGORIES= multimedia
MASTER_SITES= GNOME
diff --git a/multimedia/gstreamermm/distinfo b/multimedia/gstreamermm/distinfo
index 605236323a18..34d528bf3021 100644
--- a/multimedia/gstreamermm/distinfo
+++ b/multimedia/gstreamermm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gstreamermm-0.10.2.tar.bz2) = 6c62dcfe1e12d1ad05a9fa4cad19d3fc
-SHA256 (gstreamermm-0.10.2.tar.bz2) = 03ca74e002764f4f2474f812c1b5edc47ae0a121d2be053fd2eaccd29279bbda
-SIZE (gstreamermm-0.10.2.tar.bz2) = 2262704
+MD5 (gstreamermm-0.10.5.tar.bz2) = 0865345d926c11573a951a18a7a31eaa
+SHA256 (gstreamermm-0.10.5.tar.bz2) = 368b4523135e8918494e0be4495d9eab28574e7d007809b2d312c869ec6dc2a2
+SIZE (gstreamermm-0.10.5.tar.bz2) = 2645672
diff --git a/multimedia/gstreamermm/pkg-plist b/multimedia/gstreamermm/pkg-plist
index 9bdb79c08a06..67678ea96404 100644
--- a/multimedia/gstreamermm/pkg-plist
+++ b/multimedia/gstreamermm/pkg-plist
@@ -28,6 +28,7 @@ include/gstreamermm-%%GST_VERSION%%/gstreamermm/clockoverlay.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/colorbalance.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/colorbalancechannel.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/decodebin.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/decodebin2.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/element.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/elementfactory.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/enums.h
@@ -61,6 +62,7 @@ include/gstreamermm-%%GST_VERSION%%/gstreamermm/miniobject.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/mixer.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/mixeroptions.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/mixertrack.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/multifdsink.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/multiqueue.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/navigation.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/object.h
@@ -70,6 +72,7 @@ include/gstreamermm-%%GST_VERSION%%/gstreamermm/pad.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/padtemplate.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/parse.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/pipeline.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/playbin.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/playbin2.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/plugin.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/pluginfeature.h
@@ -102,6 +105,7 @@ include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/clock_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/clockoverlay_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/colorbalance_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/colorbalancechannel_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/decodebin2_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/decodebin_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/element_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/elementfactory_p.h
@@ -134,6 +138,7 @@ include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/miniobject_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/mixer_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/mixeroptions_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/mixertrack_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/multifdsink_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/multiqueue_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/navigation_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/object_p.h
@@ -144,6 +149,7 @@ include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/padtemplate_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/parse_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/pipeline_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/playbin2_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/playbin_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/plugin_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/pluginfeature_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/preset_p.h
@@ -159,19 +165,25 @@ include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/systemclock_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/taglist_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/tagsetter_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/task_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/taskpool_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/tcpclientsink_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/tcpclientsrc_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/tcpserversink_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/tcpserversrc_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/tee_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/textoverlay_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/textrender_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/theoradec_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/theoraenc_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/theoraparse_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/timeoverlay_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/tuner_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/tunerchannel_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/tunernorm_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/typefind_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/typefindelement_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/typefindfactory_p.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/uridecodebin_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/urihandler_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/value_p.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/videoorientation_p.h
@@ -200,19 +212,25 @@ include/gstreamermm-%%GST_VERSION%%/gstreamermm/systemclock.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/taglist.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/tagsetter.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/task.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/taskpool.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/tcpclientsink.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/tcpclientsrc.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/tcpserversink.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/tcpserversrc.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/tee.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/textoverlay.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/textrender.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/theoradec.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/theoraenc.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/theoraparse.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/timeoverlay.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/tuner.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/tunerchannel.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/tunernorm.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/typefind.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/typefindelement.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/typefindfactory.h
+include/gstreamermm-%%GST_VERSION%%/gstreamermm/uridecodebin.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/urihandler.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/value.h
include/gstreamermm-%%GST_VERSION%%/gstreamermm/version.h
@@ -239,9 +257,9 @@ lib/gstreamermm-%%GST_VERSION%%/proc/m4/class_boxedtype_extra.m4
lib/gstreamermm-%%GST_VERSION%%/proc/m4/class_gstminiobject.m4
lib/gstreamermm-%%GST_VERSION%%/proc/m4/convert.m4
lib/gstreamermm-%%GST_VERSION%%/proc/m4/convert_gst.m4
-lib/gstreamermm-%%GST_VERSION%%/proc/m4/ctocpp.m4
-lib/gstreamermm-%%GST_VERSION%%/proc/m4/ctocpp_base.m4
-lib/gstreamermm-%%GST_VERSION%%/proc/m4/ctocpp_gstreamermm.m4
+lib/gstreamermm-%%GST_VERSION%%/proc/m4/plugingen.m4
+lib/gstreamermm-%%GST_VERSION%%/proc/m4/plugingen_base.m4
+lib/gstreamermm-%%GST_VERSION%%/proc/m4/plugingen_gstreamermm.m4
lib/gstreamermm-%%GST_VERSION%%/proc/m4/shared.m4
lib/libgstreamermm-%%GST_VERSION%%.la
lib/libgstreamermm-%%GST_VERSION%%.so
diff --git a/multimedia/swfdec-gnome/Makefile b/multimedia/swfdec-gnome/Makefile
index d45240c3cbcd..6a06667c8972 100644
--- a/multimedia/swfdec-gnome/Makefile
+++ b/multimedia/swfdec-gnome/Makefile
@@ -3,17 +3,16 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/swfdec-gnome/Makefile,v 1.17 2009/03/17 16:41:17 kwm Exp $
+# $MCom: ports/multimedia/swfdec-gnome/Makefile,v 1.25 2009/09/22 10:46:26 kwm Exp $
#
PORTNAME= swfdec-gnome
-PORTVERSION= 2.26.0
-PORTREVISION= 1
+PORTVERSION= 2.28.0
CATEGORIES= multimedia
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
-MAINTAINER= kwm@FreeBSD.org
+MAINTAINER= gnome@FreeBSD.org
COMMENT= Gtk flash player and thumbnailer
LIB_DEPENDS= swfdec-0.8:${PORTSDIR}/graphics/swfdec
diff --git a/multimedia/swfdec-gnome/distinfo b/multimedia/swfdec-gnome/distinfo
index 451f89d48c1d..3de3083be683 100644
--- a/multimedia/swfdec-gnome/distinfo
+++ b/multimedia/swfdec-gnome/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/swfdec-gnome-2.28.0.tar.bz2) = 70a37c4b6d93104868c314d197b1496f
+SHA256 (gnome2/swfdec-gnome-2.28.0.tar.bz2) = 960ebd98fdfb5b02cdb2bc5681d5937e8c0369f7706ae2ddcfb3774344b389a4
+SIZE (gnome2/swfdec-gnome-2.28.0.tar.bz2) = 170434
diff --git a/multimedia/swfdec-gnome/pkg-plist b/multimedia/swfdec-gnome/pkg-plist
index 15e18fdd91ff..5abe55533110 100644
--- a/multimedia/swfdec-gnome/pkg-plist
+++ b/multimedia/swfdec-gnome/pkg-plist
@@ -9,10 +9,14 @@ 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/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/LC_MESSAGES/swfdec-gnome.mo
share/locale/bn_IN/LC_MESSAGES/swfdec-gnome.mo
+share/locale/br/LC_MESSAGES/swfdec-gnome.mo
share/locale/ca/LC_MESSAGES/swfdec-gnome.mo
+share/locale/ca@valencia/LC_MESSAGES/swfdec-gnome.mo
share/locale/cs/LC_MESSAGES/swfdec-gnome.mo
share/locale/da/LC_MESSAGES/swfdec-gnome.mo
share/locale/de/LC_MESSAGES/swfdec-gnome.mo
@@ -23,6 +27,7 @@ share/locale/et/LC_MESSAGES/swfdec-gnome.mo
share/locale/eu/LC_MESSAGES/swfdec-gnome.mo
share/locale/fi/LC_MESSAGES/swfdec-gnome.mo
share/locale/fr/LC_MESSAGES/swfdec-gnome.mo
+share/locale/ga/LC_MESSAGES/swfdec-gnome.mo
share/locale/gl/LC_MESSAGES/swfdec-gnome.mo
share/locale/gu/LC_MESSAGES/swfdec-gnome.mo
share/locale/he/LC_MESSAGES/swfdec-gnome.mo
@@ -35,6 +40,7 @@ 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/mai/LC_MESSAGES/swfdec-gnome.mo
share/locale/mk/LC_MESSAGES/swfdec-gnome.mo
share/locale/ml/LC_MESSAGES/swfdec-gnome.mo
share/locale/mr/LC_MESSAGES/swfdec-gnome.mo
@@ -82,10 +88,14 @@ share/locale/zh_TW/LC_MESSAGES/swfdec-gnome.mo
@dirrmtry share/locale/ps
@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/kk/LC_MESSAGES
@dirrmtry share/locale/kk
+@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
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index 9ce23850de4f..a83f5bef0d9e 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/totem-pl-parser/Makefile,v 1.24 2009/03/31 13:10:18 kwm Exp $
+# $MCom: ports/multimedia/totem-pl-parser/Makefile,v 1.31 2009/09/30 08:02:17 kwm Exp $
#
PORTNAME= totem-pl-parser
-PORTVERSION= 2.26.2
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,12 +15,12 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GObject-based library to parse a host of playlist formats
-LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \
+ gmime-2.4.6:${PORTSDIR}/mail/gmime24
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack gnomeprefix gnomevfs2 intlhack evolutiondataserver \
- ltverhack
+USE_GNOME= gnomehack gnomeprefix gnomevfs2 intlhack ltverhack
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
diff --git a/multimedia/totem-pl-parser/distinfo b/multimedia/totem-pl-parser/distinfo
index 871daaf37355..12230bea5d24 100644
--- a/multimedia/totem-pl-parser/distinfo
+++ b/multimedia/totem-pl-parser/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-pl-parser-2.26.2.tar.bz2) = daffda80cfead2a1473ca3ff71e1057b
-SHA256 (gnome2/totem-pl-parser-2.26.2.tar.bz2) = 3a6dd0382fe074f23a747b08423fccb23fb38c25b1feddacbd4875d8b8c83743
-SIZE (gnome2/totem-pl-parser-2.26.2.tar.bz2) = 634274
+MD5 (gnome2/totem-pl-parser-2.28.1.tar.bz2) = bd4ef8ce1cd3c467cd6adc2835f027bc
+SHA256 (gnome2/totem-pl-parser-2.28.1.tar.bz2) = 5f71c946cce245d53e8a13281c8dc1884fb6928f0a65d47a6aba7fb18a39acc2
+SIZE (gnome2/totem-pl-parser-2.28.1.tar.bz2) = 629063
diff --git a/multimedia/totem-pl-parser/pkg-plist b/multimedia/totem-pl-parser/pkg-plist
index 18e2fccb0f27..69ab8e9702dc 100644
--- a/multimedia/totem-pl-parser/pkg-plist
+++ b/multimedia/totem-pl-parser/pkg-plist
@@ -38,6 +38,7 @@ share/locale/bn/LC_MESSAGES/totem-pl-parser.mo
share/locale/bn_IN/LC_MESSAGES/totem-pl-parser.mo
share/locale/br/LC_MESSAGES/totem-pl-parser.mo
share/locale/ca/LC_MESSAGES/totem-pl-parser.mo
+share/locale/ca@valencia/LC_MESSAGES/totem-pl-parser.mo
share/locale/cs/LC_MESSAGES/totem-pl-parser.mo
share/locale/cy/LC_MESSAGES/totem-pl-parser.mo
share/locale/da/LC_MESSAGES/totem-pl-parser.mo
@@ -69,12 +70,14 @@ 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
share/locale/lv/LC_MESSAGES/totem-pl-parser.mo
+share/locale/mai/LC_MESSAGES/totem-pl-parser.mo
share/locale/mg/LC_MESSAGES/totem-pl-parser.mo
share/locale/mk/LC_MESSAGES/totem-pl-parser.mo
share/locale/ml/LC_MESSAGES/totem-pl-parser.mo
share/locale/mr/LC_MESSAGES/totem-pl-parser.mo
share/locale/ms/LC_MESSAGES/totem-pl-parser.mo
share/locale/nb/LC_MESSAGES/totem-pl-parser.mo
+share/locale/nds/LC_MESSAGES/totem-pl-parser.mo
share/locale/ne/LC_MESSAGES/totem-pl-parser.mo
share/locale/nl/LC_MESSAGES/totem-pl-parser.mo
share/locale/nn/LC_MESSAGES/totem-pl-parser.mo
@@ -129,14 +132,20 @@ share/locale/zh_TW/LC_MESSAGES/totem-pl-parser.mo
@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@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
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index c1b985261cf8..9cb5bfba73ca 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -3,12 +3,12 @@
# Whom: Hendrik Scholz <hendrik@scholz.net>
#
# $FreeBSD$
-# $MCom: ports/multimedia/totem/Makefile,v 1.126 2009/04/03 10:17:44 kwm Exp $
+# $MCom: ports/multimedia/totem/Makefile,v 1.138 2009/11/19 15:28:58 kwm Exp $
#
PORTNAME= totem
-PORTVERSION= 2.26.3
-PORTREVISION?= 1
+PORTVERSION= 2.28.4
+PORTREVISION?= 0
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,6 +18,7 @@ COMMENT?= A gstreamer-based video player for the GNOME 2 Desktop
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
LIB_DEPENDS= musicbrainz:${PORTSDIR}/audio/libmusicbrainz \
+ gdata.6:${PORTSDIR}/devel/libgdata \
totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \
@@ -29,7 +30,7 @@ USE_GETTEXT= yes
USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils \
nautilus2 ltverhack pygtk2
GNOME_DESKTOP_VERSION=2
-WANT_GSTREAMER= yes
+USE_GSTREAMER= core gconf hal good mpeg2dec soup ugly python gio
INSTALLS_ICONS= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
@@ -44,7 +45,8 @@ CONFIGURE_ARGS= --with-plugins="${TOTEM_PLUGINS}"
MAN1= totem.1 totem-video-thumbnailer.1
GCONF_SCHEMAS= totem-handlers.schemas totem-video-thumbnail.schemas \
totem.schemas
-CONFLICTS?= totem-xine-[0-9]*
+
+WITHOUT_DVDNAV= yes
OPTIONS= LIRC "Enable lirc support" off \
GALAGO "Enable Galago support" off \
@@ -100,7 +102,7 @@ CONFIGURE_ARGS+=--enable-browser-plugins \
PLIST_SUB+= BROWSER_PLUGINS=""
USE_WEBPLUGINS= gecko19 webkit-gtk2
-WEBPLUGINS_FILES= libtotem-basic-plugin.so libtotem-complex-plugin.so \
+WEBPLUGINS_FILES= libtotem-complex-plugin.so \
libtotem-cone-plugin.so libtotem-gmp-plugin.so \
libtotem-mully-plugin.so \
libtotem-narrowspace-plugin.so
@@ -114,17 +116,6 @@ CONFIGURE_ARGS+=--disable-browser-plugins \
PLIST_SUB+= BROWSER_PLUGINS="@comment "
.endif
-.if !defined(WITH_TOTEM_XINE) || ${SLAVE_PORT}=="no"
-CONFIGURE_ARGS+=--enable-gstreamer=yes
-USE_GSTREAMER+= core gconf hal good mpeg2dec soup ugly python gio
-WITHOUT_DVDNAV= yes
-PLIST_SUB+= GSTREAMER=""
-.else
-CONFIGURE_ARGS+=--enable-xine=yes
-LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine
-PLIST_SUB+= GSTREAMER="@comment "
-.endif
-
.if defined(WITH_DVDNAV) && !defined(WITHOUT_DVDNAV)
LIB_DEPENDS+= dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
.endif
@@ -142,8 +133,6 @@ pre-everything::
post-patch:
@${CP} -f ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
- @${REINPLACE_CMD} -e 's|dbus >= 0.61|dbus-1 >= 0.61|g' \
- ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
${WRKSRC}/src/backend/bacon-video-widget-gst-0.10.c
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 3b60109a80f7..343a163cc425 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-2.26.3.tar.bz2) = f8f7390f5d93268cd200086a1b4f765a
-SHA256 (gnome2/totem-2.26.3.tar.bz2) = ae1bd6682385ad401effda4a856f4ba8150b5ef4eab113a288b29e9335170d70
-SIZE (gnome2/totem-2.26.3.tar.bz2) = 3193956
+MD5 (gnome2/totem-2.28.4.tar.bz2) = a08fca39db3c3e7885c584e0fd533f5a
+SHA256 (gnome2/totem-2.28.4.tar.bz2) = ac1f9091450e2dde2887dd7176183341fcea5adc4b6cee6887342837f2a6e17e
+SIZE (gnome2/totem-2.28.4.tar.bz2) = 3081676
diff --git a/multimedia/totem/files/patch-help_Makefile.in b/multimedia/totem/files/patch-help_Makefile.in
new file mode 100644
index 000000000000..0695029ac2b6
--- /dev/null
+++ b/multimedia/totem/files/patch-help_Makefile.in
@@ -0,0 +1,11 @@
+--- help/Makefile.in.orig 2009-05-10 03:06:15.000000000 -0400
++++ help/Makefile.in 2009-05-10 03:06:29.000000000 -0400
+@@ -783,7 +783,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS);
+ xsltproc --path "$$xmlpath" $(_credits) $$doc; \
+ done | sort | uniq \
+ | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \
+- | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp
++ | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/ "\1",/' >> $@.tmp
+ echo ' NULL' >> $@.tmp
+ echo '};' >> $@.tmp
+ echo >> $@.tmp
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 7edd484c982a..971411f013dc 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -17,10 +17,6 @@ bin/totem-video-thumbnailer
%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.a
%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.la
%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.so
-lib/libbaconvideowidget.a
-lib/libbaconvideowidget.la
-lib/libbaconvideowidget.so
-lib/libbaconvideowidget.so.0
lib/nautilus/extensions-2.0/libtotem-properties-page.a
lib/nautilus/extensions-2.0/libtotem-properties-page.la
lib/nautilus/extensions-2.0/libtotem-properties-page.so
@@ -73,9 +69,9 @@ lib/totem/plugins/thumbnail/thumbnail.totem-plugin
lib/totem/plugins/totem/__init__.py
lib/totem/plugins/totem/__init__.pyc
lib/totem/plugins/totem/__init__.pyo
-lib/totem/plugins/youtube/youtube.py
-lib/totem/plugins/youtube/youtube.pyc
-lib/totem/plugins/youtube/youtube.pyo
+lib/totem/plugins/youtube/libyoutube.a
+lib/totem/plugins/youtube/libyoutube.la
+lib/totem/plugins/youtube/libyoutube.so
lib/totem/plugins/youtube/youtube.totem-plugin
lib/totem/plugins/youtube/youtube.ui
%%BROWSER_PLUGINS%%libexec/totem-plugin-viewer
@@ -98,6 +94,8 @@ share/applications/totem.desktop
%%DOCSDIR%%/totem-Interface.html
%%DOCSDIR%%/totem.devhelp
%%DOCSDIR%%/totem.devhelp2
+%%DOCSDIR%%/totem-plugins.html
+%%DOCSDIR%%/tutorials.html
%%DOCSDIR%%/up.png
%%DOCSDIR%%/widget-api.html
share/gnome/help/totem/C/figures/totem_next_button.png
@@ -275,6 +273,15 @@ share/gnome/help/totem/uk/figures/totem_start_window.png
share/gnome/help/totem/uk/figures/totem_volume_maximum_button.png
share/gnome/help/totem/uk/figures/totem_volume_mute_button.png
share/gnome/help/totem/uk/totem.xml
+share/gnome/help/totem/zh_CN/figures/totem_next_button.png
+share/gnome/help/totem/zh_CN/figures/totem_pause_button.png
+share/gnome/help/totem/zh_CN/figures/totem_play_button.png
+share/gnome/help/totem/zh_CN/figures/totem_previous_button.png
+share/gnome/help/totem/zh_CN/figures/totem_show_playlist_button.png
+share/gnome/help/totem/zh_CN/figures/totem_start_window.png
+share/gnome/help/totem/zh_CN/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/zh_CN/figures/totem_volume_mute_button.png
+share/gnome/help/totem/zh_CN/totem.xml
share/gnome/help/totem/zh_HK/figures/totem_next_button.png
share/gnome/help/totem/zh_HK/figures/totem_pause_button.png
share/gnome/help/totem/zh_HK/figures/totem_play_button.png
@@ -317,6 +324,7 @@ share/locale/bn/LC_MESSAGES/totem.mo
share/locale/bn_IN/LC_MESSAGES/totem.mo
share/locale/br/LC_MESSAGES/totem.mo
share/locale/ca/LC_MESSAGES/totem.mo
+share/locale/ca@valencia/LC_MESSAGES/totem.mo
share/locale/crh/LC_MESSAGES/totem.mo
share/locale/cs/LC_MESSAGES/totem.mo
share/locale/cy/LC_MESSAGES/totem.mo
@@ -363,7 +371,6 @@ 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
@@ -408,6 +415,7 @@ share/omf/totem/totem-pt_BR.omf
share/omf/totem/totem-ru.omf
share/omf/totem/totem-sv.omf
share/omf/totem/totem-uk.omf
+share/omf/totem/totem-zh_CN.omf
share/omf/totem/totem-zh_HK.omf
share/omf/totem/totem-zh_TW.omf
%%DATADIR%%/filmholes-big-left.png
@@ -419,7 +427,6 @@ share/omf/totem/totem-zh_TW.omf
%%DATADIR%%/plugins.ui
%%DATADIR%%/properties.ui
%%DATADIR%%/totem.ui
-%%DATADIR%%/totem_logo.png
%%DATADIR%%/uri.ui
%%DATADIR%%/video-list.ui
share/vala/vapi/totem.deps
@@ -430,6 +437,8 @@ share/vala/vapi/totem.vapi
@dirrm share/gnome/help/totem/zh_TW
@dirrm share/gnome/help/totem/zh_HK/figures
@dirrm share/gnome/help/totem/zh_HK
+@dirrm share/gnome/help/totem/zh_CN/figures
+@dirrm share/gnome/help/totem/zh_CN
@dirrm share/gnome/help/totem/uk/figures
@dirrm share/gnome/help/totem/uk
@dirrm share/gnome/help/totem/sv/figures
@@ -506,8 +515,6 @@ 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
@@ -522,6 +529,8 @@ share/vala/vapi/totem.vapi
@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
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index 1d250a460ce1..f36468b1e43c 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -3,25 +3,26 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/net-im/empathy/Makefile,v 1.3 2009/04/15 11:41:56 kwm Exp $
+# $MCom: ports/net-im/empathy/Makefile,v 1.49 2009/11/18 18:26:02 kwm Exp $
PORTNAME= empathy
-PORTVERSION= 2.26.2
-PORTREVISION= 1
+PORTVERSION= 2.28.1.2
CATEGORIES= net-im gnome
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
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 \
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+ ${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
+LIB_DEPENDS= aspell.16:${PORTSDIR}/textproc/aspell \
telepathy.2:${PORTSDIR}/net-im/libtelepathy \
telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
telepathy-farsight.0:${PORTSDIR}/net-im/telepathy-farsight \
+ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
canberra-gtk.0:${PORTSDIR}/audio/libcanberra
-RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+ ${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
USE_GMAKE= yes
USE_BZIP2= yes
@@ -45,7 +46,9 @@ OPTIONS= JABBER "Enable jabber (XMPP) client support" on \
MSN "Enable MSN client support" on \
IRC "Enable IRC client support" on \
SALUT "Enable link-local (serverless) XMPP support" off \
- HAZE "Enable libpurple protocol integration" off
+ HAZE "Enable libpurple protocol integration" off \
+ WEBKIT "Enable Adium Message Style themes" on \
+ MAP "Enable graphical map support" on
.include <bsd.port.pre.mk>
@@ -69,6 +72,24 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-salut:${PORTSDIR}/net-im/telepathy-
RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-haze:${PORTSDIR}/net-im/telepathy-haze
.endif
+.if defined(WITH_WEBKIT)
+LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
+CONFIGURE_ARGS+=--enable-webkit
+PLIST_SUB+= ADIUM=""
+.else
+CONFIGURE_ARGS+=--disable-webkit
+PLIST_SUB+= ADIUM="@comment "
+.endif
+
+.if !defined(WITHOUT_MAP)
+LIB_DEPENDS+= champlain-0.4.1:${PORTSDIR}/graphics/libchamplain
+CONFIGURE_ARGS+=--enable-map
+PLIST_SUB+= MAP=""
+.else
+CONFIGURE_ARGS+=--disable-map
+PLIST_SUB+= MAP="@comment "
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|$${datadir}/gtk-doc/html|${DOCSDIR}|g ; \
s|-Werror||g' ${WRKSRC}/configure
diff --git a/net-im/empathy/distinfo b/net-im/empathy/distinfo
index aa523af3508a..84ee9a08ec6d 100644
--- a/net-im/empathy/distinfo
+++ b/net-im/empathy/distinfo
@@ -1,3 +1,3 @@
-MD5 (empathy-2.26.2.tar.bz2) = 7d42b4c54373c3706a3da301cd616329
-SHA256 (empathy-2.26.2.tar.bz2) = 2790502f62056926feeab71681033e5787856f7b56ae0beaa49f89b4763f1b9a
-SIZE (empathy-2.26.2.tar.bz2) = 2021659
+MD5 (empathy-2.28.1.2.tar.bz2) = 4852ca8423896b6ccb5f7de4d6064607
+SHA256 (empathy-2.28.1.2.tar.bz2) = 7af58b5d6c315dd08f7ad519d1aeed545a6c2c99ff1275ad3a442bcf513b7a0d
+SIZE (empathy-2.28.1.2.tar.bz2) = 2432256
diff --git a/net-im/empathy/files/patch-libempathy_emapth-tp-file.c b/net-im/empathy/files/patch-libempathy_emapth-tp-file.c
new file mode 100644
index 000000000000..58ac2a65b19d
--- /dev/null
+++ b/net-im/empathy/files/patch-libempathy_emapth-tp-file.c
@@ -0,0 +1,10 @@
+--- libempathy/empathy-tp-file.c.orig 2009-06-15 18:52:39.000000000 +0200
++++ libempathy/empathy-tp-file.c 2009-06-15 18:53:45.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include <arpa/inet.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <sys/un.h>
+
+ #include <glib/gi18n-lib.h>
diff --git a/net-im/empathy/pkg-plist b/net-im/empathy/pkg-plist
index 7dca126190c5..9860d5b38adf 100644
--- a/net-im/empathy/pkg-plist
+++ b/net-im/empathy/pkg-plist
@@ -25,38 +25,51 @@ include/libempathy-gtk/empathy-geometry.h
include/libempathy-gtk/empathy-gtk-enum-types.h
include/libempathy-gtk/empathy-images.h
include/libempathy-gtk/empathy-irc-network-dialog.h
+include/libempathy-gtk/empathy-kludge-label.h
include/libempathy-gtk/empathy-log-window.h
include/libempathy-gtk/empathy-new-message-dialog.h
+include/libempathy-gtk/empathy-plist.h
include/libempathy-gtk/empathy-presence-chooser.h
-include/libempathy-gtk/empathy-profile-chooser.h
+include/libempathy-gtk/empathy-protocol-chooser.h
+include/libempathy-gtk/empathy-share-my-desktop.h
include/libempathy-gtk/empathy-smiley-manager.h
-include/libempathy-gtk/empathy-spell-dialog.h
+include/libempathy-gtk/empathy-sound.h
include/libempathy-gtk/empathy-spell.h
+include/libempathy-gtk/empathy-status-preset-dialog.h
+%%ADIUM%%include/libempathy-gtk/empathy-theme-adium.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-ui-utils.h
include/libempathy-gtk/empathy-video-src.h
include/libempathy-gtk/empathy-video-widget.h
+include/libempathy/empathy-account.h
include/libempathy/empathy-account-manager.h
+include/libempathy/empathy-account-settings.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-connection-managers.h
+include/libempathy/empathy-connectivity.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-debugger.h
include/libempathy/empathy-dispatch-operation.h
include/libempathy/empathy-dispatcher.h
include/libempathy/empathy-enum-types.h
+include/libempathy/empathy-ft-factory.h
+include/libempathy/empathy-ft-handler.h
+include/libempathy/empathy-handler.h
include/libempathy/empathy-idle.h
include/libempathy/empathy-irc-network-manager.h
include/libempathy/empathy-irc-network.h
include/libempathy/empathy-irc-server.h
+include/libempathy/empathy-location.h
include/libempathy/empathy-log-manager.h
include/libempathy/empathy-log-store-empathy.h
include/libempathy/empathy-log-store.h
@@ -68,20 +81,18 @@ 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.19
+lib/libempathy-gtk.so.28
lib/libempathy.a
lib/libempathy.la
lib/libempathy.so
-lib/libempathy.so.23
+lib/libempathy.so.30
%%PYTHON_SITELIBDIR%%/empathy.a
%%PYTHON_SITELIBDIR%%/empathy.la
%%PYTHON_SITELIBDIR%%/empathy.so
@@ -95,7 +106,9 @@ libdata/pkgconfig/libempathy.pc
libexec/megaphone-applet
libexec/nothere-applet
share/applications/empathy.desktop
+share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
share/doc/libempathy-gtk/EmpathyAccountChooser.html
+share/doc/libempathy-gtk/EmpathyAccountWidget.html
share/doc/libempathy-gtk/EmpathyAvatarChooser.html
share/doc/libempathy-gtk/EmpathyAvatarImage.html
share/doc/libempathy-gtk/EmpathyCellRendererActivatable.html
@@ -110,8 +123,13 @@ 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/EmpathyKludgeLabel.html
+share/doc/libempathy-gtk/EmpathyLocationManager.html
share/doc/libempathy-gtk/EmpathyPresenceChooser.html
+share/doc/libempathy-gtk/EmpathyProtocolChooser.html
share/doc/libempathy-gtk/EmpathySmileyManager.html
+share/doc/libempathy-gtk/EmpathyStatusPresetDialog.html
+share/doc/libempathy-gtk/EmpathyThemeAdium.html
share/doc/libempathy-gtk/EmpathyThemeBoxes.html
share/doc/libempathy-gtk/EmpathyThemeIrc.html
share/doc/libempathy-gtk/EmpathyThemeManager.html
@@ -122,8 +140,8 @@ share/doc/libempathy-gtk/index.sgml
share/doc/libempathy-gtk/ix01.html
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-private.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
@@ -133,8 +151,9 @@ share/doc/libempathy-gtk/libempathy-gtk-empathy-images.html
share/doc/libempathy-gtk/libempathy-gtk-empathy-irc-network-dialog.html
share/doc/libempathy-gtk/libempathy-gtk-empathy-log-window.html
share/doc/libempathy-gtk/libempathy-gtk-empathy-new-message-dialog.html
-share/doc/libempathy-gtk/libempathy-gtk-empathy-profile-chooser.html
-share/doc/libempathy-gtk/libempathy-gtk-empathy-spell-dialog.html
+share/doc/libempathy-gtk/libempathy-gtk-empathy-plist.html
+share/doc/libempathy-gtk/libempathy-gtk-empathy-share-my-desktop.html
+share/doc/libempathy-gtk/libempathy-gtk-empathy-sound.html
share/doc/libempathy-gtk/libempathy-gtk-empathy-spell.html
share/doc/libempathy-gtk/libempathy-gtk-empathy-ui-utils.html
share/doc/libempathy-gtk/libempathy-gtk-hierarchy.html
@@ -146,17 +165,23 @@ 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/EmpathyAccount.html
share/doc/libempathy/EmpathyAccountManager.html
+share/doc/libempathy/EmpathyAccountSettings.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/EmpathyConnectionManagers.html
+share/doc/libempathy/EmpathyConnectivity.html
share/doc/libempathy/EmpathyContactMonitor.html
+share/doc/libempathy/EmpathyDebugger.html
share/doc/libempathy/EmpathyDispatcher.html
share/doc/libempathy/EmpathyDispatchOperation.html
+share/doc/libempathy/EmpathyFTFactory.html
+share/doc/libempathy/EmpathyFTHandler.html
share/doc/libempathy/EmpathyIdle.html
share/doc/libempathy/EmpathyIrcNetwork.html
share/doc/libempathy/EmpathyIrcNetworkManager.html
@@ -169,9 +194,7 @@ 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
share/doc/libempathy/EmpathyTubeHandler.html
share/doc/libempathy/home.png
share/doc/libempathy/index.html
@@ -181,6 +204,7 @@ 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-location.html
share/doc/libempathy/libempathy-empathy-log-store.html
share/doc/libempathy/libempathy-empathy-status-presets.html
share/doc/libempathy/libempathy-empathy-time.html
@@ -197,45 +221,53 @@ share/doc/libempathy/style.css
share/doc/libempathy/up.png
%%DATADIR%%/GNOME_Megaphone_Applet.xml
%%DATADIR%%/GNOME_NotHere_Applet.xml
-%%DATADIR%%/empathy-account-widget-aim.glade
-%%DATADIR%%/empathy-account-widget-generic.glade
-%%DATADIR%%/empathy-account-widget-groupwise.glade
-%%DATADIR%%/empathy-account-widget-icq.glade
-%%DATADIR%%/empathy-account-widget-irc.glade
-%%DATADIR%%/empathy-account-widget-jabber.glade
-%%DATADIR%%/empathy-account-widget-msn.glade
-%%DATADIR%%/empathy-account-widget-salut.glade
-%%DATADIR%%/empathy-account-widget-sip.glade
-%%DATADIR%%/empathy-account-widget-yahoo.glade
-%%DATADIR%%/empathy-accounts-dialog.glade
-%%DATADIR%%/empathy-call-window.glade
-%%DATADIR%%/empathy-chat-window.glade
-%%DATADIR%%/empathy-chat.glade
+%%DATADIR%%/Template.html
+%%DATADIR%%/codec-preferences
+%%DATADIR%%/element-properties
+%%DATADIR%%/empathy-account-widget-local-xmpp.ui
+%%MAP%%%%DATADIR%%/empathy-map-view.ui
+%%DATADIR%%/empathy-account-widget-aim.ui
+%%DATADIR%%/empathy-account-widget-generic.ui
+%%DATADIR%%/empathy-account-widget-groupwise.ui
+%%DATADIR%%/empathy-account-widget-icq.ui
+%%DATADIR%%/empathy-account-widget-irc.ui
+%%DATADIR%%/empathy-account-widget-jabber.ui
+%%DATADIR%%/empathy-account-widget-msn.ui
+%%DATADIR%%/empathy-account-widget-sip.ui
+%%DATADIR%%/empathy-account-widget-yahoo.ui
+%%DATADIR%%/empathy-accounts-dialog.ui
+%%DATADIR%%/empathy-call-window-fullscreen.ui
+%%DATADIR%%/empathy-call-window.ui
+%%DATADIR%%/empathy-chat-window.ui
+%%DATADIR%%/empathy-chat.ui
%%DATADIR%%/empathy-chatroom-manager.dtd
-%%DATADIR%%/empathy-chatrooms-window.glade
-%%DATADIR%%/empathy-contact-dialogs.glade
+%%DATADIR%%/empathy-chatrooms-window.ui
+%%DATADIR%%/empathy-contact-dialogs.ui
%%DATADIR%%/empathy-contact-groups.dtd
-%%DATADIR%%/empathy-contact-widget.glade
-%%DATADIR%%/empathy-ft-manager.glade
+%%DATADIR%%/empathy-contact-widget.ui
+%%DATADIR%%/empathy-ft-manager.ui
+%%DATADIR%%/empathy-import-dialog.ui
%%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
-%%DATADIR%%/empathy-new-chatroom-dialog.glade
-%%DATADIR%%/empathy-new-message-dialog.glade
-%%DATADIR%%/empathy-preferences.glade
-%%DATADIR%%/empathy-presence-chooser.glade
-%%DATADIR%%/empathy-spell-dialog.glade
-%%DATADIR%%/empathy-status-icon.glade
+%%DATADIR%%/empathy-log-window.ui
+%%DATADIR%%/empathy-main-window.ui
+%%DATADIR%%/empathy-new-chatroom-dialog.ui
+%%DATADIR%%/empathy-new-message-dialog.ui
+%%DATADIR%%/empathy-preferences.ui
+%%DATADIR%%/empathy-status-icon.ui
%%DATADIR%%/empathy-status-presets.dtd
+%%DATADIR%%/empathy-status-preset-dialog.ui
%%DATADIR%%/icons/hicolor/16x16/actions/im-message-new.png
+%%DATADIR%%/icons/hicolor/16x16/apps/empathy-starred.png
+%%DATADIR%%/icons/hicolor/16x16/apps/empathy-unstarred.png
%%DATADIR%%/icons/hicolor/16x16/apps/im-ekiga.png
+%%DATADIR%%/icons/hicolor/16x16/apps/im-facebook.png
%%DATADIR%%/icons/hicolor/16x16/apps/im-gadugadu.png
%%DATADIR%%/icons/hicolor/16x16/apps/im-gizmo.png
%%DATADIR%%/icons/hicolor/16x16/apps/im-google-talk.png
%%DATADIR%%/icons/hicolor/16x16/apps/im-irc.png
%%DATADIR%%/icons/hicolor/16x16/apps/im-local-xmpp.png
+%%DATADIR%%/icons/hicolor/16x16/apps/im-meanwhile.png
%%DATADIR%%/icons/hicolor/16x16/apps/im-msn.png
%%DATADIR%%/icons/hicolor/16x16/apps/im-qq.png
%%DATADIR%%/icons/hicolor/16x16/apps/im-sip.png
@@ -249,12 +281,16 @@ share/doc/libempathy/up.png
%%DATADIR%%/icons/hicolor/16x16/status/im-message.png
%%DATADIR%%/icons/hicolor/16x16/status/user-typing.png
%%DATADIR%%/icons/hicolor/22x22/actions/im-message-new.png
+%%DATADIR%%/icons/hicolor/22x22/apps/empathy-starred.png
+%%DATADIR%%/icons/hicolor/22x22/apps/empathy-unstarred.png
%%DATADIR%%/icons/hicolor/22x22/apps/im-ekiga.png
+%%DATADIR%%/icons/hicolor/22x22/apps/im-facebook.png
%%DATADIR%%/icons/hicolor/22x22/apps/im-gadugadu.png
%%DATADIR%%/icons/hicolor/22x22/apps/im-gizmo.png
%%DATADIR%%/icons/hicolor/22x22/apps/im-google-talk.png
%%DATADIR%%/icons/hicolor/22x22/apps/im-irc.png
%%DATADIR%%/icons/hicolor/22x22/apps/im-local-xmpp.png
+%%DATADIR%%/icons/hicolor/22x22/apps/im-meanwhile.png
%%DATADIR%%/icons/hicolor/22x22/apps/im-msn.png
%%DATADIR%%/icons/hicolor/22x22/apps/im-qq.png
%%DATADIR%%/icons/hicolor/22x22/apps/im-sip.png
@@ -266,6 +302,8 @@ share/doc/libempathy/up.png
%%DATADIR%%/icons/hicolor/22x22/status/empathy-offline.png
%%DATADIR%%/icons/hicolor/22x22/status/empathy-pending.png
%%DATADIR%%/icons/hicolor/24x24/actions/im-message-new.png
+%%DATADIR%%/icons/hicolor/24x24/apps/empathy-starred.png
+%%DATADIR%%/icons/hicolor/24x24/apps/empathy-unstarred.png
%%DATADIR%%/icons/hicolor/24x24/apps/im-ekiga.png
%%DATADIR%%/icons/hicolor/24x24/apps/im-gadugadu.png
%%DATADIR%%/icons/hicolor/24x24/apps/im-gizmo.png
@@ -282,6 +320,8 @@ share/doc/libempathy/up.png
%%DATADIR%%/icons/hicolor/24x24/status/empathy-extended-away.png
%%DATADIR%%/icons/hicolor/24x24/status/empathy-offline.png
%%DATADIR%%/icons/hicolor/24x24/status/empathy-pending.png
+%%DATADIR%%/icons/hicolor/32x32/apps/empathy-starred.png
+%%DATADIR%%/icons/hicolor/32x32/apps/empathy-unstarred.png
%%DATADIR%%/icons/hicolor/32x32/apps/im-ekiga.png
%%DATADIR%%/icons/hicolor/32x32/apps/im-gadugadu.png
%%DATADIR%%/icons/hicolor/32x32/apps/im-gizmo.png
@@ -298,12 +338,16 @@ share/doc/libempathy/up.png
%%DATADIR%%/icons/hicolor/32x32/status/empathy-extended-away.png
%%DATADIR%%/icons/hicolor/32x32/status/empathy-offline.png
%%DATADIR%%/icons/hicolor/32x32/status/empathy-pending.png
+%%DATADIR%%/icons/hicolor/48x48/apps/empathy-starred.png
+%%DATADIR%%/icons/hicolor/48x48/apps/empathy-unstarred.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-ekiga.png
+%%DATADIR%%/icons/hicolor/48x48/apps/im-facebook.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-gadugadu.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-gizmo.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-google-talk.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-irc.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-local-xmpp.png
+%%DATADIR%%/icons/hicolor/48x48/apps/im-meanwhile.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-msn.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-qq.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-sip.png
@@ -314,13 +358,13 @@ 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
%%DATADIR%%/icons/hicolor/scalable/apps/im-google-talk.svg
%%DATADIR%%/icons/hicolor/scalable/apps/im-irc.svg
%%DATADIR%%/icons/hicolor/scalable/apps/im-local-xmpp.svg
+%%DATADIR%%/icons/hicolor/scalable/apps/im-meanwhile.svg
%%DATADIR%%/icons/hicolor/scalable/apps/im-msn.svg
%%DATADIR%%/icons/hicolor/scalable/apps/im-qq.svg
%%DATADIR%%/icons/hicolor/scalable/apps/im-sip.svg
@@ -331,32 +375,645 @@ share/doc/libempathy/up.png
%%DATADIR%%/icons/hicolor/scalable/status/empathy-extended-away.svg
%%DATADIR%%/icons/hicolor/scalable/status/empathy-offline.svg
%%DATADIR%%/icons/hicolor/scalable/status/empathy-pending.svg
+@exec %%LOCALBASE%%/bin/gtk-update-icon-cache -q -t -f %D/%%DATADIR%%/icons/hicolor 2>/dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/gtk-update-icon-cache -q -t -f %D/%%DATADIR%%/icons/hicolor 2>/dev/null || /usr/bin/true
%%DATADIR%%/irc-networks.xml
-share/gnome/help/empathy/C/empathy.xml
+share/gnome/help/empathy/C/account-irc.page
+share/gnome/help/empathy/C/account-jabber.page
+share/gnome/help/empathy/C/accounts-window.page
+share/gnome/help/empathy/C/add-account.page
+share/gnome/help/empathy/C/add-contact.page
+share/gnome/help/empathy/C/audio-call.page
+share/gnome/help/empathy/C/audio-video.page
+share/gnome/help/empathy/C/change-status.page
+share/gnome/help/empathy/C/create-account.page
+share/gnome/help/empathy/C/disable-account.page
+share/gnome/help/empathy/C/favorite-rooms.page
+share/gnome/help/empathy/C/figures/audio-input-microphone.png
+share/gnome/help/empathy/C/figures/available.png
+share/gnome/help/empathy/C/figures/away.png
+share/gnome/help/empathy/C/figures/busy.png
+share/gnome/help/empathy/C/figures/camera-web.png
share/gnome/help/empathy/C/figures/empathy-main-window.png
+share/gnome/help/empathy/C/figures/gtk-add.png
+share/gnome/help/empathy/C/figures/gtk-edit.png
+share/gnome/help/empathy/C/figures/gtk-remove.png
+share/gnome/help/empathy/C/figures/offline.png
+share/gnome/help/empathy/C/geolocation-not-showing.page
+share/gnome/help/empathy/C/geolocation-privacy.page
+share/gnome/help/empathy/C/geolocation-supported.page
+share/gnome/help/empathy/C/geolocation-turn.page
+share/gnome/help/empathy/C/geolocation-what-is.page
+share/gnome/help/empathy/C/geolocation.page
+share/gnome/help/empathy/C/group-conversations.page
+share/gnome/help/empathy/C/import-account.page
+share/gnome/help/empathy/C/index.page
+share/gnome/help/empathy/C/introduction.page
+share/gnome/help/empathy/C/irc-join-pwd.page
+share/gnome/help/empathy/C/irc-join-room.page
+share/gnome/help/empathy/C/irc-manage.page
+share/gnome/help/empathy/C/irc-nick-password.page
+share/gnome/help/empathy/C/irc-send-file.page
+share/gnome/help/empathy/C/irc-start-conversation.page
share/gnome/help/empathy/C/legal.xml
-share/gnome/help/empathy/ca/empathy.xml
+share/gnome/help/empathy/C/offline-contacts.page
+share/gnome/help/empathy/C/prev-conv.page
+share/gnome/help/empathy/C/prob-conn-acctdisabled.page
+share/gnome/help/empathy/C/prob-conn-auth.page
+share/gnome/help/empathy/C/prob-conn-name.page
+share/gnome/help/empathy/C/prob-conn-neterror.page
+share/gnome/help/empathy/C/prob-conn.page
+share/gnome/help/empathy/C/remove-account.page
+share/gnome/help/empathy/C/salut-protocol.page
+share/gnome/help/empathy/C/send-file.page
+share/gnome/help/empathy/C/send-message.page
+share/gnome/help/empathy/C/set-custom-status.page
+share/gnome/help/empathy/C/share-desktop.page
+share/gnome/help/empathy/C/status-icons.page
+share/gnome/help/empathy/C/video-call.page
+share/gnome/help/empathy/ca/account-irc.page
+share/gnome/help/empathy/ca/account-jabber.page
+share/gnome/help/empathy/ca/accounts-window.page
+share/gnome/help/empathy/ca/add-account.page
+share/gnome/help/empathy/ca/add-contact.page
+share/gnome/help/empathy/ca/audio-call.page
+share/gnome/help/empathy/ca/audio-video.page
+share/gnome/help/empathy/ca/change-status.page
+share/gnome/help/empathy/ca/create-account.page
+share/gnome/help/empathy/ca/disable-account.page
+share/gnome/help/empathy/ca/favorite-rooms.page
+share/gnome/help/empathy/ca/figures/audio-input-microphone.png
+share/gnome/help/empathy/ca/figures/available.png
+share/gnome/help/empathy/ca/figures/away.png
+share/gnome/help/empathy/ca/figures/busy.png
+share/gnome/help/empathy/ca/figures/camera-web.png
share/gnome/help/empathy/ca/figures/empathy-main-window.png
-share/gnome/help/empathy/cs/empathy.xml
+share/gnome/help/empathy/ca/figures/gtk-add.png
+share/gnome/help/empathy/ca/figures/gtk-edit.png
+share/gnome/help/empathy/ca/figures/gtk-remove.png
+share/gnome/help/empathy/ca/figures/offline.png
+share/gnome/help/empathy/ca/geolocation-not-showing.page
+share/gnome/help/empathy/ca/geolocation-privacy.page
+share/gnome/help/empathy/ca/geolocation-supported.page
+share/gnome/help/empathy/ca/geolocation-turn.page
+share/gnome/help/empathy/ca/geolocation-what-is.page
+share/gnome/help/empathy/ca/geolocation.page
+share/gnome/help/empathy/ca/group-conversations.page
+share/gnome/help/empathy/ca/import-account.page
+share/gnome/help/empathy/ca/index.page
+share/gnome/help/empathy/ca/introduction.page
+share/gnome/help/empathy/ca/irc-join-pwd.page
+share/gnome/help/empathy/ca/irc-join-room.page
+share/gnome/help/empathy/ca/irc-manage.page
+share/gnome/help/empathy/ca/irc-nick-password.page
+share/gnome/help/empathy/ca/irc-send-file.page
+share/gnome/help/empathy/ca/irc-start-conversation.page
+share/gnome/help/empathy/ca/legal.xml
+share/gnome/help/empathy/ca/offline-contacts.page
+share/gnome/help/empathy/ca/prev-conv.page
+share/gnome/help/empathy/ca/prob-conn-acctdisabled.page
+share/gnome/help/empathy/ca/prob-conn-auth.page
+share/gnome/help/empathy/ca/prob-conn-name.page
+share/gnome/help/empathy/ca/prob-conn-neterror.page
+share/gnome/help/empathy/ca/prob-conn.page
+share/gnome/help/empathy/ca/remove-account.page
+share/gnome/help/empathy/ca/salut-protocol.page
+share/gnome/help/empathy/ca/send-file.page
+share/gnome/help/empathy/ca/send-message.page
+share/gnome/help/empathy/ca/set-custom-status.page
+share/gnome/help/empathy/ca/share-desktop.page
+share/gnome/help/empathy/ca/status-icons.page
+share/gnome/help/empathy/ca/video-call.page
+share/gnome/help/empathy/cs/account-irc.page
+share/gnome/help/empathy/cs/account-jabber.page
+share/gnome/help/empathy/cs/accounts-window.page
+share/gnome/help/empathy/cs/add-account.page
+share/gnome/help/empathy/cs/add-contact.page
+share/gnome/help/empathy/cs/audio-call.page
+share/gnome/help/empathy/cs/audio-video.page
+share/gnome/help/empathy/cs/change-status.page
+share/gnome/help/empathy/cs/create-account.page
+share/gnome/help/empathy/cs/disable-account.page
+share/gnome/help/empathy/cs/favorite-rooms.page
+share/gnome/help/empathy/cs/figures/audio-input-microphone.png
+share/gnome/help/empathy/cs/figures/available.png
+share/gnome/help/empathy/cs/figures/away.png
+share/gnome/help/empathy/cs/figures/busy.png
+share/gnome/help/empathy/cs/figures/camera-web.png
share/gnome/help/empathy/cs/figures/empathy-main-window.png
-share/gnome/help/empathy/de/empathy.xml
+share/gnome/help/empathy/cs/figures/gtk-add.png
+share/gnome/help/empathy/cs/figures/gtk-edit.png
+share/gnome/help/empathy/cs/figures/gtk-remove.png
+share/gnome/help/empathy/cs/figures/offline.png
+share/gnome/help/empathy/cs/geolocation-not-showing.page
+share/gnome/help/empathy/cs/geolocation-privacy.page
+share/gnome/help/empathy/cs/geolocation-supported.page
+share/gnome/help/empathy/cs/geolocation-turn.page
+share/gnome/help/empathy/cs/geolocation-what-is.page
+share/gnome/help/empathy/cs/geolocation.page
+share/gnome/help/empathy/cs/group-conversations.page
+share/gnome/help/empathy/cs/import-account.page
+share/gnome/help/empathy/cs/index.page
+share/gnome/help/empathy/cs/introduction.page
+share/gnome/help/empathy/cs/irc-join-pwd.page
+share/gnome/help/empathy/cs/irc-join-room.page
+share/gnome/help/empathy/cs/irc-manage.page
+share/gnome/help/empathy/cs/irc-nick-password.page
+share/gnome/help/empathy/cs/irc-send-file.page
+share/gnome/help/empathy/cs/irc-start-conversation.page
+share/gnome/help/empathy/cs/legal.xml
+share/gnome/help/empathy/cs/offline-contacts.page
+share/gnome/help/empathy/cs/prev-conv.page
+share/gnome/help/empathy/cs/prob-conn-acctdisabled.page
+share/gnome/help/empathy/cs/prob-conn-auth.page
+share/gnome/help/empathy/cs/prob-conn-name.page
+share/gnome/help/empathy/cs/prob-conn-neterror.page
+share/gnome/help/empathy/cs/prob-conn.page
+share/gnome/help/empathy/cs/remove-account.page
+share/gnome/help/empathy/cs/salut-protocol.page
+share/gnome/help/empathy/cs/send-file.page
+share/gnome/help/empathy/cs/send-message.page
+share/gnome/help/empathy/cs/set-custom-status.page
+share/gnome/help/empathy/cs/share-desktop.page
+share/gnome/help/empathy/cs/status-icons.page
+share/gnome/help/empathy/cs/video-call.page
+share/gnome/help/empathy/de/account-irc.page
+share/gnome/help/empathy/de/account-jabber.page
+share/gnome/help/empathy/de/accounts-window.page
+share/gnome/help/empathy/de/add-account.page
+share/gnome/help/empathy/de/add-contact.page
+share/gnome/help/empathy/de/audio-call.page
+share/gnome/help/empathy/de/audio-video.page
+share/gnome/help/empathy/de/change-status.page
+share/gnome/help/empathy/de/create-account.page
+share/gnome/help/empathy/de/disable-account.page
+share/gnome/help/empathy/de/favorite-rooms.page
+share/gnome/help/empathy/de/figures/audio-input-microphone.png
+share/gnome/help/empathy/de/figures/available.png
+share/gnome/help/empathy/de/figures/away.png
+share/gnome/help/empathy/de/figures/busy.png
+share/gnome/help/empathy/de/figures/camera-web.png
share/gnome/help/empathy/de/figures/empathy-main-window.png
-share/gnome/help/empathy/el/empathy.xml
+share/gnome/help/empathy/de/figures/gtk-add.png
+share/gnome/help/empathy/de/figures/gtk-edit.png
+share/gnome/help/empathy/de/figures/gtk-remove.png
+share/gnome/help/empathy/de/figures/offline.png
+share/gnome/help/empathy/de/geolocation-not-showing.page
+share/gnome/help/empathy/de/geolocation-privacy.page
+share/gnome/help/empathy/de/geolocation-supported.page
+share/gnome/help/empathy/de/geolocation-turn.page
+share/gnome/help/empathy/de/geolocation-what-is.page
+share/gnome/help/empathy/de/geolocation.page
+share/gnome/help/empathy/de/group-conversations.page
+share/gnome/help/empathy/de/import-account.page
+share/gnome/help/empathy/de/index.page
+share/gnome/help/empathy/de/introduction.page
+share/gnome/help/empathy/de/irc-join-pwd.page
+share/gnome/help/empathy/de/irc-join-room.page
+share/gnome/help/empathy/de/irc-manage.page
+share/gnome/help/empathy/de/irc-nick-password.page
+share/gnome/help/empathy/de/irc-send-file.page
+share/gnome/help/empathy/de/irc-start-conversation.page
+share/gnome/help/empathy/de/legal.xml
+share/gnome/help/empathy/de/offline-contacts.page
+share/gnome/help/empathy/de/prev-conv.page
+share/gnome/help/empathy/de/prob-conn-acctdisabled.page
+share/gnome/help/empathy/de/prob-conn-auth.page
+share/gnome/help/empathy/de/prob-conn-name.page
+share/gnome/help/empathy/de/prob-conn-neterror.page
+share/gnome/help/empathy/de/prob-conn.page
+share/gnome/help/empathy/de/remove-account.page
+share/gnome/help/empathy/de/salut-protocol.page
+share/gnome/help/empathy/de/send-file.page
+share/gnome/help/empathy/de/send-message.page
+share/gnome/help/empathy/de/set-custom-status.page
+share/gnome/help/empathy/de/share-desktop.page
+share/gnome/help/empathy/de/status-icons.page
+share/gnome/help/empathy/de/video-call.page
+share/gnome/help/empathy/el/account-irc.page
+share/gnome/help/empathy/el/account-jabber.page
+share/gnome/help/empathy/el/accounts-window.page
+share/gnome/help/empathy/el/add-account.page
+share/gnome/help/empathy/el/add-contact.page
+share/gnome/help/empathy/el/audio-call.page
+share/gnome/help/empathy/el/audio-video.page
+share/gnome/help/empathy/el/change-status.page
+share/gnome/help/empathy/el/create-account.page
+share/gnome/help/empathy/el/disable-account.page
+share/gnome/help/empathy/el/favorite-rooms.page
+share/gnome/help/empathy/el/figures/audio-input-microphone.png
+share/gnome/help/empathy/el/figures/available.png
+share/gnome/help/empathy/el/figures/away.png
+share/gnome/help/empathy/el/figures/busy.png
+share/gnome/help/empathy/el/figures/camera-web.png
share/gnome/help/empathy/el/figures/empathy-main-window.png
-share/gnome/help/empathy/en_GB/empathy.xml
+share/gnome/help/empathy/el/figures/gtk-add.png
+share/gnome/help/empathy/el/figures/gtk-edit.png
+share/gnome/help/empathy/el/figures/gtk-remove.png
+share/gnome/help/empathy/el/figures/offline.png
+share/gnome/help/empathy/el/geolocation-not-showing.page
+share/gnome/help/empathy/el/geolocation-privacy.page
+share/gnome/help/empathy/el/geolocation-supported.page
+share/gnome/help/empathy/el/geolocation-turn.page
+share/gnome/help/empathy/el/geolocation-what-is.page
+share/gnome/help/empathy/el/geolocation.page
+share/gnome/help/empathy/el/group-conversations.page
+share/gnome/help/empathy/el/import-account.page
+share/gnome/help/empathy/el/index.page
+share/gnome/help/empathy/el/introduction.page
+share/gnome/help/empathy/el/irc-join-pwd.page
+share/gnome/help/empathy/el/irc-join-room.page
+share/gnome/help/empathy/el/irc-manage.page
+share/gnome/help/empathy/el/irc-nick-password.page
+share/gnome/help/empathy/el/irc-send-file.page
+share/gnome/help/empathy/el/irc-start-conversation.page
+share/gnome/help/empathy/el/legal.xml
+share/gnome/help/empathy/el/offline-contacts.page
+share/gnome/help/empathy/el/prev-conv.page
+share/gnome/help/empathy/el/prob-conn-acctdisabled.page
+share/gnome/help/empathy/el/prob-conn-auth.page
+share/gnome/help/empathy/el/prob-conn-name.page
+share/gnome/help/empathy/el/prob-conn-neterror.page
+share/gnome/help/empathy/el/prob-conn.page
+share/gnome/help/empathy/el/remove-account.page
+share/gnome/help/empathy/el/salut-protocol.page
+share/gnome/help/empathy/el/send-file.page
+share/gnome/help/empathy/el/send-message.page
+share/gnome/help/empathy/el/set-custom-status.page
+share/gnome/help/empathy/el/share-desktop.page
+share/gnome/help/empathy/el/status-icons.page
+share/gnome/help/empathy/el/video-call.page
+share/gnome/help/empathy/en_GB/account-irc.page
+share/gnome/help/empathy/en_GB/account-jabber.page
+share/gnome/help/empathy/en_GB/accounts-window.page
+share/gnome/help/empathy/en_GB/add-account.page
+share/gnome/help/empathy/en_GB/add-contact.page
+share/gnome/help/empathy/en_GB/audio-call.page
+share/gnome/help/empathy/en_GB/audio-video.page
+share/gnome/help/empathy/en_GB/change-status.page
+share/gnome/help/empathy/en_GB/create-account.page
+share/gnome/help/empathy/en_GB/disable-account.page
+share/gnome/help/empathy/en_GB/favorite-rooms.page
+share/gnome/help/empathy/en_GB/figures/audio-input-microphone.png
+share/gnome/help/empathy/en_GB/figures/available.png
+share/gnome/help/empathy/en_GB/figures/away.png
+share/gnome/help/empathy/en_GB/figures/busy.png
+share/gnome/help/empathy/en_GB/figures/camera-web.png
share/gnome/help/empathy/en_GB/figures/empathy-main-window.png
-share/gnome/help/empathy/es/empathy.xml
+share/gnome/help/empathy/en_GB/figures/gtk-add.png
+share/gnome/help/empathy/en_GB/figures/gtk-edit.png
+share/gnome/help/empathy/en_GB/figures/gtk-remove.png
+share/gnome/help/empathy/en_GB/figures/offline.png
+share/gnome/help/empathy/en_GB/geolocation-not-showing.page
+share/gnome/help/empathy/en_GB/geolocation-privacy.page
+share/gnome/help/empathy/en_GB/geolocation-supported.page
+share/gnome/help/empathy/en_GB/geolocation-turn.page
+share/gnome/help/empathy/en_GB/geolocation-what-is.page
+share/gnome/help/empathy/en_GB/geolocation.page
+share/gnome/help/empathy/en_GB/group-conversations.page
+share/gnome/help/empathy/en_GB/import-account.page
+share/gnome/help/empathy/en_GB/index.page
+share/gnome/help/empathy/en_GB/introduction.page
+share/gnome/help/empathy/en_GB/irc-join-pwd.page
+share/gnome/help/empathy/en_GB/irc-join-room.page
+share/gnome/help/empathy/en_GB/irc-manage.page
+share/gnome/help/empathy/en_GB/irc-nick-password.page
+share/gnome/help/empathy/en_GB/irc-send-file.page
+share/gnome/help/empathy/en_GB/irc-start-conversation.page
+share/gnome/help/empathy/en_GB/legal.xml
+share/gnome/help/empathy/en_GB/offline-contacts.page
+share/gnome/help/empathy/en_GB/prev-conv.page
+share/gnome/help/empathy/en_GB/prob-conn-acctdisabled.page
+share/gnome/help/empathy/en_GB/prob-conn-auth.page
+share/gnome/help/empathy/en_GB/prob-conn-name.page
+share/gnome/help/empathy/en_GB/prob-conn-neterror.page
+share/gnome/help/empathy/en_GB/prob-conn.page
+share/gnome/help/empathy/en_GB/remove-account.page
+share/gnome/help/empathy/en_GB/salut-protocol.page
+share/gnome/help/empathy/en_GB/send-file.page
+share/gnome/help/empathy/en_GB/send-message.page
+share/gnome/help/empathy/en_GB/set-custom-status.page
+share/gnome/help/empathy/en_GB/share-desktop.page
+share/gnome/help/empathy/en_GB/status-icons.page
+share/gnome/help/empathy/en_GB/video-call.page
+share/gnome/help/empathy/es/account-irc.page
+share/gnome/help/empathy/es/account-jabber.page
+share/gnome/help/empathy/es/accounts-window.page
+share/gnome/help/empathy/es/add-account.page
+share/gnome/help/empathy/es/add-contact.page
+share/gnome/help/empathy/es/audio-call.page
+share/gnome/help/empathy/es/audio-video.page
+share/gnome/help/empathy/es/change-status.page
+share/gnome/help/empathy/es/create-account.page
+share/gnome/help/empathy/es/disable-account.page
+share/gnome/help/empathy/es/favorite-rooms.page
+share/gnome/help/empathy/es/figures/audio-input-microphone.png
+share/gnome/help/empathy/es/figures/available.png
+share/gnome/help/empathy/es/figures/away.png
+share/gnome/help/empathy/es/figures/busy.png
+share/gnome/help/empathy/es/figures/camera-web.png
share/gnome/help/empathy/es/figures/empathy-main-window.png
-share/gnome/help/empathy/fi/empathy.xml
+share/gnome/help/empathy/es/figures/gtk-add.png
+share/gnome/help/empathy/es/figures/gtk-edit.png
+share/gnome/help/empathy/es/figures/gtk-remove.png
+share/gnome/help/empathy/es/figures/offline.png
+share/gnome/help/empathy/es/geolocation-not-showing.page
+share/gnome/help/empathy/es/geolocation-privacy.page
+share/gnome/help/empathy/es/geolocation-supported.page
+share/gnome/help/empathy/es/geolocation-turn.page
+share/gnome/help/empathy/es/geolocation-what-is.page
+share/gnome/help/empathy/es/geolocation.page
+share/gnome/help/empathy/es/group-conversations.page
+share/gnome/help/empathy/es/import-account.page
+share/gnome/help/empathy/es/index.page
+share/gnome/help/empathy/es/introduction.page
+share/gnome/help/empathy/es/irc-join-pwd.page
+share/gnome/help/empathy/es/irc-join-room.page
+share/gnome/help/empathy/es/irc-manage.page
+share/gnome/help/empathy/es/irc-nick-password.page
+share/gnome/help/empathy/es/irc-send-file.page
+share/gnome/help/empathy/es/irc-start-conversation.page
+share/gnome/help/empathy/es/legal.xml
+share/gnome/help/empathy/es/offline-contacts.page
+share/gnome/help/empathy/es/prev-conv.page
+share/gnome/help/empathy/es/prob-conn-acctdisabled.page
+share/gnome/help/empathy/es/prob-conn-auth.page
+share/gnome/help/empathy/es/prob-conn-name.page
+share/gnome/help/empathy/es/prob-conn-neterror.page
+share/gnome/help/empathy/es/prob-conn.page
+share/gnome/help/empathy/es/remove-account.page
+share/gnome/help/empathy/es/salut-protocol.page
+share/gnome/help/empathy/es/send-file.page
+share/gnome/help/empathy/es/send-message.page
+share/gnome/help/empathy/es/set-custom-status.page
+share/gnome/help/empathy/es/share-desktop.page
+share/gnome/help/empathy/es/status-icons.page
+share/gnome/help/empathy/es/video-call.page
+share/gnome/help/empathy/fi/account-irc.page
+share/gnome/help/empathy/fi/account-jabber.page
+share/gnome/help/empathy/fi/accounts-window.page
+share/gnome/help/empathy/fi/add-account.page
+share/gnome/help/empathy/fi/add-contact.page
+share/gnome/help/empathy/fi/audio-call.page
+share/gnome/help/empathy/fi/audio-video.page
+share/gnome/help/empathy/fi/change-status.page
+share/gnome/help/empathy/fi/create-account.page
+share/gnome/help/empathy/fi/disable-account.page
+share/gnome/help/empathy/fi/favorite-rooms.page
+share/gnome/help/empathy/fi/figures/audio-input-microphone.png
+share/gnome/help/empathy/fi/figures/available.png
+share/gnome/help/empathy/fi/figures/away.png
+share/gnome/help/empathy/fi/figures/busy.png
+share/gnome/help/empathy/fi/figures/camera-web.png
share/gnome/help/empathy/fi/figures/empathy-main-window.png
-share/gnome/help/empathy/fr/empathy.xml
+share/gnome/help/empathy/fi/figures/gtk-add.png
+share/gnome/help/empathy/fi/figures/gtk-edit.png
+share/gnome/help/empathy/fi/figures/gtk-remove.png
+share/gnome/help/empathy/fi/figures/offline.png
+share/gnome/help/empathy/fi/geolocation-not-showing.page
+share/gnome/help/empathy/fi/geolocation-privacy.page
+share/gnome/help/empathy/fi/geolocation-supported.page
+share/gnome/help/empathy/fi/geolocation-turn.page
+share/gnome/help/empathy/fi/geolocation-what-is.page
+share/gnome/help/empathy/fi/geolocation.page
+share/gnome/help/empathy/fi/group-conversations.page
+share/gnome/help/empathy/fi/import-account.page
+share/gnome/help/empathy/fi/index.page
+share/gnome/help/empathy/fi/introduction.page
+share/gnome/help/empathy/fi/irc-join-pwd.page
+share/gnome/help/empathy/fi/irc-join-room.page
+share/gnome/help/empathy/fi/irc-manage.page
+share/gnome/help/empathy/fi/irc-nick-password.page
+share/gnome/help/empathy/fi/irc-send-file.page
+share/gnome/help/empathy/fi/irc-start-conversation.page
+share/gnome/help/empathy/fi/legal.xml
+share/gnome/help/empathy/fi/offline-contacts.page
+share/gnome/help/empathy/fi/prev-conv.page
+share/gnome/help/empathy/fi/prob-conn-acctdisabled.page
+share/gnome/help/empathy/fi/prob-conn-auth.page
+share/gnome/help/empathy/fi/prob-conn-name.page
+share/gnome/help/empathy/fi/prob-conn-neterror.page
+share/gnome/help/empathy/fi/prob-conn.page
+share/gnome/help/empathy/fi/remove-account.page
+share/gnome/help/empathy/fi/salut-protocol.page
+share/gnome/help/empathy/fi/send-file.page
+share/gnome/help/empathy/fi/send-message.page
+share/gnome/help/empathy/fi/set-custom-status.page
+share/gnome/help/empathy/fi/share-desktop.page
+share/gnome/help/empathy/fi/status-icons.page
+share/gnome/help/empathy/fi/video-call.page
+share/gnome/help/empathy/fr/account-irc.page
+share/gnome/help/empathy/fr/account-jabber.page
+share/gnome/help/empathy/fr/accounts-window.page
+share/gnome/help/empathy/fr/add-account.page
+share/gnome/help/empathy/fr/add-contact.page
+share/gnome/help/empathy/fr/audio-call.page
+share/gnome/help/empathy/fr/audio-video.page
+share/gnome/help/empathy/fr/change-status.page
+share/gnome/help/empathy/fr/create-account.page
+share/gnome/help/empathy/fr/disable-account.page
+share/gnome/help/empathy/fr/favorite-rooms.page
+share/gnome/help/empathy/fr/figures/audio-input-microphone.png
+share/gnome/help/empathy/fr/figures/available.png
+share/gnome/help/empathy/fr/figures/away.png
+share/gnome/help/empathy/fr/figures/busy.png
+share/gnome/help/empathy/fr/figures/camera-web.png
share/gnome/help/empathy/fr/figures/empathy-main-window.png
-share/gnome/help/empathy/it/empathy.xml
+share/gnome/help/empathy/fr/figures/gtk-add.png
+share/gnome/help/empathy/fr/figures/gtk-edit.png
+share/gnome/help/empathy/fr/figures/gtk-remove.png
+share/gnome/help/empathy/fr/figures/offline.png
+share/gnome/help/empathy/fr/geolocation-not-showing.page
+share/gnome/help/empathy/fr/geolocation-privacy.page
+share/gnome/help/empathy/fr/geolocation-supported.page
+share/gnome/help/empathy/fr/geolocation-turn.page
+share/gnome/help/empathy/fr/geolocation-what-is.page
+share/gnome/help/empathy/fr/geolocation.page
+share/gnome/help/empathy/fr/group-conversations.page
+share/gnome/help/empathy/fr/import-account.page
+share/gnome/help/empathy/fr/index.page
+share/gnome/help/empathy/fr/introduction.page
+share/gnome/help/empathy/fr/irc-join-pwd.page
+share/gnome/help/empathy/fr/irc-join-room.page
+share/gnome/help/empathy/fr/irc-manage.page
+share/gnome/help/empathy/fr/irc-nick-password.page
+share/gnome/help/empathy/fr/irc-send-file.page
+share/gnome/help/empathy/fr/irc-start-conversation.page
+share/gnome/help/empathy/fr/legal.xml
+share/gnome/help/empathy/fr/offline-contacts.page
+share/gnome/help/empathy/fr/prev-conv.page
+share/gnome/help/empathy/fr/prob-conn-acctdisabled.page
+share/gnome/help/empathy/fr/prob-conn-auth.page
+share/gnome/help/empathy/fr/prob-conn-name.page
+share/gnome/help/empathy/fr/prob-conn-neterror.page
+share/gnome/help/empathy/fr/prob-conn.page
+share/gnome/help/empathy/fr/remove-account.page
+share/gnome/help/empathy/fr/salut-protocol.page
+share/gnome/help/empathy/fr/send-file.page
+share/gnome/help/empathy/fr/send-message.page
+share/gnome/help/empathy/fr/set-custom-status.page
+share/gnome/help/empathy/fr/share-desktop.page
+share/gnome/help/empathy/fr/status-icons.page
+share/gnome/help/empathy/fr/video-call.page
+share/gnome/help/empathy/it/account-irc.page
+share/gnome/help/empathy/it/account-jabber.page
+share/gnome/help/empathy/it/accounts-window.page
+share/gnome/help/empathy/it/add-account.page
+share/gnome/help/empathy/it/add-contact.page
+share/gnome/help/empathy/it/audio-call.page
+share/gnome/help/empathy/it/audio-video.page
+share/gnome/help/empathy/it/change-status.page
+share/gnome/help/empathy/it/create-account.page
+share/gnome/help/empathy/it/disable-account.page
+share/gnome/help/empathy/it/favorite-rooms.page
+share/gnome/help/empathy/it/figures/audio-input-microphone.png
+share/gnome/help/empathy/it/figures/available.png
+share/gnome/help/empathy/it/figures/away.png
+share/gnome/help/empathy/it/figures/busy.png
+share/gnome/help/empathy/it/figures/camera-web.png
share/gnome/help/empathy/it/figures/empathy-main-window.png
-share/gnome/help/empathy/ru/empathy.xml
+share/gnome/help/empathy/it/figures/gtk-add.png
+share/gnome/help/empathy/it/figures/gtk-edit.png
+share/gnome/help/empathy/it/figures/gtk-remove.png
+share/gnome/help/empathy/it/figures/offline.png
+share/gnome/help/empathy/it/geolocation-not-showing.page
+share/gnome/help/empathy/it/geolocation-privacy.page
+share/gnome/help/empathy/it/geolocation-supported.page
+share/gnome/help/empathy/it/geolocation-turn.page
+share/gnome/help/empathy/it/geolocation-what-is.page
+share/gnome/help/empathy/it/geolocation.page
+share/gnome/help/empathy/it/group-conversations.page
+share/gnome/help/empathy/it/import-account.page
+share/gnome/help/empathy/it/index.page
+share/gnome/help/empathy/it/introduction.page
+share/gnome/help/empathy/it/irc-join-pwd.page
+share/gnome/help/empathy/it/irc-join-room.page
+share/gnome/help/empathy/it/irc-manage.page
+share/gnome/help/empathy/it/irc-nick-password.page
+share/gnome/help/empathy/it/irc-send-file.page
+share/gnome/help/empathy/it/irc-start-conversation.page
+share/gnome/help/empathy/it/legal.xml
+share/gnome/help/empathy/it/offline-contacts.page
+share/gnome/help/empathy/it/prev-conv.page
+share/gnome/help/empathy/it/prob-conn-acctdisabled.page
+share/gnome/help/empathy/it/prob-conn-auth.page
+share/gnome/help/empathy/it/prob-conn-name.page
+share/gnome/help/empathy/it/prob-conn-neterror.page
+share/gnome/help/empathy/it/prob-conn.page
+share/gnome/help/empathy/it/remove-account.page
+share/gnome/help/empathy/it/salut-protocol.page
+share/gnome/help/empathy/it/send-file.page
+share/gnome/help/empathy/it/send-message.page
+share/gnome/help/empathy/it/set-custom-status.page
+share/gnome/help/empathy/it/share-desktop.page
+share/gnome/help/empathy/it/status-icons.page
+share/gnome/help/empathy/it/video-call.page
+share/gnome/help/empathy/ru/account-irc.page
+share/gnome/help/empathy/ru/account-jabber.page
+share/gnome/help/empathy/ru/accounts-window.page
+share/gnome/help/empathy/ru/add-account.page
+share/gnome/help/empathy/ru/add-contact.page
+share/gnome/help/empathy/ru/audio-call.page
+share/gnome/help/empathy/ru/audio-video.page
+share/gnome/help/empathy/ru/change-status.page
+share/gnome/help/empathy/ru/create-account.page
+share/gnome/help/empathy/ru/disable-account.page
+share/gnome/help/empathy/ru/favorite-rooms.page
+share/gnome/help/empathy/ru/figures/audio-input-microphone.png
+share/gnome/help/empathy/ru/figures/available.png
+share/gnome/help/empathy/ru/figures/away.png
+share/gnome/help/empathy/ru/figures/busy.png
+share/gnome/help/empathy/ru/figures/camera-web.png
share/gnome/help/empathy/ru/figures/empathy-main-window.png
-share/gnome/help/empathy/sv/empathy.xml
+share/gnome/help/empathy/ru/figures/gtk-add.png
+share/gnome/help/empathy/ru/figures/gtk-edit.png
+share/gnome/help/empathy/ru/figures/gtk-remove.png
+share/gnome/help/empathy/ru/figures/offline.png
+share/gnome/help/empathy/ru/geolocation-not-showing.page
+share/gnome/help/empathy/ru/geolocation-privacy.page
+share/gnome/help/empathy/ru/geolocation-supported.page
+share/gnome/help/empathy/ru/geolocation-turn.page
+share/gnome/help/empathy/ru/geolocation-what-is.page
+share/gnome/help/empathy/ru/geolocation.page
+share/gnome/help/empathy/ru/group-conversations.page
+share/gnome/help/empathy/ru/import-account.page
+share/gnome/help/empathy/ru/index.page
+share/gnome/help/empathy/ru/introduction.page
+share/gnome/help/empathy/ru/irc-join-pwd.page
+share/gnome/help/empathy/ru/irc-join-room.page
+share/gnome/help/empathy/ru/irc-manage.page
+share/gnome/help/empathy/ru/irc-nick-password.page
+share/gnome/help/empathy/ru/irc-send-file.page
+share/gnome/help/empathy/ru/irc-start-conversation.page
+share/gnome/help/empathy/ru/legal.xml
+share/gnome/help/empathy/ru/offline-contacts.page
+share/gnome/help/empathy/ru/prev-conv.page
+share/gnome/help/empathy/ru/prob-conn-acctdisabled.page
+share/gnome/help/empathy/ru/prob-conn-auth.page
+share/gnome/help/empathy/ru/prob-conn-name.page
+share/gnome/help/empathy/ru/prob-conn-neterror.page
+share/gnome/help/empathy/ru/prob-conn.page
+share/gnome/help/empathy/ru/remove-account.page
+share/gnome/help/empathy/ru/salut-protocol.page
+share/gnome/help/empathy/ru/send-file.page
+share/gnome/help/empathy/ru/send-message.page
+share/gnome/help/empathy/ru/set-custom-status.page
+share/gnome/help/empathy/ru/share-desktop.page
+share/gnome/help/empathy/ru/status-icons.page
+share/gnome/help/empathy/ru/video-call.page
+share/gnome/help/empathy/sv/account-irc.page
+share/gnome/help/empathy/sv/account-jabber.page
+share/gnome/help/empathy/sv/accounts-window.page
+share/gnome/help/empathy/sv/add-account.page
+share/gnome/help/empathy/sv/add-contact.page
+share/gnome/help/empathy/sv/audio-call.page
+share/gnome/help/empathy/sv/audio-video.page
+share/gnome/help/empathy/sv/change-status.page
+share/gnome/help/empathy/sv/create-account.page
+share/gnome/help/empathy/sv/disable-account.page
+share/gnome/help/empathy/sv/favorite-rooms.page
+share/gnome/help/empathy/sv/figures/audio-input-microphone.png
+share/gnome/help/empathy/sv/figures/available.png
+share/gnome/help/empathy/sv/figures/away.png
+share/gnome/help/empathy/sv/figures/busy.png
+share/gnome/help/empathy/sv/figures/camera-web.png
share/gnome/help/empathy/sv/figures/empathy-main-window.png
+share/gnome/help/empathy/sv/figures/gtk-add.png
+share/gnome/help/empathy/sv/figures/gtk-edit.png
+share/gnome/help/empathy/sv/figures/gtk-remove.png
+share/gnome/help/empathy/sv/figures/offline.png
+share/gnome/help/empathy/sv/geolocation-not-showing.page
+share/gnome/help/empathy/sv/geolocation-privacy.page
+share/gnome/help/empathy/sv/geolocation-supported.page
+share/gnome/help/empathy/sv/geolocation-turn.page
+share/gnome/help/empathy/sv/geolocation-what-is.page
+share/gnome/help/empathy/sv/geolocation.page
+share/gnome/help/empathy/sv/group-conversations.page
+share/gnome/help/empathy/sv/import-account.page
+share/gnome/help/empathy/sv/index.page
+share/gnome/help/empathy/sv/introduction.page
+share/gnome/help/empathy/sv/irc-join-pwd.page
+share/gnome/help/empathy/sv/irc-join-room.page
+share/gnome/help/empathy/sv/irc-manage.page
+share/gnome/help/empathy/sv/irc-nick-password.page
+share/gnome/help/empathy/sv/irc-send-file.page
+share/gnome/help/empathy/sv/irc-start-conversation.page
+share/gnome/help/empathy/sv/legal.xml
+share/gnome/help/empathy/sv/offline-contacts.page
+share/gnome/help/empathy/sv/prev-conv.page
+share/gnome/help/empathy/sv/prob-conn-acctdisabled.page
+share/gnome/help/empathy/sv/prob-conn-auth.page
+share/gnome/help/empathy/sv/prob-conn-name.page
+share/gnome/help/empathy/sv/prob-conn-neterror.page
+share/gnome/help/empathy/sv/prob-conn.page
+share/gnome/help/empathy/sv/remove-account.page
+share/gnome/help/empathy/sv/salut-protocol.page
+share/gnome/help/empathy/sv/send-file.page
+share/gnome/help/empathy/sv/send-message.page
+share/gnome/help/empathy/sv/set-custom-status.page
+share/gnome/help/empathy/sv/share-desktop.page
+share/gnome/help/empathy/sv/status-icons.page
+share/gnome/help/empathy/sv/video-call.page
share/icons/hicolor/16x16/apps/empathy.png
share/icons/hicolor/22x22/apps/empathy.png
share/icons/hicolor/24x24/apps/empathy.png
@@ -365,11 +1022,17 @@ 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/ast/LC_MESSAGES/empathy.mo
share/locale/az/LC_MESSAGES/empathy.mo
+share/locale/be/LC_MESSAGES/empathy.mo
share/locale/be@latin/LC_MESSAGES/empathy.mo
share/locale/bg/LC_MESSAGES/empathy.mo
+share/locale/bn/LC_MESSAGES/empathy.mo
share/locale/bn_IN/LC_MESSAGES/empathy.mo
+share/locale/br/LC_MESSAGES/empathy.mo
share/locale/ca/LC_MESSAGES/empathy.mo
+share/locale/ca@valencia/LC_MESSAGES/empathy.mo
+share/locale/crh/LC_MESSAGES/empathy.mo
share/locale/cs/LC_MESSAGES/empathy.mo
share/locale/cy/LC_MESSAGES/empathy.mo
share/locale/da/LC_MESSAGES/empathy.mo
@@ -380,6 +1043,7 @@ share/locale/en_CA/LC_MESSAGES/empathy.mo
share/locale/en_GB/LC_MESSAGES/empathy.mo
share/locale/eo/LC_MESSAGES/empathy.mo
share/locale/es/LC_MESSAGES/empathy.mo
+share/locale/et/LC_MESSAGES/empathy.mo
share/locale/eu/LC_MESSAGES/empathy.mo
share/locale/fi/LC_MESSAGES/empathy.mo
share/locale/fr/LC_MESSAGES/empathy.mo
@@ -428,37 +1092,9 @@ share/locale/vi/LC_MESSAGES/empathy.mo
share/locale/zh_CN/LC_MESSAGES/empathy.mo
share/locale/zh_HK/LC_MESSAGES/empathy.mo
share/locale/zh_TW/LC_MESSAGES/empathy.mo
-share/mission-control/profiles/aim.profile
-share/mission-control/profiles/ekiga.profile
-share/mission-control/profiles/fwd.profile
-share/mission-control/profiles/gadugadu.profile
-share/mission-control/profiles/groupwise.profile
-share/mission-control/profiles/gtalk.profile
-share/mission-control/profiles/icq.profile
-share/mission-control/profiles/irc.profile
-share/mission-control/profiles/jabber.profile
-share/mission-control/profiles/msn-haze.profile
-share/mission-control/profiles/msn.profile
-share/mission-control/profiles/qq.profile
-share/mission-control/profiles/salut.profile
-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
+share/telepathy/clients/Empathy.client
+@dirrmtry share/telepathy/clients
+@dirrmtry share/telepathy
@dirrm share/gnome/help/empathy/sv/figures
@dirrm share/gnome/help/empathy/sv
@dirrm share/gnome/help/empathy/ru/figures
@@ -515,10 +1151,10 @@ 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/te/LC_MESSAGES
+@dirrmtry share/locale/te
@dirrmtry share/locale/ps/LC_MESSAGES
@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@@ -531,9 +1167,13 @@ share/omf/empathy/empathy-sv.omf
@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/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/as/LC_MESSAGES
-@dirrmtry share/locale/as
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index 9ca1076b4f3c..13a1cd8b548f 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -3,13 +3,12 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.4 2008/03/20 03:20:54 marcus Exp $
+# $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.8 2009/10/24 15:26:03 marcus Exp $
PORTNAME= telepathy-mission-control
-PORTVERSION= 4.67
-PORTREVISION= 1
+PORTVERSION= 5.2.6
CATEGORIES= net-im devel
-MASTER_SITES= SF/mission-control/mission-control/${PORTVERSION}
+MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-mission-control/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Telepathy component to apps to abstract details of connection managers
@@ -23,6 +22,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
USE_GMAKE= yes
USE_LDCONFIG= yes
+MAN1= mc-account-convert.1 mc-tool.1 mc-wait-for-name.1
+MAN8= mission-control-5.8
+
+PLIST_SUB= VERSION=${PORTVERSION}
+
post-patch:
@${REINPLACE_CMD} -e 's|/gtk-doc/html|/${DOCSDIR}|' \
${WRKSRC}/configure
diff --git a/net-im/telepathy-mission-control/distinfo b/net-im/telepathy-mission-control/distinfo
index 5897861fc072..42da40bbef76 100644
--- a/net-im/telepathy-mission-control/distinfo
+++ b/net-im/telepathy-mission-control/distinfo
@@ -1,3 +1,3 @@
-MD5 (telepathy-mission-control-4.67.tar.gz) = 0a547e7af4a33355bac3638dd2e40859
-SHA256 (telepathy-mission-control-4.67.tar.gz) = 326b82519a49a238a476c028097bde5820c4b58af500dbb5b715cdfd6fe0bfcd
-SIZE (telepathy-mission-control-4.67.tar.gz) = 659444
+MD5 (telepathy-mission-control-5.2.6.tar.gz) = 21763710a1db21d71905a4e7c64a1742
+SHA256 (telepathy-mission-control-5.2.6.tar.gz) = 801be8354cda8d2cc1f79ea8ee4ad89795cae954cd719358121474271be6f08d
+SIZE (telepathy-mission-control-5.2.6.tar.gz) = 1049164
diff --git a/net-im/telepathy-mission-control/files/patch-src_Makefile.in b/net-im/telepathy-mission-control/files/patch-src_Makefile.in
deleted file mode 100644
index c81711665058..000000000000
--- a/net-im/telepathy-mission-control/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig 2008-07-20 01:57:35.000000000 -0400
-+++ src/Makefile.in 2008-07-20 01:57:38.000000000 -0400
-@@ -291,7 +291,6 @@ BUILT_SOURCES = \
- CLEANFILES = $(BUILT_SOURCES)
- lib_LTLIBRARIES = libmissioncontrol-server.la
- libmissioncontrol_server_la_LIBADD = $(GCONF_LIBS) $(TELEPATHY_LIBS) \
-- -ldl \
- $(top_builddir)/libmissioncontrol/libmissioncontrol-client.la
-
-
diff --git a/net-im/telepathy-mission-control/files/patch-src_mcd-debug.c b/net-im/telepathy-mission-control/files/patch-src_mcd-debug.c
deleted file mode 100644
index bcd2581e3ef9..000000000000
--- a/net-im/telepathy-mission-control/files/patch-src_mcd-debug.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mcd-debug.c.orig 2009-03-24 23:45:42.000000000 -0400
-+++ src/mcd-debug.c 2009-03-24 23:46:43.000000000 -0400
-@@ -119,7 +119,7 @@ void mcd_debug_init ()
- mc_debug = atoi (mc_debug_str);
- }
-
--inline gint mcd_debug_get_level ()
-+gint mcd_debug_get_level ()
- {
- return mc_debug;
- }
diff --git a/net-im/telepathy-mission-control/files/patch-src_mcd-debug.h b/net-im/telepathy-mission-control/files/patch-src_mcd-debug.h
deleted file mode 100644
index 249ad641dc88..000000000000
--- a/net-im/telepathy-mission-control/files/patch-src_mcd-debug.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mcd-debug.h.orig 2009-03-24 23:45:58.000000000 -0400
-+++ src/mcd-debug.h 2009-03-24 23:46:32.000000000 -0400
-@@ -35,7 +35,7 @@ G_BEGIN_DECLS
-
- void mcd_debug_init ();
-
--inline gint mcd_debug_get_level ();
-+gint mcd_debug_get_level ();
-
- void mcd_debug_ref (gpointer obj, const gchar *filename, gint linenum);
- void mcd_debug_unref (gpointer obj, const gchar *filename, gint linenum);
diff --git a/net-im/telepathy-mission-control/files/patch-util_mc-tool.c b/net-im/telepathy-mission-control/files/patch-util_mc-tool.c
new file mode 100644
index 000000000000..c599bea27191
--- /dev/null
+++ b/net-im/telepathy-mission-control/files/patch-util_mc-tool.c
@@ -0,0 +1,35 @@
+--- util/mc-tool.c.orig 2009-09-22 22:49:32.000000000 -0400
++++ util/mc-tool.c 2009-09-22 22:50:39.000000000 -0400
+@@ -1103,7 +1103,7 @@ main (int argc, char **argv)
+ McAccountManager *am = NULL;
+ McAccount *a = NULL;
+ DBusGConnection *dbus_conn;
+- TpDBusDaemon *daemon;
++ TpDBusDaemon *td_daemon;
+
+ g_type_init ();
+
+@@ -1114,19 +1114,19 @@ main (int argc, char **argv)
+ command.common.ret = 1;
+
+ dbus_conn = tp_get_bus ();
+- daemon = tp_dbus_daemon_new (dbus_conn);
++ td_daemon = tp_dbus_daemon_new (dbus_conn);
+ dbus_g_connection_unref (dbus_conn);
+
+ if (command.common.account == NULL) {
+- am = mc_account_manager_new (daemon);
++ am = mc_account_manager_new (td_daemon);
+ mc_account_manager_call_when_ready (am, manager_ready, NULL);
+ }
+ else {
+ command.common.account = prefix (command.common.account);
+- a = mc_account_new (daemon, command.common.account);
++ a = mc_account_new (td_daemon, command.common.account);
+ mc_account_call_when_ready (a, account_ready, NULL);
+ }
+- g_object_unref (daemon);
++ g_object_unref (td_daemon);
+
+ main_loop = g_main_loop_new (NULL, FALSE);
+ g_main_loop_run (main_loop);
diff --git a/net-im/telepathy-mission-control/pkg-plist b/net-im/telepathy-mission-control/pkg-plist
index 49af223c2ca0..00187ce891ec 100644
--- a/net-im/telepathy-mission-control/pkg-plist
+++ b/net-im/telepathy-mission-control/pkg-plist
@@ -1,73 +1,48 @@
-bin/mc-account
-include/libmcclient/_gen/cli-Account.h
-include/libmcclient/_gen/cli-Account_Manager.h
+bin/mc-account-convert
+bin/mc-tool
+bin/mc-wait-for-name
+include/libmcclient/_gen/cli-account-manager.h
+include/libmcclient/_gen/cli-account.h
+include/libmcclient/_gen/cli-dispatch-operation.h
include/libmcclient/_gen/enums.h
include/libmcclient/_gen/gtypes.h
include/libmcclient/_gen/interfaces.h
+include/libmcclient/_gen/mc-quark.h
+include/libmcclient/_gen/svc-client.h
include/libmcclient/dbus-api.h
include/libmcclient/mc-account-manager.h
include/libmcclient/mc-account.h
+include/libmcclient/mc-dispatch-operation.h
+include/libmcclient/mc-enums.h
+include/libmcclient/mc-errors.h
+include/libmcclient/mc-gtypes.h
+include/libmcclient/mc-interfaces.h
+include/libmcclient/mc-profile.h
include/libmcclient/mc-signals-marshal.h
-include/libmissioncontrol/_gen/cli-nmc4.h
-include/libmissioncontrol/_gen/enums.h
-include/libmissioncontrol/_gen/gtypes.h
-include/libmissioncontrol/_gen/interfaces.h
-include/libmissioncontrol/_gen/svc-nmc4.h
-include/libmissioncontrol/cli-nmc4.h
-include/libmissioncontrol/dbus-api.h
-include/libmissioncontrol/mc-account-monitor.h
-include/libmissioncontrol/mc-account.h
-include/libmissioncontrol/mc-enum-types.h
-include/libmissioncontrol/mc-manager.h
-include/libmissioncontrol/mc-profile.h
-include/libmissioncontrol/mc-protocol.h
-include/libmissioncontrol/mc-signals-marshal.h
-include/libmissioncontrol/mc.h
-include/libmissioncontrol/mission-control-signals-marshal.h
-include/libmissioncontrol/mission-control.h
-include/libmissioncontrol/svc-nmc4.h
-include/mission-control/_gen/enums.h
-include/mission-control/_gen/gtypes.h
-include/mission-control/_gen/interfaces.h
-include/mission-control/_gen/svc-Account.h
-include/mission-control/_gen/svc-Account_Manager.h
-include/mission-control/mcd-account-manager.h
-include/mission-control/mcd-account-priv.h
-include/mission-control/mcd-account.h
-include/mission-control/mcd-chan-handler.h
-include/mission-control/mcd-channel.h
-include/mission-control/mcd-connection.h
-include/mission-control/mcd-controller.h
-include/mission-control/mcd-debug.h
-include/mission-control/mcd-dispatcher-context.h
-include/mission-control/mcd-dispatcher.h
-include/mission-control/mcd-enum-types.h
-include/mission-control/mcd-manager.h
-include/mission-control/mcd-master.h
-include/mission-control/mcd-mission.h
-include/mission-control/mcd-operation.h
-include/mission-control/mcd-presence-frame.h
-include/mission-control/mcd-provisioning-factory.h
-include/mission-control/mcd-provisioning.h
-include/mission-control/mcd-proxy.h
-include/mission-control/mcd-service.h
+include/libmcclient/mc-svc-client.h
lib/libmcclient.a
lib/libmcclient.la
lib/libmcclient.so
-lib/libmcclient.so.5
-lib/libmissioncontrol-client.a
-lib/libmissioncontrol-client.la
-lib/libmissioncontrol-client.so
-lib/libmissioncontrol-client.so.0
-lib/libmissioncontrol-server.a
-lib/libmissioncontrol-server.la
-lib/libmissioncontrol-server.so
-lib/libmissioncontrol-server.so.1
+lib/libmcclient-%%VERSION%%.so
libdata/pkgconfig/libmcclient.pc
-libdata/pkgconfig/libmissioncontrol.pc
-libdata/pkgconfig/mission-control.pc
-libexec/mission-control
-share/dbus-1/services/org.freedesktop.Telepathy.MissionControl.service
+libexec/mission-control-5
+share/dbus-1/services/org.freedesktop.Telepathy.AccountManager.service
+share/dbus-1/services/org.freedesktop.Telepathy.MissionControl5.service
+share/doc/libmcclient/McProfile.html
+share/doc/libmcclient/ch-account-manager.html
+share/doc/libmcclient/ch-account.html
+share/doc/libmcclient/ch-profile.html
+share/doc/libmcclient/home.png
+share/doc/libmcclient/index.html
+share/doc/libmcclient/index.sgml
+share/doc/libmcclient/left.png
+share/doc/libmcclient/libmcclient-mc-account-manager.html
+share/doc/libmcclient/libmcclient-mc-account.html
+share/doc/libmcclient/libmcclient.devhelp
+share/doc/libmcclient/libmcclient.devhelp2
+share/doc/libmcclient/right.png
+share/doc/libmcclient/style.css
+share/doc/libmcclient/up.png
share/doc/libmissioncontrol-server/McdChannel.html
share/doc/libmissioncontrol-server/McdController.html
share/doc/libmissioncontrol-server/McdDispatcher.html
@@ -75,7 +50,6 @@ share/doc/libmissioncontrol-server/McdManager.html
share/doc/libmissioncontrol-server/McdMaster.html
share/doc/libmissioncontrol-server/McdMission.html
share/doc/libmissioncontrol-server/McdOperation.html
-share/doc/libmissioncontrol-server/McdPresenceFrame.html
share/doc/libmissioncontrol-server/McdProxy.html
share/doc/libmissioncontrol-server/McdService.html
share/doc/libmissioncontrol-server/ch01.html
@@ -83,7 +57,6 @@ share/doc/libmissioncontrol-server/home.png
share/doc/libmissioncontrol-server/index.html
share/doc/libmissioncontrol-server/index.sgml
share/doc/libmissioncontrol-server/left.png
-share/doc/libmissioncontrol-server/libmissioncontrol-server-mcd-chan-handler.html
share/doc/libmissioncontrol-server/libmissioncontrol-server-mcd-connection.html
share/doc/libmissioncontrol-server/libmissioncontrol-server-mcd-debug.html
share/doc/libmissioncontrol-server/libmissioncontrol-server-mcd-dispatcher-context.html
@@ -93,27 +66,7 @@ share/doc/libmissioncontrol-server/libmissioncontrol-server.devhelp2
share/doc/libmissioncontrol-server/right.png
share/doc/libmissioncontrol-server/style.css
share/doc/libmissioncontrol-server/up.png
-share/doc/libmissioncontrol/McAccount.html
-share/doc/libmissioncontrol/McAccountMonitor.html
-share/doc/libmissioncontrol/McManager.html
-share/doc/libmissioncontrol/McProfile.html
-share/doc/libmissioncontrol/McProtocol.html
-share/doc/libmissioncontrol/ch01.html
-share/doc/libmissioncontrol/home.png
-share/doc/libmissioncontrol/index.html
-share/doc/libmissioncontrol/index.sgml
-share/doc/libmissioncontrol/left.png
-share/doc/libmissioncontrol/libmissioncontrol-mission-control.html
-share/doc/libmissioncontrol/libmissioncontrol.devhelp
-share/doc/libmissioncontrol/libmissioncontrol.devhelp2
-share/doc/libmissioncontrol/right.png
-share/doc/libmissioncontrol/style.css
-share/doc/libmissioncontrol/up.png
@dirrm share/doc/libmissioncontrol-server
-@dirrm share/doc/libmissioncontrol
-@dirrm include/mission-control/_gen
-@dirrm include/mission-control
-@dirrm include/libmissioncontrol/_gen
-@dirrm include/libmissioncontrol
+@dirrm share/doc/libmcclient
@dirrm include/libmcclient/_gen
@dirrm include/libmcclient
diff --git a/net/Makefile b/net/Makefile
index c9e7f5278815..858e2d55c7cc 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -172,6 +172,7 @@
SUBDIR += geotrace
SUBDIR += ggsd
SUBDIR += gini
+ SUBDIR += gir-repository-avahi
SUBDIR += gkrellm_snmp
SUBDIR += gkrellmmultiping2
SUBDIR += gkrellmqst
diff --git a/net/desktop-data-model/Makefile b/net/desktop-data-model/Makefile
index 48f6c6121a81..1384f38b98dc 100644
--- a/net/desktop-data-model/Makefile
+++ b/net/desktop-data-model/Makefile
@@ -7,7 +7,7 @@
PORTNAME= desktop-data-model
PORTVERSION= 1.2.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= GNOME
@@ -28,7 +28,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
USE_GMAKE= yes
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_GNOME= gnomehack gtk20 glib20 gnomedesktop
+USE_GNOME= gnomehack gtk20 glib20 gnomedesktop gnomevfs2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-maemo=no
USE_XORG= xscrnsaver
diff --git a/net/gir-repository-avahi/Makefile b/net/gir-repository-avahi/Makefile
new file mode 100644
index 000000000000..f56d432ae9fa
--- /dev/null
+++ b/net/gir-repository-avahi/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-avahi
+# Date created: 12 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/net/gir-repository-avahi/Makefile,v 1.1 2009/09/16 02:05:12 avl Exp $
+#
+
+CATEGORIES= net
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -avahi
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 96cabbd421e5..3e3c718afa8c 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.52 2009/03/08 19:32:04 marcus Exp $
+# $MCom: ports/net/gnome-netstatus/Makefile,v 1.54 2009/09/22 20:42:40 kwm Exp $
#
PORTNAME= gnome-netstatus
-PORTVERSION= 2.26.0
+PORTVERSION= 2.28.0
PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= GNOME
@@ -19,7 +19,7 @@ COMMENT= A GNOME applet that shows network status
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
-USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2 \
+USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel \
gnomedocutils
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo
index 818e6650a3e8..eb908566bc84 100644
--- a/net/gnome-netstatus/distinfo
+++ b/net/gnome-netstatus/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/gnome-netstatus-2.28.0.tar.bz2) = c8469bbaae5cb84e17ef02e0e3560623
+SHA256 (gnome2/gnome-netstatus-2.28.0.tar.bz2) = 1b279a0ff92b0952d70dbcaccfcfb2fc7378e8f15355bc01e2d478313a31d90d
+SIZE (gnome2/gnome-netstatus-2.28.0.tar.bz2) = 542242
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
index b3c64e8bcbd5..a55923c77d1f 100644
--- a/net/gnome-netstatus/pkg-plist
+++ b/net/gnome-netstatus/pkg-plist
@@ -1,7 +1,7 @@
libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server
libexec/gnome-netstatus-applet
share/gnome-2.0/ui/GNOME_NetstatusApplet.xml
-share/gnome-netstatus/gnome-netstatus.glade
+share/gnome-netstatus/gnome-netstatus.ui
share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-disconn.png
share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-error.png
share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-idle.png
@@ -24,6 +24,13 @@ share/gnome/help/gnome-netstatus/ca/figures/gnome-netstatus-rx.png
share/gnome/help/gnome-netstatus/ca/figures/gnome-netstatus-tx.png
share/gnome/help/gnome-netstatus/ca/figures/gnome-netstatus-txrx.png
share/gnome/help/gnome-netstatus/ca/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/cs/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/cs/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/cs/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/cs/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/cs/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/cs/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/cs/gnome-netstatus.xml
share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-disconn.png
share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-error.png
share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-idle.png
@@ -31,7 +38,6 @@ share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-rx.png
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
@@ -139,7 +145,6 @@ share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-rx.png
share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-tx.png
share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-txrx.png
share/gnome/help/gnome-netstatus/zh_CN/gnome-netstatus.xml
-share/gnome/help/gnome-netstatus/zh_CN/legal.xml
share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-disconn.png
share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-error.png
share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-idle.png
@@ -157,8 +162,9 @@ share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-txrx.png
share/gnome/help/gnome-netstatus/zh_TW/gnome-netstatus.xml
share/gnome/help/gnome-netstatus/zh_TW/legal.xml
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-ca.omf
+share/omf/gnome-netstatus/gnome-netstatus-cs.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
@@ -189,6 +195,7 @@ share/icons/hicolor/48x48/apps/gnome-netstatus-tx.png
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/as/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
@@ -196,6 +203,7 @@ 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/ca@valencia/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
@@ -229,6 +237,7 @@ 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/mai/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
@@ -304,6 +313,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
@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/cs/figures
+@dirrm share/gnome/help/gnome-netstatus/cs
@dirrm share/gnome/help/gnome-netstatus/ca/figures
@dirrm share/gnome/help/gnome-netstatus/ca
@dirrm share/gnome/help/gnome-netstatus/bg/figures
@@ -332,12 +343,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.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/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/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
@dirrmtry share/locale/crh/LC_MESSAGES
@dirrmtry share/locale/crh
@dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index e9ab805f3663..1ba69bea6726 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.50 2009/04/01 04:33:15 marcus Exp $
+# $MCom: ports/net/gnome-nettool/Makefile,v 1.53 2009/09/22 20:29:52 kwm Exp $
#
PORTNAME= gnome-nettool
-PORTVERSION= 2.26.2
-PORTREVISION= 1
+PORTVERSION= 2.28.0
PORTEPOCH= 1
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index 78126b6982d8..54837e4ca6a1 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-nettool-2.26.2.tar.bz2) = fc1a730e25aa09dc1bef613c8ed6ab92
-SHA256 (gnome2/gnome-nettool-2.26.2.tar.bz2) = ac71ed4ba64e551f9905e69aa4472a9486030702e3712dd7e34b978ba582edc7
-SIZE (gnome2/gnome-nettool-2.26.2.tar.bz2) = 631631
+MD5 (gnome2/gnome-nettool-2.28.0.tar.bz2) = e5d44454cfa4c5ca5e640c304f18fe0e
+SHA256 (gnome2/gnome-nettool-2.28.0.tar.bz2) = ecce19920e2bf5b7cac8ffd26d8592adff7b895d1ee219b18a84a46313f36dd5
+SIZE (gnome2/gnome-nettool-2.28.0.tar.bz2) = 641475
diff --git a/net/gnome-nettool/files/patch-src_nettool.c b/net/gnome-nettool/files/patch-src_nettool.c
index 1009298e6f59..40e45446775a 100644
--- a/net/gnome-nettool/files/patch-src_nettool.c
+++ b/net/gnome-nettool/files/patch-src_nettool.c
@@ -1,5 +1,5 @@
---- src/nettool.c.orig Fri Apr 14 08:36:08 2006
-+++ src/nettool.c Fri May 12 15:54:15 2006
+--- src/nettool.c.orig 2009-06-18 13:51:14.000000000 -0400
++++ src/nettool.c 2009-07-19 16:05:59.000000000 -0400
@@ -24,6 +24,7 @@
#include <string.h>
#include <sys/types.h>
@@ -8,7 +8,7 @@
#include <signal.h>
#include <errno.h>
#include <sys/wait.h>
-@@ -360,6 +361,10 @@ netinfo_io_text_buffer_dialog (GIOChanne
+@@ -374,6 +375,10 @@ netinfo_io_text_buffer_dialog (GIOChanne
len, NULL);
}
@@ -19,14 +19,26 @@
} else if (status == G_IO_STATUS_AGAIN) {
char buf[1];
-@@ -371,12 +376,13 @@ netinfo_io_text_buffer_dialog (GIOChanne
+@@ -385,6 +390,8 @@ netinfo_io_text_buffer_dialog (GIOChanne
}
g_string_append_c (netinfo->command_output, buf[0]);
}
-+
+ g_free (text);
+ return TRUE;
} else if (status == G_IO_STATUS_EOF) {
+
+ } else if (status == G_IO_STATUS_ERROR) {
+@@ -402,15 +409,15 @@ netinfo_io_text_buffer_dialog (GIOChanne
+
+ } else {
+ g_warning ("Error: %s\n", err->message);
+- g_free (text);
+ g_free (err);
+ }
+
++ g_free (text);
++ return TRUE;
++
}
g_free (text);
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index cd15a3acf584..514782f3a70e 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -1,6 +1,6 @@
bin/gnome-nettool
share/applications/gnome-nettool.desktop
-%%DATADIR%%/dialogs/gnome-nettool.glade
+%%DATADIR%%/dialogs/gnome-nettool.ui
%%DATADIR%%/pixmaps/16_ethernet.xpm
%%DATADIR%%/pixmaps/16_loopback.xpm
%%DATADIR%%/pixmaps/16_plip.xpm
@@ -40,8 +40,10 @@ share/locale/az/LC_MESSAGES/gnome-nettool.mo
share/locale/bg/LC_MESSAGES/gnome-nettool.mo
share/locale/bn/LC_MESSAGES/gnome-nettool.mo
share/locale/bn_IN/LC_MESSAGES/gnome-nettool.mo
+share/locale/br/LC_MESSAGES/gnome-nettool.mo
share/locale/bs/LC_MESSAGES/gnome-nettool.mo
share/locale/ca/LC_MESSAGES/gnome-nettool.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-nettool.mo
share/locale/cs/LC_MESSAGES/gnome-nettool.mo
share/locale/cy/LC_MESSAGES/gnome-nettool.mo
share/locale/da/LC_MESSAGES/gnome-nettool.mo
@@ -72,6 +74,7 @@ share/locale/ko/LC_MESSAGES/gnome-nettool.mo
share/locale/ku/LC_MESSAGES/gnome-nettool.mo
share/locale/lt/LC_MESSAGES/gnome-nettool.mo
share/locale/lv/LC_MESSAGES/gnome-nettool.mo
+share/locale/mai/LC_MESSAGES/gnome-nettool.mo
share/locale/mg/LC_MESSAGES/gnome-nettool.mo
share/locale/mk/LC_MESSAGES/gnome-nettool.mo
share/locale/ml/LC_MESSAGES/gnome-nettool.mo
@@ -173,10 +176,14 @@ share/pixmaps/gnome-nettool.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/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/as/LC_MESSAGES
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 9f65e2bc0e2b..0d4a1c738629 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gtk-vnc
-PORTVERSION= 0.3.9
-PORTREVISION= 1
+PORTVERSION= 0.3.10
CATEGORIES= net gnome
MASTER_SITES= GNOME
@@ -20,6 +19,7 @@ LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \
USE_GNOME= pygtk2 gnomehack
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
diff --git a/net/gtk-vnc/distinfo b/net/gtk-vnc/distinfo
index ea4379447be0..7d8a8e121f4a 100644
--- a/net/gtk-vnc/distinfo
+++ b/net/gtk-vnc/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtk-vnc-0.3.9.tar.gz) = 26690465f413a017ae95514af9f4e41d
-SHA256 (gtk-vnc-0.3.9.tar.gz) = f0ac2dfcc814e1cf627eebd3efd2f93383f495e859c8ba2977d4d6afa73c44ca
-SIZE (gtk-vnc-0.3.9.tar.gz) = 577009
+MD5 (gtk-vnc-0.3.10.tar.gz) = 4d6ae40f7d9e6eff7b62488a2b728b2b
+SHA256 (gtk-vnc-0.3.10.tar.gz) = 61fdc1824e5621ba77a116fae7e512ced377a914ad34b2a694188277ca679384
+SIZE (gtk-vnc-0.3.10.tar.gz) = 604228
diff --git a/net/gtk-vnc/pkg-plist b/net/gtk-vnc/pkg-plist
index a53715865f5f..e57277615288 100644
--- a/net/gtk-vnc/pkg-plist
+++ b/net/gtk-vnc/pkg-plist
@@ -7,4 +7,17 @@ lib/libgtk-vnc-1.0.so.0
%%PYTHON_SITELIBDIR%%/gtkvnc.la
%%PYTHON_SITELIBDIR%%/gtkvnc.so
libdata/pkgconfig/gtk-vnc-1.0.pc
+share/locale/de/LC_MESSAGES/gtk-vnc.mo
+share/locale/el/LC_MESSAGES/gtk-vnc.mo
+share/locale/en_GB/LC_MESSAGES/gtk-vnc.mo
+share/locale/es/LC_MESSAGES/gtk-vnc.mo
+share/locale/eu/LC_MESSAGES/gtk-vnc.mo
+share/locale/fr/LC_MESSAGES/gtk-vnc.mo
+share/locale/gl/LC_MESSAGES/gtk-vnc.mo
+share/locale/hu/LC_MESSAGES/gtk-vnc.mo
+share/locale/it/LC_MESSAGES/gtk-vnc.mo
+share/locale/pl/LC_MESSAGES/gtk-vnc.mo
+share/locale/pt/LC_MESSAGES/gtk-vnc.mo
+share/locale/pt_BR/LC_MESSAGES/gtk-vnc.mo
+share/locale/sv/LC_MESSAGES/gtk-vnc.mo
@dirrm include/gtk-vnc-1.0
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index b5a62e7d2f79..5d8edd3b3429 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/net/libgweather/Makefile,v 1.1 2009/04/15 22:11:37 kwm Exp $
+# $MCom: ports/net/libgweather/Makefile,v 1.29 2009/09/22 02:46:21 avl Exp $
#
PORTNAME= libgweather
-PORTVERSION= 2.26.2.1
-PORTREVISION= 1
+PORTVERSION= 2.28.0
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/libgweather/distinfo b/net/libgweather/distinfo
index 4b824da42679..f9586ba79f19 100644
--- a/net/libgweather/distinfo
+++ b/net/libgweather/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgweather-2.26.2.1.tar.bz2) = cef0447b62235c4662aa9691dd9a6c92
-SHA256 (libgweather-2.26.2.1.tar.bz2) = 70cf977060a5e71ade98346070856f09fbf33f6d88f4d49632d7ae0f6b314834
-SIZE (libgweather-2.26.2.1.tar.bz2) = 6367411
+MD5 (libgweather-2.28.0.tar.bz2) = 9f4457144d32d4004e0e045240ab51dc
+SHA256 (libgweather-2.28.0.tar.bz2) = 65fd8e4d7b617de7aac5a5d7d9bebde63ead828bcdc3e8f73f038ce03e669654
+SIZE (libgweather-2.28.0.tar.bz2) = 6320631
diff --git a/net/libgweather/pkg-plist b/net/libgweather/pkg-plist
index 049dc64a0c0a..b163c08c25d5 100644
--- a/net/libgweather/pkg-plist
+++ b/net/libgweather/pkg-plist
@@ -41,6 +41,7 @@ libdata/pkgconfig/gweather.pc
%%DATADIR%%/Locations.bn_IN.xml
%%DATADIR%%/Locations.bs.xml
%%DATADIR%%/Locations.ca.xml
+%%DATADIR%%/Locations.ca@valencia.xml
%%DATADIR%%/Locations.cs.xml
%%DATADIR%%/Locations.cy.xml
%%DATADIR%%/Locations.da.xml
@@ -121,6 +122,7 @@ share/locale/bn/LC_MESSAGES/libgweather.mo
share/locale/bn_IN/LC_MESSAGES/libgweather.mo
share/locale/bs/LC_MESSAGES/libgweather.mo
share/locale/ca/LC_MESSAGES/libgweather.mo
+share/locale/ca@valencia/LC_MESSAGES/libgweather.mo
share/locale/cs/LC_MESSAGES/libgweather.mo
share/locale/cy/LC_MESSAGES/libgweather.mo
share/locale/da/LC_MESSAGES/libgweather.mo
@@ -171,6 +173,7 @@ share/locale/ku/LC_MESSAGES/libgweather.mo
share/locale/ky/LC_MESSAGES/libgweather.mo
share/locale/lt/LC_MESSAGES/libgweather.mo
share/locale/lv/LC_MESSAGES/libgweather.mo
+share/locale/mai/LC_MESSAGES/libgweather.mo
share/locale/mg/LC_MESSAGES/libgweather.mo
share/locale/mk/LC_MESSAGES/libgweather.mo
share/locale/ml/LC_MESSAGES/libgweather.mo
@@ -229,6 +232,8 @@ share/locale/zh_TW/LC_MESSAGES/libgweather.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/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@@ -267,6 +272,8 @@ share/locale/zh_TW/LC_MESSAGES/libgweather.mo
@dirrmtry share/locale/es_AR
@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
diff --git a/net/libproxy-mozjs/Makefile b/net/libproxy-mozjs/Makefile
index bda76b26d235..7502d6229705 100644
--- a/net/libproxy-mozjs/Makefile
+++ b/net/libproxy-mozjs/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= net devel
PKGNAMESUFFIX= -mozjs
@@ -19,11 +19,15 @@ BUILD_WRKSRC= ${WRKSRC}/src/plugins
INSTALL_WRKSRC= ${BUILD_WRKSRC}
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-USE_GECKO= firefox libxul
+USE_GECKO= libxul
CONFIGURE_ARGS=--without-gnome --without-kde --without-webkit \
--with-mozjs --without-networkmanager --without-python \
--without-envvar --without-file
LIBPROXY_SLAVE= yes
+post-patch:
+ @${REINPLACE_CMD} -e 's|mozilla-js|mozilla-js libxul-unstable|g' \
+ ${WRKSRC}/configure
+
.include "${MASTERDIR}/Makefile"
diff --git a/net/libproxy-webkit/Makefile b/net/libproxy-webkit/Makefile
index a1ee24dc632b..67c44cb36a09 100644
--- a/net/libproxy-webkit/Makefile
+++ b/net/libproxy-webkit/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 7
CATEGORIES= net devel
PKGNAMESUFFIX= -webkit
@@ -13,7 +13,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= WebKit Javascript plug-in for libproxy
LIB_DEPENDS= proxy.0:${PORTSDIR}/net/libproxy \
- webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+ webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
MASTERDIR= ${.CURDIR}/../libproxy
BUILD_WRKSRC= ${WRKSRC}/src/plugins
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 880ce4a0bf45..b14e724c9443 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -7,7 +7,7 @@
PORTNAME= liferea
PORTVERSION= 1.4.28
-PORTREVISION= 2
+PORTREVISION= 7
CATEGORIES= net gnome
MASTER_SITES= SF/${PORTNAME}/Liferea%20Stable/${PORTVERSION}
@@ -61,7 +61,7 @@ PLIST_SUB+= GTKHTML="@comment "
.endif
.ifdef WITH_WEBKIT
-LIB_DEPENDS+= webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
CONFIGURE_ARGS+=--enable-webkit
PLIST_SUB+= WEBKIT=""
.else
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index ea7bd27f417b..692a0ab46a7b 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/net/vinagre/Makefile,v 1.1 2009/04/15 09:36:08 kwm Exp $
+# $MCom: ports/net/vinagre/Makefile,v 1.32 2009/10/19 13:20:56 avl Exp $
#
PORTNAME= vinagre
-PORTVERSION= 2.26.2
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -23,13 +22,13 @@ LIB_DEPENDS= gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc \
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_GNOME= gnomeprefix intlhack gnomehack libglade2 gconf2 gnomedocutils \
+USE_GNOME= gnomeprefix intlhack gnomehack vte gconf2 gnomedocutils \
gnomepanel
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-CONFIGURE_ARGS= --enable-avahi
+CONFIGURE_ARGS= --enable-avahi --enable-applet -enable-ssh
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -37,6 +36,19 @@ GCONF_SCHEMAS= vinagre.schemas
MAN1= vinagre.1
+OPTIONS= TELEPATHY "Enable telepathy integration" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_TELEPATHY)
+CONFIGURE_ARGS+=--enable-telepathy
+LIB_DEPENDS+= telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
+PLIST_SUB+= TELEPATHY=""
+.else
+CONFIGURE_ARGS+=--disable-telepathy
+PLIST_SUB+= TELEPATHY="@comment "
+.endif
+
post-install:
@-update-desktop-database > /dev/null
@-update-mime-database ${PREFIX}/share/mime > /dev/null
@@ -47,4 +59,4 @@ post-install:
.endfor
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
index be3f82179e45..26137b5073ff 100644
--- a/net/vinagre/distinfo
+++ b/net/vinagre/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vinagre-2.26.2.tar.bz2) = 86686bb8ba70a6cf38de48c45515c7fc
-SHA256 (gnome2/vinagre-2.26.2.tar.bz2) = 8a1e86dff5e1c14bb53f8f5ee579c7ddaaf532d5d7b1f66a2b5a239a65a15fb5
-SIZE (gnome2/vinagre-2.26.2.tar.bz2) = 1445532
+MD5 (gnome2/vinagre-2.28.1.tar.bz2) = 3fec37a3e20d6f3641d905b580f7306a
+SHA256 (gnome2/vinagre-2.28.1.tar.bz2) = 774276784b3f097faf165dff37d1e9372098db5570421f4e213fa3c8e9808ad4
+SIZE (gnome2/vinagre-2.28.1.tar.bz2) = 1888223
diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist
index 01d26136148b..6f9d4155544f 100644
--- a/net/vinagre/pkg-plist
+++ b/net/vinagre/pkg-plist
@@ -1,45 +1,164 @@
bin/vinagre
libdata/bonobo/servers/GNOME_VinagreApplet.server
libexec/vinagre-applet
+include/vinagre-1.0/vinagre/vinagre-app.h
+include/vinagre-1.0/vinagre/vinagre-bacon.h
+include/vinagre-1.0/vinagre/vinagre-bookmarks-entry.h
+include/vinagre-1.0/vinagre/vinagre-bookmarks-migration.h
+include/vinagre-1.0/vinagre/vinagre-bookmarks-tree.h
+include/vinagre-1.0/vinagre/vinagre-bookmarks-ui.h
+include/vinagre-1.0/vinagre/vinagre-bookmarks.h
+include/vinagre-1.0/vinagre/vinagre-commands.h
+include/vinagre-1.0/vinagre/vinagre-connect.h
+include/vinagre-1.0/vinagre/vinagre-connection.h
+include/vinagre-1.0/vinagre/vinagre-debug.h
+include/vinagre-1.0/vinagre/vinagre-dirs.h
+include/vinagre-1.0/vinagre/vinagre-dnd.h
+include/vinagre-1.0/vinagre/vinagre-fav.h
+include/vinagre-1.0/vinagre/vinagre-notebook.h
+include/vinagre-1.0/vinagre/vinagre-plugin-loader.h
+include/vinagre-1.0/vinagre/vinagre-plugin.h
+include/vinagre-1.0/vinagre/vinagre-prefs.h
+include/vinagre-1.0/vinagre/vinagre-tab.h
+include/vinagre-1.0/vinagre/vinagre-ui.h
+include/vinagre-1.0/vinagre/vinagre-utils.h
+include/vinagre-1.0/vinagre/vinagre-window.h
+lib/vinagre-1/plugin-loaders/libcloader.la
+lib/vinagre-1/plugin-loaders/libcloader.so
+lib/vinagre-1/plugins/libssh.la
+lib/vinagre-1/plugins/libssh.so
+lib/vinagre-1/plugins/libvnc.la
+lib/vinagre-1/plugins/libvnc.so
+lib/vinagre-1/plugins/ssh.vinagre-plugin
+lib/vinagre-1/plugins/vnc.vinagre-plugin
+libdata/pkgconfig/vinagre-1.0.pc
share/applications/vinagre-file.desktop
share/applications/vinagre.desktop
+%%TELEPATHY%%share/dbus-1/services/org.gnome.Empathy.StreamTubeHandler.rfb.service
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
+share/gnome/help/vinagre/C/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/C/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/C/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/C/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/C/figures/vinagre-saving-bookmarks.png
share/gnome/help/vinagre/C/figures/vinagre-screenshot.png
share/gnome/help/vinagre/C/legal.xml
share/gnome/help/vinagre/C/vinagre.xml
+share/gnome/help/vinagre/ca/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/ca/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/ca/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/ca/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/ca/figures/vinagre-saving-bookmarks.png
share/gnome/help/vinagre/ca/figures/vinagre-screenshot.png
share/gnome/help/vinagre/ca/vinagre.xml
+share/gnome/help/vinagre/cs/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/cs/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/cs/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/cs/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/cs/figures/vinagre-saving-bookmarks.png
share/gnome/help/vinagre/cs/figures/vinagre-screenshot.png
share/gnome/help/vinagre/cs/vinagre.xml
+share/gnome/help/vinagre/de/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/de/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/de/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/de/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/de/figures/vinagre-saving-bookmarks.png
share/gnome/help/vinagre/de/figures/vinagre-screenshot.png
share/gnome/help/vinagre/de/vinagre.xml
+share/gnome/help/vinagre/el/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/el/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/el/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/el/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/el/figures/vinagre-saving-bookmarks.png
share/gnome/help/vinagre/el/figures/vinagre-screenshot.png
share/gnome/help/vinagre/el/vinagre.xml
+share/gnome/help/vinagre/en_GB/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/en_GB/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/en_GB/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/en_GB/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/en_GB/figures/vinagre-saving-bookmarks.png
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-auth-needed.png
+share/gnome/help/vinagre/es/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/es/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/es/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/es/figures/vinagre-saving-bookmarks.png
share/gnome/help/vinagre/es/figures/vinagre-screenshot.png
share/gnome/help/vinagre/es/vinagre.xml
+share/gnome/help/vinagre/fr/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/fr/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/fr/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/fr/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/fr/figures/vinagre-saving-bookmarks.png
share/gnome/help/vinagre/fr/figures/vinagre-screenshot.png
share/gnome/help/vinagre/fr/vinagre.xml
+share/gnome/help/vinagre/it/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/it/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/it/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/it/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/it/figures/vinagre-saving-bookmarks.png
share/gnome/help/vinagre/it/figures/vinagre-screenshot.png
share/gnome/help/vinagre/it/vinagre.xml
+share/gnome/help/vinagre/oc/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/oc/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/oc/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/oc/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/oc/figures/vinagre-saving-bookmarks.png
share/gnome/help/vinagre/oc/figures/vinagre-screenshot.png
share/gnome/help/vinagre/oc/vinagre.xml
+share/gnome/help/vinagre/pl/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/pl/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/pl/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/pl/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/pl/figures/vinagre-saving-bookmarks.png
+share/gnome/help/vinagre/pl/figures/vinagre-screenshot.png
+share/gnome/help/vinagre/pl/vinagre.xml
+share/gnome/help/vinagre/pt/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/pt/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/pt/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/pt/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/pt/figures/vinagre-saving-bookmarks.png
share/gnome/help/vinagre/pt/figures/vinagre-screenshot.png
share/gnome/help/vinagre/pt/vinagre.xml
+share/gnome/help/vinagre/pt_BR/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/pt_BR/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/pt_BR/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/pt_BR/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/pt_BR/figures/vinagre-saving-bookmarks.png
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-auth-needed.png
+share/gnome/help/vinagre/sq/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/sq/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/sq/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/sq/figures/vinagre-saving-bookmarks.png
share/gnome/help/vinagre/sq/figures/vinagre-screenshot.png
share/gnome/help/vinagre/sq/vinagre.xml
+share/gnome/help/vinagre/sv/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/sv/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/sv/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/sv/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/sv/figures/vinagre-saving-bookmarks.png
share/gnome/help/vinagre/sv/figures/vinagre-screenshot.png
share/gnome/help/vinagre/sv/vinagre.xml
+share/gnome/help/vinagre/th/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/th/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/th/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/th/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/th/figures/vinagre-saving-bookmarks.png
share/gnome/help/vinagre/th/figures/vinagre-screenshot.png
share/gnome/help/vinagre/th/vinagre.xml
+share/gnome/help/vinagre/zh_CN/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/zh_CN/figures/vinagre-bookmarks-side-panel.png
+share/gnome/help/vinagre/zh_CN/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/zh_CN/figures/vinagre-editing-bookmarks.png
+share/gnome/help/vinagre/zh_CN/figures/vinagre-saving-bookmarks.png
share/gnome/help/vinagre/zh_CN/figures/vinagre-screenshot.png
share/gnome/help/vinagre/zh_CN/vinagre.xml
share/icons/hicolor/16x16/apps/vinagre.png
@@ -69,8 +188,10 @@ 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/LC_MESSAGES/vinagre.mo
share/locale/bn_IN/LC_MESSAGES/vinagre.mo
share/locale/ca/LC_MESSAGES/vinagre.mo
+share/locale/ca@valencia/LC_MESSAGES/vinagre.mo
share/locale/cs/LC_MESSAGES/vinagre.mo
share/locale/da/LC_MESSAGES/vinagre.mo
share/locale/de/LC_MESSAGES/vinagre.mo
@@ -81,6 +202,7 @@ share/locale/et/LC_MESSAGES/vinagre.mo
share/locale/eu/LC_MESSAGES/vinagre.mo
share/locale/fi/LC_MESSAGES/vinagre.mo
share/locale/fr/LC_MESSAGES/vinagre.mo
+share/locale/ga/LC_MESSAGES/vinagre.mo
share/locale/gl/LC_MESSAGES/vinagre.mo
share/locale/gu/LC_MESSAGES/vinagre.mo
share/locale/he/LC_MESSAGES/vinagre.mo
@@ -93,6 +215,7 @@ 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/mai/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
@@ -135,6 +258,7 @@ 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-pl.omf
share/omf/vinagre/vinagre-pt.omf
share/omf/vinagre/vinagre-pt_BR.omf
share/omf/vinagre/vinagre-sq.omf
@@ -143,7 +267,7 @@ share/omf/vinagre/vinagre-th.omf
share/omf/vinagre/vinagre-zh_CN.omf
%%DATADIR%%/GNOME_VinagreApplet.xml
%%DATADIR%%/vinagre-ui.xml
-%%DATADIR%%/vinagre.glade
+%%DATADIR%%/vinagre.ui
@dirrm %%DATADIR%%
@dirrm share/omf/vinagre
@dirrm share/gnome/help/vinagre/zh_CN/figures
@@ -158,6 +282,8 @@ share/omf/vinagre/vinagre-zh_CN.omf
@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/pl/figures
+@dirrm share/gnome/help/vinagre/pl
@dirrm share/gnome/help/vinagre/oc/figures
@dirrm share/gnome/help/vinagre/oc
@dirrm share/gnome/help/vinagre/it/figures
@@ -181,6 +307,11 @@ share/omf/vinagre/vinagre-zh_CN.omf
@dirrm share/gnome/help/vinagre
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry share/applications
+@dirrm lib/vinagre-1/plugins
+@dirrm lib/vinagre-1/plugin-loaders
+@dirrm lib/vinagre-1
+@dirrm include/vinagre-1.0/vinagre
+@dirrm include/vinagre-1.0
@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
@@ -197,8 +328,12 @@ share/omf/vinagre/vinagre-zh_CN.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/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
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 590ec5fff2f1..34758e57111d 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,12 +3,11 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $MCom: ports-stable/net/vino/Makefile,v 1.1 2009/04/15 09:28:05 kwm Exp $
+# $MCom: ports/net/vino/Makefile,v 1.76 2009/10/19 13:48:42 avl Exp $
#
PORTNAME= vino
-PORTVERSION= 2.26.2
-PORTREVISION= 2
+PORTVERSION= 2.28.1
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/vino/distinfo b/net/vino/distinfo
index a8c196cd559d..32f15ef71773 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vino-2.26.2.tar.bz2) = 580a8f79130273f03cb57c32bba59120
-SHA256 (gnome2/vino-2.26.2.tar.bz2) = b42580887d91ed2ffc1f2e8e05f4dd0f7304abd98a04139bdb9a674022dd6913
-SIZE (gnome2/vino-2.26.2.tar.bz2) = 724845
+MD5 (gnome2/vino-2.28.1.tar.bz2) = 5cf3c006f0d0b5e0daa3b10bc94f0e0d
+SHA256 (gnome2/vino-2.28.1.tar.bz2) = bd86825546d2639ec3ea724efa013a84971f289c7903740418b2f2ca38f28ebe
+SIZE (gnome2/vino-2.28.1.tar.bz2) = 794178
diff --git a/net/vino/files/patch-server_vino-dbus-listener.c b/net/vino/files/patch-server_vino-dbus-listener.c
deleted file mode 100644
index 0744af11668d..000000000000
--- a/net/vino/files/patch-server_vino-dbus-listener.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- server/vino-dbus-listener.c.orig 2009-05-18 17:59:03.000000000 +0200
-+++ server/vino-dbus-listener.c 2009-05-19 10:13:22.000000000 +0200
-@@ -35,6 +35,8 @@
- #include <string.h>
- #include <unistd.h>
- #include <netdb.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <net/if.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index 9438f2de6b85..c065c6eff60e 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -3,6 +3,7 @@ bin/vino-preferences
etc/xdg/autostart/vino-server.desktop
libexec/vino-server
share/applications/vino-preferences.desktop
+share/dbus-1/services/org.gnome.Vino.service
share/locale/ar/LC_MESSAGES/vino.mo
share/locale/as/LC_MESSAGES/vino.mo
share/locale/ast/LC_MESSAGES/vino.mo
@@ -14,6 +15,7 @@ share/locale/bn/LC_MESSAGES/vino.mo
share/locale/bn_IN/LC_MESSAGES/vino.mo
share/locale/bs/LC_MESSAGES/vino.mo
share/locale/ca/LC_MESSAGES/vino.mo
+share/locale/ca@valencia/LC_MESSAGES/vino.mo
share/locale/cs/LC_MESSAGES/vino.mo
share/locale/cy/LC_MESSAGES/vino.mo
share/locale/da/LC_MESSAGES/vino.mo
@@ -28,6 +30,7 @@ share/locale/eu/LC_MESSAGES/vino.mo
share/locale/fa/LC_MESSAGES/vino.mo
share/locale/fi/LC_MESSAGES/vino.mo
share/locale/fr/LC_MESSAGES/vino.mo
+share/locale/ga/LC_MESSAGES/vino.mo
share/locale/gl/LC_MESSAGES/vino.mo
share/locale/gu/LC_MESSAGES/vino.mo
share/locale/he/LC_MESSAGES/vino.mo
@@ -43,6 +46,7 @@ share/locale/ko/LC_MESSAGES/vino.mo
share/locale/ku/LC_MESSAGES/vino.mo
share/locale/lt/LC_MESSAGES/vino.mo
share/locale/lv/LC_MESSAGES/vino.mo
+share/locale/mai/LC_MESSAGES/vino.mo
share/locale/mk/LC_MESSAGES/vino.mo
share/locale/ml/LC_MESSAGES/vino.mo
share/locale/mn/LC_MESSAGES/vino.mo
@@ -80,8 +84,8 @@ share/locale/xh/LC_MESSAGES/vino.mo
share/locale/zh_CN/LC_MESSAGES/vino.mo
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%%/vino-preferences.ui
+%%DATADIR%%/vino-prompt.ui
%%DATADIR%%/webservices
@dirrm %%DATADIR%%
@dirrmtry share/applications
@@ -103,10 +107,14 @@ share/locale/zh_TW/LC_MESSAGES/vino.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
@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
diff --git a/palm/synce-gvfs/Makefile b/palm/synce-gvfs/Makefile
index e6bb265b929c..7ea1ce9b2044 100644
--- a/palm/synce-gvfs/Makefile
+++ b/palm/synce-gvfs/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= synce-gvfs
-PORTVERSION= 0.3
+PORTVERSION= 0.3.1
CATEGORIES= palm
MASTER_SITES= SF/synce/SynCE-GNOME/0.14
diff --git a/palm/synce-gvfs/distinfo b/palm/synce-gvfs/distinfo
index 611a78a0e1de..204ffa45634a 100644
--- a/palm/synce-gvfs/distinfo
+++ b/palm/synce-gvfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (synce-gvfs-0.3.tar.gz) = bdc7cae57e0de95d18ebb087ca58dbac
-SHA256 (synce-gvfs-0.3.tar.gz) = 317c13fa8f7ec2bfe4dbc2b6969436513fe6c69f9c520a4b7c0ce23b84c9abe3
-SIZE (synce-gvfs-0.3.tar.gz) = 348954
+MD5 (synce-gvfs-0.3.1.tar.gz) = 5b23845b40b102eef6e8e3c8c348aa76
+SHA256 (synce-gvfs-0.3.1.tar.gz) = 31a2362e4f4f8d98105ed79600d03adca7e21c590d6157a6f813400cd99ea719
+SIZE (synce-gvfs-0.3.1.tar.gz) = 355881
diff --git a/palm/synce-gvfs/pkg-plist b/palm/synce-gvfs/pkg-plist
index 7ee97bf8c4e9..85df253b0a92 100644
--- a/palm/synce-gvfs/pkg-plist
+++ b/palm/synce-gvfs/pkg-plist
@@ -1,5 +1,6 @@
libexec/gvfsd-synce
share/gvfs/mounts/synce.mount
+share/icons/gnome/22x22/apps/synce-gvfs.png
share/icons/gnome/48x48/apps/synce-gvfs.png
share/mime/application/x-pocket-excel.xml
share/mime/application/x-pocket-word.xml
@@ -8,6 +9,8 @@ share/mime/packages/synce-gvfs.xml
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@dirrmtry share/gvfs/mounts
@dirrmtry share/gvfs
+@dirrmtry share/icons/gnome/22x22/apps
+@dirrmtry share/icons/gnome/22x22
@dirrmtry share/icons/gnome/48x48/apps
@dirrmtry share/icons/gnome/48x48
@dirrmtry share/icons/gnome
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index d3b69092e31c..6fb2273f60be 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -3,12 +3,11 @@
# Whom: jseger@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/print/freetype2/Makefile,v 1.16 2009/04/09 03:24:09 mezz Exp $
+# $MCom: ports/print/freetype2/Makefile,v 1.19 2009/11/28 05:59:02 mezz Exp $
#
PORTNAME= freetype2
-PORTVERSION= 2.3.9
-PORTREVISION= 1
+PORTVERSION= 2.3.11
CATEGORIES= print
MASTER_SITES= SF/freetype/${PORTNAME}/${PORTVERSION} \
http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \
diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo
index 90082855f2fd..cba91a34b1bd 100644
--- a/print/freetype2/distinfo
+++ b/print/freetype2/distinfo
@@ -1,3 +1,3 @@
-MD5 (freetype-2.3.9.tar.bz2) = d76233108aca9c9606cdbd341562ad9a
-SHA256 (freetype-2.3.9.tar.bz2) = 51a033bce9904d73e0821e8e2bba24bd319619d7d1b2e9eeccac611580242ab6
-SIZE (freetype-2.3.9.tar.bz2) = 1363190
+MD5 (freetype-2.3.11.tar.bz2) = 519c7cbf5cbd72ffa822c66844d3114c
+SHA256 (freetype-2.3.11.tar.bz2) = 8a033b1e6018a1e9ea381b09b2347b02c6686bdf7e4ee86a6714b6b90f1e2ec9
+SIZE (freetype-2.3.11.tar.bz2) = 1446474
diff --git a/print/freetype2/files/patch-src-cff_cffload.c b/print/freetype2/files/patch-src-cff_cffload.c
deleted file mode 100644
index 33d8a99d8800..000000000000
--- a/print/freetype2/files/patch-src-cff_cffload.c
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/cff/cffload.c b/src/cff/cffload.c
-index 22163fb..24b899d 100644
---- src/cff/cffload.c
-+++ src/cff/cffload.c
-@@ -842,7 +842,20 @@
- goto Exit;
-
- for ( j = 1; j < num_glyphs; j++ )
-- charset->sids[j] = FT_GET_USHORT();
-+ {
-+ FT_UShort sid = FT_GET_USHORT();
-+
-+
-+ /* this constant is given in the CFF specification */
-+ if ( sid < 65000 )
-+ charset->sids[j] = sid;
-+ else
-+ {
-+ FT_ERROR(( "cff_charset_load:"
-+ " invalid SID value %d set to zero\n", sid ));
-+ charset->sids[j] = 0;
-+ }
-+ }
-
- FT_FRAME_EXIT();
- }
-@@ -875,6 +888,20 @@
- goto Exit;
- }
-
-+ /* check whether the range contains at least one valid glyph; */
-+ /* the constant is given in the CFF specification */
-+ if ( glyph_sid >= 65000 ) {
-+ FT_ERROR(( "cff_charset_load: invalid SID range\n" ));
-+ error = CFF_Err_Invalid_File_Format;
-+ goto Exit;
-+ }
-+
-+ /* try to rescue some of the SIDs if `nleft' is too large */
-+ if ( nleft > 65000 - 1 || glyph_sid >= 65000 - nleft ) {
-+ FT_ERROR(( "cff_charset_load: invalid SID range trimmed\n" ));
-+ nleft = 65000 - 1 - glyph_sid;
-+ }
-+
- /* Fill in the range of sids -- `nleft + 1' glyphs. */
- for ( i = 0; j < num_glyphs && i <= nleft; i++, j++, glyph_sid++ )
- charset->sids[j] = glyph_sid;
diff --git a/print/freetype2/files/patch-src-lzw_ftzopen.c b/print/freetype2/files/patch-src-lzw_ftzopen.c
deleted file mode 100644
index 8f8de1f14622..000000000000
--- a/print/freetype2/files/patch-src-lzw_ftzopen.c
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/lzw/ftzopen.c b/src/lzw/ftzopen.c
-index fc78315..c0483de 100644
---- src/lzw/ftzopen.c
-+++ src/lzw/ftzopen.c
-@@ -332,6 +332,9 @@
-
- while ( code >= 256U )
- {
-+ if ( !state->prefix )
-+ goto Eof;
-+
- FTLZW_STACK_PUSH( state->suffix[code - 256] );
- code = state->prefix[code - 256];
- }
diff --git a/print/freetype2/files/patch-src-sfnt_ttcmap.c b/print/freetype2/files/patch-src-sfnt_ttcmap.c
deleted file mode 100644
index ce5c717eb915..000000000000
--- a/print/freetype2/files/patch-src-sfnt_ttcmap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
-index 6830391..1bd2ce7 100644
---- src/sfnt/ttcmap.c
-+++ src/sfnt/ttcmap.c
-@@ -1635,7 +1635,7 @@
- FT_INVALID_TOO_SHORT;
-
- length = TT_NEXT_ULONG( p );
-- if ( table + length > valid->limit || length < 8208 )
-+ if ( length > (FT_UInt32)( valid->limit - table ) || length < 8192 + 16 )
- FT_INVALID_TOO_SHORT;
-
- is32 = table + 12;
-@@ -1863,7 +1863,8 @@
- p = table + 16;
- count = TT_NEXT_ULONG( p );
-
-- if ( table + length > valid->limit || length < 20 + count * 2 )
-+ if ( length > (FT_ULong)( valid->limit - table ) ||
-+ length < 20 + count * 2 )
- FT_INVALID_TOO_SHORT;
-
- /* check glyph indices */
-@@ -2048,7 +2049,8 @@
- p = table + 12;
- num_groups = TT_NEXT_ULONG( p );
-
-- if ( table + length > valid->limit || length < 16 + 12 * num_groups )
-+ if ( length > (FT_ULong)( valid->limit - table ) ||
-+ length < 16 + 12 * num_groups )
- FT_INVALID_TOO_SHORT;
-
- /* check groups, they must be in increasing order */
-@@ -2429,7 +2431,8 @@
- FT_ULong num_selectors = TT_NEXT_ULONG( p );
-
-
-- if ( table + length > valid->limit || length < 10 + 11 * num_selectors )
-+ if ( length > (FT_ULong)( valid->limit - table ) ||
-+ length < 10 + 11 * num_selectors )
- FT_INVALID_TOO_SHORT;
-
- /* check selectors, they must be in increasing order */
-@@ -2491,7 +2494,7 @@
- FT_ULong i, lastUni = 0;
-
-
-- if ( ndp + numMappings * 4 > valid->limit )
-+ if ( numMappings * 4 > (FT_ULong)( valid->limit - ndp ) )
- FT_INVALID_TOO_SHORT;
-
- for ( i = 0; i < numMappings; ++i )
diff --git a/print/freetype2/files/patch-src-smooth_ftsmooth.c b/print/freetype2/files/patch-src-smooth_ftsmooth.c
deleted file mode 100644
index ce0f3622bb5a..000000000000
--- a/print/freetype2/files/patch-src-smooth_ftsmooth.c
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c
-index a6db504..cacc490 100644
---- src/smooth/ftsmooth.c
-+++ src/smooth/ftsmooth.c
-@@ -153,7 +153,7 @@
- slot->internal->flags &= ~FT_GLYPH_OWN_BITMAP;
- }
-
-- /* allocate new one, depends on pixel format */
-+ /* allocate new one */
- pitch = width;
- if ( hmul )
- {
-@@ -194,6 +194,13 @@
-
- #endif
-
-+ if ( pitch > 0xFFFF || height > 0xFFFF )
-+ {
-+ FT_ERROR(( "ft_smooth_render_generic: glyph too large: %d x %d\n",
-+ width, height ));
-+ return Smooth_Err_Raster_Overflow;
-+ }
-+
- bitmap->pixel_mode = FT_PIXEL_MODE_GRAY;
- bitmap->num_grays = 256;
- bitmap->width = width;
diff --git a/print/libspectre/Makefile b/print/libspectre/Makefile
index 9303a5f869f0..6ceb7fd7759e 100644
--- a/print/libspectre/Makefile
+++ b/print/libspectre/Makefile
@@ -3,11 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/print/libspectre/Makefile,v 1.2 2008/03/13 16:30:50 ahze Exp $
+# $MCom: ports/print/libspectre/Makefile,v 1.4 2009/10/19 20:04:37 kwm Exp $
PORTNAME= libspectre
-PORTVERSION= 0.2.2
-PORTREVISION= 1
+PORTVERSION= 0.2.3
CATEGORIES= print
MASTER_SITES= http://libspectre.freedesktop.org/releases/
diff --git a/print/libspectre/distinfo b/print/libspectre/distinfo
index 5c446e70ffe2..a2603a21ee46 100644
--- a/print/libspectre/distinfo
+++ b/print/libspectre/distinfo
@@ -1,3 +1,3 @@
-MD5 (libspectre-0.2.2.tar.gz) = 0600653653d9313e3be135b2217ea7fd
-SHA256 (libspectre-0.2.2.tar.gz) = 94d4e7b5916f925f992380237bc6ac9227291531b4cd18a21df54caef147f704
-SIZE (libspectre-0.2.2.tar.gz) = 391727
+MD5 (libspectre-0.2.3.tar.gz) = 9c5867e970d1bad5f80809bfdb4306c1
+SHA256 (libspectre-0.2.3.tar.gz) = 0cc4e30b9379a383894e2559c5e2125dd90f814106b4628459d90db9b5ac8b41
+SIZE (libspectre-0.2.3.tar.gz) = 352308
diff --git a/security/Makefile b/security/Makefile
index ebc2f14c36f1..3792cfa84138 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -151,6 +151,7 @@
SUBDIR += gag
SUBDIR += gambas2-gb-crypt
SUBDIR += gcipher
+ SUBDIR += gir-repository-gnome-keyring
SUBDIR += gnome-gpg
SUBDIR += gnome-keyring
SUBDIR += gnome-password-generator
diff --git a/security/gir-repository-gnome-keyring/Makefile b/security/gir-repository-gnome-keyring/Makefile
new file mode 100644
index 000000000000..05f9408a1d9b
--- /dev/null
+++ b/security/gir-repository-gnome-keyring/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-gnome-keyring
+# Date created: 12 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/security/gir-repository-gnome-keyring/Makefile,v 1.1 2009/09/16 02:05:12 avl Exp $
+#
+
+CATEGORIES= security
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -gnome-keyring
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index ae3f961f4f49..6f6fb4065821 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-stable/security/gnome-keyring/Makefile,v 1.3 2009/04/20 00:24:30 marcus Exp $
+# $MCom: ports/security/gnome-keyring/Makefile,v 1.85 2009/10/18 13:46:28 avl Exp $
#
PORTNAME= gnome-keyring
-PORTVERSION= 2.26.3
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A program that keeps passwords and other secrets
LIB_DEPENDS= tasn1.4:${PORTSDIR}/security/libtasn1 \
- gcrypt.16:${PORTSDIR}/security/libgcrypt
+ gcrypt.16:${PORTSDIR}/security/libgcrypt
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix gtk20 ltverhack intlhack gconf2
@@ -30,15 +29,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= gnome-keyring.schemas
-OPTIONS= HAL "Use HAL for keys on removable drives" on
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_HAL)
-LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
-CONFIGURE_ARGS+=--enable-hal
-.else
-CONFIGURE_ARGS+=--disable-hal
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index a5ac9a98bfbe..7c047bb5a2de 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-2.26.3.tar.bz2) = d7639185dce46c26cf2e7d2a75028f78
-SHA256 (gnome2/gnome-keyring-2.26.3.tar.bz2) = 319eef68f9c82225dcce06d2f6cfda9196da66a799459b8a00da9bb490529539
-SIZE (gnome2/gnome-keyring-2.26.3.tar.bz2) = 2692915
+MD5 (gnome2/gnome-keyring-2.28.1.tar.bz2) = 1139f46c99a1b0c01009ed2eae3f4a0a
+SHA256 (gnome2/gnome-keyring-2.28.1.tar.bz2) = 549a85092d4bbd08cbae4becd9be0a9f40f371498303eda1aa9aa3a27458aa91
+SIZE (gnome2/gnome-keyring-2.28.1.tar.bz2) = 2759424
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index 25da7d59382f..95a3ba266728 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -135,6 +135,7 @@ share/locale/eu/LC_MESSAGES/gnome-keyring.mo
share/locale/fa/LC_MESSAGES/gnome-keyring.mo
share/locale/fi/LC_MESSAGES/gnome-keyring.mo
share/locale/fr/LC_MESSAGES/gnome-keyring.mo
+share/locale/ga/LC_MESSAGES/gnome-keyring.mo
share/locale/gl/LC_MESSAGES/gnome-keyring.mo
share/locale/gu/LC_MESSAGES/gnome-keyring.mo
share/locale/he/LC_MESSAGES/gnome-keyring.mo
diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile
index 662b039be0ca..d05884bb61bb 100644
--- a/security/seahorse-plugins/Makefile
+++ b/security/seahorse-plugins/Makefile
@@ -3,12 +3,11 @@
# Whom: Dave McKay <dave@mu.org>
#
# $FreeBSD$
-# $MCom: ports-stable/security/seahorse-plugins/Makefile,v 1.1 2009/04/15 10:36:03 kwm Exp $
+# $MCom: ports/security/seahorse-plugins/Makefile,v 1.18 2009/10/19 10:24:17 kwm Exp $
#
PORTNAME= seahorse-plugins
-PORTVERSION= 2.26.2
-PORTREVISION= 3
+PORTVERSION= 2.28.1
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -29,10 +28,10 @@ INSTALLS_OMF= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-OPTIONS= EPIPHANY "Enable Epiphany plug-in support" on \
- NAUTILUS "Enable the Nautilus component" on \
+OPTIONS= NAUTILUS "Enable the Nautilus component" on \
GEDIT "Enable GEdit plug-in support" on \
APPLET "Enable clipboard encryption applet" on
+#EPIPHANY "Enable Epiphany plug-in support" on
GCONF_SCHEMAS= seahorse-plugins.schemas
MAN1= seahorse-agent.1 seahorse-tool.1
@@ -63,14 +62,14 @@ PLIST_SUB+= NAUTILUS="@comment "
CONFIGURE_ARGS+=--disable-nautilus
.endif
-.if !defined(WITHOUT_EPIPHANY)
-BUILD_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany
-RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany
-PLIST_SUB+= EPIPHANY="" EPHY_VERSION="2.26"
-.else
+#.if !defined(WITHOUT_EPIPHANY)
+#BUILD_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany
+#RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany
+#PLIST_SUB+= EPIPHANY="" EPHY_VERSION="2.26"
+#.else
CONFIGURE_ARGS+=--disable-epiphany
PLIST_SUB+= EPHY="@comment "
-.endif
+#.endif
.if !defined(WITHOUT_APPLET)
USE_GNOME+= gnomepanel
diff --git a/security/seahorse-plugins/distinfo b/security/seahorse-plugins/distinfo
index 50e2cd085a02..f8ddd7b776cb 100644
--- a/security/seahorse-plugins/distinfo
+++ b/security/seahorse-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seahorse-plugins-2.26.2.tar.bz2) = 36b51b866fc729526f1be86bb0db7370
-SHA256 (gnome2/seahorse-plugins-2.26.2.tar.bz2) = c98fd6c0cf35b1628fa758d31da3f4f53d8861ec41ddee361256ff27f7b2cdb0
-SIZE (gnome2/seahorse-plugins-2.26.2.tar.bz2) = 1318153
+MD5 (gnome2/seahorse-plugins-2.28.1.tar.bz2) = cec5ef8b94c16798f53a5876d3718b91
+SHA256 (gnome2/seahorse-plugins-2.28.1.tar.bz2) = e04f9bba2d0527951cb15367e285d0f75de6392b140ca4183a70cec3fef7e97e
+SIZE (gnome2/seahorse-plugins-2.28.1.tar.bz2) = 1315429
diff --git a/security/seahorse-plugins/pkg-plist b/security/seahorse-plugins/pkg-plist
index 1ff664f8cc7b..ece59b733c39 100644
--- a/security/seahorse-plugins/pkg-plist
+++ b/security/seahorse-plugins/pkg-plist
@@ -1,10 +1,10 @@
bin/seahorse-agent
bin/seahorse-preferences
bin/seahorse-tool
-%%EPIPHANY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.a
-%%EPIPHANY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.la
-%%EPIPHANY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.so
-%%EPIPHANY%%lib/epiphany/%%EPHY_VERSION%%/extensions/seahorse.ephy-extension
+%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.a
+%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.la
+%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.so
+%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/seahorse.ephy-extension
%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.a
%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.la
%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.so
@@ -51,7 +51,9 @@ share/locale/be@latin/LC_MESSAGES/seahorse-plugins.mo
share/locale/bg/LC_MESSAGES/seahorse-plugins.mo
share/locale/bn/LC_MESSAGES/seahorse-plugins.mo
share/locale/bn_IN/LC_MESSAGES/seahorse-plugins.mo
+share/locale/br/LC_MESSAGES/seahorse-plugins.mo
share/locale/ca/LC_MESSAGES/seahorse-plugins.mo
+share/locale/ca@valencia/LC_MESSAGES/seahorse-plugins.mo
share/locale/cs/LC_MESSAGES/seahorse-plugins.mo
share/locale/da/LC_MESSAGES/seahorse-plugins.mo
share/locale/de/LC_MESSAGES/seahorse-plugins.mo
@@ -78,6 +80,7 @@ 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/mai/LC_MESSAGES/seahorse-plugins.mo
share/locale/mk/LC_MESSAGES/seahorse-plugins.mo
share/locale/ml/LC_MESSAGES/seahorse-plugins.mo
share/locale/mr/LC_MESSAGES/seahorse-plugins.mo
@@ -176,7 +179,7 @@ share/pixmaps/seahorse-plugins/scalable/seahorse-sign.svg
%%DATADIR%%/glade/seahorse-notify.glade
%%DATADIR%%/glade/seahorse-prefs.glade
%%DATADIR%%/glade/seahorse-progress.glade
-%%EPIPHANY%%@dirrmtry lib/epiphany/%%EPHY_VERSION%%/extensions
+%%EPHY%%@dirrmtry lib/epiphany/%%EPHY_VERSION%%/extensions
@dirrm %%DATADIR%%/glade
@dirrm %%DATADIR%%
@dirrmtry share/pixmaps/seahorse-plugins/scalable
@@ -227,10 +230,14 @@ 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/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
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 56c3406a2513..f66c48d80eb2 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -3,12 +3,11 @@
# Whom: Dave McKay <dave@mu.org>
#
# $FreeBSD$
-# $MCom: ports-stable/security/seahorse/Makefile,v 1.5 2009/04/20 00:55:09 marcus Exp $
+# $MCom: ports/security/seahorse/Makefile,v 1.88 2009/10/18 02:38:21 avl Exp $
#
PORTNAME= seahorse
-PORTVERSION= 2.26.2
-PORTREVISION= 2
+PORTVERSION= 2.28.1
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -28,7 +27,7 @@ USE_LDCONFIG= yes
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
+USE_GNOME= gnomehack intlhack gnomeprefix gconf2 gnomedocutils
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index fce202f2b321..ee99c6c64910 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seahorse-2.26.2.tar.bz2) = c5126bd7ddfda3317daa71c06f261034
-SHA256 (gnome2/seahorse-2.26.2.tar.bz2) = ab73a7c918afd9f111b6078750328d0a4b82f2f6644e3fa04582f58d81238dce
-SIZE (gnome2/seahorse-2.26.2.tar.bz2) = 2196810
+MD5 (gnome2/seahorse-2.28.1.tar.bz2) = c49d4d9bcfe7620081df517ab939f67b
+SHA256 (gnome2/seahorse-2.28.1.tar.bz2) = 67a1ae5eaceca6306a6a740c8753c5a6c4b511cfbf8a8031a78ae61297ced0a0
+SIZE (gnome2/seahorse-2.28.1.tar.bz2) = 2397687
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index 27d42742fa4d..a15a34c04cc4 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -34,11 +34,58 @@ share/doc/libcryptui/libcryptui.devhelp2
share/doc/libcryptui/right.png
share/doc/libcryptui/style.css
share/doc/libcryptui/up.png
+share/doc/libseahorse/api-index-full.html
+share/doc/libseahorse/ch01.html
+share/doc/libseahorse/home.png
+share/doc/libseahorse/index.html
+share/doc/libseahorse/index.sgml
+share/doc/libseahorse/left.png
+share/doc/libseahorse/libseahorse-SeahorseCommands.html
+share/doc/libseahorse/libseahorse-SeahorseContext.html
+share/doc/libseahorse/libseahorse-SeahorseKeyserverControl.html
+share/doc/libseahorse/libseahorse-SeahorseMultiOperation.html
+share/doc/libseahorse/libseahorse-SeahorseObject.html
+share/doc/libseahorse/libseahorse-SeahorseObjectModel.html
+share/doc/libseahorse/libseahorse-SeahorseObjectWidget.html
+share/doc/libseahorse/libseahorse-SeahorseSecureEntry.html
+share/doc/libseahorse/libseahorse-SeahorseServiceDiscovery.html
+share/doc/libseahorse/libseahorse-SeahorseSet.html
+share/doc/libseahorse/libseahorse-SeahorseSetModel.html
+share/doc/libseahorse/libseahorse-SeahorseUnknown.html
+share/doc/libseahorse/libseahorse-SeahorseUnknownSource.html
+share/doc/libseahorse/libseahorse-SeahorseWidget.html
+share/doc/libseahorse/libseahorse-SeahorseXxx.html
+share/doc/libseahorse/libseahorse-seahorse-check-button-control.html
+share/doc/libseahorse/libseahorse-seahorse-combo-keys.html
+share/doc/libseahorse/libseahorse-seahorse-gconf.html
+share/doc/libseahorse/libseahorse-seahorse-gtkstock.html
+share/doc/libseahorse/libseahorse-seahorse-libdialogs.html
+share/doc/libseahorse/libseahorse-seahorse-marshal.html
+share/doc/libseahorse/libseahorse-seahorse-passphrase.html
+share/doc/libseahorse/libseahorse-seahorse-prefs.html
+share/doc/libseahorse/libseahorse-seahorse-progress.html
+share/doc/libseahorse/libseahorse-seahorse-secure-memory.html
+share/doc/libseahorse/libseahorse-seahorse-servers.html
+share/doc/libseahorse/libseahorse-seahorse-source.html
+share/doc/libseahorse/libseahorse-seahorse-transfer-operation.html
+share/doc/libseahorse/libseahorse-seahorse-types.html
+share/doc/libseahorse/libseahorse-seahorse-unix-signal.html
+share/doc/libseahorse/libseahorse-seahorse-util.html
+share/doc/libseahorse/libseahorse-seahorse-validity.html
+share/doc/libseahorse/libseahorse-seahorse-view.html
+share/doc/libseahorse/libseahorse.devhelp
+share/doc/libseahorse/libseahorse.devhelp2
+share/doc/libseahorse/object-tree.html
+share/doc/libseahorse/right.png
+share/doc/libseahorse/style.css
+share/doc/libseahorse/up.png
share/gnome/help/seahorse/C/figures/seahorse-window.png
share/gnome/help/seahorse/C/legal.xml
share/gnome/help/seahorse/C/seahorse.xml
share/gnome/help/seahorse/ca/figures/seahorse-window.png
share/gnome/help/seahorse/ca/seahorse.xml
+share/gnome/help/seahorse/cs/figures/seahorse-window.png
+share/gnome/help/seahorse/cs/seahorse.xml
share/gnome/help/seahorse/de/figures/seahorse-window.png
share/gnome/help/seahorse/de/seahorse.xml
share/gnome/help/seahorse/el/figures/seahorse-window.png
@@ -78,8 +125,11 @@ share/locale/be@latin/LC_MESSAGES/seahorse.mo
share/locale/bg/LC_MESSAGES/seahorse.mo
share/locale/bn/LC_MESSAGES/seahorse.mo
share/locale/bn_IN/LC_MESSAGES/seahorse.mo
+share/locale/br/LC_MESSAGES/seahorse.mo
share/locale/ca/LC_MESSAGES/seahorse.mo
+share/locale/ca@valencia/LC_MESSAGES/seahorse.mo
share/locale/cs/LC_MESSAGES/seahorse.mo
+share/locale/cy/LC_MESSAGES/seahorse.mo
share/locale/da/LC_MESSAGES/seahorse.mo
share/locale/de/LC_MESSAGES/seahorse.mo
share/locale/dz/LC_MESSAGES/seahorse.mo
@@ -105,6 +155,7 @@ 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
+share/locale/mai/LC_MESSAGES/seahorse.mo
share/locale/mk/LC_MESSAGES/seahorse.mo
share/locale/ml/LC_MESSAGES/seahorse.mo
share/locale/mr/LC_MESSAGES/seahorse.mo
@@ -139,6 +190,7 @@ 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-cs.omf
share/omf/seahorse/seahorse-de.omf
share/omf/seahorse/seahorse-el.omf
share/omf/seahorse/seahorse-en_GB.omf
@@ -176,34 +228,35 @@ share/pixmaps/seahorse/scalable/seahorse-sign-bad.svg
share/pixmaps/seahorse/scalable/seahorse-sign-ok.svg
share/pixmaps/seahorse/scalable/seahorse-sign-unknown.svg
share/pixmaps/seahorse/scalable/seahorse-sign.svg
-%%DATADIR%%/glade/seahorse-add-keyring.glade
-%%DATADIR%%/glade/seahorse-add-keyserver.glade
-%%DATADIR%%/glade/seahorse-add-subkey.glade
-%%DATADIR%%/glade/seahorse-add-uid.glade
-%%DATADIR%%/glade/seahorse-change-passphrase.glade
-%%DATADIR%%/glade/seahorse-expires.glade
-%%DATADIR%%/glade/seahorse-generate-select.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
-%%DATADIR%%/glade/seahorse-keyserver-results.ui
-%%DATADIR%%/glade/seahorse-keyserver-search.glade
-%%DATADIR%%/glade/seahorse-keyserver-sync.glade
-%%DATADIR%%/glade/seahorse-notify.glade
-%%DATADIR%%/glade/seahorse-pgp-generate.glade
-%%DATADIR%%/glade/seahorse-pgp-private-key-properties.glade
-%%DATADIR%%/glade/seahorse-pgp-public-key-properties.glade
-%%DATADIR%%/glade/seahorse-prefs.glade
-%%DATADIR%%/glade/seahorse-progress.glade
-%%DATADIR%%/glade/seahorse-revoke.glade
-%%DATADIR%%/glade/seahorse-sign.glade
-%%DATADIR%%/glade/seahorse-signer.glade
-%%DATADIR%%/glade/seahorse-ssh-generate.glade
-%%DATADIR%%/glade/seahorse-ssh-key-properties.glade
-%%DATADIR%%/glade/seahorse-ssh-upload.glade
-@dirrm %%DATADIR%%/glade
+%%DATADIR%%/ui/seahorse-add-keyring.xml
+%%DATADIR%%/ui/seahorse-add-keyserver.xml
+%%DATADIR%%/ui/seahorse-add-subkey.xml
+%%DATADIR%%/ui/seahorse-add-uid.xml
+%%DATADIR%%/ui/seahorse-change-passphrase.xml
+%%DATADIR%%/ui/seahorse-expires.xml
+%%DATADIR%%/ui/seahorse-generate-select.xml
+%%DATADIR%%/ui/seahorse-gkr-add-item.xml
+%%DATADIR%%/ui/seahorse-gkr-item-properties.xml
+%%DATADIR%%/ui/seahorse-gkr-keyring.xml
+%%DATADIR%%/ui/seahorse-key-manager.ui
+%%DATADIR%%/ui/seahorse-key-manager.xml
+%%DATADIR%%/ui/seahorse-keyserver-results.ui
+%%DATADIR%%/ui/seahorse-keyserver-results.xml
+%%DATADIR%%/ui/seahorse-keyserver-search.xml
+%%DATADIR%%/ui/seahorse-keyserver-sync.xml
+%%DATADIR%%/ui/seahorse-notify.xml
+%%DATADIR%%/ui/seahorse-pgp-generate.xml
+%%DATADIR%%/ui/seahorse-pgp-private-key-properties.xml
+%%DATADIR%%/ui/seahorse-pgp-public-key-properties.xml
+%%DATADIR%%/ui/seahorse-prefs.xml
+%%DATADIR%%/ui/seahorse-progress.xml
+%%DATADIR%%/ui/seahorse-revoke.xml
+%%DATADIR%%/ui/seahorse-sign.xml
+%%DATADIR%%/ui/seahorse-signer.xml
+%%DATADIR%%/ui/seahorse-ssh-generate.xml
+%%DATADIR%%/ui/seahorse-ssh-key-properties.xml
+%%DATADIR%%/ui/seahorse-ssh-upload.xml
+@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%
@dirrm share/pixmaps/seahorse/scalable
@dirrm share/pixmaps/seahorse/48x48
@@ -232,11 +285,14 @@ share/pixmaps/seahorse/scalable/seahorse-sign.svg
@dirrm share/gnome/help/seahorse/el
@dirrm share/gnome/help/seahorse/de/figures
@dirrm share/gnome/help/seahorse/de
+@dirrm share/gnome/help/seahorse/cs/figures
+@dirrm share/gnome/help/seahorse/cs
@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/libseahorse
@dirrm share/doc/libcryptui
@dirrmtry share/applications
@dirrm lib/seahorse
@@ -255,10 +311,14 @@ share/pixmaps/seahorse/scalable/seahorse-sign.svg
@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/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
diff --git a/security/tuntun/Makefile b/security/tuntun/Makefile
index 0d1800f377b9..5fa9d2ba9567 100644
--- a/security/tuntun/Makefile
+++ b/security/tuntun/Makefile
@@ -14,6 +14,8 @@ MASTER_SITES= http://tuntun.googlecode.com/files/
MAINTAINER= anderson@cnpm.embrapa.br
COMMENT= A Gnome applet gui for OpenVPN
+BROKEN= Conflict between shipped code and glib.
+
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \
LIBS="`pkg-config --libs libgnomeui-2.0`"
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 4f71e0479537..1b3b7fdbd38d 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -613,6 +613,8 @@
SUBDIR += policykit-gnome
SUBDIR += policykit-kde
SUBDIR += policykit-qt
+ SUBDIR += polkit
+ SUBDIR += polkit-gnome
SUBDIR += powerman
SUBDIR += prips
SUBDIR += procmap
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 633e3b058896..adaf83fc279b 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/brasero/Makefile,v 1.1 2009/04/16 02:11:50 kwm Exp $
+# $MCom: ports/sysutils/brasero/Makefile,v 1.59 2009/10/24 01:52:39 avl Exp $
PORTNAME= brasero
-PORTVERSION= 2.26.3
+PORTVERSION= 2.28.2
PORTREVISION= 1
CATEGORIES= sysutils audio multimedia gnome
MASTER_SITES= GNOME
@@ -16,9 +16,10 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= CD/DVD mastering tool for the GNOME desktop
LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \
+ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser
RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
- cdrdao:${PORTSDIR}/sysutils/cdrdao
+ cdrdao:${PORTSDIR}/sysutils/cdrdao
USE_GETTEXT= yes
USE_BZIP2= yes
@@ -26,6 +27,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_XORG= sm
USE_GNOME= intlhack gnomeprefix gnomehack
+USE_LDCONFIG= yes
USE_GSTREAMER= gconf core
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo
index fbd7306beaa4..ad6a5f30bcd4 100644
--- a/sysutils/brasero/distinfo
+++ b/sysutils/brasero/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/brasero-2.26.3.tar.bz2) = edf1b2b489a4686b84674dc7dbbd8130
-SHA256 (gnome2/brasero-2.26.3.tar.bz2) = a426e4d451a271137bd1c9fe246e7631f8e98276694ce136529d66810e1dfd91
-SIZE (gnome2/brasero-2.26.3.tar.bz2) = 3312144
+MD5 (gnome2/brasero-2.28.2.tar.bz2) = 7a6ab4befeadbc2ad21bd1195a840097
+SHA256 (gnome2/brasero-2.28.2.tar.bz2) = 7c3493b1f4e90b4b9a4bcf155c1cd85142bb24a038cc5baa8defdad8526650df
+SIZE (gnome2/brasero-2.28.2.tar.bz2) = 4072165
diff --git a/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c b/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c
new file mode 100644
index 000000000000..e342112f8562
--- /dev/null
+++ b/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c
@@ -0,0 +1,27 @@
+--- libbrasero-media/scsi-cam.c.orig 2009-09-25 10:39:03.000000000 -0400
++++ libbrasero-media/scsi-cam.c 2009-10-10 13:30:06.000000000 -0400
+@@ -184,6 +184,8 @@ brasero_device_handle_open (const gchar
+ handle->fd = fd;
+ }
+ else {
++ int serrno;
++
+ if (code) {
+ if (errno == EAGAIN
+ || errno == EWOULDBLOCK
+@@ -193,6 +195,15 @@ brasero_device_handle_open (const gchar
+ *code = BRASERO_SCSI_ERRNO;
+ }
+
++ serrno = errno;
++
++ if (fd > -1)
++ close (fd);
++ if (cam)
++ cam_close_device (cam);
++
++ errno = serrno;
++
+ return NULL;
+ }
+
diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist
index 77bd332af63a..cef48951df4e 100644
--- a/sysutils/brasero/pkg-plist
+++ b/sysutils/brasero/pkg-plist
@@ -1,10 +1,33 @@
bin/brasero
+include/brasero/brasero-blank-dialog.h
+include/brasero/brasero-burn-dialog.h
+include/brasero/brasero-burn-lib.h
+include/brasero/brasero-burn-options.h
+include/brasero/brasero-burn.h
include/brasero/brasero-drive-selection.h
include/brasero/brasero-drive.h
+include/brasero/brasero-enums.h
+include/brasero/brasero-error.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-session-cfg.h
+include/brasero/brasero-session-span.h
+include/brasero/brasero-session.h
+include/brasero/brasero-status.h
+include/brasero/brasero-sum-dialog.h
+include/brasero/brasero-tags.h
+include/brasero/brasero-tool-dialog.h
+include/brasero/brasero-track-data-cfg.h
+include/brasero/brasero-track-data.h
+include/brasero/brasero-track-disc.h
+include/brasero/brasero-track-image-cfg.h
+include/brasero/brasero-track-image.h
+include/brasero/brasero-track-stream-cfg.h
+include/brasero/brasero-track-stream.h
+include/brasero/brasero-track-type.h
+include/brasero/brasero-track.h
include/brasero/brasero-units.h
include/brasero/brasero-volume.h
lib/brasero/plugins/libbrasero-burn-uri.la
@@ -51,18 +74,77 @@ 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-burn.la
+lib/libbrasero-burn.so
+lib/libbrasero-burn.so.2
lib/libbrasero-media.la
lib/libbrasero-media.so
-lib/libbrasero-media.so.1
+lib/libbrasero-media.so.2
+lib/libbrasero-utils.la
+lib/libbrasero-utils.so
+lib/libbrasero-utils.so.2
%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-brasero-extension.la
%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-brasero-extension.so
+libdata/pkgconfig/libbrasero-burn.pc
libdata/pkgconfig/libbrasero-media.pc
share/applications/brasero.desktop
share/applications/brasero-copy-medium.desktop
%%NAUTILUS%%share/applications/brasero-nautilus.desktop
-share/applications/brasero-open-image.desktop
-share/applications/brasero-open-playlist.desktop
-share/applications/brasero-open-project.desktop
+share/doc/libbrasero-burn/api-index-full.html
+share/doc/libbrasero-burn/ch01.html
+share/doc/libbrasero-burn/home.png
+share/doc/libbrasero-burn/index.html
+share/doc/libbrasero-burn/index.sgml
+share/doc/libbrasero-burn/left.png
+share/doc/libbrasero-burn/libbrasero-burn-BraseroBlankDialog.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroBurn.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroBurnDialog.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroBurnOptions.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroBurnSession.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroSessionCfg.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroSessionSpan.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroSumDialog.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroToolDialog.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroTrack.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackData.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackDataCfg.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackDisc.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackImage.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackImageCfg.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackStream.html
+share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackStreamCfg.html
+share/doc/libbrasero-burn/libbrasero-burn-brasero-burn-lib.html
+share/doc/libbrasero-burn/libbrasero-burn-brasero-enums.html
+share/doc/libbrasero-burn/libbrasero-burn-brasero-error.html
+share/doc/libbrasero-burn/libbrasero-burn-brasero-status.html
+share/doc/libbrasero-burn/libbrasero-burn-brasero-tags.html
+share/doc/libbrasero-burn/libbrasero-burn-brasero-track-type.html
+share/doc/libbrasero-burn/libbrasero-burn.devhelp
+share/doc/libbrasero-burn/libbrasero-burn.devhelp2
+share/doc/libbrasero-burn/object-tree.html
+share/doc/libbrasero-burn/right.png
+share/doc/libbrasero-burn/style.css
+share/doc/libbrasero-burn/up.png
+share/doc/libbrasero-media/api-index-full.html
+share/doc/libbrasero-media/ch01.html
+share/doc/libbrasero-media/home.png
+share/doc/libbrasero-media/index.html
+share/doc/libbrasero-media/index.sgml
+share/doc/libbrasero-media/left.png
+share/doc/libbrasero-media/libbrasero-media-BraseroDrive.html
+share/doc/libbrasero-media/libbrasero-media-BraseroDriveSelection.html
+share/doc/libbrasero-media/libbrasero-media-BraseroMedium.html
+share/doc/libbrasero-media/libbrasero-media-BraseroMediumMonitor.html
+share/doc/libbrasero-media/libbrasero-media-BraseroMediumSelection.html
+share/doc/libbrasero-media/libbrasero-media-BraseroVolume.html
+share/doc/libbrasero-media/libbrasero-media-brasero-media.html
+share/doc/libbrasero-media/libbrasero-media-brasero-units.html
+share/doc/libbrasero-media/libbrasero-media.devhelp
+share/doc/libbrasero-media/libbrasero-media.devhelp2
+share/doc/libbrasero-media/object-tree.html
+share/doc/libbrasero-media/right.png
+share/doc/libbrasero-media/style.css
+share/doc/libbrasero-media/up.png
%%DATADIR%%/icons/hicolor/16x16/actions/insert-pause.png
%%DATADIR%%/icons/hicolor/16x16/actions/iso-image-burn.png
%%DATADIR%%/icons/hicolor/16x16/actions/iso-image-new.png
@@ -218,29 +300,13 @@ 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
share/gnome/help/brasero/ca/brasero.xml
share/gnome/help/brasero/ca/figures/brasero_main.png
+share/gnome/help/brasero/cs/brasero.xml
+share/gnome/help/brasero/cs/figures/brasero_main.png
share/gnome/help/brasero/de/brasero.xml
share/gnome/help/brasero/de/figures/brasero_main.png
share/gnome/help/brasero/el/brasero.xml
@@ -259,6 +325,12 @@ share/gnome/help/brasero/ru/brasero.xml
share/gnome/help/brasero/ru/figures/brasero_main.png
share/gnome/help/brasero/sv/brasero.xml
share/gnome/help/brasero/sv/figures/brasero_main.png
+share/gnome/help/brasero/zh_CN/brasero.xml
+share/gnome/help/brasero/zh_CN/figures/brasero_main.png
+share/gnome/help/brasero/zh_HK/brasero.xml
+share/gnome/help/brasero/zh_HK/figures/brasero_main.png
+share/gnome/help/brasero/zh_TW/brasero.xml
+share/gnome/help/brasero/zh_TW/figures/brasero_main.png
share/icons/hicolor/16x16/apps/brasero.png
share/icons/hicolor/22x22/apps/brasero.png
share/icons/hicolor/24x24/apps/brasero.png
@@ -267,9 +339,14 @@ share/icons/hicolor/48x48/apps/brasero.png
share/icons/hicolor/scalable/apps/brasero.svg
share/locale/ar/LC_MESSAGES/brasero.mo
share/locale/as/LC_MESSAGES/brasero.mo
+share/locale/ast/LC_MESSAGES/brasero.mo
+share/locale/be/LC_MESSAGES/brasero.mo
share/locale/bg/LC_MESSAGES/brasero.mo
+share/locale/bn/LC_MESSAGES/brasero.mo
share/locale/bn_IN/LC_MESSAGES/brasero.mo
+share/locale/br/LC_MESSAGES/brasero.mo
share/locale/ca/LC_MESSAGES/brasero.mo
+share/locale/ca@valencia/LC_MESSAGES/brasero.mo
share/locale/cs/LC_MESSAGES/brasero.mo
share/locale/da/LC_MESSAGES/brasero.mo
share/locale/de/LC_MESSAGES/brasero.mo
@@ -281,6 +358,7 @@ 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/ga/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
@@ -290,8 +368,10 @@ 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/ku/LC_MESSAGES/brasero.mo
share/locale/lt/LC_MESSAGES/brasero.mo
share/locale/lv/LC_MESSAGES/brasero.mo
+share/locale/mai/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
@@ -321,6 +401,7 @@ share/locale/zh_TW/LC_MESSAGES/brasero.mo
share/mime/packages/brasero.xml
share/omf/brasero/brasero-C.omf
share/omf/brasero/brasero-ca.omf
+share/omf/brasero/brasero-cs.omf
share/omf/brasero/brasero-de.omf
share/omf/brasero/brasero-el.omf
share/omf/brasero/brasero-en_GB.omf
@@ -330,7 +411,16 @@ share/omf/brasero/brasero-it.omf
share/omf/brasero/brasero-pl.omf
share/omf/brasero/brasero-ru.omf
share/omf/brasero/brasero-sv.omf
+share/omf/brasero/brasero-zh_CN.omf
+share/omf/brasero/brasero-zh_HK.omf
+share/omf/brasero/brasero-zh_TW.omf
@dirrm share/omf/brasero
+@dirrm share/gnome/help/brasero/zh_TW/figures
+@dirrm share/gnome/help/brasero/zh_TW
+@dirrm share/gnome/help/brasero/zh_HK/figures
+@dirrm share/gnome/help/brasero/zh_HK
+@dirrm share/gnome/help/brasero/zh_CN/figures
+@dirrm share/gnome/help/brasero/zh_CN
@dirrm share/gnome/help/brasero/sv/figures
@dirrm share/gnome/help/brasero/sv
@dirrm share/gnome/help/brasero/ru/figures
@@ -349,12 +439,13 @@ share/omf/brasero/brasero-sv.omf
@dirrm share/gnome/help/brasero/el
@dirrm share/gnome/help/brasero/de/figures
@dirrm share/gnome/help/brasero/de
+@dirrm share/gnome/help/brasero/cs/figures
+@dirrm share/gnome/help/brasero/cs
@dirrm share/gnome/help/brasero/ca/figures
@dirrm share/gnome/help/brasero/ca
@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
@@ -375,6 +466,8 @@ share/omf/brasero/brasero-sv.omf
@dirrm %%DATADIR%%/icons/hicolor
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%
+@dirrm share/doc/libbrasero-media
+@dirrm share/doc/libbrasero-burn
@dirrmtry share/applications
@dirrm lib/brasero/plugins
@dirrm lib/brasero
@@ -395,9 +488,15 @@ share/omf/brasero/brasero-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
@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/as/LC_MESSAGES
-@dirrmtry share/locale/as
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index 3e9e623fddb9..a4e9c69e7f53 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -3,20 +3,20 @@
# Whom: Florent Thoumie <flz@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/consolekit/Makefile,v 1.2 2009/04/18 22:09:26 marcus Exp $
+# $MCom: ports/sysutils/consolekit/Makefile,v 1.23 2009/09/26 12:32:45 kwm Exp $
PORTNAME= consolekit
-PORTVERSION= 0.3.0
-PORTREVISION= 8
+PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= sysutils gnome
-MASTER_SITES= http://people.freedesktop.org/~mccann/dist/
+MASTER_SITES= http://www.freedesktop.org/software/ConsoleKit/dist/
DISTFILES= ConsoleKit-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Framework for defining and tracking users
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
- polkit.2:${PORTSDIR}/sysutils/policykit
+ polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
WRKSRC= ${WRKDIR}/ConsoleKit-${PORTVERSION}
USE_BZIP2= yes
diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo
index ef1243c68ef1..0dbdd04a2b42 100644
--- a/sysutils/consolekit/distinfo
+++ b/sysutils/consolekit/distinfo
@@ -1,3 +1,3 @@
-MD5 (ConsoleKit-0.3.0.tar.bz2) = 43b02a52212330b54cfb34c4044d9ce0
-SHA256 (ConsoleKit-0.3.0.tar.bz2) = cbcfbb3df2dc76855c99c1cdff04a257ec5270fa62e1d21b0d057b08d88c0fd4
-SIZE (ConsoleKit-0.3.0.tar.bz2) = 393694
+MD5 (ConsoleKit-0.4.1.tar.bz2) = 48eda4483cc97841d5f88e8e003eb6d7
+SHA256 (ConsoleKit-0.4.1.tar.bz2) = f032adc6146d745034315054c5822a7a09f30e20a40d6e802221fa977354403e
+SIZE (ConsoleKit-0.4.1.tar.bz2) = 398080
diff --git a/sysutils/consolekit/files/patch-data_ConsoleKit.conf b/sysutils/consolekit/files/patch-data_ConsoleKit.conf
deleted file mode 100644
index 9a3e97aa95c5..000000000000
--- a/sysutils/consolekit/files/patch-data_ConsoleKit.conf
+++ /dev/null
@@ -1,20 +0,0 @@
---- data/ConsoleKit.conf.orig 2008-04-19 01:39:49.000000000 -0400
-+++ data/ConsoleKit.conf 2009-04-17 01:51:54.000000000 -0400
-@@ -32,6 +32,8 @@
- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
- send_member="GetSeats"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+ send_member="GetSessions"/>
-+ <allow send_interface="org.freedesktop.ConsoleKit.Manager"
- send_member="GetSessionForCookie"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
- send_member="GetSessionForUnixProcess"/>
-@@ -91,6 +93,8 @@
- send_member="GetIdleHint"/>
- <allow send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="GetIdleSinceHint"/>
-+ <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ send_member="SetIdleHint"/>
- </policy>
-
- </busconfig>
diff --git a/sysutils/consolekit/files/patch-src_ck-run-programs.c b/sysutils/consolekit/files/patch-src_ck-run-programs.c
deleted file mode 100644
index f5de90d10e0c..000000000000
--- a/sysutils/consolekit/files/patch-src_ck-run-programs.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/ck-run-programs.c.orig 2009-04-04 20:55:11.000000000 -0400
-+++ src/ck-run-programs.c 2009-04-04 20:55:39.000000000 -0400
-@@ -225,6 +225,7 @@ ck_run_programs (const char *dirpath,
- out_loop:
- g_free (child_argv[0]);
- }
-+ g_dir_close (dir);
- out:
- g_strfreev (env_for_child);
- }
diff --git a/sysutils/consolekit/files/patch-tools_ck-log-system-start.c b/sysutils/consolekit/files/patch-tools_ck-log-system-start.c
new file mode 100644
index 000000000000..0e125ef262d2
--- /dev/null
+++ b/sysutils/consolekit/files/patch-tools_ck-log-system-start.c
@@ -0,0 +1,60 @@
+--- tools/ck-log-system-start.c.orig 2009-09-14 20:08:10.000000000 -0400
++++ tools/ck-log-system-start.c 2009-09-26 01:35:37.000000000 -0400
+@@ -26,6 +26,9 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#ifdef __FreeBSD__
++#include <kenv.h>
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/utsname.h>
+@@ -41,7 +44,9 @@
+
+ #define DEFAULT_LOG_FILENAME LOCALSTATEDIR "/log/ConsoleKit/history"
+
++#ifdef __linux__
+ #define LINUX_KERNEL_CMDLINE "/proc/cmdline"
++#endif
+
+ /* Adapted from auditd auditd-event.c */
+ static gboolean
+@@ -162,6 +167,7 @@ write_log_for_event (CkLogEvent *event)
+ static char *
+ get_boot_arguments (void)
+ {
++#if defined(__linux__)
+ char *contents;
+ gboolean res;
+
+@@ -178,6 +184,29 @@ get_boot_arguments (void)
+ }
+
+ return contents;
++#elif defined(__FreeBSD__)
++ char kern_name[1024], root[1024], mopts[1024];
++ char *options;
++
++ options = NULL;
++ if (kenv(KENV_GET, "kernelname", kern_name, sizeof (kern_name)) == -1) {
++ return options;
++ }
++
++ if (kenv(KENV_GET, "vfs.root.mountfrom.options", mopts, sizeof (mopts)) == -1) {
++ g_strlcpy (mopts, "ro", sizeof (mopts));
++ }
++
++ if (kenv(KENV_GET, "vfs.root.mountfrom", root, sizeof (root)) == -1) {
++ g_strlcpy (root, "/", sizeof (root));
++ }
++
++ options = g_strdup_printf ("%s %s root=%s", mopts, kern_name, root);
++
++ return options;
++#else
++ return NULL;
++#endif
+ }
+
+ int
diff --git a/sysutils/consolekit/pkg-plist b/sysutils/consolekit/pkg-plist
index 01d42a80cbdc..52e05ed984f2 100644
--- a/sysutils/consolekit/pkg-plist
+++ b/sysutils/consolekit/pkg-plist
@@ -17,20 +17,23 @@ libexec/ck-collect-session-info
libexec/ck-get-x11-display-device
libexec/ck-get-x11-server-pid
sbin/console-kit-daemon
-share/PolicyKit/policy/org.freedesktop.consolekit.policy
share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml
share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml
share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml
share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
+share/polkit-1/actions/org.freedesktop.consolekit.policy
@exec mkdir -p %D/etc/ConsoleKit/run-session.d
+@exec mkdir -p %D/etc/ConsoleKit/run-seat.d
@exec mkdir -p %D/lib/ConsoleKit/run-session.d
@dirrm lib/ConsoleKit/scripts
@dirrmtry lib/ConsoleKit/run-session.d
+@dirrmtry lib/ConsoleKit/run-seat.d
@dirrmtry lib/ConsoleKit
@dirrm include/ConsoleKit/ck-connector
@dirrm include/ConsoleKit
@dirrm etc/ConsoleKit/seats.d
@dirrmtry etc/ConsoleKit/run-session.d
+@dirrmtry etc/ConsoleKit/run-seat.d
@dirrm etc/ConsoleKit
@exec mkdir -p /var/run/ConsoleKit
@exec mkdir -p /var/log/ConsoleKit
diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile
index dd22d096c4c6..c31cc6b1a342 100644
--- a/sysutils/eiciel/Makefile
+++ b/sysutils/eiciel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eiciel
PORTVERSION= 0.9.6.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils security
MASTER_SITES= http://rofi.roger-ferrer.org/eiciel/download/
@@ -17,7 +17,7 @@ COMMENT= A GNOME-based ACL editor, with integration into Nautilus
LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
USE_BZIP2= yes
-USE_GNOME= gnomehack gnomeprefix intlhack nautilus2
+USE_GNOME= gnomehack gnomeprefix intlhack nautilus2 libgnomeui
USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index d69787a44174..0dfd979eafd5 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.76 2009/03/18 04:05:53 marcus Exp $
+# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.79 2009/09/21 18:42:34 kwm Exp $
#
PORTNAME= gconf-editor
-PORTVERSION= 2.26.0
-PORTREVISION= 1
+PORTVERSION= 2.28.0
PORTEPOCH= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index 55794c7fc31d..ee5f4ddc8035 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/gconf-editor-2.28.0.tar.bz2) = f3f19df4ce47ca27bf69d355f24ac5ba
+SHA256 (gnome2/gconf-editor-2.28.0.tar.bz2) = 35f5256f1a93e872586bb6b8c81f7ebfdd78ab3edcfa508f59f99f0f75a74839
+SIZE (gnome2/gconf-editor-2.28.0.tar.bz2) = 1405006
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index f8ccc624fe97..3ec7408b43ad 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -25,6 +25,14 @@ 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/cs/figures/entry-blank.png
+share/gnome/help/gconf-editor/cs/figures/entry-bool.png
+share/gnome/help/gconf-editor/cs/figures/entry-list.png
+share/gnome/help/gconf-editor/cs/figures/entry-number.png
+share/gnome/help/gconf-editor/cs/figures/entry-schema.png
+share/gnome/help/gconf-editor/cs/figures/entry-string.png
+share/gnome/help/gconf-editor/cs/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/cs/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
@@ -121,6 +129,14 @@ 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/gnome/help/gconf-editor/zh_CN/figures/entry-blank.png
+share/gnome/help/gconf-editor/zh_CN/figures/entry-bool.png
+share/gnome/help/gconf-editor/zh_CN/figures/entry-list.png
+share/gnome/help/gconf-editor/zh_CN/figures/entry-number.png
+share/gnome/help/gconf-editor/zh_CN/figures/entry-schema.png
+share/gnome/help/gconf-editor/zh_CN/figures/entry-string.png
+share/gnome/help/gconf-editor/zh_CN/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/zh_CN/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
@@ -135,6 +151,7 @@ share/locale/bn_IN/LC_MESSAGES/gconf-editor.mo
share/locale/br/LC_MESSAGES/gconf-editor.mo
share/locale/bs/LC_MESSAGES/gconf-editor.mo
share/locale/ca/LC_MESSAGES/gconf-editor.mo
+share/locale/ca@valencia/LC_MESSAGES/gconf-editor.mo
share/locale/cs/LC_MESSAGES/gconf-editor.mo
share/locale/cy/LC_MESSAGES/gconf-editor.mo
share/locale/da/LC_MESSAGES/gconf-editor.mo
@@ -166,6 +183,7 @@ share/locale/ku/LC_MESSAGES/gconf-editor.mo
share/locale/li/LC_MESSAGES/gconf-editor.mo
share/locale/lt/LC_MESSAGES/gconf-editor.mo
share/locale/lv/LC_MESSAGES/gconf-editor.mo
+share/locale/mai/LC_MESSAGES/gconf-editor.mo
share/locale/mg/LC_MESSAGES/gconf-editor.mo
share/locale/mk/LC_MESSAGES/gconf-editor.mo
share/locale/ml/LC_MESSAGES/gconf-editor.mo
@@ -206,6 +224,7 @@ share/locale/zh_HK/LC_MESSAGES/gconf-editor.mo
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-cs.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
@@ -218,7 +237,10 @@ share/omf/gconf-editor/gconf-editor-ru.omf
share/omf/gconf-editor/gconf-editor-sv.omf
share/omf/gconf-editor/gconf-editor-th.omf
share/omf/gconf-editor/gconf-editor-uk.omf
+share/omf/gconf-editor/gconf-editor-zh_CN.omf
@dirrm share/omf/gconf-editor
+@dirrm share/gnome/help/gconf-editor/zh_CN/figures
+@dirrm share/gnome/help/gconf-editor/zh_CN
@dirrm share/gnome/help/gconf-editor/uk/figures
@dirrm share/gnome/help/gconf-editor/uk
@dirrm share/gnome/help/gconf-editor/th/figures
@@ -243,6 +265,8 @@ share/omf/gconf-editor/gconf-editor-uk.omf
@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/cs/figures
+@dirrm share/gnome/help/gconf-editor/cs
@dirrm share/gnome/help/gconf-editor/ca/figures
@dirrm share/gnome/help/gconf-editor/ca
@dirrm share/gnome/help/gconf-editor/C/figures
@@ -276,10 +300,14 @@ share/omf/gconf-editor/gconf-editor-uk.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
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index b111d77c6e7d..636af89ba102 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.189 2009/03/18 00:23:38 kwm Exp $
+# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.198 2009/10/20 00:09:19 kwm Exp $
#
PORTNAME= gnome-control-center
-PORTVERSION= 2.26.0
-PORTREVISION= 2
+PORTVERSION= 2.28.1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,7 +15,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Control center for GNOME 2 project
-LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
+ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
RUN_DEPENDS= gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
@@ -27,18 +27,18 @@ USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GSTREAMER= good
WANT_GNOME= yes
-USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \
- gnomemenus desktopfileutils libgnomekbd gnomepanel
+USE_GNOME= gnomeprefix gnomehack intlhack metacity gnomemenus \
+ desktopfileutils libgnomekbd gnomedesktop librsvg2
USE_XORG= xscrnsaver
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --enable-gstreamer=0.10
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-GCONF_SCHEMAS= control-center.schemas fontilus.schemas
+GCONF_SCHEMAS= control-center.schemas fontilus.schemas \
+ gnome-control-center.schemas
.if defined(PACKAGE_BUILDING)
.undef WITHOUT_GNOME
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 4bd79e50c1e6..bbba4e0ca540 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/gnome-control-center-2.28.1.tar.bz2) = a37a1b5ff4cfce45baef0cf31126d380
+SHA256 (gnome2/gnome-control-center-2.28.1.tar.bz2) = bd1d9a55f810266c38a283baf6a4e92002d35c9366529eb92b25710f3456bbf1
+SIZE (gnome2/gnome-control-center-2.28.1.tar.bz2) = 2287398
diff --git a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
index d0e21a6c33b9..c9b3785448ee 100644
--- a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
+++ b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
@@ -1,20 +1,11 @@
---- capplets/common/gnome-theme-info.c.orig 2008-05-17 12:46:59.000000000 -0400
-+++ capplets/common/gnome-theme-info.c 2008-05-20 18:10:50.000000000 -0400
-@@ -1843,7 +1843,7 @@ gnome_theme_init ()
- g_object_unref (top_theme_dir);
-
- /* The weird /usr/share/icons */
-- top_theme_dir = g_file_new_for_path ("/usr/share/icons");
-+ top_theme_dir = g_file_new_for_path ("%%LOCALBASE%%/lib/X11/icons");
- add_top_icon_theme_dir_monitor (top_theme_dir, 2, NULL);
- g_object_unref (top_theme_dir);
-
-@@ -1857,7 +1857,7 @@ gnome_theme_init ()
+--- capplets/common/gnome-theme-info.c.orig 2009-05-03 20:30:56.000000000 +0200
++++ capplets/common/gnome-theme-info.c 2009-07-19 12:54:25.000000000 +0200
+@@ -1876,7 +1876,7 @@ gnome_theme_init ()
#ifdef XCURSOR_ICONDIR
/* if there's a separate xcursors dir, add that as well */
if (strcmp (XCURSOR_ICONDIR, top_theme_dir_string) &&
- strcmp (XCURSOR_ICONDIR, "/usr/share/icons")) {
+ strcmp (XCURSOR_ICONDIR, "%%LOCALBASE%%/lib/X11/icons")) {
top_theme_dir = g_file_new_for_path (XCURSOR_ICONDIR);
- if (g_file_query_exists (top_theme_dir, NULL))
- add_top_icon_theme_dir_monitor (top_theme_dir, 1, NULL);
+ add_top_icon_theme_dir_monitor (top_theme_dir, 1, NULL);
+ g_object_unref (top_theme_dir);
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 569150975fdc..cd01f573b5cc 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -43,17 +43,6 @@ share/applications/keyboard.desktop
share/applications/window-properties.desktop
share/desktop-directories/gnomecc.directory
%%DATADIR%%/default-apps/gnome-default-applications.xml
-%%DATADIR%%/glade/appearance.glade
-%%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-properties.glade
-%%DATADIR%%/glade/gnome-window-properties.glade
%%DATADIR%%/keybindings/00-multimedia-key.xml
%%DATADIR%%/keybindings/01-desktop-key.xml
%%DATADIR%%/pixmaps/at-startup.png
@@ -65,21 +54,49 @@ share/desktop-directories/gnomecc.directory
%%DATADIR%%/pixmaps/double-click-maybe.png
%%DATADIR%%/pixmaps/double-click-off.png
%%DATADIR%%/pixmaps/double-click-on.png
-%%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock-open.png
-%%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock.png
+%%DATADIR%%/pixmaps/gnome-about-me-lock-open.png
+%%DATADIR%%/pixmaps/gnome-about-me-lock.png
%%DATADIR%%/pixmaps/gtk-theme-thumbnailing.png
%%DATADIR%%/pixmaps/icon-theme-thumbnailing.png
+%%DATADIR%%/pixmaps/left-index-finger.svg
+%%DATADIR%%/pixmaps/left-little-finger.svg
+%%DATADIR%%/pixmaps/left-middle-finger.svg
+%%DATADIR%%/pixmaps/left-ring-finger.svg
+%%DATADIR%%/pixmaps/left-thumb.svg
%%DATADIR%%/pixmaps/mouse-cursor-normal-large.png
%%DATADIR%%/pixmaps/mouse-cursor-normal.png
%%DATADIR%%/pixmaps/mouse-cursor-white-large.png
%%DATADIR%%/pixmaps/mouse-cursor-white.png
%%DATADIR%%/pixmaps/ocean-stripes.png
+%%DATADIR%%/pixmaps/print_error.svg
+%%DATADIR%%/pixmaps/print_ok.svg
+%%DATADIR%%/pixmaps/right-index-finger.svg
+%%DATADIR%%/pixmaps/right-little-finger.svg
+%%DATADIR%%/pixmaps/right-middle-finger.svg
+%%DATADIR%%/pixmaps/right-ring-finger.svg
+%%DATADIR%%/pixmaps/right-thumb.svg
%%DATADIR%%/pixmaps/subpixel-bgr.png
%%DATADIR%%/pixmaps/subpixel-rgb.png
%%DATADIR%%/pixmaps/subpixel-vbgr.png
%%DATADIR%%/pixmaps/subpixel-vrgb.png
%%DATADIR%%/pixmaps/theme-thumbnailing.png
%%DATADIR%%/pixmaps/window-theme-thumbnailing.png
+%%DATADIR%%/ui/appearance.ui
+%%DATADIR%%/ui/at-enable-dialog.ui
+%%DATADIR%%/ui/display-capplet.ui
+share/gnome-control-center/ui/gnome-about-me-dialog.ui
+share/gnome-control-center/ui/gnome-about-me-fingerprint.ui
+share/gnome-control-center/ui/gnome-about-me-password.ui
+%%DATADIR%%/ui/gnome-default-applications-properties.ui
+%%DATADIR%%/ui/gnome-keybinding-properties.ui
+share/gnome-control-center/ui/gnome-keyboard-properties-a11y-notifications.ui
+share/gnome-control-center/ui/gnome-keyboard-properties-dialog.ui
+share/gnome-control-center/ui/gnome-keyboard-properties-layout-chooser.ui
+share/gnome-control-center/ui/gnome-keyboard-properties-model-chooser.ui
+share/gnome-control-center/ui/gnome-keyboard-properties-options-dialog.ui
+share/gnome-control-center/ui/gnome-mouse-properties.ui
+%%DATADIR%%/ui/gnome-network-properties.ui
+%%DATADIR%%/ui/gnome-window-properties.ui
share/gnome/cursor-fonts/cursor-large-white.pcf
share/gnome/cursor-fonts/cursor-large.pcf
share/gnome/cursor-fonts/cursor-white.pcf
@@ -101,6 +118,7 @@ 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/el/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
@@ -149,6 +167,7 @@ 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/crh/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
@@ -229,6 +248,7 @@ 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-el.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
@@ -260,6 +280,7 @@ 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/el
@dirrm share/gnome/help/control-center/de
@dirrm share/gnome/help/control-center/cs
@dirrm share/gnome/help/control-center/ca@valencia
@@ -267,8 +288,8 @@ share/omf/control-center/control-center-zh_CN.omf
@dirrm share/gnome/help/control-center/C
@dirrm share/gnome/help/control-center
@dirrm share/gnome/cursor-fonts
+@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/glade
@dirrm %%DATADIR%%/default-apps
@dirrmtry share/desktop-directories
@dirrmtry share/applications
@@ -308,6 +329,8 @@ share/omf/control-center/control-center-zh_CN.omf
@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/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index ec4068a88b66..601ea8167393 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/gnome-power-manager/Makefile,v 1.5 2009/04/19 06:23:37 marcus Exp $
+# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.54 2009/10/25 00:02:31 marcus Exp $
#
PORTNAME= gnome-power-manager
PORTVERSION= 2.24.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c b/sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c
new file mode 100644
index 000000000000..ea8e92f03661
--- /dev/null
+++ b/sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c
@@ -0,0 +1,12 @@
+--- src/gpm-cell-aray.c.orig 2009-10-24 19:59:07.000000000 -0400
++++ src/gpm-cell-array.c 2009-10-24 19:59:50.000000000 -0400
+@@ -355,7 +355,8 @@ gpm_cell_array_update (GpmCellArray *cel
+ * get an with batteries which have a very small charge unit and consequently
+ * a very high charge. Fixes bug #327471 */
+ if (unit->kind == GPM_CELL_UNIT_KIND_PRIMARY &&
+- unit->charge_current > 0 && unit->charge_last_full > 0) {
++ unit->charge_current > 0 && unit->charge_last_full > 0 &&
++ unit->percentage > 1) {
+ gfloat pc = 100.0f * ((gfloat)unit->charge_current /
+ (gfloat)unit->charge_last_full);
+ if (pc < 0.0f) {
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index f00dde88dea7..35b2269b7e4e 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -3,12 +3,12 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/gnome-settings-daemon/Makefile,v 1.2 2009/04/18 10:59:37 kwm Exp $
+# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.53 2009/11/26 06:20:13 marcus Exp $
#
PORTNAME= gnome-settings-daemon
-PORTVERSION= 2.26.1
-PORTREVISION= 4
+PORTVERSION= 2.28.1
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,7 +16,9 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 settings daemon
-LIB_DEPENDS= pulse.0:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS= pulse.0:${PORTSDIR}/audio/pulseaudio \
+ canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
+ notify.1:${PORTSDIR}/devel/libnotify
RUN_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb
USE_XORG= xxf86misc
@@ -27,15 +29,15 @@ USE_GETTEXT= yes
USE_GSTREAMER= good
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CONFIGURE_ARGS= --enable-gstreamer=0.10
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-GCONF_SCHEMAS= apps_gnome_settings_daemon_keybindings.schemas \
+GCONF_SCHEMAS= apps_gnome_settings_daemon_housekeeping.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 \
+ desktop_gnome_peripherals_touchpad.schemas \
gnome-settings-daemon.schemas
.include <bsd.port.mk>
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 54077390c442..5cced3e1045e 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-settings-daemon-2.26.1.tar.bz2) = 7be383de54c0707c64843ae51563c43a
-SHA256 (gnome2/gnome-settings-daemon-2.26.1.tar.bz2) = 4dff1daa84fe485e302f61286df1dd188292302ee792ddb4fb1c34e65aea0a80
-SIZE (gnome2/gnome-settings-daemon-2.26.1.tar.bz2) = 1084129
+MD5 (gnome2/gnome-settings-daemon-2.28.1.tar.bz2) = cadb2e161846c4df76fec45679db1f50
+SHA256 (gnome2/gnome-settings-daemon-2.28.1.tar.bz2) = 1267ef7d4069189b6bd05b915586b5b323688a136d394e571d29991d59bbadb2
+SIZE (gnome2/gnome-settings-daemon-2.28.1.tar.bz2) = 1174173
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
index dd7b5a3e25f9..3407151e081d 100644
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ b/sysutils/gnome-settings-daemon/pkg-plist
@@ -4,7 +4,6 @@ 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
-lib/gnome-settings-daemon-2.0/dummy.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/font.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/housekeeping.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/keybindings.gnome-settings-plugin
@@ -18,9 +17,6 @@ lib/gnome-settings-daemon-2.0/libbackground.so
lib/gnome-settings-daemon-2.0/libclipboard.a
lib/gnome-settings-daemon-2.0/libclipboard.la
lib/gnome-settings-daemon-2.0/libclipboard.so
-lib/gnome-settings-daemon-2.0/libdummy.a
-lib/gnome-settings-daemon-2.0/libdummy.la
-lib/gnome-settings-daemon-2.0/libdummy.so
lib/gnome-settings-daemon-2.0/libfont.a
lib/gnome-settings-daemon-2.0/libfont.la
lib/gnome-settings-daemon-2.0/libfont.so
@@ -39,9 +35,6 @@ lib/gnome-settings-daemon-2.0/libmedia-keys.so
lib/gnome-settings-daemon-2.0/libmouse.a
lib/gnome-settings-daemon-2.0/libmouse.la
lib/gnome-settings-daemon-2.0/libmouse.so
-lib/gnome-settings-daemon-2.0/libscreensaver.a
-lib/gnome-settings-daemon-2.0/libscreensaver.la
-lib/gnome-settings-daemon-2.0/libscreensaver.so
lib/gnome-settings-daemon-2.0/libsound.a
lib/gnome-settings-daemon-2.0/libsound.la
lib/gnome-settings-daemon-2.0/libsound.so
@@ -59,7 +52,6 @@ lib/gnome-settings-daemon-2.0/libxsettings.la
lib/gnome-settings-daemon-2.0/libxsettings.so
lib/gnome-settings-daemon-2.0/media-keys.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/mouse.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/screensaver.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/sound.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/typing-break.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/xrandr.gnome-settings-plugin
@@ -67,12 +59,12 @@ lib/gnome-settings-daemon-2.0/xrdb.gnome-settings-plugin
lib/gnome-settings-daemon-2.0/xsettings.gnome-settings-plugin
libdata/pkgconfig/gnome-settings-daemon.pc
libexec/gnome-settings-daemon
+libexec/gsd-locate-pointer
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
-%%DATADIR%%/modmap-dialog.glade
+%%DATADIR%%/acme.ui
+%%DATADIR%%/gsd-a11y-preferences-dialog.ui
+%%DATADIR%%/modmap-dialog.ui
%%DATADIR%%/xrdb/Editres.ad
%%DATADIR%%/xrdb/Emacs.ad
%%DATADIR%%/xrdb/General.ad
@@ -98,6 +90,7 @@ share/locale/bn_IN/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/br/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/bs/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/ca/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/cs/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/cy/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/da/LC_MESSAGES/gnome-settings-daemon.mo
@@ -129,6 +122,7 @@ share/locale/ko/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/ku/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/lt/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/lv/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/mai/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/mg/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/mk/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/ml/LC_MESSAGES/gnome-settings-daemon.mo
@@ -195,10 +189,14 @@ share/locale/zu/LC_MESSAGES/gnome-settings-daemon.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/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
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 7328a0b22efd..c7b602910571 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/gnome-system-monitor/Makefile,v 1.1 2009/04/15 13:39:54 kwm Exp $
+# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.137 2009/09/21 09:37:19 kwm Exp $
#
PORTNAME= gnome-system-monitor
-PORTVERSION= 2.26.2
-PORTREVISION= 1
+PORTVERSION= 2.28.0
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -28,7 +27,6 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \
librsvg2
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-pcrecpp
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lutil"
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index b941c30e8b8d..9c0250230f41 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-monitor-2.26.2.tar.bz2) = d69ddb569e51ba381b6bf2d8d32f3b78
-SHA256 (gnome2/gnome-system-monitor-2.26.2.tar.bz2) = 22f67671756c4d5c860d1201f27d87830479fc923384f8dae5bcd24cb5f3dd7e
-SIZE (gnome2/gnome-system-monitor-2.26.2.tar.bz2) = 2188963
+MD5 (gnome2/gnome-system-monitor-2.28.0.tar.bz2) = 341c8fda9b518729e04465705da62994
+SHA256 (gnome2/gnome-system-monitor-2.28.0.tar.bz2) = 638875c6041cd2b0ad7219fecd8fe86eb9d4c8b0662166a84d7659bd6a9db1d3
+SIZE (gnome2/gnome-system-monitor-2.28.0.tar.bz2) = 2388199
diff --git a/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp b/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp
index e57a2170425e..9b934be3ddb8 100644
--- a/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp
+++ b/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp
@@ -1,11 +1,11 @@
--- src/load-graph.cpp.orig 2008-01-14 23:43:43.000000000 -0600
+++ src/load-graph.cpp 2008-01-14 23:44:15.000000000 -0600
-@@ -501,7 +501,7 @@
- // e.g: ceil(100.5 KiB) = 101 KiB = 101 * 2**(1 * 10)
- // where base10 = 1, coef10 = 101, pow2 = 16
+@@ -412,7 +412,7 @@
+ // e.g: ceil(100.5 KiB) = 101 KiB = 101 * 2**(1 * 10)
+ // where base10 = 1, coef10 = 101, pow2 = 16
-- unsigned pow2 = std::floor(log2(new_max));
-+ unsigned pow2 = std::floor(log(new_max) / log(2));
- unsigned base10 = pow2 / 10;
- unsigned coef10 = std::ceil(new_max / double(1UL << (base10 * 10)));
- g_assert(new_max <= (coef10 * (1UL << (base10 * 10))));
+- unsigned pow2 = std::floor(log2(new_max));
++ unsigned pow2 = std::floor(log(new_max) / log(2));
+ unsigned base10 = pow2 / 10;
+ unsigned coef10 = std::ceil(new_max / double(1UL << (base10 * 10)));
+ g_assert(new_max <= (coef10 * (1UL << (base10 * 10))));
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index f6bdb12cfbb4..701940d51541 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -57,6 +57,34 @@ 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/cs/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/cs/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/cs/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/cs/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/cs/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/cs/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/cs/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/cs/figures/processListing.png
+share/gnome/help/gnome-system-monitor/cs/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/cs/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/cs/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/cs/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/cs/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/cs/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/da/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/da/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/da/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/da/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/da/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/da/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/da/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/da/figures/processListing.png
+share/gnome/help/gnome-system-monitor/da/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/da/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/da/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/da/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/da/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/da/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
@@ -167,6 +195,7 @@ share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo
share/locale/bn_IN/LC_MESSAGES/gnome-system-monitor.mo
share/locale/bs/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ca/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-system-monitor.mo
share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo
share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
share/locale/da/LC_MESSAGES/gnome-system-monitor.mo
@@ -198,6 +227,7 @@ share/locale/ku/LC_MESSAGES/gnome-system-monitor.mo
share/locale/li/LC_MESSAGES/gnome-system-monitor.mo
share/locale/lt/LC_MESSAGES/gnome-system-monitor.mo
share/locale/lv/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/mai/LC_MESSAGES/gnome-system-monitor.mo
share/locale/mg/LC_MESSAGES/gnome-system-monitor.mo
share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
@@ -239,6 +269,8 @@ 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-cs.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-da.omf
share/omf/gnome-system-monitor/gnome-system-monitor-de.omf
share/omf/gnome-system-monitor/gnome-system-monitor-el.omf
share/omf/gnome-system-monitor/gnome-system-monitor-es.omf
@@ -265,6 +297,10 @@ share/pixmaps/gnome-system-monitor/upload.svg
@dirrm share/gnome/help/gnome-system-monitor/el
@dirrm share/gnome/help/gnome-system-monitor/de/figures
@dirrm share/gnome/help/gnome-system-monitor/de
+@dirrm share/gnome/help/gnome-system-monitor/da/figures
+@dirrm share/gnome/help/gnome-system-monitor/da
+@dirrm share/gnome/help/gnome-system-monitor/cs/figures
+@dirrm share/gnome/help/gnome-system-monitor/cs
@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
@@ -295,10 +331,14 @@ share/pixmaps/gnome-system-monitor/upload.svg
@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
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index cf5be7c91975..a1a2a37f124d 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.81 2008/09/27 01:53:00 mezz Exp $
+# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.88 2009/10/19 18:43:32 kwm Exp $
#
PORTNAME= gnome-system-tools
-PORTVERSION= 2.22.2
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,7 +15,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Tools to configure workstations
-LIB_DEPENDS= oobs-1.4:${PORTSDIR}/devel/liboobs
+LIB_DEPENDS= oobs-1.4:${PORTSDIR}/devel/liboobs \
+ polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index ff06dde618d2..bce5173440db 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-tools-2.22.2.tar.bz2) = c2c9a2570dd01a38b46a6adb91a2cb2f
-SHA256 (gnome2/gnome-system-tools-2.22.2.tar.bz2) = d57b18d859c6c0c67c27137934f62a4737ab459e7a2eb22d9400f821e4b75227
-SIZE (gnome2/gnome-system-tools-2.22.2.tar.bz2) = 4461916
+MD5 (gnome2/gnome-system-tools-2.28.1.tar.bz2) = 1614c0727801a9cb124c773f8bd76291
+SHA256 (gnome2/gnome-system-tools-2.28.1.tar.bz2) = eebc44c570c3af4642ee29859ca8caa0b780e0545c42c2e2bf214ef322299d61
+SIZE (gnome2/gnome-system-tools-2.28.1.tar.bz2) = 5308059
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 8c3e6e688aec..69ba8c6603ed 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -24,8 +24,12 @@ share/gnome/help/network-admin/C/legal.xml
share/gnome/help/network-admin/C/network-admin.xml
share/gnome/help/network-admin/ca/figures/network-tool.png
share/gnome/help/network-admin/ca/network-admin.xml
+share/gnome/help/network-admin/cs/figures/network-tool.png
+share/gnome/help/network-admin/cs/network-admin.xml
share/gnome/help/network-admin/de/figures/network-tool.png
share/gnome/help/network-admin/de/network-admin.xml
+share/gnome/help/network-admin/el/figures/network-tool.png
+share/gnome/help/network-admin/el/network-admin.xml
share/gnome/help/network-admin/en_GB/figures/network-tool.png
share/gnome/help/network-admin/en_GB/network-admin.xml
share/gnome/help/network-admin/es/figures/network-tool.png
@@ -38,46 +42,48 @@ share/gnome/help/network-admin/oc/figures/network-tool.png
share/gnome/help/network-admin/oc/network-admin.xml
share/gnome/help/network-admin/sv/figures/network-tool.png
share/gnome/help/network-admin/sv/network-admin.xml
-share/gnome/help/services-admin/C/figures/service-properties.png
+share/gnome/help/network-admin/zh_CN/figures/network-tool.png
+share/gnome/help/network-admin/zh_CN/network-admin.xml
share/gnome/help/services-admin/C/figures/services-tool.png
share/gnome/help/services-admin/C/legal.xml
share/gnome/help/services-admin/C/services-admin.xml
-share/gnome/help/services-admin/ca/figures/service-properties.png
share/gnome/help/services-admin/ca/figures/services-tool.png
share/gnome/help/services-admin/ca/services-admin.xml
-share/gnome/help/services-admin/de/figures/service-properties.png
+share/gnome/help/services-admin/cs/figures/services-tool.png
+share/gnome/help/services-admin/cs/services-admin.xml
share/gnome/help/services-admin/de/figures/services-tool.png
share/gnome/help/services-admin/de/services-admin.xml
-share/gnome/help/services-admin/el/figures/service-properties.png
share/gnome/help/services-admin/el/figures/services-tool.png
share/gnome/help/services-admin/el/services-admin.xml
-share/gnome/help/services-admin/en_GB/figures/service-properties.png
share/gnome/help/services-admin/en_GB/figures/services-tool.png
share/gnome/help/services-admin/en_GB/services-admin.xml
-share/gnome/help/services-admin/es/figures/service-properties.png
share/gnome/help/services-admin/es/figures/services-tool.png
share/gnome/help/services-admin/es/services-admin.xml
-share/gnome/help/services-admin/fr/figures/service-properties.png
share/gnome/help/services-admin/fr/figures/services-tool.png
share/gnome/help/services-admin/fr/services-admin.xml
-share/gnome/help/services-admin/it/figures/service-properties.png
share/gnome/help/services-admin/it/figures/services-tool.png
share/gnome/help/services-admin/it/services-admin.xml
share/gnome/help/services-admin/nl/figures/service-properties.png
share/gnome/help/services-admin/nl/figures/services-tool.png
share/gnome/help/services-admin/nl/legal.xml
share/gnome/help/services-admin/nl/services-admin.xml
-share/gnome/help/services-admin/oc/figures/service-properties.png
share/gnome/help/services-admin/oc/figures/services-tool.png
share/gnome/help/services-admin/oc/services-admin.xml
-share/gnome/help/services-admin/sv/figures/service-properties.png
+share/gnome/help/services-admin/pl/figures/services-tool.png
+share/gnome/help/services-admin/pl/services-admin.xml
+share/gnome/help/services-admin/pt_BR/figures/services-tool.png
+share/gnome/help/services-admin/pt_BR/services-admin.xml
share/gnome/help/services-admin/sv/figures/services-tool.png
share/gnome/help/services-admin/sv/services-admin.xml
+share/gnome/help/services-admin/zh_CN/figures/services-tool.png
+share/gnome/help/services-admin/zh_CN/services-admin.xml
share/gnome/help/shares-admin/C/figures/shares-tool.png
share/gnome/help/shares-admin/C/legal.xml
share/gnome/help/shares-admin/C/shares-admin.xml
share/gnome/help/shares-admin/ca/figures/shares-tool.png
share/gnome/help/shares-admin/ca/shares-admin.xml
+share/gnome/help/shares-admin/cs/figures/shares-tool.png
+share/gnome/help/shares-admin/cs/shares-admin.xml
share/gnome/help/shares-admin/de/figures/shares-tool.png
share/gnome/help/shares-admin/de/shares-admin.xml
share/gnome/help/shares-admin/el/figures/shares-tool.png
@@ -96,6 +102,8 @@ share/gnome/help/shares-admin/pt_BR/figures/shares-tool.png
share/gnome/help/shares-admin/pt_BR/shares-admin.xml
share/gnome/help/shares-admin/sv/figures/shares-tool.png
share/gnome/help/shares-admin/sv/shares-admin.xml
+share/gnome/help/shares-admin/zh_CN/figures/shares-tool.png
+share/gnome/help/shares-admin/zh_CN/shares-admin.xml
share/gnome/help/time-admin/C/figures/time-map.png
share/gnome/help/time-admin/C/figures/time-servers.png
share/gnome/help/time-admin/C/figures/time-tool-automatic.png
@@ -107,11 +115,21 @@ share/gnome/help/time-admin/ca/figures/time-servers.png
share/gnome/help/time-admin/ca/figures/time-tool-automatic.png
share/gnome/help/time-admin/ca/figures/time-tool-manual.png
share/gnome/help/time-admin/ca/time-admin.xml
+share/gnome/help/time-admin/cs/figures/time-map.png
+share/gnome/help/time-admin/cs/figures/time-servers.png
+share/gnome/help/time-admin/cs/figures/time-tool-automatic.png
+share/gnome/help/time-admin/cs/figures/time-tool-manual.png
+share/gnome/help/time-admin/cs/time-admin.xml
share/gnome/help/time-admin/de/figures/time-map.png
share/gnome/help/time-admin/de/figures/time-servers.png
share/gnome/help/time-admin/de/figures/time-tool-automatic.png
share/gnome/help/time-admin/de/figures/time-tool-manual.png
share/gnome/help/time-admin/de/time-admin.xml
+share/gnome/help/time-admin/el/figures/time-map.png
+share/gnome/help/time-admin/el/figures/time-servers.png
+share/gnome/help/time-admin/el/figures/time-tool-automatic.png
+share/gnome/help/time-admin/el/figures/time-tool-manual.png
+share/gnome/help/time-admin/el/time-admin.xml
share/gnome/help/time-admin/en_GB/figures/time-map.png
share/gnome/help/time-admin/en_GB/figures/time-servers.png
share/gnome/help/time-admin/en_GB/figures/time-tool-automatic.png
@@ -142,6 +160,11 @@ share/gnome/help/time-admin/oc/figures/time-servers.png
share/gnome/help/time-admin/oc/figures/time-tool-automatic.png
share/gnome/help/time-admin/oc/figures/time-tool-manual.png
share/gnome/help/time-admin/oc/time-admin.xml
+share/gnome/help/time-admin/pt_BR/figures/time-map.png
+share/gnome/help/time-admin/pt_BR/figures/time-servers.png
+share/gnome/help/time-admin/pt_BR/figures/time-tool-automatic.png
+share/gnome/help/time-admin/pt_BR/figures/time-tool-manual.png
+share/gnome/help/time-admin/pt_BR/time-admin.xml
share/gnome/help/time-admin/ru/figures/time-map.png
share/gnome/help/time-admin/ru/figures/time-servers.png
share/gnome/help/time-admin/ru/figures/time-tool-automatic.png
@@ -152,31 +175,54 @@ share/gnome/help/time-admin/sv/figures/time-servers.png
share/gnome/help/time-admin/sv/figures/time-tool-automatic.png
share/gnome/help/time-admin/sv/figures/time-tool-manual.png
share/gnome/help/time-admin/sv/time-admin.xml
+share/gnome/help/time-admin/zh_CN/figures/time-map.png
+share/gnome/help/time-admin/zh_CN/figures/time-servers.png
+share/gnome/help/time-admin/zh_CN/figures/time-tool-automatic.png
+share/gnome/help/time-admin/zh_CN/figures/time-tool-manual.png
+share/gnome/help/time-admin/zh_CN/time-admin.xml
+share/gnome/help/users-admin/C/figures/groups.png
share/gnome/help/users-admin/C/figures/users-tool.png
share/gnome/help/users-admin/C/legal.xml
share/gnome/help/users-admin/C/users-admin.xml
+share/gnome/help/users-admin/ca/figures/groups.png
share/gnome/help/users-admin/ca/figures/users-tool.png
share/gnome/help/users-admin/ca/users-admin.xml
+share/gnome/help/users-admin/cs/figures/groups.png
+share/gnome/help/users-admin/cs/figures/users-tool.png
+share/gnome/help/users-admin/cs/users-admin.xml
+share/gnome/help/users-admin/de/figures/groups.png
share/gnome/help/users-admin/de/figures/users-tool.png
share/gnome/help/users-admin/de/users-admin.xml
+share/gnome/help/users-admin/el/figures/groups.png
share/gnome/help/users-admin/el/figures/users-tool.png
share/gnome/help/users-admin/el/users-admin.xml
+share/gnome/help/users-admin/en_GB/figures/groups.png
share/gnome/help/users-admin/en_GB/figures/users-tool.png
share/gnome/help/users-admin/en_GB/users-admin.xml
+share/gnome/help/users-admin/es/figures/groups.png
share/gnome/help/users-admin/es/figures/users-tool.png
share/gnome/help/users-admin/es/users-admin.xml
+share/gnome/help/users-admin/fr/figures/groups.png
share/gnome/help/users-admin/fr/figures/users-tool.png
share/gnome/help/users-admin/fr/users-admin.xml
+share/gnome/help/users-admin/it/figures/groups.png
share/gnome/help/users-admin/it/figures/users-tool.png
share/gnome/help/users-admin/it/users-admin.xml
+share/gnome/help/users-admin/oc/figures/groups.png
share/gnome/help/users-admin/oc/figures/users-tool.png
share/gnome/help/users-admin/oc/users-admin.xml
+share/gnome/help/users-admin/pt_BR/figures/groups.png
share/gnome/help/users-admin/pt_BR/figures/users-tool.png
share/gnome/help/users-admin/pt_BR/users-admin.xml
+share/gnome/help/users-admin/ru/figures/groups.png
share/gnome/help/users-admin/ru/figures/users-tool.png
share/gnome/help/users-admin/ru/users-admin.xml
+share/gnome/help/users-admin/sv/figures/groups.png
share/gnome/help/users-admin/sv/figures/users-tool.png
share/gnome/help/users-admin/sv/users-admin.xml
+share/gnome/help/users-admin/zh_CN/figures/groups.png
+share/gnome/help/users-admin/zh_CN/figures/users-tool.png
+share/gnome/help/users-admin/zh_CN/users-admin.xml
share/icons/hicolor/16x16/apps/time-admin.png
share/icons/hicolor/22x22/apps/time-admin.png
share/icons/hicolor/24x24/apps/time-admin.png
@@ -196,6 +242,7 @@ share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
share/locale/bn_IN/LC_MESSAGES/gnome-system-tools.mo
share/locale/ca/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-system-tools.mo
share/locale/cs/LC_MESSAGES/gnome-system-tools.mo
share/locale/cy/LC_MESSAGES/gnome-system-tools.mo
share/locale/da/LC_MESSAGES/gnome-system-tools.mo
@@ -227,6 +274,7 @@ share/locale/ko/LC_MESSAGES/gnome-system-tools.mo
share/locale/ku/LC_MESSAGES/gnome-system-tools.mo
share/locale/lt/LC_MESSAGES/gnome-system-tools.mo
share/locale/lv/LC_MESSAGES/gnome-system-tools.mo
+share/locale/mai/LC_MESSAGES/gnome-system-tools.mo
share/locale/mg/LC_MESSAGES/gnome-system-tools.mo
share/locale/mk/LC_MESSAGES/gnome-system-tools.mo
share/locale/ml/LC_MESSAGES/gnome-system-tools.mo
@@ -269,15 +317,19 @@ share/omf/gnome-system-tools/services-admin-nl.omf
share/omf/gnome-system-tools/time-admin-nl.omf
share/omf/network-admin/network-admin-C.omf
share/omf/network-admin/network-admin-ca.omf
+share/omf/network-admin/network-admin-cs.omf
share/omf/network-admin/network-admin-de.omf
+share/omf/network-admin/network-admin-el.omf
share/omf/network-admin/network-admin-en_GB.omf
share/omf/network-admin/network-admin-es.omf
share/omf/network-admin/network-admin-fr.omf
share/omf/network-admin/network-admin-it.omf
share/omf/network-admin/network-admin-oc.omf
share/omf/network-admin/network-admin-sv.omf
+share/omf/network-admin/network-admin-zh_CN.omf
share/omf/services-admin/services-admin-C.omf
share/omf/services-admin/services-admin-ca.omf
+share/omf/services-admin/services-admin-cs.omf
share/omf/services-admin/services-admin-de.omf
share/omf/services-admin/services-admin-el.omf
share/omf/services-admin/services-admin-en_GB.omf
@@ -285,9 +337,13 @@ share/omf/services-admin/services-admin-es.omf
share/omf/services-admin/services-admin-fr.omf
share/omf/services-admin/services-admin-it.omf
share/omf/services-admin/services-admin-oc.omf
+share/omf/services-admin/services-admin-pl.omf
+share/omf/services-admin/services-admin-pt_BR.omf
share/omf/services-admin/services-admin-sv.omf
+share/omf/services-admin/services-admin-zh_CN.omf
share/omf/shares-admin/shares-admin-C.omf
share/omf/shares-admin/shares-admin-ca.omf
+share/omf/shares-admin/shares-admin-cs.omf
share/omf/shares-admin/shares-admin-de.omf
share/omf/shares-admin/shares-admin-el.omf
share/omf/shares-admin/shares-admin-en_GB.omf
@@ -297,18 +353,24 @@ share/omf/shares-admin/shares-admin-it.omf
share/omf/shares-admin/shares-admin-oc.omf
share/omf/shares-admin/shares-admin-pt_BR.omf
share/omf/shares-admin/shares-admin-sv.omf
+share/omf/shares-admin/shares-admin-zh_CN.omf
share/omf/time-admin/time-admin-C.omf
share/omf/time-admin/time-admin-ca.omf
+share/omf/time-admin/time-admin-cs.omf
share/omf/time-admin/time-admin-de.omf
+share/omf/time-admin/time-admin-el.omf
share/omf/time-admin/time-admin-en_GB.omf
share/omf/time-admin/time-admin-es.omf
share/omf/time-admin/time-admin-fr.omf
share/omf/time-admin/time-admin-it.omf
share/omf/time-admin/time-admin-oc.omf
+share/omf/time-admin/time-admin-pt_BR.omf
share/omf/time-admin/time-admin-ru.omf
share/omf/time-admin/time-admin-sv.omf
+share/omf/time-admin/time-admin-zh_CN.omf
share/omf/users-admin/users-admin-C.omf
share/omf/users-admin/users-admin-ca.omf
+share/omf/users-admin/users-admin-cs.omf
share/omf/users-admin/users-admin-de.omf
share/omf/users-admin/users-admin-el.omf
share/omf/users-admin/users-admin-en_GB.omf
@@ -319,12 +381,15 @@ share/omf/users-admin/users-admin-oc.omf
share/omf/users-admin/users-admin-pt_BR.omf
share/omf/users-admin/users-admin-ru.omf
share/omf/users-admin/users-admin-sv.omf
+share/omf/users-admin/users-admin-zh_CN.omf
@dirrm share/omf/users-admin
@dirrm share/omf/time-admin
@dirrm share/omf/shares-admin
@dirrm share/omf/services-admin
@dirrm share/omf/network-admin
@dirrm share/omf/gnome-system-tools
+@dirrm share/gnome/help/users-admin/zh_CN/figures
+@dirrm share/gnome/help/users-admin/zh_CN
@dirrm share/gnome/help/users-admin/sv/figures
@dirrm share/gnome/help/users-admin/sv
@dirrm share/gnome/help/users-admin/ru/figures
@@ -345,15 +410,21 @@ share/omf/users-admin/users-admin-sv.omf
@dirrm share/gnome/help/users-admin/el
@dirrm share/gnome/help/users-admin/de/figures
@dirrm share/gnome/help/users-admin/de
+@dirrm share/gnome/help/users-admin/cs/figures
+@dirrm share/gnome/help/users-admin/cs
@dirrm share/gnome/help/users-admin/ca/figures
@dirrm share/gnome/help/users-admin/ca
@dirrm share/gnome/help/users-admin/C/figures
@dirrm share/gnome/help/users-admin/C
@dirrm share/gnome/help/users-admin
+@dirrm share/gnome/help/time-admin/zh_CN/figures
+@dirrm share/gnome/help/time-admin/zh_CN
@dirrm share/gnome/help/time-admin/sv/figures
@dirrm share/gnome/help/time-admin/sv
@dirrm share/gnome/help/time-admin/ru/figures
@dirrm share/gnome/help/time-admin/ru
+@dirrm share/gnome/help/time-admin/pt_BR/figures
+@dirrm share/gnome/help/time-admin/pt_BR
@dirrm share/gnome/help/time-admin/oc/figures
@dirrm share/gnome/help/time-admin/oc
@dirrm share/gnome/help/time-admin/nl/figures
@@ -366,13 +437,19 @@ share/omf/users-admin/users-admin-sv.omf
@dirrm share/gnome/help/time-admin/es
@dirrm share/gnome/help/time-admin/en_GB/figures
@dirrm share/gnome/help/time-admin/en_GB
+@dirrm share/gnome/help/time-admin/el/figures
+@dirrm share/gnome/help/time-admin/el
@dirrm share/gnome/help/time-admin/de/figures
@dirrm share/gnome/help/time-admin/de
+@dirrm share/gnome/help/time-admin/cs/figures
+@dirrm share/gnome/help/time-admin/cs
@dirrm share/gnome/help/time-admin/ca/figures
@dirrm share/gnome/help/time-admin/ca
@dirrm share/gnome/help/time-admin/C/figures
@dirrm share/gnome/help/time-admin/C
@dirrm share/gnome/help/time-admin
+@dirrm share/gnome/help/shares-admin/zh_CN/figures
+@dirrm share/gnome/help/shares-admin/zh_CN
@dirrm share/gnome/help/shares-admin/sv/figures
@dirrm share/gnome/help/shares-admin/sv
@dirrm share/gnome/help/shares-admin/pt_BR/figures
@@ -391,13 +468,21 @@ share/omf/users-admin/users-admin-sv.omf
@dirrm share/gnome/help/shares-admin/el
@dirrm share/gnome/help/shares-admin/de/figures
@dirrm share/gnome/help/shares-admin/de
+@dirrm share/gnome/help/shares-admin/cs/figures
+@dirrm share/gnome/help/shares-admin/cs
@dirrm share/gnome/help/shares-admin/ca/figures
@dirrm share/gnome/help/shares-admin/ca
@dirrm share/gnome/help/shares-admin/C/figures
@dirrm share/gnome/help/shares-admin/C
@dirrm share/gnome/help/shares-admin
+@dirrm share/gnome/help/services-admin/zh_CN/figures
+@dirrm share/gnome/help/services-admin/zh_CN
@dirrm share/gnome/help/services-admin/sv/figures
@dirrm share/gnome/help/services-admin/sv
+@dirrm share/gnome/help/services-admin/pt_BR/figures
+@dirrm share/gnome/help/services-admin/pt_BR
+@dirrm share/gnome/help/services-admin/pl/figures
+@dirrm share/gnome/help/services-admin/pl
@dirrm share/gnome/help/services-admin/oc/figures
@dirrm share/gnome/help/services-admin/oc
@dirrm share/gnome/help/services-admin/nl/figures
@@ -414,11 +499,15 @@ share/omf/users-admin/users-admin-sv.omf
@dirrm share/gnome/help/services-admin/el
@dirrm share/gnome/help/services-admin/de/figures
@dirrm share/gnome/help/services-admin/de
+@dirrm share/gnome/help/services-admin/cs/figures
+@dirrm share/gnome/help/services-admin/cs
@dirrm share/gnome/help/services-admin/ca/figures
@dirrm share/gnome/help/services-admin/ca
@dirrm share/gnome/help/services-admin/C/figures
@dirrm share/gnome/help/services-admin/C
@dirrm share/gnome/help/services-admin
+@dirrm share/gnome/help/network-admin/zh_CN/figures
+@dirrm share/gnome/help/network-admin/zh_CN
@dirrm share/gnome/help/network-admin/sv/figures
@dirrm share/gnome/help/network-admin/sv
@dirrm share/gnome/help/network-admin/oc/figures
@@ -431,8 +520,12 @@ share/omf/users-admin/users-admin-sv.omf
@dirrm share/gnome/help/network-admin/es
@dirrm share/gnome/help/network-admin/en_GB/figures
@dirrm share/gnome/help/network-admin/en_GB
+@dirrm share/gnome/help/network-admin/el/figures
+@dirrm share/gnome/help/network-admin/el
@dirrm share/gnome/help/network-admin/de/figures
@dirrm share/gnome/help/network-admin/de
+@dirrm share/gnome/help/network-admin/cs/figures
+@dirrm share/gnome/help/network-admin/cs
@dirrm share/gnome/help/network-admin/ca/figures
@dirrm share/gnome/help/network-admin/ca
@dirrm share/gnome/help/network-admin/C/figures
@@ -462,10 +555,14 @@ share/omf/users-admin/users-admin-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
@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
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index c83611bfa3b3..bf18e1e15daf 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/hal/Makefile,v 1.54 2008/12/21 06:20:19 marcus Exp $
+# $MCom: ports/sysutils/hal/Makefile,v 1.72 2009/11/28 05:59:03 mezz Exp $
#
PORTNAME= hal
-DISTVERSION= 0.5.11
-PORTREVISION= 26
+DISTVERSION= 0.5.13
+PORTREVISION= 12
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/
@@ -43,7 +43,7 @@ CONFIGURE_ARGS= --disable-gtk-doc \
--with-pid-file=/var/run/hald/hald.pid \
--with-deprecated-keys \
--localstatedir=/var
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_CK_0_3" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
GTKDOC="false"
@@ -78,13 +78,6 @@ OPTIONS= FIXED_MOUNTPOINTS "use fixed mountpoints" off
RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode
.endif
-.if ${OSVERSION} <= 601100
-NEEDS_MEDIA= yes
-PLIST_SUB+= MEDIA=""
-.else
-PLIST_SUB+= MEDIA="@comment "
-.endif
-
.if defined(WITH_FIXED_MOUNTPOINTS)
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-tools_hal-storage-mount.c
.endif
@@ -96,11 +89,12 @@ PLIST_SUB+= USB2="@comment "
.endif
post-patch:
- @${REINPLACE_CMD} -e '/^scriptdir = /s|libdir|libexecdir|' \
+ @${REINPLACE_CMD} -e '/^scriptdir = /s|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \
${WRKSRC}/tools/Makefile.in \
${WRKSRC}/tools/freebsd/Makefile.in
- @${REINPLACE_CMD} -e 's|[(]libdir[)]/hal/scripts|(libexecdir)/hal/scripts|' \
- ${WRKSRC}/hald/Makefile.in
+ @${REINPLACE_CMD} -e 's|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \
+ ${WRKSRC}/hald/Makefile.in \
+ ${WRKSRC}/tools/Makefile.in
@${REINPLACE_CMD} -e 's|user="0"|group="operator"|g' \
${WRKSRC}/hal.conf.in
@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
@@ -117,9 +111,6 @@ post-install:
.if !defined(PACKAGE_BUILDING)
@${SETENV} PKG_PREFIX=${PREFIX} \
${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if defined(NEEDS_MEDIA)
- ${MKDIR} /media
-.endif
.endif
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
index 00f32dd5190c..5885af28aef5 100644
--- a/sysutils/hal/distinfo
+++ b/sysutils/hal/distinfo
@@ -1,3 +1,3 @@
-MD5 (hal-0.5.11.tar.gz) = 750cf074e88b6fb7012f26d99cd39b9b
-SHA256 (hal-0.5.11.tar.gz) = 730a9f2340f789677eb0c3b0984bbaca3ede6c12d1e4b16bc7ea91f51d10ba90
-SIZE (hal-0.5.11.tar.gz) = 1672992
+MD5 (hal-0.5.13.tar.gz) = 46ecc5d2e5bd964fb78099688f01bb6a
+SHA256 (hal-0.5.13.tar.gz) = ebcf22a373761530920643add1a791af40954dc7349f027d1c35b0e0f7f9c8af
+SIZE (hal-0.5.13.tar.gz) = 1199224
diff --git a/sysutils/hal/files/hald.in b/sysutils/hal/files/hald.in
index 9ccdbc16e6d1..42643888c954 100644
--- a/sysutils/hal/files/hald.in
+++ b/sysutils/hal/files/hald.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports/sysutils/hal/files/hald.in,v 1.14 2008/08/21 16:04:48 mezz Exp $
+# $MCom: ports/sysutils/hal/files/hald.in,v 1.17 2009/09/26 13:42:01 marcus Exp $
#
# PROVIDE: hald
# REQUIRE: DAEMON usbd devd dbus moused
@@ -9,12 +9,13 @@
# Add the following line to /etc/rc.conf to enable the HAL daemon:
#
# hald_enable="YES"
-# hald_flags="<set as needed>"
+#
. %%RC_SUBR%%
. %%GNOME_SUBR%%
hald_enable=${hald_enable-${gnome_enable}}
+hald_flags=${hald_flags-""}
name=hald
rcvar=`set_rcvar`
diff --git a/sysutils/hal/files/patch-configure b/sysutils/hal/files/patch-configure
index e70d7d60f497..bc4df6d96423 100644
--- a/sysutils/hal/files/patch-configure
+++ b/sysutils/hal/files/patch-configure
@@ -1,183 +1,53 @@
---- configure.orig 2009-03-14 00:22:20.000000000 -0400
-+++ configure 2009-03-14 00:22:44.000000000 -0400
-@@ -930,6 +930,9 @@ HALD_COMPILE_FREEBSD_FALSE
- HALD_COMPILE_SOLARIS_TRUE
- HALD_COMPILE_SOLARIS_FALSE
- HALD_BACKEND
-+HAVE_LIBUSB20_TRUE
-+HAVE_LIBUSB20_FALSE
-+LIBUSB20_LIBS
- HAVE_CONKIT_TRUE
- HAVE_CONKIT_FALSE
+--- configure.orig 2009-07-18 21:14:47.000000000 -0400
++++ configure 2009-07-18 21:14:47.000000000 -0400
+@@ -818,6 +818,8 @@ XMLTO
+ HALD_OS_LIBS
+ BLKID_LIBS
+ BLKID_CFLAGS
++VOLUME_ID_LIBS
++VOLUME_ID_CFLAGS
+ GLIB_LIBS
+ GLIB_CFLAGS
+ DBUS_LIBS
+@@ -847,6 +849,9 @@ HAVE_GPERF
GPERF
-@@ -5944,7 +5947,7 @@ ia64-*-hpux*)
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 5947 "configure"' > conftest.$ac_ext
-+ echo '#line 5950 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -8596,11 +8599,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8599: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8602: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8603: \$? = $ac_status" >&5
-+ echo "$as_me:8606: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -8886,11 +8889,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8889: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8892: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8893: \$? = $ac_status" >&5
-+ echo "$as_me:8896: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -8990,11 +8993,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8993: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8996: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8997: \$? = $ac_status" >&5
-+ echo "$as_me:9000: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -11354,7 +11357,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11357 "configure"
-+#line 11360 "configure"
- #include "confdefs.h"
+ HAVE_CONKIT_FALSE
+ HAVE_CONKIT_TRUE
++LIBUSB20_LIBS
++HAVE_LIBUSB20_FALSE
++HAVE_LIBUSB20_TRUE
+ HALD_BACKEND
+ HALD_COMPILE_SOLARIS_FALSE
+ HALD_COMPILE_SOLARIS_TRUE
+@@ -1101,6 +1106,8 @@ DBUS_CFLAGS
+ DBUS_LIBS
+ GLIB_CFLAGS
+ GLIB_LIBS
++VOLUME_ID_CFLAGS
++VOLUME_ID_LIBS
+ BLKID_CFLAGS
+ BLKID_LIBS'
- #if HAVE_DLFCN_H
-@@ -11454,7 +11457,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 11457 "configure"
-+#line 11460 "configure"
- #include "confdefs.h"
+@@ -1825,6 +1832,10 @@ Some influential environment variables:
+ DBUS_LIBS linker flags for DBUS, overriding pkg-config
+ GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
+ GLIB_LIBS linker flags for GLIB, overriding pkg-config
++ VOLUME_ID_CFLAGS
++ C compiler flags for VOLUME_ID, overriding pkg-config
++ VOLUME_ID_LIBS
++ linker flags for VOLUME_ID, overriding pkg-config
+ BLKID_CFLAGS
+ C compiler flags for BLKID, overriding pkg-config
+ BLKID_LIBS linker flags for BLKID, overriding pkg-config
+@@ -2794,6 +2805,7 @@ fi
+ glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61"
+ dbus_module="dbus-1 >= 0.61"
+ blkid_module="blkid >= 1.43"
++volume_id_module="libvolume_id >= 0.77"
+ polkit_module="polkit >= 0.5"
- #if HAVE_DLFCN_H
-@@ -13855,11 +13858,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13858: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13861: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:13862: \$? = $ac_status" >&5
-+ echo "$as_me:13865: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -13959,11 +13962,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13962: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13965: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:13966: \$? = $ac_status" >&5
-+ echo "$as_me:13969: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -15542,11 +15545,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15545: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15548: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:15549: \$? = $ac_status" >&5
-+ echo "$as_me:15552: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -15646,11 +15649,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15649: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15652: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:15653: \$? = $ac_status" >&5
-+ echo "$as_me:15656: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -17853,11 +17856,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17856: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17859: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:17860: \$? = $ac_status" >&5
-+ echo "$as_me:17863: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -18143,11 +18146,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18146: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18149: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:18150: \$? = $ac_status" >&5
-+ echo "$as_me:18153: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -18247,11 +18250,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18250: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18253: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:18254: \$? = $ac_status" >&5
-+ echo "$as_me:18257: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -23420,6 +23423,9 @@ else
+ # libtool versioning - this applies to libhal and libhal-storage
+@@ -19129,6 +19141,9 @@ else
fi
@@ -187,15 +57,15 @@
# Check whether --with-backend was given.
if test "${with_backend+set}" = set; then
-@@ -23477,6 +23483,176 @@ else
+@@ -19186,6 +19201,184 @@ else
fi
+if test "x$HALD_BACKEND" = "xfreebsd"; then
-+ { echo "$as_me:$LINENO: checking for libusb20_dev_get_info in -lusb20" >&5
-+echo $ECHO_N "checking for libusb20_dev_get_info in -lusb20... $ECHO_C" >&6; }
++ { $as_echo "$as_me:$LINENO: checking for libusb20_dev_get_info in -lusb20" >&5
++$as_echo_n "checking for libusb20_dev_get_info in -lusb20... " >&6; }
+if test "${ac_cv_lib_usb20_libusb20_dev_get_info+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
++ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb20 $LIBS"
@@ -227,33 +97,37 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
++ } && test -s conftest$ac_exeext && {
++ test "$cross_compiling" = yes ||
++ $as_test_x conftest$ac_exeext
++ }; then
+ ac_cv_lib_usb20_libusb20_dev_get_info=yes
+else
-+ echo "$as_me: failed program was:" >&5
++ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_usb20_libusb20_dev_get_info=no
+fi
+
++rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_usb20_libusb20_dev_get_info" >&5
-+echo "${ECHO_T}$ac_cv_lib_usb20_libusb20_dev_get_info" >&6; }
-+if test $ac_cv_lib_usb20_libusb20_dev_get_info = yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_usb20_libusb20_dev_get_info" >&5
++$as_echo "$ac_cv_lib_usb20_libusb20_dev_get_info" >&6; }
++if test "x$ac_cv_lib_usb20_libusb20_dev_get_info" = x""yes; then
+ USE_LIBUSB20=yes
+else
+ USE_LIBUSB20=no
@@ -261,10 +135,10 @@
+
+fi
+if test "x$USE_LIBUSB20" = "xno"; then
-+ { echo "$as_me:$LINENO: checking for libusb20_dev_get_info in -lusb" >&5
-+echo $ECHO_N "checking for libusb20_dev_get_info in -lusb... $ECHO_C" >&6; }
++ { $as_echo "$as_me:$LINENO: checking for libusb20_dev_get_info in -lusb" >&5
++$as_echo_n "checking for libusb20_dev_get_info in -lusb... " >&6; }
+if test "${ac_cv_lib_usb_libusb20_dev_get_info+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
++ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb $LIBS"
@@ -296,33 +170,37 @@
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
++ } && test -s conftest$ac_exeext && {
++ test "$cross_compiling" = yes ||
++ $as_test_x conftest$ac_exeext
++ }; then
+ ac_cv_lib_usb_libusb20_dev_get_info=yes
+else
-+ echo "$as_me: failed program was:" >&5
++ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_usb_libusb20_dev_get_info=no
+fi
+
++rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_usb_libusb20_dev_get_info" >&5
-+echo "${ECHO_T}$ac_cv_lib_usb_libusb20_dev_get_info" >&6; }
-+if test $ac_cv_lib_usb_libusb20_dev_get_info = yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_usb_libusb20_dev_get_info" >&5
++$as_echo "$ac_cv_lib_usb_libusb20_dev_get_info" >&6; }
++if test "x$ac_cv_lib_usb_libusb20_dev_get_info" = x""yes; then
+ USE_LIBUSB=yes
+else
+ USE_LIBUSB=no
@@ -364,63 +242,157 @@
cat >>confdefs.h <<_ACEOF
-@@ -25602,6 +25778,20 @@ echo "$as_me: error: conditional \"HALD_
+@@ -19943,8 +20136,132 @@ fi
+ { $as_echo "$as_me:$LINENO: result: $have_glib_2_14" >&5
+ $as_echo "$have_glib_2_14" >&6; }
+
++case "$host" in
++*-*-freebsd*)
++
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for VOLUME_ID" >&5
++$as_echo_n "checking for VOLUME_ID... " >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$VOLUME_ID_CFLAGS"; then
++ pkg_cv_VOLUME_ID_CFLAGS="$VOLUME_ID_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$volume_id_module\"") >&5
++ ($PKG_CONFIG --exists --print-errors "$volume_id_module") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_VOLUME_ID_CFLAGS=`$PKG_CONFIG --cflags "$volume_id_module" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$VOLUME_ID_LIBS"; then
++ pkg_cv_VOLUME_ID_LIBS="$VOLUME_ID_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$volume_id_module\"") >&5
++ ($PKG_CONFIG --exists --print-errors "$volume_id_module") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_VOLUME_ID_LIBS=`$PKG_CONFIG --libs "$volume_id_module" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ 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
++ VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$volume_id_module"`
++ else
++ VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$volume_id_module"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$VOLUME_ID_PKG_ERRORS" >&5
++
++ { { $as_echo "$as_me:$LINENO: error: Package requirements ($volume_id_module) were not met:
++
++$VOLUME_ID_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables VOLUME_ID_CFLAGS
++and VOLUME_ID_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++$as_echo "$as_me: error: Package requirements ($volume_id_module) were not met:
++
++$VOLUME_ID_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables VOLUME_ID_CFLAGS
++and VOLUME_ID_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
++ { (exit 1); exit 1; }; }
++elif test $pkg_failed = untried; then
++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables VOLUME_ID_CFLAGS
++and VOLUME_ID_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables VOLUME_ID_CFLAGS
++and VOLUME_ID_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }; }
++else
++ VOLUME_ID_CFLAGS=$pkg_cv_VOLUME_ID_CFLAGS
++ VOLUME_ID_LIBS=$pkg_cv_VOLUME_ID_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ :
++fi
++
++
++ ;;
++*)
++ ;;
++esac
++
+ # blkid
+ case "$host" in
++*-*-freebsd*)
++ ;;
+ *-*-solaris*)
+ ;;
+ *)
+@@ -21441,6 +21758,20 @@ $as_echo "$as_me: error: conditional \"H
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${HAVE_LIBUSB20_TRUE}" && test -z "${HAVE_LIBUSB20_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBUSB20\" was never defined.
++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBUSB20\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"HAVE_LIBUSB20\" was never defined.
++$as_echo "$as_me: error: conditional \"HAVE_LIBUSB20\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_LIBUSB20_TRUE}" && test -z "${HAVE_LIBUSB20_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBUSB20\" was never defined.
++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBUSB20\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"HAVE_LIBUSB20\" was never defined.
++$as_echo "$as_me: error: conditional \"HAVE_LIBUSB20\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${HAVE_CONKIT_TRUE}" && test -z "${HAVE_CONKIT_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"HAVE_CONKIT\" was never defined.
+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CONKIT\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -26568,6 +26758,9 @@ HALD_COMPILE_FREEBSD_FALSE!$HALD_COMPILE
- HALD_COMPILE_SOLARIS_TRUE!$HALD_COMPILE_SOLARIS_TRUE$ac_delim
- HALD_COMPILE_SOLARIS_FALSE!$HALD_COMPILE_SOLARIS_FALSE$ac_delim
- HALD_BACKEND!$HALD_BACKEND$ac_delim
-+HAVE_LIBUSB20_TRUE!$HAVE_LIBUSB20_TRUE$ac_delim
-+HAVE_LIBUSB20_FALSE!$HAVE_LIBUSB20_FALSE$ac_delim
-+LIBUSB20_LIBS!$LIBUSB20_LIBS$ac_delim
- HAVE_CONKIT_TRUE!$HAVE_CONKIT_TRUE$ac_delim
- HAVE_CONKIT_FALSE!$HAVE_CONKIT_FALSE$ac_delim
- GPERF!$GPERF$ac_delim
-@@ -26597,9 +26790,6 @@ DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim
- DBUS_LIBS!$DBUS_LIBS$ac_delim
- GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
- GLIB_LIBS!$GLIB_LIBS$ac_delim
--VOLUME_ID_CFLAGS!$VOLUME_ID_CFLAGS$ac_delim
--VOLUME_ID_LIBS!$VOLUME_ID_LIBS$ac_delim
--HALD_OS_LIBS!$HALD_OS_LIBS$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -26641,6 +26831,9 @@ _ACEOF
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-+VOLUME_ID_CFLAGS!$VOLUME_ID_CFLAGS$ac_delim
-+VOLUME_ID_LIBS!$VOLUME_ID_LIBS$ac_delim
-+HALD_OS_LIBS!$HALD_OS_LIBS$ac_delim
- XMLTO!$XMLTO$ac_delim
- XMLLINT!$XMLLINT$ac_delim
- DOCBOOK_DOCS_ENABLED_TRUE!$DOCBOOK_DOCS_ENABLED_TRUE$ac_delim
-@@ -26672,7 +26865,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` = 29; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/sysutils/hal/files/patch-configure.in b/sysutils/hal/files/patch-configure.in
index 37fb1534e484..84e12d18796b 100644
--- a/sysutils/hal/files/patch-configure.in
+++ b/sysutils/hal/files/patch-configure.in
@@ -1,6 +1,14 @@
---- configure.in.orig 2008-05-07 19:24:31.000000000 -0400
-+++ configure.in 2009-03-14 00:14:25.000000000 -0400
-@@ -446,6 +446,9 @@ if test "x$with_libpci" != xno ; then
+--- configure.in.orig 2009-05-10 15:43:52.000000000 -0400
++++ configure.in 2009-05-17 00:53:29.000000000 -0400
+@@ -14,6 +14,7 @@ AM_MAINTAINER_MODE
+ glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61"
+ dbus_module="dbus-1 >= 0.61"
+ blkid_module="blkid >= 1.43"
++volume_id_module="libvolume_id >= 0.77"
+ polkit_module="polkit >= 0.5"
+
+ # libtool versioning - this applies to libhal and libhal-storage
+@@ -477,6 +478,9 @@ if test "x$with_libpci" != xno ; then
fi
AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])
@@ -10,7 +18,7 @@
AC_ARG_WITH([backend],
AS_HELP_STRING([--with-backend=<name>],
[backend to use (linux/solaris/freebsd/dummy)]),
-@@ -473,6 +476,22 @@ AM_CONDITIONAL(HALD_COMPILE_LINUX, [test
+@@ -504,6 +508,22 @@ AM_CONDITIONAL(HALD_COMPILE_LINUX, [test
AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compiling for FreeBSD])
AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
AC_SUBST(HALD_BACKEND)
@@ -33,3 +41,24 @@
dnl DBUS API is subject to changes
AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change])
+@@ -685,8 +705,20 @@ else
+ fi
+ AC_MSG_RESULT($have_glib_2_14)
+
++case "$host" in
++*-*-freebsd*)
++ PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module])
++ AC_SUBST(VOLUME_ID_CFLAGS)
++ AC_SUBST(VOLUME_ID_LIBS)
++ ;;
++*)
++ ;;
++esac
++
+ # blkid
+ case "$host" in
++*-*-freebsd*)
++ ;;
+ *-*-solaris*)
+ ;;
+ *)
diff --git a/sysutils/hal/files/patch-consolekit03 b/sysutils/hal/files/patch-consolekit03
deleted file mode 100644
index 13ac31849390..000000000000
--- a/sysutils/hal/files/patch-consolekit03
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -p -up hal-0.5.11/configure.in.ck03 hal-0.5.11/configure.in
---- hal-0.5.11/configure.in.ck03 2008-05-07 19:24:31.000000000 -0400
-+++ configure.in 2008-08-11 06:18:07.000000000 -0400
-diff -p -up hal-0.5.11/hald/ck-tracker.c.ck03 hal-0.5.11/hald/ck-tracker.c
---- hal-0.5.11/hald/ck-tracker.c.ck03 2008-05-07 19:23:48.000000000 -0400
-+++ hald/ck-tracker.c 2008-08-12 12:34:47.000000000 -0400
-@@ -256,7 +256,11 @@ ck_session_get_info (CKTracker *tracker,
- goto error;
- }
- if (!dbus_message_get_args (reply, NULL,
-+#ifdef HAVE_CK_0_3
-+ DBUS_TYPE_UINT32, &(session->user),
-+#else
- DBUS_TYPE_INT32, &(session->user),
-+#endif
- DBUS_TYPE_INVALID)) {
- HAL_ERROR (("Invalid GetUnixUser reply from CK"));
- goto error;
-@@ -531,7 +535,11 @@ ck_tracker_process_system_bus_message (C
- seat_objpath = dbus_message_get_path (message);
-
- if (!dbus_message_get_args (message, NULL,
-+#ifdef HAVE_CK_0_3
-+ DBUS_TYPE_OBJECT_PATH, &seat_objpath,
-+#else
- DBUS_TYPE_STRING, &seat_objpath,
-+#endif
- DBUS_TYPE_INVALID)) {
- HAL_ERROR (("Invalid SeatAdded signal from CK"));
- goto out;
-@@ -558,7 +566,11 @@ ck_tracker_process_system_bus_message (C
- seat_objpath = dbus_message_get_path (message);
-
- if (!dbus_message_get_args (message, NULL,
-+#ifdef HAVE_CK_0_3
-+ DBUS_TYPE_OBJECT_PATH, &seat_objpath,
-+#else
- DBUS_TYPE_STRING, &seat_objpath,
-+#endif
- DBUS_TYPE_INVALID)) {
- HAL_ERROR (("Invalid SeatRemoved signal from CK"));
- goto out;
-@@ -588,7 +600,11 @@ ck_tracker_process_system_bus_message (C
- seat_objpath = dbus_message_get_path (message);
-
- if (!dbus_message_get_args (message, NULL,
-+#ifdef HAVE_CK_0_3
-+ DBUS_TYPE_OBJECT_PATH, &session_objpath,
-+#else
- DBUS_TYPE_STRING, &session_objpath,
-+#endif
- DBUS_TYPE_INVALID)) {
- HAL_ERROR (("Invalid SessionAdded signal from CK"));
- goto out;
-@@ -624,7 +640,11 @@ ck_tracker_process_system_bus_message (C
- seat_objpath = dbus_message_get_path (message);
-
- if (!dbus_message_get_args (message, NULL,
-+#ifdef HAVE_CK_0_3
-+ DBUS_TYPE_OBJECT_PATH, &session_objpath,
-+#else
- DBUS_TYPE_STRING, &session_objpath,
-+#endif
- DBUS_TYPE_INVALID)) {
- HAL_ERROR (("Invalid SessionRemoved signal from CK"));
- goto out;
diff --git a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi
index b4fd8b3ff74c..bb18f33107a3 100644
--- a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi
+++ b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi
@@ -1,9 +1,9 @@
---- fdi/policy/10osvendor/10-x11-input.fdi.orig 2008-05-07 19:21:15.000000000 -0400
-+++ fdi/policy/10osvendor/10-x11-input.fdi 2009-01-23 18:20:10.000000000 -0500
-@@ -1,19 +1,10 @@
- <?xml version="1.0" encoding="ISO-8859-1"?>
- <deviceinfo version="0.2">
- <device>
+--- fdi/policy/10osvendor/10-x11-input.fdi.orig 2009-06-26 03:28:39.000000000 -0400
++++ fdi/policy/10osvendor/10-x11-input.fdi 2009-07-18 21:19:15.000000000 -0400
+@@ -7,15 +7,6 @@
+ <merge key="input.x11_driver" type="string">evdev</merge>
+ </match>
+
- <!-- FIXME: Support tablets too. -->
- <match key="info.capabilities" contains="input.mouse">
- <merge key="input.x11_driver" type="string">mouse</merge>
@@ -13,6 +13,13 @@
- </match>
- </match>
-
+ <match key="info.capabilities" contains="input.tablet">
+ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
+ string="Linux">
+@@ -23,10 +14,10 @@
+ </match>
+ </match>
+
- <match key="info.capabilities" contains="input.keys">
+ <match key="info.capabilities" contains="input.keyboard">
<!-- If we're using Linux, we use evdev by default (falling back to
diff --git a/sysutils/hal/files/patch-hal.conf.in b/sysutils/hal/files/patch-hal.conf.in
deleted file mode 100644
index 2d11e7133b18..000000000000
--- a/sysutils/hal/files/patch-hal.conf.in
+++ /dev/null
@@ -1,25 +0,0 @@
-fix for 'stderr' error
-
-dbus-daemon: Would reject message, 1 matched rules; type="method_call", sender=":1.33" (uid=1002 pid=23124 comm=") interface="org.freedesktop.DBus.Introspectable" member="Introspect" error name="(unset)" requested_reply=0 destination="org.freedesktop.Hal" (uid=0 pid=25899 comm="))
-
-here is a patch for hal.conf. Fixed in upstream, obrient from https://bugs.freedesktop.org/show_bug.cgi?id=18985
-
---- hal.conf.in.orig 2008-08-14 04:32:12.000000000 -0400
-+++ hal.conf.in 2008-12-19 12:11:02.000000000 -0500
-@@ -16,6 +16,8 @@
-
- <!-- Allow anyone to invoke methods on the Manager and Device interfaces -->
- <policy context="default">
-+ <allow send_destination="org.freedesktop.Hal"
-+ send_interface="org.freedesktop.DBus.Introspectable"/>
- <allow send_interface="org.freedesktop.Hal.Manager"/>
- <allow send_interface="org.freedesktop.Hal.Device"/>
- <allow receive_interface="org.freedesktop.Hal.Manager"
-@@ -26,6 +28,7 @@
- <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
- <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
- <allow send_interface="org.freedesktop.Hal.Device.Volume"/>
-+ <allow send_interface="org.freedesktop.Hal.Device.KillSwitch"/>
- <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
- <allow receive_interface="org.freedesktop.Hal.Device.SystemPowerManagement"
- receive_sender="org.freedesktop.Hal"/>
diff --git a/sysutils/hal/files/patch-hald_freebsd_Makefile.in b/sysutils/hal/files/patch-hald_freebsd_Makefile.in
index 793066528491..44dbf8adc88a 100644
--- a/sysutils/hal/files/patch-hald_freebsd_Makefile.in
+++ b/sysutils/hal/files/patch-hald_freebsd_Makefile.in
@@ -1,5 +1,5 @@
---- hald/freebsd/Makefile.in.orig 2009-02-17 18:59:04.000000000 -0500
-+++ hald/freebsd/Makefile.in 2009-02-18 00:18:00.000000000 -0500
+--- hald/freebsd/Makefile.in.orig 2009-05-17 00:43:12.000000000 -0400
++++ hald/freebsd/Makefile.in 2009-05-17 00:43:12.000000000 -0400
@@ -32,6 +32,11 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
@@ -43,15 +43,7 @@
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-dvi-recursive install-exec-recursive \
-@@ -228,6 +242,7 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = libprobe probing addons .
-@@ -241,46 +256,15 @@ AM_CPPFLAGS = \
+@@ -250,46 +264,15 @@ AM_CPPFLAGS = \
@GLIB_CFLAGS@ @DBUS_CFLAGS@ @POLKIT_CFLAGS@
@HALD_COMPILE_FREEBSD_TRUE@noinst_LTLIBRARIES = libhald_freebsd.la
@@ -107,7 +99,7 @@
EXTRA_DIST = README TODO
all: all-recursive
-@@ -349,6 +333,7 @@ distclean-compile:
+@@ -358,6 +341,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-sound.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-storage.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-usb.Plo@am__quote@
diff --git a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
index 474658423dc7..f19b7e92dcea 100644
--- a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
+++ b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
@@ -1,6 +1,6 @@
---- hald/freebsd/addons/addon-storage.c.orig 2008-05-07 19:24:04.000000000 -0400
-+++ hald/freebsd/addons/addon-storage.c 2008-05-19 02:18:59.000000000 -0400
-@@ -36,17 +36,23 @@
+--- hald/freebsd/addons/addon-storage.c.orig 2008-08-10 09:50:10.000000000 -0400
++++ hald/freebsd/addons/addon-storage.c 2009-09-13 17:23:52.000000000 -0400
+@@ -36,17 +36,24 @@
#include "../libprobe/hfp.h"
#include "../libprobe/hfp-cdrom.h"
@@ -22,11 +22,22 @@
} addon = { { 2, 0 } };
+static void update_proc_title (const char *device);
++static void unmount_volumes (void);
+
/* see MMC-3 Working Draft Revision 10 */
static boolean
hf_addon_storage_cdrom_eject_pressed (HFPCDROM *cdrom)
-@@ -144,18 +150,49 @@ hf_addon_storage_update (void)
+@@ -100,8 +107,7 @@ hf_addon_storage_update (void)
+
+ if (hf_addon_storage_cdrom_eject_pressed(cdrom))
+ {
+- libhal_device_emit_condition(hfp_ctx, hfp_udi, "EjectPressed", "", &hfp_error);
+- dbus_error_free(&hfp_error);
++ libhal_device_emit_condition(hfp_ctx, hfp_udi, "EjectPressed", "", NULL);
+ }
+
+ hfp_cdrom_free(cdrom);
+@@ -144,18 +150,142 @@ hf_addon_storage_update (void)
}
}
@@ -36,6 +47,102 @@
return has_media;
}
++static void
++unmount_volumes (void)
++{
++ int num_volumes;
++ char **volumes;
++
++ if ((volumes = libhal_manager_find_device_string_match(hfp_ctx,
++ "block.storage_device",
++ hfp_udi,
++ &num_volumes,
++ NULL)) != NULL)
++ {
++ int i;
++
++ for (i = 0; i < num_volumes; i++)
++ {
++ char *vol_udi;
++
++ vol_udi = volumes[i];
++
++ if (libhal_device_get_property_bool(hfp_ctx, vol_udi, "volume.is_mounted", NULL))
++ {
++ DBusMessage *msg = NULL;
++ DBusMessage *reply = NULL;
++ DBusConnection *dbus_connection;
++ unsigned int num_options = 0;
++ char **options = NULL;
++ char *devfile;
++
++ hfp_info("Forcing unmount of volume '%s'", vol_udi);
++
++ dbus_connection = libhal_ctx_get_dbus_connection(hfp_ctx);
++ msg = dbus_message_new_method_call("org.freedesktop.Hal", vol_udi,
++ "org.freedesktop.Hal.Device.Volume",
++ "Unmount");
++ if (msg == NULL)
++ {
++ hfp_warning("Could not create dbus message for %s", vol_udi);
++ continue;
++ }
++
++ options = calloc(1, sizeof (char *));
++ if (options == NULL)
++ {
++ hfp_warning("Could not allocation memory for options");
++ dbus_message_unref(msg);
++ continue;
++ }
++
++ options[0] = "force";
++ num_options = 1;
++
++ devfile = libhal_device_get_property_string(hfp_ctx, vol_udi, "block.device", NULL);
++ if (devfile != NULL)
++ {
++ hfp_info("Forcibly attempting to unmount %s as media was removed", devfile);
++ libhal_free_string(devfile);
++ }
++
++ if (! dbus_message_append_args(msg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, num_options, DBUS_TYPE_INVALID))
++ {
++ hfp_warning("Could not append args to dbus message for %s", vol_udi);
++ free(options);
++ dbus_message_unref(msg);
++ continue;
++ }
++
++ if (! (reply = dbus_connection_send_with_reply_and_block(dbus_connection, msg, -1, &hfp_error)))
++ {
++ hfp_warning("Unmount failed for %s: %s: %s", vol_udi, hfp_error.name, hfp_error.message);
++ dbus_error_free(&hfp_error);
++ free(options);
++ dbus_message_unref(msg);
++ continue;
++ }
++
++ if (dbus_error_is_set(&hfp_error))
++ {
++ hfp_warning("Unmount failed for %s: %s : %s", vol_udi, hfp_error.name, hfp_error.message);
++ dbus_error_free(&hfp_error);
++ free(options);
++ dbus_message_unref(msg);
++ dbus_message_unref(reply);
++ continue;
++ }
++
++ hfp_info("Successfully unmounted udi '%s'", vol_udi);
++ free(options);
++ dbus_message_unref(msg);
++ dbus_message_unref(reply);
++ }
++ }
++ libhal_free_string_array(volumes);
++ }
++}
++
static boolean
-poll_for_media (void)
+poll_for_media (boolean check_only, boolean force)
@@ -49,10 +156,9 @@
+ check_lock_state = FALSE;
+
+ hfp_info("Checking whether device %s is locked by HAL", addon.device_file);
-+ if (libhal_device_is_locked_by_others(hfp_ctx, hfp_udi, "org.freedesktop.Hal.Device.Storage", &hfp_error))
++ if (libhal_device_is_locked_by_others(hfp_ctx, hfp_udi, "org.freedesktop.Hal.Device.Storage", NULL))
+ {
+ hfp_info("... device %s is locked by HAL", addon.device_file);
-+ dbus_error_free(&hfp_error);
+ is_locked_by_hal = TRUE;
+ update_proc_title(addon.device_file);
+ goto skip_check;
@@ -62,10 +168,8 @@
+ hfp_info("... device %s is not locked by HAL", addon.device_file);
+ is_locked_by_hal = FALSE;
+ }
-+ dbus_error_free(&hfp_error);
+
-+ should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", &hfp_error);
-+ dbus_error_free(&hfp_error);
++ should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", NULL);
+ polling_disabled = ! should_poll;
+ update_proc_title(addon.device_file);
+ }
@@ -80,7 +184,23 @@
if (has_media != addon.had_media)
{
/*
-@@ -175,20 +212,33 @@ poll_for_media (void)
+@@ -168,27 +298,47 @@ poll_for_media (void)
+ * then hung while rebooting and did not unmount my other
+ * filesystems.
+ */
++#if __FreeBSD_version >= 800066
++ /*
++ * With newusb, it is safe to force unmount volumes. This may be
++ * safe on newer versions of the old USB stack, but we'll be
++ * extra cautious.
++ */
++ unmount_volumes();
++#endif
+
+- libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error);
+- dbus_error_free(&hfp_error);
++ libhal_device_rescan(hfp_ctx, hfp_udi, NULL);
+ addon.had_media = has_media;
return TRUE;
}
@@ -119,7 +239,7 @@
{
if (dbus_message_is_method_call(message,
"org.freedesktop.Hal.Device.Storage.Removable",
-@@ -199,7 +249,7 @@ filter_function (DBusConnection *connect
+@@ -199,7 +349,7 @@ filter_function (DBusConnection *connect
hfp_info("Forcing poll for media becusse CheckForMedia() was called");
@@ -128,7 +248,7 @@
reply = dbus_message_new_method_return (message);
dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, &had_effect, DBUS_TYPE_INVALID);
-@@ -217,8 +267,9 @@ main (int argc, char **argv)
+@@ -217,8 +367,9 @@ main (int argc, char **argv)
char *removable;
char *bus;
char *driver;
@@ -139,19 +259,19 @@
if (! hfp_init(argc, argv))
goto end;
-@@ -251,16 +302,41 @@ main (int argc, char **argv)
+@@ -251,16 +402,39 @@ main (int argc, char **argv)
addon.is_scsi_removable = (! strcmp(bus, "scsi") ||
(! strcmp(bus, "usb") && (! strcmp(driver, "da") || ! strcmp(driver, "sa") ||
! strcmp(driver, "cd")))) && ! strcmp(removable, "true");
- addon.had_media = hf_addon_storage_update();
+ addon.had_media = poll_for_media(TRUE, FALSE);
- if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, &hfp_error))
+- if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, &hfp_error))
++ if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, NULL))
goto end;
- dbus_error_free(&hfp_error);
-
-+ syscon = dbus_bus_get(DBUS_BUS_SYSTEM, &hfp_error);
-+ dbus_error_free(&hfp_error);
+- dbus_error_free(&hfp_error);
++
++ syscon = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
+ assert(syscon != NULL);
+ dbus_connection_set_exit_on_disconnect(syscon, 0);
+
@@ -174,7 +294,7 @@
+ hfp_free(filter_str);
+
+ dbus_connection_add_filter(syscon, dbus_filter_function, NULL, NULL);
-+
+
connection = libhal_ctx_get_dbus_connection(hfp_ctx);
assert(connection != NULL);
dbus_connection_set_exit_on_disconnect(connection, 0);
@@ -183,7 +303,20 @@
if (! libhal_device_claim_interface(hfp_ctx,
hfp_udi,
-@@ -280,40 +356,32 @@ main (int argc, char **argv)
+@@ -268,52 +442,43 @@ main (int argc, char **argv)
+ " <method name=\"CheckForMedia\">\n"
+ " <arg name=\"call_had_sideeffect\" direction=\"out\" type=\"b\"/>\n"
+ " </method>\n",
+- &hfp_error))
++ NULL))
+ {
+ hfp_critical("Cannot claim interface 'org.freedesktop.Hal.Device.Storage.Removable'");
+ goto end;
+ }
+- dbus_error_free(&hfp_error);
+
+ while (TRUE)
+ {
/* process dbus traffic until update interval has elapsed */
while (TRUE)
{
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-computer.c b/sysutils/hal/files/patch-hald_freebsd_hf-computer.c
new file mode 100644
index 000000000000..e2921c58aa12
--- /dev/null
+++ b/sysutils/hal/files/patch-hald_freebsd_hf-computer.c
@@ -0,0 +1,26 @@
+--- hald/freebsd/hf-computer.c.orig 2009-07-18 21:22:48.000000000 -0400
++++ hald/freebsd/hf-computer.c 2009-07-18 21:23:51.000000000 -0400
+@@ -26,6 +26,7 @@
+ # include <config.h>
+ #endif
+
++#include <stdio.h>
+ #include <string.h>
+ #include <sys/utsname.h>
+
+@@ -133,11 +134,11 @@ hf_computer_device_add (void)
+ if (PACKAGE_VERSION) {
+ int major, minor, micro;
+
+- hal_device_property_set_string (root, "org.freedesktop.Hal.version", PACKAGE_VERSION);
++ hal_device_property_set_string (device, "org.freedesktop.Hal.version", PACKAGE_VERSION);
+ if ( sscanf( PACKAGE_VERSION, "%d.%d.%d", &major, &minor, &micro ) == 3 ) {
+- hal_device_property_set_int (root, "org.freedesktop.Hal.version.major", major);
+- hal_device_property_set_int (root, "org.freedesktop.Hal.version.minor", minor);
+- hal_device_property_set_int (root, "org.freedesktop.Hal.version.micro", micro);
++ hal_device_property_set_int (device, "org.freedesktop.Hal.version.major", major);
++ hal_device_property_set_int (device, "org.freedesktop.Hal.version.minor", minor);
++ hal_device_property_set_int (device, "org.freedesktop.Hal.version.micro", micro);
+ }
+ }
+
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
new file mode 100644
index 000000000000..bc7ad871d67d
--- /dev/null
+++ b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
@@ -0,0 +1,11 @@
+--- hald/freebsd/hf-scsi.c.orig 2009-08-18 16:19:02.000000000 -0400
++++ hald/freebsd/hf-scsi.c 2009-08-18 16:19:24.000000000 -0400
+@@ -549,7 +549,7 @@ hf_scsi_probe (void)
+ break; /* only use the first peripheral */
+
+ match = &ccb.cdm.matches[i].result.periph_result;
+- if ((int) match->path_id == -1 || ! strcmp(match->periph_name, "pass"))
++ if ((int) match->path_id == -1 || ! strcmp(match->periph_name, "pass") || ! strcmp(match->periph_name, "probe"))
+ break;
+
+ pending_devname = g_strdup_printf("%s%i", match->periph_name, match->unit_number);
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c b/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c
index 0da9bc2bc566..9f0f5726186c 100644
--- a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c
+++ b/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c
@@ -1,6 +1,6 @@
---- hald/freebsd/hf-usb2.c.orig 2009-03-02 20:16:10.000000000 -0600
-+++ hald/freebsd/hf-usb2.c 2009-03-02 20:33:13.000000000 -0600
-@@ -0,0 +1,287 @@
+--- hald/freebsd/hf-usb2.c.orig 2009-11-21 19:57:40.000000000 -0500
++++ hald/freebsd/hf-usb2.c 2009-11-21 19:58:07.000000000 -0500
+@@ -0,0 +1,312 @@
+/***************************************************************************
+ * CVSID: $Id$
+ *
@@ -102,7 +102,7 @@
+ {
+ if (! strcmp(driver, "ukbd"))
+ hf_device_set_input(device, "keyboard", NULL);
-+ else if (! strcmp(driver, "ums"))
++ else if (! strcmp(driver, "ums") || ! strcmp(driver, "atp"))
+ {
+ hf_device_set_input(device, "mouse", devname);
+ hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL);
@@ -195,11 +195,12 @@
+ addr = libusb20_dev_get_address(pdev);
+
+ if (addr == 1)
-+ parent = hf_devtree_find_parent_from_info(hald_get_gdl(), "usbus", bus);
++ parent = hf_devtree_find_from_info(hald_get_gdl(), "usbus", bus);
+ else
+ parent = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number",
+ HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number",
-+ HAL_PROPERTY_TYPE_INT32, addr - 1, NULL);
++ HAL_PROPERTY_TYPE_INT32, addr - 1, "info.bus",
++ HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
+ if (! parent || hal_device_property_get_bool(parent, "info.ignore"))
+ continue;
+
@@ -219,7 +220,13 @@
+ HalDevice *parent_device;
+ int bus, addr, pbus, paddr;
+
-+ if (strncmp(name, "ugen", strlen("ugen")))
++ if (! parent)
++ return FALSE;
++
++ if (strncmp(name, "ugen", strlen("ugen")) &&
++ ! strncmp(parent, "uhub", strlen("uhub")))
++ return TRUE;
++ else if (strncmp(name, "ugen", strlen("ugen")))
+ return FALSE;
+ else if (strncmp(parent, "ugen", strlen("ugen")))
+ return TRUE;
@@ -235,7 +242,8 @@
+
+ parent_device = hf_device_store_match(hald_get_gdl(),
+ "usb_device.bus_number", HAL_PROPERTY_TYPE_INT32, pbus,
-+ "usb_device.port_number", HAL_PROPERTY_TYPE_INT32, paddr, NULL);
++ "usb_device.port_number", HAL_PROPERTY_TYPE_INT32, paddr, "info.bus",
++ HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
+
+ if (parent_device && ! hal_device_property_get_bool(parent_device,
+ "info.ignore"))
@@ -258,8 +266,6 @@
+
+ if (strncmp(name, "ugen", strlen("ugen")))
+ return FALSE;
-+ else if (strncmp(parent, "ugen", strlen("ugen")))
-+ return TRUE;
+
+ if (sscanf(name, "ugen%i.%i", &bus, &addr) != 2)
+ return FALSE;
@@ -268,7 +274,8 @@
+
+ device = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number",
+ HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number",
-+ HAL_PROPERTY_TYPE_INT32, addr, NULL);
++ HAL_PROPERTY_TYPE_INT32, addr, "info.bus",
++ HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
+
+ if (device)
+ {
@@ -279,6 +286,23 @@
+ return FALSE;
+}
+
++static gboolean
++hf_usb2_devd_notify (const char *system,
++ const char *subsystem,
++ const char *type,
++ const char *data)
++{
++ if (! data || strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") ||
++ (strcmp(type, "CREATE") && strcmp(type, "DESTROY")))
++ return FALSE;
++
++ if (! strncmp(data, "cdev=ugen", strlen("cdev=ugen")) ||
++ ! strncmp(data, "cdev=usb", strlen("cdev=usb")))
++ return TRUE;
++
++ return FALSE;
++}
++
+HFHandler hf_usb2_handler = {
+ .privileged_init = hf_usb2_privileged_init,
+ .probe = hf_usb2_probe
@@ -286,5 +310,6 @@
+
+HFDevdHandler hf_usb2_devd_handler = {
+ .add = hf_usb2_devd_add,
-+ .remove = hf_usb2_devd_remove
++ .remove = hf_usb2_devd_remove,
++ .notify = hf_usb2_devd_notify
+};
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-volume.c b/sysutils/hal/files/patch-hald_freebsd_hf-volume.c
index 039a1a6760f4..6ee93b139a6b 100644
--- a/sysutils/hal/files/patch-hald_freebsd_hf-volume.c
+++ b/sysutils/hal/files/patch-hald_freebsd_hf-volume.c
@@ -1,5 +1,5 @@
---- hald/freebsd/hf-volume.c.orig 2008-05-07 19:24:03.000000000 -0400
-+++ hald/freebsd/hf-volume.c 2008-10-26 15:17:09.000000000 -0400
+--- hald/freebsd/hf-volume.c.orig 2008-08-10 09:50:10.000000000 -0400
++++ hald/freebsd/hf-volume.c 2009-09-19 02:06:37.000000000 -0400
@@ -45,6 +45,7 @@
#include "hf-util.h"
@@ -8,7 +8,7 @@
static void
hf_volume_get_mounts (struct statfs **mounts, int *n_mounts)
-@@ -60,6 +61,55 @@ hf_volume_get_mounts (struct statfs **mo
+@@ -60,6 +61,58 @@ hf_volume_get_mounts (struct statfs **mo
}
}
@@ -37,9 +37,12 @@
+ {
+ if (strcmp(fields[0], special) == 0)
+ {
++ char *ret;
++
++ ret = g_strdup(fields[1]);
+ g_strfreev(fields);
+ g_strfreev(lines);
-+ return g_strdup(fields[1]);
++ return ret;
+ }
+ }
+ g_strfreev(fields);
@@ -64,7 +67,7 @@
static const struct statfs *
hf_volume_mounts_find (const struct statfs *mounts,
int n_mounts,
-@@ -71,8 +121,18 @@ hf_volume_mounts_find (const struct stat
+@@ -71,8 +124,18 @@ hf_volume_mounts_find (const struct stat
g_return_val_if_fail(special != NULL, NULL);
for (i = 0; i < n_mounts; i++)
@@ -85,7 +88,7 @@
return NULL;
}
-@@ -92,7 +152,13 @@ hf_volume_device_update_mount_properties
+@@ -92,7 +155,13 @@ hf_volume_device_update_mount_properties
special = hal_device_property_get_string(device, "block.device");
if (special)
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am
index 405026cc65b3..091af3c1ca0e 100644
--- a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am
+++ b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am
@@ -1,5 +1,5 @@
---- hald/freebsd/probing/Makefile.am.orig 2008-05-07 19:24:08.000000000 -0400
-+++ hald/freebsd/probing/Makefile.am 2009-02-18 00:16:28.000000000 -0500
+--- hald/freebsd/probing/Makefile.am.orig 2008-08-10 09:50:10.000000000 -0400
++++ hald/freebsd/probing/Makefile.am 2009-07-17 02:31:02.000000000 -0400
@@ -9,11 +9,18 @@ AM_CPPFLAGS = \
if HALD_COMPILE_FREEBSD
@@ -49,3 +49,9 @@
hald_probe_smbios_SOURCES = probe-smbios.c
hald_probe_smbios_LDADD = \
$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
+@@ -41,4 +67,5 @@ hald_probe_volume_CPPFLAGS = $(AM_CPPFLA
+ hald_probe_volume_LDADD = \
+ @GLIB_LIBS@ \
+ @VOLUME_ID_LIBS@ \
++ -lufs \
+ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in
index 5cc771653f20..4a8ea2f053e3 100644
--- a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in
+++ b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in
@@ -1,5 +1,5 @@
---- hald/freebsd/probing/Makefile.in.orig 2009-02-15 13:42:09.000000000 -0500
-+++ hald/freebsd/probing/Makefile.in 2009-02-18 00:18:00.000000000 -0500
+--- hald/freebsd/probing/Makefile.in.orig 2009-07-16 22:17:53.000000000 -0400
++++ hald/freebsd/probing/Makefile.in 2009-07-17 02:32:09.000000000 -0400
@@ -34,10 +34,16 @@ build_triplet = @build@
host_triplet = @host@
@HALD_COMPILE_FREEBSD_TRUE@libexec_PROGRAMS = \
@@ -75,15 +75,7 @@
$(hald_probe_volume_SOURCES)
ETAGS = etags
CTAGS = ctags
-@@ -238,6 +266,7 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CPPFLAGS = \
-@@ -254,6 +283,23 @@ hald_probe_hiddev_LDADD = \
+@@ -263,6 +291,23 @@ hald_probe_hiddev_LDADD = \
$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \
-lusbhid
@@ -107,7 +99,15 @@
hald_probe_smbios_SOURCES = probe-smbios.c
hald_probe_smbios_LDADD = \
$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
-@@ -340,6 +386,9 @@ clean-libexecPROGRAMS:
+@@ -283,6 +328,7 @@ hald_probe_volume_CPPFLAGS = $(AM_CPPFLA
+ hald_probe_volume_LDADD = \
+ @GLIB_LIBS@ \
+ @VOLUME_ID_LIBS@ \
++ -lufs \
+ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
+
+ all: all-am
+@@ -349,6 +395,9 @@ clean-libexecPROGRAMS:
hald-probe-hiddev$(EXEEXT): $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_DEPENDENCIES)
@rm -f hald-probe-hiddev$(EXEEXT)
$(LINK) $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_LDADD) $(LIBS)
@@ -117,7 +117,7 @@
hald-probe-scsi$(EXEEXT): $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_DEPENDENCIES)
@rm -f hald-probe-scsi$(EXEEXT)
$(LINK) $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_LDADD) $(LIBS)
-@@ -349,6 +398,12 @@ hald-probe-smbios$(EXEEXT): $(hald_probe
+@@ -358,6 +407,12 @@ hald-probe-smbios$(EXEEXT): $(hald_probe
hald-probe-storage$(EXEEXT): $(hald_probe_storage_OBJECTS) $(hald_probe_storage_DEPENDENCIES)
@rm -f hald-probe-storage$(EXEEXT)
$(LINK) $(hald_probe_storage_OBJECTS) $(hald_probe_storage_LDADD) $(LIBS)
@@ -130,7 +130,7 @@
hald-probe-volume$(EXEEXT): $(hald_probe_volume_OBJECTS) $(hald_probe_volume_DEPENDENCIES)
@rm -f hald-probe-volume$(EXEEXT)
$(LINK) $(hald_probe_volume_OBJECTS) $(hald_probe_volume_LDADD) $(LIBS)
-@@ -359,6 +414,7 @@ mostlyclean-compile:
+@@ -368,6 +423,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@@ -138,7 +138,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_storage-probe-storage.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po@am__quote@
-@@ -366,6 +422,8 @@ distclean-compile:
+@@ -375,6 +431,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-hiddev.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-scsi.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-smbios.Po@am__quote@
@@ -147,7 +147,7 @@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -388,6 +446,20 @@ distclean-compile:
+@@ -397,6 +455,20 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c
index b9dc099e63b3..c92b7026654d 100644
--- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c
+++ b/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c
@@ -1,6 +1,19 @@
---- hald/freebsd/probing/probe-volume.c.orig 2008-04-07 00:41:22.000000000 -0400
-+++ hald/freebsd/probing/probe-volume.c 2008-04-07 00:43:32.000000000 -0400
-@@ -502,7 +502,8 @@ main (int argc, char **argv)
+--- hald/freebsd/probing/probe-volume.c.orig 2008-08-10 09:50:10.000000000 -0400
++++ hald/freebsd/probing/probe-volume.c 2009-09-26 03:54:16.000000000 -0400
+@@ -36,7 +36,12 @@
+ #include <sys/disk.h>
+ #include <sys/cdio.h>
+ #include <sys/param.h>
++#include <sys/mount.h>
+ #include <sys/types.h>
++#include <ufs/ufs/ufsmount.h>
++#include <ufs/ufs/dinode.h>
++#include <ufs/ffs/fs.h>
++#include <libufs.h>
+ #include <isofs/cd9660/iso.h>
+ #include <glib.h>
+ #include <libvolume_id.h>
+@@ -502,7 +507,8 @@ main (int argc, char **argv)
hfp_cdrom_free(cdrom);
}
@@ -10,3 +23,52 @@
hf_probe_volume_advanced_disc_detect(fd);
}
else
+@@ -555,6 +561,48 @@ main (int argc, char **argv)
+
+ libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", has_children || is_swap, &hfp_error);
+
++ if (vid && ! strcmp (vid->type, "ufs"))
++ {
++ struct uufsd ufsdisk;
++
++ if (ufs_disk_fillout(&ufsdisk, device_file) == 0)
++ {
++ char ufsid[64];
++ char **ufs_devs = NULL;
++ int num_udis;
++ int i;
++
++ snprintf(ufsid, sizeof(ufsid), "%08x%08x", ufsdisk.d_fs.fs_id[0], ufsdisk.d_fs.fs_id[1]);
++ libhal_device_set_property_string(hfp_ctx, hfp_udi, "volume.freebsd.ufsid", ufsid, &hfp_error);
++ dbus_error_free(&hfp_error);
++ ufs_devs = libhal_manager_find_device_string_match(hfp_ctx,
++ "volume.freebsd.ufsid",
++ ufsid,
++ &num_udis,
++ &hfp_error);
++ dbus_error_free(&hfp_error);
++ for (i = 0; i < num_udis; i++)
++ {
++ if (ufs_devs[i] != NULL && strcmp(ufs_devs[i], hfp_udi))
++ {
++ gboolean mounted;
++
++ mounted = libhal_device_get_property_bool(hfp_ctx, ufs_devs[i], "volume.is_mounted", &hfp_error);
++ dbus_error_free(&hfp_error);
++ if (mounted)
++ {
++ libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", TRUE, &hfp_error);
++ dbus_error_free(&hfp_error);
++ break;
++ }
++ }
++ }
++ if (ufs_devs)
++ libhal_free_string_array(ufs_devs);
++ ufs_disk_close(&ufsdisk);
++ }
++ }
++
+ if (has_children)
+ usage = "partitiontable";
+ else if (is_swap)
diff --git a/sysutils/hal/files/patch-hald_hf-storage.c b/sysutils/hal/files/patch-hald_hf-storage.c
index 605342c36b3b..a699ca827e57 100644
--- a/sysutils/hal/files/patch-hald_hf-storage.c
+++ b/sysutils/hal/files/patch-hald_hf-storage.c
@@ -1,14 +1,15 @@
---- hald/freebsd/hf-storage.c.orig 2008-08-10 09:50:10.000000000 -0400
-+++ hald/freebsd/hf-storage.c 2009-05-23 18:52:52.000000000 -0400
-@@ -30,6 +30,7 @@
+--- hald/freebsd/hf-storage.c.orig 2009-05-12 08:24:28.000000000 -0400
++++ hald/freebsd/hf-storage.c 2009-10-24 02:30:22.000000000 -0400
+@@ -30,6 +30,8 @@
#include <limits.h>
#include <inttypes.h>
#include <string.h>
++#include <unistd.h>
+#include <sys/param.h>
#include <sys/types.h>
#include <sys/disklabel.h>
-@@ -38,6 +39,7 @@
+@@ -38,6 +40,7 @@
#include "hf-storage.h"
#include "hf-block.h"
@@ -16,7 +17,7 @@
#include "hf-devtree.h"
#include "hf-volume.h"
#include "hf-util.h"
-@@ -64,7 +66,7 @@ typedef struct
+@@ -64,7 +67,7 @@ typedef struct
static GNode *hf_storage_geom_tree = NULL;
static GHashTable *hf_storage_geom_hash = NULL;
@@ -25,7 +26,7 @@
static gboolean hf_storage_device_has_addon (HalDevice *device);
static void
-@@ -104,6 +106,8 @@ hf_storage_class_is_partitionable (const
+@@ -104,6 +107,8 @@ hf_storage_class_is_partitionable (const
{
return (! strcmp(geom_class, "MBR") ||
! strcmp(geom_class, "MBREXT") ||
@@ -34,7 +35,7 @@
! strcmp(geom_class, "GPT") ||
! strcmp(geom_class, "APPLE") || ! strcmp(geom_class, "SUN"));
}
-@@ -117,6 +121,7 @@ hf_storage_geom_has_partitions (const Ge
+@@ -117,6 +122,7 @@ hf_storage_geom_has_partitions (const Ge
if (g_node_n_children(node) > 0)
return TRUE;
@@ -42,7 +43,7 @@
if (hf_storage_class_is_partitionable(geom_obj->class) &&
g_node_next_sibling(node) != NULL)
{
-@@ -135,6 +140,7 @@ hf_storage_geom_has_partitions (const Ge
+@@ -135,6 +141,7 @@ hf_storage_geom_has_partitions (const Ge
return TRUE;
}
}
@@ -50,7 +51,7 @@
return FALSE;
}
-@@ -294,7 +300,7 @@ hf_storage_device_probe (HalDevice *devi
+@@ -294,7 +301,7 @@ hf_storage_device_probe (HalDevice *devi
{
g_return_if_fail(HAL_IS_DEVICE(device));
@@ -59,7 +60,7 @@
if (hf_runner_run_sync(device, 0, "hald-probe-storage",
"HF_HAS_CHILDREN", HF_BOOL_TO_STRING(hf_storage_device_has_partitions(device)),
-@@ -403,13 +409,20 @@ hf_storage_parse_conftxt (const char *co
+@@ -403,13 +410,49 @@ hf_storage_parse_conftxt (const char *co
continue;
}
@@ -72,17 +73,46 @@
+ continue;
+ }
+
++ /* XXX This is a hack, but we need to ignore dynamic labels like
++ * ufsids which are created and destroyed based on whether or not
++ * the actual device is mounted or not. If we don't then strange
++ * things happen in applications like nautilus.
++ */
++ if ((! strcmp(fields[1], "LABEL") ||
++ ! strcmp(fields[1], "BSD")) &&
++ ! strncmp(fields[2], "ufsid/", strlen("ufsid/")))
++ {
++ g_strfreev(fields);
++ continue;
++ }
++
geom_obj = g_new0(Geom_Object, 1);
- depth = atoi(fields[0]);
geom_obj->class = g_strdup(fields[1]);
geom_obj->dev = g_strdup(fields[2]);
++ /* Allow for spaces in label names. */
++ if (! strcmp(fields[1], "LABEL"))
++ {
++ int j;
++
++ for (j = 3; g_strv_length(fields) > (j + 2) &&
++ strcmp(fields[j + 2], "i"); j++)
++ {
++ char *tmp;
++
++ tmp = g_strdup_printf("%s %s", geom_obj->dev, fields[j]);
++ g_free(geom_obj->dev);
++ geom_obj->dev = tmp;
++ }
++ }
++
geom_obj->type = -1; /* We use -1 here to denote a missing type. */
- hash = g_str_hash(geom_obj->dev);
geom_obj->hash = hash;
if (g_strv_length(fields) >= 5)
-@@ -433,6 +446,30 @@ hf_storage_parse_conftxt (const char *co
+@@ -433,6 +476,30 @@ hf_storage_parse_conftxt (const char *co
if (! strcmp (geom_obj->class, "GPT") ||
! strcmp (geom_obj->class, "APPLE"))
geom_obj->str_type = g_strdup(fields[10]);
@@ -113,7 +143,7 @@
else
geom_obj->type = atoi(fields[10]);
}
-@@ -541,15 +578,20 @@ hf_storage_device_rescan_real (HalDevice
+@@ -541,17 +608,27 @@ hf_storage_device_rescan_real (HalDevice
}
static gboolean
@@ -131,13 +161,20 @@
- if (hf_is_waiting)
- return TRUE;
-+ if (strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") ||
++ if (! data || strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") ||
+ (strcmp(type, "CREATE") && strcmp(type, "DESTROY")))
+ return FALSE;
++
++ if (! strcmp(type, "DESTROY"))
++ g_usleep(G_USEC_PER_SEC/2);
conftxt = hf_get_string_sysctl(NULL, "kern.geom.conftxt");
++ if (! conftxt)
++ return FALSE;
new_disks = hf_storage_parse_conftxt(conftxt);
-@@ -572,6 +614,7 @@ hf_storage_conftxt_timeout_cb (gpointer
+ g_free(conftxt);
+
+@@ -572,6 +649,7 @@ hf_storage_conftxt_timeout_cb (gpointer
if (! hf_storage_find_disk(disks, disk->name))
{
osspec_probe(); /* catch new disk(s) */
@@ -145,7 +182,7 @@
break;
}
}
-@@ -593,7 +636,10 @@ hf_storage_conftxt_timeout_cb (gpointer
+@@ -593,7 +671,10 @@ hf_storage_conftxt_timeout_cb (gpointer
device = hf_devtree_find_from_name(hald_get_gdl(), disk->name);
if (device && hal_device_has_capability(device, "storage") &&
! hf_storage_device_has_addon(device))
@@ -157,7 +194,7 @@
}
}
else
-@@ -601,7 +647,10 @@ hf_storage_conftxt_timeout_cb (gpointer
+@@ -601,7 +682,10 @@ hf_storage_conftxt_timeout_cb (gpointer
/* disk removed */
device = hf_devtree_find_from_name(hald_get_gdl(), disk->name);
if (device && hal_device_has_capability(device, "storage"))
@@ -169,7 +206,7 @@
}
}
}
-@@ -610,17 +659,30 @@ hf_storage_conftxt_timeout_cb (gpointer
+@@ -610,17 +694,30 @@ hf_storage_conftxt_timeout_cb (gpointer
g_slist_free(disks);
disks = new_disks;
@@ -183,7 +220,7 @@
+ if (hf_is_waiting)
+ return TRUE;
+
-+ hf_storage_devd_notify("DEVFS", "CDEV", "CREATE", NULL);
++ hf_storage_devd_notify("DEVFS", "CDEV", "CREATE", "");
+
return TRUE;
}
@@ -202,7 +239,7 @@
return;
conftxt = hf_get_string_sysctl(NULL, "kern.geom.conftxt");
-@@ -636,8 +698,10 @@ hf_storage_init_geom (void)
+@@ -636,8 +733,10 @@ hf_storage_init_geom (void)
static void
hf_storage_init (void)
{
@@ -214,7 +251,7 @@
}
void
-@@ -720,8 +784,6 @@ hf_storage_device_add (HalDevice *device
+@@ -719,8 +818,6 @@ hf_storage_device_add (HalDevice *device
{
g_return_if_fail(HAL_IS_DEVICE(device));
@@ -223,7 +260,7 @@
if (hf_device_preprobe(device))
{
hf_storage_device_probe(device, FALSE);
-@@ -739,7 +801,7 @@ hf_storage_get_geoms (const char *devnam
+@@ -738,7 +835,7 @@ hf_storage_get_geoms (const char *devnam
g_return_val_if_fail(devname != NULL, NULL);
@@ -232,7 +269,7 @@
hash = g_str_hash(devname);
node = g_node_find(hf_storage_geom_tree, G_PRE_ORDER, G_TRAVERSE_ALL,
-@@ -802,3 +864,7 @@ HFHandler hf_storage_handler = {
+@@ -801,3 +898,7 @@ HFHandler hf_storage_handler = {
.probe = hf_storage_probe,
.device_rescan = hf_storage_device_rescan
};
diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist
index 03a497327d34..0f42ef11f040 100644
--- a/sysutils/hal/pkg-plist
+++ b/sysutils/hal/pkg-plist
@@ -1,5 +1,4 @@
@unexec %D/etc/rc.d/hald stop > /dev/null 2>&1 || true
-%%MEDIA%%@exec mkdir -p /media
bin/hal-device
bin/hal-disable-polling
bin/hal-find-by-capability
@@ -83,6 +82,7 @@ sbin/hald
%%DATADIR%%/fdi/policy/10osvendor/10-dockstation.fdi
%%DATADIR%%/fdi/policy/10osvendor/10-input-policy.fdi
%%DATADIR%%/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
+%%DATADIR%%/fdi/policy/10osvendor/10-leds.fdi
%%DATADIR%%/fdi/policy/10osvendor/10-mouse-sysmouse.fdi
%%DATADIR%%/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
%%DATADIR%%/fdi/policy/10osvendor/10-rfkill-switch.fdi
@@ -94,6 +94,7 @@ sbin/hald
%%DATADIR%%/mount-fuse
share/PolicyKit/policy/org.freedesktop.hal.dockstation.policy
share/PolicyKit/policy/org.freedesktop.hal.killswitch.policy
+share/PolicyKit/policy/org.freedesktop.hal.leds.policy
share/PolicyKit/policy/org.freedesktop.hal.policy
share/PolicyKit/policy/org.freedesktop.hal.power-management.policy
share/PolicyKit/policy/org.freedesktop.hal.storage.policy
@@ -131,4 +132,3 @@ share/PolicyKit/policy/org.freedesktop.hal.wol.policy
@unexec rmdir /var/cache 2>/dev/null || true
@unexec /var/lib/hal 2>/dev/null || true
@unexec /var/lib 2>/dev/null || true
-%%MEDIA%%@unexec rmdir /media 2>/dev/null || true
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 78684e9dfca4..088c7f640852 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.147 2009/04/07 03:11:00 marcus Exp $
+# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.149 2009/09/25 18:40:01 kwm Exp $
#
PORTNAME= nautilus-cd-burner
PORTVERSION= 2.24.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -26,7 +26,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack \
- desktopfileutils ltasneededhack eel2
+ desktopfileutils ltasneededhack eel2 libgnomeui
USE_CDRTOOLS= yes
INSTALLS_ICONS= yes
USE_AUTOTOOLS= libtool:22
diff --git a/sysutils/nautilus-cd-burner/files/patch-configure b/sysutils/nautilus-cd-burner/files/patch-configure
deleted file mode 100644
index e8dbb4a5b891..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-configure
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.orig Thu Jul 22 10:27:35 2004
-+++ configure Thu Jul 22 10:29:32 2004
-@@ -21015,6 +21015,8 @@
- if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+ ac_check_lib_save_LIBS=$LIBS
-+ LIBS="-lintl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -21097,6 +21099,7 @@
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-+ LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -21104,6 +21107,7 @@
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-+LIBS="-lintl $LIBS"
-
- fi
- done
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c b/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c
deleted file mode 100644
index 71f43178c354..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/list_cddrives.c.orig 2008-01-21 11:14:45.000000000 -0500
-+++ src/list_cddrives.c 2008-01-21 19:48:49.000000000 -0500
-@@ -49,6 +49,7 @@ list_drive_info (NautilusBurnDrive *driv
- g_print ("Drive:\n");
- g_print (" name:\t\t\t%s\n", display_name);
- g_print (" device:\t\t%s\n", nautilus_burn_drive_get_device (drive));
-+ g_print (" cdrecord device:\t%s\n", nautilus_burn_drive_get_cdrecord_device (drive));
- g_print (" door:\t\t\t%s\n", door_is_open ? "open" : "closed");
- g_print (" type:\t\t\t%s\n", type_str);
- g_print (" is mounted:\t\t%s\n", is_mounted ? "TRUE" : "FALSE");
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c b/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c
deleted file mode 100644
index 18183a421d3b..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/make-iso.c.orig Sun Nov 19 13:34:29 2006
-+++ src/make-iso.c Sun Nov 19 13:36:03 2006
-@@ -1367,7 +1367,7 @@ get_disc_info (NautilusBurnIso *iso,
- &has_data,
- &_has_audio);
- if (_has_audio) {
-- device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_device (drive));
-+ device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_cdrecord_device (drive));
-
- argv = g_ptr_array_new ();
- g_ptr_array_add (argv, "cdrdao");
-@@ -1377,7 +1377,7 @@ get_disc_info (NautilusBurnIso *iso,
- g_ptr_array_add (argv, NULL);
-
- } else {
-- device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_device (drive));
-+ device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
-
- argv = g_ptr_array_new ();
- g_ptr_array_add (argv, "readcd");
-@@ -1547,7 +1547,7 @@ nautilus_burn_iso_make_from_drive (Nauti
- g_ptr_array_add (argv, "--datafile");
- g_ptr_array_add (argv, (char *)filename);
- g_ptr_array_add (argv, "--device");
-- g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive));
-+ g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive));
- g_ptr_array_add (argv, "-v");
- g_ptr_array_add (argv, "2");
- g_ptr_array_add (argv, (char *)toc_filename_arg);
-@@ -1559,7 +1559,7 @@ nautilus_burn_iso_make_from_drive (Nauti
-
- filename_arg = g_strdup_printf ("f=%s", filename);
-
-- dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
-+ dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
-
- argv = g_ptr_array_new ();
- g_ptr_array_add (argv, "readcd");
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c
deleted file mode 100644
index 2d62886636fa..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/nautilus-burn-drive-monitor.c.orig 2007-07-10 15:06:23.000000000 -0400
-+++ src/nautilus-burn-drive-monitor.c 2008-01-05 13:51:44.000000000 -0500
-@@ -618,7 +618,8 @@ nautilus_burn_drive_monitor_get_drive_fo
- */
- if (drive->priv->device != NULL &&
- (strcmp (drive->priv->device, target) == 0 ||
-- strcmp (drive->priv->device, device) == 0)) {
-+ strcmp (drive->priv->device, device) == 0 ||
-+ strcmp (drive->priv->cdrecord_device, device) == 0)) {
- ret = nautilus_burn_drive_ref (drive);
- break;
- }
-@@ -683,6 +684,8 @@ hal_drive_from_udi (LibHalContext *ctx,
- NautilusBurnDrive *drive;
- char **write_speeds = NULL;
- char *raw_device = NULL;
-+ char *cam_path = NULL;
-+ char *cam_device = NULL;
-
- LIBHAL_CHECK_LIBHALCONTEXT (ctx, FALSE);
-
-@@ -711,6 +714,8 @@ hal_drive_from_udi (LibHalContext *ctx,
-
- LIBHAL_PROP_EXTRACT_STRING ("block.device", drive->priv->device);
- LIBHAL_PROP_EXTRACT_STRING ("block.solaris.raw_device", raw_device);
-+ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.atapi_cam_device", cam_device);
-+ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.cam_path", cam_path);
- LIBHAL_PROP_EXTRACT_STRING ("storage.model", drive->priv->display_name);
-
- LIBHAL_PROP_EXTRACT_INT ("storage.cdrom.read_speed", drive->priv->max_speed_read);
-@@ -736,6 +741,17 @@ hal_drive_from_udi (LibHalContext *ctx,
- drive->priv->device = raw_device;
- }
-
-+ if (cam_device != NULL) {
-+ g_free (drive->priv->device);
-+ drive->priv->device = cam_device;
-+ }
-+
-+ if (cam_path != NULL) {
-+ drive->priv->cdrecord_device = cam_path;
-+ } else {
-+ drive->priv->cdrecord_device = g_strdup (drive->priv->device);
-+ }
-+
- drive->priv->drive_udi = g_strdup (udi);
- drive->priv->write_speeds = hal_parse_write_speeds (write_speeds);
- /* we do not own write_speeds so do not free it. */
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h
deleted file mode 100644
index a4da309cbb17..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/nautilus-burn-drive-private.h.orig Sun Nov 19 13:43:24 2006
-+++ src/nautilus-burn-drive-private.h Sun Nov 19 13:43:50 2006
-@@ -34,6 +34,7 @@ struct NautilusBurnDrivePrivate {
-
- int type;
- char *device;
-+ char *cdrecord_device;
- char *display_name;
- int max_speed_write;
- int max_speed_read;
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
deleted file mode 100644
index 17a0384464ec..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/nautilus-burn-drive.c.orig Fri Sep 29 12:55:36 2006
-+++ src/nautilus-burn-drive.c Sun Nov 19 13:27:31 2006
-@@ -266,6 +266,25 @@ nautilus_burn_drive_get_device (Nautilus
- }
-
- /**
-+ * nautilus_burn_drive_get_cdrecord_device:
-+ * @drive: #NautilusBurnDrive
-+ *
-+ * Get the name of the device associated with the drive suitable for
-+ * user with cdrcord.
-+ *
-+ * Returns: device name. Must be not be freed.
-+ *
-+ * Since: 2.16
-+ **/
-+const char *
-+nautilus_burn_drive_get_cdrecord_device (NautilusBurnDrive *drive)
-+{
-+ g_return_val_if_fail (drive != NULL, NULL);
-+
-+ return drive->priv->cdrecord_device;
-+}
-+
-+/**
- * nautilus_burn_drive_get_drive_type:
- * @drive: #NautilusBurnDrive
- *
-@@ -1021,6 +1044,7 @@ nautilus_burn_drive_finalize (GObject *o
- g_free (drive->priv->write_speeds);
- g_free (drive->priv->display_name);
- g_free (drive->priv->device);
-+ g_free (drive->priv->cdrecord_device);
-
- if (G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize != NULL) {
- (* G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize) (object);
-@@ -1038,6 +1062,7 @@ nautilus_burn_drive_init (NautilusBurnDr
- drive->priv->max_speed_read = 0;
- drive->priv->write_speeds = NULL;
- drive->priv->device = NULL;
-+ drive->priv->cdrecord_device = NULL;
- }
-
- /**
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h
deleted file mode 100644
index f033fa3ba295..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/nautilus-burn-drive.h.orig Sun Nov 19 13:37:32 2006
-+++ src/nautilus-burn-drive.h Sun Nov 19 13:37:55 2006
-@@ -127,6 +127,7 @@ gboolean nautilus_burn_driv
- int nautilus_burn_drive_get_drive_type (NautilusBurnDrive *drive);
- char * nautilus_burn_drive_get_name_for_display (NautilusBurnDrive *drive);
- const char * nautilus_burn_drive_get_device (NautilusBurnDrive *drive);
-+const char * nautilus_burn_drive_get_cdrecord_device (NautilusBurnDrive *drive);
-
- /* Capabilities */
- gboolean nautilus_burn_drive_can_write (NautilusBurnDrive *drive);
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c
deleted file mode 100644
index 85f6416abcfe..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/nautilus-burn-recorder.c.orig Fri Sep 29 14:18:37 2006
-+++ src/nautilus-burn-recorder.c Mon Nov 20 18:13:24 2006
-@@ -1343,7 +1343,7 @@ nautilus_burn_recorder_write_cdrecord (N
- g_ptr_array_add (argv, "cdrdao");
- g_ptr_array_add (argv, "write");
- g_ptr_array_add (argv, "--device");
-- g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive));
-+ g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive));
- g_ptr_array_add (argv, "--speed");
- speed_str = g_strdup_printf ("%d", speed);
- g_ptr_array_add (argv, speed_str);
-@@ -1375,7 +1375,7 @@ nautilus_burn_recorder_write_cdrecord (N
- if (speed != 0) {
- g_ptr_array_add (argv, speed_str);
- }
-- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
-+ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
- g_ptr_array_add (argv, dev_str);
- if (flags & NAUTILUS_BURN_RECORDER_WRITE_DUMMY_WRITE) {
- g_ptr_array_add (argv, "-dummy");
-@@ -1486,7 +1486,7 @@ nautilus_burn_recorder_blank_disc_cdreco
- argv = g_ptr_array_new ();
- g_ptr_array_add (argv, "cdrecord");
-
-- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
-+ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
- g_ptr_array_add (argv, dev_str);
- g_ptr_array_add (argv, "-v");
-
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
deleted file mode 100644
index 13cfcc6be76e..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/nautilus-cd-burner.c.orig 2008-01-21 11:16:24.000000000 -0500
-+++ src/nautilus-cd-burner.c 2008-04-02 16:48:23.000000000 -0400
-@@ -27,6 +27,8 @@
-
- #include "config.h"
-
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <time.h>
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
index e2e166dc052c..36ce4ee74aeb 100644
--- a/sysutils/pessulus/Makefile
+++ b/sysutils/pessulus/Makefile
@@ -3,12 +3,11 @@
# Whom: FreeBSD GNOME Team
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/pessulus/Makefile,v 1.1 2009/04/15 21:45:06 kwm Exp $
+# $MCom: ports/sysutils/pessulus/Makefile,v 1.24 2009/09/23 13:07:48 kwm Exp $
#
PORTNAME= pessulus
-PORTVERSION= 2.26.2
-PORTREVISION= 1
+PORTVERSION= 2.28.0
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo
index d476ca623da0..8ab858b7b6b0 100644
--- a/sysutils/pessulus/distinfo
+++ b/sysutils/pessulus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pessulus-2.26.2.tar.bz2) = 255ec0743714b6fc50da796f6bc95009
-SHA256 (gnome2/pessulus-2.26.2.tar.bz2) = 019923718cf92f821a2d2f2067cf121dd91ea2f7c3377324019e6c5ec5928785
-SIZE (gnome2/pessulus-2.26.2.tar.bz2) = 160342
+MD5 (gnome2/pessulus-2.28.0.tar.bz2) = 792485aac615a8f36f7d77bc06a40036
+SHA256 (gnome2/pessulus-2.28.0.tar.bz2) = f6efb78f234f8fa5c2d1310e13340ec46d49c22d6de710daeb5136e75ff1a012
+SIZE (gnome2/pessulus-2.28.0.tar.bz2) = 178550
diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist
index 78aa89faa10e..f8034c268616 100644
--- a/sysutils/pessulus/pkg-plist
+++ b/sysutils/pessulus/pkg-plist
@@ -55,12 +55,14 @@ share/icons/hicolor/scalable/apps/pessulus.svg
%%PORTDOCS%%%%DOCSDIR%%/TODO
share/locale/ar/LC_MESSAGES/pessulus.mo
share/locale/as/LC_MESSAGES/pessulus.mo
+share/locale/ast/LC_MESSAGES/pessulus.mo
share/locale/bal/LC_MESSAGES/pessulus.mo
share/locale/be/LC_MESSAGES/pessulus.mo
share/locale/be@latin/LC_MESSAGES/pessulus.mo
share/locale/bg/LC_MESSAGES/pessulus.mo
share/locale/bn/LC_MESSAGES/pessulus.mo
share/locale/bn_IN/LC_MESSAGES/pessulus.mo
+share/locale/br/LC_MESSAGES/pessulus.mo
share/locale/ca/LC_MESSAGES/pessulus.mo
share/locale/ca@valencia/LC_MESSAGES/pessulus.mo
share/locale/crh/LC_MESSAGES/pessulus.mo
@@ -91,11 +93,13 @@ share/locale/kn/LC_MESSAGES/pessulus.mo
share/locale/ku/LC_MESSAGES/pessulus.mo
share/locale/lt/LC_MESSAGES/pessulus.mo
share/locale/lv/LC_MESSAGES/pessulus.mo
+share/locale/mai/LC_MESSAGES/pessulus.mo
share/locale/mk/LC_MESSAGES/pessulus.mo
share/locale/ml/LC_MESSAGES/pessulus.mo
share/locale/mn/LC_MESSAGES/pessulus.mo
share/locale/mr/LC_MESSAGES/pessulus.mo
share/locale/nb/LC_MESSAGES/pessulus.mo
+share/locale/nds/LC_MESSAGES/pessulus.mo
share/locale/ne/LC_MESSAGES/pessulus.mo
share/locale/nl/LC_MESSAGES/pessulus.mo
share/locale/nn/LC_MESSAGES/pessulus.mo
@@ -124,8 +128,8 @@ share/locale/vi/LC_MESSAGES/pessulus.mo
share/locale/zh_CN/LC_MESSAGES/pessulus.mo
share/locale/zh_HK/LC_MESSAGES/pessulus.mo
share/locale/zh_TW/LC_MESSAGES/pessulus.mo
-%%DATADIR%%/glade/pessulus.glade
-@dirrm %%DATADIR%%/glade
+%%DATADIR%%/ui/pessulus.ui
+@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%PYTHON_SITELIBDIR%%/Pessulus
@@ -142,8 +146,12 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo
@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@@ -152,11 +160,15 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo
@dirrmtry share/locale/crh
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/br/LC_MESSAGES
+@dirrmtry share/locale/br
@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/bal/LC_MESSAGES
@dirrmtry share/locale/bal
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
new file mode 100644
index 000000000000..0b525ec44a54
--- /dev/null
+++ b/sysutils/polkit-gnome/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for: polkit-gnome
+# Date Created: 30 Juli 2009
+# Whom: Koop Mast<kwm@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.5 2009/11/24 02:22:19 marcus Exp $
+#
+
+PORTNAME= polkit-gnome
+PORTVERSION= 0.95
+CATEGORIES= sysutils gnome
+MASTER_SITES= http://hal.freedesktop.org/releases/
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME frontend to the PolicKit framework
+
+BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+LIB_DEPENDS= polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
+RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_GETTEXT= yes
+USE_GNOME= gnomehack gnomeprefix gtk20 intlhack
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+CONFIGURE_ARGS= --disable-gtk-doc \
+ --localstatedir=/var
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.mk>
diff --git a/sysutils/polkit-gnome/distinfo b/sysutils/polkit-gnome/distinfo
new file mode 100644
index 000000000000..e43e18c8caaa
--- /dev/null
+++ b/sysutils/polkit-gnome/distinfo
@@ -0,0 +1,3 @@
+MD5 (polkit-gnome-0.95.tar.bz2) = e52555258ebae5d3f080b7b4cd6aedd4
+SHA256 (polkit-gnome-0.95.tar.bz2) = 3ee6bfe7475856f2287736d7174bbe4199ca32d803e23e1ce653434e1ba56c06
+SIZE (polkit-gnome-0.95.tar.bz2) = 361305
diff --git a/sysutils/polkit-gnome/pkg-descr b/sysutils/polkit-gnome/pkg-descr
new file mode 100644
index 000000000000..57dad7b5d29a
--- /dev/null
+++ b/sysutils/polkit-gnome/pkg-descr
@@ -0,0 +1,5 @@
+PolicyKit is a framework for defining policy for system-wide components and
+for desktop pieces to configure it. PolicyKit-gnome is a GTK+/GNOME frontend
+for that framework.
+
+WWW: http://www.freedesktop.org/wiki/Software/PolicyKit
diff --git a/sysutils/polkit-gnome/pkg-plist b/sysutils/polkit-gnome/pkg-plist
new file mode 100644
index 000000000000..bfa353ff1107
--- /dev/null
+++ b/sysutils/polkit-gnome/pkg-plist
@@ -0,0 +1,66 @@
+etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
+include/polkit-gtk-1/polkitgtk/polkitgtk.h
+include/polkit-gtk-1/polkitgtk/polkitgtktypes.h
+include/polkit-gtk-1/polkitgtk/polkitlockbutton.h
+lib/girepository-1.0/PolkitGtk-1.0.typelib
+lib/libpolkit-gtk-1.a
+lib/libpolkit-gtk-1.la
+lib/libpolkit-gtk-1.so
+lib/libpolkit-gtk-1.so.0
+libexec/polkit-gnome-authentication-agent-1
+libdata/pkgconfig/polkit-gtk-1.pc
+share/gir-1.0/PolkitGtk-1.0.gir
+share/locale/ar/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/be/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/ca/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/cs/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/da/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/de/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/el/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/en_GB/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/es/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/eu/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/fi/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/fr/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/gl/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/gu/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/he/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/hu/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/it/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/ja/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/lt/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/nb/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/pa/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/pl/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/pt/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/pt_BR/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/ru/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/sk/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/sv/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/zh_CN/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/zh_HK/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/zh_TW/LC_MESSAGES/polkit-gnome-1.mo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
+@dirrm include/polkit-gtk-1/polkitgtk
+@dirrm include/polkit-gtk-1
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
new file mode 100644
index 000000000000..67cddeda6203
--- /dev/null
+++ b/sysutils/polkit/Makefile
@@ -0,0 +1,66 @@
+# New ports collection makefile for: polkit
+# Date Created: 30 Juli 2009
+# Whom: Koop Mast<kwm@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/sysutils/polkit/Makefile,v 1.5 2009/11/26 14:22:58 mezz Exp $
+#
+
+PORTNAME= polkit
+PORTVERSION= 0.95
+PORTREVISION= 1
+CATEGORIES= sysutils gnome
+MASTER_SITES= http://hal.freedesktop.org/releases/
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Framework for controlling access to system-wide components
+
+BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS= eggdbus-1.0:${PORTSDIR}/devel/eggdbus \
+ expat.6:${PORTSDIR}/textproc/expat2
+RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
+
+USE_GNOME= gnomehack glib20 intlhack
+USE_GMAKE= yes
+USE_GETTEXT= yes
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+CONFIGURE_ARGS= --disable-gtk-doc \
+ --with-authfw=pam \
+ --with-pam-include=system \
+ --with-os-type=freebsd \
+ --enable-introspection \
+ --localstatedir=/var \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ GTKDOC="false"
+
+.if defined(NO_INSTALL_MANPAGES)
+CONFIGURE_ARGS+=--disable-man-pages
+.else
+BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1/catalog:${PORTSDIR}/textproc/docbook-410 \
+ xsltproc:${PORTSDIR}/textproc/libxslt \
+ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+
+MAN1= pkaction.1 pkcheck.1 pkexec.1
+MAN8= pklocalauthority.8 polkit.8 polkitd.8
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|/usr/bin/|${PREFIX}/bin/|g' \
+ ${WRKSRC}/docs/man/pkexec.xml \
+ ${WRKSRC}/src/examples/org.freedesktop.policykit.examples.pkexec.policy.in
+
+post-install:
+ ${MKDIR} ${PREFIX}/etc/dbus-1/system.d/
+ if [ ! -f ${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ]; then \
+ ${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \
+ ${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ; \
+ fi
+ ${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \
+ ${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist
+.if !defined(PACKAGE_BUILDING)
+ @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
+
+.include <bsd.port.mk>
diff --git a/sysutils/polkit/distinfo b/sysutils/polkit/distinfo
new file mode 100644
index 000000000000..b37677cf92cf
--- /dev/null
+++ b/sysutils/polkit/distinfo
@@ -0,0 +1,3 @@
+MD5 (polkit-0.95.tar.gz) = 10971f5d334550025897b02d779fddd1
+SHA256 (polkit-0.95.tar.gz) = b484248ed8fa7419170cf98d7cba51d68290783c3c7cac7c5dab7605dfe3c79c
+SIZE (polkit-0.95.tar.gz) = 1025805
diff --git a/sysutils/polkit/files/patch-data_Makefile.in b/sysutils/polkit/files/patch-data_Makefile.in
new file mode 100644
index 000000000000..c2895461f523
--- /dev/null
+++ b/sysutils/polkit/files/patch-data_Makefile.in
@@ -0,0 +1,11 @@
+--- data/Makefile.in.orig 2009-08-01 16:02:38.000000000 +0200
++++ data/Makefile.in 2009-08-01 16:05:13.000000000 +0200
+@@ -471,7 +471,7 @@
+
+ info-am:
+
+-install-data-am: install-dbusconfDATA install-pamDATA \
++install-data-am: install-pamDATA \
+ install-pkgconfigDATA install-serviceDATA
+
+ install-dvi: install-dvi-am
diff --git a/sysutils/polkit/files/patch-src_polkitbackend_Makefile.in b/sysutils/polkit/files/patch-src_polkitbackend_Makefile.in
new file mode 100644
index 000000000000..b3bb5b72105b
--- /dev/null
+++ b/sysutils/polkit/files/patch-src_polkitbackend_Makefile.in
@@ -0,0 +1,15 @@
+--- src/polkitbackend/Makefile.in.orig 2009-08-01 11:56:22.000000000 +0200
++++ src/polkitbackend/Makefile.in 2009-08-01 11:57:18.000000000 +0200
+@@ -852,7 +852,11 @@ clean-local :
+
+ install-exec-hook:
+ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1
+- mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/{10-vendor.d,20-org.d,30-site.d,50-local.d,90-mandatory.d}
++ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/10-vendor.d
++ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/20-org.d
++ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/30-site.d
++ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/50-local.d
++ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/90-mandatory.d
+ -chmod 700 $(DESTDIR)$(localstatedir)/lib/polkit-1
+ mkdir -p $(DESTDIR)$(libdir)/polkit-1/extensions
+
diff --git a/sysutils/polkit/pkg-descr b/sysutils/polkit/pkg-descr
new file mode 100644
index 000000000000..9746a6470c1d
--- /dev/null
+++ b/sysutils/polkit/pkg-descr
@@ -0,0 +1,4 @@
+PolicyKit is a framework for defining policy for system-wide components and
+for desktop pieces to configure it. It is used by HAL.
+
+WWW: http://www.freedesktop.org/wiki/Software/PolicyKit
diff --git a/sysutils/polkit/pkg-install b/sysutils/polkit/pkg-install
new file mode 100644
index 000000000000..93efeea2297b
--- /dev/null
+++ b/sysutils/polkit/pkg-install
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+ mkdir -p /var/lib/polkit-1
+ for i in 10-vendor.d 20-org.d 30-site.d 50-local.d 90-mandatory.d; do
+ mkdir -p /var/lib/polkit-1/${i}
+ done
+ chmod 0700 /var/lib/polkit-1
+ exit 0
+ ;;
+esac
diff --git a/sysutils/polkit/pkg-plist b/sysutils/polkit/pkg-plist
new file mode 100644
index 000000000000..2685cac96f6f
--- /dev/null
+++ b/sysutils/polkit/pkg-plist
@@ -0,0 +1,82 @@
+bin/pkaction
+bin/pkcheck
+bin/pkexec
+@unexec if cmp -s %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist; then rm -f %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ; fi
+etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist
+@exec [ -f %B/org.freedesktop.PolicyKit1.conf ] || cp %B/%f %B/org.freedesktop.PolicyKit1.conf
+etc/pam.d/polkit-1
+etc/polkit-1/localauthority.conf.d/50-localauthority.conf
+etc/polkit-1/nullbackend.conf.d/50-nullbackend.conf
+include/polkit-1/polkit/polkit.h
+include/polkit-1/polkit/polkitactiondescription.h
+include/polkit-1/polkit/polkitauthorityfeatures.h
+include/polkit-1/polkit/polkitauthority.h
+include/polkit-1/polkit/polkitauthorizationresult.h
+include/polkit-1/polkit/polkitcheckauthorizationflags.h
+include/polkit-1/polkit/polkitdetails.h
+include/polkit-1/polkit/polkitenumtypes.h
+include/polkit-1/polkit/polkiterror.h
+include/polkit-1/polkit/polkitidentity.h
+include/polkit-1/polkit/polkitimplicitauthorization.h
+include/polkit-1/polkit/polkitprivate.h
+include/polkit-1/polkit/polkitsubject.h
+include/polkit-1/polkit/polkitsystembusname.h
+include/polkit-1/polkit/polkittemporaryauthorization.h
+include/polkit-1/polkit/polkittypes.h
+include/polkit-1/polkit/polkitunixgroup.h
+include/polkit-1/polkit/polkitunixprocess.h
+include/polkit-1/polkit/polkitunixsession.h
+include/polkit-1/polkit/polkitunixuser.h
+include/polkit-1/polkitagent/polkitagent.h
+include/polkit-1/polkitagent/polkitagentlistener.h
+include/polkit-1/polkitagent/polkitagentsession.h
+include/polkit-1/polkitagent/polkitagenttypes.h
+include/polkit-1/polkitbackend/polkitbackend.h
+include/polkit-1/polkitbackend/polkitbackendactionlookup.h
+include/polkit-1/polkitbackend/polkitbackendactionpool.h
+include/polkit-1/polkitbackend/polkitbackendauthority.h
+include/polkit-1/polkitbackend/polkitbackendconfigsource.h
+include/polkit-1/polkitbackend/polkitbackendinteractiveauthority.h
+include/polkit-1/polkitbackend/polkitbackendlocalauthority.h
+include/polkit-1/polkitbackend/polkitbackendlocalauthorizationstore.h
+include/polkit-1/polkitbackend/polkitbackendsessionmonitor.h
+include/polkit-1/polkitbackend/polkitbackendtypes.h
+lib/girepository-1.0/Polkit-1.0.typelib
+lib/libpolkit-agent-1.a
+lib/libpolkit-agent-1.la
+lib/libpolkit-agent-1.so
+lib/libpolkit-agent-1.so.0
+lib/libpolkit-backend-1.a
+lib/libpolkit-backend-1.la
+lib/libpolkit-backend-1.so
+lib/libpolkit-backend-1.so.0
+lib/libpolkit-gobject-1.a
+lib/libpolkit-gobject-1.la
+lib/libpolkit-gobject-1.so
+lib/libpolkit-gobject-1.so.0
+lib/polkit-1/extensions/libnullbackend.a
+lib/polkit-1/extensions/libnullbackend.la
+lib/polkit-1/extensions/libnullbackend.so
+lib/polkit-1/extensions/libpkexec-action-lookup.a
+lib/polkit-1/extensions/libpkexec-action-lookup.la
+lib/polkit-1/extensions/libpkexec-action-lookup.so
+libdata/pkgconfig/polkit-agent-1.pc
+libdata/pkgconfig/polkit-backend-1.pc
+libdata/pkgconfig/polkit-gobject-1.pc
+libexec/polkit-agent-helper-1
+libexec/polkitd
+share/dbus-1/system-services/org.freedesktop.PolicyKit1.service
+share/gir-1.0/Polkit-1.0.gir
+share/locale/da/LC_MESSAGES/polkit-1.mo
+share/polkit-1/actions/org.freedesktop.policykit.policy
+@dirrmtry share/polkit-1/actions
+@dirrmtry share/polkit-1
+@dirrm lib/polkit-1/extensions
+@dirrm lib/polkit-1
+@dirrm include/polkit-1/polkitbackend
+@dirrm include/polkit-1/polkitagent
+@dirrm include/polkit-1/polkit
+@dirrm include/polkit-1
+@dirrm etc/polkit-1/nullbackend.conf.d
+@dirrm etc/polkit-1/localauthority.conf.d
+@dirrm etc/polkit-1
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 415007b1ed88..d38d86a52c39 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/system-tools-backends/Makefile,v 1.1 2009/04/16 08:56:17 kwm Exp $
+# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.54 2009/10/11 19:13:30 marcus Exp $
#
PORTNAME= system-tools-backends
-PORTVERSION= 2.6.1
-PORTREVISION= 1
+PORTVERSION= 2.8.2
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,7 +17,7 @@ COMMENT= Backend system admin scripts for gnome-system-tools
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
- polkit-dbus.2:${PORTSDIR}/sysutils/policykit
+ polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
USE_BZIP2= yes
diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo
index 43e2f1c0fc1b..d5b28d398ae7 100644
--- a/sysutils/system-tools-backends/distinfo
+++ b/sysutils/system-tools-backends/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/system-tools-backends-2.6.1.tar.bz2) = c82a9d305c3a1bf924bba6b1bced3e86
-SHA256 (gnome2/system-tools-backends-2.6.1.tar.bz2) = 7f56dd08cf5425218b697d5db82e6ce03aff4f7b57f58d3053f0a7af632b3747
-SIZE (gnome2/system-tools-backends-2.6.1.tar.bz2) = 441586
+MD5 (gnome2/system-tools-backends-2.8.2.tar.bz2) = 689c79b36d2929b264c29ff39db4b10b
+SHA256 (gnome2/system-tools-backends-2.8.2.tar.bz2) = bbbef8a0d160c6dfd44d60a5026a6c51ac97818d18febcf716e218983af4bf6c
+SIZE (gnome2/system-tools-backends-2.8.2.tar.bz2) = 458579
diff --git a/sysutils/system-tools-backends/files/patch-Users_Users.pm b/sysutils/system-tools-backends/files/patch-Users_Users.pm
index 5e2598972c24..909f28dff134 100644
--- a/sysutils/system-tools-backends/files/patch-Users_Users.pm
+++ b/sysutils/system-tools-backends/files/patch-Users_Users.pm
@@ -1,42 +1,42 @@
---- Users/Users.pm.orig Thu Oct 5 09:27:21 2006
-+++ Users/Users.pm Sun Apr 22 23:05:41 2007
-@@ -458,7 +458,7 @@
+--- Users/Users.pm.orig 2009-09-28 05:49:10.000000000 -0400
++++ Users/Users.pm 2009-10-11 15:09:31.000000000 -0400
+@@ -443,7 +443,7 @@ sub del_user
if ($Utils::Backend::tool{"system"} eq "FreeBSD")
{
-- $command = "$cmd_pw userdel -n \'" . $$user[$LOGIN] . "\' ";
-+ $command = "$cmd_pw userdel -n \'" . $$user[$LOGIN] . "\' -r ";
+- @command = ($cmd_pw, "userdel", "-n", $$user[$LOGIN]);
++ @command = ($cmd_pw, "userdel", "-n", $$user[$LOGIN], "-r");
}
else
{
-@@ -538,10 +538,10 @@
- {
+@@ -551,9 +551,7 @@ sub add_user
my $pwdpipe;
my $home;
-+ my $user;
- # FreeBSD doesn't create the home directory
$home = $$user[$HOME];
-- &Utils::File::run ("$tool_mkdir -p $home");
-+ $user = $$user[$LOGIN];
+- &Utils::File::run ($tool_mkdir, "-p", $home);
$command = "$cmd_pw useradd " .
" -n \'" . $$user[$LOGIN] . "\'" .
-@@ -549,11 +549,12 @@
+@@ -561,7 +559,7 @@ sub add_user
" -d \'" . $$user[$HOME] . "\'" .
" -g \'" . $$user[$GID] . "\'" .
" -s \'" . $$user[$SHELL] . "\'" .
- " -H 0"; # pw(8) reads password from STDIN
+ " -m -h 0"; # pw(8) reads password from STDIN
+ # @command = ($cmd_pw, "useradd", "-n", $$user[$LOGIN],
+ # "-u", $$user[$UID],
+@@ -573,6 +571,7 @@ sub add_user
$pwdpipe = &Utils::File::run_pipe_write ($command);
print $pwdpipe $$user[$PASSWD];
&Utils::File::close_file ($pwdpipe);
-+ &Utils::File::run ("chown -R $user $home");
++ &Utils::File::run ("chown -R " . $$user[$LOGIN] . " $home");
}
elsif ($Utils::Backend::tool{"system"} eq "SunOS")
{
-@@ -629,7 +630,7 @@
+@@ -651,7 +650,7 @@ sub change_user
" -d \'" . $$new_user[$HOME] . "\'" .
" -g \'" . $$new_user[$GID] . "\'" .
" -s \'" . $$new_user[$SHELL] . "\'" .
diff --git a/sysutils/system-tools-backends/files/patch-policykit b/sysutils/system-tools-backends/files/patch-policykit
deleted file mode 100644
index aaac9aa69979..000000000000
--- a/sysutils/system-tools-backends/files/patch-policykit
+++ /dev/null
@@ -1,46 +0,0 @@
-Allow root to send messages to all the system tools backends, so they
-work even when CVE-2008-4311 has been fixed.
-
-Also disallow normal user access by destination, not by interface (fd.o
-#18961).
-
-Original patch by Simon McVittie, updated for the PolicyKit version by
-Josselin Mouette with advice from Colin Walters.
-
-Index: system-tools-backends-2.6.0/system-tools-backends.conf
-===================================================================
---- system-tools-backends.conf 2008-03-09 14:21:45.000000000 +0100
-+++ system-tools-backends.conf 2009-03-11 22:21:09.145371060 +0100
-@@ -22,11 +22,7 @@
- <allow send_interface="org.freedesktop.SystemToolsBackends.Platform" send_member="getPlatform"/>
- -->
-
-- <!-- configuration modules can't be accessed directly... -->
-- <deny send_interface="org.freedesktop.SystemToolsBackends"/>
-- <deny send_interface="org.freedesktop.SystemToolsBackends.Platform"/>
--
-- <!-- ...so petitions go through the dispatcher instead -->
-+ <!-- Only allow talking to the dispatcher -->
- <allow send_destination="org.freedesktop.SystemToolsBackends"/>
- </policy>
-
-@@ -49,7 +45,17 @@
-
- <!-- be able to speak to configuration modules,
- so any message to them has to go through the dispatcher -->
-- <allow send_interface="org.freedesktop.SystemToolsBackends"/>
-- <allow send_interface="org.freedesktop.SystemToolsBackends.Platform"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.Platform"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.GroupsConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.HostsConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.IfacesConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.NFSConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.NTPConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.ServicesConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.SMBConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.TimeConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.UserConfig"/>
-+ <allow send_destination="org.freedesktop.SystemToolsBackends.UsersConfig"/>
- </policy>
- </busconfig>
diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist
index 26aca35ca483..b300daf2d77c 100644
--- a/sysutils/system-tools-backends/pkg-plist
+++ b/sysutils/system-tools-backends/pkg-plist
@@ -1,7 +1,6 @@
-bin/system-tools-backends
-etc/dbus-1/system.d/system-tools-backends.conf
+etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf
+sbin/system-tools-backends
libdata/pkgconfig/system-tools-backends-2.0.pc
-share/PolicyKit/policy/system-tools-backends.policy
share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.GroupsConfig.service
share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.HostsConfig.service
share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.IfacesConfig.service
@@ -14,23 +13,47 @@ share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.TimeConfig.serv
share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UserConfig.service
share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UsersConfig.service
share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.service
+share/locale/ar/LC_MESSAGES/system-tools-backends.mo
share/locale/bg/LC_MESSAGES/system-tools-backends.mo
+share/locale/bn_IN/LC_MESSAGES/system-tools-backends.mo
share/locale/ca/LC_MESSAGES/system-tools-backends.mo
+share/locale/cs/LC_MESSAGES/system-tools-backends.mo
share/locale/da/LC_MESSAGES/system-tools-backends.mo
share/locale/de/LC_MESSAGES/system-tools-backends.mo
share/locale/el/LC_MESSAGES/system-tools-backends.mo
+share/locale/en_GB/LC_MESSAGES/system-tools-backends.mo
share/locale/es/LC_MESSAGES/system-tools-backends.mo
+share/locale/et/LC_MESSAGES/system-tools-backends.mo
+share/locale/eu/LC_MESSAGES/system-tools-backends.mo
share/locale/fi/LC_MESSAGES/system-tools-backends.mo
share/locale/fr/LC_MESSAGES/system-tools-backends.mo
+share/locale/gl/LC_MESSAGES/system-tools-backends.mo
+share/locale/gu/LC_MESSAGES/system-tools-backends.mo
share/locale/he/LC_MESSAGES/system-tools-backends.mo
+share/locale/hi/LC_MESSAGES/system-tools-backends.mo
share/locale/hu/LC_MESSAGES/system-tools-backends.mo
share/locale/it/LC_MESSAGES/system-tools-backends.mo
+share/locale/ja/LC_MESSAGES/system-tools-backends.mo
+share/locale/kn/LC_MESSAGES/system-tools-backends.mo
+share/locale/or/LC_MESSAGES/system-tools-backends.mo
+share/locale/pa/LC_MESSAGES/system-tools-backends.mo
share/locale/pl/LC_MESSAGES/system-tools-backends.mo
+share/locale/pt/LC_MESSAGES/system-tools-backends.mo
share/locale/pt_BR/LC_MESSAGES/system-tools-backends.mo
share/locale/ro/LC_MESSAGES/system-tools-backends.mo
share/locale/sl/LC_MESSAGES/system-tools-backends.mo
+share/locale/sr/LC_MESSAGES/system-tools-backends.mo
+share/locale/sr@latin/LC_MESSAGES/system-tools-backends.mo
share/locale/sv/LC_MESSAGES/system-tools-backends.mo
+share/locale/ta/LC_MESSAGES/system-tools-backends.mo
+share/locale/te/LC_MESSAGES/system-tools-backends.mo
+share/locale/th/LC_MESSAGES/system-tools-backends.mo
+share/locale/tr/LC_MESSAGES/system-tools-backends.mo
+share/locale/uk/LC_MESSAGES/system-tools-backends.mo
share/locale/zh_CN/LC_MESSAGES/system-tools-backends.mo
+share/locale/zh_HK/LC_MESSAGES/system-tools-backends.mo
+share/locale/zh_TW/LC_MESSAGES/system-tools-backends.mo
+share/polkit-1/actions/org.freedesktop.SystemToolsBackends.policy
share/system-tools-backends-2.0/files/general_gprs_chatscript
share/system-tools-backends-2.0/files/general_isdn_ppp_options
share/system-tools-backends-2.0/files/general_pppoe_ppp_options
@@ -77,17 +100,33 @@ share/system-tools-backends-2.0/scripts/Utils/XML.pm
@dirrm share/system-tools-backends-2.0/scripts
@dirrm share/system-tools-backends-2.0/files
@dirrm share/system-tools-backends-2.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/zh_CN/LC_MESSAGES
@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@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/sl/LC_MESSAGES
@dirrmtry share/locale/sl
@dirrmtry share/locale/ro/LC_MESSAGES
@dirrmtry share/locale/ro
@dirrmtry share/locale/pl/LC_MESSAGES
@dirrmtry share/locale/pl
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
@dirrmtry share/locale/fi/LC_MESSAGES
@dirrmtry share/locale/fi
@dirrmtry share/locale/el/LC_MESSAGES
@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index 1a86865beb54..74af4cfd03b4 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -3,14 +3,14 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/tracker-client/Makefile,v 1.6 2009/02/27 00:23:22 marcus Exp $
+# $MCom: ports/sysutils/tracker-client/Makefile,v 1.10 2009/10/11 11:11:33 kwm Exp $
#
PORTNAME= tracker
-PORTVERSION= 0.6.6
-PORTREVISION= 11
+PORTVERSION= 0.6.95
+PORTREVISION= 1
CATEGORIES= sysutils gnome
-MASTER_SITES= http://www.gnome.org/~jamiemcc/tracker/
+MASTER_SITES= GNOME
PKGNAMESUFFIX?= -client
MAINTAINER= gnome@FreeBSD.org
@@ -23,7 +23,12 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \
wv-1.2.3:${PORTSDIR}/textproc/wv \
gmime-2.0.4:${PORTSDIR}/mail/gmime2 \
qdbm.14:${PORTSDIR}/databases/qdbm \
- exempi.3:${PORTSDIR}/textproc/exempi
+ exempi.3:${PORTSDIR}/textproc/exempi \
+ hal.1:${PORTSDIR}/sysutils/hal \
+ totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser \
+ raptor.2:${PORTSDIR}/textproc/raptor \
+ ogg.6:${PORTSDIR}/audio/libogg \
+ iptcdata.3:${PORTSDIR}/graphics/libiptcdata
RUN_DEPENDS= xdg-desktop-icon:${PORTSDIR}/devel/xdg-utils \
o3totxt:${PORTSDIR}/converters/o3read \
pdftotext:${PORTSDIR}/graphics/poppler-utils \
@@ -33,7 +38,7 @@ USE_BZIP2= yes
USE_FAM= yes
WANT_FAM_SYSTEM=gamin
INSTALLS_ICONS= yes
-USE_GNOME= gnomehack gnomeprefix ltasneededhack intltool
+USE_GNOME= gnomehack gnomeprefix ltasneededhack intltool ltverhack
USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
@@ -41,11 +46,12 @@ USE_GSTREAMER= core
INSTALLS_ICONS= yes
USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+ LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/tracker ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --enable-video-extractor=gstreamer \
--enable-file-monitoring=fam \
--with-session-bus-services-dir=${LOCALBASE}/share/dbus-1/services \
- --enable-external-qdbm
+ --enable-external-qdbm --enable-libexif --enable-libvorbis \
+ --enable-libiptcdata
.include <bsd.port.pre.mk>
@@ -59,7 +65,7 @@ INSTALL_WRKSRC= ${WRKSRC}/src/tracker-applet
EXTRA_WRKSRC= src/tracker-preferences src/tracker-search-tool
RUN_DEPENDS+= ${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet
USE_GNOME+= gnomedesktop libgsf
-MAN1+= tracker-applet.1 tracker-search-tool.1 tracker-preferences.1
+MAN1+= tracker-applet.1 tracker-search-tool.1 tracker-preferences.1
CONFIGURE_ARGS+=--enable-deskbar-applet \
--with-deskbar-applet-handler-dir=${LOCALBASE}/lib/deskbar-applet/handlers
. endif
@@ -71,14 +77,17 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC}
. endif
.else
MAN1+= tracker-extract.1 tracker-files.1 \
+ tracker-info.1 \
tracker-meta-folder.1 tracker-query.1 \
- tracker-search.1 tracker-stats.1 \
- tracker-status.1 tracker-tag.1 tracker-thumbnailer.1 trackerd.1
+ tracker-search.1 tracker-services.1 tracker-stats.1 \
+ tracker-status.1 tracker-tag.1 tracker-thumbnailer.1 tracker-unique.1 trackerd.1
+
MAN5+= tracker.cfg.5
-MAN7+= tracker-services.7
CONFIGURE_ARGS+= --disable-libtrackergtk --disable-gui \
--disable-trackerapplet --disable-gsf \
- --disable-preferences
+ --disable-preferences --disable-deskbar-applet \
+ --disable-tracker-applet --disable-tracker-preferences \
+ --disable-libgsf
.endif
post-patch:
@@ -104,7 +113,7 @@ post-install:
@(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
. endfor
. for man in ${MAN1}
- @(cd ${WRKSRC} && ${INSTALL_DATA} docs/${man} ${PREFIX}/man/man1/${man})
+ @(cd ${WRKSRC} && ${INSTALL_DATA} docs/manpages/${man} ${PREFIX}/man/man1/${man})
. endfor
.endif
diff --git a/sysutils/tracker-client/distinfo b/sysutils/tracker-client/distinfo
index 435cb9e83cb9..2848e25a3864 100644
--- a/sysutils/tracker-client/distinfo
+++ b/sysutils/tracker-client/distinfo
@@ -1,3 +1,3 @@
-MD5 (tracker-0.6.6.tar.bz2) = 0845998f8f0d715b3f1b306d59fdae4d
-SHA256 (tracker-0.6.6.tar.bz2) = ffa374989db365f388edf0a52f901ae3becfa7a25a7e1b2dd76832eff9606a97
-SIZE (tracker-0.6.6.tar.bz2) = 901549
+MD5 (tracker-0.6.95.tar.bz2) = a4edc8aa830070bd3f1d80a7df07c80c
+SHA256 (tracker-0.6.95.tar.bz2) = 0fe42353117c62ccc9de3b3c9c11acf707a0702d30cd24b8d1cd1e2581dec339
+SIZE (tracker-0.6.95.tar.bz2) = 1399996
diff --git a/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-albumart.c b/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-albumart.c
new file mode 100644
index 000000000000..d2467b17cd3f
--- /dev/null
+++ b/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-albumart.c
@@ -0,0 +1,12 @@
+--- src/libtracker-common/tracker-albumart.c.orig 2009-08-08 17:37:48.000000000 +0000
++++ src/libtracker-common/tracker-albumart.c 2009-08-08 17:38:14.000000000 +0000
+@@ -81,7 +81,8 @@
+ return retval;
+ }
+
+-#ifndef HAVE_STRCASESTR
++#if 0
++// #ifndef HAVE_STRCASESTR
+
+ static gchar *
+ strcasestr (const gchar *haystack,
diff --git a/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-type-utils.c b/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-type-utils.c
new file mode 100644
index 000000000000..c6f07b336e52
--- /dev/null
+++ b/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-type-utils.c
@@ -0,0 +1,13 @@
+--- src/libtracker-common/tracker-type-utils.c.orig 2009-08-08 17:29:36.000000000 +0000
++++ src/libtracker-common/tracker-type-utils.c 2009-08-08 17:30:09.000000000 +0000
+@@ -531,8 +531,8 @@
+ /* mktime() always assumes that "tm" is in locale time but we
+ * want to keep control on time, so we go to UTC
+ */
+- t = mktime (&tm);
+- t -= timezone;
++
++ t = timegm (&tm);
+
+ if (*date_string == '+' ||
+ *date_string == '-') {
diff --git a/sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in b/sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in
index df2beaaac844..a5d3b6c1788b 100644
--- a/sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in
+++ b/sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in
@@ -1,19 +1,19 @@
---- src/libtracker-gtk/Makefile.in.orig 2008-03-30 15:48:54.539689924 -0400
-+++ src/libtracker-gtk/Makefile.in 2008-03-30 15:50:09.289800343 -0400
-@@ -56,7 +56,6 @@
+--- src/libtracker-gtk/Makefile.in.orig 2009-08-08 17:07:00.000000000 +0000
++++ src/libtracker-gtk/Makefile.in 2009-08-08 17:09:07.000000000 +0000
+@@ -66,7 +66,6 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libtracker_gtk_la_DEPENDENCIES = \
- $(top_builddir)/src/libtracker/libtrackerclient.la \
- $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libtracker_gtk_la_OBJECTS = tracker-utils.lo tracker-ui.lo \
tracker-metadata-tile.lo tracker-tag-bar.lo \
-@@ -316,7 +315,7 @@
+@@ -355,7 +354,7 @@
tracker-keyword-store.c
libtracker_gtk_la_LIBADD = \
-- $(top_builddir)/src/libtracker/libtrackerclient.la \
-+ -ltrackerclient \
- $(LIBTRACKERGTK_LIBS)
+- $(top_builddir)/src/libtracker/libtrackerclient.la \
++ -ltrackerclient \
+ $(LIBTRACKERGTK_LIBS) \
+ $(GCOV_LIBS)
- libtracker_gtk_la_LDFLAGS = -version-info 0:0:0
diff --git a/sysutils/tracker-client/files/patch-src_text-filters__Makefile.in b/sysutils/tracker-client/files/patch-src_text-filters__Makefile.in
deleted file mode 100644
index ee9e1903a1a4..000000000000
--- a/sysutils/tracker-client/files/patch-src_text-filters__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/text-filters/Makefile.in.orig 2008-03-03 13:14:00.000000000 +0900
-+++ ./src/text-filters/Makefile.in 2008-08-22 21:40:00.000000000 +0900
-@@ -266,7 +266,7 @@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = ooo_converter
-+#SUBDIRS = ooo_converter
- all: all-recursive
-
- .SUFFIXES:
diff --git a/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in b/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in
index f964d78ce7f3..e00d83cf4e40 100644
--- a/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in
+++ b/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in
@@ -1,19 +1,22 @@
---- src/tracker-applet/Makefile.in.orig 2008-03-30 16:20:32.345933535 -0400
-+++ src/tracker-applet/Makefile.in 2008-03-30 16:20:52.759690870 -0400
-@@ -55,7 +55,6 @@
+--- src/tracker-applet/Makefile.in.orig 2009-08-08 17:11:05.000000000 +0000
++++ src/tracker-applet/Makefile.in 2009-08-08 17:12:21.000000000 +0000
+@@ -65,8 +65,6 @@
tracker_applet_OBJECTS = $(am_tracker_applet_OBJECTS)
am__DEPENDENCIES_1 =
tracker_applet_DEPENDENCIES = \
- $(top_builddir)/src/libtracker/libtrackerclient.la \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -312,7 +311,7 @@
- tracker-applet-marshallers.h
+- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+@@ -345,8 +343,8 @@
+ $(GCOV_CFLAGS)
tracker_applet_LDADD = \
-- $(top_builddir)/src/libtracker/libtrackerclient.la \
-+ -ltrackerclient \
- $(LIBGLADE_LIBS) \
- $(TRACKERAPPLET_LIBS)
-
+- $(top_builddir)/src/libtracker/libtrackerclient.la \
+- $(top_builddir)/src/libtracker-common/libtracker-common.la \
++ -ltrackerclient \
++ -ltracker-common \
+ $(TRACKER_APPLET_LIBS) \
+ $(LIBGLADE_LIBS) \
+ $(GCOV_LIBS)
diff --git a/sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in b/sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in
index acbe9556b169..76095e88bcad 100644
--- a/sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in
+++ b/sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in
@@ -1,21 +1,22 @@
---- src/tracker-preferences/Makefile.in.orig 2008-03-30 16:28:05.657537943 -0400
-+++ src/tracker-preferences/Makefile.in 2008-03-30 16:29:01.927868390 -0400
-@@ -59,8 +59,7 @@
+--- src/tracker-preferences/Makefile.in.orig 2009-08-08 17:13:03.000000000 +0000
++++ src/tracker-preferences/Makefile.in 2009-08-08 17:14:08.000000000 +0000
+@@ -67,8 +67,6 @@
tracker_preferences_OBJECTS = $(am_tracker_preferences_OBJECTS)
am__DEPENDENCIES_1 =
- tracker_preferences_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-- $(top_builddir)/src/libtracker/libtrackerclient.la
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -329,7 +328,7 @@
- $(GTK2_LIBS) \
- $(LIBGLADE_LIBS) \
- $(DBUS_LIBS) \
-- $(top_builddir)/src/libtracker/libtrackerclient.la \
-+ -ltrackerclient \
- $(NULL)
+ tracker_preferences_DEPENDENCIES = \
+- $(top_builddir)/src/libtracker/libtrackerclient.la \
+- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+@@ -361,8 +359,8 @@
+ tracker-preferences-utils.h
- EXTRA_DIST = $(pkgdata_DATA)
+ tracker_preferences_LDADD = \
+- $(top_builddir)/src/libtracker/libtrackerclient.la \
+- $(top_builddir)/src/libtracker-common/libtracker-common.la \
++ -ltrackerclient \
++ -ltracker-common \
+ $(LIBGLADE_LIBS) \
+ $(GTK2_LIBS) \
+ $(DBUS_LIBS) \
diff --git a/sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in b/sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in
index 67de120b0227..0130754f0431 100644
--- a/sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in
+++ b/sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in
@@ -1,23 +1,24 @@
---- src/tracker-search-tool/Makefile.in.orig 2008-03-30 16:33:18.729811374 -0400
-+++ src/tracker-search-tool/Makefile.in 2008-03-30 16:33:36.248603008 -0400
-@@ -57,9 +57,7 @@
- am__DEPENDENCIES_1 =
+--- src/tracker-search-tool/Makefile.in.orig 2009-08-08 17:14:44.000000000 +0000
++++ src/tracker-search-tool/Makefile.in 2009-08-08 17:15:51.000000000 +0000
+@@ -69,9 +69,7 @@
tracker_search_tool_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) \
- $(top_builddir)/src/libtracker-gtk/libtracker-gtk.la \
- $(top_builddir)/src/libtracker/libtrackerclient.la
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
++ $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -327,8 +325,7 @@
- $(GNOMEVFS_LIBS) \
- $(GNOMEDESKTOP_LIBS) \
- $(DBUS_LIBS) \
-- $(top_builddir)/src/libtracker-gtk/libtracker-gtk.la \
+@@ -367,8 +365,8 @@
+ $(GCOV_LIBS) \
+ $(GNOMEDESKTOP_LIBS) \
+ $(DBUS_LIBS) \
+- $(top_builddir)/src/libtracker-gtk/libtracker-gtk.la \
- $(top_builddir)/src/libtracker/libtrackerclient.la
-+ -ltracker-gtk -ltrackerclient
++ -ltracker-gtk \
++ -ltrackerclient
- desktop_in_files = tracker-search-tool.desktop.in
- desktop_files = $(desktop_in_files:.desktop.in=.desktop)
+ desktopdir = $(datadir)/applications
+ desktop_DATA = tracker-search-tool.desktop
diff --git a/sysutils/tracker-client/files/patch-src_trackerd_tracker-utils.c b/sysutils/tracker-client/files/patch-src_trackerd_tracker-utils.c
deleted file mode 100644
index 132346af41a9..000000000000
--- a/sysutils/tracker-client/files/patch-src_trackerd_tracker-utils.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/trackerd/tracker-utils.c.orig 2007-08-05 01:53:12.000000000 +0400
-+++ src/trackerd/tracker-utils.c 2007-08-24 22:31:05.000000000 +0400
-@@ -727,10 +727,7 @@
- tm.tm_sec = strtoul (timestamp, (char **)&timestamp, 10);
- }
-
-- tt = mktime (&tm);
-- /* mktime() always assumes that "tm" is in locale time but
-- we want to keep control on time, so we go to UTC */
-- tt -= timezone;
-+ tt = timegm (&tm);
-
- if (*timestamp == '+' || *timestamp == '-') {
- int sign;
diff --git a/sysutils/tracker-client/pkg-plist b/sysutils/tracker-client/pkg-plist
index 3daea5a6c3ba..e55381d7c1de 100644
--- a/sysutils/tracker-client/pkg-plist
+++ b/sysutils/tracker-client/pkg-plist
@@ -1,15 +1,36 @@
-bin/tracker-extract
bin/tracker-files
+bin/tracker-info
bin/tracker-meta-folder
+bin/tracker-processes
bin/tracker-query
bin/tracker-search
+bin/tracker-services
bin/tracker-stats
bin/tracker-status
bin/tracker-tag
-bin/tracker-thumbnailer
-bin/trackerd
+bin/tracker-unique
etc/xdg/autostart/trackerd.desktop
-include/tracker-client.h
+include/tracker-1.0/libtracker-common/tracker-common.h
+include/tracker-1.0/libtracker-common/tracker-config.h
+include/tracker-1.0/libtracker-common/tracker-field.h
+include/tracker-1.0/libtracker-common/tracker-file-utils.h
+include/tracker-1.0/libtracker-common/tracker-language.h
+include/tracker-1.0/libtracker-common/tracker-module-config.h
+include/tracker-1.0/libtracker-common/tracker-ontology.h
+include/tracker-1.0/libtracker-common/tracker-parser.h
+include/tracker-1.0/libtracker-common/tracker-service.h
+include/tracker-1.0/libtracker-common/tracker-type-utils.h
+include/tracker-1.0/libtracker-common/tracker-utils.h
+include/tracker-1.0/libtracker-module/tracker-module-file.h
+include/tracker-1.0/libtracker-module/tracker-module-iteratable.h
+include/tracker-1.0/libtracker-module/tracker-module-metadata-utils.h
+include/tracker-1.0/libtracker-module/tracker-module-metadata.h
+include/tracker-1.0/libtracker-module/tracker-module.h
+include/tracker-daemon-glue.h
+include/tracker-files-glue.h
+include/tracker-keywords-glue.h
+include/tracker-metadata-glue.h
+include/tracker-search-glue.h
include/tracker.h
lib/libtrackerclient.a
lib/libtrackerclient.la
@@ -18,39 +39,39 @@ lib/libtrackerclient.so.0
lib/tracker/extract-modules/libextract-abw.a
lib/tracker/extract-modules/libextract-abw.la
lib/tracker/extract-modules/libextract-abw.so
-lib/tracker/extract-modules/libextract-exif.a
-lib/tracker/extract-modules/libextract-exif.la
-lib/tracker/extract-modules/libextract-exif.so
lib/tracker/extract-modules/libextract-gstreamer.a
lib/tracker/extract-modules/libextract-gstreamer.la
lib/tracker/extract-modules/libextract-gstreamer.so
lib/tracker/extract-modules/libextract-html.a
lib/tracker/extract-modules/libextract-html.la
lib/tracker/extract-modules/libextract-html.so
-lib/tracker/extract-modules/libextract-imagemagick.a
-lib/tracker/extract-modules/libextract-imagemagick.la
-lib/tracker/extract-modules/libextract-imagemagick.so
+lib/tracker/extract-modules/libextract-jpeg.a
+lib/tracker/extract-modules/libextract-jpeg.la
+lib/tracker/extract-modules/libextract-jpeg.so
lib/tracker/extract-modules/libextract-mp3.a
lib/tracker/extract-modules/libextract-mp3.la
lib/tracker/extract-modules/libextract-mp3.so
-lib/tracker/extract-modules/libextract-mplayer.a
-lib/tracker/extract-modules/libextract-mplayer.la
-lib/tracker/extract-modules/libextract-mplayer.so
lib/tracker/extract-modules/libextract-oasis.a
lib/tracker/extract-modules/libextract-oasis.la
lib/tracker/extract-modules/libextract-oasis.so
lib/tracker/extract-modules/libextract-pdf.a
lib/tracker/extract-modules/libextract-pdf.la
lib/tracker/extract-modules/libextract-pdf.so
+lib/tracker/extract-modules/libextract-playlist.a
+lib/tracker/extract-modules/libextract-playlist.la
+lib/tracker/extract-modules/libextract-playlist.so
lib/tracker/extract-modules/libextract-png.a
lib/tracker/extract-modules/libextract-png.la
lib/tracker/extract-modules/libextract-png.so
lib/tracker/extract-modules/libextract-ps.a
lib/tracker/extract-modules/libextract-ps.la
lib/tracker/extract-modules/libextract-ps.so
-lib/tracker/extract-modules/libextract-totem.a
-lib/tracker/extract-modules/libextract-totem.la
-lib/tracker/extract-modules/libextract-totem.so
+lib/tracker/extract-modules/libextract-tiff.a
+lib/tracker/extract-modules/libextract-tiff.la
+lib/tracker/extract-modules/libextract-tiff.so
+lib/tracker/extract-modules/libextract-vorbis.a
+lib/tracker/extract-modules/libextract-vorbis.la
+lib/tracker/extract-modules/libextract-vorbis.so
lib/tracker/extract-modules/libextract-xmp.a
lib/tracker/extract-modules/libextract-xmp.la
lib/tracker/extract-modules/libextract-xmp.so
@@ -83,17 +104,101 @@ lib/tracker/filters/text/tab-separated-values_filter
lib/tracker/filters/text/x-comma-separated-values_filter
lib/tracker/filters/text/x-tex_filter
lib/tracker/filters/text/xml_filter
-lib/tracker/thumbnailers/application/pdf_thumbnailer
-lib/tracker/thumbnailers/application/vnd.oasis.opendocument.graphics_thumbnailer
-lib/tracker/thumbnailers/application/vnd.oasis.opendocument.presentation_thumbnailer
-lib/tracker/thumbnailers/application/vnd.oasis.opendocument.spreadsheet_thumbnailer
-lib/tracker/thumbnailers/application/vnd.oasis.opendocument.text_thumbnailer
-lib/tracker/thumbnailers/image/gif_thumbnailer
-lib/tracker/thumbnailers/image/jpeg_thumbnailer
-lib/tracker/thumbnailers/image/png_thumbnailer
-lib/tracker/thumbnailers/image/tiff_thumbnailer
+lib/tracker/indexer-modules/libtracker-module-applications.a
+lib/tracker/indexer-modules/libtracker-module-applications.la
+lib/tracker/indexer-modules/libtracker-module-applications.so
+lib/tracker/indexer-modules/libtracker-module-evolution.a
+lib/tracker/indexer-modules/libtracker-module-evolution.la
+lib/tracker/indexer-modules/libtracker-module-evolution.so
+lib/tracker/indexer-modules/libtracker-module-files.a
+lib/tracker/indexer-modules/libtracker-module-files.la
+lib/tracker/indexer-modules/libtracker-module-files.so
+lib/tracker/indexer-modules/libtracker-module-gaim-conversations.a
+lib/tracker/indexer-modules/libtracker-module-gaim-conversations.la
+lib/tracker/indexer-modules/libtracker-module-gaim-conversations.so
+lib/tracker/libstemmer.a
+lib/tracker/libstemmer.la
+lib/tracker/libstemmer.so
+lib/tracker/libstemmer.so.0
+lib/tracker/libtracker-common.a
+lib/tracker/libtracker-common.la
+lib/tracker/libtracker-common.so
+lib/tracker/libtracker-common.so.0
+lib/tracker/libtracker-data.a
+lib/tracker/libtracker-data.la
+lib/tracker/libtracker-data.so
+lib/tracker/libtracker-data.so.0
+lib/tracker/libtracker-db.a
+lib/tracker/libtracker-db.la
+lib/tracker/libtracker-db.so
+lib/tracker/libtracker-db.so.0
+lib/tracker/libtracker-module.a
+lib/tracker/libtracker-module.la
+lib/tracker/libtracker-module.so
+lib/tracker/libtracker-module.so.0
+libdata/pkgconfig/tracker-module-1.0.pc
libdata/pkgconfig/tracker.pc
-share/dbus-1/services/tracker.service
+libexec/tracker-extract
+libexec/tracker-indexer
+libexec/trackerd
+share/dbus-1/services/org.freedesktop.Tracker.Extract.service
+share/dbus-1/services/org.freedesktop.Tracker.Indexer.service
+share/dbus-1/services/org.freedesktop.Tracker.service
+share/doc/libtracker-common/ch01.html
+share/doc/libtracker-common/ch02.html
+share/doc/libtracker-common/ch03.html
+share/doc/libtracker-common/ch04.html
+share/doc/libtracker-common/ch05.html
+share/doc/libtracker-common/home.png
+share/doc/libtracker-common/index.html
+share/doc/libtracker-common/index.sgml
+share/doc/libtracker-common/left.png
+share/doc/libtracker-common/libtracker-common-Config.html
+share/doc/libtracker-common/libtracker-common-DBus.html
+share/doc/libtracker-common/libtracker-common-Fields.html
+share/doc/libtracker-common/libtracker-common-File-Operations.html
+share/doc/libtracker-common/libtracker-common-General.html
+share/doc/libtracker-common/libtracker-common-HAL.html
+share/doc/libtracker-common/libtracker-common-IO-Priority.html
+share/doc/libtracker-common/libtracker-common-Language.html
+share/doc/libtracker-common/libtracker-common-Logging.html
+share/doc/libtracker-common/libtracker-common-Module-Config.html
+share/doc/libtracker-common/libtracker-common-NFS-Locking.html
+share/doc/libtracker-common/libtracker-common-Ontology.html
+share/doc/libtracker-common/libtracker-common-Parser.html
+share/doc/libtracker-common/libtracker-common-Service.html
+share/doc/libtracker-common/libtracker-common-Type-Conversions.html
+share/doc/libtracker-common/libtracker-common.devhelp
+share/doc/libtracker-common/libtracker-common.devhelp2
+share/doc/libtracker-common/libtracker-common.html
+share/doc/libtracker-common/right.png
+share/doc/libtracker-common/style.css
+share/doc/libtracker-common/up.png
+share/doc/libtracker-module/adding-categories.html
+share/doc/libtracker-module/ch01.html
+share/doc/libtracker-module/ch02.html
+share/doc/libtracker-module/creating-extractor-module-binary.html
+share/doc/libtracker-module/defining-properties.html
+share/doc/libtracker-module/home.png
+share/doc/libtracker-module/how-to-add-an-extractor.html
+share/doc/libtracker-module/index.html
+share/doc/libtracker-module/index.sgml
+share/doc/libtracker-module/installing-an-extractor.html
+share/doc/libtracker-module/integrating-applications.html
+share/doc/libtracker-module/left.png
+share/doc/libtracker-module/libtracker-module-Iteratable-files.html
+share/doc/libtracker-module/libtracker-module-Metadata-Convenience-Fallback-Functions.html
+share/doc/libtracker-module/libtracker-module-Metadata-Object.html
+share/doc/libtracker-module/libtracker-module-Module-files.html
+share/doc/libtracker-module/libtracker-module.devhelp
+share/doc/libtracker-module/libtracker-module.devhelp2
+share/doc/libtracker-module/right.png
+share/doc/libtracker-module/style.css
+share/doc/libtracker-module/testing-an-extractor.html
+share/doc/libtracker-module/tracker-indexer.html
+share/doc/libtracker-module/up.png
+share/doc/libtracker-module/writing-an-extractor.html
+share/doc/libtracker-module/writing-an-indexer-module.html
share/icons/hicolor/16x16/apps/tracker.png
share/icons/hicolor/22x22/apps/tracker.png
share/icons/hicolor/24x24/apps/tracker.png
@@ -101,18 +206,24 @@ share/icons/hicolor/32x32/apps/tracker.png
share/icons/hicolor/48x48/apps/tracker.png
share/icons/hicolor/scalable/apps/tracker.svg
share/locale/ar/LC_MESSAGES/tracker.mo
+share/locale/be/LC_MESSAGES/tracker.mo
share/locale/be@latin/LC_MESSAGES/tracker.mo
share/locale/ca/LC_MESSAGES/tracker.mo
+share/locale/cs/LC_MESSAGES/tracker.mo
+share/locale/da/LC_MESSAGES/tracker.mo
share/locale/de/LC_MESSAGES/tracker.mo
share/locale/dz/LC_MESSAGES/tracker.mo
+share/locale/el/LC_MESSAGES/tracker.mo
share/locale/en_GB/LC_MESSAGES/tracker.mo
share/locale/es/LC_MESSAGES/tracker.mo
share/locale/et/LC_MESSAGES/tracker.mo
share/locale/fi/LC_MESSAGES/tracker.mo
share/locale/fr/LC_MESSAGES/tracker.mo
share/locale/gl/LC_MESSAGES/tracker.mo
+share/locale/he/LC_MESSAGES/tracker.mo
share/locale/hu/LC_MESSAGES/tracker.mo
share/locale/it/LC_MESSAGES/tracker.mo
+share/locale/ja/LC_MESSAGES/tracker.mo
share/locale/ko/LC_MESSAGES/tracker.mo
share/locale/lt/LC_MESSAGES/tracker.mo
share/locale/mk/LC_MESSAGES/tracker.mo
@@ -126,6 +237,7 @@ share/locale/ru/LC_MESSAGES/tracker.mo
share/locale/sk/LC_MESSAGES/tracker.mo
share/locale/sl/LC_MESSAGES/tracker.mo
share/locale/sv/LC_MESSAGES/tracker.mo
+share/locale/th/LC_MESSAGES/tracker.mo
share/locale/zh_CN/LC_MESSAGES/tracker.mo
%%DATADIR%%/languages/stopwords.da
%%DATADIR%%/languages/stopwords.de
@@ -133,25 +245,33 @@ share/locale/zh_CN/LC_MESSAGES/tracker.mo
%%DATADIR%%/languages/stopwords.es
%%DATADIR%%/languages/stopwords.fi
%%DATADIR%%/languages/stopwords.fr
+%%DATADIR%%/languages/stopwords.hu
%%DATADIR%%/languages/stopwords.it
%%DATADIR%%/languages/stopwords.nb
%%DATADIR%%/languages/stopwords.nl
%%DATADIR%%/languages/stopwords.pt
%%DATADIR%%/languages/stopwords.ru
%%DATADIR%%/languages/stopwords.sv
+%%DATADIR%%/modules/applications.module
+%%DATADIR%%/modules/evolution.module
+%%DATADIR%%/modules/files.module
+%%DATADIR%%/modules/gaim-conversations.module
%%DATADIR%%/services/application.metadata
%%DATADIR%%/services/audio.metadata
+%%DATADIR%%/services/conversation.metadata
%%DATADIR%%/services/default.metadata
%%DATADIR%%/services/default.service
%%DATADIR%%/services/document.metadata
%%DATADIR%%/services/email.metadata
%%DATADIR%%/services/file.metadata
%%DATADIR%%/services/image.metadata
+%%DATADIR%%/services/playlist.metadata
%%DATADIR%%/services/video.metadata
%%DATADIR%%/sqlite-cache.sql
+%%DATADIR%%/sqlite-contents.sql
%%DATADIR%%/sqlite-email.sql
+%%DATADIR%%/sqlite-fulltext.sql
%%DATADIR%%/sqlite-metadata.sql
-%%DATADIR%%/sqlite-service-stored-procs.sql
%%DATADIR%%/sqlite-service-triggers.sql
%%DATADIR%%/sqlite-service-types.sql
%%DATADIR%%/sqlite-service.sql
@@ -159,21 +279,32 @@ share/locale/zh_CN/LC_MESSAGES/tracker.mo
%%DATADIR%%/sqlite-tracker-triggers.sql
%%DATADIR%%/sqlite-tracker.sql
%%DATADIR%%/sqlite-user-data.sql
-%%DATADIR%%/tracker-introspect.xml
+%%DATADIR%%/tracker-backup.xml
+%%DATADIR%%/tracker-daemon.xml
+%%DATADIR%%/tracker-extract.xml
+%%DATADIR%%/tracker-files.xml
+%%DATADIR%%/tracker-indexer.xml
+%%DATADIR%%/tracker-keywords.xml
+%%DATADIR%%/tracker-metadata.xml
+%%DATADIR%%/tracker-search.xml
@dirrm %%DATADIR%%/services
+@dirrm %%DATADIR%%/modules
@dirrm %%DATADIR%%/languages
@dirrm %%DATADIR%%
-@dirrm lib/tracker/thumbnailers/image
-@dirrm lib/tracker/thumbnailers/application
-@dirrm lib/tracker/thumbnailers
-@dirrm lib/tracker/filters/text
-@dirrm lib/tracker/filters/application
-@dirrm lib/tracker/filters
-@dirrm lib/tracker/extract-modules
-@dirrm lib/tracker
@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 share/doc/libtracker-module
+@dirrm share/doc/libtracker-common
+@dirrm lib/tracker/indexer-modules
+@dirrm lib/tracker/filters/text
+@dirrm lib/tracker/filters/application
+@dirrm lib/tracker/filters
+@dirrm lib/tracker/extract-modules
+@dirrm lib/tracker
+@dirrm include/tracker-1.0/libtracker-module
+@dirrm include/tracker-1.0/libtracker-common
+@dirrm include/tracker-1.0
diff --git a/sysutils/tracker-gnome/Makefile b/sysutils/tracker-gnome/Makefile
index fa7c585b9b37..d75ed4cf245f 100644
--- a/sysutils/tracker-gnome/Makefile
+++ b/sysutils/tracker-gnome/Makefile
@@ -3,9 +3,9 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/tracker-gnome/Makefile,v 1.2 2009/04/09 03:24:09 mezz Exp $
+# $MCom: ports/sysutils/tracker-gnome/Makefile,v 1.4 2009/08/08 18:46:42 ahze Exp $
-PORTREVISION= 3
+PORTREVISION= 0
COMMENT= Tracker GNOME applet, search tool, and preference programs
diff --git a/sysutils/tracker-gnome/pkg-plist b/sysutils/tracker-gnome/pkg-plist
index a6d62ab27d95..2587a84e1e41 100644
--- a/sysutils/tracker-gnome/pkg-plist
+++ b/sysutils/tracker-gnome/pkg-plist
@@ -11,6 +11,5 @@ share/applications/tracker-search-tool.desktop
%%DATADIR%%/icons/tracker-applet-paused.png
%%DATADIR%%/tracker-applet-prefs.glade
%%DATADIR%%/tracker-preferences.glade
-@dirrmtry %%DATADIR%%/icons
-@dirrmtry %%DATADIR%%
+@dirrm %%DATADIR%%/icons
@dirrmtry share/applications
diff --git a/sysutils/tracker-libtrackergtk/Makefile b/sysutils/tracker-libtrackergtk/Makefile
index 247b978bec4f..0ad05f45cd27 100644
--- a/sysutils/tracker-libtrackergtk/Makefile
+++ b/sysutils/tracker-libtrackergtk/Makefile
@@ -3,9 +3,9 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/tracker-libtrackergtk/Makefile,v 1.1 2008/03/30 20:39:09 ahze Exp $
+# $MCom: ports/sysutils/tracker-libtrackergtk/Makefile,v 1.1 2009/08/08 18:46:43 ahze Exp $
-PORTREVISION= 2
+PORTREVISION= 0
COMMENT= Gtk bindings to tracker and GSF data extract module (MS docs)
diff --git a/sysutils/tracker-libtrackergtk/pkg-plist b/sysutils/tracker-libtrackergtk/pkg-plist
index 4cee5053d4f4..a4408617c565 100644
--- a/sysutils/tracker-libtrackergtk/pkg-plist
+++ b/sysutils/tracker-libtrackergtk/pkg-plist
@@ -11,6 +11,4 @@ lib/libtracker-gtk.so.0
lib/tracker/extract-modules/libextract-msoffice.a
lib/tracker/extract-modules/libextract-msoffice.la
lib/tracker/extract-modules/libextract-msoffice.so
-@dirrm lib/tracker/extract-modules
-@dirrm lib/tracker
@dirrm include/libtracker-gtk
diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index cb4deecaff15..7ee5a3c7a3ef 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/tracker/Makefile,v 1.2 2008/03/31 00:28:58 ahze Exp $
+# $MCom: ports/sysutils/tracker/Makefile,v 1.18 2009/08/08 18:46:41 ahze Exp $
#
PORTNAME= tracker
-PORTVERSION= 0.6.6
-PORTREVISION= 2
+PORTVERSION= 0.6.95
CATEGORIES= sysutils gnome
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index f4c739cebc1a..ae4bc8231b8d 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/textproc/gnome-doc-utils/Makefile,v 1.1 2009/04/16 07:52:40 kwm Exp $
+# $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.74 2009/11/19 19:39:52 kwm Exp $
#
PORTNAME= gnome-doc-utils
-PORTVERSION= 0.16.1
-PORTREVISION= 1
+PORTVERSION= 0.18.1
CATEGORIES= textproc gnome
MASTER_SITES= GNOME
@@ -16,6 +15,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME doc utils
BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \
+ ${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
gawk:${PORTSDIR}/lang/gawk
RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \
${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
@@ -37,6 +37,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN1= xml2po.1
post-install:
- @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PREFIX}/share/xml2po
+ @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR}/xml2po
+ @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR}/xml2po/modes
.include <bsd.port.mk>
diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo
index 56c198680c89..47ba83b1284c 100644
--- a/textproc/gnome-doc-utils/distinfo
+++ b/textproc/gnome-doc-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-doc-utils-0.16.1.tar.bz2) = 85d4bba44773f6162de72e81e8bd0ab0
-SHA256 (gnome-doc-utils-0.16.1.tar.bz2) = 73e0c7f06efcc42b3b3c353dd5d4c19f178119505bcbb554312be6862616e248
-SIZE (gnome-doc-utils-0.16.1.tar.bz2) = 626475
+MD5 (gnome-doc-utils-0.18.1.tar.bz2) = c98ca796f3f2938a1fced7476e65351e
+SHA256 (gnome-doc-utils-0.18.1.tar.bz2) = f601f602a99023fb8d46b3e5dec460357d719d9c6aae9600520f1b786d4f545f
+SIZE (gnome-doc-utils-0.18.1.tar.bz2) = 783694
diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist
index 786631717549..1573cb49a487 100644
--- a/textproc/gnome-doc-utils/pkg-plist
+++ b/textproc/gnome-doc-utils/pkg-plist
@@ -3,6 +3,30 @@ bin/gnome-doc-tool
bin/xml2po
libdata/pkgconfig/gnome-doc-utils.pc
libdata/pkgconfig/xml2po.pc
+%%PYTHON_SITELIBDIR%%/xml2po/__init__.py
+%%PYTHON_SITELIBDIR%%/xml2po/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xml2po/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xml2po/modes/__init__.py
+%%PYTHON_SITELIBDIR%%/xml2po/modes/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xml2po/modes/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xml2po/modes/basic.py
+%%PYTHON_SITELIBDIR%%/xml2po/modes/basic.pyc
+%%PYTHON_SITELIBDIR%%/xml2po/modes/basic.pyo
+%%PYTHON_SITELIBDIR%%/xml2po/modes/docbook.py
+%%PYTHON_SITELIBDIR%%/xml2po/modes/docbook.pyc
+%%PYTHON_SITELIBDIR%%/xml2po/modes/docbook.pyo
+%%PYTHON_SITELIBDIR%%/xml2po/modes/gs.py
+%%PYTHON_SITELIBDIR%%/xml2po/modes/gs.pyc
+%%PYTHON_SITELIBDIR%%/xml2po/modes/gs.pyo
+%%PYTHON_SITELIBDIR%%/xml2po/modes/mallard.py
+%%PYTHON_SITELIBDIR%%/xml2po/modes/mallard.pyc
+%%PYTHON_SITELIBDIR%%/xml2po/modes/mallard.pyo
+%%PYTHON_SITELIBDIR%%/xml2po/modes/ubuntu.py
+%%PYTHON_SITELIBDIR%%/xml2po/modes/ubuntu.pyc
+%%PYTHON_SITELIBDIR%%/xml2po/modes/ubuntu.pyo
+%%PYTHON_SITELIBDIR%%/xml2po/modes/xhtml.py
+%%PYTHON_SITELIBDIR%%/xml2po/modes/xhtml.pyc
+%%PYTHON_SITELIBDIR%%/xml2po/modes/xhtml.pyo
share/aclocal/gnome-doc-utils.m4
%%DATADIR%%/gnome-doc-utils.make
%%DATADIR%%/icons/hicolor/48x48/admon-bug.png
@@ -33,6 +57,153 @@ share/aclocal/gnome-doc-utils.m4
share/gnome/help/gnome-doc-make/C/gnome-doc-make.xml
share/gnome/help/gnome-doc-make/C/legal.xml
share/gnome/help/gnome-doc-make/C/make-ref.xml
+share/gnome/help/gnome-doc-make/de/gnome-doc-make.xml
+share/gnome/help/gnome-doc-make/de/legal.xml
+share/gnome/help/gnome-doc-make/de/make-ref.xml
+share/gnome/help/gnome-doc-mallard-spec/C/details.page
+share/gnome/help/gnome-doc-mallard-spec/C/docbook.page
+share/gnome/help/gnome-doc-mallard-spec/C/explore.page
+share/gnome/help/gnome-doc-mallard-spec/C/figures/mallard.png
+share/gnome/help/gnome-doc-mallard-spec/C/i18n.page
+share/gnome/help/gnome-doc-mallard-spec/C/index.page
+share/gnome/help/gnome-doc-mallard-spec/C/its.page
+share/gnome/help/gnome-doc-mallard-spec/C/l10n.page
+share/gnome/help/gnome-doc-mallard-spec/C/legal.xml
+share/gnome/help/gnome-doc-mallard-spec/C/links.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_TODO.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_attr_link.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_cite.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_code.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_comment.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_desc.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_example.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_figure.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_list.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_listing.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_media.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_note.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_p.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_quote.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_screen.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_steps.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_subtitle.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_synopsis.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_terms.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_title.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_block_tree.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_external.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_info.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_info_credit.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_info_desc.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_info_email.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_info_license.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_info_link.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_info_name.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_info_revision.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_info_title.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_info_years.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_app.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_cmd.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_code.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_em.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_file.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_gui.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_guiseq.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_input.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_key.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_keyseq.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_link.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_media.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_output.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_span.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_sys.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_inline_var.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_page.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_section.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_table.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_table_col.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_table_td.page
+share/gnome/help/gnome-doc-mallard-spec/C/mal_table_tr.page
+share/gnome/help/gnome-doc-mallard-spec/C/principle-guide.page
+share/gnome/help/gnome-doc-mallard-spec/C/principle-justenough.page
+share/gnome/help/gnome-doc-mallard-spec/C/principle-redundancy.page
+share/gnome/help/gnome-doc-mallard-spec/C/principles.page
+share/gnome/help/gnome-doc-mallard-spec/C/spec.page
+share/gnome/help/gnome-doc-mallard-spec/C/tenminutes.page
+share/gnome/help/gnome-doc-mallard-spec/de/details.page
+share/gnome/help/gnome-doc-mallard-spec/de/docbook.page
+share/gnome/help/gnome-doc-mallard-spec/de/explore.page
+share/gnome/help/gnome-doc-mallard-spec/de/figures/mallard.png
+share/gnome/help/gnome-doc-mallard-spec/de/i18n.page
+share/gnome/help/gnome-doc-mallard-spec/de/index.page
+share/gnome/help/gnome-doc-mallard-spec/de/its.page
+share/gnome/help/gnome-doc-mallard-spec/de/l10n.page
+share/gnome/help/gnome-doc-mallard-spec/de/legal.xml
+share/gnome/help/gnome-doc-mallard-spec/de/links.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_TODO.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_attr_link.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_cite.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_code.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_comment.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_desc.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_example.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_figure.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_list.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_listing.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_media.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_note.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_p.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_quote.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_screen.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_steps.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_subtitle.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_synopsis.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_terms.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_title.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_block_tree.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_external.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_info.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_info_credit.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_info_desc.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_info_email.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_info_license.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_info_link.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_info_name.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_info_revision.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_info_title.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_info_years.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_app.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_cmd.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_code.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_em.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_file.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_gui.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_guiseq.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_input.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_key.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_keyseq.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_link.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_media.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_output.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_span.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_sys.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_inline_var.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_page.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_section.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_table.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_table_col.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_table_td.page
+share/gnome/help/gnome-doc-mallard-spec/de/mal_table_tr.page
+share/gnome/help/gnome-doc-mallard-spec/de/principle-guide.page
+share/gnome/help/gnome-doc-mallard-spec/de/principle-justenough.page
+share/gnome/help/gnome-doc-mallard-spec/de/principle-redundancy.page
+share/gnome/help/gnome-doc-mallard-spec/de/principles.page
+share/gnome/help/gnome-doc-mallard-spec/de/spec.page
+share/gnome/help/gnome-doc-mallard-spec/de/tenminutes.page
share/gnome/help/gnome-doc-xslt/C/db-chunk.xml
share/gnome/help/gnome-doc-xslt/C/db-common.xml
share/gnome/help/gnome-doc-xslt/C/db-label.xml
@@ -67,8 +238,46 @@ share/gnome/help/gnome-doc-xslt/C/gettext.xml
share/gnome/help/gnome-doc-xslt/C/gnome-doc-xslt.xml
share/gnome/help/gnome-doc-xslt/C/l10n-numbers.xml
share/gnome/help/gnome-doc-xslt/C/legal.xml
+share/gnome/help/gnome-doc-xslt/C/utils.xml
share/gnome/help/gnome-doc-xslt/C/theme.xml
share/gnome/help/gnome-doc-xslt/C/translating.xml
+share/gnome/help/gnome-doc-xslt/de/db-chunk.xml
+share/gnome/help/gnome-doc-xslt/de/db-common.xml
+share/gnome/help/gnome-doc-xslt/de/db-label.xml
+share/gnome/help/gnome-doc-xslt/de/db-title.xml
+share/gnome/help/gnome-doc-xslt/de/db-xref.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-autotoc.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-bibliography.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-block.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-callout.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-classsynopsis.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-cmdsynopsis.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-css.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-division.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-ebnf.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-footnote.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-funcsynopsis.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-index.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-info.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-inline.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-l10n.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-list.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-media.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-qanda.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-refentry.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-table.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-title.xml
+share/gnome/help/gnome-doc-xslt/de/db2html-xref.xml
+share/gnome/help/gnome-doc-xslt/de/db2html.xml
+share/gnome/help/gnome-doc-xslt/de/db2omf.xml
+share/gnome/help/gnome-doc-xslt/de/db2xhtml.xml
+share/gnome/help/gnome-doc-xslt/de/gettext.xml
+share/gnome/help/gnome-doc-xslt/de/gnome-doc-xslt.xml
+share/gnome/help/gnome-doc-xslt/de/l10n-numbers.xml
+share/gnome/help/gnome-doc-xslt/de/legal.xml
+share/gnome/help/gnome-doc-xslt/de/theme.xml
+share/gnome/help/gnome-doc-xslt/de/translating.xml
+share/gnome/help/gnome-doc-xslt/de/utils.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
@@ -76,6 +285,7 @@ share/locale/bg/LC_MESSAGES/gnome-doc-utils.mo
share/locale/bn/LC_MESSAGES/gnome-doc-utils.mo
share/locale/bn_IN/LC_MESSAGES/gnome-doc-utils.mo
share/locale/ca/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-doc-utils.mo
share/locale/cs/LC_MESSAGES/gnome-doc-utils.mo
share/locale/cy/LC_MESSAGES/gnome-doc-utils.mo
share/locale/da/LC_MESSAGES/gnome-doc-utils.mo
@@ -90,6 +300,7 @@ share/locale/eu/LC_MESSAGES/gnome-doc-utils.mo
share/locale/fa/LC_MESSAGES/gnome-doc-utils.mo
share/locale/fi/LC_MESSAGES/gnome-doc-utils.mo
share/locale/fr/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/ga/LC_MESSAGES/gnome-doc-utils.mo
share/locale/gl/LC_MESSAGES/gnome-doc-utils.mo
share/locale/gu/LC_MESSAGES/gnome-doc-utils.mo
share/locale/he/LC_MESSAGES/gnome-doc-utils.mo
@@ -103,6 +314,7 @@ share/locale/kn/LC_MESSAGES/gnome-doc-utils.mo
share/locale/ko/LC_MESSAGES/gnome-doc-utils.mo
share/locale/lt/LC_MESSAGES/gnome-doc-utils.mo
share/locale/lv/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/mai/LC_MESSAGES/gnome-doc-utils.mo
share/locale/mg/LC_MESSAGES/gnome-doc-utils.mo
share/locale/mk/LC_MESSAGES/gnome-doc-utils.mo
share/locale/ml/LC_MESSAGES/gnome-doc-utils.mo
@@ -139,7 +351,10 @@ share/locale/zh_CN/LC_MESSAGES/gnome-doc-utils.mo
share/locale/zh_HK/LC_MESSAGES/gnome-doc-utils.mo
share/locale/zh_TW/LC_MESSAGES/gnome-doc-utils.mo
share/omf/gnome-doc-make/gnome-doc-make-C.omf
+share/omf/gnome-doc-make/gnome-doc-make-de.omf
share/omf/gnome-doc-xslt/gnome-doc-xslt-C.omf
+share/omf/gnome-doc-xslt/gnome-doc-xslt-de.omf
+share/xml/gnome/xslt/common/utils.xsl
share/xml/gnome/xslt/common/theme.xsl
share/xml/gnome/xslt/docbook/common/db-chunk.xsl
share/xml/gnome/xslt/docbook/common/db-common.xsl
@@ -180,17 +395,26 @@ share/xml/gnome/xslt/docbook/utils/ids.xsl
share/xml/gnome/xslt/gettext/gettext.xsl
share/xml/gnome/xslt/gettext/l10n-numbers.xsl
share/xml/gnome/xslt/gettext/l10n.xml
-share/xml2po/docbook.py
-share/xml2po/docbook.pyc
-share/xml2po/empty.py
-share/xml2po/empty.pyc
-share/xml2po/gs.py
-share/xml2po/gs.pyc
-share/xml2po/ubuntu.py
-share/xml2po/ubuntu.pyc
-share/xml2po/xhtml.py
-share/xml2po/xhtml.pyc
-@dirrm share/xml2po
+share/xml/gnome/xslt/mallard/common/mal-chunk.xsl
+share/xml/gnome/xslt/mallard/common/mal-link.xsl
+share/xml/gnome/xslt/mallard/html/mal2html-block.xsl
+share/xml/gnome/xslt/mallard/html/mal2html-css.xsl
+share/xml/gnome/xslt/mallard/html/mal2html-inline.xsl
+share/xml/gnome/xslt/mallard/html/mal2html-list.xsl
+share/xml/gnome/xslt/mallard/html/mal2html-media.xsl
+share/xml/gnome/xslt/mallard/html/mal2html-page.xsl
+share/xml/gnome/xslt/mallard/html/mal2html-table.xsl
+share/xml/gnome/xslt/mallard/html/mal2html.xsl
+share/xml/gnome/xslt/mallard/html/mal2xhtml.xsl
+share/xml/gnome/xslt/mallard/utils/mal2cache.xsl
+share/xml/mallard/1.0/mallard.rnc
+share/xml/mallard/1.0/mallard.rng
+@dirrm share/xml/mallard/1.0
+@dirrm share/xml/mallard
+@dirrm share/xml/gnome/xslt/mallard/utils
+@dirrm share/xml/gnome/xslt/mallard/html
+@dirrm share/xml/gnome/xslt/mallard/common
+@dirrm share/xml/gnome/xslt/mallard
@dirrm share/xml/gnome/xslt/gettext
@dirrm share/xml/gnome/xslt/docbook/utils
@dirrm share/xml/gnome/xslt/docbook/omf
@@ -202,8 +426,15 @@ share/xml2po/xhtml.pyc
@dirrm share/xml/gnome
@dirrm share/omf/gnome-doc-xslt
@dirrm share/omf/gnome-doc-make
+@dirrm share/gnome/help/gnome-doc-xslt/de
@dirrm share/gnome/help/gnome-doc-xslt/C
@dirrm share/gnome/help/gnome-doc-xslt
+@dirrm share/gnome/help/gnome-doc-mallard-spec/de/figures
+@dirrm share/gnome/help/gnome-doc-mallard-spec/de
+@dirrm share/gnome/help/gnome-doc-mallard-spec/C/figures
+@dirrm share/gnome/help/gnome-doc-mallard-spec/C
+@dirrm share/gnome/help/gnome-doc-mallard-spec
+@dirrm share/gnome/help/gnome-doc-make/de
@dirrm share/gnome/help/gnome-doc-make/C
@dirrm share/gnome/help/gnome-doc-make
@dirrm %%DATADIR%%/watermarks
@@ -229,11 +460,17 @@ share/xml2po/xhtml.pyc
@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/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/as/LC_MESSAGES
@dirrmtry share/locale/as
+@dirrm %%PYTHON_SITELIBDIR%%/xml2po/modes
+@dirrm %%PYTHON_SITELIBDIR%%/xml2po
diff --git a/textproc/gnome-translate/Makefile b/textproc/gnome-translate/Makefile
index ee9ebb83f565..218998b6ca1a 100644
--- a/textproc/gnome-translate/Makefile
+++ b/textproc/gnome-translate/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-translate
PORTVERSION= 0.99
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= libtranslate
@@ -20,7 +20,7 @@ LIB_DEPENDS= translate:${PORTSDIR}/textproc/libtranslate
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
GCONF_SCHEMAS= gnome-translate.schemas
-USE_GNOME= gnomehack gnomeprefix eel2 intlhack
+USE_GNOME= gnomehack gnomeprefix eel2 intlhack libgnomeui
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/Makefile b/www/Makefile
index b05446dcf661..96e380b1a43a 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -243,7 +243,6 @@
SUBDIR += g-gcl
SUBDIR += gaeo
SUBDIR += gaeutilities
- SUBDIR += galeon
SUBDIR += gallery
SUBDIR += gallery2
SUBDIR += gallery3
@@ -256,6 +255,7 @@
SUBDIR += geronimo
SUBDIR += getleft
SUBDIR += gforge
+ SUBDIR += gir-repository-webkit
SUBDIR += gist
SUBDIR += glibwww
SUBDIR += glpi
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index e1317f0d785d..cf7e5eba6097 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany-extensions/Makefile,v 1.114 2009/03/30 21:05:52 marcus Exp $
+# $MCom: ports/www/epiphany-extensions/Makefile,v 1.122 2009/10/19 02:40:50 kwm Exp $
#
PORTNAME= epiphany-extensions
-PORTVERSION= 2.26.1
-PORTREVISION= 2
+PORTVERSION= 2.28.1
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,27 +16,23 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A set of add-ons for the Epiphany web browser
BUILD_DEPENDS= epiphany:${PORTSDIR}/www/epiphany
-LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
+LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
+ webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_GECKO= libxul
USE_GNOME= gnomeprefix gnomehack intlhack
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS= --with-mozilla=${GECKO}
-
-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=2.26 EPHY_VERSION=2.26
+PLIST_SUB= VERSION=${EPHY_VERSION} EPHY_VERSION=${EPHY_VERSION}
OPTIONS= OPENSP "Enable OpenSP SGML support" off
@@ -49,14 +44,6 @@ CONFIGURE_ARGS+= --enable-opensp=yes
CONFIGURE_ARGS+= --disable-opensp
.endif
-.if exists(${LOCALBASE}/share/pygtk/2.0/defs/epiphany.defs)
-USE_PYTHON= yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-PLIST_SUB+= PYTHON=""
-.else
-PLIST_SUB+= PYTHON="@comment "
-.endif
-
CONFIGURE_ARGS+=--with-extensions="${EPHY_EXTENSIONS}"
pre-everything::
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index 329aae0f78d6..411231617165 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-extensions-2.26.1.tar.bz2) = bc3044148e915312654f8c82a575e58e
-SHA256 (gnome2/epiphany-extensions-2.26.1.tar.bz2) = 928b444783332fefb4abccd98827aa3fabd8e7279e2fe0400019dcbab9ea072c
-SIZE (gnome2/epiphany-extensions-2.26.1.tar.bz2) = 1025146
+MD5 (gnome2/epiphany-extensions-2.28.1.tar.bz2) = 565d32a8b94fd023f11a82dcef2bf634
+SHA256 (gnome2/epiphany-extensions-2.28.1.tar.bz2) = 0f14413316ebbdba392c9df7468d0d08811376ee26c735d7e523fc4eba44572a
+SIZE (gnome2/epiphany-extensions-2.28.1.tar.bz2) = 1389667
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index 8864ff24eae5..e44956a16b5b 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -2,22 +2,9 @@ lib/epiphany/%%VERSION%%/extensions/actions.ephy-extension
lib/epiphany/%%VERSION%%/extensions/adblock.ephy-extension
lib/epiphany/%%VERSION%%/extensions/auto-reload.ephy-extension
lib/epiphany/%%VERSION%%/extensions/auto-scroller.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.py
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.pyc
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.pyo
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/certificates.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.py
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.pyc
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.pyo
-lib/epiphany/%%VERSION%%/extensions/error-viewer.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/certificates.ephy-extension
lib/epiphany/%%VERSION%%/extensions/extensions-manager-ui.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.py
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.pyc
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.pyo
lib/epiphany/%%VERSION%%/extensions/gestures.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/java-console.ephy-extension
lib/epiphany/%%VERSION%%/extensions/libactionsextension.la
lib/epiphany/%%VERSION%%/extensions/libactionsextension.so
lib/epiphany/%%VERSION%%/extensions/libadblockextension.la
@@ -28,50 +15,36 @@ lib/epiphany/%%VERSION%%/extensions/libautoscrollerextension.la
lib/epiphany/%%VERSION%%/extensions/libautoscrollerextension.so
lib/epiphany/%%VERSION%%/extensions/libcertificatesextension.la
lib/epiphany/%%VERSION%%/extensions/libcertificatesextension.so
-lib/epiphany/%%VERSION%%/extensions/liberrorviewerextension.la
-lib/epiphany/%%VERSION%%/extensions/liberrorviewerextension.so
lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.la
lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.so
lib/epiphany/%%VERSION%%/extensions/libgesturesextension.la
lib/epiphany/%%VERSION%%/extensions/libgesturesextension.so
-lib/epiphany/%%VERSION%%/extensions/libjavaconsoleextension.la
-lib/epiphany/%%VERSION%%/extensions/libjavaconsoleextension.so
-lib/epiphany/%%VERSION%%/extensions/libpageinfoextension.la
-lib/epiphany/%%VERSION%%/extensions/libpageinfoextension.so
lib/epiphany/%%VERSION%%/extensions/libpushscrollerextension.la
lib/epiphany/%%VERSION%%/extensions/libpushscrollerextension.so
lib/epiphany/%%VERSION%%/extensions/librssextension.la
lib/epiphany/%%VERSION%%/extensions/librssextension.so
-lib/epiphany/%%VERSION%%/extensions/libselectstylesheetextension.la
-lib/epiphany/%%VERSION%%/extensions/libselectstylesheetextension.so
lib/epiphany/%%VERSION%%/extensions/libsidebarextension.la
lib/epiphany/%%VERSION%%/extensions/libsidebarextension.so
-lib/epiphany/%%VERSION%%/extensions/libsmartbookmarksextension.la
-lib/epiphany/%%VERSION%%/extensions/libsmartbookmarksextension.so
+lib/epiphany/%%VERSION%%/extensions/libsoupflyextension.so
+lib/epiphany/%%VERSION%%/extensions/libsoupflyextension.la
lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.la
lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.so
lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.la
lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.so
-lib/epiphany/%%VERSION%%/extensions/page-info.ephy-extension
lib/epiphany/%%VERSION%%/extensions/push-scroller.ephy-extension
-%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/python-console.ephy-extension
lib/epiphany/%%VERSION%%/extensions/rss.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/select-stylesheet.ephy-extension
lib/epiphany/%%VERSION%%/extensions/sidebar.ephy-extension
-lib/epiphany/%%VERSION%%/extensions/smart-bookmarks.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/soup-fly.ephy-extension
lib/epiphany/%%VERSION%%/extensions/tab-groups.ephy-extension
lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension
%%DATADIR%%/adblock-patterns
%%DATADIR%%/ephy-gestures.xml
%%DATADIR%%/glade/action-properties.glade
%%DATADIR%%/glade/actions-editor.glade
-%%DATADIR%%/glade/adblock.glade
-%%DATADIR%%/glade/error-viewer.glade
-%%DATADIR%%/glade/extensions-manager-ui.glade
-%%DATADIR%%/glade/page-info.glade
+%%DATADIR%%/glade/adblock.ui
+%%DATADIR%%/glade/extensions-manager-ui.ui
%%DATADIR%%/glade/rss-ui.glade
%%DATADIR%%/xml/epiphany-sidebar-ui.xml
-%%DATADIR%%/xml/page-info-context-ui.xml
share/epiphany/icons/hicolor/16x16/status/ad-blocked.png
share/epiphany/icons/hicolor/16x16/status/feed-presence.png
share/epiphany/icons/hicolor/22x22/status/ad-blocked.png
@@ -82,7 +55,6 @@ 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
@@ -102,9 +74,28 @@ share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-view-source.png
share/gnome/help/epiphany-extensions/C/figures/epi-ext-sidebar.png
share/gnome/help/epiphany-extensions/C/figures/epi-ext-tabgroups.png
share/gnome/help/epiphany-extensions/C/legal.xml
+share/gnome/help/epiphany-extensions/de/epiphany-extensions.xml
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-action-create.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-adblocker.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-back.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-close-2.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-close.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-forward.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-fullscreen.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-homepage.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-new-tab.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-new-window.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-next-tab.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-prev-tab.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-reload.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-stop.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-up.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-view-source-2.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-view-source.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-sidebar.png
+share/gnome/help/epiphany-extensions/de/figures/epi-ext-tabgroups.png
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,9 +114,28 @@ share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-view-source-2.p
share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-view-source.png
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/fr/epiphany-extensions.xml
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-action-create.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-adblocker.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-back.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-close-2.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-close.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-forward.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-fullscreen.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-homepage.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-new-tab.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-new-window.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-next-tab.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-prev-tab.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-reload.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-stop.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-up.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-view-source-2.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-view-source.png
+share/gnome/help/epiphany-extensions/fr/figures/epi-ext-sidebar.png
+share/gnome/help/epiphany-extensions/fr/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
@@ -146,7 +156,6 @@ 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
@@ -166,7 +175,9 @@ share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-view-source.png
share/gnome/help/epiphany-extensions/sv/figures/epi-ext-sidebar.png
share/gnome/help/epiphany-extensions/sv/figures/epi-ext-tabgroups.png
share/locale/ar/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/as/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/bg/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/bn_IN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ca/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/cs/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/da/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -176,20 +187,26 @@ share/locale/el/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/en_CA/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/es/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/eu/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/fi/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/fr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/gl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/gu/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/he/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/hr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/hu/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/it/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ja/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/kn/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ko/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/lt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/ml/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/mr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/nb/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ne/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/nl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/oc/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/or/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/pa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/pl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/pt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -201,6 +218,8 @@ share/locale/sq/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/sr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/sv/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/ta/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/te/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/th/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/tr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/uk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -210,7 +229,9 @@ share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/omf/epiphany-extensions/epiphany-extensions-C.omf
+share/omf/epiphany-extensions/epiphany-extensions-de.omf
share/omf/epiphany-extensions/epiphany-extensions-es.omf
+share/omf/epiphany-extensions/epiphany-extensions-fr.omf
share/omf/epiphany-extensions/epiphany-extensions-oc.omf
share/omf/epiphany-extensions/epiphany-extensions-sv.omf
@dirrm share/omf/epiphany-extensions
@@ -218,8 +239,12 @@ share/omf/epiphany-extensions/epiphany-extensions-sv.omf
@dirrm share/gnome/help/epiphany-extensions/sv
@dirrm share/gnome/help/epiphany-extensions/oc/figures
@dirrm share/gnome/help/epiphany-extensions/oc
+@dirrm share/gnome/help/epiphany-extensions/fr/figures
+@dirrm share/gnome/help/epiphany-extensions/fr
@dirrm share/gnome/help/epiphany-extensions/es/figures
@dirrm share/gnome/help/epiphany-extensions/es
+@dirrm share/gnome/help/epiphany-extensions/de/figures
+@dirrm share/gnome/help/epiphany-extensions/de
@dirrm share/gnome/help/epiphany-extensions/C/figures
@dirrm share/gnome/help/epiphany-extensions/C
@dirrm share/gnome/help/epiphany-extensions
@@ -245,9 +270,17 @@ share/omf/epiphany-extensions/epiphany-extensions-sv.omf
@dirrmtry lib/epiphany
@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 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/epiphany/Makefile b/www/epiphany/Makefile
index d97d89085e46..87c44e7babfa 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.195 2009/03/30 03:15:21 marcus Exp $
+# $MCom: ports/www/epiphany/Makefile,v 1.214 2009/10/25 20:22:54 marcus Exp $
#
PORTNAME= epiphany
-PORTVERSION= 2.26.3
-PORTREVISION?= 4
+PORTVERSION= 2.28.1
+PORTREVISION?= 1
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,11 +16,15 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT?= An extremely lightweight and simple web browser for GNOME 2
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+ ${LOCALBASE}/share/gir-1.0/WebKit-1.0.gir:${PORTSDIR}/www/gir-repository-webkit
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
- notify.1:${PORTSDIR}/devel/libnotify
+ webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \
+ notify.1:${PORTSDIR}/devel/libnotify \
+ gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
- ${LOCALBASE}/share/icons/HighContrastLargePrint/index.theme:${PORTSDIR}/x11-themes/gnome-themes
+ ${LOCALBASE}/share/gir-1.0/WebKit-1.0.gir:${PORTSDIR}/www/gir-repository-webkit \
+ ${LOCALBASE}/share/icons/HighContrastLargePrint/index.theme:${PORTSDIR}/x11-themes/gnome-themes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
@@ -32,19 +36,20 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils
WANT_GNOME= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GECKO+= libxul
INSTALLS_OMF= yes
+CONFIGURE_ARGS+=--enable-introspection
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS}"
-GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas \
- epiphany-fonts.schemas epiphany-pango.schemas
+GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas
PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}"
MAN1= epiphany.1
-OPTIONS= SPELL_CHECKER "Enable spell checking support" off
+OPTIONS= NSS "Import passwords from 2.26 and older on first run" on \
+ SEED "Enable seed support" off \
+ SPELLCHECK "Enable spell checking by default" on
.if defined(PACKAGE_BUILDING)
.undef WITHOUT_GNOME
@@ -53,40 +58,26 @@ WITH_GNOME= yes
.include <bsd.port.pre.mk>
-CONFIGURE_ARGS+= --with-gecko=${GECKO} \
- --with-engine=mozilla \
- --with-gecko-home=${LOCALBASE}/lib/${GECKO}
-CONFLICTS= epiphany-webkit-[1-9]*
-PLIST_SUB+= GECKO=""
-.if ${GECKO:Mlibxul}!=""
-PLUGIN_SYMLINK= 19
-CONFIGURE_ENV+=gecko_cv_xpcom_program_check="yes"
-PLIST_SUB+= GECKO19=""
-.else
-PLUGIN_SYMLINK= 18
-PLIST_SUB+= GECKO19="@comment "
-.endif
-
NO_WERROR= yes
# allow build with more warnings enabled
.if defined(NO_WERROR)
CONFIGURE_ARGS+= --enable-compile-warnings=no
.endif
-.if ${HAVE_GNOME:Mpygnome2}!=""
-USE_PYTHON= yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-USE_GNOME+= pygnome2
-CONFIGURE_ARGS+=--enable-python
-PLIST_SUB+= PYTHON=""
+.if defined(WITH_NSS)
+LIB_DEPENDS+= nss3.1:${PORTSDIR}/security/nss
+CONFIGURE_ARGS+=--enable-nss
.else
-CONFIGURE_ARGS+=--disable-python
-PLIST_SUB+= PYTHON="@comment "
+CONFIGURE_ARGS+=--disable-nss
+.endif
+
+.if defined(WITH_SEED)
+LIB_DEPENDS+= seed.0:${PORTSDIR}/devel/seed
+CONFIGURE_ARGS+=--enable-seed
.endif
-.if defined(WITH_SPELL_CHECKER)
-LIB_DEPENDS+= enchant.1:${PORTSDIR}/textproc/enchant
-CONFIGURE_ARGS+=--enable-spell-checker
+.if defined(WITH_SPELLCHECK)
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-embed_ephy-embed-prefs.c
.endif
post-patch:
@@ -95,14 +86,8 @@ post-patch:
@${REINPLACE_CMD} -e 's|execinfo.h|#|g ; \
s|-ldl"$$|"|g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|/lib/mozilla/plugins"|/lib/browser_plugins/symlinks/gecko${PLUGIN_SYMLINK}"|' \
- ${WRKSRC}/embed/mozilla/mozilla-embed-single.cpp
- @${REINPLACE_CMD} -e 's|@with_engine@|mozilla|' \
- ${WRKSRC}/data/epiphany.pc.in
post-install:
- ${INSTALL_DATA} ${WRKSRC}/data/epiphany-fonts.schemas \
- ${PREFIX}/etc/gconf/schemas
@-update-desktop-database
.include <bsd.port.post.mk>
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 40744340fbdd..0ccbf15306c0 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-2.26.3.tar.bz2) = 16f44012bc376077e1443e049d725847
-SHA256 (gnome2/epiphany-2.26.3.tar.bz2) = bc3e79cb0d62c30ef32c7cf9eef563b1de1af60f31729dae43c3795d214880ad
-SIZE (gnome2/epiphany-2.26.3.tar.bz2) = 5655997
+MD5 (gnome2/epiphany-2.28.1.tar.bz2) = 7a8b885a4894d2a9e979b8cb8898db1e
+SHA256 (gnome2/epiphany-2.28.1.tar.bz2) = 95ccdd36bc7fdf95c6085da3b76cee6467f3c9a8745541cfb09fdd8d33a1f04d
+SIZE (gnome2/epiphany-2.28.1.tar.bz2) = 5693411
diff --git a/www/epiphany/files/extra-patch-embed_ephy-embed-prefs.c b/www/epiphany/files/extra-patch-embed_ephy-embed-prefs.c
new file mode 100644
index 000000000000..f9fbb6a13b89
--- /dev/null
+++ b/www/epiphany/files/extra-patch-embed_ephy-embed-prefs.c
@@ -0,0 +1,12 @@
+--- embed/ephy-embed-prefs.c.orig 2009-10-25 16:18:24.000000000 -0400
++++ embed/ephy-embed-prefs.c 2009-10-25 16:19:05.000000000 -0400
+@@ -250,6 +250,9 @@ ephy_embed_prefs_init (void)
+ /* Hardcoded settings */
+ g_object_set (settings, "auto-shrink-images", FALSE, NULL);
+
++ /* Enable spell-check by default */
++ g_object_set (settings, "enable-spell-checking", TRUE, NULL);
++
+ /* Connections */
+ connections = g_malloc (sizeof (guint) * G_N_ELEMENTS (webkit_pref_entries));
+
diff --git a/www/epiphany/files/patch-embed_ephy-embed-utils.c b/www/epiphany/files/patch-embed_ephy-embed-utils.c
new file mode 100644
index 000000000000..09de6a98174c
--- /dev/null
+++ b/www/epiphany/files/patch-embed_ephy-embed-utils.c
@@ -0,0 +1,10 @@
+--- embed/ephy-embed-utils.c.orig 2009-10-13 15:28:59.000000000 +0200
++++ embed/ephy-embed-utils.c 2009-10-13 15:29:30.000000000 +0200
+@@ -91,6 +91,7 @@ ephy_embed_utils_address_has_web_scheme
+ g_str_has_prefix (address, "file:") ||
+ g_str_has_prefix (address, "data:") ||
+ g_str_has_prefix (address, "about:") ||
++ g_str_has_prefix (address, "javascript:") ||
+ g_str_has_prefix (address, "gopher:"));
+
+ return has_web_scheme;
diff --git a/www/epiphany/files/patch-embed_ephy-web-view.c b/www/epiphany/files/patch-embed_ephy-web-view.c
new file mode 100644
index 000000000000..beb96fd71c92
--- /dev/null
+++ b/www/epiphany/files/patch-embed_ephy-web-view.c
@@ -0,0 +1,14 @@
+--- embed/ephy-web-view.c.orig 2009-10-13 15:30:12.000000000 +0200
++++ embed/ephy-web-view.c 2009-10-13 15:30:52.000000000 +0200
+@@ -1129,7 +1129,10 @@ ephy_web_view_load_url (EphyWebView *vie
+ else
+ effective_url = ephy_embed_utils_normalize_address (url);
+
+- webkit_web_view_open (WEBKIT_WEB_VIEW (view), effective_url);
++ if (g_str_has_prefix (effective_url, "javascript:"))
++ webkit_web_view_execute_script (WEBKIT_WEB_VIEW (view), effective_url);
++ else
++ webkit_web_view_open (WEBKIT_WEB_VIEW (view), effective_url);
+
+ if (soup_uri)
+ soup_uri_free (soup_uri);
diff --git a/www/epiphany/files/patch-src_ephy-window.c b/www/epiphany/files/patch-src_ephy-window.c
new file mode 100644
index 000000000000..f8467d96bce8
--- /dev/null
+++ b/www/epiphany/files/patch-src_ephy-window.c
@@ -0,0 +1,35 @@
+From c61c318aabdc980477dccd78549fe9819c3b1fa0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@0d.be>
+Date: Fri, 9 Oct 2009 20:07:20 +0200
+Subject: [PATCH] Pass mailto: URI to gtk_show_uri()
+
+(Part of) Bug #584537
+---
+ src/ephy-window.c | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/src/ephy-window.c b/src/ephy-window.c
+index 635a779..630ecec 100644
+--- src/ephy-window.c
++++ src/ephy-window.c
+@@ -2548,10 +2548,18 @@ policy_decision_required_cb (WebKitWebView *web_view,
+ WebKitWebNavigationReason reason;
+ gint button;
+ gint state;
++ const char *uri;
+
+ reason = webkit_web_navigation_action_get_reason (action);
+ button = webkit_web_navigation_action_get_button (action);
+ state = webkit_web_navigation_action_get_modifier_state (action);
++ uri = webkit_network_request_get_uri (request);
++
++ if (strncmp (uri, "mailto:", 7) == 0) {
++ webkit_web_policy_decision_ignore (decision);
++ gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL);
++ return TRUE;
++ }
+
+ /* Open in new tab for middle click or ctrl+click */
+ if (reason == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED &&
+--
+1.6.4.3
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 583f6d49d136..265cf986aa97 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -1,16 +1,13 @@
bin/epiphany
+include/epiphany/%%EPHY_VERSION%%/epiphany/epiphany.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-adblock-manager.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-adblock.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-base-embed.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks-type-builtins.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-command-manager.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-cookie-manager.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-dbus.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-dialog.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-container.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-event.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-factory.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-persist.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-prefs.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-shell.h
@@ -20,7 +17,6 @@ include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-utils.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-extension.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-extensions-manager.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-history-item.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-history.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-lib-type-builtins.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-link.h
@@ -28,36 +24,39 @@ include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-loader.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-node-db.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-node.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-notebook.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-password-manager.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-permission-manager.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-session.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-shell.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-state.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-statusbar.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-type-builtins.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-version.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-web-view.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
@comment libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
-libdata/pkgconfig/epiphany-2.26.pc
+libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
share/aclocal/epiphany.m4
share/applications/bme.desktop
share/applications/epiphany.desktop
share/dbus-1/services/org.gnome.Epiphany.service
+lib/girepository-1.0/Epiphany-2.28.typelib
+share/gir-1.0/Epiphany-2.28.gir
%%DOCSDIR%%/EphyCommandManager.html
%%DOCSDIR%%/EphyEmbed.html
+%%DOCSDIR%%/EphyLocationEntry.html
%%DOCSDIR%%/EphyNodeDb.html
+%%DOCSDIR%%/EphySearchEntry.html
+%%DOCSDIR%%/EphySpinner.html
%%DOCSDIR%%/EphyWindow.html
+%%DOCSDIR%%/EphyZoomControl.html
%%DOCSDIR%%/ch01.html
%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
%%DOCSDIR%%/epiphany-EphyEmbedFactory.html
%%DOCSDIR%%/epiphany-EphyEmbedPersist.html
%%DOCSDIR%%/epiphany-EphyEmbedSingle.html
%%DOCSDIR%%/epiphany-EphyExtensionsManager.html
%%DOCSDIR%%/epiphany-EphyGlade.html
%%DOCSDIR%%/epiphany-EphyPermissionManager.html
-%%DOCSDIR%%/epiphany-ephy-cookie-manager.html
%%DOCSDIR%%/epiphany-ephy-password-manager.html
%%DOCSDIR%%/epiphany-ephy-session.html
%%DOCSDIR%%/epiphany-ephy-shell.html
@@ -71,13 +70,7 @@ share/dbus-1/services/org.gnome.Epiphany.service
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
%%DATADIR%%/about.ini
-%%DATADIR%%/chrome/app-chrome.manifest
-%%DATADIR%%/chrome/branding/brand.dtd
-%%DATADIR%%/chrome/branding/brand.properties
-%%DATADIR%%/chrome/global/about.xhtml
-%%GECKO19%%%%DATADIR%%/chrome/global/netError.dtd
-%%GECKO19%%%%DATADIR%%/components/epiphany.xpt
-%%DATADIR%%/default-prefs.js
+%%DATADIR%%/default-bookmarks.rdf
%%DATADIR%%/ephy-xml2ini.xsl
%%DATADIR%%/epiphany-bookmark-editor-ui.xml
%%DATADIR%%/epiphany-bookmarks-html.xsl
@@ -87,11 +80,11 @@ share/dbus-1/services/org.gnome.Epiphany.service
%%DATADIR%%/epiphany-toolbar.xml
%%DATADIR%%/epiphany-ui.xml
%%DATADIR%%/epiphany.xhtml
-%%DATADIR%%/glade/certificate-dialogs.glade
-%%DATADIR%%/glade/epiphany.glade
-%%DATADIR%%/glade/form-signing-dialog.glade
-%%DATADIR%%/glade/prefs-dialog.glade
-%%DATADIR%%/glade/print.glade
+%%DATADIR%%/glade/certificate-dialogs.ui
+%%DATADIR%%/glade/epiphany.ui
+%%DATADIR%%/glade/form-signing-dialog.ui
+%%DATADIR%%/glade/prefs-dialog.ui
+%%DATADIR%%/glade/print.ui
%%DATADIR%%/icons/hicolor/16x16/actions/bookmark-view.png
%%DATADIR%%/icons/hicolor/16x16/actions/history-view.png
%%DATADIR%%/icons/hicolor/16x16/actions/location-entry.png
@@ -239,8 +232,10 @@ share/locale/be@latin/LC_MESSAGES/epiphany.mo
share/locale/bg/LC_MESSAGES/epiphany.mo
share/locale/bn/LC_MESSAGES/epiphany.mo
share/locale/bn_IN/LC_MESSAGES/epiphany.mo
+share/locale/br/LC_MESSAGES/epiphany.mo
share/locale/bs/LC_MESSAGES/epiphany.mo
share/locale/ca/LC_MESSAGES/epiphany.mo
+share/locale/ca@valencia/LC_MESSAGES/epiphany.mo
share/locale/cs/LC_MESSAGES/epiphany.mo
share/locale/cy/LC_MESSAGES/epiphany.mo
share/locale/da/LC_MESSAGES/epiphany.mo
@@ -262,7 +257,9 @@ share/locale/he/LC_MESSAGES/epiphany.mo
share/locale/hi/LC_MESSAGES/epiphany.mo
share/locale/hr/LC_MESSAGES/epiphany.mo
share/locale/hu/LC_MESSAGES/epiphany.mo
+share/locale/hy/LC_MESSAGES/epiphany.mo
share/locale/id/LC_MESSAGES/epiphany.mo
+share/locale/ig/LC_MESSAGES/epiphany.mo
share/locale/is/LC_MESSAGES/epiphany.mo
share/locale/it/LC_MESSAGES/epiphany.mo
share/locale/ja/LC_MESSAGES/epiphany.mo
@@ -282,6 +279,7 @@ 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
@@ -307,8 +305,11 @@ share/locale/th/LC_MESSAGES/epiphany.mo
share/locale/tk/LC_MESSAGES/epiphany.mo
share/locale/tr/LC_MESSAGES/epiphany.mo
share/locale/uk/LC_MESSAGES/epiphany.mo
+share/locale/uz/LC_MESSAGES/epiphany.mo
+share/locale/uz@cyrillic/LC_MESSAGES/epiphany.mo
share/locale/vi/LC_MESSAGES/epiphany.mo
share/locale/wa/LC_MESSAGES/epiphany.mo
+share/locale/yo/LC_MESSAGES/epiphany.mo
share/locale/zh_CN/LC_MESSAGES/epiphany.mo
share/locale/zh_HK/LC_MESSAGES/epiphany.mo
share/locale/zh_TW/LC_MESSAGES/epiphany.mo
@@ -330,7 +331,6 @@ share/omf/epiphany/epiphany-oc.omf
share/omf/epiphany/epiphany-ru.omf
share/omf/epiphany/epiphany-sv.omf
share/omf/epiphany/epiphany-uk.omf
-share/pygtk/2.0/defs/epiphany.defs
@dirrm share/omf/epiphany
@dirrmtry share/icons/LowContrastLargePrint/48x48/apps
@dirrmtry share/icons/LowContrastLargePrint/48x48
@@ -395,14 +395,12 @@ share/pygtk/2.0/defs/epiphany.defs
@dirrmtry %%DATADIR%%/icons/hicolor
@dirrmtry %%DATADIR%%/icons
@dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%/components
-@dirrm %%DATADIR%%/chrome/global
-@dirrm %%DATADIR%%/chrome/branding
-@dirrm %%DATADIR%%/chrome
@dirrm %%DATADIR%%/art
@dirrmtry %%DATADIR%%
-@dirrm %%DOCSDIR%%
+@dirrmtry %%DOCSDIR%%
@dirrmtry share/applications
+@dirrmtry lib/girepository-1.0
+@dirrmtry share/gir-1.0
@dirrmtry lib/epiphany/%%EPHY_VERSION%%/plugins
@dirrmtry lib/epiphany/%%EPHY_VERSION%%
@dirrmtry lib/epiphany
@@ -437,6 +435,8 @@ share/pygtk/2.0/defs/epiphany.defs
@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
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index b04a21358fbd..cc1c39dd1c70 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast <kwm@rainbow-runner.nl>
#
# $FreeBSD$
-# $MCom: ports/www/evolution-webcal/Makefile,v 1.61 2009/03/17 17:15:04 kwm Exp $
+# $MCom: ports/www/evolution-webcal/Makefile,v 1.64 2009/09/22 11:30:13 avl Exp $
#
PORTNAME= evolution-webcal
-PORTVERSION= 2.26.0
-PORTREVISION= 1
+PORTVERSION= 2.28.0
CATEGORIES= www gnome
MASTER_SITES= GNOME
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo
index c57481dbbab9..b58ca34c74b4 100644
--- a/www/evolution-webcal/distinfo
+++ b/www/evolution-webcal/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (evolution-webcal-2.28.0.tar.bz2) = 7b506d06c56b579977d4ebc56463ff23
+SHA256 (evolution-webcal-2.28.0.tar.bz2) = 0518327536f1e43e14a19f0957e38a7c6cde224a971562a5a2c00cc7438cb7bd
+SIZE (evolution-webcal-2.28.0.tar.bz2) = 158384
diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist
index 13c66d80768b..f7662efc2861 100644
--- a/www/evolution-webcal/pkg-plist
+++ b/www/evolution-webcal/pkg-plist
@@ -9,6 +9,7 @@ share/locale/bn/LC_MESSAGES/evolution-webcal.mo
share/locale/bn_IN/LC_MESSAGES/evolution-webcal.mo
share/locale/bs/LC_MESSAGES/evolution-webcal.mo
share/locale/ca/LC_MESSAGES/evolution-webcal.mo
+share/locale/ca@valencia/LC_MESSAGES/evolution-webcal.mo
share/locale/cs/LC_MESSAGES/evolution-webcal.mo
share/locale/cy/LC_MESSAGES/evolution-webcal.mo
share/locale/da/LC_MESSAGES/evolution-webcal.mo
@@ -39,6 +40,7 @@ share/locale/ku/LC_MESSAGES/evolution-webcal.mo
share/locale/ky/LC_MESSAGES/evolution-webcal.mo
share/locale/lt/LC_MESSAGES/evolution-webcal.mo
share/locale/lv/LC_MESSAGES/evolution-webcal.mo
+share/locale/mai/LC_MESSAGES/evolution-webcal.mo
share/locale/mk/LC_MESSAGES/evolution-webcal.mo
share/locale/ml/LC_MESSAGES/evolution-webcal.mo
share/locale/mr/LC_MESSAGES/evolution-webcal.mo
@@ -95,12 +97,16 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.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/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@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
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
deleted file mode 100644
index 86d542073ce3..000000000000
--- a/www/galeon/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# Ports collection Makefile for: galeon
-# Date created: 1 August 2000
-# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports-stable/www/galeon/Makefile,v 1.6 2008/11/16 20:00:21 marcus Exp $
-#
-
-PORTNAME= galeon
-PORTVERSION= 2.0.7
-PORTREVISION= 1
-CATEGORIES= www gnome
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%202.x/Galeon%20${PORTVERSION}
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= A GNOME 2 Web browser based on gecko (the Mozilla rendering engine)
-
-USE_GECKO= firefox mozilla seamonkey xulrunner
-WRKSRC= ${WRKDIR}/${PORTNAME:S/2$//}-${PORTVERSION:S/a$//}
-USE_BZIP2= yes
-INSTALLS_OMF= yes
-USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils \
- gnomedesktop
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-USE_GETTEXT= yes
-CONFIGURE_ARGS= --enable-nautilus-view=no \
- --with-mozilla=${GECKO}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-MAN1= galeon.1
-GCONF_SCHEMAS= galeon.schemas
-
-DEPRECATED= requires legacy Gecko; switch to www/epiphany instead
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
-
-# Galeon does not build correctly in -CURRENT if -Werror is passed
-# to the compiler.
-NO_WERROR= yes
-
-# allow build with more warnings enabled
-.if defined(NO_WERROR)
-CONFIGURE_ARGS+= --disable-werror
-.endif
-
-post-patch:
- @${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|-lpthread|${PTHREAD_LIBS}|g'
- @${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|malloc\.h|stdlib.h|g'
- @${REINPLACE_CMD} -e 's|@prefix@/@DATADIRNAME@|@datadir@|g' \
- ${WRKSRC}/ui/galeon-bookmarks-editor-ui.xml.in
- @${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${LOCALBASE}/lib/browser_plugins/symlinks/gecko18|' \
- ${WRKSRC}/mozilla/mozilla-embed-shell.cpp
-
-.include <bsd.port.post.mk>
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
deleted file mode 100644
index b14dc93f2c93..000000000000
--- a/www/galeon/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (galeon-2.0.7.tar.bz2) = 2eede1f43e3f6f2ac4ce7d4db99b15b2
-SHA256 (galeon-2.0.7.tar.bz2) = c6fb0c9e7e2a4014ee7c785cec35380985138bd9aa2b33e9cb63de497ea68b3b
-SIZE (galeon-2.0.7.tar.bz2) = 3096337
diff --git a/www/galeon/files/patch-bookmarks_bookmarks-import-druid-konqueror.c b/www/galeon/files/patch-bookmarks_bookmarks-import-druid-konqueror.c
deleted file mode 100644
index 0400ebcf4602..000000000000
--- a/www/galeon/files/patch-bookmarks_bookmarks-import-druid-konqueror.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- bookmarks/bookmarks-import-druid-konqueror.c.orig Tue Mar 30 16:33:05 2004
-+++ bookmarks/bookmarks-import-druid-konqueror.c Mon May 31 23:35:26 2004
-@@ -20,6 +20,7 @@
- #include "config.h"
- #endif
-
-+#include <sys/types.h>
- #include <glib/gi18n.h>
- #include "bookmarks-import-druid-konqueror.h"
- #include "gul-gobject-misc.h"
diff --git a/www/galeon/files/patch-src_Makefile.in b/www/galeon/files/patch-src_Makefile.in
deleted file mode 100644
index 3c75398d9feb..000000000000
--- a/www/galeon/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig Thu Dec 18 15:12:38 2003
-+++ src/Makefile.in Thu Dec 18 15:13:13 2003
-@@ -206,6 +206,7 @@
- -I$(top_srcdir)/bookmarks \
- $(GALEON_DEPENDENCY_CFLAGS) \
- -DSHARE_DIR=\"$(pkgdatadir)\" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
- -DDATADIR=\""$(datadir)"\"
-
-
diff --git a/www/galeon/files/patch-src_galeon-main.c b/www/galeon/files/patch-src_galeon-main.c
deleted file mode 100644
index 777907e0e2c6..000000000000
--- a/www/galeon/files/patch-src_galeon-main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/galeon-main.c.orig Thu Sep 11 01:11:30 2003
-+++ src/galeon-main.c Thu Sep 11 01:12:31 2003
-@@ -130,7 +130,7 @@
- #ifdef ENABLE_NLS
- /* Initialize the i18n stuff */
- setlocale(LC_ALL, "");
-- bindtextdomain(GETTEXT_PACKAGE, DATADIR "/locale");
-+ bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);
- textdomain(GETTEXT_PACKAGE);
- #endif
- /* set the application name manually until gnome handles the
diff --git a/www/galeon/files/patch-ui_Makefile.in b/www/galeon/files/patch-ui_Makefile.in
deleted file mode 100644
index 9e87b8029a20..000000000000
--- a/www/galeon/files/patch-ui_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- ui/Makefile.in.orig Fri Jan 23 01:48:25 2004
-+++ ui/Makefile.in Fri Jan 23 01:48:55 2004
-@@ -265,8 +265,7 @@
- uidir = $(pkgdatadir)
-
- uixmldir = $(datadir)/gnome-2.0/ui
--uixml_in_files = galeon-bookmarks-editor-ui.xml.in \
-- nautilus-galeon-view-ui.xml.in
-+uixml_in_files = galeon-bookmarks-editor-ui.xml.in
-
-
- uixml_DATA = $(uixml_in_files:.xml.in=.xml)
diff --git a/www/galeon/pkg-descr b/www/galeon/pkg-descr
deleted file mode 100644
index 9a420538650d..000000000000
--- a/www/galeon/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Galeon is a GNOME 2 Web browser based on Gecko (the mozilla rendering engine).
-It's fast, it has a light interface, and it is fully standards-compliant.
-
-WWW: http://galeon.sourceforge.net/
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
deleted file mode 100644
index 21a4ba4f2390..000000000000
--- a/www/galeon/pkg-plist
+++ /dev/null
@@ -1,244 +0,0 @@
-bin/galeon
-bin/galeon-config-tool
-etc/sound/events/galeon.soundlist
-libdata/bonobo/servers/GNOME_Galeon_Automation.server
-libdata/bonobo/servers/GNOME_Galeon_NautilusView.server
-share/applications/galeon.desktop
-share/galeon/FAQ.html
-share/galeon/about_logo.png
-share/galeon/autoscroll.xpm
-share/galeon/bookmarks-editor-small.glade
-share/galeon/bookmarks-editor.glade
-share/galeon/bookmarks.glade
-share/galeon/bug.png
-share/galeon/certificate-dialogs.glade
-share/galeon/chrome/branding/brand.dtd
-share/galeon/chrome/branding/brand.properties
-share/galeon/chrome/galeon.manifest
-share/galeon/chrome/global/about.xhtml
-share/galeon/debian.png
-share/galeon/default-bookmarks.xbel
-share/galeon/default-prefs.js
-share/galeon/fetch_favicon.xpm
-share/galeon/freshmeat.png
-share/galeon/galeon-bookmark-alias-mark.png
-share/galeon/galeon-default.png
-share/galeon/galeon-download.png
-share/galeon/galeon-egg-ui-toolbar.xml
-share/galeon/galeon-egg-ui.xml
-share/galeon/galeon-entry.png
-share/galeon/galeon-filter.png
-share/galeon/galeon-folder.png
-share/galeon/galeon-history.png
-share/galeon/galeon-insecure.png
-share/galeon/galeon-popup-blocked.png
-share/galeon/galeon-prefs-fonts.png
-share/galeon/galeon-prefs-general.png
-share/galeon/galeon-prefs-language.png
-share/galeon/galeon-prefs-mouse.png
-share/galeon/galeon-prefs-network.png
-share/galeon/galeon-prefs-privacy.png
-share/galeon/galeon-prefs-tabs.png
-share/galeon/galeon-prefs-web-content.png
-share/galeon/galeon-secure.png
-share/galeon/galeon-separator.png
-share/galeon/galeon-tab-loading.gif
-share/galeon/galeon.glade
-share/galeon/galeon.png
-share/galeon/gnu.png
-share/galeon/google.png
-share/galeon/google_groups.png
-share/galeon/google_images.png
-share/galeon/hand-open.png
-share/galeon/imdb_movies.png
-share/galeon/logo.png
-share/galeon/myportal.css
-share/galeon/new_alias.xpm
-share/galeon/new_alias_small.xpm
-share/galeon/new_folder.xpm
-share/galeon/new_folder_small.xpm
-share/galeon/new_item.xpm
-share/galeon/new_item_small.xpm
-share/galeon/new_separator.xpm
-share/galeon/new_separator_small.xpm
-share/galeon/prefs-dialog.glade
-share/galeon/print.glade
-share/galeon/rpm.png
-share/galeon/slack.png
-share/galeon/smart-bm-fold.png
-share/galeon/smart-bm-unfold.png
-share/galeon/stocks.png
-share/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml
-share/gnome/help/galeon/C/apx-authors.xml
-share/gnome/help/galeon/C/apx-bugs.xml
-share/gnome/help/galeon/C/apx-command-line.xml
-share/gnome/help/galeon/C/apx-compiling.xml
-share/gnome/help/galeon/C/apx-keyboard-shortcuts.xml
-share/gnome/help/galeon/C/apx-mouse-gestures.xml
-share/gnome/help/galeon/C/apx-troubleshooting.xml
-share/gnome/help/galeon/C/bookmarks.xml
-share/gnome/help/galeon/C/browser-window.xml
-share/gnome/help/galeon/C/figures/bookmarks-editor.png
-share/gnome/help/galeon/C/figures/browser-window.png
-share/gnome/help/galeon/C/figures/find-dialog.png
-share/gnome/help/galeon/C/figures/gesture-back.png
-share/gnome/help/galeon/C/figures/gesture-clone-tab.png
-share/gnome/help/galeon/C/figures/gesture-clone-window.png
-share/gnome/help/galeon/C/figures/gesture-close-2.png
-share/gnome/help/galeon/C/figures/gesture-close.png
-share/gnome/help/galeon/C/figures/gesture-contents.png
-share/gnome/help/galeon/C/figures/gesture-forward.png
-share/gnome/help/galeon/C/figures/gesture-fullscreen.png
-share/gnome/help/galeon/C/figures/gesture-homepage.png
-share/gnome/help/galeon/C/figures/gesture-new-tab.png
-share/gnome/help/galeon/C/figures/gesture-new-window.png
-share/gnome/help/galeon/C/figures/gesture-next-link.png
-share/gnome/help/galeon/C/figures/gesture-next-tab.png
-share/gnome/help/galeon/C/figures/gesture-prev-link.png
-share/gnome/help/galeon/C/figures/gesture-prev-tab.png
-share/gnome/help/galeon/C/figures/gesture-reload-bypass.png
-share/gnome/help/galeon/C/figures/gesture-reload.png
-share/gnome/help/galeon/C/figures/gesture-stop.png
-share/gnome/help/galeon/C/figures/gesture-up.png
-share/gnome/help/galeon/C/figures/gesture-view-source.png
-share/gnome/help/galeon/C/figures/othertools-history.png
-share/gnome/help/galeon/C/figures/othertools-pdm.png
-share/gnome/help/galeon/C/figures/othertools-toolbar-editor.png
-share/gnome/help/galeon/C/figures/statusbar.png
-share/gnome/help/galeon/C/figures/tabbed-browsing.png
-share/gnome/help/galeon/C/figures/toolbars-bookmarks.png
-share/gnome/help/galeon/C/figures/toolbars-main.png
-share/gnome/help/galeon/C/galeon.xml
-share/gnome/help/galeon/C/getting-started.xml
-share/gnome/help/galeon/C/other-tools.xml
-share/gnome/help/galeon/C/plugins.xml
-share/gnome/help/galeon/C/preface.xml
-share/gnome/help/galeon/C/preferences.xml
-share/gnome/help/galeon/es/apx-authors.xml
-share/gnome/help/galeon/es/apx-bugs.xml
-share/gnome/help/galeon/es/apx-command-line.xml
-share/gnome/help/galeon/es/apx-compiling.xml
-share/gnome/help/galeon/es/apx-keyboard-shortcuts.xml
-share/gnome/help/galeon/es/apx-mouse-gestures.xml
-share/gnome/help/galeon/es/apx-troubleshooting.xml
-share/gnome/help/galeon/es/bookmarks.xml
-share/gnome/help/galeon/es/browser-window.xml
-share/gnome/help/galeon/es/figures/bookmarks-editor.png
-share/gnome/help/galeon/es/figures/browser-window.png
-share/gnome/help/galeon/es/figures/find-dialog.png
-share/gnome/help/galeon/es/figures/gesture-back.png
-share/gnome/help/galeon/es/figures/gesture-clone-tab.png
-share/gnome/help/galeon/es/figures/gesture-clone-window.png
-share/gnome/help/galeon/es/figures/gesture-close-2.png
-share/gnome/help/galeon/es/figures/gesture-close.png
-share/gnome/help/galeon/es/figures/gesture-contents.png
-share/gnome/help/galeon/es/figures/gesture-forward.png
-share/gnome/help/galeon/es/figures/gesture-fullscreen.png
-share/gnome/help/galeon/es/figures/gesture-homepage.png
-share/gnome/help/galeon/es/figures/gesture-new-tab.png
-share/gnome/help/galeon/es/figures/gesture-new-window.png
-share/gnome/help/galeon/es/figures/gesture-next-link.png
-share/gnome/help/galeon/es/figures/gesture-next-tab.png
-share/gnome/help/galeon/es/figures/gesture-prev-link.png
-share/gnome/help/galeon/es/figures/gesture-prev-tab.png
-share/gnome/help/galeon/es/figures/gesture-reload-bypass.png
-share/gnome/help/galeon/es/figures/gesture-reload.png
-share/gnome/help/galeon/es/figures/gesture-stop.png
-share/gnome/help/galeon/es/figures/gesture-up.png
-share/gnome/help/galeon/es/figures/gesture-view-source.png
-share/gnome/help/galeon/es/figures/othertools-history.png
-share/gnome/help/galeon/es/figures/othertools-pdm.png
-share/gnome/help/galeon/es/figures/othertools-toolbar-editor.png
-share/gnome/help/galeon/es/figures/statusbar.png
-share/gnome/help/galeon/es/figures/tabbed-browsing.png
-share/gnome/help/galeon/es/figures/toolbars-bookmarks.png
-share/gnome/help/galeon/es/figures/toolbars-main.png
-share/gnome/help/galeon/es/galeon.xml
-share/gnome/help/galeon/es/getting-started.xml
-share/gnome/help/galeon/es/other-tools.xml
-share/gnome/help/galeon/es/plugins.xml
-share/gnome/help/galeon/es/preface.xml
-share/gnome/help/galeon/es/preferences.xml
-share/omf/galeon/galeon-C.omf
-share/omf/galeon/galeon-es.omf
-share/pixmaps/galeon.png
-share/sounds/galeon/clicked.wav
-share/locale/am/LC_MESSAGES/galeon-2.0.mo
-share/locale/ar/LC_MESSAGES/galeon-2.0.mo
-share/locale/az/LC_MESSAGES/galeon-2.0.mo
-share/locale/be/LC_MESSAGES/galeon-2.0.mo
-share/locale/bg/LC_MESSAGES/galeon-2.0.mo
-share/locale/bs/LC_MESSAGES/galeon-2.0.mo
-share/locale/ca/LC_MESSAGES/galeon-2.0.mo
-share/locale/cs/LC_MESSAGES/galeon-2.0.mo
-share/locale/da/LC_MESSAGES/galeon-2.0.mo
-share/locale/de/LC_MESSAGES/galeon-2.0.mo
-share/locale/dz/LC_MESSAGES/galeon-2.0.mo
-share/locale/el/LC_MESSAGES/galeon-2.0.mo
-share/locale/en_CA/LC_MESSAGES/galeon-2.0.mo
-share/locale/en_GB/LC_MESSAGES/galeon-2.0.mo
-share/locale/es/LC_MESSAGES/galeon-2.0.mo
-share/locale/et/LC_MESSAGES/galeon-2.0.mo
-share/locale/eu/LC_MESSAGES/galeon-2.0.mo
-share/locale/fi/LC_MESSAGES/galeon-2.0.mo
-share/locale/fr/LC_MESSAGES/galeon-2.0.mo
-share/locale/ga/LC_MESSAGES/galeon-2.0.mo
-share/locale/gl/LC_MESSAGES/galeon-2.0.mo
-share/locale/hr/LC_MESSAGES/galeon-2.0.mo
-share/locale/hu/LC_MESSAGES/galeon-2.0.mo
-share/locale/it/LC_MESSAGES/galeon-2.0.mo
-share/locale/ja/LC_MESSAGES/galeon-2.0.mo
-share/locale/ko/LC_MESSAGES/galeon-2.0.mo
-share/locale/lt/LC_MESSAGES/galeon-2.0.mo
-share/locale/lv/LC_MESSAGES/galeon-2.0.mo
-share/locale/mk/LC_MESSAGES/galeon-2.0.mo
-share/locale/ml/LC_MESSAGES/galeon-2.0.mo
-share/locale/mn/LC_MESSAGES/galeon-2.0.mo
-share/locale/ms/LC_MESSAGES/galeon-2.0.mo
-share/locale/nb/LC_MESSAGES/galeon-2.0.mo
-share/locale/nl/LC_MESSAGES/galeon-2.0.mo
-share/locale/nn/LC_MESSAGES/galeon-2.0.mo
-share/locale/oc/LC_MESSAGES/galeon-2.0.mo
-share/locale/pa/LC_MESSAGES/galeon-2.0.mo
-share/locale/pl/LC_MESSAGES/galeon-2.0.mo
-share/locale/pt/LC_MESSAGES/galeon-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/galeon-2.0.mo
-share/locale/ro/LC_MESSAGES/galeon-2.0.mo
-share/locale/ru/LC_MESSAGES/galeon-2.0.mo
-share/locale/rw/LC_MESSAGES/galeon-2.0.mo
-share/locale/sk/LC_MESSAGES/galeon-2.0.mo
-share/locale/sl/LC_MESSAGES/galeon-2.0.mo
-share/locale/sq/LC_MESSAGES/galeon-2.0.mo
-share/locale/sr/LC_MESSAGES/galeon-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/galeon-2.0.mo
-share/locale/sv/LC_MESSAGES/galeon-2.0.mo
-share/locale/ta/LC_MESSAGES/galeon-2.0.mo
-share/locale/tr/LC_MESSAGES/galeon-2.0.mo
-share/locale/uk/LC_MESSAGES/galeon-2.0.mo
-share/locale/vi/LC_MESSAGES/galeon-2.0.mo
-share/locale/wa/LC_MESSAGES/galeon-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo
-share/locale/zh_HK/LC_MESSAGES/galeon-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
-@dirrm share/sounds/galeon
-@dirrm share/omf/galeon
-@dirrm share/gnome/help/galeon/es/figures
-@dirrm share/gnome/help/galeon/es
-@dirrm share/gnome/help/galeon/C/figures
-@dirrm share/gnome/help/galeon/C
-@dirrm share/gnome/help/galeon
-@dirrm share/galeon/chrome/global
-@dirrm share/galeon/chrome/branding
-@dirrm share/galeon/chrome
-@dirrm share/galeon
-@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/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/applications
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 3528bd5cb8e0..3f47df649814 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gnome-user-share/Makefile,v 1.14 2009/03/17 13:35:33 kwm Exp $
+# $MCom: ports/www/gnome-user-share/Makefile,v 1.17 2009/10/27 11:20:53 kwm Exp $
#
PORTNAME= gnome-user-share
-PORTVERSION= 2.26.0
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= www deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,14 +16,16 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Personal file-sharing service for the GNOME Desktop
LIB_DEPENDS= avahi-client:${PORTSDIR}/net/avahi-app \
+ canberra.0:${PORTSDIR}/audio/libcanberra \
notify.1:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_dnssd.so:${PORTSDIR}/www/mod_dnssd
+RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_dnssd.so:${PORTSDIR}/www/mod_dnssd \
+ console-kit-daemon:${PORTSDIR}/sysutils/consolekit
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
USE_APACHE= 2.2+
-USE_GNOME= gnomeprefix gnomehack intlhack libglade2 gconf2 gnomedocutils
+USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 gnomedocutils
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
CONFIGURE_ARGS= --with-modules-path=${LOCALBASE}/${APACHEMODDIR}
diff --git a/www/gnome-user-share/distinfo b/www/gnome-user-share/distinfo
index e02044498cab..35fa78e70075 100644
--- a/www/gnome-user-share/distinfo
+++ b/www/gnome-user-share/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/gnome-user-share-2.28.1.tar.bz2) = 4dde75de682805357af5995a748d6e4e
+SHA256 (gnome2/gnome-user-share-2.28.1.tar.bz2) = 4803ddedd77ce64ae25a85fcb04550b2589dc735baa4afd485618629700429bf
+SIZE (gnome2/gnome-user-share-2.28.1.tar.bz2) = 912102
diff --git a/www/gnome-user-share/files/patch-configure b/www/gnome-user-share/files/patch-configure
new file mode 100644
index 000000000000..52ca647a5e2f
--- /dev/null
+++ b/www/gnome-user-share/files/patch-configure
@@ -0,0 +1,61 @@
+--- configure.orig 2009-10-27 12:12:48.000000000 +0100
++++ configure 2009-10-27 12:15:00.000000000 +0100
+@@ -15214,12 +15214,12 @@
+ pkg_cv_USER_SHARE_CFLAGS="$USER_SHARE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\"") >&5
+- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2") 2>&5
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES \"") >&5
++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_USER_SHARE_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>/dev/null`
++ pkg_cv_USER_SHARE_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -15230,12 +15230,12 @@
+ pkg_cv_USER_SHARE_LIBS="$USER_SHARE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\"") >&5
+- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2") 2>&5
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES \"") >&5
++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_USER_SHARE_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>/dev/null`
++ pkg_cv_USER_SHARE_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -15253,14 +15253,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- USER_SHARE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>&1`
++ USER_SHARE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>&1`
+ else
+- USER_SHARE_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>&1`
++ USER_SHARE_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$USER_SHARE_PKG_ERRORS" >&5
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met:
++ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES) were not met:
+
+ $USER_SHARE_PKG_ERRORS
+
+@@ -15271,7 +15271,7 @@
+ and USER_SHARE_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met:
++$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES) were not met:
+
+ $USER_SHARE_PKG_ERRORS
+
diff --git a/www/gnome-user-share/files/patch-src_user_share.c b/www/gnome-user-share/files/patch-src_user_share.c
new file mode 100644
index 000000000000..4305314fbdef
--- /dev/null
+++ b/www/gnome-user-share/files/patch-src_user_share.c
@@ -0,0 +1,48 @@
+--- src/user_share.c.orig 2009-09-26 09:10:16.000000000 -0400
++++ src/user_share.c 2009-09-26 09:13:52.000000000 -0400
+@@ -26,7 +26,9 @@
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
++#ifndef __FreeBSD__
+ #include <bluetooth-client.h>
++#endif
+ #include <X11/Xlib.h>
+
+ #include "user_share.h"
+@@ -58,7 +60,9 @@
+ static guint disabled_timeout_tag = 0;
+ static gboolean has_console = TRUE;
+
++#ifndef __FreeBSD__
+ static BluetoothClient *client = NULL;
++#endif
+ static gboolean bluetoothd_enabled = FALSE;
+
+ #define OBEX_ENABLED (bluetoothd_enabled && has_console)
+@@ -224,6 +228,7 @@ consolekit_init (void)
+ dbus_g_connection_unref (dbus_connection);
+ }
+
++#ifndef __FreeBSD__
+ static void
+ default_adapter_changed (GObject *gobject,
+ GParamSpec *pspec,
+@@ -261,6 +266,7 @@ bluez_init (void)
+ g_signal_connect (G_OBJECT (client), "notify::default-adapter-powered",
+ G_CALLBACK (default_adapter_changed), NULL);
+ }
++#endif
+
+ char *
+ lookup_public_dir (void)
+@@ -590,7 +596,9 @@ main (int argc, char **argv)
+
+ g_object_unref (client);
+
++#ifndef __FreeBSD__
+ bluez_init ();
++#endif
+ consolekit_init ();
+
+ /* Initial setting */
diff --git a/www/gnome-user-share/pkg-plist b/www/gnome-user-share/pkg-plist
index 447088a2ca0b..9d64b7329e80 100644
--- a/www/gnome-user-share/pkg-plist
+++ b/www/gnome-user-share/pkg-plist
@@ -12,6 +12,18 @@ 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/ca/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/ca/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/ca/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/ca/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/ca/gnome-user-share.xml
+share/gnome/help/gnome-user-share/ca/legal.xml
+share/gnome/help/gnome-user-share/cs/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/cs/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/cs/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/cs/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/cs/gnome-user-share.xml
+share/gnome/help/gnome-user-share/cs/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
@@ -36,6 +48,12 @@ 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/fr/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/fr/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/fr/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/fr/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/fr/gnome-user-share.xml
+share/gnome/help/gnome-user-share/fr/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
@@ -48,6 +66,12 @@ 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/gnome/help/gnome-user-share/zh_CN/figures/file-sharing-preferences.png
+share/gnome/help/gnome-user-share/zh_CN/figures/receiving-over-bluetooth.png
+share/gnome/help/gnome-user-share/zh_CN/figures/sharing-over-bluetooth.png
+share/gnome/help/gnome-user-share/zh_CN/figures/sharing-over-the-network.png
+share/gnome/help/gnome-user-share/zh_CN/gnome-user-share.xml
+share/gnome/help/gnome-user-share/zh_CN/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
@@ -55,8 +79,10 @@ 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/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/ca@valencia/LC_MESSAGES/gnome-user-share.mo
share/locale/cs/LC_MESSAGES/gnome-user-share.mo
share/locale/da/LC_MESSAGES/gnome-user-share.mo
share/locale/de/LC_MESSAGES/gnome-user-share.mo
@@ -66,8 +92,10 @@ share/locale/en_CA/LC_MESSAGES/gnome-user-share.mo
share/locale/en_GB/LC_MESSAGES/gnome-user-share.mo
share/locale/eu/LC_MESSAGES/gnome-user-share.mo
share/locale/es/LC_MESSAGES/gnome-user-share.mo
+share/locale/et/LC_MESSAGES/gnome-user-share.mo
share/locale/fi/LC_MESSAGES/gnome-user-share.mo
share/locale/fr/LC_MESSAGES/gnome-user-share.mo
+share/locale/ga/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
@@ -75,8 +103,10 @@ 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/kn/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/mai/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
@@ -95,6 +125,8 @@ 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/sr/LC_MESSAGES/gnome-user-share.mo
+share/locale/sr@latin/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
@@ -106,17 +138,25 @@ 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
share/omf/gnome-user-share/gnome-user-share-C.omf
+share/omf/gnome-user-share/gnome-user-share-ca.omf
+share/omf/gnome-user-share/gnome-user-share-cs.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-fr.omf
share/omf/gnome-user-share/gnome-user-share-it.omf
share/omf/gnome-user-share/gnome-user-share-sv.omf
+share/omf/gnome-user-share/gnome-user-share-zh_CN.omf
@dirrm share/omf/gnome-user-share
+@dirrm share/gnome/help/gnome-user-share/zh_CN/figures
+@dirrm share/gnome/help/gnome-user-share/zh_CN
@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/fr/figures
+@dirrm share/gnome/help/gnome-user-share/fr
@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
@@ -125,6 +165,10 @@ share/omf/gnome-user-share/gnome-user-share-sv.omf
@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/cs/figures
+@dirrm share/gnome/help/gnome-user-share/cs
+@dirrm share/gnome/help/gnome-user-share/ca/figures
+@dirrm share/gnome/help/gnome-user-share/ca
@dirrm share/gnome/help/gnome-user-share/C/figures
@dirrm share/gnome/help/gnome-user-share/C
@dirrm share/gnome/help/gnome-user-share
@@ -134,14 +178,20 @@ share/omf/gnome-user-share/gnome-user-share-sv.omf
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@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/as/LC_MESSAGES
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 5beddfa0c5e4..05b02069e32e 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/www/gtkhtml3/Makefile,v 1.7 2009/04/15 23:28:43 kwm Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.159 2009/10/18 04:03:22 marcus Exp $
#
PORTNAME= gtkhtml3
-PORTVERSION= 3.26.3
-PORTREVISION= 1
+PORTVERSION= 3.28.1
CATEGORIES= www gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,16 +17,18 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Lightweight HTML rendering/printing/editing engine
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+ ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \
enchant.1:${PORTSDIR}/textproc/enchant
-RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+ ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
USE_GETTEXT= yes
USE_BZIP2= yes
USE_XORG= xinerama xi xrandr xcursor xcomposite xdamage
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui ltverhack
+USE_GNOME= gnomeprefix gnomehack intlhack libglade2 ltverhack
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -38,5 +39,7 @@ PLIST_SUB= VERSION="3.14"
post-patch:
@${REINPLACE_CMD} -e 's|@INTLTOOL_LIBDIR@|${LOCALBASE}/libdata|' \
${WRKSRC}/intltool-merge.in
+ @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
+ ${WRKSRC}/configure
.include <bsd.port.mk>
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 7ecafba5fda4..829cec97d508 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.26.3.tar.bz2) = 9a9586fa4581ad20f273952fb70e4101
-SHA256 (gnome2/gtkhtml-3.26.3.tar.bz2) = e700a1d57522d63987d27c1b4f0b1b3936a13471d61873c5f77c4535dbfd63eb
-SIZE (gnome2/gtkhtml-3.26.3.tar.bz2) = 1487455
+MD5 (gnome2/gtkhtml-3.28.1.tar.bz2) = 332bea8d39e1348c0f630a79146de5f6
+SHA256 (gnome2/gtkhtml-3.28.1.tar.bz2) = 7a39302134b405c2427b0b43afc06b6168074bfbd24bd4a9600d19fbc9aea084
+SIZE (gnome2/gtkhtml-3.28.1.tar.bz2) = 1335433
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index 3c04f90bda86..520bc55ef52a 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -25,8 +25,8 @@ lib/libgtkhtml-editor.so
lib/libgtkhtml-editor.so.0
libdata/pkgconfig/gtkhtml-editor.pc
libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
-share/gtkhtml-%%VERSION%%/gtkhtml-editor.glade
-share/gtkhtml-%%VERSION%%/gtkhtml-editor.ui
+share/gtkhtml-%%VERSION%%/gtkhtml-editor-builder.ui
+share/gtkhtml-%%VERSION%%/gtkhtml-editor-manager.ui
share/gtkhtml-%%VERSION%%/icons/bulb.png
share/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
share/gtkhtml-%%VERSION%%/icons/draft-paper.png
@@ -57,6 +57,7 @@ share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/bn_IN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ca@valencia/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -153,6 +154,8 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@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/as/LC_MESSAGES
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index 3935408baa8e..f0034a03eb69 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -3,29 +3,30 @@
# Whom: michael johnson <ahze@ahze.net>
#
# $FreeBSD$
-# $MCom: ports/www/kazehakase/Makefile,v 1.15 2008/08/06 04:22:50 mezz Exp $
+# $MCom: ports/www/kazehakase/Makefile,v 1.26 2009/10/22 22:10:49 kwm Exp $
#
PORTNAME= kazehakase
-PORTVERSION= 0.5.4
-PORTREVISION= 7
+PORTVERSION= 0.5.8
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= ${PORTNAME}/30219
+MASTER_SITE_SUBDIR= ${PORTNAME}/43802
MAINTAINER= ahze@FreeBSD.org
COMMENT= Kazehakase is a browser with gecko engine like Epiphany or Galeon
-LIB_DEPENDS= gnutls.40:${PORTSDIR}/security/gnutls
+LIB_DEPENDS= gnutls.40:${PORTSDIR}/security/gnutls \
+ estraier.8:${PORTSDIR}/textproc/hyperestraier
USE_GNOME= gnomehack intlhack gnomeprefix gtk20
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_GECKO= seamonkey
+USE_GECKO= libxul seamonkey
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gecko_engine=${GECKO}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+ -I${LOCALBASE}/include/nspr" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
MAN1= kazehakase.1
OPTIONS= WEBKIT "Webkit Backend (along with Gecko)" On
@@ -39,7 +40,7 @@ RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
.include <bsd.port.pre.mk>
.if defined(WITH_WEBKIT)
-LIB_DEPENDS+= webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
PLIST_SUB+= WEBKIT=""
.else
PLIST_SUB+= WEBKIT="@comment "
@@ -57,24 +58,12 @@ CONFIGURE_ARGS+= --enable-migemo
.endif
.endif
-WITH_SEARCH?= hyperestraier
-.if ${WITH_SEARCH:L}=="rast"
-LIB_DEPENDS+= rast.1:${PORTSDIR}/textproc/rast
-CONFIGURE_ARGS+= --with-search-engine=rast
-.else
-LIB_DEPENDS+= estraier.8:${PORTSDIR}/textproc/hyperestraier
-CONFIGURE_ARGS+= --with-search-engine=hyperestraier
-.endif
-
pre-everything::
@${ECHO_MSG} ""
@${ECHO_MSG} "Enable Migemo (Japanese incremental search) by defining WITH_MIGEMO"
@${ECHO_MSG} ""
@${ECHO_MSG} "Enable Thumbnail support by defining WITH_THUMBNAIL"
@${ECHO_MSG} ""
- @${ECHO_MSG} "By default the search uses hyperestraier but you can"
- @${ECHO_MSG} "use rast by using WITH_SEARCH=rast"
- @${ECHO_MSG} ""
post-patch:
@${REINPLACE_CMD} -e 's|/usr/share/migemo|${LOCALBASE}/share/migemo|; \
diff --git a/www/kazehakase/distinfo b/www/kazehakase/distinfo
index 08778bd955ce..eded3d9e8892 100644
--- a/www/kazehakase/distinfo
+++ b/www/kazehakase/distinfo
@@ -1,3 +1,3 @@
-MD5 (kazehakase-0.5.4.tar.gz) = 75f8afb9ddf4493c3a1fb4eb38a044df
-SHA256 (kazehakase-0.5.4.tar.gz) = ce6ae61832d83242b298721be62fcfa61a046d8c16a00c2d224c9169fae51416
-SIZE (kazehakase-0.5.4.tar.gz) = 1403194
+MD5 (kazehakase-0.5.8.tar.gz) = 22d831982ebe010338907381caee8fdf
+SHA256 (kazehakase-0.5.8.tar.gz) = 1d461c56b3df86544d123d2a15484a156a6053c4fe2884d773a987d450406943
+SIZE (kazehakase-0.5.8.tar.gz) = 1433099
diff --git a/www/kazehakase/files/patch-src_net_kz-http.c b/www/kazehakase/files/patch-src_net_kz-http.c
new file mode 100644
index 000000000000..deb8e918b41f
--- /dev/null
+++ b/www/kazehakase/files/patch-src_net_kz-http.c
@@ -0,0 +1,11 @@
+--- src/net/kz-http.c.orig 2009-09-04 00:46:36.000000000 +0200
++++ src/net/kz-http.c 2009-09-04 00:46:49.000000000 +0200
+@@ -25,7 +25,7 @@
+ # include "config.h"
+ #endif /* HAVE_CONFIG_H */
+
+-#include <features.h>
++//#include <features.h>
+ #define __USE_XOPEN
+ #include <time.h>
+ #include "gnet.h"
diff --git a/www/kazehakase/pkg-plist b/www/kazehakase/pkg-plist
index 37e9d028f7ec..d27231a952ac 100644
--- a/www/kazehakase/pkg-plist
+++ b/www/kazehakase/pkg-plist
@@ -1,4 +1,5 @@
bin/kazehakase
+bin/kz-embed-process
etc/kazehakase/bookmarkbar.xml
etc/kazehakase/bookmarks.xml
etc/kazehakase/kz-ui-beginner.xml
@@ -14,6 +15,8 @@ lib/kazehakase/libkazehakase.so
lib/kazehakase/libkazehakase.so.1
lib/kazehakase/embed/gecko.la
lib/kazehakase/embed/gecko.so
+lib/kazehakase/embed/per_process.la
+lib/kazehakase/embed/per_process.so
%%WEBKIT%%lib/kazehakase/embed/webkit_gtk.la
%%WEBKIT%%lib/kazehakase/embed/webkit_gtk.so
lib/kazehakase/search/hyper-estraier.la
@@ -69,6 +72,7 @@ share/locale/cs/LC_MESSAGES/kazehakase.mo
share/locale/de/LC_MESSAGES/kazehakase.mo
share/locale/fr/LC_MESSAGES/kazehakase.mo
share/locale/ja/LC_MESSAGES/kazehakase.mo
+share/locale/nl/LC_MESSAGES/kazehakase.mo
share/locale/ru/LC_MESSAGES/kazehakase.mo
@dirrm share/kazehakase/icons
@dirrm share/kazehakase
diff --git a/www/midori/Makefile b/www/midori/Makefile
index ced3fda9a0ad..2d5c0f7931d1 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -3,14 +3,13 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/midori/Makefile,v 1.10 2008/12/31 03:30:21 mezz Exp $
+# $MCom: ports/www/midori/Makefile,v 1.19 2009/10/22 21:20:56 kwm Exp $
#
PORTNAME= midori
-PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTVERSION= 0.2.0
CATEGORIES= www
-MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES= http://archive.xfce.org/src/apps/${PORTNAME}/${PORTVERSION:R}/
MAINTAINER= ahze@FreeBSD.org
COMMENT= Lightweight web browser using WebKit browser engine
@@ -35,7 +34,7 @@ USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
# WAF needs that
-CONFIGURE_ENV+= CC="${CC=gcc}"
+CONFIGURE_ENV+= CC=${CC}
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/www/midori/distinfo b/www/midori/distinfo
index d5aa5a28086d..2c2276146402 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,3 +1,3 @@
-MD5 (midori-0.1.2.tar.bz2) = 5169ead6783f374cedf3f89bf399bd75
-SHA256 (midori-0.1.2.tar.bz2) = a966641cf1b6e18e4f58aa3585a9a63905ed50252883804c006a3263674a32ec
-SIZE (midori-0.1.2.tar.bz2) = 311182
+MD5 (midori-0.2.0.tar.bz2) = 805e2e59a93a0a4b7652d6547b2bd923
+SHA256 (midori-0.2.0.tar.bz2) = 97c79d20807899bad4b241385c7cbf3a4f85d2673b1b6c12059878450e3e971a
+SIZE (midori-0.2.0.tar.bz2) = 570091
diff --git a/www/midori/pkg-plist b/www/midori/pkg-plist
index a96b5b143d2b..639d57a8ba6e 100644
--- a/www/midori/pkg-plist
+++ b/www/midori/pkg-plist
@@ -1,7 +1,17 @@
bin/midori
+etc/xdg/midori/search
+lib/midori/libadblock.so
+lib/midori/libcolorful-tabs.so
+lib/midori/libcookie-manager.so
+lib/midori/libdnsprefetch.so
+lib/midori/libfeed-panel.so
+lib/midori/libformhistory.so
+lib/midori/libmouse-gestures.so
lib/midori/libpage-holder.so
-lib/midori/libtab-panel.so
+lib/midori/libshortcuts.so
lib/midori/libstatusbar-features.so
+lib/midori/libtab-panel.so
+lib/midori/libtoolbar-editor.so
%%NLS%%share/applications/midori.desktop
%%DOCSDIR%%/AUTHORS
%%DOCSDIR%%/ChangeLog
@@ -15,12 +25,18 @@ share/icons/hicolor/16x16/status/news-feed.png
share/icons/hicolor/22x22/apps/midori.png
share/icons/hicolor/22x22/categories/extension.png
share/icons/hicolor/22x22/status/news-feed.png
+share/icons/hicolor/24x24/apps/midori.png
+share/icons/hicolor/24x24/categories/extension.png
+share/icons/hicolor/24x24/status/news-feed.png
share/icons/hicolor/32x32/apps/midori.png
share/icons/hicolor/32x32/categories/extension.png
share/icons/hicolor/32x32/status/news-feed.png
share/icons/hicolor/48x48/apps/midori.png
share/icons/hicolor/48x48/categories/extension.png
share/icons/hicolor/48x48/status/news-feed.png
+%%NLS%%share/locale/ast/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/midori.mo
%%NLS%%share/locale/da/LC_MESSAGES/midori.mo
%%NLS%%share/locale/de/LC_MESSAGES/midori.mo
%%NLS%%share/locale/el/LC_MESSAGES/midori.mo
@@ -30,18 +46,41 @@ share/icons/hicolor/48x48/status/news-feed.png
%%NLS%%share/locale/fi/LC_MESSAGES/midori.mo
%%NLS%%share/locale/fr/LC_MESSAGES/midori.mo
%%NLS%%share/locale/gl/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/he/LC_MESSAGES/midori.mo
%%NLS%%share/locale/hu/LC_MESSAGES/midori.mo
%%NLS%%share/locale/id/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/it/LC_MESSAGES/midori.mo
%%NLS%%share/locale/ja/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/midori.mo
%%NLS%%share/locale/nl/LC_MESSAGES/midori.mo
%%NLS%%share/locale/pl/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/pt_PT/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/midori.mo
%%NLS%%share/locale/ru/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/sr@latin/LC_MESSAGES/midori.mo
%%NLS%%share/locale/sv/LC_MESSAGES/midori.mo
%%NLS%%share/locale/tr/LC_MESSAGES/midori.mo
%%NLS%%share/locale/uk/LC_MESSAGES/midori.mo
-share/midori/logo-shade.png
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/midori.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/midori.mo
+%%DATADIR%%/autosuggestcontrol.css
+%%DATADIR%%/autosuggestcontrol.js
+%%DATADIR%%/res/error.html
+%%DATADIR%%/res/logo-shade.png
+%%DATADIR%%/res/mootools.js
+%%DATADIR%%/res/speeddial-head.html
+%%DATADIR%%/res/speeddial.json
+@dirrm %%DATADIR%%/res
+@dirrm %%DATADIR%%
+%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sr@latin
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
@dirrm lib/midori
-@dirrm share/midori
@dirrmtry share/applications
@dirrm %%DOCSDIR%%
+@dirrm etc/xdg/midori
+@dirrmtry etc/xdg
diff --git a/www/p5-Gtk2-WebKit/Makefile b/www/p5-Gtk2-WebKit/Makefile
index c4ef21215007..b00c2a29c223 100644
--- a/www/p5-Gtk2-WebKit/Makefile
+++ b/www/p5-Gtk2-WebKit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Gtk2-WebKit
PORTVERSION= 0.04
-PORTREVISION= 1
+PORTREVISION= 6
CATEGORIES= www perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= ../../authors/id/F/FL/FLORA
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 3ca4dd05bb4d..ad2f4c734c48 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,76 +3,91 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/webkit-gtk2/Makefile,v 1.23 2008/10/23 02:41:54 mezz Exp $
+# $MCom: ports/www/webkit-gtk2/Makefile,v 1.50 2009/11/28 17:35:07 kwm Exp $
#
PORTNAME= webkit
-PORTVERSION= 1.0.1
-PORTREVISION= 8
+PORTVERSION= 1.1.15.4
CATEGORIES= www
-MASTER_SITES= http://people.freedesktop.org/~alp/webkit/gtk/
+MASTER_SITES= http://webkitgtk.org/
PKGNAMESUFFIX= -gtk2
MAINTAINER= gnome@FreeBSD.org
COMMENT= An opensource browser engine
+BUILD_DEPENDS= flex:${PORTSDIR}/textproc/flex
LIB_DEPENDS= icutu.38:${PORTSDIR}/devel/icu \
+ enchant.1:${PORTSDIR}/textproc/enchant \
curl.5:${PORTSDIR}/ftp/curl \
- sqlite3.8:${PORTSDIR}/databases/sqlite3
+ sqlite3.8:${PORTSDIR}/databases/sqlite3 \
+ soup-2.4.1:${PORTSDIR}/devel/libsoup
WANT_GSTREAMER= yes
+MAKE_JOBS_SAFE= yes
USE_XORG= xt
USE_BISON= build
USE_GMAKE= yes
-USE_GNOME= gtk20 libxslt
+USE_AUTOTOOLS= libtool:22
+USE_GNOME= gtk20 libxslt ltverhack:13
USE_PERL5= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= autoconf:262 automake:110 libtool:22
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
+ ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \
ac_cv_path_DOLT_BASH=""
-CONFIGURE_ARGS= --with-webkit-target=x11 \
- --enable-icon-database \
+CONFIGURE_ARGS= --enable-icon-database \
--enable-svg \
- --enable-svg-fonts \
- --enable-svg-experimental \
- --enable-static
+ --enable-svg-fonts
MAKEFILE= GNUmakefile
BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2
#_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}",
-OPTIONS= VIDEO "Enable video support" on
+OPTIONS= VIDEO "Enable video support" on \
+ DEBUG "Build with debug support" off \
+ STATIC "Enable building static library" off
.include <bsd.port.pre.mk>
-.if ${ARCH} == "sparc64"
-BROKEN= Does not compile on sparc64
-.endif
-
.if defined(WITH_VIDEO)
-USE_GSTREAMER+= gnomevfs
+USE_GSTREAMER+= yes
CONFIGURE_ARGS+=--enable-video
.endif
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=--enable-debug
+.else
+CONFIGURE_ARGS+=--disable-debug
+.endif
+
+.if defined(WITH_STATIC)
+CONFIGURE_ARGS+=--enable-static
+PLIST_SUB+= STATIC=""
+.else
+PLIST_SUB+= STATIC="@comment "
+.endif
+
+.if ${OSVERSION} < 700000
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-JavaScriptCore_yarr_RegexJIT.h \
+ ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITStubCall.h \
+ ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp \
+ ${FILESDIR}/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h \
+ ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITStubs.cpp
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \
${WRKSRC}/WebCore/plugins/PluginDatabase.cpp
- @${REINPLACE_CMD} -e 's|autoconf|${AUTOCONF}|g ; \
- s|automake|${AUTOMAKE}|g ; s|aclocal|${ACLOCAL}|g ; \
- s|autoheader|${AUTOHEADER}|g ; \
- s|LIBTOOLIZE=libtoolize|LIBTOOLIZE=${LIBTOOLIZE}|g ; \
- s|$$srcdir/configure|#$$srcdir/configure|g' \
- ${WRKSRC}/autogen.sh
- @${FIND} ${WRKSRC} -name GNUmakefile.am | ${XARGS} ${REINPLACE_CMD} -e \
+ @${FIND} ${WRKSRC} -name GNUmakefile.* | ${XARGS} ${REINPLACE_CMD} -e \
's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
-
-pre-configure:
- @(cd ${WRKSRC} && ${SH} autogen.sh)
-
-post-install:
-# Install compat pkg-config file so we don't have to patch ports
- ${CP} ${PREFIX}/libdata/pkgconfig/webkit-1.0.pc \
- ${PREFIX}/libdata/pkgconfig/WebKitGtk.pc
+.if !defined(WITH_STATIC)
+ @${REINPLACE_CMD} -e 's|^build_old_libs=yes|build_old_libs=no|' \
+ ${WRKDIR}/gnome-libtool
+.endif
+ @${REINPLACE_CMD} -e 's|/usr/bin/gcc|${CC}|' \
+ ${WRKSRC}/WebCore/dom/make_names.pl \
+ ${WRKSRC}/WebCore/css/make-css-file-arrays.pl \
+ ${WRKSRC}/WebCore/bindings/scripts/IDLParser.pm
.include <bsd.port.post.mk>
diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo
index b36c0f022f15..412335d8ad21 100644
--- a/www/webkit-gtk2/distinfo
+++ b/www/webkit-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (webkit-1.0.1.tar.gz) = 4de68a5773998bea14e8939aa341c466
-SHA256 (webkit-1.0.1.tar.gz) = 9601ed57978e7f1221f770c24933d2037fdb93e4b412716d842b993507f0b856
-SIZE (webkit-1.0.1.tar.gz) = 13418752
+MD5 (webkit-1.1.15.4.tar.gz) = 47301fb7120421ac38bf714db8f5d428
+SHA256 (webkit-1.1.15.4.tar.gz) = ec2511fc1d4a1e64534574cd5f9b2bc552de9bb22d7b3837dd17146fb5f1c90f
+SIZE (webkit-1.1.15.4.tar.gz) = 6093252
diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h
new file mode 100644
index 000000000000..dc03dce02dc1
--- /dev/null
+++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h
@@ -0,0 +1,11 @@
+--- JavaScriptCore/assembler/MacroAssemblerCodeRef.h.orig 2009-10-19 08:34:08.000000000 -0400
++++ JavaScriptCore/assembler/MacroAssemblerCodeRef.h 2009-10-19 08:34:53.000000000 -0400
+@@ -69,7 +69,7 @@ public:
+
+ template<typename FunctionType>
+ explicit FunctionPtr(FunctionType* value)
+- : m_value(reinterpret_cast<void*>(value))
++ : m_value((void*)(value))
+ {
+ ASSERT_VALID_CODE_POINTER(m_value);
+ }
diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp
new file mode 100644
index 000000000000..6e6ffe831486
--- /dev/null
+++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp
@@ -0,0 +1,20 @@
+--- JavaScriptCore/jit/JITOpcodes.cpp.orig 2009-09-29 15:43:18.000000000 -0400
++++ JavaScriptCore/jit/JITOpcodes.cpp 2009-11-01 13:09:39.000000000 -0500
+@@ -270,7 +270,7 @@ void JIT::privateCompileCTIMachineTrampo
+ emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1);
+ move(ImmPtr(&globalData->exceptionLocation), regT2);
+ storePtr(regT1, regT2);
+- move(ImmPtr(reinterpret_cast<void*>(ctiVMThrowTrampoline)), regT2);
++ move(ImmPtr((void*)(ctiVMThrowTrampoline)), regT2);
+ emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister);
+ poke(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*));
+ restoreReturnAddressBeforeReturn(regT2);
+@@ -1754,7 +1754,7 @@ void JIT::privateCompileCTIMachineTrampo
+ emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1);
+ move(ImmPtr(&globalData->exceptionLocation), regT2);
+ storePtr(regT1, regT2);
+- move(ImmPtr(reinterpret_cast<void*>(ctiVMThrowTrampoline)), regT2);
++ move(ImmPtr((void*)(ctiVMThrowTrampoline)), regT2);
+ emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister);
+ poke(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*));
+ restoreReturnAddressBeforeReturn(regT2);
diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h
new file mode 100644
index 000000000000..4d4a76bce3f0
--- /dev/null
+++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h
@@ -0,0 +1,65 @@
+--- JavaScriptCore/jit/JITStubCall.h.orig 2009-10-18 13:44:09.000000000 -0400
++++ JavaScriptCore/jit/JITStubCall.h 2009-10-18 13:45:53.000000000 -0400
+@@ -36,7 +36,7 @@ namespace JSC {
+ public:
+ JITStubCall(JIT* jit, JSObject* (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Cell)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -44,7 +44,7 @@ namespace JSC {
+
+ JITStubCall(JIT* jit, JSPropertyNameIterator* (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Cell)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -52,7 +52,7 @@ namespace JSC {
+
+ JITStubCall(JIT* jit, void* (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(VoidPtr)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -60,7 +60,7 @@ namespace JSC {
+
+ JITStubCall(JIT* jit, int (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Int)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -68,7 +68,7 @@ namespace JSC {
+
+ JITStubCall(JIT* jit, bool (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Int)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -76,7 +76,7 @@ namespace JSC {
+
+ JITStubCall(JIT* jit, void (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Void)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -85,7 +85,7 @@ namespace JSC {
+ #if USE(JSVALUE32_64)
+ JITStubCall(JIT* jit, EncodedJSValue (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Value)
+ , m_stackIndex(stackIndexStart)
+ {
diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp
new file mode 100644
index 000000000000..59229e8bc82e
--- /dev/null
+++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp
@@ -0,0 +1,11 @@
+--- JavaScriptCore/jit/JITStubs.cpp.orig 2009-10-19 15:13:27.000000000 -0400
++++ JavaScriptCore/jit/JITStubs.cpp 2009-10-19 15:13:46.000000000 -0400
+@@ -2672,7 +2672,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_
+
+ if (!handler) {
+ *stackFrame.exception = exceptionValue;
+- STUB_SET_RETURN_ADDRESS(reinterpret_cast<void*>(ctiOpThrowNotCaught));
++ STUB_SET_RETURN_ADDRESS((void*)(ctiOpThrowNotCaught));
+ return JSValue::encode(jsNull());
+ }
+
diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_yarr_RegexJIT.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_yarr_RegexJIT.h
new file mode 100644
index 000000000000..c46912d7aee8
--- /dev/null
+++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_yarr_RegexJIT.h
@@ -0,0 +1,11 @@
+--- JavaScriptCore/yarr/RegexJIT.h.orig 2009-10-09 23:47:41.000000000 -0400
++++ JavaScriptCore/yarr/RegexJIT.h 2009-10-09 23:48:19.000000000 -0400
+@@ -73,7 +73,7 @@ public:
+
+ int execute(const UChar* input, unsigned start, unsigned length, int* output)
+ {
+- return reinterpret_cast<RegexJITCode>(m_ref.m_code.executableAddress())(input, start, length, output);
++ return ((RegexJITCode)m_ref.m_code.executableAddress())(input, start, length, output);
+ }
+
+ private:
diff --git a/www/webkit-gtk2/files/patch-GNUmakefile.in b/www/webkit-gtk2/files/patch-GNUmakefile.in
new file mode 100644
index 000000000000..53333a520d38
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-GNUmakefile.in
@@ -0,0 +1,13 @@
+--- GNUmakefile.in.orig 2009-07-28 12:36:13.000000000 +0200
++++ GNUmakefile.in 2009-07-28 12:39:13.000000000 +0200
+@@ -8154,7 +8154,9 @@ libWebCoreJS_depfiles := $(patsubst \
+ webinspectordir = ${datadir}/webkit-1.0/webinspector
+ dist_webinspector_DATA = \
+ $(WebCore)/English.lproj/localizedStrings.js \
+- $(shell ls $(WebCore)/inspector/front-end/*.{js,html,css})
++ $(shell ls $(WebCore)/inspector/front-end/*.js) \
++ $(shell ls $(WebCore)/inspector/front-end/*.html) \
++ $(shell ls $(WebCore)/inspector/front-end/*.css)
+
+ webinspectorimagesdir = ${datadir}/webkit-1.0/webinspector/Images
+ dist_webinspectorimages_DATA = \
diff --git a/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h b/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h
new file mode 100644
index 000000000000..1b4d9eec188f
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h
@@ -0,0 +1,11 @@
+--- JavaScriptCore/wtf/Platform.h.orig 2009-09-20 01:06:03.000000000 +0200
++++ JavaScriptCore/wtf/Platform.h 2009-09-21 22:01:16.000000000 +0200
+@@ -626,7 +626,7 @@
+ #endif
+
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
+-#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX))
++#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(FREEBSD))
+ #define WTF_USE_JSVALUE64 1
+ #elif PLATFORM(ARM) || PLATFORM(PPC64)
+ #define WTF_USE_JSVALUE32 1
diff --git a/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in b/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in
index 006b49709b38..1d41c7c8db1c 100644
--- a/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in
+++ b/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in
@@ -1,8 +1,8 @@
---- WebKit/gtk/webkit.pc.in.orig 2008-04-01 14:46:09.251210738 -0400
-+++ WebKit/gtk/webkit.pc.in 2008-04-01 14:46:21.218068816 -0400
-@@ -8,4 +8,4 @@
+--- WebKit/gtk/webkit.pc.in.orig 2009-05-13 20:55:10.000000000 +0800
++++ WebKit/gtk/webkit.pc.in 2009-05-19 15:09:51.000000000 +0800
+@@ -8,4 +8,4 @@ Description: Web content engine for GTK+
Version: @VERSION@
- Requires: gtk+-2.0
+ Requires: glib-2.0 gtk+-2.0 libsoup-2.4
Libs: -L${libdir} -lwebkit-1.0
-Cflags: -I${includedir}/webkit-1.0
+Cflags: -I${includedir}/webkit-1.0 -I${includedir}/webkit-1.0/webkit
diff --git a/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp
index ed0a5895fca9..2670c229d1b1 100644
--- a/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp
+++ b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp
@@ -1,10 +1,10 @@
---- WebCore/plugins/PluginDatabase.cpp.orig 2008-05-26 01:03:07.236973838 -0700
-+++ WebCore/plugins/PluginDatabase.cpp 2008-05-26 01:03:52.356436787 -0700
-@@ -281,6 +281,7 @@
+--- WebCore/plugins/PluginDatabase.cpp.orig 2008-11-02 03:12:05.000000000 +0800
++++ WebCore/plugins/PluginDatabase.cpp 2009-05-19 15:09:51.000000000 +0800
+@@ -283,6 +283,7 @@ Vector<String> PluginDatabase::defaultPl
userPluginPath.append(String("/.netscape/plugins"));
paths.append(userPluginPath);
-+ paths.append("%%BROWSER_PLUGINS%%");
++ paths.append("%%BROWSER_PLUGINS_DIR%%");
paths.append("/usr/lib/browser/plugins");
paths.append("/usr/local/lib/mozilla/plugins");
paths.append("/usr/lib/firefox/plugins");
diff --git a/www/webkit-gtk2/files/patch-cairo b/www/webkit-gtk2/files/patch-cairo
index 4bba0cc2a860..2c4293af518e 100644
--- a/www/webkit-gtk2/files/patch-cairo
+++ b/www/webkit-gtk2/files/patch-cairo
@@ -1,31 +1,11 @@
---- WebCore/platform/graphics/BitmapImage.cpp
-+++ WebCore/platform/graphics/BitmapImage.cpp
-@@ -203,7 +203,7 @@ float BitmapImage::frameDurationAtIndex(size_t index)
- bool BitmapImage::frameHasAlphaAtIndex(size_t index)
+--- WebCore/platform/graphics/BitmapImage.cpp.orig 2009-03-04 03:34:16.000000000 +0800
++++ WebCore/platform/graphics/BitmapImage.cpp 2009-05-19 15:09:51.000000000 +0800
+@@ -202,7 +202,7 @@ bool BitmapImage::isSizeAvailable()
+ NativeImagePtr BitmapImage::frameAtIndex(size_t index)
{
if (index >= frameCount())
- return 0;
-+ return true;
++ return NULL;
if (index >= m_frames.size() || !m_frames[index].m_frame)
cacheFrame(index);
---- WebCore/platform/graphics/cairo/ImageCairo.cpp
-+++ WebCore/platform/graphics/cairo/ImageCairo.cpp
-@@ -76,6 +76,7 @@ BitmapImage::BitmapImage(cairo_surface_t* surface, ImageObserver* observer)
-
- m_frames.grow(1);
- m_frames[0].m_frame = surface;
-+ m_frames[0].m_hasAlpha = cairo_surface_get_content(surface) != CAIRO_CONTENT_COLOR;
- checkForSolidColor();
- }
-
---- WebCore/platform/graphics/cg/ImageCG.cpp
-+++ WebCore/platform/graphics/cg/ImageCG.cpp
-@@ -87,6 +87,7 @@ BitmapImage::BitmapImage(CGImageRef cgImage, ImageObserver* observer)
-
- m_frames.grow(1);
- m_frames[0].m_frame = cgImage;
-+ m_frames[0].m_hasAlpha = true;
- checkForSolidColor();
- }
-
diff --git a/www/webkit-gtk2/files/patch-configure b/www/webkit-gtk2/files/patch-configure
new file mode 100644
index 000000000000..08c05beeab7c
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig 2009-06-15 17:23:17.000000000 +0200
++++ configure 2009-06-15 20:19:44.000000000 +0200
+@@ -21204,7 +21204,7 @@ fi
+
+ if test "$enable_jit" = "yes"; then
+ case "$host_cpu" in
+- i*86|x86_64)
++ i*86|x86_64|amd64)
+
+ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_JIT 1
+@@ -21243,7 +21243,7 @@ cat >>confdefs.h <<\_ACEOF
+ _ACEOF
+
+ ;;
+- x86_64)
++ x86_64|amd64)
+
+ cat >>confdefs.h <<\_ACEOF
+ #define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1
diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist
index 85d72c47fc5b..3e9628ce253a 100644
--- a/www/webkit-gtk2/pkg-plist
+++ b/www/webkit-gtk2/pkg-plist
@@ -8,21 +8,248 @@ include/webkit-1.0/JavaScriptCore/JSStringRefCF.h
include/webkit-1.0/JavaScriptCore/JSValueRef.h
include/webkit-1.0/JavaScriptCore/JavaScript.h
include/webkit-1.0/JavaScriptCore/JavaScriptCore.h
+include/webkit-1.0/JavaScriptCore/WebKitAvailability.h
include/webkit-1.0/webkit/webkit.h
include/webkit-1.0/webkit/webkitdefines.h
+include/webkit-1.0/webkit/webkitdownload.h
+include/webkit-1.0/webkit/webkitenumtypes.h
+include/webkit-1.0/webkit/webkiterror.h
+include/webkit-1.0/webkit/webkithittestresult.h
include/webkit-1.0/webkit/webkitnetworkrequest.h
+include/webkit-1.0/webkit/webkitnetworkresponse.h
+include/webkit-1.0/webkit/webkitsecurityorigin.h
+include/webkit-1.0/webkit/webkitsoupauthdialog.h
include/webkit-1.0/webkit/webkitversion.h
include/webkit-1.0/webkit/webkitwebbackforwardlist.h
+include/webkit-1.0/webkit/webkitwebdatabase.h
+include/webkit-1.0/webkit/webkitwebdatasource.h
include/webkit-1.0/webkit/webkitwebframe.h
include/webkit-1.0/webkit/webkitwebhistoryitem.h
+include/webkit-1.0/webkit/webkitwebinspector.h
+include/webkit-1.0/webkit/webkitwebnavigationaction.h
+include/webkit-1.0/webkit/webkitwebpolicydecision.h
+include/webkit-1.0/webkit/webkitwebresource.h
include/webkit-1.0/webkit/webkitwebsettings.h
include/webkit-1.0/webkit/webkitwebview.h
-lib/libwebkit-1.0.a
+include/webkit-1.0/webkit/webkitwebwindowfeatures.h
+%%STATIC%%lib/libwebkit-1.0.a
lib/libwebkit-1.0.la
lib/libwebkit-1.0.so
-lib/libwebkit-1.0.so.1
-libdata/pkgconfig/WebKitGtk.pc
+lib/libwebkit-1.0.so.13
libdata/pkgconfig/webkit-1.0.pc
+share/locale/de/LC_MESSAGES/webkit.mo
+share/locale/en_GB/LC_MESSAGES/webkit.mo
+share/locale/es/LC_MESSAGES/webkit.mo
+share/locale/it/LC_MESSAGES/webkit.mo
+share/locale/lt/LC_MESSAGES/webkit.mo
+share/locale/nl/LC_MESSAGES/webkit.mo
+share/locale/pt_BR/LC_MESSAGES/webkit.mo
+share/locale/ru/LC_MESSAGES/webkit.mo
+share/locale/sr/LC_MESSAGES/webkit.mo
+share/locale/sr@latin/LC_MESSAGES/webkit.mo
+share/locale/sv/LC_MESSAGES/webkit.mo
+share/locale/vi/LC_MESSAGES/webkit.mo
+share/locale/zh_CN/LC_MESSAGES/webkit.mo
+share/webkit-1.0/images/deleteButton.png
+share/webkit-1.0/images/missingImage.png
+share/webkit-1.0/images/nullPlugin.png
+share/webkit-1.0/images/panIcon.png
+share/webkit-1.0/images/textAreaResizeCorner.png
+share/webkit-1.0/images/urlIcon.png
+share/webkit-1.0/resources/error.html
+share/webkit-1.0/webinspector/BottomUpProfileDataGridTree.js
+share/webkit-1.0/webinspector/Breakpoint.js
+share/webkit-1.0/webinspector/BreakpointsSidebarPane.js
+share/webkit-1.0/webinspector/CallStackSidebarPane.js
+share/webkit-1.0/webinspector/Callback.js
+share/webkit-1.0/webinspector/ChangesView.js
+share/webkit-1.0/webinspector/Color.js
+share/webkit-1.0/webinspector/ConsoleView.js
+share/webkit-1.0/webinspector/CookieItemsView.js
+share/webkit-1.0/webinspector/DOMAgent.js
+share/webkit-1.0/webinspector/DOMStorage.js
+share/webkit-1.0/webinspector/DOMStorageDataGrid.js
+share/webkit-1.0/webinspector/DOMStorageItemsView.js
+share/webkit-1.0/webinspector/DataGrid.js
+share/webkit-1.0/webinspector/Database.js
+share/webkit-1.0/webinspector/DatabaseQueryView.js
+share/webkit-1.0/webinspector/DatabaseTableView.js
+share/webkit-1.0/webinspector/Drawer.js
+share/webkit-1.0/webinspector/ElementsPanel.js
+share/webkit-1.0/webinspector/ElementsTreeOutline.js
+share/webkit-1.0/webinspector/FontView.js
+share/webkit-1.0/webinspector/ImageView.js
+share/webkit-1.0/webinspector/Images/back.png
+share/webkit-1.0/webinspector/Images/checker.png
+share/webkit-1.0/webinspector/Images/clearConsoleButtonGlyph.png
+share/webkit-1.0/webinspector/Images/closeButtons.png
+share/webkit-1.0/webinspector/Images/consoleButtonGlyph.png
+share/webkit-1.0/webinspector/Images/cookie.png
+share/webkit-1.0/webinspector/Images/database.png
+share/webkit-1.0/webinspector/Images/databaseTable.png
+share/webkit-1.0/webinspector/Images/debuggerContinue.png
+share/webkit-1.0/webinspector/Images/debuggerPause.png
+share/webkit-1.0/webinspector/Images/debuggerStepInto.png
+share/webkit-1.0/webinspector/Images/debuggerStepOut.png
+share/webkit-1.0/webinspector/Images/debuggerStepOver.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallDown.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallDownBlack.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallDownWhite.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRight.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightBlack.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDown.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDownBlack.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDownWhite.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightWhite.png
+share/webkit-1.0/webinspector/Images/dockButtonGlyph.png
+share/webkit-1.0/webinspector/Images/elementsIcon.png
+share/webkit-1.0/webinspector/Images/enableOutlineButtonGlyph.png
+share/webkit-1.0/webinspector/Images/enableSolidButtonGlyph.png
+share/webkit-1.0/webinspector/Images/errorIcon.png
+share/webkit-1.0/webinspector/Images/errorMediumIcon.png
+share/webkit-1.0/webinspector/Images/excludeButtonGlyph.png
+share/webkit-1.0/webinspector/Images/focusButtonGlyph.png
+share/webkit-1.0/webinspector/Images/forward.png
+share/webkit-1.0/webinspector/Images/glossyHeader.png
+share/webkit-1.0/webinspector/Images/glossyHeaderPressed.png
+share/webkit-1.0/webinspector/Images/glossyHeaderSelected.png
+share/webkit-1.0/webinspector/Images/glossyHeaderSelectedPressed.png
+share/webkit-1.0/webinspector/Images/goArrow.png
+share/webkit-1.0/webinspector/Images/graphLabelCalloutLeft.png
+share/webkit-1.0/webinspector/Images/graphLabelCalloutRight.png
+share/webkit-1.0/webinspector/Images/largerResourcesButtonGlyph.png
+share/webkit-1.0/webinspector/Images/localStorage.png
+share/webkit-1.0/webinspector/Images/nodeSearchButtonGlyph.png
+share/webkit-1.0/webinspector/Images/paneBottomGrow.png
+share/webkit-1.0/webinspector/Images/paneBottomGrowActive.png
+share/webkit-1.0/webinspector/Images/paneGrowHandleLine.png
+share/webkit-1.0/webinspector/Images/paneSettingsButtons.png
+share/webkit-1.0/webinspector/Images/pauseOnExceptionButtonGlyph.png
+share/webkit-1.0/webinspector/Images/percentButtonGlyph.png
+share/webkit-1.0/webinspector/Images/profileGroupIcon.png
+share/webkit-1.0/webinspector/Images/profileIcon.png
+share/webkit-1.0/webinspector/Images/profileSmallIcon.png
+share/webkit-1.0/webinspector/Images/profilesIcon.png
+share/webkit-1.0/webinspector/Images/profilesSilhouette.png
+share/webkit-1.0/webinspector/Images/radioDot.png
+share/webkit-1.0/webinspector/Images/recordButtonGlyph.png
+share/webkit-1.0/webinspector/Images/recordToggledButtonGlyph.png
+share/webkit-1.0/webinspector/Images/reloadButtonGlyph.png
+share/webkit-1.0/webinspector/Images/resourceCSSIcon.png
+share/webkit-1.0/webinspector/Images/resourceDocumentIcon.png
+share/webkit-1.0/webinspector/Images/resourceDocumentIconSmall.png
+share/webkit-1.0/webinspector/Images/resourceJSIcon.png
+share/webkit-1.0/webinspector/Images/resourcePlainIcon.png
+share/webkit-1.0/webinspector/Images/resourcePlainIconSmall.png
+share/webkit-1.0/webinspector/Images/resourcesIcon.png
+share/webkit-1.0/webinspector/Images/resourcesSilhouette.png
+share/webkit-1.0/webinspector/Images/resourcesSizeGraphIcon.png
+share/webkit-1.0/webinspector/Images/resourcesTimeGraphIcon.png
+share/webkit-1.0/webinspector/Images/scriptsIcon.png
+share/webkit-1.0/webinspector/Images/scriptsSilhouette.png
+share/webkit-1.0/webinspector/Images/searchSmallBlue.png
+share/webkit-1.0/webinspector/Images/searchSmallBrightBlue.png
+share/webkit-1.0/webinspector/Images/searchSmallGray.png
+share/webkit-1.0/webinspector/Images/searchSmallWhite.png
+share/webkit-1.0/webinspector/Images/segment.png
+share/webkit-1.0/webinspector/Images/segmentEnd.png
+share/webkit-1.0/webinspector/Images/segmentHover.png
+share/webkit-1.0/webinspector/Images/segmentHoverEnd.png
+share/webkit-1.0/webinspector/Images/segmentSelected.png
+share/webkit-1.0/webinspector/Images/segmentSelectedEnd.png
+share/webkit-1.0/webinspector/Images/sessionStorage.png
+share/webkit-1.0/webinspector/Images/splitviewDimple.png
+share/webkit-1.0/webinspector/Images/splitviewDividerBackground.png
+share/webkit-1.0/webinspector/Images/storageIcon.png
+share/webkit-1.0/webinspector/Images/statusbarBackground.png
+share/webkit-1.0/webinspector/Images/statusbarBottomBackground.png
+share/webkit-1.0/webinspector/Images/statusbarButtons.png
+share/webkit-1.0/webinspector/Images/statusbarMenuButton.png
+share/webkit-1.0/webinspector/Images/statusbarMenuButtonSelected.png
+share/webkit-1.0/webinspector/Images/statusbarResizerHorizontal.png
+share/webkit-1.0/webinspector/Images/statusbarResizerVertical.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillBlue.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillGray.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillGreen.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillOrange.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillPurple.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillRed.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillYellow.png
+share/webkit-1.0/webinspector/Images/timelinePillBlue.png
+share/webkit-1.0/webinspector/Images/timelinePillGray.png
+share/webkit-1.0/webinspector/Images/timelinePillGreen.png
+share/webkit-1.0/webinspector/Images/timelinePillOrange.png
+share/webkit-1.0/webinspector/Images/timelinePillPurple.png
+share/webkit-1.0/webinspector/Images/timelinePillRed.png
+share/webkit-1.0/webinspector/Images/timelinePillYellow.png
+share/webkit-1.0/webinspector/Images/tipBalloon.png
+share/webkit-1.0/webinspector/Images/tipBalloonBottom.png
+share/webkit-1.0/webinspector/Images/tipIcon.png
+share/webkit-1.0/webinspector/Images/tipIconPressed.png
+share/webkit-1.0/webinspector/Images/toolbarItemSelected.png
+share/webkit-1.0/webinspector/Images/treeDownTriangleBlack.png
+share/webkit-1.0/webinspector/Images/treeDownTriangleWhite.png
+share/webkit-1.0/webinspector/Images/treeRightTriangleBlack.png
+share/webkit-1.0/webinspector/Images/treeRightTriangleWhite.png
+share/webkit-1.0/webinspector/Images/treeUpTriangleBlack.png
+share/webkit-1.0/webinspector/Images/treeUpTriangleWhite.png
+share/webkit-1.0/webinspector/Images/undockButtonGlyph.png
+share/webkit-1.0/webinspector/Images/userInputIcon.png
+share/webkit-1.0/webinspector/Images/userInputPreviousIcon.png
+share/webkit-1.0/webinspector/Images/userInputResultIcon.png
+share/webkit-1.0/webinspector/Images/warningIcon.png
+share/webkit-1.0/webinspector/Images/warningMediumIcon.png
+share/webkit-1.0/webinspector/Images/warningsErrors.png
+share/webkit-1.0/webinspector/InjectedScript.js
+share/webkit-1.0/webinspector/InjectedScriptAccess.js
+share/webkit-1.0/webinspector/KeyboardShortcut.js
+share/webkit-1.0/webinspector/MetricsSidebarPane.js
+share/webkit-1.0/webinspector/Object.js
+share/webkit-1.0/webinspector/ObjectPropertiesSection.js
+share/webkit-1.0/webinspector/ObjectProxy.js
+share/webkit-1.0/webinspector/Panel.js
+share/webkit-1.0/webinspector/PanelEnablerView.js
+share/webkit-1.0/webinspector/Placard.js
+share/webkit-1.0/webinspector/Popup.js
+share/webkit-1.0/webinspector/ProfileDataGridTree.js
+share/webkit-1.0/webinspector/ProfileView.js
+share/webkit-1.0/webinspector/ProfilesPanel.js
+share/webkit-1.0/webinspector/PropertiesSection.js
+share/webkit-1.0/webinspector/PropertiesSidebarPane.js
+share/webkit-1.0/webinspector/Resource.js
+share/webkit-1.0/webinspector/ResourceCategory.js
+share/webkit-1.0/webinspector/ResourceView.js
+share/webkit-1.0/webinspector/ResourcesPanel.js
+share/webkit-1.0/webinspector/ScopeChainSidebarPane.js
+share/webkit-1.0/webinspector/Script.js
+share/webkit-1.0/webinspector/ScriptView.js
+share/webkit-1.0/webinspector/ScriptsPanel.js
+share/webkit-1.0/webinspector/SidebarPane.js
+share/webkit-1.0/webinspector/SidebarTreeElement.js
+share/webkit-1.0/webinspector/SourceFrame.js
+share/webkit-1.0/webinspector/SourceView.js
+share/webkit-1.0/webinspector/StatusBarButton.js
+share/webkit-1.0/webinspector/StoragePanel.js
+share/webkit-1.0/webinspector/StylesSidebarPane.js
+share/webkit-1.0/webinspector/SummaryBar.js
+share/webkit-1.0/webinspector/TextPrompt.js
+share/webkit-1.0/webinspector/TimelineAgent.js
+share/webkit-1.0/webinspector/TopDownProfileDataGridTree.js
+share/webkit-1.0/webinspector/View.js
+share/webkit-1.0/webinspector/WatchExpressionsSidebarPane.js
+share/webkit-1.0/webinspector/inspector.css
+share/webkit-1.0/webinspector/inspector.html
+share/webkit-1.0/webinspector/inspector.js
+share/webkit-1.0/webinspector/localizedStrings.js
+share/webkit-1.0/webinspector/treeoutline.js
+share/webkit-1.0/webinspector/utilities.js
+@dirrm share/webkit-1.0/webinspector/Images
+@dirrm share/webkit-1.0/webinspector
+@dirrm share/webkit-1.0/resources
+@dirrm share/webkit-1.0/images
+@dirrm share/webkit-1.0
@dirrm include/webkit-1.0/webkit
@dirrm include/webkit-1.0/JavaScriptCore
@dirrm include/webkit-1.0
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
diff --git a/www/webkit-sharp/Makefile b/www/webkit-sharp/Makefile
index baa5dca1f1bf..20f9c112f09a 100644
--- a/www/webkit-sharp/Makefile
+++ b/www/webkit-sharp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= webkit-sharp
PORTVERSION= 0.2
-PORTREVISION= 1
+PORTREVISION= 5
#PORTEPOCH= 0
CATEGORIES= www
MASTER_SITES= ftp://ftp.novell.com/pub/mono/sources/${PORTNAME}/
diff --git a/x11-fm/Makefile b/x11-fm/Makefile
index d1f38c2e4b0e..e49beb735036 100644
--- a/x11-fm/Makefile
+++ b/x11-fm/Makefile
@@ -16,6 +16,7 @@
SUBDIR += filerunner
SUBDIR += fsv
SUBDIR += gentoo
+ SUBDIR += gir-repository-nautilus
SUBDIR += gnome-commander
SUBDIR += gnome-commander2
SUBDIR += gprename
diff --git a/x11-fm/gir-repository-nautilus/Makefile b/x11-fm/gir-repository-nautilus/Makefile
new file mode 100644
index 000000000000..899d58efefba
--- /dev/null
+++ b/x11-fm/gir-repository-nautilus/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-nautilus
+# Date created: 12 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/x11-fm/gir-repository-nautilus/Makefile,v 1.1 2009/09/16 02:05:13 avl Exp $
+#
+
+CATEGORIES= x11-fm
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -nautilus
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index d742e495baf6..4e3aa4035b59 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,12 +3,11 @@
# Whom: ade, archie
#
# $FreeBSD$
-# $MCom: ports-stable/x11-fm/nautilus/Makefile,v 1.4 2009/04/15 12:03:35 kwm Exp $
+# $MCom: ports/x11-fm/nautilus/Makefile,v 1.186 2009/10/20 13:37:51 avl Exp $
#
PORTNAME= nautilus
-PORTVERSION= 2.26.3
-PORTREVISION= 2
+PORTVERSION= 2.28.1
CATEGORIES= x11-fm gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -32,7 +31,7 @@ USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv" \
LIBPNG="-L${LOCALBASE}/lib -lpng -lz"
-CONFIGURE_ARGS= --enable-static
+CONFIGURE_ARGS= --enable-static --disable-packagekit
MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
OPTIONS= TRACKER "Enable Tracker Search (sysutils/tracker)" Off
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index b239d1afe719..912a5adba63f 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-2.26.3.tar.bz2) = e05f1b61c27f506451f7d46509631e7b
-SHA256 (gnome2/nautilus-2.26.3.tar.bz2) = 1d877362a0f1eea68c2945ef6b2770e0da19d4a0c81c49fb5ebe478fd5e0dfe1
-SIZE (gnome2/nautilus-2.26.3.tar.bz2) = 5913186
+MD5 (gnome2/nautilus-2.28.1.tar.bz2) = e759af11a0844828e2b484ff42ee0498
+SHA256 (gnome2/nautilus-2.28.1.tar.bz2) = 197147d04529ee14e63609fa4755c9effff19842f77594ff8cce6e2433d0bec0
+SIZE (gnome2/nautilus-2.28.1.tar.bz2) = 6020681
diff --git a/x11-fm/nautilus/files/patch-configure b/x11-fm/nautilus/files/patch-configure
deleted file mode 100644
index 4a9390ced7e9..000000000000
--- a/x11-fm/nautilus/files/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig Mon May 14 20:47:58 2007
-+++ configure Mon May 14 20:52:42 2007
-@@ -23611,9 +23611,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <unistd.h>
-- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
-- #endif
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -23674,9 +23672,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <unistd.h>
-- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
-- #endif
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
diff --git a/x11-fm/nautilus/files/patch-nautilus.desktop.in.in b/x11-fm/nautilus/files/patch-data_nautilus.desktop.in.in
index 9a2d128a097c..448a4f6b0035 100644
--- a/x11-fm/nautilus/files/patch-nautilus.desktop.in.in
+++ b/x11-fm/nautilus/files/patch-data_nautilus.desktop.in.in
@@ -1,5 +1,5 @@
---- nautilus.desktop.in.in.orig 2009-04-25 17:13:18.000000000 -0400
-+++ nautilus.desktop.in.in 2009-04-25 17:13:32.000000000 -0400
+--- data/nautilus.desktop.in.in.orig 2009-04-25 17:13:18.000000000 -0400
++++ data/nautilus.desktop.in.in 2009-04-25 17:13:32.000000000 -0400
@@ -15,4 +15,5 @@ X-GNOME-Bugzilla-Version=@VERSION@
X-GNOME-Autostart-Phase=Desktop
X-GNOME-Autostart-Notify=true
diff --git a/x11-fm/nautilus/files/patch-src_nautilus-file-management-properties.ui b/x11-fm/nautilus/files/patch-src_nautilus-file-management-properties.ui
deleted file mode 100644
index 4be8fc959422..000000000000
--- a/x11-fm/nautilus/files/patch-src_nautilus-file-management-properties.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/nautilus-file-management-properties.ui.orig 2009-09-09 22:36:20.000000000 -0400
-+++ src/nautilus-file-management-properties.ui 2009-09-09 22:26:46.000000000 -0400
-@@ -1128,7 +1128,7 @@
- </packing>
- </child>
- <child>
-- <object class="GtkLabel" id="label">
-+ <object class="GtkLabel" id="label99">
- <property name="height_request">6</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes"/>
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 513932c9554a..e834f8565dd3 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -17,6 +17,7 @@ lib/libnautilus-extension.a
lib/libnautilus-extension.la
lib/libnautilus-extension.so
lib/libnautilus-extension.so.1
+libexec/nautilus-convert-metadata
libdata/pkgconfig/libnautilus-extension.pc
share/applications/nautilus-autorun-software.desktop
share/applications/nautilus-browser.desktop
diff --git a/x11-fonts/fontconfig-reference/Makefile b/x11-fonts/fontconfig-reference/Makefile
index 215ecf8c5e9d..13de867bc88e 100644
--- a/x11-fonts/fontconfig-reference/Makefile
+++ b/x11-fonts/fontconfig-reference/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 0
DOCSDIR= ${PREFIX}/share/doc/fontconfig-devel
diff --git a/x11-fonts/fontconfig-reference/Makefile.man b/x11-fonts/fontconfig-reference/Makefile.man
index 4aa9fd1e9d66..d26d023d3a93 100644
--- a/x11-fonts/fontconfig-reference/Makefile.man
+++ b/x11-fonts/fontconfig-reference/Makefile.man
@@ -7,9 +7,9 @@ MAN3= FcAtomicCreate.3 FcAtomicDeleteNew.3 FcAtomicDestroy.3 \
FcCharSetCopy.3 FcCharSetCount.3 FcCharSetCoverage.3 \
FcCharSetCreate.3 FcCharSetDestroy.3 FcCharSetEqual.3 \
FcCharSetFirstPage.3 FcCharSetHasChar.3 FcCharSetIntersect.3 \
- FcCharSetIntersectCount.3 FcCharSetIsSubset.3 FcCharSetNew.3 \
- FcCharSetNextPage.3 FcCharSetSubtract.3 FcCharSetSubtractCount.3 \
- FcCharSetUnion.3 FcConfigAppFontAddDir.3 \
+ FcCharSetIntersectCount.3 FcCharSetIsSubset.3 FcCharSetMerge.3 \
+ FcCharSetNew.3 FcCharSetNextPage.3 FcCharSetSubtract.3 \
+ FcCharSetSubtractCount.3 FcCharSetUnion.3 FcConfigAppFontAddDir.3 \
FcConfigAppFontAddFile.3 FcConfigAppFontClear.3 \
FcConfigBuildFonts.3 FcConfigCreate.3 FcConfigDestroy.3 \
FcConfigEnableHome.3 FcConfigFilename.3 FcConfigGetBlanks.3 \
@@ -17,7 +17,7 @@ MAN3= FcAtomicCreate.3 FcAtomicDeleteNew.3 FcAtomicDestroy.3 \
FcConfigGetConfigDirs.3 FcConfigGetConfigFiles.3 \
FcConfigGetCurrent.3 FcConfigGetFontDirs.3 FcConfigGetFonts.3 \
FcConfigGetRescanInterval.3 FcConfigHome.3 \
- FcConfigParseAndLoad.3 FcConfigSetCurrent.3 \
+ FcConfigParseAndLoad.3 FcConfigReference.3 FcConfigSetCurrent.3 \
FcConfigSetRescanInterval.3 FcConfigSubstitute.3 \
FcConfigSubstituteWithPat.3 FcConfigUptoDate.3 \
FcDefaultSubstitute.3 FcDirCacheLoad.3 FcDirCacheLoadFile.3 \
@@ -35,8 +35,8 @@ MAN3= FcAtomicCreate.3 FcAtomicDeleteNew.3 FcAtomicDestroy.3 \
FcIsUpper.3 FcLangGetCharSet.3 FcLangSetAdd.3 FcLangSetCompare.3 \
FcLangSetContains.3 FcLangSetCopy.3 FcLangSetCreate.3 \
FcLangSetDestroy.3 FcLangSetEqual.3 FcLangSetHasLang.3 \
- FcLangSetHash.3 FcMatrixCopy.3 FcMatrixEqual.3 FcMatrixInit.3 \
- FcMatrixMultiply.3 FcMatrixRotate.3 FcMatrixScale.3 \
+ FcLangSetGetLangs.3 FcLangSetHash.3 FcMatrixCopy.3 FcMatrixEqual.3 \
+ FcMatrixInit.3 FcMatrixMultiply.3 FcMatrixRotate.3 FcMatrixScale.3 \
FcMatrixShear.3 FcNameConstant.3 FcNameGetConstant.3 \
FcNameGetObjectType.3 FcNameParse.3 FcNameRegisterConstants.3 \
FcNameRegisterObjectTypes.3 FcNameUnparse.3 \
@@ -45,9 +45,9 @@ MAN3= FcAtomicCreate.3 FcAtomicDeleteNew.3 FcAtomicDestroy.3 \
FcObjectSetDestroy.3 FcPatternAdd.3 FcPatternAdd-Type.3 \
FcPatternAddWeak.3 FcPatternBuild.3 FcPatternCreate.3 \
FcPatternDel.3 FcPatternDestroy.3 FcPatternDuplicate.3 \
- FcPatternEqual.3 FcPatternEqualSubset.3 FcPatternGet.3 \
- FcPatternGet-Type.3 FcPatternHash.3 FcPatternPrint.3 \
- FcPatternReference.3 FcPatternRemove.3 FcStrBasename.3 \
+ FcPatternEqual.3 FcPatternEqualSubset.3 FcPatternFilter.3 \
+ FcPatternFormat.3 FcPatternGet.3 FcPatternGet-Type.3 FcPatternHash.3 \
+ FcPatternPrint.3 FcPatternReference.3 FcPatternRemove.3 FcStrBasename.3 \
FcStrCmp.3 FcStrCmpIgnoreCase.3 FcStrCopy.3 FcStrCopyFilename.3 \
FcStrDowncase.3 FcStrFree.3 FcStrListCreate.3 FcStrListDone.3 \
FcStrListNext.3 FcStrPlus.3 FcStrSetAdd.3 FcStrSetAddFilename.3 \
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 54b6dcd1313d..c7bf341c9e4b 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.18 2008/08/21 21:53:01 mezz Exp $
+# $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.25 2009/11/22 04:17:16 marcus Exp $
#
PORTNAME= fontconfig
-PORTVERSION= 2.6.0
+PORTVERSION= 2.8.0
PORTREVISION?= 0
PORTEPOCH?= 1
CATEGORIES= x11-fonts
@@ -36,7 +36,7 @@ MAKE_ENV= LC_ALL=C
MAKE_JOBS_SAFE= yes
PKGINSTALL= ${WRKDIR}/pkg-install
-MAN1= fc-cache.1 fc-cat.1 fc-list.1 fc-match.1
+MAN1= fc-cache.1 fc-cat.1 fc-list.1 fc-match.1 fc-query.1 fc-scan.1
MAN5= fonts-conf.5
PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo
index 24a1c943bf82..5b617cd3ec3a 100644
--- a/x11-fonts/fontconfig/distinfo
+++ b/x11-fonts/fontconfig/distinfo
@@ -1,3 +1,3 @@
-MD5 (fontconfig-2.6.0.tar.gz) = ab54ec1d4ddd836313fdbc0cd5299d6d
-SHA256 (fontconfig-2.6.0.tar.gz) = a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5
-SIZE (fontconfig-2.6.0.tar.gz) = 1403857
+MD5 (fontconfig-2.8.0.tar.gz) = 77e15a92006ddc2adbb06f840d591c0e
+SHA256 (fontconfig-2.8.0.tar.gz) = fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335
+SIZE (fontconfig-2.8.0.tar.gz) = 1548409
diff --git a/x11-fonts/fontconfig/files/fc-query.1 b/x11-fonts/fontconfig/files/fc-query.1
new file mode 100644
index 000000000000..a6e6e47a9387
--- /dev/null
+++ b/x11-fonts/fontconfig/files/fc-query.1
@@ -0,0 +1,57 @@
+.\\" auto-generated by docbook2man-spec $Revision: 1.1 $
+.TH "FC-QUERY" "1" "Aug 13, 2008" "" ""
+.SH NAME
+fc-query \- query font files
+.SH SYNOPSIS
+.sp
+\fBfc-query\fR [ \fB-Vh\fR ]
+
+ [ \fB [ -i \fIindex\fB ] [ --index \fIindex\fB ] \fR ] [ \fB [ -f \fIformat\fB ] [ --format \fIformat\fB ] \fR ] [ \fB--version\fR ] [ \fB--help\fR ] \fB\fIfont-file\fB\fR\fI...\fR
+.SH "DESCRIPTION"
+.PP
+\fBfc-query\fR queries
+\fIfont-file\fR(s) using the normal fontconfig
+rules and prints out font pattern for each face found.
+If \fB--index\fR is given, only one face of each file is
+queried, otherwise all faces are queried.
+.SH "OPTIONS"
+.PP
+This program follows the usual GNU command line syntax,
+with long options starting with two dashes (`-'). A summary of
+options is included below.
+.TP
+\fB-i\fR
+Only query face indexed \fIindex\fR of
+each file.
+.TP
+\fB-f\fR
+Format output according to the format specifier
+\fIformat\fR.
+.TP
+\fB-V\fR
+Show version of the program and exit.
+.TP
+\fB-h\fR
+Show summary of options.
+.TP
+\fB\fIfont-file\fB\fR
+Query \fIfont-file\fR for font faces.
+.SH "RETURN CODES"
+.PP
+\fBfc-query\fR returns error code 0 for successful parsing,
+or 1 if any errors occured or if at least one font face could not be opened.
+.SH "SEE ALSO"
+.PP
+\fBfc-scan\fR(1)
+\fBFcFreeTypeQuery\fR(3)
+\fBFcPatternFormat\fR(3)
+\fBfc-cat\fR(1)
+\fBfc-cache\fR(1)
+\fBfc-list\fR(1)
+\fBfc-match\fR(1)
+.PP
+The fontconfig user's guide, in HTML format:
+\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR.
+.SH "AUTHOR"
+.PP
+This manual page was updated by Behdad Esfahbod <behdad@behdad.org>.
diff --git a/x11-fonts/fontconfig/files/fc-scan.1 b/x11-fonts/fontconfig/files/fc-scan.1
new file mode 100644
index 000000000000..77748d18f5c4
--- /dev/null
+++ b/x11-fonts/fontconfig/files/fc-scan.1
@@ -0,0 +1,52 @@
+.\\" auto-generated by docbook2man-spec $Revision: 1.1 $
+.TH "FC-SCAN" "1" "Jan 15, 2009" "" ""
+.SH NAME
+fc-scan \- scan font files or directories
+.SH SYNOPSIS
+.sp
+\fBfc-scan\fR [ \fB-Vh\fR ]
+
+ [ \fB [ -f \fIformat\fB ] [ --format \fIformat\fB ] \fR ] [ \fB--version\fR ] [ \fB--help\fR ] \fB\fIfile\fB\fR\fI...\fR
+.SH "DESCRIPTION"
+.PP
+\fBfc-scan\fR scans
+\fIfile\fR(s) recursively
+and prints out font pattern for each face found.
+.SH "OPTIONS"
+.PP
+This program follows the usual GNU command line syntax,
+with long options starting with two dashes (`-'). A summary of
+options is included below.
+.TP
+\fB-f\fR
+Format output according to the format specifier
+\fIformat\fR.
+.TP
+\fB-V\fR
+Show version of the program and exit.
+.TP
+\fB-h\fR
+Show summary of options.
+.TP
+\fB\fIfile\fB\fR
+Scan \fIfile\fR recursively for font faces.
+.SH "RETURN CODES"
+.PP
+\fBfc-scan\fR returns error code 0 if at least one font
+was found or 1 otherwise.
+.SH "SEE ALSO"
+.PP
+\fBfc-query\fR(1)
+\fBFcFileScan\fR(3)
+\fBFcDirScan\fR(3)
+\fBFcPatternFormat\fR(3)
+\fBfc-cat\fR(1)
+\fBfc-cache\fR(1)
+\fBfc-list\fR(1)
+\fBfc-match\fR(1)
+.PP
+The fontconfig user's guide, in HTML format:
+\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR.
+.SH "AUTHOR"
+.PP
+This manual page was updated by Behdad Esfahbod <behdad@behdad.org>.
diff --git a/x11-fonts/fontconfig/files/patch-Makefile.in b/x11-fonts/fontconfig/files/patch-Makefile.in
index 40d586736f14..5719bed30981 100644
--- a/x11-fonts/fontconfig/files/patch-Makefile.in
+++ b/x11-fonts/fontconfig/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- Makefile.in.orig 2008-07-03 03:20:43.000000000 -0400
-+++ Makefile.in 2008-07-03 03:21:18.000000000 -0400
-@@ -789,28 +789,28 @@ ChangeLog:
- .PHONY: ChangeLog
+--- Makefile.in.orig 2009-07-08 01:52:45.000000000 -0400
++++ Makefile.in 2009-07-08 01:53:30.000000000 -0400
+@@ -896,28 +896,28 @@ fonts.conf: fonts.conf.in Makefile
+ mv $@.tmp $@
- install-data-local:
+ install-data-local: fonts.conf
- $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
- if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
- echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
index 3101d5ccf879..bc6a0793ecca 100644
--- a/x11-fonts/fontconfig/pkg-plist
+++ b/x11-fonts/fontconfig/pkg-plist
@@ -2,6 +2,8 @@ bin/fc-cache
bin/fc-cat
bin/fc-list
bin/fc-match
+bin/fc-query
+bin/fc-scan
etc/fonts/conf.avail/10-autohint.conf
etc/fonts/conf.avail/10-no-sub-pixel.conf
etc/fonts/conf.avail/10-sub-pixel-bgr.conf
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index be920c37282c..696f58073d65 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXft
-PORTVERSION= 2.1.13
+PORTVERSION= 2.1.14
CATEGORIES= x11-fonts
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-fonts/libXft/distinfo b/x11-fonts/libXft/distinfo
index 678cf67a581f..789527c9a6d7 100644
--- a/x11-fonts/libXft/distinfo
+++ b/x11-fonts/libXft/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXft-2.1.13.tar.bz2) = bc8881851f3bd8dcc625fac37350a1c6
-SHA256 (xorg/lib/libXft-2.1.13.tar.bz2) = ce7688258af34c14af421bcfb306d4310245b727d2417ac968b7f6b2facfde8c
-SIZE (xorg/lib/libXft-2.1.13.tar.bz2) = 268153
+MD5 (xorg/lib/libXft-2.1.14.tar.bz2) = 254e62a233491e0e1251636536163e20
+SHA256 (xorg/lib/libXft-2.1.14.tar.bz2) = 700e9d594b81cad3dfd5fac4a5cfd0c4cf7780c812507ef04eb40139ebf5175e
+SIZE (xorg/lib/libXft-2.1.14.tar.bz2) = 289068
diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile
index 64034acdf2ca..f67908556cff 100644
--- a/x11-themes/gnome-backgrounds/Makefile
+++ b/x11-themes/gnome-backgrounds/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.41 2008/09/23 15:03:03 kwm Exp $
+# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.44 2009/09/22 05:30:15 avl Exp $
#
PORTNAME= gnome-backgrounds
-PORTVERSION= 2.24.1
+PORTVERSION= 2.28.0
CATEGORIES= x11-themes graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-themes/gnome-backgrounds/distinfo b/x11-themes/gnome-backgrounds/distinfo
index 6ac855a21322..3f3c9a05964c 100644
--- a/x11-themes/gnome-backgrounds/distinfo
+++ b/x11-themes/gnome-backgrounds/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-backgrounds-2.24.1.tar.bz2) = 28e09fcdeef5616bc612b36e5068e413
-SHA256 (gnome2/gnome-backgrounds-2.24.1.tar.bz2) = 8fa2684462fad77e6c34b6a40c5350f711e91cf7cdb772e69d2bfbba2a1841bc
-SIZE (gnome2/gnome-backgrounds-2.24.1.tar.bz2) = 9899727
+MD5 (gnome2/gnome-backgrounds-2.28.0.tar.bz2) = a137eae321c12ba253a1ce55b13b622d
+SHA256 (gnome2/gnome-backgrounds-2.28.0.tar.bz2) = 39dafeeb198ba778a1bdf5eeb2591515c1a12647ea2d3bcde1e4e2b799e42ecd
+SIZE (gnome2/gnome-backgrounds-2.28.0.tar.bz2) = 9919862
diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist
index 696a65a5c905..78996a579e5f 100644
--- a/x11-themes/gnome-backgrounds/pkg-plist
+++ b/x11-themes/gnome-backgrounds/pkg-plist
@@ -9,6 +9,7 @@ share/locale/bg/LC_MESSAGES/gnome-backgrounds.mo
share/locale/bn/LC_MESSAGES/gnome-backgrounds.mo
share/locale/bn_IN/LC_MESSAGES/gnome-backgrounds.mo
share/locale/ca/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-backgrounds.mo
share/locale/cs/LC_MESSAGES/gnome-backgrounds.mo
share/locale/cy/LC_MESSAGES/gnome-backgrounds.mo
share/locale/da/LC_MESSAGES/gnome-backgrounds.mo
@@ -49,6 +50,7 @@ share/locale/ml/LC_MESSAGES/gnome-backgrounds.mo
share/locale/mn/LC_MESSAGES/gnome-backgrounds.mo
share/locale/mr/LC_MESSAGES/gnome-backgrounds.mo
share/locale/nb/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/nds/LC_MESSAGES/gnome-backgrounds.mo
share/locale/ne/LC_MESSAGES/gnome-backgrounds.mo
share/locale/nl/LC_MESSAGES/gnome-backgrounds.mo
share/locale/nn/LC_MESSAGES/gnome-backgrounds.mo
@@ -118,6 +120,8 @@ share/pixmaps/backgrounds/gnome/nature/YellowFlower.jpg
@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@@ -136,6 +140,8 @@ share/pixmaps/backgrounds/gnome/nature/YellowFlower.jpg
@dirrmtry share/locale/fur
@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
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 99c1a6743ae5..715e2e823ff3 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-themes/gnome-themes/Makefile,v 1.3 2009/04/15 22:18:14 kwm Exp $
+# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.170 2009/10/19 18:58:14 kwm Exp $
#
PORTNAME= gnome-themes
-PORTVERSION= 2.26.3.1
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= x11-themes gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -27,7 +26,7 @@ USE_GETTEXT= yes
USE_AUTOTOOLS= libtool:22
INSTALLS_ICONS= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack gnomeprefix intlhack metacity libgnomeui
+USE_GNOME= gnomehack gnomeprefix intlhack metacity gtk20
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo
index 912fad34bcda..11940d1077f2 100644
--- a/x11-themes/gnome-themes/distinfo
+++ b/x11-themes/gnome-themes/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-themes-2.26.3.1.tar.bz2) = 2b9fbbf9911098b9eb061c05f175940a
-SHA256 (gnome2/gnome-themes-2.26.3.1.tar.bz2) = cdf1720bf8c9c9682ed65bfd61587065e11f63f69d5e827ff7a8c49bb40cf9b7
-SIZE (gnome2/gnome-themes-2.26.3.1.tar.bz2) = 1582870
+MD5 (gnome2/gnome-themes-2.28.1.tar.bz2) = 0159b27d7f72c74ae9595486fc13814b
+SHA256 (gnome2/gnome-themes-2.28.1.tar.bz2) = 62396dad35acf20874a430d679e81554f8e3dcf22b8ecb85c464d060f315902e
+SIZE (gnome2/gnome-themes-2.28.1.tar.bz2) = 1602311
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index 70cc61bc43b0..49f5d6ef7322 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -1094,6 +1094,10 @@ 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/nm-signal-100.svg
+share/icons/HighContrast-SVG/scalable/status/nm-signal-25.svg
+share/icons/HighContrast-SVG/scalable/status/nm-signal-50.svg
+share/icons/HighContrast-SVG/scalable/status/nm-signal-75.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
@@ -2232,6 +2236,7 @@ share/locale/be@latin/LC_MESSAGES/gnome-themes.mo
share/locale/bg/LC_MESSAGES/gnome-themes.mo
share/locale/bn/LC_MESSAGES/gnome-themes.mo
share/locale/bn_IN/LC_MESSAGES/gnome-themes.mo
+share/locale/br/LC_MESSAGES/gnome-themes.mo
share/locale/bs/LC_MESSAGES/gnome-themes.mo
share/locale/ca/LC_MESSAGES/gnome-themes.mo
share/locale/ca@valencia/LC_MESSAGES/gnome-themes.mo
@@ -2270,6 +2275,7 @@ share/locale/ky/LC_MESSAGES/gnome-themes.mo
share/locale/li/LC_MESSAGES/gnome-themes.mo
share/locale/lt/LC_MESSAGES/gnome-themes.mo
share/locale/lv/LC_MESSAGES/gnome-themes.mo
+share/locale/mai/LC_MESSAGES/gnome-themes.mo
share/locale/mg/LC_MESSAGES/gnome-themes.mo
share/locale/mk/LC_MESSAGES/gnome-themes.mo
share/locale/ml/LC_MESSAGES/gnome-themes.mo
@@ -2277,6 +2283,7 @@ share/locale/mn/LC_MESSAGES/gnome-themes.mo
share/locale/mr/LC_MESSAGES/gnome-themes.mo
share/locale/ms/LC_MESSAGES/gnome-themes.mo
share/locale/nb/LC_MESSAGES/gnome-themes.mo
+share/locale/nds/LC_MESSAGES/gnome-themes.mo
share/locale/ne/LC_MESSAGES/gnome-themes.mo
share/locale/nl/LC_MESSAGES/gnome-themes.mo
share/locale/nn/LC_MESSAGES/gnome-themes.mo
@@ -2723,9 +2730,9 @@ share/themes/Mist/index.theme
share/themes/Mist/metacity-1/metacity-theme-1.xml
share/themes/Simple/gtk-2.0/gtkrc
@dirrm share/themes/Simple/gtk-2.0
-@dirrmtry share/themes/Simple
+@dirrm share/themes/Simple
@dirrm share/themes/Mist/metacity-1
-@dirrmtry share/themes/Mist
+@dirrm share/themes/Mist
@dirrm share/themes/LowContrastLargePrint/pixmaps
@dirrm share/themes/LowContrastLargePrint/gtk-2.0
@dirrm share/themes/LowContrastLargePrint
@@ -2752,12 +2759,12 @@ share/themes/Simple/gtk-2.0/gtkrc
@dirrm share/themes/Glider/metacity-1
@dirrm share/themes/Glider/gtk-2.0
@dirrm share/themes/Glider
-@dirrmtry share/themes/Crux
+@dirrm share/themes/Crux
@dirrm share/themes/ClearlooksClassic/metacity-1
@dirrm share/themes/ClearlooksClassic/gtk-2.0
@dirrm share/themes/ClearlooksClassic
@dirrm share/themes/Clearlooks/metacity-1
-@dirrmtry share/themes/Clearlooks
+@dirrm share/themes/Clearlooks
@dirrmtry share/themes
@dirrm share/icons/Mist/scalable/status
@dirrm share/icons/Mist/scalable/places
@@ -2858,10 +2865,14 @@ share/themes/Simple/gtk-2.0/gtkrc
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index a52e3ac6458b..26dbe55b93b9 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-themes/gtk-engines2/Makefile,v 1.3 2009/04/15 12:13:33 kwm Exp $
+# $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.78 2009/09/26 13:42:02 marcus Exp $
#
PORTNAME= gtk-engines2
-PORTVERSION= 2.18.2
-PORTREVISION= 1
+PORTVERSION= 2.18.4
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 c0555a2ed839..85640b36dbac 100644
--- a/x11-themes/gtk-engines2/distinfo
+++ b/x11-themes/gtk-engines2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk-engines-2.18.2.tar.bz2) = 68c7d012923bf40fab47765e82de0676
-SHA256 (gnome2/gtk-engines-2.18.2.tar.bz2) = 3e43b76e7af008fa0ab5d17f83ec7a98ff39637f0c2c34e51fc9503a633cdd1a
-SIZE (gnome2/gtk-engines-2.18.2.tar.bz2) = 663756
+MD5 (gnome2/gtk-engines-2.18.4.tar.bz2) = 95748497eafdfe898588931f08b2fccc
+SHA256 (gnome2/gtk-engines-2.18.4.tar.bz2) = 846e138c45f951451246fa7550e883ba695c2597ffe74b24fafd0cc5c21e1272
+SIZE (gnome2/gtk-engines-2.18.4.tar.bz2) = 706050
diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist
index c645df1e5e55..fdd5f159f09d 100644
--- a/x11-themes/gtk-engines2/pkg-plist
+++ b/x11-themes/gtk-engines2/pkg-plist
@@ -35,8 +35,10 @@ 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/LC_MESSAGES/gtk-engines.mo
share/locale/bn_IN/LC_MESSAGES/gtk-engines.mo
share/locale/ca/LC_MESSAGES/gtk-engines.mo
+share/locale/ca@valencia/LC_MESSAGES/gtk-engines.mo
share/locale/cs/LC_MESSAGES/gtk-engines.mo
share/locale/da/LC_MESSAGES/gtk-engines.mo
share/locale/de/LC_MESSAGES/gtk-engines.mo
@@ -49,6 +51,7 @@ share/locale/eu/LC_MESSAGES/gtk-engines.mo
share/locale/fi/LC_MESSAGES/gtk-engines.mo
share/locale/fr/LC_MESSAGES/gtk-engines.mo
share/locale/fur/LC_MESSAGES/gtk-engines.mo
+share/locale/ga/LC_MESSAGES/gtk-engines.mo
share/locale/gl/LC_MESSAGES/gtk-engines.mo
share/locale/gu/LC_MESSAGES/gtk-engines.mo
share/locale/he/LC_MESSAGES/gtk-engines.mo
@@ -59,6 +62,7 @@ share/locale/ja/LC_MESSAGES/gtk-engines.mo
share/locale/kn/LC_MESSAGES/gtk-engines.mo
share/locale/ko/LC_MESSAGES/gtk-engines.mo
share/locale/lt/LC_MESSAGES/gtk-engines.mo
+share/locale/mai/LC_MESSAGES/gtk-engines.mo
share/locale/mk/LC_MESSAGES/gtk-engines.mo
share/locale/ml/LC_MESSAGES/gtk-engines.mo
share/locale/mr/LC_MESSAGES/gtk-engines.mo
@@ -120,10 +124,14 @@ share/themes/ThinIce/gtk-2.0/gtkrc
@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/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@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
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index d0abda35df7e..f78d647f128b 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -43,6 +43,11 @@
SUBDIR += gauche-gtk
SUBDIR += gdl
SUBDIR += gigi
+ SUBDIR += gir-repository-gtk20
+ SUBDIR += gir-repository-gtksourceview2
+ SUBDIR += gir-repository-libwnck
+ SUBDIR += gir-repository-pango
+ SUBDIR += gir-repository-vte
SUBDIR += gnocl
SUBDIR += gnome-desktop-sharp20
SUBDIR += gnome-sharp20
diff --git a/x11-toolkits/gauche-gtk/Makefile b/x11-toolkits/gauche-gtk/Makefile
index 93d3f628c9e4..b2bc8fcee381 100644
--- a/x11-toolkits/gauche-gtk/Makefile
+++ b/x11-toolkits/gauche-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gauche
PORTVERSION= 0.4.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-toolkits scheme
MASTER_SITES= SF/${PORTNAME}/Gauche-gtk/${PORTVERSION}
PKGNAMESUFFIX= -gtk
@@ -36,6 +36,10 @@ PLIST_SUB+= GTKGLEXT=""
PLIST_SUB+= GTKGLEXT="@comment "
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|n-bytes|x-n-bytes|g' -e 's|text-size|x-text-size|g' \
+ ${WRKSRC}/src/gtkentry.stub
+
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${EXAMPLESDIR}
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 9e47cd09b4da..a17f592a31db 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -3,12 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.22 2009/03/17 18:08:56 kwm Exp $
+# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.31 2009/11/24 18:15:38 kwm Exp $
#
PORTNAME= gdl
-PORTVERSION= 2.26.2
-PORTREVISION= 1
+PORTVERSION= 2.28.2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
@@ -17,7 +16,7 @@ COMMENT= Components intended to be shared between GNOME development tools
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack libgnomeui
+USE_GNOME= gnomeprefix gnomehack gtk20
USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo
index 5ccccc16b2ac..19f7a4702daf 100644
--- a/x11-toolkits/gdl/distinfo
+++ b/x11-toolkits/gdl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gdl-2.26.2.tar.bz2) = 461b077f33ee7a447964f521e5455fd1
-SHA256 (gdl-2.26.2.tar.bz2) = bc19871a7512f85b684a332e282512e41bb354dc632e1a6cf3ca07708c344410
-SIZE (gdl-2.26.2.tar.bz2) = 552658
+MD5 (gdl-2.28.2.tar.bz2) = 8070b7effb3ca80e7f4f0c90924f6718
+SHA256 (gdl-2.28.2.tar.bz2) = c389c4fa623ce00b5a6da1103f4f4a913e4641e9787d13ba37854f17b9efdcf7
+SIZE (gdl-2.28.2.tar.bz2) = 543823
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index 25b1c27b90e0..7e4dc41face9 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -1,35 +1,25 @@
-include/libgdl-1.0/gdl/gdl-combo-button.h
include/libgdl-1.0/gdl/gdl-dock-bar.h
include/libgdl-1.0/gdl/gdl-dock-item.h
+include/libgdl-1.0/gdl/gdl-dock-item-grip.h
include/libgdl-1.0/gdl/gdl-dock-layout.h
include/libgdl-1.0/gdl/gdl-dock-master.h
-include/libgdl-1.0/gdl/gdl-dock-notebook.h
include/libgdl-1.0/gdl/gdl-dock-object.h
-include/libgdl-1.0/gdl/gdl-dock-paned.h
include/libgdl-1.0/gdl/gdl-dock-placeholder.h
-include/libgdl-1.0/gdl/gdl-dock-tablabel.h
include/libgdl-1.0/gdl/gdl-dock.h
-include/libgdl-1.0/gdl/gdl-stock-icons.h
-include/libgdl-1.0/gdl/gdl-stock.h
-include/libgdl-1.0/gdl/gdl-switcher.h
include/libgdl-1.0/gdl/gdl-tools.h
include/libgdl-1.0/gdl/gdl.h
include/libgdl-1.0/gdl/libgdltypebuiltins.h
lib/libgdl-1.la
lib/libgdl-1.so
-lib/libgdl-1.so.0
+lib/libgdl-1.so.3
libdata/pkgconfig/gdl-1.0.pc
%%DOCSDIR%%/GdlDock.html
%%DOCSDIR%%/GdlDockBar.html
%%DOCSDIR%%/GdlDockItem.html
%%DOCSDIR%%/GdlDockLayout.html
%%DOCSDIR%%/GdlDockMaster.html
-%%DOCSDIR%%/GdlDockNotebook.html
%%DOCSDIR%%/GdlDockObject.html
-%%DOCSDIR%%/GdlDockPaned.html
%%DOCSDIR%%/GdlDockPlaceholder.html
-%%DOCSDIR%%/GdlDockTablabel.html
-%%DOCSDIR%%/GdlSwitcher.html
%%DOCSDIR%%/gdl-gdl-tools.html
%%DOCSDIR%%/gdl-main.html
%%DOCSDIR%%/gdl.devhelp
@@ -41,7 +31,7 @@ libdata/pkgconfig/gdl-1.0.pc
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
-share/gdl/glade/layout.glade
+share/gdl/ui/layout.ui
share/locale/am/LC_MESSAGES/gdl-1.mo
share/locale/ar/LC_MESSAGES/gdl-1.mo
share/locale/ast/LC_MESSAGES/gdl-1.mo
@@ -74,6 +64,7 @@ share/locale/ja/LC_MESSAGES/gdl-1.mo
share/locale/ko/LC_MESSAGES/gdl-1.mo
share/locale/lt/LC_MESSAGES/gdl-1.mo
share/locale/lv/LC_MESSAGES/gdl-1.mo
+share/locale/mai/LC_MESSAGES/gdl-1.mo
share/locale/mk/LC_MESSAGES/gdl-1.mo
share/locale/ml/LC_MESSAGES/gdl-1.mo
share/locale/mr/LC_MESSAGES/gdl-1.mo
@@ -105,7 +96,7 @@ share/locale/vi/LC_MESSAGES/gdl-1.mo
share/locale/zh_CN/LC_MESSAGES/gdl-1.mo
share/locale/zh_HK/LC_MESSAGES/gdl-1.mo
share/locale/zh_TW/LC_MESSAGES/gdl-1.mo
-@dirrm share/gdl/glade
+@dirrm share/gdl/ui
@dirrm share/gdl
@dirrm %%DOCSDIR%%
@dirrm include/libgdl-1.0/gdl
@@ -126,6 +117,8 @@ share/locale/zh_TW/LC_MESSAGES/gdl-1.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/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/x11-toolkits/gir-repository-gtk20/Makefile b/x11-toolkits/gir-repository-gtk20/Makefile
new file mode 100644
index 000000000000..1d064a3e6c23
--- /dev/null
+++ b/x11-toolkits/gir-repository-gtk20/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-gtk20
+# Date created: 07 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/x11-toolkits/gir-repository-gtk20/Makefile,v 1.1 2009/09/16 02:05:13 avl Exp $
+#
+
+CATEGORIES= x11-toolkits
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -gtk20
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/x11-toolkits/gir-repository-gtksourceview2/Makefile b/x11-toolkits/gir-repository-gtksourceview2/Makefile
new file mode 100644
index 000000000000..e2e0b03b0656
--- /dev/null
+++ b/x11-toolkits/gir-repository-gtksourceview2/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-gtksourceview2
+# Date created: 12 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/x11-toolkits/gir-repository-gtksourceview2/Makefile,v 1.1 2009/09/16 02:05:13 avl Exp $
+#
+
+CATEGORIES= x11-toolkits
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -gtksourceview2
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/x11-toolkits/gir-repository-libwnck/Makefile b/x11-toolkits/gir-repository-libwnck/Makefile
new file mode 100644
index 000000000000..d27921f60fea
--- /dev/null
+++ b/x11-toolkits/gir-repository-libwnck/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-libwnck
+# Date created: 12 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/x11-toolkits/gir-repository-libwnck/Makefile,v 1.1 2009/09/16 02:05:14 avl Exp $
+#
+
+CATEGORIES= x11-toolkits
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -libwnck
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/x11-toolkits/gir-repository-pango/Makefile b/x11-toolkits/gir-repository-pango/Makefile
new file mode 100644
index 000000000000..5b3a538b3f00
--- /dev/null
+++ b/x11-toolkits/gir-repository-pango/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-pango
+# Date created: 07 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/x11-toolkits/gir-repository-pango/Makefile,v 1.1 2009/09/16 02:05:14 avl Exp $
+#
+
+CATEGORIES= x11-toolkits
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -pango
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/x11-toolkits/gir-repository-vte/Makefile b/x11-toolkits/gir-repository-vte/Makefile
new file mode 100644
index 000000000000..e6701185c27c
--- /dev/null
+++ b/x11-toolkits/gir-repository-vte/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-vte
+# Date created: 12 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/x11-toolkits/gir-repository-vte/Makefile,v 1.1 2009/09/16 02:05:14 avl Exp $
+#
+
+CATEGORIES= x11-toolkits
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -vte
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 9db9546d7ccd..c4e8d5625e0a 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,11 +3,11 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.152 2009/03/13 16:20:57 kwm Exp $
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.174 2009/10/17 09:40:33 kwm Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.16.6
+PORTVERSION= 2.18.3
PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
@@ -44,7 +44,7 @@ USE_GNOME= gnomehack atk pango ltverhack
USE_GETTEXT= yes
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
-CONFIGURE_ARGS= --enable-static --with-xinput=yes
+CONFIGURE_ARGS= --enable-static --with-xinput=yes --with-libjasper
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index be741d8cebee..d4f7d977df7b 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.16.6.tar.bz2) = 416412b336d9f3b6b78ca887395d1726
-SHA256 (gnome2/gtk+-2.16.6.tar.bz2) = 18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af
-SIZE (gnome2/gtk+-2.16.6.tar.bz2) = 18518781
+MD5 (gnome2/gtk+-2.18.3.tar.bz2) = 369e173600efc272131b53b1902679e8
+SHA256 (gnome2/gtk+-2.18.3.tar.bz2) = 1c0665fe560a560851e8b3c9a6501d416c4b54abfb6fa07549d703a04ea768bf
+SIZE (gnome2/gtk+-2.18.3.tar.bz2) = 19069010
diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah
index 88bfe209d8ae..416fbb3f007e 100644
--- a/x11-toolkits/gtk20/files/patch-ah
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -1,11 +1,11 @@
---- docs/Makefile.in.orig Fri Oct 24 21:47:52 2003
-+++ docs/Makefile.in Fri Oct 24 23:35:09 2003
-@@ -179,7 +179,7 @@
+--- docs/Makefile.in.orig 2009-09-05 11:12:17.000000000 +0200
++++ docs/Makefile.in 2009-09-05 11:16:52.000000000 +0200
+@@ -228,7 +228,7 @@ LTLIBOBJS = @LTLIBOBJS@
+ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+ LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
- MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split
+ MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@
diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai
index a7c07057c598..0a4e1022fa27 100644
--- a/x11-toolkits/gtk20/files/patch-ai
+++ b/x11-toolkits/gtk20/files/patch-ai
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in.orig 2008-02-23 10:25:17.000000000 -0500
-+++ docs/reference/Makefile.in 2008-02-23 10:26:36.000000000 -0500
-@@ -372,7 +372,7 @@
+--- docs/reference/Makefile.in.orig 2009-09-05 11:17:44.000000000 +0200
++++ docs/reference/Makefile.in 2009-09-05 11:18:15.000000000 +0200
+@@ -359,7 +359,7 @@ XVFB_START = \
+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
-
-SUBDIRS = gdk-pixbuf gdk gtk libgail-util
-+SUBDIRS = # gdk-pixbuf gdk gtk libgail-util
- subdir = docs/reference
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++SUBDIRS = #gdk-pixbuf gdk gtk libgail-util
+ GITIGNOREFILES = */*.1
+ all: all-recursive
+
diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
index 1bedfdf55f2c..04ce78984f84 100644
--- a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
@@ -1,15 +1,14 @@
---- gdk-pixbuf/Makefile.in.orig Wed Mar 2 15:56:36 2005
-+++ gdk-pixbuf/Makefile.in Wed Mar 2 15:57:08 2005
-@@ -519,10 +519,10 @@
-
- bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders
+--- gdk-pixbuf/Makefile.in.orig 2009-09-05 11:19:07.000000000 +0200
++++ gdk-pixbuf/Makefile.in 2009-09-05 11:20:19.000000000 +0200
+@@ -1322,9 +1322,9 @@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loade
+ LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
+ test_gdk_pixbuf_LDADD = $(LDADDS)
gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
-gdk_pixbuf_csource_LDADD = $(LDADDS)
+gdk_pixbuf_csource_LDADD = $(LDADDS) $(GLIB_LIBS)
-
gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
-gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
+gdk_pixbuf_query_loaders_LDADD = $(LDADDS) $(GLIB_LIBS)
-
gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
+ #
diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
index 610ece8f33ac..8037cf952ad2 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -1,16 +1,14 @@
---- gtk/Makefile.in.orig Sat May 6 04:47:11 2006
-+++ gtk/Makefile.in Sat May 6 04:48:06 2006
-@@ -1009,11 +1009,11 @@ LDADDS = \
- bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache
+--- gtk/Makefile.in.orig 2009-09-05 11:21:40.000000000 +0200
++++ gtk/Makefile.in 2009-09-05 11:22:57.000000000 +0200
+@@ -1310,9 +1310,9 @@ LDADDS = \
+ bin_SCRIPTS = gtk-builder-convert
gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
-gtk_query_immodules_2_0_LDADD = $(LDADDS)
+gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS)
-
gtk_query_immodules_2_0_SOURCES = queryimmodules.c
-
-gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
-
- gtk_update_icon_cache_SOURCES = updateiconcache.c
+ gtk_update_icon_cache_SOURCES = \
+ updateiconcache.c
diff --git a/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c b/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c
index 9003cc7d095e..206257551dbe 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c
+++ b/x11-toolkits/gtk20/files/patch-gtk_updateiconcache.c
@@ -1,6 +1,6 @@
---- gtk/updateiconcache.c.orig 2008-02-16 11:33:25.000000000 -0500
-+++ gtk/updateiconcache.c 2008-02-16 11:33:33.000000000 -0500
-@@ -1477,7 +1477,7 @@ build_cache (const gchar *path)
+--- gtk/updateiconcache.c.orig 2009-05-11 18:05:35.000000000 +0200
++++ gtk/updateiconcache.c 2009-05-30 12:03:39.000000000 +0200
+@@ -1505,7 +1505,7 @@ opentmp:
if (!validate_file (tmp_cache_path))
{
g_printerr (_("The generated cache was invalid.\n"));
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 830f0e739210..d65ae42f666a 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -110,6 +110,7 @@ include/gtk-2.0/gtk/gtkdnd.h
include/gtk-2.0/gtk/gtkdrawingarea.h
include/gtk-2.0/gtk/gtkeditable.h
include/gtk-2.0/gtk/gtkentry.h
+include/gtk-2.0/gtk/gtkentrybuffer.h
include/gtk-2.0/gtk/gtkentrycompletion.h
include/gtk-2.0/gtk/gtkenums.h
include/gtk-2.0/gtk/gtkeventbox.h
@@ -138,6 +139,7 @@ include/gtk-2.0/gtk/gtkhsv.h
include/gtk-2.0/gtk/gtkiconfactory.h
include/gtk-2.0/gtk/gtkicontheme.h
include/gtk-2.0/gtk/gtkiconview.h
+include/gtk-2.0/gtk/gtkinfobar.h
include/gtk-2.0/gtk/gtkimage.h
include/gtk-2.0/gtk/gtkimagemenuitem.h
include/gtk-2.0/gtk/gtkimcontext.h
@@ -413,6 +415,7 @@ share/gtk-2.0/demo/demo.ui
share/gtk-2.0/demo/dialog.c
share/gtk-2.0/demo/drawingarea.c
share/gtk-2.0/demo/editable_cells.c
+share/gtk-2.0/demo/entry_buffer.c
share/gtk-2.0/demo/entry_completion.c
share/gtk-2.0/demo/expander.c
share/gtk-2.0/demo/floppybuddy.gif
@@ -430,8 +433,12 @@ share/gtk-2.0/demo/hypertext.c
share/gtk-2.0/demo/iconview.c
share/gtk-2.0/demo/iconview_edit.c
share/gtk-2.0/demo/images.c
+share/gtk-2.0/demo/infobar.c
share/gtk-2.0/demo/list_store.c
+share/gtk-2.0/demo/links.c
share/gtk-2.0/demo/menus.c
+share/gtk-2.0/demo/offscreen_window.c
+share/gtk-2.0/demo/offscreen_window2.c
share/gtk-2.0/demo/panes.c
share/gtk-2.0/demo/pickers.c
share/gtk-2.0/demo/pixbufs.c
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 9db9546d7ccd..c4e8d5625e0a 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,11 +3,11 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.152 2009/03/13 16:20:57 kwm Exp $
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.174 2009/10/17 09:40:33 kwm Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.16.6
+PORTVERSION= 2.18.3
PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
@@ -44,7 +44,7 @@ USE_GNOME= gnomehack atk pango ltverhack
USE_GETTEXT= yes
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
-CONFIGURE_ARGS= --enable-static --with-xinput=yes
+CONFIGURE_ARGS= --enable-static --with-xinput=yes --with-libjasper
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index be741d8cebee..d4f7d977df7b 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.16.6.tar.bz2) = 416412b336d9f3b6b78ca887395d1726
-SHA256 (gnome2/gtk+-2.16.6.tar.bz2) = 18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af
-SIZE (gnome2/gtk+-2.16.6.tar.bz2) = 18518781
+MD5 (gnome2/gtk+-2.18.3.tar.bz2) = 369e173600efc272131b53b1902679e8
+SHA256 (gnome2/gtk+-2.18.3.tar.bz2) = 1c0665fe560a560851e8b3c9a6501d416c4b54abfb6fa07549d703a04ea768bf
+SIZE (gnome2/gtk+-2.18.3.tar.bz2) = 19069010
diff --git a/x11-toolkits/gtk30/files/patch-ah b/x11-toolkits/gtk30/files/patch-ah
index 88bfe209d8ae..416fbb3f007e 100644
--- a/x11-toolkits/gtk30/files/patch-ah
+++ b/x11-toolkits/gtk30/files/patch-ah
@@ -1,11 +1,11 @@
---- docs/Makefile.in.orig Fri Oct 24 21:47:52 2003
-+++ docs/Makefile.in Fri Oct 24 23:35:09 2003
-@@ -179,7 +179,7 @@
+--- docs/Makefile.in.orig 2009-09-05 11:12:17.000000000 +0200
++++ docs/Makefile.in 2009-09-05 11:16:52.000000000 +0200
+@@ -228,7 +228,7 @@ LTLIBOBJS = @LTLIBOBJS@
+ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
+ LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
- MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split
+ MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@
diff --git a/x11-toolkits/gtk30/files/patch-ai b/x11-toolkits/gtk30/files/patch-ai
index a7c07057c598..0a4e1022fa27 100644
--- a/x11-toolkits/gtk30/files/patch-ai
+++ b/x11-toolkits/gtk30/files/patch-ai
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in.orig 2008-02-23 10:25:17.000000000 -0500
-+++ docs/reference/Makefile.in 2008-02-23 10:26:36.000000000 -0500
-@@ -372,7 +372,7 @@
+--- docs/reference/Makefile.in.orig 2009-09-05 11:17:44.000000000 +0200
++++ docs/reference/Makefile.in 2009-09-05 11:18:15.000000000 +0200
+@@ -359,7 +359,7 @@ XVFB_START = \
+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
-
-SUBDIRS = gdk-pixbuf gdk gtk libgail-util
-+SUBDIRS = # gdk-pixbuf gdk gtk libgail-util
- subdir = docs/reference
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++SUBDIRS = #gdk-pixbuf gdk gtk libgail-util
+ GITIGNOREFILES = */*.1
+ all: all-recursive
+
diff --git a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in
index 1bedfdf55f2c..04ce78984f84 100644
--- a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in
@@ -1,15 +1,14 @@
---- gdk-pixbuf/Makefile.in.orig Wed Mar 2 15:56:36 2005
-+++ gdk-pixbuf/Makefile.in Wed Mar 2 15:57:08 2005
-@@ -519,10 +519,10 @@
-
- bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders
+--- gdk-pixbuf/Makefile.in.orig 2009-09-05 11:19:07.000000000 +0200
++++ gdk-pixbuf/Makefile.in 2009-09-05 11:20:19.000000000 +0200
+@@ -1322,9 +1322,9 @@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loade
+ LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
+ test_gdk_pixbuf_LDADD = $(LDADDS)
gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
-gdk_pixbuf_csource_LDADD = $(LDADDS)
+gdk_pixbuf_csource_LDADD = $(LDADDS) $(GLIB_LIBS)
-
gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
-gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
+gdk_pixbuf_query_loaders_LDADD = $(LDADDS) $(GLIB_LIBS)
-
gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
+ #
diff --git a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
index 610ece8f33ac..8037cf952ad2 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
@@ -1,16 +1,14 @@
---- gtk/Makefile.in.orig Sat May 6 04:47:11 2006
-+++ gtk/Makefile.in Sat May 6 04:48:06 2006
-@@ -1009,11 +1009,11 @@ LDADDS = \
- bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache
+--- gtk/Makefile.in.orig 2009-09-05 11:21:40.000000000 +0200
++++ gtk/Makefile.in 2009-09-05 11:22:57.000000000 +0200
+@@ -1310,9 +1310,9 @@ LDADDS = \
+ bin_SCRIPTS = gtk-builder-convert
gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
-gtk_query_immodules_2_0_LDADD = $(LDADDS)
+gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS)
-
gtk_query_immodules_2_0_SOURCES = queryimmodules.c
-
-gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
-
- gtk_update_icon_cache_SOURCES = updateiconcache.c
+ gtk_update_icon_cache_SOURCES = \
+ updateiconcache.c
diff --git a/x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c b/x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c
index 9003cc7d095e..206257551dbe 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c
+++ b/x11-toolkits/gtk30/files/patch-gtk_updateiconcache.c
@@ -1,6 +1,6 @@
---- gtk/updateiconcache.c.orig 2008-02-16 11:33:25.000000000 -0500
-+++ gtk/updateiconcache.c 2008-02-16 11:33:33.000000000 -0500
-@@ -1477,7 +1477,7 @@ build_cache (const gchar *path)
+--- gtk/updateiconcache.c.orig 2009-05-11 18:05:35.000000000 +0200
++++ gtk/updateiconcache.c 2009-05-30 12:03:39.000000000 +0200
+@@ -1505,7 +1505,7 @@ opentmp:
if (!validate_file (tmp_cache_path))
{
g_printerr (_("The generated cache was invalid.\n"));
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 830f0e739210..d65ae42f666a 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -110,6 +110,7 @@ include/gtk-2.0/gtk/gtkdnd.h
include/gtk-2.0/gtk/gtkdrawingarea.h
include/gtk-2.0/gtk/gtkeditable.h
include/gtk-2.0/gtk/gtkentry.h
+include/gtk-2.0/gtk/gtkentrybuffer.h
include/gtk-2.0/gtk/gtkentrycompletion.h
include/gtk-2.0/gtk/gtkenums.h
include/gtk-2.0/gtk/gtkeventbox.h
@@ -138,6 +139,7 @@ include/gtk-2.0/gtk/gtkhsv.h
include/gtk-2.0/gtk/gtkiconfactory.h
include/gtk-2.0/gtk/gtkicontheme.h
include/gtk-2.0/gtk/gtkiconview.h
+include/gtk-2.0/gtk/gtkinfobar.h
include/gtk-2.0/gtk/gtkimage.h
include/gtk-2.0/gtk/gtkimagemenuitem.h
include/gtk-2.0/gtk/gtkimcontext.h
@@ -413,6 +415,7 @@ share/gtk-2.0/demo/demo.ui
share/gtk-2.0/demo/dialog.c
share/gtk-2.0/demo/drawingarea.c
share/gtk-2.0/demo/editable_cells.c
+share/gtk-2.0/demo/entry_buffer.c
share/gtk-2.0/demo/entry_completion.c
share/gtk-2.0/demo/expander.c
share/gtk-2.0/demo/floppybuddy.gif
@@ -430,8 +433,12 @@ share/gtk-2.0/demo/hypertext.c
share/gtk-2.0/demo/iconview.c
share/gtk-2.0/demo/iconview_edit.c
share/gtk-2.0/demo/images.c
+share/gtk-2.0/demo/infobar.c
share/gtk-2.0/demo/list_store.c
+share/gtk-2.0/demo/links.c
share/gtk-2.0/demo/menus.c
+share/gtk-2.0/demo/offscreen_window.c
+share/gtk-2.0/demo/offscreen_window2.c
share/gtk-2.0/demo/panes.c
share/gtk-2.0/demo/pickers.c
share/gtk-2.0/demo/pixbufs.c
diff --git a/x11-toolkits/gtkada-gcc/Makefile b/x11-toolkits/gtkada-gcc/Makefile
index 3eb291124176..4db4853550e3 100644
--- a/x11-toolkits/gtkada-gcc/Makefile
+++ b/x11-toolkits/gtkada-gcc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkada
PORTVERSION= 2.8.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= SF/gnuada/GNAT_GCC%20Source/4.1.1%20R6
PKGNAMESUFFIX= -gcc
@@ -49,5 +49,7 @@ do-extract:
post-patch:
@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/projects/Makefile
+ @${REINPLACE_CMD} -e 's|n_bytes|x_n_bytes|g' -e 's|text_size|x_text_size|g' \
+ ${WRKSRC}/src/gtkextra/gtkitementry.c
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index a1945f0dbaf1..8974a8296a8e 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkextra
PORTVERSION= 2.1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits
MASTER_SITES= SF/scigraphica/GtkExtra/${PORTVERSION}%20Sources
DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
diff --git a/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c b/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c
new file mode 100644
index 000000000000..209bf3070e28
--- /dev/null
+++ b/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c
@@ -0,0 +1,108 @@
+--- gtkextra/gtkitementry.c.orig 2009-09-26 16:38:37.000000000 +0200
++++ gtkextra/gtkitementry.c 2009-09-26 16:40:16.000000000 +0200
+@@ -693,23 +693,23 @@ gtk_entry_real_insert_text (GtkEditable
+ new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
+ }
+
+- if (new_text_length + entry->n_bytes + 1 > entry->text_size)
++ if (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
+ {
+- while (new_text_length + entry->n_bytes + 1 > entry->text_size)
++ while (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
+ {
+- if (entry->text_size == 0)
+- entry->text_size = MIN_SIZE;
++ if (entry->x_text_size == 0)
++ entry->x_text_size = MIN_SIZE;
+ else
+ {
+- if (2 * (guint)entry->text_size < MAX_SIZE &&
+- 2 * (guint)entry->text_size > entry->text_size)
+- entry->text_size *= 2;
++ if (2 * (guint)entry->x_text_size < MAX_SIZE &&
++ 2 * (guint)entry->x_text_size > entry->x_text_size)
++ entry->x_text_size *= 2;
+ else
+ {
+- entry->text_size = MAX_SIZE;
+- if (new_text_length > (gint)entry->text_size - (gint)entry->n_bytes - 1)
++ entry->x_text_size = MAX_SIZE;
++ if (new_text_length > (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1)
+ {
+- new_text_length = (gint)entry->text_size - (gint)entry->n_bytes - 1;
++ new_text_length = (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1;
+ new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text;
+ n_chars = g_utf8_strlen (new_text, new_text_length);
+ }
+@@ -718,19 +718,19 @@ gtk_entry_real_insert_text (GtkEditable
+ }
+ }
+
+- entry->text = g_realloc (entry->text, entry->text_size);
++ entry->text = g_realloc (entry->text, entry->x_text_size);
+ }
+
+ index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text;
+
+- g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index);
++ g_memmove (entry->text + index + new_text_length, entry->text + index, entry->x_n_bytes - index);
+ memcpy (entry->text + index, new_text, new_text_length);
+
+- entry->n_bytes += new_text_length;
++ entry->x_n_bytes += new_text_length;
+ entry->text_length += n_chars;
+
+ /* NUL terminate for safety and convenience */
+- entry->text[entry->n_bytes] = '\0';
++ entry->text[entry->x_n_bytes] = '\0';
+
+ if (entry->current_pos > *position)
+ entry->current_pos += n_chars;
+@@ -763,9 +763,9 @@ gtk_entry_real_delete_text (GtkEditable
+ gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
+ gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
+
+- g_memmove (entry->text + start_index, entry->text + end_index, entry->n_bytes + 1 - end_index);
++ g_memmove (entry->text + start_index, entry->text + end_index, entry->x_n_bytes + 1 - end_index);
+ entry->text_length -= (end_pos - start_pos);
+- entry->n_bytes -= (end_index - start_index);
++ entry->x_n_bytes -= (end_index - start_index);
+
+ if (entry->current_pos > start_pos)
+ entry->current_pos -= MIN (entry->current_pos, end_pos) - start_pos;
+@@ -1028,7 +1028,7 @@ gtk_entry_retrieve_surrounding_cb (GtkIM
+ {
+ gtk_im_context_set_surrounding (context,
+ entry->text,
+- entry->n_bytes,
++ entry->x_n_bytes,
+ g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
+
+ return TRUE;
+@@ -1229,7 +1229,7 @@ gtk_entry_create_layout (GtkEntry *entry
+
+ if (entry->visible)
+ {
+- g_string_prepend_len (tmp_string, entry->text, entry->n_bytes);
++ g_string_prepend_len (tmp_string, entry->text, entry->x_n_bytes);
+ g_string_insert (tmp_string, cursor_index, preedit_string);
+ }
+ else
+@@ -1238,7 +1238,7 @@ gtk_entry_create_layout (GtkEntry *entry
+ gint preedit_len_chars;
+ gunichar invisible_char;
+
+- ch_len = g_utf8_strlen (entry->text, entry->n_bytes);
++ ch_len = g_utf8_strlen (entry->text, entry->x_n_bytes);
+ preedit_len_chars = g_utf8_strlen (preedit_string, -1);
+ ch_len += preedit_len_chars;
+
+@@ -1272,7 +1272,7 @@ gtk_entry_create_layout (GtkEntry *entry
+ {
+ if (entry->visible)
+ {
+- pango_layout_set_text (layout, entry->text, entry->n_bytes);
++ pango_layout_set_text (layout, entry->text, entry->x_n_bytes);
+ }
+ else
+ {
diff --git a/x11-toolkits/gtkmm24-reference/Makefile b/x11-toolkits/gtkmm24-reference/Makefile
index cac4d3180c66..1c1e84cbd219 100644
--- a/x11-toolkits/gtkmm24-reference/Makefile
+++ b/x11-toolkits/gtkmm24-reference/Makefile
@@ -5,9 +5,10 @@
# $FreeBSD$
#
-PORTREVISION= 4
+PORTREVISION= 5
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.4.pc:${PORTSDIR}/x11-toolkits/gtkmm24
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtkmm-2.4.pc:${PORTSDIR}/x11-toolkits/gtkmm24 \
+ ${LOCALBASE}/share/glibmm-2.4/doctool/doc-install.pl:${PORTSDIR}/devel/glibmm-reference
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/gtkmm24-reference/pkg-plist b/x11-toolkits/gtkmm24-reference/pkg-plist
index 79c4a6b613a5..842fc6b954a7 100644
--- a/x11-toolkits/gtkmm24-reference/pkg-plist
+++ b/x11-toolkits/gtkmm24-reference/pkg-plist
@@ -1,4 +1,4 @@
-%%PORTDOCS%%share/devhelp/books/gtkmm-2.4/gtkmm-2.4.devhelp
+%%PORTDOCS%%share/devhelp/books/gtkmm-2.4/gtkmm-2.4.devhelp2
%%PORTDOCS%%@dirrm share/devhelp/books/gtkmm-2.4
%%PORTDOCS%%@dirrmtry share/devhelp/books
%%PORTDOCS%%@dirrmtry share/devhelp
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 47733eaff60c..d67a1b4087b2 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -3,12 +3,12 @@
# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.46 2009/03/17 15:18:15 kwm Exp $
+# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.55 2009/10/04 09:39:21 kwm Exp $
#
PORTNAME= gtkmm
-PORTVERSION= 2.16.0
-PORTREVISION?= 1
+PORTVERSION= 2.18.2
+PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -29,22 +29,18 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_GNOME= gnomehack gtk20
+USE_AUTOTOOLS= libtool:22
+USE_GNOME= gnomehack gtk20 ltverhack:1
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --disable-demos \
- --disable-docs \
- --disable-examples \
- --enable-static=yes \
- --with-sigc-prefix=${LOCALBASE}
+CONFIGURE_ARGS= --disable-documentation \
+ --enable-static=yes
PLIST_SUB= VERSION="2.4" API_VERSION="2.4"
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \
${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e 's|demo[$$][(]EXEEXT[)]|gtkmm-demo$$(EXEEXT)|g' \
- ${WRKSRC}/demos/gtk-demo/Makefile.in
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index 98ae79afc752..e0749a3452c3 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/gtkmm-2.18.2.tar.bz2) = 3e43e9eef1da8988a76a2815d6b31c91
+SHA256 (gnome2/gtkmm-2.18.2.tar.bz2) = dfc003e22ecdc046cbae731b24e077ed87efa0f9ca57a0735dfe716c560b474e
+SIZE (gnome2/gtkmm-2.18.2.tar.bz2) = 12215352
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index acf9e6def421..93d068b38611 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -53,6 +53,7 @@ include/gdkmm-%%API_VERSION%%/gdkmm/event.h
include/gdkmm-%%API_VERSION%%/gdkmm/gc.h
include/gdkmm-%%API_VERSION%%/gdkmm/general.h
include/gdkmm-%%API_VERSION%%/gdkmm/image.h
+include/gtkmm-%%API_VERSION%%/gtkmm/infobar.h
include/gdkmm-%%API_VERSION%%/gdkmm/list.h
include/gdkmm-%%API_VERSION%%/gdkmm/pixbuf.h
include/gdkmm-%%API_VERSION%%/gdkmm/pixbufanimation.h
@@ -72,6 +73,7 @@ include/gdkmm-%%API_VERSION%%/gdkmm/private/drawable_p.h
include/gdkmm-%%API_VERSION%%/gdkmm/private/event_p.h
include/gdkmm-%%API_VERSION%%/gdkmm/private/gc_p.h
include/gdkmm-%%API_VERSION%%/gdkmm/private/image_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/infobar_p.h
include/gdkmm-%%API_VERSION%%/gdkmm/private/pixbuf_p.h
include/gdkmm-%%API_VERSION%%/gdkmm/private/pixbufanimation_p.h
include/gdkmm-%%API_VERSION%%/gdkmm/private/pixbufanimationiter_p.h
@@ -445,12 +447,6 @@ include/gtkmm-%%API_VERSION%%/gtkmm/window.h
include/gtkmm-%%API_VERSION%%/gtkmm/wrap_init.h
lib/gdkmm-%%API_VERSION%%/include/gdkmmconfig.h
lib/gtkmm-%%API_VERSION%%/include/gtkmmconfig.h
-lib/gtkmm-%%API_VERSION%%/proc/m4/convert.m4
-lib/gtkmm-%%API_VERSION%%/proc/m4/convert_atk.m4
-lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gdk.m4
-lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtk.m4
-lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtkmm.m4
-lib/gtkmm-%%API_VERSION%%/proc/m4/convert_pango.m4
lib/libatkmm-1.6.a
lib/libatkmm-1.6.la
lib/libatkmm-1.6.so
@@ -466,8 +462,48 @@ lib/libgtkmm-%%VERSION%%.so.1
libdata/pkgconfig/atkmm-1.6.pc
libdata/pkgconfig/gdkmm-%%API_VERSION%%.pc
libdata/pkgconfig/gtkmm-%%API_VERSION%%.pc
-@dirrm lib/gtkmm-%%API_VERSION%%/proc/m4
-@dirrm lib/gtkmm-%%API_VERSION%%/proc
+share/gtkmm-%%API_VERSION%%/demo/alphatest.png
+share/gtkmm-%%API_VERSION%%/demo/apple-red.png
+share/gtkmm-%%API_VERSION%%/demo/background.jpg
+share/gtkmm-%%API_VERSION%%/demo/demo-common.cc
+share/gtkmm-%%API_VERSION%%/demo/demo-common.h
+share/gtkmm-%%API_VERSION%%/demo/demos.h
+share/gtkmm-%%API_VERSION%%/demo/demowindow.cc
+share/gtkmm-%%API_VERSION%%/demo/demowindow.h
+share/gtkmm-%%API_VERSION%%/demo/example_appwindow.cc
+share/gtkmm-%%API_VERSION%%/demo/example_buttonbox.cc
+share/gtkmm-%%API_VERSION%%/demo/example_change_display.cc
+share/gtkmm-%%API_VERSION%%/demo/example_colorsel.cc
+share/gtkmm-%%API_VERSION%%/demo/example_dialog.cc
+share/gtkmm-%%API_VERSION%%/demo/example_drawingarea.cc
+share/gtkmm-%%API_VERSION%%/demo/example_iconview.cc
+share/gtkmm-%%API_VERSION%%/demo/example_images.cc
+share/gtkmm-%%API_VERSION%%/demo/example_menus.cc
+share/gtkmm-%%API_VERSION%%/demo/example_panes.cc
+share/gtkmm-%%API_VERSION%%/demo/example_pixbufs.cc
+share/gtkmm-%%API_VERSION%%/demo/example_sizegroup.cc
+share/gtkmm-%%API_VERSION%%/demo/example_stockbrowser.cc
+share/gtkmm-%%API_VERSION%%/demo/example_textview.cc
+share/gtkmm-%%API_VERSION%%/demo/example_treeview_editable_cells.cc
+share/gtkmm-%%API_VERSION%%/demo/example_treeview_liststore.cc
+share/gtkmm-%%API_VERSION%%/demo/example_treeview_treestore.cc
+share/gtkmm-%%API_VERSION%%/demo/example_uimanager.cc
+share/gtkmm-%%API_VERSION%%/demo/floppybuddy.gif
+share/gtkmm-%%API_VERSION%%/demo/gnome-applets.png
+share/gtkmm-%%API_VERSION%%/demo/gnome-calendar.png
+share/gtkmm-%%API_VERSION%%/demo/gnome-foot.png
+share/gtkmm-%%API_VERSION%%/demo/gnome-fs-directory.png
+share/gtkmm-%%API_VERSION%%/demo/gnome-fs-regular.png
+share/gtkmm-%%API_VERSION%%/demo/gnome-gimp.png
+share/gtkmm-%%API_VERSION%%/demo/gnome-gmush.png
+share/gtkmm-%%API_VERSION%%/demo/gnome-gsame.png
+share/gtkmm-%%API_VERSION%%/demo/gnu-keys.png
+share/gtkmm-%%API_VERSION%%/demo/gtk-logo-rgb.gif
+share/gtkmm-%%API_VERSION%%/demo/main.cc
+share/gtkmm-%%API_VERSION%%/demo/textwidget.cc
+share/gtkmm-%%API_VERSION%%/demo/textwidget.h
+@dirrm share/gtkmm-%%API_VERSION%%/demo
+@dirrm share/gtkmm-%%API_VERSION%%
@dirrm lib/gtkmm-%%API_VERSION%%/include
@dirrm lib/gtkmm-%%API_VERSION%%
@dirrm lib/gdkmm-%%API_VERSION%%/include
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index 3b2aca00591b..a16feee650ce 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.72 2009/04/09 03:24:10 mezz Exp $
+# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.81 2009/09/28 23:56:18 avl Exp $
#
PORTNAME= gtksourceview2
-PORTVERSION= 2.6.2
-PORTREVISION?= 1
+PORTVERSION= 2.8.1
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/gtksourceview2/distinfo b/x11-toolkits/gtksourceview2/distinfo
index 99420450dc2c..d40c6f6e212a 100644
--- a/x11-toolkits/gtksourceview2/distinfo
+++ b/x11-toolkits/gtksourceview2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtksourceview-2.6.2.tar.bz2) = 5f94a7c9e31f81b4a1780a3a83df6413
-SHA256 (gnome2/gtksourceview-2.6.2.tar.bz2) = 0b6f52b37557a883c80051305d07101473b34dcda5b6237cfafe3f26de797d5d
-SIZE (gnome2/gtksourceview-2.6.2.tar.bz2) = 1045258
+MD5 (gnome2/gtksourceview-2.8.1.tar.bz2) = 7741e41d3c7c83a35014f0faef3c94a2
+SHA256 (gnome2/gtksourceview-2.8.1.tar.bz2) = e67e8222675228a7cc1ef7da0a3367f3d67d2a0ca2eb50e668e48caf116f390a
+SIZE (gnome2/gtksourceview-2.8.1.tar.bz2) = 1049753
diff --git a/x11-toolkits/gtksourceview2/pkg-plist b/x11-toolkits/gtksourceview2/pkg-plist
index d5926c92be46..7316c0d22815 100644
--- a/x11-toolkits/gtksourceview2/pkg-plist
+++ b/x11-toolkits/gtksourceview2/pkg-plist
@@ -1,4 +1,5 @@
include/gtksourceview-2.0/gtksourceview/gtksourcebuffer.h
+include/gtksourceview-2.0/gtksourceview/gtksourcegutter.h
include/gtksourceview-2.0/gtksourceview/gtksourceiter.h
include/gtksourceview-2.0/gtksourceview/gtksourcelanguage.h
include/gtksourceview-2.0/gtksourceview/gtksourcelanguagemanager.h
@@ -28,6 +29,7 @@ share/gtksourceview-2.0/language-specs/convert.py
share/gtksourceview-2.0/language-specs/cpp.lang
share/gtksourceview-2.0/language-specs/csharp.lang
share/gtksourceview-2.0/language-specs/css.lang
+share/gtksourceview-2.0/language-specs/cuda.lang
share/gtksourceview-2.0/language-specs/d.lang
share/gtksourceview-2.0/language-specs/def.lang
share/gtksourceview-2.0/language-specs/desktop.lang
@@ -42,6 +44,7 @@ share/gtksourceview-2.0/language-specs/erlang.lang
share/gtksourceview-2.0/language-specs/forth.lang
share/gtksourceview-2.0/language-specs/fortran.lang
share/gtksourceview-2.0/language-specs/gap.lang
+share/gtksourceview-2.0/language-specs/glsl.lang
share/gtksourceview-2.0/language-specs/gtk-doc.lang
share/gtksourceview-2.0/language-specs/gtkrc.lang
share/gtksourceview-2.0/language-specs/haddock.lang
@@ -60,6 +63,7 @@ share/gtksourceview-2.0/language-specs/libtool.lang
share/gtksourceview-2.0/language-specs/lua.lang
share/gtksourceview-2.0/language-specs/m4.lang
share/gtksourceview-2.0/language-specs/makefile.lang
+share/gtksourceview-2.0/language-specs/mallard.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
@@ -105,6 +109,7 @@ share/locale/bn/LC_MESSAGES/gtksourceview-2.0.mo
share/locale/bn_IN/LC_MESSAGES/gtksourceview-2.0.mo
share/locale/bs/LC_MESSAGES/gtksourceview-2.0.mo
share/locale/ca/LC_MESSAGES/gtksourceview-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gtksourceview-2.0.mo
share/locale/cs/LC_MESSAGES/gtksourceview-2.0.mo
share/locale/cy/LC_MESSAGES/gtksourceview-2.0.mo
share/locale/da/LC_MESSAGES/gtksourceview-2.0.mo
@@ -197,6 +202,8 @@ share/locale/zh_TW/LC_MESSAGES/gtksourceview-2.0.mo
@dirrmtry share/locale/mai
@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/as/LC_MESSAGES
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index d27104848c87..fc4e43bc1188 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.68 2008/09/22 12:44:50 kwm Exp $
+# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.71 2009/09/26 13:42:02 marcus Exp $
#
PORTNAME= libbonoboui
-PORTVERSION= 2.24.1
-PORTREVISION?= 1
+PORTVERSION= 2.24.2
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index c961106cf42f..793d24c2a721 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome/libbonoboui-2.24.1.tar.bz2) = 9ff3ec1c7aefd0b1a15a5b21ecc7b4e4
-SHA256 (gnome/libbonoboui-2.24.1.tar.bz2) = 322536bdc23a70287f229168af2538a7b36c1b5041626ba15e22902228750c29
-SIZE (gnome/libbonoboui-2.24.1.tar.bz2) = 988420
+MD5 (gnome/libbonoboui-2.24.2.tar.bz2) = 3c206eccc97730c02366a2f698c40ed2
+SHA256 (gnome/libbonoboui-2.24.2.tar.bz2) = aebcf9dc56a76f4ab1ae2134920d962e12c6f7397028052658dad5b1bebdbe00
+SIZE (gnome/libbonoboui-2.24.2.tar.bz2) = 961498
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index c7648291f0a0..b8c6f7506a5b 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -56,8 +56,10 @@ share/locale/be/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/bn/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/bn_IN/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/br/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/bs/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ca/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/cs/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/cy/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/da/LC_MESSAGES/libbonoboui-2.0.mo
@@ -172,6 +174,8 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo
@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/as/LC_MESSAGES
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 93d963058964..3a95fb480249 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.122 2008/09/22 12:50:50 kwm Exp $
+# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.125 2009/09/26 13:42:02 marcus Exp $
#
PORTNAME= libgnomeui
-PORTVERSION= 2.24.1
-PORTREVISION?= 1
+PORTVERSION= 2.24.2
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index f2bcf60b44c9..b85a2bdc9b1e 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeui-2.24.1.tar.bz2) = 8e7d36dd1decfcf5cc4d5cb93bc4d217
-SHA256 (gnome2/libgnomeui-2.24.1.tar.bz2) = a2ed289b7b35956eff7ddd4d9f4e2507260a7fcb5d7d01969f2e3bb8278e8dc1
-SIZE (gnome2/libgnomeui-2.24.1.tar.bz2) = 1494605
+MD5 (gnome2/libgnomeui-2.24.2.tar.bz2) = d455674fa1a477903dbfcf603f060172
+SHA256 (gnome2/libgnomeui-2.24.2.tar.bz2) = ae7459b3ddee78258bb2d619fd199b0b24647f1df45fc397fee83d659c354910
+SIZE (gnome2/libgnomeui-2.24.2.tar.bz2) = 1526889
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index 6552b7e94fe4..97a37fcbbee6 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -71,6 +71,7 @@ share/locale/bn_IN/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/br/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/bs/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ca/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/crh/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/cs/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/cy/LC_MESSAGES/libgnomeui-2.0.mo
@@ -206,6 +207,8 @@ share/pixmaps/gnome-about-logo.png
@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
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index ddd7b6714003..0b4a1d6246d6 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -3,12 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.18 2009/03/17 16:02:12 kwm Exp $
+# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.20 2009/09/22 21:23:48 kwm Exp $
#
PORTNAME= libgnomeuimm
-PORTVERSION= 2.26.0
-PORTREVISION= 1
+PORTVERSION= 2.28.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgnomeuimm26/distinfo b/x11-toolkits/libgnomeuimm26/distinfo
index 12ed4522cfb6..69b0fec383a4 100644
--- a/x11-toolkits/libgnomeuimm26/distinfo
+++ b/x11-toolkits/libgnomeuimm26/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/libgnomeuimm-2.28.0.tar.bz2) = 6c34dbe07cf9835c36f7d0b7bc38d4fb
+SHA256 (gnome2/libgnomeuimm-2.28.0.tar.bz2) = 6cb46494913f1e5e34b94a0f5b9ff8ef238bb71e3b08d0ef0ab7f4a7c88211d3
+SIZE (gnome2/libgnomeuimm-2.28.0.tar.bz2) = 382428
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 0886675c91d7..381c45e108aa 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-toolkits/libwnck/Makefile,v 1.3 2009/04/15 17:27:23 kwm Exp $
+# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.123 2009/09/22 09:04:57 kwm Exp $
#
PORTNAME= libwnck
-PORTVERSION= 2.26.2
-PORTREVISION?= 1
+PORTVERSION= 2.28.0
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index e4f856004639..df07325bdc85 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libwnck-2.26.2.tar.bz2) = 90d89a7bcf3311877fa4b427719c7483
-SHA256 (gnome2/libwnck-2.26.2.tar.bz2) = fc38a8ef185828e6a9205f2489bd563d8f303655ba533ad6f640e2de8018983c
-SIZE (gnome2/libwnck-2.26.2.tar.bz2) = 684354
+MD5 (gnome2/libwnck-2.28.0.tar.bz2) = a9311661aa954e7c918439b6dd578792
+SHA256 (gnome2/libwnck-2.28.0.tar.bz2) = d90be36d2fefa33a9287ed6dc41141213a06463f91d69d847da6b2e59c16b947
+SIZE (gnome2/libwnck-2.28.0.tar.bz2) = 712289
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index b614890c5689..2c3e5ed5c403 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -1,3 +1,4 @@
+bin/wnck-urgency-monitor
bin/wnckprop
include/libwnck-1.0/libwnck/application.h
include/libwnck-1.0/libwnck/class-group.h
@@ -63,6 +64,7 @@ share/locale/ky/LC_MESSAGES/libwnck.mo
share/locale/li/LC_MESSAGES/libwnck.mo
share/locale/lt/LC_MESSAGES/libwnck.mo
share/locale/lv/LC_MESSAGES/libwnck.mo
+share/locale/mai/LC_MESSAGES/libwnck.mo
share/locale/mi/LC_MESSAGES/libwnck.mo
share/locale/mk/LC_MESSAGES/libwnck.mo
share/locale/ml/LC_MESSAGES/libwnck.mo
@@ -120,6 +122,8 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo
@dirrmtry share/locale/mr
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 5d745929bb7f..345be6cd514f 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-toolkits/pango/Makefile,v 1.7 2009/04/15 22:25:48 kwm Exp $
+# $MCom: ports/x11-toolkits/pango/Makefile,v 1.149 2009/11/18 11:00:12 kwm Exp $
#
PORTNAME= pango
-PORTVERSION= 1.24.5
+PORTVERSION= 1.26.1
PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME \
@@ -32,8 +32,7 @@ MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack glib20 ltverhack referencehack
-CONFIGURE_ARGS= --with-qt=no \
- --with-html-dir=${PREFIX}/share/doc \
+CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--enable-static
# Hmm.. tough one. Found this one when I had graphics/hdf installed
# (which installs glist.h) which is picked up before the glib-2.0
@@ -45,7 +44,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-view.1 pango-querymodules.1 preload.1
+MAN1= pango-view.1 pango-querymodules.1
.if defined(WITHOUT_X11)
CONFIGURE_ARGS+= --with-x=no
@@ -61,6 +60,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
PLIST_SUB+= X11=""
.endif
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 700000
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc
+.endif
+
+.include <bsd.port.post.mk>
.endif
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 80aac2bb8774..5acfcd5a394f 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pango-1.24.5.tar.bz2) = 815416a452e9cccc172fed9862401f37
-SHA256 (gnome2/pango-1.24.5.tar.bz2) = 0f733d1ec3e8dafcae152d7ac58f1090bee1fd856176c8fee0e81b0e42392f4e
-SIZE (gnome2/pango-1.24.5.tar.bz2) = 1519944
+MD5 (gnome2/pango-1.26.1.tar.bz2) = 2cbc1f26639e335905f7d31c0da53fce
+SHA256 (gnome2/pango-1.26.1.tar.bz2) = e0254e979bf0fac305de596997cabda83e26c713b666bc582aa9e4b70cb0920d
+SIZE (gnome2/pango-1.26.1.tar.bz2) = 1538050
diff --git a/x11-toolkits/pango/files/extra-patch-gcc b/x11-toolkits/pango/files/extra-patch-gcc
new file mode 100644
index 000000000000..d8a1cc957480
--- /dev/null
+++ b/x11-toolkits/pango/files/extra-patch-gcc
@@ -0,0 +1,188 @@
+diff -ru ../pango-1.26.0/pango/opentype/hb-open-type-private.hh ./pango/opentype/hb-open-type-private.hh
+--- pango/opentype/hb-open-type-private.hh 2009-08-28 17:15:12.000000000 -0400
++++ pango/opentype/hb-open-type-private.hh 2009-09-30 05:14:13.000000000 -0400
+@@ -508,10 +508,10 @@
+ inline const Type& operator [] (unsigned int i) const
+ {
+ if (HB_UNLIKELY (i >= len)) return Null(Type);
+- return array[i];
++ return _array(i);
+ }
+ inline unsigned int get_size () const
+- { return sizeof (len) + len * sizeof (array[0]); }
++ { return sizeof (len) + len * sizeof (Type); }
+
+ inline bool sanitize (SANITIZE_ARG_DEF) {
+ TRACE_SANITIZE ();
+@@ -523,7 +523,7 @@
+ return true;
+ unsigned int count = len;
+ for (unsigned int i = 0; i < count; i++)
+- if (!SANITIZE (array[i]))
++ if (!SANITIZE (_array(i)))
+ return false;
+ return true;
+ }
+@@ -532,7 +532,7 @@
+ if (!SANITIZE_GET_SIZE()) return false;
+ unsigned int count = len;
+ for (unsigned int i = 0; i < count; i++)
+- if (!array[i].sanitize (SANITIZE_ARG, base))
++ if (!_array(i).sanitize (SANITIZE_ARG, base))
+ return false;
+ return true;
+ }
+@@ -541,7 +541,7 @@
+ if (!SANITIZE_GET_SIZE()) return false;
+ unsigned int count = len;
+ for (unsigned int i = 0; i < count; i++)
+- if (!array[i].sanitize (SANITIZE_ARG, base, base2))
++ if (!_array(i).sanitize (SANITIZE_ARG, base, base2))
+ return false;
+ return true;
+ }
+@@ -550,15 +550,21 @@
+ if (!SANITIZE_GET_SIZE()) return false;
+ unsigned int count = len;
+ for (unsigned int i = 0; i < count; i++)
+- if (!array[i].sanitize (SANITIZE_ARG, base, user_data))
++ if (!_array(i).sanitize (SANITIZE_ARG, base, user_data))
+ return false;
+ return true;
+ }
+
+ LenType len;
+- Type array[];
++ //Type array[];
++ Type& _array(unsigned int i) const
++ {
++ return *(Type*)(&len + 1);
++ }
+ };
+
++#undef array
++
+ /* An array with a USHORT number of elements. */
+ template <typename Type>
+ struct ArrayOf : GenericArrayOf<USHORT, Type> {};
+@@ -586,7 +592,7 @@
+ inline const Type& operator [] (unsigned int i) const
+ {
+ if (HB_UNLIKELY (i >= this->len)) return Null(Type);
+- return this+this->array[i];
++ return this+this->_array(i);
+ }
+
+ inline bool sanitize (SANITIZE_ARG_DEF) {
+diff -ru ../pango-1.26.0/pango/opentype/hb-ot-layout-common-private.hh ./pango/opentype/hb-ot-layout-common-private.hh
+--- ../pango-1.26.0/pango/opentype/hb-ot-layout-common-private.hh 2009-08-28 17:15:12.000000000 -0400
++++ ./pango/opentype/hb-ot-layout-common-private.hh 2009-09-30 05:15:25.000000000 -0400
+@@ -67,14 +67,14 @@
+ inline const Tag& get_tag (unsigned int i) const
+ {
+ if (HB_UNLIKELY (i >= this->len)) return Null(Tag);
+- return this->array[i].tag;
++ return this->_array(i).tag;
+ }
+ inline bool get_tags (unsigned int *record_count /* IN/OUT */,
+ hb_tag_t *record_tags /* OUT */) const
+ {
+ unsigned int count = MIN (this->len, *record_count);
+ for (unsigned int i = 0; i < count; i++)
+- record_tags[i] = this->array[i].tag;
++ record_tags[i] = this->_array(i).tag;
+
+ *record_count = this->len;
+ return !!this->len;
+@@ -86,7 +86,7 @@
+ unsigned int count = this->len;
+ for (unsigned int i = 0; i < count; i++)
+ {
+- if (t == this->array[i].tag)
++ if (t == this->_array(i).tag)
+ {
+ if (index) *index = i;
+ return true;
+@@ -116,14 +116,14 @@
+ {
+ if (HB_UNLIKELY (i >= this->len))
+ return NO_INDEX;
+- return this->array[i];
++ return this->_array(i);
+ }
+ inline bool get_indexes (unsigned int *_count /* IN/OUT */,
+ unsigned int *_indexes /* OUT */) const
+ {
+ unsigned int count = MIN (this->len, *_count);
+ for (unsigned int i = 0; i < count; i++)
+- _indexes[i] = this->array[i];
++ _indexes[i] = this->_array(i);
+
+ *_count = this->len;
+ return !!this->len;
+diff -ru ../pango-1.26.0/pango/opentype/hb-ot-layout-gsub-private.hh ./pango/opentype/hb-ot-layout-gsub-private.hh
+--- ../pango-1.26.0/pango/opentype/hb-ot-layout-gsub-private.hh 2009-08-28 17:16:36.000000000 -0400
++++ ./pango/opentype/hb-ot-layout-gsub-private.hh 2009-09-30 05:28:53.000000000 -0400
+@@ -160,7 +160,7 @@
+ return false;
+
+ _hb_buffer_add_output_glyphs (buffer, 1,
+- substitute.len, (const uint16_t *) substitute.array,
++ substitute.len, (const uint16_t *) &substitute._array(0),
+ 0xFFFF, 0xFFFF);
+
+ /* This is a guess only ... */
+@@ -285,7 +285,7 @@
+ if (context->face->altfunc)
+ alt_index = (context->face->altfunc)(context->layout, buffer,
+ buffer->out_pos, glyph_id,
+- alt_set.len, alt_set.array);
++ alt_set.len, alt_set._array(0));
+ */
+
+ if (HB_UNLIKELY (alt_index >= alt_set.len))
+@@ -601,10 +601,10 @@
+ const ArrayOf<GlyphID> &substitute = CONST_NEXT (ArrayOf<GlyphID>, lookahead);
+
+ if (match_backtrack (APPLY_ARG,
+- backtrack.len, (USHORT *) backtrack.array,
++ backtrack.len, (USHORT *) &backtrack._array(0),
+ match_coverage, DECONST_CHARP(this)) &&
+ match_lookahead (APPLY_ARG,
+- lookahead.len, (USHORT *) lookahead.array,
++ lookahead.len, (USHORT *) &lookahead._array(0),
+ match_coverage, DECONST_CHARP(this),
+ 1))
+ {
+diff -ru ../pango-1.26.0/pango/opentype/hb-ot-layout-gsubgpos-private.hh ./pango/opentype/hb-ot-layout-gsubgpos-private.hh
+--- ../pango-1.26.0/pango/opentype/hb-ot-layout-gsubgpos-private.hh 2009-09-21 13:58:54.000000000 -0400
++++ ./pango/opentype/hb-ot-layout-gsubgpos-private.hh 2009-09-30 05:33:03.000000000 -0400
+@@ -572,10 +572,10 @@
+ const ArrayOf<USHORT> &lookahead = CONST_NEXT (ArrayOf<USHORT>, input);
+ const ArrayOf<LookupRecord> &lookup = CONST_NEXT (ArrayOf<LookupRecord>, lookahead);
+ return chain_context_lookup (APPLY_ARG,
+- backtrack.len, backtrack.array,
++ backtrack.len, &backtrack._array(0),
+ input.len, input.array,
+- lookahead.len, lookahead.array,
+- lookup.len, lookup.array,
++ lookahead.len, &lookahead._array(0),
++ lookup.len, &lookup._array(0),
+ lookup_context);
+ return false;
+ }
+@@ -754,10 +754,10 @@
+ {DECONST_CHARP(this), DECONST_CHARP(this), DECONST_CHARP(this)}
+ };
+ return chain_context_lookup (APPLY_ARG,
+- backtrack.len, (USHORT *) backtrack.array,
+- input.len, (USHORT *) input.array + 1,
+- lookahead.len, (USHORT *) lookahead.array,
+- lookup.len, lookup.array,
++ backtrack.len, (USHORT *) &backtrack._array(0),
++ input.len, (USHORT *) &input._array(1),
++ lookahead.len, (USHORT *) &lookahead._array(0),
++ lookup.len, &lookup._array(0),
+ lookup_context);
+ return false;
+ }
diff --git a/x11-toolkits/pango/files/patch-pango-view_Makefile.in b/x11-toolkits/pango/files/patch-pango-view_Makefile.in
deleted file mode 100644
index 345e608bf339..000000000000
--- a/x11-toolkits/pango/files/patch-pango-view_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- pango-view/Makefile.in.orig 2009-07-03 10:45:14.000000000 +0200
-+++ pango-view/Makefile.in 2009-07-03 10:46:39.000000000 +0200
-@@ -794,7 +794,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 > pango-view.1.gz && $(RM) pango-view.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 782570ccf582..99a2734834aa 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.9 2009/03/13 14:42:38 kwm Exp $
+# $MCom: ports/x11-toolkits/pangomm/Makefile,v 1.13 2009/09/21 17:22:55 kwm Exp $
#
PORTNAME= pangomm
-PORTVERSION= 2.24.0
+PORTVERSION= 2.26.0
PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
@@ -30,17 +30,16 @@ USE_LDCONFIG= yes
USE_GNOME= gnomehack pango
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --disable-demos \
- --disable-docs \
- --disable-examples \
- --enable-static=yes \
- --with-sigc-prefix=${LOCALBASE}
+CONFIGURE_ARGS= --disable-documentation \
+ --enable-static=yes
PLIST_SUB= VERSION="2.4" API_VERSION="1.4"
post-patch:
- @${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \
+.for d in tests
+ @${REINPLACE_CMD} -e '/^SUBDIRS =/s/${d}//' \
${WRKSRC}/Makefile.in
+.endfor
.include <bsd.port.mk>
diff --git a/x11-toolkits/pangomm/distinfo b/x11-toolkits/pangomm/distinfo
index 5e4dcdf249cc..2b1ff4ca292a 100644
--- a/x11-toolkits/pangomm/distinfo
+++ b/x11-toolkits/pangomm/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/pangomm-2.26.0.tar.bz2) = 37f54dc8e6cb73ed923b22f313352156
+SHA256 (gnome2/pangomm-2.26.0.tar.bz2) = bf26ebe42c12c81e5c32ceca80ff226a01c8d80d4db2a4cc3463d5bf241b095e
+SIZE (gnome2/pangomm-2.26.0.tar.bz2) = 982857
diff --git a/x11-toolkits/pangomm/pkg-plist b/x11-toolkits/pangomm/pkg-plist
index 08c681f69138..8483bc4b0326 100644
--- a/x11-toolkits/pangomm/pkg-plist
+++ b/x11-toolkits/pangomm/pkg-plist
@@ -56,11 +56,9 @@ lib/libpangomm-%%API_VERSION%%.a
lib/libpangomm-%%API_VERSION%%.la
lib/libpangomm-%%API_VERSION%%.so
lib/libpangomm-%%API_VERSION%%.so.1
-lib/pangomm-%%API_VERSION%%/proc/m4/convert.m4
-lib/pangomm-%%API_VERSION%%/proc/m4/convert_pango.m4
+lib/pangomm-%%API_VERSION%%/include/pangommconfig.h
libdata/pkgconfig/pangomm-%%API_VERSION%%.pc
-@dirrm lib/pangomm-%%API_VERSION%%/proc/m4
-@dirrm lib/pangomm-%%API_VERSION%%/proc
+@dirrm lib/pangomm-%%API_VERSION%%/include
@dirrm lib/pangomm-%%API_VERSION%%
@dirrm include/pangomm-%%API_VERSION%%/pangomm/private
@dirrm include/pangomm-%%API_VERSION%%/pangomm
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index b26933b80234..6cdb0918c15d 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -3,17 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.86 2009/03/15 00:39:36 marcus Exp $
+# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.91 2009/09/21 20:15:50 kwm Exp $
#
-PORTNAME= gnome
-PORTVERSION= 2.26.0
-PORTREVISION= 1
+PORTNAME= gnome-desktop
+PORTVERSION= 2.28.0
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX= -desktop
DISTNAME= gnome-python-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -25,6 +23,7 @@ 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 \
+ brasero-media.2:${PORTSDIR}/sysutils/brasero \
evdocument.1:${PORTSDIR}/graphics/evince
RUN_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy
diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo
index 7c842b1e4979..162c4e063592 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.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
+MD5 (gnome2/gnome-python-desktop-2.28.0.tar.bz2) = d97bb3d8e1adc00505be060fbc832f44
+SHA256 (gnome2/gnome-python-desktop-2.28.0.tar.bz2) = 92948d2dd0d03a56abe565f3c24725242251db261bd0a12aad5a742326cb3c7f
+SIZE (gnome2/gnome-python-desktop-2.28.0.tar.bz2) = 613169
diff --git a/x11-toolkits/py-gnome-desktop/pkg-plist b/x11-toolkits/py-gnome-desktop/pkg-plist
index 2d7723f572f5..0de7d54e5ac0 100644
--- a/x11-toolkits/py-gnome-desktop/pkg-plist
+++ b/x11-toolkits/py-gnome-desktop/pkg-plist
@@ -1,3 +1,7 @@
+%%PYTHON_SITELIBDIR%%/gtk-2.0/braseroburn.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/braseroburn.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/braseromedia.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/braseromedia.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.pyo
@@ -83,6 +87,10 @@ libdata/pkgconfig/gnome-python-desktop-2.0.pc
%%PORTDOCS%%share/examples/py-gnome/applet/GNOME_PythonAppletSample.server
%%PORTDOCS%%share/examples/py-gnome/applet/README
%%PORTDOCS%%share/examples/py-gnome/applet/applet.py
+%%PORTDOCS%%share/examples/py-gnome/braseroburn/write-audio-video.py
+%%PORTDOCS%%share/examples/py-gnome/braseroburn/write-data.py
+%%PORTDOCS%%share/examples/py-gnome/braseroburn/write-image.py
+%%PORTDOCS%%share/examples/py-gnome/braseromedia/drive_selection.py
%%PORTDOCS%%share/examples/py-gnome/gnomeprint/README
%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_01.py
%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_02.py
@@ -106,6 +114,8 @@ libdata/pkgconfig/gnome-python-desktop-2.0.pc
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/brasero_burn.defs
+share/pygtk/2.0/defs/brasero_media.defs
share/pygtk/2.0/defs/ebook.defs
share/pygtk/2.0/defs/evince.defs
share/pygtk/2.0/defs/gnomekeyring.defs
@@ -119,6 +129,8 @@ share/pygtk/2.0/defs/wnck.defs
%%PORTDOCS%%@dirrm share/examples/py-gnome/mediaprofiles
%%PORTDOCS%%@dirrm share/examples/py-gnome/gtksourceview
%%PORTDOCS%%@dirrm share/examples/py-gnome/gnomeprint
+%%PORTDOCS%%@dirrm share/examples/py-gnome/braseromedia
+%%PORTDOCS%%@dirrm share/examples/py-gnome/braseroburn
%%PORTDOCS%%@dirrm share/examples/py-gnome/applet
%%PORTDOCS%%@dirrmtry share/examples/py-gnome
%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtksourceview
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 7e8bcd2b38b8..70a40e7e7321 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -3,17 +3,16 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.48 2009/04/07 03:08:53 marcus Exp $
+# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.55 2009/11/28 05:59:04 mezz Exp $
#
-PORTNAME= gnome
+PORTNAME= gnome-extras
PORTVERSION= 2.25.3
-PORTREVISION= 4
+PORTREVISION= 6
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX= -extras
DISTNAME= gnome-python-extras-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -22,8 +21,8 @@ COMMENT= A set of Python bindings for GNOME 2
LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell \
gksu1.2.0:${PORTSDIR}/sysutils/libgksu \
- gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui \
- gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
+ gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui
+# gdl-1.2:${PORTSDIR}/x11-toolkits/gdl
USE_GECKO= libxul
USE_BZIP2= yes
@@ -33,6 +32,7 @@ USE_GNOME= gnomehack libgtkhtml pygnome2 libgda4
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=--disable-gdl
EG_SRC_DIR= ${WRKSRC}/examples
EG_DST_DIR= ${PREFIX}/share/examples/py-gnome
diff --git a/x11-toolkits/py-gnome-extras/files/patch-configure b/x11-toolkits/py-gnome-extras/files/patch-configure
deleted file mode 100644
index 04f5b256944c..000000000000
--- a/x11-toolkits/py-gnome-extras/files/patch-configure
+++ /dev/null
@@ -1,675 +0,0 @@
---- 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]
-- --with-gtkmozembed=mozilla|firefox|xulrunner
-+ --with-gtkmozembed=mozilla|firefox|xulrunner|seamonkey
- package that provides libgtkmozembed
-
- Some influential environment variables:
-@@ -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/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist
index 8564adea3250..fb6368087b33 100644
--- a/x11-toolkits/py-gnome-extras/pkg-plist
+++ b/x11-toolkits/py-gnome-extras/pkg-plist
@@ -8,8 +8,6 @@ include/pygda-4.0/pygdavalue_conversions.h
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gda.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gda.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyo
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 5b14acca2285..e4c9c99b1c72 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.55 2009/03/15 00:16:38 marcus Exp $
+# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.58 2009/09/21 19:32:26 kwm Exp $
#
PORTNAME= gnome
-PORTVERSION= 2.26.1
-PORTREVISION= 1
+PORTVERSION= 2.28.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 03156a926a87..ed7191ac1594 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-2.26.1.tar.bz2) = e5dcae40b2c291126843680dbed924a8
-SHA256 (gnome2/gnome-python-2.26.1.tar.bz2) = ede0203f1eec22b3ed4a91c7b769e437859e5bc4b89a8f8e80b3f7ca62317098
-SIZE (gnome2/gnome-python-2.26.1.tar.bz2) = 523132
+MD5 (gnome2/gnome-python-2.28.0.tar.bz2) = b627abbb0ed912e221cc072e3dd6f9d6
+SHA256 (gnome2/gnome-python-2.28.0.tar.bz2) = f2c984587450086dff8eb0a72a8d8c616d51fecfcc790601c35641be140efa0c
+SIZE (gnome2/gnome-python-2.28.0.tar.bz2) = 560872
diff --git a/x11-toolkits/py-gnome2/pkg-plist b/x11-toolkits/py-gnome2/pkg-plist
index 54bab3102807..e3cca9b7284c 100644
--- a/x11-toolkits/py-gnome2/pkg-plist
+++ b/x11-toolkits/py-gnome2/pkg-plist
@@ -48,6 +48,7 @@ libdata/pkgconfig/gnome-python-2.0.pc
%%PORTDOCS%%share/examples/py-gnome/gconf/basic-gconf-app.py
%%PORTDOCS%%share/examples/py-gnome/gconf/simple-controller.py
%%PORTDOCS%%share/examples/py-gnome/gconf/simple-view.py
+%%PORTDOCS%%share/examples/py-gnome/popt/goption.py
%%PORTDOCS%%share/examples/py-gnome/popt/popt.py
%%PORTDOCS%%share/examples/py-gnome/vfs/async-xfer.py
%%PORTDOCS%%share/examples/py-gnome/vfs/async.py
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 7113e0840e59..8f1b2542185d 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -3,12 +3,11 @@
# Whom: marc@informatik.uni-bremen.de
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.58 2008/09/27 01:53:01 mezz Exp $
+# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.65 2009/08/23 18:58:07 kwm Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.14.1
-PORTREVISION= 1
+PORTVERSION= 2.16.0
CATEGORIES= x11-toolkits python
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,7 +18,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A set of Python bindings for GTK+
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \
+BUILD_DEPENDS= ${PYNUMERIC} \
+ ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \
${PYTHON_SITELIBDIR}/gtk-2.0/gobject/_gobject.so:${PORTSDIR}/devel/py-gobject
RUN_DEPENDS= ${PYNUMERIC} \
${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index 9e6b70760b75..44b98e279e92 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygtk-2.14.1.tar.bz2) = c27a7d21b87910e80605d9135d220592
-SHA256 (gnome2/pygtk-2.14.1.tar.bz2) = 733a5e2e1ca2ca6cf9dae0de9c035d3a428c6ec52774977f60d0618a1a27591a
-SIZE (gnome2/pygtk-2.14.1.tar.bz2) = 2210535
+MD5 (gnome2/pygtk-2.16.0.tar.bz2) = bd0d437fefd6d5390f5d770a495cd50c
+SHA256 (gnome2/pygtk-2.16.0.tar.bz2) = 7fae5e01af217a01738eae41c38ad7f86d1f538f444300d0fa2847aafb7444a8
+SIZE (gnome2/pygtk-2.16.0.tar.bz2) = 2253202
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index 7cabb83f0786..3644393e6a62 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -186,6 +186,7 @@ libdata/pkgconfig/pygtk-2.0.pc
%%DOCSDIR%%/class-gtkaccessible.html
%%DOCSDIR%%/class-gtkaction.html
%%DOCSDIR%%/class-gtkactiongroup.html
+%%DOCSDIR%%/class-gtkactivatable.html
%%DOCSDIR%%/class-gtkadjustment.html
%%DOCSDIR%%/class-gtkalignment.html
%%DOCSDIR%%/class-gtkarrow.html
@@ -700,6 +701,7 @@ share/pygtk/2.0/defs/atk.defs
share/pygtk/2.0/defs/gdk-2.10.defs
share/pygtk/2.0/defs/gdk-2.12.defs
share/pygtk/2.0/defs/gdk-2.14.defs
+share/pygtk/2.0/defs/gdk-2.16.defs
share/pygtk/2.0/defs/gdk-base-types.defs
share/pygtk/2.0/defs/gdk-base.defs
share/pygtk/2.0/defs/gdk-types.defs
@@ -710,6 +712,8 @@ share/pygtk/2.0/defs/gtk-2.12-types.defs
share/pygtk/2.0/defs/gtk-2.12.defs
share/pygtk/2.0/defs/gtk-2.14-types.defs
share/pygtk/2.0/defs/gtk-2.14.defs
+share/pygtk/2.0/defs/gtk-2.16-types.defs
+share/pygtk/2.0/defs/gtk-2.16.defs
share/pygtk/2.0/defs/gtk-base-types.defs
share/pygtk/2.0/defs/gtk-base.defs
share/pygtk/2.0/defs/gtk-extrafuncs.defs
@@ -743,10 +747,10 @@ share/pygtk/2.0/defs/pangocairo.override
@dirrm %%DOCSDIR%%/cursors
@dirrm %%DOCSDIR%%
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0
+@dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0
@dirrm lib/pygtk/2.0/demos/images
@dirrm lib/pygtk/2.0/demos
@dirrm lib/pygtk/2.0
@dirrm lib/pygtk
@dirrm include/pygtk-2.0/pygtk
-@dirrm include/pygtk-2.0
+@dirrmtry include/pygtk-2.0
diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
index 104d27e48357..e0c9cf2489b7 100644
--- a/x11-toolkits/py-gtksourceview/Makefile
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -3,12 +3,11 @@
# Whom: Mezz <mezz@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.17 2009/03/24 13:38:04 kwm Exp $
+# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.20 2009/09/22 08:25:11 kwm Exp $
#
PORTNAME= gtksourceview
-PORTVERSION= 2.6.0
-PORTREVISION= 1
+PORTVERSION= 2.8.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 e07fe304f190..f0d42509325f 100644
--- a/x11-toolkits/py-gtksourceview/distinfo
+++ b/x11-toolkits/py-gtksourceview/distinfo
@@ -1,3 +1,3 @@
-MD5 (pygtksourceview-2.6.0.tar.bz2) = 5587a1865bd5c785c6f34095c57cc96b
-SHA256 (pygtksourceview-2.6.0.tar.bz2) = 77acb735fee997a1638c79256b9dcf592566d066b54a72eb4321909f98f66178
-SIZE (pygtksourceview-2.6.0.tar.bz2) = 271314
+MD5 (pygtksourceview-2.8.0.tar.bz2) = bc344044113a52026b4eb7e433a24c29
+SHA256 (pygtksourceview-2.8.0.tar.bz2) = 27f531270b46285982573089a58a19d622174ad9a4568e12d8fa4aedbfc174da
+SIZE (pygtksourceview-2.8.0.tar.bz2) = 269696
diff --git a/x11-toolkits/slgtk/Makefile b/x11-toolkits/slgtk/Makefile
index 8198d4613690..7de23dcfd4b1 100644
--- a/x11-toolkits/slgtk/Makefile
+++ b/x11-toolkits/slgtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= slgtk
PORTVERSION= 0.7.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://space.mit.edu/pub/cxc/modules/slgtk/
diff --git a/x11-toolkits/slgtk/files/patch-src_slirprc-gtk.sl b/x11-toolkits/slgtk/files/patch-src_slirprc-gtk.sl
new file mode 100644
index 000000000000..9b4ecf3bfc6d
--- /dev/null
+++ b/x11-toolkits/slgtk/files/patch-src_slirprc-gtk.sl
@@ -0,0 +1,11 @@
+--- src/slirprc-gtk.sl.orig 2009-09-27 23:31:51.000000000 -0400
++++ src/slirprc-gtk.sl 2009-09-27 23:32:06.000000000 -0400
+@@ -308,6 +308,8 @@ accepts_null_args["g_list_append"] = [1]
+ gtk_widget_get_window % prefer my version, which returns
+ % bin_window for GtkLayout
+
++gtk_widget_get_allocation
++
+ gtk_accel_group_activate % gtk/gtkaccelgroup.h: "internal" funcs
+ gtk_accel_group_get_entry
+ gtk_accel_group_lock_entry
diff --git a/x11-toolkits/unique/Makefile b/x11-toolkits/unique/Makefile
index 77650d91822c..41396bfe0a10 100644
--- a/x11-toolkits/unique/Makefile
+++ b/x11-toolkits/unique/Makefile
@@ -3,26 +3,30 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/x11-toolkits/unique/Makefile,v 1.3 2009/10/03 02:27:43 marcus Exp $
#
PORTNAME= unique
-PORTVERSION= 1.0.6
-PORTREVISION= 1
+PORTVERSION= 1.1.2
CATEGORIES= x11-toolkits
-MASTER_SITES= http://www.gnome.org/~ebassi/source/
+MASTER_SITES= GNOME/sources/lib${PORTNAME}/${PORTVERSION:R}/
+DISTNAME= lib${PORTNAME}-${PORTVERSION}
MAINTAINER= kwm@FreeBSD.org
COMMENT= Library for single instance applications.
+BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
+RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
USE_XORG= ice
+USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
-USE_GNOME= gtk20 gnomeprefix
+USE_GNOME= gtk20 gnomeprefix ltverhack:2
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-maintainer-flags
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/unique/distinfo b/x11-toolkits/unique/distinfo
index 08da782dbfe6..445ab3a96808 100644
--- a/x11-toolkits/unique/distinfo
+++ b/x11-toolkits/unique/distinfo
@@ -1,3 +1,3 @@
-MD5 (unique-1.0.6.tar.gz) = 90eccdb97722d53f872a8fbdc8255ebb
-SHA256 (unique-1.0.6.tar.gz) = 5ab4814e854f594dd004b07bdecffd360f81cd13482d850d9c99e8b4cc9191b9
-SIZE (unique-1.0.6.tar.gz) = 449242
+MD5 (libunique-1.1.2.tar.gz) = a99799e72779baa98352fbac7f91c910
+SHA256 (libunique-1.1.2.tar.gz) = ccf73a90a66477d6d31e50aeabebad8e0035f80e98ac0e926157c3d7e229b31e
+SIZE (libunique-1.1.2.tar.gz) = 431459
diff --git a/x11-toolkits/unique/pkg-plist b/x11-toolkits/unique/pkg-plist
index fada9ed4463b..c82fa3a05818 100644
--- a/x11-toolkits/unique/pkg-plist
+++ b/x11-toolkits/unique/pkg-plist
@@ -3,11 +3,13 @@ include/unique-1.0/unique/uniqueapp.h
include/unique-1.0/unique/uniquebackend.h
include/unique-1.0/unique/uniquemessage.h
include/unique-1.0/unique/uniqueversion.h
+lib/girepository-1.0/Unique-1.0.typelib
lib/libunique-1.0.a
lib/libunique-1.0.la
lib/libunique-1.0.so
lib/libunique-1.0.so.2
libdata/pkgconfig/unique-1.0.pc
+share/gir-1.0/Unique-1.0.gir
%%DOCSDIR%%/UniqueApp.html
%%DOCSDIR%%/UniqueBackend.html
%%DOCSDIR%%/home.png
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 1ecbd3f7ca7a..1916cfd75029 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/x11-toolkits/vte/Makefile,v 1.104 2009/11/17 21:15:44 kwm Exp $
#
PORTNAME= vte
-PORTVERSION= 0.20.5
+PORTVERSION= 0.22.5
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index ba6a4250b1ee..786a0be68291 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vte-0.20.5.tar.bz2) = 90de70ddd1340be308430ded74d6b8d6
-SHA256 (gnome2/vte-0.20.5.tar.bz2) = d69ec08804eaa03beef93d39b1cb56ecb98a492f1dd091343b69303ef999681b
-SIZE (gnome2/vte-0.20.5.tar.bz2) = 1328766
+MD5 (gnome2/vte-0.22.5.tar.bz2) = cbb17696e40ee175977bf165ef838da2
+SHA256 (gnome2/vte-0.22.5.tar.bz2) = c0987126347e12daf2bf9b772b6c58ddf8a922f5b8341470ed578d9fcea7b2f6
+SIZE (gnome2/vte-0.22.5.tar.bz2) = 1351975
diff --git a/x11-toolkits/vte/files/patch-python_Makefile.in b/x11-toolkits/vte/files/patch-python_Makefile.in
index d8c01a7483df..d821a7cf66e0 100644
--- a/x11-toolkits/vte/files/patch-python_Makefile.in
+++ b/x11-toolkits/vte/files/patch-python_Makefile.in
@@ -1,6 +1,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 @@
+--- python/Makefile.in.orig 2009-11-01 13:38:24.000000000 -0500
++++ python/Makefile.in 2009-11-01 13:38:24.000000000 -0500
+@@ -73,7 +73,6 @@ am__installdirs = "$(DESTDIR)$(pythonsit
LTLIBRARIES = $(pythonsiteexec_LTLIBRARIES)
am__DEPENDENCIES_1 =
@BUILD_PYTHON_MODULES_TRUE@vtemodule_la_DEPENDENCIES = \
@@ -8,24 +8,7 @@
@BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \
@BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \
@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
-@@ -305,7 +304,7 @@
+@@ -320,7 +319,7 @@ EXTRA_DIST = vte.defs pyvte.pc.in vte.ov
# 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)
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index d4337b16529b..33a0070c4553 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -28,12 +28,14 @@ share/locale/bn/LC_MESSAGES/vte.mo
share/locale/bn_IN/LC_MESSAGES/vte.mo
share/locale/bs/LC_MESSAGES/vte.mo
share/locale/ca/LC_MESSAGES/vte.mo
+share/locale/ca@valencia/LC_MESSAGES/vte.mo
share/locale/cs/LC_MESSAGES/vte.mo
share/locale/cy/LC_MESSAGES/vte.mo
share/locale/da/LC_MESSAGES/vte.mo
share/locale/de/LC_MESSAGES/vte.mo
share/locale/dz/LC_MESSAGES/vte.mo
share/locale/el/LC_MESSAGES/vte.mo
+share/locale/en@shaw/LC_MESSAGES/vte.mo
share/locale/en_CA/LC_MESSAGES/vte.mo
share/locale/en_GB/LC_MESSAGES/vte.mo
share/locale/es/LC_MESSAGES/vte.mo
@@ -61,6 +63,7 @@ share/locale/ky/LC_MESSAGES/vte.mo
share/locale/li/LC_MESSAGES/vte.mo
share/locale/lt/LC_MESSAGES/vte.mo
share/locale/lv/LC_MESSAGES/vte.mo
+share/locale/mai/LC_MESSAGES/vte.mo
share/locale/mi/LC_MESSAGES/vte.mo
share/locale/mk/LC_MESSAGES/vte.mo
share/locale/ml/LC_MESSAGES/vte.mo
@@ -69,6 +72,7 @@ share/locale/mr/LC_MESSAGES/vte.mo
share/locale/ms/LC_MESSAGES/vte.mo
share/locale/nb/LC_MESSAGES/vte.mo
share/locale/ne/LC_MESSAGES/vte.mo
+share/locale/nds/LC_MESSAGES/vte.mo
share/locale/nl/LC_MESSAGES/vte.mo
share/locale/nn/LC_MESSAGES/vte.mo
share/locale/oc/LC_MESSAGES/vte.mo
@@ -120,16 +124,24 @@ share/locale/zh_TW/LC_MESSAGES/vte.mo
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 90a7ae6a1c1c..2a09fdd27768 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wx
PORTVERSION= 2.4.2
-PORTREVISION?= 17
+PORTREVISION?= 18
PKGNAMESUFFIX= ${WXGTK_FLAVOR}
CATEGORIES= x11-toolkits
MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION}
diff --git a/x11-toolkits/wxgtk24/files/patch-src-gtk-gsockgtk.cpp b/x11-toolkits/wxgtk24/files/patch-src-gtk-gsockgtk.cpp
new file mode 100644
index 000000000000..9ad23614f486
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-src-gtk-gsockgtk.cpp
@@ -0,0 +1,18 @@
+--- src/gtk/gsockgtk.c.orig 2003-09-21 13:31:58.000000000 +0200
++++ src/gtk/gsockgtk.c 2009-09-28 13:38:26.000000000 +0200
+@@ -13,8 +13,15 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+
++// newer versions of glib define its own GSocket but we unfortunately use this
++// name in our own (semi-)public header and so can't change it -- rename glib
++// one instead
++#define GSocket GlibGSocket
++#define _GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
++#undef _GSocket
+
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index 8dd258fa30a3..73589d934608 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wx
PORTVERSION= 2.6.4
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= x11-toolkits
MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION}
PKGNAMESUFFIX= ${WXGTK_FLAVOR}
diff --git a/x11-toolkits/wxgtk26/files/patch-src-gtk-gsockgtk.cpp b/x11-toolkits/wxgtk26/files/patch-src-gtk-gsockgtk.cpp
new file mode 100644
index 000000000000..113f73e51ced
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-src-gtk-gsockgtk.cpp
@@ -0,0 +1,16 @@
+--- src/gtk//gsockgtk.cpp.orig 2007-03-20 16:50:07.000000000 +0100
++++ src/gtk/gsockgtk.cpp 2009-09-18 14:46:47.000000000 +0200
+@@ -14,8 +14,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+
++// newer versions of glib define its own GSocket but we unfortunately use this
++// name in our own (semi-)public header and so can't change it -- rename glib
++// one instead
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
+
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index 321c75cc900a..e8510b09c18d 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wx
PORTVERSION= 2.8.10
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= x11-toolkits
MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION}
PKGNAMESUFFIX= ${WXGTK_FLAVOR}
diff --git a/x11-toolkits/wxgtk28/files/patch-include__wx__gtk__win_gtk.h b/x11-toolkits/wxgtk28/files/patch-include__wx__gtk__win_gtk.h
new file mode 100644
index 000000000000..d9c66f279bee
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-include__wx__gtk__win_gtk.h
@@ -0,0 +1,12 @@
+--- include/wx/gtk/win_gtk.h.orig 2009-11-27 01:59:18.000000000 +0100
++++ include/wx/gtk/win_gtk.h 2009-11-27 01:59:33.000000000 +0100
+@@ -15,7 +15,9 @@
+ extern "C" {
+ #endif /* __cplusplus */
+
++#define GSocket GlibGSocket
+ #include <gtk/gtkcontainer.h>
++#undef GSocket
+
+ #include "wx/dlimpexp.h"
+
diff --git a/x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp b/x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp
new file mode 100644
index 000000000000..113f73e51ced
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-src-gtk-gsockgtk.cpp
@@ -0,0 +1,16 @@
+--- src/gtk//gsockgtk.cpp.orig 2007-03-20 16:50:07.000000000 +0100
++++ src/gtk/gsockgtk.cpp 2009-09-18 14:46:47.000000000 +0200
+@@ -14,8 +14,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+
++// newer versions of glib define its own GSocket but we unfortunately use this
++// name in our own (semi-)public header and so can't change it -- rename glib
++// one instead
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
+
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index 321c75cc900a..e8510b09c18d 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wx
PORTVERSION= 2.8.10
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= x11-toolkits
MASTER_SITES= SF/wxwindows/wxGTK/${PORTVERSION}
PKGNAMESUFFIX= ${WXGTK_FLAVOR}
diff --git a/x11-toolkits/wxgtk29/files/patch-include__wx__gtk__win_gtk.h b/x11-toolkits/wxgtk29/files/patch-include__wx__gtk__win_gtk.h
new file mode 100644
index 000000000000..d9c66f279bee
--- /dev/null
+++ b/x11-toolkits/wxgtk29/files/patch-include__wx__gtk__win_gtk.h
@@ -0,0 +1,12 @@
+--- include/wx/gtk/win_gtk.h.orig 2009-11-27 01:59:18.000000000 +0100
++++ include/wx/gtk/win_gtk.h 2009-11-27 01:59:33.000000000 +0100
+@@ -15,7 +15,9 @@
+ extern "C" {
+ #endif /* __cplusplus */
+
++#define GSocket GlibGSocket
+ #include <gtk/gtkcontainer.h>
++#undef GSocket
+
+ #include "wx/dlimpexp.h"
+
diff --git a/x11-toolkits/wxgtk29/files/patch-src-gtk-gsockgtk.cpp b/x11-toolkits/wxgtk29/files/patch-src-gtk-gsockgtk.cpp
new file mode 100644
index 000000000000..113f73e51ced
--- /dev/null
+++ b/x11-toolkits/wxgtk29/files/patch-src-gtk-gsockgtk.cpp
@@ -0,0 +1,16 @@
+--- src/gtk//gsockgtk.cpp.orig 2007-03-20 16:50:07.000000000 +0100
++++ src/gtk/gsockgtk.cpp 2009-09-18 14:46:47.000000000 +0200
+@@ -14,8 +14,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+
++// newer versions of glib define its own GSocket but we unfortunately use this
++// name in our own (semi-)public header and so can't change it -- rename glib
++// one instead
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
+
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 9d1e012e222a..9fe97eae6574 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -83,6 +83,7 @@
SUBDIR += matwm2
SUBDIR += metacity
SUBDIR += musca
+ SUBDIR += mutter
SUBDIR += nickleby
SUBDIR += obconf
SUBDIR += obmenu
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 61df6dcf9b67..0689520579b3 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= compiz
PORTVERSION= 0.8.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
@@ -83,7 +83,8 @@ DESKTOP_ENTRIES= "Compiz Manager" \
false
post-patch:
- @${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|libpng|libpng12|' -e 's|gnome-desktop-2.0|gnome-desktop-2.0 gconf-2.0|g' \
+ ${WRKSRC}/configure
post-install:
${INSTALL_SCRIPT} ${WRKDIR}/compiz-manager ${PREFIX}/bin/compiz-manager
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 41c6cbaba1bb..e1f82f0c14cc 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.145 2009/03/26 17:34:42 marcus Exp $
+# $MCom: ports/x11-wm/metacity/Makefile,v 1.151 2009/09/22 20:27:27 kwm Exp $
#
PORTNAME= metacity
-PORTVERSION= 2.26.0
-PORTREVISION= 1
+PORTVERSION= 2.28.0
CATEGORIES= x11-wm
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,10 +16,10 @@ 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
+LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
+ canberra-gtk.0:${PORTSDIR}/audio/libcanberra
RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity
-CONFLICTS= expocity-[0-9]*
USE_BZIP2= yes
USE_XORG= x11 xcomposite xdamage
USE_GETTEXT= yes
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index 092049327eaa..3cdf65382e0e 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/metacity-2.28.0.tar.bz2) = 9d87e390cf9979978f2290aebc41f83b
+SHA256 (gnome2/metacity-2.28.0.tar.bz2) = 0621553a6f21fcf40c5dc4c7907b5745c6d853e6b7637bb45b863ec39f595545
+SIZE (gnome2/metacity-2.28.0.tar.bz2) = 2288241
diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure
index dc37d41d93d6..e05059e0ae57 100644
--- a/x11-wm/metacity/files/patch-configure
+++ b/x11-wm/metacity/files/patch-configure
@@ -1,9 +1,9 @@
---- configure.orig 2009-03-17 18:59:17.000000000 +0100
-+++ configure 2009-03-17 19:00:03.000000000 +0100
-@@ -23806,7 +23806,7 @@
+--- configure.orig 2009-09-22 22:18:43.000000000 +0200
++++ configure 2009-09-22 22:19:29.000000000 +0200
+@@ -18211,7 +18211,7 @@ metacity-$VERSION:
"
- METACITY_MINOR_VERSION=26
+ METACITY_MINOR_VERSION=28
-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
new file mode 100644
index 000000000000..a88ecf2af527
--- /dev/null
+++ b/x11-wm/metacity/files/patch-src_core_main.c
@@ -0,0 +1,24 @@
+--- src/core/main.c.orig 2009-09-08 16:55:35.000000000 -0400
++++ src/core/main.c 2009-10-02 23:36:53.000000000 -0400
+@@ -58,7 +58,11 @@
+
+ #include <stdlib.h>
+ #include <sys/types.h>
++#ifdef __linux__
+ #include <wait.h>
++#else
++#include <sys/wait.h>
++#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <signal.h>
+@@ -378,6 +382,9 @@ sigterm_handler (int signum)
+ }
+
+ static guint sigchld_signal_id = 0;
++#ifndef CLD_EXITED
++#define CLD_EXITED 1
++#endif
+
+ static void
+ sigchld_handler (int signum, siginfo_t *info, void *context)
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index 82b209e925f7..4e15080e2fa5 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -14,7 +14,6 @@ lib/libmetacity-private.la
lib/libmetacity-private.so
lib/libmetacity-private.so.0
libdata/pkgconfig/libmetacity-private.pc
-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
@@ -30,6 +29,7 @@ share/locale/be@latin/LC_MESSAGES/metacity.mo
share/locale/bg/LC_MESSAGES/metacity.mo
share/locale/bn/LC_MESSAGES/metacity.mo
share/locale/bn_IN/LC_MESSAGES/metacity.mo
+share/locale/br/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
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
new file mode 100644
index 000000000000..b813b829eb6a
--- /dev/null
+++ b/x11-wm/mutter/Makefile
@@ -0,0 +1,44 @@
+# New ports collection makefile for: mutter
+# Date created: 14 Aug 2009
+# Whom: Pawel Worach <pawel.worach@gmail.com>
+#
+# $FreeBSD$
+# $MCom: ports/x11-wm/mutter/Makefile,v 1.6 2009/10/07 22:59:24 kwm Exp $
+#
+
+PORTNAME= mutter
+PORTVERSION= 2.28.0
+CATEGORIES= x11-wm
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Window and compositing manager based on Clutter
+
+BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity \
+ ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
+ clutter-glx-1.0:${PORTSDIR}/graphics/clutter
+RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \
+ ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+
+USE_BZIP2= yes
+USE_XORG= x11 xext xrandr xcomposite xcursor xinerama ice sm
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_AUTOTOOLS= libtool:22
+USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 ltverhack
+USE_LDCONFIG= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS= mutter.schemas
+
+MAN1= mutter-message.1 mutter-theme-viewer.1 \
+ mutter-window-demo.1 mutter.1
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|-Werror||g' \
+ ${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/x11-wm/mutter/distinfo b/x11-wm/mutter/distinfo
new file mode 100644
index 000000000000..e668aca176f2
--- /dev/null
+++ b/x11-wm/mutter/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/mutter-2.28.0.tar.bz2) = 3926895782024cff7af7ca480df46b4f
+SHA256 (gnome2/mutter-2.28.0.tar.bz2) = f1917172fa4fa622dcc2aa1d82a6c4796c2981566a5c9dc1df7da2a38cd8da80
+SIZE (gnome2/mutter-2.28.0.tar.bz2) = 1986736
diff --git a/x11-wm/mutter/files/patch-src_core_main.c b/x11-wm/mutter/files/patch-src_core_main.c
new file mode 100644
index 000000000000..9980fe9099c6
--- /dev/null
+++ b/x11-wm/mutter/files/patch-src_core_main.c
@@ -0,0 +1,14 @@
+--- src/core/main.c.orig 2009-08-14 00:40:56.000000000 +0000
++++ src/core/main.c 2009-08-14 00:41:22.000000000 +0000
+@@ -59,7 +59,11 @@
+
+ #include <stdlib.h>
+ #include <sys/types.h>
++#ifdef __linux__
+ #include <wait.h>
++#else
++#include <sys/wait.h>
++#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <signal.h>
diff --git a/x11-wm/mutter/pkg-descr b/x11-wm/mutter/pkg-descr
new file mode 100644
index 000000000000..54c14b743c7e
--- /dev/null
+++ b/x11-wm/mutter/pkg-descr
@@ -0,0 +1,7 @@
+mutter is a minimal X window manager aimed at nontechnical users and is
+designed to integrate well with the GNOME desktop. mutter lacks some
+features that may be expected by traditional UNIX or other technical
+users; these users may want to investigate other available window man-
+agers for use with GNOME or standalone.
+
+WWW: -
diff --git a/x11-wm/mutter/pkg-plist b/x11-wm/mutter/pkg-plist
new file mode 100644
index 000000000000..523a02c687ca
--- /dev/null
+++ b/x11-wm/mutter/pkg-plist
@@ -0,0 +1,180 @@
+bin/mutter
+bin/mutter-message
+bin/mutter-theme-viewer
+bin/mutter-window-demo
+include/mutter/mutter-private/atomnames.h
+include/mutter/mutter-private/boxes.h
+include/mutter/mutter-private/common.h
+include/mutter/mutter-private/compositor-mutter.h
+include/mutter/mutter-private/compositor.h
+include/mutter/mutter-private/display.h
+include/mutter/mutter-private/errors.h
+include/mutter/mutter-private/gradient.h
+include/mutter/mutter-private/group.h
+include/mutter/mutter-private/keybindings.h
+include/mutter/mutter-private/main.h
+include/mutter/mutter-private/mutter-plugin.h
+include/mutter/mutter-private/mutter-window.h
+include/mutter/mutter-private/prefs.h
+include/mutter/mutter-private/preview-widget.h
+include/mutter/mutter-private/screen.h
+include/mutter/mutter-private/theme-parser.h
+include/mutter/mutter-private/theme.h
+include/mutter/mutter-private/types.h
+include/mutter/mutter-private/util.h
+include/mutter/mutter-private/window.h
+include/mutter/mutter-private/workspace.h
+lib/libmutter-private.a
+lib/libmutter-private.la
+lib/libmutter-private.so
+lib/libmutter-private.so.0
+lib/mutter/Meta-2.28.gir
+lib/mutter/Meta-2.28.typelib
+lib/mutter/plugins/default.so
+libdata/pkgconfig/libmutter-private.pc
+libdata/pkgconfig/mutter-plugins.pc
+share/applications/mutter.desktop
+share/gnome/wm-properties/mutter-wm.desktop
+share/locale/am/LC_MESSAGES/mutter.mo
+share/locale/ar/LC_MESSAGES/mutter.mo
+share/locale/as/LC_MESSAGES/mutter.mo
+share/locale/ast/LC_MESSAGES/mutter.mo
+share/locale/az/LC_MESSAGES/mutter.mo
+share/locale/be/LC_MESSAGES/mutter.mo
+share/locale/be@latin/LC_MESSAGES/mutter.mo
+share/locale/bg/LC_MESSAGES/mutter.mo
+share/locale/bn/LC_MESSAGES/mutter.mo
+share/locale/bn_IN/LC_MESSAGES/mutter.mo
+share/locale/br/LC_MESSAGES/mutter.mo
+share/locale/bs/LC_MESSAGES/mutter.mo
+share/locale/ca/LC_MESSAGES/mutter.mo
+share/locale/ca@valencia/LC_MESSAGES/mutter.mo
+share/locale/cs/LC_MESSAGES/mutter.mo
+share/locale/cy/LC_MESSAGES/mutter.mo
+share/locale/da/LC_MESSAGES/mutter.mo
+share/locale/de/LC_MESSAGES/mutter.mo
+share/locale/dz/LC_MESSAGES/mutter.mo
+share/locale/el/LC_MESSAGES/mutter.mo
+share/locale/en_CA/LC_MESSAGES/mutter.mo
+share/locale/en_GB/LC_MESSAGES/mutter.mo
+share/locale/es/LC_MESSAGES/mutter.mo
+share/locale/et/LC_MESSAGES/mutter.mo
+share/locale/eu/LC_MESSAGES/mutter.mo
+share/locale/fa/LC_MESSAGES/mutter.mo
+share/locale/fi/LC_MESSAGES/mutter.mo
+share/locale/fr/LC_MESSAGES/mutter.mo
+share/locale/ga/LC_MESSAGES/mutter.mo
+share/locale/gl/LC_MESSAGES/mutter.mo
+share/locale/gu/LC_MESSAGES/mutter.mo
+share/locale/ha/LC_MESSAGES/mutter.mo
+share/locale/he/LC_MESSAGES/mutter.mo
+share/locale/hi/LC_MESSAGES/mutter.mo
+share/locale/hr/LC_MESSAGES/mutter.mo
+share/locale/hu/LC_MESSAGES/mutter.mo
+share/locale/hy/LC_MESSAGES/mutter.mo
+share/locale/id/LC_MESSAGES/mutter.mo
+share/locale/ig/LC_MESSAGES/mutter.mo
+share/locale/is/LC_MESSAGES/mutter.mo
+share/locale/it/LC_MESSAGES/mutter.mo
+share/locale/ja/LC_MESSAGES/mutter.mo
+share/locale/ka/LC_MESSAGES/mutter.mo
+share/locale/kn/LC_MESSAGES/mutter.mo
+share/locale/ko/LC_MESSAGES/mutter.mo
+share/locale/ku/LC_MESSAGES/mutter.mo
+share/locale/la/LC_MESSAGES/mutter.mo
+share/locale/lt/LC_MESSAGES/mutter.mo
+share/locale/lv/LC_MESSAGES/mutter.mo
+share/locale/mai/LC_MESSAGES/mutter.mo
+share/locale/mg/LC_MESSAGES/mutter.mo
+share/locale/mk/LC_MESSAGES/mutter.mo
+share/locale/ml/LC_MESSAGES/mutter.mo
+share/locale/mn/LC_MESSAGES/mutter.mo
+share/locale/mr/LC_MESSAGES/mutter.mo
+share/locale/ms/LC_MESSAGES/mutter.mo
+share/locale/nb/LC_MESSAGES/mutter.mo
+share/locale/ne/LC_MESSAGES/mutter.mo
+share/locale/nl/LC_MESSAGES/mutter.mo
+share/locale/nn/LC_MESSAGES/mutter.mo
+share/locale/oc/LC_MESSAGES/mutter.mo
+share/locale/or/LC_MESSAGES/mutter.mo
+share/locale/pa/LC_MESSAGES/mutter.mo
+share/locale/pl/LC_MESSAGES/mutter.mo
+share/locale/pt/LC_MESSAGES/mutter.mo
+share/locale/pt_BR/LC_MESSAGES/mutter.mo
+share/locale/ro/LC_MESSAGES/mutter.mo
+share/locale/ru/LC_MESSAGES/mutter.mo
+share/locale/rw/LC_MESSAGES/mutter.mo
+share/locale/si/LC_MESSAGES/mutter.mo
+share/locale/sk/LC_MESSAGES/mutter.mo
+share/locale/sl/LC_MESSAGES/mutter.mo
+share/locale/sq/LC_MESSAGES/mutter.mo
+share/locale/sr/LC_MESSAGES/mutter.mo
+share/locale/sr@latin/LC_MESSAGES/mutter.mo
+share/locale/sv/LC_MESSAGES/mutter.mo
+share/locale/ta/LC_MESSAGES/mutter.mo
+share/locale/te/LC_MESSAGES/mutter.mo
+share/locale/th/LC_MESSAGES/mutter.mo
+share/locale/tk/LC_MESSAGES/mutter.mo
+share/locale/tr/LC_MESSAGES/mutter.mo
+share/locale/uk/LC_MESSAGES/mutter.mo
+share/locale/vi/LC_MESSAGES/mutter.mo
+share/locale/wa/LC_MESSAGES/mutter.mo
+share/locale/xh/LC_MESSAGES/mutter.mo
+share/locale/yo/LC_MESSAGES/mutter.mo
+share/locale/zh_CN/LC_MESSAGES/mutter.mo
+share/locale/zh_HK/LC_MESSAGES/mutter.mo
+share/locale/zh_TW/LC_MESSAGES/mutter.mo
+%%DATADIR%%/icons/mutter-window-demo.png
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
+@dirrmtry lib/girepository-1.0
+@dirrm lib/mutter/plugins
+@dirrm lib/mutter
+@dirrm include/mutter/mutter-private
+@dirrm include/mutter
+@dirrmtry share/applications
+@dirrmtry share/gir-1.0
+@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
+@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/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/Makefile b/x11/Makefile
index 0ce01c23b462..67bed4226b5c 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -97,6 +97,8 @@
SUBDIR += gdkxft
SUBDIR += gdm
SUBDIR += ggiterm
+ SUBDIR += gir-repository-babl
+ SUBDIR += gir-repository-gnome-menus
SUBDIR += glproto
SUBDIR += gmessage
SUBDIR += gmrun
@@ -111,6 +113,7 @@
SUBDIR += gnome-panel-reference
SUBDIR += gnome-screensaver
SUBDIR += gnome-session
+ SUBDIR += gnome-shell
SUBDIR += gnome-swallow
SUBDIR += gnome-terminal
SUBDIR += gnome2
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 9a6e1a7baf58..0d362dad07d7 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11/gdm/Makefile,v 1.8 2009/04/15 23:39:01 kwm Exp $
+# $MCom: ports/x11/gdm/Makefile,v 1.164 2009/11/28 05:59:03 mezz Exp $
#
PORTNAME= gdm
-PORTVERSION= 2.26.1
-PORTREVISION= 7
+PORTVERSION= 2.28.1
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,8 +18,10 @@ COMMENT= GNOME 2 version of xdm display manager
BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity
LIB_DEPENDS= ck-connector.0:${PORTSDIR}/sysutils/consolekit \
+ polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome \
execinfo:${PORTSDIR}/devel/libexecinfo \
- hal.1:${PORTSDIR}/sysutils/hal
+ hal.1:${PORTSDIR}/sysutils/hal \
+ canberra-gtk.0:${PORTSDIR}/audio/libcanberra
RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \
${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \
gnome-session:${PORTSDIR}/x11/gnome-session
@@ -35,8 +37,8 @@ INSTALLS_ICONS= yes
USE_RC_SUBR= gdm
USE_GNOME_SUBR= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
- gnomeprefix gnomepanel
+USE_GNOME= gnomehack intlhack gnomehier gconf2 libglade2 librsvg2 \
+ gnomedocutils gnomeprefix gnomepanel
GCONF_SCHEMAS= gdm-simple-greeter.schemas
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home
@@ -81,6 +83,8 @@ post-patch:
${WRKSRC}/data/session-setup.entries
@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
${WRKSRC}/configure ${WRKSRC}/daemon/*.c ${WRKSRC}/po/*.po
+ @${REINPLACE_CMD} -e 's|/usr/lib|${LOCALBASE}/lib|g' \
+ ${WRKSRC}/data/greeter-autostart/*.desktop.in*
post-install:
${INSTALL_DATA} ${WRKSRC}/data/gconf.path \
@@ -94,7 +98,6 @@ post-install:
${PREFIX}/etc/gdm/custom.conf.default
${MKDIR} ${PREFIX}/share/xsessions
${INSTALL_DATA} ${WRKDIR}/gdm.pam ${PREFIX}/etc/pam.d/gdm
- @${MKDIR} ${PREFIX}/etc/gdm/Sessions
@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
@${CAT} ${PKGMESSAGE}
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index e0eb9e84b26e..c2b797f0de19 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.26.1.tar.bz2) = c2c15f8b741962f278fa7e790aaa9a2b
-SHA256 (gnome2/gdm-2.26.1.tar.bz2) = 34abc69bdfd1b6bb6d1f64dd1e34652c61310dc69305712d7aeec6203678fa4c
-SIZE (gnome2/gdm-2.26.1.tar.bz2) = 2526832
+MD5 (gnome2/gdm-2.28.1.tar.bz2) = 917dc80f5ef6adcdc15193de238476db
+SHA256 (gnome2/gdm-2.28.1.tar.bz2) = da77a6fd9d4cc76b68dd4354839f953f8df5fb7921c7777b80256916533a3e7a
+SIZE (gnome2/gdm-2.28.1.tar.bz2) = 2332716
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index a6a0a8d70eec..7190a891e9ac 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
#!/bin/sh
# $FreeBSD$
-# $MCom$
+# $MCom: ports/x11/gdm/files/gdm.in,v 1.38 2009/09/26 13:42:01 marcus Exp $
# PROVIDE: gdm
# REQUIRE: LOGIN cleanvar moused syscons dbus hald
diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in
index 014d6c8151e9..1f16ea8e8ca2 100644
--- a/x11/gdm/files/gdm.pam.in
+++ b/x11/gdm/files/gdm.pam.in
@@ -1,6 +1,6 @@
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/x11/gdm/files/gdm.pam.in,v 1.8 2009/09/26 13:42:01 marcus Exp $
#
# PAM configuration for the "gdm" service
#
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
index baa14aa863dd..220aa1cb6ac2 100644
--- a/x11/gdm/files/patch-configure
+++ b/x11/gdm/files/patch-configure
@@ -1,68 +1,137 @@
---- configure.orig 2009-05-02 22:45:53.000000000 -0400
-+++ configure 2009-05-02 22:47:16.000000000 -0400
-@@ -19163,15 +19163,18 @@ if test -n "$DAEMON_CFLAGS"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
+--- configure.orig 2009-09-22 12:26:34.000000000 +0200
++++ configure 2009-09-22 12:29:51.000000000 +0200
+@@ -22494,10 +22494,12 @@
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= \$GLIB_REQUIRED_VERSION
+ gio-2.0 >= \$GLIB_REQUIRED_VERSION
+ hal
\"") >&5
($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -22519,10 +22521,12 @@
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= \$GLIB_REQUIRED_VERSION
+ gio-2.0 >= \$GLIB_REQUIRED_VERSION
++ hal
+ \"") >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
++ hal
+ ") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -22530,6 +22534,7 @@
+ pkg_cv_COMMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
++ hal
+ " 2>/dev/null`
+ else
+ pkg_failed=yes
+@@ -22551,11 +22556,13 @@
+ COMMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
++ hal
+ " 2>&1`
+ else
+ COMMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
++ hal
+ " 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+@@ -22564,6 +22571,7 @@
+ { { echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
++ hal
+ ) were not met:
+
+ $COMMON_PKG_ERRORS
+@@ -22578,6 +22586,7 @@
+ echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
++ hal
+ ) were not met:
+
+ $COMMON_PKG_ERRORS
+@@ -22634,10 +22643,12 @@
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= \$GLIB_REQUIRED_VERSION
+ gio-2.0 >= \$GLIB_REQUIRED_VERSION
++ hal
+ \"") >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
++ hal
+ ") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -22645,6 +22656,7 @@
pkg_cv_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
" 2>/dev/null`
else
pkg_failed=yes
-@@ -19185,15 +19188,18 @@ if test -n "$DAEMON_LIBS"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
+@@ -22659,10 +22671,12 @@
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= \$GLIB_REQUIRED_VERSION
+ gio-2.0 >= \$GLIB_REQUIRED_VERSION
+ hal
\"") >&5
($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -22670,6 +22684,7 @@
pkg_cv_DAEMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
" 2>/dev/null`
else
pkg_failed=yes
-@@ -19214,10 +19220,12 @@ fi
- if test $_pkg_short_errors_supported = yes; then
+@@ -22691,11 +22706,13 @@
DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
" 2>&1`
else
DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
-@@ -19225,6 +19233,7 @@ fi
-
- { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+@@ -22704,6 +22721,7 @@
+ { { echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
) were not met:
$DAEMON_PKG_ERRORS
-@@ -19238,6 +19247,7 @@ See the pkg-config man page for more det
- " >&5
- $as_echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+@@ -22718,6 +22736,7 @@
+ echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
) were not met:
diff --git a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
index 63fb5db1c176..692c275167b8 100644
--- a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
+++ b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
@@ -1,5 +1,5 @@
---- daemon/gdm-xdmcp-display-factory.c.orig 2009-03-16 16:12:08.000000000 -0400
-+++ daemon/gdm-xdmcp-display-factory.c 2009-05-16 18:17:26.000000000 -0400
+--- daemon/gdm-xdmcp-display-factory.c.orig 2009-07-20 03:09:09.000000000 +0200
++++ daemon/gdm-xdmcp-display-factory.c 2009-07-20 09:54:25.000000000 +0200
@@ -35,6 +35,7 @@
#include <netdb.h>
#include <arpa/inet.h>
@@ -46,7 +46,7 @@
if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) {
g_warning ("bind: %s", g_strerror (errno));
close (sock);
-@@ -833,7 +849,7 @@ gdm_xdmcp_send_willing (GdmXdmcpDisplayF
+@@ -835,7 +851,7 @@ gdm_xdmcp_send_willing (GdmXdmcpDisplayF
XdmcpFlush (factory->priv->socket_fd,
&factory->priv->buf,
(XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
@@ -55,7 +55,7 @@
g_free (status.data);
}
-@@ -877,7 +893,7 @@ gdm_xdmcp_send_unwilling (GdmXdmcpDispla
+@@ -879,7 +895,7 @@ gdm_xdmcp_send_unwilling (GdmXdmcpDispla
XdmcpFlush (factory->priv->socket_fd,
&factory->priv->buf,
(XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
@@ -64,7 +64,7 @@
last_time = time (NULL);
}
-@@ -986,7 +1002,7 @@ gdm_xdmcp_send_forward_query (GdmXdmcpDi
+@@ -988,7 +1004,7 @@ gdm_xdmcp_send_forward_query (GdmXdmcpDi
XdmcpFlush (factory->priv->socket_fd,
&factory->priv->buf,
(XdmcpNetaddr)gdm_address_peek_sockaddr_storage (ic->chosen_address),
@@ -73,7 +73,7 @@
g_free (port.data);
g_free (addr.data);
-@@ -1689,7 +1705,7 @@ gdm_xdmcp_really_send_managed_forward (G
+@@ -1691,7 +1707,7 @@ gdm_xdmcp_really_send_managed_forward (G
XdmcpFlush (factory->priv->socket_fd,
&factory->priv->buf,
(XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
@@ -82,7 +82,7 @@
g_free (addr.data);
}
-@@ -1770,7 +1786,7 @@ gdm_xdmcp_send_got_managed_forward (GdmX
+@@ -1772,7 +1788,7 @@ gdm_xdmcp_send_got_managed_forward (GdmX
XdmcpFlush (factory->priv->socket_fd,
&factory->priv->buf,
(XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
@@ -91,7 +91,7 @@
}
static gboolean
-@@ -1943,7 +1959,7 @@ gdm_xdmcp_send_decline (GdmXdmcpDisplayF
+@@ -1945,7 +1961,7 @@ gdm_xdmcp_send_decline (GdmXdmcpDisplayF
XdmcpFlush (factory->priv->socket_fd,
&factory->priv->buf,
(XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
@@ -100,7 +100,7 @@
/* Send MANAGED_FORWARD to indicate that the connection
* reached some sort of resolution */
-@@ -2091,7 +2107,7 @@ gdm_xdmcp_send_accept (GdmXdmcpDisplayFa
+@@ -2093,7 +2109,7 @@ gdm_xdmcp_send_accept (GdmXdmcpDisplayFa
XdmcpFlush (factory->priv->socket_fd,
&factory->priv->buf,
(XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
@@ -109,25 +109,7 @@
host = NULL;
gdm_address_get_numeric_info (address, &host, NULL);
-@@ -2309,8 +2325,6 @@ gdm_xdmcp_handle_request (GdmXdmcpDispla
- authorization_data.data = (CARD8 *) cookie->data;
- authorization_data.length = cookie->len;
-
-- g_array_free (cookie, TRUE);
--
- /* the addrs are NOT copied */
- gdm_xdmcp_send_accept (factory,
- address,
-@@ -2319,6 +2333,8 @@ gdm_xdmcp_handle_request (GdmXdmcpDispla
- &authentication_data,
- &authorization_name,
- &authorization_data);
-+
-+ g_array_free (cookie, TRUE);
- }
- }
- } else {
-@@ -2422,7 +2438,7 @@ gdm_xdmcp_send_failed (GdmXdmcpDisplayFa
+@@ -2424,7 +2440,7 @@ gdm_xdmcp_send_failed (GdmXdmcpDisplayFa
XdmcpFlush (factory->priv->socket_fd,
&factory->priv->buf,
(XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
@@ -136,7 +118,7 @@
}
static void
-@@ -2446,7 +2462,7 @@ gdm_xdmcp_send_refuse (GdmXdmcpDisplayFa
+@@ -2448,7 +2464,7 @@ gdm_xdmcp_send_refuse (GdmXdmcpDisplayFa
XdmcpFlush (factory->priv->socket_fd,
&factory->priv->buf,
(XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
@@ -145,7 +127,7 @@
/*
* This was from a forwarded query quite apparently so
-@@ -2717,7 +2733,7 @@ gdm_xdmcp_send_alive (GdmXdmcpDisplayFac
+@@ -2719,7 +2735,7 @@ gdm_xdmcp_send_alive (GdmXdmcpDisplayFac
XdmcpFlush (factory->priv->socket_fd,
&factory->priv->buf,
(XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address),
diff --git a/x11/gdm/files/patch-daemon_gdm-display-access-file.c b/x11/gdm/files/patch-daemon_gdm-display-access-file.c
deleted file mode 100644
index 0f54784eca16..000000000000
--- a/x11/gdm/files/patch-daemon_gdm-display-access-file.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- daemon/gdm-display-access-file.c.orig 2009-04-16 01:32:41.000000000 +0200
-+++ daemon/gdm-display-access-file.c 2009-04-16 01:33:17.000000000 +0200
-@@ -41,6 +41,9 @@
- #include "gdm-display-access-file.h"
- #include "gdm-common.h"
-
-+/* OpenBSD defines 255, glibc defines 64. */
-+#define HOST_NAME_MAX 64
-+
- struct _GdmDisplayAccessFilePrivate
- {
- char *username;
diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c
index 0c56d5da4419..362a116eaa79 100644
--- a/x11/gdm/files/patch-daemon_gdm-session-worker.c
+++ b/x11/gdm/files/patch-daemon_gdm-session-worker.c
@@ -1,5 +1,5 @@
---- daemon/gdm-session-worker.c.orig 2009-04-14 10:01:14.000000000 -0400
-+++ daemon/gdm-session-worker.c 2009-05-31 15:52:10.000000000 -0400
+--- daemon/gdm-session-worker.c.orig 2009-09-21 22:05:27.000000000 +0200
++++ daemon/gdm-session-worker.c 2009-09-22 12:33:59.000000000 +0200
@@ -31,6 +31,9 @@
#include <errno.h>
#include <grp.h>
@@ -8,9 +8,9 @@
+#include <login_cap.h>
+#endif
- #include <security/pam_appl.h>
-
-@@ -332,7 +335,7 @@ gdm_session_execute (const char *file,
+ #ifdef HAVE_LOGINDEVPERM
+ #include <libdevinfo.h>
+@@ -340,7 +343,7 @@ gdm_session_execute (const char *file,
* what to search if PATH is unset. POSIX may, dunno.
*/
@@ -19,8 +19,8 @@
}
len = strlen (file) + 1;
-@@ -1757,11 +1760,12 @@ gdm_session_worker_start_user_session (G
- char **environment;
+@@ -1995,15 +1998,16 @@ gdm_session_worker_start_user_session (G
+ char *cachedirname;
char *home_dir;
int fd;
+#ifdef HAVE_LOGINCAP
@@ -28,6 +28,10 @@
+ struct passwd *pwent = getpwnam (login);
+#endif
+ /* Make sure cachedir gets created before we drop to user */
+ cachedirname = gdm_session_worker_create_cachedir (worker);
+ g_free (cachedirname);
+
- if (setuid (worker->priv->uid) < 0) {
- g_debug ("GdmSessionWorker: could not reset uid - %s", g_strerror (errno));
- _exit (1);
@@ -36,7 +40,7 @@
if (setsid () < 0) {
g_debug ("GdmSessionWorker: could not set pid '%u' as leader of new session and process group - %s",
-@@ -1769,6 +1773,28 @@ gdm_session_worker_start_user_session (G
+@@ -2011,6 +2015,28 @@ gdm_session_worker_start_user_session (G
_exit (2);
}
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-greeter-login-window.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-greeter-login-window.c
new file mode 100644
index 000000000000..55f6d7ec8bd2
--- /dev/null
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-greeter-login-window.c
@@ -0,0 +1,155 @@
+--- gui/simple-greeter/gdm-greeter-login-window.c.orig 2009-10-24 20:05:24.000000000 -0400
++++ gui/simple-greeter/gdm-greeter-login-window.c 2009-10-24 20:11:02.000000000 -0400
+@@ -56,10 +56,6 @@
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+-#ifdef HAVE_DEVICEKIT_POWER
+-#include <devkit-power-gobject/devicekit-power.h>
+-#endif
+-
+ #include "gdm-settings-client.h"
+ #include "gdm-settings-keys.h"
+ #include "gdm-profile.h"
+@@ -83,6 +79,10 @@
+ #define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat"
+ #define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
+
++#define GPM_DBUS_NAME "org.freedesktop.PowerManagement"
++#define GPM_DBUS_PATH "/org/freedesktop/PowerManagement"
++#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement"
++
+ #define GLADE_XML_FILE "gdm-greeter-login-window.glade"
+
+ #define KEY_GREETER_DIR "/apps/gdm/simple-greeter"
+@@ -477,22 +477,46 @@ adjust_other_login_visibility(GdmGreeter
+ }
+ }
+
+-#ifdef HAVE_DEVICEKIT_POWER
+ static gboolean
+ can_suspend (GdmGreeterLoginWindow *login_window)
+ {
+- gboolean ret;
+- DkpClient *dkp_client;
++ DBusGConnection *connection;
++ DBusGProxy *proxy;
++ GError *error;
++ gboolean ret;
++ gboolean res;
++
++ error = NULL;
++ connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
++ if (error != NULL) {
++ g_warning ("Couldn't connect to power manager: %s", error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++ proxy = dbus_g_proxy_new_for_name (connection,
++ GPM_DBUS_NAME,
++ GPM_DBUS_PATH,
++ GPM_DBUS_INTERFACE);
++
++ ret = FALSE;
++
++ res = dbus_g_proxy_call (proxy, "CanSuspend",
++ &error,
++ G_TYPE_INVALID,
++ G_TYPE_BOOLEAN,
++ &ret,
++ G_TYPE_INVALID);
++ if (!res) {
++ if (error != NULL) {
++ g_warning ("Could not ask power manager if user can suspend: %s",
++ error->message);
++ g_error_free (error);
++ }
++ ret = FALSE;
++ }
+
+- /* use DeviceKit-power to get data */
+- dkp_client = dkp_client_new ();
+- g_object_get (dkp_client,
+- "can-suspend", &ret,
+- NULL);
+- g_object_unref (dkp_client);
+- return ret;
++ return ret;
+ }
+-#endif
+
+ static void
+ remove_sensitize_power_buttons_timeout (GdmGreeterLoginWindow *login_window)
+@@ -544,11 +568,7 @@ switch_mode (GdmGreeterLoginWindow *logi
+
+ show_restart_buttons = get_show_restart_buttons (login_window);
+
+-#ifdef HAVE_DEVICEKIT_POWER
+ show_suspend_button = can_suspend (login_window);
+-#else
+- show_suspend_button = FALSE;
+-#endif
+
+ /* we want to run this even if we're supposed to
+ be in the mode already so that we reset everything
+@@ -634,25 +654,39 @@ do_disconnect (GdmGreeterLoginWindow *lo
+ gtk_main_quit ();
+ }
+
+-#ifdef HAVE_DEVICEKIT_POWER
+ static void
+ do_suspend (GdmGreeterLoginWindow *login_window)
+ {
+- gboolean ret;
+- DkpClient *dkp_client;
+- GError *error = NULL;
+-
+- /* use DeviceKit-power to get data */
+- dkp_client = dkp_client_new ();
+- ret = dkp_client_suspend (dkp_client, &error);
+- if (!ret) {
++ GError *error;
++ DBusGConnection *connection;
++ DBusGProxy *proxy;
++
++ g_debug ("GdmGreeterLoginWindow: Suspend button clicked");
++
++ error = NULL;
++ connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
++ if (error != NULL) {
+ g_warning ("Couldn't suspend: %s", error->message);
+ g_error_free (error);
+ return;
+ }
+- g_object_unref (dkp_client);
++ proxy = dbus_g_proxy_new_for_name (connection,
++ GPM_DBUS_NAME,
++ GPM_DBUS_PATH,
++ GPM_DBUS_INTERFACE);
++ error = NULL;
++ dbus_g_proxy_call (proxy,
++ "Suspend",
++ &error,
++ G_TYPE_INVALID,
++ G_TYPE_INVALID);
++ if (error != NULL) {
++ g_warning ("Couldn't suspend: %s", error->message);
++ g_error_free (error);
++ return;
++ }
++ g_object_unref (proxy);
+ }
+-#endif
+
+ static void
+ delete_entry_text (GtkWidget *entry)
+@@ -971,9 +1005,7 @@ static void
+ suspend_button_clicked (GtkButton *button,
+ GdmGreeterLoginWindow *login_window)
+ {
+-#ifdef HAVE_DEVICEKIT_POWER
+ do_suspend (login_window);
+-#endif
+ }
+
+
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
index 9116dc917a64..675925aa926b 100644
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
@@ -1,5 +1,5 @@
---- gui/simple-greeter/gdm-languages.c.orig 2008-11-22 17:16:42.000000000 -0500
-+++ gui/simple-greeter/gdm-languages.c 2008-11-22 17:29:05.000000000 -0500
+--- gui/simple-greeter/gdm-languages.c.orig 2009-07-20 03:09:09.000000000 +0200
++++ gui/simple-greeter/gdm-languages.c 2009-07-20 10:02:41.000000000 +0200
@@ -168,13 +168,13 @@ gdm_parse_language_name (const char *nam
*codesetp = NULL;
}
@@ -16,7 +16,16 @@
}
if (modifierp != NULL) {
-@@ -353,7 +353,7 @@ add_locale (const char *language_name)
+@@ -314,7 +314,7 @@ language_name_has_translations (const ch
+ const char *name;
+ gboolean has_translations;
+
+- path = g_build_filename (GNOMELOCALEDIR, language_name, "LC_MESSAGES", NULL);
++ path = g_build_filename ("/usr/share/locale", language_name, "LC_MESSAGES", NULL);
+
+ has_translations = FALSE;
+ dir = g_dir_open (path, 0, NULL);
+@@ -352,7 +352,7 @@ add_locale (const char *language_name)
if (language_name_is_utf8 (language_name)) {
name = g_strdup (language_name);
} else {
@@ -25,20 +34,11 @@
if (!language_name_is_utf8 (name)) {
g_free (name);
-@@ -482,7 +482,7 @@ select_dirs (const struct dirent *dirent
- struct stat st;
- char *path;
-
-- path = g_build_filename (GNOMELOCALEDIR, dirent->d_name, NULL);
-+ path = g_build_filename ("/usr/share/locale", dirent->d_name, NULL);
- if (g_stat (path, &st) == 0) {
- mode = st.st_mode;
- }
-@@ -502,7 +502,7 @@ collect_locales_from_directory (void)
+@@ -501,7 +501,7 @@ collect_locales_from_directory (void)
int ndirents;
int cnt;
-- ndirents = scandir (GNOMELOCALEDIR, &dirents, select_dirs, alphasort);
+- ndirents = scandir (LIBLOCALEDIR, &dirents, select_dirs, alphasort);
+ ndirents = scandir ("/usr/share/locale", &dirents, select_dirs, alphasort);
for (cnt = 0; cnt < ndirents; ++cnt) {
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
index d666bc1fd826..d0a5d73f5e47 100644
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
@@ -1,12 +1,20 @@
---- gui/simple-greeter/gdm-user-manager.c.orig 2008-04-29 13:38:43.000000000 -0400
-+++ gui/simple-greeter/gdm-user-manager.c 2008-05-03 13:27:52.000000000 -0400
-@@ -1269,17 +1269,23 @@ reload_passwd (GdmUserManager *manager)
- GSList *old_users;
+--- gui/simple-greeter/gdm-user-manager.c.orig 2009-09-21 16:05:27.000000000 -0400
++++ gui/simple-greeter/gdm-user-manager.c 2009-10-14 12:58:37.000000000 -0400
+@@ -65,6 +65,8 @@
+
+ #ifdef __sun
+ #define DEFAULT_MINIMAL_UID 100
++#elif defined(__FreeBSD__)
++#define DEFAULT_MINIMAL_UID 1000
+ #else
+ #define DEFAULT_MINIMAL_UID 500
+ #endif
+@@ -1366,17 +1368,24 @@ reload_passwd (GdmUserManager *manager)
GSList *new_users;
GSList *list;
-- FILE *fp;
+ GSList *dup;
+#ifndef __FreeBSD__
-+ FILE *fp;
+ FILE *fp;
+#endif
old_users = NULL;
@@ -15,6 +23,7 @@
+#ifdef __FreeBSD__
+ setpwent ();
+#else
++
errno = 0;
fp = fopen (PATH_PASSWD, "r");
if (fp == NULL) {
@@ -25,7 +34,7 @@
g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users);
g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
-@@ -1292,7 +1298,11 @@ reload_passwd (GdmUserManager *manager)
+@@ -1390,7 +1399,11 @@ reload_passwd (GdmUserManager *manager)
}
}
@@ -37,7 +46,7 @@
GdmUser *user;
user = NULL;
-@@ -1355,7 +1365,11 @@ reload_passwd (GdmUserManager *manager)
+@@ -1461,7 +1474,11 @@ reload_passwd (GdmUserManager *manager)
out:
/* Cleanup */
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c
index 049b75b42036..fae89ec079d8 100644
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c
@@ -1,14 +1,14 @@
---- gui/simple-greeter/gdm-user.c.orig 2009-05-16 17:52:57.000000000 -0400
-+++ gui/simple-greeter/gdm-user.c 2009-05-16 18:08:08.000000000 -0400
-@@ -412,6 +412,7 @@ _gdm_user_update (GdmUser *u
+--- gui/simple-greeter/gdm-user.c.orig 2009-07-20 03:09:09.000000000 +0200
++++ gui/simple-greeter/gdm-user.c 2009-07-20 10:09:41.000000000 +0200
+@@ -427,6 +427,7 @@ _gdm_user_update (GdmUser *u
/* Display Name */
if (pwent->pw_gecos && pwent->pw_gecos[0] != '\0') {
gchar *first_comma;
+ gchar *ampersand;
+ gchar *real_name_utf8;
- first_comma = strchr (pwent->pw_gecos, ',');
- if (first_comma) {
-@@ -425,6 +426,23 @@ _gdm_user_update (GdmUser *u
+ real_name_utf8 = g_locale_to_utf8 (pwent->pw_gecos, -1, NULL, NULL, NULL);
+@@ -443,6 +444,23 @@ _gdm_user_update (GdmUser *u
g_free (real_name);
real_name = NULL;
}
diff --git a/x11/gdm/files/patch-hal-keyboard b/x11/gdm/files/patch-hal-keyboard
index a712f04a128a..904f1cdaccaa 100644
--- a/x11/gdm/files/patch-hal-keyboard
+++ b/x11/gdm/files/patch-hal-keyboard
@@ -1,6 +1,5 @@
-diff -up gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard gdm-2.25.2/daemon/gdm-session-direct.c
---- daemon/gdm-session-direct.c.system-keyboard 2008-08-26 15:04:00.000000000 -0400
-+++ daemon/gdm-session-direct.c 2009-02-24 22:55:02.656566009 -0500
+--- daemon/gdm-session-direct.c.orig 2009-07-20 03:09:09.000000000 +0200
++++ daemon/gdm-session-direct.c 2009-07-20 10:14:45.000000000 +0200
@@ -45,6 +45,8 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
@@ -10,7 +9,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard gdm-2.25.2/daemo
#include "gdm-session-direct.h"
#include "gdm-session.h"
#include "gdm-session-private.h"
-@@ -595,14 +597,66 @@ get_default_language_name (GdmSessionDir
+@@ -597,14 +599,66 @@ get_default_language_name (GdmSessionDir
return setlocale (LC_MESSAGES, NULL);
}
@@ -80,23 +79,19 @@ diff -up gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard gdm-2.25.2/daemo
}
static char *
-@@ -1971,9 +2025,10 @@ setup_session_environment (GdmSessionDir
+@@ -1953,8 +2007,8 @@ setup_session_environment (GdmSessionDir
"GDM_LANG",
get_language_name (session));
-- gdm_session_direct_set_environment_variable (session,
-- "GDM_KEYBOARD_LAYOUT",
-- get_layout_name (session));
-+ if (g_strcmp0 (get_layout_name (session), get_system_default_layout (session)) != 0)
-+ gdm_session_direct_set_environment_variable (session,
-+ "GDM_KEYBOARD_LAYOUT",
-+ get_layout_name (session));
-
- gdm_session_direct_set_environment_variable (session,
- "DISPLAY",
-diff -up gdm-2.25.2/daemon/gdm-session-settings.c.system-keyboard gdm-2.25.2/daemon/gdm-session-settings.c
---- daemon/gdm-session-settings.c.system-keyboard 2008-08-26 15:04:00.000000000 -0400
-+++ daemon/gdm-session-settings.c 2009-02-24 22:51:00.158815919 -0500
+- if (strcmp (get_layout_name (session),
+- get_default_layout_name (session)) == 0) {
++ if (g_strcmp0 (get_layout_name (session),
++ get_default_layout_name (session)) != 0) {
+ gdm_session_direct_set_environment_variable (session,
+ "GDM_KEYBOARD_LAYOUT",
+ get_layout_name (session));
+--- daemon/gdm-session-settings.c.orig 2009-05-19 17:18:12.000000000 +0200
++++ daemon/gdm-session-settings.c 2009-07-20 10:10:15.000000000 +0200
@@ -149,8 +149,7 @@ gdm_session_settings_set_layout_name (Gd
{
g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings));
diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install
index 4adf27abbb43..97ae6b4832be 100644
--- a/x11/gdm/pkg-install
+++ b/x11/gdm/pkg-install
@@ -17,6 +17,9 @@ POST-INSTALL)
${MKDIR} -p /var/run/gdm
${CHOWN} root:${GROUP} /var/run/gdm
${CHMOD} 1777 /var/run/gdm
+ ${MKDIR} -p /var/cache/gdm
+ ${CHMOD} 1755 /var/cache/gdm
+ ${CHOWN} root:${GROUP} /var/cache/gdm
${CHOWN} root:wheel ${PKG_PREFIX}/share/gdm
${CHMOD} 0755 ${PKG_PREFIX}/share/gdm
${MKDIR} -p ${PKG_PREFIX}/etc/gdm/home
@@ -29,6 +32,7 @@ POST-INSTALL)
${CHMOD} 1750 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
${CHMOD} 1640 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory/*.xml
+ ${MKDIR} -p ${PKG_PREFIX}/etc/gdm/Sessions
${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions
exit 0
;;
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index cfe404abd8bd..95025aa6c2aa 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -35,6 +35,7 @@ sbin/gdm-stop
%%DATADIR%%/autostart/LoginWindow/gok.desktop
%%DATADIR%%/autostart/LoginWindow/metacity.desktop
%%DATADIR%%/autostart/LoginWindow/orca-screen-reader.desktop
+%%DATADIR%%/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop
%%DATADIR%%/gconf.path
%%DATADIR%%/gdb-cmd
%%DATADIR%%/gdm-greeter-login-window.glade
@@ -43,6 +44,7 @@ share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
share/gnome/help/gdm/C/gdm.xml
share/gnome/help/gdm/C/legal.xml
share/gnome/help/gdm/de/gdm.xml
+share/gnome/help/gdm/el/gdm.xml
share/gnome/help/gdm/en_GB/gdm.xml
share/gnome/help/gdm/es/gdm.xml
share/gnome/help/gdm/fr/gdm.xml
@@ -66,8 +68,10 @@ 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/br/LC_MESSAGES/gdm.mo
share/locale/bs/LC_MESSAGES/gdm.mo
share/locale/ca/LC_MESSAGES/gdm.mo
+share/locale/ca@valencia/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
@@ -77,6 +81,7 @@ share/locale/dz/LC_MESSAGES/gdm.mo
share/locale/el/LC_MESSAGES/gdm.mo
share/locale/en_CA/LC_MESSAGES/gdm.mo
share/locale/en_GB/LC_MESSAGES/gdm.mo
+share/locale/eo/LC_MESSAGES/gdm.mo
share/locale/es/LC_MESSAGES/gdm.mo
share/locale/et/LC_MESSAGES/gdm.mo
share/locale/eu/LC_MESSAGES/gdm.mo
@@ -97,6 +102,7 @@ share/locale/is/LC_MESSAGES/gdm.mo
share/locale/it/LC_MESSAGES/gdm.mo
share/locale/ja/LC_MESSAGES/gdm.mo
share/locale/ka/LC_MESSAGES/gdm.mo
+share/locale/kk/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
@@ -148,6 +154,7 @@ 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-el.omf
share/omf/gdm/gdm-en_GB.omf
share/omf/gdm/gdm-es.omf
share/omf/gdm/gdm-fr.omf
@@ -200,6 +207,7 @@ share/pixmaps/nohost.png
@dirrm share/gnome/help/gdm/fr
@dirrm share/gnome/help/gdm/es
@dirrm share/gnome/help/gdm/en_GB
+@dirrm share/gnome/help/gdm/el
@dirrm share/gnome/help/gdm/de
@dirrm share/gnome/help/gdm/C
@dirrm share/gnome/help/gdm
@@ -222,6 +230,8 @@ share/pixmaps/nohost.png
@unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
@unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true
@unexec /bin/rm -rf /var/run/gdm 2>/dev/null || /usr/bin/true
+@unexec rmdir /var/cache/gdm 2>/dev/null || /usr/bin/true
+@unexec rmdir /var/cache 2>/dev/null || /usr/bin/true
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -256,6 +266,8 @@ share/pixmaps/nohost.png
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
@dirrmtry share/locale/fur/LC_MESSAGES
@@ -264,6 +276,8 @@ share/pixmaps/nohost.png
@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
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/x11/gir-repository-babl/Makefile b/x11/gir-repository-babl/Makefile
new file mode 100644
index 000000000000..8836d904e355
--- /dev/null
+++ b/x11/gir-repository-babl/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-babl
+# Date created: 12 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/x11/gir-repository-babl/Makefile,v 1.1 2009/09/16 02:05:12 avl Exp $
+#
+
+CATEGORIES= x11
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -babl
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/x11/gir-repository-gnome-menus/Makefile b/x11/gir-repository-gnome-menus/Makefile
new file mode 100644
index 000000000000..5ec5a76ea3c7
--- /dev/null
+++ b/x11/gir-repository-gnome-menus/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-gnome-menus
+# Date created: 12 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/x11/gir-repository-gnome-menus/Makefile,v 1.1 2009/09/16 02:05:13 avl Exp $
+#
+
+CATEGORIES= x11
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -gnome-menus
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index b314dd99b54b..9f9c55d9298c 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-stable/x11/gnome-applets/Makefile,v 1.1 2009/04/13 13:21:01 kwm Exp $
+# $MCom: ports/x11/gnome-applets/Makefile,v 1.208 2009/11/13 06:07:53 avl Exp $
#
PORTNAME= gnome-applets
-PORTVERSION= 2.26.3
+PORTVERSION= 2.28.0
PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
@@ -20,6 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${POR
${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
gweather.1:${PORTSDIR}/net/libgweather \
+ polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \
xklavier.12:${PORTSDIR}/x11/libxklavier \
gucharmap.7:${PORTSDIR}/deskutils/gucharmap
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
@@ -38,7 +39,8 @@ WANT_GNOME= yes
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gstreamer=0.10 \
- --enable-mixer-applet
+ --enable-mixer-applet \
+ --disable-networkmanager
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 ba9c348376bd..f01328d71b07 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.26.3.tar.bz2) = 23fb47b3e35ef2136d6ade3f0203328b
-SHA256 (gnome2/gnome-applets-2.26.3.tar.bz2) = f6e93d98cbb45f15fff605966eca5e4172cd4404509d612b03da748b9e2e0ee5
-SIZE (gnome2/gnome-applets-2.26.3.tar.bz2) = 9544328
+MD5 (gnome2/gnome-applets-2.28.0.tar.bz2) = 9eb00e9dc468d2c5c71b70c9fb2b751c
+SHA256 (gnome2/gnome-applets-2.28.0.tar.bz2) = 73aa1d5b9636ea3293d206986115473f30581dd4a937267873573880eb1bec7b
+SIZE (gnome2/gnome-applets-2.28.0.tar.bz2) = 9599635
diff --git a/x11/gnome-applets/files/patch-stickynotes_stickynotes.ui b/x11/gnome-applets/files/patch-stickynotes_stickynotes.ui
new file mode 100644
index 000000000000..8323a6dd33cf
--- /dev/null
+++ b/x11/gnome-applets/files/patch-stickynotes_stickynotes.ui
@@ -0,0 +1,20 @@
+--- stickynotes/stickynotes.ui.orig 2009-11-13 13:13:28.000000000 +0800
++++ stickynotes/stickynotes.ui 2009-11-13 13:15:23.000000000 +0800
+@@ -593,7 +593,7 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkVBox" id="vbox1">
++ <object class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+@@ -613,7 +613,7 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkLabel" id="label1">
++ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">This cannot be undone.</property>
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index ba3ff7ededfd..137dd52e013c 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -61,7 +61,6 @@ libexec/multiload-applet-2
libexec/null_applet
libexec/stickynotes_applet
libexec/trashapplet
-%%CPUFREQ%%share/PolicyKit/policy/org.gnome.cpufreqselector.policy
%%CPUFREQ%%share/dbus-1/system-services/org.gnome.CPUFreqSelector.service
share/gnome-2.0/ui/GNOME_AccessxApplet.xml
%%BATTERY%%share/gnome-2.0/ui/GNOME_BattstatApplet.xml
@@ -340,6 +339,18 @@ share/gnome/help/accessx-status/zh_CN/figures/accessx_sticky-windows-key.png
%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-credits-hal.png
%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-preferences.png
%%BATTERY%%share/gnome/help/battstat/bg/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/ca/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/ca/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/ca/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/ca/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/ca/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/ca/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/cs/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/cs/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/cs/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/cs/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/cs/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/cs/figures/context-menu.png
%%BATTERY%%share/gnome/help/battstat/de/battstat.xml
%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet-expanded.png
%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet.png
@@ -418,6 +429,12 @@ share/gnome/help/accessx-status/zh_CN/figures/accessx_sticky-windows-key.png
%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-credits-hal.png
%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-preferences.png
%%BATTERY%%share/gnome/help/battstat/uk/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/context-menu.png
share/gnome/help/char-palette/C/char-palette.xml
share/gnome/help/char-palette/C/figures/charpalette_applet.png
share/gnome/help/char-palette/C/figures/charpalette_chargroup.png
@@ -524,6 +541,10 @@ share/gnome/help/char-palette/zh_CN/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/ca/command-line.xml
+%%COMMANDER%%share/gnome/help/command-line/ca/figures/command-line.png
+%%COMMANDER%%share/gnome/help/command-line/ca/figures/prefs-macros.png
+%%COMMANDER%%share/gnome/help/command-line/ca/figures/prefs.png
%%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
@@ -673,6 +694,16 @@ share/gnome/help/char-palette/zh_CN/figures/charpick_characters.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-selector-both.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-selector.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/hu/figures/cpufreq-applet.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/cpufreq-applet.xml
%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-100.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-25.png
@@ -743,6 +774,26 @@ share/gnome/help/char-palette/zh_CN/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
@@ -750,6 +801,12 @@ share/gnome/help/drivemount/C/figures/drivemount-applet_mount.png
share/gnome/help/drivemount/C/figures/drivemount-applet_open.png
share/gnome/help/drivemount/C/figures/drivemount-applet_status.png
share/gnome/help/drivemount/C/legal.xml
+share/gnome/help/drivemount/ca/drivemount.xml
+share/gnome/help/drivemount/ca/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/ca/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/ca/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/ca/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/ca/figures/drivemount-applet_status.png
share/gnome/help/drivemount/cs/drivemount.xml
share/gnome/help/drivemount/cs/figures/drivemount-applet_eject.png
share/gnome/help/drivemount/cs/figures/drivemount-applet_example.png
@@ -917,6 +974,21 @@ share/gnome/help/gweather/C/figures/stock_weather-storm.png
share/gnome/help/gweather/C/figures/stock_weather-sunny.png
share/gnome/help/gweather/C/gweather.xml
share/gnome/help/gweather/C/legal.xml
+share/gnome/help/gweather/ar/figures/gweather-details.png
+share/gnome/help/gweather/ar/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/ar/figures/gweather-prefs-general.png
+share/gnome/help/gweather/ar/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/ar/figures/gweather_applet.png
+share/gnome/help/gweather/ar/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/ar/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/ar/figures/stock_weather-fog.png
+share/gnome/help/gweather/ar/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/ar/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/ar/figures/stock_weather-showers.png
+share/gnome/help/gweather/ar/figures/stock_weather-snow.png
+share/gnome/help/gweather/ar/figures/stock_weather-storm.png
+share/gnome/help/gweather/ar/figures/stock_weather-sunny.png
+share/gnome/help/gweather/ar/gweather.xml
share/gnome/help/gweather/ca/figures/gweather-details.png
share/gnome/help/gweather/ca/figures/gweather-menu-prefs.png
share/gnome/help/gweather/ca/figures/gweather-prefs-general.png
@@ -1189,6 +1261,7 @@ 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/ca/invest-applet.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
@@ -1247,6 +1320,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/cs/figures/multiload-preferences.png
+share/gnome/help/multiload/cs/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/cs/figures/system_monitor.png
+share/gnome/help/multiload/cs/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
@@ -1410,6 +1487,12 @@ share/gnome/help/stickynotes_applet/uk/figures/stickynotes-note-prefs.png
share/gnome/help/stickynotes_applet/uk/figures/stickynotes-prefs.png
share/gnome/help/stickynotes_applet/uk/figures/stickynotes_applet.png
share/gnome/help/stickynotes_applet/uk/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/zh_CN/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/zh_CN/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/zh_CN/stickynotes_applet.xml
share/gnome/help/trashapplet/C/figures/trash-applet.png
share/gnome/help/trashapplet/C/legal.xml
share/gnome/help/trashapplet/C/trashapplet.xml
@@ -1453,6 +1536,10 @@ share/gnome/help/trashapplet/uk/figures/trash-applet.png
share/gnome/help/trashapplet/uk/trashapplet.xml
share/gnome/help/trashapplet/zh_CN/figures/trash-applet.png
share/gnome/help/trashapplet/zh_CN/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
@@ -1485,8 +1572,10 @@ share/locale/be@latin/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/bn_IN/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/br/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/crh/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1597,6 +1686,8 @@ share/omf/accessx-status/accessx-status-uk.omf
share/omf/accessx-status/accessx-status-zh_CN.omf
%%BATTERY%%share/omf/battstat/battstat-C.omf
%%BATTERY%%share/omf/battstat/battstat-bg.omf
+%%BATTERY%%share/omf/battstat/battstat-ca.omf
+%%BATTERY%%share/omf/battstat/battstat-cs.omf
%%BATTERY%%share/omf/battstat/battstat-de.omf
%%BATTERY%%share/omf/battstat/battstat-el.omf
%%BATTERY%%share/omf/battstat/battstat-en_GB.omf
@@ -1610,6 +1701,7 @@ share/omf/accessx-status/accessx-status-zh_CN.omf
%%BATTERY%%share/omf/battstat/battstat-pt_BR.omf
%%BATTERY%%share/omf/battstat/battstat-sv.omf
%%BATTERY%%share/omf/battstat/battstat-uk.omf
+%%BATTERY%%share/omf/battstat/battstat-zh_CN.omf
share/omf/char-palette/char-palette-C.omf
share/omf/char-palette/char-palette-bg.omf
share/omf/char-palette/char-palette-ca.omf
@@ -1631,6 +1723,7 @@ share/omf/char-palette/char-palette-sv.omf
share/omf/char-palette/char-palette-uk.omf
share/omf/char-palette/char-palette-zh_CN.omf
%%COMMANDER%%share/omf/command-line/command-line-C.omf
+%%COMMANDER%%share/omf/command-line/command-line-ca.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
@@ -1653,6 +1746,7 @@ share/omf/char-palette/char-palette-zh_CN.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-hu.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-nl.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-oc.omf
%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-pt_BR.omf
@@ -1660,7 +1754,10 @@ share/omf/char-palette/char-palette-zh_CN.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-ca.omf
share/omf/drivemount/drivemount-cs.omf
share/omf/drivemount/drivemount-de.omf
share/omf/drivemount/drivemount-el.omf
@@ -1712,6 +1809,7 @@ share/omf/gswitchit/gswitchit-sv.omf
share/omf/gswitchit/gswitchit-uk.omf
share/omf/gswitchit/gswitchit-zh_CN.omf
share/omf/gweather/gweather-C.omf
+share/omf/gweather/gweather-ar.omf
share/omf/gweather/gweather-ca.omf
share/omf/gweather/gweather-cs.omf
share/omf/gweather/gweather-de.omf
@@ -1731,6 +1829,7 @@ 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-ca.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
@@ -1761,6 +1860,7 @@ share/omf/mixer_applet2/mixer_applet2-uk.omf
share/omf/mixer_applet2/mixer_applet2-zh_CN.omf
share/omf/multiload/multiload-C.omf
share/omf/multiload/multiload-ca.omf
+share/omf/multiload/multiload-cs.omf
share/omf/multiload/multiload-de.omf
share/omf/multiload/multiload-el.omf
share/omf/multiload/multiload-en_GB.omf
@@ -1793,6 +1893,7 @@ share/omf/stickynotes_applet/stickynotes_applet-pt_BR.omf
share/omf/stickynotes_applet/stickynotes_applet-ru.omf
share/omf/stickynotes_applet/stickynotes_applet-sv.omf
share/omf/stickynotes_applet/stickynotes_applet-uk.omf
+share/omf/stickynotes_applet/stickynotes_applet-zh_CN.omf
share/omf/trashapplet/trashapplet-C.omf
share/omf/trashapplet/trashapplet-ca.omf
share/omf/trashapplet/trashapplet-cs.omf
@@ -1814,6 +1915,8 @@ share/omf/trashapplet/trashapplet-ru.omf
share/omf/trashapplet/trashapplet-sv.omf
share/omf/trashapplet/trashapplet-uk.omf
share/omf/trashapplet/trashapplet-zh_CN.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
@@ -1860,6 +1963,7 @@ share/pixmaps/stickynotes/locked.png
share/pixmaps/stickynotes/resize_se.png
share/pixmaps/stickynotes/resize_sw.png
share/pixmaps/stickynotes/unlocked.png
+%%CPUFREQ%%share/polkit-1/actions/org.gnome.cpufreqselector.policy
share/xmodmap/base.xml
share/xmodmap/xmodmap.am
share/xmodmap/xmodmap.ar
@@ -1963,6 +2067,10 @@ 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/zh_CN/figures
@dirrm share/gnome/help/trashapplet/zh_CN
@dirrm share/gnome/help/trashapplet/uk/figures
@@ -2006,6 +2114,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/trashapplet/C/figures
@dirrm share/gnome/help/trashapplet/C
@dirrm share/gnome/help/trashapplet
+@dirrm share/gnome/help/stickynotes_applet/zh_CN/figures
+@dirrm share/gnome/help/stickynotes_applet/zh_CN
@dirrm share/gnome/help/stickynotes_applet/uk/figures
@dirrm share/gnome/help/stickynotes_applet/uk
@dirrm share/gnome/help/stickynotes_applet/sv/figures
@@ -2071,6 +2181,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/multiload/el
@dirrm share/gnome/help/multiload/de/figures
@dirrm share/gnome/help/multiload/de
+@dirrm share/gnome/help/multiload/cs/figures
+@dirrm share/gnome/help/multiload/cs
@dirrm share/gnome/help/multiload/ca/figures
@dirrm share/gnome/help/multiload/ca
@dirrm share/gnome/help/multiload/C/figures
@@ -2125,6 +2237,7 @@ share/xmodmap/xmodmap.yu
%%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/ca
%%PYTHON%%@dirrm share/gnome/help/invest-applet/C
%%PYTHON%%@dirrm share/gnome/help/invest-applet
@dirrm share/gnome/help/gweather/zh_CN/figures
@@ -2163,6 +2276,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/gweather/cs
@dirrm share/gnome/help/gweather/ca/figures
@dirrm share/gnome/help/gweather/ca
+@dirrm share/gnome/help/gweather/ar/figures
+@dirrm share/gnome/help/gweather/ar
@dirrm share/gnome/help/gweather/C/figures
@dirrm share/gnome/help/gweather/C
@dirrm share/gnome/help/gweather
@@ -2253,9 +2368,15 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/drivemount/de
@dirrm share/gnome/help/drivemount/cs/figures
@dirrm share/gnome/help/drivemount/cs
+@dirrm share/gnome/help/drivemount/ca/figures
+@dirrm share/gnome/help/drivemount/ca
@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
@@ -2270,6 +2391,8 @@ share/xmodmap/xmodmap.yu
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/oc
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/hu/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/hu
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fi/figures
@@ -2315,6 +2438,8 @@ share/xmodmap/xmodmap.yu
%%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/ca/figures
+%%COMMANDER%%@dirrm share/gnome/help/command-line/ca
%%COMMANDER%%@dirrm share/gnome/help/command-line/C/figures
%%COMMANDER%%@dirrm share/gnome/help/command-line/C
%%COMMANDER%%@dirrm share/gnome/help/command-line
@@ -2359,6 +2484,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/char-palette/C/figures
@dirrm share/gnome/help/char-palette/C
@dirrm share/gnome/help/char-palette
+%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN
%%BATTERY%%@dirrm share/gnome/help/battstat/uk/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/uk
%%BATTERY%%@dirrm share/gnome/help/battstat/sv/figures
@@ -2387,6 +2514,10 @@ share/xmodmap/xmodmap.yu
%%BATTERY%%@dirrm share/gnome/help/battstat/de
%%BATTERY%%@dirrm share/gnome/help/battstat/bg/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/bg
+%%BATTERY%%@dirrm share/gnome/help/battstat/cs/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/cs
+%%BATTERY%%@dirrm share/gnome/help/battstat/ca/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/ca
%%BATTERY%%@dirrm share/gnome/help/battstat/C/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/C
%%BATTERY%%@dirrm share/gnome/help/battstat
@@ -2499,6 +2630,8 @@ share/xmodmap/xmodmap.yu
@dirrmtry share/locale/es_AR
@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
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 32bd5a0144c2..1bb4c4156025 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11/gnome-desktop/Makefile,v 1.3 2009/04/15 21:55:48 kwm Exp $
+# $MCom: ports/x11/gnome-desktop/Makefile,v 1.171 2009/10/22 14:31:14 kwm Exp $
#
PORTNAME= gnome-desktop
-PORTVERSION= 2.26.3
-PORTREVISION?= 1
+PORTVERSION= 2.28.1
+PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,10 +20,10 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
-RUN_DEPENDS= ${pygnome2_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome2
+LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
USE_XORG= xpm
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \
+USE_GNOME= gnomeprefix gnomehack intlhack gnomedocutils gconf2 pygtk2 \
ltverhack referencehack
GNOME_DESKTOP_VERSION=2
USE_GETTEXT= yes
@@ -33,8 +33,7 @@ USE_PYTHON= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
-CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \
- --with-kde-datadir=${LOCALBASE}/share
+CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 34acc1d523e8..5e145439b1aa 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-desktop-2.26.3.tar.bz2) = 1668dcedde64b30aa02f0a73e59c957d
-SHA256 (gnome2/gnome-desktop-2.26.3.tar.bz2) = 37b7278d3132bb97f70ba2d5c5c06f5a219433d886e3f85e9a16c1f05c3726b7
-SIZE (gnome2/gnome-desktop-2.26.3.tar.bz2) = 3107987
+MD5 (gnome2/gnome-desktop-2.28.1.tar.bz2) = 6870b71b564dc902af65ddee176e603f
+SHA256 (gnome2/gnome-desktop-2.28.1.tar.bz2) = 21bb7d3b4aa9b452ecf1b27d6fe61b824f60f76d7c5f3b78b59f0fd3eedfd461
+SIZE (gnome2/gnome-desktop-2.28.1.tar.bz2) = 1639948
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 40a2944a79fc..f0f0792005f1 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -37,6 +37,7 @@ share/gnome/help/fdl/fr/fdl.xml
share/gnome/help/fdl/hu/fdl.xml
share/gnome/help/fdl/ko/fdl.xml
share/gnome/help/fdl/oc/fdl.xml
+share/gnome/help/fdl/pl/fdl.xml
share/gnome/help/fdl/sv/fdl.xml
share/gnome/help/fdl/uk/fdl.xml
share/gnome/help/fdl/vi/fdl.xml
@@ -74,6 +75,7 @@ share/gnome/help/lgpl/sv/lgpl.xml
share/gnome/help/lgpl/uk/lgpl.xml
share/gnome/help/lgpl/vi/lgpl.xml
share/gnome/help/lgpl/zh_CN/lgpl.xml
+share/libgnome-desktop/pnp.ids
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
@@ -126,8 +128,8 @@ share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ky/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/lo/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/mai/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/mg/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -138,6 +140,7 @@ share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/mr/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/nb/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/nds/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -189,6 +192,7 @@ share/omf/fdl/fdl-fr.omf
share/omf/fdl/fdl-hu.omf
share/omf/fdl/fdl-ko.omf
share/omf/fdl/fdl-oc.omf
+share/omf/fdl/fdl-pl.omf
share/omf/fdl/fdl-sv.omf
share/omf/fdl/fdl-uk.omf
share/omf/fdl/fdl-vi.omf
@@ -336,6 +340,7 @@ share/pixmaps/vnterm.xpm
@dirrm share/gnome/help/fdl/vi
@dirrm share/gnome/help/fdl/uk
@dirrm share/gnome/help/fdl/sv
+@dirrm share/gnome/help/fdl/pl
@dirrm share/gnome/help/fdl/oc
@dirrm share/gnome/help/fdl/ko
@dirrm share/gnome/help/fdl/hu
@@ -351,6 +356,7 @@ share/pixmaps/vnterm.xpm
@dirrm include/gnome-desktop-2.0/libgnomeui
@dirrm include/gnome-desktop-2.0/libgnome
@dirrm include/gnome-desktop-2.0
+@dirrm share/libgnome-desktop
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -381,6 +387,8 @@ share/pixmaps/vnterm.xpm
@dirrmtry share/locale/oc
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mi/LC_MESSAGES
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 151f63199686..787e14aaedc9 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-stable/x11/gnome-menus/Makefile,v 1.7 2009/04/15 17:32:15 kwm Exp $
+# $MCom: ports/x11/gnome-menus/Makefile,v 1.100 2009/10/18 23:13:39 marcus Exp $
#
PORTNAME= gnome-menus
-PORTVERSION= 2.26.2
+PORTVERSION= 2.28.0.1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -37,6 +37,8 @@ post-patch:
< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py
+ @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
+ ${WRKSRC}/util/Makefile.in
post-install:
@${INSTALL_DATA} ${WRKSRC}/layout/applications.menu \
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index 1ff9efa22dd8..6061681685d2 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-menus-2.26.2.tar.bz2) = 23a7375dd20238184f2fcccc4d83846b
-SHA256 (gnome2/gnome-menus-2.26.2.tar.bz2) = c9709695819ffaea92d41647adef8c0a6a408aa9a725e4b2987273bb06115a1c
-SIZE (gnome2/gnome-menus-2.26.2.tar.bz2) = 438945
+MD5 (gnome2/gnome-menus-2.28.0.1.tar.bz2) = 279316228fd84917acb9405476f74b53
+SHA256 (gnome2/gnome-menus-2.28.0.1.tar.bz2) = 75e73554cd0b0a8356956e76ccb517def5382eafa7bdb14336499cd271570dbc
+SIZE (gnome2/gnome-menus-2.28.0.1.tar.bz2) = 461356
diff --git a/x11/gnome-menus/files/patch-util_Makefile.in b/x11/gnome-menus/files/patch-util_Makefile.in
new file mode 100644
index 000000000000..fd9b0fcf098b
--- /dev/null
+++ b/x11/gnome-menus/files/patch-util_Makefile.in
@@ -0,0 +1,10 @@
+--- util/Makefile.in.orig 2009-10-18 19:06:36.000000000 -0400
++++ util/Makefile.in 2009-10-18 19:10:40.000000000 -0400
+@@ -313,6 +313,7 @@ gnome_menu_spec_test_SOURCES = \
+
+ gnome_menu_spec_test_LDADD = \
+ ../libmenu/libgnome-menu.la \
++ %%PTHREAD_LIBS%% \
+ $(GLIB_LIBS) \
+ $(NULL)
+
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index aebcca475721..b801284aaa12 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -93,6 +93,7 @@ share/locale/mn/LC_MESSAGES/gnome-menus.mo
share/locale/mr/LC_MESSAGES/gnome-menus.mo
share/locale/ms/LC_MESSAGES/gnome-menus.mo
share/locale/nb/LC_MESSAGES/gnome-menus.mo
+share/locale/nds/LC_MESSAGES/gnome-menus.mo
share/locale/ne/LC_MESSAGES/gnome-menus.mo
share/locale/nl/LC_MESSAGES/gnome-menus.mo
share/locale/nn/LC_MESSAGES/gnome-menus.mo
@@ -152,6 +153,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index cf428bd304e2..d535db2a1adb 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-stable/x11/gnome-panel/Makefile,v 1.3 2009/04/16 08:01:26 kwm Exp $
+# $MCom: ports/x11/gnome-panel/Makefile,v 1.208 2009/10/12 13:36:46 avl Exp $
#
PORTNAME= gnome-panel
-PORTVERSION= 2.26.3
+PORTVERSION= 2.28.0
PORTREVISION?= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
@@ -21,21 +21,20 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
LIB_DEPENDS= gweather.1:${PORTSDIR}/net/libgweather \
- polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome
+ polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome
USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop librsvg2 \
- libwnck gnomemenus gnomedocutils ltverhack referencehack
+ libwnck gnomemenus gnomedocutils ltverhack referencehack \
+ libgnomeui
WANT_GNOME= yes
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
-CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \
- --with-kde-docdir=${LOCALBASE}/share/doc \
- --disable-network-manager \
+CONFIGURE_ARGS= --disable-network-manager \
--enable-polkit
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -69,9 +68,7 @@ post-patch:
'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
+ ${WRKSRC}/help/fish/Makefile.in
.include <bsd.port.post.mk>
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index d6092bc525e8..74972b3b2ea9 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.26.3.tar.bz2) = 38de69896976d57abb4f4720fef62fcf
-SHA256 (gnome2/gnome-panel-2.26.3.tar.bz2) = b50fa78df3e94327e6478fbf8d0addfc0dde1f2022ffc39066bb46040ad3778e
-SIZE (gnome2/gnome-panel-2.26.3.tar.bz2) = 2988811
+MD5 (gnome2/gnome-panel-2.28.0.tar.bz2) = 9f0ea283d44bbcce67dc2e8a02fe9fad
+SHA256 (gnome2/gnome-panel-2.28.0.tar.bz2) = c1168c0c8f84692002557d60870c782f4831635080d2c52cd2a3665fb7718465
+SIZE (gnome2/gnome-panel-2.28.0.tar.bz2) = 2976766
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c
index 5acc58b408c6..a9b459b74091 100644
--- a/x11/gnome-panel/files/patch-applets_clock_clock.c
+++ b/x11/gnome-panel/files/patch-applets_clock_clock.c
@@ -1,11 +1,11 @@
---- applets/clock/clock.c.orig 2008-02-26 14:17:49.000000000 +0100
-+++ applets/clock/clock.c 2008-02-26 18:01:17.000000000 +0100
-@@ -84,6 +84,8 @@
-
- #define FALLBACK_CONFIG_TOOL "time-admin"
+--- applets/clock/clock.c.orig 2009-07-01 15:06:23.000000000 +0200
++++ applets/clock/clock.c 2009-07-19 15:59:26.000000000 +0200
+@@ -71,6 +71,8 @@
+ #include "set-timezone.h"
+ #include "system-timezone.h"
+#define daylight 1
+
- static const char *clock_config_tools [] = {
- CLOCK_TIME_UTILITY,
- FALLBACK_CONFIG_TOOL
+ #define INTERNETSECOND (864)
+ #define INTERNETBEAT (86400)
+
diff --git a/x11/gnome-panel/files/patch-config.h.in b/x11/gnome-panel/files/patch-config.h.in
deleted file mode 100644
index 8a59166a57b7..000000000000
--- a/x11/gnome-panel/files/patch-config.h.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.h.in.orig Thu Jan 2 19:50:41 2003
-+++ config.h.in Mon Jan 6 13:11:12 2003
-@@ -96,6 +96,8 @@
- /* Define to 1 if you have the <stdlib.h> header file. */
- #undef HAVE_STDLIB_H
-
-+#undef HAVE_LANGINFO_H
-+
- /* Define to 1 if you have the <strings.h> header file. */
- #undef HAVE_STRINGS_H
-
diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure
index 732f3a86022c..1d73358932d3 100644
--- a/x11/gnome-panel/files/patch-configure
+++ b/x11/gnome-panel/files/patch-configure
@@ -1,11 +1,61 @@
---- configure.orig Wed Jan 14 15:54:42 2004
-+++ configure Wed Jan 14 15:55:13 2004
-@@ -5536,7 +5536,7 @@
+--- configure.orig 2009-10-04 17:26:08.000000000 -0400
++++ configure 2009-10-04 17:31:11.000000000 -0400
+@@ -14954,12 +14955,12 @@ if test -n "$CLOCK_CFLAGS"; then
+ pkg_cv_CLOCK_CFLAGS="$CLOCK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\"") >&5
+- ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5
++ ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null`
++ pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -14970,12 +14971,12 @@ if test -n "$CLOCK_LIBS"; then
+ pkg_cv_CLOCK_LIBS="$CLOCK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\"") >&5
+- ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5
++ ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null`
++ pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -14993,14 +14994,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>&1`
++ CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>&1`
+ else
+- CLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>&1`
++ CLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$CLOCK_PKG_ERRORS" >&5
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) were not met:
++ { { $as_echo "$as_me:$LINENO: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met:
+
+ $CLOCK_PKG_ERRORS
+
+@@ -15011,7 +15012,7 @@ Alternatively, you may set the environme
+ and CLOCK_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-$as_echo "$as_me: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) were not met:
++$as_echo "$as_me: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met:
+
+ $CLOCK_PKG_ERRORS
- for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-- inttypes.h stdint.h unistd.h
-+ inttypes.h stdint.h unistd.h langinfo.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_header" >&5
diff --git a/x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c b/x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c
new file mode 100644
index 000000000000..50ef12367570
--- /dev/null
+++ b/x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c
@@ -0,0 +1,59 @@
+--- gnome-panel/panel-multiscreen.c.orig 2009-10-12 22:57:08.000000000 +1000
++++ gnome-panel/panel-multiscreen.c 2009-10-12 22:57:08.000000000 +1000
+@@ -136,9 +136,17 @@
+ xroot = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen));
+
+ #if (RANDR_MAJOR > 1 || (RANDR_MAJOR == 1 && RANDR_MINOR >= 3))
+- if (have_randr_1_3)
++ if (have_randr_1_3) {
+ resources = XRRGetScreenResourcesCurrent (xdisplay, xroot);
+- else
++ if (resources->noutput == 0) {
++ /* This might happen if nothing tried to get randr
++ * resources from the server before, so we need an
++ * active probe. See comment #27 in
++ * https://bugzilla.gnome.org/show_bug.cgi?id=597101 */
++ XRRFreeScreenResources (resources);
++ resources = XRRGetScreenResources (xdisplay, xroot);
++ }
++ } else
+ resources = XRRGetScreenResources (xdisplay, xroot);
+ #else
+ resources = XRRGetScreenResources (xdisplay, xroot);
+@@ -205,6 +213,17 @@
+ return FALSE;
+ }
+
++ if (geometries->len == 0) {
++ /* This can happen in at least one case:
++ * https://bugzilla.novell.com/show_bug.cgi?id=543876 where all
++ * monitors appear disconnected (possibly because the screen
++ * is behing a KVM switch) -- see comment #8.
++ * There might be other cases too, so we stay on the safe side.
++ */
++ g_array_free (geometries, TRUE);
++ return FALSE;
++ }
++
+ *monitors_ret = geometries->len;
+ *geometries_ret = (GdkRectangle *) g_array_free (geometries, FALSE);
+
+@@ -238,9 +257,15 @@
+ int *monitors_ret,
+ GdkRectangle **geometries_ret)
+ {
+- if (panel_multiscreen_get_randr_monitors_for_screen (screen,
+- monitors_ret,
+- geometries_ret))
++ gboolean res;
++
++ *monitors_ret = 0;
++ *geometries_ret = NULL;
++
++ res = panel_multiscreen_get_randr_monitors_for_screen (screen,
++ monitors_ret,
++ geometries_ret);
++ if (res && *monitors_ret > 0)
+ return;
+
+ panel_multiscreen_get_gdk_monitors_for_screen (screen,
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 16ed214475df..72143630613a 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -23,9 +23,9 @@ libdata/pkgconfig/libpanelapplet-2.0.pc
libexec/clock-applet
libexec/fish-applet-2
libexec/gnome-clock-applet-mechanism
+libexec/gnome-panel-add
libexec/notification-area-applet
libexec/wnck-applet
-share/PolicyKit/policy/org.gnome.clockapplet.mechanism.policy
share/applications/gnome-panel.desktop
share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
share/gnome-2.0/ui/GNOME_ClockApplet.xml
@@ -36,13 +36,13 @@ share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
share/gnome-2.0/ui/GNOME_WindowListApplet.xml
share/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
-%%DATADIR%%/glade/clock.glade
-%%DATADIR%%/glade/fish.glade
-%%DATADIR%%/glade/panel-properties-dialog.glade
-%%DATADIR%%/glade/panel-run-dialog.glade
-%%DATADIR%%/glade/panel-test-applets.glade
-%%DATADIR%%/glade/window-list.glade
-%%DATADIR%%/glade/workspace-switcher.glade
+%%DATADIR%%/ui/clock.ui
+%%DATADIR%%/ui/fish.ui
+%%DATADIR%%/ui/panel-properties-dialog.ui
+%%DATADIR%%/ui/panel-run-dialog.ui
+%%DATADIR%%/ui/panel-test-applets.ui
+%%DATADIR%%/ui/window-list.ui
+%%DATADIR%%/ui/workspace-switcher.ui
%%DATADIR%%/pixmaps/clock-calendar-icon.png
%%DATADIR%%/pixmaps/clock-face-large.svg
%%DATADIR%%/pixmaps/clock-face-small-day.svg
@@ -192,50 +192,6 @@ share/gnome/help/fish/uk/legal.xml
share/gnome/help/fish/zh_CN/figures/fish_applet.png
share/gnome/help/fish/zh_CN/fish.xml
share/gnome/help/fish/zh_CN/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/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
-share/gnome/help/window-list/ko/window-list.xml
-share/gnome/help/window-list/oc/window-list.xml
-share/gnome/help/window-list/pa/window-list.xml
-share/gnome/help/window-list/pt_BR/window-list.xml
-share/gnome/help/window-list/ru/window-list.xml
-share/gnome/help/window-list/sv/window-list.xml
-share/gnome/help/window-list/uk/window-list.xml
-share/gnome/help/window-list/zh_CN/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/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
-share/gnome/help/workspace-switcher/ko/workspace-switcher.xml
-share/gnome/help/workspace-switcher/nl/workspace-switcher.xml
-share/gnome/help/workspace-switcher/oc/workspace-switcher.xml
-share/gnome/help/workspace-switcher/pa/workspace-switcher.xml
-share/gnome/help/workspace-switcher/pt_BR/workspace-switcher.xml
-share/gnome/help/workspace-switcher/ru/workspace-switcher.xml
-share/gnome/help/workspace-switcher/sv/workspace-switcher.xml
-share/gnome/help/workspace-switcher/uk/workspace-switcher.xml
-share/gnome/help/workspace-switcher/vi/workspace-switcher.xml
-share/gnome/help/workspace-switcher/zh_CN/workspace-switcher.xml
share/icons/hicolor/16x16/apps/gnome-panel-clock.png
share/icons/hicolor/16x16/apps/gnome-panel-drawer.png
share/icons/hicolor/16x16/apps/gnome-panel-fish.png
@@ -438,101 +394,10 @@ share/omf/fish/fish-sv.omf
share/omf/fish/fish-th.omf
share/omf/fish/fish-uk.omf
share/omf/fish/fish-zh_CN.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
-share/omf/window-list/window-list-ko.omf
-share/omf/window-list/window-list-oc.omf
-share/omf/window-list/window-list-pa.omf
-share/omf/window-list/window-list-pt_BR.omf
-share/omf/window-list/window-list-ru.omf
-share/omf/window-list/window-list-sv.omf
-share/omf/window-list/window-list-uk.omf
-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
-share/omf/workspace-switcher/workspace-switcher-ko.omf
-share/omf/workspace-switcher/workspace-switcher-nl.omf
-share/omf/workspace-switcher/workspace-switcher-oc.omf
-share/omf/workspace-switcher/workspace-switcher-pa.omf
-share/omf/workspace-switcher/workspace-switcher-pt_BR.omf
-share/omf/workspace-switcher/workspace-switcher-ru.omf
-share/omf/workspace-switcher/workspace-switcher-sv.omf
-share/omf/workspace-switcher/workspace-switcher-uk.omf
-share/omf/workspace-switcher/workspace-switcher-vi.omf
-share/omf/workspace-switcher/workspace-switcher-zh_CN.omf
-@dirrm share/omf/workspace-switcher
-@dirrm share/omf/window-list
+share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
@dirrm share/omf/fish
@dirrm share/omf/clock
@dirrm share/idl/gnome-panel-2.0
-@dirrm share/gnome/help/workspace-switcher/zh_CN
-@dirrm share/gnome/help/workspace-switcher/vi
-@dirrm share/gnome/help/workspace-switcher/uk
-@dirrm share/gnome/help/workspace-switcher/sv
-@dirrm share/gnome/help/workspace-switcher/ru
-@dirrm share/gnome/help/workspace-switcher/pt_BR
-@dirrm share/gnome/help/workspace-switcher/pa
-@dirrm share/gnome/help/workspace-switcher/oc
-@dirrm share/gnome/help/workspace-switcher/nl
-@dirrm share/gnome/help/workspace-switcher/ko
-@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
-@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
-@dirrm share/gnome/help/workspace-switcher
-@dirrm share/gnome/help/window-list/zh_CN
-@dirrm share/gnome/help/window-list/uk
-@dirrm share/gnome/help/window-list/sv
-@dirrm share/gnome/help/window-list/ru
-@dirrm share/gnome/help/window-list/pt_BR
-@dirrm share/gnome/help/window-list/pa
-@dirrm share/gnome/help/window-list/oc
-@dirrm share/gnome/help/window-list/ko
-@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
-@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
-@dirrm share/gnome/help/window-list
@dirrm share/gnome/help/fish/zh_CN/figures
@dirrm share/gnome/help/fish/zh_CN
@dirrm share/gnome/help/fish/uk/figures
@@ -622,7 +487,7 @@ share/omf/workspace-switcher/workspace-switcher-zh_CN.omf
@dirrm share/gnome/help/clock/C
@dirrm share/gnome/help/clock
@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrm include/panel-2.0
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 46131e0f46e2..f98cb46eab5a 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-stable/x11/gnome-screensaver/Makefile,v 1.1 2009/04/16 01:20:04 kwm Exp $
+# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.112 2009/09/23 11:36:58 kwm Exp $
#
PORTNAME= gnome-screensaver
-PORTVERSION= 2.26.1
-PORTREVISION= 3
+PORTVERSION= 2.28.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index eae52a2b7277..e9349d500e87 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-screensaver-2.26.1.tar.bz2) = 13b9066bb2dfe9face50b3d852b67ded
-SHA256 (gnome2/gnome-screensaver-2.26.1.tar.bz2) = 14b68dc59646b5a53487c311d770ccc8458581480c201faf003349119d340830
-SIZE (gnome2/gnome-screensaver-2.26.1.tar.bz2) = 2031739
+MD5 (gnome2/gnome-screensaver-2.28.0.tar.bz2) = b37d4a210cac22a7312f9736f0c4356f
+SHA256 (gnome2/gnome-screensaver-2.28.0.tar.bz2) = 4e1a9c1054a8473b73f2bf3e9adee778e0918e793df6e1c2fa6230485f895412
+SIZE (gnome2/gnome-screensaver-2.28.0.tar.bz2) = 4779450
diff --git a/x11/gnome-screensaver/files/patch-data_Makefile.in b/x11/gnome-screensaver/files/patch-data_Makefile.in
index a474e9ef2229..b61f2225d2f4 100644
--- a/x11/gnome-screensaver/files/patch-data_Makefile.in
+++ b/x11/gnome-screensaver/files/patch-data_Makefile.in
@@ -1,6 +1,6 @@
---- data/Makefile.in.orig Mon Nov 7 05:37:01 2005
-+++ data/Makefile.in Mon Nov 7 05:37:38 2005
-@@ -737,38 +737,38 @@
+--- data/Makefile.in.orig 2009-06-15 22:41:37.000000000 +0200
++++ data/Makefile.in 2009-06-15 22:42:51.000000000 +0200
+@@ -916,38 +916,38 @@
@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
install-data-hook:
@@ -68,6 +68,6 @@
+# echo "***" ; \
+# fi; \
+# fi
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index 9532b59e5f49..9e1e7c8d57f7 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -2,6 +2,7 @@ bin/gnome-screensaver
bin/gnome-screensaver-command
bin/gnome-screensaver-preferences
%%PAM%%etc/pam.d/gnome-screensaver
+etc/xdg/autostart/gnome-screensaver.desktop
etc/xdg/menus/gnome-screensavers.menu
libdata/pkgconfig/gnome-screensaver.pc
libexec/gnome-screensaver-dialog
@@ -15,8 +16,8 @@ share/applications/screensavers/footlogo-floaters.desktop
share/applications/screensavers/personal-slideshow.desktop
share/applications/screensavers/popsquares.desktop
share/desktop-directories/gnome-screensaver.directory
-%%DATADIR%%/gnome-screensaver-preferences.glade
-%%DATADIR%%/lock-dialog-default.glade
+%%DATADIR%%/gnome-screensaver-preferences.ui
+%%DATADIR%%/lock-dialog-default.ui
share/locale/ar/LC_MESSAGES/gnome-screensaver.mo
share/locale/as/LC_MESSAGES/gnome-screensaver.mo
share/locale/ast/LC_MESSAGES/gnome-screensaver.mo
@@ -25,7 +26,9 @@ share/locale/be@latin/LC_MESSAGES/gnome-screensaver.mo
share/locale/bg/LC_MESSAGES/gnome-screensaver.mo
share/locale/bn/LC_MESSAGES/gnome-screensaver.mo
share/locale/bn_IN/LC_MESSAGES/gnome-screensaver.mo
+share/locale/br/LC_MESSAGES/gnome-screensaver.mo
share/locale/ca/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-screensaver.mo
share/locale/crh/LC_MESSAGES/gnome-screensaver.mo
share/locale/cs/LC_MESSAGES/gnome-screensaver.mo
share/locale/cy/LC_MESSAGES/gnome-screensaver.mo
@@ -58,12 +61,14 @@ share/locale/ko/LC_MESSAGES/gnome-screensaver.mo
share/locale/ku/LC_MESSAGES/gnome-screensaver.mo
share/locale/lt/LC_MESSAGES/gnome-screensaver.mo
share/locale/lv/LC_MESSAGES/gnome-screensaver.mo
+share/locale/mai/LC_MESSAGES/gnome-screensaver.mo
share/locale/mg/LC_MESSAGES/gnome-screensaver.mo
share/locale/mk/LC_MESSAGES/gnome-screensaver.mo
share/locale/ml/LC_MESSAGES/gnome-screensaver.mo
share/locale/mn/LC_MESSAGES/gnome-screensaver.mo
share/locale/mr/LC_MESSAGES/gnome-screensaver.mo
share/locale/nb/LC_MESSAGES/gnome-screensaver.mo
+share/locale/nds/LC_MESSAGES/gnome-screensaver.mo
share/locale/ne/LC_MESSAGES/gnome-screensaver.mo
share/locale/nl/LC_MESSAGES/gnome-screensaver.mo
share/locale/nn/LC_MESSAGES/gnome-screensaver.mo
@@ -92,18 +97,21 @@ share/locale/vi/LC_MESSAGES/gnome-screensaver.mo
share/locale/zh_CN/LC_MESSAGES/gnome-screensaver.mo
share/locale/zh_HK/LC_MESSAGES/gnome-screensaver.mo
share/locale/zh_TW/LC_MESSAGES/gnome-screensaver.mo
-share/pixmaps/backgrounds/cosmos/cloud.jpg
-share/pixmaps/backgrounds/cosmos/comet.jpg
-share/pixmaps/backgrounds/cosmos/earth-horizon.jpg
-share/pixmaps/backgrounds/cosmos/earthrise.jpg
-share/pixmaps/backgrounds/cosmos/galaxy-ngc3370.jpg
-share/pixmaps/backgrounds/cosmos/helix-nebula.jpg
-share/pixmaps/backgrounds/cosmos/jupiter.jpg
-share/pixmaps/backgrounds/cosmos/sombrero.jpg
-share/pixmaps/backgrounds/cosmos/whirlpool.jpg
+share/backgrounds/cosmos/background-1.xml
+share/backgrounds/cosmos/blue-marble-west.jpg
+share/backgrounds/cosmos/cloud.jpg
+share/backgrounds/cosmos/comet.jpg
+share/backgrounds/cosmos/earth-horizon.jpg
+share/backgrounds/cosmos/galaxy-ngc3370.jpg
+share/backgrounds/cosmos/helix-nebula.jpg
+share/backgrounds/cosmos/jupiter.jpg
+share/backgrounds/cosmos/sombrero.jpg
+share/backgrounds/cosmos/whirlpool.jpg
+share/gnome-background-properties/cosmos.xml
share/pixmaps/gnome-logo-white.svg
-@dirrm share/pixmaps/backgrounds/cosmos
-@dirrmtry share/pixmaps/backgrounds
+@dirrm share/gnome-background-properties
+@dirrm share/backgrounds/cosmos
+@dirrmtry share/backgrounds
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrm libexec/gnome-screensaver
@@ -119,16 +127,22 @@ share/pixmaps/gnome-logo-white.svg
@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@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/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
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 33213548525c..5dfdb755e918 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11/gnome-session/Makefile,v 1.3 2009/04/16 01:54:40 kwm Exp $
+# $MCom: ports/x11/gnome-session/Makefile,v 1.175 2009/09/22 09:18:35 kwm Exp $
#
PORTNAME= gnome-session
-PORTVERSION= 2.26.2
-PORTREVISION= 1
+PORTVERSION= 2.28.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME \
http://www.marcuscom.com/downloads/:local
@@ -26,17 +25,19 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
notify.1:${PORTSDIR}/devel/libnotify \
execinfo:${PORTSDIR}/devel/libexecinfo
RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \
+ ${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
INSTALLS_ICONS= yes
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_XORG= xau xrandr
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
+USE_XORG= ice sm xau xrandr
+USE_GNOME= gnomeprefix gnomehack intlhack gconf2
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-docbook-docs
+CONFIGURE_ARGS= --disable-docbook-docs \
+ --enable-splash
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 0e03e58531cf..7870703d67b6 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnome2/gnome-session-2.26.2.tar.bz2) = 2cc3ff808592d95c3b364d608e99dea4
-SHA256 (gnome2/gnome-session-2.26.2.tar.bz2) = e089c7349bb6bc73d19f65c0a4536757968b929825ec38c616c8049bfd2d6905
-SIZE (gnome2/gnome-session-2.26.2.tar.bz2) = 804340
+MD5 (gnome2/gnome-session-2.28.0.tar.bz2) = b1a2307b02e833010d6c5312b9ff9048
+SHA256 (gnome2/gnome-session-2.28.0.tar.bz2) = 83e89a04fb090f1a1f6b609bdc39f1e69390269b885b7da6b32e980f4e765c0c
+SIZE (gnome2/gnome-session-2.28.0.tar.bz2) = 822009
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-configure b/x11/gnome-session/files/patch-configure
new file mode 100644
index 000000000000..6c8c58f69eac
--- /dev/null
+++ b/x11/gnome-session/files/patch-configure
@@ -0,0 +1,85 @@
+--- configure.orig 2009-08-26 14:16:17.000000000 -0400
++++ configure 2009-08-26 14:16:27.000000000 -0400
+@@ -13057,7 +13057,6 @@ GLIB_REQUIRED=2.16.0
+ LIBGNOMEUI_REQUIRED=2.2.0
+ GTK_REQUIRED=2.14.0
+ DBUS_GLIB_REQUIRED=0.76
+-DEVKIT_POWER_REQUIRED=008
+
+
+
+@@ -13189,13 +13188,11 @@ if test -n "$GNOME_SESSION_CFLAGS"; then
+ gio-2.0 >= \$GLIB_REQUIRED
+ gtk+-2.0 >= \$GTK_REQUIRED
+ dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED
+ \"") >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
+ gio-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+ ") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -13204,7 +13201,6 @@ if test -n "$GNOME_SESSION_CFLAGS"; then
+ gio-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+ " 2>/dev/null`
+ else
+ pkg_failed=yes
+@@ -13220,13 +13216,11 @@ if test -n "$GNOME_SESSION_LIBS"; then
+ gio-2.0 >= \$GLIB_REQUIRED
+ gtk+-2.0 >= \$GTK_REQUIRED
+ dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED
+ \"") >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
+ gio-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+ ") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -13235,7 +13229,6 @@ if test -n "$GNOME_SESSION_LIBS"; then
+ gio-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+ " 2>/dev/null`
+ else
+ pkg_failed=yes
+@@ -13258,14 +13251,12 @@ fi
+ gio-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+ " 2>&1`
+ else
+ GNOME_SESSION_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED
+ gio-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+ " 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+@@ -13275,7 +13266,6 @@ fi
+ gio-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+ ) were not met:
+
+ $GNOME_SESSION_PKG_ERRORS
+@@ -13291,7 +13281,6 @@ $as_echo "$as_me: error: Package require
+ gio-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+ ) were not met:
+
+ $GNOME_SESSION_PKG_ERRORS
diff --git a/x11/gnome-session/files/patch-configure.in b/x11/gnome-session/files/patch-configure.in
new file mode 100644
index 000000000000..02a19373b902
--- /dev/null
+++ b/x11/gnome-session/files/patch-configure.in
@@ -0,0 +1,18 @@
+--- configure.in.orig 2009-08-25 10:09:56.000000000 -0400
++++ configure.in 2009-08-26 14:12:40.000000000 -0400
+@@ -49,7 +49,6 @@ GLIB_REQUIRED=2.16.0
+ LIBGNOMEUI_REQUIRED=2.2.0
+ GTK_REQUIRED=2.14.0
+ DBUS_GLIB_REQUIRED=0.76
+-DEVKIT_POWER_REQUIRED=008
+
+ dnl ====================================================================
+ dnl Dependency Checks
+@@ -61,7 +60,6 @@ PKG_CHECK_MODULES(GNOME_SESSION,
+ gio-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+ )
+
+ PKG_CHECK_MODULES(SESSION_PROPERTIES,
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.am b/x11/gnome-session/files/patch-gnome-session_Makefile.am
new file mode 100644
index 000000000000..aff8ee55c44b
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_Makefile.am
@@ -0,0 +1,21 @@
+--- gnome-session/Makefile.am.orig 2009-08-25 10:07:24.000000000 -0400
++++ gnome-session/Makefile.am 2009-08-26 14:11:18.000000000 -0400
+@@ -23,8 +23,7 @@ INCLUDES = \
+ -DLIBEXECDIR=\"$(libexecdir)\" \
+ -DGTKBUILDER_DIR=\""$(pkgdatadir)"\" \
+ -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \
+- -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" \
+- -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE
++ -DGCONFTOOL_CMD=\"$(GCONFTOOL)\"
+
+ test_inhibit_SOURCES = \
+ test-inhibit.c \
+@@ -73,6 +72,8 @@ gnome_session_SOURCES = \
+ gsm-logout-dialog.c \
+ gsm-inhibit-dialog.h \
+ gsm-inhibit-dialog.c \
++ gsm-power-manager.h \
++ gsm-power-manager.c \
+ gs-idle-monitor.h \
+ gs-idle-monitor.c \
+ gsm-presence.h \
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in
index 7febc702d2bf..dcf1a21e9f09 100644
--- a/x11/gnome-session/files/patch-gnome-session_Makefile.in
+++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in
@@ -1,6 +1,24 @@
---- 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/Makefile.in.orig 2009-08-26 14:18:15.000000000 -0400
++++ gnome-session/Makefile.in 2009-08-26 14:20:10.000000000 -0400
+@@ -73,6 +73,7 @@ am_gnome_session_OBJECTS = gsm-app.$(OBJ
+ gdm-log.$(OBJEXT) main.$(OBJEXT) gsm-store.$(OBJEXT) \
+ gsm-inhibitor.$(OBJEXT) gsm-manager.$(OBJEXT) \
+ gsm-session-save.$(OBJEXT) gsm-xsmp-server.$(OBJEXT) \
++ gsm-power-manager.$(OBJEXT) \
+ $(am__objects_1)
+ gnome_session_OBJECTS = $(am_gnome_session_OBJECTS)
+ gnome_session_DEPENDENCIES = libgsmutil.la \
+@@ -339,8 +340,7 @@ INCLUDES = \
+ -DLIBEXECDIR=\"$(libexecdir)\" \
+ -DGTKBUILDER_DIR=\""$(pkgdatadir)"\" \
+ -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \
+- -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" \
+- -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE
++ -DGCONFTOOL_CMD=\"$(GCONFTOOL)\"
+
+ test_inhibit_SOURCES = \
+ test-inhibit.c \
+@@ -360,6 +360,7 @@ test_client_dbus_LDADD = \
gnome_session_LDADD = \
libgsmutil.la \
@@ -8,3 +26,20 @@
$(top_builddir)/egg/libeggdesktopfile.la \
$(SM_LIBS) \
$(ICE_LIBS) \
+@@ -389,6 +390,8 @@ gnome_session_SOURCES = \
+ gsm-logout-dialog.c \
+ gsm-inhibit-dialog.h \
+ gsm-inhibit-dialog.c \
++ gsm-power-manager.c \
++ gsm-power-manager.h \
+ gs-idle-monitor.h \
+ gs-idle-monitor.c \
+ gsm-presence.h \
+@@ -574,6 +577,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-dbus-client.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-gconf.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-inhibit-dialog.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-power-manager.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-inhibitor.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-logout-dialog.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-manager.Po@am__quote@
diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-logout-dialog.c b/x11/gnome-session/files/patch-gnome-session_gsm-logout-dialog.c
new file mode 100644
index 000000000000..1ca12557d678
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_gsm-logout-dialog.c
@@ -0,0 +1,66 @@
+--- gnome-session/gsm-logout-dialog.c.orig 2009-08-25 04:03:42.000000000 -0400
++++ gnome-session/gsm-logout-dialog.c 2009-08-26 14:27:18.000000000 -0400
+@@ -27,9 +27,8 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+
+-#include <devkit-power-gobject/devicekit-power.h>
+-
+ #include "gsm-logout-dialog.h"
++#include "gsm-power-manager.h"
+ #include "gsm-consolekit.h"
+ #include "gdm.h"
+
+@@ -50,7 +49,7 @@ struct _GsmLogoutDialogPrivate
+ {
+ GsmDialogLogoutType type;
+
+- DkpClient *dkp_client;
++ GsmPowerManager *power_manager;
+ GsmConsolekit *consolekit;
+
+ int timeout;
+@@ -142,7 +141,7 @@ gsm_logout_dialog_init (GsmLogoutDialog
+ gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
+ gtk_window_stick (GTK_WINDOW (logout_dialog));
+
+- logout_dialog->priv->dkp_client = dkp_client_new ();
++ logout_dialog->priv->power_manager = gsm_get_power_manager ();
+
+ logout_dialog->priv->consolekit = gsm_get_consolekit ();
+
+@@ -166,9 +165,9 @@ gsm_logout_dialog_destroy (GsmLogoutDial
+ logout_dialog->priv->timeout_id = 0;
+ }
+
+- if (logout_dialog->priv->dkp_client) {
+- g_object_unref (logout_dialog->priv->dkp_client);
+- logout_dialog->priv->dkp_client = NULL;
++ if (logout_dialog->priv->power_manager) {
++ g_object_unref (logout_dialog->priv->power_manager);
++ logout_dialog->priv->power_manager = NULL;
+ }
+
+ if (logout_dialog->priv->consolekit) {
+@@ -183,9 +182,7 @@ static gboolean
+ gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog)
+ {
+ gboolean ret;
+- g_object_get (logout_dialog->priv->dkp_client,
+- "can-suspend", &ret,
+- NULL);
++ ret = gsm_power_manager_can_suspend (logout_dialog->priv->power_manager);
+ return ret;
+ }
+
+@@ -193,9 +190,7 @@ static gboolean
+ gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog)
+ {
+ gboolean ret;
+- g_object_get (logout_dialog->priv->dkp_client,
+- "can-hibernate", &ret,
+- NULL);
++ ret = gsm_power_manager_can_hibernate (logout_dialog->priv->power_manager);
+ return ret;
+ }
+
diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-manager.c b/x11/gnome-session/files/patch-gnome-session_gsm-manager.c
new file mode 100644
index 000000000000..befa415d9c6e
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_gsm-manager.c
@@ -0,0 +1,150 @@
+--- gnome-session/gsm-manager.c.orig 2009-09-18 18:36:04.000000000 +0200
++++ gnome-session/gsm-manager.c 2009-09-22 11:12:05.000000000 +0200
+@@ -38,8 +38,6 @@
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+-#include <devkit-power-gobject/devicekit-power.h>
+-
+ #include <gtk/gtk.h> /* for logout dialog */
+ #include <gconf/gconf-client.h>
+
+@@ -60,6 +58,7 @@
+ #include "gsm-logout-dialog.h"
+ #include "gsm-inhibit-dialog.h"
+ #include "gsm-consolekit.h"
++#include "gsm-power-manager.h"
+ #include "gsm-session-save.h"
+
+ #define GSM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_MANAGER, GsmManagerPrivate))
+@@ -133,9 +132,6 @@ struct GsmManagerPrivate
+
+ DBusGProxy *bus_proxy;
+ DBusGConnection *connection;
+-
+- /* Interface with other parts of the system */
+- DkpClient *dkp_client;
+ };
+
+ enum {
+@@ -971,53 +967,29 @@ manager_perhaps_lock (GsmManager *manage
+ static void
+ manager_attempt_hibernate (GsmManager *manager)
+ {
+- gboolean can_hibernate;
+- GError *error;
+- gboolean ret;
++ GsmPowerManager *power_manager;
+
+- g_object_get (manager->priv->dkp_client,
+- "can-hibernate", &can_hibernate,
+- NULL);
+-
+- if (can_hibernate) {
+-
+- /* lock the screen before we suspend */
+- manager_perhaps_lock (manager);
+-
+- error = NULL;
+- ret = dkp_client_hibernate (manager->priv->dkp_client, &error);
+- if (!ret) {
+- g_warning ("Unexpected hibernate failure: %s",
+- error->message);
+- g_error_free (error);
+- }
+- }
++ power_manager = gsm_get_power_manager ();
++
++ if (gsm_power_manager_can_hibernate (power_manager)) {
++ gsm_power_manager_attempt_hibernate (power_manager);
++ }
++
++ g_object_unref (power_manager);
+ }
+
+ static void
+ manager_attempt_suspend (GsmManager *manager)
+ {
+- gboolean can_suspend;
+- GError *error;
+- gboolean ret;
++ GsmPowerManager *power_manager;
+
+- g_object_get (manager->priv->dkp_client,
+- "can-suspend", &can_suspend,
+- NULL);
+-
+- if (can_suspend) {
+-
+- /* lock the screen before we suspend */
+- manager_perhaps_lock (manager);
+-
+- error = NULL;
+- ret = dkp_client_suspend (manager->priv->dkp_client, &error);
+- if (!ret) {
+- g_warning ("Unexpected suspend failure: %s",
+- error->message);
+- g_error_free (error);
+- }
+- }
++ power_manager = gsm_get_power_manager ();
++
++ if (gsm_power_manager_can_suspend (power_manager)) {
++ gsm_power_manager_attempt_suspend (power_manager);
++ }
++
++ g_object_unref (power_manager);
+ }
+
+ static void
+@@ -2190,11 +2162,6 @@ gsm_manager_dispose (GObject *object)
+ manager->priv->gconf_client = NULL;
+ }
+
+- if (manager->priv->dkp_client != NULL) {
+- g_object_unref (manager->priv->dkp_client);
+- manager->priv->dkp_client = NULL;
+- }
+-
+ G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object);
+ }
+
+@@ -2423,8 +2390,6 @@ gsm_manager_init (GsmManager *manager)
+ G_CALLBACK (on_presence_status_changed),
+ manager);
+
+- manager->priv->dkp_client = dkp_client_new ();
+-
+ /* GConf setup */
+ gconf_client_add_dir (manager->priv->gconf_client,
+ KEY_DESKTOP_DIR,
+@@ -2944,24 +2909,20 @@ gsm_manager_can_shutdown (GsmManager *ma
+ GError **error)
+ {
+ GsmConsolekit *consolekit;
+- gboolean can_suspend;
+- gboolean can_hibernate;
+-
+- g_object_get (manager->priv->dkp_client,
+- "can-suspend", &can_suspend,
+- "can-hibernate", &can_hibernate,
+- NULL);
++ GsmPowerManager *power_manager;
+
+ g_debug ("GsmManager: CanShutdown called");
+
+ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
+
+ consolekit = gsm_get_consolekit ();
++ power_manager = gsm_get_power_manager ();
+ *shutdown_available = gsm_consolekit_can_stop (consolekit)
+ || gsm_consolekit_can_restart (consolekit)
+- || can_suspend
+- || can_hibernate;
++ || gsm_power_manager_can_suspend (power_manager)
++ || gsm_power_manager_can_hibernate (power_manager);
+ g_object_unref (consolekit);
++ g_object_unref (power_manager);
+
+ return TRUE;
+ }
diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.c b/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.c
new file mode 100644
index 000000000000..05342ff0fbf1
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.c
@@ -0,0 +1,483 @@
+--- gnome-session/gsm-power-manager.c.orig 2009-08-26 14:14:31.000000000 -0400
++++ gnome-session/gsm-power-manager.c 2009-08-26 14:15:07.000000000 -0400
+@@ -0,0 +1,480 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * power-manager.h: functions for powering down, restarting, and
++ * suspending the computer
++ * Copyright (C) 2006 Ray Strode <rstrode@redhat.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ */
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include "gsm-power-manager.h"
++
++#include <errno.h>
++#include <string.h>
++
++#include <glib.h>
++#include <glib-object.h>
++#include <glib/gi18n.h>
++
++#include <dbus/dbus-glib.h>
++
++struct _GsmPowerManagerPrivate
++{
++ DBusGConnection *dbus_connection;
++ DBusGProxy *bus_proxy;
++ DBusGProxy *gpm_proxy;
++ guint32 is_connected : 1;
++};
++
++static void gsm_power_manager_finalize (GObject *object);
++
++static void gsm_power_manager_class_install_signals (GsmPowerManagerClass *manager_class);
++
++static void gsm_power_manager_class_install_properties (GsmPowerManagerClass *manager_class);
++
++static void gsm_power_manager_get_property (GObject *object,
++ guint prop_id,
++ GValue *value,
++ GParamSpec *pspec);
++
++static gboolean ensure_gpm_connection (GsmPowerManager *manager,
++ GError **error);
++
++enum {
++ PROP_0 = 0,
++ PROP_IS_CONNECTED
++};
++
++enum {
++ REQUEST_FAILED = 0,
++ LAST_SIGNAL
++};
++
++static guint signals[LAST_SIGNAL];
++
++G_DEFINE_TYPE (GsmPowerManager, gsm_power_manager, G_TYPE_OBJECT);
++
++static void
++gsm_power_manager_class_init (GsmPowerManagerClass *manager_class)
++{
++ GObjectClass *object_class;
++
++ object_class = G_OBJECT_CLASS (manager_class);
++
++ object_class->finalize = gsm_power_manager_finalize;
++
++ gsm_power_manager_class_install_properties (manager_class);
++ gsm_power_manager_class_install_signals (manager_class);
++
++ g_type_class_add_private (manager_class,
++ sizeof (GsmPowerManagerPrivate));
++}
++
++static void
++gsm_power_manager_class_install_signals (GsmPowerManagerClass *manager_class)
++{
++ GObjectClass *object_class;
++
++ object_class = G_OBJECT_CLASS (manager_class);
++
++ signals[REQUEST_FAILED] =
++ g_signal_new ("request-failed",
++ G_OBJECT_CLASS_TYPE (object_class),
++ G_SIGNAL_RUN_LAST,
++ G_STRUCT_OFFSET (GsmPowerManagerClass, request_failed),
++ NULL,
++ NULL,
++ g_cclosure_marshal_VOID__POINTER,
++ G_TYPE_NONE,
++ 1, G_TYPE_POINTER);
++
++ manager_class->request_failed = NULL;
++}
++
++static void
++gsm_power_manager_class_install_properties (GsmPowerManagerClass *manager_class)
++{
++ GObjectClass *object_class;
++ GParamSpec *param_spec;
++
++ object_class = G_OBJECT_CLASS (manager_class);
++ object_class->get_property = gsm_power_manager_get_property;
++
++ param_spec = g_param_spec_boolean ("is-connected",
++ "Is connected",
++ "Whether the session is connected to "
++ "the power manager",
++ FALSE,
++ G_PARAM_READABLE);
++
++ g_object_class_install_property (object_class, PROP_IS_CONNECTED,
++ param_spec);
++}
++
++static void
++on_name_owner_changed (DBusGProxy *bus_proxy,
++ const char *name,
++ const char *prev_owner,
++ const char *new_owner,
++ GsmPowerManager *manager)
++{
++ if (strcmp (name, "org.freedesktop.PowerManagement") != 0) {
++ return;
++ }
++
++ if (manager->priv->gpm_proxy != NULL) {
++ g_object_unref (manager->priv->gpm_proxy);
++ manager->priv->gpm_proxy = NULL;
++ }
++
++ ensure_gpm_connection (manager, NULL);
++}
++
++static gboolean
++ensure_gpm_connection (GsmPowerManager *manager,
++ GError **error)
++{
++ GError *connection_error;
++ gboolean is_connected;
++
++ connection_error = NULL;
++ if (manager->priv->dbus_connection == NULL) {
++ manager->priv->dbus_connection = dbus_g_bus_get (DBUS_BUS_SESSION,
++ &connection_error);
++
++ if (manager->priv->dbus_connection == NULL) {
++ g_propagate_error (error, connection_error);
++ is_connected = FALSE;
++ goto out;
++ }
++ }
++
++ if (manager->priv->bus_proxy == NULL) {
++ manager->priv->bus_proxy =
++ dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection,
++ DBUS_SERVICE_DBUS,
++ DBUS_PATH_DBUS,
++ DBUS_INTERFACE_DBUS,
++ &connection_error);
++
++ if (manager->priv->bus_proxy == NULL) {
++ g_propagate_error (error, connection_error);
++ is_connected = FALSE;
++ goto out;
++ }
++
++ dbus_g_proxy_add_signal (manager->priv->bus_proxy,
++ "NameOwnerChanged",
++ G_TYPE_STRING,
++ G_TYPE_STRING,
++ G_TYPE_STRING,
++ G_TYPE_INVALID);
++
++ dbus_g_proxy_connect_signal (manager->priv->bus_proxy,
++ "NameOwnerChanged",
++ G_CALLBACK (on_name_owner_changed),
++ manager, NULL);
++ }
++
++ if (manager->priv->gpm_proxy == NULL) {
++ manager->priv->gpm_proxy =
++ dbus_g_proxy_new_for_name_owner (
++ manager->priv->dbus_connection,
++ "org.freedesktop.PowerManagement",
++ "/org/freedesktop/PowerManagement",
++ "org.freedesktop.PowerManagement",
++ &connection_error);
++
++ if (manager->priv->gpm_proxy == NULL) {
++ g_propagate_error (error, connection_error);
++ is_connected = FALSE;
++ goto out;
++ }
++ }
++
++ is_connected = TRUE;
++
++ out:
++ if (manager->priv->is_connected != is_connected) {
++ manager->priv->is_connected = is_connected;
++ g_object_notify (G_OBJECT (manager), "is-connected");
++ }
++
++ if (!is_connected) {
++ if (manager->priv->dbus_connection == NULL) {
++ if (manager->priv->bus_proxy != NULL) {
++ g_object_unref (manager->priv->bus_proxy);
++ manager->priv->bus_proxy = NULL;
++ }
++
++ if (manager->priv->gpm_proxy != NULL) {
++ g_object_unref (manager->priv->gpm_proxy);
++ manager->priv->gpm_proxy = NULL;
++ }
++ } else if (manager->priv->bus_proxy == NULL) {
++ if (manager->priv->gpm_proxy != NULL) {
++ g_object_unref (manager->priv->gpm_proxy);
++ manager->priv->gpm_proxy = NULL;
++ }
++ }
++ }
++
++ return is_connected;
++}
++
++static void
++gsm_power_manager_init (GsmPowerManager *manager)
++{
++ GError *error;
++
++ manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
++ GSM_TYPE_POWER_MANAGER,
++ GsmPowerManagerPrivate);
++
++ manager->priv->dbus_connection = NULL;
++ manager->priv->bus_proxy = NULL;
++ manager->priv->gpm_proxy = NULL;
++ manager->priv->is_connected = FALSE;
++
++ error = NULL;
++
++ if (!ensure_gpm_connection (manager, &error)) {
++ g_message ("Could not connect to power manager: %s",
++ error->message);
++ g_error_free (error);
++ }
++}
++
++static void
++gsm_power_manager_finalize (GObject *object)
++{
++ GsmPowerManager *manager;
++ GObjectClass *parent_class;
++
++ manager = GSM_POWER_MANAGER (object);
++
++ parent_class = G_OBJECT_CLASS (gsm_power_manager_parent_class);
++
++ if (parent_class->finalize != NULL) {
++ parent_class->finalize (object);
++ }
++}
++
++static void
++gsm_power_manager_get_property (GObject *object,
++ guint prop_id,
++ GValue *value,
++ GParamSpec *pspec)
++{
++ GsmPowerManager *manager = GSM_POWER_MANAGER (object);
++
++ switch (prop_id) {
++ case PROP_IS_CONNECTED:
++ g_value_set_boolean (value,
++ manager->priv->is_connected);
++ break;
++
++ default:
++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object,
++ prop_id,
++ pspec);
++ }
++}
++
++GQuark
++gsm_power_manager_error_quark (void)
++{
++ static GQuark error_quark = 0;
++
++ if (error_quark == 0)
++ error_quark = g_quark_from_static_string ("gsm-power-manager-error");
++
++ return error_quark;
++}
++
++GsmPowerManager *
++gsm_power_manager_new (void)
++{
++ GsmPowerManager *manager;
++
++ manager = g_object_new (GSM_TYPE_POWER_MANAGER, NULL);
++
++ return manager;
++}
++
++gboolean
++gsm_power_manager_can_suspend (GsmPowerManager *manager)
++{
++ GError *error;
++ gboolean can_suspend;
++
++ error = NULL;
++
++ if (!ensure_gpm_connection (manager, &error)) {
++ g_message ("Could not connect to power manager: %s",
++ error->message);
++
++ g_error_free (error);
++
++ return FALSE;
++ }
++
++ can_suspend = FALSE;
++
++ if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanSuspend",
++ &error,
++ G_TYPE_INVALID,
++ G_TYPE_BOOLEAN, &can_suspend, G_TYPE_INVALID)) {
++ if (error != NULL) {
++ g_message ("Could not ask power manager if user can suspend: %s",
++ error->message);
++
++ g_error_free (error);
++ }
++
++ can_suspend = FALSE;
++ }
++
++ return can_suspend;
++}
++
++gboolean
++gsm_power_manager_can_hibernate (GsmPowerManager *manager)
++{
++ GError *error;
++ gboolean can_hibernate;
++
++ error = NULL;
++
++ if (!ensure_gpm_connection (manager, &error)) {
++ g_message ("Could not connect to power manager: %s",
++ error->message);
++
++ g_error_free (error);
++
++ return FALSE;
++ }
++
++ can_hibernate = FALSE;
++
++ if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanHibernate",
++ &error,
++ G_TYPE_INVALID,
++ G_TYPE_BOOLEAN, &can_hibernate, G_TYPE_INVALID)) {
++ if (error != NULL) {
++ g_message ("Could not ask power manager if user can suspend: %s",
++ error->message);
++
++ g_error_free (error);
++ }
++
++ can_hibernate = FALSE;
++ }
++
++ return can_hibernate;
++}
++
++void
++gsm_power_manager_attempt_suspend (GsmPowerManager *manager)
++{
++ GError *error;
++
++ error = NULL;
++
++ if (!ensure_gpm_connection (manager, &error)) {
++ g_warning ("Could not connect to power manager: %s",
++ error->message);
++ g_error_free (error);
++ return;
++ }
++
++ if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "Suspend",
++ &error,
++ G_TYPE_INVALID, G_TYPE_INVALID) &&
++ error != NULL) {
++ GError *call_error;
++
++ g_warning ("Could not ask power manager to suspend: %s",
++ error->message);
++
++ call_error = g_error_new_literal (GSM_POWER_MANAGER_ERROR,
++ GSM_POWER_MANAGER_ERROR_SUSPENDING,
++ error->message);
++
++ g_error_free (error);
++
++ g_signal_emit (G_OBJECT (manager),
++ signals[REQUEST_FAILED],
++ 0, call_error);
++
++ g_error_free (call_error);
++ }
++}
++
++void
++gsm_power_manager_attempt_hibernate (GsmPowerManager *manager)
++{
++ GError *error;
++
++ error = NULL;
++ if (!ensure_gpm_connection (manager, &error)) {
++ g_warning ("Could not connect to power manager: %s",
++ error->message);
++
++ g_error_free (error);
++
++ return;
++ }
++
++ if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "Hibernate",
++ &error,
++ G_TYPE_INVALID, G_TYPE_INVALID) &&
++ error != NULL) {
++ GError *call_error;
++
++ g_warning ("Could not ask power manager to hibernate: %s",
++ error->message);
++
++ call_error = g_error_new_literal (GSM_POWER_MANAGER_ERROR,
++ GSM_POWER_MANAGER_ERROR_HIBERNATING,
++ error->message);
++
++ g_error_free (error);
++
++ g_signal_emit (G_OBJECT (manager),
++ signals[REQUEST_FAILED],
++ 0, call_error);
++
++ g_error_free (call_error);
++ }
++}
++
++
++GsmPowerManager *
++gsm_get_power_manager (void)
++{
++ static GsmPowerManager *manager = NULL;
++
++ if (manager == NULL) {
++ manager = gsm_power_manager_new ();
++ }
++
++ return g_object_ref (manager);
++}
diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.h b/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.h
new file mode 100644
index 000000000000..2a27338b7dba
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_gsm-power-manager.h
@@ -0,0 +1,90 @@
+--- gnome-session/gsm-power-manager.h.orig 2009-08-26 14:14:35.000000000 -0400
++++ gnome-session/gsm-power-manager.h 2009-08-26 14:15:07.000000000 -0400
+@@ -0,0 +1,87 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * power-manager.h: functions for powering down, restarting, and
++ * suspending the computer
++ * Copyright (C) 2006 Ray Strode <rstrode@redhat.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ */
++
++#ifndef __GSM_POWER_MANAGER_H__
++#define __GSM_POWER_MANAGER_H__
++
++#include <glib.h>
++#include <glib-object.h>
++
++G_BEGIN_DECLS
++
++#define GSM_TYPE_POWER_MANAGER (gsm_power_manager_get_type ())
++#define GSM_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSM_TYPE_POWER_MANAGER, GsmPowerManager))
++#define GSM_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GSM_TYPE_POWER_MANAGER, GsmPowerManagerClass))
++#define GSM_IS_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSM_TYPE_POWER_MANAGER))
++#define GSM_IS_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSM_TYPE_POWER_MANAGER))
++#define GSM_POWER_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GSM_TYPE_POWER_MANAGER, GsmPowerManagerClass))
++#define GSM_POWER_MANAGER_ERROR (gsm_power_manager_error_quark ())
++
++typedef struct _GsmPowerManager GsmPowerManager;
++typedef struct _GsmPowerManagerClass GsmPowerManagerClass;
++typedef struct _GsmPowerManagerPrivate GsmPowerManagerPrivate;
++typedef enum _GsmPowerManagerError GsmPowerManagerError;
++
++struct _GsmPowerManager
++{
++ GObject parent;
++
++ GsmPowerManagerPrivate *priv;
++};
++
++struct _GsmPowerManagerClass
++{
++ GObjectClass parent_class;
++
++ void (* request_failed) (GsmPowerManager *manager,
++ GError *error);
++};
++
++enum _GsmPowerManagerError
++{
++ GSM_POWER_MANAGER_ERROR_SUSPENDING = 0,
++ GSM_POWER_MANAGER_ERROR_HIBERNATING
++};
++
++GType gsm_power_manager_get_type (void) G_GNUC_CONST;
++
++GQuark gsm_power_manager_error_quark (void);
++
++GsmPowerManager *gsm_power_manager_new (void) G_GNUC_MALLOC;
++
++GsmPowerManager *gsm_get_power_manager (void);
++
++gboolean gsm_power_manager_can_suspend (GsmPowerManager *manager);
++
++gboolean gsm_power_manager_can_hibernate (GsmPowerManager *manager);
++
++gboolean gsm_power_manager_can_power_down (GsmPowerManager *manager);
++
++gboolean gsm_power_manager_can_restart (GsmPowerManager *manager);
++
++void gsm_power_manager_attempt_suspend (GsmPowerManager *manager);
++
++void gsm_power_manager_attempt_hibernate (GsmPowerManager *manager);
++
++G_END_DECLS
++
++#endif /* __GSM_POWER_MANAGER_H__ */
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 9bc1d79b0b8b..306533fcb5ca 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -2,15 +2,13 @@ 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-session-splash.desktop
etc/xdg/autostart/gnome-settings-daemon-helper.desktop
-lib/gnome-session/helpers/at-spi-registryd-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/gnome-session-splash.desktop
+%%DATADIR%%/gsm-inhibit-dialog.ui
+%%DATADIR%%/session-properties.ui
share/icons/hicolor/16x16/apps/session-properties.png
share/icons/hicolor/22x22/apps/session-properties.png
share/icons/hicolor/24x24/apps/session-properties.png
@@ -28,6 +26,7 @@ share/locale/be@latin/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bn_IN/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/br/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/ca@valencia/LC_MESSAGES/gnome-session-2.0.mo
@@ -68,6 +67,7 @@ share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-session-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mai/LC_MESSAGES/gnome-session-2.0.mo
share/locale/mg/LC_MESSAGES/gnome-session-2.0.mo
share/locale/mi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
@@ -170,6 +170,8 @@ share/xsessions/gnome.desktop
@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/ig/LC_MESSAGES
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
new file mode 100644
index 000000000000..6c9aa50c86fd
--- /dev/null
+++ b/x11/gnome-shell/Makefile
@@ -0,0 +1,49 @@
+# New ports collection makefile for: gnome-shell
+# Date created: 14 Aug 2009
+# Whom: Pawel Worach <pawel.worach@gmail.com>
+#
+# $FreeBSD$
+# $MCom: ports/x11/gnome-shell/Makefile,v 1.6 2009/10/08 06:58:31 kwm Exp $
+#
+
+PORTNAME= gnome-shell
+PORTVERSION= 2.28.0
+CATEGORIES= x11
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Next generation GNOME desktop shell
+
+BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
+ mutter-private.0:${PORTSDIR}/x11-wm/mutter \
+ clutter-glx-1.0:${PORTSDIR}/graphics/clutter \
+ gjs-gi:${PORTSDIR}/lang/gjs
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
+ ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+
+USE_BZIP2= yes
+USE_XORG= x11 xfixes sm
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_AUTOTOOLS= libtool:22
+USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 gnomemenus \
+ gnomedesktop ltverhack libgnomeui librsvg2
+USE_GSTREAMER= theora
+USE_LDCONFIG= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/js -I${LOCALBASE}/include/nspr"
+
+GCONF_SCHEMAS= gnome-shell.schemas
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|-Werror||g' \
+ ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g' \
+ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/src/gnome-shell.in
+
+post-install:
+ @${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo
new file mode 100644
index 000000000000..a96b0a90297d
--- /dev/null
+++ b/x11/gnome-shell/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gnome-shell-2.28.0.tar.bz2) = a9f93a6f03da60f2f6e3fb82a9e7dc94
+SHA256 (gnome2/gnome-shell-2.28.0.tar.bz2) = 64d30bd2692af2047a3056545b8f549c713ee91877cee8742d4b02d606ef6bd4
+SIZE (gnome2/gnome-shell-2.28.0.tar.bz2) = 591376
diff --git a/x11/gnome-shell/files/patch-src_Makefile.in b/x11/gnome-shell/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..592ea873a8f7
--- /dev/null
+++ b/x11/gnome-shell/files/patch-src_Makefile.in
@@ -0,0 +1,18 @@
+--- src/Makefile.in.orig 2009-08-29 12:13:13.000000000 +0200
++++ src/Makefile.in 2009-08-29 12:13:25.000000000 +0200
+@@ -492,7 +492,6 @@ libtray_la_CPPFLAGS = $(tray_cflags)
+ libtray_la_LDFLAGS = $(LDADD)
+ gnome_shell_cflags = \
+ $(MUTTER_PLUGIN_CFLAGS) \
+- $(LIBGNOMEUI_CFLAGS) \
+ -I$(srcdir)/tray \
+ -DGETTEXT_PACKAGE=\"gnome-shell\" \
+ -DLOCALEDIR=\"$(datadir)/locale\" \
+@@ -548,7 +547,6 @@ libgnome_shell_la_gir_sources = \
+ libgnome_shell_la_LDFLAGS = -avoid-version -module
+ libgnome_shell_la_LIBADD = \
+ $(MUTTER_PLUGIN_LIBS) \
+- $(LIBGNOMEUI_LIBS) \
+ libbig-1.0.la \
+ libgdmuser-1.0.la \
+ libtray.la
diff --git a/x11/gnome-shell/files/patch-src_gdmuser_gdm-user-manager.c b/x11/gnome-shell/files/patch-src_gdmuser_gdm-user-manager.c
new file mode 100644
index 000000000000..1bf59d1bcdf9
--- /dev/null
+++ b/x11/gnome-shell/files/patch-src_gdmuser_gdm-user-manager.c
@@ -0,0 +1,11 @@
+--- src/gdmuser/gdm-user-manager.c.orig 2009-08-14 05:38:43.000000000 +0000
++++ src/gdmuser/gdm-user-manager.c 2009-08-14 05:39:14.000000000 +0000
+@@ -1297,7 +1297,7 @@
+ }
+ }
+
+- for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) {
++ for (pwent = getpwent(); pwent != NULL; pwent = getpwent()) {
+ GdmUser *user;
+
+ user = NULL;
diff --git a/x11/gnome-shell/files/patch-src_gnome-shell.in b/x11/gnome-shell/files/patch-src_gnome-shell.in
new file mode 100644
index 000000000000..07775f34dba4
--- /dev/null
+++ b/x11/gnome-shell/files/patch-src_gnome-shell.in
@@ -0,0 +1,8 @@
+--- src/gnome-shell.in.orig 2009-08-28 18:34:04.000000000 +0200
++++ src/gnome-shell.in 2009-08-29 12:13:44.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+
+ import atexit
+ import optparse
diff --git a/x11/gnome-shell/pkg-descr b/x11/gnome-shell/pkg-descr
new file mode 100644
index 000000000000..693aa3b6e258
--- /dev/null
+++ b/x11/gnome-shell/pkg-descr
@@ -0,0 +1,3 @@
+Next generation GNOME desktop shell
+
+WWW: http://live.gnome.org/GnomeShell
diff --git a/x11/gnome-shell/pkg-message b/x11/gnome-shell/pkg-message
new file mode 100644
index 000000000000..e00823112f4b
--- /dev/null
+++ b/x11/gnome-shell/pkg-message
@@ -0,0 +1,33 @@
+Running
+
+You can either start gnome-shell "nested" in a window within your current
+session, or you can run it within your session replacing gnome-panel and
+window manager.
+
+Depending on the state of your X drivers, one or of the other of these may
+work better. So, if the first one you try doesn't work, try the other.
+
+====
+
+Running gnome-shell replacing the panel
+
+This approach is best when trying out the GNOME Shell and wanting to see its
+full potential.
+
+gnome-shell --replace
+
+When gnome-shell exits (you can kill it with Control-C in the terminal in which
+you started it), gnome-panel and metacity are restarted.
+
+====
+
+Running gnome-shell nested
+
+This approach is useful when developing the GNOME Shell and wanting to quickly
+test some changes. NOTE: It isn't useful for getting a good feel for how the
+shell works since it will be really slow, and won't properly integrate with
+the rest of your desktop.
+
+gnome-shell
+(This requires a relatively recent version of Xephyr with GLX support to be
+installed on your system (x11-servers/xephyr).
diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist
new file mode 100644
index 000000000000..a5c993c9bee7
--- /dev/null
+++ b/x11/gnome-shell/pkg-plist
@@ -0,0 +1,76 @@
+bin/gnome-shell
+lib/gnome-shell/Big-1.0.typelib
+lib/gnome-shell/Shell-0.1.typelib
+lib/gnome-shell/St-1.0.typelib
+share/applications/gnome-shell.desktop
+%%DATADIR%%/images/app-well-glow.png
+%%DATADIR%%/images/add-workspace.svg
+%%DATADIR%%/images/back.svg
+%%DATADIR%%/images/close-black.svg
+%%DATADIR%%/images/close.svg
+%%DATADIR%%/images/info.svg
+%%DATADIR%%/images/magnifier.svg
+%%DATADIR%%/images/remove-workspace.svg
+%%DATADIR%%/js/misc/docInfo.js
+%%DATADIR%%/js/misc/format.js
+%%DATADIR%%/js/ui/appIcon.js
+%%DATADIR%%/js/ui/altTab.js
+%%DATADIR%%/js/ui/appDisplay.js
+%%DATADIR%%/js/ui/button.js
+%%DATADIR%%/js/ui/calendar.js
+%%DATADIR%%/js/ui/chrome.js
+%%DATADIR%%/js/ui/dash.js
+%%DATADIR%%/js/ui/dnd.js
+%%DATADIR%%/js/ui/docDisplay.js
+%%DATADIR%%/js/ui/environment.js
+%%DATADIR%%/js/ui/genericDisplay.js
+%%DATADIR%%/js/ui/lightbox.js
+%%DATADIR%%/js/ui/link.js
+%%DATADIR%%/js/ui/lookingGlass.js
+%%DATADIR%%/js/ui/main.js
+%%DATADIR%%/js/ui/overview.js
+%%DATADIR%%/js/ui/panel.js
+%%DATADIR%%/js/ui/places.js
+%%DATADIR%%/js/ui/runDialog.js
+%%DATADIR%%/js/ui/shellDBus.js
+%%DATADIR%%/js/ui/sidebar.js
+%%DATADIR%%/js/ui/tweener.js
+%%DATADIR%%/js/ui/widget.js
+%%DATADIR%%/js/ui/widgetBox.js
+%%DATADIR%%/js/ui/windowManager.js
+%%DATADIR%%/js/ui/workspaces.js
+%%DATADIR%%/theme/gnome-shell.css
+%%DATADIR%%/theme/scroll-button-down-hover.png
+%%DATADIR%%/theme/scroll-button-down.png
+%%DATADIR%%/theme/scroll-button-up-hover.png
+%%DATADIR%%/theme/scroll-button-up.png
+%%DATADIR%%/theme/scroll-vhandle.png
+share/locale/ar/LC_MESSAGES/gnome-shell.mo
+share/locale/ca/LC_MESSAGES/gnome-shell.mo
+share/locale/cs/LC_MESSAGES/gnome-shell.mo
+share/locale/da/LC_MESSAGES/gnome-shell.mo
+share/locale/de/LC_MESSAGES/gnome-shell.mo
+share/locale/en_GB/LC_MESSAGES/gnome-shell.mo
+share/locale/es/LC_MESSAGES/gnome-shell.mo
+share/locale/fr/LC_MESSAGES/gnome-shell.mo
+share/locale/ga/LC_MESSAGES/gnome-shell.mo
+share/locale/gl/LC_MESSAGES/gnome-shell.mo
+share/locale/hu/LC_MESSAGES/gnome-shell.mo
+share/locale/it/LC_MESSAGES/gnome-shell.mo
+share/locale/ko/LC_MESSAGES/gnome-shell.mo
+share/locale/nb/LC_MESSAGES/gnome-shell.mo
+share/locale/nl/LC_MESSAGES/gnome-shell.mo
+share/locale/pa/LC_MESSAGES/gnome-shell.mo
+share/locale/pl/LC_MESSAGES/gnome-shell.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-shell.mo
+share/locale/sl/LC_MESSAGES/gnome-shell.mo
+share/locale/sv/LC_MESSAGES/gnome-shell.mo
+share/locale/tr/LC_MESSAGES/gnome-shell.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-shell.mo
+@dirrm %%DATADIR%%/theme
+@dirrm %%DATADIR%%/js/ui
+@dirrm %%DATADIR%%/js/misc
+@dirrm %%DATADIR%%/js
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%
+@dirrm lib/gnome-shell
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index abedfc642a94..ff75c44352cb 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11/gnome-terminal/Makefile,v 1.3 2009/04/15 14:55:27 kwm Exp $
+# $MCom: ports/x11/gnome-terminal/Makefile,v 1.125 2009/10/19 20:14:29 kwm Exp $
#
PORTNAME= gnome-terminal
-PORTVERSION= 2.26.3.1
-PORTREVISION= 2
+PORTVERSION= 2.28.1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,11 +15,14 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Terminal component for the GNOME 2 Desktop
+LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+
USE_GETTEXT= yes
USE_BZIP2= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte gnomedocutils
+USE_XORG= sm
+USE_GNOME= gnomeprefix gnomehack intlhack gconf2 vte gnomedocutils
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index aa1b4fa091f3..fb1853fd3c94 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-terminal-2.26.3.1.tar.bz2) = b6c6c0f5f3e061da7e56f3a04385bb7b
-SHA256 (gnome2/gnome-terminal-2.26.3.1.tar.bz2) = 40d97f983363002d6da574b35f3e4d44d4e8db38b776b226626f1e83d6fde1dc
-SIZE (gnome2/gnome-terminal-2.26.3.1.tar.bz2) = 2176049
+MD5 (gnome2/gnome-terminal-2.28.1.tar.bz2) = d0eea9c1fe86260bb302c5650259a2ed
+SHA256 (gnome2/gnome-terminal-2.28.1.tar.bz2) = 97bb800a77d95ee33ad6dac8ec995c6c0d5841749eb5e6f40c24357136a02ec0
+SIZE (gnome2/gnome-terminal-2.28.1.tar.bz2) = 2221288
diff --git a/x11/gnome-terminal/files/patch-src_terminal-screen.c b/x11/gnome-terminal/files/patch-src_terminal-screen.c
index e283146a72e6..52f80dd55eb3 100644
--- a/x11/gnome-terminal/files/patch-src_terminal-screen.c
+++ b/x11/gnome-terminal/files/patch-src_terminal-screen.c
@@ -1,5 +1,5 @@
---- src/terminal-screen.c.orig 2009-04-12 15:40:23.000000000 +0200
-+++ src/terminal-screen.c 2009-05-06 00:30:39.000000000 +0200
+--- src/terminal-screen.c.orig 2009-08-13 14:39:24.000000000 +0200
++++ src/terminal-screen.c 2009-08-20 10:41:58.000000000 +0200
@@ -18,6 +18,15 @@
#include <config.h>
@@ -16,9 +16,9 @@
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
-@@ -1744,10 +1753,22 @@
- char*
- terminal_screen_get_current_dir (TerminalScreen *screen)
+@@ -184,15 +193,28 @@ G_DEFINE_TYPE (TerminalScreen, terminal_
+ static char *
+ cwd_of_pid (int pid)
{
+#ifndef __FreeBSD__
static const char patterns[][18] = {
@@ -36,22 +36,21 @@
+#endif /* HAVE_KINFO_GETFILE */
+#endif /* __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) */
+#endif /* __FreeBSD__ */
- TerminalScreenPrivate *priv = screen->priv;
- int fgpid;
guint i;
-@@ -1767,6 +1788,7 @@
- if (fgpid == -1)
- return g_strdup (priv->initial_working_directory);
+
+ if (pid == -1)
+ return NULL;
+#ifndef __FreeBSD__
/* Try to get the working directory using various OS-specific mechanisms */
for (i = 0; i < G_N_ELEMENTS (patterns); ++i)
{
-@@ -1804,6 +1826,48 @@
+@@ -230,6 +252,49 @@ cwd_of_pid (int pid)
return working_dir;
}
}
+#else
++ int fgpid;
+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
+#ifndef HAVE_KINFO_GETFILE
+ name[0] = CTL_KERN;
@@ -94,5 +93,5 @@
+#endif /* __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) */
+#endif /* __FreeBSD__ */
- return g_strdup (priv->initial_working_directory);
+ return NULL;
}
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 83bb026bad34..f9b20ca1628e 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -85,10 +85,13 @@ 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/ca@valencia/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
@@ -110,6 +113,7 @@ 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
@@ -254,6 +258,8 @@ share/omf/gnome-terminal/gnome-terminal-zh_TW.omf
@dirrmtry share/locale/fur
@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
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index 49ea13dfada4..1f3f72876f38 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -3,10 +3,10 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome2-lite/Makefile,v 1.60 2007/08/15 17:52:07 mezz Exp $
+# $MCom: ports/x11/gnome2-lite/Makefile,v 1.62 2009/11/26 20:39:06 marcus Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11 gnome
PKGNAMESUFFIX= -lite
@@ -23,16 +23,13 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applet
nautilus:${PORTSDIR}/x11-fm/nautilus \
${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
${LOCALBASE}/share/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
- file-roller:${PORTSDIR}/archivers/file-roller \
${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
evince:${PORTSDIR}/graphics/evince \
gcalctool:${PORTSDIR}/math/gcalctool \
- gucharmap:${PORTSDIR}/deskutils/gucharmap \
${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
- gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
- totem:${PORTSDIR}/multimedia/totem
+ gnome-mount:${PORTSDIR}/sysutils/gnome-mount
MASTERDIR= ${.CURDIR}/../gnome2
CONFLICTS= gnome2-[0-9]*
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index bfe75b030b86..6b41c17f4cd5 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11/gnome2/Makefile,v 1.7 2009/04/16 10:56:46 kwm Exp $
+# $MCom: ports/x11/gnome2/Makefile,v 1.279 2009/10/22 15:15:40 kwm Exp $
#
PORTNAME= gnome2
-PORTVERSION= 2.26.3
+PORTVERSION= 2.28.1
PORTREVISION?= 0
CATEGORIES?= x11 gnome
MASTER_SITES= # empty
@@ -44,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.26:${PORTSDIR}/mail/evolution-exchange \
+ exchange-connector-setup-2.28:${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 \
@@ -68,7 +68,8 @@ USE_PYTHON= yes
.endif
.if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite"
-OPTIONS= XSCREENSAVER "Use xscreensaver as screen saver app" off
+OPTIONS= XSCREENSAVER "Use xscreensaver as screen saver app" off \
+ MAPI "Depend on evolution-mapi (pulls in samba4)" on
.endif
do-install: # empty
@@ -91,7 +92,7 @@ RUN_DEPENDS+= empathy:${PORTSDIR}/net-im/empathy \
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}/libexec/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \
${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet
.if ${ARCH} == "i386"
#RUN_DEPENDS+= tomboy:${PORTSDIR}/deskutils/tomboy
@@ -99,6 +100,9 @@ RUN_DEPENDS+= empathy:${PORTSDIR}/net-im/empathy \
.if ${OSVERSION}>=600000
RUN_DEPENDS+= ekiga:${PORTSDIR}/net/ekiga
.endif
+.if defined(WITH_MAPI)
+RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libexchangemapi-1.0.pc:${PORTSDIR}/mail/evolution-mapi
+.endif
.endif
.endif
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 02bb0d01e0e6..cc2e85820664 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,12 +3,12 @@
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnome/Makefile,v 1.126 2009/03/18 04:20:56 marcus Exp $
+# $MCom: ports/x11/libgnome/Makefile,v 1.129 2009/09/23 00:32:50 avl Exp $
#
PORTNAME= libgnome
-PORTVERSION= 2.26.0
-PORTREVISION?= 1
+PORTVERSION= 2.28.0
+PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 9490458f33bc..a551c7d051ee 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/libgnome-2.28.0.tar.bz2) = 5c7efe21dc28c137aa766a77a84c0c29
+SHA256 (gnome2/libgnome-2.28.0.tar.bz2) = 9b5b05085b814406f75abfaa1a85395bcf92c8f933248219e1bd738d500d0c0e
+SIZE (gnome2/libgnome-2.28.0.tar.bz2) = 1407385
diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in
index a0dc080c84b6..e52462b671dd 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.20 2009/04/09 03:24:10 mezz Exp $
+# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.23 2009/09/26 13:42:02 marcus Exp $
#
# Restore gconf keys of gnomevfs2.
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index b948e7525d12..1e3d9dc8fe7e 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -35,8 +35,10 @@ share/locale/be/LC_MESSAGES/libgnome-2.0.mo
share/locale/bg/LC_MESSAGES/libgnome-2.0.mo
share/locale/bn/LC_MESSAGES/libgnome-2.0.mo
share/locale/bn_IN/LC_MESSAGES/libgnome-2.0.mo
+share/locale/br/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/ca@valencia/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
@@ -66,6 +68,7 @@ share/locale/is/LC_MESSAGES/libgnome-2.0.mo
share/locale/it/LC_MESSAGES/libgnome-2.0.mo
share/locale/ja/LC_MESSAGES/libgnome-2.0.mo
share/locale/ka/LC_MESSAGES/libgnome-2.0.mo
+share/locale/kn/LC_MESSAGES/libgnome-2.0.mo
share/locale/ko/LC_MESSAGES/libgnome-2.0.mo
share/locale/ku/LC_MESSAGES/libgnome-2.0.mo
share/locale/lt/LC_MESSAGES/libgnome-2.0.mo
@@ -151,6 +154,8 @@ share/pixmaps/backgrounds/gnome/background-default.jpg
@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
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/ast/LC_MESSAGES
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index f1aa98c3c3e1..ceba5371cea8 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnomekbd/Makefile,v 1.29 2009/03/14 05:54:11 marcus Exp $
+# $MCom: ports/x11/libgnomekbd/Makefile,v 1.37 2009/09/22 23:24:04 avl Exp $
#
PORTNAME= libgnomekbd
-PORTVERSION= 2.26.0
-PORTREVISION= 1
+PORTVERSION= 2.28.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,7 +19,7 @@ LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
USE_BZIP2= yes
-USE_GNOME= gnomeprefix gnomehack ltverhack gconf2 libglade2
+USE_GNOME= gnomeprefix gnomehack ltverhack gconf2
USE_AUTOTOOLS= libtool:22
INSTALLS_ICONS= yes
USE_GETTEXT= yes
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index 1d9ecc89cba2..0460e05c9904 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/libgnomekbd-2.28.0.tar.bz2) = b0989c4a2dbe2b5dd892d14195674f2b
+SHA256 (gnome2/libgnomekbd-2.28.0.tar.bz2) = 72da2cc218de666a0ffa8896ae2d01bce3f46fde7072f2aa937c2bcd2d312668
+SIZE (gnome2/libgnomekbd-2.28.0.tar.bz2) = 392332
diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist
index cd3c2506f340..c068cc28da70 100644
--- a/x11/libgnomekbd/pkg-plist
+++ b/x11/libgnomekbd/pkg-plist
@@ -9,20 +9,24 @@ include/libgnomekbd/gkbd-util.h
lib/libgnomekbd.a
lib/libgnomekbd.la
lib/libgnomekbd.so
-lib/libgnomekbd.so.3
+lib/libgnomekbd.so.4
lib/libgnomekbdui.a
lib/libgnomekbdui.la
lib/libgnomekbdui.so
-lib/libgnomekbdui.so.3
+lib/libgnomekbdui.so.4
libdata/pkgconfig/libgnomekbd.pc
libdata/pkgconfig/libgnomekbdui.pc
share/applications/gkbd-indicator-plugins-capplet.desktop
-%%DATADIR%%/glade/gkbd-indicator-plugins.glade
+%%DATADIR%%/ui/gkbd-indicator-plugins.ui
+%%DATADIR%%/ui/gkbd-indicator-plugins_add.ui
share/locale/ar/LC_MESSAGES/libgnomekbd.mo
+share/locale/as/LC_MESSAGES/libgnomekbd.mo
share/locale/be@latin/LC_MESSAGES/libgnomekbd.mo
share/locale/bg/LC_MESSAGES/libgnomekbd.mo
+share/locale/bn/LC_MESSAGES/libgnomekbd.mo
share/locale/bn_IN/LC_MESSAGES/libgnomekbd.mo
share/locale/ca/LC_MESSAGES/libgnomekbd.mo
+share/locale/ca@valencia/LC_MESSAGES/libgnomekbd.mo
share/locale/cs/LC_MESSAGES/libgnomekbd.mo
share/locale/da/LC_MESSAGES/libgnomekbd.mo
share/locale/de/LC_MESSAGES/libgnomekbd.mo
@@ -34,6 +38,7 @@ share/locale/et/LC_MESSAGES/libgnomekbd.mo
share/locale/eu/LC_MESSAGES/libgnomekbd.mo
share/locale/fi/LC_MESSAGES/libgnomekbd.mo
share/locale/fr/LC_MESSAGES/libgnomekbd.mo
+share/locale/ga/LC_MESSAGES/libgnomekbd.mo
share/locale/gl/LC_MESSAGES/libgnomekbd.mo
share/locale/gu/LC_MESSAGES/libgnomekbd.mo
share/locale/he/LC_MESSAGES/libgnomekbd.mo
@@ -42,9 +47,11 @@ share/locale/hu/LC_MESSAGES/libgnomekbd.mo
share/locale/it/LC_MESSAGES/libgnomekbd.mo
share/locale/ja/LC_MESSAGES/libgnomekbd.mo
share/locale/ka/LC_MESSAGES/libgnomekbd.mo
+share/locale/kn/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/mai/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
@@ -74,7 +81,7 @@ share/locale/vi/LC_MESSAGES/libgnomekbd.mo
share/locale/zh_CN/LC_MESSAGES/libgnomekbd.mo
share/locale/zh_HK/LC_MESSAGES/libgnomekbd.mo
share/locale/zh_TW/LC_MESSAGES/libgnomekbd.mo
-@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrm include/libgnomekbd
@@ -90,6 +97,8 @@ share/locale/zh_TW/LC_MESSAGES/libgnomekbd.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/dz/LC_MESSAGES
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index 6b05afae5289..1cfdbef3e6f5 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -3,12 +3,11 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnomemm26/Makefile,v 1.20 2009/03/17 15:00:20 kwm Exp $
+# $MCom: ports/x11/libgnomemm26/Makefile,v 1.22 2009/09/22 21:02:40 kwm Exp $
#
PORTNAME= libgnomemm
-PORTVERSION= 2.26.0
-PORTREVISION= 1
+PORTVERSION= 2.28.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo
index 6bcc7405235b..5ab76c039375 100644
--- a/x11/libgnomemm26/distinfo
+++ b/x11/libgnomemm26/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/libgnomemm-2.28.0.tar.bz2) = 7c583094a12159a0bab0134df5e90853
+SHA256 (gnome2/libgnomemm-2.28.0.tar.bz2) = 55ee731bce977ced2b2cd5661cf605b1eb9d0188aa4d46fba44052a94b500e6e
+SIZE (gnome2/libgnomemm-2.28.0.tar.bz2) = 361769
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index c09671f32c05..83f7314db54a 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -3,14 +3,15 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/libxklavier/Makefile,v 1.47 2009/03/21 04:28:11 marcus Exp $
+# $MCom: ports/x11/libxklavier/Makefile,v 1.51 2009/07/21 22:14:28 marcus Exp $
#
PORTNAME= libxklavier
-PORTVERSION= 3.9
+PORTVERSION= 4.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11 gnome
-MASTER_SITES= SF/gswitchit/${PORTNAME}/${PORTVERSION}
+MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= An utility library to make XKB stuff easier
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index b5b0fc861e4d..be4bcb007ebc 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxklavier-3.9.tar.bz2) = c8ff3ba6daf899be7ec2a626894852b9
-SHA256 (libxklavier-3.9.tar.bz2) = 462a4e427f201a23de194f824dce70c84867464956f2f6c8dd4a5e07f1f4a554
-SIZE (libxklavier-3.9.tar.bz2) = 339409
+MD5 (libxklavier-4.0.tar.bz2) = 1b714ba04835fb49511f9e1444a5ea4c
+SHA256 (libxklavier-4.0.tar.bz2) = 210ed5803109a8cef3b2ab1195bc73fe3385a97a8749d01673e020642d8e5a71
+SIZE (libxklavier-4.0.tar.bz2) = 354149
diff --git a/x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c b/x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c
new file mode 100644
index 000000000000..f749303176a8
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xkl-enum-types.c
@@ -0,0 +1,27 @@
+--- libxklavier/xkl-enum-types.c.orig 2009-07-21 18:10:01.000000000 -0400
++++ libxklavier/xkl-enum-types.c 2009-07-21 18:10:04.000000000 -0400
+@@ -21,9 +21,9 @@ xkl_engine_state_change_get_type (void)
+ GType
+ xkl_engine_features_get_type (void)
+ {
+- static GType etype = 0;
+- if (etype == 0) {
+- static const GEnumValue values[] = {
++ static GType ftype = 0;
++ if (ftype == 0) {
++ static const GFlagsValue values[] = {
+ { XKLF_CAN_TOGGLE_INDICATORS, "XKLF_CAN_TOGGLE_INDICATORS", "can-toggle-indicators" },
+ { XKLF_CAN_OUTPUT_CONFIG_AS_ASCII, "XKLF_CAN_OUTPUT_CONFIG_AS_ASCII", "can-output-config-as-ascii" },
+ { XKLF_CAN_OUTPUT_CONFIG_AS_BINARY, "XKLF_CAN_OUTPUT_CONFIG_AS_BINARY", "can-output-config-as-binary" },
+@@ -32,9 +32,9 @@ xkl_engine_features_get_type (void)
+ { XKLF_DEVICE_DISCOVERY, "XKLF_DEVICE_DISCOVERY", "device-discovery" },
+ { 0, NULL, NULL }
+ };
+- etype = g_enum_register_static ("XklEngineFeatures", values);
++ ftype = g_flags_register_static ("XklEngineFeatures", values);
+ }
+- return etype;
++ return ftype;
+ }
+ GType
+ xkl_engine_listen_modes_get_type (void)
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_props.c b/x11/libxklavier/files/patch-libxklavier_xklavier_props.c
deleted file mode 100644
index a56ec7896810..000000000000
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_props.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libxklavier/xklavier_props.c.orig Sun Apr 16 20:51:36 2006
-+++ libxklavier/xklavier_props.c Tue Jun 13 00:11:24 2006
-@@ -355,10 +355,8 @@ xkl_config_rec_get_from_root_window_prop
- --varlen);
- var[varlen] = '\0';
- /* Resize the original layout */
-- ((char *)
-- g_realloc(*layout,
-- laylen + 1))[laylen] =
-- '\0';
-+ *layout = g_realloc(*layout, laylen + 1);
-+ (*layout)[laylen] = '\0';
- }
- }
- layout++;
diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist
index 98b5565758cd..56aa8de30942 100644
--- a/x11/libxklavier/pkg-plist
+++ b/x11/libxklavier/pkg-plist
@@ -3,6 +3,7 @@ include/libxklavier/xkl_config_rec.h
include/libxklavier/xkl_config_registry.h
include/libxklavier/xkl_engine.h
include/libxklavier/xkl_engine_marshal.h
+include/libxklavier/xkl-enum-types.h
include/libxklavier/xklavier.h
lib/libxklavier.a
lib/libxklavier.la
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index bc18bb68a610..8cc59f283fae 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/yelp/Makefile,v 1.133 2009/03/30 03:32:43 marcus Exp $
+# $MCom: ports/x11/yelp/Makefile,v 1.145 2009/11/20 10:58:38 kwm Exp $
#
PORTNAME= yelp
-PORTVERSION= 2.26.0
-PORTREVISION= 2
+PORTVERSION= 2.28.1
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,6 +17,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A help browser for the GNOME 2 desktop
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+ startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
rarian.0:${PORTSDIR}/textproc/rarian
USE_GECKO= libxul
@@ -24,7 +25,7 @@ USE_GETTEXT= yes
USE_BZIP2= yes
USE_XORG= ice
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils
+USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gnomedocutils
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -35,4 +36,7 @@ MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
GCONF_SCHEMAS= yelp.schemas
+post-extract:
+ ${RM} -f ${WRKSRC}/data/yelp.schemas
+
.include <bsd.port.mk>
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index adc47cac83fc..32b4ef3962f2 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/yelp-2.28.1.tar.bz2) = faf7eac7abf4eded189566f9ffafc188
+SHA256 (gnome2/yelp-2.28.1.tar.bz2) = 860cfb348cbe199bca64203c82858d012fe505194573f8290be7a85de6c80a22
+SIZE (gnome2/yelp-2.28.1.tar.bz2) = 1136184
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 23e7fa35e807..5e84fddacae2 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -16,12 +16,14 @@ share/locale/bn_IN/LC_MESSAGES/yelp.mo
share/locale/br/LC_MESSAGES/yelp.mo
share/locale/bs/LC_MESSAGES/yelp.mo
share/locale/ca/LC_MESSAGES/yelp.mo
+share/locale/ca@valencia/LC_MESSAGES/yelp.mo
share/locale/cs/LC_MESSAGES/yelp.mo
share/locale/cy/LC_MESSAGES/yelp.mo
share/locale/da/LC_MESSAGES/yelp.mo
share/locale/de/LC_MESSAGES/yelp.mo
share/locale/dz/LC_MESSAGES/yelp.mo
share/locale/el/LC_MESSAGES/yelp.mo
+share/locale/en@shaw/LC_MESSAGES/yelp.mo
share/locale/en_CA/LC_MESSAGES/yelp.mo
share/locale/en_GB/LC_MESSAGES/yelp.mo
share/locale/eo/LC_MESSAGES/yelp.mo
@@ -61,7 +63,7 @@ share/locale/mn/LC_MESSAGES/yelp.mo
share/locale/mr/LC_MESSAGES/yelp.mo
share/locale/ms/LC_MESSAGES/yelp.mo
share/locale/nb/LC_MESSAGES/yelp.mo
-share/locale/nds@NFE/LC_MESSAGES/yelp.mo
+share/locale/nds/LC_MESSAGES/yelp.mo
share/locale/ne/LC_MESSAGES/yelp.mo
share/locale/nl/LC_MESSAGES/yelp.mo
share/locale/nn/LC_MESSAGES/yelp.mo
@@ -115,12 +117,16 @@ share/locale/zu/LC_MESSAGES/yelp.mo
%%DATADIR%%/man.xml
%%DATADIR%%/scrollkeeper.xml
%%DATADIR%%/toc.xml
+%%DATADIR%%/ui/yelp-bookmarks-add.ui
+%%DATADIR%%/ui/yelp-bookmarks.ui
+%%DATADIR%%/ui/yelp-open-location.ui
+%%DATADIR%%/ui/yelp-preferences.ui
%%DATADIR%%/ui/yelp-search-ui.xml
%%DATADIR%%/ui/yelp-ui.xml
-%%DATADIR%%/ui/yelp.glade
%%DATADIR%%/xslt/db-title.xsl
%%DATADIR%%/xslt/db2html.xsl
%%DATADIR%%/xslt/info2html.xsl
+%%DATADIR%%/xslt/mal2html.xsl
%%DATADIR%%/xslt/man2html.xsl
%%DATADIR%%/xslt/search2html.xsl
%%DATADIR%%/xslt/toc2html.xsl
@@ -155,8 +161,8 @@ share/locale/zu/LC_MESSAGES/yelp.mo
@dirrmtry share/locale/oc
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
-@dirrmtry share/locale/nds@NFE/LC_MESSAGES
-@dirrmtry share/locale/nds@NFE
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@@ -173,8 +179,12 @@ share/locale/zu/LC_MESSAGES/yelp.mo
@dirrmtry share/locale/ks
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 58bd06439664..0753c8feb7d9 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,12 +3,11 @@
# Whom: Franz Klammer <klammer@webonaut.com>
#
# $FreeBSD$
-# $MCom: ports/x11/zenity/Makefile,v 1.98 2009/03/17 22:47:07 kwm Exp $
+# $MCom: ports/x11/zenity/Makefile,v 1.102 2009/09/21 22:23:34 kwm Exp $
#
PORTNAME= zenity
-PORTVERSION= 2.26.0
-PORTREVISION= 1
+PORTVERSION= 2.28.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,7 +19,7 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack libgnomecanvas gnomedocutils intlhack
+USE_GNOME= gnomeprefix gnomehack gtk20 gnomedocutils intlhack
USE_BZIP2= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index 8da51c4de29b..06a52221ec3f 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/zenity-2.28.0.tar.bz2) = 262c476aebbf67a7043cd80c6a03add3
+SHA256 (gnome2/zenity-2.28.0.tar.bz2) = 3747a23ce46b0ee68e6261d669ae461f0f460d9c6ad19e04acbd518ddfcc8c63
+SIZE (gnome2/zenity-2.28.0.tar.bz2) = 3095956
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 1c49882ffc5c..de7746f1eed5 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -25,6 +25,30 @@ share/gnome/help/zenity/bg/figures/zenity-question-screenshot.png
share/gnome/help/zenity/bg/figures/zenity-text-screenshot.png
share/gnome/help/zenity/bg/figures/zenity-warning-screenshot.png
share/gnome/help/zenity/bg/zenity.xml
+share/gnome/help/zenity/cs/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/cs/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/cs/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/cs/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/cs/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/cs/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/cs/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/cs/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/cs/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/cs/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/cs/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/cs/zenity.xml
+share/gnome/help/zenity/da/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/da/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/da/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/da/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/da/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/da/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/da/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/da/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/da/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/da/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/da/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/da/zenity.xml
share/gnome/help/zenity/de/figures/zenity-calendar-screenshot.png
share/gnome/help/zenity/de/figures/zenity-entry-screenshot.png
share/gnome/help/zenity/de/figures/zenity-error-screenshot.png
@@ -37,6 +61,18 @@ share/gnome/help/zenity/de/figures/zenity-question-screenshot.png
share/gnome/help/zenity/de/figures/zenity-text-screenshot.png
share/gnome/help/zenity/de/figures/zenity-warning-screenshot.png
share/gnome/help/zenity/de/zenity.xml
+share/gnome/help/zenity/el/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/el/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/el/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/el/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/el/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/el/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/el/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/el/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/el/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/el/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/el/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/el/zenity.xml
share/gnome/help/zenity/en_GB/figures/zenity-calendar-screenshot.png
share/gnome/help/zenity/en_GB/figures/zenity-entry-screenshot.png
share/gnome/help/zenity/en_GB/figures/zenity-error-screenshot.png
@@ -109,6 +145,18 @@ share/gnome/help/zenity/oc/figures/zenity-question-screenshot.png
share/gnome/help/zenity/oc/figures/zenity-text-screenshot.png
share/gnome/help/zenity/oc/figures/zenity-warning-screenshot.png
share/gnome/help/zenity/oc/zenity.xml
+share/gnome/help/zenity/pt_BR/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/pt_BR/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/pt_BR/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/pt_BR/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/pt_BR/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/pt_BR/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/pt_BR/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/pt_BR/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/pt_BR/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/pt_BR/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/pt_BR/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/pt_BR/zenity.xml
share/gnome/help/zenity/ru/figures/zenity-calendar-screenshot.png
share/gnome/help/zenity/ru/figures/zenity-entry-screenshot.png
share/gnome/help/zenity/ru/figures/zenity-error-screenshot.png
@@ -156,6 +204,7 @@ share/locale/bn/LC_MESSAGES/zenity.mo
share/locale/bn_IN/LC_MESSAGES/zenity.mo
share/locale/bs/LC_MESSAGES/zenity.mo
share/locale/ca/LC_MESSAGES/zenity.mo
+share/locale/ca@valencia/LC_MESSAGES/zenity.mo
share/locale/cs/LC_MESSAGES/zenity.mo
share/locale/cy/LC_MESSAGES/zenity.mo
share/locale/da/LC_MESSAGES/zenity.mo
@@ -187,6 +236,7 @@ share/locale/ko/LC_MESSAGES/zenity.mo
share/locale/ku/LC_MESSAGES/zenity.mo
share/locale/lt/LC_MESSAGES/zenity.mo
share/locale/lv/LC_MESSAGES/zenity.mo
+share/locale/mai/LC_MESSAGES/zenity.mo
share/locale/mg/LC_MESSAGES/zenity.mo
share/locale/mi/LC_MESSAGES/zenity.mo
share/locale/mk/LC_MESSAGES/zenity.mo
@@ -228,13 +278,17 @@ share/locale/zh_HK/LC_MESSAGES/zenity.mo
share/locale/zh_TW/LC_MESSAGES/zenity.mo
share/omf/zenity/zenity-C.omf
share/omf/zenity/zenity-bg.omf
+share/omf/zenity/zenity-cs.omf
+share/omf/zenity/zenity-da.omf
share/omf/zenity/zenity-de.omf
+share/omf/zenity/zenity-el.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
+share/omf/zenity/zenity-pt_BR.omf
share/omf/zenity/zenity-ru.omf
share/omf/zenity/zenity-sv.omf
share/omf/zenity/zenity-uk.omf
@@ -251,36 +305,11 @@ share/omf/zenity/zenity-uk.omf
%%DATADIR%%/zenity-progress.png
%%DATADIR%%/zenity-scale.png
%%DATADIR%%/zenity-text.png
-%%DATADIR%%/zenity.glade
%%DATADIR%%/zenity.png
+%%DATADIR%%/zenity.ui
@dirrm %%DATADIR%%/clothes
@dirrm %%DATADIR%%
@dirrm share/omf/zenity
-@dirrm share/gnome/help/zenity/uk/figures
-@dirrm share/gnome/help/zenity/uk
-@dirrm share/gnome/help/zenity/sv/figures
-@dirrm share/gnome/help/zenity/sv
-@dirrm share/gnome/help/zenity/ru/figures
-@dirrm share/gnome/help/zenity/ru
-@dirrm share/gnome/help/zenity/oc/figures
-@dirrm share/gnome/help/zenity/oc
-@dirrm share/gnome/help/zenity/fr/figures
-@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
-@dirrm share/gnome/help/zenity/en_GB
-@dirrm share/gnome/help/zenity/de/figures
-@dirrm share/gnome/help/zenity/de
-@dirrm share/gnome/help/zenity/bg/figures
-@dirrm share/gnome/help/zenity/bg
-@dirrm share/gnome/help/zenity/C/figures
-@dirrm share/gnome/help/zenity/C
-@dirrm share/gnome/help/zenity
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@@ -295,6 +324,8 @@ share/omf/zenity/zenity-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
@@ -303,13 +334,50 @@ share/omf/zenity/zenity-uk.omf
@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/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/as/LC_MESSAGES
@dirrmtry share/locale/as
+@dirrm share/gnome/help/zenity/uk/figures
+@dirrm share/gnome/help/zenity/uk
+@dirrm share/gnome/help/zenity/sv/figures
+@dirrm share/gnome/help/zenity/sv
+@dirrm share/gnome/help/zenity/ru/figures
+@dirrm share/gnome/help/zenity/ru
+@dirrm share/gnome/help/zenity/pt_BR/figures
+@dirrm share/gnome/help/zenity/pt_BR
+@dirrm share/gnome/help/zenity/oc/figures
+@dirrm share/gnome/help/zenity/oc
+@dirrm share/gnome/help/zenity/fr/figures
+@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
+@dirrm share/gnome/help/zenity/en_GB
+@dirrm share/gnome/help/zenity/el/figures
+@dirrm share/gnome/help/zenity/el
+@dirrm share/gnome/help/zenity/de/figures
+@dirrm share/gnome/help/zenity/de
+@dirrm share/gnome/help/zenity/da/figures
+@dirrm share/gnome/help/zenity/da
+@dirrm share/gnome/help/zenity/cs/figures
+@dirrm share/gnome/help/zenity/cs
+@dirrm share/gnome/help/zenity/bg/figures
+@dirrm share/gnome/help/zenity/bg
+@dirrm share/gnome/help/zenity/C/figures
+@dirrm share/gnome/help/zenity/C
+@dirrm share/gnome/help/zenity