aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED6
-rw-r--r--Mk/bsd.gnome.mk65
-rw-r--r--UPDATING19
-rw-r--r--accessibility/Makefile1
-rw-r--r--accessibility/at-spi/Makefile6
-rw-r--r--accessibility/at-spi/distinfo6
-rw-r--r--accessibility/at-spi/pkg-plist6
-rw-r--r--accessibility/at-spi2-atk/Makefile10
-rw-r--r--accessibility/at-spi2-atk/distinfo5
-rw-r--r--accessibility/at-spi2-atk/pkg-plist57
-rw-r--r--accessibility/at-spi2-core/Makefile7
-rw-r--r--accessibility/at-spi2-core/distinfo5
-rw-r--r--accessibility/at-spi2-core/pkg-plist4
-rw-r--r--accessibility/atk/Makefile6
-rw-r--r--accessibility/atk/distinfo6
-rw-r--r--accessibility/atk/pkg-plist6
-rw-r--r--accessibility/atkmm/Makefile29
-rw-r--r--accessibility/atkmm/distinfo3
-rw-r--r--accessibility/atkmm/pkg-descr3
-rw-r--r--accessibility/atkmm/pkg-plist51
-rw-r--r--accessibility/gnome-mag/Makefile5
-rw-r--r--accessibility/gnome-mag/distinfo5
-rw-r--r--accessibility/gok/Makefile5
-rw-r--r--accessibility/gok/distinfo6
-rw-r--r--accessibility/mousetweaks/Makefile6
-rw-r--r--accessibility/mousetweaks/distinfo5
-rw-r--r--accessibility/mousetweaks/pkg-plist2
-rw-r--r--accessibility/orca/Makefile10
-rw-r--r--accessibility/orca/distinfo5
-rw-r--r--accessibility/orca/files/patch-configure11
-rw-r--r--accessibility/orca/files/patch-src_orca_orca.in31
-rw-r--r--accessibility/orca/pkg-plist319
-rw-r--r--accessibility/py-atspi/Makefile5
-rw-r--r--accessibility/py-atspi/distinfo5
-rw-r--r--archivers/file-roller/Makefile6
-rw-r--r--archivers/file-roller/distinfo5
-rw-r--r--archivers/file-roller/files/patch-src_fr-command-lrzip.c11
-rw-r--r--archivers/file-roller/pkg-plist16
-rw-r--r--audio/gmpc/Makefile3
-rw-r--r--audio/gnome-media/Makefile5
-rw-r--r--audio/gnome-media/distinfo6
-rw-r--r--audio/gnome-media/pkg-plist53
-rw-r--r--audio/gx2osd/Makefile2
-rw-r--r--audio/muine/files/patch-libmuine_Makefile.in11
-rw-r--r--audio/rhythmbox/Makefile6
-rw-r--r--audio/rhythmbox/files/patch-remote_dbus_rb-client.c38
-rw-r--r--audio/sound-juicer/Makefile7
-rw-r--r--audio/sound-juicer/distinfo6
-rw-r--r--audio/sound-juicer/pkg-plist16
-rw-r--r--cad/geda-gattrib/Makefile2
-rw-r--r--cad/geda-gattrib/files/patch-src_gtkitementry_2_2.c28
-rw-r--r--databases/evolution-data-server/Makefile9
-rw-r--r--databases/evolution-data-server/distinfo5
-rw-r--r--databases/evolution-data-server/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c11
-rw-r--r--databases/evolution-data-server/pkg-plist247
-rw-r--r--databases/glom/Makefile6
-rw-r--r--databases/libgda4-mysql/Makefile4
-rw-r--r--databases/libgda4-mysql/pkg-plist2
-rw-r--r--databases/libgda4-postgresql/Makefile4
-rw-r--r--databases/libgda4-postgresql/pkg-plist4
-rw-r--r--databases/libgda4/Makefile59
-rw-r--r--databases/libgda4/distinfo5
-rw-r--r--databases/libgda4/files/patch-configure62
-rw-r--r--databases/libgda4/pkg-plist284
-rw-r--r--databases/libgdamm/Makefile5
-rw-r--r--databases/libgdamm/distinfo6
-rw-r--r--databases/libgdamm/pkg-plist6
-rw-r--r--deskutils/contacts/Makefile2
-rw-r--r--deskutils/deskbar-applet/Makefile5
-rw-r--r--deskutils/deskbar-applet/distinfo6
-rw-r--r--deskutils/deskbar-applet/pkg-plist7
-rw-r--r--deskutils/gbirthday/Makefile1
-rw-r--r--deskutils/glabels/Makefile2
-rw-r--r--deskutils/gnome-utils/Makefile5
-rw-r--r--deskutils/gnome-utils/distinfo6
-rw-r--r--deskutils/gnome-utils/pkg-plist4
-rw-r--r--deskutils/gnote/Makefile5
-rw-r--r--deskutils/gnote/distinfo5
-rw-r--r--deskutils/gnote/files/patch-libtomboy_tomboyutil.c14
-rw-r--r--deskutils/gnote/pkg-plist56
-rw-r--r--deskutils/gucharmap/Makefile4
-rw-r--r--deskutils/gucharmap/distinfo5
-rw-r--r--deskutils/gucharmap/pkg-plist36
-rw-r--r--deskutils/libopensync-plugin-evolution2-devel/Makefile2
-rw-r--r--deskutils/libopensync-plugin-evolution2/Makefile2
-rw-r--r--deskutils/nautilus-sendto/Makefile24
-rw-r--r--deskutils/nautilus-sendto/distinfo6
-rw-r--r--deskutils/nautilus-sendto/files/patch-configure13
-rw-r--r--deskutils/nautilus-sendto/pkg-plist17
-rw-r--r--deskutils/notification-daemon/Makefile15
-rw-r--r--deskutils/notification-daemon/distinfo6
-rw-r--r--deskutils/notification-daemon/pkg-plist21
-rw-r--r--devel/Makefile2
-rw-r--r--devel/ORBit2/Makefile6
-rw-r--r--devel/ORBit2/distinfo6
-rw-r--r--devel/anjuta-extras/Makefile6
-rw-r--r--devel/anjuta-extras/distinfo6
-rw-r--r--devel/anjuta-extras/pkg-plist6
-rw-r--r--devel/anjuta/Makefile34
-rw-r--r--devel/anjuta/distinfo5
-rw-r--r--devel/anjuta/files/patch-plugins_gdb_debugger.c10
-rw-r--r--devel/anjuta/pkg-plist196
-rw-r--r--devel/bug-buddy/Makefile10
-rw-r--r--devel/bug-buddy/distinfo6
-rw-r--r--devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc55
-rw-r--r--devel/bug-buddy/files/patch-src_bug-buddy.c26
-rw-r--r--devel/bug-buddy/files/patch-src_elf.c42
-rw-r--r--devel/bug-buddy/files/patch-src_gdb-buddy.c11
-rw-r--r--devel/bug-buddy/pkg-plist3
-rw-r--r--devel/crow/Makefile2
-rw-r--r--devel/devhelp/Makefile8
-rw-r--r--devel/devhelp/distinfo6
-rw-r--r--devel/devhelp/files/patch-src_dh-base.c14
-rw-r--r--devel/devhelp/files/patch-src_dh-book-manager.c13
-rw-r--r--devel/devhelp/pkg-plist34
-rw-r--r--devel/gconf2/Makefile17
-rw-r--r--devel/gconf2/distinfo6
-rw-r--r--devel/gconf2/files/patch-gsettings_gconfsettingsbackend.c9
-rw-r--r--devel/gconf2/pkg-plist13
-rw-r--r--devel/giggle/Makefile1
-rw-r--r--devel/gio-fam-backend/Makefile6
-rw-r--r--devel/gio-fam-backend/distinfo5
-rw-r--r--devel/gir-repository-dbus/Makefile15
-rw-r--r--devel/gir-repository/Makefile6
-rw-r--r--devel/gir-repository/bsd.gir.mk64
-rw-r--r--devel/gir-repository/files/patch-gir_Makefile.in24
-rw-r--r--devel/glade3/Makefile5
-rw-r--r--devel/glade3/distinfo6
-rw-r--r--devel/glade3/pkg-plist45
-rw-r--r--devel/glib20-reference/bsd.gnome-reference.mk2
-rw-r--r--devel/glib20/Makefile14
-rw-r--r--devel/glib20/distinfo5
-rw-r--r--devel/glib20/files/extra-patch-glib_gunicollate.c33
-rw-r--r--devel/glib20/files/patch-ae28
-rw-r--r--devel/glib20/files/patch-ag18
-rw-r--r--devel/glib20/files/patch-gio_tests_gdbus-peer.c11
-rw-r--r--devel/glib20/files/patch-glib::libcharset::Makefile.in16
-rw-r--r--devel/glib20/files/patch-glib_Makefile.in25
-rw-r--r--devel/glib20/files/patch-gobject_Makefile.in12
-rw-r--r--devel/glib20/pkg-plist41
-rw-r--r--devel/glibmm/Makefile6
-rw-r--r--devel/glibmm/distinfo6
-rw-r--r--devel/glibmm/pkg-plist51
-rw-r--r--devel/gnome-vfs/Makefile6
-rw-r--r--devel/gnome-vfs/distinfo6
-rw-r--r--devel/gnome-vfs/files/patch-configure53
-rw-r--r--devel/gnome-vfs/pkg-deinstall.in2
-rw-r--r--devel/gnome-vfs/pkg-install.in2
-rw-r--r--devel/gobject-introspection/Makefile10
-rw-r--r--devel/gobject-introspection/distinfo6
-rw-r--r--devel/gobject-introspection/files/patch-gir_Makefile.in10
-rw-r--r--devel/gobject-introspection/files/patch-girepository_ginfo.c46
-rw-r--r--devel/gobject-introspection/files/patch-giscanner_sourcescanner.py11
-rw-r--r--devel/gobject-introspection/files/patch-giscanner_xmlwriter.py11
-rw-r--r--devel/gobject-introspection/files/patch-tests_Makefile.in18
-rw-r--r--devel/gobject-introspection/pkg-plist120
-rw-r--r--devel/gvfs/Makefile7
-rw-r--r--devel/gvfs/distinfo5
-rw-r--r--devel/gvfs/pkg-plist4
-rw-r--r--devel/json-glib/Makefile4
-rw-r--r--devel/json-glib/distinfo6
-rw-r--r--devel/json-glib/pkg-plist5
-rw-r--r--devel/libbonobo/Makefile9
-rw-r--r--devel/libbonobo/distinfo6
-rw-r--r--devel/libbonobo/pkg-plist3
-rw-r--r--devel/libgdata/Makefile11
-rw-r--r--devel/libgdata/distinfo6
-rw-r--r--devel/libgdata/pkg-plist4
-rw-r--r--devel/libgee/Makefile8
-rw-r--r--devel/libgee/distinfo6
-rw-r--r--devel/libgee/files/patch-gee_Makefile.in11
-rw-r--r--devel/libgee/pkg-plist4
-rw-r--r--devel/libnotify/Makefile11
-rw-r--r--devel/libnotify/distinfo6
-rw-r--r--devel/libnotify/pkg-plist3
-rw-r--r--devel/liboobs/Makefile4
-rw-r--r--devel/liboobs/distinfo6
-rw-r--r--devel/liboobs/pkg-plist2
-rw-r--r--devel/libsoup-gnome/Makefile29
-rw-r--r--devel/libsoup-gnome/pkg-descr16
-rw-r--r--devel/libsoup-gnome/pkg-plist10
-rw-r--r--devel/libsoup/Makefile50
-rw-r--r--devel/libsoup/distinfo5
-rw-r--r--devel/libsoup/files/patch-libsoup_Makefile.in19
-rw-r--r--devel/libsoup/pkg-plist14
-rw-r--r--devel/monotone-viz/Makefile2
-rw-r--r--devel/py-gobject/Makefile22
-rw-r--r--devel/py-gobject/distinfo6
-rw-r--r--devel/py-gobject/pkg-plist41
-rw-r--r--devel/seed/Makefile11
-rw-r--r--devel/seed/distinfo6
-rw-r--r--devel/seed/pkg-plist3
-rw-r--r--devel/upp/files/patch-uppsrc_ide_Makefile11
-rw-r--r--devel/valide/Makefile2
-rw-r--r--editors/gedit-plugins/Makefile6
-rw-r--r--editors/gedit-plugins/distinfo6
-rw-r--r--editors/gedit-plugins/pkg-plist35
-rw-r--r--editors/gedit/Makefile6
-rw-r--r--editors/gedit/distinfo6
-rw-r--r--editors/gedit/pkg-plist4
-rw-r--r--games/gnome-games/Makefile12
-rw-r--r--games/gnome-games/distinfo5
-rw-r--r--games/gnome-games/pkg-plist131
-rw-r--r--graphics/Makefile1
-rw-r--r--graphics/cairo/Makefile47
-rw-r--r--graphics/cairo/distinfo6
-rw-r--r--graphics/cairo/files/patch-src_cairo.h11
-rw-r--r--graphics/cairo/pkg-plist26
-rw-r--r--graphics/cairomm/Makefile7
-rw-r--r--graphics/cairomm/distinfo6
-rw-r--r--graphics/cairomm/files/patch-cairomm_fontface.cc11
-rw-r--r--graphics/cairomm/pkg-plist21
-rw-r--r--graphics/clutter-gtk/Makefile9
-rw-r--r--graphics/clutter-gtk/distinfo6
-rw-r--r--graphics/clutter-gtk/files/patch-clutter-gtk_Makefile.in28
-rw-r--r--graphics/clutter-qt/Makefile2
-rw-r--r--graphics/clutter/Makefile12
-rw-r--r--graphics/clutter/distinfo6
-rw-r--r--graphics/clutter/files/patch-clutter_cogl_cogl_Makefile.in10
-rw-r--r--graphics/clutter/files/patch-clutter_glx_clutter-stage-glx.c12
-rw-r--r--graphics/clutter/pkg-plist130
-rw-r--r--graphics/eog-plugins/Makefile12
-rw-r--r--graphics/eog/Makefile16
-rw-r--r--graphics/eog/distinfo5
-rw-r--r--graphics/eog/pkg-plist3
-rw-r--r--graphics/evince/Makefile15
-rw-r--r--graphics/evince/distinfo6
-rw-r--r--graphics/evince/pkg-plist179
-rw-r--r--graphics/gdk-pixbuf2/Makefile45
-rw-r--r--graphics/gdk-pixbuf2/distinfo2
-rw-r--r--graphics/gdk-pixbuf2/files/patch-Makefile.in11
-rw-r--r--graphics/gdk-pixbuf2/pkg-descr8
-rw-r--r--graphics/gdk-pixbuf2/pkg-plist246
-rw-r--r--graphics/gimp-app/Makefile6
-rw-r--r--graphics/gimp-app/distinfo6
-rw-r--r--graphics/gimp-app/pkg-plist2
-rw-r--r--graphics/gimp/Makefile4
-rw-r--r--graphics/gir-repository-poppler/Makefile3
-rw-r--r--graphics/goocanvasmm/Makefile6
-rw-r--r--graphics/goocanvasmm/distinfo6
-rw-r--r--graphics/goocanvasmm/pkg-plist148
-rw-r--r--graphics/libchamplain/Makefile19
-rw-r--r--graphics/libchamplain/distinfo6
-rw-r--r--graphics/libchamplain/pkg-plist115
-rw-r--r--graphics/libgnomecanvas/Makefile6
-rw-r--r--graphics/libgnomecanvas/distinfo6
-rw-r--r--graphics/librsvg2/Makefile43
-rw-r--r--graphics/librsvg2/distinfo5
-rw-r--r--graphics/librsvg2/files/patch-Makefile.in19
-rw-r--r--graphics/librsvg2/files/patch-gtk-engines_Makefile.in20
-rw-r--r--graphics/librsvg2/pkg-plist78
-rw-r--r--graphics/nip2/Makefile2
-rw-r--r--graphics/nip2/files/patch-src_gtkitementry.c56
-rw-r--r--graphics/poppler-data/Makefile4
-rw-r--r--graphics/poppler-data/distinfo5
-rw-r--r--graphics/poppler-gtk/Makefile4
-rw-r--r--graphics/poppler-gtk/pkg-plist5
-rw-r--r--graphics/poppler-qt/Makefile2
-rw-r--r--graphics/poppler-qt4/Makefile2
-rw-r--r--graphics/poppler-qt4/pkg-plist1
-rw-r--r--graphics/poppler-utils/Makefile4
-rw-r--r--graphics/poppler/Makefile13
-rw-r--r--graphics/poppler/distinfo5
-rw-r--r--graphics/poppler/files/patch-glib_Makefile.in40
-rw-r--r--graphics/poppler/files/patch-qt4_src_Makefile.in28
-rw-r--r--graphics/poppler/pkg-plist26
-rw-r--r--graphics/py-cairo/Makefile10
-rw-r--r--graphics/py-cairo/distinfo5
-rw-r--r--graphics/py-clutter/Makefile4
-rw-r--r--graphics/py-clutter/files/patch-clutter_cogl-base-types.defs33
-rw-r--r--graphics/shotwell/Makefile2
-rw-r--r--lang/Makefile1
-rw-r--r--lang/gjs/Makefile5
-rw-r--r--lang/gjs/distinfo5
-rw-r--r--lang/gjs/pkg-plist10
-rw-r--r--lang/vala-vapigen/Makefile26
-rw-r--r--lang/vala-vapigen/pkg-descr16
-rw-r--r--lang/vala-vapigen/pkg-plist8
-rw-r--r--lang/vala/Makefile44
-rw-r--r--lang/vala/distinfo6
-rw-r--r--lang/vala/files/patch-vapigen_Makefile.in34
-rw-r--r--lang/vala/pkg-plist464
-rw-r--r--mail/claws-mail/Makefile4
-rw-r--r--mail/contact-lookup-applet/Makefile2
-rw-r--r--mail/evolution-exchange/Makefile13
-rw-r--r--mail/evolution-exchange/distinfo5
-rw-r--r--mail/evolution-exchange/pkg-plist8
-rw-r--r--mail/evolution-mapi/Makefile6
-rw-r--r--mail/evolution-mapi/distinfo5
-rw-r--r--mail/evolution-mapi/files/patch-src_libexchangemapi_exchnage-mapi-cal-utils.c10
-rw-r--r--mail/evolution-mapi/pkg-plist12
-rw-r--r--mail/evolution-sharp/Makefile2
-rw-r--r--mail/evolution/Makefile22
-rw-r--r--mail/evolution/distinfo5
-rw-r--r--mail/evolution/files/fix-plugins.sh4
-rw-r--r--mail/evolution/pkg-plist532
-rw-r--r--math/gcalctool/Makefile9
-rw-r--r--math/gcalctool/distinfo5
-rw-r--r--math/gcalctool/files/patch-configure13
-rw-r--r--math/gcalctool/files/patch-po__zh_CN.po14
-rw-r--r--math/gcalctool/pkg-plist101
-rw-r--r--math/pspp/Makefile2
-rw-r--r--misc/gnome-devel-docs/Makefile4
-rw-r--r--misc/gnome-devel-docs/distinfo6
-rw-r--r--misc/gnome-devel-docs/pkg-plist336
-rw-r--r--misc/gnome-icon-theme/Makefile5
-rw-r--r--misc/gnome-icon-theme/distinfo6
-rw-r--r--misc/gnome-icon-theme/pkg-plist86
-rw-r--r--misc/gnome-user-docs/Makefile4
-rw-r--r--misc/gnome-user-docs/distinfo6
-rw-r--r--misc/gnome-user-docs/pkg-plist205
-rw-r--r--misc/quick-lounge-applet/Makefile5
-rw-r--r--misc/quick-lounge-applet/distinfo5
-rw-r--r--misc/quick-lounge-applet/pkg-plist25
-rw-r--r--multimedia/bmpx/Makefile1
-rw-r--r--multimedia/cheese/Makefile5
-rw-r--r--multimedia/cheese/distinfo6
-rw-r--r--multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c34
-rw-r--r--multimedia/cheese/pkg-plist17
-rw-r--r--multimedia/clutter-gst/Makefile3
-rw-r--r--multimedia/swfdec-gnome/Makefile5
-rw-r--r--multimedia/swfdec-gnome/distinfo6
-rw-r--r--multimedia/swfdec-gnome/pkg-plist2
-rw-r--r--multimedia/totem-pl-parser/Makefile7
-rw-r--r--multimedia/totem-pl-parser/distinfo6
-rw-r--r--multimedia/totem-pl-parser/pkg-plist1
-rw-r--r--multimedia/totem/Makefile7
-rw-r--r--multimedia/totem/distinfo6
-rw-r--r--multimedia/totem/files/patch-configure17
-rw-r--r--multimedia/totem/pkg-plist6
-rw-r--r--net-im/Makefile2
-rw-r--r--net-im/empathy/Makefile21
-rw-r--r--net-im/empathy/distinfo5
-rw-r--r--net-im/empathy/files/patch-configure28
-rw-r--r--net-im/empathy/pkg-plist262
-rw-r--r--net-im/folks/Makefile32
-rw-r--r--net-im/folks/distinfo3
-rw-r--r--net-im/folks/pkg-descr7
-rw-r--r--net-im/folks/pkg-plist27
-rw-r--r--net-im/gossip/Makefile2
-rw-r--r--net-im/libpurple/Makefile2
-rw-r--r--net-im/pino/Makefile2
-rw-r--r--net-im/telepathy-gabble/Makefile9
-rw-r--r--net-im/telepathy-gabble/distinfo5
-rw-r--r--net-im/telepathy-gabble/files/patch-Makefile.in12
-rw-r--r--net-im/telepathy-gabble/files/patch-lib_gibber_asyncns.c10
-rw-r--r--net-im/telepathy-gabble/files/patch-lib_gibber_gibber-fd-transport.h12
-rw-r--r--net-im/telepathy-gabble/files/patch-lib_gibber_gibber-resolver.c12
-rw-r--r--net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c257
-rw-r--r--net-im/telepathy-gabble/files/patch-lib_gibber_gibber-util.h12
-rw-r--r--net-im/telepathy-gabble/files/patch-src_bytestream-socks5.c11
-rw-r--r--net-im/telepathy-gabble/files/patch-src_jingle-factory.c13
-rw-r--r--net-im/telepathy-gabble/files/patch-src_tube-stream.c10
-rw-r--r--net-im/telepathy-gabble/pkg-plist4
-rw-r--r--net-im/telepathy-glib/Makefile14
-rw-r--r--net-im/telepathy-glib/distinfo6
-rw-r--r--net-im/telepathy-glib/pkg-plist53
-rw-r--r--net-im/telepathy-logger/Makefile36
-rw-r--r--net-im/telepathy-logger/distinfo3
-rw-r--r--net-im/telepathy-logger/files/patch-configure13
-rw-r--r--net-im/telepathy-logger/pkg-descr3
-rw-r--r--net-im/telepathy-logger/pkg-plist35
-rw-r--r--net-im/telepathy-mission-control/Makefile7
-rw-r--r--net-im/telepathy-mission-control/distinfo6
-rw-r--r--net-im/telepathy-mission-control/files/patch-util_mc-tool.c35
-rw-r--r--net-im/telepathy-mission-control/pkg-plist108
-rw-r--r--net/avahi-app/Makefile16
-rw-r--r--net/avahi-app/distinfo6
-rw-r--r--net/avahi-app/pkg-plist7
-rw-r--r--net/avahi/Makefile4
-rw-r--r--net/ekiga/Makefile2
-rw-r--r--net/ekiga3/files/patch-configure20
-rw-r--r--net/ekiga3/files/patch-lib_engine_components_libnotify_libnotify-main.cpp10
-rw-r--r--net/gnome-netstatus/Makefile5
-rw-r--r--net/gnome-netstatus/distinfo6
-rw-r--r--net/gnome-netstatus/pkg-plist1
-rw-r--r--net/gnome-nettool/Makefile6
-rw-r--r--net/gnome-nettool/distinfo6
-rw-r--r--net/gnome-nettool/pkg-plist4
-rw-r--r--net/libgweather/Makefile5
-rw-r--r--net/libgweather/distinfo6
-rw-r--r--net/libgweather/pkg-plist1
-rw-r--r--net/liferea/Makefile3
-rw-r--r--net/vinagre/Makefile5
-rw-r--r--net/vinagre/distinfo6
-rw-r--r--net/vinagre/pkg-plist4
-rw-r--r--net/vino/Makefile8
-rw-r--r--net/vino/distinfo6
-rw-r--r--net/vino/files/patch-configure12
-rw-r--r--net/vino/pkg-plist9
-rw-r--r--ports-mgmt/gnome-packagekit/Makefile6
-rw-r--r--ports-mgmt/gnome-packagekit/distinfo6
-rw-r--r--ports-mgmt/gnome-packagekit/pkg-plist1
-rw-r--r--ports-mgmt/packagekit/Makefile6
-rw-r--r--ports-mgmt/packagekit/distinfo6
-rw-r--r--ports-mgmt/packagekit/pkg-plist52
-rw-r--r--print/freetype2/Makefile6
-rw-r--r--print/freetype2/distinfo6
-rw-r--r--print/libgnomeprint/Makefile5
-rw-r--r--print/libgnomeprint/distinfo6
-rw-r--r--security/Makefile1
-rw-r--r--security/gir-repository-gnome-keyring/Makefile15
-rw-r--r--security/gnome-keyring/Makefile14
-rw-r--r--security/gnome-keyring/distinfo6
-rw-r--r--security/gnome-keyring/files/patch-configure22
-rw-r--r--security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c11
-rw-r--r--security/gnome-keyring/files/patch-egg_egg-asn1x.c13
-rw-r--r--security/gnome-keyring/files/patch-gcr_gcr-certificate.c14
-rw-r--r--security/gnome-keyring/files/patch-pkcs11_rpc-layer_gck-rpc-dispatch.c11
-rw-r--r--security/gnome-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c11
-rw-r--r--security/gnome-keyring/pkg-plist92
-rw-r--r--security/libgnome-keyring/Makefile5
-rw-r--r--security/libgnome-keyring/distinfo6
-rw-r--r--security/libgnome-keyring/pkg-plist6
-rw-r--r--security/seahorse/Makefile5
-rw-r--r--security/seahorse/distinfo6
-rw-r--r--security/seahorse/pkg-plist34
-rw-r--r--sysutils/brasero/Makefile15
-rw-r--r--sysutils/brasero/distinfo5
-rw-r--r--sysutils/brasero/files/patch-configure13
-rw-r--r--sysutils/brasero/pkg-plist37
-rw-r--r--sysutils/consolekit/Makefile5
-rw-r--r--sysutils/consolekit/distinfo6
-rw-r--r--sysutils/consolekit/files/patch-tools_Makefile.in34
-rw-r--r--sysutils/gconf-editor/Makefile5
-rw-r--r--sysutils/gconf-editor/distinfo6
-rw-r--r--sysutils/gconf-editor/pkg-plist3
-rw-r--r--sysutils/gnome-control-center/Makefile11
-rw-r--r--sysutils/gnome-control-center/distinfo5
-rw-r--r--sysutils/gnome-control-center/files/patch-configure10
-rw-r--r--sysutils/gnome-control-center/files/patch-libslab_directory-tile.c9
-rw-r--r--sysutils/gnome-control-center/pkg-plist30
-rw-r--r--sysutils/gnome-power-manager/Makefile11
-rw-r--r--sysutils/gnome-power-manager/distinfo6
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_Makefile.in47
-rw-r--r--sysutils/gnome-power-manager/pkg-plist2
-rw-r--r--sysutils/gnome-settings-daemon/Makefile8
-rw-r--r--sysutils/gnome-settings-daemon/distinfo5
-rw-r--r--sysutils/gnome-settings-daemon/pkg-plist21
-rw-r--r--sysutils/gnome-system-monitor/Makefile5
-rw-r--r--sysutils/gnome-system-monitor/distinfo6
-rw-r--r--sysutils/gnome-system-monitor/pkg-plist1
-rw-r--r--sysutils/gnome-system-tools/Makefile9
-rw-r--r--sysutils/gnome-system-tools/distinfo6
-rw-r--r--sysutils/gnome-system-tools/files/patch-configure13
-rw-r--r--sysutils/gnome-system-tools/pkg-plist28
-rw-r--r--sysutils/pessulus/Makefile4
-rw-r--r--sysutils/pessulus/distinfo5
-rw-r--r--sysutils/pessulus/pkg-plist2
-rw-r--r--sysutils/polkit-gnome/Makefile5
-rw-r--r--sysutils/polkit-gnome/distinfo6
-rw-r--r--sysutils/polkit-gnome/pkg-plist15
-rw-r--r--sysutils/polkit/Makefile9
-rw-r--r--sysutils/polkit/distinfo6
-rw-r--r--sysutils/polkit/files/patch-src_polkitd_gposixsignal.c40
-rw-r--r--sysutils/polkit/pkg-plist7
-rw-r--r--sysutils/tracker-client/Makefile4
-rw-r--r--sysutils/upower/Makefile5
-rw-r--r--sysutils/upower/distinfo6
-rw-r--r--sysutils/upower/files/patch-libupower-glib_Makefile.in18
-rw-r--r--sysutils/upower/files/patch-src_up-daemon.c20
-rw-r--r--sysutils/upower/files/patch-src_up-polkit.c20
-rw-r--r--sysutils/upower/pkg-plist17
-rw-r--r--textproc/gnome-doc-utils/Makefile5
-rw-r--r--textproc/gnome-doc-utils/distinfo6
-rw-r--r--textproc/intltool/Makefile7
-rw-r--r--textproc/intltool/distinfo6
-rw-r--r--textproc/libxml++26/Makefile6
-rw-r--r--textproc/libxml++26/distinfo6
-rw-r--r--www/epiphany-extensions/Makefile4
-rw-r--r--www/epiphany-extensions/distinfo6
-rw-r--r--www/epiphany-extensions/files/patch-extensions_adblock_adblock-ui.c22
-rw-r--r--www/epiphany-extensions/files/patch-extensions_adblock_ephy-adblock-extension.c13
-rw-r--r--www/epiphany-extensions/files/patch-extensions_permissions_ephy-permissions-dialog.c22
-rw-r--r--www/epiphany/Makefile11
-rw-r--r--www/epiphany/distinfo6
-rw-r--r--www/epiphany/files/patch-embed_ephy-embed-prefs.c2
-rw-r--r--www/epiphany/files/patch-src_Makefile.in26
-rw-r--r--www/epiphany/pkg-plist29
-rw-r--r--www/evolution-webcal/Makefile5
-rw-r--r--www/evolution-webcal/distinfo6
-rw-r--r--www/gnome-user-share/Makefile5
-rw-r--r--www/gnome-user-share/distinfo6
-rw-r--r--www/gnome-user-share/files/patch-configure14
-rw-r--r--www/gnome-user-share/pkg-plist7
-rw-r--r--www/gtkhtml3/Makefile9
-rw-r--r--www/gtkhtml3/distinfo5
-rw-r--r--www/gtkhtml3/files/patch-components_editor_gtkhtml-spell-dialog.c13
-rw-r--r--www/gtkhtml3/pkg-plist10
-rw-r--r--www/osb-browser/Makefile1
-rw-r--r--www/webkit-gtk2/Makefile7
-rw-r--r--www/webkit-gtk2/files/patch-WebKit_gtk_JSCore-1.0.gir22
-rw-r--r--x11-fm/nautilus/Makefile6
-rw-r--r--x11-fm/nautilus/distinfo5
-rw-r--r--x11-fm/nautilus/pkg-plist20
-rw-r--r--x11-themes/gnome-backgrounds/Makefile5
-rw-r--r--x11-themes/gnome-backgrounds/distinfo6
-rw-r--r--x11-themes/gnome-backgrounds/pkg-plist8
-rw-r--r--x11-themes/gnome-themes/Makefile4
-rw-r--r--x11-themes/gnome-themes/distinfo5
-rw-r--r--x11-themes/gnome-themes/pkg-plist324
-rw-r--r--x11-themes/gtk-qt-engine/Makefile2
-rw-r--r--x11-toolkits/eel/Makefile4
-rw-r--r--x11-toolkits/eel/files/patch-eel_Makefile.in12
-rw-r--r--x11-toolkits/gdl/Makefile5
-rw-r--r--x11-toolkits/gdl/distinfo6
-rw-r--r--x11-toolkits/gdl/pkg-plist21
-rw-r--r--x11-toolkits/gtk20-reference/Makefile10
-rw-r--r--x11-toolkits/gtk20/Makefile40
-rw-r--r--x11-toolkits/gtk20/distinfo5
-rw-r--r--x11-toolkits/gtk20/files/patch-Makefile.in16
-rw-r--r--x11-toolkits/gtk20/files/patch-ai10
-rw-r--r--x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in14
-rw-r--r--x11-toolkits/gtk20/files/patch-gdk-pixbuf_io-png.c26
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_Makefile.in18
-rw-r--r--x11-toolkits/gtk20/pkg-plist206
-rw-r--r--x11-toolkits/gtk30-reference/Makefile10
-rw-r--r--x11-toolkits/gtk30/Makefile40
-rw-r--r--x11-toolkits/gtk30/distinfo5
-rw-r--r--x11-toolkits/gtk30/files/patch-Makefile.in16
-rw-r--r--x11-toolkits/gtk30/files/patch-ai10
-rw-r--r--x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in14
-rw-r--r--x11-toolkits/gtk30/files/patch-gdk-pixbuf_io-png.c26
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_Makefile.in18
-rw-r--r--x11-toolkits/gtk30/pkg-plist206
-rw-r--r--x11-toolkits/gtkdatabox/Makefile4
-rw-r--r--x11-toolkits/gtkextra2/Makefile2
-rw-r--r--x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c43
-rw-r--r--x11-toolkits/gtkglextmm/Makefile7
-rw-r--r--x11-toolkits/gtkmm24/Makefile10
-rw-r--r--x11-toolkits/gtkmm24/distinfo6
-rw-r--r--x11-toolkits/gtkmm24/pkg-plist103
-rw-r--r--x11-toolkits/gtksourceview2/Makefile4
-rw-r--r--x11-toolkits/gtksourceview2/distinfo6
-rw-r--r--x11-toolkits/libbonoboui/Makefile6
-rw-r--r--x11-toolkits/libbonoboui/distinfo6
-rw-r--r--x11-toolkits/libbonoboui/pkg-plist1
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile5
-rw-r--r--x11-toolkits/libgnomeprintui/distinfo6
-rw-r--r--x11-toolkits/libgnomeui/Makefile6
-rw-r--r--x11-toolkits/libgnomeui/distinfo6
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist6
-rw-r--r--x11-toolkits/libwnck/Makefile4
-rw-r--r--x11-toolkits/libwnck/distinfo5
-rw-r--r--x11-toolkits/libwnck/pkg-plist6
-rw-r--r--x11-toolkits/ocaml-lablgtk2/Makefile2
-rw-r--r--x11-toolkits/pango/Makefile4
-rw-r--r--x11-toolkits/pango/distinfo6
-rw-r--r--x11-toolkits/py-gnome-desktop/Makefile10
-rw-r--r--x11-toolkits/py-gnome-desktop/distinfo6
-rw-r--r--x11-toolkits/py-gtk2/Makefile6
-rw-r--r--x11-toolkits/py-gtk2/distinfo6
-rw-r--r--x11-toolkits/py-gtk2/files/patch-configure11
-rw-r--r--x11-toolkits/py-gtk2/pkg-plist10
-rw-r--r--x11-toolkits/py-vte/Makefile3
-rw-r--r--x11-toolkits/unique/Makefile4
-rw-r--r--x11-toolkits/vte/Makefile5
-rw-r--r--x11-toolkits/vte/distinfo5
-rw-r--r--x11-toolkits/vte/pkg-plist206
-rw-r--r--x11-wm/compiz/Makefile2
-rw-r--r--x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c54
-rw-r--r--x11-wm/emerald/Makefile2
-rw-r--r--x11-wm/emerald/files/patch-src_main.c58
-rw-r--r--x11-wm/metacity/Makefile5
-rw-r--r--x11-wm/metacity/distinfo6
-rw-r--r--x11-wm/metacity/pkg-plist4
-rw-r--r--x11-wm/mutter/Makefile4
-rw-r--r--x11-wm/mutter/distinfo6
-rw-r--r--x11-wm/mutter/pkg-plist4
-rw-r--r--x11/gdm/Makefile6
-rw-r--r--x11/gnome-applets/Makefile9
-rw-r--r--x11/gnome-applets/distinfo6
-rw-r--r--x11/gnome-applets/pkg-plist124
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-desktop/distinfo5
-rw-r--r--x11/gnome-desktop/pkg-plist3
-rw-r--r--x11/gnome-launch-box/Makefile2
-rw-r--r--x11/gnome-menus/Makefile5
-rw-r--r--x11/gnome-menus/distinfo5
-rw-r--r--x11/gnome-menus/files/patch-Makefile.in22
-rw-r--r--x11/gnome-menus/files/patch-util_Makefile.in12
-rw-r--r--x11/gnome-menus/pkg-plist9
-rw-r--r--x11/gnome-panel/Makefile34
-rw-r--r--x11/gnome-panel/distinfo5
-rw-r--r--x11/gnome-panel/files/patch-po_ko.po29
-rw-r--r--x11/gnome-panel/pkg-plist112
-rw-r--r--x11/gnome-screensaver/Makefile6
-rw-r--r--x11/gnome-screensaver/distinfo6
-rw-r--r--x11/gnome-screensaver/pkg-plist1
-rw-r--r--x11/gnome-session/Makefile30
-rw-r--r--x11/gnome-session/distinfo8
-rw-r--r--x11/gnome-session/pkg-plist33
-rw-r--r--x11/gnome-shell/Makefile8
-rw-r--r--x11/gnome-shell/distinfo6
-rw-r--r--x11/gnome-shell/files/patch-src_Makefile.in18
-rw-r--r--x11/gnome-shell/files/patch-src_gnome-shell-plugin.c26
-rw-r--r--x11/gnome-shell/pkg-plist19
-rw-r--r--x11/gnome-terminal/Makefile8
-rw-r--r--x11/gnome-terminal/distinfo5
-rw-r--r--x11/gnome-terminal/pkg-plist8
-rw-r--r--x11/gnome2/Makefile9
-rw-r--r--x11/gtkchtheme/files/patch-Makefile11
-rw-r--r--x11/libgnome/Makefile7
-rw-r--r--x11/libgnome/distinfo6
-rw-r--r--x11/libgnome/files/pkg-deinstall.in2
-rw-r--r--x11/libgnome/pkg-plist3
-rw-r--r--x11/libgnomekbd/Makefile10
-rw-r--r--x11/libgnomekbd/distinfo6
-rw-r--r--x11/libgnomekbd/pkg-plist4
-rw-r--r--x11/startup-notification/Makefile9
-rw-r--r--x11/yelp/Makefile8
-rw-r--r--x11/yelp/distinfo6
-rw-r--r--x11/yelp/files/patch-src_yelp-window.c37
-rw-r--r--x11/yelp/pkg-plist3
-rw-r--r--x11/zenity/Makefile5
-rw-r--r--x11/zenity/distinfo5
-rw-r--r--x11/zenity/pkg-plist15
617 files changed, 8557 insertions, 4084 deletions
diff --git a/MOVED b/MOVED
index 87c7fa6387e6..03fad737df23 100644
--- a/MOVED
+++ b/MOVED
@@ -4676,3 +4676,9 @@ misc/bidwatcher||2010-11-08|Has expired: Obsoleted by JBidwatcher and changes at
security/vscan||2010-11-08|Has expired: Depends of misc/compat3x, that is deprecated and set to be removed
www/ssserver||2010-11-08|Has expired: Depends of misc/compat3x, that is deprecated and set to be removed
graphics/qtpfsgui|graphics/luminance|2010-11-12|Project has been renamed
+devel/gir-repository-gconf2|devel/gconf2|2010-11-20|merged into gconf2
+x11-fm/gir-repository-nautilus|x11-fm/nautilus|2010-11-20|merged into nautilus
+devel/gir-repository-libsoup|devel/libsoup|2010-11-20|merged into libsoup
+x11-toolkits/gir-repository-gtksourceview2|x11-toolkits/gtksourceview2|2010-11-20|merged into gtksourceview2
+security/gir-repository-gnome-keyring||2010-11-20|Not buildable
+devel/gir-repository-dbus|devel/gobject-introspection|2010-11-20|merged into gobject-introspection
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index e5f431cfbdf2..c1638dfd77a1 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -3,7 +3,7 @@
#
# $FreeBSD$
# $NetBSD: $
-# $MCom: ports/Mk/bsd.gnome.mk,v 1.490 2010/03/14 18:13:44 marcus Exp $
+# $MCom: ports/Mk/bsd.gnome.mk,v 1.512 2010/10/26 09:02:45 kwm Exp $
#
# Please view me with 4 column tabs!
@@ -41,22 +41,30 @@ Gnome_Pre_Include= bsd.gnome.mk
# and MAKE_ENV defined.
#
#
-# GCONF_SCHEMAS - Set the following to list of all schema files
-# that your port installs. These schema files and
-# %gconf.xml files will be automatically added to
-# ${PLIST}. For example, if your port has
-# "etc/gconf/schemas/(foo.schemas and bar.schemas)",
-# add the following to your Makefile:
-# "GCONF_SCHEMAS=foo.schemas bar.schemas".
+# GCONF_SCHEMAS - Set the following to list of all the gconf schema files
+# that your port installs. These schema files and
+# %gconf.xml files will be automatically added to
+# the ${PLIST}. For example, if your port has
+# "etc/gconf/schemas/(foo.schemas and bar.schemas)",
+# add the following to your Makefile:
+# "GCONF_SCHEMAS=foo.schemas bar.schemas".
+#
+# GLIB_SCHEMAS - Set the following to list of all gsettings schema files
+# (*.gschema.xml) that your ports installs. The
+# schema files will be automatically added to
+# the ${PLIST}. For example, if your port has
+# "share/glib-2.0/schemas/(foo.gschema.xml and bar.gschema.xml)",
+# add the following to your Makefile:
+# "GLIB_SCHEMAS=foo.gschema.xml bar.gschema.xml".
#
# INSTALLS_OMF - If set, bsd.gnome.mk will automatically scan pkg-plist
-# file and add apropriate @exec/@unexec directives for
-# each .omf file found to track OMF registration database.
+# file and add apropriate @exec/@unexec directives for
+# each .omf file found to track OMF registration database.
#
# INSTALLS_ICONS - If your port installs Freedesktop-style icons to
-# ${LOCALBASE}/share/icons, then you should use this
-# macro. If the icons are not cached, they will not be
-# displayed.
+# ${LOCALBASE}/share/icons, then you should use this
+# macro. If the icons are not cached, they will not be
+# displayed.
#
# non-version specific components
@@ -71,7 +79,7 @@ _USE_GNOME_ALL+= bonobo gal gconf gdkpixbuf glib12 glibwww \
oaf orbit pygnome pygtk
# GNOME 2 components
-_USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gal2 \
+_USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gal2 gdkpixbuf2 \
gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop gnomedesktopsharp20 \
gnomedocutils gnomemenus gnomepanel gnomesharp20 gnomespeech gnomevfs2 gtk20 \
gtkhtml3 gtksharp10 gtksharp20 gtksourceview gtksourceview2 gvfs \
@@ -277,6 +285,10 @@ pango_LIB_DEPENDS= pango-1.0.0:${PORTSDIR}/x11-toolkits/pango
pango_DETECT= ${LOCALBASE}/libdata/pkgconfig/pango.pc
pango_USE_GNOME_IMPL= glib20
+gdkpixbuf2_LIB_DEPENDS= gdk_pixbuf-2.0.0:${PORTSDIR}/graphics/gdk-pixbuf2
+gdkpixbuf2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gdk-pixbuf-2.0.pc
+gdkpixbuf2_USE_GNOME_IMPL=glib20
+
gtk20_LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
gtk20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk+-x11-2.0.pc
gtk20_USE_GNOME_IMPL= intltool atk pango
@@ -284,7 +296,7 @@ GTK2_VERSION= 2.10.0
linc_LIB_DEPENDS= linc.1:${PORTSDIR}/net/linc
linc_DETECT= ${LOCALBASE}/libdata/pkgconfig/linc.pc
-linc_USE_GNOME_IMPL=glib20
+linc_USE_GNOME_IMPL= glib20
libidl_LIB_DEPENDS= IDL-2.0:${PORTSDIR}/devel/libIDL
libidl_DETECT= ${LOCALBASE}/libdata/pkgconfig/libIDL-2.0.pc
@@ -390,7 +402,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 libbonoboui
+gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils librsvg2
gnomepanel_GNOME_DESKTOP_VERSION=2
nautilus2_LIB_DEPENDS= nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus
@@ -418,7 +430,7 @@ libgda3_LIB_DEPENDS= gda-3.0.3:${PORTSDIR}/databases/libgda3
libgda3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda-3.0.pc
libgda3_USE_GNOME_IMPL= glib20 libxslt
-libgda4_LIB_DEPENDS= gda-4.0.4:${PORTSDIR}/databases/libgda4
+libgda4_LIB_DEPENDS= gda-4.0.5:${PORTSDIR}/databases/libgda4
libgda4_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda-4.0.pc
libgda4_USE_GNOME_IMPL= glib20 libxslt
@@ -474,7 +486,7 @@ gnomespeech_LIB_DEPENDS=gnomespeech.7:${PORTSDIR}/accessibility/gnome-speech
gnomespeech_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-speech-1.0.pc
gnomespeech_USE_GNOME_IMPL=libbonobo
-evolutiondataserver_LIB_DEPENDS=edataserver-1.2.11:${PORTSDIR}/databases/evolution-data-server
+evolutiondataserver_LIB_DEPENDS=edataserverui-1.2.11:${PORTSDIR}/databases/evolution-data-server
evolutiondataserver_DETECT= ${LOCALBASE}/libdata/pkgconfig/evolution-data-server-1.2.pc
evolutiondataserver_USE_GNOME_IMPL=gconf2 libxml2
@@ -665,7 +677,8 @@ _USE_GNOME+= ${${component}_USE_GNOME_IMPL} ${component}
# Setup the GTK+ API version for pixbuf loaders, input method modules,
# and theme engines.
-PLIST_SUB+= GTK2_VERSION="${GTK2_VERSION}"
+PLIST_SUB+= GTK2_VERSION="${GTK2_VERSION}" \
+ GTK3_VERSION="${GTK3_VERSION}"
# Then handle the ltverhack component (it has to be done here, because
# we rely on some bsd.autotools.mk variables, and bsd.autotools.mk is
@@ -790,7 +803,7 @@ CONFIGURE_FAIL_MESSAGE= "Please run the gnomelogalyzer, available from \"http://
.if defined(GCONF_SCHEMAS) || defined(INSTALLS_OMF) || defined(INSTALLS_ICONS) \
- || (defined(_USE_GNOME) && ${_USE_GNOME:Mgnomehier}!="")
+ || defined(GLIB_SCHEMAS) || (defined(_USE_GNOME) && ${_USE_GNOME:Mgnomehier}!="")
pre-su-install: gnome-pre-su-install
post-install: gnome-post-install
@@ -815,6 +828,18 @@ gnome-post-install:
done
. endif
+# we put the @unexec behind the plist schema entry, because it compiles files
+# in the directory. So we should remove the port file first before recompiling.
+. if defined(GLIB_SCHEMAS)
+ @for i in ${GLIB_SCHEMAS}; do \
+ ${ECHO_CMD} "share/glib-2.0/schemas/$${i}" >> ${TMPPLIST}; \
+ ${ECHO_CMD} "@exec glib-compile-schemas %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \
+ >> ${TMPPLIST}; \
+ ${ECHO_CMD} "@unexec glib-compile-schemas --uninstall %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \
+ >> ${TMPPLIST}; \
+ done
+.endif
+
. if defined(INSTALLS_OMF)
@for i in `${GREP} "\.omf$$" ${TMPPLIST}`; do \
${ECHO_CMD} "@exec scrollkeeper-install -q %D/$${i} 2>/dev/null || /usr/bin/true" \
diff --git a/UPDATING b/UPDATING
index 65f5cff4ef21..0bacce9a899c 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,25 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20101120:
+ AFFECTS: users of x11-toolkits/gtk20 and x11-toolkits/gtkmm24
+ AUTHOR: FreeBSD GNOME Team <gnome@FreeBSD.org>
+
+ In the GNOME 2.32 release. gdk-pixbuf2 has been split off from gtk20,
+ and atkmm has been split off from gtkmm24. To upgrade please use the
+ following instructions:
+
+ Portmaster users:
+
+ # pkg_delete -f gtkmm-2.20\* gtk-2.20\*
+ # portmaster -a
+
+ Portupgrade users:
+
+ # pkgdb -fF
+ # pkg_deinstall -f0 gtkmm-2.20\* gtk-2.20\*
+ # portupgrade -aOW
+
20101118:
AFFECTS: users of editors/emacs-devel
AUTHOR: Ashish SHUKLA <ashish@FreeBSD.org>
diff --git a/accessibility/Makefile b/accessibility/Makefile
index 0dc8d47ebc13..8ee0c9b7096f 100644
--- a/accessibility/Makefile
+++ b/accessibility/Makefile
@@ -10,6 +10,7 @@
SUBDIR += at-spi2-core
SUBDIR += at-spi2-atk
SUBDIR += atk
+ SUBDIR += atkmm
SUBDIR += atk-reference
SUBDIR += dasher
SUBDIR += eflite
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index a7750bb4bf20..f87f110b2a5d 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.99 2010/04/26 11:38:24 kwm Exp $
+# $MCom: ports/accessibility/at-spi/Makefile,v 1.103 2010/09/27 09:47:42 kwm Exp $
#
PORTNAME= at-spi
-PORTVERSION= 1.30.1
-PORTREVISION?= 1
+PORTVERSION= 1.32.0
+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 5417c1352aa7..318b0ad4e8b2 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/at-spi-1.30.1.tar.bz2) = 29fdf7934e98efda5fe0ab74ab4d3f29
-SHA256 (gnome2/at-spi-1.30.1.tar.bz2) = 8dbe3f3b6028f01afd841859e49c0bf159a1ccca1f90be2647365062c5d0346d
-SIZE (gnome2/at-spi-1.30.1.tar.bz2) = 836847
+MD5 (gnome2/at-spi-1.32.0.tar.bz2) = bc62c41f18529d56271fa1ae6cad8629
+SHA256 (gnome2/at-spi-1.32.0.tar.bz2) = cc841dea746413eebadf0710dabec741450b37a06821c34526f505fe9d027039
+SIZE (gnome2/at-spi-1.32.0.tar.bz2) = 845788
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index f4a0de914eb6..9d5f86967d48 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -138,11 +138,13 @@ share/locale/he/LC_MESSAGES/at-spi.mo
share/locale/hi/LC_MESSAGES/at-spi.mo
share/locale/hr/LC_MESSAGES/at-spi.mo
share/locale/hu/LC_MESSAGES/at-spi.mo
+share/locale/hy/LC_MESSAGES/at-spi.mo
share/locale/id/LC_MESSAGES/at-spi.mo
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/kk/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
@@ -221,6 +223,10 @@ share/locale/zh_TW/LC_MESSAGES/at-spi.mo
@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/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile
index 16e48d53667c..af037e1989a8 100644
--- a/accessibility/at-spi2-atk/Makefile
+++ b/accessibility/at-spi2-atk/Makefile
@@ -3,12 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/at-spi2-atk/Makefile,v 1.6 2010/04/01 12:23:26 kwm Exp $
+# $MCom: ports/accessibility/at-spi2-atk/Makefile,v 1.16 2010/11/16 11:53:13 kwm Exp $
#
PORTNAME= at-spi2-atk
-PORTVERSION= 0.1.8
-PORTREVISION= 1
+PORTVERSION= 0.4.1
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -19,13 +18,16 @@ COMMENT= Assisted Technology Provider module for GTK+
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
RUN_DEPENDS= ${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack gnomehier intlhack gtk20 libxml2
+USE_GNOME= gnomehack gnomehier intlhack gconf2 libxml2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+GCONF_SCHEMAS= at-spi2.schemas
.include <bsd.port.mk>
diff --git a/accessibility/at-spi2-atk/distinfo b/accessibility/at-spi2-atk/distinfo
index 6c0a2ff5560e..21d9b152adc4 100644
--- a/accessibility/at-spi2-atk/distinfo
+++ b/accessibility/at-spi2-atk/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/at-spi2-atk-0.1.8.tar.bz2) = dbf92538b4e83bcd0a5f42adb9143411
-SHA256 (gnome2/at-spi2-atk-0.1.8.tar.bz2) = 7ccfb43ec166814aa3daf0bf1b894d07b766d05c30860ef3db759f2dab72f2eb
-SIZE (gnome2/at-spi2-atk-0.1.8.tar.bz2) = 292459
+SHA256 (gnome2/at-spi2-atk-0.4.1.tar.bz2) = ad885b257f9e12bc1cfb0f21bd1075c00bdedca3f66d01b57401ecb12c9f411c
+SIZE (gnome2/at-spi2-atk-0.4.1.tar.bz2) = 337286
diff --git a/accessibility/at-spi2-atk/pkg-plist b/accessibility/at-spi2-atk/pkg-plist
index fb9bd01547e3..ef93366a36d6 100644
--- a/accessibility/at-spi2-atk/pkg-plist
+++ b/accessibility/at-spi2-atk/pkg-plist
@@ -1,6 +1,63 @@
lib/gtk-2.0/modules/at-spi-dbus/modules/libatk-bridge.a
lib/gtk-2.0/modules/at-spi-dbus/modules/libatk-bridge.la
lib/gtk-2.0/modules/at-spi-dbus/modules/libatk-bridge.so
+lib/gtk-3.0/modules/at-spi-dbus/modules/libatk-bridge.a
+lib/gtk-3.0/modules/at-spi-dbus/modules/libatk-bridge.la
+lib/gtk-3.0/modules/at-spi-dbus/modules/libatk-bridge.so
share/gnome/autostart/atk-bridge.desktop
+share/locale/ar/LC_MESSAGES/at-spi2-atk.mo
+share/locale/ast/LC_MESSAGES/at-spi2-atk.mo
+share/locale/bg/LC_MESSAGES/at-spi2-atk.mo
+share/locale/bn/LC_MESSAGES/at-spi2-atk.mo
+share/locale/ca/LC_MESSAGES/at-spi2-atk.mo
+share/locale/cs/LC_MESSAGES/at-spi2-atk.mo
+share/locale/cy/LC_MESSAGES/at-spi2-atk.mo
+share/locale/de/LC_MESSAGES/at-spi2-atk.mo
+share/locale/el/LC_MESSAGES/at-spi2-atk.mo
+share/locale/en@shaw/LC_MESSAGES/at-spi2-atk.mo
+share/locale/en_GB/LC_MESSAGES/at-spi2-atk.mo
+share/locale/es/LC_MESSAGES/at-spi2-atk.mo
+share/locale/et/LC_MESSAGES/at-spi2-atk.mo
+share/locale/eu/LC_MESSAGES/at-spi2-atk.mo
+share/locale/fi/LC_MESSAGES/at-spi2-atk.mo
+share/locale/fr/LC_MESSAGES/at-spi2-atk.mo
+share/locale/gl/LC_MESSAGES/at-spi2-atk.mo
+share/locale/he/LC_MESSAGES/at-spi2-atk.mo
+share/locale/hu/LC_MESSAGES/at-spi2-atk.mo
+share/locale/it/LC_MESSAGES/at-spi2-atk.mo
+share/locale/ko/LC_MESSAGES/at-spi2-atk.mo
+share/locale/lt/LC_MESSAGES/at-spi2-atk.mo
+share/locale/nb/LC_MESSAGES/at-spi2-atk.mo
+share/locale/nl/LC_MESSAGES/at-spi2-atk.mo
+share/locale/nn/LC_MESSAGES/at-spi2-atk.mo
+share/locale/pl/LC_MESSAGES/at-spi2-atk.mo
+share/locale/pt/LC_MESSAGES/at-spi2-atk.mo
+share/locale/pt_BR/LC_MESSAGES/at-spi2-atk.mo
+share/locale/ro/LC_MESSAGES/at-spi2-atk.mo
+share/locale/ru/LC_MESSAGES/at-spi2-atk.mo
+share/locale/sk/LC_MESSAGES/at-spi2-atk.mo
+share/locale/sl/LC_MESSAGES/at-spi2-atk.mo
+share/locale/sr/LC_MESSAGES/at-spi2-atk.mo
+share/locale/sr@latin/LC_MESSAGES/at-spi2-atk.mo
+share/locale/sv/LC_MESSAGES/at-spi2-atk.mo
+share/locale/ta/LC_MESSAGES/at-spi2-atk.mo
+share/locale/th/LC_MESSAGES/at-spi2-atk.mo
+share/locale/uk/LC_MESSAGES/at-spi2-atk.mo
+share/locale/vi/LC_MESSAGES/at-spi2-atk.mo
+share/locale/zh_CN/LC_MESSAGES/at-spi2-atk.mo
+share/locale/zh_HK/LC_MESSAGES/at-spi2-atk.mo
+share/locale/zh_TW/LC_MESSAGES/at-spi2-atk.mo
@dirrm lib/gtk-2.0/modules/at-spi-dbus/modules
@dirrm lib/gtk-2.0/modules/at-spi-dbus
+@dirrm lib/gtk-3.0/modules/at-spi-dbus/modules
+@dirrm lib/gtk-3.0/modules/at-spi-dbus
+@dirrmtry lib/gtk-3.0/modules
+@dirrmtry lib/gtk-3.0
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile
index 8ab3704bc39f..ff63c8d7d3f5 100644
--- a/accessibility/at-spi2-core/Makefile
+++ b/accessibility/at-spi2-core/Makefile
@@ -3,12 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/at-spi2-core/Makefile,v 1.8 2010/04/01 12:15:44 kwm Exp $
+# $MCom: ports/accessibility/at-spi2-core/Makefile,v 1.17 2010/11/16 11:48:22 kwm Exp $
#
PORTNAME= at-spi2-core
-PORTVERSION= 0.1.8
-PORTREVISION= 1
+PORTVERSION= 0.4.1
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,6 +17,8 @@ COMMENT= An Assistive Technology Service Provider Interface
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/accessibility/at-spi2-core/distinfo b/accessibility/at-spi2-core/distinfo
index 19194d321fa6..310cdb76efb3 100644
--- a/accessibility/at-spi2-core/distinfo
+++ b/accessibility/at-spi2-core/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/at-spi2-core-0.1.8.tar.bz2) = 6f333474d4e03ee3317ed9b5006752b0
-SHA256 (gnome2/at-spi2-core-0.1.8.tar.bz2) = 2bb33f5ccff315df5d5c1513502e31f186394346b3446f4be2396dad3b1da9d3
-SIZE (gnome2/at-spi2-core-0.1.8.tar.bz2) = 281367
+SHA256 (gnome2/at-spi2-core-0.4.1.tar.bz2) = e3f10134851691b4c0878c2bdb778e21ded01e140b7a930d1958513c775765f9
+SIZE (gnome2/at-spi2-core-0.4.1.tar.bz2) = 277204
diff --git a/accessibility/at-spi2-core/pkg-plist b/accessibility/at-spi2-core/pkg-plist
index 6c2efa7513f1..55de074ee261 100644
--- a/accessibility/at-spi2-core/pkg-plist
+++ b/accessibility/at-spi2-core/pkg-plist
@@ -1,2 +1,6 @@
+bin/at-spi-dbus-bus
+etc/at-spi2/accessibility.conf
+etc/xdg/autostart/at-spi-dbus-bus.desktop
libexec/at-spi2-registryd
share/dbus-1/services/org.a11y.atspi.Registry.service
+@dirrm etc/at-spi2
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 0cdeaa9c2e43..23544f052d28 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/atk/Makefile,v 1.104 2010/04/02 16:56:50 kwm Exp $
+# $MCom: ports/accessibility/atk/Makefile,v 1.108 2010/09/27 08:35:36 kwm Exp $
#
PORTNAME= atk
-PORTVERSION= 1.30.0
-PORTREVISION?= 1
+PORTVERSION= 1.32.0
+PORTREVISION?= 0
CATEGORIES= accessibility devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 93c451b49e77..764e371730ef 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/atk-1.30.0.tar.bz2) = 548d413775819fef425410739041cac3
-SHA256 (gnome2/atk-1.30.0.tar.bz2) = 92b9b1213cafc68fe9c3806273b968c26423237d7b1f631dd83dc5270b8c268c
-SIZE (gnome2/atk-1.30.0.tar.bz2) = 746014
+MD5 (gnome2/atk-1.32.0.tar.bz2) = b9a19a3e426cd9ca930f0108c4ee343f
+SHA256 (gnome2/atk-1.32.0.tar.bz2) = e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e
+SIZE (gnome2/atk-1.32.0.tar.bz2) = 688186
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 2a74d8c74a6c..cf19e3d2f373 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -72,11 +72,13 @@ share/locale/he/LC_MESSAGES/atk10.mo
share/locale/hi/LC_MESSAGES/atk10.mo
share/locale/hr/LC_MESSAGES/atk10.mo
share/locale/hu/LC_MESSAGES/atk10.mo
+share/locale/hy/LC_MESSAGES/atk10.mo
share/locale/id/LC_MESSAGES/atk10.mo
share/locale/is/LC_MESSAGES/atk10.mo
share/locale/it/LC_MESSAGES/atk10.mo
share/locale/ja/LC_MESSAGES/atk10.mo
share/locale/ka/LC_MESSAGES/atk10.mo
+share/locale/kk/LC_MESSAGES/atk10.mo
share/locale/kn/LC_MESSAGES/atk10.mo
share/locale/ko/LC_MESSAGES/atk10.mo
share/locale/ku/LC_MESSAGES/atk10.mo
@@ -160,6 +162,10 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/accessibility/atkmm/Makefile b/accessibility/atkmm/Makefile
new file mode 100644
index 000000000000..76153e29c06b
--- /dev/null
+++ b/accessibility/atkmm/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for: atkmm
+# Date created: 24 June 2010
+# Whom: Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/accessibility/atkmm/Makefile,v 1.4 2010/09/27 21:08:01 kwm Exp $
+#
+
+PORTNAME= atkmm
+PORTVERSION= 2.22.0
+CATEGORIES= accessibility gnome
+MASTER_SITES= GNOME
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= C++ wrapper for ATK API library
+
+LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm
+
+USE_BZIP2= yes
+USE_LDCONFIG= yes
+USE_GMAKE= yes
+MAKE_JOBS_SAFE= yes
+USE_GNOME= gnomehack atk
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \
+ LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --disable-documentation
+
+.include <bsd.port.mk>
diff --git a/accessibility/atkmm/distinfo b/accessibility/atkmm/distinfo
new file mode 100644
index 000000000000..bdf7060c9b0f
--- /dev/null
+++ b/accessibility/atkmm/distinfo
@@ -0,0 +1,3 @@
+MD5 (atkmm-2.22.0.tar.bz2) = 6faeedb26810fd954a856f05e03d4ea8
+SHA256 (atkmm-2.22.0.tar.bz2) = e4114e2de44a386733eee26fd5bb021868500e906c6801ddff9c0fc28a855796
+SIZE (atkmm-2.22.0.tar.bz2) = 694525
diff --git a/accessibility/atkmm/pkg-descr b/accessibility/atkmm/pkg-descr
new file mode 100644
index 000000000000..1e9e1b30984a
--- /dev/null
+++ b/accessibility/atkmm/pkg-descr
@@ -0,0 +1,3 @@
+C++ wrapper for Atk.
+
+WWW: http://www.gtkmm.org/
diff --git a/accessibility/atkmm/pkg-plist b/accessibility/atkmm/pkg-plist
new file mode 100644
index 000000000000..b0c691e93aa6
--- /dev/null
+++ b/accessibility/atkmm/pkg-plist
@@ -0,0 +1,51 @@
+include/atkmm-1.6/atkmm.h
+include/atkmm-1.6/atkmm/action.h
+include/atkmm-1.6/atkmm/component.h
+include/atkmm-1.6/atkmm/document.h
+include/atkmm-1.6/atkmm/editabletext.h
+include/atkmm-1.6/atkmm/hyperlink.h
+include/atkmm-1.6/atkmm/hypertext.h
+include/atkmm-1.6/atkmm/image.h
+include/atkmm-1.6/atkmm/implementor.h
+include/atkmm-1.6/atkmm/init.h
+include/atkmm-1.6/atkmm/noopobject.h
+include/atkmm-1.6/atkmm/object.h
+include/atkmm-1.6/atkmm/objectaccessible.h
+include/atkmm-1.6/atkmm/private/action_p.h
+include/atkmm-1.6/atkmm/private/component_p.h
+include/atkmm-1.6/atkmm/private/document_p.h
+include/atkmm-1.6/atkmm/private/editabletext_p.h
+include/atkmm-1.6/atkmm/private/hyperlink_p.h
+include/atkmm-1.6/atkmm/private/hypertext_p.h
+include/atkmm-1.6/atkmm/private/image_p.h
+include/atkmm-1.6/atkmm/private/implementor_p.h
+include/atkmm-1.6/atkmm/private/noopobject_p.h
+include/atkmm-1.6/atkmm/private/object_p.h
+include/atkmm-1.6/atkmm/private/objectaccessible_p.h
+include/atkmm-1.6/atkmm/private/relation_p.h
+include/atkmm-1.6/atkmm/private/relationset_p.h
+include/atkmm-1.6/atkmm/private/selection_p.h
+include/atkmm-1.6/atkmm/private/stateset_p.h
+include/atkmm-1.6/atkmm/private/streamablecontent_p.h
+include/atkmm-1.6/atkmm/private/table_p.h
+include/atkmm-1.6/atkmm/private/text_p.h
+include/atkmm-1.6/atkmm/private/value_p.h
+include/atkmm-1.6/atkmm/relation.h
+include/atkmm-1.6/atkmm/relationset.h
+include/atkmm-1.6/atkmm/selection.h
+include/atkmm-1.6/atkmm/stateset.h
+include/atkmm-1.6/atkmm/streamablecontent.h
+include/atkmm-1.6/atkmm/table.h
+include/atkmm-1.6/atkmm/text.h
+include/atkmm-1.6/atkmm/value.h
+include/atkmm-1.6/atkmm/wrap_init.h
+lib/atkmm-1.6/include/atkmmconfig.h
+lib/libatkmm-1.6.la
+lib/libatkmm-1.6.so
+lib/libatkmm-1.6.so.2
+libdata/pkgconfig/atkmm-1.6.pc
+@dirrm lib/atkmm-1.6/include
+@dirrm lib/atkmm-1.6
+@dirrm include/atkmm-1.6/atkmm/private
+@dirrm include/atkmm-1.6/atkmm
+@dirrm include/atkmm-1.6
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 84d76b114f34..4ac0cefc19e5 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/gnome-mag/Makefile,v 1.51 2010/04/01 11:23:47 kwm Exp $
+# $MCom: ports/accessibility/gnome-mag/Makefile,v 1.54 2010/10/31 11:01:52 kwm Exp $
#
PORTNAME= gnome-mag
-PORTVERSION= 0.16.1
-PORTREVISION= 1
+PORTVERSION= 0.16.3
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/gnome-mag/distinfo b/accessibility/gnome-mag/distinfo
index 7ef3c2a18fc2..6c55aca52bd7 100644
--- a/accessibility/gnome-mag/distinfo
+++ b/accessibility/gnome-mag/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gnome-mag-0.16.1.tar.bz2) = bbe177dadfd64c071b5670956ed703ae
-SHA256 (gnome2/gnome-mag-0.16.1.tar.bz2) = 92541c30a70a6cf59ec3fb3f46d27a598173984f786f7c6bc1bd3e4be65ad3fa
-SIZE (gnome2/gnome-mag-0.16.1.tar.bz2) = 546444
+SHA256 (gnome2/gnome-mag-0.16.3.tar.bz2) = 1ea1b1218ce621226b0397c4c548db29636ab663da7943440327e04345916d99
+SIZE (gnome2/gnome-mag-0.16.3.tar.bz2) = 554588
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index f2c43b92d2cd..63bc6a6b8c3c 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.110 2010/04/02 16:53:04 kwm Exp $
+# $MCom: ports/accessibility/gok/Makefile,v 1.112 2010/09/29 07:37:57 kwm Exp $
#
PORTNAME= gok
-PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTVERSION= 2.30.1
PORTEPOCH= 1
CATEGORIES= accessibility sysutils gnome
MASTER_SITES= GNOME
diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo
index 7f03e9291a64..308fa587c3f8 100644
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gok-2.30.0.tar.bz2) = 853c7825eb62d7c425f5a0efdc07412a
-SHA256 (gnome2/gok-2.30.0.tar.bz2) = 6fe6e116dc663d7f2132b44fc9959ce2e9a26e5259eea860db6829c736a386b6
-SIZE (gnome2/gok-2.30.0.tar.bz2) = 1544165
+MD5 (gnome2/gok-2.30.1.tar.bz2) = 09ae1130220e9321fce9a4a6d0890cea
+SHA256 (gnome2/gok-2.30.1.tar.bz2) = 6422dedb80c2cb3d5ee47238227960dc0e6dde0d0d1351cc7d11de06089c36c0
+SIZE (gnome2/gok-2.30.1.tar.bz2) = 1538598
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
index 0885e41f31ea..208d4dca6ead 100644
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/accessibility/mousetweaks/Makefile,v 1.1 2010/06/23 12:32:12 kwm Exp $
+# $MCom: ports/accessibility/mousetweaks/Makefile,v 1.53 2010/11/15 21:25:36 kwm Exp $
#
PORTNAME= mousetweaks
-PORTVERSION= 2.30.2
+PORTVERSION= 2.32.1
CATEGORIES= accessibility
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,7 +17,7 @@ COMMENT= Mouse accessibility enhancements for the GNOME desktop
USE_XORG= x11 xfixes xcursor xtst
USE_BZIP2= yes
-USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack atspi
+USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack
USE_GMAKE= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
diff --git a/accessibility/mousetweaks/distinfo b/accessibility/mousetweaks/distinfo
index abdc059c6ce9..d70b80607ab4 100644
--- a/accessibility/mousetweaks/distinfo
+++ b/accessibility/mousetweaks/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/mousetweaks-2.30.2.tar.bz2) = 35e755f9e607b1e18f9cc619ec496c24
-SHA256 (gnome2/mousetweaks-2.30.2.tar.bz2) = d204e41bba4f14728246dc01b867d59fbc9e809739f0a7e9ad226a95af594da4
-SIZE (gnome2/mousetweaks-2.30.2.tar.bz2) = 2195681
+SHA256 (gnome2/mousetweaks-2.32.1.tar.bz2) = 70d2e8ba0f5021a9e70fecab2ea5cb5f2c03941e676607bec37f2304d9b86d08
+SIZE (gnome2/mousetweaks-2.32.1.tar.bz2) = 2195347
diff --git a/accessibility/mousetweaks/pkg-plist b/accessibility/mousetweaks/pkg-plist
index 6e757d17ee07..bbb40e78f1bc 100644
--- a/accessibility/mousetweaks/pkg-plist
+++ b/accessibility/mousetweaks/pkg-plist
@@ -208,6 +208,7 @@ share/locale/gu/LC_MESSAGES/mousetweaks.mo
share/locale/he/LC_MESSAGES/mousetweaks.mo
share/locale/hi/LC_MESSAGES/mousetweaks.mo
share/locale/hu/LC_MESSAGES/mousetweaks.mo
+share/locale/id/LC_MESSAGES/mousetweaks.mo
share/locale/it/LC_MESSAGES/mousetweaks.mo
share/locale/ja/LC_MESSAGES/mousetweaks.mo
share/locale/kn/LC_MESSAGES/mousetweaks.mo
@@ -228,6 +229,7 @@ share/locale/pt/LC_MESSAGES/mousetweaks.mo
share/locale/pt_BR/LC_MESSAGES/mousetweaks.mo
share/locale/ro/LC_MESSAGES/mousetweaks.mo
share/locale/ru/LC_MESSAGES/mousetweaks.mo
+share/locale/sk/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
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index 36eb4039f6fe..d72c563475eb 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/accessibility/orca/Makefile,v 1.5 2010/06/23 12:15:30 kwm Exp $
+# $MCom: ports/accessibility/orca/Makefile,v 1.90 2010/11/16 12:00:48 avl Exp $
#
PORTNAME= orca
-PORTVERSION= 2.30.2
+PORTVERSION= 2.32.1
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,10 +16,12 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Scriptable screen reader
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \
- ${PYTHON_SITELIBDIR}/pyatspi/__init__.py:${PORTSDIR}/accessibility/at-spi
+ ${PYTHON_SITELIBDIR}/pyatspi/__init__.py:${PORTSDIR}/accessibility/at-spi \
+ ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
LIB_DEPENDS= gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \
- ${PYTHON_SITELIBDIR}/pyatspi/__init__.py:${PORTSDIR}/accessibility/at-spi
+ ${PYTHON_SITELIBDIR}/pyatspi/__init__.py:${PORTSDIR}/accessibility/at-spi \
+ ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
LATEST_LINK= gnome-orca
diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo
index 96a6b5e0758e..0c8f4f40a6f4 100644
--- a/accessibility/orca/distinfo
+++ b/accessibility/orca/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/orca-2.30.2.tar.bz2) = 8988f96533109c14cbd5ac8f2b0754f2
-SHA256 (gnome2/orca-2.30.2.tar.bz2) = 0359387f6be84b4321313a3f96deb6b65314e6334b86658a12386976bb82c5df
-SIZE (gnome2/orca-2.30.2.tar.bz2) = 2291523
+SHA256 (gnome2/orca-2.32.1.tar.bz2) = 44da9da70c1b47bc87fda8f3b9da4cc1df9993d92388434f5707d39b5a832629
+SIZE (gnome2/orca-2.32.1.tar.bz2) = 2653300
diff --git a/accessibility/orca/files/patch-configure b/accessibility/orca/files/patch-configure
new file mode 100644
index 000000000000..19247d9a06d6
--- /dev/null
+++ b/accessibility/orca/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig 2010-10-10 12:06:22.000000000 -0400
++++ configure 2010-10-10 12:06:40.000000000 -0400
+@@ -5867,7 +5867,7 @@ except ImportError:
+ except:
+ sys.exit(0)
+ sys.exit(0)"
+-if $PYTHON -c "$prog" 1>&5 2>&5
++if dbus-launch $PYTHON -c "$prog" 1>&5 2>&5
+ then
+ eval "py_cv_mod_$py_mod_var=yes"
+ else
diff --git a/accessibility/orca/files/patch-src_orca_orca.in b/accessibility/orca/files/patch-src_orca_orca.in
index be06e2fd4a31..d38c7a9aab1f 100644
--- a/accessibility/orca/files/patch-src_orca_orca.in
+++ b/accessibility/orca/files/patch-src_orca_orca.in
@@ -1,20 +1,11 @@
---- 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.
- #
--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.
-@@ -84,7 +84,7 @@ restoreXmodmap()
- cleanup()
- {
- USERID=`id | cut -f2 -d= | cut -f1 -d\(`
-- PIDS=`ps -eo pid,ruid,args | grep $USERID | \
-+ PIDS=`ps -exo pid,ruid,args | grep $USERID | \
- egrep "orca[.]orca|OAFIID[:]GNOME_Speech|OAFIID[:]GNOME_Magnifier|festival [-][-]server"|\
- grep -v grep | awk '{ print $1 }'`
- IFS='
+--- src/orca/orca.in.orig 2010-08-30 18:09:24.000000000 +0000
++++ src/orca/orca.in 2010-09-11 16:18:35.000000000 +0000
+@@ -183,7 +183,7 @@
+ if [ "x$DBUS_SESSION_BUS_ADDRESS" != "x" ] && [ $WONT_EXIT -gt 0 ] ; then
+ IFS=:
+ DBUSSENDCMD=
+- for dir in $PATH:/usr/sfw/bin:/usr/local/bin; do
++ for dir in $PATH:/usr/local/bin; do
+ test -x "$dir/dbus-send" && {
+ DBUSSENDCMD="$dir/dbus-send"
+ break
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
index d2ddc3b7b4c4..5c77bb9438c3 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -23,9 +23,15 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/brlmon.py
%%PYTHON_SITELIBDIR%%/orca/brlmon.pyc
%%PYTHON_SITELIBDIR%%/orca/brlmon.pyo
+%%PYTHON_SITELIBDIR%%/orca/chat.py
+%%PYTHON_SITELIBDIR%%/orca/chat.pyc
+%%PYTHON_SITELIBDIR%%/orca/chat.pyo
%%PYTHON_SITELIBDIR%%/orca/chnames.py
%%PYTHON_SITELIBDIR%%/orca/chnames.pyc
%%PYTHON_SITELIBDIR%%/orca/chnames.pyo
+%%PYTHON_SITELIBDIR%%/orca/common_keyboardmap.py
+%%PYTHON_SITELIBDIR%%/orca/common_keyboardmap.pyc
+%%PYTHON_SITELIBDIR%%/orca/common_keyboardmap.pyo
%%PYTHON_SITELIBDIR%%/orca/dbusserver.py
%%PYTHON_SITELIBDIR%%/orca/dbusserver.pyc
%%PYTHON_SITELIBDIR%%/orca/dbusserver.pyo
@@ -38,6 +44,9 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/default.py
%%PYTHON_SITELIBDIR%%/orca/default.pyc
%%PYTHON_SITELIBDIR%%/orca/default.pyo
+%%PYTHON_SITELIBDIR%%/orca/desktop_keyboardmap.py
+%%PYTHON_SITELIBDIR%%/orca/desktop_keyboardmap.pyc
+%%PYTHON_SITELIBDIR%%/orca/desktop_keyboardmap.pyo
%%PYTHON_SITELIBDIR%%/orca/espeechfactory.py
%%PYTHON_SITELIBDIR%%/orca/espeechfactory.pyc
%%PYTHON_SITELIBDIR%%/orca/espeechfactory.pyo
@@ -77,6 +86,9 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/keynames.py
%%PYTHON_SITELIBDIR%%/orca/keynames.pyc
%%PYTHON_SITELIBDIR%%/orca/keynames.pyo
+%%PYTHON_SITELIBDIR%%/orca/laptop_keyboardmap.py
+%%PYTHON_SITELIBDIR%%/orca/laptop_keyboardmap.pyc
+%%PYTHON_SITELIBDIR%%/orca/laptop_keyboardmap.pyo
%%PYTHON_SITELIBDIR%%/orca/liveregions.py
%%PYTHON_SITELIBDIR%%/orca/liveregions.pyc
%%PYTHON_SITELIBDIR%%/orca/liveregions.pyo
@@ -86,6 +98,12 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/mouse_review.py
%%PYTHON_SITELIBDIR%%/orca/mouse_review.pyc
%%PYTHON_SITELIBDIR%%/orca/mouse_review.pyo
+%%PYTHON_SITELIBDIR%%/orca/notification_messages.py
+%%PYTHON_SITELIBDIR%%/orca/notification_messages.pyc
+%%PYTHON_SITELIBDIR%%/orca/notification_messages.pyo
+%%PYTHON_SITELIBDIR%%/orca/openttsfactory.py
+%%PYTHON_SITELIBDIR%%/orca/openttsfactory.pyc
+%%PYTHON_SITELIBDIR%%/orca/openttsfactory.pyo
%%PYTHON_SITELIBDIR%%/orca/orca.py
%%PYTHON_SITELIBDIR%%/orca/orca.pyc
%%PYTHON_SITELIBDIR%%/orca/orca.pyo
@@ -104,9 +122,15 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/orca_gui_prefs.py
%%PYTHON_SITELIBDIR%%/orca/orca_gui_prefs.pyc
%%PYTHON_SITELIBDIR%%/orca/orca_gui_prefs.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_splash.py
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_splash.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_splash.pyo
%%PYTHON_SITELIBDIR%%/orca/orca_i18n.py
%%PYTHON_SITELIBDIR%%/orca/orca_i18n.pyc
%%PYTHON_SITELIBDIR%%/orca/orca_i18n.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_platform.py
+%%PYTHON_SITELIBDIR%%/orca/orca_platform.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_platform.pyo
%%PYTHON_SITELIBDIR%%/orca/orca_prefs.py
%%PYTHON_SITELIBDIR%%/orca/orca_prefs.pyc
%%PYTHON_SITELIBDIR%%/orca/orca_prefs.pyo
@@ -125,9 +149,6 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/phonnames.py
%%PYTHON_SITELIBDIR%%/orca/phonnames.pyc
%%PYTHON_SITELIBDIR%%/orca/phonnames.pyo
-%%PYTHON_SITELIBDIR%%/orca/platform.py
-%%PYTHON_SITELIBDIR%%/orca/platform.pyc
-%%PYTHON_SITELIBDIR%%/orca/platform.pyo
%%PYTHON_SITELIBDIR%%/orca/presentation_manager.py
%%PYTHON_SITELIBDIR%%/orca/presentation_manager.pyc
%%PYTHON_SITELIBDIR%%/orca/presentation_manager.pyo
@@ -143,6 +164,9 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/script.py
%%PYTHON_SITELIBDIR%%/orca/script.pyc
%%PYTHON_SITELIBDIR%%/orca/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/script_utilities.pyc
+%%PYTHON_SITELIBDIR%%/orca/script_utilities.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.py
%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyo
@@ -155,36 +179,90 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/script.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/script_utilities.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/script_utilities.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/speech_generator.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee/speech_generator.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/script_utilities.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse/script_utilities.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/chat.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/chat.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/chat.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/script_utilities.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird/script_utilities.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla/script.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__init__.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__init__.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/formatting.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/formatting.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/formatting.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script_settings.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script_settings.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script_settings.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script_utilities.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script_utilities.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/speech_generator.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/speech_generator.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__init__.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__init__.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__init__.pyo
-%%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/acroread/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu/script_utilities.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu/script_utilities.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/script_utilities.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy/script_utilities.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
@@ -194,9 +272,18 @@ bin/orca
%%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/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script_utilities.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script_utilities.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/gajim/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim/script.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
@@ -206,36 +293,63 @@ 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/gdmlogin.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin/script.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__init__.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__init__.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__init__.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/script.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/script.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-system-monitor.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-system-monitor.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-system-monitor.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel/speech_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-system-monitor/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-system-monitor/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-system-monitor/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-system-monitor/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-system-monitor/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-system-monitor/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal/script.pyo
%%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
@@ -245,27 +359,48 @@ bin/orca
%%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_segv2.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/nautilus.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/nautilus.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/nautilus.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/nautilus/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/nautilus/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/nautilus/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/nautilus/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/nautilus/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/nautilus/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notify-osd/script.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
@@ -278,6 +413,9 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script_settings.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script_settings.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script_settings.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script_utilities.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/packagemanager/script_utilities.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
@@ -287,12 +425,15 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/chat.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/chat.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/chat.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_settings.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_settings.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_settings.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_utilities.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_utilities.pyo
%%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
@@ -338,6 +479,9 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_settings.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_settings.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_settings.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_utilities.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_utilities.pyo
%%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
@@ -353,9 +497,18 @@ bin/orca
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script_settings.py
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script_settings.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script_settings.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script_utilities.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp/script_utilities.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.py
%%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/CALLY/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/CALLY/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/CALLY/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/CALLY/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/CALLY/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/CALLY/script.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL.pyo
@@ -371,12 +524,18 @@ bin/orca
%%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/keymaps.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/keymaps.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/keymaps.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
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_settings.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_settings.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_settings.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_utilities.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_utilities.pyo
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/speech_generator.py
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/speech_generator.pyc
%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/speech_generator.pyo
@@ -392,6 +551,9 @@ bin/orca
%%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/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script_utilities.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script_utilities.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
@@ -439,6 +601,7 @@ share/icons/hicolor/32x32/apps/orca.png
share/icons/hicolor/48x48/apps/orca.png
share/icons/hicolor/scalable/apps/orca.svg
share/locale/ar/LC_MESSAGES/orca.mo
+share/locale/ast/LC_MESSAGES/orca.mo
share/locale/bg/LC_MESSAGES/orca.mo
share/locale/bn/LC_MESSAGES/orca.mo
share/locale/bn_IN/LC_MESSAGES/orca.mo
@@ -473,6 +636,7 @@ share/locale/mai/LC_MESSAGES/orca.mo
share/locale/mk/LC_MESSAGES/orca.mo
share/locale/ml/LC_MESSAGES/orca.mo
share/locale/mr/LC_MESSAGES/orca.mo
+share/locale/ms/LC_MESSAGES/orca.mo
share/locale/nb/LC_MESSAGES/orca.mo
share/locale/ne/LC_MESSAGES/orca.mo
share/locale/nl/LC_MESSAGES/orca.mo
@@ -501,17 +665,21 @@ 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%%/gfx/orca-splash.png
%%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
+%%DATADIR%%/ui/orca-splash.ui
@dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%/gfx
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/CALLY
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice
@@ -519,11 +687,34 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
@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/notify-osd
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/nautilus
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gtk-window-decorator
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-system-monitor
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gajim
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/empathy
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/ekiga
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/ddu
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Instantbird
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Eclipse
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Banshee
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps
@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts
@@ -550,3 +741,5 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
@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
diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
index 1f8ac59598d9..f5ae0ee28867 100644
--- a/accessibility/py-atspi/Makefile
+++ b/accessibility/py-atspi/Makefile
@@ -3,12 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/py-atspi/Makefile,v 1.5 2010/04/01 12:24:50 kwm Exp $
+# $MCom: ports/accessibility/py-atspi/Makefile,v 1.13 2010/11/16 11:55:55 kwm Exp $
#
PORTNAME= atspi
-PORTVERSION= 0.1.8
-PORTREVISION= 1
+PORTVERSION= 0.4.1
CATEGORIES= accessibility x11-toolkits python
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/accessibility/py-atspi/distinfo b/accessibility/py-atspi/distinfo
index dde4f0b69753..dd82dbd20708 100644
--- a/accessibility/py-atspi/distinfo
+++ b/accessibility/py-atspi/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/pyatspi-0.1.8.tar.bz2) = 01f6a0d4879e6d65bce20ae4927b6d45
-SHA256 (gnome2/pyatspi-0.1.8.tar.bz2) = e984b0e587fb28813e92a3b3b08228b47b410f48d8474da05fbf8e327274d55a
-SIZE (gnome2/pyatspi-0.1.8.tar.bz2) = 306278
+SHA256 (gnome2/pyatspi-0.4.1.tar.bz2) = 2d9672e0ca6277c491a0b35421691d96618d9c02e687851ce418811379aa4a2e
+SIZE (gnome2/pyatspi-0.4.1.tar.bz2) = 311019
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 14b14d13fb2c..299c8ec781e4 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,11 +3,11 @@
# Whom: Anders Nordby <anders@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/archivers/file-roller/Makefile,v 1.5 2010/06/23 15:16:03 kwm Exp $
+# $MCom: ports/archivers/file-roller/Makefile,v 1.184 2010/11/15 22:58:48 kwm Exp $
#
PORTNAME= file-roller
-PORTVERSION= 2.30.2
+PORTVERSION= 2.32.1
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= GNOME
@@ -29,10 +29,12 @@ INSTALLS_ICONS= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils gnomedocutils \
gtk20 gconf2
+GNOME_DESKTOP_VERSION=2
USE_XORG= sm
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --disable-packagekit
PORTDOCS= AUTHORS NEWS README TODO ChangeLog
GCONF_SCHEMAS= file-roller.schemas
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 686e3829684f..0391b548bd16 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/file-roller-2.30.2.tar.bz2) = c13209518d2e2294ec1fa813e063b0c5
-SHA256 (gnome2/file-roller-2.30.2.tar.bz2) = 34e809ee4e11d85d314b9060a5641a68e55046d429bf8a435a24b777eec8b2f5
-SIZE (gnome2/file-roller-2.30.2.tar.bz2) = 1818246
+SHA256 (gnome2/file-roller-2.32.1.tar.bz2) = a9109d9c871c022eb0553eeedc98520bad42ba3099088c16a9f7df817f60cc92
+SIZE (gnome2/file-roller-2.32.1.tar.bz2) = 1916180
diff --git a/archivers/file-roller/files/patch-src_fr-command-lrzip.c b/archivers/file-roller/files/patch-src_fr-command-lrzip.c
new file mode 100644
index 000000000000..ae2d7d440482
--- /dev/null
+++ b/archivers/file-roller/files/patch-src_fr-command-lrzip.c
@@ -0,0 +1,11 @@
+--- src/fr-command-lrzip.c.orig 2010-08-26 12:40:56.000000000 -0400
++++ src/fr-command-lrzip.c 2010-08-26 12:41:41.000000000 -0400
+@@ -53,7 +53,7 @@ list__process_line (char *line,
+ struct stat st;
+ time_t tt;
+ if (stat (comm->filename, &st) == 0)
+- fdata->modified = st.st_mtim.tv_sec;
++ fdata->modified = st.st_mtime;
+ else
+ time(&(fdata->modified));
+ fdata->modified;
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index b45025293667..6af23090ca35 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -87,6 +87,12 @@ share/gnome/help/file-roller/it/figures/file-roller_main_window.png
share/gnome/help/file-roller/it/figures/file-roller_rightarrow.png
share/gnome/help/file-roller/it/figures/file-roller_uparrow.png
share/gnome/help/file-roller/it/file-roller.xml
+share/gnome/help/file-roller/ja/figures/file-roller_home.png
+share/gnome/help/file-roller/ja/figures/file-roller_leftarrow.png
+share/gnome/help/file-roller/ja/figures/file-roller_main_window.png
+share/gnome/help/file-roller/ja/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/ja/figures/file-roller_uparrow.png
+share/gnome/help/file-roller/ja/file-roller.xml
share/gnome/help/file-roller/nl/figures/file-roller_home.png
share/gnome/help/file-roller/nl/figures/file-roller_leftarrow.png
share/gnome/help/file-roller/nl/figures/file-roller_main_window.png
@@ -158,6 +164,7 @@ share/locale/el/LC_MESSAGES/file-roller.mo
share/locale/en@shaw/LC_MESSAGES/file-roller.mo
share/locale/en_CA/LC_MESSAGES/file-roller.mo
share/locale/en_GB/LC_MESSAGES/file-roller.mo
+share/locale/eo/LC_MESSAGES/file-roller.mo
share/locale/es/LC_MESSAGES/file-roller.mo
share/locale/et/LC_MESSAGES/file-roller.mo
share/locale/eu/LC_MESSAGES/file-roller.mo
@@ -165,6 +172,7 @@ share/locale/fa/LC_MESSAGES/file-roller.mo
share/locale/fi/LC_MESSAGES/file-roller.mo
share/locale/fr/LC_MESSAGES/file-roller.mo
share/locale/fur/LC_MESSAGES/file-roller.mo
+share/locale/fy/LC_MESSAGES/file-roller.mo
share/locale/ga/LC_MESSAGES/file-roller.mo
share/locale/gl/LC_MESSAGES/file-roller.mo
share/locale/gu/LC_MESSAGES/file-roller.mo
@@ -219,6 +227,7 @@ share/locale/te/LC_MESSAGES/file-roller.mo
share/locale/th/LC_MESSAGES/file-roller.mo
share/locale/tk/LC_MESSAGES/file-roller.mo
share/locale/tr/LC_MESSAGES/file-roller.mo
+share/locale/ug/LC_MESSAGES/file-roller.mo
share/locale/uk/LC_MESSAGES/file-roller.mo
share/locale/ur/LC_MESSAGES/file-roller.mo
share/locale/ur_PK/LC_MESSAGES/file-roller.mo
@@ -238,6 +247,7 @@ share/omf/file-roller/file-roller-es.omf
share/omf/file-roller/file-roller-fi.omf
share/omf/file-roller/file-roller-fr.omf
share/omf/file-roller/file-roller-it.omf
+share/omf/file-roller/file-roller-ja.omf
share/omf/file-roller/file-roller-nl.omf
share/omf/file-roller/file-roller-oc.omf
share/omf/file-roller/file-roller-ru.omf
@@ -260,6 +270,8 @@ share/omf/file-roller/file-roller-zh_CN.omf
@dirrm share/gnome/help/file-roller/oc
@dirrm share/gnome/help/file-roller/nl/figures
@dirrm share/gnome/help/file-roller/nl
+@dirrm share/gnome/help/file-roller/ja/figures
+@dirrm share/gnome/help/file-roller/ja
@dirrm share/gnome/help/file-roller/it/figures
@dirrm share/gnome/help/file-roller/it
@dirrm share/gnome/help/file-roller/fr/figures
@@ -303,6 +315,8 @@ share/omf/file-roller/file-roller-zh_CN.omf
@dirrmtry share/locale/ur_PK
@dirrmtry share/locale/ur/LC_MESSAGES
@dirrmtry share/locale/ur
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -331,6 +345,8 @@ share/omf/file-roller/file-roller-zh_CN.omf
@dirrmtry share/locale/kk
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/fy/LC_MESSAGES
+@dirrmtry share/locale/fy
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/en@shaw/LC_MESSAGES
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index 738f96ac85d8..aee8b236bcc2 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmpc
PORTVERSION= 0.19.0
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
@@ -18,6 +18,7 @@ COMMENT= Full featured GTK2 client for musicpd
BUILD_DEPENDS= gob2:${PORTSDIR}/devel/gob2
LIB_DEPENDS= mpd:${PORTSDIR}/audio/libmpd \
+ sqlite3.8:${PORTSDIR}/databases/sqlite3 \
curl.6:${PORTSDIR}/ftp/curl \
soup-2.4.1:${PORTSDIR}/devel/libsoup
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 986aa913b7d3..864239ff6fdb 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/audio/gnome-media/Makefile,v 1.2 2010/06/25 06:51:09 kwm Exp $
+# $MCom: ports/audio/gnome-media/Makefile,v 1.155 2010/09/29 08:17:11 kwm Exp $
#
PORTNAME= gnome-media
-PORTVERSION= 2.30.0
-PORTREVISION= 2
+PORTVERSION= 2.32.0
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index 5a2389c24a4b..f83b79878a9e 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.30.0.tar.bz2) = 027b11fb8b126ab1b25def6b9e121bd3
-SHA256 (gnome2/gnome-media-2.30.0.tar.bz2) = 994cd9b88ff22e4815585629b14efc828a95284900809b0b4f8ebcde0c6e2926
-SIZE (gnome2/gnome-media-2.30.0.tar.bz2) = 2707711
+MD5 (gnome2/gnome-media-2.32.0.tar.bz2) = 06fc8c67add34c98bc484e0dbc404d41
+SHA256 (gnome2/gnome-media-2.32.0.tar.bz2) = 2b0ad4decd75406398f46e82a170e53bcbc6e1bdc3363f03a07b00f59c2fe5e6
+SIZE (gnome2/gnome-media-2.32.0.tar.bz2) = 2814365
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index cb85a917f590..513d10acd347 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -35,6 +35,24 @@ share/applications/gstreamer-properties.desktop
%%PULSE%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-low.png
%%PULSE%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-medium.png
%%PULSE%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-muted.png
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-testing.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back-testing.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side-testing.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-testing.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back-testing.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side-testing.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-testing.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back-testing.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer.svg
+%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer-testing.svg
%%PULSE%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-high.svg
%%PULSE%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-low.svg
%%PULSE%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-medium.svg
@@ -45,6 +63,10 @@ share/gnome/help/gnome-audio-profiles/C/figures/gnome-audio-profiles-profile-win
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-audio-profiles/da/figures/gnome-audio-profiles-profile-window.png
+share/gnome/help/gnome-audio-profiles/da/figures/gnome-audio-profiles-profiles-window.png
+share/gnome/help/gnome-audio-profiles/da/gnome-audio-profiles.xml
+share/gnome/help/gnome-audio-profiles/da/legal.xml
share/gnome/help/gnome-audio-profiles/de/figures/gnome-audio-profiles-profile-window.png
share/gnome/help/gnome-audio-profiles/de/figures/gnome-audio-profiles-profiles-window.png
share/gnome/help/gnome-audio-profiles/de/gnome-audio-profiles.xml
@@ -103,6 +125,8 @@ share/gnome/help/gstreamer-properties/ca/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/ca/gstreamer-properties.xml
share/gnome/help/gstreamer-properties/cs/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/cs/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/da/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/da/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
@@ -132,21 +156,21 @@ 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
-%%PULSE%%share/icons/hicolor/16x16/apps/gnome-volume-control.png
-%%PULSE%%share/icons/hicolor/16x16/apps/gnome-volume-control.svg
+%%PULSE%%share/icons/hicolor/16x16/apps/multimedia-volume-control.png
+%%PULSE%%share/icons/hicolor/16x16/apps/multimedia-volume-control.svg
share/icons/hicolor/22x22/apps/gnome-sound-recorder.png
-%%PULSE%%share/icons/hicolor/22x22/apps/gnome-volume-control.png
-%%PULSE%%share/icons/hicolor/22x22/apps/gnome-volume-control.svg
+%%PULSE%%share/icons/hicolor/22x22/apps/multimedia-volume-control.png
+%%PULSE%%share/icons/hicolor/22x22/apps/multimedia-volume-control.svg
share/icons/hicolor/24x24/apps/gnome-sound-recorder.png
-%%PULSE%%share/icons/hicolor/24x24/apps/gnome-volume-control.png
+%%PULSE%%share/icons/hicolor/24x24/apps/multimedia-volume-control.png
share/icons/hicolor/32x32/apps/gnome-sound-recorder.png
-%%PULSE%%share/icons/hicolor/32x32/apps/gnome-volume-control.png
-%%PULSE%%share/icons/hicolor/32x32/apps/gnome-volume-control.svg
+%%PULSE%%share/icons/hicolor/32x32/apps/multimedia-volume-control.png
+%%PULSE%%share/icons/hicolor/32x32/apps/multimedia-volume-control.svg
share/icons/hicolor/48x48/apps/gnome-sound-recorder.png
-%%PULSE%%share/icons/hicolor/48x48/apps/gnome-volume-control.png
+%%PULSE%%share/icons/hicolor/48x48/apps/multimedia-volume-control.png
share/icons/hicolor/48x48/apps/gstreamer-properties.png
share/icons/hicolor/scalable/apps/gnome-sound-recorder.svg
-%%PULSE%%share/icons/hicolor/scalable/apps/gnome-volume-control.svg
+%%PULSE%%share/icons/hicolor/scalable/apps/multimedia-volume-control.svg
share/locale/af/LC_MESSAGES/gnome-media-2.0.mo
share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
@@ -226,6 +250,7 @@ share/locale/te/LC_MESSAGES/gnome-media-2.0.mo
share/locale/th/LC_MESSAGES/gnome-media-2.0.mo
share/locale/tk/LC_MESSAGES/gnome-media-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ug/LC_MESSAGES/gnome-media-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-media-2.0.mo
@@ -234,6 +259,7 @@ 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-audio-profiles/gnome-audio-profiles-da.omf
share/omf/gnome-audio-profiles/gnome-audio-profiles-de.omf
share/omf/gnome-audio-profiles/gnome-audio-profiles-el.omf
share/omf/gnome-audio-profiles/gnome-audio-profiles-es.omf
@@ -257,6 +283,7 @@ 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-da.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
@@ -308,6 +335,8 @@ share/sounds/gnome/default/alerts/sonar.ogg
@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/da/figures
+@dirrm share/gnome/help/gstreamer-properties/da
@dirrm share/gnome/help/gstreamer-properties/cs/figures
@dirrm share/gnome/help/gstreamer-properties/cs
@dirrm share/gnome/help/gstreamer-properties/ca/figures
@@ -356,6 +385,8 @@ share/sounds/gnome/default/alerts/sonar.ogg
@dirrm share/gnome/help/gnome-audio-profiles/el
@dirrm share/gnome/help/gnome-audio-profiles/de/figures
@dirrm share/gnome/help/gnome-audio-profiles/de
+@dirrm share/gnome/help/gnome-audio-profiles/da/figures
+@dirrm share/gnome/help/gnome-audio-profiles/da
@dirrm share/gnome/help/gnome-audio-profiles/C/figures
@dirrm share/gnome/help/gnome-audio-profiles/C
@dirrm share/gnome/help/gnome-audio-profiles
@@ -364,6 +395,8 @@ share/sounds/gnome/default/alerts/sonar.ogg
@dirrm %%DATADIR%%/sounds
%%PULSE%%@dirrm %%DATADIR%%/icons/hicolor/scalable/status
%%PULSE%%@dirrm %%DATADIR%%/icons/hicolor/scalable
+%%PULSE%%@dirrm %%DATADIR%%/icons/hicolor/48x48/devices
+%%PULSE%%@dirrm %%DATADIR%%/icons/hicolor/48x48
%%PULSE%%@dirrm %%DATADIR%%/icons/hicolor/32x32/status
%%PULSE%%@dirrm %%DATADIR%%/icons/hicolor/32x32
%%PULSE%%@dirrm %%DATADIR%%/icons/hicolor/24x24/status
@@ -382,6 +415,8 @@ share/sounds/gnome/default/alerts/sonar.ogg
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
diff --git a/audio/gx2osd/Makefile b/audio/gx2osd/Makefile
index 2b747a717226..b9ef77619f83 100644
--- a/audio/gx2osd/Makefile
+++ b/audio/gx2osd/Makefile
@@ -19,6 +19,8 @@ LIB_DEPENDS= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
BUILD_DEPENDS= ${LOCALBASE}/lib/libxmmsclient++.so.3:${PORTSDIR}/audio/cpp-xmms2
RUN_DEPENDS= ${LOCALBASE}/lib/libxmmsclient++.so.3:${PORTSDIR}/audio/cpp-xmms2
+BROKEN= Doesn't compile with Glib 2.26 / Gtk 2.22
+
USE_BZIP2= yes
USE_PYTHON_BUILD= yes
diff --git a/audio/muine/files/patch-libmuine_Makefile.in b/audio/muine/files/patch-libmuine_Makefile.in
new file mode 100644
index 000000000000..9432290abd69
--- /dev/null
+++ b/audio/muine/files/patch-libmuine_Makefile.in
@@ -0,0 +1,11 @@
+--- libmuine/Makefile.in.orig 2010-10-31 15:02:50.000000000 +0100
++++ libmuine/Makefile.in 2010-10-31 15:03:02.000000000 +0100
+@@ -266,8 +266,6 @@ INCLUDES = \
+ $(MUINE_CFLAGS) \
+ $(WARN_CFLAGS) \
+ -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DGDK_DISABLE_DEPRECATED \
+ -DGDK_PIXBUF_DISABLE_DEPRECATED \
+ -DGNOME_DISABLE_DEPRECATED
+
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index fda731c22eb7..2bd4be2bc162 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.107 2010/04/08 23:16:25 kwm Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.111 2010/09/28 15:55:46 kwm Exp $
#
PORTNAME= rhythmbox
PORTVERSION= 0.12.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -25,7 +25,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.2:${PORTSDIR}/sysutils/brasero
+ brasero-media.3:${PORTSDIR}/sysutils/brasero
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/audio/rhythmbox/files/patch-remote_dbus_rb-client.c b/audio/rhythmbox/files/patch-remote_dbus_rb-client.c
new file mode 100644
index 000000000000..c73cde0dcc11
--- /dev/null
+++ b/audio/rhythmbox/files/patch-remote_dbus_rb-client.c
@@ -0,0 +1,38 @@
+--- remote/dbus/rb-client.c.orig 2010-10-10 11:56:07.000000000 -0400
++++ remote/dbus/rb-client.c 2010-10-10 11:57:02.000000000 -0400
+@@ -54,7 +54,7 @@ static gboolean previous = FALSE;
+ static gboolean notify = FALSE;
+
+ static gboolean play = FALSE;
+-static gboolean pause = FALSE;
++static gboolean rbpause = FALSE;
+ static gboolean play_pause = FALSE;
+ static gboolean stop = FALSE;
+
+@@ -91,7 +91,7 @@ static GOptionEntry args[] = {
+ { "notify", 0, 0, G_OPTION_ARG_NONE, &notify, N_("Show notification of the playing song"), NULL },
+
+ { "play", 0, 0, G_OPTION_ARG_NONE, &play, N_("Resume playback if currently paused"), NULL },
+- { "pause", 0, 0, G_OPTION_ARG_NONE, &pause, N_("Pause playback if currently playing"), NULL },
++ { "pause", 0, 0, G_OPTION_ARG_NONE, &rbpause, N_("Pause playback if currently playing"), NULL },
+ { "play-pause", 0, 0, G_OPTION_ARG_NONE, &play_pause, N_("Toggle play/pause mode"), NULL },
+ /* { "stop", 0, 0, G_OPTION_ARG_NONE, &stop, N_("Stop playback"), NULL }, */
+
+@@ -608,7 +608,7 @@ main (int argc, char **argv)
+ if (next || previous ||
+ clear_queue ||
+ play_uri || other_stuff ||
+- play || pause || play_pause || stop ||
++ play || rbpause || play_pause || stop ||
+ print_playing || print_playing_format || notify ||
+ (set_volume > -0.01) || volume_up || volume_down || print_volume || mute || unmute || (set_rating > -0.01))
+ no_present = TRUE;
+@@ -696,7 +696,7 @@ main (int argc, char **argv)
+ org_gnome_Rhythmbox_Player_get_playing (player_proxy, &is_playing, &error);
+ if (!annoy (&error)) {
+ rb_debug ("playback state: %d", is_playing);
+- if (play || pause || play_pause) {
++ if (play || rbpause || play_pause) {
+ if (is_playing != play || play_pause) {
+ rb_debug ("calling playPause to change playback state");
+ org_gnome_Rhythmbox_Player_play_pause (player_proxy, FALSE, &error);
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 9ec9c450798d..438bb154dc80 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.98 2010/04/01 12:47:54 kwm Exp $
+# $MCom: ports/audio/sound-juicer/Makefile,v 1.102 2010/09/29 13:19:43 kwm Exp $
#
PORTNAME= sound-juicer
-PORTVERSION= 2.28.2
-PORTREVISION= 1
+PORTVERSION= 2.32.0
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -23,7 +22,7 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
tag.1:${PORTSDIR}/audio/taglib \
canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
- brasero-media.2:${PORTSDIR}/sysutils/brasero
+ brasero-media.3:${PORTSDIR}/sysutils/brasero
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index 5490698b19a9..c6e14eccc54b 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/sound-juicer-2.28.2.tar.bz2) = b40da7b2888d0c658fcfdff104ac8bbb
-SHA256 (gnome2/sound-juicer-2.28.2.tar.bz2) = f4dde2db5bfbae023ff5042257600f9acdb42626f878a079c271cc838eefae30
-SIZE (gnome2/sound-juicer-2.28.2.tar.bz2) = 2193659
+MD5 (gnome2/sound-juicer-2.32.0.tar.bz2) = 8261bd1f450d7056d15828ed2a69ef65
+SHA256 (gnome2/sound-juicer-2.32.0.tar.bz2) = f6040e19e50094daff9699dea3e9884ce3226a61f28acbe9ad3a0458975a305a
+SIZE (gnome2/sound-juicer-2.32.0.tar.bz2) = 2177250
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index 8237c6f3a029..8b0e01eb4eb2 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -40,6 +40,10 @@ share/gnome/help/sound-juicer/fr/figures/prefs.png
share/gnome/help/sound-juicer/fr/figures/startup.png
share/gnome/help/sound-juicer/fr/legal.xml
share/gnome/help/sound-juicer/fr/sound-juicer.xml
+share/gnome/help/sound-juicer/ja/figures/prefs.png
+share/gnome/help/sound-juicer/ja/figures/startup.png
+share/gnome/help/sound-juicer/ja/legal.xml
+share/gnome/help/sound-juicer/ja/sound-juicer.xml
share/gnome/help/sound-juicer/nl/figures/prefs.png
share/gnome/help/sound-juicer/nl/figures/startup.png
share/gnome/help/sound-juicer/nl/legal.xml
@@ -68,6 +72,10 @@ share/gnome/help/sound-juicer/uk/figures/prefs.png
share/gnome/help/sound-juicer/uk/figures/startup.png
share/gnome/help/sound-juicer/uk/legal.xml
share/gnome/help/sound-juicer/uk/sound-juicer.xml
+share/gnome/help/sound-juicer/zh_CN/figures/prefs.png
+share/gnome/help/sound-juicer/zh_CN/figures/startup.png
+share/gnome/help/sound-juicer/zh_CN/legal.xml
+share/gnome/help/sound-juicer/zh_CN/sound-juicer.xml
share/icons/hicolor/16x16/apps/sound-juicer.png
share/icons/hicolor/22x22/apps/sound-juicer.png
share/icons/hicolor/24x24/apps/sound-juicer.png
@@ -164,6 +172,7 @@ share/omf/sound-juicer/sound-juicer-en_GB.omf
share/omf/sound-juicer/sound-juicer-es.omf
share/omf/sound-juicer/sound-juicer-eu.omf
share/omf/sound-juicer/sound-juicer-fr.omf
+share/omf/sound-juicer/sound-juicer-ja.omf
share/omf/sound-juicer/sound-juicer-nl.omf
share/omf/sound-juicer/sound-juicer-oc.omf
share/omf/sound-juicer/sound-juicer-pl.omf
@@ -171,9 +180,12 @@ share/omf/sound-juicer/sound-juicer-pt_BR.omf
share/omf/sound-juicer/sound-juicer-ru.omf
share/omf/sound-juicer/sound-juicer-sv.omf
share/omf/sound-juicer/sound-juicer-uk.omf
-%%DATADIR%%/sound-juicer.glade
+share/omf/sound-juicer/sound-juicer-zh_CN.omf
+%%DATADIR%%/sound-juicer.ui
@dirrm %%DATADIR%%
@dirrm share/omf/sound-juicer
+@dirrm share/gnome/help/sound-juicer/zh_CN/figures
+@dirrm share/gnome/help/sound-juicer/zh_CN
@dirrm share/gnome/help/sound-juicer/uk/figures
@dirrm share/gnome/help/sound-juicer/uk
@dirrm share/gnome/help/sound-juicer/sv/figures
@@ -188,6 +200,8 @@ share/omf/sound-juicer/sound-juicer-uk.omf
@dirrm share/gnome/help/sound-juicer/oc
@dirrm share/gnome/help/sound-juicer/nl/figures
@dirrm share/gnome/help/sound-juicer/nl
+@dirrm share/gnome/help/sound-juicer/ja/figures
+@dirrm share/gnome/help/sound-juicer/ja
@dirrm share/gnome/help/sound-juicer/fr/figures
@dirrm share/gnome/help/sound-juicer/fr
@dirrm share/gnome/help/sound-juicer/eu/figures
diff --git a/cad/geda-gattrib/Makefile b/cad/geda-gattrib/Makefile
index fd903e379cac..16a6e27adad4 100644
--- a/cad/geda-gattrib/Makefile
+++ b/cad/geda-gattrib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gattrib
PORTVERSION= 1.4.3
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= cad
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/release/v1.4/${PORTVERSION}/ \
diff --git a/cad/geda-gattrib/files/patch-src_gtkitementry_2_2.c b/cad/geda-gattrib/files/patch-src_gtkitementry_2_2.c
new file mode 100644
index 000000000000..29d2ae56b635
--- /dev/null
+++ b/cad/geda-gattrib/files/patch-src_gtkitementry_2_2.c
@@ -0,0 +1,28 @@
+--- src/gtkitementry_2_2.c.orig 2010-10-29 19:10:42.000000000 +0200
++++ src/gtkitementry_2_2.c 2010-10-29 19:11:29.000000000 +0200
+@@ -156,7 +156,7 @@ static void gtk_entry_draw_curso
+ static PangoLayout *gtk_entry_ensure_layout (GtkEntry *entry,
+ gboolean include_preedit);
+ static void gtk_entry_queue_draw (GtkEntry *entry);
+-static void gtk_entry_reset_im_context (GtkEntry *entry);
++//static void gtk_entry_reset_im_context (GtkEntry *entry);
+ static void gtk_entry_recompute (GtkEntry *entry);
+ static void gtk_entry_get_cursor_locations (GtkEntry *entry,
+ CursorType type,
+@@ -1830,16 +1830,6 @@ gtk_entry_queue_draw (GtkEntry *entry)
+ }
+
+ static void
+-gtk_entry_reset_im_context (GtkEntry *entry)
+-{
+- if (entry->need_im_reset)
+- {
+- entry->need_im_reset = 0;
+- gtk_im_context_reset (entry->im_context);
+- }
+-}
+-
+-static void
+ gtk_entry_get_cursor_locations (GtkEntry *entry,
+ CursorType type,
+ gint *strong_x,
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index b43017790b9f..45d60670b64d 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/databases/evolution-data-server/Makefile,v 1.8 2010/06/24 10:03:53 kwm Exp $
+# $MCom: ports/databases/evolution-data-server/Makefile,v 1.203 2010/11/15 17:19:55 kwm Exp $
#
PORTNAME= evolution-data-server
-PORTVERSION= 2.30.3
+PORTVERSION= 2.32.1
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,6 +16,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= The data backends for the Evolution integrated mail/PIM suite
LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \
+ gdata.7:${PORTSDIR}/devel/libgdata \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
ical.44:${PORTSDIR}/devel/libical \
nss3.1:${PORTSDIR}/security/nss \
@@ -29,6 +30,7 @@ USE_BISON= build
USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack intlhack ltverhack ltasneededhack gconf2 \
libxml2
+GNOME_DESKTOP_VERSION=2
USE_OPENLDAP= yes
USE_AUTOTOOLS= libtool:22
USE_BDB= 41+
@@ -40,7 +42,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.30" EVO_VERSION="1.2"
+PLIST_SUB= VERSION="2.32" EVO_VERSION="1.2"
#OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off
OPTIONS= WEATHER "Enable weather calendar backend" on
@@ -84,7 +86,6 @@ pre-everything::
post-patch:
@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g ; \
s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g ; \
- s|LIBEDATASERVER_CURRENT=13|LIBEDATASERVER_CURRENT=11|g ; \
s|-Wl,--no-undefined||g ; \
s|-Wmissing-include-dirs||g' \
${WRKSRC}/configure
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index adccd4efda6d..d510805ec313 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/evolution-data-server-2.30.3.tar.bz2) = 095bac0a80043d57d00f64319f3cbdbb
-SHA256 (gnome2/evolution-data-server-2.30.3.tar.bz2) = 3773e677ab3b9ff5564a26409ec6b00bc1bd68baf58a8781109866a7e29df890
-SIZE (gnome2/evolution-data-server-2.30.3.tar.bz2) = 4652416
+SHA256 (gnome2/evolution-data-server-2.32.1.tar.bz2) = de6a724504a9d72ca550a5a157df1e27dbb951a673f281106171c2345912fc79
+SIZE (gnome2/evolution-data-server-2.32.1.tar.bz2) = 4290087
diff --git a/databases/evolution-data-server/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c b/databases/evolution-data-server/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c
new file mode 100644
index 000000000000..573eb5312a37
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c
@@ -0,0 +1,11 @@
+--- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig 2010-09-19 18:17:35.000000000 +0000
++++ calendar/libedata-cal/e-cal-backend-intervaltree.c 2010-09-19 18:17:44.000000000 +0000
+@@ -26,7 +26,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+
+ #include "e-cal-backend-intervaltree.h"
+
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index 8d112f6add3a..982014ecc1af 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -1,5 +1,4 @@
include/evolution-data-server-%%VERSION%%/camel/camel-address.h
-include/evolution-data-server-%%VERSION%%/camel/camel-arg.h
include/evolution-data-server-%%VERSION%%/camel/camel-block-file.h
include/evolution-data-server-%%VERSION%%/camel/camel-certdb.h
include/evolution-data-server-%%VERSION%%/camel/camel-charset-map.h
@@ -8,14 +7,9 @@ include/evolution-data-server-%%VERSION%%/camel/camel-data-cache.h
include/evolution-data-server-%%VERSION%%/camel/camel-data-wrapper.h
include/evolution-data-server-%%VERSION%%/camel/camel-db.h
include/evolution-data-server-%%VERSION%%/camel/camel-debug.h
-include/evolution-data-server-%%VERSION%%/camel/camel-digest-folder.h
-include/evolution-data-server-%%VERSION%%/camel/camel-digest-store.h
-include/evolution-data-server-%%VERSION%%/camel/camel-digest-summary.h
include/evolution-data-server-%%VERSION%%/camel/camel-disco-diary.h
include/evolution-data-server-%%VERSION%%/camel/camel-disco-folder.h
include/evolution-data-server-%%VERSION%%/camel/camel-disco-store.h
-include/evolution-data-server-%%VERSION%%/camel/camel-exception-list.def
-include/evolution-data-server-%%VERSION%%/camel/camel-exception.h
include/evolution-data-server-%%VERSION%%/camel/camel-file-utils.h
include/evolution-data-server-%%VERSION%%/camel/camel-filter-driver.h
include/evolution-data-server-%%VERSION%%/camel/camel-filter-search.h
@@ -26,7 +20,6 @@ include/evolution-data-server-%%VERSION%%/camel/camel-folder.h
include/evolution-data-server-%%VERSION%%/camel/camel-gpg-context.h
include/evolution-data-server-%%VERSION%%/camel/camel-html-parser.h
include/evolution-data-server-%%VERSION%%/camel/camel-http-stream.h
-include/evolution-data-server-%%VERSION%%/camel/camel-i18n.h
include/evolution-data-server-%%VERSION%%/camel/camel-iconv.h
include/evolution-data-server-%%VERSION%%/camel/camel-index.h
include/evolution-data-server-%%VERSION%%/camel/camel-internet-address.h
@@ -36,6 +29,7 @@ include/evolution-data-server-%%VERSION%%/camel/camel-lock-client.h
include/evolution-data-server-%%VERSION%%/camel/camel-lock-helper.h
include/evolution-data-server-%%VERSION%%/camel/camel-lock.h
include/evolution-data-server-%%VERSION%%/camel/camel-medium.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mempool.h
include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-basic.h
include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-bestenc.h
include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-canon.h
@@ -65,15 +59,14 @@ include/evolution-data-server-%%VERSION%%/camel/camel-multipart-encrypted.h
include/evolution-data-server-%%VERSION%%/camel/camel-multipart-signed.h
include/evolution-data-server-%%VERSION%%/camel/camel-multipart.h
include/evolution-data-server-%%VERSION%%/camel/camel-net-utils.h
-include/evolution-data-server-%%VERSION%%/camel/camel-news-address.h
include/evolution-data-server-%%VERSION%%/camel/camel-nntp-address.h
include/evolution-data-server-%%VERSION%%/camel/camel-object.h
+include/evolution-data-server-%%VERSION%%/camel/camel-object-bag.h
include/evolution-data-server-%%VERSION%%/camel/camel-offline-folder.h
include/evolution-data-server-%%VERSION%%/camel/camel-offline-journal.h
include/evolution-data-server-%%VERSION%%/camel/camel-offline-store.h
include/evolution-data-server-%%VERSION%%/camel/camel-operation.h
include/evolution-data-server-%%VERSION%%/camel/camel-partition-table.h
-include/evolution-data-server-%%VERSION%%/camel/camel-process.h
include/evolution-data-server-%%VERSION%%/camel/camel-provider.h
include/evolution-data-server-%%VERSION%%/camel/camel-sasl-anonymous.h
include/evolution-data-server-%%VERSION%%/camel/camel-sasl-cram-md5.h
@@ -109,7 +102,6 @@ include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream.h
include/evolution-data-server-%%VERSION%%/camel/camel-text-index.h
include/evolution-data-server-%%VERSION%%/camel/camel-transport.h
include/evolution-data-server-%%VERSION%%/camel/camel-trie.h
-include/evolution-data-server-%%VERSION%%/camel/camel-types.h
include/evolution-data-server-%%VERSION%%/camel/camel-uid-cache.h
include/evolution-data-server-%%VERSION%%/camel/camel-url-scanner.h
include/evolution-data-server-%%VERSION%%/camel/camel-url.h
@@ -119,10 +111,6 @@ include/evolution-data-server-%%VERSION%%/camel/camel-vee-store.h
include/evolution-data-server-%%VERSION%%/camel/camel-vee-summary.h
include/evolution-data-server-%%VERSION%%/camel/camel-vtrash-folder.h
include/evolution-data-server-%%VERSION%%/camel/camel.h
-include/evolution-data-server-%%VERSION%%/google/libgdata-google/gdata-google-service.h
-include/evolution-data-server-%%VERSION%%/google/libgdata/gdata-entry.h
-include/evolution-data-server-%%VERSION%%/google/libgdata/gdata-feed.h
-include/evolution-data-server-%%VERSION%%/google/libgdata/gdata-service-iface.h
include/evolution-data-server-%%VERSION%%/groupwise/e-gw-connection.h
include/evolution-data-server-%%VERSION%%/groupwise/e-gw-container.h
include/evolution-data-server-%%VERSION%%/groupwise/e-gw-filter.h
@@ -170,6 +158,7 @@ include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book.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-intervaltree.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
@@ -184,26 +173,23 @@ include/evolution-data-server-%%VERSION%%/libedataserver/e-account-list.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-account.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-categories.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-data-server-util.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-debug-log.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-flag.h
-include/evolution-data-server-%%VERSION%%/libedataserver/e-iconv.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-iterator.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-list-iterator.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-list.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-memory.h
-include/evolution-data-server-%%VERSION%%/libedataserver/e-msgport.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-proxy.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-sexp.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-source-group.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-source-list.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-source.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-time-utils.h
-include/evolution-data-server-%%VERSION%%/libedataserver/e-trie.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-uid.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-url.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-hash-utils.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-utils.h
include/evolution-data-server-%%VERSION%%/libedataserver/eds-version.h
-include/evolution-data-server-%%VERSION%%/libedataserver/md5-utils.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-book-auth-util.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-category-completion.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-categories-dialog.h
@@ -217,7 +203,6 @@ include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-model
include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-passwords.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-combo-box.h
-include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-option-menu.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector-dialog.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-tree-model-generator.h
@@ -284,9 +269,6 @@ lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcontacts.so
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.a
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.la
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.so
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgoogle.a
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgoogle.la
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgoogle.so
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.a
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.la
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.so
@@ -299,11 +281,11 @@ lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.so
lib/libcamel-%%EVO_VERSION%%.a
lib/libcamel-%%EVO_VERSION%%.la
lib/libcamel-%%EVO_VERSION%%.so
-lib/libcamel-%%EVO_VERSION%%.so.14
+lib/libcamel-%%EVO_VERSION%%.so.19
lib/libcamel-provider-%%EVO_VERSION%%.a
lib/libcamel-provider-%%EVO_VERSION%%.la
lib/libcamel-provider-%%EVO_VERSION%%.so
-lib/libcamel-provider-%%EVO_VERSION%%.so.14
+lib/libcamel-provider-%%EVO_VERSION%%.so.19
lib/libebackend-%%EVO_VERSION%%.a
lib/libebackend-%%EVO_VERSION%%.la
lib/libebackend-%%EVO_VERSION%%.so
@@ -311,39 +293,31 @@ lib/libebackend-%%EVO_VERSION%%.so.0
lib/libebook-%%EVO_VERSION%%.a
lib/libebook-%%EVO_VERSION%%.la
lib/libebook-%%EVO_VERSION%%.so
-lib/libebook-%%EVO_VERSION%%.so.9
+lib/libebook-%%EVO_VERSION%%.so.10
lib/libecal-%%EVO_VERSION%%.a
lib/libecal-%%EVO_VERSION%%.la
lib/libecal-%%EVO_VERSION%%.so
-lib/libecal-%%EVO_VERSION%%.so.7
+lib/libecal-%%EVO_VERSION%%.so.8
lib/libedata-book-%%EVO_VERSION%%.a
lib/libedata-book-%%EVO_VERSION%%.la
lib/libedata-book-%%EVO_VERSION%%.so
-lib/libedata-book-%%EVO_VERSION%%.so.2
+lib/libedata-book-%%EVO_VERSION%%.so.8
lib/libedata-cal-%%EVO_VERSION%%.a
lib/libedata-cal-%%EVO_VERSION%%.la
lib/libedata-cal-%%EVO_VERSION%%.so
-lib/libedata-cal-%%EVO_VERSION%%.so.7
+lib/libedata-cal-%%EVO_VERSION%%.so.10
lib/libedataserver-%%EVO_VERSION%%.a
lib/libedataserver-%%EVO_VERSION%%.la
lib/libedataserver-%%EVO_VERSION%%.so
-lib/libedataserver-%%EVO_VERSION%%.so.11
+lib/libedataserver-%%EVO_VERSION%%.so.14
lib/libedataserverui-%%EVO_VERSION%%.a
lib/libedataserverui-%%EVO_VERSION%%.la
lib/libedataserverui-%%EVO_VERSION%%.so
-lib/libedataserverui-%%EVO_VERSION%%.so.8
+lib/libedataserverui-%%EVO_VERSION%%.so.11
lib/libegroupwise-%%EVO_VERSION%%.a
lib/libegroupwise-%%EVO_VERSION%%.la
lib/libegroupwise-%%EVO_VERSION%%.so
lib/libegroupwise-%%EVO_VERSION%%.so.13
-lib/libgdata-%%EVO_VERSION%%.a
-lib/libgdata-%%EVO_VERSION%%.la
-lib/libgdata-%%EVO_VERSION%%.so
-lib/libgdata-%%EVO_VERSION%%.so.1
-lib/libgdata-google-%%EVO_VERSION%%.a
-lib/libgdata-google-%%EVO_VERSION%%.la
-lib/libgdata-google-%%EVO_VERSION%%.so
-lib/libgdata-google-%%EVO_VERSION%%.so.1
libdata/pkgconfig/camel-%%EVO_VERSION%%.pc
libdata/pkgconfig/camel-provider-%%EVO_VERSION%%.pc
libdata/pkgconfig/evolution-data-server-%%EVO_VERSION%%.pc
@@ -355,8 +329,6 @@ libdata/pkgconfig/libedata-cal-%%EVO_VERSION%%.pc
libdata/pkgconfig/libedataserver-%%EVO_VERSION%%.pc
libdata/pkgconfig/libedataserverui-%%EVO_VERSION%%.pc
libdata/pkgconfig/libegroupwise-%%EVO_VERSION%%.pc
-libdata/pkgconfig/libgdata-%%EVO_VERSION%%.pc
-libdata/pkgconfig/libgdata-google-%%EVO_VERSION%%.pc
libexec/camel-index-control-%%EVO_VERSION%%
libexec/camel-lock-helper-%%EVO_VERSION%%
libexec/e-addressbook-factory
@@ -364,6 +336,86 @@ libexec/e-calendar-factory
share/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service
share/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
share/doc/camel/Addresses.html
+share/doc/camel/CamelAddress.html
+share/doc/camel/CamelCertDB.html
+share/doc/camel/CamelCipherContext.html
+share/doc/camel/CamelDataCache.html
+share/doc/camel/CamelDataWrapper.html
+share/doc/camel/CamelDiscoDiary.html
+share/doc/camel/CamelDiscoFolder.html
+share/doc/camel/CamelDiscoStore.html
+share/doc/camel/CamelFilterDriver.html
+share/doc/camel/CamelFolder.html
+share/doc/camel/CamelFolderSearch.html
+share/doc/camel/CamelFolderSummary.html
+share/doc/camel/CamelGpgContext.html
+share/doc/camel/CamelHttpStream.html
+share/doc/camel/CamelIndex.html
+share/doc/camel/CamelInternetAddress.html
+share/doc/camel/CamelKeyFile.html
+share/doc/camel/CamelKeyTable.html
+share/doc/camel/CamelMedium.html
+share/doc/camel/CamelMimeFilter.html
+share/doc/camel/CamelMimeFilterBasic.html
+share/doc/camel/CamelMimeFilterBestenc.html
+share/doc/camel/CamelMimeFilterCRLF.html
+share/doc/camel/CamelMimeFilterCanon.html
+share/doc/camel/CamelMimeFilterCharset.html
+share/doc/camel/CamelMimeFilterEnriched.html
+share/doc/camel/CamelMimeFilterFrom.html
+share/doc/camel/CamelMimeFilterGZip.html
+share/doc/camel/CamelMimeFilterHTML.html
+share/doc/camel/CamelMimeFilterIndex.html
+share/doc/camel/CamelMimeFilterLinewrap.html
+share/doc/camel/CamelMimeFilterPgp.html
+share/doc/camel/CamelMimeFilterProgress.html
+share/doc/camel/CamelMimeFilterSave.html
+share/doc/camel/CamelMimeFilterToHTML.html
+share/doc/camel/CamelMimeFilterWindows.html
+share/doc/camel/CamelMimeFilterYenc.html
+share/doc/camel/CamelMimeMessage.html
+share/doc/camel/CamelMimeParser.html
+share/doc/camel/CamelMimePart.html
+share/doc/camel/CamelMultipart.html
+share/doc/camel/CamelMultipartEncrypted.html
+share/doc/camel/CamelMultipartSigned.html
+share/doc/camel/CamelNNTPAddress.html
+share/doc/camel/CamelObject.html
+share/doc/camel/CamelOfflineFolder.html
+share/doc/camel/CamelOfflineJournal.html
+share/doc/camel/CamelOfflineStore.html
+share/doc/camel/CamelSMIMEContext.html
+share/doc/camel/CamelSasl.html
+share/doc/camel/CamelSaslAnonymous.html
+share/doc/camel/CamelSaslCramMd5.html
+share/doc/camel/CamelSaslDigestMd5.html
+share/doc/camel/CamelSaslGssapi.html
+share/doc/camel/CamelSaslLogin.html
+share/doc/camel/CamelSaslNTLM.html
+share/doc/camel/CamelSaslPOPB4SMTP.html
+share/doc/camel/CamelSaslPlain.html
+share/doc/camel/CamelSeekableStream.html
+share/doc/camel/CamelSeekableSubstream.html
+share/doc/camel/CamelService.html
+share/doc/camel/CamelSession.html
+share/doc/camel/CamelStore.html
+share/doc/camel/CamelStoreSummary.html
+share/doc/camel/CamelStream.html
+share/doc/camel/CamelStreamBuffer.html
+share/doc/camel/CamelStreamFilter.html
+share/doc/camel/CamelStreamFs.html
+share/doc/camel/CamelStreamMem.html
+share/doc/camel/CamelStreamNull.html
+share/doc/camel/CamelStreamProcess.html
+share/doc/camel/CamelStreamVFS.html
+share/doc/camel/CamelTcpStream.html
+share/doc/camel/CamelTcpStreamRaw.html
+share/doc/camel/CamelTextIndexName.html
+share/doc/camel/CamelTransport.html
+share/doc/camel/CamelVTrashFolder.html
+share/doc/camel/CamelVeeFolder.html
+share/doc/camel/CamelVeeStore.html
+share/doc/camel/CamelVeeSummary.html
share/doc/camel/ClassTree.html
share/doc/camel/Crypto.html
share/doc/camel/Deprecated.html
@@ -382,99 +434,14 @@ share/doc/camel/api-index-2.24.html
share/doc/camel/api-index-2.26.html
share/doc/camel/api-index-2.28.html
share/doc/camel/api-index-2.30.html
+share/doc/camel/api-index-2.32.html
share/doc/camel/api-index-deprecated.html
share/doc/camel/api-index-full.html
-share/doc/camel/camel-CamelAddress.html
-share/doc/camel/camel-CamelCertDB.html
-share/doc/camel/camel-CamelCipherContext.html
share/doc/camel/camel-CamelDB.html
-share/doc/camel/camel-CamelDataCache.html
-share/doc/camel/camel-CamelDataWrapper.html
-share/doc/camel/camel-CamelDigestFolder.html
-share/doc/camel/camel-CamelDigestStore.html
-share/doc/camel/camel-CamelDigestSummary.html
-share/doc/camel/camel-CamelDiscoDiary.html
-share/doc/camel/camel-CamelDiscoFolder.html
-share/doc/camel/camel-CamelDiscoStore.html
-share/doc/camel/camel-CamelFilterDriver.html
-share/doc/camel/camel-CamelFolder.html
-share/doc/camel/camel-CamelFolderSearch.html
-share/doc/camel/camel-CamelFolderSummary.html
-share/doc/camel/camel-CamelGpgContext.html
-share/doc/camel/camel-CamelHttpStream.html
-share/doc/camel/camel-CamelIndex.html
-share/doc/camel/camel-CamelInternetAddress.html
-share/doc/camel/camel-CamelKeyFile.html
-share/doc/camel/camel-CamelKeyTable.html
-share/doc/camel/camel-CamelMedium.html
-share/doc/camel/camel-CamelMimeFilter.html
-share/doc/camel/camel-CamelMimeFilterBasic.html
-share/doc/camel/camel-CamelMimeFilterBestenc.html
-share/doc/camel/camel-CamelMimeFilterCRLF.html
-share/doc/camel/camel-CamelMimeFilterCanon.html
-share/doc/camel/camel-CamelMimeFilterCharset.html
-share/doc/camel/camel-CamelMimeFilterEnriched.html
-share/doc/camel/camel-CamelMimeFilterFrom.html
-share/doc/camel/camel-CamelMimeFilterGZip.html
-share/doc/camel/camel-CamelMimeFilterHTML.html
-share/doc/camel/camel-CamelMimeFilterIndex.html
-share/doc/camel/camel-CamelMimeFilterLinewrap.html
-share/doc/camel/camel-CamelMimeFilterPgp.html
-share/doc/camel/camel-CamelMimeFilterProgress.html
-share/doc/camel/camel-CamelMimeFilterSave.html
-share/doc/camel/camel-CamelMimeFilterToHTML.html
-share/doc/camel/camel-CamelMimeFilterWindows.html
-share/doc/camel/camel-CamelMimeFilterYenc.html
-share/doc/camel/camel-CamelMimeMessage.html
-share/doc/camel/camel-CamelMimeParser.html
-share/doc/camel/camel-CamelMimePart.html
share/doc/camel/camel-CamelMsgPort.html
-share/doc/camel/camel-CamelMultipart.html
-share/doc/camel/camel-CamelMultipartEncrypted.html
-share/doc/camel/camel-CamelMultipartSigned.html
-share/doc/camel/camel-CamelNNTPAddress.html
-share/doc/camel/camel-CamelNewsAddress.html
-share/doc/camel/camel-CamelObject.html
-share/doc/camel/camel-CamelOfflineFolder.html
-share/doc/camel/camel-CamelOfflineJournal.html
-share/doc/camel/camel-CamelOfflineStore.html
-share/doc/camel/camel-CamelSMIMEContext.html
-share/doc/camel/camel-CamelSasl.html
-share/doc/camel/camel-CamelSaslAnonymous.html
-share/doc/camel/camel-CamelSaslCramMd5.html
-share/doc/camel/camel-CamelSaslDigestMd5.html
-share/doc/camel/camel-CamelSaslGssapi.html
-share/doc/camel/camel-CamelSaslLogin.html
-share/doc/camel/camel-CamelSaslNTLM.html
-share/doc/camel/camel-CamelSaslPOPB4SMTP.html
-share/doc/camel/camel-CamelSaslPlain.html
-share/doc/camel/camel-CamelSeekableStream.html
-share/doc/camel/camel-CamelSeekableSubstream.html
-share/doc/camel/camel-CamelService.html
-share/doc/camel/camel-CamelSession.html
-share/doc/camel/camel-CamelStore.html
-share/doc/camel/camel-CamelStoreSummary.html
-share/doc/camel/camel-CamelStream.html
-share/doc/camel/camel-CamelStreamBuffer.html
-share/doc/camel/camel-CamelStreamFilter.html
-share/doc/camel/camel-CamelStreamFs.html
-share/doc/camel/camel-CamelStreamMem.html
-share/doc/camel/camel-CamelStreamNull.html
-share/doc/camel/camel-CamelStreamProcess.html
-share/doc/camel/camel-CamelStreamVFS.html
-share/doc/camel/camel-CamelTcpStream.html
-share/doc/camel/camel-CamelTcpStreamRaw.html
share/doc/camel/camel-CamelTcpStreamSSL.html
-share/doc/camel/camel-CamelTextIndexName.html
-share/doc/camel/camel-CamelTransport.html
-share/doc/camel/camel-CamelVTrashFolder.html
-share/doc/camel/camel-CamelVeeFolder.html
-share/doc/camel/camel-CamelVeeStore.html
-share/doc/camel/camel-CamelVeeSummary.html
-share/doc/camel/camel-camel-arg.html
share/doc/camel/camel-camel-charset-map.html
share/doc/camel/camel-camel-debug.html
-share/doc/camel/camel-camel-exception.html
share/doc/camel/camel-camel-file-utils.html
share/doc/camel/camel-camel-filter-search.html
share/doc/camel/camel-camel-folder-thread.html
@@ -483,14 +450,14 @@ share/doc/camel/camel-camel-junk-plugin.html
share/doc/camel/camel-camel-list-utils.html
share/doc/camel/camel-camel-lock-client.html
share/doc/camel/camel-camel-lock.html
+share/doc/camel/camel-camel-mempool.html
share/doc/camel/camel-camel-mime-utils.html
share/doc/camel/camel-camel-movemail.html
share/doc/camel/camel-camel-net-utils.html
share/doc/camel/camel-camel-operation.html
-share/doc/camel/camel-camel-process.html
share/doc/camel/camel-camel-provider.html
-share/doc/camel/camel-camel-search-sql.html
share/doc/camel/camel-camel-search-sql-sexp.html
+share/doc/camel/camel-camel-search-sql.html
share/doc/camel/camel-camel-string-utils.html
share/doc/camel/camel-camel-trie.html
share/doc/camel/camel-camel-uid-cache.html
@@ -512,6 +479,7 @@ share/doc/libebackend/api-index-2.24.html
share/doc/libebackend/api-index-2.26.html
share/doc/libebackend/api-index-2.28.html
share/doc/libebackend/api-index-2.30.html
+share/doc/libebackend/api-index-deprecated.html
share/doc/libebackend/ch01.html
share/doc/libebackend/home.png
share/doc/libebackend/index.html
@@ -539,6 +507,8 @@ share/doc/libebook/api-index-2.24.html
share/doc/libebook/api-index-2.26.html
share/doc/libebook/api-index-2.28.html
share/doc/libebook/api-index-2.30.html
+share/doc/libebook/api-index-2.32.html
+share/doc/libebook/api-index-deprecated.html
share/doc/libebook/api-index-full.html
share/doc/libebook/ch01.html
share/doc/libebook/home.png
@@ -563,6 +533,8 @@ share/doc/libecal/api-index-2.24.html
share/doc/libecal/api-index-2.26.html
share/doc/libecal/api-index-2.28.html
share/doc/libecal/api-index-2.30.html
+share/doc/libecal/api-index-2.32.html
+share/doc/libecal/api-index-deprecated.html
share/doc/libecal/api-index-full.html
share/doc/libecal/ch01.html
share/doc/libecal/home.png
@@ -594,6 +566,8 @@ share/doc/libedata-book/api-index-2.24.html
share/doc/libedata-book/api-index-2.26.html
share/doc/libedata-book/api-index-2.28.html
share/doc/libedata-book/api-index-2.30.html
+share/doc/libedata-book/api-index-2.32.html
+share/doc/libedata-book/api-index-deprecated.html
share/doc/libedata-book/api-index-full.html
share/doc/libedata-book/ch01.html
share/doc/libedata-book/home.png
@@ -620,6 +594,8 @@ share/doc/libedata-cal/api-index-2.24.html
share/doc/libedata-cal/api-index-2.26.html
share/doc/libedata-cal/api-index-2.28.html
share/doc/libedata-cal/api-index-2.30.html
+share/doc/libedata-cal/api-index-2.32.html
+share/doc/libedata-cal/api-index-deprecated.html
share/doc/libedata-cal/api-index-full.html
share/doc/libedata-cal/ch01.html
share/doc/libedata-cal/home.png
@@ -631,6 +607,7 @@ share/doc/libedata-cal/libedata-cal-ECalBackendLoaderFactory.html
share/doc/libedata-cal/libedata-cal-ECalBackendStore.html
share/doc/libedata-cal/libedata-cal-EDataCalFactory.html
share/doc/libedata-cal/libedata-cal-EDataCalView.html
+share/doc/libedata-cal/libedata-cal-EIntervalTree.html
share/doc/libedata-cal/libedata-cal-e-cal-backend-util.html
share/doc/libedata-cal/libedata-cal.devhelp
share/doc/libedata-cal/libedata-cal.devhelp2
@@ -651,6 +628,8 @@ share/doc/libedataserver/api-index-2.24.html
share/doc/libedataserver/api-index-2.26.html
share/doc/libedataserver/api-index-2.28.html
share/doc/libedataserver/api-index-2.30.html
+share/doc/libedataserver/api-index-2.32.html
+share/doc/libedataserver/api-index-deprecated.html
share/doc/libedataserver/api-index-full.html
share/doc/libedataserver/ch01.html
share/doc/libedataserver/home.png
@@ -662,16 +641,13 @@ 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-debug-log.html
share/doc/libedataserver/libedataserver-e-memory.html
-share/doc/libedataserver/libedataserver-e-msgport.html
share/doc/libedataserver/libedataserver-e-time-utils.html
-share/doc/libedataserver/libedataserver-e-trie.html
share/doc/libedataserver/libedataserver-e-uid.html
share/doc/libedataserver/libedataserver-e-url.html
share/doc/libedataserver/libedataserver-e-util.html
share/doc/libedataserver/libedataserver-e-xml-hash-utils.html
-share/doc/libedataserver/libedataserver-md5-utils.html
share/doc/libedataserver/libedataserver.devhelp
share/doc/libedataserver/libedataserver.devhelp2
share/doc/libedataserver/right.png
@@ -686,7 +662,6 @@ share/doc/libedataserverui/ENameSelectorEntry.html
share/doc/libedataserverui/ENameSelectorList.html
share/doc/libedataserverui/ENameSelectorModel.html
share/doc/libedataserverui/ESourceComboBox.html
-share/doc/libedataserverui/ESourceOptionMenu.html
share/doc/libedataserverui/ESourceSelector.html
share/doc/libedataserverui/ESourceSelectorDialog.html
share/doc/libedataserverui/ETreeModelGenerator.html
@@ -696,6 +671,8 @@ share/doc/libedataserverui/api-index-2.24.html
share/doc/libedataserverui/api-index-2.26.html
share/doc/libedataserverui/api-index-2.28.html
share/doc/libedataserverui/api-index-2.30.html
+share/doc/libedataserverui/api-index-2.32.html
+share/doc/libedataserverui/api-index-deprecated.html
share/doc/libedataserverui/api-index-full.html
share/doc/libedataserverui/ch01.html
share/doc/libedataserverui/home.png
@@ -705,7 +682,6 @@ 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
@@ -839,9 +815,6 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
@dirrm include/evolution-data-server-%%VERSION%%/libebook
@dirrm include/evolution-data-server-%%VERSION%%/libebackend
@dirrm include/evolution-data-server-%%VERSION%%/groupwise
-@dirrm include/evolution-data-server-%%VERSION%%/google/libgdata-google
-@dirrm include/evolution-data-server-%%VERSION%%/google/libgdata
-@dirrm include/evolution-data-server-%%VERSION%%/google
@dirrm include/evolution-data-server-%%VERSION%%/camel
@dirrm include/evolution-data-server-%%VERSION%%
@dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index 0947b0889842..7f451b1be98d 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -3,12 +3,12 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/glom/Makefile,v 1.28 2009/10/11 10:43:05 kwm Exp $
+# $MCom: ports/databases/glom/Makefile,v 1.30 2010/11/04 15:57:03 kwm Exp $
#
PORTNAME= glom
PORTVERSION= 1.12.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -21,7 +21,7 @@ LIB_DEPENDS= gdamm-4.0.12:${PORTSDIR}/databases/libgdamm \
gtksourceviewmm-2.0.2:${PORTSDIR}/x11-toolkits/libgtksourceviewmm \
avahi-ui.0:${PORTSDIR}/net/avahi-gtk \
epc-1.0.2:${PORTSDIR}/www/libepc \
- goocanvasmm-0.1.5:${PORTSDIR}/graphics/goocanvasmm
+ goocanvasmm-1.0.5:${PORTSDIR}/graphics/goocanvasmm
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
${LOCALBASE}/libdata/pkgconfig/libgda-postgres-4.0.pc:${PORTSDIR}/databases/libgda4-postgresql
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
diff --git a/databases/libgda4-mysql/Makefile b/databases/libgda4-mysql/Makefile
index 997331ff9b50..35bc74aea0d8 100644
--- a/databases/libgda4-mysql/Makefile
+++ b/databases/libgda4-mysql/Makefile
@@ -3,10 +3,10 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/libgda4-mysql/Makefile,v 1.1 2008/08/18 23:53:35 kwm Exp $
+# $MCom: ports/databases/libgda4-mysql/Makefile,v 1.3 2010/10/18 12:47:12 kwm Exp $
#
-PORTREVISION?= 1
+PORTREVISION?= 0
CATEGORIES= databases gnome
PKGNAMESUFFIX?= -mysql
diff --git a/databases/libgda4-mysql/pkg-plist b/databases/libgda4-mysql/pkg-plist
index 5aff78cd8a02..b5ff48b6fe37 100644
--- a/databases/libgda4-mysql/pkg-plist
+++ b/databases/libgda4-mysql/pkg-plist
@@ -3,6 +3,8 @@ lib/libgda-%%VERSION%%/providers/libgda-mysql.la
lib/libgda-%%VERSION%%/providers/libgda-mysql.so
libdata/pkgconfig/libgda-mysql-%%VERSION%%.pc
share/libgda-%%VERSION%%/mysql_specs_add_column.xml
+share/libgda-%%VERSION%%/mysql_specs_comment_table.xml
+share/libgda-%%VERSION%%/mysql_specs_comment_column.xml
share/libgda-%%VERSION%%/mysql_specs_create_db.xml
share/libgda-%%VERSION%%/mysql_specs_create_index.xml
share/libgda-%%VERSION%%/mysql_specs_create_table.xml
diff --git a/databases/libgda4-postgresql/Makefile b/databases/libgda4-postgresql/Makefile
index 553fc2fc148b..fcc137941fee 100644
--- a/databases/libgda4-postgresql/Makefile
+++ b/databases/libgda4-postgresql/Makefile
@@ -3,10 +3,10 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/libgda4-postgresql/Makefile,v 1.1 2008/08/18 23:53:36 kwm Exp $
+# $MCom: ports/databases/libgda4-postgresql/Makefile,v 1.3 2010/10/18 12:47:12 kwm Exp $
#
-PORTREVISION?= 1
+PORTREVISION?= 0
CATEGORIES= databases gnome
PKGNAMESUFFIX?= -postgresql
diff --git a/databases/libgda4-postgresql/pkg-plist b/databases/libgda4-postgresql/pkg-plist
index e2de17eb1d39..02ae080c90e0 100644
--- a/databases/libgda4-postgresql/pkg-plist
+++ b/databases/libgda4-postgresql/pkg-plist
@@ -5,12 +5,16 @@ libdata/pkgconfig/libgda-postgres-%%VERSION%%.pc
share/libgda-%%VERSION%%/postgres_specs_add_column.xml
share/libgda-%%VERSION%%/postgres_specs_create_db.xml
share/libgda-%%VERSION%%/postgres_specs_create_index.xml
+share/libgda-%%VERSION%%/postgres_specs_create_role.xml
share/libgda-%%VERSION%%/postgres_specs_create_table.xml
+share/libgda-%%VERSION%%/postgres_specs_create_user.xml
share/libgda-%%VERSION%%/postgres_specs_create_view.xml
share/libgda-%%VERSION%%/postgres_specs_drop_column.xml
share/libgda-%%VERSION%%/postgres_specs_drop_db.xml
share/libgda-%%VERSION%%/postgres_specs_drop_index.xml
+share/libgda-%%VERSION%%/postgres_specs_drop_role.xml
share/libgda-%%VERSION%%/postgres_specs_drop_table.xml
+share/libgda-%%VERSION%%/postgres_specs_drop_user.xml
share/libgda-%%VERSION%%/postgres_specs_drop_view.xml
share/libgda-%%VERSION%%/postgres_specs_dsn.xml
share/libgda-%%VERSION%%/postgres_specs_rename_table.xml
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 23a78523a2fd..30868bae3fa3 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/databases/libgda4/Makefile,v 1.4 2010/06/23 21:29:32 kwm Exp $
+# $MCom: ports/databases/libgda4/Makefile,v 1.14 2010/11/14 20:57:58 kwm Exp $
#
PORTNAME= libgda4
-PORTVERSION?= 4.0.9
+PORTVERSION?= 4.2.1
PORTREVISION?= 0
CATEGORIES= databases gnome
MASTER_SITES= GNOME
@@ -25,6 +25,7 @@ LIBGDA4_SLAVE?= no
BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
+ gcrypt.17:${PORTSDIR}/security/libgcrypt \
soup-2.4.1:${PORTSDIR}/devel/libsoup \
json-glib-1.0.0:${PORTSDIR}/devel/json-glib
RUN_DEPENDS= ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection
@@ -36,11 +37,19 @@ USE_GNOME= gnomeprefix gnomehack glib20 libxslt intlhack referencehack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE=yes
-CONFIGURE_ARGS= --without-sybase \
- --enable-introspection
+CONFIGURE_ARGS= --without-oracle \
+ --enable-introspection=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl"
+.if ${LIBGDA4_SLAVE}=="no"
+OPTIONS= UI "Build UI tools" on
+.endif
+
+.if defined(WITH_UI)
+INSTALLS_ICONS= yes
+.endif
+
.include <bsd.port.pre.mk>
#VERSION= ${PORTVERSION:R}
@@ -48,6 +57,16 @@ VERSION= 4.0
PLIST_SUB= VERSION=${VERSION}
.if ${LIBGDA4_SLAVE}=="no"
+.if defined(WITH_UI)
+CONFIGURE_ARGS+=--with-ui
+BUILD_DEPENDS+= xml2po:${PORTSDIR}/textproc/gnome-doc-utils
+USE_GNOME+= gtk20
+PLIST_SUB+= UI=""
+.else
+CONFIGURE_ARGS+=--without-ui
+PLIST_SUB+= UI="@comment "
+.endif
+
MAN1= gda-sql.1 gda-sql-4.0.1
.else
USE_GNOME+= libgda4
@@ -74,13 +93,6 @@ CONFIGURE_ARGS+= --with-postgres=${LOCALBASE}
CONFIGURE_ARGS+= --without-postgres
.endif
-.if ${LIBGDA4_SLAVE}=="ldap"
-USE_OPENLDAP= yes
-CONFIGURE_ARGS+= --with-ldap=${LOCALBASE}
-.else
-CONFIGURE_ARGS+= --without-ldap
-.endif
-
.if ${LIBGDA4_SLAVE}=="firebird"
LIB_DEPENDS+= gds.2:${PORTSDIR}/databases/firebird2-client
CONFIGURE_ARGS+= --with-firebird=${LOCALBASE}
@@ -88,13 +100,6 @@ CONFIGURE_ARGS+= --with-firebird=${LOCALBASE}
CONFIGURE_ARGS+= --without-firebird
.endif
-.if ${LIBGDA4_SLAVE}=="freetds"
-LIB_DEPENDS+= tds.5:${PORTSDIR}/databases/freetds
-CONFIGURE_ARGS+= --with-tds=${LOCALBASE}
-.else
-CONFIGURE_ARGS+= --without-tds
-.endif
-
# MDB (MS Access)
.if ${LIBGDA4_SLAVE}=="mdb"
LIB_DEPENDS+= mdbsql.0:${PORTSDIR}/databases/mdbtools
@@ -103,13 +108,6 @@ CONFIGURE_ARGS+= --with-mdb=${LOCALBASE}
CONFIGURE_ARGS+= --without-mdb
.endif
-.if ${LIBGDA4_SLAVE}=="odbc"
-LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+= --with-odbc=${LOCALBASE}
-.else
-CONFIGURE_ARGS+= --without-odbc
-.endif
-
.if ${LIBGDA4_SLAVE}=="jdbc"
USE_JAVA= yes
JAVA_VENDOR= bsdjava openjdk
@@ -135,12 +133,21 @@ post-patch:
${WRKSRC}/providers/bdb/gda-bdb-test.c
.if ${LIBGDA4_SLAVE}!="no"
#. for d in msql firebird odbc freetds mdb ldap mysql sqlite postgres
-. for d in bdb jdbc mdb mysql postgres
+. for d in bdb jdbc mdb mysql postgres reuseable/postgres reuseable/mysql
@${REINPLACE_CMD} -e 's|$$(top_builddir)/libgda/libgda-4.0.la|${LOCALBASE}/lib/libgda-4.0.la|g' \
${WRKSRC}/providers/${d}/Makefile.in
. endfor
.endif
+pre-build:
+.if ${LIBGDA4_SLAVE}=="postgresql"
+ cd ${WRKSRC}/providers/reuseable/postgres && ${GMAKE} libgda-postgres.la
+.endif
+
+.if ${LIBGDA4_SLAVE}=="mysql"
+ cd ${WRKSRC}/providers/reuseable/mysql && ${GMAKE} libgda-mysql.la
+.endif
+
.if ${LIBGDA4_SLAVE}=="no"
post-install:
${INSTALL_DATA} ${WRKSRC}/data/config \
diff --git a/databases/libgda4/distinfo b/databases/libgda4/distinfo
index 5ba3eb25adc8..faa37761636c 100644
--- a/databases/libgda4/distinfo
+++ b/databases/libgda4/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/libgda-4.0.9.tar.bz2) = de14cf681c0bcfb3a4076a3ddc1508a2
-SHA256 (gnome2/libgda-4.0.9.tar.bz2) = c3e2958cd711177ec4be0a69cd453ab728526fa38592c5539e7d89d3778e9e56
-SIZE (gnome2/libgda-4.0.9.tar.bz2) = 8227552
+SHA256 (gnome2/libgda-4.2.1.tar.bz2) = d485d24fb19bd95faad196c8ed22b2cb8f9e9275d907f880a3f8f079f6bf40f7
+SIZE (gnome2/libgda-4.2.1.tar.bz2) = 14048095
diff --git a/databases/libgda4/files/patch-configure b/databases/libgda4/files/patch-configure
index 6e42fcfab8ff..cf6a34b0c4ae 100644
--- a/databases/libgda4/files/patch-configure
+++ b/databases/libgda4/files/patch-configure
@@ -1,14 +1,48 @@
---- configure.orig 2010-06-23 23:07:54.000000000 +0200
-+++ configure 2010-06-23 23:09:57.000000000 +0200
-@@ -18629,9 +18629,9 @@
- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
-+ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\${datadir}|"`
- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
-+ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\${libdir}|"`
- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+--- configure.orig 2010-11-14 17:29:29.000000000 +0100
++++ configure 2010-11-14 17:33:39.000000000 +0100
+@@ -19487,9 +19487,9 @@
+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
++ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"`
+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
++ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"`
+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+ INTROSPECTION_MAKEFILE=$introspection_makefile
+@@ -19586,7 +19586,7 @@
+ echo "$LIBCRYPTO_PKG_ERRORS" >&5
+
+ if test "$enable_crypto" = "yes"; then
+- as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5
++# as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5
+ fi
+ have_crypto=no
+
+@@ -19594,7 +19594,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ if test "$enable_crypto" = "yes"; then
+- as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5
++# as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5
+ fi
+ have_crypto=no
+
+@@ -21772,6 +21772,15 @@
+ fi
+ CFLAGS="$save_CFLAGS"
+ fi
++ else
++ if false; then
++ MDB_TRUE=
++ MDB_FALSE='#'
++else
++ MDB_TRUE='#'
++ MDB_FALSE=
++fi
++
+ fi
+
+ if test "$mdbtools_found" = "yes"; then
diff --git a/databases/libgda4/pkg-plist b/databases/libgda4/pkg-plist
index 90fa9176857d..63dbcf3467d4 100644
--- a/databases/libgda4/pkg-plist
+++ b/databases/libgda4/pkg-plist
@@ -1,9 +1,11 @@
bin/gda-list-config-%%VERSION%%
+%%UI%%bin/gda-browser-%%VERSION%%
+%%UI%%bin/gda-control-center-%%VERSION%%
bin/gda-list-config
-bin/gda-list-server-op-%%VERSION%%
bin/gda-list-server-op
-bin/gda-sql-%%VERSION%%
+bin/gda-list-server-op-%%VERSION%%
bin/gda-sql
+bin/gda-sql-%%VERSION%%
bin/gda-test-connection-%%VERSION%%
bin/gda_trml2html/__init__.py
bin/gda_trml2html/trml2html.py
@@ -12,6 +14,7 @@ bin/gda_trml2pdf/__init__.py
bin/gda_trml2pdf/color.py
bin/gda_trml2pdf/trml2pdf.py
bin/gda_trml2pdf/utils.py
+%%UI%%bin/gdaui-demo-%%VERSION%%
@unexec if cmp -s %D/etc/libgda-%%VERSION%%/config %D/etc/libgda-%%VERSION%%/config.default; then rm -f %D/etc/libgda-%%VERSION%%/config; fi
etc/libgda-%%VERSION%%/config.default
@exec [ -f %B/config ] || cp %B/%f %B/config
@@ -21,6 +24,30 @@ include/libgda-%%VERSION%%/libgda-report/gda-report-document.h
include/libgda-%%VERSION%%/libgda-report/gda-report-engine.h
include/libgda-%%VERSION%%/libgda-report/gda-report-rml-document.h
include/libgda-%%VERSION%%/libgda-report/libgda-report.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-basic-form.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-cloud.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-combo.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-cell-renderer-util.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-entry.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-filter.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-proxy-info.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-proxy.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-selector.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-store.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-decl.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-easy.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-enum-types.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-enums.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-form.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-grid.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-login.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-plugin.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-provider-selector.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-raw-form.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-raw-grid.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-server-operation.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-tree-store.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/libgda-ui.h
include/libgda-%%VERSION%%/libgda-xslt/libgda-xslt.h
include/libgda-%%VERSION%%/libgda/gda-attributes-manager.h
include/libgda-%%VERSION%%/libgda/gda-batch.h
@@ -57,14 +84,24 @@ include/libgda-%%VERSION%%/libgda/gda-meta-store.h
include/libgda-%%VERSION%%/libgda/gda-meta-struct.h
include/libgda-%%VERSION%%/libgda/gda-mutex.h
include/libgda-%%VERSION%%/libgda/gda-quark-list.h
+include/libgda-%%VERSION%%/libgda/gda-repetitive-statement.h
include/libgda-%%VERSION%%/libgda/gda-row.h
include/libgda-%%VERSION%%/libgda/gda-server-operation.h
include/libgda-%%VERSION%%/libgda/gda-server-provider-extra.h
include/libgda-%%VERSION%%/libgda/gda-server-provider-private.h
include/libgda-%%VERSION%%/libgda/gda-server-provider.h
include/libgda-%%VERSION%%/libgda/gda-set.h
+include/libgda-%%VERSION%%/libgda/gda-sql-builder.h
include/libgda-%%VERSION%%/libgda/gda-statement-extra.h
include/libgda-%%VERSION%%/libgda/gda-statement.h
+include/libgda-%%VERSION%%/libgda/gda-tree-manager.h
+include/libgda-%%VERSION%%/libgda/gda-tree-mgr-columns.h
+include/libgda-%%VERSION%%/libgda/gda-tree-mgr-label.h
+include/libgda-%%VERSION%%/libgda/gda-tree-mgr-schemas.h
+include/libgda-%%VERSION%%/libgda/gda-tree-mgr-select.h
+include/libgda-%%VERSION%%/libgda/gda-tree-mgr-tables.h
+include/libgda-%%VERSION%%/libgda/gda-tree-node.h
+include/libgda-%%VERSION%%/libgda/gda-tree.h
include/libgda-%%VERSION%%/libgda/gda-transaction-status-private.h
include/libgda-%%VERSION%%/libgda/gda-transaction-status.h
include/libgda-%%VERSION%%/libgda/gda-util.h
@@ -96,6 +133,7 @@ include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-update.h
include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-util.h
include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct.h
include/libgda-%%VERSION%%/libgda/sqlite/gda-sqlite-provider.h
+include/libgda-%%VERSION%%/libgda/thread-wrapper/gda-thread-wrapper.h
include/libgda-%%VERSION%%/libgda/virtual/gda-vconnection-data-model.h
include/libgda-%%VERSION%%/libgda/virtual/gda-vconnection-hub.h
include/libgda-%%VERSION%%/libgda/virtual/gda-virtual-connection.h
@@ -103,31 +141,224 @@ include/libgda-%%VERSION%%/libgda/virtual/gda-virtual-provider.h
include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-data-model.h
include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-hub.h
include/libgda-%%VERSION%%/libgda/virtual/libgda-virtual.h
-lib/girepository-1.0/Gda-4.0.typelib
lib/libgda-%%VERSION%%.a
lib/libgda-%%VERSION%%.la
lib/libgda-%%VERSION%%.so
-lib/libgda-%%VERSION%%.so.4
+lib/libgda-%%VERSION%%.so.5
+%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-filesel-spec.xml
+%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-password.xml
+%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec.xml
+%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec_string.xml
+%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-text-spec.xml
+%%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.a
+%%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.la
+%%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.so
+lib/libgda-%%VERSION%%/providers/libgda-web.a
+lib/libgda-%%VERSION%%/providers/libgda-web.la
+lib/libgda-%%VERSION%%/providers/libgda-web.so
lib/libgda-%%VERSION%%/providers/libgda-sqlite.a
lib/libgda-%%VERSION%%/providers/libgda-sqlite.la
lib/libgda-%%VERSION%%/providers/libgda-sqlite.so
lib/libgda-report-%%VERSION%%.a
lib/libgda-report-%%VERSION%%.la
lib/libgda-report-%%VERSION%%.so
-lib/libgda-report-%%VERSION%%.so.4
+lib/libgda-report-%%VERSION%%.so.5
+%%UI%%lib/libgda-ui-%%VERSION%%.a
+%%UI%%lib/libgda-ui-%%VERSION%%.la
+%%UI%%lib/libgda-ui-%%VERSION%%.so
+%%UI%%lib/libgda-ui-%%VERSION%%.so.5
lib/libgda-xslt-%%VERSION%%.a
lib/libgda-xslt-%%VERSION%%.la
lib/libgda-xslt-%%VERSION%%.so
-lib/libgda-xslt-%%VERSION%%.so.4
+lib/libgda-xslt-%%VERSION%%.so.5
libdata/pkgconfig/libgda-%%VERSION%%.pc
libdata/pkgconfig/libgda-report-%%VERSION%%.pc
libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc
+%%UI%%libdata/pkgconfig/libgda-ui-%%VERSION%%.pc
+libdata/pkgconfig/libgda-web-%%VERSION%%.pc
libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
-share/gir-1.0/Gda-4.0.gir
+%%UI%%share/applications/gda-browser-%%VERSION%%.desktop
+%%UI%%share/applications/gda-control-center-%%VERSION%%.desktop
+%%UI%%share/gnome/help/gda-browser/C/data-manager-perspective.page
+%%UI%%share/gnome/help/gda-browser/C/data-manager-xml-syntax.page
+%%UI%%share/gnome/help/gda-browser/C/diagram.page
+%%UI%%share/gnome/help/gda-browser/C/features.page
+%%UI%%share/gnome/help/gda-browser/C/figures/cnc_open.png
+%%UI%%share/gnome/help/gda-browser/C/figures/data-man-mode.png
+%%UI%%share/gnome/help/gda-browser/C/figures/data-man-persp.png
+%%UI%%share/gnome/help/gda-browser/C/figures/data-man-xmlcompose.png
+%%UI%%share/gnome/help/gda-browser/C/figures/diagram.png
+%%UI%%share/gnome/help/gda-browser/C/figures/mainwin.png
+%%UI%%share/gnome/help/gda-browser/C/figures/query-exec-persp.png
+%%UI%%share/gnome/help/gda-browser/C/figures/trans-begin.png
+%%UI%%share/gnome/help/gda-browser/C/figures/trans-commit.png
+%%UI%%share/gnome/help/gda-browser/C/figures/table-insert-data.png
+%%UI%%share/gnome/help/gda-browser/C/figures/trans-rollback.png
+%%UI%%share/gnome/help/gda-browser/C/general-ui.page
+%%UI%%share/gnome/help/gda-browser/C/index.page
+%%UI%%share/gnome/help/gda-browser/C/legal.xml
+%%UI%%share/gnome/help/gda-browser/C/query-execution-perspective.page
+%%UI%%share/gnome/help/gda-browser/C/schema-browser-perspective.page
+%%UI%%share/gnome/help/gda-browser/C/table-insert-data.page
+%%UI%%share/gnome/help/gda-browser/C/transactions.page
+%%UI%%share/gnome/help/gda-browser/C/variables.page
+%%UI%%share/gnome/help/gda-browser/de/data-manager-perspective.page
+%%UI%%share/gnome/help/gda-browser/de/data-manager-xml-syntax.page
+%%UI%%share/gnome/help/gda-browser/de/diagram.page
+%%UI%%share/gnome/help/gda-browser/de/features.page
+%%UI%%share/gnome/help/gda-browser/de/figures/cnc_open.png
+%%UI%%share/gnome/help/gda-browser/de/figures/data-man-mode.png
+%%UI%%share/gnome/help/gda-browser/de/figures/data-man-persp.png
+%%UI%%share/gnome/help/gda-browser/de/figures/data-man-xmlcompose.png
+%%UI%%share/gnome/help/gda-browser/de/figures/diagram.png
+%%UI%%share/gnome/help/gda-browser/de/figures/mainwin.png
+%%UI%%share/gnome/help/gda-browser/de/figures/query-exec-persp.png
+%%UI%%share/gnome/help/gda-browser/de/figures/trans-begin.png
+%%UI%%share/gnome/help/gda-browser/de/figures/trans-commit.png
+%%UI%%share/gnome/help/gda-browser/de/figures/table-insert-data.png
+%%UI%%share/gnome/help/gda-browser/de/figures/trans-rollback.png
+%%UI%%share/gnome/help/gda-browser/de/general-ui.page
+%%UI%%share/gnome/help/gda-browser/de/index.page
+%%UI%%share/gnome/help/gda-browser/de/legal.xml
+%%UI%%share/gnome/help/gda-browser/de/query-execution-perspective.page
+%%UI%%share/gnome/help/gda-browser/de/schema-browser-perspective.page
+%%UI%%share/gnome/help/gda-browser/de/table-insert-data.page
+%%UI%%share/gnome/help/gda-browser/de/transactions.page
+%%UI%%share/gnome/help/gda-browser/de/variables.page
+%%UI%%share/gnome/help/gda-browser/es/data-manager-perspective.page
+%%UI%%share/gnome/help/gda-browser/es/data-manager-xml-syntax.page
+%%UI%%share/gnome/help/gda-browser/es/diagram.page
+%%UI%%share/gnome/help/gda-browser/es/features.page
+%%UI%%share/gnome/help/gda-browser/es/figures/cnc_open.png
+%%UI%%share/gnome/help/gda-browser/es/figures/data-man-mode.png
+%%UI%%share/gnome/help/gda-browser/es/figures/data-man-persp.png
+%%UI%%share/gnome/help/gda-browser/es/figures/data-man-xmlcompose.png
+%%UI%%share/gnome/help/gda-browser/es/figures/diagram.png
+%%UI%%share/gnome/help/gda-browser/es/figures/mainwin.png
+%%UI%%share/gnome/help/gda-browser/es/figures/query-exec-persp.png
+%%UI%%share/gnome/help/gda-browser/es/figures/table-insert-data.png
+%%UI%%share/gnome/help/gda-browser/es/figures/trans-begin.png
+%%UI%%share/gnome/help/gda-browser/es/figures/trans-commit.png
+%%UI%%share/gnome/help/gda-browser/es/figures/trans-rollback.png
+%%UI%%share/gnome/help/gda-browser/es/general-ui.page
+%%UI%%share/gnome/help/gda-browser/es/index.page
+%%UI%%share/gnome/help/gda-browser/es/legal.xml
+%%UI%%share/gnome/help/gda-browser/es/query-execution-perspective.page
+%%UI%%share/gnome/help/gda-browser/es/schema-browser-perspective.page
+%%UI%%share/gnome/help/gda-browser/es/table-insert-data.page
+%%UI%%share/gnome/help/gda-browser/es/transactions.page
+%%UI%%share/gnome/help/gda-browser/es/variables.page
+%%UI%%share/gnome/help/gda-browser/sl/data-manager-perspective.page
+%%UI%%share/gnome/help/gda-browser/sl/data-manager-xml-syntax.page
+%%UI%%share/gnome/help/gda-browser/sl/diagram.page
+%%UI%%share/gnome/help/gda-browser/sl/features.page
+%%UI%%share/gnome/help/gda-browser/sl/figures/cnc_open.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/data-man-mode.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/data-man-persp.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/data-man-xmlcompose.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/diagram.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/mainwin.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/query-exec-persp.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/table-insert-data.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/trans-begin.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/trans-commit.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/trans-rollback.png
+%%UI%%share/gnome/help/gda-browser/sl/general-ui.page
+%%UI%%share/gnome/help/gda-browser/sl/index.page
+%%UI%%share/gnome/help/gda-browser/sl/legal.xml
+%%UI%%share/gnome/help/gda-browser/sl/query-execution-perspective.page
+%%UI%%share/gnome/help/gda-browser/sl/schema-browser-perspective.page
+%%UI%%share/gnome/help/gda-browser/sl/table-insert-data.page
+%%UI%%share/gnome/help/gda-browser/sl/transactions.page
+%%UI%%share/gnome/help/gda-browser/sl/variables.page
+%%UI%%share/icons/hicolor/16x16/apps/gda-control-center.png
+%%UI%%share/icons/hicolor/22x22/apps/gda-control-center.png
+%%UI%%share/icons/hicolor/24x24/apps/gda-control-center.png
+%%UI%%share/icons/hicolor/256x256/apps/gda-control-center.png
+%%UI%%share/icons/hicolor/32x32/apps/gda-control-center.png
+%%UI%%share/icons/hicolor/48x48/apps/gda-control-center.png
+%%UI%%share/libgda-%%VERSION%%/demo/basic_form.c
+%%UI%%share/libgda-%%VERSION%%/demo/cloud.c
+%%UI%%share/libgda-%%VERSION%%/demo/combo.c
+%%UI%%share/libgda-%%VERSION%%/demo/custom_layout.xml
+%%UI%%share/libgda-%%VERSION%%/demo/data_model_dir.c
+%%UI%%share/libgda-%%VERSION%%/demo/ddl_queries.c
+%%UI%%share/libgda-%%VERSION%%/demo/demo_db.db
+%%UI%%share/libgda-%%VERSION%%/demo/form.c
+%%UI%%share/libgda-%%VERSION%%/demo/form_data_layout.c
+%%UI%%share/libgda-%%VERSION%%/demo/form_pict.c
+%%UI%%share/libgda-%%VERSION%%/demo/form_rw.c
+%%UI%%share/libgda-%%VERSION%%/demo/grid.c
+%%UI%%share/libgda-%%VERSION%%/demo/grid_data_layout.c
+%%UI%%share/libgda-%%VERSION%%/demo/grid_pict.c
+%%UI%%share/libgda-%%VERSION%%/demo/grid_rw.c
+%%UI%%share/libgda-%%VERSION%%/demo/linked_grid_form.c
+%%UI%%share/libgda-%%VERSION%%/demo/linked_model_param.c
+%%UI%%share/libgda-%%VERSION%%/demo/login.c
+%%UI%%share/libgda-%%VERSION%%/demo/provider_sel.c
+%%UI%%share/libgda-%%VERSION%%/demo/tree.c
+%%UI%%share/libgda-%%VERSION%%/dtd/gdaui-layout.dtd
share/libgda-%%VERSION%%/dtd/libgda-array.dtd
share/libgda-%%VERSION%%/dtd/libgda-paramlist.dtd
share/libgda-%%VERSION%%/dtd/libgda-server-operation.dtd
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/bookmark-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/glade.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/history-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/bookmark-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/glade.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/history-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/bookmark-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/glade.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/history-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-begin.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-commit.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-rollback.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/bookmark-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/glade.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/history-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/icon-theme.cache
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/bookmark-view.svg
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/glade.svg
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/history-view.svg
+%%UI%%share/libgda-%%VERSION%%/import_encodings.xml
share/libgda-%%VERSION%%/information_schema.xml
+%%UI%%share/libgda-%%VERSION%%/language-specs/gda-sql.lang
+share/libgda-%%VERSION%%/php/README
+share/libgda-%%VERSION%%/php/gda-clean.php
+share/libgda-%%VERSION%%/php/gda-config.php
+share/libgda-%%VERSION%%/php/gda-exception.php
+share/libgda-%%VERSION%%/php/gda-front.php
+share/libgda-%%VERSION%%/php/gda-meta.php
+share/libgda-%%VERSION%%/php/gda-setup.php
+share/libgda-%%VERSION%%/php/gda-tester.php
+share/libgda-%%VERSION%%/php/gda-utils.php
+share/libgda-%%VERSION%%/php/gda-worker.php
+%%UI%%share/libgda-%%VERSION%%/pixmaps/bin-attachment-16x16.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-auth-big.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-auth.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-bookmark.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column-fk.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column-fknn.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column-nn.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column-pk.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-connected-big.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-connected.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-diagram.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-form.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-grid.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-menu-ind.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-non-connected-big.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-non-connected.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-query.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-reference.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-schema.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-table.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-control-center-newcnc.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-control-center.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gdaui-generic.png
+%%UI%%share/libgda-%%VERSION%%/server_operation.glade
share/libgda-%%VERSION%%/sqlite_specs_add_column.xml
share/libgda-%%VERSION%%/sqlite_specs_create_db.xml
share/libgda-%%VERSION%%/sqlite_specs_create_index.xml
@@ -139,6 +370,10 @@ share/libgda-%%VERSION%%/sqlite_specs_drop_table.xml
share/libgda-%%VERSION%%/sqlite_specs_drop_view.xml
share/libgda-%%VERSION%%/sqlite_specs_dsn.xml
share/libgda-%%VERSION%%/sqlite_specs_rename_table.xml
+%%UI%%share/libgda-%%VERSION%%/ui/gdaui-entry-number.xml
+%%UI%%share/libgda-%%VERSION%%/ui/gdaui-entry-string.xml
+share/libgda-%%VERSION%%/web_specs_auth.xml
+share/libgda-%%VERSION%%/web_specs_dsn.xml
share/libgda-%%VERSION%%/web/cnc.js
share/libgda-%%VERSION%%/web/gda-print.css
share/libgda-%%VERSION%%/web/gda.css
@@ -151,6 +386,7 @@ share/libgda-%%VERSION%%/web/mouseirb_2.js
share/locale/ar/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/ca@valencia/LC_MESSAGES/libgda-4.0.mo
share/locale/cs/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/da/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/de/LC_MESSAGES/libgda-%%VERSION%%.mo
@@ -167,6 +403,7 @@ share/locale/ga/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/gl/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/hr/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/hu/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/id/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/ja/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/ko/LC_MESSAGES/libgda-%%VERSION%%.mo
@@ -196,17 +433,48 @@ share/locale/vi/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/libgda-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/libgda-%%VERSION%%.mo
+%%UI%%share/pixmaps/gda-browser-%%VERSION%%.png
@dirrm share/libgda-%%VERSION%%/web
+%%UI%%@dirrm share/libgda-%%VERSION%%/ui
+%%UI%%@dirrm share/libgda-%%VERSION%%/pixmaps
+@dirrm share/libgda-%%VERSION%%/php
+%%UI%%@dirrm share/libgda-%%VERSION%%/language-specs
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/scalable/actions
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/scalable
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/32x32/actions
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/32x32
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/24x24/actions
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/24x24
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/22x22/actions
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/22x22
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/16x16/actions
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/16x16
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons
+%%UI%%@dirrm share/gnome/help/gda-browser/sl/figures
+%%UI%%@dirrm share/gnome/help/gda-browser/sl
+%%UI%%@dirrm share/gnome/help/gda-browser/es/figures
+%%UI%%@dirrm share/gnome/help/gda-browser/es
+%%UI%%@dirrm share/gnome/help/gda-browser/de/figures
+%%UI%%@dirrm share/gnome/help/gda-browser/de
+%%UI%%@dirrm share/gnome/help/gda-browser/C/figures
+%%UI%%@dirrm share/gnome/help/gda-browser/C
+%%UI%%@dirrm share/gnome/help/gda-browser
@dirrm share/libgda-%%VERSION%%/dtd
+%%UI%%@dirrm share/libgda-%%VERSION%%/demo
@dirrm share/libgda-%%VERSION%%/
+%%UI%%@dirrmtry share/applications
@dirrm lib/libgda-%%VERSION%%/providers
+%%UI%%@dirrm lib/libgda-%%VERSION%%/plugins
@dirrm lib/libgda-%%VERSION%%
@dirrm include/libgda-%%VERSION%%/libgda/virtual
+@dirrm include/libgda-%%VERSION%%/libgda/thread-wrapper
@dirrm include/libgda-%%VERSION%%/libgda/sqlite
@dirrm include/libgda-%%VERSION%%/libgda/sql-parser
@dirrm include/libgda-%%VERSION%%/libgda/providers-support
@dirrm include/libgda-%%VERSION%%/libgda/handlers
@dirrm include/libgda-%%VERSION%%/libgda-xslt
+%%UI%%@dirrm include/libgda-%%VERSION%%/libgda-ui
@dirrm include/libgda-%%VERSION%%/libgda-report
@dirrm include/libgda-%%VERSION%%/libgda
@dirrm include/libgda-%%VERSION%%
@@ -221,3 +489,5 @@ share/locale/zh_TW/LC_MESSAGES/libgda-%%VERSION%%.mo
@dirrmtry share/locale/oc
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 90128f48fd23..4c35e462b95a 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.18 2009/11/28 05:58:58 mezz Exp $
+# $MCom: ports/databases/libgdamm/Makefile,v 1.21 2010/10/23 16:04:08 kwm Exp $
#
PORTNAME= libgdamm
-PORTVERSION= 3.99.17.1
-PORTREVISION= 2
+PORTVERSION= 3.99.21
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/databases/libgdamm/distinfo b/databases/libgdamm/distinfo
index 52ebba84dced..7af2ac99346d 100644
--- a/databases/libgdamm/distinfo
+++ b/databases/libgdamm/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/libgdamm-3.99.21.tar.bz2) = f2eb75edc7a439e7df71cb45bac9ec22
+SHA256 (gnome2/libgdamm-3.99.21.tar.bz2) = 08a17b9275104fa9da964cfff331e2118bfb57705c30271cff44cef91574ec9d
+SIZE (gnome2/libgdamm-3.99.21.tar.bz2) = 1628064
diff --git a/databases/libgdamm/pkg-plist b/databases/libgdamm/pkg-plist
index 8458fdd6eaab..e3aab9378871 100644
--- a/databases/libgdamm/pkg-plist
+++ b/databases/libgdamm/pkg-plist
@@ -55,7 +55,10 @@ include/libgdamm-4.0/libgdamm/private/row_p.h
include/libgdamm-4.0/libgdamm/private/serveroperation_p.h
include/libgdamm-4.0/libgdamm/private/serverprovider_p.h
include/libgdamm-4.0/libgdamm/private/set_p.h
+include/libgdamm-4.0/libgdamm/private/sqlbuilder_p.h
+include/libgdamm-4.0/libgdamm/private/sqlexpr_p.h
include/libgdamm-4.0/libgdamm/private/sqlparser_p.h
+include/libgdamm-4.0/libgdamm/private/sqlstatement_p.h
include/libgdamm-4.0/libgdamm/private/statement_p.h
include/libgdamm-4.0/libgdamm/private/transactionstatus_p.h
include/libgdamm-4.0/libgdamm/private/xatransaction_p.h
@@ -64,7 +67,10 @@ include/libgdamm-4.0/libgdamm/row.h
include/libgdamm-4.0/libgdamm/serveroperation.h
include/libgdamm-4.0/libgdamm/serverprovider.h
include/libgdamm-4.0/libgdamm/set.h
+include/libgdamm-4.0/libgdamm/sqlbuilder.h
+include/libgdamm-4.0/libgdamm/sqlexpr.h
include/libgdamm-4.0/libgdamm/sqlparser.h
+include/libgdamm-4.0/libgdamm/sqlstatement.h
include/libgdamm-4.0/libgdamm/statement.h
include/libgdamm-4.0/libgdamm/transactionstatus.h
include/libgdamm-4.0/libgdamm/throw_exception.h
diff --git a/deskutils/contacts/Makefile b/deskutils/contacts/Makefile
index a571e1ddb86d..eecd9d354589 100644
--- a/deskutils/contacts/Makefile
+++ b/deskutils/contacts/Makefile
@@ -7,7 +7,7 @@
PORTNAME= contacts
PORTVERSION= 0.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils gnome
MASTER_SITES= http://pimlico-project.org/sources/${PORTNAME}/
DIST_SUBDIR= gnome2
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index ee8ff2a7c4b6..6616b3eae52d 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.114 2010/05/02 11:44:22 kwm Exp $
+# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.116 2010/09/27 19:36:13 kwm Exp $
#
PORTNAME= deskbar-applet
-PORTVERSION= 2.30.1
-PORTREVISION= 1
+PORTVERSION= 2.32.0
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo
index 01879e9f78e3..dee181464cf5 100644
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/deskbar-applet-2.30.1.tar.bz2) = 80ba002fb063a9f034cc82d7099932e5
-SHA256 (gnome2/deskbar-applet-2.30.1.tar.bz2) = 0754e15db1b5295dbb7e4134bafe06ffad054cf09d8f3034b95b14a0af534a89
-SIZE (gnome2/deskbar-applet-2.30.1.tar.bz2) = 1064879
+MD5 (gnome2/deskbar-applet-2.32.0.tar.bz2) = 4985ea0786d994302057463f32cb69ce
+SHA256 (gnome2/deskbar-applet-2.32.0.tar.bz2) = 123f2231ac8449f8376030c1b25394f9bab18d5d219292afc6f27eda77d4e684
+SIZE (gnome2/deskbar-applet-2.32.0.tar.bz2) = 1068070
diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist
index e2850c7fa3d1..4364c70b5901 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -386,6 +386,7 @@ share/locale/el/LC_MESSAGES/deskbar-applet.mo
share/locale/en@shaw/LC_MESSAGES/deskbar-applet.mo
share/locale/en_CA/LC_MESSAGES/deskbar-applet.mo
share/locale/en_GB/LC_MESSAGES/deskbar-applet.mo
+share/locale/eo/LC_MESSAGES/deskbar-applet.mo
share/locale/es/LC_MESSAGES/deskbar-applet.mo
share/locale/et/LC_MESSAGES/deskbar-applet.mo
share/locale/eu/LC_MESSAGES/deskbar-applet.mo
@@ -403,6 +404,7 @@ share/locale/id/LC_MESSAGES/deskbar-applet.mo
share/locale/it/LC_MESSAGES/deskbar-applet.mo
share/locale/ja/LC_MESSAGES/deskbar-applet.mo
share/locale/ka/LC_MESSAGES/deskbar-applet.mo
+share/locale/kk/LC_MESSAGES/deskbar-applet.mo
share/locale/kn/LC_MESSAGES/deskbar-applet.mo
share/locale/ko/LC_MESSAGES/deskbar-applet.mo
share/locale/ku/LC_MESSAGES/deskbar-applet.mo
@@ -438,6 +440,7 @@ share/locale/ta/LC_MESSAGES/deskbar-applet.mo
share/locale/te/LC_MESSAGES/deskbar-applet.mo
share/locale/th/LC_MESSAGES/deskbar-applet.mo
share/locale/tr/LC_MESSAGES/deskbar-applet.mo
+share/locale/ug/LC_MESSAGES/deskbar-applet.mo
share/locale/uk/LC_MESSAGES/deskbar-applet.mo
share/locale/vi/LC_MESSAGES/deskbar-applet.mo
share/locale/zh_CN/LC_MESSAGES/deskbar-applet.mo
@@ -513,6 +516,8 @@ share/omf/deskbar/deskbar-zh_CN.omf
@dirrm libexec/deskbar-applet
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -531,6 +536,8 @@ share/omf/deskbar/deskbar-zh_CN.omf
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/deskutils/gbirthday/Makefile b/deskutils/gbirthday/Makefile
index 17773c1b1686..ff4d8d486305 100644
--- a/deskutils/gbirthday/Makefile
+++ b/deskutils/gbirthday/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gbirthday
PORTVERSION= 0.6.5
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= SF
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index c0bab2ef45ff..d1bea50507ec 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -8,7 +8,7 @@
PORTNAME= glabels
PORTVERSION= 2.2.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= GNOME
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 46375536ad6a..fbde3bf2af90 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.147 2010/04/01 13:45:39 kwm Exp $
+# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.150 2010/09/28 08:41:46 kwm Exp $
#
PORTNAME= gnome-utils
-PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTVERSION= 2.32.0
PORTEPOCH= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 712ca37a663d..176a3e947eee 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-utils-2.30.0.tar.bz2) = c6d779ddccf99cbe0667b578078dd011
-SHA256 (gnome2/gnome-utils-2.30.0.tar.bz2) = 745bb25fce536dc5337e7b5cbcbce9eee66b3cc0c500de302759b98ebcef6a8f
-SIZE (gnome2/gnome-utils-2.30.0.tar.bz2) = 7608826
+MD5 (gnome2/gnome-utils-2.32.0.tar.bz2) = e150cdb53314fe97ea80768850c2e03c
+SHA256 (gnome2/gnome-utils-2.32.0.tar.bz2) = 033a55cf442096b28ea6292043354feafe000d1e5f4ebb962a9b6d72eb9a93fa
+SIZE (gnome2/gnome-utils-2.32.0.tar.bz2) = 7705320
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 541c1ef5a1cd..44991c40d455 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -559,6 +559,7 @@ share/locale/el/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/en_CA/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/en@shaw/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/eo/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/es/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/et/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/eu/LC_MESSAGES/gnome-utils-2.0.mo
@@ -614,6 +615,7 @@ share/locale/ta/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/te/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/th/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/ug/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo
@@ -787,6 +789,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index d4f674488131..29f42943be62 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -3,12 +3,11 @@
# Whom: Mezz <mezz@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnote/Makefile,v 1.11 2010/03/14 05:52:37 marcus Exp $
+# $MCom: ports/deskutils/gnote/Makefile,v 1.14 2010/11/15 16:21:49 kwm Exp $
#
PORTNAME= gnote
-PORTVERSION= 0.7.2
-PORTREVISION= 1
+PORTVERSION= 0.7.3
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
diff --git a/deskutils/gnote/distinfo b/deskutils/gnote/distinfo
index 83b9f1491ed7..5f4eaa7782c0 100644
--- a/deskutils/gnote/distinfo
+++ b/deskutils/gnote/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnote-0.7.2.tar.bz2) = c4e1a93896cb8610d2e08c72d41f1777
-SHA256 (gnote-0.7.2.tar.bz2) = ef46a1bade7bf684615b32e5bf35c100d646456e40ac2e9cab871e6dff0d2a4c
-SIZE (gnote-0.7.2.tar.bz2) = 1364579
+SHA256 (gnote-0.7.3.tar.bz2) = 4853315711baf7647cdae4c2f7d23e22e2b13322605efe3dd98796a06f928321
+SIZE (gnote-0.7.3.tar.bz2) = 1606926
diff --git a/deskutils/gnote/files/patch-libtomboy_tomboyutil.c b/deskutils/gnote/files/patch-libtomboy_tomboyutil.c
deleted file mode 100644
index 2252cd007efa..000000000000
--- a/deskutils/gnote/files/patch-libtomboy_tomboyutil.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- libtomboy/tomboyutil.c.orig 2010-03-14 00:35:24.000000000 -0500
-+++ libtomboy/tomboyutil.c 2010-03-14 00:36:19.000000000 -0500
-@@ -153,9 +153,9 @@ tomboy_window_override_user_time (GtkWin
- void
- tomboy_window_present_hardcore (GtkWindow *window)
- {
-- if (!GTK_WIDGET_REALIZED (window))
-+ if (!gtk_widget_get_realized (window))
- gtk_widget_realize (GTK_WIDGET (window));
-- else if (GTK_WIDGET_VISIBLE (window))
-+ else if (gtk_widget_get_visible (window))
- tomboy_window_move_to_current_workspace (window);
-
- tomboy_window_override_user_time (window);
diff --git a/deskutils/gnote/pkg-plist b/deskutils/gnote/pkg-plist
index bfd5fd72bbd1..1b4c1b466321 100644
--- a/deskutils/gnote/pkg-plist
+++ b/deskutils/gnote/pkg-plist
@@ -14,9 +14,9 @@ lib/gnote/addins/%%VERSION%%/fixedwidth.so
lib/gnote/addins/%%VERSION%%/inserttimestamp.a
lib/gnote/addins/%%VERSION%%/inserttimestamp.la
lib/gnote/addins/%%VERSION%%/inserttimestamp.so
-lib/gnote/addins/%%VERSION%%/libnoteoftheday.a
-lib/gnote/addins/%%VERSION%%/libnoteoftheday.la
-lib/gnote/addins/%%VERSION%%/libnoteoftheday.so
+lib/gnote/addins/%%VERSION%%/noteoftheday.a
+lib/gnote/addins/%%VERSION%%/noteoftheday.la
+lib/gnote/addins/%%VERSION%%/noteoftheday.so
lib/gnote/addins/%%VERSION%%/printnotes.a
lib/gnote/addins/%%VERSION%%/printnotes.la
lib/gnote/addins/%%VERSION%%/printnotes.so
@@ -114,6 +114,44 @@ 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/fr/figures/add-notebook-search.png
+share/gnome/help/gnote/fr/figures/add-to-notebook.png
+share/gnome/help/gnote/fr/figures/delete-notebook.png
+share/gnome/help/gnote/fr/figures/gnote-main-menu.png
+share/gnome/help/gnote/fr/figures/gnote-new-note.png
+share/gnome/help/gnote/fr/figures/gnote-panel.png
+share/gnome/help/gnote/fr/figures/gnote-pindown.png
+share/gnome/help/gnote/fr/figures/gnote-pinup.png
+share/gnome/help/gnote/fr/figures/gnote-preferences-add-ins.png
+share/gnome/help/gnote/fr/figures/gnote-preferences-editing.png
+share/gnome/help/gnote/fr/figures/gnote-preferences-hotkeys.png
+share/gnome/help/gnote/fr/figures/gnote-preferences-synchronization.png
+share/gnome/help/gnote/fr/figures/gnote-tools.png
+share/gnome/help/gnote/fr/figures/move-notes-search.png
+share/gnome/help/gnote/fr/figures/new-notebook.png
+share/gnome/help/gnote/fr/figures/note-template.png
+share/gnome/help/gnote/fr/figures/notebook-icon.png
+share/gnome/help/gnote/fr/gnote.xml
+share/gnome/help/gnote/fr/legal.xml
+share/gnome/help/gnote/sl/figures/add-notebook-search.png
+share/gnome/help/gnote/sl/figures/add-to-notebook.png
+share/gnome/help/gnote/sl/figures/delete-notebook.png
+share/gnome/help/gnote/sl/figures/gnote-main-menu.png
+share/gnome/help/gnote/sl/figures/gnote-new-note.png
+share/gnome/help/gnote/sl/figures/gnote-panel.png
+share/gnome/help/gnote/sl/figures/gnote-pindown.png
+share/gnome/help/gnote/sl/figures/gnote-pinup.png
+share/gnome/help/gnote/sl/figures/gnote-preferences-add-ins.png
+share/gnome/help/gnote/sl/figures/gnote-preferences-editing.png
+share/gnome/help/gnote/sl/figures/gnote-preferences-hotkeys.png
+share/gnome/help/gnote/sl/figures/gnote-preferences-synchronization.png
+share/gnome/help/gnote/sl/figures/gnote-tools.png
+share/gnome/help/gnote/sl/figures/move-notes-search.png
+share/gnome/help/gnote/sl/figures/new-notebook.png
+share/gnome/help/gnote/sl/figures/note-template.png
+share/gnome/help/gnote/sl/figures/notebook-icon.png
+share/gnome/help/gnote/sl/gnote.xml
+share/gnome/help/gnote/sl/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
@@ -188,6 +226,7 @@ share/locale/as/LC_MESSAGES/gnote.mo
share/locale/bg/LC_MESSAGES/gnote.mo
share/locale/bn_IN/LC_MESSAGES/gnote.mo
share/locale/ca/LC_MESSAGES/gnote.mo
+share/locale/ca@valencia/LC_MESSAGES/gnote.mo
share/locale/cs/LC_MESSAGES/gnote.mo
share/locale/da/LC_MESSAGES/gnote.mo
share/locale/de/LC_MESSAGES/gnote.mo
@@ -208,22 +247,27 @@ share/locale/ko/LC_MESSAGES/gnote.mo
share/locale/lt/LC_MESSAGES/gnote.mo
share/locale/ml/LC_MESSAGES/gnote.mo
share/locale/mr/LC_MESSAGES/gnote.mo
+share/locale/nb/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/ro/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/uk/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-fr.omf
+share/omf/gnote/gnote-sl.omf
share/omf/gnote/gnote-sv.omf
share/omf/gnote/gnote-zh_CN.omf
@dirrm share/omf/gnote
@@ -249,6 +293,10 @@ share/omf/gnote/gnote-zh_CN.omf
@dirrm share/gnome/help/gnote/zh_CN
@dirrm share/gnome/help/gnote/sv/figures
@dirrm share/gnome/help/gnote/sv
+@dirrm share/gnome/help/gnote/sl/figures
+@dirrm share/gnome/help/gnote/sl
+@dirrm share/gnome/help/gnote/fr/figures
+@dirrm share/gnome/help/gnote/fr
@dirrm share/gnome/help/gnote/es/figures
@dirrm share/gnome/help/gnote/es
@dirrm share/gnome/help/gnote/el/figures
@@ -267,6 +315,8 @@ share/omf/gnote/gnote-zh_CN.omf
@dirrmtry share/locale/te
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@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/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index c0ad32418d61..aa134ff0e03f 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/deskutils/gucharmap/Makefile,v 1.1 2010/06/23 15:10:44 kwm Exp $
+# $MCom: ports/deskutils/gucharmap/Makefile,v 1.75 2010/11/13 13:05:08 kwm Exp $
#
PORTNAME= gucharmap
-PORTVERSION= 2.30.2
+PORTVERSION= 2.32.1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index 6cfde61c1d2d..92ddc91dda5d 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gucharmap-2.30.2.tar.bz2) = f997f6e6ba970fef7ec704da06e2de80
-SHA256 (gnome2/gucharmap-2.30.2.tar.bz2) = eab5e6e1ef244e14173a491fb2b42724d68e1aa5ca179cabd7f1b691209a7849
-SIZE (gnome2/gucharmap-2.30.2.tar.bz2) = 3102073
+SHA256 (gnome2/gucharmap-2.32.1.tar.bz2) = fdef066f35f4301bc128b91f15a30d64a2459721cb50daa53f923789df315c28
+SIZE (gnome2/gucharmap-2.32.1.tar.bz2) = 3242939
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
index d29b7f645184..4ce00b7f9c1d 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -1,18 +1,18 @@
bin/charmap
bin/gnome-character-map
bin/gucharmap
-include/gucharmap-2/gucharmap/gucharmap-block-chapters-model.h
-include/gucharmap-2/gucharmap/gucharmap-block-codepoint-list.h
-include/gucharmap-2/gucharmap/gucharmap-chapters-model.h
-include/gucharmap-2/gucharmap/gucharmap-chapters-view.h
-include/gucharmap-2/gucharmap/gucharmap-charmap.h
-include/gucharmap-2/gucharmap/gucharmap-chartable.h
-include/gucharmap-2/gucharmap/gucharmap-codepoint-list.h
-include/gucharmap-2/gucharmap/gucharmap-script-chapters-model.h
-include/gucharmap-2/gucharmap/gucharmap-script-codepoint-list.h
-include/gucharmap-2/gucharmap/gucharmap-type-builtins.h
-include/gucharmap-2/gucharmap/gucharmap-unicode-info.h
-include/gucharmap-2/gucharmap/gucharmap.h
+include/gucharmap-2.0/gucharmap/gucharmap-block-chapters-model.h
+include/gucharmap-2.0/gucharmap/gucharmap-block-codepoint-list.h
+include/gucharmap-2.0/gucharmap/gucharmap-chapters-model.h
+include/gucharmap-2.0/gucharmap/gucharmap-chapters-view.h
+include/gucharmap-2.0/gucharmap/gucharmap-charmap.h
+include/gucharmap-2.0/gucharmap/gucharmap-chartable.h
+include/gucharmap-2.0/gucharmap/gucharmap-codepoint-list.h
+include/gucharmap-2.0/gucharmap/gucharmap-script-chapters-model.h
+include/gucharmap-2.0/gucharmap/gucharmap-script-codepoint-list.h
+include/gucharmap-2.0/gucharmap/gucharmap-type-builtins.h
+include/gucharmap-2.0/gucharmap/gucharmap-unicode-info.h
+include/gucharmap-2.0/gucharmap/gucharmap.h
lib/libgucharmap.la
lib/libgucharmap.so
lib/libgucharmap.so.7
@@ -73,9 +73,12 @@ share/gnome/help/gucharmap/sv/gucharmap.xml
share/gnome/help/gucharmap/vi/figures/gucharmap_start_window.png
share/gnome/help/gucharmap/vi/figures/gucharmap_window.png
share/gnome/help/gucharmap/vi/gucharmap.xml
+share/gnome/help/gucharmap/zh_CN/figures/gucharmap_start_window.png
share/gnome/help/gucharmap/zh_CN/figures/gucharmap_window.png
share/gnome/help/gucharmap/zh_CN/gucharmap.xml
-share/gnome/help/gucharmap/zh_CN/legal.xml
+share/gnome/help/gucharmap/zh_HK/figures/gucharmap_window.png
+share/gnome/help/gucharmap/zh_HK/gucharmap.xml
+share/gnome/help/gucharmap/zh_HK/legal.xml
share/gnome/help/gucharmap/zh_TW/figures/gucharmap_window.png
share/gnome/help/gucharmap/zh_TW/gucharmap.xml
share/gnome/help/gucharmap/zh_TW/legal.xml
@@ -183,10 +186,13 @@ share/omf/gucharmap/gucharmap-ru.omf
share/omf/gucharmap/gucharmap-sv.omf
share/omf/gucharmap/gucharmap-vi.omf
share/omf/gucharmap/gucharmap-zh_CN.omf
+share/omf/gucharmap/gucharmap-zh_HK.omf
share/omf/gucharmap/gucharmap-zh_TW.omf
@dirrm share/omf/gucharmap
@dirrm share/gnome/help/gucharmap/zh_TW/figures
@dirrm share/gnome/help/gucharmap/zh_TW
+@dirrm share/gnome/help/gucharmap/zh_HK/figures
+@dirrm share/gnome/help/gucharmap/zh_HK
@dirrm share/gnome/help/gucharmap/zh_CN/figures
@dirrm share/gnome/help/gucharmap/zh_CN
@dirrm share/gnome/help/gucharmap/vi/figures
@@ -227,8 +233,8 @@ share/omf/gucharmap/gucharmap-zh_TW.omf
@dirrm share/gnome/help/gucharmap/C
@dirrm share/gnome/help/gucharmap
@dirrmtry share/applications
-@dirrm include/gucharmap-2/gucharmap
-@dirrm include/gucharmap-2
+@dirrm include/gucharmap-2.0/gucharmap
+@dirrm include/gucharmap-2.0
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
diff --git a/deskutils/libopensync-plugin-evolution2-devel/Makefile b/deskutils/libopensync-plugin-evolution2-devel/Makefile
index 67891552b154..f9a08efb9871 100644
--- a/deskutils/libopensync-plugin-evolution2-devel/Makefile
+++ b/deskutils/libopensync-plugin-evolution2-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libopensync-plugin-evolution2
PORTVERSION= 0.36
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils
MASTER_SITES= http://www.opensync.org/download/releases/${PORTVERSION}/
PKGNAMESUFFIX= -devel
diff --git a/deskutils/libopensync-plugin-evolution2/Makefile b/deskutils/libopensync-plugin-evolution2/Makefile
index 91003c8aef7e..fc9655447163 100644
--- a/deskutils/libopensync-plugin-evolution2/Makefile
+++ b/deskutils/libopensync-plugin-evolution2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libopensync-plugin-evolution2
PORTVERSION= 0.22
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils
MASTER_SITES= http://www.opensync.org/download/releases/${PORTVERSION}/
diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index 00cb7eb98dc5..08a6d2682223 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -3,11 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.25 2010/04/10 23:24:02 kwm Exp $
+# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.30 2010/09/30 06:21:18 kwm Exp $
PORTNAME= nautilus-sendto
-PORTVERSION= 2.28.4
-PORTREVISION= 2
+PORTVERSION= 2.32.0
CATEGORIES= deskutils
MASTER_SITES= GNOME
@@ -15,24 +14,23 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Integration between nautilus, evolution, and pidgin
MAN1= nautilus-sendto.1
-GCONF_SCHEMAS= nst.schemas
+GLIB_SCHEMAS= org.gnome.Nautilus.Sendto.gschema.xml
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= intlhack gnomeprefix gnometarget nautilus2 gnomehack \
evolutiondataserver
+GNOME_DESKTOP_VERSION=2
USE_GETTEXT= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-plugins="${SENDTO_PLUGINS}"
-OPTIONS= PIDGIN "Build pidgin sendto plugin" off
+OPTIONS= PIDGIN "Build pidgin sendto plugin" off \
+ UPNP "Build upnp sendto plugin" off
# check configure script for allowed_plugins="..." for new plugins
-SENDTO_PLUGINS= bluetooth evolution gajim nautilus-burn removable-devices
-
-# Not these plugins:
-# empathy (moved to empathy port) upnp
+SENDTO_PLUGINS= evolution gajim nautilus-burn removable-devices
.include <bsd.port.pre.mk>
@@ -45,4 +43,12 @@ PLIST_SUB+= PIDGIN=""
PLIST_SUB+= PIDGIN="@comment "
.endif
+.if defined(WITH_UPNP)
+SENDTO_PLUGINS:=${SENDTO_PLUGINS} upnp
+LIB_DEPENDS+= gupnp-1.0:${PORTSDIR}/net/gupnp
+PLIST_SUB+= UPNP=""
+.else
+PLIST_SUB+= UPNP="@comment "
+.endif
+
.include <bsd.port.post.mk>
diff --git a/deskutils/nautilus-sendto/distinfo b/deskutils/nautilus-sendto/distinfo
index 6361c56f4b45..cb9e982cddba 100644
--- a/deskutils/nautilus-sendto/distinfo
+++ b/deskutils/nautilus-sendto/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-sendto-2.28.4.tar.bz2) = e68236367190d01a31d11fb746822bed
-SHA256 (nautilus-sendto-2.28.4.tar.bz2) = ff6b1a73f7e662fb49c3a1aee59a5c17fc96c23fcf63c3b10b6142eaef344f06
-SIZE (nautilus-sendto-2.28.4.tar.bz2) = 436967
+MD5 (nautilus-sendto-2.32.0.tar.bz2) = e4f44084976ac4c6602a02ee3700e6f5
+SHA256 (nautilus-sendto-2.32.0.tar.bz2) = 890090b24381d91f079610d5454cb786a3ecefc91fa06649b2222be9bb02269a
+SIZE (nautilus-sendto-2.32.0.tar.bz2) = 446731
diff --git a/deskutils/nautilus-sendto/files/patch-configure b/deskutils/nautilus-sendto/files/patch-configure
new file mode 100644
index 000000000000..8cfe52049763
--- /dev/null
+++ b/deskutils/nautilus-sendto/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig 2010-08-18 11:22:51.000000000 +0200
++++ configure 2010-08-18 11:26:00.000000000 +0200
+@@ -11030,8 +11030,8 @@
+ .SECONDARY: $(gsettings_SCHEMAS)
+
+ gsettings__base_list = \
+- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
++ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
+
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ @$(NORMAL_INSTALL)
diff --git a/deskutils/nautilus-sendto/pkg-plist b/deskutils/nautilus-sendto/pkg-plist
index 816f0b08933f..e47d7d08d9bd 100644
--- a/deskutils/nautilus-sendto/pkg-plist
+++ b/deskutils/nautilus-sendto/pkg-plist
@@ -1,7 +1,5 @@
bin/nautilus-sendto
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
lib/nautilus-sendto/plugins/libnstburn.so
lib/nautilus-sendto/plugins/libnstevolution.la
@@ -12,9 +10,13 @@ lib/nautilus-sendto/plugins/libnstgajim.so
%%PIDGIN%%lib/nautilus-sendto/plugins/libnstpidgin.so
lib/nautilus-sendto/plugins/libnstremovable_devices.la
lib/nautilus-sendto/plugins/libnstremovable_devices.so
+%%UPNP%%lib/nautilus-sendto/plugins/libnstupnp.la
+%%UPNP%%lib/nautilus-sendto/plugins/libnstupnp.so
lib/nautilus/extensions-2.0/libnautilus-sendto.la
lib/nautilus/extensions-2.0/libnautilus-sendto.so
libdata/pkgconfig/nautilus-sendto.pc
+share/GConf/gsettings/nautilus-sendto-convert
+%%DOCSDIR%%/annotation-glossary.html
%%DOCSDIR%%/api-index-full.html
%%DOCSDIR%%/ch01.html
%%DOCSDIR%%/home.png
@@ -38,6 +40,7 @@ share/locale/bn/LC_MESSAGES/nautilus-sendto.mo
share/locale/bn_IN/LC_MESSAGES/nautilus-sendto.mo
share/locale/br/LC_MESSAGES/nautilus-sendto.mo
share/locale/ca/LC_MESSAGES/nautilus-sendto.mo
+share/locale/ca@valencia/LC_MESSAGES/nautilus-sendto.mo
share/locale/cs/LC_MESSAGES/nautilus-sendto.mo
share/locale/da/LC_MESSAGES/nautilus-sendto.mo
share/locale/de/LC_MESSAGES/nautilus-sendto.mo
@@ -56,6 +59,7 @@ 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/id/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
@@ -66,10 +70,12 @@ share/locale/lv/LC_MESSAGES/nautilus-sendto.mo
share/locale/mk/LC_MESSAGES/nautilus-sendto.mo
share/locale/ml/LC_MESSAGES/nautilus-sendto.mo
share/locale/mr/LC_MESSAGES/nautilus-sendto.mo
+share/locale/ms/LC_MESSAGES/nautilus-sendto.mo
share/locale/nb/LC_MESSAGES/nautilus-sendto.mo
share/locale/nds/LC_MESSAGES/nautilus-sendto.mo
share/locale/ne/LC_MESSAGES/nautilus-sendto.mo
share/locale/nl/LC_MESSAGES/nautilus-sendto.mo
+share/locale/nn/LC_MESSAGES/nautilus-sendto.mo
share/locale/oc/LC_MESSAGES/nautilus-sendto.mo
share/locale/or/LC_MESSAGES/nautilus-sendto.mo
share/locale/pa/LC_MESSAGES/nautilus-sendto.mo
@@ -88,6 +94,7 @@ 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/ug/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
@@ -102,6 +109,8 @@ share/nautilus-sendto/ui/nautilus-sendto.ui
@dirrm include/nautilus-sendto
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -118,6 +127,8 @@ share/nautilus-sendto/ui/nautilus-sendto.ui
@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
@@ -126,3 +137,5 @@ share/nautilus-sendto/ui/nautilus-sendto.ui
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+@dirrmtry share/GConf/gsettings
+@dirrmtry share/GConf
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index af67682ea70b..c29dd0c6d4a1 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -3,24 +3,25 @@
# Whom: Andreas Kohn <andreas@syndrom23.de>
#
# $FreeBSD$
-# $MCom: ports/deskutils/notification-daemon/Makefile,v 1.4 2008/11/30 19:43:36 marcus Exp $
+# $MCom: ports/deskutils/notification-daemon/Makefile,v 1.6 2010/06/28 22:16:41 kwm Exp $
#
PORTNAME= notification-daemon
-PORTVERSION= 0.4.0
-PORTREVISION= 6
+PORTVERSION= 0.5.0
CATEGORIES= deskutils gnome
-MASTER_SITES= http://www.galago-project.org/files/releases/source/notification-daemon/
+MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Send small notifications to your desktop
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
- sexy:${PORTSDIR}/x11-toolkits/libsexy \
+ canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
notify.1:${PORTSDIR}/devel/libnotify
-USE_GNOME= gnomehack gnomeprefix gnometarget intlhack gconf2 libwnck \
- libglade2
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+USE_BZIP2= yes
+USE_GNOME= gnomehack gnomeprefix gnometarget intlhack gconf2 libwnck
USE_GMAKE= yes
USE_GETTEXT= yes
USE_XORG= x11 xt sm ice xext
diff --git a/deskutils/notification-daemon/distinfo b/deskutils/notification-daemon/distinfo
index f0f4ede63712..9f154af53742 100644
--- a/deskutils/notification-daemon/distinfo
+++ b/deskutils/notification-daemon/distinfo
@@ -1,3 +1,3 @@
-MD5 (notification-daemon-0.4.0.tar.gz) = 281624263e3fc82c888dd7433a37194b
-SHA256 (notification-daemon-0.4.0.tar.gz) = 0c0c90ec7f2fc7fc5cbefba2e04df6ae311abc7ace23dd34f21dc063e119d808
-SIZE (notification-daemon-0.4.0.tar.gz) = 404178
+MD5 (notification-daemon-0.5.0.tar.bz2) = 18919b2aa2a88b71a40f59393edf70d0
+SHA256 (notification-daemon-0.5.0.tar.bz2) = aa1d3546fd1d5c51087317f4921c419927b644c12c39b557c959c9b45deb1475
+SIZE (notification-daemon-0.5.0.tar.bz2) = 330034
diff --git a/deskutils/notification-daemon/pkg-plist b/deskutils/notification-daemon/pkg-plist
index b4160c5ec039..b94b0ae5f86e 100644
--- a/deskutils/notification-daemon/pkg-plist
+++ b/deskutils/notification-daemon/pkg-plist
@@ -1,4 +1,7 @@
bin/notification-properties
+lib/notification-daemon-1.0/engines/libslider.a
+lib/notification-daemon-1.0/engines/libslider.la
+lib/notification-daemon-1.0/engines/libslider.so
lib/notification-daemon-1.0/engines/libstandard.a
lib/notification-daemon-1.0/engines/libstandard.la
lib/notification-daemon-1.0/engines/libstandard.so
@@ -12,12 +15,28 @@ share/icons/hicolor/32x32/apps/notification-properties.png
share/icons/hicolor/48x48/apps/notification-properties.png
share/icons/hicolor/scalable/apps/notification-properties.svg
share/locale/ar/LC_MESSAGES/notification-daemon.mo
+share/locale/cs/LC_MESSAGES/notification-daemon.mo
+share/locale/da/LC_MESSAGES/notification-daemon.mo
share/locale/de/LC_MESSAGES/notification-daemon.mo
+share/locale/el/LC_MESSAGES/notification-daemon.mo
+share/locale/es/LC_MESSAGES/notification-daemon.mo
+share/locale/et/LC_MESSAGES/notification-daemon.mo
+share/locale/fr/LC_MESSAGES/notification-daemon.mo
+share/locale/gl/LC_MESSAGES/notification-daemon.mo
+share/locale/hu/LC_MESSAGES/notification-daemon.mo
share/locale/it/LC_MESSAGES/notification-daemon.mo
+share/locale/ja/LC_MESSAGES/notification-daemon.mo
+share/locale/lt/LC_MESSAGES/notification-daemon.mo
+share/locale/nb/LC_MESSAGES/notification-daemon.mo
share/locale/nl/LC_MESSAGES/notification-daemon.mo
+share/locale/pa/LC_MESSAGES/notification-daemon.mo
share/locale/pl/LC_MESSAGES/notification-daemon.mo
+share/locale/pt_BR/LC_MESSAGES/notification-daemon.mo
+share/locale/ru/LC_MESSAGES/notification-daemon.mo
+share/locale/sl/LC_MESSAGES/notification-daemon.mo
share/locale/sv/LC_MESSAGES/notification-daemon.mo
-share/notification-daemon/notification-properties.glade
+share/locale/zh_CN/LC_MESSAGES/notification-daemon.mo
+share/notification-daemon/notification-properties.ui
@dirrm share/notification-daemon
@dirrm lib/notification-daemon-1.0/engines
@dirrm lib/notification-daemon-1.0
diff --git a/devel/Makefile b/devel/Makefile
index f6f9eb75f3fe..0d8a9c492ab5 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -479,7 +479,6 @@
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
@@ -876,6 +875,7 @@
SUBDIR += libsigsegv
SUBDIR += libslang2
SUBDIR += libsoup
+ SUBDIR += libsoup-gnome
SUBDIR += libsoup-reference
SUBDIR += libsoup22
SUBDIR += libstatgrab
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index b2e074b2ef44..2fa796ead901 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -3,12 +3,12 @@
# Whom: Chia-liang Kao <clkao@CirX.ORG>
#
# $FreeBSD$
-# $MCom: ports/devel/ORBit2/Makefile,v 1.55 2010/04/02 17:37:25 kwm Exp $
+# $MCom: ports/devel/ORBit2/Makefile,v 1.57 2010/09/29 14:08:02 kwm Exp $
#
PORTNAME= ORBit2
-PORTVERSION= 2.14.18
-PORTREVISION?= 1
+PORTVERSION= 2.14.19
+PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index b4e655b065bb..5d8828ecc1da 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/ORBit2-2.14.18.tar.bz2) = 3e80596171b1ea652707219c7144ff53
-SHA256 (gnome2/ORBit2-2.14.18.tar.bz2) = c6148edd8044255aeed9ab1d1eeb3c39edd0aa1ace5d33cf6831b80d11f1ab7c
-SIZE (gnome2/ORBit2-2.14.18.tar.bz2) = 747701
+MD5 (gnome2/ORBit2-2.14.19.tar.bz2) = 7082d317a9573ab338302243082d10d1
+SHA256 (gnome2/ORBit2-2.14.19.tar.bz2) = 55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550
+SIZE (gnome2/ORBit2-2.14.19.tar.bz2) = 764820
diff --git a/devel/anjuta-extras/Makefile b/devel/anjuta-extras/Makefile
index 2223a250c84e..61dee88db025 100644
--- a/devel/anjuta-extras/Makefile
+++ b/devel/anjuta-extras/Makefile
@@ -3,20 +3,18 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/anjuta-extras/Makefile,v 1.7 2010/04/29 15:08:31 kwm Exp $
+# $MCom: ports/devel/anjuta-extras/Makefile,v 1.11 2010/09/29 12:14:23 kwm Exp $
#
PORTNAME= anjuta-extras
-PORTVERSION= 2.30.1.0
+PORTVERSION= 2.32.0.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
diff --git a/devel/anjuta-extras/distinfo b/devel/anjuta-extras/distinfo
index 70c891199e11..312e793d72b1 100644
--- a/devel/anjuta-extras/distinfo
+++ b/devel/anjuta-extras/distinfo
@@ -1,3 +1,3 @@
-MD5 (anjuta-extras-2.30.1.0.tar.bz2) = c76a0843896890e054b063551fa431eb
-SHA256 (anjuta-extras-2.30.1.0.tar.bz2) = 6a8f37de883d05596d7b416a10d49d737c735a7dd0767ce4b804480255cfe808
-SIZE (anjuta-extras-2.30.1.0.tar.bz2) = 2873072
+MD5 (anjuta-extras-2.32.0.0.tar.bz2) = 44e79fb026524897d123bcde5e7861f9
+SHA256 (anjuta-extras-2.32.0.0.tar.bz2) = 220fd7cf87de2f8e3de2fcbc01373e25f66b428cf5b2c8a25aa9b4b3527ad620
+SIZE (anjuta-extras-2.32.0.0.tar.bz2) = 2701220
diff --git a/devel/anjuta-extras/pkg-plist b/devel/anjuta-extras/pkg-plist
index d274e65150ba..35e342347f93 100644
--- a/devel/anjuta-extras/pkg-plist
+++ b/devel/anjuta-extras/pkg-plist
@@ -1,10 +1,6 @@
-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-editor.a
lib/anjuta/libanjuta-editor.la
lib/anjuta/libanjuta-editor.so
@@ -91,8 +87,6 @@ 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
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 24164518b05a..0729aa3c5dfd 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.8 2010/06/23 19:53:50 kwm Exp $
+# $MCom: ports/devel/anjuta/Makefile,v 1.67 2010/11/13 08:07:29 kwm Exp $
#
PORTNAME= anjuta
-PORTVERSION= 2.30.2.1
-PORTREVISION= 1
+PORTVERSION= 2.32.1.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,7 +19,8 @@ BUILD_DEPENDS= autogen:${PORTSDIR}/devel/autogen \
bash:${PORTSDIR}/shells/bash \
p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
- gladeui-1.9:${PORTSDIR}/devel/glade3 \
+ gladeui-1.10:${PORTSDIR}/devel/glade3 \
+ vala-0.10.0:${PORTSDIR}/lang/vala \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
gdl-1.3:${PORTSDIR}/x11-toolkits/gdl
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
@@ -39,11 +39,13 @@ USE_GETTEXT= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_PERL5= yes
+USE_PYTHON= yes
USE_GNOME= gnomeprefix gnomehack vte gtksourceview2 libgda4
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-symbol-db-shm=/tmp
+CONFIGURE_ARGS= --with-symbol-db-shm=/tmp \
+ --enable-introspection=no
USE_LDCONFIG= yes
GCONF_SCHEMAS= anjuta-build-basic-autotools-plugin.schemas \
anjuta-cvs-plugin.schemas \
@@ -55,19 +57,21 @@ GCONF_SCHEMAS= anjuta-build-basic-autotools-plugin.schemas \
anjuta-symbol-db.schemas \
anjuta-terminal-plugin.schemas \
file-manager.schemas \
- preferences.schemas
+ preferences.schemas \
+ python-plugin-properties.schemas
MAN1= anjuta.1 anjuta-launcher.1
OPTIONS= SVN "Build subversion plugin" off \
- DEVHELP "Build devhelp plugin" on
+ DEVHELP "Build devhelp plugin" on \
+ GRAPHVIZ "Build inheritance plugin" on
.include <bsd.port.pre.mk>
.if defined(WITH_SVN)
BUILD_DEPENDS+= svn:${PORTSDIR}/devel/subversion
-LIB_DEPENDS+= apr-1.4:${PORTSDIR}/devel/apr1 \
- neon.27:${PORTSDIR}/www/neon29
+LIB_DEPENDS+= apr-1.4:${PORTSDIR}/devel/apr1
+LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29
RUN_DEPENDS+= svn:${PORTSDIR}/devel/subversion
PLIST_SUB+= SVN=""
.else
@@ -76,7 +80,7 @@ PLIST_SUB+= SVN="@comment "
.endif
.if defined(WITH_DEVHELP)
-LIB_DEPENDS+= devhelp-1.1:${PORTSDIR}/devel/devhelp
+LIB_DEPENDS+= devhelp-2.1:${PORTSDIR}/devel/devhelp
PLIST_SUB+= DEVHELP=""
.else
CONFIGURE_ARGS+=--disable-plugin-devhelp
@@ -86,6 +90,16 @@ CONFIGURE_ARGS+=--disable-plugin-devhelp
PLIST_SUB+= DEVHELP=""
.endif
+.if defined(WITH_GRAPHVIZ)
+CONFIGURE_ARGS+=--enable-graphviz
+BUILD_DEPENDS+= neato:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS+= neato:${PORTSDIR}/graphics/graphviz
+PLIST_SUB+= GRAPHVIZ=""
+.else
+CONFIGURE_ARGS+=--disable-graphviz
+PLIST_SUB+= GRAPHVIZ="@comment "
+.endif
+
post-patch:
@${RM} ${WRKSRC}/plugins/debug-manager/anjuta-debug-manager.schemas
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index 895950f1e557..0f448eb053c0 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/anjuta-2.30.2.1.tar.bz2) = 9b511224d97500ac9b318588fbb441ab
-SHA256 (gnome2/anjuta-2.30.2.1.tar.bz2) = ea32910ed047300934b6fe27a363b3dd57047222f8b664ff6dcb767a2fcd2726
-SIZE (gnome2/anjuta-2.30.2.1.tar.bz2) = 9405637
+SHA256 (gnome2/anjuta-2.32.1.0.tar.bz2) = e69c22e38623ff2a828c4214f6486169d1a42e5b4b221f26c581094bc059d638
+SIZE (gnome2/anjuta-2.32.1.0.tar.bz2) = 10197971
diff --git a/devel/anjuta/files/patch-plugins_gdb_debugger.c b/devel/anjuta/files/patch-plugins_gdb_debugger.c
index 3667278cc5c4..b8895a4a1fd0 100644
--- a/devel/anjuta/files/patch-plugins_gdb_debugger.c
+++ b/devel/anjuta/files/patch-plugins_gdb_debugger.c
@@ -1,11 +1,11 @@
---- plugins/gdb/debugger.c.orig 2009-12-19 15:21:02.000000000 -0500
-+++ plugins/gdb/debugger.c 2009-12-19 15:21:13.000000000 -0500
-@@ -54,7 +54,7 @@
+--- plugins/gdb/debugger.c.orig 2010-07-25 22:27:28.000000000 +0200
++++ plugins/gdb/debugger.c 2010-09-01 12:00:35.000000000 +0200
+@@ -56,7 +56,7 @@
#define GDB_PROMPT "(gdb)"
#define FILE_BUFFER_SIZE 1024
-#define GDB_PATH "gdb"
+#define GDB_PATH "gdb66"
+ #define MAX_CHILDREN 25 /* Limit the number of variable children
+ * returned by debugger */
#define SUMMARY_MAX_LENGTH 90 /* Should be smaller than 4K to be displayed
- * in GtkCellRendererCell */
-
diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist
index 59e4922c6548..534e4ca10c7a 100644
--- a/devel/anjuta/pkg-plist
+++ b/devel/anjuta/pkg-plist
@@ -11,9 +11,9 @@ include/libanjuta-1.0/libanjuta/anjuta-convert.h
include/libanjuta-1.0/libanjuta/anjuta-debug.h
include/libanjuta-1.0/libanjuta/anjuta-encodings.h
include/libanjuta-1.0/libanjuta/anjuta-enum-types.h
-include/libanjuta-1.0/libanjuta/anjuta-error.h
include/libanjuta-1.0/libanjuta/anjuta-launcher.h
include/libanjuta-1.0/libanjuta/anjuta-marshal.h
+include/libanjuta-1.0/libanjuta/anjuta-pkg-config-chooser.h
include/libanjuta-1.0/libanjuta/anjuta-plugin-description.h
include/libanjuta-1.0/libanjuta/anjuta-plugin-handle.h
include/libanjuta-1.0/libanjuta/anjuta-plugin-manager.h
@@ -73,10 +73,8 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-help.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-indicable.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-iterable-tree.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-iterable.h
-include/libanjuta-1.0/libanjuta/interfaces/ianjuta-language-support.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-language.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-loader.h
-include/libanjuta-1.0/libanjuta/interfaces/ianjuta-macro.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-markable.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-message-manager.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-message-view.h
@@ -87,10 +85,12 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project-backend.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project-manager.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-provider.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-snippets-manager.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream-loader.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream-savable.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-symbol-manager.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-symbol-query.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-symbol.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-terminal.h
include/libanjuta-1.0/libanjuta/interfaces/ianjuta-todo.h
@@ -103,6 +103,7 @@ 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
+%%GRAPHVIZ%%lib/anjuta/anjuta-class-inheritance.plugin
lib/anjuta/anjuta-cvs.plugin
lib/anjuta/anjuta-debug-manager.plugin
%%DEVHELP%%lib/anjuta/anjuta-devhelp.plugin
@@ -114,18 +115,21 @@ lib/anjuta/anjuta-glade.plugin
lib/anjuta/anjuta-gtodo.plugin
lib/anjuta/anjuta-language-cpp-java.plugin
lib/anjuta/anjuta-loader.plugin
-lib/anjuta/anjuta-macro.plugin
lib/anjuta/anjuta-message-manager.plugin
lib/anjuta/anjuta-patch.plugin
lib/anjuta/anjuta-project-import.plugin
lib/anjuta/anjuta-project-manager.plugin
lib/anjuta/anjuta-project-wizard.plugin
+lib/anjuta/anjuta-python-autocomplete.py
+lib/anjuta/anjuta-python-loader.plugin
lib/anjuta/anjuta-run-program.plugin
lib/anjuta/anjuta-search.plugin
+lib/anjuta/anjuta-snippets-manager.plugin
lib/anjuta/anjuta-starter.plugin
%%SVN%%lib/anjuta/anjuta-subversion.plugin
lib/anjuta/anjuta-terminal.plugin
lib/anjuta/anjuta-tools.plugin
+lib/anjuta/anjuta-vala.plugin
lib/anjuta/file-manager.plugin
lib/anjuta/gbf-am.plugin
lib/anjuta/gbf-mkfile.plugin
@@ -137,6 +141,8 @@ 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
+%%GRAPHVIZ%%lib/anjuta/libanjuta-class-inheritance.la
+%%GRAPHVIZ%%lib/anjuta/libanjuta-class-inheritance.so
lib/anjuta/libanjuta-cvs-plugin.la
lib/anjuta/libanjuta-cvs-plugin.so
lib/anjuta/libanjuta-debug-manager.la
@@ -157,10 +163,10 @@ lib/anjuta/libanjuta-gtodo.la
lib/anjuta/libanjuta-gtodo.so
lib/anjuta/libanjuta-language-cpp-java.la
lib/anjuta/libanjuta-language-cpp-java.so
+lib/anjuta/libanjuta-language-vala.la
+lib/anjuta/libanjuta-language-vala.so
lib/anjuta/libanjuta-loader.la
lib/anjuta/libanjuta-loader.so
-lib/anjuta/libanjuta-macro.la
-lib/anjuta/libanjuta-macro.so
lib/anjuta/libanjuta-message-view.la
lib/anjuta/libanjuta-message-view.so
lib/anjuta/libanjuta-patch.la
@@ -171,10 +177,14 @@ lib/anjuta/libanjuta-project-manager.la
lib/anjuta/libanjuta-project-manager.so
lib/anjuta/libanjuta-project-wizard.la
lib/anjuta/libanjuta-project-wizard.so
+lib/anjuta/libanjuta-python-loader.la
+lib/anjuta/libanjuta-python-loader.so
lib/anjuta/libanjuta-run-program.la
lib/anjuta/libanjuta-run-program.so
lib/anjuta/libanjuta-search.la
lib/anjuta/libanjuta-search.so
+lib/anjuta/libanjuta-snippets-manager.la
+lib/anjuta/libanjuta-snippets-manager.so
lib/anjuta/libanjuta-sourceview.la
lib/anjuta/libanjuta-sourceview.so
lib/anjuta/libanjuta-starter.la
@@ -201,6 +211,10 @@ lib/anjuta/libjs-support-plugin.la
lib/anjuta/libjs-support-plugin.so
lib/anjuta/liblanguage-manager.la
lib/anjuta/liblanguage-manager.so
+lib/anjuta/libpython_plugin.la
+lib/anjuta/libpython_plugin.so
+lib/anjuta/libpython_plugin.so.0
+lib/anjuta/python-plugin.plugin
lib/anjuta/sourceview.plugin
lib/anjuta/symbol-db.plugin
lib/glade3/modules/libgladeanjuta.la
@@ -208,6 +222,9 @@ lib/glade3/modules/libgladeanjuta.so
lib/libanjuta.la
lib/libanjuta.so
lib/libanjuta.so.0
+lib/libanjuta-foocanvas.la
+lib/libanjuta-foocanvas.so
+lib/libanjuta-foocanvas.so.0
libdata/pkgconfig/libanjuta-1.0.pc
share/anjuta/AUTHORS
share/anjuta/GBF/AmFiles.pm
@@ -227,11 +244,10 @@ 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-gdb.ui
share/anjuta/glade/anjuta-git.ui
-share/anjuta/glade/anjuta-glade.glade
share/anjuta/glade/anjuta-language-cpp-java.ui
share/anjuta/glade/anjuta-language-javascript.ui
-share/anjuta/glade/anjuta-macro.ui
share/anjuta/glade/anjuta-message-manager-plugin.ui
share/anjuta/glade/anjuta-project-wizard.ui
share/anjuta/glade/anjuta-run-program.ui
@@ -248,6 +264,10 @@ 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/python-plugin-properties.ui
+share/anjuta/glade/snippets-browser.ui
+share/anjuta/glade/snippets-editor.ui
+share/anjuta/glade/snippets-manager-preferences.ui
share/anjuta/glade/start-with-import.png
share/anjuta/glade/start-with-open.png
share/anjuta/glade/start-with-wizard.png
@@ -256,7 +276,6 @@ share/anjuta/gtodo/gtodo.xsl
share/anjuta/gtodo/gtodo-plain.xsl
share/anjuta/languages.xml
share/anjuta/layout.xml
-share/anjuta/macros.xml
share/anjuta/profiles/default.profile
share/anjuta/project/anjuta-plugin-logo.png
share/anjuta/project/anjuta-plugin.wiz
@@ -274,7 +293,6 @@ share/anjuta/project/cpp.wiz
share/anjuta/project/cpp/configure.ac.tpl
share/anjuta/project/cpp/po/POTFILES.in
share/anjuta/project/cpp/src/Makefile.am.tpl
-share/anjuta/project/cpp/src/cvsignore
share/anjuta/project/cpp/src/main.cc
share/anjuta/project/directory/project.anjuta
share/anjuta/project/django-logo.png
@@ -283,16 +301,7 @@ share/anjuta/project/gcj-logo.png
share/anjuta/project/gcj.wiz
share/anjuta/project/gcj/configure.ac.tpl
share/anjuta/project/gcj/src/Makefile.am.tpl
-share/anjuta/project/gnome-applet.wiz
-share/anjuta/project/gnome-applet/HACKING
-share/anjuta/project/gnome-applet/Makefile.am.tpl
-share/anjuta/project/gnome-applet/autogen.sh
-share/anjuta/project/gnome-applet/configure.ac.tpl
-share/anjuta/project/gnome-applet/src/GNOME_Applet.server.in.in
-share/anjuta/project/gnome-applet/src/Makefile.am.tpl
-share/anjuta/project/gnome-applet/src/main.c
share/anjuta/project/gnome-logo.png
-share/anjuta/project/gnome/po/POTFILES.in
share/anjuta/project/gtk-logo.png
share/anjuta/project/gtk.wiz
share/anjuta/project/gtk/po/POTFILES.in
@@ -350,6 +359,13 @@ share/anjuta/project/mkfile/po/POTFILES.in
share/anjuta/project/mkfile/project.anjuta
share/anjuta/project/mkfile/src/Makefile.tpl
share/anjuta/project/mkfile/src/main.c
+share/anjuta/project/pygtk-logo.png
+share/anjuta/project/pygtk.wiz
+share/anjuta/project/pygtk/configure.ac.tpl
+share/anjuta/project/pygtk/data/project.ui
+share/anjuta/project/pygtk/project.anjuta
+share/anjuta/project/pygtk/src/Makefile.am.tpl
+share/anjuta/project/pygtk/src/main.py
share/anjuta/project/python-logo.png
share/anjuta/project/python.wiz
share/anjuta/project/python/configure.ac.tpl
@@ -372,14 +388,11 @@ share/anjuta/project/terminal/NEWS
share/anjuta/project/terminal/README
share/anjuta/project/terminal/autogen.sh
share/anjuta/project/terminal/configure.ac.tpl
-share/anjuta/project/terminal/cvsignore
share/anjuta/project/terminal/po/ChangeLog
share/anjuta/project/terminal/po/LINGUAS
share/anjuta/project/terminal/po/POTFILES.in
-share/anjuta/project/terminal/po/cvsignore
share/anjuta/project/terminal/project.anjuta
share/anjuta/project/terminal/src/Makefile.am.tpl
-share/anjuta/project/terminal/src/cvsignore
share/anjuta/project/terminal/src/main.c
share/anjuta/project/wxwin-logo.png
share/anjuta/project/wxwin.wiz
@@ -401,6 +414,8 @@ share/anjuta/project/xlib/po/POTFILES.in
share/anjuta/project/xlib/src/Makefile.am.tpl
share/anjuta/project/xlib/src/main.c
share/anjuta/sources.list
+share/anjuta/snippets-global-variables.xml
+share/anjuta/snippets.anjuta-snippets
share/anjuta/tables.sql
share/anjuta/tools/find-fixmes.pl
share/anjuta/tools/prepare-changelog.pl
@@ -413,12 +428,11 @@ 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-glade.xml
share/anjuta/ui/anjuta-gtodo.ui
share/anjuta/ui/anjuta-language-support-cpp-java.xml
share/anjuta/ui/anjuta-language-javascript.xml
share/anjuta/ui/anjuta-loader-plugin.ui
-share/anjuta/ui/anjuta-macro.xml
share/anjuta/ui/anjuta-message-manager.xml
share/anjuta/ui/anjuta-patch.xml
share/anjuta/ui/anjuta-project-manager.xml
@@ -430,6 +444,8 @@ share/anjuta/ui/anjuta-terminal-plugin.xml
share/anjuta/ui/anjuta-tools.xml
share/anjuta/ui/anjuta.xml
share/anjuta/ui/file-manager.xml
+share/anjuta/ui/python-plugin.xml
+share/anjuta/ui/snippets-manager-ui.xml
share/anjuta/welcome.txt
share/applications/anjuta.desktop
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
@@ -500,9 +516,7 @@ share/doc/libanjuta/IAnjutaIndicable.html
share/doc/libanjuta/IAnjutaIterable.html
share/doc/libanjuta/IAnjutaIterableTree.html
share/doc/libanjuta/IAnjutaLanguage.html
-share/doc/libanjuta/IAnjutaLanguageSupport.html
share/doc/libanjuta/IAnjutaLoader.html
-share/doc/libanjuta/IAnjutaMacro.html
share/doc/libanjuta/IAnjutaMarkable.html
share/doc/libanjuta/IAnjutaMessageManager.html
share/doc/libanjuta/IAnjutaMessageView.html
@@ -515,6 +529,7 @@ share/doc/libanjuta/IAnjutaStreamLoader.html
share/doc/libanjuta/IAnjutaStreamSavable.html
share/doc/libanjuta/IAnjutaSymbol.html
share/doc/libanjuta/IAnjutaSymbolManager.html
+share/doc/libanjuta/IAnjutaSymbolQuery.html
share/doc/libanjuta/IAnjutaTerminal.html
share/doc/libanjuta/IAnjutaTodo.html
share/doc/libanjuta/IAnjutaVcs.html
@@ -524,10 +539,12 @@ share/doc/libanjuta/anjuta-architecture.html
share/doc/libanjuta/anjuta-architecture.png
share/doc/libanjuta/content-block.html
share/doc/libanjuta/debugger-states.png
+share/doc/libanjuta/distribution.html
share/doc/libanjuta/header-block.html
share/doc/libanjuta/home.png
share/doc/libanjuta/index.html
share/doc/libanjuta/index.sgml
+share/doc/libanjuta/internationalization.html
share/doc/libanjuta/left.png
share/doc/libanjuta/libanjuta-AnjutaPluginDescription.html
share/doc/libanjuta/libanjuta-Debugging.html
@@ -535,9 +552,6 @@ share/doc/libanjuta/libanjuta-Program-resources.html
share/doc/libanjuta/libanjuta-Utilities.html
share/doc/libanjuta/libanjuta-anjuta-convert.html
share/doc/libanjuta/libanjuta-anjuta-encodings.html
-share/doc/libanjuta/libanjuta-anjuta-enum-types.html
-share/doc/libanjuta/libanjuta-anjuta-error.html
-share/doc/libanjuta/libanjuta-anjuta-marshal.html
share/doc/libanjuta/libanjuta-anjuta-utils-priv.html
share/doc/libanjuta/libanjuta-anjuta-version.html
share/doc/libanjuta/libanjuta-api.html
@@ -844,6 +858,49 @@ share/gnome/help/anjuta-manual/fr/figures/signals.png
share/gnome/help/anjuta-manual/fr/figures/stack.png
share/gnome/help/anjuta-manual/fr/figures/symbol_browser.png
share/gnome/help/anjuta-manual/fr/figures/tool-editor.png
+share/gnome/help/anjuta-manual/ja/anjuta-manual.xml
+share/gnome/help/anjuta-manual/ja/figures/add_edit_macro.png
+share/gnome/help/anjuta-manual/ja/figures/anjuta-in-action.png
+share/gnome/help/anjuta-manual/ja/figures/attach.png
+share/gnome/help/anjuta-manual/ja/figures/brk_add.png
+share/gnome/help/anjuta-manual/ja/figures/brk_dlg.png
+share/gnome/help/anjuta-manual/ja/figures/configure_dlg.png
+share/gnome/help/anjuta-manual/ja/figures/display_macro.png
+share/gnome/help/anjuta-manual/ja/figures/editor_guides.png
+share/gnome/help/anjuta-manual/ja/figures/editor_margins.png
+share/gnome/help/anjuta-manual/ja/figures/editor_markers.png
+share/gnome/help/anjuta-manual/ja/figures/file_menu.png
+share/gnome/help/anjuta-manual/ja/figures/insert_text.png
+share/gnome/help/anjuta-manual/ja/figures/keyword_macro.png
+share/gnome/help/anjuta-manual/ja/figures/local_variables.png
+share/gnome/help/anjuta-manual/ja/figures/menubar.png
+share/gnome/help/anjuta-manual/ja/figures/message_win.png
+share/gnome/help/anjuta-manual/ja/figures/new_file_wizard.png
+share/gnome/help/anjuta-manual/ja/figures/open_file.png
+share/gnome/help/anjuta-manual/ja/figures/open_file_multiple.png
+share/gnome/help/anjuta-manual/ja/figures/prefs_print.png
+share/gnome/help/anjuta-manual/ja/figures/print_dlg.png
+share/gnome/help/anjuta-manual/ja/figures/print_preview.png
+share/gnome/help/anjuta-manual/ja/figures/project-window.png
+share/gnome/help/anjuta-manual/ja/figures/project_group.png
+share/gnome/help/anjuta-manual/ja/figures/project_info.png
+share/gnome/help/anjuta-manual/ja/figures/project_target.png
+share/gnome/help/anjuta-manual/ja/figures/project_target_details.png
+share/gnome/help/anjuta-manual/ja/figures/registers.png
+share/gnome/help/anjuta-manual/ja/figures/save_as_file.png
+share/gnome/help/anjuta-manual/ja/figures/search_expr.png
+share/gnome/help/anjuta-manual/ja/figures/search_expr_basic.png
+share/gnome/help/anjuta-manual/ja/figures/search_file_pattern.png
+share/gnome/help/anjuta-manual/ja/figures/search_replace.png
+share/gnome/help/anjuta-manual/ja/figures/search_setting.png
+share/gnome/help/anjuta-manual/ja/figures/search_target.png
+share/gnome/help/anjuta-manual/ja/figures/search_target_action.png
+share/gnome/help/anjuta-manual/ja/figures/search_target_in.png
+share/gnome/help/anjuta-manual/ja/figures/sharedlibs.png
+share/gnome/help/anjuta-manual/ja/figures/signals.png
+share/gnome/help/anjuta-manual/ja/figures/stack.png
+share/gnome/help/anjuta-manual/ja/figures/symbol_browser.png
+share/gnome/help/anjuta-manual/ja/figures/tool-editor.png
share/gnome/help/anjuta-manual/oc/anjuta-manual.xml
share/gnome/help/anjuta-manual/oc/figures/add_edit_macro.png
share/gnome/help/anjuta-manual/oc/figures/anjuta-in-action.png
@@ -1059,8 +1116,16 @@ 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/16x16/mimetypes/gnome-mime-application-x-anjuta.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-anjuta.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-anjuta.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-anjuta.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/16x16/apps/anjuta.png
+share/icons/hicolor/22x22/apps/anjuta.png
+share/icons/hicolor/24x24/apps/anjuta.png
+share/icons/hicolor/32x32/apps/anjuta.png
share/icons/hicolor/48x48/apps/anjuta.png
share/icons/hicolor/scalable/apps/anjuta.svg
share/locale/ar/LC_MESSAGES/anjuta.mo
@@ -1089,6 +1154,7 @@ share/locale/he/LC_MESSAGES/anjuta.mo
share/locale/hi/LC_MESSAGES/anjuta.mo
share/locale/hr/LC_MESSAGES/anjuta.mo
share/locale/hu/LC_MESSAGES/anjuta.mo
+share/locale/hy/LC_MESSAGES/anjuta.mo
share/locale/id/LC_MESSAGES/anjuta.mo
share/locale/it/LC_MESSAGES/anjuta.mo
share/locale/ja/LC_MESSAGES/anjuta.mo
@@ -1136,6 +1202,7 @@ share/omf/anjuta-manual/anjuta-manual-el.omf
share/omf/anjuta-manual/anjuta-manual-es.omf
share/omf/anjuta-manual/anjuta-manual-eu.omf
share/omf/anjuta-manual/anjuta-manual-fr.omf
+share/omf/anjuta-manual/anjuta-manual-ja.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
@@ -1172,6 +1239,10 @@ 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-gen-plugin-48.png
+share/pixmaps/anjuta/anjuta-class-gen-plugin.svg
+%%GRAPHVIZ%%share/pixmaps/anjuta/anjuta-class-inheritance-plugin-48.png
+%%GRAPHVIZ%%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
@@ -1184,32 +1255,17 @@ 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/element-class-16.png
-share/pixmaps/anjuta/element-delegate-16.png
-share/pixmaps/anjuta/element-enumeration-16.png
-share/pixmaps/anjuta/element-event-16.png
-share/pixmaps/anjuta/element-field-16.png
-share/pixmaps/anjuta/element-interface-16.png
-share/pixmaps/anjuta/element-interface-24.png
-share/pixmaps/anjuta/element-interface-private-16.png
-share/pixmaps/anjuta/element-interface-protected-16.png
-share/pixmaps/anjuta/element-interface-public-16.png
-share/pixmaps/anjuta/element-literal-16.png
-share/pixmaps/anjuta/element-method-16.png
-share/pixmaps/anjuta/element-method-24.png
-share/pixmaps/anjuta/element-method-private-16.png
-share/pixmaps/anjuta/element-method-protected-16.png
-share/pixmaps/anjuta/element-method-public-16.png
-share/pixmaps/anjuta/element-namespace-16.png
-share/pixmaps/anjuta/element-property-16.png
-share/pixmaps/anjuta/element-property-private-16.png
-share/pixmaps/anjuta/element-property-protected-16.png
-share/pixmaps/anjuta/element-property-public-16.png
-share/pixmaps/anjuta/element-structure-16.png
+share/pixmaps/anjuta/anjuta-file-manager-plugin-16.png
+share/pixmaps/anjuta/anjuta-file-wizard-plugin-48.png
+share/pixmaps/anjuta/anjuta-file-wizard-plugin.svg
+share/pixmaps/anjuta/anjuta-gtodo-plugin-16.png
+share/pixmaps/anjuta/anjuta-project-manager-plugin-16.png
+share/pixmaps/anjuta/anjuta-snippets-manager.png
+share/pixmaps/anjuta/anjuta-symbol-db-plugin-16.png
+share/pixmaps/anjuta/anjuta-symbol-db-plugin.svg
share/pixmaps/anjuta/anjuta-editor-sourceview-plugin-48.png
share/pixmaps/anjuta/anjuta-file-manager-plugin-48.png
share/pixmaps/anjuta/anjuta-file-manager-plugin.svg
-share/pixmaps/anjuta/anjuta-file-wizard-plugin.png
share/pixmaps/anjuta/anjuta-fold-close-16.png
share/pixmaps/anjuta/anjuta-fold-close-24.png
share/pixmaps/anjuta/anjuta-fold-open-16.png
@@ -1244,7 +1300,6 @@ share/pixmaps/anjuta/anjuta-language-manager-plugin.svg
share/pixmaps/anjuta/anjuta-linemark-16.png
share/pixmaps/anjuta/anjuta-loader-plugin-48.png
share/pixmaps/anjuta/anjuta-loader-plugin.svg
-share/pixmaps/anjuta/anjuta-macro.png
share/pixmaps/anjuta/anjuta-messages-plugin-48.png
share/pixmaps/anjuta/anjuta-messages-plugin.svg
share/pixmaps/anjuta/anjuta-patch-plugin-48.png
@@ -1281,15 +1336,34 @@ share/pixmaps/anjuta/anjuta-tools-plugin.svg
share/pixmaps/anjuta/anjuta-watch-16.png
share/pixmaps/anjuta/anjuta-watch-24.png
share/pixmaps/anjuta/anjuta-watch.svg
-share/pixmaps/anjuta/anjuta.png
-share/pixmaps/anjuta/anjuta.svg
share/pixmaps/anjuta/anjuta_logo.png
share/pixmaps/anjuta/anjuta_splash.png
share/pixmaps/anjuta/breakpoint.png
-share/pixmaps/anjuta/class_logo.xpm
share/pixmaps/anjuta/dir-project-plugin-48.png
share/pixmaps/anjuta/directory-accept.png
share/pixmaps/anjuta/directory.png
+share/pixmaps/anjuta/element-class-16.png
+share/pixmaps/anjuta/element-delegate-16.png
+share/pixmaps/anjuta/element-enumeration-16.png
+share/pixmaps/anjuta/element-event-16.png
+share/pixmaps/anjuta/element-field-16.png
+share/pixmaps/anjuta/element-interface-16.png
+share/pixmaps/anjuta/element-interface-24.png
+share/pixmaps/anjuta/element-interface-private-16.png
+share/pixmaps/anjuta/element-interface-protected-16.png
+share/pixmaps/anjuta/element-interface-public-16.png
+share/pixmaps/anjuta/element-literal-16.png
+share/pixmaps/anjuta/element-method-16.png
+share/pixmaps/anjuta/element-method-24.png
+share/pixmaps/anjuta/element-method-private-16.png
+share/pixmaps/anjuta/element-method-protected-16.png
+share/pixmaps/anjuta/element-method-public-16.png
+share/pixmaps/anjuta/element-namespace-16.png
+share/pixmaps/anjuta/element-property-16.png
+share/pixmaps/anjuta/element-property-private-16.png
+share/pixmaps/anjuta/element-property-protected-16.png
+share/pixmaps/anjuta/element-property-public-16.png
+share/pixmaps/anjuta/element-structure-16.png
share/pixmaps/anjuta/gbf-am-plugin-48.png
share/pixmaps/anjuta/gbf-build.png
share/pixmaps/anjuta/gbf-install.png
@@ -1303,6 +1377,7 @@ share/pixmaps/anjuta/madeinanjuta.xcf
share/pixmaps/anjuta/password.png
share/pixmaps/anjuta/pointer.png
share/pixmaps/anjuta/preferences-editor.png
+share/pixmaps/anjuta/python_plugin.png
share/pixmaps/anjuta/stack.png
share/pixmaps/anjuta/start-with-import.png
share/pixmaps/anjuta/starter_logo.png
@@ -1325,6 +1400,8 @@ share/pixmaps/anjuta/vcs-updated.png
@dirrm share/gnome/help/anjuta-manual/sv
@dirrm share/gnome/help/anjuta-manual/oc/figures
@dirrm share/gnome/help/anjuta-manual/oc
+@dirrm share/gnome/help/anjuta-manual/ja/figures
+@dirrm share/gnome/help/anjuta-manual/ja
@dirrm share/gnome/help/anjuta-manual/fr/figures
@dirrm share/gnome/help/anjuta-manual/fr
@dirrm share/gnome/help/anjuta-manual/eu/figures
@@ -1364,6 +1441,9 @@ share/pixmaps/anjuta/vcs-updated.png
@dirrm share/anjuta/project/python/src
@dirrm share/anjuta/project/python/po
@dirrm share/anjuta/project/python
+@dirrm share/anjuta/project/pygtk/src
+@dirrm share/anjuta/project/pygtk/data
+@dirrm share/anjuta/project/pygtk
@dirrm share/anjuta/project/mkfile/src
@dirrm share/anjuta/project/mkfile/po
@dirrm share/anjuta/project/mkfile
@@ -1384,10 +1464,6 @@ share/pixmaps/anjuta/vcs-updated.png
@dirrm share/anjuta/project/gtk/src
@dirrm share/anjuta/project/gtk/po
@dirrm share/anjuta/project/gtk
-@dirrm share/anjuta/project/gnome-applet/src
-@dirrm share/anjuta/project/gnome-applet
-@dirrm share/anjuta/project/gnome/po
-@dirrm share/anjuta/project/gnome
@dirrm share/anjuta/project/gcj/src
@dirrm share/anjuta/project/gcj
@dirrm share/anjuta/project/directory
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 888c32e7fcf6..025744a6e06d 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/bug-buddy/Makefile,v 1.81 2010/03/30 07:21:31 avl Exp $
+# $MCom: ports/devel/bug-buddy/Makefile,v 1.86 2010/11/16 18:17:55 kwm Exp $
#
PORTNAME= bug-buddy
-PORTVERSION= 2.30.0
-PORTREVISION= 2
+PORTVERSION= 2.32.0
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -41,4 +41,8 @@ post-patch:
s|gelf.h||g' \
${WRKSRC}/configure
+post-install:
+ @${LN} -fs ${PREFIX}/lib/gtk-2.0/modules/libgnomesegvhandler.so \
+ ${PREFIX}/lib/gtk-2.0/modules/libgnomebreakpad.so
+
.include <bsd.port.mk>
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index 9f4e9f0e4a4b..84c72dfa0e7a 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/bug-buddy-2.30.0.tar.bz2) = da34ace8a806cd1c901ae960184e2997
-SHA256 (gnome2/bug-buddy-2.30.0.tar.bz2) = 6e81a55bd252f552aa4aea180b8dbceb0898d2bf173e330c5c09f8fbdba66b05
-SIZE (gnome2/bug-buddy-2.30.0.tar.bz2) = 1192441
+MD5 (gnome2/bug-buddy-2.32.0.tar.bz2) = 86a84389c206396eba680e93288d04c8
+SHA256 (gnome2/bug-buddy-2.32.0.tar.bz2) = ffdc70fe4a59c0aef42b5b0b72b08f17db2b1d9f49ba2b68722334ddbee5e3ca
+SIZE (gnome2/bug-buddy-2.32.0.tar.bz2) = 701052
diff --git a/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc b/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc
deleted file mode 100644
index 7007a9101cb3..000000000000
--- a/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc
+++ /dev/null
@@ -1,55 +0,0 @@
---- gnome-breakpad/gnome-breakpad.cc.orig 2009-02-16 15:24:48.000000000 +0100
-+++ gnome-breakpad/gnome-breakpad.cc 2009-02-22 16:25:50.000000000 +0100
-@@ -25,8 +25,14 @@
- #include <cassert>
- #include <cstring>
-
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#endif
-+
-+#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
- #include <libelf.h>
- #include <gelf.h>
-+#endif
-
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -264,6 +270,7 @@ find_in_debug_path (const char *filename
- }
-
-
-+#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
- static gboolean
- elf_has_debug_symbols (const char *filename)
- {
-@@ -316,7 +323,7 @@ elf_has_debug_symbols (const char *filen
- elf_end (elf);
- return false;
- }
--
-+#endif
-
-
-
-@@ -429,11 +436,18 @@ check_if_gdb ()
- _exit (1);
- _exit(0);
- }
--
-+
-+#if !defined(__FreeBSD__)
- mypath = g_file_read_link ("/proc/self/exe", NULL);
-+#else
-+ mypath = g_file_read_link ("/proc/curproc/file", NULL);
-+#endif
- if (mypath)
-+#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
- has_debug_symbols = elf_has_debug_symbols (mypath);
--
-+#else
-+ has_debug_symbols = TRUE;
-+#endif
- g_free (mypath);
-
- if (bugbuddy && gdb && has_debug_symbols) {
diff --git a/devel/bug-buddy/files/patch-src_bug-buddy.c b/devel/bug-buddy/files/patch-src_bug-buddy.c
new file mode 100644
index 000000000000..25c5a0a3f425
--- /dev/null
+++ b/devel/bug-buddy/files/patch-src_bug-buddy.c
@@ -0,0 +1,26 @@
+--- src/bug-buddy.c.orig 2010-09-27 16:25:15.000000000 +0200
++++ src/bug-buddy.c 2010-11-16 19:16:24.000000000 +0100
+@@ -56,6 +56,10 @@
+
+ #include <libsoup/soup.h>
+
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#endif
++
+ #define USE_PROXY_KEY "/system/http_proxy/use_http_proxy"
+ #define PROXY_HOST_KEY "/system/http_proxy/host"
+ #define PROXY_PORT_KEY "/system/http_proxy/port"
+@@ -1955,10 +1959,12 @@
+ _exit(0);
+ }
+
++#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
+ if (!elf_has_debug_symbols (gopt_data.pid)) {
+ /* FIXME: Request PackageKit to install debug symbols packages */
+ _exit(0);
+ }
++#endif
+
+ }
+
diff --git a/devel/bug-buddy/files/patch-src_elf.c b/devel/bug-buddy/files/patch-src_elf.c
new file mode 100644
index 000000000000..659058fe963c
--- /dev/null
+++ b/devel/bug-buddy/files/patch-src_elf.c
@@ -0,0 +1,42 @@
+--- src/elf.c.orig 2010-11-16 18:43:40.000000000 +0100
++++ src/elf.c 2010-11-16 18:59:11.000000000 +0100
+@@ -16,8 +16,15 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ */
+
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#endif
++
++#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
+ #include <libelf.h>
+ #include <gelf.h>
++#endif
++
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <string.h>
+@@ -61,7 +68,9 @@
+ gboolean
+ elf_has_debug_symbols (gint pid)
+ {
++#if !defined(__FreeBSD__)
+ gchar *proc_path;
++#endif
+ gchar *filename;
+ int fd;
+ Elf *elf;
+@@ -76,9 +85,13 @@
+ return FALSE;
+ }
+
++#if defined(__FreeBSD__)
++ filename = g_file_read_link ("/proc/curproc/file", NULL);
++#else
+ proc_path = g_strdup_printf ("/proc/%d/exe", pid);
+ filename = g_file_read_link (proc_path, NULL);
+ g_free (proc_path);
++#endif
+ if (!filename)
+ return FALSE;
+
diff --git a/devel/bug-buddy/files/patch-src_gdb-buddy.c b/devel/bug-buddy/files/patch-src_gdb-buddy.c
new file mode 100644
index 000000000000..a15e1a2a0ddb
--- /dev/null
+++ b/devel/bug-buddy/files/patch-src_gdb-buddy.c
@@ -0,0 +1,11 @@
+--- src/gdb-buddy.c.orig 2010-11-16 18:43:48.000000000 +0100
++++ src/gdb-buddy.c 2010-11-16 18:54:28.000000000 +0100
+@@ -170,7 +170,7 @@
+ link = g_strdup_printf ("/proc/%d/path/a.out", pid);
+ #else
+ /* if someone knows how to do this on BSD, please send a patch */
+- return NULL;
++ link = g_file_read_link ("/proc/curproc/file", NULL);
+ #endif
+ exe = g_file_read_link (link, &error);
+
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index 32c3dfcc8d0b..c8b6d1f69bfa 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -1,6 +1,7 @@
bin/bug-buddy
-lib/gtk-2.0/modules/libgnomebreakpad.la
lib/gtk-2.0/modules/libgnomebreakpad.so
+lib/gtk-2.0/modules/libgnomesegvhandler.la
+lib/gtk-2.0/modules/libgnomesegvhandler.so
share/applications/bug-buddy.desktop
%%DATADIR%%/bug-buddy.gtkbuilder
%%DATADIR%%/gdb-cmd
diff --git a/devel/crow/Makefile b/devel/crow/Makefile
index 14f539bdf2bd..4267c394238b 100644
--- a/devel/crow/Makefile
+++ b/devel/crow/Makefile
@@ -19,6 +19,8 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
RUN_DEPENDS= xdg-desktop-menu:${PORTSDIR}/devel/xdg-utils
+BROKEN= Doesn't build with Glibmm 2.25
+
PROJECTHOST= nothing-personal
USE_BZIP2= yes
USE_GNOME= gnomehack gtk20
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 26465d7be7ef..d4f3d27dbdec 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -3,10 +3,10 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/devel/devhelp/Makefile,v 1.1 2010/06/23 12:12:25 kwm Exp $
+# $MCom: ports/devel/devhelp/Makefile,v 1.38 2010/09/28 09:09:20 kwm Exp $
PORTNAME= devhelp
-PORTVERSION= 2.30.1
+PORTVERSION= 2.32.0
PORTEPOCH= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
@@ -51,8 +51,4 @@ post-patch:
${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 00752246c60c..a132abcb5340 100644
--- a/devel/devhelp/distinfo
+++ b/devel/devhelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/devhelp-2.30.1.tar.bz2) = 447413a54d3bec2480e9a290e261703d
-SHA256 (gnome2/devhelp-2.30.1.tar.bz2) = a72d75fae489bc957f15ef203a6bf8fc9cf80f2730444912dc568476018d5335
-SIZE (gnome2/devhelp-2.30.1.tar.bz2) = 489222
+MD5 (gnome2/devhelp-2.32.0.tar.bz2) = c6690a45609caa00ecd9cd92f7d28915
+SHA256 (gnome2/devhelp-2.32.0.tar.bz2) = 61b342cbaf27379be9baa5df1f34c9464916601ec4378fa7e1c76fcc686553e4
+SIZE (gnome2/devhelp-2.32.0.tar.bz2) = 503689
diff --git a/devel/devhelp/files/patch-src_dh-base.c b/devel/devhelp/files/patch-src_dh-base.c
deleted file mode 100644
index 3dbf1c71cf4e..000000000000
--- a/devel/devhelp/files/patch-src_dh-base.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/dh-base.c.orig 2008-10-11 00:00:18.000000000 +0200
-+++ src/dh-base.c 2009-01-09 23:10:12.000000000 +0100
-@@ -214,6 +214,11 @@ base_add_books_in_data_dir (DhBase
- dir = g_build_filename (data_dir, "devhelp", "books", NULL);
- base_add_books (base, dir);
- g_free (dir);
-+
-+ dir = g_build_filename (data_dir, "doc", NULL);
-+ base_add_books (base, dir);
-+ g_free (dir);
-+
- }
-
- static void
diff --git a/devel/devhelp/files/patch-src_dh-book-manager.c b/devel/devhelp/files/patch-src_dh-book-manager.c
new file mode 100644
index 000000000000..a9d8640db7d8
--- /dev/null
+++ b/devel/devhelp/files/patch-src_dh-book-manager.c
@@ -0,0 +1,13 @@
+--- src/dh-book-manager.c.orig 2010-09-01 11:30:01.000000000 +0200
++++ src/dh-book-manager.c 2010-09-01 11:31:03.000000000 +0200
+@@ -149,6 +149,10 @@ book_manager_add_books_in_data_dir (DhBo
+ dir = g_build_filename (data_dir, "devhelp", "books", NULL);
+ book_manager_add_from_dir (book_manager, dir);
+ g_free (dir);
++
++ dir = g_build_filename (data_dir, "doc", NULL);
++ book_manager_add_from_dir (book_manager, dir);
++ g_free (dir);
+ }
+
+ void
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index 963290b7ae3f..4297730748eb 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -1,13 +1,15 @@
bin/devhelp
-include/devhelp-1.0/devhelp/dh-assistant-view.h
-include/devhelp-1.0/devhelp/dh-assistant.h
-include/devhelp-1.0/devhelp/dh-base.h
-include/devhelp-1.0/devhelp/dh-book-tree.h
-include/devhelp-1.0/devhelp/dh-error.h
-include/devhelp-1.0/devhelp/dh-keyword-model.h
-include/devhelp-1.0/devhelp/dh-link.h
-include/devhelp-1.0/devhelp/dh-search.h
-include/devhelp-1.0/devhelp/dh-window.h
+include/devhelp-2.0/devhelp/dh-assistant-view.h
+include/devhelp-2.0/devhelp/dh-assistant.h
+include/devhelp-2.0/devhelp/dh-base.h
+include/devhelp-2.0/devhelp/dh-book-manager.h
+include/devhelp-2.0/devhelp/dh-book-tree.h
+include/devhelp-2.0/devhelp/dh-book.h
+include/devhelp-2.0/devhelp/dh-error.h
+include/devhelp-2.0/devhelp/dh-keyword-model.h
+include/devhelp-2.0/devhelp/dh-link.h
+include/devhelp-2.0/devhelp/dh-search.h
+include/devhelp-2.0/devhelp/dh-window.h
%%GEDIT%%lib/gedit-2/plugins/devhelp.gedit-plugin
%%GEDIT%%lib/gedit-2/plugins/devhelp/__init__.py
%%GEDIT%%lib/gedit-2/plugins/devhelp/__init__.pyc
@@ -15,11 +17,11 @@ include/devhelp-1.0/devhelp/dh-window.h
%%GEDIT%%lib/gedit-2/plugins/devhelp/devhelp.py
%%GEDIT%%lib/gedit-2/plugins/devhelp/devhelp.pyc
%%GEDIT%%lib/gedit-2/plugins/devhelp/devhelp.pyo
-lib/libdevhelp-1.a
-lib/libdevhelp-1.la
-lib/libdevhelp-1.so
-lib/libdevhelp-1.so.1
-libdata/pkgconfig/libdevhelp-1.0.pc
+lib/libdevhelp-2.a
+lib/libdevhelp-2.la
+lib/libdevhelp-2.so
+lib/libdevhelp-2.so.1
+libdata/pkgconfig/libdevhelp-2.0.pc
share/applications/devhelp.desktop
share/devhelp/assistant/assistant.css
share/devhelp/assistant/assistant.js
@@ -110,8 +112,8 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
@dirrm share/devhelp/dtd
@dirrm share/devhelp/assistant
@dirrm share/devhelp
-@dirrm include/devhelp-1.0/devhelp
-@dirrm include/devhelp-1.0
+@dirrm include/devhelp-2.0/devhelp
+@dirrm include/devhelp-2.0
@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index ce1fb0e060e8..9443a9a741e6 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.111 2010/04/01 15:59:40 kwm Exp $
+# $MCom: ports/devel/gconf2/Makefile,v 1.124 2010/11/15 22:14:03 kwm Exp $
#
PORTNAME= gconf2
-PORTVERSION= 2.28.1
-PORTREVISION?= 1
+PORTVERSION= 2.32.0
+PORTREVISION?= 2
CATEGORIES= devel gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,6 +20,9 @@ COMMENT= A configuration database system for GNOME
USE_BZIP2= yes
+LICENSE= LGPL20
+LICENSE_FILE= ${WRKSRC}/COPYING
+
.if !defined(REFERENCE_PORT)
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
@@ -28,7 +31,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
USE_GMAKE= yes
USE_GETTEXT= yes
USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 ltverhack \
- referencehack intlhack
+ referencehack intlhack dconf
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
@@ -37,7 +40,8 @@ CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-MAN1= gconftool-2.1
+MAN1= gconftool-2.1 gsettings-data-convert.1 \
+ gsettings-schema-convert.1
OPTIONS= LDAP "Enable LDAP support" off
@@ -52,6 +56,9 @@ CONFIGURE_ARGS+=--without-openldap
PLIST_SUB+= LDAP="@comment "
.endif
+post-install:
+ -${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gio/modules
+
.include <bsd.port.post.mk>
.endif
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index d216af850702..b7d4f13db58d 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/GConf-2.28.1.tar.bz2) = 27663faf0af4f6a6d534de9270f6d24a
-SHA256 (gnome2/GConf-2.28.1.tar.bz2) = 53c477f9086057b0c84816a1c979e01537b862fbcacb6af4b62f8cffec4b3000
-SIZE (gnome2/GConf-2.28.1.tar.bz2) = 1476141
+MD5 (gnome2/GConf-2.32.0.tar.bz2) = b161da6a1ab090b649aed3111003b0bb
+SHA256 (gnome2/GConf-2.32.0.tar.bz2) = 54dd1dd7f49928a9cc42574bef6ef0481753770fc19986dc2004bbb7fac977a0
+SIZE (gnome2/GConf-2.32.0.tar.bz2) = 1541688
diff --git a/devel/gconf2/files/patch-gsettings_gconfsettingsbackend.c b/devel/gconf2/files/patch-gsettings_gconfsettingsbackend.c
new file mode 100644
index 000000000000..9742e9e91d2a
--- /dev/null
+++ b/devel/gconf2/files/patch-gsettings_gconfsettingsbackend.c
@@ -0,0 +1,9 @@
+--- gsettings/gconfsettingsbackend.c.orig 2010-11-14 12:54:57.000000000 -0500
++++ gsettings/gconfsettingsbackend.c 2010-11-14 12:55:08.000000000 -0500
+@@ -924,5 +924,5 @@ gconf_settings_backend_register (GIOModu
+ g_io_extension_point_implement (G_SETTINGS_BACKEND_EXTENSION_POINT_NAME,
+ GCONF_TYPE_SETTINGS_BACKEND,
+ "gconf",
+- -1);
++ 10);
+ }
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index eb8bec29974a..010cc2f6ca21 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -1,8 +1,11 @@
bin/gconf-merge-tree
bin/gconftool-2
+bin/gsettings-data-convert
+bin/gsettings-schema-convert
etc/dbus-1/system.d/org.gnome.GConf.Defaults.conf
%%LDAP%%etc/gconf/2/evoldap.conf
etc/gconf/2/path
+etc/xdg/autostart/gsettings-data-convert.desktop
include/gconf/2/gconf/gconf-changeset.h
include/gconf/2/gconf/gconf-client.h
include/gconf/2/gconf/gconf-engine.h
@@ -22,6 +25,10 @@ lib/GConf/2/libgconfbackend-oldxml.so
lib/GConf/2/libgconfbackend-xml.a
lib/GConf/2/libgconfbackend-xml.la
lib/GConf/2/libgconfbackend-xml.so
+lib/girepository-1.0/GConf-2.0.typelib
+lib/gio/modules/libgsettingsgconfbackend.a
+lib/gio/modules/libgsettingsgconfbackend.la
+lib/gio/modules/libgsettingsgconfbackend.so
lib/libgconf-2.a
lib/libgconf-2.la
lib/libgconf-2.so
@@ -33,6 +40,7 @@ libexec/gconfd-2
share/aclocal/gconf-2.m4
share/dbus-1/system-services/org.gnome.GConf.Defaults.service
share/dbus-1/services/org.gnome.GConf.service
+share/gir-1.0/GConf-2.0.gir
share/locale/am/LC_MESSAGES/GConf2.mo
share/locale/ar/LC_MESSAGES/GConf2.mo
share/locale/as/LC_MESSAGES/GConf2.mo
@@ -67,6 +75,7 @@ share/locale/he/LC_MESSAGES/GConf2.mo
share/locale/hi/LC_MESSAGES/GConf2.mo
share/locale/hr/LC_MESSAGES/GConf2.mo
share/locale/hu/LC_MESSAGES/GConf2.mo
+share/locale/hy/LC_MESSAGES/GConf2.mo
share/locale/id/LC_MESSAGES/GConf2.mo
share/locale/is/LC_MESSAGES/GConf2.mo
share/locale/it/LC_MESSAGES/GConf2.mo
@@ -148,6 +157,8 @@ share/sgml/gconf/gconf-1.0.dtd
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@@ -160,3 +171,5 @@ share/sgml/gconf/gconf-1.0.dtd
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+@unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
diff --git a/devel/giggle/Makefile b/devel/giggle/Makefile
index f44bac08a07b..f418af0b8cce 100644
--- a/devel/giggle/Makefile
+++ b/devel/giggle/Makefile
@@ -7,6 +7,7 @@
PORTNAME= giggle
PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index d231083c80ca..9ed6a864a597 100644
--- a/devel/gio-fam-backend/Makefile
+++ b/devel/gio-fam-backend/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.52 2010/05/04 09:44:51 kwm Exp $
+# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.65 2010/11/15 02:01:55 kwm Exp $
#
PORTNAME= gio-fam-backend
-PORTVERSION= 2.24.2
+PORTVERSION= 2.26.1
+PORTREVISION= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
@@ -23,7 +24,6 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= FAM backend for GLib's GIO library
USE_BZIP2= yes
-USE_GETTEXT= yes
BUILD_WRKSRC= ${WRKSRC}/gio/fam
INSTALL_WRKSRC= ${BUILD_WRKSRC}
GNU_CONFIGURE= yes
diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo
index e43ea4c4554a..0ef45aba0485 100644
--- a/devel/gio-fam-backend/distinfo
+++ b/devel/gio-fam-backend/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/glib-2.24.2.tar.bz2) = 8a6e45d7840460ed84288ebfd75782d4
-SHA256 (gnome2/glib-2.24.2.tar.bz2) = 3aeb521abd3642dd1224379f0e54915957e5010f888a4ae74afa0ad54da0160c
-SIZE (gnome2/glib-2.24.2.tar.bz2) = 5326328
+SHA256 (gnome2/glib-2.26.1.tar.bz2) = 7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5
+SIZE (gnome2/glib-2.26.1.tar.bz2) = 6704686
diff --git a/devel/gir-repository-dbus/Makefile b/devel/gir-repository-dbus/Makefile
deleted file mode 100644
index 48cb73e4361d..000000000000
--- a/devel/gir-repository-dbus/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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/Makefile b/devel/gir-repository/Makefile
index 37942954c509..c92dac7b8e5b 100644
--- a/devel/gir-repository/Makefile
+++ b/devel/gir-repository/Makefile
@@ -3,7 +3,7 @@
# Whom: Pawel Worach <pawel.worach@gmail.com>
#
# $FreeBSD$
-# $MCom: ports/devel/gir-repository/Makefile,v 1.16 2010/03/14 01:32:00 kwm Exp $
+# $MCom: ports/devel/gir-repository/Makefile,v 1.21 2010/10/24 16:26:19 avl Exp $
#
MASTER_SITES= # Empty
@@ -17,14 +17,10 @@ COMMENT= Introspection information for various libraries
NO_BUILD= yes
RUN_DEPENDS= ${GIRDIR}/${poppler_GIR}.gir:${PORTSDIR}/${poppler_CATEGORY}/gir-repository-poppler \
- ${GIRDIR}/${libsoup_GIR}.gir:${PORTSDIR}/${libsoup_CATEGORY}/gir-repository-libsoup \
${GIRDIR}/${dbus_GIR}.gir:${PORTSDIR}/${dbus_CATEGORY}/gir-repository-dbus \
- ${GIRDIR}/${gconf2_GIR}.gir:${PORTSDIR}/${gconf2_CATEGORY}/gir-repository-gconf2 \
${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}/${goocanvas_GIR}.gir:${PORTSDIR}/${goocanvas_CATEGORY}/gir-repository-goocanvas
diff --git a/devel/gir-repository/bsd.gir.mk b/devel/gir-repository/bsd.gir.mk
index 62fea33aad2d..cb9b4f1d1b9f 100644
--- a/devel/gir-repository/bsd.gir.mk
+++ b/devel/gir-repository/bsd.gir.mk
@@ -1,6 +1,6 @@
PORTNAME= gir-repository
PORTVERSION= 0.6.5
-PORTREVISION?= 4
+PORTREVISION?= 5
MAINTAINER= gnome@FreeBSD.org
@@ -9,31 +9,12 @@ GIRDIR= ${LOCALBASE}/share/gir-1.0
poppler_CATEGORY= graphics
poppler_GIR= Poppler-0.8
-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.1
-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
@@ -48,7 +29,7 @@ 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
+RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
USE_BZIP2= yes
GNU_CONFIGURE= yes
@@ -68,44 +49,20 @@ PLIST= ${NONEXISTENT}
_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 unique gmenu wnck
+ goocanvas gssdp gupnp avahi unique gmenu wnck
.if ${GIR_NAME} == "poppler"
-LIB_DEPENDS+= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk
+LIB_DEPENDS+= poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk
USE_GNOME+= gtk20
GIR_FILES= Poppler-0.8
CLEAR_DEPS+= Gdk-2.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.1.0:${PORTSDIR}/x11/babl
GIR_FILES= Babl-0.1
.endif
-.if ${GIR_NAME} == "nautilus"
-USE_GNOME+= nautilus2
-GIR_FILES= Nautilus-1.0
-DEP_NAMES= nautilusextension
-CLEAR_DEPS+= Gtk-2.0
-.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_GNOME+= gtk20
@@ -114,19 +71,6 @@ DEP_NAMES= notify
CLEAR_DEPS+= Gtk-2.0
.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
-GIR_FILES= GtkSource-2.2
-DEP_NAMES= gtksourceview
-CLEAR_DEPS+= Gtk-2.0
-.endif
-
.if ${GIR_NAME} == "vte"
USE_GNOME+= vte
GIR_FILES= Vte-1.0
diff --git a/devel/gir-repository/files/patch-gir_Makefile.in b/devel/gir-repository/files/patch-gir_Makefile.in
index 5c559acda3b4..8932e4d3fd19 100644
--- a/devel/gir-repository/files/patch-gir_Makefile.in
+++ b/devel/gir-repository/files/patch-gir_Makefile.in
@@ -1,5 +1,5 @@
---- gir/Makefile.in.orig 2009-09-09 21:31:46.000000000 +0200
-+++ gir/Makefile.in 2010-04-07 15:17:19.000000000 +0200
+--- gir/Makefile.in.orig 2010-11-02 16:00:41.000000000 +0100
++++ gir/Makefile.in 2010-11-02 16:02:11.000000000 +0100
@@ -86,7 +86,7 @@ host_triplet = @host@
@BUILD_GSSDP_TRUE@am__append_33 = GSSDP-1.0.gir
@BUILD_GUPNP_TRUE@am__append_34 = GUPnP-1.0.gir
@@ -36,7 +36,17 @@
@BUILD_POPPLER_TRUE@ $(INTROSPECTION_SCANNER) -v --namespace Poppler --nsversion=0.8 \
@BUILD_POPPLER_TRUE@ --add-include-path=$(srcdir) --add-include-path=. \
@BUILD_POPPLER_TRUE@ --include=GObject-2.0 \
-@@ -1384,16 +1384,16 @@ uninstall-am: uninstall-dist_girDATA uni
+@@ -1228,7 +1228,8 @@ uninstall-am: uninstall-dist_girDATA uni
+ @BUILD_VTE_TRUE@ --pkg gtk+-2.0 \
+ @BUILD_VTE_TRUE@ --pkg vte \
+ @BUILD_VTE_TRUE@ --output $@ \
+-@BUILD_VTE_TRUE@ $(VTE_INCLUDEDIR)/vte/*.h
++@BUILD_VTE_TRUE@ -DVTE_COMPILATION \
++@BUILD_VTE_TRUE@ $(VTE_INCLUDEDIR)/vte-0.0/vte/*.h
+ @BUILD_CLUTTER_TRUE@ClutterJson-0.8.gir: $(INTROSPECTION_SCANNER)
+ @BUILD_CLUTTER_TRUE@ $(INTROSPECTION_SCANNER) -v --namespace ClutterJson --nsversion=0.8 \
+ @BUILD_CLUTTER_TRUE@ --add-include-path=$(srcdir) --add-include-path=. \
+@@ -1384,16 +1385,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)
@@ -56,7 +66,7 @@
@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
+@@ -1479,6 +1480,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 \
@@ -64,7 +74,7 @@
@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 \
-@@ -1529,11 +1530,11 @@ uninstall-am: uninstall-dist_girDATA uni
+@@ -1529,14 +1531,15 @@ uninstall-am: uninstall-dist_girDATA uni
@BUILD_AVAHI_TRUE@ --output $@ \
@BUILD_AVAHI_TRUE@ --pkg avahi-gobject \
@BUILD_AVAHI_TRUE@ $(AVAHI_INCLUDEDIR)/*.h
@@ -79,3 +89,7 @@
@BUILD_BABL_TRUE@ --libtool="$(LIBTOOL)" \
@BUILD_BABL_TRUE@ --output $@ \
@BUILD_BABL_TRUE@ --pkg babl \
++@BUILD_BABL_TRUE@ -DBABL_INSIDE_BABL_H \
+ @BUILD_BABL_TRUE@ $(BABL_INCLUDEDIR)/babl/*.h
+ @BUILD_UNIQUE_TRUE@Unique-1.0.gir: Gtk-2.0.gir $(INTROSPECTION_SCANNER)
+ @BUILD_UNIQUE_TRUE@ $(INTROSPECTION_SCANNER) -v --namespace Unique --nsversion=1.0 \
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index bdc4a6ea3913..1d7fa62b1be0 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/devel/glade3/Makefile,v 1.2 2009/04/24 05:51:34 kwm Exp $
+# $MCom: ports/devel/glade3/Makefile,v 1.44 2010/06/06 22:11:46 kwm Exp $
#
PORTNAME= glade3
-PORTVERSION= 3.6.7
-PORTREVISION= 3
+PORTVERSION= 3.7.1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/glade3/distinfo b/devel/glade3/distinfo
index ad531621f0b1..3f632bbdc756 100644
--- a/devel/glade3/distinfo
+++ b/devel/glade3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glade3-3.6.7.tar.bz2) = 0fbe06e4babb2adeaf9725577ff43395
-SHA256 (gnome2/glade3-3.6.7.tar.bz2) = 117905d5b52781e0ffa861e38f47acda0e6bff992c5015408be74a7669769f81
-SIZE (gnome2/glade3-3.6.7.tar.bz2) = 2244221
+MD5 (gnome2/glade3-3.7.1.tar.bz2) = 35dca20dd51aa1a1fd461d723abba95b
+SHA256 (gnome2/glade3-3.7.1.tar.bz2) = e803ea266df3f35515f68d067ef2509411db190bba3d121e640244ae09c12cfd
+SIZE (gnome2/glade3-3.7.1.tar.bz2) = 2550121
diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist
index e08b19ee6725..971dde53a02c 100644
--- a/devel/glade3/pkg-plist
+++ b/devel/glade3/pkg-plist
@@ -7,8 +7,8 @@ include/libgladeui-1.0/gladeui/glade-base-editor.h
include/libgladeui-1.0/gladeui/glade-builtins.h
include/libgladeui-1.0/gladeui/glade-button-editor.h
include/libgladeui-1.0/gladeui/glade-catalog.h
-include/libgladeui-1.0/gladeui/glade-cell-renderer-button.h
include/libgladeui-1.0/gladeui/glade-cell-renderer-editor.h
+include/libgladeui-1.0/gladeui/glade-cell-renderer-icon.h
include/libgladeui-1.0/gladeui/glade-clipboard-view.h
include/libgladeui-1.0/gladeui/glade-clipboard.h
include/libgladeui-1.0/gladeui/glade-column-types.h
@@ -34,7 +34,6 @@ include/libgladeui-1.0/gladeui/glade-inspector.h
include/libgladeui-1.0/gladeui/glade-label-editor.h
include/libgladeui-1.0/gladeui/glade-model-data.h
include/libgladeui-1.0/gladeui/glade-name-context.h
-include/libgladeui-1.0/gladeui/glade-palette-item.h
include/libgladeui-1.0/gladeui/glade-palette.h
include/libgladeui-1.0/gladeui/glade-parameter.h
include/libgladeui-1.0/gladeui/glade-placeholder.h
@@ -65,22 +64,21 @@ lib/glade3/modules/libgladegtk.so
lib/libgladeui-1.a
lib/libgladeui-1.la
lib/libgladeui-1.so
-lib/libgladeui-1.so.9
+lib/libgladeui-1.so.10
libdata/pkgconfig/gladeui-1.0.pc
share/applications/glade-3.desktop
%%DOCSDIR%%/GladeApp.html
%%DOCSDIR%%/GladeBaseEditor.html
%%DOCSDIR%%/GladeClipboard.html
%%DOCSDIR%%/GladeClipboardView.html
-%%DOCSDIR%%/GladeCommand.html
%%DOCSDIR%%/GladeDesignView.html
-%%DOCSDIR%%/GladeEditor.html
%%DOCSDIR%%/GladeEditorProperty.html
%%DOCSDIR%%/GladeFixed.html
%%DOCSDIR%%/GladeInspector.html
%%DOCSDIR%%/GladePalette.html
%%DOCSDIR%%/GladePlaceholder.html
%%DOCSDIR%%/GladeProject.html
+%%DOCSDIR%%/GladeProperty.html
%%DOCSDIR%%/GladeWidget.html
%%DOCSDIR%%/GladeWidgetAction.html
%%DOCSDIR%%/catalog.html
@@ -89,13 +87,14 @@ share/applications/glade-3.desktop
%%DOCSDIR%%/dockables.html
%%DOCSDIR%%/gladeui.devhelp
%%DOCSDIR%%/gladeui.devhelp2
+%%DOCSDIR%%/gladeui-Glade-Parameter.html
+%%DOCSDIR%%/gladeui-Glade-Utils.html
+%%DOCSDIR%%/gladeui-GladeSignalEditor.html
%%DOCSDIR%%/gladeui-GladePropertyClass.html
-%%DOCSDIR%%/gladeui-GladeWidgetAdaptor.html
-%%DOCSDIR%%/gladeui-glade-parameter.html
-%%DOCSDIR%%/gladeui-glade-property.html
-%%DOCSDIR%%/gladeui-glade-signal-editor.html
-%%DOCSDIR%%/gladeui-glade-utils.html
-%%DOCSDIR%%/gladeui-glade-xml-utils.html
+%%DOCSDIR%%/gladeui-Xml-Utils.html
+%%DOCSDIR%%/gladeui-glade-command.html
+%%DOCSDIR%%/gladeui-glade-editor.html
+%%DOCSDIR%%/gladeui-glade-widget-adaptor.html
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
@@ -395,6 +394,9 @@ share/gnome/help/glade/C/legal.xml
share/gnome/help/glade/bg/figures/main-window.png
share/gnome/help/glade/bg/glade.xml
share/gnome/help/glade/bg/legal.xml
+share/gnome/help/glade/cs/figures/main-window.png
+share/gnome/help/glade/cs/glade.xml
+share/gnome/help/glade/cs/legal.xml
share/gnome/help/glade/de/figures/main-window.png
share/gnome/help/glade/de/glade.xml
share/gnome/help/glade/de/legal.xml
@@ -431,6 +433,12 @@ share/gnome/help/glade/ru/legal.xml
share/gnome/help/glade/sv/figures/main-window.png
share/gnome/help/glade/sv/glade.xml
share/gnome/help/glade/sv/legal.xml
+share/gnome/help/glade/uk/figures/main-window.png
+share/gnome/help/glade/uk/glade.xml
+share/gnome/help/glade/uk/legal.xml
+share/gnome/help/glade/zh_CN/figures/main-window.png
+share/gnome/help/glade/zh_CN/glade.xml
+share/gnome/help/glade/zh_CN/legal.xml
share/icons/hicolor/16x16/apps/glade-3.png
share/icons/hicolor/22x22/apps/glade-3.png
share/icons/hicolor/24x24/apps/glade-3.png
@@ -443,12 +451,14 @@ share/locale/bg/LC_MESSAGES/glade3.mo
share/locale/bn/LC_MESSAGES/glade3.mo
share/locale/bn_IN/LC_MESSAGES/glade3.mo
share/locale/ca/LC_MESSAGES/glade3.mo
+share/locale/ca@valencia/LC_MESSAGES/glade3.mo
share/locale/cs/LC_MESSAGES/glade3.mo
share/locale/da/LC_MESSAGES/glade3.mo
share/locale/de/LC_MESSAGES/glade3.mo
share/locale/el/LC_MESSAGES/glade3.mo
share/locale/en_CA/LC_MESSAGES/glade3.mo
share/locale/en_GB/LC_MESSAGES/glade3.mo
+share/locale/en@shaw/LC_MESSAGES/glade3.mo
share/locale/es/LC_MESSAGES/glade3.mo
share/locale/et/LC_MESSAGES/glade3.mo
share/locale/eu/LC_MESSAGES/glade3.mo
@@ -497,6 +507,7 @@ share/locale/zh_HK/LC_MESSAGES/glade3.mo
share/locale/zh_TW/LC_MESSAGES/glade3.mo
share/omf/glade/glade-C.omf
share/omf/glade/glade-bg.omf
+share/omf/glade/glade-cs.omf
share/omf/glade/glade-de.omf
share/omf/glade/glade-el.omf
share/omf/glade/glade-en_GB.omf
@@ -509,7 +520,13 @@ share/omf/glade/glade-oc.omf
share/omf/glade/glade-pt_BR.omf
share/omf/glade/glade-ru.omf
share/omf/glade/glade-sv.omf
+share/omf/glade/glade-uk.omf
+share/omf/glade/glade-zh_CN.omf
@dirrm share/omf/glade
+@dirrm share/gnome/help/glade/zh_CN/figures
+@dirrm share/gnome/help/glade/zh_CN
+@dirrm share/gnome/help/glade/uk/figures
+@dirrm share/gnome/help/glade/uk
@dirrm share/gnome/help/glade/sv/figures
@dirrm share/gnome/help/glade/sv
@dirrm share/gnome/help/glade/ru/figures
@@ -534,6 +551,8 @@ share/omf/glade/glade-sv.omf
@dirrm share/gnome/help/glade/el
@dirrm share/gnome/help/glade/de/figures
@dirrm share/gnome/help/glade/de
+@dirrm share/gnome/help/glade/cs/figures
+@dirrm share/gnome/help/glade/cs
@dirrm share/gnome/help/glade/bg/figures
@dirrm share/gnome/help/glade/bg
@dirrm share/gnome/help/glade/C/figures
@@ -572,7 +591,11 @@ share/omf/glade/glade-sv.omf
@dirrmtry share/locale/mr
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/cs/LC_MESSAGES
@dirrmtry share/locale/cs
+@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/devel/glib20-reference/bsd.gnome-reference.mk b/devel/glib20-reference/bsd.gnome-reference.mk
index 682328ed9902..d09035b78d47 100644
--- a/devel/glib20-reference/bsd.gnome-reference.mk
+++ b/devel/glib20-reference/bsd.gnome-reference.mk
@@ -48,7 +48,6 @@ make-descr:
.if !target(do-install)
do-install:
-. if !defined(NOPORTDOCS)
. for d in ${BOOKS}
if [ -d ${REFERENCE_SRC}/${d}/html ]; then \
${MKDIR} ${DOCSDIR}/${d}; \
@@ -57,7 +56,6 @@ do-install:
${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/${d}/{}" \; ; \
fi
. endfor
-. endif
.endif
.include <bsd.port.mk>
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 85450e0422a8..f67ff1396d89 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.166 2010/05/04 09:44:51 kwm Exp $
+# $MCom: ports/devel/glib20/Makefile,v 1.188 2010/11/15 02:01:55 kwm Exp $
#
# !! DON'T FORGET ABOUT devel/gio-fam-backend !!
PORTNAME= glib
-PORTVERSION= 2.24.2
+PORTVERSION= 2.26.1
PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
@@ -26,10 +26,13 @@ COMMENT= Some useful routines of C programming (current stable version)
LATEST_LINK= glib20
USE_BZIP2= yes
+LICENSE= LGPL20
+LICENSE_FILE= ${WRKSRC}/COPYING
.if !defined(REFERENCE_PORT)
-LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre \
+ dbus-1.3:${PORTSDIR}/devel/dbus
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool:22
@@ -42,6 +45,7 @@ USE_PERL5= yes
CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \
--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
--disable-man --without-xml-catalog \
+ --disable-dtrace \
--with-pcre=system \
--disable-fam
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -74,8 +78,12 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/glib/gutils.c
+ @${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
+ ${WRKSRC}/gio/gdbusaddress.c ${WRKSRC}/gio/gdbusprivate.c \
+ ${WRKSRC}/po/*.po
post-install:
+ @${MKDIR} ${PREFIX}/share/GConf/gsettings
-${PREFIX}/bin/gio-querymodules ${PREFIX}/lib/gio/modules
.include <bsd.port.post.mk>
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index e43ea4c4554a..0ef45aba0485 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/glib-2.24.2.tar.bz2) = 8a6e45d7840460ed84288ebfd75782d4
-SHA256 (gnome2/glib-2.24.2.tar.bz2) = 3aeb521abd3642dd1224379f0e54915957e5010f888a4ae74afa0ad54da0160c
-SIZE (gnome2/glib-2.24.2.tar.bz2) = 5326328
+SHA256 (gnome2/glib-2.26.1.tar.bz2) = 7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5
+SIZE (gnome2/glib-2.26.1.tar.bz2) = 6704686
diff --git a/devel/glib20/files/extra-patch-glib_gunicollate.c b/devel/glib20/files/extra-patch-glib_gunicollate.c
index dfcb99209ea8..e2edc6938273 100644
--- a/devel/glib20/files/extra-patch-glib_gunicollate.c
+++ b/devel/glib20/files/extra-patch-glib_gunicollate.c
@@ -1,6 +1,6 @@
---- glib/gunicollate.c.orig Thu Jun 8 17:24:10 2006
-+++ glib/gunicollate.c Thu Oct 19 20:12:50 2006
-@@ -26,10 +26,57 @@
+--- glib/gunicollate.c.orig
++++ glib/gunicollate.c
+@@ -26,6 +26,10 @@
#include <wchar.h>
#endif
@@ -8,9 +8,17 @@
+#include <unicode/ustring.h>
+#include <unicode/ucol.h>
+
- #include "glib.h"
- #include "gunicodeprivate.h"
- #include "galias.h"
+ #ifdef HAVE_CARBON
+ #include <CoreServices/CoreServices.h>
+ #endif
+@@ -36,10 +40,53 @@
+ #include "gstring.h"
+ #include "gstrfuncs.h"
+ #include "gtestutils.h"
++#include "gthread.h"
+ #ifndef __STDC_ISO_10646__
+ #include "gconvert.h"
+ #endif
+static gboolean icu_collator_initialized = FALSE;
+static UCollator *icu_collator = NULL;
@@ -54,11 +62,10 @@
+
+ return result;
+}
-+
+
#ifdef _MSC_VER
/* Workaround for bug in MSVCR80.DLL */
- static size_t
-@@ -94,6 +141,28 @@
+@@ -127,6 +174,28 @@
g_return_val_if_fail (str1 != NULL, 0);
g_return_val_if_fail (str2 != NULL, 0);
@@ -87,11 +94,10 @@
str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE);
str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE);
-@@ -235,6 +304,26 @@
- gchar *str_norm;
+@@ -419,6 +488,26 @@
g_return_val_if_fail (str != NULL, NULL);
-+
+
+ init_icu_collator();
+ if (icu_collator != NULL)
+ {
@@ -111,6 +117,7 @@
+ return result;
+ }
+ }
-
++
str_norm = g_utf8_normalize (str, len, G_NORMALIZE_ALL_COMPOSE);
+ result = NULL;
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index a6d6851b09cf..80fcb92b20d5 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig 2010-03-03 21:31:46.000000000 -0500
-+++ configure 2010-03-03 21:47:47.000000000 -0500
-@@ -714,6 +714,9 @@ ac_includes_default="\
+--- configure.orig 2010-09-09 12:18:43.000000000 +0200
++++ configure 2010-09-09 12:20:56.000000000 +0200
+@@ -575,6 +575,9 @@
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
@@ -10,7 +10,16 @@
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-@@ -23020,7 +23023,7 @@ _ACEOF
+@@ -5187,7 +5190,7 @@
+ fi
+
+ GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
+-ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
++ABS_GLIB_RUNTIME_LIBDIR="`readlink $libdir/$with_runtime_libdir`"
+
+
+ if test "x$with_runtime_libdir" != "x"; then
+@@ -22212,7 +22215,7 @@
fi
done
@@ -19,7 +28,7 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-@@ -25631,6 +25634,8 @@ fi
+@@ -24815,6 +24818,8 @@
;;
esac
fi
@@ -28,3 +37,12 @@
if test x"$G_THREAD_CFLAGS" = x; then
+@@ -27415,7 +27420,7 @@
+ fi
+
+
+-if test "x${enable_Bsymbolic}" == "xyes"; then
++if test "x${enable_Bsymbolic}" = "xyes"; then
+ GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions
+ fi
+
diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag
index 5ee7fe3d539f..289bc3381903 100644
--- a/devel/glib20/files/patch-ag
+++ b/devel/glib20/files/patch-ag
@@ -1,21 +1,11 @@
---- Makefile.in.orig 2008-02-12 00:16:23.000000000 +0100
-+++ Makefile.in 2008-02-12 00:16:23.000000000 +0100
-@@ -338,7 +338,7 @@ EXTRA_DIST = ChangeLog.pre-2-14 ChangeLo
+--- Makefile.in.orig 2010-08-08 12:14:27.000000000 +0200
++++ Makefile.in 2010-08-08 12:15:40.000000000 +0200
+@@ -418,7 +418,7 @@
gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
TEST_PROGS =
- AUTOMAKE_OPTIONS = 1.7
+ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
DIST_SUBDIRS = $(SUBDIRS) build
bin_SCRIPTS = glib-gettextize
AM_CPPFLAGS = \
-@@ -356,7 +356,8 @@ BUILT_EXTRA_DIST = \
- config.h.win32 \
- gtk-doc.make
-
--configexecincludedir = $(libdir)/glib-2.0/include
-+glibincludedir = $(includedir)/glib-2.0
-+configexecincludedir = $(glibincludedir)
- configexecinclude_DATA = glibconfig.h
- CONFIGURE_DEPENDENCIES = acglib.m4
- BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
diff --git a/devel/glib20/files/patch-gio_tests_gdbus-peer.c b/devel/glib20/files/patch-gio_tests_gdbus-peer.c
new file mode 100644
index 000000000000..1ab76dc8c704
--- /dev/null
+++ b/devel/glib20/files/patch-gio_tests_gdbus-peer.c
@@ -0,0 +1,11 @@
+--- gio/tests/gdbus-peer.c.orig 2010-08-16 21:30:03.000000000 +0200
++++ gio/tests/gdbus-peer.c 2010-08-16 23:13:32.000000000 +0200
+@@ -42,6 +42,8 @@
+ #include <sys/socket.h>
+ #endif
+
++#include <sys/socket.h>
++
+ /* used in test_overflow */
+ #ifdef G_OS_UNIX
+ #include <gio/gunixconnection.h>
diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in
index 352c0cf6031c..7175b8581c93 100644
--- a/devel/glib20/files/patch-glib::libcharset::Makefile.in
+++ b/devel/glib20/files/patch-glib::libcharset::Makefile.in
@@ -1,15 +1,15 @@
---- glib/libcharset/Makefile.in.orig 2008-06-04 00:03:14.000000000 +0200
-+++ glib/libcharset/Makefile.in 2008-06-04 00:05:58.000000000 +0200
-@@ -278,7 +278,7 @@ EXTRA_DIST = README config.charset ref-a
+--- glib/libcharset/Makefile.in.orig 2010-08-08 12:46:01.000000000 +0200
++++ glib/libcharset/Makefile.in 2010-08-08 12:46:01.000000000 +0200
+@@ -328,7 +328,7 @@ EXTRA_DIST = README config.charset ref-a
codeset.m4 update.sh make-patch.sh libcharset-glib.patch
TEST_PROGS =
INCLUDES = \
-- -DLIBDIR=\"$(libdir)\" -I$(top_srcdir)
-+ -DLIBDIR=\"$(prefix)/libdata\" -I$(top_srcdir)
+- -DLIBDIR=\"$(libdir)\" $(config_h_INCLUDES)
++ -DLIBDIR=\"$(prefix)/libdata\" $(config_h_INCLUDES)
noinst_LTLIBRARIES = libcharset.la
libcharset_la_SOURCES = \
-@@ -286,8 +286,8 @@ libcharset_la_SOURCES = \
+@@ -336,8 +336,8 @@ libcharset_la_SOURCES = \
localcharset.h \
localcharset.c
@@ -20,9 +20,9 @@
SUFFIXES = .sed .sin
CLEANFILES = charset.alias ref-add.sed ref-del.sed
all: all-am
-@@ -498,7 +498,7 @@ install-data-am:
+@@ -566,7 +566,7 @@ install-dvi: install-dvi-am
- install-dvi: install-dvi-am
+ install-dvi-am:
-install-exec-am: install-exec-local
+install-exec-am: # install-exec-local
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in
index 8dd7ae74bb82..d58efb723f81 100644
--- a/devel/glib20/files/patch-glib_Makefile.in
+++ b/devel/glib20/files/patch-glib_Makefile.in
@@ -1,17 +1,26 @@
---- 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 @@
+--- glib/Makefile.in.orig 2010-08-08 12:46:01.000000000 +0200
++++ glib/Makefile.in 2010-08-08 12:46:01.000000000 +0200
+@@ -529,7 +529,7 @@ BUILT_SOURCES = glibconfig-stamp $(am__a
+ #
+ DISTCLEANFILES = glibconfig-stamp glibconfig.h
+ CLEANFILES = $(am__append_2)
+-configexecincludedir = $(libdir)/glib-2.0/include
++configexecincludedir = $(includedir)/glib-2.0
+ nodist_configexecinclude_HEADERS = glibconfig.h
+ @HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib
+ @HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la
+@@ -1530,7 +1530,7 @@ info: info-recursive
info-am:
-install-data-am: install-data-local install-dist_gdbSCRIPTS \
+install-data-am: install-data-local \
- install-glibincludeHEADERS install-glibsubincludeHEADERS
+ install-glibincludeHEADERS install-glibsubincludeHEADERS \
+ install-tapsetDATA
@$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -1603,9 +1603,7 @@
+@@ -1786,9 +1786,7 @@ distclean-local:
libglib-gdb.py: libglib-gdb.py.in
- sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
+ $(AM_V_GEN) $(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)
@@ -19,4 +28,4 @@
+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)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/files/patch-gobject_Makefile.in b/devel/glib20/files/patch-gobject_Makefile.in
index b8842a6f46e4..12a20215a0bb 100644
--- a/devel/glib20/files/patch-gobject_Makefile.in
+++ b/devel/glib20/files/patch-gobject_Makefile.in
@@ -1,15 +1,15 @@
---- 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
+--- gobject/Makefile.in.orig 2010-06-08 09:19:51.000000000 +0200
++++ gobject/Makefile.in 2010-06-08 09:20:41.000000000 +0200
+@@ -1236,7 +1236,7 @@ info: info-recursive
info-am:
-install-data-am: install-data-local install-dist_gdbSCRIPTS \
+install-data-am: install-data-local \
- install-libgobjectincludeHEADERS
+ install-libgobjectincludeHEADERS install-tapsetDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -1393,9 +1393,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
+@@ -1460,9 +1460,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
uninstall-gdb:
-rm -r $(DESTDIR)$(datadir)/gdb
@@ -19,4 +19,4 @@
+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)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index a760ba254490..d25cc3afcee1 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -1,13 +1,19 @@
+bin/gdbus
bin/gio-querymodules
+bin/glib-compile-schemas
bin/glib-genmarshal
bin/glib-gettextize
bin/glib-mkenums
bin/gobject-query
+bin/gsettings
bin/gtester
bin/gtester-report
+etc/bash_completion.d/gdbus-bash-completion.sh
+etc/bash_completion.d/gsettings-bash-completion.sh
include/gio-unix-2.0/gio/gdesktopappinfo.h
include/gio-unix-2.0/gio/gfiledescriptorbased.h
include/gio-unix-2.0/gio/gunixconnection.h
+include/gio-unix-2.0/gio/gunixcredentialsmessage.h
include/gio-unix-2.0/gio/gunixfdlist.h
include/gio-unix-2.0/gio/gunixfdmessage.h
include/gio-unix-2.0/gio/gunixinputstream.h
@@ -25,8 +31,21 @@ include/glib-2.0/gio/gcontenttype.h
include/glib-2.0/gio/gconverter.h
include/glib-2.0/gio/gconverterinputstream.h
include/glib-2.0/gio/gconverteroutputstream.h
+include/glib-2.0/gio/gcredentials.h
include/glib-2.0/gio/gdatainputstream.h
include/glib-2.0/gio/gdataoutputstream.h
+include/glib-2.0/gio/gdbusaddress.h
+include/glib-2.0/gio/gdbusauthobserver.h
+include/glib-2.0/gio/gdbusconnection.h
+include/glib-2.0/gio/gdbuserror.h
+include/glib-2.0/gio/gdbusintrospection.h
+include/glib-2.0/gio/gdbusmessage.h
+include/glib-2.0/gio/gdbusmethodinvocation.h
+include/glib-2.0/gio/gdbusnameowning.h
+include/glib-2.0/gio/gdbusnamewatching.h
+include/glib-2.0/gio/gdbusproxy.h
+include/glib-2.0/gio/gdbusserver.h
+include/glib-2.0/gio/gdbusutils.h
include/glib-2.0/gio/gdrive.h
include/glib-2.0/gio/gemblem.h
include/glib-2.0/gio/gemblemedicon.h
@@ -64,9 +83,17 @@ 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/gpermission.h
+include/glib-2.0/gio/gproxy.h
+include/glib-2.0/gio/gproxyaddress.h
+include/glib-2.0/gio/gproxyaddressenumerator.h
+include/glib-2.0/gio/gproxyresolver.h
include/glib-2.0/gio/gresolver.h
include/glib-2.0/gio/gseekable.h
+include/glib-2.0/gio/gsettings.h
+include/glib-2.0/gio/gsettingsbackend.h
include/glib-2.0/gio/gsimpleasyncresult.h
+include/glib-2.0/gio/gsimplepermission.h
include/glib-2.0/gio/gsocket.h
include/glib-2.0/gio/gsocketaddress.h
include/glib-2.0/gio/gsocketaddressenumerator.h
@@ -101,6 +128,7 @@ include/glib-2.0/glib/gcompletion.h
include/glib-2.0/glib/gconvert.h
include/glib-2.0/glib/gdataset.h
include/glib-2.0/glib/gdate.h
+include/glib-2.0/glib/gdatetime.h
include/glib-2.0/glib/gdir.h
include/glib-2.0/glib/gerror.h
include/glib-2.0/glib/gfileutils.h
@@ -143,6 +171,7 @@ include/glib-2.0/glib/gtestutils.h
include/glib-2.0/glib/gthread.h
include/glib-2.0/glib/gthreadpool.h
include/glib-2.0/glib/gtimer.h
+include/glib-2.0/glib/gtimezone.h
include/glib-2.0/glib/gtree.h
include/glib-2.0/glib/gtypes.h
include/glib-2.0/glib/gunicode.h
@@ -153,6 +182,7 @@ include/glib-2.0/glib/gvarianttype.h
include/glib-2.0/glib/gwin32.h
include/glib-2.0/glibconfig.h
include/glib-2.0/gmodule.h
+include/glib-2.0/gobject/gbinding.h
include/glib-2.0/gobject/gboxed.h
include/glib-2.0/gobject/gclosure.h
include/glib-2.0/gobject/genums.h
@@ -200,8 +230,10 @@ libdata/pkgconfig/gobject-2.0.pc
libdata/pkgconfig/gthread-2.0.pc
share/aclocal/glib-2.0.m4
share/aclocal/glib-gettext.m4
+share/aclocal/gsettings.m4
share/glib-2.0/gettext/mkinstalldirs
share/glib-2.0/gettext/po/Makefile.in.in
+share/glib-2.0/schemas/gschema.dtd
share/locale/af/LC_MESSAGES/glib20.mo
share/locale/am/LC_MESSAGES/glib20.mo
share/locale/ar/LC_MESSAGES/glib20.mo
@@ -245,6 +277,7 @@ share/locale/is/LC_MESSAGES/glib20.mo
share/locale/it/LC_MESSAGES/glib20.mo
share/locale/ja/LC_MESSAGES/glib20.mo
share/locale/ka/LC_MESSAGES/glib20.mo
+share/locale/kk/LC_MESSAGES/glib20.mo
share/locale/kn/LC_MESSAGES/glib20.mo
share/locale/ko/LC_MESSAGES/glib20.mo
share/locale/ku/LC_MESSAGES/glib20.mo
@@ -294,6 +327,11 @@ share/locale/yi/LC_MESSAGES/glib20.mo
share/locale/zh_CN/LC_MESSAGES/glib20.mo
share/locale/zh_HK/LC_MESSAGES/glib20.mo
share/locale/zh_TW/LC_MESSAGES/glib20.mo
+@exec mkdir -p %D/share/glib-2.0/schemas
+@dirrmtry share/GConf/gsettings
+@dirrmtry share/GConf
+@exec glib-compile-schemas --uninstall %D/share/glib-2.0/schemas
+@dirrm share/glib-2.0/schemas
@dirrm share/glib-2.0/gettext/po
@dirrm share/glib-2.0/gettext
@dirrm share/glib-2.0
@@ -342,6 +380,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@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/en@shaw/LC_MESSAGES
@@ -358,3 +398,4 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+@dirrmtry etc/bash_completion.d
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index ddd7668555b4..474e72284afe 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,12 +3,12 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glibmm/Makefile,v 1.90 2010/05/04 12:45:00 kwm Exp $
+# $MCom: ports/devel/glibmm/Makefile,v 1.96 2010/09/19 20:53:57 kwm Exp $
#
PORTNAME= glibmm
-PORTVERSION= 2.24.2
-PORTREVISION?= 2
+PORTVERSION= 2.25.5
+PORTREVISION?= 0
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index b114a6abd3a1..58b35ff7b32f 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glibmm-2.24.2.tar.bz2) = 48861fec006c2bd8e301d8e44cd12d3c
-SHA256 (gnome2/glibmm-2.24.2.tar.bz2) = d4687c0b27f9c9f955a5306649008a1f8d8935edff916278fb7b65b44292ff7a
-SIZE (gnome2/glibmm-2.24.2.tar.bz2) = 4481414
+MD5 (gnome2/glibmm-2.25.5.tar.bz2) = 280b57f81139f90709c867745c31be62
+SHA256 (gnome2/glibmm-2.25.5.tar.bz2) = a808bc5872556697a5bb221a3f9f14de9e8224b90a1900e7b37dcd0b3fcb0051
+SIZE (gnome2/glibmm-2.25.5.tar.bz2) = 5428421
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index 3cb8d30b0675..8799426c6758 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -1,12 +1,25 @@
include/giomm-%%API_VERSION%%/giomm.h
include/giomm-%%API_VERSION%%/giomm/appinfo.h
+include/giomm-%%API_VERSION%%/giomm/asyncinitable.h
include/giomm-%%API_VERSION%%/giomm/asyncresult.h
include/giomm-%%API_VERSION%%/giomm/bufferedinputstream.h
include/giomm-%%API_VERSION%%/giomm/bufferedoutputstream.h
include/giomm-%%API_VERSION%%/giomm/cancellable.h
include/giomm-%%API_VERSION%%/giomm/contenttype.h
+include/giomm-%%API_VERSION%%/giomm/credentials.h
include/giomm-%%API_VERSION%%/giomm/datainputstream.h
include/giomm-%%API_VERSION%%/giomm/dataoutputstream.h
+include/giomm-%%API_VERSION%%/giomm/dbusauthobserver.h
+include/giomm-%%API_VERSION%%/giomm/dbusconnection.h
+include/giomm-%%API_VERSION%%/giomm/dbuserror.h
+include/giomm-%%API_VERSION%%/giomm/dbusintrospection.h
+include/giomm-%%API_VERSION%%/giomm/dbusmessage.h
+include/giomm-%%API_VERSION%%/giomm/dbusmethodinvocation.h
+include/giomm-%%API_VERSION%%/giomm/dbusownname.h
+include/giomm-%%API_VERSION%%/giomm/dbusproxy.h
+include/giomm-%%API_VERSION%%/giomm/dbusserver.h
+include/giomm-%%API_VERSION%%/giomm/dbusutils.h
+include/giomm-%%API_VERSION%%/giomm/dbuswatchname.h
include/giomm-%%API_VERSION%%/giomm/desktopappinfo.h
include/giomm-%%API_VERSION%%/giomm/drive.h
include/giomm-%%API_VERSION%%/giomm/emblem.h
@@ -42,12 +55,25 @@ include/giomm-%%API_VERSION%%/giomm/networkaddress.h
include/giomm-%%API_VERSION%%/giomm/networkservice.h
include/giomm-%%API_VERSION%%/giomm/outputstream.h
include/giomm-%%API_VERSION%%/giomm/private/appinfo_p.h
+include/giomm-%%API_VERSION%%/giomm/private/asyncinitable_p.h
include/giomm-%%API_VERSION%%/giomm/private/asyncresult_p.h
include/giomm-%%API_VERSION%%/giomm/private/bufferedinputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/bufferedoutputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/cancellable_p.h
+include/giomm-%%API_VERSION%%/giomm/private/credentials_p.h
include/giomm-%%API_VERSION%%/giomm/private/datainputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/dataoutputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusauthobserver_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusconnection_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbuserror_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusintrospection_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusmessage_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusmethodinvocation_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusownname_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusproxy_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusserver_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusutils_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbuswatchname_p.h
include/giomm-%%API_VERSION%%/giomm/private/desktopappinfo_p.h
include/giomm-%%API_VERSION%%/giomm/private/drive_p.h
include/giomm-%%API_VERSION%%/giomm/private/emblem_p.h
@@ -81,14 +107,20 @@ include/giomm-%%API_VERSION%%/giomm/private/mountoperation_p.h
include/giomm-%%API_VERSION%%/giomm/private/networkaddress_p.h
include/giomm-%%API_VERSION%%/giomm/private/networkservice_p.h
include/giomm-%%API_VERSION%%/giomm/private/outputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/proxy_p.h
+include/giomm-%%API_VERSION%%/giomm/private/proxyaddress_p.h
+include/giomm-%%API_VERSION%%/giomm/private/proxyresolver_p.h
include/giomm-%%API_VERSION%%/giomm/private/resolver_p.h
include/giomm-%%API_VERSION%%/giomm/private/seekable_p.h
+include/giomm-%%API_VERSION%%/giomm/private/settings_p.h
+include/giomm-%%API_VERSION%%/giomm/private/settingsbackend_p.h
include/giomm-%%API_VERSION%%/giomm/private/socket_p.h
include/giomm-%%API_VERSION%%/giomm/private/socketaddress_p.h
include/giomm-%%API_VERSION%%/giomm/private/socketaddressenumerator_p.h
include/giomm-%%API_VERSION%%/giomm/private/socketclient_p.h
include/giomm-%%API_VERSION%%/giomm/private/socketconnectable_p.h
include/giomm-%%API_VERSION%%/giomm/private/socketconnection_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socketcontrolmessage_p.h
include/giomm-%%API_VERSION%%/giomm/private/socketlistener_p.h
include/giomm-%%API_VERSION%%/giomm/private/socketservice_p.h
include/giomm-%%API_VERSION%%/giomm/private/srvtarget_p.h
@@ -96,18 +128,27 @@ include/giomm-%%API_VERSION%%/giomm/private/tcpconnection_p.h
include/giomm-%%API_VERSION%%/giomm/private/themedicon_p.h
include/giomm-%%API_VERSION%%/giomm/private/threadedsocketservice_p.h
include/giomm-%%API_VERSION%%/giomm/private/unixconnection_p.h
+include/giomm-%%API_VERSION%%/giomm/private/unixcredentialsmessage_p.h
+include/giomm-%%API_VERSION%%/giomm/private/unixfdlist_p.h
+include/giomm-%%API_VERSION%%/giomm/private/unixfdmessage_p.h
include/giomm-%%API_VERSION%%/giomm/private/unixinputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/unixoutputstream_p.h
include/giomm-%%API_VERSION%%/giomm/private/volume_p.h
include/giomm-%%API_VERSION%%/giomm/private/volumemonitor_p.h
+include/giomm-%%API_VERSION%%/giomm/proxy.h
+include/giomm-%%API_VERSION%%/giomm/proxyaddress.h
+include/giomm-%%API_VERSION%%/giomm/proxyresolver.h
include/giomm-%%API_VERSION%%/giomm/resolver.h
include/giomm-%%API_VERSION%%/giomm/seekable.h
+include/giomm-%%API_VERSION%%/giomm/settings.h
+include/giomm-%%API_VERSION%%/giomm/settingsbackend.h
include/giomm-%%API_VERSION%%/giomm/socket.h
include/giomm-%%API_VERSION%%/giomm/socketaddress.h
include/giomm-%%API_VERSION%%/giomm/socketaddressenumerator.h
include/giomm-%%API_VERSION%%/giomm/socketclient.h
include/giomm-%%API_VERSION%%/giomm/socketconnectable.h
include/giomm-%%API_VERSION%%/giomm/socketconnection.h
+include/giomm-%%API_VERSION%%/giomm/socketcontrolmessage.h
include/giomm-%%API_VERSION%%/giomm/socketlistener.h
include/giomm-%%API_VERSION%%/giomm/socketservice.h
include/giomm-%%API_VERSION%%/giomm/srvtarget.h
@@ -115,6 +156,9 @@ include/giomm-%%API_VERSION%%/giomm/tcpconnection.h
include/giomm-%%API_VERSION%%/giomm/themedicon.h
include/giomm-%%API_VERSION%%/giomm/threadedsocketservice.h
include/giomm-%%API_VERSION%%/giomm/unixconnection.h
+include/giomm-%%API_VERSION%%/giomm/unixcredentialsmessage.h
+include/giomm-%%API_VERSION%%/giomm/unixfdlist.h
+include/giomm-%%API_VERSION%%/giomm/unixfdmessage.h
include/giomm-%%API_VERSION%%/giomm/unixinputstream.h
include/giomm-%%API_VERSION%%/giomm/unixoutputstream.h
include/giomm-%%API_VERSION%%/giomm/volume.h
@@ -177,6 +221,9 @@ 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/private/variant_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/variantiter_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/varianttype_p.h
include/glibmm-%%API_VERSION%%/glibmm/property.h
include/glibmm-%%API_VERSION%%/glibmm/propertyproxy.h
include/glibmm-%%API_VERSION%%/glibmm/propertyproxy_base.h
@@ -204,6 +251,10 @@ 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/variant.h
+include/glibmm-%%API_VERSION%%/glibmm/variant_basictypes.h
+include/glibmm-%%API_VERSION%%/glibmm/variantiter.h
+include/glibmm-%%API_VERSION%%/glibmm/varianttype.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
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 7d1b55e91d0a..caa250ad4313 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.189 2010/04/01 14:24:30 kwm Exp $
+# $MCom: ports/devel/gnome-vfs/Makefile,v 1.191 2010/09/29 12:30:29 kwm Exp $
#
PORTNAME= gnome-vfs
-PORTVERSION= 2.24.3
-PORTREVISION?= 1
+PORTVERSION= 2.24.4
+PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 5a89b547e6a7..3f8cf3778131 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.24.3.tar.bz2) = 646a2672c6e7e4ebff6a798b0fb7cc90
-SHA256 (gnome2/gnome-vfs-2.24.3.tar.bz2) = 3b0f342e79813bfc11d8e636db96b3ffd16c9ca48b07306410e09a3fd1065b4a
-SIZE (gnome2/gnome-vfs-2.24.3.tar.bz2) = 1830456
+MD5 (gnome2/gnome-vfs-2.24.4.tar.bz2) = a05fab03eeef10a47dd156b758982f2e
+SHA256 (gnome2/gnome-vfs-2.24.4.tar.bz2) = 62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa
+SIZE (gnome2/gnome-vfs-2.24.4.tar.bz2) = 1890370
diff --git a/devel/gnome-vfs/files/patch-configure b/devel/gnome-vfs/files/patch-configure
index 7865fc3fbb2c..e44e93476014 100644
--- a/devel/gnome-vfs/files/patch-configure
+++ b/devel/gnome-vfs/files/patch-configure
@@ -1,54 +1,37 @@
---- configure.orig 2009-10-10 11:55:11.000000000 -0400
-+++ configure 2009-10-10 11:55:14.000000000 -0400
-@@ -8433,7 +8433,7 @@ fi
-
+--- configure.orig 2010-09-29 07:03:15.000000000 +0000
++++ configure 2010-09-29 07:09:42.000000000 +0000
+@@ -8424,7 +8424,7 @@
+ # On IRIX 5.3, sys/types and inttypes.h are conflicting.
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=`$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
- $as_echo_n "(cached) " >&6
- else
-+ ac_check_lib_save_LIBS=$LIBS
-+ LIBS="-lintl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -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
- { $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'}
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+@@ -14465,6 +14465,7 @@
cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ #define HAVE_NGETTEXT 1
_ACEOF
+ LIBS="-lintl $LIBS"
have_ngettext=yes
else
- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-@@ -26068,7 +26072,7 @@ if test "${openssl_libs+set}" = set; the
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+@@ -17694,7 +17695,7 @@
$as_echo_n "(cached) " >&6
else
- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -26363,7 +26367,7 @@ if test "${openssl_libs+set}" = set; the
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -17824,7 +17825,7 @@
$as_echo_n "(cached) " >&6
else
- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in
index 6567e62042f2..68798e37cc53 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.26 2010/04/02 21:50:06 kwm Exp $
+# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.28 2010/09/29 12:30:29 kwm Exp $
#
# Restore gconf keys of libgnome.
diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in
index 0fc15088ae8b..b9dc1ffa789a 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.26 2010/04/02 21:50:06 kwm Exp $
+# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.28 2010/09/29 12:30:29 kwm Exp $
#
# Restore gconf keys of libgnome.
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 5d88f02a9c98..a093619c8b0e 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Logvinov <avl@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gobject-introspection/Makefile,v 1.8 2010/04/22 15:11:23 kwm Exp $
+# $MCom: ports/devel/gobject-introspection/Makefile,v 1.26 2010/10/07 10:28:00 kwm Exp $
#
PORTNAME= gobject-introspection
-PORTVERSION= 0.6.14
+PORTVERSION= 0.9.12
CATEGORIES= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -22,7 +22,7 @@ LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi \
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack glib20
+USE_GNOME= gnomehack glib20 ltverhack
USE_PYTHON= yes
USE_BISON= both
USE_GETTEXT= yes
@@ -32,6 +32,10 @@ MAKE_JOBS_UNSAFE=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --disable-tests
+
+# Force it to put the .cache in ${WRKSRC} instead of ~/.cache. ports/143260
+MAKE_ENV= HOME=${WRKDIR}
MAN1= g-ir-compiler.1 g-ir-generate.1 g-ir-scanner.1
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index cce161879a1b..57ea68928bcd 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gobject-introspection-0.6.14.tar.bz2) = 7ea9be9a347b5c408fd3c3907803de9b
-SHA256 (gnome2/gobject-introspection-0.6.14.tar.bz2) = c4713bcbcebb06861738a8f630ab05289666e631f42f7abbf2e836978db7eba6
-SIZE (gnome2/gobject-introspection-0.6.14.tar.bz2) = 763182
+MD5 (gnome2/gobject-introspection-0.9.12.tar.bz2) = 260ba5e77b5c0de0e7d8faf63ecbfee7
+SHA256 (gnome2/gobject-introspection-0.9.12.tar.bz2) = 9c0060d66d14a060057a1fc005be73675a1b8a00d4968ce8e78ff2d6b9f84e81
+SIZE (gnome2/gobject-introspection-0.9.12.tar.bz2) = 1050788
diff --git a/devel/gobject-introspection/files/patch-gir_Makefile.in b/devel/gobject-introspection/files/patch-gir_Makefile.in
index f56e9f69b115..f25f14725aef 100644
--- a/devel/gobject-introspection/files/patch-gir_Makefile.in
+++ b/devel/gobject-introspection/files/patch-gir_Makefile.in
@@ -1,15 +1,15 @@
---- gir/Makefile.in.orig 2010-06-06 15:58:29.000000000 -0400
-+++ gir/Makefile.in 2010-06-06 15:59:15.000000000 -0400
-@@ -436,14 +436,13 @@ GLib_2_0_gir_SCANNERFLAGS = --noclosure
+--- gir/Makefile.in.orig 2010-09-29 01:50:46.000000000 +0000
++++ gir/Makefile.in 2010-09-29 01:52:35.000000000 +0000
+@@ -393,13 +393,13 @@
GLib_2_0_gir_PACKAGES = glib-2.0
- GLib_2_0_gir_CFLAGS = $(CPPFLAGS) \
+ GLib_2_0_gir_CFLAGS = \
-I$(GLIB_INCLUDEDIR) \
- -I$(GLIB_LIBDIR)/glib-2.0/include \
++ -I$(GLIB_INCLUDEDIR)/.. \
-DGETTEXT_PACKAGE=Dummy \
-DGLIB_COMPILATION \
-D__G_I18N_LIB_H__
- GLib_2_0_gir_ASSERTIONS = GLib-2.0.xpath
GLib_2_0_gir_FILES = \
- $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
+ $(GLIB_INCLUDEDIR)/glibconfig.h \
diff --git a/devel/gobject-introspection/files/patch-girepository_ginfo.c b/devel/gobject-introspection/files/patch-girepository_ginfo.c
deleted file mode 100644
index 794bf443c8aa..000000000000
--- a/devel/gobject-introspection/files/patch-girepository_ginfo.c
+++ /dev/null
@@ -1,46 +0,0 @@
---- girepository/ginfo.c.orig 2010-06-01 15:48:36.000000000 -0400
-+++ girepository/ginfo.c 2010-06-06 16:02:36.000000000 -0400
-@@ -2110,6 +2110,9 @@ g_constant_info_get_type (GIConstantInfo
- return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + 8);
- }
-
-+#define DO_ALIGNED_COPY(dest_addr, src_addr, type) \
-+ memcpy((dest_addr), (src_addr), sizeof(type))
-+
- gint
- g_constant_info_get_value (GIConstantInfo *info,
- GArgument *value)
-@@ -2148,16 +2151,16 @@ g_constant_info_get_value (GIConstantInf
- value->v_uint32 = *(guint32*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_INT64:
-- value->v_int64 = *(gint64*)&rinfo->typelib->data[blob->offset];
-+ DO_ALIGNED_COPY(&value->v_int64, &rinfo->typelib->data[blob->offset], gint64);
- break;
- case GI_TYPE_TAG_UINT64:
-- value->v_uint64 = *(guint64*)&rinfo->typelib->data[blob->offset];
-+ DO_ALIGNED_COPY(&value->v_uint64, &rinfo->typelib->data[blob->offset], guint64);
- break;
- case GI_TYPE_TAG_FLOAT:
-- value->v_float = *(gfloat*)&rinfo->typelib->data[blob->offset];
-+ DO_ALIGNED_COPY(&value->v_float, &rinfo->typelib->data[blob->offset], gfloat);
- break;
- case GI_TYPE_TAG_DOUBLE:
-- value->v_double = *(gdouble*)&rinfo->typelib->data[blob->offset];
-+ DO_ALIGNED_COPY(&value->v_double, &rinfo->typelib->data[blob->offset], gdouble);
- break;
- case GI_TYPE_TAG_TIME_T:
- value->v_long = *(long*)&rinfo->typelib->data[blob->offset];
-@@ -2175,10 +2178,10 @@ g_constant_info_get_value (GIConstantInf
- value->v_uint = *(guint*)&rinfo->typelib->data[blob->offset];
- break;
- case GI_TYPE_TAG_LONG:
-- value->v_long = *(glong*)&rinfo->typelib->data[blob->offset];
-+ DO_ALIGNED_COPY(&value->v_long, &rinfo->typelib->data[blob->offset], glong);
- break;
- case GI_TYPE_TAG_ULONG:
-- value->v_ulong = *(gulong*)&rinfo->typelib->data[blob->offset];
-+ DO_ALIGNED_COPY(&value->v_ulong, &rinfo->typelib->data[blob->offset], gulong);
- break;
- }
- }
diff --git a/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py b/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py
deleted file mode 100644
index cb77d1c7ac7b..000000000000
--- a/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- giscanner/sourcescanner.py.orig
-+++ giscanner/sourcescanner.py
-@@ -196,7 +196,7 @@ class SourceSymbol(object):
- class SourceScanner(object):
-
- def __init__(self):
-- with LibtoolImporter:
-+ with LibtoolImporter(None, None):
- from giscanner._giscanner import SourceScanner
- self._scanner = SourceScanner()
- self._filenames = []
diff --git a/devel/gobject-introspection/files/patch-giscanner_xmlwriter.py b/devel/gobject-introspection/files/patch-giscanner_xmlwriter.py
deleted file mode 100644
index 94b3ca939d52..000000000000
--- a/devel/gobject-introspection/files/patch-giscanner_xmlwriter.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- giscanner/xmlwriter.py.orig
-+++ giscanner/xmlwriter.py
-@@ -67,7 +67,7 @@ def collect_attributes(tag_name, attributes, self_indent,
- return attr_value
-
-
--with LibtoolImporter:
-+with LibtoolImporter(None, None):
- from giscanner._giscanner import collect_attributes
-
-
diff --git a/devel/gobject-introspection/files/patch-tests_Makefile.in b/devel/gobject-introspection/files/patch-tests_Makefile.in
new file mode 100644
index 000000000000..a96e8a48d708
--- /dev/null
+++ b/devel/gobject-introspection/files/patch-tests_Makefile.in
@@ -0,0 +1,18 @@
+--- tests/Makefile.in.orig 2010-09-21 16:31:48.000000000 +0000
++++ tests/Makefile.in 2010-09-21 16:33:10.000000000 +0000
+@@ -819,6 +819,7 @@
+ $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate \
+ --namespace=Everything --nsversion=1.0 \
+ --add-include-path=$(top_builddir)/gir --include=Gio-2.0 \
++ --libtool="$(LIBTOOL)" \
+ --library=libeverything-1.0.la --output=$@ \
+ everything.h everything.c
+
+@@ -826,6 +827,7 @@
+ $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate \
+ --namespace=GIMarshallingTests --symbol-prefix=gi_marshalling_tests --nsversion=1.0 \
+ --add-include-path=$(top_builddir)/gir --include=Gio-2.0 \
++ --libtool="$(LIBTOOL)" \
+ --library=libgimarshallingtests-1.0.la --output=$@ \
+ $(srcdir)/gimarshallingtests.h $(srcdir)/gimarshallingtests.c
+
diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist
index 7588b683930d..c39c55aa80c4 100644
--- a/devel/gobject-introspection/pkg-plist
+++ b/devel/gobject-introspection/pkg-plist
@@ -1,14 +1,30 @@
+bin/g-ir-annotation-tool
bin/g-ir-compiler
bin/g-ir-generate
bin/g-ir-scanner
+include/gobject-introspection-1.0/giarginfo.h
include/gobject-introspection-1.0/gibaseinfo.h
+include/gobject-introspection-1.0/gicallableinfo.h
+include/gobject-introspection-1.0/giconstantinfo.h
+include/gobject-introspection-1.0/gienuminfo.h
+include/gobject-introspection-1.0/gierrordomaininfo.h
+include/gobject-introspection-1.0/gifieldinfo.h
include/gobject-introspection-1.0/gifunctioninfo.h
+include/gobject-introspection-1.0/giinterfaceinfo.h
+include/gobject-introspection-1.0/giobjectinfo.h
+include/gobject-introspection-1.0/gipropertyinfo.h
+include/gobject-introspection-1.0/giregisteredtypeinfo.h
include/gobject-introspection-1.0/girepository.h
include/gobject-introspection-1.0/girffi.h
+include/gobject-introspection-1.0/gisignalinfo.h
+include/gobject-introspection-1.0/gistructinfo.h
+include/gobject-introspection-1.0/gitypeinfo.h
include/gobject-introspection-1.0/gitypelib.h
include/gobject-introspection-1.0/gitypes.h
-lib/girepository-1.0/Everything-1.0.typelib
-lib/girepository-1.0/GIMarshallingTests-1.0.typelib
+include/gobject-introspection-1.0/giunioninfo.h
+include/gobject-introspection-1.0/givfuncinfo.h
+lib/girepository-1.0/DBus-1.0.typelib
+lib/girepository-1.0/DBusGLib-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
@@ -29,6 +45,9 @@ 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/annotationmain.py
+lib/gobject-introspection/giscanner/annotationmain.pyc
+lib/gobject-introspection/giscanner/annotationmain.pyo
lib/gobject-introspection/giscanner/annotationparser.py
lib/gobject-introspection/giscanner/annotationparser.pyc
lib/gobject-introspection/giscanner/annotationparser.pyo
@@ -38,30 +57,36 @@ 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/codegen.py
+lib/gobject-introspection/giscanner/codegen.pyc
+lib/gobject-introspection/giscanner/codegen.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/gdumpparser.py
+lib/gobject-introspection/giscanner/gdumpparser.pyc
+lib/gobject-introspection/giscanner/gdumpparser.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/introspectablepass.py
+lib/gobject-introspection/giscanner/introspectablepass.pyc
+lib/gobject-introspection/giscanner/introspectablepass.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/maintransformer.py
+lib/gobject-introspection/giscanner/maintransformer.pyc
+lib/gobject-introspection/giscanner/maintransformer.pyo
+lib/gobject-introspection/giscanner/message.py
+lib/gobject-introspection/giscanner/message.pyc
+lib/gobject-introspection/giscanner/message.pyo
lib/gobject-introspection/giscanner/odict.py
lib/gobject-introspection/giscanner/odict.pyc
lib/gobject-introspection/giscanner/odict.pyo
@@ -74,6 +99,9 @@ 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/testcodegen.py
+lib/gobject-introspection/giscanner/testcodegen.pyc
+lib/gobject-introspection/giscanner/testcodegen.pyo
lib/gobject-introspection/giscanner/transformer.py
lib/gobject-introspection/giscanner/transformer.pyc
lib/gobject-introspection/giscanner/transformer.pyo
@@ -86,20 +114,12 @@ 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
-lib/libgirepository-gimarshallingtests-1.0.a
-lib/libgirepository-gimarshallingtests-1.0.la
-lib/libgirepository-gimarshallingtests-1.0.so
-lib/libgirepository-gimarshallingtests-1.0.so.1
+lib/libgirepository-1.0.so.1
libdata/pkgconfig/gobject-introspection-1.0.pc
libdata/pkgconfig/gobject-introspection-no-export-1.0.pc
share/aclocal/introspection.m4
-share/gir-1.0/Everything-1.0.gir
-share/gir-1.0/GIMarshallingTests-1.0.gir
+share/gir-1.0/DBus-1.0.gir
+share/gir-1.0/DBusGLib-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
@@ -115,9 +135,61 @@ share/gir-1.0/xft-2.0.gir
share/gir-1.0/xlib-2.0.gir
share/gir-1.0/xrandr-1.3.gir
share/gobject-introspection-1.0/Makefile.introspection
+share/gobject-introspection-1.0/gdump.c
+share/gobject-introspection-1.0/tests/everything.c
+share/gobject-introspection-1.0/tests/everything.h
+share/gobject-introspection-1.0/tests/gimarshallingtests.c
+share/gobject-introspection-1.0/tests/gimarshallingtests.h
+share/gobject-introspection-1.0/tests/regress.c
+share/gobject-introspection-1.0/tests/regress.h
+share/gtk-doc/html/gi/annotation-glossary.html
+share/gtk-doc/html/gi/gi-GIArgInfo.html
+share/gtk-doc/html/gi/gi-GIBaseInfo.html
+share/gtk-doc/html/gi/gi-GICallableInfo.html
+share/gtk-doc/html/gi/gi-GIConstantInfo.html
+share/gtk-doc/html/gi/gi-GIEnumInfo.html
+share/gtk-doc/html/gi/gi-GIErrorDomainInfo.html
+share/gtk-doc/html/gi/gi-GIFieldInfo.html
+share/gtk-doc/html/gi/gi-GIFunctionInfo.html
+share/gtk-doc/html/gi/gi-GIInterfaceInfo.html
+share/gtk-doc/html/gi/gi-GIObjectInfo.html
+share/gtk-doc/html/gi/gi-GIPropertyInfo.html
+share/gtk-doc/html/gi/gi-GIRegisteredTypeInfo.html
+share/gtk-doc/html/gi/gi-GISignalInfo.html
+share/gtk-doc/html/gi/gi-GIStructInfo.html
+share/gtk-doc/html/gi/gi-GITypeInfo.html
+share/gtk-doc/html/gi/gi-GIUnionInfo.html
+share/gtk-doc/html/gi/gi-GIVFuncInfo.html
+share/gtk-doc/html/gi/gi-ffi.html
+share/gtk-doc/html/gi/gi-gir-reference.html
+share/gtk-doc/html/gi/gi-gir.html
+share/gtk-doc/html/gi/gi-girepository.html
+share/gtk-doc/html/gi/gi-girffi.html
+share/gtk-doc/html/gi/gi-gtypelib.html
+share/gtk-doc/html/gi/gi-libgirepository.html
+share/gtk-doc/html/gi/gi-overview.html
+share/gtk-doc/html/gi/gi-repository-structs.html
+share/gtk-doc/html/gi/gi-struct-hierarchy.html
+share/gtk-doc/html/gi/gi-typelib.html
+share/gtk-doc/html/gi/gi.devhelp
+share/gtk-doc/html/gi/gi.devhelp2
+share/gtk-doc/html/gi/girepository.html
+share/gtk-doc/html/gi/glib.html
+share/gtk-doc/html/gi/home.png
+share/gtk-doc/html/gi/index.html
+share/gtk-doc/html/gi/index.sgml
+share/gtk-doc/html/gi/left.png
+share/gtk-doc/html/gi/overview.png
+share/gtk-doc/html/gi/right.png
+share/gtk-doc/html/gi/style.css
+share/gtk-doc/html/gi/up.png
+@dirrm share/gtk-doc/html/gi
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
+@dirrm share/gobject-introspection-1.0/tests
@dirrm share/gobject-introspection-1.0
-@dirrm include/gobject-introspection-1.0
+@dirrmtry share/gir-1.0
@dirrmtry lib/girepository-1.0
@dirrm lib/gobject-introspection/giscanner
@dirrm lib/gobject-introspection
-@dirrmtry share/gir-1.0
+@dirrm include/gobject-introspection-1.0
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index bb6e05d5bd34..50423b59ed44 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.4 2010/07/13 12:41:36 kwm Exp $
+# $MCom: ports/devel/gvfs/Makefile,v 1.66 2010/11/13 01:48:28 kwm Exp $
#
PORTNAME= gvfs
-PORTVERSION= 1.6.3
-PORTREVISION= 1
+PORTVERSION= 1.6.6
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,7 +17,7 @@ COMMENT= GNOME virtual file system
LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \
hal.1:${PORTSDIR}/sysutils/hal \
- soup-2.4.1:${PORTSDIR}/devel/libsoup \
+ soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \
gnome-keyring:${PORTSDIR}/security/gnome-keyring \
avahi-client.3:${PORTSDIR}/net/avahi-app
RUN_DEPENDS= gnome-mount:${PORTSDIR}/sysutils/gnome-mount
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index 74af4a70b7f5..5cd6abd7ebc4 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gvfs-1.6.3.tar.bz2) = 1c2e76b6c7c7ed603bab05753f971f82
-SHA256 (gnome2/gvfs-1.6.3.tar.bz2) = 4e3fe2dd80e5baaf4c1844560f6a787b144a917de1cb457b41efcb338477e760
-SIZE (gnome2/gvfs-1.6.3.tar.bz2) = 1347090
+SHA256 (gnome2/gvfs-1.6.6.tar.bz2) = 902890deb6a670f642180ea958406ebb02af1d5867a464c87e493d56f1dde7bd
+SIZE (gnome2/gvfs-1.6.6.tar.bz2) = 1387796
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
index 045d2c2b0c27..353491c5fe39 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -72,6 +72,7 @@ share/gvfs/mounts/sftp.mount
share/gvfs/mounts/trash.mount
%%GPHOTO2%%share/gvfs/remote-volume-monitors/gphoto2.monitor
share/gvfs/remote-volume-monitors/hal.monitor
+share/locale/af/LC_MESSAGES/gvfs.mo
share/locale/ar/LC_MESSAGES/gvfs.mo
share/locale/as/LC_MESSAGES/gvfs.mo
share/locale/ast/LC_MESSAGES/gvfs.mo
@@ -132,6 +133,7 @@ share/locale/ta/LC_MESSAGES/gvfs.mo
share/locale/te/LC_MESSAGES/gvfs.mo
share/locale/th/LC_MESSAGES/gvfs.mo
share/locale/tr/LC_MESSAGES/gvfs.mo
+share/locale/ug/LC_MESSAGES/gvfs.mo
share/locale/uk/LC_MESSAGES/gvfs.mo
share/locale/vi/LC_MESSAGES/gvfs.mo
share/locale/zh_CN/LC_MESSAGES/gvfs.mo
@@ -145,6 +147,8 @@ share/locale/zh_TW/LC_MESSAGES/gvfs.mo
@dirrmtry etc/profile.d
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile
index f086065352e6..2eda5da51dbc 100644
--- a/devel/json-glib/Makefile
+++ b/devel/json-glib/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/json-glib/Makefile,v 1.8 2010/03/20 01:19:18 marcus Exp $
+# $MCom: ports/devel/json-glib/Makefile,v 1.12 2010/09/25 15:34:43 kwm Exp $
#
PORTNAME= json-glib
-PORTVERSION= 0.10.4
+PORTVERSION= 0.12.0
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/json-glib/distinfo b/devel/json-glib/distinfo
index 3cea6fe6f6d9..2bd6ad898430 100644
--- a/devel/json-glib/distinfo
+++ b/devel/json-glib/distinfo
@@ -1,3 +1,3 @@
-MD5 (json-glib-0.10.4.tar.bz2) = cb207a673438d1bc833eca6fc93f80e1
-SHA256 (json-glib-0.10.4.tar.bz2) = efd8b341d3f9e03cc35b7e2eb353b8336cf7a5560ad273b07e85f7a7a46d5ed9
-SIZE (json-glib-0.10.4.tar.bz2) = 389457
+MD5 (json-glib-0.12.0.tar.bz2) = ee611ef8d7b6e67a14021b32d66b7d1a
+SHA256 (json-glib-0.12.0.tar.bz2) = e22978aadbe92a12e4cef2f494eb3571ac5c983ad05cff4256328157f1112842
+SIZE (json-glib-0.12.0.tar.bz2) = 417623
diff --git a/devel/json-glib/pkg-plist b/devel/json-glib/pkg-plist
index 40f6fcd59311..4a0bcfbde4f7 100644
--- a/devel/json-glib/pkg-plist
+++ b/devel/json-glib/pkg-plist
@@ -1,8 +1,10 @@
+include/json-glib-1.0/json-glib/json-builder.h
include/json-glib-1.0/json-glib/json-enum-types.h
include/json-glib-1.0/json-glib/json-generator.h
include/json-glib-1.0/json-glib/json-glib.h
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-reader.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
@@ -11,8 +13,10 @@ lib/libjson-glib-1.0.la
lib/libjson-glib-1.0.so
lib/libjson-glib-1.0.so.0
libdata/pkgconfig/json-glib-1.0.pc
+%%DOCSDIR%%/JsonBuilder.html
%%DOCSDIR%%/JsonGenerator.html
%%DOCSDIR%%/JsonParser.html
+%%DOCSDIR%%/JsonReader.html
%%DOCSDIR%%/annotation-glossary.html
%%DOCSDIR%%/ch01.html
%%DOCSDIR%%/ch02.html
@@ -27,6 +31,7 @@ libdata/pkgconfig/json-glib-1.0.pc
%%DOCSDIR%%/ix04.html
%%DOCSDIR%%/ix05.html
%%DOCSDIR%%/ix06.html
+%%DOCSDIR%%/ix07.html
%%DOCSDIR%%/json-advanced.html
%%DOCSDIR%%/json-base.html
%%DOCSDIR%%/json-glib-Boxed-Types-Serialization.html
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 2c38fdc5873c..e89182d4ff92 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libbonobo/Makefile,v 1.81 2010/04/02 18:10:40 kwm Exp $
+# $MCom: ports/devel/libbonobo/Makefile,v 1.84 2010/09/26 20:57:33 kwm Exp $
#
PORTNAME= libbonobo
-PORTVERSION= 2.24.3
-PORTREVISION?= 1
+PORTVERSION= 2.32.0
+PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,8 +20,7 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
-LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
- dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_GMAKE= yes
USE_BISON= build
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index dbbb5091b584..5c05f1acd8dd 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libbonobo-2.24.3.tar.bz2) = b217cef6a187505290c66c5bf8225d38
-SHA256 (gnome2/libbonobo-2.24.3.tar.bz2) = 5310957fa90691689c0557218b8833f681666cae160bd84e1f2c2705189a4ebe
-SIZE (gnome2/libbonobo-2.24.3.tar.bz2) = 1354929
+MD5 (gnome2/libbonobo-2.32.0.tar.bz2) = bc2b25b03ca57866a61e04852f2f53fd
+SHA256 (gnome2/libbonobo-2.32.0.tar.bz2) = b8b8037d5e8e37f39395a2a2fba7f2fb3d5b53ecedc3d419181912b831ab1349
+SIZE (gnome2/libbonobo-2.32.0.tar.bz2) = 1373333
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index 161fb13c9378..9ac24260a1ba 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -131,6 +131,7 @@ share/locale/he/LC_MESSAGES/libbonobo-2.0.mo
share/locale/hi/LC_MESSAGES/libbonobo-2.0.mo
share/locale/hr/LC_MESSAGES/libbonobo-2.0.mo
share/locale/hu/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/hy/LC_MESSAGES/libbonobo-2.0.mo
share/locale/id/LC_MESSAGES/libbonobo-2.0.mo
share/locale/is/LC_MESSAGES/libbonobo-2.0.mo
share/locale/it/LC_MESSAGES/libbonobo-2.0.mo
@@ -215,6 +216,8 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index fe6801374d4b..40e5358b29c5 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -3,22 +3,19 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgdata/Makefile,v 1.9 2010/03/30 11:24:13 kwm Exp $
+# $MCom: ports/devel/libgdata/Makefile,v 1.14 2010/09/30 19:39:17 kwm Exp $
#
PORTNAME= libgdata
-PORTVERSION= 0.6.4
-PORTREVISION= 1
+PORTVERSION= 0.6.5
CATEGORIES= devel
MASTER_SITES= GNOME
MAINTAINER= kwm@FreeBSD.org
COMMENT= GLib based implimentation of the GData protocol
-BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup \
- g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup
-RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup
+BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS= soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome
USE_BZIP2= yes
USE_LDCONFIG= yes
diff --git a/devel/libgdata/distinfo b/devel/libgdata/distinfo
index 49d1b0deb532..687fe9bbabde 100644
--- a/devel/libgdata/distinfo
+++ b/devel/libgdata/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgdata-0.6.4.tar.bz2) = 7efdef75d1b59177d119f689522d00ba
-SHA256 (libgdata-0.6.4.tar.bz2) = 56c3f3cbd0bf8c410ebdff2d8a57eeb1db7dbc1bb342bf6f43f89700ef517d9d
-SIZE (libgdata-0.6.4.tar.bz2) = 1003963
+MD5 (libgdata-0.6.5.tar.bz2) = e12f52a3d25c25016856c64ca0331221
+SHA256 (libgdata-0.6.5.tar.bz2) = dcb82f7162d69549512444376da2cdea65650ee4dae4d00eed7fbbd3387ddf2c
+SIZE (libgdata-0.6.5.tar.bz2) = 1015870
diff --git a/devel/libgdata/pkg-plist b/devel/libgdata/pkg-plist
index 6ebbc629022c..6469866830a5 100644
--- a/devel/libgdata/pkg-plist
+++ b/devel/libgdata/pkg-plist
@@ -119,6 +119,8 @@ share/doc/gdata/GDataYouTubeQuery.html
share/doc/gdata/GDataYouTubeService.html
share/doc/gdata/GDataYouTubeState.html
share/doc/gdata/GDataYouTubeVideo.html
+share/doc/gdata/annotation-glossary.html
+share/doc/gdata/api-index-deprecated.html
share/doc/gdata/api-index-full.html
share/doc/gdata/ch01.html
share/doc/gdata/ch02.html
@@ -140,7 +142,6 @@ share/doc/gdata/gdata.devhelp2
share/doc/gdata/home.png
share/doc/gdata/index.html
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
@@ -148,6 +149,7 @@ share/doc/gdata/ix06.html
share/doc/gdata/ix07.html
share/doc/gdata/ix08.html
share/doc/gdata/ix09.html
+share/doc/gdata/ix10.html
share/doc/gdata/left.png
share/doc/gdata/pt01.html
share/doc/gdata/pt02.html
diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile
index 59d6f00671d0..d53acadf7c5c 100644
--- a/devel/libgee/Makefile
+++ b/devel/libgee/Makefile
@@ -6,14 +6,18 @@
#
PORTNAME= libgee
-PORTVERSION= 0.5.0
+PORTVERSION= 0.6.0
CATEGORIES= devel
-MASTER_SITES= GNOME/sources/${PORTNAME}/0.5/
+MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:R}/
MAINTAINER= kwm@FreeBSD.org
COMMENT= GObject collection library
+BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-introspection=yes
+USE_BZIP2= yes
USE_GNOME= glib20 gnomehack
USE_LDCONFIG= yes
diff --git a/devel/libgee/distinfo b/devel/libgee/distinfo
index fe5c9d85345b..24d9fd7f55e4 100644
--- a/devel/libgee/distinfo
+++ b/devel/libgee/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgee-0.5.0.tar.gz) = e344c13851e991dd24b4e9ebbc3f8fb7
-SHA256 (libgee-0.5.0.tar.gz) = 5986ac76c78a5da4800916dbe477ab8196ee86f6777d638060ccded248cb38be
-SIZE (libgee-0.5.0.tar.gz) = 675954
+MD5 (libgee-0.6.0.tar.bz2) = 4eb513b23ab6ea78884989518a4acf6f
+SHA256 (libgee-0.6.0.tar.bz2) = e586678d0a88637abeaaf850b62231000772e79ea6d9c4b45dc3cea99f778a7a
+SIZE (libgee-0.6.0.tar.bz2) = 477609
diff --git a/devel/libgee/files/patch-gee_Makefile.in b/devel/libgee/files/patch-gee_Makefile.in
new file mode 100644
index 000000000000..6a506df72736
--- /dev/null
+++ b/devel/libgee/files/patch-gee_Makefile.in
@@ -0,0 +1,11 @@
+--- gee/Makefile.in.orig 2010-08-08 13:36:58.000000000 +0200
++++ gee/Makefile.in 2010-08-08 13:37:42.000000000 +0200
+@@ -872,7 +872,7 @@
+ touch $@
+
+ @HAVE_INTROSPECTION_TRUE@Gee-1.0.typelib: Gee-1.0.gir
+-@HAVE_INTROSPECTION_TRUE@ @INTROSPECTION_COMPILER@ --shared-library=libgee -o $@ $^
++@HAVE_INTROSPECTION_TRUE@ @INTROSPECTION_COMPILER@ --shared-library=libgee Gee-1.0.gir -o $@ $^
+
+ # 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.
diff --git a/devel/libgee/pkg-plist b/devel/libgee/pkg-plist
index 8d0569d9059f..970a894ce808 100644
--- a/devel/libgee/pkg-plist
+++ b/devel/libgee/pkg-plist
@@ -2,10 +2,12 @@ include/gee-1.0/gee.h
lib/libgee.la
lib/libgee.so
lib/libgee.so.2
+lib/girepository-1.0/Gee-1.0.typelib
libdata/pkgconfig/gee-1.0.pc
share/gir-1.0/Gee-1.0.gir
share/vala/vapi/gee-1.0.vapi
@dirrm share/vala/vapi
@dirrm share/vala
-@dirrm share/gir-1.0
+@dirrmtry share/gir-1.0
+@dirrmtry lib/girepository-1.0
@dirrm include/gee-1.0
diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index b678af304f23..56229781611e 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -3,26 +3,27 @@
# Whom: Andreas Kohn <andreas@syndrom23.de>
#
# $FreeBSD$
-# $MCom: ports/devel/libnotify/Makefile,v 1.3 2008/11/30 19:42:57 marcus Exp $
+# $MCom: ports/devel/libnotify/Makefile,v 1.10 2010/10/15 06:43:06 avl Exp $
#
PORTNAME= libnotify
-PORTVERSION= 0.4.5
-PORTREVISION= 4
+PORTVERSION= 0.5.2
CATEGORIES= devel gnome
-MASTER_SITES= http://www.galago-project.org/files/releases/source/libnotify/
+MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= A library for desktop notifications
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
+USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget intlhack glib20 gtk20 ltverhack
USE_GETTEXT= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
-CONFIGURE_ARGS= --without-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libnotify/distinfo b/devel/libnotify/distinfo
index fa3d33aa8905..9e00644985d7 100644
--- a/devel/libnotify/distinfo
+++ b/devel/libnotify/distinfo
@@ -1,3 +1,3 @@
-MD5 (libnotify-0.4.5.tar.gz) = 472e2c1f808848365572a9b024d9e8f5
-SHA256 (libnotify-0.4.5.tar.gz) = 0799db8ea1500b65a477421a8c930cc8c8b0bbc0596e55ea1601e2542f3fb0d9
-SIZE (libnotify-0.4.5.tar.gz) = 364142
+MD5 (libnotify-0.5.2.tar.bz2) = 4361058ae4e28a9ffce6764e7d03acd1
+SHA256 (libnotify-0.5.2.tar.bz2) = 1f6f1a2d6a0e009997c7ed31f6197f9bf09e9b45fb9cd54acabceea951d99062
+SIZE (libnotify-0.5.2.tar.bz2) = 310439
diff --git a/devel/libnotify/pkg-plist b/devel/libnotify/pkg-plist
index bc896db170d1..11162feb7453 100644
--- a/devel/libnotify/pkg-plist
+++ b/devel/libnotify/pkg-plist
@@ -1,18 +1,19 @@
bin/notify-send
include/libnotify/notification.h
include/libnotify/notify-enum-types.h
+include/libnotify/notify-features.h
include/libnotify/notify.h
lib/libnotify.a
lib/libnotify.la
lib/libnotify.so
lib/libnotify.so.1
libdata/pkgconfig/libnotify.pc
-share/gtk-doc/html/libnotify/NotifyNotification.html
share/gtk-doc/html/libnotify/ch01.html
share/gtk-doc/html/libnotify/home.png
share/gtk-doc/html/libnotify/index.html
share/gtk-doc/html/libnotify/index.sgml
share/gtk-doc/html/libnotify/left.png
+share/gtk-doc/html/libnotify/libnotify-notification.html
share/gtk-doc/html/libnotify/libnotify-notify.html
share/gtk-doc/html/libnotify/libnotify.devhelp
share/gtk-doc/html/libnotify/libnotify.devhelp2
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index 203ef854452d..acd86dde0833 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/liboobs/Makefile,v 1.46 2010/04/01 22:27:34 kwm Exp $
+# $MCom: ports/devel/liboobs/Makefile,v 1.50 2010/09/27 17:46:12 kwm Exp $
#
PORTNAME= liboobs
-PORTVERSION= 2.30.1
+PORTVERSION= 2.32.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/liboobs/distinfo b/devel/liboobs/distinfo
index 24d3c9763842..8c1a60acaf44 100644
--- a/devel/liboobs/distinfo
+++ b/devel/liboobs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/liboobs-2.30.1.tar.bz2) = 65abd1254c63aea04fc1879c21e0051d
-SHA256 (gnome2/liboobs-2.30.1.tar.bz2) = 591c938ef000bcb5357cf9b8329c6783c5f2e8d71bbab81c1961d220ed246091
-SIZE (gnome2/liboobs-2.30.1.tar.bz2) = 369861
+MD5 (gnome2/liboobs-2.32.0.tar.bz2) = 0bb40041b7227f9060ab51f3022115df
+SHA256 (gnome2/liboobs-2.32.0.tar.bz2) = 1b70061272b2c777d505b5b6c785e045d4297639dd0d4214d04dea154a9b63d6
+SIZE (gnome2/liboobs-2.32.0.tar.bz2) = 368347
diff --git a/devel/liboobs/pkg-plist b/devel/liboobs/pkg-plist
index a790cf8b2ba5..82d80e062c20 100644
--- a/devel/liboobs/pkg-plist
+++ b/devel/liboobs/pkg-plist
@@ -33,7 +33,7 @@ include/liboobs-1.0/oobs/oobs.h
lib/liboobs-1.a
lib/liboobs-1.la
lib/liboobs-1.so
-lib/liboobs-1.so.4
+lib/liboobs-1.so.5
libdata/pkgconfig/liboobs-1.pc
%%DOCSDIR%%/OobsGroup.html
%%DOCSDIR%%/OobsGroupsConfig.html
diff --git a/devel/libsoup-gnome/Makefile b/devel/libsoup-gnome/Makefile
new file mode 100644
index 000000000000..fafcadceb911
--- /dev/null
+++ b/devel/libsoup-gnome/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for: libgsf
+# Date created: 11 September 2002
+# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/libsoup-gnome/Makefile,v 1.1 2010/06/05 21:11:10 kwm Exp $
+#
+
+PORTREVISION= 0
+CATEGORIES= devel gnome
+PKGNAMESUFFIX= -gnome
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= A GNOME wrapper for libsoup
+
+MASTERDIR= ${.CURDIR}/../libsoup
+#BUILD_WRKSRC= ${WRKSRC}/gsf-gnome
+#INSTALL_WRKSRC= ${WRKSRC}/gsf-gnome
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+
+SOUP_SLAVE= yes
+
+#post-install:
+# @${MKDIR} ${PREFIX}/libdata/pkgconfig
+# @${INSTALL_DATA} ${WRKSRC}/libsoup-gnome-2.4.pc \
+# ${PREFIX}/libdata/pkgconfig/
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/libsoup-gnome/pkg-descr b/devel/libsoup-gnome/pkg-descr
new file mode 100644
index 000000000000..1ec2bfea440f
--- /dev/null
+++ b/devel/libsoup-gnome/pkg-descr
@@ -0,0 +1,16 @@
+Soup is a SOAP (Simple Object Access Protocol) implementation in C.
+
+It provides a queued asynchronous callback-based mechanism for sending and
+servicing SOAP requests, and a WSDL (Web Service Definition Language) for C
+compilers which generates client stubs and server skeletons for easily
+calling and implementing SOAP methods. It uses GLib and is designed to work
+well with GTK applications.
+
+Features:
+ * Completely Asynchronous
+ * Connection cache
+ * HTTP chunked transfer and persistent connections
+ * Authenticated HTTP, SOCKS4, and SOCKS5 proxy support
+ * SSL Support using OpenSSL
+ * Apache module server support
+ * Client digest authentication
diff --git a/devel/libsoup-gnome/pkg-plist b/devel/libsoup-gnome/pkg-plist
new file mode 100644
index 000000000000..500adeb165e8
--- /dev/null
+++ b/devel/libsoup-gnome/pkg-plist
@@ -0,0 +1,10 @@
+include/libsoup-gnome-%%VERSION%%/libsoup/soup-cookie-jar-sqlite.h
+include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome-features.h
+include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome.h
+lib/libsoup-gnome-%%VERSION%%.a
+lib/libsoup-gnome-%%VERSION%%.la
+lib/libsoup-gnome-%%VERSION%%.so
+lib/libsoup-gnome-%%VERSION%%.so.1
+libdata/pkgconfig/libsoup-gnome-%%VERSION%%.pc
+@dirrm include/libsoup-gnome-%%VERSION%%/libsoup
+@dirrm include/libsoup-gnome-%%VERSION%%
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 991311495bc5..81bb2b1f9cfb 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.12 2010/06/24 10:03:53 kwm Exp $
+# $MCom: ports/devel/libsoup/Makefile,v 1.90 2010/11/16 02:38:21 avl Exp $
#
PORTNAME= libsoup
-PORTVERSION= 2.30.2
-PORTREVISION?= 1
+PORTVERSION= 2.32.1
+PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,13 +20,7 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
-LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
- proxy.0:${PORTSDIR}/net/libproxy \
- gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
- sqlite3.8:${PORTSDIR}/databases/sqlite3
-
-USE_GETTEXT= yes
-USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack gconf2
+USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
@@ -37,18 +31,30 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
PLIST_SUB= VERSION="2.4"
+.include <bsd.port.pre.mk>
+
+.if defined(SOUP_SLAVE)
+LIB_DEPENDS+= soup-2.4.1:${PORTSDIR}/devel/libsoup \
+ proxy.0:${PORTSDIR}/net/libproxy \
+ gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
+ sqlite3.8:${PORTSDIR}/databases/sqlite3
+CONFIGURE_ARGS+=--with-gnome
+USE_GNOME+= gconf2
+.else
+BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+CONFIGURE_ARGS+=--without-gnome
+.endif
+
.if !defined(WITHOUT_SSL)
LIB_DEPENDS+= gnutls.40:${PORTSDIR}/security/gnutls
.else
CONFIGURE_ARGS+=--disable-ssl
.endif
-.include <bsd.port.pre.mk>
-
pre-everything::
@${ECHO_MSG} ""
@${ECHO_MSG} "libsoup has the following configurable option(s):"
- @${ECHO_MSG} " WITHOUT_SSL Disable GnuTLS SSL support"
+ @${ECHO_MSG} " WITHOUT_SSL Disable GnuTLS SSL support"
@${ECHO_MSG} ""
post-patch:
@@ -56,9 +62,27 @@ post-patch:
s|" == "|" = "|g' \
${WRKSRC}/configure
+.if defined(SOUP_SLAVE)
+do-build:
+ cd ${WRKSRC}/libsoup && ${GMAKE} libsoup-gnome-2.4.la
+
+do-install:
+ ${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.a ${PREFIX}/lib/
+ ${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.la ${PREFIX}/lib/
+ ${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so ${PREFIX}/lib/
+ ${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.1 ${PREFIX}/lib/
+ cd ${WRKSRC}/libsoup && ${GMAKE} install-libsoupgnomeincludeHEADERS
+.endif
+
post-install:
+.if defined(SOUP_SLAVE)
+ @${MKDIR} ${PREFIX}/libdata/pkgconfig
+ @${INSTALL_DATA} ${WRKSRC}/libsoup-gnome-2.4.pc \
+ ${PREFIX}/libdata/pkgconfig/
+.else
@${INSTALL_DATA} ${WRKSRC}/libsoup/soup-connection.h \
${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h
+.endif
.include <bsd.port.post.mk>
diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo
index 44dad240d554..e27ede1ff2da 100644
--- a/devel/libsoup/distinfo
+++ b/devel/libsoup/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/libsoup-2.30.2.tar.bz2) = f33b62063e76a9b1d5503363a3ed6a84
-SHA256 (gnome2/libsoup-2.30.2.tar.bz2) = 78ccbce84fccc74a49fb8168eeb409a6429a8a5854f197261d4108b8bb106bf6
-SIZE (gnome2/libsoup-2.30.2.tar.bz2) = 644337
+SHA256 (gnome2/libsoup-2.32.1.tar.bz2) = 8779da1b4d85f443f04ea8301f52c4a1943c10e4dc8d20dbcdb3652921de6b8e
+SIZE (gnome2/libsoup-2.32.1.tar.bz2) = 667140
diff --git a/devel/libsoup/files/patch-libsoup_Makefile.in b/devel/libsoup/files/patch-libsoup_Makefile.in
new file mode 100644
index 000000000000..15a468ce49bc
--- /dev/null
+++ b/devel/libsoup/files/patch-libsoup_Makefile.in
@@ -0,0 +1,19 @@
+--- libsoup/Makefile.in.orig 2010-05-14 16:28:56.000000000 +0200
++++ libsoup/Makefile.in 2010-05-14 16:31:03.000000000 +0200
+@@ -112,7 +112,6 @@
+ $(AM_CFLAGS) $(CFLAGS) $(libsoup_2_4_la_LDFLAGS) $(LDFLAGS) -o \
+ $@
+ @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_DEPENDENCIES = \
+-@BUILD_LIBSOUP_GNOME_TRUE@ libsoup-2.4.la $(am__DEPENDENCIES_1) \
+ @BUILD_LIBSOUP_GNOME_TRUE@ $(am__DEPENDENCIES_1) \
+ @BUILD_LIBSOUP_GNOME_TRUE@ $(am__DEPENDENCIES_1) \
+ @BUILD_LIBSOUP_GNOME_TRUE@ $(am__DEPENDENCIES_1) \
+@@ -473,7 +472,7 @@
+
+ @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
+ @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_LIBADD = \
+-@BUILD_LIBSOUP_GNOME_TRUE@ libsoup-2.4.la \
++@BUILD_LIBSOUP_GNOME_TRUE@ -lsoup-2.4 \
+ @BUILD_LIBSOUP_GNOME_TRUE@ $(GLIB_LIBS) \
+ @BUILD_LIBSOUP_GNOME_TRUE@ $(GCONF_LIBS) \
+ @BUILD_LIBSOUP_GNOME_TRUE@ $(LIBPROXY_LIBS) \
diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist
index 2c2f61bacba1..ab9adb28206a 100644
--- a/devel/libsoup/pkg-plist
+++ b/devel/libsoup/pkg-plist
@@ -36,20 +36,14 @@ include/libsoup-%%VERSION%%/libsoup/soup-uri.h
include/libsoup-%%VERSION%%/libsoup/soup-value-utils.h
include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc.h
include/libsoup-%%VERSION%%/libsoup/soup.h
-include/libsoup-gnome-%%VERSION%%/libsoup/soup-cookie-jar-sqlite.h
-include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome-features.h
-include/libsoup-gnome-%%VERSION%%/libsoup/soup-gnome.h
+lib/girepository-1.0/Soup-%%VERSION%%.typelib
lib/libsoup-%%VERSION%%.a
lib/libsoup-%%VERSION%%.la
lib/libsoup-%%VERSION%%.so
lib/libsoup-%%VERSION%%.so.1
-lib/libsoup-gnome-%%VERSION%%.a
-lib/libsoup-gnome-%%VERSION%%.la
-lib/libsoup-gnome-%%VERSION%%.so
-lib/libsoup-gnome-%%VERSION%%.so.1
libdata/pkgconfig/libsoup-%%VERSION%%.pc
-libdata/pkgconfig/libsoup-gnome-%%VERSION%%.pc
-@dirrm include/libsoup-gnome-%%VERSION%%/libsoup
-@dirrm include/libsoup-gnome-%%VERSION%%
+share/gir-1.0/Soup-%%VERSION%%.gir
@dirrm include/libsoup-%%VERSION%%/libsoup
@dirrm include/libsoup-%%VERSION%%
+@dirrmtry lib/girepository-1.0
+@dirrmtry share/gir-1.0
diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index 5e4b420edc7a..8fb470dd5e62 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -21,6 +21,8 @@ RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz \
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+BROKEN= Doesn't build with Glib-2.26
+
USE_GMAKE= yes
USE_OCAML= yes
GNU_CONFIGURE= yes
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index e7dc28283112..656517a69abd 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.37 2010/01/03 06:54:20 marcus Exp $
+# $MCom: ports/devel/py-gobject/Makefile,v 1.42 2010/09/27 18:04:22 kwm Exp $
#
PORTNAME= gobject
-PORTVERSION= 2.21.1
+PORTVERSION= 2.26.0
CATEGORIES= devel python
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,6 +18,13 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Python bindings for GObject
+BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
+ ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
+RUN_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
+ ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
+
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack glib20
@@ -29,8 +36,17 @@ CONFIGURE_ARGS= --disable-docs
CONFLICTS= py*-gtk-0*
PLIST_SUB= PYTHON_VER="${PYTHON_VER}"
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/lib/libffi.so)
+LIB_DEPENDS+= ffi.5:${PORTSDIR}/devel/libffi
+CONFIGURE_ARGS+=--with-ffi
+.else
+CONFIGURE_ARGS+=--without-ffi
+.endif
+
post-install:
@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
${PREFIX}/share/pygobject/2.0/codegen
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo
index 2c1792ed61e3..f1bb638ced33 100644
--- a/devel/py-gobject/distinfo
+++ b/devel/py-gobject/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygobject-2.21.1.tar.bz2) = c12eef0cd6725dc7245c3db78ef85d2d
-SHA256 (gnome2/pygobject-2.21.1.tar.bz2) = e6ae6c70966899d2040c82ae4e1590cf941ebf121a3ec61e80bf517ce8d9be0a
-SIZE (gnome2/pygobject-2.21.1.tar.bz2) = 681795
+MD5 (gnome2/pygobject-2.26.0.tar.bz2) = 7e3352c4b83ce8dc15290e86dd9c2be0
+SHA256 (gnome2/pygobject-2.26.0.tar.bz2) = 5554acff9c27b647144143b0459359864e4a6f2ff62c7ba21cf310ad755cf7c7
+SIZE (gnome2/pygobject-2.26.0.tar.bz2) = 808427
diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist
index 67f431338713..b0230853e604 100644
--- a/devel/py-gobject/pkg-plist
+++ b/devel/py-gobject/pkg-plist
@@ -7,6 +7,43 @@ 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
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/_gi.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/_gi.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/_gi_cairo.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/_gi_cairo.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/importer.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/importer.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/importer.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/module.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/module.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/module.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/GIMarshallingTests.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/GIMarshallingTests.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/GIMarshallingTests.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/GLib.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/GLib.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/GLib.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/Gdk.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/Gdk.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/Gdk.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/Gtk.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/Gtk.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/Gtk.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/keysyms.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/keysyms.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides/keysyms.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/repository/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/repository/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/repository/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/types.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/types.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gi/types.pyo
%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.pyo
@@ -145,6 +182,7 @@ share/pygobject/2.0/codegen/scmexpr.pyc
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/gcancellable.override
share/pygobject/2.0/defs/gdatainputstream.override
share/pygobject/2.0/defs/gdrive.override
share/pygobject/2.0/defs/gfile.override
@@ -187,5 +225,8 @@ share/pygobject/xsl/ref-html-style.xsl
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/glib
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gio
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gi/repository
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gi/overrides
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gi
@dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0
@dirrmtry include/pygtk-2.0
diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index 3a089cd989f6..d11060768b63 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -3,15 +3,14 @@
# Whom: Alexander Logvinov <avl@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/seed/Makefile,v 1.19 2010/05/08 17:04:45 marcus Exp $
+# $MCom: ports/devel/seed/Makefile,v 1.24 2010/09/19 15:06:42 kwm Exp $
#
# NOTE: It may be necessary to update ${FILESDIR}/Seed.js on each release.
# To do that, just replace imports.searchPaths with "." and ".." elements.
#
PORTNAME= seed
-PORTVERSION= 2.30.0
-PORTREVISION= 2
+PORTVERSION= 2.31.91
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -22,7 +21,7 @@ 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 \
+ girepository-1.0.1:${PORTSDIR}/devel/gobject-introspection \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
sqlite3.8:${PORTSDIR}/databases/sqlite3 \
mpfr.4:${PORTSDIR}/math/mpfr
@@ -36,7 +35,7 @@ USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=--enable-gtk-doc=no
+CONFIGURE_ARGS+=--enable-gtk-doc=no --with-webkit=1.0
MAN1= seed.1
@@ -45,6 +44,8 @@ MAN1= seed.1
post-patch:
@${REINPLACE_CMD} -e 's|== x|= x|g' \
${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|-ldl||g' \
+ ${WRKSRC}/libseed/Makefile.in
@${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'
diff --git a/devel/seed/distinfo b/devel/seed/distinfo
index 6bee1233b0cf..be392a77bdc2 100644
--- a/devel/seed/distinfo
+++ b/devel/seed/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seed-2.30.0.tar.bz2) = dd09d22c6a06b4bbef7320bb6a715c0f
-SHA256 (gnome2/seed-2.30.0.tar.bz2) = 3b5e7babd1e14793829c9d521319cbf2af9a66bea604c5dc80a9885558f00361
-SIZE (gnome2/seed-2.30.0.tar.bz2) = 770032
+MD5 (gnome2/seed-2.31.91.tar.bz2) = 024aff0a69761f77bc346bbad1a2489b
+SHA256 (gnome2/seed-2.31.91.tar.bz2) = 9e1da3adc6ed25b1778508ab67aecfe0923d1083f375b88137ea5f9ff57c22a3
+SIZE (gnome2/seed-2.31.91.tar.bz2) = 762875
diff --git a/devel/seed/pkg-plist b/devel/seed/pkg-plist
index b91412a68d76..db20734ff130 100644
--- a/devel/seed/pkg-plist
+++ b/devel/seed/pkg-plist
@@ -6,6 +6,9 @@ lib/libseed.a
lib/libseed.la
lib/libseed.so
lib/libseed.so.0
+lib/seed/libseed_DynamicObject.a
+lib/seed/libseed_DynamicObject.la
+lib/seed/libseed_DynamicObject.so
lib/seed/libseed_cairo.a
lib/seed/libseed_cairo.la
lib/seed/libseed_cairo.so
diff --git a/devel/upp/files/patch-uppsrc_ide_Makefile b/devel/upp/files/patch-uppsrc_ide_Makefile
new file mode 100644
index 000000000000..cfb15fbb87fb
--- /dev/null
+++ b/devel/upp/files/patch-uppsrc_ide_Makefile
@@ -0,0 +1,11 @@
+--- uppsrc/ide/Makefile.orig 2010-10-31 16:58:47.000000000 +0100
++++ uppsrc/ide/Makefile 2010-10-31 16:59:18.000000000 +0100
+@@ -6,7 +6,7 @@
+ UPPDIR1 = uppsrc/
+ UPPOUT = out/
+
+-CINC = -I$(UPPDIR1) -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/gtk-2.0 -I$(LOCALBASE)/include/glib-2.0 -I$(LOCALBASE)/include/cairo -I$(LOCALBASE)/include/pango-1.0 -I$(LOCALBASE)/include/atk-1.0
++CINC = -I$(UPPDIR1) -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I${LOCALBASE}/include/gdk-pixbuf-2.0 -I$(LOCALBASE)/include/gtk-2.0 -I$(LOCALBASE)/include/glib-2.0 -I$(LOCALBASE)/include/cairo -I$(LOCALBASE)/include/pango-1.0 -I$(LOCALBASE)/include/atk-1.0
+ Macro = -DflagGUI -DflagGCC -DflagSHARED -Dflag$(HOSTTYPE)
+ CC ?= c++
+ C_FLAGS = $(CC) -c -O2 -x c $(CFLAGS)
diff --git a/devel/valide/Makefile b/devel/valide/Makefile
index 67cacbab76b1..041193c05f5f 100644
--- a/devel/valide/Makefile
+++ b/devel/valide/Makefile
@@ -18,6 +18,8 @@ LIB_DEPENDS= gdl-1:${PORTSDIR}/x11-toolkits/gdl
BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala
RUN_DEPENDS= ${BUILD_DEPENDS}
+BROKEN= Doesn't build with vala-0.10
+
INSTALLS_ICONS= yes
USE_GETTEXT= yes
USE_GNOME= gtk20 gtksourceview2
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 716849d6c28b..6df7425aea31 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.43 2010/04/03 09:38:28 kwm Exp $
+# $MCom: ports/editors/gedit-plugins/Makefile,v 1.48 2010/10/29 14:47:24 kwm Exp $
#
PORTNAME= gedit-plugins
-PORTVERSION= 2.30.0
+PORTVERSION= 2.32.0
PORTREVISION= 1
CATEGORIES= editors gnome
MASTER_SITES= GNOME
@@ -48,8 +48,10 @@ USE_PYTHON= yes
.include "${PORTSDIR}/Mk/bsd.python.mk"
USE_GNOME+= pygtksourceview
BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte \
+ ${PYTHON_SITELIBDIR}/dbus/bus.py:${PORTSDIR}/devel/py-dbus \
${PYTHON_SITELIBDIR}/gtksourceview2.so:${PORTSDIR}/x11-toolkits/py-gtksourceview
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte \
+ ${PYTHON_SITELIBDIR}/dbus/bus.py:${PORTSDIR}/devel/py-dbus \
${PYTHON_SITELIBDIR}/gtksourceview2.so:${PORTSDIR}/x11-toolkits/py-gtksourceview
CONFIGURE_ARGS+=--enable-python
PLIST_SUB+= PYTHON=""
diff --git a/editors/gedit-plugins/distinfo b/editors/gedit-plugins/distinfo
index 1862e2f043db..db94f15d10ba 100644
--- a/editors/gedit-plugins/distinfo
+++ b/editors/gedit-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-plugins-2.30.0.tar.bz2) = f1200605247b3ece1212c363f0b04c1d
-SHA256 (gnome2/gedit-plugins-2.30.0.tar.bz2) = 8a177f2455ee5c58bc4a19df013d5698b14ae6a3f31ed48347904cf467a79509
-SIZE (gnome2/gedit-plugins-2.30.0.tar.bz2) = 598898
+MD5 (gnome2/gedit-plugins-2.32.0.tar.bz2) = b5123846fa41f2d94992ae67e96ff79b
+SHA256 (gnome2/gedit-plugins-2.32.0.tar.bz2) = 2ef7bf48e9500556d84ae4c2950f4eadcc3f9cb9c58c90f2c83956b0ddad1107
+SIZE (gnome2/gedit-plugins-2.32.0.tar.bz2) = 616927
diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist
index b4f253afe9cf..30aac7135be3 100644
--- a/editors/gedit-plugins/pkg-plist
+++ b/editors/gedit-plugins/pkg-plist
@@ -49,6 +49,9 @@ lib/gedit-2/plugins/charmap.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/commander/info.py
%%PYTHON%%lib/gedit-2/plugins/commander/info.pyc
%%PYTHON%%lib/gedit-2/plugins/commander/info.pyo
+%%PYTHON%%lib/gedit-2/plugins/commander/modules.py
+%%PYTHON%%lib/gedit-2/plugins/commander/modules.pyc
+%%PYTHON%%lib/gedit-2/plugins/commander/modules.pyo
%%PYTHON%%lib/gedit-2/plugins/commander/transparentwindow.py
%%PYTHON%%lib/gedit-2/plugins/commander/transparentwindow.pyc
%%PYTHON%%lib/gedit-2/plugins/commander/transparentwindow.pyo
@@ -112,10 +115,36 @@ lib/gedit-2/plugins/showtabbar.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/smartspaces.py
%%PYTHON%%lib/gedit-2/plugins/smartspaces.pyc
%%PYTHON%%lib/gedit-2/plugins/smartspaces.pyo
+%%PYTHON%%lib/gedit-2/plugins/synctex.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/synctex/__init__.py
+%%PYTHON%%lib/gedit-2/plugins/synctex/__init__.pyc
+%%PYTHON%%lib/gedit-2/plugins/synctex/__init__.pyo
+%%PYTHON%%lib/gedit-2/plugins/synctex/evince_dbus.py
+%%PYTHON%%lib/gedit-2/plugins/synctex/evince_dbus.pyc
+%%PYTHON%%lib/gedit-2/plugins/synctex/evince_dbus.pyo
+%%PYTHON%%lib/gedit-2/plugins/synctex/synctex.py
+%%PYTHON%%lib/gedit-2/plugins/synctex/synctex.pyc
+%%PYTHON%%lib/gedit-2/plugins/synctex/synctex.pyo
%%PYTHON%%lib/gedit-2/plugins/terminal.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/terminal.py
%%PYTHON%%lib/gedit-2/plugins/terminal.pyc
%%PYTHON%%lib/gedit-2/plugins/terminal.pyo
+%%PYTHON%%lib/gedit-2/plugins/textsize.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/textsize/__init__.py
+%%PYTHON%%lib/gedit-2/plugins/textsize/__init__.pyc
+%%PYTHON%%lib/gedit-2/plugins/textsize/__init__.pyo
+%%PYTHON%%lib/gedit-2/plugins/textsize/constants.py
+%%PYTHON%%lib/gedit-2/plugins/textsize/constants.pyc
+%%PYTHON%%lib/gedit-2/plugins/textsize/constants.pyo
+%%PYTHON%%lib/gedit-2/plugins/textsize/documenthelper.py
+%%PYTHON%%lib/gedit-2/plugins/textsize/documenthelper.pyc
+%%PYTHON%%lib/gedit-2/plugins/textsize/documenthelper.pyo
+%%PYTHON%%lib/gedit-2/plugins/textsize/signals.py
+%%PYTHON%%lib/gedit-2/plugins/textsize/signals.pyc
+%%PYTHON%%lib/gedit-2/plugins/textsize/signals.pyo
+%%PYTHON%%lib/gedit-2/plugins/textsize/windowhelper.py
+%%PYTHON%%lib/gedit-2/plugins/textsize/windowhelper.pyc
+%%PYTHON%%lib/gedit-2/plugins/textsize/windowhelper.pyo
lib/gedit-2/plugins/wordcompletion.gedit-plugin
share/gedit-2/plugins/bookmarks/bookmark.png
%%PYTHON%%share/gedit-2/plugins/commander/modules/align.py
@@ -145,6 +174,9 @@ share/gedit-2/plugins/bookmarks/bookmark.png
%%PYTHON%%share/gedit-2/plugins/commander/modules/format.py
%%PYTHON%%share/gedit-2/plugins/commander/modules/format.pyc
%%PYTHON%%share/gedit-2/plugins/commander/modules/format.pyo
+%%PYTHON%%share/gedit-2/plugins/commander/modules/grep.py
+%%PYTHON%%share/gedit-2/plugins/commander/modules/grep.pyc
+%%PYTHON%%share/gedit-2/plugins/commander/modules/grep.pyo
%%PYTHON%%share/gedit-2/plugins/commander/modules/goto.py
%%PYTHON%%share/gedit-2/plugins/commander/modules/goto.pyc
%%PYTHON%%share/gedit-2/plugins/commander/modules/goto.pyo
@@ -192,6 +224,7 @@ share/locale/he/LC_MESSAGES/gedit-plugins.mo
share/locale/hi/LC_MESSAGES/gedit-plugins.mo
share/locale/hr/LC_MESSAGES/gedit-plugins.mo
share/locale/hu/LC_MESSAGES/gedit-plugins.mo
+share/locale/id/LC_MESSAGES/gedit-plugins.mo
share/locale/it/LC_MESSAGES/gedit-plugins.mo
share/locale/ja/LC_MESSAGES/gedit-plugins.mo
share/locale/kn/LC_MESSAGES/gedit-plugins.mo
@@ -232,7 +265,9 @@ share/locale/wa/LC_MESSAGES/gedit-plugins.mo
share/locale/zh_CN/LC_MESSAGES/gedit-plugins.mo
share/locale/zh_HK/LC_MESSAGES/gedit-plugins.mo
share/locale/zh_TW/LC_MESSAGES/gedit-plugins.mo
+%%PYTHON%%@dirrm lib/gedit-2/plugins/textsize
%%PYTHON%%@dirrm lib/gedit-2/plugins/multiedit
+%%PYTHON%%@dirrm lib/gedit-2/plugins/synctex
%%PYTHON%%@dirrm lib/gedit-2/plugins/sessionsaver
%%PYTHON%%@dirrm lib/gedit-2/plugins/commander/commands
%%PYTHON%%@dirrm lib/gedit-2/plugins/commander
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 885f4e466d47..63ad38a1f62b 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/editors/gedit/Makefile,v 1.13 2010/06/22 20:00:07 kwm Exp $
+# $MCom: ports/editors/gedit/Makefile,v 1.125 2010/09/30 19:58:54 kwm Exp $
#
PORTNAME= gedit
-PORTVERSION= 2.30.3
+PORTVERSION= 2.30.4
+PORTREVISION= 1
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -29,6 +30,7 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gtksourceview2 \
desktopfileutils gnomedocutils ltasneededhack
+GNOME_DESKTOP_VERSION=2
WANT_GNOME= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 0b215c12961f..dae62b656a49 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-2.30.3.tar.bz2) = 7c8ac5fe529285309f7d5750ee52b7bd
-SHA256 (gnome2/gedit-2.30.3.tar.bz2) = ab09e29e70fa830ed453a2ffb3e80f614cc7df4f3b89b3d3d1234a4936ffecf6
-SIZE (gnome2/gedit-2.30.3.tar.bz2) = 4729828
+MD5 (gnome2/gedit-2.30.4.tar.bz2) = e1eecb0a92a1a363b3d375ec5ac0fb3b
+SHA256 (gnome2/gedit-2.30.4.tar.bz2) = a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c
+SIZE (gnome2/gedit-2.30.4.tar.bz2) = 4705692
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index e04a0f58c6c5..0823a841a09d 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -217,6 +217,7 @@ share/gedit-2/plugins/modelines/language-mappings
%%PYTHON%%share/gedit-2/plugins/snippets/javascript.xml
%%PYTHON%%share/gedit-2/plugins/snippets/lang/snippets.lang
%%PYTHON%%share/gedit-2/plugins/snippets/latex.xml
+%%PYTHON%%share/gedit-2/plugins/snippets/mallard.xml
%%PYTHON%%share/gedit-2/plugins/snippets/perl.xml
%%PYTHON%%share/gedit-2/plugins/snippets/php.xml
%%PYTHON%%share/gedit-2/plugins/snippets/python.xml
@@ -478,6 +479,7 @@ share/locale/is/LC_MESSAGES/gedit.mo
share/locale/it/LC_MESSAGES/gedit.mo
share/locale/ja/LC_MESSAGES/gedit.mo
share/locale/ka/LC_MESSAGES/gedit.mo
+share/locale/kk/LC_MESSAGES/gedit.mo
share/locale/kn/LC_MESSAGES/gedit.mo
share/locale/ko/LC_MESSAGES/gedit.mo
share/locale/ku/LC_MESSAGES/gedit.mo
@@ -665,6 +667,8 @@ share/omf/gedit/gedit-zh_TW.omf
@dirrmtry share/locale/la
@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/en@shaw/LC_MESSAGES
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 6a5aa1005ac7..890bd92235bc 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.6 2010/07/21 18:17:43 kwm Exp $
+# $MCom: ports/games/gnome-games/Makefile,v 1.232 2010/11/15 22:52:01 kwm Exp $
#
PORTNAME= gnome-games
-PORTVERSION= 2.30.2
-PORTREVISION= 2
+PORTVERSION= 2.32.1
CATEGORIES= games gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,8 +19,7 @@ BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
LIB_DEPENDS= guile.20:${PORTSDIR}/lang/guile \
clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \
clutter-glx-1.0.0:${PORTSDIR}/graphics/clutter
-RUN_DEPENDS= seed:${PORTSDIR}/devel/seed \
- ${LOCALBASE}/share/gir-1.0/GConf-2.0.gir:${PORTSDIR}/devel/gir-repository-gconf2
+RUN_DEPENDS= seed:${PORTSDIR}/devel/seed
USE_BZIP2= yes
USE_PYTHON= yes
@@ -61,8 +59,10 @@ LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \
- ${WRKSRC}/gnome-sudoku/src/lib/defaults.py.in \
+ ${WRKSRC}/gnome-sudoku/src/lib/defaults.py.in \
${WRKSRC}/glchess/src/lib/defaults.py.in
+ @${REINPLACE_CMD} -e 's|strip-prefix=games|strip-prefix=Games|' \
+ ${WRKSRC}/libgames-support/Makefile.in
post-install:
${MKDIR} ${PREFIX}/share/ggz/gnome-games
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index 9a53c469a7e1..d6cd28ee1c49 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gnome-games-2.30.2.tar.bz2) = 1fc03fe2209aa8a70da8f25d6eae1735
-SHA256 (gnome2/gnome-games-2.30.2.tar.bz2) = 57c3f3685cdd49016dfbf236f4a1d98c9d669d456fabe0aeb6f5a4128dba3586
-SIZE (gnome2/gnome-games-2.30.2.tar.bz2) = 27683256
+SHA256 (gnome2/gnome-games-2.32.1.tar.bz2) = 1a3b2e82102eed3780f05db4378111c475456678deed82fd4ca379da1c5593d9
+SIZE (gnome2/gnome-games-2.32.1.tar.bz2) = 27758241
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 7bde75717760..b2d307e98741 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -216,9 +216,6 @@ lib/gnome-games/libgames-support-gi.so.0
%%PYTHON_SITELIBDIR%%/glchess/scene/cairo/__init__.py
%%PYTHON_SITELIBDIR%%/glchess/scene/cairo/__init__.pyc
%%PYTHON_SITELIBDIR%%/glchess/scene/cairo/__init__.pyo
-%%PYTHON_SITELIBDIR%%/glchess/scene/cairo/pieces.py
-%%PYTHON_SITELIBDIR%%/glchess/scene/cairo/pieces.pyc
-%%PYTHON_SITELIBDIR%%/glchess/scene/cairo/pieces.pyo
%%PYTHON_SITELIBDIR%%/glchess/scene/human.py
%%PYTHON_SITELIBDIR%%/glchess/scene/human.pyc
%%PYTHON_SITELIBDIR%%/glchess/scene/human.pyo
@@ -231,9 +228,6 @@ lib/gnome-games/libgames-support-gi.so.0
%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/opengl.py
%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/opengl.pyc
%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/opengl.pyo
-%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/png.py
-%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/png.pyc
-%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/png.pyo
%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/texture.py
%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/texture.pyc
%%PYTHON_SITELIBDIR%%/glchess/scene/opengl/texture.pyo
@@ -303,9 +297,6 @@ lib/gnome-games/libgames-support-gi.so.0
%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku.py
%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku.pyc
%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku.pyo
-%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_generator_gui.py
-%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_generator_gui.pyc
-%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_generator_gui.pyo
%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_maker.py
%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_maker.pyc
%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_maker.pyo
@@ -315,6 +306,9 @@ lib/gnome-games/libgames-support-gi.so.0
%%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.py
%%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.pyc
%%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/tracker_info.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/tracker_info.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/tracker_info.pyo
share/applications/freecell.desktop
share/applications/glchess.desktop
share/applications/glines.desktop
@@ -334,18 +328,42 @@ share/applications/sol.desktop
share/applications/swell-foop.desktop
share/gir-1.0/GnomeGamesSupport-1.0.gir
share/glchess/ai.xml
-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/pieces/fancy/blackBishop.svg
+share/glchess/pieces/fancy/blackKing.svg
+share/glchess/pieces/fancy/blackKnight.svg
+share/glchess/pieces/fancy/blackPawn.svg
+share/glchess/pieces/fancy/blackQueen.svg
+share/glchess/pieces/fancy/blackRook.svg
+share/glchess/pieces/fancy/whiteBishop.svg
+share/glchess/pieces/fancy/whiteKing.svg
+share/glchess/pieces/fancy/whiteKnight.svg
+share/glchess/pieces/fancy/whitePawn.svg
+share/glchess/pieces/fancy/whiteQueen.svg
+share/glchess/pieces/fancy/whiteRook.svg
+share/glchess/pieces/simple/blackBishop.svg
+share/glchess/pieces/simple/blackKing.svg
+share/glchess/pieces/simple/blackKnight.svg
+share/glchess/pieces/simple/blackPawn.svg
+share/glchess/pieces/simple/blackQueen.svg
+share/glchess/pieces/simple/blackRook.svg
+share/glchess/pieces/simple/whiteBishop.svg
+share/glchess/pieces/simple/whiteKing.svg
+share/glchess/pieces/simple/whiteKnight.svg
+share/glchess/pieces/simple/whitePawn.svg
+share/glchess/pieces/simple/whiteQueen.svg
+share/glchess/pieces/simple/whiteRook.svg
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
@@ -556,6 +574,7 @@ share/gnome-games-common/cards/gnomangelo_bitmap.svg
%%DATADIR%%/lightsoff/LED.js
%%DATADIR%%/lightsoff/Light.js
%%DATADIR%%/lightsoff/Path.js
+%%DATADIR%%/lightsoff/Puzzle.js
%%DATADIR%%/lightsoff/Settings.js
%%DATADIR%%/lightsoff/ThemeLoader.js
%%DATADIR%%/lightsoff/lightsoff.ui
@@ -631,7 +650,6 @@ share/gnome-games-common/cards/gnomangelo_bitmap.svg
%%DATADIR%%/swell-foop/themes/test/yellow.svg
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
@@ -811,6 +829,11 @@ share/gnome/help/glchess/fr/figures/new_game.png
share/gnome/help/glchess/fr/figures/preferences_game.png
share/gnome/help/glchess/fr/figures/preferences_view.png
share/gnome/help/glchess/fr/glchess.xml
+share/gnome/help/glchess/ja/figures/game.png
+share/gnome/help/glchess/ja/figures/new_game.png
+share/gnome/help/glchess/ja/figures/preferences_game.png
+share/gnome/help/glchess/ja/figures/preferences_view.png
+share/gnome/help/glchess/ja/glchess.xml
share/gnome/help/glchess/oc/figures/game.png
share/gnome/help/glchess/oc/figures/new_game.png
share/gnome/help/glchess/oc/figures/preferences_game.png
@@ -1093,6 +1116,13 @@ share/gnome/help/gnibbles/sv/figures/playing.png
share/gnome/help/gnibbles/sv/figures/tables.png
share/gnome/help/gnibbles/sv/figures/worm_op.png
share/gnome/help/gnibbles/sv/gnibbles.xml
+share/gnome/help/gnibbles/zh_CN/figures/connect.png
+share/gnome/help/gnibbles/zh_CN/figures/game.png
+share/gnome/help/gnibbles/zh_CN/figures/intro.png
+share/gnome/help/gnibbles/zh_CN/figures/playing.png
+share/gnome/help/gnibbles/zh_CN/figures/tables.png
+share/gnome/help/gnibbles/zh_CN/figures/worm_op.png
+share/gnome/help/gnibbles/zh_CN/gnibbles.xml
share/gnome/help/gnobots2/C/figures/gnobots2-main.png
share/gnome/help/gnobots2/C/gnobots2.xml
share/gnome/help/gnobots2/C/legal.xml
@@ -1213,6 +1243,14 @@ share/gnome/help/gnome-sudoku/it/figures/hints.png
share/gnome/help/gnome-sudoku/it/figures/resuming.png
share/gnome/help/gnome-sudoku/it/figures/starting.png
share/gnome/help/gnome-sudoku/it/gnome-sudoku.xml
+share/gnome/help/gnome-sudoku/ja/figures/Print_Sudokus.png
+share/gnome/help/gnome-sudoku/ja/figures/always_show_hint.png
+share/gnome/help/gnome-sudoku/ja/figures/error_highlighting.png
+share/gnome/help/gnome-sudoku/ja/figures/highlighting.png
+share/gnome/help/gnome-sudoku/ja/figures/hints.png
+share/gnome/help/gnome-sudoku/ja/figures/resuming.png
+share/gnome/help/gnome-sudoku/ja/figures/starting.png
+share/gnome/help/gnome-sudoku/ja/gnome-sudoku.xml
share/gnome/help/gnome-sudoku/oc/figures/Print_Sudokus.png
share/gnome/help/gnome-sudoku/oc/figures/always_show_hint.png
share/gnome/help/gnome-sudoku/oc/figures/error_highlighting.png
@@ -1494,8 +1532,8 @@ share/gnome/help/gnomine/zh_CN/figures/preferences.png
share/gnome/help/gnomine/zh_CN/figures/statusbar.png
share/gnome/help/gnomine/zh_CN/gnomine.xml
share/gnome/help/gnomine/sv/gnomine.xml
-share/gnome/help/gnotravex/C/figures/gnotravex-logo.png
share/gnome/help/gnotravex/C/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/C/figures/gnotravex-logo.png
share/gnome/help/gnotravex/C/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/C/gameplay.page
share/gnome/help/gnotravex/C/hint.page
@@ -1507,8 +1545,8 @@ share/gnome/help/gnotravex/C/shortcut.page
share/gnome/help/gnotravex/C/size.page
share/gnome/help/gnotravex/C/usage.page
share/gnome/help/gnotravex/C/winning.page
-share/gnome/help/gnotravex/ca/figures/gnotravex-logo.png
share/gnome/help/gnotravex/ca/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/ca/figures/gnotravex-logo.png
share/gnome/help/gnotravex/ca/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/ca/gameplay.page
share/gnome/help/gnotravex/ca/hint.page
@@ -1520,8 +1558,8 @@ share/gnome/help/gnotravex/ca/shortcut.page
share/gnome/help/gnotravex/ca/size.page
share/gnome/help/gnotravex/ca/usage.page
share/gnome/help/gnotravex/ca/winning.page
-share/gnome/help/gnotravex/cs/figures/gnotravex-logo.png
share/gnome/help/gnotravex/cs/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/cs/figures/gnotravex-logo.png
share/gnome/help/gnotravex/cs/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/cs/gameplay.page
share/gnome/help/gnotravex/cs/hint.page
@@ -1533,8 +1571,8 @@ share/gnome/help/gnotravex/cs/shortcut.page
share/gnome/help/gnotravex/cs/size.page
share/gnome/help/gnotravex/cs/usage.page
share/gnome/help/gnotravex/cs/winning.page
-share/gnome/help/gnotravex/da/figures/gnotravex-logo.png
share/gnome/help/gnotravex/da/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/da/figures/gnotravex-logo.png
share/gnome/help/gnotravex/da/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/da/gameplay.page
share/gnome/help/gnotravex/da/hint.page
@@ -1546,8 +1584,8 @@ share/gnome/help/gnotravex/da/shortcut.page
share/gnome/help/gnotravex/da/size.page
share/gnome/help/gnotravex/da/usage.page
share/gnome/help/gnotravex/da/winning.page
-share/gnome/help/gnotravex/de/figures/gnotravex-logo.png
share/gnome/help/gnotravex/de/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/de/figures/gnotravex-logo.png
share/gnome/help/gnotravex/de/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/de/gameplay.page
share/gnome/help/gnotravex/de/hint.page
@@ -1559,8 +1597,8 @@ share/gnome/help/gnotravex/de/shortcut.page
share/gnome/help/gnotravex/de/size.page
share/gnome/help/gnotravex/de/usage.page
share/gnome/help/gnotravex/de/winning.page
-share/gnome/help/gnotravex/el/figures/gnotravex-logo.png
share/gnome/help/gnotravex/el/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/el/figures/gnotravex-logo.png
share/gnome/help/gnotravex/el/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/el/gameplay.page
share/gnome/help/gnotravex/el/hint.page
@@ -1572,8 +1610,8 @@ share/gnome/help/gnotravex/el/shortcut.page
share/gnome/help/gnotravex/el/size.page
share/gnome/help/gnotravex/el/usage.page
share/gnome/help/gnotravex/el/winning.page
-share/gnome/help/gnotravex/en_GB/figures/gnotravex-logo.png
share/gnome/help/gnotravex/en_GB/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/en_GB/figures/gnotravex-logo.png
share/gnome/help/gnotravex/en_GB/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/en_GB/gameplay.page
share/gnome/help/gnotravex/en_GB/hint.page
@@ -1585,8 +1623,8 @@ share/gnome/help/gnotravex/en_GB/shortcut.page
share/gnome/help/gnotravex/en_GB/size.page
share/gnome/help/gnotravex/en_GB/usage.page
share/gnome/help/gnotravex/en_GB/winning.page
-share/gnome/help/gnotravex/es/figures/gnotravex-logo.png
share/gnome/help/gnotravex/es/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/es/figures/gnotravex-logo.png
share/gnome/help/gnotravex/es/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/es/gameplay.page
share/gnome/help/gnotravex/es/hint.page
@@ -1598,8 +1636,8 @@ share/gnome/help/gnotravex/es/shortcut.page
share/gnome/help/gnotravex/es/size.page
share/gnome/help/gnotravex/es/usage.page
share/gnome/help/gnotravex/es/winning.page
-share/gnome/help/gnotravex/eu/figures/gnotravex-logo.png
share/gnome/help/gnotravex/eu/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/eu/figures/gnotravex-logo.png
share/gnome/help/gnotravex/eu/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/eu/gameplay.page
share/gnome/help/gnotravex/eu/hint.page
@@ -1611,8 +1649,8 @@ share/gnome/help/gnotravex/eu/shortcut.page
share/gnome/help/gnotravex/eu/size.page
share/gnome/help/gnotravex/eu/usage.page
share/gnome/help/gnotravex/eu/winning.page
-share/gnome/help/gnotravex/fr/figures/gnotravex-logo.png
share/gnome/help/gnotravex/fr/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/fr/figures/gnotravex-logo.png
share/gnome/help/gnotravex/fr/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/fr/gameplay.page
share/gnome/help/gnotravex/fr/hint.page
@@ -1624,8 +1662,8 @@ share/gnome/help/gnotravex/fr/shortcut.page
share/gnome/help/gnotravex/fr/size.page
share/gnome/help/gnotravex/fr/usage.page
share/gnome/help/gnotravex/fr/winning.page
-share/gnome/help/gnotravex/it/figures/gnotravex-logo.png
share/gnome/help/gnotravex/it/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/it/figures/gnotravex-logo.png
share/gnome/help/gnotravex/it/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/it/gameplay.page
share/gnome/help/gnotravex/it/hint.page
@@ -1637,8 +1675,8 @@ share/gnome/help/gnotravex/it/shortcut.page
share/gnome/help/gnotravex/it/size.page
share/gnome/help/gnotravex/it/usage.page
share/gnome/help/gnotravex/it/winning.page
-share/gnome/help/gnotravex/oc/figures/gnotravex-logo.png
share/gnome/help/gnotravex/oc/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/oc/figures/gnotravex-logo.png
share/gnome/help/gnotravex/oc/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/oc/gameplay.page
share/gnome/help/gnotravex/oc/hint.page
@@ -1650,8 +1688,8 @@ share/gnome/help/gnotravex/oc/shortcut.page
share/gnome/help/gnotravex/oc/size.page
share/gnome/help/gnotravex/oc/usage.page
share/gnome/help/gnotravex/oc/winning.page
-share/gnome/help/gnotravex/ru/figures/gnotravex-logo.png
share/gnome/help/gnotravex/ru/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/ru/figures/gnotravex-logo.png
share/gnome/help/gnotravex/ru/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/ru/gameplay.page
share/gnome/help/gnotravex/ru/hint.page
@@ -1663,8 +1701,8 @@ share/gnome/help/gnotravex/ru/shortcut.page
share/gnome/help/gnotravex/ru/size.page
share/gnome/help/gnotravex/ru/usage.page
share/gnome/help/gnotravex/ru/winning.page
-share/gnome/help/gnotravex/sl/figures/gnotravex-logo.png
share/gnome/help/gnotravex/sl/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/sl/figures/gnotravex-logo.png
share/gnome/help/gnotravex/sl/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/sl/gameplay.page
share/gnome/help/gnotravex/sl/hint.page
@@ -1676,8 +1714,8 @@ share/gnome/help/gnotravex/sl/shortcut.page
share/gnome/help/gnotravex/sl/size.page
share/gnome/help/gnotravex/sl/usage.page
share/gnome/help/gnotravex/sl/winning.page
-share/gnome/help/gnotravex/sr/figures/gnotravex-logo.png
share/gnome/help/gnotravex/sr/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/sr/figures/gnotravex-logo.png
share/gnome/help/gnotravex/sr/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/sr/gameplay.page
share/gnome/help/gnotravex/sr/hint.page
@@ -1689,8 +1727,8 @@ share/gnome/help/gnotravex/sr/shortcut.page
share/gnome/help/gnotravex/sr/size.page
share/gnome/help/gnotravex/sr/usage.page
share/gnome/help/gnotravex/sr/winning.page
-share/gnome/help/gnotravex/sr@latin/figures/gnotravex-logo.png
share/gnome/help/gnotravex/sr@latin/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/sr@latin/figures/gnotravex-logo.png
share/gnome/help/gnotravex/sr@latin/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/sr@latin/gameplay.page
share/gnome/help/gnotravex/sr@latin/hint.page
@@ -1702,8 +1740,8 @@ share/gnome/help/gnotravex/sr@latin/shortcut.page
share/gnome/help/gnotravex/sr@latin/size.page
share/gnome/help/gnotravex/sr@latin/usage.page
share/gnome/help/gnotravex/sr@latin/winning.page
-share/gnome/help/gnotravex/sv/figures/gnotravex-logo.png
share/gnome/help/gnotravex/sv/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/sv/figures/gnotravex-logo.png
share/gnome/help/gnotravex/sv/figures/gnotravex-video.ogv
share/gnome/help/gnotravex/sv/gameplay.page
share/gnome/help/gnotravex/sv/hint.page
@@ -1715,6 +1753,19 @@ share/gnome/help/gnotravex/sv/shortcut.page
share/gnome/help/gnotravex/sv/size.page
share/gnome/help/gnotravex/sv/usage.page
share/gnome/help/gnotravex/sv/winning.page
+share/gnome/help/gnotravex/zh_CN/figures/gnotravex-logo.png
+share/gnome/help/gnotravex/zh_CN/figures/gnotravex-main-window.png
+share/gnome/help/gnotravex/zh_CN/figures/gnotravex-video.ogv
+share/gnome/help/gnotravex/zh_CN/gameplay.page
+share/gnome/help/gnotravex/zh_CN/hint.page
+share/gnome/help/gnotravex/zh_CN/index.page
+share/gnome/help/gnotravex/zh_CN/license.page
+share/gnome/help/gnotravex/zh_CN/move.page
+share/gnome/help/gnotravex/zh_CN/multiplayer.page
+share/gnome/help/gnotravex/zh_CN/shortcut.page
+share/gnome/help/gnotravex/zh_CN/size.page
+share/gnome/help/gnotravex/zh_CN/usage.page
+share/gnome/help/gnotravex/zh_CN/winning.page
share/gnome/help/gnotski/C/figures/gnotski_start_window.png
share/gnome/help/gnotski/C/figures/gnotski_win.png
share/gnome/help/gnotski/C/gnotski.xml
@@ -1937,6 +1988,7 @@ share/gnome/help/lightsoff/C/lightsoff.xml
share/gnome/help/lightsoff/de/lightsoff.xml
share/gnome/help/lightsoff/el/lightsoff.xml
share/gnome/help/lightsoff/es/lightsoff.xml
+share/gnome/help/lightsoff/fi/lightsoff.xml
share/gnome/help/lightsoff/fr/lightsoff.xml
share/gnome/help/mahjongg/C/figures/mahjongg.png
share/gnome/help/mahjongg/C/figures/no-move.png
@@ -2026,6 +2078,7 @@ share/gnome/help/quadrapassel/eu/quadrapassel.xml
share/gnome/help/quadrapassel/fi/quadrapassel.xml
share/gnome/help/quadrapassel/fr/quadrapassel.xml
share/gnome/help/quadrapassel/it/quadrapassel.xml
+share/gnome/help/quadrapassel/ja/quadrapassel.xml
share/gnome/help/quadrapassel/oc/quadrapassel.xml
share/gnome/help/quadrapassel/sr/quadrapassel.xml
share/gnome/help/quadrapassel/sr@latin/quadrapassel.xml
@@ -2255,6 +2308,7 @@ share/locale/el/LC_MESSAGES/gnome-games.mo
share/locale/en_CA/LC_MESSAGES/gnome-games.mo
share/locale/en_GB/LC_MESSAGES/gnome-games.mo
share/locale/en@shaw/LC_MESSAGES/gnome-games.mo
+share/locale/eo/LC_MESSAGES/gnome-games.mo
share/locale/es/LC_MESSAGES/gnome-games.mo
share/locale/et/LC_MESSAGES/gnome-games.mo
share/locale/eu/LC_MESSAGES/gnome-games.mo
@@ -2273,6 +2327,7 @@ share/locale/is/LC_MESSAGES/gnome-games.mo
share/locale/it/LC_MESSAGES/gnome-games.mo
share/locale/ja/LC_MESSAGES/gnome-games.mo
share/locale/ka/LC_MESSAGES/gnome-games.mo
+share/locale/kk/LC_MESSAGES/gnome-games.mo
share/locale/kn/LC_MESSAGES/gnome-games.mo
share/locale/ko/LC_MESSAGES/gnome-games.mo
share/locale/ku/LC_MESSAGES/gnome-games.mo
@@ -2338,6 +2393,7 @@ share/omf/glchess/glchess-en_GB.omf
share/omf/glchess/glchess-es.omf
share/omf/glchess/glchess-eu.omf
share/omf/glchess/glchess-fr.omf
+share/omf/glchess/glchess-ja.omf
share/omf/glchess/glchess-oc.omf
share/omf/glchess/glchess-pt_BR.omf
share/omf/glchess/glchess-ru.omf
@@ -2390,6 +2446,7 @@ share/omf/gnibbles/gnibbles-oc.omf
share/omf/gnibbles/gnibbles-sr.omf
share/omf/gnibbles/gnibbles-sr@latin.omf
share/omf/gnibbles/gnibbles-sv.omf
+share/omf/gnibbles/gnibbles-zh_CN.omf
share/omf/gnobots2/gnobots2-C.omf
share/omf/gnobots2/gnobots2-ca.omf
share/omf/gnobots2/gnobots2-cs.omf
@@ -2416,6 +2473,7 @@ share/omf/gnome-sudoku/gnome-sudoku-es.omf
share/omf/gnome-sudoku/gnome-sudoku-eu.omf
share/omf/gnome-sudoku/gnome-sudoku-fr.omf
share/omf/gnome-sudoku/gnome-sudoku-it.omf
+share/omf/gnome-sudoku/gnome-sudoku-ja.omf
share/omf/gnome-sudoku/gnome-sudoku-oc.omf
share/omf/gnome-sudoku/gnome-sudoku-pt_BR.omf
share/omf/gnome-sudoku/gnome-sudoku-ru.omf
@@ -2489,6 +2547,7 @@ share/omf/lightsoff/lightsoff-C.omf
share/omf/lightsoff/lightsoff-de.omf
share/omf/lightsoff/lightsoff-el.omf
share/omf/lightsoff/lightsoff-es.omf
+share/omf/lightsoff/lightsoff-fi.omf
share/omf/lightsoff/lightsoff-fr.omf
share/omf/mahjongg/mahjongg-C.omf
share/omf/mahjongg/mahjongg-ca.omf
@@ -2516,6 +2575,7 @@ share/omf/quadrapassel/quadrapassel-eu.omf
share/omf/quadrapassel/quadrapassel-fi.omf
share/omf/quadrapassel/quadrapassel-fr.omf
share/omf/quadrapassel/quadrapassel-it.omf
+share/omf/quadrapassel/quadrapassel-ja.omf
share/omf/quadrapassel/quadrapassel-oc.omf
share/omf/quadrapassel/quadrapassel-sr.omf
share/omf/quadrapassel/quadrapassel-sr@latin.omf
@@ -2587,6 +2647,7 @@ share/omf/swell-foop/swell-foop-sv.omf
@dirrm share/gnome/help/quadrapassel/sr@latin
@dirrm share/gnome/help/quadrapassel/sr
@dirrm share/gnome/help/quadrapassel/oc
+@dirrm share/gnome/help/quadrapassel/ja
@dirrm share/gnome/help/quadrapassel/it
@dirrm share/gnome/help/quadrapassel/fr
@dirrm share/gnome/help/quadrapassel/fi
@@ -2631,6 +2692,7 @@ share/omf/swell-foop/swell-foop-sv.omf
@dirrm share/gnome/help/mahjongg/C
@dirrm share/gnome/help/mahjongg
@dirrm share/gnome/help/lightsoff/fr
+@dirrm share/gnome/help/lightsoff/fi
@dirrm share/gnome/help/lightsoff/es
@dirrm share/gnome/help/lightsoff/el
@dirrm share/gnome/help/lightsoff/de
@@ -2731,6 +2793,8 @@ share/omf/swell-foop/swell-foop-sv.omf
@dirrm share/gnome/help/gnotski/C/figures
@dirrm share/gnome/help/gnotski/C
@dirrm share/gnome/help/gnotski
+@dirrm share/gnome/help/gnotravex/zh_CN/figures
+@dirrm share/gnome/help/gnotravex/zh_CN
@dirrm share/gnome/help/gnotravex/sv/figures
@dirrm share/gnome/help/gnotravex/sv
@dirrm share/gnome/help/gnotravex/sr@latin/figures
@@ -2813,6 +2877,8 @@ share/omf/swell-foop/swell-foop-sv.omf
@dirrm share/gnome/help/gnome-sudoku/pt_BR
@dirrm share/gnome/help/gnome-sudoku/oc/figures
@dirrm share/gnome/help/gnome-sudoku/oc
+@dirrm share/gnome/help/gnome-sudoku/ja/figures
+@dirrm share/gnome/help/gnome-sudoku/ja
@dirrm share/gnome/help/gnome-sudoku/it/figures
@dirrm share/gnome/help/gnome-sudoku/it
@dirrm share/gnome/help/gnome-sudoku/fr/figures
@@ -2867,6 +2933,8 @@ share/omf/swell-foop/swell-foop-sv.omf
@dirrm share/gnome/help/gnobots2/C/figures
@dirrm share/gnome/help/gnobots2/C
@dirrm share/gnome/help/gnobots2
+@dirrm share/gnome/help/gnibbles/zh_CN/figures
+@dirrm share/gnome/help/gnibbles/zh_CN
@dirrm share/gnome/help/gnibbles/sv/figures
@dirrm share/gnome/help/gnibbles/sv
@dirrm share/gnome/help/gnibbles/sr@latin/figures
@@ -2974,6 +3042,8 @@ share/omf/swell-foop/swell-foop-sv.omf
@dirrm share/gnome/help/glchess/pt_BR
@dirrm share/gnome/help/glchess/oc/figures
@dirrm share/gnome/help/glchess/oc
+@dirrm share/gnome/help/glchess/ja/figures
+@dirrm share/gnome/help/glchess/ja
@dirrm share/gnome/help/glchess/fr/figures
@dirrm share/gnome/help/glchess/fr
@dirrm share/gnome/help/glchess/eu/figures
@@ -3079,6 +3149,9 @@ share/omf/swell-foop/swell-foop-sv.omf
@dirrm share/gnome-games-common/cards
@dirrm share/gnome-games-common
@dirrm share/glchess/textures
+@dirrm share/glchess/pieces/simple
+@dirrm share/glchess/pieces/fancy
+@dirrm share/glchess/pieces
@dirrm share/glchess
@dirrmtry share/ggz/gnome-games
@dirrmtry share/ggz
@@ -3117,6 +3190,8 @@ share/omf/swell-foop/swell-foop-sv.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/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/graphics/Makefile b/graphics/Makefile
index fdcea3838653..f2026b95f215 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -223,6 +223,7 @@
SUBDIR += gdal-grass
SUBDIR += gdchart
SUBDIR += gdk-pixbuf
+ SUBDIR += gdk-pixbuf2
SUBDIR += gdtclft
SUBDIR += geeqie
SUBDIR += gegl
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 0f748c619795..ddc7f2b1809e 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -3,12 +3,12 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/cairo/Makefile,v 1.93 2010/04/03 05:40:01 marcus Exp $
+# $MCom: ports/graphics/cairo/Makefile,v 1.101 2010/10/29 15:40:04 kwm Exp $
#
PORTNAME= cairo
-PORTVERSION= 1.8.10
-PORTREVISION?= 1
+PORTVERSION= 1.10.0
+PORTREVISION= 2
PORTEPOCH?= 1
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
@@ -24,17 +24,17 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
pixman-1.9:${PORTSDIR}/x11/pixman
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \
--disable-directfb \
- --enable-pdf \
- --enable-ps
-USE_GNOME= gnomehack ltverhack referencehack
+ --enable-gobject
+USE_GNOME= glib20 gnomehack ltverhack referencehack
USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
- LDFLAGS="${PTHREAD_LIBS}" \
- png_REQUIRES="libpng"
+CPPFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= ${PTHREAD_LIBS}
.if defined(WITHOUT_X11)
CONFIGURE_ARGS+=--disable-xlib
@@ -44,24 +44,25 @@ USE_XORG+= xrender
PLIST_SUB+= X11=""
.endif
-OPTIONS+= GLITZ "Enable Glitz OpenGL Support" Off \
+OPTIONS+= GL "Enable OpenGL Support" Off \
XCB "Enable XCB (X C-language Binding) Support" On
.include <bsd.port.pre.mk>
-.if defined(WITH_GLITZ)
-LIB_DEPENDS+= glitz-glx.1:${PORTSDIR}/graphics/glitz
-CONFIGURE_ARGS+= --enable-glitz
-PLIST_SUB+= GLITZ=""
+.if defined(WITH_GL)
+USE_GL= gl
+CONFIGURE_ARGS+= --enable-gl
+PLIST_SUB+= GL=""
.else
-CONFIGURE_ARGS+= --disable-glitz
-PLIST_SUB+= GLITZ="@comment "
+CONFIGURE_ARGS+= --disable-gl
+PLIST_SUB+= GL="@comment "
.endif
-.ifdef(WITH_XCB)
+.if defined(WITH_XCB)
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util
RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util
CONFIGURE_ARGS+= --enable-xcb
+# this option exposes a bug --enable-xlib-xcb=auto
PLIST_SUB+= XCB=""
.else
CONFIGURE_ARGS+= --disable-xcb
@@ -69,13 +70,17 @@ PLIST_SUB+= XCB="@comment "
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
- ${WRKSRC}/test/Makefile.in
+ @${REINPLACE_CMD} -e '/test/s/==/=/g' \
+ -e '/LIBS/s/-lrt//' \
+ ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|-lcairo|-lcairo ${PTHREAD_LIBS}|' \
${WRKSRC}/src/*.pc.in
- @${REINPLACE_CMD} -e 's|src test doc|src doc|; \
- s|@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = test||' \
+ @${REINPLACE_CMD} -e '/@CAIRO_HAS_PNG_FUNCTIONS_TRUE@.*=/d' \
${WRKSRC}/Makefile.in
+.if defined(WITH_GL)
+ @${REINPLACE_CMD} 's|@CAIRO_CFLAGS@|-I$$(top_srcdir)/src/glew &|' \
+ ${WRKSRC}/src/Makefile.in
+.endif
.include <bsd.port.post.mk>
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 4d008ca43cd3..10a0e78cde6c 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,3 +1,3 @@
-MD5 (cairo-1.8.10.tar.gz) = b60a82f405f9400bbfdcf850b1728d25
-SHA256 (cairo-1.8.10.tar.gz) = 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439
-SIZE (cairo-1.8.10.tar.gz) = 7102657
+MD5 (cairo-1.10.0.tar.gz) = 70a2ece66cf473d976e2db0f75bf199e
+SHA256 (cairo-1.10.0.tar.gz) = 0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2
+SIZE (cairo-1.10.0.tar.gz) = 24022822
diff --git a/graphics/cairo/files/patch-src_cairo.h b/graphics/cairo/files/patch-src_cairo.h
new file mode 100644
index 000000000000..5e12601a0509
--- /dev/null
+++ b/graphics/cairo/files/patch-src_cairo.h
@@ -0,0 +1,11 @@
+--- src/cairo.h.orig 2010-10-29 16:27:48.000000000 +0200
++++ src/cairo.h 2010-10-29 16:28:07.000000000 +0200
+@@ -1973,7 +1973,7 @@ typedef enum _cairo_device_type {
+ CAIRO_DEVICE_TYPE_SCRIPT,
+ CAIRO_DEVICE_TYPE_XCB,
+ CAIRO_DEVICE_TYPE_XLIB,
+- CAIRO_DEVICE_TYPE_XML,
++ CAIRO_DEVICE_TYPE_XML
+ } cairo_device_type_t;
+
+ cairo_public cairo_device_type_t
diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist
index ec0206e6a37d..9271bf93e961 100644
--- a/graphics/cairo/pkg-plist
+++ b/graphics/cairo/pkg-plist
@@ -1,28 +1,48 @@
+bin/cairo-trace
include/cairo/cairo-deprecated.h
include/cairo/cairo-features.h
include/cairo/cairo-ft.h
-%%GLITZ%%include/cairo/cairo-glitz.h
+%%GL%%include/cairo/cairo-gl.h
+include/cairo/cairo-gobject.h
include/cairo/cairo-pdf.h
include/cairo/cairo-ps.h
+include/cairo/cairo-script-interpreter.h
include/cairo/cairo-svg.h
include/cairo/cairo-version.h
-%%XCB%%include/cairo/cairo-xcb-xrender.h
%%XCB%%include/cairo/cairo-xcb.h
%%X11%%include/cairo/cairo-xlib-xrender.h
%%X11%%include/cairo/cairo-xlib.h
include/cairo/cairo.h
+lib/cairo/libcairo-trace.a
+lib/cairo/libcairo-trace.la
+lib/cairo/libcairo-trace.so
+lib/cairo/libcairo-trace.so.0
+lib/libcairo-gobject.a
+lib/libcairo-gobject.la
+lib/libcairo-gobject.so
+lib/libcairo-gobject.so.2
+lib/libcairo-script-interpreter.a
+lib/libcairo-script-interpreter.la
+lib/libcairo-script-interpreter.so
+lib/libcairo-script-interpreter.so.2
lib/libcairo.a
lib/libcairo.la
lib/libcairo.so
lib/libcairo.so.2
libdata/pkgconfig/cairo.pc
+libdata/pkgconfig/cairo-fc.pc
libdata/pkgconfig/cairo-ft.pc
-%%GLITZ%%libdata/pkgconfig/cairo-glitz.pc
+%%GL%%libdata/pkgconfig/cairo-gl.pc
+%%GL%%libdata/pkgconfig/cairo-glx.pc
+libdata/pkgconfig/cairo-gobject.pc
libdata/pkgconfig/cairo-pdf.pc
libdata/pkgconfig/cairo-png.pc
libdata/pkgconfig/cairo-ps.pc
libdata/pkgconfig/cairo-svg.pc
%%XCB%%libdata/pkgconfig/cairo-xcb.pc
+%%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc
%%X11%%libdata/pkgconfig/cairo-xlib.pc
+@comment %%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
%%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
@dirrm include/cairo
+@dirrm lib/cairo
diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index 9eb449539161..bf8813740064 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/cairomm/Makefile,v 1.4 2008/06/16 22:38:50 mezz Exp $
+# $MCom: ports/graphics/cairomm/Makefile,v 1.16 2010/10/26 09:42:43 kwm Exp $
#
PORTNAME= cairomm
-PORTVERSION= 1.8.4
-PORTREVISION= 1
+PORTVERSION= 1.9.6
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
@@ -18,6 +17,8 @@ COMMENT= C++ interface to cairo
LIB_DEPENDS= xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 \
cairo.2:${PORTSDIR}/graphics/cairo
+LICENSE= LGPL20
+LICENSE_FILE= ${WRKSRC}/COPYING
USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
USE_GMAKE= yes
diff --git a/graphics/cairomm/distinfo b/graphics/cairomm/distinfo
index 6fb127edd744..15193e34ba0f 100644
--- a/graphics/cairomm/distinfo
+++ b/graphics/cairomm/distinfo
@@ -1,3 +1,3 @@
-MD5 (cairomm-1.8.4.tar.gz) = 559afbc47484ba3fad265e38a3dafe90
-SHA256 (cairomm-1.8.4.tar.gz) = a28ec6d9af8f93d09076f32cd77de35f9d74a517def5dea12cb8cc2ce3a6c8f1
-SIZE (cairomm-1.8.4.tar.gz) = 906632
+MD5 (cairomm-1.9.6.tar.gz) = f0c0b03142b67d798e781e3f40dea456
+SHA256 (cairomm-1.9.6.tar.gz) = b7a377273b5369118a72f2802f4fd58419db45dae89bd7d0cf2e657e220765f3
+SIZE (cairomm-1.9.6.tar.gz) = 878676
diff --git a/graphics/cairomm/files/patch-cairomm_fontface.cc b/graphics/cairomm/files/patch-cairomm_fontface.cc
deleted file mode 100644
index 18d7fc85b9d3..000000000000
--- a/graphics/cairomm/files/patch-cairomm_fontface.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- cairomm/fontface.cc.orig 2009-02-24 02:40:24.000000000 -0500
-+++ cairomm/fontface.cc 2009-02-24 02:49:31.000000000 -0500
-@@ -309,7 +309,7 @@ UserFontFace::text_to_glyphs(const RefPt
- // bool value in the user_data, which we can read back in the
- // text_to_glyphs_cb and used as a signal to return -1 for the num_glyphs
- // parameter.
-- cairo_font_face_set_user_data(cobj(), &USER_DATA_KEY_DEFAULT_TEXT_TO_GLYPHS, reinterpret_cast<void*>(true), NULL);
-+ cairo_font_face_set_user_data(cobj(), &USER_DATA_KEY_DEFAULT_TEXT_TO_GLYPHS, (void *) (true), NULL);
- return CAIRO_STATUS_SUCCESS;
- }
-
diff --git a/graphics/cairomm/pkg-plist b/graphics/cairomm/pkg-plist
index 83d49b33573d..fb7e7566525b 100644
--- a/graphics/cairomm/pkg-plist
+++ b/graphics/cairomm/pkg-plist
@@ -1,5 +1,6 @@
include/cairomm-1.0/cairomm/cairomm.h
include/cairomm-1.0/cairomm/context.h
+include/cairomm-1.0/cairomm/device.h
include/cairomm-1.0/cairomm/enums.h
include/cairomm-1.0/cairomm/exception.h
include/cairomm-1.0/cairomm/fontface.h
@@ -10,6 +11,7 @@ include/cairomm-1.0/cairomm/pattern.h
include/cairomm-1.0/cairomm/quartz_font.h
include/cairomm-1.0/cairomm/quartz_surface.h
include/cairomm-1.0/cairomm/refptr.h
+include/cairomm-1.0/cairomm/region.h
include/cairomm-1.0/cairomm/scaledfont.h
include/cairomm-1.0/cairomm/surface.h
include/cairomm-1.0/cairomm/types.h
@@ -28,12 +30,16 @@ libdata/pkgconfig/cairomm-png-1.0.pc
libdata/pkgconfig/cairomm-ps-1.0.pc
libdata/pkgconfig/cairomm-svg-1.0.pc
libdata/pkgconfig/cairomm-xlib-1.0.pc
+libdata/pkgconfig/cairomm-xlib-xrender-1.0.pc
%%PORTDOCS%%share/devhelp/books/cairomm-1.0/cairomm-1.0.devhelp2
%%PORTDOCS%%share/doc/cairomm-1.0/reference/cairomm-1.0.tag
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/annotated.html
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/bc_s.png
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/cairomm.css
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Context-members.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Context.html
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Device-members.html
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Device.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1FontFace-members.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1FontFace.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1FontOptions-members.html
@@ -68,6 +74,8 @@ libdata/pkgconfig/cairomm-xlib-1.0.pc
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1RadialGradient.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1RefPtr-members.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1RefPtr.html
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Region-members.html
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Region.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1ScaledFont-members.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1ScaledFont.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1SolidPattern-members.html
@@ -96,6 +104,7 @@ libdata/pkgconfig/cairomm-xlib-1.0.pc
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1logic__error.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classcairo__matrix__t.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classes.html
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/closed.png
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/deprecated.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/doxygen.png
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/examples.html
@@ -153,6 +162,8 @@ libdata/pkgconfig/cairomm-xlib-1.0.pc
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__0.png
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__1.png
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__10.png
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__11.png
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__12.png
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__2.png
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__3.png
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__4.png
@@ -168,15 +179,19 @@ libdata/pkgconfig/cairomm-xlib-1.0.pc
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/namespacemembers_eval.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/namespacemembers_type.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/namespaces.html
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/nav_f.png
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/nav_h.png
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/open.png
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/pages.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/pdf-surface_8cc-example.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/ps-surface_8cc-example.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/structCairo_1_1ColorStop-members.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/structCairo_1_1ColorStop.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/svg-surface_8cc-example.html
-%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_b.gif
-%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_l.gif
-%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_r.gif
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_a.png
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_b.png
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_h.png
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_s.png
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tabs.css
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/toy-text_8cc-example.html
%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/user-font_8cc-example.html
diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile
index d8487f15c1fa..1ed07187a3ce 100644
--- a/graphics/clutter-gtk/Makefile
+++ b/graphics/clutter-gtk/Makefile
@@ -6,10 +6,11 @@
#
PORTNAME= clutter-gtk
-PORTVERSION= 0.10.4
+PORTVERSION= 0.10.8
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/
+MASTER_SITES= GNOME \
+ http://source.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/
MAINTAINER= gnome@FreeBSD.org
COMMENT= GTK+ Integration library for Clutter
@@ -28,8 +29,4 @@ 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 6447d72ffd06..008e8138e52e 100644
--- a/graphics/clutter-gtk/distinfo
+++ b/graphics/clutter-gtk/distinfo
@@ -1,3 +1,3 @@
-MD5 (clutter-gtk-0.10.4.tar.bz2) = fd015e8080e1212dacc95d0e3d776d0d
-SHA256 (clutter-gtk-0.10.4.tar.bz2) = 0134a8de202c518e231f340f5f2f3e988350105de9fadd0e849f08d95ac1b912
-SIZE (clutter-gtk-0.10.4.tar.bz2) = 307429
+MD5 (clutter-gtk-0.10.8.tar.bz2) = 22b4ebddc795e40d83622d7d23669eff
+SHA256 (clutter-gtk-0.10.8.tar.bz2) = 7867f951568871d9f68cbe8a3644fd53d2138f725b7ba61ffc0053eb64e80814
+SIZE (clutter-gtk-0.10.8.tar.bz2) = 321316
diff --git a/graphics/clutter-gtk/files/patch-clutter-gtk_Makefile.in b/graphics/clutter-gtk/files/patch-clutter-gtk_Makefile.in
new file mode 100644
index 000000000000..80c495f4867f
--- /dev/null
+++ b/graphics/clutter-gtk/files/patch-clutter-gtk_Makefile.in
@@ -0,0 +1,28 @@
+--- clutter-gtk/Makefile.in.orig 2010-10-07 22:59:05.000000000 +0200
++++ clutter-gtk/Makefile.in 2010-10-07 23:01:50.000000000 +0200
+@@ -289,6 +289,7 @@
+ -DCLUTTER_DISABLE_DEPRECATED \
+ $(CLUTTER_GTK_DEBUG_CFLAGS)
+
++common_cflags = $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
+
+ # please, keep these lists sorted alphabetically
+ sources_c = \
+@@ -311,7 +312,7 @@
+ libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c)
+ libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
+ libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
+-libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS)
++libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(common_cflags) $(MAINTAINER_CFLAGS)
+ cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk
+ cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h
+ @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GtkClutter-@CLUTTER_GTK_API_VERSION@.gir
+@@ -744,7 +745,7 @@
+ @HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
+ @HAVE_INTROSPECTION_TRUE@ --namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
+ @HAVE_INTROSPECTION_TRUE@ --strip-prefix=GtkClutter \
+-@HAVE_INTROSPECTION_TRUE@ $(INCLUDES) $(AM_CPPFLAGS) \
++@HAVE_INTROSPECTION_TRUE@ $(INCLUDES) $(AM_CPPFLAGS) $(common_cflags) \
+ @HAVE_INTROSPECTION_TRUE@ --add-include-path=$(srcdir) --add-include=path=. \
+ @HAVE_INTROSPECTION_TRUE@ --include=Clutter-1.0 \
+ @HAVE_INTROSPECTION_TRUE@ --include=GdkPixbuf-2.0 \
diff --git a/graphics/clutter-qt/Makefile b/graphics/clutter-qt/Makefile
index 1895eb049676..f20c1fa2cfea 100644
--- a/graphics/clutter-qt/Makefile
+++ b/graphics/clutter-qt/Makefile
@@ -16,6 +16,8 @@ COMMENT= QT+ Integration library for Clutter
LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
+BROKEN= Doesn't build with Glib-2.26
+
USE_BZIP2= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index 19138147f06a..1cd758a06b73 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -3,11 +3,11 @@
# Whom: Martin Wilke <miwi@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/clutter/Makefile,v 1.1 2010/07/15 14:48:21 kwm Exp $
+# $MCom: ports/graphics/clutter/Makefile,v 1.34 2010/09/24 16:35:42 kwm Exp $
#
PORTNAME= clutter
-PORTVERSION= 1.2.12
+PORTVERSION= 1.4.0
CATEGORIES= graphics
MASTER_SITES= GNOME \
http://www.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/
@@ -15,15 +15,19 @@ MASTER_SITES= GNOME \
MAINTAINER= gnome@FreeBSD.org
COMMENT= OpenGL based interactive canvas library
+LIB_DEPENDS= json-glib-1.0.0:${PORTSDIR}/devel/json-glib
+
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
USE_GMAKE= yes
USE_GETTEXT= yes
USE_BZIP2= yes
USE_AUTOTOOLS= libtool:22
-USE_GNOME= pkgconfig gtk20 gnomehack ltverhack gnomeprefix
+USE_GNOME= pkgconfig gdkpixbuf2 gnomehack ltverhack gnomeprefix atk pango
USE_GL= gl
USE_XORG= glproto x11 xfixes xdamage xcomposite xi
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --with-x --with-json=internal
+CONFIGURE_ARGS= --with-x --enable-conformance=no
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/graphics/clutter/distinfo b/graphics/clutter/distinfo
index 99cb48c39429..2f859197a3c4 100644
--- a/graphics/clutter/distinfo
+++ b/graphics/clutter/distinfo
@@ -1,3 +1,3 @@
-MD5 (clutter-1.2.12.tar.bz2) = 76f70e765adcf7146be1ceb50bafa14f
-SHA256 (clutter-1.2.12.tar.bz2) = 4582e6579897374d1f8ce51daa330311ebb90033fad95d5f076c1e9392b4ae68
-SIZE (clutter-1.2.12.tar.bz2) = 2396325
+MD5 (clutter-1.4.0.tar.bz2) = 329b6ac4e14b6f63b23297cfbb05af93
+SHA256 (clutter-1.4.0.tar.bz2) = bcdb2c55a083b8f18b0205e816c303605926b03e19f380294a203ae19ec02c96
+SIZE (clutter-1.4.0.tar.bz2) = 4476562
diff --git a/graphics/clutter/files/patch-clutter_cogl_cogl_Makefile.in b/graphics/clutter/files/patch-clutter_cogl_cogl_Makefile.in
new file mode 100644
index 000000000000..ec4a62547896
--- /dev/null
+++ b/graphics/clutter/files/patch-clutter_cogl_cogl_Makefile.in
@@ -0,0 +1,10 @@
+--- clutter/cogl/cogl/Makefile.in.orig 2010-11-20 14:38:12.000000000 +0100
++++ clutter/cogl/cogl/Makefile.in 2010-11-20 14:47:42.000000000 +0100
+@@ -582,6 +582,7 @@
+ -I$(srcdir)/winsys \
+ -I$(srcdir)/driver/$(COGL_DRIVER) \
+ -I$(top_builddir)/clutter/cogl \
++ `pkg-config --cflags gl` \
+ $(NULL)
+
+ AM_CPPFLAGS = \
diff --git a/graphics/clutter/files/patch-clutter_glx_clutter-stage-glx.c b/graphics/clutter/files/patch-clutter_glx_clutter-stage-glx.c
deleted file mode 100644
index fff439a43af2..000000000000
--- a/graphics/clutter/files/patch-clutter_glx_clutter-stage-glx.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- clutter/glx/clutter-stage-glx.c.orig 2010-07-15 15:58:02.000000000 +0000
-+++ clutter/glx/clutter-stage-glx.c 2010-07-15 15:58:25.000000000 +0000
-@@ -487,8 +487,8 @@
- (retraceCount + 1) % 2,
- &retraceCount);
- }
-- else
- #ifdef __linux__
-+ else
- {
- drm_wait_vblank_t blank;
-
diff --git a/graphics/clutter/pkg-plist b/graphics/clutter/pkg-plist
index 829bcbdc4edc..59a6dba2c5fc 100644
--- a/graphics/clutter/pkg-plist
+++ b/graphics/clutter/pkg-plist
@@ -1,4 +1,19 @@
+include/clutter-1.0/cally/cally-actor.h
+include/clutter-1.0/cally/cally-clone.h
+include/clutter-1.0/cally/cally-factory.h
+include/clutter-1.0/cally/cally-group.h
+include/clutter-1.0/cally/cally-main.h
+include/clutter-1.0/cally/cally-rectangle.h
+include/clutter-1.0/cally/cally-root.h
+include/clutter-1.0/cally/cally-stage.h
+include/clutter-1.0/cally/cally-text.h
+include/clutter-1.0/cally/cally-texture.h
+include/clutter-1.0/cally/cally-util.h
+include/clutter-1.0/cally/cally.h
+include/clutter-1.0/clutter/clutter-action.h
include/clutter-1.0/clutter/clutter-actor.h
+include/clutter-1.0/clutter/clutter-actor-meta.h
+include/clutter-1.0/clutter/clutter-align-constraint.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
@@ -12,16 +27,25 @@ 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-bin-layout.h
+include/clutter-1.0/clutter/clutter-bind-constraint.h
include/clutter-1.0/clutter/clutter-binding-pool.h
+include/clutter-1.0/clutter/clutter-blur-effect.h
include/clutter-1.0/clutter/clutter-box-layout.h
include/clutter-1.0/clutter/clutter-box.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-click-action.h
include/clutter-1.0/clutter/clutter-clone.h
include/clutter-1.0/clutter/clutter-color.h
+include/clutter-1.0/clutter/clutter-colorize-effect.h
include/clutter-1.0/clutter/clutter-container.h
+include/clutter-1.0/clutter/clutter-constraint.h
+include/clutter-1.0/clutter/clutter-deform-effect.h
include/clutter-1.0/clutter/clutter-deprecated.h
+include/clutter-1.0/clutter/clutter-desaturate-effect.h
include/clutter-1.0/clutter/clutter-device-manager.h
+include/clutter-1.0/clutter/clutter-drag-action.h
+include/clutter-1.0/clutter/clutter-effect.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
@@ -33,23 +57,31 @@ include/clutter-1.0/clutter/clutter-group.h
include/clutter-1.0/clutter/clutter-input-device.h
include/clutter-1.0/clutter/clutter-interval.h
include/clutter-1.0/clutter/clutter-json.h
+include/clutter-1.0/clutter/clutter-keysyms-compat.h
include/clutter-1.0/clutter/clutter-keysyms.h
include/clutter-1.0/clutter/clutter-layout-manager.h
include/clutter-1.0/clutter/clutter-layout-meta.h
include/clutter-1.0/clutter/clutter-list-model.h
include/clutter-1.0/clutter/clutter-main.h
+include/clutter-1.0/clutter/clutter-marshal.h
include/clutter-1.0/clutter/clutter-media.h
include/clutter-1.0/clutter/clutter-model.h
+include/clutter-1.0/clutter/clutter-offscreen-effect.h
+include/clutter-1.0/clutter/clutter-page-turn-effect.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-settings.h
+include/clutter-1.0/clutter/clutter-shader-effect.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-window.h
include/clutter-1.0/clutter/clutter-stage.h
+include/clutter-1.0/clutter/clutter-state.h
+include/clutter-1.0/clutter/clutter-table-layout.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
@@ -61,47 +93,80 @@ 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-buffer.h
include/clutter-1.0/cogl/cogl-color.h
-include/clutter-1.0/cogl/cogl-debug.h
include/clutter-1.0/cogl/cogl-defines.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-object.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-pixel-buffer.h
+include/clutter-1.0/cogl/cogl-pixel-array.h
include/clutter-1.0/cogl/cogl-primitives.h
include/clutter-1.0/cogl/cogl-shader.h
+include/clutter-1.0/cogl/cogl-texture-3d.h
+include/clutter-1.0/cogl/cogl-texture-pixmap-x11.h
include/clutter-1.0/cogl/cogl-texture.h
include/clutter-1.0/cogl/cogl-types.h
+include/clutter-1.0/cogl/cogl-vector.h
include/clutter-1.0/cogl/cogl-vertex-buffer.h
include/clutter-1.0/cogl/cogl.h
+lib/girepository-1.0/Cally-1.0.typelib
lib/girepository-1.0/Clutter-1.0.typelib
+lib/girepository-1.0/ClutterX11-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/cally-1.0.pc
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
+share/doc/cally/CallyActor.html
+share/doc/cally/CallyClone.html
+share/doc/cally/CallyGroup.html
+share/doc/cally/CallyRectangle.html
+share/doc/cally/CallyRoot.html
+share/doc/cally/CallyStage.html
+share/doc/cally/CallyText.html
+share/doc/cally/CallyTexture.html
+share/doc/cally/CallyUtil.html
+share/doc/cally/cally-General-API.html
+share/doc/cally/cally.devhelp
+share/doc/cally/cally.devhelp2
+share/doc/cally/callybase.html
+share/doc/cally/callyobjecthierarchy.html
+share/doc/cally/callyobjectindex.html
+share/doc/cally/callyobjects.html
+share/doc/cally/ch01.html
+share/doc/cally/ch02.html
+share/doc/cally/clutter-overview.html
+share/doc/cally/home.png
+share/doc/cally/index.html
+share/doc/cally/index.sgml
+share/doc/cally/ix01.html
+share/doc/cally/ix02.html
+share/doc/cally/ix03.html
+share/doc/cally/left.png
+share/doc/cally/license.html
+share/doc/cally/right.png
+share/doc/cally/style.css
+share/doc/cally/up.png
+%%DOCSDIR%%/ClutterAction.html
%%DOCSDIR%%/ClutterActor.html
+%%DOCSDIR%%/ClutterActorMeta.html
+%%DOCSDIR%%/ClutterAlignConstraint.html
%%DOCSDIR%%/ClutterAlpha.html
%%DOCSDIR%%/ClutterAnimatable.html
%%DOCSDIR%%/ClutterAnimator.html
@@ -113,13 +178,22 @@ libdata/pkgconfig/cogl-gl-1.0.pc
%%DOCSDIR%%/ClutterBehaviourRotate.html
%%DOCSDIR%%/ClutterBehaviourScale.html
%%DOCSDIR%%/ClutterBinLayout.html
+%%DOCSDIR%%/ClutterBindConstraint.html
+%%DOCSDIR%%/ClutterBlurEffect.html
%%DOCSDIR%%/ClutterBox.html
%%DOCSDIR%%/ClutterBoxLayout.html
%%DOCSDIR%%/ClutterCairoTexture.html
%%DOCSDIR%%/ClutterChildMeta.html
+%%DOCSDIR%%/ClutterClickAction.html
%%DOCSDIR%%/ClutterClone.html
+%%DOCSDIR%%/ClutterColorizeEffect.html
%%DOCSDIR%%/ClutterContainer.html
+%%DOCSDIR%%/ClutterConstraint.html
+%%DOCSDIR%%/ClutterDeformEffect.html
%%DOCSDIR%%/ClutterDeviceManager.html
+%%DOCSDIR%%/ClutterDesaturateEffect.html
+%%DOCSDIR%%/ClutterDragAction.html
+%%DOCSDIR%%/ClutterEffect.html
%%DOCSDIR%%/ClutterFixedLayout.html
%%DOCSDIR%%/ClutterFlowLayout.html
%%DOCSDIR%%/ClutterGroup.html
@@ -130,12 +204,18 @@ libdata/pkgconfig/cogl-gl-1.0.pc
%%DOCSDIR%%/ClutterMedia.html
%%DOCSDIR%%/ClutterModel.html
%%DOCSDIR%%/ClutterModelIter.html
+%%DOCSDIR%%/ClutterOffscreenEffect.html
+%%DOCSDIR%%/ClutterPageTurnEffect.html
%%DOCSDIR%%/ClutterPath.html
%%DOCSDIR%%/ClutterRectangle.html
%%DOCSDIR%%/ClutterScore.html
%%DOCSDIR%%/ClutterScript.html
%%DOCSDIR%%/ClutterScriptable.html
+%%DOCSDIR%%/ClutterSettings.html
+%%DOCSDIR%%/ClutterShaderEffect.html
%%DOCSDIR%%/ClutterStage.html
+%%DOCSDIR%%/ClutterState.html
+%%DOCSDIR%%/ClutterTableLayout.html
%%DOCSDIR%%/ClutterText.html
%%DOCSDIR%%/ClutterTexture.html
%%DOCSDIR%%/ClutterTimeline.html
@@ -156,15 +236,17 @@ libdata/pkgconfig/cogl-gl-1.0.pc
%%DOCSDIR%%/ch08.html
%%DOCSDIR%%/ch09.html
%%DOCSDIR%%/ch10.html
+%%DOCSDIR%%/ch11.html
%%DOCSDIR%%/clutter-ClutterBackend.html
+%%DOCSDIR%%/clutter-ClutterX11TexturePixmap.html
%%DOCSDIR%%/clutter-Colors.html
%%DOCSDIR%%/clutter-EGL-Specific-Support.html
-%%DOCSDIR%%/clutter-EGLX-Specific-Support.html
%%DOCSDIR%%/clutter-Events.html
%%DOCSDIR%%/clutter-Features.html
%%DOCSDIR%%/clutter-GLX-Specific-Support.html
%%DOCSDIR%%/clutter-General.html
%%DOCSDIR%%/clutter-Implicit-Animations.html
+%%DOCSDIR%%/clutter-Intel-CE3100-CE4100-Specific-Support.html
%%DOCSDIR%%/clutter-Key-Bindings.html
%%DOCSDIR%%/clutter-Shaders.html
%%DOCSDIR%%/clutter-Stage-Manager.html
@@ -209,6 +291,7 @@ libdata/pkgconfig/cogl-gl-1.0.pc
%%DOCSDIR%%/ix06.html
%%DOCSDIR%%/ix07.html
%%DOCSDIR%%/ix08.html
+%%DOCSDIR%%/ix09.html
%%DOCSDIR%%/left.png
%%DOCSDIR%%/license.html
%%DOCSDIR%%/migrating-ClutterEffect.html
@@ -223,22 +306,36 @@ libdata/pkgconfig/cogl-gl-1.0.pc
%%DOCSDIR%%/using-cairo.html
share/doc/cogl/ch01.html
share/doc/cogl/ch02.html
+share/doc/cogl/ch03.html
+share/doc/cogl/cogl-3D-textures.html
share/doc/cogl/cogl-Blend-Strings.html
share/doc/cogl/cogl-Buffers.html
+share/doc/cogl/cogl-Clipping-(Deprecated).html
share/doc/cogl/cogl-Clipping.html
share/doc/cogl/cogl-Color-Type.html
share/doc/cogl/cogl-Fixed-Point-API.html
+share/doc/cogl/cogl-General-API-(Deprecated).html
share/doc/cogl/cogl-General-API.html
+share/doc/cogl/cogl-Materials-(Deprecated).html
share/doc/cogl/cogl-Materials.html
share/doc/cogl/cogl-Matrices.html
+share/doc/cogl/cogl-Offscreen-Buffers-(Deprecated).html
share/doc/cogl/cogl-Offscreen-Buffers.html
+share/doc/cogl/cogl-Path-Primitives.html
share/doc/cogl/cogl-Primitives.html
+share/doc/cogl/cogl-Shaders-and-Programmable-Pipeline-(Deprecated).html
share/doc/cogl/cogl-Shaders-and-Programmable-Pipeline.html
+share/doc/cogl/cogl-Textures-(Deprecated).html
share/doc/cogl/cogl-Textures.html
+share/doc/cogl/cogl-Vectors.html
+share/doc/cogl/cogl-Vertex-Buffers-(Deprecated).html
share/doc/cogl/cogl-Vertex-Buffers.html
share/doc/cogl/cogl.devhelp
share/doc/cogl/cogl.devhelp2
-share/doc/cogl/fill-rule.png
+share/doc/cogl/cogl_ortho.png
+share/doc/cogl/coglglossary.html
+share/doc/cogl/fill-rule-even-odd.png
+share/doc/cogl/fill-rule-non-zero.png
share/doc/cogl/home.png
share/doc/cogl/index.html
share/doc/cogl/index.sgml
@@ -247,19 +344,28 @@ share/doc/cogl/ix02.html
share/doc/cogl/ix03.html
share/doc/cogl/ix04.html
share/doc/cogl/ix05.html
+share/doc/cogl/ix06.html
share/doc/cogl/left.png
share/doc/cogl/license.html
+share/doc/cogl/quad-indices-order.png
+share/doc/cogl/quad-indices-triangles.png
share/doc/cogl/right.png
share/doc/cogl/style.css
share/doc/cogl/up.png
+share/gir-1.0/Cally-1.0.gir
share/gir-1.0/Clutter-1.0.gir
-share/gir-1.0/ClutterJson-1.0.gir
+share/gir-1.0/ClutterX11-1.0.gir
share/gir-1.0/Cogl-1.0.gir
+share/locale/de/LC_MESSAGES/clutter-1.0.mo
+share/locale/it/LC_MESSAGES/clutter-1.0.mo
+share/locale/pl/LC_MESSAGES/clutter-1.0.mo
+share/locale/zh_CN/LC_MESSAGES/clutter-1.0.mo
@dirrm share/doc/cogl
+@dirrm share/doc/cally
@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/cally
@dirrm include/clutter-1.0
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index fe68490b16a3..9fed45c5dd5e 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/eog-plugins/Makefile,v 1.1 2010/06/23 15:28:22 kwm Exp $
+# $MCom: ports/graphics/eog-plugins/Makefile,v 1.14 2010/09/04 18:09:30 kwm Exp $
#
PORTNAME= eog-plugins
PORTVERSION= 2.30.1
+PORTREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -31,8 +32,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
.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
+ (exists(${LOCALBASE}/lib/libchamplain-0.8.so)) || defined(WITH_CHAMPLIAN)
+LIB_DEPENDS+= champlain-0.8.1:${PORTSDIR}/graphics/libchamplain
PLIST_SUB+= CHAMPLAIN=""
.else
PLUST_SUB+= CHAMPLAIN="@comment "
@@ -55,4 +56,9 @@ CONFIGURE_ARGS+=--disable-python
PLIST_SUB+= PYTHON="@comment "
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|champlain-0.4|champlain-0.8|g' \
+ -e 's|champlain-gtk-0.4|champlain-gtk-0.8|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.post.mk>
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 7c2d37be98da..01c15ffdca11 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/eog/Makefile,v 1.10 2010/06/23 15:24:15 kwm Exp $
+# $MCom: ports/graphics/eog/Makefile,v 1.123 2010/11/16 10:11:41 kwm Exp $
#
PORTNAME= eog
-PORTVERSION= 2.30.2
+PORTVERSION= 2.32.1
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,13 +15,15 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= The Eye Of Gnome image viewer
-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
+BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
+ update-mime-database:${PORTSDIR}/misc/shared-mime-info
+RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
+ update-mime-database:${PORTSDIR}/misc/shared-mime-info
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack librsvg2 desktopfileutils \
- gnomedesktop
+ gconf2 gnomedesktop
WANT_GNOME= yes
INSTALLS_ICONS= yes
USE_GETTEXT= yes
@@ -59,8 +61,8 @@ PLIST_SUB+= EXIFEXEMPI=""
PLIST_SUB+= EXIFEXEMPI="@comment "
.endif
-.if ${HAVE_GNOME:Mpygnome2}!=""
-USE_GNOME+= pygnome2
+.if ${HAVE_GNOME:Mpygtk2}!=""
+USE_GNOME+= pygtk2
CONFIGURE_ARGS+=--enable-python
.else
CONFIGURE_ARGS+=--disable-python
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index e744a76a973f..f47a31c3ca22 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/eog-2.30.2.tar.bz2) = 2f7fdf9392f24229fd82c53e8465f998
-SHA256 (gnome2/eog-2.30.2.tar.bz2) = 0f508cbc1727181122410f921f54d6c1464d0b98d544a04bd7d021d43d2ab91b
-SIZE (gnome2/eog-2.30.2.tar.bz2) = 2789170
+SHA256 (gnome2/eog-2.32.1.tar.bz2) = 543672fb8e8e300bf2cf4c7eef43b5b1624e2e48e6aa0801a083ae7beb2d7078
+SIZE (gnome2/eog-2.32.1.tar.bz2) = 2804681
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index 0d8ca576f30b..92f6c69b22c4 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -259,6 +259,7 @@ share/locale/is/LC_MESSAGES/eog.mo
share/locale/it/LC_MESSAGES/eog.mo
share/locale/ja/LC_MESSAGES/eog.mo
share/locale/ka/LC_MESSAGES/eog.mo
+share/locale/kk/LC_MESSAGES/eog.mo
share/locale/kn/LC_MESSAGES/eog.mo
share/locale/ko/LC_MESSAGES/eog.mo
share/locale/ks/LC_MESSAGES/eog.mo
@@ -448,6 +449,8 @@ share/omf/eog/eog-zh_TW.omf
@dirrmtry share/locale/ku
@dirrmtry share/locale/ks/LC_MESSAGES
@dirrmtry share/locale/ks
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/en@shaw/LC_MESSAGES
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 596aeece77bc..cd85c2f72e26 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.11 2010/06/24 10:03:54 kwm Exp $
+# $MCom: ports/graphics/evince/Makefile,v 1.147 2010/09/28 07:27:12 kwm Exp $
#
PORTNAME= evince
-PORTVERSION= 2.30.3
-PORTREVISION= 2
+PORTVERSION= 2.32.0
CATEGORIES= graphics print gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,7 +16,7 @@ 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 \
+LIB_DEPENDS= poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk \
spectre.1:${PORTSDIR}/print/libspectre
RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
@@ -33,10 +32,13 @@ USE_GNOME= gnomehack intlhack gnomeprefix desktopfileutils \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-GCONF_SCHEMAS= evince.schemas \
+GLIB_SCHEMAS= org.gnome.Evince.gschema.xml
+GCONF_SCHEMAS= \
evince-thumbnailer.schemas \
evince-thumbnailer-ps.schemas
+PLIST_SUB+= VERSION=2.32
+
MAN1= evince.1
OPTIONS= DVI "Enable DVI viewer support" off \
@@ -120,6 +122,7 @@ PLIST_SUB+= COMICS="@comment "
post-patch:
@${REINPLACE_CMD} -e 's|execinfo.h|#|g' \
+ -e 's|" == "|" = "|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e '/^DOC_MODULE_VERSION/d' \
${WRKSRC}/help/reference/libdocument/Makefile.in \
@@ -127,5 +130,7 @@ post-patch:
post-install:
@-update-desktop-database
+ @${INSTALL_DATA} ${WRKSRC}/data/org.gnome.Evince.gschema.xml \
+ ${PREFIX}/share/glib-2.0/schemas
.include <bsd.port.post.mk>
diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo
index 8c3b0f42b085..bee1bd741bd8 100644
--- a/graphics/evince/distinfo
+++ b/graphics/evince/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evince-2.30.3.tar.bz2) = 516748897113cd4e9638c49245c555c2
-SHA256 (gnome2/evince-2.30.3.tar.bz2) = daddd9720bf8fc0156d9a4a5a85485c232393896376707cf7fcedfcbc515732f
-SIZE (gnome2/evince-2.30.3.tar.bz2) = 2180874
+MD5 (gnome2/evince-2.32.0.tar.bz2) = ebc3ce6df8dcbf29cb9492f8dd031319
+SHA256 (gnome2/evince-2.32.0.tar.bz2) = 2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7
+SIZE (gnome2/evince-2.32.0.tar.bz2) = 2295272
diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist
index c5fcd85807f1..af50cbf4da50 100644
--- a/graphics/evince/pkg-plist
+++ b/graphics/evince/pkg-plist
@@ -1,95 +1,97 @@
bin/evince
bin/evince-previewer
bin/evince-thumbnailer
-include/evince/2.30/evince-document.h
-include/evince/2.30/evince-view.h
-include/evince/2.30/libdocument/ev-annotation.h
-include/evince/2.30/libdocument/ev-async-renderer.h
-include/evince/2.30/libdocument/ev-attachment.h
-include/evince/2.30/libdocument/ev-backends-manager.h
-include/evince/2.30/libdocument/ev-document-annotations.h
-include/evince/2.30/libdocument/ev-document-attachments.h
-include/evince/2.30/libdocument/ev-document-factory.h
-include/evince/2.30/libdocument/ev-document-find.h
-include/evince/2.30/libdocument/ev-document-fonts.h
-include/evince/2.30/libdocument/ev-document-forms.h
-include/evince/2.30/libdocument/ev-document-images.h
-include/evince/2.30/libdocument/ev-document-info.h
-include/evince/2.30/libdocument/ev-document-layers.h
-include/evince/2.30/libdocument/ev-document-links.h
-include/evince/2.30/libdocument/ev-document-misc.h
-include/evince/2.30/libdocument/ev-document-print.h
-include/evince/2.30/libdocument/ev-document-security.h
-include/evince/2.30/libdocument/ev-document-thumbnails.h
-include/evince/2.30/libdocument/ev-document-transition.h
-include/evince/2.30/libdocument/ev-document-type-builtins.h
-include/evince/2.30/libdocument/ev-document.h
-include/evince/2.30/libdocument/ev-file-exporter.h
-include/evince/2.30/libdocument/ev-file-helpers.h
-include/evince/2.30/libdocument/ev-form-field.h
-include/evince/2.30/libdocument/ev-image.h
-include/evince/2.30/libdocument/ev-init.h
-include/evince/2.30/libdocument/ev-layer.h
-include/evince/2.30/libdocument/ev-link-action.h
-include/evince/2.30/libdocument/ev-link-dest.h
-include/evince/2.30/libdocument/ev-link.h
-include/evince/2.30/libdocument/ev-mapping.h
-include/evince/2.30/libdocument/ev-page.h
-include/evince/2.30/libdocument/ev-render-context.h
-include/evince/2.30/libdocument/ev-selection.h
-include/evince/2.30/libdocument/ev-transition-effect.h
-include/evince/2.30/libdocument/ev-version.h
-include/evince/2.30/libview/ev-document-model.h
-include/evince/2.30/libview/ev-job-scheduler.h
-include/evince/2.30/libview/ev-jobs.h
-include/evince/2.30/libview/ev-print-operation.h
-include/evince/2.30/libview/ev-stock-icons.h
-include/evince/2.30/libview/ev-view-presentation.h
-include/evince/2.30/libview/ev-view-type-builtins.h
-include/evince/2.30/libview/ev-view.h
-%%COMICS%%lib/evince/2/backends/comicsdocument.evince-backend
-%%DJVU%%lib/evince/2/backends/djvudocument.evince-backend
-%%DVI%%lib/evince/2/backends/dvidocument.evince-backend
-%%IMPRESS%%lib/evince/2/backends/impressdocument.evince-backend
-%%COMICS%%lib/evince/2/backends/libcomicsdocument.a
-%%COMICS%%lib/evince/2/backends/libcomicsdocument.la
-%%COMICS%%lib/evince/2/backends/libcomicsdocument.so
-%%DJVU%%lib/evince/2/backends/libdjvudocument.a
-%%DJVU%%lib/evince/2/backends/libdjvudocument.la
-%%DJVU%%lib/evince/2/backends/libdjvudocument.so
-%%DVI%%lib/evince/2/backends/libdvidocument.a
-%%DVI%%lib/evince/2/backends/libdvidocument.la
-%%DVI%%lib/evince/2/backends/libdvidocument.so
-%%IMPRESS%%lib/evince/2/backends/libimpressdocument.a
-%%IMPRESS%%lib/evince/2/backends/libimpressdocument.la
-%%IMPRESS%%lib/evince/2/backends/libimpressdocument.so
-lib/evince/2/backends/libpdfdocument.a
-lib/evince/2/backends/libpdfdocument.la
-lib/evince/2/backends/libpdfdocument.so
-lib/evince/2/backends/libpsdocument.a
-lib/evince/2/backends/libpsdocument.la
-lib/evince/2/backends/libpsdocument.so
-lib/evince/2/backends/libtiffdocument.a
-lib/evince/2/backends/libtiffdocument.la
-lib/evince/2/backends/libtiffdocument.so
-lib/evince/2/backends/pdfdocument.evince-backend
-lib/evince/2/backends/psdocument.evince-backend
-lib/evince/2/backends/tiffdocument.evince-backend
+include/evince/%%VERSION%%/evince-document.h
+include/evince/%%VERSION%%/evince-view.h
+include/evince/%%VERSION%%/libdocument/ev-annotation.h
+include/evince/%%VERSION%%/libdocument/ev-async-renderer.h
+include/evince/%%VERSION%%/libdocument/ev-attachment.h
+include/evince/%%VERSION%%/libdocument/ev-backends-manager.h
+include/evince/%%VERSION%%/libdocument/ev-document-annotations.h
+include/evince/%%VERSION%%/libdocument/ev-document-attachments.h
+include/evince/%%VERSION%%/libdocument/ev-document-factory.h
+include/evince/%%VERSION%%/libdocument/ev-document-find.h
+include/evince/%%VERSION%%/libdocument/ev-document-fonts.h
+include/evince/%%VERSION%%/libdocument/ev-document-forms.h
+include/evince/%%VERSION%%/libdocument/ev-document-images.h
+include/evince/%%VERSION%%/libdocument/ev-document-info.h
+include/evince/%%VERSION%%/libdocument/ev-document-layers.h
+include/evince/%%VERSION%%/libdocument/ev-document-links.h
+include/evince/%%VERSION%%/libdocument/ev-document-misc.h
+include/evince/%%VERSION%%/libdocument/ev-document-print.h
+include/evince/%%VERSION%%/libdocument/ev-document-security.h
+include/evince/%%VERSION%%/libdocument/ev-document-text.h
+include/evince/%%VERSION%%/libdocument/ev-document-thumbnails.h
+include/evince/%%VERSION%%/libdocument/ev-document-transition.h
+include/evince/%%VERSION%%/libdocument/ev-document-type-builtins.h
+include/evince/%%VERSION%%/libdocument/ev-document.h
+include/evince/%%VERSION%%/libdocument/ev-file-exporter.h
+include/evince/%%VERSION%%/libdocument/ev-file-helpers.h
+include/evince/%%VERSION%%/libdocument/ev-form-field.h
+include/evince/%%VERSION%%/libdocument/ev-image.h
+include/evince/%%VERSION%%/libdocument/ev-init.h
+include/evince/%%VERSION%%/libdocument/ev-layer.h
+include/evince/%%VERSION%%/libdocument/ev-link-action.h
+include/evince/%%VERSION%%/libdocument/ev-link-dest.h
+include/evince/%%VERSION%%/libdocument/ev-link.h
+include/evince/%%VERSION%%/libdocument/ev-mapping-list.h
+include/evince/%%VERSION%%/libdocument/ev-page.h
+include/evince/%%VERSION%%/libdocument/ev-render-context.h
+include/evince/%%VERSION%%/libdocument/ev-selection.h
+include/evince/%%VERSION%%/libdocument/ev-transition-effect.h
+include/evince/%%VERSION%%/libdocument/ev-version.h
+include/evince/%%VERSION%%/libview/ev-document-model.h
+include/evince/%%VERSION%%/libview/ev-job-scheduler.h
+include/evince/%%VERSION%%/libview/ev-jobs.h
+include/evince/%%VERSION%%/libview/ev-print-operation.h
+include/evince/%%VERSION%%/libview/ev-stock-icons.h
+include/evince/%%VERSION%%/libview/ev-view-presentation.h
+include/evince/%%VERSION%%/libview/ev-view-type-builtins.h
+include/evince/%%VERSION%%/libview/ev-view.h
+%%COMICS%%lib/evince/3/backends/comicsdocument.evince-backend
+%%DJVU%%lib/evince/3/backends/djvudocument.evince-backend
+%%DVI%%lib/evince/3/backends/dvidocument.evince-backend
+%%IMPRESS%%lib/evince/3/backends/impressdocument.evince-backend
+%%COMICS%%lib/evince/3/backends/libcomicsdocument.a
+%%COMICS%%lib/evince/3/backends/libcomicsdocument.la
+%%COMICS%%lib/evince/3/backends/libcomicsdocument.so
+%%DJVU%%lib/evince/3/backends/libdjvudocument.a
+%%DJVU%%lib/evince/3/backends/libdjvudocument.la
+%%DJVU%%lib/evince/3/backends/libdjvudocument.so
+%%DVI%%lib/evince/3/backends/libdvidocument.a
+%%DVI%%lib/evince/3/backends/libdvidocument.la
+%%DVI%%lib/evince/3/backends/libdvidocument.so
+%%IMPRESS%%lib/evince/3/backends/libimpressdocument.a
+%%IMPRESS%%lib/evince/3/backends/libimpressdocument.la
+%%IMPRESS%%lib/evince/3/backends/libimpressdocument.so
+lib/evince/3/backends/libpdfdocument.a
+lib/evince/3/backends/libpdfdocument.la
+lib/evince/3/backends/libpdfdocument.so
+lib/evince/3/backends/libpsdocument.a
+lib/evince/3/backends/libpsdocument.la
+lib/evince/3/backends/libpsdocument.so
+lib/evince/3/backends/libtiffdocument.a
+lib/evince/3/backends/libtiffdocument.la
+lib/evince/3/backends/libtiffdocument.so
+lib/evince/3/backends/pdfdocument.evince-backend
+lib/evince/3/backends/psdocument.evince-backend
+lib/evince/3/backends/tiffdocument.evince-backend
lib/libevdocument.a
lib/libevdocument.la
lib/libevdocument.so
-lib/libevdocument.so.2
+lib/libevdocument.so.3
lib/libevview.a
lib/libevview.la
lib/libevview.so
-lib/libevview.so.2
+lib/libevview.so.3
%%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.a
%%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.la
%%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.so
-libdata/pkgconfig/evince-document-2.30.pc
-libdata/pkgconfig/evince-view-2.30.pc
+libdata/pkgconfig/evince-document-%%VERSION%%.pc
+libdata/pkgconfig/evince-view-%%VERSION%%.pc
libexec/evince-convert-metadata
libexec/evinced
+share/GConf/gsettings/evince.convert
share/applications/evince.desktop
share/dbus-1/services/org.gnome.evince.Daemon.service
%%DOCSDIR%%/EggFindBar.html
@@ -284,6 +286,8 @@ share/gnome/help/evince/pt_BR/evince.xml
share/gnome/help/evince/pt_BR/figures/evince_start_window.png
share/gnome/help/evince/ru/evince.xml
share/gnome/help/evince/ru/figures/evince_start_window.png
+share/gnome/help/evince/sl/evince.xml
+share/gnome/help/evince/sl/figures/evince_start_window.png
share/gnome/help/evince/sr/evince.xml
share/gnome/help/evince/sr/figures/evince_start_window.png
share/gnome/help/evince/sv/evince.xml
@@ -317,6 +321,7 @@ share/locale/da/LC_MESSAGES/evince.mo
share/locale/de/LC_MESSAGES/evince.mo
share/locale/dz/LC_MESSAGES/evince.mo
share/locale/el/LC_MESSAGES/evince.mo
+share/locale/eo/LC_MESSAGES/evince.mo
share/locale/en@shaw/LC_MESSAGES/evince.mo
share/locale/en_CA/LC_MESSAGES/evince.mo
share/locale/en_GB/LC_MESSAGES/evince.mo
@@ -336,6 +341,7 @@ share/locale/id/LC_MESSAGES/evince.mo
share/locale/it/LC_MESSAGES/evince.mo
share/locale/ja/LC_MESSAGES/evince.mo
share/locale/ka/LC_MESSAGES/evince.mo
+share/locale/kk/LC_MESSAGES/evince.mo
share/locale/kn/LC_MESSAGES/evince.mo
share/locale/ko/LC_MESSAGES/evince.mo
share/locale/ks/LC_MESSAGES/evince.mo
@@ -398,6 +404,7 @@ share/omf/evince/evince-nl.omf
share/omf/evince/evince-oc.omf
share/omf/evince/evince-pt_BR.omf
share/omf/evince/evince-ru.omf
+share/omf/evince/evince-sl.omf
share/omf/evince/evince-sr.omf
share/omf/evince/evince-sv.omf
share/omf/evince/evince-uk.omf
@@ -414,6 +421,8 @@ share/omf/evince/evince-zh_CN.omf
@dirrm share/gnome/help/evince/sv
@dirrm share/gnome/help/evince/sr/figures
@dirrm share/gnome/help/evince/sr
+@dirrm share/gnome/help/evince/sl/figures
+@dirrm share/gnome/help/evince/sl
@dirrm share/gnome/help/evince/ru/figures
@dirrm share/gnome/help/evince/ru
@dirrm share/gnome/help/evince/pt_BR/figures
@@ -473,15 +482,17 @@ share/omf/evince/evince-zh_CN.omf
@dirrm share/doc/libevdocument
@dirrm %%DOCSDIR%%
@dirrmtry share/applications
-@dirrm lib/evince/2/backends
-@dirrm lib/evince/2
+@dirrm lib/evince/3/backends
+@dirrm lib/evince/3
@dirrm lib/evince
-@dirrm include/evince/2.30/libview
-@dirrm include/evince/2.30/libdocument
-@dirrm include/evince/2.30
+@dirrm include/evince/%%VERSION%%/libview
+@dirrm include/evince/%%VERSION%%/libdocument
+@dirrm include/evince/%%VERSION%%
@dirrm include/evince
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/GConf/gsettings
+@dirrmtry share/GConf
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@@ -508,6 +519,8 @@ share/omf/evince/evince-zh_CN.omf
@dirrmtry share/locale/ku
@dirrmtry share/locale/ks/LC_MESSAGES
@dirrmtry share/locale/ks
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
new file mode 100644
index 000000000000..6fa18c02cecc
--- /dev/null
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -0,0 +1,45 @@
+# New ports collection makefile for: gdk-pixbuf
+# Date created: 5th October 1999
+# Whom: Ade Lovett <ade@lovett.com>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/gdk-pixbuf2/Makefile,v 1.9 2010/11/09 09:35:01 kwm Exp $
+
+PORTNAME?= gdk-pixbuf
+PORTVERSION= 2.22.1
+CATEGORIES?= graphics
+MASTER_SITES= GNOME
+MASTER_SITE_SUBDIR= sources/gdk-pixbuf/${PORTVERSION:R}
+DISTNAME= gdk-pixbuf-${PORTVERSION}
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= A graphic library for GTK+
+
+BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
+ tiff.4:${PORTSDIR}/graphics/tiff \
+ jpeg.11:${PORTSDIR}/graphics/jpeg \
+ jasper.4:${PORTSDIR}/graphics/jasper
+
+LATEST_LINK= gdk-pixbuf2
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_XORG= xt xi x11
+USE_AUTOTOOLS= libtool:22
+USE_GNOME+= gnomehack glib20 ltverhack
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --enable-introspection=yes --with-libjasper
+
+MAN1= gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|" == "|" = "|g' ${WRKSRC}/configure
+
+post-install:
+ @cd ${WRKSRC}/docs/reference/gdk-pixbuf && gmake install-man1
+
+.include <bsd.port.mk>
diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo
new file mode 100644
index 000000000000..a2b0891c3f8f
--- /dev/null
+++ b/graphics/gdk-pixbuf2/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/gdk-pixbuf-2.22.1.tar.bz2) = 6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d
+SIZE (gnome2/gdk-pixbuf-2.22.1.tar.bz2) = 1543273
diff --git a/graphics/gdk-pixbuf2/files/patch-Makefile.in b/graphics/gdk-pixbuf2/files/patch-Makefile.in
new file mode 100644
index 000000000000..0b95cf6c7e6e
--- /dev/null
+++ b/graphics/gdk-pixbuf2/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2010-06-27 12:20:54.000000000 +0200
++++ Makefile.in 2010-06-27 12:21:04.000000000 +0200
+@@ -362,7 +362,7 @@
+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ && DISPLAY=:$$XID && export DISPLAY
+
+-SUBDIRS = gdk-pixbuf po docs tests contrib
++SUBDIRS = gdk-pixbuf po tests contrib
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = gdk-pixbuf-2.0.pc
+ ACLOCAL_AMFLAGS = -I m4
diff --git a/graphics/gdk-pixbuf2/pkg-descr b/graphics/gdk-pixbuf2/pkg-descr
new file mode 100644
index 000000000000..e3b98bcb0ed1
--- /dev/null
+++ b/graphics/gdk-pixbuf2/pkg-descr
@@ -0,0 +1,8 @@
+The GdkPixBuf library provides a number of features:
+
+ - Image loading facilities.
+ - Rendering of a GdkPixBuf into various formats:
+ drawables (windows, pixmaps), GdkRGB buffers.
+ - A cache interface
+
+WWW: http://developer.gnome.org/arch/imaging/gdkpixbuf.html
diff --git a/graphics/gdk-pixbuf2/pkg-plist b/graphics/gdk-pixbuf2/pkg-plist
new file mode 100644
index 000000000000..fc68f34cbde4
--- /dev/null
+++ b/graphics/gdk-pixbuf2/pkg-plist
@@ -0,0 +1,246 @@
+bin/gdk-pixbuf-csource
+bin/gdk-pixbuf-query-loaders
+include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
+include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
+include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
+include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h
+include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
+include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-features.h
+include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-io.h
+include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
+include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
+include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
+include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
+include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf.h
+include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ani.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ani.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ani.so
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-bmp.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-bmp.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-bmp.so
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-gif.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-gif.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-gif.so
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-icns.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-icns.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-icns.so
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ico.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ico.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ico.so
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jasper.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jasper.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jasper.so
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jpeg.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jpeg.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jpeg.so
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pcx.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pcx.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pcx.so
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-png.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-png.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-png.so
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pnm.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pnm.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pnm.so
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-qtif.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-qtif.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-qtif.so
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ras.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ras.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ras.so
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tga.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tga.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tga.so
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tiff.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tiff.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tiff.so
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-wbmp.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-wbmp.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-wbmp.so
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xbm.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xbm.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xbm.so
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xpm.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xpm.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xpm.so
+lib/girepository-1.0/GdkPixbuf-2.0.typelib
+lib/libgdk_pixbuf-2.0.a
+lib/libgdk_pixbuf-2.0.la
+lib/libgdk_pixbuf-2.0.so
+lib/libgdk_pixbuf-2.0.so.0
+lib/libgdk_pixbuf_xlib-2.0.a
+lib/libgdk_pixbuf_xlib-2.0.la
+lib/libgdk_pixbuf_xlib-2.0.so
+lib/libgdk_pixbuf_xlib-2.0.so.0
+libdata/pkgconfig/gdk-pixbuf-2.0.pc
+libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
+share/gir-1.0/GdkPixbuf-2.0.gir
+share/locale/af/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ar/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/as/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ast/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/az/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/be/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/be@latin/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/bg/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/bn/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/bn_IN/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/br/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/bs/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ca/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ca@valencia/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/crh/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/cs/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/cy/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/da/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/de/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/dz/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/el/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/en_CA/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/en_GB/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/eo/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/es/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/et/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/eu/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/fa/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/fi/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/fr/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ga/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/gl/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/gu/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/he/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/hi/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/hr/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/hu/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/hy/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ia/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/id/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/io/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/is/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/it/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ja/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ka/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/kn/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ko/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ku/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/li/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/lt/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/lv/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/mai/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/mi/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/mk/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ml/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/mn/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/mr/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ms/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/my/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/nb/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/nds/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ne/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/nl/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/nn/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/nso/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/oc/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/or/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/pa/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/pl/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ps/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/pt/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/pt_BR/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ro/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ru/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/si/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/sk/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/sl/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/sq/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/sr/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/sr@ije/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/sr@latin/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/sv/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ta/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/te/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/th/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/tk/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/tr/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/tt/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ug/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/uk/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/uz/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/vi/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/wa/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/xh/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/yi/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/zh_HK/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo
+@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true
+@unexec rm %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
+@dirrmtry share/locale/my/LC_MESSAGES
+@dirrmtry share/locale/my
+@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/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/io/LC_MESSAGES
+@dirrmtry share/locale/io
+@dirrmtry share/locale/ia/LC_MESSAGES
+@dirrmtry share/locale/ia
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrmtry share/locale/ang/LC_MESSAGES
+@dirrmtry share/locale/ang
+@dirrm lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/
+@dirrm lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%
+@dirrm lib/gdk-pixbuf-2.0
+@dirrm include/gdk-pixbuf-2.0/gdk-pixbuf
+@dirrm include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
+@dirrm include/gdk-pixbuf-2.0
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 85a7e7affbdb..03dd02b29b47 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.48 2009/09/23 15:44:49 kwm Exp $
+# $MCom: ports/graphics/gimp-app/Makefile,v 1.53 2010/10/08 08:29:33 kwm Exp $
#
PORTNAME= gimp-app
-DISTVERSION= 2.6.10
+DISTVERSION= 2.6.11
PORTREVISION?= 0
PORTEPOCH?= 1
CATEGORIES?= graphics gnome
@@ -156,7 +156,7 @@ CONFIGURE_ARGS+= --disable-mp
.endif
.if defined(WITH_POPPLER)
-LIB_DEPENDS+= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk
+LIB_DEPENDS+= poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk
PLIST_SUB+= POPPLER=""
.else
CONFIGURE_ARGS+= --without-poppler
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index f52b3ff05b73..f7fe1e379436 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-2.6.10.tar.bz2) = b92710ad9f1b52fec98554d765473819
-SHA256 (gimp-2.6.10.tar.bz2) = ef7a3fe73b352d8afeda9a5358431ea64a1d4cf3ebab588167f6335cdb52e032
-SIZE (gimp-2.6.10.tar.bz2) = 16445326
+MD5 (gimp-2.6.11.tar.bz2) = bb2939fe13e54fc7255cef5d097bb5dd
+SHA256 (gimp-2.6.11.tar.bz2) = 9b6d08d0803b3912ea596d1b77b9c21ee13778c23388a225c004b8c1587cb0a1
+SIZE (gimp-2.6.11.tar.bz2) = 16473561
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index d73be4be7c35..58e1df0ec6c1 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -2042,6 +2042,8 @@ share/locale/zh_CN/LC_MESSAGES/gimp20-script-fu.mo
share/locale/zh_CN/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/zh_CN/LC_MESSAGES/gimp20-tips.mo
share/locale/zh_CN/LC_MESSAGES/gimp20.mo
+share/locale/zh_HK/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/zh_HK/LC_MESSAGES/gimp20-python.mo
share/locale/zh_HK/LC_MESSAGES/gimp20-script-fu.mo
share/locale/zh_HK/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/zh_HK/LC_MESSAGES/gimp20-tips.mo
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 8cd61ba86eb9..179989283c37 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -3,11 +3,11 @@
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/graphics/gimp/Makefile,v 1.16 2009/08/25 00:05:58 marcus Exp $
+# $MCom: ports/graphics/gimp/Makefile,v 1.18 2010/10/08 08:29:33 kwm Exp $
#
PORTNAME= gimp
-DISTVERSION?= 2.6.10
+DISTVERSION?= 2.6.11
PORTREVISION?= 0
PORTEPOCH?= 2
CATEGORIES= graphics gnome
diff --git a/graphics/gir-repository-poppler/Makefile b/graphics/gir-repository-poppler/Makefile
index 6e5ae914b846..ea7f67415e80 100644
--- a/graphics/gir-repository-poppler/Makefile
+++ b/graphics/gir-repository-poppler/Makefile
@@ -3,9 +3,10 @@
# 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 $
+# $MCom: ports/graphics/gir-repository-poppler/Makefile,v 1.4 2010/09/28 15:55:48 kwm Exp $
#
+PORTREVISION= 6
CATEGORIES= graphics
MASTERDIR= ${.CURDIR}/../../devel/gir-repository
diff --git a/graphics/goocanvasmm/Makefile b/graphics/goocanvasmm/Makefile
index bf5965e04a70..3cdd9f97c7e6 100644
--- a/graphics/goocanvasmm/Makefile
+++ b/graphics/goocanvasmm/Makefile
@@ -3,11 +3,10 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/goocanvasmm/Makefile,v 1.2 2009/01/09 11:30:01 kwm Exp $
+# $MCom: ports/graphics/goocanvasmm/Makefile,v 1.4 2010/10/29 10:27:45 kwm Exp $
PORTNAME= goocanvasmm
-PORTVERSION= 0.15.0
-PORTREVISION= 2
+PORTVERSION= 0.15.4
CATEGORIES= graphics
MASTER_SITES= GNOME
@@ -20,6 +19,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
USE_GNOME= gnomehack ltverhack
USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
+CONFIGURE_ARGS= --disable-documentation
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/graphics/goocanvasmm/distinfo b/graphics/goocanvasmm/distinfo
index 70c5450a205c..ebee860df7a6 100644
--- a/graphics/goocanvasmm/distinfo
+++ b/graphics/goocanvasmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (goocanvasmm-0.15.0.tar.bz2) = 14be5630e88a28ef309c2603ecab01ec
-SHA256 (goocanvasmm-0.15.0.tar.bz2) = 914d0f3f0220d3d820b2941390e2e6b3888dc9f7f2b9d2ee419203d720df8541
-SIZE (goocanvasmm-0.15.0.tar.bz2) = 387345
+MD5 (goocanvasmm-0.15.4.tar.bz2) = cf462e8d2f36f4e02387eb094773b3e9
+SHA256 (goocanvasmm-0.15.4.tar.bz2) = e70d42f76c5093e929da2be307d97d3631cf71052e8506cfdba592479ef285e3
+SIZE (goocanvasmm-0.15.4.tar.bz2) = 1357399
diff --git a/graphics/goocanvasmm/pkg-plist b/graphics/goocanvasmm/pkg-plist
index 48b15e7c3afb..5e45c93de313 100644
--- a/graphics/goocanvasmm/pkg-plist
+++ b/graphics/goocanvasmm/pkg-plist
@@ -1,77 +1,73 @@
-include/goocanvasmm-0.1/goocanvasmm.h
-include/goocanvasmm-0.1/goocanvasmm/bounds.h
-include/goocanvasmm-0.1/goocanvasmm/canvas.h
-include/goocanvasmm-0.1/goocanvasmm/ellipse.h
-include/goocanvasmm-0.1/goocanvasmm/ellipsemodel.h
-include/goocanvasmm-0.1/goocanvasmm/enums.h
-include/goocanvasmm-0.1/goocanvasmm/grid.h
-include/goocanvasmm-0.1/goocanvasmm/gridmodel.h
-include/goocanvasmm-0.1/goocanvasmm/group.h
-include/goocanvasmm-0.1/goocanvasmm/groupmodel.h
-include/goocanvasmm-0.1/goocanvasmm/image.h
-include/goocanvasmm-0.1/goocanvasmm/imagemodel.h
-include/goocanvasmm-0.1/goocanvasmm/init.h
-include/goocanvasmm-0.1/goocanvasmm/item.h
-include/goocanvasmm-0.1/goocanvasmm/itemmodel.h
-include/goocanvasmm-0.1/goocanvasmm/itemmodelsimple.h
-include/goocanvasmm-0.1/goocanvasmm/itemsimple.h
-include/goocanvasmm-0.1/goocanvasmm/linedash.h
-include/goocanvasmm-0.1/goocanvasmm/path.h
-include/goocanvasmm-0.1/goocanvasmm/pathmodel.h
-include/goocanvasmm-0.1/goocanvasmm/points.h
-include/goocanvasmm-0.1/goocanvasmm/polyline.h
-include/goocanvasmm-0.1/goocanvasmm/polylinemodel.h
-include/goocanvasmm-0.1/goocanvasmm/private/bounds_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/canvas_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/ellipse_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/ellipsemodel_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/enums_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/grid_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/gridmodel_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/group_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/groupmodel_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/image_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/imagemodel_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/item_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/itemmodel_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/itemmodelsimple_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/itemsimple_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/linedash_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/path_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/pathmodel_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/points_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/polyline_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/polylinemodel_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/rect_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/rectmodel_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/style_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/table_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/tablemodel_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/text_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/textmodel_p.h
-include/goocanvasmm-0.1/goocanvasmm/private/widget_p.h
-include/goocanvasmm-0.1/goocanvasmm/rect.h
-include/goocanvasmm-0.1/goocanvasmm/rectmodel.h
-include/goocanvasmm-0.1/goocanvasmm/style.h
-include/goocanvasmm-0.1/goocanvasmm/table.h
-include/goocanvasmm-0.1/goocanvasmm/tablemodel.h
-include/goocanvasmm-0.1/goocanvasmm/text.h
-include/goocanvasmm-0.1/goocanvasmm/textmodel.h
-include/goocanvasmm-0.1/goocanvasmm/types.h
-include/goocanvasmm-0.1/goocanvasmm/widget.h
-include/goocanvasmm-0.1/goocanvasmm/wrap_init.h
-lib/goocanvasmm-0.1/include/goocanvasmmconfig.h
-lib/goocanvasmm-0.1/proc/m4/convert.m4
-lib/goocanvasmm-0.1/proc/m4/convert_libgoocanvasmm.m4
-lib/libgoocanvasmm-0.1.a
-lib/libgoocanvasmm-0.1.la
-lib/libgoocanvasmm-0.1.so
-lib/libgoocanvasmm-0.1.so.5
+include/goocanvasmm-1.0/goocanvasmm.h
+include/goocanvasmm-1.0/goocanvasmm/bounds.h
+include/goocanvasmm-1.0/goocanvasmm/canvas.h
+include/goocanvasmm-1.0/goocanvasmm/ellipse.h
+include/goocanvasmm-1.0/goocanvasmm/ellipsemodel.h
+include/goocanvasmm-1.0/goocanvasmm/enums.h
+include/goocanvasmm-1.0/goocanvasmm/grid.h
+include/goocanvasmm-1.0/goocanvasmm/gridmodel.h
+include/goocanvasmm-1.0/goocanvasmm/group.h
+include/goocanvasmm-1.0/goocanvasmm/groupmodel.h
+include/goocanvasmm-1.0/goocanvasmm/image.h
+include/goocanvasmm-1.0/goocanvasmm/imagemodel.h
+include/goocanvasmm-1.0/goocanvasmm/init.h
+include/goocanvasmm-1.0/goocanvasmm/item.h
+include/goocanvasmm-1.0/goocanvasmm/itemmodel.h
+include/goocanvasmm-1.0/goocanvasmm/itemmodelsimple.h
+include/goocanvasmm-1.0/goocanvasmm/itemsimple.h
+include/goocanvasmm-1.0/goocanvasmm/linedash.h
+include/goocanvasmm-1.0/goocanvasmm/path.h
+include/goocanvasmm-1.0/goocanvasmm/pathmodel.h
+include/goocanvasmm-1.0/goocanvasmm/points.h
+include/goocanvasmm-1.0/goocanvasmm/polyline.h
+include/goocanvasmm-1.0/goocanvasmm/polylinemodel.h
+include/goocanvasmm-1.0/goocanvasmm/private/bounds_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/canvas_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/ellipse_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/ellipsemodel_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/enums_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/grid_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/gridmodel_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/group_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/groupmodel_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/image_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/imagemodel_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/item_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/itemmodel_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/itemmodelsimple_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/itemsimple_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/linedash_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/path_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/pathmodel_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/points_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/polyline_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/polylinemodel_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/rect_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/rectmodel_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/style_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/table_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/tablemodel_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/text_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/textmodel_p.h
+include/goocanvasmm-1.0/goocanvasmm/private/widget_p.h
+include/goocanvasmm-1.0/goocanvasmm/rect.h
+include/goocanvasmm-1.0/goocanvasmm/rectmodel.h
+include/goocanvasmm-1.0/goocanvasmm/style.h
+include/goocanvasmm-1.0/goocanvasmm/table.h
+include/goocanvasmm-1.0/goocanvasmm/tablemodel.h
+include/goocanvasmm-1.0/goocanvasmm/text.h
+include/goocanvasmm-1.0/goocanvasmm/textmodel.h
+include/goocanvasmm-1.0/goocanvasmm/types.h
+include/goocanvasmm-1.0/goocanvasmm/widget.h
+include/goocanvasmm-1.0/goocanvasmm/wrap_init.h
+lib/goocanvasmm-1.0/include/goocanvasmmconfig.h
+lib/libgoocanvasmm-1.0.a
+lib/libgoocanvasmm-1.0.la
+lib/libgoocanvasmm-1.0.so
+lib/libgoocanvasmm-1.0.so.5
libdata/pkgconfig/goocanvasmm-1.0.pc
-@dirrm lib/goocanvasmm-0.1/proc/m4
-@dirrm lib/goocanvasmm-0.1/proc
-@dirrm lib/goocanvasmm-0.1/include
-@dirrm lib/goocanvasmm-0.1
-@dirrm include/goocanvasmm-0.1/goocanvasmm/private
-@dirrm include/goocanvasmm-0.1/goocanvasmm
-@dirrm include/goocanvasmm-0.1
+@dirrm lib/goocanvasmm-1.0/include
+@dirrm lib/goocanvasmm-1.0
+@dirrm include/goocanvasmm-1.0/goocanvasmm/private
+@dirrm include/goocanvasmm-1.0/goocanvasmm
+@dirrm include/goocanvasmm-1.0
diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index 28b656a95890..400ce39fed82 100644
--- a/graphics/libchamplain/Makefile
+++ b/graphics/libchamplain/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/libchamplain/Makefile,v 1.17 2010/03/29 10:55:48 kwm Exp $
+# $MCom: ports/graphics/libchamplain/Makefile,v 1.23 2010/09/27 18:17:23 kwm Exp $
#
PORTNAME= libchamplain
-PORTVERSION= 0.4.6
-PORTREVISION= 1
+PORTVERSION= 0.8.0
CATEGORIES= graphics
MASTER_SITES= GNOME
@@ -17,7 +16,7 @@ COMMENT= A C library aimed to provide a Gtk+ widget to display rasterized maps a
LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \
clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \
- soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup
+ soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome
USE_BZIP2= yes
USE_GNOME= pkgconfig gtk20 gnomehack ltverhack:1
@@ -28,10 +27,10 @@ USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-# clutter-sharp need to get released.
-CONFIGURE_ARGS+=--enable-managed=no
+PLIST_SUB= VERSION=0.8
-PLIST_SUB= VERSION=${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+# python bindings need to get ported
+WITHOUT_PYTHON=yes
.if !defined(WITHOUT_PYTHON)
USE_PYTHON= yes
@@ -50,10 +49,4 @@ PLIST_SUB+= PYTHON="@comment "
@${ECHO_CMD} "Specify WITHOUT_PYTHON=yes to disable python bindings"
@${ECHO_CMD} ""
-post-patch:
- @${REINPLACE_CMD} -e 's|pyclutter-gtk-0.9|pyclutter-gtk-0.10|g' \
- ${WRKSRC}/configure
- # Fix python bindings, can be safely removed after 0.4.7 release
- @${RM} -f ${WRKSRC}/bindings/python/champlain/pychamplain.c
-
.include <bsd.port.mk>
diff --git a/graphics/libchamplain/distinfo b/graphics/libchamplain/distinfo
index 8d91140c7ba0..608afa1cce64 100644
--- a/graphics/libchamplain/distinfo
+++ b/graphics/libchamplain/distinfo
@@ -1,3 +1,3 @@
-MD5 (libchamplain-0.4.6.tar.bz2) = 0ea5f87dba0ce3787a36e5f47b39ae2d
-SHA256 (libchamplain-0.4.6.tar.bz2) = 0ffdbd5a067a02c744173174e3f5fa5ae23b444edf0f5dcc6622d295f3059fbc
-SIZE (libchamplain-0.4.6.tar.bz2) = 528683
+MD5 (libchamplain-0.8.0.tar.bz2) = 55bf83ce4cd1fa13fdc5d0a5b478e323
+SHA256 (libchamplain-0.8.0.tar.bz2) = 0784b53f488d690ed878b1bbf30cd9bd9b1baafb5b6b0d0b7b2ba0ef240c49cc
+SIZE (libchamplain-0.8.0.tar.bz2) = 672862
diff --git a/graphics/libchamplain/pkg-plist b/graphics/libchamplain/pkg-plist
index 1ecbf217c6b7..3c7e4bb54a18 100644
--- a/graphics/libchamplain/pkg-plist
+++ b/graphics/libchamplain/pkg-plist
@@ -1,68 +1,96 @@
-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
+include/libchamplain-0.8/champlain/champlain-base-marker.h
+include/libchamplain-0.8/champlain/champlain-bounding-box.h
+include/libchamplain-0.8/champlain/champlain-defines.h
+include/libchamplain-0.8/champlain/champlain-enum-types.h
+include/libchamplain-0.8/champlain/champlain-error-tile-renderer.h
+include/libchamplain-0.8/champlain/champlain-features.h
+include/libchamplain-0.8/champlain/champlain-file-cache.h
+include/libchamplain-0.8/champlain/champlain-file-tile-source.h
+include/libchamplain-0.8/champlain/champlain-image-renderer.h
+include/libchamplain-0.8/champlain/champlain-layer.h
+include/libchamplain-0.8/champlain/champlain-map-source-chain.h
+include/libchamplain-0.8/champlain/champlain-map-source-desc.h
+include/libchamplain-0.8/champlain/champlain-map-source-factory.h
+include/libchamplain-0.8/champlain/champlain-map-source.h
+include/libchamplain-0.8/champlain/champlain-marker.h
+include/libchamplain-0.8/champlain/champlain-marshal.h
+include/libchamplain-0.8/champlain/champlain-memory-cache.h
+include/libchamplain-0.8/champlain/champlain-network-bbox-tile-source.h
+include/libchamplain-0.8/champlain/champlain-network-tile-source.h
+include/libchamplain-0.8/champlain/champlain-null-tile-source.h
+include/libchamplain-0.8/champlain/champlain-point.h
+include/libchamplain-0.8/champlain/champlain-polygon.h
+include/libchamplain-0.8/champlain/champlain-renderer.h
+include/libchamplain-0.8/champlain/champlain-selection-layer.h
+include/libchamplain-0.8/champlain/champlain-tile-cache.h
+include/libchamplain-0.8/champlain/champlain-tile-source.h
+include/libchamplain-0.8/champlain/champlain-tile.h
+include/libchamplain-0.8/champlain/champlain-version.h
+include/libchamplain-0.8/champlain/champlain-view.h
+include/libchamplain-0.8/champlain/champlain.h
+include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk.h
+include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk-enum-types.h
+include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk-marshal.h
+include/libchamplain-gtk-0.8/champlain-gtk/gtk-champlain-embed.h
+lib/girepository-1.0/Champlain-0.8.typelib
+lib/girepository-1.0/GtkChamplain-0.8.typelib
+lib/libchamplain-0.8.a
+lib/libchamplain-0.8.la
+lib/libchamplain-0.8.so
+lib/libchamplain-0.8.so.1
+lib/libchamplain-gtk-0.8.a
+lib/libchamplain-gtk-0.8.la
+lib/libchamplain-gtk-0.8.so
+lib/libchamplain-gtk-0.8.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
+libdata/pkgconfig/champlain-0.8.pc
+libdata/pkgconfig/champlain-gtk-0.8.pc
+share/gir-1.0/Champlain-0.8.gir
+share/gir-1.0/GtkChamplain-0.8.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/pt01.html
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/ChamplainErrorTileRenderer.html
+share/gtk-doc/html/libchamplain/ChamplainFileCache.html
+share/gtk-doc/html/libchamplain/ChamplainFileTileSource.html
+share/gtk-doc/html/libchamplain/ChamplainImageRenderer.html
share/gtk-doc/html/libchamplain/ChamplainLayer.html
share/gtk-doc/html/libchamplain/ChamplainMapSource.html
+share/gtk-doc/html/libchamplain/ChamplainMapSourceChain.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/ChamplainMemoryCache.html
+share/gtk-doc/html/libchamplain/ChamplainMemphisRenderer.html
+share/gtk-doc/html/libchamplain/ChamplainNetworkBboxTileSource.html
+share/gtk-doc/html/libchamplain/ChamplainNetworkTileSource.html
+share/gtk-doc/html/libchamplain/ChamplainNullTileSource.html
share/gtk-doc/html/libchamplain/ChamplainPolygon.html
+share/gtk-doc/html/libchamplain/ChamplainRenderer.html
share/gtk-doc/html/libchamplain/ChamplainSelectionLayer.html
share/gtk-doc/html/libchamplain/ChamplainTile.html
+share/gtk-doc/html/libchamplain/ChamplainTileCache.html
+share/gtk-doc/html/libchamplain/ChamplainTileSource.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/ch04.html
+share/gtk-doc/html/libchamplain/ch05.html
+share/gtk-doc/html/libchamplain/ch06.html
share/gtk-doc/html/libchamplain/home.png
share/gtk-doc/html/libchamplain/index.html
share/gtk-doc/html/libchamplain/index.sgml
@@ -73,16 +101,25 @@ 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-ChamplainBoundingBox.html
+share/gtk-doc/html/libchamplain/libchamplain-ChamplainMapSourceDesc.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/pt01.html
+share/gtk-doc/html/libchamplain/pt02.html
+share/gtk-doc/html/libchamplain/pt03.html
+share/gtk-doc/html/libchamplain/pt04.html
+share/gtk-doc/html/libchamplain/pt05.html
share/gtk-doc/html/libchamplain/right.png
share/gtk-doc/html/libchamplain/style.css
share/gtk-doc/html/libchamplain/up.png
+share/vala/vapi/champlain-0.8.deps
+share/vala/vapi/champlain-0.8.vapi
+share/vala/vapi/champlain-gtk-0.8.deps
+share/vala/vapi/champlain-gtk-0.8.vapi
@dirrm share/gtk-doc/html/libchamplain
@dirrm share/gtk-doc/html/libchamplain-gtk
@dirrmtry share/gtk-doc/html
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index c05373a3bd93..dcfd964398c5 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.77 2010/04/02 21:20:26 kwm Exp $
+# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.79 2010/09/28 07:31:27 kwm Exp $
#
PORTNAME= libgnomecanvas
-PORTVERSION= 2.30.1
-PORTREVISION?= 1
+PORTVERSION= 2.30.2
+PORTREVISION?= 0
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index aecc39580155..0b2d196b45b2 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomecanvas-2.30.1.tar.bz2) = 362ab7b81024b3c3b4a712e7df01b169
-SHA256 (gnome2/libgnomecanvas-2.30.1.tar.bz2) = 291a436cba73550fc1cc93a2bc99353daa18c0a9fec4cfcff47d9ec38d643166
-SIZE (gnome2/libgnomecanvas-2.30.1.tar.bz2) = 583190
+MD5 (gnome2/libgnomecanvas-2.30.2.tar.bz2) = 7f7cb2348466616b034bd2265361455d
+SHA256 (gnome2/libgnomecanvas-2.30.2.tar.bz2) = a74edb1054cd394ea7514c6abdf7539b0b4c6d62a34c2ab5e30ba231af1f13f9
+SIZE (gnome2/libgnomecanvas-2.30.2.tar.bz2) = 563360
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 0d34a51e5127..708f7f4b6460 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,15 +3,14 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/librsvg2/Makefile,v 1.131 2010/05/02 10:25:51 kwm Exp $
+# $MCom: ports/graphics/librsvg2/Makefile,v 1.136 2010/11/13 12:59:46 kwm Exp $
#
-PORTNAME= librsvg2
-PORTVERSION= 2.26.3
-PORTREVISION= 1
+PORTNAME?= librsvg2
+PORTVERSION= 2.32.1
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITE_SUBDIR= sources/librsvg/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= librsvg-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -21,22 +20,48 @@ COMMENT= Library for parsing and rendering SVG vector-graphic files
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco
-RUN_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
-USE_GNOME= gnomehack gnomeprefix libgsf gtk20 ltverhack
+USE_GNOME= gnomehack gnomeprefix libgsf ltverhack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-svgz \
--with-croco \
--enable-gtk-theme
-
CROCO_VERSION= 0.6
+.if defined(SLAVEPORT)
+USE_GNOME+= librsvg2 gtk30
+RUN_DEPENDS= gtk-engines3>=2.90.3.1:${PORTSDIR}/x11-themes/gtk-engines3
+.else
+USE_GNOME+= gtk20
+RUN_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
MAN1= rsvg.1
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if defined(SLAVEPORT)
+post-patch:
+ @${REINPLACE_CMD} -e 's|GTK2_REQUIRED=2.16.0|GTK2_REQUIRED=9.16.0|g' \
+ ${WRKSRC}/configure
+
+do-build:
+ @cd ${WRKSRC} && gmake rsvg-view-3
+ @cd ${WRKSRC}/gtk-engine && gmake
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/rsvg-view-3 ${PREFIX}/bin
+ @cd ${WRKSRC}/gtk-engine && gmake install
+
+.else
+post-patch:
+ @${REINPLACE_CMD} -e 's|GTK3_REQUIRED=2.90.0|GTK3_REQUIRED=9.90.0|g' \
+ ${WRKSRC}/configure
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index b81219c6e67e..33e5b4a45477 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/librsvg-2.26.3.tar.bz2) = 8df68c2c02cdf2a96a92b43bf737bf9c
-SHA256 (gnome2/librsvg-2.26.3.tar.bz2) = c0005f9471b4bd3ba4873d165d8e481ee6b1d124dda4efc6bdc24b7da024b7e5
-SIZE (gnome2/librsvg-2.26.3.tar.bz2) = 511876
+SHA256 (gnome2/librsvg-2.32.1.tar.bz2) = 91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334
+SIZE (gnome2/librsvg-2.32.1.tar.bz2) = 517170
diff --git a/graphics/librsvg2/files/patch-Makefile.in b/graphics/librsvg2/files/patch-Makefile.in
new file mode 100644
index 000000000000..d2009b700b95
--- /dev/null
+++ b/graphics/librsvg2/files/patch-Makefile.in
@@ -0,0 +1,19 @@
+--- Makefile.in.orig 2010-07-07 13:03:21.000000000 +0200
++++ Makefile.in 2010-07-07 13:04:07.000000000 +0200
+@@ -155,7 +155,6 @@
+ am_rsvg_view_3_OBJECTS = rsvg_view_3-test-display.$(OBJEXT)
+ rsvg_view_3_OBJECTS = $(am_rsvg_view_3_OBJECTS)
+ rsvg_view_3_DEPENDENCIES = \
+- $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@@ -563,7 +562,7 @@
+
+ rsvg_view_3_LDFLAGS =
+ rsvg_view_3_LDADD = \
+- $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \
++ -lrsvg-2 \
+ $(GTK3_LIBS) \
+ $(LIBRSVG_LIBS) \
+ $(LIBCROCO_LIBS) \
diff --git a/graphics/librsvg2/files/patch-gtk-engines_Makefile.in b/graphics/librsvg2/files/patch-gtk-engines_Makefile.in
new file mode 100644
index 000000000000..b1f325203166
--- /dev/null
+++ b/graphics/librsvg2/files/patch-gtk-engines_Makefile.in
@@ -0,0 +1,20 @@
+--- gtk-engine/Makefile.in.orig 2010-07-07 12:59:02.000000000 +0200
++++ gtk-engine/Makefile.in 2010-07-07 13:00:27.000000000 +0200
+@@ -72,7 +72,7 @@
+ "$(DESTDIR)$(gtk3_enginedir)"
+ LTLIBRARIES = $(gtk2_engine_LTLIBRARIES) $(gtk3_engine_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@libsvg_3_la_DEPENDENCIES = $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \
++@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@libsvg_3_la_DEPENDENCIES = \
+ @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(am__DEPENDENCIES_1) \
+ @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(am__DEPENDENCIES_1) \
+ @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(am__DEPENDENCIES_1) \
+@@ -405,7 +405,7 @@
+ @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ -module $(AM_LDFLAGS) \
+ @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(am__append_3)
+ @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@libsvg_3_la_LIBADD = \
+-@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \
++@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ -lrsvg-2 \
+ @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(GTK3_LIBS) \
+ @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(LIBRSVG_LIBS) \
+ @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@ $(LIBCROCO_LIBS) \
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index 52425f347f26..0992f99834ab 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -1,41 +1,61 @@
bin/rsvg
bin/rsvg-convert
bin/rsvg-view
-include/librsvg-2/librsvg/librsvg-enum-types.h
-include/librsvg-2/librsvg/librsvg-features.h
-include/librsvg-2/librsvg/rsvg-cairo.h
-include/librsvg-2/librsvg/rsvg.h
+include/librsvg-2.0/librsvg/librsvg-enum-types.h
+include/librsvg-2.0/librsvg/librsvg-features.h
+include/librsvg-2.0/librsvg/rsvg-cairo.h
+include/librsvg-2.0/librsvg/rsvg.h
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-svg.a
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-svg.la
+lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-svg.so
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.a
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.la
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.so
-lib/gtk-2.0/%%GTK2_VERSION%%/loaders/svg_loader.a
-lib/gtk-2.0/%%GTK2_VERSION%%/loaders/svg_loader.la
-lib/gtk-2.0/%%GTK2_VERSION%%/loaders/svg_loader.so
lib/librsvg-2.a
lib/librsvg-2.la
lib/librsvg-2.so
lib/librsvg-2.so.2
libdata/pkgconfig/librsvg-2.0.pc
-share/doc/rsvg/home.png
-share/doc/rsvg/index.html
-share/doc/rsvg/index.sgml
-share/doc/rsvg/ix01.html
-share/doc/rsvg/left.png
-share/doc/rsvg/pt02.html
-share/doc/rsvg/pt03.html
-share/doc/rsvg/pt04.html
-share/doc/rsvg/right.png
-share/doc/rsvg/rsvg-Cairo.html
-share/doc/rsvg/rsvg-Core-API.html
-share/doc/rsvg/rsvg-GdkPixbuf.html
-share/doc/rsvg/rsvg.devhelp
-share/doc/rsvg/rsvg.devhelp2
-share/doc/rsvg/rsvg.html
-share/doc/rsvg/style.css
-share/doc/rsvg/up.png
+share/doc/rsvg-2.0/RsvgHandle.html
+share/doc/rsvg-2.0/annotation-glossary.html
+share/doc/rsvg-2.0/api-index-2-14.html
+share/doc/rsvg-2.0/api-index-2-22.html
+share/doc/rsvg-2.0/api-index-2-32.html
+share/doc/rsvg-2.0/api-index-2-4.html
+share/doc/rsvg-2.0/api-index-2-8.html
+share/doc/rsvg-2.0/api-index-2-9.html
+share/doc/rsvg-2.0/api-index-deprecated.html
+share/doc/rsvg-2.0/api-index-full.html
+share/doc/rsvg-2.0/home.png
+share/doc/rsvg-2.0/index.html
+share/doc/rsvg-2.0/index.sgml
+share/doc/rsvg-2.0/left.png
+share/doc/rsvg-2.0/licence.html
+share/doc/rsvg-2.0/object-tree.html
+share/doc/rsvg-2.0/right.png
+share/doc/rsvg-2.0/rsvg-2.0.devhelp
+share/doc/rsvg-2.0/rsvg-2.0.devhelp2
+share/doc/rsvg-2.0/rsvg-Using-RSVG-with-GIO.html
+share/doc/rsvg-2.0/rsvg-Using-RSVG-with-GdkPixbuf.html
+share/doc/rsvg-2.0/rsvg-Using-RSVG-with-cairo.html
+share/doc/rsvg-2.0/rsvg-Version-check-and-feature-tests.html
+share/doc/rsvg-2.0/rsvg.html
+share/doc/rsvg-2.0/style.css
+share/doc/rsvg-2.0/up.png
share/pixmaps/svg-viewer.svg
-@dirrm share/doc/rsvg
-@dirrm include/librsvg-2/librsvg
-@dirrm include/librsvg-2
-@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
-@unexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
+share/themes/bubble/gtk-2.0/blue.svg
+share/themes/bubble/gtk-2.0/green.svg
+share/themes/bubble/gtk-2.0/gtkrc
+share/themes/bubble/gtk-2.0/orange.svg
+share/themes/bubble/gtk-2.0/purple.svg
+share/themes/bubble/gtk-2.0/red.svg
+@dirrm share/doc/rsvg-2.0
+@dirrm include/librsvg-2.0/librsvg
+@dirrm include/librsvg-2.0
+@dirrmtry lib/gtk-3.0/engines
+@dirrmtry lib/gtk-3.0
+@dirrmtry share/themes/bubble/gtk-2.0
+@dirrmtry share/themes/bubble/gtk-3.0
+@dirrmtry share/themes/bubble
+@comment @exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
+@comment @unexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index cd77657135e9..c36fd1fce617 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nip2
PORTVERSION= 7.14.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
diff --git a/graphics/nip2/files/patch-src_gtkitementry.c b/graphics/nip2/files/patch-src_gtkitementry.c
new file mode 100644
index 000000000000..43b809d653d5
--- /dev/null
+++ b/graphics/nip2/files/patch-src_gtkitementry.c
@@ -0,0 +1,56 @@
+--- src/gtkitementry.c.orig 2010-10-31 15:58:33.000000000 +0100
++++ src/gtkitementry.c 2010-10-31 15:59:28.000000000 +0100
+@@ -131,7 +131,7 @@ static void gtk_entry_draw_curso
+ static PangoLayout *gtk_entry_ensure_layout (GtkEntry *entry,
+ gboolean include_preedit);
+ static void gtk_entry_queue_draw (GtkEntry *entry);
+-static void gtk_entry_reset_im_context (GtkEntry *entry);
++static void nip_gtk_entry_reset_im_context (GtkEntry *entry);
+ static void gtk_entry_recompute (GtkEntry *entry);
+ static void gtk_entry_get_cursor_locations (GtkEntry *entry,
+ CursorType type,
+@@ -657,7 +657,7 @@ gtk_entry_real_set_position (GtkEditable
+ if (position != entry->current_pos ||
+ position != entry->selection_bound)
+ {
+- gtk_entry_reset_im_context (entry);
++ nip_gtk_entry_reset_im_context (entry);
+ gtk_entry_set_positions (entry, position, position);
+ }
+ }
+@@ -823,7 +823,7 @@ gtk_entry_move_cursor (GtkEntry *e
+ {
+ gint new_pos = entry->current_pos;
+
+- gtk_entry_reset_im_context (entry);
++ nip_gtk_entry_reset_im_context (entry);
+
+ if (entry->current_pos != entry->selection_bound && !extend_selection)
+ {
+@@ -917,7 +917,7 @@ gtk_entry_insert_at_cursor (GtkEntry
+
+ if (entry->editable)
+ {
+- gtk_entry_reset_im_context (entry);
++ nip_gtk_entry_reset_im_context (entry);
+
+ gtk_editable_insert_text (editable, str, -1, &pos);
+ gtk_editable_set_position (editable, pos);
+@@ -933,7 +933,7 @@ gtk_entry_delete_from_cursor (GtkEntry
+ gint start_pos = entry->current_pos;
+ gint end_pos = entry->current_pos;
+
+- gtk_entry_reset_im_context (entry);
++ nip_gtk_entry_reset_im_context (entry);
+
+ if (!entry->editable)
+ return;
+@@ -1699,7 +1699,7 @@ gtk_entry_queue_draw (GtkEntry *entry)
+ }
+
+ static void
+-gtk_entry_reset_im_context (GtkEntry *entry)
++nip_gtk_entry_reset_im_context (GtkEntry *entry)
+ {
+ if (entry->need_im_reset)
+ {
diff --git a/graphics/poppler-data/Makefile b/graphics/poppler-data/Makefile
index b05175647c61..a22fc4dec845 100644
--- a/graphics/poppler-data/Makefile
+++ b/graphics/poppler-data/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/poppler-data/Makefile,v 1.1 2010/07/20 08:17:51 kwm Exp $
+# $MCom: ports/graphics/poppler-data/Makefile,v 1.5 2010/11/17 15:12:27 kwm Exp $
#
PORTNAME= poppler-data
-PORTVERSION= 0.4.3
+PORTVERSION= 0.4.4
CATEGORIES= graphics
MASTER_SITES= http://poppler.freedesktop.org/
diff --git a/graphics/poppler-data/distinfo b/graphics/poppler-data/distinfo
index a48d0a2bc6bc..f80a4f6f4a42 100644
--- a/graphics/poppler-data/distinfo
+++ b/graphics/poppler-data/distinfo
@@ -1,3 +1,2 @@
-MD5 (poppler-data-0.4.3.tar.gz) = 2d648047e5d0b315df1571b460ee6a96
-SHA256 (poppler-data-0.4.3.tar.gz) = 426010488bfb8c923419ca4c5d4916ea0193a140d2246336fdf97f1b632d58a6
-SIZE (poppler-data-0.4.3.tar.gz) = 4175311
+SHA256 (poppler-data-0.4.4.tar.gz) = 7643ada027b99a2ef508ed750b64a89b82c666bd841476b36a2426e69631fe8b
+SIZE (poppler-data-0.4.4.tar.gz) = 4175352
diff --git a/graphics/poppler-gtk/Makefile b/graphics/poppler-gtk/Makefile
index ae3fb35aed4e..f9fe19076b2f 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.18 2010/03/14 22:08:42 kwm Exp $
+# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.20 2010/07/07 13:03:19 kwm 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 6bb080493e3d..239a7305dc28 100644
--- a/graphics/poppler-gtk/pkg-plist
+++ b/graphics/poppler-gtk/pkg-plist
@@ -7,12 +7,14 @@ 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-media.h
+include/poppler/glib/poppler-movie.h
include/poppler/glib/poppler-page.h
include/poppler/glib/poppler.h
lib/libpoppler-glib.a
lib/libpoppler-glib.la
lib/libpoppler-glib.so
-lib/libpoppler-glib.so.4
+lib/libpoppler-glib.so.5
libdata/pkgconfig/poppler-glib.pc
%%DOCSDIR%%/poppler/ch01.html
%%DOCSDIR%%/poppler/home.png
@@ -21,7 +23,6 @@ libdata/pkgconfig/poppler-glib.pc
%%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
diff --git a/graphics/poppler-qt/Makefile b/graphics/poppler-qt/Makefile
index 228a5327130b..c946b0bb223b 100644
--- a/graphics/poppler-qt/Makefile
+++ b/graphics/poppler-qt/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/poppler-qt/Makefile,v 1.11 2010/03/14 22:08:43 kwm Exp $
+# $MCom: ports/graphics/poppler-qt/Makefile,v 1.13 2010/07/07 13:03:19 kwm Exp $
#
PORTREVISION= 0
diff --git a/graphics/poppler-qt4/Makefile b/graphics/poppler-qt4/Makefile
index d64da7bb3726..d045b363ca64 100644
--- a/graphics/poppler-qt4/Makefile
+++ b/graphics/poppler-qt4/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.13 2010/03/14 22:08:43 kwm Exp $
+# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.15 2010/07/07 13:03:19 kwm Exp $
#
PORTREVISION= 0
diff --git a/graphics/poppler-qt4/pkg-plist b/graphics/poppler-qt4/pkg-plist
index d20d75d3e7c2..d49be20711e6 100644
--- a/graphics/poppler-qt4/pkg-plist
+++ b/graphics/poppler-qt4/pkg-plist
@@ -4,7 +4,6 @@ include/poppler/qt4/poppler-form.h
include/poppler/qt4/poppler-link.h
include/poppler/qt4/poppler-optcontent.h
include/poppler/qt4/poppler-page-transition.h
-include/poppler/qt4/poppler-page-transition-private.h
include/poppler/qt4/poppler-qt4.h
lib/libpoppler-qt4.a
lib/libpoppler-qt4.la
diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile
index 128fa8d63311..263fca70ea32 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.3 2009/08/27 14:48:12 kwm Exp $
+# $MCom: ports/graphics/poppler-utils/Makefile,v 1.5 2010/07/07 13:03:19 kwm Exp $
#
-PORTREVISION= 2
+PORTREVISION= 0
PKGNAMESUFFIX= -utils
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index d76bcbb8ab1c..1928a9219b7a 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,11 +3,11 @@
# Whom: marcus@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/graphics/poppler/Makefile,v 1.58 2010/03/14 22:08:42 kwm Exp $
+# $MCom: ports/graphics/poppler/Makefile,v 1.66 2010/11/17 15:03:00 kwm Exp $
#
PORTNAME= poppler
-PORTVERSION= 0.12.4
+PORTVERSION= 0.14.5
PORTREVISION?= 0
CATEGORIES= graphics print
MASTER_SITES= http://poppler.freedesktop.org/
@@ -20,9 +20,12 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
lcms.1:${PORTSDIR}/graphics/lcms
RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget libxml2 ltverhack
USE_AUTOTOOLS= libtool:22
+MAKE_JOBS_UNSAFE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-zlib \
--enable-xpdf-headers \
@@ -40,7 +43,7 @@ OPTIONS= CAIRO "Enable cairo output backend" on \
.include <bsd.port.pre.mk>
.if defined(SLAVEPORT)
-LIB_DEPENDS+= poppler.5:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS+= poppler.6:${PORTSDIR}/graphics/poppler
.if ${SLAVEPORT}=="gtk"
CONFIGURE_ARGS+=--enable-poppler-glib
@@ -110,11 +113,13 @@ LIB_DEPENDS+= openjpeg.2:${PORTSDIR}/graphics/openjpeg
.endif
post-patch:
+ @${REINPLACE_CMD} -e 's|7:0:0|6:0:0|' ${WRKSRC}/poppler/Makefile.in
+
.if defined(SLAVEPORT) && ${SLAVEPORT}=="qt"
@${REINPLACE_CMD} -e 's|/usr/local/qt/include|${LOCALBASE}/include|; \
+ s|$$QTDIR|${QT_PREFIX}|; \
s|/usr/local/qt/lib|${LOCALBASE}/lib|' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|$$QTDIR|${QT_PREFIX}|' ${WRKSRC}/configure
.endif
.if defined(SLAVEPORT) && ${SLAVEPORT}=="qt4"
@${REINPLACE_CMD} -e 's|MOCQT4=`.*|MOCQT4="${LOCALBASE}/bin/moc-qt4"|' \
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index fe24669ee9cd..d34cf4192e34 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,2 @@
-MD5 (poppler-0.12.4.tar.gz) = 4155346f9369b192569ce9184ff73e43
-SHA256 (poppler-0.12.4.tar.gz) = 2afa2a54bd4ccb09e92f82b64bcafa95d39a404a3b3db9d6a5fcad0e0229857a
-SIZE (poppler-0.12.4.tar.gz) = 1674400
+SHA256 (poppler-0.14.5.tar.gz) = c805317c4c1a7080098ae8c7c2a1c1b8e2c784858fc2e04941878eeb8164814c
+SIZE (poppler-0.14.5.tar.gz) = 1798194
diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in
index 94d7703cd62b..4afb4b2aa878 100644
--- a/graphics/poppler/files/patch-glib_Makefile.in
+++ b/graphics/poppler/files/patch-glib_Makefile.in
@@ -1,40 +1,42 @@
---- glib/Makefile.in.orig 2008-03-24 09:03:54.000000000 -0400
-+++ glib/Makefile.in 2008-03-24 09:04:38.000000000 -0400
-@@ -66,7 +66,6 @@
- @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-cairo.la \
- @BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_1)
+--- glib/Makefile.in.orig 2010-08-14 16:50:48.000000000 +0200
++++ glib/Makefile.in 2010-08-14 16:50:48.000000000 +0200
+@@ -82,7 +82,6 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
libpoppler_glib_la_DEPENDENCIES = \
-- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
+- $(top_builddir)/poppler/libpoppler.la \
+ $(top_builddir)/poppler/libpoppler-cairo.la \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
- am__objects_1 = poppler-enums.lo
-@@ -80,7 +79,6 @@
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@@ -105,8 +104,7 @@
@BUILD_WITH_GDK_TRUE@ test-poppler-glib.$(OBJEXT)
test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
@BUILD_WITH_GDK_TRUE@test_poppler_glib_DEPENDENCIES = \
-@BUILD_WITH_GDK_TRUE@ $(top_builddir)/poppler/libpoppler.la \
- @BUILD_WITH_GDK_TRUE@ libpoppler-glib.la $(am__DEPENDENCIES_1) \
+-@BUILD_WITH_GDK_TRUE@ libpoppler-glib.la $(am__DEPENDENCIES_1) \
++@BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \
@BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \
- @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \
-@@ -295,7 +293,7 @@
- @BUILD_CAIRO_OUTPUT_TRUE@ $(top_builddir)/poppler/libpoppler-cairo.la \
- @BUILD_CAIRO_OUTPUT_TRUE@ $(CAIRO_LIBS)
-
+ @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
+@@ -386,7 +384,7 @@
+ top_srcdir = @top_srcdir@
+ win32_libs = @win32_libs@
+ AM_LDFLAGS = @auto_import_flags@
-SUBDIRS = . reference demo
+SUBDIRS = . reference
INCLUDES = \
-DG_LOG_DOMAIN=\"Poppler\" \
-I$(top_srcdir) \
-@@ -336,7 +334,7 @@
+@@ -439,7 +437,7 @@
poppler-private.h
libpoppler_glib_la_LIBADD = \
- $(top_builddir)/poppler/libpoppler.la \
-+ -lpoppler \
++ -lpoppler \
+ $(top_builddir)/poppler/libpoppler-cairo.la \
$(POPPLER_GLIB_LIBS) \
$(GDK_LIBS) \
- $(FREETYPE_LIBS) \
-@@ -348,7 +346,7 @@
+@@ -451,7 +449,7 @@
@BUILD_WITH_GDK_TRUE@ test-poppler-glib.cc
@BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \
diff --git a/graphics/poppler/files/patch-qt4_src_Makefile.in b/graphics/poppler/files/patch-qt4_src_Makefile.in
index e9f0ee2e3749..916eabc22f88 100644
--- a/graphics/poppler/files/patch-qt4_src_Makefile.in
+++ b/graphics/poppler/files/patch-qt4_src_Makefile.in
@@ -1,19 +1,19 @@
---- qt4/src/Makefile.in.orig 2008-07-02 14:06:32.000000000 -0500
-+++ qt4/src/Makefile.in 2008-07-02 14:07:35.000000000 -0500
-@@ -62,7 +62,6 @@
+--- qt4/src/Makefile.in.orig 2010-07-07 14:22:29.000000000 +0200
++++ qt4/src/Makefile.in 2010-07-07 14:23:40.000000000 +0200
+@@ -79,7 +79,6 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libpoppler_qt4_la_DEPENDENCIES = \
-- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__append_1)
+- $(top_builddir)/poppler/libpoppler.la \
+ $(top_builddir)/poppler/libpoppler-arthur.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \
- poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \
-@@ -303,7 +302,7 @@
- poppler-export.h \
- poppler-private.h
+@@ -384,7 +383,7 @@
+ poppler-page-transition-private.h
--libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \
-+libpoppler_qt4_la_LIBADD = -lpoppler \
- $(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1)
- libpoppler_qt4_la_LDFLAGS = -version-info 3:0:0
- all: all-am
+ libpoppler_qt4_la_LIBADD = \
+- $(top_builddir)/poppler/libpoppler.la \
++ -lpoppler \
+ $(top_builddir)/poppler/libpoppler-arthur.la \
+ $(FONTCONFIG_LIBS) \
+ $(POPPLER_QT4_LIBS)
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index 5ccd2f4ab8da..92af8cb0eaf5 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -3,6 +3,7 @@ include/poppler/Array.h
include/poppler/BuiltinFont.h
include/poppler/BuiltinFontTables.h
include/poppler/CMap.h
+include/poppler/CachedFile.h
include/poppler/Catalog.h
include/poppler/CharCodeToUnicode.h
include/poppler/CharTypes.h
@@ -26,6 +27,7 @@ include/poppler/JArithmeticDecoder.h
include/poppler/JBIG2Stream.h
include/poppler/Lexer.h
include/poppler/Link.h
+include/poppler/LocalPDFDocBuilder.h
include/poppler/Movie.h
include/poppler/NameToCharCode.h
include/poppler/NameToUnicodeTable.h
@@ -34,7 +36,9 @@ include/poppler/OptionalContent.h
include/poppler/Outline.h
include/poppler/OutputDev.h
include/poppler/PDFDoc.h
+include/poppler/PDFDocBuilder.h
include/poppler/PDFDocEncoding.h
+include/poppler/PDFDocFactory.h
include/poppler/PSOutputDev.h
include/poppler/PSTokenizer.h
include/poppler/Page.h
@@ -43,9 +47,12 @@ include/poppler/Parser.h
include/poppler/PopplerCache.h
include/poppler/PreScanOutputDev.h
include/poppler/ProfileData.h
+include/poppler/Rendition.h
include/poppler/SecurityHandler.h
include/poppler/Sound.h
include/poppler/SplashOutputDev.h
+include/poppler/StdinCachedFile.h
+include/poppler/StdinPDFDocBuilder.h
include/poppler/Stream-CCITT.h
include/poppler/Stream.h
include/poppler/TextOutputDev.h
@@ -58,6 +65,15 @@ include/poppler/UnicodeMapTables.h
include/poppler/UnicodeTypeTable.h
include/poppler/XRef.h
include/poppler/XpdfPluginAPI.h
+include/poppler/cpp/poppler-document.h
+include/poppler/cpp/poppler-embedded-file.h
+include/poppler/cpp/poppler-font.h
+include/poppler/cpp/poppler-global.h
+include/poppler/cpp/poppler-page-transition.h
+include/poppler/cpp/poppler-page.h
+include/poppler/cpp/poppler-rectangle.h
+include/poppler/cpp/poppler-toc.h
+include/poppler/cpp/poppler-version.h
include/poppler/fofi/FoFiBase.h
include/poppler/fofi/FoFiEncodings.h
include/poppler/fofi/FoFiTrueType.h
@@ -70,6 +86,8 @@ include/poppler/goo/GooMutex.h
include/poppler/goo/GooString.h
include/poppler/goo/GooTimer.h
include/poppler/goo/GooVector.h
+include/poppler/goo/ImgWriter.h
+include/poppler/goo/JpegWriter.h
include/poppler/goo/PNGWriter.h
include/poppler/goo/gfile.h
include/poppler/goo/gmem.h
@@ -99,14 +117,20 @@ include/poppler/splash/SplashT1FontFile.h
include/poppler/splash/SplashTypes.h
include/poppler/splash/SplashXPath.h
include/poppler/splash/SplashXPathScanner.h
+lib/libpoppler-cpp.a
+lib/libpoppler-cpp.la
+lib/libpoppler-cpp.so
+lib/libpoppler-cpp.so.0
lib/libpoppler.a
lib/libpoppler.la
lib/libpoppler.so
-lib/libpoppler.so.5
+lib/libpoppler.so.6
%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
+libdata/pkgconfig/poppler-cpp.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/cpp
@dirrm include/poppler
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index 0e235accc50a..e5cc5ebd3cf3 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -3,23 +3,23 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/py-cairo/Makefile,v 1.26 2009/01/02 20:13:31 mezz Exp $
+# $MCom: ports/graphics/py-cairo/Makefile,v 1.28 2010/11/15 14:12:13 kwm Exp $
#
PORTNAME= cairo
-PORTVERSION= 1.8.8
-PORTREVISION= 1
+PORTVERSION= 1.8.10
CATEGORIES= graphics python
MASTER_SITES= http://cairographics.org/releases/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= py${PORTNAME}-${PORTVERSION}
+DISTNAME= py2${PORTNAME}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Python bindings for Cairo
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
-USE_PYTHON= 2.6+
+WRKSRC= ${WRKDIR}/py${PORTNAME}-${PORTVERSION}
+USE_PYTHON= 2.6-2.7
USE_GMAKE= yes
USE_GNOME= gnometarget gnomehack
GNU_CONFIGURE= yes
diff --git a/graphics/py-cairo/distinfo b/graphics/py-cairo/distinfo
index 596dd3cd2b5d..c4bd9a347736 100644
--- a/graphics/py-cairo/distinfo
+++ b/graphics/py-cairo/distinfo
@@ -1,3 +1,2 @@
-MD5 (pycairo-1.8.8.tar.gz) = 054da6c125cb427a003f5fd6c54f853e
-SHA256 (pycairo-1.8.8.tar.gz) = 2f52599943ca03c8ff336a0e84b1c8b74f30e2a3de9cb6a9a42a93a848832860
-SIZE (pycairo-1.8.8.tar.gz) = 475651
+SHA256 (py2cairo-1.8.10.tar.gz) = b15f71019e42e06d86f7e8fe5587f07c3de5a59a6c3a071b25fe100796dbcd56
+SIZE (py2cairo-1.8.10.tar.gz) = 588459
diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile
index 365db2649d6b..15f505239d5a 100644
--- a/graphics/py-clutter/Makefile
+++ b/graphics/py-clutter/Makefile
@@ -3,12 +3,12 @@
# Whom: Martin Wilke <miwi@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/py-clutter/Makefile,v 1.6 2010/05/10 04:21:19 marcus Exp $
+# $MCom: ports/graphics/py-clutter/Makefile,v 1.8 2010/08/26 21:06:34 marcus Exp $
#
PORTNAME= clutter
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics python
MASTER_SITES= http://www.clutter-project.org/sources/pyclutter/${PORTVERSION:R}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-clutter/files/patch-clutter_cogl-base-types.defs b/graphics/py-clutter/files/patch-clutter_cogl-base-types.defs
new file mode 100644
index 000000000000..f30d20b0283e
--- /dev/null
+++ b/graphics/py-clutter/files/patch-clutter_cogl-base-types.defs
@@ -0,0 +1,33 @@
+--- clutter/cogl-base-types.defs.orig 2010-08-28 21:20:41.000000000 -0400
++++ clutter/cogl-base-types.defs 2010-08-28 21:21:02.000000000 -0400
+@@ -7,30 +7,6 @@
+ (gtype-id "COGL_PANGO_TYPE_FONT_MAP")
+ )
+
+-(define-flags DebugFlags
+- (in-module "Cogl")
+- (c-name "CoglDebugFlags")
+- (gtype-id "COGL_TYPE_DEBUG_FLAGS")
+- (values
+- '("misc" "COGL_DEBUG_MISC")
+- '("texture" "COGL_DEBUG_TEXTURE")
+- '("material" "COGL_DEBUG_MATERIAL")
+- '("shader" "COGL_DEBUG_SHADER")
+- '("offscreen" "COGL_DEBUG_OFFSCREEN")
+- '("draw" "COGL_DEBUG_DRAW")
+- '("pango" "COGL_DEBUG_PANGO")
+- '("rectangles" "COGL_DEBUG_RECTANGLES")
+- '("handle" "COGL_DEBUG_HANDLE")
+- '("blend-strings" "COGL_DEBUG_BLEND_STRINGS")
+- '("disable-batching" "COGL_DEBUG_DISABLE_BATCHING")
+- '("force-client-side-matrices" "COGL_DEBUG_FORCE_CLIENT_SIDE_MATRICES")
+- '("disable-vbos" "COGL_DEBUG_DISABLE_VBOS")
+- '("journal" "COGL_DEBUG_JOURNAL")
+- '("batching" "COGL_DEBUG_BATCHING")
+- '("disable-software-transform" "COGL_DEBUG_DISABLE_SOFTWARE_TRANSFORM")
+- )
+-)
+-
+ (define-flags BufferBit
+ (in-module "Cogl")
+ (c-name "CoglBufferBit")
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index 06eb46a85c11..de24a4149ed8 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -26,6 +26,8 @@ LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 \
webkit:${PORTSDIR}/www/webkit-gtk2 \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+BROKEN= Doesn't build with vala-0.10
+
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GNOME= gconf2 gtk20 desktopfileutils
diff --git a/lang/Makefile b/lang/Makefile
index cb61714701ba..ad8b4654a2da 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -380,6 +380,7 @@
SUBDIR += u++
SUBDIR += ucc
SUBDIR += vala
+ SUBDIR += vala-vapigen
SUBDIR += visualworks
SUBDIR += whitespace
SUBDIR += xds
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index 9056f877d30c..89de1fff4009 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -3,12 +3,11 @@
# Whom: Pawel Worach <pawel.worach@gmail.com>
#
# $FreeBSD$
-# $MCom: ports/lang/gjs/Makefile,v 1.5 2010/03/20 01:14:31 marcus Exp $
+# $MCom: ports/lang/gjs/Makefile,v 1.12 2010/11/15 20:14:53 kwm Exp $
#
PORTNAME= gjs
-PORTVERSION= 0.6
-PORTREVISION= 2
+PORTVERSION= 0.7.7
CATEGORIES= lang gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo
index da2a1c0cddd7..77acc71b0400 100644
--- a/lang/gjs/distinfo
+++ b/lang/gjs/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gjs-0.6.tar.bz2) = 0667ee25bc89eeea2fede223be82df81
-SHA256 (gnome2/gjs-0.6.tar.bz2) = 5c5a54bbb819bfaea1e0e76f0508467e8d5690360ab550e1284951d905a56e5d
-SIZE (gnome2/gjs-0.6.tar.bz2) = 436575
+SHA256 (gnome2/gjs-0.7.7.tar.bz2) = 30fd38a589dc5520604718b416564f4db4f23c5821c46beaced35e4af0bf4318
+SIZE (gnome2/gjs-0.7.7.tar.bz2) = 485317
diff --git a/lang/gjs/pkg-plist b/lang/gjs/pkg-plist
index dc7fbe65c206..406b87203fa1 100644
--- a/lang/gjs/pkg-plist
+++ b/lang/gjs/pkg-plist
@@ -2,12 +2,16 @@ 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/byteArray.h
+include/gjs-1.0/gjs/compat.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/foreign.h
include/gjs-1.0/gjs/gi/function.h
+include/gjs-1.0/gjs/gi/gjs_gi_trace.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
@@ -16,6 +20,7 @@ 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/gjs-module.h
include/gjs-1.0/gjs/importer.h
include/gjs-1.0/gjs/jsapi-util.h
include/gjs-1.0/gjs/mem.h
@@ -29,9 +34,6 @@ 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
@@ -59,11 +61,13 @@ lib/libgjs.so.0
libdata/pkgconfig/gjs-1.0.pc
libdata/pkgconfig/gjs-dbus-1.0.pc
libdata/pkgconfig/gjs-gi-1.0.pc
+libdata/pkgconfig/gjs-internals-1.0.pc
share/gjs-1.0/cairo.js
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/promise.js
share/gjs-1.0/signals.js
share/gjs-1.0/tweener/equations.js
share/gjs-1.0/tweener/tweenList.js
diff --git a/lang/vala-vapigen/Makefile b/lang/vala-vapigen/Makefile
new file mode 100644
index 000000000000..cce3836e0c56
--- /dev/null
+++ b/lang/vala-vapigen/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for: vala-vapigen
+# Date created:
+# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/lang/vala-vapigen/Makefile,v 1.2 2010/08/31 14:51:44 avl Exp $
+#
+
+PORTREVISION= 0
+CATEGORIES= devel gnome
+PKGNAMESUFFIX= -vapigen
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= The vapigen program from vala
+
+USE_GMAKE= yes
+
+MASTERDIR= ${.CURDIR}/../vala
+BUILD_WRKSRC= ${WRKSRC}/vapigen
+INSTALL_WRKSRC= ${WRKSRC}/vapigen
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+
+VALA_SLAVE= yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/lang/vala-vapigen/pkg-descr b/lang/vala-vapigen/pkg-descr
new file mode 100644
index 000000000000..1ec2bfea440f
--- /dev/null
+++ b/lang/vala-vapigen/pkg-descr
@@ -0,0 +1,16 @@
+Soup is a SOAP (Simple Object Access Protocol) implementation in C.
+
+It provides a queued asynchronous callback-based mechanism for sending and
+servicing SOAP requests, and a WSDL (Web Service Definition Language) for C
+compilers which generates client stubs and server skeletons for easily
+calling and implementing SOAP methods. It uses GLib and is designed to work
+well with GTK applications.
+
+Features:
+ * Completely Asynchronous
+ * Connection cache
+ * HTTP chunked transfer and persistent connections
+ * Authenticated HTTP, SOCKS4, and SOCKS5 proxy support
+ * SSL Support using OpenSSL
+ * Apache module server support
+ * Client digest authentication
diff --git a/lang/vala-vapigen/pkg-plist b/lang/vala-vapigen/pkg-plist
new file mode 100644
index 000000000000..175851d3a862
--- /dev/null
+++ b/lang/vala-vapigen/pkg-plist
@@ -0,0 +1,8 @@
+bin/vala-gen-introspect
+bin/vala-gen-introspect-0.10
+bin/vapicheck
+bin/vapicheck-0.10
+bin/vapigen
+bin/vapigen-0.10
+lib/vala-0.10/gen-introspect-0.10
+@dirrm lib/vala-0.10
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index ea97811facd7..aafdbadef607 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -3,44 +3,66 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/lang/vala/Makefile,v 1.32 2010/04/21 22:30:45 kwm Exp $
+# $MCom: ports/lang/vala/Makefile,v 1.46 2010/10/27 21:21:51 kwm Exp $
#
PORTNAME= vala
-PORTVERSION= 0.8.1
-PORTREVISION= 1
+PORTVERSION= 0.10.1
CATEGORIES= lang gnome
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Programming language and compiler that converts Vala code into C code
-OPTIONS= VAPIGEN "Enable VAPI generator" Off
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
-USE_GNOME= glib20 gnomeprefix libxslt
+USE_GNOME= gnomehack glib20 gnomeprefix libxslt
GNU_CONFIGURE= yes
USE_GETTEXT= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}" LDFLAGS="-L${LOCALBASE}/lib"
USE_BISON= build
USE_LDCONFIG= yes
-MAN1= valac.1
+MAN1?= valac.1 valac-0.10.1
.include <bsd.port.pre.mk>
-.if defined(WITH_VAPIGEN)
+.if defined(VALA_SLAVE)
+LIB_DEPENDS+= vala-0.10.0:${PORTSDIR}/lang/vala
CONFIGURE_ARGS+=--enable-vapigen
BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
-MAN1+= vala-gen-introspect.1 vapigen.1
-PLIST_SUB+= VAPIGEN=""
+MAN1= vala-gen-introspect.1 vapigen.1
.else
CONFIGURE_ARGS+=--disable-vapigen
-PLIST_SUB+= VAPIGEN="@comment "
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$$(prefix)/libdata/pkgconfig|' \
+# We cheat here, because vala records vapigen related stuff in its .pc file
+# This makes the vapigen work again, although it might get weird when
+# vala-vapigen isn't installed.
+ @${REINPLACE_CMD} -e 's|@vapigen_decl@|vapigen=$${bindir}/vapigen-0.10|g' \
+ -e 's|@gen_introspect_decl@|gen_introspect=$${libdir}/vala-0.10/gen-introspect-0.10|g' \
+ -e 's|@vala_gen_introspect_decl@|vala_gen_introspect=$${bindir}/vala-gen-introspect-0.10|g' \
+ ${WRKSRC}/vala.pc.in
+ @${REINPLACE_CMD} -e 's|cp $$< $$@|cp vala.pc vala-0.10.pc|g' \
${WRKSRC}/Makefile.in
+.if defined(VALA_SLAVE)
+pre-build:
+ @cd ${WRKSRC} && ${GMAKE} version.h
+ @cd ${WRKSRC}/gobject-introspection && ${GMAKE} libgidl.la && \
+ ${GMAKE} gen-introspect
+
+post-install:
+ @cd ${WRKSRC}/gobject-introspection && ${GMAKE} install
+ @${INSTALL_MAN} ${WRKSRC}/doc/vapigen.1 ${WRKSRC}/doc/vala-gen-introspect.1 \
+ ${PREFIX}/man/man1/
+.else
+post-install:
+ ${LN} -fs ${PREFIX}/libdata/pkgconfig/vala-0.10.pc \
+ ${PREFIX}/libdata/pkgconfig/vala-1.0.pc
+.endif
+
.include <bsd.port.post.mk>
diff --git a/lang/vala/distinfo b/lang/vala/distinfo
index 77354e2f01e6..4d334ea5c050 100644
--- a/lang/vala/distinfo
+++ b/lang/vala/distinfo
@@ -1,3 +1,3 @@
-MD5 (vala-0.8.1.tar.bz2) = 3e105d7f39e55925299a3e6e82c32de7
-SHA256 (vala-0.8.1.tar.bz2) = d805853ac87234ec0942e536e3381609eb9da596e32928996103b4342737ea85
-SIZE (vala-0.8.1.tar.bz2) = 2122657
+MD5 (vala-0.10.1.tar.bz2) = b8bc7cf32ca2e0e277912f2a5f86f8e6
+SHA256 (vala-0.10.1.tar.bz2) = eae1d2f52b651e9d2ed31ae0877ab671b5f796a3013c714f86a926806337805a
+SIZE (vala-0.10.1.tar.bz2) = 2415883
diff --git a/lang/vala/files/patch-vapigen_Makefile.in b/lang/vala/files/patch-vapigen_Makefile.in
new file mode 100644
index 000000000000..bc1780d20f73
--- /dev/null
+++ b/lang/vala/files/patch-vapigen_Makefile.in
@@ -0,0 +1,34 @@
+--- vapigen/Makefile.in.orig 2010-08-10 23:24:52.000000000 +0200
++++ vapigen/Makefile.in 2010-08-10 23:27:28.000000000 +0200
+@@ -56,7 +56,6 @@
+ vapicheck_OBJECTS = $(am_vapicheck_OBJECTS)
+ am__DEPENDENCIES_1 =
+ vapicheck_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- ../codegen/libvala@PACKAGE_SUFFIX@.la \
+ ../gobject-introspection/libgidl.la $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+@@ -66,7 +65,6 @@
+ am_vapigen_OBJECTS = $(am__objects_3) $(am__objects_1)
+ vapigen_OBJECTS = $(am_vapigen_OBJECTS)
+ vapigen_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- ../codegen/libvala@PACKAGE_SUFFIX@.la \
+ ../gobject-introspection/libgidl.la $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+@@ -307,13 +305,13 @@
+
+ vapigen_LDADD = \
+ $(GLIB_LIBS) \
+- ../codegen/libvala@PACKAGE_SUFFIX@.la \
++ -lvala@PACKAGE_SUFFIX@ \
+ ../gobject-introspection/libgidl.la \
+ $(NULL)
+
+ vapicheck_LDADD = \
+ $(GLIB_LIBS) \
+- ../codegen/libvala@PACKAGE_SUFFIX@.la \
++ -lvala@PACKAGE_SUFFIX@ \
+ ../gobject-introspection/libgidl.la \
+ $(NULL)
+
diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist
index 8a79ae32ab30..212c33987382 100644
--- a/lang/vala/pkg-plist
+++ b/lang/vala/pkg-plist
@@ -1,228 +1,244 @@
-%%VAPIGEN%%bin/vala-gen-introspect
+bin/vala
+bin/vala-0.10
bin/valac
-%%VAPIGEN%%bin/vapicheck
-%%VAPIGEN%%bin/vapigen
-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
-%%VAPIGEN%%lib/vala/gen-introspect
+bin/valac-0.10
+include/vala-0.10/vala.h
+include/vala-0.10/valaccode.h
+include/vala-0.10/valacodegen.h
+include/vala-0.10/valagee.h
+lib/libvala-0.10.la
+lib/libvala-0.10.so
+lib/libvala-0.10.so.0
+libdata/pkgconfig/vala-0.10.pc
libdata/pkgconfig/vala-1.0.pc
-share/devhelp/books/vala/attributes.html
-share/devhelp/books/vala/classes.html
-share/devhelp/books/vala/default.css
-share/devhelp/books/vala/delegates.html
-share/devhelp/books/vala/enums.html
-share/devhelp/books/vala/exceptions.html
-share/devhelp/books/vala/expressions.html
-share/devhelp/books/vala/index.html
-share/devhelp/books/vala/interfaces.html
-share/devhelp/books/vala/methods.html
-share/devhelp/books/vala/namespaces.html
-share/devhelp/books/vala/overview.html
-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/avahi-gobject.deps
-%%DATADIR%%/vapi/avahi-gobject.vapi
-%%DATADIR%%/vapi/bzlib.vapi
-%%DATADIR%%/vapi/cairo-xcb.deps
-%%DATADIR%%/vapi/cairo-xcb.vapi
-%%DATADIR%%/vapi/cairo.vapi
-%%DATADIR%%/vapi/ccss-1.vapi
-%%DATADIR%%/vapi/clutter-1.0.deps
-%%DATADIR%%/vapi/clutter-1.0.vapi
-%%DATADIR%%/vapi/clutter-gtk-0.10.deps
-%%DATADIR%%/vapi/clutter-gtk-0.10.vapi
-%%DATADIR%%/vapi/clutter-json-1.0.vapi
-%%DATADIR%%/vapi/cogl-1.0.deps
-%%DATADIR%%/vapi/cogl-1.0.vapi
-%%DATADIR%%/vapi/clutter-gst-1.0.deps
-%%DATADIR%%/vapi/clutter-gst-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
-%%DATADIR%%/vapi/gconf-2.0.vapi
-%%DATADIR%%/vapi/gdk-2.0.deps
-%%DATADIR%%/vapi/gdk-2.0.vapi
-%%DATADIR%%/vapi/gdl-1.0.deps
-%%DATADIR%%/vapi/gdl-1.0.vapi
-%%DATADIR%%/vapi/gdk-pixbuf-2.0.deps
-%%DATADIR%%/vapi/gdk-pixbuf-2.0.vapi
-%%DATADIR%%/vapi/gdk-x11-2.0.deps
-%%DATADIR%%/vapi/gdk-x11-2.0.vapi
-%%DATADIR%%/vapi/gdu-gtk.deps
-%%DATADIR%%/vapi/gdu-gtk.vapi
-%%DATADIR%%/vapi/gdu.deps
-%%DATADIR%%/vapi/gdu.vapi
-%%DATADIR%%/vapi/gio-2.0.vapi
-%%DATADIR%%/vapi/gio-unix-2.0.deps
-%%DATADIR%%/vapi/gio-unix-2.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
-%%DATADIR%%/vapi/gsl.vapi
-%%DATADIR%%/vapi/gstreamer-0.10.deps
-%%DATADIR%%/vapi/gstreamer-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-app-0.10.deps
-%%DATADIR%%/vapi/gstreamer-app-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-audio-0.10.deps
-%%DATADIR%%/vapi/gstreamer-audio-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-base-0.10.deps
-%%DATADIR%%/vapi/gstreamer-base-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-cdda-0.10.deps
-%%DATADIR%%/vapi/gstreamer-cdda-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-check-0.10.deps
-%%DATADIR%%/vapi/gstreamer-check-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-controller-0.10.deps
-%%DATADIR%%/vapi/gstreamer-controller-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-dataprotocol-0.10.deps
-%%DATADIR%%/vapi/gstreamer-dataprotocol-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-fft-0.10.deps
-%%DATADIR%%/vapi/gstreamer-fft-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-interfaces-0.10.deps
-%%DATADIR%%/vapi/gstreamer-interfaces-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-net-0.10.deps
-%%DATADIR%%/vapi/gstreamer-net-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-netbuffer-0.10.deps
-%%DATADIR%%/vapi/gstreamer-netbuffer-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-pbutils-0.10.deps
-%%DATADIR%%/vapi/gstreamer-pbutils-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-riff-0.10.deps
-%%DATADIR%%/vapi/gstreamer-riff-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-rtp-0.10.deps
-%%DATADIR%%/vapi/gstreamer-rtp-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-rtsp-0.10.deps
-%%DATADIR%%/vapi/gstreamer-rtsp-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-sdp-0.10.deps
-%%DATADIR%%/vapi/gstreamer-sdp-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-tag-0.10.deps
-%%DATADIR%%/vapi/gstreamer-tag-0.10.vapi
-%%DATADIR%%/vapi/gstreamer-video-0.10.deps
-%%DATADIR%%/vapi/gstreamer-video-0.10.vapi
-%%DATADIR%%/vapi/gtk+-2.0.deps
-%%DATADIR%%/vapi/gtk+-2.0.vapi
-%%DATADIR%%/vapi/gtkmozembed.deps
-%%DATADIR%%/vapi/gtkmozembed.vapi
-%%DATADIR%%/vapi/gtksourceview-2.0.deps
-%%DATADIR%%/vapi/gtksourceview-2.0.vapi
-%%DATADIR%%/vapi/gudev-1.0.deps
-%%DATADIR%%/vapi/gudev-1.0.vapi
-%%DATADIR%%/vapi/hal.deps
-%%DATADIR%%/vapi/hal.vapi
-%%DATADIR%%/vapi/hildon-1.deps
-%%DATADIR%%/vapi/hildon-1.vapi
-%%DATADIR%%/vapi/hildon-fm-2.deps
-%%DATADIR%%/vapi/hildon-fm-2.vapi
-%%DATADIR%%/vapi/json-glib-1.0.vapi
-%%DATADIR%%/vapi/libarchive.deps
-%%DATADIR%%/vapi/libarchive.vapi
-%%DATADIR%%/vapi/libbonoboui-2.0.vapi
-%%DATADIR%%/vapi/libdaemon.vapi
-%%DATADIR%%/vapi/libepc-1.0.vapi
-%%DATADIR%%/vapi/libftdi.deps
-%%DATADIR%%/vapi/libftdi.vapi
-%%DATADIR%%/vapi/libgda-4.0.deps
-%%DATADIR%%/vapi/libgda-4.0.vapi
-%%DATADIR%%/vapi/libgda-report-4.0.deps
-%%DATADIR%%/vapi/libgda-report-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
-%%DATADIR%%/vapi/libgnome-menu.vapi
-%%DATADIR%%/vapi/libgnomeui-2.0.deps
-%%DATADIR%%/vapi/libgnomeui-2.0.vapi
-%%DATADIR%%/vapi/libgsf-1.deps
-%%DATADIR%%/vapi/libgsf-1.vapi
-%%DATADIR%%/vapi/libgvc.vapi
-%%DATADIR%%/vapi/libmagic.vapi
-%%DATADIR%%/vapi/libnl-1.vapi
-%%DATADIR%%/vapi/libnl-2.0.deps
-%%DATADIR%%/vapi/libnl-2.0.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
-%%DATADIR%%/vapi/libsexy.vapi
-%%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
-%%DATADIR%%/vapi/pango.deps
-%%DATADIR%%/vapi/pango.vapi
-%%DATADIR%%/vapi/pangocairo.deps
-%%DATADIR%%/vapi/pangocairo.vapi
-%%DATADIR%%/vapi/poppler-glib.deps
-%%DATADIR%%/vapi/poppler-glib.vapi
-%%DATADIR%%/vapi/posix.vapi
-%%DATADIR%%/vapi/purple.deps
-%%DATADIR%%/vapi/purple.vapi
-%%DATADIR%%/vapi/raptor.vapi
-%%DATADIR%%/vapi/rasqal.vapi
-%%DATADIR%%/vapi/readline.vapi
-%%DATADIR%%/vapi/rest.deps
-%%DATADIR%%/vapi/rest.vapi
-%%DATADIR%%/vapi/sdl-gfx.vapi
-%%DATADIR%%/vapi/sdl-image.vapi
-%%DATADIR%%/vapi/sdl-mixer.vapi
-%%DATADIR%%/vapi/sdl-net.vapi
-%%DATADIR%%/vapi/sdl-ttf.vapi
-%%DATADIR%%/vapi/sdl.vapi
-%%DATADIR%%/vapi/sqlite3.vapi
-%%DATADIR%%/vapi/taglib_c.vapi
-%%DATADIR%%/vapi/tiff.vapi
-%%DATADIR%%/vapi/tracker-indexer-module-1.0.vapi
-%%DATADIR%%/vapi/twitter-glib-1.0.deps
-%%DATADIR%%/vapi/twitter-glib-1.0.vapi
-%%DATADIR%%/vapi/unique-1.0.deps
-%%DATADIR%%/vapi/unique-1.0.vapi
-%%DATADIR%%/vapi/v4l2.vapi
-%%DATADIR%%/vapi/vala-1.0.vapi
-%%DATADIR%%/vapi/vte.deps
-%%DATADIR%%/vapi/vte.vapi
-%%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
+share/aclocal/vala.m4
+share/devhelp/books/vala-0.10/attributes.html
+share/devhelp/books/vala-0.10/classes.html
+share/devhelp/books/vala-0.10/default.css
+share/devhelp/books/vala-0.10/delegates.html
+share/devhelp/books/vala-0.10/enums.html
+share/devhelp/books/vala-0.10/exceptions.html
+share/devhelp/books/vala-0.10/expressions.html
+share/devhelp/books/vala-0.10/index.html
+share/devhelp/books/vala-0.10/interfaces.html
+share/devhelp/books/vala-0.10/methods.html
+share/devhelp/books/vala-0.10/namespaces.html
+share/devhelp/books/vala-0.10/overview.html
+share/devhelp/books/vala-0.10/statements.html
+share/devhelp/books/vala-0.10/structs.html
+share/devhelp/books/vala-0.10/types.html
+share/devhelp/books/vala-0.10/vala.devhelp2
+%%DATADIR%%-0.10/vapi/alsa.vapi
+%%DATADIR%%-0.10/vapi/atk.vapi
+%%DATADIR%%-0.10/vapi/avahi-gobject.deps
+%%DATADIR%%-0.10/vapi/avahi-gobject.vapi
+%%DATADIR%%-0.10/vapi/bzlib.vapi
+%%DATADIR%%-0.10/vapi/cairo-xcb.deps
+%%DATADIR%%-0.10/vapi/cairo-xcb.vapi
+%%DATADIR%%-0.10/vapi/cairo.vapi
+%%DATADIR%%-0.10/vapi/ccss-1.vapi
+%%DATADIR%%-0.10/vapi/clutter-1.0.deps
+%%DATADIR%%-0.10/vapi/clutter-1.0.vapi
+%%DATADIR%%-0.10/vapi/clutter-gtk-0.10.deps
+%%DATADIR%%-0.10/vapi/clutter-gtk-0.10.vapi
+%%DATADIR%%-0.10/vapi/clutter-json-1.0.vapi
+%%DATADIR%%-0.10/vapi/cogl-1.0.deps
+%%DATADIR%%-0.10/vapi/cogl-1.0.vapi
+%%DATADIR%%-0.10/vapi/clutter-gst-1.0.deps
+%%DATADIR%%-0.10/vapi/clutter-gst-1.0.vapi
+%%DATADIR%%-0.10/vapi/curses.vapi
+%%DATADIR%%-0.10/vapi/dbus-glib-1.vapi
+%%DATADIR%%-0.10/vapi/enchant.vapi
+%%DATADIR%%-0.10/vapi/fuse.deps
+%%DATADIR%%-0.10/vapi/fuse.vapi
+%%DATADIR%%-0.10/vapi/gconf-2.0.vapi
+%%DATADIR%%-0.10/vapi/gdk-2.0.deps
+%%DATADIR%%-0.10/vapi/gdk-2.0.vapi
+%%DATADIR%%-0.10/vapi/gdl-1.0.deps
+%%DATADIR%%-0.10/vapi/gdl-1.0.vapi
+%%DATADIR%%-0.10/vapi/gdk-pixbuf-2.0.deps
+%%DATADIR%%-0.10/vapi/gdk-pixbuf-2.0.vapi
+%%DATADIR%%-0.10/vapi/gdk-x11-2.0.deps
+%%DATADIR%%-0.10/vapi/gdk-x11-2.0.vapi
+%%DATADIR%%-0.10/vapi/gdu-gtk.deps
+%%DATADIR%%-0.10/vapi/gdu-gtk.vapi
+%%DATADIR%%-0.10/vapi/gdu.deps
+%%DATADIR%%-0.10/vapi/gdu.vapi
+%%DATADIR%%-0.10/vapi/gedit-2.20.deps
+%%DATADIR%%-0.10/vapi/gedit-2.20.vapi
+%%DATADIR%%-0.10/vapi/gio-2.0.vapi
+%%DATADIR%%-0.10/vapi/gio-unix-2.0.deps
+%%DATADIR%%-0.10/vapi/gio-unix-2.0.vapi
+%%DATADIR%%-0.10/vapi/glib-2.0.vapi
+%%DATADIR%%-0.10/vapi/gmodule-2.0.vapi
+%%DATADIR%%-0.10/vapi/gnet-2.0.deps
+%%DATADIR%%-0.10/vapi/gnet-2.0.vapi
+%%DATADIR%%-0.10/vapi/gnome-desktop-2.0.deps
+%%DATADIR%%-0.10/vapi/gnome-desktop-2.0.vapi
+%%DATADIR%%-0.10/vapi/gnome-keyring-1.vapi
+%%DATADIR%%-0.10/vapi/gnome-vfs-2.0.vapi
+%%DATADIR%%-0.10/vapi/gnutls.vapi
+%%DATADIR%%-0.10/vapi/gobject-2.0.vapi
+%%DATADIR%%-0.10/vapi/goocanvas.deps
+%%DATADIR%%-0.10/vapi/goocanvas.vapi
+%%DATADIR%%-0.10/vapi/gsl.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-app-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-app-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-audio-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-audio-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-base-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-base-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-cdda-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-cdda-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-check-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-check-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-controller-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-controller-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-dataprotocol-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-dataprotocol-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-fft-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-fft-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-interfaces-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-interfaces-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-net-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-net-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-netbuffer-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-netbuffer-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-pbutils-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-pbutils-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-riff-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-riff-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-rtp-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-rtp-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-rtsp-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-rtsp-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-sdp-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-sdp-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-tag-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-tag-0.10.vapi
+%%DATADIR%%-0.10/vapi/gstreamer-video-0.10.deps
+%%DATADIR%%-0.10/vapi/gstreamer-video-0.10.vapi
+%%DATADIR%%-0.10/vapi/gtk+-2.0.deps
+%%DATADIR%%-0.10/vapi/gtk+-2.0.vapi
+%%DATADIR%%-0.10/vapi/gtkmozembed.deps
+%%DATADIR%%-0.10/vapi/gtkmozembed.vapi
+%%DATADIR%%-0.10/vapi/gtksourceview-2.0.deps
+%%DATADIR%%-0.10/vapi/gtksourceview-2.0.vapi
+%%DATADIR%%-0.10/vapi/gudev-1.0.deps
+%%DATADIR%%-0.10/vapi/gudev-1.0.vapi
+%%DATADIR%%-0.10/vapi/hal.deps
+%%DATADIR%%-0.10/vapi/hal.vapi
+%%DATADIR%%-0.10/vapi/hildon-1.deps
+%%DATADIR%%-0.10/vapi/hildon-1.vapi
+%%DATADIR%%-0.10/vapi/hildon-fm-2.deps
+%%DATADIR%%-0.10/vapi/hildon-fm-2.vapi
+%%DATADIR%%-0.10/vapi/json-glib-1.0.vapi
+%%DATADIR%%-0.10/vapi/libarchive.deps
+%%DATADIR%%-0.10/vapi/libarchive.vapi
+%%DATADIR%%-0.10/vapi/libbonoboui-2.0.vapi
+%%DATADIR%%-0.10/vapi/libdaemon.vapi
+%%DATADIR%%-0.10/vapi/libepc-1.0.vapi
+%%DATADIR%%-0.10/vapi/libesmtp.vapi
+%%DATADIR%%-0.10/vapi/libftdi.deps
+%%DATADIR%%-0.10/vapi/libftdi.vapi
+%%DATADIR%%-0.10/vapi/libgda-4.0.deps
+%%DATADIR%%-0.10/vapi/libgda-4.0.vapi
+%%DATADIR%%-0.10/vapi/libgda-report-4.0.deps
+%%DATADIR%%-0.10/vapi/libgda-report-4.0.vapi
+%%DATADIR%%-0.10/vapi/libgdata.deps
+%%DATADIR%%-0.10/vapi/libgdata.vapi
+%%DATADIR%%-0.10/vapi/libglade-2.0.deps
+%%DATADIR%%-0.10/vapi/libglade-2.0.vapi
+%%DATADIR%%-0.10/vapi/libgnome-2.0.vapi
+%%DATADIR%%-0.10/vapi/libgnome-menu.vapi
+%%DATADIR%%-0.10/vapi/libgnomeui-2.0.deps
+%%DATADIR%%-0.10/vapi/libgnomeui-2.0.vapi
+%%DATADIR%%-0.10/vapi/libgsf-1.deps
+%%DATADIR%%-0.10/vapi/libgsf-1.vapi
+%%DATADIR%%-0.10/vapi/libgvc.vapi
+%%DATADIR%%-0.10/vapi/libmagic.vapi
+%%DATADIR%%-0.10/vapi/libnl-1.vapi
+%%DATADIR%%-0.10/vapi/libnl-2.0.deps
+%%DATADIR%%-0.10/vapi/libnl-2.0.vapi
+%%DATADIR%%-0.10/vapi/libnotify.deps
+%%DATADIR%%-0.10/vapi/libnotify.vapi
+%%DATADIR%%-0.10/vapi/liboobs-1.vapi
+%%DATADIR%%-0.10/vapi/libosso.vapi
+%%DATADIR%%-0.10/vapi/libpanelapplet-2.0.deps
+%%DATADIR%%-0.10/vapi/libpanelapplet-2.0.vapi
+%%DATADIR%%-0.10/vapi/libpq.vapi
+%%DATADIR%%-0.10/vapi/librsvg-2.0.deps
+%%DATADIR%%-0.10/vapi/librsvg-2.0.vapi
+%%DATADIR%%-0.10/vapi/libsexy.deps
+%%DATADIR%%-0.10/vapi/libsexy.vapi
+%%DATADIR%%-0.10/vapi/libsoup-2.2.vapi
+%%DATADIR%%-0.10/vapi/libsoup-2.4.deps
+%%DATADIR%%-0.10/vapi/libsoup-2.4.vapi
+%%DATADIR%%-0.10/vapi/libusb-1.0.deps
+%%DATADIR%%-0.10/vapi/libusb-1.0.vapi
+%%DATADIR%%-0.10/vapi/libusb.vapi
+%%DATADIR%%-0.10/vapi/libwnck-1.0.deps
+%%DATADIR%%-0.10/vapi/libwnck-1.0.vapi
+%%DATADIR%%-0.10/vapi/libxml-2.0.vapi
+%%DATADIR%%-0.10/vapi/linux.deps
+%%DATADIR%%-0.10/vapi/linux.vapi
+%%DATADIR%%-0.10/vapi/loudmouth-1.0.vapi
+%%DATADIR%%-0.10/vapi/lua.vapi
+%%DATADIR%%-0.10/vapi/mx-1.0.deps
+%%DATADIR%%-0.10/vapi/mx-1.0.vapi
+%%DATADIR%%-0.10/vapi/mysql.vapi
+%%DATADIR%%-0.10/vapi/orc-0.4.vapi
+%%DATADIR%%-0.10/vapi/pango.deps
+%%DATADIR%%-0.10/vapi/pango.vapi
+%%DATADIR%%-0.10/vapi/pangocairo.deps
+%%DATADIR%%-0.10/vapi/pangocairo.vapi
+%%DATADIR%%-0.10/vapi/poppler-glib.deps
+%%DATADIR%%-0.10/vapi/poppler-glib.vapi
+%%DATADIR%%-0.10/vapi/posix.vapi
+%%DATADIR%%-0.10/vapi/purple.deps
+%%DATADIR%%-0.10/vapi/purple.vapi
+%%DATADIR%%-0.10/vapi/raptor.vapi
+%%DATADIR%%-0.10/vapi/rasqal.deps
+%%DATADIR%%-0.10/vapi/rasqal.vapi
+%%DATADIR%%-0.10/vapi/readline.vapi
+%%DATADIR%%-0.10/vapi/rest-0.6.deps
+%%DATADIR%%-0.10/vapi/rest-0.6.vapi
+%%DATADIR%%-0.10/vapi/rest-extras-0.6.deps
+%%DATADIR%%-0.10/vapi/rest-extras-0.6.vapi
+%%DATADIR%%-0.10/vapi/sdl-gfx.deps
+%%DATADIR%%-0.10/vapi/sdl-gfx.vapi
+%%DATADIR%%-0.10/vapi/sdl-image.deps
+%%DATADIR%%-0.10/vapi/sdl-image.vapi
+%%DATADIR%%-0.10/vapi/sdl-mixer.deps
+%%DATADIR%%-0.10/vapi/sdl-mixer.vapi
+%%DATADIR%%-0.10/vapi/sdl-net.deps
+%%DATADIR%%-0.10/vapi/sdl-net.vapi
+%%DATADIR%%-0.10/vapi/sdl-ttf.deps
+%%DATADIR%%-0.10/vapi/sdl-ttf.vapi
+%%DATADIR%%-0.10/vapi/sdl.vapi
+%%DATADIR%%-0.10/vapi/sqlite3.vapi
+%%DATADIR%%-0.10/vapi/taglib_c.vapi
+%%DATADIR%%-0.10/vapi/tiff.vapi
+%%DATADIR%%-0.10/vapi/tokyocabinet.vapi
+%%DATADIR%%-0.10/vapi/tracker-indexer-module-1.0.vapi
+%%DATADIR%%-0.10/vapi/twitter-glib-1.0.deps
+%%DATADIR%%-0.10/vapi/twitter-glib-1.0.vapi
+%%DATADIR%%-0.10/vapi/unique-1.0.deps
+%%DATADIR%%-0.10/vapi/unique-1.0.vapi
+%%DATADIR%%-0.10/vapi/v4l2.vapi
+%%DATADIR%%-0.10/vapi/vala-0.10.vapi
+%%DATADIR%%-0.10/vapi/vte.deps
+%%DATADIR%%-0.10/vapi/vte.vapi
+%%DATADIR%%-0.10/vapi/webkit-1.0.deps
+%%DATADIR%%-0.10/vapi/webkit-1.0.vapi
+%%DATADIR%%-0.10/vapi/x11.vapi
+%%DATADIR%%-0.10/vapi/xcb.vapi
+%%DATADIR%%-0.10/vapi/zlib.vapi
+@dirrm %%DATADIR%%-0.10/vapi
+@dirrm %%DATADIR%%-0.10
+@dirrm share/devhelp/books/vala-0.10
@dirrmtry share/devhelp/books
@dirrmtry share/devhelp
-%%VAPIGEN%%@dirrm lib/vala
-@dirrm include/vala-1.0
+@dirrm include/vala-0.10
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 4b3484db7d65..8afc995a574f 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -150,7 +150,9 @@ RUN_DEPENDS+= ${LOCALBASE}/share/claws-mail/themes/ZX-0_1.1/down_arrow.xpm:${POR
post-patch:
@${REINPLACE_CMD} -e \
- 's|-lresolv||g; s|-lpisock\"|-liconv &|g' ${WRKSRC}/configure
+ 's|-lresolv||g; s|-lpisock\"|-liconv &|g' \
+ -e 's|-DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED||g' \
+ ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g ; s|/usr/share|${LOCALBASE}/share|g' \
${WRKSRC}/src/procmime.c
@${REINPLACE_CMD} -e "s|po intl src|po src| ; s:@CLAWS_GNOME2:#@CLAWS_GNOME2:g" ${WRKSRC}/Makefile.in
diff --git a/mail/contact-lookup-applet/Makefile b/mail/contact-lookup-applet/Makefile
index e88c052a8940..16960bcd1ad4 100644
--- a/mail/contact-lookup-applet/Makefile
+++ b/mail/contact-lookup-applet/Makefile
@@ -8,7 +8,7 @@
PORTNAME= contact
PORTVERSION= 0.17
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= mail gnome
MASTER_SITES= http://www.burtonini.com/computing/
PKGNAMESUFFIX= -lookup-applet
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 4d11f4dd178c..2a62de92f565 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger, based off kiesel's ximian-exchange port
#
# $FreeBSD$
-# $MCom: ports-stable/mail/evolution-exchange/Makefile,v 1.5 2010/06/23 11:38:54 kwm Exp $
+# $MCom: ports/mail/evolution-exchange/Makefile,v 1.166 2010/11/16 09:52:36 kwm Exp $
#
PORTNAME= evolution-exchange
-PORTVERSION= 2.30.3
+PORTVERSION= 2.32.1
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,8 +15,9 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Evolution plugin to connect to Microsoft Exchange servers
-BUILD_DEPENDS= evolution:${PORTSDIR}/mail/evolution
-RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution
+EVO_PC_FILE= ${LOCALBASE}/libdata/pkgconfig/evolution-mail.pc
+BUILD_DEPENDS= ${EVO_PC_FILE}:${PORTSDIR}/mail/evolution
+RUN_DEPENDS= ${EVO_PC_FILE}:${PORTSDIR}/mail/evolution
USE_BZIP2= yes
USE_GETTEXT= yes
@@ -31,8 +32,8 @@ CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \
--with-static-ldap=no \
--with-libdb=${LOCALBASE}
-EVO_VERSION= 2.30
-VERSION= 2.30
+EVO_VERSION= 2.32
+VERSION= 2.32
PLIST_SUB= VERSION=${VERSION} EVO_VERSION=${EVO_VERSION} \
EDS_VERSION="1.2"
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index 566d8a27980f..8ac461492532 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/evolution-exchange-2.30.3.tar.bz2) = bbe693fb1e1e857fa3abcc7e39e2f800
-SHA256 (gnome2/evolution-exchange-2.30.3.tar.bz2) = 45ab89229bc19adca16b979d9b4d8c2c628c07c8b097529773b0a32243e3dfcd
-SIZE (gnome2/evolution-exchange-2.30.3.tar.bz2) = 1331986
+SHA256 (gnome2/evolution-exchange-2.32.1.tar.bz2) = 300e2fd995eaecd2d0877b408cc8c6b3d26467aa36e41b1d690f8563b1df9dae
+SIZE (gnome2/evolution-exchange-2.32.1.tar.bz2) = 1307820
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index 6b429296db3b..851f156b63b6 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -1,8 +1,8 @@
bin/exchange-connector-setup-%%VERSION%%
-lib/evolution/2.30/plugins/liborg-gnome-exchange-operations.a
-lib/evolution/2.30/plugins/liborg-gnome-exchange-operations.la
-lib/evolution/2.30/plugins/liborg-gnome-exchange-operations.so
-lib/evolution/2.30/plugins/org-gnome-exchange-operations.eplug
+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/org-gnome-exchange-operations.eplug
lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.a
lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.la
lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.so
diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
index 76efb61cd9db..b7f296b81a90 100644
--- a/mail/evolution-mapi/Makefile
+++ b/mail/evolution-mapi/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/mail/evolution-mapi/Makefile,v 1.1 2010/06/23 09:55:28 kwm Exp $
+# $MCom: ports/mail/evolution-mapi/Makefile,v 1.23 2010/11/16 09:58:56 kwm Exp $
#
PORTNAME= evolution-mapi
-PORTVERSION= 0.30.3
+PORTVERSION= 0.32.1
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -30,7 +30,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-EVO_VERSION= 2.30
+EVO_VERSION= 2.32
EDS_VERSION= 1.2
PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION=${EDS_VERSION}
diff --git a/mail/evolution-mapi/distinfo b/mail/evolution-mapi/distinfo
index 3358412861d3..bcc486d5c8e4 100644
--- a/mail/evolution-mapi/distinfo
+++ b/mail/evolution-mapi/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/evolution-mapi-0.30.3.tar.bz2) = 82df7fb9212863d78612b6639e0946db
-SHA256 (gnome2/evolution-mapi-0.30.3.tar.bz2) = c2320e47a562913398ae1be1de6bbf0d93eae666010e18d855a00c96317c7f11
-SIZE (gnome2/evolution-mapi-0.30.3.tar.bz2) = 525255
+SHA256 (gnome2/evolution-mapi-0.32.1.tar.bz2) = 4ff34dbde1cef67615c4cbc76e259d076a315d70fb80bbf4c107e48b214b9cd8
+SIZE (gnome2/evolution-mapi-0.32.1.tar.bz2) = 560064
diff --git a/mail/evolution-mapi/files/patch-src_libexchangemapi_exchnage-mapi-cal-utils.c b/mail/evolution-mapi/files/patch-src_libexchangemapi_exchnage-mapi-cal-utils.c
new file mode 100644
index 000000000000..5801861bd60a
--- /dev/null
+++ b/mail/evolution-mapi/files/patch-src_libexchangemapi_exchnage-mapi-cal-utils.c
@@ -0,0 +1,10 @@
+--- src/libexchangemapi/exchange-mapi-cal-utils.c.orig 2010-06-07 16:59:16.000000000 +0200
++++ src/libexchangemapi/exchange-mapi-cal-utils.c 2010-06-07 17:01:25.000000000 +0200
+@@ -2175,6 +2175,7 @@ populate_freebusy_data (struct Binary_r
+ gchar *start = NULL, *end = NULL;
+ time_t start_date, end_date;
+ icalcomponent *icalcomp = NULL;
++ int daylight = 0;
+
+ if (!bin)
+ return;
diff --git a/mail/evolution-mapi/pkg-plist b/mail/evolution-mapi/pkg-plist
index 71912de36ff4..6e36162bb260 100644
--- a/mail/evolution-mapi/pkg-plist
+++ b/mail/evolution-mapi/pkg-plist
@@ -1,17 +1,17 @@
+include/evolution-data-server-%%EVO_VERSION%%/mapi/em-operation-queue.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-cal-recur-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-utils.h
+include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-connection.h
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-mail-utils.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
diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile
index 72b6c7c85a24..4462f537e29e 100644
--- a/mail/evolution-sharp/Makefile
+++ b/mail/evolution-sharp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= evolution-sharp
PORTVERSION= 0.20.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail gnome
MASTER_SITES= GNOME
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index dde16b20d747..912bf7572277 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/mail/evolution/Makefile,v 1.5 2010/06/23 07:04:02 kwm Exp $
+# $MCom: ports/mail/evolution/Makefile,v 1.232 2010/11/15 20:40:29 kwm Exp $
#
PORTNAME= evolution
-PORTVERSION= 2.30.3
+PORTVERSION= 2.32.1
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -25,8 +25,8 @@ USE_GMAKE= yes
USE_BISON= build
USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \
- desktopfileutils gnomedocutils ltasneededhack gnomedesktop \
- libgnomecanvas
+ desktopfileutils gnomedocutils ltasneededhack gnomedesktop
+GNOME_DESKTOP_VERSION=2
USE_AUTOTOOLS= libtool:22
USE_GSTREAMER= yes
INSTALLS_OMF= yes
@@ -50,26 +50,16 @@ GCONF_SCHEMAS= apps_evolution_addressbook.schemas \
bogo-junk-plugin.schemas \
evolution-mail.schemas
-EVO_VERSION= 2.30
+EVO_VERSION= 2.32
PLIST_SUB= VERSION=${EVO_VERSION} \
PORTVERSION=2.12
-OPTIONS= PILOT "Enable Palm Pilot sync support" off \
- LDAP "Enable LDAP support" on \
+OPTIONS= LDAP "Enable LDAP support" on \
CANBERRA "Enable canberra plugin" on \
SPAMASSASSIN "Enable SpamAssassin spam filtering" off
.include <bsd.port.pre.mk>
-.if defined(WITH_PILOT)
-LIB_DEPENDS+= gpilotdconduit.2:${PORTSDIR}/palm/gnome-pilot
-CONFIGURE_ARGS+= --with-pisock=${LOCALBASE} \
- --enable-pilot-conduits=yes
-PLIST_SUB+= PILOT=""
-.else
-PLIST_SUB+= PILOT="@comment "
-.endif
-
.if !defined(WITHOUT_LDAP)
USE_OPENLDAP= yes
CONFIGURE_ARGS+=--with-openldap=${LOCALBASE}
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 46a3c5369cac..27311f6996fa 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/evolution-2.30.3.tar.bz2) = 02d225cf130ed0cfcf90915b6ba977bf
-SHA256 (gnome2/evolution-2.30.3.tar.bz2) = 8c47e93ff5aedfad39d4224ae0751a938ccb7d2a2bcd407513cf1331c51b9cab
-SIZE (gnome2/evolution-2.30.3.tar.bz2) = 32555386
+SHA256 (gnome2/evolution-2.32.1.tar.bz2) = 6f6f904b5a2c6cf51f9c44317fc1990b07593eba54957c3924c2db0a235117a3
+SIZE (gnome2/evolution-2.32.1.tar.bz2) = 31875075
diff --git a/mail/evolution/files/fix-plugins.sh b/mail/evolution/files/fix-plugins.sh
index 76216fa1ab67..cadd97baeaae 100644
--- a/mail/evolution/files/fix-plugins.sh
+++ b/mail/evolution/files/fix-plugins.sh
@@ -1,8 +1,8 @@
#!/bin/sh
-plugin_srcs="addressbook-file/addressbook-file.c attachment-reminder/attachment-reminder.c audio-inline/audio-inline.c backup-restore/backup-restore.c bbdb/bbdb.c bogo-junk-plugin/bf-junk-filter.c caldav/caldav-source.c calendar-file/calendar-file.c calendar-http/calendar-http.c calendar-weather/calendar-weather.c contacts-map/contacts-map.c default-mailer/default-mailer.c default-source/default-source.c email-custom-header/email-custom-header.c external-editor/external-editor.c face/face.c google-account-setup/google-source.c groupwise-features/install-shared.c hula-account-setup/hula-account-setup.c image-inline/image-inline.c imap-features/imap-headers.c itip-formatter/itip-formatter.c mail-notification/mail-notification.c mail-to-task/mail-to-task.c mailing-list-actions/mailing-list-actions.c mark-all-read/mark-all-read.c plugin-manager/plugin-manager.c prefer-plain/prefer-plain.c profiler/profiler.c pst-import/pst-importer.c publish-calendar/publish-calendar.c sa-junk-plugin/em-junk-filter.c save-calendar/save-calendar.c startup-wizard/startup-wizard.c subject-thread/subject-thread.c templates/templates.c tnef-attachments/tnef-plugin.c vcard-inline/vcard-inline.c webdav-account-setup/webdav-contacts-source.c"
+plugin_srcs="addressbook-file/addressbook-file.c attachment-reminder/attachment-reminder.c audio-inline/audio-inline.c backup-restore/backup-restore.c bbdb/bbdb.c bogo-junk-plugin/bf-junk-filter.c caldav/caldav-source.c calendar-file/calendar-file.c calendar-http/calendar-http.c calendar-weather/calendar-weather.c contacts-map/contacts-map.c dbx-import/dbx-importer.c default-source/default-source.c email-custom-header/email-custom-header.c external-editor/external-editor.c face/face.c google-account-setup/google-source.c groupwise-features/install-shared.c image-inline/image-inline.c imap-features/imap-headers.c itip-formatter/itip-formatter.c mail-notification/mail-notification.c mail-to-task/mail-to-task.c mailing-list-actions/mailing-list-actions.c mark-all-read/mark-all-read.c plugin-manager/plugin-manager.c prefer-plain/prefer-plain.c profiler/profiler.c pst-import/pst-importer.c publish-calendar/publish-calendar.c sa-junk-plugin/em-junk-filter.c save-calendar/save-calendar.c subject-thread/subject-thread.c templates/templates.c tnef-attachments/tnef-plugin.c vcard-inline/vcard-inline.c webdav-account-setup/webdav-contacts-source.c"
-module_srcs="addressbook/evolution-module-addressbook.c calendar/evolution-module-calendar.c mail/evolution-module-mail.c plugin-lib/evolution-module-plugin-lib.c plugin-mono/evolution-module-plugin-mono.c plugin-python/evolution-module-plugin-python.c"
+module_srcs="addressbook/evolution-module-addressbook.c calendar/evolution-module-calendar.c composer-autosave/e-composer-autosave.c connman/evolution-connman.c mail/evolution-module-mail.c mailto-handler/evolution-mailto-handler.c network-manager/evolution-network-manager.c plugin-lib/evolution-module-plugin-lib.c plugin-mono/evolution-module-plugin-mono.c plugin-python/evolution-module-plugin-python.c startup-wizard/evolution-startup-wizard.c windows-sens/evolution-windows-sens.c"
WRKSRC=$1
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 975b11a5d38f..64e8edf28d39 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -3,7 +3,6 @@ bin/evolution-settings
etc/xdg/autostart/evolution-alarm-notify.desktop
include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-config.h
include/evolution-%%VERSION%%/calendar/common/authentication.h
-%%PILOT%%include/evolution-%%VERSION%%/calendar/conduits/common/libecalendar-common-conduit.h
include/evolution-%%VERSION%%/calendar/gui/cal-editor-utils.h
include/evolution-%%VERSION%%/calendar/gui/calendar-config-keys.h
include/evolution-%%VERSION%%/calendar/gui/calendar-config.h
@@ -74,7 +73,6 @@ 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
@@ -84,14 +82,11 @@ 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-account-utils.h
include/evolution-%%VERSION%%/e-util/e-activity.h
include/evolution-%%VERSION%%/e-util/e-alert-activity.h
include/evolution-%%VERSION%%/e-util/e-alert-dialog.h
include/evolution-%%VERSION%%/e-util/e-alert.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
@@ -104,7 +99,6 @@ include/evolution-%%VERSION%%/e-util/e-event.h
include/evolution-%%VERSION%%/e-util/e-extensible.h
include/evolution-%%VERSION%%/e-util/e-extension.h
include/evolution-%%VERSION%%/e-util/e-file-utils.h
-include/evolution-%%VERSION%%/e-util/e-folder-map.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-io-activity.h
@@ -114,6 +108,7 @@ include/evolution-%%VERSION%%/e-util/e-marshal.h
include/evolution-%%VERSION%%/e-util/e-mktemp.h
include/evolution-%%VERSION%%/e-util/e-module.h
include/evolution-%%VERSION%%/e-util/e-non-intrusive-error-dialog.h
+include/evolution-%%VERSION%%/e-util/e-poolv.h
include/evolution-%%VERSION%%/e-util/e-plugin-ui.h
include/evolution-%%VERSION%%/e-util/e-plugin-util.h
include/evolution-%%VERSION%%/e-util/e-plugin.h
@@ -149,22 +144,85 @@ include/evolution-%%VERSION%%/filter/e-filter-part.h
include/evolution-%%VERSION%%/filter/e-filter-rule.h
include/evolution-%%VERSION%%/filter/e-rule-context.h
include/evolution-%%VERSION%%/filter/e-rule-editor.h
+include/evolution-%%VERSION%%/libart_lgpl/art_affine.h
+include/evolution-%%VERSION%%/libart_lgpl/art_alphagamma.h
+include/evolution-%%VERSION%%/libart_lgpl/art_bpath.h
+include/evolution-%%VERSION%%/libart_lgpl/art_filterlevel.h
+include/evolution-%%VERSION%%/libart_lgpl/art_gray_svp.h
+include/evolution-%%VERSION%%/libart_lgpl/art_misc.h
+include/evolution-%%VERSION%%/libart_lgpl/art_pathcode.h
+include/evolution-%%VERSION%%/libart_lgpl/art_point.h
+include/evolution-%%VERSION%%/libart_lgpl/art_rect.h
+include/evolution-%%VERSION%%/libart_lgpl/art_rect_svp.h
+include/evolution-%%VERSION%%/libart_lgpl/art_rect_uta.h
+include/evolution-%%VERSION%%/libart_lgpl/art_render.h
+include/evolution-%%VERSION%%/libart_lgpl/art_rgb.h
+include/evolution-%%VERSION%%/libart_lgpl/art_rgb_affine.h
+include/evolution-%%VERSION%%/libart_lgpl/art_rgb_affine_private.h
+include/evolution-%%VERSION%%/libart_lgpl/art_rgb_rgba_affine.h
+include/evolution-%%VERSION%%/libart_lgpl/art_rgb_svp.h
+include/evolution-%%VERSION%%/libart_lgpl/art_svp.h
+include/evolution-%%VERSION%%/libart_lgpl/art_svp_intersect.h
+include/evolution-%%VERSION%%/libart_lgpl/art_svp_ops.h
+include/evolution-%%VERSION%%/libart_lgpl/art_svp_point.h
+include/evolution-%%VERSION%%/libart_lgpl/art_svp_render_aa.h
+include/evolution-%%VERSION%%/libart_lgpl/art_svp_vpath.h
+include/evolution-%%VERSION%%/libart_lgpl/art_svp_vpath_stroke.h
+include/evolution-%%VERSION%%/libart_lgpl/art_svp_wind.h
+include/evolution-%%VERSION%%/libart_lgpl/art_uta.h
+include/evolution-%%VERSION%%/libart_lgpl/art_uta_rect.h
+include/evolution-%%VERSION%%/libart_lgpl/art_uta_svp.h
+include/evolution-%%VERSION%%/libart_lgpl/art_uta_vpath.h
+include/evolution-%%VERSION%%/libart_lgpl/art_vpath.h
+include/evolution-%%VERSION%%/libart_lgpl/art_vpath_bpath.h
+include/evolution-%%VERSION%%/libart_lgpl/art_vpath_dash.h
+include/evolution-%%VERSION%%/libart_lgpl/art_vpath_svp.h
+include/evolution-%%VERSION%%/libart_lgpl/libart.h
+include/evolution-%%VERSION%%/libgnomecanvas/gailcanvas.h
+include/evolution-%%VERSION%%/libgnomecanvas/gailcanvasgroup.h
+include/evolution-%%VERSION%%/libgnomecanvas/gailcanvasgroupfactory.h
+include/evolution-%%VERSION%%/libgnomecanvas/gailcanvasitem.h
+include/evolution-%%VERSION%%/libgnomecanvas/gailcanvasitemfactory.h
+include/evolution-%%VERSION%%/libgnomecanvas/gailcanvastext.h
+include/evolution-%%VERSION%%/libgnomecanvas/gailcanvastextfactory.h
+include/evolution-%%VERSION%%/libgnomecanvas/gailcanvaswidget.h
+include/evolution-%%VERSION%%/libgnomecanvas/gailcanvaswidgetfactory.h
+include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas-bpath.h
+include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas-clipgroup.h
+include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas-i18n.h
+include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas-line.h
+include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas-path-def.h
+include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas-pixbuf.h
+include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas-polygon.h
+include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas-rect-ellipse.h
+include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas-rich-text.h
+include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas-shape.h
+include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas-text.h
+include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas-util.h
+include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas-widget.h
+include/evolution-%%VERSION%%/libgnomecanvas/gnome-canvas.h
+include/evolution-%%VERSION%%/libgnomecanvas/libgnomecanvas.h
include/evolution-%%VERSION%%/mail/e-mail-attachment-bar.h
include/evolution-%%VERSION%%/mail/e-mail-backend.h
include/evolution-%%VERSION%%/mail/e-mail-browser.h
include/evolution-%%VERSION%%/mail/e-mail-display.h
+include/evolution-%%VERSION%%/mail/e-mail-folder-pane.h
include/evolution-%%VERSION%%/mail/e-mail-label-action.h
include/evolution-%%VERSION%%/mail/e-mail-label-dialog.h
include/evolution-%%VERSION%%/mail/e-mail-label-list-store.h
include/evolution-%%VERSION%%/mail/e-mail-label-manager.h
include/evolution-%%VERSION%%/mail/e-mail-label-tree-view.h
include/evolution-%%VERSION%%/mail/e-mail-local.h
+include/evolution-%%VERSION%%/mail/e-mail-message-pane.h
include/evolution-%%VERSION%%/mail/e-mail-migrate.h
+include/evolution-%%VERSION%%/mail/e-mail-notebook-view.h
+include/evolution-%%VERSION%%/mail/e-mail-paned-view.h
include/evolution-%%VERSION%%/mail/e-mail-reader-utils.h
include/evolution-%%VERSION%%/mail/e-mail-reader.h
include/evolution-%%VERSION%%/mail/e-mail-sidebar.h
include/evolution-%%VERSION%%/mail/e-mail-store.h
include/evolution-%%VERSION%%/mail/e-mail-tag-editor.h
+include/evolution-%%VERSION%%/mail/e-mail-view.h
include/evolution-%%VERSION%%/mail/em-account-editor.h
include/evolution-%%VERSION%%/mail/em-composer-utils.h
include/evolution-%%VERSION%%/mail/em-config.h
@@ -251,7 +309,6 @@ include/evolution-%%VERSION%%/misc/e-menu-tool-action.h
include/evolution-%%VERSION%%/misc/e-menu-tool-button.h
include/evolution-%%VERSION%%/misc/e-online-button.h
include/evolution-%%VERSION%%/misc/e-paned.h
-%%PILOT%%include/evolution-%%VERSION%%/misc/e-pilot-settings.h
include/evolution-%%VERSION%%/misc/e-popup-action.h
include/evolution-%%VERSION%%/misc/e-popup-menu.h
include/evolution-%%VERSION%%/misc/e-preferences-window.h
@@ -270,9 +327,8 @@ include/evolution-%%VERSION%%/misc/e-signature-manager.h
include/evolution-%%VERSION%%/misc/e-signature-preview.h
include/evolution-%%VERSION%%/misc/e-signature-script-dialog.h
include/evolution-%%VERSION%%/misc/e-signature-tree-view.h
-include/evolution-%%VERSION%%/misc/e-spinner.c
-include/evolution-%%VERSION%%/misc/e-spinner.h
include/evolution-%%VERSION%%/misc/e-web-view.h
+include/evolution-%%VERSION%%/misc/e-web-view-preview.h
include/evolution-%%VERSION%%/misc/e-url-entry.h
include/evolution-%%VERSION%%/misc/ea-calendar-cell.h
include/evolution-%%VERSION%%/misc/ea-calendar-item.h
@@ -281,6 +337,7 @@ include/evolution-%%VERSION%%/misc/ea-widgets.h
include/evolution-%%VERSION%%/shell/e-shell-backend.h
include/evolution-%%VERSION%%/shell/e-shell-common.h
include/evolution-%%VERSION%%/shell/e-shell-content.h
+include/evolution-%%VERSION%%/shell/e-shell-enumtypes.h
include/evolution-%%VERSION%%/shell/e-shell-searchbar.h
include/evolution-%%VERSION%%/shell/e-shell-settings.h
include/evolution-%%VERSION%%/shell/e-shell-sidebar.h
@@ -352,7 +409,6 @@ include/evolution-%%VERSION%%/table/e-tree-table-adapter.h
include/evolution-%%VERSION%%/table/e-tree.h
include/evolution-%%VERSION%%/table/gal-a11y-e-cell-popup.h
include/evolution-%%VERSION%%/table/gal-a11y-e-cell-registry.h
-include/evolution-%%VERSION%%/table/gal-a11y-e-cell-text.h
include/evolution-%%VERSION%%/table/gal-a11y-e-cell-toggle.h
include/evolution-%%VERSION%%/table/gal-a11y-e-cell-tree.h
include/evolution-%%VERSION%%/table/gal-a11y-e-cell-vbox.h
@@ -373,33 +429,18 @@ include/evolution-%%VERSION%%/text/e-text-model.h
include/evolution-%%VERSION%%/text/e-text.h
include/evolution-%%VERSION%%/text/gal-a11y-e-text-factory.h
include/evolution-%%VERSION%%/text/gal-a11y-e-text.h
-%%PILOT%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.a
-%%PILOT%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.la
-%%PILOT%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.so
-%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.a
-%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.la
-%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.so
-%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_common_conduit.a
-%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_common_conduit.la
-%%PILOT%%lib/evolution/%%VERSION%%/conduits/libecalendar_common_conduit.so
-%%PILOT%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.a
-%%PILOT%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.la
-%%PILOT%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.so
-%%PILOT%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.a
-%%PILOT%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.la
-%%PILOT%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.so
lib/evolution/%%VERSION%%/libeabutil.a
lib/evolution/%%VERSION%%/libeabutil.la
lib/evolution/%%VERSION%%/libeabutil.so
lib/evolution/%%VERSION%%/libeabutil.so.0
+lib/evolution/%%VERSION%%/libart_lgpl.a
+lib/evolution/%%VERSION%%/libart_lgpl.la
+lib/evolution/%%VERSION%%/libart_lgpl.so
+lib/evolution/%%VERSION%%/libart_lgpl.so.0
lib/evolution/%%VERSION%%/libcomposer.a
lib/evolution/%%VERSION%%/libcomposer.la
lib/evolution/%%VERSION%%/libcomposer.so
lib/evolution/%%VERSION%%/libcomposer.so.0
-lib/evolution/%%VERSION%%/libeconduit.a
-lib/evolution/%%VERSION%%/libeconduit.la
-lib/evolution/%%VERSION%%/libeconduit.so
-lib/evolution/%%VERSION%%/libeconduit.so.0
lib/evolution/%%VERSION%%/libecontacteditor.a
lib/evolution/%%VERSION%%/libecontacteditor.la
lib/evolution/%%VERSION%%/libecontacteditor.so
@@ -476,6 +517,10 @@ lib/evolution/%%VERSION%%/libfilter.a
lib/evolution/%%VERSION%%/libfilter.la
lib/evolution/%%VERSION%%/libfilter.so
lib/evolution/%%VERSION%%/libfilter.so.0
+lib/evolution/%%VERSION%%/libgnomecanvas.a
+lib/evolution/%%VERSION%%/libgnomecanvas.la
+lib/evolution/%%VERSION%%/libgnomecanvas.so
+lib/evolution/%%VERSION%%/libgnomecanvas.so.0
lib/evolution/%%VERSION%%/libmenus.a
lib/evolution/%%VERSION%%/libmenus.la
lib/evolution/%%VERSION%%/libmenus.so
@@ -486,12 +531,21 @@ lib/evolution/%%VERSION%%/modules/libevolution-module-addressbook.so
lib/evolution/%%VERSION%%/modules/libevolution-module-calendar.a
lib/evolution/%%VERSION%%/modules/libevolution-module-calendar.la
lib/evolution/%%VERSION%%/modules/libevolution-module-calendar.so
+lib/evolution/%%VERSION%%/modules/libevolution-module-composer-autosave.a
+lib/evolution/%%VERSION%%/modules/libevolution-module-composer-autosave.la
+lib/evolution/%%VERSION%%/modules/libevolution-module-composer-autosave.so
lib/evolution/%%VERSION%%/modules/libevolution-module-mail.a
lib/evolution/%%VERSION%%/modules/libevolution-module-mail.la
lib/evolution/%%VERSION%%/modules/libevolution-module-mail.so
+lib/evolution/%%VERSION%%/modules/libevolution-module-mailto-handler.a
+lib/evolution/%%VERSION%%/modules/libevolution-module-mailto-handler.la
+lib/evolution/%%VERSION%%/modules/libevolution-module-mailto-handler.so
lib/evolution/%%VERSION%%/modules/libevolution-module-plugin-lib.a
lib/evolution/%%VERSION%%/modules/libevolution-module-plugin-lib.la
lib/evolution/%%VERSION%%/modules/libevolution-module-plugin-lib.so
+lib/evolution/%%VERSION%%/modules/libevolution-module-startup-wizard.a
+lib/evolution/%%VERSION%%/modules/libevolution-module-startup-wizard.la
+lib/evolution/%%VERSION%%/modules/libevolution-module-startup-wizard.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.a
lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so
@@ -513,9 +567,6 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.a
lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.a
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.a
lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.so
@@ -534,12 +585,12 @@ 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-startup-wizard.a
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.a
lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.a
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.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
@@ -596,15 +647,14 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-weather.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-compose-send-options.xml
-lib/evolution/%%VERSION%%/plugins/org-gnome-default-mailer.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-default-source.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-email-custom-header.eplug
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-startup-wizard.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-webdav.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-dbx-import.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-groupwise-features.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-image-inline.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-imap-features.eplug
@@ -626,13 +676,16 @@ libdata/pkgconfig/evolution-mail.pc
libdata/pkgconfig/evolution-plugin.pc
libdata/pkgconfig/evolution-shell.pc
libexec/evolution/%%VERSION%%/csv2vcard
+libexec/evolution/%%VERSION%%/evolution-alarm-notify
libexec/evolution/%%VERSION%%/evolution-addressbook-clean
libexec/evolution/%%VERSION%%/evolution-addressbook-export
-libexec/evolution/%%VERSION%%/evolution-alarm-notify
libexec/evolution/%%VERSION%%/evolution-backup
libexec/evolution/%%VERSION%%/killev
share/applications/evolution.desktop
share/applications/evolution-settings.desktop
+share/doc/eshell/EExtensible.html
+share/doc/eshell/EExtension.html
+share/doc/eshell/EModule.html
share/doc/eshell/EShell.html
share/doc/eshell/EShellBackend.html
share/doc/eshell/EShellContent.html
@@ -647,20 +700,20 @@ share/doc/eshell/ch01.html
share/doc/eshell/ch02.html
share/doc/eshell/ch03.html
share/doc/eshell/ch04.html
+share/doc/eshell/ch05.html
share/doc/eshell/eshell-Action-Groups.html
share/doc/eshell/eshell-Bit-Arrays-(Legacy).html
share/doc/eshell/eshell-Categories.html
share/doc/eshell/eshell-Container-for-Signatures.html
share/doc/eshell/eshell-Date-and-Time-Formatting.html
share/doc/eshell/eshell-Dialog-Utilities-(Legacy).html
+share/doc/eshell/eshell-EPoolv.html
share/doc/eshell/eshell-Error-Logging.html
share/doc/eshell/eshell-GConf-Bridge.html
share/doc/eshell/eshell-GObject-Property-Bindings.html
-share/doc/eshell/eshell-Generic-Module-Loader.html
share/doc/eshell/eshell-Icon-Utilities-(Legacy).html
share/doc/eshell/eshell-Mail-Accounts.html
share/doc/eshell/eshell-Miscellaneous-Utilities.html
-share/doc/eshell/eshell-More-Signature-Utilities.html
share/doc/eshell/eshell-Personalized-Signatures.html
share/doc/eshell/eshell-Printing.html
share/doc/eshell/eshell-Reading-and-Writing-XML.html
@@ -671,6 +724,7 @@ share/doc/eshell/eshell-Text-to-HTML-Conversion.html
share/doc/eshell/eshell-User-Alert-Handling.html
share/doc/eshell/eshell.devhelp
share/doc/eshell/eshell.devhelp2
+share/doc/eshell/eshell-e-signature-utils.html
share/doc/eshell/home.png
share/doc/eshell/index.html
share/doc/eshell/index.sgml
@@ -689,6 +743,7 @@ share/doc/eshell/up.png
%%DATADIR%%/%%VERSION%%/default/fi/mail/local/Inbox
%%DATADIR%%/%%VERSION%%/default/fr/mail/local/Inbox
%%DATADIR%%/%%VERSION%%/default/hu/mail/local/Inbox
+%%DATADIR%%/%%VERSION%%/default/id/mail/local/Inbox
%%DATADIR%%/%%VERSION%%/default/it/mail/local/Inbox
%%DATADIR%%/%%VERSION%%/default/ja/mail/local/Inbox
%%DATADIR%%/%%VERSION%%/default/ko/mail/local/Inbox
@@ -713,7 +768,6 @@ share/doc/eshell/up.png
%%DATADIR%%/%%VERSION%%/errors/mail.error
%%DATADIR%%/%%VERSION%%/errors/org-gnome-attachment-reminder.error
%%DATADIR%%/%%VERSION%%/errors/org-gnome-backup-restore.error
-%%DATADIR%%/%%VERSION%%/errors/org-gnome-default-mailer.error
%%DATADIR%%/%%VERSION%%/errors/org-gnome-itip-formatter.error
%%DATADIR%%/%%VERSION%%/errors/org-gnome-mail-retract.error
%%DATADIR%%/%%VERSION%%/errors/org-gnome-mailing-list-actions.error
@@ -765,6 +819,8 @@ share/doc/eshell/up.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_new-meeting.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_notes.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_people.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_select-column.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_select-row.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_shared-by-me.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_shared-to-me.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_show-all.png
@@ -778,6 +834,12 @@ share/doc/eshell/up.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_video-conferencing.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_view-details.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/apps/contact-editor.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/apps/im-aim.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/apps/im-icq.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/apps/im-jabber.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/apps/im-msn.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/apps/im-nov.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/apps/im-yahoo.png
%%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
@@ -799,11 +861,21 @@ share/doc/eshell/up.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-month.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-week.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-workweek.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/apps/contact-editor.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/apps/im-aim.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/apps/im-icq.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/apps/im-jabber.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/apps/im-msn.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/apps/im-nov.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/apps/im-yahoo.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/places/mail-inbox.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/places/mail-outbox.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/places/mail-sent.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/go-today.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_contact-list.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_insert-note.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_insert-rule.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_insert-table.png
-%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_text-monospaced.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_mail-filters-apply.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_mail-open-multiple.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_mail-unread-multiple.png
@@ -811,6 +883,8 @@ share/doc/eshell/up.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_new-meeting.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_notes.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_people.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_select-column.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_select-row.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_shared-by-me.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_shared-to-me.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_show-all.png
@@ -818,14 +892,10 @@ share/doc/eshell/up.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_task-assigned.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_task-recurring.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_task.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_text-monospaced.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_timezone.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_todo.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_video-conferencing.png
-%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/apps/contact-editor.png
-%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/places/mail-inbox.png
-%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/places/mail-outbox.png
-%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/places/mail-sent.png
-%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/go-today.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/query-free-busy.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/view-calendar-day.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/view-calendar-list.png
@@ -833,6 +903,12 @@ share/doc/eshell/up.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/view-calendar-week.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/view-calendar-workweek.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/apps/contact-editor.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/apps/im-aim.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/apps/im-icq.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/apps/im-jabber.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/apps/im-msn.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/apps/im-nov.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/apps/im-yahoo.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/places/mail-inbox.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/places/mail-outbox.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/places/mail-sent.png
@@ -845,6 +921,12 @@ share/doc/eshell/up.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/32x32/actions/view-calendar-week.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/32x32/actions/view-calendar-workweek.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/32x32/apps/contact-editor.png
+%%DATADIR%%/%%VERSION%%/icons/hicolor/scalable/apps/im-aim.svg
+%%DATADIR%%/%%VERSION%%/icons/hicolor/scalable/apps/im-icq.svg
+%%DATADIR%%/%%VERSION%%/icons/hicolor/scalable/apps/im-jabber.svg
+%%DATADIR%%/%%VERSION%%/icons/hicolor/scalable/apps/im-msn.svg
+%%DATADIR%%/%%VERSION%%/icons/hicolor/scalable/apps/im-nov.svg
+%%DATADIR%%/%%VERSION%%/icons/hicolor/scalable/apps/im-yahoo.svg
%%DATADIR%%/%%VERSION%%/icons/hicolor/32x32/status/offline.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/32x32/status/online.png
%%DATADIR%%/%%VERSION%%/icons/hicolor/48x48/actions/stock_alarm.png
@@ -875,10 +957,211 @@ share/doc/eshell/up.png
%%DATADIR%%/%%VERSION%%/images/minus.png
%%DATADIR%%/%%VERSION%%/images/plus.png
%%DATADIR%%/%%VERSION%%/images/world_map-960.png
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/a.memail.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/abc.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/agate.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/amail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/amber.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/amethyst.broba.cc
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/aol.com
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/apost.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/aqua.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/arcor.de
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/ballade.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/bay.gunmanet.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/bb-niigata.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/bc.iij4u.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/beige.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/blue.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/bmail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/bolero.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/bpost.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/brown.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/camel.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/cameo.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/cc9.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/cek.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/clio.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/cmail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/co1.wind.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/co2.wind.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/co3.wind.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/cocoa.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/coda.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/comcast.net
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/concerto.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/coral.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/courante.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/cpost.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/cream.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/dan.gunmanet.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/dance.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/dmail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/e23.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/earthlink.net
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/ebony.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/email.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/fantasy.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/flamenco.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/fmail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/free.fr
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/freenet.de
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/fuga.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/gmail.com
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/gmail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/gmx.com
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/gmx.net
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/go.tvm.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/goo.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/googlemail.com
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/grape.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/gray.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/hal.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/hana.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/hotmail.co.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/hotmail.co.uk
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/hotmail.com
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/hotmail.de
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/hotmail.fr
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/hotmail.it
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/ic-net.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/iiyama-catv.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/imail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/inbox.lt
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/inbox.lv
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/indigo.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/inet-shibata.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/ivory.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/iwafune.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/jade.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/janis.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/jet.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/ji.jet.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/jmail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/k1.wind.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/khaki.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/kmail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/kokuyou.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/lapis.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/laposte.net
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/lemon.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/lilac.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/lime.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/live.co.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/live.co.uk
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/live.com
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/live.de
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/live.fr
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/live.it
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/ma100.tiki.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/mac.com
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/mahoroba.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/mail.gunmanet.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/mail.iwafune.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/maroon.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/me.com
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/minuet.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/ml.murakami.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/ml.shibata.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/mnet.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/mopera.net
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/msn.com
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/navy.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/nifty.com
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/nsat.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/olive.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/online.de
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/opal.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/orange.fr
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/orange.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/orchid.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/pal.kijimadaira.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/palette.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/parabox.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/peach.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/peoplepc.com
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/plum.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/po.dcn.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/po.wind.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/polka.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/pop.shibata.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/purple.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/rainbow.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/red.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/rmail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/rondo.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/rose.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/rouge.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/ruby.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/sakunet.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/sea.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/sepia.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/serenade.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/silk.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/silver.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/sky.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/smail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/snow.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/so.wind.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/sonata.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/suite.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/symphony.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/t-online.de
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/taupe.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/tiki.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/tmail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/toccata.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/topaz.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/trio.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/umail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/verizon.net
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/violet.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/vm.aikis.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/vmail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/vp.tiki.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/waltz.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/wanadoo.fr
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/wave.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/web.de
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/white.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/wine.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/wmail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/xmail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/xp.wind.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/xpost.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/xs4all.nl
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/yahoo.com
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/ybb.ne.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/yellow.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/ymail.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/ypost.plala.or.jp
+%%DATADIR%%/%%VERSION%%/mail-autoconfig/zmail.plala.or.jp
%%DATADIR%%/%%VERSION%%/memotypes.xml
%%DATADIR%%/%%VERSION%%/searchtypes.xml
%%DATADIR%%/%%VERSION%%/sounds/default_alarm.wav
%%DATADIR%%/%%VERSION%%/tasktypes.xml
+%%DATADIR%%/%%VERSION%%/theme/close-on-tab-hover.png
+%%DATADIR%%/%%VERSION%%/theme/close-on-tab.png
+%%DATADIR%%/%%VERSION%%/theme/default.css
+%%DATADIR%%/%%VERSION%%/theme/preview-tab-active-private.png
+%%DATADIR%%/%%VERSION%%/theme/preview-tab-active.png
+%%DATADIR%%/%%VERSION%%/theme/preview-tab-hover-private.png
+%%DATADIR%%/%%VERSION%%/theme/preview-tab-hover.png
+%%DATADIR%%/%%VERSION%%/theme/preview-tab-inactive-private.png
+%%DATADIR%%/%%VERSION%%/theme/preview-tab-inactive.png
+%%DATADIR%%/%%VERSION%%/theme/tab-active-private.png
+%%DATADIR%%/%%VERSION%%/theme/tab-active.png
+%%DATADIR%%/%%VERSION%%/theme/tab-add-hover.png
+%%DATADIR%%/%%VERSION%%/theme/tab-add.png
+%%DATADIR%%/%%VERSION%%/theme/tab-bar-background.png
+%%DATADIR%%/%%VERSION%%/theme/tab-inactive-hover-private.png
+%%DATADIR%%/%%VERSION%%/theme/tab-inactive-hover.png
+%%DATADIR%%/%%VERSION%%/theme/tab-inactive-private.png
+%%DATADIR%%/%%VERSION%%/theme/tab-inactive.png
+%%DATADIR%%/%%VERSION%%/theme/tab-switcher-close-hover.png
+%%DATADIR%%/%%VERSION%%/theme/tab-switcher-close.png
+%%DATADIR%%/%%VERSION%%/theme/tab-switcher-hover.png
+%%DATADIR%%/%%VERSION%%/theme/tab-switcher.png
%%DATADIR%%/%%VERSION%%/ui/alarm-dialog.ui
%%DATADIR%%/%%VERSION%%/ui/alarm-list-dialog.ui
%%DATADIR%%/%%VERSION%%/ui/alarm-notify.ui
@@ -1474,6 +1757,72 @@ 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/ver_view_a.png
+share/gnome/help/evolution/gl/evolution.xml
+share/gnome/help/evolution/gl/figures/attach_reminder_a.png
+share/gnome/help/evolution/gl/figures/calendar_preference_display.png
+share/gnome/help/evolution/gl/figures/categories_a.png
+share/gnome/help/evolution/gl/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/gl/figures/delgt-add.png
+share/gnome/help/evolution/gl/figures/evo_Wcal_prop_a.png
+share/gnome/help/evolution/gl/figures/evo_adv_search_a.png
+share/gnome/help/evolution/gl/figures/evo_attachreminder_plugin.png
+share/gnome/help/evolution/gl/figures/evo_backup_prgsbar.png
+share/gnome/help/evolution/gl/figures/evo_backup_warning.png
+share/gnome/help/evolution/gl/figures/evo_blink.png
+share/gnome/help/evolution/gl/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/gl/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/gl/figures/evo_calstatus_a.png
+share/gnome/help/evolution/gl/figures/evo_caltasks_a.png
+share/gnome/help/evolution/gl/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/gl/figures/evo_delegate_permission_a.png
+share/gnome/help/evolution/gl/figures/evo_dialog-info.png
+share/gnome/help/evolution/gl/figures/evo_dialog-warning.png
+share/gnome/help/evolution/gl/figures/evo_edit_search.png
+share/gnome/help/evolution/gl/figures/evo_exchng_mapi.png
+share/gnome/help/evolution/gl/figures/evo_flag_follow_up_a.png
+share/gnome/help/evolution/gl/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/gl/figures/evo_gwstatustrack.png
+share/gnome/help/evolution/gl/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/gl/figures/evo_junk_a.png
+share/gnome/help/evolution/gl/figures/evo_label_a.png
+share/gnome/help/evolution/gl/figures/evo_labels_a.png
+share/gnome/help/evolution/gl/figures/evo_mail_a.png
+share/gnome/help/evolution/gl/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/gl/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/gl/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/gl/figures/evo_memo_a.png
+share/gnome/help/evolution/gl/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/gl/figures/evo_newmail.png
+share/gnome/help/evolution/gl/figures/evo_newmess_a.png
+share/gnome/help/evolution/gl/figures/evo_offline.png
+share/gnome/help/evolution/gl/figures/evo_popreceive_a.png
+share/gnome/help/evolution/gl/figures/evo_proxyadd_a.png
+share/gnome/help/evolution/gl/figures/evo_rule_a.png
+share/gnome/help/evolution/gl/figures/evo_send_option_a.png
+share/gnome/help/evolution/gl/figures/evo_send_setup_a.png
+share/gnome/help/evolution/gl/figures/evo_sendstatus_a.png
+share/gnome/help/evolution/gl/figures/evo_shd_memo_a.png
+share/gnome/help/evolution/gl/figures/evo_usereceive_a.png
+share/gnome/help/evolution/gl/figures/evolution_contact_preference.png
+share/gnome/help/evolution/gl/figures/evolution_mail_preference.png
+share/gnome/help/evolution/gl/figures/exchng-rec-mails.png
+share/gnome/help/evolution/gl/figures/exchng-rec-options.png
+share/gnome/help/evolution/gl/figures/filter-new-fig.png
+share/gnome/help/evolution/gl/figures/folder_plus.png
+share/gnome/help/evolution/gl/figures/folder_size_mapi.png
+share/gnome/help/evolution/gl/figures/folder_size_preference.png
+share/gnome/help/evolution/gl/figures/google_cal_view.png
+share/gnome/help/evolution/gl/figures/groupwise_resend.png
+share/gnome/help/evolution/gl/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/gl/figures/local_ics_calendar.png
+share/gnome/help/evolution/gl/figures/mailer_preferences.png
+share/gnome/help/evolution/gl/figures/meeting.png
+share/gnome/help/evolution/gl/figures/minus.png
+share/gnome/help/evolution/gl/figures/plus.png
+share/gnome/help/evolution/gl/figures/quick_add_a.png
+share/gnome/help/evolution/gl/figures/quick_reference.png
+share/gnome/help/evolution/gl/figures/stock_search.png
+share/gnome/help/evolution/gl/figures/ver_view_a.png
share/gnome/help/evolution/mk/evolution.xml
share/gnome/help/evolution/mk/figures/attach_reminder_a.png
share/gnome/help/evolution/mk/figures/calendar_preference_display.png
@@ -1738,10 +2087,72 @@ 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/ver_view_a.png
-%%PILOT%%share/gnome-pilot/conduits/e-address.conduit
-%%PILOT%%share/gnome-pilot/conduits/e-calendar.conduit
-%%PILOT%%share/gnome-pilot/conduits/e-memo.conduit
-%%PILOT%%share/gnome-pilot/conduits/e-todo.conduit
+share/gnome/help/evolution/zh_CN/evolution.xml
+share/gnome/help/evolution/zh_CN/figures/attach_reminder_a.png
+share/gnome/help/evolution/zh_CN/figures/calendar_preference_display.png
+share/gnome/help/evolution/zh_CN/figures/categories_a.png
+share/gnome/help/evolution/zh_CN/figures/contacts_mainwindow_a.png
+share/gnome/help/evolution/zh_CN/figures/delgt-add.png
+share/gnome/help/evolution/zh_CN/figures/evo_Wcal_prop_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_adv_search_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_attachreminder_plugin.png
+share/gnome/help/evolution/zh_CN/figures/evo_backup_prgsbar.png
+share/gnome/help/evolution/zh_CN/figures/evo_backup_warning.png
+share/gnome/help/evolution/zh_CN/figures/evo_blink.png
+share/gnome/help/evolution/zh_CN/figures/evo_cal_callout_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_calender_appointmnt.png
+share/gnome/help/evolution/zh_CN/figures/evo_calstatus_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_caltasks_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_contacteditor_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_delegate_permission_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_dialog-info.png
+share/gnome/help/evolution/zh_CN/figures/evo_dialog-warning.png
+share/gnome/help/evolution/zh_CN/figures/evo_edit_search.png
+share/gnome/help/evolution/zh_CN/figures/evo_exchng_mapi.png
+share/gnome/help/evolution/zh_CN/figures/evo_flag_follow_up_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_gwreceive_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_gwstatustrack.png
+share/gnome/help/evolution/zh_CN/figures/evo_imapreceive_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_junk_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_label_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_labels_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_mail_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_maildirreceive_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_mboxreceive_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_memo_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_mhreceive_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_newmail.png
+share/gnome/help/evolution/zh_CN/figures/evo_newmess_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_offline.png
+share/gnome/help/evolution/zh_CN/figures/evo_popreceive_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_proxyadd_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_rule_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_send_option_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_send_setup_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_sendstatus_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_shd_memo_a.png
+share/gnome/help/evolution/zh_CN/figures/evo_usereceive_a.png
+share/gnome/help/evolution/zh_CN/figures/evolution_contact_preference.png
+share/gnome/help/evolution/zh_CN/figures/evolution_mail_preference.png
+share/gnome/help/evolution/zh_CN/figures/exchng-rec-mails.png
+share/gnome/help/evolution/zh_CN/figures/exchng-rec-options.png
+share/gnome/help/evolution/zh_CN/figures/filter-new-fig.png
+share/gnome/help/evolution/zh_CN/figures/folder_plus.png
+share/gnome/help/evolution/zh_CN/figures/folder_size_mapi.png
+share/gnome/help/evolution/zh_CN/figures/folder_size_preference.png
+share/gnome/help/evolution/zh_CN/figures/google_cal_view.png
+share/gnome/help/evolution/zh_CN/figures/groupwise_resend.png
+share/gnome/help/evolution/zh_CN/figures/groupwise_resend_retract.png
+share/gnome/help/evolution/zh_CN/figures/local_ics_calendar.png
+share/gnome/help/evolution/zh_CN/figures/mailer_preferences.png
+share/gnome/help/evolution/zh_CN/figures/meeting.png
+share/gnome/help/evolution/zh_CN/figures/minus.png
+share/gnome/help/evolution/zh_CN/figures/plus.png
+share/gnome/help/evolution/zh_CN/figures/quick_add_a.png
+share/gnome/help/evolution/zh_CN/figures/quick_reference.png
+share/gnome/help/evolution/zh_CN/figures/stock_search.png
+share/gnome/help/evolution/zh_CN/figures/ver_view_a.png
share/icons/hicolor/16x16/apps/evolution-mail.png
share/icons/hicolor/16x16/apps/evolution-memos.png
share/icons/hicolor/16x16/apps/evolution-tasks.png
@@ -1769,6 +2180,7 @@ share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/as/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/ast/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/be@latin/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -1858,11 +2270,15 @@ share/omf/evolution/evolution-en_GB.omf
share/omf/evolution/evolution-es.omf
share/omf/evolution/evolution-eu.omf
share/omf/evolution/evolution-fr.omf
+share/omf/evolution/evolution-gl.omf
share/omf/evolution/evolution-mk.omf
share/omf/evolution/evolution-oc.omf
share/omf/evolution/evolution-ru.omf
share/omf/evolution/evolution-sv.omf
+share/omf/evolution/evolution-zh_CN.omf
@dirrm share/omf/evolution
+@dirrm share/gnome/help/evolution/zh_CN/figures
+@dirrm share/gnome/help/evolution/zh_CN
@dirrm share/gnome/help/evolution/sv/figures
@dirrm share/gnome/help/evolution/sv
@dirrm share/gnome/help/evolution/ru/figures
@@ -1871,6 +2287,8 @@ share/omf/evolution/evolution-sv.omf
@dirrm share/gnome/help/evolution/oc
@dirrm share/gnome/help/evolution/mk/figures
@dirrm share/gnome/help/evolution/mk
+@dirrm share/gnome/help/evolution/gl/figures
+@dirrm share/gnome/help/evolution/gl
@dirrm share/gnome/help/evolution/fr/figures
@dirrm share/gnome/help/evolution/fr
@dirrm share/gnome/help/evolution/eu/figures
@@ -1895,8 +2313,11 @@ share/omf/evolution/evolution-sv.omf
@dirrm %%DATADIR%%/%%VERSION%%/views/addressbook
@dirrm %%DATADIR%%/%%VERSION%%/views
@dirrm %%DATADIR%%/%%VERSION%%/ui
+@dirrm %%DATADIR%%/%%VERSION%%/theme
@dirrm %%DATADIR%%/%%VERSION%%/sounds
+@dirrm %%DATADIR%%/%%VERSION%%/mail-autoconfig
@dirrm %%DATADIR%%/%%VERSION%%/images
+@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/scalable/apps
@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/scalable/actions
@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/scalable
@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/48x48/status
@@ -1980,6 +2401,9 @@ share/omf/evolution/evolution-sv.omf
@dirrm %%DATADIR%%/%%VERSION%%/default/it/mail/local
@dirrm %%DATADIR%%/%%VERSION%%/default/it/mail
@dirrm %%DATADIR%%/%%VERSION%%/default/it
+@dirrm %%DATADIR%%/%%VERSION%%/default/id/mail/local
+@dirrm %%DATADIR%%/%%VERSION%%/default/id/mail
+@dirrm %%DATADIR%%/%%VERSION%%/default/id
@dirrm %%DATADIR%%/%%VERSION%%/default/hu/mail/local
@dirrm %%DATADIR%%/%%VERSION%%/default/hu/mail
@dirrm %%DATADIR%%/%%VERSION%%/default/hu
@@ -2013,7 +2437,6 @@ share/omf/evolution/evolution-sv.omf
@dirrm libexec/evolution
@dirrm lib/evolution/%%VERSION%%/plugins
@dirrm lib/evolution/%%VERSION%%/modules
-%%PILOT%%@dirrm lib/evolution/%%VERSION%%/conduits
@dirrm lib/evolution/%%VERSION%%
@dirrm lib/evolution
@dirrm include/evolution-%%VERSION%%/text
@@ -2022,16 +2445,15 @@ 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%%/libart_lgpl
+@dirrm include/evolution-%%VERSION%%/libgnomecanvas
@dirrm include/evolution-%%VERSION%%/filter
@dirrm include/evolution-%%VERSION%%/em-format
@dirrm include/evolution-%%VERSION%%/e-util
-@dirrm include/evolution-%%VERSION%%/e-conduit
@dirrm include/evolution-%%VERSION%%/composer
@dirrm include/evolution-%%VERSION%%/calendar/gui/dialogs
@dirrm include/evolution-%%VERSION%%/calendar/gui
@dirrm include/evolution-%%VERSION%%/calendar/common
-%%PILOT%%@dirrm include/evolution-%%VERSION%%/calendar/conduits/common
-%%PILOT%%@dirrm include/evolution-%%VERSION%%/calendar/conduits
@dirrm include/evolution-%%VERSION%%/calendar
@dirrm include/evolution-%%VERSION%%/addressbook/gui/widgets
@dirrm include/evolution-%%VERSION%%/addressbook/gui
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 5d2c13098eca..e7457a9c87f9 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/math/gcalctool/Makefile,v 1.11 2010/06/23 15:50:52 kwm Exp $
+# $MCom: ports/math/gcalctool/Makefile,v 1.140 2010/11/15 22:06:10 kwm Exp $
#
PORTNAME= gcalctool
-PORTVERSION= 5.30.2
-PORTREVISION= 1
+PORTVERSION= 5.32.1
PORTEPOCH= 2
CATEGORIES= math gnome
MASTER_SITES= GNOME
@@ -17,6 +16,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A GNOME 2 calculator tool based on the old calctool for OpenWindows
+CONFLICTS= gcalctool-2.31.*
+
USE_BZIP2= yes
USE_BISON= build
USE_GETTEXT= yes
@@ -27,6 +28,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAN1= gcalctool.1
-GCONF_SCHEMAS= gcalctool.schemas
+GLIB_SCHEMAS= org.gnome.gcalctool.gschema.xml
.include <bsd.port.mk>
diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo
index 76eb245b3106..1b7eb1df4cef 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gcalctool-5.30.2.tar.bz2) = 9357de6835da305ee4f0ebad509b509a
-SHA256 (gnome2/gcalctool-5.30.2.tar.bz2) = 214580306a0029d8247b79e3e710a40328b9e022f8fcee1cd448c5d2467d8c4b
-SIZE (gnome2/gcalctool-5.30.2.tar.bz2) = 1126899
+SHA256 (gnome2/gcalctool-5.32.1.tar.bz2) = 3938913d22876fc7acaa18b9b5b15fd110d6cb63bfa6d2079a2b1341e28564f4
+SIZE (gnome2/gcalctool-5.32.1.tar.bz2) = 1260032
diff --git a/math/gcalctool/files/patch-configure b/math/gcalctool/files/patch-configure
new file mode 100644
index 000000000000..330200143e4a
--- /dev/null
+++ b/math/gcalctool/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig 2010-08-17 10:19:07.000000000 +0200
++++ configure 2010-08-17 10:21:04.000000000 +0200
+@@ -5741,8 +5741,8 @@
+ .SECONDARY: $(gsettings_SCHEMAS)
+
+ gsettings__base_list = \
+- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
++ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
+
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ @$(NORMAL_INSTALL)
diff --git a/math/gcalctool/files/patch-po__zh_CN.po b/math/gcalctool/files/patch-po__zh_CN.po
deleted file mode 100644
index 5d874eb0cab9..000000000000
--- a/math/gcalctool/files/patch-po__zh_CN.po
+++ /dev/null
@@ -1,14 +0,0 @@
-
---- po/zh_CN.po.old 2010-10-02 02:25:46.507328082 +0800
-+++ po/zh_CN.po 2010-10-02 02:27:12.744004376 +0800
-@@ -1028,7 +1028,7 @@
- #. Translators: Digits localized for the given language
- #: ../src/calctool.c:175
- msgid "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
--msgstr "零,一,二,三,四,五,六,七,八,九,十,A,B,C,D,E,F"
-+msgstr "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
-
- #: ../src/currency.h:18
- msgid "Australian dollar"
-
-
diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist
index f9f618bfdd12..344ee94c5bb5 100644
--- a/math/gcalctool/pkg-plist
+++ b/math/gcalctool/pkg-plist
@@ -2,8 +2,11 @@ bin/gcalccmd
bin/gcalctool
bin/gnome-calculator
share/applications/gcalctool.desktop
-%%DATADIR%%/gcalctool.ui
-%%DATADIR%%/financial.ui
+%%DATADIR%%/buttons-advanced.ui
+%%DATADIR%%/buttons-basic.ui
+%%DATADIR%%/buttons-financial.ui
+%%DATADIR%%/buttons-programming.ui
+%%DATADIR%%/preferences.ui
share/gnome/help/gcalctool/C/absolute.page
share/gnome/help/gcalctool/C/base.page
share/gnome/help/gcalctool/C/boolean.page
@@ -228,6 +231,34 @@ share/gnome/help/gcalctool/eu/scientific.page
share/gnome/help/gcalctool/eu/superscript.page
share/gnome/help/gcalctool/eu/trigonometry.page
share/gnome/help/gcalctool/eu/variables.page
+share/gnome/help/gcalctool/fi/absolute.page
+share/gnome/help/gcalctool/fi/base.page
+share/gnome/help/gcalctool/fi/boolean.page
+share/gnome/help/gcalctool/fi/complex.page
+share/gnome/help/gcalctool/fi/conv-base.page
+share/gnome/help/gcalctool/fi/conv-character.page
+share/gnome/help/gcalctool/fi/conv-currency.page
+share/gnome/help/gcalctool/fi/conv-length.page
+share/gnome/help/gcalctool/fi/conv-time.page
+share/gnome/help/gcalctool/fi/conv-weight.page
+share/gnome/help/gcalctool/fi/equation.page
+share/gnome/help/gcalctool/fi/factorial.page
+share/gnome/help/gcalctool/fi/factorize.page
+share/gnome/help/gcalctool/fi/financial.page
+share/gnome/help/gcalctool/fi/functions.page
+share/gnome/help/gcalctool/fi/index.page
+share/gnome/help/gcalctool/fi/keyboard.page
+share/gnome/help/gcalctool/fi/legal.xml
+share/gnome/help/gcalctool/fi/logarithm.page
+share/gnome/help/gcalctool/fi/modulus.page
+share/gnome/help/gcalctool/fi/mouse.page
+share/gnome/help/gcalctool/fi/number-display.page
+share/gnome/help/gcalctool/fi/percentage.page
+share/gnome/help/gcalctool/fi/power.page
+share/gnome/help/gcalctool/fi/scientific.page
+share/gnome/help/gcalctool/fi/superscript.page
+share/gnome/help/gcalctool/fi/trigonometry.page
+share/gnome/help/gcalctool/fi/variables.page
share/gnome/help/gcalctool/fr/absolute.page
share/gnome/help/gcalctool/fr/base.page
share/gnome/help/gcalctool/fr/boolean.page
@@ -256,6 +287,62 @@ share/gnome/help/gcalctool/fr/scientific.page
share/gnome/help/gcalctool/fr/superscript.page
share/gnome/help/gcalctool/fr/trigonometry.page
share/gnome/help/gcalctool/fr/variables.page
+share/gnome/help/gcalctool/gl/absolute.page
+share/gnome/help/gcalctool/gl/base.page
+share/gnome/help/gcalctool/gl/boolean.page
+share/gnome/help/gcalctool/gl/complex.page
+share/gnome/help/gcalctool/gl/conv-base.page
+share/gnome/help/gcalctool/gl/conv-character.page
+share/gnome/help/gcalctool/gl/conv-currency.page
+share/gnome/help/gcalctool/gl/conv-length.page
+share/gnome/help/gcalctool/gl/conv-time.page
+share/gnome/help/gcalctool/gl/conv-weight.page
+share/gnome/help/gcalctool/gl/equation.page
+share/gnome/help/gcalctool/gl/factorial.page
+share/gnome/help/gcalctool/gl/factorize.page
+share/gnome/help/gcalctool/gl/financial.page
+share/gnome/help/gcalctool/gl/functions.page
+share/gnome/help/gcalctool/gl/index.page
+share/gnome/help/gcalctool/gl/keyboard.page
+share/gnome/help/gcalctool/gl/legal.xml
+share/gnome/help/gcalctool/gl/logarithm.page
+share/gnome/help/gcalctool/gl/modulus.page
+share/gnome/help/gcalctool/gl/mouse.page
+share/gnome/help/gcalctool/gl/number-display.page
+share/gnome/help/gcalctool/gl/percentage.page
+share/gnome/help/gcalctool/gl/power.page
+share/gnome/help/gcalctool/gl/scientific.page
+share/gnome/help/gcalctool/gl/superscript.page
+share/gnome/help/gcalctool/gl/trigonometry.page
+share/gnome/help/gcalctool/gl/variables.page
+share/gnome/help/gcalctool/hu/absolute.page
+share/gnome/help/gcalctool/hu/base.page
+share/gnome/help/gcalctool/hu/boolean.page
+share/gnome/help/gcalctool/hu/complex.page
+share/gnome/help/gcalctool/hu/conv-base.page
+share/gnome/help/gcalctool/hu/conv-character.page
+share/gnome/help/gcalctool/hu/conv-currency.page
+share/gnome/help/gcalctool/hu/conv-length.page
+share/gnome/help/gcalctool/hu/conv-time.page
+share/gnome/help/gcalctool/hu/conv-weight.page
+share/gnome/help/gcalctool/hu/equation.page
+share/gnome/help/gcalctool/hu/factorial.page
+share/gnome/help/gcalctool/hu/factorize.page
+share/gnome/help/gcalctool/hu/financial.page
+share/gnome/help/gcalctool/hu/functions.page
+share/gnome/help/gcalctool/hu/index.page
+share/gnome/help/gcalctool/hu/keyboard.page
+share/gnome/help/gcalctool/hu/legal.xml
+share/gnome/help/gcalctool/hu/logarithm.page
+share/gnome/help/gcalctool/hu/modulus.page
+share/gnome/help/gcalctool/hu/mouse.page
+share/gnome/help/gcalctool/hu/number-display.page
+share/gnome/help/gcalctool/hu/percentage.page
+share/gnome/help/gcalctool/hu/power.page
+share/gnome/help/gcalctool/hu/scientific.page
+share/gnome/help/gcalctool/hu/superscript.page
+share/gnome/help/gcalctool/hu/trigonometry.page
+share/gnome/help/gcalctool/hu/variables.page
share/gnome/help/gcalctool/it/absolute.page
share/gnome/help/gcalctool/it/base.page
share/gnome/help/gcalctool/it/boolean.page
@@ -560,6 +647,7 @@ share/locale/en@shaw/LC_MESSAGES/gcalctool.mo
share/locale/en_CA/LC_MESSAGES/gcalctool.mo
share/locale/en_GB/LC_MESSAGES/gcalctool.mo
share/locale/en_US/LC_MESSAGES/gcalctool.mo
+share/locale/eo/LC_MESSAGES/gcalctool.mo
share/locale/es/LC_MESSAGES/gcalctool.mo
share/locale/et/LC_MESSAGES/gcalctool.mo
share/locale/eu/LC_MESSAGES/gcalctool.mo
@@ -573,10 +661,12 @@ share/locale/he/LC_MESSAGES/gcalctool.mo
share/locale/hi/LC_MESSAGES/gcalctool.mo
share/locale/hr/LC_MESSAGES/gcalctool.mo
share/locale/hu/LC_MESSAGES/gcalctool.mo
+share/locale/hy/LC_MESSAGES/gcalctool.mo
share/locale/id/LC_MESSAGES/gcalctool.mo
share/locale/it/LC_MESSAGES/gcalctool.mo
share/locale/ja/LC_MESSAGES/gcalctool.mo
share/locale/ka/LC_MESSAGES/gcalctool.mo
+share/locale/kk/LC_MESSAGES/gcalctool.mo
share/locale/kn/LC_MESSAGES/gcalctool.mo
share/locale/ko/LC_MESSAGES/gcalctool.mo
share/locale/ku/LC_MESSAGES/gcalctool.mo
@@ -630,7 +720,10 @@ share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
@dirrm share/gnome/help/gcalctool/ko
@dirrm share/gnome/help/gcalctool/ja
@dirrm share/gnome/help/gcalctool/it
+@dirrm share/gnome/help/gcalctool/hu
+@dirrm share/gnome/help/gcalctool/gl
@dirrm share/gnome/help/gcalctool/fr
+@dirrm share/gnome/help/gcalctool/fi
@dirrm share/gnome/help/gcalctool/eu
@dirrm share/gnome/help/gcalctool/es
@dirrm share/gnome/help/gcalctool/el
@@ -664,6 +757,10 @@ share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
@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/en_US/LC_MESSAGES
@dirrmtry share/locale/en_US
@dirrmtry share/locale/en@shaw/LC_MESSAGES
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 66c4d3f76493..0f9765188dbe 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pspp
PORTVERSION= 0.6.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= math
MASTER_SITES= GNU
diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile
index 3ddb4ed7e41b..3c33a5035c97 100644
--- a/misc/gnome-devel-docs/Makefile
+++ b/misc/gnome-devel-docs/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.20 2010/04/27 00:49:49 kwm Exp $
+# $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.22 2010/09/29 15:17:53 kwm Exp $
#
PORTNAME= gnome-devel-docs
-PORTVERSION= 2.30.1
+PORTVERSION= 2.32.0
CATEGORIES= misc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/misc/gnome-devel-docs/distinfo b/misc/gnome-devel-docs/distinfo
index dac16fd60214..60c13165bc8c 100644
--- a/misc/gnome-devel-docs/distinfo
+++ b/misc/gnome-devel-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-devel-docs-2.30.1.tar.bz2) = 6af984290595176fcd6f0717320b7643
-SHA256 (gnome2/gnome-devel-docs-2.30.1.tar.bz2) = 073570bd0057a836cc000a1964cfa674728c14152027e2876bbee98c723845a0
-SIZE (gnome2/gnome-devel-docs-2.30.1.tar.bz2) = 4402369
+MD5 (gnome2/gnome-devel-docs-2.32.0.tar.bz2) = 5c239c881a613f3d8880721be14cc358
+SHA256 (gnome2/gnome-devel-docs-2.32.0.tar.bz2) = 38f6c48c35179d667b637e8d65bd35045d8b54b4f8079220633d9a59cafa4b26
+SIZE (gnome2/gnome-devel-docs-2.32.0.tar.bz2) = 4841916
diff --git a/misc/gnome-devel-docs/pkg-plist b/misc/gnome-devel-docs/pkg-plist
index f437c0b701c4..fe661854fc1a 100644
--- a/misc/gnome-devel-docs/pkg-plist
+++ b/misc/gnome-devel-docs/pkg-plist
@@ -23,68 +23,110 @@ 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/de/accessibility-devel-guide.xml
+share/gnome/help/accessibility-devel-guide/de/figures/GNOME_desktop_Accessibility.png
share/gnome/help/accessibility-devel-guide/de/figures/at-arch.png
share/gnome/help/accessibility-devel-guide/de/figures/badfocus1.png
share/gnome/help/accessibility-devel-guide/de/figures/badfocus2.png
share/gnome/help/accessibility-devel-guide/de/figures/badfocus3.png
share/gnome/help/accessibility-devel-guide/de/figures/colour_and_arrows.png
share/gnome/help/accessibility-devel-guide/de/figures/colour_only.png
-share/gnome/help/accessibility-devel-guide/de/figures/depend1a.png
share/gnome/help/accessibility-devel-guide/de/figures/depend1.png
-share/gnome/help/accessibility-devel-guide/de/figures/depend2a.png
+share/gnome/help/accessibility-devel-guide/de/figures/depend1a.png
share/gnome/help/accessibility-devel-guide/de/figures/depend2.png
+share/gnome/help/accessibility-devel-guide/de/figures/depend2a.png
share/gnome/help/accessibility-devel-guide/de/figures/depend3.png
-share/gnome/help/accessibility-devel-guide/de/figures/GNOME_desktop_Accessibility.png
+share/gnome/help/accessibility-devel-guide/de/figures/goodfocus.png
share/gnome/help/accessibility-devel-guide/de/figures/goodfocus2.png
share/gnome/help/accessibility-devel-guide/de/figures/goodfocus3.png
-share/gnome/help/accessibility-devel-guide/de/figures/goodfocus.png
share/gnome/help/accessibility-devel-guide/de/figures/label_above.png
share/gnome/help/accessibility-devel-guide/de/figures/label_below.png
share/gnome/help/accessibility-devel-guide/de/figures/label_left.png
share/gnome/help/accessibility-devel-guide/de/figures/label_right.png
share/gnome/help/accessibility-devel-guide/de/figures/nodrop.png
share/gnome/help/accessibility-devel-guide/el/accessibility-devel-guide.xml
+share/gnome/help/accessibility-devel-guide/el/figures/GNOME_desktop_Accessibility.png
share/gnome/help/accessibility-devel-guide/el/figures/at-arch.png
share/gnome/help/accessibility-devel-guide/el/figures/badfocus1.png
share/gnome/help/accessibility-devel-guide/el/figures/badfocus2.png
share/gnome/help/accessibility-devel-guide/el/figures/badfocus3.png
share/gnome/help/accessibility-devel-guide/el/figures/colour_and_arrows.png
share/gnome/help/accessibility-devel-guide/el/figures/colour_only.png
-share/gnome/help/accessibility-devel-guide/el/figures/depend1a.png
share/gnome/help/accessibility-devel-guide/el/figures/depend1.png
-share/gnome/help/accessibility-devel-guide/el/figures/depend2a.png
+share/gnome/help/accessibility-devel-guide/el/figures/depend1a.png
share/gnome/help/accessibility-devel-guide/el/figures/depend2.png
+share/gnome/help/accessibility-devel-guide/el/figures/depend2a.png
share/gnome/help/accessibility-devel-guide/el/figures/depend3.png
-share/gnome/help/accessibility-devel-guide/el/figures/GNOME_desktop_Accessibility.png
+share/gnome/help/accessibility-devel-guide/el/figures/goodfocus.png
share/gnome/help/accessibility-devel-guide/el/figures/goodfocus2.png
share/gnome/help/accessibility-devel-guide/el/figures/goodfocus3.png
-share/gnome/help/accessibility-devel-guide/el/figures/goodfocus.png
share/gnome/help/accessibility-devel-guide/el/figures/label_above.png
share/gnome/help/accessibility-devel-guide/el/figures/label_below.png
share/gnome/help/accessibility-devel-guide/el/figures/label_left.png
share/gnome/help/accessibility-devel-guide/el/figures/label_right.png
share/gnome/help/accessibility-devel-guide/el/figures/nodrop.png
share/gnome/help/accessibility-devel-guide/es/accessibility-devel-guide.xml
+share/gnome/help/accessibility-devel-guide/es/figures/GNOME_desktop_Accessibility.png
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/depend1a.png
share/gnome/help/accessibility-devel-guide/es/figures/depend2.png
+share/gnome/help/accessibility-devel-guide/es/figures/depend2a.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/goodfocus.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/accessibility-devel-guide/fr/accessibility-devel-guide.xml
+share/gnome/help/accessibility-devel-guide/fr/figures/GNOME_desktop_Accessibility.png
+share/gnome/help/accessibility-devel-guide/fr/figures/at-arch.png
+share/gnome/help/accessibility-devel-guide/fr/figures/badfocus1.png
+share/gnome/help/accessibility-devel-guide/fr/figures/badfocus2.png
+share/gnome/help/accessibility-devel-guide/fr/figures/badfocus3.png
+share/gnome/help/accessibility-devel-guide/fr/figures/colour_and_arrows.png
+share/gnome/help/accessibility-devel-guide/fr/figures/colour_only.png
+share/gnome/help/accessibility-devel-guide/fr/figures/depend1.png
+share/gnome/help/accessibility-devel-guide/fr/figures/depend1a.png
+share/gnome/help/accessibility-devel-guide/fr/figures/depend2.png
+share/gnome/help/accessibility-devel-guide/fr/figures/depend2a.png
+share/gnome/help/accessibility-devel-guide/fr/figures/depend3.png
+share/gnome/help/accessibility-devel-guide/fr/figures/goodfocus.png
+share/gnome/help/accessibility-devel-guide/fr/figures/goodfocus2.png
+share/gnome/help/accessibility-devel-guide/fr/figures/goodfocus3.png
+share/gnome/help/accessibility-devel-guide/fr/figures/label_above.png
+share/gnome/help/accessibility-devel-guide/fr/figures/label_below.png
+share/gnome/help/accessibility-devel-guide/fr/figures/label_left.png
+share/gnome/help/accessibility-devel-guide/fr/figures/label_right.png
+share/gnome/help/accessibility-devel-guide/fr/figures/nodrop.png
+share/gnome/help/accessibility-devel-guide/ja/accessibility-devel-guide.xml
+share/gnome/help/accessibility-devel-guide/ja/figures/GNOME_desktop_Accessibility.png
+share/gnome/help/accessibility-devel-guide/ja/figures/at-arch.png
+share/gnome/help/accessibility-devel-guide/ja/figures/badfocus1.png
+share/gnome/help/accessibility-devel-guide/ja/figures/badfocus2.png
+share/gnome/help/accessibility-devel-guide/ja/figures/badfocus3.png
+share/gnome/help/accessibility-devel-guide/ja/figures/colour_and_arrows.png
+share/gnome/help/accessibility-devel-guide/ja/figures/colour_only.png
+share/gnome/help/accessibility-devel-guide/ja/figures/depend1.png
+share/gnome/help/accessibility-devel-guide/ja/figures/depend1a.png
+share/gnome/help/accessibility-devel-guide/ja/figures/depend2.png
+share/gnome/help/accessibility-devel-guide/ja/figures/depend2a.png
+share/gnome/help/accessibility-devel-guide/ja/figures/depend3.png
+share/gnome/help/accessibility-devel-guide/ja/figures/goodfocus.png
+share/gnome/help/accessibility-devel-guide/ja/figures/goodfocus2.png
+share/gnome/help/accessibility-devel-guide/ja/figures/goodfocus3.png
+share/gnome/help/accessibility-devel-guide/ja/figures/label_above.png
+share/gnome/help/accessibility-devel-guide/ja/figures/label_below.png
+share/gnome/help/accessibility-devel-guide/ja/figures/label_left.png
+share/gnome/help/accessibility-devel-guide/ja/figures/label_right.png
+share/gnome/help/accessibility-devel-guide/ja/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
@@ -413,10 +455,10 @@ 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-gedit.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
@@ -468,11 +510,10 @@ 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/toolbars-mail.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
@@ -483,7 +524,6 @@ 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
@@ -529,9 +569,10 @@ 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-dialog-tabbed.png
share/gnome/help/hig-book/de/images/windows-explicit-apply.png
+share/gnome/help/hig-book/de/images/windows-mdi.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
@@ -540,6 +581,7 @@ 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-sdi.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
@@ -593,10 +635,10 @@ 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-gedit.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
@@ -648,11 +690,10 @@ 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/toolbars-mail.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
@@ -663,7 +704,6 @@ 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
@@ -709,9 +749,10 @@ 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-dialog-tabbed.png
share/gnome/help/hig-book/el/images/windows-explicit-apply.png
+share/gnome/help/hig-book/el/images/windows-mdi.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
@@ -720,6 +761,7 @@ 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-sdi.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
@@ -773,10 +815,10 @@ 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-gedit.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
@@ -828,11 +870,10 @@ 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/toolbars-mail.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
@@ -843,7 +884,6 @@ 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
@@ -889,9 +929,10 @@ 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-dialog-tabbed.png
share/gnome/help/hig-book/es/images/windows-explicit-apply.png
+share/gnome/help/hig-book/es/images/windows-mdi.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
@@ -900,9 +941,190 @@ 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-sdi.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/hig-book/fr/hig-book.xml
+share/gnome/help/hig-book/fr/images/controls-buttons.png
+share/gnome/help/hig-book/fr/images/controls-check-box-ambiguous.png
+share/gnome/help/hig-book/fr/images/controls-check-boxes-mixed.png
+share/gnome/help/hig-book/fr/images/controls-check-boxes.png
+share/gnome/help/hig-book/fr/images/controls-combo.png
+share/gnome/help/hig-book/fr/images/controls-frames.png
+share/gnome/help/hig-book/fr/images/controls-list-checkbox.png
+share/gnome/help/hig-book/fr/images/controls-list.png
+share/gnome/help/hig-book/fr/images/controls-locked.png
+share/gnome/help/hig-book/fr/images/controls-notebook-list.png
+share/gnome/help/hig-book/fr/images/controls-notebook-tabs.png
+share/gnome/help/hig-book/fr/images/controls-notebook.png
+share/gnome/help/hig-book/fr/images/controls-old-frames.png
+share/gnome/help/hig-book/fr/images/controls-option-menu.png
+share/gnome/help/hig-book/fr/images/controls-progress-indeterminate.png
+share/gnome/help/hig-book/fr/images/controls-progress-time.png
+share/gnome/help/hig-book/fr/images/controls-progress-typical.png
+share/gnome/help/hig-book/fr/images/controls-radio-button-mixed.png
+share/gnome/help/hig-book/fr/images/controls-radio-buttons.png
+share/gnome/help/hig-book/fr/images/controls-sensitivity.png
+share/gnome/help/hig-book/fr/images/controls-slider-spinbox.png
+share/gnome/help/hig-book/fr/images/controls-slider.png
+share/gnome/help/hig-book/fr/images/controls-spin-box.png
+share/gnome/help/hig-book/fr/images/controls-status-bar-interactive.png
+share/gnome/help/hig-book/fr/images/controls-status-bar.png
+share/gnome/help/hig-book/fr/images/controls-text-choose.png
+share/gnome/help/hig-book/fr/images/controls-text-prompt.png
+share/gnome/help/hig-book/fr/images/controls-text.png
+share/gnome/help/hig-book/fr/images/controls-toggle-button-mixed.png
+share/gnome/help/hig-book/fr/images/controls-toggle-buttons.png
+share/gnome/help/hig-book/fr/images/controls-tree-checkbox.png
+share/gnome/help/hig-book/fr/images/controls-tree.png
+share/gnome/help/hig-book/fr/images/desktop-applications-menu.png
+share/gnome/help/hig-book/fr/images/feedback-checklist-running.png
+share/gnome/help/hig-book/fr/images/feedback-pointers-busy.png
+share/gnome/help/hig-book/fr/images/icon-design-process-1.png
+share/gnome/help/hig-book/fr/images/icon-design-process-10.png
+share/gnome/help/hig-book/fr/images/icon-design-process-11.png
+share/gnome/help/hig-book/fr/images/icon-design-process-12.png
+share/gnome/help/hig-book/fr/images/icon-design-process-2.png
+share/gnome/help/hig-book/fr/images/icon-design-process-3.png
+share/gnome/help/hig-book/fr/images/icon-design-process-4.png
+share/gnome/help/hig-book/fr/images/icon-design-process-5.png
+share/gnome/help/hig-book/fr/images/icon-design-process-6.png
+share/gnome/help/hig-book/fr/images/icon-design-process-7.png
+share/gnome/help/hig-book/fr/images/icon-design-process-8.png
+share/gnome/help/hig-book/fr/images/icon-design-process-9.png
+share/gnome/help/hig-book/fr/images/icons-applications.png
+share/gnome/help/hig-book/fr/images/icons-evolution.png
+share/gnome/help/hig-book/fr/images/icons-floppy-dissected.png
+share/gnome/help/hig-book/fr/images/icons-font-selection-good.png
+share/gnome/help/hig-book/fr/images/icons-font-selection-poor.png
+share/gnome/help/hig-book/fr/images/icons-gedit.png
+share/gnome/help/hig-book/fr/images/icons-gnumeric.png
+share/gnome/help/hig-book/fr/images/icons-hc-book-blur.png
+share/gnome/help/hig-book/fr/images/icons-hc-book.png
+share/gnome/help/hig-book/fr/images/icons-hc-cdrom-blur.png
+share/gnome/help/hig-book/fr/images/icons-hc-cdrom.png
+share/gnome/help/hig-book/fr/images/icons-hc-copy-blur.png
+share/gnome/help/hig-book/fr/images/icons-hc-copy.png
+share/gnome/help/hig-book/fr/images/icons-hc-metaphors.png
+share/gnome/help/hig-book/fr/images/icons-lowcontrast-levels.png
+share/gnome/help/hig-book/fr/images/icons-menu.png
+share/gnome/help/hig-book/fr/images/icons-nautilus.png
+share/gnome/help/hig-book/fr/images/icons-objects.png
+share/gnome/help/hig-book/fr/images/icons-perspective-shelf.png
+share/gnome/help/hig-book/fr/images/icons-perspective-table.png
+share/gnome/help/hig-book/fr/images/icons-shut-down.png
+share/gnome/help/hig-book/fr/images/icons-silhouette.png
+share/gnome/help/hig-book/fr/images/icons-sodipodi.png
+share/gnome/help/hig-book/fr/images/icons-style-aqua.png
+share/gnome/help/hig-book/fr/images/icons-style-gnome.png
+share/gnome/help/hig-book/fr/images/icons-style-java.png
+share/gnome/help/hig-book/fr/images/icons-system-log.png
+share/gnome/help/hig-book/fr/images/icons-toolbar.png
+share/gnome/help/hig-book/fr/images/icons-underline-text.png
+share/gnome/help/hig-book/fr/images/icons-word-processor.png
+share/gnome/help/hig-book/fr/images/input-accesskeys-shortcuts.png
+share/gnome/help/hig-book/fr/images/input-drag-cursor-copy.png
+share/gnome/help/hig-book/fr/images/input-drag-cursor-link.png
+share/gnome/help/hig-book/fr/images/input-drag-cursor-move.png
+share/gnome/help/hig-book/fr/images/input-drag-cursor-nodrop.png
+share/gnome/help/hig-book/fr/images/input-drag-cursor-query.png
+share/gnome/help/hig-book/fr/images/input-drag-cursor.png
+share/gnome/help/hig-book/fr/images/input-drag-select-files.png
+share/gnome/help/hig-book/fr/images/input-drag-select-graphics.png
+share/gnome/help/hig-book/fr/images/input-pointing-devices.png
+share/gnome/help/hig-book/fr/images/menus-application.png
+share/gnome/help/hig-book/fr/images/menus-bookmarks.png
+share/gnome/help/hig-book/fr/images/menus-checkbox-group.png
+share/gnome/help/hig-book/fr/images/menus-command-group.png
+share/gnome/help/hig-book/fr/images/menus-dropdown.png
+share/gnome/help/hig-book/fr/images/menus-edit.png
+share/gnome/help/hig-book/fr/images/menus-file.png
+share/gnome/help/hig-book/fr/images/menus-format.png
+share/gnome/help/hig-book/fr/images/menus-go-browser.png
+share/gnome/help/hig-book/fr/images/menus-go-document.png
+share/gnome/help/hig-book/fr/images/menus-help.png
+share/gnome/help/hig-book/fr/images/menus-insert.png
+share/gnome/help/hig-book/fr/images/menus-popup.png
+share/gnome/help/hig-book/fr/images/menus-radiobutton-group.png
+share/gnome/help/hig-book/fr/images/menus-submenu.png
+share/gnome/help/hig-book/fr/images/menus-view.png
+share/gnome/help/hig-book/fr/images/menus-windows.png
+share/gnome/help/hig-book/fr/images/toolbars-configure-menu.png
+share/gnome/help/hig-book/fr/images/toolbars-labels-below.png
+share/gnome/help/hig-book/fr/images/toolbars-labels-beside.png
+share/gnome/help/hig-book/fr/images/toolbars-mail.png
+share/gnome/help/hig-book/fr/images/visdes-button-label.png
+share/gnome/help/hig-book/fr/images/visdes-colorblind-deutan.png
+share/gnome/help/hig-book/fr/images/visdes-colorblind-normal.png
+share/gnome/help/hig-book/fr/images/visdes-colorblind-tritan.png
+share/gnome/help/hig-book/fr/images/visdes-large-icon-label.png
+share/gnome/help/hig-book/fr/images/visdes-layout-annotated.png
+share/gnome/help/hig-book/fr/images/visdes-layout-good.png
+share/gnome/help/hig-book/fr/images/visdes-layout-poor.png
+share/gnome/help/hig-book/fr/images/visdes-list-label.png
+share/gnome/help/hig-book/fr/images/visdes-other-labels.png
+share/gnome/help/hig-book/fr/images/visdes-palette-1.png
+share/gnome/help/hig-book/fr/images/visdes-palette-10.png
+share/gnome/help/hig-book/fr/images/visdes-palette-11.png
+share/gnome/help/hig-book/fr/images/visdes-palette-12.png
+share/gnome/help/hig-book/fr/images/visdes-palette-13.png
+share/gnome/help/hig-book/fr/images/visdes-palette-14.png
+share/gnome/help/hig-book/fr/images/visdes-palette-15.png
+share/gnome/help/hig-book/fr/images/visdes-palette-16.png
+share/gnome/help/hig-book/fr/images/visdes-palette-17.png
+share/gnome/help/hig-book/fr/images/visdes-palette-18.png
+share/gnome/help/hig-book/fr/images/visdes-palette-19.png
+share/gnome/help/hig-book/fr/images/visdes-palette-2.png
+share/gnome/help/hig-book/fr/images/visdes-palette-20.png
+share/gnome/help/hig-book/fr/images/visdes-palette-21.png
+share/gnome/help/hig-book/fr/images/visdes-palette-22.png
+share/gnome/help/hig-book/fr/images/visdes-palette-23.png
+share/gnome/help/hig-book/fr/images/visdes-palette-24.png
+share/gnome/help/hig-book/fr/images/visdes-palette-25.png
+share/gnome/help/hig-book/fr/images/visdes-palette-26.png
+share/gnome/help/hig-book/fr/images/visdes-palette-27.png
+share/gnome/help/hig-book/fr/images/visdes-palette-28.png
+share/gnome/help/hig-book/fr/images/visdes-palette-29.png
+share/gnome/help/hig-book/fr/images/visdes-palette-3.png
+share/gnome/help/hig-book/fr/images/visdes-palette-30.png
+share/gnome/help/hig-book/fr/images/visdes-palette-31.png
+share/gnome/help/hig-book/fr/images/visdes-palette-32.png
+share/gnome/help/hig-book/fr/images/visdes-palette-4.png
+share/gnome/help/hig-book/fr/images/visdes-palette-5.png
+share/gnome/help/hig-book/fr/images/visdes-palette-6.png
+share/gnome/help/hig-book/fr/images/visdes-palette-7.png
+share/gnome/help/hig-book/fr/images/visdes-palette-8.png
+share/gnome/help/hig-book/fr/images/visdes-palette-9.png
+share/gnome/help/hig-book/fr/images/visdes-palette.png
+share/gnome/help/hig-book/fr/images/visdes-radiobutton-label.png
+share/gnome/help/hig-book/fr/images/visdes-small-icon-label.png
+share/gnome/help/hig-book/fr/images/visdes-textbox-label.png
+share/gnome/help/hig-book/fr/images/windows-alert-authentication.png
+share/gnome/help/hig-book/fr/images/windows-alert-buttons.png
+share/gnome/help/hig-book/fr/images/windows-alert-confirmation.png
+share/gnome/help/hig-book/fr/images/windows-alert-error.png
+share/gnome/help/hig-book/fr/images/windows-alert-information.png
+share/gnome/help/hig-book/fr/images/windows-alert-save.png
+share/gnome/help/hig-book/fr/images/windows-alert-spacing.png
+share/gnome/help/hig-book/fr/images/windows-alert-text.png
+share/gnome/help/hig-book/fr/images/windows-assistant-first-page.png
+share/gnome/help/hig-book/fr/images/windows-assistant-middle-page.png
+share/gnome/help/hig-book/fr/images/windows-dialog-tabbed.png
+share/gnome/help/hig-book/fr/images/windows-explicit-apply.png
+share/gnome/help/hig-book/fr/images/windows-mdi.png
+share/gnome/help/hig-book/fr/images/windows-preferences.png
+share/gnome/help/hig-book/fr/images/windows-primary.png
+share/gnome/help/hig-book/fr/images/windows-progress-checklist-done.png
+share/gnome/help/hig-book/fr/images/windows-progress-checklist-start.png
+share/gnome/help/hig-book/fr/images/windows-progress-checklist.png
+share/gnome/help/hig-book/fr/images/windows-progress-copy-file.png
+share/gnome/help/hig-book/fr/images/windows-progress.png
+share/gnome/help/hig-book/fr/images/windows-properties.png
+share/gnome/help/hig-book/fr/images/windows-sdi.png
+share/gnome/help/hig-book/fr/images/windows-titlebar.png
+share/gnome/help/hig-book/fr/images/windows-toolbox-large.png
+share/gnome/help/hig-book/fr/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
@@ -926,24 +1148,36 @@ share/gnome/help/optimization-guide/cs/optimization-guide.xml
share/gnome/help/optimization-guide/cs/optimization-harmful.xml
share/gnome/help/optimization-guide/cs/optimization-intro.xml
share/gnome/help/optimization-guide/cs/optimization-massif.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/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/de/optimization-massif.xml
+share/gnome/help/optimization-guide/el/figures/massif-after.png
+share/gnome/help/optimization-guide/el/figures/massif-before.png
share/gnome/help/optimization-guide/el/optimization-guide.xml
share/gnome/help/optimization-guide/el/optimization-harmful.xml
-share/gnome/help/optimization-guide/el/optimization-massif.xml
share/gnome/help/optimization-guide/el/optimization-intro.xml
-share/gnome/help/optimization-guide/el/figures/massif-after.png
-share/gnome/help/optimization-guide/el/figures/massif-before.png
+share/gnome/help/optimization-guide/el/optimization-massif.xml
+share/gnome/help/optimization-guide/es/figures/massif-after.png
+share/gnome/help/optimization-guide/es/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/optimization-guide/es/optimization-massif.xml
+share/gnome/help/optimization-guide/fr/figures/massif-after.png
+share/gnome/help/optimization-guide/fr/figures/massif-before.png
+share/gnome/help/optimization-guide/fr/optimization-guide.xml
+share/gnome/help/optimization-guide/fr/optimization-harmful.xml
+share/gnome/help/optimization-guide/fr/optimization-intro.xml
+share/gnome/help/optimization-guide/fr/optimization-massif.xml
+share/gnome/help/optimization-guide/zh_CN/figures/massif-after.png
+share/gnome/help/optimization-guide/zh_CN/figures/massif-before.png
+share/gnome/help/optimization-guide/zh_CN/optimization-guide.xml
+share/gnome/help/optimization-guide/zh_CN/optimization-harmful.xml
+share/gnome/help/optimization-guide/zh_CN/optimization-intro.xml
+share/gnome/help/optimization-guide/zh_CN/optimization-massif.xml
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
@@ -1028,6 +1262,18 @@ share/gnome/help/platform-overview/it/ipc-network.xml
share/gnome/help/platform-overview/it/legal-fdl.xml
share/gnome/help/platform-overview/it/platform-overview.xml
share/gnome/help/platform-overview/it/platform.xml
+share/gnome/help/platform-overview/ja/apx-modules.xml
+share/gnome/help/platform-overview/ja/bindings.xml
+share/gnome/help/platform-overview/ja/core-tech.xml
+share/gnome/help/platform-overview/ja/desktop-tech.xml
+share/gnome/help/platform-overview/ja/figures/graphics.png
+share/gnome/help/platform-overview/ja/figures/i18n.png
+share/gnome/help/platform-overview/ja/figures/pango.png
+share/gnome/help/platform-overview/ja/intro.xml
+share/gnome/help/platform-overview/ja/ipc-network.xml
+share/gnome/help/platform-overview/ja/legal-fdl.xml
+share/gnome/help/platform-overview/ja/platform-overview.xml
+share/gnome/help/platform-overview/ja/platform.xml
share/gnome/help/platform-overview/oc/apx-modules.xml
share/gnome/help/platform-overview/oc/bindings.xml
share/gnome/help/platform-overview/oc/core-tech.xml
@@ -1068,12 +1314,15 @@ share/omf/accessibility-devel-guide/accessibility-devel-guide-C.omf
share/omf/accessibility-devel-guide/accessibility-devel-guide-de.omf
share/omf/accessibility-devel-guide/accessibility-devel-guide-el.omf
share/omf/accessibility-devel-guide/accessibility-devel-guide-es.omf
+share/omf/accessibility-devel-guide/accessibility-devel-guide-fr.omf
+share/omf/accessibility-devel-guide/accessibility-devel-guide-ja.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/hig-book/hig-book-fr.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
@@ -1090,6 +1339,8 @@ share/omf/optimization-guide/optimization-guide-cs.omf
share/omf/optimization-guide/optimization-guide-de.omf
share/omf/optimization-guide/optimization-guide-el.omf
share/omf/optimization-guide/optimization-guide-es.omf
+share/omf/optimization-guide/optimization-guide-fr.omf
+share/omf/optimization-guide/optimization-guide-zh_CN.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
@@ -1097,6 +1348,7 @@ share/omf/platform-overview/platform-overview-el.omf
share/omf/platform-overview/platform-overview-es.omf
share/omf/platform-overview/platform-overview-fr.omf
share/omf/platform-overview/platform-overview-it.omf
+share/omf/platform-overview/platform-overview-ja.omf
share/omf/platform-overview/platform-overview-oc.omf
share/omf/platform-overview/platform-overview-ru.omf
share/omf/platform-overview/platform-overview-uk.omf
@@ -1113,6 +1365,8 @@ share/omf/platform-overview/platform-overview-uk.omf
@dirrm share/gnome/help/platform-overview/ru
@dirrm share/gnome/help/platform-overview/oc/figures
@dirrm share/gnome/help/platform-overview/oc
+@dirrm share/gnome/help/platform-overview/ja/figures
+@dirrm share/gnome/help/platform-overview/ja
@dirrm share/gnome/help/platform-overview/it/figures
@dirrm share/gnome/help/platform-overview/it
@dirrm share/gnome/help/platform-overview/fr/figures
@@ -1128,6 +1382,10 @@ share/omf/platform-overview/platform-overview-uk.omf
@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/zh_CN/figures
+@dirrm share/gnome/help/optimization-guide/zh_CN
+@dirrm share/gnome/help/optimization-guide/fr/figures
+@dirrm share/gnome/help/optimization-guide/fr
@dirrm share/gnome/help/optimization-guide/es/figures
@dirrm share/gnome/help/optimization-guide/es
@dirrm share/gnome/help/optimization-guide/el/figures
@@ -1151,6 +1409,8 @@ share/omf/platform-overview/platform-overview-uk.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/fr/images
+@dirrm share/gnome/help/hig-book/fr
@dirrm share/gnome/help/hig-book/es/images
@dirrm share/gnome/help/hig-book/es
@dirrm share/gnome/help/hig-book/el/images
@@ -1165,6 +1425,10 @@ share/omf/platform-overview/platform-overview-uk.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/ja/figures
+@dirrm share/gnome/help/accessibility-devel-guide/ja
+@dirrm share/gnome/help/accessibility-devel-guide/fr/figures
+@dirrm share/gnome/help/accessibility-devel-guide/fr
@dirrm share/gnome/help/accessibility-devel-guide/es/figures
@dirrm share/gnome/help/accessibility-devel-guide/es
@dirrm share/gnome/help/accessibility-devel-guide/el/figures
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index ddb40825cd78..f300e4ff1330 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.146 2010/04/29 21:22:49 kwm Exp $
+# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.149 2010/08/30 13:45:30 avl Exp $
#
PORTNAME= gnome-icon-theme
-PORTVERSION= 2.30.3
+PORTVERSION= 2.31.0
+PORTREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo
index 1a2c2384e78d..7f54624012f3 100644
--- a/misc/gnome-icon-theme/distinfo
+++ b/misc/gnome-icon-theme/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-icon-theme-2.30.3.tar.bz2) = 77d272e4220c75588418d9bec31eae24
-SHA256 (gnome2/gnome-icon-theme-2.30.3.tar.bz2) = 417e2f9d77843a6dbdcb1f6fa70dd55992aae5621c6ad8a64e5baa3cb893dac7
-SIZE (gnome2/gnome-icon-theme-2.30.3.tar.bz2) = 15984407
+MD5 (gnome2/gnome-icon-theme-2.31.0.tar.bz2) = 8e727703343d4c18c73c79dd2009f8ed
+SHA256 (gnome2/gnome-icon-theme-2.31.0.tar.bz2) = ea7e05b77ead159379392b3b275ca0c9cbacd7d936014e447cc7c5e27a767982
+SIZE (gnome2/gnome-icon-theme-2.31.0.tar.bz2) = 15762905
diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist
index 0952957d3951..0ea6554c4aea 100644
--- a/misc/gnome-icon-theme/pkg-plist
+++ b/misc/gnome-icon-theme/pkg-plist
@@ -603,6 +603,7 @@ share/icons/gnome/16x16/emblems/emblem-photos.png
share/icons/gnome/16x16/emblems/emblem-readonly.png
share/icons/gnome/16x16/emblems/emblem-shared.png
share/icons/gnome/16x16/emblems/emblem-symbolic-link.png
+share/icons/gnome/16x16/emblems/emblem-synchronizing.png
share/icons/gnome/16x16/emblems/emblem-system.png
share/icons/gnome/16x16/emblems/emblem-unreadable.png
share/icons/gnome/16x16/emblems/emblem-urgent.png
@@ -873,8 +874,8 @@ share/icons/gnome/16x16/status/audio-volume-muted.png
share/icons/gnome/16x16/status/avatar-default.png
share/icons/gnome/16x16/status/battery-caution-charging.png
share/icons/gnome/16x16/status/battery-caution.png
-share/icons/gnome/16x16/status/battery-charging.png
share/icons/gnome/16x16/status/battery-empty.png
+share/icons/gnome/16x16/status/battery-full-charged.png
share/icons/gnome/16x16/status/battery-full-charging.png
share/icons/gnome/16x16/status/battery-full.png
share/icons/gnome/16x16/status/battery-good-charging.png
@@ -1609,6 +1610,7 @@ share/icons/gnome/22x22/emblems/emblem-photos.png
share/icons/gnome/22x22/emblems/emblem-readonly.png
share/icons/gnome/22x22/emblems/emblem-shared.png
share/icons/gnome/22x22/emblems/emblem-symbolic-link.png
+share/icons/gnome/22x22/emblems/emblem-synchronizing.png
share/icons/gnome/22x22/emblems/emblem-system.png
share/icons/gnome/22x22/emblems/emblem-unreadable.png
share/icons/gnome/22x22/emblems/emblem-urgent.png
@@ -1879,8 +1881,8 @@ share/icons/gnome/22x22/status/audio-volume-muted.png
share/icons/gnome/22x22/status/avatar-default.png
share/icons/gnome/22x22/status/battery-caution-charging.png
share/icons/gnome/22x22/status/battery-caution.png
-share/icons/gnome/22x22/status/battery-charging.png
share/icons/gnome/22x22/status/battery-empty.png
+share/icons/gnome/22x22/status/battery-full-charged.png
share/icons/gnome/22x22/status/battery-full-charging.png
share/icons/gnome/22x22/status/battery-full.png
share/icons/gnome/22x22/status/battery-good-charging.png
@@ -2883,8 +2885,8 @@ share/icons/gnome/24x24/status/audio-volume-muted.png
share/icons/gnome/24x24/status/avatar-default.png
share/icons/gnome/24x24/status/battery-caution-charging.png
share/icons/gnome/24x24/status/battery-caution.png
-share/icons/gnome/24x24/status/battery-charging.png
share/icons/gnome/24x24/status/battery-empty.png
+share/icons/gnome/24x24/status/battery-full-charged.png
share/icons/gnome/24x24/status/battery-full-charging.png
share/icons/gnome/24x24/status/battery-full.png
share/icons/gnome/24x24/status/battery-good-charging.png
@@ -3018,6 +3020,7 @@ share/icons/gnome/24x24/status/xfce-trash_full.png
share/icons/gnome/256x256/actions/address-book-new.png
share/icons/gnome/256x256/actions/appointment-new.png
share/icons/gnome/256x256/actions/appointment.png
+share/icons/gnome/256x256/actions/back.png
share/icons/gnome/256x256/actions/document-new.png
share/icons/gnome/256x256/actions/document-open-recent.png
share/icons/gnome/256x256/actions/document-open.png
@@ -3026,6 +3029,8 @@ share/icons/gnome/256x256/actions/document-print-preview.png
share/icons/gnome/256x256/actions/document-print.png
share/icons/gnome/256x256/actions/document-properties.png
share/icons/gnome/256x256/actions/document-revert.png
+share/icons/gnome/256x256/actions/document-save-as.png
+share/icons/gnome/256x256/actions/document-save.png
share/icons/gnome/256x256/actions/edit-delete.png
share/icons/gnome/256x256/actions/edit-find-replace.png
share/icons/gnome/256x256/actions/edit-find.png
@@ -3037,32 +3042,67 @@ share/icons/gnome/256x256/actions/filenew.png
share/icons/gnome/256x256/actions/fileopen.png
share/icons/gnome/256x256/actions/fileprint.png
share/icons/gnome/256x256/actions/filequickprint.png
+share/icons/gnome/256x256/actions/filesave.png
+share/icons/gnome/256x256/actions/filesaveas.png
share/icons/gnome/256x256/actions/find.png
+share/icons/gnome/256x256/actions/finish.png
share/icons/gnome/256x256/actions/folder-new.png
share/icons/gnome/256x256/actions/folder_new.png
+share/icons/gnome/256x256/actions/forward.png
share/icons/gnome/256x256/actions/gnome-lockscreen.png
share/icons/gnome/256x256/actions/gnome-logout.png
share/icons/gnome/256x256/actions/gnome-searchtool.png
share/icons/gnome/256x256/actions/gnome-stock-mail-new.png
+share/icons/gnome/256x256/actions/go-first.png
+share/icons/gnome/256x256/actions/go-jump.png
+share/icons/gnome/256x256/actions/go-last.png
+share/icons/gnome/256x256/actions/go-next.png
+share/icons/gnome/256x256/actions/go-previous.png
+share/icons/gnome/256x256/actions/gtk-cancel.png
share/icons/gnome/256x256/actions/gtk-delete.png
share/icons/gnome/256x256/actions/gtk-find-and-replace.png
share/icons/gnome/256x256/actions/gtk-find.png
+share/icons/gnome/256x256/actions/gtk-go-back-ltr.png
+share/icons/gnome/256x256/actions/gtk-go-back-rtl.png
+share/icons/gnome/256x256/actions/gtk-go-forward-ltr.png
+share/icons/gnome/256x256/actions/gtk-go-forward-rtl.png
+share/icons/gnome/256x256/actions/gtk-goto-first-ltr.png
+share/icons/gnome/256x256/actions/gtk-goto-first-rtl.png
+share/icons/gnome/256x256/actions/gtk-goto-last-ltr.png
+share/icons/gnome/256x256/actions/gtk-goto-last-rtl.png
+share/icons/gnome/256x256/actions/gtk-jump-to-ltr.png
+share/icons/gnome/256x256/actions/gtk-jump-to-rtl.png
share/icons/gnome/256x256/actions/gtk-new.png
share/icons/gnome/256x256/actions/gtk-open.png
share/icons/gnome/256x256/actions/gtk-print-preview.png
share/icons/gnome/256x256/actions/gtk-print.png
share/icons/gnome/256x256/actions/gtk-properties.png
+share/icons/gnome/256x256/actions/gtk-refresh.png
share/icons/gnome/256x256/actions/gtk-revert-to-saved-ltr.png
share/icons/gnome/256x256/actions/gtk-revert-to-saved-rtl.png
+share/icons/gnome/256x256/actions/gtk-save-as.png
+share/icons/gnome/256x256/actions/gtk-save.png
share/icons/gnome/256x256/actions/gtk-select-all.png
+share/icons/gnome/256x256/actions/gtk-stop.png
share/icons/gnome/256x256/actions/kfind.png
share/icons/gnome/256x256/actions/lock.png
share/icons/gnome/256x256/actions/mail-message-new.png
share/icons/gnome/256x256/actions/mail_new.png
+share/icons/gnome/256x256/actions/next.png
+share/icons/gnome/256x256/actions/previous.png
+share/icons/gnome/256x256/actions/process-stop.png
+share/icons/gnome/256x256/actions/reload.png
+share/icons/gnome/256x256/actions/reload3.png
+share/icons/gnome/256x256/actions/reload_all_tabs.png
+share/icons/gnome/256x256/actions/reload_page.png
share/icons/gnome/256x256/actions/revert.png
share/icons/gnome/256x256/actions/search.png
+share/icons/gnome/256x256/actions/start.png
share/icons/gnome/256x256/actions/stock_delete.png
share/icons/gnome/256x256/actions/stock_file-properites.png
+share/icons/gnome/256x256/actions/stock_first.png
+share/icons/gnome/256x256/actions/stock_last.png
+share/icons/gnome/256x256/actions/stock_left.png
share/icons/gnome/256x256/actions/stock_mail-compose.png
share/icons/gnome/256x256/actions/stock_new-address-book.png
share/icons/gnome/256x256/actions/stock_new-appointment.png
@@ -3072,16 +3112,24 @@ share/icons/gnome/256x256/actions/stock_print-preview.png
share/icons/gnome/256x256/actions/stock_print-setup.png
share/icons/gnome/256x256/actions/stock_print.png
share/icons/gnome/256x256/actions/stock_properties.png
+share/icons/gnome/256x256/actions/stock_refresh.png
+share/icons/gnome/256x256/actions/stock_right.png
+share/icons/gnome/256x256/actions/stock_save-as.png
+share/icons/gnome/256x256/actions/stock_save.png
share/icons/gnome/256x256/actions/stock_search-and-replace.png
share/icons/gnome/256x256/actions/stock_search.png
share/icons/gnome/256x256/actions/stock_select-all.png
+share/icons/gnome/256x256/actions/stock_stop.png
+share/icons/gnome/256x256/actions/stop.png
share/icons/gnome/256x256/actions/system-lock-screen.png
share/icons/gnome/256x256/actions/system-log-out.png
share/icons/gnome/256x256/actions/system-search.png
+share/icons/gnome/256x256/actions/view-refresh.png
share/icons/gnome/256x256/actions/xfce-system-lock.png
share/icons/gnome/256x256/apps/access.png
share/icons/gnome/256x256/apps/accessibility-directory.png
share/icons/gnome/256x256/apps/accessories-calculator.png
+share/icons/gnome/256x256/apps/accessories-character-map.png
share/icons/gnome/256x256/apps/accessories-dictionary.png
share/icons/gnome/256x256/apps/accessories-text-editor.png
share/icons/gnome/256x256/apps/applets-screenshooter.png
@@ -3092,17 +3140,22 @@ share/icons/gnome/256x256/apps/config-users.png
share/icons/gnome/256x256/apps/file-manager.png
share/icons/gnome/256x256/apps/fonts.png
share/icons/gnome/256x256/apps/gnome-calculator.png
+share/icons/gnome/256x256/apps/gnome-character-map.png
share/icons/gnome/256x256/apps/gnome-help.png
share/icons/gnome/256x256/apps/gnome-monitor.png
share/icons/gnome/256x256/apps/gnome-remote-desktop.png
share/icons/gnome/256x256/apps/gnome-settings-accessibility-technologies.png
share/icons/gnome/256x256/apps/gnome-settings-background.png
share/icons/gnome/256x256/apps/gnome-settings-font.png
+share/icons/gnome/256x256/apps/gnome-settings-keybindings.png
share/icons/gnome/256x256/apps/gnome-settings-theme.png
share/icons/gnome/256x256/apps/gnome-terminal.png
+share/icons/gnome/256x256/apps/gucharmap.png
share/icons/gnome/256x256/apps/help-browser.png
share/icons/gnome/256x256/apps/kcalc.png
+share/icons/gnome/256x256/apps/kcharselect.png
share/icons/gnome/256x256/apps/kedit.png
+share/icons/gnome/256x256/apps/key_bindings.png
share/icons/gnome/256x256/apps/kfm.png
share/icons/gnome/256x256/apps/khelpcenter.png
share/icons/gnome/256x256/apps/konsole.png
@@ -3115,6 +3168,7 @@ share/icons/gnome/256x256/apps/openterm.png
share/icons/gnome/256x256/apps/preferences-desktop-accessibility.png
share/icons/gnome/256x256/apps/preferences-desktop-display.png
share/icons/gnome/256x256/apps/preferences-desktop-font.png
+share/icons/gnome/256x256/apps/preferences-desktop-keyboard-shortcuts.png
share/icons/gnome/256x256/apps/preferences-desktop-keyboard.png
share/icons/gnome/256x256/apps/preferences-desktop-locale.png
share/icons/gnome/256x256/apps/preferences-desktop-remote-desktop.png
@@ -3146,25 +3200,30 @@ share/icons/gnome/256x256/apps/zen-icon.png
share/icons/gnome/256x256/categories/applications-graphics.png
share/icons/gnome/256x256/categories/applications-internet.png
share/icons/gnome/256x256/categories/applications-office.png
+share/icons/gnome/256x256/categories/applications-system.png
share/icons/gnome/256x256/categories/gnome-applications.png
share/icons/gnome/256x256/categories/gnome-globe.png
share/icons/gnome/256x256/categories/gnome-graphics.png
+share/icons/gnome/256x256/categories/gnome-system.png
share/icons/gnome/256x256/categories/package_graphics.png
share/icons/gnome/256x256/categories/package_network.png
share/icons/gnome/256x256/categories/package_office.png
share/icons/gnome/256x256/categories/package_settings.png
+share/icons/gnome/256x256/categories/package_system.png
share/icons/gnome/256x256/categories/preferences-system-network.png
share/icons/gnome/256x256/categories/preferences-system.png
share/icons/gnome/256x256/categories/redhat-graphics.png
share/icons/gnome/256x256/categories/redhat-internet.png
share/icons/gnome/256x256/categories/redhat-office.png
share/icons/gnome/256x256/categories/redhat-system_settings.png
+share/icons/gnome/256x256/categories/redhat-system_tools.png
share/icons/gnome/256x256/categories/stock_internet.png
share/icons/gnome/256x256/categories/xfce-graphics.png
share/icons/gnome/256x256/categories/xfce-internet.png
share/icons/gnome/256x256/categories/xfce-office.png
share/icons/gnome/256x256/categories/xfce-system-settings.png
share/icons/gnome/256x256/devices/ac-adapter.png
+share/icons/gnome/256x256/devices/audio-input-microphone.png
share/icons/gnome/256x256/devices/battery.png
share/icons/gnome/256x256/devices/camera-photo.png
share/icons/gnome/256x256/devices/camera.png
@@ -3205,6 +3264,7 @@ share/icons/gnome/256x256/devices/gnome-dev-removable-1394.png
share/icons/gnome/256x256/devices/gnome-dev-removable-usb.png
share/icons/gnome/256x256/devices/gnome-dev-removable.png
share/icons/gnome/256x256/devices/gnome-fs-client.png
+share/icons/gnome/256x256/devices/gnome-stock-mic.png
share/icons/gnome/256x256/devices/gtk-cdrom.png
share/icons/gnome/256x256/devices/gtk-harddisk.png
share/icons/gnome/256x256/devices/harddrive.png
@@ -3222,6 +3282,7 @@ share/icons/gnome/256x256/devices/printer-remote.png
share/icons/gnome/256x256/devices/printer.png
share/icons/gnome/256x256/devices/printer1.png
share/icons/gnome/256x256/devices/printmgr.png
+share/icons/gnome/256x256/devices/stock_mic.png
share/icons/gnome/256x256/devices/stock_printers.png
share/icons/gnome/256x256/devices/system.png
share/icons/gnome/256x256/devices/usbpendrive_unmount.png
@@ -3238,6 +3299,7 @@ share/icons/gnome/256x256/emblems/emblem-package.png
share/icons/gnome/256x256/emblems/emblem-readonly.png
share/icons/gnome/256x256/emblems/emblem-shared.png
share/icons/gnome/256x256/emblems/emblem-symbolic-link.png
+share/icons/gnome/256x256/emblems/emblem-synchronizing.png
share/icons/gnome/256x256/emblems/emblem-unreadable.png
share/icons/gnome/256x256/emotes/face-angel.png
share/icons/gnome/256x256/emotes/face-angry.png
@@ -3487,8 +3549,8 @@ share/icons/gnome/256x256/status/audio-volume-muted.png
share/icons/gnome/256x256/status/avatar-default.png
share/icons/gnome/256x256/status/battery-caution-charging.png
share/icons/gnome/256x256/status/battery-caution.png
-share/icons/gnome/256x256/status/battery-charging.png
share/icons/gnome/256x256/status/battery-empty.png
+share/icons/gnome/256x256/status/battery-full-charged.png
share/icons/gnome/256x256/status/battery-full-charging.png
share/icons/gnome/256x256/status/battery-full.png
share/icons/gnome/256x256/status/battery-good-charging.png
@@ -3500,6 +3562,7 @@ share/icons/gnome/256x256/status/connect_creating.png
share/icons/gnome/256x256/status/connect_established.png
share/icons/gnome/256x256/status/connect_no.png
share/icons/gnome/256x256/status/dialog-error.png
+share/icons/gnome/256x256/status/dialog-information.png
share/icons/gnome/256x256/status/dialog-question.png
share/icons/gnome/256x256/status/dialog-warning.png
share/icons/gnome/256x256/status/edittrash.png
@@ -3520,14 +3583,17 @@ share/icons/gnome/256x256/status/gnome-netstatus-tx.png
share/icons/gnome/256x256/status/gnome-netstatus-txrx.png
share/icons/gnome/256x256/status/gnome-stock-trash-full.png
share/icons/gnome/256x256/status/gtk-dialog-error.png
+share/icons/gnome/256x256/status/gtk-dialog-info.png
share/icons/gnome/256x256/status/gtk-dialog-question.png
share/icons/gnome/256x256/status/gtk-dialog-warning.png
share/icons/gnome/256x256/status/gtk-missing-image.png
share/icons/gnome/256x256/status/image-loading.png
share/icons/gnome/256x256/status/image-missing.png
share/icons/gnome/256x256/status/important.png
+share/icons/gnome/256x256/status/info.png
share/icons/gnome/256x256/status/mail-read.png
share/icons/gnome/256x256/status/messagebox_critical.png
+share/icons/gnome/256x256/status/messagebox_info.png
share/icons/gnome/256x256/status/messagebox_warning.png
share/icons/gnome/256x256/status/network-error.png
share/icons/gnome/256x256/status/network-idle.png
@@ -3549,6 +3615,7 @@ share/icons/gnome/256x256/status/software-update-urgent.png
share/icons/gnome/256x256/status/stock_appointment-reminder-excl.png
share/icons/gnome/256x256/status/stock_appointment-reminder.png
share/icons/gnome/256x256/status/stock_dialog-error.png
+share/icons/gnome/256x256/status/stock_dialog-info.png
share/icons/gnome/256x256/status/stock_dialog-question.png
share/icons/gnome/256x256/status/stock_dialog-warning.png
share/icons/gnome/256x256/status/stock_lock-broken.png
@@ -4168,6 +4235,7 @@ share/icons/gnome/32x32/emblems/emblem-photos.png
share/icons/gnome/32x32/emblems/emblem-readonly.png
share/icons/gnome/32x32/emblems/emblem-shared.png
share/icons/gnome/32x32/emblems/emblem-symbolic-link.png
+share/icons/gnome/32x32/emblems/emblem-synchronizing.png
share/icons/gnome/32x32/emblems/emblem-system.png
share/icons/gnome/32x32/emblems/emblem-unreadable.png
share/icons/gnome/32x32/emblems/emblem-urgent.png
@@ -4438,8 +4506,8 @@ share/icons/gnome/32x32/status/audio-volume-muted.png
share/icons/gnome/32x32/status/avatar-default.png
share/icons/gnome/32x32/status/battery-caution-charging.png
share/icons/gnome/32x32/status/battery-caution.png
-share/icons/gnome/32x32/status/battery-charging.png
share/icons/gnome/32x32/status/battery-empty.png
+share/icons/gnome/32x32/status/battery-full-charged.png
share/icons/gnome/32x32/status/battery-full-charging.png
share/icons/gnome/32x32/status/battery-full.png
share/icons/gnome/32x32/status/battery-good-charging.png
@@ -4953,8 +5021,6 @@ share/icons/gnome/48x48/apps/logviewer.png
share/icons/gnome/48x48/apps/multimedia-volume-control.png
share/icons/gnome/48x48/apps/multimedia.png
share/icons/gnome/48x48/apps/openterm.png
-share/icons/gnome/48x48/apps/palm-pilot-sync.png
-share/icons/gnome/48x48/apps/palm-pilot.png
share/icons/gnome/48x48/apps/preferences-desktop-accessibility.png
share/icons/gnome/48x48/apps/preferences-desktop-display.png
share/icons/gnome/48x48/apps/preferences-desktop-font.png
@@ -5171,6 +5237,7 @@ share/icons/gnome/48x48/emblems/emblem-photos.png
share/icons/gnome/48x48/emblems/emblem-readonly.png
share/icons/gnome/48x48/emblems/emblem-shared.png
share/icons/gnome/48x48/emblems/emblem-symbolic-link.png
+share/icons/gnome/48x48/emblems/emblem-synchronizing.png
share/icons/gnome/48x48/emblems/emblem-system.png
share/icons/gnome/48x48/emblems/emblem-unreadable.png
share/icons/gnome/48x48/emblems/emblem-urgent.png
@@ -5441,8 +5508,8 @@ share/icons/gnome/48x48/status/audio-volume-muted.png
share/icons/gnome/48x48/status/avatar-default.png
share/icons/gnome/48x48/status/battery-caution-charging.png
share/icons/gnome/48x48/status/battery-caution.png
-share/icons/gnome/48x48/status/battery-charging.png
share/icons/gnome/48x48/status/battery-empty.png
+share/icons/gnome/48x48/status/battery-full-charged.png
share/icons/gnome/48x48/status/battery-full-charging.png
share/icons/gnome/48x48/status/battery-full.png
share/icons/gnome/48x48/status/battery-good-charging.png
@@ -5575,12 +5642,15 @@ share/icons/gnome/8x8/emblems/emblem-noread.png
share/icons/gnome/8x8/emblems/emblem-nowrite.png
share/icons/gnome/8x8/emblems/emblem-readonly.png
share/icons/gnome/8x8/emblems/emblem-symbolic-link.png
+share/icons/gnome/8x8/emblems/emblem-synchronizing.png
share/icons/gnome/8x8/emblems/emblem-unreadable.png
share/icons/gnome/index.theme
@dirrmtry share/locale/nds/LC_MESSAGES
@dirrmtry share/locale/nds
@dirrmtry share/locale/kk/LC_MESSAGES
@dirrmtry share/locale/kk
+@dirrmtry share/locale/fy/LC_MESSAGES
+@dirrmtry share/locale/fy
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/icons/gnome/scalable/stock/generic
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index 6448ab963865..f54ed3dfd7e1 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnome-user-docs/Makefile,v 1.60 2010/04/27 09:35:34 kwm Exp $
+# $MCom: ports/misc/gnome-user-docs/Makefile,v 1.62 2010/09/30 06:07:30 kwm Exp $
#
PORTNAME= gnome-user-docs
-PORTVERSION= 2.30.1
+PORTVERSION= 2.32.0
CATEGORIES= misc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo
index 1861b9f646d8..77481c7f3b80 100644
--- a/misc/gnome-user-docs/distinfo
+++ b/misc/gnome-user-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-user-docs-2.30.1.tar.bz2) = eccd6a238a499ba42dbb6d74b02dd25a
-SHA256 (gnome2/gnome-user-docs-2.30.1.tar.bz2) = cd490d676c3f9c4792bfb4bf7848ccced7339abc45b25dedf5d1a60fe039cfa9
-SIZE (gnome2/gnome-user-docs-2.30.1.tar.bz2) = 18016659
+MD5 (gnome2/gnome-user-docs-2.32.0.tar.bz2) = 3db5efe72b17f123d402912bd3fb39c1
+SHA256 (gnome2/gnome-user-docs-2.32.0.tar.bz2) = d42c4435590e5b79c8fcf1d917aee485096c02cdc84338bc31f769219ccc87f7
+SIZE (gnome2/gnome-user-docs-2.32.0.tar.bz2) = 17858824
diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist
index 3c40707596f1..555ebf34d895 100644
--- a/misc/gnome-user-docs/pkg-plist
+++ b/misc/gnome-user-docs/pkg-plist
@@ -318,6 +318,45 @@ share/gnome/help/gnome-access-guide/fr/figures/tabbed_section.png
share/gnome/help/gnome-access-guide/fr/figures/text_box.png
share/gnome/help/gnome-access-guide/fr/figures/tree.png
share/gnome/help/gnome-access-guide/fr/gnome-access-guide.xml
+share/gnome/help/gnome-access-guide/gl/figures/Braille_Tab.png
+share/gnome/help/gnome-access-guide/gl/figures/General_Tab.png
+share/gnome/help/gnome-access-guide/gl/figures/KeyBindings_Tab.png
+share/gnome/help/gnome-access-guide/gl/figures/KeyBindings_Tab_Unbound.png
+share/gnome/help/gnome-access-guide/gl/figures/KeyEcho_Tab.png
+share/gnome/help/gnome-access-guide/gl/figures/Magnifier_Advanced.png
+share/gnome/help/gnome-access-guide/gl/figures/Magnifier_Tab.png
+share/gnome/help/gnome-access-guide/gl/figures/MainWindow.png
+share/gnome/help/gnome-access-guide/gl/figures/Pronunciation_Tab.png
+share/gnome/help/gnome-access-guide/gl/figures/RPM_search_gnome_common.png
+share/gnome/help/gnome-access-guide/gl/figures/Speech_Tab.png
+share/gnome/help/gnome-access-guide/gl/figures/TextAttributes_Tab.png
+share/gnome/help/gnome-access-guide/gl/figures/accessx.png
+share/gnome/help/gnome-access-guide/gl/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/gl/figures/button.png
+share/gnome/help/gnome-access-guide/gl/figures/check_box.png
+share/gnome/help/gnome-access-guide/gl/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/gl/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/gl/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/gl/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/gl/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/gl/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/gl/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/gl/figures/radio_button.png
+share/gnome/help/gnome-access-guide/gl/figures/slider.png
+share/gnome/help/gnome-access-guide/gl/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/gl/figures/spin_box.png
+share/gnome/help/gnome-access-guide/gl/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/gl/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/gl/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/gl/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/gl/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/gl/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/gl/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/gl/figures/stickywindowlock.png
+share/gnome/help/gnome-access-guide/gl/figures/tabbed_section.png
+share/gnome/help/gnome-access-guide/gl/figures/text_box.png
+share/gnome/help/gnome-access-guide/gl/figures/tree.png
+share/gnome/help/gnome-access-guide/gl/gnome-access-guide.xml
share/gnome/help/gnome-access-guide/hu/figures/Braille_Tab.png
share/gnome/help/gnome-access-guide/hu/figures/General_Tab.png
share/gnome/help/gnome-access-guide/hu/figures/KeyBindings_Tab.png
@@ -653,6 +692,7 @@ share/gnome/help/system-admin-guide/es/system-admin-guide.xml
share/gnome/help/system-admin-guide/eu/system-admin-guide.xml
share/gnome/help/system-admin-guide/fi/system-admin-guide.xml
share/gnome/help/system-admin-guide/fr/system-admin-guide.xml
+share/gnome/help/system-admin-guide/gl/system-admin-guide.xml
share/gnome/help/system-admin-guide/it/system-admin-guide.xml
share/gnome/help/system-admin-guide/ja/system-admin-guide.xml
share/gnome/help/system-admin-guide/ko/system-admin-guide.xml
@@ -1432,6 +1472,83 @@ share/gnome/help/user-guide/fr/gospanel.xml
share/gnome/help/user-guide/fr/gosstartsession.xml
share/gnome/help/user-guide/fr/gostools.xml
share/gnome/help/user-guide/fr/user-guide.xml
+share/gnome/help/user-guide/gl/figures/ask_pointer.png
+share/gnome/help/user-guide/gl/figures/busy_pointer.png
+share/gnome/help/user-guide/gl/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/gl/figures/copy_pointer.png
+share/gnome/help/user-guide/gl/figures/force_quit.png
+share/gnome/help/user-guide/gl/figures/four_hide_button.png
+share/gnome/help/user-guide/gl/figures/gedit_window.png
+share/gnome/help/user-guide/gl/figures/gnome_panel.png
+share/gnome/help/user-guide/gl/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/gl/figures/ibeam_pointer.png
+share/gnome/help/user-guide/gl/figures/link_pointer.png
+share/gnome/help/user-guide/gl/figures/lockscreen_icon.png
+share/gnome/help/user-guide/gl/figures/logout_icon.png
+share/gnome/help/user-guide/gl/figures/menu_bar_applet.png
+share/gnome/help/user-guide/gl/figures/menu_panel.png
+share/gnome/help/user-guide/gl/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/gl/figures/move_pointer.png
+share/gnome/help/user-guide/gl/figures/movewindow_pointer.png
+share/gnome/help/user-guide/gl/figures/naut_browser_mode.png
+share/gnome/help/user-guide/gl/figures/naut_button_bar.png
+share/gnome/help/user-guide/gl/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/gl/figures/naut_emblem.png
+share/gnome/help/user-guide/gl/figures/naut_go_to_location.png
+share/gnome/help/user-guide/gl/figures/naut_link_emblem.png
+share/gnome/help/user-guide/gl/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/gl/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/gl/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/gl/figures/naut_refine_search.png
+share/gnome/help/user-guide/gl/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/gl/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/gl/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/gl/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/gl/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/gl/figures/naut_search_bar.png
+share/gnome/help/user-guide/gl/figures/naut_search_results.png
+share/gnome/help/user-guide/gl/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/gl/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/gl/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/gl/figures/naut_spatial_view.png
+share/gnome/help/user-guide/gl/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/gl/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/gl/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/gl/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/gl/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/gl/figures/normal_pointer.png
+share/gnome/help/user-guide/gl/figures/not_available_pointer.png
+share/gnome/help/user-guide/gl/figures/notification_area_icon.png
+share/gnome/help/user-guide/gl/figures/open_drawer.png
+share/gnome/help/user-guide/gl/figures/openwindows_menu.png
+share/gnome/help/user-guide/gl/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/gl/figures/resize_pointer.png
+share/gnome/help/user-guide/gl/figures/run_button.png
+share/gnome/help/user-guide/gl/figures/sample_applet.png
+share/gnome/help/user-guide/gl/figures/screenshot_button.png
+share/gnome/help/user-guide/gl/figures/searchtool_button.png
+share/gnome/help/user-guide/gl/figures/show_desktop_button.png
+share/gnome/help/user-guide/gl/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/gl/figures/titlebar_window.png
+share/gnome/help/user-guide/gl/figures/typical_menu.png
+share/gnome/help/user-guide/gl/figures/window_list_applet.png
+share/gnome/help/user-guide/gl/figures/window_list_group_applet.png
+share/gnome/help/user-guide/gl/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/gl/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/gl/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/gl/figures/yelp_preferences.png
+share/gnome/help/user-guide/gl/figures/yelp_window.png
+share/gnome/help/user-guide/gl/glossary.xml
+share/gnome/help/user-guide/gl/gosbasic.xml
+share/gnome/help/user-guide/gl/goscustdesk.xml
+share/gnome/help/user-guide/gl/goseditmainmenu.xml
+share/gnome/help/user-guide/gl/gosfeedback.xml
+share/gnome/help/user-guide/gl/gosnautilus.xml
+share/gnome/help/user-guide/gl/gosoverview.xml
+share/gnome/help/user-guide/gl/gospanel.xml
+share/gnome/help/user-guide/gl/gosstartsession.xml
+share/gnome/help/user-guide/gl/gostools.xml
+share/gnome/help/user-guide/gl/user-guide.xml
share/gnome/help/user-guide/hu/figures/ask_pointer.png
share/gnome/help/user-guide/hu/figures/busy_pointer.png
share/gnome/help/user-guide/hu/figures/com_file_manager_menu.png
@@ -1509,6 +1626,83 @@ share/gnome/help/user-guide/hu/gospanel.xml
share/gnome/help/user-guide/hu/gosstartsession.xml
share/gnome/help/user-guide/hu/gostools.xml
share/gnome/help/user-guide/hu/user-guide.xml
+share/gnome/help/user-guide/id/figures/ask_pointer.png
+share/gnome/help/user-guide/id/figures/busy_pointer.png
+share/gnome/help/user-guide/id/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/id/figures/copy_pointer.png
+share/gnome/help/user-guide/id/figures/force_quit.png
+share/gnome/help/user-guide/id/figures/four_hide_button.png
+share/gnome/help/user-guide/id/figures/gedit_window.png
+share/gnome/help/user-guide/id/figures/gnome_panel.png
+share/gnome/help/user-guide/id/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/id/figures/ibeam_pointer.png
+share/gnome/help/user-guide/id/figures/link_pointer.png
+share/gnome/help/user-guide/id/figures/lockscreen_icon.png
+share/gnome/help/user-guide/id/figures/logout_icon.png
+share/gnome/help/user-guide/id/figures/menu_bar_applet.png
+share/gnome/help/user-guide/id/figures/menu_panel.png
+share/gnome/help/user-guide/id/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/id/figures/move_pointer.png
+share/gnome/help/user-guide/id/figures/movewindow_pointer.png
+share/gnome/help/user-guide/id/figures/naut_browser_mode.png
+share/gnome/help/user-guide/id/figures/naut_button_bar.png
+share/gnome/help/user-guide/id/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/id/figures/naut_emblem.png
+share/gnome/help/user-guide/id/figures/naut_go_to_location.png
+share/gnome/help/user-guide/id/figures/naut_link_emblem.png
+share/gnome/help/user-guide/id/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/id/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/id/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/id/figures/naut_refine_search.png
+share/gnome/help/user-guide/id/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/id/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/id/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/id/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/id/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/id/figures/naut_search_bar.png
+share/gnome/help/user-guide/id/figures/naut_search_results.png
+share/gnome/help/user-guide/id/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/id/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/id/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/id/figures/naut_spatial_view.png
+share/gnome/help/user-guide/id/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/id/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/id/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/id/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/id/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/id/figures/normal_pointer.png
+share/gnome/help/user-guide/id/figures/not_available_pointer.png
+share/gnome/help/user-guide/id/figures/notification_area_icon.png
+share/gnome/help/user-guide/id/figures/open_drawer.png
+share/gnome/help/user-guide/id/figures/openwindows_menu.png
+share/gnome/help/user-guide/id/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/id/figures/resize_pointer.png
+share/gnome/help/user-guide/id/figures/run_button.png
+share/gnome/help/user-guide/id/figures/sample_applet.png
+share/gnome/help/user-guide/id/figures/screenshot_button.png
+share/gnome/help/user-guide/id/figures/searchtool_button.png
+share/gnome/help/user-guide/id/figures/show_desktop_button.png
+share/gnome/help/user-guide/id/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/id/figures/titlebar_window.png
+share/gnome/help/user-guide/id/figures/typical_menu.png
+share/gnome/help/user-guide/id/figures/window_list_applet.png
+share/gnome/help/user-guide/id/figures/window_list_group_applet.png
+share/gnome/help/user-guide/id/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/id/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/id/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/id/figures/yelp_preferences.png
+share/gnome/help/user-guide/id/figures/yelp_window.png
+share/gnome/help/user-guide/id/glossary.xml
+share/gnome/help/user-guide/id/gosbasic.xml
+share/gnome/help/user-guide/id/goscustdesk.xml
+share/gnome/help/user-guide/id/goseditmainmenu.xml
+share/gnome/help/user-guide/id/gosfeedback.xml
+share/gnome/help/user-guide/id/gosnautilus.xml
+share/gnome/help/user-guide/id/gosoverview.xml
+share/gnome/help/user-guide/id/gospanel.xml
+share/gnome/help/user-guide/id/gosstartsession.xml
+share/gnome/help/user-guide/id/gostools.xml
+share/gnome/help/user-guide/id/user-guide.xml
share/gnome/help/user-guide/it/figures/ask_pointer.png
share/gnome/help/user-guide/it/figures/busy_pointer.png
share/gnome/help/user-guide/it/figures/com_file_manager_menu.png
@@ -2441,6 +2635,7 @@ share/omf/gnome-access-guide/gnome-access-guide-es.omf
share/omf/gnome-access-guide/gnome-access-guide-eu.omf
share/omf/gnome-access-guide/gnome-access-guide-fi.omf
share/omf/gnome-access-guide/gnome-access-guide-fr.omf
+share/omf/gnome-access-guide/gnome-access-guide-gl.omf
share/omf/gnome-access-guide/gnome-access-guide-hu.omf
share/omf/gnome-access-guide/gnome-access-guide-it.omf
share/omf/gnome-access-guide/gnome-access-guide-oc.omf
@@ -2458,6 +2653,7 @@ share/omf/system-admin-guide/system-admin-guide-es.omf
share/omf/system-admin-guide/system-admin-guide-eu.omf
share/omf/system-admin-guide/system-admin-guide-fi.omf
share/omf/system-admin-guide/system-admin-guide-fr.omf
+share/omf/system-admin-guide/system-admin-guide-gl.omf
share/omf/system-admin-guide/system-admin-guide-it.omf
share/omf/system-admin-guide/system-admin-guide-ja.omf
share/omf/system-admin-guide/system-admin-guide-ko.omf
@@ -2476,7 +2672,9 @@ 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-gl.omf
share/omf/user-guide/user-guide-hu.omf
+share/omf/user-guide/user-guide-id.omf
share/omf/user-guide/user-guide-it.omf
share/omf/user-guide/user-guide-ja.omf
share/omf/user-guide/user-guide-ko.omf
@@ -2516,8 +2714,12 @@ share/omf/user-guide/user-guide-zh_CN.omf
@dirrm share/gnome/help/user-guide/ja
@dirrm share/gnome/help/user-guide/it/figures
@dirrm share/gnome/help/user-guide/it
+@dirrm share/gnome/help/user-guide/id/figures
+@dirrm share/gnome/help/user-guide/id
@dirrm share/gnome/help/user-guide/hu/figures
@dirrm share/gnome/help/user-guide/hu
+@dirrm share/gnome/help/user-guide/gl/figures
+@dirrm share/gnome/help/user-guide/gl
@dirrm share/gnome/help/user-guide/fr/figures
@dirrm share/gnome/help/user-guide/fr
@dirrm share/gnome/help/user-guide/fi/figures
@@ -2547,6 +2749,7 @@ share/omf/user-guide/user-guide-zh_CN.omf
@dirrm share/gnome/help/system-admin-guide/ko
@dirrm share/gnome/help/system-admin-guide/ja
@dirrm share/gnome/help/system-admin-guide/it
+@dirrm share/gnome/help/system-admin-guide/gl
@dirrm share/gnome/help/system-admin-guide/fr
@dirrm share/gnome/help/system-admin-guide/fi
@dirrm share/gnome/help/system-admin-guide/eu
@@ -2573,6 +2776,8 @@ share/omf/user-guide/user-guide-zh_CN.omf
@dirrm share/gnome/help/gnome-access-guide/it
@dirrm share/gnome/help/gnome-access-guide/hu/figures
@dirrm share/gnome/help/gnome-access-guide/hu
+@dirrm share/gnome/help/gnome-access-guide/gl/figures
+@dirrm share/gnome/help/gnome-access-guide/gl
@dirrm share/gnome/help/gnome-access-guide/fr/figures
@dirrm share/gnome/help/gnome-access-guide/fr
@dirrm share/gnome/help/gnome-access-guide/fi/figures
diff --git a/misc/quick-lounge-applet/Makefile b/misc/quick-lounge-applet/Makefile
index 621726fc26e0..9e5eede931dd 100644
--- a/misc/quick-lounge-applet/Makefile
+++ b/misc/quick-lounge-applet/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/misc/quick-lounge-applet/Makefile,v 1.3 2009/04/16 08:13:36 kwm Exp $
+# $MCom: ports/misc/quick-lounge-applet/Makefile,v 1.15 2010/11/16 10:06:22 kwm Exp $
#
PORTNAME= quick-lounge-applet
-PORTVERSION= 2.14.0
-PORTREVISION= 3
+PORTVERSION= 2.14.1
CATEGORIES= misc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/misc/quick-lounge-applet/distinfo b/misc/quick-lounge-applet/distinfo
index c42682670b19..ea95777b1257 100644
--- a/misc/quick-lounge-applet/distinfo
+++ b/misc/quick-lounge-applet/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/quick-lounge-applet-2.14.0.tar.bz2) = f3fe457f145c74d42002930e6c91ad83
-SHA256 (gnome2/quick-lounge-applet-2.14.0.tar.bz2) = 44fa9f1a80316b8ccc4835bc3ad9b9ab6185ae2cc48c418a17926758e1bb67f8
-SIZE (gnome2/quick-lounge-applet-2.14.0.tar.bz2) = 396628
+SHA256 (gnome2/quick-lounge-applet-2.14.1.tar.bz2) = 852d7027e688228a0d2052cd6181d633e573cd799f8fc9526ea09eab6d743812
+SIZE (gnome2/quick-lounge-applet-2.14.1.tar.bz2) = 411560
diff --git a/misc/quick-lounge-applet/pkg-plist b/misc/quick-lounge-applet/pkg-plist
index 48e8e850d9de..14b31a09d9c6 100644
--- a/misc/quick-lounge-applet/pkg-plist
+++ b/misc/quick-lounge-applet/pkg-plist
@@ -14,12 +14,30 @@ share/gnome/help/quick-lounge/de/figures/quick-lounge_start.png
share/gnome/help/quick-lounge/de/figures/quick-lounge_up.png
share/gnome/help/quick-lounge/de/figures/quick-lounge_window.png
share/gnome/help/quick-lounge/de/quick-lounge.xml
+share/gnome/help/quick-lounge/es/figures/quick-lounge_down.png
+share/gnome/help/quick-lounge/es/figures/quick-lounge_end.png
+share/gnome/help/quick-lounge/es/figures/quick-lounge_start.png
+share/gnome/help/quick-lounge/es/figures/quick-lounge_up.png
+share/gnome/help/quick-lounge/es/figures/quick-lounge_window.png
+share/gnome/help/quick-lounge/es/quick-lounge.xml
share/gnome/help/quick-lounge/fr/figures/quick-lounge_down.png
share/gnome/help/quick-lounge/fr/figures/quick-lounge_end.png
share/gnome/help/quick-lounge/fr/figures/quick-lounge_start.png
share/gnome/help/quick-lounge/fr/figures/quick-lounge_up.png
share/gnome/help/quick-lounge/fr/figures/quick-lounge_window.png
share/gnome/help/quick-lounge/fr/quick-lounge.xml
+share/gnome/help/quick-lounge/sl/figures/quick-lounge_down.png
+share/gnome/help/quick-lounge/sl/figures/quick-lounge_end.png
+share/gnome/help/quick-lounge/sl/figures/quick-lounge_start.png
+share/gnome/help/quick-lounge/sl/figures/quick-lounge_up.png
+share/gnome/help/quick-lounge/sl/figures/quick-lounge_window.png
+share/gnome/help/quick-lounge/sl/quick-lounge.xml
+share/gnome/help/quick-lounge/sv/figures/quick-lounge_down.png
+share/gnome/help/quick-lounge/sv/figures/quick-lounge_end.png
+share/gnome/help/quick-lounge/sv/figures/quick-lounge_start.png
+share/gnome/help/quick-lounge/sv/figures/quick-lounge_up.png
+share/gnome/help/quick-lounge/sv/figures/quick-lounge_window.png
+share/gnome/help/quick-lounge/sv/quick-lounge.xml
share/icons/hicolor/48x48/apps/quick-lounge-applet.png
share/locale/ar/LC_MESSAGES/quick-lounge-applet.mo
share/locale/az/LC_MESSAGES/quick-lounge-applet.mo
@@ -42,6 +60,7 @@ share/locale/gl/LC_MESSAGES/quick-lounge-applet.mo
share/locale/gu/LC_MESSAGES/quick-lounge-applet.mo
share/locale/hr/LC_MESSAGES/quick-lounge-applet.mo
share/locale/hu/LC_MESSAGES/quick-lounge-applet.mo
+share/locale/id/LC_MESSAGES/quick-lounge-applet.mo
share/locale/it/LC_MESSAGES/quick-lounge-applet.mo
share/locale/ja/LC_MESSAGES/quick-lounge-applet.mo
share/locale/ko/LC_MESSAGES/quick-lounge-applet.mo
@@ -75,8 +94,14 @@ share/quick-lounge-applet/ui/properties.ui
@dirrmtry share/locale/rw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrm share/gnome/help/quick-lounge/sv/figures
+@dirrm share/gnome/help/quick-lounge/sv
+@dirrm share/gnome/help/quick-lounge/sl/figures
+@dirrm share/gnome/help/quick-lounge/sl
@dirrm share/gnome/help/quick-lounge/fr/figures
@dirrm share/gnome/help/quick-lounge/fr
+@dirrm share/gnome/help/quick-lounge/es/figures
+@dirrm share/gnome/help/quick-lounge/es
@dirrm share/gnome/help/quick-lounge/de/figures
@dirrm share/gnome/help/quick-lounge/de
@dirrm share/gnome/help/quick-lounge/C/figures
diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile
index 5859ef553bc5..6e3f8fa3eee7 100644
--- a/multimedia/bmpx/Makefile
+++ b/multimedia/bmpx/Makefile
@@ -28,6 +28,7 @@ LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib \
soup-2.2.8:${PORTSDIR}/devel/libsoup22
CONFLICTS= bmpx-devel-[0-9]*
+BROKEN= Doesn't build with Glib-2.26
USE_BISON= build
USE_XORG= ice sm
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index fcd9850c331f..64582184ae4a 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.58 2010/04/27 15:51:59 kwm Exp $
+# $MCom: ports/multimedia/cheese/Makefile,v 1.63 2010/09/28 08:21:02 kwm Exp $
#
PORTNAME= cheese
-PORTVERSION= 2.30.1
-PORTREVISION= 3
+PORTVERSION= 2.32.0
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/multimedia/cheese/distinfo b/multimedia/cheese/distinfo
index 4208c352ab0d..32da8e840986 100644
--- a/multimedia/cheese/distinfo
+++ b/multimedia/cheese/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/cheese-2.30.1.tar.bz2) = 1599fded8a1797ea51fb010af4e6c45b
-SHA256 (gnome2/cheese-2.30.1.tar.bz2) = 48f03470c6f527caa0e3b269d3afcff86ae0939a74f66ce030d4eed3bc3cbd9a
-SIZE (gnome2/cheese-2.30.1.tar.bz2) = 5266128
+MD5 (gnome2/cheese-2.32.0.tar.bz2) = e3b822e46b2558d0bbdfa4809d5d3c24
+SHA256 (gnome2/cheese-2.32.0.tar.bz2) = 8debc47113d9889247f411d256a8eca0d8da49e5ab5909c200923945b8d5e087
+SIZE (gnome2/cheese-2.32.0.tar.bz2) = 5303805
diff --git a/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c b/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c
index 05da52bbd4f6..8604c237799c 100644
--- a/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c
+++ b/multimedia/cheese/files/patch-libcheese_cheese-camera-device-monitor.c
@@ -1,5 +1,5 @@
---- libcheese/cheese-camera-device-monitor.c.orig 2010-03-29 16:27:42.000000000 -0400
-+++ libcheese/cheese-camera-device-monitor.c 2010-04-17 17:57:57.000000000 -0400
+--- libcheese/cheese-camera-device-monitor.c.orig 2010-08-16 23:00:43.000000000 +0200
++++ libcheese/cheese-camera-device-monitor.c 2010-08-18 09:51:48.000000000 +0200
@@ -24,24 +24,11 @@
#endif
@@ -54,12 +54,12 @@
} CheeseCameraDeviceMonitorPrivate;
enum
-@@ -102,111 +87,79 @@ cheese_camera_device_monitor_error_quark
+@@ -102,111 +87,77 @@ cheese_camera_device_monitor_error_quark
return g_quark_from_static_string ("cheese-camera-error-quark");
}
-#ifdef HAVE_UDEV
- static void
+-static void
-cheese_camera_device_monitor_added (CheeseCameraDeviceMonitor *monitor,
- GUdevDevice *udevice)
+cheese_camera_device_monitor_handle_udi (CheeseCameraDeviceMonitor *monitor,
@@ -93,7 +93,7 @@
- vendor_id = g_ascii_strtoll (vendor, NULL, 16);
- product = g_udev_device_get_property (udevice, "ID_MODEL_ID");
- if (product != NULL)
-- product_id = g_ascii_strtoll (vendor, NULL, 16);
+- product_id = g_ascii_strtoll (product, NULL, 16);
- if (vendor_id == 0 || product_id == 0)
- {
- GST_WARNING ("Error getting vendor and product id");
@@ -119,10 +119,10 @@
+ if (dbus_error_is_set (&error))
{
- GST_WARNING ("Error getting V4L device");
+- return;
+ GST_WARNING ("error getting V4L device for %s: %s: %s", udi, error.name, error.message);
+ dbus_error_free (&error);
+ libhal_free_string (product_name);
- return;
}
- /* vbi devices support capture capability too, but cannot be used,
@@ -181,12 +181,13 @@
static void
-cheese_camera_device_monitor_removed (CheeseCameraDeviceMonitor *monitor,
- GUdevDevice *udevice)
-+cheese_camera_device_monitor_removed (LibHalContext *ctx,
-+ const char *udi)
- {
+-{
- g_signal_emit (monitor, monitor_signals[REMOVED], 0,
- g_udev_device_get_property (udevice, "DEVPATH"));
-}
++cheese_camera_device_monitor_removed (LibHalContext *ctx,
++ const char *udi)
++ {
+ CheeseCameraDeviceMonitor *monitor;
+ void *data;
@@ -209,7 +210,7 @@
}
/**
-@@ -222,115 +175,85 @@ void
+@@ -222,115 +173,85 @@ void
cheese_camera_device_monitor_coldplug (CheeseCameraDeviceMonitor *monitor)
{
CheeseCameraDeviceMonitorPrivate *priv = CHEESE_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor);
@@ -221,19 +222,20 @@
+ DBusError error;
- if (priv->client == NULL)
+- return;
+ GST_INFO ("Probing devices with HAL...");
-+
-+ if (priv->hal_ctx == NULL)
- return;
- GST_INFO ("Probing devices with udev...");
-+ dbus_error_init (&error);
++ if (priv->hal_ctx == NULL)
++ return;
- devices = g_udev_client_query_by_subsystem (priv->client, "video4linux");
-+ udis = libhal_find_device_by_capability (priv->hal_ctx, "video4linux", &num_udis, &error);
++ dbus_error_init (&error);
- /* Initialize camera structures */
- for (l = devices; l != NULL; l = l->next)
++ udis = libhal_find_device_by_capability (priv->hal_ctx, "video4linux", &num_udis, &error);
++
+ if (dbus_error_is_set (&error))
{
- cheese_camera_device_monitor_added (monitor, l->data);
@@ -373,7 +375,7 @@
G_OBJECT_CLASS (cheese_camera_device_monitor_parent_class)->finalize (object);
}
-@@ -385,14 +308,52 @@ cheese_camera_device_monitor_class_init
+@@ -385,14 +306,52 @@ cheese_camera_device_monitor_class_init
static void
cheese_camera_device_monitor_init (CheeseCameraDeviceMonitor *monitor)
{
diff --git a/multimedia/cheese/pkg-plist b/multimedia/cheese/pkg-plist
index cf424dad1a6b..2755ff708d95 100644
--- a/multimedia/cheese/pkg-plist
+++ b/multimedia/cheese/pkg-plist
@@ -161,6 +161,13 @@ 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/sl/cheese.xml
+share/gnome/help/cheese/sl/figures/cheese-effects.jpg
+share/gnome/help/cheese/sl/figures/cheese-fullscreen.jpg
+share/gnome/help/cheese/sl/figures/cheese-main.jpg
+share/gnome/help/cheese/sl/figures/cheese-preferences.jpg
+share/gnome/help/cheese/sl/figures/cheese-share.jpg
+share/gnome/help/cheese/sl/figures/cheese-wide.jpg
share/gnome/help/cheese/sv/cheese.xml
share/gnome/help/cheese/sv/figures/cheese-effects.jpg
share/gnome/help/cheese/sv/figures/cheese-fullscreen.jpg
@@ -222,6 +229,8 @@ share/locale/hu/LC_MESSAGES/cheese.mo
share/locale/id/LC_MESSAGES/cheese.mo
share/locale/it/LC_MESSAGES/cheese.mo
share/locale/ja/LC_MESSAGES/cheese.mo
+share/locale/ka/LC_MESSAGES/cheese.mo
+share/locale/kk/LC_MESSAGES/cheese.mo
share/locale/kn/LC_MESSAGES/cheese.mo
share/locale/ko/LC_MESSAGES/cheese.mo
share/locale/ku/LC_MESSAGES/cheese.mo
@@ -254,6 +263,7 @@ share/locale/ta/LC_MESSAGES/cheese.mo
share/locale/te/LC_MESSAGES/cheese.mo
share/locale/th/LC_MESSAGES/cheese.mo
share/locale/tr/LC_MESSAGES/cheese.mo
+share/locale/ug/LC_MESSAGES/cheese.mo
share/locale/uk/LC_MESSAGES/cheese.mo
share/locale/vi/LC_MESSAGES/cheese.mo
share/locale/zh_CN/LC_MESSAGES/cheese.mo
@@ -272,6 +282,7 @@ 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-sl.omf
share/omf/cheese/cheese-sv.omf
share/omf/cheese/cheese-th.omf
share/omf/cheese/cheese-zh_CN.omf
@@ -284,6 +295,8 @@ share/omf/cheese/cheese-zh_CN.omf
@dirrm share/gnome/help/cheese/th
@dirrm share/gnome/help/cheese/sv/figures
@dirrm share/gnome/help/cheese/sv
+@dirrm share/gnome/help/cheese/sl/figures
+@dirrm share/gnome/help/cheese/sl
@dirrm share/gnome/help/cheese/ru/figures
@dirrm share/gnome/help/cheese/ru
@dirrm share/gnome/help/cheese/pt_BR/figures
@@ -334,6 +347,8 @@ share/omf/cheese/cheese-zh_CN.omf
@dirrm include/cheese
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -350,6 +365,8 @@ share/omf/cheese/cheese-zh_CN.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/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index 365136bcf947..9bbecae50ba6 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -3,10 +3,11 @@
# Whom: Martin Wilke <miwi@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/multimedia/clutter-gst/Makefile,v 1.6 2010/06/29 21:14:02 kwm Exp $
PORTNAME= clutter-gst
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/
diff --git a/multimedia/swfdec-gnome/Makefile b/multimedia/swfdec-gnome/Makefile
index aa2947030aec..4a90ef90f0c0 100644
--- a/multimedia/swfdec-gnome/Makefile
+++ b/multimedia/swfdec-gnome/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/swfdec-gnome/Makefile,v 1.27 2010/04/01 17:25:14 kwm Exp $
+# $MCom: ports/multimedia/swfdec-gnome/Makefile,v 1.29 2010/09/29 14:04:43 kwm Exp $
#
PORTNAME= swfdec-gnome
-PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTVERSION= 2.30.1
CATEGORIES= multimedia
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/multimedia/swfdec-gnome/distinfo b/multimedia/swfdec-gnome/distinfo
index b80c2a5f5625..15461177cc94 100644
--- a/multimedia/swfdec-gnome/distinfo
+++ b/multimedia/swfdec-gnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/swfdec-gnome-2.30.0.tar.bz2) = c3a8429f42f3dd1aa3963588caaa2940
-SHA256 (gnome2/swfdec-gnome-2.30.0.tar.bz2) = d9e5f0a2460726518c9cde14a137d3e0045d4ec64c40a8254914e5a08d2bb459
-SIZE (gnome2/swfdec-gnome-2.30.0.tar.bz2) = 177557
+MD5 (gnome2/swfdec-gnome-2.30.1.tar.bz2) = 28a72e9c2ad79f33e4cf83bbd54fa124
+SHA256 (gnome2/swfdec-gnome-2.30.1.tar.bz2) = e684a2ae44ff52b925796734813c32fa222d4aba0aa85fd77276e99a12317b88
+SIZE (gnome2/swfdec-gnome-2.30.1.tar.bz2) = 176616
diff --git a/multimedia/swfdec-gnome/pkg-plist b/multimedia/swfdec-gnome/pkg-plist
index 5d01d856e6f6..77097bec6538 100644
--- a/multimedia/swfdec-gnome/pkg-plist
+++ b/multimedia/swfdec-gnome/pkg-plist
@@ -35,6 +35,7 @@ share/locale/gu/LC_MESSAGES/swfdec-gnome.mo
share/locale/he/LC_MESSAGES/swfdec-gnome.mo
share/locale/hi/LC_MESSAGES/swfdec-gnome.mo
share/locale/hu/LC_MESSAGES/swfdec-gnome.mo
+share/locale/id/LC_MESSAGES/swfdec-gnome.mo
share/locale/it/LC_MESSAGES/swfdec-gnome.mo
share/locale/ja/LC_MESSAGES/swfdec-gnome.mo
share/locale/kk/LC_MESSAGES/swfdec-gnome.mo
@@ -47,6 +48,7 @@ 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
+share/locale/ms/LC_MESSAGES/swfdec-gnome.mo
share/locale/nb/LC_MESSAGES/swfdec-gnome.mo
share/locale/nl/LC_MESSAGES/swfdec-gnome.mo
share/locale/nn/LC_MESSAGES/swfdec-gnome.mo
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index 55f5e96ab8a8..31eb263da66c 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.35 2010/04/01 18:58:58 kwm Exp $
+# $MCom: ports/multimedia/totem-pl-parser/Makefile,v 1.42 2010/10/18 14:01:02 kwm Exp $
#
PORTNAME= totem-pl-parser
-PORTVERSION= 2.30.2
-PORTREVISION= 1
+PORTVERSION= 2.32.1
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -19,7 +18,7 @@ COMMENT= GObject-based library to parse a host of playlist formats
BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \
gmime-2.4.6:${PORTSDIR}/mail/gmime24 \
- soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup
+ soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome
RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
USE_BZIP2= yes
diff --git a/multimedia/totem-pl-parser/distinfo b/multimedia/totem-pl-parser/distinfo
index ec1d89480977..9854704a3740 100644
--- a/multimedia/totem-pl-parser/distinfo
+++ b/multimedia/totem-pl-parser/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-pl-parser-2.30.2.tar.bz2) = c616536b9d7af21bbb16363eec0ec8a5
-SHA256 (gnome2/totem-pl-parser-2.30.2.tar.bz2) = acb087cb09a1138aa616ff46d319180abdec4d32516414a864cfa26ffe258520
-SIZE (gnome2/totem-pl-parser-2.30.2.tar.bz2) = 843960
+MD5 (gnome2/totem-pl-parser-2.32.1.tar.bz2) = 2cedaab5dee14526ad0be0970155151f
+SHA256 (gnome2/totem-pl-parser-2.32.1.tar.bz2) = 993fb25442d9d77ebf9d920f6482b43d504abfb084e30cd5a2f1719df96c12c2
+SIZE (gnome2/totem-pl-parser-2.32.1.tar.bz2) = 1614749
diff --git a/multimedia/totem-pl-parser/pkg-plist b/multimedia/totem-pl-parser/pkg-plist
index 881454b8ee36..c474de34989b 100644
--- a/multimedia/totem-pl-parser/pkg-plist
+++ b/multimedia/totem-pl-parser/pkg-plist
@@ -24,6 +24,7 @@ libdata/pkgconfig/totem-plparser.pc
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/ix02.html
%%DOCSDIR%%/left.png
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index b1a65652cae7..ab31bec18247 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.146 2010/05/06 08:41:15 kwm Exp $
+# $MCom: ports/multimedia/totem/Makefile,v 1.151 2010/09/27 19:04:37 kwm Exp $
#
PORTNAME= totem
-PORTVERSION= 2.30.2
-PORTREVISION?= 1
+PORTVERSION= 2.32.0
+PORTREVISION?= 0
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -19,6 +19,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.7:${PORTSDIR}/devel/libgdata \
+ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
totem-plparser.17:${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 \
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 5cff87a72e44..b33127b26527 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-2.30.2.tar.bz2) = 4ff658d6178fdb57f310c54daf596de7
-SHA256 (gnome2/totem-2.30.2.tar.bz2) = c50da5479c57b2791c3c1bfc05f815d5ee06082fcd1bacc49f4d88c11ed02b6d
-SIZE (gnome2/totem-2.30.2.tar.bz2) = 3223073
+MD5 (gnome2/totem-2.32.0.tar.bz2) = 2e55c3da316648ba860e3f88af2d30ab
+SHA256 (gnome2/totem-2.32.0.tar.bz2) = 982d6aaeca3e4844694fc0a2540d792bea753e24b55cf33203188b32b5914f47
+SIZE (gnome2/totem-2.32.0.tar.bz2) = 3278758
diff --git a/multimedia/totem/files/patch-configure b/multimedia/totem/files/patch-configure
index 4c6c7b340f9d..4c6a3519cdb4 100644
--- a/multimedia/totem/files/patch-configure
+++ b/multimedia/totem/files/patch-configure
@@ -1,7 +1,16 @@
---- configure.orig 2008-08-30 08:23:22.000000000 +0200
-+++ configure 2008-08-30 08:24:20.000000000 +0200
-@@ -25171,7 +25171,9 @@
- _ACEOF
+--- configure.orig 2010-10-10 12:15:41.000000000 -0400
++++ configure 2010-10-10 12:18:12.000000000 -0400
+@@ -18343,7 +18343,7 @@ for good_element in gconfaudiosink gconf
+ do
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 0.10 $good_element plugin" >&5
+ $as_echo_n "checking GStreamer 0.10 $good_element plugin... " >&6; }
+- if $gst010_inspect $good_element >/dev/null 2>/dev/null; then
++ if dbus-launch $gst010_inspect $good_element >/dev/null 2>/dev/null; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ else
+@@ -21139,7 +21139,9 @@ if test "$enable_browser_plugins" = "yes
+ $as_echo "#define ENABLE_BROWSER_PLUGINS 1" >>confdefs.h
+if [ -z "${BROWSER_PLUGIN_DIR}" ]; then
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 1c0431cd5e25..c62cb3d70fa1 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -116,12 +116,15 @@ share/applications/totem.desktop
%%DOCSDIR%%/TotemObject.html
%%DOCSDIR%%/TotemPlugin.html
%%DOCSDIR%%/TotemVideoList.html
+%%DOCSDIR%%/annotation-glossary.html
%%DOCSDIR%%/api-index-deprecated.html
%%DOCSDIR%%/api-index-full.html
%%DOCSDIR%%/core-api.html
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/ix02.html
+%%DOCSDIR%%/ix03.html
%%DOCSDIR%%/left.png
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
@@ -402,6 +405,7 @@ share/locale/is/LC_MESSAGES/totem.mo
share/locale/it/LC_MESSAGES/totem.mo
share/locale/ja/LC_MESSAGES/totem.mo
share/locale/ka/LC_MESSAGES/totem.mo
+share/locale/kk/LC_MESSAGES/totem.mo
share/locale/kn/LC_MESSAGES/totem.mo
share/locale/ko/LC_MESSAGES/totem.mo
share/locale/ku/LC_MESSAGES/totem.mo
@@ -584,6 +588,8 @@ share/vala/vapi/totem.vapi
@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/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/net-im/Makefile b/net-im/Makefile
index 347dbe795d86..d52a63dc2339 100644
--- a/net-im/Makefile
+++ b/net-im/Makefile
@@ -29,6 +29,7 @@
SUBDIR += farsight2
SUBDIR += finch
SUBDIR += firetalk
+ SUBDIR += folks
SUBDIR += freetalk
SUBDIR += fugu
SUBDIR += gajim
@@ -162,6 +163,7 @@
SUBDIR += telepathy-glib
SUBDIR += telepathy-haze
SUBDIR += telepathy-idle
+ SUBDIR += telepathy-logger
SUBDIR += telepathy-mission-control
SUBDIR += telepathy-python
SUBDIR += telepathy-qt
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index 3074ef428d66..5bd22029ed63 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/net-im/empathy/Makefile,v 1.5 2010/06/23 14:00:15 kwm Exp $
+# $MCom: ports/net-im/empathy/Makefile,v 1.76 2010/11/18 18:04:55 kwm Exp $
PORTNAME= empathy
-PORTVERSION= 2.30.2
+PORTVERSION= 2.32.2
CATEGORIES= net-im gnome
MASTER_SITES= GNOME
@@ -14,14 +14,18 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME IM client based around telepathy
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \
telepathy.2:${PORTSDIR}/net-im/libtelepathy \
telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
telepathy-farsight.0:${PORTSDIR}/net-im/telepathy-farsight \
+ telepathy-logger.1:${PORTSDIR}/net-im/telepathy-logger \
+ folks-telepathy.16:${PORTSDIR}/net-im/folks \
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 \
+ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
USE_GMAKE= yes
@@ -37,11 +41,12 @@ USE_PYTHON= yes
MAKE_JOBS_UNSAFE=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --enable-tpl=no
+CONFIGURE_ARGS= --disable-Werror \
+ --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
-GCONF_SCHEMAS= empathy.schemas
+GLIB_SCHEMAS= org.gnome.Empathy.gschema.xml
-MAN1= empathy.1
+MAN1= empathy.1 empathy-accounts.1
OPTIONS= JABBER "Enable jabber (XMPP) client support" on \
MSN "Enable MSN client support" on \
@@ -94,7 +99,7 @@ PLIST_SUB+= NST="@comment "
.endif
.if !defined(WITHOUT_MAP)
-LIB_DEPENDS+= champlain-0.4.1:${PORTSDIR}/graphics/libchamplain
+LIB_DEPENDS+= champlain-0.8.1:${PORTSDIR}/graphics/libchamplain
CONFIGURE_ARGS+=--enable-map
PLIST_SUB+= MAP=""
.else
@@ -102,8 +107,4 @@ 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
-
.include <bsd.port.post.mk>
diff --git a/net-im/empathy/distinfo b/net-im/empathy/distinfo
index a03dd4772157..aef3ef0e3e1f 100644
--- a/net-im/empathy/distinfo
+++ b/net-im/empathy/distinfo
@@ -1,3 +1,2 @@
-MD5 (empathy-2.30.2.tar.bz2) = 964b48ccc63a2acdd14224eb763d6bf6
-SHA256 (empathy-2.30.2.tar.bz2) = e96846bafcedf39f9869d656031ba1c02c3568038e968db308ff07552e5024d7
-SIZE (empathy-2.30.2.tar.bz2) = 2644286
+SHA256 (empathy-2.32.2.tar.bz2) = f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861
+SIZE (empathy-2.32.2.tar.bz2) = 2936340
diff --git a/net-im/empathy/files/patch-configure b/net-im/empathy/files/patch-configure
new file mode 100644
index 000000000000..054f1a3e5c15
--- /dev/null
+++ b/net-im/empathy/files/patch-configure
@@ -0,0 +1,28 @@
+--- configure.orig 2010-11-18 17:41:43.000000000 +0100
++++ configure 2010-11-18 17:41:43.000000000 +0100
+@@ -13390,8 +13390,8 @@
+ .SECONDARY: $(gsettings_SCHEMAS)
+
+ gsettings__base_list = \
+- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
++ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
+
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid)
+ @$(NORMAL_INSTALL)
+@@ -15049,11 +15049,11 @@
+ fi
+
+ # Enable GSEAL checks if needed
+-if test $USE_MAINTAINER_MODE = yes; then
++#if test $USE_MAINTAINER_MODE = yes; then
+
+-$as_echo "#define GSEAL_ENABLE /**/" >>confdefs.h
++#$as_echo "#define GSEAL_ENABLE /**/" >>confdefs.h
+
+-fi
++#fi
+
+ # -----------------------------------------------------------
+ # Enable debug
diff --git a/net-im/empathy/pkg-plist b/net-im/empathy/pkg-plist
index 9f1b99bb6f07..daa8228d30de 100644
--- a/net-im/empathy/pkg-plist
+++ b/net-im/empathy/pkg-plist
@@ -4,8 +4,13 @@ bin/empathy-debugger
%%NST%%lib/nautilus-sendto/plugins/libnstempathy.a
%%NST%%lib/nautilus-sendto/plugins/libnstempathy.la
%%NST%%lib/nautilus-sendto/plugins/libnstempathy.so
+libexec/empathy-auth-client
+libexec/empathy-av
+share/GConf/gsettings/empathy.convert
share/applications/empathy-accounts.desktop
share/applications/empathy.desktop
+share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service
+share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Auth.service
share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%%DATADIR%%/Template.html
%%DATADIR%%/codec-preferences
@@ -33,8 +38,8 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%%DATADIR%%/empathy-contact-widget.ui
%%DATADIR%%/empathy-ft-manager.ui
%%DATADIR%%/empathy-import-dialog.ui
+%%DATADIR%%/empathy-individual-widget.ui
%%DATADIR%%/empathy-irc-networks.dtd
-%%DATADIR%%/empathy-log-manager.xsl
%%DATADIR%%/empathy-log-window.ui
%%DATADIR%%/empathy-main-window.ui
%%MAP%%%%DATADIR%%/empathy-map-view.ui
@@ -66,13 +71,13 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%%DATADIR%%/icons/hicolor/16x16/apps/im-sip.png
%%DATADIR%%/icons/hicolor/16x16/apps/im-yahoo.png
%%DATADIR%%/icons/hicolor/16x16/apps/im-zephyr.png
-%%DATADIR%%/icons/hicolor/16x16/status/empathy-available.png
-%%DATADIR%%/icons/hicolor/16x16/status/empathy-away.png
-%%DATADIR%%/icons/hicolor/16x16/status/empathy-busy.png
-%%DATADIR%%/icons/hicolor/16x16/status/empathy-extended-away.png
-%%DATADIR%%/icons/hicolor/16x16/status/empathy-offline.png
%%DATADIR%%/icons/hicolor/16x16/status/empathy-pending.png
%%DATADIR%%/icons/hicolor/16x16/status/im-message.png
+%%DATADIR%%/icons/hicolor/16x16/status/user-available.png
+%%DATADIR%%/icons/hicolor/16x16/status/user-away.png
+%%DATADIR%%/icons/hicolor/16x16/status/user-busy.png
+%%DATADIR%%/icons/hicolor/16x16/status/user-idle.png
+%%DATADIR%%/icons/hicolor/16x16/status/user-offline.png
%%DATADIR%%/icons/hicolor/16x16/status/user-typing.png
%%DATADIR%%/icons/hicolor/22x22/actions/im-message-new.png
%%DATADIR%%/icons/hicolor/22x22/apps/im-aim.png
@@ -96,12 +101,13 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%%DATADIR%%/icons/hicolor/22x22/apps/im-sip.png
%%DATADIR%%/icons/hicolor/22x22/apps/im-yahoo.png
%%DATADIR%%/icons/hicolor/22x22/apps/im-zephyr.png
-%%DATADIR%%/icons/hicolor/22x22/status/empathy-available.png
-%%DATADIR%%/icons/hicolor/22x22/status/empathy-away.png
-%%DATADIR%%/icons/hicolor/22x22/status/empathy-busy.png
-%%DATADIR%%/icons/hicolor/22x22/status/empathy-extended-away.png
-%%DATADIR%%/icons/hicolor/22x22/status/empathy-offline.png
%%DATADIR%%/icons/hicolor/22x22/status/empathy-pending.png
+%%DATADIR%%/icons/hicolor/22x22/status/im-message.png
+%%DATADIR%%/icons/hicolor/22x22/status/user-available.png
+%%DATADIR%%/icons/hicolor/22x22/status/user-away.png
+%%DATADIR%%/icons/hicolor/22x22/status/user-busy.png
+%%DATADIR%%/icons/hicolor/22x22/status/user-idle.png
+%%DATADIR%%/icons/hicolor/22x22/status/user-offline.png
%%DATADIR%%/icons/hicolor/24x24/actions/im-message-new.png
%%DATADIR%%/icons/hicolor/24x24/apps/im-aim.png
%%DATADIR%%/icons/hicolor/24x24/apps/im-ekiga.png
@@ -123,12 +129,12 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%%DATADIR%%/icons/hicolor/24x24/apps/im-sip.png
%%DATADIR%%/icons/hicolor/24x24/apps/im-yahoo.png
%%DATADIR%%/icons/hicolor/24x24/apps/im-zephyr.png
-%%DATADIR%%/icons/hicolor/24x24/status/empathy-available.png
-%%DATADIR%%/icons/hicolor/24x24/status/empathy-away.png
-%%DATADIR%%/icons/hicolor/24x24/status/empathy-busy.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/24x24/status/user-available.png
+%%DATADIR%%/icons/hicolor/24x24/status/user-away.png
+%%DATADIR%%/icons/hicolor/24x24/status/user-busy.png
+%%DATADIR%%/icons/hicolor/24x24/status/user-idle.png
+%%DATADIR%%/icons/hicolor/24x24/status/user-offline.png
%%DATADIR%%/icons/hicolor/32x32/apps/im-aim.png
%%DATADIR%%/icons/hicolor/32x32/apps/im-ekiga.png
%%DATADIR%%/icons/hicolor/32x32/apps/im-gadugadu.png
@@ -149,12 +155,12 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%%DATADIR%%/icons/hicolor/32x32/apps/im-sip.png
%%DATADIR%%/icons/hicolor/32x32/apps/im-yahoo.png
%%DATADIR%%/icons/hicolor/32x32/apps/im-zephyr.png
-%%DATADIR%%/icons/hicolor/32x32/status/empathy-available.png
-%%DATADIR%%/icons/hicolor/32x32/status/empathy-away.png
-%%DATADIR%%/icons/hicolor/32x32/status/empathy-busy.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/32x32/status/user-available.png
+%%DATADIR%%/icons/hicolor/32x32/status/user-away.png
+%%DATADIR%%/icons/hicolor/32x32/status/user-busy.png
+%%DATADIR%%/icons/hicolor/32x32/status/user-idle.png
+%%DATADIR%%/icons/hicolor/32x32/status/user-offline.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-aim.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-ekiga.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-facebook.png
@@ -176,12 +182,12 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%%DATADIR%%/icons/hicolor/48x48/apps/im-sip.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-yahoo.png
%%DATADIR%%/icons/hicolor/48x48/apps/im-zephyr.png
-%%DATADIR%%/icons/hicolor/48x48/status/empathy-available.png
-%%DATADIR%%/icons/hicolor/48x48/status/empathy-away.png
-%%DATADIR%%/icons/hicolor/48x48/status/empathy-busy.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/48x48/status/user-available.png
+%%DATADIR%%/icons/hicolor/48x48/status/user-away.png
+%%DATADIR%%/icons/hicolor/48x48/status/user-busy.png
+%%DATADIR%%/icons/hicolor/48x48/status/user-idle.png
+%%DATADIR%%/icons/hicolor/48x48/status/user-offline.png
%%DATADIR%%/icons/hicolor/icon-theme.cache
%%DATADIR%%/icons/hicolor/scalable/apps/im-aim.svg
%%DATADIR%%/icons/hicolor/scalable/apps/im-ekiga.svg
@@ -203,12 +209,12 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
%%DATADIR%%/icons/hicolor/scalable/apps/im-sip.svg
%%DATADIR%%/icons/hicolor/scalable/apps/im-yahoo.svg
%%DATADIR%%/icons/hicolor/scalable/apps/im-zephyr.svg
-%%DATADIR%%/icons/hicolor/scalable/status/empathy-available.svg
-%%DATADIR%%/icons/hicolor/scalable/status/empathy-away.svg
-%%DATADIR%%/icons/hicolor/scalable/status/empathy-busy.svg
-%%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
+%%DATADIR%%/icons/hicolor/scalable/status/user-available.svg
+%%DATADIR%%/icons/hicolor/scalable/status/user-away.svg
+%%DATADIR%%/icons/hicolor/scalable/status/user-busy.svg
+%%DATADIR%%/icons/hicolor/scalable/status/user-idle.svg
+%%DATADIR%%/icons/hicolor/scalable/status/user-offline.svg
%%DATADIR%%/irc-networks.xml
share/gnome/help/empathy/C/account-irc.page
share/gnome/help/empathy/C/account-jabber.page
@@ -251,6 +257,7 @@ 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/license.page
+share/gnome/help/empathy/C/link-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
@@ -306,6 +313,7 @@ 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/license.page
+share/gnome/help/empathy/ca/link-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
@@ -361,6 +369,7 @@ 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/license.page
+share/gnome/help/empathy/cs/link-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
@@ -416,6 +425,7 @@ 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/license.page
+share/gnome/help/empathy/de/link-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
@@ -471,6 +481,7 @@ 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/license.page
+share/gnome/help/empathy/el/link-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
@@ -526,6 +537,7 @@ 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/license.page
+share/gnome/help/empathy/en_GB/link-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
@@ -581,6 +593,7 @@ 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/license.page
+share/gnome/help/empathy/es/link-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
@@ -636,6 +649,7 @@ 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/license.page
+share/gnome/help/empathy/fi/link-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
@@ -691,6 +705,7 @@ 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/license.page
+share/gnome/help/empathy/fr/link-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
@@ -705,6 +720,118 @@ 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/gl/account-irc.page
+share/gnome/help/empathy/gl/account-jabber.page
+share/gnome/help/empathy/gl/accounts-window.page
+share/gnome/help/empathy/gl/add-account.page
+share/gnome/help/empathy/gl/add-contact.page
+share/gnome/help/empathy/gl/audio-call.page
+share/gnome/help/empathy/gl/audio-video.page
+share/gnome/help/empathy/gl/change-status.page
+share/gnome/help/empathy/gl/create-account.page
+share/gnome/help/empathy/gl/disable-account.page
+share/gnome/help/empathy/gl/favorite-rooms.page
+share/gnome/help/empathy/gl/figures/audio-input-microphone.png
+share/gnome/help/empathy/gl/figures/available.png
+share/gnome/help/empathy/gl/figures/away.png
+share/gnome/help/empathy/gl/figures/busy.png
+share/gnome/help/empathy/gl/figures/camera-web.png
+share/gnome/help/empathy/gl/figures/empathy-logo.png
+share/gnome/help/empathy/gl/figures/empathy-main-window.png
+share/gnome/help/empathy/gl/figures/gtk-add.png
+share/gnome/help/empathy/gl/figures/gtk-edit.png
+share/gnome/help/empathy/gl/figures/gtk-remove.png
+share/gnome/help/empathy/gl/figures/offline.png
+share/gnome/help/empathy/gl/geolocation-not-showing.page
+share/gnome/help/empathy/gl/geolocation-privacy.page
+share/gnome/help/empathy/gl/geolocation-supported.page
+share/gnome/help/empathy/gl/geolocation-turn.page
+share/gnome/help/empathy/gl/geolocation-what-is.page
+share/gnome/help/empathy/gl/geolocation.page
+share/gnome/help/empathy/gl/group-conversations.page
+share/gnome/help/empathy/gl/hide-contacts.page
+share/gnome/help/empathy/gl/import-account.page
+share/gnome/help/empathy/gl/index.page
+share/gnome/help/empathy/gl/introduction.page
+share/gnome/help/empathy/gl/irc-commands.page
+share/gnome/help/empathy/gl/irc-join-pwd.page
+share/gnome/help/empathy/gl/irc-join-room.page
+share/gnome/help/empathy/gl/irc-manage.page
+share/gnome/help/empathy/gl/irc-nick-password.page
+share/gnome/help/empathy/gl/irc-send-file.page
+share/gnome/help/empathy/gl/irc-start-conversation.page
+share/gnome/help/empathy/gl/license.page
+share/gnome/help/empathy/gl/link-contacts.page
+share/gnome/help/empathy/gl/prev-conv.page
+share/gnome/help/empathy/gl/prob-conn-acctdisabled.page
+share/gnome/help/empathy/gl/prob-conn-auth.page
+share/gnome/help/empathy/gl/prob-conn-name.page
+share/gnome/help/empathy/gl/prob-conn-neterror.page
+share/gnome/help/empathy/gl/prob-conn.page
+share/gnome/help/empathy/gl/remove-account.page
+share/gnome/help/empathy/gl/salut-protocol.page
+share/gnome/help/empathy/gl/send-file.page
+share/gnome/help/empathy/gl/send-message.page
+share/gnome/help/empathy/gl/set-custom-status.page
+share/gnome/help/empathy/gl/share-desktop.page
+share/gnome/help/empathy/gl/status-icons.page
+share/gnome/help/empathy/gl/video-call.page
+share/gnome/help/empathy/hu/account-irc.page
+share/gnome/help/empathy/hu/account-jabber.page
+share/gnome/help/empathy/hu/accounts-window.page
+share/gnome/help/empathy/hu/add-account.page
+share/gnome/help/empathy/hu/add-contact.page
+share/gnome/help/empathy/hu/audio-call.page
+share/gnome/help/empathy/hu/audio-video.page
+share/gnome/help/empathy/hu/change-status.page
+share/gnome/help/empathy/hu/create-account.page
+share/gnome/help/empathy/hu/disable-account.page
+share/gnome/help/empathy/hu/favorite-rooms.page
+share/gnome/help/empathy/hu/figures/audio-input-microphone.png
+share/gnome/help/empathy/hu/figures/available.png
+share/gnome/help/empathy/hu/figures/away.png
+share/gnome/help/empathy/hu/figures/busy.png
+share/gnome/help/empathy/hu/figures/camera-web.png
+share/gnome/help/empathy/hu/figures/empathy-logo.png
+share/gnome/help/empathy/hu/figures/empathy-main-window.png
+share/gnome/help/empathy/hu/figures/gtk-add.png
+share/gnome/help/empathy/hu/figures/gtk-edit.png
+share/gnome/help/empathy/hu/figures/gtk-remove.png
+share/gnome/help/empathy/hu/figures/offline.png
+share/gnome/help/empathy/hu/geolocation-not-showing.page
+share/gnome/help/empathy/hu/geolocation-privacy.page
+share/gnome/help/empathy/hu/geolocation-supported.page
+share/gnome/help/empathy/hu/geolocation-turn.page
+share/gnome/help/empathy/hu/geolocation-what-is.page
+share/gnome/help/empathy/hu/geolocation.page
+share/gnome/help/empathy/hu/group-conversations.page
+share/gnome/help/empathy/hu/hide-contacts.page
+share/gnome/help/empathy/hu/import-account.page
+share/gnome/help/empathy/hu/index.page
+share/gnome/help/empathy/hu/introduction.page
+share/gnome/help/empathy/hu/irc-commands.page
+share/gnome/help/empathy/hu/irc-join-pwd.page
+share/gnome/help/empathy/hu/irc-join-room.page
+share/gnome/help/empathy/hu/irc-manage.page
+share/gnome/help/empathy/hu/irc-nick-password.page
+share/gnome/help/empathy/hu/irc-send-file.page
+share/gnome/help/empathy/hu/irc-start-conversation.page
+share/gnome/help/empathy/hu/license.page
+share/gnome/help/empathy/hu/link-contacts.page
+share/gnome/help/empathy/hu/prev-conv.page
+share/gnome/help/empathy/hu/prob-conn-acctdisabled.page
+share/gnome/help/empathy/hu/prob-conn-auth.page
+share/gnome/help/empathy/hu/prob-conn-name.page
+share/gnome/help/empathy/hu/prob-conn-neterror.page
+share/gnome/help/empathy/hu/prob-conn.page
+share/gnome/help/empathy/hu/remove-account.page
+share/gnome/help/empathy/hu/salut-protocol.page
+share/gnome/help/empathy/hu/send-file.page
+share/gnome/help/empathy/hu/send-message.page
+share/gnome/help/empathy/hu/set-custom-status.page
+share/gnome/help/empathy/hu/share-desktop.page
+share/gnome/help/empathy/hu/status-icons.page
+share/gnome/help/empathy/hu/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
@@ -746,6 +873,7 @@ 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/license.page
+share/gnome/help/empathy/it/link-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
@@ -801,6 +929,7 @@ 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/license.page
+share/gnome/help/empathy/ru/link-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
@@ -856,6 +985,7 @@ 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/license.page
+share/gnome/help/empathy/sv/link-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
@@ -870,12 +1000,69 @@ 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/gnome/help/empathy/zh_CN/account-irc.page
+share/gnome/help/empathy/zh_CN/account-jabber.page
+share/gnome/help/empathy/zh_CN/accounts-window.page
+share/gnome/help/empathy/zh_CN/add-account.page
+share/gnome/help/empathy/zh_CN/add-contact.page
+share/gnome/help/empathy/zh_CN/audio-call.page
+share/gnome/help/empathy/zh_CN/audio-video.page
+share/gnome/help/empathy/zh_CN/change-status.page
+share/gnome/help/empathy/zh_CN/create-account.page
+share/gnome/help/empathy/zh_CN/disable-account.page
+share/gnome/help/empathy/zh_CN/favorite-rooms.page
+share/gnome/help/empathy/zh_CN/figures/audio-input-microphone.png
+share/gnome/help/empathy/zh_CN/figures/available.png
+share/gnome/help/empathy/zh_CN/figures/away.png
+share/gnome/help/empathy/zh_CN/figures/busy.png
+share/gnome/help/empathy/zh_CN/figures/camera-web.png
+share/gnome/help/empathy/zh_CN/figures/empathy-logo.png
+share/gnome/help/empathy/zh_CN/figures/empathy-main-window.png
+share/gnome/help/empathy/zh_CN/figures/gtk-add.png
+share/gnome/help/empathy/zh_CN/figures/gtk-edit.png
+share/gnome/help/empathy/zh_CN/figures/gtk-remove.png
+share/gnome/help/empathy/zh_CN/figures/offline.png
+share/gnome/help/empathy/zh_CN/geolocation-not-showing.page
+share/gnome/help/empathy/zh_CN/geolocation-privacy.page
+share/gnome/help/empathy/zh_CN/geolocation-supported.page
+share/gnome/help/empathy/zh_CN/geolocation-turn.page
+share/gnome/help/empathy/zh_CN/geolocation-what-is.page
+share/gnome/help/empathy/zh_CN/geolocation.page
+share/gnome/help/empathy/zh_CN/group-conversations.page
+share/gnome/help/empathy/zh_CN/hide-contacts.page
+share/gnome/help/empathy/zh_CN/import-account.page
+share/gnome/help/empathy/zh_CN/index.page
+share/gnome/help/empathy/zh_CN/introduction.page
+share/gnome/help/empathy/zh_CN/irc-commands.page
+share/gnome/help/empathy/zh_CN/irc-join-pwd.page
+share/gnome/help/empathy/zh_CN/irc-join-room.page
+share/gnome/help/empathy/zh_CN/irc-manage.page
+share/gnome/help/empathy/zh_CN/irc-nick-password.page
+share/gnome/help/empathy/zh_CN/irc-send-file.page
+share/gnome/help/empathy/zh_CN/irc-start-conversation.page
+share/gnome/help/empathy/zh_CN/license.page
+share/gnome/help/empathy/zh_CN/link-contacts.page
+share/gnome/help/empathy/zh_CN/prev-conv.page
+share/gnome/help/empathy/zh_CN/prob-conn-acctdisabled.page
+share/gnome/help/empathy/zh_CN/prob-conn-auth.page
+share/gnome/help/empathy/zh_CN/prob-conn-name.page
+share/gnome/help/empathy/zh_CN/prob-conn-neterror.page
+share/gnome/help/empathy/zh_CN/prob-conn.page
+share/gnome/help/empathy/zh_CN/remove-account.page
+share/gnome/help/empathy/zh_CN/salut-protocol.page
+share/gnome/help/empathy/zh_CN/send-file.page
+share/gnome/help/empathy/zh_CN/send-message.page
+share/gnome/help/empathy/zh_CN/set-custom-status.page
+share/gnome/help/empathy/zh_CN/share-desktop.page
+share/gnome/help/empathy/zh_CN/status-icons.page
+share/gnome/help/empathy/zh_CN/video-call.page
share/icons/hicolor/16x16/apps/empathy.png
share/icons/hicolor/22x22/apps/empathy.png
share/icons/hicolor/24x24/apps/empathy.png
share/icons/hicolor/32x32/apps/empathy.png
share/icons/hicolor/48x48/apps/empathy.png
share/icons/hicolor/scalable/apps/empathy.svg
+share/locale/an/LC_MESSAGES/empathy.mo
share/locale/ar/LC_MESSAGES/empathy.mo
share/locale/as/LC_MESSAGES/empathy.mo
share/locale/ast/LC_MESSAGES/empathy.mo
@@ -911,8 +1098,10 @@ share/locale/he/LC_MESSAGES/empathy.mo
share/locale/hi/LC_MESSAGES/empathy.mo
share/locale/hr/LC_MESSAGES/empathy.mo
share/locale/hu/LC_MESSAGES/empathy.mo
+share/locale/id/LC_MESSAGES/empathy.mo
share/locale/it/LC_MESSAGES/empathy.mo
share/locale/ja/LC_MESSAGES/empathy.mo
+share/locale/kk/LC_MESSAGES/empathy.mo
share/locale/kn/LC_MESSAGES/empathy.mo
share/locale/ko/LC_MESSAGES/empathy.mo
share/locale/ku/LC_MESSAGES/empathy.mo
@@ -926,6 +1115,7 @@ share/locale/ms/LC_MESSAGES/empathy.mo
share/locale/nb/LC_MESSAGES/empathy.mo
share/locale/ne/LC_MESSAGES/empathy.mo
share/locale/nl/LC_MESSAGES/empathy.mo
+share/locale/nn/LC_MESSAGES/empathy.mo
share/locale/oc/LC_MESSAGES/empathy.mo
share/locale/or/LC_MESSAGES/empathy.mo
share/locale/pa/LC_MESSAGES/empathy.mo
@@ -950,15 +1140,23 @@ 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/telepathy/clients/Empathy.AudioVideo.client
+share/telepathy/clients/Empathy.Auth.client
share/telepathy/clients/Empathy.client
@dirrmtry share/telepathy/clients
@dirrmtry share/telepathy
+@dirrm share/gnome/help/empathy/zh_CN/figures
+@dirrm share/gnome/help/empathy/zh_CN
@dirrm share/gnome/help/empathy/sv/figures
@dirrm share/gnome/help/empathy/sv
@dirrm share/gnome/help/empathy/ru/figures
@dirrm share/gnome/help/empathy/ru
@dirrm share/gnome/help/empathy/it/figures
@dirrm share/gnome/help/empathy/it
+@dirrm share/gnome/help/empathy/hu/figures
+@dirrm share/gnome/help/empathy/hu
+@dirrm share/gnome/help/empathy/gl/figures
+@dirrm share/gnome/help/empathy/gl
@dirrm share/gnome/help/empathy/fr/figures
@dirrm share/gnome/help/empathy/fr
@dirrm share/gnome/help/empathy/fi/figures
@@ -1037,3 +1235,5 @@ share/telepathy/clients/Empathy.client
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
new file mode 100644
index 000000000000..dc4484a65f19
--- /dev/null
+++ b/net-im/folks/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for: folks
+# Date created: 23 July 2010
+# Whom: Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/net-im/folks/Makefile,v 1.8 2010/10/26 08:47:55 kwm Exp $
+#
+
+PORTNAME= folks
+PORTVERSION= 0.2.1
+CATEGORIES= net-im
+MASTER_SITES= GNOME
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= library to aggregates people from multiple sources
+
+BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen \
+ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS= gee.2:${PORTSDIR}/devel/libgee \
+ telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
+
+USE_BZIP2= yes
+USE_LDCONFIG= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+PLIST_SUB= VERSION=16
+
+.include <bsd.port.mk>
diff --git a/net-im/folks/distinfo b/net-im/folks/distinfo
new file mode 100644
index 000000000000..240bbf5187cb
--- /dev/null
+++ b/net-im/folks/distinfo
@@ -0,0 +1,3 @@
+MD5 (folks-0.2.1.tar.bz2) = afabe04bd84347e73e9c94eb1b8cf3c1
+SHA256 (folks-0.2.1.tar.bz2) = f8eeeb6a6974416d4db1ab6b18187173fb6ff4ec7830bece379dfba9b25f2a29
+SIZE (folks-0.2.1.tar.bz2) = 465522
diff --git a/net-im/folks/pkg-descr b/net-im/folks/pkg-descr
new file mode 100644
index 000000000000..21280dabf8d6
--- /dev/null
+++ b/net-im/folks/pkg-descr
@@ -0,0 +1,7 @@
+libfolks is a library that aggregates people from multiple sources
+(eg, Telepathy connection managers and eventually evolution data server,
+Facebook, etc.) to create metacontacts. It's written in Vala (in part to
+evaluate Vala). The initial goal is for GObject/C support, though the Vala
+bindings should basically automatic.
+
+WWW: http://telepathy.freedesktop.org/wiki/Folks
diff --git a/net-im/folks/pkg-plist b/net-im/folks/pkg-plist
new file mode 100644
index 000000000000..a9cd7dbadde4
--- /dev/null
+++ b/net-im/folks/pkg-plist
@@ -0,0 +1,27 @@
+bin/folks-import
+include/folks/folks-telepathy.h
+include/folks/folks.h
+lib/folks/%%VERSION%%/backends/key-file/libfolks-backend-key-file.la
+lib/folks/%%VERSION%%/backends/key-file/libfolks-backend-key-file.so
+lib/folks/%%VERSION%%/backends/telepathy/libfolks-backend-telepathy.la
+lib/folks/%%VERSION%%/backends/telepathy/libfolks-backend-telepathy.so
+lib/libfolks-telepathy.la
+lib/libfolks-telepathy.so
+lib/libfolks-telepathy.so.%%VERSION%%
+lib/libfolks.la
+lib/libfolks.so
+lib/libfolks.so.%%VERSION%%
+libdata/pkgconfig/folks-telepathy.pc
+libdata/pkgconfig/folks.pc
+share/vala/vapi/folks-telepathy.deps
+share/vala/vapi/folks-telepathy.vapi
+share/vala/vapi/folks.deps
+share/vala/vapi/folks.vapi
+@dirrmtry share/vala/vapi
+@dirrmtry share/vala
+@dirrm lib/folks/%%VERSION%%/backends/telepathy
+@dirrm lib/folks/%%VERSION%%/backends/key-file
+@dirrm lib/folks/%%VERSION%%/backends
+@dirrm lib/folks/%%VERSION%%
+@dirrm lib/folks
+@dirrm include/folks
diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile
index f34f4d4f6b1e..2b33b745fccc 100644
--- a/net-im/gossip/Makefile
+++ b/net-im/gossip/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gossip
PORTVERSION= 0.31
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-im gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index be55038b6f9a..0461449ba111 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -8,7 +8,7 @@
PORTNAME?= libpurple
PORTVERSION= 2.7.5
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= net-im
MASTER_SITES= SF/pidgin/Pidgin/${PORTVERSION}
DISTNAME= pidgin-${PORTVERSION}
diff --git a/net-im/pino/Makefile b/net-im/pino/Makefile
index e0b086122f72..33169ad2dab6 100644
--- a/net-im/pino/Makefile
+++ b/net-im/pino/Makefile
@@ -22,6 +22,8 @@ LIB_DEPENDS= gee.2:${PORTSDIR}/devel/libgee \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
+BROKEN= Doesn't build with vala-0.10
+
PROJECTHOST= pino-twitter
USE_GNOME= gnomehack intltool libxml2 gtk20 glib20
USE_GETTEXT= yes
diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index ee1a464b64b8..a102210d672e 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -3,10 +3,10 @@
# Whom: Florent Thoumie <flz@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net-im/telepathy-gabble/Makefile,v 1.5 2009/01/08 07:03:21 marcus Exp $
+# $MCom: ports/net-im/telepathy-gabble/Makefile,v 1.10 2010/11/14 16:18:09 marcus Exp $
PORTNAME= telepathy-gabble
-PORTVERSION= 0.8.14
+PORTVERSION= 0.10.4
CATEGORIES= net-im
MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
@@ -15,13 +15,16 @@ COMMENT= Jabber Connection Manager for Telepathy Framework
LIB_PC_DEPENDS= gobject-2.0.pc:${PORTSDIR}/devel/glib20 \
dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib \
+ nice.pc:${PORTSDIR}/net-im/libnice \
+ uuid.pc:${PORTSDIR}/misc/e2fsprogs-libuuid \
telepathy-glib.pc:${PORTSDIR}/net-im/telepathy-glib \
loudmouth-1.0.pc:${PORTSDIR}/net-im/loudmouth
BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
-LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \
+ sqlite3.8:${PORTSDIR}/databases/sqlite3
RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
GNU_CONFIGURE= yes
diff --git a/net-im/telepathy-gabble/distinfo b/net-im/telepathy-gabble/distinfo
index 17a1d3b07f23..7f77130ac4aa 100644
--- a/net-im/telepathy-gabble/distinfo
+++ b/net-im/telepathy-gabble/distinfo
@@ -1,3 +1,2 @@
-MD5 (telepathy-gabble-0.8.14.tar.gz) = 0114937c1664c6b76b8cd983f24c2089
-SHA256 (telepathy-gabble-0.8.14.tar.gz) = 71a1bb38478c8e5b831531036980ba46d157fc072226e11c8624e8c395a682d1
-SIZE (telepathy-gabble-0.8.14.tar.gz) = 1519190
+SHA256 (telepathy-gabble-0.10.4.tar.gz) = abdf07e833b934fa7cd0c9e34894a11da037adf03a4fdde4dc7818ed990a662c
+SIZE (telepathy-gabble-0.10.4.tar.gz) = 2936168
diff --git a/net-im/telepathy-gabble/files/patch-Makefile.in b/net-im/telepathy-gabble/files/patch-Makefile.in
index 911ee27c5cf6..6e8234229f1c 100644
--- a/net-im/telepathy-gabble/files/patch-Makefile.in
+++ b/net-im/telepathy-gabble/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig 2009-03-12 20:41:53.000000000 -0400
-+++ Makefile.in 2009-03-12 20:41:59.000000000 -0400
-@@ -203,7 +203,7 @@ top_build_prefix = @top_build_prefix@
+--- Makefile.in.orig 2010-09-18 17:29:38.000000000 +0000
++++ Makefile.in 2010-09-18 17:29:53.000000000 +0000
+@@ -267,7 +267,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = docs tools extensions lib src data m4 tests
-+SUBDIRS = docs tools extensions lib src data m4
- DISTCHECK_CONFIGURE_FLAGS = --disable-debug
+-SUBDIRS = docs tools extensions lib src data m4 plugins tests gabble
++SUBDIRS = docs tools extensions lib src data m4 plugins gabble
+ DISTCHECK_CONFIGURE_FLAGS = --disable-debug --enable-gtk-doc
CLEANFILES = FIXME.out
LCOV_CHECK_ARGS = CHECK_TWISTED_SLEEP=6
diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_asyncns.c b/net-im/telepathy-gabble/files/patch-lib_gibber_asyncns.c
deleted file mode 100644
index ff3bb3733f37..000000000000
--- a/net-im/telepathy-gabble/files/patch-lib_gibber_asyncns.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/gibber/asyncns.c.orig 2009-03-08 13:01:42.000000000 -0400
-+++ lib/gibber/asyncns.c 2009-03-08 13:02:06.000000000 -0400
-@@ -35,6 +35,7 @@
- #include <errno.h>
- #include <sys/wait.h>
- #include <sys/types.h>
-+#include <sys/resource.h>
- #include <pwd.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-fd-transport.h b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-fd-transport.h
deleted file mode 100644
index 8cf86b314b6d..000000000000
--- a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-fd-transport.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/gibber/gibber-fd-transport.h.orig 2009-01-08 01:53:58.000000000 -0500
-+++ lib/gibber/gibber-fd-transport.h 2009-01-08 01:54:11.000000000 -0500
-@@ -23,7 +23,9 @@
-
- #include <glib-object.h>
-
-+#include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <netdb.h>
-
- #include "gibber-transport.h"
diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-resolver.c b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-resolver.c
deleted file mode 100644
index 6d20d57dc734..000000000000
--- a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-resolver.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/gibber/gibber-resolver.c.orig 2009-03-15 02:48:07.000000000 -0400
-+++ lib/gibber/gibber-resolver.c 2009-03-15 02:48:53.000000000 -0400
-@@ -735,7 +735,9 @@ gibber_resolver_gai_error_to_g_error (in
- break;
-
- case EAI_MEMORY:
-+#ifdef EAI_OVERFLOW
- case EAI_OVERFLOW:
-+#endif
- code = GIBBER_RESOLVER_ERROR_MEMORY;
- break;
-
diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c
index 79aaa44ec998..c055de832675 100644
--- a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c
+++ b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c
@@ -1,116 +1,181 @@
---- lib/gibber/gibber-unix-transport.c.orig 2009-06-02 23:56:27.000000000 -0400
-+++ lib/gibber/gibber-unix-transport.c 2009-06-03 00:13:18.000000000 -0400
-@@ -200,11 +200,12 @@ gibber_unix_transport_send_credentials (
- gsize size)
- {
- int fd, ret;
-- struct ucred *cred;
- struct msghdr msg;
-- struct cmsghdr *ch;
- struct iovec iov;
-- char buffer[CMSG_SPACE (sizeof (struct ucred))];
+--- lib/gibber/gibber-unix-transport.c.orig 2010-06-09 16:09:58.000000000 +0000
++++ lib/gibber/gibber-unix-transport.c 2010-09-18 21:24:44.000000000 +0000
+@@ -375,6 +375,167 @@ gibber_unix_transport_recv_credentials (
+ return TRUE;
+ }
+
++/* End Linux part */
++#elif defined(__FreeBSD__)
++
++gboolean
++gibber_unix_transport_send_credentials (GibberUnixTransport *transport,
++ const guint8 *data,
++ gsize size)
++{
++ int fd, ret;
++ struct msghdr msg;
++ struct iovec iov;
+ union {
-+ struct cmsghdr hdr;
-+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
++ struct cmsghdr hdr;
++ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
+ } cmsg;
-
- DEBUG ("send credentials");
- fd = GIBBER_FD_TRANSPORT (transport)->fd;
-@@ -217,19 +218,12 @@ gibber_unix_transport_send_credentials (
- memset (&msg, 0, sizeof msg);
- msg.msg_iov = &iov;
- msg.msg_iovlen = 1;
-- msg.msg_control = buffer;
-- msg.msg_controllen = sizeof (buffer);
--
-- /* Set the credentials */
-- ch = CMSG_FIRSTHDR (&msg);
-- ch->cmsg_len = CMSG_LEN (sizeof (struct ucred));
-- ch->cmsg_level = SOL_SOCKET;
-- ch->cmsg_type = SCM_CREDENTIALS;
--
-- cred = (struct ucred *) CMSG_DATA (ch);
-- cred->pid = getpid ();
-- cred->uid = getuid ();
-- cred->gid = getgid ();
++
++ DEBUG ("send credentials");
++ fd = GIBBER_FD_TRANSPORT (transport)->fd;
++
++ /* Set the message payload */
++ memset (&iov, 0, sizeof (iov));
++ iov.iov_base = (void *) data;
++ iov.iov_len = size;
++
++ memset (&msg, 0, sizeof (msg));
++ msg.msg_iov = &iov;
++ msg.msg_iovlen = 1;
+ msg.msg_control = (caddr_t) &cmsg;
+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+ memset (&cmsg, 0, sizeof (cmsg));
+ cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
+ cmsg.hdr.cmsg_level = SOL_SOCKET;
+ cmsg.hdr.cmsg_type = SCM_CREDS;
-
- ret = sendmsg (fd, &msg, 0);
- if (ret == -1)
-@@ -256,9 +250,11 @@ gibber_unix_transport_read (GibberFdTran
- GibberBuffer buf;
- struct iovec iov;
- struct msghdr msg;
-- char control[CMSG_SPACE (sizeof (struct ucred))];
-- struct cmsghdr *ch;
-- struct ucred *cred;
++
++ ret = sendmsg (fd, &msg, 0);
++ if (ret == -1)
++ {
++ DEBUG ("sendmsg failed: %s", g_strerror (errno));
++ return FALSE;
++ }
++
++ return TRUE;
++}
++
++gboolean
++gibber_unix_transport_recv_credentials (GibberUnixTransport *self,
++ GibberUnixTransportRecvCredentialsCb callback,
++ gpointer user_data)
++{
++ GibberUnixTransportPrivate *priv = GIBBER_UNIX_TRANSPORT_GET_PRIVATE (self);
++
++ if (priv->recv_creds_cb != NULL)
++ {
++ DEBUG ("already waiting for credentials");
++ return FALSE;
++ }
++
++ priv->recv_creds_cb = callback;
++ priv->recv_creds_data = user_data;
++ return TRUE;
++}
++
++gboolean
++gibber_unix_transport_supports_credentials (void)
++{
++ return TRUE;
++}
++
++#define BUFSIZE 1024
++
++static GibberFdIOResult
++gibber_unix_transport_read (GibberFdTransport *transport,
++ GIOChannel *channel,
++ GError **error)
++{
++ GibberUnixTransport *self = GIBBER_UNIX_TRANSPORT (transport);
++ GibberUnixTransportPrivate *priv = GIBBER_UNIX_TRANSPORT_GET_PRIVATE (self);
++ int fd;
++ guint8 buffer[BUFSIZE];
++ ssize_t bytes_read;
++ GibberBuffer buf;
++ struct iovec iov;
++ struct msghdr msg;
+ struct cmsgcred *cred;
+ union {
-+ struct cmsghdr hdr;
-+ char cred[CMSG_SPACE (sizeof *cred)];
++ struct cmsghdr hdr;
++ char cred[CMSG_SPACE (sizeof *cred)];
+ } cmsg;
- int opt;
-
- if (priv->recv_creds_cb == NULL)
-@@ -268,8 +264,10 @@ gibber_unix_transport_read (GibberFdTran
- fd = transport->fd;
-
- /* set SO_PASSCRED flag */
-+#ifdef SO_PASSCRED
- opt = 1;
- setsockopt (fd, SOL_SOCKET, SO_PASSCRED, &opt, sizeof (opt));
-+#endif
-
- memset (buffer, 0, sizeof (buffer));
- memset (&iov, 0, sizeof (iov));
-@@ -279,8 +277,8 @@ gibber_unix_transport_read (GibberFdTran
- memset (&msg, 0, sizeof (msg));
- msg.msg_iov = &iov;
- msg.msg_iovlen = 1;
-- msg.msg_control = control;
-- msg.msg_controllen = sizeof (control);
++ int opt;
++
++ if (priv->recv_creds_cb == NULL)
++ return gibber_fd_transport_read (transport, channel, error);
++
++ /* We are waiting for credentials */
++ fd = transport->fd;
++
++ memset (buffer, 0, sizeof (buffer));
++ memset (&iov, 0, sizeof (iov));
++ iov.iov_base = buffer;
++ iov.iov_len = sizeof (buffer);
++
++ memset (&msg, 0, sizeof (msg));
++ msg.msg_iov = &iov;
++ msg.msg_iovlen = 1;
+ msg.msg_control = (caddr_t) &cmsg;
+ msg.msg_controllen = CMSG_SPACE (sizeof *cred);
-
- bytes_read = recvmsg (fd, &msg, 0);
-
-@@ -300,15 +298,17 @@ gibber_unix_transport_read (GibberFdTran
- }
-
- /* unset SO_PASSCRED flag */
-+#ifdef SO_PASSCRED
- opt = 0;
- setsockopt (fd, SOL_SOCKET, SO_PASSCRED, &opt, sizeof (opt));
-+#endif
-
- buf.data = buffer;
- buf.length = bytes_read;
-
- /* extract the credentials */
-- ch = CMSG_FIRSTHDR (&msg);
-- if (ch == NULL)
++
++ bytes_read = recvmsg (fd, &msg, 0);
++
++ if (bytes_read == -1)
++ {
++ GError *err = NULL;
++
++ g_set_error_literal (&err, G_IO_CHANNEL_ERROR,
++ g_io_channel_error_from_errno (errno), "recvmsg failed");
++
++ priv->recv_creds_cb (self, NULL, NULL, err, priv->recv_creds_data);
++ g_propagate_error (error, err);
++
++ priv->recv_creds_cb = NULL;
++ priv->recv_creds_data = NULL;
++ return GIBBER_FD_IO_RESULT_ERROR;
++ }
++
++ buf.data = buffer;
++ buf.length = bytes_read;
++
++ /* extract the credentials */
+ if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof *cred) ||
+ cmsg.hdr.cmsg_type != SCM_CREDS)
- {
- GError *err = NULL;
-
-@@ -325,10 +325,10 @@ gibber_unix_transport_read (GibberFdTran
- {
- GibberCredentials credentials;
-
-- cred = (struct ucred *) CMSG_DATA (ch);
-- credentials.pid = cred->pid;
-- credentials.uid = cred->uid;
-- credentials.gid = cred->gid;
++ {
++ GError *err = NULL;
++
++ DEBUG ("Message doesn't contain credentials");
++
++ g_set_error_literal (&err, GIBBER_UNIX_TRANSPORT_ERROR,
++ GIBBER_UNIX_TRANSPORT_ERROR_NO_CREDENTIALS,
++ "no credentials received");
++
++ priv->recv_creds_cb (self, &buf, NULL, err, priv->recv_creds_data);
++ g_error_free (err);
++ }
++ else
++ {
++ GibberCredentials credentials;
++
+ cred = (struct cmsgcred *) CMSG_DATA (&cmsg.hdr);
+ credentials.pid = cred->cmcred_pid;
+ credentials.uid = cred->cmcred_uid;
+ credentials.gid = cred->cmcred_gid;
++
++ priv->recv_creds_cb (self, &buf, &credentials, NULL,
++ priv->recv_creds_data);
++ }
++
++ priv->recv_creds_cb = NULL;
++ priv->recv_creds_data = NULL;
++ return GIBBER_FD_IO_RESULT_SUCCESS;
++}
++
++/* End FreeBSD part */
+ #else /* OSs where we have no implementation */
- priv->recv_creds_cb (self, &buf, &credentials, NULL,
- priv->recv_creds_data);
+ gboolean
+@@ -393,9 +554,7 @@ gibber_unix_transport_recv_credentials (
+ }
+
+ gboolean
+-gibber_unix_transport_send_credentials (GibberUnixTransport *transport,
+- const guint8 *data,
+- gsize size)
++gibber_unix_transport_send_credentials (void)
+ {
+ DEBUG ("stub implementation, failing");
+ return FALSE;
diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-util.h b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-util.h
deleted file mode 100644
index e690611c3af5..000000000000
--- a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-util.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/gibber/gibber-util.h.orig 2009-01-08 01:55:08.000000000 -0500
-+++ lib/gibber/gibber-util.h 2009-01-08 01:56:05.000000000 -0500
-@@ -20,6 +20,9 @@
- #ifndef __GIBBER_UTIL_H__
- #define __GIBBER_UTIL_H__
-
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
- #include <netdb.h>
-
- #include <glib.h>
diff --git a/net-im/telepathy-gabble/files/patch-src_bytestream-socks5.c b/net-im/telepathy-gabble/files/patch-src_bytestream-socks5.c
deleted file mode 100644
index 07bf4c2ab63c..000000000000
--- a/net-im/telepathy-gabble/files/patch-src_bytestream-socks5.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bytestream-socks5.c.orig 2009-01-08 01:57:01.000000000 -0500
-+++ src/bytestream-socks5.c 2009-01-08 01:57:20.000000000 -0500
-@@ -21,6 +21,8 @@
- #include "config.h"
- #include "bytestream-socks5.h"
-
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <arpa/inet.h>
- #include <errno.h>
- #include <fcntl.h>
diff --git a/net-im/telepathy-gabble/files/patch-src_jingle-factory.c b/net-im/telepathy-gabble/files/patch-src_jingle-factory.c
deleted file mode 100644
index 6f75e4951b3a..000000000000
--- a/net-im/telepathy-gabble/files/patch-src_jingle-factory.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/jingle-factory.c.orig 2009-03-08 13:03:05.000000000 -0400
-+++ src/jingle-factory.c 2009-03-08 13:04:05.000000000 -0400
-@@ -20,6 +20,10 @@
-
- #include "jingle-factory.h"
-
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/net-im/telepathy-gabble/files/patch-src_tube-stream.c b/net-im/telepathy-gabble/files/patch-src_tube-stream.c
deleted file mode 100644
index 9118a52ade02..000000000000
--- a/net-im/telepathy-gabble/files/patch-src_tube-stream.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/tube-stream.c.orig 2008-01-17 01:49:11.000000000 -0500
-+++ src/tube-stream.c 2008-01-17 01:49:22.000000000 -0500
-@@ -24,6 +24,7 @@
- #include <time.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <sys/un.h>
- #include <unistd.h>
- #include <fcntl.h>
diff --git a/net-im/telepathy-gabble/pkg-plist b/net-im/telepathy-gabble/pkg-plist
index fff4ba5c0364..2bd653be6e31 100644
--- a/net-im/telepathy-gabble/pkg-plist
+++ b/net-im/telepathy-gabble/pkg-plist
@@ -1,4 +1,6 @@
libexec/telepathy-gabble
+lib/telepathy/gabble-0/gateways.la
+lib/telepathy/gabble-0/gateways.so
share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.gabble.service
%%DOCSDIR%%/muc-bytestream.html
%%DOCSDIR%%/olpc.html
@@ -8,3 +10,5 @@ share/telepathy/managers/gabble.manager
@dirrmtry share/telepathy/managers
@dirrmtry share/telepathy
@dirrm %%DOCSDIR%%
+@dirrm lib/telepathy/gabble-0
+@dirrmtry lib/telepathy
diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index e43c712f3c1b..1a36953a3750 100644
--- a/net-im/telepathy-glib/Makefile
+++ b/net-im/telepathy-glib/Makefile
@@ -3,10 +3,10 @@
# Whom: Florent Thoumie <flz@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net-im/telepathy-glib/Makefile,v 1.4 2008/03/20 02:57:19 marcus Exp $
+# $MCom: ports/net-im/telepathy-glib/Makefile,v 1.15 2010/10/21 17:35:24 kwm Exp $
PORTNAME= telepathy-glib
-PORTVERSION= 0.10.7
+PORTVERSION= 0.12.1
CATEGORIES= net-im
MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
@@ -16,10 +16,13 @@ COMMENT= GLib utility library for the Telepathy framework
LIB_PC_DEPENDS= gobject-2.0.pc:${PORTSDIR}/devel/glib20 \
dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
-BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \
+ vapigen-0.10:${PORTSDIR}/lang/vala-vapigen \
+ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
-RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
+RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} \
+ vapigen-0.10:${PORTSDIR}/lang/vala-vapigen
USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
@@ -27,9 +30,12 @@ USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig glib20 ltverhack
USE_PYTHON_BUILD= yes
MAKE_JOBS_UNSAFE= yes
+CONFIGURE_ARGS= --enable-vala-bindings
post-patch:
@${REINPLACE_CMD} -e 's|\(^pkgconfigdir =\).*|\1 ${PREFIX}/libdata/pkgconfig|' \
${WRKSRC}/telepathy-glib/Makefile.in
+ @${REINPLACE_CMD} -e 's|datarootdir)/vala/vapi|datarootdir)/vala-0.10/vapi|g' \
+ ${WRKSRC}/vala/Makefile.in
.include <bsd.port.mk>
diff --git a/net-im/telepathy-glib/distinfo b/net-im/telepathy-glib/distinfo
index cb5657f2669d..e1c9e5bd7893 100644
--- a/net-im/telepathy-glib/distinfo
+++ b/net-im/telepathy-glib/distinfo
@@ -1,3 +1,3 @@
-MD5 (telepathy-glib-0.10.7.tar.gz) = 811c375416bc4f0fab4b870eb936ded4
-SHA256 (telepathy-glib-0.10.7.tar.gz) = 92b0de059ff3bcec08d16fe31456aecd8fe8f5973504e1ac45b28fed8b41307a
-SIZE (telepathy-glib-0.10.7.tar.gz) = 2090298
+MD5 (telepathy-glib-0.12.1.tar.gz) = b3c0e84b7f1f0709dfd8eed56455a80d
+SHA256 (telepathy-glib-0.12.1.tar.gz) = 3ae79c7664766c8217c44e1ed8e1e91655983f704713dff6e4e1747abc3440e3
+SIZE (telepathy-glib-0.12.1.tar.gz) = 2554755
diff --git a/net-im/telepathy-glib/pkg-plist b/net-im/telepathy-glib/pkg-plist
index 3058eed4ae39..6295b7ff9285 100644
--- a/net-im/telepathy-glib/pkg-plist
+++ b/net-im/telepathy-glib/pkg-plist
@@ -1,4 +1,5 @@
include/telepathy-1.0/telepathy-glib/_gen/error-str.h
+include/telepathy-1.0/telepathy-glib/_gen/genums.h
include/telepathy-1.0/telepathy-glib/_gen/gtypes.h
include/telepathy-1.0/telepathy-glib/_gen/telepathy-enums.h
include/telepathy-1.0/telepathy-glib/_gen/telepathy-interfaces.h
@@ -15,6 +16,7 @@ include/telepathy-1.0/telepathy-glib/_gen/tp-cli-dbus-daemon.h
include/telepathy-1.0/telepathy-glib/_gen/tp-cli-generic.h
include/telepathy-1.0/telepathy-glib/_gen/tp-cli-media-session-handler.h
include/telepathy-1.0/telepathy-glib/_gen/tp-cli-media-stream-handler.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-cli-protocol.h
include/telepathy-1.0/telepathy-glib/_gen/tp-svc-account-manager.h
include/telepathy-1.0/telepathy-glib/_gen/tp-svc-account.h
include/telepathy-1.0/telepathy-glib/_gen/tp-svc-channel-dispatch-operation.h
@@ -28,10 +30,18 @@ include/telepathy-1.0/telepathy-glib/_gen/tp-svc-debug.h
include/telepathy-1.0/telepathy-glib/_gen/tp-svc-generic.h
include/telepathy-1.0/telepathy-glib/_gen/tp-svc-media-session-handler.h
include/telepathy-1.0/telepathy-glib/_gen/tp-svc-media-stream-handler.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-svc-protocol.h
+include/telepathy-1.0/telepathy-glib/_gen/tp-svc-tls-cert.h
+include/telepathy-1.0/telepathy-glib/account-channel-request.h
include/telepathy-1.0/telepathy-glib/account-manager.h
include/telepathy-1.0/telepathy-glib/account.h
+include/telepathy-1.0/telepathy-glib/add-dispatch-operation-context.h
+include/telepathy-1.0/telepathy-glib/base-channel.h
+include/telepathy-1.0/telepathy-glib/base-client.h
include/telepathy-1.0/telepathy-glib/base-connection-manager.h
include/telepathy-1.0/telepathy-glib/base-connection.h
+include/telepathy-1.0/telepathy-glib/base-protocol.h
+include/telepathy-1.0/telepathy-glib/capabilities.h
include/telepathy-1.0/telepathy-glib/channel-dispatch-operation.h
include/telepathy-1.0/telepathy-glib/channel-dispatcher.h
include/telepathy-1.0/telepathy-glib/channel-factory-iface.h
@@ -54,8 +64,10 @@ include/telepathy-1.0/telepathy-glib/defs.h
include/telepathy-1.0/telepathy-glib/enums.h
include/telepathy-1.0/telepathy-glib/errors.h
include/telepathy-1.0/telepathy-glib/exportable-channel.h
+include/telepathy-1.0/telepathy-glib/gnio-util.h
include/telepathy-1.0/telepathy-glib/group-mixin.h
include/telepathy-1.0/telepathy-glib/gtypes.h
+include/telepathy-1.0/telepathy-glib/handle-channels-context.h
include/telepathy-1.0/telepathy-glib/handle-repo-dynamic.h
include/telepathy-1.0/telepathy-glib/handle-repo-static.h
include/telepathy-1.0/telepathy-glib/handle-repo.h
@@ -65,11 +77,16 @@ include/telepathy-1.0/telepathy-glib/interfaces.h
include/telepathy-1.0/telepathy-glib/intset.h
include/telepathy-1.0/telepathy-glib/media-interfaces.h
include/telepathy-1.0/telepathy-glib/message-mixin.h
+include/telepathy-1.0/telepathy-glib/observe-channels-context.h
include/telepathy-1.0/telepathy-glib/presence-mixin.h
include/telepathy-1.0/telepathy-glib/properties-mixin.h
+include/telepathy-1.0/telepathy-glib/protocol.h
include/telepathy-1.0/telepathy-glib/proxy-subclass.h
include/telepathy-1.0/telepathy-glib/proxy.h
include/telepathy-1.0/telepathy-glib/run.h
+include/telepathy-1.0/telepathy-glib/simple-approver.h
+include/telepathy-1.0/telepathy-glib/simple-handler.h
+include/telepathy-1.0/telepathy-glib/simple-observer.h
include/telepathy-1.0/telepathy-glib/svc-account-manager.h
include/telepathy-1.0/telepathy-glib/svc-account.h
include/telepathy-1.0/telepathy-glib/svc-channel-dispatch-operation.h
@@ -83,15 +100,20 @@ include/telepathy-1.0/telepathy-glib/svc-debug.h
include/telepathy-1.0/telepathy-glib/svc-generic.h
include/telepathy-1.0/telepathy-glib/svc-media-interfaces.h
include/telepathy-1.0/telepathy-glib/svc-properties-interface.h
+include/telepathy-1.0/telepathy-glib/svc-protocol.h
+include/telepathy-1.0/telepathy-glib/svc-tls.h
include/telepathy-1.0/telepathy-glib/telepathy-glib.h
include/telepathy-1.0/telepathy-glib/text-mixin.h
include/telepathy-1.0/telepathy-glib/util.h
include/telepathy-1.0/telepathy-glib/verify.h
+lib/girepository-1.0/TelepathyGLib-0.12.typelib
lib/libtelepathy-glib.a
lib/libtelepathy-glib.la
lib/libtelepathy-glib.so
lib/libtelepathy-glib.so.0
libdata/pkgconfig/telepathy-glib.pc
+share/gir-1.0/TelepathyGLib-0.12.gir
+share/gtk-doc/html/telepathy-glib/TpBaseChannel.html
share/gtk-doc/html/telepathy-glib/TpBaseConnection.html
share/gtk-doc/html/telepathy-glib/TpBaseConnectionManager.html
share/gtk-doc/html/telepathy-glib/TpChannelFactoryIface.html
@@ -100,6 +122,7 @@ share/gtk-doc/html/telepathy-glib/TpChannelManager.html
share/gtk-doc/html/telepathy-glib/TpExportableChannel.html
share/gtk-doc/html/telepathy-glib/TpDynamicHandleRepo.html
share/gtk-doc/html/telepathy-glib/TpStaticHandleRepo.html
+share/gtk-doc/html/telepathy-glib/annotation-glossary.html
share/gtk-doc/html/telepathy-glib/ch-client.html
share/gtk-doc/html/telepathy-glib/ch-dbus.html
share/gtk-doc/html/telepathy-glib/ch-protocol.html
@@ -116,14 +139,20 @@ share/gtk-doc/html/telepathy-glib/style.css
share/gtk-doc/html/telepathy-glib/telepathy-glib-TpContactsMixin.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-TpGroupMixin.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-TpHeap.html
-share/gtk-doc/html/telepathy-glib/telepathy-glib-TpIntSet.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-TpIntset.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-TpMessageMixin.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-TpPresenceMixin.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-TpPropertiesMixin.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-TpTextMixin.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-account-channel-request.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-add-dispatch-operation-context.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-asv.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-account-manager.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-account.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-base-client.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-base-protocol.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-capabilities.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-contactsearch.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-dispatch-operation.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-dispatcher.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-file-transfer.html
@@ -135,11 +164,17 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-text.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-tube.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-tubes.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-channel.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-anonymity.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-service-point.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-client.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-aliasing.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-avatars.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-balance.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-caps.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-cellular.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-contact-info.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-contacts.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-location.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-manager.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-presence.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-requests.html
@@ -154,19 +189,28 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-debug.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-defs.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-errors.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-gnio-util.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-gtypes.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-handle-channels-context.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-handle-repo.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-handle.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-interfaces.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-media-interfaces.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-observe-channels-context.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-protocol.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy-dbus-core.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy-subclass.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy-tp-properties.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-run.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-approver.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-handler.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-observer.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-account-manager.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-account.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-anonymity.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-contactlist.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-contactsearch.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-dispatch-operation.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-dispatcher.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-file-transfer.html
@@ -184,14 +228,21 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-connection.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-debug.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-generic.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-media-interfaces.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-service-point.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-tls.html
+share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-protocol.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-svc.html
share/gtk-doc/html/telepathy-glib/telepathy-glib-util.html
share/gtk-doc/html/telepathy-glib/telepathy-glib.devhelp
share/gtk-doc/html/telepathy-glib/telepathy-glib.devhelp2
share/gtk-doc/html/telepathy-glib/up.png
+share/vala-0.10/vapi/telepathy-glib.deps
+share/vala-0.10/vapi/telepathy-glib.vapi
@dirrm share/gtk-doc/html/telepathy-glib
@dirrmtry share/gtk-doc/html
@dirrmtry share/gtk-doc
@dirrm include/telepathy-1.0/telepathy-glib/_gen
@dirrm include/telepathy-1.0/telepathy-glib
@dirrmtry include/telepathy-1.0
+@dirrmtry lib/girepository-1.0
+@dirrmtry share/gir-1.0
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
new file mode 100644
index 000000000000..1691f790f21d
--- /dev/null
+++ b/net-im/telepathy-logger/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for: telepathy-logger
+# Date created: 23 July 2010
+# Whom: Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/net-im/telepathy-logger/Makefile,v 1.3 2010/09/01 23:50:23 avl Exp $
+
+PORTNAME= telepathy-logger
+PORTVERSION= 0.1.5
+PORTREVISION= 1
+CATEGORIES= net-im
+MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Logger utility library for the Telepathy framework
+
+BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+ xml2.5:${PORTSDIR}/textproc/libxml2 \
+ telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
+ sqlite3.8:${PORTSDIR}/databases/sqlite3
+
+USE_BZIP2= yes
+USE_AUTOTOOLS= libtool:22
+USE_GMAKE= yes
+USE_LDCONFIG= yes
+USE_GNOME= gnomehack pkgconfig glib20 intltool gnomedocutils ltverhack
+USE_PYTHON_BUILD= yes
+#MAKE_JOBS_UNSAFE= yes
+GLIB_SCHEMAS= org.freedesktop.Telepathy.Logger.gschema.xml
+
+#post-patch:
+# @${REINPLACE_CMD} -e 's|\(^pkgconfigdir =\).*|\1 ${PREFIX}/libdata/pkgconfig|' \
+# ${WRKSRC}/telepathy-glib/Makefile.in
+
+.include <bsd.port.mk>
diff --git a/net-im/telepathy-logger/distinfo b/net-im/telepathy-logger/distinfo
new file mode 100644
index 000000000000..7bc4e3f9c6bd
--- /dev/null
+++ b/net-im/telepathy-logger/distinfo
@@ -0,0 +1,3 @@
+MD5 (telepathy-logger-0.1.5.tar.bz2) = 6e41a5c6b323a337085b9519ac557fb7
+SHA256 (telepathy-logger-0.1.5.tar.bz2) = 0b2e4f402531a607c5322c2fbcd0fd61a96f6b933c726430dafefa03f580bec8
+SIZE (telepathy-logger-0.1.5.tar.bz2) = 448552
diff --git a/net-im/telepathy-logger/files/patch-configure b/net-im/telepathy-logger/files/patch-configure
new file mode 100644
index 000000000000..ce4c818f908c
--- /dev/null
+++ b/net-im/telepathy-logger/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig 2010-08-18 14:48:05.000000000 +0200
++++ configure 2010-08-18 14:49:13.000000000 +0200
+@@ -13281,8 +13281,8 @@
+ .SECONDARY: $(gsettings_SCHEMAS)
+
+ gsettings__base_list = \
+- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
++ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
+
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ @$(NORMAL_INSTALL)
diff --git a/net-im/telepathy-logger/pkg-descr b/net-im/telepathy-logger/pkg-descr
new file mode 100644
index 000000000000..9d04383569a1
--- /dev/null
+++ b/net-im/telepathy-logger/pkg-descr
@@ -0,0 +1,3 @@
+Logger utility library for the Teleparthy framwork.
+
+WWW: http://telepathy.freedesktop.org/
diff --git a/net-im/telepathy-logger/pkg-plist b/net-im/telepathy-logger/pkg-plist
new file mode 100644
index 000000000000..983770d4dd69
--- /dev/null
+++ b/net-im/telepathy-logger/pkg-plist
@@ -0,0 +1,35 @@
+include/telepathy-logger-0.1/telepathy-logger/entity.h
+include/telepathy-logger-0.1/telepathy-logger/entry-text.h
+include/telepathy-logger-0.1/telepathy-logger/entry.h
+include/telepathy-logger-0.1/telepathy-logger/log-manager.h
+include/telepathy-logger-0.1/telepathy-logger/telepathy-logger.h
+lib/libtelepathy-logger.a
+lib/libtelepathy-logger.la
+lib/libtelepathy-logger.so
+lib/libtelepathy-logger.so.1
+libdata/pkgconfig/telepathy-logger-0.1.pc
+libexec/telepathy-logger
+share/dbus-1/services/org.freedesktop.Telepathy.Client.Logger.service
+share/dbus-1/services/org.freedesktop.Telepathy.Logger.service
+share/gtk-doc/html/telepathy-logger/TplEntry.html
+share/gtk-doc/html/telepathy-logger/TplEntryText.html
+share/gtk-doc/html/telepathy-logger/ch-public.html
+share/gtk-doc/html/telepathy-logger/home.png
+share/gtk-doc/html/telepathy-logger/index.html
+share/gtk-doc/html/telepathy-logger/index.sgml
+share/gtk-doc/html/telepathy-logger/left.png
+share/gtk-doc/html/telepathy-logger/right.png
+share/gtk-doc/html/telepathy-logger/style.css
+share/gtk-doc/html/telepathy-logger/telepathy-logger-TplEntity.html
+share/gtk-doc/html/telepathy-logger/telepathy-logger-TplLogManager.html
+share/gtk-doc/html/telepathy-logger/telepathy-logger.devhelp
+share/gtk-doc/html/telepathy-logger/telepathy-logger.devhelp2
+share/gtk-doc/html/telepathy-logger/up.png
+share/telepathy/clients/Logger.client
+@dirrmtry share/telepathy/clients
+@dirrmtry share/telepathy
+@dirrm share/gtk-doc/html/telepathy-logger
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
+@dirrm include/telepathy-logger-0.1/telepathy-logger
+@dirrm include/telepathy-logger-0.1
diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index 672083f7eb46..1647eed92fe5 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -3,10 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.11 2010/04/23 17:01:23 marcus Exp $
+# $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.14 2010/09/22 12:13:31 avl Exp $
PORTNAME= telepathy-mission-control
-PORTVERSION= 5.3.2
+PORTVERSION= 5.6.0
+PORTREVISION= 1
CATEGORIES= net-im devel
MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-mission-control/
@@ -23,7 +24,7 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE=yes
-MAN1= mc-account-convert.1 mc-tool.1 mc-wait-for-name.1
+MAN1= mc-tool.1 mc-wait-for-name.1
MAN8= mission-control-5.8
PLIST_SUB= VERSION=${PORTVERSION}
diff --git a/net-im/telepathy-mission-control/distinfo b/net-im/telepathy-mission-control/distinfo
index 4ea4a99ec00d..ef1dc6a2146c 100644
--- a/net-im/telepathy-mission-control/distinfo
+++ b/net-im/telepathy-mission-control/distinfo
@@ -1,3 +1,3 @@
-MD5 (telepathy-mission-control-5.3.2.tar.gz) = 4aca1025905c23bdcc2e6a55d69644e3
-SHA256 (telepathy-mission-control-5.3.2.tar.gz) = a1bf76add06f3938a939d9c296eb6b90df77bac7819ca583df313e954bf52d2a
-SIZE (telepathy-mission-control-5.3.2.tar.gz) = 1112677
+MD5 (telepathy-mission-control-5.6.0.tar.gz) = 597f693cd506c2a800153c36082b29cb
+SHA256 (telepathy-mission-control-5.6.0.tar.gz) = 9423dffaf35826d34028c2f4b3ddc8d34099d04b4f2579d59ae6726b6c4d876e
+SIZE (telepathy-mission-control-5.6.0.tar.gz) = 1298241
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
deleted file mode 100644
index c599bea27191..000000000000
--- a/net-im/telepathy-mission-control/files/patch-util_mc-tool.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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 00187ce891ec..2185201acab3 100644
--- a/net-im/telepathy-mission-control/pkg-plist
+++ b/net-im/telepathy-mission-control/pkg-plist
@@ -1,72 +1,46 @@
-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/libmcclient/mc-svc-client.h
-lib/libmcclient.a
-lib/libmcclient.la
-lib/libmcclient.so
-lib/libmcclient-%%VERSION%%.so
-libdata/pkgconfig/libmcclient.pc
+include/mission-control-5.5/mission-control-plugins/account-storage.h
+include/mission-control-5.5/mission-control-plugins/account.h
+include/mission-control-5.5/mission-control-plugins/dbus-acl.h
+include/mission-control-5.5/mission-control-plugins/dispatch-operation-policy.h
+include/mission-control-5.5/mission-control-plugins/dispatch-operation.h
+include/mission-control-5.5/mission-control-plugins/loader.h
+include/mission-control-5.5/mission-control-plugins/mcp-signals-marshal.h
+include/mission-control-5.5/mission-control-plugins/mission-control-plugins.h
+include/mission-control-5.5/mission-control-plugins/request-policy.h
+include/mission-control-5.5/mission-control-plugins/request.h
+lib/libmission-control-plugins.a
+lib/libmission-control-plugins.la
+lib/libmission-control-plugins.so
+lib/libmission-control-plugins.so.0
+libdata/pkgconfig/mission-control-plugins.pc
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
-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/McdProxy.html
-share/doc/libmissioncontrol-server/McdService.html
-share/doc/libmissioncontrol-server/ch01.html
-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-connection.html
-share/doc/libmissioncontrol-server/libmissioncontrol-server-mcd-debug.html
-share/doc/libmissioncontrol-server/libmissioncontrol-server-mcd-dispatcher-context.html
-share/doc/libmissioncontrol-server/libmissioncontrol-server-mcd-enum-types.html
-share/doc/libmissioncontrol-server/libmissioncontrol-server.devhelp
-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
-@dirrm share/doc/libmissioncontrol-server
-@dirrm share/doc/libmcclient
-@dirrm include/libmcclient/_gen
-@dirrm include/libmcclient
+share/doc/mission-control-plugins/McpAccountStorage.html
+share/doc/mission-control-plugins/McpDispatchOperation.html
+share/doc/mission-control-plugins/McpDispatchOperationPolicy.html
+share/doc/mission-control-plugins/McpRequest.html
+share/doc/mission-control-plugins/McpRequestPolicy.html
+share/doc/mission-control-plugins/api-index-full.html
+share/doc/mission-control-plugins/ch01.html
+share/doc/mission-control-plugins/ch02.html
+share/doc/mission-control-plugins/ch03.html
+share/doc/mission-control-plugins/ch04.html
+share/doc/mission-control-plugins/home.png
+share/doc/mission-control-plugins/index.html
+share/doc/mission-control-plugins/index.sgml
+share/doc/mission-control-plugins/left.png
+share/doc/mission-control-plugins/mission-control-plugins-Plugin-loader-and-global-functions.html
+share/doc/mission-control-plugins/mission-control-plugins-account.html
+share/doc/mission-control-plugins/mission-control-plugins.devhelp
+share/doc/mission-control-plugins/mission-control-plugins.devhelp2
+share/doc/mission-control-plugins/object-tree.html
+share/doc/mission-control-plugins/right.png
+share/doc/mission-control-plugins/style.css
+share/doc/mission-control-plugins/up.png
+@dirrm share/doc/mission-control-plugins
+@dirrm include/mission-control-5.5/mission-control-plugins
+@dirrm include/mission-control-5.5
+@dirrmtry lib/mission-control-plugins.0
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 67550fe0d980..79bf8139da9f 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/net/avahi-app/Makefile,v 1.1 2009/04/20 23:42:18 marcus Exp $
+# $MCom: ports/net/avahi-app/Makefile,v 1.14 2010/10/23 20:58:29 marcus Exp $
#
PORTNAME= avahi
-PORTVERSION= 0.6.27
-PORTREVISION?= 2
+PORTVERSION= 0.6.28
+PORTREVISION?= 0
CATEGORIES?= net dns
MASTER_SITES= http://www.avahi.org/download/
PKGNAMESUFFIX?= -app
@@ -36,8 +36,7 @@ CONFIGURE_ARGS?=--with-distro=freebsd \
--disable-doxygen-doc \
--disable-doxygen-dot \
--localstatedir=/var \
- --enable-compat-howl \
- --disable-gtk3
+ --enable-compat-howl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_KQUEUE" \
LDFLAGS="-L${LOCALBASE}/lib" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
@@ -73,6 +72,11 @@ CONFIGURE_ARGS+=--enable-gtk
.else
CONFIGURE_ARGS+=--disable-gtk
.endif
+.if ${AVAHI_SLAVE}=="gtk3"
+CONFIGURE_ARGS+=--enable-gtk3
+.else
+CONFIGURE_ARGS+=--disable-gtk3
+.endif
.if ${AVAHI_SLAVE}=="libdns"
CONFIGURE_ARGS+=--enable-compat-libdns_sd
.else
@@ -161,7 +165,7 @@ avahi-post-install:
fi
.endfor
${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \
- ${LOCALBASE}/share/dbus-1/system-services
+ ${LOCALBASE}/share/dbus-1/system-services
.if !defined(PACKAGE_BUILDING) && (${AVAHI_SLAVE}=="no" || ${AVAHI_SLAVE}=="autoipd")
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif
diff --git a/net/avahi-app/distinfo b/net/avahi-app/distinfo
index 9a4d7d82c031..0ca2bc46b28b 100644
--- a/net/avahi-app/distinfo
+++ b/net/avahi-app/distinfo
@@ -1,3 +1,3 @@
-MD5 (avahi-0.6.27.tar.gz) = 74b40f87aeab07fc77af25f725b32f04
-SHA256 (avahi-0.6.27.tar.gz) = c22df5e0b0d695bfe3cc52545bf0affc1c52060818a5a65d70055e320bc45e84
-SIZE (avahi-0.6.27.tar.gz) = 1217974
+MD5 (avahi-0.6.28.tar.gz) = d0143a5aa3265019072e53ab497818d0
+SHA256 (avahi-0.6.28.tar.gz) = a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91
+SIZE (avahi-0.6.28.tar.gz) = 1238660
diff --git a/net/avahi-app/pkg-plist b/net/avahi-app/pkg-plist
index 1edb8825ad2f..a30b159102ae 100644
--- a/net/avahi-app/pkg-plist
+++ b/net/avahi-app/pkg-plist
@@ -121,6 +121,7 @@ share/gir-1.0/AvahiCore-0.6.gir
share/locale/bg/LC_MESSAGES/avahi.mo
share/locale/ca/LC_MESSAGES/avahi.mo
share/locale/cs/LC_MESSAGES/avahi.mo
+share/locale/da/LC_MESSAGES/avahi.mo
share/locale/de/LC_MESSAGES/avahi.mo
share/locale/el/LC_MESSAGES/avahi.mo
share/locale/en_AU/LC_MESSAGES/avahi.mo
@@ -129,9 +130,12 @@ share/locale/en_GB/LC_MESSAGES/avahi.mo
share/locale/en_NZ/LC_MESSAGES/avahi.mo
share/locale/es/LC_MESSAGES/avahi.mo
share/locale/fi/LC_MESSAGES/avahi.mo
+share/locale/fo/LC_MESSAGES/avahi.mo
share/locale/fr/LC_MESSAGES/avahi.mo
share/locale/gl/LC_MESSAGES/avahi.mo
+share/locale/he/LC_MESSAGES/avahi.mo
share/locale/hu/LC_MESSAGES/avahi.mo
+share/locale/id/LC_MESSAGES/avahi.mo
share/locale/it/LC_MESSAGES/avahi.mo
share/locale/ja/LC_MESSAGES/avahi.mo
share/locale/ms/LC_MESSAGES/avahi.mo
@@ -140,6 +144,7 @@ share/locale/pl/LC_MESSAGES/avahi.mo
share/locale/pt_BR/LC_MESSAGES/avahi.mo
share/locale/ro/LC_MESSAGES/avahi.mo
share/locale/ru/LC_MESSAGES/avahi.mo
+share/locale/sl/LC_MESSAGES/avahi.mo
share/locale/sr/LC_MESSAGES/avahi.mo
share/locale/sv/LC_MESSAGES/avahi.mo
share/locale/sr@latin/LC_MESSAGES/avahi.mo
@@ -148,6 +153,8 @@ share/locale/zh_CN/LC_MESSAGES/avahi.mo
share/locale/zh_TW/LC_MESSAGES/avahi.mo
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/fo/LC_MESSAGES
+@dirrmtry share/locale/fo
@dirrmtry share/locale/en_NZ/LC_MESSAGES
@dirrmtry share/locale/en_NZ
@dirrm %%DATADIR%%
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 508c244fb9b4..b69cc5256f55 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/avahi/Makefile,v 1.26 2007/09/09 22:45:27 mezz Exp $
+# $MCom: ports/net/avahi/Makefile,v 1.28 2010/10/23 20:58:28 marcus Exp $
#
PORTNAME= avahi
-PORTVERSION= 0.6.27
+PORTVERSION= 0.6.28
PORTREVISION?= 0
CATEGORIES?= net dns
MASTER_SITES= # empty
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index e95e478a80f0..e1d5e19f892b 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ekiga
PORTVERSION= 2.0.11
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/ekiga3/files/patch-configure b/net/ekiga3/files/patch-configure
new file mode 100644
index 000000000000..79bfbea51ed0
--- /dev/null
+++ b/net/ekiga3/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig 2010-08-28 15:04:35.000000000 -0400
++++ configure 2010-08-28 15:05:31.000000000 -0400
+@@ -17255,7 +17255,7 @@ if test -n "$PKG_CONFIG"; then
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_NOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" 2>/dev/null`
++ pkg_cv_NOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" "gtk+-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -17273,7 +17273,7 @@ if test -n "$PKG_CONFIG"; then
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_NOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" 2>/dev/null`
++ pkg_cv_NOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" "gtk+-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
diff --git a/net/ekiga3/files/patch-lib_engine_components_libnotify_libnotify-main.cpp b/net/ekiga3/files/patch-lib_engine_components_libnotify_libnotify-main.cpp
new file mode 100644
index 000000000000..a6ac603c4ef4
--- /dev/null
+++ b/net/ekiga3/files/patch-lib_engine_components_libnotify_libnotify-main.cpp
@@ -0,0 +1,10 @@
+--- lib/engine/components/libnotify/libnotify-main.cpp.orig 2010-08-28 15:04:11.000000000 -0400
++++ lib/engine/components/libnotify/libnotify-main.cpp 2010-08-28 15:01:22.000000000 -0400
+@@ -38,6 +38,7 @@
+ #include <map>
+ #include <tr1/memory>
+
++#include <gtk/gtk.h>
+ #include <libnotify/notify.h>
+
+ #include "services.h"
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 8670bbc40347..1a67a2f3b5e1 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/gnome-netstatus/Makefile,v 1.56 2010/04/01 16:16:57 kwm Exp $
+# $MCom: ports/net/gnome-netstatus/Makefile,v 1.58 2010/09/29 12:35:14 kwm Exp $
#
PORTNAME= gnome-netstatus
-PORTVERSION= 2.28.1
-PORTREVISION= 1
+PORTVERSION= 2.28.2
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo
index f2ab01fcae52..4ddfb1c00fd6 100644
--- a/net/gnome-netstatus/distinfo
+++ b/net/gnome-netstatus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-netstatus-2.28.1.tar.bz2) = 8ecc95396c9d1c7d963a7f232ca370f8
-SHA256 (gnome2/gnome-netstatus-2.28.1.tar.bz2) = 9e6bb618283d2c96afd7365f998b415a7ee9539957fcf8bd4cd58cf8e877a335
-SIZE (gnome2/gnome-netstatus-2.28.1.tar.bz2) = 572012
+MD5 (gnome2/gnome-netstatus-2.28.2.tar.bz2) = 9ce64074ed64e2c94a9ea4499749508c
+SHA256 (gnome2/gnome-netstatus-2.28.2.tar.bz2) = d1ad0a668a1344898d4f47b5591adddc7791edb6c2e92136ebcf8d278d959119
+SIZE (gnome2/gnome-netstatus-2.28.2.tar.bz2) = 585336
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
index 874acacb75f2..72e45c2b3ffa 100644
--- a/net/gnome-netstatus/pkg-plist
+++ b/net/gnome-netstatus/pkg-plist
@@ -215,6 +215,7 @@ share/locale/el/LC_MESSAGES/gnome-netstatus.mo
share/locale/en@shaw/LC_MESSAGES/gnome-netstatus.mo
share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo
share/locale/en_GB/LC_MESSAGES/gnome-netstatus.mo
+share/locale/eo/LC_MESSAGES/gnome-netstatus.mo
share/locale/es/LC_MESSAGES/gnome-netstatus.mo
share/locale/et/LC_MESSAGES/gnome-netstatus.mo
share/locale/eu/LC_MESSAGES/gnome-netstatus.mo
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 601aa0eb2a4e..54dacf22cd79 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.55 2010/04/01 16:28:19 kwm Exp $
+# $MCom: ports/net/gnome-nettool/Makefile,v 1.58 2010/09/28 09:03:44 kwm Exp $
#
PORTNAME= gnome-nettool
-PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTVERSION= 2.32.0
PORTEPOCH= 1
CATEGORIES= net gnome
MASTER_SITES= GNOME
@@ -21,6 +20,7 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop
USE_BZIP2= yes
USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
+GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index e008c15021a6..ba2a3d9fdba0 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-nettool-2.30.0.tar.bz2) = 2087259219cf16d434c52b4a5710b4c7
-SHA256 (gnome2/gnome-nettool-2.30.0.tar.bz2) = 42fdc867d26b31145986fd99e06509229b118430f2d666070c5dac7cff1dd000
-SIZE (gnome2/gnome-nettool-2.30.0.tar.bz2) = 651732
+MD5 (gnome2/gnome-nettool-2.32.0.tar.bz2) = af5436deb30ccfb3f6a1f8ea5602c40d
+SHA256 (gnome2/gnome-nettool-2.32.0.tar.bz2) = 8c70f85952760170114b2fa4be3ccaa3fc6298f802bacda2503ed482b8a0539c
+SIZE (gnome2/gnome-nettool-2.32.0.tar.bz2) = 647036
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index c0c67a307737..f358bc3f8dd7 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -1,6 +1,5 @@
bin/gnome-nettool
share/applications/gnome-nettool.desktop
-%%DATADIR%%/dialogs/gnome-nettool.ui
%%DATADIR%%/pixmaps/16_ethernet.xpm
%%DATADIR%%/pixmaps/16_loopback.xpm
%%DATADIR%%/pixmaps/16_plip.xpm
@@ -9,6 +8,7 @@ share/applications/gnome-nettool.desktop
%%DATADIR%%/pixmaps/irda-16.png
%%DATADIR%%/pixmaps/network.png
%%DATADIR%%/pixmaps/wavelan-16.png
+%%DATADIR%%/ui/gnome-nettool.ui
share/gnome/help/gnome-nettool/C/gnome-nettool.xml
share/gnome/help/gnome-nettool/C/legal.xml
share/gnome/help/gnome-nettool/ca/gnome-nettool.xml
@@ -153,8 +153,8 @@ share/pixmaps/gnome-nettool.png
@dirrm share/gnome/help/gnome-nettool/ca
@dirrm share/gnome/help/gnome-nettool/C
@dirrm share/gnome/help/gnome-nettool
+@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/dialogs
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index a26f98cb2717..7f34d5fb50ab 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.3 2010/06/24 07:55:55 kwm Exp $
+# $MCom: ports/net/libgweather/Makefile,v 1.42 2010/09/27 14:03:30 kwm Exp $
#
PORTNAME= libgweather
-PORTVERSION= 2.30.2
-PORTREVISION= 1
+PORTVERSION= 2.30.3
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/libgweather/distinfo b/net/libgweather/distinfo
index c81de304d034..a69597ad04c8 100644
--- a/net/libgweather/distinfo
+++ b/net/libgweather/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgweather-2.30.2.tar.bz2) = 050f4ed212261c2a147c89012d5daa90
-SHA256 (libgweather-2.30.2.tar.bz2) = dd98545cd4aaa2a856e62c9cc7822baf8d5f54bd277fd56ed8de6728dd61e312
-SIZE (libgweather-2.30.2.tar.bz2) = 7452039
+MD5 (libgweather-2.30.3.tar.bz2) = bf6a0a05051341ecb250f332e3edfb88
+SHA256 (libgweather-2.30.3.tar.bz2) = b835374661423f37c46aa8e37368ae24a68856f117b7c21e475a21efdba5264c
+SIZE (libgweather-2.30.3.tar.bz2) = 7449487
diff --git a/net/libgweather/pkg-plist b/net/libgweather/pkg-plist
index 29fa4ba9bbb4..9fe57249803a 100644
--- a/net/libgweather/pkg-plist
+++ b/net/libgweather/pkg-plist
@@ -460,6 +460,7 @@ share/icons/gnome/scalable/status/weather-few-clouds-night-350.svg
%%DATADIR%%/Locations.te.xml
%%DATADIR%%/Locations.th.xml
%%DATADIR%%/Locations.tr.xml
+%%DATADIR%%/Locations.ug.xml
%%DATADIR%%/Locations.uk.xml
%%DATADIR%%/Locations.vi.xml
%%DATADIR%%/Locations.xml
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 6de36777f183..00a132f3fc9b 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -7,6 +7,7 @@
PORTNAME= liferea
PORTVERSION= 1.6.5
+PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= SF/${PORTNAME}/Liferea%20Stable/${PORTVERSION}
@@ -16,7 +17,7 @@ COMMENT= Simple RSS/RDF feed reader
LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \
webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
-USE_GNOME= gnomeprefix gnomehack libglade2
+USE_GNOME= gnomeprefix gnomehack libglade2 gconf2
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index 154ce5ca56e5..8ba7c7c58a31 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.5 2010/07/25 00:14:30 marcus Exp $
+# $MCom: ports/net/vinagre/Makefile,v 1.42 2010/09/29 14:23:36 kwm Exp $
#
PORTNAME= vinagre
-PORTVERSION= 2.30.2
-PORTREVISION= 3
+PORTVERSION= 2.30.3
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
index c34d4e90f159..bfc51c2974dc 100644
--- a/net/vinagre/distinfo
+++ b/net/vinagre/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vinagre-2.30.2.tar.bz2) = 2483369947e7914b5ac2aae8200f6452
-SHA256 (gnome2/vinagre-2.30.2.tar.bz2) = 478b58ad9eb4a02fad45134bdddc29dc986d8c14e203a47b88aa7f3e6d1bf388
-SIZE (gnome2/vinagre-2.30.2.tar.bz2) = 2424224
+MD5 (gnome2/vinagre-2.30.3.tar.bz2) = adfa70f0fab9171d01f4c4cd4ede9e90
+SHA256 (gnome2/vinagre-2.30.3.tar.bz2) = 28bfc70a816bc3f1e71ada82e260c39ee2dac693cb7859323b06c8b1452a39f4
+SIZE (gnome2/vinagre-2.30.3.tar.bz2) = 2447388
diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist
index 4dcdd7cc677e..e104951d7936 100644
--- a/net/vinagre/pkg-plist
+++ b/net/vinagre/pkg-plist
@@ -214,6 +214,7 @@ share/locale/hu/LC_MESSAGES/vinagre.mo
share/locale/id/LC_MESSAGES/vinagre.mo
share/locale/it/LC_MESSAGES/vinagre.mo
share/locale/ja/LC_MESSAGES/vinagre.mo
+share/locale/kk/LC_MESSAGES/vinagre.mo
share/locale/kn/LC_MESSAGES/vinagre.mo
share/locale/ko/LC_MESSAGES/vinagre.mo
share/locale/ku/LC_MESSAGES/vinagre.mo
@@ -223,6 +224,7 @@ 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
+share/locale/ms/LC_MESSAGES/vinagre.mo
share/locale/nb/LC_MESSAGES/vinagre.mo
share/locale/nl/LC_MESSAGES/vinagre.mo
share/locale/nn/LC_MESSAGES/vinagre.mo
@@ -345,6 +347,8 @@ share/vinagre-1/plugins/vnc/vnc.ui
@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/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 5ce473bc91d5..09a045e0ea62 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,12 +3,11 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $MCom: ports/net/vino/Makefile,v 1.78 2010/04/01 15:02:57 kwm Exp $
+# $MCom: ports/net/vino/Makefile,v 1.81 2010/09/27 13:51:24 kwm Exp $
#
PORTNAME= vino
-PORTVERSION= 2.28.2
-PORTREVISION= 2
+PORTVERSION= 2.32.0
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,7 +16,8 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= VNC server that allows for remote access to your GNOME desktop
LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \
- unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+ telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
+ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/net/vino/distinfo b/net/vino/distinfo
index 80e7fccad5ae..008989d14fd2 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vino-2.28.2.tar.bz2) = 7b7fcd23925efb628da2d2f12d73b485
-SHA256 (gnome2/vino-2.28.2.tar.bz2) = f2a0b7c77fe58f3918b202a9f0f4ae3295518ac43eeceade0875b096038a72e0
-SIZE (gnome2/vino-2.28.2.tar.bz2) = 795208
+MD5 (gnome2/vino-2.32.0.tar.bz2) = e43a40dc3a1ad81ce6d417c237b68875
+SHA256 (gnome2/vino-2.32.0.tar.bz2) = 00446f52eb03893be9d69dadbb3899b58676c122f33db670f46dc19e4a7d3d6d
+SIZE (gnome2/vino-2.32.0.tar.bz2) = 855538
diff --git a/net/vino/files/patch-configure b/net/vino/files/patch-configure
index 7d5508317db8..9d64aa9f6476 100644
--- a/net/vino/files/patch-configure
+++ b/net/vino/files/patch-configure
@@ -1,11 +1,11 @@
--- configure.orig 2010-04-01 16:50:38.000000000 +0200
+++ configure 2010-04-01 16:50:38.000000000 +0200
-@@ -15144,6 +15144,8 @@
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -15991,6 +15991,8 @@ if test "x$ac_cv_header_ifaddrs_h" = "xy
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
- #include <ifaddrs.h>
++ #include <sys/types.h>
++ #include <sys/socket.h>
+ #include <ifaddrs.h>
+ #include <net/if.h>
- int
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index 524f06d7884d..88337ff4a238 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -3,7 +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/dbus-1/services/org.freedesktop.Telepathy.Client.Vino.service
share/locale/ar/LC_MESSAGES/vino.mo
share/locale/as/LC_MESSAGES/vino.mo
share/locale/ast/LC_MESSAGES/vino.mo
@@ -25,6 +25,7 @@ share/locale/el/LC_MESSAGES/vino.mo
share/locale/en@shaw/LC_MESSAGES/vino.mo
share/locale/en_CA/LC_MESSAGES/vino.mo
share/locale/en_GB/LC_MESSAGES/vino.mo
+share/locale/eo/LC_MESSAGES/vino.mo
share/locale/es/LC_MESSAGES/vino.mo
share/locale/et/LC_MESSAGES/vino.mo
share/locale/eu/LC_MESSAGES/vino.mo
@@ -42,6 +43,7 @@ share/locale/id/LC_MESSAGES/vino.mo
share/locale/it/LC_MESSAGES/vino.mo
share/locale/ja/LC_MESSAGES/vino.mo
share/locale/ka/LC_MESSAGES/vino.mo
+share/locale/kk/LC_MESSAGES/vino.mo
share/locale/kn/LC_MESSAGES/vino.mo
share/locale/ko/LC_MESSAGES/vino.mo
share/locale/ku/LC_MESSAGES/vino.mo
@@ -85,10 +87,13 @@ 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
+share/telepathy/clients/Vino.client
%%DATADIR%%/vino-preferences.ui
%%DATADIR%%/vino-prompt.ui
%%DATADIR%%/webservices
@dirrm %%DATADIR%%
+@dirrmtry share/telepathy/clients
+@dirrmtry share/telepathy
@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@@ -112,6 +117,8 @@ share/locale/zh_TW/LC_MESSAGES/vino.mo
@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/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/ports-mgmt/gnome-packagekit/Makefile b/ports-mgmt/gnome-packagekit/Makefile
index 24dc2ae9408e..7130c43b1165 100644
--- a/ports-mgmt/gnome-packagekit/Makefile
+++ b/ports-mgmt/gnome-packagekit/Makefile
@@ -3,10 +3,10 @@
# Whom: Anders F Bjorklund <afb@users.sourceforge.net>
#
# $FreeBSD$
-# $MCom: ports-stable/ports-mgmt/gnome-packagekit/Makefile,v 1.1 2010/07/21 15:21:03 kwm Exp $
+# $MCom: ports/ports-mgmt/gnome-packagekit/Makefile,v 1.19 2010/10/04 20:40:36 kwm Exp $
PORTNAME= gnome-packagekit
-PORTVERSION= 2.30.3
+PORTVERSION= 2.32.0
CATEGORIES= ports-mgmt sysutils gnome
MASTER_SITES= GNOME
@@ -18,7 +18,7 @@ LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
packagekit-glib2.14:${PORTSDIR}/ports-mgmt/packagekit \
notify:${PORTSDIR}/devel/libnotify \
unique-1.0:${PORTSDIR}/x11-toolkits/unique \
- devkit-power-gobject.1:${PORTSDIR}/sysutils/upower \
+ upower-glib.1:${PORTSDIR}/sysutils/upower \
canberra-gtk.0:${PORTSDIR}/audio/libcanberra
USE_GMAKE= yes
diff --git a/ports-mgmt/gnome-packagekit/distinfo b/ports-mgmt/gnome-packagekit/distinfo
index dc31a1d7c879..2f29304695ef 100644
--- a/ports-mgmt/gnome-packagekit/distinfo
+++ b/ports-mgmt/gnome-packagekit/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-packagekit-2.30.3.tar.bz2) = 865675fb52f131083e76f97c9a630def
-SHA256 (gnome-packagekit-2.30.3.tar.bz2) = 2fd9e49d0b538dac7223c170119507fdf5e896aa27683a9b886aef74e13651b1
-SIZE (gnome-packagekit-2.30.3.tar.bz2) = 3595882
+MD5 (gnome-packagekit-2.32.0.tar.bz2) = 56a8535ca4e10f6bfaf6092de774859e
+SHA256 (gnome-packagekit-2.32.0.tar.bz2) = bc68dad11e5c9db89dcd2548a29736456063b38aa99633f9cfc4427a77a4525e
+SIZE (gnome-packagekit-2.32.0.tar.bz2) = 3638533
diff --git a/ports-mgmt/gnome-packagekit/pkg-plist b/ports-mgmt/gnome-packagekit/pkg-plist
index fbe981a8c2ad..ea5c21c23489 100644
--- a/ports-mgmt/gnome-packagekit/pkg-plist
+++ b/ports-mgmt/gnome-packagekit/pkg-plist
@@ -425,6 +425,7 @@ share/locale/pt/LC_MESSAGES/gnome-packagekit.mo
share/locale/pt_BR/LC_MESSAGES/gnome-packagekit.mo
share/locale/ro/LC_MESSAGES/gnome-packagekit.mo
share/locale/ru/LC_MESSAGES/gnome-packagekit.mo
+share/locale/sk/LC_MESSAGES/gnome-packagekit.mo
share/locale/sl/LC_MESSAGES/gnome-packagekit.mo
share/locale/sr/LC_MESSAGES/gnome-packagekit.mo
share/locale/sr@latin/LC_MESSAGES/gnome-packagekit.mo
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index 018a9f0ca3bd..db617ec7662c 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -3,10 +3,10 @@
# Whom: Anders F Bjorklund <afb@users.sourceforge.net>
#
# $FreeBSD$
-# $MCom: ports/ports-mgmt/packagekit/Makefile,v 1.20 2010/04/07 04:53:37 marcus Exp $
+# $MCom: ports/ports-mgmt/packagekit/Makefile,v 1.26 2010/10/10 15:49:51 marcus Exp $
PORTNAME= PackageKit
-PORTVERSION= 0.6.7
+PORTVERSION= 0.6.9
PORTREVISION?= 0
CATEGORIES= ports-mgmt sysutils
MASTER_SITES= http://www.packagekit.org/releases/
@@ -108,7 +108,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|girepositry|girepository|g' \
${WRKSRC}/lib/packagekit-glib2/Makefile.in
@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
- '/xsltproc/s|.xsl [$$]? &> /dev|.xsl $$? > /dev|g'
+ '/xsltproc/s|.xsl [$$]? &> /dev|.xsl $$? > /dev|g'
post-install:
.if !defined(SLAVEPORT)
diff --git a/ports-mgmt/packagekit/distinfo b/ports-mgmt/packagekit/distinfo
index 36db7655f0dd..806b472438ec 100644
--- a/ports-mgmt/packagekit/distinfo
+++ b/ports-mgmt/packagekit/distinfo
@@ -1,3 +1,3 @@
-MD5 (PackageKit-0.6.7.tar.gz) = 869d779f4e2158904fb4e479eaa1d33c
-SHA256 (PackageKit-0.6.7.tar.gz) = 2d05c5db73bd41a0cad11b7034e3d8c5639598aadba60e119f7ef2cb57c1c0fb
-SIZE (PackageKit-0.6.7.tar.gz) = 9412065
+MD5 (PackageKit-0.6.9.tar.gz) = 187a9b44b0bd8d98cc19e36ca00be5a1
+SHA256 (PackageKit-0.6.9.tar.gz) = 9d1e96184c4f6cce65368fe64d6fb73ca2301a0bae46ac4b048446300a0908e0
+SIZE (PackageKit-0.6.9.tar.gz) = 9458058
diff --git a/ports-mgmt/packagekit/pkg-plist b/ports-mgmt/packagekit/pkg-plist
index 9c33c7d44e2f..b2dd2ceb7154 100644
--- a/ports-mgmt/packagekit/pkg-plist
+++ b/ports-mgmt/packagekit/pkg-plist
@@ -10,6 +10,8 @@ etc/PackageKit/CommandNotFound.conf
etc/PackageKit/PackageKit.conf
@exec [ -f %B/PackageKit.conf ] || cp %B/%f %B/PackageKit.conf
etc/PackageKit/Vendor.conf
+etc/PackageKit/events/post-transaction.d/README
+etc/PackageKit/events/pre-transaction.d/README
etc/bash_completion.d/pk-completion.bash
etc/cron.daily/packagekit-background.cron
etc/dbus-1/system.d/org.freedesktop.PackageKit.conf
@@ -275,38 +277,38 @@ share/dbus-1/system-services/org.freedesktop.PackageKit.service
share/gir-1.0/PackageKitGlib-1.0.gir
share/gtk-doc/html/PackageKit/PackageKit-egg-debug.html
share/gtk-doc/html/PackageKit/PackageKit-pk-bitfield.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-catalog.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-category.html
share/gtk-doc/html/PackageKit/PackageKit-pk-client-sync.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-client.html
share/gtk-doc/html/PackageKit/PackageKit-pk-common.html
share/gtk-doc/html/PackageKit/PackageKit-pk-control-sync.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-control.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-desktop.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-details.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-distro-upgrade.html
share/gtk-doc/html/PackageKit/PackageKit-pk-enum.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-error.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-eula-required.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-files.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-media-change-required.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-message.html
share/gtk-doc/html/PackageKit/PackageKit-pk-package-id.html
share/gtk-doc/html/PackageKit/PackageKit-pk-package-ids.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-package-sack.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-package.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-progress.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-repo-detail.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-repo-signature-required.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-require-restart.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-results.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-service-pack.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-task.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-transaction-past.html
-share/gtk-doc/html/PackageKit/PackageKit-pk-update-detail.html
share/gtk-doc/html/PackageKit/PackageKit.devhelp
share/gtk-doc/html/PackageKit/PackageKit.devhelp2
share/gtk-doc/html/PackageKit/PackageKit.html
+share/gtk-doc/html/PackageKit/PkCatalog.html
+share/gtk-doc/html/PackageKit/PkCategory.html
+share/gtk-doc/html/PackageKit/PkClient.html
+share/gtk-doc/html/PackageKit/PkControl.html
+share/gtk-doc/html/PackageKit/PkDesktop.html
+share/gtk-doc/html/PackageKit/PkDetails.html
+share/gtk-doc/html/PackageKit/PkDistroUpgrade.html
+share/gtk-doc/html/PackageKit/PkError.html
+share/gtk-doc/html/PackageKit/PkEulaRequired.html
+share/gtk-doc/html/PackageKit/PkFiles.html
+share/gtk-doc/html/PackageKit/PkMediaChangeRequired.html
+share/gtk-doc/html/PackageKit/PkMessage.html
+share/gtk-doc/html/PackageKit/PkPackage.html
+share/gtk-doc/html/PackageKit/PkPackageSack.html
+share/gtk-doc/html/PackageKit/PkProgress.html
+share/gtk-doc/html/PackageKit/PkRepoDetail.html
+share/gtk-doc/html/PackageKit/PkRepoSignatureRequired.html
+share/gtk-doc/html/PackageKit/PkRequireRestart.html
+share/gtk-doc/html/PackageKit/PkResults.html
+share/gtk-doc/html/PackageKit/PkServicePack.html
+share/gtk-doc/html/PackageKit/PkTask.html
+share/gtk-doc/html/PackageKit/PkTransactionPast.html
+share/gtk-doc/html/PackageKit/PkUpdateDetail.html
share/gtk-doc/html/PackageKit/Transaction.html
share/gtk-doc/html/PackageKit/api-reference.html
share/gtk-doc/html/PackageKit/backend-compiled.html
@@ -369,6 +371,7 @@ share/locale/it/LC_MESSAGES/PackageKit.mo
share/locale/ja/LC_MESSAGES/PackageKit.mo
share/locale/kn/LC_MESSAGES/PackageKit.mo
share/locale/ko/LC_MESSAGES/PackageKit.mo
+share/locale/lt/LC_MESSAGES/PackageKit.mo
share/locale/ml/LC_MESSAGES/PackageKit.mo
share/locale/mr/LC_MESSAGES/PackageKit.mo
share/locale/ms/LC_MESSAGES/PackageKit.mo
@@ -436,6 +439,9 @@ share/polkit-1/actions/org.freedesktop.packagekit.policy
@dirrmtry etc/sysconfig
@dirrmtry etc/profile.d
@dirrmtry etc/cron.daily
+@dirrmtry etc/PackageKit/events/post-transaction.d
+@dirrmtry etc/PackageKit/events/pre-transaction.d
+@dirrmtry etc/PackageKit/events
@dirrmtry etc/PackageKit
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 0c53ff354fab..6684a24827be 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -3,11 +3,11 @@
# Whom: jseger@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/print/freetype2/Makefile,v 1.22 2010/03/16 19:33:10 mezz Exp $
+# $MCom: ports/print/freetype2/Makefile,v 1.26 2010/10/14 09:17:24 kwm Exp $
#
PORTNAME= freetype2
-PORTVERSION= 2.4.2
+PORTVERSION= 2.4.3
CATEGORIES= print
MASTER_SITES= SF/freetype/${PORTNAME}/${PORTVERSION} \
http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \
@@ -61,7 +61,7 @@ pre-patch:
${WRKSRC}/builds/unix/install.mk
pre-configure:
- @${REINPLACE_CMD} -e '/^LIBTOOL/s|LIBTOOL ?= $$(BUILD_DIR)/libtool|LIBTOOL := ${WRKDIR}/gnome-libtool|' \
+ @${REINPLACE_CMD} -e '/^LIBTOOL/s|LIBTOOL := $$(FT_LIBTOOL_DIR)/libtool|LIBTOOL := ${WRKDIR}/gnome-libtool|' \
${WRKSRC}/builds/unix/unix-cc.in
post-configure:
diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo
index 8d272de2507b..d263563a604f 100644
--- a/print/freetype2/distinfo
+++ b/print/freetype2/distinfo
@@ -1,3 +1,3 @@
-MD5 (freetype-2.4.2.tar.bz2) = 647ee8ed266f9a4117c8d0a4855b3d3e
-SHA256 (freetype-2.4.2.tar.bz2) = 9a987aef8c50d9bcfdfdc9f012f8bd0de6095cc1a5524e62c1a037deb8dacbfe
-SIZE (freetype-2.4.2.tar.bz2) = 1433843
+MD5 (freetype-2.4.3.tar.bz2) = 75ac7082bde7b3805dc5d6bc806fa045
+SHA256 (freetype-2.4.3.tar.bz2) = b4e626db62fd1b4549ff5d57f5eca3a41631fd6066adf8a31c11879b51249afc
+SIZE (freetype-2.4.3.tar.bz2) = 1437406
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 629eedcc0b1e..669d7408a13b 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -3,13 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/print/libgnomeprint/Makefile,v 1.75 2010/04/01 15:19:59 kwm Exp $
+# $MCom: ports/print/libgnomeprint/Makefile,v 1.77 2010/09/28 16:38:29 kwm Exp $
#
# NOTE: Remind to update comms/gfax plist when PORTVERSION change.
PORTNAME= libgnomeprint
-PORTVERSION= 2.18.7
-PORTREVISION= 2
+PORTVERSION= 2.18.8
CATEGORIES= print gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 587a0187fade..f8037dd285a7 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeprint-2.18.7.tar.bz2) = d66b81ee8aa3b3a33f5efc9a47ce07e3
-SHA256 (gnome2/libgnomeprint-2.18.7.tar.bz2) = 8b34f81599423ef3da9c43775495da602f83cbbee069c9e760ffeae6aa4768e6
-SIZE (gnome2/libgnomeprint-2.18.7.tar.bz2) = 858527
+MD5 (gnome2/libgnomeprint-2.18.8.tar.bz2) = 63b05ffb5386e131487c6af30f4c56ac
+SHA256 (gnome2/libgnomeprint-2.18.8.tar.bz2) = 1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691
+SIZE (gnome2/libgnomeprint-2.18.8.tar.bz2) = 880489
diff --git a/security/Makefile b/security/Makefile
index b8310a42745f..52b71a4dc518 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -161,7 +161,6 @@
SUBDIR += gag
SUBDIR += gambas2-gb-crypt
SUBDIR += gcipher
- SUBDIR += gir-repository-gnome-keyring
SUBDIR += gnome-gpg
SUBDIR += gnome-keyring
SUBDIR += gnome-keyring-sharp
diff --git a/security/gir-repository-gnome-keyring/Makefile b/security/gir-repository-gnome-keyring/Makefile
deleted file mode 100644
index 05f9408a1d9b..000000000000
--- a/security/gir-repository-gnome-keyring/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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 f4e78d323888..7c55f7c7fcbc 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.6 2010/06/23 12:38:25 kwm Exp $
+# $MCom: ports/security/gnome-keyring/Makefile,v 1.98 2010/10/26 08:18:44 kwm Exp $
#
PORTNAME= gnome-keyring
-PORTVERSION= 2.30.3
-PORTREVISION= 1
+PORTVERSION= 2.32.1
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,16 +16,19 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A program that keeps passwords and other secrets
LIB_DEPENDS= gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
+RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
USE_BZIP2= yes
-USE_GNOME= gnomehack gnomeprefix gtk20 ltverhack intlhack gconf2
+USE_GNOME= gnomehack gnomeprefix gtk20 ltverhack intlhack
USE_GMAKE= yes
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --with-pam-dir="${PREFIX}/lib"
+CONFIGURE_ARGS= --with-pam-dir="${PREFIX}/lib" \
+ --with-root-certs="${LOCALBASE}/share/certs/ca-root-nss.crt"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-GCONF_SCHEMAS= gnome-keyring.schemas
+GLIB_SCHEMAS= org.gnome.crypto.cache.gschema.xml \
+ org.gnome.crypto.pgp.gschema.xml
.include <bsd.port.mk>
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index c87f432564c7..5c6e7223b8d8 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-2.30.3.tar.bz2) = 54cb1835c02a40f27fda73e58da17cc6
-SHA256 (gnome2/gnome-keyring-2.30.3.tar.bz2) = b24e5c6db621897f2a0045f0083e1f878d617f5c801d389c2ce028a2c67e290b
-SIZE (gnome2/gnome-keyring-2.30.3.tar.bz2) = 1592573
+MD5 (gnome2/gnome-keyring-2.32.1.tar.bz2) = 9a8aa74e03361676f29d6e73155786fc
+SHA256 (gnome2/gnome-keyring-2.32.1.tar.bz2) = 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9
+SIZE (gnome2/gnome-keyring-2.32.1.tar.bz2) = 1619245
diff --git a/security/gnome-keyring/files/patch-configure b/security/gnome-keyring/files/patch-configure
new file mode 100644
index 000000000000..7e8ec000a1bb
--- /dev/null
+++ b/security/gnome-keyring/files/patch-configure
@@ -0,0 +1,22 @@
+--- configure.orig 2010-09-19 12:45:34.000000000 +0000
++++ configure 2010-09-19 12:50:50.000000000 +0000
+@@ -14454,8 +14454,8 @@
+ .SECONDARY: $(gsettings_SCHEMAS)
+
+ gsettings__base_list = \
+- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
++ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
+
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ @$(NORMAL_INSTALL)
+@@ -15058,7 +15058,7 @@
+
+ pam_status="no"
+ if test "$enable_pam" != "no"; then
+- for ac_header in security/pam_modules.h pam/pam_modules.h
++ for ac_header in security/pam_modules.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
diff --git a/security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c b/security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c
deleted file mode 100644
index 1c4cb9ae4a1b..000000000000
--- a/security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- daemon/prompt/gkd-prompt.c.orig 2009-12-21 19:17:13.000000000 -0500
-+++ daemon/prompt/gkd-prompt.c 2009-12-21 19:17:23.000000000 -0500
-@@ -21,6 +21,8 @@
-
- #include "config.h"
-
-+#include <sys/wait.h>
-+
- #include "gkd-prompt.h"
- #include "gkd-prompt-marshal.h"
- #include "gkd-prompt-util.h"
diff --git a/security/gnome-keyring/files/patch-egg_egg-asn1x.c b/security/gnome-keyring/files/patch-egg_egg-asn1x.c
new file mode 100644
index 000000000000..30828f3f61c8
--- /dev/null
+++ b/security/gnome-keyring/files/patch-egg_egg-asn1x.c
@@ -0,0 +1,13 @@
+--- egg/egg-asn1x.c.orig 2010-09-04 12:08:41.000000000 +0200
++++ egg/egg-asn1x.c 2010-09-04 12:10:05.000000000 +0200
+@@ -1988,8 +1988,8 @@ anode_write_integer_ulong (gulong value,
+ guchar buf[sizeof (gulong)];
+ gint bytes, i, off;
+
+- for (i = 0; i < sizeof (ulong); ++i) {
+- off = sizeof (ulong) - (i + 1);
++ for (i = 0; i < sizeof (gulong); ++i) {
++ off = sizeof (gulong) - (i + 1);
+ buf[i] = (value >> (off * 8)) & 0xFF;
+ }
+
diff --git a/security/gnome-keyring/files/patch-gcr_gcr-certificate.c b/security/gnome-keyring/files/patch-gcr_gcr-certificate.c
index 0c910a4c453a..bdf10bf14628 100644
--- a/security/gnome-keyring/files/patch-gcr_gcr-certificate.c
+++ b/security/gnome-keyring/files/patch-gcr_gcr-certificate.c
@@ -1,11 +1,11 @@
---- gcr/gcr-certificate.c.orig 2009-12-16 23:36:19.000000000 -0500
-+++ gcr/gcr-certificate.c 2009-12-16 23:36:28.000000000 -0500
-@@ -156,7 +156,7 @@ calculate_key_size (GcrCertificateInfo *
+--- gcr/gcr-certificate.c.orig 2010-09-04 12:04:30.000000000 +0200
++++ gcr/gcr-certificate.c 2010-09-04 12:04:42.000000000 +0200
+@@ -158,7 +158,7 @@ calculate_key_size (GcrCertificateInfo *
const guchar *data, *params;
- gsize n_data, n_params, n_key;
- guint key_size = 0;
+ gsize n_data, n_params;
+ guint key_size = 0, n_bits;
- guchar *key;
+ guchar *key = NULL;
GQuark oid;
-
- data = egg_asn1_read_element (info->asn1, info->der, info->n_der, "tbsCertificate.subjectPublicKeyInfo", &n_data);
+
+ data = egg_asn1x_get_raw_element (egg_asn1x_node (info->asn1, "tbsCertificate", "subjectPublicKeyInfo", NULL), &n_data);
diff --git a/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gck-rpc-dispatch.c b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gck-rpc-dispatch.c
deleted file mode 100644
index 0fdeef6bc040..000000000000
--- a/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gck-rpc-dispatch.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- pkcs11/rpc-layer/gck-rpc-dispatch.c.orig 2009-12-16 23:37:26.000000000 -0500
-+++ pkcs11/rpc-layer/gck-rpc-dispatch.c 2009-12-16 23:38:10.000000000 -0500
-@@ -783,7 +783,7 @@ rpc_C_Finalize (CallState *cs)
- {
- CK_SLOT_ID_PTR slots;
- CK_ULONG n_slots, i;
-- CK_RV ret;
-+ CK_RV ret = CKR_OK;
-
- debug (("C_Finalize: enter"));
-
diff --git a/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c
new file mode 100644
index 000000000000..146d8b69da05
--- /dev/null
+++ b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c
@@ -0,0 +1,11 @@
+--- pkcs11/rpc-layer/gkm-rpc-dispatch.c.orig 2010-09-04 12:06:44.000000000 +0200
++++ pkcs11/rpc-layer/gkm-rpc-dispatch.c 2010-09-04 12:07:12.000000000 +0200
+@@ -784,7 +784,7 @@ rpc_C_Finalize (CallState *cs)
+ {
+ CK_SLOT_ID_PTR slots;
+ CK_ULONG n_slots, i;
+- CK_RV ret;
++ CK_RV ret = CKR_OK;
+
+ debug (("C_Finalize: enter"));
+
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index 8094cfb282a5..96646576363d 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -1,35 +1,38 @@
bin/gnome-keyring
bin/gnome-keyring-daemon
+etc/xdg/autostart/gnome-keyring-gpg.desktop
etc/xdg/autostart/gnome-keyring-pkcs11.desktop
etc/xdg/autostart/gnome-keyring-secrets.desktop
etc/xdg/autostart/gnome-keyring-ssh.desktop
-include/gcr/gcr-certificate-basics-widget.h
-include/gcr/gcr-certificate-details-widget.h
-include/gcr/gcr-certificate.h
-include/gcr/gcr-importer.h
-include/gcr/gcr-parser.h
-include/gcr/gcr-types.h
-include/gcr/gcr-unlock-options-widget.h
-include/gcr/gcr.h
+include/gcr/gcr/gcr-certificate-basics-widget.h
+include/gcr/gcr/gcr-certificate-details-widget.h
+include/gcr/gcr/gcr-certificate.h
+include/gcr/gcr/gcr-importer.h
+include/gcr/gcr/gcr-parser.h
+include/gcr/gcr/gcr-simple-certificate.h
+include/gcr/gcr/gcr-types.h
+include/gcr/gcr/gcr-unlock-options-widget.h
+include/gcr/gcr/gcr-unlock-options.h
+include/gcr/gcr/gcr.h
include/gp11/gp11.h
include/gp11/pkcs11.h
include/gp11/pkcs11g.h
include/gp11/pkcs11n.h
-lib/gnome-keyring/devel/gck-ssh-store-standalone.a
-lib/gnome-keyring/devel/gck-ssh-store-standalone.la
-lib/gnome-keyring/devel/gck-ssh-store-standalone.so
-lib/gnome-keyring/devel/gck-user-store-standalone.a
-lib/gnome-keyring/devel/gck-user-store-standalone.la
-lib/gnome-keyring/devel/gck-user-store-standalone.so
+lib/gnome-keyring/devel/gkm-ssh-store-standalone.a
+lib/gnome-keyring/devel/gkm-ssh-store-standalone.la
+lib/gnome-keyring/devel/gkm-ssh-store-standalone.so
+lib/gnome-keyring/devel/gkm-user-store-standalone.a
+lib/gnome-keyring/devel/gkm-user-store-standalone.la
+lib/gnome-keyring/devel/gkm-user-store-standalone.so
lib/gnome-keyring/gnome-keyring-pkcs11.a
lib/gnome-keyring/gnome-keyring-pkcs11.la
lib/gnome-keyring/gnome-keyring-pkcs11.so
-lib/gnome-keyring/standalone/gck-roots-store-standalone.a
-lib/gnome-keyring/standalone/gck-roots-store-standalone.la
-lib/gnome-keyring/standalone/gck-roots-store-standalone.so
-lib/gnome-keyring/standalone/gck-secret-store-standalone.a
-lib/gnome-keyring/standalone/gck-secret-store-standalone.la
-lib/gnome-keyring/standalone/gck-secret-store-standalone.so
+lib/gnome-keyring/standalone/gkm-roots-store-standalone.a
+lib/gnome-keyring/standalone/gkm-roots-store-standalone.la
+lib/gnome-keyring/standalone/gkm-roots-store-standalone.so
+lib/gnome-keyring/standalone/gkm-secret-store-standalone.a
+lib/gnome-keyring/standalone/gkm-secret-store-standalone.la
+lib/gnome-keyring/standalone/gkm-secret-store-standalone.so
lib/libgcr.a
lib/libgcr.la
lib/libgcr.so
@@ -44,28 +47,30 @@ lib/pam_gnome_keyring.so
libdata/pkgconfig/gcr-0.pc
libdata/pkgconfig/gp11-0.pc
libexec/gnome-keyring-prompt
+share/GConf/gsettings/org.gnome.crypto.cache.convert
+share/GConf/gsettings/org.gnome.crypto.pgp.convert
share/dbus-1/services/org.freedesktop.secrets.service
share/dbus-1/services/org.gnome.keyring.service
-share/doc/gcr/ch01.html
-share/doc/gcr/gcr-GcrCertificate.html
-share/doc/gcr/gcr-gcr-certificate-basics-widget.html
-share/doc/gcr/gcr-gcr-certificate-details-widget.html
-share/doc/gcr/gcr-gcr-import-dialog.html
-share/doc/gcr/gcr-gcr-importer.html
-share/doc/gcr/gcr-gcr-initializer.html
-share/doc/gcr/gcr-gcr-parser.html
-share/doc/gcr/gcr-gcr-simple-certificate.html
-share/doc/gcr/gcr-gcr-types.html
-share/doc/gcr/gcr-gcr-xxx.html
-share/doc/gcr/gcr.devhelp
-share/doc/gcr/gcr.devhelp2
-share/doc/gcr/home.png
-share/doc/gcr/index.html
-share/doc/gcr/index.sgml
-share/doc/gcr/left.png
-share/doc/gcr/right.png
-share/doc/gcr/style.css
-share/doc/gcr/up.png
+share/doc/gcr-0/ch01.html
+share/doc/gcr-0/gcr-GcrCertificate.html
+share/doc/gcr-0/gcr-gcr-certificate-basics-widget.html
+share/doc/gcr-0/gcr-gcr-certificate-details-widget.html
+share/doc/gcr-0/gcr-gcr-import-dialog.html
+share/doc/gcr-0/gcr-gcr-importer.html
+share/doc/gcr-0/gcr-gcr-initializer.html
+share/doc/gcr-0/gcr-gcr-parser.html
+share/doc/gcr-0/gcr-gcr-simple-certificate.html
+share/doc/gcr-0/gcr-gcr-types.html
+share/doc/gcr-0/gcr-gcr-xxx.html
+share/doc/gcr-0/gcr-0.devhelp
+share/doc/gcr-0/gcr-0.devhelp2
+share/doc/gcr-0/home.png
+share/doc/gcr-0/index.html
+share/doc/gcr-0/index.sgml
+share/doc/gcr-0/left.png
+share/doc/gcr-0/right.png
+share/doc/gcr-0/style.css
+share/doc/gcr-0/up.png
share/doc/gp11/GP11Module.html
share/doc/gp11/GP11Object.html
share/doc/gp11/GP11Session.html
@@ -92,7 +97,7 @@ share/gcr/ui/gcr-unlock-options-widget.ui
%%DATADIR%%/introspect/introspect-prompt.xml
%%DATADIR%%/introspect/introspect-service.xml
%%DATADIR%%/introspect/introspect-session.xml
-%%DATADIR%%/ui/gkd-prompt.ui
+%%DATADIR%%/ui/gku-prompt.ui
share/locale/ar/LC_MESSAGES/gnome-keyring.mo
share/locale/as/LC_MESSAGES/gnome-keyring.mo
share/locale/ast/LC_MESSAGES/gnome-keyring.mo
@@ -179,12 +184,15 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
@dirrm share/gcr/ui
@dirrm share/gcr
@dirrm share/doc/gp11
-@dirrm share/doc/gcr
+@dirrm share/doc/gcr-0
@dirrm lib/gnome-keyring/standalone
@dirrm lib/gnome-keyring/devel
@dirrm lib/gnome-keyring
@dirrm include/gp11
+@dirrm include/gcr/gcr
@dirrm include/gcr
+@dirrmtry share/GConf/gsettings
+@dirrmtry share/GConf
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
diff --git a/security/libgnome-keyring/Makefile b/security/libgnome-keyring/Makefile
index 89c1860cfe0a..f4b0cce735d2 100644
--- a/security/libgnome-keyring/Makefile
+++ b/security/libgnome-keyring/Makefile
@@ -3,11 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/security/libgnome-keyring/Makefile,v 1.3 2010/04/27 16:37:52 kwm Exp $
+# $MCom: ports/security/libgnome-keyring/Makefile,v 1.7 2010/09/28 08:11:06 kwm Exp $
PORTNAME= libgnome-keyring
-PORTVERSION= 2.30.1
-PORTREVISION= 2
+PORTVERSION= 2.32.0
CATEGORIES= security gnome
MASTER_SITES= GNOME
diff --git a/security/libgnome-keyring/distinfo b/security/libgnome-keyring/distinfo
index b0afae706eca..23fba285fc00 100644
--- a/security/libgnome-keyring/distinfo
+++ b/security/libgnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgnome-keyring-2.30.1.tar.bz2) = 11ce9e5ca66cf934e243ddd68f52adc9
-SHA256 (libgnome-keyring-2.30.1.tar.bz2) = a9227da7d3eee930b75ad7858875344b713d1bf73e6af54870a2691643d5dae4
-SIZE (libgnome-keyring-2.30.1.tar.bz2) = 812131
+MD5 (libgnome-keyring-2.32.0.tar.bz2) = c42b2ca66204835d901d3dbfc1fa5ae6
+SHA256 (libgnome-keyring-2.32.0.tar.bz2) = 56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c
+SIZE (libgnome-keyring-2.32.0.tar.bz2) = 412592
diff --git a/security/libgnome-keyring/pkg-plist b/security/libgnome-keyring/pkg-plist
index 7a0f7b41f1db..17e515baeaeb 100644
--- a/security/libgnome-keyring/pkg-plist
+++ b/security/libgnome-keyring/pkg-plist
@@ -8,16 +8,19 @@ lib/libgnome-keyring.so.0
libdata/pkgconfig/gnome-keyring-1.pc
share/doc/gnome-keyring/ch01.html
share/doc/gnome-keyring/gnome-keyring-Callbacks.html
+share/doc/gnome-keyring/gnome-keyring-Daemon-Management-Functions.html
share/doc/gnome-keyring/gnome-keyring-Item-ACLs.html
share/doc/gnome-keyring/gnome-keyring-Item-Attributes.html
share/doc/gnome-keyring/gnome-keyring-Item-Information.html
share/doc/gnome-keyring/gnome-keyring-Keyring-Info.html
share/doc/gnome-keyring/gnome-keyring-Keyring-Items.html
share/doc/gnome-keyring/gnome-keyring-Keyrings.html
+share/doc/gnome-keyring/gnome-keyring-Miscellaneous-Functions.html
share/doc/gnome-keyring/gnome-keyring-Network-Passwords.html
share/doc/gnome-keyring/gnome-keyring-Non-pageable-Memory.html
share/doc/gnome-keyring/gnome-keyring-Result-Codes.html
share/doc/gnome-keyring/gnome-keyring-Search-Functionality.html
+share/doc/gnome-keyring/gnome-keyring-Simple-Password-Storage.html
share/doc/gnome-keyring/gnome-keyring.devhelp
share/doc/gnome-keyring/gnome-keyring.devhelp2
share/doc/gnome-keyring/home.png
@@ -38,12 +41,14 @@ share/locale/da/LC_MESSAGES/libgnome-keyring.mo
share/locale/de/LC_MESSAGES/libgnome-keyring.mo
share/locale/el/LC_MESSAGES/libgnome-keyring.mo
share/locale/en_GB/LC_MESSAGES/libgnome-keyring.mo
+share/locale/eo/LC_MESSAGES/libgnome-keyring.mo
share/locale/es/LC_MESSAGES/libgnome-keyring.mo
share/locale/et/LC_MESSAGES/libgnome-keyring.mo
share/locale/eu/LC_MESSAGES/libgnome-keyring.mo
share/locale/fi/LC_MESSAGES/libgnome-keyring.mo
share/locale/fr/LC_MESSAGES/libgnome-keyring.mo
share/locale/gl/LC_MESSAGES/libgnome-keyring.mo
+share/locale/he/LC_MESSAGES/libgnome-keyring.mo
share/locale/hu/LC_MESSAGES/libgnome-keyring.mo
share/locale/id/LC_MESSAGES/libgnome-keyring.mo
share/locale/it/LC_MESSAGES/libgnome-keyring.mo
@@ -53,6 +58,7 @@ share/locale/lt/LC_MESSAGES/libgnome-keyring.mo
share/locale/lv/LC_MESSAGES/libgnome-keyring.mo
share/locale/ml/LC_MESSAGES/libgnome-keyring.mo
share/locale/mn/LC_MESSAGES/libgnome-keyring.mo
+share/locale/ms/LC_MESSAGES/libgnome-keyring.mo
share/locale/nb/LC_MESSAGES/libgnome-keyring.mo
share/locale/nds/LC_MESSAGES/libgnome-keyring.mo
share/locale/nl/LC_MESSAGES/libgnome-keyring.mo
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index a8df25c78f91..f5688700d33a 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -3,12 +3,11 @@
# Whom: Dave McKay <dave@mu.org>
#
# $FreeBSD$
-# $MCom: ports/security/seahorse/Makefile,v 1.96 2010/04/27 22:04:55 kwm Exp $
+# $MCom: ports/security/seahorse/Makefile,v 1.99 2010/09/28 09:01:33 kwm Exp $
#
PORTNAME= seahorse
-PORTVERSION= 2.30.1
-PORTREVISION= 2
+PORTVERSION= 2.32.0
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 8134344b0bb2..196816b44ca5 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seahorse-2.30.1.tar.bz2) = b332279b34acca952807e31534fec592
-SHA256 (gnome2/seahorse-2.30.1.tar.bz2) = 1b97064ee91f87494040313a0a2fe813473ec4dba15b5781245080e8fea8e7c3
-SIZE (gnome2/seahorse-2.30.1.tar.bz2) = 2422214
+MD5 (gnome2/seahorse-2.32.0.tar.bz2) = bffb5ba78efb7eae760e05d8473ee7ad
+SHA256 (gnome2/seahorse-2.32.0.tar.bz2) = f55468237246a485317d59e2fbc1b1ef5f5bd4c5a7b9ff6f40c3d921af0ed52d
+SIZE (gnome2/seahorse-2.32.0.tar.bz2) = 2491230
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index 453aae477c26..09524c6f610f 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -20,12 +20,12 @@ share/doc/libcryptui/home.png
share/doc/libcryptui/index.html
share/doc/libcryptui/index.sgml
share/doc/libcryptui/left.png
-share/doc/libcryptui/libcryptui-CryptUIKeyChooser.html
-share/doc/libcryptui/libcryptui-CryptUIKeyStore.html
-share/doc/libcryptui/libcryptui-CryptUIKeyset.html
share/doc/libcryptui/libcryptui-cryptui-defines.html
+share/doc/libcryptui/libcryptui-cryptui-key-chooser.html
share/doc/libcryptui/libcryptui-cryptui-key-combo.html
share/doc/libcryptui/libcryptui-cryptui-key-list.html
+share/doc/libcryptui/libcryptui-cryptui-key-store.html
+share/doc/libcryptui/libcryptui-cryptui-keyset.html
share/doc/libcryptui/libcryptui-cryptui-marshal.html
share/doc/libcryptui/libcryptui-cryptui.html
share/doc/libcryptui/libcryptui.devhelp
@@ -39,39 +39,39 @@ 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-SeahorseOperation.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-commands.html
+share/doc/libseahorse/libseahorse-seahorse-context.html
+share/doc/libseahorse/libseahorse-seahorse-dns-sd.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-object.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-set-model.html
+share/doc/libseahorse/libseahorse-seahorse-set.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-unknown-source.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-seahorse-xxx.html
share/doc/libseahorse/libseahorse.devhelp
share/doc/libseahorse/libseahorse.devhelp2
share/doc/libseahorse/object-tree.html
@@ -99,6 +99,8 @@ share/gnome/help/seahorse/fr/figures/seahorse-window.png
share/gnome/help/seahorse/fr/seahorse.xml
share/gnome/help/seahorse/it/figures/seahorse-window.png
share/gnome/help/seahorse/it/seahorse.xml
+share/gnome/help/seahorse/ja/figures/seahorse-window.png
+share/gnome/help/seahorse/ja/seahorse.xml
share/gnome/help/seahorse/oc/figures/seahorse-window.png
share/gnome/help/seahorse/oc/seahorse.xml
share/gnome/help/seahorse/ru/figures/seahorse-window.png
@@ -107,6 +109,8 @@ share/gnome/help/seahorse/sv/figures/seahorse-window.png
share/gnome/help/seahorse/sv/seahorse.xml
share/gnome/help/seahorse/vi/figures/seahorse-window.png
share/gnome/help/seahorse/vi/seahorse.xml
+share/gnome/help/seahorse/zh_CN/figures/seahorse-window.png
+share/gnome/help/seahorse/zh_CN/seahorse.xml
share/icons/hicolor/16x16/apps/seahorse-preferences.png
share/icons/hicolor/16x16/apps/seahorse.png
share/icons/hicolor/22x22/apps/seahorse-preferences.png
@@ -201,10 +205,12 @@ share/omf/seahorse/seahorse-es.omf
share/omf/seahorse/seahorse-eu.omf
share/omf/seahorse/seahorse-fr.omf
share/omf/seahorse/seahorse-it.omf
+share/omf/seahorse/seahorse-ja.omf
share/omf/seahorse/seahorse-oc.omf
share/omf/seahorse/seahorse-ru.omf
share/omf/seahorse/seahorse-sv.omf
share/omf/seahorse/seahorse-vi.omf
+share/omf/seahorse/seahorse-zh_CN.omf
share/pixmaps/seahorse/22x22/seahorse-key-personal.png
share/pixmaps/seahorse/22x22/seahorse-key-ssh.png
share/pixmaps/seahorse/22x22/seahorse-key.png
@@ -266,6 +272,8 @@ share/pixmaps/seahorse/scalable/seahorse-sign.svg
@dirrm share/pixmaps/seahorse/22x22
@dirrm share/pixmaps/seahorse
@dirrm share/omf/seahorse
+@dirrm share/gnome/help/seahorse/zh_CN/figures
+@dirrm share/gnome/help/seahorse/zh_CN
@dirrm share/gnome/help/seahorse/vi/figures
@dirrm share/gnome/help/seahorse/vi
@dirrm share/gnome/help/seahorse/sv/figures
@@ -274,6 +282,8 @@ share/pixmaps/seahorse/scalable/seahorse-sign.svg
@dirrm share/gnome/help/seahorse/ru
@dirrm share/gnome/help/seahorse/oc/figures
@dirrm share/gnome/help/seahorse/oc
+@dirrm share/gnome/help/seahorse/ja/figures
+@dirrm share/gnome/help/seahorse/ja
@dirrm share/gnome/help/seahorse/it/figures
@dirrm share/gnome/help/seahorse/it
@dirrm share/gnome/help/seahorse/fr/figures
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 731acffa0603..43fc31288a68 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -3,11 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/brasero/Makefile,v 1.3 2010/06/23 15:46:07 kwm Exp $
+# $MCom: ports/sysutils/brasero/Makefile,v 1.83 2010/11/15 21:53:38 kwm Exp $
PORTNAME= brasero
-PORTVERSION= 2.30.2
-PORTREVISION= 2
+PORTVERSION= 2.32.1
CATEGORIES= sysutils audio multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -28,20 +27,24 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_XORG= sm
USE_GNOME= intlhack gnomeprefix gnomehack gnomedocutils
+GNOME_DESKTOP_VERSION=2
USE_LDCONFIG= yes
USE_GSTREAMER= gconf core
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-CONFIGURE_ARGS= --disable-inotify --with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS= --disable-inotify --with-html-dir=${PREFIX}/share/doc \
+ --enable-gtk3=no --enable-introspection=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_CAM_LIB_H=1" \
LDFLAGS="-L${LOCALBASE}/lib"
MAN1= brasero.1
-GCONF_SCHEMAS= brasero.schemas
+GLIB_SCHEMAS= org.gnome.brasero.gschema.xml
OPTIONS= NAUTILUS "Enable Nautilus extension" on \
LIBBURNIA "Enable libburnia plug-ins" off
+PLIST_SUB= FULL_VERSION=${PORTVERSION}
+
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_NAUTILUS)
@@ -65,5 +68,7 @@ PLIST_SUB+= LIBBURNIA="@comment "
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/libbrasero-burn/burn-process.c
+ @${REINPLACE_CMD} -e 's|" == "|" = "|g' \
+ ${WRKSRC}/configure
.include <bsd.port.post.mk>
diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo
index 1010f1a6855a..23e03e01f832 100644
--- a/sysutils/brasero/distinfo
+++ b/sysutils/brasero/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/brasero-2.30.2.tar.bz2) = c1c995a01a087ad1d1062c8ed64405dd
-SHA256 (gnome2/brasero-2.30.2.tar.bz2) = 782b9c35e706fc405bc349d9cb4fab0ec6c64758bcb56a9e86c2899ca02f415b
-SIZE (gnome2/brasero-2.30.2.tar.bz2) = 4460261
+SHA256 (gnome2/brasero-2.32.1.tar.bz2) = 7b1056b6f19398912d51e3e583bc1b4d2a75ce2a8e15a96e1514fe6edb79df3b
+SIZE (gnome2/brasero-2.32.1.tar.bz2) = 4530933
diff --git a/sysutils/brasero/files/patch-configure b/sysutils/brasero/files/patch-configure
new file mode 100644
index 000000000000..47011fb7a96f
--- /dev/null
+++ b/sysutils/brasero/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig 2010-08-18 15:30:33.000000000 +0200
++++ configure 2010-08-18 15:31:21.000000000 +0200
+@@ -11105,8 +11105,8 @@
+ .SECONDARY: $(gsettings_SCHEMAS)
+
+ gsettings__base_list = \
+- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
++ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
+
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ @$(NORMAL_INSTALL)
diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist
index 679e284b08fe..3b2f6327a511 100644
--- a/sysutils/brasero/pkg-plist
+++ b/sysutils/brasero/pkg-plist
@@ -76,23 +76,23 @@ 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/girepository-1.0/BraseroBurn-1.0.typelib
-lib/girepository-1.0/BraseroMedia-1.0.typelib
+lib/girepository-1.0/BraseroBurn-%%FULL_VERSION%%.typelib
+lib/girepository-1.0/BraseroMedia-%%FULL_VERSION%%.typelib
lib/libbrasero-burn.la
lib/libbrasero-burn.so
-lib/libbrasero-burn.so.2
+lib/libbrasero-burn.so.3
lib/libbrasero-media.la
lib/libbrasero-media.so
-lib/libbrasero-media.so.2
+lib/libbrasero-media.so.3
lib/libbrasero-utils.la
lib/libbrasero-utils.so
-lib/libbrasero-utils.so.2
+lib/libbrasero-utils.so.3
%%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/GConf/gsettings/brasero.convert
share/applications/brasero.desktop
-share/applications/brasero-copy-medium.desktop
%%NAUTILUS%%share/applications/brasero-nautilus.desktop
share/doc/libbrasero-burn/annotation-glossary.html
share/doc/libbrasero-burn/api-index-full.html
@@ -253,6 +253,7 @@ share/doc/libbrasero-media/up.png
%%DATADIR%%/icons/hicolor/32x32/actions/media-optical-copy.png
%%DATADIR%%/icons/hicolor/32x32/actions/media-optical-data-new.png
%%DATADIR%%/icons/hicolor/32x32/actions/media-optical-video-new.png
+%%DATADIR%%/icons/hicolor/32x32/actions/transform-crop-and-resize.png
%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-00.png
%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-05.png
%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-10.png
@@ -305,9 +306,8 @@ share/doc/libbrasero-media/up.png
%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-85.svg
%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-90.svg
%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-95.svg
-%%DATADIR%%/logo.png
-share/gir-1.0/BraseroBurn-1.0.gir
-share/gir-1.0/BraseroMedia-1.0.gir
+share/gir-1.0/BraseroBurn-%%FULL_VERSION%%.gir
+share/gir-1.0/BraseroMedia-%%FULL_VERSION%%.gir
share/gnome/help/brasero/C/brasero.xml
share/gnome/help/brasero/C/figures/brasero_main.png
share/gnome/help/brasero/C/legal.xml
@@ -329,12 +329,16 @@ share/gnome/help/brasero/fi/brasero.xml
share/gnome/help/brasero/fi/figures/brasero_main.png
share/gnome/help/brasero/fr/brasero.xml
share/gnome/help/brasero/fr/figures/brasero_main.png
+share/gnome/help/brasero/gl/brasero.xml
+share/gnome/help/brasero/gl/figures/brasero_main.png
share/gnome/help/brasero/it/brasero.xml
share/gnome/help/brasero/it/figures/brasero_main.png
share/gnome/help/brasero/pl/brasero.xml
share/gnome/help/brasero/pl/figures/brasero_main.png
share/gnome/help/brasero/ru/brasero.xml
share/gnome/help/brasero/ru/figures/brasero_main.png
+share/gnome/help/brasero/sl/brasero.xml
+share/gnome/help/brasero/sl/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
@@ -367,6 +371,7 @@ share/locale/dz/LC_MESSAGES/brasero.mo
share/locale/el/LC_MESSAGES/brasero.mo
share/locale/en_GB/LC_MESSAGES/brasero.mo
share/locale/en@shaw/LC_MESSAGES/brasero.mo
+share/locale/eo/LC_MESSAGES/brasero.mo
share/locale/es/LC_MESSAGES/brasero.mo
share/locale/et/LC_MESSAGES/brasero.mo
share/locale/eu/LC_MESSAGES/brasero.mo
@@ -381,6 +386,7 @@ share/locale/hu/LC_MESSAGES/brasero.mo
share/locale/id/LC_MESSAGES/brasero.mo
share/locale/it/LC_MESSAGES/brasero.mo
share/locale/ja/LC_MESSAGES/brasero.mo
+share/locale/kk/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
@@ -390,6 +396,7 @@ 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
+share/locale/ms/LC_MESSAGES/brasero.mo
share/locale/nb/LC_MESSAGES/brasero.mo
share/locale/nds/LC_MESSAGES/brasero.mo
share/locale/nl/LC_MESSAGES/brasero.mo
@@ -402,6 +409,7 @@ share/locale/pt/LC_MESSAGES/brasero.mo
share/locale/pt_BR/LC_MESSAGES/brasero.mo
share/locale/ro/LC_MESSAGES/brasero.mo
share/locale/ru/LC_MESSAGES/brasero.mo
+share/locale/sk/LC_MESSAGES/brasero.mo
share/locale/sl/LC_MESSAGES/brasero.mo
share/locale/sr/LC_MESSAGES/brasero.mo
share/locale/sr@latin/LC_MESSAGES/brasero.mo
@@ -410,6 +418,7 @@ share/locale/ta/LC_MESSAGES/brasero.mo
share/locale/te/LC_MESSAGES/brasero.mo
share/locale/th/LC_MESSAGES/brasero.mo
share/locale/tr/LC_MESSAGES/brasero.mo
+share/locale/ug/LC_MESSAGES/brasero.mo
share/locale/uk/LC_MESSAGES/brasero.mo
share/locale/vi/LC_MESSAGES/brasero.mo
share/locale/zh_CN/LC_MESSAGES/brasero.mo
@@ -426,9 +435,11 @@ share/omf/brasero/brasero-en_GB.omf
share/omf/brasero/brasero-es.omf
share/omf/brasero/brasero-fi.omf
share/omf/brasero/brasero-fr.omf
+share/omf/brasero/brasero-gl.omf
share/omf/brasero/brasero-it.omf
share/omf/brasero/brasero-pl.omf
share/omf/brasero/brasero-ru.omf
+share/omf/brasero/brasero-sl.omf
share/omf/brasero/brasero-sv.omf
share/omf/brasero/brasero-zh_CN.omf
share/omf/brasero/brasero-zh_HK.omf
@@ -442,12 +453,16 @@ share/omf/brasero/brasero-zh_TW.omf
@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/sl/figures
+@dirrm share/gnome/help/brasero/sl
@dirrm share/gnome/help/brasero/ru/figures
@dirrm share/gnome/help/brasero/ru
@dirrm share/gnome/help/brasero/pl/figures
@dirrm share/gnome/help/brasero/pl
@dirrm share/gnome/help/brasero/it/figures
@dirrm share/gnome/help/brasero/it
+@dirrm share/gnome/help/brasero/gl/figures
+@dirrm share/gnome/help/brasero/gl
@dirrm share/gnome/help/brasero/fr/figures
@dirrm share/gnome/help/brasero/fr
@dirrm share/gnome/help/brasero/fi/figures
@@ -495,6 +510,8 @@ share/omf/brasero/brasero-zh_TW.omf
@dirrm lib/brasero/plugins
@dirrm lib/brasero
@dirrm include/brasero
+@dirrmtry share/GConf/gsettings
+@dirrmtry share/GConf
@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
@@ -515,6 +532,8 @@ share/omf/brasero/brasero-zh_TW.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/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index 4fa1497a32e1..75a64bc3d9bb 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -3,11 +3,10 @@
# Whom: Florent Thoumie <flz@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/consolekit/Makefile,v 1.23 2009/09/26 12:32:45 kwm Exp $
+# $MCom: ports/sysutils/consolekit/Makefile,v 1.25 2010/10/23 10:12:30 kwm Exp $
PORTNAME= consolekit
-PORTVERSION= 0.4.1
-PORTREVISION= 4
+PORTVERSION= 0.4.2
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.freedesktop.org/software/ConsoleKit/dist/
DISTFILES= ConsoleKit-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo
index 0dbdd04a2b42..54e666b605cc 100644
--- a/sysutils/consolekit/distinfo
+++ b/sysutils/consolekit/distinfo
@@ -1,3 +1,3 @@
-MD5 (ConsoleKit-0.4.1.tar.bz2) = 48eda4483cc97841d5f88e8e003eb6d7
-SHA256 (ConsoleKit-0.4.1.tar.bz2) = f032adc6146d745034315054c5822a7a09f30e20a40d6e802221fa977354403e
-SIZE (ConsoleKit-0.4.1.tar.bz2) = 398080
+MD5 (ConsoleKit-0.4.2.tar.bz2) = 285acb35bfcb2b8dc21c6071e6f6e116
+SHA256 (ConsoleKit-0.4.2.tar.bz2) = 656f406c9c436bd105c34d87e824cb2fbae09fa672b93894059281124480fe15
+SIZE (ConsoleKit-0.4.2.tar.bz2) = 412651
diff --git a/sysutils/consolekit/files/patch-tools_Makefile.in b/sysutils/consolekit/files/patch-tools_Makefile.in
index b818fd9319d0..ed58bbb7ad6d 100644
--- a/sysutils/consolekit/files/patch-tools_Makefile.in
+++ b/sysutils/consolekit/files/patch-tools_Makefile.in
@@ -1,8 +1,8 @@
---- tools/Makefile.in.orig 2008-01-31 16:09:08.000000000 -0500
-+++ tools/Makefile.in 2008-01-31 16:10:21.000000000 -0500
-@@ -39,8 +39,7 @@ bin_PROGRAMS = ck-list-sessions$(EXEEXT)
+--- tools/Makefile.in.orig 2010-10-23 11:29:43.000000000 +0200
++++ tools/Makefile.in 2010-10-23 11:32:41.000000000 +0200
+@@ -43,8 +43,7 @@ sbin_PROGRAMS = ck-log-system-start$(EXE
+ ck-log-system-restart$(EXEEXT) ck-log-system-stop$(EXEEXT) \
$(am__EXEEXT_1)
- sbin_PROGRAMS = ck-log-system-start$(EXEEXT) $(am__EXEEXT_1)
libexec_PROGRAMS = ck-collect-session-info$(EXEEXT) \
- ck-get-x11-server-pid$(EXEEXT) \
- ck-get-x11-display-device$(EXEEXT) $(am__EXEEXT_1)
@@ -10,10 +10,10 @@
subdir = tools
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -66,17 +65,6 @@ ck_collect_session_info_OBJECTS = \
- am__DEPENDENCIES_1 =
- ck_collect_session_info_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(top_builddir)/src/libck.la $(am__DEPENDENCIES_1)
+@@ -71,17 +70,6 @@ ck_collect_session_info_DEPENDENCIES = $
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+ am__v_lt_0 = --silent
-am_ck_get_x11_display_device_OBJECTS = \
- ck-get-x11-display-device.$(OBJEXT) $(am__objects_1)
-ck_get_x11_display_device_OBJECTS = \
@@ -28,7 +28,7 @@
am_ck_history_OBJECTS = ck-history.$(OBJEXT) $(am__objects_1)
ck_history_OBJECTS = $(am_ck_history_OBJECTS)
ck_history_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-@@ -335,24 +323,6 @@ ck_collect_session_info_LDADD = \
+@@ -441,24 +429,6 @@ ck_collect_session_info_LDADD = \
$(top_builddir)/src/libck.la \
$(NULL)
@@ -53,25 +53,25 @@
EXTRA_DIST = \
$(NULL)
-@@ -480,12 +450,6 @@ clean-sbinPROGRAMS:
+@@ -632,12 +602,6 @@ clean-sbinPROGRAMS:
ck-collect-session-info$(EXEEXT): $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_DEPENDENCIES)
@rm -f ck-collect-session-info$(EXEEXT)
- $(LINK) $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(LINK) $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_LDADD) $(LIBS)
-ck-get-x11-display-device$(EXEEXT): $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_DEPENDENCIES)
- @rm -f ck-get-x11-display-device$(EXEEXT)
-- $(LINK) $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_LDADD) $(LIBS)
+- $(AM_V_CCLD)$(LINK) $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_LDADD) $(LIBS)
-ck-get-x11-server-pid$(EXEEXT): $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_DEPENDENCIES)
- @rm -f ck-get-x11-server-pid$(EXEEXT)
-- $(LINK) $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_LDADD) $(LIBS)
+- $(AM_V_CCLD)$(LINK) $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_LDADD) $(LIBS)
ck-history$(EXEEXT): $(ck_history_OBJECTS) $(ck_history_DEPENDENCIES)
@rm -f ck-history$(EXEEXT)
- $(LINK) $(ck_history_OBJECTS) $(ck_history_LDADD) $(LIBS)
-@@ -503,8 +467,6 @@ distclean-compile:
+ $(AM_V_CCLD)$(LINK) $(ck_history_OBJECTS) $(ck_history_LDADD) $(LIBS)
+@@ -664,8 +628,6 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-collect-session-info.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-get-x11-display-device.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-get-x11-server-pid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-history.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-log-system-start.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list-sessions.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-launch-session.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-log-system-restart.Po@am__quote@
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index a3a6cc8e3eb7..72a94f513e61 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.82 2010/04/01 15:48:36 kwm Exp $
+# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.85 2010/09/27 18:22:59 kwm Exp $
#
PORTNAME= gconf-editor
-PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTVERSION= 2.32.0
PORTEPOCH= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index 5e4a61561202..04ade80dacac 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconf-editor-2.30.0.tar.bz2) = 2a941e3c64843be69190f38891470580
-SHA256 (gnome2/gconf-editor-2.30.0.tar.bz2) = 955d8eb6ff39f72002a7cfb0bed5e4b6eaad45410441e4a5a767767ec6db26d4
-SIZE (gnome2/gconf-editor-2.30.0.tar.bz2) = 1389176
+MD5 (gnome2/gconf-editor-2.32.0.tar.bz2) = 14e413e88380b0d7a463c2beea3bac2e
+SHA256 (gnome2/gconf-editor-2.32.0.tar.bz2) = c6d1d35ce5d136121ad76efe1c4033425bb2ad3800e711bd1bca9ce869c12a1f
+SIZE (gnome2/gconf-editor-2.32.0.tar.bz2) = 1397117
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index 056eace55b96..9ae9658a2738 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -178,6 +178,7 @@ share/locale/id/LC_MESSAGES/gconf-editor.mo
share/locale/it/LC_MESSAGES/gconf-editor.mo
share/locale/ja/LC_MESSAGES/gconf-editor.mo
share/locale/ka/LC_MESSAGES/gconf-editor.mo
+share/locale/kk/LC_MESSAGES/gconf-editor.mo
share/locale/kn/LC_MESSAGES/gconf-editor.mo
share/locale/ko/LC_MESSAGES/gconf-editor.mo
share/locale/ku/LC_MESSAGES/gconf-editor.mo
@@ -305,6 +306,8 @@ share/omf/gconf-editor/gconf-editor-zh_CN.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/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index dacbbc0ee6ae..8d13d34e7144 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.207 2010/04/28 08:26:27 kwm Exp $
+# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.214 2010/11/18 11:46:09 kwm Exp $
#
PORTNAME= gnome-control-center
-PORTVERSION= 2.30.1
-PORTREVISION= 2
+PORTVERSION= 2.32.1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,6 +16,8 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Control center for GNOME 2 project
LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+ polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \
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 \
@@ -29,7 +30,7 @@ GNOME_DESKTOP_VERSION=2
USE_GSTREAMER= good
WANT_GNOME= yes
USE_GNOME= gnomeprefix gnomehack intlhack metacity gnomemenus \
- desktopfileutils libgnomekbd gnomedesktop librsvg2
+ desktopfileutils libgnomekbd gnomedesktop librsvg2 gconf2
USE_XORG= xscrnsaver
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
@@ -60,6 +61,8 @@ PLIST_SUB+= ABOUTME="@comment "
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
${WRKSRC}/capplets/common/gnome-theme-info.c
+ @${REINPLACE_CMD} -e 's|/usr/sbin|${PREFIX}/sbin|g' \
+ ${WRKSRC}/capplets/display/org.gnome.randr.policy.in
post-install:
@-update-desktop-database
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 7a5ae7dcc490..2173acb5cf86 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gnome-control-center-2.30.1.tar.bz2) = 9608eae5605cfc478ba35b683bf129c1
-SHA256 (gnome2/gnome-control-center-2.30.1.tar.bz2) = db050803a4bf3a2297255b8fff4810f2125a5b001d3fd785ee1ecd7f2c6f593b
-SIZE (gnome2/gnome-control-center-2.30.1.tar.bz2) = 2830194
+SHA256 (gnome2/gnome-control-center-2.32.1.tar.bz2) = 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66
+SIZE (gnome2/gnome-control-center-2.32.1.tar.bz2) = 2280217
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
deleted file mode 100644
index 31566627790d..000000000000
--- a/sysutils/gnome-control-center/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Tue Feb 13 07:51:47 2007
-+++ configure Tue Feb 13 07:51:47 2007
-@@ -12525,6 +12525,7 @@
- if test "${gt_cv_func_ngettext_libc+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-+ LIBS="-lintl $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
diff --git a/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c b/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c
deleted file mode 100644
index 86acdbe0c46e..000000000000
--- a/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- libslab/directory-tile.c.orig Mon Mar 12 16:33:35 2007
-+++ libslab/directory-tile.c Mon Mar 12 16:35:48 2007
-@@ -644,5 +644,5 @@ static void
- disown_spawned_child (gpointer user_data)
- {
- setsid ();
-- setpgrp ();
-+ setpgrp (0, 0);
- }
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 54023d50b185..65d4d00b5e4f 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -28,10 +28,11 @@ lib/window-manager-settings/libmetacity.so
libdata/pkgconfig/gnome-default-applications.pc
libdata/pkgconfig/gnome-keybindings.pc
libdata/pkgconfig/gnome-window-settings-2.0.pc
+sbin/gnome-display-properties-install-systemwide
+%%ABOUTME%%share/applications/gnome-about-me.desktop
share/applications/at-properties.desktop
share/applications/default-applications.desktop
share/applications/display-properties.desktop
-%%ABOUTME%%share/applications/gnome-about-me.desktop
share/applications/gnome-appearance-properties.desktop
share/applications/gnome-font-viewer.desktop
share/applications/gnome-network-properties.desktop
@@ -54,8 +55,6 @@ 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/gtk-theme-thumbnailing.png
%%DATADIR%%/pixmaps/icon-theme-thumbnailing.png
%%ABOUTME%%%%DATADIR%%/pixmaps/left-index-finger.png
@@ -134,6 +133,7 @@ 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
+share/gnome/help/control-center/id/control-center.xml
share/gnome/help/control-center/it/control-center.xml
share/gnome/help/control-center/ja/control-center.xml
share/gnome/help/control-center/oc/control-center.xml
@@ -147,23 +147,23 @@ share/gnome/help/control-center/th/control-center.xml
share/gnome/help/control-center/uk/control-center.xml
share/gnome/help/control-center/vi/control-center.xml
share/gnome/help/control-center/zh_CN/control-center.xml
-share/icons/hicolor/16x16/apps/gnome-display-properties.png
share/icons/hicolor/16x16/apps/gnome-network-properties.png
share/icons/hicolor/16x16/apps/gnome-settings-default-applications.png
-share/icons/hicolor/22x22/apps/gnome-display-properties.png
+share/icons/hicolor/16x16/apps/preferences-desktop-display.png
share/icons/hicolor/22x22/apps/gnome-network-properties.png
share/icons/hicolor/22x22/apps/gnome-settings-default-applications.png
-share/icons/hicolor/24x24/apps/gnome-display-properties.png
+share/icons/hicolor/22x22/apps/preferences-desktop-display.png
share/icons/hicolor/24x24/apps/gnome-network-properties.png
share/icons/hicolor/24x24/apps/gnome-settings-default-applications.png
-share/icons/hicolor/32x32/apps/gnome-display-properties.png
+share/icons/hicolor/24x24/apps/preferences-desktop-display.png
share/icons/hicolor/32x32/apps/gnome-network-properties.png
share/icons/hicolor/32x32/apps/gnome-settings-default-applications.png
+share/icons/hicolor/32x32/apps/preferences-desktop-display.png
share/icons/hicolor/48x48/apps/gnome-network-properties.png
share/icons/hicolor/48x48/apps/gnome-settings-default-applications.png
share/icons/hicolor/48x48/apps/typing-monitor.png
-share/icons/hicolor/scalable/apps/gnome-display-properties.svg
share/icons/hicolor/scalable/apps/gnome-network-properties.svg
+share/icons/hicolor/scalable/apps/preferences-desktop-display.svg
share/icons/hicolor/scalable/apps/typing-monitor.svg
share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -203,11 +203,13 @@ share/locale/he/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/hr/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/hy/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/id/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/is/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/it/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ka/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/kk/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/kn/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -246,6 +248,7 @@ share/locale/ta/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/te/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/th/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/ug/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/uz/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/uz@cyrillic/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -267,6 +270,7 @@ 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
+share/omf/control-center/control-center-id.omf
share/omf/control-center/control-center-it.omf
share/omf/control-center/control-center-ja.omf
share/omf/control-center/control-center-oc.omf
@@ -280,6 +284,7 @@ share/omf/control-center/control-center-th.omf
share/omf/control-center/control-center-uk.omf
share/omf/control-center/control-center-vi.omf
share/omf/control-center/control-center-zh_CN.omf
+share/polkit-1/actions/org.gnome.randr.policy
@dirrm share/omf/control-center
@dirrm share/gnome/help/control-center/zh_CN
@dirrm share/gnome/help/control-center/vi
@@ -294,6 +299,7 @@ share/omf/control-center/control-center-zh_CN.omf
@dirrm share/gnome/help/control-center/oc
@dirrm share/gnome/help/control-center/ja
@dirrm share/gnome/help/control-center/it
+@dirrm share/gnome/help/control-center/id
@dirrm share/gnome/help/control-center/fr
@dirrm share/gnome/help/control-center/es
@dirrm share/gnome/help/control-center/en_GB
@@ -314,6 +320,8 @@ share/omf/control-center/control-center-zh_CN.omf
@dirrm include/gnome-window-settings-2.0
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@comment not sure about this ..
+@unexec rm -f %D/share/applications/mimeinfo.cache > /dev/null || /usr/bin/true
@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/zu/LC_MESSAGES
@@ -324,6 +332,8 @@ share/omf/control-center/control-center-zh_CN.omf
@dirrmtry share/locale/xh
@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -346,6 +356,10 @@ share/omf/control-center/control-center-zh_CN.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/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 5c4b8623ae54..3245f23db47d 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.63 2010/04/26 17:38:05 kwm Exp $
+# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.69 2010/09/27 18:49:22 kwm Exp $
#
PORTNAME= gnome-power-manager
-PORTVERSION= 2.30.1
-PORTREVISION= 1
+PORTVERSION= 2.32.0
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,12 +15,12 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Power management system for the GNOME Desktop
-LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \
- devkit-power-gobject.1:${PORTSDIR}/sysutils/upower \
+LIB_DEPENDS= upower-glib.1:${PORTSDIR}/sysutils/upower \
canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
notify.1:${PORTSDIR}/devel/libnotify \
execinfo:${PORTSDIR}/devel/libexecinfo \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+RUN_DEPENDS= pkexec:${PORTSDIR}/sysutils/polkit
USE_GETTEXT= yes
USE_BZIP2= yes
@@ -29,7 +28,7 @@ USE_GMAKE= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_AUTOTOOLS= libtool:22
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libwnck \
+USE_GNOME= gnomeprefix gnomehack intlhack libwnck \
gnomedocutils gnomepanel
CONFIGURE_ARGS= --with-doc-dir=${PREFIX}/share/doc \
--disable-docbook-docs \
diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo
index 644f6020406d..5ba031ccfdf1 100644
--- a/sysutils/gnome-power-manager/distinfo
+++ b/sysutils/gnome-power-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-power-manager-2.30.1.tar.bz2) = b85178b8db77db5d22e185430549a295
-SHA256 (gnome2/gnome-power-manager-2.30.1.tar.bz2) = 47af6221ae83d329088abd8f5176f503fe5f81417a7c6766c95279b0af05021c
-SIZE (gnome2/gnome-power-manager-2.30.1.tar.bz2) = 3854167
+MD5 (gnome2/gnome-power-manager-2.32.0.tar.bz2) = 9a08e85dce3ffb90775f15e3bda4adda
+SHA256 (gnome2/gnome-power-manager-2.32.0.tar.bz2) = 17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476
+SIZE (gnome2/gnome-power-manager-2.32.0.tar.bz2) = 3892164
diff --git a/sysutils/gnome-power-manager/files/patch-src_Makefile.in b/sysutils/gnome-power-manager/files/patch-src_Makefile.in
index a161ee0fabad..0f4da29db278 100644
--- a/sysutils/gnome-power-manager/files/patch-src_Makefile.in
+++ b/sysutils/gnome-power-manager/files/patch-src_Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig 2010-03-30 18:08:05.000000000 +0800
-+++ src/Makefile.in 2010-03-30 18:09:04.000000000 +0800
-@@ -497,6 +497,7 @@
+--- src/Makefile.in.orig 2010-06-06 12:19:04.000000000 +0200
++++ src/Makefile.in 2010-06-06 12:21:46.000000000 +0200
+@@ -499,6 +499,7 @@
$(GNOME_LIBS) \
$(UNIQUE_LIBS) \
$(DBUS_LIBS) \
@@ -8,30 +8,27 @@
-lm
gnome_power_statistics_CFLAGS = \
-@@ -511,7 +512,7 @@
+@@ -520,6 +521,7 @@
+ $(UNIQUE_LIBS) \
+ $(GPM_EXTRA_LIBS) \
+ $(UPOWER_LIBS) \
++ -lexecinfo \
+ -lm
- gnome_power_preferences_LDADD = libgpmshared.a $(GLIB_LIBS) \
- $(X11_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(UNIQUE_LIBS) \
-- $(GPM_EXTRA_LIBS) $(DEVKIT_LIBS) -lm $(am__append_1)
-+ $(GPM_EXTRA_LIBS) $(DEVKIT_LIBS) -lexecinfo -lm $(am__append_1)
gnome_power_preferences_CFLAGS = \
- $(WARNINGFLAGS) \
- $(NULL)
-@@ -531,7 +532,7 @@
- gnome_power_manager_LDADD = libgpmshared.a $(GLIB_LIBS) $(X11_LIBS) \
- $(GSTREAMER_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(X11_LIBS) \
- $(CANBERRA_LIBS) $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) \
-- $(DEVKIT_LIBS) -lm $(am__append_3)
-+ $(DEVKIT_LIBS) -lexecinfo -lm $(am__append_3)
+@@ -573,6 +575,7 @@
+ $(LIBNOTIFY_LIBS) \
+ $(GPM_EXTRA_LIBS) \
+ $(UPOWER_LIBS) \
++ -lexecinfo \
+ -lm
+
gnome_power_manager_CFLAGS = \
- $(WARNINGFLAGS) \
- $(NULL)
-@@ -590,7 +591,7 @@
+@@ -639,6 +642,7 @@
+ $(X11_LIBS) \
+ $(LIBNOTIFY_LIBS) \
+ $(GPM_EXTRA_LIBS) \
++ -lexecinfo \
+ -lm
- gnome_power_self_test_LDADD = $(GLIB_LIBS) $(X11_LIBS) $(GNOME_LIBS) \
- $(GSTREAMER_LIBS) $(DEVKIT_LIBS) $(DBUS_LIBS) $(X11_LIBS) \
-- $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) -lm $(am__append_4)
-+ $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) -lexecinfo -lm $(am__append_4)
gnome_power_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS) $(WARNINGFLAGS)
- BUILT_SOURCES = \
- org.gnome.PowerManager.h \
diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist
index 47e2c200a9c6..4bd92ff7ec09 100644
--- a/sysutils/gnome-power-manager/pkg-plist
+++ b/sysutils/gnome-power-manager/pkg-plist
@@ -7,6 +7,7 @@ libdata/bonobo/servers/GNOME_BrightnessApplet.server
libdata/bonobo/servers/GNOME_InhibitApplet.server
libexec/gnome-brightness-applet
libexec/gnome-inhibit-applet
+sbin/gnome-power-backlight-helper
share/applications/gnome-power-preferences.desktop
share/applications/gnome-power-statistics.desktop
share/dbus-1/services/gnome-power-manager.service
@@ -690,6 +691,7 @@ share/omf/gnome-power-manager/gnome-power-manager-pa.omf
share/omf/gnome-power-manager/gnome-power-manager-ru.omf
share/omf/gnome-power-manager/gnome-power-manager-sv.omf
share/omf/gnome-power-manager/gnome-power-manager-zh_CN.omf
+share/polkit-1/actions/org.gnome.power.policy
@dirrm share/omf/gnome-power-manager
@dirrm share/gnome/help/gnome-power-manager/zh_CN/figures
@dirrm share/gnome/help/gnome-power-manager/zh_CN
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 1530144d6baf..126aa92f9bbc 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/gnome-settings-daemon/Makefile,v 1.4 2010/06/23 20:44:39 kwm Exp $
+# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.72 2010/11/15 13:50:07 kwm Exp $
#
PORTNAME= gnome-settings-daemon
-PORTVERSION= 2.30.2
+PORTVERSION= 2.32.1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,7 +16,8 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 settings daemon
LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
- notify.1:${PORTSDIR}/devel/libnotify
+ notify.1:${PORTSDIR}/devel/libnotify \
+ nss3.1:${PORTSDIR}/security/nss
RUN_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb
USE_XORG= xxf86misc
@@ -38,6 +39,7 @@ GCONF_SCHEMAS= apps_gnome_settings_daemon_housekeeping.schemas \
apps_gnome_settings_daemon_xrandr.schemas \
desktop_gnome_font_rendering.schemas \
desktop_gnome_keybindings.schemas \
+ desktop_gnome_peripherals_smartcard.schemas \
desktop_gnome_peripherals_touchpad.schemas \
gnome-settings-daemon.schemas
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 145591482cab..4720b385e071 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gnome-settings-daemon-2.30.2.tar.bz2) = b945b1f542167c201a11f0ba1e1a4739
-SHA256 (gnome2/gnome-settings-daemon-2.30.2.tar.bz2) = 7cd22dab52f52900ee13a5bc0c1a186e91d33e77f5333c4622f84d85e4eb71f4
-SIZE (gnome2/gnome-settings-daemon-2.30.2.tar.bz2) = 1250365
+SHA256 (gnome2/gnome-settings-daemon-2.32.1.tar.bz2) = 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86
+SIZE (gnome2/gnome-settings-daemon-2.32.1.tar.bz2) = 1331850
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
index 144568d8cabe..054cf6ea336c 100644
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ b/sysutils/gnome-settings-daemon/pkg-plist
@@ -1,3 +1,4 @@
+etc/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
etc/xdg/autostart/gnome-settings-daemon.desktop
include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-plugin.h
@@ -35,6 +36,9 @@ lib/gnome-settings-daemon-2.0/libkeyboard.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/libsmartcard.a
+lib/gnome-settings-daemon-2.0/libsmartcard.la
+lib/gnome-settings-daemon-2.0/libsmartcard.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
@@ -52,6 +56,7 @@ lib/gnome-settings-daemon-2.0/libxsettings.la
lib/gnome-settings-daemon-2.0/libxsettings.so
%%PULSEAUDIO%%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/smartcard.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
@@ -59,13 +64,20 @@ 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-datetime-mechanism
libexec/gsd-locate-pointer
share/dbus-1/services/org.gnome.SettingsDaemon.service
+share/dbus-1/system-services/org.gnome.SettingsDaemon.DateTimeMechanism.service
share/gnome-control-center/keybindings/50-accessibility.xml
%%DATADIR%%/acme.ui
%%DATADIR%%/gsd-a11y-preferences-dialog.ui
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-off.png
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-on.png
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-numlock-off.png
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-numlock-on.png
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-scrolllock-off.png
+%%DATADIR%%/icons/hicolor/64x64/devices/kbd-scrolllock-on.png
%%DATADIR%%/modmap-dialog.ui
-%%DATADIR%%/show-layout.ui
%%DATADIR%%/xrdb/Editres.ad
%%DATADIR%%/xrdb/Emacs.ad
%%DATADIR%%/xrdb/General.ad
@@ -176,11 +188,18 @@ share/locale/zh_CN/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/zh_HK/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/zh_TW/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
+share/polkit-1/actions/org.gnome.settingsdaemon.datetimemechanism.policy
@dirrm %%DATADIR%%/xrdb
+@dirrm %%DATADIR%%/icons/hicolor/64x64/devices
+@dirrm %%DATADIR%%/icons/hicolor/64x64
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%
@dirrm lib/gnome-settings-daemon-2.0
@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
@dirrm include/gnome-settings-daemon-2.0
+@dirrmtry etc/gnome-settings-daemon/xrandr
+@dirrmtry etc/gnome-settings-daemon
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 81d031828791..db9bc9a3ecc4 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/sysutils/gnome-system-monitor/Makefile,v 1.139 2010/04/01 13:05:19 kwm Exp $
+# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.141 2010/09/29 13:44:33 kwm Exp $
#
PORTNAME= gnome-system-monitor
-PORTVERSION= 2.28.1
-PORTREVISION= 1
+PORTVERSION= 2.28.2
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 925fc1787965..5dbc7e84ca10 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-monitor-2.28.1.tar.bz2) = 064cf1a97d3dd1946bc3e55d8272c2c8
-SHA256 (gnome2/gnome-system-monitor-2.28.1.tar.bz2) = 25b2566af336c44dc279afd7a522e3616b68047f1a1a34c8a5024a52f894429b
-SIZE (gnome2/gnome-system-monitor-2.28.1.tar.bz2) = 2335360
+MD5 (gnome2/gnome-system-monitor-2.28.2.tar.bz2) = 3f0bca9b0ebc7a365466851cd580d167
+SHA256 (gnome2/gnome-system-monitor-2.28.2.tar.bz2) = b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59
+SIZE (gnome2/gnome-system-monitor-2.28.2.tar.bz2) = 2432252
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index fe6d662fa1fa..3cde256016dd 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -219,6 +219,7 @@ share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
share/locale/en@shaw/LC_MESSAGES/gnome-system-monitor.mo
share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo
share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/eo/LC_MESSAGES/gnome-system-monitor.mo
share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
share/locale/et/LC_MESSAGES/gnome-system-monitor.mo
share/locale/eu/LC_MESSAGES/gnome-system-monitor.mo
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 5628f92ce6f4..afb5383de081 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,11 +3,12 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/gnome-system-tools/Makefile,v 1.1 2010/06/24 08:02:01 kwm Exp $
+# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.103 2010/10/25 09:44:29 kwm Exp $
#
PORTNAME= gnome-system-tools
-PORTVERSION= 2.30.2
+PORTVERSION= 2.32.0
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,7 +16,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Tools to configure workstations
-LIB_DEPENDS= oobs-1.4:${PORTSDIR}/devel/liboobs \
+LIB_DEPENDS= oobs-1.5:${PORTSDIR}/devel/liboobs \
polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome
USE_BZIP2= yes
@@ -31,6 +32,6 @@ CONFIGURE_ARGS= --enable-services
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-GCONF_SCHEMAS= gnome-system-tools.schemas
+GLIB_SCHEMAS= org.gnome.system-tools.gschema.xml
.include <bsd.port.mk>
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index d981283007bf..11e810478463 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-tools-2.30.2.tar.bz2) = 9211516168aa171b34823d8c58c807d4
-SHA256 (gnome2/gnome-system-tools-2.30.2.tar.bz2) = ee5d945a32fe962d3574c073416ee950d770e16a87dec2d51b8d4dd6521e880d
-SIZE (gnome2/gnome-system-tools-2.30.2.tar.bz2) = 5401601
+MD5 (gnome2/gnome-system-tools-2.32.0.tar.bz2) = 93e3d21b041c771d4ac12307e4ef3392
+SHA256 (gnome2/gnome-system-tools-2.32.0.tar.bz2) = 71d52698ccb60bc07d6e4e442b7cb178ebf1152396379500df5ec62da4c4d14a
+SIZE (gnome2/gnome-system-tools-2.32.0.tar.bz2) = 5433090
diff --git a/sysutils/gnome-system-tools/files/patch-configure b/sysutils/gnome-system-tools/files/patch-configure
new file mode 100644
index 000000000000..ae9d19daa615
--- /dev/null
+++ b/sysutils/gnome-system-tools/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig 2010-10-25 11:36:00.000000000 +0200
++++ configure 2010-10-25 11:36:25.000000000 +0200
+@@ -13173,8 +13173,8 @@
+ .SECONDARY: $(gsettings_SCHEMAS)
+
+ gsettings__base_list = \
+- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
++ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
+
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ @$(NORMAL_INSTALL)
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 0bfaa9786591..3fa6ba7b6512 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -62,6 +62,8 @@ 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/services-tool.png
share/gnome/help/services-admin/fr/services-admin.xml
+share/gnome/help/services-admin/gl/figures/services-tool.png
+share/gnome/help/services-admin/gl/services-admin.xml
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/services-tool.png
@@ -94,6 +96,8 @@ share/gnome/help/shares-admin/es/figures/shares-tool.png
share/gnome/help/shares-admin/es/shares-admin.xml
share/gnome/help/shares-admin/fr/figures/shares-tool.png
share/gnome/help/shares-admin/fr/shares-admin.xml
+share/gnome/help/shares-admin/gl/figures/shares-tool.png
+share/gnome/help/shares-admin/gl/shares-admin.xml
share/gnome/help/shares-admin/it/figures/shares-tool.png
share/gnome/help/shares-admin/it/shares-admin.xml
share/gnome/help/shares-admin/oc/figures/shares-tool.png
@@ -145,6 +149,11 @@ share/gnome/help/time-admin/fr/figures/time-servers.png
share/gnome/help/time-admin/fr/figures/time-tool-automatic.png
share/gnome/help/time-admin/fr/figures/time-tool-manual.png
share/gnome/help/time-admin/fr/time-admin.xml
+share/gnome/help/time-admin/gl/figures/time-map.png
+share/gnome/help/time-admin/gl/figures/time-servers.png
+share/gnome/help/time-admin/gl/figures/time-tool-automatic.png
+share/gnome/help/time-admin/gl/figures/time-tool-manual.png
+share/gnome/help/time-admin/gl/time-admin.xml
share/gnome/help/time-admin/it/figures/time-map.png
share/gnome/help/time-admin/it/figures/time-servers.png
share/gnome/help/time-admin/it/figures/time-tool-automatic.png
@@ -205,6 +214,9 @@ 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/gl/figures/groups.png
+share/gnome/help/users-admin/gl/figures/users-tool.png
+share/gnome/help/users-admin/gl/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
@@ -254,6 +266,7 @@ share/locale/el/LC_MESSAGES/gnome-system-tools.mo
share/locale/en@shaw/LC_MESSAGES/gnome-system-tools.mo
share/locale/en_CA/LC_MESSAGES/gnome-system-tools.mo
share/locale/en_GB/LC_MESSAGES/gnome-system-tools.mo
+share/locale/eo/LC_MESSAGES/gnome-system-tools.mo
share/locale/es/LC_MESSAGES/gnome-system-tools.mo
share/locale/et/LC_MESSAGES/gnome-system-tools.mo
share/locale/eu/LC_MESSAGES/gnome-system-tools.mo
@@ -310,6 +323,7 @@ share/locale/ta/LC_MESSAGES/gnome-system-tools.mo
share/locale/te/LC_MESSAGES/gnome-system-tools.mo
share/locale/th/LC_MESSAGES/gnome-system-tools.mo
share/locale/tr/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ug/LC_MESSAGES/gnome-system-tools.mo
share/locale/uk/LC_MESSAGES/gnome-system-tools.mo
share/locale/vi/LC_MESSAGES/gnome-system-tools.mo
share/locale/wa/LC_MESSAGES/gnome-system-tools.mo
@@ -339,6 +353,7 @@ share/omf/services-admin/services-admin-el.omf
share/omf/services-admin/services-admin-en_GB.omf
share/omf/services-admin/services-admin-es.omf
share/omf/services-admin/services-admin-fr.omf
+share/omf/services-admin/services-admin-gl.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
@@ -353,6 +368,7 @@ share/omf/shares-admin/shares-admin-el.omf
share/omf/shares-admin/shares-admin-en_GB.omf
share/omf/shares-admin/shares-admin-es.omf
share/omf/shares-admin/shares-admin-fr.omf
+share/omf/shares-admin/shares-admin-gl.omf
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
@@ -366,6 +382,7 @@ 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-gl.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
@@ -380,6 +397,7 @@ share/omf/users-admin/users-admin-el.omf
share/omf/users-admin/users-admin-en_GB.omf
share/omf/users-admin/users-admin-es.omf
share/omf/users-admin/users-admin-fr.omf
+share/omf/users-admin/users-admin-gl.omf
share/omf/users-admin/users-admin-it.omf
share/omf/users-admin/users-admin-oc.omf
share/omf/users-admin/users-admin-pt_BR.omf
@@ -404,6 +422,8 @@ share/omf/users-admin/users-admin-zh_CN.omf
@dirrm share/gnome/help/users-admin/oc
@dirrm share/gnome/help/users-admin/it/figures
@dirrm share/gnome/help/users-admin/it
+@dirrm share/gnome/help/users-admin/gl/figures
+@dirrm share/gnome/help/users-admin/gl
@dirrm share/gnome/help/users-admin/fr/figures
@dirrm share/gnome/help/users-admin/fr
@dirrm share/gnome/help/users-admin/es/figures
@@ -435,6 +455,8 @@ share/omf/users-admin/users-admin-zh_CN.omf
@dirrm share/gnome/help/time-admin/nl
@dirrm share/gnome/help/time-admin/it/figures
@dirrm share/gnome/help/time-admin/it
+@dirrm share/gnome/help/time-admin/gl/figures
+@dirrm share/gnome/help/time-admin/gl
@dirrm share/gnome/help/time-admin/fr/figures
@dirrm share/gnome/help/time-admin/fr
@dirrm share/gnome/help/time-admin/es/figures
@@ -462,6 +484,8 @@ share/omf/users-admin/users-admin-zh_CN.omf
@dirrm share/gnome/help/shares-admin/oc
@dirrm share/gnome/help/shares-admin/it/figures
@dirrm share/gnome/help/shares-admin/it
+@dirrm share/gnome/help/shares-admin/gl/figures
+@dirrm share/gnome/help/shares-admin/gl
@dirrm share/gnome/help/shares-admin/fr/figures
@dirrm share/gnome/help/shares-admin/fr
@dirrm share/gnome/help/shares-admin/es/figures
@@ -493,6 +517,8 @@ share/omf/users-admin/users-admin-zh_CN.omf
@dirrm share/gnome/help/services-admin/nl
@dirrm share/gnome/help/services-admin/it/figures
@dirrm share/gnome/help/services-admin/it
+@dirrm share/gnome/help/services-admin/gl/figures
+@dirrm share/gnome/help/services-admin/gl
@dirrm share/gnome/help/services-admin/fr/figures
@dirrm share/gnome/help/services-admin/fr
@dirrm share/gnome/help/services-admin/es/figures
@@ -544,6 +570,8 @@ share/omf/users-admin/users-admin-zh_CN.omf
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
index 111857bdc7f4..39774813e3f0 100644
--- a/sysutils/pessulus/Makefile
+++ b/sysutils/pessulus/Makefile
@@ -3,11 +3,11 @@
# Whom: FreeBSD GNOME Team
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/pessulus/Makefile,v 1.3 2010/06/23 20:01:35 kwm Exp $
+# $MCom: ports/sysutils/pessulus/Makefile,v 1.30 2010/11/17 11:53:24 kwm Exp $
#
PORTNAME= pessulus
-PORTVERSION= 2.30.2
+PORTVERSION= 2.30.4
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo
index 38102127c821..ff18ed10538b 100644
--- a/sysutils/pessulus/distinfo
+++ b/sysutils/pessulus/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/pessulus-2.30.2.tar.bz2) = fbcfb402e12af2006918fc4ee4c78285
-SHA256 (gnome2/pessulus-2.30.2.tar.bz2) = c6ff212f8db39fb4a4937b7a85a8b668ebbc4555742b00f3d2d40750c92f8e8e
-SIZE (gnome2/pessulus-2.30.2.tar.bz2) = 181716
+SHA256 (gnome2/pessulus-2.30.4.tar.bz2) = 6b623659bd95759b291a2739bc280e73f23dfa9f95b684fbc7d2c6057ceaa7c3
+SIZE (gnome2/pessulus-2.30.4.tar.bz2) = 187192
diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist
index 7a1d333456ee..57e8b89f1bb6 100644
--- a/sysutils/pessulus/pkg-plist
+++ b/sysutils/pessulus/pkg-plist
@@ -79,6 +79,7 @@ share/locale/eo/LC_MESSAGES/pessulus.mo
share/locale/es/LC_MESSAGES/pessulus.mo
share/locale/et/LC_MESSAGES/pessulus.mo
share/locale/eu/LC_MESSAGES/pessulus.mo
+share/locale/fa/LC_MESSAGES/pessulus.mo
share/locale/fi/LC_MESSAGES/pessulus.mo
share/locale/fr/LC_MESSAGES/pessulus.mo
share/locale/gl/LC_MESSAGES/pessulus.mo
@@ -101,6 +102,7 @@ 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/ms/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
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index 65b2e64c32ba..1bea70b0fe70 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast<kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.10 2010/05/10 04:21:19 marcus Exp $
+# $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.14 2010/09/19 20:17:19 kwm Exp $
#
PORTNAME= polkit-gnome
-PORTVERSION= 0.96
-PORTREVISION= 4
+PORTVERSION= 0.99
CATEGORIES= sysutils gnome
MASTER_SITES= http://hal.freedesktop.org/releases/
diff --git a/sysutils/polkit-gnome/distinfo b/sysutils/polkit-gnome/distinfo
index eed5204a9001..a3dd5f0b0f2b 100644
--- a/sysutils/polkit-gnome/distinfo
+++ b/sysutils/polkit-gnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (polkit-gnome-0.96.tar.bz2) = 611cf39fba2945320fc7a9ec49087e69
-SHA256 (polkit-gnome-0.96.tar.bz2) = 0d96c8032d658a2e1eef8adfbeafff0f569ef0cf68b35915423acc00873c8a92
-SIZE (polkit-gnome-0.96.tar.bz2) = 362723
+MD5 (polkit-gnome-0.99.tar.bz2) = f1a2565083266bc8c05c60aa7d8a0f6a
+SHA256 (polkit-gnome-0.99.tar.bz2) = 73c4d04aa89d9a9687f3650327c0ec1cba704e9d5b7fc193958fa81d621208ba
+SIZE (polkit-gnome-0.99.tar.bz2) = 388069
diff --git a/sysutils/polkit-gnome/pkg-plist b/sysutils/polkit-gnome/pkg-plist
index 3a4f4dddf06c..97158f9e5f5e 100644
--- a/sysutils/polkit-gnome/pkg-plist
+++ b/sysutils/polkit-gnome/pkg-plist
@@ -12,6 +12,7 @@ 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/bn_IN/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
@@ -25,19 +26,29 @@ 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/hi/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/kn/LC_MESSAGES/polkit-gnome-1.mo
share/locale/lt/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/ml/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/mr/LC_MESSAGES/polkit-gnome-1.mo
share/locale/nb/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/or/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/ro/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/sl/LC_MESSAGES/polkit-gnome-1.mo
share/locale/sv/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/ta/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/te/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/th/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/uk/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
@@ -45,3 +56,7 @@ share/locale/zh_TW/LC_MESSAGES/polkit-gnome-1.mo
@dirrm include/polkit-gtk-1
@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/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index c9441d0595c0..e1fcbac4cf51 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast<kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/polkit/Makefile,v 1.5 2009/11/26 14:22:58 mezz Exp $
+# $MCom: ports/sysutils/polkit/Makefile,v 1.10 2010/09/16 02:09:43 avl Exp $
#
PORTNAME= polkit
-PORTVERSION= 0.96
-PORTREVISION= 2
+PORTVERSION= 0.99
CATEGORIES= sysutils gnome
MASTER_SITES= http://hal.freedesktop.org/releases/
@@ -54,11 +53,11 @@ post-patch:
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 \
+ ${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
+ ${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
diff --git a/sysutils/polkit/distinfo b/sysutils/polkit/distinfo
index 628723b6c799..edf3d2550267 100644
--- a/sysutils/polkit/distinfo
+++ b/sysutils/polkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (polkit-0.96.tar.gz) = e0a06da501b04ed3bab986a9df5b5aa2
-SHA256 (polkit-0.96.tar.gz) = 3426ca917210b2a5525732559368c18f983a4c39a6a55c5dddba26071bd8054a
-SIZE (polkit-0.96.tar.gz) = 1034210
+MD5 (polkit-0.99.tar.gz) = fcc4d7b19c08ad54d3ce0eae0ab12398
+SHA256 (polkit-0.99.tar.gz) = f612c7c26ec822f67751420057a4ae113fc50ab51070758faacf2ad30bb3583f
+SIZE (polkit-0.99.tar.gz) = 1042461
diff --git a/sysutils/polkit/files/patch-src_polkitd_gposixsignal.c b/sysutils/polkit/files/patch-src_polkitd_gposixsignal.c
new file mode 100644
index 000000000000..4fb366f4f2de
--- /dev/null
+++ b/sysutils/polkit/files/patch-src_polkitd_gposixsignal.c
@@ -0,0 +1,40 @@
+--- src/polkitd/gposixsignal.c.orig 2010-08-29 20:05:07.000000000 -0400
++++ src/polkitd/gposixsignal.c 2010-08-29 20:13:20.000000000 -0400
+@@ -23,7 +23,13 @@
+ #include "config.h"
+
+ #include <unistd.h>
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/event.h>
++#include <sys/time.h>
++#else
+ #include <sys/signalfd.h>
++#endif
+ #include <signal.h>
+
+ #include "gposixsignal.h"
+@@ -83,6 +89,9 @@ _g_posix_signal_source_new (gint signum)
+ gint fd;
+ GSource *_source;
+ _GPosixSignalSource *source;
++#ifdef __FreeBSD__
++ struct kevent ev;
++#endif
+
+ _source = NULL;
+
+@@ -92,7 +101,13 @@ _g_posix_signal_source_new (gint signum)
+ if (sigprocmask (SIG_BLOCK, &sigset, NULL) == -1)
+ g_assert_not_reached ();
+
++#ifdef __FreeBSD__
++ fd = kqueue ();
++ EV_SET (&ev, signum, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL);
++ kevent (fd, &ev, 1, NULL, 0, NULL);
++#else
+ fd = signalfd (-1, &sigset, SFD_NONBLOCK | SFD_CLOEXEC);
++#endif
+
+ _source = g_source_new (&_g_posix_signal_source_funcs, sizeof (_GPosixSignalSource));
+ source = (_GPosixSignalSource *) _source;
diff --git a/sysutils/polkit/pkg-plist b/sysutils/polkit/pkg-plist
index 9c707ff65eb9..5f7672022836 100644
--- a/sysutils/polkit/pkg-plist
+++ b/sysutils/polkit/pkg-plist
@@ -18,6 +18,7 @@ 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/polkitpermission.h
include/polkit-1/polkit/polkitprivate.h
include/polkit-1/polkit/polkitsubject.h
include/polkit-1/polkit/polkitsystembusname.h
@@ -28,18 +29,16 @@ 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/polkitagentenumtypes.h
include/polkit-1/polkitagent/polkitagentlistener.h
include/polkit-1/polkitagent/polkitagentsession.h
include/polkit-1/polkitagent/polkitagenttypes.h
+include/polkit-1/polkitagent/polkitagenttextlistener.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
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index 685ce79c18e3..c9395a67b032 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tracker
PORTVERSION= 0.6.95
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX?= -client
@@ -18,7 +18,7 @@ COMMENT= Object database, tag/metadata database, search tool and indexer
LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
- poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk \
+ poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk \
exif.12:${PORTSDIR}/graphics/libexif \
wv-1.2.4:${PORTSDIR}/textproc/wv \
gmime-2.0.4:${PORTSDIR}/mail/gmime2 \
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 7a5ad5df8f3e..6549d2ce17a6 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/sysutils/upower/Makefile,v 1.1 2010/07/12 14:10:07 kwm Exp $
+# $MCom: ports/sysutils/upower/Makefile,v 1.19 2010/10/05 08:30:15 kwm Exp $
#
PORTNAME= upower
-PORTVERSION= 0.9.5
+PORTVERSION= 0.9.6
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://upower.freedesktop.org/releases/
diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo
index 453b025431ce..3871fbb02191 100644
--- a/sysutils/upower/distinfo
+++ b/sysutils/upower/distinfo
@@ -1,3 +1,3 @@
-MD5 (upower-0.9.5.tar.bz2) = 1c0e5f45345c17fc945dfb365847b587
-SHA256 (upower-0.9.5.tar.bz2) = b34074a5467d442720f4b5d4cee3946fa41dea932463f5e265deb90ae0e7c7a1
-SIZE (upower-0.9.5.tar.bz2) = 473750
+MD5 (upower-0.9.6.tar.bz2) = 9c41e4973fdd6e9b491d1b829a9a35db
+SHA256 (upower-0.9.6.tar.bz2) = aeff4a0c98a12b8beb56ca92314e1e8a6711f13929a294ae3c0a725125a1db4f
+SIZE (upower-0.9.6.tar.bz2) = 453993
diff --git a/sysutils/upower/files/patch-libupower-glib_Makefile.in b/sysutils/upower/files/patch-libupower-glib_Makefile.in
new file mode 100644
index 000000000000..7ecd30cfc5c6
--- /dev/null
+++ b/sysutils/upower/files/patch-libupower-glib_Makefile.in
@@ -0,0 +1,18 @@
+--- libupower-glib/Makefile.in.orig 2010-10-04 14:53:46.000000000 +0100
++++ libupower-glib/Makefile.in 2010-10-05 07:42:17.000000000 +0100
+@@ -364,12 +364,13 @@
+ up-version.h.in
+
+ CLEANFILES = $(BUILT_SOURCES) $(am__append_2)
+-@HAVE_INTROSPECTION_TRUE@introspection_sources = $(libupower_glib_la_SOURCES)
++@HAVE_INTROSPECTION_TRUE@introspection_sources = $(libupower_glib_include_HEADERS) $(libupower_glib_la_SOURCES)
+ @HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+ @HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_CFLAGS = $(INCLUDES)
+-@HAVE_INTROSPECTION_TRUE@PackageKitGlib_1_0_gir_SCANNERFLAGS = --identifier-prefix=Up --warn-all --add-include-path=$(srcdir)
++@HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_SCANNERFLAGS = --identifier-prefix=Up --symbol-prefix=up_ --warn-all --add-include-path=$(srcdir)
+ @HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_LIBS = libupower-glib.la
+ @HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_FILES = $(introspection_sources)
++@HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_NAMESPACE = UPowerGlib
+ @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
+ @HAVE_INTROSPECTION_TRUE@dist_gir_DATA = $(INTROSPECTION_GIRS)
+ @HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0
diff --git a/sysutils/upower/files/patch-src_up-daemon.c b/sysutils/upower/files/patch-src_up-daemon.c
deleted file mode 100644
index eea72a87b7c1..000000000000
--- a/sysutils/upower/files/patch-src_up-daemon.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/up-daemon.c.orig 2010-04-19 11:58:18.000000000 -0400
-+++ src/up-daemon.c 2010-05-09 13:38:28.000000000 -0400
-@@ -488,6 +488,8 @@ up_daemon_suspend_allowed (UpDaemon *dae
- goto out;
-
- ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.suspend", context);
-+ if (!ret)
-+ goto out;
- dbus_g_method_return (context, ret);
-
- out:
-@@ -575,6 +577,8 @@ up_daemon_hibernate_allowed (UpDaemon *d
- goto out;
-
- ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.hibernate", context);
-+ if (!ret)
-+ goto out;
- dbus_g_method_return (context, ret);
-
- out:
diff --git a/sysutils/upower/files/patch-src_up-polkit.c b/sysutils/upower/files/patch-src_up-polkit.c
deleted file mode 100644
index 88a074e9908c..000000000000
--- a/sysutils/upower/files/patch-src_up-polkit.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/up-polkit.c.orig 2010-04-08 21:38:56.000000000 -0400
-+++ src/up-polkit.c 2010-04-09 02:48:12.000000000 -0400
-@@ -69,7 +69,7 @@ up_polkit_check_auth (UpPolkit *polkit,
- {
- gboolean ret = FALSE;
- GError *error;
-- GError *error_local;
-+ GError *error_local = NULL;
- PolkitAuthorizationResult *result;
-
- /* check auth */
-@@ -104,7 +104,7 @@ up_polkit_is_allowed (UpPolkit *polkit,
- {
- gboolean ret = FALSE;
- GError *error;
-- GError *error_local;
-+ GError *error_local = NULL;
- PolkitAuthorizationResult *result;
-
- /* check auth */
diff --git a/sysutils/upower/pkg-plist b/sysutils/upower/pkg-plist
index 8f96cd1fc98c..ba51b6f99593 100644
--- a/sysutils/upower/pkg-plist
+++ b/sysutils/upower/pkg-plist
@@ -2,16 +2,6 @@ bin/devkit-power
bin/upower
etc/UPower/UPower.conf
etc/dbus-1/system.d/org.freedesktop.UPower.conf
-include/DeviceKit-power/devkit-power-gobject/devicekit-power.h
-include/DeviceKit-power/devkit-power-gobject/dkp-client.h
-include/DeviceKit-power/devkit-power-gobject/dkp-device.h
-include/DeviceKit-power/devkit-power-gobject/dkp-enum.h
-include/DeviceKit-power/devkit-power-gobject/dkp-history-obj.h
-include/DeviceKit-power/devkit-power-gobject/dkp-qos-obj.h
-include/DeviceKit-power/devkit-power-gobject/dkp-stats-obj.h
-include/DeviceKit-power/devkit-power-gobject/dkp-version.h
-include/DeviceKit-power/devkit-power-gobject/dkp-wakeups-obj.h
-include/DeviceKit-power/devkit-power-gobject/dkp-wakeups.h
include/libupower-glib/up-client.h
include/libupower-glib/up-device.h
include/libupower-glib/up-history-item.h
@@ -23,15 +13,10 @@ include/libupower-glib/up-wakeup-item.h
include/libupower-glib/up-wakeups.h
include/libupower-glib/upower.h
lib/girepository-1.0/UPowerGlib-1.0.typelib
-lib/libdevkit-power-gobject.a
-lib/libdevkit-power-gobject.la
-lib/libdevkit-power-gobject.so
-lib/libdevkit-power-gobject.so.1
lib/libupower-glib.a
lib/libupower-glib.la
lib/libupower-glib.so
lib/libupower-glib.so.1
-libdata/pkgconfig/devkit-power-gobject.pc
libdata/pkgconfig/upower-glib.pc
libexec/devkit-power-daemon
libexec/upowerd
@@ -47,8 +32,6 @@ share/locale/sv/LC_MESSAGES/upower.mo
share/polkit-1/actions/org.freedesktop.upower.policy
share/polkit-1/actions/org.freedesktop.upower.qos.policy
@exec mkdir -p /var/lib/DeviceKit-power
-@dirrm include/DeviceKit-power/devkit-power-gobject
-@dirrm include/DeviceKit-power
@dirrm include/libupower-glib
@dirrm etc/UPower
@unexec rmdir /var/lib/DeviceKit-power 2>/dev/null || true
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 1ab44e4f0398..d2b80deed3ed 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/textproc/gnome-doc-utils/Makefile,v 1.82 2010/04/27 00:16:27 kwm Exp $
+# $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.84 2010/09/29 15:20:02 kwm Exp $
#
PORTNAME= gnome-doc-utils
-PORTVERSION= 0.20.1
-PORTREVISION= 1
+PORTVERSION= 0.20.2
CATEGORIES= textproc gnome
MASTER_SITES= GNOME
diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo
index 500af1457aa9..e5303c229334 100644
--- a/textproc/gnome-doc-utils/distinfo
+++ b/textproc/gnome-doc-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-doc-utils-0.20.1.tar.bz2) = 19e67da738497f82a2a36a603953f588
-SHA256 (gnome-doc-utils-0.20.1.tar.bz2) = 2a744dc0561fc9e2d8b1fc1c2dcf6e5dd07663affb3e908cd1fe5b1dd3cca26b
-SIZE (gnome-doc-utils-0.20.1.tar.bz2) = 714900
+MD5 (gnome-doc-utils-0.20.2.tar.bz2) = 920914c13c57e67616c6ff8594579786
+SHA256 (gnome-doc-utils-0.20.2.tar.bz2) = f6c0124f61b9400c63da630dd3a9ac1b738eac0058da245661ff699fad267aca
+SIZE (gnome-doc-utils-0.20.2.tar.bz2) = 707344
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index 486c05dab789..afeef5808270 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/textproc/intltool/Makefile,v 1.11 2008/10/08 21:37:49 marcus Exp $
+# $MCom: ports/textproc/intltool/Makefile,v 1.13 2010/05/29 19:19:26 kwm Exp $
PORTNAME= intltool
-PORTVERSION= 0.40.6
+PORTVERSION= 0.41.1
CATEGORIES= textproc gnome
-MASTER_SITES= GNOME
+MASTER_SITES= http://launchpadlibrarian.net/41841194/
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
@@ -17,7 +17,6 @@ COMMENT= Tools to internationalize various kinds of data files
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
-USE_BZIP2= yes
USE_GMAKE= yes
USE_ICONV= yes
USE_PERL5= yes
diff --git a/textproc/intltool/distinfo b/textproc/intltool/distinfo
index 0b5656bd6ae0..0f44229d94b0 100644
--- a/textproc/intltool/distinfo
+++ b/textproc/intltool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome/intltool-0.40.6.tar.bz2) = 69bc0353323112f42ad4f9cf351bc3e5
-SHA256 (gnome/intltool-0.40.6.tar.bz2) = 4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64
-SIZE (gnome/intltool-0.40.6.tar.bz2) = 140340
+MD5 (gnome/intltool-0.41.1.tar.gz) = d6c91bf06681919ccfdf3624035b75dc
+SHA256 (gnome/intltool-0.41.1.tar.gz) = 06d02133a85b9d6f29cd763050dc9267a6d73ef3008993f5b917cafc7ece96c0
+SIZE (gnome/intltool-0.41.1.tar.gz) = 139287
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index 2ac9ee98bbbd..d965472f1c37 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -4,11 +4,11 @@
# Whom: Ying-Chieh Liao <ijliao@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/textproc/libxml++26/Makefile,v 1.37 2010/04/03 16:02:01 avl Exp $
+# $MCom: ports/textproc/libxml++26/Makefile,v 1.39 2010/10/15 03:29:33 avl Exp $
#
PORTNAME= libxml++
-PORTVERSION= 2.30.0
+PORTVERSION= 2.32.0
PORTREVISION?= 0
CATEGORIES= textproc
MASTER_SITES= GNOME
@@ -45,4 +45,4 @@ post-patch:
.include <bsd.port.mk>
-.endif \ No newline at end of file
+.endif
diff --git a/textproc/libxml++26/distinfo b/textproc/libxml++26/distinfo
index 430d2895f418..7e44f8ab5931 100644
--- a/textproc/libxml++26/distinfo
+++ b/textproc/libxml++26/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxml++-2.30.0.tar.bz2) = ae752b65c016391cbca40bc73bcc67c0
-SHA256 (libxml++-2.30.0.tar.bz2) = f3957b1c1e5d25be6d8dd0f409ad7d8b0dd71bfa57e53ec9f866824669e2f7c1
-SIZE (libxml++-2.30.0.tar.bz2) = 653319
+MD5 (libxml++-2.32.0.tar.bz2) = f25c032942653211311754608abf46a4
+SHA256 (libxml++-2.32.0.tar.bz2) = 7989e285ca6fe63379121a2afea8dd4806abef6ecf1cb84f4fc4e9de18b43c25
+SIZE (libxml++-2.32.0.tar.bz2) = 831918
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index fcc316e0c0ea..770393fa2e1d 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany-extensions/Makefile,v 1.125 2010/04/02 20:47:49 kwm Exp $
+# $MCom: ports/www/epiphany-extensions/Makefile,v 1.132 2010/09/19 15:40:33 kwm Exp $
#
PORTNAME= epiphany-extensions
-PORTVERSION= 2.30.1
+PORTVERSION= 2.30.2
PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= GNOME
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index 81cd87b8dd86..ef2a5cf705cb 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-extensions-2.30.1.tar.bz2) = 7553dcdf452dc8f310d33d58aa825925
-SHA256 (gnome2/epiphany-extensions-2.30.1.tar.bz2) = 2f91b34e5854df382bb30bf93ae469490a5321d1ad006ff45032e3127eddb63d
-SIZE (gnome2/epiphany-extensions-2.30.1.tar.bz2) = 1565963
+MD5 (gnome2/epiphany-extensions-2.30.2.tar.bz2) = 4ee9beee4bfd8a588a6821e164c48b3d
+SHA256 (gnome2/epiphany-extensions-2.30.2.tar.bz2) = bdd0aad473262f2ac780d34c09644d0dd0066cb01f2cc66b3d200b946fd2db27
+SIZE (gnome2/epiphany-extensions-2.30.2.tar.bz2) = 1565280
diff --git a/www/epiphany-extensions/files/patch-extensions_adblock_adblock-ui.c b/www/epiphany-extensions/files/patch-extensions_adblock_adblock-ui.c
new file mode 100644
index 000000000000..7131e43328fa
--- /dev/null
+++ b/www/epiphany-extensions/files/patch-extensions_adblock_adblock-ui.c
@@ -0,0 +1,22 @@
+--- extensions/adblock/adblock-ui.c.orig 2010-08-19 08:56:01.000000000 +0200
++++ extensions/adblock/adblock-ui.c 2010-08-19 08:56:39.000000000 +0200
+@@ -65,7 +65,7 @@
+ struct _AdblockUIPrivate
+ {
+ GtkWidget *dialog;
+- GtkNotebook *notebook;
++ GtkWidget *notebook;
+
+ /* Pages */
+ InfoPage *pages[LAST_PAGE];
+@@ -347,8 +347,8 @@
+ }
+
+ static void
+-adblock_ui_switch_page (GtkNotebook *notebook,
+- GtkNotebookPage *page,
++adblock_ui_switch_page (GtkWidget *notebook,
++ GtkWidget *page,
+ guint page_num,
+ AdblockUI *dialog)
+ {
diff --git a/www/epiphany-extensions/files/patch-extensions_adblock_ephy-adblock-extension.c b/www/epiphany-extensions/files/patch-extensions_adblock_ephy-adblock-extension.c
new file mode 100644
index 000000000000..50ea0b3d3a4e
--- /dev/null
+++ b/www/epiphany-extensions/files/patch-extensions_adblock_ephy-adblock-extension.c
@@ -0,0 +1,13 @@
+--- extensions/adblock/ephy-adblock-extension.c.orig 2010-08-19 08:54:27.000000000 +0200
++++ extensions/adblock/ephy-adblock-extension.c 2010-08-19 08:54:54.000000000 +0200
+@@ -385,8 +385,8 @@ ephy_adblock_extension_edit_cb (GtkActio
+ }
+
+ static void
+-switch_page_cb (GtkNotebook *notebook,
+- GtkNotebookPage *page,
++switch_page_cb (GtkWidget *notebook,
++ GtkWidget *page,
+ guint page_num,
+ EphyWindow *window)
+ {
diff --git a/www/epiphany-extensions/files/patch-extensions_permissions_ephy-permissions-dialog.c b/www/epiphany-extensions/files/patch-extensions_permissions_ephy-permissions-dialog.c
new file mode 100644
index 000000000000..129157887c52
--- /dev/null
+++ b/www/epiphany-extensions/files/patch-extensions_permissions_ephy-permissions-dialog.c
@@ -0,0 +1,22 @@
+--- extensions/permissions/ephy-permissions-dialog.c.orig 2010-08-19 09:05:33.000000000 +0200
++++ extensions/permissions/ephy-permissions-dialog.c 2010-08-19 09:05:58.000000000 +0200
+@@ -56,7 +56,7 @@ struct EphyPermissionsDialogPrivate
+ {
+ EphyPermissionManager *manager;
+ GList *tabs;
+- GtkNotebook *notebook;
++ GtkWidget *notebook;
+ GtkSizeGroup *buttons_size_group;
+ };
+
+@@ -219,8 +219,8 @@ fill_tab (DialogTab *tab)
+ }
+
+ static void
+-sync_notebook_tab (GtkNotebook *notebook,
+- GtkNotebookPage *page,
++sync_notebook_tab (GtkWidget *notebook,
++ GtkWidget *page,
+ int page_num,
+ EphyPermissionsDialog *dialog)
+ {
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index d8b0d1318066..d1cc19002abe 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany/Makefile,v 1.228 2010/05/09 00:11:47 marcus Exp $
+# $MCom: ports/www/epiphany/Makefile,v 1.240 2010/10/10 19:16:00 marcus Exp $
#
PORTNAME= epiphany
-PORTVERSION= 2.30.2
+PORTVERSION= 2.30.6
PORTREVISION?= 1
CATEGORIES= www gnome
MASTER_SITES= GNOME
@@ -20,8 +20,9 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-
${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \
+ soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \
notify.1:${PORTSDIR}/devel/libnotify \
- gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
+ gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
${LOCALBASE}/share/icons/HighContrastLargePrint/index.theme:${PORTSDIR}/x11-themes/gnome-themes
@@ -49,8 +50,8 @@ PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}"
MAN1= epiphany.1
OPTIONS= NSS "Import passwords from 2.26 and older on first run" on \
- SEED "Enable seed (JavaScript) support" on \
- SPELLCHECK "Enable spell checking by default" on
+ SPELLCHECK "Enable spell checking by default" on \
+ SEED "Enable seed (JavaScript) support" off \
.if defined(PACKAGE_BUILDING)
.undef WITHOUT_GNOME
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 055b312cf580..89469ba78b54 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-2.30.2.tar.bz2) = 29b084acfa016540d91d3601ec3dff5c
-SHA256 (gnome2/epiphany-2.30.2.tar.bz2) = cd0124e71e72142593cfeb442d58d97e99ba94ace6e31d94717fe977c0bfb98a
-SIZE (gnome2/epiphany-2.30.2.tar.bz2) = 5881032
+MD5 (gnome2/epiphany-2.30.6.tar.bz2) = 0c566b3ffd428d2135e3c8cb65352d64
+SHA256 (gnome2/epiphany-2.30.6.tar.bz2) = 278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc
+SIZE (gnome2/epiphany-2.30.6.tar.bz2) = 5927938
diff --git a/www/epiphany/files/patch-embed_ephy-embed-prefs.c b/www/epiphany/files/patch-embed_ephy-embed-prefs.c
index 2f361fc443b8..197a264783c2 100644
--- a/www/epiphany/files/patch-embed_ephy-embed-prefs.c
+++ b/www/epiphany/files/patch-embed_ephy-embed-prefs.c
@@ -6,7 +6,7 @@
/* Update Soup session */
- session = webkit_get_default_session ();
- g_object_set (G_OBJECT (session), webkit_pref, langs_str, NULL);
-+ if (strlen (langs_str) > 0) {
++ if (langs_str != NULL && strlen (langs_str) > 0) {
+ session = webkit_get_default_session ();
+ g_object_set (G_OBJECT (session), webkit_pref, langs_str, NULL);
+ }
diff --git a/www/epiphany/files/patch-src_Makefile.in b/www/epiphany/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..2d715ad69703
--- /dev/null
+++ b/www/epiphany/files/patch-src_Makefile.in
@@ -0,0 +1,26 @@
+--- src/Makefile.in.orig 2010-10-04 21:25:05.000000000 +0000
++++ src/Makefile.in 2010-10-04 21:29:36.000000000 +0000
+@@ -1584,8 +1584,10 @@
+ @HAVE_INTROSPECTION_TRUE@Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILES) \
+ @HAVE_INTROSPECTION_TRUE@ $(EPHY_GIR_C_FILES) epiphany
+ @HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
+-@HAVE_INTROSPECTION_TRUE@ $(INTROSPECTION_SCANNER) -v \
+-@HAVE_INTROSPECTION_TRUE@ --namespace Epiphany \
++@HAVE_INTROSPECTION_TRUE@ $(INTROSPECTION_SCANNER) -v --warn-all \
++@HAVE_INTROSPECTION_TRUE@ --identifier-prefix=Ephy \
++@HAVE_INTROSPECTION_TRUE@ --symbol-prefix=ephy \
++@HAVE_INTROSPECTION_TRUE@ --namespace=Epiphany \
+ @HAVE_INTROSPECTION_TRUE@ --nsversion=$(EPIPHANY_API_VERSION) \
+ @HAVE_INTROSPECTION_TRUE@ --add-include-path=. \
+ @HAVE_INTROSPECTION_TRUE@ --add-include-path=$(srcdir) \
+@@ -1593,8 +1595,8 @@
+ @HAVE_INTROSPECTION_TRUE@ --include=libxml2-2.0 \
+ @HAVE_INTROSPECTION_TRUE@ --include=WebKit-1.0 \
+ @HAVE_INTROSPECTION_TRUE@ --program=./epiphany \
+-@HAVE_INTROSPECTION_TRUE@ --output $@ \
+-@HAVE_INTROSPECTION_TRUE@ --pkg epiphany-$(EPIPHANY_API_VERSION) \
++@HAVE_INTROSPECTION_TRUE@ --output=$@ \
++@HAVE_INTROSPECTION_TRUE@ --pkg=epiphany-$(EPIPHANY_API_VERSION) \
+ @HAVE_INTROSPECTION_TRUE@ -DEPIPHANY_COMPILATION \
+ @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir)/embed \
+ @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir)/lib \
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index ed5adcca9d3a..c14e43c94c51 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -40,26 +40,26 @@ share/applications/epiphany.desktop
share/dbus-1/services/org.gnome.Epiphany.service
lib/girepository-1.0/Epiphany-2.30.typelib
share/gir-1.0/Epiphany-2.30.gir
-%%DOCSDIR%%/EphyCommandManager.html
-%%DOCSDIR%%/EphyEmbed.html
+%%DOCSDIR%%/EphyDialog.html
+%%DOCSDIR%%/EphyLocationAction.html
%%DOCSDIR%%/EphyLocationEntry.html
-%%DOCSDIR%%/EphyNodeDb.html
+%%DOCSDIR%%/EphyNodeView.html
%%DOCSDIR%%/EphySearchEntry.html
%%DOCSDIR%%/EphySpinner.html
+%%DOCSDIR%%/EphyStatusbar.html
+%%DOCSDIR%%/EphyToolbar.html
+%%DOCSDIR%%/EphyTreeModelNode.html
+%%DOCSDIR%%/EphyTreeModelSort.html
+%%DOCSDIR%%/EphyWebView.html
%%DOCSDIR%%/EphyWindow.html
+%%DOCSDIR%%/EphyZoomAction.html
%%DOCSDIR%%/EphyZoomControl.html
+%%DOCSDIR%%/annotation-glossary.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-password-manager.html
-%%DOCSDIR%%/epiphany-ephy-session.html
-%%DOCSDIR%%/epiphany-ephy-shell.html
+%%DOCSDIR%%/epiphany-Epiphany-Debug-Helpers.html
+%%DOCSDIR%%/epiphany-Epiphany-File-Helpers.html
%%DOCSDIR%%/epiphany.devhelp
%%DOCSDIR%%/epiphany.devhelp2
%%DOCSDIR%%/home.png
@@ -222,6 +222,7 @@ share/icons/hicolor/32x32/apps/gnome-web-browser.png
share/icons/hicolor/48x48/apps/epiphany-bookmarks.png
share/icons/hicolor/scalable/apps/gnome-web-browser.svg
share/locale/am/LC_MESSAGES/epiphany.mo
+share/locale/an/LC_MESSAGES/epiphany.mo
share/locale/ar/LC_MESSAGES/epiphany.mo
share/locale/as/LC_MESSAGES/epiphany.mo
share/locale/ast/LC_MESSAGES/epiphany.mo
@@ -400,8 +401,6 @@ share/omf/epiphany/epiphany-uk.omf
@dirrmtry %%DATADIR%%
@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
@@ -458,3 +457,5 @@ share/omf/epiphany/epiphany-uk.omf
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index 30693567e868..4f107af21381 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.66 2010/04/01 12:38:24 kwm Exp $
+# $MCom: ports/www/evolution-webcal/Makefile,v 1.69 2010/09/29 12:56:07 kwm Exp $
#
PORTNAME= evolution-webcal
-PORTVERSION= 2.28.1
-PORTREVISION= 1
+PORTVERSION= 2.32.0
CATEGORIES= www gnome
MASTER_SITES= GNOME
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo
index 8a4d1a0f3f74..1da8895a4d94 100644
--- a/www/evolution-webcal/distinfo
+++ b/www/evolution-webcal/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-webcal-2.28.1.tar.bz2) = c5bdefc1ad9128dab4fc2ec2e86ef07d
-SHA256 (evolution-webcal-2.28.1.tar.bz2) = eeff6d0c9f45647ee1bc19585fd17f81caa87e99b95501f87d7ab1cdac1060c1
-SIZE (evolution-webcal-2.28.1.tar.bz2) = 162470
+MD5 (evolution-webcal-2.32.0.tar.bz2) = eec3c2464b18853fd03ebb4da1a69031
+SHA256 (evolution-webcal-2.32.0.tar.bz2) = b6ae8a105665771c4069be96d67e0c10f13e01417805cb3a1900c397c9bd580c
+SIZE (evolution-webcal-2.32.0.tar.bz2) = 163816
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 046c9e4b6c73..e839181c1bc1 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.21 2010/04/01 21:10:51 kwm Exp $
+# $MCom: ports/www/gnome-user-share/Makefile,v 1.23 2010/09/28 08:52:36 kwm Exp $
#
PORTNAME= gnome-user-share
-PORTVERSION= 2.30.0
-PORTREVISION= 2
+PORTVERSION= 2.30.1
CATEGORIES= www deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/www/gnome-user-share/distinfo b/www/gnome-user-share/distinfo
index c0d7485256ba..741941d9dacf 100644
--- a/www/gnome-user-share/distinfo
+++ b/www/gnome-user-share/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-user-share-2.30.0.tar.bz2) = a736a1bebc1782d3d6e7a7239158f189
-SHA256 (gnome2/gnome-user-share-2.30.0.tar.bz2) = 75f5424d7062c8ee82c2a65f6c952a04aca92070134de4a69c9e2e5ec50d4163
-SIZE (gnome2/gnome-user-share-2.30.0.tar.bz2) = 944583
+MD5 (gnome2/gnome-user-share-2.30.1.tar.bz2) = 532f3d310ec9b42bf2dd015ab5b64092
+SHA256 (gnome2/gnome-user-share-2.30.1.tar.bz2) = 30ba07420a495450f80b4be001601150453ddc3504ff23c486fd1541ff5a1bfe
+SIZE (gnome2/gnome-user-share-2.30.1.tar.bz2) = 959747
diff --git a/www/gnome-user-share/files/patch-configure b/www/gnome-user-share/files/patch-configure
index 27fe70c56841..7c2899da0167 100644
--- a/www/gnome-user-share/files/patch-configure
+++ b/www/gnome-user-share/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2010-03-16 13:46:47.000000000 +0100
-+++ configure 2010-03-16 13:46:47.000000000 +0100
-@@ -13261,12 +13261,12 @@
+--- configure.orig 2010-09-28 10:42:29.000000000 +0000
++++ configure 2010-09-28 10:43:25.000000000 +0000
+@@ -13411,12 +13411,12 @@
pkg_cv_USER_SHARE_CFLAGS="$USER_SHARE_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -16,7 +16,7 @@
else
pkg_failed=yes
fi
-@@ -13277,12 +13277,12 @@
+@@ -13427,12 +13427,12 @@
pkg_cv_USER_SHARE_LIBS="$USER_SHARE_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -32,7 +32,7 @@
else
pkg_failed=yes
fi
-@@ -13300,14 +13300,14 @@
+@@ -13452,14 +13452,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -45,8 +45,8 @@
# Put the nasty error message in config.log where it belongs
echo "$USER_SHARE_PKG_ERRORS" >&5
-- as_fn_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_fn_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:
+- as_fn_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_fn_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/pkg-plist b/www/gnome-user-share/pkg-plist
index 6423483af4d5..609b8dd2395c 100644
--- a/www/gnome-user-share/pkg-plist
+++ b/www/gnome-user-share/pkg-plist
@@ -84,6 +84,7 @@ share/locale/ast/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/br/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
@@ -94,6 +95,7 @@ share/locale/el/LC_MESSAGES/gnome-user-share.mo
share/locale/en@shaw/LC_MESSAGES/gnome-user-share.mo
share/locale/en_CA/LC_MESSAGES/gnome-user-share.mo
share/locale/en_GB/LC_MESSAGES/gnome-user-share.mo
+share/locale/eo/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
@@ -105,6 +107,7 @@ share/locale/gu/LC_MESSAGES/gnome-user-share.mo
share/locale/he/LC_MESSAGES/gnome-user-share.mo
share/locale/hi/LC_MESSAGES/gnome-user-share.mo
share/locale/hu/LC_MESSAGES/gnome-user-share.mo
+share/locale/id/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
@@ -118,6 +121,7 @@ share/locale/mr/LC_MESSAGES/gnome-user-share.mo
share/locale/nb/LC_MESSAGES/gnome-user-share.mo
share/locale/ne/LC_MESSAGES/gnome-user-share.mo
share/locale/nl/LC_MESSAGES/gnome-user-share.mo
+share/locale/nn/LC_MESSAGES/gnome-user-share.mo
share/locale/oc/LC_MESSAGES/gnome-user-share.mo
share/locale/or/LC_MESSAGES/gnome-user-share.mo
share/locale/pa/LC_MESSAGES/gnome-user-share.mo
@@ -137,6 +141,7 @@ share/locale/ta/LC_MESSAGES/gnome-user-share.mo
share/locale/te/LC_MESSAGES/gnome-user-share.mo
share/locale/th/LC_MESSAGES/gnome-user-share.mo
share/locale/tr/LC_MESSAGES/gnome-user-share.mo
+share/locale/ug/LC_MESSAGES/gnome-user-share.mo
share/locale/uk/LC_MESSAGES/gnome-user-share.mo
share/locale/vi/LC_MESSAGES/gnome-user-share.mo
share/locale/zh_CN/LC_MESSAGES/gnome-user-share.mo
@@ -181,6 +186,8 @@ share/omf/gnome-user-share/gnome-user-share-zh_CN.omf
@dirrmtry share/applications
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index cbaee3d3933b..eda3d7c5e73b 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/www/gtkhtml3/Makefile,v 1.9 2010/06/22 20:20:38 kwm Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.177 2010/11/15 16:59:05 kwm Exp $
#
PORTNAME= gtkhtml3
-PORTVERSION= 3.30.3
+PORTVERSION= 3.32.1
CATEGORIES= www gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -28,7 +28,7 @@ USE_GETTEXT= yes
USE_BZIP2= yes
USE_XORG= xinerama xi xrandr xcursor xcomposite xdamage
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack libglade2 ltverhack
+USE_GNOME= gnomeprefix gnomehack intlhack gconf2 ltverhack
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -39,7 +39,8 @@ 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' \
+ @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g ; \
+ s|-DGDK_DISABLE_DEPRECATED||g' \
${WRKSRC}/configure
.include <bsd.port.mk>
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 78d2c84e0067..59301a05e64f 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gtkhtml-3.30.3.tar.bz2) = 0d11cebd0f1fe25435ab00d7cd26df7b
-SHA256 (gnome2/gtkhtml-3.30.3.tar.bz2) = 99795c154f1c6459063bb8018066ad46baf086a2419510ed959167d4d9e35fae
-SIZE (gnome2/gtkhtml-3.30.3.tar.bz2) = 1354771
+SHA256 (gnome2/gtkhtml-3.32.1.tar.bz2) = 78b6da6c1f4f61947f77de505a626a028ee3ecb6ad3c7c06cc4a6273e16d95c6
+SIZE (gnome2/gtkhtml-3.32.1.tar.bz2) = 1196875
diff --git a/www/gtkhtml3/files/patch-components_editor_gtkhtml-spell-dialog.c b/www/gtkhtml3/files/patch-components_editor_gtkhtml-spell-dialog.c
new file mode 100644
index 000000000000..ec390b5d8173
--- /dev/null
+++ b/www/gtkhtml3/files/patch-components_editor_gtkhtml-spell-dialog.c
@@ -0,0 +1,13 @@
+--- components/editor/gtkhtml-spell-dialog.c.orig 2010-09-19 17:57:00.000000000 +0000
++++ components/editor/gtkhtml-spell-dialog.c 2010-09-19 17:57:41.000000000 +0000
+@@ -443,7 +443,9 @@ spell_dialog_init (GtkhtmlSpellDialog *d
+
+ gtk_dialog_add_button (
+ GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
++#if !GTK_CHECK_VERSION(2,90,7)
++ g_object_set (dialog, "has-separator", FALSE, NULL);
++#endif
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Spell Checker"));
+ gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index 919730fbe361..3a36ed5b8cbf 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -19,11 +19,11 @@ lib/libgtkhtml-%%VERSION%%.a
lib/libgtkhtml-%%VERSION%%.la
lib/libgtkhtml-%%VERSION%%.so
lib/libgtkhtml-%%VERSION%%.so.19
-lib/libgtkhtml-editor.a
-lib/libgtkhtml-editor.la
-lib/libgtkhtml-editor.so
-lib/libgtkhtml-editor.so.0
-libdata/pkgconfig/gtkhtml-editor.pc
+lib/libgtkhtml-editor-%%VERSION%%.a
+lib/libgtkhtml-editor-%%VERSION%%.la
+lib/libgtkhtml-editor-%%VERSION%%.so
+lib/libgtkhtml-editor-%%VERSION%%.so.0
+libdata/pkgconfig/gtkhtml-editor-%%VERSION%%.pc
libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
share/gtkhtml-%%VERSION%%/gtkhtml-editor-builder.ui
share/gtkhtml-%%VERSION%%/gtkhtml-editor-manager.ui
diff --git a/www/osb-browser/Makefile b/www/osb-browser/Makefile
index 42d344a2c9a6..fb74b1982399 100644
--- a/www/osb-browser/Makefile
+++ b/www/osb-browser/Makefile
@@ -24,6 +24,7 @@ USE_AUTOTOOLS= libtool:22
post-patch:
@${REINPLACE_CMD} -e 's|-nostdinc++||g ; \
+ s|-DGTK_DISABLE_DEPRECATED||g ; \
s|-Werror -ansi||g ; \
s|-nodefaultlibs -lgcc -lc||g' ${WRKSRC}/configure
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 1ff75ed332fc..e791d29bc59f 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,11 +3,12 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/www/webkit-gtk2/Makefile,v 1.1 2010/07/14 13:43:27 kwm Exp $
+# $MCom: ports/www/webkit-gtk2/Makefile,v 1.70 2010/10/20 12:46:17 kwm Exp $
#
PORTNAME= webkit
PORTVERSION= 1.2.5
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/
PKGNAMESUFFIX= -gtk2
@@ -16,13 +17,11 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= An opensource browser engine
BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
- g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
- ${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup
+ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \
curl.6:${PORTSDIR}/ftp/curl \
sqlite3.8:${PORTSDIR}/databases/sqlite3 \
soup-2.4.1:${PORTSDIR}/devel/libsoup
-RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup
USE_GETTEXT= yes
WANT_GSTREAMER= yes
diff --git a/www/webkit-gtk2/files/patch-WebKit_gtk_JSCore-1.0.gir b/www/webkit-gtk2/files/patch-WebKit_gtk_JSCore-1.0.gir
new file mode 100644
index 000000000000..8a13bac74d97
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-WebKit_gtk_JSCore-1.0.gir
@@ -0,0 +1,22 @@
+--- WebKit/gtk/JSCore-1.0.gir.orig 2010-09-19 16:07:49.000000000 +0000
++++ WebKit/gtk/JSCore-1.0.gir 2010-09-19 16:08:26.000000000 +0000
+@@ -1,12 +1,14 @@
+ <?xml version="1.0"?>
+-<repository version="1.0"
++<repository version="1.2"
+ xmlns="http://www.gtk.org/introspection/core/1.0"
+ xmlns:c="http://www.gtk.org/introspection/c/1.0">
+ <namespace name="JSCore" version="1.0" shared-library="webkit-1.0">
+- <alias name="GlobalContextRef"
+- target="none"
+- c:type="JSGlobalContextRef"/>
+- <alias name="ObjectRef" target="none" c:type="JSObjectRef"/>
++ <alias name="GlobalContextRef" target="none">
++ <type name="JSGlobalContextRef" c:type="JSGlobalContextRef"/>
++ </alias>
++ <alias name="ObjectRef" target="none">
++ <type name="JSObjectRef" c:type="JSObjectRef"/>
++ </alias>
+ <function name="EvaluateScript" c:identifier="JSEvaluateScript">
+ <return-value transfer-ownership="none">
+ <type name="none" c:type="void"/>
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 6fac74c6cd76..f48b048cddcb 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,12 +3,11 @@
# Whom: ade, archie
#
# $FreeBSD$
-# $MCom: ports/x11-fm/nautilus/Makefile,v 1.196 2010/04/26 22:22:10 kwm Exp $
+# $MCom: ports/x11-fm/nautilus/Makefile,v 1.206 2010/11/13 12:53:45 kwm Exp $
#
PORTNAME= nautilus
-PORTVERSION= 2.30.1
-PORTREVISION= 1
+PORTVERSION= 2.32.1
CATEGORIES= x11-fm gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,6 +15,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT?= File manager for the GNOME desktop
+BUILD_DEPENDS= g-ir-compiler:${PORTSDIR}/devel/gobject-introspection
LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
exempi.3:${PORTSDIR}/textproc/exempi
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index 7c27f76e506f..1e70c3971735 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/nautilus-2.30.1.tar.bz2) = e1bda55f9c6cd223561da066dbc4e863
-SHA256 (gnome2/nautilus-2.30.1.tar.bz2) = 83df19591c4d0d359fe67d16b3f73f71e6a2aa5ba7d477739276c7562f221144
-SIZE (gnome2/nautilus-2.30.1.tar.bz2) = 6156330
+SHA256 (gnome2/nautilus-2.32.1.tar.bz2) = 3d7291682ed0cdfe95f5faf80104528f0affb26330007f08dd7a41d7e21b0349
+SIZE (gnome2/nautilus-2.32.1.tar.bz2) = 6335525
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index ee5480228801..b6e4f3b327db 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -13,6 +13,7 @@ include/nautilus/libnautilus-extension/nautilus-menu-provider.h
include/nautilus/libnautilus-extension/nautilus-menu.h
include/nautilus/libnautilus-extension/nautilus-property-page-provider.h
include/nautilus/libnautilus-extension/nautilus-property-page.h
+lib/girepository-1.0/Nautilus-2.0.typelib
lib/libnautilus-extension.a
lib/libnautilus-extension.la
lib/libnautilus-extension.so
@@ -27,9 +28,6 @@ share/applications/nautilus-folder-handler.desktop
share/applications/nautilus-home.desktop
share/applications/nautilus.desktop
share/applications/network-scheme.desktop
-share/doc/libnautilus-extension/NautilusColumn.html
-share/doc/libnautilus-extension/NautilusMenuItem.html
-share/doc/libnautilus-extension/NautilusPropertyPage.html
share/doc/libnautilus-extension/ch01.html
share/doc/libnautilus-extension/home.png
share/doc/libnautilus-extension/index.html
@@ -38,17 +36,21 @@ share/doc/libnautilus-extension/ix01.html
share/doc/libnautilus-extension/left.png
share/doc/libnautilus-extension/libnautilus-extension.devhelp
share/doc/libnautilus-extension/libnautilus-extension.devhelp2
+share/doc/libnautilus-extension/libnautilus-extension-nautilus-column.html
share/doc/libnautilus-extension/libnautilus-extension-nautilus-column-provider.html
share/doc/libnautilus-extension/libnautilus-extension-nautilus-extension-types.html
share/doc/libnautilus-extension/libnautilus-extension-nautilus-file-info.html
share/doc/libnautilus-extension/libnautilus-extension-nautilus-info-provider.html
share/doc/libnautilus-extension/libnautilus-extension-nautilus-location-widget-provider.html
+share/doc/libnautilus-extension/libnautilus-extension-nautilus-menu.html
share/doc/libnautilus-extension/libnautilus-extension-nautilus-menu-provider.html
+share/doc/libnautilus-extension/libnautilus-extension-nautilus-property-page.html
share/doc/libnautilus-extension/libnautilus-extension-nautilus-property-page-provider.html
share/doc/libnautilus-extension/pt01.html
share/doc/libnautilus-extension/right.png
share/doc/libnautilus-extension/style.css
share/doc/libnautilus-extension/up.png
+share/gir-1.0/Nautilus-2.0.gir
share/icons/hicolor/16x16/apps/nautilus.png
share/icons/hicolor/22x22/apps/nautilus.png
share/icons/hicolor/24x24/apps/nautilus.png
@@ -86,10 +88,12 @@ share/locale/eu/LC_MESSAGES/nautilus.mo
share/locale/fa/LC_MESSAGES/nautilus.mo
share/locale/fi/LC_MESSAGES/nautilus.mo
share/locale/fr/LC_MESSAGES/nautilus.mo
+share/locale/fy/LC_MESSAGES/nautilus.mo
share/locale/fur/LC_MESSAGES/nautilus.mo
share/locale/ga/LC_MESSAGES/nautilus.mo
share/locale/gl/LC_MESSAGES/nautilus.mo
share/locale/gu/LC_MESSAGES/nautilus.mo
+share/locale/gv/LC_MESSAGES/nautilus.mo
share/locale/ha/LC_MESSAGES/nautilus.mo
share/locale/he/LC_MESSAGES/nautilus.mo
share/locale/hi/LC_MESSAGES/nautilus.mo
@@ -103,6 +107,7 @@ share/locale/is/LC_MESSAGES/nautilus.mo
share/locale/it/LC_MESSAGES/nautilus.mo
share/locale/ja/LC_MESSAGES/nautilus.mo
share/locale/ka/LC_MESSAGES/nautilus.mo
+share/locale/kk/LC_MESSAGES/nautilus.mo
share/locale/km/LC_MESSAGES/nautilus.mo
share/locale/kn/LC_MESSAGES/nautilus.mo
share/locale/ko/LC_MESSAGES/nautilus.mo
@@ -147,6 +152,7 @@ share/locale/te/LC_MESSAGES/nautilus.mo
share/locale/th/LC_MESSAGES/nautilus.mo
share/locale/tk/LC_MESSAGES/nautilus.mo
share/locale/tr/LC_MESSAGES/nautilus.mo
+share/locale/ug/LC_MESSAGES/nautilus.mo
share/locale/uk/LC_MESSAGES/nautilus.mo
share/locale/uz/LC_MESSAGES/nautilus.mo
share/locale/uz@cyrillic/LC_MESSAGES/nautilus.mo
@@ -249,6 +255,8 @@ share/pixmaps/nautilus/thumbnail_frame.png
@dirrmtry share/locale/xh
@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -279,6 +287,8 @@ share/pixmaps/nautilus/thumbnail_frame.png
@dirrmtry share/locale/ku
@dirrmtry share/locale/km/LC_MESSAGES
@dirrmtry share/locale/km
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/io/LC_MESSAGES
@dirrmtry share/locale/io
@dirrmtry share/locale/ig/LC_MESSAGES
@@ -287,6 +297,10 @@ share/pixmaps/nautilus/thumbnail_frame.png
@dirrmtry share/locale/hy
@dirrmtry share/locale/ha/LC_MESSAGES
@dirrmtry share/locale/ha
+@dirrmtry share/locale/gv/LC_MESSAGES
+@dirrmtry share/locale/gv
+@dirrmtry share/locale/fy/LC_MESSAGES
+@dirrmtry share/locale/fy
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/en@shaw/LC_MESSAGES
diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile
index ec60036a4a77..96133ec15ee0 100644
--- a/x11-themes/gnome-backgrounds/Makefile
+++ b/x11-themes/gnome-backgrounds/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.47 2010/04/02 01:50:16 avl Exp $
+# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.49 2010/09/27 19:52:50 kwm Exp $
#
PORTNAME= gnome-backgrounds
-PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTVERSION= 2.32.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 04c51d2e9fb3..e9d5a892ebbf 100644
--- a/x11-themes/gnome-backgrounds/distinfo
+++ b/x11-themes/gnome-backgrounds/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-backgrounds-2.30.0.tar.bz2) = 4d620b0d0b6498eceacaef018abdcad2
-SHA256 (gnome2/gnome-backgrounds-2.30.0.tar.bz2) = c69220d2c65419c5c2cce1f80df8bb40ef2e584ef5500313f9304eb5f71e8a92
-SIZE (gnome2/gnome-backgrounds-2.30.0.tar.bz2) = 9931183
+MD5 (gnome2/gnome-backgrounds-2.32.0.tar.bz2) = 3df26626483b02e51adefc6ab5945a8d
+SHA256 (gnome2/gnome-backgrounds-2.32.0.tar.bz2) = 4d7b60b5ba768bf8834b5fa3a3471cd9a9e14b5884bc210dc2d3cdbf1faddcef
+SIZE (gnome2/gnome-backgrounds-2.32.0.tar.bz2) = 9919651
diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist
index d2808909683f..bf37284713f0 100644
--- a/x11-themes/gnome-backgrounds/pkg-plist
+++ b/x11-themes/gnome-backgrounds/pkg-plist
@@ -1,6 +1,7 @@
share/gnome-background-properties/gnome-abstract.xml
share/gnome-background-properties/gnome-nature.xml
share/locale/af/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/an/LC_MESSAGES/gnome-backgrounds.mo
share/locale/ar/LC_MESSAGES/gnome-backgrounds.mo
share/locale/as/LC_MESSAGES/gnome-backgrounds.mo
share/locale/ast/LC_MESSAGES/gnome-backgrounds.mo
@@ -20,6 +21,7 @@ share/locale/el/LC_MESSAGES/gnome-backgrounds.mo
share/locale/en@shaw/LC_MESSAGES/gnome-backgrounds.mo
share/locale/en_CA/LC_MESSAGES/gnome-backgrounds.mo
share/locale/en_GB/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/eo/LC_MESSAGES/gnome-backgrounds.mo
share/locale/es/LC_MESSAGES/gnome-backgrounds.mo
share/locale/et/LC_MESSAGES/gnome-backgrounds.mo
share/locale/eu/LC_MESSAGES/gnome-backgrounds.mo
@@ -27,6 +29,7 @@ share/locale/fa/LC_MESSAGES/gnome-backgrounds.mo
share/locale/fi/LC_MESSAGES/gnome-backgrounds.mo
share/locale/fr/LC_MESSAGES/gnome-backgrounds.mo
share/locale/fur/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/fy/LC_MESSAGES/gnome-backgrounds.mo
share/locale/ga/LC_MESSAGES/gnome-backgrounds.mo
share/locale/gl/LC_MESSAGES/gnome-backgrounds.mo
share/locale/gu/LC_MESSAGES/gnome-backgrounds.mo
@@ -51,6 +54,7 @@ share/locale/mk/LC_MESSAGES/gnome-backgrounds.mo
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/ms/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
@@ -138,6 +142,8 @@ share/pixmaps/backgrounds/gnome/nature/YellowFlower.jpg
@dirrmtry share/locale/kk
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/fy/LC_MESSAGES
+@dirrmtry share/locale/fy
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@@ -154,3 +160,5 @@ share/pixmaps/backgrounds/gnome/nature/YellowFlower.jpg
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 2de3ff540965..60c49c04fc14 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-themes/gnome-themes/Makefile,v 1.5 2010/06/23 14:17:10 kwm Exp $
+# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.183 2010/11/15 22:11:44 kwm Exp $
#
PORTNAME= gnome-themes
-PORTVERSION= 2.30.2
+PORTVERSION= 2.32.1
CATEGORIES= x11-themes gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo
index ddfac942698e..a4b137dfe738 100644
--- a/x11-themes/gnome-themes/distinfo
+++ b/x11-themes/gnome-themes/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gnome-themes-2.30.2.tar.bz2) = a14d46ac59f651e04a333ae1dff23848
-SHA256 (gnome2/gnome-themes-2.30.2.tar.bz2) = b7efbeb429ad19003cc26c468597cef42f5b5570d819af51828efbaa441682d5
-SIZE (gnome2/gnome-themes-2.30.2.tar.bz2) = 1643197
+SHA256 (gnome2/gnome-themes-2.32.1.tar.bz2) = 8601ee24c2e096593221cbd6ebdb6686042225a03c02a01c0d67c163f9febd1a
+SIZE (gnome2/gnome-themes-2.32.1.tar.bz2) = 2683723
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index ccbe20ffa6a4..f548a6f02d0c 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -675,6 +675,7 @@ share/icons/HighContrast-SVG/scalable/apps/bug-buddy.svg
share/icons/HighContrast-SVG/scalable/apps/calc.svg
share/icons/HighContrast-SVG/scalable/apps/config-language.svg
share/icons/HighContrast-SVG/scalable/apps/file-manager.svg
+share/icons/HighContrast-SVG/scalable/apps/firefox-icon.svg
share/icons/HighContrast-SVG/scalable/apps/fonts.svg
share/icons/HighContrast-SVG/scalable/apps/glchess.svg
share/icons/HighContrast-SVG/scalable/apps/gnome-calculator.svg
@@ -705,6 +706,7 @@ share/icons/HighContrast-SVG/scalable/apps/multimedia-volume-control.svg
share/icons/HighContrast-SVG/scalable/apps/multimedia.svg
share/icons/HighContrast-SVG/scalable/apps/openterm.svg
share/icons/HighContrast-SVG/scalable/apps/orca.svg
+share/icons/HighContrast-SVG/scalable/apps/pidgin.svg
share/icons/HighContrast-SVG/scalable/apps/preferences-desktop-accessibility.svg
share/icons/HighContrast-SVG/scalable/apps/preferences-desktop-font.svg
share/icons/HighContrast-SVG/scalable/apps/preferences-desktop-locale.svg
@@ -720,6 +722,7 @@ share/icons/HighContrast-SVG/scalable/apps/susehelpcenter.svg
share/icons/HighContrast-SVG/scalable/apps/system-file-manager.svg
share/icons/HighContrast-SVG/scalable/apps/terminal.svg
share/icons/HighContrast-SVG/scalable/apps/text-editor.svg
+share/icons/HighContrast-SVG/scalable/apps/thunderbird-icon.svg
share/icons/HighContrast-SVG/scalable/apps/tomboy.svg
share/icons/HighContrast-SVG/scalable/apps/totem.svg
share/icons/HighContrast-SVG/scalable/apps/utilities-system-monitor.svg
@@ -1231,6 +1234,7 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-mini-commander.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer-applet.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-monitor.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-palm.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-panel.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-searchtool-animation-rest.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-searchtool-animation.png
@@ -1250,6 +1254,7 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-window-manager.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-windows.png
share/icons/HighContrastLargePrint/48x48/apps/gnome-workspace.png
share/icons/HighContrastLargePrint/48x48/apps/gok.png
+share/icons/HighContrastLargePrint/48x48/apps/gtkam-camera.png
share/icons/HighContrastLargePrint/48x48/apps/gucharmap.png
share/icons/HighContrastLargePrint/48x48/apps/help-browser.png
share/icons/HighContrastLargePrint/48x48/apps/kcalc.png
@@ -1274,6 +1279,7 @@ share/icons/HighContrastLargePrint/48x48/apps/orca.png
share/icons/HighContrastLargePrint/48x48/apps/panel-drawer.png
share/icons/HighContrastLargePrint/48x48/apps/panel-force-quit.png
share/icons/HighContrastLargePrint/48x48/apps/perfmeter.png
+share/icons/HighContrastLargePrint/48x48/apps/pidgin.png
share/icons/HighContrastLargePrint/48x48/apps/preferences-desktop-accessibility.png
share/icons/HighContrastLargePrint/48x48/apps/preferences-desktop-font.png
share/icons/HighContrastLargePrint/48x48/apps/preferences-desktop-keyboard-shortcuts.png
@@ -1295,6 +1301,7 @@ share/icons/HighContrastLargePrint/48x48/apps/susehelpcenter.png
share/icons/HighContrastLargePrint/48x48/apps/system-file-manager.png
share/icons/HighContrastLargePrint/48x48/apps/terminal.png
share/icons/HighContrastLargePrint/48x48/apps/text-editor.png
+share/icons/HighContrastLargePrint/48x48/apps/thunderbird-icon.png
share/icons/HighContrastLargePrint/48x48/apps/totem.png
share/icons/HighContrastLargePrint/48x48/apps/utilities-system-monitor.png
share/icons/HighContrastLargePrint/48x48/apps/utilities-terminal.png
@@ -1416,6 +1423,7 @@ share/icons/HighContrastLargePrint/48x48/devices/media-cdrom.png
share/icons/HighContrastLargePrint/48x48/devices/media-floppy.png
share/icons/HighContrastLargePrint/48x48/devices/media-optical.png
share/icons/HighContrastLargePrint/48x48/devices/mouse.png
+share/icons/HighContrastLargePrint/48x48/devices/pda.png
share/icons/HighContrastLargePrint/48x48/devices/printer-remote.png
share/icons/HighContrastLargePrint/48x48/devices/printer.png
share/icons/HighContrastLargePrint/48x48/devices/printer1.png
@@ -1692,6 +1700,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mini-commander.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer-applet.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-monitor.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-palm.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-panel.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool-animation-rest.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool-animation.png
@@ -1711,6 +1720,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-window-manager.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-windows.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-workspace.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gok.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gtkam-camera.png
share/icons/HighContrastLargePrintInverse/48x48/apps/gucharmap.png
share/icons/HighContrastLargePrintInverse/48x48/apps/help-browser.png
share/icons/HighContrastLargePrintInverse/48x48/apps/kcalc.png
@@ -1735,6 +1745,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/orca.png
share/icons/HighContrastLargePrintInverse/48x48/apps/panel-drawer.png
share/icons/HighContrastLargePrintInverse/48x48/apps/panel-force-quit.png
share/icons/HighContrastLargePrintInverse/48x48/apps/perfmeter.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/pidgin.png
share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-accessibility.png
share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-font.png
share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-keyboard-shortcuts.png
@@ -1756,6 +1767,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/susehelpcenter.png
share/icons/HighContrastLargePrintInverse/48x48/apps/system-file-manager.png
share/icons/HighContrastLargePrintInverse/48x48/apps/terminal.png
share/icons/HighContrastLargePrintInverse/48x48/apps/text-editor.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/thunderbird-icon.png
share/icons/HighContrastLargePrintInverse/48x48/apps/totem.png
share/icons/HighContrastLargePrintInverse/48x48/apps/utilities-system-monitor.png
share/icons/HighContrastLargePrintInverse/48x48/apps/utilities-terminal.png
@@ -1879,6 +1891,7 @@ share/icons/HighContrastLargePrintInverse/48x48/devices/media-floppy.png
share/icons/HighContrastLargePrintInverse/48x48/devices/media-optical.png
share/icons/HighContrastLargePrintInverse/48x48/devices/mouse.png
share/icons/HighContrastLargePrintInverse/48x48/devices/network-wireless.png
+share/icons/HighContrastLargePrintInverse/48x48/devices/pda.png
share/icons/HighContrastLargePrintInverse/48x48/devices/printer-remote.png
share/icons/HighContrastLargePrintInverse/48x48/devices/printer.png
share/icons/HighContrastLargePrintInverse/48x48/devices/printer1.png
@@ -2139,13 +2152,34 @@ share/icons/HighContrastLargePrintInverse/index.theme
share/icons/LargePrint/index.theme
share/icons/Mist/16x16/actions/document-open.png
share/icons/Mist/16x16/actions/fileopen.png
+share/icons/Mist/16x16/actions/folder-new.png
+share/icons/Mist/16x16/actions/folder_new.png
share/icons/Mist/16x16/actions/gtk-open.png
+share/icons/Mist/16x16/actions/stock_new-dir.png
+share/icons/Mist/16x16/apps/preferences-desktop-display.png
+share/icons/Mist/16x16/devices/chardevice.png
+share/icons/Mist/16x16/devices/computer.png
+share/icons/Mist/16x16/devices/display.png
+share/icons/Mist/16x16/devices/gnome-dev-computer.png
+share/icons/Mist/16x16/devices/gnome-fs-client.png
+share/icons/Mist/16x16/devices/system.png
+share/icons/Mist/16x16/devices/video-display.png
+share/icons/Mist/16x16/devices/xfce4-display.png
share/icons/Mist/16x16/places/application-x-gnome-saved-search.png
+share/icons/Mist/16x16/places/desktop.png
+share/icons/Mist/16x16/places/folder-documents.png
+share/icons/Mist/16x16/places/folder-download.png
+share/icons/Mist/16x16/places/folder-music.png
share/icons/Mist/16x16/places/folder-new.png
+share/icons/Mist/16x16/places/folder-pictures.png
+share/icons/Mist/16x16/places/folder-publicshare.png
share/icons/Mist/16x16/places/folder-remote.png
share/icons/Mist/16x16/places/folder-saved-search.png
+share/icons/Mist/16x16/places/folder-templates.png
+share/icons/Mist/16x16/places/folder-videos.png
share/icons/Mist/16x16/places/folder.png
share/icons/Mist/16x16/places/folder_home.png
+share/icons/Mist/16x16/places/gnome-fs-desktop.png
share/icons/Mist/16x16/places/gnome-fs-directory.png
share/icons/Mist/16x16/places/gnome-fs-ftp.png
share/icons/Mist/16x16/places/gnome-fs-home.png
@@ -2158,26 +2192,48 @@ share/icons/Mist/16x16/places/gtk-directory.png
share/icons/Mist/16x16/places/inode-directory.png
share/icons/Mist/16x16/places/network.png
share/icons/Mist/16x16/places/stock_folder.png
+share/icons/Mist/16x16/places/user-desktop.png
share/icons/Mist/16x16/places/user-home.png
-share/icons/Mist/16x16/status/folder-drag-accept.svg
-share/icons/Mist/16x16/status/folder-open.svg
+share/icons/Mist/16x16/status/folder-drag-accept.png
+share/icons/Mist/16x16/status/folder-open.png
share/icons/Mist/16x16/status/folder-visiting.png
-share/icons/Mist/16x16/status/folder_open.svg
-share/icons/Mist/16x16/status/gnome-fs-directory-accept.svg
+share/icons/Mist/16x16/status/folder_open.png
+share/icons/Mist/16x16/status/gnome-fs-directory-accept.png
share/icons/Mist/16x16/status/gnome-fs-directory-visiting.png
-share/icons/Mist/16x16/status/stock_open.svg
+share/icons/Mist/16x16/status/stock_open.png
share/icons/Mist/22x22/actions/document-open.png
share/icons/Mist/22x22/actions/fileopen.png
+share/icons/Mist/22x22/actions/folder-new.png
+share/icons/Mist/22x22/actions/folder_new.png
share/icons/Mist/22x22/actions/gtk-open.png
+share/icons/Mist/22x22/actions/stock_new-dir.png
+share/icons/Mist/22x22/apps/preferences-desktop-display.png
+share/icons/Mist/22x22/devices/chardevice.png
+share/icons/Mist/22x22/devices/computer.png
+share/icons/Mist/22x22/devices/display.png
+share/icons/Mist/22x22/devices/gnome-dev-computer.png
+share/icons/Mist/22x22/devices/gnome-fs-client.png
+share/icons/Mist/22x22/devices/system.png
+share/icons/Mist/22x22/devices/video-display.png
+share/icons/Mist/22x22/devices/xfce4-display.png
share/icons/Mist/22x22/places/application-x-gnome-saved-search.png
+share/icons/Mist/22x22/places/desktop.png
+share/icons/Mist/22x22/places/folder-documents.png
+share/icons/Mist/22x22/places/folder-download.png
+share/icons/Mist/22x22/places/folder-music.png
share/icons/Mist/22x22/places/folder-new.png
+share/icons/Mist/22x22/places/folder-pictures.png
+share/icons/Mist/22x22/places/folder-publicshare.png
share/icons/Mist/22x22/places/folder-remote.png
share/icons/Mist/22x22/places/folder-saved-search.png
+share/icons/Mist/22x22/places/folder-templates.png
+share/icons/Mist/22x22/places/folder-videos.png
share/icons/Mist/22x22/places/folder.png
-share/icons/Mist/22x22/places/folder_home.svg
+share/icons/Mist/22x22/places/folder_home.png
+share/icons/Mist/22x22/places/gnome-fs-desktop.png
share/icons/Mist/22x22/places/gnome-fs-directory.png
share/icons/Mist/22x22/places/gnome-fs-ftp.png
-share/icons/Mist/22x22/places/gnome-fs-home.svg
+share/icons/Mist/22x22/places/gnome-fs-home.png
share/icons/Mist/22x22/places/gnome-fs-nfs.png
share/icons/Mist/22x22/places/gnome-fs-share.png
share/icons/Mist/22x22/places/gnome-fs-smb.png
@@ -2187,7 +2243,8 @@ share/icons/Mist/22x22/places/gtk-directory.png
share/icons/Mist/22x22/places/inode-directory.png
share/icons/Mist/22x22/places/network.png
share/icons/Mist/22x22/places/stock_folder.png
-share/icons/Mist/22x22/places/user-home.svg
+share/icons/Mist/22x22/places/user-desktop.png
+share/icons/Mist/22x22/places/user-home.png
share/icons/Mist/22x22/status/folder-drag-accept.png
share/icons/Mist/22x22/status/folder-open.png
share/icons/Mist/22x22/status/folder-visiting.png
@@ -2197,13 +2254,34 @@ share/icons/Mist/22x22/status/gnome-fs-directory-visiting.png
share/icons/Mist/22x22/status/stock_open.png
share/icons/Mist/24x24/actions/document-open.png
share/icons/Mist/24x24/actions/fileopen.png
+share/icons/Mist/24x24/actions/folder-new.png
+share/icons/Mist/24x24/actions/folder_new.png
share/icons/Mist/24x24/actions/gtk-open.png
+share/icons/Mist/24x24/actions/stock_new-dir.png
+share/icons/Mist/24x24/apps/preferences-desktop-display.png
+share/icons/Mist/24x24/devices/chardevice.png
+share/icons/Mist/24x24/devices/computer.png
+share/icons/Mist/24x24/devices/display.png
+share/icons/Mist/24x24/devices/gnome-dev-computer.png
+share/icons/Mist/24x24/devices/gnome-fs-client.png
+share/icons/Mist/24x24/devices/system.png
+share/icons/Mist/24x24/devices/video-display.png
+share/icons/Mist/24x24/devices/xfce4-display.png
share/icons/Mist/24x24/places/application-x-gnome-saved-search.png
+share/icons/Mist/24x24/places/desktop.png
+share/icons/Mist/24x24/places/folder-documents.png
+share/icons/Mist/24x24/places/folder-download.png
+share/icons/Mist/24x24/places/folder-music.png
share/icons/Mist/24x24/places/folder-new.png
+share/icons/Mist/24x24/places/folder-pictures.png
+share/icons/Mist/24x24/places/folder-publicshare.png
share/icons/Mist/24x24/places/folder-remote.png
share/icons/Mist/24x24/places/folder-saved-search.png
+share/icons/Mist/24x24/places/folder-templates.png
+share/icons/Mist/24x24/places/folder-videos.png
share/icons/Mist/24x24/places/folder.png
share/icons/Mist/24x24/places/folder_home.png
+share/icons/Mist/24x24/places/gnome-fs-desktop.png
share/icons/Mist/24x24/places/gnome-fs-directory.png
share/icons/Mist/24x24/places/gnome-fs-ftp.png
share/icons/Mist/24x24/places/gnome-fs-home.png
@@ -2216,6 +2294,7 @@ share/icons/Mist/24x24/places/gtk-directory.png
share/icons/Mist/24x24/places/inode-directory.png
share/icons/Mist/24x24/places/network.png
share/icons/Mist/24x24/places/stock_folder.png
+share/icons/Mist/24x24/places/user-desktop.png
share/icons/Mist/24x24/places/user-home.png
share/icons/Mist/24x24/status/folder-drag-accept.png
share/icons/Mist/24x24/status/folder-open.png
@@ -2224,65 +2303,158 @@ share/icons/Mist/24x24/status/folder_open.png
share/icons/Mist/24x24/status/gnome-fs-directory-accept.png
share/icons/Mist/24x24/status/gnome-fs-directory-visiting.png
share/icons/Mist/24x24/status/stock_open.png
-share/icons/Mist/32x32/actions/document-open.svg
-share/icons/Mist/32x32/actions/fileopen.svg
-share/icons/Mist/32x32/actions/gtk-open.svg
-share/icons/Mist/32x32/places/application-x-gnome-saved-search.svg
-share/icons/Mist/32x32/places/folder-new.svg
-share/icons/Mist/32x32/places/folder-remote.svg
-share/icons/Mist/32x32/places/folder-saved-search.svg
-share/icons/Mist/32x32/places/folder.svg
-share/icons/Mist/32x32/places/folder_home.svg
-share/icons/Mist/32x32/places/gnome-fs-directory.svg
-share/icons/Mist/32x32/places/gnome-fs-ftp.svg
-share/icons/Mist/32x32/places/gnome-fs-home.svg
-share/icons/Mist/32x32/places/gnome-fs-nfs.svg
-share/icons/Mist/32x32/places/gnome-fs-share.svg
-share/icons/Mist/32x32/places/gnome-fs-smb.svg
-share/icons/Mist/32x32/places/gnome-fs-ssh.svg
-share/icons/Mist/32x32/places/gnome-mime-x-directory-smb-share.svg
-share/icons/Mist/32x32/places/gtk-directory.svg
-share/icons/Mist/32x32/places/inode-directory.svg
-share/icons/Mist/32x32/places/network.svg
-share/icons/Mist/32x32/places/stock_folder.svg
-share/icons/Mist/32x32/places/user-home.svg
-share/icons/Mist/32x32/status/folder-drag-accept.svg
-share/icons/Mist/32x32/status/folder-open.svg
+share/icons/Mist/256x256/actions/document-open.png
+share/icons/Mist/256x256/actions/fileopen.png
+share/icons/Mist/256x256/actions/folder-new.png
+share/icons/Mist/256x256/actions/folder_new.png
+share/icons/Mist/256x256/actions/gtk-open.png
+share/icons/Mist/256x256/actions/stock_new-dir.png
+share/icons/Mist/256x256/apps/preferences-desktop-display.png
+share/icons/Mist/256x256/devices/chardevice.png
+share/icons/Mist/256x256/devices/computer.png
+share/icons/Mist/256x256/devices/display.png
+share/icons/Mist/256x256/devices/gnome-dev-computer.png
+share/icons/Mist/256x256/devices/gnome-fs-client.png
+share/icons/Mist/256x256/devices/system.png
+share/icons/Mist/256x256/devices/video-display.png
+share/icons/Mist/256x256/devices/xfce4-display.png
+share/icons/Mist/256x256/places/application-x-gnome-saved-search.png
+share/icons/Mist/256x256/places/desktop.png
+share/icons/Mist/256x256/places/folder-documents.png
+share/icons/Mist/256x256/places/folder-download.png
+share/icons/Mist/256x256/places/folder-music.png
+share/icons/Mist/256x256/places/folder-pictures.png
+share/icons/Mist/256x256/places/folder-publicshare.png
+share/icons/Mist/256x256/places/folder-remote.png
+share/icons/Mist/256x256/places/folder-saved-search.png
+share/icons/Mist/256x256/places/folder-templates.png
+share/icons/Mist/256x256/places/folder-videos.png
+share/icons/Mist/256x256/places/folder.png
+share/icons/Mist/256x256/places/folder_home.png
+share/icons/Mist/256x256/places/gnome-fs-desktop.png
+share/icons/Mist/256x256/places/gnome-fs-directory.png
+share/icons/Mist/256x256/places/gnome-fs-ftp.png
+share/icons/Mist/256x256/places/gnome-fs-home.png
+share/icons/Mist/256x256/places/gnome-fs-nfs.png
+share/icons/Mist/256x256/places/gnome-fs-share.png
+share/icons/Mist/256x256/places/gnome-fs-smb.png
+share/icons/Mist/256x256/places/gnome-fs-ssh.png
+share/icons/Mist/256x256/places/gnome-mime-x-directory-smb-share.png
+share/icons/Mist/256x256/places/gtk-directory.png
+share/icons/Mist/256x256/places/inode-directory.png
+share/icons/Mist/256x256/places/network.png
+share/icons/Mist/256x256/places/stock_folder.png
+share/icons/Mist/256x256/places/user-desktop.png
+share/icons/Mist/256x256/places/user-home.png
+share/icons/Mist/256x256/status/folder-drag-accept.png
+share/icons/Mist/256x256/status/folder-open.png
+share/icons/Mist/256x256/status/folder-visiting.png
+share/icons/Mist/256x256/status/folder_open.png
+share/icons/Mist/256x256/status/gnome-fs-directory-accept.png
+share/icons/Mist/256x256/status/gnome-fs-directory-visiting.png
+share/icons/Mist/256x256/status/stock_open.png
+share/icons/Mist/32x32/actions/document-open.png
+share/icons/Mist/32x32/actions/fileopen.png
+share/icons/Mist/32x32/actions/folder-new.png
+share/icons/Mist/32x32/actions/folder_new.png
+share/icons/Mist/32x32/actions/gtk-open.png
+share/icons/Mist/32x32/actions/stock_new-dir.png
+share/icons/Mist/32x32/apps/preferences-desktop-display.png
+share/icons/Mist/32x32/devices/chardevice.png
+share/icons/Mist/32x32/devices/computer.png
+share/icons/Mist/32x32/devices/display.png
+share/icons/Mist/32x32/devices/gnome-dev-computer.png
+share/icons/Mist/32x32/devices/gnome-fs-client.png
+share/icons/Mist/32x32/devices/system.png
+share/icons/Mist/32x32/devices/video-display.png
+share/icons/Mist/32x32/devices/xfce4-display.png
+share/icons/Mist/32x32/places/application-x-gnome-saved-search.png
+share/icons/Mist/32x32/places/desktop.png
+share/icons/Mist/32x32/places/folder-documents.png
+share/icons/Mist/32x32/places/folder-download.png
+share/icons/Mist/32x32/places/folder-music.png
+share/icons/Mist/32x32/places/folder-new.png
+share/icons/Mist/32x32/places/folder-pictures.png
+share/icons/Mist/32x32/places/folder-publicshare.png
+share/icons/Mist/32x32/places/folder-remote.png
+share/icons/Mist/32x32/places/folder-saved-search.png
+share/icons/Mist/32x32/places/folder-templates.png
+share/icons/Mist/32x32/places/folder-videos.png
+share/icons/Mist/32x32/places/folder.png
+share/icons/Mist/32x32/places/folder_home.png
+share/icons/Mist/32x32/places/gnome-fs-desktop.png
+share/icons/Mist/32x32/places/gnome-fs-directory.png
+share/icons/Mist/32x32/places/gnome-fs-ftp.png
+share/icons/Mist/32x32/places/gnome-fs-home.png
+share/icons/Mist/32x32/places/gnome-fs-nfs.png
+share/icons/Mist/32x32/places/gnome-fs-share.png
+share/icons/Mist/32x32/places/gnome-fs-smb.png
+share/icons/Mist/32x32/places/gnome-fs-ssh.png
+share/icons/Mist/32x32/places/gnome-mime-x-directory-smb-share.png
+share/icons/Mist/32x32/places/gtk-directory.png
+share/icons/Mist/32x32/places/inode-directory.png
+share/icons/Mist/32x32/places/network.png
+share/icons/Mist/32x32/places/stock_folder.png
+share/icons/Mist/32x32/places/user-desktop.png
+share/icons/Mist/32x32/places/user-home.png
+share/icons/Mist/32x32/status/folder-drag-accept.png
+share/icons/Mist/32x32/status/folder-open.png
share/icons/Mist/32x32/status/folder-visiting.png
-share/icons/Mist/32x32/status/folder_open.svg
-share/icons/Mist/32x32/status/gnome-fs-directory-accept.svg
+share/icons/Mist/32x32/status/folder_open.png
+share/icons/Mist/32x32/status/gnome-fs-directory-accept.png
share/icons/Mist/32x32/status/gnome-fs-directory-visiting.png
-share/icons/Mist/32x32/status/stock_open.svg
+share/icons/Mist/32x32/status/stock_open.png
+share/icons/Mist/48x48/actions/document-open.png
+share/icons/Mist/48x48/actions/fileopen.png
+share/icons/Mist/48x48/actions/folder-new.png
+share/icons/Mist/48x48/actions/folder_new.png
+share/icons/Mist/48x48/actions/gtk-open.png
+share/icons/Mist/48x48/actions/stock_new-dir.png
+share/icons/Mist/48x48/apps/preferences-desktop-display.png
+share/icons/Mist/48x48/devices/chardevice.png
+share/icons/Mist/48x48/devices/computer.png
+share/icons/Mist/48x48/devices/display.png
+share/icons/Mist/48x48/devices/gnome-dev-computer.png
+share/icons/Mist/48x48/devices/gnome-fs-client.png
+share/icons/Mist/48x48/devices/system.png
+share/icons/Mist/48x48/devices/video-display.png
+share/icons/Mist/48x48/devices/xfce4-display.png
+share/icons/Mist/48x48/places/application-x-gnome-saved-search.png
+share/icons/Mist/48x48/places/desktop.png
+share/icons/Mist/48x48/places/folder-documents.png
+share/icons/Mist/48x48/places/folder-download.png
+share/icons/Mist/48x48/places/folder-music.png
+share/icons/Mist/48x48/places/folder-pictures.png
+share/icons/Mist/48x48/places/folder-publicshare.png
+share/icons/Mist/48x48/places/folder-remote.png
+share/icons/Mist/48x48/places/folder-saved-search.png
+share/icons/Mist/48x48/places/folder-templates.png
+share/icons/Mist/48x48/places/folder-videos.png
+share/icons/Mist/48x48/places/folder.png
+share/icons/Mist/48x48/places/folder_home.png
+share/icons/Mist/48x48/places/gnome-fs-desktop.png
+share/icons/Mist/48x48/places/gnome-fs-directory.png
+share/icons/Mist/48x48/places/gnome-fs-ftp.png
+share/icons/Mist/48x48/places/gnome-fs-home.png
+share/icons/Mist/48x48/places/gnome-fs-nfs.png
+share/icons/Mist/48x48/places/gnome-fs-share.png
+share/icons/Mist/48x48/places/gnome-fs-smb.png
+share/icons/Mist/48x48/places/gnome-fs-ssh.png
+share/icons/Mist/48x48/places/gnome-mime-x-directory-smb-share.png
+share/icons/Mist/48x48/places/gtk-directory.png
+share/icons/Mist/48x48/places/inode-directory.png
+share/icons/Mist/48x48/places/network.png
+share/icons/Mist/48x48/places/stock_folder.png
+share/icons/Mist/48x48/places/user-desktop.png
+share/icons/Mist/48x48/places/user-home.png
+share/icons/Mist/48x48/status/folder-drag-accept.png
+share/icons/Mist/48x48/status/folder-open.png
+share/icons/Mist/48x48/status/folder-visiting.png
+share/icons/Mist/48x48/status/folder_open.png
+share/icons/Mist/48x48/status/gnome-fs-directory-accept.png
+share/icons/Mist/48x48/status/gnome-fs-directory-visiting.png
+share/icons/Mist/48x48/status/stock_open.png
share/icons/Mist/index.theme
-share/icons/Mist/scalable/actions/document-open.svg
-share/icons/Mist/scalable/actions/fileopen.svg
-share/icons/Mist/scalable/actions/gtk-open.svg
-share/icons/Mist/scalable/places/application-x-gnome-saved-search.svg
-share/icons/Mist/scalable/places/folder-new.svg
-share/icons/Mist/scalable/places/folder-remote.svg
-share/icons/Mist/scalable/places/folder-saved-search.svg
-share/icons/Mist/scalable/places/folder.svg
-share/icons/Mist/scalable/places/folder_home.svg
-share/icons/Mist/scalable/places/gnome-fs-directory.svg
-share/icons/Mist/scalable/places/gnome-fs-ftp.svg
-share/icons/Mist/scalable/places/gnome-fs-home.svg
-share/icons/Mist/scalable/places/gnome-fs-nfs.svg
-share/icons/Mist/scalable/places/gnome-fs-share.svg
-share/icons/Mist/scalable/places/gnome-fs-smb.svg
-share/icons/Mist/scalable/places/gnome-fs-ssh.svg
-share/icons/Mist/scalable/places/gnome-mime-x-directory-smb-share.svg
-share/icons/Mist/scalable/places/gtk-directory.svg
-share/icons/Mist/scalable/places/inode-directory.svg
-share/icons/Mist/scalable/places/network.svg
-share/icons/Mist/scalable/places/stock_folder.svg
-share/icons/Mist/scalable/places/user-home.svg
-share/icons/Mist/scalable/status/folder-drag-accept.svg
-share/icons/Mist/scalable/status/folder-open.svg
-share/icons/Mist/scalable/status/folder-visiting.svg
-share/icons/Mist/scalable/status/folder_open.svg
-share/icons/Mist/scalable/status/gnome-fs-directory-accept.svg
-share/icons/Mist/scalable/status/gnome-fs-directory-visiting.svg
-share/icons/Mist/scalable/status/stock_open.svg
share/locale/af/LC_MESSAGES/gnome-themes.mo
share/locale/am/LC_MESSAGES/gnome-themes.mo
share/locale/ar/LC_MESSAGES/gnome-themes.mo
@@ -2825,24 +2997,40 @@ share/themes/Simple/gtk-2.0/gtkrc
@dirrm share/themes/Clearlooks/metacity-1
@dirrmtry share/themes/Clearlooks
@dirrmtry share/themes
-@dirrm share/icons/Mist/scalable/status
-@dirrm share/icons/Mist/scalable/places
-@dirrm share/icons/Mist/scalable/actions
-@dirrm share/icons/Mist/scalable
+@dirrm share/icons/Mist/48x48/status
+@dirrm share/icons/Mist/48x48/places
+@dirrm share/icons/Mist/48x48/devices
+@dirrm share/icons/Mist/48x48/apps
+@dirrm share/icons/Mist/48x48/actions
+@dirrm share/icons/Mist/48x48
@dirrm share/icons/Mist/32x32/status
@dirrm share/icons/Mist/32x32/places
+@dirrm share/icons/Mist/32x32/devices
+@dirrm share/icons/Mist/32x32/apps
@dirrm share/icons/Mist/32x32/actions
@dirrm share/icons/Mist/32x32
+@dirrm share/icons/Mist/256x256/status
+@dirrm share/icons/Mist/256x256/places
+@dirrm share/icons/Mist/256x256/devices
+@dirrm share/icons/Mist/256x256/apps
+@dirrm share/icons/Mist/256x256/actions
+@dirrm share/icons/Mist/256x256
@dirrm share/icons/Mist/24x24/status
@dirrm share/icons/Mist/24x24/places
+@dirrm share/icons/Mist/24x24/devices
+@dirrm share/icons/Mist/24x24/apps
@dirrm share/icons/Mist/24x24/actions
@dirrm share/icons/Mist/24x24
@dirrm share/icons/Mist/22x22/status
@dirrm share/icons/Mist/22x22/places
+@dirrm share/icons/Mist/22x22/devices
+@dirrm share/icons/Mist/22x22/apps
@dirrm share/icons/Mist/22x22/actions
@dirrm share/icons/Mist/22x22
@dirrm share/icons/Mist/16x16/status
@dirrm share/icons/Mist/16x16/places
+@dirrm share/icons/Mist/16x16/devices
+@dirrm share/icons/Mist/16x16/apps
@dirrm share/icons/Mist/16x16/actions
@dirrm share/icons/Mist/16x16
@dirrm share/icons/Mist
diff --git a/x11-themes/gtk-qt-engine/Makefile b/x11-themes/gtk-qt-engine/Makefile
index ba8f4c0bec76..5db74c68f13a 100644
--- a/x11-themes/gtk-qt-engine/Makefile
+++ b/x11-themes/gtk-qt-engine/Makefile
@@ -15,6 +15,8 @@ MASTER_SITES= http://gtk-qt.ecs.soton.ac.uk/files/${PORTVERSION}/ \
MAINTAINER= danny@ricin.com
COMMENT= GTK-QT Theme Engine allows GTK2 apps to use QT/KDE themes
+BROKEN= Doesn't build with Glib 2.26.x
+
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index 892395d49483..78f15966610c 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/eel/Makefile,v 1.88 2010/05/10 04:21:20 marcus Exp $
+# $MCom: ports/x11-toolkits/eel/Makefile,v 1.90 2010/09/28 09:15:49 kwm Exp $
#
PORTNAME= eel
PORTVERSION= 2.26.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/eel/files/patch-eel_Makefile.in b/x11-toolkits/eel/files/patch-eel_Makefile.in
new file mode 100644
index 000000000000..ec753e19eab4
--- /dev/null
+++ b/x11-toolkits/eel/files/patch-eel_Makefile.in
@@ -0,0 +1,12 @@
+--- eel/Makefile.in.orig 2010-09-28 11:12:01.000000000 +0000
++++ eel/Makefile.in 2010-09-28 11:12:37.000000000 +0000
+@@ -290,9 +290,6 @@
+ -DDATADIR=\""$(datadir)"\" \
+ -DSOURCE_DATADIR=\""$(top_srcdir)/data"\" \
+ -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGDK_DISABLE_DEPRECATED \
+- -DGDK_PIXBUF_DISABLE_DEPRECATED \
+ -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
+ $(NULL)
+
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 9b695789ef71..a09734c6b512 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.35 2010/03/30 09:44:18 avl Exp $
+# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.40 2010/09/29 08:07:46 kwm Exp $
#
PORTNAME= gdl
-PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTVERSION= 2.30.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo
index e67756657d02..fcea5d687a40 100644
--- a/x11-toolkits/gdl/distinfo
+++ b/x11-toolkits/gdl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gdl-2.30.0.tar.bz2) = ce4eef03a36bf6abd9f8cbad4806d7b8
-SHA256 (gdl-2.30.0.tar.bz2) = c3ca19831384ae8570f1e6fc0e6be9b2a5ba0f14592b9f2bbb629be113791453
-SIZE (gdl-2.30.0.tar.bz2) = 535941
+MD5 (gdl-2.30.1.tar.bz2) = 4af16be490b47ce4e828a2fb93633856
+SHA256 (gdl-2.30.1.tar.bz2) = 027dd1cd0191996fe1a0dc902da857698cc79564cb057ba13b09097e56e30cc1
+SIZE (gdl-2.30.1.tar.bz2) = 569211
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index 134610452247..b2ff54f12d70 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -13,14 +13,14 @@ lib/libgdl-1.la
lib/libgdl-1.so
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%%/GdlDockObject.html
-%%DOCSDIR%%/GdlDockPlaceholder.html
+%%DOCSDIR%%/gdl-gdl-dock-bar.html
+%%DOCSDIR%%/gdl-gdl-dock-item.html
+%%DOCSDIR%%/gdl-gdl-dock-layout.html
+%%DOCSDIR%%/gdl-gdl-dock-master.html
+%%DOCSDIR%%/gdl-gdl-dock-object.html
+%%DOCSDIR%%/gdl-gdl-dock-placeholder.html
%%DOCSDIR%%/gdl-gdl-tools.html
+%%DOCSDIR%%/gdl-gdl-dock.html
%%DOCSDIR%%/gdl-main.html
%%DOCSDIR%%/gdl.devhelp
%%DOCSDIR%%/gdl.devhelp2
@@ -61,6 +61,8 @@ share/locale/he/LC_MESSAGES/gdl-1.mo
share/locale/hi/LC_MESSAGES/gdl-1.mo
share/locale/hr/LC_MESSAGES/gdl-1.mo
share/locale/hu/LC_MESSAGES/gdl-1.mo
+share/locale/hy/LC_MESSAGES/gdl-1.mo
+share/locale/id/LC_MESSAGES/gdl-1.mo
share/locale/it/LC_MESSAGES/gdl-1.mo
share/locale/ja/LC_MESSAGES/gdl-1.mo
share/locale/ko/LC_MESSAGES/gdl-1.mo
@@ -93,6 +95,7 @@ share/locale/sv/LC_MESSAGES/gdl-1.mo
share/locale/te/LC_MESSAGES/gdl-1.mo
share/locale/th/LC_MESSAGES/gdl-1.mo
share/locale/tr/LC_MESSAGES/gdl-1.mo
+share/locale/ug/LC_MESSAGES/gdl-1.mo
share/locale/uk/LC_MESSAGES/gdl-1.mo
share/locale/vi/LC_MESSAGES/gdl-1.mo
share/locale/zh_CN/LC_MESSAGES/gdl-1.mo
@@ -105,6 +108,8 @@ share/locale/zh_TW/LC_MESSAGES/gdl-1.mo
@dirrm include/libgdl-1.0
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -121,6 +126,8 @@ share/locale/zh_TW/LC_MESSAGES/gdl-1.mo
@dirrmtry share/locale/mr
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/x11-toolkits/gtk20-reference/Makefile b/x11-toolkits/gtk20-reference/Makefile
index b1ecb1860630..b7beec30130d 100644
--- a/x11-toolkits/gtk20-reference/Makefile
+++ b/x11-toolkits/gtk20-reference/Makefile
@@ -5,14 +5,8 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
-BOOKS= gdk gdk-pixbuf gtk
-
-MAN1= gdk-pixbuf-csource.1
-
-post-install:
- ${INSTALL_MAN} ${MAN1:S|^|${REFERENCE_SRC}/gdk-pixbuf/|} \
- ${PREFIX}/man/man1
+BOOKS= gdk gtk
.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index e38f8935ca4c..83d881b07752 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,12 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.191 2010/05/04 10:29:49 kwm Exp $
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.209 2010/11/15 21:17:48 kwm Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.20.1
-PORTREVISION?= 2
+PORTVERSION= 2.22.1
+PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
@@ -24,24 +24,23 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gimp Toolkit for X11 GUI (current stable version)
+LICENSE= LGPL20
+LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
LATEST_LINK= gtk20
.if !defined(REFERENCE_PORT)
BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \
- tiff.4:${PORTSDIR}/graphics/tiff \
- jpeg.11:${PORTSDIR}/graphics/jpeg \
- jasper.4:${PORTSDIR}/graphics/jasper
RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
USE_GMAKE= yes
USE_PERL5_BUILD=yes
+MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
-USE_GNOME= gnomehack atk pango ltverhack
+USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack
USE_GETTEXT= yes
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
@@ -49,26 +48,22 @@ CONFIGURE_ARGS= --enable-static --with-xinput=yes --with-libjasper
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-GTK_VERSION= 2.10.0
-PLIST_SUB= GTK_VERSION="${GTK_VERSION}"
-gdk_pixbuf_MAN= gdk-pixbuf-query-loaders.1
-gtk_MAN= gtk-query-immodules-2.0.1 gtk-update-icon-cache.1
-
-MAN1= ${gdk_pixbuf_MAN} ${gtk_MAN}
+MAN1= gtk-query-immodules-2.0.1 gtk-update-icon-cache.1
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-debug=yes
.endif
+OPTIONS= CUPS "Enable cups printing support" on
+
.include <bsd.port.pre.mk>
.if ${ARCH} == powerpc64
-EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-powerpc64
+EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-powerpc64
.endif
-.if (defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)) && \
- !defined(WITHOUT_CUPS)
+.if defined(WITH_CUPS)
LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client
CONFIGURE_ARGS+=--enable-cups=auto
PLIST_SUB+= CUPS:=""
@@ -82,10 +77,6 @@ post-patch:
${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
${WRKSRC}/configure
-# GnomeVFS needs pthread; gtk-demo may use GnomeVFS (via GtkFileChooser)
- @${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \
- s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \
- ${WRKSRC}/demos/gtk-demo/Makefile.in
@${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in
@${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \
${WRKSRC}/gtk/Makefile.in
@@ -97,10 +88,9 @@ post-install:
-@${FIND} ${LOCALBASE}/share/icons -type d -depth 1 -exec \
${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null
@${MKDIR} ${PREFIX}/lib/gtk-2.0/modules
- @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK_VERSION}/engines
- ${INSTALL_MAN} ${gdk_pixbuf_MAN:S|^|${WRKSRC}/docs/reference/gdk-pixbuf/|} \
- ${PREFIX}/man/man1
- ${INSTALL_MAN} ${gtk_MAN:S|^|${WRKSRC}/docs/reference/gtk/|} \
+ @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/engines
+ @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/loaders
+ ${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/docs/reference/gtk/|} \
${PREFIX}/man/man1
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index cc3c94a0d656..a6827d508561 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gtk+-2.20.1.tar.bz2) = 53e6f3a93bd22934878fc4a4a34c68aa
-SHA256 (gnome2/gtk+-2.20.1.tar.bz2) = 0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65
-SIZE (gnome2/gtk+-2.20.1.tar.bz2) = 19089076
+SHA256 (gnome2/gtk+-2.22.1.tar.bz2) = 965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07
+SIZE (gnome2/gtk+-2.22.1.tar.bz2) = 18306164
diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in
index 307fd6fc2f77..f2ac7216d525 100644
--- a/x11-toolkits/gtk20/files/patch-Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig Wed Aug 3 18:09:32 2005
-+++ Makefile.in Wed Aug 3 18:10:01 2005
-@@ -288,7 +288,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- Makefile.in.orig 2010-06-27 12:13:41.000000000 +0200
++++ Makefile.in 2010-06-27 12:14:23.000000000 +0200
+@@ -456,7 +456,7 @@
+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ && DISPLAY=:$$XID && export DISPLAY
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos perf contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
++SRC_SUBDIRS = gdk gtk modules demos perf
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
# require automake 1.4
diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai
index 0a4e1022fa27..a9d1d5f214c3 100644
--- a/x11-toolkits/gtk20/files/patch-ai
+++ b/x11-toolkits/gtk20/files/patch-ai
@@ -1,11 +1,11 @@
---- 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 = \
+--- docs/reference/Makefile.in.orig 2010-06-27 12:22:03.000000000 +0200
++++ docs/reference/Makefile.in 2010-06-27 12:22:37.000000000 +0200
+@@ -354,7 +354,7 @@
|| { 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
+-SUBDIRS = gdk gtk libgail-util
++SUBDIRS = #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
deleted file mode 100644
index 04ce78984f84..000000000000
--- a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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-gdk-pixbuf_io-png.c b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_io-png.c
deleted file mode 100644
index cca139d6b99a..000000000000
--- a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_io-png.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- gdk-pixbuf/io-png.c.orig 2010-05-02 05:14:27.000000000 +0200
-+++ gdk-pixbuf/io-png.c 2010-05-15 17:30:35.000000000 +0200
-@@ -261,7 +261,11 @@ gdk_pixbuf__png_image_load (FILE *f, GEr
- gchar *icc_profile_base64;
- const gchar *icc_profile_title;
- const gchar *icc_profile;
-+#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-+ guint icc_profile_size;
-+#else
- gulong icc_profile_size;
-+#endif
- guint32 retval;
- gint compression_type;
-
-@@ -607,7 +611,11 @@ png_info_callback (png_structp png_rea
- gchar *icc_profile_base64;
- const gchar *icc_profile_title;
- const gchar *icc_profile;
-+#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-+ guint icc_profile_size;
-+#else
- gulong icc_profile_size;
-+#endif
- guint32 retval;
- gint compression_type;
-
diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
index 25056ecf7e03..60254041d668 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 2009-12-25 20:27:57.000000000 +0100
-+++ gtk/Makefile.in 2009-12-25 20:29:14.000000000 +0100
-@@ -1377,11 +1377,11 @@ bin_SCRIPTS = gtk-builder-convert $(am__
+--- gtk/Makefile.in.orig 2010-06-27 12:26:58.000000000 +0200
++++ gtk/Makefile.in 2010-06-27 12:28:14.000000000 +0200
+@@ -1350,9 +1350,9 @@
# gtk-update-icon-cache.exe doesn't require any special privileges.
@OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
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 \
-- $(GDK_PIXBUF_DEP_LIBS)
-+ $(GDK_PIXBUF_DEP_LIBS) $(GLIB_LIBS)
-
- gtk_update_icon_cache_SOURCES = \
- updateiconcache.c
+-gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
++gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS)
+ gtk_update_icon_cache_SOURCES = updateiconcache.c
+ STOCK_ICONS = \
+ stock-icons/16/document-open-recent.png \
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 28d34b3b06ac..06e2e8485b92 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,29 +1,13 @@
-bin/gdk-pixbuf-csource
-bin/gdk-pixbuf-query-loaders
bin/gtk-builder-convert
bin/gtk-demo
bin/gtk-query-immodules-2.0
bin/gtk-update-icon-cache
-etc/gtk-2.0/gdk-pixbuf.loaders
etc/gtk-2.0/gtk.immodules
etc/gtk-2.0/im-multipress.conf
include/gail-1.0/gail/gailwidget.h
include/gail-1.0/libgail-util/gail-util.h
include/gail-1.0/libgail-util/gailmisc.h
include/gail-1.0/libgail-util/gailtextutil.h
-include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
-include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
include/gtk-2.0/gdk/gdk.h
include/gtk-2.0/gdk/gdkapplaunchcontext.h
include/gtk-2.0/gdk/gdkcairo.h
@@ -41,6 +25,7 @@ include/gtk-2.0/gdk/gdki18n.h
include/gtk-2.0/gdk/gdkimage.h
include/gtk-2.0/gdk/gdkinput.h
include/gtk-2.0/gdk/gdkkeys.h
+include/gtk-2.0/gdk/gdkkeysyms-compat.h
include/gtk-2.0/gdk/gdkkeysyms.h
include/gtk-2.0/gdk/gdkpango.h
include/gtk-2.0/gdk/gdkpixbuf.h
@@ -278,104 +263,53 @@ include/gtk-unix-print-2.0/gtk/gtkprintjob.h
include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
include/gtk-unix-print-2.0/gtk/gtkunixprint.h
lib/girepository-1.0/Gdk-2.0.typelib
-lib/girepository-1.0/GdkPixbuf-2.0.typelib
+lib/girepository-1.0/GdkX11-2.0.typelib
lib/girepository-1.0/Gtk-2.0.typelib
-lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a
-lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la
-lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.a
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.la
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.so
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.a
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.la
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.so
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.a
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.la
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.so
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.a
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.la
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.so
+%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.a
+%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.la
+%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.so
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.a
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.la
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.so
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.a
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.la
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.so
lib/gtk-2.0/modules/libferret.a
lib/gtk-2.0/modules/libferret.la
lib/gtk-2.0/modules/libferret.so
@@ -390,29 +324,19 @@ lib/libgdk-x11-2.0.a
lib/libgdk-x11-2.0.la
lib/libgdk-x11-2.0.so
lib/libgdk-x11-2.0.so.0
-lib/libgdk_pixbuf-2.0.a
-lib/libgdk_pixbuf-2.0.la
-lib/libgdk_pixbuf-2.0.so
-lib/libgdk_pixbuf-2.0.so.0
-lib/libgdk_pixbuf_xlib-2.0.a
-lib/libgdk_pixbuf_xlib-2.0.la
-lib/libgdk_pixbuf_xlib-2.0.so
-lib/libgdk_pixbuf_xlib-2.0.so.0
lib/libgtk-x11-2.0.a
lib/libgtk-x11-2.0.la
lib/libgtk-x11-2.0.so
lib/libgtk-x11-2.0.so.0
libdata/pkgconfig/gail.pc
libdata/pkgconfig/gdk-2.0.pc
-libdata/pkgconfig/gdk-pixbuf-2.0.pc
-libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
libdata/pkgconfig/gdk-x11-2.0.pc
libdata/pkgconfig/gtk+-2.0.pc
libdata/pkgconfig/gtk+-unix-print-2.0.pc
libdata/pkgconfig/gtk+-x11-2.0.pc
share/aclocal/gtk-2.0.m4
share/gir-1.0/Gdk-2.0.gir
-share/gir-1.0/GdkPixbuf-2.0.gir
+share/gir-1.0/GdkX11-2.0.gir
share/gir-1.0/Gtk-2.0.gir
share/gtk-2.0/demo/alphatest.png
share/gtk-2.0/demo/apple-red.png
@@ -563,12 +487,18 @@ share/locale/ja/LC_MESSAGES/gtk20-properties.mo
share/locale/ja/LC_MESSAGES/gtk20.mo
share/locale/ka/LC_MESSAGES/gtk20-properties.mo
share/locale/ka/LC_MESSAGES/gtk20.mo
+share/locale/kg/LC_MESSAGES/gtk20-properties.mo
+share/locale/kg/LC_MESSAGES/gtk20.mo
+share/locale/kk/LC_MESSAGES/gtk20-properties.mo
+share/locale/kk/LC_MESSAGES/gtk20.mo
share/locale/kn/LC_MESSAGES/gtk20-properties.mo
share/locale/kn/LC_MESSAGES/gtk20.mo
share/locale/ko/LC_MESSAGES/gtk20-properties.mo
share/locale/ko/LC_MESSAGES/gtk20.mo
share/locale/ku/LC_MESSAGES/gtk20-properties.mo
share/locale/ku/LC_MESSAGES/gtk20.mo
+share/locale/lg/LC_MESSAGES/gtk20-properties.mo
+share/locale/lg/LC_MESSAGES/gtk20.mo
share/locale/li/LC_MESSAGES/gtk20-properties.mo
share/locale/li/LC_MESSAGES/gtk20.mo
share/locale/lt/LC_MESSAGES/gtk20-properties.mo
@@ -651,6 +581,8 @@ share/locale/tr/LC_MESSAGES/gtk20-properties.mo
share/locale/tr/LC_MESSAGES/gtk20.mo
share/locale/tt/LC_MESSAGES/gtk20-properties.mo
share/locale/tt/LC_MESSAGES/gtk20.mo
+share/locale/ug/LC_MESSAGES/gtk20-properties.mo
+share/locale/ug/LC_MESSAGES/gtk20.mo
share/locale/uk/LC_MESSAGES/gtk20-properties.mo
share/locale/uk/LC_MESSAGES/gtk20.mo
share/locale/ur/LC_MESSAGES/gtk20-properties.mo
@@ -688,8 +620,6 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrm include/gtk-unix-print-2.0/gtk
@dirrm include/gtk-unix-print-2.0
@dirrm include/gtk-2.0/gtk
-@dirrm include/gtk-2.0/gdk-pixbuf-xlib
-@dirrm include/gtk-2.0/gdk-pixbuf
@dirrm include/gtk-2.0/gdk
@dirrm include/gtk-2.0
@dirrm include/gail-1.0/libgail-util
@@ -697,18 +627,18 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrm include/gail-1.0
@dirrm etc/gtk-2.0
@exec /bin/mkdir -p %D/lib/gtk-2.0/modules
-@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines
+@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/engines
+@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/loaders
@dirrmtry share/themes/Default
@dirrmtry share/themes
@dirrmtry lib/gtk-2.0/modules
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/printbackends
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/modules
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/loaders
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/immodules
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/engines
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/printbackends
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/modules
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/loaders
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/immodules
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/engines
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%
@dirrmtry lib/gtk-2.0
-@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
@exec %D/bin/gtk-query-immodules-2.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@@ -720,6 +650,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/ur/LC_MESSAGES
@dirrmtry share/locale/ur
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/tt/LC_MESSAGES
@dirrmtry share/locale/tt
@dirrmtry share/locale/te/LC_MESSAGES
@@ -748,8 +680,14 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrmtry share/locale/mi
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
+@dirrmtry share/locale/lg/LC_MESSAGES
+@dirrmtry share/locale/lg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/kg/LC_MESSAGES
+@dirrmtry share/locale/kg
@dirrmtry share/locale/io/LC_MESSAGES
@dirrmtry share/locale/io
@dirrmtry share/locale/ia/LC_MESSAGES
diff --git a/x11-toolkits/gtk30-reference/Makefile b/x11-toolkits/gtk30-reference/Makefile
index b1ecb1860630..b7beec30130d 100644
--- a/x11-toolkits/gtk30-reference/Makefile
+++ b/x11-toolkits/gtk30-reference/Makefile
@@ -5,14 +5,8 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
-BOOKS= gdk gdk-pixbuf gtk
-
-MAN1= gdk-pixbuf-csource.1
-
-post-install:
- ${INSTALL_MAN} ${MAN1:S|^|${REFERENCE_SRC}/gdk-pixbuf/|} \
- ${PREFIX}/man/man1
+BOOKS= gdk gtk
.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index e38f8935ca4c..83d881b07752 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,12 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.191 2010/05/04 10:29:49 kwm Exp $
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.209 2010/11/15 21:17:48 kwm Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.20.1
-PORTREVISION?= 2
+PORTVERSION= 2.22.1
+PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
@@ -24,24 +24,23 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gimp Toolkit for X11 GUI (current stable version)
+LICENSE= LGPL20
+LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
LATEST_LINK= gtk20
.if !defined(REFERENCE_PORT)
BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \
- tiff.4:${PORTSDIR}/graphics/tiff \
- jpeg.11:${PORTSDIR}/graphics/jpeg \
- jasper.4:${PORTSDIR}/graphics/jasper
RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
USE_GMAKE= yes
USE_PERL5_BUILD=yes
+MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
-USE_GNOME= gnomehack atk pango ltverhack
+USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack
USE_GETTEXT= yes
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
@@ -49,26 +48,22 @@ CONFIGURE_ARGS= --enable-static --with-xinput=yes --with-libjasper
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-GTK_VERSION= 2.10.0
-PLIST_SUB= GTK_VERSION="${GTK_VERSION}"
-gdk_pixbuf_MAN= gdk-pixbuf-query-loaders.1
-gtk_MAN= gtk-query-immodules-2.0.1 gtk-update-icon-cache.1
-
-MAN1= ${gdk_pixbuf_MAN} ${gtk_MAN}
+MAN1= gtk-query-immodules-2.0.1 gtk-update-icon-cache.1
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-debug=yes
.endif
+OPTIONS= CUPS "Enable cups printing support" on
+
.include <bsd.port.pre.mk>
.if ${ARCH} == powerpc64
-EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-powerpc64
+EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-powerpc64
.endif
-.if (defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)) && \
- !defined(WITHOUT_CUPS)
+.if defined(WITH_CUPS)
LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client
CONFIGURE_ARGS+=--enable-cups=auto
PLIST_SUB+= CUPS:=""
@@ -82,10 +77,6 @@ post-patch:
${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
${WRKSRC}/configure
-# GnomeVFS needs pthread; gtk-demo may use GnomeVFS (via GtkFileChooser)
- @${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \
- s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \
- ${WRKSRC}/demos/gtk-demo/Makefile.in
@${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in
@${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \
${WRKSRC}/gtk/Makefile.in
@@ -97,10 +88,9 @@ post-install:
-@${FIND} ${LOCALBASE}/share/icons -type d -depth 1 -exec \
${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null
@${MKDIR} ${PREFIX}/lib/gtk-2.0/modules
- @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK_VERSION}/engines
- ${INSTALL_MAN} ${gdk_pixbuf_MAN:S|^|${WRKSRC}/docs/reference/gdk-pixbuf/|} \
- ${PREFIX}/man/man1
- ${INSTALL_MAN} ${gtk_MAN:S|^|${WRKSRC}/docs/reference/gtk/|} \
+ @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/engines
+ @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/loaders
+ ${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/docs/reference/gtk/|} \
${PREFIX}/man/man1
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index cc3c94a0d656..a6827d508561 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gtk+-2.20.1.tar.bz2) = 53e6f3a93bd22934878fc4a4a34c68aa
-SHA256 (gnome2/gtk+-2.20.1.tar.bz2) = 0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65
-SIZE (gnome2/gtk+-2.20.1.tar.bz2) = 19089076
+SHA256 (gnome2/gtk+-2.22.1.tar.bz2) = 965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07
+SIZE (gnome2/gtk+-2.22.1.tar.bz2) = 18306164
diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in
index 307fd6fc2f77..f2ac7216d525 100644
--- a/x11-toolkits/gtk30/files/patch-Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig Wed Aug 3 18:09:32 2005
-+++ Makefile.in Wed Aug 3 18:10:01 2005
-@@ -288,7 +288,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- Makefile.in.orig 2010-06-27 12:13:41.000000000 +0200
++++ Makefile.in 2010-06-27 12:14:23.000000000 +0200
+@@ -456,7 +456,7 @@
+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ && DISPLAY=:$$XID && export DISPLAY
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos perf contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
++SRC_SUBDIRS = gdk gtk modules demos perf
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
# require automake 1.4
diff --git a/x11-toolkits/gtk30/files/patch-ai b/x11-toolkits/gtk30/files/patch-ai
index 0a4e1022fa27..a9d1d5f214c3 100644
--- a/x11-toolkits/gtk30/files/patch-ai
+++ b/x11-toolkits/gtk30/files/patch-ai
@@ -1,11 +1,11 @@
---- 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 = \
+--- docs/reference/Makefile.in.orig 2010-06-27 12:22:03.000000000 +0200
++++ docs/reference/Makefile.in 2010-06-27 12:22:37.000000000 +0200
+@@ -354,7 +354,7 @@
|| { 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
+-SUBDIRS = gdk gtk libgail-util
++SUBDIRS = #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
deleted file mode 100644
index 04ce78984f84..000000000000
--- a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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-gdk-pixbuf_io-png.c b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_io-png.c
deleted file mode 100644
index cca139d6b99a..000000000000
--- a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_io-png.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- gdk-pixbuf/io-png.c.orig 2010-05-02 05:14:27.000000000 +0200
-+++ gdk-pixbuf/io-png.c 2010-05-15 17:30:35.000000000 +0200
-@@ -261,7 +261,11 @@ gdk_pixbuf__png_image_load (FILE *f, GEr
- gchar *icc_profile_base64;
- const gchar *icc_profile_title;
- const gchar *icc_profile;
-+#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-+ guint icc_profile_size;
-+#else
- gulong icc_profile_size;
-+#endif
- guint32 retval;
- gint compression_type;
-
-@@ -607,7 +611,11 @@ png_info_callback (png_structp png_rea
- gchar *icc_profile_base64;
- const gchar *icc_profile_title;
- const gchar *icc_profile;
-+#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-+ guint icc_profile_size;
-+#else
- gulong icc_profile_size;
-+#endif
- guint32 retval;
- gint compression_type;
-
diff --git a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
index 25056ecf7e03..60254041d668 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 2009-12-25 20:27:57.000000000 +0100
-+++ gtk/Makefile.in 2009-12-25 20:29:14.000000000 +0100
-@@ -1377,11 +1377,11 @@ bin_SCRIPTS = gtk-builder-convert $(am__
+--- gtk/Makefile.in.orig 2010-06-27 12:26:58.000000000 +0200
++++ gtk/Makefile.in 2010-06-27 12:28:14.000000000 +0200
+@@ -1350,9 +1350,9 @@
# gtk-update-icon-cache.exe doesn't require any special privileges.
@OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
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 \
-- $(GDK_PIXBUF_DEP_LIBS)
-+ $(GDK_PIXBUF_DEP_LIBS) $(GLIB_LIBS)
-
- gtk_update_icon_cache_SOURCES = \
- updateiconcache.c
+-gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
++gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS)
+ gtk_update_icon_cache_SOURCES = updateiconcache.c
+ STOCK_ICONS = \
+ stock-icons/16/document-open-recent.png \
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 28d34b3b06ac..06e2e8485b92 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,29 +1,13 @@
-bin/gdk-pixbuf-csource
-bin/gdk-pixbuf-query-loaders
bin/gtk-builder-convert
bin/gtk-demo
bin/gtk-query-immodules-2.0
bin/gtk-update-icon-cache
-etc/gtk-2.0/gdk-pixbuf.loaders
etc/gtk-2.0/gtk.immodules
etc/gtk-2.0/im-multipress.conf
include/gail-1.0/gail/gailwidget.h
include/gail-1.0/libgail-util/gail-util.h
include/gail-1.0/libgail-util/gailmisc.h
include/gail-1.0/libgail-util/gailtextutil.h
-include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
-include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
-include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
include/gtk-2.0/gdk/gdk.h
include/gtk-2.0/gdk/gdkapplaunchcontext.h
include/gtk-2.0/gdk/gdkcairo.h
@@ -41,6 +25,7 @@ include/gtk-2.0/gdk/gdki18n.h
include/gtk-2.0/gdk/gdkimage.h
include/gtk-2.0/gdk/gdkinput.h
include/gtk-2.0/gdk/gdkkeys.h
+include/gtk-2.0/gdk/gdkkeysyms-compat.h
include/gtk-2.0/gdk/gdkkeysyms.h
include/gtk-2.0/gdk/gdkpango.h
include/gtk-2.0/gdk/gdkpixbuf.h
@@ -278,104 +263,53 @@ include/gtk-unix-print-2.0/gtk/gtkprintjob.h
include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
include/gtk-unix-print-2.0/gtk/gtkunixprint.h
lib/girepository-1.0/Gdk-2.0.typelib
-lib/girepository-1.0/GdkPixbuf-2.0.typelib
+lib/girepository-1.0/GdkX11-2.0.typelib
lib/girepository-1.0/Gtk-2.0.typelib
-lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a
-lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la
-lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.a
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.la
-lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-qtif.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.la
-lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.a
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.la
-%%CUPS:%%lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-cups.so
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.a
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.la
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.so
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.a
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.la
-lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.so
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.a
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.la
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.so
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.a
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.la
+lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.so
+%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.a
+%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.la
+%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.so
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.a
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.la
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.so
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.a
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.la
+lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.so
lib/gtk-2.0/modules/libferret.a
lib/gtk-2.0/modules/libferret.la
lib/gtk-2.0/modules/libferret.so
@@ -390,29 +324,19 @@ lib/libgdk-x11-2.0.a
lib/libgdk-x11-2.0.la
lib/libgdk-x11-2.0.so
lib/libgdk-x11-2.0.so.0
-lib/libgdk_pixbuf-2.0.a
-lib/libgdk_pixbuf-2.0.la
-lib/libgdk_pixbuf-2.0.so
-lib/libgdk_pixbuf-2.0.so.0
-lib/libgdk_pixbuf_xlib-2.0.a
-lib/libgdk_pixbuf_xlib-2.0.la
-lib/libgdk_pixbuf_xlib-2.0.so
-lib/libgdk_pixbuf_xlib-2.0.so.0
lib/libgtk-x11-2.0.a
lib/libgtk-x11-2.0.la
lib/libgtk-x11-2.0.so
lib/libgtk-x11-2.0.so.0
libdata/pkgconfig/gail.pc
libdata/pkgconfig/gdk-2.0.pc
-libdata/pkgconfig/gdk-pixbuf-2.0.pc
-libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
libdata/pkgconfig/gdk-x11-2.0.pc
libdata/pkgconfig/gtk+-2.0.pc
libdata/pkgconfig/gtk+-unix-print-2.0.pc
libdata/pkgconfig/gtk+-x11-2.0.pc
share/aclocal/gtk-2.0.m4
share/gir-1.0/Gdk-2.0.gir
-share/gir-1.0/GdkPixbuf-2.0.gir
+share/gir-1.0/GdkX11-2.0.gir
share/gir-1.0/Gtk-2.0.gir
share/gtk-2.0/demo/alphatest.png
share/gtk-2.0/demo/apple-red.png
@@ -563,12 +487,18 @@ share/locale/ja/LC_MESSAGES/gtk20-properties.mo
share/locale/ja/LC_MESSAGES/gtk20.mo
share/locale/ka/LC_MESSAGES/gtk20-properties.mo
share/locale/ka/LC_MESSAGES/gtk20.mo
+share/locale/kg/LC_MESSAGES/gtk20-properties.mo
+share/locale/kg/LC_MESSAGES/gtk20.mo
+share/locale/kk/LC_MESSAGES/gtk20-properties.mo
+share/locale/kk/LC_MESSAGES/gtk20.mo
share/locale/kn/LC_MESSAGES/gtk20-properties.mo
share/locale/kn/LC_MESSAGES/gtk20.mo
share/locale/ko/LC_MESSAGES/gtk20-properties.mo
share/locale/ko/LC_MESSAGES/gtk20.mo
share/locale/ku/LC_MESSAGES/gtk20-properties.mo
share/locale/ku/LC_MESSAGES/gtk20.mo
+share/locale/lg/LC_MESSAGES/gtk20-properties.mo
+share/locale/lg/LC_MESSAGES/gtk20.mo
share/locale/li/LC_MESSAGES/gtk20-properties.mo
share/locale/li/LC_MESSAGES/gtk20.mo
share/locale/lt/LC_MESSAGES/gtk20-properties.mo
@@ -651,6 +581,8 @@ share/locale/tr/LC_MESSAGES/gtk20-properties.mo
share/locale/tr/LC_MESSAGES/gtk20.mo
share/locale/tt/LC_MESSAGES/gtk20-properties.mo
share/locale/tt/LC_MESSAGES/gtk20.mo
+share/locale/ug/LC_MESSAGES/gtk20-properties.mo
+share/locale/ug/LC_MESSAGES/gtk20.mo
share/locale/uk/LC_MESSAGES/gtk20-properties.mo
share/locale/uk/LC_MESSAGES/gtk20.mo
share/locale/ur/LC_MESSAGES/gtk20-properties.mo
@@ -688,8 +620,6 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrm include/gtk-unix-print-2.0/gtk
@dirrm include/gtk-unix-print-2.0
@dirrm include/gtk-2.0/gtk
-@dirrm include/gtk-2.0/gdk-pixbuf-xlib
-@dirrm include/gtk-2.0/gdk-pixbuf
@dirrm include/gtk-2.0/gdk
@dirrm include/gtk-2.0
@dirrm include/gail-1.0/libgail-util
@@ -697,18 +627,18 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrm include/gail-1.0
@dirrm etc/gtk-2.0
@exec /bin/mkdir -p %D/lib/gtk-2.0/modules
-@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines
+@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/engines
+@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/loaders
@dirrmtry share/themes/Default
@dirrmtry share/themes
@dirrmtry lib/gtk-2.0/modules
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/printbackends
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/modules
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/loaders
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/immodules
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/engines
-@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/printbackends
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/modules
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/loaders
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/immodules
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/engines
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%
@dirrmtry lib/gtk-2.0
-@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
@exec %D/bin/gtk-query-immodules-2.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@@ -720,6 +650,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrmtry share/locale/uz@cyrillic
@dirrmtry share/locale/ur/LC_MESSAGES
@dirrmtry share/locale/ur
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/tt/LC_MESSAGES
@dirrmtry share/locale/tt
@dirrmtry share/locale/te/LC_MESSAGES
@@ -748,8 +680,14 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrmtry share/locale/mi
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
+@dirrmtry share/locale/lg/LC_MESSAGES
+@dirrmtry share/locale/lg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/kg/LC_MESSAGES
+@dirrmtry share/locale/kg
@dirrmtry share/locale/io/LC_MESSAGES
@dirrmtry share/locale/io
@dirrmtry share/locale/ia/LC_MESSAGES
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index a75e328c58e2..e87c0892892c 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtkdatabox
PORTVERSION= 0.9.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= SF http://www.eudoxos.de/gtk/gtkdatabox/download/
DIST_SUBDIR= gnome2
@@ -41,7 +41,7 @@ PLIST_SUB+= GLADE="@comment "
.endif
.if !defined(WITHOUT_GLADEUI)
-LIB_DEPENDS+= gladeui-1.9:${PORTSDIR}/devel/glade3
+LIB_DEPENDS+= gladeui-1.10:${PORTSDIR}/devel/glade3
CONFIGURE_ARGS+= --enable-glade
PLIST_SUB+= GLADEUI=""
.else
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 21c28529d217..529baff2c7fe 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkextra
PORTVERSION= 2.1.1
-PORTREVISION= 8
+PORTREVISION= 9
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
index 209bf3070e28..d1f4dac111bc 100644
--- a/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c
+++ b/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c
@@ -1,6 +1,14 @@
---- 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
+--- gtkextra/gtkitementry.c.orig 2002-06-27 18:57:19.000000000 +0200
++++ gtkextra/gtkitementry.c 2010-11-02 17:51:07.000000000 +0100
+@@ -131,7 +131,6 @@ static void gtk_entry_draw_curso
+ static PangoLayout *gtk_entry_ensure_layout (GtkEntry *entry,
+ gboolean include_preedit);
+ static void gtk_entry_queue_draw (GtkEntry *entry);
+-static void gtk_entry_reset_im_context (GtkEntry *entry);
+ static void gtk_entry_recompute (GtkEntry *entry);
+ static void gtk_entry_get_cursor_locations (GtkEntry *entry,
+ CursorType type,
+@@ -693,23 +692,23 @@ gtk_entry_real_insert_text (GtkEditable
new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
}
@@ -34,7 +42,7 @@
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
+@@ -718,19 +717,19 @@ gtk_entry_real_insert_text (GtkEditable
}
}
@@ -58,7 +66,7 @@
if (entry->current_pos > *position)
entry->current_pos += n_chars;
-@@ -763,9 +763,9 @@ gtk_entry_real_delete_text (GtkEditable
+@@ -763,9 +762,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;
@@ -70,7 +78,7 @@
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
+@@ -1028,7 +1027,7 @@ gtk_entry_retrieve_surrounding_cb (GtkIM
{
gtk_im_context_set_surrounding (context,
entry->text,
@@ -79,7 +87,7 @@
g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
return TRUE;
-@@ -1229,7 +1229,7 @@ gtk_entry_create_layout (GtkEntry *entry
+@@ -1229,7 +1228,7 @@ gtk_entry_create_layout (GtkEntry *entry
if (entry->visible)
{
@@ -88,7 +96,7 @@
g_string_insert (tmp_string, cursor_index, preedit_string);
}
else
-@@ -1238,7 +1238,7 @@ gtk_entry_create_layout (GtkEntry *entry
+@@ -1238,7 +1237,7 @@ gtk_entry_create_layout (GtkEntry *entry
gint preedit_len_chars;
gunichar invisible_char;
@@ -97,7 +105,7 @@
preedit_len_chars = g_utf8_strlen (preedit_string, -1);
ch_len += preedit_len_chars;
-@@ -1272,7 +1272,7 @@ gtk_entry_create_layout (GtkEntry *entry
+@@ -1272,7 +1271,7 @@ gtk_entry_create_layout (GtkEntry *entry
{
if (entry->visible)
{
@@ -106,3 +114,20 @@
}
else
{
+@@ -1695,16 +1694,6 @@ gtk_entry_queue_draw (GtkEntry *entry)
+ }
+
+ static void
+-gtk_entry_reset_im_context (GtkEntry *entry)
+-{
+- if (entry->need_im_reset)
+- {
+- entry->need_im_reset = 0;
+- gtk_im_context_reset (entry->im_context);
+- }
+-}
+-
+-static void
+ gtk_entry_get_cursor_locations (GtkEntry *entry,
+ CursorType type,
+ gint *strong_x,
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index d6491c7b6c3f..5a7b37f2c659 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -24,4 +24,11 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
USE_LDCONFIG= yes
+post-patch:
+ @${REINPLACE_CMD} -e 's|-DGDK_DISABLE_DEPRECATED||g' \
+ -e 's|-DGDK_PIXBUF_DISABLE_DEPRECATED||g' \
+ -e 's|-DGTK_DISABLE_DEPRECATED||g' \
+ ${WRKSRC}/gdkglext/gdkmm/gl/Makefile.in \
+ ${WRKSRC}/gtkglext/gtkmm/gl/Makefile.in
+
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 72279c0ba812..1523301ec74d 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -3,18 +3,18 @@
# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.64 2010/05/04 14:03:00 kwm Exp $
+# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.71 2010/09/27 21:24:09 kwm Exp $
#
PORTNAME= gtkmm
-PORTVERSION= 2.20.3
-PORTREVISION?= 1
+PORTVERSION= 2.22.0
+PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= C++ wrapper for Gtk+, Pango, Atk
+COMMENT= C++ wrapper for Gtk+, Pango
USE_BZIP2= yes
LATEST_LINK= gtkmm24
@@ -23,6 +23,7 @@ LATEST_LINK= gtkmm24
LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \
+ atkmm-1.6.2:${PORTSDIR}/accessibility/atkmm \
pangomm-1.4.1:${PORTSDIR}/x11-toolkits/pangomm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
@@ -32,6 +33,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack gtk20 ltverhack:1
+MAKE_JOBS_SAFE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-documentation \
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index 2e84b722cd80..7e54377a37d1 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkmm-2.20.3.tar.bz2) = c35f236091b4f96fe45c53b4107400a9
-SHA256 (gnome2/gtkmm-2.20.3.tar.bz2) = 311d2156f15cdbdce22cb2af6e606a3f621d7dfebea6f7b1be0132e81af90585
-SIZE (gnome2/gtkmm-2.20.3.tar.bz2) = 12554334
+MD5 (gnome2/gtkmm-2.22.0.tar.bz2) = 4356dfde44b13f7fb1bfbd97623f37dd
+SHA256 (gnome2/gtkmm-2.22.0.tar.bz2) = 8478d80d8d4793c2e1c459a71bad6a767a43eaf2664da06a9bd65a2b98bb07b1
+SIZE (gnome2/gtkmm-2.22.0.tar.bz2) = 11496369
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index 52ebe7996fe5..acfb22e4aebe 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -1,44 +1,3 @@
-include/atkmm-1.6/atkmm.h
-include/atkmm-1.6/atkmm/action.h
-include/atkmm-1.6/atkmm/component.h
-include/atkmm-1.6/atkmm/document.h
-include/atkmm-1.6/atkmm/editabletext.h
-include/atkmm-1.6/atkmm/hyperlink.h
-include/atkmm-1.6/atkmm/hypertext.h
-include/atkmm-1.6/atkmm/image.h
-include/atkmm-1.6/atkmm/implementor.h
-include/atkmm-1.6/atkmm/init.h
-include/atkmm-1.6/atkmm/noopobject.h
-include/atkmm-1.6/atkmm/object.h
-include/atkmm-1.6/atkmm/objectaccessible.h
-include/atkmm-1.6/atkmm/private/action_p.h
-include/atkmm-1.6/atkmm/private/component_p.h
-include/atkmm-1.6/atkmm/private/document_p.h
-include/atkmm-1.6/atkmm/private/editabletext_p.h
-include/atkmm-1.6/atkmm/private/hyperlink_p.h
-include/atkmm-1.6/atkmm/private/hypertext_p.h
-include/atkmm-1.6/atkmm/private/image_p.h
-include/atkmm-1.6/atkmm/private/implementor_p.h
-include/atkmm-1.6/atkmm/private/noopobject_p.h
-include/atkmm-1.6/atkmm/private/object_p.h
-include/atkmm-1.6/atkmm/private/objectaccessible_p.h
-include/atkmm-1.6/atkmm/private/relation_p.h
-include/atkmm-1.6/atkmm/private/relationset_p.h
-include/atkmm-1.6/atkmm/private/selection_p.h
-include/atkmm-1.6/atkmm/private/stateset_p.h
-include/atkmm-1.6/atkmm/private/streamablecontent_p.h
-include/atkmm-1.6/atkmm/private/table_p.h
-include/atkmm-1.6/atkmm/private/text_p.h
-include/atkmm-1.6/atkmm/private/value_p.h
-include/atkmm-1.6/atkmm/relation.h
-include/atkmm-1.6/atkmm/relationset.h
-include/atkmm-1.6/atkmm/selection.h
-include/atkmm-1.6/atkmm/stateset.h
-include/atkmm-1.6/atkmm/streamablecontent.h
-include/atkmm-1.6/atkmm/table.h
-include/atkmm-1.6/atkmm/text.h
-include/atkmm-1.6/atkmm/value.h
-include/atkmm-1.6/atkmm/wrap_init.h
include/gdkmm-%%API_VERSION%%/gdkmm.h
include/gdkmm-%%API_VERSION%%/gdkmm/bitmap.h
include/gdkmm-%%API_VERSION%%/gdkmm/color.h
@@ -53,7 +12,6 @@ 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
@@ -73,7 +31,6 @@ 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
@@ -171,6 +128,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/icontheme.h
include/gtkmm-%%API_VERSION%%/gtkmm/iconview.h
include/gtkmm-%%API_VERSION%%/gtkmm/image.h
include/gtkmm-%%API_VERSION%%/gtkmm/imagemenuitem.h
+include/gtkmm-%%API_VERSION%%/gtkmm/infobar.h
include/gtkmm-%%API_VERSION%%/gtkmm/inputdialog.h
include/gtkmm-%%API_VERSION%%/gtkmm/invisible.h
include/gtkmm-%%API_VERSION%%/gtkmm/item.h
@@ -272,6 +230,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/icontheme_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/iconview_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/image_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/imagemenuitem_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/infobar_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/inputdialog_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/invisible_p.h
include/gtkmm-%%API_VERSION%%/gtkmm/private/item_p.h
@@ -460,10 +419,12 @@ 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/libatkmm-1.6.a
-lib/libatkmm-1.6.la
-lib/libatkmm-1.6.so
-lib/libatkmm-1.6.so.1
+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/libgdkmm-%%VERSION%%.a
lib/libgdkmm-%%VERSION%%.la
lib/libgdkmm-%%VERSION%%.so
@@ -472,51 +433,10 @@ lib/libgtkmm-%%VERSION%%.a
lib/libgtkmm-%%VERSION%%.la
lib/libgtkmm-%%VERSION%%.so
lib/libgtkmm-%%VERSION%%.so.1
-libdata/pkgconfig/atkmm-1.6.pc
libdata/pkgconfig/gdkmm-%%API_VERSION%%.pc
libdata/pkgconfig/gtkmm-%%API_VERSION%%.pc
-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%%/proc/m4
+@dirrm lib/gtkmm-%%API_VERSION%%/proc
@dirrm lib/gtkmm-%%API_VERSION%%/include
@dirrm lib/gtkmm-%%API_VERSION%%
@dirrm lib/gdkmm-%%API_VERSION%%/include
@@ -527,6 +447,3 @@ share/gtkmm-%%API_VERSION%%/demo/textwidget.h
@dirrm include/gdkmm-%%API_VERSION%%/gdkmm/private
@dirrm include/gdkmm-%%API_VERSION%%/gdkmm
@dirrm include/gdkmm-%%API_VERSION%%
-@dirrm include/atkmm-1.6/atkmm/private
-@dirrm include/atkmm-1.6/atkmm
-@dirrm include/atkmm-1.6
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index 640c8d3e7724..8f355d89d70c 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-toolkits/gtksourceview2/Makefile,v 1.3 2010/06/23 11:44:45 kwm Exp $
+# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.96 2010/09/29 12:42:49 kwm Exp $
#
PORTNAME= gtksourceview2
-PORTVERSION= 2.10.4
+PORTVERSION= 2.10.5
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
diff --git a/x11-toolkits/gtksourceview2/distinfo b/x11-toolkits/gtksourceview2/distinfo
index 37debe302fc4..9e8ddec108c9 100644
--- a/x11-toolkits/gtksourceview2/distinfo
+++ b/x11-toolkits/gtksourceview2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtksourceview-2.10.4.tar.bz2) = 342666cba9eb2643e5166a0cb58203d2
-SHA256 (gnome2/gtksourceview-2.10.4.tar.bz2) = 54f243cf6d55f8d75d910b05374c6b33c9bd66b9c05e781ed565275e0bcad741
-SIZE (gnome2/gtksourceview-2.10.4.tar.bz2) = 1232741
+MD5 (gnome2/gtksourceview-2.10.5.tar.bz2) = 1219ad1694df136f126507466aeb41aa
+SHA256 (gnome2/gtksourceview-2.10.5.tar.bz2) = c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
+SIZE (gnome2/gtksourceview-2.10.5.tar.bz2) = 1253321
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index fae81cca8442..a0f3624155c1 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.73 2010/04/02 17:56:10 kwm Exp $
+# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.75 2010/09/28 16:03:49 kwm Exp $
#
PORTNAME= libbonoboui
-PORTVERSION= 2.24.3
-PORTREVISION?= 1
+PORTVERSION= 2.24.4
+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 4953d1fe3e2c..f062906028f8 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome/libbonoboui-2.24.3.tar.bz2) = 3a754b1df0a4d5fd4836a05020a0bb4a
-SHA256 (gnome/libbonoboui-2.24.3.tar.bz2) = 0be51ee3069a2ef21d98561ee28036dd263ac08b401776fe9164e084825ffd84
-SIZE (gnome/libbonoboui-2.24.3.tar.bz2) = 926983
+MD5 (gnome/libbonoboui-2.24.4.tar.bz2) = cc2fb47b79fb3bcc6816ff07d7496cf9
+SHA256 (gnome/libbonoboui-2.24.4.tar.bz2) = 4b683a4a933392384267a0bf99771a99ef2ceacee22d67efe5648b894f8ba0c7
+SIZE (gnome/libbonoboui-2.24.4.tar.bz2) = 961744
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index 34ed3af15609..46a24f14783b 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -67,6 +67,7 @@ share/locale/da/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/de/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/dz/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/en@shaw/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/eo/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/el/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/en_CA/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/en_GB/LC_MESSAGES/libbonoboui-2.0.mo
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 21937fda7ea8..f7f87008c41a 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -3,12 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.73 2010/04/01 15:43:24 kwm Exp $
+# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.75 2010/09/28 16:07:36 kwm Exp $
#
PORTNAME= libgnomeprintui
-PORTVERSION= 2.18.5
-PORTREVISION= 1
+PORTVERSION= 2.18.6
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo
index f84fbf9c543d..4848e0004326 100644
--- a/x11-toolkits/libgnomeprintui/distinfo
+++ b/x11-toolkits/libgnomeprintui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeprintui-2.18.5.tar.bz2) = 66c1cf3a9ead428585c2c44e6110ebb7
-SHA256 (gnome2/libgnomeprintui-2.18.5.tar.bz2) = 48ef73621dc2d208f81031dc87d18757879761ca176df80f46fafcfd9af9449f
-SIZE (gnome2/libgnomeprintui-2.18.5.tar.bz2) = 677362
+MD5 (gnome2/libgnomeprintui-2.18.6.tar.bz2) = cbfab252ec7e9dc25bb1fe1610c3270b
+SHA256 (gnome2/libgnomeprintui-2.18.6.tar.bz2) = 156ae5b66e5dcc546efa2449048f792d76c55b30d93a9b67b0c69665e346f46a
+SIZE (gnome2/libgnomeprintui-2.18.6.tar.bz2) = 681125
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 6908a4c37851..10bb032cd73e 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.127 2010/04/01 14:39:51 kwm Exp $
+# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.129 2010/09/27 20:16:41 kwm Exp $
#
PORTNAME= libgnomeui
-PORTVERSION= 2.24.3
-PORTREVISION?= 2
+PORTVERSION= 2.24.4
+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 f68637521994..eee03bcf8f8f 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeui-2.24.3.tar.bz2) = ceab6f4370581d1a03c09f15cc103099
-SHA256 (gnome2/libgnomeui-2.24.3.tar.bz2) = 04c81f3bb5a337cdf3ed1230916f82d29857ee95eb884f58dd2f5c6860efe803
-SIZE (gnome2/libgnomeui-2.24.3.tar.bz2) = 1401560
+MD5 (gnome2/libgnomeui-2.24.4.tar.bz2) = f8f68600f26832d3d24b7d7d99d050b9
+SHA256 (gnome2/libgnomeui-2.24.4.tar.bz2) = a64dcb5af190ec0bfe2ba647ab09a90e4187336fa417d301abfb736be41283b2
+SIZE (gnome2/libgnomeui-2.24.4.tar.bz2) = 1431076
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index a22a6f1b05ff..59ab6d73f2f1 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -103,6 +103,7 @@ share/locale/is/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/it/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ja/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ka/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/kk/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/kn/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ko/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ku/LC_MESSAGES/libgnomeui-2.0.mo
@@ -148,6 +149,7 @@ share/locale/th/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/tk/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/tr/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/tt/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/ug/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/uk/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/uz@cyrillic/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/vi/LC_MESSAGES/libgnomeui-2.0.mo
@@ -171,6 +173,8 @@ share/pixmaps/gnome-about-logo.png
@dirrmtry share/locale/xh
@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/tt/LC_MESSAGES
@dirrmtry share/locale/tt
@dirrmtry share/locale/te/LC_MESSAGES
@@ -203,6 +207,8 @@ share/pixmaps/gnome-about-logo.png
@dirrmtry share/locale/la
@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
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 5fe55515b04e..b6c4130fe605 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-toolkits/libwnck/Makefile,v 1.5 2010/06/23 20:05:15 kwm Exp $
+# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.133 2010/11/17 11:38:29 kwm Exp $
#
PORTNAME= libwnck
-PORTVERSION= 2.30.3
+PORTVERSION= 2.30.6
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index 0abac33b1cd3..8ba015d70cfd 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/libwnck-2.30.3.tar.bz2) = 743276e946b2512ef86246f8e9def6a6
-SHA256 (gnome2/libwnck-2.30.3.tar.bz2) = e3afbeeab591e8f22b32d957e6372bd2f38d0ba33a6a11aa436db840d57a6b04
-SIZE (gnome2/libwnck-2.30.3.tar.bz2) = 708132
+SHA256 (gnome2/libwnck-2.30.6.tar.bz2) = 4d25984ed5cfe215eb650f960de634300a6cafc9d98bbc7caea8043b7cd96cc5
+SIZE (gnome2/libwnck-2.30.6.tar.bz2) = 724558
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index d0e7f8ca007d..6e8a07f1d691 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -61,6 +61,7 @@ share/locale/is/LC_MESSAGES/libwnck.mo
share/locale/it/LC_MESSAGES/libwnck.mo
share/locale/ja/LC_MESSAGES/libwnck.mo
share/locale/ka/LC_MESSAGES/libwnck.mo
+share/locale/kk/LC_MESSAGES/libwnck.mo
share/locale/kn/LC_MESSAGES/libwnck.mo
share/locale/ko/LC_MESSAGES/libwnck.mo
share/locale/ku/LC_MESSAGES/libwnck.mo
@@ -99,6 +100,7 @@ share/locale/ta/LC_MESSAGES/libwnck.mo
share/locale/te/LC_MESSAGES/libwnck.mo
share/locale/th/LC_MESSAGES/libwnck.mo
share/locale/tr/LC_MESSAGES/libwnck.mo
+share/locale/ug/LC_MESSAGES/libwnck.mo
share/locale/uk/LC_MESSAGES/libwnck.mo
share/locale/vi/LC_MESSAGES/libwnck.mo
share/locale/wa/LC_MESSAGES/libwnck.mo
@@ -113,6 +115,8 @@ share/gir-1.0/Wnck-1.0.gir
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -133,6 +137,8 @@ share/gir-1.0/Wnck-1.0.gir
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile
index 6ed78214d14e..0dff1f8e402c 100644
--- a/x11-toolkits/ocaml-lablgtk2/Makefile
+++ b/x11-toolkits/ocaml-lablgtk2/Makefile
@@ -18,6 +18,8 @@ DISTNAME= lablgtk-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= An Objective Caml interface to GTK+ 2.x
+BROKEN= Doesn't build with Glib 2.26
+
USE_GMAKE= yes
USE_GNOME= gtk20
USE_OCAML= yes
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 192c081f6c43..ed65a8023abd 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.9 2010/06/23 22:34:21 kwm Exp $
+# $MCom: ports/x11-toolkits/pango/Makefile,v 1.161 2010/09/30 06:56:41 kwm Exp $
#
PORTNAME= pango
-PORTVERSION= 1.28.1
+PORTVERSION= 1.28.3
PORTREVISION?= 0
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME \
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 27a809b6fa86..7996f2e92754 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pango-1.28.1.tar.bz2) = bab5b4eb3fde6b0a5bfe98d25e668741
-SHA256 (gnome2/pango-1.28.1.tar.bz2) = 8f3eaab506f613dd25bb1fa65ea87a145d523d066d90c227bdb3016523451bc2
-SIZE (gnome2/pango-1.28.1.tar.bz2) = 1483961
+MD5 (gnome2/pango-1.28.3.tar.bz2) = caa74baea47e7e16bc73c89f9089d522
+SHA256 (gnome2/pango-1.28.3.tar.bz2) = 5e278bc9430cc7bb00270f183360d262c5006b51248e8b537ea904573f200632
+SIZE (gnome2/pango-1.28.3.tar.bz2) = 1509501
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index b463e1a77ed1..535d9de6ab1f 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-toolkits/py-gnome-desktop/Makefile,v 1.2 2010/06/24 10:03:55 kwm Exp $
+# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.103 2010/09/30 06:27:40 kwm Exp $
#
PORTNAME= gnome-desktop
-PORTVERSION= 2.30.2
-PORTREVISION= 1
+PORTVERSION= 2.32.0
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -24,8 +23,8 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
- brasero-media.2:${PORTSDIR}/sysutils/brasero \
- evdocument.2:${PORTSDIR}/graphics/evince
+ brasero-media.3:${PORTSDIR}/sysutils/brasero \
+ evdocument.3:${PORTSDIR}/graphics/evince
RUN_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy
USE_BZIP2= yes
@@ -52,6 +51,7 @@ DOCSDIR= ${WRKSRC}/share/doc/py-gnome-desktop
post-patch:
@${FIND} ${WRKSRC}/docs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
-e 's|^HTML_DIR =.*|HTML_DIR = ${DOCSDIR}|g'
+ @${REINPLACE_CMD} -e 's|2.30|2.32|g' ${WRKSRC}/configure
.if !defined(NOPORTDOCS)
post-install:
diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo
index 15c9456624f9..0f854db68e0c 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.30.2.tar.bz2) = b90f6e96a6321e7bf859f6faff2aa4df
-SHA256 (gnome2/gnome-python-desktop-2.30.2.tar.bz2) = 23aa8dbae4bd3d00a5da1eae9500ba3787af4ad0481073ea53e5bff824bbcebb
-SIZE (gnome2/gnome-python-desktop-2.30.2.tar.bz2) = 598305
+MD5 (gnome2/gnome-python-desktop-2.32.0.tar.bz2) = 0e73fa80ace5c861777e0b523c6ead9d
+SHA256 (gnome2/gnome-python-desktop-2.32.0.tar.bz2) = 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9
+SIZE (gnome2/gnome-python-desktop-2.32.0.tar.bz2) = 621277
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index d2bb0c968d7f..700412b5bfe3 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -3,12 +3,12 @@
# Whom: marc@informatik.uni-bremen.de
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.69 2009/12/27 16:45:09 kwm Exp $
+# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.72 2010/09/28 15:45:26 kwm Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.17.0
-PORTREVISION= 4
+PORTVERSION= 2.22.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits python
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index 659add33eae8..e2734ab7cd77 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygtk-2.17.0.tar.bz2) = 43d704343d7ca04a6e4ddd4fa73a3c55
-SHA256 (gnome2/pygtk-2.17.0.tar.bz2) = 6a61817a2e765c6209c72ecdf44389ec134c1ebed1d842408bf001c9321f1400
-SIZE (gnome2/pygtk-2.17.0.tar.bz2) = 2260394
+MD5 (gnome2/pygtk-2.22.0.tar.bz2) = e9bba9cd4cdaccb22a7991cc2f7c8373
+SHA256 (gnome2/pygtk-2.22.0.tar.bz2) = 4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8
+SIZE (gnome2/pygtk-2.22.0.tar.bz2) = 2285379
diff --git a/x11-toolkits/py-gtk2/files/patch-configure b/x11-toolkits/py-gtk2/files/patch-configure
new file mode 100644
index 000000000000..1c766c127109
--- /dev/null
+++ b/x11-toolkits/py-gtk2/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig 2010-09-26 10:02:15.000000000 +0000
++++ configure 2010-09-26 10:02:33.000000000 +0000
+@@ -12288,7 +12288,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+
+- for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
++ for am_cv_pathless_PYTHON in python python2 python3 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ test "$am_cv_pathless_PYTHON" = none && break
+ prog="import sys
+ # split strings by '.' and convert to numeric. Append some zeros
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index c48a984657e7..e828ad1ec7f6 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -52,6 +52,9 @@ lib/pygtk/2.0/demos/images/gnome-gmush.png
lib/pygtk/2.0/demos/images/gnome-gsame.png
lib/pygtk/2.0/demos/images/gnu-keys.png
lib/pygtk/2.0/demos/images/gtk-logo-rgb.gif
+lib/pygtk/2.0/demos/infobar.py
+lib/pygtk/2.0/demos/infobar.pyc
+lib/pygtk/2.0/demos/infobar.pyo
lib/pygtk/2.0/demos/list_store.py
lib/pygtk/2.0/demos/list_store.pyc
lib/pygtk/2.0/demos/list_store.pyo
@@ -672,6 +675,7 @@ libdata/pkgconfig/pygtk-2.0.pc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/demos/images/gnome-gsame.png
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/demos/images/gnu-keys.png
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/demos/images/gtk-logo-rgb.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/demos/infobar.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/demos/list_store.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/demos/menu.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygtk-demo/demos/panes.py
@@ -703,6 +707,8 @@ 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-2.18.defs
+share/pygtk/2.0/defs/gdk-2.20.defs
+share/pygtk/2.0/defs/gdk-2.22.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
@@ -717,6 +723,10 @@ 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-2.18-types.defs
share/pygtk/2.0/defs/gtk-2.18.defs
+share/pygtk/2.0/defs/gtk-2.20-types.defs
+share/pygtk/2.0/defs/gtk-2.20.defs
+share/pygtk/2.0/defs/gtk-2.22-types.defs
+share/pygtk/2.0/defs/gtk-2.22.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
diff --git a/x11-toolkits/py-vte/Makefile b/x11-toolkits/py-vte/Makefile
index 73993810c4bb..9d658bfff731 100644
--- a/x11-toolkits/py-vte/Makefile
+++ b/x11-toolkits/py-vte/Makefile
@@ -3,7 +3,7 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-vte/Makefile,v 1.3 2009/02/24 19:42:18 kwm Exp $
+# $MCom: ports/x11-toolkits/py-vte/Makefile,v 1.5 2010/09/30 09:15:43 kwm Exp $
#
PORTREVISION= 0
@@ -22,6 +22,7 @@ PLIST= ${.CURDIR}/pkg-plist
USE_GNOME= gnomehack gnometarget vte pygtk2
USE_PYTHON= yes
CONFIGURE_ARGS= --enable-python \
+ --disable-Bsymbolic \
--disable-freetypetest
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/unique/Makefile b/x11-toolkits/unique/Makefile
index d34bc9ac7ddb..29ebe9d3ec63 100644
--- a/x11-toolkits/unique/Makefile
+++ b/x11-toolkits/unique/Makefile
@@ -3,12 +3,12 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/unique/Makefile,v 1.7 2010/01/09 18:22:39 marcus Exp $
+# $MCom: ports/x11-toolkits/unique/Makefile,v 1.9 2010/06/29 21:14:06 kwm Exp $
#
PORTNAME= unique
PORTVERSION= 1.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME/sources/lib${PORTNAME}/${PORTVERSION:R}/
DISTNAME= lib${PORTNAME}-${PORTVERSION}
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index ca0e890497e6..2554756698ad 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-toolkits/vte/Makefile,v 1.14 2010/07/15 20:43:21 kwm Exp $
+# $MCom: ports/x11-toolkits/vte/Makefile,v 1.117 2010/11/13 13:16:58 kwm Exp $
#
PORTNAME= vte
-PORTVERSION= 0.24.3
+PORTVERSION= 0.26.2
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
@@ -30,6 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
# BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS?=--disable-python \
+ --disable-Bsymbolic \
--disable-freetypetest
.if !defined(MASTERDIR)
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index 0faf82c3821a..8eb9d3e3ed5a 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/vte-0.24.3.tar.bz2) = 3eba555eab7ccbbe5ca056bb203a14ab
-SHA256 (gnome2/vte-0.24.3.tar.bz2) = fe7d01178976b17ca809e41d0e6dbbcb28e2af5e2f5aa857f9df65affac17d01
-SIZE (gnome2/vte-0.24.3.tar.bz2) = 1287755
+SHA256 (gnome2/vte-0.26.2.tar.bz2) = f02c350340266c9515a98b8f69c72b4bdc53b352cd053624a63a7cb97ddec9bd
+SIZE (gnome2/vte-0.26.2.tar.bz2) = 1310863
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index cd7b59f00ac3..52983e8f0d1a 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -1,114 +1,118 @@
bin/vte
-include/vte/pty.h
-include/vte/reaper.h
-include/vte/vte.h
-include/vte/vteaccess.h
-include/vte/vtetypebuiltins.h
-include/vte/vteversion.h
+include/vte-0.0/vte/pty.h
+include/vte-0.0/vte/reaper.h
+include/vte-0.0/vte/vte.h
+include/vte-0.0/vte/vteaccess.h
+include/vte-0.0/vte/vtedeprecated.h
+include/vte-0.0/vte/vtepty.h
+include/vte-0.0/vte/vtetypebuiltins.h
+include/vte-0.0/vte/vteversion.h
lib/libvte.a
lib/libvte.la
lib/libvte.so
lib/libvte.so.9
-lib/vte/decset
-lib/vte/interpret
-lib/vte/osc
-lib/vte/slowcat
-lib/vte/window
+lib/vte-0.0/decset
+lib/vte-0.0/interpret
+lib/vte-0.0/osc
+lib/vte-0.0/slowcat
+lib/vte-0.0/window
libdata/pkgconfig/vte.pc
libexec/gnome-pty-helper
-share/locale/am/LC_MESSAGES/vte.mo
-share/locale/ang/LC_MESSAGES/vte.mo
-share/locale/ar/LC_MESSAGES/vte.mo
-share/locale/as/LC_MESSAGES/vte.mo
-share/locale/ast/LC_MESSAGES/vte.mo
-share/locale/az/LC_MESSAGES/vte.mo
-share/locale/be/LC_MESSAGES/vte.mo
-share/locale/be@latin/LC_MESSAGES/vte.mo
-share/locale/bg/LC_MESSAGES/vte.mo
-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
-share/locale/et/LC_MESSAGES/vte.mo
-share/locale/eu/LC_MESSAGES/vte.mo
-share/locale/fa/LC_MESSAGES/vte.mo
-share/locale/fi/LC_MESSAGES/vte.mo
-share/locale/fr/LC_MESSAGES/vte.mo
-share/locale/ga/LC_MESSAGES/vte.mo
-share/locale/gl/LC_MESSAGES/vte.mo
-share/locale/gu/LC_MESSAGES/vte.mo
-share/locale/he/LC_MESSAGES/vte.mo
-share/locale/hi/LC_MESSAGES/vte.mo
-share/locale/hr/LC_MESSAGES/vte.mo
-share/locale/hu/LC_MESSAGES/vte.mo
-share/locale/id/LC_MESSAGES/vte.mo
-share/locale/is/LC_MESSAGES/vte.mo
-share/locale/it/LC_MESSAGES/vte.mo
-share/locale/ja/LC_MESSAGES/vte.mo
-share/locale/ka/LC_MESSAGES/vte.mo
-share/locale/kn/LC_MESSAGES/vte.mo
-share/locale/ko/LC_MESSAGES/vte.mo
-share/locale/ku/LC_MESSAGES/vte.mo
-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
-share/locale/mn/LC_MESSAGES/vte.mo
-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
-share/locale/or/LC_MESSAGES/vte.mo
-share/locale/pa/LC_MESSAGES/vte.mo
-share/locale/pl/LC_MESSAGES/vte.mo
-share/locale/pt/LC_MESSAGES/vte.mo
-share/locale/pt_BR/LC_MESSAGES/vte.mo
-share/locale/ro/LC_MESSAGES/vte.mo
-share/locale/ru/LC_MESSAGES/vte.mo
-share/locale/rw/LC_MESSAGES/vte.mo
-share/locale/si/LC_MESSAGES/vte.mo
-share/locale/sk/LC_MESSAGES/vte.mo
-share/locale/sl/LC_MESSAGES/vte.mo
-share/locale/sq/LC_MESSAGES/vte.mo
-share/locale/sr/LC_MESSAGES/vte.mo
-share/locale/sr@latin/LC_MESSAGES/vte.mo
-share/locale/sv/LC_MESSAGES/vte.mo
-share/locale/ta/LC_MESSAGES/vte.mo
-share/locale/te/LC_MESSAGES/vte.mo
-share/locale/th/LC_MESSAGES/vte.mo
-share/locale/tr/LC_MESSAGES/vte.mo
-share/locale/ug/LC_MESSAGES/vte.mo
-share/locale/uk/LC_MESSAGES/vte.mo
-share/locale/vi/LC_MESSAGES/vte.mo
-share/locale/wa/LC_MESSAGES/vte.mo
-share/locale/xh/LC_MESSAGES/vte.mo
-share/locale/zh_CN/LC_MESSAGES/vte.mo
-share/locale/zh_HK/LC_MESSAGES/vte.mo
-share/locale/zh_TW/LC_MESSAGES/vte.mo
+share/locale/am/LC_MESSAGES/vte-0.0.mo
+share/locale/ang/LC_MESSAGES/vte-0.0.mo
+share/locale/ar/LC_MESSAGES/vte-0.0.mo
+share/locale/as/LC_MESSAGES/vte-0.0.mo
+share/locale/ast/LC_MESSAGES/vte-0.0.mo
+share/locale/az/LC_MESSAGES/vte-0.0.mo
+share/locale/be/LC_MESSAGES/vte-0.0.mo
+share/locale/be@latin/LC_MESSAGES/vte-0.0.mo
+share/locale/bg/LC_MESSAGES/vte-0.0.mo
+share/locale/bn/LC_MESSAGES/vte-0.0.mo
+share/locale/bn_IN/LC_MESSAGES/vte-0.0.mo
+share/locale/bs/LC_MESSAGES/vte-0.0.mo
+share/locale/ca/LC_MESSAGES/vte-0.0.mo
+share/locale/ca@valencia/LC_MESSAGES/vte-0.0.mo
+share/locale/cs/LC_MESSAGES/vte-0.0.mo
+share/locale/cy/LC_MESSAGES/vte-0.0.mo
+share/locale/da/LC_MESSAGES/vte-0.0.mo
+share/locale/de/LC_MESSAGES/vte-0.0.mo
+share/locale/dz/LC_MESSAGES/vte-0.0.mo
+share/locale/el/LC_MESSAGES/vte-0.0.mo
+share/locale/en@shaw/LC_MESSAGES/vte-0.0.mo
+share/locale/en_CA/LC_MESSAGES/vte-0.0.mo
+share/locale/en_GB/LC_MESSAGES/vte-0.0.mo
+share/locale/eo/LC_MESSAGES/vte-0.0.mo
+share/locale/es/LC_MESSAGES/vte-0.0.mo
+share/locale/et/LC_MESSAGES/vte-0.0.mo
+share/locale/eu/LC_MESSAGES/vte-0.0.mo
+share/locale/fa/LC_MESSAGES/vte-0.0.mo
+share/locale/fi/LC_MESSAGES/vte-0.0.mo
+share/locale/fr/LC_MESSAGES/vte-0.0.mo
+share/locale/ga/LC_MESSAGES/vte-0.0.mo
+share/locale/gl/LC_MESSAGES/vte-0.0.mo
+share/locale/gu/LC_MESSAGES/vte-0.0.mo
+share/locale/he/LC_MESSAGES/vte-0.0.mo
+share/locale/hi/LC_MESSAGES/vte-0.0.mo
+share/locale/hr/LC_MESSAGES/vte-0.0.mo
+share/locale/hu/LC_MESSAGES/vte-0.0.mo
+share/locale/id/LC_MESSAGES/vte-0.0.mo
+share/locale/is/LC_MESSAGES/vte-0.0.mo
+share/locale/it/LC_MESSAGES/vte-0.0.mo
+share/locale/ja/LC_MESSAGES/vte-0.0.mo
+share/locale/ka/LC_MESSAGES/vte-0.0.mo
+share/locale/kn/LC_MESSAGES/vte-0.0.mo
+share/locale/ko/LC_MESSAGES/vte-0.0.mo
+share/locale/ku/LC_MESSAGES/vte-0.0.mo
+share/locale/ky/LC_MESSAGES/vte-0.0.mo
+share/locale/li/LC_MESSAGES/vte-0.0.mo
+share/locale/lt/LC_MESSAGES/vte-0.0.mo
+share/locale/lv/LC_MESSAGES/vte-0.0.mo
+share/locale/mai/LC_MESSAGES/vte-0.0.mo
+share/locale/mi/LC_MESSAGES/vte-0.0.mo
+share/locale/mk/LC_MESSAGES/vte-0.0.mo
+share/locale/ml/LC_MESSAGES/vte-0.0.mo
+share/locale/mn/LC_MESSAGES/vte-0.0.mo
+share/locale/mr/LC_MESSAGES/vte-0.0.mo
+share/locale/ms/LC_MESSAGES/vte-0.0.mo
+share/locale/nb/LC_MESSAGES/vte-0.0.mo
+share/locale/ne/LC_MESSAGES/vte-0.0.mo
+share/locale/nds/LC_MESSAGES/vte-0.0.mo
+share/locale/nl/LC_MESSAGES/vte-0.0.mo
+share/locale/nn/LC_MESSAGES/vte-0.0.mo
+share/locale/oc/LC_MESSAGES/vte-0.0.mo
+share/locale/or/LC_MESSAGES/vte-0.0.mo
+share/locale/pa/LC_MESSAGES/vte-0.0.mo
+share/locale/pl/LC_MESSAGES/vte-0.0.mo
+share/locale/pt/LC_MESSAGES/vte-0.0.mo
+share/locale/pt_BR/LC_MESSAGES/vte-0.0.mo
+share/locale/ro/LC_MESSAGES/vte-0.0.mo
+share/locale/ru/LC_MESSAGES/vte-0.0.mo
+share/locale/rw/LC_MESSAGES/vte-0.0.mo
+share/locale/si/LC_MESSAGES/vte-0.0.mo
+share/locale/sk/LC_MESSAGES/vte-0.0.mo
+share/locale/sl/LC_MESSAGES/vte-0.0.mo
+share/locale/sq/LC_MESSAGES/vte-0.0.mo
+share/locale/sr/LC_MESSAGES/vte-0.0.mo
+share/locale/sr@latin/LC_MESSAGES/vte-0.0.mo
+share/locale/sv/LC_MESSAGES/vte-0.0.mo
+share/locale/ta/LC_MESSAGES/vte-0.0.mo
+share/locale/te/LC_MESSAGES/vte-0.0.mo
+share/locale/th/LC_MESSAGES/vte-0.0.mo
+share/locale/tr/LC_MESSAGES/vte-0.0.mo
+share/locale/ug/LC_MESSAGES/vte-0.0.mo
+share/locale/uk/LC_MESSAGES/vte-0.0.mo
+share/locale/vi/LC_MESSAGES/vte-0.0.mo
+share/locale/wa/LC_MESSAGES/vte-0.0.mo
+share/locale/xh/LC_MESSAGES/vte-0.0.mo
+share/locale/zh_CN/LC_MESSAGES/vte-0.0.mo
+share/locale/zh_HK/LC_MESSAGES/vte-0.0.mo
+share/locale/zh_TW/LC_MESSAGES/vte-0.0.mo
%%DATADIR%%/termcap/xterm
@dirrm %%DATADIR%%/termcap
@dirrm %%DATADIR%%
-@dirrm lib/vte
-@dirrm include/vte
+@dirrm lib/vte-0.0
+@dirrm include/vte-0.0/vte
+@dirrm include/vte-0.0
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index fe81043df637..3bca40e76b7f 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -7,7 +7,7 @@
PORTNAME= compiz
PORTVERSION= 0.8.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
diff --git a/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c b/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c
index 53b82dae3979..1c853c4e2d99 100644
--- a/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c
+++ b/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c
@@ -1,5 +1,14 @@
---- gtk/window-decorator/gtk-window-decorator.c.orig 2010-04-06 18:29:25.000000000 +0200
-+++ gtk/window-decorator/gtk-window-decorator.c 2010-04-06 18:40:04.000000000 +0200
+--- gtk/window-decorator/gtk-window-decorator.c.orig 2009-08-15 09:24:40.000000000 +0200
++++ gtk/window-decorator/gtk-window-decorator.c 2010-10-29 12:56:37.000000000 +0200
+@@ -2671,7 +2671,7 @@ get_window_prop (Window xwindow,
+ gdk_error_trap_push ();
+
+ type = None;
+- result = XGetWindowProperty (gdk_display,
++ result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+ xwindow,
+ atom,
+ 0, G_MAXLONG,
@@ -4233,7 +4233,7 @@ show_tooltip (const char *text)
static void
hide_tooltip (void)
@@ -9,3 +18,44 @@
g_get_current_time (&tooltip_last_popdown);
gtk_widget_hide (tip_window);
+@@ -4966,7 +4966,7 @@ force_quit_dialog_realize (GtkWidget *di
+ WnckWindow *win = data;
+
+ gdk_error_trap_push ();
+- XSetTransientForHint (gdk_display,
++ XSetTransientForHint (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+ GDK_WINDOW_XID (dialog->window),
+ wnck_window_get_xid (win));
+ gdk_display_sync (gdk_display_get_default ());
+@@ -4982,11 +4982,11 @@ get_client_machine (Window xwindow)
+ int format, result;
+ char *retval;
+
+- atom = XInternAtom (gdk_display, "WM_CLIENT_MACHINE", FALSE);
++ atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE);
+
+ gdk_error_trap_push ();
+
+- result = XGetWindowProperty (gdk_display,
++ result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+ xwindow, atom,
+ 0, G_MAXLONG,
+ FALSE, XA_STRING, &type, &format, &nitems,
+@@ -5038,7 +5038,7 @@ kill_window (WnckWindow *win)
+ }
+
+ gdk_error_trap_push ();
+- XKillClient (gdk_display, wnck_window_get_xid (win));
++ XKillClient (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid (win));
+ gdk_display_sync (gdk_display_get_default ());
+ gdk_error_trap_pop ();
+ }
+@@ -5623,7 +5623,7 @@ static int
+ update_shadow (void)
+ {
+ decor_shadow_options_t opt;
+- Display *xdisplay = gdk_display;
++ Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+ GdkDisplay *display = gdk_display_get_default ();
+ GdkScreen *screen = gdk_display_get_default_screen (display);
+
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index 99462ae264e4..d2a3a35156c2 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emerald
PORTVERSION= 0.8.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
diff --git a/x11-wm/emerald/files/patch-src_main.c b/x11-wm/emerald/files/patch-src_main.c
new file mode 100644
index 000000000000..adff2eccea31
--- /dev/null
+++ b/x11-wm/emerald/files/patch-src_main.c
@@ -0,0 +1,58 @@
+--- src/main.c.orig 2010-11-02 16:54:19.000000000 +0100
++++ src/main.c 2010-11-02 16:56:04.000000000 +0100
+@@ -2457,7 +2457,7 @@
+ gdk_error_trap_push();
+
+ type = None;
+- result = XGetWindowProperty(gdk_display,
++ result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+ xwindow,
+ atom,
+ 0, G_MAXLONG,
+@@ -4246,10 +4246,10 @@
+ WnckWindow *win = data;
+
+ gdk_error_trap_push();
+- XSetTransientForHint(gdk_display,
++ XSetTransientForHint(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+ GDK_WINDOW_XID(dialog->window),
+ wnck_window_get_xid(win));
+- XSync(gdk_display, FALSE);
++ XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
+ gdk_error_trap_pop();
+ }
+
+@@ -4262,11 +4262,11 @@
+ int format, result;
+ char *retval;
+
+- atom = XInternAtom(gdk_display, "WM_CLIENT_MACHINE", FALSE);
++ atom = XInternAtom(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE);
+
+ gdk_error_trap_push();
+
+- result = XGetWindowProperty(gdk_display,
++ result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+ xwindow, atom,
+ 0, G_MAXLONG,
+ FALSE, XA_STRING, &type, &format, &nitems,
+@@ -4318,8 +4318,8 @@
+ }
+
+ gdk_error_trap_push();
+- XKillClient(gdk_display, wnck_window_get_xid(win));
+- XSync(gdk_display, FALSE);
++ XKillClient(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid(win));
++ XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
+ gdk_error_trap_pop();
+ }
+
+@@ -4739,7 +4739,7 @@
+
+ static int update_shadow(frame_settings * fs)
+ {
+- Display *xdisplay = gdk_display;
++ Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+ XRenderPictFormat *format;
+ GdkPixmap *pixmap;
+ Picture src, dst, tmp;
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 4b3f3883ecda..4af139d5d19e 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.155 2010/04/06 22:47:54 marcus Exp $
+# $MCom: ports/x11-wm/metacity/Makefile,v 1.158 2010/09/30 07:04:02 kwm Exp $
#
PORTNAME= metacity
-PORTVERSION= 2.30.1
-PORTREVISION= 3
+PORTVERSION= 2.30.3
CATEGORIES= x11-wm
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index 1883d005560e..849e225ec1dc 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/metacity-2.30.1.tar.bz2) = 3d3c05c60b70b9d06b30872e756c31ba
-SHA256 (gnome2/metacity-2.30.1.tar.bz2) = 0057b6e0562cf51b648a2d7b3729def8365ccefd12a9b1373f93312da1ebe5d8
-SIZE (gnome2/metacity-2.30.1.tar.bz2) = 2314657
+MD5 (gnome2/metacity-2.30.3.tar.bz2) = 553784f376d96b902e19ff437cd5b339
+SHA256 (gnome2/metacity-2.30.3.tar.bz2) = 08f887018fa5e447cf184d03bae3fe2c05fdb7583bed6768e3b4d66392fc18dd
+SIZE (gnome2/metacity-2.30.3.tar.bz2) = 2358537
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index cb1d97b3be3c..9c9b5015e075 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -43,6 +43,7 @@ share/locale/el/LC_MESSAGES/metacity.mo
share/locale/en@shaw/LC_MESSAGES/metacity.mo
share/locale/en_CA/LC_MESSAGES/metacity.mo
share/locale/en_GB/LC_MESSAGES/metacity.mo
+share/locale/eo/LC_MESSAGES/metacity.mo
share/locale/es/LC_MESSAGES/metacity.mo
share/locale/et/LC_MESSAGES/metacity.mo
share/locale/eu/LC_MESSAGES/metacity.mo
@@ -78,6 +79,7 @@ share/locale/mn/LC_MESSAGES/metacity.mo
share/locale/mr/LC_MESSAGES/metacity.mo
share/locale/ms/LC_MESSAGES/metacity.mo
share/locale/nb/LC_MESSAGES/metacity.mo
+share/locale/nds/LC_MESSAGES/metacity.mo
share/locale/ne/LC_MESSAGES/metacity.mo
share/locale/nl/LC_MESSAGES/metacity.mo
share/locale/nn/LC_MESSAGES/metacity.mo
@@ -250,6 +252,8 @@ share/themes/Simple/metacity-1/minimize.png
@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
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index 7e70ce4e9f50..13ba0648561e 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -3,11 +3,11 @@
# Whom: Pawel Worach <pawel.worach@gmail.com>
#
# $FreeBSD$
-# $MCom: ports/x11-wm/mutter/Makefile,v 1.11 2010/03/28 15:56:20 kwm Exp $
+# $MCom: ports/x11-wm/mutter/Makefile,v 1.14 2010/06/29 21:14:07 kwm Exp $
#
PORTNAME= mutter
-PORTVERSION= 2.29.1
+PORTVERSION= 2.31.2
PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= GNOME
diff --git a/x11-wm/mutter/distinfo b/x11-wm/mutter/distinfo
index 33ebc570861e..59abe4bfe438 100644
--- a/x11-wm/mutter/distinfo
+++ b/x11-wm/mutter/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/mutter-2.29.1.tar.bz2) = ebe3c04751741fb2a028a3c6c4f1c2d7
-SHA256 (gnome2/mutter-2.29.1.tar.bz2) = 175f3adcc5ad5c6f23772ca15c862f275fc3d9a9c3104e9146cf265847a4a10a
-SIZE (gnome2/mutter-2.29.1.tar.bz2) = 1981019
+MD5 (gnome2/mutter-2.31.2.tar.bz2) = c2ca30b2f5af0e53d512062ba081806c
+SHA256 (gnome2/mutter-2.31.2.tar.bz2) = 7267018c2eb28213748810de7e1ccf6d4f059e8ab593ec335234588d0037578c
+SIZE (gnome2/mutter-2.31.2.tar.bz2) = 1983139
diff --git a/x11-wm/mutter/pkg-plist b/x11-wm/mutter/pkg-plist
index a768bbbe3884..417dc282f335 100644
--- a/x11-wm/mutter/pkg-plist
+++ b/x11-wm/mutter/pkg-plist
@@ -28,8 +28,8 @@ lib/libmutter-private.a
lib/libmutter-private.la
lib/libmutter-private.so
lib/libmutter-private.so.0
-lib/mutter/Meta-2.29.gir
-lib/mutter/Meta-2.29.typelib
+lib/mutter/Meta-2.31.gir
+lib/mutter/Meta-2.31.typelib
lib/mutter/plugins/default.so
libdata/pkgconfig/libmutter-private.pc
libdata/pkgconfig/mutter-plugins.pc
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index dfadb4c668f0..69a41b9c4bcd 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gdm
PORTVERSION= 2.30.5
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -43,7 +44,8 @@ USE_GNOME= gnomehack intlhack gnomehier gconf2 librsvg2 \
gnomedocutils gnomeprefix gnomepanel
GCONF_SCHEMAS= gdm-simple-greeter.schemas
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home
+CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home \
+ --with-at-spi-registryd-directory=${LOCALBASE}/libexec
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAS_SA_LEN" \
LDFLAGS="-L${LOCALBASE}/lib" \
LIBS="-lm" \
@@ -64,7 +66,7 @@ OPTIONS= IPV6 "Enable IPv6 support" off \
.if defined(WITHOUT_KEYRING)
SUB_LIST+= PAM_KEYRING=\#
.else
-RUN_DEPENDS+= ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring
+LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
SUB_LIST+= PAM_KEYRING=
.endif
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 8e21730d9789..ed3915304eac 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-applets/Makefile,v 1.211 2010/03/28 17:55:31 marcus Exp $
+# $MCom: ports/x11/gnome-applets/Makefile,v 1.216 2010/09/27 10:14:28 kwm Exp $
#
PORTNAME= gnome-applets
-PORTVERSION= 2.30.0
-PORTREVISION= 3
+PORTVERSION= 2.32.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -80,9 +79,9 @@ GCONF_SCHEMAS+= cpufreq-applet.schemas
.if defined(WITH_MINI_COMMANDER)
CONFIGURE_ARGS+= --enable-mini-commander
GCONF_SCHEMAS+= mini-commander-global.schemas mini-commander.schemas
-PLIST_SUB+= COMMANDER=""
+PLIST_SUB+= COMMANDER="" OLDCOMMANDER="@comment "
.else
-PLIST_SUB+= COMMANDER="@comment "
+PLIST_SUB+= COMMANDER="@comment " OLDCOMMANDER=""
.endif
.if ( exists(${pygnomedesktop_DETECT}) ) || \
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 01f4c787073b..539d23dcd8b0 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.30.0.tar.bz2) = 2afcbedc10b1a0e8072ac4eefdc8d770
-SHA256 (gnome2/gnome-applets-2.30.0.tar.bz2) = 41489fbb1f8352a306cde6676dfaf1e497bfbca960454f7251c4fd92920bba5d
-SIZE (gnome2/gnome-applets-2.30.0.tar.bz2) = 9919459
+MD5 (gnome2/gnome-applets-2.32.0.tar.bz2) = d2fb61c5cfdba1f87302d972bc62dd81
+SHA256 (gnome2/gnome-applets-2.32.0.tar.bz2) = 3b2611b3253ed5418f37c83d710918e93476a783637ddb4ef7e5eab7a83a4c1b
+SIZE (gnome2/gnome-applets-2.32.0.tar.bz2) = 10065202
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index c5a575959073..0602ba569b99 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -14,9 +14,15 @@
%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/chart.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/chart.pyc
%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/chart.pyo
+lib/python2.6/site-packages/invest/currencies.py
+lib/python2.6/site-packages/invest/currencies.pyc
+lib/python2.6/site-packages/invest/currencies.pyo
%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.pyc
%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.pyo
+lib/python2.6/site-packages/invest/help.py
+lib/python2.6/site-packages/invest/help.pyc
+lib/python2.6/site-packages/invest/help.pyo
%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/networkmanager.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/networkmanager.pyc
%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/networkmanager.pyo
@@ -29,24 +35,13 @@
%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/widgets.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/widgets.pyc
%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/widgets.pyo
-libdata/bonobo/servers/GNOME_AccessxStatusApplet.server
-%%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server
libdata/bonobo/servers/GNOME_CDPlayerApplet.server
-%%CPUFREQ%%libdata/bonobo/servers/GNOME_CPUFreqApplet.server
-libdata/bonobo/servers/GNOME_CharpickerApplet.server
-libdata/bonobo/servers/GNOME_DriveMountApplet.server
-libdata/bonobo/servers/GNOME_GWeatherApplet_Factory.server
-libdata/bonobo/servers/GNOME_GeyesApplet.server
%%PYTHON%%libdata/bonobo/servers/GNOME_GtikApplet.server
libdata/bonobo/servers/GNOME_KeyboardApplet.server
libdata/bonobo/servers/GNOME_MailcheckApplet_Factory.server
-libdata/bonobo/servers/GNOME_MiniCommanderApplet.server
-libdata/bonobo/servers/GNOME_MixerApplet.server
-libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
+%%OLDCOMMANDER%%libdata/bonobo/servers/GNOME_MiniCommanderApplet.server
libdata/bonobo/servers/GNOME_NullApplet_Factory.server
-libdata/bonobo/servers/GNOME_Panel_TrashApplet.server
libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server
-libdata/bonobo/servers/GNOME_StickyNotesApplet.server
%%PYTHON%%libdata/bonobo/servers/Invest_Applet.server
libexec/accessx-status-applet
%%BATTERY%%libexec/battstat-applet-2
@@ -63,20 +58,44 @@ libexec/multiload-applet-2
libexec/null_applet
libexec/stickynotes_applet
libexec/trashapplet
+share/dbus-1/services/org.gnome.panel.applet.AccessxStatusAppletFactory.service
+%%BATTERY%%share/dbus-1/services/org.gnome.panel.applet.BattstatAppletFactory.service
+%%CPUFREQ%%share/dbus-1/services/org.gnome.panel.applet.CPUFreqAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.CharpickerAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.DriveMountAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.GWeatherAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.GeyesAppletFactory.service
+%%COMMANDER%%share/dbus-1/services/org.gnome.panel.applet.MiniCommanderAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.MixerAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.MultiLoadAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.StickyNotesAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.TrashAppletFactory.service
%%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
-%%CPUFREQ%%share/gnome-2.0/ui/GNOME_CPUFreqApplet.xml
-share/gnome-2.0/ui/GNOME_CharpickerApplet.xml
-share/gnome-2.0/ui/GNOME_DriveMountApplet.xml
-share/gnome-2.0/ui/GNOME_GWeatherApplet.xml
-share/gnome-2.0/ui/GNOME_GeyesApplet.xml
-%%COMMANDER%%share/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
-share/gnome-2.0/ui/GNOME_MixerApplet.xml
-share/gnome-2.0/ui/GNOME_MultiloadApplet.xml
-share/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml
-share/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
+share/gnome-2.0/ui/accessx-status-applet-menu.xml
+%%BATTERY%%share/gnome-2.0/ui/battstat-applet-menu.xml
+share/gnome-2.0/ui/charpick-applet-menu.xml
+%%CPUFREQ%%share/gnome-2.0/ui/cpufreq-applet-menu.xml
+share/gnome-2.0/ui/drivemount-applet-menu.xml
+share/gnome-2.0/ui/geyes-applet-menu.xml
+share/gnome-2.0/ui/gweather-applet-menu.xml
+%%COMMANDER%%share/gnome-2.0/ui/mini-commander-applet-menu.xml
+share/gnome-2.0/ui/mixer-applet-menu.xml
+share/gnome-2.0/ui/multiload-applet-menu.xml
+share/gnome-2.0/ui/stickynotes-applet-menu.xml
+share/gnome-2.0/ui/trashapplet-menu.xml
%%PYTHON%%share/gnome-2.0/ui/Invest_Applet.xml
+share/gnome-panel/applets/org.gnome.applets.AccessxStatusApplet.panel-applet
+%%BATTERY%%share/gnome-panel/applets/org.gnome.applets.BattstatApplet.panel-applet
+%%CPUFREQ%%share/gnome-panel/applets/org.gnome.applets.CPUFreqApplet.panel-applet
+share/gnome-panel/applets/org.gnome.applets.CharpickerApplet.panel-applet
+share/gnome-panel/applets/org.gnome.applets.DriveMountApplet.panel-applet
+share/gnome-panel/applets/org.gnome.applets.GWeatherApplet.panel-applet
+share/gnome-panel/applets/org.gnome.applets.GeyesApplet.panel-applet
+%%COMMANDER%%share/gnome-panel/applets/org.gnome.applets.MiniCommanderApplet.panel-applet
+share/gnome-panel/applets/org.gnome.applets.MixerApplet.panel-applet
+share/gnome-panel/applets/org.gnome.applets.MultiLoadApplet.panel-applet
+share/gnome-panel/applets/org.gnome.applets.StickyNotesApplet.panel-applet
+share/gnome-panel/applets/org.gnome.applets.TrashApplet.panel-applet
%%BATTERY%%%%DATADIR%%/builder/battstat_applet.ui
%%CPUFREQ%%%%DATADIR%%/builder/cpufreq-preferences.ui
%%PYTHON%%%%DATADIR%%/builder/financialchart.ui
@@ -242,6 +261,18 @@ share/gnome/help/accessx-status/fr/figures/accessx_sticky-keys.png
share/gnome/help/accessx-status/fr/figures/accessx_sticky-meta-key.png
share/gnome/help/accessx-status/fr/figures/accessx_sticky-shift-key.png
share/gnome/help/accessx-status/fr/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/gl/accessx-status.xml
+share/gnome/help/accessx-status/gl/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/gl/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/gl/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/gl/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/gl/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/gl/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/gl/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/gl/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/gl/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/gl/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/gl/figures/accessx_sticky-windows-key.png
share/gnome/help/accessx-status/it/accessx-status.xml
share/gnome/help/accessx-status/it/figures/accessx-status-applet.png
share/gnome/help/accessx-status/it/figures/accessx-status-disabled.png
@@ -819,6 +850,12 @@ share/gnome/help/drivemount/cs/figures/drivemount-applet_example.png
share/gnome/help/drivemount/cs/figures/drivemount-applet_mount.png
share/gnome/help/drivemount/cs/figures/drivemount-applet_open.png
share/gnome/help/drivemount/cs/figures/drivemount-applet_status.png
+share/gnome/help/drivemount/da/drivemount.xml
+share/gnome/help/drivemount/da/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/da/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/da/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/da/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/da/figures/drivemount-applet_status.png
share/gnome/help/drivemount/de/drivemount.xml
share/gnome/help/drivemount/de/figures/drivemount-applet_eject.png
share/gnome/help/drivemount/de/figures/drivemount-applet_example.png
@@ -1255,16 +1292,26 @@ share/gnome/help/gweather/zh_CN/figures/stock_weather-snow.png
share/gnome/help/gweather/zh_CN/figures/stock_weather-storm.png
share/gnome/help/gweather/zh_CN/figures/stock_weather-sunny.png
share/gnome/help/gweather/zh_CN/gweather.xml
+%%PYTHON%%share/gnome/help/invest-applet/C/figures/symbol-search.png
%%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/figures/symbol-search.png
%%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/figures/symbol-search.png
%%PYTHON%%share/gnome/help/invest-applet/de/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/el/figures/symbol-search.png
%%PYTHON%%share/gnome/help/invest-applet/el/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/en_GB/figures/symbol-search.png
+%%PYTHON%%share/gnome/help/invest-applet/en_GB/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/es/figures/symbol-search.png
%%PYTHON%%share/gnome/help/invest-applet/es/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/fi/figures/symbol-search.png
%%PYTHON%%share/gnome/help/invest-applet/fi/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/ru/figures/symbol-search.png
%%PYTHON%%share/gnome/help/invest-applet/ru/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/sv/figures/symbol-search.png
%%PYTHON%%share/gnome/help/invest-applet/sv/invest-applet.xml
+%%PYTHON%%share/gnome/help/invest-applet/zh_CN/figures/symbol-search.png
%%PYTHON%%share/gnome/help/invest-applet/zh_CN/invest-applet.xml
share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/C/legal.xml
@@ -1596,6 +1643,7 @@ share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/en_CA/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/en@shaw/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/eo/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/es/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/es_AR/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/es_CL/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1632,6 +1680,7 @@ share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ka/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/kk/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/kn/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1670,6 +1719,7 @@ share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/te/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/th/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/ug/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1688,6 +1738,7 @@ share/omf/accessx-status/accessx-status-es.omf
share/omf/accessx-status/accessx-status-eu.omf
share/omf/accessx-status/accessx-status-fi.omf
share/omf/accessx-status/accessx-status-fr.omf
+share/omf/accessx-status/accessx-status-gl.omf
share/omf/accessx-status/accessx-status-it.omf
share/omf/accessx-status/accessx-status-ko.omf
share/omf/accessx-status/accessx-status-nl.omf
@@ -1771,6 +1822,7 @@ share/omf/char-palette/char-palette-zh_CN.omf
share/omf/drivemount/drivemount-C.omf
share/omf/drivemount/drivemount-ca.omf
share/omf/drivemount/drivemount-cs.omf
+share/omf/drivemount/drivemount-da.omf
share/omf/drivemount/drivemount-de.omf
share/omf/drivemount/drivemount-el.omf
share/omf/drivemount/drivemount-en_GB.omf
@@ -2237,15 +2289,25 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/mixer_applet2/C/figures
@dirrm share/gnome/help/mixer_applet2/C
@dirrm share/gnome/help/mixer_applet2
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/zh_CN/figures
%%PYTHON%%@dirrm share/gnome/help/invest-applet/zh_CN
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/sv/figures
%%PYTHON%%@dirrm share/gnome/help/invest-applet/sv
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/ru/figures
%%PYTHON%%@dirrm share/gnome/help/invest-applet/ru
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/fi/figures
%%PYTHON%%@dirrm share/gnome/help/invest-applet/fi
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/es/figures
%%PYTHON%%@dirrm share/gnome/help/invest-applet/es
-%%PYTHON%%@dirrm share/gnome/help/invest-applet/el
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/en_GB/figures
%%PYTHON%%@dirrm share/gnome/help/invest-applet/en_GB
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/el/figures
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/el
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/de/figures
%%PYTHON%%@dirrm share/gnome/help/invest-applet/de
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/ca/figures
%%PYTHON%%@dirrm share/gnome/help/invest-applet/ca
+%%PYTHON%%@dirrm share/gnome/help/invest-applet/C/figures
%%PYTHON%%@dirrm share/gnome/help/invest-applet/C
%%PYTHON%%@dirrm share/gnome/help/invest-applet
@dirrm share/gnome/help/gweather/zh_CN/figures
@@ -2364,6 +2426,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/drivemount/el
@dirrm share/gnome/help/drivemount/de/figures
@dirrm share/gnome/help/drivemount/de
+@dirrm share/gnome/help/drivemount/da/figures
+@dirrm share/gnome/help/drivemount/da
@dirrm share/gnome/help/drivemount/cs/figures
@dirrm share/gnome/help/drivemount/cs
@dirrm share/gnome/help/drivemount/ca/figures
@@ -2535,6 +2599,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/accessx-status/ko
@dirrm share/gnome/help/accessx-status/it/figures
@dirrm share/gnome/help/accessx-status/it
+@dirrm share/gnome/help/accessx-status/gl/figures
+@dirrm share/gnome/help/accessx-status/gl
@dirrm share/gnome/help/accessx-status/fr/figures
@dirrm share/gnome/help/accessx-status/fr
@dirrm share/gnome/help/accessx-status/fi/figures
@@ -2559,6 +2625,8 @@ share/xmodmap/xmodmap.yu
@dirrm share/gnome/help/accessx-status/C
@dirrm share/gnome/help/accessx-status
%%PYTHON%%@dirrm %%DATADIR%%/invest-applet
+@dirrmtry share/gnome-panel/applets
+@dirrmtry share/gnome-panel
@dirrm %%DATADIR%%/geyes/Tango
@dirrm %%DATADIR%%/geyes/Horrid
@dirrm %%DATADIR%%/geyes/Default-tiny
@@ -2574,6 +2642,8 @@ share/xmodmap/xmodmap.yu
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -2596,6 +2666,8 @@ share/xmodmap/xmodmap.yu
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
@dirrmtry share/locale/es_VE/LC_MESSAGES
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index cd1be1754099..8b4f2d832897 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11/gnome-desktop/Makefile,v 1.5 2010/06/23 19:15:14 kwm Exp $
+# $MCom: ports/x11/gnome-desktop/Makefile,v 1.190 2010/11/17 12:03:52 kwm Exp $
#
PORTNAME= gnome-desktop
-PORTVERSION= 2.30.2
+PORTVERSION= 2.32.1
PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 71da28feed6c..2f432d4f6689 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gnome-desktop-2.30.2.tar.bz2) = 49f06f91b0579c6e5a07ff8195945629
-SHA256 (gnome2/gnome-desktop-2.30.2.tar.bz2) = 089c672cd70617541a9e4a827467af43266357e0c3635fc875b86b9b902084d8
-SIZE (gnome2/gnome-desktop-2.30.2.tar.bz2) = 1665808
+SHA256 (gnome2/gnome-desktop-2.32.1.tar.bz2) = 55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d
+SIZE (gnome2/gnome-desktop-2.32.1.tar.bz2) = 1633847
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 75ca3939c16f..5e9dc85e77d5 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -79,6 +79,7 @@ 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/an/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/as/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ast/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -431,3 +432,5 @@ share/pixmaps/vnterm.xpm
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
diff --git a/x11/gnome-launch-box/Makefile b/x11/gnome-launch-box/Makefile
index 0c8644eb783a..d84568032537 100644
--- a/x11/gnome-launch-box/Makefile
+++ b/x11/gnome-launch-box/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-launch-box
PORTVERSION= 20060112
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jylefort
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index b944b214c44f..cdf43017c376 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11/gnome-menus/Makefile,v 1.9 2010/06/23 19:26:18 kwm Exp $
+# $MCom: ports/x11/gnome-menus/Makefile,v 1.110 2010/11/17 11:29:19 kwm Exp $
#
PORTNAME= gnome-menus
-PORTVERSION= 2.30.2
+PORTVERSION= 2.30.5
+PORTREVISION= 0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index eec8ec568c99..a11734649c75 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gnome-menus-2.30.2.tar.bz2) = 5ca9935f50c939881689c48f59348426
-SHA256 (gnome2/gnome-menus-2.30.2.tar.bz2) = 3cfb41586cda5892aea929ff9b327cbabc37a15971fdc6c6d4334d2488bb3233
-SIZE (gnome2/gnome-menus-2.30.2.tar.bz2) = 464086
+SHA256 (gnome2/gnome-menus-2.30.5.tar.bz2) = 6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa
+SIZE (gnome2/gnome-menus-2.30.5.tar.bz2) = 471327
diff --git a/x11/gnome-menus/files/patch-Makefile.in b/x11/gnome-menus/files/patch-Makefile.in
index 621e0233ce97..915e1b5a1f82 100644
--- a/x11/gnome-menus/files/patch-Makefile.in
+++ b/x11/gnome-menus/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig Mon Jul 24 15:57:52 2006
-+++ Makefile.in Mon Jul 24 15:58:05 2006
-@@ -244,7 +244,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- NULL =
--@HAVE_PYTHON_TRUE@PYTHON_SUBDIRS = python simple-editor
-+@HAVE_PYTHON_TRUE@PYTHON_SUBDIRS = python
- ALL_SUBDIRS = \
- po \
- libmenu \
+--- Makefile.in.orig 2010-09-27 14:11:42.000000000 +0000
++++ Makefile.in 2010-09-27 14:12:05.000000000 +0000
+@@ -33,7 +33,7 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-@HAVE_PYTHON_TRUE@am__append_1 = python simple-editor
++@HAVE_PYTHON_TRUE@am__append_1 = python
+ subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
diff --git a/x11/gnome-menus/files/patch-util_Makefile.in b/x11/gnome-menus/files/patch-util_Makefile.in
index fd9b0fcf098b..658861905565 100644
--- a/x11/gnome-menus/files/patch-util_Makefile.in
+++ b/x11/gnome-menus/files/patch-util_Makefile.in
@@ -1,10 +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 = \
+--- util/Makefile.in.orig 2010-09-27 14:12:22.000000000 +0000
++++ util/Makefile.in 2010-09-27 14:13:51.000000000 +0000
+@@ -298,6 +298,7 @@
+ test-menu-spec.c
gnome_menu_spec_test_LDADD = \
- ../libmenu/libgnome-menu.la \
-+ %%PTHREAD_LIBS%% \
++ %%PTHREAD_LIBS%% \
$(GLIB_LIBS) \
- $(NULL)
+ ../libmenu/libgnome-menu.la
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index ff466cc19618..f94508732644 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -65,10 +65,12 @@ share/locale/fa/LC_MESSAGES/gnome-menus.mo
share/locale/fi/LC_MESSAGES/gnome-menus.mo
share/locale/fr/LC_MESSAGES/gnome-menus.mo
share/locale/fur/LC_MESSAGES/gnome-menus.mo
+share/locale/fy/LC_MESSAGES/gnome-menus.mo
share/locale/ga/LC_MESSAGES/gnome-menus.mo
share/locale/gl/LC_MESSAGES/gnome-menus.mo
share/locale/gn/LC_MESSAGES/gnome-menus.mo
share/locale/gu/LC_MESSAGES/gnome-menus.mo
+share/locale/gv/LC_MESSAGES/gnome-menus.mo
share/locale/ha/LC_MESSAGES/gnome-menus.mo
share/locale/he/LC_MESSAGES/gnome-menus.mo
share/locale/hi/LC_MESSAGES/gnome-menus.mo
@@ -82,6 +84,7 @@ share/locale/is/LC_MESSAGES/gnome-menus.mo
share/locale/it/LC_MESSAGES/gnome-menus.mo
share/locale/ja/LC_MESSAGES/gnome-menus.mo
share/locale/ka/LC_MESSAGES/gnome-menus.mo
+share/locale/kg/LC_MESSAGES/gnome-menus.mo
share/locale/kk/LC_MESSAGES/gnome-menus.mo
share/locale/kn/LC_MESSAGES/gnome-menus.mo
share/locale/ko/LC_MESSAGES/gnome-menus.mo
@@ -174,6 +177,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/ku
@dirrmtry share/locale/kk/LC_MESSAGES
@dirrmtry share/locale/kk
+@dirrmtry share/locale/kg/LC_MESSAGES
+@dirrmtry share/locale/kg
@dirrmtry share/locale/io/LC_MESSAGES
@dirrmtry share/locale/io
@dirrmtry share/locale/ig/LC_MESSAGES
@@ -182,8 +187,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/hy
@dirrmtry share/locale/ha/LC_MESSAGES
@dirrmtry share/locale/ha
+@dirrmtry share/locale/gv/LC_MESSAGES
+@dirrmtry share/locale/gv
@dirrmtry share/locale/gn/LC_MESSAGES
@dirrmtry share/locale/gn
+@dirrmtry share/locale/fy/LC_MESSAGES
+@dirrmtry share/locale/fy
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/en@shaw/LC_MESSAGES
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 9345359e5632..b23c8312eb8d 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11/gnome-panel/Makefile,v 1.5 2010/06/23 21:59:12 kwm Exp $
+# $MCom: ports/x11/gnome-panel/Makefile,v 1.230 2010/11/17 13:01:32 kwm Exp $
#
PORTNAME= gnome-panel
-PORTVERSION= 2.30.2
-PORTREVISION?= 1
+PORTVERSION= 2.32.1
+PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -21,16 +21,16 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
LIB_DEPENDS= gweather.1:${PORTSDIR}/net/libgweather \
- canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
- polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+ canberra-gtk.0:${PORTSDIR}/audio/libcanberra
USE_GETTEXT= yes
+USE_XORG= ice sm x11 xau xrandr
INSTALLS_OMF= yes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop librsvg2 \
- libwnck gnomemenus gnomedocutils ltverhack referencehack \
- libbonoboui
+USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop libwnck gnomemenus \
+ gnomedocutils ltverhack referencehack librsvg2
WANT_GNOME= yes
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
@@ -47,7 +47,8 @@ GCONF_SCHEMAS= clock.schemas fish.schemas \
panel-toplevel.schemas window-list.schemas \
workspace-switcher.schemas
-OPTIONS= EVOLUTION "use the Evolution calendar if installed" on
+OPTIONS= EVOLUTION "use the Evolution calendar if installed" on \
+ BONOBO "Support for bonobo applets aka Gnome 2 applets" on
.if defined(PACKAGE_BUILDING)
.undef WITHOUT_GNOME
@@ -58,11 +59,20 @@ WITH_GNOME= yes
.if !defined(WITHOUT_EVOLUTION) && ${HAVE_GNOME:Mevolutiondataserver}!=""
USE_GNOME+= evolutiondataserver
-CONFIGURE_ARGS+=--enable-eds
+#CONFIGURE_ARGS+=--enable-eds
.else
CONFIGURE_ARGS+=--disable-eds
.endif
+.if defined(WITH_BONOBO)
+USE_GNOME+= libbonoboui
+CONFIGURE_ARGS+=--enable-bonobo
+PLIST_SUB+= BONOBO=""
+.else
+CONFIGURE_ARGS+=--disable-bonobo
+PLIST_SUB+= BONOBO="@comment "
+.endif
+
post-patch:
@${FIND} ${WRKSRC} -type f | \
${XARGS} -n 10 ${REINPLACE_CMD} -e \
@@ -71,6 +81,10 @@ post-patch:
${WRKSRC}/help/clock/Makefile.in \
${WRKSRC}/help/fish/Makefile.in
+post-install:
+ @${MKDIR} ${PREFIX}/lib/gnome-panel/modules
+ -${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gnome-panel/modules
+
.include <bsd.port.post.mk>
.endif
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 210adb38c35b..d0b90eeb508f 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gnome-panel-2.30.2.tar.bz2) = 11b6db12223c70a218a2f4602b1683cc
-SHA256 (gnome2/gnome-panel-2.30.2.tar.bz2) = f0171c55ecdf4970f819cce66de0db99bbe43832e8a284ea0dd0c89d7d12e7b6
-SIZE (gnome2/gnome-panel-2.30.2.tar.bz2) = 3125757
+SHA256 (gnome2/gnome-panel-2.32.1.tar.bz2) = 8f7828eb7a21c817a73b697844a4e20256059b32386414a10f97d51e7d9fca5f
+SIZE (gnome2/gnome-panel-2.32.1.tar.bz2) = 3132156
diff --git a/x11/gnome-panel/files/patch-po_ko.po b/x11/gnome-panel/files/patch-po_ko.po
deleted file mode 100644
index 7de508a0eba4..000000000000
--- a/x11/gnome-panel/files/patch-po_ko.po
+++ /dev/null
@@ -1,29 +0,0 @@
---- po/ko.po.orig 2008-02-26 18:15:58.000000000 +0100
-+++ po/ko.po 2008-02-26 18:16:31.000000000 +0100
-@@ -95,7 +95,7 @@ msgstr "%H:%M"
- #. * possible.
- #: ../applets/clock/calendar-window.c:250
- msgid "%b %d"
--msgstr "%b %e일"
-+msgstr "%B %e일"
-
- #: ../applets/clock/calendar-window.c:765
- msgid "Tasks"
-@@ -146,7 +146,7 @@ msgstr "%H:%M:%S"
- #.
- #: ../applets/clock/clock.c:443
- msgid "%a %b %e"
--msgstr "%b %e일 (%a)"
-+msgstr "%B %e일 (%a)"
-
- #. translators: reverse the order of these arguments
- #. * if the time should come before the
-@@ -207,7 +207,7 @@ msgstr "%p %I:%M"
-
- #: ../applets/clock/clock.c:1590
- msgid "%A, %B %d %Y"
--msgstr "%Y년 %b %e일 %A"
-+msgstr "%Y년 %B %e일 %A"
-
- #: ../applets/clock/clock.c:1665
- #, c-format
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 1d349e92627e..1f93a7f91a44 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -1,48 +1,67 @@
bin/gnome-desktop-item-edit
bin/gnome-panel
bin/panel-test-applets
-etc/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
+%%BONOBO%%bin/panel-test-applets-bonobo
@unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true
@unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true
etc/gconf/schemas/panel-default-setup.entries
@exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true
@exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true
-include/panel-2.0/GNOME_Panel.h
-include/panel-2.0/panel-applet-enums.h
-include/panel-2.0/panel-applet-gconf.h
-include/panel-2.0/panel-applet.h
-lib/libpanel-applet-2.a
-lib/libpanel-applet-2.la
-lib/libpanel-applet-2.so
-lib/libpanel-applet-2.so.0
-libdata/bonobo/servers/GNOME_ClockApplet_Factory.server
-libdata/bonobo/servers/GNOME_FishApplet_Factory.server
-libdata/bonobo/servers/GNOME_NotificationAreaApplet.server
-libdata/bonobo/servers/GNOME_Wncklet_Factory.server
-libdata/pkgconfig/libpanelapplet-2.0.pc
+%%BONOBO%%include/panel-2.0/GNOME_Panel.h
+%%BONOBO%%include/panel-2.0/panel-applet-enums.h
+%%BONOBO%%include/panel-2.0/panel-applet-gconf.h
+%%BONOBO%%include/panel-2.0/panel-applet.h
+include/gnome-panel-3.0/libpanel-applet/panel-applet-enums.h
+include/gnome-panel-3.0/libpanel-applet/panel-applet-gconf.h
+include/gnome-panel-3.0/libpanel-applet/panel-applet.h
+lib/girepository-1.0/PanelApplet-3.0.typelib
+@exec mkdir -p %D/lib/gnome-panel/modules
+%%BONOBO%%lib/gnome-panel/modules/libpanel-applets-bonobo.a
+%%BONOBO%%lib/gnome-panel/modules/libpanel-applets-bonobo.la
+%%BONOBO%%lib/gnome-panel/modules/libpanel-applets-bonobo.so
+@exec %%LOCALBASE%%/bin/gio-querymodules %D/lib/gnome-panel/modules 2>1/dev/null || /usr/bin/true
+@unexec /bin/rm -f %D/lib/gnome-panel/modules/giomodule.cache
+%%BONOBO%%lib/libpanel-applet-2.a
+%%BONOBO%%lib/libpanel-applet-2.la
+%%BONOBO%%lib/libpanel-applet-2.so
+%%BONOBO%%lib/libpanel-applet-2.so.0
+lib/libpanel-applet-3.a
+lib/libpanel-applet-3.la
+lib/libpanel-applet-3.so
+lib/libpanel-applet-3.so.0
+%%BONOBO%%libdata/pkgconfig/libpanelapplet-2.0.pc
+libdata/pkgconfig/libpanelapplet-3.0.pc
libexec/clock-applet
-libexec/fish-applet-2
-libexec/gnome-clock-applet-mechanism
+libexec/fish-applet
libexec/gnome-panel-add
libexec/notification-area-applet
libexec/wnck-applet
share/applications/gnome-panel.desktop
-share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
-share/gnome-2.0/ui/GNOME_ClockApplet.xml
-share/gnome-2.0/ui/GNOME_FishApplet.xml
-share/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
-share/gnome-2.0/ui/GNOME_Panel_Popup.xml
-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
+share/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
+%%BONOBO%%share/gnome-2.0/ui/GNOME_Panel_Popup.xml
+share/gir-1.0/PanelApplet-3.0.gir
+%%DATADIR%%/applets/org.gnome.panel.ClockApplet.panel-applet
+%%DATADIR%%/applets/org.gnome.panel.FishApplet.panel-applet
+%%DATADIR%%/applets/org.gnome.panel.NotificationAreaApplet.panel-applet
+%%DATADIR%%/applets/org.gnome.panel.Wncklet.panel-applet
%%DATADIR%%/ui/clock.ui
+%%DATADIR%%/ui/clock-menu.xml
%%DATADIR%%/ui/fish.ui
+%%DATADIR%%/ui/fish-menu.xml
+%%DATADIR%%/ui/notification-area-menu.xml
+%%BONOBO%%%%DATADIR%%/ui/panel-test-applets-bonobo.ui
%%DATADIR%%/ui/panel-properties-dialog.ui
%%DATADIR%%/ui/panel-run-dialog.ui
+%%DATADIR%%/ui/showdesktop-menu.xml
%%DATADIR%%/ui/panel-test-applets.ui
%%DATADIR%%/ui/window-list.ui
+%%DATADIR%%/ui/window-list-menu.xml
+%%DATADIR%%/ui/window-menu-menu.xml
%%DATADIR%%/ui/workspace-switcher.ui
+%%DATADIR%%/ui/workspace-switcher-menu.xml
%%DATADIR%%/pixmaps/clock-calendar-icon.png
%%DATADIR%%/pixmaps/clock-face-large.svg
%%DATADIR%%/pixmaps/clock-face-small-day.svg
@@ -61,7 +80,6 @@ share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
%%DATADIR%%/pixmaps/monkey.png
%%DATADIR%%/pixmaps/oldwanda.png
%%DATADIR%%/pixmaps/wanda.png
-%%DATADIR%%/pixmaps/world_map-960.png
share/gnome-panelrc
share/gnome/help/clock/C/clock.xml
share/gnome/help/clock/C/figures/clock_applet.png
@@ -126,6 +144,9 @@ share/gnome/help/clock/pt_BR/legal.xml
share/gnome/help/clock/ru/clock.xml
share/gnome/help/clock/ru/figures/clock_applet.png
share/gnome/help/clock/ru/legal.xml
+share/gnome/help/clock/sl/clock.xml
+share/gnome/help/clock/sl/figures/clock_applet.png
+share/gnome/help/clock/sl/legal.xml
share/gnome/help/clock/sr/clock.xml
share/gnome/help/clock/sr/figures/clock_applet.png
share/gnome/help/clock/sr/legal.xml
@@ -180,6 +201,9 @@ share/gnome/help/fish/fr/legal.xml
share/gnome/help/fish/it/figures/fish_applet.png
share/gnome/help/fish/it/fish.xml
share/gnome/help/fish/it/legal.xml
+share/gnome/help/fish/ja/figures/fish_applet.png
+share/gnome/help/fish/ja/fish.xml
+share/gnome/help/fish/ja/legal.xml
share/gnome/help/fish/ko/figures/fish_applet.png
share/gnome/help/fish/ko/fish.xml
share/gnome/help/fish/ko/legal.xml
@@ -189,6 +213,9 @@ share/gnome/help/fish/oc/legal.xml
share/gnome/help/fish/ru/figures/fish_applet.png
share/gnome/help/fish/ru/fish.xml
share/gnome/help/fish/ru/legal.xml
+share/gnome/help/fish/sl/figures/fish_applet.png
+share/gnome/help/fish/sl/fish.xml
+share/gnome/help/fish/sl/legal.xml
share/gnome/help/fish/sv/figures/fish_applet.png
share/gnome/help/fish/sv/fish.xml
share/gnome/help/fish/sv/legal.xml
@@ -257,7 +284,7 @@ share/icons/hicolor/scalable/apps/gnome-panel-window-list.svg
share/icons/hicolor/scalable/apps/gnome-panel-window-menu.svg
share/icons/hicolor/scalable/apps/gnome-panel-workspace-switcher.svg
share/icons/hicolor/scalable/apps/gnome-panel.svg
-share/idl/gnome-panel-2.0/GNOME_Panel.idl
+%%BONOBO%%share/idl/gnome-panel-2.0/GNOME_Panel.idl
share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
@@ -291,9 +318,11 @@ share/locale/fa/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/fur/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/fy/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/gu/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/gv/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ha/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo
@@ -306,6 +335,7 @@ share/locale/is/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ka/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/kk/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/kn/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo
@@ -350,6 +380,7 @@ share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/te/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/th/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ug/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/uz/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/uz@cyrillic/LC_MESSAGES/gnome-panel-2.0.mo
@@ -383,6 +414,7 @@ share/omf/clock/clock-pa.omf
share/omf/clock/clock-pt.omf
share/omf/clock/clock-pt_BR.omf
share/omf/clock/clock-ru.omf
+share/omf/clock/clock-sl.omf
share/omf/clock/clock-sr.omf
share/omf/clock/clock-sv.omf
share/omf/clock/clock-th.omf
@@ -401,17 +433,18 @@ share/omf/fish/fish-eu.omf
share/omf/fish/fish-fi.omf
share/omf/fish/fish-fr.omf
share/omf/fish/fish-it.omf
+share/omf/fish/fish-ja.omf
share/omf/fish/fish-ko.omf
share/omf/fish/fish-oc.omf
share/omf/fish/fish-ru.omf
+share/omf/fish/fish-sl.omf
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/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
@dirrm share/omf/fish
@dirrm share/omf/clock
-@dirrm share/idl/gnome-panel-2.0
+%%BONOBO%%@dirrm share/idl/gnome-panel-2.0
@dirrm share/gnome/help/fish/zh_CN/figures
@dirrm share/gnome/help/fish/zh_CN
@dirrm share/gnome/help/fish/uk/figures
@@ -420,12 +453,16 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
@dirrm share/gnome/help/fish/th
@dirrm share/gnome/help/fish/sv/figures
@dirrm share/gnome/help/fish/sv
+@dirrm share/gnome/help/fish/sl/figures
+@dirrm share/gnome/help/fish/sl
@dirrm share/gnome/help/fish/ru/figures
@dirrm share/gnome/help/fish/ru
@dirrm share/gnome/help/fish/oc/figures
@dirrm share/gnome/help/fish/oc
@dirrm share/gnome/help/fish/ko/figures
@dirrm share/gnome/help/fish/ko
+@dirrm share/gnome/help/fish/ja/figures
+@dirrm share/gnome/help/fish/ja
@dirrm share/gnome/help/fish/it/figures
@dirrm share/gnome/help/fish/it
@dirrm share/gnome/help/fish/fr/figures
@@ -463,6 +500,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
@dirrm share/gnome/help/clock/sv
@dirrm share/gnome/help/clock/sr/figures
@dirrm share/gnome/help/clock/sr
+@dirrm share/gnome/help/clock/sl/figures
+@dirrm share/gnome/help/clock/sl
@dirrm share/gnome/help/clock/ru/figures
@dirrm share/gnome/help/clock/ru
@dirrm share/gnome/help/clock/pt_BR/figures
@@ -508,9 +547,14 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
@dirrm share/gnome/help/clock
@dirrm %%DATADIR%%/pixmaps
@dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%/applets
@dirrm %%DATADIR%%
@dirrmtry share/applications
-@dirrm include/panel-2.0
+@dirrmtry lib/gnome-panel/modules
+@dirrmtry lib/gnome-panel
+@dirrm include/gnome-panel-3.0/libpanel-applet
+@dirrm include/gnome-panel-3.0
+%%BONOBO%%@dirrm include/panel-2.0
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -523,6 +567,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
@dirrmtry share/locale/xh
@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -555,12 +601,18 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/ig/LC_MESSAGES
@dirrmtry share/locale/ig
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
@dirrmtry share/locale/ha/LC_MESSAGES
@dirrmtry share/locale/ha
+@dirrmtry share/locale/gv/LC_MESSAGES
+@dirrmtry share/locale/gv
+@dirrmtry share/locale/fy/LC_MESSAGES
+@dirrmtry share/locale/fy
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/en@shaw/LC_MESSAGES
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 1e04e4206ef4..53db051654d3 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.118 2010/04/01 13:10:41 kwm Exp $
+# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.121 2010/09/30 19:51:41 kwm Exp $
#
PORTNAME= gnome-screensaver
-PORTVERSION= 2.30.0
-PORTREVISION= 2
+PORTVERSION= 2.30.2
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index 5cf7179b9bdf..58e63346c711 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-screensaver-2.30.0.tar.bz2) = a18086bf2191795d87b7ea80b7b66daa
-SHA256 (gnome2/gnome-screensaver-2.30.0.tar.bz2) = f653d3e4a872d435bce9d74ea8d14e54090c4c803521d5fe940e948c1dccc060
-SIZE (gnome2/gnome-screensaver-2.30.0.tar.bz2) = 4803639
+MD5 (gnome2/gnome-screensaver-2.30.2.tar.bz2) = 0fbe6e610e6847ac1e69d49b1e1f0582
+SHA256 (gnome2/gnome-screensaver-2.30.2.tar.bz2) = dd52ef278b23ec5abe5974548c2d576eeaeb5294c85e9f2efd6231ecc9ca09fa
+SIZE (gnome2/gnome-screensaver-2.30.2.tar.bz2) = 4814653
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index 8922fb86e9be..4333ecdb345d 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -15,6 +15,7 @@ share/applications/screensavers/cosmos-slideshow.desktop
share/applications/screensavers/footlogo-floaters.desktop
share/applications/screensavers/personal-slideshow.desktop
share/applications/screensavers/popsquares.desktop
+share/dbus-1/services/org.gnome.ScreenSaver.service
share/desktop-directories/gnome-screensaver.directory
%%DATADIR%%/gnome-screensaver-preferences.ui
%%DATADIR%%/lock-dialog-default.ui
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 2db2990f916e..bb2d8155f528 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,23 +3,20 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11/gnome-session/Makefile,v 1.6 2010/06/24 10:03:55 kwm Exp $
+# $MCom: ports/x11/gnome-session/Makefile,v 1.187 2010/11/17 12:00:11 kwm Exp $
#
PORTNAME= gnome-session
-PORTVERSION= 2.30.2
-PORTREVISION= 1
+PORTVERSION= 2.32.1
CATEGORIES= x11 gnome
-MASTER_SITES= GNOME \
- http://www.marcuscom.com/downloads/:local
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- ${SPLASHES}:local
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Session component for the GNOME 2 desktop
+CONFLICTS= gnome-session-2.31.* gnome-session-2.90.* gnome-session-3.*
+
BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
@@ -33,7 +30,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gno
INSTALLS_ICONS= yes
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_XORG= ice sm xau xext xrandr
+USE_XORG= ice sm xau xrandr
USE_GNOME= gnomeprefix gnomehack intlhack gconf2
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
@@ -47,19 +44,4 @@ MAN1= gnome-session.1 gnome-wm.1 gnome-session-properties.1 \
gnome-session-save.1
GCONF_SCHEMAS= gnome-session.schemas
-SPLASHES= freebsd-splashes-gnome-2.18_1.tar
-
-post-extract:
- cd ${WRKDIR} && ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES}
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/data/gnome-splash.png \
- ${PREFIX}/share/pixmaps/splash/original-gnome-splash.png
-# ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \
-# ${PREFIX}/share/pixmaps/splash/gnome-splash.png
-.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png franz-splash_218.png adamw-bat-2.18.jpg adamw-conky-2.18.png adamw-cow-2.18.png adamw-mouth-2.18.png adamw-swing-2.18.png
- ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.18/${splash} \
- ${PREFIX}/share/pixmaps/splash
-.endfor
-
.include <bsd.port.mk>
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index cf107957e7e9..6ad5a364611b 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,2 @@
-MD5 (gnome2/gnome-session-2.30.2.tar.bz2) = d93a2da931ac0b9c0d98f6b68a17a730
-SHA256 (gnome2/gnome-session-2.30.2.tar.bz2) = ea7b5d8b254eba0f4ee5f737ed3686fca4fa734ad54a20f206534241f6aef4ec
-SIZE (gnome2/gnome-session-2.30.2.tar.bz2) = 817580
-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
+SHA256 (gnome2/gnome-session-2.32.1.tar.bz2) = 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a
+SIZE (gnome2/gnome-session-2.32.1.tar.bz2) = 774842
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index cff118134b1e..bacb06aac336 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -2,10 +2,6 @@ bin/gnome-session
bin/gnome-session-properties
bin/gnome-session-save
bin/gnome-wm
-etc/xdg/autostart/gnome-session-splash.desktop
-etc/xdg/autostart/gnome-settings-daemon-helper.desktop
-libexec/gnome-session/helpers/gnome-session-splash
-libexec/gnome-session/helpers/gnome-settings-daemon-helper
share/applications/session-properties.desktop
%%DATADIR%%/gsm-inhibit-dialog.ui
%%DATADIR%%/session-properties.ui
@@ -48,6 +44,7 @@ share/locale/fa/LC_MESSAGES/gnome-session-2.0.mo
share/locale/fi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/fr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/fur/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/fy/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/gu/LC_MESSAGES/gnome-session-2.0.mo
@@ -101,6 +98,7 @@ share/locale/sr@latin/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
share/locale/te/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ug/LC_MESSAGES/gnome-session-2.0.mo
share/locale/th/LC_MESSAGES/gnome-session-2.0.mo
share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
@@ -115,33 +113,10 @@ share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
-share/pixmaps/splash/MaMBaNgGaoX-2.12.png
-share/pixmaps/splash/adamw-bat-2.18.jpg
-share/pixmaps/splash/adamw-conky-2.18.png
-share/pixmaps/splash/adamw-cow-2.18.png
-share/pixmaps/splash/adamw-mouth-2.18.png
-share/pixmaps/splash/adamw-piggy-2.12.png
-share/pixmaps/splash/adamw-swing-2.18.png
-share/pixmaps/splash/adamw-trophy-2.12.png
-share/pixmaps/splash/andreas-slogan-2.12.png
-share/pixmaps/splash/andreas-splash-2.12.png
-share/pixmaps/splash/domix-splash-2.12.png
-share/pixmaps/splash/domix-splash2-2.12.png
-share/pixmaps/splash/franz-splash_218.png
-share/pixmaps/splash/gnome-splash.png
-share/pixmaps/splash/mumija-2.12.png
-share/pixmaps/splash/mumija2-2.12.png
-share/pixmaps/splash/mumija3-2.12.png
-share/pixmaps/splash/original-gnome-splash.png
-share/pixmaps/splash/tremulant-2.12.png
-share/pixmaps/splash/tremulant-blood-2.12.png
-share/pixmaps/splash/tremulant-brushed-metal-2.12.png
share/xsessions/gnome.desktop
@dirrmtry share/xsessions
@dirrm %%DATADIR%%
@dirrmtry share/applications
-@dirrm libexec/gnome-session/helpers
-@dirrm libexec/gnome-session
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -152,6 +127,8 @@ share/xsessions/gnome.desktop
@dirrmtry share/locale/xh
@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -184,6 +161,8 @@ share/xsessions/gnome.desktop
@dirrmtry share/locale/hy
@dirrmtry share/locale/ha/LC_MESSAGES
@dirrmtry share/locale/ha
+@dirrmtry share/locale/fy/LC_MESSAGES
+@dirrmtry share/locale/fy
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/en@shaw/LC_MESSAGES
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 5537d50e4303..7ecc0b0985bd 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -3,13 +3,13 @@
# Whom: Pawel Worach <pawel.worach@gmail.com>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-shell/Makefile,v 1.11 2010/03/29 11:42:11 kwm Exp $
+# $MCom: ports/x11/gnome-shell/Makefile,v 1.16 2010/11/20 15:05:25 kwm Exp $
#
PORTNAME= gnome-shell
-PORTVERSION= 2.29.1
+PORTVERSION= 2.31.2
PORTREVISION= 1
-CATEGORIES= x11
+CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -23,6 +23,8 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
glxinfo:${PORTSDIR}/graphics/mesa-demos
+BROKEN= Doesn't build
+
USE_BZIP2= yes
USE_XORG= x11 xfixes sm
USE_GETTEXT= yes
diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo
index 088b45374d71..f32fae96ea7f 100644
--- a/x11/gnome-shell/distinfo
+++ b/x11/gnome-shell/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-shell-2.29.1.tar.bz2) = dc98591ba7fe8acb92292bc0b2f9d246
-SHA256 (gnome2/gnome-shell-2.29.1.tar.bz2) = 710b863c0beea45543f8057d31b028ec85e19efeedda2b964d784d6fc1729c0b
-SIZE (gnome2/gnome-shell-2.29.1.tar.bz2) = 669050
+MD5 (gnome2/gnome-shell-2.31.2.tar.bz2) = 42f593eddbe3dcc2552f8ac2ca3748b6
+SHA256 (gnome2/gnome-shell-2.31.2.tar.bz2) = cf16167cf2354f57431125b38a7b3de424c3c9d3d44627c52ee4596694ee80f2
+SIZE (gnome2/gnome-shell-2.31.2.tar.bz2) = 692948
diff --git a/x11/gnome-shell/files/patch-src_Makefile.in b/x11/gnome-shell/files/patch-src_Makefile.in
deleted file mode 100644
index 592ea873a8f7..000000000000
--- a/x11/gnome-shell/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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_gnome-shell-plugin.c b/x11/gnome-shell/files/patch-src_gnome-shell-plugin.c
new file mode 100644
index 000000000000..90359fa33e6d
--- /dev/null
+++ b/x11/gnome-shell/files/patch-src_gnome-shell-plugin.c
@@ -0,0 +1,26 @@
+--- src/gnome-shell-plugin.c.orig 2010-06-06 22:53:13.000000000 +0200
++++ src/gnome-shell-plugin.c 2010-06-06 22:56:03.000000000 +0200
+@@ -38,7 +38,6 @@
+ #include <gjs/gjs.h>
+ #include <girepository.h>
+ #include <gmodule.h>
+-#include <malloc.h>
+ #include <stdlib.h>
+ #include <string.h>
+
+@@ -238,6 +237,7 @@
+ malloc_statistics_callback (ShellPerfLog *perf_log,
+ gpointer data)
+ {
++#if defined(__linux__)
+ struct mallinfo info = mallinfo ();
+
+ shell_perf_log_update_statistic_i (perf_log,
+@@ -249,6 +249,7 @@
+ shell_perf_log_update_statistic_i (perf_log,
+ "malloc.usedSize",
+ info.uordblks);
++#endif
+ }
+
+ static void
diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist
index 32918573d672..4d53b86016de 100644
--- a/x11/gnome-shell/pkg-plist
+++ b/x11/gnome-shell/pkg-plist
@@ -1,5 +1,5 @@
bin/gnome-shell
-lib/gnome-shell/Big-1.0.typelib
+bin/gnome-shell-clock-preferences
lib/gnome-shell/Gdm-1.0.typelib
lib/gnome-shell/Shell-0.1.typelib
lib/gnome-shell/St-1.0.typelib
@@ -7,14 +7,21 @@ lib/mutter/plugins/libgnome-shell.a
lib/mutter/plugins/libgnome-shell.la
lib/mutter/plugins/libgnome-shell.so
share/applications/gnome-shell.desktop
+share/applications/gnome-shell-clock-preferences.desktop
+%%DATADIR%%/clock-preferences.ui
%%DATADIR%%/images/close-black.svg
%%DATADIR%%/images/magnifier.svg
%%DATADIR%%/js/misc/docInfo.js
%%DATADIR%%/js/misc/format.js
+%%DATADIR%%/js/misc/gnomeSession.js
%%DATADIR%%/js/misc/params.js
+%%DATADIR%%/js/misc/telepathy.js
+%%DATADIR%%/js/perf/core.js
+%%DATADIR%%/js/prefs/clockPreferences.js
%%DATADIR%%/js/ui/altTab.js
%%DATADIR%%/js/ui/appDisplay.js
%%DATADIR%%/js/ui/appFavorites.js
+%%DATADIR%%/js/ui/boxpointer.js
%%DATADIR%%/js/ui/calendar.js
%%DATADIR%%/js/ui/chrome.js
%%DATADIR%%/js/ui/dash.js
@@ -26,6 +33,8 @@ share/applications/gnome-shell.desktop
%%DATADIR%%/js/ui/lightbox.js
%%DATADIR%%/js/ui/link.js
%%DATADIR%%/js/ui/lookingGlass.js
+%%DATADIR%%/js/ui/magnifier.js
+%%DATADIR%%/js/ui/magnifierDBus.js
%%DATADIR%%/js/ui/main.js
%%DATADIR%%/js/ui/messageTray.js
%%DATADIR%%/js/ui/notificationDaemon.js
@@ -33,13 +42,12 @@ share/applications/gnome-shell.desktop
%%DATADIR%%/js/ui/placeDisplay.js
%%DATADIR%%/js/ui/panel.js
%%DATADIR%%/js/ui/runDialog.js
+%%DATADIR%%/js/ui/scripting.js
%%DATADIR%%/js/ui/search.js
%%DATADIR%%/js/ui/shellDBus.js
%%DATADIR%%/js/ui/statusMenu.js
-%%DATADIR%%/js/ui/sidebar.js
+%%DATADIR%%/js/ui/telepathyClient.js
%%DATADIR%%/js/ui/tweener.js
-%%DATADIR%%/js/ui/widget.js
-%%DATADIR%%/js/ui/widgetBox.js
%%DATADIR%%/js/ui/windowAttentionHandler.js
%%DATADIR%%/js/ui/windowManager.js
%%DATADIR%%/js/ui/workspace.js
@@ -97,10 +105,13 @@ share/locale/sr/LC_MESSAGES/gnome-shell.mo
share/locale/sr@latin/LC_MESSAGES/gnome-shell.mo
share/locale/sv/LC_MESSAGES/gnome-shell.mo
share/locale/tr/LC_MESSAGES/gnome-shell.mo
+share/locale/uk/LC_MESSAGES/gnome-shell.mo
share/locale/vi/LC_MESSAGES/gnome-shell.mo
share/locale/zh_CN/LC_MESSAGES/gnome-shell.mo
@dirrm %%DATADIR%%/theme
@dirrm %%DATADIR%%/js/ui
+@dirrm %%DATADIR%%/js/prefs
+@dirrm %%DATADIR%%/js/perf
@dirrm %%DATADIR%%/js/misc
@dirrm %%DATADIR%%/js
@dirrm %%DATADIR%%/images
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 16e39bc24606..f50fa6f59c4c 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11/gnome-terminal/Makefile,v 1.5 2010/06/23 15:06:11 kwm Exp $
+# $MCom: ports/x11/gnome-terminal/Makefile,v 1.137 2010/11/13 13:25:22 kwm Exp $
#
PORTNAME= gnome-terminal
-PORTVERSION= 2.30.2
+PORTVERSION= 2.32.1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -30,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= gnome-terminal.schemas
-post-configure:
- @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
+post-patch:
+ ${FIND} ${WRKSRC} -type f -exec ${TOUCH} -f {} \;
.include <bsd.port.mk>
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 8312385db372..0c439fb39077 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/gnome-terminal-2.30.2.tar.bz2) = 74c4528f00067072c2bd867d1f8fe844
-SHA256 (gnome2/gnome-terminal-2.30.2.tar.bz2) = 2c7af2250698b9f9f53c6eaa93211c1118cf2c7e29cbbacfd1e8a6a10069e07a
-SIZE (gnome2/gnome-terminal-2.30.2.tar.bz2) = 2250070
+SHA256 (gnome2/gnome-terminal-2.32.1.tar.bz2) = 7f41e4b185a2cf65ff417b89e429fc3b625c5e3f042ee1763bda6490fa4676fb
+SIZE (gnome2/gnome-terminal-2.32.1.tar.bz2) = 2319315
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 04dd19834a12..ec21cc0a5953 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -1,6 +1,7 @@
bin/gnome-terminal
share/applications/gnome-terminal.desktop
%%DATADIR%%/encodings-dialog.ui
+%%DATADIR%%/find-dialog.ui
%%DATADIR%%/keybinding-editor.ui
%%DATADIR%%/profile-manager.ui
%%DATADIR%%/profile-new-dialog.ui
@@ -98,6 +99,7 @@ share/locale/dz/LC_MESSAGES/gnome-terminal.mo
share/locale/el/LC_MESSAGES/gnome-terminal.mo
share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo
share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo
+share/locale/eo/LC_MESSAGES/gnome-terminal.mo
share/locale/es/LC_MESSAGES/gnome-terminal.mo
share/locale/et/LC_MESSAGES/gnome-terminal.mo
share/locale/en@shaw/LC_MESSAGES/gnome-terminal.mo
@@ -118,6 +120,7 @@ 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
+share/locale/kk/LC_MESSAGES/gnome-terminal.mo
share/locale/kn/LC_MESSAGES/gnome-terminal.mo
share/locale/ko/LC_MESSAGES/gnome-terminal.mo
share/locale/ku/LC_MESSAGES/gnome-terminal.mo
@@ -156,6 +159,7 @@ share/locale/ta/LC_MESSAGES/gnome-terminal.mo
share/locale/te/LC_MESSAGES/gnome-terminal.mo
share/locale/th/LC_MESSAGES/gnome-terminal.mo
share/locale/tr/LC_MESSAGES/gnome-terminal.mo
+share/locale/ug/LC_MESSAGES/gnome-terminal.mo
share/locale/uk/LC_MESSAGES/gnome-terminal.mo
share/locale/vi/LC_MESSAGES/gnome-terminal.mo
share/locale/wa/LC_MESSAGES/gnome-terminal.mo
@@ -234,6 +238,8 @@ share/omf/gnome-terminal/gnome-terminal-zh_TW.omf
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -256,6 +262,8 @@ share/omf/gnome-terminal/gnome-terminal-zh_TW.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
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 24f846db9ced..be378b84d7a1 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.9 2010/06/24 12:38:52 kwm Exp $
+# $MCom: ports/x11/gnome2/Makefile,v 1.300 2010/11/18 01:37:46 kwm Exp $
#
PORTNAME= gnome2
-PORTVERSION= 2.30.2
+PORTVERSION= 2.32.1
PORTREVISION?= 0
CATEGORIES?= x11 gnome
MASTER_SITES= # empty
@@ -32,7 +32,6 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple
${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm \
${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
${LOCALBASE}/share/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
- ${LOCALBASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \
file-roller:${PORTSDIR}/archivers/file-roller \
${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
gok:${PORTSDIR}/accessibility/gok \
@@ -44,7 +43,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.30:${PORTSDIR}/mail/evolution-exchange \
+ exchange-connector-setup-2.32:${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 \
@@ -93,7 +92,7 @@ RUN_DEPENDS+= empathy:${PORTSDIR}/net-im/empathy \
gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \
${LOCALBASE}/libexec/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \
${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet \
- ${LOCALBASE}/lib/gtk-2.0/modules/at-spi-dbus/modules/libatk-bridge.so:${PORTSDIR}/accessibility/at-spi2-atk \
+ ${LOCALBASE}/lib/gtk-2.0/modules/libatk-bridge.so:${PORTSDIR}/accessibility/at-spi \
gpk-application:${PORTSDIR}/ports-mgmt/gnome-packagekit
.if ${OSVERSION}>=800000
RUN_DEPENDS+= cheese:${PORTSDIR}/multimedia/cheese
diff --git a/x11/gtkchtheme/files/patch-Makefile b/x11/gtkchtheme/files/patch-Makefile
new file mode 100644
index 000000000000..e5078502d48e
--- /dev/null
+++ b/x11/gtkchtheme/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig 2010-10-31 11:27:20.000000000 +0100
++++ Makefile 2010-10-31 11:27:35.000000000 +0100
+@@ -4,7 +4,7 @@ CFLAGS := $(if $(RPM_OPT_FLAGS), $(RPM_O
+
+ LDFLAGS = $(shell pkg-config --libs gtk+-2.0)
+ CFLAGS += -Wall
+-CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -DGTK_DISABLE_BROKEN -DGTK_DISABLE_DEPRECATED
++CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -DGTK_DISABLE_BROKEN
+ CFLAGS += -DPROJNAME='"$(PROJNAME)"' -DVERSION='"$(VERSION)"'
+ CPPFLAGS =
+ CXXFLAGS =
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 9020210e9d39..b1d8c41e0503 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.131 2010/04/01 14:49:19 kwm Exp $
+# $MCom: ports/x11/libgnome/Makefile,v 1.135 2010/09/27 20:06:45 kwm Exp $
#
PORTNAME= libgnome
-PORTVERSION= 2.30.0
-PORTREVISION?= 1
+PORTVERSION= 2.32.0
+PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -21,6 +21,7 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
+LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra
RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
USE_GETTEXT= yes
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 25b5f11516c0..b7349b379240 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnome-2.30.0.tar.bz2) = 1f85adc40b242b953c0e96ad017c2616
-SHA256 (gnome2/libgnome-2.30.0.tar.bz2) = 3ed932b94f16614cb03c7661f39b574845970c6ce3ca46e46338409283856f1f
-SIZE (gnome2/libgnome-2.30.0.tar.bz2) = 1736034
+MD5 (gnome2/libgnome-2.32.0.tar.bz2) = b27a0c61918fad8492d84b407a72bd7c
+SHA256 (gnome2/libgnome-2.32.0.tar.bz2) = d65e49bf075eb2b3efebec38ceb409693154d18396365765da1a71630bc3dd02
+SIZE (gnome2/libgnome-2.32.0.tar.bz2) = 1731179
diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in
index ef1c2e727f69..9b21e3ab66ab 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.26 2010/04/02 21:50:07 kwm Exp $
+# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.29 2010/09/28 15:55:50 kwm Exp $
#
# Restore gconf keys of gnomevfs2.
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 8acd7b31795d..a1f0d36255c2 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -69,6 +69,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/kk/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
@@ -152,6 +153,8 @@ share/pixmaps/backgrounds/gnome/background-default.jpg
@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/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/en@shaw/LC_MESSAGES
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 786e98354497..58c0f58a5cb2 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11/libgnomekbd/Makefile,v 1.1 2010/06/23 21:37:12 kwm Exp $
+# $MCom: ports/x11/libgnomekbd/Makefile,v 1.48 2010/09/28 08:01:11 kwm Exp $
#
PORTNAME= libgnomekbd
-PORTVERSION= 2.30.2
+PORTVERSION= 2.32.0
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -29,8 +29,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= desktop_gnome_peripherals_keyboard_xkb.schemas
-post-patch:
- @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
- 's|-Werror||g'
+#post-patch:
+# @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+# 's|-Werror||g'
.include <bsd.port.mk>
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index 75e3e64135d1..7868e298bf9f 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomekbd-2.30.2.tar.bz2) = 2fe73ebfd40801655e0aa3f85cefa873
-SHA256 (gnome2/libgnomekbd-2.30.2.tar.bz2) = 3270d8470f5bd4d7e867f22330180a4429ae0f1d685db0bfa4c126699309e1a6
-SIZE (gnome2/libgnomekbd-2.30.2.tar.bz2) = 405388
+MD5 (gnome2/libgnomekbd-2.32.0.tar.bz2) = de32a6e3e3464b566eecdc4332bf34bd
+SHA256 (gnome2/libgnomekbd-2.32.0.tar.bz2) = ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256
+SIZE (gnome2/libgnomekbd-2.32.0.tar.bz2) = 410928
diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist
index 0225e40bef24..35a4af6da56e 100644
--- a/x11/libgnomekbd/pkg-plist
+++ b/x11/libgnomekbd/pkg-plist
@@ -20,6 +20,7 @@ libdata/pkgconfig/libgnomekbdui.pc
share/applications/gkbd-indicator-plugins-capplet.desktop
%%DATADIR%%/ui/gkbd-indicator-plugins.ui
%%DATADIR%%/ui/gkbd-indicator-plugins_add.ui
+%%DATADIR%%/ui/show-layout.ui
share/locale/ar/LC_MESSAGES/libgnomekbd.mo
share/locale/as/LC_MESSAGES/libgnomekbd.mo
share/locale/ast/LC_MESSAGES/libgnomekbd.mo
@@ -36,6 +37,7 @@ share/locale/dz/LC_MESSAGES/libgnomekbd.mo
share/locale/el/LC_MESSAGES/libgnomekbd.mo
share/locale/en_GB/LC_MESSAGES/libgnomekbd.mo
share/locale/en@shaw/LC_MESSAGES/libgnomekbd.mo
+share/locale/eo/LC_MESSAGES/libgnomekbd.mo
share/locale/es/LC_MESSAGES/libgnomekbd.mo
share/locale/et/LC_MESSAGES/libgnomekbd.mo
share/locale/eu/LC_MESSAGES/libgnomekbd.mo
@@ -47,6 +49,7 @@ share/locale/gu/LC_MESSAGES/libgnomekbd.mo
share/locale/he/LC_MESSAGES/libgnomekbd.mo
share/locale/hi/LC_MESSAGES/libgnomekbd.mo
share/locale/hu/LC_MESSAGES/libgnomekbd.mo
+share/locale/id/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
@@ -58,6 +61,7 @@ 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
+share/locale/ms/LC_MESSAGES/libgnomekbd.mo
share/locale/nb/LC_MESSAGES/libgnomekbd.mo
share/locale/nl/LC_MESSAGES/libgnomekbd.mo
share/locale/nn/LC_MESSAGES/libgnomekbd.mo
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index d66a541af416..3ca5225067ad 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/startup-notification/Makefile,v 1.8 2006/09/10 00:51:15 mezz Exp $
+# $MCom: ports/x11/startup-notification/Makefile,v 1.10 2010/07/21 18:04:43 mezz Exp $
#
PORTNAME= startup-notification
PORTVERSION= 0.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= http://www.freedesktop.org/software/startup-notification/releases/
DIST_SUBDIR= gnome2
@@ -18,13 +18,14 @@ COMMENT= Library that supports startup notification spec from freedesktop.org
LIB_DEPENDS= xcb-aux.0:${PORTSDIR}/x11/xcb-util
-USE_XORG= x11 ice sm
+USE_XORG= x11
USE_AUTOTOOLS= libtool:22
USE_GMAKE= yes
-USE_GNOME= gnomehack gnometarget pkgconfig
+USE_GNOME= gnomehack gnometarget pkgconfig ltasneededhack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=ac_cv_lib_ICE_IceConnectionNumber=no
.include <bsd.port.mk>
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index bbd19f347fb2..df720e976ec5 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.154 2010/04/27 13:32:17 kwm Exp $
+# $MCom: ports/x11/yelp/Makefile,v 1.164 2010/10/18 13:37:34 kwm Exp $
#
PORTNAME= yelp
-PORTVERSION= 2.30.1
-PORTREVISION= 2
+PORTVERSION= 2.30.2
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,6 +20,8 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
rarian.0:${PORTSDIR}/textproc/rarian
+CONFLICTS= yelp-2.31.*
+
USE_GECKO= libxul
USE_GETTEXT= yes
USE_BZIP2= yes
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index ef7c6f151f27..0d552a50699d 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/yelp-2.30.1.tar.bz2) = afd638cdaea1fcb9821ece88b819a022
-SHA256 (gnome2/yelp-2.30.1.tar.bz2) = 4b453e994f8e57bc5c4637dba2c315536f30e90741b74b0bee218cbb436eb20c
-SIZE (gnome2/yelp-2.30.1.tar.bz2) = 1139961
+MD5 (gnome2/yelp-2.30.2.tar.bz2) = d745dafd0c134e726511894621d9b050
+SHA256 (gnome2/yelp-2.30.2.tar.bz2) = 5f8c35847bdae654e21cbba66865d6b582d9fc80a059ad29081bb87e146bb165
+SIZE (gnome2/yelp-2.30.2.tar.bz2) = 1159521
diff --git a/x11/yelp/files/patch-src_yelp-window.c b/x11/yelp/files/patch-src_yelp-window.c
new file mode 100644
index 000000000000..37acdfcc501a
--- /dev/null
+++ b/x11/yelp/files/patch-src_yelp-window.c
@@ -0,0 +1,37 @@
+--- src/yelp-window.c.orig 2010-10-16 23:06:05.000000000 +0400
++++ src/yelp-window.c 2010-10-17 03:58:57.000000000 +0400
+@@ -1555,28 +1555,26 @@
+
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), priv->find_entry);
+
+- box = gtk_hbox_new (FALSE, 0);
+ arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_NONE);
+ label = gtk_label_new_with_mnemonic (_("Find _Previous"));
+- gtk_box_pack_start (GTK_BOX (box), arrow, FALSE, FALSE, 0);
+- gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+- priv->find_prev = gtk_tool_button_new (box, NULL);
++ priv->find_prev = gtk_tool_button_new (arrow, NULL);
++ gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (priv->find_prev), label);
+ g_signal_connect (priv->find_prev,
+ "clicked",
+ G_CALLBACK (window_find_clicked_cb),
+ window);
++ gtk_tool_item_set_is_important (priv->find_prev, TRUE);
+ gtk_toolbar_insert (GTK_TOOLBAR (find_bar), priv->find_prev, -1);
+
+- box = gtk_hbox_new (FALSE, 0);
+ arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
+ label = gtk_label_new_with_mnemonic (_("Find _Next"));
+- gtk_box_pack_start (GTK_BOX (box), arrow, FALSE, FALSE, 0);
+- gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+- priv->find_next = gtk_tool_button_new (box, NULL);
++ priv->find_next = gtk_tool_button_new (arrow, NULL);
++ gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (priv->find_next), label);
+ g_signal_connect (priv->find_next,
+ "clicked",
+ G_CALLBACK (window_find_clicked_cb),
+ window);
++ gtk_tool_item_set_is_important (priv->find_next, TRUE);
+ gtk_toolbar_insert (GTK_TOOLBAR (find_bar), priv->find_next, -1);
+
+ priv->find_sep = gtk_separator_tool_item_new ();
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 903c7d3c5d98..4321292b2453 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -47,6 +47,7 @@ share/locale/is/LC_MESSAGES/yelp.mo
share/locale/it/LC_MESSAGES/yelp.mo
share/locale/ja/LC_MESSAGES/yelp.mo
share/locale/ka/LC_MESSAGES/yelp.mo
+share/locale/kk/LC_MESSAGES/yelp.mo
share/locale/kn/LC_MESSAGES/yelp.mo
share/locale/ko/LC_MESSAGES/yelp.mo
share/locale/ks/LC_MESSAGES/yelp.mo
@@ -178,6 +179,8 @@ share/locale/zu/LC_MESSAGES/yelp.mo
@dirrmtry share/locale/ku
@dirrmtry share/locale/ks/LC_MESSAGES
@dirrmtry share/locale/ks
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/fur/LC_MESSAGES
@dirrmtry share/locale/fur
@dirrmtry share/locale/en@shaw/LC_MESSAGES
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 58d35aa1f4a9..aae55592f2bc 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.104 2010/03/29 03:35:02 avl Exp $
+# $MCom: ports/x11/zenity/Makefile,v 1.111 2010/11/16 10:25:21 kwm Exp $
#
PORTNAME= zenity
-PORTVERSION= 2.30.0
-PORTREVISION= 1
+PORTVERSION= 2.32.1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index c04f3737c50f..5457446a907d 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/zenity-2.30.0.tar.bz2) = 15ba2f27d5e1a79c996e5e53e16f4380
-SHA256 (gnome2/zenity-2.30.0.tar.bz2) = d42a9be6f77eb018fb8c5967094db86604271f342dd15b6e6101338d82f923ff
-SIZE (gnome2/zenity-2.30.0.tar.bz2) = 3095111
+SHA256 (gnome2/zenity-2.32.1.tar.bz2) = 8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac
+SIZE (gnome2/zenity-2.32.1.tar.bz2) = 3128666
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 5678c826ec1c..96e303ee51db 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -193,6 +193,18 @@ share/gnome/help/zenity/uk/figures/zenity-question-screenshot.png
share/gnome/help/zenity/uk/figures/zenity-text-screenshot.png
share/gnome/help/zenity/uk/figures/zenity-warning-screenshot.png
share/gnome/help/zenity/uk/zenity.xml
+share/gnome/help/zenity/zh_CN/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/zh_CN/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/zh_CN/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/zh_CN/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/zh_CN/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/zh_CN/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/zh_CN/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/zh_CN/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/zh_CN/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/zh_CN/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/zh_CN/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/zh_CN/zenity.xml
share/locale/am/LC_MESSAGES/zenity.mo
share/locale/ar/LC_MESSAGES/zenity.mo
share/locale/as/LC_MESSAGES/zenity.mo
@@ -294,6 +306,7 @@ 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
+share/omf/zenity/zenity-zh_CN.omf
%%DATADIR%%/clothes/gnome-tshirt.png
%%DATADIR%%/clothes/hawaii-shirt.png
%%DATADIR%%/clothes/monk.png
@@ -350,6 +363,8 @@ share/omf/zenity/zenity-uk.omf
@dirrmtry share/locale/be@latin
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
+@dirrm share/gnome/help/zenity/zh_CN/figures
+@dirrm share/gnome/help/zenity/zh_CN
@dirrm share/gnome/help/zenity/uk/figures
@dirrm share/gnome/help/zenity/uk
@dirrm share/gnome/help/zenity/sv/figures