aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.gnome.mk149
-rw-r--r--Mk/bsd.gstreamer.mk58
-rw-r--r--accessibility/at-spi/Makefile8
-rw-r--r--accessibility/at-spi/distinfo6
-rw-r--r--accessibility/at-spi/pkg-plist67
-rw-r--r--accessibility/atk/Makefile11
-rw-r--r--accessibility/atk/distinfo6
-rw-r--r--accessibility/atk/files/patch-docs_Makefile.in10
-rw-r--r--accessibility/atk/pkg-plist20
-rw-r--r--accessibility/dasher/Makefile10
-rw-r--r--accessibility/dasher/distinfo6
-rw-r--r--accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp46
-rw-r--r--accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp60
-rw-r--r--accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp72
-rw-r--r--accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp51
-rw-r--r--accessibility/dasher/files/patch-Src_Gtk2_speech.cc10
-rw-r--r--accessibility/dasher/files/patch-configure18
-rw-r--r--accessibility/dasher/pkg-plist94
-rw-r--r--accessibility/gail/Makefile12
-rw-r--r--accessibility/gail/distinfo6
-rw-r--r--accessibility/gail/pkg-plist57
-rw-r--r--accessibility/gnome-speech/Makefile7
-rw-r--r--accessibility/gnome-speech/distinfo6
-rw-r--r--accessibility/gnopernicus/Makefile11
-rw-r--r--accessibility/gnopernicus/distinfo6
-rw-r--r--accessibility/gnopernicus/pkg-plist59
-rw-r--r--accessibility/gok/Makefile7
-rw-r--r--accessibility/gok/distinfo6
-rw-r--r--accessibility/gok/pkg-plist104
-rw-r--r--accessibility/orca/Makefile32
-rw-r--r--accessibility/orca/distinfo3
-rw-r--r--accessibility/orca/pkg-descr7
-rw-r--r--accessibility/orca/pkg-plist241
-rw-r--r--archivers/file-roller/Makefile7
-rw-r--r--archivers/file-roller/distinfo6
-rw-r--r--archivers/file-roller/pkg-plist91
-rw-r--r--audio/gnome-audio/Makefile4
-rw-r--r--audio/gnome-media/Makefile8
-rw-r--r--audio/gnome-media/distinfo6
-rw-r--r--audio/gnome-media/pkg-plist62
-rw-r--r--audio/gstreamer-monkeysaudio/Makefile7
-rw-r--r--audio/gstreamer-monkeysaudio/pkg-plist4
-rw-r--r--audio/gstreamer-plugins-pulse/Makefile33
-rw-r--r--audio/gstreamer-plugins-pulse/distinfo3
-rw-r--r--audio/gstreamer-plugins-pulse/pkg-descr3
-rw-r--r--audio/pulseaudio/Makefile60
-rw-r--r--audio/pulseaudio/distinfo3
-rw-r--r--audio/pulseaudio/files/patch-src_daemon_default.pa.in11
-rw-r--r--audio/pulseaudio/pkg-descr8
-rw-r--r--audio/pulseaudio/pkg-install22
-rw-r--r--audio/pulseaudio/pkg-plist254
-rw-r--r--audio/sound-juicer/Makefile6
-rw-r--r--audio/sound-juicer/distinfo6
-rw-r--r--audio/sound-juicer/files/patch-src::Makefile.in22
-rw-r--r--audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c18
-rw-r--r--audio/sound-juicer/pkg-plist83
-rw-r--r--databases/evolution-data-server/Makefile29
-rw-r--r--databases/evolution-data-server/distinfo6
-rw-r--r--databases/evolution-data-server/files/patch-camel_camel-object.c22
-rw-r--r--databases/evolution-data-server/files/patch-offical-sleepycat480
-rw-r--r--databases/evolution-data-server/pkg-plist90
-rw-r--r--databases/libgda2/Makefile7
-rw-r--r--databases/libgda2/pkg-plist30
-rw-r--r--deskutils/alacarte/Makefile35
-rw-r--r--deskutils/alacarte/distinfo6
-rw-r--r--deskutils/alacarte/files/patch-Alacarte_DialogHandler.py11
-rw-r--r--deskutils/alacarte/files/patch-Alacarte_util.py29
-rw-r--r--deskutils/alacarte/files/patch-GnomeDialogHandler.py26
-rw-r--r--deskutils/alacarte/pkg-descr6
-rw-r--r--deskutils/alacarte/pkg-plist147
-rw-r--r--deskutils/deskbar-applet/Makefile14
-rw-r--r--deskutils/deskbar-applet/distinfo6
-rw-r--r--deskutils/deskbar-applet/files/patch-deskbar___init__.py11
-rw-r--r--deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py6
-rw-r--r--deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py4
-rw-r--r--deskutils/deskbar-applet/pkg-plist154
-rw-r--r--deskutils/evolution-jescs/Makefile10
-rw-r--r--deskutils/evolution-jescs/distinfo6
-rw-r--r--deskutils/evolution-jescs/pkg-plist27
-rw-r--r--deskutils/gnome-utils/Makefile23
-rw-r--r--deskutils/gnome-utils/distinfo6
-rw-r--r--deskutils/gnome-utils/files/patch-07_fix_dict_crash_CVS97
-rw-r--r--deskutils/gnome-utils/files/patch-logview__logview.h10
-rw-r--r--deskutils/gnome-utils/files/patch-logview_calendar.h10
-rw-r--r--deskutils/gnome-utils/files/patch-logview_loglist.h10
-rw-r--r--deskutils/gnome-utils/files/patch-logview_logrtns.c52
-rw-r--r--deskutils/gnome-utils/files/patch-logview_logview-findbar.h10
-rw-r--r--deskutils/gnome-utils/files/patch-logview_misc.c21
-rw-r--r--deskutils/gnome-utils/pkg-plist220
-rw-r--r--deskutils/gucharmap/Makefile9
-rw-r--r--deskutils/gucharmap/distinfo6
-rw-r--r--deskutils/gucharmap/pkg-plist72
-rw-r--r--deskutils/tomboy/Makefile25
-rw-r--r--deskutils/tomboy/distinfo6
-rw-r--r--deskutils/tomboy/pkg-plist71
-rw-r--r--devel/bug-buddy/Makefile19
-rw-r--r--devel/bug-buddy/distinfo6
-rw-r--r--devel/bug-buddy/files/patch-src_bug-buddy.menu.in11
-rw-r--r--devel/bug-buddy/pkg-plist86
-rw-r--r--devel/dbus-glib/Makefile35
-rw-r--r--devel/dbus-glib/distinfo3
-rw-r--r--devel/dbus-glib/files/dbus-bus-introspect.xml77
-rw-r--r--devel/dbus-glib/files/patch-tools_run-with-tmp-session-bus.sh (renamed from devel/dbus/files/patch-tools_run-with-tmp-session-bus.sh)4
-rw-r--r--devel/dbus-glib/pkg-descr3
-rw-r--r--devel/dbus-glib/pkg-plist11
-rw-r--r--devel/dbus-sharp/Makefile8
-rw-r--r--devel/dbus-sharp/distinfo3
-rw-r--r--devel/dbus-sharp/files/patch-mono_Makefile.in (renamed from devel/dbus/files/patch-mono_Makefile.in)0
-rw-r--r--devel/dbus-sharp/files/patch-mono_dbus-sharp.dll.config.in (renamed from devel/dbus/files/patch-mono_dbus-sharp.dll.config.in)0
-rw-r--r--devel/dbus/Makefile62
-rw-r--r--devel/dbus/distinfo6
-rw-r--r--devel/dbus/files/patch-bus_dir-watch.c178
-rw-r--r--devel/dbus/files/patch-config.h.in12
-rw-r--r--devel/dbus/files/patch-configure71
-rw-r--r--devel/dbus/files/patch-dbus-1.pc.in10
-rw-r--r--devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c (renamed from devel/dbus/files/patch-dbus_dbus-sysdeps.c)39
-rw-r--r--devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c11
-rw-r--r--devel/dbus/files/patch-python_Makefile.in31
-rw-r--r--devel/dbus/files/patch-python_dbus_h_wrapper.h7
-rw-r--r--devel/dbus/files/patch-tools_Makefile.in32
-rw-r--r--devel/dbus/pkg-plist21
-rw-r--r--devel/g-wrap/Makefile35
-rw-r--r--devel/g-wrap/distinfo6
-rw-r--r--devel/g-wrap/files/patch-Makefile.in11
-rw-r--r--devel/g-wrap/files/patch-ab13
-rw-r--r--devel/g-wrap/files/patch-g-wrap_Makefile.in11
-rw-r--r--devel/g-wrap/files/patch-guile_g-wrap-2.0-guile.pc.in15
-rw-r--r--devel/g-wrap/files/patch-libffi_configure11
-rw-r--r--devel/g-wrap/pkg-plist97
-rw-r--r--devel/gconf2/Makefile11
-rw-r--r--devel/gconf2/distinfo6
-rw-r--r--devel/gconf2/pkg-plist63
-rw-r--r--devel/glib20/Makefile18
-rw-r--r--devel/glib20/distinfo6
-rw-r--r--devel/glib20/files/extra-patch-glib_Makefile.in11
-rw-r--r--devel/glib20/files/extra-patch-glib_gunicollate.c116
-rw-r--r--devel/glib20/files/patch-glib_gatomic.c37
-rw-r--r--devel/glib20/files/patch-glib_gthread.c28
-rw-r--r--devel/glib20/files/patch-glib_gtimer.c11
-rw-r--r--devel/glib20/files/patch-gmodule::gmodule-dl.c2
-rw-r--r--devel/glib20/files/patch-gthread_gthread-impl.c185
-rw-r--r--devel/glib20/pkg-plist87
-rw-r--r--devel/gnome-vfs-monikers/Makefile24
-rw-r--r--devel/gnome-vfs-monikers/distinfo3
-rw-r--r--devel/gnome-vfs-monikers/pkg-descr1
-rw-r--r--devel/gnome-vfs-monikers/pkg-plist6
-rw-r--r--devel/gnome-vfs/Makefile27
-rw-r--r--devel/gnome-vfs/distinfo6
-rw-r--r--devel/gnome-vfs/files/patch-Makefile.in8
-rw-r--r--devel/gnome-vfs/files/patch-configure26
-rw-r--r--devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in6
-rw-r--r--devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in6
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c35
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-monitor.c131
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c10
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c2
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h17
-rw-r--r--devel/gnome-vfs/files/patch-modules_file-method-acl.c11
-rw-r--r--devel/gnome-vfs/pkg-deinstall.in8
-rw-r--r--devel/gnome-vfs/pkg-install.in8
-rw-r--r--devel/gnome-vfs/pkg-plist60
-rw-r--r--devel/gnome2-hacker-tools/Makefile6
-rw-r--r--devel/libbonobo/Makefile8
-rw-r--r--devel/libbonobo/distinfo6
-rw-r--r--devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-fork-server.c21
-rw-r--r--devel/libbonobo/pkg-plist52
-rw-r--r--devel/libglade2/Makefile7
-rw-r--r--devel/libgsf/Makefile13
-rw-r--r--devel/libgsf/distinfo6
-rw-r--r--devel/libgsf/files/patch-gsf-python-Makefile.in39
-rw-r--r--devel/libgsf/pkg-plist2
-rw-r--r--devel/libgtop/Makefile6
-rw-r--r--devel/libgtop/pkg-plist36
-rw-r--r--devel/p5-Net-DBus/Makefile4
-rw-r--r--devel/py-dbus/Makefile42
-rw-r--r--devel/py-dbus/distinfo3
-rw-r--r--devel/py-dbus/pkg-descr4
-rw-r--r--devel/py-dbus/pkg-plist77
-rw-r--r--devel/py-gobject/Makefile5
-rw-r--r--devel/py-gobject/distinfo6
-rw-r--r--devel/py-gobject/files/patch-docs_Makefile.in11
-rw-r--r--devel/py-gobject/pkg-plist40
-rw-r--r--editors/gedit-plugins/Makefile55
-rw-r--r--editors/gedit-plugins/distinfo3
-rw-r--r--editors/gedit-plugins/pkg-descr1
-rw-r--r--editors/gedit-plugins/pkg-plist131
-rw-r--r--editors/gedit/Makefile25
-rw-r--r--editors/gedit/distinfo6
-rw-r--r--editors/gedit/pkg-plist144
-rw-r--r--games/gnome-games-extra-data/Makefile7
-rw-r--r--games/gnome-games/Makefile14
-rw-r--r--games/gnome-games/distinfo6
-rw-r--r--games/gnome-games/pkg-plist126
-rw-r--r--graphics/cairo/Makefile15
-rw-r--r--graphics/cairo/distinfo6
-rw-r--r--graphics/cairo/pkg-plist9
-rw-r--r--graphics/eog/Makefile13
-rw-r--r--graphics/eog/distinfo6
-rw-r--r--graphics/eog/pkg-plist133
-rw-r--r--graphics/evince/Makefile31
-rw-r--r--graphics/evince/distinfo6
-rw-r--r--graphics/evince/pkg-plist88
-rw-r--r--graphics/glitz/Makefile9
-rw-r--r--graphics/glitz/distinfo6
-rw-r--r--graphics/libgnomecanvas/Makefile9
-rw-r--r--graphics/libgnomecanvas/pkg-plist50
-rw-r--r--graphics/librsvg2/Makefile15
-rw-r--r--graphics/librsvg2/distinfo6
-rw-r--r--graphics/librsvg2/files/patch-moz-plugin_Makefile.in12
-rw-r--r--graphics/librsvg2/pkg-plist18
-rw-r--r--graphics/poppler-qt/Makefile2
-rw-r--r--graphics/poppler-qt/pkg-plist1
-rw-r--r--graphics/poppler/Makefile9
-rw-r--r--graphics/poppler/distinfo6
-rw-r--r--graphics/poppler/files/patch-Makefile.in16
-rw-r--r--graphics/poppler/files/patch-configure126
-rw-r--r--graphics/poppler/files/patch-qt_Makefile.in16
-rw-r--r--graphics/poppler/files/patch-utils_Makefile.in47
-rw-r--r--graphics/py-cairo/Makefile18
-rw-r--r--graphics/py-cairo/distinfo6
-rw-r--r--graphics/py-cairo/files/patch-cairo_pycairo-font.c19
-rw-r--r--graphics/py-cairo/pkg-plist2
-rw-r--r--lang/guile/Makefile12
-rw-r--r--lang/guile/distinfo6
-rw-r--r--lang/guile/files/extra-patch-ia6494
-rw-r--r--lang/guile/files/patch-slib_slib.scm85
-rw-r--r--lang/guile/pkg-plist1
-rw-r--r--lang/slib-guile/Makefile10
-rw-r--r--lang/slib-guile/pkg-plist8
-rw-r--r--mail/evolution-exchange/Makefile10
-rw-r--r--mail/evolution-exchange/distinfo6
-rw-r--r--mail/evolution-exchange/files/patch-configure13
-rw-r--r--mail/evolution-exchange/pkg-plist115
-rw-r--r--mail/evolution/Makefile25
-rw-r--r--mail/evolution/distinfo6
-rw-r--r--mail/evolution/files/patch-aa2
-rw-r--r--mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c34
-rw-r--r--mail/evolution/pkg-plist114
-rw-r--r--math/gcalctool/Makefile10
-rw-r--r--math/gcalctool/distinfo6
-rw-r--r--math/gcalctool/pkg-plist74
-rw-r--r--misc/gnome-icon-theme/Makefile14
-rw-r--r--misc/gnome-icon-theme/distinfo6
-rw-r--r--misc/gnome-icon-theme/pkg-plist4078
-rw-r--r--misc/gnome-mime-data/Makefile2
-rw-r--r--misc/gnome-mime-data/pkg-plist46
-rw-r--r--misc/gnome-user-docs/Makefile9
-rw-r--r--misc/gnome-user-docs/distinfo6
-rw-r--r--misc/gnome-user-docs/pkg-plist552
-rw-r--r--misc/gnomehier/Makefile9
-rw-r--r--misc/hicolor-icon-theme/Makefile49
-rw-r--r--misc/hicolor-icon-theme/distinfo6
-rw-r--r--misc/hicolor-icon-theme/files/pkg-install.in (renamed from misc/hicolor-icon-theme/pkg-install)8
-rw-r--r--misc/hicolor-icon-theme/pkg-plist212
-rw-r--r--misc/pciids/Makefile44
-rw-r--r--misc/pciids/distinfo3
-rw-r--r--misc/pciids/pkg-descr3
-rw-r--r--multimedia/gstreamer-editor/Makefile12
-rw-r--r--multimedia/gstreamer-ffmpeg/Makefile5
-rw-r--r--multimedia/gstreamer-ffmpeg80/Makefile7
-rw-r--r--multimedia/gstreamer-pitfdll/Makefile7
-rw-r--r--multimedia/gstreamer-pitfdll/pkg-plist4
-rw-r--r--multimedia/gstreamer-plugins-annodex/Makefile17
-rw-r--r--multimedia/gstreamer-plugins-bad/Makefile8
-rw-r--r--multimedia/gstreamer-plugins-bad/pkg-plist20
-rw-r--r--multimedia/gstreamer-plugins-bz2/Makefile17
-rw-r--r--multimedia/gstreamer-plugins-core/Makefile6
-rw-r--r--multimedia/gstreamer-plugins-core80/Makefile5
-rw-r--r--multimedia/gstreamer-plugins-gnonlin/Makefile4
-rw-r--r--multimedia/gstreamer-plugins-good/Makefile6
-rw-r--r--multimedia/gstreamer-plugins-good/files/patch-gst_id3demux_id3v2frames.c174
-rw-r--r--multimedia/gstreamer-plugins-good/pkg-plist20
-rw-r--r--multimedia/gstreamer-plugins-ugly/Makefile6
-rw-r--r--multimedia/gstreamer-plugins-ugly/pkg-plist20
-rw-r--r--multimedia/gstreamer-plugins/Makefile64
-rw-r--r--multimedia/gstreamer-plugins/Makefile.common354
-rw-r--r--multimedia/gstreamer-plugins/distinfo18
-rw-r--r--multimedia/gstreamer-plugins/pkg-plist12
-rw-r--r--multimedia/gstreamer-plugins80/Makefile11
-rw-r--r--multimedia/gstreamer-plugins80/Makefile.common5
-rw-r--r--multimedia/gstreamer-plugins80/files/patch-ext_x264_x264enc.c (renamed from multimedia/gstreamer-plugins80/files/patch-ext_x254_x264enc.c)0
-rw-r--r--multimedia/gstreamer-plugins80/pkg-plist8
-rw-r--r--multimedia/gstreamer/Makefile12
-rw-r--r--multimedia/gstreamer/distinfo6
-rw-r--r--multimedia/gstreamer/pkg-plist12
-rw-r--r--multimedia/gstreamer80/Makefile8
-rw-r--r--multimedia/gstreamer80/pkg-plist10
-rw-r--r--multimedia/py-gstreamer/Makefile3
-rw-r--r--multimedia/py-gstreamer80/Makefile2
-rw-r--r--multimedia/py-gstreamer80/files/patch-gst_arg-types.py11
-rw-r--r--multimedia/py-gstreamer80/files/patch-gst_gst.override17
-rw-r--r--multimedia/py-gstreamer80/files/patch-gst_gstpad.override24
-rw-r--r--multimedia/totem/Makefile68
-rw-r--r--multimedia/totem/distinfo6
-rw-r--r--multimedia/totem/files/patch-browser-plugin_totemPlugin.cpp10
-rw-r--r--multimedia/totem/files/patch-src_totem-disk.c32
-rw-r--r--multimedia/totem/files/patch-src_totem-mozilla-plugin.cpp10
-rw-r--r--multimedia/totem/files/pkg-message-mozilla.in8
-rw-r--r--multimedia/totem/pkg-plist109
-rw-r--r--net/avahi/Makefile14
-rw-r--r--net/avahi/distinfo6
-rw-r--r--net/avahi/files/patch-Makefile.in8
-rw-r--r--net/avahi/files/patch-avahi-core_dns.c10
-rw-r--r--net/avahi/pkg-plist1
-rw-r--r--net/ekiga/Makefile8
-rw-r--r--net/ekiga/pkg-plist56
-rw-r--r--net/gnome-netstatus/Makefile5
-rw-r--r--net/gnome-netstatus/pkg-plist38
-rw-r--r--net/gnome-nettool/Makefile9
-rw-r--r--net/gnome-nettool/distinfo6
-rw-r--r--net/gnome-nettool/pkg-plist62
-rw-r--r--net/py-avahi/Makefile6
-rw-r--r--net/vino/Makefile6
-rw-r--r--net/vino/distinfo6
-rw-r--r--net/vino/files/patch-server_libvncserver_rfb_rfbproto.h12
-rw-r--r--net/vino/files/patch-server_vino-fb.c10
-rw-r--r--net/vino/pkg-plist54
-rw-r--r--print/freetype2/Makefile16
-rw-r--r--print/freetype2/distinfo9
-rw-r--r--print/freetype2/files/patch-aa25
-rw-r--r--print/freetype2/files/patch-builds::unix::freetype2.in8
-rw-r--r--print/freetype2/files/patch-src::base::ftsynth.c10
-rw-r--r--print/freetype2/files/patch-src_pcf_pcfdrivr.c29
-rw-r--r--print/freetype2/files/patch-src_pcf_pcfread.c36
-rw-r--r--print/freetype2/files/patch-src_sfnt_sfdriver.c18
-rw-r--r--print/freetype2/pkg-descr15
-rw-r--r--print/freetype2/pkg-plist45
-rw-r--r--print/libgnomeprint/Makefile8
-rw-r--r--print/libgnomeprint/pkg-plist54
-rw-r--r--security/gnome-keyring-manager/Makefile10
-rw-r--r--security/gnome-keyring-manager/distinfo6
-rw-r--r--security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-acl-display.c19
-rw-r--r--security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-util.c13
-rw-r--r--security/gnome-keyring-manager/pkg-plist70
-rw-r--r--security/gnome-keyring/Makefile9
-rw-r--r--security/gnome-keyring/distinfo6
-rw-r--r--security/gnome-keyring/files/patch-gnome-keyring-daemon-io.c58
-rw-r--r--security/gnome-keyring/files/patch-gnome-keyring-daemon.c34
-rw-r--r--security/gnome-keyring/files/patch-gnome-keyring.c98
-rw-r--r--security/gnome-keyring/pkg-plist71
-rw-r--r--sysutils/gconf-editor/Makefile9
-rw-r--r--sysutils/gconf-editor/distinfo6
-rw-r--r--sysutils/gconf-editor/files/patch-src_gconf-editor-window.c11
-rw-r--r--sysutils/gconf-editor/pkg-plist77
-rw-r--r--sysutils/gnome-control-center/Makefile12
-rw-r--r--sysutils/gnome-control-center/distinfo6
-rw-r--r--sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c28
-rw-r--r--sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c17
-rw-r--r--sysutils/gnome-control-center/files/patch-configure17
-rw-r--r--sysutils/gnome-control-center/pkg-plist101
-rw-r--r--sysutils/gnome-mount/Makefile33
-rw-r--r--sysutils/gnome-mount/distinfo3
-rw-r--r--sysutils/gnome-mount/files/mntent.h56
-rw-r--r--sysutils/gnome-mount/files/patch-src_gnome-mount.c29
-rw-r--r--sysutils/gnome-mount/pkg-descr2
-rw-r--r--sysutils/gnome-mount/pkg-plist12
-rw-r--r--sysutils/gnome-power-manager/Makefile37
-rw-r--r--sysutils/gnome-power-manager/distinfo3
-rw-r--r--sysutils/gnome-power-manager/pkg-descr7
-rw-r--r--sysutils/gnome-power-manager/pkg-plist319
-rw-r--r--sysutils/gnome-system-monitor/Makefile5
-rw-r--r--sysutils/gnome-system-monitor/distinfo6
-rw-r--r--sysutils/gnome-system-monitor/pkg-plist63
-rw-r--r--sysutils/gnome-volume-manager/Makefile30
-rw-r--r--sysutils/gnome-volume-manager/distinfo3
-rw-r--r--sysutils/gnome-volume-manager/files/patch-gnome-volume-manager.schemas.in11
-rw-r--r--sysutils/gnome-volume-manager/files/patch-src_manager.c63
-rw-r--r--sysutils/gnome-volume-manager/files/patch-src_properties.c14
-rw-r--r--sysutils/gnome-volume-manager/pkg-descr3
-rw-r--r--sysutils/gnome-volume-manager/pkg-plist118
-rw-r--r--sysutils/gstreamer-plugins-hal/Makefile18
-rw-r--r--sysutils/hal-device-manager/Makefile20
-rw-r--r--sysutils/hal-device-manager/pkg-plist39
-rw-r--r--sysutils/hal/Makefile113
-rw-r--r--sysutils/hal/distinfo3
-rw-r--r--sysutils/hal/files/hald.in62
-rw-r--r--sysutils/hal/files/patch-Makefile.in25
-rw-r--r--sysutils/hal/files/patch-doc_Makefile.in11
-rw-r--r--sysutils/hal/files/patch-tools_Makefile.in11
-rw-r--r--sysutils/hal/files/patch-tools_hal-device.c11
-rw-r--r--sysutils/hal/files/patch-tools_lshal.c11
-rw-r--r--sysutils/hal/files/pkg-deinstall.in12
-rw-r--r--sysutils/hal/files/pkg-install.in47
-rw-r--r--sysutils/hal/pkg-descr6
-rw-r--r--sysutils/hal/pkg-plist152
-rw-r--r--sysutils/nautilus-cd-burner/Makefile26
-rw-r--r--sysutils/nautilus-cd-burner/distinfo6
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c11
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c42
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c33
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c14
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c11
-rw-r--r--sysutils/nautilus-cd-burner/pkg-plist73
-rw-r--r--sysutils/pessulus/Makefile8
-rw-r--r--sysutils/pessulus/distinfo6
-rw-r--r--sysutils/pessulus/pkg-plist53
-rw-r--r--sysutils/policykit/Makefile40
-rw-r--r--sysutils/policykit/distinfo3
-rw-r--r--sysutils/policykit/files/patch-Makefile.in11
-rw-r--r--sysutils/policykit/files/patch-polkitd_policy.c118
-rw-r--r--sysutils/policykit/files/patch-tools_Makefile.in14
-rw-r--r--sysutils/policykit/files/polkitd.in56
-rw-r--r--sysutils/policykit/pkg-descr4
-rw-r--r--sysutils/policykit/pkg-install38
-rw-r--r--sysutils/policykit/pkg-plist19
-rw-r--r--sysutils/system-tools-backends/Makefile10
-rw-r--r--sysutils/system-tools-backends/pkg-plist30
-rw-r--r--textproc/gnome-doc-utils/Makefile16
-rw-r--r--textproc/gnome-doc-utils/distinfo6
-rw-r--r--textproc/gnome-doc-utils/pkg-plist52
-rw-r--r--textproc/gnome-spell/Makefile5
-rw-r--r--textproc/gnome-spell/pkg-plist34
-rw-r--r--textproc/scrollkeeper/Makefile18
-rw-r--r--textproc/scrollkeeper/pkg-plist28
-rw-r--r--www/epiphany-extensions/Makefile8
-rw-r--r--www/epiphany-extensions/distinfo6
-rw-r--r--www/epiphany-extensions/pkg-plist37
-rw-r--r--www/epiphany/Makefile24
-rw-r--r--www/epiphany/distinfo6
-rw-r--r--www/epiphany/pkg-plist95
-rw-r--r--www/evolution-webcal/Makefile7
-rw-r--r--www/evolution-webcal/distinfo6
-rw-r--r--www/evolution-webcal/pkg-plist44
-rw-r--r--www/firefox-esr/Makefile10
-rw-r--r--www/firefox-esr/files/patch-configure9
-rw-r--r--www/firefox-esr/pkg-message2
-rw-r--r--www/firefox/Makefile10
-rw-r--r--www/firefox/files/patch-configure9
-rw-r--r--www/firefox/pkg-message2
-rw-r--r--www/firefox15/Makefile10
-rw-r--r--www/firefox15/files/patch-configure9
-rw-r--r--www/firefox15/pkg-message2
-rw-r--r--www/firefox36/Makefile10
-rw-r--r--www/firefox36/files/patch-configure9
-rw-r--r--www/firefox36/pkg-message2
-rw-r--r--www/gstreamer-plugins-neon/Makefile17
-rw-r--r--www/mozilla/Makefile6
-rw-r--r--www/mozilla/Makefile.common68
-rw-r--r--www/mozilla/bsd.gecko.mk20
-rw-r--r--www/mozilla/files/patch-gfx_src_ps_nsType1.cpp58
-rw-r--r--www/mozilla/pkg-deinstall.in4
-rw-r--r--www/mozilla/pkg-install.in4
-rw-r--r--x11-fm/nautilus/Makefile12
-rw-r--r--x11-fm/nautilus/distinfo6
-rw-r--r--x11-fm/nautilus/files/patch-aa20
-rw-r--r--x11-fm/nautilus/pkg-plist86
-rw-r--r--x11-fonts/fontconfig/Makefile10
-rw-r--r--x11-fonts/fontconfig/distinfo6
-rw-r--r--x11-themes/gnome-backgrounds/Makefile6
-rw-r--r--x11-themes/gnome-backgrounds/distinfo6
-rw-r--r--x11-themes/gnome-backgrounds/pkg-plist68
-rw-r--r--x11-themes/gnome-themes-extras/Makefile9
-rw-r--r--x11-themes/gnome-themes-extras/pkg-plist32
-rw-r--r--x11-themes/gnome-themes/Makefile14
-rw-r--r--x11-themes/gnome-themes/distinfo6
-rw-r--r--x11-themes/gnome-themes/pkg-plist1494
-rw-r--r--x11-themes/gtk-engines2/Makefile23
-rw-r--r--x11-themes/gtk-engines2/distinfo6
-rw-r--r--x11-themes/gtk-engines2/pkg-plist88
-rw-r--r--x11-themes/icon-naming-utils/Makefile8
-rw-r--r--x11-themes/icon-naming-utils/distinfo6
-rw-r--r--x11-toolkits/eel/Makefile10
-rw-r--r--x11-toolkits/eel/distinfo6
-rw-r--r--x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c2
-rw-r--r--x11-toolkits/eel/pkg-plist48
-rw-r--r--x11-toolkits/gtk20/Makefile31
-rw-r--r--x11-toolkits/gtk20/distinfo6
-rw-r--r--x11-toolkits/gtk20/files/patch-ak2
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_Makefile.in13
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_gtkcalendar.c10
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h17
-rw-r--r--x11-toolkits/gtk20/pkg-plist118
-rw-r--r--x11-toolkits/gtk30/Makefile31
-rw-r--r--x11-toolkits/gtk30/distinfo6
-rw-r--r--x11-toolkits/gtk30/files/patch-ak2
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_Makefile.in13
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_gtkcalendar.c10
-rw-r--r--x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.h17
-rw-r--r--x11-toolkits/gtk30/pkg-plist118
-rw-r--r--x11-toolkits/gtksourceview/Makefile8
-rw-r--r--x11-toolkits/gtksourceview/distinfo6
-rw-r--r--x11-toolkits/gtksourceview/pkg-plist52
-rw-r--r--x11-toolkits/libbonoboui/Makefile10
-rw-r--r--x11-toolkits/libbonoboui/distinfo6
-rw-r--r--x11-toolkits/libbonoboui/files/patch-tools::browser::oaf-helper.c16
-rw-r--r--x11-toolkits/libbonoboui/pkg-plist65
-rw-r--r--x11-toolkits/libgail-gnome/Makefile7
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile12
-rw-r--r--x11-toolkits/libgnomeprintui/pkg-plist46
-rw-r--r--x11-toolkits/libgnomeui/Makefile16
-rw-r--r--x11-toolkits/libgnomeui/distinfo6
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist78
-rw-r--r--x11-toolkits/libwnck/Makefile7
-rw-r--r--x11-toolkits/libwnck/distinfo6
-rw-r--r--x11-toolkits/libwnck/pkg-plist61
-rw-r--r--x11-toolkits/pango/Makefile21
-rw-r--r--x11-toolkits/pango/distinfo6
-rw-r--r--x11-toolkits/pango/files/patch-ac16
-rw-r--r--x11-toolkits/pango/pkg-plist6
-rw-r--r--x11-toolkits/py-gnome-desktop/Makefile21
-rw-r--r--x11-toolkits/py-gnome-desktop/distinfo6
-rw-r--r--x11-toolkits/py-gnome-desktop/pkg-plist70
-rw-r--r--x11-toolkits/py-gnome2/Makefile11
-rw-r--r--x11-toolkits/py-gnome2/distinfo6
-rw-r--r--x11-toolkits/py-gnome2/files/patch-configure18
-rw-r--r--x11-toolkits/py-gnome2/files/patch-gnomevfs_Makefile.in11
-rw-r--r--x11-toolkits/py-gnome2/pkg-plist17
-rw-r--r--x11-toolkits/py-gtk2/Makefile9
-rw-r--r--x11-toolkits/py-gtk2/distinfo6
-rw-r--r--x11-toolkits/py-gtk2/files/patch-Makefile.in11
-rw-r--r--x11-toolkits/py-gtk2/pkg-plist23
-rw-r--r--x11-toolkits/vte/Makefile8
-rw-r--r--x11-toolkits/vte/distinfo6
-rw-r--r--x11-toolkits/vte/files/patch-07_set_backspace_to_utf814
-rw-r--r--x11-toolkits/vte/files/patch-config.h.in12
-rw-r--r--x11-toolkits/vte/files/patch-configure26
-rw-r--r--x11-toolkits/vte/files/patch-src_vteseq.c10
-rw-r--r--x11-toolkits/vte/pkg-plist61
-rw-r--r--x11-wm/metacity/Makefile8
-rw-r--r--x11-wm/metacity/distinfo6
-rw-r--r--x11-wm/metacity/pkg-plist66
-rw-r--r--x11/fast-user-switch-applet/Makefile10
-rw-r--r--x11/fast-user-switch-applet/distinfo6
-rw-r--r--x11/fast-user-switch-applet/pkg-plist73
-rw-r--r--x11/gdm/Makefile10
-rw-r--r--x11/gdm/distinfo6
-rw-r--r--x11/gdm/files/gdm.in2
-rw-r--r--x11/gdm/files/patch-config_Makefile.in11
-rw-r--r--x11/gdm/files/patch-config_locale.alias2
-rw-r--r--x11/gdm/pkg-plist89
-rw-r--r--x11/gnome-applets/Makefile48
-rw-r--r--x11/gnome-applets/distinfo6
-rw-r--r--x11/gnome-applets/files/patch-aa35
-rw-r--r--x11/gnome-applets/files/patch-cpufreq-freebsd513
-rw-r--r--x11/gnome-applets/files/patch-cpufreq-selector-freebsd429
-rw-r--r--x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py13
-rw-r--r--x11/gnome-applets/files/patch-invest-applet_invest_invest-chart13
-rw-r--r--x11/gnome-applets/pkg-plist398
-rw-r--r--x11/gnome-desktop/Makefile10
-rw-r--r--x11/gnome-desktop/distinfo6
-rw-r--r--x11/gnome-desktop/pkg-plist119
-rw-r--r--x11/gnome-menus/Makefile22
-rw-r--r--x11/gnome-menus/distinfo6
-rw-r--r--x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py4
-rw-r--r--x11/gnome-menus/pkg-plist66
-rw-r--r--x11/gnome-panel/Makefile15
-rw-r--r--x11/gnome-panel/distinfo6
-rw-r--r--x11/gnome-panel/files/patch-applets_notification__area_eggtraymanager.c48
-rw-r--r--x11/gnome-panel/files/patch-applets_notification__area_main.c73
-rw-r--r--x11/gnome-panel/pkg-plist167
-rw-r--r--x11/gnome-screensaver/Makefile36
-rw-r--r--x11/gnome-screensaver/distinfo6
-rw-r--r--x11/gnome-screensaver/files/patch-src_gs-auth-pam.c11
-rw-r--r--x11/gnome-screensaver/pkg-plist65
-rw-r--r--x11/gnome-session/Makefile14
-rw-r--r--x11/gnome-session/distinfo6
-rw-r--r--x11/gnome-session/files/patch-dbus72
-rw-r--r--x11/gnome-session/files/patch-gnome-session_gsm-at-startup.c10
-rw-r--r--x11/gnome-session/files/patch-gnome-session_gsm-xrandr.c10
-rw-r--r--x11/gnome-session/pkg-plist60
-rw-r--r--x11/gnome-terminal/Makefile8
-rw-r--r--x11/gnome-terminal/distinfo6
-rw-r--r--x11/gnome-terminal/files/patch-src_terminal-screen.c12
-rw-r--r--x11/gnome-terminal/pkg-plist70
-rw-r--r--x11/gnome2-fifth-toe/Makefile10
-rw-r--r--x11/gnome2-lite/Makefile13
-rw-r--r--x11/gnome2-power-tools/Makefile11
-rw-r--r--x11/gnome2/Makefile51
-rw-r--r--x11/libgnome/Makefile10
-rw-r--r--x11/libgnome/distinfo6
-rw-r--r--x11/libgnome/files/patch-libgnome_gnome-util.c (renamed from x11/libgnome/files/patch-ag)12
-rw-r--r--x11/libgnome/files/pkg-deinstall.in8
-rw-r--r--x11/libgnome/pkg-plist55
-rw-r--r--x11/startup-notification/Makefile8
-rw-r--r--x11/xscreensaver-gnome/Makefile6
-rw-r--r--x11/xscreensaver-gnome/pkg-plist21
-rw-r--r--x11/yelp/Makefile13
-rw-r--r--x11/yelp/distinfo6
-rw-r--r--x11/yelp/files/patch-src_yelp-search-pager.c11
-rw-r--r--x11/yelp/pkg-plist67
-rw-r--r--x11/zenity/Makefile8
-rw-r--r--x11/zenity/distinfo6
-rw-r--r--x11/zenity/pkg-plist221
583 files changed, 16356 insertions, 8099 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 0b7863544103..232b2a97e1b8 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.370 2006/04/27 01:40:22 ahze Exp $
+# $MCom: ports/Mk/bsd.gnome.mk,v 1.401 2006/08/05 05:25:55 marcus Exp $
#
# Please view me with 4 column tabs!
@@ -99,7 +99,7 @@ referencehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "Makefile.in" -type f | ${XARGS
lthack_PRE_PATCH= ${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS} ${REINPLACE_CMD} -e \
'/^LIBTOOL_DEPS="$$ac_aux_dir\/ltmain.sh"$$/s|$$|; $$ac_aux_dir/ltconfig $$LIBTOOL_DEPS;|'
-GNOME_MTREE_FILE?= ${X11BASE}/etc/mtree/BSD.gnome-x11.dist
+GNOME_MTREE_FILE?= ${LOCALBASE}/etc/mtree/BSD.gnome.dist
gnomehier_DETECT= ${GNOME_MTREE_FILE}
gnomehier_RUN_DEPENDS= ${gnomehier_DETECT}:${PORTSDIR}/misc/gnomehier
@@ -116,6 +116,9 @@ gnomeprefix_CONFIGURE_ARGS=--localstatedir=${DESTDIR}${GNOME_LOCALSTATEDIR} \
--disable-gtk-doc \
--with-gconf-source=${GCONF_CONFIG_SOURCE}
gnomeprefix_USE_GNOME_IMPL=gnomehier
+.if !defined(WITHOUT_HACK)
+gnomeprefix_PREFIX=${LOCALBASE}
+.endif
gnometarget_CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -135,7 +138,7 @@ glib12_MAKE_ENV= GLIB_CONFIG="${GLIB_CONFIG}"
glib12_DETECT= ${GLIB_CONFIG}
glib12_USE_GNOME_IMPL= pkgconfig
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+GTK_CONFIG?= ${LOCALBASE}/bin/gtk12-config
gtk12_LIB_DEPENDS= gtk-12.2:${PORTSDIR}/x11-toolkits/gtk12
gtk12_CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
gtk12_MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
@@ -156,21 +159,21 @@ orbit_MAKE_ENV= ORBIT_CONFIG="${ORBIT_CONFIG}"
orbit_DETECT= ${ORBIT_CONFIG}
orbit_USE_GNOME_IMPL= glib12
-GDK_PIXBUF_CONFIG?= ${X11BASE}/bin/gdk-pixbuf-config
+GDK_PIXBUF_CONFIG?= ${LOCALBASE}/bin/gdk-pixbuf-config
gdkpixbuf_LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
gdkpixbuf_CONFIGURE_ENV=GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}"
gdkpixbuf_MAKE_ENV= GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}"
gdkpixbuf_DETECT= ${GDK_PIXBUF_CONFIG}
gdkpixbuf_USE_GNOME_IMPL=gtk12
-IMLIB_CONFIG?= ${X11BASE}/bin/imlib-config
+IMLIB_CONFIG?= ${LOCALBASE}/bin/imlib-config
imlib_LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib
imlib_CONFIGURE_ENV= IMLIB_CONFIG="${IMLIB_CONFIG}"
imlib_MAKE_ENV= IMLIB_CONFIG="${IMLIB_CONFIG}"
imlib_DETECT= ${IMLIB_CONFIG}
imlib_USE_GNOME_IMPL= gtk12
-GNOME_CONFIG?= ${X11BASE}/bin/gnome-config
+GNOME_CONFIG?= ${LOCALBASE}/bin/gnome-config
gnomelibs_LIB_DEPENDS= gnome.5:${PORTSDIR}/x11/gnome-libs
gnomelibs_CONFIGURE_ENV=GNOME_CONFIG="${GNOME_CONFIG}"
gnomelibs_MAKE_ENV= GNOME_CONFIG="${GNOME_CONFIG}"
@@ -178,29 +181,29 @@ gnomelibs_DETECT= ${GNOME_CONFIG}
gnomelibs_USE_GNOME_IMPL=esound gtk12 imlib libxml orbit
gnomecanvas_LIB_DEPENDS=gnomecanvaspixbuf.1:${PORTSDIR}/graphics/gnomecanvas
-gnomecanvas_DETECT= ${X11BASE}/etc/gnomecanvaspixbufConf.sh
+gnomecanvas_DETECT= ${LOCALBASE}/etc/gnomecanvaspixbufConf.sh
gnomecanvas_USE_GNOME_IMPL=gnomelibs gdkpixbuf
-OAF_CONFIG?= ${X11BASE}/bin/oaf-config
+OAF_CONFIG?= ${LOCALBASE}/bin/oaf-config
oaf_LIB_DEPENDS= oaf.0:${PORTSDIR}/devel/oaf
oaf_CONFIGURE_ENV= OAF_CONFIG="${OAF_CONFIG}"
oaf_MAKE_ENV= OAF_CONFIG="${OAF_CONFIG}"
oaf_DETECT= ${OAF_CONFIG}
oaf_USE_GNOME_IMPL= glib12 orbit libxml
-gnomemimedata_DETECT= ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc
+gnomemimedata_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc
gnomemimedata_BUILD_DEPENDS=${gnomemimedata_DETECT}:${PORTSDIR}/misc/gnome-mime-data
gnomemimedata_RUN_DEPENDS=${gnomemimedata_DETECT}:${PORTSDIR}/misc/gnome-mime-data
gnomemimedata_USE_GNOME_IMPL=gnomehier pkgconfig
-GCONF_CONFIG?= ${X11BASE}/bin/gconf-config
+GCONF_CONFIG?= ${LOCALBASE}/bin/gconf-config
gconf_LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf
gconf_CONFIGURE_ENV= GCONF_CONFIG="${GCONF_CONFIG}"
gconf_MAKE_ENV= GCONF_CONFIG="${GCONF_CONFIG}"
gconf_DETECT= ${GCONF_CONFIG}
gconf_USE_GNOME_IMPL= oaf
-GNOME_VFS_CONFIG?= ${X11BASE}/bin/gnome-vfs-config
+GNOME_VFS_CONFIG?= ${LOCALBASE}/bin/gnome-vfs-config
gnomevfs_LIB_DEPENDS= gnomevfs.0:${PORTSDIR}/devel/gnome-vfs1
gnomevfs_CONFIGURE_ENV= GNOME_VFS_CONFIG="${GNOME_VFS_CONFIG}"
gnomevfs_MAKE_ENV= GNOME_VFS_CONFIG="${GNOME_VFS_CONFIG}"
@@ -208,32 +211,32 @@ gnomevfs_DETECT= ${GNOME_VFS_CONFIG}
gnomevfs_USE_GNOME_IMPL=gnomemimedata gconf gnomelibs
libcapplet_LIB_DEPENDS= capplet.5:${PORTSDIR}/x11/libcapplet
-libcapplet_DETECT= ${X11BASE}/etc/cappletConf.sh
+libcapplet_DETECT= ${LOCALBASE}/etc/cappletConf.sh
libcapplet_USE_GNOME_IMPL=gnomelibs
gnomeprint_LIB_DEPENDS= gnomeprint.16:${PORTSDIR}/print/gnome-print
-gnomeprint_DETECT= ${X11BASE}/etc/printConf.sh
+gnomeprint_DETECT= ${LOCALBASE}/etc/printConf.sh
gnomeprint_USE_GNOME_IMPL=gnomelibs gnomecanvas
bonobo_LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo
-bonobo_DETECT= ${X11BASE}/etc/bonoboConf.sh
+bonobo_DETECT= ${LOCALBASE}/etc/bonoboConf.sh
bonobo_USE_GNOME_IMPL= oaf gnomeprint
-GDA_CONFIG?= ${X11BASE}/bin/gda-config
+GDA_CONFIG?= ${LOCALBASE}/bin/gda-config
libgda_LIB_DEPENDS= gda-client.0:${PORTSDIR}/databases/libgda
libgda_CONFIGURE_ENV= GDA_CONFIG="${GDA_CONFIG}"
libgda_MAKE_ENV= GDA_CONFIG="${GDA_CONFIG}"
libgda_DETECT= ${GDA_CONFIG}
libgda_USE_GNOME_IMPL= gconf bonobo
-GNOMEDB_CONFIG?= ${X11BASE}/bin/gnomedb-config
+GNOMEDB_CONFIG?= ${LOCALBASE}/bin/gnomedb-config
gnomedb_LIB_DEPENDS= gnomedb.0:${PORTSDIR}/databases/gnome-db
gnomedb_CONFIGURE_ENV= GNOMEDB_CONFIG="${GNOMEDB_CONFIG}"
gnomedb_MAKE_ENV= GNOMEDB_CONFIG="${GNOMEDB_CONFIG}"
gnomedb_DETECT= ${GNOMEDB_CONFIG}
gnomedb_USE_GNOME_IMPL= libgda
-LIBGLADE_CONFIG?= ${X11BASE}/bin/libglade-config
+LIBGLADE_CONFIG?= ${LOCALBASE}/bin/libglade-config
libglade_LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade
libglade_CONFIGURE_ENV= LIBGLADE_CONFIG="${LIBGLADE_CONFIG}"
libglade_MAKE_ENV= LIBGLADE_CONFIG="${LIBGLADE_CONFIG}"
@@ -241,15 +244,15 @@ libglade_DETECT= ${LIBGLADE_CONFIG}
libglade_USE_GNOME_IMPL=gnomedb
gal_LIB_DEPENDS= gal.23:${PORTSDIR}/x11-toolkits/gal
-gal_DETECT= ${X11BASE}/etc/galConf.sh
+gal_DETECT= ${LOCALBASE}/etc/galConf.sh
gal_USE_GNOME_IMPL= libglade
glibwww_LIB_DEPENDS= glibwww.1:${PORTSDIR}/www/glibwww
-glibwww_DETECT= ${X11BASE}/etc/glibwwwConf.sh
+glibwww_DETECT= ${LOCALBASE}/etc/glibwwwConf.sh
glibwww_USE_GNOME_IMPL= gnomelibs
gtkhtml_LIB_DEPENDS= gtkhtml-1.1.3:${PORTSDIR}/www/gtkhtml
-gtkhtml_DETECT= ${X11BASE}/etc/gtkhtmlConf.sh
+gtkhtml_DETECT= ${LOCALBASE}/etc/gtkhtmlConf.sh
gtkhtml_USE_GNOME_IMPL= glibwww gal libghttp libcapplet
pygtk_DETECT= ${LOCALBASE}/bin/pygtk-codegen-1.2
@@ -271,13 +274,13 @@ atk_DETECT= ${LOCALBASE}/libdata/pkgconfig/atk.pc
atk_USE_GNOME_IMPL= glib20
pango_LIB_DEPENDS= pango-1.0.0:${PORTSDIR}/x11-toolkits/pango
-pango_DETECT= ${X11BASE}/libdata/pkgconfig/pango.pc
+pango_DETECT= ${LOCALBASE}/libdata/pkgconfig/pango.pc
pango_USE_GNOME_IMPL= glib20
gtk20_LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
-gtk20_DETECT= ${X11BASE}/libdata/pkgconfig/gtk+-x11-2.0.pc
+gtk20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtk+-x11-2.0.pc
gtk20_USE_GNOME_IMPL= intltool atk pango
-GTK2_VERSION= 2.4.0
+GTK2_VERSION= 2.10.0
linc_LIB_DEPENDS= linc.1:${PORTSDIR}/net/linc
linc_DETECT= ${LOCALBASE}/libdata/pkgconfig/linc.pc
@@ -292,7 +295,7 @@ orbit2_DETECT= ${LOCALBASE}/libdata/pkgconfig/ORBit-2.0.pc
orbit2_USE_GNOME_IMPL= libidl
libglade2_LIB_DEPENDS= glade-2.0.0:${PORTSDIR}/devel/libglade2
-libglade2_DETECT= ${X11BASE}/libdata/pkgconfig/libglade-2.0.pc
+libglade2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libglade-2.0.pc
libglade2_USE_GNOME_IMPL=libxml2 gtk20
libxml2_LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
@@ -308,19 +311,19 @@ libbonobo_DETECT= ${LOCALBASE}/libdata/pkgconfig/libbonobo-2.0.pc
libbonobo_USE_GNOME_IMPL=libxml2 orbit2
gconf2_LIB_DEPENDS= gconf-2.4:${PORTSDIR}/devel/gconf2
-gconf2_DETECT= ${X11BASE}/libdata/pkgconfig/gconf-2.0.pc
+gconf2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gconf-2.0.pc
gconf2_USE_GNOME_IMPL= orbit2 libxml2 gtk20 linc
gnomevfs2_LIB_DEPENDS= gnomevfs-2.0:${PORTSDIR}/devel/gnome-vfs
-gnomevfs2_DETECT= ${X11BASE}/libdata/pkgconfig/gnome-vfs-2.0.pc
+gnomevfs2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-vfs-2.0.pc
gnomevfs2_USE_GNOME_IMPL=gconf2 libbonobo gnomemimedata
-gail_LIB_DEPENDS= gailutil.17:${PORTSDIR}/accessibility/gail
-gail_DETECT= ${X11BASE}/libdata/pkgconfig/gail.pc
+gail_LIB_DEPENDS= gailutil.18:${PORTSDIR}/accessibility/gail
+gail_DETECT= ${LOCALBASE}/libdata/pkgconfig/gail.pc
gail_USE_GNOME_IMPL= libgnomecanvas
libgnomecanvas_LIB_DEPENDS= gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas
-libgnomecanvas_DETECT= ${X11BASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc
+libgnomecanvas_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc
libgnomecanvas_USE_GNOME_IMPL= libglade2 libartlgpl2
libartlgpl2_LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl
@@ -328,98 +331,98 @@ libartlgpl2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libart-2.0.pc
libartlgpl2_USE_GNOME_IMPL= pkgconfig
libgnomeprint_LIB_DEPENDS= gnomeprint-2-2.0:${PORTSDIR}/print/libgnomeprint
-libgnomeprint_DETECT= ${X11BASE}/libdata/pkgconfig/libgnomeprint-2.2.pc
+libgnomeprint_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomeprint-2.2.pc
libgnomeprint_USE_GNOME_IMPL= libbonobo libartlgpl2 gtk20
libgnomeprintui_LIB_DEPENDS= gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
-libgnomeprintui_DETECT= ${X11BASE}/libdata/pkgconfig/libgnomeprintui-2.2.pc
+libgnomeprintui_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomeprintui-2.2.pc
libgnomeprintui_USE_GNOME_IMPL= libgnomeprint libgnomecanvas
libgnome_LIB_DEPENDS= gnome-2.0:${PORTSDIR}/x11/libgnome
-libgnome_DETECT= ${X11BASE}/libdata/pkgconfig/libgnome-2.0.pc
+libgnome_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnome-2.0.pc
libgnome_USE_GNOME_IMPL=libxslt gnomevfs2 esound
libbonoboui_LIB_DEPENDS= bonoboui-2.0:${PORTSDIR}/x11-toolkits/libbonoboui
-libbonoboui_DETECT= ${X11BASE}/libdata/pkgconfig/libbonoboui-2.0.pc
+libbonoboui_DETECT= ${LOCALBASE}/libdata/pkgconfig/libbonoboui-2.0.pc
libbonoboui_USE_GNOME_IMPL= libgnomecanvas libgnome
libgnomeui_LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
-libgnomeui_DETECT= ${X11BASE}/libdata/pkgconfig/libgnomeui-2.0.pc
+libgnomeui_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomeui-2.0.pc
libgnomeui_USE_GNOME_IMPL= libbonoboui
atspi_LIB_DEPENDS= spi.10:${PORTSDIR}/accessibility/at-spi
-atspi_DETECT= ${X11BASE}/libdata/pkgconfig/cspi-1.0.pc
+atspi_DETECT= ${LOCALBASE}/libdata/pkgconfig/cspi-1.0.pc
atspi_USE_GNOME_IMPL= gail libbonobo
-libgailgnome_DETECT= ${X11BASE}/libdata/pkgconfig/libgail-gnome.pc
+libgailgnome_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgail-gnome.pc
libgailgnome_RUN_DEPENDS= ${libgailgnome_DETECT}:${PORTSDIR}/x11-toolkits/libgail-gnome
libgailgnome_USE_GNOME_IMPL= libgnomeui atspi
libgtkhtml_LIB_DEPENDS= gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml
-libgtkhtml_DETECT= ${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc
+libgtkhtml_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc
libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2 gail
gnomedesktop_LIB_DEPENDS= gnome-desktop-2.2:${PORTSDIR}/x11/gnome-desktop
-gnomedesktop_DETECT= ${X11BASE}/libdata/pkgconfig/gnome-desktop-2.0.pc
+gnomedesktop_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-2.0.pc
gnomedesktop_USE_GNOME_IMPL= libgnomeui gnomedocutils
gnomedesktop_GNOME_DESKTOP_VERSION=2
libwnck_LIB_DEPENDS= wnck-1.18:${PORTSDIR}/x11-toolkits/libwnck
-libwnck_DETECT= ${X11BASE}/libdata/pkgconfig/libwnck-1.0.pc
+libwnck_DETECT= ${LOCALBASE}/libdata/pkgconfig/libwnck-1.0.pc
libwnck_USE_GNOME_IMPL= gtk20
-vte_LIB_DEPENDS= vte.4:${PORTSDIR}/x11-toolkits/vte
-vte_DETECT= ${X11BASE}/libdata/pkgconfig/vte.pc
+vte_LIB_DEPENDS= vte.9:${PORTSDIR}/x11-toolkits/vte
+vte_DETECT= ${LOCALBASE}/libdata/pkgconfig/vte.pc
vte_USE_GNOME_IMPL= gtk20
libzvt_LIB_DEPENDS= zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt
-libzvt_DETECT= ${X11BASE}/libdata/pkgconfig/libzvt-2.0.pc
+libzvt_DETECT= ${LOCALBASE}/libdata/pkgconfig/libzvt-2.0.pc
libzvt_USE_GNOME_IMPL= gtk20
librsvg2_LIB_DEPENDS= rsvg-2.2:${PORTSDIR}/graphics/librsvg2
-librsvg2_DETECT= ${X11BASE}/libdata/pkgconfig/librsvg-2.0.pc
+librsvg2_DETECT= ${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc
librsvg2_USE_GNOME_IMPL=libgsf gtk20
eel2_LIB_DEPENDS= eel-2.2:${PORTSDIR}/x11-toolkits/eel
-eel2_DETECT= ${X11BASE}/libdata/pkgconfig/eel-2.0.pc
+eel2_DETECT= ${LOCALBASE}/libdata/pkgconfig/eel-2.0.pc
eel2_USE_GNOME_IMPL= gnomemenus gnomedesktop gail
gnomepanel_LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnome-panel
-gnomepanel_DETECT= ${X11BASE}/libdata/pkgconfig/libpanelapplet-2.0.pc
+gnomepanel_DETECT= ${LOCALBASE}/libdata/pkgconfig/libpanelapplet-2.0.pc
gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils
gnomepanel_GNOME_DESKTOP_VERSION=2
nautilus2_LIB_DEPENDS= nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus
-nautilus2_DETECT= ${X11BASE}/libdata/pkgconfig/libnautilus-extension.pc
+nautilus2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libnautilus-extension.pc
nautilus2_USE_GNOME_IMPL=librsvg2 eel2 gnomedesktop desktopfileutils
nautilus2_GNOME_DESKTOP_VERSION=2
metacity_LIB_DEPENDS= metacity-private.0:${PORTSDIR}/x11-wm/metacity
-metacity_DETECT= ${X11BASE}/libdata/pkgconfig/libmetacity-private.pc
+metacity_DETECT= ${LOCALBASE}/libdata/pkgconfig/libmetacity-private.pc
metacity_USE_GNOME_IMPL=gconf2
gal2_LIB_DEPENDS= gal-2.4.0:${PORTSDIR}/x11-toolkits/gal2
-gal2_DETECT= ${X11BASE}/libdata/pkgconfig/gal-2.4.pc
+gal2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gal-2.4.pc
gal2_USE_GNOME_IMPL=gnomeui libgnomeprintui
gnomecontrolcenter2_LIB_DEPENDS=gnome-window-settings.1:${PORTSDIR}/sysutils/gnome-control-center
-gnomecontrolcenter2_DETECT=${X11BASE}/libdata/pkgconfig/gnome-window-settings-2.0.pc
+gnomecontrolcenter2_DETECT=${LOCALBASE}/libdata/pkgconfig/gnome-window-settings-2.0.pc
gnomecontrolcenter2_USE_GNOME_IMPL=desktopfileutils gnomedesktop gnomemenus metacity nautilus2 desktopfileutils
libgda2_LIB_DEPENDS= gda-2.3:${PORTSDIR}/databases/libgda2
-libgda2_DETECT= ${X11BASE}/libdata/pkgconfig/libgda.pc
+libgda2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda.pc
libgda2_USE_GNOME_IMPL= glib20 libxslt
libgda3_LIB_DEPENDS= gda-3.3:${PORTSDIR}/databases/libgda3
-libgda3_DETECT= ${X11BASE}/libdata/pkgconfig/libgda-2.0.pc
+libgda3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda-2.0.pc
libgda3_USE_GNOME_IMPL= glib20 libxslt
libgnomedb_LIB_DEPENDS= gnomedb-3.4:${PORTSDIR}/databases/libgnomedb
-libgnomedb_DETECT= ${X11BASE}/libdata/pkgconfig/libgnomedb.pc
+libgnomedb_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomedb.pc
libgnomedb_USE_GNOME_IMPL=libgnomeui libgda3
gtksourceview_LIB_DEPENDS= gtksourceview-1.0.0:${PORTSDIR}/x11-toolkits/gtksourceview
-gtksourceview_DETECT= ${X11BASE}/libdata/pkgconfig/gtksourceview-1.0.pc
+gtksourceview_DETECT= ${LOCALBASE}/libdata/pkgconfig/gtksourceview-1.0.pc
gtksourceview_USE_GNOME_IMPL=libgnome libgnomeprintui
pkgconfig_DETECT= ${LOCALBASE}/bin/pkg-config
@@ -427,11 +430,11 @@ pkgconfig_BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
pkgconfig_RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
libgsf_LIB_DEPENDS= gsf-1.114:${PORTSDIR}/devel/libgsf
-libgsf_DETECT= ${X11BASE}/libdata/pkgconfig/libgsf-1.pc
+libgsf_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgsf-1.pc
libgsf_USE_GNOME_IMPL= gconf2 glib20 libxml2
libgsf_gnome_LIB_DEPENDS= gsf-gnome-1.114:${PORTSDIR}/devel/libgsf-gnome
-libgsf_gnome_DETECT= ${X11BASE}/libdata/pkgconfig/libgsf-gnome-1.pc
+libgsf_gnome_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgsf-gnome-1.pc
libgsf_gnome_USE_GNOME_IMPL= libgsf gnomevfs2
pygtk2_DETECT= ${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc
@@ -455,7 +458,7 @@ intlhack_PRE_PATCH= ${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${RE
intlhack_USE_GNOME_IMPL=intltool
gtkhtml3_LIB_DEPENDS= gtkhtml-3.8.15:${PORTSDIR}/www/gtkhtml3
-gtkhtml3_DETECT= ${X11BASE}/libdata/pkgconfig/libgtkhtml-3.8.pc
+gtkhtml3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-3.8.pc
gtkhtml3_USE_GNOME_IMPL=gail libgnomeui libgnomeprintui
gnomespeech_LIB_DEPENDS=gnomespeech.7:${PORTSDIR}/accessibility/gnome-speech
@@ -463,19 +466,19 @@ gnomespeech_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-speech-1.0.pc
gnomespeech_USE_GNOME_IMPL=libbonobo
evolutiondataserver_LIB_DEPENDS=edataserver-1.2.7:${PORTSDIR}/databases/evolution-data-server
-evolutiondataserver_DETECT= ${X11BASE}/libdata/pkgconfig/evolution-data-server-1.2.pc
+evolutiondataserver_DETECT= ${LOCALBASE}/libdata/pkgconfig/evolution-data-server-1.2.pc
evolutiondataserver_USE_GNOME_IMPL=libgnomeui
desktopfileutils_RUN_DEPENDS=update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
desktopfileutils_DETECT= ${LOCALBASE}/bin/update-desktop-database
desktopfileutils_USE_GNOME_IMPL=glib20
-nautiluscdburner_LIB_DEPENDS=nautilus-burn.3:${PORTSDIR}/sysutils/nautilus-cd-burner
-nautiluscdburner_DETECT= ${X11BASE}/libdata/pkgconfig/libnautilus-burn.pc
+nautiluscdburner_LIB_DEPENDS=nautilus-burn.4:${PORTSDIR}/sysutils/nautilus-cd-burner
+nautiluscdburner_DETECT= ${LOCALBASE}/libdata/pkgconfig/libnautilus-burn.pc
nautiluscdburner_USE_GNOME_IMPL=nautilus2
gnomemenus_LIB_DEPENDS= gnome-menu.2:${PORTSDIR}/x11/gnome-menus
-gnomemenus_DETECT= ${X11BASE}/libdata/pkgconfig/libgnome-menu.pc
+gnomemenus_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnome-menu.pc
gnomemenus_USE_GNOME_IMPL= gnomevfs2
pygnomeextras_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-python-extras-2.0.pc
@@ -483,7 +486,7 @@ pygnomeextras_BUILD_DEPENDS= ${pygnomeextras_DETECT}:${PORTSDIR}/x11-toolkits/py
pygnomeextras_RUN_DEPENDS= ${pygnomeextras_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome-extras
pygnomeextras_USE_GNOME_IMPL=pygnome2 libgtkhtml
-gnomedocutils_DETECT= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc
+gnomedocutils_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-doc-utils.pc
gnomedocutils_BUILD_DEPENDS=${gnomedocutils_DETECT}:${PORTSDIR}/textproc/gnome-doc-utils
gnomedocutils_RUN_DEPENDS=${gnomedocutils_DETECT}:${PORTSDIR}/textproc/gnome-doc-utils
gnomedocutils_USE_GNOME_IMPL=libxslt
@@ -624,7 +627,7 @@ IGNORE+=the GNOME ${GNOME_DESKTOP_VERSION} desktop
. endif
. endif
. if ${_USE_GNOME_ALL:M${component}}==""
-IGNORE= cannot install: unknown component ${component}
+IGNORE= cannot install: Unknown component ${component}
. endif
_USE_GNOME+= ${${component}_USE_GNOME_IMPL} ${component}
. endfor
@@ -647,7 +650,7 @@ ltverhack_PRE_PATCH= ${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \
done;
.else
. if ${USE_GNOME:Mltverhack}!=""
-IGNORE= cannot install: ${PORTNAME} uses the ltverhack GNOME component but does not use libtool
+BROKEN= cannot install: ${PORTNAME} uses the ltverhack GNOME component but does not use libtool
. endif
.endif
@@ -673,6 +676,18 @@ BUILD_DEPENDS+= ${${component}_BUILD_DEPENDS}
LIB_DEPENDS+= ${${component}_LIB_DEPENDS}
RUN_DEPENDS+= ${${component}_RUN_DEPENDS}
+.if !defined(WITHOUT_HACK)
+.if defined(${component}_PREFIX)
+.if ${.MAKEFLAGS:MPREFIX=*}==""
+PREFIX= ${${component}_PREFIX}
+.endif
+.if defined(USE_X_PREFIX)
+.undef USE_X_PREFIX
+USE_XLIB= yes
+.endif
+.endif
+.endif
+
CONFIGURE_ARGS+=${${component}_CONFIGURE_ARGS}
CONFIGURE_ENV+= ${${component}_CONFIGURE_ENV}
MAKE_ENV+= ${${component}_MAKE_ENV}
@@ -728,7 +743,7 @@ gnome-pre-su-install:
@${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE_FILE}/} ${TARGETDIR}/ >/dev/null
.endif
.if defined(GCONF_SCHEMAS)
- @${MKDIR} ${TARGETDIR}/etc/gconf/gconf.xml.defaults/
+ @${MKDIR} ${DESTDIR}${PREFIX}/etc/gconf/gconf.xml.defaults/
.else
@${DO_NADA}
.endif
@@ -758,11 +773,11 @@ gnome-post-install:
@for i in `${GREP} "^share/icons/.*/" ${TMPPLIST} | ${CUT} -d / -f 1-3 | ${SORT} -u`; do \
${ECHO_CMD} "@unexec /bin/rm %D/$${i}/icon-theme.cache 2>/dev/null || /usr/bin/true" \
>> ${TMPPLIST}.icons1; \
- ${ECHO_CMD} "@exec ${X11BASE}/bin/gtk-update-icon-cache -q -f %D/$${i} 2>/dev/null || /usr/bin/true" \
+ ${ECHO_CMD} "@exec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/$${i} 2>/dev/null || /usr/bin/true" \
>> ${TMPPLIST}; \
- ${ECHO_CMD} "@unexec ${X11BASE}/bin/gtk-update-icon-cache -q -f %D/$${i} 2>/dev/null || /usr/bin/true" \
+ ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/$${i} 2>/dev/null || /usr/bin/true" \
>> ${TMPPLIST}; \
- ${X11BASE}/bin/gtk-update-icon-cache -q -f ${PREFIX}/$${i} 2>/dev/null || ${TRUE}; \
+ ${LOCALBASE}/bin/gtk-update-icon-cache -q -f ${PREFIX}/$${i} 2>/dev/null || ${TRUE}; \
done
@if test -f ${TMPPLIST}.icons1; then \
${CAT} ${TMPPLIST}.icons1 ${TMPPLIST} > ${TMPPLIST}.icons2; \
diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk
index 197f1f05d912..d91d3d296932 100644
--- a/Mk/bsd.gstreamer.mk
+++ b/Mk/bsd.gstreamer.mk
@@ -7,7 +7,7 @@
# Date: 4 Oct 2004
#
# $FreeBSD$
-# $MCom: ports/Mk/bsd.gstreamer.mk,v 1.24 2006/04/25 14:45:31 ahze Exp $
+# $MCom: ports/Mk/bsd.gstreamer.mk,v 1.38 2006/10/10 20:22:01 mezz Exp $
.if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include)
@@ -49,8 +49,8 @@ Gstreamer_Pre_Include= bsd.gstreamer.mk
GSTREAMER_PORT= ${PORTSDIR}/multimedia/gstreamer-plugins
GSTREAMER80_PORT= ${GSTREAMER_PORT}80
-_GST_LIB_BASE= ${X11BASE}/lib/gstreamer-${GST_VERSION}
-_GST80_LIB_BASE= ${X11BASE}/lib/gstreamer-${GST80_VERSION}
+_GST_LIB_BASE= ${LOCALBASE}/lib/gstreamer-${GST_VERSION}
+_GST80_LIB_BASE= ${LOCALBASE}/lib/gstreamer-${GST80_VERSION}
GST_VERSION= 0.10
GST_MINOR_VERSION= .0
GST80_VERSION= 0.8
@@ -60,11 +60,11 @@ GST80_SHLIB_VERSION= 1
#
# These are the current supported gstreamer-plugins modules
#
-_USE_GSTREAMER_ALL= a52dec aalib bad cairo cdparanoia dts \
+_USE_GSTREAMER_ALL= a52dec aalib annodex bad bz2 cairo cdparanoia dts \
dv dvd esound faac faad ffmpeg flac gconf gnomevfs \
- gnonlin good gsm ivorbis jpeg ladspa lame libcaca \
+ gnonlin good gsm hal ivorbis jpeg ladspa lame libcaca \
libmms libpng libvisual mad mpeg2dec \
- musepack ogg pango python sdl shout2 sidplay \
+ musepack neon ogg pango pulse python sdl shout2 sidplay \
speex theora ugly vorbis wavpack xvid
_USE_GSTREAMER80_ALL= a52dec aalib artsd audiofile cairo cdaudio cdio cdparanoia \
dirac dts dv dvd esound faac faad ffmpeg flac \
@@ -72,8 +72,8 @@ _USE_GSTREAMER80_ALL= a52dec aalib artsd audiofile cairo cdaudio cdio cdparanoia
jpeg-mmx ladspa lame libcaca libfame libmms libmng \
libpng libvisual mad mikmod mpeg2dec mpeg2enc mplex \
musepack musicbrainz nas sdl shout shout2 sidplay \
- smoothwave sndfile speex theora ogg pango polyp python \
- swfdec vorbis wavpack x264 xvid
+ smoothwave sndfile speex theora ogg pango polyp \
+ python swfdec vorbis wavpack x264 xvid
# other plugins
OTHER_GSTREAMER_PLUGINS+= core yes
OTHER_GSTREAMER80_PLUGINS+= ${OTHER_GSTREAMER_PLUGINS}
@@ -115,6 +115,8 @@ gsm_DEPENDS= audio/gstreamer-plugins-gsm
ivorbis_DEPENDS= audio/gstreamer-plugins-ivorbis
+hal_DEPENDS= sysutils/gstreamer-plugins-hal
+
jack_DEPENDS= audio/gstreamer-plugins-jack
ladspa_DEPENDS= audio/gstreamer-plugins-ladspa
@@ -131,10 +133,15 @@ musicbrainz_DEPENDS= audio/gstreamer-plugins-musicbrainz
nas_DEPENDS= audio/gstreamer-plugins-nas
+neon_DEPENDS= www/gstreamer-plugins-neon
+
ogg_DEPENDS= audio/gstreamer-plugins-ogg
polyp_DEPENDS= audio/gstreamer-plugins-polyp
+pulse_DEPENDS= audio/gstreamer-plugins-pulse
+pulse_GST_VERSION= 0.9.3
+
shout_DEPENDS= audio/gstreamer-plugins-shout
shout2_DEPENDS= audio/gstreamer-plugins-shout2
@@ -159,6 +166,8 @@ sdl_DEPENDS= devel/gstreamer-plugins-sdl
# Graphics Plugins Section
aalib_DEPENDS= graphics/gstreamer-plugins-aalib
+annodex_DEPENDS= multimedia/gstreamer-plugins-annodex
+
cairo_DEPENDS= graphics/gstreamer-plugins-cairo
gdkpixbuf_DEPENDS= graphics/gstreamer-plugins-gdkpixbuf
@@ -182,6 +191,8 @@ swfdec_DEPENDS= graphics/gstreamer-plugins-swfdec
# Multimedia Plugins Section
bad_DEPENDS= multimedia/gstreamer-plugins-bad
+bz2_DEPENDS= multimedia/gstreamer-plugins-bz2
+
dirac_DEPENDS= multimedia/gstreamer-plugins-dirac
ffmpeg_DEPENDS= multimedia/gstreamer-ffmpeg
@@ -210,14 +221,14 @@ mpeg2enc_DEPENDS= multimedia/gstreamer-plugins-mpeg2enc
mplex_DEPENDS= multimedia/gstreamer-plugins-mplex
-python_DEPENDS= multimedia/py-gstreamer
-python_NAME= gstreamer
-python_GST80_SUFX= 80
-python_GST80_PREFIX= ${PYTHON_PKGNAMEPREFIX}
-python_GST_PREFIX= ${PYTHON_PKGNAMEPREFIX}
-python_GST_SUFX= # empty
-python_GST80_VERSION= 0.8.2
-python_GST_VERSION= 0.10.4
+python_DEPENDS= multimedia/py-gstreamer
+python_NAME= gstreamer
+python_GST80_SUFX= 80
+python_GST80_PREFIX= ${PYTHON_PKGNAMEPREFIX}
+python_GST_PREFIX= ${PYTHON_PKGNAMEPREFIX}
+python_GST_SUFX= # empty
+python_GST80_VERSION= 0.8.2
+python_GST_VERSION= 0.10.4
theora_DEPENDS= multimedia/gstreamer-plugins-theora
@@ -242,15 +253,6 @@ ${ext}_GST80_SUFX?= 80
${ext}_GST80_PREFIX?= gstreamer-plugins-
${ext}_GST80_VERSION?= ${GST80_VERSION}${GST80_MINOR_VERSION}
${ext}_NAME?= ${ext}
-.endfor
-.for ext in ${USE_GSTREAMER}
-${ext}_GST_PREFIX?= gstreamer-plugins-
-${ext}_GST_VERSION?= ${GST_VERSION}${GST_MINOR_VERSION}
-${ext}_NAME?= ${ext}
-.endfor
-
-.if defined(USE_GSTREAMER80)
-.for ext in ${USE_GSTREAMER80}
. if ${_USE_GSTREAMER80_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_DEPENDS}${${ext}_GST80_SUFX})
BUILD_DEPENDS+= ${${ext}_GST80_PREFIX}${${ext}_NAME}${${ext}_GST80_SUFX}>=${${ext}_GST80_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}${${ext}_GST80_SUFX}
RUN_DEPENDS+= ${${ext}_GST80_PREFIX}${${ext}_NAME}${${ext}_GST80_SUFX}>=${${ext}_GST80_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}${${ext}_GST80_SUFX}
@@ -258,9 +260,10 @@ RUN_DEPENDS+= ${${ext}_GST80_PREFIX}${${ext}_NAME}${${ext}_GST80_SUFX}>=${${ext}
IGNORE= cannot install: unknown gstreamer-plugin -- ${ext}
. endif
.endfor
-.endif
-.if defined(USE_GSTREAMER)
.for ext in ${USE_GSTREAMER}
+${ext}_GST_PREFIX?= gstreamer-plugins-
+${ext}_GST_VERSION?= ${GST_VERSION}${GST_MINOR_VERSION}
+${ext}_NAME?= ${ext}
. if ${_USE_GSTREAMER_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_DEPENDS})
BUILD_DEPENDS+= ${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
RUN_DEPENDS+= ${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
@@ -268,7 +271,6 @@ RUN_DEPENDS+= ${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSD
IGNORE= cannot install: unknown gstreamer-plugin -- ${ext}
. endif
.endfor
-.endif
# The End
.endif
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index a8570acc45e7..9eee74bad0bf 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.43 2006/04/13 07:52:28 bland Exp $
+# $MCom: ports/accessibility/at-spi/Makefile,v 1.50 2006/10/02 00:50:26 ahze Exp $
#
PORTNAME= at-spi
-PORTVERSION= 1.7.7
-PORTREVISION?= 1
+PORTVERSION= 1.7.12
+PORTREVISION?= 0
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -25,7 +25,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier intltool gail libbonobo \
intlhack
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
index 8faba5778802..3eb907c9ae11 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/at-spi-1.7.7.tar.bz2) = 2988cd21d9f292fd404a8c532fe2723d
-SHA256 (gnome2/at-spi-1.7.7.tar.bz2) = 8e5a5a9be3e3c26068b98fbcd37e44a6c377b1d8f97735339e8dd1215b506ad6
-SIZE (gnome2/at-spi-1.7.7.tar.bz2) = 696704
+MD5 (gnome2/at-spi-1.7.12.tar.bz2) = ca4e69bb28c409e25bbc10293fa34941
+SHA256 (gnome2/at-spi-1.7.12.tar.bz2) = e4527b98874526b9ff8300f84879a154884ae9d8278d0ab6f926ab03209613e4
+SIZE (gnome2/at-spi-1.7.12.tar.bz2) = 787767
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index b49d6437b46b..4e55eb592269 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -10,6 +10,7 @@ include/at-spi-1.0/libspi/application.h
include/at-spi-1.0/libspi/base.h
include/at-spi-1.0/libspi/component.h
include/at-spi-1.0/libspi/devicelistener.h
+include/at-spi-1.0/libspi/document.h
include/at-spi-1.0/libspi/editabletext.h
include/at-spi-1.0/libspi/eventlistener.h
include/at-spi-1.0/libspi/hyperlink.h
@@ -61,6 +62,7 @@ share/gnome/idl/at-spi-1.0/Accessibility_Action.idl
share/gnome/idl/at-spi-1.0/Accessibility_Application.idl
share/gnome/idl/at-spi-1.0/Accessibility_Component.idl
share/gnome/idl/at-spi-1.0/Accessibility_Desktop.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Document.idl
share/gnome/idl/at-spi-1.0/Accessibility_EditableText.idl
share/gnome/idl/at-spi-1.0/Accessibility_Event.idl
share/gnome/idl/at-spi-1.0/Accessibility_Hyperlink.idl
@@ -119,7 +121,6 @@ share/locale/nb/LC_MESSAGES/at-spi.mo
share/locale/ne/LC_MESSAGES/at-spi.mo
share/locale/nl/LC_MESSAGES/at-spi.mo
share/locale/nn/LC_MESSAGES/at-spi.mo
-share/locale/no/LC_MESSAGES/at-spi.mo
share/locale/or/LC_MESSAGES/at-spi.mo
share/locale/pa/LC_MESSAGES/at-spi.mo
share/locale/pl/LC_MESSAGES/at-spi.mo
@@ -144,23 +145,59 @@ share/locale/xh/LC_MESSAGES/at-spi.mo
share/locale/zh_CN/LC_MESSAGES/at-spi.mo
share/locale/zh_HK/LC_MESSAGES/at-spi.mo
share/locale/zh_TW/LC_MESSAGES/at-spi.mo
-@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/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
@dirrm share/gnome/idl/at-spi-1.0
@dirrm lib/orbit-2.0
@dirrm include/at-spi-1.0/login-helper
@dirrm include/at-spi-1.0/libspi
@dirrm include/at-spi-1.0/cspi
@dirrm include/at-spi-1.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 66fe20e6d1ad..cf166a8e2d24 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.68 2006/04/13 07:52:28 bland Exp $
+# $MCom: ports/accessibility/atk/Makefile,v 1.73 2006/10/02 00:43:11 ahze Exp $
#
PORTNAME= atk
-PORTVERSION= 1.11.4
-PORTREVISION?= 1
+PORTVERSION= 1.12.3
+PORTREVISION?= 0
CATEGORIES= accessibility devel
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,14 +22,15 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
USE_GETTEXT= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack glib20 ltverhack referencehack
CONFIGURE_ARGS= --enable-static \
--disable-gtk-doc \
--with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ AUTOCONF=${TRUE} AUTOMAKE=${TRUE}
post-patch:
@${REINPLACE_CMD} -e "/^SUBDIRS =/s/tests//" \
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 8be97790ae67..fc2af3325fdb 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/atk-1.11.4.tar.bz2) = 2f7132e46a62a2586545bca40eeeef39
-SHA256 (gnome2/atk-1.11.4.tar.bz2) = f288657de2f7413c35626dcc43fb66ca837c8232b7d0c00bc602430706dd2ed7
-SIZE (gnome2/atk-1.11.4.tar.bz2) = 621041
+MD5 (gnome2/atk-1.12.3.tar.bz2) = 7f648f4808b5f8273e1d63b0b543bf9b
+SHA256 (gnome2/atk-1.12.3.tar.bz2) = 70ab4689c0f9e0127b53ae532115d5f4422b825e6742aacdeb4849c4e08b69d7
+SIZE (gnome2/atk-1.12.3.tar.bz2) = 661453
diff --git a/accessibility/atk/files/patch-docs_Makefile.in b/accessibility/atk/files/patch-docs_Makefile.in
deleted file mode 100644
index b40046ee22c3..000000000000
--- a/accessibility/atk/files/patch-docs_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- docs/Makefile.in.orig Fri Jan 24 16:45:09 2003
-+++ docs/Makefile.in Fri Jan 24 16:45:09 2003
-@@ -274,6 +274,7 @@
- dist-hook-local: all-local
-
- @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
-+@ENABLE_GTK_DOC_FALSE@all-local:
-
- #### scan ####
-
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 1734cb73e53d..b4b98d2d61c4 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -6,6 +6,7 @@ include/atk-1.0/atk/atkdocument.h
include/atk-1.0/atk/atkeditabletext.h
include/atk-1.0/atk/atkgobjectaccessible.h
include/atk-1.0/atk/atkhyperlink.h
+include/atk-1.0/atk/atkhyperlinkimpl.h
include/atk-1.0/atk/atkhypertext.h
include/atk-1.0/atk/atkimage.h
include/atk-1.0/atk/atknoopobject.h
@@ -37,12 +38,14 @@ share/locale/az/LC_MESSAGES/atk10.mo
share/locale/be/LC_MESSAGES/atk10.mo
share/locale/bg/LC_MESSAGES/atk10.mo
share/locale/bn/LC_MESSAGES/atk10.mo
+share/locale/bn_IN/LC_MESSAGES/atk10.mo
share/locale/bs/LC_MESSAGES/atk10.mo
share/locale/ca/LC_MESSAGES/atk10.mo
share/locale/cs/LC_MESSAGES/atk10.mo
share/locale/cy/LC_MESSAGES/atk10.mo
share/locale/da/LC_MESSAGES/atk10.mo
share/locale/de/LC_MESSAGES/atk10.mo
+share/locale/dz/LC_MESSAGES/atk10.mo
share/locale/el/LC_MESSAGES/atk10.mo
share/locale/en_CA/LC_MESSAGES/atk10.mo
share/locale/en_GB/LC_MESSAGES/atk10.mo
@@ -67,6 +70,7 @@ share/locale/ja/LC_MESSAGES/atk10.mo
share/locale/ka/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
share/locale/li/LC_MESSAGES/atk10.mo
share/locale/lt/LC_MESSAGES/atk10.mo
share/locale/lv/LC_MESSAGES/atk10.mo
@@ -79,7 +83,6 @@ share/locale/nb/LC_MESSAGES/atk10.mo
share/locale/ne/LC_MESSAGES/atk10.mo
share/locale/nl/LC_MESSAGES/atk10.mo
share/locale/nn/LC_MESSAGES/atk10.mo
-share/locale/no/LC_MESSAGES/atk10.mo
share/locale/or/LC_MESSAGES/atk10.mo
share/locale/pa/LC_MESSAGES/atk10.mo
share/locale/pl/LC_MESSAGES/atk10.mo
@@ -96,6 +99,7 @@ share/locale/sr@Latn/LC_MESSAGES/atk10.mo
share/locale/sr@ije/LC_MESSAGES/atk10.mo
share/locale/sv/LC_MESSAGES/atk10.mo
share/locale/ta/LC_MESSAGES/atk10.mo
+share/locale/te/LC_MESSAGES/atk10.mo
share/locale/th/LC_MESSAGES/atk10.mo
share/locale/tk/LC_MESSAGES/atk10.mo
share/locale/tr/LC_MESSAGES/atk10.mo
@@ -109,6 +113,8 @@ share/locale/yi/LC_MESSAGES/atk10.mo
share/locale/zh_CN/LC_MESSAGES/atk10.mo
share/locale/zh_HK/LC_MESSAGES/atk10.mo
share/locale/zh_TW/LC_MESSAGES/atk10.mo
+@dirrm include/atk-1.0/atk
+@dirrm include/atk-1.0
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -127,6 +133,8 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
@dirrmtry share/locale/tt
@dirrmtry share/locale/tk/LC_MESSAGES
@dirrmtry share/locale/tk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
@dirrmtry share/locale/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
@dirrmtry share/locale/sr/LC_MESSAGES
@@ -143,8 +151,6 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
@dirrmtry share/locale/pt
@dirrmtry share/locale/pl/LC_MESSAGES
@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
@dirrmtry share/locale/nn/LC_MESSAGES
@dirrmtry share/locale/nn
@dirrmtry share/locale/ne/LC_MESSAGES
@@ -153,6 +159,8 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
@dirrmtry share/locale/mr
@dirrmtry share/locale/li/LC_MESSAGES
@dirrmtry share/locale/li
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrmtry share/locale/ko/LC_MESSAGES
@dirrmtry share/locale/ko
@dirrmtry share/locale/gl/LC_MESSAGES
@@ -161,13 +169,15 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
@dirrmtry share/locale/fi
@dirrmtry share/locale/el/LC_MESSAGES
@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrmtry share/locale/cs/LC_MESSAGES
@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
-@dirrm include/atk-1.0/atk
-@dirrm include/atk-1.0
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 54303b847da0..da0fda1728aa 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -3,11 +3,11 @@
# Whom: lewiz <purple@lewiz.net>
#
# $FreeBSD$
-# $MCom: ports/accessibility/dasher/Makefile,v 1.34 2006/04/13 07:52:29 bland Exp $
+# $MCom: ports/accessibility/dasher/Makefile,v 1.44 2006/09/03 21:33:52 marcus Exp $
#
PORTNAME= dasher
-PORTVERSION= 4.0.4
+PORTVERSION= 4.2.0
PORTEPOCH= 1
CATEGORIES= accessibility editors x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -22,14 +22,14 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi \
- libwnck
+ libwnck gnomedocutils
WANT_GNOME= yes
GNU_CONFIGURE= yes
-INSTALLS_OMF= yes
INSTALLS_ICONS= yes
+INSTALLS_OMF= yes
USE_GCC= 3.4+
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo
index aefbdf60e7a1..86d91ceee590 100644
--- a/accessibility/dasher/distinfo
+++ b/accessibility/dasher/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/dasher-4.0.4.tar.bz2) = 6ab865403d29d9d3714e85840ed89dc7
-SHA256 (gnome2/dasher-4.0.4.tar.bz2) = 0862cc25e3f3e19d07d5f39b95abbb19abd99eff5220e1b23d92d3a05f1ca875
-SIZE (gnome2/dasher-4.0.4.tar.bz2) = 5707882
+MD5 (gnome2/dasher-4.2.0.tar.bz2) = 9db6f0ac46041300e7126a073a40530e
+SHA256 (gnome2/dasher-4.2.0.tar.bz2) = 1664de06b3090b762ae5292a6ccf01681e857a8f8e320fb552aad810256e76ca
+SIZE (gnome2/dasher-4.2.0.tar.bz2) = 5632602
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
index da5a022d06c5..6b5fdba4a5ad 100644
--- a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
@@ -1,36 +1,20 @@
---- Src/DasherCore/FileLogger.cpp.orig Tue Jan 17 01:41:44 2006
-+++ Src/DasherCore/FileLogger.cpp Tue Jan 17 01:51:33 2006
-@@ -17,7 +17,7 @@ static char THIS_FILE[] = __FILE__;
- #include <windows.h>
- #endif
-
--#include <sys/timeb.h>
-+#include <sys/time.h>
-
- CFileLogger::CFileLogger(const std::string& strFilenamePath, eLogLevel iLogLevel, int iOptionsMask)
- {
-@@ -492,12 +492,12 @@ std::string CFileLogger::GetTimeDateStam
-
- if ((m_bTimeStamp) || (m_bDateStamp))
- {
-- struct timeb sTimeBuffer;
-+ struct timeval sTimeBuffer;
- char* szTimeLine = NULL;
-
-- ftime(&sTimeBuffer);
-+ gettimeofday(&sTimeBuffer, NULL);
-
-- szTimeLine = ctime(&(sTimeBuffer.time));
+--- Src/DasherCore/FileLogger.cpp.orig Fri Apr 21 17:41:01 2006
++++ Src/DasherCore/FileLogger.cpp Sun Jun 11 07:33:19 2006
+@@ -511,7 +511,7 @@
+ szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+ gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+- szTimeLine = ctime(&(sTimeBuffer.tv_sec));
+ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
-
+ #endif
+
// Format is:
- // Wed Jun 22 10:22:00 2005
-@@ -520,7 +520,7 @@ std::string CFileLogger::GetTimeDateStam
- strTimeStamp += szTimeLine[i];
- strTimeStamp += ".";
- char strMs[16];
-- sprintf(strMs, "%d", sTimeBuffer.millitm);
+@@ -538,7 +538,7 @@
+ #ifdef _WIN32
+ sprintf(strMs, "%d", sTimeBuffer.millitm);
+ #else
+- sprintf(strMs, "%d", sTimeBuffer.tv_usec / 1000);
+ sprintf(strMs, "%d", (int) (sTimeBuffer.tv_usec / 1000));
+ #endif
if (strlen(strMs) == 1)
strTimeStamp += "00";
- else if (strlen(strMs) == 2)
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp b/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp
index d8679afaed3e..745c41f85a5e 100644
--- a/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp
@@ -1,44 +1,24 @@
---- Src/DasherCore/SimpleTimer.cpp.orig Tue Jan 17 01:43:17 2006
-+++ Src/DasherCore/SimpleTimer.cpp Tue Jan 17 01:46:24 2006
-@@ -1,6 +1,6 @@
- #include "SimpleTimer.h"
+--- Src/DasherCore/SimpleTimer.cpp.orig Wed May 31 00:14:12 2006
++++ Src/DasherCore/SimpleTimer.cpp Wed May 31 00:14:23 2006
+@@ -34,8 +34,8 @@ CSimpleTimer::CSimpleTimer()
+ m_iStartSecond = sTimeBuffer.time;
+ #else
+ gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+- m_iStartMs = sTimeBuffer.tv_usec / 1000;
+- m_iStartSecond = sTimeBuffer.tv_sec;
++ m_iStartMs = (int) sTimeBuffer.tv_usec / 1000;
++ m_iStartSecond = (int) sTimeBuffer.tv_sec;
+ #endif
--#include <sys/timeb.h>
-+#include <sys/time.h>
-
- // Track memory leaks on Windows to the line that new'd the memory
- #ifdef _WIN32
-@@ -14,12 +14,12 @@ static char THIS_FILE[] = __FILE__;
-
- CSimpleTimer::CSimpleTimer()
- {
-- struct timeb sTimeBuffer;
-+ struct timeval sTimeBuffer;
-
-- ftime(&sTimeBuffer);
-+ gettimeofday(&sTimeBuffer, NULL);
-
-- m_iStartMs = sTimeBuffer.millitm;
-- m_iStartSecond = sTimeBuffer.time;
-+ m_iStartMs = (int) (sTimeBuffer.tv_usec / 1000);
-+ m_iStartSecond = (int) sTimeBuffer.tv_sec;
}
-
- CSimpleTimer::~CSimpleTimer()
-@@ -28,12 +28,12 @@ CSimpleTimer::~CSimpleTimer()
-
- double CSimpleTimer::GetElapsed()
- {
-- struct timeb sTimeBuffer;
-+ struct timeval sTimeBuffer;
-
-- ftime(&sTimeBuffer);
-+ gettimeofday(&sTimeBuffer, NULL);
-
-- int iEndMs = sTimeBuffer.millitm;
-- int iEndSecond = sTimeBuffer.time;
-+ int iEndMs = (int) (sTimeBuffer.tv_usec / 1000);
+@@ -59,8 +59,8 @@ double CSimpleTimer::GetElapsed()
+ int iEndSecond = sTimeBuffer.time;
+ #else
+ gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+- int iEndMs = sTimeBuffer.tv_usec / 1000;
+- int iEndSecond = sTimeBuffer.tv_sec;
++ int iEndMs = (int) sTimeBuffer.tv_usec / 1000;
+ int iEndSecond = (int) sTimeBuffer.tv_sec;
+ #endif
+
- return ((double) iEndMs / 1000.0 + (double) iEndSecond) -
- ((double) m_iStartMs / 1000.0 + (double) m_iStartSecond);
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
index d5bf37daf0d2..d41cf9bed26b 100644
--- a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
@@ -1,51 +1,29 @@
---- Src/DasherCore/TimeSpan.cpp.orig Tue Jan 17 01:47:12 2006
-+++ Src/DasherCore/TimeSpan.cpp Tue Jan 17 01:48:47 2006
-@@ -1,6 +1,6 @@
-
- #include "TimeSpan.h"
--#include <sys/timeb.h>
-+#include <sys/time.h>
-
- #ifdef _WIN32
- // In order to track leaks to line number, we need this at the top of every file
-@@ -102,12 +102,12 @@ string CTimeSpan::GetXML(const string& s
- string CTimeSpan::GetTimeStamp()
- {
- string strTimeStamp = "";
-- struct timeb sTimeBuffer;
-+ struct timeval sTimeBuffer;
- char* szTimeLine = NULL;
-
-- ftime(&sTimeBuffer);
-+ gettimeofday(&sTimeBuffer, NULL);
-
-- szTimeLine = ctime(&(sTimeBuffer.time));
-+ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
-
+--- Src/DasherCore/TimeSpan.cpp.orig Fri Apr 21 17:41:02 2006
++++ Src/DasherCore/TimeSpan.cpp Sun Jun 11 09:21:30 2006
+@@ -122,7 +122,7 @@
+ szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+ gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+- szTimeLine = ctime(&(sTimeBuffer.tv_sec));
++ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
+ #endif
+
if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
- {
-@@ -115,7 +115,7 @@ string CTimeSpan::GetTimeStamp()
- strTimeStamp += szTimeLine[i];
- strTimeStamp += ".";
- char szMs[16];
-- sprintf(szMs, "%d", sTimeBuffer.millitm);
+@@ -134,7 +134,7 @@
+ #ifdef _WIN32
+ sprintf(szMs, "%d", sTimeBuffer.millitm);
+ #else
+- sprintf(szMs, "%d", sTimeBuffer.tv_usec / 1000);
+ sprintf(szMs, "%d", (int) (sTimeBuffer.tv_usec / 1000));
+ #endif
if (strlen(szMs) == 1)
strTimeStamp += "00";
- else if (strlen(szMs) == 2)
-@@ -163,12 +163,12 @@ string CTimeSpan::GetDateStamp()
- {
- std::string strDateStamp = "";
-
-- struct timeb sTimeBuffer;
-+ struct timeval sTimeBuffer;
- char* szTimeLine = NULL;
-
-- ftime(&sTimeBuffer);
-+ gettimeofday(&sTimeBuffer, NULL);
-
-- szTimeLine = ctime(&(sTimeBuffer.time));
-+ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
-
- // Format is:
- // Wed Jun 22 10:22:00 2005
+@@ -196,7 +196,7 @@
+ szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+ gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+- szTimeLine = ctime(&(sTimeBuffer.tv_sec));
++ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
+ #endif
+
+
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp b/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp
index 2ba6fec10fff..663e5426ef34 100644
--- a/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp
@@ -1,41 +1,20 @@
---- Src/DasherCore/UserLog.cpp.orig Tue Jan 17 01:49:12 2006
-+++ Src/DasherCore/UserLog.cpp Tue Jan 17 01:50:11 2006
-@@ -1,7 +1,7 @@
-
- #include "UserLog.h"
- #include <fstream>
--#include <sys/timeb.h>
-+#include <sys/time.h>
-
- // Track memory leaks on Windows to the line that new'd the memory
- #ifdef _WIN32
-@@ -624,12 +624,12 @@ void CUserLog::SetOuputFilename(const st
- {
- m_strFilename = USER_LOG_DETAILED_PREFIX;
-
-- struct timeb sTimeBuffer;
-+ struct timeval sTimeBuffer;
- char* szTimeLine = NULL;
-
-- ftime(&sTimeBuffer);
-+ gettimeofday(&sTimeBuffer, NULL);
-
-- szTimeLine = ctime(&(sTimeBuffer.time));
+--- Src/DasherCore/UserLog.cpp.orig Fri Apr 21 17:41:02 2006
++++ Src/DasherCore/UserLog.cpp Sun Jun 11 10:43:33 2006
+@@ -668,7 +668,7 @@
+ szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+ gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+- szTimeLine = ctime(&(sTimeBuffer.tv_sec));
+ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
+ #endif
if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
- {
-@@ -829,10 +829,10 @@ bool CUserLog::UpdateMouseLocation()
- {
- //CFunctionLogger f1("CUserLog::UpdateMouseLocation", g_pLogger);
-
-- struct timeb sTimeBuffer;
-- ftime(&sTimeBuffer);
-+ struct timeval sTimeBuffer;
-+ gettimeofday(&sTimeBuffer, NULL);
-
-- double dTime = (sTimeBuffer.time * 1000.0) + sTimeBuffer.millitm;
+@@ -881,7 +881,7 @@
+ double dTime = (sTimeBuffer.time * 1000.0) + sTimeBuffer.millitm;
+ #else
+ gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+- double dTime = (sTimeBuffer.tv_sec * 1000.0) + sTimeBuffer.tv_usec / 1000;
+ double dTime = (sTimeBuffer.tv_sec * 1000.0) + (int) (sTimeBuffer.tv_usec / 1000);
+ #endif
- if ((dTime - m_dLastMouseUpdate) > LOG_MOUSE_EVERY_MS)
- {
+
diff --git a/accessibility/dasher/files/patch-Src_Gtk2_speech.cc b/accessibility/dasher/files/patch-Src_Gtk2_speech.cc
deleted file mode 100644
index 9817b2f11bb1..000000000000
--- a/accessibility/dasher/files/patch-Src_Gtk2_speech.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- Src/Gtk2/speech.cc.orig Thu Jan 12 15:52:50 2006
-+++ Src/Gtk2/speech.cc Tue Jan 17 01:29:35 2006
-@@ -74,6 +74,7 @@ void setup_speech() {
- void teardown_speech() {
-
- bonobo_object_release_unref(speaker, NULL);
-+ if (voices != NULL && !BONOBO_EX (&ev) && voices->_length != 0)
- CORBA_free(voices);
- GNOME_Speech_SynthesisDriver_unref(rv, &ev);
- CORBA_exception_free(&ev);
diff --git a/accessibility/dasher/files/patch-configure b/accessibility/dasher/files/patch-configure
index 982daaac6663..7ade63c80eaf 100644
--- a/accessibility/dasher/files/patch-configure
+++ b/accessibility/dasher/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig Tue Jan 31 01:13:42 2006
-+++ configure Tue Jan 31 01:14:07 2006
-@@ -24818,7 +24818,7 @@
-
-
- GTK2BUILD_CFLAGS="$GTK2_CFLAGS $SETTINGS_CFLAGS $gthread_CFLAGS $gnome_speech_CFLAGS $gnome_a11y_CFLAGS $glade_CFLAGS $gnome_CFLAGS $wnck_CFLAGS $hildon_CFLAGS"
--GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS -Wl,--export-dynamic,"
-+GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS -Wl,--export-dynamic"
-
+--- configure.orig Wed May 17 00:00:16 2006
++++ configure Wed May 17 00:01:21 2006
+@@ -24000,7 +24000,7 @@ GTK2BUILD_CFLAGS="$GTK2_CFLAGS $SETTINGS
+ if [ x"$WITHDARWIN" = xtrue ]; then
+ GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS"
+ else
+- GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS -Wl,--export-dynamic,"
++ GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS -Wl,--export-dynamic"
+ fi
diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist
index 90e5f81a82ea..27fbfaa616ba 100644
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@@ -7,7 +7,6 @@ share/gnome/dasher/alphabet.Austen.xml
share/gnome/dasher/alphabet.Azerbaijani.xml
share/gnome/dasher/alphabet.Belarusian.xml
share/gnome/dasher/alphabet.Bulgarian.xml
-share/gnome/dasher/alphabet.C.xml
share/gnome/dasher/alphabet.Esperanto.xml
share/gnome/dasher/alphabet.Estonian.xml
share/gnome/dasher/alphabet.Filipino.xml
@@ -42,6 +41,7 @@ share/gnome/dasher/alphabet.Tajik.xml
share/gnome/dasher/alphabet.Tamil.xml
share/gnome/dasher/alphabet.Telugu.xml
share/gnome/dasher/alphabet.Thai.xml
+share/gnome/dasher/alphabet.Thai2.xml
share/gnome/dasher/alphabet.Tsonga.xml
share/gnome/dasher/alphabet.Tswana.xml
share/gnome/dasher/alphabet.Turkish.xml
@@ -70,12 +70,10 @@ share/gnome/dasher/alphabet.corsican.xml
share/gnome/dasher/alphabet.croatian.xml
share/gnome/dasher/alphabet.czech.xml
share/gnome/dasher/alphabet.danish.xml
-share/gnome/dasher/alphabet.danish2.xml
share/gnome/dasher/alphabet.dtd
share/gnome/dasher/alphabet.dutch.xml
share/gnome/dasher/alphabet.english.xml
share/gnome/dasher/alphabet.englishC.xml
-share/gnome/dasher/alphabet.englishLC.xml
share/gnome/dasher/alphabet.ethiopic.xml
share/gnome/dasher/alphabet.ewe.xml
share/gnome/dasher/alphabet.faroese.xml
@@ -143,13 +141,13 @@ share/gnome/dasher/colour.euroasian.xml
share/gnome/dasher/colour.euroasian2.xml
share/gnome/dasher/colour.jamie.xml
share/gnome/dasher/colour.rainbow.xml
+share/gnome/dasher/colour.thai.xml
share/gnome/dasher/colour.vowels.xml
share/gnome/dasher/colour.vowels2.xml
share/gnome/dasher/colour.xml
share/gnome/dasher/controllabels.dtd
share/gnome/dasher/controllabels.xml
share/gnome/dasher/dasher.glade
-share/gnome/dasher/dashermaemo.glade
share/gnome/dasher/training_albanian_SQ.txt
share/gnome/dasher/training_basque_EU.txt
share/gnome/dasher/training_bengali_BD.txt
@@ -179,25 +177,22 @@ share/gnome/dasher/training_swedish_SE.txt
share/gnome/dasher/training_turkish_TR.txt
share/gnome/dasher/training_welsh_GB.txt
share/gnome/help/dasher/C/dasher.xml
+share/gnome/help/dasher/C/figures/a-z.gif
+share/gnome/help/dasher/C/figures/aa-az.gif
+share/gnome/help/dasher/C/figures/ala-alz.gif
+share/gnome/help/dasher/C/figures/exampleHad2.png
+share/gnome/help/dasher/C/figures/exampleHad2a.png
+share/gnome/help/dasher/C/figures/exampleHad3a.png
+share/gnome/help/dasher/C/figures/exampleHad4.png
share/gnome/help/dasher/C/figures/figure2.png
share/gnome/help/dasher/C/figures/main.png
+share/gnome/help/dasher/C/figures/object.gif
share/gnome/help/dasher/C/figures/prefs1.png
share/gnome/help/dasher/C/figures/prefs2.png
share/gnome/help/dasher/C/figures/prefs3.png
share/gnome/help/dasher/C/figures/prefs4.png
share/gnome/help/dasher/C/figures/prefs5.png
-share/gnome/help/dasher/C/version.xml
-share/gnome/help/dasher/eu/dasher.xml
-share/gnome/help/dasher/eu/figures/figure2.png
-share/gnome/help/dasher/eu/figures/main.png
-share/gnome/help/dasher/eu/figures/prefs1.png
-share/gnome/help/dasher/eu/figures/prefs2.png
-share/gnome/help/dasher/eu/figures/prefs3.png
-share/gnome/help/dasher/eu/figures/prefs4.png
-share/gnome/help/dasher/eu/figures/prefs5.png
-share/gnome/help/dasher/eu/version.xml
share/gnome/omf/dasher/dasher-C.omf
-share/gnome/omf/dasher/dasher-eu.omf
share/icons/hicolor/48x48/apps/dasher.png
share/icons/hicolor/scalable/apps/dasher.svg
share/locale/ar/LC_MESSAGES/dasher.mo
@@ -205,7 +200,7 @@ share/locale/az/LC_MESSAGES/dasher.mo
share/locale/be/LC_MESSAGES/dasher.mo
share/locale/bg/LC_MESSAGES/dasher.mo
share/locale/bn/LC_MESSAGES/dasher.mo
-share/locale/br/LC_MESSAGES/dasher.mo
+share/locale/bn_IN/LC_MESSAGES/dasher.mo
share/locale/bs/LC_MESSAGES/dasher.mo
share/locale/ca/LC_MESSAGES/dasher.mo
share/locale/cs/LC_MESSAGES/dasher.mo
@@ -234,17 +229,21 @@ share/locale/it/LC_MESSAGES/dasher.mo
share/locale/ja/LC_MESSAGES/dasher.mo
share/locale/ka/LC_MESSAGES/dasher.mo
share/locale/ko/LC_MESSAGES/dasher.mo
+share/locale/ku/LC_MESSAGES/dasher.mo
share/locale/ky/LC_MESSAGES/dasher.mo
share/locale/lt/LC_MESSAGES/dasher.mo
share/locale/lv/LC_MESSAGES/dasher.mo
+share/locale/mg/LC_MESSAGES/dasher.mo
share/locale/mk/LC_MESSAGES/dasher.mo
+share/locale/ml/LC_MESSAGES/dasher.mo
share/locale/mn/LC_MESSAGES/dasher.mo
+share/locale/mr/LC_MESSAGES/dasher.mo
share/locale/ms/LC_MESSAGES/dasher.mo
share/locale/nb/LC_MESSAGES/dasher.mo
share/locale/ne/LC_MESSAGES/dasher.mo
share/locale/nl/LC_MESSAGES/dasher.mo
-share/locale/no/LC_MESSAGES/dasher.mo
share/locale/nn/LC_MESSAGES/dasher.mo
+share/locale/or/LC_MESSAGES/dasher.mo
share/locale/pa/LC_MESSAGES/dasher.mo
share/locale/pl/LC_MESSAGES/dasher.mo
share/locale/pt/LC_MESSAGES/dasher.mo
@@ -253,6 +252,7 @@ share/locale/ro/LC_MESSAGES/dasher.mo
share/locale/ru/LC_MESSAGES/dasher.mo
share/locale/rw/LC_MESSAGES/dasher.mo
share/locale/sk/LC_MESSAGES/dasher.mo
+share/locale/sl/LC_MESSAGES/dasher.mo
share/locale/sq/LC_MESSAGES/dasher.mo
share/locale/sr/LC_MESSAGES/dasher.mo
share/locale/sr@Latn/LC_MESSAGES/dasher.mo
@@ -267,22 +267,64 @@ share/locale/vi/LC_MESSAGES/dasher.mo
share/locale/zh_CN/LC_MESSAGES/dasher.mo
share/locale/zh_HK/LC_MESSAGES/dasher.mo
share/locale/zh_TW/LC_MESSAGES/dasher.mo
+@dirrm share/gnome/omf/dasher
+@dirrm share/gnome/help/dasher/C/figures
+@dirrm share/gnome/help/dasher/C
+@dirrm share/gnome/help/dasher
+@dirrm share/gnome/dasher
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrm share/gnome/omf/dasher
-@dirrm share/gnome/help/dasher/eu/figures
-@dirrm share/gnome/help/dasher/eu
-@dirrm share/gnome/help/dasher/C/figures
-@dirrm share/gnome/help/dasher/C
-@dirrm share/gnome/help/dasher
-@dirrm share/gnome/dasher
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index a74be6976978..fbc2215ea2e1 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/gail/Makefile,v 1.44 2006/04/23 22:21:28 mezz Exp $
+# $MCom: ports/accessibility/gail/Makefile,v 1.52 2006/10/02 00:47:13 ahze Exp $
#
PORTNAME= gail
-PORTVERSION= 1.8.11
-PORTREVISION?= 1
+PORTVERSION= 1.9.3
+PORTREVISION?= 0
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,11 +22,11 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-USE_GNOME= gnomehack libgnomecanvas lthack referencehack
+USE_AUTOTOOLS= libtool:15
+USE_GNOME= gnomehack ltverhack libgnomecanvas lthack referencehack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-gtk-doc \
diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo
index 5ae5efb34fd3..0bd8c2674455 100644
--- a/accessibility/gail/distinfo
+++ b/accessibility/gail/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gail-1.8.11.tar.bz2) = ff79df7dd0cf7a5109c089b9b5fbe17f
-SHA256 (gnome2/gail-1.8.11.tar.bz2) = b1520968851727881e5ae070ec5d43c466322fab51607d96df531609f4abe6cf
-SIZE (gnome2/gail-1.8.11.tar.bz2) = 584492
+MD5 (gnome2/gail-1.9.3.tar.bz2) = 1e8825da60fd19833dfc6b2068f05ec9
+SHA256 (gnome2/gail-1.9.3.tar.bz2) = 165be69deb636b658374c2cfe5df452ab198de6d6ca8ebe0ee8469a229225c3c
+SIZE (gnome2/gail-1.9.3.tar.bz2) = 622648
diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist
index 0bd2bf5a42c5..6c919bb1ac31 100644
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@@ -1,11 +1,13 @@
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
+lib/gtk-2.0/modules/libgail.a
lib/gtk-2.0/modules/libgail.la
lib/gtk-2.0/modules/libgail.so
+lib/libgailutil.a
lib/libgailutil.la
lib/libgailutil.so
-lib/libgailutil.so.17
+lib/libgailutil.so.18
libdata/pkgconfig/gail.pc
share/locale/ar/LC_MESSAGES/gail.mo
share/locale/as/LC_MESSAGES/gail.mo
@@ -13,12 +15,14 @@ share/locale/az/LC_MESSAGES/gail.mo
share/locale/be/LC_MESSAGES/gail.mo
share/locale/bg/LC_MESSAGES/gail.mo
share/locale/bn/LC_MESSAGES/gail.mo
+share/locale/bn_IN/LC_MESSAGES/gail.mo
share/locale/bs/LC_MESSAGES/gail.mo
share/locale/ca/LC_MESSAGES/gail.mo
share/locale/cs/LC_MESSAGES/gail.mo
share/locale/cy/LC_MESSAGES/gail.mo
share/locale/da/LC_MESSAGES/gail.mo
share/locale/de/LC_MESSAGES/gail.mo
+share/locale/dz/LC_MESSAGES/gail.mo
share/locale/el/LC_MESSAGES/gail.mo
share/locale/en_CA/LC_MESSAGES/gail.mo
share/locale/en_GB/LC_MESSAGES/gail.mo
@@ -39,18 +43,20 @@ share/locale/id/LC_MESSAGES/gail.mo
share/locale/is/LC_MESSAGES/gail.mo
share/locale/it/LC_MESSAGES/gail.mo
share/locale/ja/LC_MESSAGES/gail.mo
+share/locale/ka/LC_MESSAGES/gail.mo
share/locale/ko/LC_MESSAGES/gail.mo
share/locale/ku/LC_MESSAGES/gail.mo
share/locale/lt/LC_MESSAGES/gail.mo
+share/locale/lv/LC_MESSAGES/gail.mo
share/locale/mi/LC_MESSAGES/gail.mo
share/locale/mk/LC_MESSAGES/gail.mo
+share/locale/ml/LC_MESSAGES/gail.mo
share/locale/mn/LC_MESSAGES/gail.mo
share/locale/ms/LC_MESSAGES/gail.mo
share/locale/nb/LC_MESSAGES/gail.mo
share/locale/ne/LC_MESSAGES/gail.mo
share/locale/nl/LC_MESSAGES/gail.mo
share/locale/nn/LC_MESSAGES/gail.mo
-share/locale/no/LC_MESSAGES/gail.mo
share/locale/or/LC_MESSAGES/gail.mo
share/locale/pa/LC_MESSAGES/gail.mo
share/locale/pl/LC_MESSAGES/gail.mo
@@ -60,6 +66,7 @@ share/locale/ro/LC_MESSAGES/gail.mo
share/locale/ru/LC_MESSAGES/gail.mo
share/locale/rw/LC_MESSAGES/gail.mo
share/locale/sk/LC_MESSAGES/gail.mo
+share/locale/sl/LC_MESSAGES/gail.mo
share/locale/sq/LC_MESSAGES/gail.mo
share/locale/sr/LC_MESSAGES/gail.mo
share/locale/sr@Latn/LC_MESSAGES/gail.mo
@@ -74,17 +81,59 @@ share/locale/xh/LC_MESSAGES/gail.mo
share/locale/zh_CN/LC_MESSAGES/gail.mo
share/locale/zh_HK/LC_MESSAGES/gail.mo
share/locale/zh_TW/LC_MESSAGES/gail.mo
+@dirrm include/gail-1.0/libgail-util
+@dirrm include/gail-1.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
-@dirrm include/gail-1.0/libgail-util
-@dirrm include/gail-1.0
diff --git a/accessibility/gnome-speech/Makefile b/accessibility/gnome-speech/Makefile
index 94781a3f0cc8..b58b6018fbbe 100644
--- a/accessibility/gnome-speech/Makefile
+++ b/accessibility/gnome-speech/Makefile
@@ -3,13 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/accessibility/gnome-speech/Makefile,v 1.21 2006/08/22 00:55:57 ahze Exp $
#
PORTNAME= gnome-speech
-PORTVERSION= 0.3.10
+PORTVERSION= 0.4.4
CATEGORIES= accessibility audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-speech/0.3
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -19,7 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libbonobo
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/accessibility/gnome-speech/distinfo b/accessibility/gnome-speech/distinfo
index e94f410d3946..d428ef39b05d 100644
--- a/accessibility/gnome-speech/distinfo
+++ b/accessibility/gnome-speech/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-speech-0.3.10.tar.bz2) = 5454e2b727d505459654cbaf5f893d3a
-SHA256 (gnome2/gnome-speech-0.3.10.tar.bz2) = 1740bbabdcccac7b365b73aa06bd5c8f400cfc1f8ec4d922435b38c5b42e1bcc
-SIZE (gnome2/gnome-speech-0.3.10.tar.bz2) = 272260
+MD5 (gnome2/gnome-speech-0.4.4.tar.bz2) = c26dde244c969d7a00b229f256e77546
+SHA256 (gnome2/gnome-speech-0.4.4.tar.bz2) = 318ebf3a3f4bd05d534202839ce779f1c823f26305b625703b9615c803d74e6c
+SIZE (gnome2/gnome-speech-0.4.4.tar.bz2) = 309806
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index 8face7430f94..46b0c18e7930 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/gnopernicus/Makefile,v 1.76 2006/04/14 14:42:45 mezz Exp $
+# $MCom: ports/accessibility/gnopernicus/Makefile,v 1.83 2006/08/22 02:55:02 marcus Exp $
#
PORTNAME= gnopernicus
-PORTVERSION= 1.0.6
+PORTVERSION= 1.1.2
CATEGORIES= accessibility x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,17 +20,18 @@ LIB_DEPENDS= gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
+INSTALLS_ICONS= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui atspi gnomespeech
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags gtk+-2.0`" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ENV= SED="${SED}"
GCONF_SCHEMAS= brlmonitor.schemas gnopernicus.schemas remote.schemas
-SHLIB_VERSION= 6
+SHLIB_VERSION= 2
PLIST_SUB= SHLIB_VERSION=${SHLIB_VERSION}
post-patch:
diff --git a/accessibility/gnopernicus/distinfo b/accessibility/gnopernicus/distinfo
index 68f9b3da03db..15898651b005 100644
--- a/accessibility/gnopernicus/distinfo
+++ b/accessibility/gnopernicus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnopernicus-1.0.6.tar.bz2) = 48b4fb06920053048418036f91069763
-SHA256 (gnome2/gnopernicus-1.0.6.tar.bz2) = 48a6ef80d814af2042b12c9a794eff2a6ce8f1353cd5bcc1dba29afa68f6a5d0
-SIZE (gnome2/gnopernicus-1.0.6.tar.bz2) = 1521529
+MD5 (gnome2/gnopernicus-1.1.2.tar.bz2) = 64677df8961a68a73003393166f710bd
+SHA256 (gnome2/gnopernicus-1.1.2.tar.bz2) = 88a750ead047e52ee3c655bd4d5947d9131619ecbf56bc1977c8a3bf6e4f5214
+SIZE (gnome2/gnopernicus-1.1.2.tar.bz2) = 1578754
diff --git a/accessibility/gnopernicus/pkg-plist b/accessibility/gnopernicus/pkg-plist
index c405c690fc81..f82bef28fe10 100644
--- a/accessibility/gnopernicus/pkg-plist
+++ b/accessibility/gnopernicus/pkg-plist
@@ -4,6 +4,7 @@ bin/srcore
etc/gnopernicus-1.0/translation_tables/de.a2b
etc/gnopernicus-1.0/translation_tables/en_US.a2b
etc/gnopernicus-1.0/translation_tables/es.a2b
+etc/gnopernicus-1.0/translation_tables/fr.a2b
etc/gnopernicus-1.0/translation_tables/sv.a2b
include/gnopernicus-1.0/libbrl/brlxmlapi.h
include/gnopernicus-1.0/libke/libke.h
@@ -17,6 +18,9 @@ include/gnopernicus-1.0/libsrutil/SREvent.h
include/gnopernicus-1.0/libsrutil/SRMessages.h
include/gnopernicus-1.0/libsrutil/srintl.h
include/gnopernicus-1.0/libsrutil/sru-debug.h
+include/gnopernicus-1.0/libsrutil/sru-glib.h
+include/gnopernicus-1.0/libsrutil/sru-module.h
+include/gnopernicus-1.0/libsrutil/sru-test.h
include/gnopernicus-1.0/libsrutil/util.h
lib/gnopernicus-1.0/libbrl.la
lib/gnopernicus-1.0/libbrl.so
@@ -63,7 +67,6 @@ share/gnome/gnopernicus/glade/gnopi_files/Presentation/presentation.glade2
share/gnome/gnopernicus/glade/gnopi_files/Screen_Review/screen_review.glade2
share/gnome/gnopernicus/glade/gnopi_files/Speech_Settings/speech_settings.glade2
share/gnome/gnopernicus/glade/gnopi_files/User_Properties/user_properties.glade2
-share/gnome/gnopernicus/glade/gnopi_files/about.glade2
share/gnome/gnopernicus/glade/gnopi_files/braille.xpm
share/gnome/gnopernicus/glade/gnopi_files/gnopi.glade2
share/gnome/gnopernicus/glade/gnopi_files/keyboard.xpm
@@ -86,12 +89,13 @@ share/gnome/omf/gnopernicus/brlmonitor-C.omf
share/gnome/omf/gnopernicus/brlmonitor-es.omf
share/gnome/omf/gnopernicus/gnopernicus-C.omf
share/gnome/omf/gnopernicus/gnopernicus-es.omf
-share/gnome/pixmaps/gnopernicus.png
+share/icons/hicolor/48x48/apps/gnopernicus.png
share/locale/ar/LC_MESSAGES/gnopernicus.mo
share/locale/az/LC_MESSAGES/gnopernicus.mo
share/locale/be/LC_MESSAGES/gnopernicus.mo
share/locale/bg/LC_MESSAGES/gnopernicus.mo
share/locale/bn/LC_MESSAGES/gnopernicus.mo
+share/locale/bn_IN/LC_MESSAGES/gnopernicus.mo
share/locale/ca/LC_MESSAGES/gnopernicus.mo
share/locale/cs/LC_MESSAGES/gnopernicus.mo
share/locale/cy/LC_MESSAGES/gnopernicus.mo
@@ -119,12 +123,14 @@ share/locale/ja/LC_MESSAGES/gnopernicus.mo
share/locale/ka/LC_MESSAGES/gnopernicus.mo
share/locale/ko/LC_MESSAGES/gnopernicus.mo
share/locale/lt/LC_MESSAGES/gnopernicus.mo
+share/locale/lv/LC_MESSAGES/gnopernicus.mo
share/locale/mn/LC_MESSAGES/gnopernicus.mo
+share/locale/mr/LC_MESSAGES/gnopernicus.mo
share/locale/ms/LC_MESSAGES/gnopernicus.mo
share/locale/nb/LC_MESSAGES/gnopernicus.mo
share/locale/ne/LC_MESSAGES/gnopernicus.mo
share/locale/nl/LC_MESSAGES/gnopernicus.mo
-share/locale/no/LC_MESSAGES/gnopernicus.mo
+share/locale/or/LC_MESSAGES/gnopernicus.mo
share/locale/pa/LC_MESSAGES/gnopernicus.mo
share/locale/pl/LC_MESSAGES/gnopernicus.mo
share/locale/pt/LC_MESSAGES/gnopernicus.mo
@@ -144,9 +150,8 @@ share/locale/tr/LC_MESSAGES/gnopernicus.mo
share/locale/uk/LC_MESSAGES/gnopernicus.mo
share/locale/vi/LC_MESSAGES/gnopernicus.mo
share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo
+share/locale/zh_HK/LC_MESSAGES/gnopernicus.mo
share/locale/zh_TW/LC_MESSAGES/gnopernicus.mo
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
@dirrm share/gnome/omf/gnopernicus
@dirrm share/gnome/help/gnopernicus/pt_BR/figures
@dirrm share/gnome/help/gnopernicus/pt_BR
@@ -183,3 +188,47 @@ share/locale/zh_TW/LC_MESSAGES/gnopernicus.mo
@dirrm include/gnopernicus-1.0
@dirrm etc/gnopernicus-1.0/translation_tables
@dirrm etc/gnopernicus-1.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 05522f92be3b..e882c7e340d9 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -3,10 +3,11 @@
# Whom: Adam Weinberger <adamw@freebsd.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/gok/Makefile,v 1.65 2006/04/27 22:59:43 marcus Exp $
+# $MCom: ports/accessibility/gok/Makefile,v 1.72 2006/08/26 03:50:50 marcus Exp $
PORTNAME= gok
-PORTVERSION= 1.0.10
+PORTVERSION= 1.2.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= accessibility sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -18,7 +19,7 @@ COMMENT= GNOME On-Screen Keyboard (GOK)
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui atspi libwnck \
gnomespeech
diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo
index 79cd77b5ce9c..c5d51050c61d 100644
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gok-1.0.10.tar.bz2) = de6cceaca780e7ad0702c4b3c0fd8d1f
-SHA256 (gnome2/gok-1.0.10.tar.bz2) = 35a4e380fd85660567ad54401ae0e52ebbb6f47947ce6a585aad078ef630b824
-SIZE (gnome2/gok-1.0.10.tar.bz2) = 1149823
+MD5 (gnome2/gok-1.2.0.tar.bz2) = a5b022cf0b83800a38bb1f6d402ffa57
+SHA256 (gnome2/gok-1.2.0.tar.bz2) = f6a3fc5081c8dafbdadf05b86b13beb05d1329fda074d217b62f4a1daaedc544
+SIZE (gnome2/gok-1.2.0.tar.bz2) = 1177907
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index 2eac98f1075a..7853b5415a7e 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -3,7 +3,9 @@ bin/gok
libdata/bonobo/servers/GNOME_Gok.server
libdata/pkgconfig/gok-1.0.pc
%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/gok-GokButton.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
%%DOCSDIR%%/gok-arraylist.html
%%DOCSDIR%%/gok-callbacks.html
%%DOCSDIR%%/gok-command-common.html
@@ -129,6 +131,16 @@ share/gnome/gok/bn/numberpad.kbd
share/gnome/gok/bn/quit.kbd
share/gnome/gok/bn/text-operations.kbd
share/gnome/gok/bn/valuator.kbd
+share/gnome/gok/bn_IN/gok-controls.kbd
+share/gnome/gok/bn_IN/hide.kbd
+share/gnome/gok/bn_IN/launcher.kbd
+share/gnome/gok/bn_IN/main.kbd
+share/gnome/gok/bn_IN/mouse.kbd
+share/gnome/gok/bn_IN/move-resize.kbd
+share/gnome/gok/bn_IN/numberpad.kbd
+share/gnome/gok/bn_IN/quit.kbd
+share/gnome/gok/bn_IN/text-operations.kbd
+share/gnome/gok/bn_IN/valuator.kbd
share/gnome/gok/ca/gok-controls.kbd
share/gnome/gok/ca/hide.kbd
share/gnome/gok/ca/launcher.kbd
@@ -426,6 +438,16 @@ share/gnome/gok/lt/numberpad.kbd
share/gnome/gok/lt/quit.kbd
share/gnome/gok/lt/text-operations.kbd
share/gnome/gok/lt/valuator.kbd
+share/gnome/gok/lv/gok-controls.kbd
+share/gnome/gok/lv/hide.kbd
+share/gnome/gok/lv/launcher.kbd
+share/gnome/gok/lv/main.kbd
+share/gnome/gok/lv/mouse.kbd
+share/gnome/gok/lv/move-resize.kbd
+share/gnome/gok/lv/numberpad.kbd
+share/gnome/gok/lv/quit.kbd
+share/gnome/gok/lv/text-operations.kbd
+share/gnome/gok/lv/valuator.kbd
share/gnome/gok/main.kbd
share/gnome/gok/manage.kbd
share/gnome/gok/mk/gok-controls.kbd
@@ -460,6 +482,16 @@ share/gnome/gok/mn/text-operations.kbd
share/gnome/gok/mn/valuator.kbd
share/gnome/gok/mouse.kbd
share/gnome/gok/move-resize.kbd
+share/gnome/gok/mr/gok-controls.kbd
+share/gnome/gok/mr/hide.kbd
+share/gnome/gok/mr/launcher.kbd
+share/gnome/gok/mr/main.kbd
+share/gnome/gok/mr/mouse.kbd
+share/gnome/gok/mr/move-resize.kbd
+share/gnome/gok/mr/numberpad.kbd
+share/gnome/gok/mr/quit.kbd
+share/gnome/gok/mr/text-operations.kbd
+share/gnome/gok/mr/valuator.kbd
share/gnome/gok/ms/gok-controls.kbd
share/gnome/gok/ms/hide.kbd
share/gnome/gok/ms/launcher.kbd
@@ -501,6 +533,16 @@ share/gnome/gok/nl/quit.kbd
share/gnome/gok/nl/text-operations.kbd
share/gnome/gok/nl/valuator.kbd
share/gnome/gok/numberpad.kbd
+share/gnome/gok/or/gok-controls.kbd
+share/gnome/gok/or/hide.kbd
+share/gnome/gok/or/launcher.kbd
+share/gnome/gok/or/main.kbd
+share/gnome/gok/or/mouse.kbd
+share/gnome/gok/or/move-resize.kbd
+share/gnome/gok/or/numberpad.kbd
+share/gnome/gok/or/quit.kbd
+share/gnome/gok/or/text-operations.kbd
+share/gnome/gok/or/valuator.kbd
share/gnome/gok/pa/gok-controls.kbd
share/gnome/gok/pa/hide.kbd
share/gnome/gok/pa/launcher.kbd
@@ -704,6 +746,7 @@ share/locale/az/LC_MESSAGES/gok.mo
share/locale/be/LC_MESSAGES/gok.mo
share/locale/bg/LC_MESSAGES/gok.mo
share/locale/bn/LC_MESSAGES/gok.mo
+share/locale/bn_IN/LC_MESSAGES/gok.mo
share/locale/ca/LC_MESSAGES/gok.mo
share/locale/cs/LC_MESSAGES/gok.mo
share/locale/cy/LC_MESSAGES/gok.mo
@@ -732,13 +775,16 @@ share/locale/ka/LC_MESSAGES/gok.mo
share/locale/ko/LC_MESSAGES/gok.mo
share/locale/ku/LC_MESSAGES/gok.mo
share/locale/lt/LC_MESSAGES/gok.mo
+share/locale/lv/LC_MESSAGES/gok.mo
share/locale/mk/LC_MESSAGES/gok.mo
share/locale/ml/LC_MESSAGES/gok.mo
share/locale/mn/LC_MESSAGES/gok.mo
+share/locale/mr/LC_MESSAGES/gok.mo
share/locale/ms/LC_MESSAGES/gok.mo
share/locale/nb/LC_MESSAGES/gok.mo
share/locale/ne/LC_MESSAGES/gok.mo
share/locale/nl/LC_MESSAGES/gok.mo
+share/locale/or/LC_MESSAGES/gok.mo
share/locale/pa/LC_MESSAGES/gok.mo
share/locale/pl/LC_MESSAGES/gok.mo
share/locale/pt/LC_MESSAGES/gok.mo
@@ -757,14 +803,6 @@ share/locale/vi/LC_MESSAGES/gok.mo
share/locale/zh_CN/LC_MESSAGES/gok.mo
share/locale/zh_HK/LC_MESSAGES/gok.mo
share/locale/zh_TW/LC_MESSAGES/gok.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
@dirrm share/gnome/omf/gok
@dirrm share/gnome/help/gok/C
@dirrm share/gnome/help/gok
@@ -786,13 +824,16 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo
@dirrm share/gnome/gok/pt
@dirrm share/gnome/gok/pl
@dirrm share/gnome/gok/pa
+@dirrm share/gnome/gok/or
@dirrm share/gnome/gok/nl
@dirrm share/gnome/gok/ne
@dirrm share/gnome/gok/nb
@dirrm share/gnome/gok/ms
+@dirrm share/gnome/gok/mr
@dirrm share/gnome/gok/mn
@dirrm share/gnome/gok/ml
@dirrm share/gnome/gok/mk
+@dirrm share/gnome/gok/lv
@dirrm share/gnome/gok/lt
@dirrm share/gnome/gok/ku
@dirrm share/gnome/gok/ko
@@ -822,6 +863,7 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo
@dirrm share/gnome/gok/cy
@dirrm share/gnome/gok/cs
@dirrm share/gnome/gok/ca
+@dirrm share/gnome/gok/bn_IN
@dirrm share/gnome/gok/bn
@dirrm share/gnome/gok/bg
@dirrm share/gnome/gok/be
@@ -830,3 +872,47 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo
@dirrm share/gnome/gok/am
@dirrm share/gnome/gok
@dirrm %%DOCSDIR%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
new file mode 100644
index 000000000000..e69c721de5d6
--- /dev/null
+++ b/accessibility/orca/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for: orca
+# Date created: 25 Jul 2006
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/accessibility/orca/Makefile,v 1.4 2006/09/04 02:19:06 marcus Exp $
+#
+
+PORTNAME= orca
+PORTVERSION= 1.0.0
+CATEGORIES= accessibility x11 gnome
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Scriptable screen reader
+
+LIB_DEPENDS= gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag
+
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_XLIB= yes
+USE_PYTHON= yes
+USE_GMAKE= yes
+USE_GNOME= gnomeprefix gnomehack libgnomeui atspi gnomespeech pygnome2
+INSTALLS_ICONS= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.mk>
diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo
new file mode 100644
index 000000000000..3332dddbb1e0
--- /dev/null
+++ b/accessibility/orca/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/orca-1.0.0.tar.bz2) = b1db09138f1c99b6b0fd468cab35deb2
+SHA256 (gnome2/orca-1.0.0.tar.bz2) = 823c5dcc4d58f53100b7addcf02842451e58ff00064793018a392fa55d530cbd
+SIZE (gnome2/orca-1.0.0.tar.bz2) = 707077
diff --git a/accessibility/orca/pkg-descr b/accessibility/orca/pkg-descr
new file mode 100644
index 000000000000..30cfd432ca09
--- /dev/null
+++ b/accessibility/orca/pkg-descr
@@ -0,0 +1,7 @@
+Orca a scriptable screen reader that is currently under development.
+As such it is highly unstable and undergoes frequent changes. To
+read more about Orca, please refer to the Orca documentation series
+available in the ./docs/doc-set directory and also the Orca WIKI at
+http://live.gnome.org/Orca.
+
+WWW: http://live.gnome.org/Orca
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
new file mode 100644
index 000000000000..bfe284fd0c95
--- /dev/null
+++ b/accessibility/orca/pkg-plist
@@ -0,0 +1,241 @@
+bin/orca
+%%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.py
+%%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.pyc
+%%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.pyo
+%%PYTHON_SITELIBDIR%%/orca/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/acss.py
+%%PYTHON_SITELIBDIR%%/orca/acss.pyc
+%%PYTHON_SITELIBDIR%%/orca/acss.pyo
+%%PYTHON_SITELIBDIR%%/orca/atspi.py
+%%PYTHON_SITELIBDIR%%/orca/atspi.pyc
+%%PYTHON_SITELIBDIR%%/orca/atspi.pyo
+%%PYTHON_SITELIBDIR%%/orca/braille.py
+%%PYTHON_SITELIBDIR%%/orca/braille.pyc
+%%PYTHON_SITELIBDIR%%/orca/braille.pyo
+%%PYTHON_SITELIBDIR%%/orca/braillegenerator.py
+%%PYTHON_SITELIBDIR%%/orca/braillegenerator.pyc
+%%PYTHON_SITELIBDIR%%/orca/braillegenerator.pyo
+%%PYTHON_SITELIBDIR%%/orca/brlmodule.la
+%%PYTHON_SITELIBDIR%%/orca/brlmodule.so
+%%PYTHON_SITELIBDIR%%/orca/brlmon.py
+%%PYTHON_SITELIBDIR%%/orca/brlmon.pyc
+%%PYTHON_SITELIBDIR%%/orca/brlmon.pyo
+%%PYTHON_SITELIBDIR%%/orca/chnames.py
+%%PYTHON_SITELIBDIR%%/orca/chnames.pyc
+%%PYTHON_SITELIBDIR%%/orca/chnames.pyo
+%%PYTHON_SITELIBDIR%%/orca/debug.py
+%%PYTHON_SITELIBDIR%%/orca/debug.pyc
+%%PYTHON_SITELIBDIR%%/orca/debug.pyo
+%%PYTHON_SITELIBDIR%%/orca/dectalk.py
+%%PYTHON_SITELIBDIR%%/orca/dectalk.pyc
+%%PYTHON_SITELIBDIR%%/orca/dectalk.pyo
+%%PYTHON_SITELIBDIR%%/orca/default.py
+%%PYTHON_SITELIBDIR%%/orca/default.pyc
+%%PYTHON_SITELIBDIR%%/orca/default.pyo
+%%PYTHON_SITELIBDIR%%/orca/espeechfactory.py
+%%PYTHON_SITELIBDIR%%/orca/espeechfactory.pyc
+%%PYTHON_SITELIBDIR%%/orca/espeechfactory.pyo
+%%PYTHON_SITELIBDIR%%/orca/eventsynthesizer.py
+%%PYTHON_SITELIBDIR%%/orca/eventsynthesizer.pyc
+%%PYTHON_SITELIBDIR%%/orca/eventsynthesizer.pyo
+%%PYTHON_SITELIBDIR%%/orca/flat_review.py
+%%PYTHON_SITELIBDIR%%/orca/flat_review.pyc
+%%PYTHON_SITELIBDIR%%/orca/flat_review.pyo
+%%PYTHON_SITELIBDIR%%/orca/focus_tracking_presenter.py
+%%PYTHON_SITELIBDIR%%/orca/focus_tracking_presenter.pyc
+%%PYTHON_SITELIBDIR%%/orca/focus_tracking_presenter.pyo
+%%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.py
+%%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyc
+%%PYTHON_SITELIBDIR%%/orca/gnomespeechfactory.pyo
+%%PYTHON_SITELIBDIR%%/orca/hierarchical_presenter.py
+%%PYTHON_SITELIBDIR%%/orca/hierarchical_presenter.pyc
+%%PYTHON_SITELIBDIR%%/orca/hierarchical_presenter.pyo
+%%PYTHON_SITELIBDIR%%/orca/httpserver.py
+%%PYTHON_SITELIBDIR%%/orca/httpserver.pyc
+%%PYTHON_SITELIBDIR%%/orca/httpserver.pyo
+%%PYTHON_SITELIBDIR%%/orca/input_event.py
+%%PYTHON_SITELIBDIR%%/orca/input_event.pyc
+%%PYTHON_SITELIBDIR%%/orca/input_event.pyo
+%%PYTHON_SITELIBDIR%%/orca/keybindings.py
+%%PYTHON_SITELIBDIR%%/orca/keybindings.pyc
+%%PYTHON_SITELIBDIR%%/orca/keybindings.pyo
+%%PYTHON_SITELIBDIR%%/orca/keynames.py
+%%PYTHON_SITELIBDIR%%/orca/keynames.pyc
+%%PYTHON_SITELIBDIR%%/orca/keynames.pyo
+%%PYTHON_SITELIBDIR%%/orca/mag.py
+%%PYTHON_SITELIBDIR%%/orca/mag.pyc
+%%PYTHON_SITELIBDIR%%/orca/mag.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca.py
+%%PYTHON_SITELIBDIR%%/orca/orca.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.py
+%%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_prefs.py
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_prefs.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_prefs.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_i18n.py
+%%PYTHON_SITELIBDIR%%/orca/orca_i18n.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_i18n.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_prefs.py
+%%PYTHON_SITELIBDIR%%/orca/orca_prefs.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_prefs.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_state.py
+%%PYTHON_SITELIBDIR%%/orca/orca_state.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_state.pyo
+%%PYTHON_SITELIBDIR%%/orca/outloud.py
+%%PYTHON_SITELIBDIR%%/orca/outloud.pyc
+%%PYTHON_SITELIBDIR%%/orca/outloud.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
+%%PYTHON_SITELIBDIR%%/orca/punctuation_settings.py
+%%PYTHON_SITELIBDIR%%/orca/punctuation_settings.pyc
+%%PYTHON_SITELIBDIR%%/orca/punctuation_settings.pyo
+%%PYTHON_SITELIBDIR%%/orca/rolenames.py
+%%PYTHON_SITELIBDIR%%/orca/rolenames.pyc
+%%PYTHON_SITELIBDIR%%/orca/rolenames.pyo
+%%PYTHON_SITELIBDIR%%/orca/script.py
+%%PYTHON_SITELIBDIR%%/orca/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/Evolution.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/Evolution.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/Evolution.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/Mozilla.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/Mozilla.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/Mozilla.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gaim.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gaim.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gaim.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gcalctool.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gcalctool.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gcalctool.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gdmlogin.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gdmlogin.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gdmlogin.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gedit.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gedit.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gedit.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/metacity.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/metacity.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/metacity.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/planner.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/planner.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/planner.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/settings.py
+%%PYTHON_SITELIBDIR%%/orca/settings.pyc
+%%PYTHON_SITELIBDIR%%/orca/settings.pyo
+%%PYTHON_SITELIBDIR%%/orca/speech.py
+%%PYTHON_SITELIBDIR%%/orca/speech.pyc
+%%PYTHON_SITELIBDIR%%/orca/speech.pyo
+%%PYTHON_SITELIBDIR%%/orca/speechgenerator.py
+%%PYTHON_SITELIBDIR%%/orca/speechgenerator.pyc
+%%PYTHON_SITELIBDIR%%/orca/speechgenerator.pyo
+%%PYTHON_SITELIBDIR%%/orca/speechserver.py
+%%PYTHON_SITELIBDIR%%/orca/speechserver.pyc
+%%PYTHON_SITELIBDIR%%/orca/speechserver.pyo
+%%PYTHON_SITELIBDIR%%/orca/util.py
+%%PYTHON_SITELIBDIR%%/orca/util.pyc
+%%PYTHON_SITELIBDIR%%/orca/util.pyo
+share/gnome/applications/orca.desktop
+share/gnome/orca/glade/orca-setup.glade
+share/icons/hicolor/48x48/apps/orca.png
+share/locale/bg/LC_MESSAGES/orca.mo
+share/locale/bn/LC_MESSAGES/orca.mo
+share/locale/bn_IN/LC_MESSAGES/orca.mo
+share/locale/ca/LC_MESSAGES/orca.mo
+share/locale/cs/LC_MESSAGES/orca.mo
+share/locale/cy/LC_MESSAGES/orca.mo
+share/locale/de/LC_MESSAGES/orca.mo
+share/locale/dz/LC_MESSAGES/orca.mo
+share/locale/el/LC_MESSAGES/orca.mo
+share/locale/en_CA/LC_MESSAGES/orca.mo
+share/locale/en_GB/LC_MESSAGES/orca.mo
+share/locale/es/LC_MESSAGES/orca.mo
+share/locale/eu/LC_MESSAGES/orca.mo
+share/locale/fi/LC_MESSAGES/orca.mo
+share/locale/fr/LC_MESSAGES/orca.mo
+share/locale/gu/LC_MESSAGES/orca.mo
+share/locale/hi/LC_MESSAGES/orca.mo
+share/locale/it/LC_MESSAGES/orca.mo
+share/locale/ja/LC_MESSAGES/orca.mo
+share/locale/ko/LC_MESSAGES/orca.mo
+share/locale/lt/LC_MESSAGES/orca.mo
+share/locale/lv/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/nb/LC_MESSAGES/orca.mo
+share/locale/ne/LC_MESSAGES/orca.mo
+share/locale/nl/LC_MESSAGES/orca.mo
+share/locale/or/LC_MESSAGES/orca.mo
+share/locale/pa/LC_MESSAGES/orca.mo
+share/locale/pt/LC_MESSAGES/orca.mo
+share/locale/pt_BR/LC_MESSAGES/orca.mo
+share/locale/ru/LC_MESSAGES/orca.mo
+share/locale/rw/LC_MESSAGES/orca.mo
+share/locale/sr/LC_MESSAGES/orca.mo
+share/locale/sr@Latn/LC_MESSAGES/orca.mo
+share/locale/sv/LC_MESSAGES/orca.mo
+share/locale/ta/LC_MESSAGES/orca.mo
+share/locale/uk/LC_MESSAGES/orca.mo
+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
+@dirrm share/gnome/orca/glade
+@dirrm share/gnome/orca
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts
+@dirrm %%PYTHON_SITELIBDIR%%/orca
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 985d611b025b..bf7a3c9ce6ba 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,11 +3,11 @@
# Whom: Anders Nordby <anders@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/archivers/fileroller/Makefile,v 1.95 2006/04/18 18:52:18 ahze Exp $
+# $MCom: ports/archivers/file-roller/Makefile,v 1.104 2006/10/03 20:20:38 mezz Exp $
#
PORTNAME= file-roller
-PORTVERSION= 2.14.4
+PORTVERSION= 2.16.1
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -22,11 +22,12 @@ COMMENT= An archive manager for zip files, tar, etc
# we can do away with this dependency.
RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar
+USE_LDCONFIG= yes
USE_BZIP2= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils nautilus2 \
gnomedocutils
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 01610b4d21a0..5e2ebaac7d70 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/file-roller-2.14.4.tar.bz2) = e86c78b3ecc90af20cf66511f4622c5c
-SHA256 (gnome2/file-roller-2.14.4.tar.bz2) = c01c95da7e0158b858ce569e8b475dc2053a44db356ecfde5a83484c36f3641b
-SIZE (gnome2/file-roller-2.14.4.tar.bz2) = 1042439
+MD5 (gnome2/file-roller-2.16.1.tar.bz2) = 8d210ba20113158c9fbd38b0226e8818
+SHA256 (gnome2/file-roller-2.16.1.tar.bz2) = cfb99599c2aa47a538c11b5b7921368555282b76b459ac7196704beffb1bfc78
+SIZE (gnome2/file-roller-2.16.1.tar.bz2) = 1107890
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index f7bebfbc5434..311d5c698f64 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -58,6 +58,12 @@ share/gnome/help/file-roller/ko/figures/file-roller_main_window.png
share/gnome/help/file-roller/ko/figures/file-roller_rightarrow.png
share/gnome/help/file-roller/ko/figures/file-roller_uparrow.png
share/gnome/help/file-roller/ko/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
+share/gnome/help/file-roller/nl/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/nl/figures/file-roller_uparrow.png
+share/gnome/help/file-roller/nl/file-roller.xml
share/gnome/help/file-roller/ru/figures/file-roller_home.png
share/gnome/help/file-roller/ru/figures/file-roller_leftarrow.png
share/gnome/help/file-roller/ru/figures/file-roller_main_window.png
@@ -102,6 +108,7 @@ share/gnome/omf/file-roller/file-roller-fr.omf
share/gnome/omf/file-roller/file-roller-it.omf
share/gnome/omf/file-roller/file-roller-ja.omf
share/gnome/omf/file-roller/file-roller-ko.omf
+share/gnome/omf/file-roller/file-roller-nl.omf
share/gnome/omf/file-roller/file-roller-ru.omf
share/gnome/omf/file-roller/file-roller-sv.omf
share/gnome/omf/file-roller/file-roller-uk.omf
@@ -115,6 +122,7 @@ share/locale/az/LC_MESSAGES/file-roller.mo
share/locale/be/LC_MESSAGES/file-roller.mo
share/locale/bg/LC_MESSAGES/file-roller.mo
share/locale/bn/LC_MESSAGES/file-roller.mo
+share/locale/bn_IN/LC_MESSAGES/file-roller.mo
share/locale/br/LC_MESSAGES/file-roller.mo
share/locale/bs/LC_MESSAGES/file-roller.mo
share/locale/ca/LC_MESSAGES/file-roller.mo
@@ -150,14 +158,17 @@ share/locale/ko/LC_MESSAGES/file-roller.mo
share/locale/ku/LC_MESSAGES/file-roller.mo
share/locale/lt/LC_MESSAGES/file-roller.mo
share/locale/lv/LC_MESSAGES/file-roller.mo
+share/locale/mg/LC_MESSAGES/file-roller.mo
share/locale/mk/LC_MESSAGES/file-roller.mo
share/locale/ml/LC_MESSAGES/file-roller.mo
share/locale/mn/LC_MESSAGES/file-roller.mo
+share/locale/mr/LC_MESSAGES/file-roller.mo
share/locale/ms/LC_MESSAGES/file-roller.mo
share/locale/nb/LC_MESSAGES/file-roller.mo
share/locale/ne/LC_MESSAGES/file-roller.mo
share/locale/nl/LC_MESSAGES/file-roller.mo
share/locale/nn/LC_MESSAGES/file-roller.mo
+share/locale/or/LC_MESSAGES/file-roller.mo
share/locale/pa/LC_MESSAGES/file-roller.mo
share/locale/pl/LC_MESSAGES/file-roller.mo
share/locale/pt/LC_MESSAGES/file-roller.mo
@@ -183,24 +194,6 @@ share/locale/xh/LC_MESSAGES/file-roller.mo
share/locale/zh_CN/LC_MESSAGES/file-roller.mo
share/locale/zh_HK/LC_MESSAGES/file-roller.mo
share/locale/zh_TW/LC_MESSAGES/file-roller.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
@dirrm share/gnome/omf/file-roller
@dirrm share/gnome/help/file-roller/zh_TW/figures
@dirrm share/gnome/help/file-roller/zh_TW
@@ -214,6 +207,8 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm share/gnome/help/file-roller/sv
@dirrm share/gnome/help/file-roller/ru/figures
@dirrm share/gnome/help/file-roller/ru
+@dirrm share/gnome/help/file-roller/nl/figures
+@dirrm share/gnome/help/file-roller/nl
@dirrm share/gnome/help/file-roller/ko/figures
@dirrm share/gnome/help/file-roller/ko
@dirrm share/gnome/help/file-roller/ja/figures
@@ -236,3 +231,63 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index 0ec434e9168e..7533e54b00ae 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -3,10 +3,12 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gnome-audio/Makefile,v 1.3 2006/07/22 19:49:20 mezz Exp $
#
PORTNAME= gnome-audio
PORTVERSION= 2.0.0
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-audio/2.0
@@ -15,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Sound files for use with GNOME 2
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
NO_BUILD= yes
USE_GNOME= gnomehack gnomeprefix gnomehier
WRKSRC= ${WRKDIR}/${DISTNAME}/sounds
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 73d253d0f2e0..748b29828485 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/gnomemedia2/Makefile,v 1.95 2006/04/13 07:52:30 bland Exp $
+# $MCom: ports/audio/gnome-media/Makefile,v 1.98 2006/09/04 15:30:37 ahze Exp $
#
PORTNAME= gnome-media
-PORTVERSION= 2.14.2
+PORTVERSION= 2.16.0
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,14 +19,14 @@ COMMENT= Multimedia applications for the GNOME 2 desktop
USE_BZIP2= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
-USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \
gail nautiluscdburner
USE_GSTREAMER= esound gconf good
+CONFIGURE_ARGS= --enable-ipv6
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index c9fcebf948f0..5d7158692d42 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.14.2.tar.bz2) = 16c35916f429c5ea04fb942b4072643b
-SHA256 (gnome2/gnome-media-2.14.2.tar.bz2) = efc333f0d5abae23d3bd4f340daecf0e2882001e10de9f98bc71cec6dabfe005
-SIZE (gnome2/gnome-media-2.14.2.tar.bz2) = 2925474
+MD5 (gnome2/gnome-media-2.16.0.tar.bz2) = abb57b11214cd245fc5e47f6db87e767
+SHA256 (gnome2/gnome-media-2.16.0.tar.bz2) = bca256365751952436e97106202e1a9d5cbd50d6cfe56b9443e0193581e99011
+SIZE (gnome2/gnome-media-2.16.0.tar.bz2) = 2973940
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index fedada4af316..bffaa7d31406 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -32,7 +32,7 @@ share/gnome/applications/gnome-sound-recorder.desktop
share/gnome/applications/gnome-volume-control.desktop
share/gnome/applications/gstreamer-properties.desktop
share/gnome/applications/reclevel.desktop
-share/gnome/applications/vumeter.desktop
+share/gnome/applications/vumeter.desktop.in
share/gnome/gnome-media/glade/gnome-audio-profiles.glade2
share/gnome/gnome-media/pixmaps/3dsound.png
share/gnome/gnome-media/pixmaps/chain-broken.png
@@ -446,12 +446,15 @@ share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
share/locale/be/LC_MESSAGES/gnome-media-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-media-2.0.mo
share/locale/bn/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/br/LC_MESSAGES/gnome-media-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-media-2.0.mo
share/locale/da/LC_MESSAGES/gnome-media-2.0.mo
share/locale/de/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-media-2.0.mo
share/locale/el/LC_MESSAGES/gnome-media-2.0.mo
share/locale/en_CA/LC_MESSAGES/gnome-media-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-media-2.0.mo
@@ -476,14 +479,17 @@ share/locale/ko/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-media-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-media-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/mg/LC_MESSAGES/gnome-media-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ml/LC_MESSAGES/gnome-media-2.0.mo
share/locale/mn/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/mr/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo
share/locale/nb/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ne/LC_MESSAGES/gnome-media-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/or/LC_MESSAGES/gnome-media-2.0.mo
share/locale/pa/LC_MESSAGES/gnome-media-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-media-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-media-2.0.mo
@@ -585,3 +591,57 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm include/gnome-media/profiles
@dirrm include/gnome-media
@dirrm include/cddb-slave2
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/audio/gstreamer-monkeysaudio/Makefile b/audio/gstreamer-monkeysaudio/Makefile
index 72c41991fb3d..0cf1436d58c6 100644
--- a/audio/gstreamer-monkeysaudio/Makefile
+++ b/audio/gstreamer-monkeysaudio/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gstreamer
PORTVERSION= 0.8.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= audio
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst${PKGNAMESUFFIX}/
PKGNAMESUFFIX= -monkeysaudio
@@ -16,11 +16,10 @@ DISTNAME= gst${PKGNAMESUFFIX}-${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= GStreamer plugin for monkeysaudio files
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_GNOME= lthack gnomehack gnomeprefix
+USE_GNOME= lthack gnomehack
USE_GSTREAMER80= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -33,7 +32,7 @@ post-install:
${DOCSDIR}/GStreamer-monkeysaudio-permit
.endif
# register plugins
- -@${X11BASE}/bin/gst-register-${GST_VERSION} \
+ -@${LOCALBASE}/bin/gst-register-${GST_VERSION} \
--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml 2>/dev/null
.include <bsd.port.mk>
diff --git a/audio/gstreamer-monkeysaudio/pkg-plist b/audio/gstreamer-monkeysaudio/pkg-plist
index ff4e18f86e63..05a24a2eedfe 100644
--- a/audio/gstreamer-monkeysaudio/pkg-plist
+++ b/audio/gstreamer-monkeysaudio/pkg-plist
@@ -2,6 +2,6 @@ lib/gstreamer-%%VERSION%%/libgstmonkeysaudio.a
lib/gstreamer-%%VERSION%%/libgstmonkeysaudio.la
lib/gstreamer-%%VERSION%%/libgstmonkeysaudio.so
%%PORTDOCS%%%%DOCSDIR%%/GStreamer-monkeysaudio-permit
-@exec %%X11BASE%%/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@exec %%LOCALBASE%%/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@unexec %%X11BASE%%/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@unexec %%LOCALBASE%%/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
diff --git a/audio/gstreamer-plugins-pulse/Makefile b/audio/gstreamer-plugins-pulse/Makefile
new file mode 100644
index 000000000000..a8414f0d0a6c
--- /dev/null
+++ b/audio/gstreamer-plugins-pulse/Makefile
@@ -0,0 +1,33 @@
+# New ports collection makefile for: gstreamer-plugins-pulse
+# Date created: July 22, 2006
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= gstreamer-plugins
+PORTVERSION= 0.9.3
+CATEGORIES= audio
+MASTER_SITES= http://0pointer.de/lennart/projects/gst-pulse/
+PKGNAMESUFFIX= -pulse
+DISTNAME= gst${PKGNAMESUFFIX}-${PORTVERSION}
+
+MAINTAINER= multimedia@FreeBSD.org
+COMMENT= GStreamer plugin for pulseaudio
+
+LIB_DEPENDS= pulse.0:${PORTSDIR}/audio/pulseaudio
+
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+USE_GNOME= lthack gnomehack
+USE_GSTREAMER= yes
+CONFIGURE_ARGS= --disable-lynx
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+PLIST_FILES= lib/gstreamer-0.10/libgstpulse.a \
+ lib/gstreamer-0.10/libgstpulse.la \
+ lib/gstreamer-0.10/libgstpulse.so \
+ lib/gstreamer-0.10/libgstpulse.so.0
+
+.include <bsd.port.mk>
diff --git a/audio/gstreamer-plugins-pulse/distinfo b/audio/gstreamer-plugins-pulse/distinfo
new file mode 100644
index 000000000000..45e5faaccdc6
--- /dev/null
+++ b/audio/gstreamer-plugins-pulse/distinfo
@@ -0,0 +1,3 @@
+MD5 (gst-pulse-0.9.3.tar.gz) = 70c1897c7a51589797984a67dab90c86
+SHA256 (gst-pulse-0.9.3.tar.gz) = abcd8d3e7941e3c6ac8b71cad9b886c78b09b24db760b73eaf85ed92e9ea7aee
+SIZE (gst-pulse-0.9.3.tar.gz) = 331324
diff --git a/audio/gstreamer-plugins-pulse/pkg-descr b/audio/gstreamer-plugins-pulse/pkg-descr
new file mode 100644
index 000000000000..4091cea11873
--- /dev/null
+++ b/audio/gstreamer-plugins-pulse/pkg-descr
@@ -0,0 +1,3 @@
+Gstreamer plugins for pulseaudio
+
+WWW: http://0pointer.de/lennart/projects/gst-pulse/
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
new file mode 100644
index 000000000000..6c94b88a9d51
--- /dev/null
+++ b/audio/pulseaudio/Makefile
@@ -0,0 +1,60 @@
+# New ports collection makefile for: polypaudio
+# Date created: 29 October 2004
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/audio/pulseaudio/Makefile,v 1.5 2006/09/10 00:51:05 mezz Exp $
+
+PORTNAME= pulseaudio
+PORTVERSION= 0.9.3
+CATEGORIES= audio
+MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Sound server for UNIX
+
+LIB_DEPENDS= samplerate.1:${PORTSDIR}/audio/libsamplerate \
+ oil-0.3.1:${PORTSDIR}/devel/liboil
+
+CONFLICTS= polypaudio-[1-9]*
+
+USE_GNOME= gnometarget gnomehack glib20
+WANT_GNOME= yes
+USE_XLIB= yes
+USE_LDCONFIG= yes
+USE_AUTOTOOLS= libltdl:15
+GNU_CONFIGURE= yes
+USE_GMAKE= yes
+USE_GETOPT_LONG=yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ LIBS="-lm"
+
+CONFIGURE_ARGS+= --disable-lirc # untested
+
+.include <bsd.port.pre.mk>
+
+.if (exists(${LOCALBASE}/lib/libavahi-core.a) || defined(PACKAGE_BUILDING) \
+ || defined(WITH_AVAHI)) && !defined(WITHOUT_AVAHI)
+LIB_DEPENDS+= avahi-core.4:${PORTSDIR}/net/avahi
+CONFIGURE_ARGS+= --enable-avahi
+PLIST_SUB+= AVAHI=""
+.else
+CONFIGURE_ARGS+= --disable-avahi
+PLIST_SUB+= AVAHI="@comment "
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/src/daemon/default.pa.in
+
+post-install:
+.for ii in default.pa daemon.conf client.conf
+ ${INSTALL_DATA} ${WRKSRC}/src/${ii} \
+ ${PREFIX}/etc/pulse/${ii}-dist
+.endfor
+.if !defined(PACKAGE_BUILDING)
+ @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
new file mode 100644
index 000000000000..a8e84ec9c86f
--- /dev/null
+++ b/audio/pulseaudio/distinfo
@@ -0,0 +1,3 @@
+MD5 (pulseaudio-0.9.3.tar.gz) = 65da3e44e0580425dae628f7e39149cb
+SHA256 (pulseaudio-0.9.3.tar.gz) = f07bd02e1769485c72bd299e4eb28f9eb29a96fb943267e26e49b6ba34d377fc
+SIZE (pulseaudio-0.9.3.tar.gz) = 1111287
diff --git a/audio/pulseaudio/files/patch-src_daemon_default.pa.in b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
new file mode 100644
index 000000000000..caa3c7a3df71
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
@@ -0,0 +1,11 @@
+--- src/daemon/default.pa.in.orig Sat Jul 22 11:58:50 2006
++++ src/daemon/default.pa.in Sat Jul 22 12:22:20 2006
+@@ -60,7 +60,7 @@
+ .nofail
+
+ ### Load something to the sample cache
+-load-sample x11-bell /usr/share/sounds/gtk-events/activate.wav
++load-sample x11-bell %%LOCALBASE%%/share/gnome/sounds/gtk-events/activate.wav
+ #load-sample-dir-lazy /usr/share/sounds/*.wav
+
+ ### Load X11 bell module
diff --git a/audio/pulseaudio/pkg-descr b/audio/pulseaudio/pkg-descr
new file mode 100644
index 000000000000..4c2c80914e4e
--- /dev/null
+++ b/audio/pulseaudio/pkg-descr
@@ -0,0 +1,8 @@
+PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
+Win32 systems. A sound server is basically a proxy for your sound applications.
+It allows you to do advanced operations on your sound data as it passes between
+your application and your hardware. Things like transferring the audio to a
+different machine, changing the sample format or channel count and mixing
+several sounds into one are easily achieved using a sound server.
+
+WWW: http://pulseaudio.org/
diff --git a/audio/pulseaudio/pkg-install b/audio/pulseaudio/pkg-install
new file mode 100644
index 000000000000..f4d1fb1121fe
--- /dev/null
+++ b/audio/pulseaudio/pkg-install
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+ GROUP=realtime
+ GID=557
+ PW=/usr/sbin/pw
+
+ if ${PW} group show "${GROUP}" 2>/dev/null; then
+ echo "You already have a group \"${GROUP}\", so I will use it."
+ else
+ if ${PW} groupadd ${GROUP} -g ${GID}; then
+ echo "Added group \"${GROUP}\"."
+ else
+ echo "Adding group \"${GROUP}\" failed..."
+ exit 1
+ fi
+ fi
+
+ exit 0
+ ;;
+esac
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
new file mode 100644
index 000000000000..ed335cb685fe
--- /dev/null
+++ b/audio/pulseaudio/pkg-plist
@@ -0,0 +1,254 @@
+bin/esdcompat
+%%AVAHI%%bin/pabrowse
+bin/pacat
+bin/pacmd
+bin/pactl
+bin/padsp
+bin/paplay
+bin/parec
+bin/pax11publish
+bin/pulseaudio
+@unexec if cmp -s %D/etc/pulse/client.conf %D/etc/pulse/client.conf-dist; then rm -f %D/etc/pulse/client.conf; fi
+etc/pulse/client.conf-dist
+@unexec if cmp -s %D/etc/pulse/daemon.conf %D/etc/pulse/daemon.conf-dist; then rm -f %D/etc/pulse/daemon.conf; fi
+etc/pulse/daemon.conf-dist
+@unexec if cmp -s %D/etc/pulse/default.pa %D/etc/pulse/default.pa-dist; then rm -f %D/etc/pulse/default.pa; fi
+etc/pulse/default.pa-dist
+%%AVAHI%%include/pulse/browser.h
+include/pulse/cdecl.h
+include/pulse/channelmap.h
+include/pulse/context.h
+include/pulse/def.h
+include/pulse/error.h
+include/pulse/glib-mainloop.h
+include/pulse/introspect.h
+include/pulse/mainloop-api.h
+include/pulse/mainloop-signal.h
+include/pulse/mainloop.h
+include/pulse/operation.h
+include/pulse/pulseaudio.h
+include/pulse/sample.h
+include/pulse/scache.h
+include/pulse/simple.h
+include/pulse/stream.h
+include/pulse/subscribe.h
+include/pulse/thread-mainloop.h
+include/pulse/timeval.h
+include/pulse/utf8.h
+include/pulse/util.h
+include/pulse/version.h
+include/pulse/volume.h
+include/pulse/xmalloc.h
+include/pulsecore/authkey-prop.h
+include/pulsecore/authkey.h
+include/pulsecore/autoload.h
+%%AVAHI%%include/pulsecore/avahi-wrap.h
+include/pulsecore/cli-command.h
+include/pulsecore/cli-text.h
+include/pulsecore/cli.h
+include/pulsecore/client.h
+include/pulsecore/conf-parser.h
+include/pulsecore/core-def.h
+include/pulsecore/core-scache.h
+include/pulsecore/core-subscribe.h
+include/pulsecore/core-util.h
+include/pulsecore/core.h
+include/pulsecore/creds.h
+include/pulsecore/dynarray.h
+include/pulsecore/esound.h
+include/pulsecore/g711.h
+include/pulsecore/hashmap.h
+include/pulsecore/idxset.h
+include/pulsecore/iochannel.h
+include/pulsecore/ioline.h
+include/pulsecore/ipacl.h
+include/pulsecore/log.h
+include/pulsecore/mcalign.h
+include/pulsecore/memblock.h
+include/pulsecore/memblockq.h
+include/pulsecore/memchunk.h
+include/pulsecore/modargs.h
+include/pulsecore/modinfo.h
+include/pulsecore/module.h
+include/pulsecore/namereg.h
+include/pulsecore/native-common.h
+include/pulsecore/packet.h
+include/pulsecore/parseaddr.h
+include/pulsecore/pdispatch.h
+include/pulsecore/pid.h
+include/pulsecore/play-memchunk.h
+include/pulsecore/props.h
+include/pulsecore/protocol-cli.h
+include/pulsecore/protocol-esound.h
+include/pulsecore/protocol-http.h
+include/pulsecore/protocol-native.h
+include/pulsecore/protocol-simple.h
+include/pulsecore/pstream-util.h
+include/pulsecore/pstream.h
+include/pulsecore/queue.h
+include/pulsecore/random.h
+include/pulsecore/resampler.h
+include/pulsecore/sample-util.h
+include/pulsecore/sconv.h
+include/pulsecore/sink-input.h
+include/pulsecore/sink.h
+include/pulsecore/sioman.h
+include/pulsecore/socket-client.h
+include/pulsecore/socket-server.h
+include/pulsecore/socket-util.h
+include/pulsecore/sound-file-stream.h
+include/pulsecore/sound-file.h
+include/pulsecore/source-output.h
+include/pulsecore/source.h
+include/pulsecore/strbuf.h
+include/pulsecore/strlist.h
+include/pulsecore/tagstruct.h
+include/pulsecore/tokenizer.h
+include/pulsecore/x11prop.h
+include/pulsecore/x11wrap.h
+%%AVAHI%%lib/libpulse-browse.a
+%%AVAHI%%lib/libpulse-browse.la
+%%AVAHI%%lib/libpulse-browse.so
+%%AVAHI%%lib/libpulse-browse.so.1
+lib/libpulse-mainloop-glib.a
+lib/libpulse-mainloop-glib.la
+lib/libpulse-mainloop-glib.so
+lib/libpulse-mainloop-glib.so.0
+lib/libpulse-simple.a
+lib/libpulse-simple.la
+lib/libpulse-simple.so
+lib/libpulse-simple.so.0
+lib/libpulse.a
+lib/libpulse.la
+lib/libpulse.so
+lib/libpulse.so.0
+lib/libpulsecore.a
+lib/libpulsecore.la
+lib/libpulsecore.so
+lib/libpulsecore.so.1
+lib/libpulsedsp.so
+lib/pulse-0.9/modules/libauthkey-prop.la
+lib/pulse-0.9/modules/libauthkey-prop.so
+lib/pulse-0.9/modules/libauthkey.la
+lib/pulse-0.9/modules/libauthkey.so
+%%AVAHI%%lib/pulse-0.9/modules/libavahi-wrap.la
+%%AVAHI%%lib/pulse-0.9/modules/libavahi-wrap.so
+lib/pulse-0.9/modules/libcli.la
+lib/pulse-0.9/modules/libcli.so
+lib/pulse-0.9/modules/libiochannel.la
+lib/pulse-0.9/modules/libiochannel.so
+lib/pulse-0.9/modules/libioline.la
+lib/pulse-0.9/modules/libioline.so
+lib/pulse-0.9/modules/libipacl.la
+lib/pulse-0.9/modules/libipacl.so
+lib/pulse-0.9/modules/liboss-util.la
+lib/pulse-0.9/modules/liboss-util.so
+lib/pulse-0.9/modules/libpacket.la
+lib/pulse-0.9/modules/libpacket.so
+lib/pulse-0.9/modules/libparseaddr.la
+lib/pulse-0.9/modules/libparseaddr.so
+lib/pulse-0.9/modules/libpdispatch.la
+lib/pulse-0.9/modules/libpdispatch.so
+lib/pulse-0.9/modules/libprotocol-cli.la
+lib/pulse-0.9/modules/libprotocol-cli.so
+lib/pulse-0.9/modules/libprotocol-esound.la
+lib/pulse-0.9/modules/libprotocol-esound.so
+lib/pulse-0.9/modules/libprotocol-http.la
+lib/pulse-0.9/modules/libprotocol-http.so
+lib/pulse-0.9/modules/libprotocol-native.la
+lib/pulse-0.9/modules/libprotocol-native.so
+lib/pulse-0.9/modules/libprotocol-simple.la
+lib/pulse-0.9/modules/libprotocol-simple.so
+lib/pulse-0.9/modules/libpstream-util.la
+lib/pulse-0.9/modules/libpstream-util.so
+lib/pulse-0.9/modules/libpstream.la
+lib/pulse-0.9/modules/libpstream.so
+lib/pulse-0.9/modules/librtp.la
+lib/pulse-0.9/modules/librtp.so
+lib/pulse-0.9/modules/libsocket-client.la
+lib/pulse-0.9/modules/libsocket-client.so
+lib/pulse-0.9/modules/libsocket-server.la
+lib/pulse-0.9/modules/libsocket-server.so
+lib/pulse-0.9/modules/libsocket-util.la
+lib/pulse-0.9/modules/libsocket-util.so
+lib/pulse-0.9/modules/libstrlist.la
+lib/pulse-0.9/modules/libstrlist.so
+lib/pulse-0.9/modules/libtagstruct.la
+lib/pulse-0.9/modules/libtagstruct.so
+lib/pulse-0.9/modules/libx11prop.la
+lib/pulse-0.9/modules/libx11prop.so
+lib/pulse-0.9/modules/libx11wrap.la
+lib/pulse-0.9/modules/libx11wrap.so
+lib/pulse-0.9/modules/module-cli-protocol-tcp.la
+lib/pulse-0.9/modules/module-cli-protocol-tcp.so
+lib/pulse-0.9/modules/module-cli-protocol-unix.la
+lib/pulse-0.9/modules/module-cli-protocol-unix.so
+lib/pulse-0.9/modules/module-cli.la
+lib/pulse-0.9/modules/module-cli.so
+lib/pulse-0.9/modules/module-combine.la
+lib/pulse-0.9/modules/module-combine.so
+lib/pulse-0.9/modules/module-detect.la
+lib/pulse-0.9/modules/module-detect.so
+lib/pulse-0.9/modules/module-esound-compat-spawnfd.la
+lib/pulse-0.9/modules/module-esound-compat-spawnfd.so
+lib/pulse-0.9/modules/module-esound-compat-spawnpid.la
+lib/pulse-0.9/modules/module-esound-compat-spawnpid.so
+lib/pulse-0.9/modules/module-esound-protocol-tcp.la
+lib/pulse-0.9/modules/module-esound-protocol-tcp.so
+lib/pulse-0.9/modules/module-esound-protocol-unix.la
+lib/pulse-0.9/modules/module-esound-protocol-unix.so
+lib/pulse-0.9/modules/module-esound-sink.la
+lib/pulse-0.9/modules/module-esound-sink.so
+lib/pulse-0.9/modules/module-http-protocol-tcp.la
+lib/pulse-0.9/modules/module-http-protocol-tcp.so
+lib/pulse-0.9/modules/module-http-protocol-unix.la
+lib/pulse-0.9/modules/module-http-protocol-unix.so
+lib/pulse-0.9/modules/module-match.la
+lib/pulse-0.9/modules/module-match.so
+lib/pulse-0.9/modules/module-native-protocol-fd.la
+lib/pulse-0.9/modules/module-native-protocol-fd.so
+lib/pulse-0.9/modules/module-native-protocol-tcp.la
+lib/pulse-0.9/modules/module-native-protocol-tcp.so
+lib/pulse-0.9/modules/module-native-protocol-unix.la
+lib/pulse-0.9/modules/module-native-protocol-unix.so
+lib/pulse-0.9/modules/module-null-sink.la
+lib/pulse-0.9/modules/module-null-sink.so
+lib/pulse-0.9/modules/module-oss-mmap.la
+lib/pulse-0.9/modules/module-oss-mmap.so
+lib/pulse-0.9/modules/module-oss.la
+lib/pulse-0.9/modules/module-oss.so
+lib/pulse-0.9/modules/module-pipe-sink.la
+lib/pulse-0.9/modules/module-pipe-sink.so
+lib/pulse-0.9/modules/module-pipe-source.la
+lib/pulse-0.9/modules/module-pipe-source.so
+lib/pulse-0.9/modules/module-rtp-recv.la
+lib/pulse-0.9/modules/module-rtp-recv.so
+lib/pulse-0.9/modules/module-rtp-send.la
+lib/pulse-0.9/modules/module-rtp-send.so
+lib/pulse-0.9/modules/module-simple-protocol-tcp.la
+lib/pulse-0.9/modules/module-simple-protocol-tcp.so
+lib/pulse-0.9/modules/module-simple-protocol-unix.la
+lib/pulse-0.9/modules/module-simple-protocol-unix.so
+lib/pulse-0.9/modules/module-sine.la
+lib/pulse-0.9/modules/module-sine.so
+lib/pulse-0.9/modules/module-tunnel-sink.la
+lib/pulse-0.9/modules/module-tunnel-sink.so
+lib/pulse-0.9/modules/module-tunnel-source.la
+lib/pulse-0.9/modules/module-tunnel-source.so
+lib/pulse-0.9/modules/module-volume-restore.la
+lib/pulse-0.9/modules/module-volume-restore.so
+lib/pulse-0.9/modules/module-x11-bell.la
+lib/pulse-0.9/modules/module-x11-bell.so
+lib/pulse-0.9/modules/module-x11-publish.la
+lib/pulse-0.9/modules/module-x11-publish.so
+%%AVAHI%%lib/pulse-0.9/modules/module-zeroconf-publish.la
+%%AVAHI%%lib/pulse-0.9/modules/module-zeroconf-publish.so
+%%AVAHI%%libdata/pkgconfig/libpulse-browse.pc
+libdata/pkgconfig/libpulse-mainloop-glib.pc
+libdata/pkgconfig/libpulse-simple.pc
+libdata/pkgconfig/libpulse.pc
+@dirrm lib/pulse-0.9/modules
+@dirrm lib/pulse-0.9
+@dirrm include/pulsecore
+@dirrm include/pulse
+@dirrm etc/pulse
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 9ecdf9c661b6..6780edd6a8d0 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -3,11 +3,11 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/sound-juicer/Makefile,v 1.49 2006/04/14 15:06:00 ahze Exp $
+# $MCom: ports/audio/sound-juicer/Makefile,v 1.61 2006/10/01 16:32:05 ahze Exp $
#
PORTNAME= sound-juicer
-PORTVERSION= 2.14.4
+PORTVERSION= 2.16.1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,7 +22,7 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner \
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index acfef0b995c1..fb9879c50a95 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/sound-juicer-2.14.4.tar.bz2) = 677ed6e3e7b4aa1602d35c46a8e0bc31
-SHA256 (gnome2/sound-juicer-2.14.4.tar.bz2) = 30e0a3dd054a7758f6021176ed384892b12ddabf5ce19163646a0920d4140649
-SIZE (gnome2/sound-juicer-2.14.4.tar.bz2) = 876858
+MD5 (gnome2/sound-juicer-2.16.1.tar.bz2) = 4611ab664a863fe68ea1f3b0aeb7aa7b
+SHA256 (gnome2/sound-juicer-2.16.1.tar.bz2) = cadf15fea7c253cb5fcc4c6c47c72f44fa8b1b69bd2f809a59a94fe0f9180564
+SIZE (gnome2/sound-juicer-2.16.1.tar.bz2) = 1252424
diff --git a/audio/sound-juicer/files/patch-src::Makefile.in b/audio/sound-juicer/files/patch-src::Makefile.in
index 189365e86d3f..5162e8641328 100644
--- a/audio/sound-juicer/files/patch-src::Makefile.in
+++ b/audio/sound-juicer/files/patch-src::Makefile.in
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig Mon Apr 3 23:40:45 2006
-+++ src/Makefile.in Mon Apr 3 23:40:45 2006
-@@ -77,7 +77,7 @@ am_sound_juicer_OBJECTS = dummy.$(OBJEXT
- gconf-bridge.$(OBJEXT) bacon-volume.$(OBJEXT) $(am__objects_2) \
- $(am__objects_3) $(am__objects_4)
- sound_juicer_OBJECTS = $(am_sound_juicer_OBJECTS)
--sound_juicer_LDADD = $(LDADD)
-+sound_juicer_LDADD = $(LDADD) -lcam
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
+--- src/Makefile.in.orig Wed May 17 14:08:25 2006
++++ src/Makefile.in Wed May 17 14:09:00 2006
+@@ -304,7 +304,7 @@
+ $(BACON_FILES) \
+ $(ID3MUX_FILES)
+
+-sound_juicer_LDADD = $(top_builddir)/libjuicer/libjuicer.la
++sound_juicer_LDADD = $(top_builddir)/libjuicer/libjuicer.la -lcam
+ sound_juicer_LDFLAGS = @MEDIA_PROFILES_LIBS@ @GSTREAMER_LIBS@ \
+ @BURN_LIBS@ @UI_LIBS@ $(am__append_2)
+ BACON_DIR = $(srcdir)/../../libbacon/src/
diff --git a/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c b/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c
deleted file mode 100644
index c510a48dc6f4..000000000000
--- a/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/sj-metadata-musicbrainz.c.orig Mon Jan 17 13:22:54 2005
-+++ src/sj-metadata-musicbrainz.c Mon Jan 17 13:23:02 2005
-@@ -18,7 +18,6 @@
- * Boston, MA 02111-1307, USA.
- */
-
--#include "sound-juicer.h"
-
- #include <string.h>
- #include <glib-object.h>
-@@ -32,6 +31,7 @@
- #include <stdlib.h>
- #include <unistd.h>
-
-+#include "sound-juicer.h"
- #include "sj-metadata-musicbrainz.h"
- #include "sj-structures.h"
- #include "sj-error.h"
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index 75ed982ba8e2..876fedd1f6ad 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -5,24 +5,42 @@ share/gnome/help/sound-juicer/C/figures/prefs.png
share/gnome/help/sound-juicer/C/figures/startup.png
share/gnome/help/sound-juicer/C/legal.xml
share/gnome/help/sound-juicer/C/sound-juicer.xml
+share/gnome/help/sound-juicer/el/fdl-appendix.xml
+share/gnome/help/sound-juicer/el/figures/prefs.png
+share/gnome/help/sound-juicer/el/figures/startup.png
+share/gnome/help/sound-juicer/el/legal.xml
+share/gnome/help/sound-juicer/el/sound-juicer.xml
share/gnome/help/sound-juicer/es/fdl-appendix.xml
share/gnome/help/sound-juicer/es/figures/prefs.png
share/gnome/help/sound-juicer/es/figures/startup.png
share/gnome/help/sound-juicer/es/legal.xml
share/gnome/help/sound-juicer/es/sound-juicer.xml
+share/gnome/help/sound-juicer/fr/fdl-appendix.xml
+share/gnome/help/sound-juicer/fr/figures/prefs.png
+share/gnome/help/sound-juicer/fr/figures/startup.png
+share/gnome/help/sound-juicer/fr/legal.xml
+share/gnome/help/sound-juicer/fr/sound-juicer.xml
share/gnome/help/sound-juicer/nl/fdl-appendix.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
share/gnome/help/sound-juicer/nl/sound-juicer.xml
+share/gnome/help/sound-juicer/sv/fdl-appendix.xml
+share/gnome/help/sound-juicer/sv/figures/prefs.png
+share/gnome/help/sound-juicer/sv/figures/startup.png
+share/gnome/help/sound-juicer/sv/legal.xml
+share/gnome/help/sound-juicer/sv/sound-juicer.xml
share/gnome/help/sound-juicer/uk/fdl-appendix.xml
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/omf/sound-juicer/sound-juicer-C.omf
+share/gnome/omf/sound-juicer/sound-juicer-el.omf
share/gnome/omf/sound-juicer/sound-juicer-es.omf
+share/gnome/omf/sound-juicer/sound-juicer-fr.omf
share/gnome/omf/sound-juicer/sound-juicer-nl.omf
+share/gnome/omf/sound-juicer/sound-juicer-sv.omf
share/gnome/omf/sound-juicer/sound-juicer-uk.omf
share/gnome/sound-juicer/sj-play.png
share/gnome/sound-juicer/sj-record.png
@@ -36,12 +54,14 @@ share/locale/az/LC_MESSAGES/sound-juicer.mo
share/locale/be/LC_MESSAGES/sound-juicer.mo
share/locale/bg/LC_MESSAGES/sound-juicer.mo
share/locale/bn/LC_MESSAGES/sound-juicer.mo
+share/locale/bn_IN/LC_MESSAGES/sound-juicer.mo
share/locale/br/LC_MESSAGES/sound-juicer.mo
share/locale/ca/LC_MESSAGES/sound-juicer.mo
share/locale/cs/LC_MESSAGES/sound-juicer.mo
share/locale/cy/LC_MESSAGES/sound-juicer.mo
share/locale/da/LC_MESSAGES/sound-juicer.mo
share/locale/de/LC_MESSAGES/sound-juicer.mo
+share/locale/dz/LC_MESSAGES/sound-juicer.mo
share/locale/el/LC_MESSAGES/sound-juicer.mo
share/locale/en_CA/LC_MESSAGES/sound-juicer.mo
share/locale/en_GB/LC_MESSAGES/sound-juicer.mo
@@ -53,6 +73,7 @@ share/locale/fi/LC_MESSAGES/sound-juicer.mo
share/locale/fr/LC_MESSAGES/sound-juicer.mo
share/locale/gl/LC_MESSAGES/sound-juicer.mo
share/locale/gu/LC_MESSAGES/sound-juicer.mo
+share/locale/he/LC_MESSAGES/sound-juicer.mo
share/locale/hi/LC_MESSAGES/sound-juicer.mo
share/locale/hr/LC_MESSAGES/sound-juicer.mo
share/locale/hu/LC_MESSAGES/sound-juicer.mo
@@ -62,13 +83,16 @@ share/locale/ja/LC_MESSAGES/sound-juicer.mo
share/locale/ka/LC_MESSAGES/sound-juicer.mo
share/locale/ko/LC_MESSAGES/sound-juicer.mo
share/locale/lt/LC_MESSAGES/sound-juicer.mo
+share/locale/lv/LC_MESSAGES/sound-juicer.mo
share/locale/mk/LC_MESSAGES/sound-juicer.mo
share/locale/ml/LC_MESSAGES/sound-juicer.mo
+share/locale/mn/LC_MESSAGES/sound-juicer.mo
share/locale/ms/LC_MESSAGES/sound-juicer.mo
share/locale/nb/LC_MESSAGES/sound-juicer.mo
share/locale/ne/LC_MESSAGES/sound-juicer.mo
share/locale/nl/LC_MESSAGES/sound-juicer.mo
-share/locale/no/LC_MESSAGES/sound-juicer.mo
+share/locale/nn/LC_MESSAGES/sound-juicer.mo
+share/locale/or/LC_MESSAGES/sound-juicer.mo
share/locale/pa/LC_MESSAGES/sound-juicer.mo
share/locale/pl/LC_MESSAGES/sound-juicer.mo
share/locale/pt/LC_MESSAGES/sound-juicer.mo
@@ -77,6 +101,7 @@ share/locale/ro/LC_MESSAGES/sound-juicer.mo
share/locale/ru/LC_MESSAGES/sound-juicer.mo
share/locale/rw/LC_MESSAGES/sound-juicer.mo
share/locale/sk/LC_MESSAGES/sound-juicer.mo
+share/locale/sl/LC_MESSAGES/sound-juicer.mo
share/locale/sq/LC_MESSAGES/sound-juicer.mo
share/locale/sr/LC_MESSAGES/sound-juicer.mo
share/locale/sr@Latn/LC_MESSAGES/sound-juicer.mo
@@ -91,18 +116,70 @@ share/locale/xh/LC_MESSAGES/sound-juicer.mo
share/locale/zh_CN/LC_MESSAGES/sound-juicer.mo
share/locale/zh_HK/LC_MESSAGES/sound-juicer.mo
share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
@dirrmtry share/icons/hicolor/24x24/apps
@dirrmtry share/icons/hicolor/24x24
@dirrm share/gnome/sound-juicer
@dirrm share/gnome/omf/sound-juicer
@dirrm share/gnome/help/sound-juicer/uk/figures
@dirrm share/gnome/help/sound-juicer/uk
+@dirrm share/gnome/help/sound-juicer/sv/figures
+@dirrm share/gnome/help/sound-juicer/sv
@dirrm share/gnome/help/sound-juicer/nl/figures
@dirrm share/gnome/help/sound-juicer/nl
+@dirrm share/gnome/help/sound-juicer/fr/figures
+@dirrm share/gnome/help/sound-juicer/fr
@dirrm share/gnome/help/sound-juicer/es/figures
@dirrm share/gnome/help/sound-juicer/es
+@dirrm share/gnome/help/sound-juicer/el/figures
+@dirrm share/gnome/help/sound-juicer/el
@dirrm share/gnome/help/sound-juicer/C/figures
@dirrm share/gnome/help/sound-juicer/C
@dirrm share/gnome/help/sound-juicer
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index c289f423b1ef..f58505bc9690 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/evolution-data-server/Makefile,v 1.83 2006/04/13 07:52:30 bland Exp $
+# $MCom: ports/databases/evolution-data-server/Makefile,v 1.99 2006/10/03 00:13:42 ahze Exp $
#
PORTNAME= evolution-data-server
-PORTVERSION= 1.6.3
+PORTVERSION= 1.8.1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -24,12 +24,13 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnomeui \
ltverhack
USE_OPENLDAP= yes
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_BDB= 41
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static \
--enable-nss=yes \
--with-openldap=yes \
@@ -37,11 +38,14 @@ CONFIGURE_ARGS= --enable-static \
--with-nss-libs=${LOCALBASE}/lib \
--with-nspr-includes=${LOCALBASE}/include/nspr \
--with-nspr-libs=${LOCALBASE}/lib \
- --with-krb5=/usr
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+ --with-krb5=/usr \
+ --with-libdb=${LOCALBASE}
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-PLIST_SUB= VERSION="1.6" EVO_VERSION="1.2"
+PLIST_SUB= VERSION="1.8" EVO_VERSION="1.2"
+
+OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off
.include <bsd.port.pre.mk>
@@ -61,4 +65,15 @@ CONFIGURE_ARGS+= --with-krb5=${LOCALBASE}
.endif
.endif
+.if defined(WITH_IMAP4) || defined(PACKAGE_BUILDING)
+CONFIGURE_ARGS+= --enable-imap4=yes
+PLIST_SUB+= IMAP4=""
+.else
+PLIST_SUB+= IMAP4="@comment "
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.post.mk>
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index 5c3d6605569f..10f365ce130e 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-1.6.3.tar.bz2) = e40343fa6a80916da3f4d1ba5d118c89
-SHA256 (gnome2/evolution-data-server-1.6.3.tar.bz2) = c31a11fd745195b15a4399ec3e83ccf7bafb5d25852c89a7c6a24af49df25922
-SIZE (gnome2/evolution-data-server-1.6.3.tar.bz2) = 7047514
+MD5 (gnome2/evolution-data-server-1.8.1.tar.bz2) = 8c2fe35bcdc457e09728ed213e915d01
+SHA256 (gnome2/evolution-data-server-1.8.1.tar.bz2) = 5fb63ea67899ba3d6f1866594a2f237609b36eb985e9621ee3cb494e15e71956
+SIZE (gnome2/evolution-data-server-1.8.1.tar.bz2) = 7119647
diff --git a/databases/evolution-data-server/files/patch-camel_camel-object.c b/databases/evolution-data-server/files/patch-camel_camel-object.c
deleted file mode 100644
index 03e01116584a..000000000000
--- a/databases/evolution-data-server/files/patch-camel_camel-object.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- camel/camel-object.c.orig Sun Feb 19 17:04:42 2006
-+++ camel/camel-object.c Sun Feb 19 17:06:06 2006
-@@ -454,7 +454,7 @@ cobject_state_read(CamelObject *obj, FIL
- }
-
- /* we batch up the properties and set them in one go */
-- if (!(argv = g_try_malloc (sizeof (*argv) + (count - CAMEL_ARGV_MAX) * sizeof (argv->argv[0]))))
-+ if (!(argv = g_try_malloc ((guint32) (sizeof (*argv) + (count - CAMEL_ARGV_MAX) * sizeof (argv->argv[0])))))
- return -1;
-
- argv->argc = 0;
-@@ -534,8 +534,8 @@ cobject_state_write(CamelObject *obj, FI
-
- count = g_slist_length(props);
-
-- arggetv = g_malloc0(sizeof(*arggetv) + (count - CAMEL_ARGV_MAX) * sizeof(arggetv->argv[0]));
-- argv = g_malloc0(sizeof(*argv) + (count - CAMEL_ARGV_MAX) * sizeof(argv->argv[0]));
-+ arggetv = g_malloc0((guint32) (sizeof(*arggetv) + (count - CAMEL_ARGV_MAX) * sizeof(arggetv->argv[0])));
-+ argv = g_malloc0((guint32) (sizeof(*argv) + (count - CAMEL_ARGV_MAX) * sizeof(argv->argv[0])));
- l = props;
- i = 0;
- while (l) {
diff --git a/databases/evolution-data-server/files/patch-offical-sleepycat b/databases/evolution-data-server/files/patch-offical-sleepycat
deleted file mode 100644
index 0cd4d7909728..000000000000
--- a/databases/evolution-data-server/files/patch-offical-sleepycat
+++ /dev/null
@@ -1,480 +0,0 @@
---- libdb/fileops/fop_util.c.orig Thu Nov 20 23:13:30 2003
-+++ libdb/fileops/fop_util.c Fri Mar 18 20:31:10 2005
-@@ -40,7 +40,7 @@
- u_int32_t __lockval; \
- \
- if (LOCKING_ON((ENV))) { \
-- __lockval = 0; \
-+ __lockval = 1; \
- __dbt.data = &__lockval; \
- __dbt.size = sizeof(__lockval); \
- if ((ret = (ENV)->lock_get((ENV), (ID), \
---- libdb/dbinc/mp.h.orig Thu Nov 20 23:13:17 2003
-+++ libdb/dbinc/mp.h Fri Mar 18 20:31:14 2005
-@@ -149,6 +149,13 @@
- * region lock).
- */
- DB_MPOOL_STAT stat; /* Per-cache mpool statistics. */
-+
-+ /*
-+ * We track page puts so that we can decide when allocation is never
-+ * going to succeed. We don't lock the field, all we care about is
-+ * if it changes.
-+ */
-+ u_int32_t put_counter; /* Count of page put calls. */
- };
-
- struct __db_mpool_hash {
---- libdb/mp/mp_fput.c.orig Thu Nov 20 23:13:36 2003
-+++ libdb/mp/mp_fput.c Fri Mar 18 20:31:14 2005
-@@ -19,6 +19,8 @@
- #include "dbinc/db_shash.h"
- #include "dbinc/mp.h"
-
-+static void __memp_reset_lru __P((DB_ENV *, REGINFO *));
-+
- /*
- * __memp_fput --
- * Mpool file put function.
-@@ -198,5 +200,56 @@
-
- MUTEX_UNLOCK(dbenv, &hp->hash_mutex);
-
-+ /*
-+ * On every buffer put we update the buffer generation number and check
-+ * for wraparound.
-+ */
-+ if (++c_mp->lru_count == UINT32_T_MAX)
-+ __memp_reset_lru(dbenv, dbmp->reginfo);
-+
- return (0);
-+}
-+
-+/*
-+ * __memp_reset_lru --
-+ * Reset the cache LRU counter.
-+ */
-+static void
-+__memp_reset_lru(dbenv, memreg)
-+ DB_ENV *dbenv;
-+ REGINFO *memreg;
-+{
-+ BH *bhp;
-+ DB_MPOOL_HASH *hp;
-+ MPOOL *c_mp;
-+ int bucket;
-+
-+ c_mp = memreg->primary;
-+
-+ /*
-+ * Update the counter so all future allocations will start at the
-+ * bottom.
-+ */
-+ c_mp->lru_count -= MPOOL_BASE_DECREMENT;
-+
-+ /* Adjust the priority of every buffer in the system. */
-+ for (hp = R_ADDR(memreg, c_mp->htab),
-+ bucket = 0; bucket < c_mp->htab_buckets; ++hp, ++bucket) {
-+ /*
-+ * Skip empty buckets.
-+ *
-+ * We can check for empty buckets before locking as we
-+ * only care if the pointer is zero or non-zero.
-+ */
-+ if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) == NULL)
-+ continue;
-+
-+ MUTEX_LOCK(dbenv, &hp->hash_mutex);
-+ for (bhp = SH_TAILQ_FIRST(&hp->hash_bucket, __bh);
-+ bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh))
-+ if (bhp->priority != UINT32_T_MAX &&
-+ bhp->priority > MPOOL_BASE_DECREMENT)
-+ bhp->priority -= MPOOL_BASE_DECREMENT;
-+ MUTEX_UNLOCK(dbenv, &hp->hash_mutex);
-+ }
- }
---- libdb/mp/mp_alloc.c.orig Thu Nov 20 23:13:36 2003
-+++ libdb/mp/mp_alloc.c Fri Mar 18 20:31:14 2005
-@@ -25,7 +25,6 @@
- } HS;
-
- static void __memp_bad_buffer __P((DB_MPOOL_HASH *));
--static void __memp_reset_lru __P((DB_ENV *, REGINFO *, MPOOL *));
-
- /*
- * __memp_alloc --
-@@ -50,8 +49,9 @@
- MPOOL *c_mp;
- MPOOLFILE *bh_mfp;
- size_t freed_space;
-- u_int32_t buckets, buffers, high_priority, max_na, priority;
-- int aggressive, ret;
-+ u_int32_t buckets, buffers, high_priority, priority, put_counter;
-+ u_int32_t total_buckets;
-+ int aggressive, giveup, ret;
- void *p;
-
- dbenv = dbmp->dbenv;
-@@ -59,18 +59,13 @@
- dbht = R_ADDR(memreg, c_mp->htab);
- hp_end = &dbht[c_mp->htab_buckets];
-
-- buckets = buffers = 0;
-- aggressive = 0;
-+ buckets = buffers = put_counter = total_buckets = 0;
-+ aggressive = giveup = 0;
-+ hp_tmp = NULL;
-
- c_mp->stat.st_alloc++;
-
- /*
-- * Get aggressive if we've tried to flush the number of pages as are
-- * in the system without finding space.
-- */
-- max_na = 5 * c_mp->htab_buckets;
--
-- /*
- * If we're allocating a buffer, and the one we're discarding is the
- * same size, we don't want to waste the time to re-integrate it into
- * the shared memory free list. If the DB_MPOOLFILE argument isn't
-@@ -81,19 +76,10 @@
- len = (sizeof(BH) - sizeof(u_int8_t)) + mfp->stat.st_pagesize;
-
- R_LOCK(dbenv, memreg);
--
-- /*
-- * On every buffer allocation we update the buffer generation number
-- * and check for wraparound.
-- */
-- if (++c_mp->lru_count == UINT32_T_MAX)
-- __memp_reset_lru(dbenv, memreg, c_mp);
--
- /*
- * Anything newer than 1/10th of the buffer pool is ignored during
- * allocation (unless allocation starts failing).
- */
-- DB_ASSERT(c_mp->lru_count > c_mp->stat.st_pages / 10);
- high_priority = c_mp->lru_count - c_mp->stat.st_pages / 10;
-
- /*
-@@ -120,10 +106,11 @@
- * We're not holding the region locked here, these statistics
- * can't be trusted.
- */
-- if (buckets != 0) {
-- if (buckets > c_mp->stat.st_alloc_max_buckets)
-- c_mp->stat.st_alloc_max_buckets = buckets;
-- c_mp->stat.st_alloc_buckets += buckets;
-+ total_buckets += buckets;
-+ if (total_buckets != 0) {
-+ if (total_buckets > c_mp->stat.st_alloc_max_buckets)
-+ c_mp->stat.st_alloc_max_buckets = total_buckets;
-+ c_mp->stat.st_alloc_buckets += total_buckets;
- }
- if (buffers != 0) {
- if (buffers > c_mp->stat.st_alloc_max_pages)
-@@ -131,6 +118,12 @@
- c_mp->stat.st_alloc_pages += buffers;
- }
- return (0);
-+ } else if (giveup || c_mp->stat.st_pages == 0) {
-+ R_UNLOCK(dbenv, memreg);
-+
-+ __db_err(dbenv,
-+ "unable to allocate space from the buffer cache");
-+ return (ret);
- }
-
- /*
-@@ -138,26 +131,24 @@
- * we need. Reset our free-space counter.
- */
- freed_space = 0;
-+ total_buckets += buckets;
-+ buckets = 0;
-
- /*
- * Walk the hash buckets and find the next two with potentially useful
- * buffers. Free the buffer with the lowest priority from the buckets'
- * chains.
- */
-- for (hp_tmp = NULL;;) {
-+ for (;;) {
-+ /* All pages have been freed, make one last try */
-+ if (c_mp->stat.st_pages == 0)
-+ goto alloc;
-+
- /* Check for wrap around. */
- hp = &dbht[c_mp->last_checked++];
- if (hp >= hp_end) {
- c_mp->last_checked = 0;
--
-- /*
-- * If we've gone through all of the hash buckets, try
-- * an allocation. If the cache is small, the old page
-- * size is small, and the new page size is large, we
-- * might have freed enough memory (but not 3 times the
-- * memory).
-- */
-- goto alloc;
-+ hp = &dbht[c_mp->last_checked++];
- }
-
- /*
-@@ -172,39 +163,59 @@
- /*
- * The failure mode is when there are too many buffers we can't
- * write or there's not enough memory in the system. We don't
-- * have a metric for deciding if allocation has no possible way
-- * to succeed, so we don't ever fail, we assume memory will be
-- * available if we wait long enough.
-+ * have a way to know that allocation has no way to succeed.
-+ * We fail if there were no pages returned to the cache after
-+ * we've been trying for a relatively long time.
- *
-- * Get aggressive if we've tried to flush 5 times the number of
-- * hash buckets as are in the system -- it's possible we have
-- * been repeatedly trying to flush the same buffers, although
-- * it's unlikely. Aggressive means:
-+ * Get aggressive if we've tried to flush the number of hash
-+ * buckets as are in the system and have not found any more
-+ * space. Aggressive means:
- *
- * a: set a flag to attempt to flush high priority buffers as
- * well as other buffers.
- * b: sync the mpool to force out queue extent pages. While we
- * might not have enough space for what we want and flushing
- * is expensive, why not?
-- * c: sleep for a second -- hopefully someone else will run and
-- * free up some memory. Try to allocate memory too, in case
-- * the other thread returns its memory to the region.
-- * d: look at a buffer in every hash bucket rather than choose
-+ * c: look at a buffer in every hash bucket rather than choose
- * the more preferable of two.
-+ * d: start to think about giving up.
-+ *
-+ * If we get here twice, sleep for a second, hopefully someone
-+ * else will run and free up some memory.
-+ *
-+ * Always try to allocate memory too, in case some other thread
-+ * returns its memory to the region.
- *
- * !!!
- * This test ignores pathological cases like no buffers in the
- * system -- that shouldn't be possible.
- */
-- if ((++buckets % max_na) == 0) {
-- aggressive = 1;
--
-+ if ((++buckets % c_mp->htab_buckets) == 0) {
-+ if (freed_space > 0)
-+ goto alloc;
- R_UNLOCK(dbenv, memreg);
-
-- (void)__memp_sync_int(
-- dbenv, NULL, 0, DB_SYNC_ALLOC, NULL);
--
-- (void)__os_sleep(dbenv, 1, 0);
-+ switch (++aggressive) {
-+ case 1:
-+ break;
-+ case 2:
-+ put_counter = c_mp->put_counter;
-+ /* FALLTHROUGH */
-+ case 3:
-+ case 4:
-+ case 5:
-+ case 6:
-+ (void)__memp_sync_int(
-+ dbenv, NULL, 0, DB_SYNC_ALLOC, NULL);
-+
-+ (void)__os_sleep(dbenv, 1, 0);
-+ break;
-+ default:
-+ aggressive = 1;
-+ if (put_counter == c_mp->put_counter)
-+ giveup = 1;
-+ break;
-+ }
-
- R_LOCK(dbenv, memreg);
- goto alloc;
-@@ -277,7 +288,8 @@
- * thread may have acquired this buffer and incremented the ref
- * count after we wrote it, in which case we can't have it.
- *
-- * If there's a write error, avoid selecting this buffer again
-+ * If there's a write error and we're having problems finding
-+ * something to allocate, avoid selecting this buffer again
- * by making it the bucket's least-desirable buffer.
- */
- if (ret != 0 || bhp->ref != 0) {
-@@ -301,6 +313,8 @@
-
- freed_space += __db_shsizeof(bhp);
- __memp_bhfree(dbmp, hp, bhp, 1);
-+ if (aggressive > 1)
-+ aggressive = 1;
-
- /*
- * Unlock this hash bucket and re-acquire the region lock. If
-@@ -360,54 +374,6 @@
-
- /* Reset the hash bucket's priority. */
- hp->hash_priority = SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
--}
--
--/*
-- * __memp_reset_lru --
-- * Reset the cache LRU counter.
-- */
--static void
--__memp_reset_lru(dbenv, memreg, c_mp)
-- DB_ENV *dbenv;
-- REGINFO *memreg;
-- MPOOL *c_mp;
--{
-- BH *bhp;
-- DB_MPOOL_HASH *hp;
-- int bucket;
--
-- /*
-- * Update the counter so all future allocations will start at the
-- * bottom.
-- */
-- c_mp->lru_count -= MPOOL_BASE_DECREMENT;
--
-- /* Release the region lock. */
-- R_UNLOCK(dbenv, memreg);
--
-- /* Adjust the priority of every buffer in the system. */
-- for (hp = R_ADDR(memreg, c_mp->htab),
-- bucket = 0; bucket < c_mp->htab_buckets; ++hp, ++bucket) {
-- /*
-- * Skip empty buckets.
-- *
-- * We can check for empty buckets before locking as we
-- * only care if the pointer is zero or non-zero.
-- */
-- if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) == NULL)
-- continue;
--
-- MUTEX_LOCK(dbenv, &hp->hash_mutex);
-- for (bhp = SH_TAILQ_FIRST(&hp->hash_bucket, __bh);
-- bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh))
-- if (bhp->priority != UINT32_T_MAX &&
-- bhp->priority > MPOOL_BASE_DECREMENT)
-- bhp->priority -= MPOOL_BASE_DECREMENT;
-- MUTEX_UNLOCK(dbenv, &hp->hash_mutex);
-- }
--
-- /* Reacquire the region lock. */
-- R_LOCK(dbenv, memreg);
- }
-
- #ifdef DIAGNOSTIC
---- libdb/dbreg/dbreg_rec.c.orig Thu Nov 20 23:13:19 2003
-+++ libdb/dbreg/dbreg_rec.c Fri Mar 18 20:31:14 2005
-@@ -174,19 +174,20 @@
- * Typically, closes should match an open which means
- * that if this is a close, there should be a valid
- * entry in the dbentry table when we get here,
-- * however there is an exception. If this is an
-+ * however there are exceptions. 1. If this is an
- * OPENFILES pass, then we may have started from
- * a log file other than the first, and the
- * corresponding open appears in an earlier file.
-- * We can ignore that case, but all others are errors.
-+ * 2. If we are undoing an open on an abort or
-+ * recovery, it's possible that we failed after
-+ * the log record, but before we actually entered
-+ * a handle here.
- */
- dbe = &dblp->dbentry[argp->fileid];
- if (dbe->dbp == NULL && !dbe->deleted) {
- /* No valid entry here. */
-- if ((argp->opcode != LOG_CLOSE &&
-- argp->opcode != LOG_RCLOSE) ||
-- (op != DB_TXN_OPENFILES &&
-- op !=DB_TXN_POPENFILES)) {
-+ if (DB_REDO(op) ||
-+ argp->opcode == LOG_CHECKPOINT) {
- __db_err(dbenv,
- "Improper file close at %lu/%lu",
- (u_long)lsnp->file,
---- libdb/env/env_recover.c.orig Thu Nov 20 23:13:20 2003
-+++ libdb/env/env_recover.c Fri Mar 18 20:31:14 2005
-@@ -232,12 +232,9 @@
- * we'll still need to do a vtruncate based on information we haven't
- * yet collected.
- */
-- if (ret == DB_NOTFOUND) {
-+ if (ret == DB_NOTFOUND)
- ret = 0;
-- if (max_lsn == NULL)
-- goto done;
-- }
-- if (ret != 0)
-+ else if (ret != 0)
- goto err;
-
- hi_txn = txnid;
-@@ -331,7 +328,7 @@
-
- /* Find a low txnid. */
- ret = 0;
-- do {
-+ if (hi_txn != 0) do {
- /* txnid is after rectype, which is a u_int32. */
- memcpy(&txnid,
- (u_int8_t *)data.data + sizeof(u_int32_t), sizeof(txnid));
-@@ -344,11 +341,8 @@
- * There are no transactions and we're not recovering to an LSN (see
- * above), so there is nothing to do.
- */
-- if (ret == DB_NOTFOUND) {
-+ if (ret == DB_NOTFOUND)
- ret = 0;
-- if (max_lsn == NULL)
-- goto done;
-- }
-
- /* Reset to the first lsn. */
- if (ret != 0 || (ret = logc->get(logc, &first_lsn, &data, DB_SET)) != 0)
-@@ -367,6 +361,10 @@
- txninfo, &data, &first_lsn, &last_lsn, nfiles, 1)) != 0)
- goto err;
-
-+ /* If there were no transactions, then we can bail out early. */
-+ if (hi_txn == 0 && max_lsn == NULL)
-+ goto done;
-+
- /*
- * Pass #2.
- *
-@@ -483,6 +481,7 @@
- if ((ret = __dbreg_close_files(dbenv)) != 0)
- goto err;
-
-+done:
- if (max_lsn != NULL) {
- region->last_ckp = ((DB_TXNHEAD *)txninfo)->ckplsn;
-
-@@ -538,7 +537,8 @@
- __db_err(dbenv, "Recovery complete at %.24s", ctime(&now));
- __db_err(dbenv, "%s %lx %s [%lu][%lu]",
- "Maximum transaction ID",
-- ((DB_TXNHEAD *)txninfo)->maxid,
-+ txninfo == NULL ? TXN_MINIMUM :
-+ ((DB_TXNHEAD *)txninfo)->maxid,
- "Recovery checkpoint",
- (u_long)region->last_ckp.file,
- (u_long)region->last_ckp.offset);
-@@ -550,7 +550,6 @@
- (u_long)lsn.file, (u_long)lsn.offset, pass);
- }
-
--done:
- err: if (lockid != DB_LOCK_INVALIDID) {
- if ((t_ret = __rep_unlockpages(dbenv, lockid)) != 0 && ret == 0)
- ret = t_ret;
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index eee832eb15bd..f603e10dea56 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -92,6 +92,7 @@ include/evolution-data-server-%%VERSION%%/camel/camel-stream-fs.h
include/evolution-data-server-%%VERSION%%/camel/camel-stream-mem.h
include/evolution-data-server-%%VERSION%%/camel/camel-stream-null.h
include/evolution-data-server-%%VERSION%%/camel/camel-stream-process.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-vfs.h
include/evolution-data-server-%%VERSION%%/camel/camel-stream.h
include/evolution-data-server-%%VERSION%%/camel/camel-string-utils.h
include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream-raw.h
@@ -134,6 +135,7 @@ include/evolution-data-server-%%VERSION%%/exchange/e2k-validate.h
include/evolution-data-server-%%VERSION%%/exchange/e2k-xml-utils.h
include/evolution-data-server-%%VERSION%%/exchange/exchange-account.h
include/evolution-data-server-%%VERSION%%/exchange/exchange-constants.h
+include/evolution-data-server-%%VERSION%%/exchange/exchange-esource.h
include/evolution-data-server-%%VERSION%%/exchange/exchange-folder-size.h
include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy-foreign.h
include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy-somedav.h
@@ -174,6 +176,7 @@ include/evolution-data-server-%%VERSION%%/libecal/e-cal-view-listener.h
include/evolution-data-server-%%VERSION%%/libecal/e-cal-view.h
include/evolution-data-server-%%VERSION%%/libecal/e-cal.h
include/evolution-data-server-%%VERSION%%/libedata-book/Evolution-DataServer-Addressbook.h
+include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-db-cache.h
include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-cache.h
include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-factory.h
include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-sexp.h
@@ -291,10 +294,10 @@ lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.a
lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.la
lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.so
lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.urls
-lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.a
-lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.la
-lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.so
-lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.urls
+%%IMAP4%%lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.a
+%%IMAP4%%lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.la
+%%IMAP4%%lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.so
+%%IMAP4%%lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap4.urls
lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamellocal.a
lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamellocal.la
lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamellocal.so
@@ -356,11 +359,11 @@ lib/libcamel-provider-%%EVO_VERSION%%.so.8
lib/libebook-%%EVO_VERSION%%.a
lib/libebook-%%EVO_VERSION%%.la
lib/libebook-%%EVO_VERSION%%.so
-lib/libebook-%%EVO_VERSION%%.so.5
+lib/libebook-%%EVO_VERSION%%.so.9
lib/libecal-%%EVO_VERSION%%.a
lib/libecal-%%EVO_VERSION%%.la
lib/libecal-%%EVO_VERSION%%.so
-lib/libecal-%%EVO_VERSION%%.so.6
+lib/libecal-%%EVO_VERSION%%.so.7
lib/libedata-book-%%EVO_VERSION%%.a
lib/libedata-book-%%EVO_VERSION%%.la
lib/libedata-book-%%EVO_VERSION%%.so
@@ -368,7 +371,7 @@ lib/libedata-book-%%EVO_VERSION%%.so.2
lib/libedata-cal-%%EVO_VERSION%%.a
lib/libedata-cal-%%EVO_VERSION%%.la
lib/libedata-cal-%%EVO_VERSION%%.so
-lib/libedata-cal-%%EVO_VERSION%%.so.5
+lib/libedata-cal-%%EVO_VERSION%%.so.6
lib/libedataserver-%%EVO_VERSION%%.a
lib/libedataserver-%%EVO_VERSION%%.la
lib/libedataserver-%%EVO_VERSION%%.so
@@ -376,15 +379,15 @@ lib/libedataserver-%%EVO_VERSION%%.so.7
lib/libedataserverui-%%EVO_VERSION%%.a
lib/libedataserverui-%%EVO_VERSION%%.la
lib/libedataserverui-%%EVO_VERSION%%.so
-lib/libedataserverui-%%EVO_VERSION%%.so.6
+lib/libedataserverui-%%EVO_VERSION%%.so.8
lib/libegroupwise-%%EVO_VERSION%%.a
lib/libegroupwise-%%EVO_VERSION%%.la
lib/libegroupwise-%%EVO_VERSION%%.so
-lib/libegroupwise-%%EVO_VERSION%%.so.10
+lib/libegroupwise-%%EVO_VERSION%%.so.12
lib/libexchange-storage-%%EVO_VERSION%%.a
lib/libexchange-storage-%%EVO_VERSION%%.la
lib/libexchange-storage-%%EVO_VERSION%%.so
-lib/libexchange-storage-%%EVO_VERSION%%.so.1
+lib/libexchange-storage-%%EVO_VERSION%%.so.2
libdata/bonobo/servers/GNOME_Evolution_DataServer_%%EVO_VERSION%%.server
libdata/pkgconfig/camel-%%EVO_VERSION%%.pc
libdata/pkgconfig/camel-provider-%%EVO_VERSION%%.pc
@@ -413,7 +416,7 @@ share/doc/libebook/index.sgml
share/doc/libebook/left.png
share/doc/libebook/libebook-EAddressWestern.html
share/doc/libebook/libebook-ENameWestern.html
-share/doc/libebook/libebook-e-book-async.html
+share/doc/libebook/EDestination.html
share/doc/libebook/libebook-e-book-query.html
share/doc/libebook/libebook-e-book-types.html
share/doc/libebook/libebook.devhelp
@@ -904,6 +907,7 @@ share/locale/az/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/be/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/bg/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/bn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/bn_IN/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/bs/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -940,12 +944,13 @@ share/locale/lv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/mk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/ml/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/mn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/mr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/ms/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/nb/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/ne/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/nl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/nn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-share/locale/no/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/pa/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/pl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/pt/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -959,6 +964,7 @@ share/locale/sq/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/sr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/sr@Latn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/sv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/th/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/tr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/uk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -968,14 +974,6 @@ share/locale/xh/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
@dirrm share/gnome/pixmaps/evolution-data-server-%%VERSION%%
@dirrm share/gnome/idl/evolution-data-server-%%EVO_VERSION%%
@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific
@@ -1013,3 +1011,55 @@ share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@dirrm include/evolution-data-server-%%VERSION%%/exchange
@dirrm include/evolution-data-server-%%VERSION%%/camel
@dirrm include/evolution-data-server-%%VERSION%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/en_AU/LC_MESSAGES
+@dirrmtry share/locale/en_AU
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 757e15f510f8..6be5a9c183be 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/databases/libgda2/Makefile,v 1.35 2006/09/10 00:51:06 mezz Exp $
#
PORTNAME= libgda2
PORTVERSION= 1.2.3
-PORTREVISION?= 1
+PORTREVISION?= 2
PORTEPOCH?= 1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -29,9 +30,9 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack glib20 libxslt referencehack
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-bdb
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index 11899b4e4441..ba1df008fdb0 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -163,3 +163,33 @@ share/locale/zh_TW/LC_MESSAGES/libgda-2.mo
@dirrm include/libgda-%%VERSION%%/libgda
@dirrm include/libgda-%%VERSION%%
@dirrm etc/libgda
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index 9968aed9e613..6f6c3fa91561 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -3,24 +3,37 @@
# Whom: FreeBSD GNOME Team
#
# $FreeBSD$
-#
+# $MCom: ports/deskutils/alacarte/Makefile,v 1.10 2006/10/10 18:48:41 marcus Exp $
PORTNAME= alacarte
-PORTVERSION= 0.8
-PORTREVISION= 1
-CATEGORIES= deskutils
-MASTER_SITES= http://dev.realistanew.com/${PORTNAME}/releases/${PORTVERSION}/
+PORTVERSION= 0.10.1
+CATEGORIES= deskutils gnome
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= An editor for the freedesktop.org menu specification
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
-
-USE_GNOME= pygtk2 pygnome2
+USE_BZIP2= yes
+USE_GNOME= gnomehack gnomeprefix pygnomedesktop intlhack
+USE_GMAKE= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_INSTALLARGS= -c -O1 --prefix=${PREFIX} --install-lib=${PYTHON_SITELIBDIR}
+INSTALLS_ICONS= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ GMSGFMT="${LOCALBASE}/bin/msgfmt"
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
+ ${WRKSRC}/Alacarte/MenuEditor.py
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
+ ${WRKSRC}/Alacarte/DialogHandler.py \
+ ${WRKSRC}/Alacarte/util.py
+ @${REINPLACE_CMD} -e 's|gmsgfmt|msgfmt|g ; \
+ s|python2.4|${PYTHON_VERSION}|g' \
+ ${WRKSRC}/configure
.include <bsd.port.mk>
diff --git a/deskutils/alacarte/distinfo b/deskutils/alacarte/distinfo
index cb69ea50ece3..60944af8d104 100644
--- a/deskutils/alacarte/distinfo
+++ b/deskutils/alacarte/distinfo
@@ -1,3 +1,3 @@
-MD5 (alacarte-0.8.tar.gz) = 849fc35c84c81736974217bb810390b1
-SHA256 (alacarte-0.8.tar.gz) = ce641daadef32b6a880571bde315ce2f3dc88e8e62ef47b48c5b4fb5e33a3a62
-SIZE (alacarte-0.8.tar.gz) = 69330
+MD5 (gnome2/alacarte-0.10.1.tar.bz2) = 3e425ad3bbfe059699a9996419dc8422
+SHA256 (gnome2/alacarte-0.10.1.tar.bz2) = 7330529a95368ccb4e8f1084c305785e234f15f03e007ffe9383438ec6f9b061
+SIZE (gnome2/alacarte-0.10.1.tar.bz2) = 197077
diff --git a/deskutils/alacarte/files/patch-Alacarte_DialogHandler.py b/deskutils/alacarte/files/patch-Alacarte_DialogHandler.py
new file mode 100644
index 000000000000..5cc05fc614e9
--- /dev/null
+++ b/deskutils/alacarte/files/patch-Alacarte_DialogHandler.py
@@ -0,0 +1,11 @@
+--- Alacarte/DialogHandler.py.orig Wed Jul 26 20:53:06 2006
++++ Alacarte/DialogHandler.py Wed Jul 26 20:53:14 2006
+@@ -84,7 +84,7 @@ class DialogHandler:
+ if button.icon_path:
+ dialog.set_current_folder(button.icon_path.rsplit('/', 1)[0])
+ else:
+- dialog.set_current_folder('/usr/share/icons/')
++ dialog.set_current_folder('/usr/local/share/icons/')
+ preview = gtk.VBox()
+ preview.set_spacing(8)
+ preview.set_size_request(92, 92)
diff --git a/deskutils/alacarte/files/patch-Alacarte_util.py b/deskutils/alacarte/files/patch-Alacarte_util.py
new file mode 100644
index 000000000000..94ad287792de
--- /dev/null
+++ b/deskutils/alacarte/files/patch-Alacarte_util.py
@@ -0,0 +1,29 @@
+--- Alacarte/util.py.orig Tue Oct 3 15:11:10 2006
++++ Alacarte/util.py Tue Oct 3 15:12:35 2006
+@@ -141,7 +141,7 @@
+ file_path = os.path.join(system_path, 'applications', file_id)
+ if os.path.isfile(file_path):
+ return file_path
+- file_path = os.path.join('/', 'usr', 'share', 'applications', file_id)
++ file_path = os.path.join('/', '/usr/local', 'share', 'gnome', 'applications', file_id)
+ if os.path.isfile(file_path):
+ return file_path
+ return False
+@@ -166,7 +166,7 @@
+ file_path = os.path.join(system_path, 'desktop-directories', file_id)
+ if os.path.isfile(file_path):
+ return file_path
+- file_path = os.path.join('/', 'usr', 'share', 'desktop-directories', file_id)
++ file_path = os.path.join('/', '/usr/local', 'share', 'gnome', 'desktop-directories', file_id)
+ if os.path.isfile(file_path):
+ return file_path
+ return False
+@@ -187,7 +187,7 @@
+ file_path = os.path.join(system_path, 'menus', file_name)
+ if os.path.isfile(file_path):
+ return file_path
+- file_path = os.path.join('/', 'etc', 'xdg', 'menus', file_name)
++ file_path = os.path.join('/', '/usr/local', 'etc', 'xdg', 'menus', file_name)
+ if os.path.isfile(file_path):
+ return file_path
+ return False
diff --git a/deskutils/alacarte/files/patch-GnomeDialogHandler.py b/deskutils/alacarte/files/patch-GnomeDialogHandler.py
deleted file mode 100644
index 87e3221c7837..000000000000
--- a/deskutils/alacarte/files/patch-GnomeDialogHandler.py
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/Alacarte/GnomeDialogHandler.py.orig Tue Oct 25 22:13:44 2005
-+++ src/Alacarte/GnomeDialogHandler.py Mon Dec 26 02:44:14 2005
-@@ -212,7 +212,10 @@
- )
- commandEntry.gtk_entry().set_completion(self.completion)
- iconButton = self.tree.get_widget('eiconbutton')
-- iconButton.set_pixmap_subdir(item.iconPath)
-+ if item.iconPath == None:
-+ iconButton.set_pixmap_subdir('')
-+ else:
-+ iconButton.set_pixmap_subdir(item.iconPath)
- termCheck = self.tree.get_widget('etermcheck')
- originalValues = (
- item.getKey('Name'), item.getKey('Comment'), item.getKey('Exec'),
-@@ -221,7 +224,10 @@
- nameEntry.set_text(item.getKey('Name'))
- commentEntry.set_text(item.getKey('Comment'))
- commandEntry.set_filename(item.getKey('Exec'))
-- iconButton.set_filename(item.iconPath)
-+ if item.iconPath == None:
-+ iconButton.set_filename('')
-+ else:
-+ iconButton.set_filename(item.iconPath)
- if item.getKey('Terminal') == 'true':
- termCheck.set_active(1)
- self.setupEntry = False
diff --git a/deskutils/alacarte/pkg-descr b/deskutils/alacarte/pkg-descr
index f324e4f41942..da883f8ed36b 100644
--- a/deskutils/alacarte/pkg-descr
+++ b/deskutils/alacarte/pkg-descr
@@ -1,6 +1,6 @@
-Alacarte is a simple freedesktop.org compliant menu editor
-for GNOME that lets you change your menus, simply and
-quickly. Just click and type to edit, add, and delete any
+Alacarte is a simple freedesktop.org compliant menu editor
+for GNOME that lets you change your menus, simply and
+quickly. Just click and type to edit, add, and delete any
menu entry.
WWW: http://www.realistanew.com/projects/alacarte/
diff --git a/deskutils/alacarte/pkg-plist b/deskutils/alacarte/pkg-plist
index 073e075d3c8d..35c1a54b8dbf 100644
--- a/deskutils/alacarte/pkg-plist
+++ b/deskutils/alacarte/pkg-plist
@@ -1,38 +1,123 @@
bin/alacarte
+%%PYTHON_SITELIBDIR%%/Alacarte/DialogHandler.py
+%%PYTHON_SITELIBDIR%%/Alacarte/DialogHandler.pyc
+%%PYTHON_SITELIBDIR%%/Alacarte/DialogHandler.pyo
+%%PYTHON_SITELIBDIR%%/Alacarte/MainWindow.py
+%%PYTHON_SITELIBDIR%%/Alacarte/MainWindow.pyc
+%%PYTHON_SITELIBDIR%%/Alacarte/MainWindow.pyo
+%%PYTHON_SITELIBDIR%%/Alacarte/MenuEditor.py
+%%PYTHON_SITELIBDIR%%/Alacarte/MenuEditor.pyc
+%%PYTHON_SITELIBDIR%%/Alacarte/MenuEditor.pyo
+%%PYTHON_SITELIBDIR%%/Alacarte/__init__.py
+%%PYTHON_SITELIBDIR%%/Alacarte/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Alacarte/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Alacarte/config.py
+%%PYTHON_SITELIBDIR%%/Alacarte/config.pyc
+%%PYTHON_SITELIBDIR%%/Alacarte/config.pyo
+%%PYTHON_SITELIBDIR%%/Alacarte/util.py
+%%PYTHON_SITELIBDIR%%/Alacarte/util.pyc
+%%PYTHON_SITELIBDIR%%/Alacarte/util.pyo
+share/gnome/alacarte/alacarte.glade
+share/gnome/alacarte/logo.svg
+share/gnome/applications/alacarte.desktop
+share/icons/hicolor/22x22/apps/alacarte.png
+share/icons/hicolor/icon-theme.cache
+share/icons/hicolor/scalable/apps/alacarte.svg
+share/locale/as/LC_MESSAGES/alacarte.mo
+share/locale/bg/LC_MESSAGES/alacarte.mo
+share/locale/bn/LC_MESSAGES/alacarte.mo
+share/locale/bn_IN/LC_MESSAGES/alacarte.mo
+share/locale/ca/LC_MESSAGES/alacarte.mo
+share/locale/cs/LC_MESSAGES/alacarte.mo
+share/locale/da/LC_MESSAGES/alacarte.mo
share/locale/de/LC_MESSAGES/alacarte.mo
+share/locale/dz/LC_MESSAGES/alacarte.mo
+share/locale/el/LC_MESSAGES/alacarte.mo
+share/locale/en_GB/LC_MESSAGES/alacarte.mo
share/locale/es/LC_MESSAGES/alacarte.mo
+share/locale/et/LC_MESSAGES/alacarte.mo
+share/locale/eu/LC_MESSAGES/alacarte.mo
+share/locale/fa/LC_MESSAGES/alacarte.mo
+share/locale/fi/LC_MESSAGES/alacarte.mo
share/locale/fr/LC_MESSAGES/alacarte.mo
+share/locale/gl/LC_MESSAGES/alacarte.mo
+share/locale/gu/LC_MESSAGES/alacarte.mo
+share/locale/hi/LC_MESSAGES/alacarte.mo
+share/locale/hu/LC_MESSAGES/alacarte.mo
+share/locale/it/LC_MESSAGES/alacarte.mo
+share/locale/ja/LC_MESSAGES/alacarte.mo
+share/locale/ka/LC_MESSAGES/alacarte.mo
+share/locale/ko/LC_MESSAGES/alacarte.mo
+share/locale/ku/LC_MESSAGES/alacarte.mo
+share/locale/lt/LC_MESSAGES/alacarte.mo
+share/locale/lv/LC_MESSAGES/alacarte.mo
+share/locale/mk/LC_MESSAGES/alacarte.mo
+share/locale/ml/LC_MESSAGES/alacarte.mo
+share/locale/mn/LC_MESSAGES/alacarte.mo
+share/locale/mr/LC_MESSAGES/alacarte.mo
share/locale/nb/LC_MESSAGES/alacarte.mo
share/locale/nl/LC_MESSAGES/alacarte.mo
-share/locale/no/LC_MESSAGES/alacarte.mo
-share/applications/alacarte.desktop
-@dirrmtry share/applications
-@cwd %%LOCALBASE%%
-%%PYTHON_SITELIBDIR%%/Alacarte/MenuHandler.py
-%%PYTHON_SITELIBDIR%%/Alacarte/PyXDGMenuHandler.py
-%%PYTHON_SITELIBDIR%%/Alacarte/__init__.py
-%%PYTHON_SITELIBDIR%%/Alacarte/GnomeFront.py
-%%PYTHON_SITELIBDIR%%/Alacarte/IconHandler.py
-%%PYTHON_SITELIBDIR%%/Alacarte/PyXDGIconHandler.py
-%%PYTHON_SITELIBDIR%%/Alacarte/config.py
-%%PYTHON_SITELIBDIR%%/Alacarte/GnomeDialogHandler.py
-%%PYTHON_SITELIBDIR%%/Alacarte/alacarte.glade
-%%PYTHON_SITELIBDIR%%/Alacarte/images/alacarte.svg
-%%PYTHON_SITELIBDIR%%/Alacarte/MenuHandler.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/PyXDGMenuHandler.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/GnomeFront.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/IconHandler.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/PyXDGIconHandler.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/config.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/GnomeDialogHandler.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/MenuHandler.pyo
-%%PYTHON_SITELIBDIR%%/Alacarte/PyXDGMenuHandler.pyo
-%%PYTHON_SITELIBDIR%%/Alacarte/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Alacarte/GnomeFront.pyo
-%%PYTHON_SITELIBDIR%%/Alacarte/IconHandler.pyo
-%%PYTHON_SITELIBDIR%%/Alacarte/PyXDGIconHandler.pyo
-%%PYTHON_SITELIBDIR%%/Alacarte/config.pyo
-%%PYTHON_SITELIBDIR%%/Alacarte/GnomeDialogHandler.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/Alacarte/images
+share/locale/or/LC_MESSAGES/alacarte.mo
+share/locale/pa/LC_MESSAGES/alacarte.mo
+share/locale/pl/LC_MESSAGES/alacarte.mo
+share/locale/pt/LC_MESSAGES/alacarte.mo
+share/locale/pt_BR/LC_MESSAGES/alacarte.mo
+share/locale/ru/LC_MESSAGES/alacarte.mo
+share/locale/si/LC_MESSAGES/alacarte.mo
+share/locale/sl/LC_MESSAGES/alacarte.mo
+share/locale/sr/LC_MESSAGES/alacarte.mo
+share/locale/sr@Latn/LC_MESSAGES/alacarte.mo
+share/locale/sv/LC_MESSAGES/alacarte.mo
+share/locale/ta/LC_MESSAGES/alacarte.mo
+share/locale/te/LC_MESSAGES/alacarte.mo
+share/locale/th/LC_MESSAGES/alacarte.mo
+share/locale/tr/LC_MESSAGES/alacarte.mo
+share/locale/uk/LC_MESSAGES/alacarte.mo
+share/locale/vi/LC_MESSAGES/alacarte.mo
+share/locale/zh_CN/LC_MESSAGES/alacarte.mo
+share/locale/zh_HK/LC_MESSAGES/alacarte.mo
+share/locale/zh_TW/LC_MESSAGES/alacarte.mo
+@dirrm share/gnome/alacarte
@dirrm %%PYTHON_SITELIBDIR%%/Alacarte
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 330265cec6ca..e91953900867 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,12 +3,13 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.24 2006/04/17 07:51:13 marcus Exp $
+# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.42 2006/09/07 19:05:16 marcus Exp $
#
PORTNAME= deskbar-applet
-PORTVERSION= 2.14.2
-CATEGORIES= deskutils
+PORTVERSION= 2.16.0
+PORTREVISION= 1
+CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
@@ -18,11 +19,12 @@ COMMENT= Gnome panel applet similar to Google's (Windows only) Deskbar
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack pygnomedesktop intlhack
USE_PYTHON= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
CONFIGURE_ARGS= --disable-beagle
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -55,9 +57,9 @@ CONFIGURE_ENV+= DISPLAY="localhost:1001"
post-patch:
@${FIND} ${WRKSRC}/deskbar -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|/usr/share/applications|${X11BASE}/share/gnome/applications|g'
+ 's|/usr/share/applications|${LOCALBASE}/share/gnome/applications|g'
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
- s|%%X11BASE%%|${X11BASE}|g' \
+ s|%%X11BASE%%|${X11BASE}|g ; s|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/deskbar/handlers/mozilla.py \
${WRKSRC}/deskbar/Utils.py
diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo
index 8af107872c72..49955c22683d 100644
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/deskbar-applet-2.14.2.tar.bz2) = 382379d0c4ca4bd73f14b25d3a04b7cc
-SHA256 (gnome2/deskbar-applet-2.14.2.tar.bz2) = d90e8a109e679a2e0ae015a712a6a403f4643615675ea34e0f47d0d0518835fd
-SIZE (gnome2/deskbar-applet-2.14.2.tar.bz2) = 498475
+MD5 (gnome2/deskbar-applet-2.16.0.tar.bz2) = 9f14a65f75142cd5b233bf9376a1f946
+SHA256 (gnome2/deskbar-applet-2.16.0.tar.bz2) = 835fcc0260f16bb462e476f277b46df0d5f77fd7afc8f9aab1159daaee685582
+SIZE (gnome2/deskbar-applet-2.16.0.tar.bz2) = 613562
diff --git a/deskutils/deskbar-applet/files/patch-deskbar___init__.py b/deskutils/deskbar-applet/files/patch-deskbar___init__.py
new file mode 100644
index 000000000000..dbe19007d25a
--- /dev/null
+++ b/deskutils/deskbar-applet/files/patch-deskbar___init__.py
@@ -0,0 +1,11 @@
+--- deskbar/__init__.py.orig Thu Sep 7 15:04:34 2006
++++ deskbar/__init__.py Thu Sep 7 15:04:50 2006
+@@ -26,7 +26,7 @@ if _check(name):
+ if UNINSTALLED_DESKBAR:
+ SHARED_DATA_DIR = abspath(join(dirname(__file__), '..', 'data'))
+ else:
+- SHARED_DATA_DIR = join(DATA_DIR, "deskbar-applet")
++ SHARED_DATA_DIR = join(DATA_DIR, "gnome", "deskbar-applet")
+ print "Data Dir: %s" % SHARED_DATA_DIR
+
+ HANDLERS_DIR = []
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py b/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
index 1cf0777c4a81..4b01cdd9be6f 100644
--- a/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
+++ b/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
@@ -1,6 +1,6 @@
---- deskbar/deskbar-applet.py.orig Mon Mar 13 23:23:20 2006
-+++ deskbar/deskbar-applet.py Mon Mar 13 23:23:52 2006
-@@ -42,10 +42,10 @@
+--- deskbar/deskbar-applet.py.orig Mon May 29 19:20:47 2006
++++ deskbar/deskbar-applet.py Mon May 29 19:20:54 2006
+@@ -42,10 +42,10 @@ if hasattr(gettext, 'bind_textdomain_cod
gettext.bind_textdomain_codeset('deskbar-applet','UTF-8')
gettext.textdomain('deskbar-applet')
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py b/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py
index a668777c193e..ffad36e44f87 100644
--- a/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py
+++ b/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py
@@ -4,7 +4,7 @@
get_firefox_home_file("searchplugins"),
get_firefox_home_file("search"),
expanduser("~/.mozilla/searchplugins"),
-+ "%%X11BASE%%/lib/firefox/searchplugins",
++ "%%LOCALBASE%%/lib/firefox/searchplugins",
"/usr/lib/firefox/searchplugins",
"/usr/local/lib/firefox/searchplugins",
"/usr/lib/mozilla-firefox/searchplugins",
@@ -12,7 +12,7 @@
smart_dirs = [
get_mozilla_home_file("search"),
expanduser("~/.mozilla/searchplugins"),
-+ "%%X11BASE%%/lib/mozilla/searchplugins",
++ "%%LOCALBASE%%/lib/mozilla/searchplugins",
"/usr/lib/mozilla/searchplugins",
"/usr/local/lib/mozilla/searchplugins"]
diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist
index af48e3b30b48..18cea3f78011 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -5,9 +5,9 @@ lib/deskbar-applet/handlers/beagle-live.pyo
lib/deskbar-applet/handlers/beagle-static.py
lib/deskbar-applet/handlers/beagle-static.pyc
lib/deskbar-applet/handlers/beagle-static.pyo
-lib/deskbar-applet/handlers/email_address.py
-lib/deskbar-applet/handlers/email_address.pyc
-lib/deskbar-applet/handlers/email_address.pyo
+lib/deskbar-applet/handlers/desklicious.py
+lib/deskbar-applet/handlers/desklicious.pyc
+lib/deskbar-applet/handlers/desklicious.pyo
lib/deskbar-applet/handlers/epiphany.py
lib/deskbar-applet/handlers/epiphany.pyc
lib/deskbar-applet/handlers/epiphany.pyo
@@ -23,27 +23,24 @@ lib/deskbar-applet/handlers/galago.pyo
lib/deskbar-applet/handlers/galeon.py
lib/deskbar-applet/handlers/galeon.pyc
lib/deskbar-applet/handlers/galeon.pyo
+lib/deskbar-applet/handlers/gdmactions.py
+lib/deskbar-applet/handlers/gdmactions.pyc
+lib/deskbar-applet/handlers/gdmactions.pyo
lib/deskbar-applet/handlers/google-live.py
lib/deskbar-applet/handlers/google-live.pyc
lib/deskbar-applet/handlers/google-live.pyo
-lib/deskbar-applet/handlers/gtkbookmarks.py
-lib/deskbar-applet/handlers/gtkbookmarks.pyc
-lib/deskbar-applet/handlers/gtkbookmarks.pyo
lib/deskbar-applet/handlers/history.py
lib/deskbar-applet/handlers/history.pyc
lib/deskbar-applet/handlers/history.pyo
+lib/deskbar-applet/handlers/iswitch-window.py
+lib/deskbar-applet/handlers/iswitch-window.pyc
+lib/deskbar-applet/handlers/iswitch-window.pyo
lib/deskbar-applet/handlers/mozilla.py
lib/deskbar-applet/handlers/mozilla.pyc
lib/deskbar-applet/handlers/mozilla.pyo
-lib/deskbar-applet/handlers/pathprograms.py
-lib/deskbar-applet/handlers/pathprograms.pyc
-lib/deskbar-applet/handlers/pathprograms.pyo
lib/deskbar-applet/handlers/programs.py
lib/deskbar-applet/handlers/programs.pyc
lib/deskbar-applet/handlers/programs.pyo
-lib/deskbar-applet/handlers/volumes.py
-lib/deskbar-applet/handlers/volumes.pyc
-lib/deskbar-applet/handlers/volumes.pyo
lib/deskbar-applet/handlers/web_address.py
lib/deskbar-applet/handlers/web_address.pyc
lib/deskbar-applet/handlers/web_address.pyo
@@ -103,6 +100,11 @@ lib/deskbar-applet/handlers/yahoo.pyo
%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyo
%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.la
%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.so
+%%PYTHON_SITELIBDIR%%/deskbar/gdmclient/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/gdmclient/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/gdmclient/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/gdmclient/_gdmclient.la
+%%PYTHON_SITELIBDIR%%/deskbar/gdmclient/_gdmclient.so
%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.py
%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.pyc
%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.pyo
@@ -144,27 +146,48 @@ lib/deskbar-applet/handlers/yahoo.pyo
%%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.py
%%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.pyc
%%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/CompletionDeskbarUI.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/CompletionDeskbarUI.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/CompletionDeskbarUI.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/DeskbarEntry.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/DeskbarEntry.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/DeskbarEntry.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/__init__.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/__init__.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/completion/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/Cuemiac.py
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/Cuemiac.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/Cuemiac.pyo
%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.py
%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.pyc
%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAppletButton.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAppletButton.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAppletButton.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacButtonUI.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacButtonUI.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacButtonUI.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHeader.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHeader.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHeader.pyo
%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHistory.py
%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHistory.pyc
%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHistory.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacItems.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacItems.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacItems.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacLayoutProvider.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacLayoutProvider.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacLayoutProvider.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacModel.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacModel.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacModel.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacPopupEntry.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacPopupEntry.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacPopupEntry.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacTreeView.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacTreeView.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacTreeView.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacUIManager.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacUIManager.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacUIManager.pyo
%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/DeskbarAppletButton.py
%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/DeskbarAppletButton.pyc
%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/DeskbarAppletButton.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/LingeringSelectionWindow.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/LingeringSelectionWindow.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/LingeringSelectionWindow.pyo
%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.py
%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.pyc
%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.pyo
@@ -174,25 +197,39 @@ lib/deskbar-applet/handlers/yahoo.pyo
%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.py
%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.pyc
%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/window/CuemiacWindowUI.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/window/CuemiacWindowUI.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/window/CuemiacWindowUI.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.pyo
libdata/bonobo/servers/Deskbar_Applet.server
libdata/pkgconfig/deskbar-applet.pc
share/gnome/deskbar-applet/Deskbar_Applet.xml
+share/gnome/deskbar-applet/art/delicious.png
share/gnome/deskbar-applet/art/deskbar-applet-panel-h.png
share/gnome/deskbar-applet/art/deskbar-applet-panel-h.svg
share/gnome/deskbar-applet/art/deskbar-applet-panel-v.png
share/gnome/deskbar-applet/art/deskbar-applet-panel-v.svg
-share/gnome/deskbar-applet/art/deskbar-applet-small.png
-share/gnome/deskbar-applet/art/deskbar-applet.svg
share/gnome/deskbar-applet/art/epiphany-history.png
share/gnome/deskbar-applet/art/folder-bookmark.png
share/gnome/deskbar-applet/art/generic.png
share/gnome/deskbar-applet/art/google.png
+share/gnome/deskbar-applet/art/gpm-suspend-to-disk.png
+share/gnome/deskbar-applet/art/gpm-suspend-to-ram.png
share/gnome/deskbar-applet/art/yahoo.png
share/gnome/deskbar-applet/mozilla-search.glade
share/gnome/deskbar-applet/prefs-dialog.glade
share/gnome/deskbar-applet/smart-bookmarks.glade
-share/gnome/pixmaps/deskbar-applet.svg
+share/icons/hicolor/16x16/apps/deskbar-applet.png
+share/icons/hicolor/22x22/apps/deskbar-applet.png
+share/icons/hicolor/32x32/apps/deskbar-applet.png
+share/icons/hicolor/48x48/apps/deskbar-applet.png
+share/icons/hicolor/scalable/apps/deskbar-applet.svg
+share/locale/be/LC_MESSAGES/deskbar-applet.mo
share/locale/bg/LC_MESSAGES/deskbar-applet.mo
+share/locale/bn/LC_MESSAGES/deskbar-applet.mo
+share/locale/bn_IN/LC_MESSAGES/deskbar-applet.mo
share/locale/ca/LC_MESSAGES/deskbar-applet.mo
share/locale/cs/LC_MESSAGES/deskbar-applet.mo
share/locale/cy/LC_MESSAGES/deskbar-applet.mo
@@ -204,6 +241,7 @@ share/locale/en_CA/LC_MESSAGES/deskbar-applet.mo
share/locale/en_GB/LC_MESSAGES/deskbar-applet.mo
share/locale/es/LC_MESSAGES/deskbar-applet.mo
share/locale/et/LC_MESSAGES/deskbar-applet.mo
+share/locale/eu/LC_MESSAGES/deskbar-applet.mo
share/locale/fi/LC_MESSAGES/deskbar-applet.mo
share/locale/fr/LC_MESSAGES/deskbar-applet.mo
share/locale/gl/LC_MESSAGES/deskbar-applet.mo
@@ -218,45 +256,93 @@ share/locale/ka/LC_MESSAGES/deskbar-applet.mo
share/locale/ko/LC_MESSAGES/deskbar-applet.mo
share/locale/ku/LC_MESSAGES/deskbar-applet.mo
share/locale/lt/LC_MESSAGES/deskbar-applet.mo
+share/locale/lv/LC_MESSAGES/deskbar-applet.mo
+share/locale/mg/LC_MESSAGES/deskbar-applet.mo
share/locale/mk/LC_MESSAGES/deskbar-applet.mo
+share/locale/ml/LC_MESSAGES/deskbar-applet.mo
+share/locale/mn/LC_MESSAGES/deskbar-applet.mo
+share/locale/mr/LC_MESSAGES/deskbar-applet.mo
share/locale/nb/LC_MESSAGES/deskbar-applet.mo
share/locale/ne/LC_MESSAGES/deskbar-applet.mo
share/locale/nl/LC_MESSAGES/deskbar-applet.mo
+share/locale/or/LC_MESSAGES/deskbar-applet.mo
share/locale/pa/LC_MESSAGES/deskbar-applet.mo
share/locale/pl/LC_MESSAGES/deskbar-applet.mo
share/locale/pt/LC_MESSAGES/deskbar-applet.mo
share/locale/pt_BR/LC_MESSAGES/deskbar-applet.mo
share/locale/ru/LC_MESSAGES/deskbar-applet.mo
share/locale/sk/LC_MESSAGES/deskbar-applet.mo
+share/locale/sl/LC_MESSAGES/deskbar-applet.mo
share/locale/sq/LC_MESSAGES/deskbar-applet.mo
share/locale/sr/LC_MESSAGES/deskbar-applet.mo
share/locale/sr@Latn/LC_MESSAGES/deskbar-applet.mo
share/locale/sv/LC_MESSAGES/deskbar-applet.mo
+share/locale/ta/LC_MESSAGES/deskbar-applet.mo
share/locale/th/LC_MESSAGES/deskbar-applet.mo
+share/locale/tr/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
share/locale/zh_HK/LC_MESSAGES/deskbar-applet.mo
share/locale/zh_TW/LC_MESSAGES/deskbar-applet.mo
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
@dirrm share/gnome/deskbar-applet/art
@dirrm share/gnome/deskbar-applet
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/window
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/entriac
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac
-@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/completion
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/osutils
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/keybinder
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/iconentry
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/gdmclient
%%EVO%%@dirrm %%PYTHON_SITELIBDIR%%/deskbar/evolution
@dirrm %%PYTHON_SITELIBDIR%%/deskbar
@dirrmtry %%PYTHON_SITELIBDIR%%
@dirrmtry %%PYTHON_LIBDIR%%
@dirrm lib/deskbar-applet/handlers
@dirrm lib/deskbar-applet
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile
index 2a0a819f57b0..763ded9a1e4b 100644
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.9 2006/04/13 07:52:31 bland Exp $
+# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.14 2006/09/29 20:24:23 ahze Exp $
#
PORTNAME= jescs
-PORTVERSION= 2.6.3
+PORTVERSION= 2.8.2
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,7 +20,7 @@ COMMENT= Sun Java Enterprise System Calendar Server provider for Evolution
BUILD_DEPENDS= evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
RUN_DEPENDS= evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
@@ -29,8 +29,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-EVO_VERSION= 2.6
-PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.6"
+EVO_VERSION= 2.8
+PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.8"
post-patch:
@${REINPLACE_CMD} -e 's|libdir/bonobo/servers|prefix/libdata/bonobo/servers|g' \
diff --git a/deskutils/evolution-jescs/distinfo b/deskutils/evolution-jescs/distinfo
index 5a5efed8faf6..a0a6aac806d5 100644
--- a/deskutils/evolution-jescs/distinfo
+++ b/deskutils/evolution-jescs/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-jescs-2.6.3.tar.bz2) = cc5ffb307557111376c42a92ea974198
-SHA256 (evolution-jescs-2.6.3.tar.bz2) = d4f91255b085173818e43268bf5ba4b30288caf640ab7126e7b1665da589f2e4
-SIZE (evolution-jescs-2.6.3.tar.bz2) = 499305
+MD5 (evolution-jescs-2.8.2.tar.bz2) = d1a103854ea1ee30f2186474a0d2bb73
+SHA256 (evolution-jescs-2.8.2.tar.bz2) = 2075b5a42b19ab0ad2343816aefc0d0f9707594fa6ffceaf7f82a0591efdb4e1
+SIZE (evolution-jescs-2.8.2.tar.bz2) = 499151
diff --git a/deskutils/evolution-jescs/pkg-plist b/deskutils/evolution-jescs/pkg-plist
index f9ff160a670d..a5b4c405941e 100644
--- a/deskutils/evolution-jescs/pkg-plist
+++ b/deskutils/evolution-jescs/pkg-plist
@@ -12,6 +12,7 @@ share/gnome/evolution-jescs/glade/sunone-subscription-dialog.glade
share/locale/ca/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/de/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/dz/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/en_CA/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/es/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
@@ -35,9 +36,31 @@ share/locale/vi/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+@dirrm share/gnome/evolution-jescs/glade
+@dirrm share/gnome/evolution-jescs
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
-@dirrm share/gnome/evolution-jescs/glade
-@dirrm share/gnome/evolution-jescs
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 137894e34b6b..4e429e34e35d 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,36 +3,43 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.92 2006/04/19 04:46:41 marcus Exp $
+# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.108 2006/10/03 13:21:06 ahze Exp $
#
PORTNAME= gnome-utils
-PORTVERSION= 2.14.0
-PORTREVISION= 4
+PORTVERSION= 2.16.1
PORTEPOCH= 1
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-utils/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 support utilities
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop
+
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
+INSTALLS_ICONS= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \
libgnomeprintui gnomedesktop ltverhack
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1
+MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 \
+ baobab.1
GCONF_SCHEMAS= gnome-dictionary.schemas gnome-screenshot.schemas \
- gnome-search-tool.schemas logview.schemas
+ gnome-search-tool.schemas logview.schemas baobab.schemas
+
+post-patch:
+ @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} -n 10 \
+ ${REINPLACE_CMD} -e 's|@mandir@|${PREFIX}/man|'
.include <bsd.port.mk>
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 4ac628f22126..359e7096b311 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-utils-2.14.0.tar.bz2) = d1d16ff6bfc1f6ddc110d18ec4dfdbfa
-SHA256 (gnome2/gnome-utils-2.14.0.tar.bz2) = 44586246763c9bfb2b67baedff8c800abde0898012e646ee580ce7a4c2d57e7e
-SIZE (gnome2/gnome-utils-2.14.0.tar.bz2) = 1881962
+MD5 (gnome2/gnome-utils-2.16.1.tar.bz2) = fa07bc6c19468d2a5e7b8713a7ffe9eb
+SHA256 (gnome2/gnome-utils-2.16.1.tar.bz2) = 7981ed72f2ddc9bfb9cc38cd6038da41b95a100d4451c9794561e9eea4cc42cd
+SIZE (gnome2/gnome-utils-2.16.1.tar.bz2) = 3170280
diff --git a/deskutils/gnome-utils/files/patch-07_fix_dict_crash_CVS b/deskutils/gnome-utils/files/patch-07_fix_dict_crash_CVS
deleted file mode 100644
index 2fbe372c3db1..000000000000
--- a/deskutils/gnome-utils/files/patch-07_fix_dict_crash_CVS
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -urNad gnome-utils-2.14.0~/gnome-dictionary/libgdict/Makefile.am gnome-utils-2.14.0/gnome-dictionary/libgdict/Makefile.am
---- gnome-dictionary/libgdict/Makefile.am 2006-01-12 04:39:01.000000000 +0100
-+++ gnome-dictionary/libgdict/Makefile.am 2006-05-07 12:44:29.000000000 +0200
-@@ -2,6 +2,9 @@
-
- NULL =
-
-+# remove comment to enable debugging
-+#GDICT_ENABLE_DEBUG=-DGDICT_ENABLE_DEBUG=1
-+
- INCLUDES = -DG_LOG_DOMAIN=\"Gdict\" \
- -DDATADIR=\""$(datadir)"\" \
- -DLIBDIR=\""$(libdir)"\" \
-@@ -10,6 +13,7 @@
- -DGNOMELOCALEDIR=\""$(gnomeutilslocaledir)"\" \
- -DGDICTSOURCESDIR=\""$(datadir)/gdict-1.0/sources"\" \
- -DGDICT_ENABLE_INTERNALS=1 \
-+ $(GDICT_ENABLE_DEBUG) \
- $(DISABLE_DEPRECATED_CFLAGS) \
- $(WARN_CFLAGS) \
- $(NULL)
-diff -urNad gnome-utils-2.14.0~/gnome-dictionary/libgdict/gdict-client-context.c gnome-utils-2.14.0/gnome-dictionary/libgdict/gdict-client-context.c
---- gnome-dictionary/libgdict/gdict-client-context.c 2006-02-11 17:55:02.000000000 +0100
-+++ gnome-dictionary/libgdict/gdict-client-context.c 2006-05-07 12:44:47.000000000 +0200
-@@ -1629,10 +1629,11 @@
-
- /* retrieve the status code from the server response line */
- static gint
--get_status_code (const gchar *line)
-+get_status_code (const gchar *line,
-+ gint old_status)
- {
- gchar *status;
-- gint retval;
-+ gint possible_status, retval;
-
- if (strlen (line) < 3)
- return 0;
-@@ -1641,14 +1642,47 @@
- !g_unichar_isdigit (line[1]) ||
- !g_unichar_isdigit (line[2]))
- return 0;
-+
-+ if (!g_unichar_isspace (line[3]))
-+ return 0;
-
- status = g_strndup (line, 3);
-- retval = atoi (status);
-+ possible_status = atoi (status);
- g_free (status);
-+
-+ /* status whitelisting: sometimes, a database *cough* moby-thes *cough*
-+ * might return a number as first word; we do a small check here for
-+ * invalid status codes based on the previously set status; we don't check
-+ * the whole line, as we need only to be sure that the status code is
-+ * consistent with what we expect.
-+ */
-+ switch (old_status)
-+ {
-+ case GDICT_STATUS_WORD_DB_NAME:
-+ if (possible_status == GDICT_STATUS_OK)
-+ retval = possible_status;
-+ else
-+ retval = 0;
-+ break;
-+ case GDICT_STATUS_N_DEFINITIONS_RETRIEVED:
-+ if (possible_status == GDICT_STATUS_WORD_DB_NAME)
-+ retval = possible_status;
-+ else
-+ retval = 0;
-+ break;
-+ case GDICT_STATUS_N_MATCHES_FOUND:
-+ if (possible_status == GDICT_STATUS_OK)
-+ retval = possible_status;
-+ else
-+ retval = 0;
-+ break;
-+ default:
-+ retval = possible_status;
-+ break;
-+ }
-
- return retval;
- }
--
-
- static gboolean
- gdict_client_context_io_watch_cb (GIOChannel *channel,
-@@ -1735,7 +1769,7 @@
- /* truncate the line terminator before parsing */
- line[term] = '\0';
-
-- status_code = get_status_code (line);
-+ status_code = get_status_code (line, priv->status_code);
- if ((status_code == 0) || (GDICT_IS_VALID_STATUS_CODE (status_code)))
- {
- priv->status_code = status_code;
diff --git a/deskutils/gnome-utils/files/patch-logview__logview.h b/deskutils/gnome-utils/files/patch-logview__logview.h
deleted file mode 100644
index 3cd50f68c4bd..000000000000
--- a/deskutils/gnome-utils/files/patch-logview__logview.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- logview/logview.h.orig Wed Apr 19 12:39:07 2006
-+++ logview/logview.h Wed Apr 19 12:40:08 2006
-@@ -73,6 +73,7 @@
- void logview_set_window_title (LogviewWindow *window);
- void logview_set_font (LogviewWindow *window, const gchar *fontname);
- void logview_show_main_content (LogviewWindow *window);
-+GType logview_window_get_type (void);
- GtkWidget *logview_window_new (void);
-
- #endif /* __LOGVIEW_H__ */
diff --git a/deskutils/gnome-utils/files/patch-logview_calendar.h b/deskutils/gnome-utils/files/patch-logview_calendar.h
deleted file mode 100644
index 3aefb999f00c..000000000000
--- a/deskutils/gnome-utils/files/patch-logview_calendar.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- logview/calendar.h.orig Tue Apr 18 22:20:35 2006
-+++ logview/calendar.h Tue Apr 18 22:20:58 2006
-@@ -45,6 +45,7 @@ typedef struct CalendarClass
- GtkCalendarClass parent_class;
- }CalendarClass;
-
-+GType calendar_get_type (void);
- GtkWidget *calendar_new (void);
- void calendar_select_date (Calendar *calendar, GDate *date);
- void calendar_init_data (Calendar *calendar, LogviewWindow *logview);
diff --git a/deskutils/gnome-utils/files/patch-logview_loglist.h b/deskutils/gnome-utils/files/patch-logview_loglist.h
deleted file mode 100644
index 149e04a59abc..000000000000
--- a/deskutils/gnome-utils/files/patch-logview_loglist.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- logview/loglist.h.orig Wed Apr 19 00:30:12 2006
-+++ logview/loglist.h Wed Apr 19 00:30:23 2006
-@@ -39,6 +39,7 @@ typedef struct LogListClass
- GtkTreeViewClass parent_class;
- }LogListClass;
-
-+GType loglist_get_type (void);
- GtkWidget *loglist_new (void);
- void loglist_connect (LogList *list, LogviewWindow *window);
- void loglist_add_log (LogList *list, Log *log);
diff --git a/deskutils/gnome-utils/files/patch-logview_logrtns.c b/deskutils/gnome-utils/files/patch-logview_logrtns.c
deleted file mode 100644
index 85333d2fe164..000000000000
--- a/deskutils/gnome-utils/files/patch-logview_logrtns.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- logview/logrtns.c.orig Wed Apr 19 00:28:00 2006
-+++ logview/logrtns.c Wed Apr 19 00:29:24 2006
-@@ -48,7 +48,7 @@ file_exist (char *filename, gboolean sho
- char *secondary = NULL;
-
- if (filename == NULL)
-- return;
-+ return FALSE;
-
- result = gnome_vfs_open (&handle, filename, GNOME_VFS_OPEN_READ);
- if (result != GNOME_VFS_OK) {
-@@ -83,7 +83,7 @@ file_is_zipped (char *filename)
- char *mime_type;
-
- if (filename == NULL)
-- return;
-+ return FALSE;
-
- mime_type = gnome_vfs_get_mime_type (filename);
- if (mime_type == NULL)
-@@ -106,7 +106,7 @@ file_is_log (char *filename, gboolean sh
- LogStats *stats;
-
- if (filename == NULL)
-- return;
-+ return FALSE;
-
- stats = log_stats_new (filename, show_error);
- if (stats==NULL)
-@@ -134,11 +134,11 @@ string_get_date_string (gchar *line)
- int i=0;
-
- if (line == NULL || line[0] == 0)
-- return;
-+ return NULL;
-
- split = g_strsplit (line, " ", 4);
- if (split == NULL)
-- return;
-+ return NULL;
-
- while ((day == NULL || month == NULL) && split[i]!=NULL && i<4) {
- if (g_str_equal (split[i], "")) {
-@@ -531,7 +531,7 @@ log_unbold (gpointer data)
- LogList *list;
- Log *log = data;
-
-- g_return_if_fail (log != NULL);
-+ g_return_val_if_fail (log != NULL, FALSE);
-
- logview = log->window;
-
diff --git a/deskutils/gnome-utils/files/patch-logview_logview-findbar.h b/deskutils/gnome-utils/files/patch-logview_logview-findbar.h
deleted file mode 100644
index 1e6acd101c08..000000000000
--- a/deskutils/gnome-utils/files/patch-logview_logview-findbar.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- logview/logview-findbar.h.orig Wed Apr 19 00:27:03 2006
-+++ logview/logview-findbar.h Wed Apr 19 00:27:17 2006
-@@ -44,6 +44,7 @@ typedef struct LogviewFindBarClass
- GtkHBoxClass parent_class;
- }LogviewFindBarClass;
-
-+GType logview_findbar_get_type (void);
- GtkWidget *logview_findbar_new (void);
- void logview_findbar_connect (LogviewFindBar *findbar, LogviewWindow *logview);
- void logview_findbar_update_visibility (LogviewFindBar *findbar, LogviewWindow *logview);
diff --git a/deskutils/gnome-utils/files/patch-logview_misc.c b/deskutils/gnome-utils/files/patch-logview_misc.c
deleted file mode 100644
index 1a0f54cfe5b1..000000000000
--- a/deskutils/gnome-utils/files/patch-logview_misc.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- logview/misc.c.orig Tue Apr 18 21:28:07 2006
-+++ logview/misc.c Tue Apr 18 21:28:30 2006
-@@ -135,15 +135,15 @@ string_get_date (char *line)
- {
- GDate *date;
- struct tm tp;
-- int cp;
-+ char *cp;
-
- if (line == NULL || line[0] == 0)
- return NULL;
-
- cp = strptime (line, "%b %d", &tp);
-- if (cp == 0) {
-+ if (cp == NULL) {
- cp = strptime (line, "%F", &tp);
-- if (cp == 0) {
-+ if (cp == NULL) {
- return NULL;
- }
- }
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 51eef16fbc83..8b80f46ae6c3 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -1,3 +1,4 @@
+bin/baobab
bin/gnome-dictionary
bin/gnome-panel-screenshot
bin/gnome-screenshot
@@ -5,27 +6,29 @@ bin/gnome-search-tool
bin/gnome-system-log
include/gdict-1.0/gdict/gdict-client-context.h
include/gdict-1.0/gdict/gdict-context.h
+include/gdict-1.0/gdict/gdict-database-chooser.h
include/gdict-1.0/gdict/gdict-defbox.h
include/gdict-1.0/gdict/gdict-entry.h
include/gdict-1.0/gdict/gdict-enum-types.h
include/gdict-1.0/gdict/gdict-source-loader.h
include/gdict-1.0/gdict/gdict-source.h
+include/gdict-1.0/gdict/gdict-speller.h
include/gdict-1.0/gdict/gdict-utils.h
include/gdict-1.0/gdict/gdict-version.h
include/gdict-1.0/gdict/gdict.h
lib/libgdict-1.0.a
lib/libgdict-1.0.la
lib/libgdict-1.0.so
-lib/libgdict-1.0.so.1
+lib/libgdict-1.0.so.5
libdata/bonobo/servers/GNOME_DictionaryApplet.server
libdata/pkgconfig/gdict-1.0.pc
libexec/gnome-dictionary-applet
share/doc/gdict/gdict-GdictClientContext.html
-share/doc/gdict/gdict-GdictContext.html
share/doc/gdict/gdict-GdictDefbox.html
share/doc/gdict/gdict-GdictEntry.html
share/doc/gdict/gdict-GdictSource.html
share/doc/gdict/gdict-GdictSourceLoader.html
+share/doc/gdict/gdict-gdict-context.html
share/doc/gdict/gdict.devhelp
share/doc/gdict/gdict.devhelp2
share/doc/gdict/gdict.html
@@ -40,12 +43,31 @@ share/doc/gdict/sources-loader.html
share/doc/gdict/sources.html
share/doc/gdict/style.css
share/doc/gdict/up.png
+share/gnome/applications/baobab.desktop
share/gnome/applications/gnome-dictionary.desktop
share/gnome/applications/gnome-screenshot.desktop
share/gnome/applications/gnome-search-tool.desktop
share/gnome/applications/gnome-system-log.desktop
+share/gnome/baobab/pixmaps/alfa_sort.png
+share/gnome/baobab/pixmaps/baobab.glade
+share/gnome/baobab/pixmaps/baobab.xpm
+share/gnome/baobab/pixmaps/busy.gif
+share/gnome/baobab/pixmaps/done.png
+share/gnome/baobab/pixmaps/format_numeric.png
+share/gnome/baobab/pixmaps/format_percent.png
+share/gnome/baobab/pixmaps/green.png
+share/gnome/baobab/pixmaps/nautilus.png
+share/gnome/baobab/pixmaps/num_sort.png
+share/gnome/baobab/pixmaps/red.png
+share/gnome/baobab/pixmaps/scan_directory.png
+share/gnome/baobab/pixmaps/scan_harddisk.png
+share/gnome/baobab/pixmaps/search.png
+share/gnome/baobab/pixmaps/searchall.png
+share/gnome/baobab/pixmaps/shot.png
+share/gnome/baobab/pixmaps/stop.png
+share/gnome/baobab/pixmaps/white.png
+share/gnome/baobab/pixmaps/yellow.png
share/gnome/gdict-1.0/sources/default.desktop
-share/gnome/gdict-1.0/sources/french.desktop
share/gnome/gdict-1.0/sources/spanish.desktop
share/gnome/gnome-2.0/ui/GNOME_DictionaryApplet.xml
share/gnome/gnome-dictionary/gnome-dictionary-preferences.glade
@@ -54,6 +76,19 @@ share/gnome/gnome-screenshot/glade/gnome-screenshot.glade
share/gnome/gnome-system-log/gnome-system-log-actions.db
share/gnome/gnome-system-log/gnome-system-log-descript.db
share/gnome/gnome-system-log/gnome-system-log-regexp.db
+share/gnome/help/baobab/C/baobab.xml
+share/gnome/help/baobab/C/figures/baobab_fullscan.png
+share/gnome/help/baobab/C/figures/baobab_prefs.png
+share/gnome/help/baobab/C/figures/baobab_remote.png
+share/gnome/help/baobab/C/figures/baobab_treemaps.png
+share/gnome/help/baobab/C/figures/baobab_window.png
+share/gnome/help/baobab/C/legal.xml
+share/gnome/help/baobab/sv/baobab.xml
+share/gnome/help/baobab/sv/figures/baobab_fullscan.png
+share/gnome/help/baobab/sv/figures/baobab_prefs.png
+share/gnome/help/baobab/sv/figures/baobab_remote.png
+share/gnome/help/baobab/sv/figures/baobab_treemaps.png
+share/gnome/help/baobab/sv/figures/baobab_window.png
share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-add-source.png
share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-applet-window.png
share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-applet.png
@@ -64,6 +99,15 @@ share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-preferences-print.p
share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-preferences-source.png
share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml
share/gnome/help/gnome-dictionary/C/legal.xml
+share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/el/gnome-dictionary.xml
share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-add-source.png
share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-applet-window.png
share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-applet.png
@@ -73,39 +117,107 @@ share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-lookup.png
share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-preferences-print.png
share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-preferences-source.png
share/gnome/help/gnome-dictionary/es/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/fr/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/ru/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/sv/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/sv/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/sv/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/sv/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/sv/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/sv/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/sv/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/sv/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/sv/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/uk/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/uk/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/uk/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/uk/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/uk/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/uk/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/uk/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/uk/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/uk/gnome-dictionary.xml
share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/C/legal.xml
share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png
share/gnome/help/gnome-search-tool/es/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/it/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/it/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/fr/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/fr/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/ru/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/ru/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/sv/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/sv/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/uk/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/uk/gnome-search-tool.xml
share/gnome/help/gnome-system-log/C/figures/syslog_window.png
share/gnome/help/gnome-system-log/C/gnome-system-log.xml
share/gnome/help/gnome-system-log/C/legal.xml
share/gnome/help/gnome-system-log/es/figures/syslog_window.png
share/gnome/help/gnome-system-log/es/gnome-system-log.xml
+share/gnome/help/gnome-system-log/fr/figures/syslog_window.png
+share/gnome/help/gnome-system-log/fr/gnome-system-log.xml
+share/gnome/help/gnome-system-log/it/figures/syslog_window.png
+share/gnome/help/gnome-system-log/it/gnome-system-log.xml
+share/gnome/help/gnome-system-log/sv/figures/syslog_window.png
+share/gnome/help/gnome-system-log/sv/gnome-system-log.xml
+share/gnome/help/gnome-system-log/uk/figures/syslog_window.png
+share/gnome/help/gnome-system-log/uk/gnome-system-log.xml
+share/gnome/omf/baobab/baobab-C.omf
+share/gnome/omf/baobab/baobab-sv.omf
share/gnome/omf/gnome-dictionary/gnome-dictionary-C.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-el.omf
share/gnome/omf/gnome-dictionary/gnome-dictionary-es.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-fr.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-ru.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-sv.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-uk.omf
share/gnome/omf/gnome-search-tool/gnome-search-tool-C.omf
share/gnome/omf/gnome-search-tool/gnome-search-tool-es.omf
-share/gnome/omf/gnome-search-tool/gnome-search-tool-it.omf
+share/gnome/omf/gnome-search-tool/gnome-search-tool-fr.omf
+share/gnome/omf/gnome-search-tool/gnome-search-tool-ru.omf
+share/gnome/omf/gnome-search-tool/gnome-search-tool-sv.omf
+share/gnome/omf/gnome-search-tool/gnome-search-tool-uk.omf
share/gnome/omf/gnome-system-log/gnome-system-log-C.omf
share/gnome/omf/gnome-system-log/gnome-system-log-es.omf
-share/gnome/pixmaps/gnome-dictionary.png
+share/gnome/omf/gnome-system-log/gnome-system-log-fr.omf
+share/gnome/omf/gnome-system-log/gnome-system-log-it.omf
+share/gnome/omf/gnome-system-log/gnome-system-log-sv.omf
+share/gnome/omf/gnome-system-log/gnome-system-log-uk.omf
share/gnome/pixmaps/gsearchtool/thumbnail_frame.png
+share/icons/hicolor/48x48/apps/baobab.png
+share/icons/hicolor/48x48/apps/gnome-dictionary.png
+share/icons/hicolor/scalable/apps/gnome-dictionary.svg
share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/be/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/bn/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/da/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/de/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/el/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/en_CA/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-utils-2.0.mo
@@ -125,10 +237,12 @@ share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/id/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/mg/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ml/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/mn/LC_MESSAGES/gnome-utils-2.0.mo
@@ -137,7 +251,7 @@ share/locale/nb/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ne/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-utils-2.0.mo
-share/locale/no/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/or/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/pa/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-utils-2.0.mo
@@ -161,37 +275,115 @@ share/locale/xh/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
@dirrm share/gnome/pixmaps/gsearchtool
@dirrm share/gnome/omf/gnome-system-log
@dirrm share/gnome/omf/gnome-search-tool
@dirrm share/gnome/omf/gnome-dictionary
+@dirrm share/gnome/omf/baobab
+@dirrm share/gnome/help/gnome-system-log/uk/figures
+@dirrm share/gnome/help/gnome-system-log/uk
+@dirrm share/gnome/help/gnome-system-log/sv/figures
+@dirrm share/gnome/help/gnome-system-log/sv
+@dirrm share/gnome/help/gnome-system-log/it/figures
+@dirrm share/gnome/help/gnome-system-log/it
+@dirrm share/gnome/help/gnome-system-log/fr/figures
+@dirrm share/gnome/help/gnome-system-log/fr
@dirrm share/gnome/help/gnome-system-log/es/figures
@dirrm share/gnome/help/gnome-system-log/es
@dirrm share/gnome/help/gnome-system-log/C/figures
@dirrm share/gnome/help/gnome-system-log/C
@dirrm share/gnome/help/gnome-system-log
-@dirrm share/gnome/help/gnome-search-tool/it/figures
-@dirrm share/gnome/help/gnome-search-tool/it
+@dirrm share/gnome/help/gnome-search-tool/uk/figures
+@dirrm share/gnome/help/gnome-search-tool/uk
+@dirrm share/gnome/help/gnome-search-tool/sv/figures
+@dirrm share/gnome/help/gnome-search-tool/sv
+@dirrm share/gnome/help/gnome-search-tool/ru/figures
+@dirrm share/gnome/help/gnome-search-tool/ru
+@dirrm share/gnome/help/gnome-search-tool/fr/figures
+@dirrm share/gnome/help/gnome-search-tool/fr
@dirrm share/gnome/help/gnome-search-tool/es/figures
@dirrm share/gnome/help/gnome-search-tool/es
@dirrm share/gnome/help/gnome-search-tool/C/figures
@dirrm share/gnome/help/gnome-search-tool/C
@dirrm share/gnome/help/gnome-search-tool
+@dirrm share/gnome/help/gnome-dictionary/uk/figures
+@dirrm share/gnome/help/gnome-dictionary/uk
+@dirrm share/gnome/help/gnome-dictionary/sv/figures
+@dirrm share/gnome/help/gnome-dictionary/sv
+@dirrm share/gnome/help/gnome-dictionary/ru/figures
+@dirrm share/gnome/help/gnome-dictionary/ru
+@dirrm share/gnome/help/gnome-dictionary/fr/figures
+@dirrm share/gnome/help/gnome-dictionary/fr
@dirrm share/gnome/help/gnome-dictionary/es/figures
@dirrm share/gnome/help/gnome-dictionary/es
+@dirrm share/gnome/help/gnome-dictionary/el/figures
+@dirrm share/gnome/help/gnome-dictionary/el
@dirrm share/gnome/help/gnome-dictionary/C/figures
@dirrm share/gnome/help/gnome-dictionary/C
@dirrm share/gnome/help/gnome-dictionary
+@dirrm share/gnome/help/baobab/sv/figures
+@dirrm share/gnome/help/baobab/sv
+@dirrm share/gnome/help/baobab/C/figures
+@dirrm share/gnome/help/baobab/C
+@dirrm share/gnome/help/baobab
@dirrm share/gnome/gnome-system-log
@dirrm share/gnome/gnome-screenshot/glade
@dirrm share/gnome/gnome-screenshot
@dirrm share/gnome/gnome-dictionary
@dirrm share/gnome/gdict-1.0/sources
@dirrm share/gnome/gdict-1.0
+@dirrm share/gnome/baobab/pixmaps
+@dirrm share/gnome/baobab
@dirrm share/doc/gdict
@dirrm include/gdict-1.0/gdict
@dirrm include/gdict-1.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 17d656f8bb1f..f118b5ffc28f 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gucharmap/Makefile,v 1.24 2006/04/13 07:52:31 bland Exp $
+# $MCom: ports/deskutils/gucharmap/Makefile,v 1.30 2006/10/02 04:52:51 bland Exp $
#
PORTNAME= gucharmap
-PORTVERSION= 1.6.0
+PORTVERSION= 1.8.0
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,18 +17,17 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A Unicode/ISO10646 character map and font viewer
BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack gtk20 gnomedocutils
WANT_GNOME= yes
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
INSTALLS_ICONS= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index d5508f6a1ed8..0e3fdb65b9af 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gucharmap-1.6.0.tar.bz2) = 8af03f350c988d1565922b10776bc725
-SHA256 (gnome2/gucharmap-1.6.0.tar.bz2) = b27f201b58ec077ebe6f97ffc040c9f1e171b9595d5a917052345f711c6d2107
-SIZE (gnome2/gucharmap-1.6.0.tar.bz2) = 2131883
+MD5 (gnome2/gucharmap-1.8.0.tar.bz2) = a75cc3dcc9fb3d2edecc4da936e80e3a
+SHA256 (gnome2/gucharmap-1.8.0.tar.bz2) = 54ca751dda9e187bab19a609d42159a656c2bb933a15024b27841bf08a2185ab
+SIZE (gnome2/gucharmap-1.8.0.tar.bz2) = 2542413
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
index a8039b55ab82..6b68a4344283 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -15,7 +15,7 @@ include/gucharmap/gucharmap-window.h
include/gucharmap/gucharmap.h
lib/libgucharmap.la
lib/libgucharmap.so
-lib/libgucharmap.so.4
+lib/libgucharmap.so.5
libdata/pkgconfig/gucharmap.pc
share/gnome/applications/gucharmap.desktop
share/gnome/help/gucharmap/C/figures/gucharmap_start_window.png
@@ -34,9 +34,9 @@ share/gnome/help/gucharmap/es/gucharmap.xml
share/gnome/help/gucharmap/fi/figures/gucharmap_start_window.png
share/gnome/help/gucharmap/fi/figures/gucharmap_window.png
share/gnome/help/gucharmap/fi/gucharmap.xml
+share/gnome/help/gucharmap/fr/figures/gucharmap_start_window.png
share/gnome/help/gucharmap/fr/figures/gucharmap_window.png
share/gnome/help/gucharmap/fr/gucharmap.xml
-share/gnome/help/gucharmap/fr/legal.xml
share/gnome/help/gucharmap/it/figures/gucharmap_window.png
share/gnome/help/gucharmap/it/gucharmap.xml
share/gnome/help/gucharmap/it/legal.xml
@@ -46,9 +46,12 @@ share/gnome/help/gucharmap/ja/legal.xml
share/gnome/help/gucharmap/ko/figures/gucharmap_window.png
share/gnome/help/gucharmap/ko/gucharmap.xml
share/gnome/help/gucharmap/ko/legal.xml
+share/gnome/help/gucharmap/ru/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/ru/figures/gucharmap_window.png
+share/gnome/help/gucharmap/ru/gucharmap.xml
+share/gnome/help/gucharmap/sv/figures/gucharmap_start_window.png
share/gnome/help/gucharmap/sv/figures/gucharmap_window.png
share/gnome/help/gucharmap/sv/gucharmap.xml
-share/gnome/help/gucharmap/sv/legal.xml
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
@@ -64,6 +67,7 @@ share/gnome/omf/gucharmap/gucharmap-fr.omf
share/gnome/omf/gucharmap/gucharmap-it.omf
share/gnome/omf/gucharmap/gucharmap-ja.omf
share/gnome/omf/gucharmap/gucharmap-ko.omf
+share/gnome/omf/gucharmap/gucharmap-ru.omf
share/gnome/omf/gucharmap/gucharmap-sv.omf
share/gnome/omf/gucharmap/gucharmap-zh_CN.omf
share/gnome/omf/gucharmap/gucharmap-zh_TW.omf
@@ -74,12 +78,14 @@ share/locale/az/LC_MESSAGES/gucharmap.mo
share/locale/be/LC_MESSAGES/gucharmap.mo
share/locale/bg/LC_MESSAGES/gucharmap.mo
share/locale/bn/LC_MESSAGES/gucharmap.mo
+share/locale/bn_IN/LC_MESSAGES/gucharmap.mo
share/locale/bs/LC_MESSAGES/gucharmap.mo
share/locale/ca/LC_MESSAGES/gucharmap.mo
share/locale/cs/LC_MESSAGES/gucharmap.mo
share/locale/cy/LC_MESSAGES/gucharmap.mo
share/locale/da/LC_MESSAGES/gucharmap.mo
share/locale/de/LC_MESSAGES/gucharmap.mo
+share/locale/dz/LC_MESSAGES/gucharmap.mo
share/locale/el/LC_MESSAGES/gucharmap.mo
share/locale/en_CA/LC_MESSAGES/gucharmap.mo
share/locale/en_GB/LC_MESSAGES/gucharmap.mo
@@ -100,18 +106,21 @@ share/locale/id/LC_MESSAGES/gucharmap.mo
share/locale/is/LC_MESSAGES/gucharmap.mo
share/locale/it/LC_MESSAGES/gucharmap.mo
share/locale/ja/LC_MESSAGES/gucharmap.mo
+share/locale/ka/LC_MESSAGES/gucharmap.mo
share/locale/ko/LC_MESSAGES/gucharmap.mo
share/locale/lt/LC_MESSAGES/gucharmap.mo
+share/locale/lv/LC_MESSAGES/gucharmap.mo
share/locale/mi/LC_MESSAGES/gucharmap.mo
share/locale/mk/LC_MESSAGES/gucharmap.mo
share/locale/ml/LC_MESSAGES/gucharmap.mo
share/locale/mn/LC_MESSAGES/gucharmap.mo
+share/locale/mr/LC_MESSAGES/gucharmap.mo
share/locale/ms/LC_MESSAGES/gucharmap.mo
share/locale/nb/LC_MESSAGES/gucharmap.mo
share/locale/ne/LC_MESSAGES/gucharmap.mo
share/locale/nl/LC_MESSAGES/gucharmap.mo
share/locale/nn/LC_MESSAGES/gucharmap.mo
-share/locale/no/LC_MESSAGES/gucharmap.mo
+share/locale/or/LC_MESSAGES/gucharmap.mo
share/locale/pa/LC_MESSAGES/gucharmap.mo
share/locale/pl/LC_MESSAGES/gucharmap.mo
share/locale/pt/LC_MESSAGES/gucharmap.mo
@@ -120,6 +129,7 @@ share/locale/ro/LC_MESSAGES/gucharmap.mo
share/locale/ru/LC_MESSAGES/gucharmap.mo
share/locale/rw/LC_MESSAGES/gucharmap.mo
share/locale/sk/LC_MESSAGES/gucharmap.mo
+share/locale/sl/LC_MESSAGES/gucharmap.mo
share/locale/sq/LC_MESSAGES/gucharmap.mo
share/locale/sr/LC_MESSAGES/gucharmap.mo
share/locale/sr@Latn/LC_MESSAGES/gucharmap.mo
@@ -134,8 +144,6 @@ share/locale/xh/LC_MESSAGES/gucharmap.mo
share/locale/zh_CN/LC_MESSAGES/gucharmap.mo
share/locale/zh_HK/LC_MESSAGES/gucharmap.mo
share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
@dirrm share/gnome/omf/gucharmap
@dirrm share/gnome/help/gucharmap/zh_TW/figures
@dirrm share/gnome/help/gucharmap/zh_TW
@@ -143,6 +151,8 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
@dirrm share/gnome/help/gucharmap/zh_CN
@dirrm share/gnome/help/gucharmap/sv/figures
@dirrm share/gnome/help/gucharmap/sv
+@dirrm share/gnome/help/gucharmap/ru/figures
+@dirrm share/gnome/help/gucharmap/ru
@dirrm share/gnome/help/gucharmap/ko/figures
@dirrm share/gnome/help/gucharmap/ko
@dirrm share/gnome/help/gucharmap/ja/figures
@@ -163,3 +173,53 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
@dirrm share/gnome/help/gucharmap/C
@dirrm share/gnome/help/gucharmap
@dirrm include/gucharmap
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index d8870780c13e..c3044c0cf9f2 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -3,28 +3,30 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $Id: Makefile,v 1.22 2006/02/16 02:44:45 tmclau02 Exp $
+# $Id: Makefile,v 1.25 2006/09/15 02:47:48 tmclau02 Exp $
#
PORTNAME= tomboy
-PORTVERSION= 0.3.5
-PORTREVISION= 5
+PORTVERSION= 0.4.1
CATEGORIES= deskutils gnome
-MASTER_SITES= http://www.beatniksoftware.com/tomboy/releases/
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR= gnome2
MAINTAINER= bsd-sharp-list@forge.novell.com
COMMENT= Personal note taking system for the GNOME desktop
-LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell
-BUILD_DEPENDS= gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10 \
- ${LOCALBASE}/lib/mono/dbus-sharp/dbus-sharp.dll:${PORTSDIR}/devel/dbus-sharp
-RUN_DEPENDS= gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp10 \
- ${LOCALBASE}/lib/mono/dbus-sharp/dbus-sharp.dll:${PORTSDIR}/devel/dbus-sharp
+LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+BUILD_DEPENDS= gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20
+RUN_DEPENDS= gapi2-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp20
+USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget intltool gnomeprefix gnomepanel
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
+INSTALLS_ICONS= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -36,7 +38,7 @@ GCONF_SCHEMAS= tomboy.schemas
# Tomboy's Evolution plugin relies on gmime# and not evo# according to
# configure. Enable if either evo or gmime# is installed.
-.if defined (WITH_EVOLUTION) || exists (${X11BASE}/bin/evolution) || exists (${LOCALBASE}/lib/mono/gmime-sharp/gmime-sharp.dll)
+.if defined (WITH_EVOLUTION) || exists (${LOCALBASE}/bin/evolution) || exists (${LOCALBASE}/lib/mono/gmime-sharp/gmime-sharp.dll)
CONFIGURE_ARGS+= --enable-evolution=yes
BUILD_DEPENDS+= ${LOCALBASE}/lib/mono/gmime-sharp/gmime-sharp.dll:${PORTSDIR}/mail/gmime2-sharp
RUN_DEPENDS+= ${LOCALBASE}/lib/mono/gmime-sharp/gmime-sharp.dll:${PORTSDIR}/mail/gmime2-sharp
@@ -49,7 +51,8 @@ post-patch:
@${REINPLACE_CMD} -e 's|(libdir)/dbus-1.0|(prefix)/share/dbus-1|g' \
${WRKSRC}/data/Makefile.in
@${REINPLACE_CMD} -e 's|`$$PKG_CONFIG --variable=libdir libpanelapplet-2.0`|"$$libdir"|g; \
- s|PANELAPPLET_SERVER_DIR="$$libdir|PANELAPPLET_SERVER_DIR="$$prefix/libdata|g' \
+ s|PANELAPPLET_SERVER_DIR="$$libdir|PANELAPPLET_SERVER_DIR="$$prefix/libdata|g; \
+ s|PANELAPPLET_SERVER_DIR="$$PANELAPPLET_LIBDIR|PANELAPPLET_SERVER_DIR="$$prefix/libdata|g' \
${WRKSRC}/configure
post-install:
diff --git a/deskutils/tomboy/distinfo b/deskutils/tomboy/distinfo
index d72b196b09aa..107266dda727 100644
--- a/deskutils/tomboy/distinfo
+++ b/deskutils/tomboy/distinfo
@@ -1,3 +1,3 @@
-MD5 (tomboy-0.3.5.tar.gz) = 57e9829d80d8452f002e0a3856bd2c48
-SHA256 (tomboy-0.3.5.tar.gz) = 1af5290924b65b9e55d40816ad0797cf6e81df727bfb4a8642e700c1bb35a0ac
-SIZE (tomboy-0.3.5.tar.gz) = 665599
+MD5 (gnome2/tomboy-0.4.1.tar.bz2) = 40e0f51d832d04f762851fc9a88c01ea
+SHA256 (gnome2/tomboy-0.4.1.tar.bz2) = 389f01838a2a597c78fca7066636ee4867f3896012c47a964278ad6639ae2338
+SIZE (gnome2/tomboy-0.4.1.tar.bz2) = 774805
diff --git a/deskutils/tomboy/pkg-plist b/deskutils/tomboy/pkg-plist
index ed2f9e98cb05..6a645e3173a3 100644
--- a/deskutils/tomboy/pkg-plist
+++ b/deskutils/tomboy/pkg-plist
@@ -4,6 +4,7 @@ lib/tomboy/Plugins/ExportToHTML.dll
lib/tomboy/Plugins/FixedWidth.dll
lib/tomboy/Plugins/NoteOfTheDay.dll
lib/tomboy/Plugins/PrintNotes.dll
+lib/tomboy/Plugins/StickyNoteImport.dll
lib/tomboy/Tomboy.exe
lib/tomboy/Tomboy.exe.config
lib/tomboy/libtomboy.la
@@ -11,42 +12,106 @@ lib/tomboy/libtomboy.so
libdata/bonobo/servers/GNOME_TomboyApplet.server
libdata/pkgconfig/tomboy-plugins.pc
share/dbus-1/services/com.beatniksoftware.Tomboy.service
-share/gnome/gnome-2.0/ui/GNOME_TomboyApplet.xml
-share/gnome/pixmaps/tintin.png
+share/gnome/applications/DefaultPlugins.desktop
+share/gnome/applications/tomboy.desktop
+share/gnome/help/tomboy/C/figures/tomboy-new-note.png
+share/gnome/help/tomboy/C/figures/tomboy-panel.png
+share/gnome/help/tomboy/C/figures/tomboy-preferences-editing.png
+share/gnome/help/tomboy/C/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/C/figures/tomboy-tools.png
+share/gnome/help/tomboy/C/legal.xml
+share/gnome/help/tomboy/C/tomboy.xml
+share/gnome/help/tomboy/es/figures/tomboy-new-note.png
+share/gnome/help/tomboy/es/figures/tomboy-panel.png
+share/gnome/help/tomboy/es/figures/tomboy-preferences-editing.png
+share/gnome/help/tomboy/es/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/es/figures/tomboy-tools.png
+share/gnome/help/tomboy/es/legal.xml
+share/gnome/help/tomboy/es/tomboy.xml
+share/gnome/help/tomboy/sv/figures/tomboy-new-note.png
+share/gnome/help/tomboy/sv/figures/tomboy-panel.png
+share/gnome/help/tomboy/sv/figures/tomboy-preferences-editing.png
+share/gnome/help/tomboy/sv/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/sv/figures/tomboy-tools.png
+share/gnome/help/tomboy/sv/legal.xml
+share/gnome/help/tomboy/sv/tomboy.xml
+share/gnome/omf/tomboy/tomboy-C.omf
+share/gnome/omf/tomboy/tomboy-es.omf
+share/gnome/omf/tomboy/tomboy-sv.omf
+share/gnome/pixmaps/tomboy.png
+share/icons/hicolor/16x16/apps/tomboy.png
+share/icons/hicolor/22x22/apps/tomboy.png
+share/icons/hicolor/48x48/apps/tomboy.png
+share/icons/hicolor/scalable/apps/tomboy.svg
share/locale/bg/LC_MESSAGES/tomboy.mo
+share/locale/bn/LC_MESSAGES/tomboy.mo
+share/locale/bn_IN/LC_MESSAGES/tomboy.mo
share/locale/ca/LC_MESSAGES/tomboy.mo
share/locale/cs/LC_MESSAGES/tomboy.mo
share/locale/da/LC_MESSAGES/tomboy.mo
share/locale/de/LC_MESSAGES/tomboy.mo
+share/locale/dz/LC_MESSAGES/tomboy.mo
+share/locale/el/LC_MESSAGES/tomboy.mo
share/locale/en_CA/LC_MESSAGES/tomboy.mo
share/locale/en_GB/LC_MESSAGES/tomboy.mo
share/locale/es/LC_MESSAGES/tomboy.mo
+share/locale/et/LC_MESSAGES/tomboy.mo
share/locale/eu/LC_MESSAGES/tomboy.mo
share/locale/fi/LC_MESSAGES/tomboy.mo
share/locale/fr/LC_MESSAGES/tomboy.mo
+share/locale/gl/LC_MESSAGES/tomboy.mo
+share/locale/gu/LC_MESSAGES/tomboy.mo
+share/locale/hi/LC_MESSAGES/tomboy.mo
share/locale/hu/LC_MESSAGES/tomboy.mo
share/locale/is/LC_MESSAGES/tomboy.mo
share/locale/it/LC_MESSAGES/tomboy.mo
share/locale/ja/LC_MESSAGES/tomboy.mo
share/locale/ko/LC_MESSAGES/tomboy.mo
+share/locale/ku/LC_MESSAGES/tomboy.mo
share/locale/lt/LC_MESSAGES/tomboy.mo
+share/locale/lv/LC_MESSAGES/tomboy.mo
+share/locale/mk/LC_MESSAGES/tomboy.mo
+share/locale/ml/LC_MESSAGES/tomboy.mo
share/locale/nb/LC_MESSAGES/tomboy.mo
share/locale/ne/LC_MESSAGES/tomboy.mo
share/locale/nl/LC_MESSAGES/tomboy.mo
-share/locale/no/LC_MESSAGES/tomboy.mo
+share/locale/or/LC_MESSAGES/tomboy.mo
share/locale/pa/LC_MESSAGES/tomboy.mo
share/locale/pl/LC_MESSAGES/tomboy.mo
+share/locale/pt/LC_MESSAGES/tomboy.mo
share/locale/pt_BR/LC_MESSAGES/tomboy.mo
share/locale/ro/LC_MESSAGES/tomboy.mo
share/locale/ru/LC_MESSAGES/tomboy.mo
share/locale/rw/LC_MESSAGES/tomboy.mo
share/locale/sq/LC_MESSAGES/tomboy.mo
+share/locale/sr/LC_MESSAGES/tomboy.mo
+share/locale/sr@Latn/LC_MESSAGES/tomboy.mo
share/locale/sv/LC_MESSAGES/tomboy.mo
+share/locale/ta/LC_MESSAGES/tomboy.mo
+share/locale/th/LC_MESSAGES/tomboy.mo
share/locale/tr/LC_MESSAGES/tomboy.mo
share/locale/uk/LC_MESSAGES/tomboy.mo
share/locale/vi/LC_MESSAGES/tomboy.mo
share/locale/zh_CN/LC_MESSAGES/tomboy.mo
+share/locale/zh_HK/LC_MESSAGES/tomboy.mo
+share/locale/zh_TW/LC_MESSAGES/tomboy.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrm share/gnome/omf/tomboy
+@dirrm share/gnome/help/tomboy/sv/figures
+@dirrm share/gnome/help/tomboy/sv
+@dirrm share/gnome/help/tomboy/es/figures
+@dirrm share/gnome/help/tomboy/es
+@dirrm share/gnome/help/tomboy/C/figures
+@dirrm share/gnome/help/tomboy/C
+@dirrm share/gnome/help/tomboy
@dirrm lib/tomboy/Plugins
@dirrm lib/tomboy
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index d220c6e9dc84..5f8d94f87fe3 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/bugbuddy/Makefile,v 1.29 2006/04/13 07:52:31 bland Exp $
+# $MCom: ports/devel/bug-buddy/Makefile,v 1.38 2006/09/20 06:35:57 marcus Exp $
#
PORTNAME= bug-buddy
-PORTVERSION= 2.14.0
+PORTVERSION= 2.16.0
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/bug-buddy/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,21 +17,27 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A bug reporting tool for GNOME 2
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
+ soup-2.2.8:${PORTSDIR}/devel/libsoup
+
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
-INSTALLS_OMF= yes
+USE_XLIB= yes
+INSTALLS_ICONS= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \
- desktopfileutils gnomedocutils
+ desktopfileutils gnomedocutils evolutiondataserver
GNOME_DESKTOP_VERSION=2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-MAN1= bug-buddy.1
GCONF_SCHEMAS= bug-buddy.schemas
+post-patch:
+ @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
+ ${WRKSRC}/src/bugzilla.c
+
post-install:
@-update-desktop-database
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index 4e73e147c587..aa6bbc1b0657 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/bug-buddy-2.14.0.tar.bz2) = 4fb288adc8f67cbfb8886ddf7b400530
-SHA256 (gnome2/bug-buddy-2.14.0.tar.bz2) = f091ca6c55b2f76011d2c7f6c3c60069070e894ee455483bc8f77edc7f0eaaf6
-SIZE (gnome2/bug-buddy-2.14.0.tar.bz2) = 577253
+MD5 (gnome2/bug-buddy-2.16.0.tar.bz2) = 199b8fe6454096b1c8e514eaa925caa3
+SHA256 (gnome2/bug-buddy-2.16.0.tar.bz2) = 7c2d178a4539044654654acbe8365f925f34f312799e98f7cc1ddb09ff141c22
+SIZE (gnome2/bug-buddy-2.16.0.tar.bz2) = 511355
diff --git a/devel/bug-buddy/files/patch-src_bug-buddy.menu.in b/devel/bug-buddy/files/patch-src_bug-buddy.menu.in
new file mode 100644
index 000000000000..5093e3e9a0b5
--- /dev/null
+++ b/devel/bug-buddy/files/patch-src_bug-buddy.menu.in
@@ -0,0 +1,11 @@
+--- src/bug-buddy.menu.in.orig Wed Sep 20 02:28:05 2006
++++ src/bug-buddy.menu.in Wed Sep 20 02:28:12 2006
+@@ -6,7 +6,7 @@
+ <Name>Bug Buddy programs</Name>
+
+ <!-- Read only files in default .desktop file location -->
+- <LegacyDir>@prefix@/@DATADIRNAME@/applications</LegacyDir>
++ <LegacyDir>@prefix@/@DATADIRNAME@/gnome/applications</LegacyDir>
+
+ <!-- we want to process all desktop files; Unfortunately,
+ files with NoDisplay=true won't be returned by the
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index d785341759a3..8a283a99abc4 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -1,8 +1,7 @@
bin/bug-buddy
-share/gnome/application-registry/bug-buddy.applications
-share/gnome/applications/bug-buddy-core.desktop
share/gnome/applications/bug-buddy.desktop
share/gnome/bug-buddy/bug-buddy.glade
+share/gnome/bug-buddy/bug-buddy.menu
share/gnome/bug-buddy/bug-buddy.png
share/gnome/bug-buddy/bugzilla/gnome.bugzilla
share/gnome/bug-buddy/bugzilla/gnome/config
@@ -15,33 +14,21 @@ share/gnome/bug-buddy/bugzilla/ximian/products
share/gnome/bug-buddy/gdb-cmd
share/gnome/bug-buddy/gnome.png
share/gnome/bug-buddy/ximian.png
-share/gnome/help/bug-buddy/C/bug-buddy.xml
-share/gnome/help/bug-buddy/C/legal.xml
-share/gnome/help/bug-buddy/es/bug-buddy.xml
-share/gnome/help/bug-buddy/pa/bug-buddy.xml
-share/gnome/help/bug-buddy/sr/bug-buddy.xml
-share/gnome/help/bug-buddy/uk/bug-buddy.xml
-share/gnome/help/bug-buddy/vi/bug-buddy.xml
-share/gnome/mime-info/bug-buddy.keys
-share/gnome/omf/bug-buddy/bug-buddy-C.omf
-share/gnome/omf/bug-buddy/bug-buddy-es.omf
-share/gnome/omf/bug-buddy/bug-buddy-pa.omf
-share/gnome/omf/bug-buddy/bug-buddy-sr.omf
-share/gnome/omf/bug-buddy/bug-buddy-uk.omf
-share/gnome/omf/bug-buddy/bug-buddy-vi.omf
-share/gnome/pixmaps/bug-buddy.png
+share/icons/hicolor/48x48/apps/bug-buddy.png
share/locale/am/LC_MESSAGES/bug-buddy.mo
share/locale/ar/LC_MESSAGES/bug-buddy.mo
share/locale/az/LC_MESSAGES/bug-buddy.mo
share/locale/be/LC_MESSAGES/bug-buddy.mo
share/locale/bg/LC_MESSAGES/bug-buddy.mo
share/locale/bn/LC_MESSAGES/bug-buddy.mo
+share/locale/bn_IN/LC_MESSAGES/bug-buddy.mo
share/locale/bs/LC_MESSAGES/bug-buddy.mo
share/locale/ca/LC_MESSAGES/bug-buddy.mo
share/locale/cs/LC_MESSAGES/bug-buddy.mo
share/locale/cy/LC_MESSAGES/bug-buddy.mo
share/locale/da/LC_MESSAGES/bug-buddy.mo
share/locale/de/LC_MESSAGES/bug-buddy.mo
+share/locale/dz/LC_MESSAGES/bug-buddy.mo
share/locale/el/LC_MESSAGES/bug-buddy.mo
share/locale/en_CA/LC_MESSAGES/bug-buddy.mo
share/locale/en_GB/LC_MESSAGES/bug-buddy.mo
@@ -62,11 +49,13 @@ share/locale/id/LC_MESSAGES/bug-buddy.mo
share/locale/is/LC_MESSAGES/bug-buddy.mo
share/locale/it/LC_MESSAGES/bug-buddy.mo
share/locale/ja/LC_MESSAGES/bug-buddy.mo
+share/locale/ka/LC_MESSAGES/bug-buddy.mo
share/locale/ko/LC_MESSAGES/bug-buddy.mo
share/locale/ku/LC_MESSAGES/bug-buddy.mo
share/locale/ky/LC_MESSAGES/bug-buddy.mo
share/locale/lt/LC_MESSAGES/bug-buddy.mo
share/locale/lv/LC_MESSAGES/bug-buddy.mo
+share/locale/mg/LC_MESSAGES/bug-buddy.mo
share/locale/mk/LC_MESSAGES/bug-buddy.mo
share/locale/ml/LC_MESSAGES/bug-buddy.mo
share/locale/mn/LC_MESSAGES/bug-buddy.mo
@@ -76,7 +65,6 @@ share/locale/nb/LC_MESSAGES/bug-buddy.mo
share/locale/ne/LC_MESSAGES/bug-buddy.mo
share/locale/nl/LC_MESSAGES/bug-buddy.mo
share/locale/nn/LC_MESSAGES/bug-buddy.mo
-share/locale/no/LC_MESSAGES/bug-buddy.mo
share/locale/or/LC_MESSAGES/bug-buddy.mo
share/locale/pa/LC_MESSAGES/bug-buddy.mo
share/locale/pl/LC_MESSAGES/bug-buddy.mo
@@ -102,31 +90,65 @@ share/locale/xh/LC_MESSAGES/bug-buddy.mo
share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo
share/locale/zh_HK/LC_MESSAGES/bug-buddy.mo
share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
+@dirrm share/gnome/bug-buddy/bugzilla/ximian
+@dirrm share/gnome/bug-buddy/bugzilla/gnome
+@dirrm share/gnome/bug-buddy/bugzilla
+@dirrm share/gnome/bug-buddy
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
-@dirrm share/gnome/omf/bug-buddy
-@dirrm share/gnome/help/bug-buddy/vi
-@dirrm share/gnome/help/bug-buddy/uk
-@dirrm share/gnome/help/bug-buddy/sr
-@dirrm share/gnome/help/bug-buddy/pa
-@dirrm share/gnome/help/bug-buddy/es
-@dirrm share/gnome/help/bug-buddy/C
-@dirrm share/gnome/help/bug-buddy
-@dirrm share/gnome/bug-buddy/bugzilla/ximian
-@dirrm share/gnome/bug-buddy/bugzilla/gnome
-@dirrm share/gnome/bug-buddy/bugzilla
-@dirrm share/gnome/bug-buddy
-@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/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile
new file mode 100644
index 000000000000..8644bd1c0800
--- /dev/null
+++ b/devel/dbus-glib/Makefile
@@ -0,0 +1,35 @@
+# New ports collection makefile for: dbus-glib
+# Date Created: 07 October 2006
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= dbus
+PORTVERSION= 0.71
+CATEGORIES= devel gnome
+MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-glib/
+PKGNAMESUFFIX= -glib
+DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= GLib bindings for the D-BUS messaging system
+
+LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
+
+USE_GNOME= gnomehack glib20
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+CONFIGURE_ARGS= --with-test-socket-dir=${WRKDIR} \
+ --disable-doxygen-docs \
+ --disable-xml-docs
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+
+PLIST_SUB= VERSION="1.0"
+
+pre-build:
+ @${CP} ${FILESDIR}/dbus-bus-introspect.xml ${WRKSRC}/tools
+
+.include <bsd.port.mk>
diff --git a/devel/dbus-glib/distinfo b/devel/dbus-glib/distinfo
new file mode 100644
index 000000000000..77979418b298
--- /dev/null
+++ b/devel/dbus-glib/distinfo
@@ -0,0 +1,3 @@
+MD5 (dbus-glib-0.71.tar.gz) = 4e1e7348b26ee8b6485452113f4221cc
+SHA256 (dbus-glib-0.71.tar.gz) = b58a489fdd35a70d241f512bc08f3b6d9d8e05110f4a1d5341cff6a0b7d854b7
+SIZE (dbus-glib-0.71.tar.gz) = 566889
diff --git a/devel/dbus-glib/files/dbus-bus-introspect.xml b/devel/dbus-glib/files/dbus-bus-introspect.xml
new file mode 100644
index 000000000000..889d1cfafc04
--- /dev/null
+++ b/devel/dbus-glib/files/dbus-bus-introspect.xml
@@ -0,0 +1,77 @@
+ <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+ <interface name="org.freedesktop.DBus.Introspectable">
+ <method name="Introspect">
+ <arg name="data" direction="out" type="s"/>
+ </method>
+ </interface>
+ <interface name="org.freedesktop.DBus">
+ <method name="RequestName">
+ <arg direction="in" type="s"/>
+ <arg direction="in" type="u"/>
+ <arg direction="out" type="u"/>
+ </method>
+ <method name="ReleaseName">
+ <arg direction="in" type="s"/>
+ <arg direction="out" type="u"/>
+ </method>
+ <method name="StartServiceByName">
+ <arg direction="in" type="s"/>
+ <arg direction="in" type="u"/>
+ <arg direction="out" type="u"/>
+ </method>
+ <method name="Hello">
+ <arg direction="out" type="s"/>
+ </method>
+ <method name="NameHasOwner">
+ <arg direction="in" type="s"/>
+ <arg direction="out" type="b"/>
+ </method>
+ <method name="ListNames">
+ <arg direction="out" type="as"/>
+ </method>
+ <method name="ListActivatableNames">
+ <arg direction="out" type="as"/>
+ </method>
+ <method name="AddMatch">
+ <arg direction="in" type="s"/>
+ </method>
+ <method name="RemoveMatch">
+ <arg direction="in" type="s"/>
+ </method>
+ <method name="GetNameOwner">
+ <arg direction="in" type="s"/>
+ <arg direction="out" type="s"/>
+ </method>
+ <method name="ListQueuedOwners">
+ <arg direction="in" type="s"/>
+ <arg direction="out" type="as"/>
+ </method>
+ <method name="GetConnectionUnixUser">
+ <arg direction="in" type="s"/>
+ <arg direction="out" type="u"/>
+ </method>
+ <method name="GetConnectionUnixProcessID">
+ <arg direction="in" type="s"/>
+ <arg direction="out" type="u"/>
+ </method>
+ <method name="GetConnectionSELinuxSecurityContext">
+ <arg direction="in" type="s"/>
+ <arg direction="out" type="ay"/>
+ </method>
+ <method name="ReloadConfig">
+ </method>
+ <signal name="NameOwnerChanged">
+ <arg type="s"/>
+ <arg type="s"/>
+ <arg type="s"/>
+ </signal>
+ <signal name="NameLost">
+ <arg type="s"/>
+ </signal>
+ <signal name="NameAcquired">
+ <arg type="s"/>
+ </signal>
+ </interface>
+</node>
diff --git a/devel/dbus/files/patch-tools_run-with-tmp-session-bus.sh b/devel/dbus-glib/files/patch-tools_run-with-tmp-session-bus.sh
index 064503a1aaa0..4aa4e5a1893a 100644
--- a/devel/dbus/files/patch-tools_run-with-tmp-session-bus.sh
+++ b/devel/dbus-glib/files/patch-tools_run-with-tmp-session-bus.sh
@@ -1,5 +1,5 @@
---- tools/run-with-tmp-session-bus.sh.orig Fri Mar 18 02:48:29 2005
-+++ tools/run-with-tmp-session-bus.sh Tue Apr 4 20:40:12 2006
+--- tools/run-with-tmp-session-bus.sh.orig Sat Oct 7 16:18:50 2006
++++ tools/run-with-tmp-session-bus.sh Sat Oct 7 16:19:24 2006
@@ -1,10 +1,10 @@
-#! /bin/bash
+#! /bin/sh
diff --git a/devel/dbus-glib/pkg-descr b/devel/dbus-glib/pkg-descr
new file mode 100644
index 000000000000..bc3c57d8fe62
--- /dev/null
+++ b/devel/dbus-glib/pkg-descr
@@ -0,0 +1,3 @@
+GLib bindings for the D-BUS interprocess messaging system.
+
+WWW: http://www.freedesktop.org/wiki/Software_2fDBusBindings
diff --git a/devel/dbus-glib/pkg-plist b/devel/dbus-glib/pkg-plist
new file mode 100644
index 000000000000..abc3049f93a5
--- /dev/null
+++ b/devel/dbus-glib/pkg-plist
@@ -0,0 +1,11 @@
+bin/dbus-binding-tool
+include/dbus-%%VERSION%%/dbus/dbus-glib-bindings.h
+include/dbus-%%VERSION%%/dbus/dbus-glib-error-enum.h
+include/dbus-%%VERSION%%/dbus/dbus-glib-lowlevel.h
+include/dbus-%%VERSION%%/dbus/dbus-glib.h
+include/dbus-%%VERSION%%/dbus/dbus-gtype-specialized.h
+lib/libdbus-glib-1.a
+lib/libdbus-glib-1.la
+lib/libdbus-glib-1.so
+lib/libdbus-glib-1.so.2
+libdata/pkgconfig/dbus-glib-1.pc
diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile
index 18f226870a04..56d3d1e01b3f 100644
--- a/devel/dbus-sharp/Makefile
+++ b/devel/dbus-sharp/Makefile
@@ -6,20 +6,23 @@
# $Id: Makefile,v 1.18 2006/01/02 20:54:03 tmclau02 Exp $
#
-PORTREVISION= 13
+PORTVERSION= 0.62
+PORTREVISION= 16
CATEGORIES= devel gnome
PKGNAMESUFFIX= -sharp
MAINTAINER= bsd-sharp-list@forge.novell.com
COMMENT= Mono interface to the D-BUS messaging system
-LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
BUILD_DEPENDS= monodoc:${PORTSDIR}/devel/mono-tools
RUN_DEPENDS= monodoc:${PORTSDIR}/devel/mono-tools
MASTERDIR= ${.CURDIR}/../dbus
BUILD_WRKSRC= ${WRKSRC}/mono
INSTALL_WRKSRC= ${BUILD_WRKSRC}
+PATCHDIR= ${.CURDIR}/files
+MD5_FILE= ${.CURDIR}/distinfo
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
@@ -31,6 +34,7 @@ CONFIGURE_ARGS= --enable-mono \
--disable-gcj \
--disable-gtk \
--disable-qt \
+ --with-test-socket-dir=${WRKDIR} \
--with-system-pid-file=/var/run/dbus.pid \
--with-system-socket=/var/run/dbus \
--with-session-socket-dir=/var/tmp \
diff --git a/devel/dbus-sharp/distinfo b/devel/dbus-sharp/distinfo
new file mode 100644
index 000000000000..363c5a579806
--- /dev/null
+++ b/devel/dbus-sharp/distinfo
@@ -0,0 +1,3 @@
+MD5 (dbus-0.62.tar.gz) = ba7692f63d0e9f1ef06703dff56cb650
+SHA256 (dbus-0.62.tar.gz) = 884cc2083add655df57acc7bb144c61e9beeabf08ef76fa86929a58d7bc96707
+SIZE (dbus-0.62.tar.gz) = 1737361
diff --git a/devel/dbus/files/patch-mono_Makefile.in b/devel/dbus-sharp/files/patch-mono_Makefile.in
index 7f1d7026cf22..7f1d7026cf22 100644
--- a/devel/dbus/files/patch-mono_Makefile.in
+++ b/devel/dbus-sharp/files/patch-mono_Makefile.in
diff --git a/devel/dbus/files/patch-mono_dbus-sharp.dll.config.in b/devel/dbus-sharp/files/patch-mono_dbus-sharp.dll.config.in
index b7c0032aad1f..b7c0032aad1f 100644
--- a/devel/dbus/files/patch-mono_dbus-sharp.dll.config.in
+++ b/devel/dbus-sharp/files/patch-mono_dbus-sharp.dll.config.in
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 47b86af15f4e..590c3fea87a4 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -6,88 +6,58 @@
#
PORTNAME= dbus
-PORTVERSION= 0.62
-PORTREVISION?= 1
-CATEGORIES?= devel gnome
+PORTVERSION?= 0.93
+PORTREVISION?= 2
+CATEGORIES= devel gnome
MASTER_SITES= http://dbus.freedesktop.org/releases/
-MAINTAINER?= gnome@FreeBSD.org
-COMMENT?= A message bus system for inter-application communication
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= A message bus system for inter-application communication
-LIB_DEPENDS?= expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
-USE_GNOME?= gnomehack glib20 libxml2
+USE_GNOME= gnomehack gnometarget libxml2
USE_GMAKE= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_ARGS?=--disable-gtk \
- --disable-python \
- --disable-gcj \
- --disable-qt \
- --disable-mono \
- --disable-mono-docs \
- --localstatedir=/var \
+USE_LDCONFIG= yes
+CONFIGURE_ARGS=--localstatedir=/var \
+ --with-test-socket-dir=${WRKDIR} \
--with-system-pid-file=/var/run/dbus/dbus.pid \
--with-system-socket=/var/run/dbus/dbus.pipe \
--with-session-socket-dir=/var/tmp \
--disable-doxygen-docs \
--disable-xml-docs
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ PTHREAD_LIBS="${PTHREAD_LIBS}"
.if !defined(DBUS_SLAVE)
USE_RC_SUBR= dbus
-OPTIONS= QT "Enable Qt client support" off
PLIST_SUB= VERSION="1.0"
MAN1= dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \
dbus-monitor.1 dbus-send.1
+
+.if !defined(WITHOUT_X11)
+USE_XLIB= yes
+.endif
.endif
.include <bsd.port.pre.mk>
-.if !defined(DBUS_SLAVE)
-.if defined(WITH_QT) && !defined(WITHOUT_QT)
-CONFIGURE_ARGS+=--enable-qt3
-CONFIGURE_ENV+= QTDIR=${X11BASE}
-LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33
-PLIST_SUB+= QT=""
-.else
-PLIST_SUB+= QT="@comment "
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \
${WRKSRC}/bus/session.conf.in \
${WRKSRC}/bus/system.conf.in
.if !defined(DBUS_SLAVE)
-pre-su-install:
- @for i in 15 9 ; do \
- if [ -f /var/run/dbus/dbus.pid ]; then \
- kill -$${i} $$(${CAT} /var/run/dbus/dbus.pid) 2>/dev/null || ${TRUE} ; \
- sleep 3 ; \
- fi ; \
- done
- @if [ -f /var/run/dbus/dbus.pid ]; then \
- ${RM} -f /var/run/dbus/dbus.pid ; \
- fi
-.endif
-
post-install:
.if !defined(PACKAGE_BUILDING)
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif
${MKDIR} ${X11BASE}/etc/dbus-1/system.d
${MKDIR} ${X11BASE}/share/dbus-1/services
-.else
-.if defined(PKGNAMEPREFIX)
-.if ${PKGNAMEPREFIX}==${PYTHON_PKGNAMEPREFIX} && ${OSVERSION} < 500000
-# Ignore for py-dbus
-IGNORE= does not build on 4.X
-.endif
-.endif
.endif
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index 363c5a579806..6f41a76bd3bf 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-0.62.tar.gz) = ba7692f63d0e9f1ef06703dff56cb650
-SHA256 (dbus-0.62.tar.gz) = 884cc2083add655df57acc7bb144c61e9beeabf08ef76fa86929a58d7bc96707
-SIZE (dbus-0.62.tar.gz) = 1737361
+MD5 (dbus-0.93.tar.gz) = 0770dce874c76f7364d055e4648900fb
+SHA256 (dbus-0.93.tar.gz) = bdb6a229bc87944e46b656d6e568f9bf9e8fedcb0e1ca53f48f3ed333915168b
+SIZE (dbus-0.93.tar.gz) = 1340600
diff --git a/devel/dbus/files/patch-bus_dir-watch.c b/devel/dbus/files/patch-bus_dir-watch.c
deleted file mode 100644
index c848f1fd9746..000000000000
--- a/devel/dbus/files/patch-bus_dir-watch.c
+++ /dev/null
@@ -1,178 +0,0 @@
---- bus/dir-watch.c.orig Tue Jun 14 22:31:38 2005
-+++ bus/dir-watch.c Tue May 2 12:52:08 2006
-@@ -28,17 +28,25 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#elif defined(DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD)
-+#include <sys/types.h>
-+#include <sys/event.h>
-+#include <sys/time.h>
-+#include <signal.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include "bus.h"
-+#include <dbus/dbus-watch.h>
- #endif /* DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX */
-
- #include <dbus/dbus-internals.h>
- #include "dir-watch.h"
-
-+#define MAX_DIRS_TO_WATCH 128
-
- /* D_NOTIFY is available on Linux 2.4 or greater - the actual SIGIO signal is handled in main.c:signal_handler() */
- #ifdef DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX
-
--#define MAX_DIRS_TO_WATCH 128
--
- /* use a static array to avoid handling OOM */
- static int fds[MAX_DIRS_TO_WATCH];
- static int num_fds = 0;
-@@ -92,6 +100,147 @@ bus_drop_all_directory_watches (void)
- }
- }
-
-+ num_fds = 0;
-+}
-+
-+#elif defined(DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD)
-+
-+static int kq = -1;
-+static int fds[MAX_DIRS_TO_WATCH];
-+static int num_fds = 0;
-+static DBusWatch *watch = NULL;
-+static DBusLoop *loop = NULL;
-+
-+static dbus_bool_t
-+_kqueue_watch_callback (DBusWatch *watch, unsigned int condition, void *data)
-+{
-+ return dbus_watch_handle (watch, condition);
-+}
-+
-+static dbus_bool_t
-+_handle_kqueue_watch (DBusWatch *watch, unsigned int flags, void *data)
-+{
-+ struct kevent ev;
-+ struct timespec nullts = { 0, 0 };
-+ int res;
-+ pid_t pid;
-+
-+ res = kevent (kq, NULL, 0, &ev, 1, &nullts);
-+
-+ /* Sleep for half a second to avoid a race when files are install(1)'d
-+ * to system.d. */
-+ usleep(500000);
-+
-+ if (res > 0)
-+ {
-+ pid = getpid ();
-+ _dbus_verbose ("Sending SIGHUP signal on reception of a kevent\n");
-+ (void) kill (pid, SIGHUP);
-+ }
-+ else if (res < 0 && errno == EBADF)
-+ {
-+ kq = -1;
-+ if (watch != NULL)
-+ {
-+ _dbus_loop_remove_watch (loop, watch, _kqueue_watch_callback, NULL);
-+ _dbus_watch_unref (watch);
-+ watch = NULL;
-+ }
-+ pid = getpid ();
-+ _dbus_verbose ("Sending SIGHUP signal since kqueue has been closed\n");
-+ (void) kill (pid, SIGHUP);
-+ }
-+
-+ return TRUE;
-+}
-+
-+void
-+bus_watch_directory (const char *dir, void *userdata)
-+{
-+ int fd;
-+ struct kevent ev;
-+
-+ _dbus_assert (dir != NULL);
-+
-+ if (kq < 0)
-+ {
-+
-+ kq = kqueue ();
-+ if (kq < 0)
-+ {
-+ _dbus_warn ("Cannot create kqueue; error '%s'\n", _dbus_strerror (errno));
-+ goto out;
-+ }
-+
-+ loop = userdata;
-+
-+ watch = _dbus_watch_new (kq, DBUS_WATCH_READABLE, TRUE,
-+ _handle_kqueue_watch, NULL, NULL);
-+
-+ if (watch == NULL)
-+ {
-+ _dbus_warn ("Unable to create kqueue watch\n");
-+ close (kq);
-+ kq = -1;
-+ goto out;
-+ }
-+
-+ if (!_dbus_loop_add_watch (loop, watch, _kqueue_watch_callback,
-+ NULL, NULL))
-+ {
-+ _dbus_warn ("Unable to add reload watch to main loop");
-+ close (kq);
-+ kq = -1;
-+ _dbus_watch_unref (watch);
-+ watch = NULL;
-+ goto out;
-+ }
-+ }
-+
-+ if (num_fds >= MAX_DIRS_TO_WATCH )
-+ {
-+ _dbus_warn ("Cannot watch config directory '%s'. Already watching %d directories\n", dir, MAX_DIRS_TO_WATCH);
-+ goto out;
-+ }
-+
-+ fd = open (dir, O_RDONLY);
-+ if (fd < 0)
-+ {
-+ _dbus_warn ("Cannot open directory '%s'; error '%s'\n", dir, _dbus_strerror (errno));
-+ goto out;
-+ }
-+
-+ EV_SET (&ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
-+ NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, 0, 0);
-+ if (kevent (kq, &ev, 1, NULL, 0, NULL) == -1)
-+ {
-+ _dbus_warn ("Cannot setup a kevent for '%s'; error '%s'\n", dir, _dbus_strerror (errno));
-+ close (fd);
-+ goto out;
-+ }
-+
-+ fds[num_fds++] = fd;
-+ _dbus_verbose ("Added kqueue watch on config directory '%s'\n", dir);
-+
-+ out:
-+ ;
-+}
-+
-+void
-+bus_drop_all_directory_watches (void)
-+{
-+ int i;
-+
-+ _dbus_verbose ("Dropping all watches on config directories\n");
-+
-+ for (i = 0; i < num_fds; i++)
-+ {
-+ if (close (fds[i]) != 0)
-+ {
-+ _dbus_verbose ("Error closing fd %d for config directory watch\n", fds[i]);
-+ }
-+ }
-+
- num_fds = 0;
- }
-
diff --git a/devel/dbus/files/patch-config.h.in b/devel/dbus/files/patch-config.h.in
deleted file mode 100644
index 479d32470af5..000000000000
--- a/devel/dbus/files/patch-config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.in.orig Fri Jul 1 00:48:36 2005
-+++ config.h.in Fri Jul 1 00:48:56 2005
-@@ -9,6 +9,9 @@
- /* Use dnotify on Linux */
- #undef DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX
-
-+/* Use kqueue on FreeBSD */
-+#undef DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD
-+
- /* Disable assertion checking */
- #undef DBUS_DISABLE_ASSERT
-
diff --git a/devel/dbus/files/patch-configure b/devel/dbus/files/patch-configure
index 13e08d566774..0f19547d7d66 100644
--- a/devel/dbus/files/patch-configure
+++ b/devel/dbus/files/patch-configure
@@ -1,51 +1,28 @@
---- configure.orig Wed Jun 14 00:57:48 2006
-+++ configure Wed Jun 14 00:58:20 2006
-@@ -1057,6 +1057,7 @@ Optional Features:
- --enable-python build python bindings
- --enable-selinux build with SELinux support
- --enable-dnotify build with dnotify support (linux only)
-+ --enable-kqueue build with kqueue support (FreeBSD only)
- --enable-console-owner-file
- enable console owner file
- --enable-shared[=PKGS]
-@@ -4550,7 +4551,7 @@ if test "x$GCC" = "xyes"; then
+--- configure.orig Sun Oct 8 02:48:06 2006
++++ configure Sun Oct 8 02:50:34 2006
+@@ -463,7 +463,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
- case " $CFLAGS " in
- *[\ \ ]-Wfloat-equal[\ \ ]*) ;;
-- *) CFLAGS="$CFLAGS -Wfloat-equal" ;;
-+ *) CFLAGS="$CFLAGS" ;;
- esac
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar GETTEXT_PACKAGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP DBUS_BUILD_TESTS_TRUE DBUS_BUILD_TESTS_FALSE SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DBUS_GCOV_ENABLED_TRUE DBUS_GCOV_ENABLED_FALSE DBUS_INT64_TYPE DBUS_INT64_CONSTANT DBUS_UINT64_CONSTANT DBUS_HAVE_INT64 DBUS_INT32_TYPE DBUS_INT16_TYPE DBUS_PATH_OR_ABSTRACT PKG_CONFIG LIBXML_CFLAGS LIBXML_LIBS DBUS_USE_EXPAT_TRUE DBUS_USE_EXPAT_FALSE DBUS_USE_LIBXML_TRUE DBUS_USE_LIBXML_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_TRUE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_FALSE DBUS_BUS_ENABLE_KQUEUE_TRUE DBUS_BUS_ENABLE_KQUEUE_FALSE HAVE_CONSOLE_OWNER_FILE_TRUE HAVE_CONSOLE_OWNER_FILE_FALSE DBUS_CLIENT_CFLAGS DBUS_CLIENT_LIBS DBUS_BUS_CFLAGS DBUS_BUS_LIBS DBUS_TEST_CFLAGS DBUS_TEST_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DBUS_X_CFLAGS DBUS_X_LIBS DOXYGEN DBUS_DOXYGEN_DOCS_ENABLED_TRUE DBUS_DOXYGEN_DOCS_ENABLED_FALSE XMLTO DBUS_XML_DOCS_ENABLED_TRUE DBUS_XML_DOCS_ENABLED_FALSE EXPANDED_LOCALSTATEDIR EXPANDED_SYSCONFDIR EXPANDED_BINDIR EXPANDED_LIBDIR EXPANDED_DATADIR DBUS_INIT_SCRIPTS_RED_HAT_TRUE DBUS_INIT_SCRIPTS_RED_HAT_FALSE DBUS_INIT_SCRIPTS_SLACKWARE_TRUE DBUS_INIT_SCRIPTS_SLACKWARE_FALSE DBUS_SYSTEM_SOCKET DBUS_SYSTEM_BUS_DEFAULT_ADDRESS DBUS_SYSTEM_PID_FILE DBUS_CONSOLE_AUTH_DIR DBUS_CONSOLE_OWNER_FILE DBUS_USER DBUS_DAEMONDIR TEST_SERVICE_DIR TEST_SERVICE_BINARY TEST_SHELL_SERVICE_BINARY TEST_EXIT_BINARY TEST_SEGFAULT_BINARY TEST_SLEEP_FOREVER_BINARY TEST_SOCKET_DIR DBUS_SESSION_SOCKET_DIR LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar GETTEXT_PACKAGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP DBUS_BUILD_TESTS_TRUE DBUS_BUILD_TESTS_FALSE SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DBUS_GCOV_ENABLED_TRUE DBUS_GCOV_ENABLED_FALSE DBUS_INT64_TYPE DBUS_INT64_CONSTANT DBUS_UINT64_CONSTANT DBUS_HAVE_INT64 DBUS_INT32_TYPE DBUS_INT16_TYPE DBUS_PATH_OR_ABSTRACT PKG_CONFIG LIBXML_CFLAGS LIBXML_LIBS DBUS_USE_EXPAT_TRUE DBUS_USE_EXPAT_FALSE DBUS_USE_LIBXML_TRUE DBUS_USE_LIBXML_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_TRUE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_FALSE DBUS_BUS_ENABLE_KQUEUE_TRUE DBUS_BUS_ENABLE_KQUEUE_FALSE HAVE_CONSOLE_OWNER_FILE_TRUE HAVE_CONSOLE_OWNER_FILE_FALSE DBUS_CLIENT_CFLAGS DBUS_CLIENT_LIBS DBUS_BUS_CFLAGS DBUS_BUS_LIBS DBUS_TEST_CFLAGS DBUS_TEST_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DBUS_X_CFLAGS DBUS_X_LIBS DOXYGEN DBUS_DOXYGEN_DOCS_ENABLED_TRUE DBUS_DOXYGEN_DOCS_ENABLED_FALSE XMLTO DBUS_XML_DOCS_ENABLED_TRUE DBUS_XML_DOCS_ENABLED_FALSE EXPANDED_LOCALSTATEDIR EXPANDED_SYSCONFDIR EXPANDED_BINDIR EXPANDED_LIBDIR EXPANDED_DATADIR DBUS_INIT_SCRIPTS_RED_HAT_TRUE DBUS_INIT_SCRIPTS_RED_HAT_FALSE DBUS_INIT_SCRIPTS_SLACKWARE_TRUE DBUS_INIT_SCRIPTS_SLACKWARE_FALSE DBUS_SYSTEM_SOCKET DBUS_SYSTEM_BUS_DEFAULT_ADDRESS DBUS_SYSTEM_PID_FILE DBUS_CONSOLE_AUTH_DIR DBUS_CONSOLE_OWNER_FILE DBUS_USER DBUS_DAEMONDIR TEST_SERVICE_DIR TEST_SERVICE_BINARY TEST_SHELL_SERVICE_BINARY TEST_EXIT_BINARY TEST_SEGFAULT_BINARY TEST_SLEEP_FOREVER_BINARY TEST_SOCKET_DIR DBUS_SESSION_SOCKET_DIR LIBOBJS LTLIBOBJS PTHREAD_LIBS'
+ ac_subst_files=''
- case " $CFLAGS " in
-@@ -28332,6 +28333,31 @@ if test x$have_dnotify = xyes; then
+ # Initialize some variables set by options.
+@@ -25187,7 +25187,7 @@ DBUS_CLIENT_LIBS=
- cat >>confdefs.h <<\_ACEOF
- #define DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX 1
-+_ACEOF
-+
-+fi
-+
-+# kqueue checks
-+case "${target_os}" in
-+ freebsd*)
-+ # Check whether --enable-kqueue or --disable-kqueue was given.
-+ if test "${enable_kqueue+set}" = set; then
-+ enableval="$enable_kqueue"
-+ enable_kqueue=$enableval
-+ else
-+ enable_kqueue=auto
-+ fi;
-+ if test x$enable_kqueue = xno ; then
-+ have_kqueue=no;
-+ else
-+ have_kqueue=yes;
-+ fi
-+;;
-+esac
-+if test x$have_kqueue = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD 1
- _ACEOF
- fi
+ DBUS_BUS_CFLAGS=$XML_CFLAGS
+-DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $INTLLIBS"
++DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $INTLLIBS $PTHREAD_LIBS"
+
+
+
+@@ -27929,6 +27929,7 @@ s,@X_LIBS@,$X_LIBS,;t t
+ s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+ s,@DBUS_X_CFLAGS@,$DBUS_X_CFLAGS,;t t
+ s,@DBUS_X_LIBS@,$DBUS_X_LIBS,;t t
++s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
+ s,@DOXYGEN@,$DOXYGEN,;t t
+ s,@DBUS_DOXYGEN_DOCS_ENABLED_TRUE@,$DBUS_DOXYGEN_DOCS_ENABLED_TRUE,;t t
+ s,@DBUS_DOXYGEN_DOCS_ENABLED_FALSE@,$DBUS_DOXYGEN_DOCS_ENABLED_FALSE,;t t
diff --git a/devel/dbus/files/patch-dbus-1.pc.in b/devel/dbus/files/patch-dbus-1.pc.in
index 1b96c24f5857..b9c5fdcc2333 100644
--- a/devel/dbus/files/patch-dbus-1.pc.in
+++ b/devel/dbus/files/patch-dbus-1.pc.in
@@ -1,9 +1,11 @@
---- dbus-1.pc.in.orig Tue Jun 22 14:50:57 2004
-+++ dbus-1.pc.in Tue Jun 22 14:54:24 2004
-@@ -7,5 +7,5 @@
+--- ./dbus-1.pc.in.orig Thu Mar 16 22:20:14 2006
++++ ./dbus-1.pc.in Sun Oct 8 02:02:33 2006
+@@ -9,6 +9,6 @@ session_bus_services_dir=@EXPANDED_DATAD
+ Name: dbus
Description: Free desktop message bus
Version: @VERSION@
- Libs: -L${libdir} -ldbus-1
+-Libs: -L${libdir} -ldbus-1
-Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include
++Libs: -L${libdir} -ldbus-1 @PTHREAD_LIBS@
+Cflags: -I${includedir}/dbus-1.0 -I${includedir}/dbus-1.0/include
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
index d7182118603b..42a7509663bc 100644
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps.c
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
@@ -1,6 +1,6 @@
---- dbus/dbus-sysdeps.c.orig Tue Nov 22 15:37:00 2005
-+++ dbus/dbus-sysdeps.c Sat Dec 31 13:08:04 2005
-@@ -781,16 +781,16 @@ write_credentials_byte (int
+--- dbus/dbus-sysdeps-unix.c.orig Thu Sep 14 01:07:11 2006
++++ dbus/dbus-sysdeps-unix.c Sat Oct 7 12:23:40 2006
+@@ -719,16 +719,16 @@ write_credentials_byte (int
{
int bytes_written;
char buf[1] = { '\0' };
@@ -21,7 +21,7 @@
iov.iov_base = buf;
iov.iov_len = 1;
-@@ -798,10 +798,10 @@ write_credentials_byte (int
+@@ -736,10 +736,10 @@ write_credentials_byte (int
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
@@ -35,7 +35,7 @@
cmsg.hdr.cmsg_level = SOL_SOCKET;
cmsg.hdr.cmsg_type = SCM_CREDS;
#endif
-@@ -810,7 +810,7 @@ write_credentials_byte (int
+@@ -748,7 +748,7 @@ write_credentials_byte (int
again:
@@ -44,7 +44,7 @@
bytes_written = sendmsg (server_fd, &msg, 0);
#else
bytes_written = write (server_fd, buf, 1);
-@@ -868,9 +868,10 @@ _dbus_read_credentials_unix_socket (int
+@@ -806,9 +806,10 @@ _dbus_read_credentials_unix_socket (int
char buf;
#ifdef HAVE_CMSGCRED
@@ -55,20 +55,11 @@
- struct cmsgcred cred;
+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
} cmsg;
- #endif
-
-@@ -886,7 +887,7 @@ _dbus_read_credentials_unix_socket (int
-
- _dbus_credentials_clear (credentials);
--#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED)
-+#if defined(LOCAL_CREDS) && !defined(HAVE_CMSGCRED)
- /* Set the socket to receive credentials on the next message */
- {
- int on = 1;
-@@ -907,8 +908,8 @@ _dbus_read_credentials_unix_socket (int
+ #elif defined(LOCAL_CREDS)
+@@ -845,8 +846,8 @@ _dbus_read_credentials_unix_socket (int
- #ifdef HAVE_CMSGCRED
+ #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
memset (&cmsg, 0, sizeof (cmsg));
- msg.msg_control = &cmsg;
- msg.msg_controllen = sizeof (cmsg);
@@ -77,17 +68,17 @@
#endif
again:
-@@ -931,7 +932,8 @@ _dbus_read_credentials_unix_socket (int
+@@ -869,7 +870,8 @@ _dbus_read_credentials_unix_socket (int
}
- #ifdef HAVE_CMSGCRED
+ #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
- if (cmsg.hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS)
+ if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred))
+ || cmsg.hdr.cmsg_type != SCM_CREDS)
{
dbus_set_error (error, DBUS_ERROR_FAILED,
"Message from recvmsg() was not SCM_CREDS");
-@@ -959,9 +961,10 @@ _dbus_read_credentials_unix_socket (int
+@@ -897,9 +899,10 @@ _dbus_read_credentials_unix_socket (int
cr_len, (int) sizeof (cr), _dbus_strerror (errno));
}
#elif defined(HAVE_CMSGCRED)
@@ -98,6 +89,6 @@
+ credentials->pid = cred->cmcred_pid;
+ credentials->uid = cred->cmcred_euid;
+ credentials->gid = cred->cmcred_groups[0];
- #elif defined(HAVE_GETPEEREID)
- uid_t euid;
- gid_t egid;
+ #elif defined(LOCAL_CREDS)
+ credentials->pid = DBUS_PID_UNSET;
+ credentials->uid = cmsg.cred.sc_uid;
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
new file mode 100644
index 000000000000..28701094bd8b
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
@@ -0,0 +1,11 @@
+--- dbus/dbus-sysdeps-util-unix.c.orig Sat Oct 7 12:33:47 2006
++++ dbus/dbus-sysdeps-util-unix.c Sat Oct 7 12:34:13 2006
+@@ -502,7 +502,7 @@ static dbus_bool_t
+ dirent_buf_size(DIR * dirp, size_t *size)
+ {
+ long name_max;
+-# if defined(HAVE_FPATHCONF) && defined(HAVE_DIRFD) \
++# if defined(HAVE_FPATHCONF) && ( defined(HAVE_DIRFD) || defined(dirfd) )\
+ && defined(_PC_NAME_MAX)
+ name_max = fpathconf(dirfd(dirp), _PC_NAME_MAX);
+ if (name_max == -1)
diff --git a/devel/dbus/files/patch-python_Makefile.in b/devel/dbus/files/patch-python_Makefile.in
deleted file mode 100644
index 98f8f61041f8..000000000000
--- a/devel/dbus/files/patch-python_Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
---- python/Makefile.in.orig Sat Jul 16 13:21:22 2005
-+++ python/Makefile.in Sat Jul 16 13:22:22 2005
-@@ -60,12 +60,12 @@
- "$(DESTDIR)$(dbusdir)"
- dbusbindingsLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(dbusbindings_LTLIBRARIES)
--dbus_bindings_la_DEPENDENCIES = $(top_builddir)/dbus/libdbus-1.la
-+dbus_bindings_la_DEPENDENCIES = -ldbus-1
- nodist_dbus_bindings_la_OBJECTS = dbus_bindings.lo
- dbus_bindings_la_OBJECTS = $(nodist_dbus_bindings_la_OBJECTS)
- dbus_glib_bindings_la_DEPENDENCIES = \
-- $(top_builddir)/dbus/libdbus-1.la \
-- $(top_builddir)/glib/libdbus-glib-1.la
-+ -ldbus-1 \
-+ -ldbus-glib-1
- nodist_dbus_glib_bindings_la_OBJECTS = \
- dbus_glib_bindings_la-dbus_glib_bindings.lo
- dbus_glib_bindings_la_OBJECTS = \
-@@ -345,10 +345,10 @@
- dbusbindingsdir = $(pyexecdir)/dbus
- dbusbindings_LTLIBRARIES = dbus_bindings.la dbus_glib_bindings.la
- dbus_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_bindings
--dbus_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la
-+dbus_bindings_la_LIBADD = -ldbus-1
- nodist_dbus_bindings_la_SOURCES = dbus_bindings.c
- dbus_glib_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_glib_bindings
--dbus_glib_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/glib/libdbus-glib-1.la
-+dbus_glib_bindings_la_LIBADD = -ldbus-1 -ldbus-glib-1
- dbus_glib_bindings_la_CFLAGS = $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS)
- nodist_dbus_glib_bindings_la_SOURCES = dbus_glib_bindings.c
- EXTRA_DIST = \
diff --git a/devel/dbus/files/patch-python_dbus_h_wrapper.h b/devel/dbus/files/patch-python_dbus_h_wrapper.h
deleted file mode 100644
index b8c6cd9fd747..000000000000
--- a/devel/dbus/files/patch-python_dbus_h_wrapper.h
+++ /dev/null
@@ -1,7 +0,0 @@
---- python/dbus_h_wrapper.h.orig Sat Jul 16 03:30:40 2005
-+++ python/dbus_h_wrapper.h Sat Jul 16 03:28:47 2005
-@@ -1,3 +1,4 @@
- #define DBUS_API_SUBJECT_TO_CHANGE 1
-+#define lint 1
- #include <dbus/dbus.h>
-
diff --git a/devel/dbus/files/patch-tools_Makefile.in b/devel/dbus/files/patch-tools_Makefile.in
new file mode 100644
index 000000000000..41a417ecfc30
--- /dev/null
+++ b/devel/dbus/files/patch-tools_Makefile.in
@@ -0,0 +1,32 @@
+--- tools/Makefile.in.orig Sun Oct 8 02:49:22 2006
++++ tools/Makefile.in Sun Oct 8 02:51:10 2006
+@@ -150,6 +150,7 @@ DBUS_XML_DOCS_ENABLED_FALSE = @DBUS_XML_
+ DBUS_XML_DOCS_ENABLED_TRUE = @DBUS_XML_DOCS_ENABLED_TRUE@
+ DBUS_X_CFLAGS = @DBUS_X_CFLAGS@
+ DBUS_X_LIBS = @DBUS_X_LIBS@
++PTHREAD_LIBS = @PTHREAD_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DOXYGEN = @DOXYGEN@
+@@ -264,7 +265,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\"
++INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/share/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\"
+ dbus_send_SOURCES = \
+ dbus-print-message.c \
+ dbus-print-message.h \
+@@ -281,9 +282,9 @@ dbus_launch_SOURCES = \
+ dbus_cleanup_sockets_SOURCES = \
+ dbus-cleanup-sockets.c
+
+-dbus_send_LDADD = $(top_builddir)/dbus/libdbus-1.la
+-dbus_monitor_LDADD = $(top_builddir)/dbus/libdbus-1.la
+-dbus_launch_LDADD = $(DBUS_X_LIBS)
++dbus_send_LDADD = $(top_builddir)/dbus/libdbus-1.la $(PTHREAD_LIBS)
++dbus_monitor_LDADD = $(top_builddir)/dbus/libdbus-1.la $(PTHREAD_LIBS)
++dbus_launch_LDADD = $(DBUS_X_LIBS) $(PTHREAD_LIBS)
+ man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1
+ EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh
+ CLEANFILES = \
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
index b165f80b1f2b..e1703343c567 100644
--- a/devel/dbus/pkg-plist
+++ b/devel/dbus/pkg-plist
@@ -1,4 +1,3 @@
-bin/dbus-binding-tool
bin/dbus-cleanup-sockets
bin/dbus-daemon
bin/dbus-launch
@@ -6,45 +5,27 @@ bin/dbus-monitor
bin/dbus-send
etc/dbus-1/session.conf
etc/dbus-1/system.conf
-%%QT%%include/dbus-%%VERSION%%/dbus/connection.h
include/dbus-%%VERSION%%/dbus/dbus-address.h
include/dbus-%%VERSION%%/dbus/dbus-bus.h
include/dbus-%%VERSION%%/dbus/dbus-connection.h
include/dbus-%%VERSION%%/dbus/dbus-errors.h
-include/dbus-%%VERSION%%/dbus/dbus-glib-bindings.h
-include/dbus-%%VERSION%%/dbus/dbus-glib-error-enum.h
-include/dbus-%%VERSION%%/dbus/dbus-glib-lowlevel.h
-include/dbus-%%VERSION%%/dbus/dbus-glib.h
-include/dbus-%%VERSION%%/dbus/dbus-gtype-specialized.h
include/dbus-%%VERSION%%/dbus/dbus-macros.h
include/dbus-%%VERSION%%/dbus/dbus-memory.h
include/dbus-%%VERSION%%/dbus/dbus-message.h
include/dbus-%%VERSION%%/dbus/dbus-pending-call.h
include/dbus-%%VERSION%%/dbus/dbus-protocol.h
-%%QT%%include/dbus-%%VERSION%%/dbus/dbus-qt.h
include/dbus-%%VERSION%%/dbus/dbus-server.h
include/dbus-%%VERSION%%/dbus/dbus-shared.h
include/dbus-%%VERSION%%/dbus/dbus-signature.h
include/dbus-%%VERSION%%/dbus/dbus-threads.h
include/dbus-%%VERSION%%/dbus/dbus-types.h
include/dbus-%%VERSION%%/dbus/dbus.h
-%%QT%%include/dbus-%%VERSION%%/dbus/message.h
-%%QT%%include/dbus-%%VERSION%%/dbus/server.h
include/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h
lib/libdbus-1.a
lib/libdbus-1.la
lib/libdbus-1.so
-lib/libdbus-1.so.2
-lib/libdbus-glib-1.a
-lib/libdbus-glib-1.la
-lib/libdbus-glib-1.so
-lib/libdbus-glib-1.so.2
-%%QT%%lib/libdbus-qt-1.a
-%%QT%%lib/libdbus-qt-1.la
-%%QT%%lib/libdbus-qt-1.so
-%%QT%%lib/libdbus-qt-1.so.1
+lib/libdbus-1.so.3
libdata/pkgconfig/dbus-1.pc
-libdata/pkgconfig/dbus-glib-1.pc
@exec mkdir -p %D/etc/dbus-1/system.d
@exec mkdir -p %%X11BASE%%/etc/dbus-1/system.d
@exec mkdir -p %D/share/dbus-1/services
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index b44163bea142..5d12ec4b7096 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -4,30 +4,39 @@
# Whom: Matthew Condell (mcondell@alum.mit.edu)
#
# $FreeBSD$
-#
+# $MCom: ports/devel/g-wrap/Makefile,v 1.4 2006/09/12 21:27:18 ahze Exp $
PORTNAME= g-wrap
-PORTVERSION= 1.3.4
-PORTREVISION= 9
+PORTVERSION= 1.9.6
+PORTREVISION= 2
CATEGORIES= devel scheme
-MASTER_SITES= http://www.gnucash.org/pub/g-wrap/source/ \
- http://people.freebsd.org/~sobomax/
+MASTER_SITES= SAVANNAH
MAINTAINER= gnome@FreeBSD.org
COMMENT= A tool for exporting C libraries into Scheme interpreters
-BUILD_DEPENDS= ${LOCALBASE}/share/guile/slibcat:${PORTSDIR}/lang/slib-guile
-LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile \
- guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk
-RUN_DEPENDS= ${LOCALBASE}/share/guile/slibcat:${PORTSDIR}/lang/slib-guile
+BUILD_DEPENDS= slib-guile>0:${PORTSDIR}/lang/slib-guile
+LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile
+RUN_DEPENDS= slib-guile>0:${PORTSDIR}/lang/slib-guile
INFO= g-wrap
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GNOME= gtk12
-INSTALLS_SHLIB= yes
-CONFIGURE_ENV+= GW_GLIB_CONFIG="${GLIB_CONFIG}"
-MAKE_ENV+= GUILE_LOAD_PATH=${WRKSRC}
+USE_GNOME= glib20 gnomehack
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|"glib"|"glib-2.0"|' \
+ ${WRKSRC}/configure
+
+pre-install:
+ @${REINPLACE_CMD} -e 's|libffi||' ${WRKSRC}/${MAKEFILE}
+
+post-install:
+ ${MKDIR} ${PREFIX}/include/g-wrap/ffi
+.for f in ffi.h ffitarget.h
+ ${INSTALL_DATA} ${WRKSRC}/libffi/include/${f} ${PREFIX}/include/g-wrap/ffi
+.endfor
.include <bsd.port.mk>
diff --git a/devel/g-wrap/distinfo b/devel/g-wrap/distinfo
index 2cef87078feb..9eabe531c56d 100644
--- a/devel/g-wrap/distinfo
+++ b/devel/g-wrap/distinfo
@@ -1,3 +1,3 @@
-MD5 (g-wrap-1.3.4.tar.gz) = bf29b8b563cc27d9f7fd90a6243653aa
-SHA256 (g-wrap-1.3.4.tar.gz) = bb9fa9b7b6b2a11899d98d730cf5970179bbf942fd763eda13b7b541278adee4
-SIZE (g-wrap-1.3.4.tar.gz) = 403570
+MD5 (g-wrap-1.9.6.tar.gz) = 4d83964f51376500eedced538c1620cb
+SHA256 (g-wrap-1.9.6.tar.gz) = ddb0e31d40581402d6d7045cce7cdc79e0bc0627831a4b12012f45703446d311
+SIZE (g-wrap-1.9.6.tar.gz) = 826045
diff --git a/devel/g-wrap/files/patch-Makefile.in b/devel/g-wrap/files/patch-Makefile.in
deleted file mode 100644
index 93024a542005..000000000000
--- a/devel/g-wrap/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig Thu Nov 7 23:40:46 2002
-+++ Makefile.in Tue Feb 4 20:43:51 2003
-@@ -144,7 +144,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = doc rpm bin g-wrap example test
-+SUBDIRS = doc rpm bin g-wrap example
-
- guilemoduledir = @GUILEMODDIR@
- guilemodule_DATA = @GUILEMOD_TARGET@
diff --git a/devel/g-wrap/files/patch-ab b/devel/g-wrap/files/patch-ab
deleted file mode 100644
index b22e980a6ce2..000000000000
--- a/devel/g-wrap/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/g-wrap.texi.orig Thu Jun 22 06:42:12 2000
-+++ doc/g-wrap.texi Sat Jul 15 12:15:38 2000
-@@ -2,6 +2,10 @@
- @c %**start of header
- @setfilename g-wrap.info
- @settitle g-wrap
-+@dircategory Scheme Programming
-+@direntry
-+* g-wrap: (g-wrap). A tool for exporting C libraries into Scheme interpreters.
-+@end direntry
- @setchapternewpage on
- @c Choices for setchapternewpage are {on,off,odd}.
- @paragraphindent 0
diff --git a/devel/g-wrap/files/patch-g-wrap_Makefile.in b/devel/g-wrap/files/patch-g-wrap_Makefile.in
deleted file mode 100644
index 1e5ab26f8e38..000000000000
--- a/devel/g-wrap/files/patch-g-wrap_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- g-wrap/Makefile.in.orig Tue Feb 4 20:45:49 2003
-+++ g-wrap/Makefile.in Tue Feb 4 20:46:00 2003
-@@ -197,7 +197,7 @@
-
-
- #AM_CFLAGS = -O2 -g -Wall -Wno-uninitialized -Werror
--AM_CFLAGS = -O2 -g -Wall -Werror \
-+AM_CFLAGS = -Wall -Werror \
- ${GW_GLIB_CFLAGS_ADD} \
- ${GW_GUILE_GTK_CFLAGS_ADD}
-
diff --git a/devel/g-wrap/files/patch-guile_g-wrap-2.0-guile.pc.in b/devel/g-wrap/files/patch-guile_g-wrap-2.0-guile.pc.in
new file mode 100644
index 000000000000..6ffbfe171907
--- /dev/null
+++ b/devel/g-wrap/files/patch-guile_g-wrap-2.0-guile.pc.in
@@ -0,0 +1,15 @@
+--- guile/g-wrap-2.0-guile.pc.in.orig Mon Oct 11 06:32:16 2004
++++ guile/g-wrap-2.0-guile.pc.in Tue Sep 12 17:10:41 2006
+@@ -5,9 +5,10 @@
+ libdir=@libdir@
+ includedir=@includedir@
+ module_directory=@GUILEMODDIR@
++ffiincludedir= @includedir@/g-wrap/ffi
+
+ Name: G-Wrap
+ Description: A Guile wrapper generator
+ Version: @VERSION@
+-Libs: -L${libdir} -lgwrap-guile-runtime -lgwrap-core-runtime @GUILE_LDFLAGS@ @LIBFFI_LIBS_INSTALLED@
+-Cflags: @STD_CFLAGS@ -I${includedir} @GUILE_CFLAGS@ @LIBFFI_CFLAGS_INSTALLED@
++Libs: -L/usr/local/lib/elf -L${libdir} -lgwrap-guile-runtime -lgwrap-core-runtime @GUILE_LDFLAGS@
++Cflags: @STD_CFLAGS@ -I${includedir} -I${ffiincludedir} @GUILE_CFLAGS@ @LIBFFI_CFLAGS_INSTALLED@
diff --git a/devel/g-wrap/files/patch-libffi_configure b/devel/g-wrap/files/patch-libffi_configure
new file mode 100644
index 000000000000..2121d0c04a00
--- /dev/null
+++ b/devel/g-wrap/files/patch-libffi_configure
@@ -0,0 +1,11 @@
+--- libffi/configure.orig Tue Sep 12 17:01:51 2006
++++ libffi/configure Tue Sep 12 17:02:19 2006
+@@ -3285,7 +3285,7 @@
+ ;;
+ esac
+ else
+- enable_shared=yes
++ enable_shared=no # don't build shared lib (or conflict with gcc3*)
+ fi;
+
+ # Check whether --enable-static or --disable-static was given.
diff --git a/devel/g-wrap/pkg-plist b/devel/g-wrap/pkg-plist
index 75a89facdc33..51e877875029 100644
--- a/devel/g-wrap/pkg-plist
+++ b/devel/g-wrap/pkg-plist
@@ -1,47 +1,54 @@
bin/g-wrap-config
-include/g-wrap/g-wrap-compatibility.h
-include/g-wrap/g-wrap-glib.h
-include/g-wrap/g-wrap-wct.h
-lib/libgw-glib.a
-lib/libgw-glib.la
-lib/libgw-glib.so
-lib/libgw-glib.so.0
-lib/libgw-gtk.a
-lib/libgw-gtk.la
-lib/libgw-gtk.so
-lib/libgw-gtk.so.0
-lib/libgw-standard.a
-lib/libgw-standard.la
-lib/libgw-standard.so
-lib/libgw-standard.so.0
-lib/libgw-wct.a
-lib/libgw-wct.la
-lib/libgw-wct.so
-lib/libgw-wct.so.0
-lib/libgwrap-glib.a
-lib/libgwrap-glib.la
-lib/libgwrap-glib.so
-lib/libgwrap-glib.so.1
-lib/libgwrap-wct.a
-lib/libgwrap-wct.la
-lib/libgwrap-wct.so
-lib/libgwrap-wct.so.1
-share/aclocal/g-wrap.m4
-share/guile/g-wrap.scm
-share/guile/g-wrap/enumeration.scm
-share/guile/g-wrap/g-translate.scm
-share/guile/g-wrap/gtkobj.scm
-share/guile/g-wrap/gw-glib-spec.scm
-share/guile/g-wrap/gw-glib.scm
-share/guile/g-wrap/gw-gtk-spec.scm
-share/guile/g-wrap/gw-gtk.scm
-share/guile/g-wrap/gw-standard-spec.scm
-share/guile/g-wrap/gw-standard.scm
-share/guile/g-wrap/gw-wct-spec.scm
-share/guile/g-wrap/gw-wct.scm
-share/guile/g-wrap/output-file.scm
-share/guile/g-wrap/runtime.scm
-share/guile/g-wrap/simple-type.scm
-share/guile/g-wrap/sorting.scm
-@dirrm share/guile/g-wrap
+include/g-wrap-wct.h
+include/g-wrap/core-runtime.h
+include/g-wrap/ffi-support.h
+include/g-wrap/ffi/ffi.h
+include/g-wrap/ffi/ffitarget.h
+include/g-wrap/guile-compatibility.h
+include/g-wrap/guile-runtime.h
+include/g-wrap/guile-wct.h
+lib/libgw-guile-gw-glib.a
+lib/libgw-guile-gw-glib.la
+lib/libgw-guile-gw-glib.so
+lib/libgw-guile-gw-glib.so.0
+lib/libgw-guile-standard.a
+lib/libgw-guile-standard.la
+lib/libgw-guile-standard.so
+lib/libgw-guile-standard.so.0
+lib/libgwrap-core-runtime.a
+lib/libgwrap-core-runtime.la
+lib/libgwrap-core-runtime.so
+lib/libgwrap-core-runtime.so.0
+lib/libgwrap-guile-runtime.a
+lib/libgwrap-guile-runtime.la
+lib/libgwrap-guile-runtime.so
+lib/libgwrap-guile-runtime.so.0
+libdata/pkgconfig/g-wrap-2.0-guile.pc
+share/guile/site/g-wrap.scm
+share/guile/site/g-wrap/c-types.scm
+share/guile/site/g-wrap/compat.scm
+share/guile/site/g-wrap/enumeration.scm
+share/guile/site/g-wrap/guile.scm
+share/guile/site/g-wrap/guile/ws/standard.scm
+share/guile/site/g-wrap/gw-glib-spec.scm
+share/guile/site/g-wrap/gw-glib.scm
+share/guile/site/g-wrap/gw-standard-spec.scm
+share/guile/site/g-wrap/gw-wct-spec.scm
+share/guile/site/g-wrap/gw-wct.scm
+share/guile/site/g-wrap/gw/standard.scm
+share/guile/site/g-wrap/rti.scm
+share/guile/site/g-wrap/simple-type.scm
+share/guile/site/g-wrap/util.scm
+share/guile/site/g-wrap/ws/standard.scm
+share/guile/site/srfi/srfi-34.scm
+share/guile/site/srfi/srfi-35.scm
+@dirrmtry share/guile/site/srfi
+@dirrmtry share/guile/site/g-wrap/ws
+@dirrmtry share/guile/site/g-wrap/gw
+@dirrmtry share/guile/site/g-wrap/guile/ws
+@dirrmtry share/guile/site/g-wrap/guile
+@dirrmtry share/guile/site/g-wrap
+@dirrmtry share/guile/site
+@dirrmtry share/guile
+@dirrm include/g-wrap/ffi
@dirrm include/g-wrap
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index eb1fee6c27c8..54ae95ea3a61 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.72 2006/04/13 07:52:32 bland Exp $
+# $MCom: ports/devel/gconf2/Makefile,v 1.79 2006/10/05 18:09:30 mezz Exp $
#
PORTNAME= gconf2
-PORTVERSION= 2.14.0
-PORTREVISION?= 3
+PORTVERSION= 2.16.0
+PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -26,8 +26,9 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
-USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc ltverhack referencehack
+USE_XLIB= yes
+USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc ltverhack \
+ referencehack
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index 5bc575714c76..2aa3e29181b9 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/GConf-2.14.0.tar.bz2) = d07c2efcaf477cf34225c604a04b6271
-SHA256 (gnome2/GConf-2.14.0.tar.bz2) = 040c512ebc39285bce78c177e9e434e7b6731fd53a001768ee3405a919837525
-SIZE (gnome2/GConf-2.14.0.tar.bz2) = 1895477
+MD5 (gnome2/GConf-2.16.0.tar.bz2) = b1a202f36661c0d9c87f8fe27a28bd52
+SHA256 (gnome2/GConf-2.16.0.tar.bz2) = d687ea919e20e08c42eeedf32e40f0845cd6799dbfa2edec9dbc644d386805c2
+SIZE (gnome2/GConf-2.16.0.tar.bz2) = 1307732
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 278e79888538..035a6e805ad0 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -35,6 +35,7 @@ share/locale/az/LC_MESSAGES/GConf2.mo
share/locale/be/LC_MESSAGES/GConf2.mo
share/locale/bg/LC_MESSAGES/GConf2.mo
share/locale/bn/LC_MESSAGES/GConf2.mo
+share/locale/bn_IN/LC_MESSAGES/GConf2.mo
share/locale/bs/LC_MESSAGES/GConf2.mo
share/locale/ca/LC_MESSAGES/GConf2.mo
share/locale/cs/LC_MESSAGES/GConf2.mo
@@ -61,6 +62,7 @@ share/locale/id/LC_MESSAGES/GConf2.mo
share/locale/is/LC_MESSAGES/GConf2.mo
share/locale/it/LC_MESSAGES/GConf2.mo
share/locale/ja/LC_MESSAGES/GConf2.mo
+share/locale/ka/LC_MESSAGES/GConf2.mo
share/locale/ko/LC_MESSAGES/GConf2.mo
share/locale/ku/LC_MESSAGES/GConf2.mo
share/locale/lt/LC_MESSAGES/GConf2.mo
@@ -73,7 +75,7 @@ share/locale/nb/LC_MESSAGES/GConf2.mo
share/locale/ne/LC_MESSAGES/GConf2.mo
share/locale/nl/LC_MESSAGES/GConf2.mo
share/locale/nn/LC_MESSAGES/GConf2.mo
-share/locale/no/LC_MESSAGES/GConf2.mo
+share/locale/or/LC_MESSAGES/GConf2.mo
share/locale/pa/LC_MESSAGES/GConf2.mo
share/locale/pl/LC_MESSAGES/GConf2.mo
share/locale/pt/LC_MESSAGES/GConf2.mo
@@ -99,20 +101,57 @@ share/locale/zh_HK/LC_MESSAGES/GConf2.mo
share/locale/zh_TW/LC_MESSAGES/GConf2.mo
share/sgml/gconf/gconf-1.0.dtd
@dirrm share/sgml/gconf
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/yi/LC_MESSAGES
-@dirrmtry share/locale/yi
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
%%LDAP%%@dirrm share/GConf/schema
%%LDAP%%@dirrm share/GConf
@dirrm lib/GConf/2
@dirrm include/gconf/2/gconf
@dirrm include/gconf/2
@dirrm etc/gconf/2
-@dirrmtry share/sgml
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 78d103c31f24..83fdd84a816f 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,15 +3,15 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glib20/Makefile,v 1.75 2006/04/13 07:57:40 bland Exp $
+# $MCom: ports/devel/glib20/Makefile,v 1.91 2006/10/05 06:55:34 mezz Exp $
#
PORTNAME= glib
-PORTVERSION= 2.10.3
+PORTVERSION= 2.12.4
PORTREVISION?= 0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/2.10,} \
- ftp://ftp.gtk.org/pub/gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
+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/}/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -30,7 +30,7 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GNOME= gnomehack gnometarget pkgconfig ltverhack
USE_GMAKE= yes
USE_PERL5= yes
@@ -42,20 +42,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
-OPTIONS= COLLATION_FIX "fix string collation" off
-
.include <bsd.port.pre.mk>
.if ( ( ${OSVERSION} < 504101 ) || ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600012 ) )
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gthread_gthread-posix.c
.endif
-.if defined(WITH_COLLATION_FIX)
-LIB_DEPENDS+= icui18n:${PORTSDIR}/devel/icu
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \
- ${FILESDIR}/extra-patch-glib_gunicollate.c
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
s|%%X11BASE%%|${X11BASE}|g' \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index e467aeb74ae5..9fda3523c122 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.10.3.tar.bz2) = 87206e721c12d185d17dd9ecd7e30369
-SHA256 (gnome2/glib-2.10.3.tar.bz2) = 1d3700e35ca7240a9ce28cf222429648ea50271d62524e008191ccd04a3f8f6f
-SIZE (gnome2/glib-2.10.3.tar.bz2) = 2774011
+MD5 (gnome2/glib-2.12.4.tar.bz2) = ef7b9595fa788e245a0f883bddba8a25
+SHA256 (gnome2/glib-2.12.4.tar.bz2) = 1b1a0dc746a07c67aad15e22e3d751c3e7068c889d171efb1ab45efbab87c75d
+SIZE (gnome2/glib-2.12.4.tar.bz2) = 2868828
diff --git a/devel/glib20/files/extra-patch-glib_Makefile.in b/devel/glib20/files/extra-patch-glib_Makefile.in
deleted file mode 100644
index 3c5676d2eb1e..000000000000
--- a/devel/glib20/files/extra-patch-glib_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib/Makefile.in.orig Wed Jul 19 01:08:13 2006
-+++ glib/Makefile.in Wed Jul 19 01:09:10 2006
-@@ -130,7 +130,7 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -licui18n
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
diff --git a/devel/glib20/files/extra-patch-glib_gunicollate.c b/devel/glib20/files/extra-patch-glib_gunicollate.c
deleted file mode 100644
index 5d31cbd2ed72..000000000000
--- a/devel/glib20/files/extra-patch-glib_gunicollate.c
+++ /dev/null
@@ -1,116 +0,0 @@
---- glib/gunicollate.c.orig Sun Nov 27 21:15:41 2005
-+++ glib/gunicollate.c Thu Oct 5 17:11:44 2006
-@@ -26,10 +26,57 @@
- #include <wchar.h>
- #endif
-
-+#include <unicode/umachine.h>
-+#include <unicode/ustring.h>
-+#include <unicode/ucol.h>
-+
- #include "glib.h"
- #include "gunicodeprivate.h"
- #include "galias.h"
-
-+static gboolean icu_collator_initialized = FALSE;
-+static UCollator *icu_collator = NULL;
-+G_LOCK_DEFINE_STATIC(icu_collator);
-+
-+static void
-+init_icu_collator (void)
-+{
-+ G_LOCK(icu_collator);
-+ if (! icu_collator_initialized)
-+ {
-+ UErrorCode error = U_ZERO_ERROR;
-+
-+ icu_collator = ucol_open(NULL, &error);
-+ if (icu_collator == NULL)
-+ g_warning("unable to initialize the ICU collator (%s), FreeBSD collation routines will be used", u_errorName(error));
-+
-+ icu_collator_initialized = TRUE;
-+ }
-+ G_UNLOCK(icu_collator);
-+}
-+
-+static UChar *
-+utf8_to_uchar (const char *str, int32_t len, int32_t *result_len)
-+{
-+ UErrorCode error = U_ZERO_ERROR;
-+ UChar *result = NULL;
-+
-+ u_strFromUTF8(NULL, 0, result_len, str, len, &error);
-+ if (error <= U_ZERO_ERROR || error == U_BUFFER_OVERFLOW_ERROR)
-+ {
-+ error = U_ZERO_ERROR;
-+ result = g_new(UChar, *result_len);
-+ u_strFromUTF8(result, *result_len, NULL, str, len, &error);
-+ if (error > U_ZERO_ERROR)
-+ {
-+ g_free(result);
-+ result = NULL;
-+ }
-+ }
-+
-+ return result;
-+}
-+
- /**
- * g_utf8_collate:
- * @str1: a UTF-8 encoded string
-@@ -76,6 +123,28 @@
- g_return_val_if_fail (str1 != NULL, 0);
- g_return_val_if_fail (str2 != NULL, 0);
-
-+ init_icu_collator();
-+ if (icu_collator != NULL)
-+ {
-+ int32_t wstr1_len;
-+ UChar *wstr1 = utf8_to_uchar(str1, -1, &wstr1_len);
-+ if (wstr1 != NULL)
-+ {
-+ int32_t wstr2_len;
-+ UChar *wstr2 = utf8_to_uchar(str2, -1, &wstr2_len);
-+ if (wstr2 != NULL)
-+ {
-+ result = ucol_strcoll(icu_collator, wstr1, wstr1_len, wstr2, wstr2_len);
-+
-+ g_free(wstr1);
-+ g_free(wstr2);
-+
-+ return result;
-+ }
-+ g_free(wstr1);
-+ }
-+ }
-+
- str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE);
- str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE);
-
-@@ -217,6 +286,26 @@
- gchar *str_norm;
-
- g_return_val_if_fail (str != NULL, NULL);
-+
-+ init_icu_collator();
-+ if (icu_collator != NULL)
-+ {
-+ int32_t wstr_len;
-+ UChar *wstr = utf8_to_uchar(str, len, &wstr_len);
-+ if (wstr != NULL)
-+ {
-+ int32_t result_len;
-+
-+ /* get size of result */
-+ result_len = ucol_getSortKey(icu_collator, wstr, wstr_len, NULL, 0);
-+
-+ result = g_new(char, result_len);
-+ ucol_getSortKey(icu_collator, wstr, wstr_len, result, result_len);
-+ g_free(wstr);
-+
-+ return result;
-+ }
-+ }
-
- str_norm = g_utf8_normalize (str, len, G_NORMALIZE_ALL_COMPOSE);
-
diff --git a/devel/glib20/files/patch-glib_gatomic.c b/devel/glib20/files/patch-glib_gatomic.c
deleted file mode 100644
index 93b29baddabe..000000000000
--- a/devel/glib20/files/patch-glib_gatomic.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- glib/gatomic.c.orig Thu Jul 6 11:21:02 2006
-+++ glib/gatomic.c Thu Jul 6 11:18:48 2006
-@@ -414,14 +414,14 @@
- g_atomic_int_exchange_and_add (volatile gint *atomic,
- gint val)
- {
-- return __sync_fetch_and_add (atomic, val);
-+ return __sync_fetch_and_add_si (atomic, val);
- }
-
- void
- g_atomic_int_add (volatile gint *atomic,
- gint val)
- {
-- __sync_fetch_and_add (atomic, val);
-+ __sync_fetch_and_add_si (atomic, val);
- }
-
- gboolean
-@@ -429,7 +429,7 @@
- gint oldval,
- gint newval)
- {
-- return __sync_bool_compare_and_swap (atomic, oldval, newval);
-+ return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
- }
-
- gboolean
-@@ -437,7 +437,7 @@
- gpointer oldval,
- gpointer newval)
- {
-- return __sync_bool_compare_and_swap ((long *)atomic,
-+ return __sync_bool_compare_and_swap_di ((long *)atomic,
- (long)oldval, (long)newval);
- }
-
diff --git a/devel/glib20/files/patch-glib_gthread.c b/devel/glib20/files/patch-glib_gthread.c
deleted file mode 100644
index 1dce08388674..000000000000
--- a/devel/glib20/files/patch-glib_gthread.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- glib/gthread.c.orig Mon Mar 14 05:02:07 2005
-+++ glib/gthread.c Wed Jul 20 19:44:08 2005
-@@ -42,24 +42,8 @@
-
- #include "glib.h"
- #include "gthreadinit.h"
-+#include "gthreadprivate.h"
- #include "galias.h"
--
--#if GLIB_SIZEOF_SYSTEM_THREAD == SIZEOF_VOID_P
--# define g_system_thread_equal_simple(thread1, thread2) \
-- ((thread1).dummy_pointer == (thread2).dummy_pointer)
--# define g_system_thread_assign(dest, src) \
-- ((dest).dummy_pointer = (src).dummy_pointer)
--#else /* GLIB_SIZEOF_SYSTEM_THREAD != SIZEOF_VOID_P */
--# define g_system_thread_equal_simple(thread1, thread2) \
-- (memcmp (&(thread1), &(thread2), GLIB_SIZEOF_SYSTEM_THREAD) == 0)
--# define g_system_thread_assign(dest, src) \
-- (memcpy (&(dest), &(src), GLIB_SIZEOF_SYSTEM_THREAD))
--#endif /* GLIB_SIZEOF_SYSTEM_THREAD == SIZEOF_VOID_P */
--
--#define g_system_thread_equal(thread1, thread2) \
-- (g_thread_functions_for_glib_use.thread_equal ? \
-- g_thread_functions_for_glib_use.thread_equal (&(thread1), &(thread2)) :\
-- g_system_thread_equal_simple((thread1), (thread2)))
-
- GQuark
- g_thread_error_quark (void)
diff --git a/devel/glib20/files/patch-glib_gtimer.c b/devel/glib20/files/patch-glib_gtimer.c
new file mode 100644
index 000000000000..a0661056559f
--- /dev/null
+++ b/devel/glib20/files/patch-glib_gtimer.c
@@ -0,0 +1,11 @@
+--- glib/gtimer.c.orig Sun Oct 1 01:51:15 2006
++++ glib/gtimer.c Tue Oct 3 17:00:39 2006
+@@ -257,7 +257,7 @@
+
+ if (microseconds)
+ *microseconds = (elapsed / 10) % 1000000;
+-#elif HAVE_CLOCK_GETTIME
++#elif USE_CLOCK_GETTIME
+ if (timer->active)
+ GETTIME (timer->end);
+
diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c
index cf1338425a1c..47ca3e672044 100644
--- a/devel/glib20/files/patch-gmodule::gmodule-dl.c
+++ b/devel/glib20/files/patch-gmodule::gmodule-dl.c
@@ -1,6 +1,6 @@
$FreeBSD$
- $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.16 2005/12/15 00:18:44 marcus Exp $
+ $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.19 2006/10/10 20:22:06 mezz Exp $
--- gmodule/gmodule-dl.c.orig Sat Feb 17 08:28:07 2001
+++ gmodule/gmodule-dl.c Fri Jan 18 09:48:45 2002
diff --git a/devel/glib20/files/patch-gthread_gthread-impl.c b/devel/glib20/files/patch-gthread_gthread-impl.c
deleted file mode 100644
index 5f1b6dcbd7ec..000000000000
--- a/devel/glib20/files/patch-gthread_gthread-impl.c
+++ /dev/null
@@ -1,185 +0,0 @@
---- gthread/gthread-impl.c.orig Fri Feb 14 16:08:46 2003
-+++ gthread/gthread-impl.c Wed Jul 20 19:44:08 2005
-@@ -37,9 +37,11 @@
-
- #include <glib.h>
- #include <gthreadinit.h>
-+#include "gthreadprivate.h"
-
- #ifdef G_THREADS_ENABLED
-
-+static GSystemThread zero_thread; /* This is initialized to all zero */
- static gboolean thread_system_already_initialized = FALSE;
- static gint g_thread_priority_map [G_THREAD_PRIORITY_URGENT + 1];
-
-@@ -76,7 +78,7 @@
- struct _ErrorCheckInfo
- {
- gchar *location;
-- GThread *owner;
-+ GSystemThread owner;
- };
-
- static GMutex *
-@@ -94,7 +96,9 @@
- gchar *location)
- {
- ErrorCheckInfo *info;
-- GThread *self = g_thread_self ();
-+ GSystemThread self;
-+
-+ g_thread_functions_for_glib_use.thread_self (&self);
-
- if (magic != G_MUTEX_DEBUG_MAGIC)
- location = "unknown";
-@@ -116,14 +120,14 @@
- }
-
- info = G_MUTEX_DEBUG_INFO (mutex);
-- if (info->owner == self)
-+ if (g_system_thread_equal (info->owner, self))
- g_error ("Trying to recursivly lock a mutex at '%s', "
- "previously locked at '%s'",
- location, info->location);
-
- g_thread_functions_for_glib_use_default.mutex_lock (mutex);
-
-- info->owner = self;
-+ g_system_thread_assign (info->owner, self);
- info->location = location;
- }
-
-@@ -133,7 +137,9 @@
- gchar *location)
- {
- ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex);
-- GThread *self = g_thread_self ();
-+ GSystemThread self;
-+
-+ g_thread_functions_for_glib_use.thread_self (&self);
-
- if (magic != G_MUTEX_DEBUG_MAGIC)
- location = "unknown";
-@@ -145,7 +151,7 @@
- return TRUE;
- }
-
-- if (info->owner == self)
-+ if (g_system_thread_equal (info->owner, self))
- g_error ("Trying to recursivly lock a mutex at '%s', "
- "previously locked at '%s'",
- location, info->location);
-@@ -153,7 +159,7 @@
- if (!g_thread_functions_for_glib_use_default.mutex_trylock (mutex))
- return FALSE;
-
-- info->owner = self;
-+ g_system_thread_assign (info->owner, self);
- info->location = location;
-
- return TRUE;
-@@ -165,20 +171,22 @@
- gchar *location)
- {
- ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex);
-- GThread *self = g_thread_self ();
-+ GSystemThread self;
-+
-+ g_thread_functions_for_glib_use.thread_self (&self);
-
- if (magic != G_MUTEX_DEBUG_MAGIC)
- location = "unknown";
-
-- if (!info || info->owner == NULL)
-+ if (!info || g_system_thread_equal (info->owner, zero_thread))
- g_error ("Trying to unlock an unlocked mutex at '%s'", location);
-
-- if (info->owner != self)
-+ if (!g_system_thread_equal (info->owner, self))
- g_warning ("Trying to unlock a mutex at '%s', "
- "previously locked by a different thread at '%s'",
- location, info->location);
-
-- info->owner = NULL;
-+ g_system_thread_assign (info->owner, zero_thread);
- info->location = NULL;
-
- g_thread_functions_for_glib_use_default.mutex_unlock (mutex);
-@@ -194,7 +202,7 @@
- if (magic != G_MUTEX_DEBUG_MAGIC)
- location = "unknown";
-
-- if (info && info->owner != NULL)
-+ if (info && !g_system_thread_equal (info->owner, zero_thread))
- g_error ("Trying to free a locked mutex at '%s', "
- "which was previously locked at '%s'",
- location, info->location);
-@@ -211,25 +219,27 @@
- {
-
- ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex);
-- GThread *self = g_thread_self ();
-+ GSystemThread self;
-+
-+ g_thread_functions_for_glib_use.thread_self (&self);
-
- if (magic != G_MUTEX_DEBUG_MAGIC)
- location = "unknown";
-
-- if (!info || info->owner == NULL)
-+ if (!info || g_system_thread_equal (info->owner, zero_thread))
- g_error ("Trying to use an unlocked mutex in g_cond_wait() at '%s'",
- location);
-
-- if (info->owner != self)
-+ if (!g_system_thread_equal (info->owner, self))
- g_error ("Trying to use a mutex locked by another thread in "
- "g_cond_wait() at '%s'", location);
-
-- info->owner = NULL;
-+ g_system_thread_assign (info->owner, zero_thread);
- location = info->location;
-
- g_thread_functions_for_glib_use_default.cond_wait (cond, mutex);
-
-- info->owner = self;
-+ g_system_thread_assign (info->owner, self);
- info->location = location;
- }
-
-@@ -242,28 +252,30 @@
- gchar *location)
- {
- ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex);
-- GThread *self = g_thread_self ();
-+ GSystemThread self;
- gboolean retval;
-
-+ g_thread_functions_for_glib_use.thread_self (&self);
-+
- if (magic != G_MUTEX_DEBUG_MAGIC)
- location = "unknown";
-
-- if (!info || info->owner == NULL)
-+ if (!info || g_system_thread_equal (info->owner, zero_thread))
- g_error ("Trying to use an unlocked mutex in g_cond_timed_wait() at '%s'",
- location);
-
-- if (info->owner != self)
-+ if (!g_system_thread_equal (info->owner, self))
- g_error ("Trying to use a mutex locked by another thread in "
- "g_cond_timed_wait() at '%s'", location);
-
-- info->owner = NULL;
-+ g_system_thread_assign (info->owner, zero_thread);
- location = info->location;
-
- retval = g_thread_functions_for_glib_use_default.cond_timed_wait (cond,
- mutex,
- end_time);
-
-- info->owner = self;
-+ g_system_thread_assign (info->owner, self);
- info->location = location;
-
- return retval;
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index aa6628f4ee74..7820f1240885 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -9,6 +9,8 @@ include/glib-2.0/glib/garray.h
include/glib-2.0/glib/gasyncqueue.h
include/glib-2.0/glib/gatomic.h
include/glib-2.0/glib/gbacktrace.h
+include/glib-2.0/glib/gbase64.h
+include/glib-2.0/glib/gbookmarkfile.h
include/glib-2.0/glib/gcache.h
include/glib-2.0/glib/gcompletion.h
include/glib-2.0/glib/gconvert.h
@@ -107,6 +109,7 @@ share/locale/az/LC_MESSAGES/glib20.mo
share/locale/be/LC_MESSAGES/glib20.mo
share/locale/bg/LC_MESSAGES/glib20.mo
share/locale/bn/LC_MESSAGES/glib20.mo
+share/locale/bn_IN/LC_MESSAGES/glib20.mo
share/locale/bs/LC_MESSAGES/glib20.mo
share/locale/ca/LC_MESSAGES/glib20.mo
share/locale/cs/LC_MESSAGES/glib20.mo
@@ -131,6 +134,7 @@ share/locale/he/LC_MESSAGES/glib20.mo
share/locale/hi/LC_MESSAGES/glib20.mo
share/locale/hr/LC_MESSAGES/glib20.mo
share/locale/hu/LC_MESSAGES/glib20.mo
+share/locale/hy/LC_MESSAGES/glib20.mo
share/locale/id/LC_MESSAGES/glib20.mo
share/locale/is/LC_MESSAGES/glib20.mo
share/locale/it/LC_MESSAGES/glib20.mo
@@ -148,7 +152,6 @@ share/locale/nb/LC_MESSAGES/glib20.mo
share/locale/ne/LC_MESSAGES/glib20.mo
share/locale/nl/LC_MESSAGES/glib20.mo
share/locale/nn/LC_MESSAGES/glib20.mo
-share/locale/no/LC_MESSAGES/glib20.mo
share/locale/or/LC_MESSAGES/glib20.mo
share/locale/pa/LC_MESSAGES/glib20.mo
share/locale/pl/LC_MESSAGES/glib20.mo
@@ -178,31 +181,69 @@ 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
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/tt/LC_MESSAGES
-@dirrmtry share/locale/tt
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/tl/LC_MESSAGES
-@dirrmtry share/locale/tl
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/yi/LC_MESSAGES
-@dirrmtry share/locale/yi
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
@dirrm share/glib-2.0/gettext/po
@dirrm share/glib-2.0/gettext
@dirrm share/glib-2.0
@dirrm include/glib-2.0/gobject
@dirrm include/glib-2.0/glib
@dirrm include/glib-2.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@dirrmtry share/locale/tl/LC_MESSAGES
+@dirrmtry share/locale/tl
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/devel/gnome-vfs-monikers/Makefile b/devel/gnome-vfs-monikers/Makefile
new file mode 100644
index 000000000000..386e89bd9df9
--- /dev/null
+++ b/devel/gnome-vfs-monikers/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for: gnome-vfs-monikers
+# Date created: 2006-07-11
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/devel/gnome-vfs-monikers/Makefile,v 1.4 2006/07/18 11:37:57 ahze Exp $
+
+PORTNAME= gnome-vfs-monikers
+PORTVERSION= 2.15.3
+PORTREVISION= 3
+CATEGORIES= devel
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/..$//}
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gnome-vfs monikers module
+
+USE_GNOME= gnomevfs2
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+
+.include <bsd.port.mk>
diff --git a/devel/gnome-vfs-monikers/distinfo b/devel/gnome-vfs-monikers/distinfo
new file mode 100644
index 000000000000..711322cfce9a
--- /dev/null
+++ b/devel/gnome-vfs-monikers/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome-vfs-monikers-2.15.3.tar.gz) = a3950f72170744026d0e66f9118a393c
+SHA256 (gnome-vfs-monikers-2.15.3.tar.gz) = bc9fe3fe97a937f04c7cb3fc5b43436be00168c4753d000d9d49913715556ca4
+SIZE (gnome-vfs-monikers-2.15.3.tar.gz) = 368226
diff --git a/devel/gnome-vfs-monikers/pkg-descr b/devel/gnome-vfs-monikers/pkg-descr
new file mode 100644
index 000000000000..e9478f14c952
--- /dev/null
+++ b/devel/gnome-vfs-monikers/pkg-descr
@@ -0,0 +1 @@
+Gnome-vfs monikers module
diff --git a/devel/gnome-vfs-monikers/pkg-plist b/devel/gnome-vfs-monikers/pkg-plist
new file mode 100644
index 000000000000..793e8a54109b
--- /dev/null
+++ b/devel/gnome-vfs-monikers/pkg-plist
@@ -0,0 +1,6 @@
+lib/bonobo/monikers/libmoniker_gnome_vfs_std.a
+lib/bonobo/monikers/libmoniker_gnome_vfs_std.la
+lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
+lib/bonobo/servers/GNOME_VFS_Moniker_std.server
+@dirrm lib/bonobo/monikers
+@dirrmtry lib/bonobo/servers
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index dd49c88511eb..7e5ce1c881f2 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,11 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/gnome-vfs/Makefile,v 1.160 2006/10/07 15:04:44 marcus Exp $
#
PORTNAME= gnome-vfs
-PORTVERSION= 2.14.2
-PORTREVISION?= 3
+PORTVERSION= 2.16.1
+PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,6 +18,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME Virtual File System
+LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal
+
USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
@@ -25,15 +28,18 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
libbonobo ltverhack referencehack
USE_AUTOTOOLS= libtool:15
USE_OPENSSL= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-openssl \
--disable-gnutls \
- --disable-howl
+ --disable-howl \
+ --enable-hal \
+ --with-hal-mount=/sbin/mount \
+ --with-hal-umount=/sbin/umount
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
@@ -76,11 +82,16 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/libgnomevfs/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
+ s|/usr/X11R6|${X11BASE}|g ; \
+ s|%%LOCALBASE%%|${LOCALBASE}|g; \
s|%%X11BASE%%|${X11BASE}|g' \
- ${WRKSRC}/libgnomevfs/xdgmime.c
- @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \
+ ${WRKSRC}/libgnomevfs/xdgmime.c \
+ ${WRKSRC}/libgnomevfs/gnome-vfs-hal-mounts.c
+ @${REINPLACE_CMD} -e 's|-lacl||g' \
+ ${WRKSRC}/configure
+ @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
- @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \
+ @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
pre-configure:
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index c4d97b903183..6552ad8718cd 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.14.2.tar.bz2) = b657e31974d6981adf9b2c4db981f62c
-SHA256 (gnome2/gnome-vfs-2.14.2.tar.bz2) = 15da9d174d2373826a6921c8af2aac18aa64c6d93ac201903c9fb432e142bba7
-SIZE (gnome2/gnome-vfs-2.14.2.tar.bz2) = 1816194
+MD5 (gnome2/gnome-vfs-2.16.1.tar.bz2) = 2d9f7b01496ecc227015bc7a08fb798f
+SHA256 (gnome2/gnome-vfs-2.16.1.tar.bz2) = 8e6aaa1fb1fcf682484b27bbdf4335234752868ef3bc84ea1102a6ebf0d89067
+SIZE (gnome2/gnome-vfs-2.16.1.tar.bz2) = 1893290
diff --git a/devel/gnome-vfs/files/patch-Makefile.in b/devel/gnome-vfs/files/patch-Makefile.in
index 8c0d2a13160c..7213df2fa7e0 100644
--- a/devel/gnome-vfs/files/patch-Makefile.in
+++ b/devel/gnome-vfs/files/patch-Makefile.in
@@ -1,10 +1,10 @@
---- Makefile.in.orig Tue Nov 30 02:05:26 2004
-+++ Makefile.in Tue Nov 30 02:05:34 2004
-@@ -230,7 +230,6 @@
+--- Makefile.in.orig Tue Jul 11 09:30:02 2006
++++ Makefile.in Tue Jul 11 09:30:32 2006
+@@ -352,7 +352,6 @@
devel-docs \
doc \
programs \
- test \
- monikers \
po
+ EXTRA_DIST = \
diff --git a/devel/gnome-vfs/files/patch-configure b/devel/gnome-vfs/files/patch-configure
index 8835cb06b0c1..1bef1ebaca77 100644
--- a/devel/gnome-vfs/files/patch-configure
+++ b/devel/gnome-vfs/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Wed May 17 11:33:28 2006
-+++ configure Wed May 17 21:44:26 2006
-@@ -23540,6 +23540,8 @@
+--- configure.orig Tue Jul 11 09:30:54 2006
++++ configure Tue Jul 11 09:31:51 2006
+@@ -23202,6 +23202,8 @@
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9,7 +9,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23622,6 +23624,7 @@
+@@ -23283,6 +23285,7 @@
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
@@ -17,7 +17,7 @@
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -23629,6 +23632,7 @@
+@@ -23290,6 +23293,7 @@
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -25,7 +25,7 @@
have_ngettext=yes
else
echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-@@ -25026,7 +25030,7 @@
+@@ -24669,7 +24673,7 @@
@@ -34,7 +34,7 @@
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -33396,7 +33400,7 @@
+@@ -32940,7 +32944,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -43,7 +43,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33694,7 +33698,7 @@
+@@ -33236,7 +33240,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -52,7 +52,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37536,6 +37540,9 @@
+@@ -38765,6 +38769,9 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -62,7 +62,7 @@
#include <sys/statfs.h>
#include <sys/fstyp.h>
_ACEOF
-@@ -37577,6 +37584,9 @@
+@@ -38806,6 +38813,9 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -72,9 +72,9 @@
#include <sys/statfs.h>
#include <sys/vmount.h>
_ACEOF
-@@ -39016,6 +39026,7 @@
- s,@ORBIT_IDL@,$ORBIT_IDL,;t t
- s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
+@@ -40026,6 +40036,7 @@
+ s,@TEST_CFLAGS@,$TEST_CFLAGS,;t t
+ s,@TEST_LIBS@,$TEST_LIBS,;t t
s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
+s,@PTHREAD_LIB@,$BSD_PTHREAD_LIBS,;t t
s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
index 088433c51a28..eb0f4592025e 100644
--- a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
+++ b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
@@ -1,9 +1,9 @@
---- gnome-vfs-2.0.pc.in.orig Wed Sep 14 05:30:25 2005
-+++ gnome-vfs-2.0.pc.in Mon Oct 3 12:00:02 2005
+--- gnome-vfs-2.0.pc.in.orig Tue Jul 11 07:31:58 2006
++++ gnome-vfs-2.0.pc.in Tue Jul 11 09:33:47 2006
@@ -8,5 +8,5 @@
Description: The GNOME virtual file-system libraries
Version: @VERSION@
- Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0
+ Requires: gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0
-Libs: -L${libdir} -lgnomevfs-2
+Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@
Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include
diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
index c3f0d2c30ea2..168fba882ca8 100644
--- a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
+++ b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
@@ -1,9 +1,9 @@
---- gnome-vfs-module-2.0.pc.in.orig Wed Sep 14 05:30:25 2005
-+++ gnome-vfs-module-2.0.pc.in Mon Oct 3 12:01:04 2005
+--- gnome-vfs-module-2.0.pc.in.orig Tue Jul 11 07:31:58 2006
++++ gnome-vfs-module-2.0.pc.in Tue Jul 11 09:34:36 2006
@@ -8,5 +8,5 @@
Description: The GNOME virtual file-system module include info
Version: @VERSION@
- Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0
+ Requires: gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0
-Libs: -L${libdir} -lgnomevfs-2
+Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@
Cflags: -I${includedir}/gnome-vfs-2.0 -I${includedir}/gnome-vfs-module-2.0 -I${libdir}/gnome-vfs-2.0/include
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c
index 05dd579ba16d..5260a0f3ec76 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c
@@ -1,5 +1,5 @@
---- libgnomevfs/gnome-vfs-hal-mounts.c.orig Sun May 7 01:07:27 2006
-+++ libgnomevfs/gnome-vfs-hal-mounts.c Sun May 7 01:07:42 2006
+--- libgnomevfs/gnome-vfs-hal-mounts.c.orig Mon Aug 7 04:16:27 2006
++++ libgnomevfs/gnome-vfs-hal-mounts.c Sun Sep 17 17:39:48 2006
@@ -32,7 +32,9 @@
#include <stdlib.h>
#include <string.h>
@@ -10,3 +10,34 @@
#include <sys/types.h>
#include <unistd.h>
#include <limits.h>
+@@ -627,20 +629,30 @@ _hal_volume_policy_check (GnomeVFSVolume
+ "/",
+ "/bin",
+ "/boot",
++ "/compat/linux/proc",
++ "/compat/linux/sys",
+ "/dev",
+ "/etc",
+ "/home",
+ "/lib",
+ "/lib64",
++ "/libexec",
+ "/media",
+ "/mnt",
+ "/opt",
++ "/rescue",
+ "/root",
+ "/sbin",
+ "/srv",
+ "/tmp",
+ "/usr",
++ "/usr/local",
++ "/usr/obj",
++ "/usr/ports",
++ "/usr/src",
++ "/usr/X11R6",
+ "/var",
++ "/var/tmp",
+ "/proc",
+ "/sbin",
+ NULL
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-monitor.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-monitor.c
deleted file mode 100644
index 11d73973b413..000000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-monitor.c
+++ /dev/null
@@ -1,131 +0,0 @@
---- libgnomevfs/gnome-vfs-monitor.c.orig Fri May 12 20:46:39 2006
-+++ libgnomevfs/gnome-vfs-monitor.c Fri May 12 22:29:57 2006
-@@ -48,9 +48,6 @@
-
- GList *pending_callbacks; /* protected by handle_hash */
- guint pending_timeout; /* protected by handle_hash */
-- guint timeout_count; /* count up each time pending_timeout is changed
-- to avoid timeout remove race.
-- protected by handle_hash */
- };
-
- struct GnomeVFSMonitorCallbackData {
-@@ -69,6 +66,9 @@
- static GHashTable *handle_hash = NULL;
- G_LOCK_DEFINE_STATIC (handle_hash);
-
-+static gint actually_dispatch_callback (gpointer data);
-+static guint32 get_min_delay (GList *list, gint32 now);
-+
- static void
- init_hash_table (void)
- {
-@@ -202,17 +202,25 @@
- return result;
- }
-
-+static void
-+install_timeout (GnomeVFSMonitorHandle *monitor_handle, time_t now)
-+{
-+ guint32 delay;
-
--typedef struct {
-- guint timeout_count;
-- GnomeVFSMonitorHandle *monitor_handle;
--} DispatchData;
-+ if (monitor_handle->pending_timeout)
-+ g_source_remove (monitor_handle->pending_timeout);
-+
-+ delay = get_min_delay (monitor_handle->pending_callbacks, now);
-+ if (delay == 0)
-+ monitor_handle->pending_timeout = g_idle_add (actually_dispatch_callback, monitor_handle);
-+ else
-+ monitor_handle->pending_timeout = g_timeout_add (delay * 1000, actually_dispatch_callback, monitor_handle);
-+}
-
- static gint
- actually_dispatch_callback (gpointer data)
- {
-- DispatchData *ddata = data;
-- GnomeVFSMonitorHandle *monitor_handle = ddata->monitor_handle;
-+ GnomeVFSMonitorHandle *monitor_handle = data;
- GnomeVFSMonitorCallbackData *callback_data;
- gchar *uri;
- GList *l, *next;
-@@ -228,13 +236,6 @@
-
- G_LOCK (handle_hash);
-
-- /* Don't clear pending_timeout if we started another timeout
-- * (and removed this)
-- */
-- if (monitor_handle->timeout_count == ddata->timeout_count) {
-- monitor_handle->pending_timeout = 0;
-- }
--
- if (!monitor_handle->cancelled) {
- /* Find all callbacks that needs to be dispatched */
- dispatch = NULL;
-@@ -305,13 +306,17 @@
-
- }
-
-- /* if we were waiting for this callback to be dispatched to free
-- * this monitor, then do it now.
-- */
-- if (monitor_handle->cancelled &&
-- no_live_callbacks (monitor_handle)) {
-- destroy_monitor_handle (monitor_handle);
-- }
-+ if (no_live_callbacks (monitor_handle)) {
-+ /* if we were waiting for this callback to be dispatched
-+ * to free this monitor, then do it now.
-+ */
-+ if (monitor_handle->cancelled)
-+ destroy_monitor_handle (monitor_handle);
-+ else
-+ monitor_handle->pending_timeout = 0;
-+ } else
-+ /* pending callbacks left, install another timeout */
-+ install_timeout (monitor_handle, now);
-
- G_UNLOCK (handle_hash);
-
-@@ -375,9 +380,7 @@
- GnomeVFSMonitorHandle *monitor_handle;
- char *uri;
- time_t now;
-- guint32 delay;
- GList *l;
-- DispatchData *ddata;
-
- g_return_if_fail (info_uri != NULL);
-
-@@ -435,26 +438,7 @@
- monitor_handle->pending_callbacks =
- g_list_append(monitor_handle->pending_callbacks, callback_data);
-
-- delay = get_min_delay (monitor_handle->pending_callbacks, now);
--
-- if (monitor_handle->pending_timeout) {
-- g_source_remove (monitor_handle->pending_timeout);
-- }
--
-- ddata = g_new (DispatchData, 1);
-- ddata->monitor_handle = monitor_handle;
-- ddata->timeout_count = ++monitor_handle->timeout_count;
--
-- if (delay == 0) {
-- monitor_handle->pending_timeout = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
-- actually_dispatch_callback,
-- ddata, (GDestroyNotify)g_free);
-- } else {
-- monitor_handle->pending_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT,
-- delay * 1000,
-- actually_dispatch_callback,
-- ddata, (GDestroyNotify)g_free);
-- }
-+ install_timeout (monitor_handle, now);
- }
-
- g_free (uri);
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c
deleted file mode 100644
index dc1259ac425f..000000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomevfs/gnome-vfs-volume-ops.c.orig Wed Dec 14 22:20:23 2005
-+++ libgnomevfs/gnome-vfs-volume-ops.c Wed Dec 14 22:20:43 2005
-@@ -25,6 +25,7 @@
-
- #include <sys/types.h>
- #include <errno.h>
-+#include <signal.h>
- #include <string.h>
- #include <stdlib.h>
- #include <glib.h>
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
index 37cc69f1ea3b..7119f852fa75 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
@@ -5,7 +5,7 @@
xdg_data_dirs = getenv ("XDG_DATA_DIRS");
if (xdg_data_dirs == NULL)
- xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
++ xdg_data_dirs = "%%LOCALBASE%%/share/gnome/:%%X11BASE%%/share/gnome/:%%LOCALBASE%%/share/:%%X11BASE%%/share/:/usr/share/";
ptr = xdg_data_dirs;
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h
new file mode 100644
index 000000000000..218578c258b7
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h
@@ -0,0 +1,17 @@
+--- libgnomevfs/xdgmime.h.orig Sat Oct 7 10:42:32 2006
++++ libgnomevfs/xdgmime.h Sat Oct 7 11:01:57 2006
+@@ -52,11 +52,14 @@ typedef void (*XdgMimeDestroy) (void *u
+ #define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name)
+ #define xdg_mime_is_valid_mime_type XDG_ENTRY(is_valid_mime_type)
+ #define xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal)
++#define _xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal_p)
+ #define xdg_mime_media_type_equal XDG_ENTRY(media_type_equal)
+ #define xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass)
++#define _xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass_p)
+ #define xdg_mime_get_mime_parents XDG_ENTRY(get_mime_parents)
+ #define xdg_mime_list_mime_parents XDG_ENTRY(list_mime_parents)
+ #define xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type)
++#define _xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type_p)
+ #define xdg_mime_get_max_buffer_extents XDG_ENTRY(get_max_buffer_extents)
+ #define xdg_mime_shutdown XDG_ENTRY(shutdown)
+ #define xdg_mime_dump XDG_ENTRY(dump)
diff --git a/devel/gnome-vfs/files/patch-modules_file-method-acl.c b/devel/gnome-vfs/files/patch-modules_file-method-acl.c
new file mode 100644
index 000000000000..7ec9a33b8f5f
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules_file-method-acl.c
@@ -0,0 +1,11 @@
+--- modules/file-method-acl.c.orig Mon Jul 24 18:47:12 2006
++++ modules/file-method-acl.c Mon Jul 24 22:01:34 2006
+@@ -45,7 +45,7 @@
+ #endif
+
+ #ifdef HAVE_POSIX_ACL
+-# include <acl/libacl.h>
++# include <sys/acl.h>
+ #define HAVE_ACL 1
+ #endif
+
diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in
index f1b405661c94..d1783a46cd02 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/gnomevfs2/pkg-deinstall.in,v 1.7 2005/11/15 06:12:28 marcus Exp $
+# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.10 2006/07/22 20:45:37 mezz Exp $
#
# Restore gconf keys of libgnome.
@@ -9,11 +9,11 @@ if [ "$2" != "POST-DEINSTALL" ]; then
exit 0
fi
-SCHEMAS=%%X11BASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas
+SCHEMAS=%%LOCALBASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas
if [ -f ${SCHEMAS} ]; then
- env GCONF_CONFIG_SOURCE=xml::%%X11BASE%%/etc/gconf/gconf.xml.defaults \
- %%X11BASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \
+ env GCONF_CONFIG_SOURCE=xml::%%LOCALBASE%%/etc/gconf/gconf.xml.defaults \
+ %%LOCALBASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \
> /dev/null || /usr/bin/true
fi
diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in
index 0b792521a116..98e90d3db5f0 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/gnomevfs2/pkg-install.in,v 1.7 2005/11/15 06:12:28 marcus Exp $
+# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.10 2006/07/22 20:45:37 mezz Exp $
#
# Restore gconf keys of libgnome.
@@ -9,11 +9,11 @@ if [ "$2" != "POST-INSTALL" ]; then
exit 0
fi
-SCHEMAS=%%X11BASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas
+SCHEMAS=%%LOCALBASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas
if [ -f ${SCHEMAS} ]; then
- env GCONF_CONFIG_SOURCE=xml::%%X11BASE%%/etc/gconf/gconf.xml.defaults \
- %%X11BASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \
+ env GCONF_CONFIG_SOURCE=xml::%%LOCALBASE%%/etc/gconf/gconf.xml.defaults \
+ %%LOCALBASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \
> /dev/null || /usr/bin/true
fi
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 5e66ee7b8f29..1e606b847900 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -11,6 +11,8 @@ etc/gnome-vfs-2.0/modules/default-modules.conf
%%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf
etc/gnome-vfs-2.0/modules/ssl-modules.conf
include/gnome-vfs-2.0/include/gnome-vfs-file-size.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h
@@ -26,6 +28,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h
@@ -40,6 +43,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-version.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume-monitor.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h
@@ -48,7 +52,6 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-info.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime.h
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module.h
@@ -58,9 +61,6 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket-buffer.h
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket.h
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h
-lib/bonobo/monikers/libmoniker_gnome_vfs_std.a
-lib/bonobo/monikers/libmoniker_gnome_vfs_std.la
-lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
lib/gnome-vfs-2.0/modules/libbzip2.a
lib/gnome-vfs-2.0/modules/libbzip2.la
lib/gnome-vfs-2.0/modules/libbzip2.so
@@ -104,11 +104,10 @@ lib/libgnomevfs-2.a
lib/libgnomevfs-2.la
lib/libgnomevfs-2.so
lib/libgnomevfs-2.so.0
-libdata/bonobo/servers/GNOME_VFS_Daemon.server
-libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
libdata/pkgconfig/gnome-vfs-2.0.pc
libdata/pkgconfig/gnome-vfs-module-2.0.pc
libexec/gnome-vfs-daemon
+share/dbus-1/services/gnome-vfs-daemon.service
share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -116,6 +115,7 @@ share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -192,9 +192,57 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
@dirrm include/gnome-vfs-2.0
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile
index 046d1857bcb8..bfabce9d33f4 100644
--- a/devel/gnome2-hacker-tools/Makefile
+++ b/devel/gnome2-hacker-tools/Makefile
@@ -3,10 +3,10 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome2-hacker-tools/Makefile,v 1.40 2005/08/11 02:55:29 marcus Exp $
+# $MCom: ports/devel/gnome2-hacker-tools/Makefile,v 1.42 2006/10/14 06:29:06 ahze Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel gnome
PKGNAMESUFFIX= -hacker-tools
@@ -14,7 +14,7 @@ COMMENT= GNOME 2 development tools
RUN_DEPENDS= mlview:${PORTSDIR}/editors/mlview \
gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
- glade-2:${PORTSDIR}/devel/glade2 \
+ glade-3:${PORTSDIR}/devel/glade3 \
ghex2:${PORTSDIR}/editors/ghex \
gob2:${PORTSDIR}/devel/gob2 \
conglomerate:${PORTSDIR}/editors/conglomerate \
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 08555a4df1e2..de96345554e6 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.45 2006/04/13 07:52:33 bland Exp $
+# $MCom: ports/devel/libbonobo/Makefile,v 1.52 2006/09/10 00:51:08 mezz Exp $
#
PORTNAME= libbonobo
-PORTVERSION= 2.14.0
-PORTREVISION?= 3
+PORTVERSION= 2.16.0
+PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -26,7 +26,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_GMAKE= yes
USE_BISON= yes
USE_GETTEXT= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_PERL5= yes
USE_GNOME= gnomehack intlhack libxml2 orbit2 referencehack
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 70ebbb7b074f..9fb497d1f00b 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libbonobo-2.14.0.tar.bz2) = f1f0255f94e3354250d142b688013fad
-SHA256 (gnome2/libbonobo-2.14.0.tar.bz2) = d49cc01bf85a185836689013191f92c21b625e7f38bcfcd06b41e19201765754
-SIZE (gnome2/libbonobo-2.14.0.tar.bz2) = 1386855
+MD5 (gnome2/libbonobo-2.16.0.tar.bz2) = 30cdcf2b5316888f10fea6362b38499c
+SHA256 (gnome2/libbonobo-2.16.0.tar.bz2) = d8124bedaec7e67dd3fbf12a4a6bcb4d76235128b2784a59219174671a8f63e4
+SIZE (gnome2/libbonobo-2.16.0.tar.bz2) = 1406355
diff --git a/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-fork-server.c b/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-fork-server.c
deleted file mode 100644
index ced10add3d34..000000000000
--- a/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-fork-server.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- bonobo-activation/bonobo-activation-fork-server.c.orig Fri Sep 9 17:20:15 2005
-+++ bonobo-activation/bonobo-activation-fork-server.c Fri Sep 9 17:31:52 2005
-@@ -359,10 +359,18 @@
- g_source_destroy (source);
- g_source_unref (source);
-
-+ g_io_channel_shutdown (ai.ioc, FALSE, NULL);
- g_io_channel_unref (ai.ioc);
-
- if (use_new_loop)
- g_main_context_unref (context);
-+
-+ close (iopipes[1]);
-+
-+ g_strfreev(newenv);
-+
-+ if (fd_arg != 0)
-+ g_free ((char *) cmd[fd_arg]);
-
- return CORBA_OBJECT_NIL;
- }
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index 9047e06155d4..676939f1d83b 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -8,6 +8,7 @@ include/bonobo-activation-2.0/bonobo-activation/Bonobo_Unknown.h
include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-activate.h
include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-async.h
include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-init.h
+include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-mime.h
include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-register.h
include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-server-info.h
include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-shlib.h
@@ -100,6 +101,7 @@ share/locale/az/LC_MESSAGES/libbonobo-2.0.mo
share/locale/be/LC_MESSAGES/libbonobo-2.0.mo
share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo
share/locale/bn/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/libbonobo-2.0.mo
share/locale/bs/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ca/LC_MESSAGES/libbonobo-2.0.mo
share/locale/cs/LC_MESSAGES/libbonobo-2.0.mo
@@ -127,6 +129,7 @@ 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
share/locale/ja/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/ka/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ko/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ku/LC_MESSAGES/libbonobo-2.0.mo
share/locale/li/LC_MESSAGES/libbonobo-2.0.mo
@@ -140,7 +143,7 @@ share/locale/nb/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ne/LC_MESSAGES/libbonobo-2.0.mo
share/locale/nl/LC_MESSAGES/libbonobo-2.0.mo
share/locale/nn/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/no/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/or/LC_MESSAGES/libbonobo-2.0.mo
share/locale/pa/LC_MESSAGES/libbonobo-2.0.mo
share/locale/pl/LC_MESSAGES/libbonobo-2.0.mo
share/locale/pt/LC_MESSAGES/libbonobo-2.0.mo
@@ -162,6 +165,7 @@ share/locale/wa/LC_MESSAGES/libbonobo-2.0.mo
share/locale/xh/LC_MESSAGES/libbonobo-2.0.mo
share/locale/yi/LC_MESSAGES/libbonobo-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/libbonobo-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
@dirrm share/idl/bonobo-activation-2.0
@dirrm share/idl/bonobo-2.0
@@ -176,7 +180,53 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
@dirrm etc/bonobo-activation
@dirrmtry lib/bonobo/monikers
@dirrmtry lib/bonobo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
@dirrmtry share/locale/li/LC_MESSAGES
@dirrmtry share/locale/li
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index d17a65952007..53c5bcb54530 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@lovett.com>
#
# $FreeBSD$
-# $MCom: ports/devel/libglade2/Makefile,v 1.20 2006/07/12 17:23:04 ahze Exp $
+# $MCom: ports/devel/libglade2/Makefile,v 1.23 2006/09/10 00:51:09 mezz Exp $
PORTNAME= libglade2
PORTVERSION= 2.6.0
-PORTREVISION?= 0
+PORTREVISION?= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/..$//}
@@ -24,10 +24,9 @@ USE_BZIP2= yes
RUN_DEPENDS= xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
USE_GMAKE= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack libxml2 gtk20 referencehack
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc \
--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 514b19c55a04..da8bcd1184cf 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -3,11 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgsf/Makefile,v 1.22 2006/04/23 22:42:46 mezz Exp $
+# $MCom: ports/devel/libgsf/Makefile,v 1.27 2006/10/04 00:03:42 ahze Exp $
#
PORTNAME= libgsf
-PORTVERSION= 1.14.1
+PORTVERSION= 1.14.2
PORTREVISION?= 0
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -21,17 +21,18 @@ COMMENT?= An extensible i/o abstraction for dealing with structured file formats
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
.endif
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-INSTALLS_SHLIB= yes
-USE_GNOME?= gnomehack glib20 libxml2 gconf2 ltverhack intlhack
+USE_LDCONFIG= yes
+USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 gconf2 ltverhack intlhack
USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc --without-gnome --with-bz2 \
--mandir=${PREFIX}/man \
- --with-gconf-source=${GCONF_CONFIG_SOURCE}
+ --with-gconf-source=${GCONF_CONFIG_SOURCE} \
+ --without-python
CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index ec06e1d287ad..67beda5e8eca 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgsf-1.14.1.tar.bz2) = 00de00b99382d0b7e034e0fffd8951d4
-SHA256 (gnome2/libgsf-1.14.1.tar.bz2) = 7bd920640f8a164cb0faeffbe846bf302ffbd16ccd3751cc9d58f99e0a60c024
-SIZE (gnome2/libgsf-1.14.1.tar.bz2) = 530415
+MD5 (gnome2/libgsf-1.14.2.tar.bz2) = aea16a8408b65f95c308b0db3e3d3d47
+SHA256 (gnome2/libgsf-1.14.2.tar.bz2) = 8b78905b3c61f67dbe9b50782b7005ee5a44cdb48dd0f654f42732b4807c829d
+SIZE (gnome2/libgsf-1.14.2.tar.bz2) = 543516
diff --git a/devel/libgsf/files/patch-gsf-python-Makefile.in b/devel/libgsf/files/patch-gsf-python-Makefile.in
new file mode 100644
index 000000000000..007dc120bd4e
--- /dev/null
+++ b/devel/libgsf/files/patch-gsf-python-Makefile.in
@@ -0,0 +1,39 @@
+--- python/Makefile.in.orig Tue Oct 3 20:31:15 2006
++++ python/Makefile.in Tue Oct 3 20:32:17 2006
+@@ -59,15 +59,13 @@
+ pygsfexecLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pygsfexec_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-_gsfmodule_la_DEPENDENCIES = $(top_builddir)/gsf/libgsf-1.la \
+- $(am__DEPENDENCIES_1)
++_gsfmodule_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am__gsfmodule_la_OBJECTS = _gsfmodule_la-gsfmodule.lo
+ nodist__gsfmodule_la_OBJECTS = _gsfmodule_la-gsf.lo
+ _gsfmodule_la_OBJECTS = $(am__gsfmodule_la_OBJECTS) \
+ $(nodist__gsfmodule_la_OBJECTS)
+ gnomemodule_la_DEPENDENCIES = \
+- $(top_builddir)/gsf-gnome/libgsf-gnome-1.la \
+- $(top_builddir)/gsf/libgsf-1.la $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+ am_gnomemodule_la_OBJECTS = gnomemodule_la-gsfgnomemodule.lo
+ nodist_gnomemodule_la_OBJECTS = gnomemodule_la-gsfgnome.lo
+@@ -312,8 +310,7 @@
+
+ gnomemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initgnome
+ gnomemodule_la_LIBADD = \
+- $(top_builddir)/gsf-gnome/libgsf-gnome-1.la \
+- $(top_builddir)/gsf/libgsf-1.la \
++ -lgsf-1 -lgsf-gnome-1 \
+ $(LIBGSF_LIBS) $(LIBGSF_GNOME_LIBS)
+
+ gnomemodule_la_SOURCES = gsfgnomemodule.c
+@@ -323,7 +320,7 @@
+ $(LIBGSF_CFLAGS)
+
+ _gsfmodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gsf
+-_gsfmodule_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS)
++_gsfmodule_la_LIBADD = $(LIBGSF_LIBS)
+ _gsfmodule_la_SOURCES = gsfmodule.c
+ nodist__gsfmodule_la_SOURCES = gsf.c
+ all: all-am
diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist
index 5644e10f0899..4eef810962b2 100644
--- a/devel/libgsf/pkg-plist
+++ b/devel/libgsf/pkg-plist
@@ -1,4 +1,6 @@
+bin/gsf
bin/gsf-office-thumbnailer
+bin/gsf-vba-dump
include/libgsf-1/gsf-win32/gsf-input-win32.h
include/libgsf-1/gsf-win32/gsf-output-win32.h
include/libgsf-1/gsf/gsf-blob.h
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 744ee000ad53..83f80f2faa72 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -3,8 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgtop2/Makefile,v 1.70 2006/04/15 05:49:08 marcus Exp $
-#
+# $MCom: ports/devel/libgtop/Makefile,v 1.5 2006/10/02 23:26:51 ahze Exp $
PORTNAME= libgtop
PORTVERSION= 2.14.4
@@ -21,10 +20,9 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_BZIP2= yes
USE_PERL5_BUILD=yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack glib20 ltverhack intlhack
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --infodir=${PREFIX}/info
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index db71ee9d54ff..123feb467308 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -121,12 +121,34 @@ share/locale/zh_HK/LC_MESSAGES/libgtop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
@dirrm include/libgtop-2.0/glibtop
@dirrm include/libgtop-2.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
@dirrmtry share/locale/mg/LC_MESSAGES
@@ -135,7 +157,21 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/devel/p5-Net-DBus/Makefile b/devel/p5-Net-DBus/Makefile
index d3290d13e3f9..1749c4a55cb3 100644
--- a/devel/p5-Net-DBus/Makefile
+++ b/devel/p5-Net-DBus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Net-DBus
PORTVERSION= 0.33.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Net
@@ -16,7 +16,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= novel@FreeBSD.org
COMMENT= Perl extension for the DBus message system
-LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
RUN_DEPENDS= ${SITE_PERL}/XML/Twig.pm:${PORTSDIR}/textproc/p5-XML-Twig \
${SITE_PERL}/XML/Grove.pm:${PORTSDIR}/textproc/p5-XML-Grove \
${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile
index 598860d6467d..c62b179454cf 100644
--- a/devel/py-dbus/Makefile
+++ b/devel/py-dbus/Makefile
@@ -5,45 +5,27 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTNAME= dbus
+PORTVERSION= 0.71
CATEGORIES= devel gnome python
+MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DISTNAME= ${PORTNAME}-python-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Python interface to the D-BUS messaging system
+COMMENT= Python bindings for the D-BUS messaging system
BUILD_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex
-LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
RUN_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex \
- ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
+ ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
-MASTERDIR= ${.CURDIR}/../dbus
-BUILD_WRKSRC= ${WRKSRC}/python
-INSTALL_WRKSRC= ${BUILD_WRKSRC}
-DESCR= ${.CURDIR}/pkg-descr
-PLIST= ${.CURDIR}/pkg-plist
-
-NOT_FOR_ARCHS= ia64
-
-DBUS_SLAVE= yes
-
-USE_GNOME= gnomehack gnometarget
USE_PYTHON= yes
-CONFIGURE_ARGS= --enable-python \
- --disable-gcj \
- --disable-mono \
- --disable-mono-docs \
- --disable-gtk \
- --disable-qt3 \
- --localstatedir=/var \
- --with-system-pid-file=/var/run/dbus/dbus.pid \
- --with-system-socket=/var/run/dbus/dbus.pipe \
- --with-session-socket-dir=/var/tmp \
- --disable-doxygen-docs \
- --disable-xml-docs
+USE_GMAKE= yes
+USE_PYDISTUTILS=yes
post-install:
- @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR}
- @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR}
+ @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHONPREFIX_SITELIBDIR}/dbus
+ @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -l ${PYTHONPREFIX_SITELIBDIR}/dbus
-.include "${MASTERDIR}/Makefile"
+.include <bsd.port.mk>
diff --git a/devel/py-dbus/distinfo b/devel/py-dbus/distinfo
new file mode 100644
index 000000000000..3a92835e9d7e
--- /dev/null
+++ b/devel/py-dbus/distinfo
@@ -0,0 +1,3 @@
+MD5 (dbus-python-0.71.tar.gz) = ee893bc87b784a8c2285f5041b5e7033
+SHA256 (dbus-python-0.71.tar.gz) = 4af7a60f65cb02dabbcdf0cb6ca6f659932eb13c2533f6e1dbdab6e3700a2c57
+SIZE (dbus-python-0.71.tar.gz) = 137613
diff --git a/devel/py-dbus/pkg-descr b/devel/py-dbus/pkg-descr
index 059c9a3ed457..3c46c16da394 100644
--- a/devel/py-dbus/pkg-descr
+++ b/devel/py-dbus/pkg-descr
@@ -1,3 +1,3 @@
-Python interface to the D-BUS messaging system.
+Python bindings for the D-BUS interprocess messaging system.
-WWW: http://www.freedesktop.org/Software/dbus
+WWW: http://www.freedesktop.org/wiki/Software_2fDBusBindings
diff --git a/devel/py-dbus/pkg-plist b/devel/py-dbus/pkg-plist
index 1df8e680a782..76158ca386fa 100644
--- a/devel/py-dbus/pkg-plist
+++ b/devel/py-dbus/pkg-plist
@@ -1,41 +1,36 @@
-lib/%%PYTHON_VERSION%%/site-packages/dbus.pth
-lib/%%PYTHON_VERSION%%/site-packages/dbus/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/_dbus.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/_dbus.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/_dbus.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/_util.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/_util.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/_util.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_bindings.a
-lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_bindings.la
-lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_bindings.so
-lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_glib_bindings.a
-lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_glib_bindings.la
-lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_glib_bindings.so
-lib/%%PYTHON_VERSION%%/site-packages/dbus/decorators.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/decorators.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/decorators.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/exceptions.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/exceptions.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/exceptions.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/glib.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/glib.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/glib.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/introspect_parser.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/introspect_parser.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/introspect_parser.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/matchrules.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/matchrules.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/matchrules.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/proxies.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/proxies.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/proxies.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/service.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/service.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/service.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/types.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/types.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/types.pyo
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/dbus
+%%PYTHON_SITELIBDIR%%/dbus/__init__.py
+%%PYTHON_SITELIBDIR%%/dbus/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dbus/_dbus.py
+%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyc
+%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyo
+%%PYTHON_SITELIBDIR%%/dbus/_util.py
+%%PYTHON_SITELIBDIR%%/dbus/_util.pyc
+%%PYTHON_SITELIBDIR%%/dbus/_util.pyo
+%%PYTHON_SITELIBDIR%%/dbus/dbus_bindings.so
+%%PYTHON_SITELIBDIR%%/dbus/dbus_glib_bindings.so
+%%PYTHON_SITELIBDIR%%/dbus/decorators.py
+%%PYTHON_SITELIBDIR%%/dbus/decorators.pyc
+%%PYTHON_SITELIBDIR%%/dbus/decorators.pyo
+%%PYTHON_SITELIBDIR%%/dbus/exceptions.py
+%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/dbus/glib.py
+%%PYTHON_SITELIBDIR%%/dbus/glib.pyc
+%%PYTHON_SITELIBDIR%%/dbus/glib.pyo
+%%PYTHON_SITELIBDIR%%/dbus/introspect_parser.py
+%%PYTHON_SITELIBDIR%%/dbus/introspect_parser.pyc
+%%PYTHON_SITELIBDIR%%/dbus/introspect_parser.pyo
+%%PYTHON_SITELIBDIR%%/dbus/matchrules.py
+%%PYTHON_SITELIBDIR%%/dbus/matchrules.pyc
+%%PYTHON_SITELIBDIR%%/dbus/matchrules.pyo
+%%PYTHON_SITELIBDIR%%/dbus/proxies.py
+%%PYTHON_SITELIBDIR%%/dbus/proxies.pyc
+%%PYTHON_SITELIBDIR%%/dbus/proxies.pyo
+%%PYTHON_SITELIBDIR%%/dbus/service.py
+%%PYTHON_SITELIBDIR%%/dbus/service.pyc
+%%PYTHON_SITELIBDIR%%/dbus/service.pyo
+%%PYTHON_SITELIBDIR%%/dbus/types.py
+%%PYTHON_SITELIBDIR%%/dbus/types.pyc
+%%PYTHON_SITELIBDIR%%/dbus/types.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/dbus
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index c8faa7191d4c..230d7d7bd97d 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -3,10 +3,10 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/py-gobject/Makefile,v 1.7 2006/04/13 07:52:34 bland Exp $
+# $MCom: ports/devel/py-gobject/Makefile,v 1.17 2006/10/03 20:44:25 ahze Exp $
PORTNAME= gobject
-PORTVERSION= 2.10.1
+PORTVERSION= 2.12.2
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,6 +22,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack glib20
USE_PYTHON= yes
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-docs
CONFLICTS= py*-gtk-0*
diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo
index 9bf7994d19f5..c83fa0cb3df3 100644
--- a/devel/py-gobject/distinfo
+++ b/devel/py-gobject/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygobject-2.10.1.tar.bz2) = 3a69a75b4dfdb52642f26a4d45fcfde8
-SHA256 (gnome2/pygobject-2.10.1.tar.bz2) = dff4a3e4a53c8190b2249e2fc7dd71258b2d6b2f65762aa59f5d56a52d53b86d
-SIZE (gnome2/pygobject-2.10.1.tar.bz2) = 273207
+MD5 (gnome2/pygobject-2.12.2.tar.bz2) = 394999abd1921ceff653c98165c713a0
+SHA256 (gnome2/pygobject-2.12.2.tar.bz2) = 83787be6e11f6c7a45c111fa37f674a153274c45c2ab3f4b38b3b6dad933fcda
+SIZE (gnome2/pygobject-2.12.2.tar.bz2) = 337829
diff --git a/devel/py-gobject/files/patch-docs_Makefile.in b/devel/py-gobject/files/patch-docs_Makefile.in
new file mode 100644
index 000000000000..76edf5de1d78
--- /dev/null
+++ b/devel/py-gobject/files/patch-docs_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig Thu Aug 24 23:34:38 2006
++++ docs/Makefile.in Thu Aug 24 23:35:02 2006
+@@ -218,7 +218,7 @@ XSL_FILES = \
+
+ CSSdir = $(HTMLdir)
+ CSS_DATA = $(CSS_FILES)
+-HTMLdir = $(datadir)/gtk-doc/html/pygobject
++HTMLdir = $(prefix)/share/doc/pygobject
+ HTML_DATA = $(HTML_FILES)
+ XSLdir = $(datadir)/pygobject/xsl
+ XSL_DATA = $(XSL_FILES)
diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist
index bbd12810ba5d..d623216add61 100644
--- a/devel/py-gobject/pkg-plist
+++ b/devel/py-gobject/pkg-plist
@@ -2,12 +2,44 @@ include/pygtk-2.0/pygobject.h
%%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/gobject.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/_gobject.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/_gobject.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.pyo
%%PYTHON_SITELIBDIR%%/pygtk.pth
%%PYTHON_SITELIBDIR%%/pygtk.py
%%PYTHON_SITELIBDIR%%/pygtk.pyc
%%PYTHON_SITELIBDIR%%/pygtk.pyo
libdata/pkgconfig/pygobject-2.0.pc
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0
-@dirrm include/pygtk-2.0
+share/doc/pygobject/class-gobject.html
+share/doc/pygobject/class-gobjectgboxed.html
+share/doc/pygobject/class-gobjectginterface.html
+share/doc/pygobject/class-gobjectgpointer.html
+share/doc/pygobject/class-gobjectmaincontext.html
+share/doc/pygobject/class-gobjectmainloop.html
+share/doc/pygobject/gobject-class-reference.html
+share/doc/pygobject/gobject-constants.html
+share/doc/pygobject/gobject-functions.html
+share/doc/pygobject/index.html
+share/doc/pygobject/index.sgml
+share/doc/pygobject/pygobject-introduction.html
+share/doc/pygobject/pygobject-reference-copyright.html
+share/doc/pygobject/pygobject.devhelp
+share/doc/pygobject/style.css
+share/pygobject/xsl/common.xsl
+share/pygobject/xsl/devhelp.xsl
+share/pygobject/xsl/fixxref.py
+share/pygobject/xsl/html.xsl
+share/pygobject/xsl/pdf-style.xsl
+share/pygobject/xsl/pdf.xsl
+share/pygobject/xsl/ref-html-style.xsl
+@dirrm share/pygobject/xsl
+@dirrm share/pygobject
+@dirrm share/doc/pygobject
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject
+@dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0
+@dirrmtry include/pygtk-2.0
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
new file mode 100644
index 000000000000..30b967751c0e
--- /dev/null
+++ b/editors/gedit-plugins/Makefile
@@ -0,0 +1,55 @@
+# New ports collection makefile for: gedit-plugins
+# Date created: 19 September 2003
+# Whom: Adam Weinberger <adamw@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/editors/gedit-plugins/Makefile,v 1.18 2006/09/09 02:54:39 ahze Exp $
+#
+
+PORTNAME= gedit-plugins
+PORTVERSION= 2.16.0
+CATEGORIES= editors gnome
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Plugins for GEdit 2
+
+BUILD_DEPENDS= gedit:${PORTSDIR}/editors/gedit \
+ gucharmap:${PORTSDIR}/deskutils/gucharmap
+RUN_DEPENDS= gedit:${PORTSDIR}/editors/gedit \
+ gucharmap:${PORTSDIR}/deskutils/gucharmap
+
+USE_LDCONFIG= yes
+USE_BZIP2= yes
+USE_XLIB= yes
+USE_GMAKE= yes
+USE_GETTEXT= yes
+GNU_CONFIGURE= yes
+USE_GNOME= gnomehack gnomeprefix gnometarget intlhack
+WANT_GNOME= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS= gedit-show-tabbar-plugin.schemas
+
+.if defined(PACKAGE_BUILDING)
+.undef WITHOUT_GNOME
+WITH_GNOME= yes
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mpygnomedesktop}!="" && ${ARCH}!="sparc64"
+USE_PYTHON= yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+USE_GNOME+= pygnomedesktop
+CONFIGURE_ARGS+=--enable-python
+PLIST_SUB+= PYTHON=""
+.else
+CONFIGURE_ARGS+=--disable-python
+PLIST_SUB+= PYTHON="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/editors/gedit-plugins/distinfo b/editors/gedit-plugins/distinfo
new file mode 100644
index 000000000000..e44698576c22
--- /dev/null
+++ b/editors/gedit-plugins/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gedit-plugins-2.16.0.tar.bz2) = db67c3c53f81809460232639f3bfef64
+SHA256 (gnome2/gedit-plugins-2.16.0.tar.bz2) = be92336004be2bff03b3e03311d74b65bb32a63f83494a226d738a628fb09733
+SIZE (gnome2/gedit-plugins-2.16.0.tar.bz2) = 573389
diff --git a/editors/gedit-plugins/pkg-descr b/editors/gedit-plugins/pkg-descr
new file mode 100644
index 000000000000..f4eabb23d58e
--- /dev/null
+++ b/editors/gedit-plugins/pkg-descr
@@ -0,0 +1 @@
+Various additional plug-ins for GEdit 2.
diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist
new file mode 100644
index 000000000000..88d06168ae5a
--- /dev/null
+++ b/editors/gedit-plugins/pkg-plist
@@ -0,0 +1,131 @@
+%%PYTHON%%lib/gedit-2/plugins/bracketcompletion.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/bracketcompletion.py
+%%PYTHON%%lib/gedit-2/plugins/bracketcompletion.pyc
+%%PYTHON%%lib/gedit-2/plugins/bracketcompletion.pyo
+%%PYTHON%%lib/gedit-2/plugins/charmap.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/codecomment.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/codecomment.py
+%%PYTHON%%lib/gedit-2/plugins/codecomment.pyc
+%%PYTHON%%lib/gedit-2/plugins/codecomment.pyo
+%%PYTHON%%lib/gedit-2/plugins/colorpicker.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/colorpicker.py
+%%PYTHON%%lib/gedit-2/plugins/colorpicker.pyc
+%%PYTHON%%lib/gedit-2/plugins/colorpicker.pyo
+%%PYTHON%%lib/gedit-2/plugins/gpdefs.py
+%%PYTHON%%lib/gedit-2/plugins/gpdefs.pyc
+%%PYTHON%%lib/gedit-2/plugins/gpdefs.pyo
+%%PYTHON%%lib/gedit-2/plugins/joinlines.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/joinlines.py
+%%PYTHON%%lib/gedit-2/plugins/joinlines.pyc
+%%PYTHON%%lib/gedit-2/plugins/joinlines.pyo
+lib/gedit-2/plugins/libcharmap.la
+lib/gedit-2/plugins/libcharmap.so
+lib/gedit-2/plugins/libshowtabbar.la
+lib/gedit-2/plugins/libshowtabbar.so
+lib/gedit-2/plugins/showtabbar.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/smartspaces.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/smartspaces.py
+%%PYTHON%%lib/gedit-2/plugins/smartspaces.pyc
+%%PYTHON%%lib/gedit-2/plugins/smartspaces.pyo
+share/locale/ar/LC_MESSAGES/gedit-plugins.mo
+share/locale/az/LC_MESSAGES/gedit-plugins.mo
+share/locale/be/LC_MESSAGES/gedit-plugins.mo
+share/locale/bg/LC_MESSAGES/gedit-plugins.mo
+share/locale/ca/LC_MESSAGES/gedit-plugins.mo
+share/locale/cs/LC_MESSAGES/gedit-plugins.mo
+share/locale/da/LC_MESSAGES/gedit-plugins.mo
+share/locale/de/LC_MESSAGES/gedit-plugins.mo
+share/locale/el/LC_MESSAGES/gedit-plugins.mo
+share/locale/en_CA/LC_MESSAGES/gedit-plugins.mo
+share/locale/en_GB/LC_MESSAGES/gedit-plugins.mo
+share/locale/es/LC_MESSAGES/gedit-plugins.mo
+share/locale/et/LC_MESSAGES/gedit-plugins.mo
+share/locale/eu/LC_MESSAGES/gedit-plugins.mo
+share/locale/fi/LC_MESSAGES/gedit-plugins.mo
+share/locale/fr/LC_MESSAGES/gedit-plugins.mo
+share/locale/ga/LC_MESSAGES/gedit-plugins.mo
+share/locale/gl/LC_MESSAGES/gedit-plugins.mo
+share/locale/gu/LC_MESSAGES/gedit-plugins.mo
+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/ja/LC_MESSAGES/gedit-plugins.mo
+share/locale/kn/LC_MESSAGES/gedit-plugins.mo
+share/locale/ko/LC_MESSAGES/gedit-plugins.mo
+share/locale/lt/LC_MESSAGES/gedit-plugins.mo
+share/locale/lv/LC_MESSAGES/gedit-plugins.mo
+share/locale/mk/LC_MESSAGES/gedit-plugins.mo
+share/locale/ml/LC_MESSAGES/gedit-plugins.mo
+share/locale/mn/LC_MESSAGES/gedit-plugins.mo
+share/locale/ms/LC_MESSAGES/gedit-plugins.mo
+share/locale/nb/LC_MESSAGES/gedit-plugins.mo
+share/locale/ne/LC_MESSAGES/gedit-plugins.mo
+share/locale/nl/LC_MESSAGES/gedit-plugins.mo
+share/locale/nn/LC_MESSAGES/gedit-plugins.mo
+share/locale/no/LC_MESSAGES/gedit-plugins.mo
+share/locale/or/LC_MESSAGES/gedit-plugins.mo
+share/locale/pa/LC_MESSAGES/gedit-plugins.mo
+share/locale/pl/LC_MESSAGES/gedit-plugins.mo
+share/locale/pt/LC_MESSAGES/gedit-plugins.mo
+share/locale/pt_BR/LC_MESSAGES/gedit-plugins.mo
+share/locale/ro/LC_MESSAGES/gedit-plugins.mo
+share/locale/ru/LC_MESSAGES/gedit-plugins.mo
+share/locale/rw/LC_MESSAGES/gedit-plugins.mo
+share/locale/sk/LC_MESSAGES/gedit-plugins.mo
+share/locale/sl/LC_MESSAGES/gedit-plugins.mo
+share/locale/sq/LC_MESSAGES/gedit-plugins.mo
+share/locale/sr/LC_MESSAGES/gedit-plugins.mo
+share/locale/sr@Latn/LC_MESSAGES/gedit-plugins.mo
+share/locale/sv/LC_MESSAGES/gedit-plugins.mo
+share/locale/ta/LC_MESSAGES/gedit-plugins.mo
+share/locale/th/LC_MESSAGES/gedit-plugins.mo
+share/locale/tr/LC_MESSAGES/gedit-plugins.mo
+share/locale/uk/LC_MESSAGES/gedit-plugins.mo
+share/locale/vi/LC_MESSAGES/gedit-plugins.mo
+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
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index d64bc8a82269..5686a4f9b6bb 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -3,37 +3,38 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/gedit/Makefile,v 1.33 2006/04/13 07:52:34 bland Exp $
+# $MCom: ports/editors/gedit/Makefile,v 1.48 2006/10/01 16:28:46 ahze Exp $
#
PORTNAME= gedit
-PORTVERSION= 2.14.4
+PORTVERSION= 2.16.1
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A small but powerful text editor for Gnome 2 Desktop Environment
+COMMENT= A small but powerful text editor for GNOME 2 Desktop Environment
LIB_DEPENDS= pspell.16:${PORTSDIR}/textproc/aspell
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack intlhack \
libgnomeprintui libgnomeui eel2 gtksourceview desktopfileutils
WANT_GNOME= yes
+CONFIGURE_ARGS= --mandir=${PREFIX}/man
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-PLIST_SUB= VERSION="2.14"
+PLIST_SUB= VERSION="2.16"
MAN1= gedit.1
-GCONF_SCHEMAS= gedit.schemas
+GCONF_SCHEMAS= gedit.schemas gedit-file-browser.schemas
.if defined(PACKAGE_BUILDING)
.undef WITHOUT_GNOME
@@ -53,6 +54,16 @@ CONFIGURE_ARGS+=--disable-python
PLIST_SUB+= PYTHON="@comment "
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|make|${GMAKE}|g' \
+ ${WRKSRC}/bindings/python/Makefile.in
+
+pre-build:
+ ${MKDIR} ${WRKSRC}/bindings/python/.deps
+.for ff in gedit_la-gedit.Plo gedit_la-geditcommands.Plo gedit_la-geditutils.Plo
+ ${TOUCH} ${WRKSRC}/bindings/python/.deps/${ff}
+.endfor
+
post-install:
@-update-desktop-database
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 5af58e7094a2..4f934666c1f0 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-2.14.4.tar.bz2) = 189d4d9128eca1162a782744cb324aea
-SHA256 (gnome2/gedit-2.14.4.tar.bz2) = 93b2e6002e12dbf039c438a4c4bc9dcc990cb013391febe928439c3e805f4a04
-SIZE (gnome2/gedit-2.14.4.tar.bz2) = 2364187
+MD5 (gnome2/gedit-2.16.1.tar.bz2) = 989bf8c2726d12fb825014f3b2d7e587
+SHA256 (gnome2/gedit-2.16.1.tar.bz2) = 9250b65d3eac1ac27c27fcb0c2007ec9ee4907549720a8f771930b845899c503
+SIZE (gnome2/gedit-2.16.1.tar.bz2) = 2819511
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index 51e9253c68e4..d061efe858b6 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -18,18 +18,11 @@ include/gedit-%%VERSION%%/gedit/gedit-prefs-manager.h
include/gedit-%%VERSION%%/gedit/gedit-print-job-preview.h
include/gedit-%%VERSION%%/gedit/gedit-print.h
include/gedit-%%VERSION%%/gedit/gedit-progress-message-area.h
-include/gedit-%%VERSION%%/gedit/gedit-recent.h
include/gedit-%%VERSION%%/gedit/gedit-statusbar.h
include/gedit-%%VERSION%%/gedit/gedit-tab.h
include/gedit-%%VERSION%%/gedit/gedit-utils.h
include/gedit-%%VERSION%%/gedit/gedit-view.h
include/gedit-%%VERSION%%/gedit/gedit-window.h
-include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-item.h
-include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-model.h
-include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-util.h
-include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-gtk.h
-include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-uimanager.h
-include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view.h
lib/gedit-2/plugins/changecase.gedit-plugin
lib/gedit-2/plugins/docinfo.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/externaltools.gedit-plugin
@@ -52,11 +45,14 @@ lib/gedit-2/plugins/docinfo.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.pyc
%%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.pyo
%%PYTHON%%lib/gedit-2/plugins/externaltools/tools.glade
+lib/gedit-2/plugins/filebrowser.gedit-plugin
lib/gedit-2/plugins/indent.gedit-plugin
lib/gedit-2/plugins/libchangecase.la
lib/gedit-2/plugins/libchangecase.so
lib/gedit-2/plugins/libdocinfo.la
lib/gedit-2/plugins/libdocinfo.so
+lib/gedit-2/plugins/libfilebrowser.la
+lib/gedit-2/plugins/libfilebrowser.so
lib/gedit-2/plugins/libindent.la
lib/gedit-2/plugins/libindent.so
lib/gedit-2/plugins/libsample.la
@@ -74,9 +70,6 @@ lib/gedit-2/plugins/libtime.so
%%PYTHON%%lib/gedit-2/plugins/modelines.pyc
%%PYTHON%%lib/gedit-2/plugins/modelines.pyo
%%PYTHON%%lib/gedit-2/plugins/pythonconsole.gedit-plugin
-%%PYTHON%%lib/gedit-2/plugins/pythonconsole.py
-%%PYTHON%%lib/gedit-2/plugins/pythonconsole.pyc
-%%PYTHON%%lib/gedit-2/plugins/pythonconsole.pyo
lib/gedit-2/plugins/sample.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/snippets.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/snippets/ElementTree.py
@@ -112,9 +105,48 @@ lib/gedit-2/plugins/sample.gedit-plugin
%%PYTHON%%lib/gedit-2/plugins/snippets/snippets.glade
lib/gedit-2/plugins/sort.gedit-plugin
lib/gedit-2/plugins/spell.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.py
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.pyc
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/__init__.pyo
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.py
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.pyc
+%%PYTHON%%lib/gedit-2/plugins/pythonconsole/console.pyo
lib/gedit-2/plugins/taglist.gedit-plugin
lib/gedit-2/plugins/time.gedit-plugin
libdata/pkgconfig/gedit-%%VERSION%%.pc
+%%DOCSDIR%%/GeditApp.html
+%%DOCSDIR%%/GeditDocument.html
+%%DOCSDIR%%/GeditEncodingsOptionMenu.html
+%%DOCSDIR%%/GeditFileChooserDialog.html
+%%DOCSDIR%%/GeditMessageArea.html
+%%DOCSDIR%%/GeditNotebook.html
+%%DOCSDIR%%/GeditPanel.html
+%%DOCSDIR%%/GeditPlugin.html
+%%DOCSDIR%%/GeditPrintJob.html
+%%DOCSDIR%%/GeditPrintJobPreview.html
+%%DOCSDIR%%/GeditProgressMessageArea.html
+%%DOCSDIR%%/GeditStatusbar.html
+%%DOCSDIR%%/GeditTab.html
+%%DOCSDIR%%/GeditView.html
+%%DOCSDIR%%/GeditWindow.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/gedit-gedit-convert.html
+%%DOCSDIR%%/gedit-gedit-debug.html
+%%DOCSDIR%%/gedit-gedit-encodings.html
+%%DOCSDIR%%/gedit-gedit-help.html
+%%DOCSDIR%%/gedit-gedit-metadata-manager.html
+%%DOCSDIR%%/gedit-gedit-prefs-manager-app.html
+%%DOCSDIR%%/gedit-gedit-prefs-manager.html
+%%DOCSDIR%%/gedit-gedit-utils.html
+%%DOCSDIR%%/gedit.devhelp
+%%DOCSDIR%%/gedit.devhelp2
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
share/gnome/applications/gedit.desktop
share/gnome/gedit-2/glade/docinfo.glade2
share/gnome/gedit-2/glade/gedit-encodings-dialog.glade
@@ -126,7 +158,10 @@ share/gnome/gedit-2/glade/languages-dialog.glade2
share/gnome/gedit-2/glade/sort.glade2
share/gnome/gedit-2/glade/spell-checker.glade2
share/gnome/gedit-2/glade/time.glade2
+share/gnome/gedit-2/icons/gedit-plugin.png
+share/gnome/gedit-2/logo/gedit-logo.png
%%PYTHON%%share/gnome/gedit-2/plugins/externaltools/stock-tools.xml
+share/gnome/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml
%%PYTHON%%share/gnome/gedit-2/plugins/snippets/c++.xml
%%PYTHON%%share/gnome/gedit-2/plugins/snippets/c.xml
%%PYTHON%%share/gnome/gedit-2/plugins/snippets/css.xml
@@ -215,6 +250,10 @@ share/gnome/help/gedit/ko/legal.xml
share/gnome/help/gedit/ro/figures/gedit_window.png
share/gnome/help/gedit/ro/gedit.xml
share/gnome/help/gedit/ro/legal.xml
+share/gnome/help/gedit/sv/figures/gedit_format_bold.png
+share/gnome/help/gedit/sv/figures/gedit_format_italic.png
+share/gnome/help/gedit/sv/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/sv/figures/gedit_format_underline.png
share/gnome/help/gedit/sv/figures/gedit_recent_files_menu_icon.png
share/gnome/help/gedit/sv/figures/gedit_window.png
share/gnome/help/gedit/sv/gedit.xml
@@ -257,9 +296,6 @@ share/gnome/omf/gedit/gedit-sv.omf
share/gnome/omf/gedit/gedit-zh_CN.omf
share/gnome/omf/gedit/gedit-zh_HK.omf
share/gnome/omf/gedit/gedit-zh_TW.omf
-share/gnome/pixmaps/gedit-icon.png
-share/gnome/pixmaps/gedit-logo.png
-share/gnome/pixmaps/gedit-plugin-manager.png
share/locale/af/LC_MESSAGES/gedit.mo
share/locale/am/LC_MESSAGES/gedit.mo
share/locale/ar/LC_MESSAGES/gedit.mo
@@ -267,6 +303,7 @@ share/locale/az/LC_MESSAGES/gedit.mo
share/locale/be/LC_MESSAGES/gedit.mo
share/locale/bg/LC_MESSAGES/gedit.mo
share/locale/bn/LC_MESSAGES/gedit.mo
+share/locale/bn_IN/LC_MESSAGES/gedit.mo
share/locale/br/LC_MESSAGES/gedit.mo
share/locale/bs/LC_MESSAGES/gedit.mo
share/locale/ca/LC_MESSAGES/gedit.mo
@@ -291,6 +328,7 @@ share/locale/he/LC_MESSAGES/gedit.mo
share/locale/hi/LC_MESSAGES/gedit.mo
share/locale/hr/LC_MESSAGES/gedit.mo
share/locale/hu/LC_MESSAGES/gedit.mo
+share/locale/hy/LC_MESSAGES/gedit.mo
share/locale/id/LC_MESSAGES/gedit.mo
share/locale/is/LC_MESSAGES/gedit.mo
share/locale/it/LC_MESSAGES/gedit.mo
@@ -298,8 +336,10 @@ share/locale/ja/LC_MESSAGES/gedit.mo
share/locale/ka/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
share/locale/lt/LC_MESSAGES/gedit.mo
share/locale/lv/LC_MESSAGES/gedit.mo
+share/locale/mg/LC_MESSAGES/gedit.mo
share/locale/mi/LC_MESSAGES/gedit.mo
share/locale/mk/LC_MESSAGES/gedit.mo
share/locale/ml/LC_MESSAGES/gedit.mo
@@ -310,7 +350,6 @@ share/locale/nb/LC_MESSAGES/gedit.mo
share/locale/ne/LC_MESSAGES/gedit.mo
share/locale/nl/LC_MESSAGES/gedit.mo
share/locale/nn/LC_MESSAGES/gedit.mo
-share/locale/no/LC_MESSAGES/gedit.mo
share/locale/or/LC_MESSAGES/gedit.mo
share/locale/pa/LC_MESSAGES/gedit.mo
share/locale/pl/LC_MESSAGES/gedit.mo
@@ -318,6 +357,7 @@ share/locale/pt/LC_MESSAGES/gedit.mo
share/locale/pt_BR/LC_MESSAGES/gedit.mo
share/locale/ro/LC_MESSAGES/gedit.mo
share/locale/ru/LC_MESSAGES/gedit.mo
+share/locale/rw/LC_MESSAGES/gedit.mo
share/locale/sk/LC_MESSAGES/gedit.mo
share/locale/sl/LC_MESSAGES/gedit.mo
share/locale/sq/LC_MESSAGES/gedit.mo
@@ -325,21 +365,17 @@ share/locale/sr/LC_MESSAGES/gedit.mo
share/locale/sr@Latn/LC_MESSAGES/gedit.mo
share/locale/sv/LC_MESSAGES/gedit.mo
share/locale/ta/LC_MESSAGES/gedit.mo
+share/locale/te/LC_MESSAGES/gedit.mo
share/locale/th/LC_MESSAGES/gedit.mo
share/locale/tk/LC_MESSAGES/gedit.mo
share/locale/tr/LC_MESSAGES/gedit.mo
share/locale/uk/LC_MESSAGES/gedit.mo
share/locale/vi/LC_MESSAGES/gedit.mo
share/locale/wa/LC_MESSAGES/gedit.mo
+share/locale/xh/LC_MESSAGES/gedit.mo
share/locale/zh_CN/LC_MESSAGES/gedit.mo
share/locale/zh_HK/LC_MESSAGES/gedit.mo
share/locale/zh_TW/LC_MESSAGES/gedit.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
@dirrm share/gnome/omf/gedit
@dirrm share/gnome/help/gedit/zh_TW/figures
@dirrm share/gnome/help/gedit/zh_TW
@@ -372,17 +408,81 @@ share/locale/zh_TW/LC_MESSAGES/gedit.mo
@dirrm share/gnome/help/gedit
@dirrm share/gnome/gedit-2/ui
@dirrm share/gnome/gedit-2/taglist
+@dirrm share/gnome/gedit-2/logo
+@dirrm share/gnome/gedit-2/icons
%%PYTHON%%@dirrm share/gnome/gedit-2/plugins/snippets
+@dirrm share/gnome/gedit-2/plugins/filebrowser
%%PYTHON%%@dirrm share/gnome/gedit-2/plugins/externaltools
-%%PYTHON%%@dirrm share/gnome/gedit-2/plugins
+@dirrm share/gnome/gedit-2/plugins
@dirrm share/gnome/gedit-2/glade
@dirrm share/gnome/gedit-2
+@dirrm %%DOCSDIR%%
+%%PYTHON%%@dirrm lib/gedit-2/plugins/pythonconsole
%%PYTHON%%@dirrm lib/gedit-2/plugins/snippets
%%PYTHON%%@dirrm lib/gedit-2/plugins/externaltools
@dirrm lib/gedit-2/plugins
@dirrm lib/gedit-2
-@dirrm include/gedit-%%VERSION%%/gedit/recent-files
@dirrm include/gedit-%%VERSION%%/gedit
@dirrm include/gedit-%%VERSION%%
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile
index 69dcd2eb46ab..00b2e4ac9be0 100644
--- a/games/gnome-games-extra-data/Makefile
+++ b/games/gnome-games-extra-data/Makefile
@@ -3,11 +3,12 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/games/gnomegames2-extra-data/Makefile,v 1.8 2006/04/22 18:07:24 marcus Exp $
+# $MCom: ports/games/gnome-games-extra-data/Makefile,v 1.10 2006/07/22 20:55:44 mezz Exp $
#
PORTNAME= gnome-games-extra-data
PORTVERSION= 2.14.0
+PORTREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,11 +17,11 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Themes and artwork for the gnome-games package
-RUN_DEPENDS= ${X11BASE}/bin/sol:${PORTSDIR}/games/gnome-games
+RUN_DEPENDS= ${LOCALBASE}/bin/sol:${PORTSDIR}/games/gnome-games
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gnomeprefix gnometarget
CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 1e0b09dd3818..6c65030ec758 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/games/gnomegames2/Makefile,v 1.111 2006/04/13 07:52:34 bland Exp $
+# $MCom: ports/games/gnome-games/Makefile,v 1.120 2006/10/03 01:23:20 ahze Exp $
#
PORTNAME= gnome-games
-PORTVERSION= 2.14.3
+PORTVERSION= 2.16.1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,7 +22,8 @@ USE_BZIP2= yes
USE_PYTHON= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
-USE_X_PREFIX= yes
+INSTALLS_ICONS= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui \
librsvg2 desktopfileutils
@@ -46,15 +47,8 @@ LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi
.endif
post-patch:
- @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|malloc\.h|stdlib.h|g'
@${REINPLACE_CMD} -e 's|bin/python|bin/env python|g' \
${WRKSRC}/libgames-support/games-server.py
- @${REINPLACE_CMD} -e 's|howl|avahi-compat-howl|' \
- ${WRKSRC}/configure
-# @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-# 's|664|666|g ; \
-# s|2555|0555|g'
post-install:
@-update-desktop-database
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index 785c87991b2e..b0b36330215c 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-games-2.14.3.tar.bz2) = 20f7c2e0ee4a65d15733332f34ac3cd4
-SHA256 (gnome2/gnome-games-2.14.3.tar.bz2) = b90c31dc86fff4a31c2c8c00786d0eb959f23f47f32ce689d6ef6d1bb79b97ca
-SIZE (gnome2/gnome-games-2.14.3.tar.bz2) = 5057902
+MD5 (gnome2/gnome-games-2.16.1.tar.bz2) = 4377f69dffe1bca3a153936354112ec9
+SHA256 (gnome2/gnome-games-2.16.1.tar.bz2) = 8255a2b715492fcafa653fa9b11a5e34c6626413bd427481983e5ce6ad054efc
+SIZE (gnome2/gnome-games-2.16.1.tar.bz2) = 5199644
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 1c51e01b87fc..8141ddc3f30c 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -125,7 +125,7 @@ share/gnome/blackjack/Vegas_Strip.rules
@unexec [ -s %D/share/gnome/games/same-gnome.Medium.scores ] || rm -f %D/share/gnome/games/same-gnome.Medium.scores
@unexec [ -s %D/share/gnome/games/same-gnome.Small.scores ] || rm -f %D/share/gnome/games/same-gnome.Small.scores
@unexec [ -L %D/share/gnome/games/same-gnome.scores ] || rm -f %D/share/gnome/games/same-gnome.scores
-share/gnome/gnect/white_ob.cn4
+share/gnome/gnect/white_ob.cn4.gz
share/gnome/gnibbles/level001.gnl
share/gnome/gnibbles/level002.gnl
share/gnome/gnibbles/level003.gnl
@@ -338,8 +338,6 @@ share/gnome/help/blackjack/C/figures/blackjack_start_window.png
share/gnome/help/blackjack/C/figures/blackjack_win_window.png
share/gnome/help/blackjack/C/legal.xml
share/gnome/help/gataxx/C/figures/gataxx-legalmoves.png
-share/gnome/help/gataxx/C/figures/gataxx-prefs.png
-share/gnome/help/gataxx/C/figures/gataxx-startgame.png
share/gnome/help/gataxx/C/gataxx.xml
share/gnome/help/gataxx/C/legal.xml
share/gnome/help/glines/C/figures/glines-gameover.png
@@ -443,11 +441,8 @@ share/gnome/pixmaps/blackjack/chip-5.svg
share/gnome/pixmaps/cards/baize.png
share/gnome/pixmaps/cards/slot.svg
share/gnome/pixmaps/cards/slots/white-outline.svg
-share/gnome/pixmaps/gataxx.png
-share/gnome/pixmaps/glines.png
share/gnome/pixmaps/glines/balls.svg
share/gnome/pixmaps/glines/shapes.svg
-share/gnome/pixmaps/gnect-icon.png
share/gnome/pixmaps/gnect/bg_grotty.jpg
share/gnome/pixmaps/gnect/bg_nightfall.jpg
share/gnome/pixmaps/gnect/bg_toplight.png
@@ -488,25 +483,16 @@ share/gnome/pixmaps/gnibbles/wall-tee-left.svg
share/gnome/pixmaps/gnibbles/wall-tee-right.svg
share/gnome/pixmaps/gnibbles/wall-tee-up.svg
share/gnome/pixmaps/gnobots2/aieee.png
+share/gnome/pixmaps/gnobots2/boo.svg
share/gnome/pixmaps/gnobots2/gnomes.png
-share/gnome/pixmaps/gnobots2/robots.png
+share/gnome/pixmaps/gnobots2/robots.svg
share/gnome/pixmaps/gnobots2/splat.png
+share/gnome/pixmaps/gnobots2/ufo.svg
share/gnome/pixmaps/gnobots2/yahoo.png
-share/gnome/pixmaps/gnome-aisleriot.png
-share/gnome/pixmaps/gnome-blackjack.png
-share/gnome/pixmaps/gnome-cardgame.png
-share/gnome/pixmaps/gnome-games-common/cards/bonded.png
+share/gnome/pixmaps/gnome-games-common/cards/bonded.svg
share/gnome/pixmaps/gnome-games-common/cards/paris.svg
share/gnome/pixmaps/gnome-games-common/icons/rteleport.png
share/gnome/pixmaps/gnome-games-common/icons/teleport.png
-share/gnome/pixmaps/gnome-gnobots2.svg
-share/gnome/pixmaps/gnome-gnomine.png
-share/gnome/pixmaps/gnome-gnotravex.png
-share/gnome/pixmaps/gnome-gsame.png
-share/gnome/pixmaps/gnome-gtali.png
-share/gnome/pixmaps/gnome-gtetris.png
-share/gnome/pixmaps/gnome-mahjongg.png
-share/gnome/pixmaps/gnome-nibbles.png
share/gnome/pixmaps/gnometris/7blocks-gw.png
share/gnome/pixmaps/gnometris/7blocks-tig.png
share/gnome/pixmaps/gnomine/bang.svg
@@ -518,7 +504,7 @@ share/gnome/pixmaps/gnomine/face-worried.png
share/gnome/pixmaps/gnomine/flag-question.svg
share/gnome/pixmaps/gnomine/flag.svg
share/gnome/pixmaps/gnomine/mine.svg
-share/gnome/pixmaps/gnotski-icon.png
+share/gnome/pixmaps/gnomine/warning.svg
share/gnome/pixmaps/gnotski.svg
share/gnome/pixmaps/gtali/gnome-dice-1.svg
share/gnome/pixmaps/gtali/gnome-dice-2.svg
@@ -527,7 +513,6 @@ share/gnome/pixmaps/gtali/gnome-dice-4.svg
share/gnome/pixmaps/gtali/gnome-dice-5.svg
share/gnome/pixmaps/gtali/gnome-dice-6.svg
share/gnome/pixmaps/gtali/gnome-dice-none.svg
-share/gnome/pixmaps/iagno.png
share/gnome/pixmaps/iagno/classic.png
share/gnome/pixmaps/iagno/woodtrim.png
share/gnome/pixmaps/mahjongg/postmodern.svg
@@ -640,12 +625,50 @@ share/gnome/sounds/gnometris/slide.wav
share/gnome/sounds/gnometris/turn.wav
share/gnome/sounds/iagno/flip-piece.wav
share/gnome/sounds/iagno/gameover.wav
+share/icons/hicolor/16x16/apps/gnome-ataxx.png
+share/icons/hicolor/16x16/apps/gnome-gnomine.png
+share/icons/hicolor/16x16/apps/gnome-iagno.png
+share/icons/hicolor/16x16/apps/gnome-nibbles.png
+share/icons/hicolor/16x16/apps/gnome-tali.png
+share/icons/hicolor/22x22/apps/gnome-ataxx.png
+share/icons/hicolor/22x22/apps/gnome-gnomine.png
+share/icons/hicolor/22x22/apps/gnome-iagno.png
+share/icons/hicolor/22x22/apps/gnome-nibbles.png
+share/icons/hicolor/22x22/apps/gnome-tali.png
+share/icons/hicolor/32x32/apps/gnome-ataxx.png
+share/icons/hicolor/32x32/apps/gnome-gnomine.png
+share/icons/hicolor/32x32/apps/gnome-iagno.png
+share/icons/hicolor/32x32/apps/gnome-nibbles.png
+share/icons/hicolor/32x32/apps/gnome-tali.png
+share/icons/hicolor/48x48/apps/gnome-aisleriot.png
+share/icons/hicolor/48x48/apps/gnome-ataxx.png
+share/icons/hicolor/48x48/apps/gnome-blackjack.png
+share/icons/hicolor/48x48/apps/gnome-five-or-more.png
+share/icons/hicolor/48x48/apps/gnome-four-in-a-row.png
+share/icons/hicolor/48x48/apps/gnome-freecell.png
+share/icons/hicolor/48x48/apps/gnome-gnometris.png
+share/icons/hicolor/48x48/apps/gnome-gnomine.png
+share/icons/hicolor/48x48/apps/gnome-iagno.png
+share/icons/hicolor/48x48/apps/gnome-klotski.png
+share/icons/hicolor/48x48/apps/gnome-mahjongg.png
+share/icons/hicolor/48x48/apps/gnome-nibbles.png
+share/icons/hicolor/48x48/apps/gnome-robots.png
+share/icons/hicolor/48x48/apps/gnome-same-gnome.png
+share/icons/hicolor/48x48/apps/gnome-tali.png
+share/icons/hicolor/48x48/apps/gnome-tetravex.png
+share/icons/hicolor/scalable/apps/gnome-ataxx.svg
+share/icons/hicolor/scalable/apps/gnome-gnomine.svg
+share/icons/hicolor/scalable/apps/gnome-iagno.svg
+share/icons/hicolor/scalable/apps/gnome-nibbles.svg
+share/icons/hicolor/scalable/apps/gnome-robots.svg
+share/icons/hicolor/scalable/apps/gnome-tali.svg
share/locale/am/LC_MESSAGES/gnome-games.mo
share/locale/ar/LC_MESSAGES/gnome-games.mo
share/locale/az/LC_MESSAGES/gnome-games.mo
share/locale/be/LC_MESSAGES/gnome-games.mo
share/locale/bg/LC_MESSAGES/gnome-games.mo
share/locale/bn/LC_MESSAGES/gnome-games.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-games.mo
share/locale/ca/LC_MESSAGES/gnome-games.mo
share/locale/cs/LC_MESSAGES/gnome-games.mo
share/locale/cy/LC_MESSAGES/gnome-games.mo
@@ -680,12 +703,13 @@ share/locale/lv/LC_MESSAGES/gnome-games.mo
share/locale/mk/LC_MESSAGES/gnome-games.mo
share/locale/ml/LC_MESSAGES/gnome-games.mo
share/locale/mn/LC_MESSAGES/gnome-games.mo
+share/locale/mr/LC_MESSAGES/gnome-games.mo
share/locale/ms/LC_MESSAGES/gnome-games.mo
share/locale/nb/LC_MESSAGES/gnome-games.mo
share/locale/ne/LC_MESSAGES/gnome-games.mo
share/locale/nl/LC_MESSAGES/gnome-games.mo
share/locale/nn/LC_MESSAGES/gnome-games.mo
-share/locale/no/LC_MESSAGES/gnome-games.mo
+share/locale/or/LC_MESSAGES/gnome-games.mo
share/locale/pa/LC_MESSAGES/gnome-games.mo
share/locale/pl/LC_MESSAGES/gnome-games.mo
share/locale/pt/LC_MESSAGES/gnome-games.mo
@@ -709,14 +733,6 @@ share/locale/xh/LC_MESSAGES/gnome-games.mo
share/locale/zh_CN/LC_MESSAGES/gnome-games.mo
share/locale/zh_HK/LC_MESSAGES/gnome-games.mo
share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
@dirrm share/gnome/sounds/iagno
@dirrm share/gnome/sounds/gnometris
@dirrm share/gnome/sounds/gnobots2
@@ -804,3 +820,53 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/blackjack
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 9dfd56f5cec5..6cad3727cfbd 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -3,16 +3,14 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/cairo/Makefile,v 1.30 2005/10/04 04:35:57 ahze Exp $
+# $MCom: ports/graphics/cairo/Makefile,v 1.45 2006/08/19 16:29:11 marcus Exp $
#
PORTNAME= cairo
-PORTVERSION= 1.0.4
-PORTREVISION?= 1
+PORTVERSION= 1.2.4
+PORTREVISION?= 0
CATEGORIES= graphics
-MASTER_SITES= http://cairographics.org/releases/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ahze
+MASTER_SITES= http://cairographics.org/releases/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Vector graphics library with cross-device output support
@@ -28,7 +26,7 @@ CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \
--enable-ps
USE_GNOME= gnometarget gnomehack ltverhack referencehack
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" \
LDFLAGS="${PTHREAD_LIBS}"
@@ -62,6 +60,9 @@ post-patch:
.endif
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
${WRKSRC}/test/Makefile.in
+ @${REINPLACE_CMD} -e 's|src test doc|src doc|; \
+ s|@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = test||' \
+ ${WRKSRC}/Makefile.in
.include <bsd.port.post.mk>
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 85ffa9552e91..166ee3f1f2a1 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,3 +1,3 @@
-MD5 (cairo-1.0.4.tar.gz) = 9002b0e69b3f94831a22d3f2a7735ce2
-SHA256 (cairo-1.0.4.tar.gz) = 2c54f7a452bd21ae99789e36d38135b0ea43e7238648aabd13476d1868dcd2f5
-SIZE (cairo-1.0.4.tar.gz) = 1475777
+MD5 (cairo-1.2.4.tar.gz) = 1222b2bfdf113e2c92f66b3389659f2d
+SHA256 (cairo-1.2.4.tar.gz) = c1580ca951b2f57c4f8b34549997854bc48dbaf036ca1ca6c017c03db3504ddb
+SIZE (cairo-1.2.4.tar.gz) = 2882781
diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist
index e9445b2f0728..39be152857f9 100644
--- a/graphics/cairo/pkg-plist
+++ b/graphics/cairo/pkg-plist
@@ -3,6 +3,7 @@ include/cairo/cairo-ft.h
%%GLITZ%%include/cairo/cairo-glitz.h
include/cairo/cairo-pdf.h
include/cairo/cairo-ps.h
+include/cairo/cairo-svg.h
%%X11%%include/cairo/cairo-xlib-xrender.h
%%X11%%include/cairo/cairo-xlib.h
include/cairo/cairo.h
@@ -11,4 +12,12 @@ lib/libcairo.la
lib/libcairo.so
lib/libcairo.so.2
libdata/pkgconfig/cairo.pc
+libdata/pkgconfig/cairo-ft.pc
+%%GLITZ%%libdata/pkgconfig/cairo-glitz.pc
+libdata/pkgconfig/cairo-pdf.pc
+libdata/pkgconfig/cairo-png.pc
+libdata/pkgconfig/cairo-ps.pc
+libdata/pkgconfig/cairo-svg.pc
+%%X11%%libdata/pkgconfig/cairo-xlib.pc
+%%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
@dirrm include/cairo
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 93a97b9e7bdd..a0988e55c56f 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/eog/Makefile,v 1.29 2006/04/13 07:52:35 bland Exp $
+# $MCom: ports/graphics/eog/Makefile,v 1.41 2006/09/29 21:36:38 ahze Exp $
#
PORTNAME= eog
-PORTVERSION= 2.14.3
+PORTVERSION= 2.16.1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui \
librsvg2 desktopfileutils gnomedesktop
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
GNOME_DESKTOP_VERSION=2
@@ -32,11 +32,8 @@ GCONF_SCHEMAS= eog.schemas
.include <bsd.port.pre.mk>
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
-WITH_EXIF= yes
-.endif
-
-.if defined(WITH_EXIF) || exists(${LOCALBASE}/lib/libexif.so.12)
+.if !defined(WITHOUT_EXIF) || (exists(${LOCALBASE}/lib/libexif.so.12) || \
+ defined(WITH_EXIF))
LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif
.endif
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index 43c0c9ec36f4..e07024525da5 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eog-2.14.3.tar.bz2) = e90e4c1e314cfab04414464088098a16
-SHA256 (gnome2/eog-2.14.3.tar.bz2) = 81b35ca0948a43f6dc90bccf7b5d8498eca7a4bbe5be7f404e5bfe737265cd99
-SIZE (gnome2/eog-2.14.3.tar.bz2) = 824113
+MD5 (gnome2/eog-2.16.1.tar.bz2) = bba4f238aaac797b5a8e150aa55c7fb3
+SHA256 (gnome2/eog-2.16.1.tar.bz2) = 350e698c05f415e56a694954c5039534b980f2da865b9dd7ffeb594cb63e7fb7
+SIZE (gnome2/eog-2.16.1.tar.bz2) = 661380
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index 972834443e53..44d54a22f815 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -6,52 +6,7 @@ share/gnome/help/eog/C/eog.xml
share/gnome/help/eog/C/figures/eog_save_as_window.png
share/gnome/help/eog/C/figures/eog_start_window.png
share/gnome/help/eog/C/legal.xml
-share/gnome/help/eog/de/eog.xml
-share/gnome/help/eog/de/figures/eog_start_window.png
-share/gnome/help/eog/de/legal.xml
-share/gnome/help/eog/es/eog.xml
-share/gnome/help/eog/es/figures/eog_start_window.png
-share/gnome/help/eog/es/legal.xml
-share/gnome/help/eog/eu/eog.xml
-share/gnome/help/eog/eu/figures/eog_start_window.png
-share/gnome/help/eog/eu/legal.xml
-share/gnome/help/eog/fr/eog.xml
-share/gnome/help/eog/fr/figures/eog_start_window.png
-share/gnome/help/eog/fr/legal.xml
-share/gnome/help/eog/it/eog.xml
-share/gnome/help/eog/it/figures/eog_start_window.png
-share/gnome/help/eog/it/legal.xml
-share/gnome/help/eog/ja/eog.xml
-share/gnome/help/eog/ja/figures/eog_start_window.png
-share/gnome/help/eog/ja/legal.xml
-share/gnome/help/eog/ko/eog.xml
-share/gnome/help/eog/ko/figures/eog_start_window.png
-share/gnome/help/eog/ko/legal.xml
-share/gnome/help/eog/sv/eog.xml
-share/gnome/help/eog/sv/figures/eog_start_window.png
-share/gnome/help/eog/sv/legal.xml
-share/gnome/help/eog/uk/eog.xml
-share/gnome/help/eog/uk/figures/eog_save_as_window.png
-share/gnome/help/eog/uk/figures/eog_start_window.png
-share/gnome/help/eog/uk/legal.xml
-share/gnome/help/eog/zh_CN/eog.xml
-share/gnome/help/eog/zh_CN/figures/eog_start_window.png
-share/gnome/help/eog/zh_CN/legal.xml
-share/gnome/help/eog/zh_TW/eog.xml
-share/gnome/help/eog/zh_TW/figures/eog_start_window.png
-share/gnome/help/eog/zh_TW/legal.xml
share/gnome/omf/eog/eog-C.omf
-share/gnome/omf/eog/eog-de.omf
-share/gnome/omf/eog/eog-es.omf
-share/gnome/omf/eog/eog-eu.omf
-share/gnome/omf/eog/eog-fr.omf
-share/gnome/omf/eog/eog-it.omf
-share/gnome/omf/eog/eog-ja.omf
-share/gnome/omf/eog/eog-ko.omf
-share/gnome/omf/eog/eog-sv.omf
-share/gnome/omf/eog/eog-uk.omf
-share/gnome/omf/eog/eog-zh_CN.omf
-share/gnome/omf/eog/eog-zh_TW.omf
share/gnome/pixmaps/eog/down-right.png
share/gnome/pixmaps/eog/loading.png
share/gnome/pixmaps/eog/orient-horizontal.png
@@ -70,7 +25,7 @@ share/locale/az/LC_MESSAGES/eog.mo
share/locale/be/LC_MESSAGES/eog.mo
share/locale/bg/LC_MESSAGES/eog.mo
share/locale/bn/LC_MESSAGES/eog.mo
-share/locale/br/LC_MESSAGES/eog.mo
+share/locale/bn_IN/LC_MESSAGES/eog.mo
share/locale/bs/LC_MESSAGES/eog.mo
share/locale/ca/LC_MESSAGES/eog.mo
share/locale/cs/LC_MESSAGES/eog.mo
@@ -104,6 +59,7 @@ share/locale/ko/LC_MESSAGES/eog.mo
share/locale/ku/LC_MESSAGES/eog.mo
share/locale/lt/LC_MESSAGES/eog.mo
share/locale/lv/LC_MESSAGES/eog.mo
+share/locale/mg/LC_MESSAGES/eog.mo
share/locale/mk/LC_MESSAGES/eog.mo
share/locale/ml/LC_MESSAGES/eog.mo
share/locale/mn/LC_MESSAGES/eog.mo
@@ -112,7 +68,6 @@ share/locale/nb/LC_MESSAGES/eog.mo
share/locale/ne/LC_MESSAGES/eog.mo
share/locale/nl/LC_MESSAGES/eog.mo
share/locale/nn/LC_MESSAGES/eog.mo
-share/locale/no/LC_MESSAGES/eog.mo
share/locale/nso/LC_MESSAGES/eog.mo
share/locale/or/LC_MESSAGES/eog.mo
share/locale/pa/LC_MESSAGES/eog.mo
@@ -141,52 +96,70 @@ share/locale/zh_CN/LC_MESSAGES/eog.mo
share/locale/zh_HK/LC_MESSAGES/eog.mo
share/locale/zh_TW/LC_MESSAGES/eog.mo
share/locale/zu/LC_MESSAGES/eog.mo
+@dirrm share/gnome/pixmaps/eog
+@dirrm share/gnome/omf/eog
+@dirrm share/gnome/help/eog/C/figures
+@dirrm share/gnome/help/eog/C
+@dirrm share/gnome/help/eog
+@dirrm share/gnome/eog/glade
+@dirrm share/gnome/eog
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || true
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrm share/gnome/pixmaps/eog
-@dirrm share/gnome/omf/eog
-@dirrm share/gnome/help/eog/zh_TW/figures
-@dirrm share/gnome/help/eog/zh_TW
-@dirrm share/gnome/help/eog/zh_CN/figures
-@dirrm share/gnome/help/eog/zh_CN
-@dirrm share/gnome/help/eog/uk/figures
-@dirrm share/gnome/help/eog/uk
-@dirrm share/gnome/help/eog/sv/figures
-@dirrm share/gnome/help/eog/sv
-@dirrm share/gnome/help/eog/ko/figures
-@dirrm share/gnome/help/eog/ko
-@dirrm share/gnome/help/eog/ja/figures
-@dirrm share/gnome/help/eog/ja
-@dirrm share/gnome/help/eog/it/figures
-@dirrm share/gnome/help/eog/it
-@dirrm share/gnome/help/eog/fr/figures
-@dirrm share/gnome/help/eog/fr
-@dirrm share/gnome/help/eog/eu/figures
-@dirrm share/gnome/help/eog/eu
-@dirrm share/gnome/help/eog/es/figures
-@dirrm share/gnome/help/eog/es
-@dirrm share/gnome/help/eog/de/figures
-@dirrm share/gnome/help/eog/de
-@dirrm share/gnome/help/eog/C/figures
-@dirrm share/gnome/help/eog/C
-@dirrm share/gnome/help/eog
-@dirrm share/gnome/eog/glade
-@dirrm share/gnome/eog
-@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/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index dd4aaef39bf4..e128489f834c 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,26 +3,26 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/evince/Makefile,v 1.50 2006/04/24 00:54:32 ahze Exp $
+# $MCom: ports/graphics/evince/Makefile,v 1.58 2006/10/10 02:27:26 ahze Exp $
#
PORTNAME= evince
-PORTVERSION= 0.5.3
-PORTREVISION= 1
+PORTVERSION= 0.6.1
CATEGORIES= graphics print gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.5
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 multi-format document viewer
LIB_DEPENDS= poppler-glib.1:${PORTSDIR}/graphics/poppler-gtk
+USE_LDCONFIG= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GHOSTSCRIPT=yes
INSTALLS_OMF= yes
@@ -38,6 +38,7 @@ OPTIONS= DVI "Enable DVI viewer support" off \
NAUTILUS "Enable Nautilus plugin" on \
DBUS "Enable D-BUS support" on \
COMICS "Enable comic book archives support" off
+# IMPRESS "Enable Impress presentations support" off \
# DJVU "Enable DJVU support" off
.include <bsd.port.pre.mk>
@@ -69,12 +70,18 @@ CONFIGURE_ARGS+= --disable-nautilus
PLIST_SUB+= NAUTILUS="@comment "
.endif
-.if exists(${X11BASE}/bin/djview)
-DJVU_DIR?= # empty
-.else
-DJVU_DIR?= -nox11
-.endif
+#.if defined(WITH_IMPRESS)
+#CONFIGURE_ARGS+= --enable-impress
+#.else
+CONFIGURE_ARGS+= --disable-impress
+#.endif
+#.if exists(${X11BASE}/bin/djview)
+#DJVU_DIR?= # empty
+#.else
+#DJVU_DIR?= -nox11
+#.endif
+#
#.if defined(WITH_DJVU)
#LIB_DEPENDS+= djvulibre.17:${PORTSDIR}/graphics/djvulibre${DJVU_DIR}
#CONFIGURE_ARGS+= --enable-djvu
@@ -84,7 +91,7 @@ CONFIGURE_ARGS+= --disable-djvu
#.endif
.if !defined(WITHOUT_DBUS)
-LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
.endif
.if defined(WITH_COMICS)
diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo
index f4b9a8609ff7..f80ff610751a 100644
--- a/graphics/evince/distinfo
+++ b/graphics/evince/distinfo
@@ -1,3 +1,3 @@
-MD5 (evince-0.5.3.tar.bz2) = 94be73485eeb8584b4aeaa8ac87699f0
-SHA256 (evince-0.5.3.tar.bz2) = 793067426e0adf18129642426c4b4e8e4f61747dfea48111690525eff06822a0
-SIZE (evince-0.5.3.tar.bz2) = 994976
+MD5 (gnome2/evince-0.6.1.tar.bz2) = 55a1d4af3cac209c7cfbe83b7ffcee1d
+SHA256 (gnome2/evince-0.6.1.tar.bz2) = ee72f48ec0c76a8f44d8a6aed6759d43a147a9d5bb2b15f06460c4d6ef86025e
+SIZE (gnome2/evince-0.6.1.tar.bz2) = 1212271
diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist
index 1d6b1780feb5..06e0564df2b5 100644
--- a/graphics/evince/pkg-plist
+++ b/graphics/evince/pkg-plist
@@ -18,29 +18,42 @@ share/gnome/help/evince/el/evince.xml
share/gnome/help/evince/el/figures/evince_start_window.png
share/gnome/help/evince/es/evince.xml
share/gnome/help/evince/es/figures/evince_start_window.png
+share/gnome/help/evince/fi/evince.xml
+share/gnome/help/evince/fi/figures/evince_start_window.png
+share/gnome/help/evince/fr/evince.xml
+share/gnome/help/evince/fr/figures/evince_start_window.png
+share/gnome/help/evince/it/evince.xml
+share/gnome/help/evince/it/figures/evince_start_window.png
share/gnome/help/evince/nl/evince.xml
share/gnome/help/evince/nl/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/sr/evince.xml
share/gnome/help/evince/sr/figures/evince_start_window.png
+share/gnome/help/evince/sv/evince.xml
+share/gnome/help/evince/sv/figures/evince_start_window.png
share/gnome/help/evince/uk/evince.xml
share/gnome/help/evince/uk/figures/evince_start_window.png
share/gnome/omf/evince/evince-C.omf
share/gnome/omf/evince/evince-bg.omf
share/gnome/omf/evince/evince-el.omf
share/gnome/omf/evince/evince-es.omf
+share/gnome/omf/evince/evince-fi.omf
+share/gnome/omf/evince/evince-fr.omf
+share/gnome/omf/evince/evince-it.omf
share/gnome/omf/evince/evince-nl.omf
share/gnome/omf/evince/evince-ru.omf
share/gnome/omf/evince/evince-sr.omf
+share/gnome/omf/evince/evince-sv.omf
share/gnome/omf/evince/evince-uk.omf
-share/icons/hicolor/16x16/apps/evince-16.png
-share/icons/hicolor/22x22/apps/evince-22.png
+share/icons/hicolor/16x16/apps/evince.png
+share/icons/hicolor/22x22/apps/evince.png
share/icons/hicolor/48x48/apps/evince.png
share/icons/hicolor/scalable/apps/evince.svg
share/locale/be/LC_MESSAGES/evince.mo
share/locale/bg/LC_MESSAGES/evince.mo
share/locale/bn/LC_MESSAGES/evince.mo
+share/locale/bn_IN/LC_MESSAGES/evince.mo
share/locale/br/LC_MESSAGES/evince.mo
share/locale/ca/LC_MESSAGES/evince.mo
share/locale/cs/LC_MESSAGES/evince.mo
@@ -71,10 +84,13 @@ share/locale/ku/LC_MESSAGES/evince.mo
share/locale/lt/LC_MESSAGES/evince.mo
share/locale/lv/LC_MESSAGES/evince.mo
share/locale/mk/LC_MESSAGES/evince.mo
+share/locale/ml/LC_MESSAGES/evince.mo
+share/locale/mr/LC_MESSAGES/evince.mo
share/locale/nb/LC_MESSAGES/evince.mo
share/locale/ne/LC_MESSAGES/evince.mo
share/locale/nl/LC_MESSAGES/evince.mo
share/locale/nn/LC_MESSAGES/evince.mo
+share/locale/or/LC_MESSAGES/evince.mo
share/locale/pa/LC_MESSAGES/evince.mo
share/locale/pl/LC_MESSAGES/evince.mo
share/locale/pt/LC_MESSAGES/evince.mo
@@ -83,10 +99,12 @@ share/locale/ro/LC_MESSAGES/evince.mo
share/locale/ru/LC_MESSAGES/evince.mo
share/locale/rw/LC_MESSAGES/evince.mo
share/locale/sk/LC_MESSAGES/evince.mo
+share/locale/sl/LC_MESSAGES/evince.mo
share/locale/sq/LC_MESSAGES/evince.mo
share/locale/sr/LC_MESSAGES/evince.mo
share/locale/sr@Latn/LC_MESSAGES/evince.mo
share/locale/sv/LC_MESSAGES/evince.mo
+share/locale/ta/LC_MESSAGES/evince.mo
share/locale/th/LC_MESSAGES/evince.mo
share/locale/tr/LC_MESSAGES/evince.mo
share/locale/uk/LC_MESSAGES/evince.mo
@@ -95,25 +113,23 @@ share/locale/wa/LC_MESSAGES/evince.mo
share/locale/zh_CN/LC_MESSAGES/evince.mo
share/locale/zh_HK/LC_MESSAGES/evince.mo
share/locale/zh_TW/LC_MESSAGES/evince.mo
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
@dirrm share/gnome/omf/evince
@dirrm share/gnome/help/evince/uk/figures
@dirrm share/gnome/help/evince/uk
+@dirrm share/gnome/help/evince/sv/figures
+@dirrm share/gnome/help/evince/sv
@dirrm share/gnome/help/evince/sr/figures
@dirrm share/gnome/help/evince/sr
@dirrm share/gnome/help/evince/ru/figures
@dirrm share/gnome/help/evince/ru
@dirrm share/gnome/help/evince/nl/figures
@dirrm share/gnome/help/evince/nl
+@dirrm share/gnome/help/evince/it/figures
+@dirrm share/gnome/help/evince/it
+@dirrm share/gnome/help/evince/fr/figures
+@dirrm share/gnome/help/evince/fr
+@dirrm share/gnome/help/evince/fi/figures
+@dirrm share/gnome/help/evince/fi
@dirrm share/gnome/help/evince/es/figures
@dirrm share/gnome/help/evince/es
@dirrm share/gnome/help/evince/el/figures
@@ -126,3 +142,51 @@ share/locale/zh_TW/LC_MESSAGES/evince.mo
@dirrm share/gnome/evince
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile
index dfccc56066b2..c648490a3841 100644
--- a/graphics/glitz/Makefile
+++ b/graphics/glitz/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@ahze.net>
#
# $FreeBSD$
-# $MCom: ports/graphics/glitz/Makefile,v 1.4 2005/08/09 22:54:54 ahze Exp $
+# $MCom: ports/graphics/glitz/Makefile,v 1.8 2006/09/10 00:51:10 mezz Exp $
#
PORTNAME= glitz
-PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTVERSION= 0.5.6
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/snapshots/
@@ -18,7 +17,7 @@ COMMENT= OpenGL image compositing library
USE_GL= yes
USE_GNOME= pkgconfig gnometarget gnomehack
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="${PTHREAD_LIBS}"
@@ -28,7 +27,7 @@ CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
post-patch:
.if ${OSVERSION} < 500000
@${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \
- ${WRKSRC}/src/glitz.h
+ ${WRKSRC}/src/glitzint.h
.endif
.include <bsd.port.post.mk>
diff --git a/graphics/glitz/distinfo b/graphics/glitz/distinfo
index 7237973497d6..86714e7e51ce 100644
--- a/graphics/glitz/distinfo
+++ b/graphics/glitz/distinfo
@@ -1,3 +1,3 @@
-MD5 (glitz-0.4.4.tar.gz) = 56162ec6f5df9603c0e98391c64565f8
-SHA256 (glitz-0.4.4.tar.gz) = 35287ae5949d67e67a9f275885896615c83e6322b2b85c338514cf198fda6540
-SIZE (glitz-0.4.4.tar.gz) = 425742
+MD5 (glitz-0.5.6.tar.gz) = c507f140ecccc06aed8888c958edda4c
+SHA256 (glitz-0.5.6.tar.gz) = 132adf06e48531f4c01b6ba5843881e2b584a170c5222353d03cbef736d4a471
+SIZE (glitz-0.5.6.tar.gz) = 459224
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 33cf472f7f8a..0a91f569a42d 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -3,12 +3,11 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.57 2006/04/13 07:52:35 bland Exp $
-#
+# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.60 2006/09/10 00:51:11 mezz Exp $
PORTNAME= libgnomecanvas
PORTVERSION= 2.14.0
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,8 +22,8 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
-INSTALLS_SHLIB= yes
+USE_XLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack libglade2 libartlgpl2 ltverhack referencehack
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index a6ac3bcb3f72..37e354fc0265 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -94,15 +94,61 @@ share/locale/yi/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/zh_HK/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.mo
+@dirrm include/libgnomecanvas-2.0/libgnomecanvas
+@dirrm include/libgnomecanvas-2.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/tt/LC_MESSAGES
@dirrmtry share/locale/tt
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
@dirrmtry share/locale/ang/LC_MESSAGES
@dirrmtry share/locale/ang
-@dirrm include/libgnomecanvas-2.0/libgnomecanvas
-@dirrm include/libgnomecanvas-2.0
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 29430d5de1b1..712ed42ee9f2 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,11 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/librsvg2/Makefile,v 1.98 2006/04/13 07:52:35 bland Exp $
+# $MCom: ports/graphics/librsvg2/Makefile,v 1.109 2006/10/02 04:52:51 bland Exp $
#
PORTNAME= librsvg2
-PORTVERSION= 2.14.4
+PORTVERSION= 2.16.0
+PORTREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,14 +20,13 @@ COMMENT= Library for parsing and rendering SVG vector-graphic files
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
- popt.0:${PORTSDIR}/devel/popt \
croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco
-RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmetal.so:${PORTSDIR}/x11-themes/gtk-engines2
+RUN_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
-INSTALLS_SHLIB= yes
+USE_XLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack gnomeprefix libgsf gtk20 ltverhack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -36,7 +36,8 @@ CONFIGURE_ARGS= --with-svgz \
--without-gimp \
--with-croco \
--disable-gnome-vfs \
- --enable-gtk-theme
+ --enable-gtk-theme \
+ --disable-gnome-print
CROCO_VERSION= 0.6
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 2a1a170c93cb..19f271896599 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/librsvg-2.14.4.tar.bz2) = 945617bb094975d7353a3852302297c1
-SHA256 (gnome2/librsvg-2.14.4.tar.bz2) = 877f016487042eedc78c472bddd008fe70e17837374ede50726445eb8f5872d5
-SIZE (gnome2/librsvg-2.14.4.tar.bz2) = 415862
+MD5 (gnome2/librsvg-2.16.0.tar.bz2) = dc6385e62ed278732146bca5aab74568
+SHA256 (gnome2/librsvg-2.16.0.tar.bz2) = 2a918455246e8541ce737ea499fd0bcfa207d712cb4efa5583031b9c23c51c66
+SIZE (gnome2/librsvg-2.16.0.tar.bz2) = 420858
diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
index b129aca5aa90..5db06266c965 100644
--- a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
+++ b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
@@ -1,15 +1,15 @@
---- moz-plugin/Makefile.in.orig Sat Apr 1 15:25:20 2006
-+++ moz-plugin/Makefile.in Sat Apr 1 15:27:58 2006
-@@ -246,7 +246,7 @@ sbindir = @sbindir@
+--- moz-plugin/Makefile.in.orig Thu Jul 27 11:13:53 2006
++++ moz-plugin/Makefile.in Thu Jul 27 11:14:38 2006
+@@ -241,7 +241,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
--plugindir = $(libdir)/mozilla/plugins/
-+plugindir = $(libdir)/browser_plugins/
+-plugindir = $(libdir)/mozilla/plugins
++plugindir = $(libdir)/browser_plugins
@WITH_MOZILLA_FALSE@plugin_LTLIBRARIES =
@WITH_MOZILLA_TRUE@plugin_LTLIBRARIES = libmozsvgdec.la
INCLUDES = $(MOZILLA_CFLAGS) -DBINDIR=\"$(bindir)/\" $(GLIB_CFLAGS) $(GDK_X11_CFLAGS)
-@@ -289,7 +289,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
+@@ -284,7 +284,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index 82ac9dc7a828..ceeb03c21173 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -19,7 +19,25 @@ 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/gnome/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
diff --git a/graphics/poppler-qt/Makefile b/graphics/poppler-qt/Makefile
index e61c2b20004a..19ea8a81c1c2 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.6 2006/04/12 17:10:20 ahze Exp $
+# $MCom: ports/graphics/poppler-qt/Makefile,v 1.9 2006/10/10 20:22:10 mezz Exp $
PORTREVISION= 0
PKGNAMESUFFIX= -qt
diff --git a/graphics/poppler-qt/pkg-plist b/graphics/poppler-qt/pkg-plist
index bc152aa05973..d342c0288363 100644
--- a/graphics/poppler-qt/pkg-plist
+++ b/graphics/poppler-qt/pkg-plist
@@ -1,3 +1,4 @@
+include/poppler/poppler-link-qt3.h
include/poppler/poppler-page-transition.h
include/poppler/poppler-qt.h
lib/libpoppler-qt.a
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 2187c2dbe9e8..99a265f5326f 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.23 2006/04/12 17:10:20 ahze Exp $
+# $MCom: ports/graphics/poppler/Makefile,v 1.30 2006/09/30 04:55:20 ahze Exp $
#
PORTNAME= poppler
-PORTVERSION= 0.5.3
+PORTVERSION= 0.5.4
PORTREVISION?= 1
CATEGORIES= graphics print
MASTER_SITES= http://poppler.freedesktop.org/
@@ -15,11 +15,12 @@ MASTER_SITES= http://poppler.freedesktop.org/
MAINTAINER?= gnome@FreeBSD.org
COMMENT?= A PDF rendering library
+RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data
+
USE_GMAKE= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gnometarget
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-zlib \
--enable-xpdf-headers \
--with-html-dir=${DOCSDIR}
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index 19f573b59e7f..58d7459cd7e7 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-0.5.3.tar.gz) = d06207536555f5711e7bc61711c1b8a0
-SHA256 (poppler-0.5.3.tar.gz) = 5cfabff39670610fa8f5c33da7b9b0ae89d445445be6d6c245cdce8bf3f24190
-SIZE (poppler-0.5.3.tar.gz) = 1049900
+MD5 (poppler-0.5.4.tar.gz) = 053fdfd70533ecce1a06353fa945f061
+SHA256 (poppler-0.5.4.tar.gz) = ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9
+SIZE (poppler-0.5.4.tar.gz) = 1062401
diff --git a/graphics/poppler/files/patch-Makefile.in b/graphics/poppler/files/patch-Makefile.in
index a93d4d7c840d..02c8919d0713 100644
--- a/graphics/poppler/files/patch-Makefile.in
+++ b/graphics/poppler/files/patch-Makefile.in
@@ -1,20 +1,24 @@
---- Makefile.in.orig Tue May 23 07:59:21 2006
-+++ Makefile.in Tue May 23 08:00:41 2006
+--- Makefile.in.orig Thu Sep 21 20:54:29 2006
++++ Makefile.in Sat Sep 30 10:51:57 2006
@@ -76,7 +76,7 @@
DATA = $(pkgconfig_DATA)
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = goo fofi splash poppler utils glib qt test qt4
-+DIST_SUBDIRS = goo fofi splash poppler utils glib qt qt4
++DIST_SUBDIRS = goo fofi splash poppler utils glib qt
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
-@@ -254,7 +254,7 @@
- @BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4
+@@ -254,10 +254,10 @@
+ @BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
+ @BUILD_POPPLER_QT_TRUE@qt_subdir = qt
+ @BUILD_POPPLER_QT_TRUE@qt_pc_file = poppler-qt.pc
+-@BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4
++@BUILD_POPPLER_QT4_TRUE@qt4_subdir =
@BUILD_POPPLER_QT4_TRUE@qt4_pc_file = poppler-qt4.pc
@BUILD_UTILS_TRUE@utils_subdir = utils
-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
-+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) $(qt4_subdir)
++SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir)
EXTRA_DIST = \
README-XPDF \
poppler.pc.in \
diff --git a/graphics/poppler/files/patch-configure b/graphics/poppler/files/patch-configure
index c8c36c268cea..2af4940c3582 100644
--- a/graphics/poppler/files/patch-configure
+++ b/graphics/poppler/files/patch-configure
@@ -1,11 +1,119 @@
---- configure.orig Tue May 23 08:07:51 2006
-+++ configure Tue May 23 08:08:07 2006
-@@ -24856,7 +24856,7 @@
- fi
+--- configure.orig Sat Sep 30 00:27:43 2006
++++ configure Sat Sep 30 00:30:00 2006
+@@ -24957,12 +24957,12 @@
+ pkg_cv_POPPLER_GLIB_CFLAGS="$POPPLER_GLIB_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib >= 2.6\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0 >= 2.4.0 glib >= 2.6" 2>/dev/null`
++ pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6" 2>/dev/null`
+ else
+ pkg_failed=yes
fi
+@@ -24975,12 +24975,12 @@
+ pkg_cv_POPPLER_GLIB_LIBS="$POPPLER_GLIB_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib >= 2.6\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "gdk-2.0 >= 2.4.0 glib >= 2.6" 2>/dev/null`
++ pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -24999,14 +24999,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6"`
++ POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6"`
+ else
+- POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6"`
++ POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$POPPLER_GLIB_PKG_ERRORS" >&5
+
+- { { echo "$as_me:$LINENO: error: Package requirements (gdk-2.0 >= 2.4.0 glib >= 2.6) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6) were not met:
+
+ $POPPLER_GLIB_PKG_ERRORS
+
+@@ -25017,7 +25017,7 @@
+ and POPPLER_GLIB_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements (gdk-2.0 >= 2.4.0 glib >= 2.6) were not met:
++echo "$as_me: error: Package requirements (gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6) were not met:
+
+ $POPPLER_GLIB_PKG_ERRORS
+
+@@ -25298,10 +25298,10 @@
+ enable_poppler_qt="try"
+ fi;
+
+-if test x$enable_poppler_qt = xyes; then
++if test "$enable_poppler_qt" = xyes; then
+
+-qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
+-qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
++qt_incdirs="$QTINC /usr/X11R6/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
++qt_libdirs="$QTLIB /usr/X11R6/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
+ if test -n "$QTDIR" ; then
+ qt_incdirs="$QTDIR/include $qt_incdirs"
+ qt_libdirs="$QTDIR/lib $qt_libdirs"
+@@ -25488,8 +25488,8 @@
+
+ elif test x$enable_poppler_qt = xtry; then
+
+-qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
+-qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
++qt_incdirs="$QTINC /usr/X11R6/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
++qt_libdirs="$QTLIB /usr/X11R6/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
+ if test -n "$QTDIR" ; then
+ qt_incdirs="$QTDIR/include $qt_incdirs"
+ qt_libdirs="$QTDIR/lib $qt_libdirs"
+@@ -25700,8 +25700,8 @@
+ if test x$enable_poppler_qt4 = xyes; then
+
+ have_qt4=no
+-qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include /usr/lib/qt4/include"
+-qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib /usr/lib/qt4/lib"
++qt4_incdirs="/usr/X11R6/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include /usr/lib/qt4/include"
++qt4_libdirs="/usr/X11R6/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib /usr/lib/qt4/lib"
+
+ if test -n "$QTDIR" ; then
+ qt4_incdirs="$QTDIR/include $qt4_incdirs"
+@@ -25773,8 +25773,8 @@
+ elif test x$enable_poppler_qt4 = xtry; then
+
+ have_qt4=no
+-qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include /usr/lib/qt4/include"
+-qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib /usr/lib/qt4/lib"
++qt4_incdirs="/usr/X11R6/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include /usr/lib/qt4/include"
++qt4_libdirs="/usr/X11R6/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib /usr/lib/qt4/lib"
+
+ if test -n "$QTDIR" ; then
+ qt4_incdirs="$QTDIR/include $qt4_incdirs"
+@@ -25863,8 +25863,8 @@
+
+ have_qt4testlib=no
+
+-qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include"
+-qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib"
++qt4_incdirs="/usr/X11R6/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include"
++qt4_libdirs="/usr/X11R6/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib"
--if test "x$have_qt" == "xyes"; then
-+if test "x$have_qt" = "xyes"; then
- ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ if test -n "$QTDIR" ; then
+ qt4_incdirs="$QTDIR/include $qt4_incdirs"
diff --git a/graphics/poppler/files/patch-qt_Makefile.in b/graphics/poppler/files/patch-qt_Makefile.in
index 29d9a5fa298f..756621674b26 100644
--- a/graphics/poppler/files/patch-qt_Makefile.in
+++ b/graphics/poppler/files/patch-qt_Makefile.in
@@ -1,5 +1,5 @@
---- qt/Makefile.in.orig Thu Jan 12 21:37:56 2006
-+++ qt/Makefile.in Thu Jan 12 21:38:47 2006
+--- qt/Makefile.in.orig Sat Sep 30 00:10:34 2006
++++ qt/Makefile.in Sat Sep 30 00:11:29 2006
@@ -63,16 +63,14 @@
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -8,32 +8,32 @@
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+libpoppler_qt_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
- poppler-page.lo poppler-page-transition.lo
+ poppler-link.lo poppler-page.lo poppler-page-transition.lo
libpoppler_qt_la_OBJECTS = $(am_libpoppler_qt_la_OBJECTS)
PROGRAMS = $(noinst_PROGRAMS)
am_test_poppler_qt_OBJECTS = test-poppler-qt.$(OBJEXT)
test_poppler_qt_OBJECTS = $(am_test_poppler_qt_OBJECTS)
-test_poppler_qt_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
- libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+test_poppler_qt_DEPENDENCIES = libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++test_poppler_qt_DEPENDENCIES = libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -273,7 +271,7 @@
+@@ -281,7 +279,7 @@
poppler-private.h
libpoppler_qt_la_LIBADD = \
- $(top_builddir)/poppler/libpoppler.la \
-+ -lpoppler \
++ -lpoppler -lqt-mt \
$(POPPLER_QT_LIBS) \
$(FREETYPE_LIBS)
-@@ -281,7 +279,7 @@
+@@ -290,7 +288,7 @@
test-poppler-qt.cpp
test_poppler_qt_LDADD = \
- $(top_builddir)/poppler/libpoppler.la \
-+ -lpoppler \
++ -lpoppler -lqt-mt \
libpoppler-qt.la \
$(POPPLER_QT_LIBS) \
$(FREETYPE_LIBS)
diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in
index 88cf20d30f1f..547c93f81559 100644
--- a/graphics/poppler/files/patch-utils_Makefile.in
+++ b/graphics/poppler/files/patch-utils_Makefile.in
@@ -1,56 +1,49 @@
---- utils/Makefile.in.orig Sat May 6 22:21:41 2006
-+++ utils/Makefile.in Sat May 6 22:22:56 2006
-@@ -61,42 +61,35 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
+--- utils/Makefile.in.orig Sat Sep 30 00:11:46 2006
++++ utils/Makefile.in Sat Sep 30 00:13:02 2006
+@@ -60,35 +60,35 @@
+ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
pdffonts_LDADD = $(LDADD)
- am__DEPENDENCIES_1 =
--pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-- $(am__DEPENDENCIES_1)
-+pdffonts_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdffonts_DEPENDENCIES =
am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
$(am__objects_1)
pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
pdfimages_LDADD = $(LDADD)
--pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-- $(am__DEPENDENCIES_1)
-+pdfimages_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdfimages_DEPENDENCIES =
am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) $(am__objects_1)
pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
pdfinfo_LDADD = $(LDADD)
--pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-- $(am__DEPENDENCIES_1)
-+pdfinfo_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdfinfo_DEPENDENCIES =
am_pdftohtml_OBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \
HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
pdftohtml_LDADD = $(LDADD)
--pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-- $(am__DEPENDENCIES_1)
-+pdftohtml_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftohtml_DEPENDENCIES =
am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.c parseargs.h
@BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
@BUILD_SPLASH_OUTPUT_TRUE@ $(am__objects_1)
pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
pdftoppm_LDADD = $(LDADD)
--pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-- $(am__DEPENDENCIES_1)
-+pdftoppm_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftoppm_DEPENDENCIES =
am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
pdftops_OBJECTS = $(am_pdftops_OBJECTS)
pdftops_LDADD = $(LDADD)
--pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-- $(am__DEPENDENCIES_1)
-+pdftops_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftops_DEPENDENCIES =
am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) $(am__objects_1)
pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
pdftotext_LDADD = $(LDADD)
--pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-- $(am__DEPENDENCIES_1)
-+pdftotext_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftotext_DEPENDENCIES =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -294,7 +287,7 @@ INCLUDES = \
+@@ -291,7 +291,7 @@
$(UTILS_CFLAGS)
LDADD = \
@@ -58,4 +51,4 @@
+ -lpoppler \
$(UTILS_LIBS)
-
+ dist_man1_MANS = \
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index f5deff12f13d..7b35c95741b6 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/py-cairo/Makefile,v 1.15 2005/10/12 16:31:53 ahze Exp $
+# $MCom: ports/graphics/py-cairo/Makefile,v 1.20 2006/09/06 22:05:06 marcus Exp $
#
PORTNAME= cairo
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.2.2
CATEGORIES= graphics python
MASTER_SITES= http://cairographics.org/releases/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -26,20 +25,11 @@ USE_GMAKE= yes
USE_GNOME= gnometarget gnomehack
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-pygtk
+CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
+ LDFLAGS="-L${X11BASE}/lib"
.include <bsd.port.pre.mk>
-.if defined(WITHOUT_SVG) && !exists(${LOCALBASE}/lib/libsvg-cairo.a)
-PLIST_SUB+= SVG="@comment "
-.else
-PLIST_SUB+= SVG=""
-LIB_DEPENDS+= svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
-.endif
-
-pre-everything::
- @${ECHO_MSG} "Disable SVG support by defining WITHOUT_SVG"
- @${ECHO_MSG}
-
post-patch:
@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \
s|SUBDIRS = cairo examples test|SUBDIRS = cairo examples|' \
diff --git a/graphics/py-cairo/distinfo b/graphics/py-cairo/distinfo
index 5c11a7531ec6..875475752ea9 100644
--- a/graphics/py-cairo/distinfo
+++ b/graphics/py-cairo/distinfo
@@ -1,3 +1,3 @@
-MD5 (pycairo-1.0.2.tar.gz) = 5bb6a202ebc3990712bced1da6dfb7a8
-SHA256 (pycairo-1.0.2.tar.gz) = f4827f7d8f5fd423b58fef33c95790c6615cd6fad7d68dc780c343ed292b8d9a
-SIZE (pycairo-1.0.2.tar.gz) = 469704
+MD5 (pycairo-1.2.2.tar.gz) = 83a2e06d9fc3530753701d580a18087e
+SHA256 (pycairo-1.2.2.tar.gz) = ab10b00c209e9feaebfff944d411f300ca032d09d3ebb64e3498acf9fea09c6d
+SIZE (pycairo-1.2.2.tar.gz) = 482417
diff --git a/graphics/py-cairo/files/patch-cairo_pycairo-font.c b/graphics/py-cairo/files/patch-cairo_pycairo-font.c
deleted file mode 100644
index ca7321d6f549..000000000000
--- a/graphics/py-cairo/files/patch-cairo_pycairo-font.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- cairo/pycairo-font.c.orig Mon Aug 1 05:31:41 2005
-+++ cairo/pycairo-font.c Wed Aug 3 01:09:38 2005
-@@ -196,6 +196,7 @@ scaled_font_new (PyTypeObject *type, PyO
- PycairoFontFace *ff;
- PycairoFontOptions *fo;
- PycairoMatrix *mx1, *mx2;
-+ PyObject *o;
-
- if (!PyArg_ParseTuple(args, "O!O!O!O!:ScaledFont.__new__",
- &PycairoFontFace_Type, &ff,
-@@ -204,7 +205,7 @@ scaled_font_new (PyTypeObject *type, PyO
- &PycairoFontOptions_Type, &fo))
- return NULL;
-
-- PyObject *o = type->tp_alloc(type, 0);
-+ o = type->tp_alloc(type, 0);
- if (o) {
- cairo_scaled_font_t *scaled_font = cairo_scaled_font_create
- (ff->font_face, &mx1->matrix, &mx2->matrix, fo->font_options);
diff --git a/graphics/py-cairo/pkg-plist b/graphics/py-cairo/pkg-plist
index bfc5bf308852..0d5ac3d2b6d6 100644
--- a/graphics/py-cairo/pkg-plist
+++ b/graphics/py-cairo/pkg-plist
@@ -4,8 +4,6 @@ include/pycairo/pycairo.h
%%PYTHON_SITELIBDIR%%/cairo/__init__.pyo
%%PYTHON_SITELIBDIR%%/cairo/_cairo.la
%%PYTHON_SITELIBDIR%%/cairo/_cairo.so
-%%SVG%%%%PYTHON_SITELIBDIR%%/cairo/svg.la
-%%SVG%%%%PYTHON_SITELIBDIR%%/cairo/svg.so
libdata/pkgconfig/pycairo.pc
@dirrm %%PYTHON_SITELIBDIR%%/cairo
@dirrm include/pycairo
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index b30eb2eb5d3b..b22736499ee8 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -3,11 +3,10 @@
# Whom: jseger@FreeBSD.org
#
# $FreeBSD$
-#
+# $MCom: ports/lang/guile/Makefile,v 1.1 2006/09/12 14:57:06 ahze Exp $
PORTNAME= guile
-PORTVERSION= 1.6.7
-PORTREVISION= 1
+PORTVERSION= 1.6.8
CATEGORIES= lang scheme
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= guile
@@ -18,7 +17,7 @@ COMMENT= GNU Ubiquitous Intelligent Language for Extension
USE_AUTOTOOLS= libltdl:15
USE_GMAKE= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GNOME= gnometarget
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -33,11 +32,6 @@ INFO= goops guile-tut guile r5rs
.include <bsd.port.pre.mk>
-.if ${ARCH} == "ia64"
-BROKEN= Does not install on ${ARCH}
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-ia64
-.endif
-
.if ${ARCH} != "ia64" && ${ARCH} != "amd64" && ${ARCH} != "powerpc"
CONFIGURE_ARGS+=--with-threads
PLIST_SUB+= THREADS:=""
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index d4b52d1acf77..35e18a0bd089 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,3 +1,3 @@
-MD5 (guile-1.6.7.tar.gz) = c2ff2a2231f0cbb2e838dd8701a587c5
-SHA256 (guile-1.6.7.tar.gz) = 8faeeac282b9d4175d15923a6bd0b6603653fdd744967b15d9577b5748555734
-SIZE (guile-1.6.7.tar.gz) = 3039294
+MD5 (guile-1.6.8.tar.gz) = 2756b01f428b910d33267aeaa0e2d59a
+SHA256 (guile-1.6.8.tar.gz) = 3d4ab874f90f5c2003229be29488ba2aa6fe1f0317774283360530d5d9236011
+SIZE (guile-1.6.8.tar.gz) = 3114052
diff --git a/lang/guile/files/extra-patch-ia64 b/lang/guile/files/extra-patch-ia64
deleted file mode 100644
index 87035da6dcfe..000000000000
--- a/lang/guile/files/extra-patch-ia64
+++ /dev/null
@@ -1,94 +0,0 @@
---- libguile/continuations.c.orig Fri Sep 12 18:58:00 2003
-+++ libguile/continuations.c Wed Nov 24 07:50:54 2004
-@@ -114,15 +114,6 @@
- return 1;
- }
-
--#ifdef __ia64__
--struct rv
--{
-- long retval;
-- long first_return;
--};
--extern struct rv ia64_getcontext (ucontext_t *) __asm__ ("getcontext");
--#endif /* __ia64__ */
--
- /* this may return more than once: the first time with the escape
- procedure, then subsequently with the value to be passed to the
- continuation. */
-@@ -135,9 +126,6 @@
- scm_t_contregs *rootcont = SCM_CONTREGS (scm_rootcont);
- long stack_size;
- SCM_STACKITEM * src;
--#ifdef __ia64__
-- struct rv rv;
--#endif
-
- SCM_ENTER_A_SECTION;
- SCM_FLUSH_REGISTER_WINDOWS;
-@@ -162,17 +150,15 @@
- memcpy (continuation->stack, src, sizeof (SCM_STACKITEM) * stack_size);
-
- #ifdef __ia64__
-- rv = ia64_getcontext (&continuation->ctx);
-- if (rv.first_return)
-+ continuation->backing_store = NULL;
-+ getcontext(&continuation->ctx);
-+ if (continuation->backing_store == NULL)
- {
- continuation->backing_store_size =
-- continuation->ctx.uc_mcontext.sc_ar_bsp -
-- __libc_ia64_register_backing_store_base;
-- continuation->backing_store = NULL;
-+ continuation->ctx.uc_mcontext.mc_special.bspstore - (4UL << 61);
- continuation->backing_store =
- scm_must_malloc (continuation->backing_store_size, FUNC_NAME);
-- memcpy (continuation->backing_store,
-- (void *) __libc_ia64_register_backing_store_base,
-+ memcpy (continuation->backing_store, (void *)(4UL << 61),
- continuation->backing_store_size);
- *first = 1;
- return cont;
-@@ -235,8 +221,7 @@
-
- continuation->throw_value = val;
- #ifdef __ia64__
-- memcpy ((void *) __libc_ia64_register_backing_store_base,
-- continuation->backing_store,
-+ memcpy ((void *)(4UL << 61), continuation->backing_store,
- continuation->backing_store_size);
- setcontext (&continuation->ctx);
- #else
---- libguile/gc.c.orig Wed Nov 24 07:41:44 2004
-+++ libguile/gc.c Wed Nov 24 07:53:51 2004
-@@ -1041,8 +1041,8 @@
- scm_mark_locations ((SCM_STACKITEM *) &ctx.uc_mcontext, \
- ((size_t) (sizeof (SCM_STACKITEM) - 1 + sizeof ctx.uc_mcontext) \
- / sizeof (SCM_STACKITEM))); \
-- bot = (SCM_STACKITEM *) __libc_ia64_register_backing_store_base; \
-- top = (SCM_STACKITEM *) ctx.uc_mcontext.sc_ar_bsp; \
-+ bot = (SCM_STACKITEM *) (4UL << 61); \
-+ top = (SCM_STACKITEM *) ctx.uc_mcontext.mc_special.bspstore; \
- scm_mark_locations (bot, top - bot); } while (0)
- #else
- # define SCM_MARK_BACKING_STORE()
---- libguile/init.c.orig Sun Sep 5 23:05:37 2004
-+++ libguile/init.c Wed Nov 24 07:59:48 2004
-@@ -188,6 +188,7 @@
- {
- scm_t_contregs *contregs = scm_must_malloc (sizeof (scm_t_contregs),
- "continuation");
-+ memset(contregs, 0, sizeof(*contregs));
- contregs->num_stack_items = 0;
- contregs->seq = 0;
- SCM_NEWSMOB (scm_rootcont, scm_tc16_continuation, contregs);
---- libguile/root.c.orig Sat Dec 7 22:41:32 2002
-+++ libguile/root.c Wed Nov 24 08:00:14 2004
-@@ -254,6 +254,7 @@
- scm_t_contregs *contregs = scm_must_malloc (sizeof (scm_t_contregs),
- "inferior root continuation");
-
-+ memset(contregs, 0, sizeof(*contregs));
- contregs->num_stack_items = 0;
- contregs->dynenv = SCM_EOL;
- contregs->base = stack_start;
diff --git a/lang/guile/files/patch-slib_slib.scm b/lang/guile/files/patch-slib_slib.scm
deleted file mode 100644
index ec1380da4e63..000000000000
--- a/lang/guile/files/patch-slib_slib.scm
+++ /dev/null
@@ -1,85 +0,0 @@
-Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date: 2005-10-04
-Initial Package Version: 1.6.7
-Upstream Status: Unknown
-Origin: http://article.gmane.org/gmane.comp.gnome.apps.gnucash.devel/13956
-Description: Fixes Guile with SLIB >= 3a2
-
-diff -Naur guile-1.6.7-orig/ice-9/slib.scm guile-1.6.7/ice-9/slib.scm
---- ice-9/slib.scm 2004-08-11 20:04:21.000000000 -0500
-+++ ice-9/slib.scm 2005-10-04 19:48:04.000000000 -0500
-@@ -388,3 +388,74 @@
-
- (define (make-exchanger obj)
- (lambda (rep) (let ((old obj)) (set! obj rep) old)))
-+
-+(define software-type
-+ (if (string<? (version) "1.6")
-+ (lambda () 'UNIX)
-+ (lambda () 'unix)))
-+
-+(define (user-vicinity)
-+ (case (software-type)
-+ ((VMS) "[.]")
-+ (else "")))
-+
-+(define vicinity:suffix?
-+ (let ((suffi
-+ (case (software-type)
-+ ((amiga) '(#\: #\/))
-+ ((macos thinkc) '(#\:))
-+ ((ms-dos windows atarist os/2) '(#\\ #\/))
-+ ((nosve) '(#\: #\.))
-+ ((unix coherent plan9) '(#\/))
-+ ((vms) '(#\: #\]))
-+ (else
-+ (warn "require.scm" 'unknown 'software-type (software-type))
-+ "/"))))
-+ (lambda (chr) (and (memv chr suffi) #t))))
-+
-+(define (pathname->vicinity pathname)
-+ (let loop ((i (- (string-length pathname) 1)))
-+ (cond ((negative? i) "")
-+ ((vicinity:suffix? (string-ref pathname i))
-+ (substring pathname 0 (+ i 1)))
-+ (else (loop (- i 1))))))
-+
-+(define (program-vicinity)
-+ (define clp (current-load-port))
-+ (if clp
-+ (pathname->vicinity (port-filename clp))
-+ (slib:error 'program-vicinity " called; use slib:load to load")))
-+
-+(define sub-vicinity
-+ (case (software-type)
-+ ((VMS) (lambda
-+ (vic name)
-+ (let ((l (string-length vic)))
-+ (if (or (zero? (string-length vic))
-+ (not (char=? #\] (string-ref vic (- l 1)))))
-+ (string-append vic "[" name "]")
-+ (string-append (substring vic 0 (- l 1))
-+ "." name "]")))))
-+ (else (let ((*vicinity-suffix*
-+ (case (software-type)
-+ ((NOSVE) ".")
-+ ((MACOS THINKC) ":")
-+ ((MS-DOS WINDOWS ATARIST OS/2) "\\")
-+ ((unix COHERENT PLAN9 AMIGA) "/"))))
-+ (lambda (vic name)
-+ (string-append vic name *vicinity-suffix*))))))
-+
-+(define with-load-pathname
-+ (let ((exchange
-+ (lambda (new)
-+ (let ((old program-vicinity))
-+ (set! program-vicinity new)
-+ old))))
-+ (lambda (path thunk)
-+ (define old #f)
-+ (define vic (pathname->vicinity path))
-+ (dynamic-wind
-+ (lambda () (set! old (exchange (lambda () vic))))
-+ thunk
-+ (lambda () (exchange old))))))
-+
diff --git a/lang/guile/pkg-plist b/lang/guile/pkg-plist
index 8a3ec64fa25b..88bc9ffdc4ff 100644
--- a/lang/guile/pkg-plist
+++ b/lang/guile/pkg-plist
@@ -169,6 +169,7 @@ share/aclocal/guile.m4
%%DATADIR%%/%%GUILE_VER%%/ice-9/safe.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/session.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/slib.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/slib-old.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/stack-catch.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/streams.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/string-fun.scm
diff --git a/lang/slib-guile/Makefile b/lang/slib-guile/Makefile
index 392f069c2ec7..ea2d37b84327 100644
--- a/lang/slib-guile/Makefile
+++ b/lang/slib-guile/Makefile
@@ -3,10 +3,11 @@
# Whom: Kimura Fuyuki <fuyuki@nigredo.org>
#
# $FreeBSD$
-#
+# $MCom: ports/lang/slib-guile/Makefile,v 1.3 2006/10/13 02:32:48 marcus Exp $
PORTNAME= slib
PORTVERSION= 3a3 # Keep this in sync with lang/slib
+PORTREVISION= 3
CATEGORIES= lang scheme
MASTER_SITES= # empty
PKGNAMESUFFIX= -guile
@@ -22,8 +23,9 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
NO_BUILD= yes
do-install:
- ${LN} -shf ${PREFIX}/share/slib ${LOCALBASE}/share/guile/slib
- ${LOCALBASE}/bin/guile -c \
- "(use-modules (ice-9 slib)) (require 'new-catalog)"
+ ${LN} -shf ${PREFIX}/share/slib ${LOCALBASE}/share/guile/1.6/slib
+ cd ${PREFIX}/share/guile/1.6/slib && \
+ ${LOCALBASE}/bin/guile -q -l guile.init -c \
+ "(require 'new-catalog)"
.include <bsd.port.mk>
diff --git a/lang/slib-guile/pkg-plist b/lang/slib-guile/pkg-plist
index 7cac1ba99c30..5a524c0b2ae5 100644
--- a/lang/slib-guile/pkg-plist
+++ b/lang/slib-guile/pkg-plist
@@ -1,4 +1,4 @@
-@exec ln -shf %D/share/slib %D/share/guile/slib
-@exec %D/bin/guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
-@unexec rm -f %D/share/guile/slib
-@unexec rm -f %D/share/guile/slibcat
+@exec ln -shf %D/share/slib %D/share/guile/1.6/slib
+@exec %D/bin/guile -q -l %%LOCALBASE%%/share/slib/guile.init -c "(require 'new-catalog)"
+@unexec rm -f %D/share/guile/1.6/slib
+@unexec rm -f %D/share/guile/1.6/slibcat
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 9fe705dc3232..bf3d4b708540 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger, based off kiesel's ximian-exchange port
#
# $FreeBSD$
-# $MCom: ports/mail/evolution-exchange/Makefile,v 1.59 2006/04/13 07:52:36 bland Exp $
+# $MCom: ports/mail/evolution-exchange/Makefile,v 1.70 2006/10/03 02:06:00 ahze Exp $
#
PORTNAME= evolution-exchange
-PORTVERSION= 2.6.3
+PORTVERSION= 2.8.1
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,7 +21,7 @@ RUN_DEPENDS= evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_OPENLDAP= yes
@@ -32,8 +32,8 @@ CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \
--with-static-ldap=no \
--disable-compile-warnings
-EVO_VERSION= 2.6
-PLIST_SUB= VERSION="2.6" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" \
+EVO_VERSION= 2.8
+PLIST_SUB= VERSION="2.8" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" \
OLDDOCSDIR="share/doc/ximian-connector"
.include <bsd.port.pre.mk>
diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo
index 9d08f2a0d288..10db56d5e30a 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-exchange-2.6.3.tar.bz2) = c98c41db650707fb394e3a8b0cef019b
-SHA256 (gnome2/evolution-exchange-2.6.3.tar.bz2) = b29761ee54f592bb88fe258e13ab189f824f00d0cf7805aa49cc1d446b24da26
-SIZE (gnome2/evolution-exchange-2.6.3.tar.bz2) = 985582
+MD5 (gnome2/evolution-exchange-2.8.1.tar.bz2) = f4dfdfed72eb705adefbaff0b575fb10
+SHA256 (gnome2/evolution-exchange-2.8.1.tar.bz2) = f891a7a0c3aae94942a70f646ba3f6386d55e7234b67bae62b2f03a4c0df06e0
+SIZE (gnome2/evolution-exchange-2.8.1.tar.bz2) = 1029601
diff --git a/mail/evolution-exchange/files/patch-configure b/mail/evolution-exchange/files/patch-configure
deleted file mode 100644
index f5d9a43d8c25..000000000000
--- a/mail/evolution-exchange/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig Thu Nov 10 17:41:52 2005
-+++ configure Thu Nov 10 17:43:52 2005
-@@ -24837,8 +24837,8 @@
- # libldap might depend on OpenSSL... We need to pull
- # in the dependency libs explicitly here since we're
- # not using libtool for the configure test.
-- if test -f $with_openldap/lib/libldap.la; then
-- LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
-+ if test -f $with_openldap/lib/libldap.so; then
-+ LDAP_LIBS="`. $with_openldap/lib/libldap.so; echo $dependency_libs` $LDAP_LIBS"
- fi
- else
- LDAP_LIBS="-llber $LDAP_LIBS"
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index 1746fd4c462b..d378103d0d0d 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -1,10 +1,68 @@
-bin/ximian-connector-setup-%%VERSION%%
+bin/exchange-connector-setup-%%VERSION%%
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
lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.urls
libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage_%%VERSION%%.server
libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage
+%%OLDDOCSDIR%%/E2kContext.html
+%%OLDDOCSDIR%%/E2kGlobalCatalog.html
+%%OLDDOCSDIR%%/E2kSecurityDescriptor.html
+%%OLDDOCSDIR%%/ch01.html
+%%OLDDOCSDIR%%/ch02.html
+%%OLDDOCSDIR%%/ch03.html
+%%OLDDOCSDIR%%/ch04.html
+%%OLDDOCSDIR%%/ch05.html
+%%OLDDOCSDIR%%/ch06.html
+%%OLDDOCSDIR%%/home.png
+%%OLDDOCSDIR%%/index.html
+%%OLDDOCSDIR%%/index.sgml
+%%OLDDOCSDIR%%/left.png
+%%OLDDOCSDIR%%/right.png
+%%OLDDOCSDIR%%/style.css
+%%OLDDOCSDIR%%/up.png
+%%OLDDOCSDIR%%/ximian-connector-E2kAutoconfig.html
+%%OLDDOCSDIR%%/ximian-connector-E2kContext-(private).html
+%%OLDDOCSDIR%%/ximian-connector-E2kOperation-(private).html
+%%OLDDOCSDIR%%/ximian-connector-E2kOperation.html
+%%OLDDOCSDIR%%/ximian-connector-E2kProperties.html
+%%OLDDOCSDIR%%/ximian-connector-E2kRestriction-(vaporware).html
+%%OLDDOCSDIR%%/ximian-connector-E2kResult-(private).html
+%%OLDDOCSDIR%%/ximian-connector-E2kSid.html
+%%OLDDOCSDIR%%/ximian-connector-E2kUserDialog.html
+%%OLDDOCSDIR%%/ximian-connector-MAPI.html
+%%OLDDOCSDIR%%/ximian-connector-autoconfig.html
+%%OLDDOCSDIR%%/ximian-connector-bug-private.html
+%%OLDDOCSDIR%%/ximian-connector-bug-xml.html
+%%OLDDOCSDIR%%/ximian-connector-calendar.html
+%%OLDDOCSDIR%%/ximian-connector-delegation.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-action.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-encoding-utils.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-freebusy.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-http-utils.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-kerberos.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-restriction.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-result.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-rule.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-uri.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-utils.html
+%%OLDDOCSDIR%%/ximian-connector-e2k-xml-utils.html
+%%OLDDOCSDIR%%/ximian-connector-favorites.html
+%%OLDDOCSDIR%%/ximian-connector-fba.html
+%%OLDDOCSDIR%%/ximian-connector-freebusy.html
+%%OLDDOCSDIR%%/ximian-connector-mail-threading.html
+%%OLDDOCSDIR%%/ximian-connector-mail.html
+%%OLDDOCSDIR%%/ximian-connector-ntlm.html
+%%OLDDOCSDIR%%/ximian-connector-oof.html
+%%OLDDOCSDIR%%/ximian-connector-other-users.html
+%%OLDDOCSDIR%%/ximian-connector-permissions.html
+%%OLDDOCSDIR%%/ximian-connector-test-utils.html
+%%OLDDOCSDIR%%/ximian-connector-xntlm-des.html
+%%OLDDOCSDIR%%/ximian-connector-xntlm-md4.html
+%%OLDDOCSDIR%%/ximian-connector-xntlm.html
+%%OLDDOCSDIR%%/ximian-connector.devhelp
+%%OLDDOCSDIR%%/ximian-connector.devhelp2
+%%OLDDOCSDIR%%/ximian-connnector-booking.html
share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-autoconfig-wizard.glade
share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-change-password.glade
share/gnome/evolution-exchange/%%VERSION%%/glade/exchange-delegates.glade
@@ -21,6 +79,7 @@ share/locale/ar/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/bg/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/bn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/bn_IN/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/cy/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -32,6 +91,7 @@ share/locale/en_CA/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/es/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/et/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/eu/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/fa/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/fi/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/fr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -42,17 +102,20 @@ share/locale/hu/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/id/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/ja/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/ka/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/ko/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/ku/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/lt/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/lv/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/mk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/ml/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/mn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/ms/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/nb/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/ne/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/nl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/nn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-share/locale/no/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/pa/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/pl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/pt/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -61,6 +124,7 @@ share/locale/ro/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/ru/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/rw/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/sk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/sl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/sq/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/sr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/sr@Latn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -74,18 +138,55 @@ share/locale/xh/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+@dirrm share/gnome/evolution-exchange/%%VERSION%%/ui
+@dirrm share/gnome/evolution-exchange/%%VERSION%%/images
+@dirrm share/gnome/evolution-exchange/%%VERSION%%/glade
+@dirrm share/gnome/evolution-exchange/%%VERSION%%
+@dirrm share/gnome/evolution-exchange
+@dirrm %%OLDDOCSDIR%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrm share/gnome/evolution-exchange/%%VERSION%%/ui
-@dirrm share/gnome/evolution-exchange/%%VERSION%%/images
-@dirrm share/gnome/evolution-exchange/%%VERSION%%/glade
-@dirrm share/gnome/evolution-exchange/%%VERSION%%
-@dirrm share/gnome/evolution-exchange
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index cf052741a8da..f0a9c56e0b18 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/mail/evolution/Makefile,v 1.98 2006/04/13 07:52:35 bland Exp $
+# $MCom: ports/mail/evolution/Makefile,v 1.119 2006/10/07 17:10:06 marcus Exp $
#
PORTNAME= evolution
-PORTVERSION= 2.6.3
+PORTVERSION= 2.8.1
PORTREVISION= 1
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -18,18 +18,18 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= An integrated mail, calendar and address book distributed suite
LIB_DEPENDS= nss3.1:${PORTSDIR}/security/nss
-RUN_DEPENDS= ${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
+RUN_DEPENDS= ${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver \
gtkhtml3 desktopfileutils
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
LDCONFIG_DIRS= %%PREFIX%%/lib/evolution/%%VERSION%%
CONFIGURE_ARGS= --enable-nss=yes \
--with-nss-includes=${LOCALBASE}/include/nss/nss \
@@ -43,13 +43,13 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= apps_evolution_addressbook-${EVO_VERSION}.schemas \
apps_evolution_calendar-${EVO_VERSION}.schemas \
- apps-evolution-mail-prompts-checkdefault-2.6.schemas \
+ apps-evolution-mail-prompts-checkdefault-${EVO_VERSION}.schemas \
apps_evolution_shell-${EVO_VERSION}.schemas \
evolution-mail-${EVO_VERSION}.schemas
-EVO_VERSION= 2.6
+EVO_VERSION= 2.8
PLIST_SUB= VERSION=${EVO_VERSION} \
- PORTVERSION=2.6
+ PORTVERSION=2.8
OPTIONS= PILOT "Enable Palm Pilot sync support" off \
LDAP "Enable LDAP support" on \
@@ -69,15 +69,10 @@ WITH_DBUS= yes
WITH_DBUS= yes
.endif
-.if exists(${X11BASE}/lib/libgstreamer-0.8.so)
+.if exists(${LOCALBASE}/lib/libgstreamer-0.8.so)
WITH_GSTREAMER= yes
.endif
-.if exists(${LOCALBASE}/libdata/pkgconfig/libnotify.pc) || \
- defined(WITH_NOTIFY)
-LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify
-.endif
-
.if defined(WITH_PILOT)
LIB_DEPENDS+= gpilotdconduit.2:${PORTSDIR}/palm/gnome-pilot
CONFIGURE_ARGS+= --with-pisock=${LOCALBASE} \
@@ -106,7 +101,7 @@ PLIST_SUB+= GSTREAMER="@comment "
.endif
.if defined(WITH_DBUS)
-LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
PLIST_SUB+= DBUS=""
.else
PLIST_SUB+= DBUS="@comment "
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index d1481bb7857f..079c041953c9 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.6.3.tar.bz2) = d7db71aaff2764f03083e6ce74c8ebde
-SHA256 (gnome2/evolution-2.6.3.tar.bz2) = a9bbea60b055ae1be3791101d69d7eef7ddf65d806c24e5a997999573325016d
-SIZE (gnome2/evolution-2.6.3.tar.bz2) = 12440797
+MD5 (gnome2/evolution-2.8.1.tar.bz2) = 6a08d1121bc126c4ed7035ab94a09871
+SHA256 (gnome2/evolution-2.8.1.tar.bz2) = 91d3e7c7fd961959fc01abcd7bb18747bfd8fe8b90bd91f03b4392b11f0e3a7b
+SIZE (gnome2/evolution-2.8.1.tar.bz2) = 12873039
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index f09892fc8150..c852e61792ea 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -11,7 +11,7 @@
+ SA_JUNK_PLUGIN=sa-junk-plugin
+ DL_LIB=''
+ SOFTOKN3_LIB='-lsoftokn3'
-+ HAL_REQUIREMENT=''
++ HAL_REQUIREMENT='hal'
+ ;;
*) os_win32=no
NO_UNDEFINED=''
diff --git a/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c b/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c
new file mode 100644
index 000000000000..a6440719257b
--- /dev/null
+++ b/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c
@@ -0,0 +1,34 @@
+--- widgets/e-timezone-dialog/e-timezone-dialog.c.orig Mon Jul 10 21:50:12 2006
++++ widgets/e-timezone-dialog/e-timezone-dialog.c Mon Jul 10 22:11:54 2006
+@@ -80,7 +80,9 @@ struct _ETimezoneDialogPrivate {
+
+ #ifndef G_OS_WIN32 /* Declared properly in time.h already */
+ extern char *tzname[2];
++#ifndef __BSD_VISIBLE
+ extern long timezone;
++#endif
+ extern int daylight;
+ #endif
+
+@@ -317,9 +319,20 @@ static const icaltimezone*
+ get_local_timezone()
+ {
+ icaltimezone *zone;
++ long offset;
++#ifdef __BSD_VISIBLE
++ time_t tt;
++ struct tm tm;
++#endif
+
+ tzset();
+- zone = icaltimezone_get_builtin_timezone_from_offset (-timezone, tzname[0]);
++#ifdef __BSD_VISIBLE
++ localtime_r (&tt, &tm);
++ offset = tm.tm_gmtoff;
++#else
++ offset = -timezone;
++#endif
++ zone = icaltimezone_get_builtin_timezone_from_offset (offset, tzname[0]);
+
+ return zone;
+ }
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 8a034a468bf8..7782d112f7e4 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,25 +1,5 @@
bin/evolution
bin/evolution-%%VERSION%%
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-popup.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-registry.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-text.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-toggle.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-tree.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-vbox.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-click-to-add.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-column-header.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-factory.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-item-factory.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table-item.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-table.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-tree-factory.h
-include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-tree.h
-include/evolution-%%VERSION%%/a11y/e-text/gal-a11y-e-text-factory.h
-include/evolution-%%VERSION%%/a11y/e-text/gal-a11y-e-text.h
-include/evolution-%%VERSION%%/a11y/gal-a11y-factory.h
-include/evolution-%%VERSION%%/a11y/gal-a11y-util.h
include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-config.h
include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-menu.h
include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-popup.h
@@ -130,6 +110,7 @@ include/evolution-%%VERSION%%/misc/e-dropdown-button.h
include/evolution-%%VERSION%%/misc/e-expander.h
include/evolution-%%VERSION%%/misc/e-gui-utils.h
include/evolution-%%VERSION%%/misc/e-hsv-utils.h
+include/evolution-%%VERSION%%/misc/e-icon-entry.h
include/evolution-%%VERSION%%/misc/e-image-chooser.h
include/evolution-%%VERSION%%/misc/e-info-label.h
include/evolution-%%VERSION%%/misc/e-map.h
@@ -164,6 +145,7 @@ include/evolution-%%VERSION%%/table/e-cell-checkbox.h
include/evolution-%%VERSION%%/table/e-cell-combo.h
include/evolution-%%VERSION%%/table/e-cell-date.h
include/evolution-%%VERSION%%/table/e-cell-float.h
+include/evolution-%%VERSION%%/table/e-cell-hbox.h
include/evolution-%%VERSION%%/table/e-cell-number.h
include/evolution-%%VERSION%%/table/e-cell-pixbuf.h
include/evolution-%%VERSION%%/table/e-cell-popup.h
@@ -424,7 +406,7 @@ libexec/evolution/%%VERSION%%/evolution-addressbook-clean
libexec/evolution/%%VERSION%%/evolution-addressbook-export
libexec/evolution/%%VERSION%%/evolution-alarm-notify
libexec/evolution/%%VERSION%%/killev
-share/gnome/applications/evolution.desktop
+share/gnome/applications/evolution-%%VERSION%%.desktop
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/evolution/%%VERSION%%/addresstypes.xml
share/gnome/evolution/%%VERSION%%/default/C/mail/local/Inbox
@@ -449,6 +431,7 @@ share/gnome/evolution/%%VERSION%%/errors/mail.error
share/gnome/evolution/%%VERSION%%/errors/org-gnome-default-mailer.error
share/gnome/evolution/%%VERSION%%/errors/org-gnome-exchange-operations.error
share/gnome/evolution/%%VERSION%%/errors/org-gnome-itip-formatter.error
+share/gnome/evolution/%%VERSION%%/errors/org-gnome-mail-retract-errors.xml
share/gnome/evolution/%%VERSION%%/errors/org-gnome-mailing-list-actions.error
share/gnome/evolution/%%VERSION%%/errors/org-gnome-proxy-errors.xml
share/gnome/evolution/%%VERSION%%/errors/org-gnome-proxy-login-errors.xml
@@ -485,6 +468,7 @@ share/gnome/evolution/%%VERSION%%/glade/event-page.glade
share/gnome/evolution/%%VERSION%%/glade/exchange-change-password.glade
share/gnome/evolution/%%VERSION%%/glade/exchange-delegates.glade
share/gnome/evolution/%%VERSION%%/glade/exchange-folder-tree.glade
+share/gnome/evolution/%%VERSION%%/glade/exchange-oof.glade
share/gnome/evolution/%%VERSION%%/glade/exchange-passwd-expiry.glade
share/gnome/evolution/%%VERSION%%/glade/exchange-permissions-dialog.glade
share/gnome/evolution/%%VERSION%%/glade/filter.glade
@@ -513,12 +497,15 @@ share/gnome/evolution/%%VERSION%%/glade/smime-ui.glade
share/gnome/evolution/%%VERSION%%/glade/task-details-page.glade
share/gnome/evolution/%%VERSION%%/glade/task-page.glade
share/gnome/evolution/%%VERSION%%/help/quickref/C/quickref.pdf
+share/gnome/evolution/%%VERSION%%/help/quickref/de/quickref.pdf
share/gnome/evolution/%%VERSION%%/images/about-box.png
share/gnome/evolution/%%VERSION%%/images/bcg.png
share/gnome/evolution/%%VERSION%%/images/evolution-contacts-mini.png
+share/gnome/evolution/%%VERSION%%/images/minus.png
share/gnome/evolution/%%VERSION%%/images/monkey-16.png
share/gnome/evolution/%%VERSION%%/images/offline.png
share/gnome/evolution/%%VERSION%%/images/online.png
+share/gnome/evolution/%%VERSION%%/images/plus.png
share/gnome/evolution/%%VERSION%%/images/query-free-busy.png
share/gnome/evolution/%%VERSION%%/images/world_map-960.png
share/gnome/evolution/%%VERSION%%/searchtypes.xml
@@ -552,6 +539,8 @@ share/gnome/evolution/%%VERSION%%/views/mail/By_Sender.galview
share/gnome/evolution/%%VERSION%%/views/mail/By_Status.galview
share/gnome/evolution/%%VERSION%%/views/mail/By_Subject.galview
share/gnome/evolution/%%VERSION%%/views/mail/Messages.galview
+share/gnome/evolution/%%VERSION%%/views/mail/Wide_View_Normal.galview
+share/gnome/evolution/%%VERSION%%/views/mail/Wide_View_Sent.galview
share/gnome/evolution/%%VERSION%%/views/mail/galview.xml
share/gnome/evolution/%%VERSION%%/views/memos/Memos.galview
share/gnome/evolution/%%VERSION%%/views/memos/galview.xml
@@ -570,7 +559,6 @@ share/gnome/evolution/%%VERSION%%/weather/category_weather_tstorm_16.png
%%PILOT:%%share/gnome/gnome-pilot/conduits/e-calendar-%%VERSION%%.conduit
%%PILOT:%%share/gnome/gnome-pilot/conduits/e-todo-%%VERSION%%.conduit
share/gnome/help/evolution-%%VERSION%%/C/evolution-%%VERSION%%.xml
-share/gnome/help/evolution-%%VERSION%%/C/figures/Screenshot-Evolution-mailer-Preferences.png
share/gnome/help/evolution-%%VERSION%%/C/figures/Screenshot-Free-Busy.png
share/gnome/help/evolution-%%VERSION%%/C/figures/calendar.png
share/gnome/help/evolution-%%VERSION%%/C/figures/config-cal.png
@@ -626,8 +614,8 @@ share/gnome/idl/evolution-%%VERSION%%/Evolution-Mail.idl
share/gnome/idl/evolution-%%VERSION%%/Evolution-Shell.idl
share/gnome/idl/evolution-%%VERSION%%/Evolution.idl
share/gnome/idl/evolution-%%VERSION%%/evolution-calendar.idl
-share/gnome/mime-info/evolution.keys
-share/gnome/mime-info/evolution.mime
+share/gnome/mime-info/evolution-%%VERSION%%.keys
+share/gnome/mime-info/evolution-%%VERSION%%.mime
share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf
share/gnome/pixmaps/evolution-%%VERSION%%.png
share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -636,7 +624,7 @@ share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/br/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/bn_IN/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/bs/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -671,13 +659,15 @@ share/locale/ku/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/lt/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/lv/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/mk/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/ml/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/mn/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/mr/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/ms/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/nb/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/ne/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/nl/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/nn/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/no/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/pa/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/pl/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/pt/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -702,20 +692,6 @@ share/locale/xh/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
@dirrm share/gnome/omf/evolution
@dirrm share/gnome/idl/evolution-%%VERSION%%
@dirrm share/gnome/help/evolution-%%VERSION%%/C/figures
@@ -730,6 +706,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
@dirrm share/gnome/evolution/%%VERSION%%/views
@dirrm share/gnome/evolution/%%VERSION%%/ui
@dirrm share/gnome/evolution/%%VERSION%%/images
+@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/de
@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/C
@dirrm share/gnome/evolution/%%VERSION%%/help/quickref
@dirrm share/gnome/evolution/%%VERSION%%/help
@@ -790,8 +767,59 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
@dirrm include/evolution-%%VERSION%%/addressbook/gui/widgets
@dirrm include/evolution-%%VERSION%%/addressbook/gui
@dirrm include/evolution-%%VERSION%%/addressbook
-@dirrm include/evolution-%%VERSION%%/a11y/e-text
-@dirrm include/evolution-%%VERSION%%/a11y/e-table
-@dirrm include/evolution-%%VERSION%%/a11y
@dirrm include/evolution-%%VERSION%%
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/en_AU/LC_MESSAGES
+@dirrmtry share/locale/en_AU
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 9b27981617be..061b9d855ef9 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/math/gcalctool/Makefile,v 1.9 2006/03/13 23:35:10 mezz Exp $
+# $MCom: ports/math/gcalctool/Makefile,v 1.55 2006/09/04 15:14:28 ahze Exp $
#
PORTNAME= gcalctool
-PORTVERSION= 5.7.32
+PORTVERSION= 5.8.24
PORTEPOCH= 2
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -20,11 +20,11 @@ COMMENT= A GNOME 2 calculator tool based on the old calctool for OpenWindows
USE_BZIP2= yes
USE_BISON= yes
INSTALLS_OMF= yes
-USE_X_PREFIX= yes
+USE_GETTEXT= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
-USE_GETTEXT= yes
+USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo
index 5502d6b1de35..93e7b723a204 100644
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gcalctool-5.7.32.tar.bz2) = c0712ee651c74104cdcc3205f4c57881
-SHA256 (gnome2/gcalctool-5.7.32.tar.bz2) = e5e396d15006b7c1efa8c514048abfb8f1be608ab11cd70162f37da73e22a8dd
-SIZE (gnome2/gcalctool-5.7.32.tar.bz2) = 995525
+MD5 (gnome2/gcalctool-5.8.24.tar.bz2) = 953429a0f5d9ee73a47548289d02cb26
+SHA256 (gnome2/gcalctool-5.8.24.tar.bz2) = d607c2b2fc8497de17cae9980003feeae2b895e907bdf29083dfd47b5a371c53
+SIZE (gnome2/gcalctool-5.8.24.tar.bz2) = 1137818
diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist
index 9aef3d146d9d..c023fe8e4d63 100644
--- a/math/gcalctool/pkg-plist
+++ b/math/gcalctool/pkg-plist
@@ -25,13 +25,11 @@ share/gnome/help/gcalctool/es/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/es/figures/gcalctool_menu_symbol.png
share/gnome/help/gcalctool/es/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/es/gcalctool.xml
-share/gnome/help/gcalctool/es/legal.xml
share/gnome/help/gcalctool/fr/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/fr/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/fr/figures/gcalctool_menu_symbol.png
share/gnome/help/gcalctool/fr/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/fr/gcalctool.xml
-share/gnome/help/gcalctool/fr/legal.xml
share/gnome/help/gcalctool/it/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/it/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/it/figures/gcalctool_menu_symbol.png
@@ -55,7 +53,6 @@ share/gnome/help/gcalctool/sv/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/sv/figures/gcalctool_menu_symbol.png
share/gnome/help/gcalctool/sv/figures/gcalctool_scientific_window.png
share/gnome/help/gcalctool/sv/gcalctool.xml
-share/gnome/help/gcalctool/sv/legal.xml
share/gnome/help/gcalctool/zh_CN/figures/gcalctool_basic_window.png
share/gnome/help/gcalctool/zh_CN/figures/gcalctool_financial_window.png
share/gnome/help/gcalctool/zh_CN/figures/gcalctool_menu_symbol.png
@@ -91,12 +88,15 @@ share/locale/ar/LC_MESSAGES/gcalctool.mo
share/locale/az/LC_MESSAGES/gcalctool.mo
share/locale/be/LC_MESSAGES/gcalctool.mo
share/locale/bg/LC_MESSAGES/gcalctool.mo
+share/locale/bn/LC_MESSAGES/gcalctool.mo
+share/locale/bn_IN/LC_MESSAGES/gcalctool.mo
share/locale/bs/LC_MESSAGES/gcalctool.mo
share/locale/ca/LC_MESSAGES/gcalctool.mo
share/locale/cs/LC_MESSAGES/gcalctool.mo
share/locale/cy/LC_MESSAGES/gcalctool.mo
share/locale/da/LC_MESSAGES/gcalctool.mo
share/locale/de/LC_MESSAGES/gcalctool.mo
+share/locale/dz/LC_MESSAGES/gcalctool.mo
share/locale/el/LC_MESSAGES/gcalctool.mo
share/locale/en_CA/LC_MESSAGES/gcalctool.mo
share/locale/en_GB/LC_MESSAGES/gcalctool.mo
@@ -118,15 +118,17 @@ share/locale/id/LC_MESSAGES/gcalctool.mo
share/locale/it/LC_MESSAGES/gcalctool.mo
share/locale/ja/LC_MESSAGES/gcalctool.mo
share/locale/ko/LC_MESSAGES/gcalctool.mo
+share/locale/ku/LC_MESSAGES/gcalctool.mo
share/locale/lt/LC_MESSAGES/gcalctool.mo
+share/locale/lv/LC_MESSAGES/gcalctool.mo
share/locale/mk/LC_MESSAGES/gcalctool.mo
share/locale/ml/LC_MESSAGES/gcalctool.mo
share/locale/mn/LC_MESSAGES/gcalctool.mo
+share/locale/mr/LC_MESSAGES/gcalctool.mo
share/locale/ms/LC_MESSAGES/gcalctool.mo
share/locale/nb/LC_MESSAGES/gcalctool.mo
share/locale/ne/LC_MESSAGES/gcalctool.mo
share/locale/nl/LC_MESSAGES/gcalctool.mo
-share/locale/no/LC_MESSAGES/gcalctool.mo
share/locale/or/LC_MESSAGES/gcalctool.mo
share/locale/pa/LC_MESSAGES/gcalctool.mo
share/locale/pl/LC_MESSAGES/gcalctool.mo
@@ -152,16 +154,6 @@ share/locale/xh/LC_MESSAGES/gcalctool.mo
share/locale/zh_CN/LC_MESSAGES/gcalctool.mo
share/locale/zh_HK/LC_MESSAGES/gcalctool.mo
share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/en_US/LC_MESSAGES
-@dirrmtry share/locale/en_US
@dirrm share/gnome/omf/gcalctool
@dirrm share/gnome/help/gcalctool/zh_TW/figures
@dirrm share/gnome/help/gcalctool/zh_TW
@@ -188,3 +180,57 @@ share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
@dirrm share/gnome/help/gcalctool/C/figures
@dirrm share/gnome/help/gcalctool/C
@dirrm share/gnome/help/gcalctool
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index 7410d2b85eca..80dd08cb2a32 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.74 2006/04/13 07:52:36 bland Exp $
+# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.88 2006/09/12 07:38:48 marcus Exp $
#
PORTNAME= gnome-icon-theme
-PORTVERSION= 2.14.2
+PORTVERSION= 2.16.0.1
+PORTREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,11 +17,11 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A collection of icons for the GNOME 2 desktop
-BUILD_DEPENDS= ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
-RUN_DEPENDS= ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+BUILD_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
+ icon-naming-utils>=0.8.0:${PORTSDIR}/x11-themes/icon-naming-utils
+RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack intlhack gnometarget gtk20
@@ -29,8 +30,7 @@ CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
post-patch:
- @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \
- s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+ @${REINPLACE_CMD} -e 's|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|@mkdir_p@|mkdir -p|g' \
${WRKSRC}/po/Makefile.in.in
diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo
index a05f8da0d1f1..f609c8ca6732 100644
--- a/misc/gnome-icon-theme/distinfo
+++ b/misc/gnome-icon-theme/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-icon-theme-2.14.2.tar.bz2) = 6f1d33a297bd27e0e9f4c1a5fa956166
-SHA256 (gnome2/gnome-icon-theme-2.14.2.tar.bz2) = 7cd3124dc0f462617f282bb9cac8f6d4114c06ab552e2b26c4f3d818f5eb5379
-SIZE (gnome2/gnome-icon-theme-2.14.2.tar.bz2) = 2947288
+MD5 (gnome2/gnome-icon-theme-2.16.0.1.tar.bz2) = 79acaaccddd5c3ffceb92c613a3e9729
+SHA256 (gnome2/gnome-icon-theme-2.16.0.1.tar.bz2) = 25a5f04372d102b925cbe104e8d201382b23f8dd561274c05c6b833f22d1fec7
+SIZE (gnome2/gnome-icon-theme-2.16.0.1.tar.bz2) = 2423933
diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist
index 681f58a2b30f..b5926abbde9d 100644
--- a/misc/gnome-icon-theme/pkg-plist
+++ b/misc/gnome-icon-theme/pkg-plist
@@ -1,17 +1,288 @@
libdata/pkgconfig/gnome-icon-theme.pc
-share/icons/gnome/12x12/emblems/emblem-symbolic-link.png
-share/icons/gnome/12x12/filesystems/gnome-fs-directory-accept.png
-share/icons/gnome/12x12/filesystems/gnome-fs-directory-visiting.png
-share/icons/gnome/12x12/filesystems/gnome-fs-directory.png
+share/icons/gnome/16x16/actions/add.png
+share/icons/gnome/16x16/actions/application-exit.png
+share/icons/gnome/16x16/actions/appointment-new.png
+share/icons/gnome/16x16/actions/appointment.png
+share/icons/gnome/16x16/actions/back.png
+share/icons/gnome/16x16/actions/bottom.png
+share/icons/gnome/16x16/actions/centrejust.png
+share/icons/gnome/16x16/actions/document-new.png
+share/icons/gnome/16x16/actions/document-print-preview.png
+share/icons/gnome/16x16/actions/document-print.png
+share/icons/gnome/16x16/actions/document-save-as.png
+share/icons/gnome/16x16/actions/document-save.png
+share/icons/gnome/16x16/actions/down.png
+share/icons/gnome/16x16/actions/edit-copy.png
+share/icons/gnome/16x16/actions/edit-cut.png
+share/icons/gnome/16x16/actions/edit-delete.png
+share/icons/gnome/16x16/actions/edit-find-replace.png
+share/icons/gnome/16x16/actions/edit-find.png
+share/icons/gnome/16x16/actions/edit-paste.png
+share/icons/gnome/16x16/actions/edit-redo.png
+share/icons/gnome/16x16/actions/edit-undo.png
+share/icons/gnome/16x16/actions/editcopy.png
+share/icons/gnome/16x16/actions/editcut.png
+share/icons/gnome/16x16/actions/editdelete.png
+share/icons/gnome/16x16/actions/editpaste.png
+share/icons/gnome/16x16/actions/exit.png
+share/icons/gnome/16x16/actions/filefind.png
+share/icons/gnome/16x16/actions/filenew.png
+share/icons/gnome/16x16/actions/fileprint.png
+share/icons/gnome/16x16/actions/filequickprint.png
+share/icons/gnome/16x16/actions/filesave.png
+share/icons/gnome/16x16/actions/filesaveas.png
+share/icons/gnome/16x16/actions/find.png
+share/icons/gnome/16x16/actions/finish.png
+share/icons/gnome/16x16/actions/folder-new.png
+share/icons/gnome/16x16/actions/folder_new.png
+share/icons/gnome/16x16/actions/format-indent-less.png
+share/icons/gnome/16x16/actions/format-indent-more.png
+share/icons/gnome/16x16/actions/format-justify-center.png
+share/icons/gnome/16x16/actions/format-justify-fill.png
+share/icons/gnome/16x16/actions/format-justify-left.png
+share/icons/gnome/16x16/actions/format-justify-right.png
+share/icons/gnome/16x16/actions/format-text-bold.png
+share/icons/gnome/16x16/actions/format-text-italic.png
+share/icons/gnome/16x16/actions/format-text-strikethrough.png
+share/icons/gnome/16x16/actions/format-text-underline.png
+share/icons/gnome/16x16/actions/forward.png
+share/icons/gnome/16x16/actions/gnome-lockscreen.png
+share/icons/gnome/16x16/actions/gnome-run.png
+share/icons/gnome/16x16/actions/gnome-stock-mail-fwd.png
+share/icons/gnome/16x16/actions/gnome-stock-mail-new.png
+share/icons/gnome/16x16/actions/gnome-stock-mail-rpl.png
+share/icons/gnome/16x16/actions/gnome-stock-text-indent.png
+share/icons/gnome/16x16/actions/gnome-stock-text-unindent.png
+share/icons/gnome/16x16/actions/go-bottom.png
+share/icons/gnome/16x16/actions/go-down.png
+share/icons/gnome/16x16/actions/go-first.png
+share/icons/gnome/16x16/actions/go-home.png
+share/icons/gnome/16x16/actions/go-last.png
+share/icons/gnome/16x16/actions/go-next.png
+share/icons/gnome/16x16/actions/go-previous.png
+share/icons/gnome/16x16/actions/go-top.png
+share/icons/gnome/16x16/actions/go-up.png
+share/icons/gnome/16x16/actions/gohome.png
+share/icons/gnome/16x16/actions/gtk-add.png
+share/icons/gnome/16x16/actions/gtk-bold.png
+share/icons/gnome/16x16/actions/gtk-close.png
+share/icons/gnome/16x16/actions/gtk-copy.png
+share/icons/gnome/16x16/actions/gtk-cut.png
+share/icons/gnome/16x16/actions/gtk-delete.png
+share/icons/gnome/16x16/actions/gtk-edit.png
+share/icons/gnome/16x16/actions/gtk-find-and-replace.png
+share/icons/gnome/16x16/actions/gtk-find.png
+share/icons/gnome/16x16/actions/gtk-fullscreen.png
+share/icons/gnome/16x16/actions/gtk-go-back-ltr.png
+share/icons/gnome/16x16/actions/gtk-go-back-rtl.png
+share/icons/gnome/16x16/actions/gtk-go-down.png
+share/icons/gnome/16x16/actions/gtk-go-forward-ltr.png
+share/icons/gnome/16x16/actions/gtk-go-forward-rtl.png
+share/icons/gnome/16x16/actions/gtk-go-up.png
+share/icons/gnome/16x16/actions/gtk-goto-bottom.png
+share/icons/gnome/16x16/actions/gtk-goto-first-ltr.png
+share/icons/gnome/16x16/actions/gtk-goto-first-rtl.png
+share/icons/gnome/16x16/actions/gtk-goto-last-ltr.png
+share/icons/gnome/16x16/actions/gtk-goto-last-rtl.png
+share/icons/gnome/16x16/actions/gtk-goto-top.png
+share/icons/gnome/16x16/actions/gtk-home.png
+share/icons/gnome/16x16/actions/gtk-indent.png
+share/icons/gnome/16x16/actions/gtk-italic.png
+share/icons/gnome/16x16/actions/gtk-justify-center.png
+share/icons/gnome/16x16/actions/gtk-justify-fill.png
+share/icons/gnome/16x16/actions/gtk-justify-left.png
+share/icons/gnome/16x16/actions/gtk-justify-right.png
+share/icons/gnome/16x16/actions/gtk-leave-fullscreen.png
+share/icons/gnome/16x16/actions/gtk-media-forward-ltr.png
+share/icons/gnome/16x16/actions/gtk-media-forward-rtl.png
+share/icons/gnome/16x16/actions/gtk-media-next-ltr.png
+share/icons/gnome/16x16/actions/gtk-media-next-rtl.png
+share/icons/gnome/16x16/actions/gtk-media-pause.png
+share/icons/gnome/16x16/actions/gtk-media-play-ltr.png
+share/icons/gnome/16x16/actions/gtk-media-previous-ltr.png
+share/icons/gnome/16x16/actions/gtk-media-previous-rtl.png
+share/icons/gnome/16x16/actions/gtk-media-record.png
+share/icons/gnome/16x16/actions/gtk-media-rewind-ltr.png
+share/icons/gnome/16x16/actions/gtk-media-rewind-rtl.png
+share/icons/gnome/16x16/actions/gtk-media-stop.png
+share/icons/gnome/16x16/actions/gtk-new.png
+share/icons/gnome/16x16/actions/gtk-paste.png
+share/icons/gnome/16x16/actions/gtk-print-preview.png
+share/icons/gnome/16x16/actions/gtk-print.png
+share/icons/gnome/16x16/actions/gtk-quit.png
+share/icons/gnome/16x16/actions/gtk-redo-ltr.png
+share/icons/gnome/16x16/actions/gtk-refresh.png
+share/icons/gnome/16x16/actions/gtk-remove.png
+share/icons/gnome/16x16/actions/gtk-save-as.png
+share/icons/gnome/16x16/actions/gtk-save.png
+share/icons/gnome/16x16/actions/gtk-stop.png
+share/icons/gnome/16x16/actions/gtk-strikethrough.png
+share/icons/gnome/16x16/actions/gtk-underline.png
+share/icons/gnome/16x16/actions/gtk-undo-ltr.png
+share/icons/gnome/16x16/actions/gtk-unindent.png
+share/icons/gnome/16x16/actions/gtk-zoom-100.png
+share/icons/gnome/16x16/actions/gtk-zoom-fit.png
+share/icons/gnome/16x16/actions/gtk-zoom-in.png
+share/icons/gnome/16x16/actions/gtk-zoom-out.png
+share/icons/gnome/16x16/actions/kfm_home.png
+share/icons/gnome/16x16/actions/leftjust.png
+share/icons/gnome/16x16/actions/list-add.png
+share/icons/gnome/16x16/actions/list-remove.png
+share/icons/gnome/16x16/actions/lock.png
+share/icons/gnome/16x16/actions/mail-forward.png
+share/icons/gnome/16x16/actions/mail-mark-junk.png
+share/icons/gnome/16x16/actions/mail-mark-not-junk.png
+share/icons/gnome/16x16/actions/mail-message-new.png
+share/icons/gnome/16x16/actions/mail-reply-all.png
+share/icons/gnome/16x16/actions/mail-reply-sender.png
+share/icons/gnome/16x16/actions/mail-send-receive.png
+share/icons/gnome/16x16/actions/mail_forward.png
+share/icons/gnome/16x16/actions/mail_new.png
+share/icons/gnome/16x16/actions/mail_reply.png
+share/icons/gnome/16x16/actions/mail_replyall.png
+share/icons/gnome/16x16/actions/mail_spam.png
+share/icons/gnome/16x16/actions/media-playback-pause.png
+share/icons/gnome/16x16/actions/media-playback-start.png
+share/icons/gnome/16x16/actions/media-playback-stop.png
+share/icons/gnome/16x16/actions/media-record.png
+share/icons/gnome/16x16/actions/media-seek-backward.png
+share/icons/gnome/16x16/actions/media-seek-forward.png
+share/icons/gnome/16x16/actions/media-skip-backward.png
+share/icons/gnome/16x16/actions/media-skip-forward.png
+share/icons/gnome/16x16/actions/next.png
+share/icons/gnome/16x16/actions/player_end.png
+share/icons/gnome/16x16/actions/player_fwd.png
+share/icons/gnome/16x16/actions/player_pause.png
+share/icons/gnome/16x16/actions/player_play.png
+share/icons/gnome/16x16/actions/player_record.png
+share/icons/gnome/16x16/actions/player_rew.png
+share/icons/gnome/16x16/actions/player_start.png
+share/icons/gnome/16x16/actions/player_stop.png
+share/icons/gnome/16x16/actions/previous.png
+share/icons/gnome/16x16/actions/process-stop.png
+share/icons/gnome/16x16/actions/redhat-home.png
+share/icons/gnome/16x16/actions/redo.png
+share/icons/gnome/16x16/actions/reload.png
+share/icons/gnome/16x16/actions/reload3.png
+share/icons/gnome/16x16/actions/reload_all_tabs.png
+share/icons/gnome/16x16/actions/reload_page.png
+share/icons/gnome/16x16/actions/remove.png
+share/icons/gnome/16x16/actions/rightjust.png
+share/icons/gnome/16x16/actions/start.png
+share/icons/gnome/16x16/actions/stock_bottom.png
+share/icons/gnome/16x16/actions/stock_close.png
+share/icons/gnome/16x16/actions/stock_copy.png
+share/icons/gnome/16x16/actions/stock_cut.png
+share/icons/gnome/16x16/actions/stock_delete.png
+share/icons/gnome/16x16/actions/stock_down.png
+share/icons/gnome/16x16/actions/stock_first.png
+share/icons/gnome/16x16/actions/stock_fullscreen.png
+share/icons/gnome/16x16/actions/stock_home.png
+share/icons/gnome/16x16/actions/stock_last.png
+share/icons/gnome/16x16/actions/stock_leave-fullscreen.png
+share/icons/gnome/16x16/actions/stock_left.png
+share/icons/gnome/16x16/actions/stock_mail-compose.png
+share/icons/gnome/16x16/actions/stock_mail-forward.png
+share/icons/gnome/16x16/actions/stock_mail-reply-to-all.png
+share/icons/gnome/16x16/actions/stock_mail-reply.png
+share/icons/gnome/16x16/actions/stock_mail-send-receive.png
+share/icons/gnome/16x16/actions/stock_media-fwd.png
+share/icons/gnome/16x16/actions/stock_media-next.png
+share/icons/gnome/16x16/actions/stock_media-pause.png
+share/icons/gnome/16x16/actions/stock_media-play.png
+share/icons/gnome/16x16/actions/stock_media-prev.png
+share/icons/gnome/16x16/actions/stock_media-rec.png
+share/icons/gnome/16x16/actions/stock_media-rew.png
+share/icons/gnome/16x16/actions/stock_media-stop.png
+share/icons/gnome/16x16/actions/stock_new-appointment.png
+share/icons/gnome/16x16/actions/stock_new-dir.png
+share/icons/gnome/16x16/actions/stock_new-tab.png
+share/icons/gnome/16x16/actions/stock_new-text.png
+share/icons/gnome/16x16/actions/stock_new-window.png
+share/icons/gnome/16x16/actions/stock_not-spam.png
+share/icons/gnome/16x16/actions/stock_paste.png
+share/icons/gnome/16x16/actions/stock_print-preview.png
+share/icons/gnome/16x16/actions/stock_print.png
+share/icons/gnome/16x16/actions/stock_redo.png
+share/icons/gnome/16x16/actions/stock_refresh.png
+share/icons/gnome/16x16/actions/stock_right.png
+share/icons/gnome/16x16/actions/stock_save-as.png
+share/icons/gnome/16x16/actions/stock_save.png
+share/icons/gnome/16x16/actions/stock_search-and-replace.png
+share/icons/gnome/16x16/actions/stock_search.png
+share/icons/gnome/16x16/actions/stock_spam.png
+share/icons/gnome/16x16/actions/stock_stop.png
+share/icons/gnome/16x16/actions/stock_text-strikethrough.png
+share/icons/gnome/16x16/actions/stock_text_bold.png
+share/icons/gnome/16x16/actions/stock_text_center.png
+share/icons/gnome/16x16/actions/stock_text_indent.png
+share/icons/gnome/16x16/actions/stock_text_italic.png
+share/icons/gnome/16x16/actions/stock_text_justify.png
+share/icons/gnome/16x16/actions/stock_text_left.png
+share/icons/gnome/16x16/actions/stock_text_right.png
+share/icons/gnome/16x16/actions/stock_text_underlined.png
+share/icons/gnome/16x16/actions/stock_text_unindent.png
+share/icons/gnome/16x16/actions/stock_top.png
+share/icons/gnome/16x16/actions/stock_undo.png
+share/icons/gnome/16x16/actions/stock_up.png
+share/icons/gnome/16x16/actions/stock_zoom-1.png
+share/icons/gnome/16x16/actions/stock_zoom-in.png
+share/icons/gnome/16x16/actions/stock_zoom-out.png
+share/icons/gnome/16x16/actions/stock_zoom-page.png
+share/icons/gnome/16x16/actions/stop.png
+share/icons/gnome/16x16/actions/system-lock-screen.png
+share/icons/gnome/16x16/actions/system-run.png
+share/icons/gnome/16x16/actions/tab-new.png
+share/icons/gnome/16x16/actions/tab_new.png
+share/icons/gnome/16x16/actions/text_bold.png
+share/icons/gnome/16x16/actions/text_italic.png
+share/icons/gnome/16x16/actions/text_strike.png
+share/icons/gnome/16x16/actions/text_under.png
+share/icons/gnome/16x16/actions/top.png
+share/icons/gnome/16x16/actions/undo.png
+share/icons/gnome/16x16/actions/up.png
+share/icons/gnome/16x16/actions/view-fullscreen.png
+share/icons/gnome/16x16/actions/view-refresh.png
+share/icons/gnome/16x16/actions/view-restore.png
+share/icons/gnome/16x16/actions/window-close.png
+share/icons/gnome/16x16/actions/window-new.png
+share/icons/gnome/16x16/actions/window_fullscreen.png
+share/icons/gnome/16x16/actions/window_new.png
+share/icons/gnome/16x16/actions/window_nofullscreen.png
+share/icons/gnome/16x16/actions/xfce-system-exit.png
+share/icons/gnome/16x16/actions/xfce-system-lock.png
+share/icons/gnome/16x16/actions/zoom-best-fit.png
+share/icons/gnome/16x16/actions/zoom-in.png
+share/icons/gnome/16x16/actions/zoom-original.png
+share/icons/gnome/16x16/actions/zoom-out.png
+share/icons/gnome/16x16/animations/gnome-spinner-rest.png
+share/icons/gnome/16x16/animations/gnome-spinner.png
+share/icons/gnome/16x16/animations/process-idle.png
+share/icons/gnome/16x16/animations/process-working.png
+share/icons/gnome/16x16/apps/access.png
+share/icons/gnome/16x16/apps/accessibility-directory.png
+share/icons/gnome/16x16/apps/accessories-dictionary.png
+share/icons/gnome/16x16/apps/accessories-text-editor.png
+share/icons/gnome/16x16/apps/applets-screenshooter.png
+share/icons/gnome/16x16/apps/arts.png
+share/icons/gnome/16x16/apps/background.png
+share/icons/gnome/16x16/apps/boot.png
share/icons/gnome/16x16/apps/config-language.png
share/icons/gnome/16x16/apps/evolution.png
-share/icons/gnome/16x16/apps/gnome-devel.png
-share/icons/gnome/16x16/apps/gnome-globe.png
+share/icons/gnome/16x16/apps/file-manager.png
share/icons/gnome/16x16/apps/gnome-help.png
share/icons/gnome/16x16/apps/gnome-logout.png
-share/icons/gnome/16x16/apps/gnome-run.png
-share/icons/gnome/16x16/apps/gnome-settings.png
+share/icons/gnome/16x16/apps/gnome-mixer.png
+share/icons/gnome/16x16/apps/gnome-monitor.png
+share/icons/gnome/16x16/apps/gnome-session.png
+share/icons/gnome/16x16/apps/gnome-settings-accessibility-technologies.png
+share/icons/gnome/16x16/apps/gnome-settings-background.png
+share/icons/gnome/16x16/apps/gnome-shutdown.png
+share/icons/gnome/16x16/apps/gnome-terminal.png
share/icons/gnome/16x16/apps/gnome-window-manager.png
+share/icons/gnome/16x16/apps/gtk-help.png
+share/icons/gnome/16x16/apps/help-browser.png
+share/icons/gnome/16x16/apps/help.png
share/icons/gnome/16x16/apps/im-aim.png
share/icons/gnome/16x16/apps/im-icq.png
share/icons/gnome/16x16/apps/im-jabber.png
@@ -20,13 +291,104 @@ share/icons/gnome/16x16/apps/im-nov.png
share/icons/gnome/16x16/apps/im-yahoo.png
share/icons/gnome/16x16/apps/im.png
share/icons/gnome/16x16/apps/image-viewer.png
-share/icons/gnome/16x16/apps/panel-notification-area.png
-share/icons/gnome/16x16/apps/panel-window-list.png
-share/icons/gnome/16x16/apps/panel-window-menu.png
+share/icons/gnome/16x16/apps/kcmsound.png
+share/icons/gnome/16x16/apps/kedit.png
+share/icons/gnome/16x16/apps/kfm.png
+share/icons/gnome/16x16/apps/khelpcenter.png
+share/icons/gnome/16x16/apps/konsole.png
+share/icons/gnome/16x16/apps/kscreensaver.png
+share/icons/gnome/16x16/apps/ksysguard.png
+share/icons/gnome/16x16/apps/locale.png
+share/icons/gnome/16x16/apps/logviewer.png
+share/icons/gnome/16x16/apps/multimedia-volume-control.png
+share/icons/gnome/16x16/apps/multimedia.png
+share/icons/gnome/16x16/apps/openterm.png
+share/icons/gnome/16x16/apps/preferences-desktop-accessibility.png
+share/icons/gnome/16x16/apps/preferences-desktop-locale.png
+share/icons/gnome/16x16/apps/preferences-desktop-screensaver.png
+share/icons/gnome/16x16/apps/preferences-desktop-wallpaper.png
+share/icons/gnome/16x16/apps/redhat-filemanager.png
+share/icons/gnome/16x16/apps/screensaver.png
+share/icons/gnome/16x16/apps/stock_help.png
+share/icons/gnome/16x16/apps/susehelpcenter.png
+share/icons/gnome/16x16/apps/system-file-manager.png
+share/icons/gnome/16x16/apps/terminal.png
share/icons/gnome/16x16/apps/text-editor.png
+share/icons/gnome/16x16/apps/utilities-system-monitor.png
+share/icons/gnome/16x16/apps/utilities-terminal.png
share/icons/gnome/16x16/apps/volume-knob.png
+share/icons/gnome/16x16/apps/wallpaper.png
+share/icons/gnome/16x16/apps/web-browser.png
+share/icons/gnome/16x16/apps/xfce-filemanager.png
+share/icons/gnome/16x16/apps/xfce-terminal.png
+share/icons/gnome/16x16/apps/xfce4-backdrop.png
+share/icons/gnome/16x16/apps/xfce4-mixer.png
+share/icons/gnome/16x16/apps/xscreensaver.png
+share/icons/gnome/16x16/categories/applications-accessories.png
+share/icons/gnome/16x16/categories/applications-development.png
+share/icons/gnome/16x16/categories/applications-games.png
+share/icons/gnome/16x16/categories/applications-graphics.png
+share/icons/gnome/16x16/categories/applications-internet.png
+share/icons/gnome/16x16/categories/applications-multimedia.png
+share/icons/gnome/16x16/categories/gnome-control-center.png
+share/icons/gnome/16x16/categories/gnome-devel.png
+share/icons/gnome/16x16/categories/gnome-globe.png
+share/icons/gnome/16x16/categories/gnome-graphics.png
+share/icons/gnome/16x16/categories/gnome-joystick.png
+share/icons/gnome/16x16/categories/gnome-multimedia.png
+share/icons/gnome/16x16/categories/gnome-settings.png
+share/icons/gnome/16x16/categories/gnome-util.png
+share/icons/gnome/16x16/categories/gtk-preferences.png
+share/icons/gnome/16x16/categories/kcontrol.png
+share/icons/gnome/16x16/categories/package_development.png
+share/icons/gnome/16x16/categories/package_games.png
+share/icons/gnome/16x16/categories/package_graphics.png
+share/icons/gnome/16x16/categories/package_multimedia.png
+share/icons/gnome/16x16/categories/package_network.png
+share/icons/gnome/16x16/categories/package_settings.png
+share/icons/gnome/16x16/categories/package_utilities.png
+share/icons/gnome/16x16/categories/preferences-desktop.png
+share/icons/gnome/16x16/categories/preferences-system.png
+share/icons/gnome/16x16/categories/redhat-accessories.png
+share/icons/gnome/16x16/categories/redhat-games.png
+share/icons/gnome/16x16/categories/redhat-graphics.png
+share/icons/gnome/16x16/categories/redhat-internet.png
+share/icons/gnome/16x16/categories/redhat-preferences.png
+share/icons/gnome/16x16/categories/redhat-programming.png
+share/icons/gnome/16x16/categories/redhat-sound_video.png
+share/icons/gnome/16x16/categories/redhat-system_settings.png
+share/icons/gnome/16x16/categories/stock_internet.png
+share/icons/gnome/16x16/categories/xfce-games.png
+share/icons/gnome/16x16/categories/xfce-graphics.png
+share/icons/gnome/16x16/categories/xfce-internet.png
+share/icons/gnome/16x16/categories/xfce-multimedia.png
+share/icons/gnome/16x16/categories/xfce-system-settings.png
+share/icons/gnome/16x16/categories/xfce-utils.png
+share/icons/gnome/16x16/categories/xfce4-settings.png
+share/icons/gnome/16x16/devices/3floppy_unmount.png
+share/icons/gnome/16x16/devices/audio-input-microphone.png
+share/icons/gnome/16x16/devices/battery.png
+share/icons/gnome/16x16/devices/cdrom_unmount.png
+share/icons/gnome/16x16/devices/cdwriter_unmount.png
+share/icons/gnome/16x16/devices/chardevice.png
+share/icons/gnome/16x16/devices/computer.png
+share/icons/gnome/16x16/devices/display.png
+share/icons/gnome/16x16/devices/drive-cdrom.png
+share/icons/gnome/16x16/devices/drive-harddisk.png
+share/icons/gnome/16x16/devices/drive-optical.png
+share/icons/gnome/16x16/devices/drive-removable-media.png
+share/icons/gnome/16x16/devices/dvd_unmount.png
+share/icons/gnome/16x16/devices/gnome-dev-battery.png
share/icons/gnome/16x16/devices/gnome-dev-cdrom-audio.png
share/icons/gnome/16x16/devices/gnome-dev-cdrom.png
+share/icons/gnome/16x16/devices/gnome-dev-computer.png
+share/icons/gnome/16x16/devices/gnome-dev-disc-cdr.png
+share/icons/gnome/16x16/devices/gnome-dev-disc-cdrw.png
+share/icons/gnome/16x16/devices/gnome-dev-disc-dvdr-plus.png
+share/icons/gnome/16x16/devices/gnome-dev-disc-dvdr.png
+share/icons/gnome/16x16/devices/gnome-dev-disc-dvdram.png
+share/icons/gnome/16x16/devices/gnome-dev-disc-dvdrom.png
+share/icons/gnome/16x16/devices/gnome-dev-disc-dvdrw.png
share/icons/gnome/16x16/devices/gnome-dev-dvd.png
share/icons/gnome/16x16/devices/gnome-dev-ethernet.png
share/icons/gnome/16x16/devices/gnome-dev-floppy.png
@@ -34,51 +396,98 @@ share/icons/gnome/16x16/devices/gnome-dev-harddisk-1394.png
share/icons/gnome/16x16/devices/gnome-dev-harddisk-usb.png
share/icons/gnome/16x16/devices/gnome-dev-harddisk.png
share/icons/gnome/16x16/devices/gnome-dev-ipod.png
-share/icons/gnome/16x16/devices/gnome-dev-memory.png
+share/icons/gnome/16x16/devices/gnome-dev-keyboard.png
+share/icons/gnome/16x16/devices/gnome-dev-media-cf.png
+share/icons/gnome/16x16/devices/gnome-dev-media-ms.png
+share/icons/gnome/16x16/devices/gnome-dev-media-sdmmc.png
+share/icons/gnome/16x16/devices/gnome-dev-media-sm.png
share/icons/gnome/16x16/devices/gnome-dev-mouse-ball.png
-share/icons/gnome/16x16/devices/gnome-dev-pci.png
+share/icons/gnome/16x16/devices/gnome-dev-mouse-optical.png
share/icons/gnome/16x16/devices/gnome-dev-printer.png
share/icons/gnome/16x16/devices/gnome-dev-removable-1394.png
share/icons/gnome/16x16/devices/gnome-dev-removable-usb.png
share/icons/gnome/16x16/devices/gnome-dev-removable.png
-share/icons/gnome/16x16/devices/gnome-dev-wavelan-encrypted.png
share/icons/gnome/16x16/devices/gnome-dev-wavelan.png
+share/icons/gnome/16x16/devices/gnome-fs-client.png
+share/icons/gnome/16x16/devices/gnome-stock-mic.png
+share/icons/gnome/16x16/devices/gtk-cdrom.png
+share/icons/gnome/16x16/devices/gtk-floppy.png
+share/icons/gnome/16x16/devices/gtk-harddisk.png
+share/icons/gnome/16x16/devices/harddrive.png
+share/icons/gnome/16x16/devices/hdd_unmount.png
+share/icons/gnome/16x16/devices/input-keyboard.png
+share/icons/gnome/16x16/devices/input-mouse.png
+share/icons/gnome/16x16/devices/ipod_mount.png
+share/icons/gnome/16x16/devices/keyboard.png
+share/icons/gnome/16x16/devices/kjobviewer.png
+share/icons/gnome/16x16/devices/kxkb.png
+share/icons/gnome/16x16/devices/media-cdrom.png
+share/icons/gnome/16x16/devices/media-flash.png
+share/icons/gnome/16x16/devices/media-floppy.png
+share/icons/gnome/16x16/devices/media-optical.png
+share/icons/gnome/16x16/devices/mouse.png
+share/icons/gnome/16x16/devices/multimedia-player.png
+share/icons/gnome/16x16/devices/network-wired.png
+share/icons/gnome/16x16/devices/network-wireless.png
+share/icons/gnome/16x16/devices/printer-remote.png
+share/icons/gnome/16x16/devices/printer.png
+share/icons/gnome/16x16/devices/printer1.png
+share/icons/gnome/16x16/devices/printmgr.png
+share/icons/gnome/16x16/devices/stock_mic.png
+share/icons/gnome/16x16/devices/stock_printers.png
+share/icons/gnome/16x16/devices/system-floppy.png
+share/icons/gnome/16x16/devices/system.png
+share/icons/gnome/16x16/devices/usbpendrive_unmount.png
+share/icons/gnome/16x16/devices/video-display.png
+share/icons/gnome/16x16/devices/xfce-printer.png
+share/icons/gnome/16x16/devices/xfce4-display.png
+share/icons/gnome/16x16/devices/xfce4-keyboard.png
+share/icons/gnome/16x16/devices/xfce4-mouse.png
+share/icons/gnome/16x16/devices/yast_HD.png
+share/icons/gnome/16x16/devices/yast_idetude.png
+share/icons/gnome/16x16/devices/yast_mouse.png
+share/icons/gnome/16x16/devices/yast_printer.png
+share/icons/gnome/16x16/emblems/emblem-favorite.png
+share/icons/gnome/16x16/emblems/emblem-important.png
+share/icons/gnome/16x16/emblems/emblem-new.png
+share/icons/gnome/16x16/emblems/emblem-package.png
+share/icons/gnome/16x16/emblems/emblem-symbolic-link.png
+share/icons/gnome/16x16/emblems/emblem-web.png
+share/icons/gnome/16x16/emblems/stock_mail-priority-high.png
share/icons/gnome/16x16/filesystems/gnome-fs-bookmark-missing.png
share/icons/gnome/16x16/filesystems/gnome-fs-bookmark.png
-share/icons/gnome/16x16/filesystems/gnome-fs-client.png
-share/icons/gnome/16x16/filesystems/gnome-fs-desktop.png
-share/icons/gnome/16x16/filesystems/gnome-fs-directory-accept.png
-share/icons/gnome/16x16/filesystems/gnome-fs-directory.png
-share/icons/gnome/16x16/filesystems/gnome-fs-ftp.png
-share/icons/gnome/16x16/filesystems/gnome-fs-home.png
-share/icons/gnome/16x16/filesystems/gnome-fs-locally-shared.png
-share/icons/gnome/16x16/filesystems/gnome-fs-network.png
-share/icons/gnome/16x16/filesystems/gnome-fs-nfs.png
-share/icons/gnome/16x16/filesystems/gnome-fs-server.png
-share/icons/gnome/16x16/filesystems/gnome-fs-share-private.png
-share/icons/gnome/16x16/filesystems/gnome-fs-share.png
-share/icons/gnome/16x16/filesystems/gnome-fs-smb.png
-share/icons/gnome/16x16/filesystems/gnome-fs-ssh.png
-share/icons/gnome/16x16/filesystems/gnome-fs-trash-empty.png
-share/icons/gnome/16x16/filesystems/gnome-fs-trash-full.png
-share/icons/gnome/16x16/mimetypes/gnome-library.png
+share/icons/gnome/16x16/mimetypes/application-certificate.png
+share/icons/gnome/16x16/mimetypes/ascii.png
+share/icons/gnome/16x16/mimetypes/audio-x-generic.png
+share/icons/gnome/16x16/mimetypes/contents2.png
+share/icons/gnome/16x16/mimetypes/deb.png
+share/icons/gnome/16x16/mimetypes/document.png
+share/icons/gnome/16x16/mimetypes/empty.png
+share/icons/gnome/16x16/mimetypes/folder_tar.png
+share/icons/gnome/16x16/mimetypes/font-x-generic.png
+share/icons/gnome/16x16/mimetypes/font.png
+share/icons/gnome/16x16/mimetypes/font_bitmap.png
+share/icons/gnome/16x16/mimetypes/font_truetype.png
+share/icons/gnome/16x16/mimetypes/font_type1.png
+share/icons/gnome/16x16/mimetypes/gnome-fs-regular.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-magicpoint.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-msword.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-ogg.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-par.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-pdf.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-pgp-encrypted.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-pgp-keys.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-pgp.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-postscript.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-qif.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-rhythmbox-effect.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-rhythmbox-playlist.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-rtf.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-smil.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.ms-excel.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.image.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.rn-realmedia.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.stardivision.impress.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
@@ -86,52 +495,30 @@ share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.draw.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.sun.xml.writer.template.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-wordperfect.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-7z-compressed.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-abiword.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-applix-spreadsheet.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-applix-word.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-archive.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-arj.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-bittorrent.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-bla.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-blender.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-blf.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-blv.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-bzip.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-cd-image.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-class-file.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-compress.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-compressed-tar.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-core.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-cpio-compressed.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-cpio.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-dc-rom.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-deb.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-desktop.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-dia-diagram.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-dv.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-dvi.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-e-theme.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-executable.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-extension-nfo.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-extension-par2.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-font-afm.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-font-bdf.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-font-linux-psf.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-font-pcf.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-font-sunos-news.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-font-ttf.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-gameboy-rom.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-genesis-rom.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-glade.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-gnome-saved-search.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-gnucash.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-gnumeric.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-gtktalog.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-gzip.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-ipod-firmware.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-gzpostscript.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-jar.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-killustrator.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-kpresenter.png
@@ -139,87 +526,209 @@ share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-kspread.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-kword.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-lha.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-lhz.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-mrproject.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-msx-rom.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-n64-rom.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-nes-rom.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-object.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-perl.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-php.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-python-bytecode.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-python.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-qw.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-rar.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-reject.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-rpm.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-ruby.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-sharedlib.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-scribus.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-shellscript.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-shockwave-flash.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-sms-rom.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-sql.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-stuffit.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-tar.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-tarz.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-tex.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-trash.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-x509-ca-cert.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-xhtml+xml.png
share/icons/gnome/16x16/mimetypes/gnome-mime-application-zip.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-application.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-audio-ac3.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-audio-basic.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-audio-midi.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-aiff.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-it.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-midi.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-mod.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-mp3.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-s3m.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-stm.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-ulaw.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-voc.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-wav.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-xi.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-audio-x-xm.png
share/icons/gnome/16x16/mimetypes/gnome-mime-audio.png
share/icons/gnome/16x16/mimetypes/gnome-mime-image.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-css.png
share/icons/gnome/16x16/mimetypes/gnome-mime-text-html.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-authors.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-c++src.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-c-header.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-c.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-chdr.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-copying.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-credits.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-text-vnd.wap.wml.png
share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-csh.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-csharp.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-csrc.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-haskell.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-install.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-java.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-literate-haskell.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-lyx.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-makefile.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-objcsrc.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-patch.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-readme.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-scheme.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-sql.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-tex.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-troff-man.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-txt.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-python.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-sh.png
share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-vcalendar.png
share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-vcard.png
share/icons/gnome/16x16/mimetypes/gnome-mime-text-x-zsh.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-text-xml.png
share/icons/gnome/16x16/mimetypes/gnome-mime-text.png
share/icons/gnome/16x16/mimetypes/gnome-mime-video.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-nfs-server.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-smb-server.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-smb-share.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-smb-workgroup.png
share/icons/gnome/16x16/mimetypes/gnome-mime-x-font-afm.png
share/icons/gnome/16x16/mimetypes/gnome-package.png
+share/icons/gnome/16x16/mimetypes/gtk-file.png
+share/icons/gnome/16x16/mimetypes/html.png
+share/icons/gnome/16x16/mimetypes/image-x-generic.png
+share/icons/gnome/16x16/mimetypes/image.png
+share/icons/gnome/16x16/mimetypes/kpresenter_kpr.png
+share/icons/gnome/16x16/mimetypes/mime_ascii.png
+share/icons/gnome/16x16/mimetypes/misc.png
+share/icons/gnome/16x16/mimetypes/package-x-generic.png
+share/icons/gnome/16x16/mimetypes/package.png
+share/icons/gnome/16x16/mimetypes/package_editors.png
+share/icons/gnome/16x16/mimetypes/package_wordprocessing.png
+share/icons/gnome/16x16/mimetypes/plan.png
+share/icons/gnome/16x16/mimetypes/rpm.png
+share/icons/gnome/16x16/mimetypes/shellscript.png
+share/icons/gnome/16x16/mimetypes/sound.png
+share/icons/gnome/16x16/mimetypes/spreadsheet.png
+share/icons/gnome/16x16/mimetypes/stock_addressbook.png
+share/icons/gnome/16x16/mimetypes/stock_calendar.png
+share/icons/gnome/16x16/mimetypes/stock_certificate.png
+share/icons/gnome/16x16/mimetypes/stock_script.png
+share/icons/gnome/16x16/mimetypes/tar.png
+share/icons/gnome/16x16/mimetypes/template_source.png
+share/icons/gnome/16x16/mimetypes/text-html.png
+share/icons/gnome/16x16/mimetypes/text-x-generic-template.png
+share/icons/gnome/16x16/mimetypes/text-x-generic.png
+share/icons/gnome/16x16/mimetypes/text-x-preview.png
+share/icons/gnome/16x16/mimetypes/text-x-script.png
+share/icons/gnome/16x16/mimetypes/tgz.png
+share/icons/gnome/16x16/mimetypes/txt.png
+share/icons/gnome/16x16/mimetypes/txt2.png
+share/icons/gnome/16x16/mimetypes/unknown.png
+share/icons/gnome/16x16/mimetypes/vcalendar.png
+share/icons/gnome/16x16/mimetypes/vcard.png
+share/icons/gnome/16x16/mimetypes/video-x-generic.png
+share/icons/gnome/16x16/mimetypes/video.png
+share/icons/gnome/16x16/mimetypes/wordprocessing.png
+share/icons/gnome/16x16/mimetypes/www.png
+share/icons/gnome/16x16/mimetypes/x-office-address-book.png
+share/icons/gnome/16x16/mimetypes/x-office-calendar.png
+share/icons/gnome/16x16/mimetypes/x-office-document.png
+share/icons/gnome/16x16/mimetypes/x-office-drawing.png
+share/icons/gnome/16x16/mimetypes/x-office-presentation.png
+share/icons/gnome/16x16/mimetypes/x-office-spreadsheet.png
+share/icons/gnome/16x16/mimetypes/zip.png
+share/icons/gnome/16x16/places/application-x-gnome-saved-search.png
+share/icons/gnome/16x16/places/desktop.png
+share/icons/gnome/16x16/places/distributor-logo.png
+share/icons/gnome/16x16/places/emptytrash.png
+share/icons/gnome/16x16/places/folder-remote.png
+share/icons/gnome/16x16/places/folder-saved-search.png
+share/icons/gnome/16x16/places/folder.png
+share/icons/gnome/16x16/places/folder_home.png
+share/icons/gnome/16x16/places/gnome-fs-desktop.png
+share/icons/gnome/16x16/places/gnome-fs-directory.png
+share/icons/gnome/16x16/places/gnome-fs-ftp.png
+share/icons/gnome/16x16/places/gnome-fs-home.png
+share/icons/gnome/16x16/places/gnome-fs-network.png
+share/icons/gnome/16x16/places/gnome-fs-nfs.png
+share/icons/gnome/16x16/places/gnome-fs-server.png
+share/icons/gnome/16x16/places/gnome-fs-share.png
+share/icons/gnome/16x16/places/gnome-fs-smb.png
+share/icons/gnome/16x16/places/gnome-fs-ssh.png
+share/icons/gnome/16x16/places/gnome-fs-trash-empty.png
+share/icons/gnome/16x16/places/gnome-main-menu.png
+share/icons/gnome/16x16/places/gnome-mime-x-directory-nfs-server.png
+share/icons/gnome/16x16/places/gnome-mime-x-directory-smb-server.png
+share/icons/gnome/16x16/places/gnome-mime-x-directory-smb-share.png
+share/icons/gnome/16x16/places/gnome-mime-x-directory-smb-workgroup.png
+share/icons/gnome/16x16/places/gnome-stock-trash.png
+share/icons/gnome/16x16/places/gtk-network.png
+share/icons/gnome/16x16/places/network-server.png
+share/icons/gnome/16x16/places/network-workgroup.png
+share/icons/gnome/16x16/places/network.png
+share/icons/gnome/16x16/places/network_local.png
+share/icons/gnome/16x16/places/novell-button.png
+share/icons/gnome/16x16/places/redhat-network-server.png
+share/icons/gnome/16x16/places/server.png
+share/icons/gnome/16x16/places/start-here.png
+share/icons/gnome/16x16/places/stock_folder.png
+share/icons/gnome/16x16/places/trashcan_empty.png
+share/icons/gnome/16x16/places/user-desktop.png
+share/icons/gnome/16x16/places/user-home.png
+share/icons/gnome/16x16/places/user-trash.png
+share/icons/gnome/16x16/places/xfce-trash_empty.png
+share/icons/gnome/16x16/status/appointment-missed.png
+share/icons/gnome/16x16/status/appointment-soon.png
+share/icons/gnome/16x16/status/audio-volume-high.png
+share/icons/gnome/16x16/status/audio-volume-low.png
+share/icons/gnome/16x16/status/audio-volume-medium.png
+share/icons/gnome/16x16/status/audio-volume-muted.png
+share/icons/gnome/16x16/status/connect_creating.png
+share/icons/gnome/16x16/status/connect_established.png
+share/icons/gnome/16x16/status/connect_no.png
+share/icons/gnome/16x16/status/dialog-error.png
+share/icons/gnome/16x16/status/dialog-information.png
+share/icons/gnome/16x16/status/dialog-warning.png
+share/icons/gnome/16x16/status/edittrash.png
+share/icons/gnome/16x16/status/error.png
+share/icons/gnome/16x16/status/folder-drag-accept.png
+share/icons/gnome/16x16/status/folder-open.png
+share/icons/gnome/16x16/status/folder-visiting.png
+share/icons/gnome/16x16/status/folder_open.png
+share/icons/gnome/16x16/status/gnome-dev-wavelan-encrypted.png
+share/icons/gnome/16x16/status/gnome-fs-directory-accept.png
+share/icons/gnome/16x16/status/gnome-fs-directory-visiting.png
+share/icons/gnome/16x16/status/gnome-fs-loading-icon.png
+share/icons/gnome/16x16/status/gnome-fs-trash-full.png
+share/icons/gnome/16x16/status/gnome-netstatus-disconn.png
+share/icons/gnome/16x16/status/gnome-netstatus-error.png
+share/icons/gnome/16x16/status/gnome-netstatus-idle.png
+share/icons/gnome/16x16/status/gnome-netstatus-rx.png
+share/icons/gnome/16x16/status/gnome-netstatus-tx.png
+share/icons/gnome/16x16/status/gnome-netstatus-txrx.png
+share/icons/gnome/16x16/status/gnome-stock-trash-full.png
+share/icons/gnome/16x16/status/gtk-dialog-error.png
+share/icons/gnome/16x16/status/gtk-dialog-info.png
+share/icons/gnome/16x16/status/gtk-dialog-warning.png
+share/icons/gnome/16x16/status/image-loading.png
+share/icons/gnome/16x16/status/important.png
+share/icons/gnome/16x16/status/info.png
+share/icons/gnome/16x16/status/media-playlist-repeat.png
+share/icons/gnome/16x16/status/media-playlist-shuffle.png
+share/icons/gnome/16x16/status/messagebox_critical.png
+share/icons/gnome/16x16/status/messagebox_info.png
+share/icons/gnome/16x16/status/messagebox_warning.png
+share/icons/gnome/16x16/status/network-error.png
+share/icons/gnome/16x16/status/network-idle.png
+share/icons/gnome/16x16/status/network-offline.png
+share/icons/gnome/16x16/status/network-receive.png
+share/icons/gnome/16x16/status/network-transmit-receive.png
+share/icons/gnome/16x16/status/network-transmit.png
+share/icons/gnome/16x16/status/network-wireless-encrypted.png
+share/icons/gnome/16x16/status/nm-adhoc.png
+share/icons/gnome/16x16/status/nm-device-wired.png
+share/icons/gnome/16x16/status/nm-device-wireless.png
+share/icons/gnome/16x16/status/nm-no-connection.png
+share/icons/gnome/16x16/status/stock_appointment-reminder-excl.png
+share/icons/gnome/16x16/status/stock_appointment-reminder.png
+share/icons/gnome/16x16/status/stock_dialog-error.png
+share/icons/gnome/16x16/status/stock_dialog-info.png
+share/icons/gnome/16x16/status/stock_dialog-warning.png
+share/icons/gnome/16x16/status/stock_open.png
+share/icons/gnome/16x16/status/stock_repeat.png
+share/icons/gnome/16x16/status/stock_shuffle.png
+share/icons/gnome/16x16/status/stock_trash_full.png
+share/icons/gnome/16x16/status/stock_volume-0.png
+share/icons/gnome/16x16/status/stock_volume-max.png
+share/icons/gnome/16x16/status/stock_volume-med.png
+share/icons/gnome/16x16/status/stock_volume-min.png
+share/icons/gnome/16x16/status/stock_volume-mute.png
+share/icons/gnome/16x16/status/stock_volume.png
+share/icons/gnome/16x16/status/stock_weather-cloudy.png
+share/icons/gnome/16x16/status/stock_weather-few-clouds.png
+share/icons/gnome/16x16/status/stock_weather-fog.png
+share/icons/gnome/16x16/status/stock_weather-night-clear.png
+share/icons/gnome/16x16/status/stock_weather-night-few-clouds.png
+share/icons/gnome/16x16/status/stock_weather-showers.png
+share/icons/gnome/16x16/status/stock_weather-snow.png
+share/icons/gnome/16x16/status/stock_weather-storm.png
+share/icons/gnome/16x16/status/stock_weather-sunny.png
+share/icons/gnome/16x16/status/sunny.png
+share/icons/gnome/16x16/status/trashcan_full.png
+share/icons/gnome/16x16/status/user-trash-full.png
+share/icons/gnome/16x16/status/weather-clear-night.png
+share/icons/gnome/16x16/status/weather-clear.png
+share/icons/gnome/16x16/status/weather-few-clouds-night.png
+share/icons/gnome/16x16/status/weather-few-clouds.png
+share/icons/gnome/16x16/status/weather-fog.png
+share/icons/gnome/16x16/status/weather-overcast.png
+share/icons/gnome/16x16/status/weather-severe-alert.png
+share/icons/gnome/16x16/status/weather-showers-scattered.png
+share/icons/gnome/16x16/status/weather-showers.png
+share/icons/gnome/16x16/status/weather-snow.png
+share/icons/gnome/16x16/status/weather-storm.png
+share/icons/gnome/16x16/status/xfce-trash_full.png
share/icons/gnome/16x16/stock/chart/stock_chart-autoformat.png
share/icons/gnome/16x16/stock/chart/stock_chart-data-in-columns.png
share/icons/gnome/16x16/stock/chart/stock_chart-data-in-rows.png
@@ -429,18 +938,10 @@ share/icons/gnome/16x16/stock/generic/stock_briefcase.png
share/icons/gnome/16x16/stock/generic/stock_calc-accept.png
share/icons/gnome/16x16/stock/generic/stock_calc-cancel.png
share/icons/gnome/16x16/stock/generic/stock_calendar-and-tasks.png
-share/icons/gnome/16x16/stock/generic/stock_calendar.png
share/icons/gnome/16x16/stock/generic/stock_cell-phone.png
share/icons/gnome/16x16/stock/generic/stock_check-filled.png
-share/icons/gnome/16x16/stock/generic/stock_close.png
share/icons/gnome/16x16/stock/generic/stock_color.png
-share/icons/gnome/16x16/stock/generic/stock_copy.png
-share/icons/gnome/16x16/stock/generic/stock_cut.png
share/icons/gnome/16x16/stock/generic/stock_default-folder.png
-share/icons/gnome/16x16/stock/generic/stock_delete.png
-share/icons/gnome/16x16/stock/generic/stock_dialog-error.png
-share/icons/gnome/16x16/stock/generic/stock_dialog-info.png
-share/icons/gnome/16x16/stock/generic/stock_dialog-warning.png
share/icons/gnome/16x16/stock/generic/stock_drag-mode.png
share/icons/gnome/16x16/stock/generic/stock_edit.png
share/icons/gnome/16x16/stock/generic/stock_equals.png
@@ -453,9 +954,7 @@ share/icons/gnome/16x16/stock/generic/stock_flip-vertically.png
share/icons/gnome/16x16/stock/generic/stock_folder-copy.png
share/icons/gnome/16x16/stock/generic/stock_folder-move.png
share/icons/gnome/16x16/stock/generic/stock_folder-properties.png
-share/icons/gnome/16x16/stock/generic/stock_folder.png
share/icons/gnome/16x16/stock/generic/stock_format-page.png
-share/icons/gnome/16x16/stock/generic/stock_fullscreen.png
share/icons/gnome/16x16/stock/generic/stock_help-add-bookmark.png
share/icons/gnome/16x16/stock/generic/stock_help-agent.png
share/icons/gnome/16x16/stock/generic/stock_help-book-open.png
@@ -464,29 +963,21 @@ share/icons/gnome/16x16/stock/generic/stock_help-chat.png
share/icons/gnome/16x16/stock/generic/stock_help-document.png
share/icons/gnome/16x16/stock/generic/stock_help-pane-off.png
share/icons/gnome/16x16/stock/generic/stock_help-pane-on.png
-share/icons/gnome/16x16/stock/generic/stock_help.png
-share/icons/gnome/16x16/stock/generic/stock_home.png
share/icons/gnome/16x16/stock/generic/stock_id.png
share/icons/gnome/16x16/stock/generic/stock_keyring.png
share/icons/gnome/16x16/stock/generic/stock_landline-phone.png
-share/icons/gnome/16x16/stock/generic/stock_leave-fullscreen.png
share/icons/gnome/16x16/stock/generic/stock_mark.png
share/icons/gnome/16x16/stock/generic/stock_new-24h-appointment.png
-share/icons/gnome/16x16/stock/generic/stock_new-appointment.png
-share/icons/gnome/16x16/stock/generic/stock_new-dir.png
share/icons/gnome/16x16/stock/generic/stock_new-meeting.png
share/icons/gnome/16x16/stock/generic/stock_news.png
share/icons/gnome/16x16/stock/generic/stock_notebook.png
share/icons/gnome/16x16/stock/generic/stock_notes.png
share/icons/gnome/16x16/stock/generic/stock_openoffice.png
-share/icons/gnome/16x16/stock/generic/stock_paste.png
share/icons/gnome/16x16/stock/generic/stock_people.png
share/icons/gnome/16x16/stock/generic/stock_person.png
share/icons/gnome/16x16/stock/generic/stock_presentation-box.png
share/icons/gnome/16x16/stock/generic/stock_presentation-styles.png
share/icons/gnome/16x16/stock/generic/stock_properties.png
-share/icons/gnome/16x16/stock/generic/stock_redo.png
-share/icons/gnome/16x16/stock/generic/stock_refresh.png
share/icons/gnome/16x16/stock/generic/stock_score-high.png
share/icons/gnome/16x16/stock/generic/stock_score-higher.png
share/icons/gnome/16x16/stock/generic/stock_score-highest.png
@@ -494,11 +985,8 @@ share/icons/gnome/16x16/stock/generic/stock_score-low.png
share/icons/gnome/16x16/stock/generic/stock_score-lower.png
share/icons/gnome/16x16/stock/generic/stock_score-lowest.png
share/icons/gnome/16x16/stock/generic/stock_score-normal.png
-share/icons/gnome/16x16/stock/generic/stock_search-and-replace.png
-share/icons/gnome/16x16/stock/generic/stock_search.png
share/icons/gnome/16x16/stock/generic/stock_send-fax.png
share/icons/gnome/16x16/stock/generic/stock_show-all.png
-share/icons/gnome/16x16/stock/generic/stock_stop.png
share/icons/gnome/16x16/stock/generic/stock_styles.png
share/icons/gnome/16x16/stock/generic/stock_summary.png
share/icons/gnome/16x16/stock/generic/stock_test-mode.png
@@ -510,18 +998,8 @@ share/icons/gnome/16x16/stock/generic/stock_toggle-preview.png
share/icons/gnome/16x16/stock/generic/stock_toilet-paper.png
share/icons/gnome/16x16/stock/generic/stock_trash_full.png
share/icons/gnome/16x16/stock/generic/stock_undelete.png
-share/icons/gnome/16x16/stock/generic/stock_undo.png
share/icons/gnome/16x16/stock/generic/stock_unknown.png
share/icons/gnome/16x16/stock/generic/stock_view-details.png
-share/icons/gnome/16x16/stock/generic/stock_weather-cloudy.png
-share/icons/gnome/16x16/stock/generic/stock_weather-few-clouds.png
-share/icons/gnome/16x16/stock/generic/stock_weather-fog.png
-share/icons/gnome/16x16/stock/generic/stock_weather-night-clear.png
-share/icons/gnome/16x16/stock/generic/stock_weather-night-few-clouds.png
-share/icons/gnome/16x16/stock/generic/stock_weather-showers.png
-share/icons/gnome/16x16/stock/generic/stock_weather-snow.png
-share/icons/gnome/16x16/stock/generic/stock_weather-storm.png
-share/icons/gnome/16x16/stock/generic/stock_weather-sunny.png
share/icons/gnome/16x16/stock/generic/stock_web-calendar.png
share/icons/gnome/16x16/stock/generic/stock_web-support.png
share/icons/gnome/16x16/stock/image/stock_3d-color-picker.png
@@ -678,55 +1156,27 @@ share/icons/gnome/16x16/stock/io/stock_export.png
share/icons/gnome/16x16/stock/io/stock_insert-file.png
share/icons/gnome/16x16/stock/io/stock_network-printer.png
share/icons/gnome/16x16/stock/io/stock_open-read-only.png
-share/icons/gnome/16x16/stock/io/stock_open.png
share/icons/gnome/16x16/stock/io/stock_print-driver.png
share/icons/gnome/16x16/stock/io/stock_print-preview-print.png
-share/icons/gnome/16x16/stock/io/stock_print-preview.png
share/icons/gnome/16x16/stock/io/stock_print-setup.png
-share/icons/gnome/16x16/stock/io/stock_print.png
share/icons/gnome/16x16/stock/io/stock_printers.png
share/icons/gnome/16x16/stock/io/stock_reload.png
-share/icons/gnome/16x16/stock/io/stock_save-as.png
share/icons/gnome/16x16/stock/io/stock_save-pdf.png
share/icons/gnome/16x16/stock/io/stock_save-template.png
-share/icons/gnome/16x16/stock/io/stock_save.png
-share/icons/gnome/16x16/stock/io/stock_save_as.png
share/icons/gnome/16x16/stock/io/stock_up-one-dir.png
share/icons/gnome/16x16/stock/media/stock_3dsound.png
share/icons/gnome/16x16/stock/media/stock_effects-sound.png
share/icons/gnome/16x16/stock/media/stock_headphones.png
share/icons/gnome/16x16/stock/media/stock_insert-video-plugin.png
share/icons/gnome/16x16/stock/media/stock_line_in.png
-share/icons/gnome/16x16/stock/media/stock_media-fwd.png
-share/icons/gnome/16x16/stock/media/stock_media-next.png
-share/icons/gnome/16x16/stock/media/stock_media-pause.png
-share/icons/gnome/16x16/stock/media/stock_media-play.png
-share/icons/gnome/16x16/stock/media/stock_media-prev.png
-share/icons/gnome/16x16/stock/media/stock_media-rec.png
-share/icons/gnome/16x16/stock/media/stock_media-rew.png
-share/icons/gnome/16x16/stock/media/stock_media-stop.png
-share/icons/gnome/16x16/stock/media/stock_mic.png
share/icons/gnome/16x16/stock/media/stock_midi.png
share/icons/gnome/16x16/stock/media/stock_music-library.png
share/icons/gnome/16x16/stock/media/stock_playlist.png
-share/icons/gnome/16x16/stock/media/stock_repeat.png
-share/icons/gnome/16x16/stock/media/stock_shuffle.png
share/icons/gnome/16x16/stock/media/stock_smart-playlist.png
-share/icons/gnome/16x16/stock/media/stock_volume-0.png
-share/icons/gnome/16x16/stock/media/stock_volume-max.png
-share/icons/gnome/16x16/stock/media/stock_volume-med.png
-share/icons/gnome/16x16/stock/media/stock_volume-min.png
-share/icons/gnome/16x16/stock/media/stock_volume-mute.png
-share/icons/gnome/16x16/stock/media/stock_volume.png
-share/icons/gnome/16x16/stock/navigation/stock_bottom.png
share/icons/gnome/16x16/stock/navigation/stock_down-with-subpoints.png
-share/icons/gnome/16x16/stock/navigation/stock_down.png
share/icons/gnome/16x16/stock/navigation/stock_first-page.png
-share/icons/gnome/16x16/stock/navigation/stock_first.png
share/icons/gnome/16x16/stock/navigation/stock_last-page.png
-share/icons/gnome/16x16/stock/navigation/stock_last.png
share/icons/gnome/16x16/stock/navigation/stock_left-with-subpoints.png
-share/icons/gnome/16x16/stock/navigation/stock_left.png
share/icons/gnome/16x16/stock/navigation/stock_live-mode.png
share/icons/gnome/16x16/stock/navigation/stock_navigate-next.png
share/icons/gnome/16x16/stock/navigation/stock_navigate-prev.png
@@ -763,17 +1213,13 @@ share/icons/gnome/16x16/stock/navigation/stock_navigator-text.png
share/icons/gnome/16x16/stock/navigation/stock_navigator-update-entry.png
share/icons/gnome/16x16/stock/navigation/stock_navigator-wrong-table-formula.png
share/icons/gnome/16x16/stock/navigation/stock_navigator.png
-share/icons/gnome/16x16/stock/navigation/stock_new-tab.png
share/icons/gnome/16x16/stock/navigation/stock_next-page.png
share/icons/gnome/16x16/stock/navigation/stock_next.png
share/icons/gnome/16x16/stock/navigation/stock_previous-page.png
share/icons/gnome/16x16/stock/navigation/stock_previous.png
share/icons/gnome/16x16/stock/navigation/stock_right-with-subpoints.png
-share/icons/gnome/16x16/stock/navigation/stock_right.png
-share/icons/gnome/16x16/stock/navigation/stock_top.png
share/icons/gnome/16x16/stock/navigation/stock_undo-history.png
share/icons/gnome/16x16/stock/navigation/stock_up-with-subpoints.png
-share/icons/gnome/16x16/stock/navigation/stock_up.png
share/icons/gnome/16x16/stock/navigation/stock_zoom-1.png
share/icons/gnome/16x16/stock/navigation/stock_zoom-in.png
share/icons/gnome/16x16/stock/navigation/stock_zoom-next.png
@@ -786,8 +1232,6 @@ share/icons/gnome/16x16/stock/navigation/stock_zoom-previous.png
share/icons/gnome/16x16/stock/navigation/stock_zoom-shift.png
share/icons/gnome/16x16/stock/navigation/stock_zoom.png
share/icons/gnome/16x16/stock/net/stock_addressbook.png
-share/icons/gnome/16x16/stock/net/stock_appointment-reminder-excl.png
-share/icons/gnome/16x16/stock/net/stock_appointment-reminder.png
share/icons/gnome/16x16/stock/net/stock_channel.png
share/icons/gnome/16x16/stock/net/stock_connect-to-url.png
share/icons/gnome/16x16/stock/net/stock_connect.png
@@ -807,12 +1251,10 @@ share/icons/gnome/16x16/stock/net/stock_insert-url.png
share/icons/gnome/16x16/stock/net/stock_internet.png
share/icons/gnome/16x16/stock/net/stock_link.png
share/icons/gnome/16x16/stock/net/stock_mail-accounts.png
-share/icons/gnome/16x16/stock/net/stock_mail-compose.png
share/icons/gnome/16x16/stock/net/stock_mail-copy.png
share/icons/gnome/16x16/stock/net/stock_mail-filters-apply.png
share/icons/gnome/16x16/stock/net/stock_mail-flag-for-followup-done.png
share/icons/gnome/16x16/stock/net/stock_mail-flag-for-followup.png
-share/icons/gnome/16x16/stock/net/stock_mail-forward.png
share/icons/gnome/16x16/stock/net/stock_mail-handling.png
share/icons/gnome/16x16/stock/net/stock_mail-hide-deleted.png
share/icons/gnome/16x16/stock/net/stock_mail-hide-read.png
@@ -822,25 +1264,19 @@ share/icons/gnome/16x16/stock/net/stock_mail-merge.png
share/icons/gnome/16x16/stock/net/stock_mail-move.png
share/icons/gnome/16x16/stock/net/stock_mail-open-multiple.png
share/icons/gnome/16x16/stock/net/stock_mail-open.png
-share/icons/gnome/16x16/stock/net/stock_mail-priority-high.png
share/icons/gnome/16x16/stock/net/stock_mail-receive.png
share/icons/gnome/16x16/stock/net/stock_mail-replied.png
-share/icons/gnome/16x16/stock/net/stock_mail-reply-to-all.png
-share/icons/gnome/16x16/stock/net/stock_mail-reply.png
-share/icons/gnome/16x16/stock/net/stock_mail-send-receive.png
share/icons/gnome/16x16/stock/net/stock_mail-send.png
share/icons/gnome/16x16/stock/net/stock_mail-unread-multiple.png
share/icons/gnome/16x16/stock/net/stock_mail-unread.png
share/icons/gnome/16x16/stock/net/stock_mail.png
share/icons/gnome/16x16/stock/net/stock_message-display.png
-share/icons/gnome/16x16/stock/net/stock_not-spam.png
share/icons/gnome/16x16/stock/net/stock_online-layout.png
share/icons/gnome/16x16/stock/net/stock_outbox.png
share/icons/gnome/16x16/stock/net/stock_post-message.png
share/icons/gnome/16x16/stock/net/stock_sent-mail.png
share/icons/gnome/16x16/stock/net/stock_shared-by-me.png
share/icons/gnome/16x16/stock/net/stock_shared-to-me.png
-share/icons/gnome/16x16/stock/net/stock_spam.png
share/icons/gnome/16x16/stock/net/stock_video-conferencing.png
share/icons/gnome/16x16/stock/object/stock_3d-3d-attributes-only.png
share/icons/gnome/16x16/stock/object/stock_3d-all-attributes.png
@@ -863,7 +1299,6 @@ share/icons/gnome/16x16/stock/object/stock_3d-texture-only.png
share/icons/gnome/16x16/stock/object/stock_3d-texture-parallel.png
share/icons/gnome/16x16/stock/object/stock_3d-texture-spherical.png
share/icons/gnome/16x16/stock/object/stock_3d-texture.png
-share/icons/gnome/16x16/stock/object/stock_add-bookmark.png
share/icons/gnome/16x16/stock/object/stock_auto-contour.png
share/icons/gnome/16x16/stock/object/stock_bookmark.png
share/icons/gnome/16x16/stock/object/stock_bring-backward.png
@@ -903,7 +1338,6 @@ share/icons/gnome/16x16/stock/object/stock_insert_graphic.png
share/icons/gnome/16x16/stock/object/stock_insert_special_character.png
share/icons/gnome/16x16/stock/object/stock_interaction.png
share/icons/gnome/16x16/stock/object/stock_new-bcard.png
-share/icons/gnome/16x16/stock/object/stock_new-window.png
share/icons/gnome/16x16/stock/object/stock_object-behind.png
share/icons/gnome/16x16/stock/object/stock_object-infront.png
share/icons/gnome/16x16/stock/object/stock_pin.png
@@ -1065,20 +1499,10 @@ share/icons/gnome/16x16/stock/text/stock_text-quickedit.png
share/icons/gnome/16x16/stock/text/stock_text-select-text-only.png
share/icons/gnome/16x16/stock/text/stock_text-shadow.png
share/icons/gnome/16x16/stock/text/stock_text-spacing.png
-share/icons/gnome/16x16/stock/text/stock_text-strikethrough.png
-share/icons/gnome/16x16/stock/text/stock_text_bold.png
-share/icons/gnome/16x16/stock/text/stock_text_center.png
share/icons/gnome/16x16/stock/text/stock_text_color_background.png
share/icons/gnome/16x16/stock/text/stock_text_color_foreground.png
share/icons/gnome/16x16/stock/text/stock_text_color_hilight.png
-share/icons/gnome/16x16/stock/text/stock_text_indent.png
-share/icons/gnome/16x16/stock/text/stock_text_italic.png
-share/icons/gnome/16x16/stock/text/stock_text_justify.png
-share/icons/gnome/16x16/stock/text/stock_text_left.png
-share/icons/gnome/16x16/stock/text/stock_text_right.png
share/icons/gnome/16x16/stock/text/stock_text_underlined-double.png
-share/icons/gnome/16x16/stock/text/stock_text_underlined.png
-share/icons/gnome/16x16/stock/text/stock_text_unindent.png
share/icons/gnome/16x16/stock/text/stock_thesaurus.png
share/icons/gnome/16x16/stock/text/stock_to-background.png
share/icons/gnome/16x16/stock/text/stock_to-foreground.png
@@ -1092,19 +1516,994 @@ share/icons/gnome/16x16/stock/text/stock_wrap-interrupt.png
share/icons/gnome/16x16/stock/text/stock_wrap-left.png
share/icons/gnome/16x16/stock/text/stock_wrap-optimal.png
share/icons/gnome/16x16/stock/text/stock_wrap-right.png
-share/icons/gnome/192x192/apps/gnome-globe.png
-share/icons/gnome/192x192/filesystems/gnome-fs-regular.icon
-share/icons/gnome/192x192/filesystems/gnome-fs-regular.png
+share/icons/gnome/22x22/actions/add.png
+share/icons/gnome/22x22/actions/application-exit.png
+share/icons/gnome/22x22/actions/appointment-new.png
+share/icons/gnome/22x22/actions/appointment.png
+share/icons/gnome/22x22/actions/back.png
+share/icons/gnome/22x22/actions/bookmark-new.png
+share/icons/gnome/22x22/actions/bookmark_add.png
+share/icons/gnome/22x22/actions/bookmarks_list_add.png
+share/icons/gnome/22x22/actions/bottom.png
+share/icons/gnome/22x22/actions/centrejust.png
+share/icons/gnome/22x22/actions/document-new.png
+share/icons/gnome/22x22/actions/document-print-preview.png
+share/icons/gnome/22x22/actions/document-print.png
+share/icons/gnome/22x22/actions/document-save-as.png
+share/icons/gnome/22x22/actions/document-save.png
+share/icons/gnome/22x22/actions/down.png
+share/icons/gnome/22x22/actions/edit-copy.png
+share/icons/gnome/22x22/actions/edit-cut.png
+share/icons/gnome/22x22/actions/edit-delete.png
+share/icons/gnome/22x22/actions/edit-find-replace.png
+share/icons/gnome/22x22/actions/edit-find.png
+share/icons/gnome/22x22/actions/edit-paste.png
+share/icons/gnome/22x22/actions/edit-redo.png
+share/icons/gnome/22x22/actions/edit-undo.png
+share/icons/gnome/22x22/actions/editcopy.png
+share/icons/gnome/22x22/actions/editcut.png
+share/icons/gnome/22x22/actions/editdelete.png
+share/icons/gnome/22x22/actions/editpaste.png
+share/icons/gnome/22x22/actions/exit.png
+share/icons/gnome/22x22/actions/filefind.png
+share/icons/gnome/22x22/actions/filenew.png
+share/icons/gnome/22x22/actions/fileprint.png
+share/icons/gnome/22x22/actions/filequickprint.png
+share/icons/gnome/22x22/actions/filesave.png
+share/icons/gnome/22x22/actions/filesaveas.png
+share/icons/gnome/22x22/actions/find.png
+share/icons/gnome/22x22/actions/finish.png
+share/icons/gnome/22x22/actions/folder-new.png
+share/icons/gnome/22x22/actions/folder_new.png
+share/icons/gnome/22x22/actions/format-indent-less.png
+share/icons/gnome/22x22/actions/format-indent-more.png
+share/icons/gnome/22x22/actions/format-justify-center.png
+share/icons/gnome/22x22/actions/format-justify-fill.png
+share/icons/gnome/22x22/actions/format-justify-left.png
+share/icons/gnome/22x22/actions/format-justify-right.png
+share/icons/gnome/22x22/actions/format-text-bold.png
+share/icons/gnome/22x22/actions/format-text-italic.png
+share/icons/gnome/22x22/actions/format-text-strikethrough.png
+share/icons/gnome/22x22/actions/format-text-underline.png
+share/icons/gnome/22x22/actions/forward.png
+share/icons/gnome/22x22/actions/gnome-lockscreen.png
+share/icons/gnome/22x22/actions/gnome-run.png
+share/icons/gnome/22x22/actions/gnome-stock-mail-fwd.png
+share/icons/gnome/22x22/actions/gnome-stock-mail-new.png
+share/icons/gnome/22x22/actions/gnome-stock-mail-rpl.png
+share/icons/gnome/22x22/actions/gnome-stock-text-indent.png
+share/icons/gnome/22x22/actions/gnome-stock-text-unindent.png
+share/icons/gnome/22x22/actions/go-bottom.png
+share/icons/gnome/22x22/actions/go-down.png
+share/icons/gnome/22x22/actions/go-first.png
+share/icons/gnome/22x22/actions/go-home.png
+share/icons/gnome/22x22/actions/go-last.png
+share/icons/gnome/22x22/actions/go-next.png
+share/icons/gnome/22x22/actions/go-previous.png
+share/icons/gnome/22x22/actions/go-top.png
+share/icons/gnome/22x22/actions/go-up.png
+share/icons/gnome/22x22/actions/gohome.png
+share/icons/gnome/22x22/actions/gtk-add.png
+share/icons/gnome/22x22/actions/gtk-bold.png
+share/icons/gnome/22x22/actions/gtk-close.png
+share/icons/gnome/22x22/actions/gtk-copy.png
+share/icons/gnome/22x22/actions/gtk-cut.png
+share/icons/gnome/22x22/actions/gtk-delete.png
+share/icons/gnome/22x22/actions/gtk-edit.png
+share/icons/gnome/22x22/actions/gtk-find-and-replace.png
+share/icons/gnome/22x22/actions/gtk-find.png
+share/icons/gnome/22x22/actions/gtk-fullscreen.png
+share/icons/gnome/22x22/actions/gtk-go-back-ltr.png
+share/icons/gnome/22x22/actions/gtk-go-back-rtl.png
+share/icons/gnome/22x22/actions/gtk-go-down.png
+share/icons/gnome/22x22/actions/gtk-go-forward-ltr.png
+share/icons/gnome/22x22/actions/gtk-go-forward-rtl.png
+share/icons/gnome/22x22/actions/gtk-go-up.png
+share/icons/gnome/22x22/actions/gtk-goto-bottom.png
+share/icons/gnome/22x22/actions/gtk-goto-first-ltr.png
+share/icons/gnome/22x22/actions/gtk-goto-first-rtl.png
+share/icons/gnome/22x22/actions/gtk-goto-last-ltr.png
+share/icons/gnome/22x22/actions/gtk-goto-last-rtl.png
+share/icons/gnome/22x22/actions/gtk-goto-top.png
+share/icons/gnome/22x22/actions/gtk-home.png
+share/icons/gnome/22x22/actions/gtk-indent.png
+share/icons/gnome/22x22/actions/gtk-italic.png
+share/icons/gnome/22x22/actions/gtk-justify-center.png
+share/icons/gnome/22x22/actions/gtk-justify-fill.png
+share/icons/gnome/22x22/actions/gtk-justify-left.png
+share/icons/gnome/22x22/actions/gtk-justify-right.png
+share/icons/gnome/22x22/actions/gtk-leave-fullscreen.png
+share/icons/gnome/22x22/actions/gtk-media-forward-ltr.png
+share/icons/gnome/22x22/actions/gtk-media-forward-rtl.png
+share/icons/gnome/22x22/actions/gtk-media-next-ltr.png
+share/icons/gnome/22x22/actions/gtk-media-next-rtl.png
+share/icons/gnome/22x22/actions/gtk-media-pause.png
+share/icons/gnome/22x22/actions/gtk-media-play-ltr.png
+share/icons/gnome/22x22/actions/gtk-media-previous-ltr.png
+share/icons/gnome/22x22/actions/gtk-media-previous-rtl.png
+share/icons/gnome/22x22/actions/gtk-media-record.png
+share/icons/gnome/22x22/actions/gtk-media-rewind-ltr.png
+share/icons/gnome/22x22/actions/gtk-media-rewind-rtl.png
+share/icons/gnome/22x22/actions/gtk-media-stop.png
+share/icons/gnome/22x22/actions/gtk-new.png
+share/icons/gnome/22x22/actions/gtk-paste.png
+share/icons/gnome/22x22/actions/gtk-print-preview.png
+share/icons/gnome/22x22/actions/gtk-print.png
+share/icons/gnome/22x22/actions/gtk-quit.png
+share/icons/gnome/22x22/actions/gtk-redo-ltr.png
+share/icons/gnome/22x22/actions/gtk-refresh.png
+share/icons/gnome/22x22/actions/gtk-remove.png
+share/icons/gnome/22x22/actions/gtk-save-as.png
+share/icons/gnome/22x22/actions/gtk-save.png
+share/icons/gnome/22x22/actions/gtk-stop.png
+share/icons/gnome/22x22/actions/gtk-strikethrough.png
+share/icons/gnome/22x22/actions/gtk-underline.png
+share/icons/gnome/22x22/actions/gtk-undo-ltr.png
+share/icons/gnome/22x22/actions/gtk-unindent.png
+share/icons/gnome/22x22/actions/gtk-zoom-100.png
+share/icons/gnome/22x22/actions/gtk-zoom-fit.png
+share/icons/gnome/22x22/actions/gtk-zoom-in.png
+share/icons/gnome/22x22/actions/gtk-zoom-out.png
+share/icons/gnome/22x22/actions/kfm_home.png
+share/icons/gnome/22x22/actions/leftjust.png
+share/icons/gnome/22x22/actions/list-add.png
+share/icons/gnome/22x22/actions/list-remove.png
+share/icons/gnome/22x22/actions/lock.png
+share/icons/gnome/22x22/actions/mail-forward.png
+share/icons/gnome/22x22/actions/mail-mark-junk.png
+share/icons/gnome/22x22/actions/mail-mark-not-junk.png
+share/icons/gnome/22x22/actions/mail-message-new.png
+share/icons/gnome/22x22/actions/mail-reply-all.png
+share/icons/gnome/22x22/actions/mail-reply-sender.png
+share/icons/gnome/22x22/actions/mail-send-receive.png
+share/icons/gnome/22x22/actions/mail_forward.png
+share/icons/gnome/22x22/actions/mail_new.png
+share/icons/gnome/22x22/actions/mail_reply.png
+share/icons/gnome/22x22/actions/mail_replyall.png
+share/icons/gnome/22x22/actions/mail_spam.png
+share/icons/gnome/22x22/actions/media-playback-pause.png
+share/icons/gnome/22x22/actions/media-playback-start.png
+share/icons/gnome/22x22/actions/media-playback-stop.png
+share/icons/gnome/22x22/actions/media-record.png
+share/icons/gnome/22x22/actions/media-seek-backward.png
+share/icons/gnome/22x22/actions/media-seek-forward.png
+share/icons/gnome/22x22/actions/media-skip-backward.png
+share/icons/gnome/22x22/actions/media-skip-forward.png
+share/icons/gnome/22x22/actions/next.png
+share/icons/gnome/22x22/actions/player_end.png
+share/icons/gnome/22x22/actions/player_fwd.png
+share/icons/gnome/22x22/actions/player_pause.png
+share/icons/gnome/22x22/actions/player_play.png
+share/icons/gnome/22x22/actions/player_record.png
+share/icons/gnome/22x22/actions/player_rew.png
+share/icons/gnome/22x22/actions/player_start.png
+share/icons/gnome/22x22/actions/player_stop.png
+share/icons/gnome/22x22/actions/previous.png
+share/icons/gnome/22x22/actions/process-stop.png
+share/icons/gnome/22x22/actions/redhat-home.png
+share/icons/gnome/22x22/actions/redo.png
+share/icons/gnome/22x22/actions/reload.png
+share/icons/gnome/22x22/actions/reload3.png
+share/icons/gnome/22x22/actions/reload_all_tabs.png
+share/icons/gnome/22x22/actions/reload_page.png
+share/icons/gnome/22x22/actions/remove.png
+share/icons/gnome/22x22/actions/rightjust.png
+share/icons/gnome/22x22/actions/start.png
+share/icons/gnome/22x22/actions/stock_add-bookmark.png
+share/icons/gnome/22x22/actions/stock_bottom.png
+share/icons/gnome/22x22/actions/stock_close.png
+share/icons/gnome/22x22/actions/stock_copy.png
+share/icons/gnome/22x22/actions/stock_cut.png
+share/icons/gnome/22x22/actions/stock_delete.png
+share/icons/gnome/22x22/actions/stock_down.png
+share/icons/gnome/22x22/actions/stock_first.png
+share/icons/gnome/22x22/actions/stock_fullscreen.png
+share/icons/gnome/22x22/actions/stock_help-add-bookmark.png
+share/icons/gnome/22x22/actions/stock_home.png
+share/icons/gnome/22x22/actions/stock_last.png
+share/icons/gnome/22x22/actions/stock_leave-fullscreen.png
+share/icons/gnome/22x22/actions/stock_left.png
+share/icons/gnome/22x22/actions/stock_mail-compose.png
+share/icons/gnome/22x22/actions/stock_mail-forward.png
+share/icons/gnome/22x22/actions/stock_mail-reply-to-all.png
+share/icons/gnome/22x22/actions/stock_mail-reply.png
+share/icons/gnome/22x22/actions/stock_mail-send-receive.png
+share/icons/gnome/22x22/actions/stock_media-fwd.png
+share/icons/gnome/22x22/actions/stock_media-next.png
+share/icons/gnome/22x22/actions/stock_media-pause.png
+share/icons/gnome/22x22/actions/stock_media-play.png
+share/icons/gnome/22x22/actions/stock_media-prev.png
+share/icons/gnome/22x22/actions/stock_media-rec.png
+share/icons/gnome/22x22/actions/stock_media-rew.png
+share/icons/gnome/22x22/actions/stock_media-stop.png
+share/icons/gnome/22x22/actions/stock_new-appointment.png
+share/icons/gnome/22x22/actions/stock_new-dir.png
+share/icons/gnome/22x22/actions/stock_new-tab.png
+share/icons/gnome/22x22/actions/stock_new-text.png
+share/icons/gnome/22x22/actions/stock_new-window.png
+share/icons/gnome/22x22/actions/stock_not-spam.png
+share/icons/gnome/22x22/actions/stock_paste.png
+share/icons/gnome/22x22/actions/stock_print-preview.png
+share/icons/gnome/22x22/actions/stock_print.png
+share/icons/gnome/22x22/actions/stock_redo.png
+share/icons/gnome/22x22/actions/stock_refresh.png
+share/icons/gnome/22x22/actions/stock_right.png
+share/icons/gnome/22x22/actions/stock_save-as.png
+share/icons/gnome/22x22/actions/stock_save.png
+share/icons/gnome/22x22/actions/stock_search-and-replace.png
+share/icons/gnome/22x22/actions/stock_search.png
+share/icons/gnome/22x22/actions/stock_spam.png
+share/icons/gnome/22x22/actions/stock_stop.png
+share/icons/gnome/22x22/actions/stock_text-strikethrough.png
+share/icons/gnome/22x22/actions/stock_text_bold.png
+share/icons/gnome/22x22/actions/stock_text_center.png
+share/icons/gnome/22x22/actions/stock_text_indent.png
+share/icons/gnome/22x22/actions/stock_text_italic.png
+share/icons/gnome/22x22/actions/stock_text_justify.png
+share/icons/gnome/22x22/actions/stock_text_left.png
+share/icons/gnome/22x22/actions/stock_text_right.png
+share/icons/gnome/22x22/actions/stock_text_underlined.png
+share/icons/gnome/22x22/actions/stock_text_unindent.png
+share/icons/gnome/22x22/actions/stock_top.png
+share/icons/gnome/22x22/actions/stock_undo.png
+share/icons/gnome/22x22/actions/stock_up.png
+share/icons/gnome/22x22/actions/stock_zoom-1.png
+share/icons/gnome/22x22/actions/stock_zoom-in.png
+share/icons/gnome/22x22/actions/stock_zoom-out.png
+share/icons/gnome/22x22/actions/stock_zoom-page.png
+share/icons/gnome/22x22/actions/stop.png
+share/icons/gnome/22x22/actions/system-lock-screen.png
+share/icons/gnome/22x22/actions/system-run.png
+share/icons/gnome/22x22/actions/tab-new.png
+share/icons/gnome/22x22/actions/tab_new.png
+share/icons/gnome/22x22/actions/text_bold.png
+share/icons/gnome/22x22/actions/text_italic.png
+share/icons/gnome/22x22/actions/text_strike.png
+share/icons/gnome/22x22/actions/text_under.png
+share/icons/gnome/22x22/actions/top.png
+share/icons/gnome/22x22/actions/undo.png
+share/icons/gnome/22x22/actions/up.png
+share/icons/gnome/22x22/actions/view-fullscreen.png
+share/icons/gnome/22x22/actions/view-refresh.png
+share/icons/gnome/22x22/actions/view-restore.png
+share/icons/gnome/22x22/actions/window-close.png
+share/icons/gnome/22x22/actions/window-new.png
+share/icons/gnome/22x22/actions/window_fullscreen.png
+share/icons/gnome/22x22/actions/window_new.png
+share/icons/gnome/22x22/actions/window_nofullscreen.png
+share/icons/gnome/22x22/actions/xfce-system-exit.png
+share/icons/gnome/22x22/actions/xfce-system-lock.png
+share/icons/gnome/22x22/actions/zoom-best-fit.png
+share/icons/gnome/22x22/actions/zoom-in.png
+share/icons/gnome/22x22/actions/zoom-original.png
+share/icons/gnome/22x22/actions/zoom-out.png
+share/icons/gnome/22x22/animations/gnome-spinner-rest.png
+share/icons/gnome/22x22/animations/gnome-spinner.png
+share/icons/gnome/22x22/animations/process-idle.png
+share/icons/gnome/22x22/animations/process-working.png
+share/icons/gnome/22x22/apps/access.png
+share/icons/gnome/22x22/apps/accessibility-directory.png
+share/icons/gnome/22x22/apps/accessories-dictionary.png
+share/icons/gnome/22x22/apps/accessories-text-editor.png
+share/icons/gnome/22x22/apps/applets-screenshooter.png
+share/icons/gnome/22x22/apps/background.png
+share/icons/gnome/22x22/apps/boot.png
+share/icons/gnome/22x22/apps/evolution.png
+share/icons/gnome/22x22/apps/file-manager.png
+share/icons/gnome/22x22/apps/gnome-help.png
+share/icons/gnome/22x22/apps/gnome-monitor.png
+share/icons/gnome/22x22/apps/gnome-session.png
+share/icons/gnome/22x22/apps/gnome-settings-accessibility-technologies.png
+share/icons/gnome/22x22/apps/gnome-settings-background.png
+share/icons/gnome/22x22/apps/gnome-shutdown.png
+share/icons/gnome/22x22/apps/gnome-terminal.png
+share/icons/gnome/22x22/apps/gtk-help.png
+share/icons/gnome/22x22/apps/help-browser.png
+share/icons/gnome/22x22/apps/help.png
+share/icons/gnome/22x22/apps/im-aim.png
+share/icons/gnome/22x22/apps/im-icq.png
+share/icons/gnome/22x22/apps/im-jabber.png
+share/icons/gnome/22x22/apps/im-msn.png
+share/icons/gnome/22x22/apps/im-nov.png
+share/icons/gnome/22x22/apps/im-yahoo.png
+share/icons/gnome/22x22/apps/kedit.png
+share/icons/gnome/22x22/apps/kfm.png
+share/icons/gnome/22x22/apps/khelpcenter.png
+share/icons/gnome/22x22/apps/konsole.png
+share/icons/gnome/22x22/apps/kscreensaver.png
+share/icons/gnome/22x22/apps/ksysguard.png
+share/icons/gnome/22x22/apps/logviewer.png
+share/icons/gnome/22x22/apps/openterm.png
+share/icons/gnome/22x22/apps/preferences-desktop-accessibility.png
+share/icons/gnome/22x22/apps/preferences-desktop-screensaver.png
+share/icons/gnome/22x22/apps/preferences-desktop-wallpaper.png
+share/icons/gnome/22x22/apps/redhat-filemanager.png
+share/icons/gnome/22x22/apps/screensaver.png
+share/icons/gnome/22x22/apps/stock_help.png
+share/icons/gnome/22x22/apps/susehelpcenter.png
+share/icons/gnome/22x22/apps/system-file-manager.png
+share/icons/gnome/22x22/apps/terminal.png
+share/icons/gnome/22x22/apps/text-editor.png
+share/icons/gnome/22x22/apps/utilities-system-monitor.png
+share/icons/gnome/22x22/apps/utilities-terminal.png
+share/icons/gnome/22x22/apps/wallpaper.png
+share/icons/gnome/22x22/apps/web-browser.png
+share/icons/gnome/22x22/apps/xfce-filemanager.png
+share/icons/gnome/22x22/apps/xfce-terminal.png
+share/icons/gnome/22x22/apps/xfce4-backdrop.png
+share/icons/gnome/22x22/apps/xscreensaver.png
+share/icons/gnome/22x22/categories/applications-accessories.png
+share/icons/gnome/22x22/categories/applications-development.png
+share/icons/gnome/22x22/categories/applications-games.png
+share/icons/gnome/22x22/categories/applications-graphics.png
+share/icons/gnome/22x22/categories/applications-internet.png
+share/icons/gnome/22x22/categories/applications-multimedia.png
+share/icons/gnome/22x22/categories/gnome-control-center.png
+share/icons/gnome/22x22/categories/gnome-devel.png
+share/icons/gnome/22x22/categories/gnome-globe.png
+share/icons/gnome/22x22/categories/gnome-graphics.png
+share/icons/gnome/22x22/categories/gnome-joystick.png
+share/icons/gnome/22x22/categories/gnome-multimedia.png
+share/icons/gnome/22x22/categories/gnome-settings.png
+share/icons/gnome/22x22/categories/gnome-util.png
+share/icons/gnome/22x22/categories/gtk-preferences.png
+share/icons/gnome/22x22/categories/kcontrol.png
+share/icons/gnome/22x22/categories/package_development.png
+share/icons/gnome/22x22/categories/package_games.png
+share/icons/gnome/22x22/categories/package_graphics.png
+share/icons/gnome/22x22/categories/package_multimedia.png
+share/icons/gnome/22x22/categories/package_network.png
+share/icons/gnome/22x22/categories/package_settings.png
+share/icons/gnome/22x22/categories/package_utilities.png
+share/icons/gnome/22x22/categories/preferences-desktop.png
+share/icons/gnome/22x22/categories/preferences-system.png
+share/icons/gnome/22x22/categories/redhat-accessories.png
+share/icons/gnome/22x22/categories/redhat-games.png
+share/icons/gnome/22x22/categories/redhat-graphics.png
+share/icons/gnome/22x22/categories/redhat-internet.png
+share/icons/gnome/22x22/categories/redhat-preferences.png
+share/icons/gnome/22x22/categories/redhat-programming.png
+share/icons/gnome/22x22/categories/redhat-sound_video.png
+share/icons/gnome/22x22/categories/redhat-system_settings.png
+share/icons/gnome/22x22/categories/stock_internet.png
+share/icons/gnome/22x22/categories/xfce-games.png
+share/icons/gnome/22x22/categories/xfce-graphics.png
+share/icons/gnome/22x22/categories/xfce-internet.png
+share/icons/gnome/22x22/categories/xfce-multimedia.png
+share/icons/gnome/22x22/categories/xfce-system-settings.png
+share/icons/gnome/22x22/categories/xfce-utils.png
+share/icons/gnome/22x22/categories/xfce4-settings.png
+share/icons/gnome/22x22/devices/3floppy_unmount.png
+share/icons/gnome/22x22/devices/audio-input-microphone.png
+share/icons/gnome/22x22/devices/battery.png
+share/icons/gnome/22x22/devices/cdrom_unmount.png
+share/icons/gnome/22x22/devices/cdwriter_unmount.png
+share/icons/gnome/22x22/devices/chardevice.png
+share/icons/gnome/22x22/devices/computer.png
+share/icons/gnome/22x22/devices/display.png
+share/icons/gnome/22x22/devices/drive-cdrom.png
+share/icons/gnome/22x22/devices/drive-harddisk.png
+share/icons/gnome/22x22/devices/drive-optical.png
+share/icons/gnome/22x22/devices/drive-removable-media.png
+share/icons/gnome/22x22/devices/dvd_unmount.png
+share/icons/gnome/22x22/devices/gnome-dev-battery.png
+share/icons/gnome/22x22/devices/gnome-dev-cdrom-audio.png
+share/icons/gnome/22x22/devices/gnome-dev-cdrom.png
+share/icons/gnome/22x22/devices/gnome-dev-computer.png
+share/icons/gnome/22x22/devices/gnome-dev-disc-cdr.png
+share/icons/gnome/22x22/devices/gnome-dev-disc-cdrw.png
+share/icons/gnome/22x22/devices/gnome-dev-disc-dvdr-plus.png
+share/icons/gnome/22x22/devices/gnome-dev-disc-dvdr.png
+share/icons/gnome/22x22/devices/gnome-dev-disc-dvdram.png
+share/icons/gnome/22x22/devices/gnome-dev-disc-dvdrom.png
+share/icons/gnome/22x22/devices/gnome-dev-disc-dvdrw.png
+share/icons/gnome/22x22/devices/gnome-dev-dvd.png
+share/icons/gnome/22x22/devices/gnome-dev-ethernet.png
+share/icons/gnome/22x22/devices/gnome-dev-floppy.png
+share/icons/gnome/22x22/devices/gnome-dev-harddisk-1394.png
+share/icons/gnome/22x22/devices/gnome-dev-harddisk-usb.png
+share/icons/gnome/22x22/devices/gnome-dev-harddisk.png
+share/icons/gnome/22x22/devices/gnome-dev-ipod.png
+share/icons/gnome/22x22/devices/gnome-dev-keyboard.png
+share/icons/gnome/22x22/devices/gnome-dev-media-cf.png
+share/icons/gnome/22x22/devices/gnome-dev-media-ms.png
+share/icons/gnome/22x22/devices/gnome-dev-media-sdmmc.png
+share/icons/gnome/22x22/devices/gnome-dev-media-sm.png
+share/icons/gnome/22x22/devices/gnome-dev-mouse-ball.png
+share/icons/gnome/22x22/devices/gnome-dev-mouse-optical.png
+share/icons/gnome/22x22/devices/gnome-dev-printer.png
+share/icons/gnome/22x22/devices/gnome-dev-removable-1394.png
+share/icons/gnome/22x22/devices/gnome-dev-removable-usb.png
+share/icons/gnome/22x22/devices/gnome-dev-removable.png
+share/icons/gnome/22x22/devices/gnome-dev-wavelan.png
+share/icons/gnome/22x22/devices/gnome-fs-client.png
+share/icons/gnome/22x22/devices/gnome-stock-mic.png
+share/icons/gnome/22x22/devices/gtk-cdrom.png
+share/icons/gnome/22x22/devices/gtk-floppy.png
+share/icons/gnome/22x22/devices/gtk-harddisk.png
+share/icons/gnome/22x22/devices/harddrive.png
+share/icons/gnome/22x22/devices/hdd_unmount.png
+share/icons/gnome/22x22/devices/input-keyboard.png
+share/icons/gnome/22x22/devices/input-mouse.png
+share/icons/gnome/22x22/devices/ipod_mount.png
+share/icons/gnome/22x22/devices/keyboard.png
+share/icons/gnome/22x22/devices/kjobviewer.png
+share/icons/gnome/22x22/devices/kxkb.png
+share/icons/gnome/22x22/devices/media-cdrom.png
+share/icons/gnome/22x22/devices/media-flash.png
+share/icons/gnome/22x22/devices/media-floppy.png
+share/icons/gnome/22x22/devices/media-optical.png
+share/icons/gnome/22x22/devices/mouse.png
+share/icons/gnome/22x22/devices/multimedia-player.png
+share/icons/gnome/22x22/devices/network-wired.png
+share/icons/gnome/22x22/devices/network-wireless.png
+share/icons/gnome/22x22/devices/printer-remote.png
+share/icons/gnome/22x22/devices/printer.png
+share/icons/gnome/22x22/devices/printer1.png
+share/icons/gnome/22x22/devices/printmgr.png
+share/icons/gnome/22x22/devices/stock_mic.png
+share/icons/gnome/22x22/devices/stock_printers.png
+share/icons/gnome/22x22/devices/system-floppy.png
+share/icons/gnome/22x22/devices/system.png
+share/icons/gnome/22x22/devices/usbpendrive_unmount.png
+share/icons/gnome/22x22/devices/video-display.png
+share/icons/gnome/22x22/devices/xfce-printer.png
+share/icons/gnome/22x22/devices/xfce4-display.png
+share/icons/gnome/22x22/devices/xfce4-keyboard.png
+share/icons/gnome/22x22/devices/xfce4-mouse.png
+share/icons/gnome/22x22/devices/yast_HD.png
+share/icons/gnome/22x22/devices/yast_idetude.png
+share/icons/gnome/22x22/devices/yast_mouse.png
+share/icons/gnome/22x22/devices/yast_printer.png
+share/icons/gnome/22x22/emblems/emblem-favorite.png
+share/icons/gnome/22x22/emblems/emblem-important.png
+share/icons/gnome/22x22/emblems/emblem-new.png
+share/icons/gnome/22x22/emblems/emblem-package.png
+share/icons/gnome/22x22/emblems/emblem-symbolic-link.png
+share/icons/gnome/22x22/emblems/emblem-web.png
+share/icons/gnome/22x22/emblems/stock_mail-priority-high.png
+share/icons/gnome/22x22/mimetypes/application-certificate.png
+share/icons/gnome/22x22/mimetypes/application-x-executable.png
+share/icons/gnome/22x22/mimetypes/ascii.png
+share/icons/gnome/22x22/mimetypes/audio-x-generic.png
+share/icons/gnome/22x22/mimetypes/binary.png
+share/icons/gnome/22x22/mimetypes/contents2.png
+share/icons/gnome/22x22/mimetypes/deb.png
+share/icons/gnome/22x22/mimetypes/document.png
+share/icons/gnome/22x22/mimetypes/empty.png
+share/icons/gnome/22x22/mimetypes/exec.png
+share/icons/gnome/22x22/mimetypes/folder_tar.png
+share/icons/gnome/22x22/mimetypes/font-x-generic.png
+share/icons/gnome/22x22/mimetypes/font.png
+share/icons/gnome/22x22/mimetypes/font_bitmap.png
+share/icons/gnome/22x22/mimetypes/font_truetype.png
+share/icons/gnome/22x22/mimetypes/font_type1.png
+share/icons/gnome/22x22/mimetypes/gnome-fs-executable.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-magicpoint.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-msword.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-ogg.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-pdf.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-postscript.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-rtf.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.ms-excel.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.image.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.rn-realmedia.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.stardivision.impress.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.sun.xml.draw.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-wordperfect.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-7z-compressed.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-abiword.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-applix-spreadsheet.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-applix-word.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-archive.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-arj.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-bzip.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-compress.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-cpio-compressed.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-cpio.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-deb.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-dvi.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-executable.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-font-afm.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-font-bdf.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-font-linux-psf.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-font-pcf.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-font-sunos-news.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-font-ttf.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-gnumeric.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-gzip.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-gzpostscript.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-jar.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-killustrator.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-kpresenter.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-kspread.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-kword.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-lha.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-lhz.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-ms-dos-executable.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-perl.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-php.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-python-bytecode.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-rar.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-rpm.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-scribus.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-shellscript.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-shockwave-flash.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-stuffit.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-tar.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-tarz.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-tex.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-xhtml+xml.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-zip.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-audio.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-image.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-text-html.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-text-vnd.wap.wml.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-text-x-csh.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-text-x-python.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-text-x-sh.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-text-x-vcalendar.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-text-x-vcard.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-text-x-zsh.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-text.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-video.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-x-font-afm.png
+share/icons/gnome/22x22/mimetypes/gnome-package.png
+share/icons/gnome/22x22/mimetypes/html.png
+share/icons/gnome/22x22/mimetypes/image-x-generic.png
+share/icons/gnome/22x22/mimetypes/image.png
+share/icons/gnome/22x22/mimetypes/kpresenter_kpr.png
+share/icons/gnome/22x22/mimetypes/mime_ascii.png
+share/icons/gnome/22x22/mimetypes/misc.png
+share/icons/gnome/22x22/mimetypes/package-x-generic.png
+share/icons/gnome/22x22/mimetypes/package.png
+share/icons/gnome/22x22/mimetypes/package_editors.png
+share/icons/gnome/22x22/mimetypes/package_wordprocessing.png
+share/icons/gnome/22x22/mimetypes/plan.png
+share/icons/gnome/22x22/mimetypes/rpm.png
+share/icons/gnome/22x22/mimetypes/shellscript.png
+share/icons/gnome/22x22/mimetypes/sound.png
+share/icons/gnome/22x22/mimetypes/spreadsheet.png
+share/icons/gnome/22x22/mimetypes/stock_addressbook.png
+share/icons/gnome/22x22/mimetypes/stock_calendar.png
+share/icons/gnome/22x22/mimetypes/stock_certificate.png
+share/icons/gnome/22x22/mimetypes/stock_script.png
+share/icons/gnome/22x22/mimetypes/tar.png
+share/icons/gnome/22x22/mimetypes/template_source.png
+share/icons/gnome/22x22/mimetypes/text-html.png
+share/icons/gnome/22x22/mimetypes/text-x-generic-template.png
+share/icons/gnome/22x22/mimetypes/text-x-generic.png
+share/icons/gnome/22x22/mimetypes/text-x-script.png
+share/icons/gnome/22x22/mimetypes/tgz.png
+share/icons/gnome/22x22/mimetypes/txt.png
+share/icons/gnome/22x22/mimetypes/txt2.png
+share/icons/gnome/22x22/mimetypes/unknown.png
+share/icons/gnome/22x22/mimetypes/vcalendar.png
+share/icons/gnome/22x22/mimetypes/vcard.png
+share/icons/gnome/22x22/mimetypes/video-x-generic.png
+share/icons/gnome/22x22/mimetypes/video.png
+share/icons/gnome/22x22/mimetypes/wordprocessing.png
+share/icons/gnome/22x22/mimetypes/www.png
+share/icons/gnome/22x22/mimetypes/x-office-address-book.png
+share/icons/gnome/22x22/mimetypes/x-office-calendar.png
+share/icons/gnome/22x22/mimetypes/x-office-document.png
+share/icons/gnome/22x22/mimetypes/x-office-drawing.png
+share/icons/gnome/22x22/mimetypes/x-office-presentation.png
+share/icons/gnome/22x22/mimetypes/x-office-spreadsheet.png
+share/icons/gnome/22x22/mimetypes/zip.png
+share/icons/gnome/22x22/places/application-x-gnome-saved-search.png
+share/icons/gnome/22x22/places/desktop.png
+share/icons/gnome/22x22/places/distributor-logo.png
+share/icons/gnome/22x22/places/emptytrash.png
+share/icons/gnome/22x22/places/folder-remote.png
+share/icons/gnome/22x22/places/folder-saved-search.png
+share/icons/gnome/22x22/places/folder.icon
+share/icons/gnome/22x22/places/folder.png
+share/icons/gnome/22x22/places/folder_home.png
+share/icons/gnome/22x22/places/gnome-fs-desktop.png
+share/icons/gnome/22x22/places/gnome-fs-directory.icon
+share/icons/gnome/22x22/places/gnome-fs-directory.png
+share/icons/gnome/22x22/places/gnome-fs-ftp.png
+share/icons/gnome/22x22/places/gnome-fs-home.png
+share/icons/gnome/22x22/places/gnome-fs-network.png
+share/icons/gnome/22x22/places/gnome-fs-nfs.png
+share/icons/gnome/22x22/places/gnome-fs-server.png
+share/icons/gnome/22x22/places/gnome-fs-share.png
+share/icons/gnome/22x22/places/gnome-fs-smb.png
+share/icons/gnome/22x22/places/gnome-fs-ssh.png
+share/icons/gnome/22x22/places/gnome-fs-trash-empty.png
+share/icons/gnome/22x22/places/gnome-main-menu.png
+share/icons/gnome/22x22/places/gnome-mime-x-directory-nfs-server.png
+share/icons/gnome/22x22/places/gnome-mime-x-directory-smb-server.png
+share/icons/gnome/22x22/places/gnome-mime-x-directory-smb-share.png
+share/icons/gnome/22x22/places/gnome-mime-x-directory-smb-workgroup.png
+share/icons/gnome/22x22/places/gnome-stock-trash.png
+share/icons/gnome/22x22/places/gtk-network.png
+share/icons/gnome/22x22/places/network-server.png
+share/icons/gnome/22x22/places/network-workgroup.png
+share/icons/gnome/22x22/places/network.png
+share/icons/gnome/22x22/places/network_local.png
+share/icons/gnome/22x22/places/novell-button.png
+share/icons/gnome/22x22/places/redhat-network-server.png
+share/icons/gnome/22x22/places/server.png
+share/icons/gnome/22x22/places/start-here.png
+share/icons/gnome/22x22/places/stock_folder.icon
+share/icons/gnome/22x22/places/stock_folder.png
+share/icons/gnome/22x22/places/trashcan_empty.png
+share/icons/gnome/22x22/places/user-desktop.png
+share/icons/gnome/22x22/places/user-home.png
+share/icons/gnome/22x22/places/user-trash.png
+share/icons/gnome/22x22/places/xfce-trash_empty.png
+share/icons/gnome/22x22/status/appointment-missed.png
+share/icons/gnome/22x22/status/appointment-soon.png
+share/icons/gnome/22x22/status/connect_creating.png
+share/icons/gnome/22x22/status/connect_established.png
+share/icons/gnome/22x22/status/connect_no.png
+share/icons/gnome/22x22/status/dialog-error.png
+share/icons/gnome/22x22/status/dialog-information.png
+share/icons/gnome/22x22/status/dialog-warning.png
+share/icons/gnome/22x22/status/edittrash.png
+share/icons/gnome/22x22/status/error.png
+share/icons/gnome/22x22/status/folder-drag-accept.png
+share/icons/gnome/22x22/status/folder-open.png
+share/icons/gnome/22x22/status/folder-visiting.png
+share/icons/gnome/22x22/status/folder_open.png
+share/icons/gnome/22x22/status/gnome-dev-wavelan-encrypted.png
+share/icons/gnome/22x22/status/gnome-fs-directory-accept.png
+share/icons/gnome/22x22/status/gnome-fs-directory-visiting.png
+share/icons/gnome/22x22/status/gnome-fs-loading-icon.png
+share/icons/gnome/22x22/status/gnome-fs-trash-full.png
+share/icons/gnome/22x22/status/gnome-netstatus-disconn.png
+share/icons/gnome/22x22/status/gnome-netstatus-error.png
+share/icons/gnome/22x22/status/gnome-netstatus-idle.png
+share/icons/gnome/22x22/status/gnome-netstatus-rx.png
+share/icons/gnome/22x22/status/gnome-netstatus-tx.png
+share/icons/gnome/22x22/status/gnome-netstatus-txrx.png
+share/icons/gnome/22x22/status/gnome-stock-trash-full.png
+share/icons/gnome/22x22/status/gtk-dialog-error.png
+share/icons/gnome/22x22/status/gtk-dialog-info.png
+share/icons/gnome/22x22/status/gtk-dialog-warning.png
+share/icons/gnome/22x22/status/image-loading.png
+share/icons/gnome/22x22/status/important.png
+share/icons/gnome/22x22/status/info.png
+share/icons/gnome/22x22/status/media-playlist-repeat.png
+share/icons/gnome/22x22/status/media-playlist-shuffle.png
+share/icons/gnome/22x22/status/messagebox_critical.png
+share/icons/gnome/22x22/status/messagebox_info.png
+share/icons/gnome/22x22/status/messagebox_warning.png
+share/icons/gnome/22x22/status/network-error.png
+share/icons/gnome/22x22/status/network-idle.png
+share/icons/gnome/22x22/status/network-offline.png
+share/icons/gnome/22x22/status/network-receive.png
+share/icons/gnome/22x22/status/network-transmit-receive.png
+share/icons/gnome/22x22/status/network-transmit.png
+share/icons/gnome/22x22/status/network-wireless-encrypted.png
+share/icons/gnome/22x22/status/nm-adhoc.png
+share/icons/gnome/22x22/status/nm-device-wired.png
+share/icons/gnome/22x22/status/nm-device-wireless.png
+share/icons/gnome/22x22/status/nm-no-connection.png
+share/icons/gnome/22x22/status/stock_appointment-reminder-excl.png
+share/icons/gnome/22x22/status/stock_appointment-reminder.png
+share/icons/gnome/22x22/status/stock_dialog-error.png
+share/icons/gnome/22x22/status/stock_dialog-info.png
+share/icons/gnome/22x22/status/stock_dialog-warning.png
+share/icons/gnome/22x22/status/stock_open.png
+share/icons/gnome/22x22/status/stock_repeat.png
+share/icons/gnome/22x22/status/stock_shuffle.png
+share/icons/gnome/22x22/status/stock_trash_full.png
+share/icons/gnome/22x22/status/stock_weather-cloudy.png
+share/icons/gnome/22x22/status/stock_weather-few-clouds.png
+share/icons/gnome/22x22/status/stock_weather-night-clear.png
+share/icons/gnome/22x22/status/stock_weather-night-few-clouds.png
+share/icons/gnome/22x22/status/stock_weather-showers.png
+share/icons/gnome/22x22/status/stock_weather-snow.png
+share/icons/gnome/22x22/status/stock_weather-storm.png
+share/icons/gnome/22x22/status/stock_weather-sunny.png
+share/icons/gnome/22x22/status/sunny.png
+share/icons/gnome/22x22/status/trashcan_full.png
+share/icons/gnome/22x22/status/user-trash-full.png
+share/icons/gnome/22x22/status/weather-clear-night.png
+share/icons/gnome/22x22/status/weather-clear.png
+share/icons/gnome/22x22/status/weather-few-clouds-night.png
+share/icons/gnome/22x22/status/weather-few-clouds.png
+share/icons/gnome/22x22/status/weather-overcast.png
+share/icons/gnome/22x22/status/weather-severe-alert.png
+share/icons/gnome/22x22/status/weather-showers-scattered.png
+share/icons/gnome/22x22/status/weather-showers.png
+share/icons/gnome/22x22/status/weather-snow.png
+share/icons/gnome/22x22/status/weather-storm.png
+share/icons/gnome/22x22/status/xfce-trash_full.png
+share/icons/gnome/24x24/actions/add.png
+share/icons/gnome/24x24/actions/application-exit.png
+share/icons/gnome/24x24/actions/appointment-new.png
+share/icons/gnome/24x24/actions/appointment.png
+share/icons/gnome/24x24/actions/back.png
+share/icons/gnome/24x24/actions/bookmark-new.png
+share/icons/gnome/24x24/actions/bookmark_add.png
+share/icons/gnome/24x24/actions/bookmarks_list_add.png
+share/icons/gnome/24x24/actions/bottom.png
+share/icons/gnome/24x24/actions/centrejust.png
+share/icons/gnome/24x24/actions/document-new.png
+share/icons/gnome/24x24/actions/document-print-preview.png
+share/icons/gnome/24x24/actions/document-print.png
+share/icons/gnome/24x24/actions/document-save-as.png
+share/icons/gnome/24x24/actions/document-save.png
+share/icons/gnome/24x24/actions/down.png
+share/icons/gnome/24x24/actions/edit-copy.png
+share/icons/gnome/24x24/actions/edit-cut.png
+share/icons/gnome/24x24/actions/edit-delete.png
+share/icons/gnome/24x24/actions/edit-find-replace.png
+share/icons/gnome/24x24/actions/edit-find.png
+share/icons/gnome/24x24/actions/edit-paste.png
+share/icons/gnome/24x24/actions/edit-redo.png
+share/icons/gnome/24x24/actions/edit-undo.png
+share/icons/gnome/24x24/actions/editcopy.png
+share/icons/gnome/24x24/actions/editcut.png
+share/icons/gnome/24x24/actions/editdelete.png
+share/icons/gnome/24x24/actions/editpaste.png
+share/icons/gnome/24x24/actions/exit.png
+share/icons/gnome/24x24/actions/filefind.png
+share/icons/gnome/24x24/actions/filenew.png
+share/icons/gnome/24x24/actions/fileprint.png
+share/icons/gnome/24x24/actions/filequickprint.png
+share/icons/gnome/24x24/actions/filesave.png
+share/icons/gnome/24x24/actions/filesaveas.png
+share/icons/gnome/24x24/actions/find.png
+share/icons/gnome/24x24/actions/finish.png
+share/icons/gnome/24x24/actions/format-indent-less.png
+share/icons/gnome/24x24/actions/format-indent-more.png
+share/icons/gnome/24x24/actions/format-justify-center.png
+share/icons/gnome/24x24/actions/format-justify-fill.png
+share/icons/gnome/24x24/actions/format-justify-left.png
+share/icons/gnome/24x24/actions/format-justify-right.png
+share/icons/gnome/24x24/actions/format-text-bold.png
+share/icons/gnome/24x24/actions/format-text-italic.png
+share/icons/gnome/24x24/actions/format-text-strikethrough.png
+share/icons/gnome/24x24/actions/format-text-underline.png
+share/icons/gnome/24x24/actions/forward.png
+share/icons/gnome/24x24/actions/gnome-lockscreen.png
+share/icons/gnome/24x24/actions/gnome-run.png
+share/icons/gnome/24x24/actions/gnome-stock-mail-fwd.png
+share/icons/gnome/24x24/actions/gnome-stock-mail-new.png
+share/icons/gnome/24x24/actions/gnome-stock-mail-rpl.png
+share/icons/gnome/24x24/actions/gnome-stock-text-indent.png
+share/icons/gnome/24x24/actions/gnome-stock-text-unindent.png
+share/icons/gnome/24x24/actions/go-bottom.png
+share/icons/gnome/24x24/actions/go-down.png
+share/icons/gnome/24x24/actions/go-first.png
+share/icons/gnome/24x24/actions/go-home.png
+share/icons/gnome/24x24/actions/go-last.png
+share/icons/gnome/24x24/actions/go-next.png
+share/icons/gnome/24x24/actions/go-previous.png
+share/icons/gnome/24x24/actions/go-top.png
+share/icons/gnome/24x24/actions/go-up.png
+share/icons/gnome/24x24/actions/gohome.png
+share/icons/gnome/24x24/actions/gtk-add.png
+share/icons/gnome/24x24/actions/gtk-bold.png
+share/icons/gnome/24x24/actions/gtk-close.png
+share/icons/gnome/24x24/actions/gtk-copy.png
+share/icons/gnome/24x24/actions/gtk-cut.png
+share/icons/gnome/24x24/actions/gtk-delete.png
+share/icons/gnome/24x24/actions/gtk-edit.png
+share/icons/gnome/24x24/actions/gtk-find-and-replace.png
+share/icons/gnome/24x24/actions/gtk-find.png
+share/icons/gnome/24x24/actions/gtk-fullscreen.png
+share/icons/gnome/24x24/actions/gtk-go-back-ltr.png
+share/icons/gnome/24x24/actions/gtk-go-back-rtl.png
+share/icons/gnome/24x24/actions/gtk-go-down.png
+share/icons/gnome/24x24/actions/gtk-go-forward-ltr.png
+share/icons/gnome/24x24/actions/gtk-go-forward-rtl.png
+share/icons/gnome/24x24/actions/gtk-go-up.png
+share/icons/gnome/24x24/actions/gtk-goto-bottom.png
+share/icons/gnome/24x24/actions/gtk-goto-first-ltr.png
+share/icons/gnome/24x24/actions/gtk-goto-first-rtl.png
+share/icons/gnome/24x24/actions/gtk-goto-last-ltr.png
+share/icons/gnome/24x24/actions/gtk-goto-last-rtl.png
+share/icons/gnome/24x24/actions/gtk-goto-top.png
+share/icons/gnome/24x24/actions/gtk-home.png
+share/icons/gnome/24x24/actions/gtk-indent.png
+share/icons/gnome/24x24/actions/gtk-italic.png
+share/icons/gnome/24x24/actions/gtk-justify-center.png
+share/icons/gnome/24x24/actions/gtk-justify-fill.png
+share/icons/gnome/24x24/actions/gtk-justify-left.png
+share/icons/gnome/24x24/actions/gtk-justify-right.png
+share/icons/gnome/24x24/actions/gtk-leave-fullscreen.png
+share/icons/gnome/24x24/actions/gtk-media-forward-ltr.png
+share/icons/gnome/24x24/actions/gtk-media-forward-rtl.png
+share/icons/gnome/24x24/actions/gtk-media-next-ltr.png
+share/icons/gnome/24x24/actions/gtk-media-next-rtl.png
+share/icons/gnome/24x24/actions/gtk-media-pause.png
+share/icons/gnome/24x24/actions/gtk-media-play-ltr.png
+share/icons/gnome/24x24/actions/gtk-media-previous-ltr.png
+share/icons/gnome/24x24/actions/gtk-media-previous-rtl.png
+share/icons/gnome/24x24/actions/gtk-media-record.png
+share/icons/gnome/24x24/actions/gtk-media-rewind-ltr.png
+share/icons/gnome/24x24/actions/gtk-media-rewind-rtl.png
+share/icons/gnome/24x24/actions/gtk-media-stop.png
+share/icons/gnome/24x24/actions/gtk-new.png
+share/icons/gnome/24x24/actions/gtk-paste.png
+share/icons/gnome/24x24/actions/gtk-print-preview.png
+share/icons/gnome/24x24/actions/gtk-print.png
+share/icons/gnome/24x24/actions/gtk-quit.png
+share/icons/gnome/24x24/actions/gtk-redo-ltr.png
+share/icons/gnome/24x24/actions/gtk-refresh.png
+share/icons/gnome/24x24/actions/gtk-remove.png
+share/icons/gnome/24x24/actions/gtk-save-as.png
+share/icons/gnome/24x24/actions/gtk-save.png
+share/icons/gnome/24x24/actions/gtk-stop.png
+share/icons/gnome/24x24/actions/gtk-strikethrough.png
+share/icons/gnome/24x24/actions/gtk-underline.png
+share/icons/gnome/24x24/actions/gtk-undo-ltr.png
+share/icons/gnome/24x24/actions/gtk-unindent.png
+share/icons/gnome/24x24/actions/gtk-zoom-100.png
+share/icons/gnome/24x24/actions/gtk-zoom-fit.png
+share/icons/gnome/24x24/actions/gtk-zoom-in.png
+share/icons/gnome/24x24/actions/gtk-zoom-out.png
+share/icons/gnome/24x24/actions/kfm_home.png
+share/icons/gnome/24x24/actions/leftjust.png
+share/icons/gnome/24x24/actions/list-add.png
+share/icons/gnome/24x24/actions/list-remove.png
+share/icons/gnome/24x24/actions/lock.png
+share/icons/gnome/24x24/actions/mail-forward.png
+share/icons/gnome/24x24/actions/mail-mark-junk.png
+share/icons/gnome/24x24/actions/mail-mark-not-junk.png
+share/icons/gnome/24x24/actions/mail-message-new.png
+share/icons/gnome/24x24/actions/mail-reply-all.png
+share/icons/gnome/24x24/actions/mail-reply-sender.png
+share/icons/gnome/24x24/actions/mail-send-receive.png
+share/icons/gnome/24x24/actions/mail_forward.png
+share/icons/gnome/24x24/actions/mail_new.png
+share/icons/gnome/24x24/actions/mail_reply.png
+share/icons/gnome/24x24/actions/mail_replyall.png
+share/icons/gnome/24x24/actions/mail_spam.png
+share/icons/gnome/24x24/actions/media-playback-pause.png
+share/icons/gnome/24x24/actions/media-playback-start.png
+share/icons/gnome/24x24/actions/media-playback-stop.png
+share/icons/gnome/24x24/actions/media-record.png
+share/icons/gnome/24x24/actions/media-seek-backward.png
+share/icons/gnome/24x24/actions/media-seek-forward.png
+share/icons/gnome/24x24/actions/media-skip-backward.png
+share/icons/gnome/24x24/actions/media-skip-forward.png
+share/icons/gnome/24x24/actions/next.png
+share/icons/gnome/24x24/actions/player_end.png
+share/icons/gnome/24x24/actions/player_fwd.png
+share/icons/gnome/24x24/actions/player_pause.png
+share/icons/gnome/24x24/actions/player_play.png
+share/icons/gnome/24x24/actions/player_record.png
+share/icons/gnome/24x24/actions/player_rew.png
+share/icons/gnome/24x24/actions/player_start.png
+share/icons/gnome/24x24/actions/player_stop.png
+share/icons/gnome/24x24/actions/previous.png
+share/icons/gnome/24x24/actions/process-stop.png
+share/icons/gnome/24x24/actions/redhat-home.png
+share/icons/gnome/24x24/actions/redo.png
+share/icons/gnome/24x24/actions/reload.png
+share/icons/gnome/24x24/actions/reload3.png
+share/icons/gnome/24x24/actions/reload_all_tabs.png
+share/icons/gnome/24x24/actions/reload_page.png
+share/icons/gnome/24x24/actions/remove.png
+share/icons/gnome/24x24/actions/rightjust.png
+share/icons/gnome/24x24/actions/start.png
+share/icons/gnome/24x24/actions/stock_add-bookmark.png
+share/icons/gnome/24x24/actions/stock_bottom.png
+share/icons/gnome/24x24/actions/stock_close.png
+share/icons/gnome/24x24/actions/stock_copy.png
+share/icons/gnome/24x24/actions/stock_cut.png
+share/icons/gnome/24x24/actions/stock_delete.png
+share/icons/gnome/24x24/actions/stock_down.png
+share/icons/gnome/24x24/actions/stock_first.png
+share/icons/gnome/24x24/actions/stock_fullscreen.png
+share/icons/gnome/24x24/actions/stock_help-add-bookmark.png
+share/icons/gnome/24x24/actions/stock_home.png
+share/icons/gnome/24x24/actions/stock_last.png
+share/icons/gnome/24x24/actions/stock_leave-fullscreen.png
+share/icons/gnome/24x24/actions/stock_left.png
+share/icons/gnome/24x24/actions/stock_mail-compose.png
+share/icons/gnome/24x24/actions/stock_mail-forward.png
+share/icons/gnome/24x24/actions/stock_mail-reply-to-all.png
+share/icons/gnome/24x24/actions/stock_mail-reply.png
+share/icons/gnome/24x24/actions/stock_mail-send-receive.png
+share/icons/gnome/24x24/actions/stock_media-fwd.png
+share/icons/gnome/24x24/actions/stock_media-next.png
+share/icons/gnome/24x24/actions/stock_media-pause.png
+share/icons/gnome/24x24/actions/stock_media-play.png
+share/icons/gnome/24x24/actions/stock_media-prev.png
+share/icons/gnome/24x24/actions/stock_media-rec.png
+share/icons/gnome/24x24/actions/stock_media-rew.png
+share/icons/gnome/24x24/actions/stock_media-stop.png
+share/icons/gnome/24x24/actions/stock_new-appointment.png
+share/icons/gnome/24x24/actions/stock_new-tab.png
+share/icons/gnome/24x24/actions/stock_new-text.png
+share/icons/gnome/24x24/actions/stock_new-window.png
+share/icons/gnome/24x24/actions/stock_not-spam.png
+share/icons/gnome/24x24/actions/stock_paste.png
+share/icons/gnome/24x24/actions/stock_print-preview.png
+share/icons/gnome/24x24/actions/stock_print.png
+share/icons/gnome/24x24/actions/stock_redo.png
+share/icons/gnome/24x24/actions/stock_refresh.png
+share/icons/gnome/24x24/actions/stock_right.png
+share/icons/gnome/24x24/actions/stock_save-as.png
+share/icons/gnome/24x24/actions/stock_save.png
+share/icons/gnome/24x24/actions/stock_search-and-replace.png
+share/icons/gnome/24x24/actions/stock_search.png
+share/icons/gnome/24x24/actions/stock_spam.png
+share/icons/gnome/24x24/actions/stock_stop.png
+share/icons/gnome/24x24/actions/stock_text-strikethrough.png
+share/icons/gnome/24x24/actions/stock_text_bold.png
+share/icons/gnome/24x24/actions/stock_text_center.png
+share/icons/gnome/24x24/actions/stock_text_indent.png
+share/icons/gnome/24x24/actions/stock_text_italic.png
+share/icons/gnome/24x24/actions/stock_text_justify.png
+share/icons/gnome/24x24/actions/stock_text_left.png
+share/icons/gnome/24x24/actions/stock_text_right.png
+share/icons/gnome/24x24/actions/stock_text_underlined.png
+share/icons/gnome/24x24/actions/stock_text_unindent.png
+share/icons/gnome/24x24/actions/stock_top.png
+share/icons/gnome/24x24/actions/stock_undo.png
+share/icons/gnome/24x24/actions/stock_up.png
+share/icons/gnome/24x24/actions/stock_zoom-1.png
+share/icons/gnome/24x24/actions/stock_zoom-in.png
+share/icons/gnome/24x24/actions/stock_zoom-out.png
+share/icons/gnome/24x24/actions/stock_zoom-page.png
+share/icons/gnome/24x24/actions/stop.png
+share/icons/gnome/24x24/actions/system-lock-screen.png
+share/icons/gnome/24x24/actions/system-run.png
+share/icons/gnome/24x24/actions/tab-new.png
+share/icons/gnome/24x24/actions/tab_new.png
+share/icons/gnome/24x24/actions/text_bold.png
+share/icons/gnome/24x24/actions/text_italic.png
+share/icons/gnome/24x24/actions/text_strike.png
+share/icons/gnome/24x24/actions/text_under.png
+share/icons/gnome/24x24/actions/top.png
+share/icons/gnome/24x24/actions/undo.png
+share/icons/gnome/24x24/actions/up.png
+share/icons/gnome/24x24/actions/view-fullscreen.png
+share/icons/gnome/24x24/actions/view-refresh.png
+share/icons/gnome/24x24/actions/view-restore.png
+share/icons/gnome/24x24/actions/window-close.png
+share/icons/gnome/24x24/actions/window-new.png
+share/icons/gnome/24x24/actions/window_fullscreen.png
+share/icons/gnome/24x24/actions/window_new.png
+share/icons/gnome/24x24/actions/window_nofullscreen.png
+share/icons/gnome/24x24/actions/xfce-system-exit.png
+share/icons/gnome/24x24/actions/xfce-system-lock.png
+share/icons/gnome/24x24/actions/zoom-best-fit.png
+share/icons/gnome/24x24/actions/zoom-in.png
+share/icons/gnome/24x24/actions/zoom-original.png
+share/icons/gnome/24x24/actions/zoom-out.png
+share/icons/gnome/24x24/animations/gnome-spinner-rest.png
+share/icons/gnome/24x24/animations/gnome-spinner.png
+share/icons/gnome/24x24/animations/process-idle.png
+share/icons/gnome/24x24/animations/process-working.png
+share/icons/gnome/24x24/apps/access.png
share/icons/gnome/24x24/apps/accessibility-directory.png
+share/icons/gnome/24x24/apps/accessories-calculator.png
+share/icons/gnome/24x24/apps/accessories-text-editor.png
share/icons/gnome/24x24/apps/administration.png
share/icons/gnome/24x24/apps/advanced-directory.png
share/icons/gnome/24x24/apps/apacheconf.png
share/icons/gnome/24x24/apps/applets-screenshooter.png
-share/icons/gnome/24x24/apps/beep-media-player.png
+share/icons/gnome/24x24/apps/arts.png
+share/icons/gnome/24x24/apps/background.png
share/icons/gnome/24x24/apps/boot.png
-share/icons/gnome/24x24/apps/burner.png
+share/icons/gnome/24x24/apps/calc.png
share/icons/gnome/24x24/apps/character-picker.png
-share/icons/gnome/24x24/apps/clock.png
share/icons/gnome/24x24/apps/config-language.png
share/icons/gnome/24x24/apps/config-users.png
share/icons/gnome/24x24/apps/display-capplet.png
@@ -1112,60 +2511,59 @@ share/icons/gnome/24x24/apps/evolution-calendar.png
share/icons/gnome/24x24/apps/evolution-mail.png
share/icons/gnome/24x24/apps/evolution-tasks.png
share/icons/gnome/24x24/apps/evolution.png
-share/icons/gnome/24x24/apps/gaim.png
+share/icons/gnome/24x24/apps/file-manager.png
+share/icons/gnome/24x24/apps/fonts.png
share/icons/gnome/24x24/apps/gdm.png
-share/icons/gnome/24x24/apps/gftp.png
share/icons/gnome/24x24/apps/gnome-amusements.png
share/icons/gnome/24x24/apps/gnome-applications.png
share/icons/gnome/24x24/apps/gnome-audio.png
share/icons/gnome/24x24/apps/gnome-calculator.png
-share/icons/gnome/24x24/apps/gnome-cdplayer-icon.png
-share/icons/gnome/24x24/apps/gnome-control-center.png
share/icons/gnome/24x24/apps/gnome-cpu.png
share/icons/gnome/24x24/apps/gnome-desktop-config.png
-share/icons/gnome/24x24/apps/gnome-devel.png
share/icons/gnome/24x24/apps/gnome-eyes.png
share/icons/gnome/24x24/apps/gnome-favorites.png
share/icons/gnome/24x24/apps/gnome-finance.png
-share/icons/gnome/24x24/apps/gnome-globe.png
-share/icons/gnome/24x24/apps/gnome-gnomine.png
-share/icons/gnome/24x24/apps/gnome-graphics.png
-share/icons/gnome/24x24/apps/gnome-gsame.png
share/icons/gnome/24x24/apps/gnome-help.png
-share/icons/gnome/24x24/apps/gnome-joystick.png
-share/icons/gnome/24x24/apps/gnome-lockscreen.png
share/icons/gnome/24x24/apps/gnome-logout.png
share/icons/gnome/24x24/apps/gnome-mini-commander.png
-share/icons/gnome/24x24/apps/gnome-modem.png
-share/icons/gnome/24x24/apps/gnome-money.png
+share/icons/gnome/24x24/apps/gnome-mixer.png
share/icons/gnome/24x24/apps/gnome-monitor.png
-share/icons/gnome/24x24/apps/gnome-multimedia.png
-share/icons/gnome/24x24/apps/gnome-netstatus-disconn.png
-share/icons/gnome/24x24/apps/gnome-netstatus-error.png
-share/icons/gnome/24x24/apps/gnome-netstatus-idle.png
-share/icons/gnome/24x24/apps/gnome-netstatus-rx.png
-share/icons/gnome/24x24/apps/gnome-netstatus-tx.png
-share/icons/gnome/24x24/apps/gnome-netstatus-txrx.png
share/icons/gnome/24x24/apps/gnome-networktool.png
-share/icons/gnome/24x24/apps/gnome-nibbles.png
-share/icons/gnome/24x24/apps/gnome-office.png
-share/icons/gnome/24x24/apps/gnome-panel.png
-share/icons/gnome/24x24/apps/gnome-run.png
share/icons/gnome/24x24/apps/gnome-searchtool.png
share/icons/gnome/24x24/apps/gnome-session.png
+share/icons/gnome/24x24/apps/gnome-settings-accessibility-technologies.png
share/icons/gnome/24x24/apps/gnome-settings-background.png
share/icons/gnome/24x24/apps/gnome-settings-font.png
share/icons/gnome/24x24/apps/gnome-settings-keybindings.png
share/icons/gnome/24x24/apps/gnome-settings-sound.png
share/icons/gnome/24x24/apps/gnome-settings-theme.png
share/icons/gnome/24x24/apps/gnome-settings-ui-behavior.png
-share/icons/gnome/24x24/apps/gnome-settings.png
share/icons/gnome/24x24/apps/gnome-shutdown.png
share/icons/gnome/24x24/apps/gnome-status.png
share/icons/gnome/24x24/apps/gnome-terminal.png
share/icons/gnome/24x24/apps/gnome-unknown.png
share/icons/gnome/24x24/apps/gnome-window-manager.png
+share/icons/gnome/24x24/apps/gtk-help.png
+share/icons/gnome/24x24/apps/help-browser.png
+share/icons/gnome/24x24/apps/help.png
+share/icons/gnome/24x24/apps/im-aim.png
+share/icons/gnome/24x24/apps/im-icq.png
+share/icons/gnome/24x24/apps/im-jabber.png
+share/icons/gnome/24x24/apps/im-msn.png
+share/icons/gnome/24x24/apps/im-nov.png
+share/icons/gnome/24x24/apps/im-yahoo.png
share/icons/gnome/24x24/apps/image-viewer.png
+share/icons/gnome/24x24/apps/kcalc.png
+share/icons/gnome/24x24/apps/kcmsound.png
+share/icons/gnome/24x24/apps/kedit.png
+share/icons/gnome/24x24/apps/kfm.png
+share/icons/gnome/24x24/apps/khelpcenter.png
+share/icons/gnome/24x24/apps/konsole.png
+share/icons/gnome/24x24/apps/kscreensaver.png
+share/icons/gnome/24x24/apps/ksysguard.png
+share/icons/gnome/24x24/apps/logviewer.png
+share/icons/gnome/24x24/apps/multimedia-volume-control.png
+share/icons/gnome/24x24/apps/multimedia.png
share/icons/gnome/24x24/apps/ooo_calc.png
share/icons/gnome/24x24/apps/ooo_draw.png
share/icons/gnome/24x24/apps/ooo_gulls.png
@@ -1175,19 +2573,96 @@ share/icons/gnome/24x24/apps/ooo_printeradmin.png
share/icons/gnome/24x24/apps/ooo_template.png
share/icons/gnome/24x24/apps/ooo_web.png
share/icons/gnome/24x24/apps/ooo_writer.png
-share/icons/gnome/24x24/apps/panel-notification-area.png
-share/icons/gnome/24x24/apps/panel-window-list.png
-share/icons/gnome/24x24/apps/panel-window-menu.png
+share/icons/gnome/24x24/apps/openterm.png
share/icons/gnome/24x24/apps/postscript-viewer.png
+share/icons/gnome/24x24/apps/preferences-desktop-accessibility.png
+share/icons/gnome/24x24/apps/preferences-desktop-font.png
+share/icons/gnome/24x24/apps/preferences-desktop-screensaver.png
+share/icons/gnome/24x24/apps/preferences-desktop-theme.png
+share/icons/gnome/24x24/apps/preferences-desktop-wallpaper.png
+share/icons/gnome/24x24/apps/redhat-filemanager.png
share/icons/gnome/24x24/apps/screensaver.png
share/icons/gnome/24x24/apps/shares.png
share/icons/gnome/24x24/apps/stock-ticker.png
+share/icons/gnome/24x24/apps/stock_help.png
+share/icons/gnome/24x24/apps/style.png
+share/icons/gnome/24x24/apps/susehelpcenter.png
+share/icons/gnome/24x24/apps/system-file-manager.png
+share/icons/gnome/24x24/apps/terminal.png
share/icons/gnome/24x24/apps/text-editor.png
-share/icons/gnome/24x24/apps/tsclient.png
+share/icons/gnome/24x24/apps/utilities-system-monitor.png
+share/icons/gnome/24x24/apps/utilities-terminal.png
share/icons/gnome/24x24/apps/volume-knob.png
+share/icons/gnome/24x24/apps/wallpaper.png
+share/icons/gnome/24x24/apps/web-browser.png
+share/icons/gnome/24x24/apps/xfce-filemanager.png
+share/icons/gnome/24x24/apps/xfce-terminal.png
+share/icons/gnome/24x24/apps/xfce4-backdrop.png
+share/icons/gnome/24x24/apps/xfce4-mixer.png
+share/icons/gnome/24x24/apps/xscreensaver.png
+share/icons/gnome/24x24/categories/applications-accessories.png
+share/icons/gnome/24x24/categories/applications-development.png
+share/icons/gnome/24x24/categories/applications-games.png
+share/icons/gnome/24x24/categories/applications-graphics.png
+share/icons/gnome/24x24/categories/applications-internet.png
+share/icons/gnome/24x24/categories/applications-multimedia.png
+share/icons/gnome/24x24/categories/applications-office.png
+share/icons/gnome/24x24/categories/gnome-applications.png
+share/icons/gnome/24x24/categories/gnome-control-center.png
+share/icons/gnome/24x24/categories/gnome-devel.png
+share/icons/gnome/24x24/categories/gnome-globe.png
+share/icons/gnome/24x24/categories/gnome-graphics.png
+share/icons/gnome/24x24/categories/gnome-joystick.png
+share/icons/gnome/24x24/categories/gnome-multimedia.png
+share/icons/gnome/24x24/categories/gnome-settings.png
+share/icons/gnome/24x24/categories/gnome-util.png
+share/icons/gnome/24x24/categories/gtk-preferences.png
+share/icons/gnome/24x24/categories/kcontrol.png
+share/icons/gnome/24x24/categories/package_development.png
+share/icons/gnome/24x24/categories/package_games.png
+share/icons/gnome/24x24/categories/package_graphics.png
+share/icons/gnome/24x24/categories/package_multimedia.png
+share/icons/gnome/24x24/categories/package_network.png
+share/icons/gnome/24x24/categories/package_office.png
+share/icons/gnome/24x24/categories/package_settings.png
+share/icons/gnome/24x24/categories/package_utilities.png
+share/icons/gnome/24x24/categories/preferences-desktop.png
+share/icons/gnome/24x24/categories/preferences-system.png
+share/icons/gnome/24x24/categories/redhat-accessories.png
+share/icons/gnome/24x24/categories/redhat-games.png
+share/icons/gnome/24x24/categories/redhat-graphics.png
+share/icons/gnome/24x24/categories/redhat-internet.png
+share/icons/gnome/24x24/categories/redhat-office.png
+share/icons/gnome/24x24/categories/redhat-preferences.png
+share/icons/gnome/24x24/categories/redhat-programming.png
+share/icons/gnome/24x24/categories/redhat-sound_video.png
+share/icons/gnome/24x24/categories/redhat-system_settings.png
+share/icons/gnome/24x24/categories/stock_internet.png
+share/icons/gnome/24x24/categories/xfce-games.png
+share/icons/gnome/24x24/categories/xfce-graphics.png
+share/icons/gnome/24x24/categories/xfce-internet.png
+share/icons/gnome/24x24/categories/xfce-multimedia.png
+share/icons/gnome/24x24/categories/xfce-office.png
+share/icons/gnome/24x24/categories/xfce-system-settings.png
+share/icons/gnome/24x24/categories/xfce-utils.png
+share/icons/gnome/24x24/categories/xfce4-settings.png
+share/icons/gnome/24x24/devices/3floppy_unmount.png
+share/icons/gnome/24x24/devices/audio-input-microphone.png
+share/icons/gnome/24x24/devices/battery.png
+share/icons/gnome/24x24/devices/cdrom_unmount.png
+share/icons/gnome/24x24/devices/cdwriter_unmount.png
+share/icons/gnome/24x24/devices/chardevice.png
+share/icons/gnome/24x24/devices/computer.png
+share/icons/gnome/24x24/devices/display.png
+share/icons/gnome/24x24/devices/drive-cdrom.png
+share/icons/gnome/24x24/devices/drive-harddisk.png
+share/icons/gnome/24x24/devices/drive-optical.png
+share/icons/gnome/24x24/devices/drive-removable-media.png
+share/icons/gnome/24x24/devices/dvd_unmount.png
share/icons/gnome/24x24/devices/gnome-dev-battery.png
share/icons/gnome/24x24/devices/gnome-dev-cdrom-audio.png
share/icons/gnome/24x24/devices/gnome-dev-cdrom.png
+share/icons/gnome/24x24/devices/gnome-dev-computer.png
share/icons/gnome/24x24/devices/gnome-dev-disc-cdr.png
share/icons/gnome/24x24/devices/gnome-dev-disc-cdrw.png
share/icons/gnome/24x24/devices/gnome-dev-disc-dvdr-plus.png
@@ -1202,41 +2677,352 @@ share/icons/gnome/24x24/devices/gnome-dev-harddisk-1394.png
share/icons/gnome/24x24/devices/gnome-dev-harddisk-usb.png
share/icons/gnome/24x24/devices/gnome-dev-harddisk.png
share/icons/gnome/24x24/devices/gnome-dev-ipod.png
+share/icons/gnome/24x24/devices/gnome-dev-keyboard.png
share/icons/gnome/24x24/devices/gnome-dev-media-cf.png
share/icons/gnome/24x24/devices/gnome-dev-media-ms.png
share/icons/gnome/24x24/devices/gnome-dev-media-sdmmc.png
share/icons/gnome/24x24/devices/gnome-dev-media-sm.png
-share/icons/gnome/24x24/devices/gnome-dev-memory.png
share/icons/gnome/24x24/devices/gnome-dev-mouse-ball.png
-share/icons/gnome/24x24/devices/gnome-dev-pci.png
+share/icons/gnome/24x24/devices/gnome-dev-mouse-optical.png
share/icons/gnome/24x24/devices/gnome-dev-printer.png
share/icons/gnome/24x24/devices/gnome-dev-removable-1394.png
share/icons/gnome/24x24/devices/gnome-dev-removable-usb.png
share/icons/gnome/24x24/devices/gnome-dev-removable.png
-share/icons/gnome/24x24/devices/gnome-dev-wavelan-encrypted.png
share/icons/gnome/24x24/devices/gnome-dev-wavelan.png
+share/icons/gnome/24x24/devices/gnome-fs-client.png
+share/icons/gnome/24x24/devices/gnome-modem.png
+share/icons/gnome/24x24/devices/gnome-stock-mic.png
+share/icons/gnome/24x24/devices/gtk-cdrom.png
+share/icons/gnome/24x24/devices/gtk-floppy.png
+share/icons/gnome/24x24/devices/gtk-harddisk.png
+share/icons/gnome/24x24/devices/harddrive.png
+share/icons/gnome/24x24/devices/hdd_unmount.png
+share/icons/gnome/24x24/devices/input-keyboard.png
+share/icons/gnome/24x24/devices/input-mouse.png
+share/icons/gnome/24x24/devices/ipod_mount.png
+share/icons/gnome/24x24/devices/keyboard.png
+share/icons/gnome/24x24/devices/kjobviewer.png
+share/icons/gnome/24x24/devices/kxkb.png
+share/icons/gnome/24x24/devices/media-cdrom.png
+share/icons/gnome/24x24/devices/media-flash.png
+share/icons/gnome/24x24/devices/media-floppy.png
+share/icons/gnome/24x24/devices/media-optical.png
+share/icons/gnome/24x24/devices/modem.png
+share/icons/gnome/24x24/devices/mouse.png
+share/icons/gnome/24x24/devices/multimedia-player.png
+share/icons/gnome/24x24/devices/network-wired.png
+share/icons/gnome/24x24/devices/network-wireless.png
+share/icons/gnome/24x24/devices/printer-remote.png
+share/icons/gnome/24x24/devices/printer.png
+share/icons/gnome/24x24/devices/printer1.png
+share/icons/gnome/24x24/devices/printmgr.png
+share/icons/gnome/24x24/devices/stock_mic.png
+share/icons/gnome/24x24/devices/stock_printers.png
+share/icons/gnome/24x24/devices/system-floppy.png
+share/icons/gnome/24x24/devices/system.png
+share/icons/gnome/24x24/devices/video-display.png
+share/icons/gnome/24x24/devices/usbpendrive_unmount.png
+share/icons/gnome/24x24/devices/xfce-printer.png
+share/icons/gnome/24x24/devices/xfce4-display.png
+share/icons/gnome/24x24/devices/xfce4-keyboard.png
+share/icons/gnome/24x24/devices/xfce4-mouse.png
+share/icons/gnome/24x24/devices/yast_HD.png
+share/icons/gnome/24x24/devices/yast_idetude.png
+share/icons/gnome/24x24/devices/yast_mouse.png
+share/icons/gnome/24x24/devices/yast_printer.png
+share/icons/gnome/24x24/emblems/emblem-favorite.png
+share/icons/gnome/24x24/emblems/emblem-important.png
+share/icons/gnome/24x24/emblems/emblem-new.png
+share/icons/gnome/24x24/emblems/emblem-package.png
share/icons/gnome/24x24/emblems/emblem-symbolic-link.png
+share/icons/gnome/24x24/emblems/emblem-web.png
+share/icons/gnome/24x24/emblems/stock_mail-priority-high.png
share/icons/gnome/24x24/filesystems/gnome-fs-bookmark-missing.png
share/icons/gnome/24x24/filesystems/gnome-fs-bookmark.png
-share/icons/gnome/24x24/filesystems/gnome-fs-client.png
-share/icons/gnome/24x24/filesystems/gnome-fs-desktop.png
-share/icons/gnome/24x24/filesystems/gnome-fs-directory-accept.icon
-share/icons/gnome/24x24/filesystems/gnome-fs-directory-accept.png
-share/icons/gnome/24x24/filesystems/gnome-fs-directory-visiting.icon
-share/icons/gnome/24x24/filesystems/gnome-fs-directory-visiting.png
-share/icons/gnome/24x24/filesystems/gnome-fs-directory.icon
-share/icons/gnome/24x24/filesystems/gnome-fs-directory.png
-share/icons/gnome/24x24/filesystems/gnome-fs-home.png
-share/icons/gnome/24x24/filesystems/gnome-fs-locally-shared.png
-share/icons/gnome/24x24/filesystems/gnome-fs-network.png
-share/icons/gnome/24x24/filesystems/gnome-fs-server.png
-share/icons/gnome/24x24/filesystems/gnome-fs-share-private.png
-share/icons/gnome/24x24/filesystems/gnome-fs-share.png
-share/icons/gnome/24x24/filesystems/gnome-fs-trash-empty.png
-share/icons/gnome/24x24/filesystems/gnome-fs-trash-full.png
-share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-gnome-saved-search.png
+share/icons/gnome/24x24/mimetypes/application-certificate.png
+share/icons/gnome/24x24/mimetypes/application-x-executable.png
+share/icons/gnome/24x24/mimetypes/ascii.png
+share/icons/gnome/24x24/mimetypes/audio-x-generic.png
+share/icons/gnome/24x24/mimetypes/binary.png
+share/icons/gnome/24x24/mimetypes/contents2.png
+share/icons/gnome/24x24/mimetypes/deb.png
+share/icons/gnome/24x24/mimetypes/document.png
+share/icons/gnome/24x24/mimetypes/empty.png
+share/icons/gnome/24x24/mimetypes/exec.png
+share/icons/gnome/24x24/mimetypes/folder_tar.png
+share/icons/gnome/24x24/mimetypes/font-x-generic.png
+share/icons/gnome/24x24/mimetypes/font.png
+share/icons/gnome/24x24/mimetypes/font_bitmap.png
+share/icons/gnome/24x24/mimetypes/font_truetype.png
+share/icons/gnome/24x24/mimetypes/font_type1.png
+share/icons/gnome/24x24/mimetypes/gnome-fs-executable.png
+share/icons/gnome/24x24/mimetypes/gnome-fs-regular.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-magicpoint.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-msword.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-ogg.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-pdf.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-postscript.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-rtf.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.ms-excel.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.image.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.rn-realmedia.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.stardivision.impress.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.sun.xml.draw.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-wordperfect.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-7z-compressed.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-abiword.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-applix-spreadsheet.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-applix-word.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-archive.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-arj.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-bzip.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-compress.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-cpio-compressed.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-cpio.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-deb.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-dvi.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-executable.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-font-afm.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-font-bdf.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-font-linux-psf.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-font-pcf.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-font-sunos-news.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-font-ttf.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-gnumeric.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-gzip.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-gzpostscript.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-jar.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-killustrator.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-kpresenter.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-kspread.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-kword.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-lha.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-lhz.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-ms-dos-executable.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-perl.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-php.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-python-bytecode.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-rar.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-rpm.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-scribus.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-shellscript.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-shockwave-flash.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-stuffit.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-tar.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-tarz.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-tex.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-xhtml+xml.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-zip.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-audio.png
share/icons/gnome/24x24/mimetypes/gnome-mime-image.png
-share/icons/gnome/24x24/mimetypes/gnome-mime-x-directory-nfs-server.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-text-html.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-text-vnd.wap.wml.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-text-x-csh.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-text-x-python.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-text-x-sh.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-text-x-vcalendar.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-text-x-vcard.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-text-x-zsh.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-text.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-video.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-x-font-afm.png
+share/icons/gnome/24x24/mimetypes/gnome-package.png
+share/icons/gnome/24x24/mimetypes/gtk-file.png
+share/icons/gnome/24x24/mimetypes/html.png
+share/icons/gnome/24x24/mimetypes/image-x-generic.png
+share/icons/gnome/24x24/mimetypes/image.png
+share/icons/gnome/24x24/mimetypes/kpresenter_kpr.png
+share/icons/gnome/24x24/mimetypes/mime_ascii.png
+share/icons/gnome/24x24/mimetypes/misc.png
+share/icons/gnome/24x24/mimetypes/package-x-generic.png
+share/icons/gnome/24x24/mimetypes/package.png
+share/icons/gnome/24x24/mimetypes/package_editors.png
+share/icons/gnome/24x24/mimetypes/package_wordprocessing.png
+share/icons/gnome/24x24/mimetypes/plan.png
+share/icons/gnome/24x24/mimetypes/rpm.png
+share/icons/gnome/24x24/mimetypes/shellscript.png
+share/icons/gnome/24x24/mimetypes/sound.png
+share/icons/gnome/24x24/mimetypes/spreadsheet.png
+share/icons/gnome/24x24/mimetypes/stock_addressbook.png
+share/icons/gnome/24x24/mimetypes/stock_calendar.png
+share/icons/gnome/24x24/mimetypes/stock_certificate.png
+share/icons/gnome/24x24/mimetypes/stock_script.png
+share/icons/gnome/24x24/mimetypes/tar.png
+share/icons/gnome/24x24/mimetypes/template_source.png
+share/icons/gnome/24x24/mimetypes/text-html.png
+share/icons/gnome/24x24/mimetypes/text-x-generic-template.png
+share/icons/gnome/24x24/mimetypes/text-x-generic.png
+share/icons/gnome/24x24/mimetypes/text-x-preview.png
+share/icons/gnome/24x24/mimetypes/text-x-script.png
+share/icons/gnome/24x24/mimetypes/tgz.png
+share/icons/gnome/24x24/mimetypes/txt.png
+share/icons/gnome/24x24/mimetypes/txt2.png
+share/icons/gnome/24x24/mimetypes/unknown.png
+share/icons/gnome/24x24/mimetypes/vcalendar.png
+share/icons/gnome/24x24/mimetypes/vcard.png
+share/icons/gnome/24x24/mimetypes/video-x-generic.png
+share/icons/gnome/24x24/mimetypes/video.png
+share/icons/gnome/24x24/mimetypes/wordprocessing.png
+share/icons/gnome/24x24/mimetypes/www.png
+share/icons/gnome/24x24/mimetypes/x-office-address-book.png
+share/icons/gnome/24x24/mimetypes/x-office-calendar.png
+share/icons/gnome/24x24/mimetypes/x-office-document.png
+share/icons/gnome/24x24/mimetypes/x-office-drawing.png
+share/icons/gnome/24x24/mimetypes/x-office-presentation.png
+share/icons/gnome/24x24/mimetypes/x-office-spreadsheet.png
+share/icons/gnome/24x24/mimetypes/zip.png
+share/icons/gnome/24x24/places/application-x-gnome-saved-search.png
+share/icons/gnome/24x24/places/desktop.png
+share/icons/gnome/24x24/places/distributor-logo.png
+share/icons/gnome/24x24/places/emptytrash.png
+share/icons/gnome/24x24/places/folder-remote.png
+share/icons/gnome/24x24/places/folder-saved-search.png
+share/icons/gnome/24x24/places/folder.icon
+share/icons/gnome/24x24/places/folder.png
+share/icons/gnome/24x24/places/folder_home.png
+share/icons/gnome/24x24/places/gnome-fs-desktop.png
+share/icons/gnome/24x24/places/gnome-fs-directory.icon
+share/icons/gnome/24x24/places/gnome-fs-directory.png
+share/icons/gnome/24x24/places/gnome-fs-ftp.png
+share/icons/gnome/24x24/places/gnome-fs-home.png
+share/icons/gnome/24x24/places/gnome-fs-network.png
+share/icons/gnome/24x24/places/gnome-fs-nfs.png
+share/icons/gnome/24x24/places/gnome-fs-server.png
+share/icons/gnome/24x24/places/gnome-fs-share.png
+share/icons/gnome/24x24/places/gnome-fs-smb.png
+share/icons/gnome/24x24/places/gnome-fs-ssh.png
+share/icons/gnome/24x24/places/gnome-fs-trash-empty.png
+share/icons/gnome/24x24/places/gnome-main-menu.png
+share/icons/gnome/24x24/places/gnome-mime-x-directory-nfs-server.png
+share/icons/gnome/24x24/places/gnome-mime-x-directory-smb-server.png
+share/icons/gnome/24x24/places/gnome-mime-x-directory-smb-share.png
+share/icons/gnome/24x24/places/gnome-mime-x-directory-smb-workgroup.png
+share/icons/gnome/24x24/places/gnome-stock-trash.png
+share/icons/gnome/24x24/places/gtk-network.png
+share/icons/gnome/24x24/places/network-server.png
+share/icons/gnome/24x24/places/network-workgroup.png
+share/icons/gnome/24x24/places/network.png
+share/icons/gnome/24x24/places/network_local.png
+share/icons/gnome/24x24/places/novell-button.png
+share/icons/gnome/24x24/places/redhat-network-server.png
+share/icons/gnome/24x24/places/server.png
+share/icons/gnome/24x24/places/start-here.png
+share/icons/gnome/24x24/places/stock_folder.icon
+share/icons/gnome/24x24/places/stock_folder.png
+share/icons/gnome/24x24/places/trashcan_empty.png
+share/icons/gnome/24x24/places/user-desktop.png
+share/icons/gnome/24x24/places/user-home.png
+share/icons/gnome/24x24/places/user-trash.png
+share/icons/gnome/24x24/places/xfce-trash_empty.png
+share/icons/gnome/24x24/status/appointment-missed.png
+share/icons/gnome/24x24/status/appointment-soon.png
+share/icons/gnome/24x24/status/audio-volume-high.png
+share/icons/gnome/24x24/status/audio-volume-low.png
+share/icons/gnome/24x24/status/audio-volume-medium.png
+share/icons/gnome/24x24/status/audio-volume-muted.png
+share/icons/gnome/24x24/status/connect_creating.png
+share/icons/gnome/24x24/status/connect_established.png
+share/icons/gnome/24x24/status/connect_no.png
+share/icons/gnome/24x24/status/dialog-error.png
+share/icons/gnome/24x24/status/dialog-information.png
+share/icons/gnome/24x24/status/dialog-warning.png
+share/icons/gnome/24x24/status/edittrash.png
+share/icons/gnome/24x24/status/error.png
+share/icons/gnome/24x24/status/folder-drag-accept.icon
+share/icons/gnome/24x24/status/folder-drag-accept.png
+share/icons/gnome/24x24/status/folder-open.png
+share/icons/gnome/24x24/status/folder-visiting.icon
+share/icons/gnome/24x24/status/folder-visiting.png
+share/icons/gnome/24x24/status/folder_open.png
+share/icons/gnome/24x24/status/gnome-dev-wavelan-encrypted.png
+share/icons/gnome/24x24/status/gnome-fs-directory-accept.icon
+share/icons/gnome/24x24/status/gnome-fs-directory-accept.png
+share/icons/gnome/24x24/status/gnome-fs-directory-visiting.icon
+share/icons/gnome/24x24/status/gnome-fs-directory-visiting.png
+share/icons/gnome/24x24/status/gnome-fs-loading-icon.png
+share/icons/gnome/24x24/status/gnome-fs-trash-full.png
+share/icons/gnome/24x24/status/gnome-netstatus-disconn.png
+share/icons/gnome/24x24/status/gnome-netstatus-error.png
+share/icons/gnome/24x24/status/gnome-netstatus-idle.png
+share/icons/gnome/24x24/status/gnome-netstatus-rx.png
+share/icons/gnome/24x24/status/gnome-netstatus-tx.png
+share/icons/gnome/24x24/status/gnome-netstatus-txrx.png
+share/icons/gnome/24x24/status/gnome-stock-trash-full.png
+share/icons/gnome/24x24/status/gtk-dialog-error.png
+share/icons/gnome/24x24/status/gtk-dialog-info.png
+share/icons/gnome/24x24/status/gtk-dialog-warning.png
+share/icons/gnome/24x24/status/image-loading.png
+share/icons/gnome/24x24/status/important.png
+share/icons/gnome/24x24/status/info.png
+share/icons/gnome/24x24/status/media-playlist-repeat.png
+share/icons/gnome/24x24/status/media-playlist-shuffle.png
+share/icons/gnome/24x24/status/messagebox_critical.png
+share/icons/gnome/24x24/status/messagebox_info.png
+share/icons/gnome/24x24/status/messagebox_warning.png
+share/icons/gnome/24x24/status/network-error.png
+share/icons/gnome/24x24/status/network-idle.png
+share/icons/gnome/24x24/status/network-offline.png
+share/icons/gnome/24x24/status/network-receive.png
+share/icons/gnome/24x24/status/network-transmit-receive.png
+share/icons/gnome/24x24/status/network-transmit.png
+share/icons/gnome/24x24/status/network-wireless-encrypted.png
+share/icons/gnome/24x24/status/nm-adhoc.png
+share/icons/gnome/24x24/status/nm-device-wired.png
+share/icons/gnome/24x24/status/nm-device-wireless.png
+share/icons/gnome/24x24/status/nm-no-connection.png
+share/icons/gnome/24x24/status/stock_appointment-reminder-excl.png
+share/icons/gnome/24x24/status/stock_appointment-reminder.png
+share/icons/gnome/24x24/status/stock_dialog-error.png
+share/icons/gnome/24x24/status/stock_dialog-info.png
+share/icons/gnome/24x24/status/stock_dialog-warning.png
+share/icons/gnome/24x24/status/stock_open.png
+share/icons/gnome/24x24/status/stock_repeat.png
+share/icons/gnome/24x24/status/stock_shuffle.png
+share/icons/gnome/24x24/status/stock_trash_full.png
+share/icons/gnome/24x24/status/stock_volume-0.png
+share/icons/gnome/24x24/status/stock_volume-max.png
+share/icons/gnome/24x24/status/stock_volume-med.png
+share/icons/gnome/24x24/status/stock_volume-min.png
+share/icons/gnome/24x24/status/stock_volume-mute.png
+share/icons/gnome/24x24/status/stock_volume.png
+share/icons/gnome/24x24/status/stock_weather-cloudy.png
+share/icons/gnome/24x24/status/stock_weather-few-clouds.png
+share/icons/gnome/24x24/status/stock_weather-night-clear.png
+share/icons/gnome/24x24/status/stock_weather-night-few-clouds.png
+share/icons/gnome/24x24/status/stock_weather-showers.png
+share/icons/gnome/24x24/status/stock_weather-snow.png
+share/icons/gnome/24x24/status/stock_weather-storm.png
+share/icons/gnome/24x24/status/stock_weather-sunny.png
+share/icons/gnome/24x24/status/sunny.png
+share/icons/gnome/24x24/status/trashcan_full.png
+share/icons/gnome/24x24/status/user-trash-full.png
+share/icons/gnome/24x24/status/weather-clear-night.png
+share/icons/gnome/24x24/status/weather-clear.png
+share/icons/gnome/24x24/status/weather-few-clouds-night.png
+share/icons/gnome/24x24/status/weather-few-clouds.png
+share/icons/gnome/24x24/status/weather-overcast.png
+share/icons/gnome/24x24/status/weather-severe-alert.png
+share/icons/gnome/24x24/status/weather-showers-scattered.png
+share/icons/gnome/24x24/status/weather-showers.png
+share/icons/gnome/24x24/status/weather-snow.png
+share/icons/gnome/24x24/status/weather-storm.png
+share/icons/gnome/24x24/status/xfce-trash_full.png
share/icons/gnome/24x24/stock/chart/stock_chart-autoformat.png
share/icons/gnome/24x24/stock/chart/stock_chart-data-in-columns.png
share/icons/gnome/24x24/stock/chart/stock_chart-data-in-rows.png
@@ -1401,16 +3187,8 @@ share/icons/gnome/24x24/stock/generic/stock_calendar-view-month.png
share/icons/gnome/24x24/stock/generic/stock_calendar-view-week.png
share/icons/gnome/24x24/stock/generic/stock_calendar-view-work-week.png
share/icons/gnome/24x24/stock/generic/stock_calendar-view-year.png
-share/icons/gnome/24x24/stock/generic/stock_calendar.png
share/icons/gnome/24x24/stock/generic/stock_cell-phone.png
-share/icons/gnome/24x24/stock/generic/stock_close.png
share/icons/gnome/24x24/stock/generic/stock_color.png
-share/icons/gnome/24x24/stock/generic/stock_copy.png
-share/icons/gnome/24x24/stock/generic/stock_cut.png
-share/icons/gnome/24x24/stock/generic/stock_delete.png
-share/icons/gnome/24x24/stock/generic/stock_dialog-error.png
-share/icons/gnome/24x24/stock/generic/stock_dialog-info.png
-share/icons/gnome/24x24/stock/generic/stock_dialog-warning.png
share/icons/gnome/24x24/stock/generic/stock_edit.png
share/icons/gnome/24x24/stock/generic/stock_equals.png
share/icons/gnome/24x24/stock/generic/stock_example.png
@@ -1422,38 +3200,26 @@ share/icons/gnome/24x24/stock/generic/stock_flip-vertically.png
share/icons/gnome/24x24/stock/generic/stock_folder-copy.png
share/icons/gnome/24x24/stock/generic/stock_folder-move.png
share/icons/gnome/24x24/stock/generic/stock_folder-properties.png
-share/icons/gnome/24x24/stock/generic/stock_folder.png
share/icons/gnome/24x24/stock/generic/stock_format-page.png
-share/icons/gnome/24x24/stock/generic/stock_fullscreen.png
share/icons/gnome/24x24/stock/generic/stock_help-agent.png
share/icons/gnome/24x24/stock/generic/stock_help-chat.png
-share/icons/gnome/24x24/stock/generic/stock_help.png
-share/icons/gnome/24x24/stock/generic/stock_home.png
share/icons/gnome/24x24/stock/generic/stock_id.png
share/icons/gnome/24x24/stock/generic/stock_keyring.png
share/icons/gnome/24x24/stock/generic/stock_landline-phone.png
-share/icons/gnome/24x24/stock/generic/stock_leave-fullscreen.png
share/icons/gnome/24x24/stock/generic/stock_mark.png
share/icons/gnome/24x24/stock/generic/stock_new-24h-appointment.png
-share/icons/gnome/24x24/stock/generic/stock_new-appointment.png
share/icons/gnome/24x24/stock/generic/stock_new-meeting.png
share/icons/gnome/24x24/stock/generic/stock_news.png
share/icons/gnome/24x24/stock/generic/stock_not.png
share/icons/gnome/24x24/stock/generic/stock_notebook.png
share/icons/gnome/24x24/stock/generic/stock_notes.png
-share/icons/gnome/24x24/stock/generic/stock_paste.png
share/icons/gnome/24x24/stock/generic/stock_people.png
share/icons/gnome/24x24/stock/generic/stock_person.png
share/icons/gnome/24x24/stock/generic/stock_presentation-box.png
share/icons/gnome/24x24/stock/generic/stock_properties.png
-share/icons/gnome/24x24/stock/generic/stock_redo.png
-share/icons/gnome/24x24/stock/generic/stock_refresh.png
share/icons/gnome/24x24/stock/generic/stock_scores.png
-share/icons/gnome/24x24/stock/generic/stock_search-and-replace.png
-share/icons/gnome/24x24/stock/generic/stock_search.png
share/icons/gnome/24x24/stock/generic/stock_send-fax.png
share/icons/gnome/24x24/stock/generic/stock_show-all.png
-share/icons/gnome/24x24/stock/generic/stock_stop.png
share/icons/gnome/24x24/stock/generic/stock_styles.png
share/icons/gnome/24x24/stock/generic/stock_summary.png
share/icons/gnome/24x24/stock/generic/stock_test-mode.png
@@ -1463,7 +3229,6 @@ share/icons/gnome/24x24/stock/generic/stock_timezone.png
share/icons/gnome/24x24/stock/generic/stock_toilet-paper.png
share/icons/gnome/24x24/stock/generic/stock_trash_full.png
share/icons/gnome/24x24/stock/generic/stock_undelete.png
-share/icons/gnome/24x24/stock/generic/stock_undo.png
share/icons/gnome/24x24/stock/generic/stock_unknown.png
share/icons/gnome/24x24/stock/generic/stock_web-calendar.png
share/icons/gnome/24x24/stock/generic/stock_web-support.png
@@ -1609,66 +3374,34 @@ share/icons/gnome/24x24/stock/io/stock_bluetooth.png
share/icons/gnome/24x24/stock/io/stock_export.png
share/icons/gnome/24x24/stock/io/stock_insert-file.png
share/icons/gnome/24x24/stock/io/stock_network-printer.png
-share/icons/gnome/24x24/stock/io/stock_open.png
share/icons/gnome/24x24/stock/io/stock_print-driver.png
share/icons/gnome/24x24/stock/io/stock_print-preview-print.png
-share/icons/gnome/24x24/stock/io/stock_print-preview.png
share/icons/gnome/24x24/stock/io/stock_print-setup.png
-share/icons/gnome/24x24/stock/io/stock_print.png
share/icons/gnome/24x24/stock/io/stock_printers.png
share/icons/gnome/24x24/stock/io/stock_reload.png
-share/icons/gnome/24x24/stock/io/stock_save-as.png
share/icons/gnome/24x24/stock/io/stock_save-pdf.png
share/icons/gnome/24x24/stock/io/stock_save-template.png
-share/icons/gnome/24x24/stock/io/stock_save.png
-share/icons/gnome/24x24/stock/io/stock_save_as.png
share/icons/gnome/24x24/stock/media/stock_3dsound.png
share/icons/gnome/24x24/stock/media/stock_effects-sound.png
share/icons/gnome/24x24/stock/media/stock_headphones.png
share/icons/gnome/24x24/stock/media/stock_insert-video-plugin.png
share/icons/gnome/24x24/stock/media/stock_line_in.png
-share/icons/gnome/24x24/stock/media/stock_media-fwd.png
-share/icons/gnome/24x24/stock/media/stock_media-next.png
-share/icons/gnome/24x24/stock/media/stock_media-pause.png
-share/icons/gnome/24x24/stock/media/stock_media-play.png
-share/icons/gnome/24x24/stock/media/stock_media-prev.png
-share/icons/gnome/24x24/stock/media/stock_media-rec.png
-share/icons/gnome/24x24/stock/media/stock_media-rew.png
-share/icons/gnome/24x24/stock/media/stock_media-stop.png
-share/icons/gnome/24x24/stock/media/stock_mic.png
share/icons/gnome/24x24/stock/media/stock_midi.png
share/icons/gnome/24x24/stock/media/stock_music-library.png
share/icons/gnome/24x24/stock/media/stock_playlist.png
-share/icons/gnome/24x24/stock/media/stock_repeat.png
-share/icons/gnome/24x24/stock/media/stock_shuffle.png
share/icons/gnome/24x24/stock/media/stock_smart-playlist.png
-share/icons/gnome/24x24/stock/media/stock_volume-0.png
-share/icons/gnome/24x24/stock/media/stock_volume-max.png
-share/icons/gnome/24x24/stock/media/stock_volume-med.png
-share/icons/gnome/24x24/stock/media/stock_volume-min.png
-share/icons/gnome/24x24/stock/media/stock_volume-mute.png
-share/icons/gnome/24x24/stock/media/stock_volume.png
-share/icons/gnome/24x24/stock/navigation/stock_bottom.png
share/icons/gnome/24x24/stock/navigation/stock_down-with-subpoints.png
-share/icons/gnome/24x24/stock/navigation/stock_down.png
share/icons/gnome/24x24/stock/navigation/stock_first-page.png
-share/icons/gnome/24x24/stock/navigation/stock_first.png
share/icons/gnome/24x24/stock/navigation/stock_last-page.png
-share/icons/gnome/24x24/stock/navigation/stock_last.png
share/icons/gnome/24x24/stock/navigation/stock_left-with-subpoints.png
-share/icons/gnome/24x24/stock/navigation/stock_left.png
share/icons/gnome/24x24/stock/navigation/stock_navigator.png
-share/icons/gnome/24x24/stock/navigation/stock_new-tab.png
share/icons/gnome/24x24/stock/navigation/stock_next-page.png
share/icons/gnome/24x24/stock/navigation/stock_next.png
share/icons/gnome/24x24/stock/navigation/stock_previous-page.png
share/icons/gnome/24x24/stock/navigation/stock_previous.png
share/icons/gnome/24x24/stock/navigation/stock_right-with-subpoints.png
-share/icons/gnome/24x24/stock/navigation/stock_right.png
-share/icons/gnome/24x24/stock/navigation/stock_top.png
share/icons/gnome/24x24/stock/navigation/stock_undo-history.png
share/icons/gnome/24x24/stock/navigation/stock_up-with-subpoints.png
-share/icons/gnome/24x24/stock/navigation/stock_up.png
share/icons/gnome/24x24/stock/navigation/stock_zoom-1.png
share/icons/gnome/24x24/stock/navigation/stock_zoom-in.png
share/icons/gnome/24x24/stock/navigation/stock_zoom-next.png
@@ -1681,8 +3414,6 @@ share/icons/gnome/24x24/stock/navigation/stock_zoom-previous.png
share/icons/gnome/24x24/stock/navigation/stock_zoom-shift.png
share/icons/gnome/24x24/stock/navigation/stock_zoom.png
share/icons/gnome/24x24/stock/net/stock_addressbook.png
-share/icons/gnome/24x24/stock/net/stock_appointment-reminder-excl.png
-share/icons/gnome/24x24/stock/net/stock_appointment-reminder.png
share/icons/gnome/24x24/stock/net/stock_channel.png
share/icons/gnome/24x24/stock/net/stock_connect-to-url.png
share/icons/gnome/24x24/stock/net/stock_connect.png
@@ -1702,10 +3433,8 @@ share/icons/gnome/24x24/stock/net/stock_insert-url.png
share/icons/gnome/24x24/stock/net/stock_internet.png
share/icons/gnome/24x24/stock/net/stock_link.png
share/icons/gnome/24x24/stock/net/stock_mail-accounts.png
-share/icons/gnome/24x24/stock/net/stock_mail-compose.png
share/icons/gnome/24x24/stock/net/stock_mail-copy.png
share/icons/gnome/24x24/stock/net/stock_mail-filters-apply.png
-share/icons/gnome/24x24/stock/net/stock_mail-forward.png
share/icons/gnome/24x24/stock/net/stock_mail-handling.png
share/icons/gnome/24x24/stock/net/stock_mail-import.png
share/icons/gnome/24x24/stock/net/stock_mail-merge.png
@@ -1714,24 +3443,18 @@ share/icons/gnome/24x24/stock/net/stock_mail-open-multiple.png
share/icons/gnome/24x24/stock/net/stock_mail-open.png
share/icons/gnome/24x24/stock/net/stock_mail-receive.png
share/icons/gnome/24x24/stock/net/stock_mail-replied.png
-share/icons/gnome/24x24/stock/net/stock_mail-reply-to-all.png
-share/icons/gnome/24x24/stock/net/stock_mail-reply.png
-share/icons/gnome/24x24/stock/net/stock_mail-send-receive.png
share/icons/gnome/24x24/stock/net/stock_mail-send.png
share/icons/gnome/24x24/stock/net/stock_mail-unread-multiple.png
share/icons/gnome/24x24/stock/net/stock_mail-unread.png
share/icons/gnome/24x24/stock/net/stock_mail.png
share/icons/gnome/24x24/stock/net/stock_message-display.png
-share/icons/gnome/24x24/stock/net/stock_not-spam.png
share/icons/gnome/24x24/stock/net/stock_online-layout.png
share/icons/gnome/24x24/stock/net/stock_outbox.png
share/icons/gnome/24x24/stock/net/stock_post-message.png
share/icons/gnome/24x24/stock/net/stock_sent-mail.png
share/icons/gnome/24x24/stock/net/stock_shared-by-me.png
share/icons/gnome/24x24/stock/net/stock_shared-to-me.png
-share/icons/gnome/24x24/stock/net/stock_spam.png
share/icons/gnome/24x24/stock/net/stock_video-conferencing.png
-share/icons/gnome/24x24/stock/object/stock_add-bookmark.png
share/icons/gnome/24x24/stock/object/stock_bookmark.png
share/icons/gnome/24x24/stock/object/stock_bring-backward.png
share/icons/gnome/24x24/stock/object/stock_bring-forward.png
@@ -1769,7 +3492,6 @@ share/icons/gnome/24x24/stock/object/stock_insert_graphic.png
share/icons/gnome/24x24/stock/object/stock_insert_special_character.png
share/icons/gnome/24x24/stock/object/stock_interaction.png
share/icons/gnome/24x24/stock/object/stock_new-bcard.png
-share/icons/gnome/24x24/stock/object/stock_new-window.png
share/icons/gnome/24x24/stock/object/stock_object-behind.png
share/icons/gnome/24x24/stock/object/stock_object-infront.png
share/icons/gnome/24x24/stock/object/stock_pin.png
@@ -1907,20 +3629,10 @@ share/icons/gnome/24x24/stock/text/stock_text-quickedit.png
share/icons/gnome/24x24/stock/text/stock_text-select-text-only.png
share/icons/gnome/24x24/stock/text/stock_text-shadow.png
share/icons/gnome/24x24/stock/text/stock_text-spacing.png
-share/icons/gnome/24x24/stock/text/stock_text-strikethrough.png
-share/icons/gnome/24x24/stock/text/stock_text_bold.png
-share/icons/gnome/24x24/stock/text/stock_text_center.png
share/icons/gnome/24x24/stock/text/stock_text_color_background.png
share/icons/gnome/24x24/stock/text/stock_text_color_foreground.png
share/icons/gnome/24x24/stock/text/stock_text_color_hilight.png
-share/icons/gnome/24x24/stock/text/stock_text_indent.png
-share/icons/gnome/24x24/stock/text/stock_text_italic.png
-share/icons/gnome/24x24/stock/text/stock_text_justify.png
-share/icons/gnome/24x24/stock/text/stock_text_left.png
-share/icons/gnome/24x24/stock/text/stock_text_right.png
share/icons/gnome/24x24/stock/text/stock_text_underlined-double.png
-share/icons/gnome/24x24/stock/text/stock_text_underlined.png
-share/icons/gnome/24x24/stock/text/stock_text_unindent.png
share/icons/gnome/24x24/stock/text/stock_thesaurus.png
share/icons/gnome/24x24/stock/text/stock_to-background.png
share/icons/gnome/24x24/stock/text/stock_to-foreground.png
@@ -1934,227 +3646,531 @@ share/icons/gnome/24x24/stock/text/stock_wrap-interrupt.png
share/icons/gnome/24x24/stock/text/stock_wrap-left.png
share/icons/gnome/24x24/stock/text/stock_wrap-optimal.png
share/icons/gnome/24x24/stock/text/stock_wrap-right.png
-share/icons/gnome/32x32/apps/administration.png
-share/icons/gnome/32x32/apps/apacheconf.png
-share/icons/gnome/32x32/apps/applets-screenshooter.png
-share/icons/gnome/32x32/apps/config-date.png
-share/icons/gnome/32x32/apps/config-language.png
-share/icons/gnome/32x32/apps/config-users.png
-share/icons/gnome/32x32/apps/config-xfree.png
-share/icons/gnome/32x32/apps/dia_gnome_icon.png
-share/icons/gnome/32x32/apps/disks.png
+share/icons/gnome/32x32/actions/add.png
+share/icons/gnome/32x32/actions/back.png
+share/icons/gnome/32x32/actions/bottom.png
+share/icons/gnome/32x32/actions/document-new.png
+share/icons/gnome/32x32/actions/document-save-as.png
+share/icons/gnome/32x32/actions/document-save.png
+share/icons/gnome/32x32/actions/down.png
+share/icons/gnome/32x32/actions/filenew.png
+share/icons/gnome/32x32/actions/filesave.png
+share/icons/gnome/32x32/actions/filesaveas.png
+share/icons/gnome/32x32/actions/finish.png
+share/icons/gnome/32x32/actions/folder-new.png
+share/icons/gnome/32x32/actions/folder_new.png
+share/icons/gnome/32x32/actions/forward.png
+share/icons/gnome/32x32/actions/gnome-lockscreen.png
+share/icons/gnome/32x32/actions/gnome-run.png
+share/icons/gnome/32x32/actions/go-bottom.png
+share/icons/gnome/32x32/actions/go-down.png
+share/icons/gnome/32x32/actions/go-first.png
+share/icons/gnome/32x32/actions/go-home.png
+share/icons/gnome/32x32/actions/go-last.png
+share/icons/gnome/32x32/actions/go-next.png
+share/icons/gnome/32x32/actions/go-previous.png
+share/icons/gnome/32x32/actions/go-top.png
+share/icons/gnome/32x32/actions/go-up.png
+share/icons/gnome/32x32/actions/gohome.png
+share/icons/gnome/32x32/actions/gtk-add.png
+share/icons/gnome/32x32/actions/gtk-fullscreen.png
+share/icons/gnome/32x32/actions/gtk-go-back-ltr.png
+share/icons/gnome/32x32/actions/gtk-go-back-rtl.png
+share/icons/gnome/32x32/actions/gtk-go-down.png
+share/icons/gnome/32x32/actions/gtk-go-forward-ltr.png
+share/icons/gnome/32x32/actions/gtk-go-forward-rtl.png
+share/icons/gnome/32x32/actions/gtk-go-up.png
+share/icons/gnome/32x32/actions/gtk-goto-bottom.png
+share/icons/gnome/32x32/actions/gtk-goto-first-ltr.png
+share/icons/gnome/32x32/actions/gtk-goto-first-rtl.png
+share/icons/gnome/32x32/actions/gtk-goto-last-ltr.png
+share/icons/gnome/32x32/actions/gtk-goto-last-rtl.png
+share/icons/gnome/32x32/actions/gtk-goto-top.png
+share/icons/gnome/32x32/actions/gtk-home.png
+share/icons/gnome/32x32/actions/gtk-leave-fullscreen.png
+share/icons/gnome/32x32/actions/gtk-new.png
+share/icons/gnome/32x32/actions/gtk-remove.png
+share/icons/gnome/32x32/actions/gtk-save-as.png
+share/icons/gnome/32x32/actions/gtk-save.png
+share/icons/gnome/32x32/actions/gtk-zoom-100.png
+share/icons/gnome/32x32/actions/gtk-zoom-fit.png
+share/icons/gnome/32x32/actions/gtk-zoom-in.png
+share/icons/gnome/32x32/actions/gtk-zoom-out.png
+share/icons/gnome/32x32/actions/kfm_home.png
+share/icons/gnome/32x32/actions/list-add.png
+share/icons/gnome/32x32/actions/list-remove.png
+share/icons/gnome/32x32/actions/lock.png
+share/icons/gnome/32x32/actions/next.png
+share/icons/gnome/32x32/actions/previous.png
+share/icons/gnome/32x32/actions/redhat-home.png
+share/icons/gnome/32x32/actions/remove.png
+share/icons/gnome/32x32/actions/start.png
+share/icons/gnome/32x32/actions/stock_bottom.png
+share/icons/gnome/32x32/actions/stock_down.png
+share/icons/gnome/32x32/actions/stock_first.png
+share/icons/gnome/32x32/actions/stock_fullscreen.png
+share/icons/gnome/32x32/actions/stock_home.png
+share/icons/gnome/32x32/actions/stock_last.png
+share/icons/gnome/32x32/actions/stock_leave-fullscreen.png
+share/icons/gnome/32x32/actions/stock_left.png
+share/icons/gnome/32x32/actions/stock_new-dir.png
+share/icons/gnome/32x32/actions/stock_new-text.png
+share/icons/gnome/32x32/actions/stock_new-window.png
+share/icons/gnome/32x32/actions/stock_right.png
+share/icons/gnome/32x32/actions/stock_save-as.png
+share/icons/gnome/32x32/actions/stock_save.png
+share/icons/gnome/32x32/actions/stock_top.png
+share/icons/gnome/32x32/actions/stock_up.png
+share/icons/gnome/32x32/actions/stock_zoom-1.png
+share/icons/gnome/32x32/actions/stock_zoom-in.png
+share/icons/gnome/32x32/actions/stock_zoom-out.png
+share/icons/gnome/32x32/actions/stock_zoom-page.png
+share/icons/gnome/32x32/actions/system-lock-screen.png
+share/icons/gnome/32x32/actions/system-run.png
+share/icons/gnome/32x32/actions/top.png
+share/icons/gnome/32x32/actions/up.png
+share/icons/gnome/32x32/actions/view-fullscreen.png
+share/icons/gnome/32x32/actions/view-restore.png
+share/icons/gnome/32x32/actions/window-new.png
+share/icons/gnome/32x32/actions/window_fullscreen.png
+share/icons/gnome/32x32/actions/window_new.png
+share/icons/gnome/32x32/actions/window_nofullscreen.png
+share/icons/gnome/32x32/actions/xfce-system-lock.png
+share/icons/gnome/32x32/actions/zoom-best-fit.png
+share/icons/gnome/32x32/actions/zoom-in.png
+share/icons/gnome/32x32/actions/zoom-original.png
+share/icons/gnome/32x32/actions/zoom-out.png
+share/icons/gnome/32x32/animations/gnome-spinner-rest.png
+share/icons/gnome/32x32/animations/gnome-spinner.png
+share/icons/gnome/32x32/animations/process-idle.png
+share/icons/gnome/32x32/animations/process-working.png
+share/icons/gnome/32x32/apps/accessories-text-editor.png
+share/icons/gnome/32x32/apps/evolution.png
share/icons/gnome/32x32/apps/file-manager.png
-share/icons/gnome/32x32/apps/gdict.png
-share/icons/gnome/32x32/apps/gdm.png
-share/icons/gnome/32x32/apps/gnome-applications.png
-share/icons/gnome/32x32/apps/gnome-calculator.png
-share/icons/gnome/32x32/apps/gnome-cdplayer-icon.png
-share/icons/gnome/32x32/apps/gnome-character-map.png
-share/icons/gnome/32x32/apps/gnome-devel.png
-share/icons/gnome/32x32/apps/gnome-finance.png
-share/icons/gnome/32x32/apps/gnome-ftp.png
-share/icons/gnome/32x32/apps/gnome-globe.png
-share/icons/gnome/32x32/apps/gnome-gnomine.png
-share/icons/gnome/32x32/apps/gnome-graphics.png
-share/icons/gnome/32x32/apps/gnome-grecord.png
-share/icons/gnome/32x32/apps/gnome-gsame.png
-share/icons/gnome/32x32/apps/gnome-lockscreen.png
-share/icons/gnome/32x32/apps/gnome-logout.png
-share/icons/gnome/32x32/apps/gnome-media-player.png
-share/icons/gnome/32x32/apps/gnome-multimedia.png
-share/icons/gnome/32x32/apps/gnome-networktool.png
-share/icons/gnome/32x32/apps/gnome-nibbles.png
-share/icons/gnome/32x32/apps/gnome-pdf.png
+share/icons/gnome/32x32/apps/gnome-help.png
+share/icons/gnome/32x32/apps/gnome-monitor.png
share/icons/gnome/32x32/apps/gnome-terminal.png
-share/icons/gnome/32x32/apps/gnome-util.png
-share/icons/gnome/32x32/apps/gnome-window-manager.png
-share/icons/gnome/32x32/apps/hwbrowser.png
-share/icons/gnome/32x32/apps/iagno.png
-share/icons/gnome/32x32/apps/keyboard.png
+share/icons/gnome/32x32/apps/gtk-help.png
+share/icons/gnome/32x32/apps/help-browser.png
+share/icons/gnome/32x32/apps/help.png
+share/icons/gnome/32x32/apps/kedit.png
+share/icons/gnome/32x32/apps/kfm.png
+share/icons/gnome/32x32/apps/khelpcenter.png
+share/icons/gnome/32x32/apps/konsole.png
+share/icons/gnome/32x32/apps/kscreensaver.png
+share/icons/gnome/32x32/apps/ksysguard.png
share/icons/gnome/32x32/apps/logviewer.png
-share/icons/gnome/32x32/apps/network-config.png
-share/icons/gnome/32x32/apps/panel-notification-area.png
-share/icons/gnome/32x32/apps/panel-window-list.png
-share/icons/gnome/32x32/apps/panel-window-menu.png
-share/icons/gnome/32x32/apps/postscript-viewer.png
-share/icons/gnome/32x32/apps/serviceconf.png
-share/icons/gnome/32x32/apps/system-floppy.png
+share/icons/gnome/32x32/apps/openterm.png
+share/icons/gnome/32x32/apps/preferences-desktop-screensaver.png
+share/icons/gnome/32x32/apps/redhat-filemanager.png
+share/icons/gnome/32x32/apps/screensaver.png
+share/icons/gnome/32x32/apps/stock_help.png
+share/icons/gnome/32x32/apps/susehelpcenter.png
+share/icons/gnome/32x32/apps/system-file-manager.png
+share/icons/gnome/32x32/apps/terminal.png
share/icons/gnome/32x32/apps/text-editor.png
-share/icons/gnome/32x32/apps/tsclient.png
-share/icons/gnome/32x32/apps/web-browser.png
-share/icons/gnome/32x32/apps/xcdroast.png
-share/icons/gnome/32x32/apps/xchat.png
+share/icons/gnome/32x32/apps/utilities-system-monitor.png
+share/icons/gnome/32x32/apps/utilities-terminal.png
+share/icons/gnome/32x32/apps/xfce-filemanager.png
+share/icons/gnome/32x32/apps/xfce-terminal.png
+share/icons/gnome/32x32/apps/xscreensaver.png
+share/icons/gnome/32x32/categories/applications-accessories.png
+share/icons/gnome/32x32/categories/applications-development.png
+share/icons/gnome/32x32/categories/applications-games.png
+share/icons/gnome/32x32/categories/applications-internet.png
+share/icons/gnome/32x32/categories/gnome-devel.png
+share/icons/gnome/32x32/categories/gnome-globe.png
+share/icons/gnome/32x32/categories/gnome-joystick.png
+share/icons/gnome/32x32/categories/gnome-util.png
+share/icons/gnome/32x32/categories/package_development.png
+share/icons/gnome/32x32/categories/package_games.png
+share/icons/gnome/32x32/categories/package_network.png
+share/icons/gnome/32x32/categories/package_settings.png
+share/icons/gnome/32x32/categories/package_utilities.png
+share/icons/gnome/32x32/categories/preferences-system.png
+share/icons/gnome/32x32/categories/redhat-accessories.png
+share/icons/gnome/32x32/categories/redhat-games.png
+share/icons/gnome/32x32/categories/redhat-internet.png
+share/icons/gnome/32x32/categories/redhat-programming.png
+share/icons/gnome/32x32/categories/redhat-system_settings.png
+share/icons/gnome/32x32/categories/stock_internet.png
+share/icons/gnome/32x32/categories/xfce-games.png
+share/icons/gnome/32x32/categories/xfce-internet.png
+share/icons/gnome/32x32/categories/xfce-system-settings.png
+share/icons/gnome/32x32/categories/xfce-utils.png
+share/icons/gnome/32x32/devices/3floppy_unmount.png
+share/icons/gnome/32x32/devices/battery.png
+share/icons/gnome/32x32/devices/cdrom_unmount.png
+share/icons/gnome/32x32/devices/cdwriter_unmount.png
+share/icons/gnome/32x32/devices/drive-cdrom.png
+share/icons/gnome/32x32/devices/drive-harddisk.png
+share/icons/gnome/32x32/devices/drive-optical.png
+share/icons/gnome/32x32/devices/drive-removable-media.png
+share/icons/gnome/32x32/devices/dvd_unmount.png
+share/icons/gnome/32x32/devices/gnome-dev-battery.png
+share/icons/gnome/32x32/devices/gnome-dev-cdrom-audio.png
+share/icons/gnome/32x32/devices/gnome-dev-cdrom.png
+share/icons/gnome/32x32/devices/gnome-dev-disc-cdr.png
+share/icons/gnome/32x32/devices/gnome-dev-disc-cdrw.png
+share/icons/gnome/32x32/devices/gnome-dev-disc-dvdr-plus.png
+share/icons/gnome/32x32/devices/gnome-dev-disc-dvdr.png
+share/icons/gnome/32x32/devices/gnome-dev-disc-dvdram.png
+share/icons/gnome/32x32/devices/gnome-dev-disc-dvdrom.png
+share/icons/gnome/32x32/devices/gnome-dev-disc-dvdrw.png
+share/icons/gnome/32x32/devices/gnome-dev-dvd.png
+share/icons/gnome/32x32/devices/gnome-dev-floppy.png
+share/icons/gnome/32x32/devices/gnome-dev-harddisk-1394.png
+share/icons/gnome/32x32/devices/gnome-dev-harddisk-usb.png
+share/icons/gnome/32x32/devices/gnome-dev-harddisk.png
share/icons/gnome/32x32/devices/gnome-dev-ipod.png
-share/icons/gnome/32x32/filesystems/gnome-fs-bookmark-missing.png
-share/icons/gnome/32x32/filesystems/gnome-fs-bookmark.png
-share/icons/gnome/32x32/filesystems/gnome-fs-client.png
-share/icons/gnome/32x32/filesystems/gnome-fs-desktop.png
-share/icons/gnome/32x32/filesystems/gnome-fs-network.png
-share/icons/gnome/32x32/filesystems/gnome-fs-server.png
-share/icons/gnome/32x32/filesystems/gnome-fs-trash-empty.png
-share/icons/gnome/32x32/filesystems/gnome-fs-trash-full.png
+share/icons/gnome/32x32/devices/gnome-dev-keyboard.png
+share/icons/gnome/32x32/devices/gnome-dev-media-cf.png
+share/icons/gnome/32x32/devices/gnome-dev-media-ms.png
+share/icons/gnome/32x32/devices/gnome-dev-media-sdmmc.png
+share/icons/gnome/32x32/devices/gnome-dev-media-sm.png
+share/icons/gnome/32x32/devices/gnome-dev-mouse-ball.png
+share/icons/gnome/32x32/devices/gnome-dev-mouse-optical.png
+share/icons/gnome/32x32/devices/gnome-dev-printer.png
+share/icons/gnome/32x32/devices/gnome-dev-removable-1394.png
+share/icons/gnome/32x32/devices/gnome-dev-removable-usb.png
+share/icons/gnome/32x32/devices/gnome-dev-removable.png
+share/icons/gnome/32x32/devices/gtk-cdrom.png
+share/icons/gnome/32x32/devices/gtk-floppy.png
+share/icons/gnome/32x32/devices/gtk-harddisk.png
+share/icons/gnome/32x32/devices/harddrive.png
+share/icons/gnome/32x32/devices/hdd_unmount.png
+share/icons/gnome/32x32/devices/input-keyboard.png
+share/icons/gnome/32x32/devices/input-mouse.png
+share/icons/gnome/32x32/devices/ipod_mount.png
+share/icons/gnome/32x32/devices/keyboard.png
+share/icons/gnome/32x32/devices/kjobviewer.png
+share/icons/gnome/32x32/devices/kxkb.png
+share/icons/gnome/32x32/devices/media-cdrom.png
+share/icons/gnome/32x32/devices/media-flash.png
+share/icons/gnome/32x32/devices/media-floppy.png
+share/icons/gnome/32x32/devices/media-optical.png
+share/icons/gnome/32x32/devices/mouse.png
+share/icons/gnome/32x32/devices/multimedia-player.png
+share/icons/gnome/32x32/devices/printer-remote.png
+share/icons/gnome/32x32/devices/printer.png
+share/icons/gnome/32x32/devices/printer1.png
+share/icons/gnome/32x32/devices/printmgr.png
+share/icons/gnome/32x32/devices/stock_printers.png
+share/icons/gnome/32x32/devices/system-floppy.png
+share/icons/gnome/32x32/devices/usbpendrive_unmount.png
+share/icons/gnome/32x32/devices/xfce-printer.png
+share/icons/gnome/32x32/devices/xfce4-keyboard.png
+share/icons/gnome/32x32/devices/xfce4-mouse.png
+share/icons/gnome/32x32/devices/yast_HD.png
+share/icons/gnome/32x32/devices/yast_idetude.png
+share/icons/gnome/32x32/devices/yast_mouse.png
+share/icons/gnome/32x32/devices/yast_printer.png
+share/icons/gnome/32x32/emblems/emblem-favorite.png
+share/icons/gnome/32x32/emblems/emblem-important.png
+share/icons/gnome/32x32/emblems/emblem-new.png
+share/icons/gnome/32x32/emblems/emblem-package.png
+share/icons/gnome/32x32/emblems/emblem-symbolic-link.png
+share/icons/gnome/32x32/emblems/emblem-web.png
+share/icons/gnome/32x32/emblems/stock_mail-priority-high.png
+share/icons/gnome/32x32/mimetypes/application-certificate.png
+share/icons/gnome/32x32/mimetypes/application-x-executable.png
+share/icons/gnome/32x32/mimetypes/ascii.png
+share/icons/gnome/32x32/mimetypes/audio-x-generic.png
+share/icons/gnome/32x32/mimetypes/binary.png
+share/icons/gnome/32x32/mimetypes/contents2.png
+share/icons/gnome/32x32/mimetypes/deb.png
+share/icons/gnome/32x32/mimetypes/document.png
+share/icons/gnome/32x32/mimetypes/empty.png
+share/icons/gnome/32x32/mimetypes/exec.png
+share/icons/gnome/32x32/mimetypes/folder_tar.png
+share/icons/gnome/32x32/mimetypes/font-x-generic.png
+share/icons/gnome/32x32/mimetypes/font.png
+share/icons/gnome/32x32/mimetypes/font_bitmap.png
+share/icons/gnome/32x32/mimetypes/font_truetype.png
+share/icons/gnome/32x32/mimetypes/font_type1.png
+share/icons/gnome/32x32/mimetypes/gnome-fs-executable.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-magicpoint.png
share/icons/gnome/32x32/mimetypes/gnome-mime-application-msword.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-ogg.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-pdf.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-postscript.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-rtf.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png
share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.ms-excel.png
share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png
-share/icons/gnome/32x32/stock/chart/stock_chart.png
-share/icons/gnome/32x32/stock/code/stock_script.png
-share/icons/gnome/32x32/stock/data/stock_data-sources-hand.png
-share/icons/gnome/32x32/stock/data/stock_data-sources.png
-share/icons/gnome/32x32/stock/data/stock_lock-broken.png
-share/icons/gnome/32x32/stock/data/stock_lock-ok.png
-share/icons/gnome/32x32/stock/data/stock_lock-open.png
-share/icons/gnome/32x32/stock/data/stock_lock.png
-share/icons/gnome/32x32/stock/data/stock_signature-bad.png
-share/icons/gnome/32x32/stock/data/stock_signature-ok.png
-share/icons/gnome/32x32/stock/data/stock_signature.png
-share/icons/gnome/32x32/stock/document/stock_new-drawing.png
-share/icons/gnome/32x32/stock/document/stock_new-formula.png
-share/icons/gnome/32x32/stock/document/stock_new-html.png
-share/icons/gnome/32x32/stock/document/stock_new-labels.png
-share/icons/gnome/32x32/stock/document/stock_new-master-document.png
-share/icons/gnome/32x32/stock/document/stock_new-presentation.png
-share/icons/gnome/32x32/stock/document/stock_new-spreadsheet.png
-share/icons/gnome/32x32/stock/document/stock_new-template.png
-share/icons/gnome/32x32/stock/document/stock_new-text.png
-share/icons/gnome/32x32/stock/document/stock_new.png
-share/icons/gnome/32x32/stock/document/stock_todo.png
-share/icons/gnome/32x32/stock/generic/stock_alarm.png
-share/icons/gnome/32x32/stock/generic/stock_autopilot.png
-share/icons/gnome/32x32/stock/generic/stock_briefcase.png
-share/icons/gnome/32x32/stock/generic/stock_calendar.png
-share/icons/gnome/32x32/stock/generic/stock_cell-phone.png
-share/icons/gnome/32x32/stock/generic/stock_dialog-info.png
-share/icons/gnome/32x32/stock/generic/stock_dialog-question.png
-share/icons/gnome/32x32/stock/generic/stock_dialog-warning.png
-share/icons/gnome/32x32/stock/generic/stock_edit.png
-share/icons/gnome/32x32/stock/generic/stock_example.png
-share/icons/gnome/32x32/stock/generic/stock_folder.png
-share/icons/gnome/32x32/stock/generic/stock_id.png
-share/icons/gnome/32x32/stock/generic/stock_keyring.png
-share/icons/gnome/32x32/stock/generic/stock_landline-phone.png
-share/icons/gnome/32x32/stock/generic/stock_new-24h-appointment.png
-share/icons/gnome/32x32/stock/generic/stock_new-appointment.png
-share/icons/gnome/32x32/stock/generic/stock_new-meeting.png
-share/icons/gnome/32x32/stock/generic/stock_news.png
-share/icons/gnome/32x32/stock/generic/stock_notebook.png
-share/icons/gnome/32x32/stock/generic/stock_notes.png
-share/icons/gnome/32x32/stock/generic/stock_openoffice.png
-share/icons/gnome/32x32/stock/generic/stock_people.png
-share/icons/gnome/32x32/stock/generic/stock_summary.png
-share/icons/gnome/32x32/stock/generic/stock_web-calendar.png
-share/icons/gnome/32x32/stock/io/stock_bluetooth.png
-share/icons/gnome/32x32/stock/io/stock_network-printer.png
-share/icons/gnome/32x32/stock/io/stock_opensave.png
-share/icons/gnome/32x32/stock/io/stock_print-driver.png
-share/icons/gnome/32x32/stock/io/stock_print-preview-print.png
-share/icons/gnome/32x32/stock/io/stock_print-preview.png
-share/icons/gnome/32x32/stock/io/stock_print-setup.png
-share/icons/gnome/32x32/stock/io/stock_print.png
-share/icons/gnome/32x32/stock/io/stock_printers.png
-share/icons/gnome/32x32/stock/media/stock_sound.png
-share/icons/gnome/32x32/stock/media/stock_volume-0.png
-share/icons/gnome/32x32/stock/media/stock_volume-max.png
-share/icons/gnome/32x32/stock/media/stock_volume-med.png
-share/icons/gnome/32x32/stock/media/stock_volume-min.png
-share/icons/gnome/32x32/stock/media/stock_volume-mute.png
-share/icons/gnome/32x32/stock/media/stock_volume.png
-share/icons/gnome/32x32/stock/net/stock_addressbook.png
-share/icons/gnome/32x32/stock/net/stock_appointment-reminder-excl.png
-share/icons/gnome/32x32/stock/net/stock_appointment-reminder.png
-share/icons/gnome/32x32/stock/net/stock_channel.png
-share/icons/gnome/32x32/stock/net/stock_contact.png
-share/icons/gnome/32x32/stock/net/stock_directory-server.png
-share/icons/gnome/32x32/stock/net/stock_exchange-connector.png
-share/icons/gnome/32x32/stock/net/stock_groupwise-connector.png
-share/icons/gnome/32x32/stock/net/stock_inbox.png
-share/icons/gnome/32x32/stock/net/stock_internet.png
-share/icons/gnome/32x32/stock/net/stock_mail-import.png
-share/icons/gnome/32x32/stock/net/stock_mail-open.png
-share/icons/gnome/32x32/stock/net/stock_mail-receive.png
-share/icons/gnome/32x32/stock/net/stock_mail-send-receive.png
-share/icons/gnome/32x32/stock/net/stock_mail-send.png
-share/icons/gnome/32x32/stock/net/stock_mail.png
-share/icons/gnome/32x32/stock/net/stock_not-spam.png
-share/icons/gnome/32x32/stock/net/stock_outbox.png
-share/icons/gnome/32x32/stock/net/stock_post-message.png
-share/icons/gnome/32x32/stock/net/stock_sent-mail.png
-share/icons/gnome/32x32/stock/net/stock_spam.png
-share/icons/gnome/32x32/stock/object/stock_add-bookmark.png
-share/icons/gnome/32x32/stock/object/stock_bookmark.png
-share/icons/gnome/32x32/stock/object/stock_delete-bookmark.png
-share/icons/gnome/32x32/stock/object/stock_edit-bookmark.png
-share/icons/gnome/36x36/apps/gnome-spinner-rest.png
-share/icons/gnome/36x36/apps/gnome-spinner.png
-share/icons/gnome/36x36/emblems/emblem-symbolic-link.png
-share/icons/gnome/36x36/filesystems/gnome-fs-directory-accept.icon
-share/icons/gnome/36x36/filesystems/gnome-fs-directory-accept.png
-share/icons/gnome/36x36/filesystems/gnome-fs-directory-visiting.icon
-share/icons/gnome/36x36/filesystems/gnome-fs-directory-visiting.png
-share/icons/gnome/36x36/filesystems/gnome-fs-directory.icon
-share/icons/gnome/36x36/filesystems/gnome-fs-directory.png
-share/icons/gnome/36x36/stock/document/stock_my-documents.png
-share/icons/gnome/36x36/stock/document/stock_new-drawing.png
-share/icons/gnome/36x36/stock/document/stock_new-formula.png
-share/icons/gnome/36x36/stock/document/stock_new-html.png
-share/icons/gnome/36x36/stock/document/stock_new-labels.png
-share/icons/gnome/36x36/stock/document/stock_new-master-document.png
-share/icons/gnome/36x36/stock/document/stock_new-presentation.png
-share/icons/gnome/36x36/stock/document/stock_new-spreadsheet.png
-share/icons/gnome/36x36/stock/document/stock_new-template.png
-share/icons/gnome/36x36/stock/document/stock_new-text.png
-share/icons/gnome/36x36/stock/document/stock_samples.png
-share/icons/gnome/36x36/stock/generic/stock_autopilot.png
-share/icons/gnome/36x36/stock/generic/stock_new.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.image.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.rn-realmedia.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.stardivision.impress.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.sun.xml.draw.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-wordperfect.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-7z-compressed.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-abiword.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-applix-spreadsheet.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-applix-word.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-archive.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-arj.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-bzip.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-compress.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-compressed-tar.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-cpio-compressed.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-cpio.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-deb.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-dvi.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-executable.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-font-afm.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-font-bdf.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-font-linux-psf.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-font-pcf.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-font-sunos-news.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-font-ttf.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-gnumeric.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-gzip.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-gzpostscript.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-jar.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-killustrator.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-kpresenter.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-kspread.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-kword.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-lha.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-lhz.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-ms-dos-executable.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-perl.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-php.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-python-bytecode.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-rar.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-rpm.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-scribus.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-shellscript.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-shockwave-flash.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-stuffit.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-tar.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-tarz.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-tex.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-xhtml+xml.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-zip.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-audio.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-image.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-text-html.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-text-vnd.wap.wml.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-text-x-csh.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-text-x-python.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-text-x-sh.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-text-x-vcalendar.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-text-x-vcard.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-text-x-zsh.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-text.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-video.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-x-font-afm.png
+share/icons/gnome/32x32/mimetypes/gnome-package.png
+share/icons/gnome/32x32/mimetypes/html.png
+share/icons/gnome/32x32/mimetypes/image-x-generic.png
+share/icons/gnome/32x32/mimetypes/image.png
+share/icons/gnome/32x32/mimetypes/kpresenter_kpr.png
+share/icons/gnome/32x32/mimetypes/mime_ascii.png
+share/icons/gnome/32x32/mimetypes/misc.png
+share/icons/gnome/32x32/mimetypes/package-x-generic.png
+share/icons/gnome/32x32/mimetypes/package.png
+share/icons/gnome/32x32/mimetypes/package_editors.png
+share/icons/gnome/32x32/mimetypes/package_wordprocessing.png
+share/icons/gnome/32x32/mimetypes/plan.png
+share/icons/gnome/32x32/mimetypes/rpm.png
+share/icons/gnome/32x32/mimetypes/shellscript.png
+share/icons/gnome/32x32/mimetypes/sound.png
+share/icons/gnome/32x32/mimetypes/spreadsheet.png
+share/icons/gnome/32x32/mimetypes/stock_addressbook.png
+share/icons/gnome/32x32/mimetypes/stock_calendar.png
+share/icons/gnome/32x32/mimetypes/stock_certificate.png
+share/icons/gnome/32x32/mimetypes/stock_script.png
+share/icons/gnome/32x32/mimetypes/tar.png
+share/icons/gnome/32x32/mimetypes/template_source.png
+share/icons/gnome/32x32/mimetypes/text-html.png
+share/icons/gnome/32x32/mimetypes/text-x-generic-template.png
+share/icons/gnome/32x32/mimetypes/text-x-generic.png
+share/icons/gnome/32x32/mimetypes/text-x-script.png
+share/icons/gnome/32x32/mimetypes/tgz.png
+share/icons/gnome/32x32/mimetypes/txt.png
+share/icons/gnome/32x32/mimetypes/txt2.png
+share/icons/gnome/32x32/mimetypes/unknown.png
+share/icons/gnome/32x32/mimetypes/vcalendar.png
+share/icons/gnome/32x32/mimetypes/vcard.png
+share/icons/gnome/32x32/mimetypes/video-x-generic.png
+share/icons/gnome/32x32/mimetypes/video.png
+share/icons/gnome/32x32/mimetypes/wordprocessing.png
+share/icons/gnome/32x32/mimetypes/www.png
+share/icons/gnome/32x32/mimetypes/x-office-address-book.png
+share/icons/gnome/32x32/mimetypes/x-office-calendar.png
+share/icons/gnome/32x32/mimetypes/x-office-document.png
+share/icons/gnome/32x32/mimetypes/x-office-drawing.png
+share/icons/gnome/32x32/mimetypes/x-office-presentation.png
+share/icons/gnome/32x32/mimetypes/x-office-spreadsheet.png
+share/icons/gnome/32x32/mimetypes/zip.png
+share/icons/gnome/32x32/places/application-x-gnome-saved-search.png
+share/icons/gnome/32x32/places/distributor-logo.png
+share/icons/gnome/32x32/places/desktop.png
+share/icons/gnome/32x32/places/emptytrash.png
+share/icons/gnome/32x32/places/folder-remote.png
+share/icons/gnome/32x32/places/folder-saved-search.png
+share/icons/gnome/32x32/places/folder.png
+share/icons/gnome/32x32/places/folder_home.png
+share/icons/gnome/32x32/places/gnome-fs-desktop.png
+share/icons/gnome/32x32/places/gnome-fs-directory.png
+share/icons/gnome/32x32/places/gnome-fs-ftp.png
+share/icons/gnome/32x32/places/gnome-fs-home.png
+share/icons/gnome/32x32/places/gnome-fs-network.png
+share/icons/gnome/32x32/places/gnome-fs-nfs.png
+share/icons/gnome/32x32/places/gnome-fs-server.png
+share/icons/gnome/32x32/places/gnome-fs-share.png
+share/icons/gnome/32x32/places/gnome-fs-smb.png
+share/icons/gnome/32x32/places/gnome-fs-ssh.png
+share/icons/gnome/32x32/places/gnome-fs-trash-empty.png
+share/icons/gnome/32x32/places/gnome-main-menu.png
+share/icons/gnome/32x32/places/gnome-mime-x-directory-nfs-server.png
+share/icons/gnome/32x32/places/gnome-mime-x-directory-smb-server.png
+share/icons/gnome/32x32/places/gnome-mime-x-directory-smb-share.png
+share/icons/gnome/32x32/places/gnome-mime-x-directory-smb-workgroup.png
+share/icons/gnome/32x32/places/gnome-stock-trash.png
+share/icons/gnome/32x32/places/gtk-network.png
+share/icons/gnome/32x32/places/network-server.png
+share/icons/gnome/32x32/places/network-workgroup.png
+share/icons/gnome/32x32/places/network.png
+share/icons/gnome/32x32/places/network_local.png
+share/icons/gnome/32x32/places/novell-button.png
+share/icons/gnome/32x32/places/redhat-network-server.png
+share/icons/gnome/32x32/places/server.png
+share/icons/gnome/32x32/places/start-here.png
+share/icons/gnome/32x32/places/stock_folder.png
+share/icons/gnome/32x32/places/trashcan_empty.png
+share/icons/gnome/32x32/places/user-desktop.png
+share/icons/gnome/32x32/places/user-home.png
+share/icons/gnome/32x32/places/user-trash.png
+share/icons/gnome/32x32/places/xfce-trash_empty.png
+share/icons/gnome/32x32/status/connect_creating.png
+share/icons/gnome/32x32/status/connect_established.png
+share/icons/gnome/32x32/status/connect_no.png
+share/icons/gnome/32x32/status/dialog-error.png
+share/icons/gnome/32x32/status/dialog-information.png
+share/icons/gnome/32x32/status/dialog-warning.png
+share/icons/gnome/32x32/status/edittrash.png
+share/icons/gnome/32x32/status/error.png
+share/icons/gnome/32x32/status/folder-drag-accept.png
+share/icons/gnome/32x32/status/folder-open.png
+share/icons/gnome/32x32/status/folder-visiting.png
+share/icons/gnome/32x32/status/folder_open.png
+share/icons/gnome/32x32/status/gnome-fs-directory-accept.png
+share/icons/gnome/32x32/status/gnome-fs-directory-visiting.png
+share/icons/gnome/32x32/status/gnome-fs-loading-icon.png
+share/icons/gnome/32x32/status/gnome-fs-trash-full.png
+share/icons/gnome/32x32/status/gnome-netstatus-disconn.png
+share/icons/gnome/32x32/status/gnome-netstatus-error.png
+share/icons/gnome/32x32/status/gnome-netstatus-idle.png
+share/icons/gnome/32x32/status/gnome-netstatus-rx.png
+share/icons/gnome/32x32/status/gnome-netstatus-tx.png
+share/icons/gnome/32x32/status/gnome-netstatus-txrx.png
+share/icons/gnome/32x32/status/gnome-stock-trash-full.png
+share/icons/gnome/32x32/status/gtk-dialog-error.png
+share/icons/gnome/32x32/status/gtk-dialog-info.png
+share/icons/gnome/32x32/status/gtk-dialog-warning.png
+share/icons/gnome/32x32/status/image-loading.png
+share/icons/gnome/32x32/status/important.png
+share/icons/gnome/32x32/status/info.png
+share/icons/gnome/32x32/status/messagebox_critical.png
+share/icons/gnome/32x32/status/messagebox_info.png
+share/icons/gnome/32x32/status/messagebox_warning.png
+share/icons/gnome/32x32/status/network-error.png
+share/icons/gnome/32x32/status/network-idle.png
+share/icons/gnome/32x32/status/network-offline.png
+share/icons/gnome/32x32/status/network-receive.png
+share/icons/gnome/32x32/status/network-transmit-receive.png
+share/icons/gnome/32x32/status/network-transmit.png
+share/icons/gnome/32x32/status/nm-adhoc.png
+share/icons/gnome/32x32/status/nm-device-wired.png
+share/icons/gnome/32x32/status/nm-device-wireless.png
+share/icons/gnome/32x32/status/nm-no-connection.png
+share/icons/gnome/32x32/status/stock_dialog-error.png
+share/icons/gnome/32x32/status/stock_dialog-info.png
+share/icons/gnome/32x32/status/stock_dialog-warning.png
+share/icons/gnome/32x32/status/stock_open.png
+share/icons/gnome/32x32/status/stock_trash_full.png
+share/icons/gnome/32x32/status/stock_weather-cloudy.png
+share/icons/gnome/32x32/status/stock_weather-few-clouds.png
+share/icons/gnome/32x32/status/stock_weather-night-clear.png
+share/icons/gnome/32x32/status/stock_weather-night-few-clouds.png
+share/icons/gnome/32x32/status/stock_weather-showers.png
+share/icons/gnome/32x32/status/stock_weather-snow.png
+share/icons/gnome/32x32/status/stock_weather-storm.png
+share/icons/gnome/32x32/status/stock_weather-sunny.png
+share/icons/gnome/32x32/status/sunny.png
+share/icons/gnome/32x32/status/trashcan_full.png
+share/icons/gnome/32x32/status/user-trash-full.png
+share/icons/gnome/32x32/status/weather-clear-night.png
+share/icons/gnome/32x32/status/weather-clear.png
+share/icons/gnome/32x32/status/weather-few-clouds-night.png
+share/icons/gnome/32x32/status/weather-few-clouds.png
+share/icons/gnome/32x32/status/weather-overcast.png
+share/icons/gnome/32x32/status/weather-severe-alert.png
+share/icons/gnome/32x32/status/weather-showers-scattered.png
+share/icons/gnome/32x32/status/weather-showers.png
+share/icons/gnome/32x32/status/weather-snow.png
+share/icons/gnome/32x32/status/weather-storm.png
+share/icons/gnome/32x32/status/xfce-trash_full.png
+share/icons/gnome/48x48/actions/appointment-new.png
+share/icons/gnome/48x48/actions/appointment.png
+share/icons/gnome/48x48/actions/gnome-stock-mail-new.png
+share/icons/gnome/48x48/actions/mail-mark-junk.png
+share/icons/gnome/48x48/actions/mail-mark-not-junk.png
+share/icons/gnome/48x48/actions/mail-message-new.png
+share/icons/gnome/48x48/actions/mail-send-receive.png
+share/icons/gnome/48x48/actions/mail_new.png
+share/icons/gnome/48x48/actions/mail_spam.png
+share/icons/gnome/48x48/actions/stock_mail-compose.png
+share/icons/gnome/48x48/actions/stock_mail-send-receive.png
+share/icons/gnome/48x48/actions/stock_new-appointment.png
+share/icons/gnome/48x48/actions/stock_not-spam.png
+share/icons/gnome/48x48/actions/stock_spam.png
+share/icons/gnome/48x48/animations/gnome-spinner-rest.png
+share/icons/gnome/48x48/animations/gnome-spinner.png
+share/icons/gnome/48x48/animations/process-idle.png
+share/icons/gnome/48x48/animations/process-working.png
+share/icons/gnome/48x48/apps/access.png
share/icons/gnome/48x48/apps/accessibility-directory.png
+share/icons/gnome/48x48/apps/accessories-calculator.png
share/icons/gnome/48x48/apps/administration.png
share/icons/gnome/48x48/apps/advanced-directory.png
share/icons/gnome/48x48/apps/apacheconf.png
share/icons/gnome/48x48/apps/applets-screenshooter.png
-share/icons/gnome/48x48/apps/beast.png
-share/icons/gnome/48x48/apps/burner.png
+share/icons/gnome/48x48/apps/calc.png
share/icons/gnome/48x48/apps/character-picker.png
-share/icons/gnome/48x48/apps/clock.png
share/icons/gnome/48x48/apps/config-date.png
share/icons/gnome/48x48/apps/config-language.png
share/icons/gnome/48x48/apps/config-users.png
share/icons/gnome/48x48/apps/config-xfree.png
-share/icons/gnome/48x48/apps/dia_gnome_icon.png
share/icons/gnome/48x48/apps/disks.png
-share/icons/gnome/48x48/apps/drawer.png
share/icons/gnome/48x48/apps/eyes.png
-share/icons/gnome/48x48/apps/file-manager.png
-share/icons/gnome/48x48/apps/file-roller.png
-share/icons/gnome/48x48/apps/gdict.png
+share/icons/gnome/48x48/apps/fonts.png
share/icons/gnome/48x48/apps/gdm.png
share/icons/gnome/48x48/apps/gnome-amusements.png
-share/icons/gnome/48x48/apps/gnome-applications.png
share/icons/gnome/48x48/apps/gnome-audio.png
share/icons/gnome/48x48/apps/gnome-calculator.png
-share/icons/gnome/48x48/apps/gnome-cdplayer-icon.png
share/icons/gnome/48x48/apps/gnome-desktop-config.png
-share/icons/gnome/48x48/apps/gnome-devel.png
share/icons/gnome/48x48/apps/gnome-favorites.png
share/icons/gnome/48x48/apps/gnome-finance.png
-share/icons/gnome/48x48/apps/gnome-ftp.png
-share/icons/gnome/48x48/apps/gnome-globe.png
-share/icons/gnome/48x48/apps/gnome-gnomine.png
-share/icons/gnome/48x48/apps/gnome-graphics.png
share/icons/gnome/48x48/apps/gnome-grecord.png
-share/icons/gnome/48x48/apps/gnome-gsame.png
-share/icons/gnome/48x48/apps/gnome-help.png
-share/icons/gnome/48x48/apps/gnome-joystick.png
-share/icons/gnome/48x48/apps/gnome-lockscreen.png
share/icons/gnome/48x48/apps/gnome-logout.png
-share/icons/gnome/48x48/apps/gnome-media-player.png
-share/icons/gnome/48x48/apps/gnome-monitor.png
-share/icons/gnome/48x48/apps/gnome-multimedia.png
share/icons/gnome/48x48/apps/gnome-networktool.png
-share/icons/gnome/48x48/apps/gnome-nibbles.png
-share/icons/gnome/48x48/apps/gnome-other.png
-share/icons/gnome/48x48/apps/gnome-panel.png
share/icons/gnome/48x48/apps/gnome-pdf.png
-share/icons/gnome/48x48/apps/gnome-reboot.png
-share/icons/gnome/48x48/apps/gnome-run.png
share/icons/gnome/48x48/apps/gnome-searchtool-animation-rest.png
share/icons/gnome/48x48/apps/gnome-searchtool-animation.png
share/icons/gnome/48x48/apps/gnome-searchtool.png
@@ -2162,89 +4178,66 @@ share/icons/gnome/48x48/apps/gnome-server-config.png
share/icons/gnome/48x48/apps/gnome-session.png
share/icons/gnome/48x48/apps/gnome-settings-accessibility-keyboard.png
share/icons/gnome/48x48/apps/gnome-settings-accessibility-technologies.png
-share/icons/gnome/48x48/apps/gnome-settings-background.png
share/icons/gnome/48x48/apps/gnome-settings-default-applications.png
share/icons/gnome/48x48/apps/gnome-settings-font.png
share/icons/gnome/48x48/apps/gnome-settings-keybindings.png
share/icons/gnome/48x48/apps/gnome-settings-sound.png
share/icons/gnome/48x48/apps/gnome-settings-theme.png
share/icons/gnome/48x48/apps/gnome-settings-ui-behavior.png
-share/icons/gnome/48x48/apps/gnome-settings.png
-share/icons/gnome/48x48/apps/gnome-shutdown.png
-share/icons/gnome/48x48/apps/gnome-starthere.png
share/icons/gnome/48x48/apps/gnome-system-config.png
-share/icons/gnome/48x48/apps/gnome-system.png
-share/icons/gnome/48x48/apps/gnome-terminal.png
share/icons/gnome/48x48/apps/gnome-unknown.png
-share/icons/gnome/48x48/apps/gnome-util.png
share/icons/gnome/48x48/apps/gnome-window-manager.png
share/icons/gnome/48x48/apps/hint.png
share/icons/gnome/48x48/apps/hwbrowser.png
-share/icons/gnome/48x48/apps/iagno.png
-share/icons/gnome/48x48/apps/im-aim.png
-share/icons/gnome/48x48/apps/im-icq.png
-share/icons/gnome/48x48/apps/im-jabber.png
-share/icons/gnome/48x48/apps/im-msn.png
-share/icons/gnome/48x48/apps/im-nov.png
-share/icons/gnome/48x48/apps/im-yahoo.png
share/icons/gnome/48x48/apps/im.png
share/icons/gnome/48x48/apps/image-viewer.png
-share/icons/gnome/48x48/apps/keyboard.png
+share/icons/gnome/48x48/apps/kcalc.png
share/icons/gnome/48x48/apps/launcher-program.png
-share/icons/gnome/48x48/apps/logviewer.png
-share/icons/gnome/48x48/apps/modem.png
share/icons/gnome/48x48/apps/network-config.png
share/icons/gnome/48x48/apps/palm-pilot-sync.png
share/icons/gnome/48x48/apps/palm-pilot.png
-share/icons/gnome/48x48/apps/panel-notification-area.png
-share/icons/gnome/48x48/apps/panel-window-list.png
-share/icons/gnome/48x48/apps/panel-window-menu.png
share/icons/gnome/48x48/apps/postscript-viewer.png
-share/icons/gnome/48x48/apps/screensaver.png
+share/icons/gnome/48x48/apps/preferences-desktop-accessibility.png
+share/icons/gnome/48x48/apps/preferences-desktop-font.png
+share/icons/gnome/48x48/apps/preferences-desktop-theme.png
share/icons/gnome/48x48/apps/serviceconf.png
-share/icons/gnome/48x48/apps/sodipodi.png
share/icons/gnome/48x48/apps/stock-ticker.png
-share/icons/gnome/48x48/apps/text-editor.png
-share/icons/gnome/48x48/apps/tsclient.png
+share/icons/gnome/48x48/apps/style.png
share/icons/gnome/48x48/apps/user-info.png
share/icons/gnome/48x48/apps/visor.png
-share/icons/gnome/48x48/apps/wallpaper.png
-share/icons/gnome/48x48/apps/web-browser.png
-share/icons/gnome/48x48/apps/wine.png
-share/icons/gnome/48x48/apps/xchat.png
-share/icons/gnome/48x48/apps/xsane.png
-share/icons/gnome/48x48/devices/gnome-dev-battery.png
-share/icons/gnome/48x48/devices/gnome-dev-cdrom-audio.png
-share/icons/gnome/48x48/devices/gnome-dev-cdrom.png
-share/icons/gnome/48x48/devices/gnome-dev-disc-cdr.png
-share/icons/gnome/48x48/devices/gnome-dev-disc-cdrw.png
-share/icons/gnome/48x48/devices/gnome-dev-disc-dvdr-plus.png
-share/icons/gnome/48x48/devices/gnome-dev-disc-dvdr.png
-share/icons/gnome/48x48/devices/gnome-dev-disc-dvdram.png
-share/icons/gnome/48x48/devices/gnome-dev-disc-dvdrom.png
-share/icons/gnome/48x48/devices/gnome-dev-disc-dvdrw.png
-share/icons/gnome/48x48/devices/gnome-dev-dvd.png
-share/icons/gnome/48x48/devices/gnome-dev-floppy.png
-share/icons/gnome/48x48/devices/gnome-dev-harddisk-1394.png
-share/icons/gnome/48x48/devices/gnome-dev-harddisk-usb.png
-share/icons/gnome/48x48/devices/gnome-dev-harddisk.png
-share/icons/gnome/48x48/devices/gnome-dev-ipod.png
+share/icons/gnome/48x48/categories/applications-graphics.png
+share/icons/gnome/48x48/categories/applications-multimedia.png
+share/icons/gnome/48x48/categories/applications-office.png
+share/icons/gnome/48x48/categories/applications-other.png
+share/icons/gnome/48x48/categories/applications-system.png
+share/icons/gnome/48x48/categories/gnome-applications.png
+share/icons/gnome/48x48/categories/gnome-control-center.png
+share/icons/gnome/48x48/categories/gnome-graphics.png
+share/icons/gnome/48x48/categories/gnome-multimedia.png
+share/icons/gnome/48x48/categories/gnome-settings.png
+share/icons/gnome/48x48/categories/gnome-system.png
+share/icons/gnome/48x48/categories/gtk-preferences.png
+share/icons/gnome/48x48/categories/kcontrol.png
+share/icons/gnome/48x48/categories/package_graphics.png
+share/icons/gnome/48x48/categories/package_multimedia.png
+share/icons/gnome/48x48/categories/package_office.png
+share/icons/gnome/48x48/categories/package_system.png
+share/icons/gnome/48x48/categories/preferences-desktop.png
+share/icons/gnome/48x48/categories/redhat-graphics.png
+share/icons/gnome/48x48/categories/redhat-office.png
+share/icons/gnome/48x48/categories/redhat-preferences.png
+share/icons/gnome/48x48/categories/redhat-sound_video.png
+share/icons/gnome/48x48/categories/redhat-system_tools.png
+share/icons/gnome/48x48/categories/xfce-graphics.png
+share/icons/gnome/48x48/categories/xfce-multimedia.png
+share/icons/gnome/48x48/categories/xfce-office.png
+share/icons/gnome/48x48/categories/xfce4-settings.png
share/icons/gnome/48x48/devices/gnome-dev-jazdisk.png
-share/icons/gnome/48x48/devices/gnome-dev-keyboard.png
-share/icons/gnome/48x48/devices/gnome-dev-media-cf.png
-share/icons/gnome/48x48/devices/gnome-dev-media-ms.png
-share/icons/gnome/48x48/devices/gnome-dev-media-sdmmc.png
-share/icons/gnome/48x48/devices/gnome-dev-media-sm.png
-share/icons/gnome/48x48/devices/gnome-dev-memory.png
-share/icons/gnome/48x48/devices/gnome-dev-mouse-ball.png
-share/icons/gnome/48x48/devices/gnome-dev-mouse-optical.png
-share/icons/gnome/48x48/devices/gnome-dev-pcmcia.png
-share/icons/gnome/48x48/devices/gnome-dev-printer.png
-share/icons/gnome/48x48/devices/gnome-dev-removable-1394.png
-share/icons/gnome/48x48/devices/gnome-dev-removable-usb.png
-share/icons/gnome/48x48/devices/gnome-dev-removable.png
-share/icons/gnome/48x48/devices/gnome-dev-symlink.png
share/icons/gnome/48x48/devices/gnome-dev-zipdisk.png
+share/icons/gnome/48x48/devices/gnome-modem.png
+share/icons/gnome/48x48/devices/media-jaz.png
+share/icons/gnome/48x48/devices/media-zip.png
+share/icons/gnome/48x48/devices/modem.png
share/icons/gnome/48x48/emblems/emblem-OK.icon
share/icons/gnome/48x48/emblems/emblem-OK.png
share/icons/gnome/48x48/emblems/emblem-art.icon
@@ -2255,18 +4248,10 @@ share/icons/gnome/48x48/emblems/emblem-certified.icon
share/icons/gnome/48x48/emblems/emblem-certified.png
share/icons/gnome/48x48/emblems/emblem-cool.icon
share/icons/gnome/48x48/emblems/emblem-cool.png
-share/icons/gnome/48x48/emblems/emblem-cvs-added.icon
-share/icons/gnome/48x48/emblems/emblem-cvs-added.png
-share/icons/gnome/48x48/emblems/emblem-cvs-conflict.icon
-share/icons/gnome/48x48/emblems/emblem-cvs-conflict.png
share/icons/gnome/48x48/emblems/emblem-cvs-controlled.icon
share/icons/gnome/48x48/emblems/emblem-cvs-controlled.png
share/icons/gnome/48x48/emblems/emblem-cvs-modified.icon
share/icons/gnome/48x48/emblems/emblem-cvs-modified.png
-share/icons/gnome/48x48/emblems/emblem-cvs-new-file.icon
-share/icons/gnome/48x48/emblems/emblem-cvs-new-file.png
-share/icons/gnome/48x48/emblems/emblem-cvs-removed.icon
-share/icons/gnome/48x48/emblems/emblem-cvs-removed.png
share/icons/gnome/48x48/emblems/emblem-cvs-sticky-tag.icon
share/icons/gnome/48x48/emblems/emblem-cvs-sticky-tag.png
share/icons/gnome/48x48/emblems/emblem-danger.icon
@@ -2287,8 +4272,6 @@ share/icons/gnome/48x48/emblems/emblem-money.icon
share/icons/gnome/48x48/emblems/emblem-money.png
share/icons/gnome/48x48/emblems/emblem-multimedia.icon
share/icons/gnome/48x48/emblems/emblem-multimedia.png
-share/icons/gnome/48x48/emblems/emblem-new.icon
-share/icons/gnome/48x48/emblems/emblem-new.png
share/icons/gnome/48x48/emblems/emblem-noread.icon
share/icons/gnome/48x48/emblems/emblem-noread.png
share/icons/gnome/48x48/emblems/emblem-note.icon
@@ -2297,8 +4280,6 @@ share/icons/gnome/48x48/emblems/emblem-nowrite.icon
share/icons/gnome/48x48/emblems/emblem-nowrite.png
share/icons/gnome/48x48/emblems/emblem-ohno.icon
share/icons/gnome/48x48/emblems/emblem-ohno.png
-share/icons/gnome/48x48/emblems/emblem-package.icon
-share/icons/gnome/48x48/emblems/emblem-package.png
share/icons/gnome/48x48/emblems/emblem-people.icon
share/icons/gnome/48x48/emblems/emblem-people.png
share/icons/gnome/48x48/emblems/emblem-personal.icon
@@ -2315,218 +4296,10 @@ share/icons/gnome/48x48/emblems/emblem-shared.icon
share/icons/gnome/48x48/emblems/emblem-shared.png
share/icons/gnome/48x48/emblems/emblem-sound.icon
share/icons/gnome/48x48/emblems/emblem-sound.png
-share/icons/gnome/48x48/emblems/emblem-symbolic-link.icon
-share/icons/gnome/48x48/emblems/emblem-symbolic-link.png
share/icons/gnome/48x48/emblems/emblem-trash.icon
share/icons/gnome/48x48/emblems/emblem-trash.png
-share/icons/gnome/48x48/emblems/emblem-web.icon
-share/icons/gnome/48x48/emblems/emblem-web.png
-share/icons/gnome/48x48/filesystems/gnome-fs-blockdev.png
share/icons/gnome/48x48/filesystems/gnome-fs-bookmark-missing.png
share/icons/gnome/48x48/filesystems/gnome-fs-bookmark.png
-share/icons/gnome/48x48/filesystems/gnome-fs-chardev.png
-share/icons/gnome/48x48/filesystems/gnome-fs-client.png
-share/icons/gnome/48x48/filesystems/gnome-fs-desktop.png
-share/icons/gnome/48x48/filesystems/gnome-fs-directory-accept.icon
-share/icons/gnome/48x48/filesystems/gnome-fs-directory-accept.png
-share/icons/gnome/48x48/filesystems/gnome-fs-directory-visiting.icon
-share/icons/gnome/48x48/filesystems/gnome-fs-directory-visiting.png
-share/icons/gnome/48x48/filesystems/gnome-fs-directory.icon
-share/icons/gnome/48x48/filesystems/gnome-fs-directory.png
-share/icons/gnome/48x48/filesystems/gnome-fs-executable.png
-share/icons/gnome/48x48/filesystems/gnome-fs-fifo.png
-share/icons/gnome/48x48/filesystems/gnome-fs-ftp.png
-share/icons/gnome/48x48/filesystems/gnome-fs-home.png
-share/icons/gnome/48x48/filesystems/gnome-fs-loading-icon.png
-share/icons/gnome/48x48/filesystems/gnome-fs-network.png
-share/icons/gnome/48x48/filesystems/gnome-fs-nfs.png
-share/icons/gnome/48x48/filesystems/gnome-fs-regular.icon
-share/icons/gnome/48x48/filesystems/gnome-fs-regular.png
-share/icons/gnome/48x48/filesystems/gnome-fs-server.png
-share/icons/gnome/48x48/filesystems/gnome-fs-share.png
-share/icons/gnome/48x48/filesystems/gnome-fs-smb.png
-share/icons/gnome/48x48/filesystems/gnome-fs-socket.png
-share/icons/gnome/48x48/filesystems/gnome-fs-ssh.png
-share/icons/gnome/48x48/filesystems/gnome-fs-trash-empty.png
-share/icons/gnome/48x48/filesystems/gnome-fs-trash-full.png
-share/icons/gnome/48x48/filesystems/gnome-fs-web.png
-share/icons/gnome/48x48/mimetypes/gnome-library.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-magicpoint.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-msword.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-ogg.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-pdf.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-pgp-encrypted.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-pgp-keys.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-pgp-signature.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-pgp.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-postscript.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-qif.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-rhythmbox-effect.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-rhythmbox-playlist.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-rtf.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-smil.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.ms-excel.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.chart.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.database.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.drawing.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.formula.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics-template.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.image.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation-template.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet-template.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-master.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-template.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.stardivision.impress.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.stardivision.writer.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.draw.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.writer.template.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-wordperfect.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-abiword.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-applix-spreadsheet.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-applix-word.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-archive.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-arj.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-backup.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-bittorrent.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-bla.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-blender.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-blf.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-blv.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-bzip.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-cd-image.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-class-file.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-compress.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-compressed-tar.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-core-file.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-core.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-cpio-compressed.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-cpio.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-dc-rom.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-deb.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-desktop.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-dia-diagram.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-dv.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-dvi.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-e-theme.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-executable.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-font-afm.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-font-bdf.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-font-linux-psf.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-font-pcf.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-font-sunos-news.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-font-ttf.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gameboy-rom.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-genesis-rom.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-glade.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gnome-app-info.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gnucash.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gnumeric.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gtktalog.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gzip.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ipod-firmware.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-jar.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-java-byte-code.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-killustrator.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-kpresenter.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-kspread.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-kword.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-lha.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-lhz.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-mrproject.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-msx-rom.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-n64-rom.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-nes-rom.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-object-file.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-object.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-perl.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-php.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-python-bytecode.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-qw.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-rar.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-reject.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-rpm.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ruby.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-sharedlib.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-shellscript.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-shockwave-flash.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-smil.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-sms-rom.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-sql.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-stuffit.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-tar.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-tex.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-trash.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-x509-ca-cert.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-zip.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-audio-ac3.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-audio-basic.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-audio-midi.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-aiff.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-it.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-midi.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-mod.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-mp3.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-s3m.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-stm.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-ulaw.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-voc.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-wav.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-xi.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-audio-x-xm.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-audio.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-css.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-html.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-authors.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-c++.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-c++src.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-c-header.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-c.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-chdr.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-copying.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-credits.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-csh.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-csharp.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-csrc.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-haskell.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-install.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-java.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-literate-haskell.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-lyx.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-makefile.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-objcsrc.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-patch.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-python.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-readme.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-scheme.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-sh.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-sql.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-tex.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-troff-man.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-vcalendar.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-vcard.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-x-zsh.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text-xml.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-text.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-video.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-x-directory-nfs-server.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-x-directory-smb-server.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-x-directory-smb-share.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-x-directory-smb-workgroup.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-x-font-afm.png
-share/icons/gnome/48x48/mimetypes/gnome-package.png
share/icons/gnome/48x48/stock/code/stock_script.png
share/icons/gnome/48x48/stock/data/stock_lock-broken.png
share/icons/gnome/48x48/stock/data/stock_lock-ok.png
@@ -2551,21 +4324,15 @@ share/icons/gnome/48x48/stock/generic/stock_autocompletion.png
share/icons/gnome/48x48/stock/generic/stock_autopilot.png
share/icons/gnome/48x48/stock/generic/stock_briefcase.png
share/icons/gnome/48x48/stock/generic/stock_calendar-and-tasks.png
-share/icons/gnome/48x48/stock/generic/stock_calendar.png
share/icons/gnome/48x48/stock/generic/stock_cell-phone.png
share/icons/gnome/48x48/stock/generic/stock_creditcard.png
-share/icons/gnome/48x48/stock/generic/stock_dialog-error.png
-share/icons/gnome/48x48/stock/generic/stock_dialog-info.png
-share/icons/gnome/48x48/stock/generic/stock_dialog-warning.png
share/icons/gnome/48x48/stock/generic/stock_edit.png
share/icons/gnome/48x48/stock/generic/stock_example.png
-share/icons/gnome/48x48/stock/generic/stock_home.png
share/icons/gnome/48x48/stock/generic/stock_id.png
share/icons/gnome/48x48/stock/generic/stock_init.png
share/icons/gnome/48x48/stock/generic/stock_keyring.png
share/icons/gnome/48x48/stock/generic/stock_landline-phone.png
share/icons/gnome/48x48/stock/generic/stock_new-24h-appointment.png
-share/icons/gnome/48x48/stock/generic/stock_new-appointment.png
share/icons/gnome/48x48/stock/generic/stock_new-meeting.png
share/icons/gnome/48x48/stock/generic/stock_news.png
share/icons/gnome/48x48/stock/generic/stock_notebook.png
@@ -2574,15 +4341,6 @@ share/icons/gnome/48x48/stock/generic/stock_people.png
share/icons/gnome/48x48/stock/generic/stock_summary.png
share/icons/gnome/48x48/stock/generic/stock_timezone.png
share/icons/gnome/48x48/stock/generic/stock_unknown.png
-share/icons/gnome/48x48/stock/generic/stock_weather-cloudy.png
-share/icons/gnome/48x48/stock/generic/stock_weather-few-clouds.png
-share/icons/gnome/48x48/stock/generic/stock_weather-fog.png
-share/icons/gnome/48x48/stock/generic/stock_weather-night-clear.png
-share/icons/gnome/48x48/stock/generic/stock_weather-night-few-clouds.png
-share/icons/gnome/48x48/stock/generic/stock_weather-showers.png
-share/icons/gnome/48x48/stock/generic/stock_weather-snow.png
-share/icons/gnome/48x48/stock/generic/stock_weather-storm.png
-share/icons/gnome/48x48/stock/generic/stock_weather-sunny.png
share/icons/gnome/48x48/stock/generic/stock_web-calendar.png
share/icons/gnome/48x48/stock/io/stock_bluetooth.png
share/icons/gnome/48x48/stock/io/stock_network-printer.png
@@ -2597,8 +4355,6 @@ share/icons/gnome/48x48/stock/io/stock_print-setup.png
share/icons/gnome/48x48/stock/io/stock_print.png
share/icons/gnome/48x48/stock/io/stock_printers.png
share/icons/gnome/48x48/stock/net/stock_addressbook.png
-share/icons/gnome/48x48/stock/net/stock_appointment-reminder-excl.png
-share/icons/gnome/48x48/stock/net/stock_appointment-reminder.png
share/icons/gnome/48x48/stock/net/stock_channel.png
share/icons/gnome/48x48/stock/net/stock_contact.png
share/icons/gnome/48x48/stock/net/stock_directory-server.png
@@ -2623,18 +4379,279 @@ share/icons/gnome/48x48/stock/net/stock_post-message.png
share/icons/gnome/48x48/stock/net/stock_proxy.png
share/icons/gnome/48x48/stock/net/stock_sent-mail.png
share/icons/gnome/48x48/stock/net/stock_spam.png
-share/icons/gnome/72x72/apps/gnome-globe.png
-share/icons/gnome/72x72/filesystems/gnome-fs-regular.icon
-share/icons/gnome/72x72/filesystems/gnome-fs-regular.png
-share/icons/gnome/96x96/apps/gnome-globe.png
-share/icons/gnome/96x96/apps/gnome-starthere.png
-share/icons/gnome/96x96/filesystems/gnome-fs-regular.icon
-share/icons/gnome/96x96/filesystems/gnome-fs-regular.png
+share/icons/gnome/8x8/emblems/emblem-new.png
+share/icons/gnome/8x8/emblems/emblem-symbolic-link.png
share/icons/gnome/index.theme
+share/icons/gnome/scalable/actions/add.svg
+share/icons/gnome/scalable/actions/back.svg
+share/icons/gnome/scalable/actions/bottom.svg
+share/icons/gnome/scalable/actions/document-new.svg
+share/icons/gnome/scalable/actions/document-print-preview.svg
+share/icons/gnome/scalable/actions/document-print.svg
+share/icons/gnome/scalable/actions/document-save-as.svg
+share/icons/gnome/scalable/actions/document-save.svg
+share/icons/gnome/scalable/actions/down.svg
+share/icons/gnome/scalable/actions/edit-delete.svg
+share/icons/gnome/scalable/actions/edit-find-replace.svg
+share/icons/gnome/scalable/actions/edit-find.svg
+share/icons/gnome/scalable/actions/editdelete.svg
+share/icons/gnome/scalable/actions/filefind.svg
+share/icons/gnome/scalable/actions/filenew.svg
+share/icons/gnome/scalable/actions/fileprint.svg
+share/icons/gnome/scalable/actions/filequickprint.svg
+share/icons/gnome/scalable/actions/filesave.svg
+share/icons/gnome/scalable/actions/filesaveas.svg
+share/icons/gnome/scalable/actions/find.svg
+share/icons/gnome/scalable/actions/finish.svg
+share/icons/gnome/scalable/actions/folder-new.svg
+share/icons/gnome/scalable/actions/folder_new.svg
+share/icons/gnome/scalable/actions/forward.svg
+share/icons/gnome/scalable/actions/gnome-lockscreen.svg
+share/icons/gnome/scalable/actions/gnome-run.svg
+share/icons/gnome/scalable/actions/go-bottom.svg
+share/icons/gnome/scalable/actions/go-down.svg
+share/icons/gnome/scalable/actions/go-first.svg
+share/icons/gnome/scalable/actions/go-home.svg
+share/icons/gnome/scalable/actions/go-last.svg
+share/icons/gnome/scalable/actions/go-next.svg
+share/icons/gnome/scalable/actions/go-previous.svg
+share/icons/gnome/scalable/actions/go-top.svg
+share/icons/gnome/scalable/actions/go-up.svg
+share/icons/gnome/scalable/actions/gohome.svg
+share/icons/gnome/scalable/actions/gtk-add.svg
+share/icons/gnome/scalable/actions/gtk-delete.svg
+share/icons/gnome/scalable/actions/gtk-find-and-replace.svg
+share/icons/gnome/scalable/actions/gtk-find.svg
+share/icons/gnome/scalable/actions/gtk-fullscreen.svg
+share/icons/gnome/scalable/actions/gtk-go-back-ltr.svg
+share/icons/gnome/scalable/actions/gtk-go-back-rtl.svg
+share/icons/gnome/scalable/actions/gtk-go-down.svg
+share/icons/gnome/scalable/actions/gtk-go-forward-ltr.svg
+share/icons/gnome/scalable/actions/gtk-go-forward-rtl.svg
+share/icons/gnome/scalable/actions/gtk-go-up.svg
+share/icons/gnome/scalable/actions/gtk-goto-bottom.svg
+share/icons/gnome/scalable/actions/gtk-goto-first-ltr.svg
+share/icons/gnome/scalable/actions/gtk-goto-first-rtl.svg
+share/icons/gnome/scalable/actions/gtk-goto-last-ltr.svg
+share/icons/gnome/scalable/actions/gtk-goto-last-rtl.svg
+share/icons/gnome/scalable/actions/gtk-goto-top.svg
+share/icons/gnome/scalable/actions/gtk-home.svg
+share/icons/gnome/scalable/actions/gtk-leave-fullscreen.svg
+share/icons/gnome/scalable/actions/gtk-new.svg
+share/icons/gnome/scalable/actions/gtk-print-preview.svg
+share/icons/gnome/scalable/actions/gtk-print.svg
+share/icons/gnome/scalable/actions/gtk-remove.svg
+share/icons/gnome/scalable/actions/gtk-save-as.svg
+share/icons/gnome/scalable/actions/gtk-save.svg
+share/icons/gnome/scalable/actions/gtk-zoom-100.svg
+share/icons/gnome/scalable/actions/gtk-zoom-fit.svg
+share/icons/gnome/scalable/actions/gtk-zoom-in.svg
+share/icons/gnome/scalable/actions/gtk-zoom-out.svg
+share/icons/gnome/scalable/actions/kfm_home.svg
+share/icons/gnome/scalable/actions/list-add.svg
+share/icons/gnome/scalable/actions/list-remove.svg
+share/icons/gnome/scalable/actions/lock.svg
+share/icons/gnome/scalable/actions/next.svg
+share/icons/gnome/scalable/actions/previous.svg
+share/icons/gnome/scalable/actions/redhat-home.svg
+share/icons/gnome/scalable/actions/remove.svg
+share/icons/gnome/scalable/actions/start.svg
+share/icons/gnome/scalable/actions/stock_bottom.svg
+share/icons/gnome/scalable/actions/stock_delete.svg
+share/icons/gnome/scalable/actions/stock_down.svg
+share/icons/gnome/scalable/actions/stock_first.svg
+share/icons/gnome/scalable/actions/stock_fullscreen.svg
+share/icons/gnome/scalable/actions/stock_home.svg
+share/icons/gnome/scalable/actions/stock_last.svg
+share/icons/gnome/scalable/actions/stock_leave-fullscreen.svg
+share/icons/gnome/scalable/actions/stock_left.svg
+share/icons/gnome/scalable/actions/stock_new-dir.svg
+share/icons/gnome/scalable/actions/stock_new-text.svg
+share/icons/gnome/scalable/actions/stock_new-window.svg
+share/icons/gnome/scalable/actions/stock_print-preview.svg
+share/icons/gnome/scalable/actions/stock_print.svg
+share/icons/gnome/scalable/actions/stock_right.svg
+share/icons/gnome/scalable/actions/stock_save-as.svg
+share/icons/gnome/scalable/actions/stock_save.svg
+share/icons/gnome/scalable/actions/stock_search-and-replace.svg
+share/icons/gnome/scalable/actions/stock_search.svg
+share/icons/gnome/scalable/actions/stock_top.svg
+share/icons/gnome/scalable/actions/stock_up.svg
+share/icons/gnome/scalable/actions/stock_zoom-1.svg
+share/icons/gnome/scalable/actions/stock_zoom-in.svg
+share/icons/gnome/scalable/actions/stock_zoom-out.svg
+share/icons/gnome/scalable/actions/stock_zoom-page.svg
+share/icons/gnome/scalable/actions/system-lock-screen.svg
+share/icons/gnome/scalable/actions/system-run.svg
+share/icons/gnome/scalable/actions/top.svg
+share/icons/gnome/scalable/actions/up.svg
+share/icons/gnome/scalable/actions/view-fullscreen.svg
+share/icons/gnome/scalable/actions/view-restore.svg
+share/icons/gnome/scalable/actions/window-new.svg
+share/icons/gnome/scalable/actions/window_fullscreen.svg
+share/icons/gnome/scalable/actions/window_new.svg
+share/icons/gnome/scalable/actions/window_nofullscreen.svg
+share/icons/gnome/scalable/actions/xfce-system-lock.svg
+share/icons/gnome/scalable/actions/zoom-best-fit.svg
+share/icons/gnome/scalable/actions/zoom-in.svg
+share/icons/gnome/scalable/actions/zoom-original.svg
+share/icons/gnome/scalable/actions/zoom-out.svg
+share/icons/gnome/scalable/apps/accessories-dictionary.svg
+share/icons/gnome/scalable/apps/accessories-text-editor.svg
+share/icons/gnome/scalable/apps/arts.svg
+share/icons/gnome/scalable/apps/background.svg
share/icons/gnome/scalable/apps/evolution.svg
+share/icons/gnome/scalable/apps/file-manager.svg
+share/icons/gnome/scalable/apps/gnome-help.svg
+share/icons/gnome/scalable/apps/gnome-mixer.svg
+share/icons/gnome/scalable/apps/gnome-monitor.svg
+share/icons/gnome/scalable/apps/gnome-settings-background.svg
+share/icons/gnome/scalable/apps/gnome-shutdown.svg
+share/icons/gnome/scalable/apps/gnome-terminal.svg
+share/icons/gnome/scalable/apps/gtk-help.svg
+share/icons/gnome/scalable/apps/help-browser.svg
+share/icons/gnome/scalable/apps/help.svg
+share/icons/gnome/scalable/apps/im-aim.svg
+share/icons/gnome/scalable/apps/im-icq.svg
+share/icons/gnome/scalable/apps/im-jabber.svg
+share/icons/gnome/scalable/apps/im-msn.svg
+share/icons/gnome/scalable/apps/im-nov.svg
+share/icons/gnome/scalable/apps/im-yahoo.svg
+share/icons/gnome/scalable/apps/kcmsound.svg
+share/icons/gnome/scalable/apps/kedit.svg
+share/icons/gnome/scalable/apps/kfm.svg
+share/icons/gnome/scalable/apps/khelpcenter.svg
+share/icons/gnome/scalable/apps/konsole.svg
+share/icons/gnome/scalable/apps/kscreensaver.svg
+share/icons/gnome/scalable/apps/ksysguard.svg
+share/icons/gnome/scalable/apps/logviewer.svg
+share/icons/gnome/scalable/apps/multimedia-volume-control.svg
+share/icons/gnome/scalable/apps/multimedia.svg
+share/icons/gnome/scalable/apps/openterm.svg
+share/icons/gnome/scalable/apps/preferences-desktop-screensaver.svg
+share/icons/gnome/scalable/apps/preferences-desktop-wallpaper.svg
+share/icons/gnome/scalable/apps/redhat-filemanager.svg
+share/icons/gnome/scalable/apps/screensaver.svg
+share/icons/gnome/scalable/apps/stock_help.svg
+share/icons/gnome/scalable/apps/susehelpcenter.svg
+share/icons/gnome/scalable/apps/system-file-manager.svg
+share/icons/gnome/scalable/apps/terminal.svg
+share/icons/gnome/scalable/apps/text-editor.svg
+share/icons/gnome/scalable/apps/utilities-system-monitor.svg
+share/icons/gnome/scalable/apps/utilities-terminal.svg
share/icons/gnome/scalable/apps/volume-knob.svg
-share/icons/gnome/scalable/emblems/emblem-bin.icon
-share/icons/gnome/scalable/emblems/emblem-bin.svg
+share/icons/gnome/scalable/apps/wallpaper.svg
+share/icons/gnome/scalable/apps/web-browser.svg
+share/icons/gnome/scalable/apps/xfce-filemanager.svg
+share/icons/gnome/scalable/apps/xfce-terminal.svg
+share/icons/gnome/scalable/apps/xfce4-backdrop.svg
+share/icons/gnome/scalable/apps/xfce4-mixer.svg
+share/icons/gnome/scalable/apps/xscreensaver.svg
+share/icons/gnome/scalable/categories/applications-accessories.svg
+share/icons/gnome/scalable/categories/applications-development.svg
+share/icons/gnome/scalable/categories/applications-games.svg
+share/icons/gnome/scalable/categories/applications-internet.svg
+share/icons/gnome/scalable/categories/gnome-devel.svg
+share/icons/gnome/scalable/categories/gnome-globe.svg
+share/icons/gnome/scalable/categories/gnome-joystick.svg
+share/icons/gnome/scalable/categories/gnome-util.svg
+share/icons/gnome/scalable/categories/package_development.svg
+share/icons/gnome/scalable/categories/package_games.svg
+share/icons/gnome/scalable/categories/package_network.svg
+share/icons/gnome/scalable/categories/package_settings.svg
+share/icons/gnome/scalable/categories/package_utilities.svg
+share/icons/gnome/scalable/categories/preferences-system.svg
+share/icons/gnome/scalable/categories/redhat-accessories.svg
+share/icons/gnome/scalable/categories/redhat-games.svg
+share/icons/gnome/scalable/categories/redhat-internet.svg
+share/icons/gnome/scalable/categories/redhat-programming.svg
+share/icons/gnome/scalable/categories/redhat-system_settings.svg
+share/icons/gnome/scalable/categories/stock_internet.svg
+share/icons/gnome/scalable/categories/xfce-games.svg
+share/icons/gnome/scalable/categories/xfce-internet.svg
+share/icons/gnome/scalable/categories/xfce-system-settings.svg
+share/icons/gnome/scalable/categories/xfce-utils.svg
+share/icons/gnome/scalable/devices/3floppy_unmount.svg
+share/icons/gnome/scalable/devices/battery.svg
+share/icons/gnome/scalable/devices/cdrom_unmount.svg
+share/icons/gnome/scalable/devices/cdwriter_unmount.svg
+share/icons/gnome/scalable/devices/chardevice.svg
+share/icons/gnome/scalable/devices/computer.svg
+share/icons/gnome/scalable/devices/display.svg
+share/icons/gnome/scalable/devices/drive-cdrom.svg
+share/icons/gnome/scalable/devices/drive-harddisk.svg
+share/icons/gnome/scalable/devices/drive-optical.svg
+share/icons/gnome/scalable/devices/drive-removable-media.svg
+share/icons/gnome/scalable/devices/dvd_unmount.svg
+share/icons/gnome/scalable/devices/gnome-dev-battery.svg
+share/icons/gnome/scalable/devices/gnome-dev-cdrom-audio.svg
+share/icons/gnome/scalable/devices/gnome-dev-cdrom.svg
+share/icons/gnome/scalable/devices/gnome-dev-computer.svg
+share/icons/gnome/scalable/devices/gnome-dev-disc-cdr.svg
+share/icons/gnome/scalable/devices/gnome-dev-disc-cdrw.svg
+share/icons/gnome/scalable/devices/gnome-dev-disc-dvdr-plus.svg
+share/icons/gnome/scalable/devices/gnome-dev-disc-dvdr.svg
+share/icons/gnome/scalable/devices/gnome-dev-disc-dvdram.svg
+share/icons/gnome/scalable/devices/gnome-dev-disc-dvdrom.svg
+share/icons/gnome/scalable/devices/gnome-dev-disc-dvdrw.svg
+share/icons/gnome/scalable/devices/gnome-dev-dvd.svg
+share/icons/gnome/scalable/devices/gnome-dev-floppy.svg
+share/icons/gnome/scalable/devices/gnome-dev-harddisk-1394.svg
+share/icons/gnome/scalable/devices/gnome-dev-harddisk-usb.svg
+share/icons/gnome/scalable/devices/gnome-dev-harddisk.svg
+share/icons/gnome/scalable/devices/gnome-dev-ipod.svg
+share/icons/gnome/scalable/devices/gnome-dev-keyboard.svg
+share/icons/gnome/scalable/devices/gnome-dev-media-cf.svg
+share/icons/gnome/scalable/devices/gnome-dev-media-ms.svg
+share/icons/gnome/scalable/devices/gnome-dev-media-sdmmc.svg
+share/icons/gnome/scalable/devices/gnome-dev-media-sm.svg
+share/icons/gnome/scalable/devices/gnome-dev-mouse-ball.svg
+share/icons/gnome/scalable/devices/gnome-dev-mouse-optical.svg
+share/icons/gnome/scalable/devices/gnome-dev-printer.svg
+share/icons/gnome/scalable/devices/gnome-dev-removable-1394.svg
+share/icons/gnome/scalable/devices/gnome-dev-removable-usb.svg
+share/icons/gnome/scalable/devices/gnome-dev-removable.svg
+share/icons/gnome/scalable/devices/gnome-fs-client.svg
+share/icons/gnome/scalable/devices/gtk-cdrom.svg
+share/icons/gnome/scalable/devices/gtk-floppy.svg
+share/icons/gnome/scalable/devices/gtk-harddisk.svg
+share/icons/gnome/scalable/devices/harddrive.svg
+share/icons/gnome/scalable/devices/hdd_unmount.svg
+share/icons/gnome/scalable/devices/input-keyboard.svg
+share/icons/gnome/scalable/devices/input-mouse.svg
+share/icons/gnome/scalable/devices/ipod_mount.svg
+share/icons/gnome/scalable/devices/keyboard.svg
+share/icons/gnome/scalable/devices/kjobviewer.svg
+share/icons/gnome/scalable/devices/kxkb.svg
+share/icons/gnome/scalable/devices/media-cdrom.svg
+share/icons/gnome/scalable/devices/media-flash.svg
+share/icons/gnome/scalable/devices/media-floppy.svg
+share/icons/gnome/scalable/devices/media-optical.svg
+share/icons/gnome/scalable/devices/mouse.svg
+share/icons/gnome/scalable/devices/multimedia-player.svg
+share/icons/gnome/scalable/devices/printer-remote.svg
+share/icons/gnome/scalable/devices/printer.svg
+share/icons/gnome/scalable/devices/printer1.svg
+share/icons/gnome/scalable/devices/printmgr.svg
+share/icons/gnome/scalable/devices/stock_printers.svg
+share/icons/gnome/scalable/devices/system-floppy.svg
+share/icons/gnome/scalable/devices/system.svg
+share/icons/gnome/scalable/devices/usbpendrive_unmount.svg
+share/icons/gnome/scalable/devices/video-display.svg
+share/icons/gnome/scalable/devices/xfce-printer.svg
+share/icons/gnome/scalable/devices/xfce4-display.svg
+share/icons/gnome/scalable/devices/xfce4-keyboard.svg
+share/icons/gnome/scalable/devices/xfce4-mouse.svg
+share/icons/gnome/scalable/devices/yast_HD.svg
+share/icons/gnome/scalable/devices/yast_idetude.svg
+share/icons/gnome/scalable/devices/yast_mouse.svg
+share/icons/gnome/scalable/devices/yast_printer.svg
+share/icons/gnome/scalable/emblems/emblem-cvs-added.icon
+share/icons/gnome/scalable/emblems/emblem-cvs-added.svg
+share/icons/gnome/scalable/emblems/emblem-cvs-conflict.icon
+share/icons/gnome/scalable/emblems/emblem-cvs-conflict.svg
+share/icons/gnome/scalable/emblems/emblem-cvs-removed.icon
+share/icons/gnome/scalable/emblems/emblem-cvs-removed.svg
share/icons/gnome/scalable/emblems/emblem-favorite.icon
share/icons/gnome/scalable/emblems/emblem-favorite.svg
share/icons/gnome/scalable/emblems/emblem-generic.icon
@@ -2643,38 +4660,331 @@ share/icons/gnome/scalable/emblems/emblem-important.icon
share/icons/gnome/scalable/emblems/emblem-important.svg
share/icons/gnome/scalable/emblems/emblem-mail.icon
share/icons/gnome/scalable/emblems/emblem-mail.svg
+share/icons/gnome/scalable/emblems/emblem-new.icon
+share/icons/gnome/scalable/emblems/emblem-new.svg
+share/icons/gnome/scalable/emblems/emblem-package.icon
+share/icons/gnome/scalable/emblems/emblem-package.svg
share/icons/gnome/scalable/emblems/emblem-special.icon
share/icons/gnome/scalable/emblems/emblem-special.svg
+share/icons/gnome/scalable/emblems/emblem-symbolic-link.svg
share/icons/gnome/scalable/emblems/emblem-urgent.icon
share/icons/gnome/scalable/emblems/emblem-urgent.svg
-share/icons/gnome/scalable/filesystems/gnome-fs-directory-accept.svg
-share/icons/gnome/scalable/filesystems/gnome-fs-directory-visiting.svg
-share/icons/gnome/scalable/filesystems/gnome-fs-directory.svg
-share/icons/gnome/scalable/filesystems/gnome-fs-home.svg
-share/icons/gnome/scalable/filesystems/gnome-fs-trash-empty.svg
-share/icons/gnome/scalable/filesystems/gnome-fs-trash-full.svg
-share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-gnome-saved-search.svg
+share/icons/gnome/scalable/emblems/emblem-web.icon
+share/icons/gnome/scalable/emblems/emblem-web.svg
+share/icons/gnome/scalable/emblems/stock_mail-priority-high.icon
+share/icons/gnome/scalable/emblems/stock_mail-priority-high.svg
+share/icons/gnome/scalable/mimetypes/application-certificate.svg
+share/icons/gnome/scalable/mimetypes/application-x-executable.svg
+share/icons/gnome/scalable/mimetypes/ascii.svg
+share/icons/gnome/scalable/mimetypes/audio-x-generic.svg
+share/icons/gnome/scalable/mimetypes/binary.svg
+share/icons/gnome/scalable/mimetypes/contents2.svg
+share/icons/gnome/scalable/mimetypes/deb.svg
+share/icons/gnome/scalable/mimetypes/document.svg
+share/icons/gnome/scalable/mimetypes/empty.svg
+share/icons/gnome/scalable/mimetypes/exec.svg
+share/icons/gnome/scalable/mimetypes/folder_tar.svg
+share/icons/gnome/scalable/mimetypes/font-x-generic.svg
+share/icons/gnome/scalable/mimetypes/font.svg
+share/icons/gnome/scalable/mimetypes/font_bitmap.svg
+share/icons/gnome/scalable/mimetypes/font_truetype.svg
+share/icons/gnome/scalable/mimetypes/font_type1.svg
+share/icons/gnome/scalable/mimetypes/gnome-fs-executable.svg
+share/icons/gnome/scalable/mimetypes/gnome-fs-regular.icon
+share/icons/gnome/scalable/mimetypes/gnome-fs-regular.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-magicpoint.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-msword.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-ogg.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-pdf.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-postscript.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-rtf.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.ms-excel.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.ms-powerpoint.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.graphics.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.image.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.stardivision.calc.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.stardivision.impress.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.stardivision.writer.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.calc.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.draw.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.impress.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.writer.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-wordperfect.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-7z-compressed.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-abiword.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-applix-spreadsheet.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-applix-word.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-archive.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-arj.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-bzip-compressed-tar.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-bzip.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-compress.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-compressed-tar.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-cpio-compressed.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-cpio.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-deb.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-dvi.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-executable.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-font-afm.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-font-bdf.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-font-linux-psf.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-font-pcf.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-font-sunos-news.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-font-ttf.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-gnumeric.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-gzip.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-gzpostscript.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-jar.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-killustrator.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-kpresenter.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-kspread.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-kword.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-lha.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-lhz.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-ms-dos-executable.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-perl.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-php.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-python-bytecode.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-rar.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-rpm.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-scribus.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-shellscript.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-shockwave-flash.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-stuffit.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-tar.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-tarz.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-tex.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-xhtml+xml.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-zip.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-audio.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-image.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-text-html.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-text-vnd.wap.wml.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-text-x-csh.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-text-x-python.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-text-x-sh.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-text-x-vcalendar.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-text-x-vcard.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-text-x-zsh.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-text.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-video.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-x-font-afm.svg
+share/icons/gnome/scalable/mimetypes/gnome-package.svg
+share/icons/gnome/scalable/mimetypes/gtk-file.icon
+share/icons/gnome/scalable/mimetypes/gtk-file.svg
+share/icons/gnome/scalable/mimetypes/html.svg
+share/icons/gnome/scalable/mimetypes/image-x-generic.svg
+share/icons/gnome/scalable/mimetypes/image.svg
+share/icons/gnome/scalable/mimetypes/kpresenter_kpr.svg
+share/icons/gnome/scalable/mimetypes/mime_ascii.svg
+share/icons/gnome/scalable/mimetypes/misc.svg
+share/icons/gnome/scalable/mimetypes/package-x-generic.svg
+share/icons/gnome/scalable/mimetypes/package.svg
+share/icons/gnome/scalable/mimetypes/package_editors.svg
+share/icons/gnome/scalable/mimetypes/package_wordprocessing.svg
+share/icons/gnome/scalable/mimetypes/plan.svg
+share/icons/gnome/scalable/mimetypes/rpm.svg
+share/icons/gnome/scalable/mimetypes/shellscript.svg
+share/icons/gnome/scalable/mimetypes/sound.svg
+share/icons/gnome/scalable/mimetypes/spreadsheet.svg
+share/icons/gnome/scalable/mimetypes/stock_addressbook.svg
+share/icons/gnome/scalable/mimetypes/stock_calendar.svg
+share/icons/gnome/scalable/mimetypes/stock_certificate.svg
+share/icons/gnome/scalable/mimetypes/stock_script.svg
+share/icons/gnome/scalable/mimetypes/tar.svg
+share/icons/gnome/scalable/mimetypes/template_source.svg
+share/icons/gnome/scalable/mimetypes/text-html.svg
+share/icons/gnome/scalable/mimetypes/text-x-generic-template.svg
+share/icons/gnome/scalable/mimetypes/text-x-generic.svg
+share/icons/gnome/scalable/mimetypes/text-x-preview.icon
+share/icons/gnome/scalable/mimetypes/text-x-preview.svg
+share/icons/gnome/scalable/mimetypes/text-x-script.svg
+share/icons/gnome/scalable/mimetypes/tgz.svg
+share/icons/gnome/scalable/mimetypes/txt.svg
+share/icons/gnome/scalable/mimetypes/txt2.svg
+share/icons/gnome/scalable/mimetypes/unknown.svg
+share/icons/gnome/scalable/mimetypes/vcalendar.svg
+share/icons/gnome/scalable/mimetypes/vcard.svg
+share/icons/gnome/scalable/mimetypes/video-x-generic.svg
+share/icons/gnome/scalable/mimetypes/video.svg
+share/icons/gnome/scalable/mimetypes/wordprocessing.svg
+share/icons/gnome/scalable/mimetypes/www.svg
+share/icons/gnome/scalable/mimetypes/x-office-address-book.svg
+share/icons/gnome/scalable/mimetypes/x-office-calendar.svg
+share/icons/gnome/scalable/mimetypes/x-office-document.svg
+share/icons/gnome/scalable/mimetypes/x-office-drawing.svg
+share/icons/gnome/scalable/mimetypes/x-office-presentation.svg
+share/icons/gnome/scalable/mimetypes/x-office-spreadsheet.svg
+share/icons/gnome/scalable/mimetypes/zip.svg
+share/icons/gnome/scalable/places/application-x-gnome-saved-search.svg
+share/icons/gnome/scalable/places/desktop.svg
+share/icons/gnome/scalable/places/distributor-logo.svg
+share/icons/gnome/scalable/places/emptytrash.svg
+share/icons/gnome/scalable/places/folder-remote.icon
+share/icons/gnome/scalable/places/folder-remote.svg
+share/icons/gnome/scalable/places/folder-saved-search.svg
+share/icons/gnome/scalable/places/folder.icon
+share/icons/gnome/scalable/places/folder.svg
+share/icons/gnome/scalable/places/folder_home.svg
+share/icons/gnome/scalable/places/gnome-fs-desktop.svg
+share/icons/gnome/scalable/places/gnome-fs-directory.icon
+share/icons/gnome/scalable/places/gnome-fs-directory.svg
+share/icons/gnome/scalable/places/gnome-fs-ftp.icon
+share/icons/gnome/scalable/places/gnome-fs-ftp.svg
+share/icons/gnome/scalable/places/gnome-fs-home.svg
+share/icons/gnome/scalable/places/gnome-fs-network.svg
+share/icons/gnome/scalable/places/gnome-fs-nfs.icon
+share/icons/gnome/scalable/places/gnome-fs-nfs.svg
+share/icons/gnome/scalable/places/gnome-fs-server.svg
+share/icons/gnome/scalable/places/gnome-fs-share.icon
+share/icons/gnome/scalable/places/gnome-fs-share.svg
+share/icons/gnome/scalable/places/gnome-fs-smb.icon
+share/icons/gnome/scalable/places/gnome-fs-smb.svg
+share/icons/gnome/scalable/places/gnome-fs-ssh.icon
+share/icons/gnome/scalable/places/gnome-fs-ssh.svg
+share/icons/gnome/scalable/places/gnome-fs-trash-empty.svg
+share/icons/gnome/scalable/places/gnome-main-menu.svg
+share/icons/gnome/scalable/places/gnome-mime-x-directory-nfs-server.svg
+share/icons/gnome/scalable/places/gnome-mime-x-directory-smb-server.svg
+share/icons/gnome/scalable/places/gnome-mime-x-directory-smb-share.icon
+share/icons/gnome/scalable/places/gnome-mime-x-directory-smb-share.svg
+share/icons/gnome/scalable/places/gnome-mime-x-directory-smb-workgroup.svg
+share/icons/gnome/scalable/places/gnome-stock-trash.svg
+share/icons/gnome/scalable/places/gtk-network.svg
+share/icons/gnome/scalable/places/network-server.svg
+share/icons/gnome/scalable/places/network-workgroup.svg
+share/icons/gnome/scalable/places/network.icon
+share/icons/gnome/scalable/places/network.svg
+share/icons/gnome/scalable/places/network_local.svg
+share/icons/gnome/scalable/places/novell-button.svg
+share/icons/gnome/scalable/places/redhat-network-server.svg
+share/icons/gnome/scalable/places/server.svg
+share/icons/gnome/scalable/places/start-here.svg
+share/icons/gnome/scalable/places/stock_folder.icon
+share/icons/gnome/scalable/places/stock_folder.svg
+share/icons/gnome/scalable/places/trashcan_empty.svg
+share/icons/gnome/scalable/places/user-desktop.svg
+share/icons/gnome/scalable/places/user-home.svg
+share/icons/gnome/scalable/places/user-trash.svg
+share/icons/gnome/scalable/places/xfce-trash_empty.svg
+share/icons/gnome/scalable/status/appointment-missed.svg
+share/icons/gnome/scalable/status/appointment-soon.svg
+share/icons/gnome/scalable/status/audio-volume-high.svg
+share/icons/gnome/scalable/status/audio-volume-low.svg
+share/icons/gnome/scalable/status/audio-volume-medium.svg
+share/icons/gnome/scalable/status/audio-volume-muted.svg
+share/icons/gnome/scalable/status/connect_creating.svg
+share/icons/gnome/scalable/status/connect_established.svg
+share/icons/gnome/scalable/status/connect_no.svg
+share/icons/gnome/scalable/status/dialog-error.svg
+share/icons/gnome/scalable/status/dialog-information.svg
+share/icons/gnome/scalable/status/dialog-warning.svg
+share/icons/gnome/scalable/status/edittrash.svg
+share/icons/gnome/scalable/status/error.svg
+share/icons/gnome/scalable/status/folder-drag-accept.icon
+share/icons/gnome/scalable/status/folder-drag-accept.svg
+share/icons/gnome/scalable/status/folder-open.icon
+share/icons/gnome/scalable/status/folder-open.svg
+share/icons/gnome/scalable/status/folder-visiting.icon
+share/icons/gnome/scalable/status/folder-visiting.svg
+share/icons/gnome/scalable/status/folder_open.icon
+share/icons/gnome/scalable/status/folder_open.svg
+share/icons/gnome/scalable/status/gnome-fs-directory-accept.icon
+share/icons/gnome/scalable/status/gnome-fs-directory-accept.svg
+share/icons/gnome/scalable/status/gnome-fs-directory-visiting.icon
+share/icons/gnome/scalable/status/gnome-fs-directory-visiting.svg
+share/icons/gnome/scalable/status/gnome-fs-loading-icon.svg
+share/icons/gnome/scalable/status/gnome-fs-trash-full.svg
+share/icons/gnome/scalable/status/gnome-netstatus-disconn.svg
+share/icons/gnome/scalable/status/gnome-netstatus-error.svg
+share/icons/gnome/scalable/status/gnome-netstatus-idle.svg
+share/icons/gnome/scalable/status/gnome-netstatus-rx.svg
+share/icons/gnome/scalable/status/gnome-netstatus-tx.svg
+share/icons/gnome/scalable/status/gnome-netstatus-txrx.svg
+share/icons/gnome/scalable/status/gnome-stock-trash-full.svg
+share/icons/gnome/scalable/status/gtk-dialog-error.svg
+share/icons/gnome/scalable/status/gtk-dialog-info.svg
+share/icons/gnome/scalable/status/gtk-dialog-warning.svg
+share/icons/gnome/scalable/status/image-loading.svg
+share/icons/gnome/scalable/status/important.svg
+share/icons/gnome/scalable/status/info.svg
+share/icons/gnome/scalable/status/messagebox_critical.svg
+share/icons/gnome/scalable/status/messagebox_info.svg
+share/icons/gnome/scalable/status/messagebox_warning.svg
+share/icons/gnome/scalable/status/network-error.svg
+share/icons/gnome/scalable/status/network-idle.svg
+share/icons/gnome/scalable/status/network-offline.svg
+share/icons/gnome/scalable/status/network-receive.svg
+share/icons/gnome/scalable/status/network-transmit-receive.svg
+share/icons/gnome/scalable/status/network-transmit.svg
+share/icons/gnome/scalable/status/nm-adhoc.svg
+share/icons/gnome/scalable/status/nm-device-wired.svg
+share/icons/gnome/scalable/status/nm-device-wireless.svg
+share/icons/gnome/scalable/status/nm-no-connection.svg
+share/icons/gnome/scalable/status/stock_appointment-reminder-excl.svg
+share/icons/gnome/scalable/status/stock_appointment-reminder.svg
+share/icons/gnome/scalable/status/stock_dialog-error.svg
+share/icons/gnome/scalable/status/stock_dialog-info.svg
+share/icons/gnome/scalable/status/stock_dialog-warning.svg
+share/icons/gnome/scalable/status/stock_open.icon
+share/icons/gnome/scalable/status/stock_open.svg
+share/icons/gnome/scalable/status/stock_trash_full.svg
+share/icons/gnome/scalable/status/stock_volume-0.svg
+share/icons/gnome/scalable/status/stock_volume-max.svg
+share/icons/gnome/scalable/status/stock_volume-med.svg
+share/icons/gnome/scalable/status/stock_volume-min.svg
+share/icons/gnome/scalable/status/stock_volume-mute.svg
+share/icons/gnome/scalable/status/stock_volume.svg
+share/icons/gnome/scalable/status/stock_weather-cloudy.svg
+share/icons/gnome/scalable/status/stock_weather-few-clouds.svg
+share/icons/gnome/scalable/status/stock_weather-night-clear.svg
+share/icons/gnome/scalable/status/stock_weather-night-few-clouds.svg
+share/icons/gnome/scalable/status/stock_weather-showers.svg
+share/icons/gnome/scalable/status/stock_weather-snow.svg
+share/icons/gnome/scalable/status/stock_weather-storm.svg
+share/icons/gnome/scalable/status/stock_weather-sunny.svg
+share/icons/gnome/scalable/status/sunny.svg
+share/icons/gnome/scalable/status/trashcan_full.svg
+share/icons/gnome/scalable/status/user-trash-full.svg
+share/icons/gnome/scalable/status/weather-clear-night.svg
+share/icons/gnome/scalable/status/weather-clear.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night.svg
+share/icons/gnome/scalable/status/weather-few-clouds.svg
+share/icons/gnome/scalable/status/weather-overcast.svg
+share/icons/gnome/scalable/status/weather-severe-alert.svg
+share/icons/gnome/scalable/status/weather-showers-scattered.svg
+share/icons/gnome/scalable/status/weather-showers.svg
+share/icons/gnome/scalable/status/weather-snow.svg
+share/icons/gnome/scalable/status/weather-storm.svg
+share/icons/gnome/scalable/status/xfce-trash_full.svg
share/icons/gnome/scalable/stock/generic/stock_person.svg
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
@dirrmtry share/icons/gnome/scalable/stock/generic
@dirrmtry share/icons/gnome/scalable/stock
+@dirrmtry share/icons/gnome/scalable/status
+@dirrmtry share/icons/gnome/scalable/places
@dirrmtry share/icons/gnome/scalable/mimetypes
-@dirrmtry share/icons/gnome/scalable/filesystems
@dirrmtry share/icons/gnome/scalable/emblems
@dirrmtry share/icons/gnome/scalable/devices
+@dirrmtry share/icons/gnome/scalable/categories
@dirrmtry share/icons/gnome/scalable/apps
+@dirrmtry share/icons/gnome/scalable/actions
@dirrmtry share/icons/gnome/scalable
-@dirrmtry share/icons/gnome/96x96/mimetypes
-@dirrmtry share/icons/gnome/96x96/filesystems
-@dirrmtry share/icons/gnome/96x96/emblems
-@dirrmtry share/icons/gnome/96x96/devices
-@dirrmtry share/icons/gnome/96x96/apps
-@dirrmtry share/icons/gnome/96x96
-@dirrmtry share/icons/gnome/72x72/mimetypes
-@dirrmtry share/icons/gnome/72x72/filesystems
-@dirrmtry share/icons/gnome/72x72/emblems
-@dirrmtry share/icons/gnome/72x72/devices
-@dirrmtry share/icons/gnome/72x72/apps
-@dirrmtry share/icons/gnome/72x72
+@dirrmtry share/icons/gnome/8x8/emblems
+@dirrmtry share/icons/gnome/8x8
@dirrmtry share/icons/gnome/48x48/stock/net
@dirrmtry share/icons/gnome/48x48/stock/io
@dirrmtry share/icons/gnome/48x48/stock/generic
@@ -2682,35 +4992,25 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
@dirrmtry share/icons/gnome/48x48/stock/data
@dirrmtry share/icons/gnome/48x48/stock/code
@dirrmtry share/icons/gnome/48x48/stock
-@dirrmtry share/icons/gnome/48x48/mimetypes
+@dirrmtry share/icons/gnome/48x48/status
+@dirrmtry share/icons/gnome/48x48/places
@dirrmtry share/icons/gnome/48x48/filesystems
@dirrmtry share/icons/gnome/48x48/emblems
@dirrmtry share/icons/gnome/48x48/devices
+@dirrmtry share/icons/gnome/48x48/categories
@dirrmtry share/icons/gnome/48x48/apps
+@dirrmtry share/icons/gnome/48x48/animations
+@dirrmtry share/icons/gnome/48x48/actions
@dirrmtry share/icons/gnome/48x48
-@dirrmtry share/icons/gnome/36x36/stock/generic
-@dirrmtry share/icons/gnome/36x36/stock/document
-@dirrmtry share/icons/gnome/36x36/stock
-@dirrmtry share/icons/gnome/36x36/mimetypes
-@dirrmtry share/icons/gnome/36x36/filesystems
-@dirrmtry share/icons/gnome/36x36/emblems
-@dirrmtry share/icons/gnome/36x36/devices
-@dirrmtry share/icons/gnome/36x36/apps
-@dirrmtry share/icons/gnome/36x36
-@dirrmtry share/icons/gnome/32x32/stock/object
-@dirrmtry share/icons/gnome/32x32/stock/net
-@dirrmtry share/icons/gnome/32x32/stock/media
-@dirrmtry share/icons/gnome/32x32/stock/io
-@dirrmtry share/icons/gnome/32x32/stock/generic
-@dirrmtry share/icons/gnome/32x32/stock/document
-@dirrmtry share/icons/gnome/32x32/stock/data
-@dirrmtry share/icons/gnome/32x32/stock/code
-@dirrmtry share/icons/gnome/32x32/stock/chart
-@dirrmtry share/icons/gnome/32x32/stock
+@dirrmtry share/icons/gnome/32x32/status
+@dirrmtry share/icons/gnome/32x32/places
@dirrmtry share/icons/gnome/32x32/mimetypes
-@dirrmtry share/icons/gnome/32x32/filesystems
+@dirrmtry share/icons/gnome/32x32/emblems
@dirrmtry share/icons/gnome/32x32/devices
+@dirrmtry share/icons/gnome/32x32/categories
@dirrmtry share/icons/gnome/32x32/apps
+@dirrmtry share/icons/gnome/32x32/animations
+@dirrmtry share/icons/gnome/32x32/actions
@dirrmtry share/icons/gnome/32x32
@dirrmtry share/icons/gnome/24x24/stock/text
@dirrmtry share/icons/gnome/24x24/stock/table
@@ -2727,18 +5027,27 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
@dirrmtry share/icons/gnome/24x24/stock/code
@dirrmtry share/icons/gnome/24x24/stock/chart
@dirrmtry share/icons/gnome/24x24/stock
+@dirrmtry share/icons/gnome/24x24/status
+@dirrmtry share/icons/gnome/24x24/places
@dirrmtry share/icons/gnome/24x24/mimetypes
@dirrmtry share/icons/gnome/24x24/filesystems
@dirrmtry share/icons/gnome/24x24/emblems
@dirrmtry share/icons/gnome/24x24/devices
+@dirrmtry share/icons/gnome/24x24/categories
@dirrmtry share/icons/gnome/24x24/apps
+@dirrmtry share/icons/gnome/24x24/animations
+@dirrmtry share/icons/gnome/24x24/actions
@dirrmtry share/icons/gnome/24x24
-@dirrmtry share/icons/gnome/192x192/mimetypes
-@dirrmtry share/icons/gnome/192x192/filesystems
-@dirrmtry share/icons/gnome/192x192/emblems
-@dirrmtry share/icons/gnome/192x192/devices
-@dirrmtry share/icons/gnome/192x192/apps
-@dirrmtry share/icons/gnome/192x192
+@dirrmtry share/icons/gnome/22x22/status
+@dirrmtry share/icons/gnome/22x22/places
+@dirrmtry share/icons/gnome/22x22/mimetypes
+@dirrmtry share/icons/gnome/22x22/emblems
+@dirrmtry share/icons/gnome/22x22/devices
+@dirrmtry share/icons/gnome/22x22/categories
+@dirrmtry share/icons/gnome/22x22/apps
+@dirrmtry share/icons/gnome/22x22/animations
+@dirrmtry share/icons/gnome/22x22/actions
+@dirrmtry share/icons/gnome/22x22
@dirrmtry share/icons/gnome/16x16/stock/text
@dirrmtry share/icons/gnome/16x16/stock/table
@dirrmtry share/icons/gnome/16x16/stock/object
@@ -2755,14 +5064,15 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
@dirrmtry share/icons/gnome/16x16/stock/code
@dirrmtry share/icons/gnome/16x16/stock/chart
@dirrmtry share/icons/gnome/16x16/stock
+@dirrmtry share/icons/gnome/16x16/status
+@dirrmtry share/icons/gnome/16x16/places
@dirrmtry share/icons/gnome/16x16/mimetypes
@dirrmtry share/icons/gnome/16x16/filesystems
+@dirrmtry share/icons/gnome/16x16/emblems
@dirrmtry share/icons/gnome/16x16/devices
+@dirrmtry share/icons/gnome/16x16/categories
@dirrmtry share/icons/gnome/16x16/apps
+@dirrmtry share/icons/gnome/16x16/animations
+@dirrmtry share/icons/gnome/16x16/actions
@dirrmtry share/icons/gnome/16x16
-@dirrmtry share/icons/gnome/12x12/mimetypes
-@dirrmtry share/icons/gnome/12x12/filesystems
-@dirrmtry share/icons/gnome/12x12/emblems
-@dirrmtry share/icons/gnome/12x12/devices
-@dirrmtry share/icons/gnome/12x12
@dirrmtry share/icons/gnome
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index bd960f58f774..bb9934867874 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnome-mime-data
PORTVERSION= 2.4.2
+PORTREVISION= 2
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-mime-data/2.4
@@ -18,7 +19,6 @@ COMMENT= A MIME and Application database for GNOME
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomehier intlhack gnomeprefix gnometarget pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/misc/gnome-mime-data/pkg-plist b/misc/gnome-mime-data/pkg-plist
index a7b6babf339e..ccb402867418 100644
--- a/misc/gnome-mime-data/pkg-plist
+++ b/misc/gnome-mime-data/pkg-plist
@@ -73,7 +73,49 @@ share/locale/wa/LC_MESSAGES/gnome-mime-data.mo
share/locale/yi/LC_MESSAGES/gnome-mime-data.mo
share/locale/zh_CN/LC_MESSAGES/gnome-mime-data.mo
share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo
-@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/yi/LC_MESSAGES
@dirrmtry share/locale/yi
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index f0c5ee17a59a..ea66d06da57f 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnomeuserdocs2/Makefile,v 1.25 2006/04/13 07:52:36 bland Exp $
+# $MCom: ports/misc/gnome-user-docs/Makefile,v 1.31 2006/10/03 19:58:31 mezz Exp $
#
PORTNAME= gnome-user-docs
-PORTVERSION= 2.14.2
+PORTVERSION= 2.16.1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-user-docs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME= gnome-user-docs-${PORTVERSION}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -21,7 +20,7 @@ BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo
index dad066c40925..452d732a81b5 100644
--- a/misc/gnome-user-docs/distinfo
+++ b/misc/gnome-user-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-user-docs-2.14.2.tar.bz2) = 4f5a7114ccf9e4e31137da50b7333570
-SHA256 (gnome2/gnome-user-docs-2.14.2.tar.bz2) = e055b6a7cb4c3c9e3a27c27c0c8d09f74de81918b3b036dbbcb7a754cb6fb790
-SIZE (gnome2/gnome-user-docs-2.14.2.tar.bz2) = 2024845
+MD5 (gnome2/gnome-user-docs-2.16.1.tar.bz2) = 4b0abfe5e24438414c22083851bae19e
+SHA256 (gnome2/gnome-user-docs-2.16.1.tar.bz2) = 2ad18c2902969c81e0a8d5c510f27d6187ed83a748e8cabe33124c7f0862b354
+SIZE (gnome2/gnome-user-docs-2.16.1.tar.bz2) = 4005619
diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist
index 6ec699b35039..0e7409a7ab4f 100644
--- a/misc/gnome-user-docs/pkg-plist
+++ b/misc/gnome-user-docs/pkg-plist
@@ -33,6 +33,33 @@ share/gnome/help/gnome-access-guide/C/legal.xml
share/gnome/help/gnome-access-guide/C/preface.xml
share/gnome/help/gnome-access-guide/C/sysadmin.xml
share/gnome/help/gnome-access-guide/C/themes.xml
+share/gnome/help/gnome-access-guide/es/figures/accessx.png
+share/gnome/help/gnome-access-guide/es/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/es/figures/button.png
+share/gnome/help/gnome-access-guide/es/figures/check_box.png
+share/gnome/help/gnome-access-guide/es/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/es/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/es/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/es/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/es/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/es/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/es/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/es/figures/radio_button.png
+share/gnome/help/gnome-access-guide/es/figures/slider.png
+share/gnome/help/gnome-access-guide/es/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/es/figures/spin_box.png
+share/gnome/help/gnome-access-guide/es/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/es/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/es/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/es/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/es/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/es/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/es/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/es/figures/stickywindowlock.png
+share/gnome/help/gnome-access-guide/es/figures/tabbed_section.png
+share/gnome/help/gnome-access-guide/es/figures/text_box.png
+share/gnome/help/gnome-access-guide/es/figures/tree.png
+share/gnome/help/gnome-access-guide/es/gnome-access-guide.xml
share/gnome/help/gnome-access-guide/it/figures/accessx.png
share/gnome/help/gnome-access-guide/it/figures/bouncekeys.png
share/gnome/help/gnome-access-guide/it/figures/button.png
@@ -60,6 +87,33 @@ share/gnome/help/gnome-access-guide/it/figures/tabbed_section.png
share/gnome/help/gnome-access-guide/it/figures/text_box.png
share/gnome/help/gnome-access-guide/it/figures/tree.png
share/gnome/help/gnome-access-guide/it/gnome-access-guide.xml
+share/gnome/help/gnome-access-guide/sv/figures/accessx.png
+share/gnome/help/gnome-access-guide/sv/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/sv/figures/button.png
+share/gnome/help/gnome-access-guide/sv/figures/check_box.png
+share/gnome/help/gnome-access-guide/sv/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/sv/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/sv/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/sv/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/sv/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/sv/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/sv/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/sv/figures/radio_button.png
+share/gnome/help/gnome-access-guide/sv/figures/slider.png
+share/gnome/help/gnome-access-guide/sv/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/sv/figures/spin_box.png
+share/gnome/help/gnome-access-guide/sv/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/sv/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/sv/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/sv/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/sv/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/sv/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/sv/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/sv/figures/stickywindowlock.png
+share/gnome/help/gnome-access-guide/sv/figures/tabbed_section.png
+share/gnome/help/gnome-access-guide/sv/figures/text_box.png
+share/gnome/help/gnome-access-guide/sv/figures/tree.png
+share/gnome/help/gnome-access-guide/sv/gnome-access-guide.xml
share/gnome/help/system-admin-guide/C/appendixa.xml
share/gnome/help/system-admin-guide/C/appendixb.xml
share/gnome/help/system-admin-guide/C/fontconfig.xml
@@ -75,7 +129,9 @@ share/gnome/help/system-admin-guide/C/screensavers.xml
share/gnome/help/system-admin-guide/C/sessions.xml
share/gnome/help/system-admin-guide/C/system-admin-guide.xml
share/gnome/help/system-admin-guide/C/themes.xml
+share/gnome/help/system-admin-guide/es/system-admin-guide.xml
share/gnome/help/system-admin-guide/it/system-admin-guide.xml
+share/gnome/help/system-admin-guide/sv/system-admin-guide.xml
share/gnome/help/user-guide/C/figures/ask_pointer.png
share/gnome/help/user-guide/C/figures/busy_pointer.png
share/gnome/help/user-guide/C/figures/com_file_manager_menu.png
@@ -133,6 +189,7 @@ share/gnome/help/user-guide/C/figures/screenshot_button.png
share/gnome/help/user-guide/C/figures/searchtool_button.png
share/gnome/help/user-guide/C/figures/show_desktop_button.png
share/gnome/help/user-guide/C/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/C/figures/titlebar_window.png
share/gnome/help/user-guide/C/figures/typical_menu.png
share/gnome/help/user-guide/C/figures/window_list_applet.png
share/gnome/help/user-guide/C/figures/window_list_group_applet.png
@@ -145,6 +202,7 @@ share/gnome/help/user-guide/C/glossary.xml
share/gnome/help/user-guide/C/gosbasic.xml
share/gnome/help/user-guide/C/goscustdesk.xml
share/gnome/help/user-guide/C/goseditmainmenu.xml
+share/gnome/help/user-guide/C/gosfeedback.xml
share/gnome/help/user-guide/C/gosnautilus.xml
share/gnome/help/user-guide/C/gosoverview.xml
share/gnome/help/user-guide/C/gospanel.xml
@@ -152,6 +210,83 @@ share/gnome/help/user-guide/C/gosstartsession.xml
share/gnome/help/user-guide/C/gostools.xml
share/gnome/help/user-guide/C/legal.xml
share/gnome/help/user-guide/C/user-guide.xml
+share/gnome/help/user-guide/bg/figures/ask_pointer.png
+share/gnome/help/user-guide/bg/figures/busy_pointer.png
+share/gnome/help/user-guide/bg/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/bg/figures/copy_pointer.png
+share/gnome/help/user-guide/bg/figures/force_quit.png
+share/gnome/help/user-guide/bg/figures/four_hide_button.png
+share/gnome/help/user-guide/bg/figures/gedit_window.png
+share/gnome/help/user-guide/bg/figures/gnome_panel.png
+share/gnome/help/user-guide/bg/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/bg/figures/ibeam_pointer.png
+share/gnome/help/user-guide/bg/figures/link_pointer.png
+share/gnome/help/user-guide/bg/figures/lockscreen_icon.png
+share/gnome/help/user-guide/bg/figures/logout_icon.png
+share/gnome/help/user-guide/bg/figures/menu_bar_applet.png
+share/gnome/help/user-guide/bg/figures/menu_panel.png
+share/gnome/help/user-guide/bg/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/bg/figures/move_pointer.png
+share/gnome/help/user-guide/bg/figures/movewindow_pointer.png
+share/gnome/help/user-guide/bg/figures/naut_browser_mode.png
+share/gnome/help/user-guide/bg/figures/naut_button_bar.png
+share/gnome/help/user-guide/bg/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/bg/figures/naut_emblem.png
+share/gnome/help/user-guide/bg/figures/naut_go_to_location.png
+share/gnome/help/user-guide/bg/figures/naut_link_emblem.png
+share/gnome/help/user-guide/bg/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/bg/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/bg/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/bg/figures/naut_refine_search.png
+share/gnome/help/user-guide/bg/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/bg/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/bg/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/bg/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/bg/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/bg/figures/naut_search_bar.png
+share/gnome/help/user-guide/bg/figures/naut_search_results.png
+share/gnome/help/user-guide/bg/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/bg/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/bg/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/bg/figures/naut_spatial_view.png
+share/gnome/help/user-guide/bg/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/bg/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/bg/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/bg/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/bg/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/bg/figures/normal_pointer.png
+share/gnome/help/user-guide/bg/figures/not_available_pointer.png
+share/gnome/help/user-guide/bg/figures/notification_area_icon.png
+share/gnome/help/user-guide/bg/figures/open_drawer.png
+share/gnome/help/user-guide/bg/figures/openwindows_menu.png
+share/gnome/help/user-guide/bg/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/bg/figures/resize_pointer.png
+share/gnome/help/user-guide/bg/figures/run_button.png
+share/gnome/help/user-guide/bg/figures/sample_applet.png
+share/gnome/help/user-guide/bg/figures/screenshot_button.png
+share/gnome/help/user-guide/bg/figures/searchtool_button.png
+share/gnome/help/user-guide/bg/figures/show_desktop_button.png
+share/gnome/help/user-guide/bg/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/bg/figures/titlebar_window.png
+share/gnome/help/user-guide/bg/figures/typical_menu.png
+share/gnome/help/user-guide/bg/figures/window_list_applet.png
+share/gnome/help/user-guide/bg/figures/window_list_group_applet.png
+share/gnome/help/user-guide/bg/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/bg/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/bg/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/bg/figures/yelp_preferences.png
+share/gnome/help/user-guide/bg/figures/yelp_window.png
+share/gnome/help/user-guide/bg/glossary.xml
+share/gnome/help/user-guide/bg/gosbasic.xml
+share/gnome/help/user-guide/bg/goscustdesk.xml
+share/gnome/help/user-guide/bg/goseditmainmenu.xml
+share/gnome/help/user-guide/bg/gosfeedback.xml
+share/gnome/help/user-guide/bg/gosnautilus.xml
+share/gnome/help/user-guide/bg/gosoverview.xml
+share/gnome/help/user-guide/bg/gospanel.xml
+share/gnome/help/user-guide/bg/gosstartsession.xml
+share/gnome/help/user-guide/bg/gostools.xml
+share/gnome/help/user-guide/bg/user-guide.xml
share/gnome/help/user-guide/es/figures/ask_pointer.png
share/gnome/help/user-guide/es/figures/busy_pointer.png
share/gnome/help/user-guide/es/figures/com_file_manager_menu.png
@@ -209,6 +344,7 @@ share/gnome/help/user-guide/es/figures/screenshot_button.png
share/gnome/help/user-guide/es/figures/searchtool_button.png
share/gnome/help/user-guide/es/figures/show_desktop_button.png
share/gnome/help/user-guide/es/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/es/figures/titlebar_window.png
share/gnome/help/user-guide/es/figures/typical_menu.png
share/gnome/help/user-guide/es/figures/window_list_applet.png
share/gnome/help/user-guide/es/figures/window_list_group_applet.png
@@ -221,12 +357,90 @@ share/gnome/help/user-guide/es/glossary.xml
share/gnome/help/user-guide/es/gosbasic.xml
share/gnome/help/user-guide/es/goscustdesk.xml
share/gnome/help/user-guide/es/goseditmainmenu.xml
+share/gnome/help/user-guide/es/gosfeedback.xml
share/gnome/help/user-guide/es/gosnautilus.xml
share/gnome/help/user-guide/es/gosoverview.xml
share/gnome/help/user-guide/es/gospanel.xml
share/gnome/help/user-guide/es/gosstartsession.xml
share/gnome/help/user-guide/es/gostools.xml
share/gnome/help/user-guide/es/user-guide.xml
+share/gnome/help/user-guide/fr/figures/ask_pointer.png
+share/gnome/help/user-guide/fr/figures/busy_pointer.png
+share/gnome/help/user-guide/fr/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/fr/figures/copy_pointer.png
+share/gnome/help/user-guide/fr/figures/force_quit.png
+share/gnome/help/user-guide/fr/figures/four_hide_button.png
+share/gnome/help/user-guide/fr/figures/gedit_window.png
+share/gnome/help/user-guide/fr/figures/gnome_panel.png
+share/gnome/help/user-guide/fr/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/fr/figures/ibeam_pointer.png
+share/gnome/help/user-guide/fr/figures/link_pointer.png
+share/gnome/help/user-guide/fr/figures/lockscreen_icon.png
+share/gnome/help/user-guide/fr/figures/logout_icon.png
+share/gnome/help/user-guide/fr/figures/menu_bar_applet.png
+share/gnome/help/user-guide/fr/figures/menu_panel.png
+share/gnome/help/user-guide/fr/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/fr/figures/move_pointer.png
+share/gnome/help/user-guide/fr/figures/movewindow_pointer.png
+share/gnome/help/user-guide/fr/figures/naut_browser_mode.png
+share/gnome/help/user-guide/fr/figures/naut_button_bar.png
+share/gnome/help/user-guide/fr/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/fr/figures/naut_emblem.png
+share/gnome/help/user-guide/fr/figures/naut_go_to_location.png
+share/gnome/help/user-guide/fr/figures/naut_link_emblem.png
+share/gnome/help/user-guide/fr/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/fr/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/fr/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/fr/figures/naut_refine_search.png
+share/gnome/help/user-guide/fr/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/fr/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/fr/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/fr/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/fr/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/fr/figures/naut_search_bar.png
+share/gnome/help/user-guide/fr/figures/naut_search_results.png
+share/gnome/help/user-guide/fr/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/fr/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/fr/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/fr/figures/naut_spatial_view.png
+share/gnome/help/user-guide/fr/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/fr/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/fr/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/fr/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/fr/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/fr/figures/normal_pointer.png
+share/gnome/help/user-guide/fr/figures/not_available_pointer.png
+share/gnome/help/user-guide/fr/figures/notification_area_icon.png
+share/gnome/help/user-guide/fr/figures/open_drawer.png
+share/gnome/help/user-guide/fr/figures/openwindows_menu.png
+share/gnome/help/user-guide/fr/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/fr/figures/resize_pointer.png
+share/gnome/help/user-guide/fr/figures/run_button.png
+share/gnome/help/user-guide/fr/figures/sample_applet.png
+share/gnome/help/user-guide/fr/figures/screenshot_button.png
+share/gnome/help/user-guide/fr/figures/searchtool_button.png
+share/gnome/help/user-guide/fr/figures/show_desktop_button.png
+share/gnome/help/user-guide/fr/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/fr/figures/titlebar_window.png
+share/gnome/help/user-guide/fr/figures/typical_menu.png
+share/gnome/help/user-guide/fr/figures/window_list_applet.png
+share/gnome/help/user-guide/fr/figures/window_list_group_applet.png
+share/gnome/help/user-guide/fr/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/fr/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/fr/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/fr/figures/yelp_preferences.png
+share/gnome/help/user-guide/fr/figures/yelp_window.png
+share/gnome/help/user-guide/fr/glossary.xml
+share/gnome/help/user-guide/fr/gosbasic.xml
+share/gnome/help/user-guide/fr/goscustdesk.xml
+share/gnome/help/user-guide/fr/goseditmainmenu.xml
+share/gnome/help/user-guide/fr/gosfeedback.xml
+share/gnome/help/user-guide/fr/gosnautilus.xml
+share/gnome/help/user-guide/fr/gosoverview.xml
+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/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
@@ -284,6 +498,7 @@ share/gnome/help/user-guide/it/figures/screenshot_button.png
share/gnome/help/user-guide/it/figures/searchtool_button.png
share/gnome/help/user-guide/it/figures/show_desktop_button.png
share/gnome/help/user-guide/it/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/it/figures/titlebar_window.png
share/gnome/help/user-guide/it/figures/typical_menu.png
share/gnome/help/user-guide/it/figures/window_list_applet.png
share/gnome/help/user-guide/it/figures/window_list_group_applet.png
@@ -296,34 +511,371 @@ share/gnome/help/user-guide/it/glossary.xml
share/gnome/help/user-guide/it/gosbasic.xml
share/gnome/help/user-guide/it/goscustdesk.xml
share/gnome/help/user-guide/it/goseditmainmenu.xml
+share/gnome/help/user-guide/it/gosfeedback.xml
share/gnome/help/user-guide/it/gosnautilus.xml
share/gnome/help/user-guide/it/gosoverview.xml
share/gnome/help/user-guide/it/gospanel.xml
share/gnome/help/user-guide/it/gosstartsession.xml
share/gnome/help/user-guide/it/gostools.xml
share/gnome/help/user-guide/it/user-guide.xml
+share/gnome/help/user-guide/pt_BR/figures/ask_pointer.png
+share/gnome/help/user-guide/pt_BR/figures/busy_pointer.png
+share/gnome/help/user-guide/pt_BR/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/pt_BR/figures/copy_pointer.png
+share/gnome/help/user-guide/pt_BR/figures/force_quit.png
+share/gnome/help/user-guide/pt_BR/figures/four_hide_button.png
+share/gnome/help/user-guide/pt_BR/figures/gedit_window.png
+share/gnome/help/user-guide/pt_BR/figures/gnome_panel.png
+share/gnome/help/user-guide/pt_BR/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/pt_BR/figures/ibeam_pointer.png
+share/gnome/help/user-guide/pt_BR/figures/link_pointer.png
+share/gnome/help/user-guide/pt_BR/figures/lockscreen_icon.png
+share/gnome/help/user-guide/pt_BR/figures/logout_icon.png
+share/gnome/help/user-guide/pt_BR/figures/menu_bar_applet.png
+share/gnome/help/user-guide/pt_BR/figures/menu_panel.png
+share/gnome/help/user-guide/pt_BR/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/pt_BR/figures/move_pointer.png
+share/gnome/help/user-guide/pt_BR/figures/movewindow_pointer.png
+share/gnome/help/user-guide/pt_BR/figures/naut_browser_mode.png
+share/gnome/help/user-guide/pt_BR/figures/naut_button_bar.png
+share/gnome/help/user-guide/pt_BR/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/pt_BR/figures/naut_emblem.png
+share/gnome/help/user-guide/pt_BR/figures/naut_go_to_location.png
+share/gnome/help/user-guide/pt_BR/figures/naut_link_emblem.png
+share/gnome/help/user-guide/pt_BR/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/pt_BR/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/pt_BR/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/pt_BR/figures/naut_refine_search.png
+share/gnome/help/user-guide/pt_BR/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/pt_BR/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/pt_BR/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/pt_BR/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/pt_BR/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/pt_BR/figures/naut_search_bar.png
+share/gnome/help/user-guide/pt_BR/figures/naut_search_results.png
+share/gnome/help/user-guide/pt_BR/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/pt_BR/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/pt_BR/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/pt_BR/figures/naut_spatial_view.png
+share/gnome/help/user-guide/pt_BR/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/pt_BR/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/pt_BR/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/pt_BR/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/pt_BR/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/pt_BR/figures/normal_pointer.png
+share/gnome/help/user-guide/pt_BR/figures/not_available_pointer.png
+share/gnome/help/user-guide/pt_BR/figures/notification_area_icon.png
+share/gnome/help/user-guide/pt_BR/figures/open_drawer.png
+share/gnome/help/user-guide/pt_BR/figures/openwindows_menu.png
+share/gnome/help/user-guide/pt_BR/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/pt_BR/figures/resize_pointer.png
+share/gnome/help/user-guide/pt_BR/figures/run_button.png
+share/gnome/help/user-guide/pt_BR/figures/sample_applet.png
+share/gnome/help/user-guide/pt_BR/figures/screenshot_button.png
+share/gnome/help/user-guide/pt_BR/figures/searchtool_button.png
+share/gnome/help/user-guide/pt_BR/figures/show_desktop_button.png
+share/gnome/help/user-guide/pt_BR/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/pt_BR/figures/titlebar_window.png
+share/gnome/help/user-guide/pt_BR/figures/typical_menu.png
+share/gnome/help/user-guide/pt_BR/figures/window_list_applet.png
+share/gnome/help/user-guide/pt_BR/figures/window_list_group_applet.png
+share/gnome/help/user-guide/pt_BR/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/pt_BR/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/pt_BR/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/pt_BR/figures/yelp_preferences.png
+share/gnome/help/user-guide/pt_BR/figures/yelp_window.png
+share/gnome/help/user-guide/pt_BR/glossary.xml
+share/gnome/help/user-guide/pt_BR/gosbasic.xml
+share/gnome/help/user-guide/pt_BR/goscustdesk.xml
+share/gnome/help/user-guide/pt_BR/goseditmainmenu.xml
+share/gnome/help/user-guide/pt_BR/gosfeedback.xml
+share/gnome/help/user-guide/pt_BR/gosnautilus.xml
+share/gnome/help/user-guide/pt_BR/gosoverview.xml
+share/gnome/help/user-guide/pt_BR/gospanel.xml
+share/gnome/help/user-guide/pt_BR/gosstartsession.xml
+share/gnome/help/user-guide/pt_BR/gostools.xml
+share/gnome/help/user-guide/pt_BR/user-guide.xml
+share/gnome/help/user-guide/ru/figures/ask_pointer.png
+share/gnome/help/user-guide/ru/figures/busy_pointer.png
+share/gnome/help/user-guide/ru/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/ru/figures/copy_pointer.png
+share/gnome/help/user-guide/ru/figures/force_quit.png
+share/gnome/help/user-guide/ru/figures/four_hide_button.png
+share/gnome/help/user-guide/ru/figures/gedit_window.png
+share/gnome/help/user-guide/ru/figures/gnome_panel.png
+share/gnome/help/user-guide/ru/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/ru/figures/ibeam_pointer.png
+share/gnome/help/user-guide/ru/figures/link_pointer.png
+share/gnome/help/user-guide/ru/figures/lockscreen_icon.png
+share/gnome/help/user-guide/ru/figures/logout_icon.png
+share/gnome/help/user-guide/ru/figures/menu_bar_applet.png
+share/gnome/help/user-guide/ru/figures/menu_panel.png
+share/gnome/help/user-guide/ru/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/ru/figures/move_pointer.png
+share/gnome/help/user-guide/ru/figures/movewindow_pointer.png
+share/gnome/help/user-guide/ru/figures/naut_browser_mode.png
+share/gnome/help/user-guide/ru/figures/naut_button_bar.png
+share/gnome/help/user-guide/ru/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/ru/figures/naut_emblem.png
+share/gnome/help/user-guide/ru/figures/naut_go_to_location.png
+share/gnome/help/user-guide/ru/figures/naut_link_emblem.png
+share/gnome/help/user-guide/ru/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/ru/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/ru/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/ru/figures/naut_refine_search.png
+share/gnome/help/user-guide/ru/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/ru/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/ru/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/ru/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/ru/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/ru/figures/naut_search_bar.png
+share/gnome/help/user-guide/ru/figures/naut_search_results.png
+share/gnome/help/user-guide/ru/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/ru/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/ru/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/ru/figures/naut_spatial_view.png
+share/gnome/help/user-guide/ru/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/ru/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/ru/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/ru/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/ru/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/ru/figures/normal_pointer.png
+share/gnome/help/user-guide/ru/figures/not_available_pointer.png
+share/gnome/help/user-guide/ru/figures/notification_area_icon.png
+share/gnome/help/user-guide/ru/figures/open_drawer.png
+share/gnome/help/user-guide/ru/figures/openwindows_menu.png
+share/gnome/help/user-guide/ru/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/ru/figures/resize_pointer.png
+share/gnome/help/user-guide/ru/figures/run_button.png
+share/gnome/help/user-guide/ru/figures/sample_applet.png
+share/gnome/help/user-guide/ru/figures/screenshot_button.png
+share/gnome/help/user-guide/ru/figures/searchtool_button.png
+share/gnome/help/user-guide/ru/figures/show_desktop_button.png
+share/gnome/help/user-guide/ru/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/ru/figures/titlebar_window.png
+share/gnome/help/user-guide/ru/figures/typical_menu.png
+share/gnome/help/user-guide/ru/figures/window_list_applet.png
+share/gnome/help/user-guide/ru/figures/window_list_group_applet.png
+share/gnome/help/user-guide/ru/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/ru/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/ru/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/ru/figures/yelp_preferences.png
+share/gnome/help/user-guide/ru/figures/yelp_window.png
+share/gnome/help/user-guide/ru/glossary.xml
+share/gnome/help/user-guide/ru/gosbasic.xml
+share/gnome/help/user-guide/ru/goscustdesk.xml
+share/gnome/help/user-guide/ru/goseditmainmenu.xml
+share/gnome/help/user-guide/ru/gosfeedback.xml
+share/gnome/help/user-guide/ru/gosnautilus.xml
+share/gnome/help/user-guide/ru/gosoverview.xml
+share/gnome/help/user-guide/ru/gospanel.xml
+share/gnome/help/user-guide/ru/gosstartsession.xml
+share/gnome/help/user-guide/ru/gostools.xml
+share/gnome/help/user-guide/ru/user-guide.xml
+share/gnome/help/user-guide/sv/figures/ask_pointer.png
+share/gnome/help/user-guide/sv/figures/busy_pointer.png
+share/gnome/help/user-guide/sv/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/sv/figures/copy_pointer.png
+share/gnome/help/user-guide/sv/figures/force_quit.png
+share/gnome/help/user-guide/sv/figures/four_hide_button.png
+share/gnome/help/user-guide/sv/figures/gedit_window.png
+share/gnome/help/user-guide/sv/figures/gnome_panel.png
+share/gnome/help/user-guide/sv/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/sv/figures/ibeam_pointer.png
+share/gnome/help/user-guide/sv/figures/link_pointer.png
+share/gnome/help/user-guide/sv/figures/lockscreen_icon.png
+share/gnome/help/user-guide/sv/figures/logout_icon.png
+share/gnome/help/user-guide/sv/figures/menu_bar_applet.png
+share/gnome/help/user-guide/sv/figures/menu_panel.png
+share/gnome/help/user-guide/sv/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/sv/figures/move_pointer.png
+share/gnome/help/user-guide/sv/figures/movewindow_pointer.png
+share/gnome/help/user-guide/sv/figures/naut_browser_mode.png
+share/gnome/help/user-guide/sv/figures/naut_button_bar.png
+share/gnome/help/user-guide/sv/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/sv/figures/naut_emblem.png
+share/gnome/help/user-guide/sv/figures/naut_go_to_location.png
+share/gnome/help/user-guide/sv/figures/naut_link_emblem.png
+share/gnome/help/user-guide/sv/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/sv/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/sv/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/sv/figures/naut_refine_search.png
+share/gnome/help/user-guide/sv/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/sv/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/sv/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/sv/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/sv/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/sv/figures/naut_search_bar.png
+share/gnome/help/user-guide/sv/figures/naut_search_results.png
+share/gnome/help/user-guide/sv/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/sv/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/sv/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/sv/figures/naut_spatial_view.png
+share/gnome/help/user-guide/sv/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/sv/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/sv/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/sv/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/sv/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/sv/figures/normal_pointer.png
+share/gnome/help/user-guide/sv/figures/not_available_pointer.png
+share/gnome/help/user-guide/sv/figures/notification_area_icon.png
+share/gnome/help/user-guide/sv/figures/open_drawer.png
+share/gnome/help/user-guide/sv/figures/openwindows_menu.png
+share/gnome/help/user-guide/sv/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/sv/figures/resize_pointer.png
+share/gnome/help/user-guide/sv/figures/run_button.png
+share/gnome/help/user-guide/sv/figures/sample_applet.png
+share/gnome/help/user-guide/sv/figures/screenshot_button.png
+share/gnome/help/user-guide/sv/figures/searchtool_button.png
+share/gnome/help/user-guide/sv/figures/show_desktop_button.png
+share/gnome/help/user-guide/sv/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/sv/figures/titlebar_window.png
+share/gnome/help/user-guide/sv/figures/typical_menu.png
+share/gnome/help/user-guide/sv/figures/window_list_applet.png
+share/gnome/help/user-guide/sv/figures/window_list_group_applet.png
+share/gnome/help/user-guide/sv/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/sv/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/sv/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/sv/figures/yelp_preferences.png
+share/gnome/help/user-guide/sv/figures/yelp_window.png
+share/gnome/help/user-guide/sv/glossary.xml
+share/gnome/help/user-guide/sv/gosbasic.xml
+share/gnome/help/user-guide/sv/goscustdesk.xml
+share/gnome/help/user-guide/sv/goseditmainmenu.xml
+share/gnome/help/user-guide/sv/gosfeedback.xml
+share/gnome/help/user-guide/sv/gosnautilus.xml
+share/gnome/help/user-guide/sv/gosoverview.xml
+share/gnome/help/user-guide/sv/gospanel.xml
+share/gnome/help/user-guide/sv/gosstartsession.xml
+share/gnome/help/user-guide/sv/gostools.xml
+share/gnome/help/user-guide/sv/user-guide.xml
+share/gnome/help/user-guide/zh_CN/figures/ask_pointer.png
+share/gnome/help/user-guide/zh_CN/figures/busy_pointer.png
+share/gnome/help/user-guide/zh_CN/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/zh_CN/figures/copy_pointer.png
+share/gnome/help/user-guide/zh_CN/figures/force_quit.png
+share/gnome/help/user-guide/zh_CN/figures/four_hide_button.png
+share/gnome/help/user-guide/zh_CN/figures/gedit_window.png
+share/gnome/help/user-guide/zh_CN/figures/gnome_panel.png
+share/gnome/help/user-guide/zh_CN/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/zh_CN/figures/ibeam_pointer.png
+share/gnome/help/user-guide/zh_CN/figures/link_pointer.png
+share/gnome/help/user-guide/zh_CN/figures/lockscreen_icon.png
+share/gnome/help/user-guide/zh_CN/figures/logout_icon.png
+share/gnome/help/user-guide/zh_CN/figures/menu_bar_applet.png
+share/gnome/help/user-guide/zh_CN/figures/menu_panel.png
+share/gnome/help/user-guide/zh_CN/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/zh_CN/figures/move_pointer.png
+share/gnome/help/user-guide/zh_CN/figures/movewindow_pointer.png
+share/gnome/help/user-guide/zh_CN/figures/naut_browser_mode.png
+share/gnome/help/user-guide/zh_CN/figures/naut_button_bar.png
+share/gnome/help/user-guide/zh_CN/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/zh_CN/figures/naut_emblem.png
+share/gnome/help/user-guide/zh_CN/figures/naut_go_to_location.png
+share/gnome/help/user-guide/zh_CN/figures/naut_link_emblem.png
+share/gnome/help/user-guide/zh_CN/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/zh_CN/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/zh_CN/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/zh_CN/figures/naut_refine_search.png
+share/gnome/help/user-guide/zh_CN/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/zh_CN/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/zh_CN/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/zh_CN/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/zh_CN/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/zh_CN/figures/naut_search_bar.png
+share/gnome/help/user-guide/zh_CN/figures/naut_search_results.png
+share/gnome/help/user-guide/zh_CN/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/zh_CN/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/zh_CN/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/zh_CN/figures/naut_spatial_view.png
+share/gnome/help/user-guide/zh_CN/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/zh_CN/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/zh_CN/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/zh_CN/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/zh_CN/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/zh_CN/figures/normal_pointer.png
+share/gnome/help/user-guide/zh_CN/figures/not_available_pointer.png
+share/gnome/help/user-guide/zh_CN/figures/notification_area_icon.png
+share/gnome/help/user-guide/zh_CN/figures/open_drawer.png
+share/gnome/help/user-guide/zh_CN/figures/openwindows_menu.png
+share/gnome/help/user-guide/zh_CN/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/zh_CN/figures/resize_pointer.png
+share/gnome/help/user-guide/zh_CN/figures/run_button.png
+share/gnome/help/user-guide/zh_CN/figures/sample_applet.png
+share/gnome/help/user-guide/zh_CN/figures/screenshot_button.png
+share/gnome/help/user-guide/zh_CN/figures/searchtool_button.png
+share/gnome/help/user-guide/zh_CN/figures/show_desktop_button.png
+share/gnome/help/user-guide/zh_CN/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/zh_CN/figures/titlebar_window.png
+share/gnome/help/user-guide/zh_CN/figures/typical_menu.png
+share/gnome/help/user-guide/zh_CN/figures/window_list_applet.png
+share/gnome/help/user-guide/zh_CN/figures/window_list_group_applet.png
+share/gnome/help/user-guide/zh_CN/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/zh_CN/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/zh_CN/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/zh_CN/figures/yelp_preferences.png
+share/gnome/help/user-guide/zh_CN/figures/yelp_window.png
+share/gnome/help/user-guide/zh_CN/glossary.xml
+share/gnome/help/user-guide/zh_CN/gosbasic.xml
+share/gnome/help/user-guide/zh_CN/goscustdesk.xml
+share/gnome/help/user-guide/zh_CN/goseditmainmenu.xml
+share/gnome/help/user-guide/zh_CN/gosfeedback.xml
+share/gnome/help/user-guide/zh_CN/gosnautilus.xml
+share/gnome/help/user-guide/zh_CN/gosoverview.xml
+share/gnome/help/user-guide/zh_CN/gospanel.xml
+share/gnome/help/user-guide/zh_CN/gosstartsession.xml
+share/gnome/help/user-guide/zh_CN/gostools.xml
+share/gnome/help/user-guide/zh_CN/user-guide.xml
share/gnome/omf/gnome-access-guide/gnome-access-guide-C.omf
+share/gnome/omf/gnome-access-guide/gnome-access-guide-es.omf
share/gnome/omf/gnome-access-guide/gnome-access-guide-it.omf
+share/gnome/omf/gnome-access-guide/gnome-access-guide-sv.omf
share/gnome/omf/system-admin-guide/system-admin-guide-C.omf
+share/gnome/omf/system-admin-guide/system-admin-guide-es.omf
share/gnome/omf/system-admin-guide/system-admin-guide-it.omf
+share/gnome/omf/system-admin-guide/system-admin-guide-sv.omf
share/gnome/omf/user-guide/user-guide-C.omf
+share/gnome/omf/user-guide/user-guide-bg.omf
share/gnome/omf/user-guide/user-guide-es.omf
+share/gnome/omf/user-guide/user-guide-fr.omf
share/gnome/omf/user-guide/user-guide-it.omf
+share/gnome/omf/user-guide/user-guide-pt_BR.omf
+share/gnome/omf/user-guide/user-guide-ru.omf
+share/gnome/omf/user-guide/user-guide-sv.omf
+share/gnome/omf/user-guide/user-guide-zh_CN.omf
@dirrm share/gnome/omf/user-guide
@dirrm share/gnome/omf/system-admin-guide
@dirrm share/gnome/omf/gnome-access-guide
+@dirrm share/gnome/help/user-guide/zh_CN/figures
+@dirrm share/gnome/help/user-guide/zh_CN
+@dirrm share/gnome/help/user-guide/sv/figures
+@dirrm share/gnome/help/user-guide/sv
+@dirrm share/gnome/help/user-guide/ru/figures
+@dirrm share/gnome/help/user-guide/ru
+@dirrm share/gnome/help/user-guide/pt_BR/figures
+@dirrm share/gnome/help/user-guide/pt_BR
@dirrm share/gnome/help/user-guide/it/figures
@dirrm share/gnome/help/user-guide/it
+@dirrm share/gnome/help/user-guide/fr/figures
+@dirrm share/gnome/help/user-guide/fr
@dirrm share/gnome/help/user-guide/es/figures
@dirrm share/gnome/help/user-guide/es
+@dirrm share/gnome/help/user-guide/bg/figures
+@dirrm share/gnome/help/user-guide/bg
@dirrm share/gnome/help/user-guide/C/figures
@dirrm share/gnome/help/user-guide/C
@dirrm share/gnome/help/user-guide
+@dirrm share/gnome/help/system-admin-guide/sv
@dirrm share/gnome/help/system-admin-guide/it
+@dirrm share/gnome/help/system-admin-guide/es
@dirrm share/gnome/help/system-admin-guide/C
@dirrm share/gnome/help/system-admin-guide
+@dirrm share/gnome/help/gnome-access-guide/sv/figures
+@dirrm share/gnome/help/gnome-access-guide/sv
@dirrm share/gnome/help/gnome-access-guide/it/figures
@dirrm share/gnome/help/gnome-access-guide/it
+@dirrm share/gnome/help/gnome-access-guide/es/figures
+@dirrm share/gnome/help/gnome-access-guide/es
@dirrm share/gnome/help/gnome-access-guide/C/figures
@dirrm share/gnome/help/gnome-access-guide/C
@dirrm share/gnome/help/gnome-access-guide
diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile
index a69cda06a083..739912fbfe61 100644
--- a/misc/gnomehier/Makefile
+++ b/misc/gnomehier/Makefile
@@ -3,13 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnomehier/Makefile,v 1.11 2006/03/14 03:05:32 marcus Exp $
+# $MCom: ports/misc/gnomehier/Makefile,v 1.14 2006/10/10 20:22:15 mezz Exp $
#
# !!DON'T BUMP PORTREVISION ON MTREE CHANGES ANYMORE!!
PORTNAME= gnomehier
-PORTVERSION= 2.1
-PORTREVISION= 2
+PORTVERSION= 2.2
CATEGORIES= misc gnome
MASTER_SITES= # none
DISTFILES= # none
@@ -21,10 +20,10 @@ NO_BUILD= yes
PLIST?= ${WRKDIR}/pkg-plist
PKGINSTALL= ${WRKDIR}/pkg-install
-GNOME_MTREE= BSD.gnome-x11.dist
+GNOME_MTREE= BSD.gnome.dist
GNOME_MTREE_ARGS=${MTREE_ARGS:S|${MTREE_FILE}|${PREFIX}/etc/mtree/${GNOME_MTREE}|}
-USE_X_PREFIX= yes
+USE_XLIB= yes
do-fetch:
@${DO_NADA}
diff --git a/misc/hicolor-icon-theme/Makefile b/misc/hicolor-icon-theme/Makefile
index b10d514ac643..85deee7862f5 100644
--- a/misc/hicolor-icon-theme/Makefile
+++ b/misc/hicolor-icon-theme/Makefile
@@ -3,19 +3,56 @@
# Whom: marcus@FreeBSD.org
#
# $FreeBSD$
+# $MCom: ports/misc/hicolor-icon-theme/Makefile,v 1.4 2006/08/12 13:55:16 ahze Exp $
+#
PORTNAME= hicolor-icon-theme
-PORTVERSION= 0.5
+PORTVERSION= 0.9
+PORTREVISION= 1
CATEGORIES= misc gnome
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
- http://www.freedesktop.org/Software/icon-theme/releases/
-MASTER_SITE_SUBDIR= kwm
+MASTER_SITES= http://icon-theme.freedesktop.org/releases/
MAINTAINER= gnome@FreeBSD.org
COMMENT= A high-color icon theme shell from the FreeDesktop project
-USE_X_PREFIX= yes
USE_GNOME= gnometarget
GNU_CONFIGURE= yes
-.include <bsd.port.mk>
+ICON_DIR?= share/icons/hicolor
+ICON_FILES= index.theme
+SUB_FILES= pkg-install
+PKG_INSTALL= ${WRKDIR}/pkg-install
+PLIST= ${WRKDIR}/pkg-plist
+
+# Update the below from Makefile.in each release
+ICON_SIZES= 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 \
+ 128x128 192x192 scalable
+ICON_CONTEXTS= actions apps devices filesystems mimetypes stock emblems
+STOCK_SUBS= chart code data form image io media navigation net object table text
+
+SUB_LIST= ICON_SIZES="${ICON_SIZES}" ICON_CONTEXTS="${ICON_CONTEXTS}" \
+ STOCK_SUBS="${STOCK_SUBS}"
+
+.include <bsd.port.pre.mk>
+
+pre-install:
+ @${RM} -f ${PLIST}
+ @${TOUCH} -f ${PLIST}
+.for file in ${ICON_FILES}
+ @${ECHO_CMD} "${ICON_DIR}/${file}" >> ${PLIST}
+.endfor
+.for dir in ${ICON_SIZES}
+. for ctxt in ${ICON_CONTEXTS}
+ if [ "${ctxt}" = "stock" ] ; then \
+ for sub in ${STOCK_SUBS} ; do \
+ ${ECHO_CMD} "@dirrmtry ${ICON_DIR}/${dir}/${ctxt}/$${sub}" >> ${PLIST} ; \
+ done \
+ fi
+ ${ECHO_CMD} "@dirrmtry ${ICON_DIR}/${dir}/${ctxt}" >> ${PLIST}
+. endfor
+ ${ECHO_CMD} "@dirrmtry ${ICON_DIR}/${dir}" >> ${PLIST}
+.endfor
+ ${ECHO_CMD} "@dirrmtry ${ICON_DIR}" >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry share/icons" >> ${PLIST}
+
+.include <bsd.port.post.mk>
diff --git a/misc/hicolor-icon-theme/distinfo b/misc/hicolor-icon-theme/distinfo
index dada3ba55f3b..c94e7a029bbc 100644
--- a/misc/hicolor-icon-theme/distinfo
+++ b/misc/hicolor-icon-theme/distinfo
@@ -1,3 +1,3 @@
-MD5 (hicolor-icon-theme-0.5.tar.gz) = 947c7f6eb68fd95c7b86e87f853ceaa0
-SHA256 (hicolor-icon-theme-0.5.tar.gz) = 8643ddab3b5afd2f94a2db771bae6710ec49d76a6c6890debaa711de8f3bf12e
-SIZE (hicolor-icon-theme-0.5.tar.gz) = 31611
+MD5 (hicolor-icon-theme-0.9.tar.gz) = 1d0821cb80d394eac30bd8cec5b0b60c
+SHA256 (hicolor-icon-theme-0.9.tar.gz) = a6abad5dd62f12870ff5b32ae414e0c611f0922b905aeab6db2676b607bb1643
+SIZE (hicolor-icon-theme-0.9.tar.gz) = 32574
diff --git a/misc/hicolor-icon-theme/pkg-install b/misc/hicolor-icon-theme/files/pkg-install.in
index c775b8596466..5b985a43e19a 100644
--- a/misc/hicolor-icon-theme/pkg-install
+++ b/misc/hicolor-icon-theme/files/pkg-install.in
@@ -1,12 +1,14 @@
#!/bin/sh
+# $FreeBSD$
+# $MCom: ports/misc/hicolor-icon-theme/files/pkg-install.in,v 1.1 2006/08/11 01:19:11 ahze Exp $
PATH=/bin:/usr/bin:/usr/sbin
case $2 in
POST-INSTALL)
- ICON_SIZES="16x16 22x22 32x32 36x36 48x48 64x64 72x72 96x96 128x128 192x192 scalable"
- ICON_CONTEXTS="actions apps devices filesystems mimetypes stock"
- STOCK_SUBS="chart code data form image io media navigation net object table text"
+ ICON_SIZES="%%ICON_SIZES%%"
+ ICON_CONTEXTS="%%ICON_CONTEXTS%%"
+ STOCK_SUBS="%%STOCK_SUBS%%"
for dir in ${ICON_SIZES}; do
for ctxt in ${ICON_CONTEXTS}; do
diff --git a/misc/hicolor-icon-theme/pkg-plist b/misc/hicolor-icon-theme/pkg-plist
deleted file mode 100644
index d0ff3536763a..000000000000
--- a/misc/hicolor-icon-theme/pkg-plist
+++ /dev/null
@@ -1,212 +0,0 @@
-share/icons/hicolor/index.theme
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/stock/text 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/stock/table 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/stock/object 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/stock/net 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/stock/navigation 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/stock/media 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/stock/io 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/stock/image 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/stock/form 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/stock/data 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/stock/code 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/stock/chart 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/stock 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/mimetypes 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/filesystems 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/devices 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/apps 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable/actions 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/scalable 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/stock/text 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/stock/table 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/stock/object 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/stock/net 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/stock/navigation 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/stock/media 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/stock/io 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/stock/image 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/stock/form 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/stock/data 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/stock/code 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/stock/chart 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/stock 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/mimetypes 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/filesystems 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/devices 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/apps 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96/actions 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/stock/text 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/stock/table 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/stock/object 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/stock/net 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/stock/navigation 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/stock/media 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/stock/io 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/stock/image 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/stock/form 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/stock/data 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/stock/code 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/stock/chart 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/stock 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/mimetypes 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/filesystems 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/devices 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/apps 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72/actions 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/72x72 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/stock/text 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/stock/table 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/stock/object 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/stock/net 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/stock/navigation 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/stock/media 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/stock/io 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/stock/image 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/stock/form 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/stock/data 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/stock/code 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/stock/chart 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/stock 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/mimetypes 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/filesystems 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/devices 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/apps 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64/actions 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/64x64 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/text 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/table 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/object 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/net 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/navigation 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/media 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/io 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/image 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/form 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/data 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/code 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/chart 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/mimetypes 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/filesystems 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/devices 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/apps 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/actions 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/text 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/table 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/object 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/net 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/navigation 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/media 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/io 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/image 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/form 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/data 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/code 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/chart 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/mimetypes 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/filesystems 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/devices 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/apps 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/actions 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/text 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/table 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/object 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/net 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/navigation 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/media 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/io 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/image 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/form 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/data 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/code 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/chart 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/mimetypes 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/filesystems 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/devices 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/apps 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/actions 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/stock/text 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/stock/table 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/stock/object 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/stock/net 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/stock/navigation 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/stock/media 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/stock/io 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/stock/image 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/stock/form 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/stock/data 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/stock/code 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/stock/chart 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/stock 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/mimetypes 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/filesystems 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/devices 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/apps 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22/actions 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/22x22 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/stock/text 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/stock/table 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/stock/object 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/stock/net 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/stock/navigation 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/stock/media 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/stock/io 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/stock/image 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/stock/form 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/stock/data 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/stock/code 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/stock/chart 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/stock 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/mimetypes 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/filesystems 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/devices 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/apps 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192/actions 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/192x192 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/text 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/table 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/object 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/net 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/navigation 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/media 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/io 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/image 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/form 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/data 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/code 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/chart 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/mimetypes 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/filesystems 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/devices 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/apps 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/actions 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/stock/text 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/stock/table 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/stock/object 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/stock/net 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/stock/navigation 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/stock/media 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/stock/io 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/stock/image 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/stock/form 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/stock/data 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/stock/code 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/stock/chart 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/stock 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/mimetypes 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/filesystems 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/devices 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/apps 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128/actions 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/128x128 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor 2> /dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons 2> /dev/null || /usr/bin/true
diff --git a/misc/pciids/Makefile b/misc/pciids/Makefile
new file mode 100644
index 000000000000..4760196b49d5
--- /dev/null
+++ b/misc/pciids/Makefile
@@ -0,0 +1,44 @@
+# New ports collection makefile for: pciids
+# Date created: 2006-08-07
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/misc/pciids/Makefile,v 1.5 2006/09/29 20:57:46 ahze Exp $
+
+PORTNAME= pciids
+PORTVERSION= 20060929
+CATEGORIES= misc
+MASTER_SITES= http://www.ahze.net/~ahze/distfiles/ \
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= ahze
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Pci.ids database from pciutils
+
+USE_BZIP2= yes
+NO_BUILD= yes
+PLIST_FILES= %%DATADIR%%/pci.ids \
+ %%DATADIR%%/pci.db
+PLIST_DIRS= %%DATADIR%%
+
+do-install:
+ ${MKDIR} ${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/pci.ids ${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/pci.db ${DATADIR}
+
+# Below only contains code to create a tar file for this beast
+CT_DATE!= date "+%Y%m%d"
+CT_WRKSRC= ${WRKDIR}/tmp
+CT_DESTDIR= ${PORTNAME}-${CT_DATE}
+CT_TEMPDIR= ${CT_WRKSRC}/${CT_DESTDIR}
+CT_MASTER_SITE= http://pciids.sourceforge.net/v2.2/
+CT_DISTFILES= pci.ids pci.db
+
+maketar:
+ ${MKDIR} ${CT_TEMPDIR}
+.for file in ${CT_DISTFILES}
+ (cd ${CT_TEMPDIR} && ${FETCH_CMD} ${CT_MASTER_SITE}/${file})
+.endfor
+ (cd ${CT_WRKSRC} && ${TAR} -jcf ${PORTNAME}-${CT_DATE}.tar.bz2 ${CT_DESTDIR})
+
+.include <bsd.port.mk>
diff --git a/misc/pciids/distinfo b/misc/pciids/distinfo
new file mode 100644
index 000000000000..c05e2cd9e83f
--- /dev/null
+++ b/misc/pciids/distinfo
@@ -0,0 +1,3 @@
+MD5 (pciids-20060929.tar.bz2) = f609436fe75b4e506542a7922f3207b2
+SHA256 (pciids-20060929.tar.bz2) = f8b23bdf4aec04764e5d60a3c72730b2fe120adef9b0a0bdf9bf6ac5f5f71a17
+SIZE (pciids-20060929.tar.bz2) = 206736
diff --git a/misc/pciids/pkg-descr b/misc/pciids/pkg-descr
new file mode 100644
index 000000000000..4fdb229ea1eb
--- /dev/null
+++ b/misc/pciids/pkg-descr
@@ -0,0 +1,3 @@
+Pci.ids database from pciutils
+
+WWW: http://pciids.sourceforge.net/
diff --git a/multimedia/gstreamer-editor/Makefile b/multimedia/gstreamer-editor/Makefile
index bf1f3f7026b3..3ac34e1b3cf2 100644
--- a/multimedia/gstreamer-editor/Makefile
+++ b/multimedia/gstreamer-editor/Makefile
@@ -3,11 +3,11 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/multimedia/gstreamer-editor/Makefile,v 1.7 2006/09/10 00:52:59 mezz Exp $
PORTNAME= gstreamer
PORTVERSION= 0.8.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia gnome
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-editor/
PKGNAMESUFFIX= -editor
@@ -16,12 +16,10 @@ DISTNAME= gst-editor-${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Provide View and Controller counterparts to GStreamer's Model
-LIB_DEPENDS= gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer80 \
- popt.0:${PORTSDIR}/devel/popt
-RUN_DEPENDS= gst-visualise-0.8:${PORTSDIR}/multimedia/gstreamer-plugins80
+LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
+USE_GSTREAMER80= core
USE_BZIP2= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack \
@@ -33,7 +31,7 @@ USE_GNOME= gnomehack \
libgnomeui
PLIST_SUB= \
VERSION="${PORTVERSION}"
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
INSTALLS_OMF= yes
MAN1= gst-editor.1 gst-inspect-gui.1 gst-launch-gui.1
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile
index c013fbced8ca..d277c5ba99c0 100644
--- a/multimedia/gstreamer-ffmpeg/Makefile
+++ b/multimedia/gstreamer-ffmpeg/Makefile
@@ -3,10 +3,11 @@
# Whom: Koop Mast <kwm@rainbow-runner.nl>
#
# $FreeBSD$
-#
+# $MCom: ports/multimedia/gstreamer-ffmpeg/Makefile,v 1.14 2006/07/20 13:40:27 ahze Exp $
PORTNAME= gstreamer
PORTVERSION= 0.10.1
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/
PKGNAMESUFFIX= -ffmpeg
@@ -15,7 +16,7 @@ DISTNAME= gst-ffmpeg-${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= GStreamer plug-in for manipulating MPEG video streams
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget
diff --git a/multimedia/gstreamer-ffmpeg80/Makefile b/multimedia/gstreamer-ffmpeg80/Makefile
index 9ddf248823ba..3b3b645618ad 100644
--- a/multimedia/gstreamer-ffmpeg80/Makefile
+++ b/multimedia/gstreamer-ffmpeg80/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@rainbow-runner.nl>
#
# $FreeBSD$
-#
+# $MCom: ports/multimedia/gstreamer-ffmpeg80/Makefile,v 1.9 2006/07/23 18:28:35 marcus Exp $
PORTNAME= gstreamer
PORTVERSION= 0.8.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/
PKGNAMESUFFIX= -ffmpeg80
@@ -16,7 +16,6 @@ DISTNAME= gst-ffmpeg-${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= GStreamer plug-in for manipulating MPEG video streams
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget
@@ -45,7 +44,7 @@ post-patch:
post-install:
# register plugins
- -@${X11BASE}/bin/gst-register-${GST80_VERSION} \
+ -@${LOCALBASE}/bin/gst-register-${GST80_VERSION} \
--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST80_VERSION}/registry.xml 2>/dev/null
.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-pitfdll/Makefile b/multimedia/gstreamer-pitfdll/Makefile
index 1a03f82e5a2c..8fe6d1971732 100644
--- a/multimedia/gstreamer-pitfdll/Makefile
+++ b/multimedia/gstreamer-pitfdll/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/multimedia/gstreamer-pitfdll/Makefile,v 1.7 2006/07/23 18:28:35 marcus Exp $
PORTNAME= gstreamer-pitfdll
PORTVERSION= 0.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= pitfdll
@@ -18,7 +18,6 @@ COMMENT= GStreamer DLL loader plugin
RUN_DEPENDS= ${LOCALBASE}/lib/win32/wmv8ds32.ax:${PORTSDIR}/multimedia/win32-codecs
-USE_X_PREFIX= yes
ONLY_FOR_ARCHS= i386
USE_BZIP2= yes
USE_GMAKE= yes
@@ -36,7 +35,7 @@ post-patch:
post-install:
# register plugins
- -@${X11BASE}/bin/gst-register-${GST_VERSION} \
+ -@${LOCALBASE}/bin/gst-register-${GST_VERSION} \
--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml 2>/dev/null
.include <bsd.port.mk>
diff --git a/multimedia/gstreamer-pitfdll/pkg-plist b/multimedia/gstreamer-pitfdll/pkg-plist
index ad0f269ada04..3348748a0970 100644
--- a/multimedia/gstreamer-pitfdll/pkg-plist
+++ b/multimedia/gstreamer-pitfdll/pkg-plist
@@ -1,4 +1,4 @@
lib/gstreamer-%%VERSION%%/libpitfdll.la
lib/gstreamer-%%VERSION%%/libpitfdll.so
-@exec %%X11BASE%%/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
-@unexec %%X11BASE%%/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@exec %%LOCALBASE%%/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@unexec %%LOCALBASE%%/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
diff --git a/multimedia/gstreamer-plugins-annodex/Makefile b/multimedia/gstreamer-plugins-annodex/Makefile
new file mode 100644
index 000000000000..616754bb647f
--- /dev/null
+++ b/multimedia/gstreamer-plugins-annodex/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: gstreamer-plugins-annodex
+# Date created: 6 July 2006
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-annodex/Makefile,v 1.1 2006/07/06 19:48:44 ahze Exp $
+
+PORTREVISION= 0
+CATEGORIES= multimedia
+
+COMMENT= Gstreamer annodex CMML plugin
+
+GST_PLUGIN= annodex
+
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-bad/Makefile b/multimedia/gstreamer-plugins-bad/Makefile
index c264d0fc144a..3d598ea6edcf 100644
--- a/multimedia/gstreamer-plugins-bad/Makefile
+++ b/multimedia/gstreamer-plugins-bad/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins-bad/Makefile,v 1.4 2006/06/08 01:14:30 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins-bad/Makefile,v 1.7 2006/09/14 21:25:16 ahze Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Bad gstreamer-plugins
@@ -19,8 +19,8 @@ MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
BUILD_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
RUN_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
-DIST= bad
-BAD_GST_DIRS= gst sys
+gst_bad_DIST= bad
+BAD_GST_DIRS= gst sys gst-libs po
PLIST_SUB= VERSION="${GST_VERSION}"
NO_GSTREAMER_COMMON= yes
PLIST= ${.CURDIR}/pkg-plist
diff --git a/multimedia/gstreamer-plugins-bad/pkg-plist b/multimedia/gstreamer-plugins-bad/pkg-plist
index 4bc24eaf08f4..a58856b3130a 100644
--- a/multimedia/gstreamer-plugins-bad/pkg-plist
+++ b/multimedia/gstreamer-plugins-bad/pkg-plist
@@ -22,3 +22,23 @@ lib/gstreamer-%%VERSION%%/libgsttta.so
lib/gstreamer-%%VERSION%%/libgstxingheader.a
lib/gstreamer-%%VERSION%%/libgstxingheader.la
lib/gstreamer-%%VERSION%%/libgstxingheader.so
+share/locale/af/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/multimedia/gstreamer-plugins-bz2/Makefile b/multimedia/gstreamer-plugins-bz2/Makefile
new file mode 100644
index 000000000000..3253ba323318
--- /dev/null
+++ b/multimedia/gstreamer-plugins-bz2/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: gstreamer-plugins-bz2
+# Date created: 6 July 2006
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-bz2/Makefile,v 1.2 2006/07/06 19:32:35 ahze Exp $
+
+PORTREVISION= 0
+CATEGORIES= multimedia
+
+COMMENT= Gstreamer bz2 plugin
+
+GST_PLUGIN= bz2
+
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-core/Makefile b/multimedia/gstreamer-plugins-core/Makefile
index 9b2a81570e9f..67e9c8c716f6 100644
--- a/multimedia/gstreamer-plugins-core/Makefile
+++ b/multimedia/gstreamer-plugins-core/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins-core/Makefile,v 1.14 2006/01/21 21:22:18 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins-core/Makefile,v 1.17 2006/07/17 01:39:57 ahze Exp $
PORTNAME= gstreamer-plugins-core
PORTVERSION= 0.10
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia audio
MASTER_SITES= # empty
DISTFILES= # empty
@@ -16,9 +16,7 @@ EXTRACT_ONLY= # empty
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Core set of typical audio and video gstreamer-plugins
-USE_X_PREFIX= yes
NO_BUILD= yes
-
GST_DIR= lib/gstreamer-${PORTVERSION}
PLIST_FILES= ${GST_DIR}/.gstreamer-plugins-core.keep
diff --git a/multimedia/gstreamer-plugins-core80/Makefile b/multimedia/gstreamer-plugins-core80/Makefile
index 69bbc90d2e25..2fbf96bffc1a 100644
--- a/multimedia/gstreamer-plugins-core80/Makefile
+++ b/multimedia/gstreamer-plugins-core80/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins-core80/Makefile,v 1.4 2006/01/24 18:49:48 marcus Exp $
+# $MCom: ports/multimedia/gstreamer-plugins-core80/Makefile,v 1.6 2006/07/21 19:25:28 ahze Exp $
PORTNAME= gstreamer-plugins-core80
PORTVERSION= 0.8.11
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= multimedia audio
MASTER_SITES= # empty
DISTFILES= # empty
@@ -16,7 +16,6 @@ EXTRACT_ONLY= # empty
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Core set of typical audio and video gstreamer-plugins
-USE_X_PREFIX= yes
NO_BUILD= yes
GST_DIR= lib/gstreamer-${GST80_VERSION}
diff --git a/multimedia/gstreamer-plugins-gnonlin/Makefile b/multimedia/gstreamer-plugins-gnonlin/Makefile
index 23af14bc927a..148f221d83dd 100644
--- a/multimedia/gstreamer-plugins-gnonlin/Makefile
+++ b/multimedia/gstreamer-plugins-gnonlin/Makefile
@@ -3,10 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins-gnonlin/Makefile,v 1.2 2006/04/25 20:54:56 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins-gnonlin/Makefile,v 1.7 2006/07/21 16:39:31 ahze Exp $
PORTNAME= gstreamer-plugins-gnonlin
PORTVERSION= 0.10.5
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gnonlin/
DISTNAME= gnonlin-${PORTVERSION}
@@ -14,7 +15,6 @@ DISTNAME= gnonlin-${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Gstreamer lib for writing non-linear audio and video
-USE_X_PREFIX= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GSTREAMER= yes
diff --git a/multimedia/gstreamer-plugins-good/Makefile b/multimedia/gstreamer-plugins-good/Makefile
index 83df947d7d8a..8133176c84ca 100644
--- a/multimedia/gstreamer-plugins-good/Makefile
+++ b/multimedia/gstreamer-plugins-good/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.7 2006/06/08 01:14:31 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.10 2006/09/14 22:41:06 ahze Exp $
#
PORTREVISION= 4
@@ -19,8 +19,8 @@ MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
BUILD_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
RUN_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
-DIST= good
-GOOD_GST_DIRS= gst sys
+gst_good_DIST= good
+GOOD_GST_DIRS= gst sys po
PLIST_SUB= VERSION="${GST_VERSION}"
PLIST= ${.CURDIR}/pkg-plist
diff --git a/multimedia/gstreamer-plugins-good/files/patch-gst_id3demux_id3v2frames.c b/multimedia/gstreamer-plugins-good/files/patch-gst_id3demux_id3v2frames.c
deleted file mode 100644
index acdb3db8c177..000000000000
--- a/multimedia/gstreamer-plugins-good/files/patch-gst_id3demux_id3v2frames.c
+++ /dev/null
@@ -1,174 +0,0 @@
-diff -u -r1.16 id3v2frames.c
---- gst/id3demux/id3v2frames.c 10 May 2006 13:51:01 -0000 1.16
-+++ gst/id3demux/id3v2frames.c 15 May 2006 09:48:46 -0000
-@@ -667,33 +667,21 @@
- return result;
- }
-
--static void
--parse_insert_string_field (const gchar * encoding, gchar * data, gint data_size,
-- GArray * fields)
--{
-- gchar *field;
--
-- field = g_convert (data, data_size, "UTF-8", encoding, NULL, NULL, NULL);
-- if (field && !g_utf8_validate (field, -1, NULL)) {
-- GST_DEBUG ("%s was bad UTF-8. Ignoring", field);
-- g_free (field);
-- field = NULL;
-- }
-- if (field)
-- g_array_append_val (fields, field);
--}
-+static const gchar utf16enc[] = "UTF-16";
-+static const gchar utf16leenc[] = "UTF-16LE";
-+static const gchar utf16beenc[] = "UTF-16BE";
-
- static gboolean
--has_utf16_bom (gchar * data, const gchar ** p_in_encoding)
-+find_utf16_bom (gchar * data, const gchar ** p_in_encoding)
- {
- guint16 marker = (GST_READ_UINT8 (data) << 8) | GST_READ_UINT8 (data + 1);
-
- switch (marker) {
- case 0xFFFE:
-- *p_in_encoding = "UTF16LE";
-+ *p_in_encoding = utf16leenc;
- return TRUE;
- case 0xFEFF:
-- *p_in_encoding = "UTF16BE";
-+ *p_in_encoding = utf16beenc;
- return TRUE;
- default:
- break;
-@@ -702,6 +690,63 @@
- }
-
- static void
-+parse_insert_string_field (guint8 encoding, gchar * data, gint data_size,
-+ GArray * fields)
-+{
-+ gchar *field = NULL;
-+
-+ switch (encoding) {
-+ case ID3V2_ENCODING_UTF16:
-+ case ID3V2_ENCODING_UTF16BE:
-+ {
-+ const gchar *in_encode;
-+
-+ if (encoding == ID3V2_ENCODING_UTF16)
-+ in_encode = utf16enc;
-+ else
-+ in_encode = utf16beenc;
-+
-+ /* Sometimes we see strings with multiple BOM markers at the start.
-+ * In that case, we assume the innermost one is correct. If that fails
-+ * to produce valid UTF-8, we try the other endianness anyway */
-+ while (data_size > 2 && find_utf16_bom (data, &in_encode)) {
-+ data += 2; /* skip BOM */
-+ data_size -= 2;
-+ }
-+
-+ field = g_convert (data, data_size, "UTF-8", in_encode, NULL, NULL, NULL);
-+
-+ if (field == NULL || g_utf8_validate (field, -1, NULL) == FALSE) {
-+ /* As a fallback, try interpreting UTF-16 in the other endianness */
-+ if (in_encode == utf16beenc)
-+ field = g_convert (data, data_size, "UTF-8", utf16leenc,
-+ NULL, NULL, NULL);
-+ }
-+ }
-+
-+ break;
-+ case ID3V2_ENCODING_ISO8859:
-+ field = g_convert (data, data_size, "UTF-8", "ISO-8859-1",
-+ NULL, NULL, NULL);
-+ break;
-+ default:
-+ field = g_strndup (data, data_size);
-+ break;
-+ }
-+
-+ if (field) {
-+ if (g_utf8_validate (field, -1, NULL)) {
-+ g_array_append_val (fields, field);
-+ return;
-+ }
-+
-+ GST_DEBUG ("%s was bad UTF-8 after conversion from encoding %d. Ignoring",
-+ field, encoding);
-+ g_free (field);
-+ }
-+}
-+
-+static void
- parse_split_strings (guint8 encoding, gchar * data, gint data_size,
- GArray ** out_fields)
- {
-@@ -715,13 +760,13 @@
- case ID3V2_ENCODING_ISO8859:
- for (text_pos = 0; text_pos < data_size; text_pos++) {
- if (data[text_pos] == 0) {
-- parse_insert_string_field ("ISO-8859-1", data + prev,
-+ parse_insert_string_field (encoding, data + prev,
- text_pos - prev + 1, fields);
- prev = text_pos + 1;
- }
- }
- if (data_size - prev > 0 && data[prev] != 0x00) {
-- parse_insert_string_field ("ISO-8859-1", data + prev,
-+ parse_insert_string_field (encoding, data + prev,
- data_size - prev, fields);
- }
-
-@@ -729,34 +774,24 @@
- case ID3V2_ENCODING_UTF8:
- for (prev = 0, text_pos = 0; text_pos < data_size; text_pos++) {
- if (data[text_pos] == '\0') {
-- parse_insert_string_field ("UTF-8", data + prev,
-+ parse_insert_string_field (encoding, data + prev,
- text_pos - prev + 1, fields);
- prev = text_pos + 1;
- }
- }
- if (data_size - prev > 0 && data[prev] != 0x00) {
-- parse_insert_string_field ("UTF-8", data + prev,
-+ parse_insert_string_field (encoding, data + prev,
- data_size - prev, fields);
- }
- break;
- case ID3V2_ENCODING_UTF16:
- case ID3V2_ENCODING_UTF16BE:
- {
-- const gchar *in_encode;
--
-- if (encoding == ID3V2_ENCODING_UTF16)
-- in_encode = "UTF-16";
-- else
-- in_encode = "UTF-16BE";
--
- /* Find '\0\0' terminator */
- for (text_pos = 0; text_pos < data_size - 1; text_pos += 2) {
- if (data[text_pos] == '\0' && data[text_pos + 1] == '\0') {
-- if (has_utf16_bom (data + prev, &in_encode)) {
-- prev += 2; /* skip BOM */
-- }
- /* found a delimiter */
-- parse_insert_string_field (in_encode, data + prev,
-+ parse_insert_string_field (encoding, data + prev,
- text_pos - prev + 2, fields);
- text_pos++; /* Advance to the 2nd NULL terminator */
- prev = text_pos + 1;
-@@ -765,11 +800,8 @@
- }
- if (data_size - prev > 1 &&
- (data[prev] != 0x00 || data[prev + 1] != 0x00)) {
-- if (has_utf16_bom (data + prev, &in_encode)) {
-- prev += 2; /* skip BOM */
-- }
- /* There were 2 or more non-null chars left, convert those too */
-- parse_insert_string_field (in_encode, data + prev,
-+ parse_insert_string_field (encoding, data + prev,
- data_size - prev, fields);
- }
- break;
diff --git a/multimedia/gstreamer-plugins-good/pkg-plist b/multimedia/gstreamer-plugins-good/pkg-plist
index 88a6c9279e36..51ed562b3a73 100644
--- a/multimedia/gstreamer-plugins-good/pkg-plist
+++ b/multimedia/gstreamer-plugins-good/pkg-plist
@@ -91,3 +91,23 @@ lib/gstreamer-%%VERSION%%/libgstwavparse.so
lib/gstreamer-%%VERSION%%/libgstximagesrc.a
lib/gstreamer-%%VERSION%%/libgstximagesrc.la
lib/gstreamer-%%VERSION%%/libgstximagesrc.so
+share/locale/af/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/multimedia/gstreamer-plugins-ugly/Makefile b/multimedia/gstreamer-plugins-ugly/Makefile
index 0d36fc97881e..6c8c2ea21ffb 100644
--- a/multimedia/gstreamer-plugins-ugly/Makefile
+++ b/multimedia/gstreamer-plugins-ugly/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins-ugly/Makefile,v 1.5 2006/06/08 01:14:31 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins-ugly/Makefile,v 1.8 2006/09/14 21:20:43 ahze Exp $
#
PORTREVISION= 2
@@ -19,8 +19,8 @@ MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
BUILD_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
RUN_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
-DIST= ugly
-UGLY_GST_DIRS= gst
+gst_ugly_DIST= ugly
+UGLY_GST_DIRS= gst po gst-libs
PLIST_SUB= VERSION="${GST_VERSION}"
NO_GSTREAMER_COMMON= yes
PLIST= ${.CURDIR}/pkg-plist
diff --git a/multimedia/gstreamer-plugins-ugly/pkg-plist b/multimedia/gstreamer-plugins-ugly/pkg-plist
index 40aadb6bf1ff..5c14161c79c2 100644
--- a/multimedia/gstreamer-plugins-ugly/pkg-plist
+++ b/multimedia/gstreamer-plugins-ugly/pkg-plist
@@ -19,3 +19,23 @@ lib/gstreamer-%%VERSION%%/libgstmpegstream.so
lib/gstreamer-%%VERSION%%/libgstrmdemux.a
lib/gstreamer-%%VERSION%%/libgstrmdemux.la
lib/gstreamer-%%VERSION%%/libgstrmdemux.so
+share/locale/af/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 17e1666ba640..b3ab71d2f356 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -3,13 +3,13 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.86 2006/06/09 18:13:48 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.100 2006/09/14 21:02:22 ahze Exp $
#
PORTNAME= gstreamer
PORTVERSION?= ${BASE_PORTVERSION}
PORTREVISION?= 0
-PORTEPOCH= 1
+PORTEPOCH= 2
CATEGORIES?= multimedia audio
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
http://gstreamer.freedesktop.org/src/gst-plugins-bad/:bad \
@@ -24,20 +24,21 @@ PKGNAMESUFFIX= -plugins${GST_PLUGIN_SUFFIX}
MAINTAINER= multimedia@FreeBSD.org
COMMENT?= GStreamer written collection of plugins handling several media types
+BUILD_DEPENDS+= v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat
LIB_DEPENDS+= gstreamer-0.10.0:${PORTSDIR}/multimedia/gstreamer \
popt.0:${PORTSDIR}/devel/popt \
oil-0.3.1:${PORTSDIR}/devel/liboil
-BASE_PORTVERSION= 0.10.9
+BASE_PORTVERSION= 0.10.10
BASE_DISTNAME= gst-plugins-base-${BASE_PORTVERSION}
BASE_DISTFILE= ${BASE_DISTNAME}${EXTRACT_SUFX}
BAD_PORTVERSION= 0.10.3
BAD_DISTNAME= gst-plugins-bad-${BAD_PORTVERSION}
BAD_DISTFILE= ${BAD_DISTNAME}${EXTRACT_SUFX}
-GOOD_PORTVERSION= 0.10.3
+GOOD_PORTVERSION= 0.10.4
GOOD_DISTNAME= gst-plugins-good-${GOOD_PORTVERSION}
GOOD_DISTFILE= ${GOOD_DISTNAME}${EXTRACT_SUFX}
-UGLY_PORTVERSION= 0.10.3
+UGLY_PORTVERSION= 0.10.4
UGLY_DISTNAME= gst-plugins-ugly-${UGLY_PORTVERSION}
UGLY_DISTFILE= ${UGLY_DISTNAME}${EXTRACT_SUFX}
DIST?= good
@@ -46,7 +47,6 @@ SHLIB_VERSION= 1
USE_GETTEXT= yes
VERSION= ${GST_VERSION}
WANT_GSTREAMER= yes
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME+= gnomehack gnometarget pkgconfig ltverhack
@@ -67,9 +67,9 @@ IGNORE= many plugins don't build or even work on 4.x
.endif
.if ${GST_PLUGIN} == "base"
-DIST= base
+gst_base_DIST= base
NO_GSTREAMER_COMMON= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAN1= gst-visualise-0.10.1
PLIST_SUB+= VERSION="${VERSION}" \
SHLIB_VERSION="${SHLIB_VERSION}"
@@ -79,6 +79,34 @@ USE_GSTREAMER= yes
.include "${MASTERDIR}/Makefile.common"
+.if ${DIST}=="base"
+EXTRACT_ONLY=${BASE_DISTFILE}
+WRKSRC=${WRKDIR}/${BASE_DISTNAME}
+PORTVERSION= ${BASE_PORTVERSION}
+DISTFILES+= ${BASE_DISTFILE}:base
+PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins/files
+.elif ${DIST}=="bad"
+EXTRACT_ONLY=${BAD_DISTFILE}
+WRKSRC=${WRKDIR}/${BAD_DISTNAME}
+PORTVERSION= ${BAD_PORTVERSION}
+DISTFILES+= ${BAD_DISTFILE}:bad
+PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins-bad/files
+.elif ${DIST}=="ugly"
+EXTRACT_ONLY=${UGLY_DISTFILE}
+WRKSRC=${WRKDIR}/${UGLY_DISTNAME}
+PORTVERSION= ${UGLY_PORTVERSION}
+DISTFILES+= ${UGLY_DISTFILE}:ugly
+PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins-ugly/files
+.elif ${DIST}=="makesum"
+DISTFILES+= ${BASE_DISTFILE}:base ${BAD_DISTFILE}:bad \
+ ${UGLY_DISTFILE}:ugly ${GOOD_DISTFILE}:good
+.else
+EXTRACT_ONLY=${GOOD_DISTFILE}
+WRKSRC=${WRKDIR}/${GOOD_DISTNAME}
+PORTVERSION= ${GOOD_PORTVERSION}
+DISTFILES+= ${GOOD_DISTFILE}:good
+.endif
+
# cdrom default device
.ifdef(WITH_CDROM_DEVICE)
DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
@@ -102,23 +130,23 @@ DEFAULT_DVD_DEVICE=/dev/acd0
.endif
post-patch:
+ @${FIND} ${WRKSRC}/ext -name Makefile.in | \
+ ${XARGS} -n 10 ${REINPLACE_CMD} -e \
+ 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgsttag-@GST_MAJORMINOR@.la|; \
+ s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgstaudio-@GST_MAJORMINOR@.la|; \
+ s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgstriff-@GST_MAJORMINOR@.la|; \
+ s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-$$(GST_MAJORMINOR).la|${LOCALBASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|'
@${FIND} ${WRKSRC} -type f | \
${XARGS} -n 10 ${REINPLACE_CMD} -e \
's|malloc\.h|stdlib.h|; \
s|stdint\.h|inttypes.h|; \
s|%%VERSION%%|${VERSION}|'
- @${FIND} ${WRKSRC}/ext -name Makefile.in | \
- ${XARGS} -n 10 ${REINPLACE_CMD} -e \
- 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-$$(GST_MAJORMINOR).la|${X11BASE}/lib/libgsttag-@GST_MAJORMINOR@.la|; \
- s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-$$(GST_MAJORMINOR).la|${X11BASE}/lib/libgstaudio-@GST_MAJORMINOR@.la|; \
- s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-$$(GST_MAJORMINOR).la|${X11BASE}/lib/libgstriff-@GST_MAJORMINOR@.la|; \
- s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-$$(GST_MAJORMINOR).la|${X11BASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|'
@${FIND} ${WRKSRC}/ext -name Makefile.in | \
${XARGS} -n 10 ${REINPLACE_CMD} -e \
- 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la|${X11BASE}/lib/libgsttag-@GST_MAJORMINOR@.la|; \
- s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la|${X11BASE}/lib/libgstaudio-@GST_MAJORMINOR@.la|; \
- s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la|${X11BASE}/lib/libgstriff-@GST_MAJORMINOR@.la|; \
- s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la|${X11BASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|'
+ 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgsttag-@GST_MAJORMINOR@.la|; \
+ s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstaudio-@GST_MAJORMINOR@.la|; \
+ s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstriff-@GST_MAJORMINOR@.la|; \
+ s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|'
@${REINPLACE_CMD} -e 's|DEFAULT_AUDIOSINK="alsasink"|DEFAULT_AUDIOSINK="${DEFAULT_AUDIOSINK}"|; \
s|DEFAULT_AUDIOSRC="alsasrc"|DEFAULT_AUDIOSRC="${DEFAULT_AUDIOSRC}"|' \
${WRKSRC}/configure
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index d2973c0739f8..0e8d97052438 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -1,5 +1,5 @@
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.47 2006/06/08 20:53:40 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.63 2006/09/29 23:22:28 ahze Exp $
# base
BASE_GST_ALL_PLUGINS= \
alsa \
@@ -89,339 +89,271 @@ CONFIGURE_ARGS+=--disable-tests \
--disable-tarkin \
--enable-static \
--disable-sunaudio \
- --disable-gst_v4l \
- --disable-gst_v4l2 \
--disable-xine \
--enable-x \
--enable-xshm \
--enable-xvideo
-# spc is broken a the moment
-#.if (${ARCH} == "i386")
-#BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
-#CONFIGURE_ARGS+=--enable-spc
-#PLIST_SUB+= SPC=""
-#.else
-CONFIGURE_ARGS+=--disable-spc
-PLIST_SUB+= SPC="@comment "
-#.endif
-
.if !defined(NO_GSTREAMER_COMMON)
GST_PLUGIN_SUFFIX?= -${GST_PLUGIN}
-COMMENT= Gstreamer ${GST_PLUGIN} plugin
-
# Enable the right plugin
CONFIGURE_ARGS:=${CONFIGURE_ARGS:S|--disable-${GST_PLUGIN}|--enable-${GST_PLUGIN}|}
-# Build/Install directory. defaults to ext/${GST_PLUGIN}
-# few plugins are in sys/
-GST_PLUGIN_DIR?= ext/${GST_PLUGIN}
-
-#
GST_LIB_DIR= lib/gstreamer-${VERSION}
# Auto create PLIST
PLIST= ${NONEXISTENT}
-PLIST_FILES?= ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so \
- ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.a \
- ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.la
# a52dec
-.if ${GST_PLUGIN}=="a52dec"
-LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52
-DIST= ugly
-.endif
+gst_a52dec_LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52
+gst_a52dec_DIST= ugly
# aalib
-.if ${GST_PLUGIN}=="aalib"
-LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib
-PLIST_FILES= ${GST_LIB_DIR}/libgstaasink.so \
+gst_aalib_LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib
+gst_aalib_PLIST_FILES= ${GST_LIB_DIR}/libgstaasink.so \
${GST_LIB_DIR}/libgstaasink.a \
${GST_LIB_DIR}/libgstaasink.la
-.endif
+
+# annodex
+
+# bz2
+gst_bz2_DIST= bad
# cairo
-.if ${GST_PLUGIN}=="cairo"
-LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo
-.endif
+gst_cairo_LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo
# cdparanoia
-.if ${GST_PLUGIN}=="cdparanoia"
-LIB_DEPENDS+= cdda_interface.0:${PORTSDIR}/audio/cdparanoia
-EXTRA_LIBS+= -lgstcdda-${VERSION}
-DIST= base
-.endif
+gst_cdparanoia_LIB_DEPENDS+= cdda_interface.0:${PORTSDIR}/audio/cdparanoia
+gst_cdparanoia_EXTRA_LIBS+= -lgstcdda-${VERSION}
+gst_cdparanoia_DIST= base
# dts
-.if ${GST_PLUGIN}=="dts"
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
-PLIST_FILES= ${GST_LIB_DIR}/libgstdtsdec.a \
+gst_dts_BUILD_DEPENDS+= ${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
+gst_dts_PLIST_FILES= ${GST_LIB_DIR}/libgstdtsdec.a \
${GST_LIB_DIR}/libgstdtsdec.la \
${GST_LIB_DIR}/libgstdtsdec.so
-DIST= bad
-.endif
+gst_dts_DIST= bad
# dv
-.if ${GST_PLUGIN}=="dv"
-LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv
-.endif
+gst_dv_LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv
-.if ${GST_PLUGIN}=="dvd"
-EXTRA_LIBS+= -ldvdnav
-LIB_DEPENDS+= dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
-GST_PLUGIN_DIR= ext/dvdnav \
+# dvd
+gst_dvd_EXTRA_LIBS+= -ldvdnav
+gst_dvd_LIB_DEPENDS+= dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
+gst_dvd_GST_PLUGIN_DIR= ext/dvdnav \
ext/dvdread
-PLIST_FILES= ${GST_LIB_DIR}/libgstdvdnav.a \
+gst_dvd_PLIST_FILES= ${GST_LIB_DIR}/libgstdvdnav.a \
${GST_LIB_DIR}/libgstdvdnav.la \
${GST_LIB_DIR}/libgstdvdnav.so \
${GST_LIB_DIR}/libgstdvdread.a \
${GST_LIB_DIR}/libgstdvdread.la \
${GST_LIB_DIR}/libgstdvdread.so
-DIST= ugly
-.endif
+gst_dvd_DIST= ugly
# esound
-.if ${GST_PLUGIN}=="esound"
-USE_GNOME+= esound
-GST_PLUGIN_DIR= ext/esd
-CONFIGURE_ENV+= ESD_CFLAGS="`pkg-config --cflags esound`" \
+gst_esound_USE_GNOME+= esound
+gst_esound_GST_PLUGIN_DIR= ext/esd
+gst_esound_CONFIGURE_ENV+= ESD_CFLAGS="`pkg-config --cflags esound`" \
ESD_LIBS="`pkg-config --libs esound`"
-PLIST_FILES= ${GST_LIB_DIR}/libgstesd.so \
+gst_esound_PLIST_FILES= ${GST_LIB_DIR}/libgstesd.so \
${GST_LIB_DIR}/libgstesd.a \
${GST_LIB_DIR}/libgstesd.la
-.endif
# faac
-.if ${GST_PLUGIN}=="faac"
-LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac
-DIST= bad
-.endif
+gst_faac_LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac
+gst_faac_DIST= bad
# faad
-.if ${GST_PLUGIN}=="faad"
-LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad
-DIST= bad
-.endif
+gst_faad_LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad
+gst_faad_DIST= bad
# flac
-.if ${GST_PLUGIN}=="flac"
-LIB_DEPENDS+= FLAC.7:${PORTSDIR}/audio/flac
-.endif
+gst_flac_LIB_DEPENDS+= FLAC.7:${PORTSDIR}/audio/flac
# gconf
-.if ${GST_PLUGIN}=="gconf"
-USE_GNOME+= gconf2
-GST_PLUGIN_DIR= ext/gconf \
+gst_gconf_USE_GNOME+= gnomeprefix gconf2
+gst_gconf_GST_PLUGIN_DIR= ext/gconf \
gconf
-GCONF_SCHEMAS= gstreamer-${GST_VERSION}.schemas
-PLIST_FILES= ${GST_LIB_DIR}/libgstgconfelements.so \
+gst_gconf_CONFIGURE_ARGS+= --enable-schemas-install
+gst_gconf_GCONF_SCHEMAS= gstreamer-${GST_VERSION}.schemas
+gst_gconf_PLIST_FILES= ${GST_LIB_DIR}/libgstgconfelements.so \
${GST_LIB_DIR}/libgstgconfelements.a \
${GST_LIB_DIR}/libgstgconfelements.la
-.endif
# gnomevfs
-.if ${GST_PLUGIN}=="gnomevfs"
-USE_GNOME+= gnomevfs2
-CONFIGURE_ARGS+=--enable-gnome_vfs
-DIST= base
-.endif
+gst_gnomevfs_USE_GNOME+= gnomevfs2
+gst_gnomevfs_CONFIGURE_ARGS+=--enable-gnome_vfs
+gst_gnomevfs_DIST= base
# gsm
-.if ${GST_PLUGIN}=="gsm"
-LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm
-DIST= bad
-.endif
+gst_gsm_LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm
+gst_gsm_DIST= bad
# ivorbis
-.if ${GST_PLUGIN}=="ivorbis"
-LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor
-DIST= bad
-.endif
+gst_ivorbis_LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor
+gst_ivorbis_DIST= bad
# hal
-.if ${GST_PLUGIN}=="hal"
-LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
-PLIST_FILES= ${GST_LIB_DIR}/libgsthalelements.a \
+gst_hal_LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
+gst_hal_PLIST_FILES= ${GST_LIB_DIR}/libgsthalelements.a \
${GST_LIB_DIR}/libgsthalelements.la \
${GST_LIB_DIR}/libgsthalelements.so
-.endif
-
# jpeg
-.if ${GST_PLUGIN}=="jpeg"
-LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg
-.endif
+gst_jpeg_LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg
# ladspa
-.if ${GST_PLUGIN}=="ladspa"
-BUILD_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-.endif
+gst_ladspa_BUILD_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
# lame
-.if ${GST_PLUGIN}=="lame"
-LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
-DIST= ugly
-.endif
+gst_lame_LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
+gst_lame_DIST= ugly
# libcaca
-.if ${GST_PLUGIN}=="libcaca"
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
-PLIST_FILES= ${GST_LIB_DIR}/libgstcacasink.so \
+gst_libcaca_BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+gst_libcaca_PLIST_FILES= ${GST_LIB_DIR}/libgstcacasink.so \
${GST_LIB_DIR}/libgstcacasink.a \
${GST_LIB_DIR}/libgstcacasink.la
-.endif
# libmms
-.if ${GST_PLUGIN}=="libmms"
-LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms
-PLIST_FILES= ${GST_LIB_DIR}/libgstmms.so \
+gst_libmms_LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms
+gst_libmms_PLIST_FILES= ${GST_LIB_DIR}/libgstmms.so \
${GST_LIB_DIR}/libgstmms.a \
${GST_LIB_DIR}/libgstmms.la
-DIST= bad
-.endif
+gst_libmms_DIST= bad
# libpng and the snapshot plugin
-.if ${GST_PLUGIN}=="libpng"
-LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
-GST_PLUGIN_DIR= ext/libpng
-PLIST_FILES= ${GST_LIB_DIR}/libgstpng.so \
+gst_libpng_LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
+gst_libpng_GST_PLUGIN_DIR= ext/libpng
+gst_libpng_PLIST_FILES= ${GST_LIB_DIR}/libgstpng.so \
${GST_LIB_DIR}/libgstpng.a \
${GST_LIB_DIR}/libgstpng.la
-.endif
# libvisual
-.if ${GST_PLUGIN}=="libvisual"
-LIB_DEPENDS+= visual.0:${PORTSDIR}/graphics/libvisual
-DIST= base
-.endif
+gst_libvisual_LIB_DEPENDS+= visual.0:${PORTSDIR}/graphics/libvisual
+gst_libvisual_DIST= base
# mad
-.if ${GST_PLUGIN}=="mad"
-LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \
+gst_mad_LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \
id3tag.0:${PORTSDIR}/audio/libid3tag
-DIST= ugly
-.endif
+gst_mad_DIST= ugly
# mpeg2dec
-.if ${GST_PLUGIN}=="mpeg2dec"
-LIB_DEPENDS+= mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
-DIST= ugly
-.endif
+gst_mpeg2dec_LIB_DEPENDS+= mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
+gst_mpeg2dec_DIST= ugly
# musepack
-.if ${GST_PLUGIN}=="musepack"
-LIB_DEPENDS+= mpcdec.4:${PORTSDIR}/audio/libmpcdec
-DIST= bad
-.endif
+gst_musepack_LIB_DEPENDS+= mpcdec.4:${PORTSDIR}/audio/libmpcdec
+gst_musepack_DIST= bad
# musicbrainz
-.if ${GST_PLUGIN}=="musicbrainz"
-LIB_DEPENDS+= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
-PLIST_FILES= ${GST_LIB_DIR}/libgsttrm.so \
+gst_musicbrainz_LIB_DEPENDS+= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
+gst_musicbrainz_PLIST_FILES= ${GST_LIB_DIR}/libgsttrm.so \
${GST_LIB_DIR}/libgsttrm.a \
${GST_LIB_DIR}/libgsttrm.la
-DIST= bad
-.endif
+gst_musicbrainz_DIST= bad
+
+# neon
+gst_neon_LIB_DEPENDS+= neon.25:${PORTSDIR}/www/neon
+gst_neon_CONFIGURE_ENV+= NEON_CFLAGS="-I${LOCALBASE}/include/neon"
+gst_neon_PLIST_FILES= ${GST_LIB_DIR}/libgstneonhttpsrc.a \
+ ${GST_LIB_DIR}/libgstneonhttpsrc.la \
+ ${GST_LIB_DIR}/libgstneonhttpsrc.so
+gst_neon_DIST= bad
# ogg
-.if ${GST_PLUGIN}=="ogg"
-LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg
-EXTRA_LIBS+= -lgstriff-${VERSION}
-DIST= base
-.endif
+gst_ogg_LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg
+gst_ogg_EXTRA_LIBS+= -lgstriff-${VERSION}
+gst_ogg_DIST= base
# pango
-.if ${GST_PLUGIN}=="pango"
-USE_GNOME+= pango
-DIST= base
-.endif
+gst_pango_USE_GNOME+= pango
+gst_pango_DIST= base
# sdl
-.if ${GST_PLUGIN}=="sdl"
-USE_SDL+= sdl
-GST_PLIST_SUFFIX= videosink
-DIST= bad
-.endif
+gst_sdl_USE_SDL+= sdl
+gst_sdl_PLIST_FILES= ${GST_LIB_DIR}/libgstsdlvideosink.a \
+ ${GST_LIB_DIR}/libgstsdlvideosink.la \
+ ${GST_LIB_DIR}/libgstsdlvideosink.so
+gst_sdl_GST_PLIST_SUFFIX= videosink
+gst_sdl_DIST= bad
# shout2
-.if ${GST_PLUGIN}=="shout2"
-LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2
-.endif
+gst_shout2_LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2
# sidplay
-.if ${GST_PLUGIN}=="sidplay"
-LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay
-PLIST_FILES= ${GST_LIB_DIR}/libgstsid.so \
+gst_sidplay_LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay
+gst_sidplay_PLIST_FILES= ${GST_LIB_DIR}/libgstsid.so \
${GST_LIB_DIR}/libgstsid.a \
${GST_LIB_DIR}/libgstsid.la
-DIST= ugly
-.endif
+gst_sidplay_DIST= ugly
# speex
-.if ${GST_PLUGIN}=="speex"
-LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex
-.endif
+gst_speex_LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex
# theora
-.if ${GST_PLUGIN}=="theora"
-LIB_DEPENDS+= theora.2:${PORTSDIR}/multimedia/libtheora
-DIST= base
-.endif
+gst_theora_LIB_DEPENDS+= theora.2:${PORTSDIR}/multimedia/libtheora
+gst_theora_DIST= base
# vorbis
-.if ${GST_PLUGIN}=="vorbis"
-USE_GSTREAMER+= ogg
-LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
-EXTRA_LIBS+= -lgsttag-${VERSION} -lgstaudio-${VERSION}
-DIST= base
-.endif
+gst_vorbis_USE_GSTREAMER+= ogg
+gst_vorbis_LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
+gst_vorbis_EXTRA_LIBS+= -lgsttag-${VERSION} -lgstaudio-${VERSION}
+gst_vorbis_DIST= base
# xvid
-.if ${GST_PLUGIN}=="xvid"
-LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
-DIST= bad
-.endif
+gst_xvid_LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
+gst_xvid_DIST= bad
# wavpack
-.if ${GST_PLUGIN}=="wavpack"
-LIB_DEPENDS+= wavpack.0:${PORTSDIR}/audio/wavpack
-DIST= bad
-.endif
+gst_wavpack_LIB_DEPENDS+= wavpack.0:${PORTSDIR}/audio/wavpack
+gst_wavpack_DIST= bad
+
.endif # NO_GSTREAMER_COMMON
-.if ${DIST}=="base"
-EXTRACT_ONLY=${BASE_DISTFILE}
-WRKSRC=${WRKDIR}/${BASE_DISTNAME}
-PORTVERSION= ${BASE_PORTVERSION}
-DISTFILES+= ${BASE_DISTFILE}:base
-PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins/files
-.elif ${DIST}=="bad"
-EXTRACT_ONLY=${BAD_DISTFILE}
-WRKSRC=${WRKDIR}/${BAD_DISTNAME}
-PORTVERSION= ${BAD_PORTVERSION}
-DISTFILES+= ${BAD_DISTFILE}:bad
-PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins-bad/files
-.elif ${DIST}=="ugly"
-EXTRACT_ONLY=${UGLY_DISTFILE}
-WRKSRC=${WRKDIR}/${UGLY_DISTNAME}
-PORTVERSION= ${UGLY_PORTVERSION}
-DISTFILES+= ${UGLY_DISTFILE}:ugly
-PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins-ugly/files
-.elif ${DIST}=="makesum"
-DISTFILES+= ${BASE_DISTFILE}:base ${BAD_DISTFILE}:bad \
- ${UGLY_DISTFILE}:ugly ${GOOD_DISTFILE}:good
-.else
-EXTRACT_ONLY=${GOOD_DISTFILE}
-WRKSRC=${WRKDIR}/${GOOD_DISTNAME}
-PORTVERSION= ${GOOD_PORTVERSION}
-DISTFILES+= ${GOOD_DISTFILE}:good
-PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins-good/files
-.endif
+gst_${GST_PLUGIN}_DIST?= good
+DIST= ${gst_${GST_PLUGIN}_DIST}
.if !defined(NO_GSTREAMER_COMMON)
+gst_${GST_PLUGIN}_BUILD_DEPENDS?=
+gst_${GST_PLUGIN}_LIB_DEPENDS?=
+gst_${GST_PLUGIN}_RUN_DEPENDS?=
+gst_${GST_PLUGIN}_PLIST_FILES?=${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so \
+ ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.a \
+ ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.la
+gst_${GST_PLUGIN}_EXTRA_LIBS?=
+gst_${GST_PLUGIN}_PREBUILD_DIR?=
+gst_${GST_PLUGIN}_GST_PLUGIN_DIR?= ext/${GST_PLUGIN}
+gst_${GST_PLUGIN}_POSTBUILD_DIR?=
+gst_${GST_PLUGIN}_USE_GNOME?=
+gst_${GST_PLUGIN}_CONFIGURE_ENV?=
+gst_${GST_PLUGIN}_GCONF_SCHEMAS?=
+gst_${GST_PLUGIN}_CONFIGURE_ARGS?=
+gst_${GST_PLUGIN}_USE_SDL?=
+gst_${GST_PLUGIN}_USE_GSTREAMER?=
+
+BUILD_DEPENDS+= ${gst_${GST_PLUGIN}_BUILD_DEPENDS}
+LIB_DEPENDS+= ${gst_${GST_PLUGIN}_LIB_DEPENDS}
+RUN_DEPENDS+= ${gst_${GST_PLUGIN}_RUN_DEPENDS}
+PLIST_FILES= ${gst_${GST_PLUGIN}_PLIST_FILES}
+EXTRA_LIBS+= ${gst_${GST_PLUGIN}_EXTRA_LIBS}
+USE_GNOME+= ${gst_${GST_PLUGIN}_USE_GNOME}
+CONFIGURE_ENV+= ${gst_${GST_PLUGIN}_CONFIGURE_ENV}
+.if ${gst_${GST_PLUGIN}_GCONF_SCHEMAS}!=""
+GCONF_SCHEMAS= ${gst_${GST_PLUGIN}_GCONF_SCHEMAS}
+.endif
+CONFIGURE_ARGS+=${gst_${GST_PLUGIN}_CONFIGURE_ARGS}
+.if ${gst_${GST_PLUGIN}_USE_SDL}!=""
+USE_SDL= ${gst_${GST_PLUGIN}_USE_SDL}
+.endif
+USE_GSTREAMER+= ${gst_${GST_PLUGIN}_USE_GSTREAMER}
+GST_PREBUILD_DIR=${gst_${GST_PLUGIN}_GST_PREBUILD_DIR}
+GST_PLUGIN_DIR= ${gst_${GST_PLUGIN}_GST_PLUGIN_DIR}
+GST_POSTBUILD_DIR=${gst_${GST_PLUGIN}_GST_POSTBUILD_DIR}
+
.if !target(do-build)
do-build:
.for dir in ${GST_PREBUILD_DIR} ${GST_PLUGIN_DIR} ${GST_POSTBUILD_DIR}
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index 6d4db1b17e03..165d6d07f72e 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1,12 +1,12 @@
-MD5 (gst-plugins-base-0.10.9.tar.bz2) = cf0aa58f066c3a0e0258909b3ad9d4ad
-SHA256 (gst-plugins-base-0.10.9.tar.bz2) = 81906ea7471212bc376d509a843f113913618c2c93e352a0b5d890f69e1d35f7
-SIZE (gst-plugins-base-0.10.9.tar.bz2) = 1261167
+MD5 (gst-plugins-base-0.10.10.tar.bz2) = 7a51a3fabebe5f77235926ad65ba9593
+SHA256 (gst-plugins-base-0.10.10.tar.bz2) = 2246a5921ad060e86acd81cabec17a5022d1997849f950ac2c8f6f14f9291d3e
+SIZE (gst-plugins-base-0.10.10.tar.bz2) = 1333651
MD5 (gst-plugins-bad-0.10.3.tar.bz2) = 8545a02c408976c5e9f0c2cf3c6a362e
SHA256 (gst-plugins-bad-0.10.3.tar.bz2) = 648f1ef813c64c7eedd45d164eb41ba21366bba8ec5fcbff3100458721be489e
SIZE (gst-plugins-bad-0.10.3.tar.bz2) = 953949
-MD5 (gst-plugins-ugly-0.10.3.tar.bz2) = af6f238507b0040bf84fcbc6a241e559
-SHA256 (gst-plugins-ugly-0.10.3.tar.bz2) = 0cd916b3f0c8867cea77243d20d8d56ed45b7ef5ec5c5dd1603860ece8e88a10
-SIZE (gst-plugins-ugly-0.10.3.tar.bz2) = 605833
-MD5 (gst-plugins-good-0.10.3.tar.bz2) = a58bb825bd4b22412764f2a8d2f98b1c
-SHA256 (gst-plugins-good-0.10.3.tar.bz2) = 8c09374656aca4b8ffbe109a24dcdb98c5d519c4b05bf9eeeb3a34f16b26eaf5
-SIZE (gst-plugins-good-0.10.3.tar.bz2) = 1165391
+MD5 (gst-plugins-ugly-0.10.4.tar.bz2) = c10f40e3641d827ca7853b0a3d560257
+SHA256 (gst-plugins-ugly-0.10.4.tar.bz2) = 4871c52b2421b582330a0f9dc6a42da3b706140c346aa0cd690eb40758afe152
+SIZE (gst-plugins-ugly-0.10.4.tar.bz2) = 720893
+MD5 (gst-plugins-good-0.10.4.tar.bz2) = e189496e7987898823d28d26b79f63dc
+SHA256 (gst-plugins-good-0.10.4.tar.bz2) = f2b90ef5fb4b2d0b06d5fd8193a7c19b1d08d4f737abeafabf04d39673ea703b
+SIZE (gst-plugins-good-0.10.4.tar.bz2) = 1225739
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index f4720a089850..a732d89031ad 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -56,6 +56,9 @@ lib/gstreamer-%%VERSION%%/libgstdecodebin.so
lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.a
lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.la
lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.so
+lib/gstreamer-%%VERSION%%/libgstgdp.a
+lib/gstreamer-%%VERSION%%/libgstgdp.la
+lib/gstreamer-%%VERSION%%/libgstgdp.so
lib/gstreamer-%%VERSION%%/libgstplaybin.a
lib/gstreamer-%%VERSION%%/libgstplaybin.la
lib/gstreamer-%%VERSION%%/libgstplaybin.so
@@ -68,6 +71,9 @@ lib/gstreamer-%%VERSION%%/libgsttcp.so
lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.a
lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.la
lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.so
+lib/gstreamer-%%VERSION%%/libgstvideo4linux.a
+lib/gstreamer-%%VERSION%%/libgstvideo4linux.la
+lib/gstreamer-%%VERSION%%/libgstvideo4linux.so
lib/gstreamer-%%VERSION%%/libgstvideorate.a
lib/gstreamer-%%VERSION%%/libgstvideorate.la
lib/gstreamer-%%VERSION%%/libgstvideorate.so
@@ -142,3 +148,9 @@ share/locale/vi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
@dirrm include/gstreamer-%%VERSION%%/gst/floatcast
@dirrm include/gstreamer-%%VERSION%%/gst/cdda
@dirrm include/gstreamer-%%VERSION%%/gst/audio
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index 69ecd08f239a..6d7c74bc2480 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -3,12 +3,13 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins80/Makefile,v 1.60 2006/04/23 22:55:30 mezz Exp $
+# $MCom: ports/multimedia/gstreamer-plugins80/Makefile,v 1.63 2006/09/10 00:52:59 mezz Exp $
#
PORTNAME= gstreamer
PORTVERSION= 0.8.12
-PORTREVISION?= 3
+PORTREVISION?= 2
+PORTEPOCH= 1
CATEGORIES?= multimedia audio
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://gstreamer.freedesktop.org/src/gst-plugins/
@@ -27,7 +28,7 @@ SHLIB_VERSION= 1
VERSION= 0.8
WANT_GSTREAMER= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
@@ -52,7 +53,7 @@ WITHOUT_CPU_CFLAGS= yes
.if ${GST_PLUGIN} == "base"
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
PLIST_SUB+= VERSION="${VERSION}" \
SHLIB_VERSION="${SHLIB_VERSION}"
@@ -158,7 +159,7 @@ post-install:
. endfor
.endif
# register plugins
- -@${X11BASE}/bin/gst-register-${VERSION} \
+ -@${LOCALBASE}/bin/gst-register-${VERSION} \
--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${VERSION}/registry.xml 2>/dev/null
.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-plugins80/Makefile.common b/multimedia/gstreamer-plugins80/Makefile.common
index 49e3569357cb..16f212d67294 100644
--- a/multimedia/gstreamer-plugins80/Makefile.common
+++ b/multimedia/gstreamer-plugins80/Makefile.common
@@ -1,5 +1,5 @@
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins80/Makefile.common,v 1.33 2006/07/17 05:15:45 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins80/Makefile.common,v 1.35 2006/10/07 19:23:51 ahze Exp $
GST_ALL_PLUGINS= \
a52dec \
aalib \
@@ -259,9 +259,6 @@ PLIST_FILES= ${GST_LIB_DIR}/libgstcddasrc.so \
# libvisual
.if ${GST_PLUGIN}=="libvisual"
LIB_DEPENDS+= visual.0:${PORTSDIR}/graphics/libvisual
-.if ${OSVERSION} < 500000
-IGNORE= Does not build
-.endif
.endif
# musepack
diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_x254_x264enc.c b/multimedia/gstreamer-plugins80/files/patch-ext_x264_x264enc.c
index 4d994ddc2414..4d994ddc2414 100644
--- a/multimedia/gstreamer-plugins80/files/patch-ext_x254_x264enc.c
+++ b/multimedia/gstreamer-plugins80/files/patch-ext_x264_x264enc.c
diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist
index f13b40e24f73..c6f619f79127 100644
--- a/multimedia/gstreamer-plugins80/pkg-plist
+++ b/multimedia/gstreamer-plugins80/pkg-plist
@@ -398,3 +398,11 @@ share/locale/zh_TW/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
@dirrmtry include/gstreamer-%%VERSION%%
@exec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
@unexec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index cf351a21fc5a..0ced9734ba4c 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -3,21 +3,21 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer/Makefile,v 1.45 2006/04/28 11:44:33 ahze Exp $
+# $MCom: ports/multimedia/gstreamer/Makefile,v 1.52 2006/09/14 20:51:42 ahze Exp $
PORTNAME= gstreamer
-PORTVERSION= 0.10.9
+PORTVERSION= 0.10.10
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/ \
- ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= ahze
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Development framework for creating media applications
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BISON= yes
USE_BZIP2= yes
USE_GMAKE= yes
@@ -33,7 +33,7 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
ac_cv_func_register_printf_function="no"
PLIST_SUB= VERSION="${GST_VERSION}"
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GST_VERSION= 0.10
MAN1= gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \
diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo
index bda9d105b7d0..1fb90fc51547 100644
--- a/multimedia/gstreamer/distinfo
+++ b/multimedia/gstreamer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gstreamer-0.10.9.tar.bz2) = e59aaced7000ddfdaa81c52b9a238786
-SHA256 (gstreamer-0.10.9.tar.bz2) = 370e7cef8206522a4a8a80a05e935d6627c7381867e533b872f917d031a47e67
-SIZE (gstreamer-0.10.9.tar.bz2) = 1719970
+MD5 (gstreamer-0.10.10.tar.bz2) = 6875bf0bd3cf38b9ae1362b9e644e6fc
+SHA256 (gstreamer-0.10.10.tar.bz2) = d31981baee6a59ea87086f3bec19d2ab3e14f2ea75e47e70e39ca8acf4e87e59
+SIZE (gstreamer-0.10.10.tar.bz2) = 1794450
diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist
index caaa89e4494a..d785bf381f03 100644
--- a/multimedia/gstreamer/pkg-plist
+++ b/multimedia/gstreamer/pkg-plist
@@ -132,3 +132,15 @@ share/locale/zh_TW/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@dirrm include/gstreamer-%%VERSION%%/gst
@dirrm include/gstreamer-%%VERSION%%
@dirrm lib/gstreamer-%%VERSION%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/multimedia/gstreamer80/Makefile b/multimedia/gstreamer80/Makefile
index 038b6dd392ae..eefb8faa5bb0 100644
--- a/multimedia/gstreamer80/Makefile
+++ b/multimedia/gstreamer80/Makefile
@@ -3,12 +3,12 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer80/Makefile,v 1.40 2006/04/23 22:58:42 mezz Exp $
+# $MCom: ports/multimedia/gstreamer80/Makefile,v 1.43 2006/09/10 00:53:00 mezz Exp $
#
PORTNAME= gstreamer
PORTVERSION= 0.8.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://gstreamer.freedesktop.org/src/gstreamer/
@@ -21,7 +21,7 @@ COMMENT= Development framework for creating media applications
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BISON= yes
USE_BZIP2= yes
USE_GMAKE= yes
@@ -42,7 +42,7 @@ PLIST_SUB= \
VERSION="${GST_VERSION}" \
SHLIB_VERSION="${SHLIB_VERSION}" \
PORTVERSION="${PORTVERSION}"
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAN1= gst-complete-${GST_VERSION}.1 gst-compprep-${GST_VERSION}.1 \
gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \
diff --git a/multimedia/gstreamer80/pkg-plist b/multimedia/gstreamer80/pkg-plist
index 638edaeefb3c..ba4ae6aa23fb 100644
--- a/multimedia/gstreamer80/pkg-plist
+++ b/multimedia/gstreamer80/pkg-plist
@@ -153,3 +153,13 @@ share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@dirrm include/gstreamer-%%VERSION%%/gst
@dirrm include/gstreamer-%%VERSION%%
@exec %D/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index 53187407cc54..d27f92817d60 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -3,11 +3,12 @@
# Whom: Koop Mast <kwm@rainbow-runner.nl>
#
# $FreeBSD$
+# $MCom: ports/multimedia/py-gstreamer/Makefile,v 1.13 2006/10/05 19:34:49 mezz Exp $
#
PORTNAME= gstreamer
PORTVERSION= 0.10.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia python gnome
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/multimedia/py-gstreamer80/Makefile b/multimedia/py-gstreamer80/Makefile
index 40960c2a7d86..6887c372845f 100644
--- a/multimedia/py-gstreamer80/Makefile
+++ b/multimedia/py-gstreamer80/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gstreamer
PORTVERSION= 0.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia python gnome
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/ \
${MASTER_SITE_LOCAL}
diff --git a/multimedia/py-gstreamer80/files/patch-gst_arg-types.py b/multimedia/py-gstreamer80/files/patch-gst_arg-types.py
new file mode 100644
index 000000000000..4711c7d2e074
--- /dev/null
+++ b/multimedia/py-gstreamer80/files/patch-gst_arg-types.py
@@ -0,0 +1,11 @@
+--- gst/arg-types.py.orig Fri Oct 13 12:08:08 2006
++++ gst/arg-types.py Fri Oct 13 12:16:20 2006
+@@ -49,6 +49,8 @@ class GstDataPtrArg(ArgType):
+ info.add_parselist('O', ['&py_' + pname], [pname])
+ info.arglist.append(pname)
+ info.codebefore.append(self.normal % {'name': pname})
++ def write_return(self, ptype, ownsreturn, info):
++ return
+
+ class XmlNodeArg(ArgType):
+ """libxml2 node generator"""
diff --git a/multimedia/py-gstreamer80/files/patch-gst_gst.override b/multimedia/py-gstreamer80/files/patch-gst_gst.override
new file mode 100644
index 000000000000..bf9073c50e2e
--- /dev/null
+++ b/multimedia/py-gstreamer80/files/patch-gst_gst.override
@@ -0,0 +1,17 @@
+--- gst/gst.override.orig Fri Oct 13 12:03:56 2006
++++ gst/gst.override Fri Oct 13 12:03:42 2006
+@@ -570,14 +570,6 @@ _wrap_gst_type_find_factory_get_caps(PyG
+ return pyg_boxed_new(GST_TYPE_CAPS, ret, TRUE, TRUE);
+ }
+ %%
+-override gst_type_find_factory_get_caps noargs
+-static PyObject *
+-_wrap_gst_type_find_factory_get_caps(PyGObject *self)
+-{
+- GstCaps *ret = (GstCaps*)gst_type_find_factory_get_caps(GST_TYPE_FIND_FACTORY(self->obj));
+- return pyg_boxed_new(GST_TYPE_CAPS, ret, TRUE, TRUE);
+-}
+-%%
+ override-attr GError.domain
+ static PyObject *
+ _wrap_gst_g_error__get_domain(PyGObject *self, void *closure)
diff --git a/multimedia/py-gstreamer80/files/patch-gst_gstpad.override b/multimedia/py-gstreamer80/files/patch-gst_gstpad.override
new file mode 100644
index 000000000000..9ab49dc29337
--- /dev/null
+++ b/multimedia/py-gstreamer80/files/patch-gst_gstpad.override
@@ -0,0 +1,24 @@
+--- gst/gstpad.override.orig Wed May 4 06:59:39 2005
++++ gst/gstpad.override Fri Oct 13 12:40:22 2006
+@@ -443,16 +443,15 @@ _wrap_gst_pad_link_filtered(PyGObject *s
+ }
+
+ %%
+-override gst_pad_get_negotiated_caps
++override gst_pad_pull noargs
+ static PyObject *
+-_wrap_gst_pad_get_negotiated_caps(PyGObject *self)
++_wrap_gst_pad_pull(PyGObject *self)
+ {
+- const GstCaps *ret;
++ GstData *ret = (GstData*)gst_pad_pull(GST_PAD(self->obj));
+
+- ret = gst_pad_get_negotiated_caps(GST_PAD(self->obj));
+- /* pyg_boxed_new handles NULL checking */
+- return pyg_boxed_new(GST_TYPE_CAPS, ret, TRUE, TRUE);
++ return pyg_boxed_new(GST_TYPE_DATA, ret, TRUE, TRUE);
+ }
++
+ %%
+ override gst_pad_get_negotiated_caps noargs
+ static PyObject *
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index e21f47305209..b4d52e8e06f0 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -6,29 +6,30 @@
#
PORTNAME= totem
-PORTVERSION= 1.4.5
+PORTVERSION= 2.16.2
CATEGORIES= multimedia gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER?= hendrik@scholz.net
COMMENT?= A Xine-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
+LIB_DEPENDS= musicbrainz:${PORTSDIR}/audio/libmusicbrainz \
+ hal.1:${PORTSDIR}/sysutils/hal
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop desktopfileutils \
- nautiluscdburner
+ nautiluscdburner ltverhack
GNOME_DESKTOP_VERSION=2
WANT_GSTREAMER= yes
+INSTALLS_ICONS= yes
USE_GMAKE= yes
-GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_AUTOTOOLS= libtool:15
+USE_LDCONFIG= yes
INSTALLS_OMF= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -46,19 +47,27 @@ CONFLICTS?= totem-gstreamer-[0-9]*
.include <bsd.port.pre.mk>
.if defined(WITH_MOZILLA_PLUGIN)
-USE_GECKO= firefox mozilla seamonkey
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+USE_GECKO= firefox mozilla seamonkey xulrunner<->firefox firefox-devel<->firefox
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
PLIST_SUB+= MOZILLA=""
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
-CONFIGURE_ARGS+=--with-mozilla=${GECKO}
+CONFIGURE_ARGS+=--with-mozilla=${GECKO} \
+ --enable-gmp-plugin \
+ --enable-complex-plugin \
+ --enable-narrowspace-plugin
.else
PLIST_SUB+= MOZILLA="@comment "
-CONFIGURE_ARGS+=--disable-mozilla
+CONFIGURE_ARGS+=--without-mozilla \
+ --disable-browser-plugins \
+ --disable-mozilla \
+ --disable-basic-plugin \
+ --disable-gmp-plugin \
+ --disable-complex-plugin \
+ --disable-narrowspace-plugin
.endif
.if defined(WITH_GSTREAMER)
-CONFIGURE_ARGS+=--enable-gstreamer=0.10
-USE_GSTREAMER+= gnomevfs core gconf
+CONFIGURE_ARGS+=--enable-gstreamer=yes
+USE_GSTREAMER+= gnomevfs core gconf hal good
WITHOUT_DVDNAV= yes
PLIST_SUB+= GSTREAMER=""
.else
@@ -70,16 +79,6 @@ PLIST_SUB+= GSTREAMER="@comment "
LIB_DEPENDS+= dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
.endif
-.if defined(WITH_CDROM_DEVICE)
-DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
-.else
-.if ${OSVERSION} < 500000
-DEFAULT_CDROM_DEVICE=/dev/acd0c
-.else
-DEFAULT_CDROM_DEVICE=/dev/acd0
-.endif
-.endif
-
.if defined(WITH_DVD_DEVICE)
DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
.else
@@ -91,29 +90,18 @@ DEFAULT_DVD_DEVICE=/dev/acd0
.endif
pre-everything::
- @${ECHO_MSG} "===> The default CDROM device is ${DEFAULT_CDROM_DEVICE}"
- @${ECHO_MSG} "===> Define WITH_CDROM_DEVICE if you want to change the default"
- @${ECHO_MSG} "===> For example, 'make WITH_CDROM_DEVICE=\"/dev/somedevice\"'"
- @${ECHO_MSG} "===>"
@${ECHO_MSG} "===> The default DVD device is ${DEFAULT_DVD_DEVICE}"
@${ECHO_MSG} "===> Define WITH_DVD_DEVICE if you want to change the default"
@${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'"
post-patch:
@${CP} -f ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
-.if defined(WITH_MOZILLA_PLUGIN)
- @${ECHO} "" >> ${PKGMESSAGE}
- @${CAT} ${FILESDIR}/pkg-message-mozilla.in >> ${PKGMESSAGE}
-.endif
- @${REINPLACE_CMD} -e 's|/plugins||; \
- s|@MOZILLA_PLUGINDIR@|${PREFIX}/lib/browser_plugins|' \
- ${WRKSRC}/src/Makefile.in
- @${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
- ${WRKSRC}/src/totem-preferences.c \
- ${WRKSRC}/src/backend/bacon-video-widget-gst.c
+ @${REINPLACE_CMD} -e ' s|@MOZILLA_PLUGINDIR@|${PREFIX}/lib/browser_plugins|; \
+ s|mozilla/plugins|browser_plugins|' \
+ ${WRKSRC}/browser-plugin/Makefile.in \
+ ${WRKSRC}/browser-plugin/idl/Makefile.in
.if defined(WITH_GSTREAMER)
@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
- ${WRKSRC}/src/backend/bacon-video-widget-gst.c \
${WRKSRC}/src/backend/bacon-video-widget-gst-0.10.c
.endif
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index e966b0056ea3..7530eb61b1c4 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-1.4.5.tar.bz2) = 215861d6276b77ac4ad871abb18aa10c
-SHA256 (gnome2/totem-1.4.5.tar.bz2) = 9c6440b8fd1c4f8b1668c6a0f2946db06e641456e8b86b612275784eaccc5be1
-SIZE (gnome2/totem-1.4.5.tar.bz2) = 1720059
+MD5 (gnome2/totem-2.16.2.tar.bz2) = 6e98e3bc2b8531611906bd2bca73f743
+SHA256 (gnome2/totem-2.16.2.tar.bz2) = 7f088dc3630d040b44a5ddb84d07baae6fb5593d6fa6fd25b86bd9c46e82101d
+SIZE (gnome2/totem-2.16.2.tar.bz2) = 1831393
diff --git a/multimedia/totem/files/patch-browser-plugin_totemPlugin.cpp b/multimedia/totem/files/patch-browser-plugin_totemPlugin.cpp
new file mode 100644
index 000000000000..9a16349f4b0a
--- /dev/null
+++ b/multimedia/totem/files/patch-browser-plugin_totemPlugin.cpp
@@ -0,0 +1,10 @@
+--- browser-plugin/totemPlugin.cpp.orig Mon Aug 14 17:01:14 2006
++++ browser-plugin/totemPlugin.cpp Mon Aug 14 17:01:24 2006
+@@ -27,6 +27,7 @@
+ #include <stdint.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <signal.h>
+ #include <sys/wait.h>
+ #include <sys/poll.h>
+ #include <string.h>
diff --git a/multimedia/totem/files/patch-src_totem-disk.c b/multimedia/totem/files/patch-src_totem-disk.c
deleted file mode 100644
index 6b6ef565e287..000000000000
--- a/multimedia/totem/files/patch-src_totem-disk.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/plparse/totem-disc.c.orig Thu Nov 24 16:53:02 2005
-+++ src/plparse/totem-disc.c Sun Dec 18 13:34:12 2005
-@@ -43,7 +43,29 @@
- #include <glib/gi18n.h>
- #include <libgnomevfs/gnome-vfs.h>
-
-+#ifdef __FreeBSD__
-+#include <sys/cdio.h>
-+#include <sys/disklabel.h>
-+
-+#define CDROM_DRIVE_STATUS 0x5326
-+#define CDROM_DISC_STATUS 0x5327
-+#define CDS_AUDIO 100
-+#define CDS_MIXED 105
-+#define CDS_DATA_1 101
-+#define CDS_DATA_2 102
-+#define CDS_NO_INFO 0 /* if not implemented */
-+#define CDS_NO_DISC 1
-+#define CDS_TRAY_OPEN 2
-+#define CDS_DRIVE_NOT_READY 3
-+#define CDS_DISC_OK 4
-+#define CDS_XA_2_1 103
-+#define CDS_XA_2_2 104
-+#define CDC_DVD 0x8000
-+#define ENOMEDIUM ENODEV
-+#define CDROM_GET_CAPABILITY CDIOCCLRDEBUG
-+#else
- #include <linux/cdrom.h>
-+#endif
-
- #include "totem-disc.h"
-
diff --git a/multimedia/totem/files/patch-src_totem-mozilla-plugin.cpp b/multimedia/totem/files/patch-src_totem-mozilla-plugin.cpp
deleted file mode 100644
index 2c34077eadd5..000000000000
--- a/multimedia/totem/files/patch-src_totem-mozilla-plugin.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/totem-mozilla-plugin.cpp.orig Tue Nov 8 21:50:10 2005
-+++ src/totem-mozilla-plugin.cpp Tue Nov 8 21:50:27 2005
-@@ -27,6 +27,7 @@
- #include <stdint.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <signal.h>
- #include <sys/wait.h>
- #include <string.h>
-
diff --git a/multimedia/totem/files/pkg-message-mozilla.in b/multimedia/totem/files/pkg-message-mozilla.in
deleted file mode 100644
index ddbbe4e548a7..000000000000
--- a/multimedia/totem/files/pkg-message-mozilla.in
+++ /dev/null
@@ -1,8 +0,0 @@
-**************************************************************************
-The totem mozilla plugin requires a D-BUS-enabled desktop session. Consult
-the FreeBSD GNOME FAQ for instructions on setting up your desktop session
-through D-BUS:
-
- http://www.freebsd.org/gnome/docs/faq2.html#q25
-
-**************************************************************************
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index a9174c8c6ba1..47b223c57f2a 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -4,14 +4,30 @@ include/totem/1/plparser/totem-disc.h
include/totem/1/plparser/totem-pl-parser-builtins.h
include/totem/1/plparser/totem-pl-parser-features.h
include/totem/1/plparser/totem-pl-parser.h
-%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.a
-%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.la
-%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.so
-%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.xpt
+%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.a
+%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.la
+%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.so
+%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.xpt
+%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.a
+%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.la
+%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.so
+%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.xpt
+%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.a
+%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.la
+%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.so
+%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.xpt
+%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.a
+%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.la
+%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.so
+%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.xpt
+%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.a
+%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.la
+%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.so
+%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.xpt
lib/libtotem-plparser.a
lib/libtotem-plparser.la
lib/libtotem-plparser.so
-lib/libtotem-plparser.so.2
+lib/libtotem-plparser.so.1
lib/nautilus/extensions-1.0/libtotem-properties-page.a
lib/nautilus/extensions-1.0/libtotem-properties-page.la
lib/nautilus/extensions-1.0/libtotem-properties-page.so
@@ -82,12 +98,16 @@ share/gnome/omf/totem/totem-es.omf
share/gnome/omf/totem/totem-fr.omf
share/gnome/omf/totem/totem-ru.omf
share/gnome/omf/totem/totem-uk.omf
-share/gnome/pixmaps/media-player-48.png
share/gnome/pixmaps/vanity.png
+%%MOZILLA%%share/gnome/totem/doc/totemIBasicPlayer.html
+%%MOZILLA%%share/gnome/totem/doc/totemIComplexPlayer.html
+%%MOZILLA%%share/gnome/totem/doc/totemIGMPControls.html
+%%MOZILLA%%share/gnome/totem/doc/totemIGMPPlayer.html
+%%MOZILLA%%share/gnome/totem/doc/totemIMullYPlayer.html
+%%MOZILLA%%share/gnome/totem/doc/totemINarrowSpacePlayer.html
share/gnome/totem/filmholes-big-left.png
share/gnome/totem/filmholes-big-right.png
share/gnome/totem/filmholes.png
-share/gnome/totem/media-player-48.png
share/gnome/totem/mozilla-viewer.glade
share/gnome/totem/playlist-playing.png
share/gnome/totem/playlist.glade
@@ -107,18 +127,25 @@ share/gnome/totem/totem_logo.png
share/gnome/totem/uri.glade
share/gnome/totem/vanity.glade
share/gnome/totem/vanity.png
+share/icons/hicolor/16x16/apps/totem.png
+share/icons/hicolor/22x22/apps/totem.png
+share/icons/hicolor/24x24/apps/totem.png
+share/icons/hicolor/32x32/apps/totem.png
+share/icons/hicolor/scalable/apps/totem.svg
share/locale/am/LC_MESSAGES/totem.mo
share/locale/ar/LC_MESSAGES/totem.mo
share/locale/az/LC_MESSAGES/totem.mo
share/locale/be/LC_MESSAGES/totem.mo
share/locale/bg/LC_MESSAGES/totem.mo
share/locale/bn/LC_MESSAGES/totem.mo
+share/locale/bn_IN/LC_MESSAGES/totem.mo
share/locale/br/LC_MESSAGES/totem.mo
share/locale/ca/LC_MESSAGES/totem.mo
share/locale/cs/LC_MESSAGES/totem.mo
share/locale/cy/LC_MESSAGES/totem.mo
share/locale/da/LC_MESSAGES/totem.mo
share/locale/de/LC_MESSAGES/totem.mo
+share/locale/dz/LC_MESSAGES/totem.mo
share/locale/el/LC_MESSAGES/totem.mo
share/locale/en_CA/LC_MESSAGES/totem.mo
share/locale/en_GB/LC_MESSAGES/totem.mo
@@ -139,19 +166,21 @@ share/locale/id/LC_MESSAGES/totem.mo
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/ko/LC_MESSAGES/totem.mo
share/locale/ku/LC_MESSAGES/totem.mo
share/locale/lt/LC_MESSAGES/totem.mo
share/locale/lv/LC_MESSAGES/totem.mo
+share/locale/ka/LC_MESSAGES/totem.mo
share/locale/mg/LC_MESSAGES/totem.mo
share/locale/mk/LC_MESSAGES/totem.mo
share/locale/ml/LC_MESSAGES/totem.mo
+share/locale/mr/LC_MESSAGES/totem.mo
share/locale/ms/LC_MESSAGES/totem.mo
share/locale/nb/LC_MESSAGES/totem.mo
share/locale/ne/LC_MESSAGES/totem.mo
share/locale/nl/LC_MESSAGES/totem.mo
share/locale/nn/LC_MESSAGES/totem.mo
+share/locale/or/LC_MESSAGES/totem.mo
share/locale/pa/LC_MESSAGES/totem.mo
share/locale/pl/LC_MESSAGES/totem.mo
share/locale/pt/LC_MESSAGES/totem.mo
@@ -160,10 +189,12 @@ share/locale/ro/LC_MESSAGES/totem.mo
share/locale/ru/LC_MESSAGES/totem.mo
share/locale/rw/LC_MESSAGES/totem.mo
share/locale/sk/LC_MESSAGES/totem.mo
+share/locale/sl/LC_MESSAGES/totem.mo
share/locale/sq/LC_MESSAGES/totem.mo
share/locale/sr/LC_MESSAGES/totem.mo
share/locale/sr@Latn/LC_MESSAGES/totem.mo
share/locale/sv/LC_MESSAGES/totem.mo
+share/locale/ta/LC_MESSAGES/totem.mo
share/locale/te/LC_MESSAGES/totem.mo
share/locale/th/LC_MESSAGES/totem.mo
share/locale/tr/LC_MESSAGES/totem.mo
@@ -175,10 +206,7 @@ share/locale/xh/LC_MESSAGES/totem.mo
share/locale/zh_CN/LC_MESSAGES/totem.mo
share/locale/zh_HK/LC_MESSAGES/totem.mo
share/locale/zh_TW/LC_MESSAGES/totem.mo
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
+@dirrm share/gnome/totem/doc
@dirrm share/gnome/totem
@dirrm share/gnome/omf/totem
@dirrm share/gnome/help/totem/uk/figures
@@ -196,8 +224,65 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
@dirrm share/gnome/help/totem/C/figures
@dirrm share/gnome/help/totem/C
@dirrm share/gnome/help/totem
+@dirrmtry lib/browser_plugins
@dirrm include/totem/1/plparser
@dirrm include/totem/1
@dirrm include/totem
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index a5386af8e5e1..fc71986dc938 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.15 2006/04/28 01:52:15 marcus Exp $
+# $MCom: ports/net/avahi/Makefile,v 1.19 2006/10/12 16:44:41 marcus Exp $
PORTNAME= avahi
-PORTVERSION= 0.6.13
-PORTREVISION?= 3
+PORTVERSION= 0.6.14
+PORTREVISION?= 0
CATEGORIES?= net dns
MASTER_SITES= http://www.avahi.org/download/
@@ -16,13 +16,14 @@ COMMENT?= Service discovery on a local network
LIB_DEPENDS?= expat.6:${PORTSDIR}/textproc/expat2 \
daemon.2:${PORTSDIR}/devel/libdaemon \
- dbus-1.2:${PORTSDIR}/devel/dbus \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
gdbm.3:${PORTSDIR}/databases/gdbm
USE_GNOME?= gnomehack ltverhack glib20
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= yes
+USE_GETOPT_LONG=yes
CONFIGURE_ARGS?=--with-distro=freebsd \
--with-dbus-system-address=unix:path=/var/run/dbus/dbus.pipe \
--disable-qt3 \
@@ -34,6 +35,7 @@ CONFIGURE_ARGS?=--with-distro=freebsd \
--disable-doxygen-dot \
--localstatedir=/var \
--enable-compat-howl \
+ --disable-autoipd \
--mandir=${PREFIX}/man
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
@@ -56,10 +58,6 @@ OPTIONS= GTK2 "Build a GTK+ 2 browser utility" off \
.include <bsd.port.pre.mk>
.if !defined(AVAHI_SLAVE)
-.if ${OSVERSION} < 500000
-IGNORE= does not work on FreeBSD 4.X
-.endif
-
.if defined(WITH_LIBDNS)
CONFIGURE_ARGS+=--enable-compat-libdns_sd
PLIST_SUB+= LIBDNS=""
diff --git a/net/avahi/distinfo b/net/avahi/distinfo
index 3a834eb6a204..8ab897bd5219 100644
--- a/net/avahi/distinfo
+++ b/net/avahi/distinfo
@@ -1,3 +1,3 @@
-MD5 (avahi-0.6.13.tar.gz) = d1000689979105cc95b9ca102284aae4
-SHA256 (avahi-0.6.13.tar.gz) = 5e10afd1d3e98eac31ac0a4bdab63e6672b66a4bfd192eb700e6d3903be7b4b9
-SIZE (avahi-0.6.13.tar.gz) = 895380
+MD5 (avahi-0.6.14.tar.gz) = 6abad76bbc2ac0f51a8869b3a2e5c238
+SHA256 (avahi-0.6.14.tar.gz) = e599f03b2d493b492fc23f50c5fe7bbf78af90e79a0c6c8c2e6600048e71c2e6
+SIZE (avahi-0.6.14.tar.gz) = 923556
diff --git a/net/avahi/files/patch-Makefile.in b/net/avahi/files/patch-Makefile.in
index 19d2d7d3487b..18801509241b 100644
--- a/net/avahi/files/patch-Makefile.in
+++ b/net/avahi/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig Tue May 16 11:50:31 2006
-+++ Makefile.in Tue May 16 11:55:38 2006
-@@ -1043,21 +1043,29 @@
+--- Makefile.in.orig Wed Oct 11 01:31:58 2006
++++ Makefile.in Wed Oct 11 01:34:55 2006
+@@ -1057,21 +1056,29 @@ uninstall-info: uninstall-info-recursive
avahi-core.pc: avahi-core.pc.in
sed -e 's,@prefix\@,$(prefix),g' \
-e 's,@libdir\@,$(libdir),g' \
@@ -30,7 +30,7 @@
@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@avahi-sharp.pc: avahi-sharp.pc.in
-@@ -1068,6 +1076,8 @@
+@@ -1082,6 +1089,8 @@ avahi-core.pc: avahi-core.pc.in
@HAVE_GLIB_TRUE@avahi-glib.pc: avahi-glib.pc.in
@HAVE_GLIB_TRUE@ sed -e 's,@prefix\@,$(prefix),g' \
@HAVE_GLIB_TRUE@ -e 's,@libdir\@,$(libdir),g' \
diff --git a/net/avahi/files/patch-avahi-core_dns.c b/net/avahi/files/patch-avahi-core_dns.c
new file mode 100644
index 000000000000..3c24721e58af
--- /dev/null
+++ b/net/avahi/files/patch-avahi-core_dns.c
@@ -0,0 +1,10 @@
+--- avahi-core/dns.c.orig Thu Oct 12 12:43:19 2006
++++ avahi-core/dns.c Thu Oct 12 12:43:31 2006
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <assert.h>
+
++#include <sys/types.h>
+ #include <netinet/in.h>
+
+ #include <avahi-common/defs.h>
diff --git a/net/avahi/pkg-plist b/net/avahi/pkg-plist
index e82e0f93da1c..242c7b2b83c0 100644
--- a/net/avahi/pkg-plist
+++ b/net/avahi/pkg-plist
@@ -11,6 +11,7 @@ bin/avahi-set-host-name
etc/avahi/avahi-daemon.conf
etc/avahi/avahi-dnsconfd.action
etc/avahi/hosts
+etc/avahi/services/sftp-ssh.service
etc/avahi/services/ssh.service
etc/dbus-1/system.d/avahi-dbus.conf
etc/rc.d/avahi-daemon.sh
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 85f1b99aa456..f16cb3270c85 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ekiga
PORTVERSION= 2.0.2
-PORTREVISION= 2
+PORTREVISION= 5
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
@@ -18,7 +18,7 @@ COMMENT= VoIP phone for GNOME
LIB_DEPENDS= opal_r.2:${PORTSDIR}/net/opal
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_SDL= sdl
INSTALLS_OMF= yes
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=--disable-avahi
.endif
.ifndef (WITHOUT_DBUS)
-LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+=--enable-dbus
PLIST_SUB+= DBUS:=""
.else
@@ -53,6 +53,8 @@ PLIST_SUB+= DBUS:="@comment "
.endif
post-patch:
+ @${REINPLACE_CMD} -e 's|@prefix@/@DATADIRNAME@|${PREFIX}/share/gnome|' \
+ ${WRKSRC}/*schemas*
@${REINPLACE_CMD} -e 's|{datadir}/dbus-1|(prefix)/share/dbus-1|g' \
${WRKSRC}/Makefile.in
diff --git a/net/ekiga/pkg-plist b/net/ekiga/pkg-plist
index e9615d6576be..d47d8cb4eec0 100644
--- a/net/ekiga/pkg-plist
+++ b/net/ekiga/pkg-plist
@@ -201,18 +201,6 @@ share/locale/xh/LC_MESSAGES/ekiga.mo
share/locale/zh_CN/LC_MESSAGES/ekiga.mo
share/locale/zh_HK/LC_MESSAGES/ekiga.mo
share/locale/zh_TW/LC_MESSAGES/ekiga.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
@dirrm share/gnome/sounds/ekiga
@dirrm share/gnome/pixmaps/ekiga
@dirrm share/gnome/omf/ekiga
@@ -229,3 +217,47 @@ share/locale/zh_TW/LC_MESSAGES/ekiga.mo
@dirrm share/gnome/help/ekiga/C/figures
@dirrm share/gnome/help/ekiga/C
@dirrm share/gnome/help/ekiga
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 79c1bf979594..79076bb715fd 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/net/gnome-netstatus/Makefile,v 1.41 2006/07/23 01:10:49 mezz Exp $
#
PORTNAME= gnome-netstatus
PORTVERSION= 2.12.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.12
@@ -17,7 +18,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A GNOME applet that shows network status
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
index 266c5b3ad9be..e7d18bad3d1a 100644
--- a/net/gnome-netstatus/pkg-plist
+++ b/net/gnome-netstatus/pkg-plist
@@ -183,3 +183,41 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
@dirrm share/gnome/help/gnome-netstatus/C
@dirrm share/gnome/help/gnome-netstatus
@dirrm share/gnome/gnome-netstatus
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index faace0d0fd5d..5dbad65a7eb3 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,10 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/net/gnome-nettool/Makefile,v 1.32 2006/09/05 07:41:18 marcus Exp $
#
PORTNAME= gnome-nettool
-PORTVERSION= 2.14.2
+PORTVERSION= 2.16.0
PORTEPOCH= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -17,11 +18,13 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A GNOME utility that provides network information statistics
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
-USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2
+USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
USE_GMAKE= yes
USE_GETTEXT= yes
+INSTALLS_OMF= yes
+INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index 37c59cd66676..c310ad7944ef 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-nettool-2.14.2.tar.bz2) = 0efb13f0145abe46b26a00c75473a00f
-SHA256 (gnome2/gnome-nettool-2.14.2.tar.bz2) = 95f3f298598d8a038a04987d43d9e8e452948e8813a706c31389fd5e30cd1778
-SIZE (gnome2/gnome-nettool-2.14.2.tar.bz2) = 484715
+MD5 (gnome2/gnome-nettool-2.16.0.tar.bz2) = 58d9171efdf368910934fb71194763eb
+SHA256 (gnome2/gnome-nettool-2.16.0.tar.bz2) = 6e3d1f1ff86622ef4e39c99a470e03ab316a76eb0f66f953eebd12c2621f4be7
+SIZE (gnome2/gnome-nettool-2.16.0.tar.bz2) = 501870
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index a2b66ceaf221..468d8c45031c 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -5,16 +5,19 @@ share/gnome/gnome-nettool/pixmaps/16_ethernet.xpm
share/gnome/gnome-nettool/pixmaps/16_loopback.xpm
share/gnome/gnome-nettool/pixmaps/16_plip.xpm
share/gnome/gnome-nettool/pixmaps/16_ppp.xpm
-share/gnome/gnome-nettool/pixmaps/gnome-nettool.png
share/gnome/gnome-nettool/pixmaps/irda-16.png
share/gnome/gnome-nettool/pixmaps/network.png
share/gnome/gnome-nettool/pixmaps/wavelan-16.png
+share/gnome/help/gnome-nettool/C/gnome-nettool.xml
+share/gnome/help/gnome-nettool/C/legal.xml
+share/gnome/omf/gnome-nettool/gnome-nettool-C.omf
share/gnome/pixmaps/gnome-nettool.png
+share/icons/hicolor/48x48/apps/gnome-nettool.png
share/locale/ar/LC_MESSAGES/gnome-nettool.mo
share/locale/az/LC_MESSAGES/gnome-nettool.mo
share/locale/bg/LC_MESSAGES/gnome-nettool.mo
share/locale/bn/LC_MESSAGES/gnome-nettool.mo
-share/locale/br/LC_MESSAGES/gnome-nettool.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-nettool.mo
share/locale/bs/LC_MESSAGES/gnome-nettool.mo
share/locale/ca/LC_MESSAGES/gnome-nettool.mo
share/locale/cs/LC_MESSAGES/gnome-nettool.mo
@@ -44,6 +47,8 @@ share/locale/ja/LC_MESSAGES/gnome-nettool.mo
share/locale/ka/LC_MESSAGES/gnome-nettool.mo
share/locale/ko/LC_MESSAGES/gnome-nettool.mo
share/locale/lt/LC_MESSAGES/gnome-nettool.mo
+share/locale/lv/LC_MESSAGES/gnome-nettool.mo
+share/locale/mg/LC_MESSAGES/gnome-nettool.mo
share/locale/mk/LC_MESSAGES/gnome-nettool.mo
share/locale/ml/LC_MESSAGES/gnome-nettool.mo
share/locale/mn/LC_MESSAGES/gnome-nettool.mo
@@ -51,7 +56,7 @@ share/locale/ms/LC_MESSAGES/gnome-nettool.mo
share/locale/nb/LC_MESSAGES/gnome-nettool.mo
share/locale/ne/LC_MESSAGES/gnome-nettool.mo
share/locale/nl/LC_MESSAGES/gnome-nettool.mo
-share/locale/no/LC_MESSAGES/gnome-nettool.mo
+share/locale/or/LC_MESSAGES/gnome-nettool.mo
share/locale/pa/LC_MESSAGES/gnome-nettool.mo
share/locale/pl/LC_MESSAGES/gnome-nettool.mo
share/locale/pt/LC_MESSAGES/gnome-nettool.mo
@@ -60,6 +65,7 @@ share/locale/ro/LC_MESSAGES/gnome-nettool.mo
share/locale/ru/LC_MESSAGES/gnome-nettool.mo
share/locale/rw/LC_MESSAGES/gnome-nettool.mo
share/locale/sk/LC_MESSAGES/gnome-nettool.mo
+share/locale/sl/LC_MESSAGES/gnome-nettool.mo
share/locale/sq/LC_MESSAGES/gnome-nettool.mo
share/locale/sr/LC_MESSAGES/gnome-nettool.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-nettool.mo
@@ -72,9 +78,55 @@ share/locale/vi/LC_MESSAGES/gnome-nettool.mo
share/locale/wa/LC_MESSAGES/gnome-nettool.mo
share/locale/xh/LC_MESSAGES/gnome-nettool.mo
share/locale/zh_CN/LC_MESSAGES/gnome-nettool.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-nettool.mo
share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
+@dirrm share/gnome/omf/gnome-nettool
+@dirrm share/gnome/help/gnome-nettool/C
+@dirrm share/gnome/help/gnome-nettool
@dirrm share/gnome/gnome-nettool/pixmaps
@dirrm share/gnome/gnome-nettool/dialogs
@dirrm share/gnome/gnome-nettool
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index 01b4d2b7a99d..0d6480cfaf83 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= net gnome python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -13,10 +13,10 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Python interface to the Avahi mDNS system
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm \
- ${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
+ ${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
LIB_DEPENDS= avahi-client.3:${PORTSDIR}/net/avahi
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm \
- ${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
+ ${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
MASTERDIR= ${.CURDIR}/../avahi
BUILD_WRKSRC= ${WRKSRC}/avahi-python
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 9f7c2d214635..4f0b63189eec 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,11 +3,11 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $MCom: ports/net/vino/Makefile,v 1.28 2006/04/13 07:52:37 bland Exp $
+# $MCom: ports/net/vino/Makefile,v 1.31 2006/10/05 18:17:10 mezz Exp $
#
PORTNAME= vino
-PORTVERSION= 2.13.5
+PORTVERSION= 2.16.0
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,7 +19,7 @@ LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix intlhack gnomehack gnomepanel
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
diff --git a/net/vino/distinfo b/net/vino/distinfo
index 8a52a9171bea..351477f49a6d 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,3 +1,3 @@
-MD5 (vino-2.13.5.tar.bz2) = 9bc8c3f0e639fdc7b9ed023501308359
-SHA256 (vino-2.13.5.tar.bz2) = 58ee9c77070a8865cce6d25dd6b68fae02b307b64b203d78bd492e33c8e0c89f
-SIZE (vino-2.13.5.tar.bz2) = 566620
+MD5 (vino-2.16.0.tar.bz2) = 89937e6d6cd8f658d037da0a7cfd3f4e
+SHA256 (vino-2.16.0.tar.bz2) = bcf62f1121fe704a019363467f9182e29931ee6779f3b65e996171f4caa11369
+SIZE (vino-2.16.0.tar.bz2) = 593224
diff --git a/net/vino/files/patch-server_libvncserver_rfb_rfbproto.h b/net/vino/files/patch-server_libvncserver_rfb_rfbproto.h
deleted file mode 100644
index 04d7fa7b588f..000000000000
--- a/net/vino/files/patch-server_libvncserver_rfb_rfbproto.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- server/libvncserver/rfb/rfbproto.h.orig Fri Jul 16 18:16:16 2004
-+++ server/libvncserver/rfb/rfbproto.h Fri Jul 16 18:16:39 2004
-@@ -60,7 +60,9 @@
- #include <rfb/rfbint.h>
- #else
- #include <config.h>
-+#ifdef HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- #endif
- #endif
- #include <rfb/keysym.h>
diff --git a/net/vino/files/patch-server_vino-fb.c b/net/vino/files/patch-server_vino-fb.c
deleted file mode 100644
index 56dbb89dcd07..000000000000
--- a/net/vino/files/patch-server_vino-fb.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- server/vino-fb.c.orig Mon Jul 12 06:22:08 2004
-+++ server/vino-fb.c Wed Jul 14 22:15:44 2004
-@@ -37,6 +37,7 @@
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/ipc.h>
- #include <sys/shm.h>
- #include <gdk/gdkx.h>
- #include <X11/Xlib.h>
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index 7138e41d395d..9070a7112028 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -10,12 +10,14 @@ share/locale/ar/LC_MESSAGES/vino.mo
share/locale/az/LC_MESSAGES/vino.mo
share/locale/bg/LC_MESSAGES/vino.mo
share/locale/bn/LC_MESSAGES/vino.mo
+share/locale/bn_IN/LC_MESSAGES/vino.mo
share/locale/bs/LC_MESSAGES/vino.mo
share/locale/ca/LC_MESSAGES/vino.mo
share/locale/cs/LC_MESSAGES/vino.mo
share/locale/cy/LC_MESSAGES/vino.mo
share/locale/da/LC_MESSAGES/vino.mo
share/locale/de/LC_MESSAGES/vino.mo
+share/locale/dz/LC_MESSAGES/vino.mo
share/locale/el/LC_MESSAGES/vino.mo
share/locale/en_CA/LC_MESSAGES/vino.mo
share/locale/en_GB/LC_MESSAGES/vino.mo
@@ -33,17 +35,19 @@ share/locale/hu/LC_MESSAGES/vino.mo
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/ko/LC_MESSAGES/vino.mo
share/locale/ku/LC_MESSAGES/vino.mo
share/locale/lt/LC_MESSAGES/vino.mo
+share/locale/lv/LC_MESSAGES/vino.mo
share/locale/mk/LC_MESSAGES/vino.mo
+share/locale/ml/LC_MESSAGES/vino.mo
share/locale/mn/LC_MESSAGES/vino.mo
share/locale/ms/LC_MESSAGES/vino.mo
share/locale/nb/LC_MESSAGES/vino.mo
share/locale/ne/LC_MESSAGES/vino.mo
share/locale/nl/LC_MESSAGES/vino.mo
share/locale/nn/LC_MESSAGES/vino.mo
-share/locale/no/LC_MESSAGES/vino.mo
share/locale/or/LC_MESSAGES/vino.mo
share/locale/pa/LC_MESSAGES/vino.mo
share/locale/pl/LC_MESSAGES/vino.mo
@@ -53,6 +57,7 @@ share/locale/ro/LC_MESSAGES/vino.mo
share/locale/ru/LC_MESSAGES/vino.mo
share/locale/rw/LC_MESSAGES/vino.mo
share/locale/sk/LC_MESSAGES/vino.mo
+share/locale/sl/LC_MESSAGES/vino.mo
share/locale/sq/LC_MESSAGES/vino.mo
share/locale/sr/LC_MESSAGES/vino.mo
share/locale/sr@Latn/LC_MESSAGES/vino.mo
@@ -66,7 +71,54 @@ share/locale/vi/LC_MESSAGES/vino.mo
share/locale/wa/LC_MESSAGES/vino.mo
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
@dirrm share/gnome/vino
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 9440aead96cc..79ff67ce1752 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= freetype2
-PORTVERSION= 2.1.10
-PORTREVISION= 5
+PORTVERSION= 2.2.1
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
@@ -24,7 +24,7 @@ COMMENT= A free and portable TrueType font rendering engine
USE_BZIP2= yes
USE_GMAKE= yes
MAKE_ENV= TOP=""
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GNOME= gnometarget pkgconfig
LIBTOOLFILES= builds/unix/configure
@@ -36,11 +36,11 @@ CFLAGS+= -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
.endif
.if defined(WITH_CJK)
-PATCH_SITES+= http://lwj-hinet.myweb.hinet.net/ \
+#PATCH_SITES+= http://lwj-hinet.myweb.hinet.net/ \
ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \
http://bsdchat.com/dist/firefly-cjk-patchset/
-PATCHFILES+= cjk-freetype-2.1.10-20051219.patch.gz
-PATCH_DIST_STRIP+= -p1
+#PATCHFILES+= cjk-freetype-2.1.10-20051219.patch.gz
+#PATCH_DIST_STRIP+= -p1
.endif
pre-everything::
@@ -60,6 +60,10 @@ pre-everything::
pre-patch:
@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
${WRKSRC}/builds/unix/install.mk
+.if !defined(WITHOUT_TTF_BYTECODE_ENABLED)
+ @${REINPLACE_CMD} -e '/#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER/s,/\* \(.*\) \*/,\1,; /#define TT_CONFIG_OPTION_UNPATENTED_HINTING/s,^\(.*\),/* \1 \*/,' \
+ ${WRKSRC}/include/freetype/config/ftoption.h
+.endif
post-configure:
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup)
diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo
index 627daaa44048..208832af0a19 100644
--- a/print/freetype2/distinfo
+++ b/print/freetype2/distinfo
@@ -1,6 +1,3 @@
-MD5 (freetype-2.1.10.tar.bz2) = a4012e7d1f6400df44a16743b11b8423
-SHA256 (freetype-2.1.10.tar.bz2) = fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53
-SIZE (freetype-2.1.10.tar.bz2) = 1037107
-MD5 (cjk-freetype-2.1.10-20051219.patch.gz) = dc8f11908c22f5c617c0fff73bd07a52
-SHA256 (cjk-freetype-2.1.10-20051219.patch.gz) = 7bc8d79d4a68dbb4fbc640f6befe3b0868ff0de8295522a316a6dc21ab07a9b0
-SIZE (cjk-freetype-2.1.10-20051219.patch.gz) = 1081
+MD5 (freetype-2.2.1.tar.bz2) = 5b2f827082c544392a7701f7423f0781
+SHA256 (freetype-2.2.1.tar.bz2) = 0e8eb40392752b306d3a3de21f9fa479d53c17bd774b8051771cb258e162e006
+SIZE (freetype-2.2.1.tar.bz2) = 1212258
diff --git a/print/freetype2/files/patch-aa b/print/freetype2/files/patch-aa
index 6db517ee1afa..87863d444bb2 100644
--- a/print/freetype2/files/patch-aa
+++ b/print/freetype2/files/patch-aa
@@ -1,15 +1,14 @@
---- builds/unix/detect.mk.orig Sun Jan 9 21:12:51 2005
-+++ builds/unix/detect.mk Sun Jan 9 21:13:42 2005
-@@ -78,10 +78,10 @@
- ifneq ($(have_mk),)
- # we are building FT2 not in the src tree
- $(BUILD_DIR)/unix-def.mk: $(TOP_DIR)/builds/unix/unix-def.in
-- $(TOP_DIR)/builds/unix/configure $(CFG)
-+# $(TOP_DIR)/builds/unix/configure $(CFG)
- else
- $(BUILD_DIR)/unix-def.mk: $(TOP_DIR)/builds/unix/unix-def.in
-- cd builds/unix; ./configure $(CFG)
-+# cd builds/unix; ./configure $(CFG)
+--- builds/unix/detect.mk.orig Tue Aug 22 17:53:59 2006
++++ builds/unix/detect.mk Tue Aug 22 17:54:09 2006
+@@ -78,9 +78,9 @@ ifeq ($(PLATFORM),unix)
+ ifdef must_configure
+ ifneq ($(have_Makefile),)
+ # we are building FT2 not in the src tree
+- $(TOP_DIR)/builds/unix/configure $(CFG)
++# $(TOP_DIR)/builds/unix/configure $(CFG)
+ else
+- cd builds/unix; ./configure $(CFG)
++# cd builds/unix; ./configure $(CFG)
+ endif
endif
- endif # test PLATFORM unix
diff --git a/print/freetype2/files/patch-builds::unix::freetype2.in b/print/freetype2/files/patch-builds::unix::freetype2.in
deleted file mode 100644
index 3edd50098026..000000000000
--- a/print/freetype2/files/patch-builds::unix::freetype2.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- builds/unix/freetype2.in.orig Wed Mar 2 20:22:23 2005
-+++ builds/unix/freetype2.in Wed Mar 2 20:22:53 2005
-@@ -8,4 +8,4 @@
- Version: @ft_version@
- Requires:
- Libs: -L${libdir} -lfreetype @LIBZ@
--Cflags: -I${includedir}/freetype2
-+Cflags: -I${includedir}/freetype2 -I${includedir}
diff --git a/print/freetype2/files/patch-src::base::ftsynth.c b/print/freetype2/files/patch-src::base::ftsynth.c
deleted file mode 100644
index 0a6a99e032d5..000000000000
--- a/print/freetype2/files/patch-src::base::ftsynth.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/base/ftsynth.c.orig Tue Dec 13 00:44:56 2005
-+++ src/base/ftsynth.c Tue Dec 13 00:45:05 2005
-@@ -123,7 +123,6 @@
- if ( !error )
- {
- slot->advance.x += xstr;
-- slot->advance.y += ystr;
-
- slot->metrics.width += xstr;
- slot->metrics.height += ystr;
diff --git a/print/freetype2/files/patch-src_pcf_pcfdrivr.c b/print/freetype2/files/patch-src_pcf_pcfdrivr.c
index a12810cc3324..01758d8a9091 100644
--- a/print/freetype2/files/patch-src_pcf_pcfdrivr.c
+++ b/print/freetype2/files/patch-src_pcf_pcfdrivr.c
@@ -1,6 +1,6 @@
---- src/pcf/pcfdrivr.c.orig Wed Jul 28 00:09:02 2004
-+++ src/pcf/pcfdrivr.c Tue Aug 22 21:39:43 2006
-@@ -203,19 +203,24 @@ THE SOFTWARE.
+--- src/pcf/pcfdrivr.c.orig 2006-02-17 07:40:36.000000000 +0100
++++ src/pcf/pcfdrivr.c
+@@ -203,19 +203,23 @@ THE SOFTWARE.
/* free properties */
{
@@ -13,26 +13,25 @@
+ if ( face->properties )
{
- prop = &face->properties[i];
-+ for ( i = 0; i < face->nprops; i++ )
++ for ( i = 0; i < face->nprops; i++ )
+ {
+ prop = &face->properties[i];
- FT_FREE( prop->name );
- if ( prop->isString )
-- FT_FREE( prop->value );
-- }
-+ if ( prop ) {
+- FT_FREE( prop->value.atom );
++ if ( prop ) {
+ FT_FREE( prop->name );
-+ if ( prop->isString )
-+ FT_FREE( prop->value.atom );
-+ }
-+ }
-
-+ }
++ if ( prop->isString )
++ FT_FREE( prop->value.atom );
++ }
++ }
+ }
+-
FT_FREE( face->properties );
}
-@@ -258,6 +263,8 @@ THE SOFTWARE.
+@@ -258,6 +262,8 @@ THE SOFTWARE.
FT_Error error2;
@@ -41,7 +40,7 @@
/* this didn't work, try gzip support! */
error2 = FT_Stream_OpenGzip( &face->gzip_stream, stream );
if ( FT_ERROR_BASE( error2 ) == FT_Err_Unimplemented_Feature )
-@@ -357,6 +364,7 @@ THE SOFTWARE.
+@@ -357,6 +363,7 @@ THE SOFTWARE.
Fail:
FT_TRACE2(( "[not a valid PCF file]\n" ));
diff --git a/print/freetype2/files/patch-src_pcf_pcfread.c b/print/freetype2/files/patch-src_pcf_pcfread.c
index a5b3f45aad6e..c9117f2062cc 100644
--- a/print/freetype2/files/patch-src_pcf_pcfread.c
+++ b/print/freetype2/files/patch-src_pcf_pcfread.c
@@ -1,5 +1,5 @@
---- src/pcf/pcfread.c.orig Sun May 1 11:38:55 2005
-+++ src/pcf/pcfread.c Wed Aug 23 00:07:33 2006
+--- src/pcf/pcfread.c.orig 2006-01-23 17:35:18.000000000 +0100
++++ src/pcf/pcfread.c
@@ -102,7 +102,8 @@ THE SOFTWARE.
return PCF_Err_Cannot_Open_Resource;
@@ -345,15 +345,7 @@
return error;
}
-@@ -571,7 +662,6 @@ THE SOFTWARE.
- FT_Long bitmapSizes[GLYPHPADOPTIONS];
- FT_ULong format, size;
- int nbitmaps, i, sizebitmaps = 0;
-- char* bitmaps;
-
-
- error = pcf_seek_to_table_type( stream,
-@@ -598,14 +688,16 @@ THE SOFTWARE.
+@@ -597,14 +688,16 @@ THE SOFTWARE.
if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) )
return PCF_Err_Invalid_File_Format;
@@ -372,7 +364,7 @@
for ( i = 0; i < nbitmaps; i++ )
{
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
-@@ -613,7 +705,7 @@ THE SOFTWARE.
+@@ -612,7 +705,7 @@ THE SOFTWARE.
else
(void)FT_READ_LONG_LE( offsets[i] );
@@ -381,7 +373,7 @@
i, offsets[i], offsets[i] ));
}
if ( error )
-@@ -641,16 +733,22 @@ THE SOFTWARE.
+@@ -640,15 +733,22 @@ THE SOFTWARE.
FT_UNUSED( sizebitmaps ); /* only used for debugging */
for ( i = 0; i < nbitmaps; i++ )
@@ -389,10 +381,10 @@
+ {
+ /* rough estimate */
+ if ( ( offsets[i] < 0 ) ||
-+ ( (FT_ULong)offsets[i] > size ) )
++ ( (FT_ULong)offsets[i] > size ) )
+ {
+ FT_ERROR(( "pcf_get_bitmaps:"));
-+ FT_ERROR(( " invalid offset to bitmap data of glyph %d\n", i ));
++ FT_ERROR(( " invalid offset to bitmap data of glyph %d\n", i ));
+ }
+ else
+ face->metrics[i].bits = stream->pos + offsets[i];
@@ -404,12 +396,12 @@
- return error;
-
Bail:
- FT_FREE ( offsets );
-- FT_FREE ( bitmaps );
+- FT_FREE ( offsets );
++ FT_FREE( offsets );
return error;
}
-@@ -736,7 +834,7 @@ THE SOFTWARE.
+@@ -734,7 +834,7 @@ THE SOFTWARE.
tmpEncoding[j].glyph = (FT_Short)encodingOffset;
@@ -418,7 +410,7 @@
tmpEncoding[j].enc, tmpEncoding[j].enc,
tmpEncoding[j].glyph ));
-@@ -830,7 +928,8 @@ THE SOFTWARE.
+@@ -828,7 +928,8 @@ THE SOFTWARE.
if ( error )
goto Bail;
@@ -428,7 +420,7 @@
if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) &&
!PCF_FORMAT_MATCH( format, PCF_ACCEL_W_INKBOUNDS ) )
-@@ -878,7 +977,6 @@ THE SOFTWARE.
+@@ -876,7 +977,6 @@ THE SOFTWARE.
accel->ink_minbounds = accel->minbounds; /* I'm not sure about this */
accel->ink_maxbounds = accel->maxbounds;
}
@@ -436,7 +428,7 @@
Bail:
return error;
-@@ -1084,11 +1182,12 @@ THE SOFTWARE.
+@@ -1082,11 +1182,12 @@ THE SOFTWARE.
else
root->family_name = NULL;
@@ -452,7 +444,7 @@
*/
root->num_glyphs = face->nmetrics + 1;
-@@ -1170,7 +1269,7 @@ THE SOFTWARE.
+@@ -1171,7 +1272,7 @@ THE SOFTWARE.
Exit:
if ( error )
{
diff --git a/print/freetype2/files/patch-src_sfnt_sfdriver.c b/print/freetype2/files/patch-src_sfnt_sfdriver.c
deleted file mode 100644
index 0d877ff7b8e3..000000000000
--- a/print/freetype2/files/patch-src_sfnt_sfdriver.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/sfnt/sfdriver.c.orig Wed Aug 3 18:46:34 2005
-+++ src/sfnt/sfdriver.c Wed Aug 3 18:47:24 2005
-@@ -367,8 +367,13 @@
- /* see `ttsbit.h' and `sfnt.h' */
- tt_face_set_sbit_strike,
- tt_face_load_sbit_strikes,
-- 0 /* tt_find_sbit_image */,
-- 0 /* tt_load_sbit_metrics */,
-+#ifdef FT_OPTIMIZE_MEMORY
-+ 0,
-+ 0,
-+#else
-+ tt_find_sbit_image,
-+ tt_load_sbit_metrics,
-+#endif
- tt_face_load_sbit_image,
- tt_face_free_sbit_strikes,
-
diff --git a/print/freetype2/pkg-descr b/print/freetype2/pkg-descr
index 302f713214b8..538d9a8f8fa2 100644
--- a/print/freetype2/pkg-descr
+++ b/print/freetype2/pkg-descr
@@ -1,9 +1,10 @@
-The FreeType engine is a free and portable TrueType font rendering
-engine. It has been developed to provide TT support to a great
-variety of platforms and environments.
+This includes some tools that are in FreeType 1's contrib directory.
-Notice that FreeType is a *library*. It is *not* a font server
-for your preferred environment, even though it was designed to
-allow the design of many font servers.
+ttf2pfb: Converting TrueType fonts to the Postscript Type 1 format.
+ttf2pk: A simple conversion tool to bring TrueType quality to the
+ TeX world.
+ttf2bdf: Produce bitmapped fonts from TrueType files for your X11
+ applications.
+ttfbanner: make posters using a TrueType font
-WWW: http://www.freetype.org/
+WWW: http://freetype.sourceforge.net/freetype1/projects.html
diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist
index bffaedf32e40..1be8c735027d 100644
--- a/print/freetype2/pkg-plist
+++ b/print/freetype2/pkg-plist
@@ -1,25 +1,19 @@
bin/freetype-config
-include/freetype2/freetype/cache/ftccache.h
-include/freetype2/freetype/cache/ftccmap.h
-include/freetype2/freetype/cache/ftcglyph.h
-include/freetype2/freetype/cache/ftcimage.h
-include/freetype2/freetype/cache/ftcmanag.h
-include/freetype2/freetype/cache/ftcmru.h
-include/freetype2/freetype/cache/ftcsbits.h
include/freetype2/freetype/config/ftconfig.h
include/freetype2/freetype/config/ftheader.h
include/freetype2/freetype/config/ftmodule.h
include/freetype2/freetype/config/ftoption.h
include/freetype2/freetype/config/ftstdlib.h
include/freetype2/freetype/freetype.h
-include/freetype2/freetype/ftbitmap.h
include/freetype2/freetype/ftbbox.h
include/freetype2/freetype/ftbdf.h
+include/freetype2/freetype/ftbitmap.h
include/freetype2/freetype/ftcache.h
include/freetype2/freetype/ftchapters.h
include/freetype2/freetype/fterrdef.h
include/freetype2/freetype/fterrors.h
include/freetype2/freetype/ftglyph.h
+include/freetype2/freetype/ftgxval.h
include/freetype2/freetype/ftgzip.h
include/freetype2/freetype/ftimage.h
include/freetype2/freetype/ftincrem.h
@@ -37,44 +31,11 @@ include/freetype2/freetype/ftsizes.h
include/freetype2/freetype/ftsnames.h
include/freetype2/freetype/ftstroke.h
include/freetype2/freetype/ftsynth.h
-include/freetype2/freetype/ftsysio.h
-include/freetype2/freetype/ftsysmem.h
include/freetype2/freetype/ftsystem.h
include/freetype2/freetype/fttrigon.h
include/freetype2/freetype/fttypes.h
include/freetype2/freetype/ftwinfnt.h
include/freetype2/freetype/ftxf86.h
-include/freetype2/freetype/internal/autohint.h
-include/freetype2/freetype/internal/ftcalc.h
-include/freetype2/freetype/internal/ftdebug.h
-include/freetype2/freetype/internal/ftdriver.h
-include/freetype2/freetype/internal/ftgloadr.h
-include/freetype2/freetype/internal/ftmemory.h
-include/freetype2/freetype/internal/ftobjs.h
-include/freetype2/freetype/internal/ftrfork.h
-include/freetype2/freetype/internal/ftserv.h
-include/freetype2/freetype/internal/ftstream.h
-include/freetype2/freetype/internal/fttrace.h
-include/freetype2/freetype/internal/ftvalid.h
-include/freetype2/freetype/internal/internal.h
-include/freetype2/freetype/internal/pcftypes.h
-include/freetype2/freetype/internal/psaux.h
-include/freetype2/freetype/internal/pshints.h
-include/freetype2/freetype/internal/sfnt.h
-include/freetype2/freetype/internal/svbdf.h
-include/freetype2/freetype/internal/svgldict.h
-include/freetype2/freetype/internal/svmm.h
-include/freetype2/freetype/internal/svotval.h
-include/freetype2/freetype/internal/svpfr.h
-include/freetype2/freetype/internal/svpostnm.h
-include/freetype2/freetype/internal/svpscmap.h
-include/freetype2/freetype/internal/svpsinfo.h
-include/freetype2/freetype/internal/svsfnt.h
-include/freetype2/freetype/internal/svttcmap.h
-include/freetype2/freetype/internal/svwinfnt.h
-include/freetype2/freetype/internal/svxf86nm.h
-include/freetype2/freetype/internal/t1types.h
-include/freetype2/freetype/internal/tttypes.h
include/freetype2/freetype/t1tables.h
include/freetype2/freetype/ttnameid.h
include/freetype2/freetype/tttables.h
@@ -87,8 +48,6 @@ lib/libfreetype.so
lib/libfreetype.so.9
libdata/pkgconfig/freetype2.pc
share/aclocal/freetype2.m4
-@dirrm include/freetype2/freetype/internal
@dirrm include/freetype2/freetype/config
-@dirrm include/freetype2/freetype/cache
@dirrm include/freetype2/freetype
@dirrm include/freetype2
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 8c0614d8d86d..f13669b13bc0 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -3,12 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/print/libgnomeprint/Makefile,v 1.54 2005/09/26 21:07:03 marcus Exp $
+# $MCom: ports/print/libgnomeprint/Makefile,v 1.57 2006/09/10 00:51:12 mezz Exp $
#
PORTNAME= libgnomeprint
PORTVERSION= 2.12.1
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
@@ -29,8 +29,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack gnomehier glib20 pango libxml2 \
libartlgpl2 ltverhack
USE_GETTEXT= yes
-USE_X_PREFIX= yes
-INSTALLS_SHLIB= yes
+USE_XLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 6dab88cda124..9fef39ee6bca 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -157,14 +157,6 @@ share/locale/wa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/xh/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
@dirrm share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled
@dirrm share/gnome/libgnomeprint/%%VERSION%%/printers
@dirrm share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled
@@ -181,3 +173,49 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
@dirrm include/libgnomeprint-%%LIBVERSION%%
@dirrm etc/gnome/libgnomeprint-2.0/fonts
@dirrm etc/gnome/libgnomeprint-2.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index 3a17417417c0..b6d29bb0a216 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -3,14 +3,13 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/security/gnome-keyring-manager/Makefile,v 1.24 2006/10/02 05:07:37 bland Exp $
#
PORTNAME= gnome-keyring-manager
-PORTVERSION= 2.14.0
+PORTVERSION= 2.16.0
CATEGORIES= security gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-keyring-manager/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME= gnome-keyring-manager-${PORTVERSION}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -18,14 +17,13 @@ COMMENT= GNOME keyring manager
LIB_DEPENDS= gnome-keyring:${PORTSDIR}/security/gnome-keyring
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui gnomedocutils
-CONFIGURE_ARGS= --with-help-dir=${PREFIX}/share/gnome/help
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/gnome-keyring-manager/distinfo b/security/gnome-keyring-manager/distinfo
index f453addc7767..7232f84c4134 100644
--- a/security/gnome-keyring-manager/distinfo
+++ b/security/gnome-keyring-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-manager-2.14.0.tar.bz2) = d4e38c7b7da99885fa898917e10d8aeb
-SHA256 (gnome2/gnome-keyring-manager-2.14.0.tar.bz2) = f1182d7e560e485a9e3a9d7e983cbb09849caad21010d7c801c68ce19822b030
-SIZE (gnome2/gnome-keyring-manager-2.14.0.tar.bz2) = 391387
+MD5 (gnome2/gnome-keyring-manager-2.16.0.tar.bz2) = d63bfa5e9cfe334694438a74c157344c
+SHA256 (gnome2/gnome-keyring-manager-2.16.0.tar.bz2) = 23f0449af7cba89f4ae26c8e67f1d09bc45389f9dcd7349d2e6540620571051c
+SIZE (gnome2/gnome-keyring-manager-2.16.0.tar.bz2) = 454066
diff --git a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-acl-display.c b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-acl-display.c
deleted file mode 100644
index 3df8081babdb..000000000000
--- a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-acl-display.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/gnome-keyring-manager-acl-display.c.orig Sat Jul 2 02:12:49 2005
-+++ src/gnome-keyring-manager-acl-display.c Sat Jul 2 02:16:31 2005
-@@ -393,13 +393,15 @@ gkm_acl_display_set_acl (GKMAclDisplay *
- GnomeKeyringAccessType at;
- GtkTreeIter iter;
- char *name, *path;
-+ const char *app_path;
-
- ac = (GnomeKeyringAccessControl*) tmp->data;
- name = gnome_keyring_item_ac_get_display_name (ac);
- path = gnome_keyring_item_ac_get_path_name (ac);
-+ app_path = gkm_get_application_path ();
-
- /* We don't want to include ourself in the list. */
-- if (g_str_equal (path, gkm_get_application_path ()))
-+ if (app_path && g_str_equal (path, app_path))
- {
- self->priv->gkm_ac = gnome_keyring_access_control_copy (ac);
- }
diff --git a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-util.c b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-util.c
deleted file mode 100644
index 3291d28419ec..000000000000
--- a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-util.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/gnome-keyring-manager-util.c.orig Wed May 18 16:41:35 2005
-+++ src/gnome-keyring-manager-util.c Sat Jul 2 02:12:38 2005
-@@ -354,6 +354,10 @@ gkm_get_application_path (void)
- {
- path = g_file_read_link ("/proc/self/exe", NULL);
- }
-+#elif defined(__FreeBSD__)
-+ {
-+ path = g_file_read_link ("/proc/curproc/file", NULL);
-+ }
- #endif
- }
-
diff --git a/security/gnome-keyring-manager/pkg-plist b/security/gnome-keyring-manager/pkg-plist
index feae65637b2d..d81312492e16 100644
--- a/security/gnome-keyring-manager/pkg-plist
+++ b/security/gnome-keyring-manager/pkg-plist
@@ -9,22 +9,29 @@ share/gnome/gnome-keyring-manager/stock_new-keyring.png
share/gnome/help/gnome-keyring-manager/C/gnome-keyring-manager.xml
share/gnome/help/gnome-keyring-manager/C/legal.xml
share/gnome/help/gnome-keyring-manager/es/gnome-keyring-manager.xml
+share/gnome/help/gnome-keyring-manager/fr/gnome-keyring-manager.xml
+share/gnome/help/gnome-keyring-manager/sv/gnome-keyring-manager.xml
share/gnome/help/gnome-keyring-manager/uk/gnome-keyring-manager.xml
share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-C.omf
share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-es.omf
+share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-fr.omf
+share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-sv.omf
share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-uk.omf
share/locale/bg/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/bn/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/ca/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/cs/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/cy/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/da/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/de/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/dz/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/el/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/en_CA/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/en_GB/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/es/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/et/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/eu/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/fa/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/fi/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/fr/LC_MESSAGES/gnome-keyring-manager.mo
@@ -32,14 +39,23 @@ share/locale/gl/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/gu/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/hi/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/hu/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/id/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/it/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/ja/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/ka/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/ko/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/lt/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/lv/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/mg/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/mk/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/ml/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/mn/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/mr/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/nb/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/ne/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/nl/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/no/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/nn/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/or/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/pa/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/pl/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/pt/LC_MESSAGES/gnome-keyring-manager.mo
@@ -48,10 +64,12 @@ share/locale/ro/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/ru/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/rw/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/sk/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/sl/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/sq/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/sr/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/sv/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/ta/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/th/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/tr/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/uk/LC_MESSAGES/gnome-keyring-manager.mo
@@ -59,11 +77,57 @@ share/locale/vi/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/zh_CN/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/zh_HK/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
@dirrm share/gnome/omf/gnome-keyring-manager
@dirrm share/gnome/help/gnome-keyring-manager/uk
+@dirrm share/gnome/help/gnome-keyring-manager/sv
+@dirrm share/gnome/help/gnome-keyring-manager/fr
@dirrm share/gnome/help/gnome-keyring-manager/es
@dirrm share/gnome/help/gnome-keyring-manager/C
@dirrm share/gnome/help/gnome-keyring-manager
@dirrm share/gnome/gnome-keyring-manager
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 7f6279889303..8165fcb447cd 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -6,23 +6,24 @@
#
PORTNAME= gnome-keyring
-PORTVERSION= 0.4.9
+PORTVERSION= 0.6.0
CATEGORIES= security gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-keyring/0.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-keyring-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A program that keeps passwords and other secrets
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gtk20
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
+CONFIGURE_ARGS= --disable-gtk-doc \
+ --with-html-dir=${GNOME_HTML_DIR}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 95b7192943f4..cc9681ae150a 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-0.4.9.tar.bz2) = 9a90820acf11a66e4c3dd9e163231071
-SHA256 (gnome2/gnome-keyring-0.4.9.tar.bz2) = 6e287d88c3a4ce8c64bb6b0de151c210ecb20e487d5e1c757ef0ad941a37d393
-SIZE (gnome2/gnome-keyring-0.4.9.tar.bz2) = 396162
+MD5 (gnome2/gnome-keyring-0.6.0.tar.bz2) = 1e3a3a12b19fc5ebe95363658c2256d8
+SHA256 (gnome2/gnome-keyring-0.6.0.tar.bz2) = 649f2a0d5298b896781d0ac563b8ea1be7f3fe07fd17ea43b0ec0562be47769f
+SIZE (gnome2/gnome-keyring-0.6.0.tar.bz2) = 476280
diff --git a/security/gnome-keyring/files/patch-gnome-keyring-daemon-io.c b/security/gnome-keyring/files/patch-gnome-keyring-daemon-io.c
deleted file mode 100644
index 9c0e02eb14ff..000000000000
--- a/security/gnome-keyring/files/patch-gnome-keyring-daemon-io.c
+++ /dev/null
@@ -1,58 +0,0 @@
---- gnome-keyring-daemon-io.c.orig Wed May 4 03:17:18 2005
-+++ gnome-keyring-daemon-io.c Sat Jul 16 21:46:13 2005
-@@ -100,14 +100,17 @@ read_unix_socket_credentials (int fd,
- char buf;
-
- #ifdef HAVE_CMSGCRED
-- char cmsgmem[CMSG_SPACE (sizeof (struct cmsgcred))];
-- struct cmsghdr *cmsg = (struct cmsghdr *) cmsgmem;
-+ struct cmsgcred *cred;
-+ union {
-+ struct cmsghdr hdr;
-+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
-+ } cmsg;
- #endif
-
- *pid = 0;
- *uid = 0;
-
--#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED)
-+#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED) && !defined(__FreeBSD__)
- /* Set the socket to receive credentials on the next message */
- {
- int on = 1;
-@@ -126,9 +129,9 @@ read_unix_socket_credentials (int fd,
- msg.msg_iovlen = 1;
-
- #ifdef HAVE_CMSGCRED
-- memset (cmsgmem, 0, sizeof (cmsgmem));
-- msg.msg_control = cmsgmem;
-- msg.msg_controllen = sizeof (cmsgmem);
-+ memset (&cmsg, 0, sizeof (cmsg));
-+ msg.msg_control = (caddr_t) &cmsg;
-+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
- #endif
-
- again:
-@@ -147,7 +150,8 @@ read_unix_socket_credentials (int fd,
- }
-
- #ifdef HAVE_CMSGCRED
-- if (cmsg->cmsg_len < sizeof (cmsgmem) || cmsg->cmsg_type != SCM_CREDS) {
-+ if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred)) ||
-+ cmsg.hdr.cmsg_type != SCM_CREDS) {
- g_warning ("Message from recvmsg() was not SCM_CREDS\n");
- return FALSE;
- }
-@@ -168,10 +172,7 @@ read_unix_socket_credentials (int fd,
- return FALSE;
- }
- #elif defined(HAVE_CMSGCRED)
-- struct cmsgcred *cred;
--
-- cred = (struct cmsgcred *) CMSG_DATA (cmsg);
--
-+ cred = (struct cmsgcred *) CMSG_DATA (&cmsg);
- *pid = cred->cmcred_pid;
- *uid = cred->cmcred_euid;
- #else /* !SO_PEERCRED && !HAVE_CMSGCRED */
diff --git a/security/gnome-keyring/files/patch-gnome-keyring-daemon.c b/security/gnome-keyring/files/patch-gnome-keyring-daemon.c
deleted file mode 100644
index 293df59b976f..000000000000
--- a/security/gnome-keyring/files/patch-gnome-keyring-daemon.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- gnome-keyring-daemon.c.orig Tue Jul 20 22:41:27 2004
-+++ gnome-keyring-daemon.c Tue Jul 20 22:43:03 2004
-@@ -121,7 +121,7 @@
- int i;
-
- got_random = FALSE;
--#ifdef __linux__
-+#if defined(__linux__) || defined(__FreeBSD__)
- {
- int fd;
-
-@@ -352,6 +352,22 @@
- app_ref->pathname[len] = 0;
- }
-
-+ }
-+#elif defined(__FreeBSD__)
-+ {
-+ char buffer[1024];
-+ int len;
-+ char *path;
-+
-+ path = g_strdup_printf ("/proc/%d/file", pid);
-+ len = readlink (path, buffer, sizeof (buffer));
-+ g_free (path);
-+
-+ if (len > 0) {
-+ app_ref->pathname = g_malloc (len + 1);
-+ memcpy (app_ref->pathname, buffer, len);
-+ app_ref->pathname[len] = 0;
-+ }
- }
- #endif
-
diff --git a/security/gnome-keyring/files/patch-gnome-keyring.c b/security/gnome-keyring/files/patch-gnome-keyring.c
index 728352a8b013..27a981e6c083 100644
--- a/security/gnome-keyring/files/patch-gnome-keyring.c
+++ b/security/gnome-keyring/files/patch-gnome-keyring.c
@@ -1,92 +1,30 @@
---- gnome-keyring.c.orig Fri May 27 03:54:22 2005
-+++ gnome-keyring.c Sat Jul 16 21:49:24 2005
-@@ -36,6 +36,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <sys/uio.h>
- #include <sys/un.h>
- #include <stdarg.h>
-
-@@ -253,11 +254,39 @@ write_credentials_byte_sync (int socket)
- {
- char buf;
- int bytes_written;
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+ union {
-+ struct cmsghdr hdr;
-+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
-+ } cmsg;
-+ struct iovec iov;
-+ struct msghdr msg;
-+#endif
-+
-+ buf = 0;
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+ iov.iov_base = &buf;
-+ iov.iov_len = 1;
-+
-+ 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));
+--- gnome-keyring.c.orig Mon Apr 24 06:21:29 2006
++++ gnome-keyring.c Mon Jun 12 14:24:47 2006
+@@ -275,9 +275,9 @@ write_credentials_byte_sync (int socket)
+ msg.msg_control = (caddr_t) &cmsg;
+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+ memset (&cmsg, 0, sizeof (cmsg));
+- cmsg->cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
+- cmsg->cmsg_level = SOL_SOCKET;
+- cmsg->cmsg_type = SCM_CREDS;
+ cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
+ cmsg.hdr.cmsg_level = SOL_SOCKET;
+ cmsg.hdr.cmsg_type = SCM_CREDS;
-+#endif
+ #endif
again:
+@@ -324,10 +324,10 @@ write_credentials_byte (GnomeKeyringOper
-- buf = 0;
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+ bytes_written = sendmsg (socket, &msg, 0);
-+#else
- bytes_written = write (socket, &buf, 1);
-+#endif
-
- if (bytes_written < 0 && errno == EINTR)
- goto again;
-@@ -275,11 +304,39 @@ write_credentials_byte (GnomeKeyringOper
- {
- char buf;
- int bytes_written;
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+ union {
-+ struct cmsghdr hdr;
-+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
-+ } cmsg;
-+ struct iovec iov;
-+ struct msghdr msg;
-+#endif
-+
-+ buf = 0;
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+ iov.iov_base = &buf;
-+ iov.iov_len = 1;
-+
-+ 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));
+ msg.msg_control = (caddr_t) &cmsg;
+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+- memset (cmsg, 0, sizeof (cmsg));
+- cmsg->cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
+- cmsg->cmsg_level = SOL_SOCKET;
+- cmsg->cmsg_type = SCM_CREDS;
+ 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;
-+#endif
+ #endif
again:
-
-- buf = 0;
-+#if defined(HAVE_CMSGCRED) && (!defined(LOCAL_CREDS) || defined(__FreeBSD__))
-+ bytes_written = sendmsg (op->socket, &msg, 0);
-+#else
- bytes_written = write (op->socket, &buf, 1);
-+#endif
-
- if (bytes_written < 0 && errno == EINTR)
- goto again;
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index 38a1d87e863f..470fb7c669e8 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -5,16 +5,29 @@ lib/libgnome-keyring.so
lib/libgnome-keyring.so.0
libdata/pkgconfig/gnome-keyring-1.pc
libexec/gnome-keyring-ask
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring.html
+%%DOCSDIR%%/gnome-keyring.devhelp
+%%DOCSDIR%%/gnome-keyring.devhelp2
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
share/locale/ar/LC_MESSAGES/gnome-keyring.mo
share/locale/az/LC_MESSAGES/gnome-keyring.mo
share/locale/bg/LC_MESSAGES/gnome-keyring.mo
share/locale/bn/LC_MESSAGES/gnome-keyring.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-keyring.mo
share/locale/bs/LC_MESSAGES/gnome-keyring.mo
share/locale/ca/LC_MESSAGES/gnome-keyring.mo
share/locale/cs/LC_MESSAGES/gnome-keyring.mo
share/locale/cy/LC_MESSAGES/gnome-keyring.mo
share/locale/da/LC_MESSAGES/gnome-keyring.mo
share/locale/de/LC_MESSAGES/gnome-keyring.mo
+share/locale/dz/LC_MESSAGES/gnome-keyring.mo
share/locale/el/LC_MESSAGES/gnome-keyring.mo
share/locale/en_CA/LC_MESSAGES/gnome-keyring.mo
share/locale/en_GB/LC_MESSAGES/gnome-keyring.mo
@@ -25,20 +38,28 @@ share/locale/fa/LC_MESSAGES/gnome-keyring.mo
share/locale/fi/LC_MESSAGES/gnome-keyring.mo
share/locale/fr/LC_MESSAGES/gnome-keyring.mo
share/locale/gl/LC_MESSAGES/gnome-keyring.mo
+share/locale/gu/LC_MESSAGES/gnome-keyring.mo
+share/locale/hi/LC_MESSAGES/gnome-keyring.mo
share/locale/hr/LC_MESSAGES/gnome-keyring.mo
share/locale/hu/LC_MESSAGES/gnome-keyring.mo
share/locale/id/LC_MESSAGES/gnome-keyring.mo
share/locale/is/LC_MESSAGES/gnome-keyring.mo
share/locale/it/LC_MESSAGES/gnome-keyring.mo
share/locale/ja/LC_MESSAGES/gnome-keyring.mo
+share/locale/ka/LC_MESSAGES/gnome-keyring.mo
share/locale/ko/LC_MESSAGES/gnome-keyring.mo
share/locale/lt/LC_MESSAGES/gnome-keyring.mo
+share/locale/lv/LC_MESSAGES/gnome-keyring.mo
+share/locale/mg/LC_MESSAGES/gnome-keyring.mo
+share/locale/mk/LC_MESSAGES/gnome-keyring.mo
+share/locale/ml/LC_MESSAGES/gnome-keyring.mo
share/locale/mn/LC_MESSAGES/gnome-keyring.mo
+share/locale/mr/LC_MESSAGES/gnome-keyring.mo
share/locale/ms/LC_MESSAGES/gnome-keyring.mo
share/locale/nb/LC_MESSAGES/gnome-keyring.mo
share/locale/ne/LC_MESSAGES/gnome-keyring.mo
share/locale/nl/LC_MESSAGES/gnome-keyring.mo
-share/locale/no/LC_MESSAGES/gnome-keyring.mo
+share/locale/or/LC_MESSAGES/gnome-keyring.mo
share/locale/pa/LC_MESSAGES/gnome-keyring.mo
share/locale/pl/LC_MESSAGES/gnome-keyring.mo
share/locale/pt/LC_MESSAGES/gnome-keyring.mo
@@ -47,6 +68,7 @@ share/locale/ro/LC_MESSAGES/gnome-keyring.mo
share/locale/ru/LC_MESSAGES/gnome-keyring.mo
share/locale/rw/LC_MESSAGES/gnome-keyring.mo
share/locale/sk/LC_MESSAGES/gnome-keyring.mo
+share/locale/sl/LC_MESSAGES/gnome-keyring.mo
share/locale/sq/LC_MESSAGES/gnome-keyring.mo
share/locale/sr/LC_MESSAGES/gnome-keyring.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-keyring.mo
@@ -59,6 +81,51 @@ share/locale/xh/LC_MESSAGES/gnome-keyring.mo
share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
+@dirrm %%DOCSDIR%%
+@dirrm include/gnome-keyring-1
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
-@dirrm include/gnome-keyring-1
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 21b6c917854d..7c1a2d3d45bd 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.50 2006/04/24 07:23:03 marcus Exp $
+# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.56 2006/09/05 00:53:22 ahze Exp $
#
PORTNAME= gconf-editor
-PORTVERSION= 2.14.0
-PORTREVISION= 1
+PORTVERSION= 2.16.0
PORTEPOCH= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -20,11 +19,11 @@ COMMENT= A gconf database editor for the GNOME 2 environment
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui
+USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui gnomedocutils
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index 1ced8c304901..7b6a548e0c3d 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconf-editor-2.14.0.tar.bz2) = eb8b979464f6e383e5a27b57ee4e8382
-SHA256 (gnome2/gconf-editor-2.14.0.tar.bz2) = 974e1ba2c6bb650ee638a80e81174582123d7bfbe14cccf613542dd103e2b554
-SIZE (gnome2/gconf-editor-2.14.0.tar.bz2) = 541099
+MD5 (gnome2/gconf-editor-2.16.0.tar.bz2) = e52b3177ef6ebd1fcf2c84acbe90a663
+SHA256 (gnome2/gconf-editor-2.16.0.tar.bz2) = efee1e2e65e280abe30b94b20b59d24d2c71e55e5ad26cb3041966a32b436786
+SIZE (gnome2/gconf-editor-2.16.0.tar.bz2) = 528644
diff --git a/sysutils/gconf-editor/files/patch-src_gconf-editor-window.c b/sysutils/gconf-editor/files/patch-src_gconf-editor-window.c
deleted file mode 100644
index 7ff0eb544269..000000000000
--- a/sysutils/gconf-editor/files/patch-src_gconf-editor-window.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gconf-editor-window.c.orig Mon Apr 24 03:19:49 2006
-+++ src/gconf-editor-window.c Mon Apr 24 03:20:00 2006
-@@ -950,7 +950,7 @@ gconf_editor_gconf_value_changed (GConfC
- gconf_add_recent_key (window, key);
- }
-
-- g_free (value);
-+ gconf_value_free (value);
- g_free (key);
- gtk_tree_path_free (path);
- }
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index 757d163f7474..a2ee10cc1863 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -1,25 +1,9 @@
bin/gconf-editor
share/gnome/applications/gconf-editor.desktop
-share/gnome/help/gconf-editor/C/figures/entry-blank.png
-share/gnome/help/gconf-editor/C/figures/entry-bool.png
-share/gnome/help/gconf-editor/C/figures/entry-list.png
-share/gnome/help/gconf-editor/C/figures/entry-number.png
-share/gnome/help/gconf-editor/C/figures/entry-schema.png
-share/gnome/help/gconf-editor/C/figures/entry-string.png
share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png
share/gnome/help/gconf-editor/C/gconf-editor.xml
share/gnome/help/gconf-editor/C/legal.xml
-share/gnome/help/gconf-editor/uk/figures/entry-blank.png
-share/gnome/help/gconf-editor/uk/figures/entry-bool.png
-share/gnome/help/gconf-editor/uk/figures/entry-list.png
-share/gnome/help/gconf-editor/uk/figures/entry-number.png
-share/gnome/help/gconf-editor/uk/figures/entry-schema.png
-share/gnome/help/gconf-editor/uk/figures/entry-string.png
-share/gnome/help/gconf-editor/uk/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/uk/gconf-editor.xml
-share/gnome/help/gconf-editor/uk/legal.xml
share/gnome/omf/gconf-editor/gconf-editor-C.omf
-share/gnome/omf/gconf-editor/gconf-editor-uk.omf
share/gnome/pixmaps/gconf-editor/entry-blank.png
share/gnome/pixmaps/gconf-editor/entry-bool.png
share/gnome/pixmaps/gconf-editor/entry-list.png
@@ -35,6 +19,7 @@ share/locale/az/LC_MESSAGES/gconf-editor.mo
share/locale/be/LC_MESSAGES/gconf-editor.mo
share/locale/bg/LC_MESSAGES/gconf-editor.mo
share/locale/bn/LC_MESSAGES/gconf-editor.mo
+share/locale/bn_IN/LC_MESSAGES/gconf-editor.mo
share/locale/br/LC_MESSAGES/gconf-editor.mo
share/locale/bs/LC_MESSAGES/gconf-editor.mo
share/locale/ca/LC_MESSAGES/gconf-editor.mo
@@ -42,6 +27,7 @@ share/locale/cs/LC_MESSAGES/gconf-editor.mo
share/locale/cy/LC_MESSAGES/gconf-editor.mo
share/locale/da/LC_MESSAGES/gconf-editor.mo
share/locale/de/LC_MESSAGES/gconf-editor.mo
+share/locale/dz/LC_MESSAGES/gconf-editor.mo
share/locale/el/LC_MESSAGES/gconf-editor.mo
share/locale/en_CA/LC_MESSAGES/gconf-editor.mo
share/locale/en_GB/LC_MESSAGES/gconf-editor.mo
@@ -61,12 +47,14 @@ share/locale/hu/LC_MESSAGES/gconf-editor.mo
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/kn/LC_MESSAGES/gconf-editor.mo
share/locale/ko/LC_MESSAGES/gconf-editor.mo
share/locale/ku/LC_MESSAGES/gconf-editor.mo
share/locale/li/LC_MESSAGES/gconf-editor.mo
share/locale/lt/LC_MESSAGES/gconf-editor.mo
share/locale/lv/LC_MESSAGES/gconf-editor.mo
+share/locale/mg/LC_MESSAGES/gconf-editor.mo
share/locale/mk/LC_MESSAGES/gconf-editor.mo
share/locale/ml/LC_MESSAGES/gconf-editor.mo
share/locale/mn/LC_MESSAGES/gconf-editor.mo
@@ -75,7 +63,6 @@ share/locale/ms/LC_MESSAGES/gconf-editor.mo
share/locale/nb/LC_MESSAGES/gconf-editor.mo
share/locale/ne/LC_MESSAGES/gconf-editor.mo
share/locale/nl/LC_MESSAGES/gconf-editor.mo
-share/locale/no/LC_MESSAGES/gconf-editor.mo
share/locale/or/LC_MESSAGES/gconf-editor.mo
share/locale/pa/LC_MESSAGES/gconf-editor.mo
share/locale/pl/LC_MESSAGES/gconf-editor.mo
@@ -101,26 +88,64 @@ share/locale/xh/LC_MESSAGES/gconf-editor.mo
share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo
share/locale/zh_HK/LC_MESSAGES/gconf-editor.mo
share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
+@dirrm share/gnome/pixmaps/gconf-editor
+@dirrm share/gnome/omf/gconf-editor
+@dirrm share/gnome/help/gconf-editor/C/figures
+@dirrm share/gnome/help/gconf-editor/C
+@dirrm share/gnome/help/gconf-editor
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrm share/gnome/pixmaps/gconf-editor
-@dirrm share/gnome/omf/gconf-editor
-@dirrm share/gnome/help/gconf-editor/uk/figures
-@dirrm share/gnome/help/gconf-editor/uk
-@dirrm share/gnome/help/gconf-editor/C/figures
-@dirrm share/gnome/help/gconf-editor/C
-@dirrm share/gnome/help/gconf-editor
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 2eee7b0ba1e9..0e5618fb9ee7 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,10 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.120 2006/10/03 00:02:39 ahze Exp $
#
PORTNAME= gnome-control-center
-PORTVERSION= 2.14.2
+PORTVERSION= 2.16.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,11 +17,11 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Control center for GNOME 2 project
-LIB_DEPENDS= xklavier.10:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS= xklavier.11:${PORTSDIR}/x11/libxklavier
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GSTREAMER= good
@@ -30,9 +31,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --enable-gstreamer=0.10 \
- --disable-hal
+USE_LDCONFIG= yes
+CONFIGURE_ARGS= --enable-gstreamer=0.10
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index a40a62155be1..4e1ba827dfb1 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/control-center-2.14.2.tar.bz2) = 08711b0f14584e7eaa9f4c275085ab36
-SHA256 (gnome2/control-center-2.14.2.tar.bz2) = c0b428127f0e57921a36aff246f4a1b9d71c727506794afe7a778c2095b740d8
-SIZE (gnome2/control-center-2.14.2.tar.bz2) = 1864719
+MD5 (gnome2/control-center-2.16.1.tar.bz2) = be0e16ef4e42677ebeb0b580d0c9cf3f
+SHA256 (gnome2/control-center-2.16.1.tar.bz2) = eb78914d1d783e06c7b2ae04adf738750b6c00d146a47d591497a9a354afbb35
+SIZE (gnome2/control-center-2.16.1.tar.bz2) = 1992731
diff --git a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
index 49727c882a89..69c01de97138 100644
--- a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
+++ b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
@@ -1,25 +1,15 @@
---- capplets/about-me/gnome-about-me-password.c.orig Mon Nov 28 10:02:57 2005
-+++ capplets/about-me/gnome-about-me-password.c Wed Dec 14 13:56:42 2005
-@@ -25,7 +25,9 @@
- # include <config.h>
+--- capplets/about-me/gnome-about-me-password.c.orig Sun Jun 11 04:50:31 2006
++++ capplets/about-me/gnome-about-me-password.c Tue Jun 13 00:02:27 2006
+@@ -52,6 +52,12 @@
+ #include <signal.h>
#endif
-+#ifndef __FreeBSD__
- #include <stropts.h>
-+#endif
- #include <gnome.h>
- #include <pwd.h>
- #include <stdlib.h>
-@@ -45,6 +47,12 @@
-
- #if __sun
- #include <sys/types.h>
-+#include <signal.h>
-+#endif
-+
+#if __FreeBSD__
+#include <sys/types.h>
+#include <libutil.h>
- #include <signal.h>
- #endif
++#include <signal.h>
++#endif
++
+ #include "capplet-util.h"
+ #include "eel-alert-dialog.h"
diff --git a/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c
deleted file mode 100644
index ab7180f75c17..000000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig Wed Jul 27 13:48:58 2005
-+++ capplets/keyboard/gnome-keyboard-properties-xkbot.c Wed Jul 27 13:49:37 2005
-@@ -265,11 +265,12 @@
- GladeXML * dialog)
- {
- GtkWidget *expander, *align, *vbox;
-+ gchar *utfGroupName, *titlemarkup;
-
- GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
-
-- gchar *utfGroupName = xci_desc_to_utf8 (configItem);
-- gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
-+ utfGroupName = xci_desc_to_utf8 (configItem);
-+ titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
-
- expander = gtk_expander_new (titlemarkup);
- g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free);
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index d8e861724bd3..94466c8551f1 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Thu Jan 13 02:39:28 2005
-+++ configure Thu Jan 13 02:39:28 2005
-@@ -22221,6 +22221,7 @@
+--- configure.orig Thu Jul 13 12:02:50 2006
++++ configure Thu Jul 13 12:04:24 2006
+@@ -22229,6 +22229,7 @@ echo $ECHO_N "checking for $ac_func... $
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8,7 +8,16 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27490,7 +27491,7 @@
+@@ -28440,7 +28441,7 @@ BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG
+
+
+ # dbus directory
+-DBUS_SERVICES_DIR='$(datadir)'"/dbus-1/services"
++DBUS_SERVICES_DIR='$(prefix)'"/share/dbus-1/services"
+
+
+ cat >>confdefs.h <<_ACEOF
+@@ -29126,7 +29127,7 @@ fi
cat >>confdefs.h <<_ACEOF
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index faafe835eab5..bc35a765b962 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -21,6 +21,7 @@ bin/gnome-window-properties
bin/themus-theme-applier
etc/gnome-vfs-2.0/modules/font-method.conf
etc/gnome-vfs-2.0/modules/theme-method.conf
+include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
include/gnome-window-settings-2.0/gnome-window-manager.h
include/gnome-window-settings-2.0/gnome-wm-manager.h
lib/gnome-vfs-2.0/modules/libfont-method.a
@@ -42,9 +43,10 @@ lib/nautilus/extensions-1.0/libnautilus-themus.so
lib/window-manager-settings/libmetacity.a
lib/window-manager-settings/libmetacity.la
lib/window-manager-settings/libmetacity.so
-libdata/bonobo/servers/GNOME_SettingsDaemon.server
+libdata/pkgconfig/gnome-settings-daemon.pc
libdata/pkgconfig/gnome-window-settings-2.0.pc
libexec/gnome-settings-daemon
+share/dbus-1/services/org.gnome.SettingsDaemon.service
share/gnome/applications/accessibility-keyboard.desktop
share/gnome/applications/at-properties.desktop
share/gnome/applications/background.desktop
@@ -80,14 +82,12 @@ share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade
share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade
share/gnome/control-center-2.0/interfaces/modmap-dialog.glade
share/gnome/control-center-2.0/interfaces/sound-properties.glade
-share/gnome/control-center-2.0/interfaces/theme-install.glade
share/gnome/control-center-2.0/interfaces/theme-properties.glade
share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png
share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png
share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png
share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-stickykey.png
share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-togglekey.png
-share/gnome/control-center-2.0/pixmaps/acme-brightness.png
share/gnome/control-center-2.0/pixmaps/acme-eject.png
share/gnome/control-center-2.0/pixmaps/at-startup.png
share/gnome/control-center-2.0/pixmaps/at-support.png
@@ -98,8 +98,8 @@ share/gnome/control-center-2.0/pixmaps/bar.png
share/gnome/control-center-2.0/pixmaps/double-click-maybe.png
share/gnome/control-center-2.0/pixmaps/double-click-off.png
share/gnome/control-center-2.0/pixmaps/double-click-on.png
-%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-off.png
-%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-on.png
+%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-lock-open.png
+%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-lock.png
share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png
share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png
share/gnome/control-center-2.0/pixmaps/keyboard-bell.png
@@ -148,10 +148,18 @@ share/gnome/help/control-center/C/config-sound.xml
share/gnome/help/control-center/C/config-themes.xml
share/gnome/help/control-center/C/control-center.xml
share/gnome/help/control-center/es/control-center.xml
+share/gnome/help/control-center/fr/control-center.xml
+share/gnome/help/control-center/ru/control-center.xml
+share/gnome/help/control-center/sv/control-center.xml
+share/gnome/help/control-center/zh_CN/control-center.xml
share/gnome/idl/ConfigArchiver.idl
share/gnome/idl/GNOME_SettingsDaemon.idl
share/gnome/omf/control-center/control-center-C.omf
share/gnome/omf/control-center/control-center-es.omf
+share/gnome/omf/control-center/control-center-fr.omf
+share/gnome/omf/control-center/control-center-ru.omf
+share/gnome/omf/control-center/control-center-sv.omf
+share/gnome/omf/control-center/control-center-zh_CN.omf
share/gnome/pixmaps/display-capplet.png
share/icons/hicolor/48x48/apps/gnome-control-center.png
share/locale/af/LC_MESSAGES/control-center-2.0.mo
@@ -161,6 +169,7 @@ share/locale/az/LC_MESSAGES/control-center-2.0.mo
share/locale/be/LC_MESSAGES/control-center-2.0.mo
share/locale/bg/LC_MESSAGES/control-center-2.0.mo
share/locale/bn/LC_MESSAGES/control-center-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/control-center-2.0.mo
share/locale/br/LC_MESSAGES/control-center-2.0.mo
share/locale/bs/LC_MESSAGES/control-center-2.0.mo
share/locale/ca/LC_MESSAGES/control-center-2.0.mo
@@ -194,16 +203,18 @@ share/locale/ko/LC_MESSAGES/control-center-2.0.mo
share/locale/ku/LC_MESSAGES/control-center-2.0.mo
share/locale/lt/LC_MESSAGES/control-center-2.0.mo
share/locale/lv/LC_MESSAGES/control-center-2.0.mo
+share/locale/mg/LC_MESSAGES/control-center-2.0.mo
share/locale/mk/LC_MESSAGES/control-center-2.0.mo
share/locale/ml/LC_MESSAGES/control-center-2.0.mo
share/locale/mn/LC_MESSAGES/control-center-2.0.mo
+share/locale/mr/LC_MESSAGES/control-center-2.0.mo
share/locale/ms/LC_MESSAGES/control-center-2.0.mo
share/locale/nb/LC_MESSAGES/control-center-2.0.mo
share/locale/ne/LC_MESSAGES/control-center-2.0.mo
share/locale/nl/LC_MESSAGES/control-center-2.0.mo
share/locale/nn/LC_MESSAGES/control-center-2.0.mo
-share/locale/no/LC_MESSAGES/control-center-2.0.mo
share/locale/nso/LC_MESSAGES/control-center-2.0.mo
+share/locale/or/LC_MESSAGES/control-center-2.0.mo
share/locale/pa/LC_MESSAGES/control-center-2.0.mo
share/locale/pl/LC_MESSAGES/control-center-2.0.mo
share/locale/pt/LC_MESSAGES/control-center-2.0.mo
@@ -229,21 +240,11 @@ share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
share/locale/zh_HK/LC_MESSAGES/control-center-2.0.mo
share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
share/locale/zu/LC_MESSAGES/control-center-2.0.mo
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
@dirrm share/gnome/omf/control-center
+@dirrm share/gnome/help/control-center/zh_CN
+@dirrm share/gnome/help/control-center/ru/
+@dirrm share/gnome/help/control-center/sv
+@dirrm share/gnome/help/control-center/fr
@dirrm share/gnome/help/control-center/es
@dirrm share/gnome/help/control-center/C
@dirrm share/gnome/help/control-center
@@ -257,5 +258,65 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo
@dirrmtry share/gnome/control-center-2.0/icons
@dirrm lib/window-manager-settings
@dirrm include/gnome-window-settings-2.0
+@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
+@dirrm include/gnome-settings-daemon-2.0
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
new file mode 100644
index 000000000000..f4232382adc8
--- /dev/null
+++ b/sysutils/gnome-mount/Makefile
@@ -0,0 +1,33 @@
+# New ports collection makefile for: gnome-mount
+# Date created: 04 June 2006
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/sysutils/gnome-mount/Makefile,v 1.4 2006/10/05 07:37:38 mezz Exp $
+#
+
+PORTNAME= gnome-mount
+PORTVERSION= 0.4
+PORTREVISION= 1
+CATEGORIES= sysutils gnome
+MASTER_SITES= http://people.freedesktop.org/~david/dist/
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= A font-end to mount, umount, and eject using HAL
+
+LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal
+
+USE_XLIB= yes
+USE_GNOME= gnomeprefix gnomehack intlhack nautilus2
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-nautilus-extension
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS= gnome-mount.schemas
+
+post-extract:
+ @${CP} -f ${FILESDIR}/mntent.h ${WRKSRC}/src
+
+.include <bsd.port.mk>
diff --git a/sysutils/gnome-mount/distinfo b/sysutils/gnome-mount/distinfo
new file mode 100644
index 000000000000..656c038250f9
--- /dev/null
+++ b/sysutils/gnome-mount/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome-mount-0.4.tar.gz) = 75f260ea6b0ec3c5e0af3c722fbd9568
+SHA256 (gnome-mount-0.4.tar.gz) = fa9456c0cd1adeda962721fed955914bdc23723a403bebf31bd95a1f54211dd8
+SIZE (gnome-mount-0.4.tar.gz) = 364546
diff --git a/sysutils/gnome-mount/files/mntent.h b/sysutils/gnome-mount/files/mntent.h
new file mode 100644
index 000000000000..078b246cd02e
--- /dev/null
+++ b/sysutils/gnome-mount/files/mntent.h
@@ -0,0 +1,56 @@
+/*
+ * mntent
+ * mntent.h - compatability header for FreeBSD
+ *
+ * Copyright (c) 2001 David Rufino <daverufino@btinternet.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(HAVE_MNTENT_H)
+#include <mntent.h>
+#else
+#ifndef _MNTENT_H
+#define _MNTENT_H
+#include <stdio.h>
+
+#define MOUNTED "dummy"
+
+#define MNTTYPE_NFS "nfs"
+
+struct mntent {
+ char *mnt_fsname;
+ char *mnt_dir;
+ char *mnt_type;
+ char *mnt_opts;
+ int mnt_freq;
+ int mnt_passno;
+};
+
+#define setmntent(x,y) ((FILE *)0x1)
+struct mntent *getmntent __P ((FILE *fp));
+char *hasmntopt __P ((const struct mntent *mnt, const char *option));
+#define endmntent(x) ((int)1)
+
+#endif /* _MNTENT_H */
+#endif /* HAVE_MNTENT_H */
diff --git a/sysutils/gnome-mount/files/patch-src_gnome-mount.c b/sysutils/gnome-mount/files/patch-src_gnome-mount.c
new file mode 100644
index 000000000000..eb78bab377f5
--- /dev/null
+++ b/sysutils/gnome-mount/files/patch-src_gnome-mount.c
@@ -0,0 +1,29 @@
+--- src/gnome-mount.c.orig Mon Sep 4 21:41:09 2006
++++ src/gnome-mount.c Mon Sep 4 21:45:53 2006
+@@ -42,7 +42,7 @@
+ #include <libhal.h>
+ #include <libhal-storage.h>
+
+-#include <mntent.h>
++#include "mntent.h"
+
+ static DBusConnection *dbus_connection;
+ static LibHalContext *hal_ctx;
+@@ -477,7 +477,7 @@
+
+ mount_point = NULL;
+ device_file = get_dev_file (volume, drive);
+-
++#ifdef __linux__
+ if (device_file != NULL) {
+ FILE *f;
+ struct mntent mnt;
+@@ -497,7 +497,7 @@
+ endmntent (f);
+ }
+ }
+-
++#endif
+ g_print (_("Mounted %s at \"%s\"\n"), device_file, mount_point);
+ g_free (mount_point);
+ }
diff --git a/sysutils/gnome-mount/pkg-descr b/sysutils/gnome-mount/pkg-descr
new file mode 100644
index 000000000000..a75d36294fe4
--- /dev/null
+++ b/sysutils/gnome-mount/pkg-descr
@@ -0,0 +1,2 @@
+gnome-mount is a HAL-based front-end to mount, umount, and eject which
+offers a centralized place where settings for these commands are maintained.
diff --git a/sysutils/gnome-mount/pkg-plist b/sysutils/gnome-mount/pkg-plist
new file mode 100644
index 000000000000..0ae3f4092a0a
--- /dev/null
+++ b/sysutils/gnome-mount/pkg-plist
@@ -0,0 +1,12 @@
+bin/gnome-eject
+bin/gnome-mount
+bin/gnome-umount
+lib/nautilus/extensions-1.0/libgnome-mount.a
+lib/nautilus/extensions-1.0/libgnome-mount.la
+lib/nautilus/extensions-1.0/libgnome-mount.so
+libdata/pkgconfig/gnome-mount.pc
+share/gnome/gnome-mount/gnome-mount-properties.glade
+share/locale/it/LC_MESSAGES/gnome-mount.mo
+share/locale/ja/LC_MESSAGES/gnome-mount.mo
+share/locale/nb/LC_MESSAGES/gnome-mount.mo
+@dirrm share/gnome/gnome-mount
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
new file mode 100644
index 000000000000..6f9106ffdfee
--- /dev/null
+++ b/sysutils/gnome-power-manager/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: gnome-power-manager
+# Date created: 03 May 2006
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.13 2006/09/29 23:25:32 marcus Exp $
+#
+
+PORTNAME= gnome-power-manager
+PORTVERSION= 2.16.1
+CATEGORIES= sysutils gnome
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Power management system for the GNOME Desktop
+
+LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \
+ notify.2:${PORTSDIR}/devel/libnotify
+
+USE_GETTEXT= yes
+USE_BZIP2= yes
+USE_XLIB= yes
+USE_GMAKE= yes
+INSTALLS_OMF= yes
+INSTALLS_ICONS= yes
+USE_AUTOTOOLS= libtool:15
+USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libwnck \
+ gnomedocutils
+CONFIGURE_ARGS= --disable-icon-framing
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS= gnome-power-manager.schemas
+
+.include <bsd.port.mk>
diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo
new file mode 100644
index 000000000000..e01eb689ac13
--- /dev/null
+++ b/sysutils/gnome-power-manager/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gnome-power-manager-2.16.1.tar.bz2) = 6798ee24e5e94befab5a7584c19771cb
+SHA256 (gnome2/gnome-power-manager-2.16.1.tar.bz2) = c2bddef973b8a72b8da03b2cffad5107bfaefb64bd42a0763d9d925e222a3490
+SIZE (gnome2/gnome-power-manager-2.16.1.tar.bz2) = 1862984
diff --git a/sysutils/gnome-power-manager/pkg-descr b/sysutils/gnome-power-manager/pkg-descr
new file mode 100644
index 000000000000..5b789d06c24b
--- /dev/null
+++ b/sysutils/gnome-power-manager/pkg-descr
@@ -0,0 +1,7 @@
+GNOME Power Manager is a GNOME session daemon that acts as a policy agent
+on top of HAL (the Hardware Abstraction Layer). GNOME Power Manager listens
+for HAL events and responds with user-configurable reactions.
+Currently it supports laptop batteries and AC adapters. Its goal is to be
+architecture neutral and free of polling and other hacks.
+
+WWW: http://www.gnome.org/projects/gnome-power-manager/
diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist
new file mode 100644
index 000000000000..74bbe12673e9
--- /dev/null
+++ b/sysutils/gnome-power-manager/pkg-plist
@@ -0,0 +1,319 @@
+bin/gnome-power-inhibit-test
+bin/gnome-power-manager
+bin/gnome-power-preferences
+etc/dbus-1/system.d/gnome-power-manager.conf
+share/dbus-1/services/gnome-power-manager.service
+share/gnome/applications/gnome-power-preferences.desktop
+share/gnome/autostart/gnome-power-manager.desktop
+share/gnome/gnome-power-manager/gpm-feedback-widget.glade
+share/gnome/gnome-power-manager/gpm-info.glade
+share/gnome/gnome-power-manager/gpm-inhibit-test.glade
+share/gnome/gnome-power-manager/gpm-prefs.glade
+share/gnome/help/gnome-power-manager/C/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-info-devices.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-info-event-log.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-info-percentage.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-info-rate.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-info-time.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-ac.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-battery.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-options.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/C/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/C/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/C/legal.xml
+share/gnome/help/gnome-power-manager/ru/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-info-devices.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-info-event-log.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-info-percentage.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-info-rate.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-info-time.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-ac.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-battery.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-options.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/ru/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/ru/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/sv/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-info-devices.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-info-event-log.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-info-percentage.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-info-rate.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-info-time.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-ac.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-battery.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-options.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/sv/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/sv/gnome-power-manager.xml
+share/gnome/omf/gnome-power-manager/gnome-power-manager-C.omf
+share/gnome/omf/gnome-power-manager/gnome-power-manager-ru.omf
+share/gnome/omf/gnome-power-manager/gnome-power-manager-sv.omf
+share/icons/hicolor/16x16/apps/gpm-ac-adapter.png
+share/icons/hicolor/16x16/apps/gpm-brightness.png
+share/icons/hicolor/16x16/apps/gpm-hibernate.png
+share/icons/hicolor/16x16/apps/gpm-keyboard-000.png
+share/icons/hicolor/16x16/apps/gpm-keyboard-030.png
+share/icons/hicolor/16x16/apps/gpm-keyboard-060.png
+share/icons/hicolor/16x16/apps/gpm-keyboard-100.png
+share/icons/hicolor/16x16/apps/gpm-mouse-000.png
+share/icons/hicolor/16x16/apps/gpm-mouse-030.png
+share/icons/hicolor/16x16/apps/gpm-mouse-060.png
+share/icons/hicolor/16x16/apps/gpm-mouse-100.png
+share/icons/hicolor/16x16/apps/gpm-primary-000-charging.png
+share/icons/hicolor/16x16/apps/gpm-primary-000.png
+share/icons/hicolor/16x16/apps/gpm-primary-020-charging.png
+share/icons/hicolor/16x16/apps/gpm-primary-020.png
+share/icons/hicolor/16x16/apps/gpm-primary-040-charging.png
+share/icons/hicolor/16x16/apps/gpm-primary-040.png
+share/icons/hicolor/16x16/apps/gpm-primary-060-charging.png
+share/icons/hicolor/16x16/apps/gpm-primary-060.png
+share/icons/hicolor/16x16/apps/gpm-primary-080-charging.png
+share/icons/hicolor/16x16/apps/gpm-primary-080.png
+share/icons/hicolor/16x16/apps/gpm-primary-100-charging.png
+share/icons/hicolor/16x16/apps/gpm-primary-100.png
+share/icons/hicolor/16x16/apps/gpm-primary-charged.png
+share/icons/hicolor/16x16/apps/gpm-primary-missing.png
+share/icons/hicolor/16x16/apps/gpm-suspend.png
+share/icons/hicolor/16x16/apps/gpm-ups-000-charging.png
+share/icons/hicolor/16x16/apps/gpm-ups-000.png
+share/icons/hicolor/16x16/apps/gpm-ups-020-charging.png
+share/icons/hicolor/16x16/apps/gpm-ups-020.png
+share/icons/hicolor/16x16/apps/gpm-ups-040-charging.png
+share/icons/hicolor/16x16/apps/gpm-ups-040.png
+share/icons/hicolor/16x16/apps/gpm-ups-060-charging.png
+share/icons/hicolor/16x16/apps/gpm-ups-060.png
+share/icons/hicolor/16x16/apps/gpm-ups-080-charging.png
+share/icons/hicolor/16x16/apps/gpm-ups-080.png
+share/icons/hicolor/16x16/apps/gpm-ups-100-charging.png
+share/icons/hicolor/16x16/apps/gpm-ups-100.png
+share/icons/hicolor/16x16/apps/gpm-ups-charged.png
+share/icons/hicolor/16x16/apps/gpm-ups-missing.png
+share/icons/hicolor/22x22/apps/gpm-ac-adapter.png
+share/icons/hicolor/22x22/apps/gpm-brightness.png
+share/icons/hicolor/22x22/apps/gpm-hibernate.png
+share/icons/hicolor/22x22/apps/gpm-keyboard-000.png
+share/icons/hicolor/22x22/apps/gpm-keyboard-030.png
+share/icons/hicolor/22x22/apps/gpm-keyboard-060.png
+share/icons/hicolor/22x22/apps/gpm-keyboard-100.png
+share/icons/hicolor/22x22/apps/gpm-mouse-000.png
+share/icons/hicolor/22x22/apps/gpm-mouse-030.png
+share/icons/hicolor/22x22/apps/gpm-mouse-060.png
+share/icons/hicolor/22x22/apps/gpm-mouse-100.png
+share/icons/hicolor/22x22/apps/gpm-primary-000-charging.png
+share/icons/hicolor/22x22/apps/gpm-primary-000.png
+share/icons/hicolor/22x22/apps/gpm-primary-020-charging.png
+share/icons/hicolor/22x22/apps/gpm-primary-020.png
+share/icons/hicolor/22x22/apps/gpm-primary-040-charging.png
+share/icons/hicolor/22x22/apps/gpm-primary-040.png
+share/icons/hicolor/22x22/apps/gpm-primary-060-charging.png
+share/icons/hicolor/22x22/apps/gpm-primary-060.png
+share/icons/hicolor/22x22/apps/gpm-primary-080-charging.png
+share/icons/hicolor/22x22/apps/gpm-primary-080.png
+share/icons/hicolor/22x22/apps/gpm-primary-100-charging.png
+share/icons/hicolor/22x22/apps/gpm-primary-100.png
+share/icons/hicolor/22x22/apps/gpm-primary-charged.png
+share/icons/hicolor/22x22/apps/gpm-primary-missing.png
+share/icons/hicolor/22x22/apps/gpm-suspend.png
+share/icons/hicolor/22x22/apps/gpm-ups-000-charging.png
+share/icons/hicolor/22x22/apps/gpm-ups-000.png
+share/icons/hicolor/22x22/apps/gpm-ups-020-charging.png
+share/icons/hicolor/22x22/apps/gpm-ups-020.png
+share/icons/hicolor/22x22/apps/gpm-ups-040-charging.png
+share/icons/hicolor/22x22/apps/gpm-ups-040.png
+share/icons/hicolor/22x22/apps/gpm-ups-060-charging.png
+share/icons/hicolor/22x22/apps/gpm-ups-060.png
+share/icons/hicolor/22x22/apps/gpm-ups-080-charging.png
+share/icons/hicolor/22x22/apps/gpm-ups-080.png
+share/icons/hicolor/22x22/apps/gpm-ups-100-charging.png
+share/icons/hicolor/22x22/apps/gpm-ups-100.png
+share/icons/hicolor/22x22/apps/gpm-ups-charged.png
+share/icons/hicolor/22x22/apps/gpm-ups-missing.png
+share/icons/hicolor/24x24/apps/gpm-ac-adapter.png
+share/icons/hicolor/24x24/apps/gpm-brightness.png
+share/icons/hicolor/24x24/apps/gpm-hibernate.png
+share/icons/hicolor/24x24/apps/gpm-keyboard-000.png
+share/icons/hicolor/24x24/apps/gpm-keyboard-030.png
+share/icons/hicolor/24x24/apps/gpm-keyboard-060.png
+share/icons/hicolor/24x24/apps/gpm-keyboard-100.png
+share/icons/hicolor/24x24/apps/gpm-mouse-000.png
+share/icons/hicolor/24x24/apps/gpm-mouse-030.png
+share/icons/hicolor/24x24/apps/gpm-mouse-060.png
+share/icons/hicolor/24x24/apps/gpm-mouse-100.png
+share/icons/hicolor/24x24/apps/gpm-primary-000-charging.png
+share/icons/hicolor/24x24/apps/gpm-primary-000.png
+share/icons/hicolor/24x24/apps/gpm-primary-020-charging.png
+share/icons/hicolor/24x24/apps/gpm-primary-020.png
+share/icons/hicolor/24x24/apps/gpm-primary-040-charging.png
+share/icons/hicolor/24x24/apps/gpm-primary-040.png
+share/icons/hicolor/24x24/apps/gpm-primary-060-charging.png
+share/icons/hicolor/24x24/apps/gpm-primary-060.png
+share/icons/hicolor/24x24/apps/gpm-primary-080-charging.png
+share/icons/hicolor/24x24/apps/gpm-primary-080.png
+share/icons/hicolor/24x24/apps/gpm-primary-100-charging.png
+share/icons/hicolor/24x24/apps/gpm-primary-100.png
+share/icons/hicolor/24x24/apps/gpm-primary-charged.png
+share/icons/hicolor/24x24/apps/gpm-primary-missing.png
+share/icons/hicolor/24x24/apps/gpm-suspend.png
+share/icons/hicolor/24x24/apps/gpm-ups-000-charging.png
+share/icons/hicolor/24x24/apps/gpm-ups-000.png
+share/icons/hicolor/24x24/apps/gpm-ups-020-charging.png
+share/icons/hicolor/24x24/apps/gpm-ups-020.png
+share/icons/hicolor/24x24/apps/gpm-ups-040-charging.png
+share/icons/hicolor/24x24/apps/gpm-ups-040.png
+share/icons/hicolor/24x24/apps/gpm-ups-060-charging.png
+share/icons/hicolor/24x24/apps/gpm-ups-060.png
+share/icons/hicolor/24x24/apps/gpm-ups-080-charging.png
+share/icons/hicolor/24x24/apps/gpm-ups-080.png
+share/icons/hicolor/24x24/apps/gpm-ups-100-charging.png
+share/icons/hicolor/24x24/apps/gpm-ups-100.png
+share/icons/hicolor/24x24/apps/gpm-ups-charged.png
+share/icons/hicolor/24x24/apps/gpm-ups-missing.png
+share/icons/hicolor/scalable/apps/gpm-ac-adapter.svg
+share/icons/hicolor/scalable/apps/gpm-brightness.svg
+share/icons/hicolor/scalable/apps/gpm-hibernate.svg
+share/icons/hicolor/scalable/apps/gpm-keyboard-000.svg
+share/icons/hicolor/scalable/apps/gpm-keyboard-030.svg
+share/icons/hicolor/scalable/apps/gpm-keyboard-060.svg
+share/icons/hicolor/scalable/apps/gpm-keyboard-100.svg
+share/icons/hicolor/scalable/apps/gpm-mouse-000.svg
+share/icons/hicolor/scalable/apps/gpm-mouse-030.svg
+share/icons/hicolor/scalable/apps/gpm-mouse-060.svg
+share/icons/hicolor/scalable/apps/gpm-mouse-100.svg
+share/icons/hicolor/scalable/apps/gpm-primary-000-charging.svg
+share/icons/hicolor/scalable/apps/gpm-primary-000.svg
+share/icons/hicolor/scalable/apps/gpm-primary-020-charging.svg
+share/icons/hicolor/scalable/apps/gpm-primary-020.svg
+share/icons/hicolor/scalable/apps/gpm-primary-040-charging.svg
+share/icons/hicolor/scalable/apps/gpm-primary-040.svg
+share/icons/hicolor/scalable/apps/gpm-primary-060-charging.svg
+share/icons/hicolor/scalable/apps/gpm-primary-060.svg
+share/icons/hicolor/scalable/apps/gpm-primary-080-charging.svg
+share/icons/hicolor/scalable/apps/gpm-primary-080.svg
+share/icons/hicolor/scalable/apps/gpm-primary-100-charging.svg
+share/icons/hicolor/scalable/apps/gpm-primary-100.svg
+share/icons/hicolor/scalable/apps/gpm-primary-charged.svg
+share/icons/hicolor/scalable/apps/gpm-primary-missing.svg
+share/icons/hicolor/scalable/apps/gpm-suspend.svg
+share/icons/hicolor/scalable/apps/gpm-ups-000-charging.svg
+share/icons/hicolor/scalable/apps/gpm-ups-000.svg
+share/icons/hicolor/scalable/apps/gpm-ups-020-charging.svg
+share/icons/hicolor/scalable/apps/gpm-ups-020.svg
+share/icons/hicolor/scalable/apps/gpm-ups-040-charging.svg
+share/icons/hicolor/scalable/apps/gpm-ups-040.svg
+share/icons/hicolor/scalable/apps/gpm-ups-060-charging.svg
+share/icons/hicolor/scalable/apps/gpm-ups-060.svg
+share/icons/hicolor/scalable/apps/gpm-ups-080-charging.svg
+share/icons/hicolor/scalable/apps/gpm-ups-080.svg
+share/icons/hicolor/scalable/apps/gpm-ups-100-charging.svg
+share/icons/hicolor/scalable/apps/gpm-ups-100.svg
+share/icons/hicolor/scalable/apps/gpm-ups-charged.svg
+share/icons/hicolor/scalable/apps/gpm-ups-missing.svg
+share/locale/bg/LC_MESSAGES/gnome-power-manager.mo
+share/locale/bn/LC_MESSAGES/gnome-power-manager.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ca/LC_MESSAGES/gnome-power-manager.mo
+share/locale/cs/LC_MESSAGES/gnome-power-manager.mo
+share/locale/cy/LC_MESSAGES/gnome-power-manager.mo
+share/locale/de/LC_MESSAGES/gnome-power-manager.mo
+share/locale/dz/LC_MESSAGES/gnome-power-manager.mo
+share/locale/el/LC_MESSAGES/gnome-power-manager.mo
+share/locale/en_CA/LC_MESSAGES/gnome-power-manager.mo
+share/locale/en_GB/LC_MESSAGES/gnome-power-manager.mo
+share/locale/es/LC_MESSAGES/gnome-power-manager.mo
+share/locale/et/LC_MESSAGES/gnome-power-manager.mo
+share/locale/eu/LC_MESSAGES/gnome-power-manager.mo
+share/locale/fa/LC_MESSAGES/gnome-power-manager.mo
+share/locale/fi/LC_MESSAGES/gnome-power-manager.mo
+share/locale/fr/LC_MESSAGES/gnome-power-manager.mo
+share/locale/gl/LC_MESSAGES/gnome-power-manager.mo
+share/locale/gu/LC_MESSAGES/gnome-power-manager.mo
+share/locale/hi/LC_MESSAGES/gnome-power-manager.mo
+share/locale/hu/LC_MESSAGES/gnome-power-manager.mo
+share/locale/it/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ja/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ka/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ko/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ku/LC_MESSAGES/gnome-power-manager.mo
+share/locale/lt/LC_MESSAGES/gnome-power-manager.mo
+share/locale/lv/LC_MESSAGES/gnome-power-manager.mo
+share/locale/mg/LC_MESSAGES/gnome-power-manager.mo
+share/locale/mk/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ml/LC_MESSAGES/gnome-power-manager.mo
+share/locale/nb/LC_MESSAGES/gnome-power-manager.mo
+share/locale/nl/LC_MESSAGES/gnome-power-manager.mo
+share/locale/or/LC_MESSAGES/gnome-power-manager.mo
+share/locale/pa/LC_MESSAGES/gnome-power-manager.mo
+share/locale/pl/LC_MESSAGES/gnome-power-manager.mo
+share/locale/pt/LC_MESSAGES/gnome-power-manager.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ru/LC_MESSAGES/gnome-power-manager.mo
+share/locale/sk/LC_MESSAGES/gnome-power-manager.mo
+share/locale/sl/LC_MESSAGES/gnome-power-manager.mo
+share/locale/sr/LC_MESSAGES/gnome-power-manager.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-power-manager.mo
+share/locale/sv/LC_MESSAGES/gnome-power-manager.mo
+share/locale/ta/LC_MESSAGES/gnome-power-manager.mo
+share/locale/th/LC_MESSAGES/gnome-power-manager.mo
+share/locale/uk/LC_MESSAGES/gnome-power-manager.mo
+share/locale/vi/LC_MESSAGES/gnome-power-manager.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-power-manager.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-power-manager.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-power-manager.mo
+@dirrm share/gnome/omf/gnome-power-manager
+@dirrm share/gnome/help/gnome-power-manager/sv/figures
+@dirrm share/gnome/help/gnome-power-manager/sv
+@dirrm share/gnome/help/gnome-power-manager/ru/figures
+@dirrm share/gnome/help/gnome-power-manager/ru
+@dirrm share/gnome/help/gnome-power-manager/C/figures
+@dirrm share/gnome/help/gnome-power-manager/C
+@dirrm share/gnome/help/gnome-power-manager
+@dirrm share/gnome/gnome-power-manager
+@dirrmtry share/gnome/autostart
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 6131ed93c725..af82e4f4b567 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,10 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.76 2006/10/02 23:31:11 ahze Exp $
#
PORTNAME= gnome-system-monitor
-PORTVERSION= 2.14.5
+PORTVERSION= 2.16.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,7 +21,7 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libwnck
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index aac38e4e1291..8a66b02dd773 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-monitor-2.14.5.tar.bz2) = 1220837542f9c1905ebf3af69a608b07
-SHA256 (gnome2/gnome-system-monitor-2.14.5.tar.bz2) = 1ec5537e05191ecae5835f17d2bf308797c1fcb2ed6ebcdb0b673f1d24838b05
-SIZE (gnome2/gnome-system-monitor-2.14.5.tar.bz2) = 1413201
+MD5 (gnome2/gnome-system-monitor-2.16.1.tar.bz2) = 37b44e0e84865fc0aba8bfd4bbdf2338
+SHA256 (gnome2/gnome-system-monitor-2.16.1.tar.bz2) = 1be70e1ae696e3607dfeda186298e7034cca4e0c8020bf92c7485b8c6450504c
+SIZE (gnome2/gnome-system-monitor-2.16.1.tar.bz2) = 1480061
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index ed8ccd03b81f..3adab4f7d10e 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -38,6 +38,7 @@ share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
share/locale/be/LC_MESSAGES/gnome-system-monitor.mo
share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo
share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-system-monitor.mo
share/locale/bs/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ca/LC_MESSAGES/gnome-system-monitor.mo
share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo
@@ -66,17 +67,21 @@ share/locale/it/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ka/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ku/LC_MESSAGES/gnome-system-monitor.mo
share/locale/li/LC_MESSAGES/gnome-system-monitor.mo
share/locale/lt/LC_MESSAGES/gnome-system-monitor.mo
share/locale/lv/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/mg/LC_MESSAGES/gnome-system-monitor.mo
share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/mr/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo
share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ne/LC_MESSAGES/gnome-system-monitor.mo
share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
share/locale/nn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/or/LC_MESSAGES/gnome-system-monitor.mo
share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo
share/locale/pl/LC_MESSAGES/gnome-system-monitor.mo
share/locale/pt/LC_MESSAGES/gnome-system-monitor.mo
@@ -99,13 +104,63 @@ share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_HK/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
@dirrm share/gnome/omf/gnome-system-monitor
@dirrm share/gnome/help/gnome-system-monitor/bg/figures
@dirrm share/gnome/help/gnome-system-monitor/bg
@dirrm share/gnome/help/gnome-system-monitor/C/figures
@dirrm share/gnome/help/gnome-system-monitor/C
@dirrm share/gnome/help/gnome-system-monitor
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile
new file mode 100644
index 000000000000..8eb999440ae5
--- /dev/null
+++ b/sysutils/gnome-volume-manager/Makefile
@@ -0,0 +1,30 @@
+# New ports collection makefile for: gnome-volume-manager
+# Date created: 02 May 2006
+# Whom: Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.7 2006/09/15 05:50:19 marcus Exp $
+#
+
+PORTNAME= gnome-volume-manager
+PORTVERSION= 2.15.0
+CATEGORIES= sysutils gnome
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Automatically mount removable media, and more
+
+LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \
+ notify.2:${PORTSDIR}/devel/libnotify
+
+USE_XLIB= yes
+USE_BZIP2= yes
+USE_GNOME= gnomeprefix gnomehack intlhack nautilus2
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --disable-multiuser
+GCONF_SCHEMAS= gnome-volume-manager.schemas
+
+.include <bsd.port.mk>
diff --git a/sysutils/gnome-volume-manager/distinfo b/sysutils/gnome-volume-manager/distinfo
new file mode 100644
index 000000000000..9b0f0ca3ddf3
--- /dev/null
+++ b/sysutils/gnome-volume-manager/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome-volume-manager-2.15.0.tar.bz2) = d723bc2069fd19cf1c31961fbc1cf3c8
+SHA256 (gnome-volume-manager-2.15.0.tar.bz2) = f3d2ce3e2f2a4b757d4688bae7f6b8418d11340618f15d34871a002516ab8e0e
+SIZE (gnome-volume-manager-2.15.0.tar.bz2) = 318479
diff --git a/sysutils/gnome-volume-manager/files/patch-gnome-volume-manager.schemas.in b/sysutils/gnome-volume-manager/files/patch-gnome-volume-manager.schemas.in
new file mode 100644
index 000000000000..94af083a163b
--- /dev/null
+++ b/sysutils/gnome-volume-manager/files/patch-gnome-volume-manager.schemas.in
@@ -0,0 +1,11 @@
+--- gnome-volume-manager.schemas.in.orig Wed Jun 7 21:41:12 2006
++++ gnome-volume-manager.schemas.in Wed Jun 7 21:41:40 2006
+@@ -227,7 +227,7 @@
+ <key>/schemas/desktop/gnome/volume_manager/autoprinter_command</key>
+ <applyto>/desktop/gnome/volume_manager/autoprinter_command</applyto>
+ <type>string</type>
+- <default>gnome-printer-add hal://%h</default>
++ <default>gnome-cups-add hal://%h</default>
+ <locale name="C">
+ <short>printer command</short>
+ <long>Command to run when a printer is connected.</long>
diff --git a/sysutils/gnome-volume-manager/files/patch-src_manager.c b/sysutils/gnome-volume-manager/files/patch-src_manager.c
new file mode 100644
index 000000000000..ded14abd6f96
--- /dev/null
+++ b/sysutils/gnome-volume-manager/files/patch-src_manager.c
@@ -0,0 +1,63 @@
+--- src/manager.c.orig Mon Jul 31 16:37:36 2006
++++ src/manager.c Fri Sep 15 01:32:32 2006
+@@ -23,9 +23,12 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
++#include <fcntl.h>
+ #include <signal.h>
+ #include <unistd.h>
+ #include <utmp.h>
++#include <sys/param.h>
++#include <sys/mount.h>
+
+ #include <locale.h>
+
+@@ -3088,10 +3091,17 @@ gvm_local_user (void)
+ struct utmp *utmp;
+ const char *user;
+ size_t ulen;
++#ifndef __linux__
++ int bytes, fd;
++ struct stat sb;
++ struct utmp buf[1024];
++ long len;
++#endif
+
+ user = g_get_user_name ();
+ ulen = strlen (user);
+
++#ifdef __linux__
+ setutent ();
+
+ while (!local && (utmp = getutent ())) {
+@@ -3103,7 +3113,28 @@ gvm_local_user (void)
+ }
+
+ endutent ();
+-
++#else
++ if ((fd = open (_PATH_WTMP, O_RDONLY, 0)) < 0 || fstat(fd, &sb) == -1) {
++ close (fd);
++ return TRUE;
++ }
++ len = (sb.st_size + sizeof(buf) - 1) / sizeof(buf);
++
++ while (!local && --len >= 0) {
++ if (lseek(fd, (off_t) (len * sizeof(buf)), L_SET) == -1 ||
++ (bytes = read (fd, buf, sizeof(buf))) == -1) {
++ close (fd);
++ return TRUE;
++ }
++ for (utmp = &buf[bytes / sizeof(buf[0]) - 1]; !local && utmp >= buf; --utmp) {
++ if (!utmp->ut_name[0] || strncmp (utmp->ut_name, user, ulen) != 0)
++ continue;
++ local = utmp->ut_line[0] == ':' && utmp->ut_line[1] >= '0' && utmp->ut_line[1] <= '9';
++ }
++ }
++
++ close (fd);
++#endif
+ return local;
+ }
+
diff --git a/sysutils/gnome-volume-manager/files/patch-src_properties.c b/sysutils/gnome-volume-manager/files/patch-src_properties.c
new file mode 100644
index 000000000000..5e8d72a2d61b
--- /dev/null
+++ b/sysutils/gnome-volume-manager/files/patch-src_properties.c
@@ -0,0 +1,14 @@
+--- src/properties.c.orig Sat Jul 15 13:54:29 2006
++++ src/properties.c Sat Jul 15 13:55:03 2006
+@@ -499,7 +499,11 @@ main (int argc, char **argv)
+ _("The \"hald\" service is required but not currently "
+ "running. Enable the service and rerun this application, "
+ "or contact your system administrator.\n\n"
++#ifndef __FreeBSD__
+ "Note: You need Linux kernel 2.6 for volume "
++#else
++ "Note: You need sysutils/hal installed for volume "
++#endif
+ "management to work."));
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
diff --git a/sysutils/gnome-volume-manager/pkg-descr b/sysutils/gnome-volume-manager/pkg-descr
new file mode 100644
index 000000000000..b8ce9b76814d
--- /dev/null
+++ b/sysutils/gnome-volume-manager/pkg-descr
@@ -0,0 +1,3 @@
+gnome-volume-manager is a desktop-level daemon that enforces volume-related
+policy in response to events received from HAL. Its goal is to implement all
+functionality as a state-machine in response to asynchronous events from HAL.
diff --git a/sysutils/gnome-volume-manager/pkg-plist b/sysutils/gnome-volume-manager/pkg-plist
new file mode 100644
index 000000000000..c26bce96f36f
--- /dev/null
+++ b/sysutils/gnome-volume-manager/pkg-plist
@@ -0,0 +1,118 @@
+bin/gnome-volume-manager
+bin/gnome-volume-properties
+share/gnome/applications/gnome-volume-properties.desktop
+share/gnome/autostart/gnome-volume-manager.desktop
+share/gnome/gnome-volume-manager/gnome-volume-properties.glade
+share/gnome/gnome-volume-manager/icons/gvm-dev-tablet.png
+share/locale/ang/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ar/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/az/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/bg/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/bn/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/bs/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ca/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/cs/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/cy/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/da/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/de/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/dz/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/el/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/en_CA/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/en_GB/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/es/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/et/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/eu/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/fa/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/fi/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/fr/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/gl/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/gu/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/he/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/hi/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/hr/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/hu/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/id/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/is/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/it/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ja/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ka/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ko/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/lt/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/lv/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/mk/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/mn/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ms/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/nb/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ne/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/nl/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/nn/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/or/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/pa/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/pl/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/pt/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ro/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ru/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/rw/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/sk/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/sq/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/sr/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/sv/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ta/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/th/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/tr/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/uk/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/vi/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/xh/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.mo
+@dirrmtry share/gnome/autostart
+@dirrm share/gnome/gnome-volume-manager/icons
+@dirrm share/gnome/gnome-volume-manager
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ang/LC_MESSAGES
+@dirrmtry share/locale/ang
diff --git a/sysutils/gstreamer-plugins-hal/Makefile b/sysutils/gstreamer-plugins-hal/Makefile
new file mode 100644
index 000000000000..6282c79a8c26
--- /dev/null
+++ b/sysutils/gstreamer-plugins-hal/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for: gstreamer-plugins-hal
+# Date created: 16 May 2006
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/sysutils/gstreamer-plugins-hal/Makefile,v 1.1 2006/05/17 12:29:05 ahze Exp $
+#
+
+CATEGORIES= sysutils
+PORTREVISION= 0
+
+COMMENT= Gstreamer hal plugin
+
+GST_PLUGIN= hal
+
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/hal-device-manager/Makefile b/sysutils/hal-device-manager/Makefile
new file mode 100644
index 000000000000..f51395471c67
--- /dev/null
+++ b/sysutils/hal-device-manager/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: hal-device-manager
+# Date created: 2006-05-18
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/sysutils/hal-device-manager/Makefile,v 1.3 2006/05/18 22:15:41 ahze Exp $
+
+PORTREVISION= 0
+CATEGORIES= sysutils gnome
+PKGNAMESUFFIX= -device-manager
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= HAL device manager
+
+HAL_SLAVE= yes
+
+MASTERDIR= ${.CURDIR}/../../sysutils/hal
+PLIST= ${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/hal-device-manager/pkg-plist b/sysutils/hal-device-manager/pkg-plist
new file mode 100644
index 000000000000..b00763e2edd5
--- /dev/null
+++ b/sysutils/hal-device-manager/pkg-plist
@@ -0,0 +1,39 @@
+bin/hal-device-manager
+%%DATADIR%%/device-manager/Const.py
+%%DATADIR%%/device-manager/Const.pyc
+%%DATADIR%%/device-manager/Const.pyo
+%%DATADIR%%/device-manager/Device.py
+%%DATADIR%%/device-manager/Device.pyc
+%%DATADIR%%/device-manager/Device.pyo
+%%DATADIR%%/device-manager/DeviceManager.py
+%%DATADIR%%/device-manager/DeviceManager.pyc
+%%DATADIR%%/device-manager/DeviceManager.pyo
+%%DATADIR%%/device-manager/GtkAttributesFacade.py
+%%DATADIR%%/device-manager/GtkAttributesFacade.pyc
+%%DATADIR%%/device-manager/GtkAttributesFacade.pyo
+%%DATADIR%%/device-manager/LibGladeApplication.py
+%%DATADIR%%/device-manager/LibGladeApplication.pyc
+%%DATADIR%%/device-manager/LibGladeApplication.pyo
+%%DATADIR%%/device-manager/Representation.py
+%%DATADIR%%/device-manager/Representation.pyc
+%%DATADIR%%/device-manager/Representation.pyo
+%%DATADIR%%/device-manager/fdo-logo.png
+%%DATADIR%%/device-manager/hal-abstract.png
+%%DATADIR%%/device-manager/hal-audio.png
+%%DATADIR%%/device-manager/hal-bus-pci.png
+%%DATADIR%%/device-manager/hal-bus-usb.png
+%%DATADIR%%/device-manager/hal-camera.png
+%%DATADIR%%/device-manager/hal-cat-cardbus.png
+%%DATADIR%%/device-manager/hal-cat-keyboard.png
+%%DATADIR%%/device-manager/hal-cat-mouse.png
+%%DATADIR%%/device-manager/hal-cdrom.png
+%%DATADIR%%/device-manager/hal-computer.png
+%%DATADIR%%/device-manager/hal-device-manager.glade
+%%DATADIR%%/device-manager/hal-flash.png
+%%DATADIR%%/device-manager/hal-floppy.png
+%%DATADIR%%/device-manager/hal-harddisk.png
+%%DATADIR%%/device-manager/hal-network.png
+%%DATADIR%%/device-manager/hal-serial-port.png
+%%DATADIR%%/device-manager/hal-unknown.png
+%%DATADIR%%/device-manager/hal-video.png
+@dirrm %%DATADIR%%/device-manager
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
new file mode 100644
index 000000000000..49391209ed7a
--- /dev/null
+++ b/sysutils/hal/Makefile
@@ -0,0 +1,113 @@
+# New ports collection makefile for: HAL
+# Date Created: 02 May 2006
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/sysutils/hal/Makefile,v 1.26 2006/10/13 10:00:57 ahze Exp $
+#
+
+PORTNAME= hal
+PORTVERSION= ${HALVERSION}.${SNAPVERSION}
+PORTREVISION?= 1
+CATEGORIES?= sysutils
+MASTER_SITES= http://www.marcuscom.com/downloads/
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT?= Hardware Abstraction Layer for simplifying device access
+
+.if !defined(HAL_SLAVE)
+LIB_DEPENDS= polkit.0:${PORTSDIR}/sysutils/policykit
+RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids \
+ isoinfo:${PORTSDIR}/sysutils/cdrtools
+.endif
+
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack gnometarget intlhack ltverhack
+USE_AUTOTOOLS= libtool:15
+USE_LDCONFIG= yes
+USE_PYTHON= yes
+CONFIGURE_ARGS= --disable-gtk-doc \
+ --with-hwdata=${LOCALBASE}/share/pciids \
+ --with-backend=freebsd \
+ --with-socket-dir=/var/run/hald \
+ --with-pid-file=/var/run/hald/hald.pid
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ GTKDOC="false"
+
+HALVERSION= 0.5.8
+SNAPVERSION= 20060917
+
+.if !defined(HAL_SLAVE)
+USE_RC_SUBR= hald
+DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${HALVERSION}
+PLIST_SUB= VERSION=${HALVERSION}
+
+PRIV_FILES= hal-power-hibernate \
+ hal-power-poweroff \
+ hal-power-reboot \
+ hal-power-suspend \
+ hal-storage-fixed-mount-change-uid \
+ hal-storage-fixed-mount \
+ hal-storage-removable-mount-change-uid \
+ hal-storage-removable-mount
+PRIV_FILES:= ${PRIV_FILES:S|$|.privilege|}
+
+RC_FILES= hal.conf:${PREFIX}/etc/dbus-1/system.d \
+ ${PRIV_FILES:S|$|:${PREFIX}/etc/PolicyKit/privilege.d|}
+PLIST_FILES= ${PRIV_FILES:S|^|%%DATADIR%%/dist/|}
+
+SUB_FILES= pkg-install pkg-deinstall
+SUB_LIST= RC_FILES="${RC_FILES}"
+.else # Slave port stuff
+LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
+RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
+
+USE_GNOME+= pygnome2
+DESKTOP_ENTRIES="Device Manager" \
+ "Examine your devices" \
+ "${DATADIR}/device-manager/hal-bus-pci.png" \
+ "hal-device-manager" \
+ "Application;System;" \
+ true
+BUILD_WRKSRC= ${WRKSRC}/tools/device-manager
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if !defined(HAL_SLAVE) && (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64")
+RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode
+.endif
+
+post-patch:
+.if !defined(HAL_SLAVE)
+ @${REINPLACE_CMD} -e 's|device-manager||' \
+ ${WRKSRC}/tools/Makefile.in
+.endif
+ @${REINPLACE_CMD} -e '/^scriptdir = /s|libdir|libexecdir|' \
+ ${WRKSRC}/tools/Makefile.in \
+ ${WRKSRC}/tools/freebsd/Makefile.in
+ @${REINPLACE_CMD} -e 's|[(]libdir[)]/hal/scripts|(libexecdir)/hal/scripts|' \
+ ${WRKSRC}/hald/Makefile.in
+ @${REINPLACE_CMD} -e '/^SUBDIRS/ s|txt||' \
+ ${WRKSRC}/policy/Makefile.in
+ @${REINPLACE_CMD} -e 's|user="0"|group="operator"|g' \
+ ${WRKSRC}/hal.conf.in
+
+post-install:
+.if !defined(HAL_SLAVE)
+ ${MKDIR} ${DATADIR}/dist
+ ${INSTALL_DATA} ${WRKSRC}/hal.conf ${WRKSRC}/policy/txt/*.privilege \
+ ${DATADIR}/dist
+ @${SETENV} PKG_PREFIX=${PREFIX} PACKAGE_BUILDING=${PACKAGE_BUILDING} \
+ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.if !defined(NOPORTDOCS)
+ ${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \
+ ${DOCSDIR}/README.freebsd
+.endif
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
new file mode 100644
index 000000000000..fbae75b4b988
--- /dev/null
+++ b/sysutils/hal/distinfo
@@ -0,0 +1,3 @@
+MD5 (hal-0.5.8.20060917.tar.bz2) = 786e8ccb7a2529c7df23ea4afdb3ff3a
+SHA256 (hal-0.5.8.20060917.tar.bz2) = d2d26318f1466a140a6fb9e8a2f425c8f81e90ddc12d292652ff52741def4264
+SIZE (hal-0.5.8.20060917.tar.bz2) = 1391794
diff --git a/sysutils/hal/files/hald.in b/sysutils/hal/files/hald.in
new file mode 100644
index 000000000000..aefba2194971
--- /dev/null
+++ b/sysutils/hal/files/hald.in
@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: hald
+# REQUIRE: DAEMON dbus polkitd
+#
+# Add the following line to /etc/rc.conf to enable the HAL daemon:
+#
+# hald_enable="YES"
+#
+
+hald_enable=${hald_enable-"NO"}
+hald_flags=${hald_flags-""}
+
+. %%RC_SUBR%%
+
+name=hald
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/sbin/hald"
+pidfile="/var/run/${name}/${name}.pid"
+
+stop_postcmd="hald_postcmd"
+start_precmd="hald_precmd"
+
+local_force_depend()
+{
+ _depend="$1"
+ if [ -f %%LOCALBASE%%/etc/rc.d/${_depend}.sh ]; then
+ _depend="${_depend}.sh"
+ fi
+
+ if ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestatus 1>/dev/null 2>&1 &&
+ ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestart; then
+ return 1
+ fi
+ return 0
+}
+
+hald_precmd()
+{
+ if ! checkyesno dbus_enable
+ then
+ local_force_depend dbus || return 1
+ fi
+
+ if ! checkyesno polkitd_enable
+ then
+ local_force_depend polkitd || return 1
+ fi
+
+ mkdir -p $(dirname $pidfile)
+}
+
+hald_postcmd()
+{
+ rm -f $pidfile
+}
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/sysutils/hal/files/patch-Makefile.in b/sysutils/hal/files/patch-Makefile.in
new file mode 100644
index 000000000000..27219f54c076
--- /dev/null
+++ b/sysutils/hal/files/patch-Makefile.in
@@ -0,0 +1,25 @@
+--- Makefile.in.orig Thu May 4 15:35:41 2006
++++ Makefile.in Thu May 4 15:36:40 2006
+@@ -377,14 +377,14 @@ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
+ install-dist_dbusDATA: $(dist_dbus_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(dbusdir)" || $(mkdir_p) "$(DESTDIR)$(dbusdir)"
+- @list='$(dist_dbus_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(dist_dbusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dbusdir)/$$f'"; \
+- $(dist_dbusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbusdir)/$$f"; \
+- done
++# @$(NORMAL_INSTALL)
++# test -z "$(dbusdir)" || $(mkdir_p) "$(DESTDIR)$(dbusdir)"
++# @list='$(dist_dbus_DATA)'; for p in $$list; do \
++# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++# f=$(am__strip_dir) \
++# echo " $(dist_dbusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dbusdir)/$$f'"; \
++# $(dist_dbusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbusdir)/$$f"; \
++# done
+
+ uninstall-dist_dbusDATA:
+ @$(NORMAL_UNINSTALL)
diff --git a/sysutils/hal/files/patch-doc_Makefile.in b/sysutils/hal/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..d05f0136ccbf
--- /dev/null
+++ b/sysutils/hal/files/patch-doc_Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig Tue May 2 01:04:31 2006
++++ doc/Makefile.in Tue May 2 01:04:42 2006
+@@ -269,7 +269,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ EXTRA_DIST = TODO
+-SUBDIRS = api spec conf
++SUBDIRS = spec conf
+ all: all-recursive
+
+ .SUFFIXES:
diff --git a/sysutils/hal/files/patch-tools_Makefile.in b/sysutils/hal/files/patch-tools_Makefile.in
new file mode 100644
index 000000000000..c5ce9282732e
--- /dev/null
+++ b/sysutils/hal/files/patch-tools_Makefile.in
@@ -0,0 +1,11 @@
+--- tools/Makefile.in.orig Tue May 2 20:23:05 2006
++++ tools/Makefile.in Tue May 2 20:23:22 2006
+@@ -325,7 +325,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = freebsd linux device-manager
++SUBDIRS = freebsd device-manager
+ INCLUDES = \
+ -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
+ -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
diff --git a/sysutils/hal/files/patch-tools_hal-device.c b/sysutils/hal/files/patch-tools_hal-device.c
new file mode 100644
index 000000000000..3cda9aa14aa7
--- /dev/null
+++ b/sysutils/hal/files/patch-tools_hal-device.c
@@ -0,0 +1,11 @@
+--- tools/hal-device.c.orig Sat Oct 7 18:15:26 2006
++++ tools/hal-device.c Sat Oct 7 18:15:34 2006
+@@ -155,7 +155,7 @@ int main(int argc, char **argv)
+
+ libhal_ctx_shutdown(hal_ctx, &error);
+ libhal_ctx_free(hal_ctx);
+- dbus_connection_disconnect(conn);
++ dbus_connection_close(conn);
+ dbus_connection_unref(conn);
+ dbus_error_free(&error);
+
diff --git a/sysutils/hal/files/patch-tools_lshal.c b/sysutils/hal/files/patch-tools_lshal.c
new file mode 100644
index 000000000000..4b7d289ef4d8
--- /dev/null
+++ b/sysutils/hal/files/patch-tools_lshal.c
@@ -0,0 +1,11 @@
+--- tools/lshal.c.orig Sat Oct 7 18:14:43 2006
++++ tools/lshal.c Sat Oct 7 18:14:59 2006
+@@ -705,7 +705,7 @@ main (int argc, char *argv[])
+ libhal_ctx_shutdown (hal_ctx, &error);
+ libhal_ctx_free (hal_ctx);
+
+- dbus_connection_disconnect (conn);
++ dbus_connection_close (conn);
+ dbus_connection_unref (conn);
+
+ if (show_device)
diff --git a/sysutils/hal/files/pkg-deinstall.in b/sysutils/hal/files/pkg-deinstall.in
new file mode 100644
index 000000000000..96f8e9f91977
--- /dev/null
+++ b/sysutils/hal/files/pkg-deinstall.in
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+[ "$2" != DEINSTALL ] && exit 0
+
+for pair in %%RC_FILES%%; do
+ file=`echo $pair | cut -f 1 -d :`
+ destdir=`echo $pair | cut -f 2 -d :`
+
+ if cmp -s %%DATADIR%%/dist/$file $destdir/$file; then
+ rm -f $destdir/$file
+ fi
+done
diff --git a/sysutils/hal/files/pkg-install.in b/sysutils/hal/files/pkg-install.in
new file mode 100644
index 000000000000..2cfda5753d4c
--- /dev/null
+++ b/sysutils/hal/files/pkg-install.in
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+[ "$2" != POST-INSTALL ] && exit 0
+
+if [ -z "${PACKAGE_BUILDING}" ]; then
+ USER=haldaemon
+ GROUP=${USER}
+ UID=560
+ GID=${UID}
+ PW=/usr/sbin/pw
+
+ if ${PW} group show "${GROUP}" 2>/dev/null; then
+ echo "You already have a group \"${GROUP}\", so I will use it."
+ else
+ if ${PW} groupadd ${GROUP} -g ${GID}; then
+ echo "Added group \"${GROUP}\"."
+ else
+ echo "Adding group \"${GROUP}\" failed..."
+ exit 1
+ fi
+ fi
+
+ if ${PW} user show "${USER}" 2>/dev/null; then
+ echo "You already have a user \"${USER}\", so I will use it."
+ else
+ if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+ -d "/nonexistent" -s /sbin/nologin -c "HAL Daemon User"
+ then
+ echo "Added user \"${USER}\"."
+ else
+ echo "Adding user \"${USER}\" failed..."
+ exit 1
+ fi
+ fi
+
+ /usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/hald
+fi
+
+for pair in %%RC_FILES%%; do
+ file=`echo $pair | cut -f 1 -d :`
+ destdir=`echo $pair | cut -f 2 -d :`
+
+ if [ ! -f $destdir/$file ]; then
+ mkdir -p $destdir
+ cp -p %%DATADIR%%/dist/$file $destdir/$file
+ fi
+done
diff --git a/sysutils/hal/pkg-descr b/sysutils/hal/pkg-descr
new file mode 100644
index 000000000000..c9435851381f
--- /dev/null
+++ b/sysutils/hal/pkg-descr
@@ -0,0 +1,6 @@
+HAL is a hardware abstraction layer whose goal is to merge information from
+various sources such that desktop applications can locate and use hardware
+devices. The point is that the exact set of information to merge varies by
+device and bus type.
+
+WWW: http://www.freedesktop.org/Software/hal
diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist
new file mode 100644
index 000000000000..99baa12014d0
--- /dev/null
+++ b/sysutils/hal/pkg-plist
@@ -0,0 +1,152 @@
+bin/hal-device
+bin/hal-find-by-capability
+bin/hal-find-by-property
+bin/hal-get-property
+bin/hal-set-property
+bin/lshal
+include/hal/libhal-storage.h
+include/hal/libhal.h
+lib/libhal-storage.a
+lib/libhal-storage.la
+lib/libhal-storage.so
+lib/libhal-storage.so.1
+lib/libhal.a
+lib/libhal.la
+lib/libhal.so
+lib/libhal.so.1
+lib/libhald_freebsd_probe.a
+lib/libhald_freebsd_probe.la
+lib/libhald_freebsd_probe.so
+lib/libhald_freebsd_probe.so.0
+libdata/pkgconfig/hal-storage.pc
+libdata/pkgconfig/hal.pc
+libexec/hal-storage-mount
+libexec/hal-system-power-pmu
+libexec/hal/scripts/hal-luks-remove
+libexec/hal/scripts/hal-luks-setup
+libexec/hal/scripts/hal-luks-teardown
+libexec/hal/scripts/hal-system-lcd-get-brightness
+libexec/hal/scripts/hal-system-lcd-get-brightness-freebsd
+libexec/hal/scripts/hal-system-lcd-set-brightness
+libexec/hal/scripts/hal-system-lcd-set-brightness-freebsd
+libexec/hal/scripts/hal-system-power-hibernate
+libexec/hal/scripts/hal-system-power-reboot
+libexec/hal/scripts/hal-system-power-reboot-freebsd
+libexec/hal/scripts/hal-system-power-set-power-save
+libexec/hal/scripts/hal-system-power-set-power-save-freebsd
+libexec/hal/scripts/hal-system-power-shutdown
+libexec/hal/scripts/hal-system-power-shutdown-freebsd
+libexec/hal/scripts/hal-system-power-suspend
+libexec/hal/scripts/hal-system-power-suspend-freebsd
+libexec/hal/scripts/hal-system-storage-cleanup-mountpoint
+libexec/hal/scripts/hal-system-storage-cleanup-mountpoints
+libexec/hal/scripts/hal-system-storage-cleanup-mountpoints-freebsd
+libexec/hal/scripts/hal-system-storage-eject
+libexec/hal/scripts/hal-system-storage-eject-freebsd
+libexec/hal/scripts/hal-system-storage-unmount
+libexec/hal/scripts/hal-system-storage-unmount-freebsd
+libexec/hald-addon-storage
+libexec/hald-probe-hiddev
+libexec/hald-probe-scsi
+libexec/hald-probe-smbios
+libexec/hald-probe-storage
+libexec/hald-probe-volume
+libexec/hald-runner
+sbin/hald
+%%PORTDOCS%%%%DOCSDIR%%/README.freebsd
+%%DOCSDIR%%/conf/match-USB-camera.fdi
+%%DOCSDIR%%/conf/match-USB-mp3-player.fdi
+%%DOCSDIR%%/conf/match-cardreader.fdi
+%%DOCSDIR%%/conf/storage-non-fixed.fdi
+%%DOCSDIR%%/conf/storage-policy-examples.fdi
+%%DOCSDIR%%/conf/storage-skip-all.fdi
+%%DATADIR%%/dist/hal.conf
+%%DATADIR%%/fdi/fdi.dtd
+%%DATADIR%%/fdi/fdi.rng
+%%DATADIR%%/fdi/information/10freedesktop/10-camera-ptp.fdi
+%%DATADIR%%/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
+%%DATADIR%%/fdi/information/10freedesktop/10-usb-card-readers.fdi
+%%DATADIR%%/fdi/information/10freedesktop/10-usb-music-players.fdi
+%%DATADIR%%/fdi/information/10freedesktop/10-usb-pda.fdi
+%%DATADIR%%/fdi/information/10freedesktop/10-usb-zip-drives.fdi
+%%DATADIR%%/fdi/information/10freedesktop/10-wireless-mice.fdi
+%%DATADIR%%/fdi/policy/10osvendor/10-keyboard-policy.fdi
+%%DATADIR%%/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
+%%DATADIR%%/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
+%%DATADIR%%/fdi/policy/10osvendor/10-toshiba-buttons.fdi
+%%DATADIR%%/fdi/policy/10osvendor/15-storage-luks.fdi
+%%DATADIR%%/fdi/policy/10osvendor/20-storage-methods.fdi
+%%DATADIR%%/fdi/preprobe/10osvendor/10-ide-drives.fdi
+share/locale/cs/LC_MESSAGES/hal.mo
+share/locale/da/LC_MESSAGES/hal.mo
+share/locale/de/LC_MESSAGES/hal.mo
+share/locale/el/LC_MESSAGES/hal.mo
+share/locale/es/LC_MESSAGES/hal.mo
+share/locale/eu/LC_MESSAGES/hal.mo
+share/locale/fi/LC_MESSAGES/hal.mo
+share/locale/fr/LC_MESSAGES/hal.mo
+share/locale/hu/LC_MESSAGES/hal.mo
+share/locale/it/LC_MESSAGES/hal.mo
+share/locale/ja/LC_MESSAGES/hal.mo
+share/locale/km/LC_MESSAGES/hal.mo
+share/locale/ko/LC_MESSAGES/hal.mo
+share/locale/lt/LC_MESSAGES/hal.mo
+share/locale/nb/LC_MESSAGES/hal.mo
+share/locale/nl/LC_MESSAGES/hal.mo
+share/locale/pa/LC_MESSAGES/hal.mo
+share/locale/pl/LC_MESSAGES/hal.mo
+share/locale/pt/LC_MESSAGES/hal.mo
+share/locale/pt_BR/LC_MESSAGES/hal.mo
+share/locale/ru/LC_MESSAGES/hal.mo
+share/locale/sl_SI/LC_MESSAGES/hal.mo
+share/locale/uk/LC_MESSAGES/hal.mo
+share/locale/zh_CN/LC_MESSAGES/hal.mo
+share/locale/zh_TW/LC_MESSAGES/hal.mo
+@dirrm %%DATADIR%%/fdi/preprobe/20thirdparty
+@dirrm %%DATADIR%%/fdi/preprobe/10osvendor
+@dirrm %%DATADIR%%/fdi/preprobe
+@dirrm %%DATADIR%%/fdi/policy/20thirdparty
+@dirrm %%DATADIR%%/fdi/policy/10osvendor
+@dirrm %%DATADIR%%/fdi/policy
+@dirrm %%DATADIR%%/fdi/information/20thirdparty
+@dirrm %%DATADIR%%/fdi/information/10freedesktop
+@dirrm %%DATADIR%%/fdi/information
+@dirrm %%DATADIR%%/fdi
+@dirrm %%DATADIR%%/dist
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%/conf
+@dirrm %%DOCSDIR%%
+@dirrm libexec/hal/scripts
+@dirrm libexec/hal
+@dirrm include/hal
+@dirrm etc/hal/fdi/preprobe
+@dirrm etc/hal/fdi/policy
+@dirrm etc/hal/fdi/information
+@dirrm etc/hal/fdi
+@dirrm etc/hal
+@unexec rm -f /var/run/hald/hald.pid 2>/dev/null || true
+@unexec rm -rf /var/run/hald/hald-local 2>/dev/null || true
+@unexec rm -rf /var/run/hald/hald-runner 2>/dev/null || true
+@unexec rmdir /var/run/hald 2>/dev/null || true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl_SI/LC_MESSAGES
+@dirrmtry share/locale/sl_SI
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 3e707accfe15..13d3a8f6f993 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.96 2006/04/13 07:52:38 bland Exp $
+# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.114 2006/10/03 13:26:18 ahze Exp $
#
PORTNAME= nautilus-cd-burner
-PORTVERSION= 2.14.3
+PORTVERSION= 2.16.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,20 +18,22 @@ COMMENT= CD burner view for Nautilus
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack intlhack nautilus2
-GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack
+INSTALLS_ICONS= yes
+USE_AUTOTOOLS= libtool:15
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-hal
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-GCONF_SCHEMAS= ncb.schemas
+GCONF_SCHEMAS= nautilus-cd-burner.schemas
OPTIONS= DVD "Enable DVD support" on \
- CJK "Use cdrtools-cjk instead of cdrtools" off
+ CJK "Use cdrtools-cjk instead of cdrtools" off \
+ GNOMEMOUNT "Enable sysutils/gnome-mount support" off
.include <bsd.port.pre.mk>
@@ -46,6 +48,14 @@ RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools
RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
.endif
+.if defined(WITH_GNOMEMOUNT)
+BUILD_DEPENDS+= gnome-mount:${PORTSDIR}/sysutils/gnome-mount
+RUN_DEPENDS+= gnome-mount:${PORTSDIR}/sysutils/gnome-mount
+CONFIGURE_ARGS+= --enable-gnome-mount
+.else
+CONFIGURE_ARGS+= --disable-gnome-mount
+.endif
+
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index 045c6176c42e..88bc7f99a7e0 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-cd-burner-2.14.3.tar.bz2) = c85642630b3db5ee0a40e2fdbf4fdf94
-SHA256 (gnome2/nautilus-cd-burner-2.14.3.tar.bz2) = 45a8ac59ff4985807a54761b9f370c6d9cd73ff4a50f1c1e1cfe24e6c9c023a3
-SIZE (gnome2/nautilus-cd-burner-2.14.3.tar.bz2) = 682257
+MD5 (gnome2/nautilus-cd-burner-2.16.1.tar.bz2) = f64e98c9b3d3a21cb54dc4d4d3983de2
+SHA256 (gnome2/nautilus-cd-burner-2.16.1.tar.bz2) = 5cc224a8dfb3bbe005f06ac6b9466e4b97bde122c5db8064b25f663e3dac8e2e
+SIZE (gnome2/nautilus-cd-burner-2.16.1.tar.bz2) = 703744
diff --git a/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c b/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c
deleted file mode 100644
index aab64aa8abb9..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mapping-protocol.c.orig Tue May 17 17:14:35 2005
-+++ mapping-protocol.c Tue May 17 17:15:24 2005
-@@ -24,6 +24,8 @@
- * William Jon McCann <mccann@jhu.edu>
- */
-
-+#include <sys/types.h>
-+#include <sys/time.h>
- #include <unistd.h>
- #include <string.h>
- #include <fcntl.h>
diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
deleted file mode 100644
index 3a68ad074232..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- nautilus-burn-drive.c.orig Wed Mar 22 11:08:38 2006
-+++ nautilus-burn-drive.c Thu Jul 13 22:15:30 2006
-@@ -687,7 +687,6 @@
- struct cd_toc_entry entry;
- int i;
- #endif
-- int type;
- #ifndef CDROM_DATA_TRACK
- #define CDROM_DATA_TRACK 4
- #endif
-@@ -699,6 +698,10 @@
-
- if (ioctl (fd, CDIOREADTOCHEADER, &header) < 0) {
- close (fd);
-+ if (errno == EINVAL)
-+ /* If you try to read the TOC header of a blank disc
-+ * on FreeBSD, you get EINVAL. */
-+ return CDS_NO_INFO;
- return -1;
- }
-
-@@ -862,7 +865,7 @@
- *is_blank = mmc_profile & 0x10000;
-
- disc_type = get_disc_type (device);
-- disc_type_get_info (disc_type, is_blank, has_data, has_audio);
-+ disc_type_get_info (disc_type, NULL, has_data, has_audio);
-
- switch (mmc_profile & 0xFFFF) {
- case -1:
-@@ -1767,7 +1770,11 @@
- #ifdef USE_GNOME_MOUNT
- cmd = g_strdup_printf ("gnome-mount --eject --no-ui --device=%s", drive->device);
- #else
-+#ifdef __FreeBSD__
-+ cmd = g_strdup_printf ("cdcontrol -f %s eject", drive->device);
-+#else
- cmd = g_strdup_printf ("eject %s", drive->device);
-+#endif
- #endif
-
- res = g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL);
diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
deleted file mode 100644
index 9d286fda0065..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- nautilus-cd-burner.c.orig Wed May 11 18:56:59 2005
-+++ nautilus-cd-burner.c Tue May 17 17:11:49 2005
-@@ -25,6 +25,8 @@
- * William Jon McCann <mccann@jhu.edu>
- */
-
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <time.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -1103,10 +1105,20 @@ burn_cd (const NautilusBurnDrive *drive,
- }
-
- if (res == NAUTILUS_BURN_RECORDER_RESULT_RETRY) {
-+ gchar *path1;
-+
-+ path1 = g_strdup_printf ("%s/.ncb", g_get_home_dir());
-+
-+ if (!g_file_test (path1, G_FILE_TEST_EXISTS)) {
-+ mkdir (path1, 0700);
-+ }
-+
- g_free (toc_filename);
- g_free (filename);
-
-- filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL);
-+ filename = g_build_filename (path1, "image.iso.XXXXXX", NULL);
-+ g_free (path1);
-+
- fd = g_mkstemp (filename);
- close (fd);
-
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
new file mode 100644
index 000000000000..9d3ce89ec982
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
@@ -0,0 +1,14 @@
+--- src/nautilus-burn-drive.c.orig Thu Jul 13 22:51:49 2006
++++ src/nautilus-burn-drive.c Thu Jul 13 22:52:25 2006
+@@ -806,7 +806,11 @@ nautilus_burn_drive_eject (NautilusBurnD
+ #ifdef USE_GNOME_MOUNT
+ cmd = g_strdup_printf ("gnome-mount --eject --no-ui --device=%s", drive->priv->device);
+ #else
++#ifdef __FreeBSD_
++ cmd = g_strdup_printf ("cdcontrol -f %s eject", drive->priv->device);
++#else
+ cmd = g_strdup_printf ("eject %s", drive->priv->device);
++#endif
+ #endif
+
+ res = g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL);
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
new file mode 100644
index 000000000000..3d5585ee2e1d
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
@@ -0,0 +1,11 @@
+--- src/nautilus-cd-burner.c.orig Tue May 9 13:31:13 2006
++++ src/nautilus-cd-burner.c Mon May 15 21:11:00 2006
+@@ -27,6 +27,8 @@
+
+ #include "config.h"
+
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include <time.h>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index 64b5322649f4..b01bd7a2615c 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -1,20 +1,26 @@
bin/nautilus-cd-burner
etc/gnome-vfs-2.0/modules/mapping-modules.conf
+include/libnautilus-burn/nautilus-burn-drive-monitor.h
include/libnautilus-burn/nautilus-burn-drive-selection.h
include/libnautilus-burn/nautilus-burn-drive.h
include/libnautilus-burn/nautilus-burn-features.h
+include/libnautilus-burn/nautilus-burn-init.h
include/libnautilus-burn/nautilus-burn-recorder.h
+include/libnautilus-burn/nautilus-burn.h
+lib/gnome-vfs-2.0/modules/libmapping.a
lib/gnome-vfs-2.0/modules/libmapping.la
lib/gnome-vfs-2.0/modules/libmapping.so
+lib/libnautilus-burn.a
lib/libnautilus-burn.la
lib/libnautilus-burn.so
-lib/libnautilus-burn.so.3
+lib/libnautilus-burn.so.4
+lib/nautilus/extensions-1.0/libnautilus-burn-extension.a
lib/nautilus/extensions-1.0/libnautilus-burn-extension.la
lib/nautilus/extensions-1.0/libnautilus-burn-extension.so
libdata/pkgconfig/libnautilus-burn.pc
libexec/mapping-daemon
share/gnome/applications/nautilus-cd-burner.desktop
-share/gnome/nautilus-cd-burner/cdburn.glade
+share/gnome/applications/nautilus-cd-burner-open-iso.desktop
share/gnome/nautilus-cd-burner/cdspin1.png
share/gnome/nautilus-cd-burner/cdspin2.png
share/gnome/nautilus-cd-burner/cdspin3.png
@@ -23,19 +29,25 @@ share/gnome/nautilus-cd-burner/cdspin5.png
share/gnome/nautilus-cd-burner/cdspin6.png
share/gnome/nautilus-cd-burner/cdspin7.png
share/gnome/nautilus-cd-burner/cdspin8.png
+share/gnome/nautilus-cd-burner/nautilus-cd-burner.glade
+share/icons/hicolor/16x16/apps/nautilus-cd-burner.png
+share/icons/hicolor/22x22/apps/nautilus-cd-burner.png
+share/icons/hicolor/24x24/apps/nautilus-cd-burner.png
+share/icons/hicolor/scalable/apps/nautilus-cd-burner.svg
share/locale/am/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ar/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/az/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/be/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/bg/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/bn/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/br/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/bn_IN/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/bs/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ca/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/cs/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/cy/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/da/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/de/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/dz/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/el/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/en_CA/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/en_GB/LC_MESSAGES/nautilus-cd-burner.mo
@@ -52,6 +64,7 @@ share/locale/he/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/hi/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/hr/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/hu/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/hy/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/id/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/is/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/it/LC_MESSAGES/nautilus-cd-burner.mo
@@ -62,13 +75,13 @@ share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/mg/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ml/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/nb/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ne/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/nl/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/nn/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/no/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/or/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/pa/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/pl/LC_MESSAGES/nautilus-cd-burner.mo
@@ -94,15 +107,59 @@ share/locale/xh/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/zh_HK/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
+@dirrm share/gnome/nautilus-cd-burner
+@dirrm include/libnautilus-burn
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrm share/gnome/nautilus-cd-burner
-@dirrm include/libnautilus-burn
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
index b9ac477da5b4..ea3446cb9e18 100644
--- a/sysutils/pessulus/Makefile
+++ b/sysutils/pessulus/Makefile
@@ -3,14 +3,14 @@
# Whom: FreeBSD GNOME Team
#
# $FreeBSD$
-# $MCom: ports/sysutils/pessulus/Makefile,v 1.3 2006/04/10 13:23:35 ahze Exp $
+# $MCom: ports/sysutils/pessulus/Makefile,v 1.11 2006/10/03 01:27:41 ahze Exp $
#
PORTNAME= pessulus
-PORTVERSION= 0.9.3
+PORTVERSION= 2.16.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -21,7 +21,7 @@ USE_GNOME= gnomehack gnomeprefix intlhack pygnome2
WANT_GNOME= yes
USE_PYTHON= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo
index aa85d94f7f57..3baeb078bf16 100644
--- a/sysutils/pessulus/distinfo
+++ b/sysutils/pessulus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pessulus-0.9.3.tar.gz) = 4bc164accf6c9eac4985a0b4f873bc03
-SHA256 (gnome2/pessulus-0.9.3.tar.gz) = f2544b059feebda2235060df75099bc92314314a9ca695cd70185ed5f3208803
-SIZE (gnome2/pessulus-0.9.3.tar.gz) = 170446
+MD5 (gnome2/pessulus-2.16.1.tar.gz) = 06ac5855204f159016de9792b98c9292
+SHA256 (gnome2/pessulus-2.16.1.tar.gz) = c9d8fb51873328ee402f6d0a02f7689a2e14db599576b0d98ba08230ac3fcf4c
+SIZE (gnome2/pessulus-2.16.1.tar.gz) = 177363
diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist
index 6ec466297d43..6d984807c4e8 100644
--- a/sysutils/pessulus/pkg-plist
+++ b/sysutils/pessulus/pkg-plist
@@ -50,6 +50,7 @@ share/gnome/applications/pessulus.desktop
share/gnome/pessulus/glade/pessulus.glade
share/locale/bg/LC_MESSAGES/pessulus.mo
share/locale/bn/LC_MESSAGES/pessulus.mo
+share/locale/bn_IN/LC_MESSAGES/pessulus.mo
share/locale/ca/LC_MESSAGES/pessulus.mo
share/locale/cs/LC_MESSAGES/pessulus.mo
share/locale/cy/LC_MESSAGES/pessulus.mo
@@ -58,6 +59,7 @@ share/locale/de/LC_MESSAGES/pessulus.mo
share/locale/dz/LC_MESSAGES/pessulus.mo
share/locale/el/LC_MESSAGES/pessulus.mo
share/locale/en_CA/LC_MESSAGES/pessulus.mo
+share/locale/en_GB/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
@@ -65,6 +67,7 @@ share/locale/fi/LC_MESSAGES/pessulus.mo
share/locale/fr/LC_MESSAGES/pessulus.mo
share/locale/gl/LC_MESSAGES/pessulus.mo
share/locale/gu/LC_MESSAGES/pessulus.mo
+share/locale/he/LC_MESSAGES/pessulus.mo
share/locale/hi/LC_MESSAGES/pessulus.mo
share/locale/hu/LC_MESSAGES/pessulus.mo
share/locale/id/LC_MESSAGES/pessulus.mo
@@ -75,31 +78,73 @@ share/locale/ko/LC_MESSAGES/pessulus.mo
share/locale/lt/LC_MESSAGES/pessulus.mo
share/locale/lv/LC_MESSAGES/pessulus.mo
share/locale/mk/LC_MESSAGES/pessulus.mo
+share/locale/ml/LC_MESSAGES/pessulus.mo
+share/locale/mn/LC_MESSAGES/pessulus.mo
+share/locale/mr/LC_MESSAGES/pessulus.mo
share/locale/nb/LC_MESSAGES/pessulus.mo
share/locale/ne/LC_MESSAGES/pessulus.mo
share/locale/nl/LC_MESSAGES/pessulus.mo
+share/locale/or/LC_MESSAGES/pessulus.mo
share/locale/pa/LC_MESSAGES/pessulus.mo
share/locale/pl/LC_MESSAGES/pessulus.mo
share/locale/pt/LC_MESSAGES/pessulus.mo
share/locale/pt_BR/LC_MESSAGES/pessulus.mo
+share/locale/ru/LC_MESSAGES/pessulus.mo
share/locale/sk/LC_MESSAGES/pessulus.mo
+share/locale/sl/LC_MESSAGES/pessulus.mo
share/locale/sq/LC_MESSAGES/pessulus.mo
share/locale/sr/LC_MESSAGES/pessulus.mo
share/locale/sr@Latn/LC_MESSAGES/pessulus.mo
share/locale/sv/LC_MESSAGES/pessulus.mo
+share/locale/ta/LC_MESSAGES/pessulus.mo
share/locale/th/LC_MESSAGES/pessulus.mo
+share/locale/tr/LC_MESSAGES/pessulus.mo
share/locale/uk/LC_MESSAGES/pessulus.mo
share/locale/vi/LC_MESSAGES/pessulus.mo
share/locale/zh_CN/LC_MESSAGES/pessulus.mo
share/locale/zh_HK/LC_MESSAGES/pessulus.mo
share/locale/zh_TW/LC_MESSAGES/pessulus.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
@dirrm share/gnome/pessulus/glade
@dirrm share/gnome/pessulus
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%PYTHON_SITELIBDIR%%/Pessulus
@dirrmtry %%PYTHON_SITELIBDIR%%
@dirrmtry %%PYTHON_LIBDIR%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile
new file mode 100644
index 000000000000..68a6b9c12107
--- /dev/null
+++ b/sysutils/policykit/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for: PolicyKit
+# Date Created: 01 May 2006
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/sysutils/policykit/Makefile,v 1.12 2006/10/07 19:45:38 marcus Exp $
+#
+
+PORTNAME= policykit
+PORTVERSION= 0.1.20060514
+PORTREVISION= 2
+CATEGORIES= sysutils gnome
+MASTER_SITES= http://www.marcuscom.com/downloads/
+DISTNAME= PolicyKit-${PORTVERSION}
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Framework for controlling access to system-wide components
+
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+
+USE_BZIP2= yes
+USE_GNOME= gnomehack gnometarget
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+CONFIGURE_ARGS= --disable-gtk-doc \
+ --with-pid-file=/var/run/polkitd/polkitd.pid \
+ --with-pam-include=system
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ GTKDOC="false"
+
+USE_RC_SUBR= polkitd
+
+post-install:
+.if !defined(PACKAGE_BUILDING)
+ @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
+
+.include <bsd.port.mk>
diff --git a/sysutils/policykit/distinfo b/sysutils/policykit/distinfo
new file mode 100644
index 000000000000..2bf4052122f3
--- /dev/null
+++ b/sysutils/policykit/distinfo
@@ -0,0 +1,3 @@
+MD5 (PolicyKit-0.1.20060514.tar.bz2) = f81ac5fb28603a4b419fca6c4efc027a
+SHA256 (PolicyKit-0.1.20060514.tar.bz2) = d9015a69d63902b091475ad2cad1b6fe012cf0e8fead6603cf822c2033c9d552
+SIZE (PolicyKit-0.1.20060514.tar.bz2) = 333800
diff --git a/sysutils/policykit/files/patch-Makefile.in b/sysutils/policykit/files/patch-Makefile.in
new file mode 100644
index 000000000000..0c9552c020d6
--- /dev/null
+++ b/sysutils/policykit/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Mon May 1 01:11:30 2006
++++ Makefile.in Mon May 1 01:11:43 2006
+@@ -231,7 +231,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = libpolkit polkitd doc tools privileges
++SUBDIRS = libpolkit polkitd tools privileges
+ pamdir = $(sysconfdir)/pam.d
+ pam_DATA = policy-kit
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
diff --git a/sysutils/policykit/files/patch-polkitd_policy.c b/sysutils/policykit/files/patch-polkitd_policy.c
new file mode 100644
index 000000000000..c633366a2b60
--- /dev/null
+++ b/sysutils/policykit/files/patch-polkitd_policy.c
@@ -0,0 +1,118 @@
+--- polkitd/policy.c.orig Tue Mar 14 07:14:33 2006
++++ polkitd/policy.c Tue May 2 01:53:06 2006
+@@ -537,13 +537,15 @@
+ int rc;
+ char *res;
+ char *buf = NULL;
+- unsigned int bufsize;
++ long bufsize;
+ struct passwd pwd;
+ struct passwd *pwdp;
+
+ res = NULL;
+
+ bufsize = sysconf (_SC_GETPW_R_SIZE_MAX);
++ if (bufsize < 0)
++ bufsize = 1024;
+ buf = g_new0 (char, bufsize);
+
+ rc = getpwuid_r (uid, &pwd, buf, bufsize, &pwdp);
+@@ -567,13 +569,15 @@
+ int rc;
+ char *res;
+ char *buf = NULL;
+- unsigned int bufsize;
++ long bufsize;
+ struct group gbuf;
+ struct group *gbufp;
+
+ res = NULL;
+
+ bufsize = sysconf (_SC_GETGR_R_SIZE_MAX);
++ if (bufsize < 0)
++ bufsize = 1024;
+ buf = g_new0 (char, bufsize);
+
+ rc = getgrgid_r (gid, &gbuf, buf, bufsize, &gbufp);
+@@ -597,13 +601,15 @@
+ int rc;
+ uid_t res;
+ char *buf = NULL;
+- unsigned int bufsize;
++ long bufsize;
+ struct passwd pwd;
+ struct passwd *pwdp;
+
+ res = (uid_t) -1;
+
+ bufsize = sysconf (_SC_GETPW_R_SIZE_MAX);
++ if (bufsize < 0)
++ bufsize = 1024;
+ buf = g_new0 (char, bufsize);
+
+ rc = getpwnam_r (username, &pwd, buf, bufsize, &pwdp);
+@@ -627,13 +633,15 @@
+ int rc;
+ gid_t res;
+ char *buf = NULL;
+- unsigned int bufsize;
++ long bufsize;
+ struct group gbuf;
+ struct group *gbufp;
+
+ res = (gid_t) -1;
+
+ bufsize = sysconf (_SC_GETGR_R_SIZE_MAX);
++ if (bufsize < 0)
++ bufsize = 1024;
+ buf = g_new0 (char, bufsize);
+
+ rc = getgrnam_r (groupname, &gbuf, buf, bufsize, &gbufp);
+@@ -649,6 +657,23 @@
+ return res;
+ }
+
++static int
++getgrouplist_ala_linux (const char *name,
++ gid_t basegid,
++ gid_t *groups,
++ int *ngroups)
++{
++ if (groups)
++ return getgrouplist (name, basegid, groups, ngroups);
++ else {
++ for (*ngroups = 1;; (*ngroups)++) {
++ gid_t _groups[*ngroups];
++ if (getgrouplist (name, basegid, _groups, ngroups) != -1)
++ return 0;
++ }
++ }
++}
++
+ PolicyResult
+ policy_get_allowed_resources_for_policy_for_uid (uid_t uid,
+ const char *policy,
+@@ -665,9 +690,9 @@
+ if ((username = policy_util_uid_to_name (uid, &default_gid)) == NULL)
+ goto out;
+
+- if (getgrouplist(username, default_gid, NULL, &num_groups) < 0) {
++ if (getgrouplist_ala_linux(username, default_gid, NULL, &num_groups) < 0) {
+ groups = (gid_t *) g_new0 (gid_t, num_groups);
+- if (getgrouplist(username, default_gid, groups, &num_groups) < 0) {
++ if (getgrouplist_ala_linux(username, default_gid, groups, &num_groups) < 0) {
+ g_warning ("getgrouplist() failed");
+ goto out;
+ }
+@@ -702,9 +727,9 @@
+ if ((username = policy_util_uid_to_name (uid, &default_gid)) == NULL)
+ goto out;
+
+- if (getgrouplist(username, default_gid, NULL, &num_groups) < 0) {
++ if (getgrouplist_ala_linux(username, default_gid, NULL, &num_groups) < 0) {
+ groups = (gid_t *) g_new0 (gid_t, num_groups);
+- if (getgrouplist(username, default_gid, groups, &num_groups) < 0) {
++ if (getgrouplist_ala_linux(username, default_gid, groups, &num_groups) < 0) {
+ g_warning ("getgrouplist() failed");
+ goto out;
+ }
diff --git a/sysutils/policykit/files/patch-tools_Makefile.in b/sysutils/policykit/files/patch-tools_Makefile.in
new file mode 100644
index 000000000000..9308ff774f36
--- /dev/null
+++ b/sysutils/policykit/files/patch-tools_Makefile.in
@@ -0,0 +1,14 @@
+--- tools/Makefile.in.orig Sun Oct 8 03:37:21 2006
++++ tools/Makefile.in Sun Oct 8 03:37:37 2006
+@@ -252,9 +252,9 @@ INCLUDES = \
+ @DBUS_CFLAGS@
+
+ polkit_is_privileged_SOURCES = polkit-is-privileged.c
+-polkit_is_privileged_LDADD = @DBUS_CFLAGS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la
++polkit_is_privileged_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la
+ polkit_list_privileges_SOURCES = polkit-list-privileges.c
+-polkit_list_privileges_LDADD = @DBUS_CFLAGS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la
++polkit_list_privileges_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la
+ polkit_grant_privilege_SOURCES = \
+ polkit-grant-privilege.c \
+ polkit-interface-manager-glue.h \
diff --git a/sysutils/policykit/files/polkitd.in b/sysutils/policykit/files/polkitd.in
new file mode 100644
index 000000000000..3ded54522dff
--- /dev/null
+++ b/sysutils/policykit/files/polkitd.in
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: polkitd
+# REQUIRE: DAEMON dbus
+#
+# Add the following line to /etc/rc.conf to enable the PolicyKit daemon:
+#
+# polkitd_enable="YES"
+#
+
+polkitd_enable=${polkitd_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name=polkitd
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/sbin/polkitd"
+pidfile="/var/run/${name}/${name}.pid"
+
+start_precmd="polkitd_precmd"
+stop_postcmd="polkitd_postcmd"
+
+local_force_depend()
+{
+ _depend="$1"
+ if [ -f %%LOCALBASE%%/etc/rc.d/${_depend}.sh ]; then
+ _depend="${_depend}.sh"
+ fi
+
+ if ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestatus 1>/dev/null 2>&1 &&
+ ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestart; then
+ return 1
+ fi
+ return 0
+}
+
+polkitd_precmd()
+{
+ if ! checkyesno dbus_enable
+ then
+ local_force_depend dbus || return 1
+ fi
+
+ mkdir -p $(dirname $pidfile)
+}
+
+polkitd_postcmd()
+{
+ rm -f $pidfile
+}
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/sysutils/policykit/pkg-descr b/sysutils/policykit/pkg-descr
new file mode 100644
index 000000000000..5c002310127b
--- /dev/null
+++ b/sysutils/policykit/pkg-descr
@@ -0,0 +1,4 @@
+PolicyKit is a framework for defining policy for system-wide components and
+for desktop pieces to configure it. It is used by HAL.
+
+WWW: http://www.freedesktop.org/Software/hal
diff --git a/sysutils/policykit/pkg-install b/sysutils/policykit/pkg-install
new file mode 100644
index 000000000000..7c7d4baca2c9
--- /dev/null
+++ b/sysutils/policykit/pkg-install
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+ USER=polkit
+ GROUP=${USER}
+ UID=559
+ GID=${UID}
+ PW=/usr/sbin/pw
+
+ if ${PW} group show "${GROUP}" 2>/dev/null; then
+ echo "You already have a group \"${GROUP}\", so I will use it."
+ else
+ if ${PW} groupadd ${GROUP} -g ${GID}; then
+ echo "Added group \"${GROUP}\"."
+ else
+ echo "Adding group \"${GROUP}\" failed..."
+ exit 1
+ fi
+ fi
+
+ if ${PW} user show "${USER}" 2>/dev/null; then
+ echo "You already have a user \"${USER}\", so I will use it."
+ else
+ if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+ -d "/nonexistent" -s /sbin/nologin -c "PolicyKit Daemon User"
+ then
+ echo "Added user \"${USER}\"."
+ else
+ echo "Adding user \"${USER}\" failed..."
+ exit 1
+ fi
+ fi
+
+ /usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/polkitd
+ exit 0
+ ;;
+esac
diff --git a/sysutils/policykit/pkg-plist b/sysutils/policykit/pkg-plist
new file mode 100644
index 000000000000..66c27dc14847
--- /dev/null
+++ b/sysutils/policykit/pkg-plist
@@ -0,0 +1,19 @@
+bin/polkit-grant-privilege
+bin/polkit-is-privileged
+bin/polkit-list-privileges
+bin/polkit-revoke-privilege
+etc/PolicyKit/privilege.d/desktop-console.privilege
+etc/dbus-1/system.d/PolicyKit.conf
+etc/pam.d/policy-kit
+include/libpolkit/libpolkit.h
+lib/libpolkit.a
+lib/libpolkit.la
+lib/libpolkit.so
+lib/libpolkit.so.0
+libdata/pkgconfig/polkit.pc
+sbin/polkitd
+@dirrm include/libpolkit
+@dirrm etc/PolicyKit/privilege.d
+@dirrm etc/PolicyKit
+@unexec rm -f /var/run/polkitd/polkitd.pid 2>/dev/null || true
+@unexec rmdir /var/run/polkitd 2>/dev/null || true
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index c2eafe8a0ef1..31268961482d 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.12 2005/09/04 18:51:49 marcus Exp $
+# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.21 2006/07/27 03:59:24 marcus Exp $
#
PORTNAME= system-tools-backends
PORTVERSION= 1.4.2
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4
@@ -20,7 +21,6 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_GETTEXT= yes
-PREFIX?= ${X11BASE}
USE_GNOME= gnomehack gnometarget intlhack
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -32,12 +32,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
.endif
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-MTREE_FILE= /etc/mtree/BSD.x11.dist
-.else
-MTREE_FILE= /etc/mtree/BSD.x11-4.dist
-.endif
-
.if ${PERL_LEVEL} < 500600
post-configure:
@${FIND} ${WRKSRC} \( -name "*.pl" -or -name "*-conf" \) | \
diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist
index 92fa9e5ef655..e6bc30c63021 100644
--- a/sysutils/system-tools-backends/pkg-plist
+++ b/sysutils/system-tools-backends/pkg-plist
@@ -97,7 +97,37 @@ share/setup-tool-backends/scripts/xml.pl
@dirrm share/setup-tool-backends/scripts
@dirrm share/setup-tool-backends/files
@dirrm share/setup-tool-backends
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index df5e4f00f5fb..2891a55846c1 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnome-doc-utils
-PORTVERSION= 0.6.1
+PORTVERSION= 0.7.2
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-doc-utils/0.6
+MASTER_SITE_SUBDIR= sources/gnome-doc-utils/0.7
DISTNAME= gnome-doc-utils-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
@@ -21,8 +21,6 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper \
${LOCALBASE}/share/xml/docbook/4.3/catalog.xml:${PORTSDIR}/textproc/docbook-xml-430 \
${LOCALBASE}/share/xml/docbook/4.4/catalog.xml:${PORTSDIR}/textproc/docbook-xml-440
-PREFIX?= ${X11BASE}
-
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
@@ -36,15 +34,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN1= xml2po.1
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-MTREE_FILE= /etc/mtree/BSD.x11.dist
-.else
-MTREE_FILE= /etc/mtree/BSD.x11-4.dist
-.endif
-
post-install:
@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PREFIX}/share/xml2po
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo
index f61cd85d3f95..c6b6c87e5783 100644
--- a/textproc/gnome-doc-utils/distinfo
+++ b/textproc/gnome-doc-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-doc-utils-0.6.1.tar.bz2) = c706b807b15e07e58561f903c0f20c26
-SHA256 (gnome-doc-utils-0.6.1.tar.bz2) = 85bde5ddbc6539961acde3e6f5ad10e671197633b765f7351dba7dc1e8d35b11
-SIZE (gnome-doc-utils-0.6.1.tar.bz2) = 384898
+MD5 (gnome-doc-utils-0.7.2.tar.bz2) = 3f3903e5a3e3b05261498d907f2471a9
+SHA256 (gnome-doc-utils-0.7.2.tar.bz2) = aa2f8fed9aa95aff9c2a7d627a85cc428cef3dfa0cccd538dcfc41446bde8b8d
+SIZE (gnome-doc-utils-0.7.2.tar.bz2) = 405767
diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist
index 84f50de7d97f..054f92b11100 100644
--- a/textproc/gnome-doc-utils/pkg-plist
+++ b/textproc/gnome-doc-utils/pkg-plist
@@ -4,6 +4,9 @@ libdata/pkgconfig/gnome-doc-utils.pc
libdata/pkgconfig/xml2po.pc
share/aclocal/gnome-doc-utils.m4
%%DATADIR%%/gnome-doc-utils.make
+%%DATADIR%%/template-document.xml
+%%DATADIR%%/template.make
+%%DATADIR%%/template.omf.in
share/gnome/help/gnome-doc-make/C/gnome-doc-make.xml
share/gnome/help/gnome-doc-make/C/legal.xml
share/gnome/help/gnome-doc-make/C/make-ref.xml
@@ -48,6 +51,7 @@ share/gnome/omf/gnome-doc-xslt/gnome-doc-xslt-C.omf
share/locale/ar/LC_MESSAGES/gnome-doc-utils.mo
share/locale/bg/LC_MESSAGES/gnome-doc-utils.mo
share/locale/bn/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-doc-utils.mo
share/locale/ca/LC_MESSAGES/gnome-doc-utils.mo
share/locale/cs/LC_MESSAGES/gnome-doc-utils.mo
share/locale/cy/LC_MESSAGES/gnome-doc-utils.mo
@@ -72,10 +76,12 @@ share/locale/ja/LC_MESSAGES/gnome-doc-utils.mo
share/locale/ka/LC_MESSAGES/gnome-doc-utils.mo
share/locale/ko/LC_MESSAGES/gnome-doc-utils.mo
share/locale/lt/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/lv/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/ml/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/mn/LC_MESSAGES/gnome-doc-utils.mo
share/locale/nb/LC_MESSAGES/gnome-doc-utils.mo
share/locale/ne/LC_MESSAGES/gnome-doc-utils.mo
share/locale/nl/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/no/LC_MESSAGES/gnome-doc-utils.mo
share/locale/pa/LC_MESSAGES/gnome-doc-utils.mo
share/locale/pt/LC_MESSAGES/gnome-doc-utils.mo
share/locale/pt_BR/LC_MESSAGES/gnome-doc-utils.mo
@@ -152,18 +158,48 @@ share/xml2po/ubuntu.pyc
@dirrm share/xml/gnome/xslt
@dirrm share/xml/gnome
@dirrm share/xml
+@dirrm share/gnome/omf/gnome-doc-xslt
+@dirrm share/gnome/omf/gnome-doc-make
+@dirrm share/gnome/help/gnome-doc-xslt/C
+@dirrm share/gnome/help/gnome-doc-xslt
+@dirrm share/gnome/help/gnome-doc-make/C
+@dirrm share/gnome/help/gnome-doc-make
+@dirrm %%DATADIR%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrm share/gnome/omf/gnome-doc-xslt
-@dirrm share/gnome/omf/gnome-doc-make
-@dirrm share/gnome/help/gnome-doc-xslt/C
-@dirrm share/gnome/help/gnome-doc-xslt
-@dirrm share/gnome/help/gnome-doc-make/C
-@dirrm share/gnome/help/gnome-doc-make
-@dirrm %%DATADIR%%
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 6a57a79f0dac..b9cb3c0d1de8 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -3,11 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/textproc/gnome-spell/Makefile,v 1.9 2006/07/23 01:44:27 mezz Exp $
#
PORTNAME= gnome-spell
PORTVERSION= 1.0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-spell/1.0
@@ -20,7 +21,7 @@ COMMENT= A GNOME/Bonobo component for spell checking
LIB_DEPENDS= aspell.16:${PORTSDIR}/textproc/aspell
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
diff --git a/textproc/gnome-spell/pkg-plist b/textproc/gnome-spell/pkg-plist
index b06e57d5d1ac..2f03a7e498da 100644
--- a/textproc/gnome-spell/pkg-plist
+++ b/textproc/gnome-spell/pkg-plist
@@ -57,3 +57,37 @@ share/locale/zh_CN/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
@dirrmtry share/gnome/control-center-2.0
@dirrm share/gnome/gnome-spell-%%VERSION%%
@dirrm lib/gnome-spell
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 83c25f91bbf9..fdf51c6c3e17 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -3,11 +3,11 @@
# Whom: Rene Hexel <rh@netbsd.org>
#
# $FreeBSD$
-#
+# $MCom: ports/textproc/scrollkeeper/Makefile,v 1.2 2006/09/10 00:51:13 mezz Exp $
PORTNAME= scrollkeeper
PORTVERSION= 0.3.14
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -24,12 +24,6 @@ RUN_DEPENDS= intltool-extract:${PORTSDIR}/textproc/intltool \
${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/docbook.cat:${PORTSDIR}/textproc/docbook-sk \
${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
-# Don't use USE_X_PREFIX - the port doesn't really require X11 to run.
-# The reason why it should be in X11BASE is that GNOME is the primary
-# (only?) consumer of this port, and BadThings[tm] happen if it's not
-# put in the right place.
-PREFIX?= ${X11BASE}
-
DOCBOOK_VERSION= 4.1.2
USE_BZIP2= yes
@@ -38,7 +32,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_BISON= yes
USE_GNOME= gnomehack gnomehier gnometarget libxslt intlhack
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --localstatedir=/var --datadir=${PREFIX}/share/gnome \
--with-omfdirs=${PREFIX}/share/gnome/omf \
--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
@@ -55,12 +49,6 @@ MAN8= scrollkeeper-preinstall.8 scrollkeeper-rebuilddb.8 \
.include <bsd.port.pre.mk>
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-MTREE_FILE= /etc/mtree/BSD.x11.dist
-.else
-MTREE_FILE= /etc/mtree/BSD.x11-4.dist
-.endif
-
post-patch:
@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
's|[(]LN_S[)] -f -n|(LN_S) -f|g'
diff --git a/textproc/scrollkeeper/pkg-plist b/textproc/scrollkeeper/pkg-plist
index 49289b7ded61..dafc0c8fe4f1 100644
--- a/textproc/scrollkeeper/pkg-plist
+++ b/textproc/scrollkeeper/pkg-plist
@@ -135,3 +135,31 @@ share/locale/zh_TW/LC_MESSAGES/scrollkeeper.mo
@unexec %%LOCALBASE%%/bin/xmlcatalog --noout --del %D/share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd %%LOCALBASE%%/share/xml/catalog.ports || true
@exec touch -f /var/log/scrollkeeper.log
@exec mkdir -p /var/db/scrollkeeper
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index be9f2e0cab97..a28b48cfb275 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.72 2006/04/24 04:49:23 marcus Exp $
+# $MCom: ports/www/epiphany-extensions/Makefile,v 1.78 2006/10/03 20:07:26 mezz Exp $
#
PORTNAME= epiphany
-PORTVERSION= 2.14.1.1
+PORTVERSION= 2.16.1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,7 +23,7 @@ RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GECKO= firefox mozilla seamonkey firefox-devel<->firefox
USE_GNOME= gnomeprefix gnomehack intlhack gnometarget
INSTALLS_OMF= yes
@@ -35,7 +35,7 @@ CONFIGURE_ARGS= --with-mozilla=${GECKO}
EPHY_EXTENSIONS=all
-PLIST_SUB= VERSION="2.14" EPHY_VERSION="2.14"
+PLIST_SUB= VERSION="2.16" EPHY_VERSION="2.16"
OPTIONS= OPENSP "Enable OpenSP SGML support" off \
ADBLOCK "Enable the adblock extension" on
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index 8aebb85f91ab..706a35e6867e 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-extensions-2.14.1.1.tar.bz2) = 3e807a83f068e41ce34c3c653a3353b6
-SHA256 (gnome2/epiphany-extensions-2.14.1.1.tar.bz2) = a83b5e0e38afc254a22a430697f29f1fa7db9d6e52ebc16ee793f39a28a310d2
-SIZE (gnome2/epiphany-extensions-2.14.1.1.tar.bz2) = 789039
+MD5 (gnome2/epiphany-extensions-2.16.1.tar.bz2) = 93a8d37175dc1f173c0185c254de5c38
+SHA256 (gnome2/epiphany-extensions-2.16.1.tar.bz2) = 315ef2eeaf2943830bdf04958af613dce62574aa6697acfab335a0b9e4f699c5
+SIZE (gnome2/epiphany-extensions-2.16.1.tar.bz2) = 810858
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index 1c4008cdd651..fc38f54f0ca0 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -107,7 +107,6 @@ share/locale/lt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/nb/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ne/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/nl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-share/locale/no/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/pa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/pl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/pt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -120,13 +119,13 @@ share/locale/sr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/sv/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/th/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/tr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/uk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/vi/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/wa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
@dirrm share/gnome/omf/epiphany-extensions
@dirrm share/gnome/help/epiphany-extensions/C/figures
@dirrm share/gnome/help/epiphany-extensions/C
@@ -138,3 +137,35 @@ share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@dirrmtry lib/epiphany/%%VERSION%%/plugins
@dirrmtry lib/epiphany/%%VERSION%%
@dirrmtry lib/epiphany
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index a2886a882de5..543f1a2d2fcb 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,43 +3,44 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany/Makefile,v 1.112 2006/04/13 07:52:38 bland Exp $
+# $MCom: ports/www/epiphany/Makefile,v 1.128 2006/10/12 20:03:10 ahze Exp $
#
PORTNAME= epiphany
-PORTVERSION= 2.14.3
+PORTVERSION= 2.16.1
+PORTREVISION= 1
CATEGORIES= www gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= An extremely lightweight and simple web browser for GNOME 2
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+USE_LDCONFIG= yes
+INSTALLS_ICONS= yes
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_PYTHON= yes
GNOME_DESKTOP_VERSION=2
-USE_GECKO= firefox mozilla seamonkey firefox-devel<->firefox
-USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils \
- libgnomeprintui
+USE_GECKO= firefox mozilla seamonkey firefox-devel<->firefox xulrunner
+USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils
WANT_GNOME= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
-CONFIGURE_ARGS= --with-mozilla=${GECKO}
+CONFIGURE_ARGS= --with-mozilla=${GECKO} --mandir=${PREFIX}/man
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas \
epiphany-fonts.schemas epiphany-pango.schemas
-PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}" \
+PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}" \
EPHY_PREFIX="${PREFIX}"
MAN1= epiphany.1
@@ -51,6 +52,7 @@ WITH_GNOME= yes
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
+#.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
NO_WERROR= yes
# allow build with more warnings enabled
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index b192208b751d..7829042ac7cc 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-2.14.3.tar.bz2) = 40ec39f661ed603d15dc01c86e08d384
-SHA256 (gnome2/epiphany-2.14.3.tar.bz2) = 1acc18428a14806a767f4a10c51d235483dc48b8f42f75c4afe95487f7cf36a0
-SIZE (gnome2/epiphany-2.14.3.tar.bz2) = 3626121
+MD5 (gnome2/epiphany-2.16.1.tar.bz2) = 25fecb147b1c68cc71d2af2bac727724
+SHA256 (gnome2/epiphany-2.16.1.tar.bz2) = edc36ae24624cae00aa06dde6475c31574d5fc281612dfd1e51cda63c7a9300a
+SIZE (gnome2/epiphany-2.16.1.tar.bz2) = 3761594
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index b2ecc45df1d5..9be25d1c4645 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -88,6 +88,7 @@ share/gnome/epiphany/epiphany-ui.xml
share/gnome/epiphany/epiphany.xhtml
share/gnome/epiphany/glade/certificate-dialogs.glade
share/gnome/epiphany/glade/epiphany.glade
+share/gnome/epiphany/glade/form-signing-dialog.glade
share/gnome/epiphany/glade/prefs-dialog.glade
share/gnome/epiphany/glade/print.glade
share/gnome/epiphany/mime-types-permissions.xml
@@ -122,6 +123,11 @@ share/gnome/help/epiphany/fi/figures/ephy-addressbar-smartbookmark-screenshot.pn
share/gnome/help/epiphany/fi/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/fi/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/fi/figures/ephy-screenshot.png
+share/gnome/help/epiphany/fr/epiphany.xml
+share/gnome/help/epiphany/fr/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/fr/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/fr/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/fr/figures/ephy-screenshot.png
share/gnome/help/epiphany/ja/epiphany.xml
share/gnome/help/epiphany/ja/figures/ephy-addressbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/ja/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -132,6 +138,11 @@ share/gnome/help/epiphany/nl/figures/ephy-addressbar-smartbookmark-screenshot.pn
share/gnome/help/epiphany/nl/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/nl/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/nl/figures/ephy-screenshot.png
+share/gnome/help/epiphany/ru/epiphany.xml
+share/gnome/help/epiphany/ru/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/ru/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/ru/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/ru/figures/ephy-screenshot.png
share/gnome/help/epiphany/sv/epiphany.xml
share/gnome/help/epiphany/sv/figures/ephy-addressbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/sv/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -148,18 +159,20 @@ share/gnome/omf/epiphany/epiphany-el.omf
share/gnome/omf/epiphany/epiphany-es.omf
share/gnome/omf/epiphany/epiphany-eu.omf
share/gnome/omf/epiphany/epiphany-fi.omf
+share/gnome/omf/epiphany/epiphany-fr.omf
share/gnome/omf/epiphany/epiphany-ja.omf
share/gnome/omf/epiphany/epiphany-nl.omf
+share/gnome/omf/epiphany/epiphany-ru.omf
share/gnome/omf/epiphany/epiphany-sv.omf
share/gnome/omf/epiphany/epiphany-uk.omf
-share/gnome/pixmaps/epiphany-bookmarks.png
+share/icons/hicolor/48x48/apps/epiphany-bookmarks.png
share/locale/am/LC_MESSAGES/epiphany.mo
share/locale/ar/LC_MESSAGES/epiphany.mo
share/locale/az/LC_MESSAGES/epiphany.mo
share/locale/be/LC_MESSAGES/epiphany.mo
share/locale/bg/LC_MESSAGES/epiphany.mo
share/locale/bn/LC_MESSAGES/epiphany.mo
-share/locale/br/LC_MESSAGES/epiphany.mo
+share/locale/bn_IN/LC_MESSAGES/epiphany.mo
share/locale/bs/LC_MESSAGES/epiphany.mo
share/locale/ca/LC_MESSAGES/epiphany.mo
share/locale/cs/LC_MESSAGES/epiphany.mo
@@ -193,16 +206,18 @@ share/locale/ku/LC_MESSAGES/epiphany.mo
share/locale/li/LC_MESSAGES/epiphany.mo
share/locale/lt/LC_MESSAGES/epiphany.mo
share/locale/lv/LC_MESSAGES/epiphany.mo
+share/locale/mg/LC_MESSAGES/epiphany.mo
share/locale/mi/LC_MESSAGES/epiphany.mo
share/locale/mk/LC_MESSAGES/epiphany.mo
share/locale/ml/LC_MESSAGES/epiphany.mo
share/locale/mn/LC_MESSAGES/epiphany.mo
+share/locale/mr/LC_MESSAGES/epiphany.mo
share/locale/ms/LC_MESSAGES/epiphany.mo
share/locale/nb/LC_MESSAGES/epiphany.mo
share/locale/ne/LC_MESSAGES/epiphany.mo
share/locale/nl/LC_MESSAGES/epiphany.mo
share/locale/nn/LC_MESSAGES/epiphany.mo
-share/locale/no/LC_MESSAGES/epiphany.mo
+share/locale/or/LC_MESSAGES/epiphany.mo
share/locale/pa/LC_MESSAGES/epiphany.mo
share/locale/pl/LC_MESSAGES/epiphany.mo
share/locale/pt/LC_MESSAGES/epiphany.mo
@@ -227,27 +242,19 @@ share/locale/wa/LC_MESSAGES/epiphany.mo
share/locale/zh_CN/LC_MESSAGES/epiphany.mo
share/locale/zh_HK/LC_MESSAGES/epiphany.mo
share/locale/zh_TW/LC_MESSAGES/epiphany.mo
-@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/mi/LC_MESSAGES
-@dirrmtry share/locale/mi
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
@dirrm share/gnome/omf/epiphany
@dirrm share/gnome/help/epiphany/uk/figures
@dirrm share/gnome/help/epiphany/uk
@dirrm share/gnome/help/epiphany/sv/figures
@dirrm share/gnome/help/epiphany/sv
+@dirrm share/gnome/help/epiphany/ru/figures
+@dirrm share/gnome/help/epiphany/ru
@dirrm share/gnome/help/epiphany/nl/figures
@dirrm share/gnome/help/epiphany/nl
@dirrm share/gnome/help/epiphany/ja/figures
@dirrm share/gnome/help/epiphany/ja
+@dirrm share/gnome/help/epiphany/fr/figures
+@dirrm share/gnome/help/epiphany/fr
@dirrm share/gnome/help/epiphany/fi/figures
@dirrm share/gnome/help/epiphany/fi
@dirrm share/gnome/help/epiphany/eu/figures
@@ -278,3 +285,61 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
%%PYTHON%%@cwd %%LOCALBASE%%
%%PYTHON%%share/pygtk/2.0/defs/epiphany.defs
%%PYTHON%%@cwd %%EPHY_PREFIX%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index 240f13068110..52363d877848 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -3,11 +3,11 @@
# Whom: Koop Mast <kwm@rainbow-runner.nl>
#
# $FreeBSD$
-# $MCom: ports/www/evolution-webcal/Makefile,v 1.37 2006/04/15 06:53:55 marcus Exp $
+# $MCom: ports/www/evolution-webcal/Makefile,v 1.41 2006/09/04 05:53:25 marcus Exp $
#
PORTNAME= webcal
-PORTVERSION= 2.6.0
+PORTVERSION= 2.8.0
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,10 +17,11 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Webcal(endar) handler for gnome
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
+USE_PERL= yes
USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver libgnomeui
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo
index 930fe4babf9c..251b8a724312 100644
--- a/www/evolution-webcal/distinfo
+++ b/www/evolution-webcal/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-webcal-2.6.0.tar.bz2) = c779dcfc1db419f019abfcaafd6b8e4d
-SHA256 (evolution-webcal-2.6.0.tar.bz2) = 93f3ecb53a0ef30d04e7113355f6566cbac939ca2f995d3347e7bb1b3f5f5a80
-SIZE (evolution-webcal-2.6.0.tar.bz2) = 151657
+MD5 (evolution-webcal-2.8.0.tar.bz2) = 6dd4821ce90e238acbd8a959fee1ee14
+SHA256 (evolution-webcal-2.8.0.tar.bz2) = 485fb66cd50ba18dde547653cd6a41443a08be74293833552bdde49f402fb554
+SIZE (evolution-webcal-2.8.0.tar.bz2) = 162495
diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist
index 0f6f3709673a..0fd96d489f15 100644
--- a/www/evolution-webcal/pkg-plist
+++ b/www/evolution-webcal/pkg-plist
@@ -3,6 +3,7 @@ share/locale/ar/LC_MESSAGES/evolution-webcal.mo
share/locale/az/LC_MESSAGES/evolution-webcal.mo
share/locale/bg/LC_MESSAGES/evolution-webcal.mo
share/locale/bn/LC_MESSAGES/evolution-webcal.mo
+share/locale/bn_IN/LC_MESSAGES/evolution-webcal.mo
share/locale/bs/LC_MESSAGES/evolution-webcal.mo
share/locale/ca/LC_MESSAGES/evolution-webcal.mo
share/locale/cs/LC_MESSAGES/evolution-webcal.mo
@@ -30,7 +31,10 @@ share/locale/ka/LC_MESSAGES/evolution-webcal.mo
share/locale/ko/LC_MESSAGES/evolution-webcal.mo
share/locale/ky/LC_MESSAGES/evolution-webcal.mo
share/locale/lt/LC_MESSAGES/evolution-webcal.mo
+share/locale/lv/LC_MESSAGES/evolution-webcal.mo
share/locale/mk/LC_MESSAGES/evolution-webcal.mo
+share/locale/ml/LC_MESSAGES/evolution-webcal.mo
+share/locale/mr/LC_MESSAGES/evolution-webcal.mo
share/locale/ms/LC_MESSAGES/evolution-webcal.mo
share/locale/nb/LC_MESSAGES/evolution-webcal.mo
share/locale/ne/LC_MESSAGES/evolution-webcal.mo
@@ -44,6 +48,7 @@ share/locale/ro/LC_MESSAGES/evolution-webcal.mo
share/locale/ru/LC_MESSAGES/evolution-webcal.mo
share/locale/rw/LC_MESSAGES/evolution-webcal.mo
share/locale/sk/LC_MESSAGES/evolution-webcal.mo
+share/locale/sl/LC_MESSAGES/evolution-webcal.mo
share/locale/sq/LC_MESSAGES/evolution-webcal.mo
share/locale/sr/LC_MESSAGES/evolution-webcal.mo
share/locale/sr@Latn/LC_MESSAGES/evolution-webcal.mo
@@ -56,14 +61,53 @@ share/locale/uk/LC_MESSAGES/evolution-webcal.mo
share/locale/vi/LC_MESSAGES/evolution-webcal.mo
share/locale/xh/LC_MESSAGES/evolution-webcal.mo
share/locale/zh_CN/LC_MESSAGES/evolution-webcal.mo
+share/locale/zh_HK/LC_MESSAGES/evolution-webcal.mo
share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 7ed74bfeafa2..f5b9ce6e48bf 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -3,21 +3,20 @@
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/firefox/Makefile,v 1.29 2006/02/01 02:11:23 ahze Exp $
-#
+# $MCom: ports/www/firefox/Makefile,v 1.36 2006/10/05 21:37:18 mezz Exp $
PORTNAME= firefox
DISTVERSION= 1.5.0.7
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
+MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
DISTNAME= ${PORTNAME}-${DISTVERSION}-source
MAINTAINER= gnome@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
-USE_X_PREFIX= yes
WANT_GNOME= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
@@ -76,6 +75,7 @@ pre-install:
${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
.if !defined(WITHOUT_NEWTAB)
${ECHO_CMD} >> ${SYSTEM_PREFS}
${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
@@ -101,5 +101,5 @@ post-install:
${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm
${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
-.include "${.CURDIR}/../mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.include <bsd.port.post.mk>
diff --git a/www/firefox-esr/files/patch-configure b/www/firefox-esr/files/patch-configure
index c3d2a1b9bbe6..923cf5065f18 100644
--- a/www/firefox-esr/files/patch-configure
+++ b/www/firefox-esr/files/patch-configure
@@ -1,12 +1,5 @@
---- configure Tue Oct 4 02:01:48 2005
+--- configure.orig Tue Oct 4 02:01:48 2005
+++ configure Wed Nov 23 11:07:17 2005
-@@ -1022,5 +1022,5 @@
- MOZJPEG=62
- MOZPNG=10207
--MOZZLIB=1.2.3
-+MOZZLIB=1.2.2
- NSPR_VERSION=4
-
@@ -10016,7 +10016,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
diff --git a/www/firefox-esr/pkg-message b/www/firefox-esr/pkg-message
index c81c1458d04d..9e0a4dd2e9ff 100644
--- a/www/firefox-esr/pkg-message
+++ b/www/firefox-esr/pkg-message
@@ -16,7 +16,7 @@ The SSH sever on remote_host must allow pub key authentication.
Any bug reports should be addressed to the maintainers at:
gnome@FreeBSD.org
-You may also Cc: freebsd-ports@freebsd.org. Please do not send
+You may also Cc: freebsd-ports@FreeBSD.org. Please do not send
bug reports to any other addresses.
Please include the following information with any bug report:
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 7ed74bfeafa2..f5b9ce6e48bf 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -3,21 +3,20 @@
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/firefox/Makefile,v 1.29 2006/02/01 02:11:23 ahze Exp $
-#
+# $MCom: ports/www/firefox/Makefile,v 1.36 2006/10/05 21:37:18 mezz Exp $
PORTNAME= firefox
DISTVERSION= 1.5.0.7
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
+MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
DISTNAME= ${PORTNAME}-${DISTVERSION}-source
MAINTAINER= gnome@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
-USE_X_PREFIX= yes
WANT_GNOME= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
@@ -76,6 +75,7 @@ pre-install:
${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
.if !defined(WITHOUT_NEWTAB)
${ECHO_CMD} >> ${SYSTEM_PREFS}
${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
@@ -101,5 +101,5 @@ post-install:
${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm
${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
-.include "${.CURDIR}/../mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.include <bsd.port.post.mk>
diff --git a/www/firefox/files/patch-configure b/www/firefox/files/patch-configure
index c3d2a1b9bbe6..923cf5065f18 100644
--- a/www/firefox/files/patch-configure
+++ b/www/firefox/files/patch-configure
@@ -1,12 +1,5 @@
---- configure Tue Oct 4 02:01:48 2005
+--- configure.orig Tue Oct 4 02:01:48 2005
+++ configure Wed Nov 23 11:07:17 2005
-@@ -1022,5 +1022,5 @@
- MOZJPEG=62
- MOZPNG=10207
--MOZZLIB=1.2.3
-+MOZZLIB=1.2.2
- NSPR_VERSION=4
-
@@ -10016,7 +10016,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
diff --git a/www/firefox/pkg-message b/www/firefox/pkg-message
index c81c1458d04d..9e0a4dd2e9ff 100644
--- a/www/firefox/pkg-message
+++ b/www/firefox/pkg-message
@@ -16,7 +16,7 @@ The SSH sever on remote_host must allow pub key authentication.
Any bug reports should be addressed to the maintainers at:
gnome@FreeBSD.org
-You may also Cc: freebsd-ports@freebsd.org. Please do not send
+You may also Cc: freebsd-ports@FreeBSD.org. Please do not send
bug reports to any other addresses.
Please include the following information with any bug report:
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index 7ed74bfeafa2..f5b9ce6e48bf 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -3,21 +3,20 @@
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/firefox/Makefile,v 1.29 2006/02/01 02:11:23 ahze Exp $
-#
+# $MCom: ports/www/firefox/Makefile,v 1.36 2006/10/05 21:37:18 mezz Exp $
PORTNAME= firefox
DISTVERSION= 1.5.0.7
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
+MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
DISTNAME= ${PORTNAME}-${DISTVERSION}-source
MAINTAINER= gnome@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
-USE_X_PREFIX= yes
WANT_GNOME= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
@@ -76,6 +75,7 @@ pre-install:
${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
.if !defined(WITHOUT_NEWTAB)
${ECHO_CMD} >> ${SYSTEM_PREFS}
${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
@@ -101,5 +101,5 @@ post-install:
${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm
${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
-.include "${.CURDIR}/../mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.include <bsd.port.post.mk>
diff --git a/www/firefox15/files/patch-configure b/www/firefox15/files/patch-configure
index c3d2a1b9bbe6..923cf5065f18 100644
--- a/www/firefox15/files/patch-configure
+++ b/www/firefox15/files/patch-configure
@@ -1,12 +1,5 @@
---- configure Tue Oct 4 02:01:48 2005
+--- configure.orig Tue Oct 4 02:01:48 2005
+++ configure Wed Nov 23 11:07:17 2005
-@@ -1022,5 +1022,5 @@
- MOZJPEG=62
- MOZPNG=10207
--MOZZLIB=1.2.3
-+MOZZLIB=1.2.2
- NSPR_VERSION=4
-
@@ -10016,7 +10016,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
diff --git a/www/firefox15/pkg-message b/www/firefox15/pkg-message
index c81c1458d04d..9e0a4dd2e9ff 100644
--- a/www/firefox15/pkg-message
+++ b/www/firefox15/pkg-message
@@ -16,7 +16,7 @@ The SSH sever on remote_host must allow pub key authentication.
Any bug reports should be addressed to the maintainers at:
gnome@FreeBSD.org
-You may also Cc: freebsd-ports@freebsd.org. Please do not send
+You may also Cc: freebsd-ports@FreeBSD.org. Please do not send
bug reports to any other addresses.
Please include the following information with any bug report:
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 7ed74bfeafa2..f5b9ce6e48bf 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -3,21 +3,20 @@
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/firefox/Makefile,v 1.29 2006/02/01 02:11:23 ahze Exp $
-#
+# $MCom: ports/www/firefox/Makefile,v 1.36 2006/10/05 21:37:18 mezz Exp $
PORTNAME= firefox
DISTVERSION= 1.5.0.7
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
+MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
DISTNAME= ${PORTNAME}-${DISTVERSION}-source
MAINTAINER= gnome@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
-USE_X_PREFIX= yes
WANT_GNOME= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
@@ -76,6 +75,7 @@ pre-install:
${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
.if !defined(WITHOUT_NEWTAB)
${ECHO_CMD} >> ${SYSTEM_PREFS}
${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
@@ -101,5 +101,5 @@ post-install:
${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm
${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
-.include "${.CURDIR}/../mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.include <bsd.port.post.mk>
diff --git a/www/firefox36/files/patch-configure b/www/firefox36/files/patch-configure
index c3d2a1b9bbe6..923cf5065f18 100644
--- a/www/firefox36/files/patch-configure
+++ b/www/firefox36/files/patch-configure
@@ -1,12 +1,5 @@
---- configure Tue Oct 4 02:01:48 2005
+--- configure.orig Tue Oct 4 02:01:48 2005
+++ configure Wed Nov 23 11:07:17 2005
-@@ -1022,5 +1022,5 @@
- MOZJPEG=62
- MOZPNG=10207
--MOZZLIB=1.2.3
-+MOZZLIB=1.2.2
- NSPR_VERSION=4
-
@@ -10016,7 +10016,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
diff --git a/www/firefox36/pkg-message b/www/firefox36/pkg-message
index c81c1458d04d..9e0a4dd2e9ff 100644
--- a/www/firefox36/pkg-message
+++ b/www/firefox36/pkg-message
@@ -16,7 +16,7 @@ The SSH sever on remote_host must allow pub key authentication.
Any bug reports should be addressed to the maintainers at:
gnome@FreeBSD.org
-You may also Cc: freebsd-ports@freebsd.org. Please do not send
+You may also Cc: freebsd-ports@FreeBSD.org. Please do not send
bug reports to any other addresses.
Please include the following information with any bug report:
diff --git a/www/gstreamer-plugins-neon/Makefile b/www/gstreamer-plugins-neon/Makefile
new file mode 100644
index 000000000000..e8d74dbc5e6c
--- /dev/null
+++ b/www/gstreamer-plugins-neon/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: gstreamer-plugins-neon
+# Date created: 6 July 2006
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/www/gstreamer-plugins-neon/Makefile,v 1.1 2006/07/06 19:32:35 ahze Exp $
+
+PORTREVISION= 0
+CATEGORIES= www
+
+COMMENT= Gstreamer neon plugin
+
+GST_PLUGIN= neon
+
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 2ac5c3e029bd..f646e50a54d4 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -3,12 +3,11 @@
# Whom: eivind/dima/jseger
#
# $FreeBSD$
-# $MCom: ports/www/mozilla/Makefile,v 1.36 2006/03/09 00:45:43 ahze Exp $
-#
+# $MCom: ports/www/mozilla/Makefile,v 1.38 2006/07/18 15:03:40 ahze Exp $
PORTNAME= mozilla
PORTVERSION= 1.7.13
-PORTREVISION?= 0
+PORTREVISION?= 1
PORTEPOCH= 2
CATEGORIES?= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
@@ -24,7 +23,6 @@ COMMENT= The open source, standards compliant web browser
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/dist/bin
USE_GMAKE= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
WANT_GNOME= yes
HAS_CONFIGURE= yes
MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index ae9bebd996c1..540aeaac9fa4 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -4,7 +4,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/mozilla/Makefile.common,v 1.20 2006/03/09 00:45:43 ahze Exp $
+# $MCom: ports/www/mozilla/Makefile.common,v 1.31 2006/10/14 03:49:21 ahze Exp $
# This file contains some reusable components for mozilla ports. It's of
# use primarily to apps from the mozilla project itself (such as Firefox,
@@ -59,10 +59,6 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \
nss3:${PORTSDIR}/security/nss \
Xft.2:${PORTSDIR}/x11-fonts/libXft
-OPTIONS+= DEBUG "Build a debugging image" off \
- LOGGING "Enable additional log messages" off \
- OPTIMIZED_CFLAGS "Enable some additional optimizations" off
-
MAINTAINER?= gnome@FreeBSD.org
MOZILLA?= ${PORTNAME}
@@ -72,7 +68,7 @@ MOZ_RPATH?= ${MOZILLA}
USE_GNOME+= gtk20 libidl desktopfileutils
USE_ICONV= yes
USE_PERL5_BUILD=yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
MOZILLA_SUFX?= none
WRKSRC?= ${WRKDIR}/mozilla
@@ -108,7 +104,6 @@ EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \
--exclude mozilla/modules/libimg/png \
--exclude mozilla/jpeg \
--exclude mozilla/dbm \
- --exclude mozilla/js/src/fdlibm \
--exclude mozilla/security/nss \
--exclude mozilla/gc/boehm \
--exclude mozilla/gfx/cairo
@@ -125,6 +120,23 @@ CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= -L${X11BASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
LIBS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv
+_USE_GECKO_OPTIONS_ALL= java debug logging optimized_cflags
+
+.if !defined(USE_GECKO_OPTIONS)
+USE_GECKO_OPTIONS= debug logging optimized_cflags
+.endif
+
+debug_OPTION= "Build a debugging image" off
+java_OPTION= "Enable JAVA xpcom" off
+logging_OPTION= "Enable additional log messages" off
+optimized_cflags_OPTION= "Enable some additional optimizations" off
+
+.for option in ${USE_GECKO_OPTIONS:L}
+.if ${_USE_GECKO_OPTIONS_ALL:M${option}}!=""
+OPTIONS+= ${option:U} ${${option}_OPTION}
+.endif
+.endfor
+
# Standard options from README
MOZ_OPTIONS+= --enable-crypto \
--disable-tests \
@@ -172,20 +184,13 @@ MOZ_OPTIONS+= --with-system-jpeg=${LOCALBASE} \
--enable-xinerama
MOZ_MK_OPTIONS+= XP_UNIX=1 \
PERL=${PERL}
-#MOZ_EXPORT+= CPPFLAGS=${CPPFLAGS} \
-# CFLAGS=$$CFLAGS \
-# LIBS=$$LIBS \
-# LDFLAGS=$$LDFLAGS \
-# CONFIG_SH=$$SH \
-# XP_UNIX=1 \
-# PERL=$$PERL5
.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*}
+CFLAGS:= ${CFLAGS} -O2 -fno-strict-aliasing ${EXTRA_CFLAGS}
WITH_OPTIMIZE?= -O2
.else
-CFLAGS:= ${CFLAGS:N-O*:N-m*} -O
-WITH_OPTIMIZE?= -O
+CFLAGS:= ${CFLAGS} ${EXTRA_CFLAGS}
+WITH_OPTIMIZE?=
.endif
.if defined(WITH_SMB)
@@ -203,6 +208,14 @@ MOZ_OPTIONS+= --disable-debug \
--enable-strip
.endif
+.if defined(WITH_JAVA)
+USE_JAVA= yes
+JAVA_VERSION+= 1.4+
+JAVA_OS+= native
+CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}"
+MOZ_OPTIONS+= --enable-javaxpcom
+.endif
+
.if defined(WITH_LOGGING)
MOZ_OPTIONS+= --enable-logging
.else
@@ -289,7 +302,7 @@ gecko-post-patch:
@${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \
${WRKSRC}/widget/src/gtk2/nsSound.cpp
@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \
- ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
+ ${WRKSRC}/*/*/*/nsDeviceContextSpecG.cpp
@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \
s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
@@ -304,18 +317,25 @@ gecko-moz-pis-patch:
@${MOZCONFIG_SED} < ${FILESDIR}/${moz} > ${WRKDIR}/${moz}
.endfor
+post-configure: gecko-post-configure
+
+gecko-post-configure:
+ @${ECHO_CMD} "#define JNIIMPORT" >> ${WRKSRC}/mozilla-config.h
+
post-build: gecko-post-build
gecko-post-build:
@${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2|" \
${WRKSRC}/build/unix/*.pc
-pre-install: gecko-pre-install gecko-moz-pis-pre-install gecko-create-plist
+pre-install: gecko-moz-pis-pre-install gecko-pre-install port-pre-install gecko-create-plist
-gecko-pre-install:
- @${DO_NADA} # Empty for now
+.if !target(port-pre-install)
+port-pre-install:
+ @${DO_NADA}
+.endif
-gecko-create-plist:
+gecko-pre-install:
.if !defined(NOGECKO_PLIST)
@${RM} -rf ${FAKEDIR} ${PLIST}
@${TOUCH} -f ${PLIST}
@@ -337,6 +357,10 @@ gecko-create-plist:
${FAKEDIR}/bin/${MOZILLA} \
${FAKEDIR}/bin/${MOZILLA}-config
${RM} -f ${FAKEDIR}/bin/*.bak
+.endif
+
+gecko-create-plist:
+.if !defined(NOGECKO_PLIST)
# Create the plist
.for f in ${GECKO_PLIST_PRE_FILES}
${ECHO_CMD} ${f} >> ${PLIST}
diff --git a/www/mozilla/bsd.gecko.mk b/www/mozilla/bsd.gecko.mk
index e74ccb1d4831..10dd6ef7d966 100644
--- a/www/mozilla/bsd.gecko.mk
+++ b/www/mozilla/bsd.gecko.mk
@@ -2,7 +2,7 @@
# ex:ts=4
#
# $FreeBSD$
-# $MCom: ports/www/mozilla/bsd.gecko.mk,v 1.17 2006/03/10 12:42:50 ahze Exp $
+# $MCom: ports/www/mozilla/bsd.gecko.mk,v 1.26 2006/10/13 04:20:21 ahze Exp $
#
# 4 column tabs prevent hair loss and tooth decay!
@@ -69,19 +69,17 @@ Gecko_Pre_Include= bsd.gecko.mk
.if ${OSVERSION} >= 500000
.if (${ARCH}!="sparc64" || ${OSVERSION} >= 601101) && ${ARCH}!="ia64"
-_GECKO_ALL= firefox nvu seamonkey sunbird thunderbird xulrunner firefox-devel flock
+_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner firefox-devel flock
.endif
.endif
_GECKO_ALL+= mozilla
-sunbird_PORTSDIR= deskutils
-
thunderbird_PORTSDIR= mail
.for gecko in ${_GECKO_ALL}
${gecko}_PORTSDIR?= www
${gecko}_DEPENDS?= ${PORTSDIR}/${${gecko}_PORTSDIR}/${gecko}
-${gecko}_PLIST?= ${X11BASE}/lib/${gecko}/libgtkembedmoz.so
+${gecko}_PLIST?= ${LOCALBASE}/lib/${gecko}/libgtkembedmoz.so
.endfor
# Figure out which mozilla to use
@@ -125,18 +123,18 @@ GECKO_FALLTRHOUGH= ${TRUE}
.endif
# Generic defines
-BROWSER_LINUX_PLUGINS_DIR?= ${X11BASE}/lib/browser_linux_plugins
-BROWSER_PLUGINS_DIR?= ${X11BASE}/lib/browser_plugins
+BROWSER_LINUX_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_linux_plugins
+BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins
-GECKO_CONFIG?= ${X11BASE}/bin/${GECKO}-config
-XPIDL?= ${X11BASE}/lib/${GECKO}/xpidl
+GECKO_CONFIG?= ${LOCALBASE}/bin/${GECKO}-config
+XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl
XPIDL_INCL?= `${GECKO_CONFIG} --idlflags`
.if defined(GECKO) && ${_GECKO_ALL:M${GECKO}}!=""
BUILD_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS}
RUN_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS}
.else
-BROKEN=Unable to find a supported gecko, please check USE_GECKO
+IGNORE= Unable to find a supported gecko, please check USE_GECKO
.endif
pre-everything:: _gecko-pre-everything
@@ -164,7 +162,7 @@ post-patch: gecko-post-patch
gecko-post-patch:
.if defined(${GECKO}_HACK)
- ${FIND} ${WRKSRC} -name "Makefile.in" -o -name "configure" | \
+ ${FIND} ${WRKSRC} -name "Makefile.in" -type f -o -name "configure" -type f | \
${XARGS} ${REINPLACE_CMD} -e ${${GECKO}_HACK}
.endif
diff --git a/www/mozilla/files/patch-gfx_src_ps_nsType1.cpp b/www/mozilla/files/patch-gfx_src_ps_nsType1.cpp
new file mode 100644
index 000000000000..29752f34a181
--- /dev/null
+++ b/www/mozilla/files/patch-gfx_src_ps_nsType1.cpp
@@ -0,0 +1,58 @@
+--- gfx/src/ps/nsType1.cpp.orig Wed Dec 11 01:24:47 2002
++++ gfx/src/ps/nsType1.cpp Sun Sep 10 09:52:45 2006
+@@ -81,8 +81,8 @@
+ int wmode;
+ } FT2PT1_info;
+
+-static int cubicto(FT_Vector *aControlPt1, FT_Vector *aControlPt2,
+- FT_Vector *aEndPt, void *aClosure);
++static int cubicto(const FT_Vector *aControlPt1, const FT_Vector *aControlPt2,
++ const FT_Vector *aEndPt, void *aClosure);
+ static int Type1CharStringCommand(unsigned char **aBufPtrPtr, int aCmd);
+ static int Type1EncodeCharStringInt(unsigned char **aBufPtrPtr, int aValue);
+
+@@ -173,7 +173,7 @@
+ }
+
+ static PRBool
+-sideWidthAndBearing(FT_Vector *aEndPt, FT2PT1_info *aFti)
++sideWidthAndBearing(const FT_Vector *aEndPt, FT2PT1_info *aFti)
+ {
+ int aw = 0;
+ int ah = 0;
+@@ -216,7 +216,7 @@
+ }
+
+ static int
+-moveto(FT_Vector *aEndPt, void *aClosure)
++moveto(const FT_Vector *aEndPt, void *aClosure)
+ {
+ FT2PT1_info *fti = (FT2PT1_info *)aClosure;
+ FT_UShort upm = fti->face->units_per_EM;
+@@ -253,7 +253,7 @@
+ }
+
+ static int
+-lineto(FT_Vector *aEndPt, void *aClosure)
++lineto(const FT_Vector *aEndPt, void *aClosure)
+ {
+ FT2PT1_info *fti = (FT2PT1_info *)aClosure;
+ FT_UShort upm = fti->face->units_per_EM;
+@@ -279,7 +279,7 @@
+ }
+
+ static int
+-conicto(FT_Vector *aControlPt, FT_Vector *aEndPt, void *aClosure)
++conicto(const FT_Vector *aControlPt, const FT_Vector *aEndPt, void *aClosure)
+ {
+ FT2PT1_info *ftinfo = (FT2PT1_info *)aClosure;
+ FT_UShort upm = ftinfo->face->units_per_EM;
+@@ -311,7 +311,7 @@
+ }
+
+ static int
+-cubicto(FT_Vector *aControlPt1, FT_Vector *aControlPt2, FT_Vector *aEndPt,
++cubicto(const FT_Vector *aControlPt1, const FT_Vector *aControlPt2, const FT_Vector *aEndPt,
+ void *aClosure)
+ {
+ FT2PT1_info *ftinfo = (FT2PT1_info *)aClosure;
diff --git a/www/mozilla/pkg-deinstall.in b/www/mozilla/pkg-deinstall.in
index 1d381a06fe88..e11caf5589e6 100644
--- a/www/mozilla/pkg-deinstall.in
+++ b/www/mozilla/pkg-deinstall.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.12 2006/03/09 00:45:43 ahze Exp $
+# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.15 2006/08/01 21:09:04 ahze Exp $
#
# Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>)
@@ -23,5 +23,7 @@ rm -f ${MOZDIR}/components.ini
rm -f ${MOZDIR}/defaults.ini
rm -f ${MOZDIR}/chrome/app-chrome.manifest
rm -rf ${MOZDIR}/updates
+find %%MOZDIR%%/plugins/ -depth 1 -type l -delete > /dev/null 2>&1
+find %%MOZDIR%%/extensions/ -depth 1 -type l -delete > /dev/null 2>&1
exit 0
diff --git a/www/mozilla/pkg-install.in b/www/mozilla/pkg-install.in
index 13fe40dbee7a..bc083ae6da01 100644
--- a/www/mozilla/pkg-install.in
+++ b/www/mozilla/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports/www/mozilla/pkg-install.in,v 1.12 2006/03/09 00:45:43 ahze Exp $
+# $MCom: ports/www/mozilla/pkg-install.in,v 1.15 2006/08/01 21:09:04 ahze Exp $
#
# Date created: Mon Nov 29, 2003
# Whom: Thierry Thomas (<thierry@pompo.net>)
@@ -37,5 +37,7 @@ fi
if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
mkdir -p %%PREFIX%%/lib/browser_plugins
fi
+cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%MOZILLA%%/ %%MOZDIR%%/plugins/ > /dev/null 2>&1
+cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%MOZILLA%%/ %%MOZDIR%%/extensions/ > /dev/null 2>&1
exit 0
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 8b0752baf43a..8e5e26f67fa5 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,11 +3,11 @@
# Whom: ade, archie
#
# $FreeBSD$
-# $MCom: ports/x11-fm/nautilus2/Makefile,v 1.105 2006/04/13 07:52:42 bland Exp $
+# $MCom: ports/x11-fm/nautilus/Makefile,v 1.117 2006/10/02 22:48:27 ahze Exp $
#
PORTNAME= nautilus
-PORTVERSION= 2.14.3
+PORTVERSION= 2.16.1
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,12 +21,12 @@ LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop eel2 \
- librsvg2 desktopfileutils
+ librsvg2 desktopfileutils ltverhack
GNOME_DESKTOP_VERSION=2
-INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
LIBPNG="-L${LOCALBASE}/lib -lpng -lz"
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index f70ca7662d3b..be3c76e593d5 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-2.14.3.tar.bz2) = e82df2a1cb11719d054959539b74b3c7
-SHA256 (gnome2/nautilus-2.14.3.tar.bz2) = efbf2c4f236de0e266e5e3668a0f60e012281a7e4f653431bb1a81b0656c8f9e
-SIZE (gnome2/nautilus-2.14.3.tar.bz2) = 4026453
+MD5 (gnome2/nautilus-2.16.1.tar.bz2) = bac53a70c9517cda421f440721e095c9
+SHA256 (gnome2/nautilus-2.16.1.tar.bz2) = 48818f5e2c9e981a6c75a61e462ac4050f7ffbf1c620a62fd7b3e57669484e37
+SIZE (gnome2/nautilus-2.16.1.tar.bz2) = 4258919
diff --git a/x11-fm/nautilus/files/patch-aa b/x11-fm/nautilus/files/patch-aa
deleted file mode 100644
index 25fa0ee71c8a..000000000000
--- a/x11-fm/nautilus/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig Mon Apr 10 20:37:17 2006
-+++ configure Mon Apr 10 20:38:17 2006
-@@ -25674,7 +25674,7 @@
-
- CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
-
--CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`"
-+CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | xargs -n1 echo -n ' -I '`"
-
-
- DISABLE_DEPRECATED_CFLAGS=""
-@@ -26832,7 +26832,7 @@
- s,@STARTUP_NOTIFICATION_PACKAGE@,$STARTUP_NOTIFICATION_PACKAGE,;t t
- s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
- s,@ALL_CFLAGS@,$ALL_CFLAGS,;t t
--s,@ALL_LIBS@,$ALL_LIBS,;t t
-+s~@ALL_LIBS@~$ALL_LIBS~;t t
- s,@CONFIG_STATUS_DEPENDENCIES@,$CONFIG_STATUS_DEPENDENCIES,;t t
- s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
- s,@USE_NLS@,$USE_NLS,;t t
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index f2356a53a86a..f5d69f1350d0 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -7,6 +7,7 @@ include/nautilus/libnautilus-extension/nautilus-extension-types.h
include/nautilus/libnautilus-extension/nautilus-file-info.h
include/nautilus/libnautilus-extension/nautilus-info-provider.h
include/nautilus/libnautilus-extension/nautilus-location-widget-provider.h
+include/nautilus/libnautilus-extension/nautilus-menu.h
include/nautilus/libnautilus-extension/nautilus-menu-item.h
include/nautilus/libnautilus-extension/nautilus-menu-provider.h
include/nautilus/libnautilus-extension/nautilus-property-page-provider.h
@@ -85,13 +86,15 @@ share/locale/az/LC_MESSAGES/nautilus.mo
share/locale/be/LC_MESSAGES/nautilus.mo
share/locale/bg/LC_MESSAGES/nautilus.mo
share/locale/bn/LC_MESSAGES/nautilus.mo
-share/locale/br/LC_MESSAGES/nautilus.mo
+share/locale/bn_IN/LC_MESSAGES/nautilus.mo
share/locale/bs/LC_MESSAGES/nautilus.mo
+share/locale/br/LC_MESSAGES/nautilus.mo
share/locale/ca/LC_MESSAGES/nautilus.mo
share/locale/cs/LC_MESSAGES/nautilus.mo
share/locale/cy/LC_MESSAGES/nautilus.mo
share/locale/da/LC_MESSAGES/nautilus.mo
share/locale/de/LC_MESSAGES/nautilus.mo
+share/locale/dz/LC_MESSAGES/nautilus.mo
share/locale/el/LC_MESSAGES/nautilus.mo
share/locale/en_CA/LC_MESSAGES/nautilus.mo
share/locale/en_GB/LC_MESSAGES/nautilus.mo
@@ -108,6 +111,7 @@ share/locale/he/LC_MESSAGES/nautilus.mo
share/locale/hi/LC_MESSAGES/nautilus.mo
share/locale/hr/LC_MESSAGES/nautilus.mo
share/locale/hu/LC_MESSAGES/nautilus.mo
+share/locale/hy/LC_MESSAGES/nautilus.mo
share/locale/id/LC_MESSAGES/nautilus.mo
share/locale/is/LC_MESSAGES/nautilus.mo
share/locale/it/LC_MESSAGES/nautilus.mo
@@ -119,6 +123,7 @@ share/locale/ku/LC_MESSAGES/nautilus.mo
share/locale/li/LC_MESSAGES/nautilus.mo
share/locale/lt/LC_MESSAGES/nautilus.mo
share/locale/lv/LC_MESSAGES/nautilus.mo
+share/locale/mg/LC_MESSAGES/nautilus.mo
share/locale/mi/LC_MESSAGES/nautilus.mo
share/locale/mk/LC_MESSAGES/nautilus.mo
share/locale/ml/LC_MESSAGES/nautilus.mo
@@ -129,6 +134,7 @@ share/locale/ne/LC_MESSAGES/nautilus.mo
share/locale/nl/LC_MESSAGES/nautilus.mo
share/locale/nn/LC_MESSAGES/nautilus.mo
share/locale/nso/LC_MESSAGES/nautilus.mo
+share/locale/or/LC_MESSAGES/nautilus.mo
share/locale/pa/LC_MESSAGES/nautilus.mo
share/locale/pl/LC_MESSAGES/nautilus.mo
share/locale/pt/LC_MESSAGES/nautilus.mo
@@ -159,14 +165,6 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
share/locale/zu/LC_MESSAGES/nautilus.mo
share/mime/application/x-gnome-saved-search.xml
share/mime/packages/nautilus.xml
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/km/LC_MESSAGES
-@dirrmtry share/locale/km
@dirrm share/gnome/pixmaps/nautilus
@dirrm share/gnome/nautilus/ui
@dirrm share/gnome/nautilus/patterns
@@ -180,3 +178,73 @@ share/mime/packages/nautilus.xml
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 3223d723ce42..e8362e2179a5 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.3 2005/08/26 04:03:55 marcus Exp $
+# $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.6 2006/09/10 00:51:16 mezz Exp $
#
PORTNAME= fontconfig
PORTVERSION= 2.3.2
-PORTREVISION?= 5
+PORTREVISION?= 6
PORTEPOCH?= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://fontconfig.org/release/
@@ -16,6 +16,10 @@ MASTER_SITES= http://fontconfig.org/release/
MAINTAINER= gnome@FreeBSD.org
COMMENT= An XML-based font configuration API for X Windows
+PATCH_SITES+= http://www.freetype.org/freetype2/patches/
+PATCHFILES+= fontconfig-2.3.2-noftinternals.patch
+PATCH_DIST_STRIP+= -p1
+
.if !defined(REFERENCE_PORT)
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
@@ -23,7 +27,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
USE_GMAKE= yes
PREFIX?= ${X11BASE}
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gnometarget pkgconfig
CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \
diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo
index 1c3f34f15d97..0cc28db87734 100644
--- a/x11-fonts/fontconfig/distinfo
+++ b/x11-fonts/fontconfig/distinfo
@@ -1,6 +1,6 @@
MD5 (fontconfig-2.3.2.tar.gz) = 7354f9f125ea78a8f2851cb9c31d4866
SHA256 (fontconfig-2.3.2.tar.gz) = 6f7b91d328d6408c097ec11777bf4b1c2c710613b573b399794bc5999ff12227
SIZE (fontconfig-2.3.2.tar.gz) = 964045
-MD5 (cjk-fontconfig-2.3.2-20051217.patch.gz) = fa45698ab83100bd9d93faecf02d1e22
-SHA256 (cjk-fontconfig-2.3.2-20051217.patch.gz) = 07d8bb8999c500271b20778a3a49febb63b6993bb6f71cf7b29732af46fdb98b
-SIZE (cjk-fontconfig-2.3.2-20051217.patch.gz) = 307675
+MD5 (fontconfig-2.3.2-noftinternals.patch) = 92cad1f7eef3edc6a34a2fd5cbbf352a
+SHA256 (fontconfig-2.3.2-noftinternals.patch) = f1b41d3438acf7624c3df767111817dfdea283e418c16b3c74d25768e6d2fedd
+SIZE (fontconfig-2.3.2-noftinternals.patch) = 18275
diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile
index b6a11c7cff15..497e5ec7b6a0 100644
--- a/x11-themes/gnome-backgrounds/Makefile
+++ b/x11-themes/gnome-backgrounds/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.20 2006/04/13 07:52:42 bland Exp $
+# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.26 2006/10/02 23:33:59 ahze Exp $
#
PORTNAME= gnome-backgrounds
-PORTVERSION= 2.14.2.1
+PORTVERSION= 2.16.1
CATEGORIES= x11-themes graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A collection of backgrounds for GNOME 2
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/x11-themes/gnome-backgrounds/distinfo b/x11-themes/gnome-backgrounds/distinfo
index 8af3b885a496..f92a3a9f44a1 100644
--- a/x11-themes/gnome-backgrounds/distinfo
+++ b/x11-themes/gnome-backgrounds/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-backgrounds-2.14.2.1.tar.bz2) = 10480df7c2e5a08c920c5b0a2ff4f161
-SHA256 (gnome2/gnome-backgrounds-2.14.2.1.tar.bz2) = 1e5ad1c36001dbc9f843bb521e7ab58bc0a664ad3a7b29d3c0ab337d417ebfa3
-SIZE (gnome2/gnome-backgrounds-2.14.2.1.tar.bz2) = 1193909
+MD5 (gnome2/gnome-backgrounds-2.16.1.tar.bz2) = e76555f53d5b8a40d4d447173ae8de93
+SHA256 (gnome2/gnome-backgrounds-2.16.1.tar.bz2) = 3d7b04af336a8db2edefa2c1bb8dbff5364055372ff3054b10a68cbc9a62e469
+SIZE (gnome2/gnome-backgrounds-2.16.1.tar.bz2) = 1199770
diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist
index 9c386c6f60d7..9932a57c710d 100644
--- a/x11-themes/gnome-backgrounds/pkg-plist
+++ b/x11-themes/gnome-backgrounds/pkg-plist
@@ -12,9 +12,11 @@ share/gnome/pixmaps/backgrounds/gnome/tiles/pattern-stars.svg
share/gnome/pixmaps/backgrounds/gnome/translucent/ellipsis.svg
share/gnome/pixmaps/backgrounds/gnome/translucent/tentacles.svg
share/locale/ar/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/as/LC_MESSAGES/gnome-backgrounds.mo
share/locale/be/LC_MESSAGES/gnome-backgrounds.mo
share/locale/bg/LC_MESSAGES/gnome-backgrounds.mo
share/locale/bn/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-backgrounds.mo
share/locale/ca/LC_MESSAGES/gnome-backgrounds.mo
share/locale/cs/LC_MESSAGES/gnome-backgrounds.mo
share/locale/cy/LC_MESSAGES/gnome-backgrounds.mo
@@ -46,22 +48,30 @@ share/locale/ky/LC_MESSAGES/gnome-backgrounds.mo
share/locale/lt/LC_MESSAGES/gnome-backgrounds.mo
share/locale/lv/LC_MESSAGES/gnome-backgrounds.mo
share/locale/mg/LC_MESSAGES/gnome-backgrounds.mo
+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/nb/LC_MESSAGES/gnome-backgrounds.mo
share/locale/ne/LC_MESSAGES/gnome-backgrounds.mo
share/locale/nl/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/nn/LC_MESSAGES/gnome-backgrounds.mo
share/locale/or/LC_MESSAGES/gnome-backgrounds.mo
share/locale/pa/LC_MESSAGES/gnome-backgrounds.mo
share/locale/pl/LC_MESSAGES/gnome-backgrounds.mo
share/locale/pt/LC_MESSAGES/gnome-backgrounds.mo
share/locale/pt_BR/LC_MESSAGES/gnome-backgrounds.mo
share/locale/ro/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/ru/LC_MESSAGES/gnome-backgrounds.mo
share/locale/rw/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/si/LC_MESSAGES/gnome-backgrounds.mo
share/locale/sk/LC_MESSAGES/gnome-backgrounds.mo
share/locale/sl/LC_MESSAGES/gnome-backgrounds.mo
share/locale/sq/LC_MESSAGES/gnome-backgrounds.mo
share/locale/sr/LC_MESSAGES/gnome-backgrounds.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-backgrounds.mo
share/locale/sv/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/ta/LC_MESSAGES/gnome-backgrounds.mo
share/locale/te/LC_MESSAGES/gnome-backgrounds.mo
share/locale/th/LC_MESSAGES/gnome-backgrounds.mo
share/locale/tr/LC_MESSAGES/gnome-backgrounds.mo
@@ -70,26 +80,70 @@ share/locale/vi/LC_MESSAGES/gnome-backgrounds.mo
share/locale/zh_CN/LC_MESSAGES/gnome-backgrounds.mo
share/locale/zh_HK/LC_MESSAGES/gnome-backgrounds.mo
share/locale/zh_TW/LC_MESSAGES/gnome-backgrounds.mo
+@dirrm share/gnome/pixmaps/backgrounds/gnome/translucent
+@dirrm share/gnome/pixmaps/backgrounds/gnome/tiles
+@dirrm share/gnome/pixmaps/backgrounds/gnome/nature
+@dirrm share/gnome/pixmaps/backgrounds/gnome/branded
+@dirrm share/gnome/pixmaps/backgrounds/gnome
+@dirrm share/gnome/pixmaps/backgrounds
+@dirrmtry share/gnome/gnome-background-properties
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrm share/gnome/pixmaps/backgrounds/gnome/translucent
-@dirrm share/gnome/pixmaps/backgrounds/gnome/tiles
-@dirrm share/gnome/pixmaps/backgrounds/gnome/nature
-@dirrm share/gnome/pixmaps/backgrounds/gnome/branded
-@dirrm share/gnome/pixmaps/backgrounds/gnome
-@dirrm share/gnome/pixmaps/backgrounds
-@dirrmtry share/gnome/gnome-background-properties
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index 2e23d8d8f7ee..c8bd6eab2323 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-themes/gnome-themes-extras/Makefile,v 1.10 2006/03/02 21:18:34 mezz Exp $
-#
+# $MCom: ports/x11-themes/gnome-themes-extras/Makefile,v 1.12 2006/07/18 16:31:04 ahze Exp $
PORTNAME= gnome-themes-extras
PORTVERSION= 0.9.0
+PORTREVISION= 1
CATEGORIES= x11-themes gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
@@ -16,12 +16,11 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= More themes for the GNOME 2 desktop environment
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
-RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
+BUILD_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
+RUN_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui intlhack
diff --git a/x11-themes/gnome-themes-extras/pkg-plist b/x11-themes/gnome-themes-extras/pkg-plist
index 4159d4e45fc8..854b9393b645 100644
--- a/x11-themes/gnome-themes-extras/pkg-plist
+++ b/x11-themes/gnome-themes-extras/pkg-plist
@@ -1227,3 +1227,35 @@ share/themes/Wasp/index.theme
@dirrm share/gnome/themes/Gorilla
@dirrm share/gnome/themes/Amaranth/metacity-1
@dirrm share/gnome/themes/Amaranth
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index c62243707d9a..241270b4677e 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.85 2006/04/13 07:52:42 bland Exp $
+# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.105 2006/10/06 17:22:31 mezz Exp $
#
PORTNAME= gnome-themes
-PORTVERSION= 2.14.3
+PORTVERSION= 2.16.1.1
CATEGORIES= x11-themes gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,14 +16,14 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A collection of themes and icons for GNOME2
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
-RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
+BUILD_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2 \
+ icon-naming-utils>=0.8.0:${PORTSDIR}/x11-themes/icon-naming-utils
+RUN_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
CONFLICTS= clearlooks-metacity-0.*
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
USE_AUTOTOOLS= libtool:15
INSTALLS_ICONS= yes
USE_GMAKE= yes
@@ -31,8 +31,4 @@ USE_GNOME= gnomehack intlhack metacity libgnomeui
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-post-patch:
- @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g'
-
.include <bsd.port.mk>
diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo
index ff04348d49e0..a6d408f535b8 100644
--- a/x11-themes/gnome-themes/distinfo
+++ b/x11-themes/gnome-themes/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-themes-2.14.3.tar.bz2) = 7c07c4c01404b447f2624e8e400ee787
-SHA256 (gnome2/gnome-themes-2.14.3.tar.bz2) = f417773bb52e07e7d77f2c70db56eee3415eae3f715068de9687de61d11b38d5
-SIZE (gnome2/gnome-themes-2.14.3.tar.bz2) = 2549675
+MD5 (gnome2/gnome-themes-2.16.1.1.tar.bz2) = f405ca12d20f5179482938b659e9f491
+SHA256 (gnome2/gnome-themes-2.16.1.1.tar.bz2) = 9256d3d2394aadc82d1a27ece1ca04e98d8bf52a23abea847b62388c1fa510d6
+SIZE (gnome2/gnome-themes-2.16.1.1.tar.bz2) = 2259987
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index 7baa299f4ef5..dbf0dc37774c 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -1,165 +1,908 @@
share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml
share/gnome/themes/Glider/metacity-1/metacity-theme-1.xml
share/gnome/themes/Mist/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Sandwish/metacity-1/active-border-top-left-border.png
-share/gnome/themes/Sandwish/metacity-1/active-border-top-right-border.png
-share/gnome/themes/Sandwish/metacity-1/active-bottom-left-border.png
-share/gnome/themes/Sandwish/metacity-1/active-bottom-left-corner.png
-share/gnome/themes/Sandwish/metacity-1/active-bottom-mid-left-border.png
-share/gnome/themes/Sandwish/metacity-1/active-bottom-mid-right-border.png
-share/gnome/themes/Sandwish/metacity-1/active-bottom-right-border.png
-share/gnome/themes/Sandwish/metacity-1/active-bottom-right-corner.png
-share/gnome/themes/Sandwish/metacity-1/active-button-prelight.png
-share/gnome/themes/Sandwish/metacity-1/active-button-pressed.png
-share/gnome/themes/Sandwish/metacity-1/active-button.png
-share/gnome/themes/Sandwish/metacity-1/active-close-button.png
-share/gnome/themes/Sandwish/metacity-1/active-left-border.png
-share/gnome/themes/Sandwish/metacity-1/active-left-top-border-shaded.png
-share/gnome/themes/Sandwish/metacity-1/active-left-top-border.png
-share/gnome/themes/Sandwish/metacity-1/active-maximize-button.png
-share/gnome/themes/Sandwish/metacity-1/active-menu-button-prelight.png
-share/gnome/themes/Sandwish/metacity-1/active-menu-button-pressed.png
-share/gnome/themes/Sandwish/metacity-1/active-menu-button.png
-share/gnome/themes/Sandwish/metacity-1/active-minimize-button.png
-share/gnome/themes/Sandwish/metacity-1/active-right-border.png
-share/gnome/themes/Sandwish/metacity-1/active-right-top-border-shaded.png
-share/gnome/themes/Sandwish/metacity-1/active-right-top-border.png
-share/gnome/themes/Sandwish/metacity-1/active-top-center-left.png
-share/gnome/themes/Sandwish/metacity-1/active-top-center-mid-left.png
-share/gnome/themes/Sandwish/metacity-1/active-top-center-mid-right.png
-share/gnome/themes/Sandwish/metacity-1/active-top-center-right.png
-share/gnome/themes/Sandwish/metacity-1/active-top-left-border.png
-share/gnome/themes/Sandwish/metacity-1/active-top-left-corner.png
-share/gnome/themes/Sandwish/metacity-1/active-top-mid-left-border.png
-share/gnome/themes/Sandwish/metacity-1/active-top-mid-right-border.png
-share/gnome/themes/Sandwish/metacity-1/active-top-right-border.png
-share/gnome/themes/Sandwish/metacity-1/active-top-right-corner.png
-share/gnome/themes/Sandwish/metacity-1/inactive-border-top-left-border.png
-share/gnome/themes/Sandwish/metacity-1/inactive-border-top-right-border.png
-share/gnome/themes/Sandwish/metacity-1/inactive-bottom-left-border.png
-share/gnome/themes/Sandwish/metacity-1/inactive-bottom-left-corner.png
-share/gnome/themes/Sandwish/metacity-1/inactive-bottom-mid-border.png
-share/gnome/themes/Sandwish/metacity-1/inactive-bottom-right-border.png
-share/gnome/themes/Sandwish/metacity-1/inactive-bottom-right-corner.png
-share/gnome/themes/Sandwish/metacity-1/inactive-button-prelight.png
-share/gnome/themes/Sandwish/metacity-1/inactive-button-pressed.png
-share/gnome/themes/Sandwish/metacity-1/inactive-button.png
-share/gnome/themes/Sandwish/metacity-1/inactive-close-button.png
-share/gnome/themes/Sandwish/metacity-1/inactive-left-border.png
-share/gnome/themes/Sandwish/metacity-1/inactive-left-top-border-shaded.png
-share/gnome/themes/Sandwish/metacity-1/inactive-left-top-border.png
-share/gnome/themes/Sandwish/metacity-1/inactive-maximize-button.png
-share/gnome/themes/Sandwish/metacity-1/inactive-menu-button-prelight.png
-share/gnome/themes/Sandwish/metacity-1/inactive-menu-button-pressed.png
-share/gnome/themes/Sandwish/metacity-1/inactive-menu-button.png
-share/gnome/themes/Sandwish/metacity-1/inactive-minimize-button.png
-share/gnome/themes/Sandwish/metacity-1/inactive-right-border.png
-share/gnome/themes/Sandwish/metacity-1/inactive-right-top-border-shaded.png
-share/gnome/themes/Sandwish/metacity-1/inactive-right-top-border.png
-share/gnome/themes/Sandwish/metacity-1/inactive-top-center-left.png
-share/gnome/themes/Sandwish/metacity-1/inactive-top-center-mid.png
-share/gnome/themes/Sandwish/metacity-1/inactive-top-center-right.png
-share/gnome/themes/Sandwish/metacity-1/inactive-top-left-border.png
-share/gnome/themes/Sandwish/metacity-1/inactive-top-left-corner.png
-share/gnome/themes/Sandwish/metacity-1/inactive-top-mid-border.png
-share/gnome/themes/Sandwish/metacity-1/inactive-top-right-border.png
-share/gnome/themes/Sandwish/metacity-1/inactive-top-right-corner.png
-share/gnome/themes/Sandwish/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Smokey/metacity-1/button-base.png
-share/gnome/themes/Smokey/metacity-1/button-pressed-shine.png
-share/gnome/themes/Smokey/metacity-1/button-pressed.png
-share/gnome/themes/Smokey/metacity-1/button-shine.png
-share/gnome/themes/Smokey/metacity-1/close.png
-share/gnome/themes/Smokey/metacity-1/maximize.png
-share/gnome/themes/Smokey/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Smokey/metacity-1/minimize.png
-share/gnome/themes/Smokey/metacity-1/stripes.png
-share/icons/Crux/12x12/filesystems/gnome-fs-directory.png
-share/icons/Crux/12x12/filesystems/gnome-fs-regular.png
-share/icons/Crux/192x192/filesystems/gnome-fs-directory.png
-share/icons/Crux/192x192/filesystems/gnome-fs-regular.png
-share/icons/Crux/20x20/filesystems/gnome-fs-directory.png
-share/icons/Crux/20x20/filesystems/gnome-fs-regular.png
-share/icons/Crux/24x24/filesystems/gnome-fs-directory.png
-share/icons/Crux/24x24/filesystems/gnome-fs-regular.png
-share/icons/Crux/36x36/filesystems/gnome-fs-directory.png
-share/icons/Crux/36x36/filesystems/gnome-fs-regular.png
-share/icons/Crux/48x48/emblems/emblem-nowrite.png
-share/icons/Crux/48x48/filesystems/gnome-fs-directory.png
-share/icons/Crux/48x48/filesystems/gnome-fs-regular.png
-share/icons/Crux/72x72/emblems/emblem-nowrite.png
-share/icons/Crux/72x72/filesystems/gnome-fs-directory.png
-share/icons/Crux/72x72/filesystems/gnome-fs-regular.png
-share/icons/Crux/96x96/emblems/emblem-nowrite.png
-share/icons/Crux/96x96/filesystems/gnome-fs-directory.png
-share/icons/Crux/96x96/filesystems/gnome-fs-regular.png
+share/icons/Crux/16x16/actions/back.png
+share/icons/Crux/16x16/actions/bottom.png
+share/icons/Crux/16x16/actions/document-open.png
+share/icons/Crux/16x16/actions/down.png
+share/icons/Crux/16x16/actions/fileopen.png
+share/icons/Crux/16x16/actions/finish.png
+share/icons/Crux/16x16/actions/forward.png
+share/icons/Crux/16x16/actions/go-bottom.png
+share/icons/Crux/16x16/actions/go-down.png
+share/icons/Crux/16x16/actions/go-first.png
+share/icons/Crux/16x16/actions/go-home.png
+share/icons/Crux/16x16/actions/go-last.png
+share/icons/Crux/16x16/actions/go-next.png
+share/icons/Crux/16x16/actions/go-previous.png
+share/icons/Crux/16x16/actions/go-top.png
+share/icons/Crux/16x16/actions/go-up.png
+share/icons/Crux/16x16/actions/gohome.png
+share/icons/Crux/16x16/actions/gtk-go-back-ltr.png
+share/icons/Crux/16x16/actions/gtk-go-back-rtl.png
+share/icons/Crux/16x16/actions/gtk-go-down.png
+share/icons/Crux/16x16/actions/gtk-go-forward-ltr.png
+share/icons/Crux/16x16/actions/gtk-go-forward-rtl.png
+share/icons/Crux/16x16/actions/gtk-go-up.png
+share/icons/Crux/16x16/actions/gtk-goto-bottom.png
+share/icons/Crux/16x16/actions/gtk-goto-first-ltr.png
+share/icons/Crux/16x16/actions/gtk-goto-first-rtl.png
+share/icons/Crux/16x16/actions/gtk-goto-last-ltr.png
+share/icons/Crux/16x16/actions/gtk-goto-last-rtl.png
+share/icons/Crux/16x16/actions/gtk-goto-top.png
+share/icons/Crux/16x16/actions/gtk-home.png
+share/icons/Crux/16x16/actions/gtk-open.png
+share/icons/Crux/16x16/actions/gtk-refresh.png
+share/icons/Crux/16x16/actions/kfm_home.png
+share/icons/Crux/16x16/actions/next.png
+share/icons/Crux/16x16/actions/previous.png
+share/icons/Crux/16x16/actions/redhat-home.png
+share/icons/Crux/16x16/actions/reload.png
+share/icons/Crux/16x16/actions/reload3.png
+share/icons/Crux/16x16/actions/reload_all_tabs.png
+share/icons/Crux/16x16/actions/reload_page.png
+share/icons/Crux/16x16/actions/start.png
+share/icons/Crux/16x16/actions/stock_bottom.png
+share/icons/Crux/16x16/actions/stock_down.png
+share/icons/Crux/16x16/actions/stock_first.png
+share/icons/Crux/16x16/actions/stock_home.png
+share/icons/Crux/16x16/actions/stock_last.png
+share/icons/Crux/16x16/actions/stock_left.png
+share/icons/Crux/16x16/actions/stock_refresh.png
+share/icons/Crux/16x16/actions/stock_right.png
+share/icons/Crux/16x16/actions/stock_top.png
+share/icons/Crux/16x16/actions/stock_up.png
+share/icons/Crux/16x16/actions/top.png
+share/icons/Crux/16x16/actions/up.png
+share/icons/Crux/16x16/actions/view-refresh.png
+share/icons/Crux/16x16/places/application-x-gnome-saved-search.png
+share/icons/Crux/16x16/places/folder-remote.png
+share/icons/Crux/16x16/places/folder-saved-search.png
+share/icons/Crux/16x16/places/folder.png
+share/icons/Crux/16x16/places/folder_home.png
+share/icons/Crux/16x16/places/gnome-fs-directory.png
+share/icons/Crux/16x16/places/gnome-fs-ftp.png
+share/icons/Crux/16x16/places/gnome-fs-home.png
+share/icons/Crux/16x16/places/gnome-fs-nfs.png
+share/icons/Crux/16x16/places/gnome-fs-share.png
+share/icons/Crux/16x16/places/gnome-fs-smb.png
+share/icons/Crux/16x16/places/gnome-fs-ssh.png
+share/icons/Crux/16x16/places/gnome-mime-x-directory-smb-share.png
+share/icons/Crux/16x16/places/network.png
+share/icons/Crux/16x16/places/stock_folder.png
+share/icons/Crux/16x16/places/user-home.png
+share/icons/Crux/16x16/status/folder-drag-accept.png
+share/icons/Crux/16x16/status/folder-open.png
+share/icons/Crux/16x16/status/folder-visiting.png
+share/icons/Crux/16x16/status/folder_open.png
+share/icons/Crux/16x16/status/gnome-fs-directory-accept.png
+share/icons/Crux/16x16/status/gnome-fs-directory-visiting.png
+share/icons/Crux/16x16/status/stock_open.png
+share/icons/Crux/22x22/actions/back.png
+share/icons/Crux/22x22/actions/bottom.png
+share/icons/Crux/22x22/actions/document-open.png
+share/icons/Crux/22x22/actions/down.png
+share/icons/Crux/22x22/actions/fileopen.png
+share/icons/Crux/22x22/actions/finish.png
+share/icons/Crux/22x22/actions/forward.png
+share/icons/Crux/22x22/actions/go-bottom.png
+share/icons/Crux/22x22/actions/go-down.png
+share/icons/Crux/22x22/actions/go-first.png
+share/icons/Crux/22x22/actions/go-home.png
+share/icons/Crux/22x22/actions/go-last.png
+share/icons/Crux/22x22/actions/go-next.png
+share/icons/Crux/22x22/actions/go-previous.png
+share/icons/Crux/22x22/actions/go-top.png
+share/icons/Crux/22x22/actions/go-up.png
+share/icons/Crux/22x22/actions/gohome.png
+share/icons/Crux/22x22/actions/gtk-go-back-ltr.png
+share/icons/Crux/22x22/actions/gtk-go-back-rtl.png
+share/icons/Crux/22x22/actions/gtk-go-down.png
+share/icons/Crux/22x22/actions/gtk-go-forward-ltr.png
+share/icons/Crux/22x22/actions/gtk-go-forward-rtl.png
+share/icons/Crux/22x22/actions/gtk-go-up.png
+share/icons/Crux/22x22/actions/gtk-goto-bottom.png
+share/icons/Crux/22x22/actions/gtk-goto-first-ltr.png
+share/icons/Crux/22x22/actions/gtk-goto-first-rtl.png
+share/icons/Crux/22x22/actions/gtk-goto-last-ltr.png
+share/icons/Crux/22x22/actions/gtk-goto-last-rtl.png
+share/icons/Crux/22x22/actions/gtk-goto-top.png
+share/icons/Crux/22x22/actions/gtk-home.png
+share/icons/Crux/22x22/actions/gtk-open.png
+share/icons/Crux/22x22/actions/gtk-refresh.png
+share/icons/Crux/22x22/actions/kfm_home.png
+share/icons/Crux/22x22/actions/next.png
+share/icons/Crux/22x22/actions/previous.png
+share/icons/Crux/22x22/actions/redhat-home.png
+share/icons/Crux/22x22/actions/reload.png
+share/icons/Crux/22x22/actions/reload3.png
+share/icons/Crux/22x22/actions/reload_all_tabs.png
+share/icons/Crux/22x22/actions/reload_page.png
+share/icons/Crux/22x22/actions/start.png
+share/icons/Crux/22x22/actions/stock_bottom.png
+share/icons/Crux/22x22/actions/stock_down.png
+share/icons/Crux/22x22/actions/stock_first.png
+share/icons/Crux/22x22/actions/stock_home.png
+share/icons/Crux/22x22/actions/stock_last.png
+share/icons/Crux/22x22/actions/stock_left.png
+share/icons/Crux/22x22/actions/stock_refresh.png
+share/icons/Crux/22x22/actions/stock_right.png
+share/icons/Crux/22x22/actions/stock_top.png
+share/icons/Crux/22x22/actions/stock_up.png
+share/icons/Crux/22x22/actions/top.png
+share/icons/Crux/22x22/actions/up.png
+share/icons/Crux/22x22/actions/view-refresh.png
+share/icons/Crux/22x22/places/application-x-gnome-saved-search.png
+share/icons/Crux/22x22/places/folder-remote.png
+share/icons/Crux/22x22/places/folder-saved-search.png
+share/icons/Crux/22x22/places/folder.png
+share/icons/Crux/22x22/places/folder_home.png
+share/icons/Crux/22x22/places/gnome-fs-directory.png
+share/icons/Crux/22x22/places/gnome-fs-ftp.png
+share/icons/Crux/22x22/places/gnome-fs-home.png
+share/icons/Crux/22x22/places/gnome-fs-nfs.png
+share/icons/Crux/22x22/places/gnome-fs-share.png
+share/icons/Crux/22x22/places/gnome-fs-smb.png
+share/icons/Crux/22x22/places/gnome-fs-ssh.png
+share/icons/Crux/22x22/places/gnome-mime-x-directory-smb-share.png
+share/icons/Crux/22x22/places/network.png
+share/icons/Crux/22x22/places/stock_folder.png
+share/icons/Crux/22x22/places/user-home.png
+share/icons/Crux/22x22/status/folder-drag-accept.png
+share/icons/Crux/22x22/status/folder-open.png
+share/icons/Crux/22x22/status/folder-visiting.png
+share/icons/Crux/22x22/status/folder_open.png
+share/icons/Crux/22x22/status/gnome-fs-directory-accept.png
+share/icons/Crux/22x22/status/gnome-fs-directory-visiting.png
+share/icons/Crux/22x22/status/stock_open.png
+share/icons/Crux/24x24/actions/back.png
+share/icons/Crux/24x24/actions/bottom.png
+share/icons/Crux/24x24/actions/document-open.png
+share/icons/Crux/24x24/actions/down.png
+share/icons/Crux/24x24/actions/fileopen.png
+share/icons/Crux/24x24/actions/finish.png
+share/icons/Crux/24x24/actions/forward.png
+share/icons/Crux/24x24/actions/go-bottom.png
+share/icons/Crux/24x24/actions/go-down.png
+share/icons/Crux/24x24/actions/go-first.png
+share/icons/Crux/24x24/actions/go-home.png
+share/icons/Crux/24x24/actions/go-last.png
+share/icons/Crux/24x24/actions/go-next.png
+share/icons/Crux/24x24/actions/go-previous.png
+share/icons/Crux/24x24/actions/go-top.png
+share/icons/Crux/24x24/actions/go-up.png
+share/icons/Crux/24x24/actions/gohome.png
+share/icons/Crux/24x24/actions/gtk-go-back-ltr.png
+share/icons/Crux/24x24/actions/gtk-go-back-rtl.png
+share/icons/Crux/24x24/actions/gtk-go-down.png
+share/icons/Crux/24x24/actions/gtk-go-forward-ltr.png
+share/icons/Crux/24x24/actions/gtk-go-forward-rtl.png
+share/icons/Crux/24x24/actions/gtk-go-up.png
+share/icons/Crux/24x24/actions/gtk-goto-bottom.png
+share/icons/Crux/24x24/actions/gtk-goto-first-ltr.png
+share/icons/Crux/24x24/actions/gtk-goto-first-rtl.png
+share/icons/Crux/24x24/actions/gtk-goto-last-ltr.png
+share/icons/Crux/24x24/actions/gtk-goto-last-rtl.png
+share/icons/Crux/24x24/actions/gtk-goto-top.png
+share/icons/Crux/24x24/actions/gtk-home.png
+share/icons/Crux/24x24/actions/gtk-open.png
+share/icons/Crux/24x24/actions/gtk-refresh.png
+share/icons/Crux/24x24/actions/kfm_home.png
+share/icons/Crux/24x24/actions/next.png
+share/icons/Crux/24x24/actions/previous.png
+share/icons/Crux/24x24/actions/redhat-home.png
+share/icons/Crux/24x24/actions/reload.png
+share/icons/Crux/24x24/actions/reload3.png
+share/icons/Crux/24x24/actions/reload_all_tabs.png
+share/icons/Crux/24x24/actions/reload_page.png
+share/icons/Crux/24x24/actions/start.png
+share/icons/Crux/24x24/actions/stock_bottom.png
+share/icons/Crux/24x24/actions/stock_down.png
+share/icons/Crux/24x24/actions/stock_first.png
+share/icons/Crux/24x24/actions/stock_home.png
+share/icons/Crux/24x24/actions/stock_last.png
+share/icons/Crux/24x24/actions/stock_left.png
+share/icons/Crux/24x24/actions/stock_refresh.png
+share/icons/Crux/24x24/actions/stock_right.png
+share/icons/Crux/24x24/actions/stock_top.png
+share/icons/Crux/24x24/actions/stock_up.png
+share/icons/Crux/24x24/actions/top.png
+share/icons/Crux/24x24/actions/up.png
+share/icons/Crux/24x24/actions/view-refresh.png
+share/icons/Crux/24x24/places/application-x-gnome-saved-search.png
+share/icons/Crux/24x24/places/folder-remote.png
+share/icons/Crux/24x24/places/folder-saved-search.png
+share/icons/Crux/24x24/places/folder.png
+share/icons/Crux/24x24/places/folder_home.png
+share/icons/Crux/24x24/places/gnome-fs-directory.png
+share/icons/Crux/24x24/places/gnome-fs-ftp.png
+share/icons/Crux/24x24/places/gnome-fs-home.png
+share/icons/Crux/24x24/places/gnome-fs-nfs.png
+share/icons/Crux/24x24/places/gnome-fs-share.png
+share/icons/Crux/24x24/places/gnome-fs-smb.png
+share/icons/Crux/24x24/places/gnome-fs-ssh.png
+share/icons/Crux/24x24/places/gnome-mime-x-directory-smb-share.png
+share/icons/Crux/24x24/places/network.png
+share/icons/Crux/24x24/places/stock_folder.png
+share/icons/Crux/24x24/places/user-home.png
+share/icons/Crux/24x24/status/folder-drag-accept.png
+share/icons/Crux/24x24/status/folder-open.png
+share/icons/Crux/24x24/status/folder-visiting.png
+share/icons/Crux/24x24/status/folder_open.png
+share/icons/Crux/24x24/status/gnome-fs-directory-accept.png
+share/icons/Crux/24x24/status/gnome-fs-directory-visiting.png
+share/icons/Crux/24x24/status/stock_open.png
+share/icons/Crux/32x32/actions/document-open.png
+share/icons/Crux/32x32/actions/fileopen.png
+share/icons/Crux/32x32/actions/gtk-open.png
+share/icons/Crux/32x32/places/application-x-gnome-saved-search.png
+share/icons/Crux/32x32/places/folder-remote.png
+share/icons/Crux/32x32/places/folder-saved-search.png
+share/icons/Crux/32x32/places/folder.png
+share/icons/Crux/32x32/places/folder_home.png
+share/icons/Crux/32x32/places/gnome-fs-directory.png
+share/icons/Crux/32x32/places/gnome-fs-ftp.png
+share/icons/Crux/32x32/places/gnome-fs-home.png
+share/icons/Crux/32x32/places/gnome-fs-nfs.png
+share/icons/Crux/32x32/places/gnome-fs-share.png
+share/icons/Crux/32x32/places/gnome-fs-smb.png
+share/icons/Crux/32x32/places/gnome-fs-ssh.png
+share/icons/Crux/32x32/places/gnome-mime-x-directory-smb-share.png
+share/icons/Crux/32x32/places/network.png
+share/icons/Crux/32x32/places/stock_folder.png
+share/icons/Crux/32x32/places/user-home.png
+share/icons/Crux/32x32/status/folder-drag-accept.png
+share/icons/Crux/32x32/status/folder-open.png
+share/icons/Crux/32x32/status/folder-visiting.png
+share/icons/Crux/32x32/status/folder_open.png
+share/icons/Crux/32x32/status/gnome-fs-directory-accept.png
+share/icons/Crux/32x32/status/gnome-fs-directory-visiting.png
+share/icons/Crux/32x32/status/stock_open.png
share/icons/Crux/index.theme
-share/icons/Flat-Blue/12x12/emblems/emblem-symbolic-link.png
-share/icons/Flat-Blue/12x12/filesystems/gnome-fs-directory-accept.png
-share/icons/Flat-Blue/12x12/filesystems/gnome-fs-directory.png
-share/icons/Flat-Blue/12x12/filesystems/gnome-fs-regular.png
-share/icons/Flat-Blue/192x192/filesystems/gnome-fs-trash-empty.png
-share/icons/Flat-Blue/192x192/filesystems/gnome-fs-trash-full.png
-share/icons/Flat-Blue/20x20/filesystems/gnome-fs-bookmark-missing.png
-share/icons/Flat-Blue/20x20/filesystems/gnome-fs-bookmark.png
-share/icons/Flat-Blue/24x24/emblems/emblem-symbolic-link.png
-share/icons/Flat-Blue/24x24/filesystems/gnome-fs-directory-accept.png
-share/icons/Flat-Blue/24x24/filesystems/gnome-fs-directory.png
-share/icons/Flat-Blue/24x24/filesystems/gnome-fs-regular.png
-share/icons/Flat-Blue/36x36/emblems/emblem-symbolic-link.png
-share/icons/Flat-Blue/36x36/filesystems/gnome-fs-directory-accept.png
-share/icons/Flat-Blue/36x36/filesystems/gnome-fs-directory.png
-share/icons/Flat-Blue/36x36/filesystems/gnome-fs-regular.png
-share/icons/Flat-Blue/48x48/devices/gnome-dev-broken-image.png
-share/icons/Flat-Blue/48x48/devices/gnome-dev-spreadsheet.png
-share/icons/Flat-Blue/48x48/devices/gnome-dev-stalled.png
-share/icons/Flat-Blue/48x48/devices/gnome-dev-symlink.png
-share/icons/Flat-Blue/48x48/emblems/emblem-art.png
-share/icons/Flat-Blue/48x48/emblems/emblem-broken-link.png
-share/icons/Flat-Blue/48x48/emblems/emblem-camera.png
-share/icons/Flat-Blue/48x48/emblems/emblem-documents.png
-share/icons/Flat-Blue/48x48/emblems/emblem-generic.png
-share/icons/Flat-Blue/48x48/emblems/emblem-mail.png
-share/icons/Flat-Blue/48x48/emblems/emblem-multimedia.png
-share/icons/Flat-Blue/48x48/emblems/emblem-package.png
-share/icons/Flat-Blue/48x48/emblems/emblem-pictures.png
-share/icons/Flat-Blue/48x48/emblems/emblem-sound.png
-share/icons/Flat-Blue/48x48/emblems/emblem-symbolic-link.png
-share/icons/Flat-Blue/48x48/emblems/emblem-trash.png
-share/icons/Flat-Blue/48x48/emblems/emblem-web.png
-share/icons/Flat-Blue/48x48/filesystems/gnome-fs-bookmark-missing.png
-share/icons/Flat-Blue/48x48/filesystems/gnome-fs-bookmark.png
-share/icons/Flat-Blue/48x48/filesystems/gnome-fs-directory-accept.png
-share/icons/Flat-Blue/48x48/filesystems/gnome-fs-directory.png
-share/icons/Flat-Blue/48x48/filesystems/gnome-fs-home.png
-share/icons/Flat-Blue/48x48/filesystems/gnome-fs-loading.png
-share/icons/Flat-Blue/48x48/filesystems/gnome-fs-regular.png
-share/icons/Flat-Blue/48x48/filesystems/gnome-fs-trash-empty.png
-share/icons/Flat-Blue/48x48/filesystems/gnome-fs-trash-full.png
-share/icons/Flat-Blue/72x72/devices/gnome-dev-search.png
-share/icons/Flat-Blue/72x72/filesystems/gnome-fs-directory-accept.png
-share/icons/Flat-Blue/72x72/filesystems/gnome-fs-directory.png
-share/icons/Flat-Blue/72x72/filesystems/gnome-fs-regular.png
-share/icons/Flat-Blue/72x72/filesystems/gnome-fs-web.png
-share/icons/Flat-Blue/96x96/filesystems/gnome-fs-directory-accept.png
-share/icons/Flat-Blue/96x96/filesystems/gnome-fs-directory.png
-share/icons/Flat-Blue/96x96/filesystems/gnome-fs-regular.png
-share/icons/Flat-Blue/index.theme
-share/icons/Flat-Blue/scalable/emblems/emblem-OK.svg
-share/icons/Flat-Blue/scalable/emblems/emblem-certified.svg
-share/icons/Flat-Blue/scalable/emblems/emblem-cool.svg
-share/icons/Flat-Blue/scalable/emblems/emblem-danger.svg
-share/icons/Flat-Blue/scalable/emblems/emblem-distinguished.svg
-share/icons/Flat-Blue/scalable/emblems/emblem-draft.svg
-share/icons/Flat-Blue/scalable/emblems/emblem-favorite.svg
-share/icons/Flat-Blue/scalable/emblems/emblem-important.svg
-share/icons/Flat-Blue/scalable/emblems/emblem-new.svg
-share/icons/Flat-Blue/scalable/emblems/emblem-noread.svg
-share/icons/Flat-Blue/scalable/emblems/emblem-nowrite.svg
-share/icons/Flat-Blue/scalable/emblems/emblem-ohno.svg
-share/icons/Flat-Blue/scalable/emblems/emblem-personal.svg
-share/icons/Flat-Blue/scalable/emblems/emblem-special.svg
-share/icons/Flat-Blue/scalable/emblems/emblem-urgent.svg
+share/icons/Crux/scalable/actions/back.svg
+share/icons/Crux/scalable/actions/bottom.svg
+share/icons/Crux/scalable/actions/document-open.svg
+share/icons/Crux/scalable/actions/down.svg
+share/icons/Crux/scalable/actions/fileopen.svg
+share/icons/Crux/scalable/actions/finish.svg
+share/icons/Crux/scalable/actions/forward.svg
+share/icons/Crux/scalable/actions/go-bottom.svg
+share/icons/Crux/scalable/actions/go-down.svg
+share/icons/Crux/scalable/actions/go-first.svg
+share/icons/Crux/scalable/actions/go-home.svg
+share/icons/Crux/scalable/actions/go-last.svg
+share/icons/Crux/scalable/actions/go-next.svg
+share/icons/Crux/scalable/actions/go-previous.svg
+share/icons/Crux/scalable/actions/go-top.svg
+share/icons/Crux/scalable/actions/go-up.svg
+share/icons/Crux/scalable/actions/gohome.svg
+share/icons/Crux/scalable/actions/gtk-go-back-ltr.svg
+share/icons/Crux/scalable/actions/gtk-go-back-rtl.svg
+share/icons/Crux/scalable/actions/gtk-go-down.svg
+share/icons/Crux/scalable/actions/gtk-go-forward-ltr.svg
+share/icons/Crux/scalable/actions/gtk-go-forward-rtl.svg
+share/icons/Crux/scalable/actions/gtk-go-up.svg
+share/icons/Crux/scalable/actions/gtk-goto-bottom.svg
+share/icons/Crux/scalable/actions/gtk-goto-first-ltr.svg
+share/icons/Crux/scalable/actions/gtk-goto-first-rtl.svg
+share/icons/Crux/scalable/actions/gtk-goto-last-ltr.svg
+share/icons/Crux/scalable/actions/gtk-goto-last-rtl.svg
+share/icons/Crux/scalable/actions/gtk-goto-top.svg
+share/icons/Crux/scalable/actions/gtk-home.svg
+share/icons/Crux/scalable/actions/gtk-open.svg
+share/icons/Crux/scalable/actions/gtk-refresh.svg
+share/icons/Crux/scalable/actions/kfm_home.svg
+share/icons/Crux/scalable/actions/next.svg
+share/icons/Crux/scalable/actions/previous.svg
+share/icons/Crux/scalable/actions/redhat-home.svg
+share/icons/Crux/scalable/actions/reload.svg
+share/icons/Crux/scalable/actions/reload3.svg
+share/icons/Crux/scalable/actions/reload_all_tabs.svg
+share/icons/Crux/scalable/actions/reload_page.svg
+share/icons/Crux/scalable/actions/start.svg
+share/icons/Crux/scalable/actions/stock_bottom.svg
+share/icons/Crux/scalable/actions/stock_down.svg
+share/icons/Crux/scalable/actions/stock_first.svg
+share/icons/Crux/scalable/actions/stock_home.svg
+share/icons/Crux/scalable/actions/stock_last.svg
+share/icons/Crux/scalable/actions/stock_left.svg
+share/icons/Crux/scalable/actions/stock_refresh.svg
+share/icons/Crux/scalable/actions/stock_right.svg
+share/icons/Crux/scalable/actions/stock_top.svg
+share/icons/Crux/scalable/actions/stock_up.svg
+share/icons/Crux/scalable/actions/top.svg
+share/icons/Crux/scalable/actions/up.svg
+share/icons/Crux/scalable/actions/view-refresh.svg
+share/icons/Crux/scalable/places/application-x-gnome-saved-search.svg
+share/icons/Crux/scalable/places/folder-remote.svg
+share/icons/Crux/scalable/places/folder-saved-search.svg
+share/icons/Crux/scalable/places/folder.svg
+share/icons/Crux/scalable/places/folder_home.svg
+share/icons/Crux/scalable/places/gnome-fs-directory.svg
+share/icons/Crux/scalable/places/gnome-fs-ftp.svg
+share/icons/Crux/scalable/places/gnome-fs-home.svg
+share/icons/Crux/scalable/places/gnome-fs-nfs.svg
+share/icons/Crux/scalable/places/gnome-fs-share.svg
+share/icons/Crux/scalable/places/gnome-fs-smb.svg
+share/icons/Crux/scalable/places/gnome-fs-ssh.svg
+share/icons/Crux/scalable/places/gnome-mime-x-directory-smb-share.svg
+share/icons/Crux/scalable/places/network.svg
+share/icons/Crux/scalable/places/stock_folder.svg
+share/icons/Crux/scalable/places/user-home.svg
+share/icons/Crux/scalable/status/folder-drag-accept.svg
+share/icons/Crux/scalable/status/folder-open.svg
+share/icons/Crux/scalable/status/folder-visiting.svg
+share/icons/Crux/scalable/status/folder_open.svg
+share/icons/Crux/scalable/status/gnome-fs-directory-accept.svg
+share/icons/Crux/scalable/status/gnome-fs-directory-visiting.svg
+share/icons/Crux/scalable/status/stock_open.svg
+share/icons/HighContrast-SVG/48x48/animations/gnome-spinner-rest.png
+share/icons/HighContrast-SVG/48x48/animations/gnome-spinner.png
+share/icons/HighContrast-SVG/48x48/animations/process-idle.png
+share/icons/HighContrast-SVG/48x48/animations/process-working.png
+share/icons/HighContrast-SVG/index.theme
+share/icons/HighContrast-SVG/scalable/actions/add.svg
+share/icons/HighContrast-SVG/scalable/actions/application-exit.svg
+share/icons/HighContrast-SVG/scalable/actions/back.svg
+share/icons/HighContrast-SVG/scalable/actions/bottom.svg
+share/icons/HighContrast-SVG/scalable/actions/button_cancel.svg
+share/icons/HighContrast-SVG/scalable/actions/cancel.svg
+share/icons/HighContrast-SVG/scalable/actions/centrejust.svg
+share/icons/HighContrast-SVG/scalable/actions/dialog-cancel.svg
+share/icons/HighContrast-SVG/scalable/actions/dialog-close.svg
+share/icons/HighContrast-SVG/scalable/actions/dialog-ok.svg
+share/icons/HighContrast-SVG/scalable/actions/document-new.svg
+share/icons/HighContrast-SVG/scalable/actions/document-open-recent.svg
+share/icons/HighContrast-SVG/scalable/actions/document-open.svg
+share/icons/HighContrast-SVG/scalable/actions/document-print-preview.svg
+share/icons/HighContrast-SVG/scalable/actions/document-print.svg
+share/icons/HighContrast-SVG/scalable/actions/document-properties.svg
+share/icons/HighContrast-SVG/scalable/actions/document-revert.svg
+share/icons/HighContrast-SVG/scalable/actions/document-save-as.svg
+share/icons/HighContrast-SVG/scalable/actions/document-save.svg
+share/icons/HighContrast-SVG/scalable/actions/down.svg
+share/icons/HighContrast-SVG/scalable/actions/edit-clear.svg
+share/icons/HighContrast-SVG/scalable/actions/edit-copy.svg
+share/icons/HighContrast-SVG/scalable/actions/edit-cut.svg
+share/icons/HighContrast-SVG/scalable/actions/edit-delete.svg
+share/icons/HighContrast-SVG/scalable/actions/edit-find-replace.svg
+share/icons/HighContrast-SVG/scalable/actions/edit-find.svg
+share/icons/HighContrast-SVG/scalable/actions/edit-paste.svg
+share/icons/HighContrast-SVG/scalable/actions/edit-redo.svg
+share/icons/HighContrast-SVG/scalable/actions/edit-undo.svg
+share/icons/HighContrast-SVG/scalable/actions/editclear.svg
+share/icons/HighContrast-SVG/scalable/actions/editcopy.svg
+share/icons/HighContrast-SVG/scalable/actions/editcut.svg
+share/icons/HighContrast-SVG/scalable/actions/editdelete.svg
+share/icons/HighContrast-SVG/scalable/actions/editpaste.svg
+share/icons/HighContrast-SVG/scalable/actions/exit.svg
+share/icons/HighContrast-SVG/scalable/actions/filefind.svg
+share/icons/HighContrast-SVG/scalable/actions/filenew.svg
+share/icons/HighContrast-SVG/scalable/actions/fileopen.svg
+share/icons/HighContrast-SVG/scalable/actions/fileprint.svg
+share/icons/HighContrast-SVG/scalable/actions/filequickprint.svg
+share/icons/HighContrast-SVG/scalable/actions/filesave.svg
+share/icons/HighContrast-SVG/scalable/actions/filesaveas.svg
+share/icons/HighContrast-SVG/scalable/actions/find.svg
+share/icons/HighContrast-SVG/scalable/actions/finish.svg
+share/icons/HighContrast-SVG/scalable/actions/format-indent-less.svg
+share/icons/HighContrast-SVG/scalable/actions/format-indent-more.svg
+share/icons/HighContrast-SVG/scalable/actions/format-justify-center.svg
+share/icons/HighContrast-SVG/scalable/actions/format-justify-fill.svg
+share/icons/HighContrast-SVG/scalable/actions/format-justify-left.svg
+share/icons/HighContrast-SVG/scalable/actions/format-justify-right.svg
+share/icons/HighContrast-SVG/scalable/actions/format-text-bold.svg
+share/icons/HighContrast-SVG/scalable/actions/format-text-italic.svg
+share/icons/HighContrast-SVG/scalable/actions/format-text-strikethrough.svg
+share/icons/HighContrast-SVG/scalable/actions/format-text-underline.svg
+share/icons/HighContrast-SVG/scalable/actions/forward.svg
+share/icons/HighContrast-SVG/scalable/actions/gnome-lockscreen.svg
+share/icons/HighContrast-SVG/scalable/actions/gnome-logout.svg
+share/icons/HighContrast-SVG/scalable/actions/gnome-run.svg
+share/icons/HighContrast-SVG/scalable/actions/gnome-searchtool.svg
+share/icons/HighContrast-SVG/scalable/actions/gnome-stock-mail-new.svg
+share/icons/HighContrast-SVG/scalable/actions/gnome-stock-text-indent.svg
+share/icons/HighContrast-SVG/scalable/actions/gnome-stock-text-unindent.svg
+share/icons/HighContrast-SVG/scalable/actions/go-bottom.svg
+share/icons/HighContrast-SVG/scalable/actions/go-down.svg
+share/icons/HighContrast-SVG/scalable/actions/go-first.svg
+share/icons/HighContrast-SVG/scalable/actions/go-home.svg
+share/icons/HighContrast-SVG/scalable/actions/go-jump.svg
+share/icons/HighContrast-SVG/scalable/actions/go-last.svg
+share/icons/HighContrast-SVG/scalable/actions/go-next.svg
+share/icons/HighContrast-SVG/scalable/actions/go-previous.svg
+share/icons/HighContrast-SVG/scalable/actions/go-top.svg
+share/icons/HighContrast-SVG/scalable/actions/go-up.svg
+share/icons/HighContrast-SVG/scalable/actions/gohome.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-add.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-bold.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-cancel.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-clear.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-close.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-copy.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-cut.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-delete.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-find-and-replace.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-find.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-fullscreen.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-go-back-ltr.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-go-back-rtl.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-go-down.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-go-forward-ltr.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-go-forward-rtl.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-go-up.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-goto-bottom.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-goto-first-ltr.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-goto-first-rtl.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-goto-last-ltr.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-goto-last-rtl.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-goto-top.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-home.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-indent.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-italic.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-jump-to-ltr.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-jump-to-rtl.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-justify-center.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-justify-fill.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-justify-left.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-justify-right.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-leave-fullscreen.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-media-forward-ltr.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-media-forward-rtl.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-media-next-ltr.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-media-next-rtl.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-media-pause.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-media-play-ltr.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-media-previous-ltr.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-media-previous-rtl.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-media-record.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-media-rewind-ltr.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-media-rewind-rtl.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-media-stop.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-new.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-open.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-paste.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-print-preview.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-print.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-properties.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-quit.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-redo-ltr.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-refresh.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-remove.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-save-as.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-save.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-sort-ascending.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-sort-descending.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-stop.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-strikethrough.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-underline.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-undo-ltr.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-unindent.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-100.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-fit.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-in.svg
+share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-out.svg
+share/icons/HighContrast-SVG/scalable/actions/help-about.svg
+share/icons/HighContrast-SVG/scalable/actions/insert-object.svg
+share/icons/HighContrast-SVG/scalable/actions/kfind.svg
+share/icons/HighContrast-SVG/scalable/actions/kfm_home.svg
+share/icons/HighContrast-SVG/scalable/actions/leftjust.svg
+share/icons/HighContrast-SVG/scalable/actions/list-add.svg
+share/icons/HighContrast-SVG/scalable/actions/list-remove.svg
+share/icons/HighContrast-SVG/scalable/actions/lock.svg
+share/icons/HighContrast-SVG/scalable/actions/mail-message-new.svg
+share/icons/HighContrast-SVG/scalable/actions/mail_new.svg
+share/icons/HighContrast-SVG/scalable/actions/media-eject.svg
+share/icons/HighContrast-SVG/scalable/actions/media-playback-pause.svg
+share/icons/HighContrast-SVG/scalable/actions/media-playback-start.svg
+share/icons/HighContrast-SVG/scalable/actions/media-playback-stop.svg
+share/icons/HighContrast-SVG/scalable/actions/media-record.svg
+share/icons/HighContrast-SVG/scalable/actions/media-seek-backward.svg
+share/icons/HighContrast-SVG/scalable/actions/media-seek-forward.svg
+share/icons/HighContrast-SVG/scalable/actions/media-skip-backward.svg
+share/icons/HighContrast-SVG/scalable/actions/media-skip-forward.svg
+share/icons/HighContrast-SVG/scalable/actions/next.svg
+share/icons/HighContrast-SVG/scalable/actions/player_eject.svg
+share/icons/HighContrast-SVG/scalable/actions/player_end.svg
+share/icons/HighContrast-SVG/scalable/actions/player_fwd.svg
+share/icons/HighContrast-SVG/scalable/actions/player_pause.svg
+share/icons/HighContrast-SVG/scalable/actions/player_play.svg
+share/icons/HighContrast-SVG/scalable/actions/player_record.svg
+share/icons/HighContrast-SVG/scalable/actions/player_rew.svg
+share/icons/HighContrast-SVG/scalable/actions/player_start.svg
+share/icons/HighContrast-SVG/scalable/actions/player_stop.svg
+share/icons/HighContrast-SVG/scalable/actions/previous.svg
+share/icons/HighContrast-SVG/scalable/actions/process-stop.svg
+share/icons/HighContrast-SVG/scalable/actions/redhat-home.svg
+share/icons/HighContrast-SVG/scalable/actions/redo.svg
+share/icons/HighContrast-SVG/scalable/actions/reload.svg
+share/icons/HighContrast-SVG/scalable/actions/reload3.svg
+share/icons/HighContrast-SVG/scalable/actions/reload_all_tabs.svg
+share/icons/HighContrast-SVG/scalable/actions/reload_page.svg
+share/icons/HighContrast-SVG/scalable/actions/remove.svg
+share/icons/HighContrast-SVG/scalable/actions/rightjust.svg
+share/icons/HighContrast-SVG/scalable/actions/search.svg
+share/icons/HighContrast-SVG/scalable/actions/start.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_bottom.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_close.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_copy.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_cut.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_delete.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_down.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_file-properites.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_first.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_fullscreen.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_home.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_last.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_leave-fullscreen.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_left.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_mail-compose.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_media-fwd.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_media-next.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_media-pause.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_media-play.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_media-prev.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_media-rec.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_media-rew.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_media-stop.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_new-text.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_new-window.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_paste.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_print-preview.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_print.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_properties.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_redo.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_refresh.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_right.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_save-as.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_save.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_search-and-replace.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_search.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_stop.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_text-strikethrough.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_text_bold.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_text_center.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_text_indent.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_text_italic.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_text_justify.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_text_left.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_text_right.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_text_underlined.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_text_unindent.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_top.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_undo.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_up.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_zoom-1.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_zoom-in.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_zoom-out.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_zoom-page.svg
+share/icons/HighContrast-SVG/scalable/actions/stop.svg
+share/icons/HighContrast-SVG/scalable/actions/system-lock-screen.svg
+share/icons/HighContrast-SVG/scalable/actions/system-log-out.svg
+share/icons/HighContrast-SVG/scalable/actions/system-run.svg
+share/icons/HighContrast-SVG/scalable/actions/system-search.svg
+share/icons/HighContrast-SVG/scalable/actions/system-shutdown.svg
+share/icons/HighContrast-SVG/scalable/actions/text_bold.svg
+share/icons/HighContrast-SVG/scalable/actions/text_italic.svg
+share/icons/HighContrast-SVG/scalable/actions/text_strike.svg
+share/icons/HighContrast-SVG/scalable/actions/text_under.svg
+share/icons/HighContrast-SVG/scalable/actions/tools-check-spelling.svg
+share/icons/HighContrast-SVG/scalable/actions/top.svg
+share/icons/HighContrast-SVG/scalable/actions/undo.svg
+share/icons/HighContrast-SVG/scalable/actions/up.svg
+share/icons/HighContrast-SVG/scalable/actions/view-fullscreen.svg
+share/icons/HighContrast-SVG/scalable/actions/view-refresh.svg
+share/icons/HighContrast-SVG/scalable/actions/view-restore.svg
+share/icons/HighContrast-SVG/scalable/actions/view-sort-ascending.svg
+share/icons/HighContrast-SVG/scalable/actions/view-sort-descending.svg
+share/icons/HighContrast-SVG/scalable/actions/window-close.svg
+share/icons/HighContrast-SVG/scalable/actions/window-new.svg
+share/icons/HighContrast-SVG/scalable/actions/window_fullscreen.svg
+share/icons/HighContrast-SVG/scalable/actions/window_new.svg
+share/icons/HighContrast-SVG/scalable/actions/window_nofullscreen.svg
+share/icons/HighContrast-SVG/scalable/actions/xfce-system-exit.svg
+share/icons/HighContrast-SVG/scalable/actions/xfce-system-lock.svg
+share/icons/HighContrast-SVG/scalable/actions/zoom-best-fit.svg
+share/icons/HighContrast-SVG/scalable/actions/zoom-in.svg
+share/icons/HighContrast-SVG/scalable/actions/zoom-original.svg
+share/icons/HighContrast-SVG/scalable/actions/zoom-out.svg
+share/icons/HighContrast-SVG/scalable/apps/accessories-calculator.svg
+share/icons/HighContrast-SVG/scalable/apps/accessories-character-map.svg
+share/icons/HighContrast-SVG/scalable/apps/accessories-text-editor.svg
+share/icons/HighContrast-SVG/scalable/apps/arts.svg
+share/icons/HighContrast-SVG/scalable/apps/calc.svg
+share/icons/HighContrast-SVG/scalable/apps/fonts.svg
+share/icons/HighContrast-SVG/scalable/apps/gnome-calculator.svg
+share/icons/HighContrast-SVG/scalable/apps/gnome-character-map.svg
+share/icons/HighContrast-SVG/scalable/apps/gnome-help.svg
+share/icons/HighContrast-SVG/scalable/apps/gnome-mixer.svg
+share/icons/HighContrast-SVG/scalable/apps/gnome-monitor.svg
+share/icons/HighContrast-SVG/scalable/apps/gnome-settings-font.svg
+share/icons/HighContrast-SVG/scalable/apps/gnome-terminal.svg
+share/icons/HighContrast-SVG/scalable/apps/gnome-window-manager.svg
+share/icons/HighContrast-SVG/scalable/apps/gtk-help.svg
+share/icons/HighContrast-SVG/scalable/apps/gucharmap.svg
+share/icons/HighContrast-SVG/scalable/apps/help-browser.svg
+share/icons/HighContrast-SVG/scalable/apps/help.svg
+share/icons/HighContrast-SVG/scalable/apps/kcalc.svg
+share/icons/HighContrast-SVG/scalable/apps/kcharselect.svg
+share/icons/HighContrast-SVG/scalable/apps/kcmkwm.svg
+share/icons/HighContrast-SVG/scalable/apps/kcmsound.svg
+share/icons/HighContrast-SVG/scalable/apps/kedit.svg
+share/icons/HighContrast-SVG/scalable/apps/khelpcenter.svg
+share/icons/HighContrast-SVG/scalable/apps/konsole.svg
+share/icons/HighContrast-SVG/scalable/apps/ksysguard.svg
+share/icons/HighContrast-SVG/scalable/apps/kwin.svg
+share/icons/HighContrast-SVG/scalable/apps/multimedia-volume-control.svg
+share/icons/HighContrast-SVG/scalable/apps/multimedia.svg
+share/icons/HighContrast-SVG/scalable/apps/openterm.svg
+share/icons/HighContrast-SVG/scalable/apps/preferences-desktop-font.svg
+share/icons/HighContrast-SVG/scalable/apps/preferences-system-windows.svg
+share/icons/HighContrast-SVG/scalable/apps/stock_help.svg
+share/icons/HighContrast-SVG/scalable/apps/susehelpcenter.svg
+share/icons/HighContrast-SVG/scalable/apps/terminal.svg
+share/icons/HighContrast-SVG/scalable/apps/text-editor.svg
+share/icons/HighContrast-SVG/scalable/apps/utilities-system-monitor.svg
+share/icons/HighContrast-SVG/scalable/apps/utilities-terminal.svg
+share/icons/HighContrast-SVG/scalable/apps/volume-knob.svg
+share/icons/HighContrast-SVG/scalable/apps/xfce-terminal.svg
+share/icons/HighContrast-SVG/scalable/apps/xfce4-mixer.svg
+share/icons/HighContrast-SVG/scalable/apps/xfwm4.svg
+share/icons/HighContrast-SVG/scalable/categories/applications-accessories.svg
+share/icons/HighContrast-SVG/scalable/categories/applications-games.svg
+share/icons/HighContrast-SVG/scalable/categories/applications-graphics.svg
+share/icons/HighContrast-SVG/scalable/categories/applications-internet.svg
+share/icons/HighContrast-SVG/scalable/categories/gnome-control-center.svg
+share/icons/HighContrast-SVG/scalable/categories/gnome-globe.svg
+share/icons/HighContrast-SVG/scalable/categories/gnome-graphics.svg
+share/icons/HighContrast-SVG/scalable/categories/gnome-joystick.svg
+share/icons/HighContrast-SVG/scalable/categories/gnome-settings.svg
+share/icons/HighContrast-SVG/scalable/categories/gnome-util.svg
+share/icons/HighContrast-SVG/scalable/categories/gtk-preferences.svg
+share/icons/HighContrast-SVG/scalable/categories/kcontrol.svg
+share/icons/HighContrast-SVG/scalable/categories/package_games.svg
+share/icons/HighContrast-SVG/scalable/categories/package_graphics.svg
+share/icons/HighContrast-SVG/scalable/categories/package_network.svg
+share/icons/HighContrast-SVG/scalable/categories/package_utilities.svg
+share/icons/HighContrast-SVG/scalable/categories/preferences-desktop.svg
+share/icons/HighContrast-SVG/scalable/categories/redhat-accessories.svg
+share/icons/HighContrast-SVG/scalable/categories/redhat-games.svg
+share/icons/HighContrast-SVG/scalable/categories/redhat-graphics.svg
+share/icons/HighContrast-SVG/scalable/categories/redhat-internet.svg
+share/icons/HighContrast-SVG/scalable/categories/redhat-preferences.svg
+share/icons/HighContrast-SVG/scalable/categories/stock_internet.svg
+share/icons/HighContrast-SVG/scalable/categories/xfce-games.svg
+share/icons/HighContrast-SVG/scalable/categories/xfce-graphics.svg
+share/icons/HighContrast-SVG/scalable/categories/xfce-internet.svg
+share/icons/HighContrast-SVG/scalable/categories/xfce-utils.svg
+share/icons/HighContrast-SVG/scalable/categories/xfce4-settings.svg
+share/icons/HighContrast-SVG/scalable/devices/3floppy_unmount.svg
+share/icons/HighContrast-SVG/scalable/devices/audio-input-microphone.svg
+share/icons/HighContrast-SVG/scalable/devices/camera-photo.svg
+share/icons/HighContrast-SVG/scalable/devices/camera.svg
+share/icons/HighContrast-SVG/scalable/devices/camera_unmount.svg
+share/icons/HighContrast-SVG/scalable/devices/cdrom_unmount.svg
+share/icons/HighContrast-SVG/scalable/devices/cdwriter_unmount.svg
+share/icons/HighContrast-SVG/scalable/devices/chardevice.svg
+share/icons/HighContrast-SVG/scalable/devices/computer.svg
+share/icons/HighContrast-SVG/scalable/devices/display.svg
+share/icons/HighContrast-SVG/scalable/devices/drive-harddisk.svg
+share/icons/HighContrast-SVG/scalable/devices/drive-removable-media.svg
+share/icons/HighContrast-SVG/scalable/devices/dvd_unmount.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-cdrom-audio.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-computer.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-disc-cdr.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-disc-cdrw.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-disc-dvdr-plus.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-disc-dvdr.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-disc-dvdram.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-disc-dvdrom.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-disc-dvdrw.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-floppy.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-harddisk-1394.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-harddisk-usb.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-harddisk.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-keyboard.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-mouse-ball.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-mouse-optical.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-printer.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-removable-1394.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-removable-usb.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-dev-removable.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-fs-client.svg
+share/icons/HighContrast-SVG/scalable/devices/gnome-stock-mic.svg
+share/icons/HighContrast-SVG/scalable/devices/gtk-cdrom.svg
+share/icons/HighContrast-SVG/scalable/devices/gtk-floppy.svg
+share/icons/HighContrast-SVG/scalable/devices/gtk-harddisk.svg
+share/icons/HighContrast-SVG/scalable/devices/harddrive.svg
+share/icons/HighContrast-SVG/scalable/devices/hdd_unmount.svg
+share/icons/HighContrast-SVG/scalable/devices/input-keyboard.svg
+share/icons/HighContrast-SVG/scalable/devices/input-mouse.svg
+share/icons/HighContrast-SVG/scalable/devices/keyboard.svg
+share/icons/HighContrast-SVG/scalable/devices/kjobviewer.svg
+share/icons/HighContrast-SVG/scalable/devices/kxkb.svg
+share/icons/HighContrast-SVG/scalable/devices/media-cdrom.svg
+share/icons/HighContrast-SVG/scalable/devices/media-floppy.svg
+share/icons/HighContrast-SVG/scalable/devices/media-optical.svg
+share/icons/HighContrast-SVG/scalable/devices/mouse.svg
+share/icons/HighContrast-SVG/scalable/devices/printer-remote.svg
+share/icons/HighContrast-SVG/scalable/devices/printer.svg
+share/icons/HighContrast-SVG/scalable/devices/printer1.svg
+share/icons/HighContrast-SVG/scalable/devices/printmgr.svg
+share/icons/HighContrast-SVG/scalable/devices/stock_mic.svg
+share/icons/HighContrast-SVG/scalable/devices/stock_printers.svg
+share/icons/HighContrast-SVG/scalable/devices/system-floppy.svg
+share/icons/HighContrast-SVG/scalable/devices/system.svg
+share/icons/HighContrast-SVG/scalable/devices/usbpendrive_unmount.svg
+share/icons/HighContrast-SVG/scalable/devices/video-display.svg
+share/icons/HighContrast-SVG/scalable/devices/xfce-printer.svg
+share/icons/HighContrast-SVG/scalable/devices/xfce4-display.svg
+share/icons/HighContrast-SVG/scalable/devices/xfce4-keyboard.svg
+share/icons/HighContrast-SVG/scalable/devices/xfce4-mouse.svg
+share/icons/HighContrast-SVG/scalable/devices/yast_HD.svg
+share/icons/HighContrast-SVG/scalable/devices/yast_idetude.svg
+share/icons/HighContrast-SVG/scalable/devices/yast_mouse.svg
+share/icons/HighContrast-SVG/scalable/devices/yast_printer.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-documents.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-favorite.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-photos.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-readonly.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-symbolic-link.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/application-x-executable.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/ascii.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/audio-x-generic.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/binary.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/empty.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/exec.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/font-x-generic.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/font.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/font_bitmap.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/font_truetype.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/font_type1.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-fs-executable.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-fs-regular.icon
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-fs-regular.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-ogg.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.ms-excel.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.stardivision.calc.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-vnd.sun.xml.calc.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-applix-spreadsheet.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-executable.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-font-afm.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-font-bdf.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-font-linux-psf.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-font-pcf.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-font-sunos-news.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-font-ttf.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-gnumeric.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-killustrator.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-kspread.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-ms-dos-executable.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-perl.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-php.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-python-bytecode.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-shellscript.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-x-shockwave-flash.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-application-xhtml+xml.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-audio.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-image.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-text-html.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-text-vnd.wap.wml.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-text-x-csh.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-text-x-python.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-text-x-sh.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-text-x-zsh.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-text.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-video.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gnome-mime-x-font-afm.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/gtk-file.icon
+share/icons/HighContrast-SVG/scalable/mimetypes/gtk-file.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/html.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/image-x-generic.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/image.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/mime_ascii.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/misc.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/package_editors.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/shellscript.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/sound.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/spreadsheet.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/stock_script.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/text-html.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/text-x-generic.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/text-x-preview.icon
+share/icons/HighContrast-SVG/scalable/mimetypes/text-x-preview.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/text-x-script.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/txt.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/txt2.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/unknown.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/video-x-generic.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/video.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/www.svg
+share/icons/HighContrast-SVG/scalable/mimetypes/x-office-spreadsheet.svg
+share/icons/HighContrast-SVG/scalable/places/desktop.svg
+share/icons/HighContrast-SVG/scalable/places/distributor-logo.svg
+share/icons/HighContrast-SVG/scalable/places/emptytrash.svg
+share/icons/HighContrast-SVG/scalable/places/folder-remote.svg
+share/icons/HighContrast-SVG/scalable/places/folder.svg
+share/icons/HighContrast-SVG/scalable/places/folder_home.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-fs-desktop.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-fs-directory.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-fs-ftp.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-fs-home.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-fs-network.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-fs-nfs.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-fs-server.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-fs-share.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-fs-smb.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-fs-ssh.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-fs-trash-empty.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-main-menu.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-mime-x-directory-nfs-server.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-mime-x-directory-smb-server.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-mime-x-directory-smb-share.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-mime-x-directory-smb-workgroup.svg
+share/icons/HighContrast-SVG/scalable/places/gnome-stock-trash.svg
+share/icons/HighContrast-SVG/scalable/places/gtk-network.svg
+share/icons/HighContrast-SVG/scalable/places/network-server.svg
+share/icons/HighContrast-SVG/scalable/places/network-workgroup.svg
+share/icons/HighContrast-SVG/scalable/places/network.svg
+share/icons/HighContrast-SVG/scalable/places/network_local.svg
+share/icons/HighContrast-SVG/scalable/places/novell-button.svg
+share/icons/HighContrast-SVG/scalable/places/redhat-network-server.svg
+share/icons/HighContrast-SVG/scalable/places/server.svg
+share/icons/HighContrast-SVG/scalable/places/start-here.svg
+share/icons/HighContrast-SVG/scalable/places/stock_folder.svg
+share/icons/HighContrast-SVG/scalable/places/trashcan_empty.svg
+share/icons/HighContrast-SVG/scalable/places/user-desktop.svg
+share/icons/HighContrast-SVG/scalable/places/user-home.svg
+share/icons/HighContrast-SVG/scalable/places/user-trash.svg
+share/icons/HighContrast-SVG/scalable/places/xfce-trash_empty.svg
+share/icons/HighContrast-SVG/scalable/status/connect_no.svg
+share/icons/HighContrast-SVG/scalable/status/dialog-error.svg
+share/icons/HighContrast-SVG/scalable/status/dialog-information.svg
+share/icons/HighContrast-SVG/scalable/status/dialog-question.svg
+share/icons/HighContrast-SVG/scalable/status/dialog-warning.svg
+share/icons/HighContrast-SVG/scalable/status/edittrash.svg
+share/icons/HighContrast-SVG/scalable/status/error.svg
+share/icons/HighContrast-SVG/scalable/status/folder-drag-accept.svg
+share/icons/HighContrast-SVG/scalable/status/folder-open.svg
+share/icons/HighContrast-SVG/scalable/status/folder-visiting.svg
+share/icons/HighContrast-SVG/scalable/status/folder_open.svg
+share/icons/HighContrast-SVG/scalable/status/gnome-fs-directory-accept.svg
+share/icons/HighContrast-SVG/scalable/status/gnome-fs-directory-visiting.svg
+share/icons/HighContrast-SVG/scalable/status/gnome-fs-trash-full.svg
+share/icons/HighContrast-SVG/scalable/status/gnome-netstatus-disconn.svg
+share/icons/HighContrast-SVG/scalable/status/gnome-stock-trash-full.svg
+share/icons/HighContrast-SVG/scalable/status/gtk-dialog-error.svg
+share/icons/HighContrast-SVG/scalable/status/gtk-dialog-info.svg
+share/icons/HighContrast-SVG/scalable/status/gtk-dialog-question.svg
+share/icons/HighContrast-SVG/scalable/status/gtk-dialog-warning.svg
+share/icons/HighContrast-SVG/scalable/status/gtk-missing-image.svg
+share/icons/HighContrast-SVG/scalable/status/image-missing.svg
+share/icons/HighContrast-SVG/scalable/status/important.svg
+share/icons/HighContrast-SVG/scalable/status/info.svg
+share/icons/HighContrast-SVG/scalable/status/mail-attachment.svg
+share/icons/HighContrast-SVG/scalable/status/messagebox_critical.svg
+share/icons/HighContrast-SVG/scalable/status/messagebox_info.svg
+share/icons/HighContrast-SVG/scalable/status/messagebox_warning.svg
+share/icons/HighContrast-SVG/scalable/status/network-offline.svg
+share/icons/HighContrast-SVG/scalable/status/network-online.svg
+share/icons/HighContrast-SVG/scalable/status/nm-no-connection.svg
+share/icons/HighContrast-SVG/scalable/status/stock_dialog-error.svg
+share/icons/HighContrast-SVG/scalable/status/stock_dialog-info.svg
+share/icons/HighContrast-SVG/scalable/status/stock_dialog-question.svg
+share/icons/HighContrast-SVG/scalable/status/stock_dialog-warning.svg
+share/icons/HighContrast-SVG/scalable/status/stock_open.svg
+share/icons/HighContrast-SVG/scalable/status/stock_trash_full.svg
+share/icons/HighContrast-SVG/scalable/status/trashcan_full.svg
+share/icons/HighContrast-SVG/scalable/status/user-trash-full.svg
+share/icons/HighContrast-SVG/scalable/status/xfce-trash_full.svg
share/icons/HighContrast/index.theme
share/icons/HighContrastInverse/index.theme
share/icons/HighContrastLargePrint/48x48/apps/JUSimageIcon.png
@@ -1152,47 +1895,134 @@ share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-video-x-msvideo.png
share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-x-font-afm.png
share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-package.png
share/icons/LowContrastLargePrint/index.theme
-share/icons/Sandy/12x12/filesystems/gnome-fs-directory-accept.png
-share/icons/Sandy/12x12/filesystems/gnome-fs-directory.png
-share/icons/Sandy/24x24/filesystems/gnome-fs-directory-accept.png
-share/icons/Sandy/24x24/filesystems/gnome-fs-directory.png
-share/icons/Sandy/36x36/filesystems/gnome-fs-directory-accept.png
-share/icons/Sandy/36x36/filesystems/gnome-fs-directory.png
-share/icons/Sandy/48x48/filesystems/gnome-fs-directory-accept.png
-share/icons/Sandy/48x48/filesystems/gnome-fs-directory.png
-share/icons/Sandy/72x72/filesystems/gnome-fs-directory-accept.png
-share/icons/Sandy/72x72/filesystems/gnome-fs-directory.png
-share/icons/Sandy/96x96/filesystems/gnome-fs-directory-accept.png
-share/icons/Sandy/96x96/filesystems/gnome-fs-directory.png
-share/icons/Sandy/index.theme
-share/icons/Smokey-Blue/48x48/emblems/emblem-nowrite.png
-share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-directory.png
-share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-nfs.png
-share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-trash-empty-accept.png
-share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-trash-empty.png
-share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-trash-full-accept.png
-share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-trash-full.png
-share/icons/Smokey-Blue/72x72/filesystems/gnome-fs-directory.png
-share/icons/Smokey-Blue/96x96/filesystems/gnome-fs-directory.png
-share/icons/Smokey-Blue/index.theme
-share/icons/Smokey-Red/48x48/emblems/emblem-nowrite.png
-share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-empty-accept.png
-share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-empty.png
-share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full-accept.png
-share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full.png
-share/icons/Smokey-Red/64x64/filesystems/gnome-fs-directory.icon
-share/icons/Smokey-Red/64x64/filesystems/gnome-fs-directory.png
-share/icons/Smokey-Red/64x64/filesystems/gnome-fs-nfs.png
-share/icons/Smokey-Red/72x72/filesystems/gnome-fs-directory.png
-share/icons/Smokey-Red/96x96/filesystems/gnome-fs-directory.png
-share/icons/Smokey-Red/index.theme
+share/icons/Mist/16x16/actions/document-open.svg
+share/icons/Mist/16x16/actions/fileopen.svg
+share/icons/Mist/16x16/actions/gtk-open.svg
+share/icons/Mist/16x16/places/application-x-gnome-saved-search.png
+share/icons/Mist/16x16/places/folder-new.png
+share/icons/Mist/16x16/places/folder-remote.png
+share/icons/Mist/16x16/places/folder-saved-search.png
+share/icons/Mist/16x16/places/folder.png
+share/icons/Mist/16x16/places/folder_home.svg
+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.svg
+share/icons/Mist/16x16/places/gnome-fs-nfs.png
+share/icons/Mist/16x16/places/gnome-fs-share.png
+share/icons/Mist/16x16/places/gnome-fs-smb.png
+share/icons/Mist/16x16/places/gnome-fs-ssh.png
+share/icons/Mist/16x16/places/gnome-mime-x-directory-smb-share.png
+share/icons/Mist/16x16/places/network.png
+share/icons/Mist/16x16/places/stock_folder.png
+share/icons/Mist/16x16/places/user-home.svg
+share/icons/Mist/22x22/actions/document-open.svg
+share/icons/Mist/22x22/actions/fileopen.svg
+share/icons/Mist/22x22/actions/gtk-open.svg
+share/icons/Mist/22x22/places/application-x-gnome-saved-search.png
+share/icons/Mist/22x22/places/folder-new.png
+share/icons/Mist/22x22/places/folder-remote.png
+share/icons/Mist/22x22/places/folder-saved-search.png
+share/icons/Mist/22x22/places/folder.png
+share/icons/Mist/22x22/places/folder_home.svg
+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-nfs.png
+share/icons/Mist/22x22/places/gnome-fs-share.png
+share/icons/Mist/22x22/places/gnome-fs-smb.png
+share/icons/Mist/22x22/places/gnome-fs-ssh.png
+share/icons/Mist/22x22/places/gnome-mime-x-directory-smb-share.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/status/folder-drag-accept.svg
+share/icons/Mist/22x22/status/folder-open.svg
+share/icons/Mist/22x22/status/folder_open.svg
+share/icons/Mist/22x22/status/gnome-fs-directory-accept.svg
+share/icons/Mist/22x22/status/stock_open.svg
+share/icons/Mist/24x24/actions/document-open.png
+share/icons/Mist/24x24/actions/fileopen.png
+share/icons/Mist/24x24/actions/gtk-open.png
+share/icons/Mist/24x24/places/application-x-gnome-saved-search.png
+share/icons/Mist/24x24/places/folder-new.png
+share/icons/Mist/24x24/places/folder-remote.png
+share/icons/Mist/24x24/places/folder-saved-search.png
+share/icons/Mist/24x24/places/folder.png
+share/icons/Mist/24x24/places/folder_home.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
+share/icons/Mist/24x24/places/gnome-fs-nfs.png
+share/icons/Mist/24x24/places/gnome-fs-share.png
+share/icons/Mist/24x24/places/gnome-fs-smb.png
+share/icons/Mist/24x24/places/gnome-fs-ssh.png
+share/icons/Mist/24x24/places/gnome-mime-x-directory-smb-share.png
+share/icons/Mist/24x24/places/network.png
+share/icons/Mist/24x24/places/stock_folder.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
+share/icons/Mist/24x24/status/folder_open.png
+share/icons/Mist/24x24/status/gnome-fs-directory-accept.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/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/32x32/status/folder_open.svg
+share/icons/Mist/32x32/status/gnome-fs-directory-accept.svg
+share/icons/Mist/32x32/status/stock_open.svg
+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/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_open.svg
+share/icons/Mist/scalable/status/gnome-fs-directory-accept.svg
+share/icons/Mist/scalable/status/stock_open.svg
share/locale/am/LC_MESSAGES/gnome-themes.mo
share/locale/ar/LC_MESSAGES/gnome-themes.mo
share/locale/az/LC_MESSAGES/gnome-themes.mo
share/locale/be/LC_MESSAGES/gnome-themes.mo
share/locale/bg/LC_MESSAGES/gnome-themes.mo
share/locale/bn/LC_MESSAGES/gnome-themes.mo
-share/locale/br/LC_MESSAGES/gnome-themes.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-themes.mo
share/locale/bs/LC_MESSAGES/gnome-themes.mo
share/locale/ca/LC_MESSAGES/gnome-themes.mo
share/locale/cs/LC_MESSAGES/gnome-themes.mo
@@ -1227,15 +2057,16 @@ share/locale/ky/LC_MESSAGES/gnome-themes.mo
share/locale/li/LC_MESSAGES/gnome-themes.mo
share/locale/lt/LC_MESSAGES/gnome-themes.mo
share/locale/lv/LC_MESSAGES/gnome-themes.mo
+share/locale/mg/LC_MESSAGES/gnome-themes.mo
share/locale/mk/LC_MESSAGES/gnome-themes.mo
share/locale/ml/LC_MESSAGES/gnome-themes.mo
share/locale/mn/LC_MESSAGES/gnome-themes.mo
+share/locale/mr/LC_MESSAGES/gnome-themes.mo
share/locale/ms/LC_MESSAGES/gnome-themes.mo
share/locale/nb/LC_MESSAGES/gnome-themes.mo
share/locale/ne/LC_MESSAGES/gnome-themes.mo
share/locale/nl/LC_MESSAGES/gnome-themes.mo
share/locale/nn/LC_MESSAGES/gnome-themes.mo
-share/locale/no/LC_MESSAGES/gnome-themes.mo
share/locale/or/LC_MESSAGES/gnome-themes.mo
share/locale/pa/LC_MESSAGES/gnome-themes.mo
share/locale/pl/LC_MESSAGES/gnome-themes.mo
@@ -1244,6 +2075,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-themes.mo
share/locale/ro/LC_MESSAGES/gnome-themes.mo
share/locale/ru/LC_MESSAGES/gnome-themes.mo
share/locale/rw/LC_MESSAGES/gnome-themes.mo
+share/locale/si/LC_MESSAGES/gnome-themes.mo
share/locale/sk/LC_MESSAGES/gnome-themes.mo
share/locale/sl/LC_MESSAGES/gnome-themes.mo
share/locale/sq/LC_MESSAGES/gnome-themes.mo
@@ -1265,43 +2097,6 @@ share/themes/Clearlooks/index.theme
share/themes/Crux/index.theme
share/themes/Glider/gtk-2.0/gtkrc
share/themes/Glider/index.theme
-share/themes/Grand-Canyon/gtk-2.0/3d_all_flat.png
-share/themes/Grand-Canyon/gtk-2.0/3d_all_normal.png
-share/themes/Grand-Canyon/gtk-2.0/3d_all_prelight.png
-share/themes/Grand-Canyon/gtk-2.0/3d_bottom_flat.png
-share/themes/Grand-Canyon/gtk-2.0/3d_bottom_normal.png
-share/themes/Grand-Canyon/gtk-2.0/3d_bottom_prelight.png
-share/themes/Grand-Canyon/gtk-2.0/3d_top_flat.png
-share/themes/Grand-Canyon/gtk-2.0/3d_top_normal.png
-share/themes/Grand-Canyon/gtk-2.0/3d_top_prelight.png
-share/themes/Grand-Canyon/gtk-2.0/arrow_down.png
-share/themes/Grand-Canyon/gtk-2.0/arrow_left.png
-share/themes/Grand-Canyon/gtk-2.0/arrow_null.png
-share/themes/Grand-Canyon/gtk-2.0/arrow_right.png
-share/themes/Grand-Canyon/gtk-2.0/arrow_sub.png
-share/themes/Grand-Canyon/gtk-2.0/arrow_up.png
-share/themes/Grand-Canyon/gtk-2.0/blank.png
-share/themes/Grand-Canyon/gtk-2.0/button_default.png
-share/themes/Grand-Canyon/gtk-2.0/check2.png
-share/themes/Grand-Canyon/gtk-2.0/entry1.png
-share/themes/Grand-Canyon/gtk-2.0/gtkrc
-share/themes/Grand-Canyon/gtk-2.0/gtkrc.pants
-share/themes/Grand-Canyon/gtk-2.0/hline.png
-share/themes/Grand-Canyon/gtk-2.0/htrough.png
-share/themes/Grand-Canyon/gtk-2.0/in.png
-share/themes/Grand-Canyon/gtk-2.0/menu_shadow.png
-share/themes/Grand-Canyon/gtk-2.0/minus.png
-share/themes/Grand-Canyon/gtk-2.0/mradio1.png
-share/themes/Grand-Canyon/gtk-2.0/mradio2.png
-share/themes/Grand-Canyon/gtk-2.0/notebook_bottom_flat.png
-share/themes/Grand-Canyon/gtk-2.0/notebook_left_flat.png
-share/themes/Grand-Canyon/gtk-2.0/notebook_right_flat.png
-share/themes/Grand-Canyon/gtk-2.0/notebook_top_flat.png
-share/themes/Grand-Canyon/gtk-2.0/option_menu.png
-share/themes/Grand-Canyon/gtk-2.0/plus.png
-share/themes/Grand-Canyon/gtk-2.0/radio2.png
-share/themes/Grand-Canyon/gtk-2.0/vtrough.png
-share/themes/Grand-Canyon/index.theme
share/themes/HighContrast/gtk-2.0/gtkrc
share/themes/HighContrast/index.theme
share/themes/HighContrastInverse/gtk-2.0/gtkrc
@@ -1865,39 +2660,9 @@ share/themes/LowContrastLargePrint/pixmaps/volume-min.png
share/themes/LowContrastLargePrint/pixmaps/volume-mute.png
share/themes/LowContrastLargePrint/pixmaps/volume-zero.png
share/themes/Mist/index.theme
-share/themes/Ocean-Dream/index.theme
share/themes/Simple/gtk-2.0/gtkrc
-share/themes/Simple/index.theme
-share/themes/Smokey-Blue/gtk-2.0/bubble-blue-prelight.png
-share/themes/Smokey-Blue/gtk-2.0/bubble-blue-pressed.png
-share/themes/Smokey-Blue/gtk-2.0/bubble-blue-sb.png
-share/themes/Smokey-Blue/gtk-2.0/bubble-blue.png
-share/themes/Smokey-Blue/gtk-2.0/bubble-grey.png
-share/themes/Smokey-Blue/gtk-2.0/check1.png
-share/themes/Smokey-Blue/gtk-2.0/check2.png
-share/themes/Smokey-Blue/gtk-2.0/gtkrc
-share/themes/Smokey-Blue/gtk-2.0/halfbubble-bottom-blue.png
-share/themes/Smokey-Blue/gtk-2.0/halfbubble-bottom-grey.png
-share/themes/Smokey-Blue/gtk-2.0/halfbubble-left-blue.png
-share/themes/Smokey-Blue/gtk-2.0/halfbubble-left-grey.png
-share/themes/Smokey-Blue/gtk-2.0/halfbubble-right-blue.png
-share/themes/Smokey-Blue/gtk-2.0/halfbubble-right-grey.png
-share/themes/Smokey-Blue/gtk-2.0/halfbubble-top-blue.png
-share/themes/Smokey-Blue/gtk-2.0/halfbubble-top-blue1.png
-share/themes/Smokey-Blue/gtk-2.0/halfbubble-top-grey.png
-share/themes/Smokey-Blue/gtk-2.0/halfbubble-top-grey1.png
-share/themes/Smokey-Blue/gtk-2.0/lines_background.png
-share/themes/Smokey-Blue/gtk-2.0/lines_background_blue.png
-share/themes/Smokey-Blue/gtk-2.0/option1.png
-share/themes/Smokey-Blue/gtk-2.0/option2.png
-share/themes/Smokey-Blue/index.theme
-share/themes/Traditional/index.theme
-@dirrm share/themes/Traditional
-@dirrm share/themes/Smokey-Blue/gtk-2.0
-@dirrm share/themes/Smokey-Blue
@dirrm share/themes/Simple/gtk-2.0
@dirrm share/themes/Simple
-@dirrm share/themes/Ocean-Dream
@dirrm share/themes/Mist
@dirrm share/themes/LowContrastLargePrint/pixmaps
@dirrm share/themes/LowContrastLargePrint/gtk-2.0
@@ -1917,56 +2682,31 @@ share/themes/Traditional/index.theme
@dirrm share/themes/HighContrastInverse
@dirrm share/themes/HighContrast/gtk-2.0
@dirrm share/themes/HighContrast
-@dirrm share/themes/Grand-Canyon/gtk-2.0
-@dirrm share/themes/Grand-Canyon
@dirrm share/themes/Glider/gtk-2.0
@dirrm share/themes/Glider
@dirrm share/themes/Crux
@dirrm share/themes/Clearlooks
-@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/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ky/LC_MESSAGES
-@dirrmtry share/locale/ky
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrm share/icons/Smokey-Red/96x96/filesystems
-@dirrm share/icons/Smokey-Red/96x96
-@dirrm share/icons/Smokey-Red/72x72/filesystems
-@dirrm share/icons/Smokey-Red/72x72
-@dirrm share/icons/Smokey-Red/64x64/filesystems
-@dirrm share/icons/Smokey-Red/64x64
-@dirrm share/icons/Smokey-Red/48x48/filesystems
-@dirrm share/icons/Smokey-Red/48x48/emblems
-@dirrm share/icons/Smokey-Red/48x48
-@dirrm share/icons/Smokey-Red
-@dirrm share/icons/Smokey-Blue/96x96/filesystems
-@dirrm share/icons/Smokey-Blue/96x96
-@dirrm share/icons/Smokey-Blue/72x72/filesystems
-@dirrm share/icons/Smokey-Blue/72x72
-@dirrm share/icons/Smokey-Blue/64x64/filesystems
-@dirrm share/icons/Smokey-Blue/64x64
-@dirrm share/icons/Smokey-Blue/48x48/emblems
-@dirrm share/icons/Smokey-Blue/48x48
-@dirrm share/icons/Smokey-Blue
-@dirrm share/icons/Sandy/96x96/filesystems
-@dirrm share/icons/Sandy/96x96
-@dirrm share/icons/Sandy/72x72/filesystems
-@dirrm share/icons/Sandy/72x72
-@dirrm share/icons/Sandy/48x48/filesystems
-@dirrm share/icons/Sandy/48x48
-@dirrm share/icons/Sandy/36x36/filesystems
-@dirrm share/icons/Sandy/36x36
-@dirrm share/icons/Sandy/24x24/filesystems
-@dirrm share/icons/Sandy/24x24
-@dirrm share/icons/Sandy/12x12/filesystems
-@dirrm share/icons/Sandy/12x12
-@dirrm share/icons/Sandy
+@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/32x32/status
+@dirrm share/icons/Mist/32x32/places
+@dirrm share/icons/Mist/32x32/actions
+@dirrm share/icons/Mist/32x32
+@dirrm share/icons/Mist/24x24/status
+@dirrm share/icons/Mist/24x24/places
+@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/actions
+@dirrm share/icons/Mist/22x22
+@dirrm share/icons/Mist/16x16/places
+@dirrm share/icons/Mist/16x16/actions
+@dirrm share/icons/Mist/16x16
+@dirrm share/icons/Mist
@dirrm share/icons/LowContrastLargePrint/48x48/mimetypes
@dirrm share/icons/LowContrastLargePrint/48x48/filesystems
@dirrm share/icons/LowContrastLargePrint/48x48/emblems
@@ -1991,60 +2731,104 @@ share/themes/Traditional/index.theme
@dirrm share/icons/HighContrastLargePrint/48x48
@dirrm share/icons/HighContrastLargePrint
@dirrm share/icons/HighContrastInverse
+@dirrm share/icons/HighContrast-SVG/scalable/status
+@dirrm share/icons/HighContrast-SVG/scalable/places
+@dirrm share/icons/HighContrast-SVG/scalable/mimetypes
+@dirrm share/icons/HighContrast-SVG/scalable/emblems
+@dirrm share/icons/HighContrast-SVG/scalable/devices
+@dirrm share/icons/HighContrast-SVG/scalable/categories
+@dirrm share/icons/HighContrast-SVG/scalable/apps
+@dirrm share/icons/HighContrast-SVG/scalable/actions
+@dirrm share/icons/HighContrast-SVG/scalable
+@dirrm share/icons/HighContrast-SVG/48x48/animations
+@dirrm share/icons/HighContrast-SVG/48x48
+@dirrm share/icons/HighContrast-SVG
@dirrm share/icons/HighContrast
-@dirrm share/icons/Flat-Blue/scalable/emblems
-@dirrm share/icons/Flat-Blue/scalable
-@dirrm share/icons/Flat-Blue/96x96/filesystems
-@dirrm share/icons/Flat-Blue/96x96
-@dirrm share/icons/Flat-Blue/72x72/filesystems
-@dirrm share/icons/Flat-Blue/72x72/devices
-@dirrm share/icons/Flat-Blue/72x72
-@dirrm share/icons/Flat-Blue/48x48/filesystems
-@dirrm share/icons/Flat-Blue/48x48/emblems
-@dirrm share/icons/Flat-Blue/48x48/devices
-@dirrm share/icons/Flat-Blue/48x48
-@dirrm share/icons/Flat-Blue/36x36/filesystems
-@dirrm share/icons/Flat-Blue/36x36/emblems
-@dirrm share/icons/Flat-Blue/36x36
-@dirrm share/icons/Flat-Blue/24x24/filesystems
-@dirrm share/icons/Flat-Blue/24x24/emblems
-@dirrm share/icons/Flat-Blue/24x24
-@dirrm share/icons/Flat-Blue/20x20/filesystems
-@dirrm share/icons/Flat-Blue/20x20
-@dirrm share/icons/Flat-Blue/192x192/filesystems
-@dirrm share/icons/Flat-Blue/192x192
-@dirrm share/icons/Flat-Blue/12x12/filesystems
-@dirrm share/icons/Flat-Blue/12x12/emblems
-@dirrm share/icons/Flat-Blue/12x12
-@dirrm share/icons/Flat-Blue
-@dirrm share/icons/Crux/96x96/filesystems
-@dirrm share/icons/Crux/96x96/emblems
-@dirrm share/icons/Crux/96x96
-@dirrm share/icons/Crux/72x72/filesystems
-@dirrm share/icons/Crux/72x72/emblems
-@dirrm share/icons/Crux/72x72
-@dirrm share/icons/Crux/48x48/filesystems
-@dirrm share/icons/Crux/48x48/emblems
-@dirrm share/icons/Crux/48x48
-@dirrm share/icons/Crux/36x36/filesystems
-@dirrm share/icons/Crux/36x36
-@dirrm share/icons/Crux/24x24/filesystems
+@dirrm share/icons/Crux/scalable/status
+@dirrm share/icons/Crux/scalable/places
+@dirrm share/icons/Crux/scalable/actions
+@dirrm share/icons/Crux/scalable
+@dirrm share/icons/Crux/32x32/status
+@dirrm share/icons/Crux/32x32/places
+@dirrm share/icons/Crux/32x32/actions
+@dirrm share/icons/Crux/32x32
+@dirrm share/icons/Crux/24x24/status
+@dirrm share/icons/Crux/24x24/places
+@dirrm share/icons/Crux/24x24/actions
@dirrm share/icons/Crux/24x24
-@dirrm share/icons/Crux/20x20/filesystems
-@dirrm share/icons/Crux/20x20
-@dirrm share/icons/Crux/192x192/filesystems
-@dirrm share/icons/Crux/192x192
-@dirrm share/icons/Crux/12x12/filesystems
-@dirrm share/icons/Crux/12x12
+@dirrm share/icons/Crux/22x22/status
+@dirrm share/icons/Crux/22x22/places
+@dirrm share/icons/Crux/22x22/actions
+@dirrm share/icons/Crux/22x22
+@dirrm share/icons/Crux/16x16/status
+@dirrm share/icons/Crux/16x16/places
+@dirrm share/icons/Crux/16x16/actions
+@dirrm share/icons/Crux/16x16
@dirrm share/icons/Crux
-@dirrm share/gnome/themes/Smokey/metacity-1
-@dirrm share/gnome/themes/Smokey
-@dirrm share/gnome/themes/Sandwish/metacity-1
-@dirrm share/gnome/themes/Sandwish
+@dirrmtry share/icons
@dirrm share/gnome/themes/Mist/metacity-1
@dirrm share/gnome/themes/Mist
@dirrm share/gnome/themes/Glider/metacity-1
@dirrm share/gnome/themes/Glider
@dirrm share/gnome/themes/Clearlooks/metacity-1
@dirrm share/gnome/themes/Clearlooks
-@dirrmtry share/icons
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index d9fab95a93fe..4ad0fb659465 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-themes/gtk-engines2/Makefile,v 1.1 2006/03/13 22:39:57 mezz Exp $
+# $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.29 2006/10/03 01:32:23 ahze Exp $
#
PORTNAME= gtk-engines2
-PORTVERSION= 2.6.10
+PORTVERSION= 2.8.1
CATEGORIES= x11-themes
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -20,21 +20,20 @@ COMMENT= Theme engine for the gtk+-2.0 toolkit
CONFLICTS= gtk-smooth-engine-[0-9]* clearlooks-[0-9]*
USE_BZIP2= yes
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gtk20
.if defined(WITH_ANIMATION)
-CFLAGS+= -DHAVE_ANIMATION=1
+CONFIGURE_ARGS+= --enable-animation
.endif
-pre-everything::
-.if !defined(WITH_ANIMATION)
- @${ECHO_MSG} ""
- @${ECHO_MSG} " You can enable experimental animated progressbars"
- @${ECHO_MSG} " with the clearlooks engine by defining"
- @${ECHO_MSG} " WITH_ANIMATION"
- @${ECHO_MSG} ""
+pre-everything::
+.if !defined(WITH_ANIMATION)
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} " You can enable experimental animated progressbars"
+ @${ECHO_MSG} " with the clearlooks engine by defining"
+ @${ECHO_MSG} " WITH_ANIMATION"
+ @${ECHO_MSG} ""
.endif
# Disable the gtk1 theme.
diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo
index a2505bd388c3..eedc8d88e952 100644
--- a/x11-themes/gtk-engines2/distinfo
+++ b/x11-themes/gtk-engines2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk-engines-2.6.10.tar.bz2) = f3e2b14b0cff0988277ccba42e69813d
-SHA256 (gnome2/gtk-engines-2.6.10.tar.bz2) = 83df135980c0b3ebe18efe030b311f3eb59c1679730eda3dfd1a2a377ee4c0a6
-SIZE (gnome2/gtk-engines-2.6.10.tar.bz2) = 472374
+MD5 (gnome2/gtk-engines-2.8.1.tar.bz2) = 3929925b308c7d8d20f539bf4cc8b820
+SHA256 (gnome2/gtk-engines-2.8.1.tar.bz2) = 002ecea254ad09f5d00ecd5775ad05a52f621f406c774cfd832d01b6dfdcf3c2
+SIZE (gnome2/gtk-engines-2.8.1.tar.bz2) = 460190
diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist
index 746a8eaf455a..0d123b434980 100644
--- a/x11-themes/gtk-engines2/pkg-plist
+++ b/x11-themes/gtk-engines2/pkg-plist
@@ -2,14 +2,12 @@ lib/gtk-2.0/%%GTK2_VERSION%%/engines/libclearlooks.la
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libclearlooks.so
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libcrux-engine.la
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libcrux-engine.so
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libglide.la
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libglide.so
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libhcengine.la
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libhcengine.so
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libindustrial.la
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libindustrial.so
-lib/gtk-2.0/%%GTK2_VERSION%%/engines/liblighthouseblue.la
-lib/gtk-2.0/%%GTK2_VERSION%%/engines/liblighthouseblue.so
-lib/gtk-2.0/%%GTK2_VERSION%%/engines/libmetal.la
-lib/gtk-2.0/%%GTK2_VERSION%%/engines/libmetal.so
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libmist.la
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libmist.so
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libredmond95.la
@@ -21,101 +19,19 @@ lib/gtk-2.0/%%GTK2_VERSION%%/engines/libthinice.so
libdata/pkgconfig/gtk-engines-2.pc
share/themes/Clearlooks/gtk-2.0/gtkrc
share/themes/Crux/gtk-2.0/gtkrc
-share/themes/Crux/pixmaps/arrow_down-spinner.png
-share/themes/Crux/pixmaps/arrow_down.png
-share/themes/Crux/pixmaps/arrow_left.png
-share/themes/Crux/pixmaps/arrow_right.png
-share/themes/Crux/pixmaps/arrow_up-spinner.png
-share/themes/Crux/pixmaps/arrow_up.png
-share/themes/Crux/pixmaps/check-active-default-focus.png
-share/themes/Crux/pixmaps/check-active-default.png
-share/themes/Crux/pixmaps/check-active-hilight-focus.png
-share/themes/Crux/pixmaps/check-active-hilight.png
-share/themes/Crux/pixmaps/check-active-insensitive.png
-share/themes/Crux/pixmaps/check-active-pressed-focus.png
-share/themes/Crux/pixmaps/check-active-pressed.png
-share/themes/Crux/pixmaps/check-default-focus.png
-share/themes/Crux/pixmaps/check-default.png
-share/themes/Crux/pixmaps/check-hilight-focus.png
-share/themes/Crux/pixmaps/check-hilight.png
-share/themes/Crux/pixmaps/check-insensitive.png
-share/themes/Crux/pixmaps/check-pressed-focus.png
-share/themes/Crux/pixmaps/check-pressed.png
-share/themes/Crux/pixmaps/progressbar-left.png
-share/themes/Crux/pixmaps/progressbar-right.png
-share/themes/Crux/pixmaps/progressbar.png
-share/themes/Crux/pixmaps/progressbar_trough.png
-share/themes/Crux/pixmaps/radio-active-default-focus.png
-share/themes/Crux/pixmaps/radio-active-default.png
-share/themes/Crux/pixmaps/radio-active-hilight-focus.png
-share/themes/Crux/pixmaps/radio-active-hilight.png
-share/themes/Crux/pixmaps/radio-active-insensitive.png
-share/themes/Crux/pixmaps/radio-active-pressed-focus.png
-share/themes/Crux/pixmaps/radio-active-pressed.png
-share/themes/Crux/pixmaps/radio-default-focus.png
-share/themes/Crux/pixmaps/radio-default.png
-share/themes/Crux/pixmaps/radio-hilight-focus.png
-share/themes/Crux/pixmaps/radio-hilight.png
-share/themes/Crux/pixmaps/radio-insensitive.png
-share/themes/Crux/pixmaps/radio-pressed-focus.png
-share/themes/Crux/pixmaps/radio-pressed.png
-share/themes/Crux/pixmaps/scroller-arrow-down-hilight.png
-share/themes/Crux/pixmaps/scroller-arrow-down-pressed.png
-share/themes/Crux/pixmaps/scroller-arrow-down.png
-share/themes/Crux/pixmaps/scroller-arrow-left-hilight.png
-share/themes/Crux/pixmaps/scroller-arrow-left-pressed.png
-share/themes/Crux/pixmaps/scroller-arrow-left.png
-share/themes/Crux/pixmaps/scroller-arrow-right-hilight.png
-share/themes/Crux/pixmaps/scroller-arrow-right-pressed.png
-share/themes/Crux/pixmaps/scroller-arrow-right.png
-share/themes/Crux/pixmaps/scroller-arrow-up-hilight.png
-share/themes/Crux/pixmaps/scroller-arrow-up-pressed.png
-share/themes/Crux/pixmaps/scroller-arrow-up.png
-share/themes/Crux/pixmaps/scroller-h-hilight.png
-share/themes/Crux/pixmaps/scroller-h-thumb-hilight.png
-share/themes/Crux/pixmaps/scroller-h-thumb.png
-share/themes/Crux/pixmaps/scroller-h-trough.png
-share/themes/Crux/pixmaps/scroller-h.png
-share/themes/Crux/pixmaps/scroller-v-hilight.png
-share/themes/Crux/pixmaps/scroller-v-thumb-hilight.png
-share/themes/Crux/pixmaps/scroller-v-thumb.png
-share/themes/Crux/pixmaps/scroller-v-trough.png
-share/themes/Crux/pixmaps/scroller-v.png
-share/themes/Crux/pixmaps/slider_h_thumb.png
-share/themes/Crux/pixmaps/slider_h_trough.png
-share/themes/Crux/pixmaps/slider_h_trough_focus.png
-share/themes/Crux/pixmaps/slider_v_thumb.png
-share/themes/Crux/pixmaps/slider_v_trough.png
-share/themes/Crux/pixmaps/slider_v_trough_focus.png
-share/themes/Crux/pixmaps/tab_left-unsel.png
-share/themes/Crux/pixmaps/tab_left.png
-share/themes/Crux/pixmaps/tab_right.png
-share/themes/Crux/pixmaps/tab_sel-bottom.png
-share/themes/Crux/pixmaps/tab_sel.png
-share/themes/Crux/pixmaps/tab_usel-bottom-left.png
-share/themes/Crux/pixmaps/tab_usel-bottom.png
-share/themes/Crux/pixmaps/tab_usel-left.png
-share/themes/Crux/pixmaps/tab_usel.png
share/themes/Industrial/gtk-2.0/gtkrc
-share/themes/LighthouseBlue/gtk-2.0/gtkrc
-share/themes/Metal/gtk-2.0/gtkrc
share/themes/Mist/gtk-2.0/gtkrc
share/themes/Redmond/gtk-2.0/gtkrc
share/themes/ThinIce/gtk-2.0/gtkrc
@dirrm share/themes/ThinIce/gtk-2.0
@dirrm share/themes/Redmond/gtk-2.0
@dirrm share/themes/Mist/gtk-2.0
-@dirrm share/themes/Metal/gtk-2.0
-@dirrm share/themes/LighthouseBlue/gtk-2.0
@dirrm share/themes/Industrial/gtk-2.0
-@dirrm share/themes/Crux/pixmaps
@dirrm share/themes/Crux/gtk-2.0
@dirrm share/themes/Clearlooks/gtk-2.0
@unexec /bin/rmdir %D/share/themes/ThinIce 2>/dev/null || true
@unexec /bin/rmdir %D/share/themes/Redmond 2>/dev/null || true
@unexec /bin/rmdir %D/share/themes/Mist 2>/dev/null || true
-@unexec /bin/rmdir %D/share/themes/Metal 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/themes/LighthouseBlue 2>/dev/null || true
@unexec /bin/rmdir %D/share/themes/Industrial 2>/dev/null || true
@unexec /bin/rmdir %D/share/themes/Crux 2>/dev/null || true
@unexec /bin/rmdir %D/share/themes/Clearlooks 2>/dev/null || true
diff --git a/x11-themes/icon-naming-utils/Makefile b/x11-themes/icon-naming-utils/Makefile
index 623347b5caad..945105845c8b 100644
--- a/x11-themes/icon-naming-utils/Makefile
+++ b/x11-themes/icon-naming-utils/Makefile
@@ -6,11 +6,9 @@
#
PORTNAME= icon-naming-utils
-PORTVERSION= 0.7.2
+PORTVERSION= 0.8.1
CATEGORIES= x11-themes
-MASTER_SITES= http://tango-project.org/releases/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+MASTER_SITES= http://tango.freedesktop.org/releases/
MAINTAINER= pneumann@gmail.com
COMMENT= Utilities of the Tango project
@@ -21,7 +19,7 @@ RUN_DEPENDS= ${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple
USE_PERL5= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack pkgconfig
+USE_GNOME= gnomehack pkgconfig gnometarget
pre-configure:
@ ${REINPLACE_CMD} -e "s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g" ${WRKSRC}/Makefile.in
diff --git a/x11-themes/icon-naming-utils/distinfo b/x11-themes/icon-naming-utils/distinfo
index afd81d9ae9e4..3b995ee91064 100644
--- a/x11-themes/icon-naming-utils/distinfo
+++ b/x11-themes/icon-naming-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (icon-naming-utils-0.7.2.tar.gz) = b37455829181f1043927c2418830ce10
-SHA256 (icon-naming-utils-0.7.2.tar.gz) = 89c4373a10f66b55da54ab68e5bcb3aac49693c20248b29de0eeade365722370
-SIZE (icon-naming-utils-0.7.2.tar.gz) = 62255
+MD5 (icon-naming-utils-0.8.1.tar.gz) = 7a7d340f59c7a6c26391e906b7afa08c
+SHA256 (icon-naming-utils-0.8.1.tar.gz) = d0e92792954160afa7c137068548804dcd76321b883dcc78967a937e07ffd4d8
+SIZE (icon-naming-utils-0.8.1.tar.gz) = 63132
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index 901463be6b09..cc55c07c9505 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -3,11 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/eel/Makefile,v 1.35 2006/04/13 07:52:42 bland Exp $
+# $MCom: ports/x11-toolkits/eel/Makefile,v 1.46 2006/09/07 21:36:05 ahze Exp $
#
PORTNAME= eel
-PORTVERSION= 2.14.3
+PORTVERSION= 2.16.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,7 +20,7 @@ COMMENT= Generally useful classes and extensions to GNOME
USE_GETTEXT= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack gail gnomedesktop gnomemenus ltverhack
USE_AUTOTOOLS= libtool:15
@@ -29,7 +30,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
post-patch:
- @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
+ @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|; \
+ s|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/eel/eel-open-with-dialog.c
.include <bsd.port.mk>
diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo
index ae230a41ee59..035a3b0791ed 100644
--- a/x11-toolkits/eel/distinfo
+++ b/x11-toolkits/eel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eel-2.14.3.tar.bz2) = cdff898f9a054b35f5e3b7c0142cc2a5
-SHA256 (gnome2/eel-2.14.3.tar.bz2) = 4a19f4aa88dd92a79c6edd953302cfec8bfb2060e6d4e8fc74a77aa78a64825e
-SIZE (gnome2/eel-2.14.3.tar.bz2) = 640614
+MD5 (gnome2/eel-2.16.0.tar.bz2) = 7403a91bd27979f7513b9e9325e1d890
+SHA256 (gnome2/eel-2.16.0.tar.bz2) = 59be6069341efee420052aa8b5398ea5f7eef6a6d00cbf163633f2c241c0e64b
+SIZE (gnome2/eel-2.16.0.tar.bz2) = 672036
diff --git a/x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c b/x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c
index b94075cd3994..09270d77cacc 100644
--- a/x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c
+++ b/x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c
@@ -5,7 +5,7 @@
FALSE);
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser),
- "/usr/bin");
-+ "%%X11BASE%%/bin");
++ "%%LOCALBASE%%/bin");
gtk_widget_show (chooser);
}
diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist
index e4c025d30c4a..4be4b326e4cf 100644
--- a/x11-toolkits/eel/pkg-plist
+++ b/x11-toolkits/eel/pkg-plist
@@ -7,7 +7,6 @@ include/eel-2/eel/eel-background.h
include/eel-2/eel/eel-canvas-rect-ellipse.h
include/eel-2/eel/eel-canvas-util.h
include/eel-2/eel/eel-canvas.h
-include/eel-2/eel/eel-cell-renderer-pixbuf-list.h
include/eel-2/eel/eel-dateedit-extensions.h
include/eel-2/eel/eel-debug-drawing.h
include/eel-2/eel/eel-debug.h
@@ -56,6 +55,7 @@ share/locale/az/LC_MESSAGES/eel-2.0.mo
share/locale/be/LC_MESSAGES/eel-2.0.mo
share/locale/bg/LC_MESSAGES/eel-2.0.mo
share/locale/bn/LC_MESSAGES/eel-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/eel-2.0.mo
share/locale/br/LC_MESSAGES/eel-2.0.mo
share/locale/bs/LC_MESSAGES/eel-2.0.mo
share/locale/ca/LC_MESSAGES/eel-2.0.mo
@@ -126,25 +126,63 @@ share/locale/xh/LC_MESSAGES/eel-2.0.mo
share/locale/zh_CN/LC_MESSAGES/eel-2.0.mo
share/locale/zh_HK/LC_MESSAGES/eel-2.0.mo
share/locale/zh_TW/LC_MESSAGES/eel-2.0.mo
+@dirrm include/eel-2/eel
+@dirrm include/eel-2
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
@dirrmtry share/locale/ang/LC_MESSAGES
@dirrmtry share/locale/ang
-@dirrm include/eel-2/eel
-@dirrm include/eel-2
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index c5153fc719cc..5a1783c426e3 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,15 +3,15 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-toolkits/gtk20/Makefile,v 1.8 2006/03/13 22:32:30 mezz Exp $
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.101 2006/10/08 21:05:26 marcus Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.8.20
-PORTREVISION?= 0
+PORTVERSION= 2.10.6
+PORTREVISION?= 1
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \
- ftp://ftp.gtk.org/pub/gtk/v2.8/ \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
+ ftp://ftp.gtk.org/pub/gtk/v2.10/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -33,20 +33,21 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.9:${PORTSDIR}/graphics/jpeg
RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
- ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+USE_GMAKE= yes
USE_XPM= yes
USE_PERL5= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack atk pango ltverhack
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
CONFIGURE_ARGS= --enable-static --with-xinput=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-GTK_VERSION= 2.4.0
+GTK_VERSION= 2.10.0
PLIST_SUB= GTK_VERSION="${GTK_VERSION}"
gdk_pixbuf_MAN= gdk-pixbuf-query-loaders.1
@@ -77,13 +78,20 @@ STRIP=
.include <bsd.port.pre.mk>
+.if defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)
+LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base
+PLIST_SUB+= CUPS:=""
+.else
+PLIST_SUB+= CUPS:="@comment "
+.endif
+
# There is a SSE2 bug in either GCC or in our libc, when use p4, p-m or else
# is being use in CPUTYPE that enable SSE2 will causing Java with GTK2 and
# Mono/gtk-sharp crash. Disable SSE2 to solve the crash and see ports/72014
# for detail.
.if ${OSVERSION} >= 500000 && ( ${ARCH} == "i386" || ${ARCH} == "amd64" ) \
&& ${CC} != "icc"
-CFLAGS+= -mno-sse2
+#CFLAGS+= -mno-sse2
.endif
pre-everything::
@@ -108,12 +116,13 @@ post-patch:
@${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
pre-build:
@${RM} -rf ${WRKSRC}/docs/gtk.info*
post-install:
- -@${FIND} ${X11BASE}/share/icons -type d -depth 1 -exec \
+ -@${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
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index e7e4075ad27d..0fc02b098bba 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.8.20.tar.bz2) = 74e7ca98194f1fadfe906e66d763d05d
-SHA256 (gnome2/gtk+-2.8.20.tar.bz2) = 69a9b6c1e78da7e71416f20fab0c4972503139406e89ce7fbdbac0e213b16b79
-SIZE (gnome2/gtk+-2.8.20.tar.bz2) = 12247295
+MD5 (gnome2/gtk+-2.10.6.tar.bz2) = 13c62b610c910255934452d0617403f7
+SHA256 (gnome2/gtk+-2.10.6.tar.bz2) = ca98edcea2034ab36c1024121a44d047de192d282127c8f8b77d14afba0ca468
+SIZE (gnome2/gtk+-2.10.6.tar.bz2) = 14561124
diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak
index f30cec385b9a..27156d238e58 100644
--- a/x11-toolkits/gtk20/files/patch-ak
+++ b/x11-toolkits/gtk20/files/patch-ak
@@ -1,6 +1,6 @@
$FreeBSD$
- $MCom: ports-stable/x11-toolkits/gtk20/files/patch-ak,v 1.6 2006/03/08 20:28:38 mezz Exp $
+ $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.19 2006/10/10 20:22:27 mezz Exp $
--- gdk/Makefile.in.orig Thu Feb 14 12:38:26 2002
+++ gdk/Makefile.in Thu Feb 14 12:45:37 2002
diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
index 44589795f769..610ece8f33ac 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -1,6 +1,6 @@
---- gtk/Makefile.in.orig Wed Mar 2 15:57:44 2005
-+++ gtk/Makefile.in Wed Mar 2 15:58:22 2005
-@@ -887,12 +887,12 @@
+--- gtk/Makefile.in.orig Sat May 6 04:47:11 2006
++++ gtk/Makefile.in Sat May 6 04:48:06 2006
+@@ -1009,11 +1009,11 @@ LDADDS = \
bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache
gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
@@ -9,9 +9,8 @@
gtk_query_immodules_2_0_SOURCES = queryimmodules.c
- gtk_update_icon_cache_DEPENDENCIES = $(DEPS)
--gtk_update_icon_cache_LDADD = $(LDADDS)
-+gtk_update_icon_cache_LDADD = $(LDADDS) $(GLIB_LIBS)
+-gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
++gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
gtk_update_icon_cache_SOURCES = updateiconcache.c
- subdir = gtk
+
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkcalendar.c b/x11-toolkits/gtk20/files/patch-gtk_gtkcalendar.c
deleted file mode 100644
index 4dcf1fd052a5..000000000000
--- a/x11-toolkits/gtk20/files/patch-gtk_gtkcalendar.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk/gtkcalendar.c.orig Mon Oct 3 22:01:14 2005
-+++ gtk/gtkcalendar.c Mon Oct 3 22:02:36 2005
-@@ -566,6 +566,7 @@ gtk_calendar_init (GtkCalendar *calendar
- GtkCalendarPrivate *priv;
- gchar *year_before;
- gchar *langinfo;
-+ gchar *week_start;
- gint week_1stday = 0;
- gint first_weekday = 1;
- guint week_origin;
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h
new file mode 100644
index 000000000000..ed81f9280fac
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.h
@@ -0,0 +1,17 @@
+--- gtk/xdgmime/xdgmime.h.orig Sat Oct 7 10:42:32 2006
++++ gtk/xdgmime/xdgmime.h Sat Oct 7 11:01:57 2006
+@@ -52,11 +52,14 @@ typedef void (*XdgMimeDestroy) (void *u
+ #define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name)
+ #define xdg_mime_is_valid_mime_type XDG_ENTRY(is_valid_mime_type)
+ #define xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal)
++#define _xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal_p)
+ #define xdg_mime_media_type_equal XDG_ENTRY(media_type_equal)
+ #define xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass)
++#define _xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass_p)
+ #define xdg_mime_get_mime_parents XDG_ENTRY(get_mime_parents)
+ #define xdg_mime_list_mime_parents XDG_ENTRY(list_mime_parents)
+ #define xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type)
++#define _xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type_p)
+ #define xdg_mime_get_max_buffer_extents XDG_ENTRY(get_max_buffer_extents)
+ #define xdg_mime_shutdown XDG_ENTRY(shutdown)
+ #define xdg_mime_dump XDG_ENTRY(dump)
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 8eeac80c990b..cd3e647f1258 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -63,6 +63,7 @@ include/gtk-2.0/gtk/gtkadjustment.h
include/gtk-2.0/gtk/gtkalignment.h
include/gtk-2.0/gtk/gtkarrow.h
include/gtk-2.0/gtk/gtkaspectframe.h
+include/gtk-2.0/gtk/gtkassistant.h
include/gtk-2.0/gtk/gtkbbox.h
include/gtk-2.0/gtk/gtkbin.h
include/gtk-2.0/gtk/gtkbindings.h
@@ -72,9 +73,11 @@ include/gtk-2.0/gtk/gtkcalendar.h
include/gtk-2.0/gtk/gtkcelleditable.h
include/gtk-2.0/gtk/gtkcelllayout.h
include/gtk-2.0/gtk/gtkcellrenderer.h
+include/gtk-2.0/gtk/gtkcellrendereraccel.h
include/gtk-2.0/gtk/gtkcellrenderercombo.h
include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
include/gtk-2.0/gtk/gtkcellrendererprogress.h
+include/gtk-2.0/gtk/gtkcellrendererspin.h
include/gtk-2.0/gtk/gtkcellrenderertext.h
include/gtk-2.0/gtk/gtkcellrenderertoggle.h
include/gtk-2.0/gtk/gtkcellview.h
@@ -137,6 +140,7 @@ include/gtk-2.0/gtk/gtkitem.h
include/gtk-2.0/gtk/gtkitemfactory.h
include/gtk-2.0/gtk/gtklabel.h
include/gtk-2.0/gtk/gtklayout.h
+include/gtk-2.0/gtk/gtklinkbutton.h
include/gtk-2.0/gtk/gtklist.h
include/gtk-2.0/gtk/gtklistitem.h
include/gtk-2.0/gtk/gtkliststore.h
@@ -154,10 +158,16 @@ include/gtk-2.0/gtk/gtknotebook.h
include/gtk-2.0/gtk/gtkobject.h
include/gtk-2.0/gtk/gtkoldeditable.h
include/gtk-2.0/gtk/gtkoptionmenu.h
+include/gtk-2.0/gtk/gtkpagesetup.h
include/gtk-2.0/gtk/gtkpaned.h
+include/gtk-2.0/gtk/gtkpapersize.h
include/gtk-2.0/gtk/gtkpixmap.h
include/gtk-2.0/gtk/gtkplug.h
include/gtk-2.0/gtk/gtkpreview.h
+include/gtk-2.0/gtk/gtkprintcontext.h
+include/gtk-2.0/gtk/gtkprintoperation.h
+include/gtk-2.0/gtk/gtkprintoperationpreview.h
+include/gtk-2.0/gtk/gtkprintsettings.h
include/gtk-2.0/gtk/gtkprivate.h
include/gtk-2.0/gtk/gtkprogress.h
include/gtk-2.0/gtk/gtkprogressbar.h
@@ -167,6 +177,12 @@ include/gtk-2.0/gtk/gtkradiomenuitem.h
include/gtk-2.0/gtk/gtkradiotoolbutton.h
include/gtk-2.0/gtk/gtkrange.h
include/gtk-2.0/gtk/gtkrc.h
+include/gtk-2.0/gtk/gtkrecentchooser.h
+include/gtk-2.0/gtk/gtkrecentchooserdialog.h
+include/gtk-2.0/gtk/gtkrecentchoosermenu.h
+include/gtk-2.0/gtk/gtkrecentchooserwidget.h
+include/gtk-2.0/gtk/gtkrecentfilter.h
+include/gtk-2.0/gtk/gtkrecentmanager.h
include/gtk-2.0/gtk/gtkruler.h
include/gtk-2.0/gtk/gtkscale.h
include/gtk-2.0/gtk/gtkscrollbar.h
@@ -181,12 +197,14 @@ include/gtk-2.0/gtk/gtksizegroup.h
include/gtk-2.0/gtk/gtksocket.h
include/gtk-2.0/gtk/gtkspinbutton.h
include/gtk-2.0/gtk/gtkstatusbar.h
+include/gtk-2.0/gtk/gtkstatusicon.h
include/gtk-2.0/gtk/gtkstock.h
include/gtk-2.0/gtk/gtkstyle.h
include/gtk-2.0/gtk/gtktable.h
include/gtk-2.0/gtk/gtktearoffmenuitem.h
include/gtk-2.0/gtk/gtktext.h
include/gtk-2.0/gtk/gtktextbuffer.h
+include/gtk-2.0/gtk/gtktextbufferrichtext.h
include/gtk-2.0/gtk/gtktextchild.h
include/gtk-2.0/gtk/gtktextdisplay.h
include/gtk-2.0/gtk/gtktextiter.h
@@ -228,6 +246,10 @@ include/gtk-2.0/gtk/gtkvscrollbar.h
include/gtk-2.0/gtk/gtkvseparator.h
include/gtk-2.0/gtk/gtkwidget.h
include/gtk-2.0/gtk/gtkwindow.h
+include/gtk-unix-print-2.0/gtk/gtkpagesetupunixdialog.h
+include/gtk-unix-print-2.0/gtk/gtkprinter.h
+include/gtk-unix-print-2.0/gtk/gtkprintjob.h
+include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
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
@@ -303,6 +325,15 @@ 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/libgdk-x11-2.0.a
lib/libgdk-x11-2.0.la
lib/libgdk-x11-2.0.so
@@ -324,11 +355,13 @@ 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/gtk-2.0/demo/alphatest.png
share/gtk-2.0/demo/apple-red.png
share/gtk-2.0/demo/appwindow.c
+share/gtk-2.0/demo/assistant.c
share/gtk-2.0/demo/background.jpg
share/gtk-2.0/demo/button_box.c
share/gtk-2.0/demo/changedisplay.c
@@ -360,9 +393,11 @@ share/gtk-2.0/demo/menus.c
share/gtk-2.0/demo/panes.c
share/gtk-2.0/demo/pickers.c
share/gtk-2.0/demo/pixbufs.c
+share/gtk-2.0/demo/printing.c
share/gtk-2.0/demo/rotated_text.c
share/gtk-2.0/demo/sizegroup.c
share/gtk-2.0/demo/stock_browser.c
+share/gtk-2.0/demo/textscroll.c
share/gtk-2.0/demo/textview.c
share/gtk-2.0/demo/tree_store.c
share/gtk-2.0/demo/ui_manager.c
@@ -370,6 +405,8 @@ share/locale/af/LC_MESSAGES/gtk20-properties.mo
share/locale/af/LC_MESSAGES/gtk20.mo
share/locale/am/LC_MESSAGES/gtk20-properties.mo
share/locale/am/LC_MESSAGES/gtk20.mo
+share/locale/ang/LC_MESSAGES/gtk20-properties.mo
+share/locale/ang/LC_MESSAGES/gtk20.mo
share/locale/ar/LC_MESSAGES/gtk20-properties.mo
share/locale/ar/LC_MESSAGES/gtk20.mo
share/locale/az/LC_MESSAGES/gtk20-properties.mo
@@ -382,6 +419,8 @@ share/locale/bg/LC_MESSAGES/gtk20-properties.mo
share/locale/bg/LC_MESSAGES/gtk20.mo
share/locale/bn/LC_MESSAGES/gtk20-properties.mo
share/locale/bn/LC_MESSAGES/gtk20.mo
+share/locale/bn_IN/LC_MESSAGES/gtk20-properties.mo
+share/locale/bn_IN/LC_MESSAGES/gtk20.mo
share/locale/br/LC_MESSAGES/gtk20-properties.mo
share/locale/br/LC_MESSAGES/gtk20.mo
share/locale/bs/LC_MESSAGES/gtk20-properties.mo
@@ -474,12 +513,10 @@ share/locale/nl/LC_MESSAGES/gtk20-properties.mo
share/locale/nl/LC_MESSAGES/gtk20.mo
share/locale/nn/LC_MESSAGES/gtk20-properties.mo
share/locale/nn/LC_MESSAGES/gtk20.mo
-share/locale/no/LC_MESSAGES/gtk20-properties.mo
-share/locale/no/LC_MESSAGES/gtk20.mo
share/locale/nso/LC_MESSAGES/gtk20-properties.mo
share/locale/nso/LC_MESSAGES/gtk20.mo
-share/locale/or/LC_MESSAGES/gtk20.mo
share/locale/or/LC_MESSAGES/gtk20-properties.mo
+share/locale/or/LC_MESSAGES/gtk20.mo
share/locale/pa/LC_MESSAGES/gtk20-properties.mo
share/locale/pa/LC_MESSAGES/gtk20.mo
share/locale/pl/LC_MESSAGES/gtk20-properties.mo
@@ -518,8 +555,12 @@ share/locale/tk/LC_MESSAGES/gtk20-properties.mo
share/locale/tk/LC_MESSAGES/gtk20.mo
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/uk/LC_MESSAGES/gtk20-properties.mo
share/locale/uk/LC_MESSAGES/gtk20.mo
+share/locale/ur/LC_MESSAGES/gtk20-properties.mo
+share/locale/ur/LC_MESSAGES/gtk20.mo
share/locale/uz/LC_MESSAGES/gtk20-properties.mo
share/locale/uz/LC_MESSAGES/gtk20.mo
share/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo
@@ -541,8 +582,8 @@ share/locale/zh_TW/LC_MESSAGES/gtk20.mo
share/themes/Default/gtk-2.0-key/gtkrc
share/themes/Emacs/gtk-2.0-key/gtkrc
share/themes/Raleigh/gtk-2.0/gtkrc
-@exec /usr/bin/find %%X11BASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true
-@unexec /usr/bin/find %%X11BASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true
+@exec /usr/bin/find %%LOCALBASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true
+@unexec /usr/bin/find %%LOCALBASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true
@dirrm share/themes/Raleigh/gtk-2.0
@dirrm share/themes/Raleigh
@dirrm share/themes/Emacs/gtk-2.0-key
@@ -550,6 +591,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrm share/themes/Default/gtk-2.0-key
@dirrm share/gtk-2.0/demo
@dirrm share/gtk-2.0
+@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
@@ -560,41 +603,90 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines
@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%%/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
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/yi/LC_MESSAGES
@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
@dirrmtry share/locale/uz@Latn/LC_MESSAGES
@dirrmtry share/locale/uz@Latn
+@dirrmtry share/locale/uz/LC_MESSAGES
+@dirrmtry share/locale/uz
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
@dirrmtry share/locale/ia/LC_MESSAGES
@dirrmtry share/locale/ia
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
@dirrmtry share/locale/az_IR/LC_MESSAGES
@dirrmtry share/locale/az_IR
-@dirrmtry lib/gtk-2.0/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
+@dirrmtry share/locale/ang/LC_MESSAGES
+@dirrmtry share/locale/ang
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index c5153fc719cc..5a1783c426e3 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,15 +3,15 @@
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-toolkits/gtk20/Makefile,v 1.8 2006/03/13 22:32:30 mezz Exp $
+# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.101 2006/10/08 21:05:26 marcus Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.8.20
-PORTREVISION?= 0
+PORTVERSION= 2.10.6
+PORTREVISION?= 1
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \
- ftp://ftp.gtk.org/pub/gtk/v2.8/ \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
+ ftp://ftp.gtk.org/pub/gtk/v2.10/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -33,20 +33,21 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.9:${PORTSDIR}/graphics/jpeg
RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
- ${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+USE_GMAKE= yes
USE_XPM= yes
USE_PERL5= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack atk pango ltverhack
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
CONFIGURE_ARGS= --enable-static --with-xinput=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-GTK_VERSION= 2.4.0
+GTK_VERSION= 2.10.0
PLIST_SUB= GTK_VERSION="${GTK_VERSION}"
gdk_pixbuf_MAN= gdk-pixbuf-query-loaders.1
@@ -77,13 +78,20 @@ STRIP=
.include <bsd.port.pre.mk>
+.if defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)
+LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base
+PLIST_SUB+= CUPS:=""
+.else
+PLIST_SUB+= CUPS:="@comment "
+.endif
+
# There is a SSE2 bug in either GCC or in our libc, when use p4, p-m or else
# is being use in CPUTYPE that enable SSE2 will causing Java with GTK2 and
# Mono/gtk-sharp crash. Disable SSE2 to solve the crash and see ports/72014
# for detail.
.if ${OSVERSION} >= 500000 && ( ${ARCH} == "i386" || ${ARCH} == "amd64" ) \
&& ${CC} != "icc"
-CFLAGS+= -mno-sse2
+#CFLAGS+= -mno-sse2
.endif
pre-everything::
@@ -108,12 +116,13 @@ post-patch:
@${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
pre-build:
@${RM} -rf ${WRKSRC}/docs/gtk.info*
post-install:
- -@${FIND} ${X11BASE}/share/icons -type d -depth 1 -exec \
+ -@${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
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index e7e4075ad27d..0fc02b098bba 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.8.20.tar.bz2) = 74e7ca98194f1fadfe906e66d763d05d
-SHA256 (gnome2/gtk+-2.8.20.tar.bz2) = 69a9b6c1e78da7e71416f20fab0c4972503139406e89ce7fbdbac0e213b16b79
-SIZE (gnome2/gtk+-2.8.20.tar.bz2) = 12247295
+MD5 (gnome2/gtk+-2.10.6.tar.bz2) = 13c62b610c910255934452d0617403f7
+SHA256 (gnome2/gtk+-2.10.6.tar.bz2) = ca98edcea2034ab36c1024121a44d047de192d282127c8f8b77d14afba0ca468
+SIZE (gnome2/gtk+-2.10.6.tar.bz2) = 14561124
diff --git a/x11-toolkits/gtk30/files/patch-ak b/x11-toolkits/gtk30/files/patch-ak
index f30cec385b9a..27156d238e58 100644
--- a/x11-toolkits/gtk30/files/patch-ak
+++ b/x11-toolkits/gtk30/files/patch-ak
@@ -1,6 +1,6 @@
$FreeBSD$
- $MCom: ports-stable/x11-toolkits/gtk20/files/patch-ak,v 1.6 2006/03/08 20:28:38 mezz Exp $
+ $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.19 2006/10/10 20:22:27 mezz Exp $
--- gdk/Makefile.in.orig Thu Feb 14 12:38:26 2002
+++ gdk/Makefile.in Thu Feb 14 12:45:37 2002
diff --git a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
index 44589795f769..610ece8f33ac 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
@@ -1,6 +1,6 @@
---- gtk/Makefile.in.orig Wed Mar 2 15:57:44 2005
-+++ gtk/Makefile.in Wed Mar 2 15:58:22 2005
-@@ -887,12 +887,12 @@
+--- gtk/Makefile.in.orig Sat May 6 04:47:11 2006
++++ gtk/Makefile.in Sat May 6 04:48:06 2006
+@@ -1009,11 +1009,11 @@ LDADDS = \
bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache
gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
@@ -9,9 +9,8 @@
gtk_query_immodules_2_0_SOURCES = queryimmodules.c
- gtk_update_icon_cache_DEPENDENCIES = $(DEPS)
--gtk_update_icon_cache_LDADD = $(LDADDS)
-+gtk_update_icon_cache_LDADD = $(LDADDS) $(GLIB_LIBS)
+-gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
++gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
gtk_update_icon_cache_SOURCES = updateiconcache.c
- subdir = gtk
+
diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkcalendar.c b/x11-toolkits/gtk30/files/patch-gtk_gtkcalendar.c
deleted file mode 100644
index 4dcf1fd052a5..000000000000
--- a/x11-toolkits/gtk30/files/patch-gtk_gtkcalendar.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk/gtkcalendar.c.orig Mon Oct 3 22:01:14 2005
-+++ gtk/gtkcalendar.c Mon Oct 3 22:02:36 2005
-@@ -566,6 +566,7 @@ gtk_calendar_init (GtkCalendar *calendar
- GtkCalendarPrivate *priv;
- gchar *year_before;
- gchar *langinfo;
-+ gchar *week_start;
- gint week_1stday = 0;
- gint first_weekday = 1;
- guint week_origin;
diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.h b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.h
new file mode 100644
index 000000000000..ed81f9280fac
--- /dev/null
+++ b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.h
@@ -0,0 +1,17 @@
+--- gtk/xdgmime/xdgmime.h.orig Sat Oct 7 10:42:32 2006
++++ gtk/xdgmime/xdgmime.h Sat Oct 7 11:01:57 2006
+@@ -52,11 +52,14 @@ typedef void (*XdgMimeDestroy) (void *u
+ #define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name)
+ #define xdg_mime_is_valid_mime_type XDG_ENTRY(is_valid_mime_type)
+ #define xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal)
++#define _xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal_p)
+ #define xdg_mime_media_type_equal XDG_ENTRY(media_type_equal)
+ #define xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass)
++#define _xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass_p)
+ #define xdg_mime_get_mime_parents XDG_ENTRY(get_mime_parents)
+ #define xdg_mime_list_mime_parents XDG_ENTRY(list_mime_parents)
+ #define xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type)
++#define _xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type_p)
+ #define xdg_mime_get_max_buffer_extents XDG_ENTRY(get_max_buffer_extents)
+ #define xdg_mime_shutdown XDG_ENTRY(shutdown)
+ #define xdg_mime_dump XDG_ENTRY(dump)
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 8eeac80c990b..cd3e647f1258 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -63,6 +63,7 @@ include/gtk-2.0/gtk/gtkadjustment.h
include/gtk-2.0/gtk/gtkalignment.h
include/gtk-2.0/gtk/gtkarrow.h
include/gtk-2.0/gtk/gtkaspectframe.h
+include/gtk-2.0/gtk/gtkassistant.h
include/gtk-2.0/gtk/gtkbbox.h
include/gtk-2.0/gtk/gtkbin.h
include/gtk-2.0/gtk/gtkbindings.h
@@ -72,9 +73,11 @@ include/gtk-2.0/gtk/gtkcalendar.h
include/gtk-2.0/gtk/gtkcelleditable.h
include/gtk-2.0/gtk/gtkcelllayout.h
include/gtk-2.0/gtk/gtkcellrenderer.h
+include/gtk-2.0/gtk/gtkcellrendereraccel.h
include/gtk-2.0/gtk/gtkcellrenderercombo.h
include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
include/gtk-2.0/gtk/gtkcellrendererprogress.h
+include/gtk-2.0/gtk/gtkcellrendererspin.h
include/gtk-2.0/gtk/gtkcellrenderertext.h
include/gtk-2.0/gtk/gtkcellrenderertoggle.h
include/gtk-2.0/gtk/gtkcellview.h
@@ -137,6 +140,7 @@ include/gtk-2.0/gtk/gtkitem.h
include/gtk-2.0/gtk/gtkitemfactory.h
include/gtk-2.0/gtk/gtklabel.h
include/gtk-2.0/gtk/gtklayout.h
+include/gtk-2.0/gtk/gtklinkbutton.h
include/gtk-2.0/gtk/gtklist.h
include/gtk-2.0/gtk/gtklistitem.h
include/gtk-2.0/gtk/gtkliststore.h
@@ -154,10 +158,16 @@ include/gtk-2.0/gtk/gtknotebook.h
include/gtk-2.0/gtk/gtkobject.h
include/gtk-2.0/gtk/gtkoldeditable.h
include/gtk-2.0/gtk/gtkoptionmenu.h
+include/gtk-2.0/gtk/gtkpagesetup.h
include/gtk-2.0/gtk/gtkpaned.h
+include/gtk-2.0/gtk/gtkpapersize.h
include/gtk-2.0/gtk/gtkpixmap.h
include/gtk-2.0/gtk/gtkplug.h
include/gtk-2.0/gtk/gtkpreview.h
+include/gtk-2.0/gtk/gtkprintcontext.h
+include/gtk-2.0/gtk/gtkprintoperation.h
+include/gtk-2.0/gtk/gtkprintoperationpreview.h
+include/gtk-2.0/gtk/gtkprintsettings.h
include/gtk-2.0/gtk/gtkprivate.h
include/gtk-2.0/gtk/gtkprogress.h
include/gtk-2.0/gtk/gtkprogressbar.h
@@ -167,6 +177,12 @@ include/gtk-2.0/gtk/gtkradiomenuitem.h
include/gtk-2.0/gtk/gtkradiotoolbutton.h
include/gtk-2.0/gtk/gtkrange.h
include/gtk-2.0/gtk/gtkrc.h
+include/gtk-2.0/gtk/gtkrecentchooser.h
+include/gtk-2.0/gtk/gtkrecentchooserdialog.h
+include/gtk-2.0/gtk/gtkrecentchoosermenu.h
+include/gtk-2.0/gtk/gtkrecentchooserwidget.h
+include/gtk-2.0/gtk/gtkrecentfilter.h
+include/gtk-2.0/gtk/gtkrecentmanager.h
include/gtk-2.0/gtk/gtkruler.h
include/gtk-2.0/gtk/gtkscale.h
include/gtk-2.0/gtk/gtkscrollbar.h
@@ -181,12 +197,14 @@ include/gtk-2.0/gtk/gtksizegroup.h
include/gtk-2.0/gtk/gtksocket.h
include/gtk-2.0/gtk/gtkspinbutton.h
include/gtk-2.0/gtk/gtkstatusbar.h
+include/gtk-2.0/gtk/gtkstatusicon.h
include/gtk-2.0/gtk/gtkstock.h
include/gtk-2.0/gtk/gtkstyle.h
include/gtk-2.0/gtk/gtktable.h
include/gtk-2.0/gtk/gtktearoffmenuitem.h
include/gtk-2.0/gtk/gtktext.h
include/gtk-2.0/gtk/gtktextbuffer.h
+include/gtk-2.0/gtk/gtktextbufferrichtext.h
include/gtk-2.0/gtk/gtktextchild.h
include/gtk-2.0/gtk/gtktextdisplay.h
include/gtk-2.0/gtk/gtktextiter.h
@@ -228,6 +246,10 @@ include/gtk-2.0/gtk/gtkvscrollbar.h
include/gtk-2.0/gtk/gtkvseparator.h
include/gtk-2.0/gtk/gtkwidget.h
include/gtk-2.0/gtk/gtkwindow.h
+include/gtk-unix-print-2.0/gtk/gtkpagesetupunixdialog.h
+include/gtk-unix-print-2.0/gtk/gtkprinter.h
+include/gtk-unix-print-2.0/gtk/gtkprintjob.h
+include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h
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
@@ -303,6 +325,15 @@ 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/libgdk-x11-2.0.a
lib/libgdk-x11-2.0.la
lib/libgdk-x11-2.0.so
@@ -324,11 +355,13 @@ 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/gtk-2.0/demo/alphatest.png
share/gtk-2.0/demo/apple-red.png
share/gtk-2.0/demo/appwindow.c
+share/gtk-2.0/demo/assistant.c
share/gtk-2.0/demo/background.jpg
share/gtk-2.0/demo/button_box.c
share/gtk-2.0/demo/changedisplay.c
@@ -360,9 +393,11 @@ share/gtk-2.0/demo/menus.c
share/gtk-2.0/demo/panes.c
share/gtk-2.0/demo/pickers.c
share/gtk-2.0/demo/pixbufs.c
+share/gtk-2.0/demo/printing.c
share/gtk-2.0/demo/rotated_text.c
share/gtk-2.0/demo/sizegroup.c
share/gtk-2.0/demo/stock_browser.c
+share/gtk-2.0/demo/textscroll.c
share/gtk-2.0/demo/textview.c
share/gtk-2.0/demo/tree_store.c
share/gtk-2.0/demo/ui_manager.c
@@ -370,6 +405,8 @@ share/locale/af/LC_MESSAGES/gtk20-properties.mo
share/locale/af/LC_MESSAGES/gtk20.mo
share/locale/am/LC_MESSAGES/gtk20-properties.mo
share/locale/am/LC_MESSAGES/gtk20.mo
+share/locale/ang/LC_MESSAGES/gtk20-properties.mo
+share/locale/ang/LC_MESSAGES/gtk20.mo
share/locale/ar/LC_MESSAGES/gtk20-properties.mo
share/locale/ar/LC_MESSAGES/gtk20.mo
share/locale/az/LC_MESSAGES/gtk20-properties.mo
@@ -382,6 +419,8 @@ share/locale/bg/LC_MESSAGES/gtk20-properties.mo
share/locale/bg/LC_MESSAGES/gtk20.mo
share/locale/bn/LC_MESSAGES/gtk20-properties.mo
share/locale/bn/LC_MESSAGES/gtk20.mo
+share/locale/bn_IN/LC_MESSAGES/gtk20-properties.mo
+share/locale/bn_IN/LC_MESSAGES/gtk20.mo
share/locale/br/LC_MESSAGES/gtk20-properties.mo
share/locale/br/LC_MESSAGES/gtk20.mo
share/locale/bs/LC_MESSAGES/gtk20-properties.mo
@@ -474,12 +513,10 @@ share/locale/nl/LC_MESSAGES/gtk20-properties.mo
share/locale/nl/LC_MESSAGES/gtk20.mo
share/locale/nn/LC_MESSAGES/gtk20-properties.mo
share/locale/nn/LC_MESSAGES/gtk20.mo
-share/locale/no/LC_MESSAGES/gtk20-properties.mo
-share/locale/no/LC_MESSAGES/gtk20.mo
share/locale/nso/LC_MESSAGES/gtk20-properties.mo
share/locale/nso/LC_MESSAGES/gtk20.mo
-share/locale/or/LC_MESSAGES/gtk20.mo
share/locale/or/LC_MESSAGES/gtk20-properties.mo
+share/locale/or/LC_MESSAGES/gtk20.mo
share/locale/pa/LC_MESSAGES/gtk20-properties.mo
share/locale/pa/LC_MESSAGES/gtk20.mo
share/locale/pl/LC_MESSAGES/gtk20-properties.mo
@@ -518,8 +555,12 @@ share/locale/tk/LC_MESSAGES/gtk20-properties.mo
share/locale/tk/LC_MESSAGES/gtk20.mo
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/uk/LC_MESSAGES/gtk20-properties.mo
share/locale/uk/LC_MESSAGES/gtk20.mo
+share/locale/ur/LC_MESSAGES/gtk20-properties.mo
+share/locale/ur/LC_MESSAGES/gtk20.mo
share/locale/uz/LC_MESSAGES/gtk20-properties.mo
share/locale/uz/LC_MESSAGES/gtk20.mo
share/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo
@@ -541,8 +582,8 @@ share/locale/zh_TW/LC_MESSAGES/gtk20.mo
share/themes/Default/gtk-2.0-key/gtkrc
share/themes/Emacs/gtk-2.0-key/gtkrc
share/themes/Raleigh/gtk-2.0/gtkrc
-@exec /usr/bin/find %%X11BASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true
-@unexec /usr/bin/find %%X11BASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true
+@exec /usr/bin/find %%LOCALBASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true
+@unexec /usr/bin/find %%LOCALBASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true
@dirrm share/themes/Raleigh/gtk-2.0
@dirrm share/themes/Raleigh
@dirrm share/themes/Emacs/gtk-2.0-key
@@ -550,6 +591,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@dirrm share/themes/Default/gtk-2.0-key
@dirrm share/gtk-2.0/demo
@dirrm share/gtk-2.0
+@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
@@ -560,41 +603,90 @@ share/themes/Raleigh/gtk-2.0/gtkrc
@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines
@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%%/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
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/yi/LC_MESSAGES
@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
@dirrmtry share/locale/uz@Latn/LC_MESSAGES
@dirrmtry share/locale/uz@Latn
+@dirrmtry share/locale/uz/LC_MESSAGES
+@dirrmtry share/locale/uz
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
@dirrmtry share/locale/ia/LC_MESSAGES
@dirrmtry share/locale/ia
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
@dirrmtry share/locale/az_IR/LC_MESSAGES
@dirrmtry share/locale/az_IR
-@dirrmtry lib/gtk-2.0/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
+@dirrmtry share/locale/ang/LC_MESSAGES
+@dirrmtry share/locale/ang
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index f71d3f7c9db6..bdb27eb3d75b 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.37 2006/04/13 07:52:42 bland Exp $
+# $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.43 2006/10/02 00:40:29 ahze Exp $
#
PORTNAME= gtksourceview
-PORTVERSION= 1.6.2
+PORTVERSION= 1.8.1
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -22,10 +22,10 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GNOME= gnomeprefix gnomehack libgnome libgnomeprintui intlhack \
ltverhack referencehack
CONFIGURE_ARGS= --enable-compile-warnings=no
diff --git a/x11-toolkits/gtksourceview/distinfo b/x11-toolkits/gtksourceview/distinfo
index 24fd4193893b..67e49c2ff4fd 100644
--- a/x11-toolkits/gtksourceview/distinfo
+++ b/x11-toolkits/gtksourceview/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtksourceview-1.6.2.tar.bz2) = 57f4ee84f0c494fd943c7badb0a68785
-SHA256 (gnome2/gtksourceview-1.6.2.tar.bz2) = 9236de0b7471bfaefd0a9faf8f699c4e0cfaca0a835164bc64172ce85840e3d0
-SIZE (gnome2/gtksourceview-1.6.2.tar.bz2) = 756789
+MD5 (gnome2/gtksourceview-1.8.1.tar.bz2) = d2db4d84918fa0ca477f7684fa2f42a3
+SHA256 (gnome2/gtksourceview-1.8.1.tar.bz2) = e7c6b6bd842fad8163577ed21a8d940b42aa4bb27474d88829d15ddc9fd534e4
+SIZE (gnome2/gtksourceview-1.8.1.tar.bz2) = 771063
diff --git a/x11-toolkits/gtksourceview/pkg-plist b/x11-toolkits/gtksourceview/pkg-plist
index 11bb3af26ff9..260599912788 100644
--- a/x11-toolkits/gtksourceview/pkg-plist
+++ b/x11-toolkits/gtksourceview/pkg-plist
@@ -17,11 +17,13 @@ lib/libgtksourceview-1.0.so.0
libdata/pkgconfig/gtksourceview-1.0.pc
share/gnome/gtksourceview-1.0/language-specs/R.lang
share/gnome/gtksourceview-1.0/language-specs/ada.lang
+share/gnome/gtksourceview-1.0/language-specs/boo.lang
share/gnome/gtksourceview-1.0/language-specs/c.lang
share/gnome/gtksourceview-1.0/language-specs/changelog.lang
share/gnome/gtksourceview-1.0/language-specs/cpp.lang
share/gnome/gtksourceview-1.0/language-specs/csharp.lang
share/gnome/gtksourceview-1.0/language-specs/css.lang
+share/gnome/gtksourceview-1.0/language-specs/d.lang
share/gnome/gtksourceview-1.0/language-specs/desktop.lang
share/gnome/gtksourceview-1.0/language-specs/diff.lang
share/gnome/gtksourceview-1.0/language-specs/fortran.lang
@@ -89,13 +91,16 @@ share/locale/ja/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/ko/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/lt/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/lv/LC_MESSAGES/gtksourceview-1.0.mo
+share/locale/mg/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/mk/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/ml/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/mn/LC_MESSAGES/gtksourceview-1.0.mo
+share/locale/mr/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/ms/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/nb/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/ne/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/nl/LC_MESSAGES/gtksourceview-1.0.mo
+share/locale/or/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/pa/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/pl/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/pt/LC_MESSAGES/gtksourceview-1.0.mo
@@ -104,6 +109,7 @@ share/locale/ro/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/ru/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/rw/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/sk/LC_MESSAGES/gtksourceview-1.0.mo
+share/locale/sl/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/sq/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/sr/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/sr@Latn/LC_MESSAGES/gtksourceview-1.0.mo
@@ -117,17 +123,55 @@ share/locale/xh/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/zh_CN/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/zh_HK/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/zh_TW/LC_MESSAGES/gtksourceview-1.0.mo
+@dirrm share/gnome/gtksourceview-1.0/language-specs
+@dirrm share/gnome/gtksourceview-1.0
+@dirrm include/gtksourceview-1.0/gtksourceview
+@dirrm include/gtksourceview-1.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
-@dirrm share/gnome/gtksourceview-1.0/language-specs
-@dirrm share/gnome/gtksourceview-1.0
-@dirrm include/gtksourceview-1.0/gtksourceview
-@dirrm include/gtksourceview-1.0
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 4f4b184f2700..0b0c4c7d507f 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.43 2006/04/13 07:52:43 bland Exp $
+# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.48 2006/09/04 18:33:07 marcus Exp $
#
PORTNAME= libbonoboui
-PORTVERSION= 2.14.0
-PORTREVISION?= 1
+PORTVERSION= 2.16.0
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,12 +22,12 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier intlhack \
libgnomecanvas libgnome referencehack
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index 4a703b65ca1c..0997a7c6df4c 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome/libbonoboui-2.14.0.tar.bz2) = dc26dc17cddc625cac37ecfab263a51a
-SHA256 (gnome/libbonoboui-2.14.0.tar.bz2) = 2dd02787e5bad91e1efbfe2fe041eefe8cf13ebce9607d6dd9764c69f37233a8
-SIZE (gnome/libbonoboui-2.14.0.tar.bz2) = 893139
+MD5 (gnome/libbonoboui-2.16.0.tar.bz2) = 603ffc92491ef27ccfbc2b69abd3906b
+SHA256 (gnome/libbonoboui-2.16.0.tar.bz2) = 47346162245f79291b7755f82492d75a18f56e07a51b89f1014b83e796ba0ac1
+SIZE (gnome/libbonoboui-2.16.0.tar.bz2) = 937950
diff --git a/x11-toolkits/libbonoboui/files/patch-tools::browser::oaf-helper.c b/x11-toolkits/libbonoboui/files/patch-tools::browser::oaf-helper.c
deleted file mode 100644
index 8b187fb40e00..000000000000
--- a/x11-toolkits/libbonoboui/files/patch-tools::browser::oaf-helper.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- tools/browser/oaf-helper.c.orig Sun Feb 6 03:04:39 2005
-+++ tools/browser/oaf-helper.c Sun Feb 6 03:06:17 2005
-@@ -58,10 +58,12 @@
- gchar **search;
-
- lang = getenv ("LANG");
-+ if (!lang)
-+ return g_strdup ("");
-
- search = g_strsplit (lang, "_", 1);
- if (!search)
-- return "";
-+ return g_strdup ("");
-
- ret = g_strdup_printf ("%s", search[0]);
-
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index 15174fc36410..f1bdbbeda992 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -54,6 +54,7 @@ share/locale/az/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/be/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/bn/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/bs/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ca/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/cs/LC_MESSAGES/libbonoboui-2.0.mo
@@ -80,6 +81,7 @@ share/locale/id/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/is/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/it/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ja/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ka/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/kn/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ko/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ku/LC_MESSAGES/libbonoboui-2.0.mo
@@ -95,7 +97,6 @@ share/locale/nb/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ne/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/nl/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/nn/LC_MESSAGES/libbonoboui-2.0.mo
-share/locale/no/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/nso/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/or/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/pa/LC_MESSAGES/libbonoboui-2.0.mo
@@ -123,11 +124,65 @@ share/locale/zh_CN/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/zh_HK/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
@dirrm lib/bonobo-2.0/samples
@dirrm lib/bonobo-2.0
@dirrm include/libbonoboui-2.0/bonobo
@dirrm include/libbonoboui-2.0
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 5cd93b1a4161..d2351dba1fd7 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -3,11 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/x11-toolkits/libgail-gnome/Makefile,v 1.16 2006/09/10 00:51:17 mezz Exp $
#
PORTNAME= libgail-gnome
PORTVERSION= 1.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
@@ -18,8 +19,8 @@ COMMENT= An implementation of the ATK interfaces for GNOME widgets
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
-INSTALLS_SHLIB= yes
+USE_XLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack gnomepanel atspi
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index c0cc666ec840..61a1ee9d4b0c 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.53 2005/09/26 21:14:32 marcus Exp $
+# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.58 2006/10/10 20:22:27 mezz Exp $
#
PORTNAME= libgnomeprintui
PORTVERSION= 2.12.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
@@ -17,17 +17,17 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gnome print support library
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
-RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_XPM= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas \
intlhack ltverhack
USE_GETTEXT= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
USE_BISON= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist
index 7363dec5e82b..5233820cabef 100644
--- a/x11-toolkits/libgnomeprintui/pkg-plist
+++ b/x11-toolkits/libgnomeprintui/pkg-plist
@@ -87,3 +87,49 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo
@dirrm share/gnome/libgnomeprintui
@dirrm include/libgnomeprintui-2.2/libgnomeprintui
@dirrm include/libgnomeprintui-2.2
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index acea669aae0f..4501201b953c 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.79 2006/04/13 07:52:43 bland Exp $
+# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.91 2006/10/05 17:59:48 mezz Exp $
+#
PORTNAME= libgnomeui
-PORTVERSION= 2.14.1
-PORTREVISION?= 1
+PORTVERSION= 2.16.1
+PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,14 +23,15 @@ USE_BZIP2= yes
LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \
startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS= ${X11BASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
+RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_XPM= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui ltverhack referencehack
-INSTALLS_SHLIB= yes
+USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui ltverhack \
+ referencehack
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
USE_BISON= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 406ea091cd0a..9acf13907b15 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeui-2.14.1.tar.bz2) = ff6b6c25de0e7e39c79998621cdec048
-SHA256 (gnome2/libgnomeui-2.14.1.tar.bz2) = e1029ed0c69d7e1259c48d9ff1afdd87505182e0a1ef28ef3b48592a3a3c1c88
-SIZE (gnome2/libgnomeui-2.14.1.tar.bz2) = 1891798
+MD5 (gnome2/libgnomeui-2.16.1.tar.bz2) = d9b975952bf5feee8818d3fb18cca0b3
+SHA256 (gnome2/libgnomeui-2.16.1.tar.bz2) = 552c34d20f30847429e342e6c6ddeece707b69a5abe9aeeafcfeb65cec2eebd7
+SIZE (gnome2/libgnomeui-2.16.1.tar.bz2) = 1482097
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index 9b564b12be44..d4ae531e03f8 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -62,11 +62,6 @@ lib/libgnomeui-2.so.0
libdata/pkgconfig/libgnomeui-2.0.pc
libexec/gnome_segv2
share/gnome/pixmaps/gnome-about-logo.png
-share/gnome/pixmaps/gnome-default-dlg.png
-share/gnome/pixmaps/gnome-error.png
-share/gnome/pixmaps/gnome-info.png
-share/gnome/pixmaps/gnome-question.png
-share/gnome/pixmaps/gnome-warning.png
share/locale/af/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/am/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ar/LC_MESSAGES/libgnomeui-2.0.mo
@@ -74,6 +69,7 @@ share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/be/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/bg/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/bn/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/br/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/bs/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ca/LC_MESSAGES/libgnomeui-2.0.mo
@@ -81,7 +77,6 @@ share/locale/cs/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/cy/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/da/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/de/LC_MESSAGES/libgnomeui-2.0.mo
-share/locale/dz/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/el/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/en_CA/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/en_GB/LC_MESSAGES/libgnomeui-2.0.mo
@@ -110,6 +105,7 @@ share/locale/ku/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/li/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/lt/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/lv/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/mg/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/mi/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/mk/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ml/LC_MESSAGES/libgnomeui-2.0.mo
@@ -120,8 +116,8 @@ share/locale/nb/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ne/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/nl/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/nn/LC_MESSAGES/libgnomeui-2.0.mo
-share/locale/no/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/nso/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/or/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/pa/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/pl/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/pt/LC_MESSAGES/libgnomeui-2.0.mo
@@ -151,16 +147,74 @@ share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/zh_HK/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo
+@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/filesystems
+@dirrm include/libgnomeui-2.0/libgnomeui
+@dirrm include/libgnomeui-2.0
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/tt/LC_MESSAGES
@dirrmtry share/locale/tt
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrm lib/gtk-2.0/%%GTK2_VERSION%%/filesystems
-@dirrm include/libgnomeui-2.0/libgnomeui
-@dirrm include/libgnomeui-2.0
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 32470ff95642..4f51ac165648 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.70 2006/04/13 07:52:43 bland Exp $
+# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.81 2006/10/03 01:48:04 ahze Exp $
#
PORTNAME= libwnck
-PORTVERSION= 2.14.3
+PORTVERSION= 2.16.1
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -27,8 +27,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gtk20 ltverhack referencehack
USE_BISON= yes
-USE_X_PREFIX= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index 075263631c9b..d71586fcb4e3 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libwnck-2.14.3.tar.bz2) = 5796c0c26c5dfbad6d4fdf77858feae6
-SHA256 (gnome2/libwnck-2.14.3.tar.bz2) = b83ae20e45265465f237fd6d261f6baf61079df3220f01342f6d8d223027f415
-SIZE (gnome2/libwnck-2.14.3.tar.bz2) = 460773
+MD5 (gnome2/libwnck-2.16.1.tar.bz2) = 3b9d6d58ba8552bb354f87af23a058a8
+SHA256 (gnome2/libwnck-2.16.1.tar.bz2) = e3081b2b44ba780f6e1bf507bb39aea9aee56cdabf1784312aa057bccff626cb
+SIZE (gnome2/libwnck-2.16.1.tar.bz2) = 466473
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index 2171713fba1a..8c94310c4b38 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -21,12 +21,14 @@ share/locale/az/LC_MESSAGES/libwnck.mo
share/locale/be/LC_MESSAGES/libwnck.mo
share/locale/bg/LC_MESSAGES/libwnck.mo
share/locale/bn/LC_MESSAGES/libwnck.mo
+share/locale/bn_IN/LC_MESSAGES/libwnck.mo
share/locale/bs/LC_MESSAGES/libwnck.mo
share/locale/ca/LC_MESSAGES/libwnck.mo
share/locale/cs/LC_MESSAGES/libwnck.mo
share/locale/cy/LC_MESSAGES/libwnck.mo
share/locale/da/LC_MESSAGES/libwnck.mo
share/locale/de/LC_MESSAGES/libwnck.mo
+share/locale/dz/LC_MESSAGES/libwnck.mo
share/locale/el/LC_MESSAGES/libwnck.mo
share/locale/en_CA/LC_MESSAGES/libwnck.mo
share/locale/en_GB/LC_MESSAGES/libwnck.mo
@@ -81,6 +83,7 @@ share/locale/sr/LC_MESSAGES/libwnck.mo
share/locale/sr@Latn/LC_MESSAGES/libwnck.mo
share/locale/sv/LC_MESSAGES/libwnck.mo
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/uk/LC_MESSAGES/libwnck.mo
@@ -90,9 +93,63 @@ share/locale/xh/LC_MESSAGES/libwnck.mo
share/locale/zh_CN/LC_MESSAGES/libwnck.mo
share/locale/zh_HK/LC_MESSAGES/libwnck.mo
share/locale/zh_TW/LC_MESSAGES/libwnck.mo
+@dirrm include/libwnck-1.0/libwnck
+@dirrm include/libwnck-1.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
-@dirrm include/libwnck-1.0/libwnck
-@dirrm include/libwnck-1.0
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 9c8a7171010a..1d4d080cb137 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,15 +3,15 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/pango/Makefile,v 1.60 2006/04/27 11:12:49 ahze Exp $
+# $MCom: ports/x11-toolkits/pango/Makefile,v 1.84 2006/10/13 19:09:37 marcus Exp $
#
PORTNAME= pango
-PORTVERSION= 1.12.4
+PORTVERSION= 1.14.7
PORTREVISION?= 0
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/pango/1.12,} \
- ftp://ftp.gtk.org/pub/gtk/v2.10/
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
+ ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -28,8 +28,7 @@ RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \
USE_GETTEXT= yes
USE_GMAKE= yes
-PREFIX?= ${X11BASE}
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack glib20 ltverhack referencehack
CONFIGURE_ARGS= --with-qt=no \
@@ -64,14 +63,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
PLIST_SUB+= X11=""
.endif
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-MTREE_FILE= /etc/mtree/BSD.x11.dist
-.else
-MTREE_FILE= /etc/mtree/BSD.x11-4.dist
-.endif
-
post-install:
@${SED} -e 's|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \
> ${PKGINSTALL}
@@ -79,6 +70,6 @@ post-install:
@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
.endif
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index a34d43b1747a..364514f32fb4 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pango-1.12.4.tar.bz2) = 8f6749fe961e41dbeed72d1efcd55224
-SHA256 (gnome2/pango-1.12.4.tar.bz2) = 3d0ed04055fd8aa8e6522cd0471a8224e18e87939a26ff81593d56d4e8cd8530
-SIZE (gnome2/pango-1.12.4.tar.bz2) = 1261128
+MD5 (gnome2/pango-1.14.7.tar.bz2) = ae2e7d06917e745e3d249df4aabc42c1
+SHA256 (gnome2/pango-1.14.7.tar.bz2) = 1020cfc8907f29c293dc93c86692863eeaeffa63637137c50a11a40f8bd22b22
+SIZE (gnome2/pango-1.14.7.tar.bz2) = 1288583
diff --git a/x11-toolkits/pango/files/patch-ac b/x11-toolkits/pango/files/patch-ac
deleted file mode 100644
index 63e2e8673d18..000000000000
--- a/x11-toolkits/pango/files/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
- $MCom: ports/x11-toolkits/pango/files/patch-ac,v 1.18 2006/03/13 05:45:48 mezz Exp $
-
---- Makefile.in.orig Mon Aug 2 19:12:56 2004
-+++ Makefile.in Mon Aug 2 19:13:11 2004
-@@ -234,7 +234,7 @@
-
- AUTOMAKE_OPTIONS = 1.7
-
--SUBDIRS = pango modules examples docs tools tests
-+SUBDIRS = pango modules examples docs tools
-
- EXTRA_DIST = \
- pango.pc.in \
-
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index f9f30475438f..ca740efa7df4 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -54,6 +54,9 @@ lib/libpangoft2-1.0.so.0
lib/pango/%%VERSION%%/modules/pango-arabic-fc.a
lib/pango/%%VERSION%%/modules/pango-arabic-fc.la
lib/pango/%%VERSION%%/modules/pango-arabic-fc.so
+lib/pango/%%VERSION%%/modules/pango-arabic-lang.a
+lib/pango/%%VERSION%%/modules/pango-arabic-lang.la
+lib/pango/%%VERSION%%/modules/pango-arabic-lang.so
lib/pango/%%VERSION%%/modules/pango-basic-fc.a
lib/pango/%%VERSION%%/modules/pango-basic-fc.la
lib/pango/%%VERSION%%/modules/pango-basic-fc.so
@@ -69,6 +72,9 @@ lib/pango/%%VERSION%%/modules/pango-hebrew-fc.so
lib/pango/%%VERSION%%/modules/pango-indic-fc.a
lib/pango/%%VERSION%%/modules/pango-indic-fc.la
lib/pango/%%VERSION%%/modules/pango-indic-fc.so
+lib/pango/%%VERSION%%/modules/pango-indic-lang.a
+lib/pango/%%VERSION%%/modules/pango-indic-lang.la
+lib/pango/%%VERSION%%/modules/pango-indic-lang.so
lib/pango/%%VERSION%%/modules/pango-khmer-fc.a
lib/pango/%%VERSION%%/modules/pango-khmer-fc.la
lib/pango/%%VERSION%%/modules/pango-khmer-fc.so
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index b9fb33d21767..9d0178dfad32 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.39 2006/03/12 23:43:07 marcus Exp $
+# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.50 2006/09/05 01:09:07 ahze Exp $
#
PORTNAME= gnome
-PORTVERSION= 2.14.0
+PORTVERSION= 2.16.0
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/..$//}
+MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= -desktop
DISTNAME= gnome-python-desktop-${PORTVERSION}
@@ -20,20 +20,21 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A set of Python bindings used by modules in the GNOME Desktop
LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
- totem-plparser.2:${PORTSDIR}/multimedia/totem-gstreamer \
- gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media
+ totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+ gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
+ gnome-keyring:${PORTSDIR}/security/gnome-keyring
USE_BZIP2= yes
USE_GMAKE= yes
USE_PYTHON= yes
-USE_GNOME= gnomehack libgnomeprintui gnomepanel \
+USE_GNOME= gnomehack libgnomeprintui gnomepanel gnomedesktop \
gtksourceview libwnck nautiluscdburner pygnome2 metacity
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
EG_SRC_DIR= ${WRKSRC}/examples
-EXAMPLESDIR= ${PREFIX}/share/examples/py-gnome
+EG_DST_DIR= ${PREFIX}/share/examples/py-gnome
.if !defined(NOPORTDOCS)
DOCSDIR= ${PREFIX}/share/doc/py-gnome-desktop
.else
@@ -48,9 +49,9 @@ post-patch:
.if !defined(NOPORTDOCS)
post-install:
- ${MKDIR} ${EXAMPLESDIR}
- ${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EXAMPLESDIR} -xf -
- ${CHOWN} -R ${BINOWN}:${BINGRP} ${EXAMPLESDIR}
+ ${MKDIR} ${EG_DST_DIR}
+ ${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xf -
+ ${CHOWN} -R ${BINOWN}:${BINGRP} ${EG_DST_DIR}
.endif
.include <bsd.port.post.mk>
diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo
index 85e7ee9263a1..5bfd6963337b 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.14.0.tar.bz2) = d3f9c2d213b7d486ca7bd87dd106ca69
-SHA256 (gnome2/gnome-python-desktop-2.14.0.tar.bz2) = 1e617686fc7b84a4b2779cdfe3987a592f40bd24f3f5e252fd559ca41452dde1
-SIZE (gnome2/gnome-python-desktop-2.14.0.tar.bz2) = 403302
+MD5 (gnome2/gnome-python-desktop-2.16.0.tar.bz2) = ea79fe3e6a65d8380539a9ef6eed963f
+SHA256 (gnome2/gnome-python-desktop-2.16.0.tar.bz2) = 8b2a628e9f4a4827aa51456ab5cdf8839a9fe2522c5cd129aa9b50a712410610
+SIZE (gnome2/gnome-python-desktop-2.16.0.tar.bz2) = 429108
diff --git a/x11-toolkits/py-gnome-desktop/pkg-plist b/x11-toolkits/py-gnome-desktop/pkg-plist
index ec4714de22b4..e7200549d7ea 100644
--- a/x11-toolkits/py-gnome-desktop/pkg-plist
+++ b/x11-toolkits/py-gnome-desktop/pkg-plist
@@ -3,6 +3,13 @@
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyo
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeapplet.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeapplet.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomedesktop/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomedesktop/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomedesktop/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomedesktop/_gnomedesktop.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomedesktop/_gnomedesktop.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomekeyring.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomekeyring.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyo
@@ -20,6 +27,8 @@
%%PYTHON_SITELIBDIR%%/gtk-2.0/metacity.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/rsvg.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/rsvg.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyo
@@ -63,46 +72,51 @@ libdata/pkgconfig/gnome-python-desktop-2.0.pc
%%DOCSDIR%%/pygtksourceview/index.html
%%DOCSDIR%%/pygtksourceview/index.sgml
%%DOCSDIR%%/pygtksourceview/pygtksourceview.devhelp
-%%EXAMPLESDIR%%/applet/GNOME_PythonAppletSample.server
-%%EXAMPLESDIR%%/applet/README
-%%EXAMPLESDIR%%/applet/applet.py
-%%EXAMPLESDIR%%/gnomeprint/README
-%%EXAMPLESDIR%%/gnomeprint/example_01.py
-%%EXAMPLESDIR%%/gnomeprint/example_02.py
-%%EXAMPLESDIR%%/gnomeprint/example_03.py
-%%EXAMPLESDIR%%/gnomeprint/example_04.py
-%%EXAMPLESDIR%%/gnomeprint/example_05.py
-%%EXAMPLESDIR%%/gnomeprint/example_06.py
-%%EXAMPLESDIR%%/gnomeprint/example_08.py
-%%EXAMPLESDIR%%/gnomeprint/example_09.py
-%%EXAMPLESDIR%%/gnomeprint/example_10.glade
-%%EXAMPLESDIR%%/gnomeprint/example_10.py
-%%EXAMPLESDIR%%/gnomeprint/example_11.py
-%%EXAMPLESDIR%%/gnomeprint/sample-image.png
-%%EXAMPLESDIR%%/gnomeprint/test-print.py
-%%EXAMPLESDIR%%/gtksourceview/test-widget.py
-%%EXAMPLESDIR%%/mediaprofiles/profiles.py
-%%EXAMPLESDIR%%/nautilusburn/blank_disc.py
-%%EXAMPLESDIR%%/nautilusburn/drive_selection.py
-%%EXAMPLESDIR%%/nautilusburn/write_iso.py
+share/examples/py-gnome/applet/GNOME_PythonAppletSample.server
+share/examples/py-gnome/applet/README
+share/examples/py-gnome/applet/applet.py
+share/examples/py-gnome/gnomeprint/README
+share/examples/py-gnome/gnomeprint/example_01.py
+share/examples/py-gnome/gnomeprint/example_02.py
+share/examples/py-gnome/gnomeprint/example_03.py
+share/examples/py-gnome/gnomeprint/example_04.py
+share/examples/py-gnome/gnomeprint/example_05.py
+share/examples/py-gnome/gnomeprint/example_06.py
+share/examples/py-gnome/gnomeprint/example_08.py
+share/examples/py-gnome/gnomeprint/example_09.py
+share/examples/py-gnome/gnomeprint/example_10.glade
+share/examples/py-gnome/gnomeprint/example_10.py
+share/examples/py-gnome/gnomeprint/example_11.py
+share/examples/py-gnome/gnomeprint/sample-image.png
+share/examples/py-gnome/gnomeprint/test-print.py
+share/examples/py-gnome/gtksourceview/test-widget.py
+share/examples/py-gnome/keyring.py
+share/examples/py-gnome/mediaprofiles/profiles.py
+share/examples/py-gnome/nautilusburn/blank_disc.py
+share/examples/py-gnome/nautilusburn/drive_selection.py
+share/examples/py-gnome/nautilusburn/write_iso.py
+share/examples/py-gnome/rsvg/rsvg-cairo.py
+share/pygtk/2.0/defs/_gnomedesktop.defs
share/pygtk/2.0/defs/applet.defs
share/pygtk/2.0/defs/art.defs
+share/pygtk/2.0/defs/gnomekeyring.defs
share/pygtk/2.0/defs/gtksourceview.defs
share/pygtk/2.0/defs/mediaprofiles.defs
share/pygtk/2.0/defs/metacity.defs
share/pygtk/2.0/defs/nautilus_burn.defs
-share/pygtk/2.0/defs/nb_drive_selection.defs
share/pygtk/2.0/defs/print.defs
share/pygtk/2.0/defs/printui.defs
share/pygtk/2.0/defs/wnck.defs
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/nautilusburn
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/mediaprofiles
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/gtksourceview
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/gnomeprint
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/applet
+%%PORTDOCS%%@dirrm share/examples/py-gnome/rsvg
+%%PORTDOCS%%@dirrm share/examples/py-gnome/nautilusburn
+%%PORTDOCS%%@dirrm share/examples/py-gnome/mediaprofiles
+%%PORTDOCS%%@dirrm share/examples/py-gnome/gtksourceview
+%%PORTDOCS%%@dirrm share/examples/py-gnome/gnomeprint
+%%PORTDOCS%%@dirrm share/examples/py-gnome/applet
%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtksourceview
%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygnomeprintui
%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygnomeprint
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/totem
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomedesktop
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 5bce80c66c11..175b18e98f5a 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-toolkits/py-gnome2/Makefile,v 1.2 2006/03/14 13:28:11 marcus Exp $
+# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.36 2006/09/04 22:22:09 ahze Exp $
#
PORTNAME= gnome
-PORTVERSION= 2.12.4
-PORTREVISION= 1
+PORTVERSION= 2.16.0
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/..$//}
+MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= gnome-python-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -39,10 +38,6 @@ CONFLICTS= py*-gnome-1*
.include <bsd.port.pre.mk>
-post-patch:
- @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \
- ${WRKSRC}/gnomevfs/Makefile.in
-
.if !defined(NOPORTDOCS)
post-install:
${MKDIR} ${EG_DST_DIR}
diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo
index ca2f9bdae19b..2449a56ac706 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-2.12.4.tar.bz2) = 94347f1bff86ffcce76111fa8dac1efc
-SHA256 (gnome2/gnome-python-2.12.4.tar.bz2) = 721268f92c0dc0a2a2480779e16545d05846090c469976c0913560beb7d8645e
-SIZE (gnome2/gnome-python-2.12.4.tar.bz2) = 377341
+MD5 (gnome2/gnome-python-2.16.0.tar.bz2) = 65c71b08cdae600bf8cc31597682d595
+SHA256 (gnome2/gnome-python-2.16.0.tar.bz2) = 3a7dde776d7c0699f5a485b98dcadddde4bc8d4d39b23f8434616eb1bdcfdc7d
+SIZE (gnome2/gnome-python-2.16.0.tar.bz2) = 401399
diff --git a/x11-toolkits/py-gnome2/files/patch-configure b/x11-toolkits/py-gnome2/files/patch-configure
index af6b9c5e0154..94ede93f47f4 100644
--- a/x11-toolkits/py-gnome2/files/patch-configure
+++ b/x11-toolkits/py-gnome2/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig Tue Mar 14 08:23:11 2006
-+++ configure Tue Mar 14 08:24:01 2006
-@@ -21329,7 +21329,7 @@ if $build_pyvfsmodule; then
- echo "$as_me:$LINENO: checking for libraries required to embed python" >&5
- echo $ECHO_N "checking for libraries required to embed python... $ECHO_C" >&6
- py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
--PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}"
-+PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION} ${PTHREAD_LIBS}"
+--- configure.orig Tue Aug 22 00:47:05 2006
++++ configure Tue Aug 22 00:47:29 2006
+@@ -19036,7 +19036,7 @@ PYTHON_LIB_DEPS=`$PYTHON -c "from distut
save_LIBS="$LIBS"
- LIBS="$LIBS $PYTHON_LIBS"
+
+-PYTHON_EMBED_LIBS="-L${py_prefix}/lib/ ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}"
++PYTHON_EMBED_LIBS="-L${py_prefix}/lib/ ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION} ${PTHREAD_LIBS}"
+
+ LIBS="$LIBS $PYTHON_EMBED_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
diff --git a/x11-toolkits/py-gnome2/files/patch-gnomevfs_Makefile.in b/x11-toolkits/py-gnome2/files/patch-gnomevfs_Makefile.in
deleted file mode 100644
index 40844f935796..000000000000
--- a/x11-toolkits/py-gnome2/files/patch-gnomevfs_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnomevfs/Makefile.in.orig Sat Sep 3 15:51:39 2005
-+++ gnomevfs/Makefile.in Sat Sep 3 15:52:19 2005
-@@ -276,7 +276,7 @@
-
- gpincdir = $(includedir)/gnome-python-2.0
- gpinc_HEADERS = pygnomevfs.h
--vfsmethoddir = $(libdir)/gnome-vfs-2.0/modules
-+vfsmethoddir = %%X11BASE%%/lib/gnome-vfs-2.0/modules
- @BUILD_PYVFSMODULE_FALSE@vfsmethod_LTLIBRARIES =
- @BUILD_PYVFSMODULE_TRUE@vfsmethod_LTLIBRARIES = libpythonmethod.la
- libpythonmethod_la_CFLAGS = $(GNOME_VFS_MODULE_CFLAGS) -DGNOME_VFS_PYTHON_DIR="\"$(vfsmethoddir)\""
diff --git a/x11-toolkits/py-gnome2/pkg-plist b/x11-toolkits/py-gnome2/pkg-plist
index 957118502fcb..69b886286d63 100644
--- a/x11-toolkits/py-gnome2/pkg-plist
+++ b/x11-toolkits/py-gnome2/pkg-plist
@@ -1,4 +1,7 @@
include/gnome-python-2.0/pygnomevfs.h
+include/gnome-python-2.0/pygnomevfsbonobo.h
+lib/gnome-vfs-2.0/modules/libpythonmethod.la
+lib/gnome-vfs-2.0/modules/libpythonmethod.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/__init__.pyo
@@ -25,8 +28,13 @@ include/gnome-python-2.0/pygnomevfs.h
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/vfs.pyo
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomecanvas.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomecanvas.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/_gnomevfs.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/_gnomevfs.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/gnomevfsbonobo.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/gnomevfsbonobo.so
libdata/pkgconfig/gnome-python-2.0.pc
%%PORTDOCS%%share/examples/py-gnome/bonobo/bonobo-application.py
%%PORTDOCS%%share/examples/py-gnome/bonobo/bonoboui/Bonobo_Sample_Hello.xml
@@ -34,6 +42,7 @@ libdata/pkgconfig/gnome-python-2.0.pc
%%PORTDOCS%%share/examples/py-gnome/bonobo/echo/README
%%PORTDOCS%%share/examples/py-gnome/bonobo/echo/echo-client.py
%%PORTDOCS%%share/examples/py-gnome/bonobo/unknown.py
+%%PORTDOCS%%share/examples/py-gnome/bug-buddy-integration.py
%%PORTDOCS%%share/examples/py-gnome/canvas/canvas-curve.py
%%PORTDOCS%%share/examples/py-gnome/canvas/canvas-example.py
%%PORTDOCS%%share/examples/py-gnome/gconf/basic-gconf-app.py
@@ -73,9 +82,7 @@ share/pygtk/2.0/defs/ui.defs
%%PORTDOCS%%@dirrm share/examples/py-gnome/bonobo/bonoboui
%%PORTDOCS%%@dirrm share/examples/py-gnome/bonobo
%%PORTDOCS%%@dirrm share/examples/py-gnome
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnome
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo
@dirrm include/gnome-python-2.0
-@cwd %%X11BASE%%
-lib/gnome-vfs-2.0/modules/libpythonmethod.la
-lib/gnome-vfs-2.0/modules/libpythonmethod.so
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 2979db884d65..098861892360 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -3,11 +3,11 @@
# Whom: marc@informatik.uni-bremen.de
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.38 2006/04/13 07:52:43 bland Exp $
+# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.49 2006/10/03 20:52:30 ahze Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.8.6
+PORTVERSION= 2.10.2
CATEGORIES= x11-toolkits python
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,10 +19,10 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A set of Python bindings for GTK
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \
- ${PYTHON_SITELIBDIR}/gtk-2.0/gobject.so:${PORTSDIR}/devel/py-gobject
+ ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/_gobject.so:${PORTSDIR}/devel/py-gobject
RUN_DEPENDS= ${PYNUMERIC} \
${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \
- ${PYTHON_SITELIBDIR}/gtk-2.0/gobject.so:${PORTSDIR}/devel/py-gobject
+ ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/_gobject.so:${PORTSDIR}/devel/py-gobject
USE_BZIP2= yes
USE_GMAKE= yes
@@ -32,6 +32,7 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-lintl"
+CONFIGURE_ARGS= --disable-docs
LDFLAGS+= -L${LOCALBASE}/lib
DOCSDIR= ${PREFIX}/share/doc/py-gtk
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index 28d9eb4c7da4..bad2a99afb8d 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygtk-2.8.6.tar.bz2) = c69c2e5e86a8f21a5773df20e265fc3a
-SHA256 (gnome2/pygtk-2.8.6.tar.bz2) = dee1ec46a43bf624f1ff796903bd2d49e65c1cc8396385f46bf1489817bd6e60
-SIZE (gnome2/pygtk-2.8.6.tar.bz2) = 756885
+MD5 (gnome2/pygtk-2.10.2.tar.bz2) = 743ee3d0cbd9e63a50cdf382c28557da
+SHA256 (gnome2/pygtk-2.10.2.tar.bz2) = 5c77ddba034ea810db357a9ac496e79dcbf5d6ce173860174f29af9836e3b5e7
+SIZE (gnome2/pygtk-2.10.2.tar.bz2) = 1977651
diff --git a/x11-toolkits/py-gtk2/files/patch-Makefile.in b/x11-toolkits/py-gtk2/files/patch-Makefile.in
new file mode 100644
index 000000000000..b9cedaf23921
--- /dev/null
+++ b/x11-toolkits/py-gtk2/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Tue Sep 5 02:02:53 2006
++++ Makefile.in Tue Sep 5 02:06:11 2006
+@@ -292,7 +292,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = 1.7
+ @BUILD_GTK_TRUE@GTK_SUBDIR = gtk
+-SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs
++SUBDIRS = codegen . $(GTK_SUBDIR) examples
+ PLATFORM_VERSION = 2.0
+ CLEANFILES = atk.c pango.c pangocairo.c
+ EXTRA_DIST = \
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index ec1c7df6c566..2c6e6c9735e4 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -64,6 +64,9 @@ lib/pygtk/2.0/demos/panes.pyo
lib/pygtk/2.0/demos/pixbufs.py
lib/pygtk/2.0/demos/pixbufs.pyc
lib/pygtk/2.0/demos/pixbufs.pyo
+lib/pygtk/2.0/demos/print_editor.py
+lib/pygtk/2.0/demos/print_editor.pyc
+lib/pygtk/2.0/demos/print_editor.pyo
lib/pygtk/2.0/demos/sizegroup.py
lib/pygtk/2.0/demos/sizegroup.pyc
lib/pygtk/2.0/demos/sizegroup.pyo
@@ -92,14 +95,22 @@ lib/pygtk/2.0/pygtk-demo.pyo
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.pyo
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_gtk.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_gtk.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_lazyutils.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_lazyutils.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_lazyutils.pyo
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/compat.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/compat.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/compat.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/deprecation.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/deprecation.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/deprecation.pyo
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/glade.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/glade.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkunixprint.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkunixprint.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/pango.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/pango.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/pangocairo.la
@@ -117,12 +128,14 @@ libdata/pkgconfig/pygtk-2.0.pc
%%PORTDOCS%%%%EXAMPLESDIR%%/glade/glade-demo.py
%%PORTDOCS%%%%EXAMPLESDIR%%/glade/test.glade
%%PORTDOCS%%%%EXAMPLESDIR%%/glade/test2.glade
+%%PORTDOCS%%%%EXAMPLESDIR%%/gobject/editable-interface.py
%%PORTDOCS%%%%EXAMPLESDIR%%/gobject/properties.py
%%PORTDOCS%%%%EXAMPLESDIR%%/gobject/signal.py
%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/bin.py
%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/filechooser.py
%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/scrollable.py
%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/sizegroup.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/testprint.py
%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/uimanager.py
%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/widget.py
%%PORTDOCS%%%%EXAMPLESDIR%%/ide/README
@@ -173,6 +186,7 @@ libdata/pkgconfig/pygtk-2.0.pc
%%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/menu.py
%%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/panes.py
%%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/pixbufs.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/print_editor.py
%%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/sizegroup.py
%%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/stock_browser.py
%%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/textview.py
@@ -230,11 +244,18 @@ share/pygtk/2.0/codegen/scmexpr.pyc
share/pygtk/2.0/codegen/scmexpr.pyo
share/pygtk/2.0/defs/atk-types.defs
share/pygtk/2.0/defs/atk.defs
+share/pygtk/2.0/defs/gdk-2.10.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
share/pygtk/2.0/defs/gdk.defs
-share/pygtk/2.0/defs/gtk-extrafuncs.defs
+share/pygtk/2.0/defs/gtk-2.10-types.defs
+share/pygtk/2.0/defs/gtk-2.10.defs
+share/pygtk/2.0/defs/gtk-base-types.defs
+share/pygtk/2.0/defs/gtk-base.defs
share/pygtk/2.0/defs/gtk-types.defs
share/pygtk/2.0/defs/gtk.defs
+share/pygtk/2.0/defs/gtkunixprint.defs
share/pygtk/2.0/defs/libglade.defs
share/pygtk/2.0/defs/pango-types.defs
share/pygtk/2.0/defs/pango.defs
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 664b8ae86d5c..68b2629a6eb8 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/vte/Makefile,v 1.49 2006/04/27 01:40:22 ahze Exp $
+# $MCom: ports/x11-toolkits/vte/Makefile,v 1.61 2006/10/03 12:33:40 ahze Exp $
#
PORTNAME= vte
-PORTVERSION= 0.12.2
+PORTVERSION= 0.14.1
PORTREVISION?= 0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -23,8 +23,8 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= yes
-USE_X_PREFIX= yes
-INSTALLS_SHLIB= yes
+USE_XLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack gtk20 ltverhack referencehack
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index 8decc2692298..47f0d6ce9176 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vte-0.12.2.tar.bz2) = 7cb1bd6ca528bc4db5ec685549fd3eb1
-SHA256 (gnome2/vte-0.12.2.tar.bz2) = 41d22c945960feb1a924f58d2d237db2fbd1920cc48768ae0b4ac762245fcffb
-SIZE (gnome2/vte-0.12.2.tar.bz2) = 974551
+MD5 (gnome2/vte-0.14.1.tar.bz2) = 98ea2513b773b44cb7f8d75dc1aa312e
+SHA256 (gnome2/vte-0.14.1.tar.bz2) = 001b252018522a9dab890503a57949bd905d105dd317a2deca0e62f8cd16d6be
+SIZE (gnome2/vte-0.14.1.tar.bz2) = 1008999
diff --git a/x11-toolkits/vte/files/patch-07_set_backspace_to_utf8 b/x11-toolkits/vte/files/patch-07_set_backspace_to_utf8
deleted file mode 100644
index cf1d41e6b7d7..000000000000
--- a/x11-toolkits/vte/files/patch-07_set_backspace_to_utf8
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/vte.c.orig 2004-12-20 00:57:39 -0800
-+++ src/vte.c 2004-12-20 00:57:44 -0800
-@@ -7125,7 +7125,11 @@
- break;
- default:
- if (pid != 0) {
-+ char *codeset;
- terminal->pvt->pty_master = i;
-+ g_get_charset(&codeset);
-+ _vte_pty_set_utf8(terminal->pvt->pty_master,
-+ (strcmp(codeset, "UTF-8") == 0));
- }
- }
-
diff --git a/x11-toolkits/vte/files/patch-config.h.in b/x11-toolkits/vte/files/patch-config.h.in
new file mode 100644
index 000000000000..03db0e1c47c3
--- /dev/null
+++ b/x11-toolkits/vte/files/patch-config.h.in
@@ -0,0 +1,12 @@
+--- config.h.in.orig Wed May 17 10:45:57 2006
++++ config.h.in Wed May 17 10:46:25 2006
+@@ -106,6 +106,9 @@
+ /* Define to 1 if you have the <GL/glx.h> header file. */
+ #undef HAVE_GL_GLX_H
+
++/* Define to 1 if you have the `posix_openpt' function. */
++#undef HAVE_POSIX_OPENPT
++
+ /* Define to 1 if you have the `grantpt' function. */
+ #undef HAVE_GRANTPT
+
diff --git a/x11-toolkits/vte/files/patch-configure b/x11-toolkits/vte/files/patch-configure
index 424e74a57917..7cddbbd44395 100644
--- a/x11-toolkits/vte/files/patch-configure
+++ b/x11-toolkits/vte/files/patch-configure
@@ -1,17 +1,6 @@
---- configure.orig Tue Aug 23 20:29:13 2005
-+++ configure Tue Aug 23 20:30:09 2005
-@@ -26765,10 +26765,6 @@
- rm -f conftest*
-
-
--cat >>confdefs.h <<\_ACEOF
--#define _XOPEN_SOURCE_EXTENDED 1
--_ACEOF
--
-
- cat >>confdefs.h <<\_ACEOF
- #define _XOPEN_SOURCE 1
-@@ -27067,7 +27063,7 @@
+--- configure.orig Tue Oct 3 08:23:12 2006
++++ configure Tue Oct 3 08:23:12 2006
+@@ -26464,7 +26464,7 @@
@@ -20,12 +9,3 @@
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -29400,7 +29396,7 @@
-
-
- cat >>confdefs.h <<_ACEOF
--#define LOCALEDIR "$mydatadir/locale"
-+#define LOCALEDIR "$prefix/share/locale"
- _ACEOF
-
-
diff --git a/x11-toolkits/vte/files/patch-src_vteseq.c b/x11-toolkits/vte/files/patch-src_vteseq.c
new file mode 100644
index 000000000000..e5afb288b0d8
--- /dev/null
+++ b/x11-toolkits/vte/files/patch-src_vteseq.c
@@ -0,0 +1,10 @@
+--- src/vteseq.c.orig Mon Jun 12 20:27:00 2006
++++ src/vteseq.c Mon Jun 12 20:27:19 2006
+@@ -20,6 +20,7 @@
+ #include "../config.h"
+
+ #ifdef HAVE_SYS_SYSLIMITS_H
++#include <sys/cdefs.h>
+ #include <sys/syslimits.h>
+ #endif
+
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index 6e7e79e3d677..c36847f1f528 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -6,7 +6,7 @@ include/vte/vteaccess.h
lib/libvte.a
lib/libvte.la
lib/libvte.so
-lib/libvte.so.4
+lib/libvte.so.9
lib/vte/decset
lib/vte/interpret
lib/vte/iso8859mode
@@ -27,6 +27,7 @@ share/locale/az/LC_MESSAGES/vte.mo
share/locale/be/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/cs/LC_MESSAGES/vte.mo
@@ -66,12 +67,12 @@ 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/nl/LC_MESSAGES/vte.mo
share/locale/nn/LC_MESSAGES/vte.mo
-share/locale/no/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
@@ -97,19 +98,67 @@ 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
+@dirrm share/gnome/vte/termcap
+@dirrm share/gnome/vte
+@dirrm lib/vte
+@dirrm include/vte
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
@dirrmtry share/locale/ang/LC_MESSAGES
@dirrmtry share/locale/ang
-@dirrm share/gnome/vte/termcap
-@dirrm share/gnome/vte
-@dirrm lib/vte
-@dirrm include/vte
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 1148f3895d3e..837f3b952200 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -3,11 +3,11 @@
# Whom: Garrett Rooney <rooneg@electricjellyfish.net>
#
# $FreeBSD$
-# $MCom: ports/x11-wm/metacity/Makefile,v 1.78 2006/04/15 01:51:15 mezz Exp $
+# $MCom: ports/x11-wm/metacity/Makefile,v 1.92 2006/10/03 13:39:50 ahze Exp $
#
PORTNAME= metacity
-PORTVERSION= 2.14.5
+PORTVERSION= 2.16.3
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,12 +20,12 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
CONFLICTS= expocity-[0-9]*
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix intlhack gnomehack gconf2
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-render
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index 55821484c0c0..e065c990963b 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/metacity-2.14.5.tar.bz2) = a14c4a07e456a2590452d6c9db2e5153
-SHA256 (gnome2/metacity-2.14.5.tar.bz2) = 5b0fb8c9ca34493bb7922e28d81706df8d628b3ea0f83e34c4d1f967409a0ed2
-SIZE (gnome2/metacity-2.14.5.tar.bz2) = 1851552
+MD5 (gnome2/metacity-2.16.3.tar.bz2) = 95bdf58d175284217132a12a353fe7ec
+SHA256 (gnome2/metacity-2.16.3.tar.bz2) = 3405b2d80c43e532dc6303652e1de182ce2b65001a56c61fc837b7cd04522153
+SIZE (gnome2/metacity-2.16.3.tar.bz2) = 1833738
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index f4fe0ff022bb..32f737f0cff2 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -2,6 +2,7 @@ bin/metacity
bin/metacity-message
bin/metacity-theme-viewer
bin/metacity-window-demo
+include/metacity-1/metacity-private/boxes.h
include/metacity-1/metacity-private/common.h
include/metacity-1/metacity-private/gradient.h
include/metacity-1/metacity-private/preview-widget.h
@@ -110,7 +111,7 @@ share/locale/az/LC_MESSAGES/metacity.mo
share/locale/be/LC_MESSAGES/metacity.mo
share/locale/bg/LC_MESSAGES/metacity.mo
share/locale/bn/LC_MESSAGES/metacity.mo
-share/locale/br/LC_MESSAGES/metacity.mo
+share/locale/bn_IN/LC_MESSAGES/metacity.mo
share/locale/bs/LC_MESSAGES/metacity.mo
share/locale/ca/LC_MESSAGES/metacity.mo
share/locale/cs/LC_MESSAGES/metacity.mo
@@ -144,15 +145,16 @@ share/locale/ko/LC_MESSAGES/metacity.mo
share/locale/ku/LC_MESSAGES/metacity.mo
share/locale/lt/LC_MESSAGES/metacity.mo
share/locale/lv/LC_MESSAGES/metacity.mo
+share/locale/mg/LC_MESSAGES/metacity.mo
share/locale/mk/LC_MESSAGES/metacity.mo
share/locale/ml/LC_MESSAGES/metacity.mo
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/ne/LC_MESSAGES/metacity.mo
share/locale/nl/LC_MESSAGES/metacity.mo
share/locale/nn/LC_MESSAGES/metacity.mo
-share/locale/no/LC_MESSAGES/metacity.mo
share/locale/or/LC_MESSAGES/metacity.mo
share/locale/pa/LC_MESSAGES/metacity.mo
share/locale/pl/LC_MESSAGES/metacity.mo
@@ -178,10 +180,6 @@ share/locale/xh/LC_MESSAGES/metacity.mo
share/locale/zh_CN/LC_MESSAGES/metacity.mo
share/locale/zh_HK/LC_MESSAGES/metacity.mo
share/locale/zh_TW/LC_MESSAGES/metacity.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
@dirrm share/gnome/themes/Simple/metacity-1
@dirrm share/gnome/themes/Simple
@dirrm share/gnome/themes/Metabox/metacity-1
@@ -200,3 +198,59 @@ share/locale/zh_TW/LC_MESSAGES/metacity.mo
@dirrm share/gnome/metacity
@dirrm include/metacity-1/metacity-private
@dirrm include/metacity-1
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index 2f2cd7e375af..30b15e42f286 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -3,10 +3,10 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.12 2006/04/13 07:52:39 bland Exp $
+# $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.17 2006/09/04 22:53:22 ahze Exp $
PORTNAME= fast-user-switch-applet
-PORTVERSION= 2.14.2
+PORTVERSION= 2.16.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,15 +16,15 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Fast user switching applet for GNOME
USE_BZIP2= yes
+USE_XLIB= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomeprefix gtk20 gnomepanel
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-gdm-config=${X11BASE}/etc/gdm/custom.conf \
- --with-gdm-setup=${X11BASE}/sbin/gdmsetup
+CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
+ --with-gdm-setup=${LOCALBASE}/sbin/gdmsetup
GCONF_SCHEMAS= fast-user-switch-applet.schemas
INSTALLS_OMF= yes
diff --git a/x11/fast-user-switch-applet/distinfo b/x11/fast-user-switch-applet/distinfo
index 6700540de7cc..9796fd97478b 100644
--- a/x11/fast-user-switch-applet/distinfo
+++ b/x11/fast-user-switch-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/fast-user-switch-applet-2.14.2.tar.bz2) = 590e51fbc9dfa7e33a337d36349cf040
-SHA256 (gnome2/fast-user-switch-applet-2.14.2.tar.bz2) = 1e5b7e2ebeb54b828f00dc3e6e6387ea10d3b47df6c73f7c722b26cf3fcf147f
-SIZE (gnome2/fast-user-switch-applet-2.14.2.tar.bz2) = 497832
+MD5 (gnome2/fast-user-switch-applet-2.16.0.tar.bz2) = 749de0f0279991515ca8d82526f5b329
+SHA256 (gnome2/fast-user-switch-applet-2.16.0.tar.bz2) = 64a7d04867ff03f436cd06177a9d86e19f606f84cc42f108cb50298a05af3118
+SIZE (gnome2/fast-user-switch-applet-2.16.0.tar.bz2) = 682627
diff --git a/x11/fast-user-switch-applet/pkg-plist b/x11/fast-user-switch-applet/pkg-plist
index 18e11f0e114b..95d22b4c7de2 100644
--- a/x11/fast-user-switch-applet/pkg-plist
+++ b/x11/fast-user-switch-applet/pkg-plist
@@ -31,11 +31,21 @@ share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-pref
share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-text.png
share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-username.png
share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet.png
+share/gnome/help/fast-user-switch-applet/sv/fast-user-switch-applet.xml
+share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-context.png
+share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-icon.png
+share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-prefs.png
+share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-text.png
+share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-username.png
+share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet.png
share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-C.omf
share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-es.omf
share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-pa.omf
share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-sr.omf
+share/gnome/omf/fast-user-switch-applet/fast-user-switch-applet-sv.omf
share/locale/bg/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/bn/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/bn_IN/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/ca/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/cs/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/cy/LC_MESSAGES/fast-user-switch-applet.mo
@@ -47,6 +57,8 @@ share/locale/en_CA/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/en_GB/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/es/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/et/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/eu/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/fa/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/fi/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/fr/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/gl/LC_MESSAGES/fast-user-switch-applet.mo
@@ -54,33 +66,44 @@ share/locale/gu/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/he/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/hi/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/hu/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/id/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/it/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/ja/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/ka/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/ko/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/lt/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/lv/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/mg/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/mk/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/ml/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/mn/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/mr/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/nb/LC_MESSAGES/fast-user-switch-applet.mo
-share/locale/no/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/ne/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/nl/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/or/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/pa/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/pl/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/pt/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/pt_BR/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/ru/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/sk/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/sl/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/sq/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/sr/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/sr@Latn/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/sv/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/ta/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/th/LC_MESSAGES/fast-user-switch-applet.mo
+share/locale/tr/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/uk/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/vi/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/zh_CN/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/zh_HK/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/zh_TW/LC_MESSAGES/fast-user-switch-applet.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
@dirrm share/gnome/omf/fast-user-switch-applet
+@dirrm share/gnome/help/fast-user-switch-applet/sv/figures
+@dirrm share/gnome/help/fast-user-switch-applet/sv
@dirrm share/gnome/help/fast-user-switch-applet/sr/figures
@dirrm share/gnome/help/fast-user-switch-applet/sr
@dirrm share/gnome/help/fast-user-switch-applet/pa/figures
@@ -91,3 +114,43 @@ share/locale/zh_TW/LC_MESSAGES/fast-user-switch-applet.mo
@dirrm share/gnome/help/fast-user-switch-applet/C
@dirrm share/gnome/help/fast-user-switch-applet
@dirrm share/gnome/fast-user-switch-applet
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index f7da1363d1a5..452caddc59c6 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gdm/Makefile,v 1.29 2006/04/26 19:40:44 marcus Exp $
+# $MCom: ports/x11/gdm/Makefile,v 1.44 2006/10/03 13:36:08 ahze Exp $
#
PORTNAME= gdm
-PORTVERSION= 2.14.10
+PORTVERSION= 2.16.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,7 +21,8 @@ RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_LDCONFIG= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_RC_SUBR= gdm
@@ -29,6 +30,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
gnomeprefix
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --mandir=${PREFIX}/man
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
GTKDOC="false"
@@ -69,6 +71,8 @@ post-patch:
@${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
.endfor
.endif
+ @${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \
+ ${WRKSRC}/config/Makefile.in
post-install:
.if !defined(PACKAGE_BUILDING)
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index ddbe619f9c7a..f94608cd9c4e 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.14.10.tar.bz2) = e880558dc3574f804f3abca869992a4f
-SHA256 (gnome2/gdm-2.14.10.tar.bz2) = b6c173e9e60b85fed57951b17f3d518058c3ec63cec7118a83be016bb789fbdd
-SIZE (gnome2/gdm-2.14.10.tar.bz2) = 3050140
+MD5 (gnome2/gdm-2.16.1.tar.bz2) = a0bf247fdaf32add6d5a69495a433bbf
+SHA256 (gnome2/gdm-2.16.1.tar.bz2) = 9733a12aacf6995dc630daf108c357c5d906fdda30de05cd9b5c26a83cf3d5f6
+SIZE (gnome2/gdm-2.16.1.tar.bz2) = 3130299
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index 1b9d3e640ade..6a680efd2c2d 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
#!/bin/sh
# $FreeBSD$
-# $MCom: ports/x11/gdm/files/gdm.in,v 1.5 2006/03/06 19:02:27 marcus Exp $
+# $MCom: ports/x11/gdm/files/gdm.in,v 1.8 2006/10/10 20:22:24 mezz Exp $
# PROVIDE: gdm
# REQUIRE: LOGIN cleanvar moused
diff --git a/x11/gdm/files/patch-config_Makefile.in b/x11/gdm/files/patch-config_Makefile.in
deleted file mode 100644
index a665e989a48c..000000000000
--- a/x11/gdm/files/patch-config_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/Makefile.in.orig Sat May 27 07:38:47 2006
-+++ config/Makefile.in Sat May 27 07:50:28 2006
-@@ -681,7 +681,7 @@ install-data-hook: gdm.conf gdm.conf-cus
- if test '!' -d $(DESTDIR)$(logdir); then \
- $(mkinstalldirs) $(DESTDIR)$(logdir); \
- chmod 755 $(DESTDIR)$(logdir); \
-- chown root:root $(DESTDIR)$(logdir) || : ; \
-+ chown root:wheel $(DESTDIR)$(logdir) || : ; \
- fi
-
- if test '!' -d $(DESTDIR)$(authdir); then \
diff --git a/x11/gdm/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias
index a7706b4d4e55..8de8f08b0e29 100644
--- a/x11/gdm/files/patch-config_locale.alias
+++ b/x11/gdm/files/patch-config_locale.alias
@@ -155,6 +155,6 @@
+Slovak sk_SK.UTF-8,sk_SK.ISO8859-2
+Slovenian sl_SI.UTF-8,sl_SI.ISO8859-2
+Spanish es_ES.UTF-8,es_ES.ISO8859-15,es_ES.ISO8859-1
-+Swedish sv_SE.UTF-8,sv_SE.ISO8859-1
++Swedish sv_SV.UTF-8,sv_SE.ISO8859-1
+Turkish tr_TR.UTF-8,tr_TR.ISO8859-9
+Ukrainian uk_UA.UTF-8,uk_UA.ISO8859-5
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 7288ec2f5d69..4e5008b5047a 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -87,9 +87,6 @@ share/gnome/help/gdm/ja/legal.xml
share/gnome/help/gdm/ko/figures/gdm_window.png
share/gnome/help/gdm/ko/gdm.xml
share/gnome/help/gdm/ko/legal.xml
-share/gnome/help/gdm/sv/figures/gdm_window.png
-share/gnome/help/gdm/sv/gdm.xml
-share/gnome/help/gdm/sv/legal.xml
share/gnome/help/gdm/uk/gdm.xml
share/gnome/help/gdm/uk/legal.xml
share/gnome/help/gdm/zh_CN/figures/gdm_window.png
@@ -108,7 +105,6 @@ share/gnome/omf/gdm/gdm-fr.omf
share/gnome/omf/gdm/gdm-it.omf
share/gnome/omf/gdm/gdm-ja.omf
share/gnome/omf/gdm/gdm-ko.omf
-share/gnome/omf/gdm/gdm-sv.omf
share/gnome/omf/gdm/gdm-uk.omf
share/gnome/omf/gdm/gdm-zh_CN.omf
share/gnome/omf/gdm/gdm-zh_HK.omf
@@ -155,6 +151,7 @@ share/locale/az/LC_MESSAGES/gdm.mo
share/locale/be/LC_MESSAGES/gdm.mo
share/locale/bg/LC_MESSAGES/gdm.mo
share/locale/bn/LC_MESSAGES/gdm.mo
+share/locale/bn_IN/LC_MESSAGES/gdm.mo
share/locale/bs/LC_MESSAGES/gdm.mo
share/locale/ca/LC_MESSAGES/gdm.mo
share/locale/cs/LC_MESSAGES/gdm.mo
@@ -178,6 +175,7 @@ share/locale/he/LC_MESSAGES/gdm.mo
share/locale/hi/LC_MESSAGES/gdm.mo
share/locale/hr/LC_MESSAGES/gdm.mo
share/locale/hu/LC_MESSAGES/gdm.mo
+share/locale/hy/LC_MESSAGES/gdm.mo
share/locale/id/LC_MESSAGES/gdm.mo
share/locale/is/LC_MESSAGES/gdm.mo
share/locale/it/LC_MESSAGES/gdm.mo
@@ -187,6 +185,7 @@ share/locale/ko/LC_MESSAGES/gdm.mo
share/locale/ku/LC_MESSAGES/gdm.mo
share/locale/lt/LC_MESSAGES/gdm.mo
share/locale/lv/LC_MESSAGES/gdm.mo
+share/locale/mg/LC_MESSAGES/gdm.mo
share/locale/mi/LC_MESSAGES/gdm.mo
share/locale/mk/LC_MESSAGES/gdm.mo
share/locale/ml/LC_MESSAGES/gdm.mo
@@ -198,6 +197,7 @@ share/locale/ne/LC_MESSAGES/gdm.mo
share/locale/nl/LC_MESSAGES/gdm.mo
share/locale/nn/LC_MESSAGES/gdm.mo
share/locale/nso/LC_MESSAGES/gdm.mo
+share/locale/or/LC_MESSAGES/gdm.mo
share/locale/pa/LC_MESSAGES/gdm.mo
share/locale/pl/LC_MESSAGES/gdm.mo
share/locale/pt/LC_MESSAGES/gdm.mo
@@ -205,6 +205,7 @@ share/locale/pt_BR/LC_MESSAGES/gdm.mo
share/locale/ro/LC_MESSAGES/gdm.mo
share/locale/ru/LC_MESSAGES/gdm.mo
share/locale/rw/LC_MESSAGES/gdm.mo
+share/locale/si/LC_MESSAGES/gdm.mo
share/locale/sk/LC_MESSAGES/gdm.mo
share/locale/sl/LC_MESSAGES/gdm.mo
share/locale/sq/LC_MESSAGES/gdm.mo
@@ -222,22 +223,6 @@ share/locale/zh_CN/LC_MESSAGES/gdm.mo
share/locale/zh_HK/LC_MESSAGES/gdm.mo
share/locale/zh_TW/LC_MESSAGES/gdm.mo
share/locale/zu/LC_MESSAGES/gdm.mo
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mi/LC_MESSAGES
-@dirrmtry share/locale/mi
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
@dirrm share/gnome/xsessions
@dirrm share/gnome/pixmaps/faces
@dirrm share/gnome/omf/gdm
@@ -248,8 +233,6 @@ share/locale/zu/LC_MESSAGES/gdm.mo
@dirrm share/gnome/help/gdm/zh_CN/figures
@dirrm share/gnome/help/gdm/zh_CN
@dirrm share/gnome/help/gdm/uk
-@dirrm share/gnome/help/gdm/sv/figures
-@dirrm share/gnome/help/gdm/sv
@dirrm share/gnome/help/gdm/ko/figures
@dirrm share/gnome/help/gdm/ko
@dirrm share/gnome/help/gdm/ja/figures
@@ -285,3 +268,65 @@ share/locale/zu/LC_MESSAGES/gdm.mo
@dirrmtry share/gnome/log
@unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
@unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 8dd7d5f2a72d..c658d8fe2cd3 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,44 +3,48 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/x11/gnome-applets/Makefile,v 1.141 2006/10/08 02:12:50 marcus Exp $
#
PORTNAME= gnome-applets
-PORTVERSION= 2.14.2
-PORTREVISION= 1
+PORTVERSION= 2.16.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Applets components for the Gnome 2 Desktop Environment
+COMMENT= Applets components for the GNOME 2 Desktop Environment
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-system-tools.pc:${PORTSDIR}/sysutils/gnome-system-tools
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnome-system-tools \
+ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \
- xklavier.10:${PORTSDIR}/x11/libxklavier \
- gucharmap.4:${PORTSDIR}/deskutils/gucharmap
-RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnome-system-tools
+ xklavier.11:${PORTSDIR}/x11/libxklavier \
+ gucharmap.5:${PORTSDIR}/deskutils/gucharmap
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnome-system-tools \
+ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \
gail gnomedocutils
+WANT_GNOME= yes
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gstreamer=0.10
+CONFIGURE_ARGS= --with-gstreamer=0.10 \
+ --enable-stickynotes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
FREEBSD_SYS=${FREEBSD_SYS}
GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas \
- gswitchit.schemas gtik.schemas gweather.schemas \
+ gswitchit.schemas gweather.schemas \
mixer.schemas multiload.schemas \
stickynotes.schemas
@@ -48,10 +52,15 @@ OPTIONS= MINI_COMMANDER "Enable mini-commander applet" off
FREEBSD_SYS?= /usr/src/sys
+.if defined(PACKAGE_BUILDING)
+.undef WITHOUT_GNOME
+WITH_GNOME= yes
+.endif
+
.include <bsd.port.pre.mk>
.if exists(${LOCALBASE}/libdata/pkgconfig/libnotify.pc) || \
- defined(WITH_NOTIFY)
+ !defined(WITHOUT_LIBNOTIFY)
LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify
.endif
@@ -78,8 +87,23 @@ PLIST_SUB+= COMMANDER=""
PLIST_SUB+= COMMANDER="@comment "
.endif
+.if ( exists(${pygnomedesktop_DETECT}) && exists(${pygnomeextras_DETECT}) ) || \
+ ( ( ${HAVE_GNOME:Mpygnomedesktop}!="" && \
+ ${HAVE_GNOME:Mpygnomeextras}!="" ) && ${ARCH}!="sparc64" )
+USE_PYTHON= yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+USE_GNOME+= pygnomedesktop pygnomeextras
+PLIST_SUB+= PYTHON=""
+.else
+PLIST_SUB+= PYTHON="@comment "
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
${WRKSRC}/libgweather/weather-met.c
+.if !defined(USE_PYTHON)
+ @${REINPLACE_CMD} -e 's|HAVE_PYGTK="yes"|HAVE_PYGTK="no"|' \
+ ${WRKSRC}/configure
+.endif
.include <bsd.port.post.mk>
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 271f8ddad68a..ddfe5f865d50 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.14.2.tar.bz2) = e6da539e78da1256b9a9bee1301fd44f
-SHA256 (gnome2/gnome-applets-2.14.2.tar.bz2) = 4bdd52b47649cfa6dc5d065201124ae02d3da593531cd0defa1a9cf7a761f1df
-SIZE (gnome2/gnome-applets-2.14.2.tar.bz2) = 6601120
+MD5 (gnome2/gnome-applets-2.16.1.tar.bz2) = 0ceb0411c86304be2661bd4072662ecb
+SHA256 (gnome2/gnome-applets-2.16.1.tar.bz2) = a4d30677f946a770dc7fec2022b95fef2e3823aa1b82bee36d36f7390734fd85
+SIZE (gnome2/gnome-applets-2.16.1.tar.bz2) = 6888716
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index df27577202ce..2e1c62bde21d 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Sat May 6 14:08:13 2006
-+++ configure Sat May 6 14:13:34 2006
-@@ -23361,8 +23361,7 @@ _ACEOF
+--- configure.orig Wed Jul 26 16:38:04 2006
++++ configure Wed Jul 26 16:38:04 2006
+@@ -24860,8 +24860,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -10,7 +10,7 @@
GNOMELOCALEDIR="$ac_define_dir"
-@@ -25392,8 +25391,8 @@ fi
+@@ -27066,8 +27065,8 @@
;;
# list of supported OS cores that do not use libapm
@@ -21,16 +21,7 @@
ACPIINC="-I${OS_SYS}"
else
ACPIINC="-I/usr/src/sys"
-@@ -26469,7 +26468,7 @@ else
- fi
-
-
--if test "x$SU_TOOL" == "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then
-+if test "x$SU_TOOL" = "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then
- { echo "$as_me:$LINENO: WARNING: *** modemlights applet will not be built ***" >&5
- echo "$as_me: WARNING: *** modemlights applet will not be built ***" >&2;}
- else
-@@ -26633,6 +26632,9 @@ if test x$disable_cpufreq = xno; then
+@@ -28145,6 +28144,9 @@
*linux*)
build_cpufreq_applet=yes
;;
@@ -40,7 +31,7 @@
*)
{ echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5
echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;}
-@@ -27109,7 +27111,7 @@ fi
+@@ -28752,7 +28754,7 @@
ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
@@ -49,7 +40,7 @@
pixmapsdir="${datadir}/pixmaps"
-@@ -27123,8 +27125,7 @@ gladedir="${pkgdatadir}/glade"
+@@ -28764,8 +28766,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -59,7 +50,7 @@
GNOME_ICONDIR="$ac_define_dir"
-@@ -27136,8 +27137,7 @@ _ACEOF
+@@ -28777,8 +28778,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -69,7 +60,7 @@
GNOME_PIXMAPSDIR="$ac_define_dir"
-@@ -27149,8 +27149,7 @@ _ACEOF
+@@ -28790,8 +28790,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -79,7 +70,7 @@
GNOME_GLADEDIR="$ac_define_dir"
-@@ -27162,8 +27161,7 @@ _ACEOF
+@@ -28803,8 +28802,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -89,7 +80,7 @@
DATADIR="$ac_define_dir"
-@@ -27175,8 +27173,7 @@ _ACEOF
+@@ -28816,8 +28814,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -99,7 +90,7 @@
SYSCONFDIR="$ac_define_dir"
-@@ -27188,8 +27185,7 @@ _ACEOF
+@@ -28829,8 +28826,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -109,7 +100,7 @@
LIBDIR="$ac_define_dir"
-@@ -27201,8 +27197,7 @@ _ACEOF
+@@ -28842,8 +28838,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
diff --git a/x11/gnome-applets/files/patch-cpufreq-freebsd b/x11/gnome-applets/files/patch-cpufreq-freebsd
index 4bed0298db89..53841b6d7346 100644
--- a/x11/gnome-applets/files/patch-cpufreq-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-freebsd
@@ -1,6 +1,117 @@
---- cpufreq/src/cpufreq-monitor-sysctl.h.orig Sun Feb 13 01:00:25 2005
-+++ cpufreq/src/cpufreq-monitor-sysctl.h Sat Feb 12 20:25:21 2005
-@@ -0,0 +1,48 @@
+--- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig Thu Jun 15 01:01:54 2006
++++ cpufreq/src/cpufreq-monitor-cpuinfo.c Sat Jun 17 13:48:19 2006
+@@ -22,6 +22,10 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/sysctl.h>
++#endif /* __FreeBSD__ */
+ #include <string.h>
+ #include <stdio.h>
+
+@@ -59,15 +63,20 @@ cpufreq_monitor_cpuinfo_new (guint cpu)
+ static gboolean
+ cpufreq_monitor_cpuinfo_run (CPUFreqMonitor *monitor)
+ {
++#ifndef __FreeBSD__
+ gchar *file;
+ gchar **lines;
+ gchar *buffer = NULL;
+ gchar *p;
++#else
++ size_t len;
++#endif /* __FreeBSD__ */
+ gint cpu, i;
+ gint cur_freq, max_freq;
+ gchar *governor;
+ GError *error = NULL;
+
++#ifndef __FreeBSD__
+ file = g_strdup ("/proc/cpuinfo");
+ if (!g_file_get_contents (file, &buffer, NULL, &error)) {
+ g_warning (error->message);
+@@ -112,6 +121,12 @@ cpufreq_monitor_cpuinfo_run (CPUFreqMoni
+
+ g_strfreev (lines);
+ g_free (buffer);
++#else
++ len = sizeof (cpu);
++
++ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1)
++ return FALSE;
++#endif /* __FreeBSD__ */
+
+ governor = g_strdup (_("Frequency Scaling Unsupported"));
+ cur_freq = cpu * 1000;
+--- cpufreq/src/cpufreq-applet.c.orig Thu Jun 15 01:01:53 2006
++++ cpufreq/src/cpufreq-applet.c Sat Jun 17 13:42:50 2006
+@@ -17,6 +17,7 @@
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Authors : Carlos García Campos <carlosgc@gnome.org>
++ * Joe Marcus Clarke <marcus@FreeBSD.org>
+ */
+
+ #ifdef HAVE_CONFIG_H
+@@ -519,6 +524,7 @@ cpufreq_applet_about_cb (BonoboUICompone
+ {
+ static const gchar *const authors[] = {
+ "Carlos Garcia Campos <carlosgc@gnome.org>",
++ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)",
+ NULL
+ };
+ static const gchar *const documenters[] = {
+--- cpufreq/src/Makefile.in.orig Sat Jun 17 13:42:50 2006
++++ cpufreq/src/Makefile.in Sat Jun 17 14:03:45 2006
+@@ -62,7 +62,8 @@ am__cpufreq_applet_SOURCES_DIST = cpufre
+ cpufreq-monitor-procfs.h cpufreq-monitor-sysfs.c \
+ cpufreq-monitor-sysfs.h cpufreq-monitor-libcpufreq.c \
+ cpufreq-monitor-libcpufreq.h cpufreq-monitor-cpuinfo.c \
+- cpufreq-monitor-cpuinfo.h
++ cpufreq-monitor-cpuinfo.h cpufreq-monitor-sysctl.c \
++ cpufreq-monitor-sysctl.h
+ @HAVE_LIBCPUFREQ_TRUE@am__objects_1 = \
+ @HAVE_LIBCPUFREQ_TRUE@ cpufreq-monitor-libcpufreq.$(OBJEXT)
+ am_cpufreq_applet_OBJECTS = cpufreq-applet.$(OBJEXT) \
+@@ -71,7 +72,8 @@ am_cpufreq_applet_OBJECTS = cpufreq-appl
+ cpufreq-monitor-factory.$(OBJEXT) \
+ cpufreq-monitor-procfs.$(OBJEXT) \
+ cpufreq-monitor-sysfs.$(OBJEXT) $(am__objects_1) \
+- cpufreq-monitor-cpuinfo.$(OBJEXT)
++ cpufreq-monitor-cpuinfo.$(OBJEXT) \
++ cpufreq-monitor-sysctl.$(OBJEXT)
+ cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
+ am__DEPENDENCIES_1 =
+ cpufreq_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@@ -85,6 +87,7 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \
++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-prefs.Po \
+@@ -397,6 +400,7 @@ cpufreq_applet_SOURCES = \
+ cpufreq-monitor.c cpufreq-monitor.h \
+ cpufreq-monitor-factory.c cpufreq-monitor-factory.h \
+ cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \
++ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \
+ cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \
+ $(cpufreq_files) \
+ cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h
+@@ -482,6 +486,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@
+--- cpufreq/src/cpufreq-monitor-sysctl.h.orig Sat Jun 17 14:05:37 2006
++++ cpufreq/src/cpufreq-monitor-sysctl.h Sat Jun 17 14:14:13 2006
+@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2001, 2002 Free Software Foundation
+ *
@@ -25,6 +136,7 @@
+#define __CPUFREQ_MONITOR_SYSCTL_H__
+
+#include <glib-object.h>
++
+#include "cpufreq-monitor.h"
+
+#define TYPE_CPUFREQ_MONITOR_SYSCTL (cpufreq_monitor_sysctl_get_type ())
@@ -45,13 +157,13 @@
+ CPUFreqMonitorClass parent_class;
+};
+
-+GType cpufreq_monitor_sysctl_get_type ();
++GType cpufreq_monitor_sysctl_get_type (void) G_GNUC_CONST;
+CPUFreqMonitor *cpufreq_monitor_sysctl_new (guint cpu);
+
+#endif /* __CPUFREQ_MONITOR_SYSCTL_H__ */
---- cpufreq/src/cpufreq-monitor-sysctl.c.orig Sun Feb 13 03:52:42 2005
-+++ cpufreq/src/cpufreq-monitor-sysctl.c Mon Feb 14 00:42:07 2005
-@@ -0,0 +1,269 @@
+--- cpufreq/src/cpufreq-monitor-sysctl.c.orig Sat Jun 17 14:15:55 2006
++++ cpufreq/src/cpufreq-monitor-sysctl.c Sat Jun 24 01:45:23 2006
+@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2001, 2002 Free Software Foundation
+ *
@@ -82,70 +194,32 @@
+#include <sys/sysctl.h>
+
+#include "cpufreq-monitor-sysctl.h"
-+#include "cpufreq-monitor-protected.h"
+
+#define PARENT_TYPE TYPE_CPUFREQ_MONITOR
+
+#define CPUFREQ_MONITOR_GET_PROTECTED(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), PARENT_TYPE, CPUFreqMonitorProtected))
+
+static void cpufreq_monitor_sysctl_class_init (CPUFreqMonitorSysctlClass *klass);
-+static void cpufreq_monitor_sysctl_finalize (GObject *object);
+
-+static void cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor);
++static gboolean cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor);
+static GList *cpufreq_monitor_sysctl_get_available_frequencies (CPUFreqMonitor *monitor);
+
+static gboolean cpufreq_monitor_sysctl_get (gpointer gdata);
+
-+
-+static CPUFreqMonitorClass *parent_class = NULL;
-+
-+typedef struct _CPUFreqMonitorProtected CPUFreqMonitorProtected;
-+
-+GType cpufreq_monitor_sysctl_get_type ()
-+{
-+ static GType type = 0;
-+
-+ if (!type) {
-+ static const GTypeInfo info = {
-+ sizeof (CPUFreqMonitorSysctlClass),
-+ (GBaseInitFunc) NULL,
-+ (GBaseFinalizeFunc) NULL,
-+ (GClassInitFunc) cpufreq_monitor_sysctl_class_init,
-+ NULL,
-+ NULL,
-+ sizeof (CPUFreqMonitorSysctl),
-+ 0,
-+ NULL
-+ };
-+
-+ type = g_type_register_static (PARENT_TYPE, "CPUFreqMonitorSysctl",
-+ &info, 0);
-+ }
-+
-+ return type;
-+}
++G_DEFINE_TYPE (CPUFreqMonitorSysctl, cpufreq_monitor_sysctl, CPUFREQ_TYPE_MONITOR)
+
+static void
-+cpufreq_monitor_sysctl_class_init (CPUFreqMonitorSysctlClass *klass)
++cpufreq_monitor_sysctl_init (CPUFreqMonitorSysctl *monitor)
+{
-+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+ CPUFreqMonitorClass *monitor_class = CPUFREQ_MONITOR_CLASS (klass);
-+
-+ parent_class = g_type_class_peek_parent (klass);
-+
-+ monitor_class->run = cpufreq_monitor_sysctl_run;
-+ monitor_class->get_available_frequencies = cpufreq_monitor_sysctl_get_available_frequencies;
-+
-+ object_class->finalize = cpufreq_monitor_sysctl_finalize;
+}
+
+static void
-+cpufreq_monitor_sysctl_finalize (GObject *object)
++cpufreq_monitor_sysctl_class_init (CPUFreqMonitorSysctlClass *klass)
+{
-+ g_return_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (object));
++ CPUFreqMonitorClass *monitor_class = CPUFREQ_MONITOR_CLASS (klass);
+
-+ if (G_OBJECT_CLASS (parent_class)->finalize)
-+ (* G_OBJECT_CLASS (parent_class)->finalize) (object);
++ monitor_class->run = cpufreq_monitor_sysctl_run;
++ monitor_class->get_available_frequencies = cpufreq_monitor_sysctl_get_available_frequencies;
+}
+
+CPUFreqMonitor *
@@ -159,29 +233,23 @@
+}
+
+static gboolean
-+cpufreq_monitor_sysctl_get (gpointer gdata)
++cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor)
+{
+ gint fmax, fmin, ifreq;
-+ gchar *freq, *perc, *unit, *governor;
-+ gboolean changed;
++ gchar *governor;
+ size_t len;
+ gchar *freq_oid;
-+ CPUFreqMonitorSysctl *monitor;
-+ CPUFreqMonitorProtected *private;
++ guint mon_cpu;
++ GList *list;
+
-+ monitor = (CPUFreqMonitorSysctl *) gdata;
-+ private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor));
++ list = cpufreq_monitor_get_available_frequencies (CPUFREQ_MONITOR (monitor));
+
-+ if (private->available_freqs == NULL) {
-+ if (!cpufreq_monitor_sysctl_get_available_frequencies (CPUFREQ_MONITOR (monitor)))
-+ return FALSE;
-+ }
-+
-+ fmax = atoi ((gchar *) private->available_freqs->data);
-+ fmin = atoi ((gchar *) g_list_nth_data (private->available_freqs, (g_list_length (private->available_freqs) - 1)));
++ fmax = atoi ((gchar *) list->data);
++ fmin = atoi ((gchar *) g_list_nth_data (list, (g_list_length (list) - 1)));
+
++ g_object_get (G_OBJECT (monitor), "cpu", &mon_cpu, NULL);
+ len = sizeof (ifreq);
-+ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", private->cpu);
++ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", mon_cpu);
+
+ if (sysctlbyname (freq_oid, &ifreq, &len, NULL, 0) == -1) {
+ g_free (freq_oid);
@@ -189,7 +257,7 @@
+ }
+
+ ifreq *= 1000;
-+
++
+ if (ifreq == fmax)
+ governor = g_strdup ("performance");
+ else if (ifreq == fmin)
@@ -197,93 +265,29 @@
+ else
+ governor = g_strdup ("other");
+
-+ freq = parent_class->get_human_readable_freq (ifreq);
-+ perc = parent_class->get_human_readable_perc (fmax, ifreq);
-+ unit = parent_class->get_human_readable_unit (ifreq);
-+
-+ changed = FALSE;
-+
-+ if (!private->governor || (g_ascii_strcasecmp (governor, private->governor) != 0)) {
-+ changed = TRUE;
-+ }
-+
-+ if (!private->freq || (g_ascii_strcasecmp (freq, private->freq) != 0)) {
-+ changed = TRUE;
-+ }
-+
-+ if (!private->perc || (g_ascii_strcasecmp (perc, private->perc) != 0)) {
-+ changed = TRUE;
-+ }
-+
-+ if (!private->unit || (g_ascii_strcasecmp (unit, private->unit) != 0)) {
-+ changed = TRUE;
-+ }
-+
-+ parent_class->free_data (CPUFREQ_MONITOR (monitor));
-+
-+ private->governor = governor;
-+ private->freq = freq;
-+ private->perc = perc;
-+ private->unit = unit;
-+
-+ if (private->governor == NULL)
-+ return FALSE;
-+ if (private->freq == NULL)
-+ return FALSE;
-+ if (private->perc == NULL)
-+ return FALSE;
-+ if (private->unit == NULL)
-+ return FALSE;
-+
-+ if (changed)
-+ g_signal_emit (CPUFREQ_MONITOR (monitor), parent_class->signals[CHANGED], 0);
++ g_object_set (G_OBJECT (monitor),
++ "governor", governor,
++ "frequency", ifreq,
++ "max-frequency", fmax,
++ NULL);
+
+ return TRUE;
+}
+
-+static void
-+cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor)
-+{
-+ CPUFreqMonitorProtected *private;
-+
-+ g_return_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (monitor));
-+
-+ private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor));
-+
-+ if (private->timeout_handler > 0)
-+ g_source_remove (private->timeout_handler);
-+
-+ private->timeout_handler = g_timeout_add (1000, cpufreq_monitor_sysctl_get, (gpointer) monitor);
-+}
-+
-+static void
-+free_string (gpointer str, gpointer gdata)
-+{
-+ if (str) g_free (str);
-+}
-+
+static GList *
+cpufreq_monitor_sysctl_get_available_frequencies (CPUFreqMonitor *monitor)
+{
-+ CPUFreqMonitorProtected *private;
+ gchar *levels_oid, *levels;
+ gchar **levelsp, **l;
++ GList *list = NULL;
+ gint mib[4];
++ guint mon_cpu;
+ size_t len;
+
-+ g_return_val_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (monitor), NULL);
-+
-+ private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor));
-+
-+ if (private->available_freqs) {
-+ g_list_foreach (private->available_freqs,
-+ free_string, NULL);
-+ g_list_free (private->available_freqs);
-+ private->available_freqs = NULL;
-+ }
++ g_object_get (G_OBJECT (monitor), "cpu", &mon_cpu, NULL);
+
+ levels_oid = g_strdup_printf ("dev.cpu.%d.freq_levels",
-+ private->cpu);
++ mon_cpu);
+ len = 4;
+ sysctlnametomib (levels_oid, mib, &len);
+ len = sizeof (levels);
@@ -295,7 +299,7 @@
+ levels = g_malloc (len);
+ if (sysctl (mib, 4, levels, &len, NULL, 0) == -1)
+ return NULL;
-+
++
+ levelsp = g_strsplit (levels, " ", 0);
+ g_free (levels);
+
@@ -310,219 +314,116 @@
+ * mW.
+ */
+ int freq = atoi (frpr[0]);
-+ private->available_freqs =
-+ g_list_append (private->available_freqs, g_strdup_printf ("%d", freq * 1000));
++ list =
++ g_list_append (list, g_strdup_printf ("%d", freq * 1000));
+ }
+ g_strfreev (frpr);
+ }
+
+ g_strfreev (levelsp);
+
-+ return private->available_freqs;
++ return (list);
+}
+#endif /* __FreeBSD__ */
---- cpufreq/src/cpufreq-monitor-factory.c.orig Thu Apr 14 12:11:06 2005
-+++ cpufreq/src/cpufreq-monitor-factory.c Sun Jul 3 17:09:15 2005
-@@ -17,13 +17,21 @@
+--- cpufreq/src/cpufreq-monitor-factory.c.orig Sat Jun 17 06:28:02 2006
++++ cpufreq/src/cpufreq-monitor-factory.c Sat Jun 24 01:45:54 2006
+@@ -17,6 +17,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Authors : Carlos García Campos <carlosgc@gnome.org>
+ * Joe Marcus Clarke <marcus@FreeBSD.org>
*/
+ #ifdef HAVE_CONFIG_H
+@@ -25,11 +26,18 @@
+
#include <glib.h>
+ #include <glib/gi18n.h>
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif /* __FreeBSD__ */
#include "cpufreq-applet.h"
+ #include "cpufreq-utils.h"
#include "cpufreq-monitor-sysfs.h"
#include "cpufreq-monitor-procfs.h"
+#ifdef __FreeBSD__
+#include "cpufreq-monitor-sysctl.h"
+#endif /* __FreeBSD__ */
#include "cpufreq-monitor-cpuinfo.h"
- #include "cpufreq-monitor-factory.h"
-
-@@ -31,6 +39,7 @@ CPUFreqMonitor *
+ #ifdef HAVE_LIBCPUFREQ
+ #include "cpufreq-monitor-libcpufreq.h"
+@@ -40,6 +48,7 @@ CPUFreqMonitor *
cpufreq_monitor_factory_create_monitor (guint cpu)
{
CPUFreqMonitor *monitor = NULL;
+#ifndef __FreeBSD__
- if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
- monitor = cpufreq_monitor_sysfs_new (cpu);
-@@ -49,6 +58,20 @@ cpufreq_monitor_factory_create_monitor (
-
- monitor = cpufreq_monitor_cpuinfo_new (cpu);
+ #ifdef HAVE_LIBCPUFREQ
+ monitor = cpufreq_monitor_libcpufreq_new (cpu);
+@@ -63,6 +72,19 @@ cpufreq_monitor_factory_create_monitor (
+
+ monitor = cpufreq_monitor_cpuinfo_new (cpu);
}
+#else
+ size_t len;
+
+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) {
-+ monitor = cpufreq_monitor_sysctl_new (cpu);
++ monitor = cpufreq_monitor_sysctl_new (cpu);
+ } else {
-+ cpufreq_applet_display_error (_("CPU frequency scaling unsupported"),
-+ _("You will not be able to modify the frequency of your machine. "
-+ "Your machine may be misconfigured or not have hardware support "
-+ "for CPU frequency scaling."));
-+
-+ monitor = cpufreq_monitor_cpuinfo_new (cpu);
++ cpufreq_utils_display_error (_("CPU frequency scaling unsupported"),
++ _("You will not be able to modify the frequency of your machine. "
++ "Your machine may be misconfigured or not have hardware support "
++ "for CPU frequency scaling."));
++ monitor = cpufreq_monitor_cpuinfo_new (cpu);
+ }
+#endif /* __FreeBSD__ */
-
+
return monitor;
}
---- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig Thu Apr 14 12:11:06 2005
-+++ cpufreq/src/cpufreq-monitor-cpuinfo.c Sun Jul 3 17:07:16 2005
-@@ -23,6 +23,10 @@
- #include <glib/gi18n.h>
- #include <libgnomevfs/gnome-vfs.h>
-
+--- cpufreq/src/cpufreq-utils.c.orig Sat Aug 12 21:26:50 2006
++++ cpufreq/src/cpufreq-utils.c Tue Aug 22 11:07:32 2006
+@@ -22,6 +22,9 @@
+ #include <glib.h>
+ #include <gtk/gtkmessagedialog.h>
+ #include <sys/types.h>
+#ifdef __FreeBSD__
-+#include <sys/types.h>
+#include <sys/sysctl.h>
-+#endif /* __FreeBSD__ */
- #include <string.h>
- #include <stdio.h>
-
-@@ -104,6 +108,7 @@ cpufreq_monitor_cpuinfo_new (guint cpu)
- static gboolean
- cpufreq_monitor_cpuinfo_get (gpointer gdata)
- {
-+#ifndef __FreeBSD__
- GnomeVFSHandle *handle;
- GnomeVFSFileSize bytes_read;
- GnomeVFSResult result;
-@@ -111,6 +116,9 @@ cpufreq_monitor_cpuinfo_get (gpointer gd
- gchar **lines;
- gchar buffer[256];
- gchar *p;
-+#else
-+ size_t len;
-+#endif /* __FreeBSD__ */
- gchar *freq, *perc, *unit, *governor;
- gint cpu, i;
- CPUFreqMonitorCPUInfo *monitor;
-@@ -120,6 +128,7 @@ cpufreq_monitor_cpuinfo_get (gpointer gd
-
- private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor));
-
-+#ifndef __FreeBSD__
- uri = gnome_vfs_get_uri_from_local_path ("/proc/cpuinfo");
++#endif
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+@@ -30,6 +33,24 @@
- result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
-@@ -180,6 +189,12 @@ cpufreq_monitor_cpuinfo_get (gpointer gd
+ #include "cpufreq-utils.h"
- g_strfreev (lines);
- g_free (file);
-+#else
-+ len = sizeof (cpu);
-+
-+ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1)
-+ return FALSE;
-+#endif /* __FreeBSD__ */
-
- governor = g_strdup (_("Frequency Scaling Unsupported"));
- freq = parent_class->get_human_readable_freq (cpu * 1000); /* kHz are expected*/
---- cpufreq/src/cpufreq-applet.c.orig Thu Apr 14 12:11:06 2005
-+++ cpufreq/src/cpufreq-applet.c Sun Jul 3 17:28:43 2005
-@@ -17,6 +17,7 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Authors : Carlos García Campos <carlosgc@gnome.org>
-+ * Joe Marcus Clarke <marcus@FreeBSD.org>
- */
-
- #include <config.h>
-@@ -26,6 +27,10 @@
- #include <panel-applet-gconf.h>
- #include <glade/glade.h>
- #include <glib/gi18n.h>
+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif /* __FreeBSD__ */
- #include <string.h>
-
- #include "cpufreq-applet.h"
-@@ -193,6 +198,7 @@ cpufreq_applet_about_cb (BonoboUICompone
- {
- static const gchar *authors[] = {
- "Carlos Garcia Campos <carlosgc@gnome.org>",
-+ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)",
- NULL
- };
- static const gchar *documenters[] = {
-@@ -233,6 +239,7 @@ static gint
- cpufreq_applet_get_max_cpu (void)
- {
- gint mcpu = -1;
-+#ifndef __FreeBSD__
- gchar *file = NULL;
-
- do {
-@@ -242,11 +249,20 @@ cpufreq_applet_get_max_cpu (void)
- } while (g_file_test (file, G_FILE_TEST_EXISTS));
- g_free (file);
- mcpu --;
-+#else
++guint
++cpufreq_utils_get_n_cpus (void)
++{
+ size_t len;
++ static guint n_cpus = 0;
++
++ if (n_cpus > 0)
++ return n_cpus;
+
-+ len = sizeof (mcpu);
++ len = sizeof (n_cpus);
++ if (sysctlbyname ("hw.ncpu", &n_cpus, &len, NULL, 0) == -1) {
++ return 1;
++ }
+
-+ sysctlbyname ("hw.ncpu", &mcpu, &len, NULL, 0);
-+ mcpu --;
++ return n_cpus;
++}
++#else
+ guint
+ cpufreq_utils_get_n_cpus (void)
+ {
+@@ -72,6 +93,7 @@ cpufreq_utils_get_n_cpus (void)
+
+ return 1;
+ }
+#endif /* __FreeBSD__ */
- if (mcpu >= 0)
- return mcpu;
-
- mcpu = -1;
-+#ifndef __FreeBSD__
- file = NULL;
- do {
- if (file) g_free (file);
-@@ -255,6 +271,7 @@ cpufreq_applet_get_max_cpu (void)
- } while (g_file_test (file, G_FILE_TEST_EXISTS));
- g_free (file);
- mcpu --;
-+#endif
-
- if (mcpu >= 0)
- return mcpu;
---- cpufreq/src/Makefile.in.orig Tue Oct 4 00:11:26 2005
-+++ cpufreq/src/Makefile.in Tue Oct 4 00:20:37 2005
-@@ -57,6 +57,7 @@
- cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \
- cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \
- cpufreq-monitor-procfs.$(OBJEXT) \
-+ cpufreq-monitor-sysctl.$(OBJEXT) \
- cpufreq-monitor-sysfs.$(OBJEXT) \
- cpufreq-monitor-cpuinfo.$(OBJEXT)
- cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
-@@ -71,6 +72,7 @@
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-factory.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \
-+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-prefs.Po
-@@ -358,6 +360,7 @@
- cpufreq-monitor-protected.h \
- cpufreq-monitor-factory.c cpufreq-monitor-factory.h \
- cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \
-+ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \
- cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \
- cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h
-
-@@ -441,6 +444,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@
+ void
+ cpufreq_utils_display_error (const gchar *message,
diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
index d25df35e2b5d..8a7ea857c103 100644
--- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
@@ -1,6 +1,50 @@
---- cpufreq/src/cpufreq-selector/cpufreq-sysctl.h.orig Mon Feb 14 00:38:57 2005
-+++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.h Mon Feb 14 00:21:39 2005
-@@ -0,0 +1,51 @@
+--- cpufreq/src/cpufreq-selector/Makefile.in.orig Sat Jun 24 01:52:35 2006
++++ cpufreq/src/cpufreq-selector/Makefile.in Sat Jun 24 02:14:08 2006
+@@ -58,13 +58,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
+ cpufreq-selector.h cpufreq-selector-sysfs.c \
+ cpufreq-selector-sysfs.h cpufreq-selector-procfs.c \
+ cpufreq-selector-procfs.h cpufreq-selector-libcpufreq.c \
+- cpufreq-selector-libcpufreq.h main.c
++ cpufreq-selector-libcpufreq.h main.c \
++ cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h
+ @HAVE_LIBCPUFREQ_TRUE@am__objects_1 = \
+ @HAVE_LIBCPUFREQ_TRUE@ cpufreq-selector-libcpufreq.$(OBJEXT)
+ am_cpufreq_selector_OBJECTS = cpufreq-selector.$(OBJEXT) \
+ cpufreq-selector-sysfs.$(OBJEXT) \
+ cpufreq-selector-procfs.$(OBJEXT) $(am__objects_1) \
+- main.$(OBJEXT)
++ main.$(OBJEXT) \
++ cpufreq-selector-sysctl.$(OBJEXT)
+ cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
+ am__DEPENDENCIES_1 =
+ cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@@ -74,6 +76,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-selector-libcpufreq.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-procfs.Po \
++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-sysctl.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector-sysfs.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-selector.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/main.Po
+@@ -371,6 +374,7 @@ cpufreq_selector_SOURCES = \
+ cpufreq-selector.c cpufreq-selector.h \
+ cpufreq-selector-sysfs.c cpufreq-selector-sysfs.h \
+ cpufreq-selector-procfs.c cpufreq-selector-procfs.h \
++ cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h \
+ $(cpufreq_files) \
+ main.c
+
+@@ -451,6 +455,7 @@ distclean-compile:
+
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-libcpufreq.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-procfs.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysctl.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysfs.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+--- cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.h.orig Sat Jun 24 01:52:35 2006
++++ cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.h Sat Jun 24 02:13:05 2006
+@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2001, 2002 Free Software Foundation
+ *
@@ -21,40 +65,88 @@
+ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org>
+ */
+
-+#ifndef __CPUFREQ_SYSCTL_H__
-+#define __CPUFREQ_SYSCTL_H__
++#ifndef __CPUFREQ_SELECTOR_SYSCTL_H__
++#define __CPUFREQ_SELECTOR_SYSCTL_H__
+
+#include <glib-object.h>
+
-+#include "cpufreq.h"
++#include "cpufreq-selector.h"
++
++G_BEGIN_DECLS
+
-+#define TYPE_CPUFREQ_SYSCTL (cpufreq_sysctl_get_type ())
-+#define CPUFREQ_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctl))
-+#define CPUFREQ_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlClass))
-+#define IS_CPUFREQ_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CPUFREQ_SYSCTL))
-+#define IS_CPUFREQ_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CPUFREQ_SYSCTL))
-+#define CPUFREQ_SYSCTL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlClass))
++#define CPUFREQ_TYPE_SELECTOR_SYSCTL (cpufreq_selector_sysctl_get_type ())
++#define CPUFREQ_SELECTOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CPUFREQ_TYPE_SELECTOR_SYSCTL, CPUFreqSelectorProcfs))
++#define CPUFREQ_SELECTOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), CPUFREQ_TYPE_SELECTOR_SYSCTL, CPUFreqSelectorProcfsClass))
++#define CPUFREQ_IS_SELECTOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CPUFREQ_TYPE_SELECTOR_SYSCTL))
++#define CPUFREQ_IS_SELECTOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CPUFREQ_TYPE_SELECTOR_SYSCTL))
++#define CPUFREQ_SELECTOR_SYSCTL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CPUFREQ_TYPE_SELECTOR_SYSCTL, CPUFreqSelectorProcfsClass))
+
-+typedef struct _CPUFreqSysctl CPUFreqSysctl;
-+typedef struct _CPUFreqSysctlClass CPUFreqSysctlClass;
-+typedef struct _CPUFreqSysctlPriv CPUFreqSysctlPriv;
++typedef struct _CPUFreqSelectorSysctl CPUFreqSelectorSysctl;
++typedef struct _CPUFreqSelectorSysctlClass CPUFreqSelectorSysctlClass;
+
-+struct _CPUFreqSysctl {
-+ CPUFreq parent;
++struct _CPUFreqSelectorSysctl {
++ CPUFreqSelector parent;
+};
+
-+struct _CPUFreqSysctlClass {
-+ CPUFreqClass parent_class;
++struct _CPUFreqSelectorSysctlClass {
++ CPUFreqSelectorClass parent_class;
+};
+
++GType cpufreq_selector_sysctl_get_type (void) G_GNUC_CONST;
++CPUFreqSelector *cpufreq_selector_sysctl_new (guint cpu);
+
-+GType cpufreq_sysctl_get_type ();
-+CPUFreqSysctl *cpufreq_sysctl_new ();
++G_END_DECLS
+
-+#endif /* __CPUFREQ_SYSCTL_H__ */
---- cpufreq/src/cpufreq-selector/cpufreq-sysctl.c.orig Mon Feb 14 00:38:52 2005
-+++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.c Mon Feb 14 00:44:43 2005
-@@ -0,0 +1,235 @@
++#endif /* __CPUFREQ_SELECTOR_SYSCTL_H__ */
+--- cpufreq/src/cpufreq-selector/main.c.orig Sat Jun 17 22:13:41 2006
++++ cpufreq/src/cpufreq-selector/main.c Sat Jun 24 02:15:02 2006
+@@ -17,6 +17,7 @@
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Authors : Carlos García Campos <carlosgc@gnome.org>
++ * Joe Marcus Clarke <marcus@FreeBSD.org>
+ */
+
+ #ifdef HAVE_CONFIG_H
+@@ -33,6 +34,9 @@
+ #ifdef HAVE_LIBCPUFREQ
+ #include "cpufreq-selector-libcpufreq.h"
+ #endif
++#ifdef __FreeBSD__
++#include "cpufreq-selector-sysctl.h"
++#endif /* __FreeBSD__ */
+
+ static gint cpu = 0;
+ static gchar *governor = NULL;
+@@ -51,6 +55,9 @@ main (gint argc, gchar **argv)
+ CPUFreqSelector *selector;
+ GOptionContext *context;
+ GError *error = NULL;
++#ifdef __FreeBSD__
++ size_t len;
++#endif
+
+ if (geteuid () != 0) {
+ g_printerr ("You must be root\n");
+@@ -83,10 +90,15 @@ main (gint argc, gchar **argv)
+ #ifdef HAVE_LIBCPUFREQ
+ selector = cpufreq_selector_libcpufreq_new (cpu);
+ #else
++#ifndef __FreeBSD__
+ if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
+ selector = cpufreq_selector_sysfs_new (cpu);
+ } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */
+ selector = cpufreq_selector_procfs_new (cpu);
++#else
++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) {
++ selector = cpufreq_selector_sysctl_new (cpu);
++#endif /* __FreeBSD__ */
+ } else {
+ g_printerr ("No cpufreq support\n");
+ return 1;
+--- cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.c.orig Wed Jul 26 01:34:18 2006
++++ cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.c Wed Jul 26 01:42:00 2006
+@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2001, 2002 Free Software Foundation
+ *
@@ -84,290 +176,61 @@
+#include <sys/sysctl.h>
+#endif /* __FreeBSD__ */
+
-+#include "cpufreq-sysctl.h"
-+
-+#define PARENT_TYPE TYPE_CPUFREQ
-+
-+#define CPUFREQ_SYSCTL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlPrivate))
-+
-+static void cpufreq_sysctl_init (CPUFreqSysctl *cfq);
-+static void cpufreq_sysctl_class_init (CPUFreqSysctlClass *klass);
-+static void cpufreq_sysctl_finalize (GObject *object);
-+
-+static void cpufreq_sysctl_set_governor (CPUFreq *cfq, const gchar *governor);
-+static void cpufreq_sysctl_set_frequency (CPUFreq *cfq, gint frequency);
-+
-+static void cpufreq_sysctl_setup (CPUFreqSysctl *cfq);
-+
-+static GObjectClass *parent_class = NULL;
-+
-+typedef struct _CPUFreqSysctlPrivate CPUFreqSysctlPrivate;
-+
-+struct _CPUFreqSysctlPrivate
-+{
-+ gint pmax;
-+};
-+
-+GType cpufreq_sysctl_get_type ()
-+{
-+ static GType type = 0;
++#include "cpufreq-selector-sysctl.h"
+
-+ if (!type) {
-+ static const GTypeInfo info = {
-+ sizeof (CPUFreqSysctlClass),
-+ (GBaseInitFunc) NULL,
-+ (GBaseFinalizeFunc) NULL,
-+ (GClassInitFunc) cpufreq_sysctl_class_init,
-+ NULL,
-+ NULL,
-+ sizeof (CPUFreqSysctl),
-+ 0,
-+ (GInstanceInitFunc) cpufreq_sysctl_init
-+ };
++static void cpufreq_selector_sysctl_init (CPUFreqSelectorSysctl *selector);
++static void cpufreq_selector_sysctl_class_init (CPUFreqSelectorSysctlClass *klass);
+
-+ type = g_type_register_static (PARENT_TYPE, "CPUFreqSysctl",
-+ &info, 0);
-+ }
++static gboolean cpufreq_selector_sysctl_set_frequency (CPUFreqSelector *selector, guint frequency, GError **error);
++static gboolean cpufreq_selector_sysctl_set_governor (CPUFreqSelector *selector, const gchar *governor, GError **error);
+
-+ return type;
-+}
++G_DEFINE_TYPE (CPUFreqSelectorSysctl, cpufreq_selector_sysctl, CPUFREQ_TYPE_SELECTOR)
+
+static void
-+cpufreq_sysctl_init (CPUFreqSysctl *cfq)
++cpufreq_selector_sysctl_init (CPUFreqSelectorSysctl *selector)
+{
-+ CPUFreqSysctlPrivate *private;
-+
-+ g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq));
-+
-+ private = CPUFREQ_SYSCTL_GET_PRIVATE (cfq);
+}
+
+static void
-+cpufreq_sysctl_class_init (CPUFreqSysctlClass *klass)
++cpufreq_selector_sysctl_class_init (CPUFreqSelectorSysctlClass *klass)
+{
-+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+ CPUFreqClass *cfq_class = CPUFREQ_CLASS (klass);
-+
-+ parent_class = g_type_class_peek_parent (klass);
-+
-+ g_type_class_add_private (klass, sizeof (CPUFreqSysctlPrivate));
-+
-+ cfq_class->set_governor = cpufreq_sysctl_set_governor;
-+ cfq_class->set_frequency = cpufreq_sysctl_set_frequency;
++ CPUFreqSelectorClass *selector_class = CPUFREQ_SELECTOR_CLASS (klass);
+
-+ object_class->finalize = cpufreq_sysctl_finalize;
++ selector_class->set_frequency = cpufreq_selector_sysctl_set_frequency;
++ selector_class->set_governor = cpufreq_selector_sysctl_set_governor;
+}
+
-+static void
-+cpufreq_sysctl_finalize (GObject *object)
-+{
-+ if (G_OBJECT_CLASS (parent_class)->finalize)
-+ (* G_OBJECT_CLASS (parent_class)->finalize) (object);
-+}
-+
-+CPUFreqSysctl *
-+cpufreq_sysctl_new ()
++CPUFreqSelector *
++cpufreq_selector_sysctl_new (guint cpu)
+{
-+ CPUFreqSysctl *cfq;
-+
-+ cfq = g_object_new (TYPE_CPUFREQ_SYSCTL, NULL);
++ CPUFreqSelector *selector;
+
-+ cpufreq_sysctl_setup (cfq);
++ selector = CPUFREQ_SELECTOR (g_object_new (CPUFREQ_TYPE_SELECTOR_SYSCTL,
++ "cpu", cpu, NULL));
+
-+ return cfq;
++ return selector;
+}
+
-+static void
-+cpufreq_sysctl_set_governor (CPUFreq *cfq, const gchar *governor)
++static gboolean
++cpufreq_selector_sysctl_set_governor (CPUFreqSelector *selector, const gchar *governor, GError **error)
+{
-+ /* Not implemented. */
++ return TRUE;
+}
+
-+static void
-+cpufreq_sysctl_set_frequency (CPUFreq *cfq, gint frequency)
++static gboolean
++cpufreq_selector_sysctl_set_frequency (CPUFreqSelector *selector, guint frequency, GError **error)
+{
-+ gint cpu, i;
++ guint cpu, i;
+ size_t len;
+ gchar *freq_oid;
+
-+ g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq));
-+
-+ g_object_get (G_OBJECT (cfq), "n_cpu", &cpu, NULL);
-+
-+ frequency = (gint) ((gdouble) frequency / 1000); /* Convert back to MHz*/
-+
-+ for (i = 0; i < cpu; i++) {
-+ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", i);
-+
-+ sysctlbyname (freq_oid, NULL, &len, &frequency, sizeof (frequency));
-+ g_free (freq_oid);
-+ }
-+}
-+
-+
-+static void
-+cpufreq_sysctl_setup (CPUFreqSysctl *cfq)
-+{
-+ guint cpu;
-+ gint fmax, fmin;
-+ gint pmax;
-+ gint ifreq;
-+ gint mib[4];
-+ gchar *governor, *levels;
-+ gchar **levelsp, **frpr, **l;
-+ size_t len;
-+ CPUFreqSysctlPrivate *private;
-+
-+ g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq));
-+
-+ private = CPUFREQ_SYSCTL_GET_PRIVATE (cfq);
++ g_object_get (G_OBJECT (selector), "cpu", &cpu, NULL);
+
-+ pmax = 100;
-+ fmax = 0;
-+ fmin = 0;
-+ ifreq = 0;
++ frequency = (guint) ((gdouble) frequency / 1000); /* Convert back to MHz*/
++ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", (gint) cpu);
+
-+ private->pmax = pmax;
++ sysctlbyname (freq_oid, NULL, &len, &frequency, sizeof (frequency));
++ g_free (freq_oid);
+
-+ len = sizeof (cpu);
-+
-+ if (sysctlbyname ("hw.ncpu", &cpu, &len, NULL, 0) == -1)
-+ cpu = 1;
-+
-+ len = 4;
-+ sysctlnametomib ("dev.cpu.0.freq_levels", mib, &len);
-+ len = sizeof (levels);
-+
-+ if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1) {
-+ g_warning ("Failed to fetch dev.cpu.0.freq_levels");
-+ return;
-+ }
-+
-+ levels = g_malloc (len);
-+ if (sysctl (mib, 4, levels, &len, NULL, 0) == -1) {
-+ g_warning ("Failed to fetch data for dev.cpu.0.freq_levels");
-+ return;
-+ }
-+
-+ levelsp = g_strsplit (levels, " ", 0);
-+ g_free (levels);
-+
-+ frpr = g_strsplit (levelsp[0], "/", 0); /* MAX */
-+ if (frpr && frpr[0] != NULL)
-+ fmax = atoi (frpr[0]);
-+ g_strfreev (frpr);
-+
-+ for (l = levelsp; l && *l; l++) /* Walk to the last frequency */
-+ ;
-+
-+ l --;
-+ frpr = g_strsplit (*l, "/", 0);
-+ if (frpr && frpr[0] != NULL)
-+ fmin = atoi (frpr[0]);
-+
-+ g_strfreev (frpr);
-+ g_strfreev (levelsp);
-+
-+ len = sizeof (ifreq);
-+ if (sysctlbyname ("dev.cpu.0.freq", &ifreq, &len, NULL, 0) == -1) {
-+ g_warning ("Failed to fetch data for dev.cpu.0.freq");
-+ return;
-+ }
-+
-+ if (ifreq == fmax)
-+ governor = g_strdup ("performance");
-+ else if (ifreq == fmin)
-+ governor = g_strdup ("economy");
-+ else
-+ governor = g_strdup ("other");
-+
-+ fmax *= 1000;
-+ fmin *= 1000;
-+
-+ g_object_set (G_OBJECT (cfq), "n_cpu", cpu,
-+ "sc_max", fmax, "sc_min", fmin,
-+ "governor", governor, NULL);
-+
-+ g_free (governor);
++ return TRUE;
+}
---- cpufreq/src/cpufreq-selector/main.c.orig Sun Apr 3 12:03:13 2005
-+++ cpufreq/src/cpufreq-selector/main.c Sun Jul 3 17:16:19 2005
-@@ -17,6 +17,7 @@
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Authors : Carlos García Campos <carlosgc@gnome.org>
-+ * Joe Marcus Clarke <marcus@FreeBSD.org>
- */
-
- #include <glib-object.h>
-@@ -26,6 +27,9 @@
- #include "cpufreq.h"
- #include "cpufreq-sysfs.h"
- #include "cpufreq-procfs.h"
-+#ifdef __FreeBSD__
-+#include "cpufreq-sysctl.h"
-+#endif /* __FreeBSD__ */
-
- gint
- main (gint argc, gchar **argv)
-@@ -34,6 +38,9 @@ main (gint argc, gchar **argv)
- static gint cpu = 0;
- static gchar *governor = NULL;
- static gulong frequency = 0;
-+#ifdef __FreeBSD__
-+ size_t len;
-+#endif /* __FreeBSD__ */
- GError *error = NULL;
- CPUFreq *cfq;
-
-@@ -71,10 +78,15 @@ main (gint argc, gchar **argv)
-
- g_option_context_free (context);
-
-+#ifndef __FreeBSD__
- if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
- cfq = CPUFREQ (cpufreq_sysfs_new ());
- } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */
- cfq = CPUFREQ (cpufreq_procfs_new ());
-+#else
-+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) {
-+ cfq = CPUFREQ (cpufreq_sysctl_new ());
-+#endif /* __FreeBSD__ */
- } else {
- g_print ("No cpufreq support\n");
- return 1;
---- cpufreq/src/cpufreq-selector/Makefile.in.orig Tue Oct 4 00:21:25 2005
-+++ cpufreq/src/cpufreq-selector/Makefile.in Tue Oct 4 00:27:54 2005
-@@ -55,7 +55,7 @@
- PROGRAMS = $(bin_PROGRAMS)
- am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \
- cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \
-- main.$(OBJEXT)
-+ cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT)
- cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
- am__DEPENDENCIES_1 =
- cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1)
-@@ -64,6 +64,7 @@
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysfs.Po \
-+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysctl.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -332,6 +333,7 @@
- cpufreq.c cpufreq.h \
- cpufreq-sysfs.c cpufreq-sysfs.h \
- cpufreq-procfs.c cpufreq-procfs.h \
-+ cpufreq-sysctl.c cpufreq-sysctl.h \
- main.c
-
- cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt
-@@ -407,6 +409,7 @@
- -rm -f *.tab.c
-
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
diff --git a/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py b/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py
new file mode 100644
index 000000000000..0dc24164ec34
--- /dev/null
+++ b/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py
@@ -0,0 +1,13 @@
+--- invest-applet/invest/invest-applet.py.orig Wed Sep 13 20:42:15 2006
++++ invest-applet/invest/invest-applet.py Wed Sep 13 20:42:28 2006
+@@ -26,8 +26,8 @@ import invest, invest.applet, invest.def
+ import gettext, locale
+ gettext.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
+ gettext.textdomain(invest.defs.GETTEXT_PACKAGE)
+-locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
+-locale.textdomain(invest.defs.GETTEXT_PACKAGE)
++#locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
++#locale.textdomain(invest.defs.GETTEXT_PACKAGE)
+ gtk.glade.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
+ gtk.glade.textdomain(invest.defs.GETTEXT_PACKAGE)
+
diff --git a/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart b/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart
new file mode 100644
index 000000000000..2eddc8154089
--- /dev/null
+++ b/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart
@@ -0,0 +1,13 @@
+--- invest-applet/invest/invest-chart.orig Wed Sep 13 20:41:18 2006
++++ invest-applet/invest/invest-chart Wed Sep 13 20:41:33 2006
+@@ -6,8 +6,8 @@ import sys, invest.chart, gtk
+ import gettext, locale
+ gettext.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
+ gettext.textdomain(invest.defs.GETTEXT_PACKAGE)
+-locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
+-locale.textdomain(invest.defs.GETTEXT_PACKAGE)
++#locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
++#locale.textdomain(invest.defs.GETTEXT_PACKAGE)
+ gtk.glade.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
+ gtk.glade.textdomain(invest.defs.GETTEXT_PACKAGE)
+
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 2cf9c24b329f..28938b5e5944 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -1,8 +1,13 @@
%%CPUFREQ%%bin/cpufreq-selector
bin/gswitchit-plugins-capplet
+%%PYTHON%%bin/invest-chart
%%BATTERY%%etc/sound/events/battstat_applet.soundlist
-include/libgswitchit/gswitchit_config.h
-include/libgswitchit/gswitchit_plugin.h
+include/libgswitchit/gnome-kbd-indicator.h
+include/libgswitchit/gswitchit-config-private.h
+include/libgswitchit/gswitchit-config.h
+include/libgswitchit/gswitchit-plugin.h
+include/libgswitchit/keyboard-config-registry-client.h
+include/libgswitchit/keyboard-config-registry.h
include/libgweather/gweather-gconf.h
include/libgweather/gweather-prefs.h
include/libgweather/weather.h
@@ -10,6 +15,30 @@ lib/libgweather.a
lib/libgweather.la
lib/libgweather.so
lib/libgweather.so.0
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/about.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/about.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/about.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/applet.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/applet.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/applet.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/chart.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/chart.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/chart.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/preferences.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/preferences.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/preferences.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/quotes.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/quotes.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/quotes.pyo
+%%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
@@ -29,6 +58,7 @@ 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
libdata/pkgconfig/gswitchit.pc
libdata/pkgconfig/gweather.pc
libexec/accessx-status-applet
@@ -39,8 +69,8 @@ libexec/drivemount_applet2
libexec/geyes_applet2
%%COMMANDER%%libexec/gnome-applets/mc-install-default-macros
libexec/gnome-keyboard-applet
-libexec/gtik2_applet2
libexec/gweather-applet-2
+%%PYTHON%%libexec/invest-applet
%%COMMANDER%%libexec/mini_commander_applet
libexec/mixer_applet2
libexec/modem_applet
@@ -48,6 +78,8 @@ libexec/multiload-applet-2
libexec/null_applet
libexec/stickynotes_applet
libexec/trashapplet
+share/gnome/applications/gswitchit-plugins.desktop
+%%PYTHON%%share/gnome/applications/invest-chart.desktop
share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml
%%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
%%CPUFREQ%%share/gnome/gnome-2.0/ui/GNOME_CPUFreqApplet.xml
@@ -56,13 +88,13 @@ share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml
share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml
share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml
share/gnome/gnome-2.0/ui/GNOME_GeyesApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_GtikApplet.xml
%%COMMANDER%%share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml
share/gnome/gnome-2.0/ui/GNOME_ModemLights.xml
share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
share/gnome/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml
share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
+%%PYTHON%%share/gnome/gnome-2.0/ui/Invest_Applet.xml
share/gnome/gnome-applets/geyes/Bizarre/Bizarre-eye.png
share/gnome/gnome-applets/geyes/Bizarre/Bizarre-pupil.png
share/gnome/gnome-applets/geyes/Bizarre/config
@@ -78,16 +110,24 @@ share/gnome/gnome-applets/geyes/Default/config
share/gnome/gnome-applets/geyes/Horrid/config
share/gnome/gnome-applets/geyes/Horrid/horrid_eye.png
share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png
+share/gnome/gnome-applets/geyes/Tango/config
+share/gnome/gnome-applets/geyes/Tango/tango-eye.png
+share/gnome/gnome-applets/geyes/Tango/tango-pupil.png
%%BATTERY%%share/gnome/gnome-applets/glade/battstat_applet.glade
%%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade
+%%PYTHON%%share/gnome/gnome-applets/glade/financialchart.glade
share/gnome/gnome-applets/glade/gswitchit-plugins.glade
share/gnome/gnome-applets/glade/gswitchit.glade
%%COMMANDER%%share/gnome/gnome-applets/glade/mini-commander.glade
share/gnome/gnome-applets/glade/modemlights.glade
+%%PYTHON%%share/gnome/gnome-applets/glade/prefs-dialog.glade
share/gnome/gnome-applets/glade/stickynotes.glade
share/gnome/gnome-applets/glade/trashapplet.glade
share/gnome/gnome-applets/gweather/Locations.xml
share/gnome/gnome-applets/gweather/locations.dtd
+%%PYTHON%%share/gnome/gnome-applets/invest-applet/invest-16.png
+%%PYTHON%%share/gnome/gnome-applets/invest-applet/invest-button.png
+%%PYTHON%%share/gnome/gnome-applets/invest-applet/invest.svg
share/gnome/help/accessx-status/C/accessx-status.xml
share/gnome/help/accessx-status/C/figures/accessx-status-applet.png
share/gnome/help/accessx-status/C/figures/accessx-status-disabled.png
@@ -149,6 +189,30 @@ share/gnome/help/accessx-status/it/figures/accessx_sticky-keys.png
share/gnome/help/accessx-status/it/figures/accessx_sticky-meta-key.png
share/gnome/help/accessx-status/it/figures/accessx_sticky-shift-key.png
share/gnome/help/accessx-status/it/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/nl/accessx-status.xml
+share/gnome/help/accessx-status/nl/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/nl/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/nl/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/nl/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/nl/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/nl/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/nl/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/nl/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/nl/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/nl/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/nl/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/sv/accessx-status.xml
+share/gnome/help/accessx-status/sv/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/sv/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/sv/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/sv/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/sv/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/sv/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/sv/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/sv/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/sv/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/sv/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/sv/figures/accessx_sticky-windows-key.png
share/gnome/help/accessx-status/uk/accessx-status.xml
share/gnome/help/accessx-status/uk/figures/accessx-status-applet.png
share/gnome/help/accessx-status/uk/figures/accessx-status-disabled.png
@@ -186,6 +250,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-credits-hal.png
%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-preferences.png
%%BATTERY%%share/gnome/help/battstat/fr/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/sv/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/context-menu.png
%%BATTERY%%share/gnome/help/battstat/uk/battstat.xml
%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet-expanded.png
%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet.png
@@ -228,6 +298,11 @@ share/gnome/help/char-palette/pt_BR/figures/charpalette_applet.png
share/gnome/help/char-palette/pt_BR/figures/charpalette_chargroup.png
share/gnome/help/char-palette/pt_BR/figures/charpick-preferences.png
share/gnome/help/char-palette/pt_BR/figures/charpick_characters.png
+share/gnome/help/char-palette/sv/char-palette.xml
+share/gnome/help/char-palette/sv/figures/charpalette_applet.png
+share/gnome/help/char-palette/sv/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/sv/figures/charpick-preferences.png
+share/gnome/help/char-palette/sv/figures/charpick_characters.png
share/gnome/help/char-palette/uk/char-palette.xml
share/gnome/help/char-palette/uk/figures/charpalette_applet.png
share/gnome/help/char-palette/uk/figures/charpalette_chargroup.png
@@ -250,6 +325,10 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
%%COMMANDER%%share/gnome/help/command-line/pt_BR/figures/command-line.png
%%COMMANDER%%share/gnome/help/command-line/pt_BR/figures/prefs-macros.png
%%COMMANDER%%share/gnome/help/command-line/pt_BR/figures/prefs.png
+%%COMMANDER%%share/gnome/help/command-line/sv/command-line.xml
+%%COMMANDER%%share/gnome/help/command-line/sv/figures/command-line.png
+%%COMMANDER%%share/gnome/help/command-line/sv/figures/prefs-macros.png
+%%COMMANDER%%share/gnome/help/command-line/sv/figures/prefs.png
%%COMMANDER%%share/gnome/help/command-line/uk/command-line.xml
%%COMMANDER%%share/gnome/help/command-line/uk/figures/command-line.png
%%COMMANDER%%share/gnome/help/command-line/uk/figures/prefs-macros.png
@@ -275,6 +354,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector-both.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/cpufreq-applet.xml
%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-100.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-25.png
@@ -285,6 +374,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-selector-both.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-selector.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/cpufreq-applet.xml
%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-100.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-25.png
@@ -295,6 +394,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector-both.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet.png
share/gnome/help/drivemount/C/drivemount.xml
share/gnome/help/drivemount/C/figures/drivemount-applet_eject.png
share/gnome/help/drivemount/C/figures/drivemount-applet_example.png
@@ -326,12 +435,24 @@ share/gnome/help/drivemount/pa/figures/drivemount-applet_example.png
share/gnome/help/drivemount/pa/figures/drivemount-applet_mount.png
share/gnome/help/drivemount/pa/figures/drivemount-applet_open.png
share/gnome/help/drivemount/pa/figures/drivemount-applet_status.png
+share/gnome/help/drivemount/sv/drivemount.xml
+share/gnome/help/drivemount/sv/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/sv/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/sv/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/sv/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/sv/figures/drivemount-applet_status.png
share/gnome/help/drivemount/uk/drivemount.xml
share/gnome/help/drivemount/uk/figures/drivemount-applet_eject.png
share/gnome/help/drivemount/uk/figures/drivemount-applet_example.png
share/gnome/help/drivemount/uk/figures/drivemount-applet_mount.png
share/gnome/help/drivemount/uk/figures/drivemount-applet_open.png
share/gnome/help/drivemount/uk/figures/drivemount-applet_status.png
+share/gnome/help/drivemount/zh_CN/drivemount.xml
+share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_status.png
share/gnome/help/geyes/C/figures/geyes_applet.png
share/gnome/help/geyes/C/geyes.xml
share/gnome/help/geyes/C/legal.xml
@@ -345,22 +466,16 @@ share/gnome/help/geyes/it/figures/geyes_applet.png
share/gnome/help/geyes/it/geyes.xml
share/gnome/help/geyes/ru/figures/geyes_applet.png
share/gnome/help/geyes/ru/geyes.xml
+share/gnome/help/geyes/sv/figures/geyes_applet.png
+share/gnome/help/geyes/sv/geyes.xml
share/gnome/help/geyes/uk/figures/geyes_applet.png
share/gnome/help/geyes/uk/geyes.xml
share/gnome/help/gswitchit/C/gswitchit.xml
share/gnome/help/gswitchit/C/legal.xml
share/gnome/help/gswitchit/es/gswitchit.xml
share/gnome/help/gswitchit/fr/gswitchit.xml
+share/gnome/help/gswitchit/sv/gswitchit.xml
share/gnome/help/gswitchit/uk/gswitchit.xml
-share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png
-share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml
-share/gnome/help/gtik2_applet2/C/legal.xml
-share/gnome/help/gtik2_applet2/es/figures/gtik_applet.png
-share/gnome/help/gtik2_applet2/es/gtik2_applet2.xml
-share/gnome/help/gtik2_applet2/fr/figures/gtik_applet.png
-share/gnome/help/gtik2_applet2/fr/gtik2_applet2.xml
-share/gnome/help/gtik2_applet2/uk/figures/gtik_applet.png
-share/gnome/help/gtik2_applet2/uk/gtik2_applet2.xml
share/gnome/help/gweather/C/figures/gweather-details.png
share/gnome/help/gweather/C/figures/gweather-menu-prefs.png
share/gnome/help/gweather/C/figures/gweather-prefs-general.png
@@ -422,6 +537,21 @@ share/gnome/help/gweather/nl/figures/stock_weather-snow.png
share/gnome/help/gweather/nl/figures/stock_weather-storm.png
share/gnome/help/gweather/nl/figures/stock_weather-sunny.png
share/gnome/help/gweather/nl/gweather.xml
+share/gnome/help/gweather/sv/figures/gweather-details.png
+share/gnome/help/gweather/sv/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/sv/figures/gweather-prefs-general.png
+share/gnome/help/gweather/sv/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/sv/figures/gweather_applet.png
+share/gnome/help/gweather/sv/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/sv/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/sv/figures/stock_weather-fog.png
+share/gnome/help/gweather/sv/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/sv/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/sv/figures/stock_weather-showers.png
+share/gnome/help/gweather/sv/figures/stock_weather-snow.png
+share/gnome/help/gweather/sv/figures/stock_weather-storm.png
+share/gnome/help/gweather/sv/figures/stock_weather-sunny.png
+share/gnome/help/gweather/sv/gweather.xml
share/gnome/help/gweather/uk/figures/gweather-details.png
share/gnome/help/gweather/uk/figures/gweather-menu-prefs.png
share/gnome/help/gweather/uk/figures/gweather-prefs-general.png
@@ -446,6 +576,8 @@ share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/fr/mixer_applet2.xml
share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/it/mixer_applet2.xml
+share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/sv/mixer_applet2.xml
share/gnome/help/mixer_applet2/uk/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/uk/mixer_applet2.xml
share/gnome/help/multiload/C/figures/multiload-preferences.png
@@ -461,6 +593,10 @@ share/gnome/help/multiload/fr/figures/multiload-preferences.png
share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png
share/gnome/help/multiload/fr/figures/system_monitor.png
share/gnome/help/multiload/fr/multiload.xml
+share/gnome/help/multiload/sv/figures/multiload-preferences.png
+share/gnome/help/multiload/sv/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/sv/figures/system_monitor.png
+share/gnome/help/multiload/sv/multiload.xml
share/gnome/help/multiload/uk/figures/multiload-preferences.png
share/gnome/help/multiload/uk/figures/system-monitor-applet_window.png
share/gnome/help/multiload/uk/figures/system_monitor.png
@@ -484,6 +620,12 @@ share/gnome/help/stickynotes_applet/fr/figures/stickynotes-note-prefs.png
share/gnome/help/stickynotes_applet/fr/figures/stickynotes-prefs.png
share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png
share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/sv/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/sv/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/sv/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/sv/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/sv/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/sv/stickynotes_applet.xml
share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-lock.png
share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-new.png
share/gnome/help/stickynotes_applet/uk/figures/stickynotes-note-prefs.png
@@ -505,6 +647,8 @@ share/gnome/help/trashapplet/pa/figures/trash-applet.png
share/gnome/help/trashapplet/pa/trashapplet.xml
share/gnome/help/trashapplet/ru/figures/trash-applet.png
share/gnome/help/trashapplet/ru/trashapplet.xml
+share/gnome/help/trashapplet/sv/figures/trash-applet.png
+share/gnome/help/trashapplet/sv/trashapplet.xml
share/gnome/help/trashapplet/uk/figures/trash-applet.png
share/gnome/help/trashapplet/uk/trashapplet.xml
share/gnome/omf/accessx-status/accessx-status-C.omf
@@ -512,11 +656,14 @@ share/gnome/omf/accessx-status/accessx-status-bg.omf
share/gnome/omf/accessx-status/accessx-status-es.omf
share/gnome/omf/accessx-status/accessx-status-fr.omf
share/gnome/omf/accessx-status/accessx-status-it.omf
+share/gnome/omf/accessx-status/accessx-status-nl.omf
+share/gnome/omf/accessx-status/accessx-status-sv.omf
share/gnome/omf/accessx-status/accessx-status-uk.omf
%%BATTERY%%share/gnome/omf/battstat/battstat-C.omf
%%BATTERY%%share/gnome/omf/battstat/battstat-bg.omf
%%BATTERY%%share/gnome/omf/battstat/battstat-es.omf
%%BATTERY%%share/gnome/omf/battstat/battstat-fr.omf
+%%BATTERY%%share/gnome/omf/battstat/battstat-sv.omf
%%BATTERY%%share/gnome/omf/battstat/battstat-uk.omf
share/gnome/omf/char-palette/char-palette-C.omf
share/gnome/omf/char-palette/char-palette-bg.omf
@@ -525,54 +672,63 @@ share/gnome/omf/char-palette/char-palette-fr.omf
share/gnome/omf/char-palette/char-palette-it.omf
share/gnome/omf/char-palette/char-palette-nl.omf
share/gnome/omf/char-palette/char-palette-pt_BR.omf
+share/gnome/omf/char-palette/char-palette-sv.omf
share/gnome/omf/char-palette/char-palette-uk.omf
%%COMMANDER%%share/gnome/omf/command-line/command-line-C.omf
%%COMMANDER%%share/gnome/omf/command-line/command-line-es.omf
%%COMMANDER%%share/gnome/omf/command-line/command-line-fr.omf
%%COMMANDER%%share/gnome/omf/command-line/command-line-pt_BR.omf
+%%COMMANDER%%share/gnome/omf/command-line/command-line-sv.omf
%%COMMANDER%%share/gnome/omf/command-line/command-line-uk.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf
+%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-fr.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-nl.omf
+%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-sv.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.omf
+%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-zh_CN.omf
share/gnome/omf/drivemount/drivemount-C.omf
share/gnome/omf/drivemount/drivemount-es.omf
share/gnome/omf/drivemount/drivemount-fr.omf
share/gnome/omf/drivemount/drivemount-it.omf
share/gnome/omf/drivemount/drivemount-pa.omf
+share/gnome/omf/drivemount/drivemount-sv.omf
share/gnome/omf/drivemount/drivemount-uk.omf
+share/gnome/omf/drivemount/drivemount-zh_CN.omf
share/gnome/omf/geyes/geyes-C.omf
share/gnome/omf/geyes/geyes-bg.omf
share/gnome/omf/geyes/geyes-es.omf
share/gnome/omf/geyes/geyes-fr.omf
share/gnome/omf/geyes/geyes-it.omf
share/gnome/omf/geyes/geyes-ru.omf
+share/gnome/omf/geyes/geyes-sv.omf
share/gnome/omf/geyes/geyes-uk.omf
share/gnome/omf/gswitchit/gswitchit-C.omf
share/gnome/omf/gswitchit/gswitchit-es.omf
share/gnome/omf/gswitchit/gswitchit-fr.omf
+share/gnome/omf/gswitchit/gswitchit-sv.omf
share/gnome/omf/gswitchit/gswitchit-uk.omf
-share/gnome/omf/gtik2_applet2/gtik2_applet2-C.omf
-share/gnome/omf/gtik2_applet2/gtik2_applet2-es.omf
-share/gnome/omf/gtik2_applet2/gtik2_applet2-fr.omf
-share/gnome/omf/gtik2_applet2/gtik2_applet2-uk.omf
share/gnome/omf/gweather/gweather-C.omf
share/gnome/omf/gweather/gweather-es.omf
share/gnome/omf/gweather/gweather-fr.omf
share/gnome/omf/gweather/gweather-nl.omf
+share/gnome/omf/gweather/gweather-sv.omf
share/gnome/omf/gweather/gweather-uk.omf
share/gnome/omf/mixer_applet2/mixer_applet2-C.omf
share/gnome/omf/mixer_applet2/mixer_applet2-es.omf
share/gnome/omf/mixer_applet2/mixer_applet2-fr.omf
share/gnome/omf/mixer_applet2/mixer_applet2-it.omf
+share/gnome/omf/mixer_applet2/mixer_applet2-sv.omf
share/gnome/omf/mixer_applet2/mixer_applet2-uk.omf
share/gnome/omf/multiload/multiload-C.omf
share/gnome/omf/multiload/multiload-es.omf
share/gnome/omf/multiload/multiload-fr.omf
+share/gnome/omf/multiload/multiload-sv.omf
share/gnome/omf/multiload/multiload-uk.omf
share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf
share/gnome/omf/stickynotes_applet/stickynotes_applet-es.omf
share/gnome/omf/stickynotes_applet/stickynotes_applet-fr.omf
+share/gnome/omf/stickynotes_applet/stickynotes_applet-sv.omf
share/gnome/omf/stickynotes_applet/stickynotes_applet-uk.omf
share/gnome/omf/trashapplet/trashapplet-C.omf
share/gnome/omf/trashapplet/trashapplet-es.omf
@@ -581,6 +737,7 @@ share/gnome/omf/trashapplet/trashapplet-it.omf
share/gnome/omf/trashapplet/trashapplet-nl.omf
share/gnome/omf/trashapplet/trashapplet-pa.omf
share/gnome/omf/trashapplet/trashapplet-ru.omf
+share/gnome/omf/trashapplet/trashapplet-sv.omf
share/gnome/omf/trashapplet/trashapplet-uk.omf
share/gnome/pixmaps/accessx-status-applet/ax-applet.png
share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png
@@ -622,14 +779,12 @@ share/gnome/pixmaps/accessx-status-applet/sticky-super-none.png
%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-25.png
%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-50.png
%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-75.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-applet.png
%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-na.png
+%%PYTHON%%share/gnome/pixmaps/invest-big.png
share/gnome/pixmaps/stickynotes/close.png
share/gnome/pixmaps/stickynotes/locked.png
share/gnome/pixmaps/stickynotes/resize_se.png
share/gnome/pixmaps/stickynotes/resize_sw.png
-share/gnome/pixmaps/stickynotes/stickynotes.png
-share/gnome/pixmaps/stickynotes/stickynotes_prelight.png
share/gnome/pixmaps/stickynotes/unlocked.png
share/gnome/xmodmap/base.xml
share/gnome/xmodmap/xmodmap.am
@@ -717,22 +872,38 @@ share/gnome/xmodmap/xmodmap.us.old
share/gnome/xmodmap/xmodmap.us101A_x86
share/gnome/xmodmap/xmodmap.us_intl
share/gnome/xmodmap/xmodmap.yu
+share/icons/hicolor/16x16/apps/gnome-cpu-frequency-applet.png
+share/icons/hicolor/16x16/apps/gnome-eyes-applet.png
+share/icons/hicolor/16x16/apps/gnome-modem-monitor-applet.png
+share/icons/hicolor/16x16/apps/gnome-sticky-notes-applet.png
+share/icons/hicolor/22x22/apps/gnome-cpu-frequency-applet.png
+share/icons/hicolor/22x22/apps/gnome-eyes-applet.png
+share/icons/hicolor/22x22/apps/gnome-modem-monitor-applet.png
+share/icons/hicolor/22x22/apps/gnome-sticky-notes-applet.png
+share/icons/hicolor/24x24/apps/gnome-cpu-frequency-applet.png
+share/icons/hicolor/24x24/apps/gnome-eyes-applet.png
+share/icons/hicolor/24x24/apps/gnome-modem-monitor-applet.png
+share/icons/hicolor/24x24/apps/gnome-sticky-notes-applet.png
+share/icons/hicolor/32x32/apps/gnome-cpu-frequency-applet.png
+share/icons/hicolor/32x32/apps/gnome-eyes-applet.png
+share/icons/hicolor/32x32/apps/gnome-modem-monitor-applet.png
+share/icons/hicolor/32x32/apps/gnome-sticky-notes-applet.png
share/icons/hicolor/48x48/apps/ax-applet.png
share/icons/hicolor/48x48/apps/charpick.png
-share/icons/hicolor/48x48/apps/gnome-cpu.png
-share/icons/hicolor/48x48/apps/gnome-eyes.png
%%COMMANDER%%share/icons/hicolor/48x48/apps/gnome-mini-commander.png
-share/icons/hicolor/48x48/apps/gnome-modem.png
-share/icons/hicolor/48x48/apps/gnome-money.png
share/icons/hicolor/48x48/apps/gswitchit-applet.png
share/icons/hicolor/48x48/apps/gswitchit-properties-capplet.png
+share/icons/hicolor/svgxsvg/apps/gnome-cpu-frequency-applet
+share/icons/hicolor/svgxsvg/apps/gnome-eyes-applet
+share/icons/hicolor/svgxsvg/apps/gnome-modem-monitor-applet
+share/icons/hicolor/svgxsvg/apps/gnome-sticky-notes-applet
share/locale/am/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/br/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo
@@ -744,6 +915,23 @@ 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/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
+share/locale/es_CO/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_CR/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_DO/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_EC/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_ES/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_GT/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_HN/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_MX/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_NI/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_PA/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_PE/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_PR/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_SV/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_UY/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_VE/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/et/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/eu/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/fa/LC_MESSAGES/gnome-applets-2.0.mo
@@ -767,15 +955,17 @@ share/locale/ku/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ky/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/mg/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/mr/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ne/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/no/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/or/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/pa/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-applets-2.0.mo
@@ -800,24 +990,8 @@ share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ky/LC_MESSAGES
-@dirrmtry share/locale/ky
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
+@dirrmtry share/icons/hicolor/svgxsvg/apps
+@dirrmtry share/icons/hicolor/svgxsvg
@dirrmtry share/icons/hicolor/48x48/apps
@dirrmtry share/icons/hicolor/48x48
@dirrmtry share/icons/hicolor
@@ -829,18 +1003,19 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/omf/stickynotes_applet
@dirrm share/gnome/omf/multiload
@dirrm share/gnome/omf/mixer_applet2
-%%COMMANDER%%@dirrm share/gnome/omf/command-line
@dirrm share/gnome/omf/gweather
-@dirrm share/gnome/omf/gtik2_applet2
@dirrm share/gnome/omf/gswitchit
@dirrm share/gnome/omf/geyes
@dirrm share/gnome/omf/drivemount
%%CPUFREQ%%@dirrm share/gnome/omf/cpufreq-applet
+%%COMMANDER%%@dirrm share/gnome/omf/command-line
@dirrm share/gnome/omf/char-palette
%%BATTERY%%@dirrm share/gnome/omf/battstat
@dirrm share/gnome/omf/accessx-status
@dirrm share/gnome/help/trashapplet/uk/figures
@dirrm share/gnome/help/trashapplet/uk
+@dirrm share/gnome/help/trashapplet/sv/figures
+@dirrm share/gnome/help/trashapplet/sv
@dirrm share/gnome/help/trashapplet/ru/figures
@dirrm share/gnome/help/trashapplet/ru
@dirrm share/gnome/help/trashapplet/pa/figures
@@ -858,6 +1033,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/trashapplet
@dirrm share/gnome/help/stickynotes_applet/uk/figures
@dirrm share/gnome/help/stickynotes_applet/uk
+@dirrm share/gnome/help/stickynotes_applet/sv/figures
+@dirrm share/gnome/help/stickynotes_applet/sv
@dirrm share/gnome/help/stickynotes_applet/fr/figures
@dirrm share/gnome/help/stickynotes_applet/fr
@dirrm share/gnome/help/stickynotes_applet/es/figures
@@ -867,6 +1044,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/stickynotes_applet
@dirrm share/gnome/help/multiload/uk/figures
@dirrm share/gnome/help/multiload/uk
+@dirrm share/gnome/help/multiload/sv/figures
+@dirrm share/gnome/help/multiload/sv
@dirrm share/gnome/help/multiload/fr/figures
@dirrm share/gnome/help/multiload/fr
@dirrm share/gnome/help/multiload/es/figures
@@ -876,6 +1055,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/multiload
@dirrm share/gnome/help/mixer_applet2/uk/figures
@dirrm share/gnome/help/mixer_applet2/uk
+@dirrm share/gnome/help/mixer_applet2/sv/figures
+@dirrm share/gnome/help/mixer_applet2/sv
@dirrm share/gnome/help/mixer_applet2/it/figures
@dirrm share/gnome/help/mixer_applet2/it
@dirrm share/gnome/help/mixer_applet2/fr/figures
@@ -887,6 +1068,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/mixer_applet2
@dirrm share/gnome/help/gweather/uk/figures
@dirrm share/gnome/help/gweather/uk
+@dirrm share/gnome/help/gweather/sv/figures
+@dirrm share/gnome/help/gweather/sv
@dirrm share/gnome/help/gweather/nl/figures
@dirrm share/gnome/help/gweather/nl
@dirrm share/gnome/help/gweather/fr/figures
@@ -896,22 +1079,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/gweather/C/figures
@dirrm share/gnome/help/gweather/C
@dirrm share/gnome/help/gweather
-@dirrm share/gnome/help/gtik2_applet2/uk/figures
-@dirrm share/gnome/help/gtik2_applet2/uk
-@dirrm share/gnome/help/gtik2_applet2/fr/figures
-@dirrm share/gnome/help/gtik2_applet2/fr
-@dirrm share/gnome/help/gtik2_applet2/es/figures
-@dirrm share/gnome/help/gtik2_applet2/es
-@dirrm share/gnome/help/gtik2_applet2/C/figures
-@dirrm share/gnome/help/gtik2_applet2/C
-@dirrm share/gnome/help/gtik2_applet2
@dirrm share/gnome/help/gswitchit/uk
+@dirrm share/gnome/help/gswitchit/sv
@dirrm share/gnome/help/gswitchit/fr
@dirrm share/gnome/help/gswitchit/es
@dirrm share/gnome/help/gswitchit/C
@dirrm share/gnome/help/gswitchit
@dirrm share/gnome/help/geyes/uk/figures
@dirrm share/gnome/help/geyes/uk
+@dirrm share/gnome/help/geyes/sv/figures
+@dirrm share/gnome/help/geyes/sv
@dirrm share/gnome/help/geyes/ru/figures
@dirrm share/gnome/help/geyes/ru
@dirrm share/gnome/help/geyes/it/figures
@@ -925,8 +1102,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/geyes/C/figures
@dirrm share/gnome/help/geyes/C
@dirrm share/gnome/help/geyes
+@dirrm share/gnome/help/drivemount/zh_CN/figures
+@dirrm share/gnome/help/drivemount/zh_CN
@dirrm share/gnome/help/drivemount/uk/figures
@dirrm share/gnome/help/drivemount/uk
+@dirrm share/gnome/help/drivemount/sv/figures
+@dirrm share/gnome/help/drivemount/sv
@dirrm share/gnome/help/drivemount/pa/figures
@dirrm share/gnome/help/drivemount/pa
@dirrm share/gnome/help/drivemount/it/figures
@@ -938,10 +1119,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/drivemount/C/figures
@dirrm share/gnome/help/drivemount/C
@dirrm share/gnome/help/drivemount
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_CN/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_CN
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/sv/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/sv
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures
@@ -949,6 +1136,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet
%%COMMANDER%%@dirrm share/gnome/help/command-line/uk/figures
%%COMMANDER%%@dirrm share/gnome/help/command-line/uk
+%%COMMANDER%%@dirrm share/gnome/help/command-line/sv/figures
+%%COMMANDER%%@dirrm share/gnome/help/command-line/sv
%%COMMANDER%%@dirrm share/gnome/help/command-line/pt_BR/figures
%%COMMANDER%%@dirrm share/gnome/help/command-line/pt_BR
%%COMMANDER%%@dirrm share/gnome/help/command-line/fr/figures
@@ -960,6 +1149,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
%%COMMANDER%%@dirrm share/gnome/help/command-line
@dirrm share/gnome/help/char-palette/uk/figures
@dirrm share/gnome/help/char-palette/uk
+@dirrm share/gnome/help/char-palette/sv/figures
+@dirrm share/gnome/help/char-palette/sv
@dirrm share/gnome/help/char-palette/pt_BR/figures
@dirrm share/gnome/help/char-palette/pt_BR
@dirrm share/gnome/help/char-palette/nl/figures
@@ -977,6 +1168,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/char-palette
%%BATTERY%%@dirrm share/gnome/help/battstat/uk/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/uk
+%%BATTERY%%@dirrm share/gnome/help/battstat/sv/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/sv
%%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/fr
%%BATTERY%%@dirrm share/gnome/help/battstat/es/figures
@@ -988,6 +1181,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
%%BATTERY%%@dirrm share/gnome/help/battstat
@dirrm share/gnome/help/accessx-status/uk/figures
@dirrm share/gnome/help/accessx-status/uk
+@dirrm share/gnome/help/accessx-status/sv/figures
+@dirrm share/gnome/help/accessx-status/sv
+@dirrm share/gnome/help/accessx-status/nl/figures
+@dirrm share/gnome/help/accessx-status/nl
@dirrm share/gnome/help/accessx-status/it/figures
@dirrm share/gnome/help/accessx-status/it
@dirrm share/gnome/help/accessx-status/fr/figures
@@ -999,8 +1196,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/accessx-status/C/figures
@dirrm share/gnome/help/accessx-status/C
@dirrm share/gnome/help/accessx-status
+@dirrm share/gnome/gnome-applets/invest-applet
@dirrm share/gnome/gnome-applets/gweather
@dirrm share/gnome/gnome-applets/glade
+@dirrm share/gnome/gnome-applets/geyes/Tango
@dirrm share/gnome/gnome-applets/geyes/Horrid
@dirrm share/gnome/gnome-applets/geyes/Default-tiny
@dirrm share/gnome/gnome-applets/geyes/Default
@@ -1008,5 +1207,94 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/gnome-applets/geyes/Bizarre
@dirrm share/gnome/gnome-applets/geyes
@dirrm share/gnome/gnome-applets
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/invest
@dirrm include/libgweather
@dirrm include/libgswitchit
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/es_VE/LC_MESSAGES
+@dirrmtry share/locale/es_VE
+@dirrmtry share/locale/es_UY/LC_MESSAGES
+@dirrmtry share/locale/es_UY
+@dirrmtry share/locale/es_SV/LC_MESSAGES
+@dirrmtry share/locale/es_SV
+@dirrmtry share/locale/es_PR/LC_MESSAGES
+@dirrmtry share/locale/es_PR
+@dirrmtry share/locale/es_PE/LC_MESSAGES
+@dirrmtry share/locale/es_PE
+@dirrmtry share/locale/es_PA/LC_MESSAGES
+@dirrmtry share/locale/es_PA
+@dirrmtry share/locale/es_NI/LC_MESSAGES
+@dirrmtry share/locale/es_NI
+@dirrmtry share/locale/es_HN/LC_MESSAGES
+@dirrmtry share/locale/es_HN
+@dirrmtry share/locale/es_GT/LC_MESSAGES
+@dirrmtry share/locale/es_GT
+@dirrmtry share/locale/es_EC/LC_MESSAGES
+@dirrmtry share/locale/es_EC
+@dirrmtry share/locale/es_DO/LC_MESSAGES
+@dirrmtry share/locale/es_DO
+@dirrmtry share/locale/es_CR/LC_MESSAGES
+@dirrmtry share/locale/es_CR
+@dirrmtry share/locale/es_CO/LC_MESSAGES
+@dirrmtry share/locale/es_CO
+@dirrmtry share/locale/es_CL/LC_MESSAGES
+@dirrmtry share/locale/es_CL
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 9f77982a84d4..7d335bd5e5c2 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,15 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomedesktop/Makefile,v 1.90 2006/04/13 07:52:40 bland Exp $
+# $MCom: ports/x11/gnome-desktop/Makefile,v 1.105 2006/10/03 01:38:25 ahze Exp $
#
PORTNAME= gnome-desktop
-PORTVERSION= 2.14.3
+PORTVERSION= 2.16.1
PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITE_SUBDIR= sources/gnome-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -28,9 +28,9 @@ GNOME_DESKTOP_VERSION=2
USE_GETTEXT= yes
USE_GMAKE= yes
USE_BISON= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \
--with-kde-datadir=${LOCALBASE}/share
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index eb2da5b52a27..ae08f08040f7 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-desktop-2.14.3.tar.bz2) = 2a8547ab0dcb10a1ad297874ae95b06b
-SHA256 (gnome2/gnome-desktop-2.14.3.tar.bz2) = 9e477d0730fcf9736537f4a9a1f1d1ed5c6407c24f8f9d0514236e94384d6889
-SIZE (gnome2/gnome-desktop-2.14.3.tar.bz2) = 1186546
+MD5 (gnome2/gnome-desktop-2.16.1.tar.bz2) = e92edb17cd75faca45a4fe2d6806bdd8
+SHA256 (gnome2/gnome-desktop-2.16.1.tar.bz2) = 56c7dbe56e6a9fbcd3730c55892734a9daff23a86d69f49a381a4c965732f9d1
+SIZE (gnome2/gnome-desktop-2.16.1.tar.bz2) = 1230980
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index f70d5fc1b858..94d8084d40ea 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -22,43 +22,59 @@ share/gnome/gnome-about/headers/header-bg-sunset01.png
share/gnome/help/fdl/C/fdl.xml
share/gnome/help/fdl/es/fdl.xml
share/gnome/help/fdl/fr/fdl.xml
+share/gnome/help/fdl/sv/fdl.xml
share/gnome/help/fdl/uk/fdl.xml
share/gnome/help/gnome-feedback/C/gnome-feedback.xml
share/gnome/help/gnome-feedback/es/gnome-feedback.xml
share/gnome/help/gnome-feedback/fr/gnome-feedback.xml
share/gnome/help/gnome-feedback/it/gnome-feedback.xml
+share/gnome/help/gnome-feedback/ru/gnome-feedback.xml
+share/gnome/help/gnome-feedback/sv/gnome-feedback.xml
share/gnome/help/gnome-feedback/uk/gnome-feedback.xml
+share/gnome/help/gnome-feedback/zh_CN/gnome-feedback.xml
share/gnome/help/gpl/C/gpl.xml
share/gnome/help/gpl/es/gpl.xml
share/gnome/help/gpl/fi/gpl.xml
share/gnome/help/gpl/fr/gpl.xml
share/gnome/help/gpl/pa/gpl.xml
+share/gnome/help/gpl/sv/gpl.xml
share/gnome/help/gpl/uk/gpl.xml
+share/gnome/help/gpl/zh_CN/gpl.xml
share/gnome/help/lgpl/C/lgpl.xml
share/gnome/help/lgpl/es/lgpl.xml
share/gnome/help/lgpl/fr/lgpl.xml
share/gnome/help/lgpl/pa/lgpl.xml
+share/gnome/help/lgpl/sv/lgpl.xml
share/gnome/help/lgpl/uk/lgpl.xml
+share/gnome/help/lgpl/zh_CN/lgpl.xml
share/gnome/omf/fdl/fdl-C.omf
share/gnome/omf/fdl/fdl-es.omf
share/gnome/omf/fdl/fdl-fr.omf
+share/gnome/omf/fdl/fdl-sv.omf
share/gnome/omf/fdl/fdl-uk.omf
share/gnome/omf/gnome-feedback/gnome-feedback-C.omf
share/gnome/omf/gnome-feedback/gnome-feedback-es.omf
share/gnome/omf/gnome-feedback/gnome-feedback-fr.omf
share/gnome/omf/gnome-feedback/gnome-feedback-it.omf
+share/gnome/omf/gnome-feedback/gnome-feedback-ru.omf
+share/gnome/omf/gnome-feedback/gnome-feedback-sv.omf
share/gnome/omf/gnome-feedback/gnome-feedback-uk.omf
+share/gnome/omf/gnome-feedback/gnome-feedback-zh_CN.omf
share/gnome/omf/gpl/gpl-C.omf
share/gnome/omf/gpl/gpl-es.omf
share/gnome/omf/gpl/gpl-fi.omf
share/gnome/omf/gpl/gpl-fr.omf
share/gnome/omf/gpl/gpl-pa.omf
+share/gnome/omf/gpl/gpl-sv.omf
share/gnome/omf/gpl/gpl-uk.omf
+share/gnome/omf/gpl/gpl-zh_CN.omf
share/gnome/omf/lgpl/lgpl-C.omf
share/gnome/omf/lgpl/lgpl-es.omf
share/gnome/omf/lgpl/lgpl-fr.omf
share/gnome/omf/lgpl/lgpl-pa.omf
+share/gnome/omf/lgpl/lgpl-sv.omf
share/gnome/omf/lgpl/lgpl-uk.omf
+share/gnome/omf/lgpl/lgpl-zh_CN.omf
share/gnome/pixmaps/apple-green.png
share/gnome/pixmaps/apple-red.png
share/gnome/pixmaps/gnome-aorta.png
@@ -126,7 +142,6 @@ share/gnome/pixmaps/gnome-user-interface.png
share/gnome/pixmaps/gnome-week.png
share/gnome/pixmaps/gnome-windows.png
share/gnome/pixmaps/gnome-word.png
-share/gnome/pixmaps/gnome-workspace.png
share/gnome/pixmaps/gnome-xterm.png
share/gnome/pixmaps/gtkvim.png
share/gnome/pixmaps/kterm.xpm
@@ -139,6 +154,7 @@ share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/bn/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/br/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -177,6 +193,7 @@ share/locale/ky/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/mg/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/mi/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -187,7 +204,6 @@ share/locale/nb/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/no/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/nso/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/or/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/pa/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -210,6 +226,7 @@ share/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ur/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -219,43 +236,113 @@ share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/yo/LC_MESSAGES
-@dirrmtry share/locale/yo
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/ky/LC_MESSAGES
-@dirrmtry share/locale/ky
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
@dirrm share/gnome/omf/lgpl
@dirrm share/gnome/omf/gpl
@dirrm share/gnome/omf/gnome-feedback
@dirrm share/gnome/omf/fdl
+@dirrm share/gnome/help/lgpl/zh_CN
@dirrm share/gnome/help/lgpl/uk
+@dirrm share/gnome/help/lgpl/sv
@dirrm share/gnome/help/lgpl/pa
@dirrm share/gnome/help/lgpl/fr
@dirrm share/gnome/help/lgpl/es
+@dirrm share/gnome/help/gpl/zh_CN
@dirrm share/gnome/help/gpl/uk
+@dirrm share/gnome/help/gpl/sv
@dirrm share/gnome/help/gpl/pa
@dirrm share/gnome/help/gpl/fr
@dirrm share/gnome/help/gpl/fi
@dirrm share/gnome/help/gpl/es
+@dirrm share/gnome/help/gnome-feedback/zh_CN
@dirrm share/gnome/help/gnome-feedback/uk
+@dirrm share/gnome/help/gnome-feedback/sv
+@dirrm share/gnome/help/gnome-feedback/ru
@dirrm share/gnome/help/gnome-feedback/it
@dirrm share/gnome/help/gnome-feedback/fr
@dirrm share/gnome/help/gnome-feedback/es
@dirrm share/gnome/help/gnome-feedback/C
@dirrm share/gnome/help/gnome-feedback
@dirrm share/gnome/help/fdl/uk
+@dirrm share/gnome/help/fdl/sv
@dirrm share/gnome/help/fdl/fr
@dirrm share/gnome/help/fdl/es
@dirrm share/gnome/gnome-about/headers
@dirrm include/gnome-desktop-2.0/libgnomeui
@dirrm include/gnome-desktop-2.0/libgnome
@dirrm include/gnome-desktop-2.0
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yo/LC_MESSAGES
+@dirrmtry share/locale/yo
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 7adeffeebdc0..26c86ecf496d 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-menus/Makefile,v 1.29 2006/04/13 13:04:49 ahze Exp $
+# $MCom: ports/x11/gnome-menus/Makefile,v 1.39 2006/10/03 11:32:43 ahze Exp $
#
PORTNAME= gnome-menus
-PORTVERSION= 2.14.3
+PORTVERSION= 2.16.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,12 +18,12 @@ COMMENT= Implementation of the FreeDesktop Desktop Menu Spec
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomevfs2 ltverhack
USE_AUTOTOOLS= libtool:15
USE_PYTHON= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -34,16 +34,24 @@ USE_FAM= yes
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/share/gnome|${X11BASE}/share/gnome|g' \
+ @${REINPLACE_CMD} -e 's|applications.menu||' \
+ ${WRKSRC}/layout/Makefile.in
+ @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
+ ${WRKSRC}/util/test-menu-spec.c
+ @${REINPLACE_CMD} -e 's|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \
${WRKSRC}/layout/applications.menu \
${WRKSRC}/layout/settings.menu
@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
- @${REINPLACE_CMD} -e s'|%%X11BASE%%|${X11BASE}|g' \
+ @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \
+ s|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py
post-install:
@${MKDIR} ${PREFIX}/share/gnome/desktop-directories
- @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/desktop-directories
+ @${INSTALL_DATA} ${WRKSRC}/layout/applications.menu \
+ ${PREFIX}/etc/xdg/menus/gnome-applications.menu
+ @${INSTALL_DATA} ${WRKSRC}/KDE.directory \
+ ${PREFIX}/share/gnome/desktop-directories
.include <bsd.port.post.mk>
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index f0a6d4915c21..40c830018d7e 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-menus-2.14.3.tar.bz2) = 9926e7ad14255d1a08c7e774052f8a3a
-SHA256 (gnome2/gnome-menus-2.14.3.tar.bz2) = 0bc939a5c8347cfcbd83087f05f517b3a093515a93c104b833f2b05564df14d9
-SIZE (gnome2/gnome-menus-2.14.3.tar.bz2) = 406000
+MD5 (gnome2/gnome-menus-2.16.1.tar.bz2) = a5c467abe68003d23ec09a795ebfd29f
+SHA256 (gnome2/gnome-menus-2.16.1.tar.bz2) = 72238f33406ada505fde8555ff93c00e7fec055a41500339b434c5445b09c87b
+SIZE (gnome2/gnome-menus-2.16.1.tar.bz2) = 416053
diff --git a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
index 2306f060952e..5620119697f0 100644
--- a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
+++ b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
@@ -5,7 +5,7 @@
conf_dirs = os.environ["XDG_CONFIG_DIRS"]
if not conf_dirs:
- conf_dirs = "/etc/xdg"
-+ conf_dirs = "%%X11BASE%%/etc/xdg"
++ conf_dirs = "%%LOCALBASE%%/etc/xdg"
for conf_dir in conf_dirs.split (":"):
menu_file_path = os.path.join (conf_dir, "menus", menu_file)
@@ -14,7 +14,7 @@
data_dirs = os.environ["XDG_DATA_DIRS"]
if not data_dirs:
- data_dirs = "/usr/local/share/:/usr/share/"
-+ data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"
++ data_dirs = "%%X11BASE%%/share/gnome/:%%LOCALBASE%%/share/gnome/:%%X11BASE%%/share/:%%LOCALBASE%%/share/:/usr/share/"
for data_dir in data_dirs.split (":"):
retval = load_icon_from_path (os.path.join (data_dir, "pixmaps", icon_value))
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index 819f01166655..1a63a7cb3952 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -1,5 +1,5 @@
bin/gnome-menu-spec-test
-etc/xdg/menus/applications.menu
+etc/xdg/menus/gnome-applications.menu
etc/xdg/menus/preferences.menu
etc/xdg/menus/settings.menu
include/gnome-menus/gmenu-tree.h
@@ -30,8 +30,10 @@ share/gnome/desktop-directories/Settings.directory
share/gnome/desktop-directories/System-Settings.directory
share/gnome/desktop-directories/System-Tools.directory
share/locale/ar/LC_MESSAGES/gnome-menus.mo
+share/locale/be/LC_MESSAGES/gnome-menus.mo
share/locale/bg/LC_MESSAGES/gnome-menus.mo
share/locale/bn/LC_MESSAGES/gnome-menus.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-menus.mo
share/locale/br/LC_MESSAGES/gnome-menus.mo
share/locale/ca/LC_MESSAGES/gnome-menus.mo
share/locale/cs/LC_MESSAGES/gnome-menus.mo
@@ -48,6 +50,7 @@ share/locale/eu/LC_MESSAGES/gnome-menus.mo
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/gn/LC_MESSAGES/gnome-menus.mo
share/locale/gl/LC_MESSAGES/gnome-menus.mo
share/locale/gu/LC_MESSAGES/gnome-menus.mo
share/locale/he/LC_MESSAGES/gnome-menus.mo
@@ -65,12 +68,15 @@ share/locale/lt/LC_MESSAGES/gnome-menus.mo
share/locale/lv/LC_MESSAGES/gnome-menus.mo
share/locale/mg/LC_MESSAGES/gnome-menus.mo
share/locale/mk/LC_MESSAGES/gnome-menus.mo
+share/locale/ml/LC_MESSAGES/gnome-menus.mo
+share/locale/mn/LC_MESSAGES/gnome-menus.mo
share/locale/mr/LC_MESSAGES/gnome-menus.mo
share/locale/ms/LC_MESSAGES/gnome-menus.mo
share/locale/nb/LC_MESSAGES/gnome-menus.mo
share/locale/ne/LC_MESSAGES/gnome-menus.mo
share/locale/nl/LC_MESSAGES/gnome-menus.mo
share/locale/nn/LC_MESSAGES/gnome-menus.mo
+share/locale/or/LC_MESSAGES/gnome-menus.mo
share/locale/pa/LC_MESSAGES/gnome-menus.mo
share/locale/pl/LC_MESSAGES/gnome-menus.mo
share/locale/pt/LC_MESSAGES/gnome-menus.mo
@@ -79,10 +85,12 @@ share/locale/ro/LC_MESSAGES/gnome-menus.mo
share/locale/ru/LC_MESSAGES/gnome-menus.mo
share/locale/rw/LC_MESSAGES/gnome-menus.mo
share/locale/sk/LC_MESSAGES/gnome-menus.mo
+share/locale/sl/LC_MESSAGES/gnome-menus.mo
share/locale/sq/LC_MESSAGES/gnome-menus.mo
share/locale/sr/LC_MESSAGES/gnome-menus.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-menus.mo
share/locale/sv/LC_MESSAGES/gnome-menus.mo
+share/locale/ta/LC_MESSAGES/gnome-menus.mo
share/locale/te/LC_MESSAGES/gnome-menus.mo
share/locale/th/LC_MESSAGES/gnome-menus.mo
share/locale/tr/LC_MESSAGES/gnome-menus.mo
@@ -93,14 +101,44 @@ share/locale/xh/LC_MESSAGES/gnome-menus.mo
share/locale/zh_CN/LC_MESSAGES/gnome-menus.mo
share/locale/zh_HK/LC_MESSAGES/gnome-menus.mo
share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
+@dirrm share/gnome/desktop-directories
+@dirrm include/gnome-menus
+@dirrmtry etc/xdg/menus
+@dirrmtry etc/xdg
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@@ -109,15 +147,25 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/gn/LC_MESSAGES
+@dirrmtry share/locale/gn
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrm share/gnome/desktop-directories
-@dirrm include/gnome-menus
-@dirrm etc/xdg/menus
-@dirrm etc/xdg
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 51fe15c38f06..061c0721c5cc 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomepanel/Makefile,v 1.128 2006/04/13 07:52:40 bland Exp $
+# $MCom: ports/x11/gnome-panel/Makefile,v 1.140 2006/10/03 11:29:52 ahze Exp $
#
PORTNAME= gnome-panel
-PORTVERSION= 2.14.3
+PORTVERSION= 2.16.1
PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -21,12 +21,10 @@ USE_BZIP2= yes
.if !defined(REFERENCE_PORT)
-RUN_DEPENDS= gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor
-
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
INSTALLS_OMF= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
INSTALLS_ICONS= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \
libwnck gnomemenus gnomedocutils ltverhack referencehack
@@ -61,6 +59,11 @@ CONFIGURE_ARGS+=--disable-eds
.endif
post-patch:
+ @${REINPLACE_CMD} -e 's|evolution.desktop|evolution-2.8.desktop|g' \
+ ${WRKSRC}/gnome-panel/panel-default-setup.entries
+ @${FIND} ${WRKSRC} -type f | \
+ ${XARGS} -n 10 ${REINPLACE_CMD} -e \
+ 's|"applications.menu"|"gnome-applications.menu"|'
.if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
( ${OSVERSION} < 503101 )
.for po in da.po it.po zh_CN.po zh_TW.po
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 5293aefd82d0..f7f0e1ad0349 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.14.3.tar.bz2) = 14ab4c3d3ff3d0c1be397b6799a8626c
-SHA256 (gnome2/gnome-panel-2.14.3.tar.bz2) = ed644b064867da915199b2e9761a3059a87bc9a03b4f1013d52a0096001bb62f
-SIZE (gnome2/gnome-panel-2.14.3.tar.bz2) = 2579582
+MD5 (gnome2/gnome-panel-2.16.1.tar.bz2) = d0131e0b33a63b17b22b4d78b00291f8
+SHA256 (gnome2/gnome-panel-2.16.1.tar.bz2) = 711d7c19f0cacc5a0d0407065793c50dd7e3a154551602f4768df2da55743b23
+SIZE (gnome2/gnome-panel-2.16.1.tar.bz2) = 2689938
diff --git a/x11/gnome-panel/files/patch-applets_notification__area_eggtraymanager.c b/x11/gnome-panel/files/patch-applets_notification__area_eggtraymanager.c
deleted file mode 100644
index 727a47b99ca4..000000000000
--- a/x11/gnome-panel/files/patch-applets_notification__area_eggtraymanager.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- applets/notification_area/eggtraymanager.c.orig Sat Dec 31 14:39:09 2005
-+++ applets/notification_area/eggtraymanager.c Mon May 15 01:36:18 2006
-@@ -291,6 +291,36 @@
- return FALSE;
- }
-
-+static gboolean
-+transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
-+{
-+ gdk_window_clear_area (widget->window, event->area.x, event->area.y,
-+ event->area.width, event->area.height);
-+ return FALSE;
-+}
-+
-+static void
-+make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
-+ gpointer user_data)
-+{
-+ gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
-+}
-+
-+static void
-+make_transparent (GtkWidget *widget, gpointer user_data)
-+{
-+ if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
-+ return;
-+
-+ gtk_widget_set_app_paintable (widget, TRUE);
-+ gtk_widget_set_double_buffered (widget, FALSE);
-+ gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
-+ g_signal_connect (widget, "expose_event",
-+ G_CALLBACK (transparent_expose_event), NULL);
-+ g_signal_connect_after (widget, "style_set",
-+ G_CALLBACK (make_transparent_again), NULL);
-+}
-+
- static void
- egg_tray_manager_handle_dock_request (EggTrayManager *manager,
- XClientMessageEvent *xevent)
-@@ -306,6 +336,8 @@
- }
-
- socket = gtk_socket_new ();
-+ g_signal_connect (socket, "realize",
-+ G_CALLBACK (make_transparent), NULL);
-
- /* We need to set the child window here
- * so that the client can call _get functions
diff --git a/x11/gnome-panel/files/patch-applets_notification__area_main.c b/x11/gnome-panel/files/patch-applets_notification__area_main.c
deleted file mode 100644
index 22802096cf28..000000000000
--- a/x11/gnome-panel/files/patch-applets_notification__area_main.c
+++ /dev/null
@@ -1,73 +0,0 @@
---- applets/notification_area/main.c.orig Wed Dec 28 22:15:27 2005
-+++ applets/notification_area/main.c Mon May 15 01:36:01 2006
-@@ -159,14 +159,24 @@
- tray = all_trays->data;
-
- gtk_box_pack_end (GTK_BOX (tray->box), icon, FALSE, FALSE, 0);
--
-+
-+ gtk_widget_hide (tray->box);
- gtk_widget_show (icon);
-+ gtk_widget_show (tray->box);
- }
-
- static void
- tray_removed (EggTrayManager *manager, GtkWidget *icon, void *data)
- {
-+ SystemTray *tray;
-+
-+ if (all_trays == NULL)
-+ return;
-+
-+ tray = all_trays->data;
-
-+ gtk_widget_hide (tray->box);
-+ gtk_widget_show (tray->box);
- }
-
- static void
-@@ -207,9 +217,32 @@
- gtk_widget_set_size_request (tray->box, -1, MIN_BOX_SIZE);
- break;
- }
-+
-+ /* Force the icons to redraw their backgrounds.
-+ * gtk_widget_queue_draw() doesn't work across process boundaries,
-+ * so we do this instead.
-+ */
-+ gtk_widget_hide (tray->box);
-+ gtk_widget_show (tray->box);
- }
-
- static void
-+applet_change_background (PanelApplet *applet,
-+ PanelAppletBackgroundType type,
-+ GdkColor *color,
-+ GdkPixmap *pixmap,
-+ SystemTray *tray)
-+{
-+ /* Force the icons to redraw their backgrounds.
-+ * gtk_widget_queue_draw() doesn't work across process boundaries,
-+ * so we do this instead.
-+ */
-+ gtk_widget_hide (tray->box);
-+ gtk_widget_show (tray->box);
-+}
-+
-+
-+static void
- applet_change_orientation (PanelApplet *applet,
- PanelAppletOrient orient,
- SystemTray *tray)
-@@ -332,6 +365,11 @@
- g_signal_connect (G_OBJECT (tray->applet),
- "change_orient",
- G_CALLBACK (applet_change_orientation),
-+ tray);
-+
-+ g_signal_connect (G_OBJECT (tray->applet),
-+ "change_background",
-+ G_CALLBACK (applet_change_background),
- tray);
-
- g_signal_connect (tray->applet,
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 756d58483ce3..70c9d7a51a4e 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -86,10 +86,6 @@ share/gnome/help/fish-applet-2/ko/figures/fish_applet.png
share/gnome/help/fish-applet-2/ko/figures/fish_settings.png
share/gnome/help/fish-applet-2/ko/fish-applet-2.xml
share/gnome/help/fish-applet-2/ko/legal.xml
-share/gnome/help/fish-applet-2/sv/figures/fish_applet.png
-share/gnome/help/fish-applet-2/sv/figures/fish_settings.png
-share/gnome/help/fish-applet-2/sv/fish-applet-2.xml
-share/gnome/help/fish-applet-2/sv/legal.xml
share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png
share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png
share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml
@@ -147,7 +143,6 @@ share/gnome/help/window-list/ko/figures/window_list_group_applet.png
share/gnome/help/window-list/ko/legal.xml
share/gnome/help/window-list/ko/window-list.xml
share/gnome/help/window-list/sv/figures/window_list_applet.png
-share/gnome/help/window-list/sv/figures/window_list_group.png
share/gnome/help/window-list/sv/figures/window_list_group_applet.png
share/gnome/help/window-list/sv/legal.xml
share/gnome/help/window-list/sv/window-list.xml
@@ -156,7 +151,6 @@ share/gnome/help/window-list/uk/figures/window_list_group_applet.png
share/gnome/help/window-list/uk/legal.xml
share/gnome/help/window-list/uk/window-list.xml
share/gnome/help/window-list/zh_CN/figures/window_list_applet.png
-share/gnome/help/window-list/zh_CN/figures/window_list_group.png
share/gnome/help/window-list/zh_CN/figures/window_list_group_applet.png
share/gnome/help/window-list/zh_CN/legal.xml
share/gnome/help/window-list/zh_CN/window-list.xml
@@ -192,7 +186,6 @@ share/gnome/help/workspace-switcher/nl/figures/workspace_switcher_applet.png
share/gnome/help/workspace-switcher/nl/legal.xml
share/gnome/help/workspace-switcher/nl/workspace-switcher.xml
share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png
share/gnome/help/workspace-switcher/sv/legal.xml
share/gnome/help/workspace-switcher/sv/workspace-switcher.xml
share/gnome/help/workspace-switcher/uk/figures/workspace_switcher_applet.png
@@ -230,19 +223,15 @@ share/gnome/omf/fish/fish-uk.omf
share/gnome/omf/gnome-panel/fish-applet-2-de.omf
share/gnome/omf/gnome-panel/fish-applet-2-ja.omf
share/gnome/omf/gnome-panel/fish-applet-2-ko.omf
-share/gnome/omf/gnome-panel/fish-applet-2-sv.omf
share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf
share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf
share/gnome/omf/gnome-panel/window-list-de.omf
share/gnome/omf/gnome-panel/window-list-ja.omf
share/gnome/omf/gnome-panel/window-list-ko.omf
-share/gnome/omf/gnome-panel/window-list-sv.omf
-share/gnome/omf/gnome-panel/window-list-zh_CN.omf
share/gnome/omf/gnome-panel/window-list-zh_TW.omf
share/gnome/omf/gnome-panel/workspace-switcher-de.omf
share/gnome/omf/gnome-panel/workspace-switcher-ja.omf
share/gnome/omf/gnome-panel/workspace-switcher-ko.omf
-share/gnome/omf/gnome-panel/workspace-switcher-sv.omf
share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
share/gnome/omf/window-list/window-list-C.omf
@@ -271,11 +260,57 @@ share/gnome/panel/pixmaps/gnome-gegl2-2.png
share/gnome/panel/pixmaps/gnome-gegl2.png
share/gnome/panel/pixmaps/monkey.png
share/gnome/panel/pixmaps/oldwanda.png
-share/icons/hicolor/48x48/apps/gnome-fish.png
-share/icons/hicolor/48x48/apps/gnome-gegl.png
-share/icons/hicolor/48x48/apps/gnome-main-menu.png
-share/icons/hicolor/48x48/apps/panel-force-quit.png
-share/icons/hicolor/48x48/apps/panel-separator.png
+share/gnome/panel/pixmaps/wanda.png
+share/icons/hicolor/16x16/apps/gnome-panel-clock.png
+share/icons/hicolor/16x16/apps/gnome-panel-drawer.png
+share/icons/hicolor/16x16/apps/gnome-panel-fish.png
+share/icons/hicolor/16x16/apps/gnome-panel-force-quit.png
+share/icons/hicolor/16x16/apps/gnome-panel-notification-area.png
+share/icons/hicolor/16x16/apps/gnome-panel-separator.png
+share/icons/hicolor/16x16/apps/gnome-panel-window-list.png
+share/icons/hicolor/16x16/apps/gnome-panel-window-menu.png
+share/icons/hicolor/16x16/apps/gnome-panel-workspace-switcher.png
+share/icons/hicolor/16x16/apps/gnome-panel.png
+share/icons/hicolor/22x22/apps/gnome-panel-clock.png
+share/icons/hicolor/22x22/apps/gnome-panel-drawer.png
+share/icons/hicolor/22x22/apps/gnome-panel-fish.png
+share/icons/hicolor/22x22/apps/gnome-panel-force-quit.png
+share/icons/hicolor/22x22/apps/gnome-panel-notification-area.png
+share/icons/hicolor/22x22/apps/gnome-panel-separator.png
+share/icons/hicolor/22x22/apps/gnome-panel-window-list.png
+share/icons/hicolor/22x22/apps/gnome-panel-window-menu.png
+share/icons/hicolor/22x22/apps/gnome-panel-workspace-switcher.png
+share/icons/hicolor/22x22/apps/gnome-panel.png
+share/icons/hicolor/24x24/apps/gnome-panel-clock.png
+share/icons/hicolor/24x24/apps/gnome-panel-drawer.png
+share/icons/hicolor/24x24/apps/gnome-panel-fish.png
+share/icons/hicolor/24x24/apps/gnome-panel-force-quit.png
+share/icons/hicolor/24x24/apps/gnome-panel-notification-area.png
+share/icons/hicolor/24x24/apps/gnome-panel-separator.png
+share/icons/hicolor/24x24/apps/gnome-panel-window-list.png
+share/icons/hicolor/24x24/apps/gnome-panel-window-menu.png
+share/icons/hicolor/24x24/apps/gnome-panel-workspace-switcher.png
+share/icons/hicolor/24x24/apps/gnome-panel.png
+share/icons/hicolor/32x32/apps/gnome-panel-clock.png
+share/icons/hicolor/32x32/apps/gnome-panel-drawer.png
+share/icons/hicolor/32x32/apps/gnome-panel-fish.png
+share/icons/hicolor/32x32/apps/gnome-panel-force-quit.png
+share/icons/hicolor/32x32/apps/gnome-panel-notification-area.png
+share/icons/hicolor/32x32/apps/gnome-panel-separator.png
+share/icons/hicolor/32x32/apps/gnome-panel-window-list.png
+share/icons/hicolor/32x32/apps/gnome-panel-window-menu.png
+share/icons/hicolor/32x32/apps/gnome-panel-workspace-switcher.png
+share/icons/hicolor/32x32/apps/gnome-panel.png
+share/icons/hicolor/scalable/apps/gnome-panel-clock.svg
+share/icons/hicolor/scalable/apps/gnome-panel-drawer.svg
+share/icons/hicolor/scalable/apps/gnome-panel-fish.svg
+share/icons/hicolor/scalable/apps/gnome-panel-force-quit.svg
+share/icons/hicolor/scalable/apps/gnome-panel-notification-area.svg
+share/icons/hicolor/scalable/apps/gnome-panel-separator.svg
+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/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
@@ -360,34 +395,6 @@ share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/yi/LC_MESSAGES
-@dirrmtry share/locale/yi
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mi/LC_MESSAGES
-@dirrmtry share/locale/mi
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/ky/LC_MESSAGES
-@dirrmtry share/locale/ky
-@dirrmtry share/locale/ka/LC_MESSAGES
-@dirrmtry share/locale/ka
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
@dirrm share/gnome/panel/pixmaps
@dirrm share/gnome/panel/glade
@dirrm share/gnome/omf/workspace-switcher
@@ -460,8 +467,6 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/help/fish-applet-2/zh_TW
@dirrm share/gnome/help/fish-applet-2/zh_CN/figures
@dirrm share/gnome/help/fish-applet-2/zh_CN
-@dirrm share/gnome/help/fish-applet-2/sv/figures
-@dirrm share/gnome/help/fish-applet-2/sv
@dirrm share/gnome/help/fish-applet-2/ko/figures
@dirrm share/gnome/help/fish-applet-2/ko
@dirrm share/gnome/help/fish-applet-2/ja/figures
@@ -500,3 +505,73 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/help/clock/C
@dirrm share/gnome/help/clock
@dirrm include/panel-2.0
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 20ac6e499dfc..efc70f133bde 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,37 +3,42 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.36 2006/04/13 07:52:40 bland Exp $
+# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.58 2006/10/07 19:45:39 marcus Exp $
#
PORTNAME= gnome-screensaver
-PORTVERSION= 2.14.3
+PORTVERSION= 2.16.1
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME screen saver and locker
-LIB_DEPENDS= dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
RUN_DEPENDS= xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomemenus
-CONFIGURE_ARGS= --with-gdm-config=${X11BASE}/etc/gdm/custom.conf \
+CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
--with-xscreensaverdir=${XSCREENSAVER_DIR} \
- --with-xscreensaverhackdir=${X11BASE}/bin/xscreensaver-hacks
+ --with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-
GCONF_SCHEMAS= gnome-screensaver.schemas
PLIST= ${WRKDIR}/pkg-plist
-XSCREENSAVER_DIR= ${X11BASE}/share/xscreensaver/config
+XSCREENSAVER_DIR= ${LOCALBASE}/share/xscreensaver/config
+SCREENSAVER_DIR= share/gnome/applications/screensavers
+
+XSCREENSAVER_EXCLUDE= "(popsquares.xml)"
OPTIONS= PAM "Pluggable Authentication Module support" off
@@ -47,25 +52,20 @@ BROKEN= Does not build on 4.X
CONFIGURE_ARGS+= --disable-pam
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
- ${WRKSRC}/configure
-
pre-install:
@${CP} ${.CURDIR}/pkg-plist ${PLIST}
@cd ${XSCREENSAVER_DIR} && ${FIND} -s * -maxdepth 1 -type f -name "*.xml" | \
- ${SED} -e 's:^:share/gnome/gnome-screensaver/themes/xscreensaver/:' | \
+ ${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
+ ${SED} -e 's:^:${SCREENSAVER_DIR}/:' | \
${SED} -e 's:[.]xml$$:.desktop:' >> ${PLIST}
- @${ECHO_CMD} @dirrm share/gnome/gnome-screensaver/themes/xscreensaver >> ${PLIST}
- @${ECHO_CMD} @dirrm share/gnome/gnome-screensaver/themes >> ${PLIST}
- @${ECHO_CMD} @dirrm share/gnome/gnome-screensaver >> ${PLIST}
+ @${ECHO_CMD} @dirrm ${SCREENSAVER_DIR} >> ${PLIST}
post-install:
${CHOWN} root ${PREFIX}/libexec/gnome-screensaver-dialog
${CHMOD} +s ${PREFIX}/libexec/gnome-screensaver-dialog
- ${MKDIR} ${PREFIX}/share/gnome/gnome-screensaver/themes/xscreensaver
- cd ${PREFIX}/share/gnome/gnome-screensaver/themes/xscreensaver && \
+ cd ${PREFIX}/${SCREENSAVER_DIR} && \
${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \
+ ${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
${XARGS} ${WRKSRC}/data/migrate-xscreensaver-config.sh
.include <bsd.port.post.mk>
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index ea6585adfd5b..ed227ab528a8 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-screensaver-2.14.3.tar.bz2) = 2ed0b9322d284bb1739e037165ca94f2
-SHA256 (gnome-screensaver-2.14.3.tar.bz2) = 3e3fea74513361ec07ee97472be98b8df3749bd09289bcf72a341d0fbc53cdd1
-SIZE (gnome-screensaver-2.14.3.tar.bz2) = 1934769
+MD5 (gnome2/gnome-screensaver-2.16.1.tar.bz2) = af29aeb60a9908f6562664962129ff88
+SHA256 (gnome2/gnome-screensaver-2.16.1.tar.bz2) = 574dd2a987375e0087831e23d650862d5064fdfd43f951f426084cd57cdad2a9
+SIZE (gnome2/gnome-screensaver-2.16.1.tar.bz2) = 2008446
diff --git a/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c b/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c
new file mode 100644
index 000000000000..94d68b8f3a57
--- /dev/null
+++ b/x11/gnome-screensaver/files/patch-src_gs-auth-pam.c
@@ -0,0 +1,11 @@
+--- src/gs-auth-pam.c.orig Mon Aug 14 19:57:29 2006
++++ src/gs-auth-pam.c Mon Aug 14 20:07:43 2006
+@@ -204,7 +204,7 @@ pam_conversation (int
+ if (res) {
+ reply [replies].resp_retcode = PAM_SUCCESS;
+ } else {
+- reply [replies].resp_retcode = PAM_INCOMPLETE;
++ reply [replies].resp_retcode = PAM_TRY_AGAIN;
+ }
+ }
+ }
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index 4d07d26f2189..04c2d2d912db 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -4,16 +4,18 @@ bin/gnome-screensaver-preferences
etc/xdg/menus/gnome-screensavers.menu
libdata/pkgconfig/gnome-screensaver.pc
libexec/gnome-screensaver-dialog
+libexec/gnome-screensaver-gl-helper
libexec/gnome-screensaver/floaters
libexec/gnome-screensaver/popsquares
libexec/gnome-screensaver/slideshow
share/gnome/applications/gnome-screensaver-preferences.desktop
+share/gnome/applications/screensavers/cosmos-slideshow.desktop
+share/gnome/applications/screensavers/footlogo-floaters.desktop
+share/gnome/applications/screensavers/personal-slideshow.desktop
+share/gnome/applications/screensavers/popsquares.desktop
share/gnome/desktop-directories/gnome-screensaver.directory
share/gnome/gnome-screensaver/gnome-screensaver-preferences.glade
-share/gnome/gnome-screensaver/themes/cosmos-slideshow.desktop
-share/gnome/gnome-screensaver/themes/footlogo-floaters.desktop
-share/gnome/gnome-screensaver/themes/personal-slideshow.desktop
-share/gnome/gnome-screensaver/themes/popsquares.desktop
+share/gnome/gnome-screensaver/lock-dialog-default.glade
share/gnome/pixmaps/backgrounds/cosmos/cloud.jpg
share/gnome/pixmaps/backgrounds/cosmos/comet.jpg
share/gnome/pixmaps/backgrounds/cosmos/earth-horizon.jpg
@@ -26,6 +28,7 @@ share/gnome/pixmaps/backgrounds/cosmos/whirlpool.jpg
share/gnome/pixmaps/gnome-logo-white.svg
share/locale/bg/LC_MESSAGES/gnome-screensaver.mo
share/locale/bn/LC_MESSAGES/gnome-screensaver.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-screensaver.mo
share/locale/ca/LC_MESSAGES/gnome-screensaver.mo
share/locale/cs/LC_MESSAGES/gnome-screensaver.mo
share/locale/cy/LC_MESSAGES/gnome-screensaver.mo
@@ -37,6 +40,8 @@ share/locale/en_CA/LC_MESSAGES/gnome-screensaver.mo
share/locale/en_GB/LC_MESSAGES/gnome-screensaver.mo
share/locale/es/LC_MESSAGES/gnome-screensaver.mo
share/locale/et/LC_MESSAGES/gnome-screensaver.mo
+share/locale/eu/LC_MESSAGES/gnome-screensaver.mo
+share/locale/fa/LC_MESSAGES/gnome-screensaver.mo
share/locale/fi/LC_MESSAGES/gnome-screensaver.mo
share/locale/fr/LC_MESSAGES/gnome-screensaver.mo
share/locale/gl/LC_MESSAGES/gnome-screensaver.mo
@@ -52,28 +57,74 @@ share/locale/ko/LC_MESSAGES/gnome-screensaver.mo
share/locale/ku/LC_MESSAGES/gnome-screensaver.mo
share/locale/lt/LC_MESSAGES/gnome-screensaver.mo
share/locale/lv/LC_MESSAGES/gnome-screensaver.mo
+share/locale/mg/LC_MESSAGES/gnome-screensaver.mo
share/locale/mk/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ml/LC_MESSAGES/gnome-screensaver.mo
+share/locale/mn/LC_MESSAGES/gnome-screensaver.mo
share/locale/nb/LC_MESSAGES/gnome-screensaver.mo
share/locale/ne/LC_MESSAGES/gnome-screensaver.mo
share/locale/nl/LC_MESSAGES/gnome-screensaver.mo
-share/locale/no/LC_MESSAGES/gnome-screensaver.mo
+share/locale/or/LC_MESSAGES/gnome-screensaver.mo
share/locale/pa/LC_MESSAGES/gnome-screensaver.mo
share/locale/pl/LC_MESSAGES/gnome-screensaver.mo
share/locale/pt/LC_MESSAGES/gnome-screensaver.mo
share/locale/pt_BR/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ru/LC_MESSAGES/gnome-screensaver.mo
share/locale/sk/LC_MESSAGES/gnome-screensaver.mo
+share/locale/sl/LC_MESSAGES/gnome-screensaver.mo
share/locale/sq/LC_MESSAGES/gnome-screensaver.mo
share/locale/sr/LC_MESSAGES/gnome-screensaver.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-screensaver.mo
share/locale/sv/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ta/LC_MESSAGES/gnome-screensaver.mo
share/locale/th/LC_MESSAGES/gnome-screensaver.mo
+share/locale/tr/LC_MESSAGES/gnome-screensaver.mo
share/locale/uk/LC_MESSAGES/gnome-screensaver.mo
share/locale/vi/LC_MESSAGES/gnome-screensaver.mo
share/locale/zh_CN/LC_MESSAGES/gnome-screensaver.mo
share/locale/zh_HK/LC_MESSAGES/gnome-screensaver.mo
share/locale/zh_TW/LC_MESSAGES/gnome-screensaver.mo
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
@dirrm share/gnome/pixmaps/backgrounds/cosmos
@dirrm share/gnome/pixmaps/backgrounds
+@dirrm share/gnome/gnome-screensaver
@dirrm libexec/gnome-screensaver
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index b15801e9298a..aa8578a569b5 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,16 +3,17 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomesession/Makefile,v 1.83 2006/04/24 03:18:23 marcus Exp $
+# $MCom: ports/x11/gnome-session/Makefile,v 1.96 2006/10/07 19:45:39 marcus Exp $
#
PORTNAME= gnome-session
-PORTVERSION= 2.14.3
+PORTVERSION= 2.16.1
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
${MASTER_SITE_LOCAL:S/$/:local/} \
http://people.FreeBSD.org/~adamw/images/gnome_splashes/2.12/:local
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
+MASTER_SITE_SUBDIR= sources/gnome-session/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
adamw/:local
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${SPLASHES}:local
@@ -22,9 +23,14 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Session component for the GNOME 2 desktop
+BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+ gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
+RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
+
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 3e94fa0eb81c..8b47213d8da0 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnome2/gnome-session-2.14.3.tar.bz2) = 34eb4641e2791ae51acf6f1edfcf3d64
-SHA256 (gnome2/gnome-session-2.14.3.tar.bz2) = 23dfb74225607c586eba3c0539cb5da0133f54b5b5f8407213893386643fa7b2
-SIZE (gnome2/gnome-session-2.14.3.tar.bz2) = 662903
+MD5 (gnome2/gnome-session-2.16.1.tar.bz2) = ef6f87cb3cc6012b212fa14353a63932
+SHA256 (gnome2/gnome-session-2.16.1.tar.bz2) = 6d6d21c6b9a4a2fe7bc288e8fdf36159444370973b4aa71dfc4c48bc0ad7cdf3
+SIZE (gnome2/gnome-session-2.16.1.tar.bz2) = 677501
MD5 (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 4a098f0f2295c3333acff185d4bed5aa
SHA256 (gnome2/freebsd-splashes-gnome-2.12.1.tar) = c7008fc8f43cf07e3d84cbf0bd9b2846fa31aaf37d4f97993b185b4155f8ee27
SIZE (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 1280000
diff --git a/x11/gnome-session/files/patch-dbus b/x11/gnome-session/files/patch-dbus
index edd18bfec916..e7982166670a 100644
--- a/x11/gnome-session/files/patch-dbus
+++ b/x11/gnome-session/files/patch-dbus
@@ -1,39 +1,3 @@
---- gnome-session/main.c.orig Tue Mar 21 12:37:40 2006
-+++ gnome-session/main.c Sun Apr 23 23:05:38 2006
-@@ -43,6 +43,7 @@
- #include "command.h"
- #include "splash-widget.h"
- #include "util.h"
-+#include "gsm-dbus.h"
- #include "gsm-sound.h"
- #include "gsm-gsd.h"
- #include "gsm-keyring.h"
-@@ -334,6 +335,7 @@ main (int argc, char *argv[])
- char *display_str;
- char **versions;
- GConfClient *gconf_client;
-+ gboolean dbus_daemon_owner;
-
- if (getenv ("GSM_VERBOSE_DEBUG"))
- gsm_set_verbose (TRUE);
-@@ -415,6 +417,7 @@ main (int argc, char *argv[])
- fprintf (stderr, "SESSION_MANAGER=%s\n", getenv ("SESSION_MANAGER"));
- gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-session.png");
-
-+ dbus_daemon_owner = gsm_dbus_daemon_start ();
-
- /* Make sure children see the right value for DISPLAY. This is
- useful if --display was specified on the command line. */
-@@ -495,6 +498,9 @@ main (int argc, char *argv[])
- gsm_sound_logout ();
-
- gsm_keyring_daemon_stop ();
-+
-+ if (dbus_daemon_owner)
-+ gsm_dbus_daemon_stop ();
-
- g_object_unref (gconf_client);
- gsm_shutdown_gconfd ();
--- gnome-session/gsm-dbus.h.orig Sun Apr 23 23:01:47 2006
+++ gnome-session/gsm-dbus.h Sun Apr 23 23:00:53 2006
@@ -0,0 +1,27 @@
@@ -427,3 +391,39 @@
+ */
+ g_setenv ("DBUS_SESSION_BUS_ADDRESS", address_str, TRUE);
+}
+--- gnome-session/main.c.orig Wed Jul 26 08:46:36 2006
++++ gnome-session/main.c Mon Aug 7 21:17:49 2006
+@@ -43,6 +43,7 @@
+ #include "command.h"
+ #include "splash-widget.h"
+ #include "util.h"
++#include "gsm-dbus.h"
+ #include "gsm-sound.h"
+ #include "gsm-gsd.h"
+ #include "gsm-keyring.h"
+@@ -329,6 +330,7 @@
+ Session *the_session;
+ gboolean splashing;
+ gboolean a_t_support;
++ gboolean dbus_daemon_owner;
+ GError *err;
+ int status;
+ char *display_str;
+@@ -419,6 +421,7 @@
+ fprintf (stderr, "SESSION_MANAGER=%s\n", getenv ("SESSION_MANAGER"));
+ gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-session.png");
+
++ dbus_daemon_owner = gsm_dbus_daemon_start ();
+
+ /* Make sure children see the right value for DISPLAY. This is
+ useful if --display was specified on the command line. */
+@@ -502,6 +505,9 @@
+ gsm_sound_logout ();
+
+ gsm_keyring_daemon_stop ();
++
++ if (dbus_daemon_owner)
++ gsm_dbus_daemon_stop ();
+
+ g_object_unref (gconf_client);
+ gsm_shutdown_gconfd ();
diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-at-startup.c b/x11/gnome-session/files/patch-gnome-session_gsm-at-startup.c
deleted file mode 100644
index da4950d05c95..000000000000
--- a/x11/gnome-session/files/patch-gnome-session_gsm-at-startup.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-session/gsm-at-startup.c.orig Mon Apr 17 18:00:38 2006
-+++ gnome-session/gsm-at-startup.c Mon Apr 17 18:00:57 2006
-@@ -2,6 +2,7 @@
- #include <string.h>
-
- #include "gsm-at-startup.h"
-+#include "util.h"
-
- #include <gdk/gdk.h>
- #include <libgnome/libgnome.h>
diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-xrandr.c b/x11/gnome-session/files/patch-gnome-session_gsm-xrandr.c
deleted file mode 100644
index 8eae88069c51..000000000000
--- a/x11/gnome-session/files/patch-gnome-session_gsm-xrandr.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-session/gsm-xrandr.c.orig Mon Apr 17 17:59:38 2006
-+++ gnome-session/gsm-xrandr.c Mon Apr 17 17:59:50 2006
-@@ -3,6 +3,7 @@
- #include <gconf/gconf-client.h>
-
- #include "gsm-xrandr.h"
-+#include "util.h"
-
- #ifdef HAVE_RANDR
- #include <stdio.h>
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 89f7d32ff1f6..c34e0b2bf9ad 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -28,6 +28,7 @@ share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo
@@ -63,6 +64,7 @@ share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-session-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mg/LC_MESSAGES/gnome-session-2.0.mo
share/locale/mi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo
@@ -73,15 +75,14 @@ share/locale/nb/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ne/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/no/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nso/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/or/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ro/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
@@ -93,6 +94,7 @@ share/locale/th/LC_MESSAGES/gnome-session-2.0.mo
share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo
@@ -100,11 +102,65 @@ 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
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 1ec65fad47aa..ef60118c8920 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnometerminal/Makefile,v 1.69 2006/04/13 07:52:41 bland Exp $
+# $MCom: ports/x11/gnome-terminal/Makefile,v 1.81 2006/10/03 10:31:27 ahze Exp $
#
PORTNAME= gnome-terminal
-PORTVERSION= 2.14.2
+PORTVERSION= 2.16.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,9 +19,9 @@ COMMENT= Terminal component for the GNOME 2 Desktop
USE_GETTEXT= yes
USE_BZIP2= yes
INSTALLS_OMF= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte
+USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte gnomedocutils
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 999f8bf18e87..8338f725a82c 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-terminal-2.14.2.tar.bz2) = da80071cd707e89cedcfb476cab8b39a
-SHA256 (gnome2/gnome-terminal-2.14.2.tar.bz2) = bd7d500b16ecf1d6189f12ea5d936c218a3e1927ee5ce39119d3aeb8015cca91
-SIZE (gnome2/gnome-terminal-2.14.2.tar.bz2) = 1791473
+MD5 (gnome2/gnome-terminal-2.16.1.tar.bz2) = 861e1b780819214b4d5a398e7999c093
+SHA256 (gnome2/gnome-terminal-2.16.1.tar.bz2) = 814ab099689aabdc6351565215ce6e5a2fc93e8b05fafd3ca70f4cefe167caf0
+SIZE (gnome2/gnome-terminal-2.16.1.tar.bz2) = 1840537
diff --git a/x11/gnome-terminal/files/patch-src_terminal-screen.c b/x11/gnome-terminal/files/patch-src_terminal-screen.c
index 0f5c397cbadd..ffa05b4fcfd6 100644
--- a/x11/gnome-terminal/files/patch-src_terminal-screen.c
+++ b/x11/gnome-terminal/files/patch-src_terminal-screen.c
@@ -1,19 +1,19 @@
---- src/terminal-screen.c.orig Sun Apr 2 18:27:36 2006
-+++ src/terminal-screen.c Sun Apr 2 18:42:41 2006
+--- src/terminal-screen.c.orig Wed May 17 17:02:36 2006
++++ src/terminal-screen.c Thu May 18 15:30:27 2006
@@ -278,22 +278,22 @@ terminal_screen_init (TerminalScreen *sc
#define URLPATH "/[" PATHCHARS "]*[^]'.}>) \t\r\n,\\\"]"
terminal_widget_match_add (screen->priv->term,
- "\\<" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+"
-- "(:[0-9]+)?(" URLPATH ")?\\>", FLAVOR_AS_IS);
+- "(:[0-9]+)?(" URLPATH ")?\\>/?", FLAVOR_AS_IS);
+ "[[:<:]]" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+"
-+ "(:[0-9]+)?(" URLPATH ")?[[:>:]]", FLAVOR_AS_IS);
++ "(:[0-9]+)?(" URLPATH ")?[[:>:]]/?", FLAVOR_AS_IS);
terminal_widget_match_add (screen->priv->term,
- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+"
-- "(:[0-9]+)?(" URLPATH ")?\\>",
+- "(:[0-9]+)?(" URLPATH ")?\\>/?",
+ "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+"
-+ "(:[0-9]+)?(" URLPATH ")?[[:>:]]",
++ "(:[0-9]+)?(" URLPATH ")?[[:>:]]/?",
FLAVOR_DEFAULT_TO_HTTP);
terminal_widget_match_add (screen->priv->term,
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 380a52ff47c5..efd1e99662db 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -26,7 +26,6 @@ share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/fr/figures/terminal_window.png
share/gnome/help/gnome-terminal/fr/gnome-terminal.xml
-share/gnome/help/gnome-terminal/fr/legal.xml
share/gnome/help/gnome-terminal/it/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/it/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/it/figures/terminal_window.png
@@ -51,7 +50,6 @@ share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/sv/figures/terminal_window.png
share/gnome/help/gnome-terminal/sv/gnome-terminal.xml
-share/gnome/help/gnome-terminal/sv/legal.xml
share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/uk/gnome-terminal.xml
@@ -86,8 +84,8 @@ share/locale/az/LC_MESSAGES/gnome-terminal.mo
share/locale/be/LC_MESSAGES/gnome-terminal.mo
share/locale/bg/LC_MESSAGES/gnome-terminal.mo
share/locale/bn/LC_MESSAGES/gnome-terminal.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-terminal.mo
share/locale/bs/LC_MESSAGES/gnome-terminal.mo
-share/locale/br/LC_MESSAGES/gnome-terminal.mo
share/locale/ca/LC_MESSAGES/gnome-terminal.mo
share/locale/cs/LC_MESSAGES/gnome-terminal.mo
share/locale/cy/LC_MESSAGES/gnome-terminal.mo
@@ -114,19 +112,22 @@ share/locale/hy/LC_MESSAGES/gnome-terminal.mo
share/locale/id/LC_MESSAGES/gnome-terminal.mo
share/locale/it/LC_MESSAGES/gnome-terminal.mo
share/locale/ja/LC_MESSAGES/gnome-terminal.mo
+share/locale/ka/LC_MESSAGES/gnome-terminal.mo
share/locale/ko/LC_MESSAGES/gnome-terminal.mo
share/locale/ku/LC_MESSAGES/gnome-terminal.mo
share/locale/lt/LC_MESSAGES/gnome-terminal.mo
share/locale/lv/LC_MESSAGES/gnome-terminal.mo
+share/locale/mg/LC_MESSAGES/gnome-terminal.mo
share/locale/mk/LC_MESSAGES/gnome-terminal.mo
share/locale/ml/LC_MESSAGES/gnome-terminal.mo
share/locale/mn/LC_MESSAGES/gnome-terminal.mo
+share/locale/mr/LC_MESSAGES/gnome-terminal.mo
share/locale/ms/LC_MESSAGES/gnome-terminal.mo
share/locale/nb/LC_MESSAGES/gnome-terminal.mo
share/locale/ne/LC_MESSAGES/gnome-terminal.mo
share/locale/nl/LC_MESSAGES/gnome-terminal.mo
share/locale/nn/LC_MESSAGES/gnome-terminal.mo
-share/locale/no/LC_MESSAGES/gnome-terminal.mo
+share/locale/or/LC_MESSAGES/gnome-terminal.mo
share/locale/pa/LC_MESSAGES/gnome-terminal.mo
share/locale/pl/LC_MESSAGES/gnome-terminal.mo
share/locale/pt/LC_MESSAGES/gnome-terminal.mo
@@ -148,13 +149,8 @@ share/locale/vi/LC_MESSAGES/gnome-terminal.mo
share/locale/wa/LC_MESSAGES/gnome-terminal.mo
share/locale/xh/LC_MESSAGES/gnome-terminal.mo
share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-terminal.mo
share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
@dirrm share/gnome/omf/gnome-terminal
@dirrm share/gnome/help/gnome-terminal/zh_TW/figures
@dirrm share/gnome/help/gnome-terminal/zh_TW
@@ -185,3 +181,57 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
@dirrm share/gnome/help/gnome-terminal
@dirrm share/gnome/gnome-terminal/glade
@dirrm share/gnome/gnome-terminal
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index 09e76f03e4ca..dd7c0e41a46e 100644
--- a/x11/gnome2-fifth-toe/Makefile
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.77 2006/02/03 05:53:28 marcus Exp $
+# $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.79 2006/07/19 06:00:46 ahze Exp $
#
PORTREVISION= 0
@@ -18,23 +18,23 @@ RUN_DEPENDS= pan:${PORTSDIR}/news/pan \
sodipodi:${PORTSDIR}/graphics/sodipodi \
gnomeicu:${PORTSDIR}/net-im/gnomeicu \
gthumb:${PORTSDIR}/graphics/gthumb \
- ${X11BASE}/lib/gaim/docklet.so:${PORTSDIR}/net-im/gaim \
+ ${LOCALBASE}/lib/gaim/docklet.so:${PORTSDIR}/net-im/gaim \
tsclient:${PORTSDIR}/net/tsclient \
galeon:${PORTSDIR}/www/galeon \
seahorse:${PORTSDIR}/security/seahorse \
- ${X11BASE}/share/gnome/themes/Gorilla/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/gnome-themes-extras \
+ ${LOCALBASE}/share/gnome/themes/Gorilla/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/gnome-themes-extras \
bluefish:${PORTSDIR}/www/bluefish \
gossip:${PORTSDIR}/net-im/gossip \
- straw:${PORTSDIR}/net/straw \
liferea:${PORTSDIR}/net/liferea \
gnotime:${PORTSDIR}/deskutils/gnotime \
rhythmbox:${PORTSDIR}/audio/rhythmbox \
jamboree:${PORTSDIR}/audio/jamboree \
- ${X11BASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnome-games-extra-data \
+ ${LOCALBASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnome-games-extra-data \
nautilus-sendto:${PORTSDIR}/deskutils/nautilus-sendto \
goobox:${PORTSDIR}/audio/goobox \
inkscape:${PORTSDIR}/graphics/inkscape \
atomix:${PORTSDIR}/games/atomix
+# straw:${PORTSDIR}/net/straw
MASTERDIR= ${.CURDIR}/../gnome2
GNOME_SLAVE= yes
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index e1e414a8c0de..fd7a26d06f92 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -3,16 +3,16 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome2-lite/Makefile,v 1.45 2005/11/17 23:20:32 marcus Exp $
+# $MCom: ports/x11/gnome2-lite/Makefile,v 1.50 2006/10/14 06:34:16 marcus Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11 gnome
PKGNAMESUFFIX= -lite
COMMENT= The "meta-port" of the GNOME desktop slimmed down for FreeBSD releases
-RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets \
+RUN_DEPENDS= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets \
gnome-cd:${PORTSDIR}/audio/gnome-media \
gnome-dictionary:${PORTSDIR}/deskutils/gnome-utils \
eog:${PORTSDIR}/graphics/eog \
@@ -22,16 +22,17 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets
gnome-system-monitor:${PORTSDIR}/sysutils/gnome-system-monitor \
nautilus:${PORTSDIR}/x11-fm/nautilus \
yelp:${PORTSDIR}/x11/yelp \
- ${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
- ${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
+ ${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
+ ${LOCALBASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
file-roller:${PORTSDIR}/archivers/file-roller \
- ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
+ ${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
evince:${PORTSDIR}/graphics/evince \
gcalctool:${PORTSDIR}/math/gcalctool \
gucharmap:${PORTSDIR}/deskutils/gucharmap \
${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
+ gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
totem:${PORTSDIR}/multimedia/totem-gstreamer
MASTERDIR= ${.CURDIR}/../gnome2
diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile
index 5f135fd0c7ca..14f249d7dbc1 100644
--- a/x11/gnome2-power-tools/Makefile
+++ b/x11/gnome2-power-tools/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.69 2006/04/24 02:51:14 mezz Exp $
+# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.73 2006/10/08 03:46:18 mezz Exp $
#
PORTREVISION= 0
@@ -12,9 +12,9 @@ PKGNAMESUFFIX= -power-tools
COMMENT= The 'Geektoys' for the GNOME 2 power user
-RUN_DEPENDS= ${X11BASE}/lib/epiphany/2.14/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
+RUN_DEPENDS= ${LOCALBASE}/lib/epiphany/2.14/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \
- ${X11BASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \
+ ${LOCALBASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \
${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \
splashsetter:${PORTSDIR}/deskutils/splashsetter \
gdesklets:${PORTSDIR}/deskutils/gdesklets \
@@ -25,12 +25,12 @@ RUN_DEPENDS= ${X11BASE}/lib/epiphany/2.14/extensions/libgesturesextension.so:${P
gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \
serpentine:${PORTSDIR}/sysutils/serpentine \
devilspie:${PORTSDIR}/x11-wm/devilspie \
- ${X11BASE}/lib/nautilus/extensions-1.0/libnautilus-open-terminal.so:${PORTSDIR}/deskutils/nautilus-open-terminal \
+ ${LOCALBASE}/lib/nautilus/extensions-1.0/libnautilus-open-terminal.so:${PORTSDIR}/deskutils/nautilus-open-terminal \
gtweakui-menus:${PORTSDIR}/deskutils/gtweakui \
gnome-art:${PORTSDIR}/x11-themes/gnome-art \
brightside:${PORTSDIR}/x11/brightside \
evolution-gconf-filter-exchange:${PORTSDIR}/devel/evolution-gconf-tools \
- ${X11BASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \
+ ${LOCALBASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \
eiciel:${PORTSDIR}/sysutils/eiciel \
gtk-send-pr:${PORTSDIR}/sysutils/gtk-send-pr \
thefish:${PORTSDIR}/sysutils/thefish \
@@ -40,5 +40,4 @@ MASTERDIR= ${.CURDIR}/../gnome2
GNOME_SLAVE= yes
DESCR= ${.CURDIR}/pkg-descr
-
.include "${MASTERDIR}/Makefile"
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 24091654468e..2f50ba4814b0 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome2/Makefile,v 1.142 2006/04/23 20:10:22 marcus Exp $
+# $MCom: ports/x11/gnome2/Makefile,v 1.182 2006/10/14 06:34:16 marcus Exp $
#
PORTNAME= gnome2
-PORTVERSION= 2.14.3
-PORTREVISION?= 0
+PORTVERSION= 2.16.1
+PORTREVISION?= 2
CATEGORIES?= x11 gnome
MASTER_SITES= # empty
DISTFILES= # empty
@@ -17,7 +17,7 @@ EXTRACT_ONLY= # empty
MAINTAINER= gnome@FreeBSD.org
COMMENT?= The "meta-port" for the GNOME 2 integrated X11 desktop
-RUN_DEPENDS?= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets \
+RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets \
gnome-cd:${PORTSDIR}/audio/gnome-media \
gnome-dictionary:${PORTSDIR}/deskutils/gnome-utils \
eog:${PORTSDIR}/graphics/eog \
@@ -29,38 +29,43 @@ RUN_DEPENDS?= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets
bug-buddy:${PORTSDIR}/devel/bug-buddy \
gnome-system-monitor:${PORTSDIR}/sysutils/gnome-system-monitor \
nautilus:${PORTSDIR}/x11-fm/nautilus \
- ${X11BASE}/sbin/gdm:${PORTSDIR}/x11/gdm \
- ${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
- ${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
- ${X11BASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \
+ ${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm \
+ ${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
+ ${LOCALBASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
+ ${LOCALBASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \
file-roller:${PORTSDIR}/archivers/file-roller \
- ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
+ ${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
gok:${PORTSDIR}/accessibility/gok \
nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \
gcalctool:${PORTSDIR}/math/gcalctool \
gucharmap:${PORTSDIR}/deskutils/gucharmap \
zenity:${PORTSDIR}/x11/zenity \
${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
- gnopernicus:${PORTSDIR}/accessibility/gnopernicus \
- ${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \
+ ${LOCALBASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \
dasher:${PORTSDIR}/accessibility/dasher \
- evolution-2.6:${PORTSDIR}/mail/evolution \
- ${X11BASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \
+ evolution-2.8:${PORTSDIR}/mail/evolution \
+ ${LOCALBASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \
network-admin:${PORTSDIR}/sysutils/gnome-system-tools \
gnome-nettool:${PORTSDIR}/net/gnome-nettool \
vino-session:${PORTSDIR}/net/vino \
- ximian-connector-setup-2.6:${PORTSDIR}/mail/evolution-exchange \
- ${X11BASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \
- ${X11BASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \
+ exchange-connector-setup-2.8:${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-gstreamer \
gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
- ${X11BASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
+ ${LOCALBASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
sound-juicer:${PORTSDIR}/audio/sound-juicer \
gnome-keyring-manager:${PORTSDIR}/security/gnome-keyring-manager \
- ${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \
+ ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \
evince:${PORTSDIR}/graphics/evince \
- ${X11BASE}/libexec/fast-user-switch-applet:${PORTSDIR}/x11/fast-user-switch-applet \
- ${X11BASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \
+ ${LOCALBASE}/libexec/fast-user-switch-applet:${PORTSDIR}/x11/fast-user-switch-applet \
+ ${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \
+ alacarte:${PORTSDIR}/deskutils/alacarte \
+ gnome-power-manager:${PORTSDIR}/sysutils/gnome-power-manager \
+ gnome-volume-manager:${PORTSDIR}/sysutils/gnome-volume-manager \
+ orca:${PORTSDIR}/accessibility/orca \
+ epiphany:${PORTSDIR}/www/epiphany \
+ gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
ekiga:${PORTSDIR}/net/ekiga
NO_BUILD= yes
@@ -78,8 +83,8 @@ do-install: # empty
.include <bsd.port.pre.mk>
.if !defined(GNOME_SLAVE)
-.if ${ARCH} == "i386" || ${OSVERSION} > 500035
-RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany
+.if ${ARCH} == "i386"
+RUN_DEPENDS+= tomboy:${PORTSDIR}/deskutils/tomboy
.endif
.if (${ARCH}!="sparc64" || ${OSVERSION} >= 601101) && ${ARCH}!="ia64"
RUN_DEPENDS+= yelp:${PORTSDIR}/x11/yelp
@@ -88,7 +93,7 @@ RUN_DEPENDS+= yelp:${PORTSDIR}/x11/yelp
.if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite"
.if defined(WITH_XSCREENSAVER)
-RUN_DEPENDS+= ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+RUN_DEPENDS+= ${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
.else
RUN_DEPENDS+= gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
.endif
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 7f7d6cd64bae..9f75d138d598 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.78 2006/04/13 07:52:41 bland Exp $
+# $MCom: ports/x11/libgnome/Makefile,v 1.86 2006/09/04 18:09:21 marcus Exp $
#
PORTNAME= libgnome
-PORTVERSION= 2.14.1
-PORTREVISION?= 1
+PORTVERSION= 2.16.0
+PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -30,8 +30,8 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack esound \
gnomevfs2 libxslt ltverhack referencehack
USE_BISON= yes
-USE_X_PREFIX= yes
-INSTALLS_SHLIB= yes
+USE_XLIB= yes
+USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 42ba5385693f..b1d8dd00d5ff 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnome-2.14.1.tar.bz2) = bf53815df10db62bbf00defd4100b8d8
-SHA256 (gnome2/libgnome-2.14.1.tar.bz2) = 4d091bd00e01392d65a856ca5b9fe648025c5988c844d58b25341a275b760fa7
-SIZE (gnome2/libgnome-2.14.1.tar.bz2) = 995007
+MD5 (gnome2/libgnome-2.16.0.tar.bz2) = b3f030f6c677b0e1bcfca7c7e58d6c4a
+SHA256 (gnome2/libgnome-2.16.0.tar.bz2) = 78a2d66bea1d856f06fbd3348abceded8975f09c767a17f58e1d9cd8011ab710
+SIZE (gnome2/libgnome-2.16.0.tar.bz2) = 1011194
diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-libgnome_gnome-util.c
index ceb23de357f2..1a7e49a84512 100644
--- a/x11/libgnome/files/patch-ag
+++ b/x11/libgnome/files/patch-libgnome_gnome-util.c
@@ -1,19 +1,19 @@
---- libgnome/gnome-util.c 2002/03/19 17:16:21 1.1
-+++ libgnome/gnome-util.c 2002/03/19 17:21:31
-@@ -67,11 +67,11 @@
- static char *shells [] = {
+--- libgnome/gnome-util.c.orig Mon Jul 10 15:25:22 2006
++++ libgnome/gnome-util.c Mon Jul 10 15:25:55 2006
+@@ -79,11 +79,11 @@
+ const char shells [][14] = {
/* Note that on some systems shells can also
* be installed in /usr/bin */
- "/bin/bash", "/usr/bin/bash",
- "/bin/zsh", "/usr/bin/zsh",
- "/bin/tcsh", "/usr/bin/tcsh",
- "/bin/ksh", "/usr/bin/ksh",
-- "/bin/csh", "/bin/sh", NULL
-+ "/bin/csh", "/bin/sh",
+- "/bin/csh", "/bin/sh"
+ LOCALBASE "/bin/bash",
+ LOCALBASE "/bin/zsh",
+ LOCALBASE "/bin/ksh",
+ 0
++
};
if (geteuid () == getuid () &&
diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in
index 7377058cd835..c1cc3758947a 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.4 2005/11/16 00:04:58 ahze Exp $
+# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.7 2006/07/23 17:22:34 mezz Exp $
#
# Restore gconf keys of gnomevfs2.
@@ -9,11 +9,11 @@ if [ "$2" != "POST-DEINSTALL" ]; then
exit 0
fi
-SCHEMAS=%%X11BASE%%/etc/gconf/schemas/desktop_default_applications.schemas
+SCHEMAS=%%LOCALBASE%%/etc/gconf/schemas/desktop_default_applications.schemas
if [ -f ${SCHEMAS} ]; then
- env GCONF_CONFIG_SOURCE=xml::%%X11BASE%%/etc/gconf/gconf.xml.defaults \
- %%X11BASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \
+ env GCONF_CONFIG_SOURCE=xml::%%LOCALBASE%%/etc/gconf/gconf.xml.defaults \
+ %%LOCALBASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \
> /dev/null || /usr/bin/true
fi
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 36702bbf30a3..246d33231ca7 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -31,6 +31,7 @@ share/locale/az/LC_MESSAGES/libgnome-2.0.mo
share/locale/be/LC_MESSAGES/libgnome-2.0.mo
share/locale/bg/LC_MESSAGES/libgnome-2.0.mo
share/locale/bn/LC_MESSAGES/libgnome-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/libgnome-2.0.mo
share/locale/bs/LC_MESSAGES/libgnome-2.0.mo
share/locale/ca/LC_MESSAGES/libgnome-2.0.mo
share/locale/cs/LC_MESSAGES/libgnome-2.0.mo
@@ -57,6 +58,7 @@ share/locale/id/LC_MESSAGES/libgnome-2.0.mo
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/ko/LC_MESSAGES/libgnome-2.0.mo
share/locale/ku/LC_MESSAGES/libgnome-2.0.mo
share/locale/lt/LC_MESSAGES/libgnome-2.0.mo
@@ -69,7 +71,6 @@ share/locale/nb/LC_MESSAGES/libgnome-2.0.mo
share/locale/ne/LC_MESSAGES/libgnome-2.0.mo
share/locale/nl/LC_MESSAGES/libgnome-2.0.mo
share/locale/nn/LC_MESSAGES/libgnome-2.0.mo
-share/locale/no/LC_MESSAGES/libgnome-2.0.mo
share/locale/or/LC_MESSAGES/libgnome-2.0.mo
share/locale/pa/LC_MESSAGES/libgnome-2.0.mo
share/locale/pl/LC_MESSAGES/libgnome-2.0.mo
@@ -97,9 +98,57 @@ share/locale/yi/LC_MESSAGES/libgnome-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo
share/locale/zh_HK/LC_MESSAGES/libgnome-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
+@dirrm include/libgnome-2.0/libgnome
+@dirrm include/libgnome-2.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/tt/LC_MESSAGES
@dirrmtry share/locale/tt
-@dirrm include/libgnome-2.0/libgnome
-@dirrm include/libgnome-2.0
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index f9d7e92d846d..174dedaa57a1 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -3,11 +3,11 @@
# 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 $
PORTNAME= startup-notification
PORTVERSION= 0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://www.freedesktop.org/software/startup-notification/releases/
@@ -17,11 +17,11 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Library that supports startup notification spec from freedesktop.org
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget pkgconfig
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index ef2c1b048914..fbaa4031c7a8 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -3,11 +3,11 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/x11/xscreensaver-gnome/Makefile,v 1.2 2006/10/07 19:20:33 ahze Exp $
PORTNAME?= xscreensaver-gnome
PORTVERSION= 4.24
-PORTREVISION?= 2
+PORTREVISION?= 4
CATEGORIES= x11 gnome
MASTER_SITES= http://www.jwz.org/xscreensaver/
DISTNAME= xscreensaver-${PORTVERSION}
@@ -19,7 +19,7 @@ LIB_DEPENDS= gle.4:${PORTSDIR}/graphics/gle
CONFLICTS?= xscreensaver-[0-9]* xscreensaver-gnome-hacks-[0-9]*
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_XPM= yes
USE_GL= yes
USE_GMAKE= yes
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index ceb4a9534228..316072c63e5c 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -211,7 +211,6 @@ bin/xscreensaver-hacks/xsublim
bin/xscreensaver-hacks/xteevee
bin/xscreensaver-hacks/zoom
bin/xscreensaver-text
-lib/X11/app-defaults/XScreenSaver
share/gnome/applications/gnome-screensaver-properties.desktop
share/gnome/pixmaps/xscreensaver.xpm
share/gnome/xscreensaver/glade/screensaver-cmndln.png
@@ -453,3 +452,23 @@ share/xscreensaver/config/zoom.xml
@dirrm share/gnome/xscreensaver/glade
@dirrm share/gnome/xscreensaver
@dirrm bin/xscreensaver-hacks
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@cwd %%X11BASE%%
+lib/X11/app-defaults/XScreenSaver
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 20ac324c04b7..15c0d18e8325 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,11 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/yelp/Makefile,v 1.88 2006/04/16 13:36:49 ahze Exp $
+# $MCom: ports/x11/yelp/Makefile,v 1.105 2006/10/07 17:10:08 marcus Exp $
#
PORTNAME= yelp
-PORTVERSION= 2.14.3
+PORTVERSION= 2.16.1
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,11 +17,12 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A help browser for the GNOME 2 desktop
-USE_GECKO= firefox seamonkey xulrunner firefox-devel<->firefox
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+USE_GECKO= firefox seamonkey xulrunner firefox-devel<->firefox
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \
libgnomeprintui
@@ -34,6 +36,5 @@ MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
GCONF_SCHEMAS= yelp.schemas
.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
-
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
.include <bsd.port.post.mk>
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index 2f1c57b521b4..b5324ffab929 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/yelp-2.14.3.tar.bz2) = d3c4300c9a7d38ff2179b934ca5e2d1a
-SHA256 (gnome2/yelp-2.14.3.tar.bz2) = 14ce66413c220eef660a8103e73089b0cb2f68cf03ef9cc38fbb1e563aa3fd98
-SIZE (gnome2/yelp-2.14.3.tar.bz2) = 779245
+MD5 (gnome2/yelp-2.16.1.tar.bz2) = b88c7607bd21d06ee37a877da6747cb3
+SHA256 (gnome2/yelp-2.16.1.tar.bz2) = 33e879be19ad57da495f8cfb075fce7022429706ff2beb6e50183e6396bf8419
+SIZE (gnome2/yelp-2.16.1.tar.bz2) = 855685
diff --git a/x11/yelp/files/patch-src_yelp-search-pager.c b/x11/yelp/files/patch-src_yelp-search-pager.c
deleted file mode 100644
index 81c275b4d422..000000000000
--- a/x11/yelp/files/patch-src_yelp-search-pager.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/yelp-search-pager.c.orig Tue May 2 19:10:03 2006
-+++ src/yelp-search-pager.c Tue May 2 18:59:36 2006
-@@ -1413,7 +1413,7 @@ process_man_result (YelpSearchPager *pag
- after = strstr (before, "(");
- tmp = after;
-
-- while (!g_ascii_isspace(*tmp))
-+ while (g_ascii_isspace(*tmp))
- tmp--;
-
- title = g_strndup (before, tmp-before);
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index d92f49b29f35..1a13b80ea5a8 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -1,6 +1,5 @@
bin/gnome-help
bin/yelp
-libdata/bonobo/servers/GNOME_Yelp.server
share/gnome/applications/yelp.desktop
share/gnome/yelp/default.css
share/gnome/yelp/icons/yelp-icon-caution.png
@@ -37,6 +36,7 @@ share/locale/az/LC_MESSAGES/yelp.mo
share/locale/be/LC_MESSAGES/yelp.mo
share/locale/bg/LC_MESSAGES/yelp.mo
share/locale/bn/LC_MESSAGES/yelp.mo
+share/locale/bn_IN/LC_MESSAGES/yelp.mo
share/locale/br/LC_MESSAGES/yelp.mo
share/locale/bs/LC_MESSAGES/yelp.mo
share/locale/ca/LC_MESSAGES/yelp.mo
@@ -74,16 +74,17 @@ share/locale/ky/LC_MESSAGES/yelp.mo
share/locale/li/LC_MESSAGES/yelp.mo
share/locale/lt/LC_MESSAGES/yelp.mo
share/locale/lv/LC_MESSAGES/yelp.mo
+share/locale/mg/LC_MESSAGES/yelp.mo
share/locale/mk/LC_MESSAGES/yelp.mo
share/locale/ml/LC_MESSAGES/yelp.mo
share/locale/mn/LC_MESSAGES/yelp.mo
share/locale/mr/LC_MESSAGES/yelp.mo
share/locale/ms/LC_MESSAGES/yelp.mo
share/locale/nb/LC_MESSAGES/yelp.mo
+share/locale/nds@NFE/LC_MESSAGES/yelp.mo
share/locale/ne/LC_MESSAGES/yelp.mo
share/locale/nl/LC_MESSAGES/yelp.mo
share/locale/nn/LC_MESSAGES/yelp.mo
-share/locale/no/LC_MESSAGES/yelp.mo
share/locale/nso/LC_MESSAGES/yelp.mo
share/locale/or/LC_MESSAGES/yelp.mo
share/locale/pa/LC_MESSAGES/yelp.mo
@@ -112,23 +113,73 @@ share/locale/zh_CN/LC_MESSAGES/yelp.mo
share/locale/zh_HK/LC_MESSAGES/yelp.mo
share/locale/zh_TW/LC_MESSAGES/yelp.mo
share/locale/zu/LC_MESSAGES/yelp.mo
+@dirrm share/gnome/yelp/xslt
+@dirrm share/gnome/yelp/ui
+@dirrm share/gnome/yelp/icons
+@dirrm share/gnome/yelp
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/tg/LC_MESSAGES
+@dirrmtry share/locale/tg
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/nds@NFE/LC_MESSAGES
+@dirrmtry share/locale/nds@NFE
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrm share/gnome/yelp/xslt
-@dirrm share/gnome/yelp/ui
-@dirrm share/gnome/yelp/icons
-@dirrm share/gnome/yelp
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 4192e01f74b6..ab71fb9feac5 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,11 +3,11 @@
# Whom: Franz Klammer <klammer@webonaut.com>
#
# $FreeBSD$
-# $MCom: ports/x11/zenity/Makefile,v 1.59 2006/04/13 07:52:41 bland Exp $
+# $MCom: ports/x11/zenity/Makefile,v 1.69 2006/10/03 11:37:08 ahze Exp $
#
PORTNAME= zenity
-PORTVERSION= 2.14.3
+PORTVERSION= 2.16.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,16 +17,16 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Display GNOME dialogs from the command line
BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomecanvas gconf2 gnomedocutils
USE_BZIP2= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
+CONFIGURE_ARGS= --mandir=${PREFIX}/man
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index 475721b6dbd3..b696d89a2963 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/zenity-2.14.3.tar.bz2) = 00c0930abb905a5552f67ee764bd6177
-SHA256 (gnome2/zenity-2.14.3.tar.bz2) = 55b1a1fee5a5b42030c15a101b8a1c95535b5f7a596abed5caf4da550352ff27
-SIZE (gnome2/zenity-2.14.3.tar.bz2) = 1079994
+MD5 (gnome2/zenity-2.16.1.tar.bz2) = fd8748d1456a8dd74f9f1513b9aaea7d
+SHA256 (gnome2/zenity-2.16.1.tar.bz2) = 8fda20c9e11b00156381559053e76ffea5569c3a4f2f3d3dec8d9a4ca5c7c618
+SIZE (gnome2/zenity-2.16.1.tar.bz2) = 1311007
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index bf5cc497df53..456b2825e8c4 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -49,18 +49,6 @@ share/gnome/help/zenity/fr/figures/zenity-question-screenshot.png
share/gnome/help/zenity/fr/figures/zenity-text-screenshot.png
share/gnome/help/zenity/fr/figures/zenity-warning-screenshot.png
share/gnome/help/zenity/fr/zenity.xml
-share/gnome/help/zenity/sv/figures/zenity-calendar-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-entry-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-error-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-fileselection-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-information-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-list-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-notification-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-progress-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-question-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-text-screenshot.png
-share/gnome/help/zenity/sv/figures/zenity-warning-screenshot.png
-share/gnome/help/zenity/sv/zenity.xml
share/gnome/help/zenity/uk/figures/zenity-calendar-screenshot.png
share/gnome/help/zenity/uk/figures/zenity-entry-screenshot.png
share/gnome/help/zenity/uk/figures/zenity-error-screenshot.png
@@ -77,7 +65,6 @@ share/gnome/omf/zenity/zenity-C.omf
share/gnome/omf/zenity/zenity-bg.omf
share/gnome/omf/zenity/zenity-es.omf
share/gnome/omf/zenity/zenity-fr.omf
-share/gnome/omf/zenity/zenity-sv.omf
share/gnome/omf/zenity/zenity-uk.omf
share/gnome/zenity/clothes/gnome-tshirt.png
share/gnome/zenity/clothes/hawaii-shirt.png
@@ -94,94 +81,84 @@ share/gnome/zenity/zenity-scale.png
share/gnome/zenity/zenity-text.png
share/gnome/zenity/zenity.glade
share/gnome/zenity/zenity.png
-share/locale/am/LC_MESSAGES/zenity-0.1.mo
-share/locale/ar/LC_MESSAGES/zenity-0.1.mo
-share/locale/az/LC_MESSAGES/zenity-0.1.mo
-share/locale/be/LC_MESSAGES/zenity-0.1.mo
-share/locale/bg/LC_MESSAGES/zenity-0.1.mo
-share/locale/bn/LC_MESSAGES/zenity-0.1.mo
-share/locale/bs/LC_MESSAGES/zenity-0.1.mo
-share/locale/ca/LC_MESSAGES/zenity-0.1.mo
-share/locale/cs/LC_MESSAGES/zenity-0.1.mo
-share/locale/cy/LC_MESSAGES/zenity-0.1.mo
-share/locale/da/LC_MESSAGES/zenity-0.1.mo
-share/locale/de/LC_MESSAGES/zenity-0.1.mo
-share/locale/dz/LC_MESSAGES/zenity-0.1.mo
-share/locale/el/LC_MESSAGES/zenity-0.1.mo
-share/locale/en_CA/LC_MESSAGES/zenity-0.1.mo
-share/locale/en_GB/LC_MESSAGES/zenity-0.1.mo
-share/locale/es/LC_MESSAGES/zenity-0.1.mo
-share/locale/et/LC_MESSAGES/zenity-0.1.mo
-share/locale/eu/LC_MESSAGES/zenity-0.1.mo
-share/locale/fa/LC_MESSAGES/zenity-0.1.mo
-share/locale/fi/LC_MESSAGES/zenity-0.1.mo
-share/locale/fr/LC_MESSAGES/zenity-0.1.mo
-share/locale/ga/LC_MESSAGES/zenity-0.1.mo
-share/locale/gl/LC_MESSAGES/zenity-0.1.mo
-share/locale/gu/LC_MESSAGES/zenity-0.1.mo
-share/locale/he/LC_MESSAGES/zenity-0.1.mo
-share/locale/hi/LC_MESSAGES/zenity-0.1.mo
-share/locale/hr/LC_MESSAGES/zenity-0.1.mo
-share/locale/hu/LC_MESSAGES/zenity-0.1.mo
-share/locale/id/LC_MESSAGES/zenity-0.1.mo
-share/locale/is/LC_MESSAGES/zenity-0.1.mo
-share/locale/it/LC_MESSAGES/zenity-0.1.mo
-share/locale/ja/LC_MESSAGES/zenity-0.1.mo
-share/locale/ka/LC_MESSAGES/zenity-0.1.mo
-share/locale/kn/LC_MESSAGES/zenity-0.1.mo
-share/locale/ko/LC_MESSAGES/zenity-0.1.mo
-share/locale/ku/LC_MESSAGES/zenity-0.1.mo
-share/locale/lt/LC_MESSAGES/zenity-0.1.mo
-share/locale/lv/LC_MESSAGES/zenity-0.1.mo
-share/locale/mi/LC_MESSAGES/zenity-0.1.mo
-share/locale/mk/LC_MESSAGES/zenity-0.1.mo
-share/locale/ml/LC_MESSAGES/zenity-0.1.mo
-share/locale/mn/LC_MESSAGES/zenity-0.1.mo
-share/locale/ms/LC_MESSAGES/zenity-0.1.mo
-share/locale/nb/LC_MESSAGES/zenity-0.1.mo
-share/locale/ne/LC_MESSAGES/zenity-0.1.mo
-share/locale/nl/LC_MESSAGES/zenity-0.1.mo
-share/locale/nn/LC_MESSAGES/zenity-0.1.mo
-share/locale/no/LC_MESSAGES/zenity-0.1.mo
-share/locale/or/LC_MESSAGES/zenity-0.1.mo
-share/locale/pa/LC_MESSAGES/zenity-0.1.mo
-share/locale/pl/LC_MESSAGES/zenity-0.1.mo
-share/locale/pt/LC_MESSAGES/zenity-0.1.mo
-share/locale/pt_BR/LC_MESSAGES/zenity-0.1.mo
-share/locale/ro/LC_MESSAGES/zenity-0.1.mo
-share/locale/ru/LC_MESSAGES/zenity-0.1.mo
-share/locale/rw/LC_MESSAGES/zenity-0.1.mo
-share/locale/sk/LC_MESSAGES/zenity-0.1.mo
-share/locale/sl/LC_MESSAGES/zenity-0.1.mo
-share/locale/sq/LC_MESSAGES/zenity-0.1.mo
-share/locale/sr/LC_MESSAGES/zenity-0.1.mo
-share/locale/sr@Latn/LC_MESSAGES/zenity-0.1.mo
-share/locale/sv/LC_MESSAGES/zenity-0.1.mo
-share/locale/ta/LC_MESSAGES/zenity-0.1.mo
-share/locale/th/LC_MESSAGES/zenity-0.1.mo
-share/locale/tr/LC_MESSAGES/zenity-0.1.mo
-share/locale/ug/LC_MESSAGES/zenity-0.1.mo
-share/locale/uk/LC_MESSAGES/zenity-0.1.mo
-share/locale/vi/LC_MESSAGES/zenity-0.1.mo
-share/locale/xh/LC_MESSAGES/zenity-0.1.mo
-share/locale/zh_CN/LC_MESSAGES/zenity-0.1.mo
-share/locale/zh_HK/LC_MESSAGES/zenity-0.1.mo
-share/locale/zh_TW/LC_MESSAGES/zenity-0.1.mo
-@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/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
+share/locale/am/LC_MESSAGES/zenity.mo
+share/locale/ar/LC_MESSAGES/zenity.mo
+share/locale/az/LC_MESSAGES/zenity.mo
+share/locale/be/LC_MESSAGES/zenity.mo
+share/locale/bg/LC_MESSAGES/zenity.mo
+share/locale/bn/LC_MESSAGES/zenity.mo
+share/locale/bn_IN/LC_MESSAGES/zenity.mo
+share/locale/bs/LC_MESSAGES/zenity.mo
+share/locale/ca/LC_MESSAGES/zenity.mo
+share/locale/cs/LC_MESSAGES/zenity.mo
+share/locale/cy/LC_MESSAGES/zenity.mo
+share/locale/da/LC_MESSAGES/zenity.mo
+share/locale/de/LC_MESSAGES/zenity.mo
+share/locale/dz/LC_MESSAGES/zenity.mo
+share/locale/el/LC_MESSAGES/zenity.mo
+share/locale/en_CA/LC_MESSAGES/zenity.mo
+share/locale/en_GB/LC_MESSAGES/zenity.mo
+share/locale/es/LC_MESSAGES/zenity.mo
+share/locale/et/LC_MESSAGES/zenity.mo
+share/locale/eu/LC_MESSAGES/zenity.mo
+share/locale/fa/LC_MESSAGES/zenity.mo
+share/locale/fi/LC_MESSAGES/zenity.mo
+share/locale/fr/LC_MESSAGES/zenity.mo
+share/locale/ga/LC_MESSAGES/zenity.mo
+share/locale/gl/LC_MESSAGES/zenity.mo
+share/locale/gu/LC_MESSAGES/zenity.mo
+share/locale/he/LC_MESSAGES/zenity.mo
+share/locale/hi/LC_MESSAGES/zenity.mo
+share/locale/hr/LC_MESSAGES/zenity.mo
+share/locale/hu/LC_MESSAGES/zenity.mo
+share/locale/id/LC_MESSAGES/zenity.mo
+share/locale/is/LC_MESSAGES/zenity.mo
+share/locale/it/LC_MESSAGES/zenity.mo
+share/locale/ja/LC_MESSAGES/zenity.mo
+share/locale/ka/LC_MESSAGES/zenity.mo
+share/locale/kn/LC_MESSAGES/zenity.mo
+share/locale/ko/LC_MESSAGES/zenity.mo
+share/locale/ku/LC_MESSAGES/zenity.mo
+share/locale/lt/LC_MESSAGES/zenity.mo
+share/locale/lv/LC_MESSAGES/zenity.mo
+share/locale/mi/LC_MESSAGES/zenity.mo
+share/locale/mk/LC_MESSAGES/zenity.mo
+share/locale/ml/LC_MESSAGES/zenity.mo
+share/locale/mn/LC_MESSAGES/zenity.mo
+share/locale/ms/LC_MESSAGES/zenity.mo
+share/locale/nb/LC_MESSAGES/zenity.mo
+share/locale/ne/LC_MESSAGES/zenity.mo
+share/locale/nl/LC_MESSAGES/zenity.mo
+share/locale/nn/LC_MESSAGES/zenity.mo
+share/locale/or/LC_MESSAGES/zenity.mo
+share/locale/pa/LC_MESSAGES/zenity.mo
+share/locale/pl/LC_MESSAGES/zenity.mo
+share/locale/pt/LC_MESSAGES/zenity.mo
+share/locale/pt_BR/LC_MESSAGES/zenity.mo
+share/locale/ro/LC_MESSAGES/zenity.mo
+share/locale/ru/LC_MESSAGES/zenity.mo
+share/locale/rw/LC_MESSAGES/zenity.mo
+share/locale/sk/LC_MESSAGES/zenity.mo
+share/locale/sl/LC_MESSAGES/zenity.mo
+share/locale/sq/LC_MESSAGES/zenity.mo
+share/locale/sr/LC_MESSAGES/zenity.mo
+share/locale/sr@Latn/LC_MESSAGES/zenity.mo
+share/locale/sv/LC_MESSAGES/zenity.mo
+share/locale/ta/LC_MESSAGES/zenity.mo
+share/locale/th/LC_MESSAGES/zenity.mo
+share/locale/tr/LC_MESSAGES/zenity.mo
+share/locale/ug/LC_MESSAGES/zenity.mo
+share/locale/uk/LC_MESSAGES/zenity.mo
+share/locale/vi/LC_MESSAGES/zenity.mo
+share/locale/xh/LC_MESSAGES/zenity.mo
+share/locale/zh_CN/LC_MESSAGES/zenity.mo
+share/locale/zh_HK/LC_MESSAGES/zenity.mo
+share/locale/zh_TW/LC_MESSAGES/zenity.mo
@dirrm share/gnome/zenity/clothes
@dirrm share/gnome/zenity
@dirrm share/gnome/omf/zenity
@dirrm share/gnome/help/zenity/uk/figures
@dirrm share/gnome/help/zenity/uk
-@dirrm share/gnome/help/zenity/sv/figures
-@dirrm share/gnome/help/zenity/sv
@dirrm share/gnome/help/zenity/fr/figures
@dirrm share/gnome/help/zenity/fr
@dirrm share/gnome/help/zenity/es/figures
@@ -191,3 +168,55 @@ share/locale/zh_TW/LC_MESSAGES/zenity-0.1.mo
@dirrm share/gnome/help/zenity/C/figures
@dirrm share/gnome/help/zenity/C
@dirrm share/gnome/help/zenity
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be