aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--accessibility/at-spi/Makefile13
-rw-r--r--accessibility/at-spi/distinfo6
-rw-r--r--accessibility/at-spi/files/patch-docs_reference_idl_Makefile.in11
-rw-r--r--accessibility/at-spi/files/patch-libspi_Makefile.in11
-rw-r--r--accessibility/at-spi/files/patch-registryd_Makefile.in11
-rw-r--r--accessibility/at-spi/pkg-plist180
-rw-r--r--accessibility/atk/Makefile11
-rw-r--r--accessibility/atk/distinfo6
-rw-r--r--accessibility/atk/pkg-plist104
-rw-r--r--accessibility/dasher/Makefile14
-rw-r--r--accessibility/dasher/distinfo6
-rw-r--r--accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp36
-rw-r--r--accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp44
-rw-r--r--accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp51
-rw-r--r--accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp41
-rw-r--r--accessibility/dasher/files/patch-Src_Gtk2_speech.cc14
-rw-r--r--accessibility/dasher/files/patch-configure11
-rw-r--r--accessibility/dasher/pkg-plist25
-rw-r--r--accessibility/gail/Makefile8
-rw-r--r--accessibility/gail/distinfo6
-rw-r--r--accessibility/gail/pkg-plist8
-rw-r--r--accessibility/gnopernicus/Makefile12
-rw-r--r--accessibility/gnopernicus/distinfo6
-rw-r--r--accessibility/gnopernicus/files/patch-configure21
-rw-r--r--accessibility/gnopernicus/pkg-plist11
-rw-r--r--accessibility/gok/Makefile9
-rw-r--r--accessibility/gok/distinfo6
-rw-r--r--accessibility/gok/files/patch-gok_gok-keyboard.c13
-rw-r--r--accessibility/gok/pkg-plist170
-rw-r--r--archivers/file-roller/Makefile11
-rw-r--r--archivers/file-roller/distinfo6
-rw-r--r--archivers/file-roller/pkg-plist26
-rw-r--r--archivers/fileroller/Makefile11
-rw-r--r--archivers/fileroller/distinfo6
-rw-r--r--archivers/fileroller/pkg-plist26
-rw-r--r--audio/gnome-media/Makefile17
-rw-r--r--audio/gnome-media/distinfo6
-rw-r--r--audio/gnome-media/files/patch-configure11
-rw-r--r--audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c49
-rw-r--r--audio/gnome-media/pkg-plist6
-rw-r--r--audio/gnomemedia2/Makefile17
-rw-r--r--audio/gnomemedia2/distinfo6
-rw-r--r--audio/gnomemedia2/files/patch-configure11
-rw-r--r--audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c49
-rw-r--r--audio/gnomemedia2/pkg-plist6
-rw-r--r--audio/sound-juicer/Makefile14
-rw-r--r--audio/sound-juicer/distinfo6
-rw-r--r--audio/sound-juicer/files/patch-src::Makefile.in19
-rw-r--r--audio/sound-juicer/pkg-plist23
-rw-r--r--databases/evolution-data-server/Makefile11
-rw-r--r--databases/evolution-data-server/distinfo6
-rw-r--r--databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c17
-rw-r--r--databases/evolution-data-server/files/patch-addressbook_backends_groupwise_e-book-backend-groupwise.c47
-rw-r--r--databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c52
-rw-r--r--databases/evolution-data-server/files/patch-calendar_backends_groupwise_e-cal-backend-groupwise.c16
-rw-r--r--databases/evolution-data-server/files/patch-camel-groupwise-folder.c30
-rw-r--r--databases/evolution-data-server/files/patch-camel-groupwise-utils.c25
-rw-r--r--databases/evolution-data-server/files/patch-camel_Makefile.in11
-rw-r--r--databases/evolution-data-server/files/patch-camel_providers_imap_camel-imap-utils.c20
-rw-r--r--databases/evolution-data-server/files/patch-configure15
-rw-r--r--databases/evolution-data-server/files/patch-libedataserverui_e-name-selector-entry.c11
-rw-r--r--databases/evolution-data-server/files/patch-servers-exchange-storage-e-folder-exchange.c17
-rw-r--r--databases/evolution-data-server/files/patch-servers-groupwise-e-gw-connection.c12
-rw-r--r--databases/evolution-data-server/files/patch-servers-groupwise-e-gw-item.c12
-rw-r--r--databases/evolution-data-server/pkg-plist47
-rw-r--r--deskutils/deskbar-applet/Makefile40
-rw-r--r--deskutils/deskbar-applet/distinfo6
-rw-r--r--deskutils/deskbar-applet/files/patch-deskbar_Utils.py (renamed from deskutils/deskbar-applet/files/patch-deskbar_handler_utils.py)4
-rw-r--r--deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py16
-rw-r--r--deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py18
-rw-r--r--deskutils/deskbar-applet/pkg-plist202
-rw-r--r--deskutils/evolution-jescs/Makefile12
-rw-r--r--deskutils/evolution-jescs/distinfo6
-rw-r--r--deskutils/evolution-jescs/pkg-plist7
-rw-r--r--deskutils/gdesklets/Makefile4
-rw-r--r--deskutils/gnome-utils/Makefile23
-rw-r--r--deskutils/gnome-utils/distinfo6
-rw-r--r--deskutils/gnome-utils/files/patch-configure11
-rw-r--r--deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c10
-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_desc_db.c10
-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_logview.c29
-rw-r--r--deskutils/gnome-utils/files/patch-logview_misc.c21
-rw-r--r--deskutils/gnome-utils/pkg-plist217
-rw-r--r--deskutils/gnomeutils2/Makefile23
-rw-r--r--deskutils/gnomeutils2/distinfo6
-rw-r--r--deskutils/gnomeutils2/files/patch-configure11
-rw-r--r--deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview__logview.h10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_calendar.h10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_desc_db.c10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_loglist.h10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_logrtns.c52
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_logview-findbar.h10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_logview.c29
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_misc.c21
-rw-r--r--deskutils/gnomeutils2/pkg-plist217
-rw-r--r--deskutils/gucharmap/Makefile9
-rw-r--r--deskutils/gucharmap/distinfo6
-rw-r--r--deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c62
-rw-r--r--deskutils/gucharmap/pkg-plist23
-rw-r--r--deskutils/nautilus-sendto/Makefile8
-rw-r--r--deskutils/nautilus-sendto/distinfo6
-rw-r--r--devel/ORBit2/Makefile10
-rw-r--r--devel/ORBit2/distinfo6
-rw-r--r--devel/ORBit2/files/patch-ab14
-rw-r--r--devel/ORBit2/pkg-plist3
-rw-r--r--devel/bug-buddy/Makefile8
-rw-r--r--devel/bug-buddy/distinfo6
-rw-r--r--devel/bug-buddy/pkg-plist8
-rw-r--r--devel/bugbuddy/Makefile8
-rw-r--r--devel/bugbuddy/distinfo6
-rw-r--r--devel/bugbuddy/pkg-plist8
-rw-r--r--devel/gconf2/Makefile8
-rw-r--r--devel/gconf2/distinfo6
-rw-r--r--devel/gconf2/files/patch-gconf_gconf-listeners.c13
-rw-r--r--devel/gconf2/pkg-plist6
-rw-r--r--devel/gconfmm26/Makefile7
-rw-r--r--devel/gconfmm26/distinfo6
-rw-r--r--devel/glib20/Makefile12
-rw-r--r--devel/glib20/distinfo6
-rw-r--r--devel/glib20/files/patch-ae6
-rw-r--r--devel/glib20/files/patch-gmodule::gmodule-dl.c2
-rw-r--r--devel/glib20/pkg-plist11
-rw-r--r--devel/glibmm/Makefile7
-rw-r--r--devel/glibmm/distinfo6
-rw-r--r--devel/glibmm/files/patch-glib_glibmm_date.cc17
-rw-r--r--devel/glibmm/files/patch-glib_glibmm_date.h18
-rw-r--r--devel/glibmm/pkg-plist2
-rw-r--r--devel/gnome-vfs/Makefile19
-rw-r--r--devel/gnome-vfs/distinfo6
-rw-r--r--devel/gnome-vfs/files/patch-aa18
-rw-r--r--devel/gnome-vfs/files/patch-devel-docs::Makefile.in15
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c10
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c15
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c10
-rw-r--r--devel/gnome-vfs/files/patch-modules__http-neon-method.c21
-rw-r--r--devel/gnome-vfs/files/patch-modules_bzip2-method.c11
-rw-r--r--devel/gnome-vfs/files/patch-modules_sftp-method.c12
-rw-r--r--devel/gnome-vfs/pkg-deinstall.in2
-rw-r--r--devel/gnome-vfs/pkg-install.in2
-rw-r--r--devel/gnome-vfs/pkg-plist70
-rw-r--r--devel/gnome-vfsmm/Makefile7
-rw-r--r--devel/gnome-vfsmm/distinfo6
-rw-r--r--devel/gnomevfs2/Makefile19
-rw-r--r--devel/gnomevfs2/distinfo6
-rw-r--r--devel/gnomevfs2/files/patch-aa18
-rw-r--r--devel/gnomevfs2/files/patch-devel-docs::Makefile.in15
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-address.c10
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c15
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c10
-rw-r--r--devel/gnomevfs2/files/patch-modules__http-neon-method.c21
-rw-r--r--devel/gnomevfs2/files/patch-modules_bzip2-method.c11
-rw-r--r--devel/gnomevfs2/files/patch-modules_sftp-method.c12
-rw-r--r--devel/gnomevfs2/pkg-deinstall.in2
-rw-r--r--devel/gnomevfs2/pkg-install.in2
-rw-r--r--devel/gnomevfs2/pkg-plist70
-rw-r--r--devel/libbonobo/Makefile7
-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-plist11
-rw-r--r--devel/libgsf-gnome/Makefile2
-rw-r--r--devel/libgsf-gnome/pkg-plist2
-rw-r--r--devel/libgsf/Makefile9
-rw-r--r--devel/libgsf/distinfo6
-rw-r--r--devel/libgsf/pkg-plist4
-rw-r--r--devel/libgtop2/Makefile17
-rw-r--r--devel/libgtop2/distinfo6
-rw-r--r--devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in33
-rw-r--r--devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in50
-rw-r--r--devel/libgtop2/files/patch-configure52
-rw-r--r--devel/libgtop2/files/patch-lib::read.c12
-rw-r--r--devel/libgtop2/files/patch-lib::write.c15
-rw-r--r--devel/libgtop2/files/patch-src::daemon::io.c14
-rw-r--r--devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c37
-rw-r--r--devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h12
-rw-r--r--devel/libgtop2/files/patch-sysdeps_freebsd_siglist.c41
-rw-r--r--devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c95
-rw-r--r--devel/libgtop2/files/patch-systeps::freebsd::procmap.c152
-rw-r--r--devel/libgtop2/pkg-plist4
-rw-r--r--devel/libsoup/Makefile7
-rw-r--r--devel/libsoup/distinfo6
-rw-r--r--devel/libsoup22/Makefile7
-rw-r--r--devel/libsoup22/distinfo6
-rw-r--r--devel/py-gobject/Makefile8
-rw-r--r--devel/py-gobject/distinfo6
-rw-r--r--devel/py-gobject/pkg-plist3
-rw-r--r--devel/py-orbit2/Makefile6
-rw-r--r--devel/py-orbit2/distinfo6
-rw-r--r--editors/gedit-autocomplete-plugin/Makefile4
-rw-r--r--editors/gedit/Makefile31
-rw-r--r--editors/gedit/distinfo6
-rw-r--r--editors/gedit/files/patch-configure31
-rw-r--r--editors/gedit/files/patch-gedit_gedit-module.c11
-rw-r--r--editors/gedit/files/patch-gedit_gedit-plugins-engine.c13
-rw-r--r--editors/gedit/pkg-plist186
-rw-r--r--editors/gnome2-office/Makefile4
-rw-r--r--games/atomix/Makefile10
-rw-r--r--games/atomix/distinfo6
-rw-r--r--games/atomix/files/patch-level-manager.c15
-rw-r--r--games/atomix/files/patch-theme-manager.c15
-rw-r--r--games/atomix/pkg-plist9
-rw-r--r--games/gnome-games-extra-data/Makefile8
-rw-r--r--games/gnome-games-extra-data/distinfo6
-rw-r--r--games/gnome-games-extra-data/pkg-plist3
-rw-r--r--games/gnome-games/Makefile26
-rw-r--r--games/gnome-games/distinfo6
-rw-r--r--games/gnome-games/files/patch-configure11
-rw-r--r--games/gnome-games/files/patch-gnome-stones_Makefile.in11
-rw-r--r--games/gnome-games/files/patch-iagno_othello.c20
-rw-r--r--games/gnome-games/pkg-install10
-rw-r--r--games/gnome-games/pkg-plist120
-rw-r--r--games/gnomegames2-extra-data/Makefile8
-rw-r--r--games/gnomegames2-extra-data/distinfo6
-rw-r--r--games/gnomegames2-extra-data/pkg-plist3
-rw-r--r--games/gnomegames2/Makefile26
-rw-r--r--games/gnomegames2/distinfo6
-rw-r--r--games/gnomegames2/files/patch-configure11
-rw-r--r--games/gnomegames2/files/patch-gnome-stones_Makefile.in11
-rw-r--r--games/gnomegames2/files/patch-iagno_othello.c20
-rw-r--r--games/gnomegames2/pkg-install10
-rw-r--r--games/gnomegames2/pkg-plist120
-rw-r--r--graphics/eog/Makefile11
-rw-r--r--graphics/eog/distinfo6
-rw-r--r--graphics/eog/pkg-plist6
-rw-r--r--graphics/evince/Makefile43
-rw-r--r--graphics/evince/distinfo6
-rw-r--r--graphics/evince/files/patch-djvu_djvu-text.h10
-rw-r--r--graphics/evince/files/patch-shell_main.c20
-rw-r--r--graphics/evince/pkg-plist32
-rw-r--r--graphics/libgnomecanvas/Makefile10
-rw-r--r--graphics/libgnomecanvas/distinfo6
-rw-r--r--graphics/libgnomecanvas/pkg-plist9
-rw-r--r--graphics/libgnomecanvasmm26/Makefile7
-rw-r--r--graphics/libgnomecanvasmm26/distinfo6
-rw-r--r--graphics/librsvg2/Makefile24
-rw-r--r--graphics/librsvg2/distinfo6
-rw-r--r--graphics/librsvg2/files/patch-configure11
-rw-r--r--graphics/librsvg2/files/patch-moz-plugin_Makefile.in18
-rw-r--r--graphics/librsvg2/pkg-plist20
-rw-r--r--graphics/poppler-gtk/Makefile22
-rw-r--r--graphics/poppler-gtk/pkg-plist28
-rw-r--r--graphics/poppler-qt/Makefile18
-rw-r--r--graphics/poppler-qt/pkg-plist7
-rw-r--r--graphics/poppler/Makefile66
-rw-r--r--graphics/poppler/distinfo6
-rw-r--r--graphics/poppler/files/patch-configure11
-rw-r--r--graphics/poppler/files/patch-glib_Makefile.in37
-rw-r--r--graphics/poppler/files/patch-qt_Makefile.in39
-rw-r--r--graphics/poppler/pkg-plist28
-rw-r--r--mail/evolution-exchange/Makefile14
-rw-r--r--mail/evolution-exchange/distinfo6
-rw-r--r--mail/evolution-exchange/files/patch-configure15
-rw-r--r--mail/evolution-exchange/pkg-plist18
-rw-r--r--mail/evolution/Makefile36
-rw-r--r--mail/evolution/distinfo6
-rw-r--r--mail/evolution/files/evolibs.sh15
-rw-r--r--mail/evolution/files/patch-aa17
-rw-r--r--mail/evolution/pkg-plist84
-rw-r--r--mail/mail-notification/Makefile7
-rw-r--r--mail/mail-notification/pkg-plist4
-rw-r--r--misc/gnome-icon-theme/Makefile8
-rw-r--r--misc/gnome-icon-theme/distinfo6
-rw-r--r--misc/gnome-icon-theme/files/patch-Makefile.in11
-rw-r--r--misc/gnome-icon-theme/pkg-plist4201
-rw-r--r--misc/gnome-user-docs/Makefile11
-rw-r--r--misc/gnome-user-docs/distinfo6
-rw-r--r--misc/gnome-user-docs/pkg-plist283
-rw-r--r--misc/gnomehier/Makefile10
-rw-r--r--misc/gnomeuserdocs2/Makefile11
-rw-r--r--misc/gnomeuserdocs2/distinfo6
-rw-r--r--misc/gnomeuserdocs2/pkg-plist283
-rw-r--r--net/avahi/Makefile13
-rw-r--r--net/avahi/files/patch-Makefile.in20
-rw-r--r--net/avahi/files/patch-avahi-core_socket.c34
-rw-r--r--net/avahi/files/patch-avahi-sharp_Makefile.in16
-rw-r--r--net/avahi/pkg-plist36
-rw-r--r--net/gnome-nettool/Makefile8
-rw-r--r--net/gnome-nettool/distinfo6
-rw-r--r--net/gnome-nettool/files/patch-src_info.c44
-rw-r--r--net/gnome-nettool/files/patch-src_nettool.c21
-rw-r--r--net/gnome-nettool/pkg-plist6
-rw-r--r--net/gnomenettool/Makefile8
-rw-r--r--net/gnomenettool/distinfo6
-rw-r--r--net/gnomenettool/files/patch-src_info.c44
-rw-r--r--net/gnomenettool/files/patch-src_nettool.c21
-rw-r--r--net/gnomenettool/pkg-plist6
-rw-r--r--net/vino/Makefile8
-rw-r--r--net/vino/distinfo6
-rw-r--r--net/vino/pkg-plist1
-rw-r--r--palm/synce-trayicon/Makefile8
-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-main-ui.c18
-rw-r--r--security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-util.c18
-rw-r--r--security/gnome-keyring-manager/pkg-plist8
-rw-r--r--security/gnomekeyringmanager/Makefile10
-rw-r--r--security/gnomekeyringmanager/distinfo6
-rw-r--r--security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-main-ui.c18
-rw-r--r--security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c18
-rw-r--r--security/gnomekeyringmanager/pkg-plist8
-rw-r--r--security/seahorse/Makefile19
-rw-r--r--security/seahorse/distinfo6
-rw-r--r--sysutils/gconf-editor/Makefile8
-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-plist4
-rw-r--r--sysutils/gnome-control-center/Makefile22
-rw-r--r--sysutils/gnome-control-center/distinfo6
-rw-r--r--sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c33
-rw-r--r--sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c34
-rw-r--r--sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c10
-rw-r--r--sysutils/gnome-control-center/pkg-plist22
-rw-r--r--sysutils/gnome-system-monitor/Makefile10
-rw-r--r--sysutils/gnome-system-monitor/distinfo6
-rw-r--r--sysutils/gnome-system-monitor/files/patch-configure19
-rw-r--r--sysutils/gnome-system-monitor/files/patch-src_openfiles.c13
-rw-r--r--sysutils/gnome-system-monitor/pkg-plist23
-rw-r--r--sysutils/gnome-system-tools/Makefile12
-rw-r--r--sysutils/gnome-system-tools/distinfo6
-rw-r--r--sysutils/gnome-system-tools/pkg-plist47
-rw-r--r--sysutils/gnomecontrolcenter2/Makefile22
-rw-r--r--sysutils/gnomecontrolcenter2/distinfo6
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c33
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c34
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c10
-rw-r--r--sysutils/gnomecontrolcenter2/pkg-plist22
-rw-r--r--sysutils/gnomesystemmonitor/Makefile10
-rw-r--r--sysutils/gnomesystemmonitor/distinfo6
-rw-r--r--sysutils/gnomesystemmonitor/files/patch-configure19
-rw-r--r--sysutils/gnomesystemmonitor/files/patch-src_openfiles.c13
-rw-r--r--sysutils/gnomesystemmonitor/pkg-plist23
-rw-r--r--sysutils/gnomesystemtools/Makefile12
-rw-r--r--sysutils/gnomesystemtools/distinfo6
-rw-r--r--sysutils/gnomesystemtools/pkg-plist47
-rw-r--r--sysutils/nautilus-cd-burner/Makefile10
-rw-r--r--sysutils/nautilus-cd-burner/distinfo6
-rw-r--r--sysutils/nautilus-cd-burner/pkg-plist10
-rw-r--r--sysutils/pessulus/Makefile40
-rw-r--r--sysutils/pessulus/distinfo3
-rw-r--r--sysutils/pessulus/pkg-descr6
-rw-r--r--sysutils/pessulus/pkg-plist100
-rw-r--r--sysutils/slmon/Makefile5
-rw-r--r--textproc/gnome-doc-utils/Makefile8
-rw-r--r--textproc/gnome-doc-utils/distinfo6
-rw-r--r--textproc/gnome-doc-utils/files/patch-configure10
-rw-r--r--textproc/gnome-doc-utils/pkg-plist62
-rw-r--r--textproc/gnomedocutils/Makefile8
-rw-r--r--textproc/gnomedocutils/distinfo6
-rw-r--r--textproc/gnomedocutils/files/patch-configure10
-rw-r--r--textproc/gnomedocutils/pkg-plist62
-rw-r--r--textproc/libxml++26/Makefile10
-rw-r--r--textproc/libxml++26/distinfo6
-rw-r--r--textproc/libxml++26/pkg-plist505
-rw-r--r--www/epiphany-extensions/Makefile47
-rw-r--r--www/epiphany-extensions/distinfo6
-rw-r--r--www/epiphany-extensions/pkg-plist84
-rw-r--r--www/epiphany/Makefile47
-rw-r--r--www/epiphany/distinfo6
-rw-r--r--www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c14
-rw-r--r--www/epiphany/pkg-plist59
-rw-r--r--www/evolution-webcal/Makefile9
-rw-r--r--www/evolution-webcal/distinfo6
-rw-r--r--www/evolution-webcal/pkg-plist3
-rw-r--r--www/gnome-user-share/Makefile5
-rw-r--r--www/gtkhtml3/Makefile10
-rw-r--r--www/gtkhtml3/distinfo6
-rw-r--r--www/gtkhtml3/files/patch-src_htmltext.c15
-rw-r--r--www/gtkhtml3/pkg-plist9
-rw-r--r--www/gtkhtml38/Makefile10
-rw-r--r--www/gtkhtml38/distinfo6
-rw-r--r--www/gtkhtml38/files/patch-src_htmltext.c15
-rw-r--r--www/gtkhtml38/pkg-plist9
-rw-r--r--x11-fm/nautilus2/Makefile9
-rw-r--r--x11-fm/nautilus2/distinfo6
-rw-r--r--x11-fm/nautilus2/files/patch-aa14
-rw-r--r--x11-fm/nautilus2/pkg-plist21
-rw-r--r--x11-themes/gnome-backgrounds/Makefile6
-rw-r--r--x11-themes/gnome-backgrounds/distinfo6
-rw-r--r--x11-themes/gnome-backgrounds/pkg-plist30
-rw-r--r--x11-themes/gnome-themes-extras/Makefile10
-rw-r--r--x11-themes/gnome-themes-extras/distinfo6
-rw-r--r--x11-themes/gnome-themes-extras/files/patch-Gorilla::gtkrc-2.0::gtkrc19
-rw-r--r--x11-themes/gnome-themes-extras/pkg-plist334
-rw-r--r--x11-themes/gnome-themes/Makefile10
-rw-r--r--x11-themes/gnome-themes/distinfo6
-rw-r--r--x11-themes/gnome-themes/pkg-plist37
-rw-r--r--x11-toolkits/eel/Makefile11
-rw-r--r--x11-toolkits/eel/distinfo6
-rw-r--r--x11-toolkits/eel/files/patch-Makefile.in20
-rw-r--r--x11-toolkits/eel/pkg-plist9
-rw-r--r--x11-toolkits/gtksourceview/Makefile10
-rw-r--r--x11-toolkits/gtksourceview/distinfo6
-rw-r--r--x11-toolkits/gtksourceview/pkg-plist10
-rw-r--r--x11-toolkits/libbonoboui/Makefile11
-rw-r--r--x11-toolkits/libbonoboui/distinfo6
-rw-r--r--x11-toolkits/libbonoboui/files/patch-Makefile.in6
-rw-r--r--x11-toolkits/libbonoboui/pkg-plist5
-rw-r--r--x11-toolkits/libgnomeui/Makefile10
-rw-r--r--x11-toolkits/libgnomeui/distinfo6
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app-helper.c74
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app.c12
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-entry.c25
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-gconf-ui.c20
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ice.c20
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-icon-sel.c20
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-pixmap-entry.c25
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ui-init.c13
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-authentication-manager.c30
-rw-r--r--x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c28
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist15
-rw-r--r--x11-toolkits/libgnomeuimm26/Makefile7
-rw-r--r--x11-toolkits/libgnomeuimm26/distinfo6
-rw-r--r--x11-toolkits/libwnck/Makefile12
-rw-r--r--x11-toolkits/libwnck/distinfo6
-rw-r--r--x11-toolkits/libwnck/pkg-plist3
-rw-r--r--x11-toolkits/pango/Makefile17
-rw-r--r--x11-toolkits/pango/distinfo6
-rw-r--r--x11-toolkits/pango/files/patch-ac2
-rw-r--r--x11-toolkits/pango/pkg-plist2
-rw-r--r--x11-toolkits/py-gnome-desktop/Makefile56
-rw-r--r--x11-toolkits/py-gnome-desktop/distinfo3
-rw-r--r--x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c (renamed from x11-toolkits/py-gnome-extras/files/patch-gtop_gtop.c)0
-rw-r--r--x11-toolkits/py-gnome-desktop/pkg-descr2
-rw-r--r--x11-toolkits/py-gnome-desktop/pkg-plist108
-rw-r--r--x11-toolkits/py-gnome-extras/Makefile13
-rw-r--r--x11-toolkits/py-gnome-extras/distinfo6
-rw-r--r--x11-toolkits/py-gnome-extras/files/patch-Makefile.in11
-rw-r--r--x11-toolkits/py-gnome-extras/files/patch-gda_gda.override102
-rw-r--r--x11-toolkits/py-gnome-extras/pkg-plist105
-rw-r--r--x11-toolkits/py-gtk2/Makefile15
-rw-r--r--x11-toolkits/py-gtk2/distinfo6
-rw-r--r--x11-toolkits/py-gtk2/pkg-plist16
-rw-r--r--x11-toolkits/vte/Makefile10
-rw-r--r--x11-toolkits/vte/distinfo6
-rw-r--r--x11-toolkits/vte/pkg-descr2
-rw-r--r--x11-toolkits/vte/pkg-plist7
-rw-r--r--x11-wm/metacity/Makefile11
-rw-r--r--x11-wm/metacity/distinfo6
-rw-r--r--x11-wm/metacity/files/patch-src_window-props.c18
-rw-r--r--x11-wm/metacity/pkg-plist6
-rw-r--r--x11/fast-user-switch-applet/Makefile15
-rw-r--r--x11/fast-user-switch-applet/distinfo6
-rw-r--r--x11/fast-user-switch-applet/pkg-plist31
-rw-r--r--x11/gdm/Makefile25
-rw-r--r--x11/gdm/distinfo6
-rw-r--r--x11/gdm/files/gdm.in (renamed from x11/gdm/files/gdm.sh.in)1
-rw-r--r--x11/gdm/files/patch-config_gdm.conf.in41
-rw-r--r--x11/gdm/files/patch-config_locale.alias2
-rw-r--r--x11/gdm/files/patch-configure14
-rw-r--r--x11/gdm/files/patch-daemon_gdmconfig.c10
-rw-r--r--x11/gdm/files/patch-daemon_server.c10
-rw-r--r--x11/gdm/files/patch-gui_greeter_gdmthemetester.in112
-rw-r--r--x11/gdm/pkg-plist56
-rw-r--r--x11/gnome-applets/Makefile25
-rw-r--r--x11/gnome-applets/distinfo6
-rw-r--r--x11/gnome-applets/files/patch-aa51
-rw-r--r--x11/gnome-applets/files/patch-drivemount_drive-button.c48
-rw-r--r--x11/gnome-applets/files/patch-gswitchit_gswitchit-applet.c61
-rw-r--r--x11/gnome-applets/files/patch-gweather_weather-iwin.c9
-rw-r--r--x11/gnome-applets/pkg-plist250
-rw-r--r--x11/gnome-desktop/Makefile11
-rw-r--r--x11/gnome-desktop/distinfo6
-rw-r--r--x11/gnome-desktop/pkg-plist51
-rw-r--r--x11/gnome-menus/Makefile19
-rw-r--r--x11/gnome-menus/distinfo6
-rw-r--r--x11/gnome-menus/files/patch-Makefile.in4
-rw-r--r--x11/gnome-menus/pkg-plist25
-rw-r--r--x11/gnome-panel/Makefile13
-rw-r--r--x11/gnome-panel/distinfo6
-rw-r--r--x11/gnome-panel/files/patch-applets_clock_clock.c6
-rw-r--r--x11/gnome-panel/files/patch-gnome-panel_egg-recent-model.c20
-rw-r--r--x11/gnome-panel/pkg-plist41
-rw-r--r--x11/gnome-screensaver/Makefile12
-rw-r--r--x11/gnome-screensaver/distinfo6
-rw-r--r--x11/gnome-screensaver/pkg-plist18
-rw-r--r--x11/gnome-session/Makefile18
-rw-r--r--x11/gnome-session/distinfo6
-rw-r--r--x11/gnome-session/files/patch-dbus429
-rw-r--r--x11/gnome-session/files/patch-gnome-session_Makefile.in36
-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-plist14
-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.c23
-rw-r--r--x11/gnome-terminal/files/patch-src_terminal-screen.c33
-rw-r--r--x11/gnome-terminal/pkg-plist18
-rw-r--r--x11/gnome2-fifth-toe/Makefile5
-rw-r--r--x11/gnome2-lite/Makefile2
-rw-r--r--x11/gnome2-power-tools/Makefile6
-rw-r--r--x11/gnome2/Makefile25
-rw-r--r--x11/gnomeapplets2/Makefile25
-rw-r--r--x11/gnomeapplets2/distinfo6
-rw-r--r--x11/gnomeapplets2/files/patch-aa51
-rw-r--r--x11/gnomeapplets2/files/patch-drivemount_drive-button.c48
-rw-r--r--x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c61
-rw-r--r--x11/gnomeapplets2/files/patch-gweather_weather-iwin.c9
-rw-r--r--x11/gnomeapplets2/pkg-plist250
-rw-r--r--x11/gnomedesktop/Makefile11
-rw-r--r--x11/gnomedesktop/distinfo6
-rw-r--r--x11/gnomedesktop/pkg-plist51
-rw-r--r--x11/gnomepanel/Makefile13
-rw-r--r--x11/gnomepanel/distinfo6
-rw-r--r--x11/gnomepanel/files/patch-applets_clock_clock.c6
-rw-r--r--x11/gnomepanel/files/patch-gnome-panel_egg-recent-model.c20
-rw-r--r--x11/gnomepanel/pkg-plist41
-rw-r--r--x11/gnomesession/Makefile18
-rw-r--r--x11/gnomesession/distinfo6
-rw-r--r--x11/gnomesession/files/patch-dbus429
-rw-r--r--x11/gnomesession/files/patch-gnome-session_Makefile.in36
-rw-r--r--x11/gnomesession/files/patch-gnome-session_gsm-at-startup.c10
-rw-r--r--x11/gnomesession/files/patch-gnome-session_gsm-xrandr.c10
-rw-r--r--x11/gnomesession/pkg-plist14
-rw-r--r--x11/gnometerminal/Makefile8
-rw-r--r--x11/gnometerminal/distinfo6
-rw-r--r--x11/gnometerminal/files/patch-src::terminal-screen.c23
-rw-r--r--x11/gnometerminal/files/patch-src_terminal-screen.c33
-rw-r--r--x11/gnometerminal/pkg-plist18
-rw-r--r--x11/libgnome/Makefile12
-rw-r--r--x11/libgnome/distinfo6
-rw-r--r--x11/libgnome/files/patch-ag4
-rw-r--r--x11/libgnome/files/patch-libgnome_gnome-program.c25
-rw-r--r--x11/libgnome/files/pkg-deinstall.in2
-rw-r--r--x11/libgnome/pkg-plist8
-rw-r--r--x11/libgnomemm26/Makefile7
-rw-r--r--x11/libgnomemm26/distinfo6
-rw-r--r--x11/yelp/Makefile29
-rw-r--r--x11/yelp/distinfo6
-rw-r--r--x11/yelp/pkg-plist14
-rw-r--r--x11/zenity/Makefile8
-rw-r--r--x11/zenity/distinfo6
-rw-r--r--x11/zenity/pkg-plist24
537 files changed, 10018 insertions, 7228 deletions
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index ab46c80bf15..c1207d4ada5 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -3,31 +3,36 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/accessibility/at-spi/Makefile,v 1.43 2006/04/13 07:52:28 bland Exp $
#
PORTNAME= at-spi
-PORTVERSION= 1.6.6
-PORTREVISION= 2
+PORTVERSION= 1.7.7
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.6
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= An Assistive Technology Service Provider Interface
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier intltool gail libbonobo \
intlhack
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
CONFIGURE_ARGS= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+
+post-extract:
+ @${RM} -f ${WRKSRC}/registryd/Accessibility_Registry.server
+
post-patch:
@${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" ${WRKSRC}/Makefile.in
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
index 1155e21ca64..8faba577880 100644
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/at-spi-1.6.6.tar.bz2) = 9669ee9e3633ffb43a70795edd748e4d
-SHA256 (gnome2/at-spi-1.6.6.tar.bz2) = e80e6e93923bb00d2beb5409bf532d4ff3a3f76afaa41dda9cdd336729e42020
-SIZE (gnome2/at-spi-1.6.6.tar.bz2) = 541611
+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
diff --git a/accessibility/at-spi/files/patch-docs_reference_idl_Makefile.in b/accessibility/at-spi/files/patch-docs_reference_idl_Makefile.in
new file mode 100644
index 00000000000..f8b41ab8c21
--- /dev/null
+++ b/accessibility/at-spi/files/patch-docs_reference_idl_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/reference/idl/Makefile.in.orig Fri Mar 31 17:43:05 2006
++++ docs/reference/idl/Makefile.in Fri Mar 31 17:43:28 2006
+@@ -233,7 +233,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ doxygen_configfile = Doxyfile
+ EXTRA_DIST = Doxyfile README html
+-referencetopdir = $(datadir)/doc/at-spi-$(VERSION)/reference
++referencetopdir = $(prefix)/share/doc/at-spi-$(VERSION)/reference
+ referencedir = $(referencetopdir)/html
+ all: all-am
+
diff --git a/accessibility/at-spi/files/patch-libspi_Makefile.in b/accessibility/at-spi/files/patch-libspi_Makefile.in
deleted file mode 100644
index cfb55a212a8..00000000000
--- a/accessibility/at-spi/files/patch-libspi_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libspi/Makefile.in.orig Fri May 2 13:36:07 2003
-+++ libspi/Makefile.in Fri May 2 13:36:37 2003
-@@ -539,7 +539,7 @@
- mostlyclean distclean maintainer-clean
-
-
--$(top_srcdir)/libspi/accessible.c $(top_srcdir)/libspi/base.h $(top_srcdir)/libspi/keystrokelistener.h $(top_srcdir)/libspi/libspi.h $(top_srcdir)/libspi/listener.h $(top_srcdir)/libspi/remoteobject.h : Accessibility.h
-+accessible.c base.h keystrokelistener.h libspi.h listener.h remoteobject.h : Accessibility.h
-
- $(IDL_OUT) Accessibility-imodule.c : $(IDL_DEPS) $(ORBIT_IDL)
- $(ORBIT_IDL) -D__ACCESSIBILITY_COMPILATION__ $(IDLFLAGS) $(top_srcdir)/idl/Accessibility.idl
diff --git a/accessibility/at-spi/files/patch-registryd_Makefile.in b/accessibility/at-spi/files/patch-registryd_Makefile.in
deleted file mode 100644
index 7729e9da140..00000000000
--- a/accessibility/at-spi/files/patch-registryd_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- registryd/Makefile.in.orig Fri Aug 8 12:15:34 2003
-+++ registryd/Makefile.in Fri Aug 8 12:20:05 2003
-@@ -150,7 +150,7 @@
- at_spi_registryd_SOURCES = desktop.c desktop.h deviceeventcontroller.c deviceeventcontroller.h registry-main.c registry.c registry.h
-
-
--LDADD = $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(REGISTRYD_LIBS)
-+LDADD = -L$(top_builddir)/libspi/.libs $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(REGISTRYD_LIBS)
-
- serverinfodir = $(prefix)/libdata/bonobo/servers
- serverinfo_DATA = Accessibility_Registry.server
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index f87187c9c45..2b256a37de2 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@@ -29,6 +29,9 @@ include/at-spi-1.0/libspi/text.h
include/at-spi-1.0/libspi/value.h
include/at-spi-1.0/login-helper/Accessibility_LoginHelper.h
include/at-spi-1.0/login-helper/login-helper.h
+lib/gtk-2.0/modules/libatk-bridge.a
+lib/gtk-2.0/modules/libatk-bridge.la
+lib/gtk-2.0/modules/libatk-bridge.so
lib/libcspi.a
lib/libcspi.la
lib/libcspi.so
@@ -41,9 +44,6 @@ lib/libspi.a
lib/libspi.la
lib/libspi.so
lib/libspi.so.10
-lib/gtk-2.0/modules/libatk-bridge.a
-lib/gtk-2.0/modules/libatk-bridge.la
-lib/gtk-2.0/modules/libatk-bridge.so
lib/orbit-2.0/Accessibility_LoginHelper_module.a
lib/orbit-2.0/Accessibility_LoginHelper_module.la
lib/orbit-2.0/Accessibility_LoginHelper_module.so
@@ -55,6 +55,102 @@ libdata/pkgconfig/cspi-1.0.pc
libdata/pkgconfig/libloginhelper-1.0.pc
libdata/pkgconfig/libspi-1.0.pc
libexec/at-spi-registryd
+%%DOCSDIR%%/reference/html/Accessibility_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Accessible_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Accessible_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Action_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Action_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Application_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Application_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Component_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Component_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Desktop_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Desktop_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__EditableText_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__EditableText_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Event_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Event_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Hyperlink_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Hyperlink_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Hypertext_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Hypertext_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Image_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Image_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__LoginHelper_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__LoginHelper_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Registry_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Registry_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Relation_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Relation_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Role_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Role_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Selection_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Selection_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Selector_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Selector_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__State_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__State_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__StreamableContent_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__StreamableContent_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Table_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Table_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Text_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Text_8idl.html
+%%DOCSDIR%%/reference/html/Accessibility__Value_8idl-source.html
+%%DOCSDIR%%/reference/html/Accessibility__Value_8idl.html
+%%DOCSDIR%%/reference/html/annotated.html
+%%DOCSDIR%%/reference/html/doxygen.css
+%%DOCSDIR%%/reference/html/doxygen.png
+%%DOCSDIR%%/reference/html/exceptionAccessibility_1_1StreamableContent_1_1IOError.html
+%%DOCSDIR%%/reference/html/exceptionAccessibility_1_1StreamableContent_1_1NoPermission.html
+%%DOCSDIR%%/reference/html/exceptionAccessibility_1_1StreamableContent_1_1NotSupported.html
+%%DOCSDIR%%/reference/html/files.html
+%%DOCSDIR%%/reference/html/functions.html
+%%DOCSDIR%%/reference/html/hierarchy.html
+%%DOCSDIR%%/reference/html/index.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Accessible.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Accessible.png
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Action.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Application.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Application.png
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1CommandListener.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Component.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Desktop.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Desktop.png
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1DeviceEventController.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1DeviceEventListener.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1EditableText.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1EditableText.png
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1EventListener.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1EventListener.png
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Hyperlink.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Hypertext.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Image.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1LoginHelper.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Registry.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Registry.png
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Relation.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Selection.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Selector.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1StateSet.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1StreamableContent.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Table.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Text.html
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Text.png
+%%DOCSDIR%%/reference/html/interfaceAccessibility_1_1Value.html
+%%DOCSDIR%%/reference/html/namespaceAccessibility.html
+%%DOCSDIR%%/reference/html/namespacemembers.html
+%%DOCSDIR%%/reference/html/namespaces.html
+%%DOCSDIR%%/reference/html/structAccessibility_1_1BoundingBox.html
+%%DOCSDIR%%/reference/html/structAccessibility_1_1Command.html
+%%DOCSDIR%%/reference/html/structAccessibility_1_1DeviceEvent.html
+%%DOCSDIR%%/reference/html/structAccessibility_1_1Event.html
+%%DOCSDIR%%/reference/html/structAccessibility_1_1EventDetails.html
+%%DOCSDIR%%/reference/html/structAccessibility_1_1EventListenerMode.html
+%%DOCSDIR%%/reference/html/structAccessibility_1_1KeyDefinition.html
+%%DOCSDIR%%/reference/html/structAccessibility_1_1LoginHelper_1_1WindowInfo.html
+%%DOCSDIR%%/reference/html/structAccessibility_1_1Text_1_1Range.html
share/doc/at-spi-cspi/at-spi-cspi-Accessible-Objects.html
share/doc/at-spi-cspi/at-spi-cspi-AccessibleAction-Interface.html
share/doc/at-spi-cspi/at-spi-cspi-AccessibleApplication-API.html
@@ -73,6 +169,7 @@ share/doc/at-spi-cspi/at-spi-cspi-Registry-queries.html
share/doc/at-spi-cspi/at-spi-cspi-SPI-main-loop-and-initialization.html
share/doc/at-spi-cspi/at-spi-cspi-State-and-StateSets.html
share/doc/at-spi-cspi/at-spi-cspi.devhelp
+share/doc/at-spi-cspi/at-spi-cspi.devhelp2
share/doc/at-spi-cspi/ch05.html
share/doc/at-spi-cspi/home.png
share/doc/at-spi-cspi/index.html
@@ -101,13 +198,90 @@ share/gnome/idl/at-spi-1.0/Accessibility_Registry.idl
share/gnome/idl/at-spi-1.0/Accessibility_Relation.idl
share/gnome/idl/at-spi-1.0/Accessibility_Role.idl
share/gnome/idl/at-spi-1.0/Accessibility_Selection.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Selector.idl
share/gnome/idl/at-spi-1.0/Accessibility_State.idl
share/gnome/idl/at-spi-1.0/Accessibility_StreamableContent.idl
share/gnome/idl/at-spi-1.0/Accessibility_Table.idl
share/gnome/idl/at-spi-1.0/Accessibility_Text.idl
share/gnome/idl/at-spi-1.0/Accessibility_Value.idl
+share/locale/ar/LC_MESSAGES/at-spi.mo
+share/locale/az/LC_MESSAGES/at-spi.mo
+share/locale/be/LC_MESSAGES/at-spi.mo
+share/locale/bg/LC_MESSAGES/at-spi.mo
+share/locale/bn/LC_MESSAGES/at-spi.mo
+share/locale/bs/LC_MESSAGES/at-spi.mo
+share/locale/ca/LC_MESSAGES/at-spi.mo
+share/locale/cs/LC_MESSAGES/at-spi.mo
+share/locale/cy/LC_MESSAGES/at-spi.mo
+share/locale/da/LC_MESSAGES/at-spi.mo
+share/locale/de/LC_MESSAGES/at-spi.mo
+share/locale/dz/LC_MESSAGES/at-spi.mo
+share/locale/el/LC_MESSAGES/at-spi.mo
+share/locale/en_CA/LC_MESSAGES/at-spi.mo
+share/locale/en_GB/LC_MESSAGES/at-spi.mo
+share/locale/eo/LC_MESSAGES/at-spi.mo
+share/locale/es/LC_MESSAGES/at-spi.mo
+share/locale/et/LC_MESSAGES/at-spi.mo
+share/locale/eu/LC_MESSAGES/at-spi.mo
+share/locale/fa/LC_MESSAGES/at-spi.mo
+share/locale/fi/LC_MESSAGES/at-spi.mo
+share/locale/fr/LC_MESSAGES/at-spi.mo
+share/locale/gl/LC_MESSAGES/at-spi.mo
+share/locale/gu/LC_MESSAGES/at-spi.mo
+share/locale/he/LC_MESSAGES/at-spi.mo
+share/locale/hi/LC_MESSAGES/at-spi.mo
+share/locale/hr/LC_MESSAGES/at-spi.mo
+share/locale/hu/LC_MESSAGES/at-spi.mo
+share/locale/id/LC_MESSAGES/at-spi.mo
+share/locale/is/LC_MESSAGES/at-spi.mo
+share/locale/it/LC_MESSAGES/at-spi.mo
+share/locale/ja/LC_MESSAGES/at-spi.mo
+share/locale/ka/LC_MESSAGES/at-spi.mo
+share/locale/ko/LC_MESSAGES/at-spi.mo
+share/locale/lt/LC_MESSAGES/at-spi.mo
+share/locale/mn/LC_MESSAGES/at-spi.mo
+share/locale/mr/LC_MESSAGES/at-spi.mo
+share/locale/ms/LC_MESSAGES/at-spi.mo
+share/locale/nb/LC_MESSAGES/at-spi.mo
+share/locale/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
+share/locale/pt/LC_MESSAGES/at-spi.mo
+share/locale/pt_BR/LC_MESSAGES/at-spi.mo
+share/locale/ro/LC_MESSAGES/at-spi.mo
+share/locale/ru/LC_MESSAGES/at-spi.mo
+share/locale/rw/LC_MESSAGES/at-spi.mo
+share/locale/sk/LC_MESSAGES/at-spi.mo
+share/locale/sl/LC_MESSAGES/at-spi.mo
+share/locale/sq/LC_MESSAGES/at-spi.mo
+share/locale/sr/LC_MESSAGES/at-spi.mo
+share/locale/sr@Latn/LC_MESSAGES/at-spi.mo
+share/locale/sr@ije/LC_MESSAGES/at-spi.mo
+share/locale/sv/LC_MESSAGES/at-spi.mo
+share/locale/th/LC_MESSAGES/at-spi.mo
+share/locale/ug/LC_MESSAGES/at-spi.mo
+share/locale/uk/LC_MESSAGES/at-spi.mo
+share/locale/vi/LC_MESSAGES/at-spi.mo
+share/locale/wa/LC_MESSAGES/at-spi.mo
+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
@dirrm share/gnome/idl/at-spi-1.0
@dirrm share/doc/at-spi-cspi
+@dirrm %%DOCSDIR%%/reference/html
+@dirrm %%DOCSDIR%%/reference
+@dirrm %%DOCSDIR%%
@dirrm lib/orbit-2.0
@dirrm include/at-spi-1.0/login-helper
@dirrm include/at-spi-1.0/libspi
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index c99b643dc6b..c69aaa8d672 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -3,22 +3,21 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/atk/Makefile,v 1.56 2005/09/05 21:13:50 marcus Exp $
+# $MCom: ports/accessibility/atk/Makefile,v 1.68 2006/04/13 07:52:28 bland Exp $
#
PORTNAME= atk
-PORTVERSION= 1.10.3
-PORTREVISION= 1
+PORTVERSION= 1.11.4
CATEGORIES= accessibility devel
-MASTER_SITES= ${MASTER_SITE_GNOME} \
- ftp://ftp.gtk.org/pub/gtk/v2.6/
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.10
+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 GNOME accessibility toolkit (ATK)
USE_BZIP2= yes
+USE_GETTEXT= yes
INSTALLS_SHLIB= yes
USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack glib20 ltverhack
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 76912377e10..8be97790ae6 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/atk-1.10.3.tar.bz2) = c84a01fea567b365c0d44b227fead948
-SHA256 (gnome2/atk-1.10.3.tar.bz2) = c596baf95f6a6cd7748b1018336b2ac45ca2ef668816e6c703b01691e09b8a89
-SIZE (gnome2/atk-1.10.3.tar.bz2) = 542712
+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
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 4458fa2e132..47b421caff0 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -29,9 +29,38 @@ lib/libatk-1.0.la
lib/libatk-1.0.so
lib/libatk-1.0.so.0
libdata/pkgconfig/atk.pc
+%%DOCSDIR%%/AtkAction.html
+%%DOCSDIR%%/AtkComponent.html
+%%DOCSDIR%%/AtkDocument.html
+%%DOCSDIR%%/AtkEditableText.html
+%%DOCSDIR%%/AtkGObjectAccessible.html
+%%DOCSDIR%%/AtkHyperlink.html
+%%DOCSDIR%%/AtkHypertext.html
+%%DOCSDIR%%/AtkImage.html
+%%DOCSDIR%%/AtkNoOpObject.html
+%%DOCSDIR%%/AtkNoOpObjectFactory.html
+%%DOCSDIR%%/AtkObject.html
+%%DOCSDIR%%/AtkObjectFactory.html
+%%DOCSDIR%%/AtkRegistry.html
+%%DOCSDIR%%/AtkRelation.html
+%%DOCSDIR%%/AtkRelationSet.html
+%%DOCSDIR%%/AtkSelection.html
+%%DOCSDIR%%/AtkStreamableContent.html
+%%DOCSDIR%%/AtkTable.html
+%%DOCSDIR%%/AtkText.html
+%%DOCSDIR%%/AtkUtil.html
+%%DOCSDIR%%/AtkValue.html
+%%DOCSDIR%%/atk-AtkState.html
+%%DOCSDIR%%/atk-AtkStateSet.html
+%%DOCSDIR%%/atk.devhelp
+%%DOCSDIR%%/atk.devhelp2
+%%DOCSDIR%%/atk.html
%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
%%DOCSDIR%%/left.png
%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
share/locale/af/LC_MESSAGES/atk10.mo
share/locale/am/LC_MESSAGES/atk10.mo
@@ -68,6 +97,7 @@ share/locale/id/LC_MESSAGES/atk10.mo
share/locale/is/LC_MESSAGES/atk10.mo
share/locale/it/LC_MESSAGES/atk10.mo
share/locale/ja/LC_MESSAGES/atk10.mo
+share/locale/ka/LC_MESSAGES/atk10.mo
share/locale/kn/LC_MESSAGES/atk10.mo
share/locale/ko/LC_MESSAGES/atk10.mo
share/locale/li/LC_MESSAGES/atk10.mo
@@ -83,6 +113,7 @@ 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
share/locale/pt/LC_MESSAGES/atk10.mo
@@ -101,6 +132,7 @@ share/locale/ta/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
+share/locale/tt/LC_MESSAGES/atk10.mo
share/locale/ug/LC_MESSAGES/atk10.mo
share/locale/uk/LC_MESSAGES/atk10.mo
share/locale/vi/LC_MESSAGES/atk10.mo
@@ -108,20 +140,68 @@ share/locale/wa/LC_MESSAGES/atk10.mo
share/locale/xh/LC_MESSAGES/atk10.mo
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 %%DOCSDIR%%
-@exec mkdir -p %D/%%DOCSDIR%%
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/li/LC_MESSAGES
-@dirrmtry share/locale/li
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/tk/LC_MESSAGES
-@dirrmtry share/locale/tk
+@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/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@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/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/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
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrm %%DOCSDIR%%
@dirrm include/atk-1.0/atk
@dirrm include/atk-1.0
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 445df1ae289..df97a89f56d 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -3,26 +3,25 @@
# Whom: lewiz <purple@lewiz.net>
#
# $FreeBSD$
-# $MCom: ports/accessibility/dasher/Makefile,v 1.18 2005/10/29 22:31:15 marcus Exp $
+# $MCom: ports/accessibility/dasher/Makefile,v 1.34 2006/04/13 07:52:29 bland Exp $
#
PORTNAME= dasher
-PORTVERSION= 3.2.18
-PORTREVISION= 1
+PORTVERSION= 4.0.2
PORTEPOCH= 1
CATEGORIES= accessibility editors x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/3.2
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= lewiz@compsoc.man.ac.uk
COMMENT= Information efficient text-entry interface
BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi \
@@ -30,7 +29,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi \
WANT_GNOME= yes
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
-USE_REINPLACE= yes
+INSTALLS_ICONS= yes
USE_GCC= 3.4+
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -41,8 +40,7 @@ MAN1= dasher.1
.if ${HAVE_GNOME:Mgnomespeech}!=""
USE_GNOME+= gnomespeech
-.else
-CONFIGURE_ARGS+=--without-speech
+CONFIGURE_ARGS+=--enable-speech
.endif
post-patch:
diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo
index 4bfa1d52313..0af9bb63a4b 100644
--- a/accessibility/dasher/distinfo
+++ b/accessibility/dasher/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/dasher-3.2.18.tar.bz2) = f724113d3148a3c7f888b9e830ae75af
-SHA256 (gnome2/dasher-3.2.18.tar.bz2) = a58ec285fb908dddde468794def6538ef2930a1e273d0b24d11a627ddbe02ee9
-SIZE (gnome2/dasher-3.2.18.tar.bz2) = 4758337
+MD5 (gnome2/dasher-4.0.2.tar.bz2) = 47cf27594abb51ea97f3a8fdb276736d
+SHA256 (gnome2/dasher-4.0.2.tar.bz2) = 4a4adb18ca80641319ffdb63c8cbd69f2faa0698b4d275a2b3ccae467de8d73c
+SIZE (gnome2/dasher-4.0.2.tar.bz2) = 5802684
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
new file mode 100644
index 00000000000..da5a022d06c
--- /dev/null
+++ b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
@@ -0,0 +1,36 @@
+--- 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));
++ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
+
+ // 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);
++ sprintf(strMs, "%d", (int) (sTimeBuffer.tv_usec / 1000));
+ 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
new file mode 100644
index 00000000000..d8679afaed3
--- /dev/null
+++ b/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp
@@ -0,0 +1,44 @@
+--- 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"
+
+-#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);
++ int iEndSecond = (int) sTimeBuffer.tv_sec;
+
+ 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
new file mode 100644
index 00000000000..d5bf37daf0d
--- /dev/null
+++ b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
@@ -0,0 +1,51 @@
+--- 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));
+
+ 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);
++ sprintf(szMs, "%d", (int) (sTimeBuffer.tv_usec / 1000));
+ 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
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp b/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp
new file mode 100644
index 00000000000..2ba6fec10ff
--- /dev/null
+++ b/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp
@@ -0,0 +1,41 @@
+--- 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));
++ szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
+
+ 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;
++ double dTime = (sTimeBuffer.tv_sec * 1000.0) + (int) (sTimeBuffer.tv_usec / 1000);
+
+ 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
index 7622867dbd5..9817b2f11bb 100644
--- a/accessibility/dasher/files/patch-Src_Gtk2_speech.cc
+++ b/accessibility/dasher/files/patch-Src_Gtk2_speech.cc
@@ -1,12 +1,10 @@
---- Src/Gtk2/speech.cc.orig Fri Aug 19 09:57:44 2005
-+++ Src/Gtk2/speech.cc Mon Aug 22 20:23:21 2005
-@@ -78,7 +78,8 @@ void setup_speech() {
+--- 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);
-- CORBA_free (voices);
+ bonobo_object_release_unref(speaker, NULL);
+ if (voices != NULL && !BONOBO_EX (&ev) && voices->_length != 0)
-+ CORBA_free (voices);
+ CORBA_free(voices);
GNOME_Speech_SynthesisDriver_unref(rv, &ev);
- CORBA_exception_free (&ev);
-
+ CORBA_exception_free(&ev);
diff --git a/accessibility/dasher/files/patch-configure b/accessibility/dasher/files/patch-configure
new file mode 100644
index 00000000000..982daaac666
--- /dev/null
+++ b/accessibility/dasher/files/patch-configure
@@ -0,0 +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"
+
+
+
diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist
index baf14dc3aa7..0e3238b8a82 100644
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@@ -75,6 +75,7 @@ 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
@@ -91,6 +92,7 @@ share/gnome/dasher/alphabet.hiragana2.xml
share/gnome/dasher/alphabet.hungarian.xml
share/gnome/dasher/alphabet.ipa.xml
share/gnome/dasher/alphabet.italian.xml
+share/gnome/dasher/alphabet.japanese.canna.xml
share/gnome/dasher/alphabet.kazakh.xml
share/gnome/dasher/alphabet.kirghiz.xml
share/gnome/dasher/alphabet.kirundi.xml
@@ -144,11 +146,15 @@ share/gnome/dasher/colour.rainbow.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
share/gnome/dasher/training_bengali_bn.txt
+share/gnome/dasher/training_canna_JP.txt
share/gnome/dasher/training_czech_CS.txt
share/gnome/dasher/training_danish_DK.txt
share/gnome/dasher/training_dutch_NL.txt
@@ -170,6 +176,7 @@ share/gnome/dasher/training_russian_RU.txt
share/gnome/dasher/training_spanish_ES.txt
share/gnome/dasher/training_swahili_KE.txt
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/figure2.png
@@ -189,20 +196,23 @@ 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/icons/dasher.png
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
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/bs/LC_MESSAGES/dasher.mo
share/locale/ca/LC_MESSAGES/dasher.mo
share/locale/cs/LC_MESSAGES/dasher.mo
share/locale/cy/LC_MESSAGES/dasher.mo
share/locale/da/LC_MESSAGES/dasher.mo
share/locale/de/LC_MESSAGES/dasher.mo
+share/locale/dz/LC_MESSAGES/dasher.mo
share/locale/el/LC_MESSAGES/dasher.mo
share/locale/en_CA/LC_MESSAGES/dasher.mo
share/locale/en_GB/LC_MESSAGES/dasher.mo
@@ -222,7 +232,9 @@ share/locale/hu/LC_MESSAGES/dasher.mo
share/locale/id/LC_MESSAGES/dasher.mo
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/ky/LC_MESSAGES/dasher.mo
share/locale/lt/LC_MESSAGES/dasher.mo
share/locale/mk/LC_MESSAGES/dasher.mo
share/locale/mn/LC_MESSAGES/dasher.mo
@@ -244,14 +256,25 @@ share/locale/sr/LC_MESSAGES/dasher.mo
share/locale/sr@Latn/LC_MESSAGES/dasher.mo
share/locale/sv/LC_MESSAGES/dasher.mo
share/locale/ta/LC_MESSAGES/dasher.mo
+share/locale/th/LC_MESSAGES/dasher.mo
share/locale/tk/LC_MESSAGES/dasher.mo
share/locale/tr/LC_MESSAGES/dasher.mo
share/locale/ug/LC_MESSAGES/dasher.mo
share/locale/uk/LC_MESSAGES/dasher.mo
+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
+@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/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/gnome/omf/dasher
@dirrm share/gnome/help/dasher/eu/figures
@dirrm share/gnome/help/dasher/eu
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index a6d7c917e3a..62da81721c9 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -3,25 +3,25 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/accessibility/gail/Makefile,v 1.44 2006/04/23 22:21:28 mezz Exp $
#
PORTNAME= gail
-PORTVERSION= 1.8.10
-PORTREVISION= 1
+PORTVERSION= 1.8.11
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= An implementation of the ATK interfaces for GTK+ widgets
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
USE_GNOME= gnomehack libgnomecanvas lthack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo
index 40c6c437bde..5ae5efb34fd 100644
--- a/accessibility/gail/distinfo
+++ b/accessibility/gail/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gail-1.8.10.tar.bz2) = f7dbebcda98a5eb0cc22074b56a62d29
-SHA256 (gnome2/gail-1.8.10.tar.bz2) = d81deb6d470f9efc888c1ed2f28438ddece07f29e63e853a1bd51388a91729d7
-SIZE (gnome2/gail-1.8.10.tar.bz2) = 584033
+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
diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist
index 532efc0325c..161125f2d4e 100644
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@@ -80,18 +80,18 @@ share/locale/ta/LC_MESSAGES/gail.mo
share/locale/th/LC_MESSAGES/gail.mo
share/locale/tk/LC_MESSAGES/gail.mo
share/locale/tr/LC_MESSAGES/gail.mo
-share/locale/vi/LC_MESSAGES/gail.mo
share/locale/uk/LC_MESSAGES/gail.mo
+share/locale/vi/LC_MESSAGES/gail.mo
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_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
-@dirrm share/doc//gail-libgail-util
+@dirrm share/doc/gail-libgail-util
+@dirrm include/gail-1.0/libgail-util
+@dirrm include/gail-1.0
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index 0279ccad564..9d28d20836f 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -3,15 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/gnopernicus/Makefile,v 1.63 2005/10/12 00:10:26 marcus Exp $
+# $MCom: ports/accessibility/gnopernicus/Makefile,v 1.76 2006/04/14 14:42:45 mezz Exp $
#
PORTNAME= gnopernicus
-PORTVERSION= 0.12.0
+PORTVERSION= 1.0.4
PORTREVISION= 1
CATEGORIES= accessibility x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -20,18 +20,18 @@ COMMENT= Collection of accessibility apps for GNOME 2
LIB_DEPENDS= gnome-mag.2:${PORTSDIR}/accessibility/gnomemag
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
-USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui atspi gnomespeech
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ENV= SED="${SED}"
GCONF_SCHEMAS= brlmonitor.schemas gnopernicus.schemas remote.schemas
-SHLIB_VERSION= 0
+SHLIB_VERSION= 4
PLIST_SUB= SHLIB_VERSION=${SHLIB_VERSION}
post-patch:
diff --git a/accessibility/gnopernicus/distinfo b/accessibility/gnopernicus/distinfo
index 68dc60f7ee9..8823f40f7f3 100644
--- a/accessibility/gnopernicus/distinfo
+++ b/accessibility/gnopernicus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnopernicus-0.12.0.tar.bz2) = 8228afc6b98306207349df150592b83b
-SHA256 (gnome2/gnopernicus-0.12.0.tar.bz2) = 7cf15abeea9255594050f29824c67f4de8776b4d8e7a70ae78107675e9c7367b
-SIZE (gnome2/gnopernicus-0.12.0.tar.bz2) = 2202137
+MD5 (gnome2/gnopernicus-1.0.4.tar.bz2) = 4e798c6d08e6096702d316b702801d1d
+SHA256 (gnome2/gnopernicus-1.0.4.tar.bz2) = 1a42e8eb8dde345eb155d21e0a3ec8d57d96d13e989e3ae3ce770e797b9098c9
+SIZE (gnome2/gnopernicus-1.0.4.tar.bz2) = 2306812
diff --git a/accessibility/gnopernicus/files/patch-configure b/accessibility/gnopernicus/files/patch-configure
new file mode 100644
index 00000000000..79dc7a3c1b0
--- /dev/null
+++ b/accessibility/gnopernicus/files/patch-configure
@@ -0,0 +1,21 @@
+--- configure.orig Mon Jan 9 15:02:42 2006
++++ configure Mon Jan 9 15:04:48 2006
+@@ -21635,11 +21635,17 @@
+ TTYNAME_2="/dev/cua/c"
+ TTYNAME_3="/dev/cua/d"
+ ;;
+- FreeBSD-*)
++ FreeBSD-4*|FreeBSD-5*)
+ TTYNAME_0="/dev/cuaa0"
+ TTYNAME_1="/dev/cuaa1"
+ TTYNAME_2="/dev/cuaa2"
+ TTYNAME_3="/dev/cuaa3"
++ ;;
++ FreeBSD-*)
++ TTYNAME_0="/dev/cuad0"
++ TTYNAME_1="/dev/cuad1"
++ TTYNAME_2="/dev/cuaU0"
++ TTYNAME_3="/dev/cuaU1"
+ ;;
+ *)
+ echo "Can't figure out the name of the serial port on this OS"
diff --git a/accessibility/gnopernicus/pkg-plist b/accessibility/gnopernicus/pkg-plist
index f991f642596..6aa58bfddc9 100644
--- a/accessibility/gnopernicus/pkg-plist
+++ b/accessibility/gnopernicus/pkg-plist
@@ -79,6 +79,9 @@ share/gnome/help/gnopernicus/C/gnopernicus.xml
share/gnome/help/gnopernicus/C/legal.xml
share/gnome/help/gnopernicus/es/gnopernicus.xml
share/gnome/help/gnopernicus/es/legal.xml
+share/gnome/help/gnopernicus/pt_BR/figures/gnopernicus.png
+share/gnome/help/gnopernicus/pt_BR/gnopernicus.xml
+share/gnome/help/gnopernicus/pt_BR/legal.xml
share/gnome/omf/gnopernicus/brlmonitor-C.omf
share/gnome/omf/gnopernicus/brlmonitor-es.omf
share/gnome/omf/gnopernicus/gnopernicus-C.omf
@@ -94,10 +97,12 @@ share/locale/cs/LC_MESSAGES/gnopernicus.mo
share/locale/cy/LC_MESSAGES/gnopernicus.mo
share/locale/da/LC_MESSAGES/gnopernicus.mo
share/locale/de/LC_MESSAGES/gnopernicus.mo
+share/locale/dz/LC_MESSAGES/gnopernicus.mo
share/locale/el/LC_MESSAGES/gnopernicus.mo
share/locale/en_CA/LC_MESSAGES/gnopernicus.mo
share/locale/en_GB/LC_MESSAGES/gnopernicus.mo
share/locale/es/LC_MESSAGES/gnopernicus.mo
+share/locale/et/LC_MESSAGES/gnopernicus.mo
share/locale/eu/LC_MESSAGES/gnopernicus.mo
share/locale/fa/LC_MESSAGES/gnopernicus.mo
share/locale/fi/LC_MESSAGES/gnopernicus.mo
@@ -132,12 +137,18 @@ share/locale/sr/LC_MESSAGES/gnopernicus.mo
share/locale/sr@Latn/LC_MESSAGES/gnopernicus.mo
share/locale/sv/LC_MESSAGES/gnopernicus.mo
share/locale/ta/LC_MESSAGES/gnopernicus.mo
+share/locale/te/LC_MESSAGES/gnopernicus.mo
+share/locale/th/LC_MESSAGES/gnopernicus.mo
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_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
@dirrm share/gnome/help/gnopernicus/es
@dirrm share/gnome/help/gnopernicus/C
@dirrm share/gnome/help/gnopernicus
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 6c2a461c4cb..0f436c30cc7 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -3,14 +3,14 @@
# Whom: Adam Weinberger <adamw@freebsd.org>
#
# $FreeBSD$
-#
+# $MCom: ports/accessibility/gok/Makefile,v 1.65 2006/04/27 22:59:43 marcus Exp $
PORTNAME= gok
-PORTVERSION= 1.0.5
+PORTVERSION= 1.0.8
PORTEPOCH= 1
CATEGORIES= accessibility sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -19,11 +19,12 @@ COMMENT= GNOME On-Screen Keyboard (GOK)
LIB_DEPENDS= gnomespeech.7:${PORTSDIR}/accessibility/gnomespeech
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui atspi libwnck
USE_GMAKE= yes
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo
index aa8b7dd04a8..f01d7617b1e 100644
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gok-1.0.5.tar.bz2) = a9334a0e1dc11bbba817c128503260b0
-SHA256 (gnome2/gok-1.0.5.tar.bz2) = 0c40f2813d113f10da7ef4e534e56d7d47b71805612c4263a1b14e427ae0fa4c
-SIZE (gnome2/gok-1.0.5.tar.bz2) = 1386683
+MD5 (gnome2/gok-1.0.8.tar.bz2) = 48913cafdd9c90067319a619a5f936a3
+SHA256 (gnome2/gok-1.0.8.tar.bz2) = 684cead95f4afd403fed9fdcdfef20adf977119e172c6695f306e68a20631475
+SIZE (gnome2/gok-1.0.8.tar.bz2) = 1151395
diff --git a/accessibility/gok/files/patch-gok_gok-keyboard.c b/accessibility/gok/files/patch-gok_gok-keyboard.c
deleted file mode 100644
index c85f8da0fcb..00000000000
--- a/accessibility/gok/files/patch-gok_gok-keyboard.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- gok/gok-keyboard.c.orig Fri Nov 5 16:18:02 2004
-+++ gok/gok-keyboard.c Fri Nov 5 16:18:49 2004
-@@ -2519,8 +2519,9 @@
- else if ((pKeyboard->search_type == GOK_SPY_SEARCH_ACTIONABLE) && !did_actionkeys)
- {
- gint action_count, i;
-+ AccessibleAction *action;
- did_actionkeys = TRUE;
-- AccessibleAction *action =
-+ action =
- Accessible_getAction (pNodeAccessible->paccessible);
- if (!action)
- break;
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index a460e052dfd..2eac98f1075 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -2,6 +2,62 @@ bin/create-branching-keyboard
bin/gok
libdata/bonobo/servers/GNOME_Gok.server
libdata/pkgconfig/gok-1.0.pc
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/gok-GokButton.html
+%%DOCSDIR%%/gok-arraylist.html
+%%DOCSDIR%%/gok-callbacks.html
+%%DOCSDIR%%/gok-command-common.html
+%%DOCSDIR%%/gok-command-edge-data.html
+%%DOCSDIR%%/gok-command-edge.html
+%%DOCSDIR%%/gok-command-graph.html
+%%DOCSDIR%%/gok-command-predictor.html
+%%DOCSDIR%%/gok-command-vertex-data.html
+%%DOCSDIR%%/gok-command-vertex.html
+%%DOCSDIR%%/gok-global.html
+%%DOCSDIR%%/gok-gok-action.html
+%%DOCSDIR%%/gok-gok-branchback-stack.html
+%%DOCSDIR%%/gok-gok-chunker.html
+%%DOCSDIR%%/gok-gok-control.html
+%%DOCSDIR%%/gok-gok-data.html
+%%DOCSDIR%%/gok-gok-editor.html
+%%DOCSDIR%%/gok-gok-feedback.html
+%%DOCSDIR%%/gok-gok-gconf.html
+%%DOCSDIR%%/gok-gok-key.html
+%%DOCSDIR%%/gok-gok-keyboard.html
+%%DOCSDIR%%/gok-gok-keyslotter.html
+%%DOCSDIR%%/gok-gok-log-priv.html
+%%DOCSDIR%%/gok-gok-log-reader.html
+%%DOCSDIR%%/gok-gok-log.html
+%%DOCSDIR%%/gok-gok-modifier.html
+%%DOCSDIR%%/gok-gok-output.html
+%%DOCSDIR%%/gok-gok-page-accessmethod.html
+%%DOCSDIR%%/gok-gok-page-actions.html
+%%DOCSDIR%%/gok-gok-page-feedbacks.html
+%%DOCSDIR%%/gok-gok-page-keysizespace.html
+%%DOCSDIR%%/gok-gok-page-wordcomplete.html
+%%DOCSDIR%%/gok-gok-predictor.html
+%%DOCSDIR%%/gok-gok-scanner.html
+%%DOCSDIR%%/gok-gok-settings-dialog.html
+%%DOCSDIR%%/gok-gok-sound.html
+%%DOCSDIR%%/gok-gok-spy-priv.html
+%%DOCSDIR%%/gok-gok-spy.html
+%%DOCSDIR%%/gok-gok-word-complete.html
+%%DOCSDIR%%/gok-gok.html
+%%DOCSDIR%%/gok-gtkjoyswitch.html
+%%DOCSDIR%%/gok-interface.html
+%%DOCSDIR%%/gok-main.html
+%%DOCSDIR%%/gok-support.html
+%%DOCSDIR%%/gok-switchapi.html
+%%DOCSDIR%%/gok-word-complete.html
+%%DOCSDIR%%/gok.devhelp
+%%DOCSDIR%%/gok.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/gok.desktop
share/gnome/gok/East.png
share/gnome/gok/Keyboard.kbd
@@ -127,6 +183,16 @@ share/gnome/gok/dictionary.txt
share/gnome/gok/direct-selection.xam
share/gnome/gok/directed.xam
share/gnome/gok/dwell-selection.xam
+share/gnome/gok/dz/gok-controls.kbd
+share/gnome/gok/dz/hide.kbd
+share/gnome/gok/dz/launcher.kbd
+share/gnome/gok/dz/main.kbd
+share/gnome/gok/dz/mouse.kbd
+share/gnome/gok/dz/move-resize.kbd
+share/gnome/gok/dz/numberpad.kbd
+share/gnome/gok/dz/quit.kbd
+share/gnome/gok/dz/text-operations.kbd
+share/gnome/gok/dz/valuator.kbd
share/gnome/gok/el/gok-controls.kbd
share/gnome/gok/el/hide.kbd
share/gnome/gok/el/launcher.kbd
@@ -168,6 +234,16 @@ share/gnome/gok/es/numberpad.kbd
share/gnome/gok/es/quit.kbd
share/gnome/gok/es/text-operations.kbd
share/gnome/gok/es/valuator.kbd
+share/gnome/gok/et/gok-controls.kbd
+share/gnome/gok/et/hide.kbd
+share/gnome/gok/et/launcher.kbd
+share/gnome/gok/et/main.kbd
+share/gnome/gok/et/mouse.kbd
+share/gnome/gok/et/move-resize.kbd
+share/gnome/gok/et/numberpad.kbd
+share/gnome/gok/et/quit.kbd
+share/gnome/gok/et/text-operations.kbd
+share/gnome/gok/et/valuator.kbd
share/gnome/gok/eu/gok-controls.kbd
share/gnome/gok/eu/hide.kbd
share/gnome/gok/eu/launcher.kbd
@@ -178,6 +254,16 @@ share/gnome/gok/eu/numberpad.kbd
share/gnome/gok/eu/quit.kbd
share/gnome/gok/eu/text-operations.kbd
share/gnome/gok/eu/valuator.kbd
+share/gnome/gok/fa/gok-controls.kbd
+share/gnome/gok/fa/hide.kbd
+share/gnome/gok/fa/launcher.kbd
+share/gnome/gok/fa/main.kbd
+share/gnome/gok/fa/mouse.kbd
+share/gnome/gok/fa/move-resize.kbd
+share/gnome/gok/fa/numberpad.kbd
+share/gnome/gok/fa/quit.kbd
+share/gnome/gok/fa/text-operations.kbd
+share/gnome/gok/fa/valuator.kbd
share/gnome/gok/fi/gok-controls.kbd
share/gnome/gok/fi/hide.kbd
share/gnome/gok/fi/launcher.kbd
@@ -208,6 +294,16 @@ share/gnome/gok/ga/numberpad.kbd
share/gnome/gok/ga/quit.kbd
share/gnome/gok/ga/text-operations.kbd
share/gnome/gok/ga/valuator.kbd
+share/gnome/gok/gl/gok-controls.kbd
+share/gnome/gok/gl/hide.kbd
+share/gnome/gok/gl/launcher.kbd
+share/gnome/gok/gl/main.kbd
+share/gnome/gok/gl/mouse.kbd
+share/gnome/gok/gl/move-resize.kbd
+share/gnome/gok/gl/numberpad.kbd
+share/gnome/gok/gl/quit.kbd
+share/gnome/gok/gl/text-operations.kbd
+share/gnome/gok/gl/valuator.kbd
share/gnome/gok/glade/gok.glade2
share/gnome/gok/gok-controls.kbd
share/gnome/gok/gok.png
@@ -287,6 +383,16 @@ share/gnome/gok/ja/numberpad.kbd
share/gnome/gok/ja/quit.kbd
share/gnome/gok/ja/text-operations.kbd
share/gnome/gok/ja/valuator.kbd
+share/gnome/gok/ka/gok-controls.kbd
+share/gnome/gok/ka/hide.kbd
+share/gnome/gok/ka/launcher.kbd
+share/gnome/gok/ka/main.kbd
+share/gnome/gok/ka/mouse.kbd
+share/gnome/gok/ka/move-resize.kbd
+share/gnome/gok/ka/numberpad.kbd
+share/gnome/gok/ka/quit.kbd
+share/gnome/gok/ka/text-operations.kbd
+share/gnome/gok/ka/valuator.kbd
share/gnome/gok/ko/gok-controls.kbd
share/gnome/gok/ko/hide.kbd
share/gnome/gok/ko/launcher.kbd
@@ -297,6 +403,16 @@ share/gnome/gok/ko/numberpad.kbd
share/gnome/gok/ko/quit.kbd
share/gnome/gok/ko/text-operations.kbd
share/gnome/gok/ko/valuator.kbd
+share/gnome/gok/ku/gok-controls.kbd
+share/gnome/gok/ku/hide.kbd
+share/gnome/gok/ku/launcher.kbd
+share/gnome/gok/ku/main.kbd
+share/gnome/gok/ku/mouse.kbd
+share/gnome/gok/ku/move-resize.kbd
+share/gnome/gok/ku/numberpad.kbd
+share/gnome/gok/ku/quit.kbd
+share/gnome/gok/ku/text-operations.kbd
+share/gnome/gok/ku/valuator.kbd
share/gnome/gok/latched.png
share/gnome/gok/launcher.kbd
share/gnome/gok/locked.png
@@ -384,16 +500,6 @@ share/gnome/gok/nl/numberpad.kbd
share/gnome/gok/nl/quit.kbd
share/gnome/gok/nl/text-operations.kbd
share/gnome/gok/nl/valuator.kbd
-share/gnome/gok/no/gok-controls.kbd
-share/gnome/gok/no/hide.kbd
-share/gnome/gok/no/launcher.kbd
-share/gnome/gok/no/main.kbd
-share/gnome/gok/no/mouse.kbd
-share/gnome/gok/no/move-resize.kbd
-share/gnome/gok/no/numberpad.kbd
-share/gnome/gok/no/quit.kbd
-share/gnome/gok/no/text-operations.kbd
-share/gnome/gok/no/valuator.kbd
share/gnome/gok/numberpad.kbd
share/gnome/gok/pa/gok-controls.kbd
share/gnome/gok/pa/hide.kbd
@@ -447,6 +553,16 @@ share/gnome/gok/ro/numberpad.kbd
share/gnome/gok/ro/quit.kbd
share/gnome/gok/ro/text-operations.kbd
share/gnome/gok/ro/valuator.kbd
+share/gnome/gok/ru/gok-controls.kbd
+share/gnome/gok/ru/hide.kbd
+share/gnome/gok/ru/launcher.kbd
+share/gnome/gok/ru/main.kbd
+share/gnome/gok/ru/mouse.kbd
+share/gnome/gok/ru/move-resize.kbd
+share/gnome/gok/ru/numberpad.kbd
+share/gnome/gok/ru/quit.kbd
+share/gnome/gok/ru/text-operations.kbd
+share/gnome/gok/ru/valuator.kbd
share/gnome/gok/rw/gok-controls.kbd
share/gnome/gok/rw/hide.kbd
share/gnome/gok/rw/launcher.kbd
@@ -558,6 +674,16 @@ share/gnome/gok/zh_CN/numberpad.kbd
share/gnome/gok/zh_CN/quit.kbd
share/gnome/gok/zh_CN/text-operations.kbd
share/gnome/gok/zh_CN/valuator.kbd
+share/gnome/gok/zh_HK/gok-controls.kbd
+share/gnome/gok/zh_HK/hide.kbd
+share/gnome/gok/zh_HK/launcher.kbd
+share/gnome/gok/zh_HK/main.kbd
+share/gnome/gok/zh_HK/mouse.kbd
+share/gnome/gok/zh_HK/move-resize.kbd
+share/gnome/gok/zh_HK/numberpad.kbd
+share/gnome/gok/zh_HK/quit.kbd
+share/gnome/gok/zh_HK/text-operations.kbd
+share/gnome/gok/zh_HK/valuator.kbd
share/gnome/gok/zh_TW/gok-controls.kbd
share/gnome/gok/zh_TW/hide.kbd
share/gnome/gok/zh_TW/launcher.kbd
@@ -583,14 +709,18 @@ share/locale/cs/LC_MESSAGES/gok.mo
share/locale/cy/LC_MESSAGES/gok.mo
share/locale/da/LC_MESSAGES/gok.mo
share/locale/de/LC_MESSAGES/gok.mo
+share/locale/dz/LC_MESSAGES/gok.mo
share/locale/el/LC_MESSAGES/gok.mo
share/locale/en_CA/LC_MESSAGES/gok.mo
share/locale/en_GB/LC_MESSAGES/gok.mo
share/locale/es/LC_MESSAGES/gok.mo
+share/locale/et/LC_MESSAGES/gok.mo
share/locale/eu/LC_MESSAGES/gok.mo
+share/locale/fa/LC_MESSAGES/gok.mo
share/locale/fi/LC_MESSAGES/gok.mo
share/locale/fr/LC_MESSAGES/gok.mo
share/locale/ga/LC_MESSAGES/gok.mo
+share/locale/gl/LC_MESSAGES/gok.mo
share/locale/gu/LC_MESSAGES/gok.mo
share/locale/hi/LC_MESSAGES/gok.mo
share/locale/hr/LC_MESSAGES/gok.mo
@@ -598,7 +728,9 @@ share/locale/hu/LC_MESSAGES/gok.mo
share/locale/id/LC_MESSAGES/gok.mo
share/locale/it/LC_MESSAGES/gok.mo
share/locale/ja/LC_MESSAGES/gok.mo
+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/mk/LC_MESSAGES/gok.mo
share/locale/ml/LC_MESSAGES/gok.mo
@@ -607,12 +739,12 @@ 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/no/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
share/locale/pt_BR/LC_MESSAGES/gok.mo
share/locale/ro/LC_MESSAGES/gok.mo
+share/locale/ru/LC_MESSAGES/gok.mo
share/locale/rw/LC_MESSAGES/gok.mo
share/locale/sl/LC_MESSAGES/gok.mo
share/locale/sq/LC_MESSAGES/gok.mo
@@ -623,13 +755,21 @@ share/locale/ta/LC_MESSAGES/gok.mo
share/locale/uk/LC_MESSAGES/gok.mo
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
@dirrm share/gnome/gok/zh_TW
+@dirrm share/gnome/gok/zh_HK
@dirrm share/gnome/gok/zh_CN
@dirrm share/gnome/gok/vi
@dirrm share/gnome/gok/uk
@@ -640,12 +780,12 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo
@dirrm share/gnome/gok/sq
@dirrm share/gnome/gok/sl
@dirrm share/gnome/gok/rw
+@dirrm share/gnome/gok/ru
@dirrm share/gnome/gok/ro
@dirrm share/gnome/gok/pt_BR
@dirrm share/gnome/gok/pt
@dirrm share/gnome/gok/pl
@dirrm share/gnome/gok/pa
-@dirrm share/gnome/gok/no
@dirrm share/gnome/gok/nl
@dirrm share/gnome/gok/ne
@dirrm share/gnome/gok/nb
@@ -654,7 +794,9 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo
@dirrm share/gnome/gok/ml
@dirrm share/gnome/gok/mk
@dirrm share/gnome/gok/lt
+@dirrm share/gnome/gok/ku
@dirrm share/gnome/gok/ko
+@dirrm share/gnome/gok/ka
@dirrm share/gnome/gok/ja
@dirrm share/gnome/gok/it
@dirrm share/gnome/gok/id
@@ -663,14 +805,18 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo
@dirrm share/gnome/gok/hi
@dirrm share/gnome/gok/gu
@dirrm share/gnome/gok/glade
+@dirrm share/gnome/gok/gl
@dirrm share/gnome/gok/ga
@dirrm share/gnome/gok/fr
@dirrm share/gnome/gok/fi
+@dirrm share/gnome/gok/fa
@dirrm share/gnome/gok/eu
+@dirrm share/gnome/gok/et
@dirrm share/gnome/gok/es
@dirrm share/gnome/gok/en_GB
@dirrm share/gnome/gok/en_CA
@dirrm share/gnome/gok/el
+@dirrm share/gnome/gok/dz
@dirrm share/gnome/gok/de
@dirrm share/gnome/gok/da
@dirrm share/gnome/gok/cy
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 85a84fcd270..aa6a2611649 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,16 +3,15 @@
# Whom: Anders Nordby <anders@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/archivers/fileroller/Makefile,v 1.79 2005/10/03 21:14:16 mezz Exp $
+# $MCom: ports/archivers/fileroller/Makefile,v 1.95 2006/04/18 18:52:18 ahze Exp $
#
PORTNAME= fileroller
-PORTVERSION= 2.12.3
-PORTREVISION= 1
+PORTVERSION= 2.14.2
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/file-roller/2.12
+MASTER_SITE_SUBDIR= sources/file-roller/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= file-roller-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -25,12 +24,14 @@ COMMENT= An archive manager for zip files, tar, etc
RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar
USE_BZIP2= yes
+USE_GETTEXT= yes
INSTALLS_OMF= yes
+INSTALLS_ICONS= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils nautilus2 \
gnomedocutils
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 3872416afed..e3f9c06aeb7 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/file-roller-2.12.3.tar.bz2) = a6d7fcc3417bd23556261223c4ad77ee
-SHA256 (gnome2/file-roller-2.12.3.tar.bz2) = 983f10a76fa228bcb8beb7dde7feacab4d3033357e59b4548a4bc0ba8dad0e14
-SIZE (gnome2/file-roller-2.12.3.tar.bz2) = 936371
+MD5 (gnome2/file-roller-2.14.2.tar.bz2) = 4900dc4b2e4f0f173bd88cb5e6b9bde1
+SHA256 (gnome2/file-roller-2.14.2.tar.bz2) = 24592f04632d97c33b0b2950c4fd6467217a9ff6fdbd9058f643c11ed375382a
+SIZE (gnome2/file-roller-2.14.2.tar.bz2) = 1039404
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 99f309c21cc..f7bebfbc543 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -1,16 +1,11 @@
bin/file-roller
-lib/bonobo/libfile-roller-component.a
-lib/bonobo/libfile-roller-component.la
-lib/bonobo/libfile-roller-component.so
lib/nautilus/extensions-1.0/libnautilus-fileroller.a
lib/nautilus/extensions-1.0/libnautilus-fileroller.la
lib/nautilus/extensions-1.0/libnautilus-fileroller.so
-libdata/bonobo/servers/File_Roller_Component.server
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/application-registry/file-roller.applications
share/gnome/applications/file-roller.desktop
share/gnome/file-roller/glade/file-roller-extract.glade
share/gnome/file-roller/glade/file-roller.glade
@@ -21,6 +16,12 @@ share/gnome/help/file-roller/C/figures/file-roller_rightarrow.png
share/gnome/help/file-roller/C/figures/file-roller_uparrow.png
share/gnome/help/file-roller/C/file-roller.xml
share/gnome/help/file-roller/C/legal.xml
+share/gnome/help/file-roller/bg/figures/file-roller_home.png
+share/gnome/help/file-roller/bg/figures/file-roller_leftarrow.png
+share/gnome/help/file-roller/bg/figures/file-roller_main_window.png
+share/gnome/help/file-roller/bg/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/bg/figures/file-roller_uparrow.png
+share/gnome/help/file-roller/bg/file-roller.xml
share/gnome/help/file-roller/de/figures/file-roller_home.png
share/gnome/help/file-roller/de/figures/file-roller_leftarrow.png
share/gnome/help/file-roller/de/figures/file-roller_main_window.png
@@ -93,9 +94,8 @@ share/gnome/help/file-roller/zh_TW/figures/file-roller_main_window.png
share/gnome/help/file-roller/zh_TW/figures/file-roller_rightarrow.png
share/gnome/help/file-roller/zh_TW/figures/file-roller_uparrow.png
share/gnome/help/file-roller/zh_TW/file-roller.xml
-share/gnome/mime-info/file-roller.keys
-share/gnome/mime-info/file-roller.mime
share/gnome/omf/file-roller/file-roller-C.omf
+share/gnome/omf/file-roller/file-roller-bg.omf
share/gnome/omf/file-roller/file-roller-de.omf
share/gnome/omf/file-roller/file-roller-es.omf
share/gnome/omf/file-roller/file-roller-fr.omf
@@ -108,19 +108,21 @@ share/gnome/omf/file-roller/file-roller-uk.omf
share/gnome/omf/file-roller/file-roller-zh_CN.omf
share/gnome/omf/file-roller/file-roller-zh_HK.omf
share/gnome/omf/file-roller/file-roller-zh_TW.omf
-share/gnome/pixmaps/file-roller.png
+share/icons/hicolor/48x48/apps/file-roller.png
share/locale/am/LC_MESSAGES/file-roller.mo
share/locale/ar/LC_MESSAGES/file-roller.mo
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/br/LC_MESSAGES/file-roller.mo
share/locale/bs/LC_MESSAGES/file-roller.mo
share/locale/ca/LC_MESSAGES/file-roller.mo
share/locale/cs/LC_MESSAGES/file-roller.mo
share/locale/cy/LC_MESSAGES/file-roller.mo
share/locale/da/LC_MESSAGES/file-roller.mo
share/locale/de/LC_MESSAGES/file-roller.mo
+share/locale/dz/LC_MESSAGES/file-roller.mo
share/locale/el/LC_MESSAGES/file-roller.mo
share/locale/en_CA/LC_MESSAGES/file-roller.mo
share/locale/en_GB/LC_MESSAGES/file-roller.mo
@@ -142,6 +144,7 @@ share/locale/id/LC_MESSAGES/file-roller.mo
share/locale/is/LC_MESSAGES/file-roller.mo
share/locale/it/LC_MESSAGES/file-roller.mo
share/locale/ja/LC_MESSAGES/file-roller.mo
+share/locale/ka/LC_MESSAGES/file-roller.mo
share/locale/kn/LC_MESSAGES/file-roller.mo
share/locale/ko/LC_MESSAGES/file-roller.mo
share/locale/ku/LC_MESSAGES/file-roller.mo
@@ -155,7 +158,6 @@ 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/no/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
@@ -195,6 +197,10 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@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
@@ -220,6 +226,8 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm share/gnome/help/file-roller/es
@dirrm share/gnome/help/file-roller/de/figures
@dirrm share/gnome/help/file-roller/de
+@dirrm share/gnome/help/file-roller/bg/figures
+@dirrm share/gnome/help/file-roller/bg
@dirrm share/gnome/help/file-roller/C/figures
@dirrm share/gnome/help/file-roller/C
@dirrm share/gnome/help/file-roller
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index 85a84fcd270..aa6a2611649 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -3,16 +3,15 @@
# Whom: Anders Nordby <anders@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/archivers/fileroller/Makefile,v 1.79 2005/10/03 21:14:16 mezz Exp $
+# $MCom: ports/archivers/fileroller/Makefile,v 1.95 2006/04/18 18:52:18 ahze Exp $
#
PORTNAME= fileroller
-PORTVERSION= 2.12.3
-PORTREVISION= 1
+PORTVERSION= 2.14.2
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/file-roller/2.12
+MASTER_SITE_SUBDIR= sources/file-roller/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= file-roller-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -25,12 +24,14 @@ COMMENT= An archive manager for zip files, tar, etc
RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar
USE_BZIP2= yes
+USE_GETTEXT= yes
INSTALLS_OMF= yes
+INSTALLS_ICONS= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils nautilus2 \
gnomedocutils
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo
index 3872416afed..e3f9c06aeb7 100644
--- a/archivers/fileroller/distinfo
+++ b/archivers/fileroller/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/file-roller-2.12.3.tar.bz2) = a6d7fcc3417bd23556261223c4ad77ee
-SHA256 (gnome2/file-roller-2.12.3.tar.bz2) = 983f10a76fa228bcb8beb7dde7feacab4d3033357e59b4548a4bc0ba8dad0e14
-SIZE (gnome2/file-roller-2.12.3.tar.bz2) = 936371
+MD5 (gnome2/file-roller-2.14.2.tar.bz2) = 4900dc4b2e4f0f173bd88cb5e6b9bde1
+SHA256 (gnome2/file-roller-2.14.2.tar.bz2) = 24592f04632d97c33b0b2950c4fd6467217a9ff6fdbd9058f643c11ed375382a
+SIZE (gnome2/file-roller-2.14.2.tar.bz2) = 1039404
diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist
index 99f309c21cc..f7bebfbc543 100644
--- a/archivers/fileroller/pkg-plist
+++ b/archivers/fileroller/pkg-plist
@@ -1,16 +1,11 @@
bin/file-roller
-lib/bonobo/libfile-roller-component.a
-lib/bonobo/libfile-roller-component.la
-lib/bonobo/libfile-roller-component.so
lib/nautilus/extensions-1.0/libnautilus-fileroller.a
lib/nautilus/extensions-1.0/libnautilus-fileroller.la
lib/nautilus/extensions-1.0/libnautilus-fileroller.so
-libdata/bonobo/servers/File_Roller_Component.server
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/application-registry/file-roller.applications
share/gnome/applications/file-roller.desktop
share/gnome/file-roller/glade/file-roller-extract.glade
share/gnome/file-roller/glade/file-roller.glade
@@ -21,6 +16,12 @@ share/gnome/help/file-roller/C/figures/file-roller_rightarrow.png
share/gnome/help/file-roller/C/figures/file-roller_uparrow.png
share/gnome/help/file-roller/C/file-roller.xml
share/gnome/help/file-roller/C/legal.xml
+share/gnome/help/file-roller/bg/figures/file-roller_home.png
+share/gnome/help/file-roller/bg/figures/file-roller_leftarrow.png
+share/gnome/help/file-roller/bg/figures/file-roller_main_window.png
+share/gnome/help/file-roller/bg/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/bg/figures/file-roller_uparrow.png
+share/gnome/help/file-roller/bg/file-roller.xml
share/gnome/help/file-roller/de/figures/file-roller_home.png
share/gnome/help/file-roller/de/figures/file-roller_leftarrow.png
share/gnome/help/file-roller/de/figures/file-roller_main_window.png
@@ -93,9 +94,8 @@ share/gnome/help/file-roller/zh_TW/figures/file-roller_main_window.png
share/gnome/help/file-roller/zh_TW/figures/file-roller_rightarrow.png
share/gnome/help/file-roller/zh_TW/figures/file-roller_uparrow.png
share/gnome/help/file-roller/zh_TW/file-roller.xml
-share/gnome/mime-info/file-roller.keys
-share/gnome/mime-info/file-roller.mime
share/gnome/omf/file-roller/file-roller-C.omf
+share/gnome/omf/file-roller/file-roller-bg.omf
share/gnome/omf/file-roller/file-roller-de.omf
share/gnome/omf/file-roller/file-roller-es.omf
share/gnome/omf/file-roller/file-roller-fr.omf
@@ -108,19 +108,21 @@ share/gnome/omf/file-roller/file-roller-uk.omf
share/gnome/omf/file-roller/file-roller-zh_CN.omf
share/gnome/omf/file-roller/file-roller-zh_HK.omf
share/gnome/omf/file-roller/file-roller-zh_TW.omf
-share/gnome/pixmaps/file-roller.png
+share/icons/hicolor/48x48/apps/file-roller.png
share/locale/am/LC_MESSAGES/file-roller.mo
share/locale/ar/LC_MESSAGES/file-roller.mo
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/br/LC_MESSAGES/file-roller.mo
share/locale/bs/LC_MESSAGES/file-roller.mo
share/locale/ca/LC_MESSAGES/file-roller.mo
share/locale/cs/LC_MESSAGES/file-roller.mo
share/locale/cy/LC_MESSAGES/file-roller.mo
share/locale/da/LC_MESSAGES/file-roller.mo
share/locale/de/LC_MESSAGES/file-roller.mo
+share/locale/dz/LC_MESSAGES/file-roller.mo
share/locale/el/LC_MESSAGES/file-roller.mo
share/locale/en_CA/LC_MESSAGES/file-roller.mo
share/locale/en_GB/LC_MESSAGES/file-roller.mo
@@ -142,6 +144,7 @@ share/locale/id/LC_MESSAGES/file-roller.mo
share/locale/is/LC_MESSAGES/file-roller.mo
share/locale/it/LC_MESSAGES/file-roller.mo
share/locale/ja/LC_MESSAGES/file-roller.mo
+share/locale/ka/LC_MESSAGES/file-roller.mo
share/locale/kn/LC_MESSAGES/file-roller.mo
share/locale/ko/LC_MESSAGES/file-roller.mo
share/locale/ku/LC_MESSAGES/file-roller.mo
@@ -155,7 +158,6 @@ 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/no/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
@@ -195,6 +197,10 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@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
@@ -220,6 +226,8 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm share/gnome/help/file-roller/es
@dirrm share/gnome/help/file-roller/de/figures
@dirrm share/gnome/help/file-roller/de
+@dirrm share/gnome/help/file-roller/bg/figures
+@dirrm share/gnome/help/file-roller/bg
@dirrm share/gnome/help/file-roller/C/figures
@dirrm share/gnome/help/file-roller/C
@dirrm share/gnome/help/file-roller
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 5a0e0795998..9834f8e5f89 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/gnomemedia2/Makefile,v 1.79 2005/09/04 21:49:55 marcus Exp $
+# $MCom: ports/audio/gnomemedia2/Makefile,v 1.95 2006/04/13 07:52:30 bland Exp $
#
PORTNAME= gnomemedia2
-PORTVERSION= 2.12.0
-PORTREVISION= 1
+PORTVERSION= 2.14.0
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-media/2.12
+MASTER_SITE_SUBDIR= sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-media-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -19,16 +18,16 @@ MAINTAINER= gnome@FreeBSD.org
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
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_REINPLACE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \
gail nautiluscdburner
-USE_GSTREAMER= esound cdparanoia gconf
+USE_GSTREAMER= esound gconf good
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -42,9 +41,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|[$$][(]CDROM_HOST[)]|freebsd|g' \
${WRKSRC}/gnome-cd/Makefile.in
.if ${OSVERSION} > 501107
- @${REINPLACE_CMD} -e 's|%%CDROM%%|acd0|' ${WRKSRC}/configure
-.else
- @${REINPLACE_CMD} -e 's|%%CDROM%%|acd0c|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|acd0c|acd0|' ${WRKSRC}/configure
.endif
.include <bsd.port.post.mk>
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index c1d48b7bf36..595a5ad12fa 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.12.0.tar.bz2) = 74d9a78f7269602e033ab1a4a144afdf
-SHA256 (gnome2/gnome-media-2.12.0.tar.bz2) = 47956491973b0ace77e22f93f4141fd5a49c294f68f427e00fb4df8c1dc542ad
-SIZE (gnome2/gnome-media-2.12.0.tar.bz2) = 3444233
+MD5 (gnome2/gnome-media-2.14.0.tar.bz2) = e1304b3fb5e069025bb2c1ea3f9f8b62
+SHA256 (gnome2/gnome-media-2.14.0.tar.bz2) = f43324636c0ee8b7485a9a5d2baf8e3fb5db0cc87c55afdb350774dfafc8b280
+SIZE (gnome2/gnome-media-2.14.0.tar.bz2) = 2933013
diff --git a/audio/gnome-media/files/patch-configure b/audio/gnome-media/files/patch-configure
deleted file mode 100644
index e2224d9308d..00000000000
--- a/audio/gnome-media/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Tue Jun 1 17:42:05 2004
-+++ configure Tue Jun 1 18:38:15 2004
-@@ -24584,7 +24584,7 @@
- *FreeBSD*)
- CDROM_HOST=bsd
- CDROM_HOST_BSD=true
-- default_cd_device="/dev/acd0c"
-+ default_cd_device="/dev/%%CDROM%%"
- ;;
- *NetBSD*)
- CDROM_HOST=bsd
diff --git a/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
deleted file mode 100644
index 8d49db7bc87..00000000000
--- a/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- gnome-cd/gst-cdparanoia-cdrom.c.orig Mon Apr 4 16:25:49 2005
-+++ gnome-cd/gst-cdparanoia-cdrom.c Mon Apr 4 16:26:14 2005
-@@ -1224,6 +1224,16 @@
- *status = NULL;
- return FALSE;
- }
-+#else
-+ if (ioctl (cdrom->fd, CDIOREADTOCHEADER, priv->tochdr) < 0) {
-+ realstatus->cd = GNOME_CDROM_STATUS_NO_DISC;
-+ realstatus->audio = GNOME_CDROM_AUDIO_NOTHING;
-+ realstatus->track = -1;
-+
-+ gst_cdparanoia_cdrom_close (lcd);
-+ return TRUE;
-+ }
-+ realstatus->cd = GNOME_CDROM_STATUS_OK;
- #endif
-
- gst_cdparanoia_cdrom_close (lcd);
-@@ -1421,15 +1431,18 @@
- return FALSE;
- }
-
-+#if !defined(__FreeBSD__)
-+ /* XXX: One cannot send CDIOCCAPABILITY to an atapicam CD-ROM
-+ * device.
-+ */
-+
- fd = open (device, O_RDONLY | O_NONBLOCK);
- if (fd < 0) {
- return FALSE;
- }
-
- /* Fire a harmless ioctl at the device. */
--#if defined(__FreeBSD__)
-- if (ioctl (fd, CDIOCCAPABILITY, 0) < 0) {
--#elif defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
- if (ioctl (fd, CDIOCGETVOL, 0) < 0) {
- #else
- if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) {
-@@ -1441,6 +1454,7 @@
- }
-
- close (fd);
-+#endif /* __FreeBSD__ */
-
- return TRUE;
- }
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index e531ad4428e..a52495291e5 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -472,6 +472,7 @@ share/locale/id/LC_MESSAGES/gnome-media-2.0.mo
share/locale/it/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-media-2.0.mo
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/mk/LC_MESSAGES/gnome-media-2.0.mo
@@ -505,6 +506,7 @@ share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-media-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-media-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd
@dirrm share/gnome/pixmaps/gnome-cd/themes/media
@@ -524,8 +526,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm share/gnome/help/grecord/zh_CN
@dirrm share/gnome/help/grecord/sv/figures
@dirrm share/gnome/help/grecord/sv
-@dirrm share/gnome/help/gnome-cd/nl/figures
-@dirrm share/gnome/help/gnome-cd/nl
@dirrm share/gnome/help/grecord/ko/figures
@dirrm share/gnome/help/grecord/ko
@dirrm share/gnome/help/grecord/ja/figures
@@ -557,6 +557,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm share/gnome/help/gnome-cd/uk
@dirrm share/gnome/help/gnome-cd/sv/figures
@dirrm share/gnome/help/gnome-cd/sv
+@dirrm share/gnome/help/gnome-cd/nl/figures
+@dirrm share/gnome/help/gnome-cd/nl
@dirrm share/gnome/help/gnome-cd/ko/figures
@dirrm share/gnome/help/gnome-cd/ko
@dirrm share/gnome/help/gnome-cd/ja/figures
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 5a0e0795998..9834f8e5f89 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/gnomemedia2/Makefile,v 1.79 2005/09/04 21:49:55 marcus Exp $
+# $MCom: ports/audio/gnomemedia2/Makefile,v 1.95 2006/04/13 07:52:30 bland Exp $
#
PORTNAME= gnomemedia2
-PORTVERSION= 2.12.0
-PORTREVISION= 1
+PORTVERSION= 2.14.0
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-media/2.12
+MASTER_SITE_SUBDIR= sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-media-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -19,16 +18,16 @@ MAINTAINER= gnome@FreeBSD.org
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
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-USE_REINPLACE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \
gail nautiluscdburner
-USE_GSTREAMER= esound cdparanoia gconf
+USE_GSTREAMER= esound gconf good
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -42,9 +41,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|[$$][(]CDROM_HOST[)]|freebsd|g' \
${WRKSRC}/gnome-cd/Makefile.in
.if ${OSVERSION} > 501107
- @${REINPLACE_CMD} -e 's|%%CDROM%%|acd0|' ${WRKSRC}/configure
-.else
- @${REINPLACE_CMD} -e 's|%%CDROM%%|acd0c|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|acd0c|acd0|' ${WRKSRC}/configure
.endif
.include <bsd.port.post.mk>
diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo
index c1d48b7bf36..595a5ad12fa 100644
--- a/audio/gnomemedia2/distinfo
+++ b/audio/gnomemedia2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.12.0.tar.bz2) = 74d9a78f7269602e033ab1a4a144afdf
-SHA256 (gnome2/gnome-media-2.12.0.tar.bz2) = 47956491973b0ace77e22f93f4141fd5a49c294f68f427e00fb4df8c1dc542ad
-SIZE (gnome2/gnome-media-2.12.0.tar.bz2) = 3444233
+MD5 (gnome2/gnome-media-2.14.0.tar.bz2) = e1304b3fb5e069025bb2c1ea3f9f8b62
+SHA256 (gnome2/gnome-media-2.14.0.tar.bz2) = f43324636c0ee8b7485a9a5d2baf8e3fb5db0cc87c55afdb350774dfafc8b280
+SIZE (gnome2/gnome-media-2.14.0.tar.bz2) = 2933013
diff --git a/audio/gnomemedia2/files/patch-configure b/audio/gnomemedia2/files/patch-configure
deleted file mode 100644
index e2224d9308d..00000000000
--- a/audio/gnomemedia2/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Tue Jun 1 17:42:05 2004
-+++ configure Tue Jun 1 18:38:15 2004
-@@ -24584,7 +24584,7 @@
- *FreeBSD*)
- CDROM_HOST=bsd
- CDROM_HOST_BSD=true
-- default_cd_device="/dev/acd0c"
-+ default_cd_device="/dev/%%CDROM%%"
- ;;
- *NetBSD*)
- CDROM_HOST=bsd
diff --git a/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
deleted file mode 100644
index 8d49db7bc87..00000000000
--- a/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- gnome-cd/gst-cdparanoia-cdrom.c.orig Mon Apr 4 16:25:49 2005
-+++ gnome-cd/gst-cdparanoia-cdrom.c Mon Apr 4 16:26:14 2005
-@@ -1224,6 +1224,16 @@
- *status = NULL;
- return FALSE;
- }
-+#else
-+ if (ioctl (cdrom->fd, CDIOREADTOCHEADER, priv->tochdr) < 0) {
-+ realstatus->cd = GNOME_CDROM_STATUS_NO_DISC;
-+ realstatus->audio = GNOME_CDROM_AUDIO_NOTHING;
-+ realstatus->track = -1;
-+
-+ gst_cdparanoia_cdrom_close (lcd);
-+ return TRUE;
-+ }
-+ realstatus->cd = GNOME_CDROM_STATUS_OK;
- #endif
-
- gst_cdparanoia_cdrom_close (lcd);
-@@ -1421,15 +1431,18 @@
- return FALSE;
- }
-
-+#if !defined(__FreeBSD__)
-+ /* XXX: One cannot send CDIOCCAPABILITY to an atapicam CD-ROM
-+ * device.
-+ */
-+
- fd = open (device, O_RDONLY | O_NONBLOCK);
- if (fd < 0) {
- return FALSE;
- }
-
- /* Fire a harmless ioctl at the device. */
--#if defined(__FreeBSD__)
-- if (ioctl (fd, CDIOCCAPABILITY, 0) < 0) {
--#elif defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
- if (ioctl (fd, CDIOCGETVOL, 0) < 0) {
- #else
- if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) {
-@@ -1441,6 +1454,7 @@
- }
-
- close (fd);
-+#endif /* __FreeBSD__ */
-
- return TRUE;
- }
diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist
index e531ad4428e..a52495291e5 100644
--- a/audio/gnomemedia2/pkg-plist
+++ b/audio/gnomemedia2/pkg-plist
@@ -472,6 +472,7 @@ share/locale/id/LC_MESSAGES/gnome-media-2.0.mo
share/locale/it/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-media-2.0.mo
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/mk/LC_MESSAGES/gnome-media-2.0.mo
@@ -505,6 +506,7 @@ share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-media-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-media-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd
@dirrm share/gnome/pixmaps/gnome-cd/themes/media
@@ -524,8 +526,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm share/gnome/help/grecord/zh_CN
@dirrm share/gnome/help/grecord/sv/figures
@dirrm share/gnome/help/grecord/sv
-@dirrm share/gnome/help/gnome-cd/nl/figures
-@dirrm share/gnome/help/gnome-cd/nl
@dirrm share/gnome/help/grecord/ko/figures
@dirrm share/gnome/help/grecord/ko
@dirrm share/gnome/help/grecord/ja/figures
@@ -557,6 +557,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm share/gnome/help/gnome-cd/uk
@dirrm share/gnome/help/gnome-cd/sv/figures
@dirrm share/gnome/help/gnome-cd/sv
+@dirrm share/gnome/help/gnome-cd/nl/figures
+@dirrm share/gnome/help/gnome-cd/nl
@dirrm share/gnome/help/gnome-cd/ko/figures
@dirrm share/gnome/help/gnome-cd/ko
@dirrm share/gnome/help/gnome-cd/ja/figures
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 0f6ca61cced..e212a38eab0 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -3,32 +3,34 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/sound-juicer/Makefile,v 1.29 2005/09/19 13:18:32 marcus Exp $
+# $MCom: ports/audio/sound-juicer/Makefile,v 1.49 2006/04/14 15:06:00 ahze Exp $
#
PORTNAME= sound-juicer
-PORTVERSION= 2.12.3
+PORTVERSION= 2.14.3
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Clean, mean and lean CD ripper for GNOME2
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
- gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2
+ gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2 \
+ cdio.6:${PORTSDIR}/sysutils/libcdio
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
-USE_REINPLACE= yes
USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner \
gnomedocutils
USE_GSTREAMER= cdparanoia vorbis flac gconf
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-ignore-missing-cd
+INSTALLS_ICONS= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -36,5 +38,7 @@ GCONF_SCHEMAS= sound-juicer.schemas
post-patch:
@${REINPLACE_CMD} -e 's|^\(SUBDIRS = .*\)tests\(.*\)|\1\2|' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e 's|--parents|-p|g' \
+ ${WRKSRC}/data/Makefile.in
.include <bsd.port.mk>
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index 9e28d45b9b2..d43b5ed55c6 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/sound-juicer-2.12.3.tar.bz2) = 395395c26b035d466f145dc908021a7f
-SHA256 (gnome2/sound-juicer-2.12.3.tar.bz2) = beae4a847e4c63bb8015a023751219dc2c7c0d23f931d19f2c8b957981c8db60
-SIZE (gnome2/sound-juicer-2.12.3.tar.bz2) = 802832
+MD5 (gnome2/sound-juicer-2.14.3.tar.bz2) = c525c4ef4e8cae163f7f1b6a28460e49
+SHA256 (gnome2/sound-juicer-2.14.3.tar.bz2) = f6b1e4af5b20bb3d986b40fa9d342e2cb422e43cff56a8f8541fd9f76ec64683
+SIZE (gnome2/sound-juicer-2.14.3.tar.bz2) = 875055
diff --git a/audio/sound-juicer/files/patch-src::Makefile.in b/audio/sound-juicer/files/patch-src::Makefile.in
index 187926fc41e..189365e86d3 100644
--- a/audio/sound-juicer/files/patch-src::Makefile.in
+++ b/audio/sound-juicer/files/patch-src::Makefile.in
@@ -1,20 +1,11 @@
---- src/Makefile.in.orig Tue Aug 23 20:23:29 2005
-+++ src/Makefile.in Tue Aug 23 20:23:57 2005
-@@ -63,7 +63,7 @@
- sj-about.$(OBJEXT) sj-extracting.$(OBJEXT) \
- bacon-volume.$(OBJEXT) $(am__objects_1) $(am__objects_2)
+--- 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
-@@ -257,7 +257,7 @@
- target_alias = @target_alias@
-
- # General compiler flags
--AM_CFLAGS = -Wall -export-dynamic -W -Wno-unused-parameter
-+AM_CFLAGS = -Wall -export-dynamic -W
-
- # General CPP flags. When I can demand automake 1.8, this can become
- # sound_juicer_CPPFLAGS.
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index 1b1ef9c7713..75ed982ba8e 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -10,6 +10,11 @@ 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/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/uk/fdl-appendix.xml
share/gnome/help/sound-juicer/uk/figures/prefs.png
share/gnome/help/sound-juicer/uk/figures/startup.png
@@ -17,17 +22,21 @@ 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-es.omf
+share/gnome/omf/sound-juicer/sound-juicer-nl.omf
share/gnome/omf/sound-juicer/sound-juicer-uk.omf
-share/gnome/pixmaps/sound-juicer.png
-share/gnome/sound-juicer/orange-slice.png
share/gnome/sound-juicer/sj-play.png
share/gnome/sound-juicer/sj-record.png
share/gnome/sound-juicer/sound-juicer.glade
+share/icons/hicolor/16x16/apps/sound-juicer.png
+share/icons/hicolor/22x22/apps/sound-juicer.png
+share/icons/hicolor/24x24/apps/sound-juicer.png
+share/icons/hicolor/scalable/apps/sound-juicer.svg
share/locale/ar/LC_MESSAGES/sound-juicer.mo
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/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
@@ -44,13 +53,13 @@ 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
share/locale/id/LC_MESSAGES/sound-juicer.mo
share/locale/it/LC_MESSAGES/sound-juicer.mo
share/locale/ja/LC_MESSAGES/sound-juicer.mo
+share/locale/ka/LC_MESSAGES/sound-juicer.mo
share/locale/ko/LC_MESSAGES/sound-juicer.mo
share/locale/lt/LC_MESSAGES/sound-juicer.mo
share/locale/mk/LC_MESSAGES/sound-juicer.mo
@@ -77,13 +86,21 @@ share/locale/th/LC_MESSAGES/sound-juicer.mo
share/locale/tr/LC_MESSAGES/sound-juicer.mo
share/locale/ug/LC_MESSAGES/sound-juicer.mo
share/locale/uk/LC_MESSAGES/sound-juicer.mo
+share/locale/vi/LC_MESSAGES/sound-juicer.mo
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/nl/figures
+@dirrm share/gnome/help/sound-juicer/nl
@dirrm share/gnome/help/sound-juicer/es/figures
@dirrm share/gnome/help/sound-juicer/es
@dirrm share/gnome/help/sound-juicer/C/figures
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index b340807f252..c3b8fcf019a 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/evolution-data-server/Makefile,v 1.64 2005/10/09 20:44:42 marcus Exp $
+# $MCom: ports/databases/evolution-data-server/Makefile,v 1.83 2006/04/13 07:52:30 bland Exp $
#
PORTNAME= evolution-data-server
-PORTVERSION= 1.4.2.1
-PORTREVISION= 3
+PORTVERSION= 1.6.1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -24,11 +23,11 @@ LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup \
USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnomeui \
ltverhack
USE_OPENLDAP= yes
-USE_REINPLACE= yes
USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static \
@@ -42,7 +41,7 @@ CONFIGURE_ARGS= --enable-static \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-PLIST_SUB= VERSION="1.4" EVO_VERSION="1.2"
+PLIST_SUB= VERSION="1.6" EVO_VERSION="1.2"
.include <bsd.port.pre.mk>
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index d66c170e581..23bb7a7125c 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-1.4.2.1.tar.bz2) = 8b058aff089cf3a6c13cc9f51f536ae8
-SHA256 (gnome2/evolution-data-server-1.4.2.1.tar.bz2) = 052f80b23551352c6f55ef2b4c970a416ec2e92fa4e5fd3bd267ce6eca1a9326
-SIZE (gnome2/evolution-data-server-1.4.2.1.tar.bz2) = 14234151
+MD5 (gnome2/evolution-data-server-1.6.1.tar.bz2) = d4def6cad1dc3508b8df55e7e794db49
+SHA256 (gnome2/evolution-data-server-1.6.1.tar.bz2) = 4536bbdba67eb4c51ca387c8d877eb868eb0bc60953b6185557307881f1009f6
+SIZE (gnome2/evolution-data-server-1.6.1.tar.bz2) = 7159551
diff --git a/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c
index 7383f939f4c..b39a8fe3cc8 100644
--- a/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c
+++ b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c
@@ -1,6 +1,6 @@
---- libedataserver/e-msgport.c.orig Thu Dec 2 22:33:06 2004
-+++ libedataserver/e-msgport.c Wed Mar 9 14:31:46 2005
-@@ -921,9 +921,18 @@
+--- libedataserver/e-msgport.c.orig Sat Dec 10 07:31:28 2005
++++ libedataserver/e-msgport.c Mon Dec 19 02:19:10 2005
+@@ -1069,9 +1069,18 @@ thread_dispatch(void *din)
void e_thread_put(EThread *e, EMsg *msg)
{
pthread_t id;
@@ -19,14 +19,14 @@
/* the caller forgot to tell us what to do, well, we can't do anything can we */
if (e->received == NULL) {
-@@ -962,13 +971,14 @@
+@@ -1110,13 +1119,14 @@ void e_thread_put(EThread *e, EMsg *msg)
e_msgport_put(e->server_port, msg);
if (e->waiting == 0
&& g_list_length(e->id_list) < e->queue_limit
- && pthread_create(&id, NULL, thread_dispatch, e) == 0) {
+ && pthread_create(&id, &attr, thread_dispatch, e) == 0) {
struct _thread_info *info = g_malloc0(sizeof(*info));
- t(printf("created NEW thread %ld\n", id));
+ t(printf("created NEW thread %" G_GUINT64_FORMAT "\n", e_util_pthread_id(id)));
info->id = id;
info->busy = TRUE;
e->id_list = g_list_append(e->id_list, info);
@@ -35,14 +35,15 @@
pthread_mutex_unlock(&e->mutex);
return;
}
-@@ -977,12 +987,13 @@
- if (e->id == E_THREAD_NONE) {
+@@ -1125,13 +1135,14 @@ void e_thread_put(EThread *e, EMsg *msg)
+ if (!e->have_thread) {
int err;
- if ((err = pthread_create(&e->id, NULL, thread_dispatch, e)) != 0) {
+ if ((err = pthread_create(&e->id, &attr, thread_dispatch, e)) != 0) {
g_warning("Could not create dispatcher thread, message queued?: %s", strerror(err));
- e->id = E_THREAD_NONE;
+ } else {
+ e->have_thread = TRUE;
}
}
diff --git a/databases/evolution-data-server/files/patch-addressbook_backends_groupwise_e-book-backend-groupwise.c b/databases/evolution-data-server/files/patch-addressbook_backends_groupwise_e-book-backend-groupwise.c
deleted file mode 100644
index 2f3d3d6ff5b..00000000000
--- a/databases/evolution-data-server/files/patch-addressbook_backends_groupwise_e-book-backend-groupwise.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- addressbook/backends/groupwise/e-book-backend-groupwise.c.orig Fri Sep 2 16:37:43 2005
-+++ addressbook/backends/groupwise/e-book-backend-groupwise.c Thu Nov 10 09:55:01 2005
-@@ -2010,6 +2010,7 @@
- if (enable_debug)
- printf ("\nread contacts from cache for the ids found in summary\n");
- for (i = 0; i < ids->len; i ++) {
-+ EContact *contact;
- char *uid = g_ptr_array_index (ids, i);
-
- g_mutex_lock (closure->mutex);
-@@ -2019,8 +2020,7 @@
- if (stopped)
- break;
-
-- EContact *contact =
-- e_book_backend_cache_get_contact (priv->cache, uid);
-+ contact = e_book_backend_cache_get_contact (priv->cache, uid);
- e_data_book_view_notify_update (book_view, contact);
- g_object_unref (contact);
- }
-@@ -2697,6 +2697,13 @@
- EBookBackendGroupwisePrivate *priv = ebgw->priv;
- EBookBackendCache *cache = priv->cache;
-
-+ struct timeval start, end;
-+ unsigned long diff;
-+ const char *cache_file_name;
-+ struct stat buf;
-+ time_t mod_time;
-+
-+
- if (enable_debug)
- printf("\nupdating GroupWise system address book cache \n");
-
-@@ -2741,12 +2748,6 @@
- server_last_sequence, server_last_po_rebuild_time);
- return TRUE;
- }
--
-- struct timeval start, end;
-- unsigned long diff;
-- const char *cache_file_name;
-- struct stat buf;
-- time_t mod_time;
-
- if (enable_debug)
- gettimeofday(&start, NULL);
diff --git a/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c
index c8262746ec0..51f46886733 100644
--- a/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c
+++ b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c
@@ -11,55 +11,3 @@
E_STRING_PROP (E_CONTACT_SPOUSE, "spouseName"),
E_STRING_PROP (E_CONTACT_NOTE, "note"),
E_COMPLEX_PROP (E_CONTACT_ANNIVERSARY, "anniversary", anniversary_populate, anniversary_ber, anniversary_compare),
-@@ -1698,8 +1698,9 @@
-
- msg_type = ldap_msgtype (res);
- if (msg_type == LDAP_RES_SEARCH_ENTRY) {
-+ LDAPMessage *e;
- g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-- LDAPMessage *e = ldap_first_entry(ldap, res);
-+ e = ldap_first_entry(ldap, res);
- g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
-
- if (!e) {
-@@ -1908,13 +1909,14 @@
- the op after either */
- msg_type = ldap_msgtype (res);
- if (msg_type == LDAP_RES_SEARCH_ENTRY) {
-- g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-- LDAPMessage *e = ldap_first_entry (bl->priv->ldap, res);
-- g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
--
- EContact *contact;
- char *vcard;
-
-+ LDAPMessage *e;
-+ g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-+ e = ldap_first_entry (bl->priv->ldap, res);
-+ g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
-+
- if (!e) {
- g_warning ("uh, this shouldn't happen");
- e_data_book_respond_get_contact (op->book,
-@@ -3470,8 +3472,9 @@
- g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
-
- while (NULL != e) {
-+ EContact *contact;
- g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-- EContact *contact = build_contact_from_entry (ldap, e, NULL);
-+ contact = build_contact_from_entry (ldap, e, NULL);
- g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
-
- e_data_book_view_notify_update (view, contact);
-@@ -3709,8 +3712,9 @@
- g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
-
- while (e != NULL) {
-+ EContact *contact;
- g_static_rec_mutex_lock (&eds_ldap_handler_lock);
-- EContact *contact = build_contact_from_entry (ldap, e, NULL);
-+ contact = build_contact_from_entry (ldap, e, NULL);
- g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
-
- contact_list_op->contacts = g_list_prepend (contact_list_op->contacts, contact);
diff --git a/databases/evolution-data-server/files/patch-calendar_backends_groupwise_e-cal-backend-groupwise.c b/databases/evolution-data-server/files/patch-calendar_backends_groupwise_e-cal-backend-groupwise.c
deleted file mode 100644
index 1f3e165afca..00000000000
--- a/databases/evolution-data-server/files/patch-calendar_backends_groupwise_e-cal-backend-groupwise.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- calendar/backends/groupwise/e-cal-backend-groupwise.c.orig Mon Oct 3 11:05:43 2005
-+++ calendar/backends/groupwise/e-cal-backend-groupwise.c Thu Nov 10 10:09:35 2005
-@@ -322,11 +322,12 @@
-
- for (; item_list != NULL; item_list = g_list_next(item_list)) {
- EGwItem *item = NULL;
-- item = E_GW_ITEM(item_list->data);
- ECalComponent *modified_comp = NULL, *cache_comp = NULL;
- char *cache_comp_str = NULL;
- const char *uid, *rid = NULL;
- int r_key;
-+
-+ item = E_GW_ITEM(item_list->data);
-
- modified_comp = e_gw_item_to_cal_component (item, cbgw);
- if (!modified_comp) {
diff --git a/databases/evolution-data-server/files/patch-camel-groupwise-folder.c b/databases/evolution-data-server/files/patch-camel-groupwise-folder.c
deleted file mode 100644
index 52e4ec88d08..00000000000
--- a/databases/evolution-data-server/files/patch-camel-groupwise-folder.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- camel/providers/groupwise/camel-groupwise-folder.c.orig Mon Oct 3 14:10:05 2005
-+++ camel/providers/groupwise/camel-groupwise-folder.c Thu Nov 10 05:26:17 2005
-@@ -1032,9 +1032,9 @@
- char *temp_date = NULL;
- const char *id;
- GSList *recp_list = NULL;
-- status_flags = 0;
- CamelStream *cache_stream;
- CamelMimeMessage *mail_msg = NULL;
-+ status_flags = 0;
-
- id = e_gw_item_get_id (temp_item);
-
-@@ -1768,6 +1768,7 @@
- const char *old_uid = (const char*)uids->pdata[index];
- char **tmp;
- guint32 temp_flags = 0;
-+ CamelGroupwiseMessageInfo *dest_info;
- CamelGroupwiseMessageInfo *src_info = (CamelGroupwiseMessageInfo *)camel_folder_summary_uid (source->summary, (const char*)uids->pdata[index]);
-
- /* we don't want to blindly copy the info: reset some flags not suitable for destination*/
-@@ -1776,7 +1777,7 @@
- else if (!strcmp(destination->full_name, JUNK_FOLDER))
- camel_folder_set_message_flags (source, old_uid, CAMEL_MESSAGE_JUNK, CAMEL_GW_MESSAGE_JUNK);
-
-- CamelGroupwiseMessageInfo *dest_info = (CamelGroupwiseMessageInfo *)camel_message_info_clone((CamelMessageInfo *)src_info);
-+ dest_info = (CamelGroupwiseMessageInfo *)camel_message_info_clone((CamelMessageInfo *)src_info);
- tmp = g_strsplit (old_uid, ":", -1);
- dest_info->info.uid = g_strdup_printf ("%s:%s",tmp[0], dest_container_id);
- temp_flags = camel_folder_get_message_flags (source, (const char *)uids->pdata[index]);
diff --git a/databases/evolution-data-server/files/patch-camel-groupwise-utils.c b/databases/evolution-data-server/files/patch-camel-groupwise-utils.c
deleted file mode 100644
index 5478bec69c8..00000000000
--- a/databases/evolution-data-server/files/patch-camel-groupwise-utils.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- camel/providers/groupwise/camel-groupwise-utils.c.orig Mon Oct 3 11:05:45 2005
-+++ camel/providers/groupwise/camel-groupwise-utils.c Thu Nov 10 05:36:51 2005
-@@ -339,8 +339,9 @@
- attachment->name = g_strdup (filename ? filename : "");
- if (!g_ascii_strncasecmp (attachment->contentType, RFC_822, strlen (RFC_822))) {
- char *temp_id = NULL, *id = NULL;
-+ int len;
- temp_id = (char *)camel_medium_get_header (CAMEL_MEDIUM ((CamelMimeMessage *)dw), "Message-Id");
-- int len = strlen (temp_id);
-+ len = strlen (temp_id);
-
- id = (char *)g_malloc0 (len-1);
- id = memcpy(id, temp_id+2, len-3);
-@@ -430,9 +431,10 @@
- dw = camel_medium_get_content_object (CAMEL_MEDIUM (part));
- if (type->subtype && !strcmp (type->subtype, "alternative")) {
- CamelMimePart *temp_part;
-+ CamelDataWrapper *temp_dw;
- CamelStreamMem *temp_content = (CamelStreamMem *)camel_stream_mem_new ();
- temp_part = camel_multipart_get_part ((CamelMultipart *)dw, 1);
-- CamelDataWrapper *temp_dw = camel_data_wrapper_new ();
-+ temp_dw = camel_data_wrapper_new ();
- if (temp_part) {
- is_alternative = TRUE;
- temp_dw = camel_medium_get_content_object (CAMEL_MEDIUM (temp_part));
diff --git a/databases/evolution-data-server/files/patch-camel_Makefile.in b/databases/evolution-data-server/files/patch-camel_Makefile.in
deleted file mode 100644
index 8a2d2fdf615..00000000000
--- a/databases/evolution-data-server/files/patch-camel_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- camel/Makefile.in.orig Tue Nov 29 11:14:05 2005
-+++ camel/Makefile.in Tue Nov 29 11:14:32 2005
-@@ -508,7 +508,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- weatherdatadir = @weatherdatadir@
--SUBDIRS = . providers tests
-+SUBDIRS = . providers
- @OS_WIN32_FALSE@LIBCAMEL_PLATFORM_DEP_SOURCES = \
- @OS_WIN32_FALSE@ camel-lock-client.c \
- @OS_WIN32_FALSE@ camel-stream-process.c
diff --git a/databases/evolution-data-server/files/patch-camel_providers_imap_camel-imap-utils.c b/databases/evolution-data-server/files/patch-camel_providers_imap_camel-imap-utils.c
deleted file mode 100644
index 00ea9a3d6b5..00000000000
--- a/databases/evolution-data-server/files/patch-camel_providers_imap_camel-imap-utils.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- camel/providers/imap/camel-imap-utils.c.orig Tue Nov 29 03:03:43 2005
-+++ camel/providers/imap/camel-imap-utils.c Sun Dec 4 23:13:35 2005
-@@ -371,7 +371,7 @@ imap_parse_list_response (CamelImapStore
- return FALSE;
-
- if (folder) {
-- char *astring;
-+ char *astring, *mailbox;
-
- /* get the folder name */
- word = imap_next_word (word);
-@@ -380,8 +380,6 @@ imap_parse_list_response (CamelImapStore
- return FALSE;
-
- *folder = astring;
--
-- char *mailbox;
-
- mailbox = imap_mailbox_decode (astring, strlen (astring));
- g_free (astring);
diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure
index fe88433c128..91d8b09b92a 100644
--- a/databases/evolution-data-server/files/patch-configure
+++ b/databases/evolution-data-server/files/patch-configure
@@ -1,8 +1,8 @@
---- configure.orig Fri Jul 29 17:13:44 2005
-+++ configure Fri Jul 29 17:15:52 2005
-@@ -23461,6 +23461,13 @@
- DL_LIB=''
+--- configure.orig Sun Dec 25 01:57:35 2005
++++ configure Sun Dec 25 01:58:23 2005
+@@ -23542,6 +23542,14 @@
SOFTOKN3_LIB=''
+ LIBEXECDIR_IN_SERVER_FILE='../../../libexec'
;;
+*freebsd*)
+ os_win32=no
@@ -10,11 +10,12 @@
+ SOCKET_LIBS=''
+ DL_LIB=''
+ SOFTOKN3_LIB='-lsoftokn3'
++ LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
+ ;;
*) os_win32=no
NO_UNDEFINED=''
SOCKET_LIBS=''
-@@ -27135,7 +27142,7 @@
+@@ -27317,7 +27325,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
@@ -23,7 +24,7 @@
int
main ()
-@@ -27873,7 +27880,7 @@
+@@ -27565,7 +27573,7 @@
LDFLAGS_save="$LDFLAGS"
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
@@ -32,7 +33,7 @@
echo "$as_me:$LINENO: checking for Kerberos 5" >&5
echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
if test "${ac_cv_lib_kerberos5+set}" = set; then
-@@ -31176,7 +31183,7 @@
+@@ -31483,7 +31491,7 @@
imagesdir="$datadir/pixmaps/evolution-data-server-$BASE_VERSION"
diff --git a/databases/evolution-data-server/files/patch-libedataserverui_e-name-selector-entry.c b/databases/evolution-data-server/files/patch-libedataserverui_e-name-selector-entry.c
deleted file mode 100644
index 19b5c058130..00000000000
--- a/databases/evolution-data-server/files/patch-libedataserverui_e-name-selector-entry.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libedataserverui/e-name-selector-entry.c.orig Mon Oct 3 11:05:48 2005
-+++ libedataserverui/e-name-selector-entry.c Thu Nov 10 10:23:46 2005
-@@ -1112,7 +1112,7 @@
- const gchar *text;
- gint index_start, index_end;
- gint selection_start, selection_end;
-- gunichar str_context [2], str_b_context [2];;
-+ gunichar str_context [2], str_b_context [2];
- gint len;
- gint i;
- gboolean already_selected = FALSE;
diff --git a/databases/evolution-data-server/files/patch-servers-exchange-storage-e-folder-exchange.c b/databases/evolution-data-server/files/patch-servers-exchange-storage-e-folder-exchange.c
deleted file mode 100644
index e366b774de9..00000000000
--- a/databases/evolution-data-server/files/patch-servers-exchange-storage-e-folder-exchange.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- servers/exchange/storage/e-folder-exchange.c.orig Mon Oct 3 11:05:51 2005
-+++ servers/exchange/storage/e-folder-exchange.c Thu Nov 10 05:04:23 2005
-@@ -744,11 +744,13 @@
- void
- e_folder_exchange_unsubscribe (EFolder *folder)
- {
-+ E2kContext *ctx;
-+
- g_return_if_fail (E_IS_FOLDER_EXCHANGE (folder));
-
- /* FIXME : This is a hack as of now. The free_folder in mail-stub
- gets called when we are in offline and the context is NULL then. */
-- E2kContext *ctx = E_FOLDER_EXCHANGE_CONTEXT (folder);
-+ ctx = E_FOLDER_EXCHANGE_CONTEXT (folder);
- if (ctx) {
- e2k_context_unsubscribe (E_FOLDER_EXCHANGE_CONTEXT (folder),
- E_FOLDER_EXCHANGE_URI (folder));
diff --git a/databases/evolution-data-server/files/patch-servers-groupwise-e-gw-connection.c b/databases/evolution-data-server/files/patch-servers-groupwise-e-gw-connection.c
deleted file mode 100644
index faa3ce12021..00000000000
--- a/databases/evolution-data-server/files/patch-servers-groupwise-e-gw-connection.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- servers/groupwise/e-gw-connection.c.orig Mon Oct 3 11:05:51 2005
-+++ servers/groupwise/e-gw-connection.c Thu Nov 10 00:32:44 2005
-@@ -1979,8 +1979,8 @@
- EGwConnectionPrivate *priv;
- SoupSoapParameter *param, *subparam, *second_level_child;
- char *id, *name;
-- g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT);
- static GStaticMutex connecting = G_STATIC_MUTEX_INIT;
-+ g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT);
-
- priv = cnc->priv;
- g_static_mutex_lock (&connecting);
diff --git a/databases/evolution-data-server/files/patch-servers-groupwise-e-gw-item.c b/databases/evolution-data-server/files/patch-servers-groupwise-e-gw-item.c
deleted file mode 100644
index 89201b2e7cb..00000000000
--- a/databases/evolution-data-server/files/patch-servers-groupwise-e-gw-item.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- servers/groupwise/e-gw-item.c.orig Mon Oct 3 14:46:42 2005
-+++ servers/groupwise/e-gw-item.c Thu Nov 10 04:56:48 2005
-@@ -3019,8 +3019,8 @@
-
- /*attachments*/
- if (priv->attach_list) {
-- soup_soap_message_start_element (msg, "attachments", NULL, NULL) ;
- GSList *al ;
-+ soup_soap_message_start_element (msg, "attachments", NULL, NULL) ;
- for (al = priv->attach_list ; al != NULL ; al = al->next) {
- EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ;
- add_attachment_to_soap_message (attachment, msg) ;
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index e538af3a07d..e3b1781b5d7 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -111,6 +111,7 @@ include/evolution-data-server-%%VERSION%%/camel/camel-vtrash-folder.h
include/evolution-data-server-%%VERSION%%/camel/camel.h
include/evolution-data-server-%%VERSION%%/exchange/e-folder-exchange.h
include/evolution-data-server-%%VERSION%%/exchange/e-folder.h
+include/evolution-data-server-%%VERSION%%/exchange/e-shell-marshal.h
include/evolution-data-server-%%VERSION%%/exchange/e-storage.h
include/evolution-data-server-%%VERSION%%/exchange/e2k-autoconfig.h
include/evolution-data-server-%%VERSION%%/exchange/e2k-context.h
@@ -199,6 +200,7 @@ include/evolution-data-server-%%VERSION%%/libedataserver/e-account.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-categories.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-component-listener.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-data-server-module.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-data-server-util.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-db3-utils.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-dbhash.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-file-cache.h
@@ -216,8 +218,8 @@ include/evolution-data-server-%%VERSION%%/libedataserver/e-time-utils.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-trie.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-uid.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-url.h
-include/evolution-data-server-%%VERSION%%/libedataserver/e-util.h
include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-hash-utils.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-utils.h
include/evolution-data-server-%%VERSION%%/libedataserver/md5-utils.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-book-auth-util.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-categories-dialog.h
@@ -225,6 +227,7 @@ include/evolution-data-server-%%VERSION%%/libedataserverui/e-contact-store.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-destination-store.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-dialog.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-entry.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-list.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-model.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector.h
include/evolution-data-server-%%VERSION%%/libedataserverui/e-passwords.h
@@ -280,6 +283,10 @@ lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.a
lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.la
lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.so
lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.urls
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelhula.a
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelhula.la
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelhula.so
+lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelhula.urls
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
@@ -320,6 +327,9 @@ lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendldap.so
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendvcf.a
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendvcf.la
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendvcf.so
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcaldav.a
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcaldav.la
+lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcaldav.so
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcontacts.a
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcontacts.la
lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcontacts.so
@@ -342,7 +352,7 @@ lib/libcamel-%%EVO_VERSION%%.so.0
lib/libcamel-provider-%%EVO_VERSION%%.a
lib/libcamel-provider-%%EVO_VERSION%%.la
lib/libcamel-provider-%%EVO_VERSION%%.so
-lib/libcamel-provider-%%EVO_VERSION%%.so.6
+lib/libcamel-provider-%%EVO_VERSION%%.so.8
lib/libebook-%%EVO_VERSION%%.a
lib/libebook-%%EVO_VERSION%%.la
lib/libebook-%%EVO_VERSION%%.so
@@ -362,7 +372,7 @@ lib/libedata-cal-%%EVO_VERSION%%.so.1
lib/libedataserver-%%EVO_VERSION%%.a
lib/libedataserver-%%EVO_VERSION%%.la
lib/libedataserver-%%EVO_VERSION%%.so
-lib/libedataserver-%%EVO_VERSION%%.so.4
+lib/libedataserver-%%EVO_VERSION%%.so.7
lib/libedataserverui-%%EVO_VERSION%%.a
lib/libedataserverui-%%EVO_VERSION%%.la
lib/libedataserverui-%%EVO_VERSION%%.so
@@ -370,11 +380,11 @@ lib/libedataserverui-%%EVO_VERSION%%.so.6
lib/libegroupwise-%%EVO_VERSION%%.a
lib/libegroupwise-%%EVO_VERSION%%.la
lib/libegroupwise-%%EVO_VERSION%%.so
-lib/libegroupwise-%%EVO_VERSION%%.so.8
+lib/libegroupwise-%%EVO_VERSION%%.so.9
lib/libexchange-storage-%%EVO_VERSION%%.a
lib/libexchange-storage-%%EVO_VERSION%%.la
lib/libexchange-storage-%%EVO_VERSION%%.so
-lib/libexchange-storage-%%EVO_VERSION%%.so.0
+lib/libexchange-storage-%%EVO_VERSION%%.so.1
libdata/bonobo/servers/GNOME_Evolution_DataServer_%%EVO_VERSION%%.server
libdata/pkgconfig/camel-%%EVO_VERSION%%.pc
libdata/pkgconfig/camel-provider-%%EVO_VERSION%%.pc
@@ -407,6 +417,7 @@ share/doc/libebook/libebook-e-book-async.html
share/doc/libebook/libebook-e-book-query.html
share/doc/libebook/libebook-e-book-types.html
share/doc/libebook/libebook.devhelp
+share/doc/libebook/libebook.devhelp2
share/doc/libebook/right.png
share/doc/libebook/style.css
share/doc/libebook/up.png
@@ -425,6 +436,7 @@ share/doc/libecal/libecal-e-cal-time-util.html
share/doc/libecal/libecal-e-cal-types.html
share/doc/libecal/libecal-e-cal-util.html
share/doc/libecal/libecal.devhelp
+share/doc/libecal/libecal.devhelp2
share/doc/libecal/right.png
share/doc/libecal/style.css
share/doc/libecal/up.png
@@ -437,7 +449,13 @@ share/doc/libedata-cal/home.png
share/doc/libedata-cal/index.html
share/doc/libedata-cal/index.sgml
share/doc/libedata-cal/left.png
+share/doc/libedata-cal/libedata-cal-ECalBackendCache.html
+share/doc/libedata-cal/libedata-cal-ECalBackendFactory.html
+share/doc/libedata-cal/libedata-cal-ECalBackendSync.html
+share/doc/libedata-cal/libedata-cal-EDataCalFactory.html
+share/doc/libedata-cal/libedata-cal-e-cal-backend-util.html
share/doc/libedata-cal/libedata-cal.devhelp
+share/doc/libedata-cal/libedata-cal.devhelp2
share/doc/libedata-cal/right.png
share/doc/libedata-cal/style.css
share/doc/libedata-cal/up.png
@@ -448,6 +466,7 @@ share/doc/libedataserver/index.sgml
share/doc/libedataserver/left.png
share/doc/libedataserver/libedataserver-EAccount.html
share/doc/libedataserver/libedataserver-EAccountList.html
+share/doc/libedataserver/libedataserver-EComponentListener.html
share/doc/libedataserver/libedataserver-EFileCache.html
share/doc/libedataserver/libedataserver-EIterator.html
share/doc/libedataserver/libedataserver-EList.html
@@ -457,6 +476,7 @@ share/doc/libedataserver/libedataserver-ESource.html
share/doc/libedataserver/libedataserver-ESourceGroup.html
share/doc/libedataserver/libedataserver-ESourceList.html
share/doc/libedataserver/libedataserver-e-categories.html
+share/doc/libedataserver/libedataserver-e-data-server-module.html
share/doc/libedataserver/libedataserver-e-db3-utils.html
share/doc/libedataserver/libedataserver-e-dbhash.html
share/doc/libedataserver/libedataserver-e-iconv.html
@@ -467,8 +487,10 @@ share/doc/libedataserver/libedataserver-e-trie.html
share/doc/libedataserver/libedataserver-e-uid.html
share/doc/libedataserver/libedataserver-e-url.html
share/doc/libedataserver/libedataserver-e-util.html
+share/doc/libedataserver/libedataserver-e-xml-hash-utils.html
share/doc/libedataserver/libedataserver-md5-utils.html
share/doc/libedataserver/libedataserver.devhelp
+share/doc/libedataserver/libedataserver.devhelp2
share/doc/libedataserver/right.png
share/doc/libedataserver/style.css
share/doc/libedataserver/up.png
@@ -888,6 +910,7 @@ share/locale/cs/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/cy/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/da/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/de/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/dz/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/el/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/en_AU/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/en_CA/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -909,7 +932,9 @@ share/locale/id/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/is/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/ja/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ka/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/ko/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ku/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/lt/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/lv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/mk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@@ -934,13 +959,25 @@ 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/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
share/locale/vi/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/wa/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
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/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/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
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 1a17923a65d..3cbd3dc7267 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,27 +3,26 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.4 2005/11/02 01:42:00 marcus Exp $
+# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.24 2006/04/17 07:51:13 marcus Exp $
#
PORTNAME= deskbar-applet
-PORTVERSION= 0.8.8
-PORTREVISION= 1
+PORTVERSION= 2.14.1.1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gnome panel applet similar to Google's (Windows only) Deskbar
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
-USE_GNOME= gnomeprefix gnomehack pygnomeextras
+USE_GNOME= gnomeprefix gnomehack pygnomedesktop intlhack
USE_PYTHON= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
CONFIGURE_ARGS= --disable-beagle
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -35,7 +34,7 @@ OPTIONS= EVO "Enable evolution support" on
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
-BROKEN= "Does not build on 4.X"
+BROKEN= Does not build on 4.X
.endif
.if !defined(WITHOUT_EVO)
@@ -46,11 +45,36 @@ CONFIGURE_ARGS+=--disable-evolution
PLIST_SUB+= EVO="@comment "
.endif
+.if !defined(DISPLAY)
+BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
+ ${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
+.if !defined(PACKAGE_BUILDING)
+CONFIGURE_ENV+= DISPLAY="localhost:1001"
+.endif
+.endif
+
post-patch:
@${FIND} ${WRKSRC}/deskbar -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e \
's|/usr/share/applications|${X11BASE}/share/gnome/applications|g'
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
s|%%X11BASE%%|${X11BASE}|g' \
- ${WRKSRC}/deskbar/handler_utils.py
+ ${WRKSRC}/deskbar/handlers/mozilla.py \
+ ${WRKSRC}/deskbar/Utils.py
+
+.if !defined(DISPLAY)
+pre-configure:
+ @if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
+ ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
+ ${RM} -f ${WRKDIR}/.Xvfb.pid ; \
+ fi
+ ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
+ @sleep 5
+
+post-configure:
+ @if [ -f ${WRKDIR}/.Xvfb.pid ]; then \
+ ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
+ ${RM} -f ${WRKDIR}/.Xvfb.pid ; \
+ fi
+.endif
.include <bsd.port.post.mk>
diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo
index 8491a6ac547..147cebfffcc 100644
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/deskbar-applet-0.8.8.tar.bz2) = 2d45cd24feb023cd4083e53bdc8b478e
-SHA256 (gnome2/deskbar-applet-0.8.8.tar.bz2) = 89813323e0da4f68ed5b26ab8ae97968fda7472583b4ff2805743fc7ee80f74f
-SIZE (gnome2/deskbar-applet-0.8.8.tar.bz2) = 384587
+MD5 (gnome2/deskbar-applet-2.14.1.1.tar.bz2) = 9264c4cf5eaab4ac99009aea393d30ff
+SHA256 (gnome2/deskbar-applet-2.14.1.1.tar.bz2) = 0e623108df00e7a87a822661abe301537c0bbc3b0e512302f706fdf6b989d7b5
+SIZE (gnome2/deskbar-applet-2.14.1.1.tar.bz2) = 484608
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_handler_utils.py b/deskutils/deskbar-applet/files/patch-deskbar_Utils.py
index 8173fc2d0db..773c8e15ae7 100644
--- a/deskutils/deskbar-applet/files/patch-deskbar_handler_utils.py
+++ b/deskutils/deskbar-applet/files/patch-deskbar_Utils.py
@@ -1,5 +1,5 @@
---- deskbar/handler_utils.py.orig Tue Nov 1 20:32:51 2005
-+++ deskbar/handler_utils.py Tue Nov 1 20:33:08 2005
+--- deskbar/Utils.py.orig Tue Nov 1 20:32:51 2005
++++ deskbar/Utils.py Tue Nov 1 20:33:08 2005
@@ -10,7 +10,7 @@
sysdirs = os.getenv("XDG_DATA_DIRS")
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py b/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
index 1cca47519b6..1cf0777c4a8 100644
--- a/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
+++ b/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
@@ -1,13 +1,17 @@
---- deskbar/deskbar-applet.py.orig Sat Nov 19 14:15:58 2005
-+++ deskbar/deskbar-applet.py Thu Dec 8 22:23:00 2005
-@@ -34,8 +34,8 @@
- gettext.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale")))
+--- 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 @@
+ gettext.bind_textdomain_codeset('deskbar-applet','UTF-8')
gettext.textdomain('deskbar-applet')
-locale.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale")))
+-if hasattr(locale, 'bind_textdomain_codeset'):
+- locale.bind_textdomain_codeset('deskbar-applet','UTF-8')
-locale.textdomain('deskbar-applet')
+#locale.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale")))
++#if hasattr(locale, 'bind_textdomain_codeset'):
++# locale.bind_textdomain_codeset('deskbar-applet','UTF-8')
+#locale.textdomain('deskbar-applet')
- def applet_factory(applet, iid):
- print 'Starting Deskbar instance:', applet, iid
+ import gtkexcepthook
+
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py b/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py
new file mode 100644
index 00000000000..a668777c193
--- /dev/null
+++ b/deskutils/deskbar-applet/files/patch-deskbar_handlers_mozilla.py
@@ -0,0 +1,18 @@
+--- deskbar/handlers/mozilla.py.orig Wed Mar 1 13:32:12 2006
++++ deskbar/handlers/mozilla.py Wed Mar 1 13:33:19 2006
+@@ -189,6 +189,7 @@ class MozillaSearchHandler(deskbar.Handl
+ get_firefox_home_file("searchplugins"),
+ get_firefox_home_file("search"),
+ expanduser("~/.mozilla/searchplugins"),
++ "%%X11BASE%%/lib/firefox/searchplugins",
+ "/usr/lib/firefox/searchplugins",
+ "/usr/local/lib/firefox/searchplugins",
+ "/usr/lib/mozilla-firefox/searchplugins",
+@@ -197,6 +198,7 @@ class MozillaSearchHandler(deskbar.Handl
+ smart_dirs = [
+ get_mozilla_home_file("search"),
+ expanduser("~/.mozilla/searchplugins"),
++ "%%X11BASE%%/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 14ef80af14e..bfeca092135 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -2,9 +2,9 @@ lib/deskbar-applet/deskbar-applet
lib/deskbar-applet/handlers/beagle-live.py
lib/deskbar-applet/handlers/beagle-live.pyc
lib/deskbar-applet/handlers/beagle-live.pyo
-lib/deskbar-applet/handlers/beagle.py
-lib/deskbar-applet/handlers/beagle.pyc
-lib/deskbar-applet/handlers/beagle.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
@@ -29,6 +29,9 @@ 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/mozilla.py
lib/deskbar-applet/handlers/mozilla.pyc
lib/deskbar-applet/handlers/mozilla.pyo
@@ -44,107 +47,204 @@ 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
+lib/deskbar-applet/handlers/yahoo.py
+lib/deskbar-applet/handlers/yahoo.pyc
+lib/deskbar-applet/handlers/yahoo.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.py
+%%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/BrowserMatch.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Categories.py
+%%PYTHON_SITELIBDIR%%/deskbar/Categories.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Categories.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarApplet.py
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarApplet.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarApplet.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarAppletPreferences.py
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarAppletPreferences.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarAppletPreferences.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarHistory.py
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarHistory.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/DeskbarHistory.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Handler.py
+%%PYTHON_SITELIBDIR%%/deskbar/Handler.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Handler.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Indexer.py
+%%PYTHON_SITELIBDIR%%/deskbar/Indexer.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Indexer.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Keybinder.py
+%%PYTHON_SITELIBDIR%%/deskbar/Keybinder.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Keybinder.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Match.py
+%%PYTHON_SITELIBDIR%%/deskbar/Match.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Match.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.py
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.py
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleList.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleLoader.py
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleLoader.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleLoader.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Utils.py
+%%PYTHON_SITELIBDIR%%/deskbar/Utils.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Utils.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/Watcher.py
+%%PYTHON_SITELIBDIR%%/deskbar/Watcher.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/Watcher.pyo
%%PYTHON_SITELIBDIR%%/deskbar/__init__.py
%%PYTHON_SITELIBDIR%%/deskbar/__init__.pyc
%%PYTHON_SITELIBDIR%%/deskbar/__init__.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/about.py
-%%PYTHON_SITELIBDIR%%/deskbar/about.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/about.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/applet.py
-%%PYTHON_SITELIBDIR%%/deskbar/applet.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/applet.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/applet_keybinder.py
-%%PYTHON_SITELIBDIR%%/deskbar/applet_keybinder.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/applet_keybinder.pyo
%%PYTHON_SITELIBDIR%%/deskbar/defs.py
%%PYTHON_SITELIBDIR%%/deskbar/defs.pyc
%%PYTHON_SITELIBDIR%%/deskbar/defs.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/deskbarentry.py
-%%PYTHON_SITELIBDIR%%/deskbar/deskbarentry.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/deskbarentry.pyo
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.py
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyc
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyo
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.la
-%%EVO%%%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.so
-%%PYTHON_SITELIBDIR%%/deskbar/filewatcher.py
-%%PYTHON_SITELIBDIR%%/deskbar/filewatcher.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/filewatcher.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/evolution/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.la
+%%PYTHON_SITELIBDIR%%/deskbar/evolution/_evolution.so
%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.py
%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.pyc
%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/__init__.pyo
%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/_gnomedesktop.la
%%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop/_gnomedesktop.so
-%%PYTHON_SITELIBDIR%%/deskbar/handler.py
-%%PYTHON_SITELIBDIR%%/deskbar/handler.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/handler.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/handler_utils.py
-%%PYTHON_SITELIBDIR%%/deskbar/handler_utils.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/handler_utils.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/handlers_browsers.py
-%%PYTHON_SITELIBDIR%%/deskbar/handlers_browsers.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/handlers_browsers.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/history.py
-%%PYTHON_SITELIBDIR%%/deskbar/history.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/history.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/gtkexcepthook.py
+%%PYTHON_SITELIBDIR%%/deskbar/gtkexcepthook.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/gtkexcepthook.pyo
%%PYTHON_SITELIBDIR%%/deskbar/iconentry/__init__.py
%%PYTHON_SITELIBDIR%%/deskbar/iconentry/__init__.pyc
%%PYTHON_SITELIBDIR%%/deskbar/iconentry/__init__.pyo
%%PYTHON_SITELIBDIR%%/deskbar/iconentry/_iconentry.la
%%PYTHON_SITELIBDIR%%/deskbar/iconentry/_iconentry.so
-%%PYTHON_SITELIBDIR%%/deskbar/indexer.py
-%%PYTHON_SITELIBDIR%%/deskbar/indexer.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/indexer.pyo
%%PYTHON_SITELIBDIR%%/deskbar/keybinder/__init__.py
%%PYTHON_SITELIBDIR%%/deskbar/keybinder/__init__.pyc
%%PYTHON_SITELIBDIR%%/deskbar/keybinder/__init__.pyo
%%PYTHON_SITELIBDIR%%/deskbar/keybinder/_keybinder.la
%%PYTHON_SITELIBDIR%%/deskbar/keybinder/_keybinder.so
-%%PYTHON_SITELIBDIR%%/deskbar/locale_utils.py
-%%PYTHON_SITELIBDIR%%/deskbar/locale_utils.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/locale_utils.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/ltihooks.py
-%%PYTHON_SITELIBDIR%%/deskbar/ltihooks.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/ltihooks.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/module_list.py
-%%PYTHON_SITELIBDIR%%/deskbar/module_list.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/module_list.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/preferences.py
-%%PYTHON_SITELIBDIR%%/deskbar/preferences.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/preferences.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/osutils/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/osutils/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/osutils/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/osutils/_osutils.la
+%%PYTHON_SITELIBDIR%%/deskbar/osutils/_osutils.so
+%%PYTHON_SITELIBDIR%%/deskbar/ui/About.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/About.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/About.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarPreferencesUI.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarPreferencesUI.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarPreferencesUI.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarUI.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarUI.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarUI.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/EntryHistoryManager.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/EntryHistoryManager.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/EntryHistoryManager.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/ModuleListView.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/ModuleListView.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/ModuleListView.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/CuemiacHistory.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHistory.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacHistory.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/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/CuemiacEntryUI.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/CuemiacEntryUI.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/CuemiacEntryUI.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ui/entriac/__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/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/web-bookmark.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/locale/bg/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
+share/locale/da/LC_MESSAGES/deskbar-applet.mo
share/locale/de/LC_MESSAGES/deskbar-applet.mo
+share/locale/dz/LC_MESSAGES/deskbar-applet.mo
+share/locale/el/LC_MESSAGES/deskbar-applet.mo
share/locale/en_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/fi/LC_MESSAGES/deskbar-applet.mo
+share/locale/fr/LC_MESSAGES/deskbar-applet.mo
share/locale/gl/LC_MESSAGES/deskbar-applet.mo
share/locale/gu/LC_MESSAGES/deskbar-applet.mo
+share/locale/he/LC_MESSAGES/deskbar-applet.mo
+share/locale/hi/LC_MESSAGES/deskbar-applet.mo
share/locale/hu/LC_MESSAGES/deskbar-applet.mo
+share/locale/it/LC_MESSAGES/deskbar-applet.mo
share/locale/ja/LC_MESSAGES/deskbar-applet.mo
+share/locale/ka/LC_MESSAGES/deskbar-applet.mo
+share/locale/ko/LC_MESSAGES/deskbar-applet.mo
+share/locale/ku/LC_MESSAGES/deskbar-applet.mo
share/locale/lt/LC_MESSAGES/deskbar-applet.mo
share/locale/mk/LC_MESSAGES/deskbar-applet.mo
share/locale/nb/LC_MESSAGES/deskbar-applet.mo
share/locale/nl/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/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/th/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
@dirrm share/gnome/deskbar-applet/art
@dirrm share/gnome/deskbar-applet
+@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
diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile
index 44971b2eadb..711b2a9a0a1 100644
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.1 2005/09/08 14:22:13 marcus Exp $
+# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.9 2006/04/13 07:52:31 bland Exp $
#
PORTNAME= jescs
-PORTVERSION= 2.4.3
-PORTREVISION= 1
+PORTVERSION= 2.5.3
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/2.4
+MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= evolution-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
@@ -24,14 +23,15 @@ RUN_DEPENDS= evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_PERL= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnometarget
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-EVO_VERSION= 2.4
-PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.4"
+EVO_VERSION= 2.6
+PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.6"
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 6c055501ee6..07f587c30fd 100644
--- a/deskutils/evolution-jescs/distinfo
+++ b/deskutils/evolution-jescs/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-jescs-2.4.3.tar.bz2) = f691bc771c47af7f870f62215f0e159b
-SHA256 (evolution-jescs-2.4.3.tar.bz2) = c934802666c6969476b504d8765f6486394551b66203cef1c671b3ad3280a503
-SIZE (evolution-jescs-2.4.3.tar.bz2) = 446850
+MD5 (evolution-jescs-2.5.3.tar.bz2) = c0b8a696147ee470729f4b05c20b84bd
+SHA256 (evolution-jescs-2.5.3.tar.bz2) = 58cfd453fb30eed73547a464b2dd64f500a4616a63a9dc5e1b5f0dbbdeabf63b
+SIZE (evolution-jescs-2.5.3.tar.bz2) = 448739
diff --git a/deskutils/evolution-jescs/pkg-plist b/deskutils/evolution-jescs/pkg-plist
index 67968ebb841..78194253320 100644
--- a/deskutils/evolution-jescs/pkg-plist
+++ b/deskutils/evolution-jescs/pkg-plist
@@ -1,8 +1,3 @@
-lib/evolution/%%EVO_VERSION%%/libwcapcalendar.a
-lib/evolution/%%EVO_VERSION%%/libwcapcalendar.la
-lib/evolution/%%EVO_VERSION%%/libwcapcalendar.so
-lib/evolution/%%EVO_VERSION%%/libwcapcalendar.so.0
-lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelsunone.a
lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelsunone.la
lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelsunone.so
lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelsunone.urls
@@ -21,6 +16,7 @@ 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
share/locale/fr/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/ja/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/ko/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
@@ -34,6 +30,7 @@ share/locale/sk/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/sq/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/sv/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/uk/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index 36560fe34d5..3c49b7357da 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdesklets
PORTVERSION= 0.35.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils gnome
MASTER_SITES= http://www.gdesklets.org/downloads/ \
http://www.pycage.de/download/${PORTNAME}/ \
@@ -17,7 +17,7 @@ DISTNAME= gDesklets-${PORTVERSION}
MAINTAINER= klammer@webonaut.com
COMMENT= A framework for Gnome 2.x for desktop applets
-LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop2
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 3ec29ebda86..dd323073e74 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,15 +3,16 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.70 2005/10/04 17:39:31 mezz Exp $
+# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.92 2006/04/19 04:46:41 marcus Exp $
#
PORTNAME= gnomeutils2
-PORTVERSION= 2.12.2
+PORTVERSION= 2.14.0
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-utils/2.12
+MASTER_SITE_SUBDIR= sources/gnome-utils/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -19,26 +20,20 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 support utilities
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
-USE_REINPLACE= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
+INSTALLS_SHLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \
- libgnomeprintui gnomedesktop
-GNU_CONFIGURE= yes
+ 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
-GCONF_SCHEMAS= gdict.schemas gnome-screenshot.schemas \
+GCONF_SCHEMAS= gnome-dictionary.schemas gnome-screenshot.schemas \
gnome-search-tool.schemas logview.schemas
-post-extract:
- @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
- 's| $$||g'
-
-post-patch:
- @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
-
.include <bsd.port.mk>
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index eed200ddfee..4ac628f2212 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-utils-2.12.2.tar.bz2) = 71d615932e4ddf7182abeb734b8e370c
-SHA256 (gnome2/gnome-utils-2.12.2.tar.bz2) = be61efed2a5e78533d89ecb10339b72c2cc59d82de0422a7cc72c1ee3320c0de
-SIZE (gnome2/gnome-utils-2.12.2.tar.bz2) = 1726889
+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
diff --git a/deskutils/gnome-utils/files/patch-configure b/deskutils/gnome-utils/files/patch-configure
deleted file mode 100644
index d5d7d0e103f..00000000000
--- a/deskutils/gnome-utils/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Mon Nov 25 09:25:29 2002
-+++ configure Tue Nov 26 16:04:42 2002
-@@ -10347,7 +10347,7 @@
-
-
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- _ACEOF
-
-
diff --git a/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c
index 03a974c23aa..9d1ee8c9c55 100644
--- a/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c
+++ b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c
@@ -1,10 +1,10 @@
---- gsearchtool/gsearchtool-support.c.orig Thu Dec 23 19:13:28 2004
-+++ gsearchtool/gsearchtool-support.c Thu Dec 23 19:13:38 2004
-@@ -30,6 +30,7 @@
- #endif
+--- gsearchtool/gsearchtool-support.c.orig Thu Jan 5 23:26:25 2006
++++ gsearchtool/gsearchtool-support.c Thu Jan 5 23:27:04 2006
+@@ -31,6 +31,7 @@
#include <glib/gi18n.h>
+ #include <glib/gdate.h>
+#include <sys/types.h>
#include <regex.h>
#include <gdk/gdkx.h>
- #include <bonobo-activation/bonobo-activation.h>
+ #include <libart_lgpl/art_rgb.h>
diff --git a/deskutils/gnome-utils/files/patch-logview__logview.h b/deskutils/gnome-utils/files/patch-logview__logview.h
new file mode 100644
index 00000000000..3cd50f68c4b
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview__logview.h
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 00000000000..3aefb999f00
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_calendar.h
@@ -0,0 +1,10 @@
+--- 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_desc_db.c b/deskutils/gnome-utils/files/patch-logview_desc_db.c
deleted file mode 100644
index 5b687f492e8..00000000000
--- a/deskutils/gnome-utils/files/patch-logview_desc_db.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- logview/desc_db.c.orig Wed Dec 1 16:45:13 2004
-+++ logview/desc_db.c Wed Dec 1 16:45:25 2004
-@@ -21,6 +21,7 @@
- #include <gtk/gtk.h>
- #include <glib/gi18n.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <regex.h>
- #include "logview.h"
- #include "desc_db.h"
diff --git a/deskutils/gnome-utils/files/patch-logview_loglist.h b/deskutils/gnome-utils/files/patch-logview_loglist.h
new file mode 100644
index 00000000000..149e04a59ab
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_loglist.h
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 00000000000..85333d2fe16
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_logrtns.c
@@ -0,0 +1,52 @@
+--- 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
new file mode 100644
index 00000000000..1e6acd101c0
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_logview-findbar.h
@@ -0,0 +1,10 @@
+--- 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_logview.c b/deskutils/gnome-utils/files/patch-logview_logview.c
deleted file mode 100644
index 5dd057d1a77..00000000000
--- a/deskutils/gnome-utils/files/patch-logview_logview.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- logview/logview.c.orig Tue Oct 4 12:31:47 2005
-+++ logview/logview.c Tue Oct 4 12:32:04 2005
-@@ -930,7 +930,7 @@
-
- if ( ! found) {
- g_snprintf (full_name, sizeof (full_name),
-- "%s/share/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX);
- if (access (full_name, R_OK) == 0) {
- found = TRUE;
- g_free (cfg->regexp_db_path);
-@@ -952,7 +952,7 @@
-
- if ( ! found) {
- g_snprintf (full_name, sizeof (full_name),
-- "%s/share/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX);
- if (access (full_name, R_OK) == 0) {
- found = TRUE;
- g_free (cfg->descript_db_path);
-@@ -983,7 +983,7 @@
-
- if ( ! found) {
- g_snprintf (full_name, sizeof (full_name),
-- "%s/share/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX);
- if (access (full_name, R_OK) == 0) {
- found = TRUE;
- g_free (cfg->action_db_path);
diff --git a/deskutils/gnome-utils/files/patch-logview_misc.c b/deskutils/gnome-utils/files/patch-logview_misc.c
new file mode 100644
index 00000000000..1a0f54cfe5b
--- /dev/null
+++ b/deskutils/gnome-utils/files/patch-logview_misc.c
@@ -0,0 +1,21 @@
+--- 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 24ef4bd1cfd..51eef16fbc8 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -3,119 +3,96 @@ bin/gnome-panel-screenshot
bin/gnome-screenshot
bin/gnome-search-tool
bin/gnome-system-log
-libdata/bonobo/servers/GNOME_GDictApplet.server
-libexec/gdict-applet
+include/gdict-1.0/gdict/gdict-client-context.h
+include/gdict-1.0/gdict/gdict-context.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-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
+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.devhelp
+share/doc/gdict/gdict.devhelp2
+share/doc/gdict/gdict.html
+share/doc/gdict/gdictui.html
+share/doc/gdict/home.png
+share/doc/gdict/index.html
+share/doc/gdict/index.sgml
+share/doc/gdict/introduction.html
+share/doc/gdict/left.png
+share/doc/gdict/right.png
+share/doc/gdict/sources-loader.html
+share/doc/gdict/sources.html
+share/doc/gdict/style.css
+share/doc/gdict/up.png
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/gnome-2.0/ui/GNOME_GDictApplet.xml
+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
+share/gnome/gnome-dictionary/gnome-dictionary-ui.xml
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/gnome-dictionary/C/figures/gdict_applet.png
-share/gnome/help/gnome-dictionary/C/figures/gdict_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
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-preferences-print.png
+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/ja/figures/gdict_applet.png
-share/gnome/help/gnome-dictionary/ja/figures/gdict_window.png
-share/gnome/help/gnome-dictionary/ja/gnome-dictionary.xml
-share/gnome/help/gnome-dictionary/ja/legal.xml
-share/gnome/help/gnome-dictionary/uk/figures/gdict_applet.png
-share/gnome/help/gnome-dictionary/uk/figures/gdict_window.png
-share/gnome/help/gnome-dictionary/uk/gnome-dictionary.xml
-share/gnome/help/gnome-dictionary/uk/legal.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
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-find.png
+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-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/es/legal.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/fr/legal.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/it/legal.xml
-share/gnome/help/gnome-search-tool/ja/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/ja/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/ja/legal.xml
-share/gnome/help/gnome-search-tool/ko/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/ko/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/ko/legal.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/sv/legal.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-search-tool/uk/legal.xml
-share/gnome/help/gnome-search-tool/zh_CN/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/zh_CN/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/zh_CN/legal.xml
-share/gnome/help/gnome-search-tool/zh_HK/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/zh_HK/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/zh_HK/legal.xml
-share/gnome/help/gnome-search-tool/zh_TW/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/zh_TW/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/zh_TW/legal.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/de/figures/syslog_window.png
-share/gnome/help/gnome-system-log/de/gnome-system-log.xml
-share/gnome/help/gnome-system-log/de/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/es/legal.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/fr/legal.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/it/legal.xml
-share/gnome/help/gnome-system-log/ja/figures/syslog_window.png
-share/gnome/help/gnome-system-log/ja/gnome-system-log.xml
-share/gnome/help/gnome-system-log/ja/legal.xml
-share/gnome/help/gnome-system-log/ko/figures/syslog_window.png
-share/gnome/help/gnome-system-log/ko/gnome-system-log.xml
-share/gnome/help/gnome-system-log/ko/legal.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/sv/legal.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/help/gnome-system-log/uk/legal.xml
-share/gnome/help/gnome-system-log/zh_CN/figures/syslog_window.png
-share/gnome/help/gnome-system-log/zh_CN/gnome-system-log.xml
-share/gnome/help/gnome-system-log/zh_CN/legal.xml
-share/gnome/help/gnome-system-log/zh_TW/figures/syslog_window.png
-share/gnome/help/gnome-system-log/zh_TW/gnome-system-log.xml
-share/gnome/help/gnome-system-log/zh_TW/legal.xml
-share/gnome/omf/gnome-utils/gnome-dictionary-C.omf
-share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf
-share/gnome/omf/gnome-utils/gnome-dictionary-uk.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-C.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-es.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-it.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-ja.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-ko.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-uk.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf
-share/gnome/omf/gnome-utils/gnome-system-log-C.omf
-share/gnome/omf/gnome-utils/gnome-system-log-de.omf
-share/gnome/omf/gnome-utils/gnome-system-log-es.omf
-share/gnome/omf/gnome-utils/gnome-system-log-fr.omf
-share/gnome/omf/gnome-utils/gnome-system-log-it.omf
-share/gnome/omf/gnome-utils/gnome-system-log-ja.omf
-share/gnome/omf/gnome-utils/gnome-system-log-ko.omf
-share/gnome/omf/gnome-utils/gnome-system-log-sv.omf
-share/gnome/omf/gnome-utils/gnome-system-log-uk.omf
-share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf
-share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-C.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-es.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-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/pixmaps/gsearchtool/thumbnail_frame.png
share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
@@ -149,6 +126,7 @@ 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/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/mk/LC_MESSAGES/gnome-utils-2.0.mo
@@ -181,62 +159,39 @@ share/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo
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-utils
-@dirrm share/gnome/help/gnome-system-log/zh_TW/figures
-@dirrm share/gnome/help/gnome-system-log/zh_TW
-@dirrm share/gnome/help/gnome-system-log/zh_CN/figures
-@dirrm share/gnome/help/gnome-system-log/zh_CN
-@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/ko/figures
-@dirrm share/gnome/help/gnome-system-log/ko
-@dirrm share/gnome/help/gnome-system-log/ja/figures
-@dirrm share/gnome/help/gnome-system-log/ja
-@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/omf/gnome-system-log
+@dirrm share/gnome/omf/gnome-search-tool
+@dirrm share/gnome/omf/gnome-dictionary
@dirrm share/gnome/help/gnome-system-log/es/figures
@dirrm share/gnome/help/gnome-system-log/es
-@dirrm share/gnome/help/gnome-system-log/de/figures
-@dirrm share/gnome/help/gnome-system-log/de
@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/zh_TW/figures
-@dirrm share/gnome/help/gnome-search-tool/zh_TW
-@dirrm share/gnome/help/gnome-search-tool/zh_HK/figures
-@dirrm share/gnome/help/gnome-search-tool/zh_HK
-@dirrm share/gnome/help/gnome-search-tool/zh_CN/figures
-@dirrm share/gnome/help/gnome-search-tool/zh_CN
-@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/ko/figures
-@dirrm share/gnome/help/gnome-search-tool/ko
-@dirrm share/gnome/help/gnome-search-tool/ja/figures
-@dirrm share/gnome/help/gnome-search-tool/ja
@dirrm share/gnome/help/gnome-search-tool/it/figures
@dirrm share/gnome/help/gnome-search-tool/it
-@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/ja/figures
-@dirrm share/gnome/help/gnome-dictionary/ja
+@dirrm share/gnome/help/gnome-dictionary/es/figures
+@dirrm share/gnome/help/gnome-dictionary/es
@dirrm share/gnome/help/gnome-dictionary/C/figures
@dirrm share/gnome/help/gnome-dictionary/C
@dirrm share/gnome/help/gnome-dictionary
@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/doc/gdict
+@dirrm include/gdict-1.0/gdict
+@dirrm include/gdict-1.0
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index 3ec29ebda86..dd323073e74 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -3,15 +3,16 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.70 2005/10/04 17:39:31 mezz Exp $
+# $MCom: ports/deskutils/gnomeutils2/Makefile,v 1.92 2006/04/19 04:46:41 marcus Exp $
#
PORTNAME= gnomeutils2
-PORTVERSION= 2.12.2
+PORTVERSION= 2.14.0
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-utils/2.12
+MASTER_SITE_SUBDIR= sources/gnome-utils/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -19,26 +20,20 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 support utilities
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
-USE_REINPLACE= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
+INSTALLS_SHLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \
- libgnomeprintui gnomedesktop
-GNU_CONFIGURE= yes
+ 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
-GCONF_SCHEMAS= gdict.schemas gnome-screenshot.schemas \
+GCONF_SCHEMAS= gnome-dictionary.schemas gnome-screenshot.schemas \
gnome-search-tool.schemas logview.schemas
-post-extract:
- @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
- 's| $$||g'
-
-post-patch:
- @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
-
.include <bsd.port.mk>
diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
index eed200ddfee..4ac628f2212 100644
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/gnomeutils2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-utils-2.12.2.tar.bz2) = 71d615932e4ddf7182abeb734b8e370c
-SHA256 (gnome2/gnome-utils-2.12.2.tar.bz2) = be61efed2a5e78533d89ecb10339b72c2cc59d82de0422a7cc72c1ee3320c0de
-SIZE (gnome2/gnome-utils-2.12.2.tar.bz2) = 1726889
+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
diff --git a/deskutils/gnomeutils2/files/patch-configure b/deskutils/gnomeutils2/files/patch-configure
deleted file mode 100644
index d5d7d0e103f..00000000000
--- a/deskutils/gnomeutils2/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Mon Nov 25 09:25:29 2002
-+++ configure Tue Nov 26 16:04:42 2002
-@@ -10347,7 +10347,7 @@
-
-
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- _ACEOF
-
-
diff --git a/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c
index 03a974c23aa..9d1ee8c9c55 100644
--- a/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c
+++ b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c
@@ -1,10 +1,10 @@
---- gsearchtool/gsearchtool-support.c.orig Thu Dec 23 19:13:28 2004
-+++ gsearchtool/gsearchtool-support.c Thu Dec 23 19:13:38 2004
-@@ -30,6 +30,7 @@
- #endif
+--- gsearchtool/gsearchtool-support.c.orig Thu Jan 5 23:26:25 2006
++++ gsearchtool/gsearchtool-support.c Thu Jan 5 23:27:04 2006
+@@ -31,6 +31,7 @@
#include <glib/gi18n.h>
+ #include <glib/gdate.h>
+#include <sys/types.h>
#include <regex.h>
#include <gdk/gdkx.h>
- #include <bonobo-activation/bonobo-activation.h>
+ #include <libart_lgpl/art_rgb.h>
diff --git a/deskutils/gnomeutils2/files/patch-logview__logview.h b/deskutils/gnomeutils2/files/patch-logview__logview.h
new file mode 100644
index 00000000000..3cd50f68c4b
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview__logview.h
@@ -0,0 +1,10 @@
+--- 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/gnomeutils2/files/patch-logview_calendar.h b/deskutils/gnomeutils2/files/patch-logview_calendar.h
new file mode 100644
index 00000000000..3aefb999f00
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_calendar.h
@@ -0,0 +1,10 @@
+--- 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/gnomeutils2/files/patch-logview_desc_db.c b/deskutils/gnomeutils2/files/patch-logview_desc_db.c
deleted file mode 100644
index 5b687f492e8..00000000000
--- a/deskutils/gnomeutils2/files/patch-logview_desc_db.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- logview/desc_db.c.orig Wed Dec 1 16:45:13 2004
-+++ logview/desc_db.c Wed Dec 1 16:45:25 2004
-@@ -21,6 +21,7 @@
- #include <gtk/gtk.h>
- #include <glib/gi18n.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <regex.h>
- #include "logview.h"
- #include "desc_db.h"
diff --git a/deskutils/gnomeutils2/files/patch-logview_loglist.h b/deskutils/gnomeutils2/files/patch-logview_loglist.h
new file mode 100644
index 00000000000..149e04a59ab
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_loglist.h
@@ -0,0 +1,10 @@
+--- 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/gnomeutils2/files/patch-logview_logrtns.c b/deskutils/gnomeutils2/files/patch-logview_logrtns.c
new file mode 100644
index 00000000000..85333d2fe16
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_logrtns.c
@@ -0,0 +1,52 @@
+--- 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/gnomeutils2/files/patch-logview_logview-findbar.h b/deskutils/gnomeutils2/files/patch-logview_logview-findbar.h
new file mode 100644
index 00000000000..1e6acd101c0
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_logview-findbar.h
@@ -0,0 +1,10 @@
+--- 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/gnomeutils2/files/patch-logview_logview.c b/deskutils/gnomeutils2/files/patch-logview_logview.c
deleted file mode 100644
index 5dd057d1a77..00000000000
--- a/deskutils/gnomeutils2/files/patch-logview_logview.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- logview/logview.c.orig Tue Oct 4 12:31:47 2005
-+++ logview/logview.c Tue Oct 4 12:32:04 2005
-@@ -930,7 +930,7 @@
-
- if ( ! found) {
- g_snprintf (full_name, sizeof (full_name),
-- "%s/share/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX);
- if (access (full_name, R_OK) == 0) {
- found = TRUE;
- g_free (cfg->regexp_db_path);
-@@ -952,7 +952,7 @@
-
- if ( ! found) {
- g_snprintf (full_name, sizeof (full_name),
-- "%s/share/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX);
- if (access (full_name, R_OK) == 0) {
- found = TRUE;
- g_free (cfg->descript_db_path);
-@@ -983,7 +983,7 @@
-
- if ( ! found) {
- g_snprintf (full_name, sizeof (full_name),
-- "%s/share/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX);
-+ "%s/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX);
- if (access (full_name, R_OK) == 0) {
- found = TRUE;
- g_free (cfg->action_db_path);
diff --git a/deskutils/gnomeutils2/files/patch-logview_misc.c b/deskutils/gnomeutils2/files/patch-logview_misc.c
new file mode 100644
index 00000000000..1a0f54cfe5b
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_misc.c
@@ -0,0 +1,21 @@
+--- 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/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index 24ef4bd1cfd..51eef16fbc8 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/pkg-plist
@@ -3,119 +3,96 @@ bin/gnome-panel-screenshot
bin/gnome-screenshot
bin/gnome-search-tool
bin/gnome-system-log
-libdata/bonobo/servers/GNOME_GDictApplet.server
-libexec/gdict-applet
+include/gdict-1.0/gdict/gdict-client-context.h
+include/gdict-1.0/gdict/gdict-context.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-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
+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.devhelp
+share/doc/gdict/gdict.devhelp2
+share/doc/gdict/gdict.html
+share/doc/gdict/gdictui.html
+share/doc/gdict/home.png
+share/doc/gdict/index.html
+share/doc/gdict/index.sgml
+share/doc/gdict/introduction.html
+share/doc/gdict/left.png
+share/doc/gdict/right.png
+share/doc/gdict/sources-loader.html
+share/doc/gdict/sources.html
+share/doc/gdict/style.css
+share/doc/gdict/up.png
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/gnome-2.0/ui/GNOME_GDictApplet.xml
+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
+share/gnome/gnome-dictionary/gnome-dictionary-ui.xml
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/gnome-dictionary/C/figures/gdict_applet.png
-share/gnome/help/gnome-dictionary/C/figures/gdict_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
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-preferences-print.png
+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/ja/figures/gdict_applet.png
-share/gnome/help/gnome-dictionary/ja/figures/gdict_window.png
-share/gnome/help/gnome-dictionary/ja/gnome-dictionary.xml
-share/gnome/help/gnome-dictionary/ja/legal.xml
-share/gnome/help/gnome-dictionary/uk/figures/gdict_applet.png
-share/gnome/help/gnome-dictionary/uk/figures/gdict_window.png
-share/gnome/help/gnome-dictionary/uk/gnome-dictionary.xml
-share/gnome/help/gnome-dictionary/uk/legal.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
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-find.png
+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-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/es/legal.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/fr/legal.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/it/legal.xml
-share/gnome/help/gnome-search-tool/ja/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/ja/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/ja/legal.xml
-share/gnome/help/gnome-search-tool/ko/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/ko/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/ko/legal.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/sv/legal.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-search-tool/uk/legal.xml
-share/gnome/help/gnome-search-tool/zh_CN/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/zh_CN/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/zh_CN/legal.xml
-share/gnome/help/gnome-search-tool/zh_HK/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/zh_HK/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/zh_HK/legal.xml
-share/gnome/help/gnome-search-tool/zh_TW/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/zh_TW/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/zh_TW/legal.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/de/figures/syslog_window.png
-share/gnome/help/gnome-system-log/de/gnome-system-log.xml
-share/gnome/help/gnome-system-log/de/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/es/legal.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/fr/legal.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/it/legal.xml
-share/gnome/help/gnome-system-log/ja/figures/syslog_window.png
-share/gnome/help/gnome-system-log/ja/gnome-system-log.xml
-share/gnome/help/gnome-system-log/ja/legal.xml
-share/gnome/help/gnome-system-log/ko/figures/syslog_window.png
-share/gnome/help/gnome-system-log/ko/gnome-system-log.xml
-share/gnome/help/gnome-system-log/ko/legal.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/sv/legal.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/help/gnome-system-log/uk/legal.xml
-share/gnome/help/gnome-system-log/zh_CN/figures/syslog_window.png
-share/gnome/help/gnome-system-log/zh_CN/gnome-system-log.xml
-share/gnome/help/gnome-system-log/zh_CN/legal.xml
-share/gnome/help/gnome-system-log/zh_TW/figures/syslog_window.png
-share/gnome/help/gnome-system-log/zh_TW/gnome-system-log.xml
-share/gnome/help/gnome-system-log/zh_TW/legal.xml
-share/gnome/omf/gnome-utils/gnome-dictionary-C.omf
-share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf
-share/gnome/omf/gnome-utils/gnome-dictionary-uk.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-C.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-es.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-it.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-ja.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-ko.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-uk.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf
-share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf
-share/gnome/omf/gnome-utils/gnome-system-log-C.omf
-share/gnome/omf/gnome-utils/gnome-system-log-de.omf
-share/gnome/omf/gnome-utils/gnome-system-log-es.omf
-share/gnome/omf/gnome-utils/gnome-system-log-fr.omf
-share/gnome/omf/gnome-utils/gnome-system-log-it.omf
-share/gnome/omf/gnome-utils/gnome-system-log-ja.omf
-share/gnome/omf/gnome-utils/gnome-system-log-ko.omf
-share/gnome/omf/gnome-utils/gnome-system-log-sv.omf
-share/gnome/omf/gnome-utils/gnome-system-log-uk.omf
-share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf
-share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-C.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-es.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-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/pixmaps/gsearchtool/thumbnail_frame.png
share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
@@ -149,6 +126,7 @@ 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/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/mk/LC_MESSAGES/gnome-utils-2.0.mo
@@ -181,62 +159,39 @@ share/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo
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-utils
-@dirrm share/gnome/help/gnome-system-log/zh_TW/figures
-@dirrm share/gnome/help/gnome-system-log/zh_TW
-@dirrm share/gnome/help/gnome-system-log/zh_CN/figures
-@dirrm share/gnome/help/gnome-system-log/zh_CN
-@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/ko/figures
-@dirrm share/gnome/help/gnome-system-log/ko
-@dirrm share/gnome/help/gnome-system-log/ja/figures
-@dirrm share/gnome/help/gnome-system-log/ja
-@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/omf/gnome-system-log
+@dirrm share/gnome/omf/gnome-search-tool
+@dirrm share/gnome/omf/gnome-dictionary
@dirrm share/gnome/help/gnome-system-log/es/figures
@dirrm share/gnome/help/gnome-system-log/es
-@dirrm share/gnome/help/gnome-system-log/de/figures
-@dirrm share/gnome/help/gnome-system-log/de
@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/zh_TW/figures
-@dirrm share/gnome/help/gnome-search-tool/zh_TW
-@dirrm share/gnome/help/gnome-search-tool/zh_HK/figures
-@dirrm share/gnome/help/gnome-search-tool/zh_HK
-@dirrm share/gnome/help/gnome-search-tool/zh_CN/figures
-@dirrm share/gnome/help/gnome-search-tool/zh_CN
-@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/ko/figures
-@dirrm share/gnome/help/gnome-search-tool/ko
-@dirrm share/gnome/help/gnome-search-tool/ja/figures
-@dirrm share/gnome/help/gnome-search-tool/ja
@dirrm share/gnome/help/gnome-search-tool/it/figures
@dirrm share/gnome/help/gnome-search-tool/it
-@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/ja/figures
-@dirrm share/gnome/help/gnome-dictionary/ja
+@dirrm share/gnome/help/gnome-dictionary/es/figures
+@dirrm share/gnome/help/gnome-dictionary/es
@dirrm share/gnome/help/gnome-dictionary/C/figures
@dirrm share/gnome/help/gnome-dictionary/C
@dirrm share/gnome/help/gnome-dictionary
@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/doc/gdict
+@dirrm include/gdict-1.0/gdict
+@dirrm include/gdict-1.0
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 418b9366511..17d656f8bb1 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gucharmap/Makefile,v 1.12 2005/10/29 22:31:15 marcus Exp $
+# $MCom: ports/deskutils/gucharmap/Makefile,v 1.24 2006/04/13 07:52:31 bland Exp $
#
PORTNAME= gucharmap
-PORTVERSION= 1.4.4
-PORTREVISION= 3
+PORTVERSION= 1.6.0
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -22,6 +21,7 @@ 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_GMAKE= yes
USE_GNOME= gnomeprefix intlhack gnomehack gtk20 gnomedocutils
@@ -29,6 +29,7 @@ WANT_GNOME= yes
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
INSTALLS_SHLIB= 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 a54d6076786..d5508f6a1ed 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gucharmap-1.4.4.tar.bz2) = c9741329d08908a271864664c3f2e91c
-SHA256 (gnome2/gucharmap-1.4.4.tar.bz2) = 17a1776d1f9b3c481601fc7b33cee38665c384b07b0b3224ae91e7c0c6ba6e23
-SIZE (gnome2/gucharmap-1.4.4.tar.bz2) = 1450271
+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
diff --git a/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c b/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c
deleted file mode 100644
index c0abeb26237..00000000000
--- a/deskutils/gucharmap/files/patch-gucharmap_gucharmap-window.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- gucharmap/gucharmap-window.c.orig Mon Jan 24 05:56:53 2005
-+++ gucharmap/gucharmap-window.c Sat Sep 17 04:04:07 2005
-@@ -82,6 +82,8 @@
- ChaptersMode chapters_mode;
- };
-
-+static GtkWindowClass *parent_class = NULL;
-+
- static void
- status_message (GtkWidget *widget,
- const gchar *message,
-@@ -417,8 +419,8 @@
- {
- GucharmapWindowPrivate *priv = GUCHARMAP_WINDOW_GET_PRIVATE (guw);
- gucharmap_charmap_set_chapters (guw->charmap, GUCHARMAP_CHAPTERS (gucharmap_script_chapters_new ()));
-- gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->next_chapter_menu_item))), _("Next Script"));;
-- gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->prev_chapter_menu_item))), _("Previous Script"));;
-+ gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->next_chapter_menu_item))), _("Next Script"));
-+ gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->prev_chapter_menu_item))), _("Previous Script"));
- }
- }
-
-@@ -430,8 +432,8 @@
- {
- GucharmapWindowPrivate *priv = GUCHARMAP_WINDOW_GET_PRIVATE (guw);
- gucharmap_charmap_set_chapters (guw->charmap, GUCHARMAP_CHAPTERS (gucharmap_block_chapters_new ()));
-- gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->next_chapter_menu_item))), _("Next Block"));;
-- gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->prev_chapter_menu_item))), _("Previous Block"));;
-+ gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->next_chapter_menu_item))), _("Next Block"));
-+ gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->prev_chapter_menu_item))), _("Previous Block"));
- }
- }
-
-@@ -834,12 +836,12 @@
- g_signal_connect (priv->status, "realize", G_CALLBACK (status_realize), guw);
-
- priv->progress = gtk_progress_bar_new ();
-- gtk_box_pack_start (GTK_BOX (hbox), priv->progress, FALSE, FALSE, 0);;
-+ gtk_box_pack_start (GTK_BOX (hbox), priv->progress, FALSE, FALSE, 0);
-
- #if 0
- grip = gtk_statusbar_new ();
- gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (grip), TRUE);
-- gtk_box_pack_start (GTK_BOX (hbox), grip, FALSE, FALSE, 0);;
-+ gtk_box_pack_start (GTK_BOX (hbox), grip, FALSE, FALSE, 0);
- #endif
- gtk_widget_show_all (hbox);
-
-@@ -886,11 +888,13 @@
- g_free (priv->last_search);
- */
- #endif
-+ G_OBJECT_CLASS (parent_class)->finalize (object);
- }
-
- static void
- gucharmap_window_class_init (GucharmapWindowClass *clazz)
- {
-+ parent_class = g_type_class_peek_parent (clazz);
- GTK_WIDGET_CLASS (clazz)->show_all = show_all;
- G_OBJECT_CLASS (clazz)->finalize = window_finalize;
- g_type_class_add_private (clazz, sizeof (GucharmapWindowPrivate));
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
index 69c6052950f..a8039b55ab8 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -18,14 +18,22 @@ lib/libgucharmap.so
lib/libgucharmap.so.4
libdata/pkgconfig/gucharmap.pc
share/gnome/applications/gucharmap.desktop
+share/gnome/help/gucharmap/C/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/C/figures/gucharmap_window.png
share/gnome/help/gucharmap/C/gucharmap.xml
share/gnome/help/gucharmap/C/legal.xml
+share/gnome/help/gucharmap/bg/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/bg/figures/gucharmap_window.png
+share/gnome/help/gucharmap/bg/gucharmap.xml
share/gnome/help/gucharmap/de/figures/gucharmap_window.png
share/gnome/help/gucharmap/de/gucharmap.xml
share/gnome/help/gucharmap/de/legal.xml
+share/gnome/help/gucharmap/es/figures/gucharmap_start_window.png
share/gnome/help/gucharmap/es/figures/gucharmap_window.png
share/gnome/help/gucharmap/es/gucharmap.xml
-share/gnome/help/gucharmap/es/legal.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_window.png
share/gnome/help/gucharmap/fr/gucharmap.xml
share/gnome/help/gucharmap/fr/legal.xml
@@ -48,8 +56,10 @@ share/gnome/help/gucharmap/zh_TW/figures/gucharmap_window.png
share/gnome/help/gucharmap/zh_TW/gucharmap.xml
share/gnome/help/gucharmap/zh_TW/legal.xml
share/gnome/omf/gucharmap/gucharmap-C.omf
+share/gnome/omf/gucharmap/gucharmap-bg.omf
share/gnome/omf/gucharmap/gucharmap-de.omf
share/gnome/omf/gucharmap/gucharmap-es.omf
+share/gnome/omf/gucharmap/gucharmap-fi.omf
share/gnome/omf/gucharmap/gucharmap-fr.omf
share/gnome/omf/gucharmap/gucharmap-it.omf
share/gnome/omf/gucharmap/gucharmap-ja.omf
@@ -57,7 +67,7 @@ share/gnome/omf/gucharmap/gucharmap-ko.omf
share/gnome/omf/gucharmap/gucharmap-sv.omf
share/gnome/omf/gucharmap/gucharmap-zh_CN.omf
share/gnome/omf/gucharmap/gucharmap-zh_TW.omf
-share/gnome/pixmaps/gucharmap.png
+share/icons/hicolor/48x48/apps/gucharmap.png
share/locale/am/LC_MESSAGES/gucharmap.mo
share/locale/ar/LC_MESSAGES/gucharmap.mo
share/locale/az/LC_MESSAGES/gucharmap.mo
@@ -76,6 +86,7 @@ share/locale/en_GB/LC_MESSAGES/gucharmap.mo
share/locale/eo/LC_MESSAGES/gucharmap.mo
share/locale/es/LC_MESSAGES/gucharmap.mo
share/locale/et/LC_MESSAGES/gucharmap.mo
+share/locale/eu/LC_MESSAGES/gucharmap.mo
share/locale/fa/LC_MESSAGES/gucharmap.mo
share/locale/fi/LC_MESSAGES/gucharmap.mo
share/locale/fr/LC_MESSAGES/gucharmap.mo
@@ -121,7 +132,10 @@ share/locale/vi/LC_MESSAGES/gucharmap.mo
share/locale/wa/LC_MESSAGES/gucharmap.mo
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
@@ -137,10 +151,15 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
@dirrm share/gnome/help/gucharmap/it
@dirrm share/gnome/help/gucharmap/fr/figures
@dirrm share/gnome/help/gucharmap/fr
+@dirrm share/gnome/help/gucharmap/fi/figures
+@dirrm share/gnome/help/gucharmap/fi
@dirrm share/gnome/help/gucharmap/es/figures
@dirrm share/gnome/help/gucharmap/es
@dirrm share/gnome/help/gucharmap/de/figures
@dirrm share/gnome/help/gucharmap/de
+@dirrm share/gnome/help/gucharmap/bg/figures
+@dirrm share/gnome/help/gucharmap/bg
+@dirrm share/gnome/help/gucharmap/C/figures
@dirrm share/gnome/help/gucharmap/C
@dirrm share/gnome/help/gucharmap
@dirrm include/gucharmap
diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index 1169c59c782..b5b857e6b9c 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -3,14 +3,14 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.2 2006/02/24 05:52:41 marcus Exp $
PORTNAME= nautilus-sendto
-PORTVERSION= 0.4
-PORTREVISION= 2
+PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/nautilus-sendto/0.4
+MASTER_SITE_SUBDIR= sources/nautilus-sendto/0.5
MAINTAINER= gnome@FreeBSD.org
COMMENT= Integration between nautilus, evolution, and gaim
diff --git a/deskutils/nautilus-sendto/distinfo b/deskutils/nautilus-sendto/distinfo
index b959463871a..2b285a5ea4b 100644
--- a/deskutils/nautilus-sendto/distinfo
+++ b/deskutils/nautilus-sendto/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-sendto-0.4.tar.bz2) = 2b8bff75d6cda7b1648d59dde6e4e3b2
-SHA256 (nautilus-sendto-0.4.tar.bz2) = 2454d21fd5fc63009903bbdf6ef50bbfb30c0535feaee3d89318dee71c1d1d7b
-SIZE (nautilus-sendto-0.4.tar.bz2) = 257301
+MD5 (nautilus-sendto-0.5.tar.bz2) = e43a5e51270ef3e0f4743ed4d23f7409
+SHA256 (nautilus-sendto-0.5.tar.bz2) = 63709f0b8dc4c8006c9aa792b2898c3e956cb457b1c49e9e552d2fd1c4df7d38
+SIZE (nautilus-sendto-0.5.tar.bz2) = 268518
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 3059e25cae0..fa9264c1ccc 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -3,14 +3,14 @@
# Whom: Chia-liang Kao <clkao@CirX.ORG>
#
# $FreeBSD$
+# $MCom: ports/devel/ORBit2/Makefile,v 1.50 2006/04/13 07:52:31 bland Exp $
#
PORTNAME= ORBit2
-PORTVERSION= 2.12.5
-PORTREVISION= 2
+PORTVERSION= 2.14.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -21,8 +21,8 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_BZIP2= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
-USE_GNOME= gnomehack libidl
+USE_AUTOTOOLS= libtool:15
+USE_GNOME= gnomehack libidl ltverhack
CONFIGURE_ARGS= --disable-indent \
--with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index 559037724ae..91e91a657ea 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/ORBit2-2.12.5.tar.bz2) = cc52f71d974043414afea44c78e6d705
-SHA256 (gnome2/ORBit2-2.12.5.tar.bz2) = dc6d9c22875b178ed26103b445e6c937a7120225de581ca56d3865c069722591
-SIZE (gnome2/ORBit2-2.12.5.tar.bz2) = 685516
+MD5 (gnome2/ORBit2-2.14.0.tar.bz2) = bb1b4859522cb6e1a3a3dc4b7397db64
+SHA256 (gnome2/ORBit2-2.14.0.tar.bz2) = 412e4880d79533a2bbd33757e031a2bee24a7bc771f22cf4fed3cb81790b1b68
+SIZE (gnome2/ORBit2-2.14.0.tar.bz2) = 704207
diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab
index e58bbe31895..a423955e29e 100644
--- a/devel/ORBit2/files/patch-ab
+++ b/devel/ORBit2/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.in.orig Fri Mar 5 23:34:38 2004
-+++ Makefile.in Fri Mar 5 23:35:59 2004
-@@ -125,7 +125,7 @@
-
+--- Makefile.in.orig Tue Mar 14 17:52:25 2006
++++ Makefile.in Tue Mar 14 17:52:45 2006
+@@ -250,7 +250,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = 1.3
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
-
-SUBDIRS = linc2 src include test docs
+SUBDIRS = linc2 src include docs
-
bin_SCRIPTS = orbit2-config
-
+ EXTRA_DIST = \
+ ORBit2.m4 \
diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist
index e859e29b960..8de5ef0a24c 100644
--- a/devel/ORBit2/pkg-plist
+++ b/devel/ORBit2/pkg-plist
@@ -70,6 +70,7 @@ share/aclocal/ORBit2.m4
%%DOCSDIR%%/ORBit2-orbit2-allocators.html
%%DOCSDIR%%/ORBit2-orbit2-small.html
%%DOCSDIR%%/ORBit2.devhelp
+%%DOCSDIR%%/ORBit2.devhelp2
%%DOCSDIR%%/general.html
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
@@ -79,10 +80,10 @@ share/aclocal/ORBit2.m4
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
share/idl/orbit-2.0/CosNaming.idl
-@dirrm %%DOCSDIR%%
@dirrm share/idl/orbit-2.0
@exec /bin/mkdir -p %D/lib/orbit-2.0/idl-backends
@dirrmtry share/idl
+@dirrm %%DOCSDIR%%
@dirrmtry lib/orbit-2.0/idl-backends
@dirrmtry lib/orbit-2.0
@dirrm include/orbit-2.0/orbit/util
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 089ee5c0cb8..10e9f77a0e5 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/bugbuddy/Makefile,v 1.19 2005/10/01 04:41:05 ahze Exp $
+# $MCom: ports/devel/bugbuddy/Makefile,v 1.29 2006/04/13 07:52:31 bland Exp $
#
PORTNAME= bugbuddy
-PORTVERSION= 2.12.1
+PORTVERSION= 2.14.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/bug-buddy/2.12
+MASTER_SITE_SUBDIR= sources/bug-buddy/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= bug-buddy-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -18,9 +18,9 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A bug reporting tool for GNOME 2
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
-USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index 8330a32218d..4e73e147c58 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/bug-buddy-2.12.1.tar.bz2) = 2f8b52ad25891e7c99820c80e7c6d78d
-SHA256 (gnome2/bug-buddy-2.12.1.tar.bz2) = 596748b154a1db3f622c5a31a9c1734426bb90e88e48ff992cb5f39e9deb7108
-SIZE (gnome2/bug-buddy-2.12.1.tar.bz2) = 555641
+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
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index 06832c1205c..5a032cc2123 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -21,12 +21,14 @@ 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/locale/am/LC_MESSAGES/bug-buddy.mo
share/locale/ar/LC_MESSAGES/bug-buddy.mo
@@ -61,6 +63,8 @@ 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/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/mk/LC_MESSAGES/bug-buddy.mo
@@ -96,6 +100,7 @@ share/locale/vi/LC_MESSAGES/bug-buddy.mo
share/locale/wa/LC_MESSAGES/bug-buddy.mo
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
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
@@ -105,7 +110,10 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
@dirrmtry share/locale/rw
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
@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
diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
index 089ee5c0cb8..10e9f77a0e5 100644
--- a/devel/bugbuddy/Makefile
+++ b/devel/bugbuddy/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/bugbuddy/Makefile,v 1.19 2005/10/01 04:41:05 ahze Exp $
+# $MCom: ports/devel/bugbuddy/Makefile,v 1.29 2006/04/13 07:52:31 bland Exp $
#
PORTNAME= bugbuddy
-PORTVERSION= 2.12.1
+PORTVERSION= 2.14.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/bug-buddy/2.12
+MASTER_SITE_SUBDIR= sources/bug-buddy/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= bug-buddy-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -18,9 +18,9 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A bug reporting tool for GNOME 2
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
-USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \
diff --git a/devel/bugbuddy/distinfo b/devel/bugbuddy/distinfo
index 8330a32218d..4e73e147c58 100644
--- a/devel/bugbuddy/distinfo
+++ b/devel/bugbuddy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/bug-buddy-2.12.1.tar.bz2) = 2f8b52ad25891e7c99820c80e7c6d78d
-SHA256 (gnome2/bug-buddy-2.12.1.tar.bz2) = 596748b154a1db3f622c5a31a9c1734426bb90e88e48ff992cb5f39e9deb7108
-SIZE (gnome2/bug-buddy-2.12.1.tar.bz2) = 555641
+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
diff --git a/devel/bugbuddy/pkg-plist b/devel/bugbuddy/pkg-plist
index 06832c1205c..5a032cc2123 100644
--- a/devel/bugbuddy/pkg-plist
+++ b/devel/bugbuddy/pkg-plist
@@ -21,12 +21,14 @@ 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/locale/am/LC_MESSAGES/bug-buddy.mo
share/locale/ar/LC_MESSAGES/bug-buddy.mo
@@ -61,6 +63,8 @@ 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/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/mk/LC_MESSAGES/bug-buddy.mo
@@ -96,6 +100,7 @@ share/locale/vi/LC_MESSAGES/bug-buddy.mo
share/locale/wa/LC_MESSAGES/bug-buddy.mo
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
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
@@ -105,7 +110,10 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
@dirrmtry share/locale/rw
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
@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
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index f13b83e6c1b..f1c3969a521 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -3,15 +3,14 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gconf2/Makefile,v 1.62 2005/11/03 18:43:02 mezz Exp $
+# $MCom: ports/devel/gconf2/Makefile,v 1.72 2006/04/13 07:52:32 bland Exp $
#
PORTNAME= gconf2
-PORTVERSION= 2.12.1
-PORTREVISION= 1
+PORTVERSION= 2.14.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/GConf/2.12
+MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= GConf-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -20,6 +19,7 @@ COMMENT= A configuration database system for GNOME
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc ltverhack
INSTALLS_SHLIB= yes
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index 7c5f6943fb7..5bc575714c7 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/GConf-2.12.1.tar.bz2) = 247110de013ed24b17cf4191eb6daec5
-SHA256 (gnome2/GConf-2.12.1.tar.bz2) = 2e3c72ecc66348be6edecfbb2e424adc8d4e5a4afb92443e98cd2e50de7cf68e
-SIZE (gnome2/GConf-2.12.1.tar.bz2) = 1945241
+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
diff --git a/devel/gconf2/files/patch-gconf_gconf-listeners.c b/devel/gconf2/files/patch-gconf_gconf-listeners.c
deleted file mode 100644
index 9b08a72d295..00000000000
--- a/devel/gconf2/files/patch-gconf_gconf-listeners.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- gconf/gconf-listeners.c.orig Sun Nov 6 11:08:58 2005
-+++ gconf/gconf-listeners.c Sun Nov 6 11:09:05 2005
-@@ -366,8 +366,8 @@
-
- while (across != NULL)
- {
-- lte = across->data;
- int cmp;
-+ lte = across->data;
-
- cmp = strcmp(lte->name, dirnames[i]);
-
-
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 22363c351e7..566b5bfd71e 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -79,6 +79,7 @@ share/locale/hi/LC_MESSAGES/GConf2.mo
share/locale/hr/LC_MESSAGES/GConf2.mo
share/locale/hu/LC_MESSAGES/GConf2.mo
share/locale/id/LC_MESSAGES/GConf2.mo
+share/locale/is/LC_MESSAGES/GConf2.mo
share/locale/it/LC_MESSAGES/GConf2.mo
share/locale/ja/LC_MESSAGES/GConf2.mo
share/locale/ko/LC_MESSAGES/GConf2.mo
@@ -115,9 +116,12 @@ share/locale/vi/LC_MESSAGES/GConf2.mo
share/locale/xh/LC_MESSAGES/GConf2.mo
share/locale/yi/LC_MESSAGES/GConf2.mo
share/locale/zh_CN/LC_MESSAGES/GConf2.mo
+share/locale/zh_HK/LC_MESSAGES/GConf2.mo
share/locale/zh_TW/LC_MESSAGES/GConf2.mo
share/sgml/gconf/gconf-1.0.dtd
@dirrm share/sgml/gconf
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrm share/doc/gconf
@@ -127,4 +131,4 @@ share/sgml/gconf/gconf-1.0.dtd
@dirrm include/gconf/2/gconf
@dirrm include/gconf/2
@dirrm etc/gconf/2
-@unexec /bin/rmdir %D/share/sgml 2>/dev/null || /usr/bin/true
+@dirrmtry share/sgml
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index ae1d57fd10b..ac3eae4eccb 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -3,15 +3,14 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/devel/gconfmm26/Makefile,v 1.7 2005/10/29 22:31:16 marcus Exp $
+# $MCom: ports/devel/gconfmm26/Makefile,v 1.10 2006/04/13 07:52:32 bland Exp $
#
PORTNAME= gconfmm
-PORTVERSION= 2.12.0
-PORTREVISION= 1
+PORTVERSION= 2.14.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= bland@FreeBSD.org
diff --git a/devel/gconfmm26/distinfo b/devel/gconfmm26/distinfo
index 53632d6623b..d0114d7ce09 100644
--- a/devel/gconfmm26/distinfo
+++ b/devel/gconfmm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconfmm-2.12.0.tar.bz2) = dfd62a95e7675943933b793183649402
-SHA256 (gnome2/gconfmm-2.12.0.tar.bz2) = f6ddd48a01e28d34f0cb3a20cc03ddf79fa04bf696ab933a16911d28eabaedc5
-SIZE (gnome2/gconfmm-2.12.0.tar.bz2) = 264170
+MD5 (gnome2/gconfmm-2.14.0.tar.bz2) = 27b4703412c582ae9e6383de7c7ead6b
+SHA256 (gnome2/gconfmm-2.14.0.tar.bz2) = 5c88ffa2b9a168155765d970c2ca6c56d182af54c4cb7a50c48afddedbb3073a
+SIZE (gnome2/gconfmm-2.14.0.tar.bz2) = 268566
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 0898bbe4d46..250f869ec47 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,20 +3,19 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glib20/Makefile,v 1.55 2005/10/03 17:39:56 mezz Exp $
+# $MCom: ports/devel/glib20/Makefile,v 1.75 2006/04/13 07:57:40 bland Exp $
#
PORTNAME= glib
-PORTVERSION= 2.8.6
-PORTREVISION= 1
+PORTVERSION= 2.10.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.8,} \
- ftp://ftp.gtk.org/pub/gtk/v2.8/ \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.10,} \
+ ftp://ftp.gtk.org/pub/gtk/v${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%/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R}
+MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -27,7 +26,6 @@ LATEST_LINK= glib20
USE_BZIP2= yes
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool:15
-USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gnometarget pkgconfig ltverhack
USE_GMAKE= yes
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 91f5d3c04c0..30f93eebafe 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.8.6.tar.bz2) = fce6835fd8c99ab4c3e5213bc5bcd0ed
-SHA256 (gnome2/glib-2.8.6.tar.bz2) = e2da2eec8c87dccdbce16dcd77489d225b613074764f2f39f2815db15b5deeea
-SIZE (gnome2/glib-2.8.6.tar.bz2) = 2691171
+MD5 (gnome2/glib-2.10.2.tar.bz2) = 718961161ee1692c216a2d542196a04a
+SHA256 (gnome2/glib-2.10.2.tar.bz2) = 0e30917c2f916de991195db16d8db22298064e876e1a4a965d5ee43bea3d2144
+SIZE (gnome2/glib-2.10.2.tar.bz2) = 2784594
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 89850e10217..46738f939e1 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig Fri Apr 30 09:05:01 2004
-+++ configure Tue May 4 12:52:56 2004
-@@ -31818,6 +31819,8 @@
+--- configure.orig Sun Jan 29 13:06:22 2006
++++ configure Sun Jan 29 13:06:48 2006
+@@ -34462,6 +34461,8 @@
;;
esac
fi
diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c
index d3c7dc6bf2d..cf1338425a1 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.14 2005/06/28 05:40:00 adamw Exp $
+ $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.16 2005/12/15 00:18:44 marcus 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/pkg-plist b/devel/glib20/pkg-plist
index f4e699f1f6d..aa6628f4ee7 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -42,6 +42,7 @@ include/glib-2.0/glib/grand.h
include/glib-2.0/glib/grel.h
include/glib-2.0/glib/gscanner.h
include/glib-2.0/glib/gshell.h
+include/glib-2.0/glib/gslice.h
include/glib-2.0/glib/gslist.h
include/glib-2.0/glib/gspawn.h
include/glib-2.0/glib/gstdio.h
@@ -112,6 +113,7 @@ share/locale/cs/LC_MESSAGES/glib20.mo
share/locale/cy/LC_MESSAGES/glib20.mo
share/locale/da/LC_MESSAGES/glib20.mo
share/locale/de/LC_MESSAGES/glib20.mo
+share/locale/dz/LC_MESSAGES/glib20.mo
share/locale/el/LC_MESSAGES/glib20.mo
share/locale/en_CA/LC_MESSAGES/glib20.mo
share/locale/en_GB/LC_MESSAGES/glib20.mo
@@ -133,7 +135,9 @@ share/locale/id/LC_MESSAGES/glib20.mo
share/locale/is/LC_MESSAGES/glib20.mo
share/locale/it/LC_MESSAGES/glib20.mo
share/locale/ja/LC_MESSAGES/glib20.mo
+share/locale/ka/LC_MESSAGES/glib20.mo
share/locale/ko/LC_MESSAGES/glib20.mo
+share/locale/ku/LC_MESSAGES/glib20.mo
share/locale/lt/LC_MESSAGES/glib20.mo
share/locale/lv/LC_MESSAGES/glib20.mo
share/locale/mk/LC_MESSAGES/glib20.mo
@@ -165,6 +169,7 @@ share/locale/te/LC_MESSAGES/glib20.mo
share/locale/th/LC_MESSAGES/glib20.mo
share/locale/tl/LC_MESSAGES/glib20.mo
share/locale/tr/LC_MESSAGES/glib20.mo
+share/locale/tt/LC_MESSAGES/glib20.mo
share/locale/uk/LC_MESSAGES/glib20.mo
share/locale/vi/LC_MESSAGES/glib20.mo
share/locale/wa/LC_MESSAGES/glib20.mo
@@ -173,12 +178,18 @@ 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
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index c0bbb145f7e..497fbb839b4 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,14 +3,14 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/devel/glibmm/Makefile,v 1.1 2006/03/08 14:38:06 marcus Exp $
+# $MCom: ports/devel/glibmm/Makefile,v 1.31 2006/04/14 21:55:21 mezz Exp $
#
PORTNAME= glibmm
-PORTVERSION= 2.8.6
+PORTVERSION= 2.10.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -23,7 +23,6 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GCC= 3.4
USE_GNOME= gnomehack gnometarget glib20
-USE_REINPLACE= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index df2d47a8388..1cdf128f8ec 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glibmm-2.8.6.tar.bz2) = e5747f4216a80d29f647ad1c05090146
-SHA256 (gnome2/glibmm-2.8.6.tar.bz2) = 26864501770a3ec291c2b4e19c4305dc1634aeb63d85e72cc2021020b9a0c5c1
-SIZE (gnome2/glibmm-2.8.6.tar.bz2) = 2378213
+MD5 (gnome2/glibmm-2.10.1.tar.bz2) = 3af9f4f3dbec200545f1eb21a678706d
+SHA256 (gnome2/glibmm-2.10.1.tar.bz2) = 5e401a2dd369c50c058e6023a2b071d4086328e1930af193e937b91e86859659
+SIZE (gnome2/glibmm-2.10.1.tar.bz2) = 2383901
diff --git a/devel/glibmm/files/patch-glib_glibmm_date.cc b/devel/glibmm/files/patch-glib_glibmm_date.cc
new file mode 100644
index 00000000000..bac31b4c991
--- /dev/null
+++ b/devel/glibmm/files/patch-glib_glibmm_date.cc
@@ -0,0 +1,17 @@
+--- glib/glibmm/date.cc.orig Mon Feb 6 00:50:58 2006
++++ glib/glibmm/date.cc Mon Feb 6 00:51:32 2006
+@@ -72,12 +72,14 @@ void Date::set_parse(const Glib::ustring
+ }
+
+ #ifndef GLIBMM_DISABLE_DEPRECATED
++#if GLIB_SIZEOF_LONG != 4 && !defined(__alpha__)
+
+ void Date::set_time(GTime time)
+ {
+ //This method, and the C function that it wraps, are deprecated.
+ g_date_set_time(&gobject_, time);
+ }
++#endif
+ #endif // GLIBMM_DISABLE_DEPRECATED
+
+
diff --git a/devel/glibmm/files/patch-glib_glibmm_date.h b/devel/glibmm/files/patch-glib_glibmm_date.h
new file mode 100644
index 00000000000..0d249931c1d
--- /dev/null
+++ b/devel/glibmm/files/patch-glib_glibmm_date.h
@@ -0,0 +1,18 @@
+--- glib/glibmm/date.h.orig Mon Feb 6 00:51:03 2006
++++ glib/glibmm/date.h Mon Feb 6 00:52:08 2006
+@@ -120,6 +120,7 @@ enum DMY
+ void set_parse (const Glib::ustring& str);
+
+ #ifndef GLIBMM_DISABLE_DEPRECATED
++#if GLIB_SIZEOF_LONG != 4 && !defined(__alpha__)
+
+ /** Sets the value of a date from a GTime (time_t) value.
+ *
+@@ -128,6 +129,7 @@ enum DMY
+ * @deprecated Please use set_time(time_t) or set_time(const GTimeVal&).
+ */
+ void set_time(GTime time);
++#endif
+ #endif // GLIBMM_DISABLE_DEPRECATED
+
+
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index 25dc9e0cbf2..0916b1d62b2 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -133,7 +133,6 @@ share/aclocal/glibmm_check_perl.m4
%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Cond-members.html
%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Cond.html
%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Container__Helpers_1_1ArrayHandleIterator.html
-%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Container__Helpers_1_1ListHandleIterator-members.html
%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Container__Helpers_1_1ListHandleIterator.html
%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Container__Helpers_1_1SListHandleIterator.html
%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/classGlib_1_1ConvertError-members.html
@@ -427,6 +426,7 @@ share/aclocal/glibmm_check_perl.m4
%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/convert_8h.html
%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/date_8h.html
%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/debug_8h.html
+%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/deprecated.html
%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/dispatcher_8h.html
%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/doxygen.css
%%PORTDOCS%%share/doc/glibmm-%%API_VERSION%%/docs/reference/html/doxygen.png
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index c34da1d3dd4..db99d72416d 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,15 +3,14 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnomevfs2/Makefile,v 1.115 2005/10/31 00:12:01 marcus Exp $
+# $MCom: ports/devel/gnomevfs2/Makefile,v 1.137 2006/04/20 14:00:03 marcus Exp $
#
PORTNAME= gnomevfs2
-PORTVERSION= 2.12.2
-PORTREVISION= 2
+PORTVERSION= 2.14.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-vfs/2.12
+MASTER_SITE_SUBDIR= sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -22,15 +21,16 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
libbonobo ltverhack
-USE_REINPLACE= yes
USE_AUTOTOOLS= libtool:15
USE_OPENSSL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-openssl \
- --disable-gnutls
+ --disable-gnutls \
+ --disable-howl
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
@@ -40,8 +40,7 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
GCONF_SCHEMAS= desktop_default_applications.schemas \
desktop_gnome_url_handlers.schemas system_dns_sd.schemas \
- system_http_proxy.schemas system_smb.schemas \
- system_storage.schemas
+ system_http_proxy.schemas system_smb.schemas
OPTIONS= SAMBA "Enable SMB volume support" on \
MDNS "Enable Bonjour/Rendezvous support" on
@@ -65,9 +64,9 @@ CONFIGURE_ARGS+=--disable-samba
.endif
.if !defined(WITHOUT_MDNS)
-LIB_DEPENDS+= howl:${PORTSDIR}/net/howl
+LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi
.else
-CONFIGURE_ARGS+=--disable-howl
+CONFIGURE_ARGS+=--disable-avahi
.endif
post-patch:
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 52b0d0baf26..da121ec287a 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.12.2.tar.bz2) = 4d7b9c14af29a9bf813ab4831eeeacbb
-SHA256 (gnome2/gnome-vfs-2.12.2.tar.bz2) = 46f80ead7c52a8c5a3fa7beac2d42385c6bc9552fa28aa5068e1a251d708e177
-SIZE (gnome2/gnome-vfs-2.12.2.tar.bz2) = 1558218
+MD5 (gnome2/gnome-vfs-2.14.1.tar.bz2) = d7ba7e667b46b5929b3e277a8b870868
+SHA256 (gnome2/gnome-vfs-2.14.1.tar.bz2) = cdcef326c3bacd89bf40551932f6b8e2c04bee4ebf3afc1633032af04a7631bf
+SIZE (gnome2/gnome-vfs-2.14.1.tar.bz2) = 1813793
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index 0f976d16a46..4b5c0cfaea3 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Wed Oct 5 10:56:02 2005
-+++ configure Mon Nov 28 13:34:48 2005
-@@ -23119,6 +23119,8 @@
+--- configure.orig Mon Nov 14 11:43:13 2005
++++ configure Mon Nov 28 13:52:39 2005
+@@ -23123,6 +23123,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
-@@ -23201,6 +23203,7 @@
+@@ -23205,6 +23207,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
-@@ -24292,6 +24295,7 @@
+@@ -24296,6 +24299,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
-@@ -33558,7 +33562,7 @@
+@@ -33559,7 +33563,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -34,7 +34,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36964,6 +36968,9 @@
+@@ -37107,6 +37111,9 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44,7 +44,7 @@
#include <sys/statfs.h>
#include <sys/fstyp.h>
_ACEOF
-@@ -37005,6 +37012,9 @@
+@@ -37148,6 +37155,9 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -54,7 +54,7 @@
#include <sys/statfs.h>
#include <sys/vmount.h>
_ACEOF
-@@ -38439,6 +38449,7 @@
+@@ -38604,6 +38614,7 @@
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in
deleted file mode 100644
index 5d2778e291b..00000000000
--- a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
- $MCom: ports/devel/gnomevfs2/files/patch-devel-docs::Makefile.in,v 1.18 2005/06/28 05:40:02 adamw Exp $
-
---- devel-docs/Makefile.in 2002/02/16 16:44:53 1.1
-+++ devel-docs/Makefile.in 2002/02/16 16:45:47
-@@ -168,7 +168,7 @@
- TEXT_FILES = gnome-vfs-mime-type-handling.txt
-
-
--docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc
- doc_DATA =
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c
new file mode 100644
index 00000000000..1636ca99d4d
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c
@@ -0,0 +1,10 @@
+--- libgnomevfs/gnome-vfs-address.c.orig Wed Apr 12 10:16:28 2006
++++ libgnomevfs/gnome-vfs-address.c Thu Apr 20 09:52:12 2006
+@@ -32,6 +32,7 @@
+ #include <sys/types.h>
+
+ #ifndef G_OS_WIN32
++#include <sys/socket.h>
+ #include <sys/select.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c
deleted file mode 100644
index 6e3660c845b..00000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgnomevfs/gnome-vfs-resolve.c.orig Tue Apr 19 07:54:52 2005
-+++ libgnomevfs/gnome-vfs-resolve.c Sun May 22 23:25:22 2005
-@@ -171,10 +171,12 @@ _gnome_vfs_result_from_gai_error (int er
- switch (error) {
-
- case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND;
-+#ifdef EAI_NODATA
- #ifdef EAI_ADDRFAMILY
- case EAI_ADDRFAMILY:
- #endif
- case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;
-+#endif
- #ifdef EAI_SYSTEM
- case EAI_SYSTEM: return gnome_vfs_result_from_errno ();
- #endif
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
new file mode 100644
index 00000000000..dc1259ac425
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-volume-ops.c
@@ -0,0 +1,10 @@
+--- 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-modules__http-neon-method.c b/devel/gnome-vfs/files/patch-modules__http-neon-method.c
deleted file mode 100644
index 77e14080f5b..00000000000
--- a/devel/gnome-vfs/files/patch-modules__http-neon-method.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- modules/http-neon-method.c.orig Wed Jan 25 23:15:42 2006
-+++ modules/http-neon-method.c Wed Jan 25 23:17:47 2006
-@@ -1908,9 +1908,7 @@
- }
- }
-
--
- result = resolve_result (res, req);
-- ne_request_destroy (req);
-
- if (result == GNOME_VFS_OK) {
- const char *name;
-@@ -1929,6 +1927,8 @@
- }
-
- }
-+
-+ ne_request_destroy (req);
-
- return result;
- }
diff --git a/devel/gnome-vfs/files/patch-modules_bzip2-method.c b/devel/gnome-vfs/files/patch-modules_bzip2-method.c
deleted file mode 100644
index a1fd982c28b..00000000000
--- a/devel/gnome-vfs/files/patch-modules_bzip2-method.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/bzip2-method.c.orig Wed Apr 13 21:58:54 2005
-+++ modules/bzip2-method.c Mon Nov 28 15:09:59 2005
-@@ -435,7 +435,7 @@
-
- if (bzip2_handle->last_bz_result != BZ_OK) {
- if (bzip2_handle->last_bz_result == BZ_STREAM_END)
-- return GNOME_VFS_OK;
-+ return GNOME_VFS_ERROR_EOF;
- else
- return result_from_bz_result (bzip2_handle->last_bz_result);
- } else if (bzip2_handle->last_vfs_result != GNOME_VFS_OK) {
diff --git a/devel/gnome-vfs/files/patch-modules_sftp-method.c b/devel/gnome-vfs/files/patch-modules_sftp-method.c
deleted file mode 100644
index e1255db179c..00000000000
--- a/devel/gnome-vfs/files/patch-modules_sftp-method.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- modules/sftp-method.c.orig Tue May 11 01:53:30 2004
-+++ modules/sftp-method.c Tue May 11 01:54:07 2004
-@@ -1081,7 +1081,9 @@
- if (io_status == G_IO_STATUS_NORMAL) {
- buffer[len] = 0;
- if (g_str_has_suffix (buffer, "password: ") ||
-+ g_str_has_suffix (buffer, "password:") ||
- g_str_has_suffix (buffer, "Password: ") ||
-+ g_str_has_suffix (buffer, "Password:") ||
- g_str_has_prefix (buffer, "Enter passphrase for key")) {
- if (invoke_full_auth (uri, done_auth, buffer, &password) && password != NULL) {
- g_io_channel_write_chars (tty_channel, password, -1, &len, NULL);
diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in
index ed494001730..f1b405661c9 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.5 2005/06/28 05:40:01 adamw Exp $
+# $MCom: ports/devel/gnomevfs2/pkg-deinstall.in,v 1.7 2005/11/15 06:12:28 marcus Exp $
#
# Restore gconf keys of libgnome.
diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in
index f7ad446b978..0b792521a11 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.5 2005/06/28 05:40:01 adamw Exp $
+# $MCom: ports/devel/gnomevfs2/pkg-install.in,v 1.7 2005/11/15 06:12:28 marcus Exp $
#
# Restore gconf keys of libgnome.
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index e10dc309542..739ca05e876 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -1,5 +1,6 @@
bin/gnomevfs-cat
bin/gnomevfs-copy
+bin/gnomevfs-df
bin/gnomevfs-info
bin/gnomevfs-ls
bin/gnomevfs-mkdir
@@ -52,6 +53,7 @@ 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
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-parse-ls.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-pty.h
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
@@ -107,6 +109,67 @@ 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/doc/gnome-vfs-2.0/about.html
+share/doc/gnome-vfs-2.0/advanced-operations.html
+share/doc/gnome-vfs-2.0/data-types.html
+share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp
+share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp2
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-dns-sd.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-drive.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database-deprecated.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-resolve.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html
+share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html
+share/doc/gnome-vfs-2.0/gnome-vfs-file-and-dirs-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html
+share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html
+share/doc/gnome-vfs-2.0/home.png
+share/doc/gnome-vfs-2.0/index.html
+share/doc/gnome-vfs-2.0/index.sgml
+share/doc/gnome-vfs-2.0/left.png
+share/doc/gnome-vfs-2.0/mime-registry.html
+share/doc/gnome-vfs-2.0/modules.html
+share/doc/gnome-vfs-2.0/networking.html
+share/doc/gnome-vfs-2.0/right.png
+share/doc/gnome-vfs-2.0/style.css
+share/doc/gnome-vfs-2.0/up.png
+share/doc/gnome-vfs-2.0/volumes.html
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
@@ -141,6 +204,7 @@ share/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -154,8 +218,8 @@ share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/nso/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/or/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -179,8 +243,10 @@ share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
+@dirrm share/doc/gnome-vfs-2.0
@dirrm include/gnome-vfs-module-2.0/libgnomevfs
@dirrm include/gnome-vfs-module-2.0
@dirrm include/gnome-vfs-2.0/libgnomevfs
@@ -188,6 +254,8 @@ 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_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
@dirrmtry share/locale/rw/LC_MESSAGES
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 978cbb3ae59..48c146419b5 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -3,15 +3,14 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.14 2005/10/14 20:39:56 adamw Exp $
+# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.17 2006/04/13 07:52:32 bland Exp $
#
PORTNAME= gnome-vfsmm
-PORTVERSION= 2.12.0
-PORTREVISION= 1
+PORTVERSION= 2.14.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= bland@FreeBSD.org
diff --git a/devel/gnome-vfsmm/distinfo b/devel/gnome-vfsmm/distinfo
index ab4772088fd..6678e003e9e 100644
--- a/devel/gnome-vfsmm/distinfo
+++ b/devel/gnome-vfsmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfsmm-2.12.0.tar.bz2) = 4a73741ab5232bf85cb631108c5b6430
-SHA256 (gnome2/gnome-vfsmm-2.12.0.tar.bz2) = 3ba572ca0db177d923d9a687e5bebd9b81343f9e913cc75b725ca40d81c2c329
-SIZE (gnome2/gnome-vfsmm-2.12.0.tar.bz2) = 321830
+MD5 (gnome2/gnome-vfsmm-2.14.0.tar.bz2) = bd5c3796e417a9780201835060461be3
+SHA256 (gnome2/gnome-vfsmm-2.14.0.tar.bz2) = c59e640cdff8f877a3eae0e39a67e2ff07485290d8abccffbb522c54ccccb796
+SIZE (gnome2/gnome-vfsmm-2.14.0.tar.bz2) = 324357
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index c34da1d3dd4..db99d72416d 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -3,15 +3,14 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/gnomevfs2/Makefile,v 1.115 2005/10/31 00:12:01 marcus Exp $
+# $MCom: ports/devel/gnomevfs2/Makefile,v 1.137 2006/04/20 14:00:03 marcus Exp $
#
PORTNAME= gnomevfs2
-PORTVERSION= 2.12.2
-PORTREVISION= 2
+PORTVERSION= 2.14.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-vfs/2.12
+MASTER_SITE_SUBDIR= sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -22,15 +21,16 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
libbonobo ltverhack
-USE_REINPLACE= yes
USE_AUTOTOOLS= libtool:15
USE_OPENSSL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-openssl \
- --disable-gnutls
+ --disable-gnutls \
+ --disable-howl
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
@@ -40,8 +40,7 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
GCONF_SCHEMAS= desktop_default_applications.schemas \
desktop_gnome_url_handlers.schemas system_dns_sd.schemas \
- system_http_proxy.schemas system_smb.schemas \
- system_storage.schemas
+ system_http_proxy.schemas system_smb.schemas
OPTIONS= SAMBA "Enable SMB volume support" on \
MDNS "Enable Bonjour/Rendezvous support" on
@@ -65,9 +64,9 @@ CONFIGURE_ARGS+=--disable-samba
.endif
.if !defined(WITHOUT_MDNS)
-LIB_DEPENDS+= howl:${PORTSDIR}/net/howl
+LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi
.else
-CONFIGURE_ARGS+=--disable-howl
+CONFIGURE_ARGS+=--disable-avahi
.endif
post-patch:
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 52b0d0baf26..da121ec287a 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.12.2.tar.bz2) = 4d7b9c14af29a9bf813ab4831eeeacbb
-SHA256 (gnome2/gnome-vfs-2.12.2.tar.bz2) = 46f80ead7c52a8c5a3fa7beac2d42385c6bc9552fa28aa5068e1a251d708e177
-SIZE (gnome2/gnome-vfs-2.12.2.tar.bz2) = 1558218
+MD5 (gnome2/gnome-vfs-2.14.1.tar.bz2) = d7ba7e667b46b5929b3e277a8b870868
+SHA256 (gnome2/gnome-vfs-2.14.1.tar.bz2) = cdcef326c3bacd89bf40551932f6b8e2c04bee4ebf3afc1633032af04a7631bf
+SIZE (gnome2/gnome-vfs-2.14.1.tar.bz2) = 1813793
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 0f976d16a46..4b5c0cfaea3 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Wed Oct 5 10:56:02 2005
-+++ configure Mon Nov 28 13:34:48 2005
-@@ -23119,6 +23119,8 @@
+--- configure.orig Mon Nov 14 11:43:13 2005
++++ configure Mon Nov 28 13:52:39 2005
+@@ -23123,6 +23123,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
-@@ -23201,6 +23203,7 @@
+@@ -23205,6 +23207,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
-@@ -24292,6 +24295,7 @@
+@@ -24296,6 +24299,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
-@@ -33558,7 +33562,7 @@
+@@ -33559,7 +33563,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -34,7 +34,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36964,6 +36968,9 @@
+@@ -37107,6 +37111,9 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44,7 +44,7 @@
#include <sys/statfs.h>
#include <sys/fstyp.h>
_ACEOF
-@@ -37005,6 +37012,9 @@
+@@ -37148,6 +37155,9 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -54,7 +54,7 @@
#include <sys/statfs.h>
#include <sys/vmount.h>
_ACEOF
-@@ -38439,6 +38449,7 @@
+@@ -38604,6 +38614,7 @@
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnomevfs2/files/patch-devel-docs::Makefile.in b/devel/gnomevfs2/files/patch-devel-docs::Makefile.in
deleted file mode 100644
index 5d2778e291b..00000000000
--- a/devel/gnomevfs2/files/patch-devel-docs::Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
- $MCom: ports/devel/gnomevfs2/files/patch-devel-docs::Makefile.in,v 1.18 2005/06/28 05:40:02 adamw Exp $
-
---- devel-docs/Makefile.in 2002/02/16 16:44:53 1.1
-+++ devel-docs/Makefile.in 2002/02/16 16:45:47
-@@ -168,7 +168,7 @@
- TEXT_FILES = gnome-vfs-mime-type-handling.txt
-
-
--docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc
- doc_DATA =
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-address.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-address.c
new file mode 100644
index 00000000000..1636ca99d4d
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-address.c
@@ -0,0 +1,10 @@
+--- libgnomevfs/gnome-vfs-address.c.orig Wed Apr 12 10:16:28 2006
++++ libgnomevfs/gnome-vfs-address.c Thu Apr 20 09:52:12 2006
+@@ -32,6 +32,7 @@
+ #include <sys/types.h>
+
+ #ifndef G_OS_WIN32
++#include <sys/socket.h>
+ #include <sys/select.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c
deleted file mode 100644
index 6e3660c845b..00000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgnomevfs/gnome-vfs-resolve.c.orig Tue Apr 19 07:54:52 2005
-+++ libgnomevfs/gnome-vfs-resolve.c Sun May 22 23:25:22 2005
-@@ -171,10 +171,12 @@ _gnome_vfs_result_from_gai_error (int er
- switch (error) {
-
- case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND;
-+#ifdef EAI_NODATA
- #ifdef EAI_ADDRFAMILY
- case EAI_ADDRFAMILY:
- #endif
- case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;
-+#endif
- #ifdef EAI_SYSTEM
- case EAI_SYSTEM: return gnome_vfs_result_from_errno ();
- #endif
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c
new file mode 100644
index 00000000000..dc1259ac425
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c
@@ -0,0 +1,10 @@
+--- 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/gnomevfs2/files/patch-modules__http-neon-method.c b/devel/gnomevfs2/files/patch-modules__http-neon-method.c
deleted file mode 100644
index 77e14080f5b..00000000000
--- a/devel/gnomevfs2/files/patch-modules__http-neon-method.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- modules/http-neon-method.c.orig Wed Jan 25 23:15:42 2006
-+++ modules/http-neon-method.c Wed Jan 25 23:17:47 2006
-@@ -1908,9 +1908,7 @@
- }
- }
-
--
- result = resolve_result (res, req);
-- ne_request_destroy (req);
-
- if (result == GNOME_VFS_OK) {
- const char *name;
-@@ -1929,6 +1927,8 @@
- }
-
- }
-+
-+ ne_request_destroy (req);
-
- return result;
- }
diff --git a/devel/gnomevfs2/files/patch-modules_bzip2-method.c b/devel/gnomevfs2/files/patch-modules_bzip2-method.c
deleted file mode 100644
index a1fd982c28b..00000000000
--- a/devel/gnomevfs2/files/patch-modules_bzip2-method.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/bzip2-method.c.orig Wed Apr 13 21:58:54 2005
-+++ modules/bzip2-method.c Mon Nov 28 15:09:59 2005
-@@ -435,7 +435,7 @@
-
- if (bzip2_handle->last_bz_result != BZ_OK) {
- if (bzip2_handle->last_bz_result == BZ_STREAM_END)
-- return GNOME_VFS_OK;
-+ return GNOME_VFS_ERROR_EOF;
- else
- return result_from_bz_result (bzip2_handle->last_bz_result);
- } else if (bzip2_handle->last_vfs_result != GNOME_VFS_OK) {
diff --git a/devel/gnomevfs2/files/patch-modules_sftp-method.c b/devel/gnomevfs2/files/patch-modules_sftp-method.c
deleted file mode 100644
index e1255db179c..00000000000
--- a/devel/gnomevfs2/files/patch-modules_sftp-method.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- modules/sftp-method.c.orig Tue May 11 01:53:30 2004
-+++ modules/sftp-method.c Tue May 11 01:54:07 2004
-@@ -1081,7 +1081,9 @@
- if (io_status == G_IO_STATUS_NORMAL) {
- buffer[len] = 0;
- if (g_str_has_suffix (buffer, "password: ") ||
-+ g_str_has_suffix (buffer, "password:") ||
- g_str_has_suffix (buffer, "Password: ") ||
-+ g_str_has_suffix (buffer, "Password:") ||
- g_str_has_prefix (buffer, "Enter passphrase for key")) {
- if (invoke_full_auth (uri, done_auth, buffer, &password) && password != NULL) {
- g_io_channel_write_chars (tty_channel, password, -1, &len, NULL);
diff --git a/devel/gnomevfs2/pkg-deinstall.in b/devel/gnomevfs2/pkg-deinstall.in
index ed494001730..f1b405661c9 100644
--- a/devel/gnomevfs2/pkg-deinstall.in
+++ b/devel/gnomevfs2/pkg-deinstall.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports/devel/gnomevfs2/pkg-deinstall.in,v 1.5 2005/06/28 05:40:01 adamw Exp $
+# $MCom: ports/devel/gnomevfs2/pkg-deinstall.in,v 1.7 2005/11/15 06:12:28 marcus Exp $
#
# Restore gconf keys of libgnome.
diff --git a/devel/gnomevfs2/pkg-install.in b/devel/gnomevfs2/pkg-install.in
index f7ad446b978..0b792521a11 100644
--- a/devel/gnomevfs2/pkg-install.in
+++ b/devel/gnomevfs2/pkg-install.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD$
-# $MCom: ports/devel/gnomevfs2/pkg-install.in,v 1.5 2005/06/28 05:40:01 adamw Exp $
+# $MCom: ports/devel/gnomevfs2/pkg-install.in,v 1.7 2005/11/15 06:12:28 marcus Exp $
#
# Restore gconf keys of libgnome.
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index e10dc309542..739ca05e876 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -1,5 +1,6 @@
bin/gnomevfs-cat
bin/gnomevfs-copy
+bin/gnomevfs-df
bin/gnomevfs-info
bin/gnomevfs-ls
bin/gnomevfs-mkdir
@@ -52,6 +53,7 @@ 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
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-parse-ls.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-pty.h
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
@@ -107,6 +109,67 @@ 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/doc/gnome-vfs-2.0/about.html
+share/doc/gnome-vfs-2.0/advanced-operations.html
+share/doc/gnome-vfs-2.0/data-types.html
+share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp
+share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp2
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-dns-sd.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-drive.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database-deprecated.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-resolve.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html
+share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html
+share/doc/gnome-vfs-2.0/gnome-vfs-file-and-dirs-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html
+share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html
+share/doc/gnome-vfs-2.0/home.png
+share/doc/gnome-vfs-2.0/index.html
+share/doc/gnome-vfs-2.0/index.sgml
+share/doc/gnome-vfs-2.0/left.png
+share/doc/gnome-vfs-2.0/mime-registry.html
+share/doc/gnome-vfs-2.0/modules.html
+share/doc/gnome-vfs-2.0/networking.html
+share/doc/gnome-vfs-2.0/right.png
+share/doc/gnome-vfs-2.0/style.css
+share/doc/gnome-vfs-2.0/up.png
+share/doc/gnome-vfs-2.0/volumes.html
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
@@ -141,6 +204,7 @@ share/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -154,8 +218,8 @@ share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/nso/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/or/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -179,8 +243,10 @@ share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
+@dirrm share/doc/gnome-vfs-2.0
@dirrm include/gnome-vfs-module-2.0/libgnomevfs
@dirrm include/gnome-vfs-module-2.0
@dirrm include/gnome-vfs-2.0/libgnomevfs
@@ -188,6 +254,8 @@ 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_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
@dirrmtry share/locale/rw/LC_MESSAGES
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 278beefbb26..a2cd560e7f5 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -3,14 +3,14 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/libbonobo/Makefile,v 1.45 2006/04/13 07:52:33 bland Exp $
#
PORTNAME= libbonobo
-PORTVERSION= 2.10.1
-PORTREVISION= 3
+PORTVERSION= 2.14.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -19,6 +19,7 @@ COMMENT= A component and compound document system for GNOME2
USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= yes
+USE_GETTEXT= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_PERL5= yes
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 3b59eb12f9d..70ebbb7b074 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libbonobo-2.10.1.tar.bz2) = 927d572970d87121c8375aab1b4b1d37
-SHA256 (gnome2/libbonobo-2.10.1.tar.bz2) = 7799f889eeea4cd0758be9dd37a85e135f1b0c8e1b6042ddea75a79ba6caebb0
-SIZE (gnome2/libbonobo-2.10.1.tar.bz2) = 1358327
+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
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 ced10add3d3..00000000000
--- 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 1a5ef4155a8..2bf441f2bb1 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -217,6 +217,7 @@ share/locale/is/LC_MESSAGES/libbonobo-2.0.mo
share/locale/it/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ja/LC_MESSAGES/libbonobo-2.0.mo
share/locale/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
share/locale/lt/LC_MESSAGES/libbonobo-2.0.mo
share/locale/lv/LC_MESSAGES/libbonobo-2.0.mo
@@ -264,7 +265,9 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
@dirrm include/bonobo-activation-2.0/bonobo-activation
@dirrm include/bonobo-activation-2.0
@dirrm etc/bonobo-activation
-@unexec /bin/rmdir %D/lib/bonobo/monikers 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/lib/bonobo 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/li/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/li 2>/dev/null || /usr/bin/true
+@dirrmtry lib/bonobo/monikers
+@dirrmtry lib/bonobo
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile
index 63f12c1d616..73bd353da6d 100644
--- a/devel/libgsf-gnome/Makefile
+++ b/devel/libgsf-gnome/Makefile
@@ -3,7 +3,7 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.8 2005/09/08 17:53:00 marcus Exp $
+# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.10 2006/03/05 21:26:56 marcus Exp $
#
CATEGORIES= devel gnome
diff --git a/devel/libgsf-gnome/pkg-plist b/devel/libgsf-gnome/pkg-plist
index 73fb82d0698..4f502a67c6f 100644
--- a/devel/libgsf-gnome/pkg-plist
+++ b/devel/libgsf-gnome/pkg-plist
@@ -6,6 +6,6 @@ include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h
lib/libgsf-gnome-1.a
lib/libgsf-gnome-1.la
lib/libgsf-gnome-1.so
-lib/libgsf-gnome-1.so.113
+lib/libgsf-gnome-1.so.114
libdata/pkgconfig/libgsf-gnome-1.pc
@dirrm include/libgsf-1/gsf-gnome
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 1dc1177554b..db4ce3e3908 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -3,15 +3,15 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgsf/Makefile,v 1.17 2005/10/11 22:08:17 marcus Exp $
+# $MCom: ports/devel/libgsf/Makefile,v 1.22 2006/04/23 22:42:46 mezz Exp $
#
PORTNAME= libgsf
-PORTVERSION= 1.13.3
-PORTREVISION?= 1
+PORTVERSION= 1.14.0
+PORTREVISION?= 0
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -24,6 +24,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
INSTALLS_SHLIB= yes
USE_GNOME?= gnomehack glib20 libxml2 gconf2 ltverhack intlhack
USE_AUTOTOOLS= libtool:15
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index bc1038665ea..9164f4ed7be 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgsf-1.13.3.tar.bz2) = b35e95f6bd7b8add9981b6cf6336674a
-SHA256 (gnome2/libgsf-1.13.3.tar.bz2) = 458e7b2ca26f0d212f91b445f0a93db62a679ec671bd3cc980f3c1ac65f06b96
-SIZE (gnome2/libgsf-1.13.3.tar.bz2) = 513659
+MD5 (gnome2/libgsf-1.14.0.tar.bz2) = 2d3b112a2c6e7e1740306c32b1ebf6e6
+SHA256 (gnome2/libgsf-1.14.0.tar.bz2) = 1572b131c4d32527c9adda40faea5a58bd67dfc5e16cdbd7ff9b1e793790568a
+SIZE (gnome2/libgsf-1.14.0.tar.bz2) = 525532
diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist
index 3f3152f53af..e654b64cf30 100644
--- a/devel/libgsf/pkg-plist
+++ b/devel/libgsf/pkg-plist
@@ -46,7 +46,7 @@ include/libgsf-1/gsf/gsf.h
lib/libgsf-1.a
lib/libgsf-1.la
lib/libgsf-1.so
-lib/libgsf-1.so.113
+lib/libgsf-1.so.114
libdata/pkgconfig/libgsf-1.pc
share/doc/gsf/GsfBlob.html
share/doc/gsf/GsfClipData.html
@@ -72,6 +72,7 @@ share/doc/gsf/gsf-metadata.html
share/doc/gsf/gsf-users.html
share/doc/gsf/gsf-utils.html
share/doc/gsf/gsf.devhelp
+share/doc/gsf/gsf.devhelp2
share/doc/gsf/history.html
share/doc/gsf/home.png
share/doc/gsf/index.html
@@ -87,6 +88,7 @@ share/doc/gsf/sources.html
share/doc/gsf/style.css
share/doc/gsf/up.png
share/locale/es/LC_MESSAGES/libgsf.mo
+share/locale/sv/LC_MESSAGES/libgsf.mo
@dirrm share/doc/gsf
@dirrm include/libgsf-1/gsf-win32
@dirrm include/libgsf-1/gsf
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 2dfbe78cdfe..e8d7dcb40ee 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libgtop2/Makefile,v 1.49 2005/09/05 19:23:42 ahze Exp $
+# $MCom: ports/devel/libgtop2/Makefile,v 1.70 2006/04/15 05:49:08 marcus Exp $
#
PORTNAME= libgtop2
-PORTVERSION= 2.12.2
-PORTREVISION= 1
+PORTVERSION= 2.14.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= libgtop-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -21,13 +20,13 @@ COMMENT= GNOME 2 top library
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_BZIP2= yes
-USE_PERL5= yes
+USE_PERL5_BUILD=yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack glib20
-USE_REINPLACE= yes
+USE_GNOME= gnomehack glib20 ltverhack
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -38,8 +37,6 @@ INFO= libgtop2
.if ${OSVERSION} >= 600000
PKGMESSAGE= ${FILESDIR}/pkg-message
EXTRA_PATCHES+= ${FILESDIR}/extra-67-patch-sysdeps_freebsd_Makefile.in
-.else
-EXTRA_PATCHES+= ${FILESDIR}/extra-45-patch-sysdeps_freebsd_Makefile.in
.endif
post-patch:
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index b2e15a7aef7..dd81ddab3cb 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgtop-2.12.2.tar.bz2) = 050e0d7834a3e73f693895e0a3130917
-SHA256 (gnome2/libgtop-2.12.2.tar.bz2) = 32d3e0f538c5851b9ca908f24170ce63d7c09d5028704bce6218e6130a9169d3
-SIZE (gnome2/libgtop-2.12.2.tar.bz2) = 623479
+MD5 (gnome2/libgtop-2.14.1.tar.bz2) = 59cc661ae518fcae158517cc029b2add
+SHA256 (gnome2/libgtop-2.14.1.tar.bz2) = b0658ab0327bf833295bb8d2467ab16747c017c8cd26ff6936a927def6818fb2
+SIZE (gnome2/libgtop-2.14.1.tar.bz2) = 661846
diff --git a/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in
deleted file mode 100644
index dea0aec8224..00000000000
--- a/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
---- sysdeps/freebsd/Makefile.in.orig Mon Aug 8 15:10:50 2005
-+++ sysdeps/freebsd/Makefile.in Mon Aug 8 15:15:54 2005
-@@ -143,12 +143,11 @@
-
- noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
-
--libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c
-+libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c netlist.c
-
- libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
-
--libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netlist.c netload.c ppp.c procopenfiles.c fsusage.c
--
-+libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netload.c ppp.c procopenfiles.c fsusage.c sysinfo.c
-
- libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
-
-@@ -171,13 +170,13 @@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- libgtop_sysdeps_2_0_la_LIBADD =
--libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo
-+libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo netlist.lo
- libgtop_sysdeps_suid_2_0_la_LIBADD =
- libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo cpu.lo mem.lo \
- swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo sem_limits.lo \
- proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \
- procsignal.lo prockernel.lo procsegment.lo procargs.lo procmap.lo \
--netlist.lo netload.lo ppp.lo procopenfiles.lo fsusage.lo
-+netload.lo ppp.lo procopenfiles.lo fsusage.lo sysinfo.lo
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in
index 8168ecb6ddd..1258d576f76 100644
--- a/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in
+++ b/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in
@@ -1,34 +1,20 @@
---- sysdeps/freebsd/Makefile.in.orig Mon Aug 8 20:25:56 2005
-+++ sysdeps/freebsd/Makefile.in Mon Aug 8 20:28:06 2005
-@@ -143,12 +143,11 @@
-
+--- sysdeps/freebsd/Makefile.in.orig Mon Apr 10 14:08:39 2006
++++ sysdeps/freebsd/Makefile.in Mon Apr 10 14:11:50 2006
+@@ -50,7 +50,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libgtop_sysdeps_2_0_la_LIBADD =
++libgtop_sysdeps_2_0_la_LIBADD = -lgeom -ldevstat
+ am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo
+ libgtop_sysdeps_2_0_la_OBJECTS = $(am_libgtop_sysdeps_2_0_la_OBJECTS)
+ am__DEPENDENCIES_1 =
+@@ -260,7 +260,7 @@ target_vendor = @target_vendor@
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
-
--libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c
-+libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c netlist.c
-
+ libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c sysinfo.c
libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
-
--libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netlist.c netload.c ppp.c procopenfiles.c fsusage.c
--
-+libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netload.c ppp.c procopenfiles.c fsusage.c sysinfo.c
-
- libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
-
-@@ -171,13 +170,13 @@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- libgtop_sysdeps_2_0_la_LIBADD =
--libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo
--libgtop_sysdeps_suid_2_0_la_LIBADD =
-+libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo netlist.lo
-+libgtop_sysdeps_suid_2_0_la_LIBADD = -lgeom -ldevstat
- libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo cpu.lo mem.lo \
- swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo sem_limits.lo \
- proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \
- procsignal.lo prockernel.lo procsegment.lo procargs.lo procmap.lo \
--netlist.lo netload.lo ppp.lo procopenfiles.lo fsusage.lo
-+netload.lo ppp.lo procopenfiles.lo fsusage.lo sysinfo.lo
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS)
++libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) -lgeom -ldevstat
+ libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \
+ uptime.c loadavg.c shm_limits.c msg_limits.c \
+ sem_limits.c proclist.c procstate.c procuid.c \
diff --git a/devel/libgtop2/files/patch-configure b/devel/libgtop2/files/patch-configure
index e40ac7b08c2..934f89e79fd 100644
--- a/devel/libgtop2/files/patch-configure
+++ b/devel/libgtop2/files/patch-configure
@@ -1,33 +1,19 @@
---- configure.orig Wed Jul 13 19:29:53 2005
-+++ configure Wed Jul 13 19:36:36 2005
-@@ -1931,9 +1931,9 @@
-
- # libtool versioning
- LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
--LT_CURRENT=$LIBGTOP_CURRENT
--LT_REVISION=$LIBGTOP_REVISION
--LT_AGE=$LIBGTOP_AGE
-+LT_CURRENT=2
-+LT_REVISION=0
-+LT_AGE=0
- LT_VERSION_INFO="-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}"
-
-
-@@ -23654,6 +23654,8 @@
- fi
-
- done
-+;;
-+esac
-
-
-
-@@ -23792,8 +23794,6 @@
-
- fi
-
-- ;;
--esac
-
-
- echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5
+--- configure.orig Mon Apr 10 15:28:24 2006
++++ configure Mon Apr 10 15:30:40 2006
+@@ -20568,6 +20568,7 @@ else
+ for def in nothing KERNEL _KERNEL; do
+ cat >conftest.$ac_ext <<_ACEOF
+ #define $def
++#include <sys/types.h>
+ #include <sys/ipc.h>
+ #include <sys/msg.h>
+ #include <stdio.h>
+@@ -23458,7 +23459,7 @@ fi
+
+
+ case "$host_os" in
+- solaris*)
++ solaris*|freebsd*)
+
+ echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5
+ echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6
diff --git a/devel/libgtop2/files/patch-lib::read.c b/devel/libgtop2/files/patch-lib::read.c
index b4ca4953413..18c837d377c 100644
--- a/devel/libgtop2/files/patch-lib::read.c
+++ b/devel/libgtop2/files/patch-lib::read.c
@@ -1,5 +1,5 @@
---- lib/read.c.orig Mon Apr 11 03:25:32 2005
-+++ lib/read.c Mon Apr 11 03:27:06 2005
+--- lib/read.c.orig Mon Apr 10 04:41:46 2006
++++ lib/read.c Mon Apr 10 15:12:31 2006
@@ -22,6 +22,7 @@
*/
@@ -7,9 +7,9 @@
+#include <errno.h>
#include <glibtop/read.h>
#include <glibtop/error.h>
- #include "libgtop-i18n.h"
-@@ -56,14 +57,18 @@
- fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size);
+ #include <glib/gi18n-lib.h>
+@@ -56,14 +57,18 @@ glibtop_read_l (glibtop *server, size_t
+ fprintf (stderr, "LIBRARY: really reading %d bytes.\n", (int)size);
#endif
+retry:
@@ -24,7 +24,7 @@
server,
ngettext ("read %d byte",
"read %d bytes", size),
- size);
+ (int)size);
+ }
}
}
diff --git a/devel/libgtop2/files/patch-lib::write.c b/devel/libgtop2/files/patch-lib::write.c
index 0d00f7a5f24..acb63c489cc 100644
--- a/devel/libgtop2/files/patch-lib::write.c
+++ b/devel/libgtop2/files/patch-lib::write.c
@@ -1,5 +1,5 @@
---- lib/write.c.orig Mon Apr 11 03:28:12 2005
-+++ lib/write.c Mon Apr 11 03:29:00 2005
+--- lib/write.c.orig Mon Apr 10 04:41:46 2006
++++ lib/write.c Mon Apr 10 15:37:00 2006
@@ -22,7 +22,7 @@
*/
@@ -8,9 +8,9 @@
+#include <errno.h>
#include <glibtop/write.h>
#include <glibtop/error.h>
- #include "libgtop-i18n.h"
-@@ -42,12 +42,16 @@
- fprintf (stderr, "LIBRARY: really writing %d bytes.\n", size);
+ #include <glib/gi18n-lib.h>
+@@ -42,15 +42,19 @@ glibtop_write_l (glibtop *server, size_t
+ fprintf (stderr, "LIBRARY: really writing %d bytes.\n", (int)size);
#endif
+retry:
@@ -24,6 +24,9 @@
+ if (ret < 0) {
+ if (errno == EINTR)
+ goto retry;
- glibtop_error_io_r (server, ngettext ("wrote %d byte", "wrote %d bytes", size), size);
+ glibtop_error_io_r (server,
+ ngettext("wrote %d byte",
+ "wrote %d bytes", size),
+ (int) size);
+ }
}
diff --git a/devel/libgtop2/files/patch-src::daemon::io.c b/devel/libgtop2/files/patch-src::daemon::io.c
index a2d23482266..f8fb71b0378 100644
--- a/devel/libgtop2/files/patch-src::daemon::io.c
+++ b/devel/libgtop2/files/patch-src::daemon::io.c
@@ -1,14 +1,14 @@
---- src/daemon/io.c.orig Mon Apr 11 03:30:12 2005
-+++ src/daemon/io.c Mon Apr 11 03:33:22 2005
+--- src/daemon/io.c.orig Mon Dec 12 05:09:38 2005
++++ src/daemon/io.c Wed Dec 14 18:58:01 2005
@@ -21,6 +21,7 @@
Boston, MA 02111-1307, USA.
*/
+#include <errno.h>
+ #include <config.h>
#include "daemon.h"
#include <glibtop/error.h>
-
-@@ -36,9 +37,13 @@
+@@ -37,9 +38,13 @@ do_output (int s, glibtop_response *resp
resp->offset = offset;
resp->data_size = data_size;
@@ -23,7 +23,7 @@
} else {
if (send (s, (const void *) resp, sizeof (glibtop_response), 0) < 0)
glibtop_warn_io ("send");
-@@ -49,9 +54,13 @@
+@@ -50,9 +55,13 @@ do_output (int s, glibtop_response *resp
fprintf (stderr, "Writing %d bytes of data.\n", resp->data_size);
#endif
@@ -38,7 +38,7 @@
} else {
if (send (s, data, resp->data_size, 0) , 0)
glibtop_warn_io ("send");
-@@ -67,6 +76,7 @@
+@@ -68,6 +77,7 @@ do_read (int s, void *ptr, size_t total_
size_t already_read = 0, remaining = total_size;
while (already_read < total_size) {
@@ -46,7 +46,7 @@
if (s)
nread = recv (s, ptr, remaining, 0);
else
-@@ -78,6 +88,8 @@
+@@ -79,6 +89,8 @@ do_read (int s, void *ptr, size_t total_
}
if (nread <= 0) {
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c b/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c
index 128eda35b6c..85c9822f86f 100644
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c
+++ b/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c
@@ -1,21 +1,28 @@
---- sysdeps/freebsd/fsusage.c.orig Mon Feb 28 03:54:41 2005
-+++ sysdeps/freebsd/fsusage.c Tue May 24 01:49:42 2005
-@@ -9,6 +9,12 @@
+--- sysdeps/freebsd/jfsusage.c.orig Sun Apr 9 12:52:45 2006
++++ sysdeps/freebsd/fsusage.c Mon Apr 10 15:34:42 2006
+@@ -9,10 +9,12 @@
+
#include <unistd.h>
#include <sys/param.h>
+-#if defined (HAVE_SYS_STATVFS_H)
+-#include <sys/statvfs.h>
+-#else
#include <sys/mount.h>
+#if __FreeBSD_version >= 600000
+#include <libgeom.h>
+#include <sys/resource.h>
+#include <devstat.h>
+#include <sys/devicestat.h>
-+#endif
+ #endif
#include <stdio.h>
- #include <string.h>
-@@ -27,15 +33,107 @@ _glibtop_freebsd_get_fsusage_read_write(
+@@ -31,24 +33,108 @@ _glibtop_freebsd_get_fsusage_read_write(
+ const char *path)
{
int result;
+-#if defined (STAT_STATVFS)
+- struct statvfs sfs;
+-#else
struct statfs sfs;
+#if __FreeBSD_version >= 600000
+ struct devstat *ds;
@@ -26,14 +33,18 @@
+ struct gmesh gmp;
+ double etime;
+ uint64_t ld[2];
-+#endif
+ #endif
+-#if defined (STAT_STATVFS)
+- result = statvfs (path, &sfs);
+-#else
result = statfs (path, &sfs);
+-#endif
if (result == -1) {
+ glibtop_warn_io_r (server, "statfs");
- return;
- }
++ return;
++ }
+#if __FreeBSD_version >= 600000
+ ld[0] = 0;
+ ld[1] = 0;
@@ -55,9 +66,9 @@
+ glibtop_warn_io_r (server, "geom_stats_snapshot_get()");
+ geom_stats_close ();
+ geom_deletetree (&gmp);
-+ return;
-+ }
-+
+ return;
+ }
+
+ geom_stats_snapshot_timestamp (sc, &ts);
+ etime = ts.tv_sec + (ts.tv_nsec * 1e-9);
+ geom_stats_snapshot_reset (sc);
@@ -107,7 +118,7 @@
+ break;
+ }
+ }
-
++
+ geom_stats_snapshot_free (sc);
+ geom_stats_close ();
+ geom_deletetree (&gmp);
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h b/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h
index 5ded2dc3c3c..4955aed65da 100644
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h
+++ b/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h
@@ -1,5 +1,5 @@
---- sysdeps/freebsd/glibtop_server.h.orig Mon Oct 20 11:19:49 2003
-+++ sysdeps/freebsd/glibtop_server.h Mon Aug 8 15:10:14 2005
+--- sysdeps/freebsd/glibtop_server.h.orig Tue Apr 4 16:06:13 2006
++++ sysdeps/freebsd/glibtop_server.h Mon Apr 10 15:27:11 2006
@@ -21,8 +21,8 @@
Boston, MA 02111-1307, USA.
*/
@@ -11,11 +11,3 @@
G_BEGIN_DECLS
-@@ -45,6 +45,7 @@ G_BEGIN_DECLS
- #define GLIBTOP_SUID_PROC_ARGS (1 << GLIBTOP_SYSDEPS_PROC_ARGS)
- #define GLIBTOP_SUID_PROC_MAP (1 << GLIBTOP_SYSDEPS_PROC_MAP)
- #define GLIBTOP_SUID_NETLOAD (1 << GLIBTOP_SYSDEPS_NETLOAD)
-+#define GLIBTOP_SUID_NETLIST 0
- #define GLIBTOP_SUID_PPP (1 << GLIBTOP_SYSDEPS_PPP)
-
- G_END_DECLS
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_siglist.c b/devel/libgtop2/files/patch-sysdeps_freebsd_siglist.c
new file mode 100644
index 00000000000..6881723bd3a
--- /dev/null
+++ b/devel/libgtop2/files/patch-sysdeps_freebsd_siglist.c
@@ -0,0 +1,41 @@
+--- sysdeps/freebsd/siglist.c.orig Fri Jan 20 02:56:40 2006
++++ sysdeps/freebsd/siglist.c Fri Jan 20 02:56:44 2006
+@@ -26,4 +26,37 @@
+ #include <glibtop/signal.h>
+
+ const glibtop_signame glibtop_sys_siglist [] =
+-{ { 0, NULL, NULL } };
++{ { 1, "SIGHUP", "Hangup" },
++ { 2, "SIGINT", "Interrupt" },
++ { 3, "SIGQUIT", "Quit" },
++ { 4, "SIGILL", "Illegal Instruction" },
++ { 5, "SIGTRAP", "Trace/Breakpoint Trap" },
++ { 6, "SIGABRT", "Abort" },
++ { 7, "SIGEMT", "Emulation Trap" },
++ { 8, "SIGFPE", "Arithmetic Exception" },
++ { 9, "SIGKILL", "Killed" },
++ { 10, "SIGBUS", "Bus Error" },
++ { 11, "SIGSEGV", "Segmentation Fault" },
++ { 12, "SIGSYS", "Bad System Call" },
++ { 13, "SIGPIPE", "Broken Pipe" },
++ { 14, "SIGALRM", "Alarm Clock" },
++ { 15, "SIGTERM", "Terminated" },
++ { 16, "SIGURG", "Urgent Condition Present On Socket" },
++ { 17, "SIGSTOP", "Stop (cannot be caught or ignored)" },
++ { 18, "SIGTSTP", "Stop Signal Generated From Keyboard" },
++ { 19, "SIGCONT", "Continue After Stop" },
++ { 20, "SIGCHLD", "Child Status Has Changed" },
++ { 21, "SIGTTIN", "Background Read Attempted From Control Terminal" },
++ { 22, "SIGTTOU", "Background Write Attempted To Control Terminal" },
++ { 23, "SIGIO", "I/O Is Possible On A Descriptor" },
++ { 24, "SIGXCPU", "CPU Time Limit Exceeded" },
++ { 25, "SIGXFSZ", "File Size Limit Exceeded" },
++ { 26, "SIGVTALRM","Virtual Time Alarm" },
++ { 27, "SIGPROF", "Profiling Timer Alarm" },
++ { 28, "SIGWINCH","Window Size Change" },
++ { 29, "SIGINFO", "Status Request From Keyboard" },
++ { 30, "SIGUSR1", "User Defined Signal 1" },
++ { 31, "SIGUSR2", "User Defined Signal 2" },
++ { 32, "SIGTHR", "Thread Interrupt" },
++ { 0, NULL, NULL }
++};
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c b/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c
deleted file mode 100644
index 7a86f332773..00000000000
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c
+++ /dev/null
@@ -1,95 +0,0 @@
---- sysdeps/freebsd/sysinfo.c.orig Thu Jun 9 22:56:29 2005
-+++ sysdeps/freebsd/sysinfo.c Thu Jun 9 22:58:36 2005
-@@ -0,0 +1,92 @@
-+/* $Id$ */
-+
-+/* Copyright (C) 1998-99 Martin Baulig
-+ This file is part of LibGTop 1.0.
-+
-+ Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-+
-+ LibGTop is free software; you can redistribute it and/or modify it
-+ under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License,
-+ or (at your option) any later version.
-+
-+ LibGTop is distributed in the hope that it will be useful, but WITHOUT
-+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with LibGTop; see the file COPYING. If not, write to the
-+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA.
-+*/
-+
-+#include <config.h>
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#include <glibtop/error.h>
-+#include <glibtop/cpu.h>
-+#include <glibtop/sysinfo.h>
-+
-+static const unsigned long _glibtop_sysdeps_sysinfo =
-+(1L << GLIBTOP_SYSINFO_CPUINFO);
-+
-+static glibtop_sysinfo sysinfo = { .flags = 0 };
-+
-+static void
-+init_sysinfo (glibtop *server)
-+{
-+ char *model;
-+ int ncpus = 1;
-+ int mhz = 0;
-+ size_t len;
-+
-+ if(G_LIKELY(sysinfo.flags)) return;
-+
-+ glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);
-+
-+ len = sizeof (ncpus);
-+ sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0);
-+ len = 0;
-+ sysctlbyname ("hw.model", NULL, &len, NULL, 0);
-+ model = malloc (len);
-+ sysctlbyname ("hw.model", model, &len, NULL, 0);
-+ len = sizeof (mhz);
-+ sysctlbyname ("hw.clockrate", &mhz, &len, NULL, 0);
-+
-+ for(sysinfo.ncpu = 0;
-+ sysinfo.ncpu < GLIBTOP_NCPU && sysinfo.ncpu < ncpus;
-+ sysinfo.ncpu++) {
-+
-+ glibtop_entry * const cpuinfo = &sysinfo.cpuinfo[sysinfo.ncpu];
-+
-+ cpuinfo->labels = g_ptr_array_new ();
-+
-+ cpuinfo->values = g_hash_table_new_full(g_str_hash, g_str_equal,
-+ g_free, g_free);
-+
-+ cpuinfo->descriptions = g_hash_table_new_full(g_str_hash, g_str_equal,
-+ g_free, g_free);
-+
-+ g_ptr_array_add (cpuinfo->labels, "processor");
-+ g_hash_table_insert (cpuinfo->values, "processor", &sysinfo.ncpu);
-+
-+ g_ptr_array_add (cpuinfo->labels, "vendor_id");
-+ g_hash_table_insert (cpuinfo->values, "vendor_id", model);
-+
-+ g_ptr_array_add (cpuinfo->labels, "cpu MHz");
-+ g_hash_table_insert (cpuinfo->values, "cpu MHz", &mhz);
-+
-+ }
-+
-+ free (model);
-+
-+ sysinfo.flags = _glibtop_sysdeps_sysinfo;
-+}
-+
-+const glibtop_sysinfo *
-+glibtop_get_sysinfo_s (glibtop *server)
-+{
-+ init_sysinfo (server);
-+ return &sysinfo;
-+}
diff --git a/devel/libgtop2/files/patch-systeps::freebsd::procmap.c b/devel/libgtop2/files/patch-systeps::freebsd::procmap.c
index c8c701e46ec..a17e9595e7c 100644
--- a/devel/libgtop2/files/patch-systeps::freebsd::procmap.c
+++ b/devel/libgtop2/files/patch-systeps::freebsd::procmap.c
@@ -1,11 +1,155 @@
---- sysdeps/freebsd/procmap.c Wed Feb 23 17:20:45 2005
-+++ sysdeps/freebsd/procmap.c.orig Sat Mar 19 02:46:57 2005
-@@ -129,7 +129,7 @@
+--- sysdeps/freebsd/procmap.c.orig Mon Dec 12 05:09:39 2005
++++ sysdeps/freebsd/procmap.c Fri Jan 20 16:28:33 2006
+@@ -108,14 +108,16 @@ glibtop_get_proc_map_p (glibtop *server,
+ #else
+ struct vm_object object;
+ #endif
+- glibtop_map_entry *maps;
++ GArray *maps = g_array_sized_new(FALSE, FALSE,
++ sizeof(glibtop_map_entry),
++ 100);
+ #if defined __FreeBSD__
+ struct vnode vnode;
+ #if __FreeBSD_version < 500039
+ struct inode inode;
+ #endif
+ #endif
+- int count, i = 0;
++ int count;
+ int update = 0;
+
+ glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MAP), 0);
+@@ -123,15 +125,15 @@ glibtop_get_proc_map_p (glibtop *server,
+ memset (buf, 0, sizeof (glibtop_proc_map));
+
+ /* It does not work for the swapper task. */
+- if (pid == 0) return NULL;
++ if (pid == 0) return (glibtop_map_entry*) g_array_free(maps, TRUE);
+
+ glibtop_suid_enter (server);
+
/* Get the process data */
pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
if ((pinfo == NULL) || (count < 1)) {
- glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
+- return NULL;
+ glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
- return NULL;
++ return (glibtop_map_entry*) g_array_free(maps, TRUE);
}
+ /* Now we get the memory maps. */
+@@ -159,8 +161,6 @@ glibtop_get_proc_map_p (glibtop *server,
+
+ buf->total = buf->number * buf->size;
+
+- maps = g_malloc0(buf->total);
+-
+ buf->flags = _glibtop_sysdeps_proc_map;
+
+ /* Walk through the `vm_map_entry' list ... */
+@@ -170,6 +170,10 @@ glibtop_get_proc_map_p (glibtop *server,
+ * to OBJT_DEFAULT so if seems this really works. */
+
+ do {
++ glibtop_map_entry *mentry;
++ unsigned long inode, dev;
++ guint len;
++
+ if (update) {
+ if (kvm_read (server->machine.kd,
+ (unsigned long) entry.next,
+@@ -197,22 +201,6 @@ glibtop_get_proc_map_p (glibtop *server,
+ #endif
+ #endif
+
+- maps [i].flags = _glibtop_sysdeps_map_entry;
+-
+- maps [i].start = entry.start;
+- maps [i].end = entry.end;
+- maps [i].offset = entry.offset;
+-
+- maps [i].perm = 0;
+-
+- if (entry.protection & VM_PROT_READ)
+- maps [i].perm |= GLIBTOP_MAP_PERM_READ;
+- if (entry.protection & VM_PROT_WRITE)
+- maps [i].perm |= GLIBTOP_MAP_PERM_WRITE;
+- if (entry.protection & VM_PROT_EXECUTE)
+- maps [i].perm |= GLIBTOP_MAP_PERM_EXECUTE;
+-
+- i++;
+
+ #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
+ if (!entry.object.uvm_obj)
+@@ -224,7 +212,7 @@ glibtop_get_proc_map_p (glibtop *server,
+ (unsigned long) entry.object.uvm_obj,
+ &vnode, sizeof (vnode)) != sizeof (vnode)) {
+ glibtop_warn_io_r (server, "kvm_read (vnode)");
+- return NULL;
++ return (glibtop_map_entry*) g_array_free(maps, TRUE);
+ }
+ #else
+ if (!entry.object.vm_object)
+@@ -251,8 +239,8 @@ glibtop_get_proc_map_p (glibtop *server,
+ &inode, sizeof (inode)) != sizeof (inode))
+ glibtop_error_io_r (server, "kvm_read (inode)");
+
+- maps [i-1].inode = inode.i_number;
+- maps [i-1].device = inode.i_dev;
++ inode = inode.i_number;
++ dev = inode.i_dev;
+ #endif
+
+
+@@ -274,8 +262,8 @@ glibtop_get_proc_map_p (glibtop *server,
+ switch (vnode.v_type) {
+ case VREG:
+ #if __FreeBSD_version < 600006
+- maps [i-1].inode = vnode.v_cachedid;
+- maps [i-1].device = vnode.v_cachedfs;
++ inode = vnode.v_cachedid;
++ dev = vnode.v_cachedfs;
+ #endif
+ default:
+ continue;
+@@ -289,11 +277,37 @@ glibtop_get_proc_map_p (glibtop *server,
+ &inode, sizeof (inode)) != sizeof (inode))
+ glibtop_error_io_r (server, "kvm_read (inode)");
+
+- maps [i-1].inode = inode.i_number;
+- maps [i-1].device = inode.i_dev;
++ inode = inode.i_number;
++ dev = inode.i_dev;
+ #endif
+ #endif
++ len = maps->len;
++ g_array_set_size(maps, len + 1);
++ mentry = &g_array_index(maps, glibtop_map_entry, len);
++
++ mentry->flags = _glibtop_sysdeps_map_entry;
++
++ mentry->start = (guint64) entry.start;
++ mentry->end = (guint64) entry.end;
++ mentry->offset = (guint64) entry.offset;
++ mentry->device = (guint64) dev;
++ mentry->inode = (guint64) inode;
++
++ mentry->perm = (guint64) 0;
++
++ if (entry.protection & VM_PROT_READ)
++ mentry->perm |= GLIBTOP_MAP_PERM_READ;
++ if (entry.protection & VM_PROT_WRITE)
++ mentry->perm |= GLIBTOP_MAP_PERM_WRITE;
++ if (entry.protection & VM_PROT_EXECUTE)
++ mentry->perm |= GLIBTOP_MAP_PERM_EXECUTE;
+ } while (entry.next != first);
+
+- return maps;
++ buf->flags = _glibtop_sysdeps_proc_map;
++
++ buf->number = maps->len;
++ buf->size = sizeof (glibtop_map_entry);
++ buf->total = buf->number * buf->size;
++
++ return (glibtop_map_entry*) g_array_free(maps, FALSE);
+ }
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index b4f95e658e8..020a91183bd 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -44,7 +44,7 @@ include/libgtop-2.0/libgtopconfig.h
lib/libgtop-2.0.a
lib/libgtop-2.0.la
lib/libgtop-2.0.so
-lib/libgtop-2.0.so.2
+lib/libgtop-2.0.so.7
libdata/pkgconfig/libgtop-2.0.pc
share/locale/am/LC_MESSAGES/libgtop-2.0.mo
share/locale/ar/LC_MESSAGES/libgtop-2.0.mo
@@ -77,6 +77,7 @@ share/locale/hu/LC_MESSAGES/libgtop-2.0.mo
share/locale/id/LC_MESSAGES/libgtop-2.0.mo
share/locale/it/LC_MESSAGES/libgtop-2.0.mo
share/locale/ja/LC_MESSAGES/libgtop-2.0.mo
+share/locale/ka/LC_MESSAGES/libgtop-2.0.mo
share/locale/ko/LC_MESSAGES/libgtop-2.0.mo
share/locale/ku/LC_MESSAGES/libgtop-2.0.mo
share/locale/ky/LC_MESSAGES/libgtop-2.0.mo
@@ -107,6 +108,7 @@ share/locale/sr/LC_MESSAGES/libgtop-2.0.mo
share/locale/sr@Latn/LC_MESSAGES/libgtop-2.0.mo
share/locale/sv/LC_MESSAGES/libgtop-2.0.mo
share/locale/ta/LC_MESSAGES/libgtop-2.0.mo
+share/locale/th/LC_MESSAGES/libgtop-2.0.mo
share/locale/tr/LC_MESSAGES/libgtop-2.0.mo
share/locale/uk/LC_MESSAGES/libgtop-2.0.mo
share/locale/vi/LC_MESSAGES/libgtop-2.0.mo
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index a6185a42c86..9585ed091e7 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libsoup/Makefile,v 1.30 2005/08/29 03:22:33 marcus Exp $
+# $MCom: ports/devel/libsoup/Makefile,v 1.36 2006/04/13 07:52:33 bland Exp $
#
PORTNAME= libsoup
-PORTVERSION= 2.2.7
-PORTREVISION= 2
+PORTVERSION= 2.2.92
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo
index ec61826f064..ec6f038c1de 100644
--- a/devel/libsoup/distinfo
+++ b/devel/libsoup/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libsoup-2.2.7.tar.bz2) = fd1d6bf0ec3e57c8a1498b935d13ace4
-SHA256 (gnome2/libsoup-2.2.7.tar.bz2) = bd5992ab97ae7da9dafce67a58513580831bb1f8ab61e00daed8c12cd7d7dc3f
-SIZE (gnome2/libsoup-2.2.7.tar.bz2) = 440977
+MD5 (gnome2/libsoup-2.2.92.tar.bz2) = 44803c568d80f0adf3141fa23998ca74
+SHA256 (gnome2/libsoup-2.2.92.tar.bz2) = 142bf49e6f09dbe3a9f298e18546ef794a46cd8fc13867fa4716f15fec2c4c2f
+SIZE (gnome2/libsoup-2.2.92.tar.bz2) = 446636
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index a6185a42c86..9585ed091e7 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/libsoup/Makefile,v 1.30 2005/08/29 03:22:33 marcus Exp $
+# $MCom: ports/devel/libsoup/Makefile,v 1.36 2006/04/13 07:52:33 bland Exp $
#
PORTNAME= libsoup
-PORTVERSION= 2.2.7
-PORTREVISION= 2
+PORTVERSION= 2.2.92
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libsoup22/distinfo b/devel/libsoup22/distinfo
index ec61826f064..ec6f038c1de 100644
--- a/devel/libsoup22/distinfo
+++ b/devel/libsoup22/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libsoup-2.2.7.tar.bz2) = fd1d6bf0ec3e57c8a1498b935d13ace4
-SHA256 (gnome2/libsoup-2.2.7.tar.bz2) = bd5992ab97ae7da9dafce67a58513580831bb1f8ab61e00daed8c12cd7d7dc3f
-SIZE (gnome2/libsoup-2.2.7.tar.bz2) = 440977
+MD5 (gnome2/libsoup-2.2.92.tar.bz2) = 44803c568d80f0adf3141fa23998ca74
+SHA256 (gnome2/libsoup-2.2.92.tar.bz2) = 142bf49e6f09dbe3a9f298e18546ef794a46cd8fc13867fa4716f15fec2c4c2f
+SIZE (gnome2/libsoup-2.2.92.tar.bz2) = 446636
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 677c0e8184d..c8faa7191d4 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -3,13 +3,13 @@
# 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 $
PORTNAME= gobject
-PORTVERSION= 2.8.0
-PORTREVISION= 1
+PORTVERSION= 2.10.1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/pygobject/2.8
+MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pygobject-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -23,6 +23,6 @@ USE_GNOME= gnomehack glib20
USE_PYTHON= yes
GNU_CONFIGURE= yes
-CONFLICTS= py*-gtk-[0-9]*
+CONFLICTS= py*-gtk-0*
.include <bsd.port.mk>
diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo
index 4e818922b9f..9bf7994d19f 100644
--- a/devel/py-gobject/distinfo
+++ b/devel/py-gobject/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygobject-2.8.0.tar.bz2) = 9ad0bd2d296417321bccea4d9abf077c
-SHA256 (gnome2/pygobject-2.8.0.tar.bz2) = 82dfc3054c4fcfb37847e43df8ad298808fda955aa7c2056f5cab991fd9aa145
-SIZE (gnome2/pygobject-2.8.0.tar.bz2) = 262853
+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
diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist
index 9c1badfcdd1..bbd12810ba5 100644
--- a/devel/py-gobject/pkg-plist
+++ b/devel/py-gobject/pkg-plist
@@ -1,4 +1,7 @@
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%%/pygtk.pth
diff --git a/devel/py-orbit2/Makefile b/devel/py-orbit2/Makefile
index 5a5752b5d3b..33ed83a1de1 100644
--- a/devel/py-orbit2/Makefile
+++ b/devel/py-orbit2/Makefile
@@ -3,13 +3,13 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/py-orbit2/Makefile,v 1.11 2006/04/13 07:52:34 bland Exp $
PORTNAME= orbit
-PORTVERSION= 2.0.1
-PORTREVISION= 3
+PORTVERSION= 2.14.0
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/pyorbit/2.0
+MASTER_SITE_SUBDIR= sources/pyorbit/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyorbit-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/py-orbit2/distinfo b/devel/py-orbit2/distinfo
index c0926d4a02c..7338e67c233 100644
--- a/devel/py-orbit2/distinfo
+++ b/devel/py-orbit2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pyorbit-2.0.1.tar.bz2) = c39384f6257a386231d79db9e403d905
-SHA256 (gnome2/pyorbit-2.0.1.tar.bz2) = 4ef3a52ebfc028b21d227d29179211f86e1c51bbcc3bf8796df746065788a1bf
-SIZE (gnome2/pyorbit-2.0.1.tar.bz2) = 242959
+MD5 (gnome2/pyorbit-2.14.0.tar.bz2) = ff62b983d5d9be164bd5a207d692eab5
+SHA256 (gnome2/pyorbit-2.14.0.tar.bz2) = 4963d045f92b5975c0a7df28e7915d7efaf4c6d6f79642ecb1e8121410add32f
+SIZE (gnome2/pyorbit-2.14.0.tar.bz2) = 275825
diff --git a/editors/gedit-autocomplete-plugin/Makefile b/editors/gedit-autocomplete-plugin/Makefile
index f232f571676..015edcfecc8 100644
--- a/editors/gedit-autocomplete-plugin/Makefile
+++ b/editors/gedit-autocomplete-plugin/Makefile
@@ -18,7 +18,9 @@ COMMENT= A simple autocompletion plugin for gedit
BUILD_DEPENDS= gedit:${PORTSDIR}/editors/gedit
RUN_DEPENDS= gedit:${PORTSDIR}/editors/gedit
-GEDIT_VERSION= 2.12
+GEDIT_VERSION= 2.14
+
+BROKEN= Not compatible with gedit versions >= 2.14
USE_X_PREFIX= yes
MAKEFILE= makefile
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 0de92d76304..a63d9b36992 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/gedit/Makefile,v 1.12 2005/10/03 15:49:09 ahze Exp $
+# $MCom: ports/editors/gedit/Makefile,v 1.33 2006/04/13 07:52:34 bland Exp $
#
PORTNAME= gedit
-PORTVERSION= 2.12.1
-PORTREVISION= 1
+PORTVERSION= 2.14.2
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -20,6 +19,7 @@ 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
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
@@ -27,14 +27,33 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack intlhack \
libgnomeprintui libgnomeui eel2 gtksourceview desktopfileutils
+WANT_GNOME= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-PLIST_SUB= VERSION="2.12"
+PLIST_SUB= VERSION="2.14"
MAN1= gedit.1
GCONF_SCHEMAS= gedit.schemas
+.if defined(PACKAGE_BUILDING)
+.undef WITHOUT_GNOME
+WITH_GNOME= yes
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mpygnomedesktop}!=""
+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
+
post-install:
@-update-desktop-database
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 33c7c27229e..675f6f631bd 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gedit-2.12.1.tar.bz2) = 13f376c6c63b0fbd25ba9b6c7d6fb97c
-SHA256 (gnome2/gedit-2.12.1.tar.bz2) = a19cf963a655b9825f4f94ad8e83d4ce9df56a542b847d60a5bddd067ae07b3e
-SIZE (gnome2/gedit-2.12.1.tar.bz2) = 2018712
+MD5 (gnome2/gedit-2.14.2.tar.bz2) = 35d146a924fd426d448048e8db383334
+SHA256 (gnome2/gedit-2.14.2.tar.bz2) = 51b9833fa7b43a0e2207767d21ea6aedf0175bf7fde95c1bf56bf21670f2ef7e
+SIZE (gnome2/gedit-2.14.2.tar.bz2) = 2371194
diff --git a/editors/gedit/files/patch-configure b/editors/gedit/files/patch-configure
index 91c1e9a657d..6bfadb0af65 100644
--- a/editors/gedit/files/patch-configure
+++ b/editors/gedit/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Wed Feb 25 02:26:37 2004
-+++ configure Wed Feb 25 02:27:22 2004
-@@ -22282,6 +22282,7 @@
+--- configure.orig Wed Dec 14 09:07:01 2005
++++ configure Wed Dec 14 09:07:01 2005
+@@ -22216,6 +22216,7 @@
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8,32 +8,11 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22371,6 +22372,7 @@
+@@ -22304,6 +22305,7 @@
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
+LIBS="-lintl $LIBS"
- else
- { { echo "$as_me:$LINENO: error: ngettext function is required to build gedit." >&5
-@@ -22405,17 +22407,17 @@
- if test "x${prefix}" = "xNONE"; then
-
- cat >>confdefs.h <<_ACEOF
--#define PIXMAPS_DIR "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
-+
- _ACEOF
-
- pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
- else
-
- cat >>confdefs.h <<_ACEOF
--#define PIXMAPS_DIR "${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
-+#define PIXMAPS_DIR "${datadir}/pixmaps"
- _ACEOF
-
-- pixmapsdir="${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
-+ pixmapsdir="${datadir}/pixmaps"
fi
-
-
+ done
diff --git a/editors/gedit/files/patch-gedit_gedit-module.c b/editors/gedit/files/patch-gedit_gedit-module.c
new file mode 100644
index 00000000000..b12781557ee
--- /dev/null
+++ b/editors/gedit/files/patch-gedit_gedit-module.c
@@ -0,0 +1,11 @@
+--- gedit/gedit-module.c.orig Fri Jan 6 12:19:53 2006
++++ gedit/gedit-module.c Fri Jan 6 12:20:21 2006
+@@ -142,7 +142,7 @@ gedit_module_unload (GTypeModule *gmodul
+
+ gedit_debug_message (DEBUG_PLUGINS, "Unloading %s", module->path);
+
+- g_module_close (module->library);
++ /*g_module_close (module->library);*/
+
+ module->library = NULL;
+ module->type = 0;
diff --git a/editors/gedit/files/patch-gedit_gedit-plugins-engine.c b/editors/gedit/files/patch-gedit_gedit-plugins-engine.c
deleted file mode 100644
index 2fee7b8cd04..00000000000
--- a/editors/gedit/files/patch-gedit_gedit-plugins-engine.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- gedit/gedit-plugins-engine.c.orig Fri Aug 5 22:00:45 2005
-+++ gedit/gedit-plugins-engine.c Fri Aug 5 22:01:03 2005
-@@ -314,8 +314,8 @@ gedit_plugins_engine_shutdown (void)
- }
- }
-
-- if (info->plugin->handle != NULL)
-- g_module_close (info->plugin->handle);
-+ /*if (info->plugin->handle != NULL)
-+ g_module_close (info->plugin->handle);*/
-
- g_free (info->plugin->file);
- g_free (info->plugin->location);
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index 1a1dc0a9dc8..e76de9653a6 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -1,34 +1,57 @@
bin/gedit
bin/gnome-text-editor
-include/gedit-%%VERSION%%/gedit/bonobo-mdi-child.h
-include/gedit-%%VERSION%%/gedit/bonobo-mdi.h
+include/gedit-%%VERSION%%/gedit/gedit-app.h
include/gedit-%%VERSION%%/gedit/gedit-convert.h
include/gedit-%%VERSION%%/gedit/gedit-debug.h
include/gedit-%%VERSION%%/gedit/gedit-document.h
include/gedit-%%VERSION%%/gedit/gedit-encodings-option-menu.h
include/gedit-%%VERSION%%/gedit/gedit-encodings.h
-include/gedit-%%VERSION%%/gedit/gedit-file.h
-include/gedit-%%VERSION%%/gedit/gedit-mdi-child.h
-include/gedit-%%VERSION%%/gedit/gedit-mdi.h
-include/gedit-%%VERSION%%/gedit/gedit-menus.h
+include/gedit-%%VERSION%%/gedit/gedit-file-chooser-dialog.h
+include/gedit-%%VERSION%%/gedit/gedit-help.h
+include/gedit-%%VERSION%%/gedit/gedit-message-area.h
include/gedit-%%VERSION%%/gedit/gedit-metadata-manager.h
-include/gedit-%%VERSION%%/gedit/gedit-output-window.h
+include/gedit-%%VERSION%%/gedit/gedit-notebook.h
+include/gedit-%%VERSION%%/gedit/gedit-panel.h
include/gedit-%%VERSION%%/gedit/gedit-plugin.h
include/gedit-%%VERSION%%/gedit/gedit-prefs-manager-app.h
include/gedit-%%VERSION%%/gedit/gedit-prefs-manager.h
+include/gedit-%%VERSION%%/gedit/gedit-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/gedit2.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-bonobo.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
+%%PYTHON%%lib/gedit-2/plugins/externaltools/ElementTree.py
+%%PYTHON%%lib/gedit-2/plugins/externaltools/ElementTree.pyc
+%%PYTHON%%lib/gedit-2/plugins/externaltools/ElementTree.pyo
+%%PYTHON%%lib/gedit-2/plugins/externaltools/__init__.py
+%%PYTHON%%lib/gedit-2/plugins/externaltools/__init__.pyc
+%%PYTHON%%lib/gedit-2/plugins/externaltools/__init__.pyo
+%%PYTHON%%lib/gedit-2/plugins/externaltools/capture.py
+%%PYTHON%%lib/gedit-2/plugins/externaltools/capture.pyc
+%%PYTHON%%lib/gedit-2/plugins/externaltools/capture.pyo
+%%PYTHON%%lib/gedit-2/plugins/externaltools/functions.py
+%%PYTHON%%lib/gedit-2/plugins/externaltools/functions.pyc
+%%PYTHON%%lib/gedit-2/plugins/externaltools/functions.pyo
+%%PYTHON%%lib/gedit-2/plugins/externaltools/manager.py
+%%PYTHON%%lib/gedit-2/plugins/externaltools/manager.pyc
+%%PYTHON%%lib/gedit-2/plugins/externaltools/manager.pyo
+%%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.py
+%%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.pyc
+%%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.pyo
+%%PYTHON%%lib/gedit-2/plugins/externaltools/tools.glade
lib/gedit-2/plugins/indent.gedit-plugin
lib/gedit-2/plugins/libchangecase.la
lib/gedit-2/plugins/libchangecase.so
@@ -38,10 +61,6 @@ lib/gedit-2/plugins/libindent.la
lib/gedit-2/plugins/libindent.so
lib/gedit-2/plugins/libsample.la
lib/gedit-2/plugins/libsample.so
-lib/gedit-2/plugins/libsavecopy.la
-lib/gedit-2/plugins/libsavecopy.so
-lib/gedit-2/plugins/libshell_output.la
-lib/gedit-2/plugins/libshell_output.so
lib/gedit-2/plugins/libsort.la
lib/gedit-2/plugins/libsort.so
lib/gedit-2/plugins/libspell.la
@@ -50,32 +69,81 @@ lib/gedit-2/plugins/libtaglist.la
lib/gedit-2/plugins/libtaglist.so
lib/gedit-2/plugins/libtime.la
lib/gedit-2/plugins/libtime.so
+%%PYTHON%%lib/gedit-2/plugins/modelines.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/modelines.py
+%%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
-lib/gedit-2/plugins/savecopy.gedit-plugin
-lib/gedit-2/plugins/shell_output.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/snippets.gedit-plugin
+%%PYTHON%%lib/gedit-2/plugins/snippets/ElementTree.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/ElementTree.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/ElementTree.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/Snippet.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/Snippet.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/Snippet.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetComplete.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetComplete.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetComplete.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetController.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetController.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetController.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPlaceholders.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPlaceholders.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPlaceholders.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPluginInstance.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPluginInstance.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetPluginInstance.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsDialog.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsDialog.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsDialog.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsLibrary.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsLibrary.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/SnippetsLibrary.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/__init__.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/__init__.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/__init__.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/functions.py
+%%PYTHON%%lib/gedit-2/plugins/snippets/functions.pyc
+%%PYTHON%%lib/gedit-2/plugins/snippets/functions.pyo
+%%PYTHON%%lib/gedit-2/plugins/snippets/snippets.glade
lib/gedit-2/plugins/sort.gedit-plugin
lib/gedit-2/plugins/spell.gedit-plugin
lib/gedit-2/plugins/taglist.gedit-plugin
lib/gedit-2/plugins/time.gedit-plugin
-libdata/bonobo/servers/GNOME_Gedit.server
libdata/pkgconfig/gedit-%%VERSION%%.pc
-share/gnome/application-registry/gedit.applications
share/gnome/applications/gedit.desktop
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/gedit-2/glade/docinfo.glade2
-share/gnome/gedit-2/glade/gedit-encodings-dialog.glade2
-share/gnome/gedit-2/glade/gedit-preferences.glade2
-share/gnome/gedit-2/glade/goto-line.glade2
+share/gnome/gedit-2/glade/gedit-encodings-dialog.glade
+share/gnome/gedit-2/glade/gedit-open-location-dialog.glade
+share/gnome/gedit-2/glade/gedit-page-setup-dialog.glade
+share/gnome/gedit-2/glade/gedit-preferences-dialog.glade
+share/gnome/gedit-2/glade/gedit-search-dialog.glade
share/gnome/gedit-2/glade/languages-dialog.glade2
-share/gnome/gedit-2/glade/page-setup-dialog.glade2
-share/gnome/gedit-2/glade/plugin-manager.glade2
-share/gnome/gedit-2/glade/program-location-dialog.glade2
-share/gnome/gedit-2/glade/replace.glade2
-share/gnome/gedit-2/glade/shell_output.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/glade/uri.glade2
+%%PYTHON%%share/gnome/gedit-2/plugins/externaltools/stock-tools.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
+%%PYTHON%%share/gnome/gedit-2/plugins/snippets/global.xml
+%%PYTHON%%share/gnome/gedit-2/plugins/snippets/haskell.xml
+%%PYTHON%%share/gnome/gedit-2/plugins/snippets/html.xml
+%%PYTHON%%share/gnome/gedit-2/plugins/snippets/idl.xml
+%%PYTHON%%share/gnome/gedit-2/plugins/snippets/java.xml
+%%PYTHON%%share/gnome/gedit-2/plugins/snippets/javascript.xml
+%%PYTHON%%share/gnome/gedit-2/plugins/snippets/latex.xml
+%%PYTHON%%share/gnome/gedit-2/plugins/snippets/perl.xml
+%%PYTHON%%share/gnome/gedit-2/plugins/snippets/php.xml
+%%PYTHON%%share/gnome/gedit-2/plugins/snippets/python.xml
+%%PYTHON%%share/gnome/gedit-2/plugins/snippets/ruby.xml
+%%PYTHON%%share/gnome/gedit-2/plugins/snippets/sh.xml
+%%PYTHON%%share/gnome/gedit-2/plugins/snippets/tcl.xml
+%%PYTHON%%share/gnome/gedit-2/plugins/snippets/xml.xml
share/gnome/gedit-2/taglist/HTML.tags
share/gnome/gedit-2/taglist/Latex.tags
share/gnome/gedit-2/taglist/XSLT.tags
@@ -88,10 +156,26 @@ share/gnome/help/gedit/C/figures/gedit_recent_files_menu_icon.png
share/gnome/help/gedit/C/figures/gedit_window.png
share/gnome/help/gedit/C/gedit.xml
share/gnome/help/gedit/C/legal.xml
+share/gnome/help/gedit/bg/figures/gedit_format_bold.png
+share/gnome/help/gedit/bg/figures/gedit_format_italic.png
+share/gnome/help/gedit/bg/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/bg/figures/gedit_format_underline.png
+share/gnome/help/gedit/bg/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/bg/figures/gedit_window.png
+share/gnome/help/gedit/bg/gedit.xml
+share/gnome/help/gedit/bg/legal.xml
+share/gnome/help/gedit/de/figures/gedit_format_bold.png
+share/gnome/help/gedit/de/figures/gedit_format_italic.png
+share/gnome/help/gedit/de/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/de/figures/gedit_format_underline.png
share/gnome/help/gedit/de/figures/gedit_recent_files_menu_icon.png
share/gnome/help/gedit/de/figures/gedit_window.png
share/gnome/help/gedit/de/gedit.xml
share/gnome/help/gedit/de/legal.xml
+share/gnome/help/gedit/es/figures/gedit_format_bold.png
+share/gnome/help/gedit/es/figures/gedit_format_italic.png
+share/gnome/help/gedit/es/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/es/figures/gedit_format_underline.png
share/gnome/help/gedit/es/figures/gedit_recent_files_menu_icon.png
share/gnome/help/gedit/es/figures/gedit_window.png
share/gnome/help/gedit/es/gedit.xml
@@ -100,14 +184,26 @@ share/gnome/help/gedit/eu/figures/gedit_recent_files_menu_icon.png
share/gnome/help/gedit/eu/figures/gedit_window.png
share/gnome/help/gedit/eu/gedit.xml
share/gnome/help/gedit/eu/legal.xml
+share/gnome/help/gedit/fr/figures/gedit_format_bold.png
+share/gnome/help/gedit/fr/figures/gedit_format_italic.png
+share/gnome/help/gedit/fr/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/fr/figures/gedit_format_underline.png
share/gnome/help/gedit/fr/figures/gedit_recent_files_menu_icon.png
share/gnome/help/gedit/fr/figures/gedit_window.png
share/gnome/help/gedit/fr/gedit.xml
share/gnome/help/gedit/fr/legal.xml
+share/gnome/help/gedit/it/figures/gedit_format_bold.png
+share/gnome/help/gedit/it/figures/gedit_format_italic.png
+share/gnome/help/gedit/it/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/it/figures/gedit_format_underline.png
share/gnome/help/gedit/it/figures/gedit_recent_files_menu_icon.png
share/gnome/help/gedit/it/figures/gedit_window.png
share/gnome/help/gedit/it/gedit.xml
share/gnome/help/gedit/it/legal.xml
+share/gnome/help/gedit/ja/figures/gedit_format_bold.png
+share/gnome/help/gedit/ja/figures/gedit_format_italic.png
+share/gnome/help/gedit/ja/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/ja/figures/gedit_format_underline.png
share/gnome/help/gedit/ja/figures/gedit_recent_files_menu_icon.png
share/gnome/help/gedit/ja/figures/gedit_window.png
share/gnome/help/gedit/ja/gedit.xml
@@ -123,21 +219,32 @@ share/gnome/help/gedit/sv/figures/gedit_recent_files_menu_icon.png
share/gnome/help/gedit/sv/figures/gedit_window.png
share/gnome/help/gedit/sv/gedit.xml
share/gnome/help/gedit/sv/legal.xml
+share/gnome/help/gedit/zh_CN/figures/gedit_format_bold.png
+share/gnome/help/gedit/zh_CN/figures/gedit_format_italic.png
+share/gnome/help/gedit/zh_CN/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/zh_CN/figures/gedit_format_underline.png
share/gnome/help/gedit/zh_CN/figures/gedit_recent_files_menu_icon.png
share/gnome/help/gedit/zh_CN/figures/gedit_window.png
share/gnome/help/gedit/zh_CN/gedit.xml
share/gnome/help/gedit/zh_CN/legal.xml
+share/gnome/help/gedit/zh_HK/figures/gedit_format_bold.png
+share/gnome/help/gedit/zh_HK/figures/gedit_format_italic.png
+share/gnome/help/gedit/zh_HK/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/zh_HK/figures/gedit_format_underline.png
share/gnome/help/gedit/zh_HK/figures/gedit_recent_files_menu_icon.png
share/gnome/help/gedit/zh_HK/figures/gedit_window.png
share/gnome/help/gedit/zh_HK/gedit.xml
share/gnome/help/gedit/zh_HK/legal.xml
+share/gnome/help/gedit/zh_TW/figures/gedit_format_bold.png
+share/gnome/help/gedit/zh_TW/figures/gedit_format_italic.png
+share/gnome/help/gedit/zh_TW/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/zh_TW/figures/gedit_format_underline.png
share/gnome/help/gedit/zh_TW/figures/gedit_recent_files_menu_icon.png
share/gnome/help/gedit/zh_TW/figures/gedit_window.png
share/gnome/help/gedit/zh_TW/gedit.xml
share/gnome/help/gedit/zh_TW/legal.xml
-share/gnome/idl/GNOME_Gedit.idl
-share/gnome/mime-info/gedit.keys
share/gnome/omf/gedit/gedit-C.omf
+share/gnome/omf/gedit/gedit-bg.omf
share/gnome/omf/gedit/gedit-de.omf
share/gnome/omf/gedit/gedit-es.omf
share/gnome/omf/gedit/gedit-eu.omf
@@ -160,12 +267,14 @@ 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/br/LC_MESSAGES/gedit.mo
share/locale/bs/LC_MESSAGES/gedit.mo
share/locale/ca/LC_MESSAGES/gedit.mo
share/locale/cs/LC_MESSAGES/gedit.mo
share/locale/cy/LC_MESSAGES/gedit.mo
share/locale/da/LC_MESSAGES/gedit.mo
share/locale/de/LC_MESSAGES/gedit.mo
+share/locale/dz/LC_MESSAGES/gedit.mo
share/locale/el/LC_MESSAGES/gedit.mo
share/locale/en_CA/LC_MESSAGES/gedit.mo
share/locale/en_GB/LC_MESSAGES/gedit.mo
@@ -186,9 +295,9 @@ share/locale/id/LC_MESSAGES/gedit.mo
share/locale/is/LC_MESSAGES/gedit.mo
share/locale/it/LC_MESSAGES/gedit.mo
share/locale/ja/LC_MESSAGES/gedit.mo
+share/locale/ka/LC_MESSAGES/gedit.mo
share/locale/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/mi/LC_MESSAGES/gedit.mo
@@ -209,7 +318,6 @@ 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
@@ -217,18 +325,18 @@ 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_TW/LC_MESSAGES/gedit.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
+@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
@@ -254,16 +362,24 @@ share/locale/zh_TW/LC_MESSAGES/gedit.mo
@dirrm share/gnome/help/gedit/es
@dirrm share/gnome/help/gedit/de/figures
@dirrm share/gnome/help/gedit/de
+@dirrm share/gnome/help/gedit/bg/figures
+@dirrm share/gnome/help/gedit/bg
@dirrm share/gnome/help/gedit/C/figures
@dirrm share/gnome/help/gedit/C
@dirrm share/gnome/help/gedit
@dirrm share/gnome/gedit-2/ui
@dirrm share/gnome/gedit-2/taglist
+%%PYTHON%%@dirrm share/gnome/gedit-2/plugins/snippets
+%%PYTHON%%@dirrm share/gnome/gedit-2/plugins/externaltools
+%%PYTHON%%@dirrm share/gnome/gedit-2/plugins
@dirrm share/gnome/gedit-2/glade
@dirrm share/gnome/gedit-2
+%%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
diff --git a/editors/gnome2-office/Makefile b/editors/gnome2-office/Makefile
index 522c466f4cf..3c661fc92b4 100644
--- a/editors/gnome2-office/Makefile
+++ b/editors/gnome2-office/Makefile
@@ -3,10 +3,10 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/gnome2-office/Makefile,v 1.39 2005/08/11 02:55:29 marcus Exp $
+# $MCom: ports/editors/gnome2-office/Makefile,v 1.41 2006/04/12 22:11:33 marcus Exp $
#
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= editors gnome
PKGNAMESUFFIX= -office
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index 8962f47fe96..be673aa18d2 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -3,15 +3,14 @@
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/games/atomix/Makefile,v 1.2 2005/08/04 04:03:32 marcus Exp $
+# $MCom: ports/games/atomix/Makefile,v 1.9 2006/04/13 07:52:34 bland Exp $
#
PORTNAME= atomix
-PORTVERSION= 1.2.4
-PORTREVISION= 1
+PORTVERSION= 2.14.0
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -20,7 +19,7 @@ COMMENT= A yet another little mind game
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_BZIP2= yes
-USE_REINPLACE= yes
+USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -28,5 +27,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
post-patch:
@${REINPLACE_CMD} -e 's/games\.games/games:games/' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e '/^$$/d' ${WRKSRC}/po/POTFILES.in
.include <bsd.port.mk>
diff --git a/games/atomix/distinfo b/games/atomix/distinfo
index d65f079922b..36b7a3fc940 100644
--- a/games/atomix/distinfo
+++ b/games/atomix/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/atomix-1.2.4.tar.bz2) = ddf41160f3e108a9a937af87fa8c24d3
-SHA256 (gnome2/atomix-1.2.4.tar.bz2) = 476ae1ae6425ac8d2fb733cc995eadaa620383fa6af881126c89ae0628fcdff8
-SIZE (gnome2/atomix-1.2.4.tar.bz2) = 300052
+MD5 (gnome2/atomix-2.14.0.tar.bz2) = 54f4b98463b57aebc7692d1b153791af
+SHA256 (gnome2/atomix-2.14.0.tar.bz2) = 5d4e073c29e7d23d49b1bfcce9edf1e8f0c04bdb91db368e05e854e2b2636bb8
+SIZE (gnome2/atomix-2.14.0.tar.bz2) = 284987
diff --git a/games/atomix/files/patch-level-manager.c b/games/atomix/files/patch-level-manager.c
deleted file mode 100644
index 573ce8c6655..00000000000
--- a/games/atomix/files/patch-level-manager.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/level-manager.c.orig Thu Nov 17 17:45:18 2005
-+++ src/level-manager.c Thu Nov 17 17:45:31 2005
-@@ -232,10 +232,10 @@ static void search_level_in_dir (LevelMa
- g_free (levelname);
- }
- }
-+ g_free (dent);
-+ closedir (dir);
- }
-
-- g_free (dent);
-- closedir (dir);
- }
-
- static gchar *lookup_level_name (gchar *filename)
diff --git a/games/atomix/files/patch-theme-manager.c b/games/atomix/files/patch-theme-manager.c
deleted file mode 100644
index 185e64af8c5..00000000000
--- a/games/atomix/files/patch-theme-manager.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/theme-manager.c.orig Thu Nov 17 17:43:33 2005
-+++ src/theme-manager.c Thu Nov 17 17:43:58 2005
-@@ -168,10 +168,10 @@ static void search_themes_in_dir (ThemeM
- g_free (subdirpath);
- }
- }
-+ g_free (dent);
-+ closedir (dir);
- }
-
-- g_free (dent);
-- closedir (dir);
- }
-
- static void add_theme (ThemeManager *tm, gchar *themename, gchar *dirpath)
diff --git a/games/atomix/pkg-plist b/games/atomix/pkg-plist
index 9341ad125a1..c87bb933391 100644
--- a/games/atomix/pkg-plist
+++ b/games/atomix/pkg-plist
@@ -83,6 +83,7 @@ share/locale/en_GB/LC_MESSAGES/atomix.mo
share/locale/es/LC_MESSAGES/atomix.mo
share/locale/et/LC_MESSAGES/atomix.mo
share/locale/fa/LC_MESSAGES/atomix.mo
+share/locale/fi/LC_MESSAGES/atomix.mo
share/locale/fr/LC_MESSAGES/atomix.mo
share/locale/ga/LC_MESSAGES/atomix.mo
share/locale/gl/LC_MESSAGES/atomix.mo
@@ -95,10 +96,15 @@ share/locale/it/LC_MESSAGES/atomix.mo
share/locale/ja/LC_MESSAGES/atomix.mo
share/locale/kn/LC_MESSAGES/atomix.mo
share/locale/ko/LC_MESSAGES/atomix.mo
+share/locale/lt/LC_MESSAGES/atomix.mo
share/locale/lv/LC_MESSAGES/atomix.mo
+share/locale/mk/LC_MESSAGES/atomix.mo
+share/locale/ml/LC_MESSAGES/atomix.mo
share/locale/ms/LC_MESSAGES/atomix.mo
+share/locale/nb/LC_MESSAGES/atomix.mo
share/locale/nl/LC_MESSAGES/atomix.mo
share/locale/no/LC_MESSAGES/atomix.mo
+share/locale/pa/LC_MESSAGES/atomix.mo
share/locale/pl/LC_MESSAGES/atomix.mo
share/locale/pt/LC_MESSAGES/atomix.mo
share/locale/pt_BR/LC_MESSAGES/atomix.mo
@@ -115,7 +121,10 @@ share/locale/uk/LC_MESSAGES/atomix.mo
share/locale/vi/LC_MESSAGES/atomix.mo
share/locale/wa/LC_MESSAGES/atomix.mo
share/locale/zh_CN/LC_MESSAGES/atomix.mo
+share/locale/zh_HK/LC_MESSAGES/atomix.mo
share/locale/zh_TW/LC_MESSAGES/atomix.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrm share/gnome/atomix/themes/default
@dirrm share/gnome/atomix/themes
@dirrm share/gnome/atomix/level
diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile
index 1b2ea3165e4..106a397e463 100644
--- a/games/gnome-games-extra-data/Makefile
+++ b/games/gnome-games-extra-data/Makefile
@@ -3,14 +3,14 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/games/gnomegames2-extra-data/Makefile,v 1.6 2005/09/07 15:01:43 adamw Exp $
+# $MCom: ports/games/gnomegames2-extra-data/Makefile,v 1.8 2006/04/22 18:07:24 marcus Exp $
#
PORTNAME= gnomegames2-extra-data
-PORTVERSION= 2.12.0
+PORTVERSION= 2.14.0
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/2.12
+MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-games-extra-data-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-USE_GNOME= gnomehack gnomeprefix
+USE_GNOME= gnomehack gnomeprefix gnometarget
CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/gnome-games-extra-data/distinfo b/games/gnome-games-extra-data/distinfo
index aa8a003d1ca..57806d4acbd 100644
--- a/games/gnome-games-extra-data/distinfo
+++ b/games/gnome-games-extra-data/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-games-extra-data-2.12.0.tar.bz2) = 51b2b54c41b6d9cb1a228143723b43a1
-SHA256 (gnome2/gnome-games-extra-data-2.12.0.tar.bz2) = 9a82737ba2ddb86514903c8b90c99ab84569e1ce4b5185ace0086f1e0cb54806
-SIZE (gnome2/gnome-games-extra-data-2.12.0.tar.bz2) = 2644415
+MD5 (gnome2/gnome-games-extra-data-2.14.0.tar.bz2) = 01464739e83449288c6a58685604f86e
+SHA256 (gnome2/gnome-games-extra-data-2.14.0.tar.bz2) = 2785206387d7444f37e27dbb606e587ca282f7ba54723b052e6c44dcca99a39e
+SIZE (gnome2/gnome-games-extra-data-2.14.0.tar.bz2) = 2868801
diff --git a/games/gnome-games-extra-data/pkg-plist b/games/gnome-games-extra-data/pkg-plist
index 15c24fa98b9..1a9fb8c4743 100644
--- a/games/gnome-games-extra-data/pkg-plist
+++ b/games/gnome-games-extra-data/pkg-plist
@@ -1,6 +1,7 @@
share/gnome/gnome-games/same-gnome/themes/2.10/blink.png
share/gnome/gnome-games/same-gnome/themes/2.10/glass.png
share/gnome/gnome-games/same-gnome/themes/2.10/marbles.png
+share/gnome/gnome-games/same-gnome/themes/2.10/matrix.png
share/gnome/gnome-games/same-gnome/themes/2.10/rotate.svg
share/gnome/pixmaps/glines/classic.png
share/gnome/pixmaps/glines/dots.png
@@ -9,9 +10,9 @@ share/gnome/pixmaps/glines/pulse.png
share/gnome/pixmaps/gnobots2/cows.png
share/gnome/pixmaps/gnobots2/eggs.png
share/gnome/pixmaps/gnobots2/mice.png
-share/gnome/pixmaps/gnobots2/windows.png
share/gnome/pixmaps/gnome-games-common/cards/bellot.svg
share/gnome/pixmaps/gnome-games-common/cards/dondorf.svg
+share/gnome/pixmaps/gnome-games-common/cards/ornamental.svg
share/gnome/pixmaps/gnometris/5blocks-tig.png
share/gnome/pixmaps/gnometris/5blocks-tim.png
share/gnome/pixmaps/gnometris/5blocks.png
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index a290533cafa..6bccbc608da 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/games/gnomegames2/Makefile,v 1.89 2005/10/03 15:30:09 ahze Exp $
+# $MCom: ports/games/gnomegames2/Makefile,v 1.111 2006/04/13 07:52:34 bland Exp $
#
PORTNAME= gnomegames2
-PORTVERSION= 2.12.3
-PORTREVISION= 1
+PORTVERSION= 2.14.1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-games/2.12
+MASTER_SITE_SUBDIR= sources/gnome-games/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-games-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -22,6 +21,7 @@ LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile
USE_BZIP2= yes
USE_PYTHON= yes
+USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
@@ -32,17 +32,18 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= aisleriot.schemas blackjack.schemas gataxx.schemas \
- glines.schemas gnect.schemas gnibbles.schemas gnobots2.schemas \
- gnome-stones.schemas gnometris.schemas gnomine.schemas \
- gnotravex.schemas gnotski.schemas gtali.schemas iagno.schemas \
- libgnomegames.schemas mahjongg.schemas same-gnome.schemas
+ glines.schemas gnect.schemas gnibbles.schemas \
+ gnobots2.schemas gnometris.schemas gnomine.schemas \
+ gnotravex.schemas gnotski.schemas gtali.schemas \
+ iagno.schemas libgnomegames.schemas mahjongg.schemas \
+ same-gnome.schemas
CONFLICTS= sol-1.0.*
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/lib/libhowl.so) || defined(WITH_MDNS)
-LIB_DEPENDS+= howl:${PORTSDIR}/net/howl
+.if exists(${LOCALBASE}/lib/libavahi-client.a) || defined(WITH_MDNS)
+LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi
.endif
post-patch:
@@ -50,6 +51,11 @@ post-patch:
'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 4f66339c4cc..13dd1e201ee 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-games-2.12.3.tar.bz2) = 06d3cfaf24dd1f0b2df1df005c69d4ff
-SHA256 (gnome2/gnome-games-2.12.3.tar.bz2) = 0bd560e6094fd0bedf5316223eeef90a99451bb739a91d7a0438a858f66a3835
-SIZE (gnome2/gnome-games-2.12.3.tar.bz2) = 4932211
+MD5 (gnome2/gnome-games-2.14.1.tar.bz2) = 9893da6c2f8eecdbc596cec9a017a8b2
+SHA256 (gnome2/gnome-games-2.14.1.tar.bz2) = c9c364883f260a57d6501f8e79564738a88e76e9fe29168613a58ef94e0d7b8a
+SIZE (gnome2/gnome-games-2.14.1.tar.bz2) = 5095238
diff --git a/games/gnome-games/files/patch-configure b/games/gnome-games/files/patch-configure
deleted file mode 100644
index f8413ef3cff..00000000000
--- a/games/gnome-games/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Wed Dec 17 11:58:34 2003
-+++ configure Wed Dec 17 11:58:35 2003
-@@ -22452,7 +22452,7 @@
- else
-
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- _ACEOF
-
- fi
diff --git a/games/gnome-games/files/patch-gnome-stones_Makefile.in b/games/gnome-games/files/patch-gnome-stones_Makefile.in
deleted file mode 100644
index 92fbe9e8806..00000000000
--- a/games/gnome-games/files/patch-gnome-stones_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-stones/Makefile.in.orig Tue Jul 23 20:37:40 2002
-+++ gnome-stones/Makefile.in Tue Jul 23 20:38:10 2002
-@@ -202,7 +202,7 @@
- Caves_in_files = default.caves.in tutorial.caves.in gnomekoban.caves.in atari.caves.in
- Caves_DATA = $(Caves_in_files:.caves.in=.caves)
-
--gtkrcdir = $(datadir)
-+gtkrcdir = $(datadir)/gnome-stones
- gtkrc_DATA = gnome-stonesrc gnome-stonesrc.ko
-
- Mimedir = $(datadir)/mime-info
diff --git a/games/gnome-games/files/patch-iagno_othello.c b/games/gnome-games/files/patch-iagno_othello.c
deleted file mode 100644
index 1d6d8e88a6a..00000000000
--- a/games/gnome-games/files/patch-iagno_othello.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- iagno/othello.c.orig Tue Jan 25 11:24:35 2005
-+++ iagno/othello.c Tue Jan 25 11:24:56 2005
-@@ -784,14 +784,14 @@
- found_free = TRUE;
- }
-
-- // check if a player is dead
-+ /* check if a player is dead */
- if (!found_me && found_not_me)
- return (S_LOSING_GAME);
- else if (found_me && !found_not_me)
- return (S_WINNING_GAME);
-
-- // if the game is finished, return the actual score rather than
-- // a huristic
-+ /* if the game is finished, return the actual score rather than
-+ * a huristic */
- if (!found_free)
- return (actual_score);
-
diff --git a/games/gnome-games/pkg-install b/games/gnome-games/pkg-install
index fe5c5177045..cbbb71f5595 100644
--- a/games/gnome-games/pkg-install
+++ b/games/gnome-games/pkg-install
@@ -5,13 +5,19 @@ PATH=/bin:/usr/bin:/usr/sbin
case $2 in
POST-INSTALL)
mkdir -p ${PKG_PREFIX}/share/gnome/games
- SCORES="glines.Large.scores glines.Medium.scores glines.Small.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.10.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.18.scores gnotski.19.scores gnotski.2.scores gnotski.20.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.27.scores gnotski.28.scores gnotski.29.scores gnotski.3.scores gnotski.30.scores gnotski.31.scores gnotski.32.scores gnotski.33.scores gnotski.34.scores gnotski.35.scores gnotski.36.scores gnotski.37.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gnotski.8.scores gnotski.9.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.Large.scores same-gnome.Medium.scores same-gnome.Small.scores"
+ SCORES="glines.scores glines.Large.scores glines.Medium.scores glines.Small.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.10.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.18.scores gnotski.2.scores gnotski.20.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.27.scores gnotski.28.scores gnotski.29.scores gnotski.3.scores gnotski.30.scores gnotski.31.scores gnotski.32.scores gnotski.33.scores gnotski.34.scores gnotski.35.scores gnotski.36.scores gnotski.37.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gnotski.8.scores gnotski.9.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.Small.scores same-gnome.Medium.scores same-gnome.Large.scores"
for i in ${SCORES}; do
if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then
touch -f ${PKG_PREFIX}/share/gnome/games/${i}
chown games:games ${PKG_PREFIX}/share/gnome/games/${i}
- chmod 0664 ${PKG_PREFIX}/share/gnome/games/${i}
+ chmod 0666 ${PKG_PREFIX}/share/gnome/games/${i}
fi
done
+ if [ -f ${PKG_PREFIX}/share/gnome/games/same-gnome.scores ]; then
+ mv -f ${PKG_PREFIX}/share/gnome/games/same-gnome.scores \
+ ${PKG_PREFIX}/share/gnome/games/same-gnome.Small.scores
+ ln -sf ${PKG_PREFIX}/share/gnome/games/same-gnome.Small.scores \
+ ${PKG_PREFIX}/share/gnome/games/same-gnome.scores
+ fi
;;
esac
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 950685f8655..733b9c02833 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -5,7 +5,6 @@ bin/glines
bin/gnect
bin/gnibbles
bin/gnobots2
-bin/gnome-stones
bin/gnometris
bin/gnomine
bin/gnotravex
@@ -18,12 +17,6 @@ bin/sol
etc/sound/events/gnibbles.soundlist
etc/sound/events/gnobots2.soundlist
etc/sound/events/iagno.soundlist
-lib/gnome-stones/objects/libgnome-stones.a
-lib/gnome-stones/objects/libgnome-stones.la
-lib/gnome-stones/objects/libgnome-stones.so
-lib/gnome-stones/objects/libgnomekoban.a
-lib/gnome-stones/objects/libgnomekoban.la
-lib/gnome-stones/objects/libgnomekoban.so
share/gnome/applications/blackjack.desktop
share/gnome/applications/freecell.desktop
share/gnome/applications/gataxx.desktop
@@ -31,7 +24,6 @@ share/gnome/applications/glines.desktop
share/gnome/applications/gnect.desktop
share/gnome/applications/gnibbles.desktop
share/gnome/applications/gnobots2.desktop
-share/gnome/applications/gnome-stones.desktop
share/gnome/applications/gnometris.desktop
share/gnome/applications/gnomine.desktop
share/gnome/applications/gnotravex.desktop
@@ -41,11 +33,11 @@ share/gnome/applications/iagno.desktop
share/gnome/applications/mahjongg.desktop
share/gnome/applications/same-gnome.desktop
share/gnome/applications/sol.desktop
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/blackjack/Ameristar.rules
share/gnome/blackjack/Atlantic_City.rules
share/gnome/blackjack/Vegas_Downtown.rules
share/gnome/blackjack/Vegas_Strip.rules
+@unexec [ -s %D/share/gnome/games/glines.scores ] || rm -f %D/share/gnome/games/glines.scores
@unexec [ -s %D/share/gnome/games/glines.Large.scores ] || rm -f %D/share/gnome/games/glines.Large.scores
@unexec [ -s %D/share/gnome/games/glines.Medium.scores ] || rm -f %D/share/gnome/games/glines.Medium.scores
@unexec [ -s %D/share/gnome/games/glines.Small.scores ] || rm -f %D/share/gnome/games/glines.Small.scores
@@ -72,7 +64,6 @@ share/gnome/blackjack/Vegas_Strip.rules
@unexec [ -s %D/share/gnome/games/gnobots2.robots_with_safe_teleport-safe.scores ] || rm -f %D/share/gnome/games/gnobots2.robots_with_safe_teleport-safe.scores
@unexec [ -s %D/share/gnome/games/gnobots2.robots_with_safe_teleport-super-safe.scores ] || rm -f %D/share/gnome/games/gnobots2.robots_with_safe_teleport-super-safe.scores
@unexec [ -s %D/share/gnome/games/gnobots2.robots_with_safe_teleport.scores ] || rm -f %D/share/gnome/games/gnobots2.robots_with_safe_teleport.scores
-@unexec [ -s %D/share/gnome/games/gnome-stones.scores ] || rm -f %D/share/gnome/games/gnome-stones.scores
@unexec [ -s %D/share/gnome/games/gnometris.scores ] || rm -f %D/share/gnome/games/gnometris.scores
@unexec [ -s %D/share/gnome/games/gnomine.Custom.scores ] || rm -f %D/share/gnome/games/gnomine.Custom.scores
@unexec [ -s %D/share/gnome/games/gnomine.Large.scores ] || rm -f %D/share/gnome/games/gnomine.Large.scores
@@ -133,6 +124,7 @@ share/gnome/blackjack/Vegas_Strip.rules
@unexec [ -s %D/share/gnome/games/same-gnome.Large.scores ] || rm -f %D/share/gnome/games/same-gnome.Large.scores
@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/gnibbles/level001.gnl
share/gnome/gnibbles/level002.gnl
@@ -165,18 +157,15 @@ share/gnome/gnobots2/nightmare.cfg
share/gnome/gnobots2/robots2.cfg
share/gnome/gnobots2/robots2_easy.cfg
share/gnome/gnobots2/robots_with_safe_teleport.cfg
+share/gnome/gnome-games/ataxx/themes/2.14/classic.png
share/gnome/gnome-games/mahjongg/maps/mahjongg.map
share/gnome/gnome-games/same-gnome/themes/2.10/planets.png
share/gnome/gnome-games/same-gnome/themes/2.10/stones.png
-share/gnome/gnome-stones/atari.caves
-share/gnome/gnome-stones/default.caves
-share/gnome/gnome-stones/gnome-stonesrc
-share/gnome/gnome-stones/gnome-stonesrc.ko
-share/gnome/gnome-stones/gnomekoban.caves
-share/gnome/gnome-stones/tutorial.caves
share/gnome/help/aisleriot/C/agnes.xml
share/gnome/help/aisleriot/C/aisleriot.xml
+share/gnome/help/aisleriot/C/athena.xml
share/gnome/help/aisleriot/C/auld_lang_syne.xml
+share/gnome/help/aisleriot/C/aunt_mary.xml
share/gnome/help/aisleriot/C/backbone.xml
share/gnome/help/aisleriot/C/bakers_dozen.xml
share/gnome/help/aisleriot/C/bakers_game.xml
@@ -189,6 +178,7 @@ share/gnome/help/aisleriot/C/carpet.xml
share/gnome/help/aisleriot/C/chessboard.xml
share/gnome/help/aisleriot/C/clock.xml
share/gnome/help/aisleriot/C/cover.xml
+share/gnome/help/aisleriot/C/cruel.xml
share/gnome/help/aisleriot/C/definitions.xml
share/gnome/help/aisleriot/C/diamond_mine.xml
share/gnome/help/aisleriot/C/doublets.xml
@@ -204,6 +194,7 @@ share/gnome/help/aisleriot/C/fortress.xml
share/gnome/help/aisleriot/C/fortunes.xml
share/gnome/help/aisleriot/C/fourteen.xml
share/gnome/help/aisleriot/C/freecell.xml
+share/gnome/help/aisleriot/C/gaps.xml
share/gnome/help/aisleriot/C/gay_gordons.xml
share/gnome/help/aisleriot/C/glenwood.xml
share/gnome/help/aisleriot/C/golf.xml
@@ -214,6 +205,7 @@ share/gnome/help/aisleriot/C/isabel.xml
share/gnome/help/aisleriot/C/jamestown.xml
share/gnome/help/aisleriot/C/jumbo.xml
share/gnome/help/aisleriot/C/kansas.xml
+share/gnome/help/aisleriot/C/kings_audience.xml
share/gnome/help/aisleriot/C/king_albert.xml
share/gnome/help/aisleriot/C/klondike.xml
share/gnome/help/aisleriot/C/labyrinth.xml
@@ -230,6 +222,7 @@ share/gnome/help/aisleriot/C/plait.xml
share/gnome/help/aisleriot/C/poker.xml
share/gnome/help/aisleriot/C/quatorze.xml
share/gnome/help/aisleriot/C/royal_east.xml
+share/gnome/help/aisleriot/C/saratoga.xml
share/gnome/help/aisleriot/C/scorpion.xml
share/gnome/help/aisleriot/C/scuffle.xml
share/gnome/help/aisleriot/C/seahaven.xml
@@ -255,8 +248,10 @@ share/gnome/help/aisleriot/C/yield.xml
share/gnome/help/aisleriot/C/yukon.xml
share/gnome/help/aisleriot/C/zebra.xml
share/gnome/help/aisleriot/fr/agnes.xml
+share/gnome/help/aisleriot/fr/athena.xml
share/gnome/help/aisleriot/fr/aisleriot.xml
share/gnome/help/aisleriot/fr/auld_lang_syne.xml
+share/gnome/help/aisleriot/fr/aunt_mary.xml
share/gnome/help/aisleriot/fr/backbone.xml
share/gnome/help/aisleriot/fr/bakers_dozen.xml
share/gnome/help/aisleriot/fr/bakers_game.xml
@@ -269,6 +264,7 @@ share/gnome/help/aisleriot/fr/carpet.xml
share/gnome/help/aisleriot/fr/chessboard.xml
share/gnome/help/aisleriot/fr/clock.xml
share/gnome/help/aisleriot/fr/cover.xml
+share/gnome/help/aisleriot/fr/cruel.xml
share/gnome/help/aisleriot/fr/definitions.xml
share/gnome/help/aisleriot/fr/diamond_mine.xml
share/gnome/help/aisleriot/fr/doublets.xml
@@ -284,6 +280,7 @@ share/gnome/help/aisleriot/fr/fortress.xml
share/gnome/help/aisleriot/fr/fortunes.xml
share/gnome/help/aisleriot/fr/fourteen.xml
share/gnome/help/aisleriot/fr/freecell.xml
+share/gnome/help/aisleriot/fr/gaps.xml
share/gnome/help/aisleriot/fr/gay_gordons.xml
share/gnome/help/aisleriot/fr/glenwood.xml
share/gnome/help/aisleriot/fr/golf.xml
@@ -294,6 +291,7 @@ share/gnome/help/aisleriot/fr/isabel.xml
share/gnome/help/aisleriot/fr/jamestown.xml
share/gnome/help/aisleriot/fr/jumbo.xml
share/gnome/help/aisleriot/fr/kansas.xml
+share/gnome/help/aisleriot/fr/kings_audience.xml
share/gnome/help/aisleriot/fr/king_albert.xml
share/gnome/help/aisleriot/fr/klondike.xml
share/gnome/help/aisleriot/fr/labyrinth.xml
@@ -310,6 +308,7 @@ share/gnome/help/aisleriot/fr/plait.xml
share/gnome/help/aisleriot/fr/poker.xml
share/gnome/help/aisleriot/fr/quatorze.xml
share/gnome/help/aisleriot/fr/royal_east.xml
+share/gnome/help/aisleriot/fr/saratoga.xml
share/gnome/help/aisleriot/fr/scorpion.xml
share/gnome/help/aisleriot/fr/scuffle.xml
share/gnome/help/aisleriot/fr/seahaven.xml
@@ -367,25 +366,21 @@ share/gnome/help/gnobots2/es/gnobots2.xml
share/gnome/help/gnobots2/es/legal.xml
share/gnome/help/gnobots2/it/gnobots2.xml
share/gnome/help/gnobots2/it/legal.xml
-share/gnome/help/gnome-stones/C/figures/main-game.png
-share/gnome/help/gnome-stones/C/figures/main-start.png
-share/gnome/help/gnome-stones/C/figures/preferences-joystick.png
-share/gnome/help/gnome-stones/C/figures/preferences-main.png
-share/gnome/help/gnome-stones/C/gnome-stones.xml
-share/gnome/help/gnome-stones/C/legal.xml
share/gnome/help/gnometris/C/gnometris.xml
share/gnome/help/gnometris/C/legal.xml
-share/gnome/help/gnomine/C/figures/advanced_121_a.png
-share/gnome/help/gnomine/C/figures/advanced_121_b.png
-share/gnome/help/gnomine/C/figures/advanced_121_c.png
-share/gnome/help/gnomine/C/figures/basic-corner.png
-share/gnome/help/gnomine/C/figures/basic-flat3.png
-share/gnome/help/gnomine/C/figures/basic-wall.png
-share/gnome/help/gnomine/C/figures/gnomine-begin-play.png
-share/gnome/help/gnomine/C/figures/gnomine-fail.png
-share/gnome/help/gnomine/C/figures/gnomine-fresh.png
-share/gnome/help/gnomine/C/figures/gnomine-preferences.png
-share/gnome/help/gnomine/C/figures/gnomine-won.png
+share/gnome/help/gnomine/C/figures/easy-hints-1.png
+share/gnome/help/gnomine/C/figures/easy-hints-2.png
+share/gnome/help/gnomine/C/figures/easy-hints-3.png
+share/gnome/help/gnomine/C/figures/faces.png
+share/gnome/help/gnomine/C/figures/flags.png
+share/gnome/help/gnomine/C/figures/hard-hints-1.png
+share/gnome/help/gnomine/C/figures/hard-hints-2.png
+share/gnome/help/gnomine/C/figures/hard-hints-3.png
+share/gnome/help/gnomine/C/figures/highscores.png
+share/gnome/help/gnomine/C/figures/imnotsureflagscheckbox.png
+share/gnome/help/gnomine/C/figures/main-window.png
+share/gnome/help/gnomine/C/figures/preferences.png
+share/gnome/help/gnomine/C/figures/statusbar.png
share/gnome/help/gnomine/C/gnomine.xml
share/gnome/help/gnomine/C/legal.xml
share/gnome/help/gnotravex/C/figures/gnotravex_game.png
@@ -419,8 +414,6 @@ share/gnome/help/same-gnome/C/figures/play.png
share/gnome/help/same-gnome/C/figures/start-up.png
share/gnome/help/same-gnome/C/legal.xml
share/gnome/help/same-gnome/C/same-gnome.xml
-share/gnome/mime-info/gnome-stones.keys
-share/gnome/mime-info/gnome-stones.mime
share/gnome/omf/gnome-games/aisleriot-C.omf
share/gnome/omf/gnome-games/aisleriot-fr.omf
share/gnome/omf/gnome-games/blackjack-C.omf
@@ -432,7 +425,6 @@ share/gnome/omf/gnome-games/gnobots2-C.omf
share/gnome/omf/gnome-games/gnobots2-da.omf
share/gnome/omf/gnome-games/gnobots2-es.omf
share/gnome/omf/gnome-games/gnobots2-it.omf
-share/gnome/omf/gnome-games/gnome-stones-C.omf
share/gnome/omf/gnome-games/gnometris-C.omf
share/gnome/omf/gnome-games/gnomine-C.omf
share/gnome/omf/gnome-games/gnotravex-C.omf
@@ -472,7 +464,7 @@ share/gnome/pixmaps/gnibbles/bonus3.svg
share/gnome/pixmaps/gnibbles/bonus4.svg
share/gnome/pixmaps/gnibbles/bonus5.svg
share/gnome/pixmaps/gnibbles/diamond.svg
-share/gnome/pixmaps/gnibbles/gnibbles-logo.png
+share/gnome/pixmaps/gnibbles/gnibbles-logo.svg
share/gnome/pixmaps/gnibbles/gnibbles.png
share/gnome/pixmaps/gnibbles/life.svg
share/gnome/pixmaps/gnibbles/questionmark.svg
@@ -505,7 +497,9 @@ 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/paris.svg
-share/gnome/pixmaps/gnome-gnobots2.png
+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
@@ -513,25 +507,6 @@ 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/gnome-stones-file.png
-share/gnome/pixmaps/gnome-stones.png
-share/gnome/pixmaps/gnome-stones/amoeba.png
-share/gnome/pixmaps/gnome-stones/animated_curtain.png
-share/gnome/pixmaps/gnome-stones/background.png
-share/gnome/pixmaps/gnome-stones/boulder.png
-share/gnome/pixmaps/gnome-stones/butterfly.png
-share/gnome/pixmaps/gnome-stones/crate.png
-share/gnome/pixmaps/gnome-stones/curtain.png
-share/gnome/pixmaps/gnome-stones/diamond.png
-share/gnome/pixmaps/gnome-stones/dirt.png
-share/gnome/pixmaps/gnome-stones/door.png
-share/gnome/pixmaps/gnome-stones/empty.png
-share/gnome/pixmaps/gnome-stones/explosion.png
-share/gnome/pixmaps/gnome-stones/firefly.png
-share/gnome/pixmaps/gnome-stones/frame.png
-share/gnome/pixmaps/gnome-stones/gnome.png
-share/gnome/pixmaps/gnome-stones/title-tile.png
-share/gnome/pixmaps/gnome-stones/wall.png
share/gnome/pixmaps/gnometris/7blocks-gw.png
share/gnome/pixmaps/gnometris/7blocks-tig.png
share/gnome/pixmaps/gnomine/bang.svg
@@ -557,14 +532,15 @@ share/gnome/pixmaps/iagno/classic.png
share/gnome/pixmaps/iagno/woodtrim.png
share/gnome/pixmaps/mahjongg/postmodern.svg
share/gnome/pixmaps/mahjongg/smooth.png
-share/gnome/pixmaps/rteleport.png
-share/gnome/pixmaps/teleport.png
share/gnome/sol-games/agnes.scm
+share/gnome/sol-games/aunt_mary.scm
+share/gnome/sol-games/athena.scm
share/gnome/sol-games/auld_lang_syne.scm
share/gnome/sol-games/backbone.scm
share/gnome/sol-games/bakers_dozen.scm
share/gnome/sol-games/bakers_game.scm
share/gnome/sol-games/beleaguered_castle.scm
+share/gnome/sol-games/block_ten.scm
share/gnome/sol-games/bristol.scm
share/gnome/sol-games/camelot.scm
share/gnome/sol-games/canfield.scm
@@ -572,6 +548,7 @@ share/gnome/sol-games/carpet.scm
share/gnome/sol-games/chessboard.scm
share/gnome/sol-games/clock.scm
share/gnome/sol-games/cover.scm
+share/gnome/sol-games/cruel.scm
share/gnome/sol-games/diamond_mine.scm
share/gnome/sol-games/doublets.scm
share/gnome/sol-games/eagle_wing.scm
@@ -584,6 +561,7 @@ share/gnome/sol-games/fortress.scm
share/gnome/sol-games/fortunes.scm
share/gnome/sol-games/fourteen.scm
share/gnome/sol-games/freecell.scm
+share/gnome/sol-games/gaps.scm
share/gnome/sol-games/gay_gordons.scm
share/gnome/sol-games/glade/statistics.glade
share/gnome/sol-games/glenwood.scm
@@ -595,6 +573,7 @@ share/gnome/sol-games/isabel.scm
share/gnome/sol-games/jamestown.scm
share/gnome/sol-games/jumbo.scm
share/gnome/sol-games/kansas.scm
+share/gnome/sol-games/kings_audience.scm
share/gnome/sol-games/king_albert.scm
share/gnome/sol-games/klondike.scm
share/gnome/sol-games/labyrinth.scm
@@ -610,6 +589,7 @@ share/gnome/sol-games/plait.scm
share/gnome/sol-games/poker.scm
share/gnome/sol-games/quatorze.scm
share/gnome/sol-games/royal_east.scm
+share/gnome/sol-games/saratoga.scm
share/gnome/sol-games/scorpion.scm
share/gnome/sol-games/scuffle.scm
share/gnome/sol-games/seahaven.scm
@@ -671,6 +651,7 @@ share/locale/cs/LC_MESSAGES/gnome-games.mo
share/locale/cy/LC_MESSAGES/gnome-games.mo
share/locale/da/LC_MESSAGES/gnome-games.mo
share/locale/de/LC_MESSAGES/gnome-games.mo
+share/locale/dz/LC_MESSAGES/gnome-games.mo
share/locale/el/LC_MESSAGES/gnome-games.mo
share/locale/en_CA/LC_MESSAGES/gnome-games.mo
share/locale/en_GB/LC_MESSAGES/gnome-games.mo
@@ -691,7 +672,9 @@ share/locale/id/LC_MESSAGES/gnome-games.mo
share/locale/is/LC_MESSAGES/gnome-games.mo
share/locale/it/LC_MESSAGES/gnome-games.mo
share/locale/ja/LC_MESSAGES/gnome-games.mo
+share/locale/ka/LC_MESSAGES/gnome-games.mo
share/locale/ko/LC_MESSAGES/gnome-games.mo
+share/locale/ku/LC_MESSAGES/gnome-games.mo
share/locale/lt/LC_MESSAGES/gnome-games.mo
share/locale/lv/LC_MESSAGES/gnome-games.mo
share/locale/mk/LC_MESSAGES/gnome-games.mo
@@ -717,6 +700,7 @@ share/locale/sr/LC_MESSAGES/gnome-games.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-games.mo
share/locale/sv/LC_MESSAGES/gnome-games.mo
share/locale/ta/LC_MESSAGES/gnome-games.mo
+share/locale/th/LC_MESSAGES/gnome-games.mo
share/locale/tr/LC_MESSAGES/gnome-games.mo
share/locale/uk/LC_MESSAGES/gnome-games.mo
share/locale/vi/LC_MESSAGES/gnome-games.mo
@@ -724,6 +708,12 @@ share/locale/wa/LC_MESSAGES/gnome-games.mo
share/locale/xh/LC_MESSAGES/gnome-games.mo
share/locale/zh_CN/LC_MESSAGES/gnome-games.mo
share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
+@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
@@ -735,7 +725,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/pixmaps/gtali
@dirrm share/gnome/pixmaps/gnomine
@dirrm share/gnome/pixmaps/gnometris
-@dirrm share/gnome/pixmaps/gnome-stones
+@dirrm share/gnome/pixmaps/gnome-games-common/icons
@dirrm share/gnome/pixmaps/gnome-games-common/cards
@dirrm share/gnome/pixmaps/gnome-games-common
@dirrm share/gnome/pixmaps/gnobots2
@@ -770,9 +760,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/help/gnomine
@dirrm share/gnome/help/gnometris/C
@dirrm share/gnome/help/gnometris
-@dirrm share/gnome/help/gnome-stones/C/figures
-@dirrm share/gnome/help/gnome-stones/C
-@dirrm share/gnome/help/gnome-stones
@dirrm share/gnome/help/gnobots2/it
@dirrm share/gnome/help/gnobots2/es
@dirrm share/gnome/help/gnobots2/da
@@ -799,17 +786,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/help/aisleriot/C/figures
@dirrm share/gnome/help/aisleriot/C
@dirrm share/gnome/help/aisleriot
-@dirrm share/gnome/gnome-stones
@dirrm share/gnome/gnome-games/same-gnome/themes/2.10
@dirrm share/gnome/gnome-games/same-gnome/themes
@dirrm share/gnome/gnome-games/same-gnome
@dirrm share/gnome/gnome-games/mahjongg/maps
@dirrm share/gnome/gnome-games/mahjongg
+@dirrm share/gnome/gnome-games/ataxx/themes/2.14
+@dirrm share/gnome/gnome-games/ataxx/themes
+@dirrm share/gnome/gnome-games/ataxx
@dirrm share/gnome/gnome-games
@dirrm share/gnome/gnobots2
@dirrm share/gnome/gnibbles
@dirrm share/gnome/gnect
@dirrm share/gnome/blackjack
-@dirrm lib/gnome-stones/objects
-@dirrm lib/gnome-stones
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/games/gnomegames2-extra-data/Makefile b/games/gnomegames2-extra-data/Makefile
index 1b2ea3165e4..106a397e463 100644
--- a/games/gnomegames2-extra-data/Makefile
+++ b/games/gnomegames2-extra-data/Makefile
@@ -3,14 +3,14 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/games/gnomegames2-extra-data/Makefile,v 1.6 2005/09/07 15:01:43 adamw Exp $
+# $MCom: ports/games/gnomegames2-extra-data/Makefile,v 1.8 2006/04/22 18:07:24 marcus Exp $
#
PORTNAME= gnomegames2-extra-data
-PORTVERSION= 2.12.0
+PORTVERSION= 2.14.0
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/2.12
+MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-games-extra-data-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -23,7 +23,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-USE_GNOME= gnomehack gnomeprefix
+USE_GNOME= gnomehack gnomeprefix gnometarget
CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/gnomegames2-extra-data/distinfo b/games/gnomegames2-extra-data/distinfo
index aa8a003d1ca..57806d4acbd 100644
--- a/games/gnomegames2-extra-data/distinfo
+++ b/games/gnomegames2-extra-data/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-games-extra-data-2.12.0.tar.bz2) = 51b2b54c41b6d9cb1a228143723b43a1
-SHA256 (gnome2/gnome-games-extra-data-2.12.0.tar.bz2) = 9a82737ba2ddb86514903c8b90c99ab84569e1ce4b5185ace0086f1e0cb54806
-SIZE (gnome2/gnome-games-extra-data-2.12.0.tar.bz2) = 2644415
+MD5 (gnome2/gnome-games-extra-data-2.14.0.tar.bz2) = 01464739e83449288c6a58685604f86e
+SHA256 (gnome2/gnome-games-extra-data-2.14.0.tar.bz2) = 2785206387d7444f37e27dbb606e587ca282f7ba54723b052e6c44dcca99a39e
+SIZE (gnome2/gnome-games-extra-data-2.14.0.tar.bz2) = 2868801
diff --git a/games/gnomegames2-extra-data/pkg-plist b/games/gnomegames2-extra-data/pkg-plist
index 15c24fa98b9..1a9fb8c4743 100644
--- a/games/gnomegames2-extra-data/pkg-plist
+++ b/games/gnomegames2-extra-data/pkg-plist
@@ -1,6 +1,7 @@
share/gnome/gnome-games/same-gnome/themes/2.10/blink.png
share/gnome/gnome-games/same-gnome/themes/2.10/glass.png
share/gnome/gnome-games/same-gnome/themes/2.10/marbles.png
+share/gnome/gnome-games/same-gnome/themes/2.10/matrix.png
share/gnome/gnome-games/same-gnome/themes/2.10/rotate.svg
share/gnome/pixmaps/glines/classic.png
share/gnome/pixmaps/glines/dots.png
@@ -9,9 +10,9 @@ share/gnome/pixmaps/glines/pulse.png
share/gnome/pixmaps/gnobots2/cows.png
share/gnome/pixmaps/gnobots2/eggs.png
share/gnome/pixmaps/gnobots2/mice.png
-share/gnome/pixmaps/gnobots2/windows.png
share/gnome/pixmaps/gnome-games-common/cards/bellot.svg
share/gnome/pixmaps/gnome-games-common/cards/dondorf.svg
+share/gnome/pixmaps/gnome-games-common/cards/ornamental.svg
share/gnome/pixmaps/gnometris/5blocks-tig.png
share/gnome/pixmaps/gnometris/5blocks-tim.png
share/gnome/pixmaps/gnometris/5blocks.png
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index a290533cafa..6bccbc608da 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/games/gnomegames2/Makefile,v 1.89 2005/10/03 15:30:09 ahze Exp $
+# $MCom: ports/games/gnomegames2/Makefile,v 1.111 2006/04/13 07:52:34 bland Exp $
#
PORTNAME= gnomegames2
-PORTVERSION= 2.12.3
-PORTREVISION= 1
+PORTVERSION= 2.14.1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-games/2.12
+MASTER_SITE_SUBDIR= sources/gnome-games/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-games-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -22,6 +21,7 @@ LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile
USE_BZIP2= yes
USE_PYTHON= yes
+USE_GETTEXT= yes
INSTALLS_OMF= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
@@ -32,17 +32,18 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= aisleriot.schemas blackjack.schemas gataxx.schemas \
- glines.schemas gnect.schemas gnibbles.schemas gnobots2.schemas \
- gnome-stones.schemas gnometris.schemas gnomine.schemas \
- gnotravex.schemas gnotski.schemas gtali.schemas iagno.schemas \
- libgnomegames.schemas mahjongg.schemas same-gnome.schemas
+ glines.schemas gnect.schemas gnibbles.schemas \
+ gnobots2.schemas gnometris.schemas gnomine.schemas \
+ gnotravex.schemas gnotski.schemas gtali.schemas \
+ iagno.schemas libgnomegames.schemas mahjongg.schemas \
+ same-gnome.schemas
CONFLICTS= sol-1.0.*
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/lib/libhowl.so) || defined(WITH_MDNS)
-LIB_DEPENDS+= howl:${PORTSDIR}/net/howl
+.if exists(${LOCALBASE}/lib/libavahi-client.a) || defined(WITH_MDNS)
+LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi
.endif
post-patch:
@@ -50,6 +51,11 @@ post-patch:
'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/gnomegames2/distinfo b/games/gnomegames2/distinfo
index 4f66339c4cc..13dd1e201ee 100644
--- a/games/gnomegames2/distinfo
+++ b/games/gnomegames2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-games-2.12.3.tar.bz2) = 06d3cfaf24dd1f0b2df1df005c69d4ff
-SHA256 (gnome2/gnome-games-2.12.3.tar.bz2) = 0bd560e6094fd0bedf5316223eeef90a99451bb739a91d7a0438a858f66a3835
-SIZE (gnome2/gnome-games-2.12.3.tar.bz2) = 4932211
+MD5 (gnome2/gnome-games-2.14.1.tar.bz2) = 9893da6c2f8eecdbc596cec9a017a8b2
+SHA256 (gnome2/gnome-games-2.14.1.tar.bz2) = c9c364883f260a57d6501f8e79564738a88e76e9fe29168613a58ef94e0d7b8a
+SIZE (gnome2/gnome-games-2.14.1.tar.bz2) = 5095238
diff --git a/games/gnomegames2/files/patch-configure b/games/gnomegames2/files/patch-configure
deleted file mode 100644
index f8413ef3cff..00000000000
--- a/games/gnomegames2/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Wed Dec 17 11:58:34 2003
-+++ configure Wed Dec 17 11:58:35 2003
-@@ -22452,7 +22452,7 @@
- else
-
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- _ACEOF
-
- fi
diff --git a/games/gnomegames2/files/patch-gnome-stones_Makefile.in b/games/gnomegames2/files/patch-gnome-stones_Makefile.in
deleted file mode 100644
index 92fbe9e8806..00000000000
--- a/games/gnomegames2/files/patch-gnome-stones_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-stones/Makefile.in.orig Tue Jul 23 20:37:40 2002
-+++ gnome-stones/Makefile.in Tue Jul 23 20:38:10 2002
-@@ -202,7 +202,7 @@
- Caves_in_files = default.caves.in tutorial.caves.in gnomekoban.caves.in atari.caves.in
- Caves_DATA = $(Caves_in_files:.caves.in=.caves)
-
--gtkrcdir = $(datadir)
-+gtkrcdir = $(datadir)/gnome-stones
- gtkrc_DATA = gnome-stonesrc gnome-stonesrc.ko
-
- Mimedir = $(datadir)/mime-info
diff --git a/games/gnomegames2/files/patch-iagno_othello.c b/games/gnomegames2/files/patch-iagno_othello.c
deleted file mode 100644
index 1d6d8e88a6a..00000000000
--- a/games/gnomegames2/files/patch-iagno_othello.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- iagno/othello.c.orig Tue Jan 25 11:24:35 2005
-+++ iagno/othello.c Tue Jan 25 11:24:56 2005
-@@ -784,14 +784,14 @@
- found_free = TRUE;
- }
-
-- // check if a player is dead
-+ /* check if a player is dead */
- if (!found_me && found_not_me)
- return (S_LOSING_GAME);
- else if (found_me && !found_not_me)
- return (S_WINNING_GAME);
-
-- // if the game is finished, return the actual score rather than
-- // a huristic
-+ /* if the game is finished, return the actual score rather than
-+ * a huristic */
- if (!found_free)
- return (actual_score);
-
diff --git a/games/gnomegames2/pkg-install b/games/gnomegames2/pkg-install
index fe5c5177045..cbbb71f5595 100644
--- a/games/gnomegames2/pkg-install
+++ b/games/gnomegames2/pkg-install
@@ -5,13 +5,19 @@ PATH=/bin:/usr/bin:/usr/sbin
case $2 in
POST-INSTALL)
mkdir -p ${PKG_PREFIX}/share/gnome/games
- SCORES="glines.Large.scores glines.Medium.scores glines.Small.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.10.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.18.scores gnotski.19.scores gnotski.2.scores gnotski.20.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.27.scores gnotski.28.scores gnotski.29.scores gnotski.3.scores gnotski.30.scores gnotski.31.scores gnotski.32.scores gnotski.33.scores gnotski.34.scores gnotski.35.scores gnotski.36.scores gnotski.37.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gnotski.8.scores gnotski.9.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.Large.scores same-gnome.Medium.scores same-gnome.Small.scores"
+ SCORES="glines.scores glines.Large.scores glines.Medium.scores glines.Small.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.10.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.18.scores gnotski.2.scores gnotski.20.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.27.scores gnotski.28.scores gnotski.29.scores gnotski.3.scores gnotski.30.scores gnotski.31.scores gnotski.32.scores gnotski.33.scores gnotski.34.scores gnotski.35.scores gnotski.36.scores gnotski.37.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gnotski.8.scores gnotski.9.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.Small.scores same-gnome.Medium.scores same-gnome.Large.scores"
for i in ${SCORES}; do
if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then
touch -f ${PKG_PREFIX}/share/gnome/games/${i}
chown games:games ${PKG_PREFIX}/share/gnome/games/${i}
- chmod 0664 ${PKG_PREFIX}/share/gnome/games/${i}
+ chmod 0666 ${PKG_PREFIX}/share/gnome/games/${i}
fi
done
+ if [ -f ${PKG_PREFIX}/share/gnome/games/same-gnome.scores ]; then
+ mv -f ${PKG_PREFIX}/share/gnome/games/same-gnome.scores \
+ ${PKG_PREFIX}/share/gnome/games/same-gnome.Small.scores
+ ln -sf ${PKG_PREFIX}/share/gnome/games/same-gnome.Small.scores \
+ ${PKG_PREFIX}/share/gnome/games/same-gnome.scores
+ fi
;;
esac
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index 950685f8655..733b9c02833 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -5,7 +5,6 @@ bin/glines
bin/gnect
bin/gnibbles
bin/gnobots2
-bin/gnome-stones
bin/gnometris
bin/gnomine
bin/gnotravex
@@ -18,12 +17,6 @@ bin/sol
etc/sound/events/gnibbles.soundlist
etc/sound/events/gnobots2.soundlist
etc/sound/events/iagno.soundlist
-lib/gnome-stones/objects/libgnome-stones.a
-lib/gnome-stones/objects/libgnome-stones.la
-lib/gnome-stones/objects/libgnome-stones.so
-lib/gnome-stones/objects/libgnomekoban.a
-lib/gnome-stones/objects/libgnomekoban.la
-lib/gnome-stones/objects/libgnomekoban.so
share/gnome/applications/blackjack.desktop
share/gnome/applications/freecell.desktop
share/gnome/applications/gataxx.desktop
@@ -31,7 +24,6 @@ share/gnome/applications/glines.desktop
share/gnome/applications/gnect.desktop
share/gnome/applications/gnibbles.desktop
share/gnome/applications/gnobots2.desktop
-share/gnome/applications/gnome-stones.desktop
share/gnome/applications/gnometris.desktop
share/gnome/applications/gnomine.desktop
share/gnome/applications/gnotravex.desktop
@@ -41,11 +33,11 @@ share/gnome/applications/iagno.desktop
share/gnome/applications/mahjongg.desktop
share/gnome/applications/same-gnome.desktop
share/gnome/applications/sol.desktop
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/blackjack/Ameristar.rules
share/gnome/blackjack/Atlantic_City.rules
share/gnome/blackjack/Vegas_Downtown.rules
share/gnome/blackjack/Vegas_Strip.rules
+@unexec [ -s %D/share/gnome/games/glines.scores ] || rm -f %D/share/gnome/games/glines.scores
@unexec [ -s %D/share/gnome/games/glines.Large.scores ] || rm -f %D/share/gnome/games/glines.Large.scores
@unexec [ -s %D/share/gnome/games/glines.Medium.scores ] || rm -f %D/share/gnome/games/glines.Medium.scores
@unexec [ -s %D/share/gnome/games/glines.Small.scores ] || rm -f %D/share/gnome/games/glines.Small.scores
@@ -72,7 +64,6 @@ share/gnome/blackjack/Vegas_Strip.rules
@unexec [ -s %D/share/gnome/games/gnobots2.robots_with_safe_teleport-safe.scores ] || rm -f %D/share/gnome/games/gnobots2.robots_with_safe_teleport-safe.scores
@unexec [ -s %D/share/gnome/games/gnobots2.robots_with_safe_teleport-super-safe.scores ] || rm -f %D/share/gnome/games/gnobots2.robots_with_safe_teleport-super-safe.scores
@unexec [ -s %D/share/gnome/games/gnobots2.robots_with_safe_teleport.scores ] || rm -f %D/share/gnome/games/gnobots2.robots_with_safe_teleport.scores
-@unexec [ -s %D/share/gnome/games/gnome-stones.scores ] || rm -f %D/share/gnome/games/gnome-stones.scores
@unexec [ -s %D/share/gnome/games/gnometris.scores ] || rm -f %D/share/gnome/games/gnometris.scores
@unexec [ -s %D/share/gnome/games/gnomine.Custom.scores ] || rm -f %D/share/gnome/games/gnomine.Custom.scores
@unexec [ -s %D/share/gnome/games/gnomine.Large.scores ] || rm -f %D/share/gnome/games/gnomine.Large.scores
@@ -133,6 +124,7 @@ share/gnome/blackjack/Vegas_Strip.rules
@unexec [ -s %D/share/gnome/games/same-gnome.Large.scores ] || rm -f %D/share/gnome/games/same-gnome.Large.scores
@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/gnibbles/level001.gnl
share/gnome/gnibbles/level002.gnl
@@ -165,18 +157,15 @@ share/gnome/gnobots2/nightmare.cfg
share/gnome/gnobots2/robots2.cfg
share/gnome/gnobots2/robots2_easy.cfg
share/gnome/gnobots2/robots_with_safe_teleport.cfg
+share/gnome/gnome-games/ataxx/themes/2.14/classic.png
share/gnome/gnome-games/mahjongg/maps/mahjongg.map
share/gnome/gnome-games/same-gnome/themes/2.10/planets.png
share/gnome/gnome-games/same-gnome/themes/2.10/stones.png
-share/gnome/gnome-stones/atari.caves
-share/gnome/gnome-stones/default.caves
-share/gnome/gnome-stones/gnome-stonesrc
-share/gnome/gnome-stones/gnome-stonesrc.ko
-share/gnome/gnome-stones/gnomekoban.caves
-share/gnome/gnome-stones/tutorial.caves
share/gnome/help/aisleriot/C/agnes.xml
share/gnome/help/aisleriot/C/aisleriot.xml
+share/gnome/help/aisleriot/C/athena.xml
share/gnome/help/aisleriot/C/auld_lang_syne.xml
+share/gnome/help/aisleriot/C/aunt_mary.xml
share/gnome/help/aisleriot/C/backbone.xml
share/gnome/help/aisleriot/C/bakers_dozen.xml
share/gnome/help/aisleriot/C/bakers_game.xml
@@ -189,6 +178,7 @@ share/gnome/help/aisleriot/C/carpet.xml
share/gnome/help/aisleriot/C/chessboard.xml
share/gnome/help/aisleriot/C/clock.xml
share/gnome/help/aisleriot/C/cover.xml
+share/gnome/help/aisleriot/C/cruel.xml
share/gnome/help/aisleriot/C/definitions.xml
share/gnome/help/aisleriot/C/diamond_mine.xml
share/gnome/help/aisleriot/C/doublets.xml
@@ -204,6 +194,7 @@ share/gnome/help/aisleriot/C/fortress.xml
share/gnome/help/aisleriot/C/fortunes.xml
share/gnome/help/aisleriot/C/fourteen.xml
share/gnome/help/aisleriot/C/freecell.xml
+share/gnome/help/aisleriot/C/gaps.xml
share/gnome/help/aisleriot/C/gay_gordons.xml
share/gnome/help/aisleriot/C/glenwood.xml
share/gnome/help/aisleriot/C/golf.xml
@@ -214,6 +205,7 @@ share/gnome/help/aisleriot/C/isabel.xml
share/gnome/help/aisleriot/C/jamestown.xml
share/gnome/help/aisleriot/C/jumbo.xml
share/gnome/help/aisleriot/C/kansas.xml
+share/gnome/help/aisleriot/C/kings_audience.xml
share/gnome/help/aisleriot/C/king_albert.xml
share/gnome/help/aisleriot/C/klondike.xml
share/gnome/help/aisleriot/C/labyrinth.xml
@@ -230,6 +222,7 @@ share/gnome/help/aisleriot/C/plait.xml
share/gnome/help/aisleriot/C/poker.xml
share/gnome/help/aisleriot/C/quatorze.xml
share/gnome/help/aisleriot/C/royal_east.xml
+share/gnome/help/aisleriot/C/saratoga.xml
share/gnome/help/aisleriot/C/scorpion.xml
share/gnome/help/aisleriot/C/scuffle.xml
share/gnome/help/aisleriot/C/seahaven.xml
@@ -255,8 +248,10 @@ share/gnome/help/aisleriot/C/yield.xml
share/gnome/help/aisleriot/C/yukon.xml
share/gnome/help/aisleriot/C/zebra.xml
share/gnome/help/aisleriot/fr/agnes.xml
+share/gnome/help/aisleriot/fr/athena.xml
share/gnome/help/aisleriot/fr/aisleriot.xml
share/gnome/help/aisleriot/fr/auld_lang_syne.xml
+share/gnome/help/aisleriot/fr/aunt_mary.xml
share/gnome/help/aisleriot/fr/backbone.xml
share/gnome/help/aisleriot/fr/bakers_dozen.xml
share/gnome/help/aisleriot/fr/bakers_game.xml
@@ -269,6 +264,7 @@ share/gnome/help/aisleriot/fr/carpet.xml
share/gnome/help/aisleriot/fr/chessboard.xml
share/gnome/help/aisleriot/fr/clock.xml
share/gnome/help/aisleriot/fr/cover.xml
+share/gnome/help/aisleriot/fr/cruel.xml
share/gnome/help/aisleriot/fr/definitions.xml
share/gnome/help/aisleriot/fr/diamond_mine.xml
share/gnome/help/aisleriot/fr/doublets.xml
@@ -284,6 +280,7 @@ share/gnome/help/aisleriot/fr/fortress.xml
share/gnome/help/aisleriot/fr/fortunes.xml
share/gnome/help/aisleriot/fr/fourteen.xml
share/gnome/help/aisleriot/fr/freecell.xml
+share/gnome/help/aisleriot/fr/gaps.xml
share/gnome/help/aisleriot/fr/gay_gordons.xml
share/gnome/help/aisleriot/fr/glenwood.xml
share/gnome/help/aisleriot/fr/golf.xml
@@ -294,6 +291,7 @@ share/gnome/help/aisleriot/fr/isabel.xml
share/gnome/help/aisleriot/fr/jamestown.xml
share/gnome/help/aisleriot/fr/jumbo.xml
share/gnome/help/aisleriot/fr/kansas.xml
+share/gnome/help/aisleriot/fr/kings_audience.xml
share/gnome/help/aisleriot/fr/king_albert.xml
share/gnome/help/aisleriot/fr/klondike.xml
share/gnome/help/aisleriot/fr/labyrinth.xml
@@ -310,6 +308,7 @@ share/gnome/help/aisleriot/fr/plait.xml
share/gnome/help/aisleriot/fr/poker.xml
share/gnome/help/aisleriot/fr/quatorze.xml
share/gnome/help/aisleriot/fr/royal_east.xml
+share/gnome/help/aisleriot/fr/saratoga.xml
share/gnome/help/aisleriot/fr/scorpion.xml
share/gnome/help/aisleriot/fr/scuffle.xml
share/gnome/help/aisleriot/fr/seahaven.xml
@@ -367,25 +366,21 @@ share/gnome/help/gnobots2/es/gnobots2.xml
share/gnome/help/gnobots2/es/legal.xml
share/gnome/help/gnobots2/it/gnobots2.xml
share/gnome/help/gnobots2/it/legal.xml
-share/gnome/help/gnome-stones/C/figures/main-game.png
-share/gnome/help/gnome-stones/C/figures/main-start.png
-share/gnome/help/gnome-stones/C/figures/preferences-joystick.png
-share/gnome/help/gnome-stones/C/figures/preferences-main.png
-share/gnome/help/gnome-stones/C/gnome-stones.xml
-share/gnome/help/gnome-stones/C/legal.xml
share/gnome/help/gnometris/C/gnometris.xml
share/gnome/help/gnometris/C/legal.xml
-share/gnome/help/gnomine/C/figures/advanced_121_a.png
-share/gnome/help/gnomine/C/figures/advanced_121_b.png
-share/gnome/help/gnomine/C/figures/advanced_121_c.png
-share/gnome/help/gnomine/C/figures/basic-corner.png
-share/gnome/help/gnomine/C/figures/basic-flat3.png
-share/gnome/help/gnomine/C/figures/basic-wall.png
-share/gnome/help/gnomine/C/figures/gnomine-begin-play.png
-share/gnome/help/gnomine/C/figures/gnomine-fail.png
-share/gnome/help/gnomine/C/figures/gnomine-fresh.png
-share/gnome/help/gnomine/C/figures/gnomine-preferences.png
-share/gnome/help/gnomine/C/figures/gnomine-won.png
+share/gnome/help/gnomine/C/figures/easy-hints-1.png
+share/gnome/help/gnomine/C/figures/easy-hints-2.png
+share/gnome/help/gnomine/C/figures/easy-hints-3.png
+share/gnome/help/gnomine/C/figures/faces.png
+share/gnome/help/gnomine/C/figures/flags.png
+share/gnome/help/gnomine/C/figures/hard-hints-1.png
+share/gnome/help/gnomine/C/figures/hard-hints-2.png
+share/gnome/help/gnomine/C/figures/hard-hints-3.png
+share/gnome/help/gnomine/C/figures/highscores.png
+share/gnome/help/gnomine/C/figures/imnotsureflagscheckbox.png
+share/gnome/help/gnomine/C/figures/main-window.png
+share/gnome/help/gnomine/C/figures/preferences.png
+share/gnome/help/gnomine/C/figures/statusbar.png
share/gnome/help/gnomine/C/gnomine.xml
share/gnome/help/gnomine/C/legal.xml
share/gnome/help/gnotravex/C/figures/gnotravex_game.png
@@ -419,8 +414,6 @@ share/gnome/help/same-gnome/C/figures/play.png
share/gnome/help/same-gnome/C/figures/start-up.png
share/gnome/help/same-gnome/C/legal.xml
share/gnome/help/same-gnome/C/same-gnome.xml
-share/gnome/mime-info/gnome-stones.keys
-share/gnome/mime-info/gnome-stones.mime
share/gnome/omf/gnome-games/aisleriot-C.omf
share/gnome/omf/gnome-games/aisleriot-fr.omf
share/gnome/omf/gnome-games/blackjack-C.omf
@@ -432,7 +425,6 @@ share/gnome/omf/gnome-games/gnobots2-C.omf
share/gnome/omf/gnome-games/gnobots2-da.omf
share/gnome/omf/gnome-games/gnobots2-es.omf
share/gnome/omf/gnome-games/gnobots2-it.omf
-share/gnome/omf/gnome-games/gnome-stones-C.omf
share/gnome/omf/gnome-games/gnometris-C.omf
share/gnome/omf/gnome-games/gnomine-C.omf
share/gnome/omf/gnome-games/gnotravex-C.omf
@@ -472,7 +464,7 @@ share/gnome/pixmaps/gnibbles/bonus3.svg
share/gnome/pixmaps/gnibbles/bonus4.svg
share/gnome/pixmaps/gnibbles/bonus5.svg
share/gnome/pixmaps/gnibbles/diamond.svg
-share/gnome/pixmaps/gnibbles/gnibbles-logo.png
+share/gnome/pixmaps/gnibbles/gnibbles-logo.svg
share/gnome/pixmaps/gnibbles/gnibbles.png
share/gnome/pixmaps/gnibbles/life.svg
share/gnome/pixmaps/gnibbles/questionmark.svg
@@ -505,7 +497,9 @@ 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/paris.svg
-share/gnome/pixmaps/gnome-gnobots2.png
+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
@@ -513,25 +507,6 @@ 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/gnome-stones-file.png
-share/gnome/pixmaps/gnome-stones.png
-share/gnome/pixmaps/gnome-stones/amoeba.png
-share/gnome/pixmaps/gnome-stones/animated_curtain.png
-share/gnome/pixmaps/gnome-stones/background.png
-share/gnome/pixmaps/gnome-stones/boulder.png
-share/gnome/pixmaps/gnome-stones/butterfly.png
-share/gnome/pixmaps/gnome-stones/crate.png
-share/gnome/pixmaps/gnome-stones/curtain.png
-share/gnome/pixmaps/gnome-stones/diamond.png
-share/gnome/pixmaps/gnome-stones/dirt.png
-share/gnome/pixmaps/gnome-stones/door.png
-share/gnome/pixmaps/gnome-stones/empty.png
-share/gnome/pixmaps/gnome-stones/explosion.png
-share/gnome/pixmaps/gnome-stones/firefly.png
-share/gnome/pixmaps/gnome-stones/frame.png
-share/gnome/pixmaps/gnome-stones/gnome.png
-share/gnome/pixmaps/gnome-stones/title-tile.png
-share/gnome/pixmaps/gnome-stones/wall.png
share/gnome/pixmaps/gnometris/7blocks-gw.png
share/gnome/pixmaps/gnometris/7blocks-tig.png
share/gnome/pixmaps/gnomine/bang.svg
@@ -557,14 +532,15 @@ share/gnome/pixmaps/iagno/classic.png
share/gnome/pixmaps/iagno/woodtrim.png
share/gnome/pixmaps/mahjongg/postmodern.svg
share/gnome/pixmaps/mahjongg/smooth.png
-share/gnome/pixmaps/rteleport.png
-share/gnome/pixmaps/teleport.png
share/gnome/sol-games/agnes.scm
+share/gnome/sol-games/aunt_mary.scm
+share/gnome/sol-games/athena.scm
share/gnome/sol-games/auld_lang_syne.scm
share/gnome/sol-games/backbone.scm
share/gnome/sol-games/bakers_dozen.scm
share/gnome/sol-games/bakers_game.scm
share/gnome/sol-games/beleaguered_castle.scm
+share/gnome/sol-games/block_ten.scm
share/gnome/sol-games/bristol.scm
share/gnome/sol-games/camelot.scm
share/gnome/sol-games/canfield.scm
@@ -572,6 +548,7 @@ share/gnome/sol-games/carpet.scm
share/gnome/sol-games/chessboard.scm
share/gnome/sol-games/clock.scm
share/gnome/sol-games/cover.scm
+share/gnome/sol-games/cruel.scm
share/gnome/sol-games/diamond_mine.scm
share/gnome/sol-games/doublets.scm
share/gnome/sol-games/eagle_wing.scm
@@ -584,6 +561,7 @@ share/gnome/sol-games/fortress.scm
share/gnome/sol-games/fortunes.scm
share/gnome/sol-games/fourteen.scm
share/gnome/sol-games/freecell.scm
+share/gnome/sol-games/gaps.scm
share/gnome/sol-games/gay_gordons.scm
share/gnome/sol-games/glade/statistics.glade
share/gnome/sol-games/glenwood.scm
@@ -595,6 +573,7 @@ share/gnome/sol-games/isabel.scm
share/gnome/sol-games/jamestown.scm
share/gnome/sol-games/jumbo.scm
share/gnome/sol-games/kansas.scm
+share/gnome/sol-games/kings_audience.scm
share/gnome/sol-games/king_albert.scm
share/gnome/sol-games/klondike.scm
share/gnome/sol-games/labyrinth.scm
@@ -610,6 +589,7 @@ share/gnome/sol-games/plait.scm
share/gnome/sol-games/poker.scm
share/gnome/sol-games/quatorze.scm
share/gnome/sol-games/royal_east.scm
+share/gnome/sol-games/saratoga.scm
share/gnome/sol-games/scorpion.scm
share/gnome/sol-games/scuffle.scm
share/gnome/sol-games/seahaven.scm
@@ -671,6 +651,7 @@ share/locale/cs/LC_MESSAGES/gnome-games.mo
share/locale/cy/LC_MESSAGES/gnome-games.mo
share/locale/da/LC_MESSAGES/gnome-games.mo
share/locale/de/LC_MESSAGES/gnome-games.mo
+share/locale/dz/LC_MESSAGES/gnome-games.mo
share/locale/el/LC_MESSAGES/gnome-games.mo
share/locale/en_CA/LC_MESSAGES/gnome-games.mo
share/locale/en_GB/LC_MESSAGES/gnome-games.mo
@@ -691,7 +672,9 @@ share/locale/id/LC_MESSAGES/gnome-games.mo
share/locale/is/LC_MESSAGES/gnome-games.mo
share/locale/it/LC_MESSAGES/gnome-games.mo
share/locale/ja/LC_MESSAGES/gnome-games.mo
+share/locale/ka/LC_MESSAGES/gnome-games.mo
share/locale/ko/LC_MESSAGES/gnome-games.mo
+share/locale/ku/LC_MESSAGES/gnome-games.mo
share/locale/lt/LC_MESSAGES/gnome-games.mo
share/locale/lv/LC_MESSAGES/gnome-games.mo
share/locale/mk/LC_MESSAGES/gnome-games.mo
@@ -717,6 +700,7 @@ share/locale/sr/LC_MESSAGES/gnome-games.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-games.mo
share/locale/sv/LC_MESSAGES/gnome-games.mo
share/locale/ta/LC_MESSAGES/gnome-games.mo
+share/locale/th/LC_MESSAGES/gnome-games.mo
share/locale/tr/LC_MESSAGES/gnome-games.mo
share/locale/uk/LC_MESSAGES/gnome-games.mo
share/locale/vi/LC_MESSAGES/gnome-games.mo
@@ -724,6 +708,12 @@ share/locale/wa/LC_MESSAGES/gnome-games.mo
share/locale/xh/LC_MESSAGES/gnome-games.mo
share/locale/zh_CN/LC_MESSAGES/gnome-games.mo
share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
+@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
@@ -735,7 +725,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/pixmaps/gtali
@dirrm share/gnome/pixmaps/gnomine
@dirrm share/gnome/pixmaps/gnometris
-@dirrm share/gnome/pixmaps/gnome-stones
+@dirrm share/gnome/pixmaps/gnome-games-common/icons
@dirrm share/gnome/pixmaps/gnome-games-common/cards
@dirrm share/gnome/pixmaps/gnome-games-common
@dirrm share/gnome/pixmaps/gnobots2
@@ -770,9 +760,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/help/gnomine
@dirrm share/gnome/help/gnometris/C
@dirrm share/gnome/help/gnometris
-@dirrm share/gnome/help/gnome-stones/C/figures
-@dirrm share/gnome/help/gnome-stones/C
-@dirrm share/gnome/help/gnome-stones
@dirrm share/gnome/help/gnobots2/it
@dirrm share/gnome/help/gnobots2/es
@dirrm share/gnome/help/gnobots2/da
@@ -799,17 +786,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/help/aisleriot/C/figures
@dirrm share/gnome/help/aisleriot/C
@dirrm share/gnome/help/aisleriot
-@dirrm share/gnome/gnome-stones
@dirrm share/gnome/gnome-games/same-gnome/themes/2.10
@dirrm share/gnome/gnome-games/same-gnome/themes
@dirrm share/gnome/gnome-games/same-gnome
@dirrm share/gnome/gnome-games/mahjongg/maps
@dirrm share/gnome/gnome-games/mahjongg
+@dirrm share/gnome/gnome-games/ataxx/themes/2.14
+@dirrm share/gnome/gnome-games/ataxx/themes
+@dirrm share/gnome/gnome-games/ataxx
@dirrm share/gnome/gnome-games
@dirrm share/gnome/gnobots2
@dirrm share/gnome/gnibbles
@dirrm share/gnome/gnect
@dirrm share/gnome/blackjack
-@dirrm lib/gnome-stones/objects
-@dirrm lib/gnome-stones
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 90d80493b2c..d508901fdad 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/eog/Makefile,v 1.9 2005/10/04 03:00:35 ahze Exp $
+# $MCom: ports/graphics/eog/Makefile,v 1.29 2006/04/13 07:52:35 bland Exp $
#
PORTNAME= eog
-PORTVERSION= 2.12.3
+PORTVERSION= 2.14.1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -18,12 +18,13 @@ COMMENT= The Eye Of Gnome image viewer
USE_BZIP2= yes
USE_GMAKE= yes
-USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui \
- librsvg2 desktopfileutils libgnomeui
+ librsvg2 desktopfileutils gnomedesktop
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
+GNOME_DESKTOP_VERSION=2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index 5b6e99b42a0..60e00b1b88b 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eog-2.12.3.tar.bz2) = cb93289f47060af04026f78e0ecefd71
-SHA256 (gnome2/eog-2.12.3.tar.bz2) = 5833c6b7cb38555dff26821629136c8650a0edaea777a9e6d08d0cf42775e334
-SIZE (gnome2/eog-2.12.3.tar.bz2) = 801299
+MD5 (gnome2/eog-2.14.1.tar.bz2) = c77fbfa3a1e77cb7ed140567ebdfab12
+SHA256 (gnome2/eog-2.14.1.tar.bz2) = c26cefe7d594f31871ca2ddd847a12a4a7f28665ca9a545144e9fffe026e0ab9
+SIZE (gnome2/eog-2.14.1.tar.bz2) = 821034
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index 2830c74e8e4..77b6c479e9c 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -76,6 +76,7 @@ share/locale/cs/LC_MESSAGES/eog.mo
share/locale/cy/LC_MESSAGES/eog.mo
share/locale/da/LC_MESSAGES/eog.mo
share/locale/de/LC_MESSAGES/eog.mo
+share/locale/dz/LC_MESSAGES/eog.mo
share/locale/el/LC_MESSAGES/eog.mo
share/locale/en_CA/LC_MESSAGES/eog.mo
share/locale/en_GB/LC_MESSAGES/eog.mo
@@ -96,6 +97,7 @@ share/locale/id/LC_MESSAGES/eog.mo
share/locale/is/LC_MESSAGES/eog.mo
share/locale/it/LC_MESSAGES/eog.mo
share/locale/ja/LC_MESSAGES/eog.mo
+share/locale/ka/LC_MESSAGES/eog.mo
share/locale/kn/LC_MESSAGES/eog.mo
share/locale/ko/LC_MESSAGES/eog.mo
share/locale/ku/LC_MESSAGES/eog.mo
@@ -140,8 +142,6 @@ share/locale/zh_TW/LC_MESSAGES/eog.mo
share/locale/zu/LC_MESSAGES/eog.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/ug/LC_MESSAGES
@@ -152,6 +152,8 @@ share/locale/zu/LC_MESSAGES/eog.mo
@dirrmtry share/locale/nso
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrm share/gnome/pixmaps/eog
@dirrm share/gnome/omf/eog
@dirrm share/gnome/help/eog/zh_TW/figures
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index cbe79f439a5..5f569314573 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,24 +3,24 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/evince/Makefile,v 1.35 2005/10/20 01:37:54 ahze Exp $
+# $MCom: ports/graphics/evince/Makefile,v 1.50 2006/04/24 00:54:32 ahze Exp $
#
PORTNAME= evince
-PORTVERSION= 0.4.0
-PORTREVISION= 4
+PORTVERSION= 0.5.2
+PORTREVISION= 2
CATEGORIES= graphics print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.5
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 multi-format document viewer
-LIB_DEPENDS= poppler.0:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS= poppler-glib.1:${PORTSDIR}/graphics/poppler-gtk
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GHOSTSCRIPT=yes
@@ -35,8 +35,9 @@ GCONF_SCHEMAS= evince.schemas evince-thumbnailer.schemas
OPTIONS= DVI "Enable DVI viewer support" off \
T1LIB "Enable T1LIB for TYPE1 fonts to DVI (Enables DVI)" off \
NAUTILUS "Enable Nautilus plugin" on \
- DBUS "Enable D-BUS support" off \
- DJVU "Enable DJVU support" off
+ DBUS "Enable D-BUS support" on \
+ COMICS "Enable comic book archives support" off
+# DJVU "Enable DJVU support" off
.include <bsd.port.pre.mk>
@@ -73,20 +74,30 @@ DJVU_DIR?= # empty
DJVU_DIR?= -nox11
.endif
-.if defined(WITH_DJVU)
-LIB_DEPENDS+= djvulibre.17:${PORTSDIR}/graphics/djvulibre${DJVU_DIR}
-CONFIGURE_ARGS+= --enable-djvu
-GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas
-.else
+# DJVU is broken, need older version of djvu
+#.if defined(WITH_DJVU)
+#LIB_DEPENDS+= djvulibre.17:${PORTSDIR}/graphics/djvulibre${DJVU_DIR}
+#CONFIGURE_ARGS+= --enable-djvu
+#GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas
+#.else
CONFIGURE_ARGS+= --disable-djvu
-.endif
+#.endif
-.if defined(WITH_DBUS)
+.if !defined(WITHOUT_DBUS)
LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus
.endif
+.if defined(WITH_COMICS)
+CONFIGURE_ARGS+= --enable-comics
+GCONF_SCHEMAS+= evince-thumbnailer-comics.schemas
+
+RUN_DEPENDS= unrar:${PORTSDIR}/archivers/unrar \
+ unzip:${PORTSDIR}/archivers/unzip
+.endif
+
post-patch:
- @${REINPLACE_CMD} -e 's|-lt1lib|-lt1 -lm|' \
+ @${REINPLACE_CMD} -e 's|-lt1lib|-lt1 -lm| ; \
+ s|execinfo.h|#|g' \
${WRKSRC}/configure \
${WRKSRC}/dvi/mdvi-lib/Makefile.in
diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo
index dcfa41b268d..acd8bc52158 100644
--- a/graphics/evince/distinfo
+++ b/graphics/evince/distinfo
@@ -1,3 +1,3 @@
-MD5 (evince-0.4.0.tar.bz2) = cc41e30108bc54a345bd6ca2556ab857
-SHA256 (evince-0.4.0.tar.bz2) = 0264f24b30820bef80473db9176a46524e6ec00db2024adef2e7c49673ad0b59
-SIZE (evince-0.4.0.tar.bz2) = 891605
+MD5 (evince-0.5.2.tar.bz2) = 732df368435cebddd4cc8132a8a280bd
+SHA256 (evince-0.5.2.tar.bz2) = c3f923e9becee6aa59cc4dafbc36d376a88099cf4017a5e928f367bd428174de
+SIZE (evince-0.5.2.tar.bz2) = 1000723
diff --git a/graphics/evince/files/patch-djvu_djvu-text.h b/graphics/evince/files/patch-djvu_djvu-text.h
new file mode 100644
index 00000000000..ab717fac730
--- /dev/null
+++ b/graphics/evince/files/patch-djvu_djvu-text.h
@@ -0,0 +1,10 @@
+--- djvu/djvu-text.h.orig Fri Apr 21 23:12:56 2006
++++ djvu/djvu-text.h Fri Apr 21 23:14:09 2006
+@@ -24,7 +24,6 @@
+ #include <glib.h>
+ #include <libdjvu/ddjvuapi.h>
+
+-typedef struct miniexp_s* miniexp_t;
+ extern const miniexp_t miniexp_nil;
+ extern const miniexp_t miniexp_dummy;
+
diff --git a/graphics/evince/files/patch-shell_main.c b/graphics/evince/files/patch-shell_main.c
deleted file mode 100644
index 05a0c788287..00000000000
--- a/graphics/evince/files/patch-shell_main.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- shell/main.c.dbus-fix 2005-09-01 04:14:54.000000000 -0400
-+++ shell/main.c 2005-09-01 04:15:33.000000000 -0400
-@@ -152,7 +152,7 @@
- if (!files) {
- #if DBUS_VERSION <= 33
- call = dbus_g_proxy_begin_call (remote_object, "OpenWindow",
-- DBUS_TYPE_UINT32, timestamp,
-+ DBUS_TYPE_UINT32, &timestamp,
- DBUS_TYPE_INVALID);
-
- if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) {
-@@ -193,7 +193,7 @@
- call = dbus_g_proxy_begin_call (remote_object, "OpenURI",
- DBUS_TYPE_STRING, &uri,
- DBUS_TYPE_STRING, &page_label,
-- DBUS_TYPE_UINT32, timestamp,
-+ DBUS_TYPE_UINT32, &timestamp,
- DBUS_TYPE_INVALID);
-
- if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) {
diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist
index 47ac1b8b158..3c8660a6122 100644
--- a/graphics/evince/pkg-plist
+++ b/graphics/evince/pkg-plist
@@ -3,7 +3,6 @@ bin/evince-thumbnailer
%%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.a
%%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.la
%%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.so
-%%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.so.0
share/gnome/applications/evince.desktop
share/gnome/evince/evince-password.glade
share/gnome/evince/evince-properties.glade
@@ -13,22 +12,34 @@ share/gnome/evince/hand-open.png
share/gnome/help/evince/C/evince.xml
share/gnome/help/evince/C/figures/evince_start_window.png
share/gnome/help/evince/C/legal.xml
+share/gnome/help/evince/bg/evince.xml
+share/gnome/help/evince/bg/figures/evince_start_window.png
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/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/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-nl.omf
+share/gnome/omf/evince/evince-ru.omf
share/gnome/omf/evince/evince-sr.omf
share/gnome/omf/evince/evince-uk.omf
+share/locale/be/LC_MESSAGES/evince.mo
share/locale/bg/LC_MESSAGES/evince.mo
+share/locale/bn/LC_MESSAGES/evince.mo
share/locale/ca/LC_MESSAGES/evince.mo
share/locale/cs/LC_MESSAGES/evince.mo
+share/locale/cy/LC_MESSAGES/evince.mo
share/locale/da/LC_MESSAGES/evince.mo
share/locale/de/LC_MESSAGES/evince.mo
share/locale/el/LC_MESSAGES/evince.mo
@@ -37,6 +48,7 @@ share/locale/en_GB/LC_MESSAGES/evince.mo
share/locale/es/LC_MESSAGES/evince.mo
share/locale/et/LC_MESSAGES/evince.mo
share/locale/eu/LC_MESSAGES/evince.mo
+share/locale/fa/LC_MESSAGES/evince.mo
share/locale/fi/LC_MESSAGES/evince.mo
share/locale/fr/LC_MESSAGES/evince.mo
share/locale/gl/LC_MESSAGES/evince.mo
@@ -44,16 +56,24 @@ share/locale/gu/LC_MESSAGES/evince.mo
share/locale/he/LC_MESSAGES/evince.mo
share/locale/hi/LC_MESSAGES/evince.mo
share/locale/hu/LC_MESSAGES/evince.mo
+share/locale/id/LC_MESSAGES/evince.mo
+share/locale/it/LC_MESSAGES/evince.mo
share/locale/ja/LC_MESSAGES/evince.mo
+share/locale/ka/LC_MESSAGES/evince.mo
share/locale/ko/LC_MESSAGES/evince.mo
+share/locale/ku/LC_MESSAGES/evince.mo
share/locale/lt/LC_MESSAGES/evince.mo
+share/locale/lv/LC_MESSAGES/evince.mo
+share/locale/mk/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/no/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
share/locale/pt_BR/LC_MESSAGES/evince.mo
+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
@@ -64,20 +84,26 @@ share/locale/sv/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
+share/locale/vi/LC_MESSAGES/evince.mo
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/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
@dirrm share/gnome/omf/evince
@dirrm share/gnome/help/evince/uk/figures
@dirrm share/gnome/help/evince/uk
@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/es/figures
@dirrm share/gnome/help/evince/es
@dirrm share/gnome/help/evince/el/figures
@dirrm share/gnome/help/evince/el
+@dirrm share/gnome/help/evince/bg/figures
+@dirrm share/gnome/help/evince/bg
@dirrm share/gnome/help/evince/C/figures
@dirrm share/gnome/help/evince/C
@dirrm share/gnome/help/evince
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index ad4281fd46f..e0211433a81 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -3,15 +3,14 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.48 2005/09/06 18:43:35 mezz Exp $
+# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.57 2006/04/13 07:52:35 bland Exp $
#
PORTNAME= libgnomecanvas
-PORTVERSION= 2.12.0
-PORTREVISION= 1
+PORTVERSION= 2.14.0
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -19,9 +18,10 @@ COMMENT= A graphics library for GNOME
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack libglade2 libartlgpl2 ltverhack
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index c15708ce6f9..cd3d87c1d1d 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomecanvas-2.12.0.tar.bz2) = 62c0edd3d27803d341662fd9088b2d9b
-SHA256 (gnome2/libgnomecanvas-2.12.0.tar.bz2) = 77c57dab746a312cd188ce9fcf91bb99b9a7e06d164f438530d65d018afd35da
-SIZE (gnome2/libgnomecanvas-2.12.0.tar.bz2) = 590010
+MD5 (gnome2/libgnomecanvas-2.14.0.tar.bz2) = 516c46fb4a1401b05cfef58c350fbd3d
+SHA256 (gnome2/libgnomecanvas-2.14.0.tar.bz2) = 5ceadd704327c2967868b3c0c81b5e600e1c6fd4f8efcbaaf89f9b18aa8bb5cf
+SIZE (gnome2/libgnomecanvas-2.14.0.tar.bz2) = 612330
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index fe9b38e017c..1567a0ba6e3 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -83,6 +83,7 @@ share/locale/it/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ja/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/kn/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ko/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/ku/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/li/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/lt/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/lv/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -111,15 +112,23 @@ share/locale/sr@ije/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/sv/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ta/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/tr/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/tt/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/uk/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/vi/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/wa/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/xh/LC_MESSAGES/libgnomecanvas-2.0.mo
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
+@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/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrmtry share/locale/ang/LC_MESSAGES
@dirrmtry share/locale/ang
@dirrm %%DOCSDIR%%
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index 856eb120260..733518c0cbd 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -3,15 +3,14 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.9 2005/09/07 18:37:21 marcus Exp $
+# $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.12 2006/04/13 07:52:35 bland Exp $
#
PORTNAME= libgnomecanvasmm
-PORTVERSION= 2.12.0
-PORTREVISION= 1
+PORTVERSION= 2.14.0
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= bland@FreeBSD.org
diff --git a/graphics/libgnomecanvasmm26/distinfo b/graphics/libgnomecanvasmm26/distinfo
index a04a8940bcb..f7e182efc6a 100644
--- a/graphics/libgnomecanvasmm26/distinfo
+++ b/graphics/libgnomecanvasmm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomecanvasmm-2.12.0.tar.bz2) = b05bba03433745043ef0c781020d4738
-SHA256 (gnome2/libgnomecanvasmm-2.12.0.tar.bz2) = 830622e3d0f8cbeeed3c1aeb8ec0d399505edc319f97233f3c4a6088acea3c80
-SIZE (gnome2/libgnomecanvasmm-2.12.0.tar.bz2) = 353153
+MD5 (gnome2/libgnomecanvasmm-2.14.0.tar.bz2) = a4e5bf13a31e38b4f30b99153bc10aca
+SHA256 (gnome2/libgnomecanvasmm-2.14.0.tar.bz2) = 93c22a04032163d5efe2d95b1b5e7b055221ad0246c64d0dd9584338f93cb4f8
+SIZE (gnome2/libgnomecanvasmm-2.14.0.tar.bz2) = 327771
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index f8e9ddbdf75..29837899896 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,15 +3,14 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/librsvg2/Makefile,v 1.73 2005/10/11 22:27:04 marcus Exp $
+# $MCom: ports/graphics/librsvg2/Makefile,v 1.98 2006/04/13 07:52:35 bland Exp $
#
PORTNAME= librsvg2
-PORTVERSION= 2.12.7
-PORTREVISION= 4
+PORTVERSION= 2.14.3
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= librsvg-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -28,16 +27,16 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
-USE_REINPLACE= yes
-USE_GNOME= gnomehack gnomeprefix libartlgpl2 libgsf gtk20 ltverhack
+USE_AUTOTOOLS= libtool:15
+USE_GNOME= gnomehack gnomeprefix libgsf gtk20 ltverhack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-svgz \
--disable-gtk-doc \
--without-gimp \
--with-croco \
- --disable-gnome-vfs
+ --disable-gnome-vfs \
+ --enable-gtk-theme
CROCO_VERSION= 0.6
GTK_VERSION= 2.4.0
@@ -50,23 +49,18 @@ OPTIONS= MOZILLA_PLUGIN "Enable the SVG browser plug-in" no
.include <bsd.port.pre.mk>
-.if ${OSVERSION} > 499999
.if defined(WITH_MOZILLA_PLUGIN)
-USE_GECKO= firefox mozilla
+USE_GECKO= firefox mozilla seamonkey xulrunner firefox-devel
.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
CONFIGURE_ENV+= MOZILLA_CONFIG=no
CONFIGURE_ARGS+=--enable-mozilla-plugin=yes
PLIST_SUB+= PLUGIN=""
.else
-
CONFIGURE_ARGS+=--enable-mozilla-plugin=no
+
PLIST_SUB+= PLUGIN="@comment "
.endif
-.else
-PLIST_SUB+= PLUGIN="@comment "
-CONFIGURE_ARGS+=--enable-mozilla-plugin=no
-.endif
post-patch:
.if defined(WITH_MOZILLA_PLUGIN)
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 480c6886be6..ebf2518b6ee 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/librsvg-2.12.7.tar.bz2) = 2113f01fbf228f3f8fc17c49966143fe
-SHA256 (gnome2/librsvg-2.12.7.tar.bz2) = b2b351675547c9d4a33b8dd6d51063ce024bcdc834ff057bcb5d1c62ab0ed781
-SIZE (gnome2/librsvg-2.12.7.tar.bz2) = 396901
+MD5 (gnome2/librsvg-2.14.3.tar.bz2) = f926aa102ccc3ce99ddf257fcce8ebf4
+SHA256 (gnome2/librsvg-2.14.3.tar.bz2) = 1fe9d73067f6be070ca5fc0bc3b06e6439947b8037acbb9a2116bf94b3acd2e7
+SIZE (gnome2/librsvg-2.14.3.tar.bz2) = 415420
diff --git a/graphics/librsvg2/files/patch-configure b/graphics/librsvg2/files/patch-configure
deleted file mode 100644
index 38c33bc6c06..00000000000
--- a/graphics/librsvg2/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Wed Jun 9 01:30:07 2004
-+++ configure Wed Jun 9 01:30:24 2004
-@@ -22052,7 +22052,7 @@
- if test "x$with_html_dir" = "x" ; then
- HTML_DIR='${datadir}/doc/librsvg/html'
- else
-- HTML_DIR=$with_html_dir
-+ HTML_DIR=${with_html_dir}/librsvg/html
- fi
-
-
diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
index 835590afdfa..e8c168429a7 100644
--- a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
+++ b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
@@ -1,20 +1,20 @@
---- moz-plugin/Makefile.in.orig Fri Sep 9 23:59:09 2005
-+++ moz-plugin/Makefile.in Sat Sep 10 00:01:22 2005
-@@ -204,7 +204,7 @@
+--- 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@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-plugindir = $(libdir)/mozilla/plugins/
+plugindir = $(libdir)/browser_plugins/
@WITH_MOZILLA_FALSE@plugin_LTLIBRARIES =
-
@WITH_MOZILLA_TRUE@plugin_LTLIBRARIES = libmozsvgdec.la
-@@ -253,7 +253,7 @@
- pluginLTLIBRARIES_INSTALL = $(INSTALL)
+ INCLUDES = $(MOZILLA_CFLAGS) -DBINDIR=\"$(bindir)/\" $(GLIB_CFLAGS) $(GDK_X11_CFLAGS)
+@@ -289,7 +289,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
@$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(plugindir)
-+@WITH_MOZILLA_TRUE@ $(mkinstalldirs) $(DESTDIR)$(plugindir)
+- test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
++@WITH_MOZILLA_TRUE@ test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
+ f=$(am__strip_dir) \
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index 8c2da3c3ec2..b7c27e69cac 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -1,7 +1,9 @@
bin/rsvg
+bin/rsvg-convert
bin/rsvg-view
include/librsvg-2/librsvg/librsvg-enum-types.h
include/librsvg-2/librsvg/librsvg-features.h
+include/librsvg-2/librsvg/rsvg-cairo.h
include/librsvg-2/librsvg/rsvg.h
%%PLUGIN%%lib/browser_plugins/libmozsvgdec.a
%%PLUGIN%%lib/browser_plugins/libmozsvgdec.la
@@ -17,26 +19,8 @@ lib/librsvg-2.la
lib/librsvg-2.so
lib/librsvg-2.so.2
libdata/pkgconfig/librsvg-2.0.pc
-share/doc/librsvg/html/home.png
-share/doc/librsvg/html/index.html
-share/doc/librsvg/html/index.sgml
-share/doc/librsvg/html/ix01.html
-share/doc/librsvg/html/left.png
-share/doc/librsvg/html/right.png
-share/doc/librsvg/html/rn01.html
-share/doc/librsvg/html/rn02.html
-share/doc/librsvg/html/rn03.html
-share/doc/librsvg/html/rsvg-Convenience-Functions.html
-share/doc/librsvg/html/rsvg-Core-API.html
-share/doc/librsvg/html/rsvg-Creating-a-SVGZ-reader.html
-share/doc/librsvg/html/rsvg.devhelp
-share/doc/librsvg/html/rsvg.html
-share/doc/librsvg/html/up.png
share/gnome/pixmaps/svg-viewer.svg
-@dirrm share/doc/librsvg/html
-@dirrm share/doc/librsvg
@dirrm include/librsvg-2/librsvg
@dirrm include/librsvg-2
@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
@unexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
-%%PLUGIN%%@unexec rmdir %D/lib/browser_plugins 2>/dev/null || /usr/bin/true
diff --git a/graphics/poppler-gtk/Makefile b/graphics/poppler-gtk/Makefile
new file mode 100644
index 00000000000..50821380dfd
--- /dev/null
+++ b/graphics/poppler-gtk/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: poppler-gtk
+# Date created: 2006-01-12
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.3 2006/03/09 01:49:50 marcus Exp $
+
+PORTREVISION= 0
+PKGNAMESUFFIX= -gtk
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gtk bindings to poppler
+
+MASTERDIR= ${.CURDIR}/../../graphics/poppler
+SLAVEPORT= gtk
+PLIST= ${.CURDIR}/pkg-plist
+
+pre-build:
+ cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+ Makefile ${MAKE_ARGS} libpoppler-cairo.la
+
+.include "${MASTERDIR}/Makefile"
diff --git a/graphics/poppler-gtk/pkg-plist b/graphics/poppler-gtk/pkg-plist
new file mode 100644
index 00000000000..980f6301364
--- /dev/null
+++ b/graphics/poppler-gtk/pkg-plist
@@ -0,0 +1,28 @@
+include/poppler/glib/poppler-action.h
+include/poppler/glib/poppler-attachment.h
+include/poppler/glib/poppler-document.h
+include/poppler/glib/poppler-enums.h
+include/poppler/glib/poppler-page.h
+include/poppler/glib/poppler.h
+lib/libpoppler-glib.a
+lib/libpoppler-glib.la
+lib/libpoppler-glib.so
+lib/libpoppler-glib.so.1
+libdata/pkgconfig/poppler-glib.pc
+%%DOCSDIR%%/poppler/ch01.html
+%%DOCSDIR%%/poppler/home.png
+%%DOCSDIR%%/poppler/index.html
+%%DOCSDIR%%/poppler/index.sgml
+%%DOCSDIR%%/poppler/left.png
+%%DOCSDIR%%/poppler/poppler-poppler-action.html
+%%DOCSDIR%%/poppler/poppler-poppler-document.html
+%%DOCSDIR%%/poppler/poppler-poppler-enums.html
+%%DOCSDIR%%/poppler/poppler-poppler-page.html
+%%DOCSDIR%%/poppler/poppler-poppler.html
+%%DOCSDIR%%/poppler/poppler.devhelp
+%%DOCSDIR%%/poppler/right.png
+%%DOCSDIR%%/poppler/style.css
+%%DOCSDIR%%/poppler/up.png
+@dirrmtry %%DOCSDIR%%/poppler
+@dirrmtry %%DOCSDIR%%
+@dirrm include/poppler/glib
diff --git a/graphics/poppler-qt/Makefile b/graphics/poppler-qt/Makefile
new file mode 100644
index 00000000000..e61c2b20004
--- /dev/null
+++ b/graphics/poppler-qt/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for: poppler-qt
+# Date created: 2006-01-12
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/poppler-qt/Makefile,v 1.6 2006/04/12 17:10:20 ahze Exp $
+
+PORTREVISION= 0
+PKGNAMESUFFIX= -qt
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Qt bindings to poppler
+
+MASTERDIR= ${.CURDIR}/../../graphics/poppler
+SLAVEPORT= qt
+PLIST= ${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/graphics/poppler-qt/pkg-plist b/graphics/poppler-qt/pkg-plist
new file mode 100644
index 00000000000..bc152aa0597
--- /dev/null
+++ b/graphics/poppler-qt/pkg-plist
@@ -0,0 +1,7 @@
+include/poppler/poppler-page-transition.h
+include/poppler/poppler-qt.h
+lib/libpoppler-qt.a
+lib/libpoppler-qt.la
+lib/libpoppler-qt.so
+lib/libpoppler-qt.so.1
+libdata/pkgconfig/poppler-qt.pc
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 48275124af6..f12fb706614 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,25 +3,71 @@
# Whom: marcus@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/graphics/poppler/Makefile,v 1.14 2005/09/03 04:44:58 ahze Exp $
+# $MCom: ports/graphics/poppler/Makefile,v 1.23 2006/04/12 17:10:20 ahze Exp $
#
PORTNAME= poppler
-PORTVERSION= 0.4.5
+PORTVERSION= 0.5.1
+PORTREVISION?= 0
CATEGORIES= graphics print
MASTER_SITES= http://poppler.freedesktop.org/
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= A PDF rendering library
+MAINTAINER?= gnome@FreeBSD.org
+COMMENT?= A PDF rendering library
-USE_X_PREFIX= yes
+LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
+
+CONFLICTS= xpdf-[0-9]*
USE_GMAKE= yes
+USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-USE_GNOME= gnomeprefix gnomehack gtk20
+USE_GNOME= gnomehack gnometarget
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-zlib \
- --disable-poppler-qt
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ --enable-xpdf-headers \
+ --with-html-dir=${DOCSDIR}
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+
+.include <bsd.port.pre.mk>
+
+.if defined(SLAVEPORT)
+LIB_DEPENDS+= poppler.1:${PORTSDIR}/graphics/poppler
+.if ${SLAVEPORT}=="gtk"
+CONFIGURE_ARGS+=--enable-poppler-glib
+USE_GNOME+= gtk20
+BUILD_WRKSRC= ${WRKSRC}/glib
+INSTALL_WRKSRC= ${WRKSRC}/glib
+.elif ${SLAVEPORT}=="qt"
+CONFIGURE_ARGS+=--enable-poppler-qt
+USE_QT_VER+= 3
+BUILD_WRKSRC= ${WRKSRC}/qt
+INSTALL_WRKSRC= ${WRKSRC}/qt
+# blah.. USE_QT_VER can't be defined after bsd.port.pre.mk
+.include "${PORTSDIR}/Mk/bsd.kde.mk"
+.endif
+.else
+CONFIGURE_ARGS+=--disable-poppler-glib --disable-poppler-qt \
+ --disable-poppler-qt4
+MAN1= pdffonts.1 pdfimages.1 pdfinfo.1 \
+ pdftohtml.1 pdftops.1 pdftotext.1 pdftoppm.1
+.endif
+
+post-patch:
+.if defined(SLAVEPORT) && ${SLAVEPORT}=="qt"
+ @${REINPLACE_CMD} -e 's|/usr/local/qt/include|${X11BASE}/include|; \
+ s|/usr/local/qt/lib|${X11BASE}/lib|' \
+ ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|$$QTDIR|${X11BASE}|' ${WRKSRC}/configure
+.endif
+
+post-install:
+.if defined(SLAVEPORT)
+.if ${SLAVEPORT}=="gtk"
+ ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${PREFIX}/libdata/pkgconfig
+.elif ${SLAVEPORT}=="qt"
+ ${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc ${PREFIX}/libdata/pkgconfig
+.endif
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index 288cfd4c1df..ba73162585d 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-0.4.5.tar.gz) = 2bb1c75aa3f9c42f0ba48b5492e6d32c
-SHA256 (poppler-0.4.5.tar.gz) = e5094a7587e53744ade899394ff5679e1dab2438ee0c9db137b1220c439f0639
-SIZE (poppler-0.4.5.tar.gz) = 783752
+MD5 (poppler-0.5.1.tar.gz) = a136cd731892f4570933034ba97c8704
+SHA256 (poppler-0.5.1.tar.gz) = 2ee3f06d64dd703a2411428169fe21c17f6358950bb797d52ca8eebd1dcf1abe
+SIZE (poppler-0.5.1.tar.gz) = 954930
diff --git a/graphics/poppler/files/patch-configure b/graphics/poppler/files/patch-configure
new file mode 100644
index 00000000000..72b0d9459e1
--- /dev/null
+++ b/graphics/poppler/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig Wed Apr 12 12:53:56 2006
++++ configure Wed Apr 12 13:06:36 2006
+@@ -24849,7 +24849,7 @@
+ fi
+ fi
+
+-if test "x$have_qt" == "xyes"; then
++if test "x$have_qt" = "xyes"; then
+ POPPLER_QT_CXXFLAGS="-I$qt_incdir"
+ POPPLER_QT_LIBS="$qt_libdir/$qt_test_library"
+ :
diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in
new file mode 100644
index 00000000000..111a8521c47
--- /dev/null
+++ b/graphics/poppler/files/patch-glib_Makefile.in
@@ -0,0 +1,37 @@
+--- glib/Makefile.in.orig Wed Mar 8 20:40:26 2006
++++ glib/Makefile.in Wed Mar 8 20:42:17 2006
+@@ -65,7 +65,6 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+ libpoppler_glib_la_DEPENDENCIES = \
+- $(top_builddir)/poppler/libpoppler.la \
+ $(top_builddir)/poppler/libpoppler-cairo.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2)
+@@ -78,7 +77,7 @@ PROGRAMS = $(noinst_PROGRAMS)
+ am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT)
+ test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
+ test_poppler_glib_DEPENDENCIES = \
+- $(top_builddir)/poppler/libpoppler.la libpoppler-glib.la \
++ $(top_builddir)/poppler/libpoppler-cairo.la libpoppler-glib.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
+@@ -306,7 +305,7 @@ libpoppler_glib_la_SOURCES = \
+ poppler-private.h
+
+ libpoppler_glib_la_LIBADD = \
+- $(top_builddir)/poppler/libpoppler.la \
++ -lpoppler \
+ $(top_builddir)/poppler/libpoppler-cairo.la \
+ $(POPPLER_GLIB_LIBS) \
+ $(FREETYPE_LIBS) \
+@@ -317,7 +316,7 @@ test_poppler_glib_SOURCES = \
+ test-poppler-glib.c
+
+ test_poppler_glib_LDADD = \
+- $(top_builddir)/poppler/libpoppler.la \
++ -lpoppler \
+ libpoppler-glib.la \
+ $(POPPLER_GLIB_LIBS) \
+ $(FREETYPE_LIBS) \
diff --git a/graphics/poppler/files/patch-qt_Makefile.in b/graphics/poppler/files/patch-qt_Makefile.in
new file mode 100644
index 00000000000..29d9a5fa298
--- /dev/null
+++ b/graphics/poppler/files/patch-qt_Makefile.in
@@ -0,0 +1,39 @@
+--- qt/Makefile.in.orig Thu Jan 12 21:37:56 2006
++++ qt/Makefile.in Thu Jan 12 21:38:47 2006
+@@ -63,16 +63,14 @@
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libpoppler_qt_la_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+- $(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
+ 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)
+ 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 @@
+ poppler-private.h
+
+ libpoppler_qt_la_LIBADD = \
+- $(top_builddir)/poppler/libpoppler.la \
++ -lpoppler \
+ $(POPPLER_QT_LIBS) \
+ $(FREETYPE_LIBS)
+
+@@ -281,7 +279,7 @@
+ test-poppler-qt.cpp
+
+ test_poppler_qt_LDADD = \
+- $(top_builddir)/poppler/libpoppler.la \
++ -lpoppler \
+ libpoppler-qt.la \
+ $(POPPLER_QT_LIBS) \
+ $(FREETYPE_LIBS)
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index eafc607a97a..dde9794b661 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -1,11 +1,16 @@
+bin/pdffonts
+bin/pdfimages
+bin/pdfinfo
+bin/pdftohtml
+bin/pdftoppm
+bin/pdftops
+bin/pdftotext
include/poppler/Annot.h
include/poppler/Array.h
include/poppler/BaseFile.h
include/poppler/BuiltinFont.h
include/poppler/BuiltinFontTables.h
include/poppler/CMap.h
-include/poppler/CairoFontEngine.h
-include/poppler/CairoOutputDev.h
include/poppler/Catalog.h
include/poppler/CharCodeToUnicode.h
include/poppler/CharTypes.h
@@ -38,25 +43,26 @@ include/poppler/PSOutputDev.h
include/poppler/PSTokenizer.h
include/poppler/Page.h
include/poppler/Parser.h
+include/poppler/ProfileData.h
+include/poppler/SecurityHandler.h
include/poppler/SplashOutputDev.h
include/poppler/Stream-CCITT.h
include/poppler/Stream.h
include/poppler/TextOutputDev.h
include/poppler/UTF8.h
+include/poppler/UGooString.h
include/poppler/UnicodeMap.h
include/poppler/UnicodeMapTables.h
include/poppler/UnicodeTypeTable.h
include/poppler/XRef.h
-include/poppler/glib/poppler-action.h
-include/poppler/glib/poppler-document.h
-include/poppler/glib/poppler-enums.h
-include/poppler/glib/poppler-page.h
-include/poppler/glib/poppler.h
+include/poppler/XpdfPluginAPI.h
+include/poppler/goo/FixedPoint.h
include/poppler/goo/GooHash.h
include/poppler/goo/GooList.h
include/poppler/goo/GooMutex.h
include/poppler/goo/GooString.h
include/poppler/goo/GooTimer.h
+include/poppler/goo/GooVector.h
include/poppler/goo/gfile.h
include/poppler/goo/gmem.h
include/poppler/goo/gtypes.h
@@ -84,19 +90,13 @@ include/poppler/splash/SplashT1FontFile.h
include/poppler/splash/SplashTypes.h
include/poppler/splash/SplashXPath.h
include/poppler/splash/SplashXPathScanner.h
-lib/libpoppler-glib.a
-lib/libpoppler-glib.la
-lib/libpoppler-glib.so
-lib/libpoppler-glib.so.0
lib/libpoppler.a
lib/libpoppler.la
lib/libpoppler.so
-lib/libpoppler.so.0
+lib/libpoppler.so.1
libdata/pkgconfig/poppler-cairo.pc
-libdata/pkgconfig/poppler-glib.pc
libdata/pkgconfig/poppler-splash.pc
libdata/pkgconfig/poppler.pc
@dirrm include/poppler/splash
@dirrm include/poppler/goo
-@dirrm include/poppler/glib
@dirrm include/poppler
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index c85600b4535..2352de3063a 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,15 +3,14 @@
# Whom: Adam Weinberger, based off kiesel's ximian-exchange port
#
# $FreeBSD$
-# $MCom: ports/mail/evolution-exchange/Makefile,v 1.39 2005/10/04 04:32:19 marcus Exp $
+# $MCom: ports/mail/evolution-exchange/Makefile,v 1.59 2006/04/13 07:52:36 bland Exp $
#
PORTNAME= evolution-exchange
-PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTVERSION= 2.6.1
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= kiesel@schlund.de
@@ -21,21 +20,20 @@ BUILD_DEPENDS= evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
RUN_DEPENDS= evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
-
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_OPENLDAP= yes
USE_GNOME= gnomeprefix intlhack gnomehack gnometarget
-USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \
--with-static-ldap=no \
--disable-compile-warnings
-EVO_VERSION= 2.4
-PLIST_SUB= VERSION="2.4" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" \
+EVO_VERSION= 2.6
+PLIST_SUB= VERSION="2.6" 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 bbd27e390bb..18f4c48f2fd 100644
--- a/mail/evolution-exchange/distinfo
+++ b/mail/evolution-exchange/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-exchange-2.4.2.tar.bz2) = 67802f9c0be1528edaa0612188588914
-SHA256 (gnome2/evolution-exchange-2.4.2.tar.bz2) = beaa8e806e5babb2cd479446720ea492ed854db65036df678d7717c682cc332c
-SIZE (gnome2/evolution-exchange-2.4.2.tar.bz2) = 1100845
+MD5 (gnome2/evolution-exchange-2.6.1.tar.bz2) = 027cc03c5d8f95f4eb26603781e49816
+SHA256 (gnome2/evolution-exchange-2.6.1.tar.bz2) = fbb9120984ea440c9b29ecf707bc7e39e1a93b4455ec79d89183233b718dfd21
+SIZE (gnome2/evolution-exchange-2.6.1.tar.bz2) = 1022518
diff --git a/mail/evolution-exchange/files/patch-configure b/mail/evolution-exchange/files/patch-configure
index 43668716a0d..f5d9a43d8c2 100644
--- a/mail/evolution-exchange/files/patch-configure
+++ b/mail/evolution-exchange/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Fri Aug 20 15:26:49 2004
-+++ configure Fri Aug 20 15:27:21 2004
-@@ -23754,8 +23754,8 @@
+--- 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.
@@ -11,12 +11,3 @@
fi
else
LDAP_LIBS="-llber $LDAP_LIBS"
-@@ -24006,7 +24006,7 @@
-
-
- mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
--heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
-+heimlibs="-lkrb5 -lcrypt -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
- echo "$as_me:$LINENO: checking for Kerberos 5" >&5
- echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
- if test "${ac_cv_lib_kerberos5+set}" = set; then
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index 24e31d9d08e..5c2509a6dee 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -62,9 +62,6 @@ libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage
%%OLDDOCSDIR%%/ximian-connector-xntlm.html
%%OLDDOCSDIR%%/ximian-connector.devhelp
%%OLDDOCSDIR%%/ximian-connnector-booking.html
-share/gnome/evolution-exchange/%%VERSION%%/etspec/e-storage-set-view.etspec
-share/gnome/evolution-exchange/%%VERSION%%/glade/e-folder-creation-dialog.glade
-share/gnome/evolution-exchange/%%VERSION%%/glade/e-foreign-folder-dialog.glade
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
@@ -81,14 +78,17 @@ 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/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
+share/locale/da/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/de/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/dz/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/el/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
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
@@ -100,7 +100,9 @@ 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/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/mk/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
@@ -112,6 +114,7 @@ share/locale/pl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/pt/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/pt_BR/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
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/sq/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
@@ -122,13 +125,18 @@ share/locale/ta/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/th/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/tr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/uk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
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
+@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/evolution-exchange/%%VERSION%%/ui
@dirrm share/gnome/evolution-exchange/%%VERSION%%/images
@dirrm share/gnome/evolution-exchange/%%VERSION%%/glade
-@dirrm share/gnome/evolution-exchange/%%VERSION%%/etspec
@dirrm share/gnome/evolution-exchange/%%VERSION%%
@dirrm share/gnome/evolution-exchange
@dirrm %%OLDDOCSDIR%%
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index eb3923090bd..1be87512628 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,15 +3,14 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/mail/evolution/Makefile,v 1.76 2005/10/09 11:09:15 kwm Exp $
+# $MCom: ports/mail/evolution/Makefile,v 1.98 2006/04/13 07:52:35 bland Exp $
#
PORTNAME= evolution
-PORTVERSION= 2.4.2.1
-PORTREVISION= 1
+PORTVERSION= 2.6.1
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -23,12 +22,14 @@ RUN_DEPENDS= ${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSD
USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver \
gtkhtml3 desktopfileutils
-USE_REINPLACE= yes
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
+INSTALLS_SHLIB= yes
+LDCONFIG_DIRS= %%PREFIX%%/lib/evolution/%%VERSION%%
CONFIGURE_ARGS= --enable-nss=yes \
--with-nss-includes=${LOCALBASE}/include/nss/nss \
--with-nss-libs=${LOCALBASE}/lib \
@@ -41,13 +42,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.4.schemas \
+ apps-evolution-mail-prompts-checkdefault-2.6.schemas \
apps_evolution_shell-${EVO_VERSION}.schemas \
evolution-mail-${EVO_VERSION}.schemas
-EVO_VERSION= 2.4
+EVO_VERSION= 2.6
PLIST_SUB= VERSION=${EVO_VERSION} \
- PORTVERSION=2.4
+ PORTVERSION=2.6
OPTIONS= PILOT "Enable Palm Pilot sync support" off \
LDAP "Enable LDAP support" on \
@@ -55,9 +56,8 @@ OPTIONS= PILOT "Enable Palm Pilot sync support" off \
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-BROKEN= "Does not build on 4.X"
-.endif
+USE_LDCONFIG= ${PREFIX}/lib/evolution/${EVO_VERSION}
+.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
WITH_GSTREAMER= yes
@@ -93,7 +93,7 @@ RUN_DEPENDS+= spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
.endif
.if defined(WITH_GSTREAMER)
-LIB_DEPENDS+= gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer
+LIB_DEPENDS+= gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer80
PLIST_SUB+= GSTREAMER=""
.else
PLIST_SUB+= GSTREAMER="@comment "
@@ -118,19 +118,9 @@ CONFIGURE_ARGS+= --with-krb5=${LOCALBASE}
.endif
.endif
-post-patch:
- @${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \
- s|%%EVO_VERSION%%|${EVO_VERSION}|' \
- ${FILESDIR}/evolibs.sh > ${WRKDIR}/evolibs.sh
- @${REINPLACE_CMD} -e "s|gal-2.4|gal-2.6|g" \
- ${WRKSRC}/evolution-shell.pc.in \
- ${WRKSRC}/evolution-plugin.pc.in
-
-post-install:
+post-install: install-ldconfig-file
@${LN} -sf ${PREFIX}/bin/evolution-${EVO_VERSION} \
${PREFIX}/bin/evolution
- @${INSTALL_SCRIPT} -m 555 ${WRKDIR}/evolibs.sh \
- ${PREFIX}/etc/rc.d/000.evolibs.sh
-@update-desktop-database
.include <bsd.port.post.mk>
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 45e73136248..c065bd751e8 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.4.2.1.tar.bz2) = cee3e0ac6ca43e5060468c3b938bea72
-SHA256 (gnome2/evolution-2.4.2.1.tar.bz2) = eae8fed13de8eee9f60606ec0e645876e4b9a1e9bb30d21dace54e3995ca5f40
-SIZE (gnome2/evolution-2.4.2.1.tar.bz2) = 11503590
+MD5 (gnome2/evolution-2.6.1.tar.bz2) = 6ca70a86e6d8e8b3824e58f28a362065
+SHA256 (gnome2/evolution-2.6.1.tar.bz2) = 9b78e132a52a9f7192ff396a6b957f9836794e34f45b96823f971756b8261ef8
+SIZE (gnome2/evolution-2.6.1.tar.bz2) = 12291684
diff --git a/mail/evolution/files/evolibs.sh b/mail/evolution/files/evolibs.sh
deleted file mode 100644
index e191b9c41ed..00000000000
--- a/mail/evolution/files/evolibs.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$1" in
- start)
- /sbin/ldconfig -m %%PREFIX%%/lib/evolution/%%EVO_VERSION%%
- ;;
- stop)
- ;;
- *)
- echo ""
- echo "Usage: `basename $0` { start | stop }"
- echo ""
- exit 64
- ;;
-esac
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index 0ad426b2d93..f09892fc815 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,8 +1,8 @@
---- configure.orig Fri Jul 29 17:50:28 2005
-+++ configure Fri Jul 29 17:51:42 2005
-@@ -23657,6 +23657,14 @@
- DL_LIB=''
+--- configure.orig Tue Nov 15 17:58:33 2005
++++ configure Tue Nov 15 18:02:37 2005
+@@ -23732,6 +23732,15 @@
SOFTOKN3_LIB=''
+ HAL_REQUIREMENT=''
;;
+*freebsd*) os_win32=no
+ NO_UNDEFINED=''
@@ -11,11 +11,12 @@
+ SA_JUNK_PLUGIN=sa-junk-plugin
+ DL_LIB=''
+ SOFTOKN3_LIB='-lsoftokn3'
++ HAL_REQUIREMENT=''
+ ;;
*) os_win32=no
NO_UNDEFINED=''
- SOCKET_LIBS=''
-@@ -26205,6 +26213,7 @@
+ SOEXT='.so'
+@@ -26280,6 +26289,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
@@ -23,7 +24,7 @@
int
-@@ -27882,7 +27891,7 @@
+@@ -27980,7 +27990,7 @@
LDFLAGS_save="$LDFLAGS"
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
@@ -32,7 +33,7 @@
echo "$as_me:$LINENO: checking for Kerberos 5" >&5
echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
if test "${ac_cv_lib_kerberos5+set}" = set; then
-@@ -33151,7 +33160,7 @@
+@@ -33143,7 +33153,7 @@
idldir="$datadir/idl/evolution-$BASE_VERSION"
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index a19421e9540..bb958c9531c 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,6 +1,5 @@
bin/evolution
bin/evolution-%%VERSION%%
-etc/rc.d/000.evolibs.sh
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
@@ -27,12 +26,9 @@ include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-popup.h
include/evolution-%%VERSION%%/calendar/gui/e-cal-config.h
include/evolution-%%VERSION%%/e-conduit/e-pilot-map.h
include/evolution-%%VERSION%%/e-conduit/e-pilot-util.h
-include/evolution-%%VERSION%%/e-util/e-account-list.h
-include/evolution-%%VERSION%%/e-util/e-account.h
include/evolution-%%VERSION%%/e-util/e-bconf-map.h
include/evolution-%%VERSION%%/e-util/e-bit-array.h
include/evolution-%%VERSION%%/e-util/e-categories-config.h
-include/evolution-%%VERSION%%/e-util/e-component-listener.h
include/evolution-%%VERSION%%/e-util/e-config-listener.h
include/evolution-%%VERSION%%/e-util/e-config.h
include/evolution-%%VERSION%%/e-util/e-corba-utils.h
@@ -47,11 +43,7 @@ include/evolution-%%VERSION%%/e-util/e-gtk-utils.h
include/evolution-%%VERSION%%/e-util/e-gui-utils.h
include/evolution-%%VERSION%%/e-util/e-html-utils.h
include/evolution-%%VERSION%%/e-util/e-icon-factory.h
-include/evolution-%%VERSION%%/e-util/e-iconv.h
include/evolution-%%VERSION%%/e-util/e-import.h
-include/evolution-%%VERSION%%/e-util/e-iterator.h
-include/evolution-%%VERSION%%/e-util/e-list-iterator.h
-include/evolution-%%VERSION%%/e-util/e-list.h
include/evolution-%%VERSION%%/e-util/e-menu.h
include/evolution-%%VERSION%%/e-util/e-mktemp.h
include/evolution-%%VERSION%%/e-util/e-plugin.h
@@ -66,12 +58,9 @@ include/evolution-%%VERSION%%/e-util/e-sorter.h
include/evolution-%%VERSION%%/e-util/e-text-event-processor-emacs-like.h
include/evolution-%%VERSION%%/e-util/e-text-event-processor-types.h
include/evolution-%%VERSION%%/e-util/e-text-event-processor.h
-include/evolution-%%VERSION%%/e-util/e-time-utils.h
-include/evolution-%%VERSION%%/e-util/e-uid.h
include/evolution-%%VERSION%%/e-util/e-util-marshal.h
include/evolution-%%VERSION%%/e-util/e-util.h
include/evolution-%%VERSION%%/e-util/e-xml-utils.h
-include/evolution-%%VERSION%%/e-util/md5-utils.h
include/evolution-%%VERSION%%/mail/Evolution-Mail.h
include/evolution-%%VERSION%%/mail/em-composer-utils.h
include/evolution-%%VERSION%%/mail/em-config.h
@@ -162,6 +151,7 @@ include/evolution-%%VERSION%%/misc/e-url-entry.h
include/evolution-%%VERSION%%/misc/gal-combo-box.h
include/evolution-%%VERSION%%/misc/gal-combo-text.h
include/evolution-%%VERSION%%/shell/Evolution.h
+include/evolution-%%VERSION%%/shell/e-component-view.h
include/evolution-%%VERSION%%/shell/e-shell-utils.h
include/evolution-%%VERSION%%/shell/e-user-creatable-items-handler.h
include/evolution-%%VERSION%%/shell/es-event.h
@@ -324,8 +314,8 @@ lib/evolution/%%VERSION%%/plugins/libmail-account-disable.la
lib/evolution/%%VERSION%%/plugins/libmail-account-disable.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.la
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so
+%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.la
+%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.la
@@ -340,6 +330,12 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-caldav.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-caldav.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-hula-account-setup.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-hula-account-setup.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.la
@@ -364,6 +360,8 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-sa-junk-plugin.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-sa-junk-plugin.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.la
@@ -373,7 +371,7 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.so
lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.la
lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so
lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug
+%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-weather.eplug
@@ -382,6 +380,9 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-copy-tool.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-default-mailer.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-default-source.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-bbdb.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-caldav.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-hula-account-setup.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-mail-attachments-import-ics.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-startup-wizard.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-ab-subscription.xml
lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-cal-subscription.xml
@@ -394,6 +395,7 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-gw-account-setup.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-itip-formatter.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-mail-account-disable.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.xml
lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.xml
lib/evolution/%%VERSION%%/plugins/org-gnome-mark-all-read.eplug
@@ -403,10 +405,13 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.xml
lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.xml
+lib/evolution/%%VERSION%%/plugins/org-gnome-publish-calendar.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-publish-calendar.xml
lib/evolution/%%VERSION%%/plugins/org-gnome-sa-junk-plugin.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-save-calendar.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-select-one-source.eplug
lib/evolution/%%VERSION%%/plugins/org-gnome-subject-thread.eplug
+lib/evolution/%%VERSION%%/plugins/publish-calendar.glade
libdata/bonobo/servers/GNOME_Evolution_Addressbook_%%VERSION%%.server
libdata/bonobo/servers/GNOME_Evolution_Calendar_%%VERSION%%.server
libdata/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_%%VERSION%%.server
@@ -419,12 +424,16 @@ 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-%%VERSION%%.desktop
+share/gnome/applications/evolution.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
share/gnome/evolution/%%VERSION%%/default/de/mail/local/Inbox
+share/gnome/evolution/%%VERSION%%/default/fi/mail/local/Inbox
+share/gnome/evolution/%%VERSION%%/default/fr/mail/local/Inbox
share/gnome/evolution/%%VERSION%%/default/ja/mail/local/Inbox
+share/gnome/evolution/%%VERSION%%/default/lt/mail/local/Inbox
+share/gnome/evolution/%%VERSION%%/default/mk/mail/local/Inbox
share/gnome/evolution/%%VERSION%%/default/nl/mail/local/Inbox
share/gnome/evolution/%%VERSION%%/default/pt/mail/local/Inbox
share/gnome/evolution/%%VERSION%%/default/zh_CN/mail/local/Inbox
@@ -450,6 +459,7 @@ share/gnome/evolution/%%VERSION%%/etspec/e-cal-list-view.etspec
share/gnome/evolution/%%VERSION%%/etspec/e-calendar-table.etspec
share/gnome/evolution/%%VERSION%%/etspec/e-contact-list-editor.etspec
share/gnome/evolution/%%VERSION%%/etspec/e-meeting-time-sel.etspec
+share/gnome/evolution/%%VERSION%%/etspec/e-memo-table.etspec
share/gnome/evolution/%%VERSION%%/etspec/message-list.etspec
share/gnome/evolution/%%VERSION%%/filtertypes.xml
share/gnome/evolution/%%VERSION%%/glade/alarm-dialog.glade
@@ -475,6 +485,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-passwd-expiry.glade
share/gnome/evolution/%%VERSION%%/glade/exchange-permissions-dialog.glade
share/gnome/evolution/%%VERSION%%/glade/filter.glade
share/gnome/evolution/%%VERSION%%/glade/fulladdr.glade
@@ -490,6 +501,7 @@ share/gnome/evolution/%%VERSION%%/glade/junk-settings.glade
share/gnome/evolution/%%VERSION%%/glade/ldap-config.glade
share/gnome/evolution/%%VERSION%%/glade/mail-config.glade
share/gnome/evolution/%%VERSION%%/glade/mail-dialogs.glade
+share/gnome/evolution/%%VERSION%%/glade/memo-page.glade
share/gnome/evolution/%%VERSION%%/glade/meeting-page.glade
share/gnome/evolution/%%VERSION%%/glade/properties.glade
share/gnome/evolution/%%VERSION%%/glade/proxy-add-dialog.glade
@@ -500,7 +512,6 @@ share/gnome/evolution/%%VERSION%%/glade/schedule-page.glade
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%%/glade/url-editor-dialog.glade
share/gnome/evolution/%%VERSION%%/help/quickref/C/quickref.pdf
share/gnome/evolution/%%VERSION%%/images/about-box.png
share/gnome/evolution/%%VERSION%%/images/bcg.png
@@ -508,19 +519,24 @@ share/gnome/evolution/%%VERSION%%/images/evolution-contacts-mini.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/query-free-busy.png
share/gnome/evolution/%%VERSION%%/images/world_map-960.png
share/gnome/evolution/%%VERSION%%/searchtypes.xml
share/gnome/evolution/%%VERSION%%/ui/evolution-addressbook.xml
share/gnome/evolution/%%VERSION%%/ui/evolution-calendar.xml
share/gnome/evolution/%%VERSION%%/ui/evolution-composer-entries.xml
-share/gnome/evolution/%%VERSION%%/ui/evolution-executive-summary.xml
+share/gnome/evolution/%%VERSION%%/ui/evolution-editor.xml
+share/gnome/evolution/%%VERSION%%/ui/evolution-event-editor.xml
share/gnome/evolution/%%VERSION%%/ui/evolution-mail-global.xml
share/gnome/evolution/%%VERSION%%/ui/evolution-mail-list.xml
share/gnome/evolution/%%VERSION%%/ui/evolution-mail-message.xml
share/gnome/evolution/%%VERSION%%/ui/evolution-mail-messagedisplay.xml
+share/gnome/evolution/%%VERSION%%/ui/evolution-memo-editor.xml
+share/gnome/evolution/%%VERSION%%/ui/evolution-memos.xml
share/gnome/evolution/%%VERSION%%/ui/evolution-message-composer.xml
share/gnome/evolution/%%VERSION%%/ui/evolution-signature-editor.xml
share/gnome/evolution/%%VERSION%%/ui/evolution-subscribe.xml
+share/gnome/evolution/%%VERSION%%/ui/evolution-task-editor.xml
share/gnome/evolution/%%VERSION%%/ui/evolution-tasks.xml
share/gnome/evolution/%%VERSION%%/ui/evolution.xml
share/gnome/evolution/%%VERSION%%/vfoldertypes.xml
@@ -537,6 +553,8 @@ 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/galview.xml
+share/gnome/evolution/%%VERSION%%/views/memos/Memos.galview
+share/gnome/evolution/%%VERSION%%/views/memos/galview.xml
share/gnome/evolution/%%VERSION%%/views/tasks/Tasks.galview
share/gnome/evolution/%%VERSION%%/views/tasks/With_DueDate.galview
share/gnome/evolution/%%VERSION%%/views/tasks/With_Status.galview
@@ -552,6 +570,7 @@ 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-Free-Busy.png
share/gnome/help/evolution-%%VERSION%%/C/figures/calendar.png
share/gnome/help/evolution-%%VERSION%%/C/figures/config-cal.png
share/gnome/help/evolution-%%VERSION%%/C/figures/config-mail.png
@@ -606,8 +625,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-%%VERSION%%.keys
-share/gnome/mime-info/evolution-%%VERSION%%.mime
+share/gnome/mime-info/evolution.keys
+share/gnome/mime-info/evolution.mime
share/gnome/omf/evolution/evolution-%%VERSION%%-C.omf
share/gnome/pixmaps/evolution-%%VERSION%%.png
share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -616,12 +635,14 @@ 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/bs/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/cy/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/da/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/de/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/dz/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/el/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/en_AU/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/en_CA/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -636,15 +657,19 @@ share/locale/ga/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/gl/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/gu/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/he/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/hi/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/hr/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/hu/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/id/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/is/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/ja/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/ka/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/ko/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/ku/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/lt/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/lv/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/mk/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/mn/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/ms/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/nb/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -665,6 +690,7 @@ share/locale/sq/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/sr/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/sr@Latn/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/sv/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/te/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/th/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/tr/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -673,7 +699,14 @@ share/locale/vi/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/wa/LC_MESSAGES/evolution-%%VERSION%%.mo
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/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrm share/gnome/omf/evolution
@dirrm share/gnome/idl/evolution-%%VERSION%%
@dirrm share/gnome/help/evolution-%%VERSION%%/C/figures
@@ -681,6 +714,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
@dirrm share/gnome/help/evolution-%%VERSION%%
@dirrm share/gnome/evolution/%%VERSION%%/weather
@dirrm share/gnome/evolution/%%VERSION%%/views/tasks
+@dirrm share/gnome/evolution/%%VERSION%%/views/memos
@dirrm share/gnome/evolution/%%VERSION%%/views/mail
@dirrm share/gnome/evolution/%%VERSION%%/views/calendar
@dirrm share/gnome/evolution/%%VERSION%%/views/addressbook
@@ -703,9 +737,21 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
@dirrm share/gnome/evolution/%%VERSION%%/default/nl/mail/local
@dirrm share/gnome/evolution/%%VERSION%%/default/nl/mail
@dirrm share/gnome/evolution/%%VERSION%%/default/nl
+@dirrm share/gnome/evolution/%%VERSION%%/default/mk/mail/local
+@dirrm share/gnome/evolution/%%VERSION%%/default/mk/mail
+@dirrm share/gnome/evolution/%%VERSION%%/default/mk
+@dirrm share/gnome/evolution/%%VERSION%%/default/lt/mail/local
+@dirrm share/gnome/evolution/%%VERSION%%/default/lt/mail
+@dirrm share/gnome/evolution/%%VERSION%%/default/lt
@dirrm share/gnome/evolution/%%VERSION%%/default/ja/mail/local
@dirrm share/gnome/evolution/%%VERSION%%/default/ja/mail
@dirrm share/gnome/evolution/%%VERSION%%/default/ja
+@dirrm share/gnome/evolution/%%VERSION%%/default/fr/mail/local
+@dirrm share/gnome/evolution/%%VERSION%%/default/fr/mail
+@dirrm share/gnome/evolution/%%VERSION%%/default/fr
+@dirrm share/gnome/evolution/%%VERSION%%/default/fi/mail/local
+@dirrm share/gnome/evolution/%%VERSION%%/default/fi/mail
+@dirrm share/gnome/evolution/%%VERSION%%/default/fi
@dirrm share/gnome/evolution/%%VERSION%%/default/de/mail/local
@dirrm share/gnome/evolution/%%VERSION%%/default/de/mail
@dirrm share/gnome/evolution/%%VERSION%%/default/de
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 23da8c17d9f..3f479b73d1e 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -70,10 +70,11 @@ CONFIGURE_ARGS+= --disable-evolution
PLIST_SUB+= EVOLUTION="@comment "
.else
BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/mail/evolution:patch \
- ${X11BASE}/libdata/pkgconfig/evolution-plugin-2.4.pc:${PORTSDIR}/mail/evolution
-RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/evolution-plugin-2.4.pc:${PORTSDIR}/mail/evolution
+ ${X11BASE}/libdata/pkgconfig/evolution-plugin-2.6.pc:${PORTSDIR}/mail/evolution
+RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/evolution-plugin-2.6.pc:${PORTSDIR}/mail/evolution
EVOLUTION_WRKSRC!= cd ${PORTSDIR}/mail/evolution && ${MAKE} -V WRKSRC
CONFIGURE_ARGS+= --with-evolution-source-dir="${EVOLUTION_WRKSRC}"
+LDFLAGS+= -Wl,-export-dynamic
PLIST_SUB+= EVOLUTION="" LITERAL_PREFIX="${PREFIX}"
.endif
.if defined(WITHOUT_SYLPHEED)
@@ -100,7 +101,7 @@ LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|evolution-plugin-2.2|evolution-plugin-2.4|' \
+ @${REINPLACE_CMD} -e 's|evolution-plugin-2.2|evolution-plugin-2.6|' \
${WRKSRC}/configure
.include <bsd.port.post.mk>
diff --git a/mail/mail-notification/pkg-plist b/mail/mail-notification/pkg-plist
index aead5dac485..deb9150dbf0 100644
--- a/mail/mail-notification/pkg-plist
+++ b/mail/mail-notification/pkg-plist
@@ -32,8 +32,8 @@ share/locale/ru/LC_MESSAGES/mail-notification.mo
share/locale/sr/LC_MESSAGES/mail-notification.mo
share/locale/sr@Latn/LC_MESSAGES/mail-notification.mo
%%EVOLUTION%%@cwd %%X11BASE%%
-%%EVOLUTION%%lib/evolution/2.4/plugins/liborg-gnome-mail-notification.so
-%%EVOLUTION%%lib/evolution/2.4/plugins/org-gnome-mail-notification.eplug
+%%EVOLUTION%%lib/evolution/2.6/plugins/liborg-gnome-mail-notification.so
+%%EVOLUTION%%lib/evolution/2.6/plugins/org-gnome-mail-notification.eplug
%%EVOLUTION%%@cwd %%LITERAL_PREFIX%%
@dirrm share/gnome/omf/mail-notification
@dirrm share/gnome/mail-notification/ui
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index 3283c33fbcc..7410d2b85ec 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.56 2005/10/06 17:36:54 mezz Exp $
+# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.74 2006/04/13 07:52:36 bland Exp $
#
PORTNAME= gnome-icon-theme
-PORTVERSION= 2.12.1
-PORTREVISION= 2
+PORTVERSION= 2.14.2
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -24,7 +23,6 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
USE_GNOME= gnomehack intlhack gnometarget gtk20
INSTALLS_ICONS= yes
CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo
index cc4574a342f..a05f8da0d1f 100644
--- a/misc/gnome-icon-theme/distinfo
+++ b/misc/gnome-icon-theme/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-icon-theme-2.12.1.tar.bz2) = a5401d6f085979fe6601f2241743af86
-SHA256 (gnome2/gnome-icon-theme-2.12.1.tar.bz2) = bb04706ac3154b8df1cbf434d6012e2d96453589c89aef2bf63d75906fee60c8
-SIZE (gnome2/gnome-icon-theme-2.12.1.tar.bz2) = 3113824
+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
diff --git a/misc/gnome-icon-theme/files/patch-Makefile.in b/misc/gnome-icon-theme/files/patch-Makefile.in
deleted file mode 100644
index 0868017d98b..00000000000
--- a/misc/gnome-icon-theme/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig Tue Jan 13 16:03:30 2004
-+++ Makefile.in Tue Jan 13 16:03:57 2004
-@@ -119,6 +119,8 @@
- hicolor_dirs = \
- $(datadir)/pixmaps \
- $(datadir)/icons \
-+ %%X11BASE%%/share/icons \
-+ %%X11BASE%%/share/pixmaps \
- /usr/share/icons \
- /usr/share/pixmaps
-
diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist
index 033bb0a6770..681f58a2b30 100644
--- a/misc/gnome-icon-theme/pkg-plist
+++ b/misc/gnome-icon-theme/pkg-plist
@@ -3,6 +3,28 @@ 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/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/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-window-manager.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
+share/icons/gnome/16x16/apps/im-msn.png
+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/text-editor.png
+share/icons/gnome/16x16/apps/volume-knob.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-dvd.png
@@ -29,9 +51,11 @@ 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
@@ -102,6 +126,7 @@ 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
@@ -156,20 +181,6 @@ 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-bmp.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-image-gif.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-image-jpeg.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-image-png.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-image-svg+xml.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-image-svg.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-image-tiff.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-image-wmf.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-image-x-3ds.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-image-x-applix-graphic.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-image-x-cmu-raster.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-image-x-lwo.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-image-x-lws.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-image-x-xcf.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
@@ -202,11 +213,6 @@ 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-mpeg.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-video-quicktime.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-video-x-ms-asf.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-video-x-ms-wmv.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-video-x-msvideo.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
@@ -214,6 +220,137 @@ 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/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
+share/icons/gnome/16x16/stock/chart/stock_chart-edit-type.png
+share/icons/gnome/16x16/stock/chart/stock_chart-reorganize.png
+share/icons/gnome/16x16/stock/chart/stock_chart-toggle-axes-title.png
+share/icons/gnome/16x16/stock/chart/stock_chart-toggle-axes.png
+share/icons/gnome/16x16/stock/chart/stock_chart-toggle-hgrid.png
+share/icons/gnome/16x16/stock/chart/stock_chart-toggle-legend.png
+share/icons/gnome/16x16/stock/chart/stock_chart-toggle-title.png
+share/icons/gnome/16x16/stock/chart/stock_chart-toggle-vgrid.png
+share/icons/gnome/16x16/stock/chart/stock_glue.png
+share/icons/gnome/16x16/stock/chart/stock_gluepoint-down.png
+share/icons/gnome/16x16/stock/chart/stock_gluepoint-horizontal-center.png
+share/icons/gnome/16x16/stock/chart/stock_gluepoint-horizontal-left.png
+share/icons/gnome/16x16/stock/chart/stock_gluepoint-horizontal-right.png
+share/icons/gnome/16x16/stock/chart/stock_gluepoint-left.png
+share/icons/gnome/16x16/stock/chart/stock_gluepoint-relative.png
+share/icons/gnome/16x16/stock/chart/stock_gluepoint-right.png
+share/icons/gnome/16x16/stock/chart/stock_gluepoint-up.png
+share/icons/gnome/16x16/stock/chart/stock_gluepoint-vertical-bottom.png
+share/icons/gnome/16x16/stock/chart/stock_gluepoint-vertical-center.png
+share/icons/gnome/16x16/stock/chart/stock_gluepoint-vertical-top.png
+share/icons/gnome/16x16/stock/chart/stock_insert-chart.png
+share/icons/gnome/16x16/stock/code/stock_compile.png
+share/icons/gnome/16x16/stock/code/stock_error-next.png
+share/icons/gnome/16x16/stock/code/stock_error-previous.png
+share/icons/gnome/16x16/stock/code/stock_macro-check-brackets.png
+share/icons/gnome/16x16/stock/code/stock_macro-insert-breakpoint.png
+share/icons/gnome/16x16/stock/code/stock_macro-insert.png
+share/icons/gnome/16x16/stock/code/stock_macro-jump-back.png
+share/icons/gnome/16x16/stock/code/stock_macro-objects.png
+share/icons/gnome/16x16/stock/code/stock_macro-organizer.png
+share/icons/gnome/16x16/stock/code/stock_macro-stop-after-command.png
+share/icons/gnome/16x16/stock/code/stock_macro-stop-after-procedure.png
+share/icons/gnome/16x16/stock/code/stock_macro-stop-watching.png
+share/icons/gnome/16x16/stock/code/stock_macro-watch-variable.png
+share/icons/gnome/16x16/stock/code/stock_record-macro.png
+share/icons/gnome/16x16/stock/code/stock_run-macro.png
+share/icons/gnome/16x16/stock/code/stock_script.png
+share/icons/gnome/16x16/stock/code/stock_tools-macro.png
+share/icons/gnome/16x16/stock/data/stock_add-decimal-place.png
+share/icons/gnome/16x16/stock/data/stock_advanced-filter.png
+share/icons/gnome/16x16/stock/data/stock_autofilter.png
+share/icons/gnome/16x16/stock/data/stock_data-delete-link.png
+share/icons/gnome/16x16/stock/data/stock_data-delete-query.png
+share/icons/gnome/16x16/stock/data/stock_data-delete-record.png
+share/icons/gnome/16x16/stock/data/stock_data-delete-sql-query.png
+share/icons/gnome/16x16/stock/data/stock_data-delete-table.png
+share/icons/gnome/16x16/stock/data/stock_data-edit-link.png
+share/icons/gnome/16x16/stock/data/stock_data-edit-query.png
+share/icons/gnome/16x16/stock/data/stock_data-edit-sql-query.png
+share/icons/gnome/16x16/stock/data/stock_data-edit-table.png
+share/icons/gnome/16x16/stock/data/stock_data-explorer.png
+share/icons/gnome/16x16/stock/data/stock_data-first.png
+share/icons/gnome/16x16/stock/data/stock_data-last.png
+share/icons/gnome/16x16/stock/data/stock_data-link.png
+share/icons/gnome/16x16/stock/data/stock_data-linked-table.png
+share/icons/gnome/16x16/stock/data/stock_data-links.png
+share/icons/gnome/16x16/stock/data/stock_data-new-link.png
+share/icons/gnome/16x16/stock/data/stock_data-new-query.png
+share/icons/gnome/16x16/stock/data/stock_data-new-record.png
+share/icons/gnome/16x16/stock/data/stock_data-new-sql-query.png
+share/icons/gnome/16x16/stock/data/stock_data-new-table.png
+share/icons/gnome/16x16/stock/data/stock_data-next.png
+share/icons/gnome/16x16/stock/data/stock_data-previous.png
+share/icons/gnome/16x16/stock/data/stock_data-queries.png
+share/icons/gnome/16x16/stock/data/stock_data-query-rename.png
+share/icons/gnome/16x16/stock/data/stock_data-query.png
+share/icons/gnome/16x16/stock/data/stock_data-save.png
+share/icons/gnome/16x16/stock/data/stock_data-sources-delete.png
+share/icons/gnome/16x16/stock/data/stock_data-sources-hand.png
+share/icons/gnome/16x16/stock/data/stock_data-sources-modified.png
+share/icons/gnome/16x16/stock/data/stock_data-sources-new.png
+share/icons/gnome/16x16/stock/data/stock_data-sources.png
+share/icons/gnome/16x16/stock/data/stock_data-table.png
+share/icons/gnome/16x16/stock/data/stock_data-tables.png
+share/icons/gnome/16x16/stock/data/stock_data-undo.png
+share/icons/gnome/16x16/stock/data/stock_database.png
+share/icons/gnome/16x16/stock/data/stock_delete-autofilter.png
+share/icons/gnome/16x16/stock/data/stock_delete-decimal-place.png
+share/icons/gnome/16x16/stock/data/stock_filter-data-by-criteria.png
+share/icons/gnome/16x16/stock/data/stock_filter-navigator.png
+share/icons/gnome/16x16/stock/data/stock_filters.png
+share/icons/gnome/16x16/stock/data/stock_format-default.png
+share/icons/gnome/16x16/stock/data/stock_format-percent.png
+share/icons/gnome/16x16/stock/data/stock_format-scientific.png
+share/icons/gnome/16x16/stock/data/stock_function-autopilot.png
+share/icons/gnome/16x16/stock/data/stock_goal-seek.png
+share/icons/gnome/16x16/stock/data/stock_insert-fields.png
+share/icons/gnome/16x16/stock/data/stock_lock-broken.png
+share/icons/gnome/16x16/stock/data/stock_lock-ok.png
+share/icons/gnome/16x16/stock/data/stock_lock-open.png
+share/icons/gnome/16x16/stock/data/stock_lock.png
+share/icons/gnome/16x16/stock/data/stock_record-number.png
+share/icons/gnome/16x16/stock/data/stock_signature-bad.png
+share/icons/gnome/16x16/stock/data/stock_signature-ok.png
+share/icons/gnome/16x16/stock/data/stock_signature.png
+share/icons/gnome/16x16/stock/data/stock_sort-ascending.png
+share/icons/gnome/16x16/stock/data/stock_sort-column-ascending.png
+share/icons/gnome/16x16/stock/data/stock_sort-criteria.png
+share/icons/gnome/16x16/stock/data/stock_sort-descending.png
+share/icons/gnome/16x16/stock/data/stock_sort-row-ascending.png
+share/icons/gnome/16x16/stock/data/stock_standard-filter.png
+share/icons/gnome/16x16/stock/data/stock_sum.png
+share/icons/gnome/16x16/stock/data/stock_update-data.png
+share/icons/gnome/16x16/stock/document/stock_attach.png
+share/icons/gnome/16x16/stock/document/stock_certificate.png
+share/icons/gnome/16x16/stock/document/stock_new-drawing.png
+share/icons/gnome/16x16/stock/document/stock_new-formula.png
+share/icons/gnome/16x16/stock/document/stock_new-html.png
+share/icons/gnome/16x16/stock/document/stock_new-labels.png
+share/icons/gnome/16x16/stock/document/stock_new-master-document.png
+share/icons/gnome/16x16/stock/document/stock_new-presentation.png
+share/icons/gnome/16x16/stock/document/stock_new-spreadsheet.png
+share/icons/gnome/16x16/stock/document/stock_new-template.png
+share/icons/gnome/16x16/stock/document/stock_new-text.png
+share/icons/gnome/16x16/stock/document/stock_new.png
+share/icons/gnome/16x16/stock/document/stock_preview-four-pages.png
+share/icons/gnome/16x16/stock/document/stock_preview-two-pages.png
+share/icons/gnome/16x16/stock/document/stock_print-layout.png
+share/icons/gnome/16x16/stock/document/stock_print-options.png
+share/icons/gnome/16x16/stock/document/stock_print-resolution.png
+share/icons/gnome/16x16/stock/document/stock_script.png
+share/icons/gnome/16x16/stock/document/stock_scripts.png
+share/icons/gnome/16x16/stock/document/stock_task-assigned-to.png
+share/icons/gnome/16x16/stock/document/stock_task-assigned.png
+share/icons/gnome/16x16/stock/document/stock_task-recurring.png
+share/icons/gnome/16x16/stock/document/stock_task.png
+share/icons/gnome/16x16/stock/document/stock_todo.png
+share/icons/gnome/16x16/stock/document/stock_view-html-source.png
share/icons/gnome/16x16/stock/emoticons/stock_smiley-1.png
share/icons/gnome/16x16/stock/emoticons/stock_smiley-10.png
share/icons/gnome/16x16/stock/emoticons/stock_smiley-11.png
@@ -240,6 +377,321 @@ share/icons/gnome/16x16/stock/emoticons/stock_smiley-6.png
share/icons/gnome/16x16/stock/emoticons/stock_smiley-7.png
share/icons/gnome/16x16/stock/emoticons/stock_smiley-8.png
share/icons/gnome/16x16/stock/emoticons/stock_smiley-9.png
+share/icons/gnome/16x16/stock/form/stock_form-activation-order.png
+share/icons/gnome/16x16/stock/form/stock_form-add-field.png
+share/icons/gnome/16x16/stock/form/stock_form-automatic-control-focus.png
+share/icons/gnome/16x16/stock/form/stock_form-autopilots.png
+share/icons/gnome/16x16/stock/form/stock_form-button.png
+share/icons/gnome/16x16/stock/form/stock_form-checkbox.png
+share/icons/gnome/16x16/stock/form/stock_form-combobox.png
+share/icons/gnome/16x16/stock/form/stock_form-control-properties.png
+share/icons/gnome/16x16/stock/form/stock_form-currency-field.png
+share/icons/gnome/16x16/stock/form/stock_form-date-field.png
+share/icons/gnome/16x16/stock/form/stock_form-design-mode.png
+share/icons/gnome/16x16/stock/form/stock_form-file-selection.png
+share/icons/gnome/16x16/stock/form/stock_form-formatted-field.png
+share/icons/gnome/16x16/stock/form/stock_form-frame.png
+share/icons/gnome/16x16/stock/form/stock_form-image-button.png
+share/icons/gnome/16x16/stock/form/stock_form-image-control.png
+share/icons/gnome/16x16/stock/form/stock_form-label.png
+share/icons/gnome/16x16/stock/form/stock_form-letter-dialog.png
+share/icons/gnome/16x16/stock/form/stock_form-listbox.png
+share/icons/gnome/16x16/stock/form/stock_form-navigator.png
+share/icons/gnome/16x16/stock/form/stock_form-numerical-field.png
+share/icons/gnome/16x16/stock/form/stock_form-open-in-design-mode.png
+share/icons/gnome/16x16/stock/form/stock_form-pattern-field.png
+share/icons/gnome/16x16/stock/form/stock_form-progressbar.png
+share/icons/gnome/16x16/stock/form/stock_form-properties.png
+share/icons/gnome/16x16/stock/form/stock_form-radio.png
+share/icons/gnome/16x16/stock/form/stock_form-table-control.png
+share/icons/gnome/16x16/stock/form/stock_form-text-box.png
+share/icons/gnome/16x16/stock/form/stock_form-time-field.png
+share/icons/gnome/16x16/stock/form/stock_insert-form.png
+share/icons/gnome/16x16/stock/form/stock_macro-controls.png
+share/icons/gnome/16x16/stock/form/stock_show-form-dialog.png
+share/icons/gnome/16x16/stock/form/stock_show-hidden-controls.png
+share/icons/gnome/16x16/stock/form/stock_view-fields.png
+share/icons/gnome/16x16/stock/generic/stock_3d-favourites.png
+share/icons/gnome/16x16/stock/generic/stock_about.png
+share/icons/gnome/16x16/stock/generic/stock_active.png
+share/icons/gnome/16x16/stock/generic/stock_allow-effects.png
+share/icons/gnome/16x16/stock/generic/stock_anchor.png
+share/icons/gnome/16x16/stock/generic/stock_animation.png
+share/icons/gnome/16x16/stock/generic/stock_autocompletion.png
+share/icons/gnome/16x16/stock/generic/stock_autopilot.png
+share/icons/gnome/16x16/stock/generic/stock_bell.png
+share/icons/gnome/16x16/stock/generic/stock_book_blue.png
+share/icons/gnome/16x16/stock/generic/stock_book_green.png
+share/icons/gnome/16x16/stock/generic/stock_book_open.png
+share/icons/gnome/16x16/stock/generic/stock_book_red.png
+share/icons/gnome/16x16/stock/generic/stock_book_yellow.png
+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
+share/icons/gnome/16x16/stock/generic/stock_example.png
+share/icons/gnome/16x16/stock/generic/stock_exit.png
+share/icons/gnome/16x16/stock/generic/stock_extended-help.png
+share/icons/gnome/16x16/stock/generic/stock_file-properties.png
+share/icons/gnome/16x16/stock/generic/stock_flip-horizontally.png
+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
+share/icons/gnome/16x16/stock/generic/stock_help-book.png
+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
+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
+share/icons/gnome/16x16/stock/generic/stock_timer.png
+share/icons/gnome/16x16/stock/generic/stock_timer_stopped.png
+share/icons/gnome/16x16/stock/generic/stock_timezone.png
+share/icons/gnome/16x16/stock/generic/stock_toggle-info.png
+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
+share/icons/gnome/16x16/stock/image/stock_3d-colors.png
+share/icons/gnome/16x16/stock/image/stock_3d-custom-color.png
+share/icons/gnome/16x16/stock/image/stock_3d-effects.png
+share/icons/gnome/16x16/stock/image/stock_arrowstyle.png
+share/icons/gnome/16x16/stock/image/stock_brightness.png
+share/icons/gnome/16x16/stock/image/stock_bucketfill.png
+share/icons/gnome/16x16/stock/image/stock_channel-blue.png
+share/icons/gnome/16x16/stock/image/stock_channel-green.png
+share/icons/gnome/16x16/stock/image/stock_channel-red.png
+share/icons/gnome/16x16/stock/image/stock_contrast.png
+share/icons/gnome/16x16/stock/image/stock_crop.png
+share/icons/gnome/16x16/stock/image/stock_display-grid.png
+share/icons/gnome/16x16/stock/image/stock_display-guides.png
+share/icons/gnome/16x16/stock/image/stock_distort.png
+share/icons/gnome/16x16/stock/image/stock_draw-arc.png
+share/icons/gnome/16x16/stock/image/stock_draw-callouts.png
+share/icons/gnome/16x16/stock/image/stock_draw-circle-arc.png
+share/icons/gnome/16x16/stock/image/stock_draw-circle-pie-unfilled.png
+share/icons/gnome/16x16/stock/image/stock_draw-circle-pie.png
+share/icons/gnome/16x16/stock/image/stock_draw-circle-segment-unfilled.png
+share/icons/gnome/16x16/stock/image/stock_draw-circle-segment.png
+share/icons/gnome/16x16/stock/image/stock_draw-circle-unfilled.png
+share/icons/gnome/16x16/stock/image/stock_draw-circle.png
+share/icons/gnome/16x16/stock/image/stock_draw-cone.png
+share/icons/gnome/16x16/stock/image/stock_draw-connector-ends-with-arrow.png
+share/icons/gnome/16x16/stock/image/stock_draw-connector-ends-with-circle.png
+share/icons/gnome/16x16/stock/image/stock_draw-connector-starts-with-arrow.png
+share/icons/gnome/16x16/stock/image/stock_draw-connector-starts-with-circle.png
+share/icons/gnome/16x16/stock/image/stock_draw-connector-with-arrows.png
+share/icons/gnome/16x16/stock/image/stock_draw-connector-with-circles.png
+share/icons/gnome/16x16/stock/image/stock_draw-connector.png
+share/icons/gnome/16x16/stock/image/stock_draw-cube.png
+share/icons/gnome/16x16/stock/image/stock_draw-curve-filled.png
+share/icons/gnome/16x16/stock/image/stock_draw-curve.png
+share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-ends-with-arrow.png
+share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-ends-with-circle.png
+share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-starts-with-arrow.png
+share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-starts-with-circle.png
+share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-with-arrows.png
+share/icons/gnome/16x16/stock/image/stock_draw-curved-connector-with-circles.png
+share/icons/gnome/16x16/stock/image/stock_draw-curved-connector.png
+share/icons/gnome/16x16/stock/image/stock_draw-cylinder.png
+share/icons/gnome/16x16/stock/image/stock_draw-dimension-line.png
+share/icons/gnome/16x16/stock/image/stock_draw-ellipse-pie-unfilled.png
+share/icons/gnome/16x16/stock/image/stock_draw-ellipse-pie.png
+share/icons/gnome/16x16/stock/image/stock_draw-ellipse-segment-unfilled.png
+share/icons/gnome/16x16/stock/image/stock_draw-ellipse-segment.png
+share/icons/gnome/16x16/stock/image/stock_draw-ellipse-unfilled.png
+share/icons/gnome/16x16/stock/image/stock_draw-ellipse.png
+share/icons/gnome/16x16/stock/image/stock_draw-freeform-line-filled.png
+share/icons/gnome/16x16/stock/image/stock_draw-freeform-line.png
+share/icons/gnome/16x16/stock/image/stock_draw-half-sphere.png
+share/icons/gnome/16x16/stock/image/stock_draw-line-45.png
+share/icons/gnome/16x16/stock/image/stock_draw-line-connector-ends-with-arrow.png
+share/icons/gnome/16x16/stock/image/stock_draw-line-connector-ends-with-circle.png
+share/icons/gnome/16x16/stock/image/stock_draw-line-connector-starts-with-arrow.png
+share/icons/gnome/16x16/stock/image/stock_draw-line-connector-starts-with-circle.png
+share/icons/gnome/16x16/stock/image/stock_draw-line-connector-with-arrows.png
+share/icons/gnome/16x16/stock/image/stock_draw-line-connector-with-circles.png
+share/icons/gnome/16x16/stock/image/stock_draw-line-connector.png
+share/icons/gnome/16x16/stock/image/stock_draw-line-ends-with-arrow.png
+share/icons/gnome/16x16/stock/image/stock_draw-line-starts-with-arrow.png
+share/icons/gnome/16x16/stock/image/stock_draw-line-with-arrow-circle.png
+share/icons/gnome/16x16/stock/image/stock_draw-line-with-arrow-square.png
+share/icons/gnome/16x16/stock/image/stock_draw-line-with-arrows.png
+share/icons/gnome/16x16/stock/image/stock_draw-line-with-circle-arrow.png
+share/icons/gnome/16x16/stock/image/stock_draw-line-with-square-arrow.png
+share/icons/gnome/16x16/stock/image/stock_draw-line.png
+share/icons/gnome/16x16/stock/image/stock_draw-polygon-45-filled.png
+share/icons/gnome/16x16/stock/image/stock_draw-polygon-45.png
+share/icons/gnome/16x16/stock/image/stock_draw-polygon-filled.png
+share/icons/gnome/16x16/stock/image/stock_draw-polygon.png
+share/icons/gnome/16x16/stock/image/stock_draw-pyramid.png
+share/icons/gnome/16x16/stock/image/stock_draw-rectangle-unfilled.png
+share/icons/gnome/16x16/stock/image/stock_draw-rectangle.png
+share/icons/gnome/16x16/stock/image/stock_draw-rounded-rectangle-unfilled.png
+share/icons/gnome/16x16/stock/image/stock_draw-rounded-rectangle.png
+share/icons/gnome/16x16/stock/image/stock_draw-rounded-square-unfilled.png
+share/icons/gnome/16x16/stock/image/stock_draw-rounded-square.png
+share/icons/gnome/16x16/stock/image/stock_draw-selection.png
+share/icons/gnome/16x16/stock/image/stock_draw-shell.png
+share/icons/gnome/16x16/stock/image/stock_draw-sphere.png
+share/icons/gnome/16x16/stock/image/stock_draw-square-unfilled.png
+share/icons/gnome/16x16/stock/image/stock_draw-square.png
+share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-ends-with-arrow.png
+share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-ends-with-circle.png
+share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-starts-with-arrow.png
+share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-starts-with-circle.png
+share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-with-arrows.png
+share/icons/gnome/16x16/stock/image/stock_draw-straight-connector-with-circles.png
+share/icons/gnome/16x16/stock/image/stock_draw-straight-connector.png
+share/icons/gnome/16x16/stock/image/stock_draw-torus.png
+share/icons/gnome/16x16/stock/image/stock_draw-vertical-callouts.png
+share/icons/gnome/16x16/stock/image/stock_edit-points.png
+share/icons/gnome/16x16/stock/image/stock_filters-aging.png
+share/icons/gnome/16x16/stock/image/stock_filters-charcoal.png
+share/icons/gnome/16x16/stock/image/stock_filters-invert.png
+share/icons/gnome/16x16/stock/image/stock_filters-pixelize.png
+share/icons/gnome/16x16/stock/image/stock_filters-pop-art.png
+share/icons/gnome/16x16/stock/image/stock_filters-posterize.png
+share/icons/gnome/16x16/stock/image/stock_filters-relief.png
+share/icons/gnome/16x16/stock/image/stock_filters-remove-noise.png
+share/icons/gnome/16x16/stock/image/stock_filters-sharpen.png
+share/icons/gnome/16x16/stock/image/stock_filters-smooth.png
+share/icons/gnome/16x16/stock/image/stock_filters-solarize.png
+share/icons/gnome/16x16/stock/image/stock_flip.png
+share/icons/gnome/16x16/stock/image/stock_gamma.png
+share/icons/gnome/16x16/stock/image/stock_gradient.png
+share/icons/gnome/16x16/stock/image/stock_graphic-styles.png
+share/icons/gnome/16x16/stock/image/stock_graphics-align-bottom.png
+share/icons/gnome/16x16/stock/image/stock_graphics-align-center.png
+share/icons/gnome/16x16/stock/image/stock_graphics-align-centered.png
+share/icons/gnome/16x16/stock/image/stock_graphics-align-left.png
+share/icons/gnome/16x16/stock/image/stock_graphics-align-right.png
+share/icons/gnome/16x16/stock/image/stock_graphics-align-top.png
+share/icons/gnome/16x16/stock/image/stock_guides.png
+share/icons/gnome/16x16/stock/image/stock_imagemap-editor.png
+share/icons/gnome/16x16/stock/image/stock_insert_image.png
+share/icons/gnome/16x16/stock/image/stock_linepen.png
+share/icons/gnome/16x16/stock/image/stock_modify-layout.png
+share/icons/gnome/16x16/stock/image/stock_node-add.png
+share/icons/gnome/16x16/stock/image/stock_node-close-path.png
+share/icons/gnome/16x16/stock/image/stock_node-convert.png
+share/icons/gnome/16x16/stock/image/stock_node-corner-to-smooth.png
+share/icons/gnome/16x16/stock/image/stock_node-corner.png
+share/icons/gnome/16x16/stock/image/stock_node-curve-split.png
+share/icons/gnome/16x16/stock/image/stock_node-delete.png
+share/icons/gnome/16x16/stock/image/stock_node-mark-for-deletion.png
+share/icons/gnome/16x16/stock/image/stock_node-move.png
+share/icons/gnome/16x16/stock/image/stock_node-smooth-to-symmetrical.png
+share/icons/gnome/16x16/stock/image/stock_placeholder-graphic.png
+share/icons/gnome/16x16/stock/image/stock_placeholder-line-contour.png
+share/icons/gnome/16x16/stock/image/stock_placeholder-picture.png
+share/icons/gnome/16x16/stock/image/stock_placeholder-text.png
+share/icons/gnome/16x16/stock/image/stock_quickmask.png
+share/icons/gnome/16x16/stock/image/stock_rotate-3d.png
+share/icons/gnome/16x16/stock/image/stock_rotate.png
+share/icons/gnome/16x16/stock/image/stock_rotation-mode.png
+share/icons/gnome/16x16/stock/image/stock_shadow.png
+share/icons/gnome/16x16/stock/image/stock_show-draw-functions.png
+share/icons/gnome/16x16/stock/image/stock_toggle-graphics.png
+share/icons/gnome/16x16/stock/image/stock_transform-circle-perspective.png
+share/icons/gnome/16x16/stock/image/stock_transform-circle-slant.png
+share/icons/gnome/16x16/stock/image/stock_transparency.png
+share/icons/gnome/16x16/stock/image/stock_wallpaper-center.png
+share/icons/gnome/16x16/stock/image/stock_wallpaper-fill.png
+share/icons/gnome/16x16/stock/image/stock_wallpaper-scale.png
+share/icons/gnome/16x16/stock/image/stock_wallpaper-tile.png
+share/icons/gnome/16x16/stock/io/stock_bluetooth.png
+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
@@ -266,8 +718,473 @@ 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
+share/icons/gnome/16x16/stock/navigation/stock_navigator-all-or-sel-toggle.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-database-ranges.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-drag-mode.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-edit-entry.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-foonote-body-toggle.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-footer-body-toggle.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-header-body-toggle.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-headings.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-indexes.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-insert-as-copy.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-insert-as-link.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-insert-index.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-insert-linked.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-levels.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-list-box-toggle.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-master-toggle.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-next-object.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-open-toolbar.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-previous-object.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-range-names.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-references.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-reminder.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-scenarios.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-sections.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-shift-down.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-shift-left.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-shift-right.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-shift-up.png
+share/icons/gnome/16x16/stock/navigation/stock_navigator-table-formula.png
+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
+share/icons/gnome/16x16/stock/navigation/stock_zoom-object.png
+share/icons/gnome/16x16/stock/navigation/stock_zoom-optimal.png
+share/icons/gnome/16x16/stock/navigation/stock_zoom-out.png
+share/icons/gnome/16x16/stock/navigation/stock_zoom-page-width.png
+share/icons/gnome/16x16/stock/navigation/stock_zoom-page.png
+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
+share/icons/gnome/16x16/stock/net/stock_contact-list.png
+share/icons/gnome/16x16/stock/net/stock_contact.png
+share/icons/gnome/16x16/stock/net/stock_directory-server.png
+share/icons/gnome/16x16/stock/net/stock_disconnect.png
+share/icons/gnome/16x16/stock/net/stock_exchange-connector.png
+share/icons/gnome/16x16/stock/net/stock_groupwise-connector.png
+share/icons/gnome/16x16/stock/net/stock_hand-signed.png
+share/icons/gnome/16x16/stock/net/stock_hyperlink-internet-search.png
+share/icons/gnome/16x16/stock/net/stock_hyperlink-target.png
+share/icons/gnome/16x16/stock/net/stock_hyperlink-toolbar.png
+share/icons/gnome/16x16/stock/net/stock_hyperlink.png
+share/icons/gnome/16x16/stock/net/stock_inbox.png
+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
+share/icons/gnome/16x16/stock/net/stock_mail-hide-selected.png
+share/icons/gnome/16x16/stock/net/stock_mail-import.png
+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
+share/icons/gnome/16x16/stock/object/stock_3d-geometry.png
+share/icons/gnome/16x16/stock/object/stock_3d-light-off.png
+share/icons/gnome/16x16/stock/object/stock_3d-light-on.png
+share/icons/gnome/16x16/stock/object/stock_3d-light.png
+share/icons/gnome/16x16/stock/object/stock_3d-material.png
+share/icons/gnome/16x16/stock/object/stock_3d-normals-double-sided-closed-body.png
+share/icons/gnome/16x16/stock/object/stock_3d-normals-double-sided.png
+share/icons/gnome/16x16/stock/object/stock_3d-normals-flat.png
+share/icons/gnome/16x16/stock/object/stock_3d-normals-flip-illumination.png
+share/icons/gnome/16x16/stock/object/stock_3d-normals-object-specific.png
+share/icons/gnome/16x16/stock/object/stock_3d-normals-spherical.png
+share/icons/gnome/16x16/stock/object/stock_3d-perspective.png
+share/icons/gnome/16x16/stock/object/stock_3d-shading.png
+share/icons/gnome/16x16/stock/object/stock_3d-texture-and-shading.png
+share/icons/gnome/16x16/stock/object/stock_3d-texture-object-specific.png
+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
+share/icons/gnome/16x16/stock/object/stock_bring-forward.png
+share/icons/gnome/16x16/stock/object/stock_create-with-attributes.png
+share/icons/gnome/16x16/stock/object/stock_delete-bookmark.png
+share/icons/gnome/16x16/stock/object/stock_edit-bookmark.png
+share/icons/gnome/16x16/stock/object/stock_effects-more-options.png
+share/icons/gnome/16x16/stock/object/stock_effects-object-colorize.png
+share/icons/gnome/16x16/stock/object/stock_effects-object-hide.png
+share/icons/gnome/16x16/stock/object/stock_effects-object.png
+share/icons/gnome/16x16/stock/object/stock_effects-play-in-full.png
+share/icons/gnome/16x16/stock/object/stock_effects-preview.png
+share/icons/gnome/16x16/stock/object/stock_effects.png
+share/icons/gnome/16x16/stock/object/stock_enter-group.png
+share/icons/gnome/16x16/stock/object/stock_exit-group.png
+share/icons/gnome/16x16/stock/object/stock_file-with-objects.png
+share/icons/gnome/16x16/stock/object/stock_format-object.png
+share/icons/gnome/16x16/stock/object/stock_formula-cursor.png
+share/icons/gnome/16x16/stock/object/stock_frame.png
+share/icons/gnome/16x16/stock/object/stock_group.png
+share/icons/gnome/16x16/stock/object/stock_handles-big.png
+share/icons/gnome/16x16/stock/object/stock_handles-simple.png
+share/icons/gnome/16x16/stock/object/stock_insert-applet.png
+share/icons/gnome/16x16/stock/object/stock_insert-floating-frame.png
+share/icons/gnome/16x16/stock/object/stock_insert-gluepoint.png
+share/icons/gnome/16x16/stock/object/stock_insert-math-object.png
+share/icons/gnome/16x16/stock/object/stock_insert-note.png
+share/icons/gnome/16x16/stock/object/stock_insert-ole-object.png
+share/icons/gnome/16x16/stock/object/stock_insert-plugin.png
+share/icons/gnome/16x16/stock/object/stock_insert-rule.png
+share/icons/gnome/16x16/stock/object/stock_insert-single-column-text-frame.png
+share/icons/gnome/16x16/stock/object/stock_insert-slide.png
+share/icons/gnome/16x16/stock/object/stock_insert-sound-plugin.png
+share/icons/gnome/16x16/stock/object/stock_insert-text-frame.png
+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
+share/icons/gnome/16x16/stock/object/stock_position-size.png
+share/icons/gnome/16x16/stock/object/stock_reverse-order.png
+share/icons/gnome/16x16/stock/object/stock_slide-design.png
+share/icons/gnome/16x16/stock/object/stock_slide-duplicate.png
+share/icons/gnome/16x16/stock/object/stock_slide-expand.png
+share/icons/gnome/16x16/stock/object/stock_slide-reherse-timings.png
+share/icons/gnome/16x16/stock/object/stock_slide-show.png
+share/icons/gnome/16x16/stock/object/stock_slide-showhide.png
+share/icons/gnome/16x16/stock/object/stock_snap-grid.png
+share/icons/gnome/16x16/stock/object/stock_snap-guides.png
+share/icons/gnome/16x16/stock/object/stock_snap-margins.png
+share/icons/gnome/16x16/stock/object/stock_snap-object-points.png
+share/icons/gnome/16x16/stock/object/stock_snap-object.png
+share/icons/gnome/16x16/stock/object/stock_symbol-selection.png
+share/icons/gnome/16x16/stock/object/stock_to-3d-rotation-object.png
+share/icons/gnome/16x16/stock/object/stock_to-3d.png
+share/icons/gnome/16x16/stock/object/stock_to-bottom.png
+share/icons/gnome/16x16/stock/object/stock_to-curve.png
+share/icons/gnome/16x16/stock/object/stock_to-polygon.png
+share/icons/gnome/16x16/stock/object/stock_to-top.png
+share/icons/gnome/16x16/stock/object/stock_ungroup.png
+share/icons/gnome/16x16/stock/object/stock_unlink.png
+share/icons/gnome/16x16/stock/object/stock_view-function-selection.png
+share/icons/gnome/16x16/stock/table/stock_alignment-bottom.png
+share/icons/gnome/16x16/stock/table/stock_alignment-centered-vertically.png
+share/icons/gnome/16x16/stock/table/stock_alignment-centered.png
+share/icons/gnome/16x16/stock/table/stock_alignment-left.png
+share/icons/gnome/16x16/stock/table/stock_alignment-right.png
+share/icons/gnome/16x16/stock/table/stock_alignment-top.png
+share/icons/gnome/16x16/stock/table/stock_alignment.png
+share/icons/gnome/16x16/stock/table/stock_cell-align-bottom.png
+share/icons/gnome/16x16/stock/table/stock_cell-align-center.png
+share/icons/gnome/16x16/stock/table/stock_cell-align-top.png
+share/icons/gnome/16x16/stock/table/stock_choose-themes.png
+share/icons/gnome/16x16/stock/table/stock_datapilot.png
+share/icons/gnome/16x16/stock/table/stock_delete-column.png
+share/icons/gnome/16x16/stock/table/stock_delete-row.png
+share/icons/gnome/16x16/stock/table/stock_exchange-columns.png
+share/icons/gnome/16x16/stock/table/stock_exchange-rows.png
+share/icons/gnome/16x16/stock/table/stock_group-cells.png
+share/icons/gnome/16x16/stock/table/stock_insert-cells-down.png
+share/icons/gnome/16x16/stock/table/stock_insert-cells-right.png
+share/icons/gnome/16x16/stock/table/stock_insert-cells.png
+share/icons/gnome/16x16/stock/table/stock_insert-columns.png
+share/icons/gnome/16x16/stock/table/stock_insert-names-define.png
+share/icons/gnome/16x16/stock/table/stock_insert-rows.png
+share/icons/gnome/16x16/stock/table/stock_insert-table.png
+share/icons/gnome/16x16/stock/table/stock_select-cell.png
+share/icons/gnome/16x16/stock/table/stock_select-column.png
+share/icons/gnome/16x16/stock/table/stock_select-row.png
+share/icons/gnome/16x16/stock/table/stock_select-table.png
+share/icons/gnome/16x16/stock/table/stock_sort-table-column-ascending.png
+share/icons/gnome/16x16/stock/table/stock_sort-table-row-ascending.png
+share/icons/gnome/16x16/stock/table/stock_table-align-bottom.png
+share/icons/gnome/16x16/stock/table/stock_table-align-center.png
+share/icons/gnome/16x16/stock/table/stock_table-align-top.png
+share/icons/gnome/16x16/stock/table/stock_table-borders.png
+share/icons/gnome/16x16/stock/table/stock_table-combine.png
+share/icons/gnome/16x16/stock/table/stock_table-fit-height.png
+share/icons/gnome/16x16/stock/table/stock_table-fit-width.png
+share/icons/gnome/16x16/stock/table/stock_table-fixed-proportional.png
+share/icons/gnome/16x16/stock/table/stock_table-fixed.png
+share/icons/gnome/16x16/stock/table/stock_table-line-color.png
+share/icons/gnome/16x16/stock/table/stock_table-line-style.png
+share/icons/gnome/16x16/stock/table/stock_table-optimize.png
+share/icons/gnome/16x16/stock/table/stock_table-same-height.png
+share/icons/gnome/16x16/stock/table/stock_table-same-width.png
+share/icons/gnome/16x16/stock/table/stock_table-split.png
+share/icons/gnome/16x16/stock/table/stock_table-variable.png
+share/icons/gnome/16x16/stock/table/stock_table_borders.png
+share/icons/gnome/16x16/stock/table/stock_table_fill.png
+share/icons/gnome/16x16/stock/table/stock_ungroup-cells.png
+share/icons/gnome/16x16/stock/text/stock_autoformat.png
+share/icons/gnome/16x16/stock/text/stock_autospellcheck.png
+share/icons/gnome/16x16/stock/text/stock_autotext.png
+share/icons/gnome/16x16/stock/text/stock_chart-scale-text.png
+share/icons/gnome/16x16/stock/text/stock_decrease-font.png
+share/icons/gnome/16x16/stock/text/stock_directcursor.png
+share/icons/gnome/16x16/stock/text/stock_draw-text-animation.png
+share/icons/gnome/16x16/stock/text/stock_draw-text-frame.png
+share/icons/gnome/16x16/stock/text/stock_draw-text.png
+share/icons/gnome/16x16/stock/text/stock_draw-vertical-text-frame.png
+share/icons/gnome/16x16/stock/text/stock_draw-vertical-text.png
+share/icons/gnome/16x16/stock/text/stock_edit-contour.png
+share/icons/gnome/16x16/stock/text/stock_edit-headers-and-footers.png
+share/icons/gnome/16x16/stock/text/stock_effects-text.png
+share/icons/gnome/16x16/stock/text/stock_euro.png
+share/icons/gnome/16x16/stock/text/stock_font-formatting-toggle.png
+share/icons/gnome/16x16/stock/text/stock_font-size.png
+share/icons/gnome/16x16/stock/text/stock_font.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-2dshadow.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-3dshadow.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-adaptation-off.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-adaptation-rotate.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-adaptation-slant-h.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-adaptation-slant-v.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-adaptation-straight.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-align-fill.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-noshadow.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-preview-spline.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-reverse-text-flow.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-shadow-angle.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-shadow-length.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-shadow-x-offset.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-shadow-y-offset.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-spline-distance.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-spline-indent.png
+share/icons/gnome/16x16/stock/text/stock_fontwork-text-border.png
+share/icons/gnome/16x16/stock/text/stock_fontwork.png
+share/icons/gnome/16x16/stock/text/stock_format-character.png
+share/icons/gnome/16x16/stock/text/stock_format-numbering-bullets.png
+share/icons/gnome/16x16/stock/text/stock_format-paragraph.png
+share/icons/gnome/16x16/stock/text/stock_increase-font.png
+share/icons/gnome/16x16/stock/text/stock_insert-caption.png
+share/icons/gnome/16x16/stock/text/stock_insert-cross-reference.png
+share/icons/gnome/16x16/stock/text/stock_insert-fields-author.png
+share/icons/gnome/16x16/stock/text/stock_insert-fields-subject.png
+share/icons/gnome/16x16/stock/text/stock_insert-fields-title.png
+share/icons/gnome/16x16/stock/text/stock_insert-footer.png
+share/icons/gnome/16x16/stock/text/stock_insert-header.png
+share/icons/gnome/16x16/stock/text/stock_insert_endnote.png
+share/icons/gnome/16x16/stock/text/stock_insert_footnote.png
+share/icons/gnome/16x16/stock/text/stock_insert_index_marker.png
+share/icons/gnome/16x16/stock/text/stock_insert_section.png
+share/icons/gnome/16x16/stock/text/stock_line-spacing-1.5.png
+share/icons/gnome/16x16/stock/text/stock_line-spacing-1.png
+share/icons/gnome/16x16/stock/text/stock_line-spacing-2.png
+share/icons/gnome/16x16/stock/text/stock_list-insert-unnumbered.png
+share/icons/gnome/16x16/stock/text/stock_list_bullet.png
+share/icons/gnome/16x16/stock/text/stock_list_enum-off.png
+share/icons/gnome/16x16/stock/text/stock_list_enum-restart.png
+share/icons/gnome/16x16/stock/text/stock_list_enum.png
+share/icons/gnome/16x16/stock/text/stock_nonprinting-chars.png
+share/icons/gnome/16x16/stock/text/stock_page-number.png
+share/icons/gnome/16x16/stock/text/stock_page-total-number.png
+share/icons/gnome/16x16/stock/text/stock_paragraph-spacing-decrease.png
+share/icons/gnome/16x16/stock/text/stock_paragraph-spacing-increase.png
+share/icons/gnome/16x16/stock/text/stock_select-all.png
+share/icons/gnome/16x16/stock/text/stock_spellcheck.png
+share/icons/gnome/16x16/stock/text/stock_styles-character-styles.png
+share/icons/gnome/16x16/stock/text/stock_styles-fill-format-mode.png
+share/icons/gnome/16x16/stock/text/stock_styles-frame-styles.png
+share/icons/gnome/16x16/stock/text/stock_styles-new-style-from-selection.png
+share/icons/gnome/16x16/stock/text/stock_styles-numbering-styles.png
+share/icons/gnome/16x16/stock/text/stock_styles-page-styles.png
+share/icons/gnome/16x16/stock/text/stock_styles-paragraph-styles.png
+share/icons/gnome/16x16/stock/text/stock_styles-update-style.png
+share/icons/gnome/16x16/stock/text/stock_subscript.png
+share/icons/gnome/16x16/stock/text/stock_superscript.png
+share/icons/gnome/16x16/stock/text/stock_text-direction-ltr.png
+share/icons/gnome/16x16/stock/text/stock_text-direction-ttb.png
+share/icons/gnome/16x16/stock/text/stock_text-double-click-to-edit.png
+share/icons/gnome/16x16/stock/text/stock_text-monospaced.png
+share/icons/gnome/16x16/stock/text/stock_text-outline.png
+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
+share/icons/gnome/16x16/stock/text/stock_tools-hyphenation.png
+share/icons/gnome/16x16/stock/text/stock_update-fields.png
+share/icons/gnome/16x16/stock/text/stock_view-field-shadings.png
+share/icons/gnome/16x16/stock/text/stock_wrap-around.png
+share/icons/gnome/16x16/stock/text/stock_wrap-behind.png
+share/icons/gnome/16x16/stock/text/stock_wrap-contour.png
+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/24x24/apps/accessibility-directory.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/boot.png
+share/icons/gnome/24x24/apps/burner.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
+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/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-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-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/image-viewer.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
+share/icons/gnome/24x24/apps/ooo_impress.png
+share/icons/gnome/24x24/apps/ooo_math.png
+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/postscript-viewer.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/text-editor.png
+share/icons/gnome/24x24/apps/tsclient.png
+share/icons/gnome/24x24/apps/volume-knob.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
@@ -310,12 +1227,401 @@ 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/gnome-mime-image.png
share/icons/gnome/24x24/mimetypes/gnome-mime-x-directory-nfs-server.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
+share/icons/gnome/24x24/stock/chart/stock_chart-edit-type.png
+share/icons/gnome/24x24/stock/chart/stock_chart-reorganize.png
+share/icons/gnome/24x24/stock/chart/stock_chart-toggle-axes-title.png
+share/icons/gnome/24x24/stock/chart/stock_chart-toggle-axes.png
+share/icons/gnome/24x24/stock/chart/stock_chart-toggle-hgrid.png
+share/icons/gnome/24x24/stock/chart/stock_chart-toggle-legend.png
+share/icons/gnome/24x24/stock/chart/stock_chart-toggle-title.png
+share/icons/gnome/24x24/stock/chart/stock_chart-toggle-vgrid.png
+share/icons/gnome/24x24/stock/chart/stock_glue.png
+share/icons/gnome/24x24/stock/chart/stock_gluepoint-down.png
+share/icons/gnome/24x24/stock/chart/stock_gluepoint-horizontal-center.png
+share/icons/gnome/24x24/stock/chart/stock_gluepoint-horizontal-left.png
+share/icons/gnome/24x24/stock/chart/stock_gluepoint-horizontal-right.png
+share/icons/gnome/24x24/stock/chart/stock_gluepoint-left.png
+share/icons/gnome/24x24/stock/chart/stock_gluepoint-relative.png
+share/icons/gnome/24x24/stock/chart/stock_gluepoint-right.png
+share/icons/gnome/24x24/stock/chart/stock_gluepoint-up.png
+share/icons/gnome/24x24/stock/chart/stock_gluepoint-vertical-bottom.png
+share/icons/gnome/24x24/stock/chart/stock_gluepoint-vertical-center.png
+share/icons/gnome/24x24/stock/chart/stock_gluepoint-vertical-top.png
+share/icons/gnome/24x24/stock/chart/stock_insert-chart.png
+share/icons/gnome/24x24/stock/code/stock_compile.png
+share/icons/gnome/24x24/stock/code/stock_error-next-16.png
+share/icons/gnome/24x24/stock/code/stock_error-previous-16.png
+share/icons/gnome/24x24/stock/code/stock_macro-check-brackets.png
+share/icons/gnome/24x24/stock/code/stock_macro-insert-breakpoint.png
+share/icons/gnome/24x24/stock/code/stock_macro-insert.png
+share/icons/gnome/24x24/stock/code/stock_macro-jump-back.png
+share/icons/gnome/24x24/stock/code/stock_macro-objects.png
+share/icons/gnome/24x24/stock/code/stock_macro-organizer.png
+share/icons/gnome/24x24/stock/code/stock_macro-stop-after-command.png
+share/icons/gnome/24x24/stock/code/stock_macro-stop-after-procedure.png
+share/icons/gnome/24x24/stock/code/stock_macro-stop-watching.png
+share/icons/gnome/24x24/stock/code/stock_macro-watch-variable.png
+share/icons/gnome/24x24/stock/code/stock_record-macro.png
+share/icons/gnome/24x24/stock/code/stock_run-macro.png
+share/icons/gnome/24x24/stock/code/stock_script.png
+share/icons/gnome/24x24/stock/code/stock_tools-macro.png
+share/icons/gnome/24x24/stock/data/stock_add-decimal-place.png
+share/icons/gnome/24x24/stock/data/stock_advanced-filter.png
+share/icons/gnome/24x24/stock/data/stock_autofilter.png
+share/icons/gnome/24x24/stock/data/stock_data-delete-record.png
+share/icons/gnome/24x24/stock/data/stock_data-explorer.png
+share/icons/gnome/24x24/stock/data/stock_data-first.png
+share/icons/gnome/24x24/stock/data/stock_data-last.png
+share/icons/gnome/24x24/stock/data/stock_data-linked-table.png
+share/icons/gnome/24x24/stock/data/stock_data-new-record.png
+share/icons/gnome/24x24/stock/data/stock_data-next.png
+share/icons/gnome/24x24/stock/data/stock_data-previous.png
+share/icons/gnome/24x24/stock/data/stock_data-save.png
+share/icons/gnome/24x24/stock/data/stock_data-sources.png
+share/icons/gnome/24x24/stock/data/stock_data-undo.png
+share/icons/gnome/24x24/stock/data/stock_database.png
+share/icons/gnome/24x24/stock/data/stock_delete-autofilter.png
+share/icons/gnome/24x24/stock/data/stock_delete-decimal-place.png
+share/icons/gnome/24x24/stock/data/stock_filter-data-by-criteria.png
+share/icons/gnome/24x24/stock/data/stock_filter-navigator.png
+share/icons/gnome/24x24/stock/data/stock_filters.png
+share/icons/gnome/24x24/stock/data/stock_format-default.png
+share/icons/gnome/24x24/stock/data/stock_format-percent.png
+share/icons/gnome/24x24/stock/data/stock_format-scientific.png
+share/icons/gnome/24x24/stock/data/stock_function-autopilot.png
+share/icons/gnome/24x24/stock/data/stock_goal-seek.png
+share/icons/gnome/24x24/stock/data/stock_insert-fields.png
+share/icons/gnome/24x24/stock/data/stock_lock-broken.png
+share/icons/gnome/24x24/stock/data/stock_lock-ok.png
+share/icons/gnome/24x24/stock/data/stock_lock-open.png
+share/icons/gnome/24x24/stock/data/stock_lock.png
+share/icons/gnome/24x24/stock/data/stock_record-number.png
+share/icons/gnome/24x24/stock/data/stock_signature-bad.png
+share/icons/gnome/24x24/stock/data/stock_signature-ok.png
+share/icons/gnome/24x24/stock/data/stock_signature.png
+share/icons/gnome/24x24/stock/data/stock_sort-ascending.png
+share/icons/gnome/24x24/stock/data/stock_sort-column-ascending.png
+share/icons/gnome/24x24/stock/data/stock_sort-criteria.png
+share/icons/gnome/24x24/stock/data/stock_sort-descending.png
+share/icons/gnome/24x24/stock/data/stock_sort-row-ascending.png
+share/icons/gnome/24x24/stock/data/stock_standard-filter.png
+share/icons/gnome/24x24/stock/data/stock_sum.png
+share/icons/gnome/24x24/stock/data/stock_update-data.png
+share/icons/gnome/24x24/stock/document/stock_attach.png
+share/icons/gnome/24x24/stock/document/stock_certificate.png
+share/icons/gnome/24x24/stock/document/stock_new-drawing.png
+share/icons/gnome/24x24/stock/document/stock_new-formula.png
+share/icons/gnome/24x24/stock/document/stock_new-html.png
+share/icons/gnome/24x24/stock/document/stock_new-labels.png
+share/icons/gnome/24x24/stock/document/stock_new-master-document.png
+share/icons/gnome/24x24/stock/document/stock_new-presentation.png
+share/icons/gnome/24x24/stock/document/stock_new-spreadsheet.png
+share/icons/gnome/24x24/stock/document/stock_new-template.png
+share/icons/gnome/24x24/stock/document/stock_new-text.png
+share/icons/gnome/24x24/stock/document/stock_new.png
+share/icons/gnome/24x24/stock/document/stock_preview-four-pages.png
+share/icons/gnome/24x24/stock/document/stock_preview-two-pages.png
+share/icons/gnome/24x24/stock/document/stock_print-layout.png
+share/icons/gnome/24x24/stock/document/stock_print-options.png
+share/icons/gnome/24x24/stock/document/stock_print-resolution.png
+share/icons/gnome/24x24/stock/document/stock_task-assigned-to.png
+share/icons/gnome/24x24/stock/document/stock_task-assigned.png
+share/icons/gnome/24x24/stock/document/stock_task-recurring.png
+share/icons/gnome/24x24/stock/document/stock_task.png
+share/icons/gnome/24x24/stock/document/stock_todo.png
+share/icons/gnome/24x24/stock/document/stock_view-html-source.png
+share/icons/gnome/24x24/stock/form/stock_form-activation-order.png
+share/icons/gnome/24x24/stock/form/stock_form-add-field.png
+share/icons/gnome/24x24/stock/form/stock_form-automatic-control-focus.png
+share/icons/gnome/24x24/stock/form/stock_form-autopilots.png
+share/icons/gnome/24x24/stock/form/stock_form-button.png
+share/icons/gnome/24x24/stock/form/stock_form-checkbox.png
+share/icons/gnome/24x24/stock/form/stock_form-combobox.png
+share/icons/gnome/24x24/stock/form/stock_form-control-properties.png
+share/icons/gnome/24x24/stock/form/stock_form-currency-field.png
+share/icons/gnome/24x24/stock/form/stock_form-date-field.png
+share/icons/gnome/24x24/stock/form/stock_form-design-mode.png
+share/icons/gnome/24x24/stock/form/stock_form-file-selection.png
+share/icons/gnome/24x24/stock/form/stock_form-formatted-field.png
+share/icons/gnome/24x24/stock/form/stock_form-frame.png
+share/icons/gnome/24x24/stock/form/stock_form-image-button.png
+share/icons/gnome/24x24/stock/form/stock_form-image-control.png
+share/icons/gnome/24x24/stock/form/stock_form-label.png
+share/icons/gnome/24x24/stock/form/stock_form-letter-dialog.png
+share/icons/gnome/24x24/stock/form/stock_form-line-horizontal.png
+share/icons/gnome/24x24/stock/form/stock_form-line-vertical.png
+share/icons/gnome/24x24/stock/form/stock_form-listbox.png
+share/icons/gnome/24x24/stock/form/stock_form-navigator.png
+share/icons/gnome/24x24/stock/form/stock_form-numerical-field.png
+share/icons/gnome/24x24/stock/form/stock_form-open-in-design-mode.png
+share/icons/gnome/24x24/stock/form/stock_form-pattern-field.png
+share/icons/gnome/24x24/stock/form/stock_form-progressbar.png
+share/icons/gnome/24x24/stock/form/stock_form-properties.png
+share/icons/gnome/24x24/stock/form/stock_form-radio.png
+share/icons/gnome/24x24/stock/form/stock_form-table-control.png
+share/icons/gnome/24x24/stock/form/stock_form-text-box.png
+share/icons/gnome/24x24/stock/form/stock_form-time-field.png
+share/icons/gnome/24x24/stock/form/stock_insert-form.png
+share/icons/gnome/24x24/stock/form/stock_macro-controls.png
+share/icons/gnome/24x24/stock/form/stock_show-form-dialog.png
+share/icons/gnome/24x24/stock/form/stock_show-hidden-controls.png
+share/icons/gnome/24x24/stock/form/stock_view-fields.png
+share/icons/gnome/24x24/stock/generic/stock_about.png
+share/icons/gnome/24x24/stock/generic/stock_active.png
+share/icons/gnome/24x24/stock/generic/stock_allow-effects.png
+share/icons/gnome/24x24/stock/generic/stock_anchor.png
+share/icons/gnome/24x24/stock/generic/stock_animation.png
+share/icons/gnome/24x24/stock/generic/stock_autocompletion.png
+share/icons/gnome/24x24/stock/generic/stock_autopilot-24.png
+share/icons/gnome/24x24/stock/generic/stock_book_blue.png
+share/icons/gnome/24x24/stock/generic/stock_book_green.png
+share/icons/gnome/24x24/stock/generic/stock_book_open.png
+share/icons/gnome/24x24/stock/generic/stock_book_red.png
+share/icons/gnome/24x24/stock/generic/stock_book_yellow.png
+share/icons/gnome/24x24/stock/generic/stock_briefcase.png
+share/icons/gnome/24x24/stock/generic/stock_calc-accept.png
+share/icons/gnome/24x24/stock/generic/stock_calc-cancel.png
+share/icons/gnome/24x24/stock/generic/stock_calendar-and-tasks.png
+share/icons/gnome/24x24/stock/generic/stock_calendar-view-day.png
+share/icons/gnome/24x24/stock/generic/stock_calendar-view-list.png
+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
+share/icons/gnome/24x24/stock/generic/stock_exit.png
+share/icons/gnome/24x24/stock/generic/stock_extended-help.png
+share/icons/gnome/24x24/stock/generic/stock_file-properties.png
+share/icons/gnome/24x24/stock/generic/stock_flip-horizontally.png
+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
+share/icons/gnome/24x24/stock/generic/stock_timer.png
+share/icons/gnome/24x24/stock/generic/stock_timer_stopped.png
+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
+share/icons/gnome/24x24/stock/image/stock_3d-color-picker.png
+share/icons/gnome/24x24/stock/image/stock_3d-effects.png
+share/icons/gnome/24x24/stock/image/stock_arrowstyle.png
+share/icons/gnome/24x24/stock/image/stock_brightness.png
+share/icons/gnome/24x24/stock/image/stock_bucketfill.png
+share/icons/gnome/24x24/stock/image/stock_channel-blue.png
+share/icons/gnome/24x24/stock/image/stock_channel-green.png
+share/icons/gnome/24x24/stock/image/stock_channel-red.png
+share/icons/gnome/24x24/stock/image/stock_contrast.png
+share/icons/gnome/24x24/stock/image/stock_crop.png
+share/icons/gnome/24x24/stock/image/stock_display-grid.png
+share/icons/gnome/24x24/stock/image/stock_distort.png
+share/icons/gnome/24x24/stock/image/stock_draw-arc.png
+share/icons/gnome/24x24/stock/image/stock_draw-callouts.png
+share/icons/gnome/24x24/stock/image/stock_draw-circle-arc.png
+share/icons/gnome/24x24/stock/image/stock_draw-circle-pie-unfilled.png
+share/icons/gnome/24x24/stock/image/stock_draw-circle-pie.png
+share/icons/gnome/24x24/stock/image/stock_draw-circle-segment-unfilled.png
+share/icons/gnome/24x24/stock/image/stock_draw-circle-segment.png
+share/icons/gnome/24x24/stock/image/stock_draw-circle-unfilled.png
+share/icons/gnome/24x24/stock/image/stock_draw-circle.png
+share/icons/gnome/24x24/stock/image/stock_draw-cone.png
+share/icons/gnome/24x24/stock/image/stock_draw-connector-ends-with-arrow.png
+share/icons/gnome/24x24/stock/image/stock_draw-connector-ends-with-circle.png
+share/icons/gnome/24x24/stock/image/stock_draw-connector-starts-with-arrow.png
+share/icons/gnome/24x24/stock/image/stock_draw-connector-starts-with-circle.png
+share/icons/gnome/24x24/stock/image/stock_draw-connector-with-arrows.png
+share/icons/gnome/24x24/stock/image/stock_draw-connector-with-circles.png
+share/icons/gnome/24x24/stock/image/stock_draw-connector.png
+share/icons/gnome/24x24/stock/image/stock_draw-cube.png
+share/icons/gnome/24x24/stock/image/stock_draw-curve-filled.png
+share/icons/gnome/24x24/stock/image/stock_draw-curve.png
+share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-ends-with-arrow.png
+share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-ends-with-circle.png
+share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-starts-with-arrow.png
+share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-starts-with-circle.png
+share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-with-arrows.png
+share/icons/gnome/24x24/stock/image/stock_draw-curved-connector-with-circles.png
+share/icons/gnome/24x24/stock/image/stock_draw-curved-connector.png
+share/icons/gnome/24x24/stock/image/stock_draw-cylinder.png
+share/icons/gnome/24x24/stock/image/stock_draw-dimension-line.png
+share/icons/gnome/24x24/stock/image/stock_draw-ellipse-pie-unfilled.png
+share/icons/gnome/24x24/stock/image/stock_draw-ellipse-pie.png
+share/icons/gnome/24x24/stock/image/stock_draw-ellipse-segment-unfilled.png
+share/icons/gnome/24x24/stock/image/stock_draw-ellipse-segment.png
+share/icons/gnome/24x24/stock/image/stock_draw-ellipse-unfilled.png
+share/icons/gnome/24x24/stock/image/stock_draw-ellipse.png
+share/icons/gnome/24x24/stock/image/stock_draw-freeform-line-filled.png
+share/icons/gnome/24x24/stock/image/stock_draw-freeform-line.png
+share/icons/gnome/24x24/stock/image/stock_draw-half-sphere.png
+share/icons/gnome/24x24/stock/image/stock_draw-line-45.png
+share/icons/gnome/24x24/stock/image/stock_draw-line-connector-ends-with-arrow.png
+share/icons/gnome/24x24/stock/image/stock_draw-line-connector-ends-with-circle.png
+share/icons/gnome/24x24/stock/image/stock_draw-line-connector-starts-with-arrow.png
+share/icons/gnome/24x24/stock/image/stock_draw-line-connector-starts-with-circle.png
+share/icons/gnome/24x24/stock/image/stock_draw-line-connector-with-arrows.png
+share/icons/gnome/24x24/stock/image/stock_draw-line-connector-with-circles.png
+share/icons/gnome/24x24/stock/image/stock_draw-line-connector.png
+share/icons/gnome/24x24/stock/image/stock_draw-line-ends-with-arrow.png
+share/icons/gnome/24x24/stock/image/stock_draw-line-starts-with-arrow.png
+share/icons/gnome/24x24/stock/image/stock_draw-line-with-arrow-circle.png
+share/icons/gnome/24x24/stock/image/stock_draw-line-with-arrow-square.png
+share/icons/gnome/24x24/stock/image/stock_draw-line-with-arrows.png
+share/icons/gnome/24x24/stock/image/stock_draw-line-with-circle-arrow.png
+share/icons/gnome/24x24/stock/image/stock_draw-line-with-square-arrow.png
+share/icons/gnome/24x24/stock/image/stock_draw-line.png
+share/icons/gnome/24x24/stock/image/stock_draw-polygon-45-filled.png
+share/icons/gnome/24x24/stock/image/stock_draw-polygon-45.png
+share/icons/gnome/24x24/stock/image/stock_draw-polygon-filled.png
+share/icons/gnome/24x24/stock/image/stock_draw-polygon.png
+share/icons/gnome/24x24/stock/image/stock_draw-pyramid.png
+share/icons/gnome/24x24/stock/image/stock_draw-rectangle-unfilled.png
+share/icons/gnome/24x24/stock/image/stock_draw-rectangle.png
+share/icons/gnome/24x24/stock/image/stock_draw-rounded-rectangle-unfilled.png
+share/icons/gnome/24x24/stock/image/stock_draw-rounded-rectangle.png
+share/icons/gnome/24x24/stock/image/stock_draw-rounded-square-unfilled.png
+share/icons/gnome/24x24/stock/image/stock_draw-rounded-square.png
+share/icons/gnome/24x24/stock/image/stock_draw-selection.png
+share/icons/gnome/24x24/stock/image/stock_draw-shell.png
+share/icons/gnome/24x24/stock/image/stock_draw-sphere.png
+share/icons/gnome/24x24/stock/image/stock_draw-square-unfilled.png
+share/icons/gnome/24x24/stock/image/stock_draw-square.png
+share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-ends-with-arrow.png
+share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-ends-with-circle.png
+share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-starts-with-arrow.png
+share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-starts-with-circle.png
+share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-with-arrows.png
+share/icons/gnome/24x24/stock/image/stock_draw-straight-connector-with-circles.png
+share/icons/gnome/24x24/stock/image/stock_draw-straight-connector.png
+share/icons/gnome/24x24/stock/image/stock_draw-torus.png
+share/icons/gnome/24x24/stock/image/stock_draw-vertical-callouts.png
+share/icons/gnome/24x24/stock/image/stock_edit-points.png
+share/icons/gnome/24x24/stock/image/stock_filters-aging.png
+share/icons/gnome/24x24/stock/image/stock_filters-charcoal.png
+share/icons/gnome/24x24/stock/image/stock_filters-invert.png
+share/icons/gnome/24x24/stock/image/stock_filters-pixelize.png
+share/icons/gnome/24x24/stock/image/stock_filters-pop-art.png
+share/icons/gnome/24x24/stock/image/stock_filters-posterize.png
+share/icons/gnome/24x24/stock/image/stock_filters-relief.png
+share/icons/gnome/24x24/stock/image/stock_filters-remove-noise.png
+share/icons/gnome/24x24/stock/image/stock_filters-sharpen.png
+share/icons/gnome/24x24/stock/image/stock_filters-smooth.png
+share/icons/gnome/24x24/stock/image/stock_filters-solarize.png
+share/icons/gnome/24x24/stock/image/stock_flip.png
+share/icons/gnome/24x24/stock/image/stock_gamma.png
+share/icons/gnome/24x24/stock/image/stock_gradient.png
+share/icons/gnome/24x24/stock/image/stock_graphics-align-bottom.png
+share/icons/gnome/24x24/stock/image/stock_graphics-align-center.png
+share/icons/gnome/24x24/stock/image/stock_graphics-align-centered.png
+share/icons/gnome/24x24/stock/image/stock_graphics-align-left.png
+share/icons/gnome/24x24/stock/image/stock_graphics-align-right.png
+share/icons/gnome/24x24/stock/image/stock_graphics-align-top.png
+share/icons/gnome/24x24/stock/image/stock_guides.png
+share/icons/gnome/24x24/stock/image/stock_imagemap-editor.png
+share/icons/gnome/24x24/stock/image/stock_insert_image.png
+share/icons/gnome/24x24/stock/image/stock_linepen.png
+share/icons/gnome/24x24/stock/image/stock_modify-layout.png
+share/icons/gnome/24x24/stock/image/stock_node-add.png
+share/icons/gnome/24x24/stock/image/stock_node-close-path.png
+share/icons/gnome/24x24/stock/image/stock_node-convert.png
+share/icons/gnome/24x24/stock/image/stock_node-corner-to-smooth.png
+share/icons/gnome/24x24/stock/image/stock_node-corner.png
+share/icons/gnome/24x24/stock/image/stock_node-curve-split.png
+share/icons/gnome/24x24/stock/image/stock_node-delete.png
+share/icons/gnome/24x24/stock/image/stock_node-mark-for-deletion.png
+share/icons/gnome/24x24/stock/image/stock_node-move.png
+share/icons/gnome/24x24/stock/image/stock_node-smooth-to-symmetrical.png
+share/icons/gnome/24x24/stock/image/stock_placeholder-graphic.png
+share/icons/gnome/24x24/stock/image/stock_placeholder-line-contour.png
+share/icons/gnome/24x24/stock/image/stock_placeholder-picture.png
+share/icons/gnome/24x24/stock/image/stock_placeholder-text.png
+share/icons/gnome/24x24/stock/image/stock_quickmask.png
+share/icons/gnome/24x24/stock/image/stock_rotate-3d.png
+share/icons/gnome/24x24/stock/image/stock_rotate.png
+share/icons/gnome/24x24/stock/image/stock_rotation-mode.png
+share/icons/gnome/24x24/stock/image/stock_shadow.png
+share/icons/gnome/24x24/stock/image/stock_show-draw-functions.png
+share/icons/gnome/24x24/stock/image/stock_toggle-graphics.png
+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
@@ -328,13 +1634,13 @@ 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-shuffle.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
@@ -342,6 +1648,342 @@ 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
+share/icons/gnome/24x24/stock/navigation/stock_zoom-object.png
+share/icons/gnome/24x24/stock/navigation/stock_zoom-optimal.png
+share/icons/gnome/24x24/stock/navigation/stock_zoom-out.png
+share/icons/gnome/24x24/stock/navigation/stock_zoom-page-width.png
+share/icons/gnome/24x24/stock/navigation/stock_zoom-page.png
+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
+share/icons/gnome/24x24/stock/net/stock_contact-list.png
+share/icons/gnome/24x24/stock/net/stock_contact.png
+share/icons/gnome/24x24/stock/net/stock_directory-server.png
+share/icons/gnome/24x24/stock/net/stock_disconnect.png
+share/icons/gnome/24x24/stock/net/stock_exchange-connector.png
+share/icons/gnome/24x24/stock/net/stock_groupwise-connector.png
+share/icons/gnome/24x24/stock/net/stock_hand-signed.png
+share/icons/gnome/24x24/stock/net/stock_hyperlink-internet-search.png
+share/icons/gnome/24x24/stock/net/stock_hyperlink-target.png
+share/icons/gnome/24x24/stock/net/stock_hyperlink-toolbar.png
+share/icons/gnome/24x24/stock/net/stock_hyperlink.png
+share/icons/gnome/24x24/stock/net/stock_inbox.png
+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
+share/icons/gnome/24x24/stock/net/stock_mail-move.png
+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
+share/icons/gnome/24x24/stock/object/stock_create-with-attributes.png
+share/icons/gnome/24x24/stock/object/stock_delete-bookmark.png
+share/icons/gnome/24x24/stock/object/stock_edit-bookmark.png
+share/icons/gnome/24x24/stock/object/stock_effects-more-options.png
+share/icons/gnome/24x24/stock/object/stock_effects-object-colorize.png
+share/icons/gnome/24x24/stock/object/stock_effects-object-hide.png
+share/icons/gnome/24x24/stock/object/stock_effects-object.png
+share/icons/gnome/24x24/stock/object/stock_effects-play-in-full.png
+share/icons/gnome/24x24/stock/object/stock_effects-preview.png
+share/icons/gnome/24x24/stock/object/stock_effects.png
+share/icons/gnome/24x24/stock/object/stock_enter-group.png
+share/icons/gnome/24x24/stock/object/stock_exit-group.png
+share/icons/gnome/24x24/stock/object/stock_file-with-objects.png
+share/icons/gnome/24x24/stock/object/stock_format-object.png
+share/icons/gnome/24x24/stock/object/stock_formula-cursor.png
+share/icons/gnome/24x24/stock/object/stock_frame.png
+share/icons/gnome/24x24/stock/object/stock_group.png
+share/icons/gnome/24x24/stock/object/stock_handles-simple.png
+share/icons/gnome/24x24/stock/object/stock_insert-applet.png
+share/icons/gnome/24x24/stock/object/stock_insert-floating-frame.png
+share/icons/gnome/24x24/stock/object/stock_insert-gluepoint.png
+share/icons/gnome/24x24/stock/object/stock_insert-math-object.png
+share/icons/gnome/24x24/stock/object/stock_insert-note.png
+share/icons/gnome/24x24/stock/object/stock_insert-ole-object.png
+share/icons/gnome/24x24/stock/object/stock_insert-plugin.png
+share/icons/gnome/24x24/stock/object/stock_insert-rule.png
+share/icons/gnome/24x24/stock/object/stock_insert-single-column-text-frame.png
+share/icons/gnome/24x24/stock/object/stock_insert-slide.png
+share/icons/gnome/24x24/stock/object/stock_insert-sound-plugin.png
+share/icons/gnome/24x24/stock/object/stock_insert-text-frame.png
+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
+share/icons/gnome/24x24/stock/object/stock_position-size.png
+share/icons/gnome/24x24/stock/object/stock_reverse-order.png
+share/icons/gnome/24x24/stock/object/stock_slide-design.png
+share/icons/gnome/24x24/stock/object/stock_slide-duplicate.png
+share/icons/gnome/24x24/stock/object/stock_slide-expand.png
+share/icons/gnome/24x24/stock/object/stock_slide-reherse-timings.png
+share/icons/gnome/24x24/stock/object/stock_slide-show.png
+share/icons/gnome/24x24/stock/object/stock_slide-showhide.png
+share/icons/gnome/24x24/stock/object/stock_snap-grid.png
+share/icons/gnome/24x24/stock/object/stock_snap-guides.png
+share/icons/gnome/24x24/stock/object/stock_snap-margins.png
+share/icons/gnome/24x24/stock/object/stock_snap-object-points.png
+share/icons/gnome/24x24/stock/object/stock_snap-object.png
+share/icons/gnome/24x24/stock/object/stock_symbol-selection.png
+share/icons/gnome/24x24/stock/object/stock_to-3d-rotation-object.png
+share/icons/gnome/24x24/stock/object/stock_to-3d.png
+share/icons/gnome/24x24/stock/object/stock_to-bottom.png
+share/icons/gnome/24x24/stock/object/stock_to-curve.png
+share/icons/gnome/24x24/stock/object/stock_to-polygon.png
+share/icons/gnome/24x24/stock/object/stock_to-top.png
+share/icons/gnome/24x24/stock/object/stock_ungroup.png
+share/icons/gnome/24x24/stock/object/stock_unlink.png
+share/icons/gnome/24x24/stock/object/stock_view-function-selection.png
+share/icons/gnome/24x24/stock/table/stock_alignment-bottom.png
+share/icons/gnome/24x24/stock/table/stock_alignment-centered-vertically.png
+share/icons/gnome/24x24/stock/table/stock_alignment-centered.png
+share/icons/gnome/24x24/stock/table/stock_alignment-left.png
+share/icons/gnome/24x24/stock/table/stock_alignment-right.png
+share/icons/gnome/24x24/stock/table/stock_alignment-top.png
+share/icons/gnome/24x24/stock/table/stock_alignment.png
+share/icons/gnome/24x24/stock/table/stock_cell-align-bottom.png
+share/icons/gnome/24x24/stock/table/stock_cell-align-center.png
+share/icons/gnome/24x24/stock/table/stock_cell-align-top.png
+share/icons/gnome/24x24/stock/table/stock_choose-themes.png
+share/icons/gnome/24x24/stock/table/stock_datapilot.png
+share/icons/gnome/24x24/stock/table/stock_delete-column.png
+share/icons/gnome/24x24/stock/table/stock_delete-row.png
+share/icons/gnome/24x24/stock/table/stock_exchange-columns.png
+share/icons/gnome/24x24/stock/table/stock_exchange-rows.png
+share/icons/gnome/24x24/stock/table/stock_group-cells.png
+share/icons/gnome/24x24/stock/table/stock_insert-cells-down.png
+share/icons/gnome/24x24/stock/table/stock_insert-cells-right.png
+share/icons/gnome/24x24/stock/table/stock_insert-cells.png
+share/icons/gnome/24x24/stock/table/stock_insert-columns.png
+share/icons/gnome/24x24/stock/table/stock_insert-names-define.png
+share/icons/gnome/24x24/stock/table/stock_insert-rows.png
+share/icons/gnome/24x24/stock/table/stock_insert-table.png
+share/icons/gnome/24x24/stock/table/stock_select-cell.png
+share/icons/gnome/24x24/stock/table/stock_select-column.png
+share/icons/gnome/24x24/stock/table/stock_select-row.png
+share/icons/gnome/24x24/stock/table/stock_select-table.png
+share/icons/gnome/24x24/stock/table/stock_sort-table-column-ascending.png
+share/icons/gnome/24x24/stock/table/stock_sort-table-row-ascending.png
+share/icons/gnome/24x24/stock/table/stock_table-align-bottom.png
+share/icons/gnome/24x24/stock/table/stock_table-align-center.png
+share/icons/gnome/24x24/stock/table/stock_table-align-top.png
+share/icons/gnome/24x24/stock/table/stock_table-borders.png
+share/icons/gnome/24x24/stock/table/stock_table-combine.png
+share/icons/gnome/24x24/stock/table/stock_table-fit-height.png
+share/icons/gnome/24x24/stock/table/stock_table-fit-width.png
+share/icons/gnome/24x24/stock/table/stock_table-fixed-proportional.png
+share/icons/gnome/24x24/stock/table/stock_table-fixed.png
+share/icons/gnome/24x24/stock/table/stock_table-line-color.png
+share/icons/gnome/24x24/stock/table/stock_table-line-style.png
+share/icons/gnome/24x24/stock/table/stock_table-optimize.png
+share/icons/gnome/24x24/stock/table/stock_table-same-height.png
+share/icons/gnome/24x24/stock/table/stock_table-same-width.png
+share/icons/gnome/24x24/stock/table/stock_table-split.png
+share/icons/gnome/24x24/stock/table/stock_table-variable.png
+share/icons/gnome/24x24/stock/table/stock_table_borders.png
+share/icons/gnome/24x24/stock/table/stock_table_fill.png
+share/icons/gnome/24x24/stock/table/stock_ungroup-cells.png
+share/icons/gnome/24x24/stock/text/stock_autoformat.png
+share/icons/gnome/24x24/stock/text/stock_autospellcheck.png
+share/icons/gnome/24x24/stock/text/stock_autotext.png
+share/icons/gnome/24x24/stock/text/stock_chart-scale-text.png
+share/icons/gnome/24x24/stock/text/stock_decrease-font.png
+share/icons/gnome/24x24/stock/text/stock_directcursor.png
+share/icons/gnome/24x24/stock/text/stock_draw-text-animation.png
+share/icons/gnome/24x24/stock/text/stock_draw-text-frame.png
+share/icons/gnome/24x24/stock/text/stock_draw-text.png
+share/icons/gnome/24x24/stock/text/stock_draw-vertical-text-frame.png
+share/icons/gnome/24x24/stock/text/stock_draw-vertical-text.png
+share/icons/gnome/24x24/stock/text/stock_edit-contour.png
+share/icons/gnome/24x24/stock/text/stock_edit-headers-and-footers.png
+share/icons/gnome/24x24/stock/text/stock_effects-text.png
+share/icons/gnome/24x24/stock/text/stock_euro.png
+share/icons/gnome/24x24/stock/text/stock_font-formatting-toggle.png
+share/icons/gnome/24x24/stock/text/stock_font-size.png
+share/icons/gnome/24x24/stock/text/stock_font.png
+share/icons/gnome/24x24/stock/text/stock_fontwork.png
+share/icons/gnome/24x24/stock/text/stock_format-character.png
+share/icons/gnome/24x24/stock/text/stock_format-numbering-bullets.png
+share/icons/gnome/24x24/stock/text/stock_format-paragraph.png
+share/icons/gnome/24x24/stock/text/stock_increase-font.png
+share/icons/gnome/24x24/stock/text/stock_insert-caption.png
+share/icons/gnome/24x24/stock/text/stock_insert-cross-reference.png
+share/icons/gnome/24x24/stock/text/stock_insert-fields-author.png
+share/icons/gnome/24x24/stock/text/stock_insert-fields-subject.png
+share/icons/gnome/24x24/stock/text/stock_insert-fields-title.png
+share/icons/gnome/24x24/stock/text/stock_insert-footer.png
+share/icons/gnome/24x24/stock/text/stock_insert-header.png
+share/icons/gnome/24x24/stock/text/stock_insert_endnote.png
+share/icons/gnome/24x24/stock/text/stock_insert_footnote.png
+share/icons/gnome/24x24/stock/text/stock_insert_index_marker.png
+share/icons/gnome/24x24/stock/text/stock_insert_section.png
+share/icons/gnome/24x24/stock/text/stock_line-spacing-1.5.png
+share/icons/gnome/24x24/stock/text/stock_line-spacing-1.png
+share/icons/gnome/24x24/stock/text/stock_line-spacing-2.png
+share/icons/gnome/24x24/stock/text/stock_list-insert-unnumbered.png
+share/icons/gnome/24x24/stock/text/stock_list_bullet.png
+share/icons/gnome/24x24/stock/text/stock_list_enum-off.png
+share/icons/gnome/24x24/stock/text/stock_list_enum-restart.png
+share/icons/gnome/24x24/stock/text/stock_list_enum.png
+share/icons/gnome/24x24/stock/text/stock_nonprinting-chars.png
+share/icons/gnome/24x24/stock/text/stock_page-number.png
+share/icons/gnome/24x24/stock/text/stock_page-total-number.png
+share/icons/gnome/24x24/stock/text/stock_paragraph-spacing-decrease.png
+share/icons/gnome/24x24/stock/text/stock_paragraph-spacing-increase.png
+share/icons/gnome/24x24/stock/text/stock_select-all.png
+share/icons/gnome/24x24/stock/text/stock_spellcheck.png
+share/icons/gnome/24x24/stock/text/stock_styles-new-style-from-selection.png
+share/icons/gnome/24x24/stock/text/stock_styles-update-style.png
+share/icons/gnome/24x24/stock/text/stock_subscript.png
+share/icons/gnome/24x24/stock/text/stock_superscript.png
+share/icons/gnome/24x24/stock/text/stock_text-direction-ltr.png
+share/icons/gnome/24x24/stock/text/stock_text-direction-ttb.png
+share/icons/gnome/24x24/stock/text/stock_text-double-click-to-edit.png
+share/icons/gnome/24x24/stock/text/stock_text-monospaced.png
+share/icons/gnome/24x24/stock/text/stock_text-outline.png
+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
+share/icons/gnome/24x24/stock/text/stock_tools-hyphenation.png
+share/icons/gnome/24x24/stock/text/stock_update-fields.png
+share/icons/gnome/24x24/stock/text/stock_view-field-shadings.png
+share/icons/gnome/24x24/stock/text/stock_wrap-around.png
+share/icons/gnome/24x24/stock/text/stock_wrap-behind.png
+share/icons/gnome/24x24/stock/text/stock_wrap-contour.png
+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/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-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/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/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/devices/gnome-dev-ipod.png
share/icons/gnome/32x32/filesystems/gnome-fs-bookmark-missing.png
share/icons/gnome/32x32/filesystems/gnome-fs-bookmark.png
@@ -354,13 +1996,61 @@ share/icons/gnome/32x32/filesystems/gnome-fs-trash-full.png
share/icons/gnome/32x32/mimetypes/gnome-mime-application-msword.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/mimetypes/gnome-mime-image-bmp.png
-share/icons/gnome/32x32/mimetypes/gnome-mime-image-gif.png
-share/icons/gnome/32x32/mimetypes/gnome-mime-image-jpeg.png
-share/icons/gnome/32x32/mimetypes/gnome-mime-image-png.png
-share/icons/gnome/32x32/mimetypes/gnome-mime-image-svg.png
-share/icons/gnome/32x32/mimetypes/gnome-mime-image-tiff.png
-share/icons/gnome/32x32/mimetypes/gnome-mime-image-wmf.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
@@ -368,6 +2058,33 @@ 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
@@ -375,6 +2092,127 @@ 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/48x48/apps/accessibility-directory.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/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/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
+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/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/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/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
@@ -618,6 +2456,7 @@ 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
@@ -647,31 +2486,6 @@ 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-bmp.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-gif.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-ief.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-jpeg.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-png.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-svg+xml.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-svg.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-tiff.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-3ds.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-applix-graphic.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-cmu-raster.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-lwo.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-lws.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-portable-anymap.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-portable-bitmap.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-portable-graymap.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-portable-pixmap.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-psd.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-rgb.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-tga.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-xbitmap.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-xcf.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-xfig.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-xpixmap.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-image-x-xwindowdump.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
@@ -706,11 +2520,6 @@ 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-mpeg.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-video-quicktime.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-video-x-ms-asf.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-video-x-ms-wmv.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-video-x-msvideo.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
@@ -718,11 +2527,112 @@ 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
+share/icons/gnome/48x48/stock/data/stock_lock-open.png
+share/icons/gnome/48x48/stock/data/stock_lock.png
+share/icons/gnome/48x48/stock/data/stock_signature-bad.png
+share/icons/gnome/48x48/stock/data/stock_signature-ok.png
+share/icons/gnome/48x48/stock/data/stock_signature.png
+share/icons/gnome/48x48/stock/document/stock_certificate.png
+share/icons/gnome/48x48/stock/document/stock_new-drawing.png
+share/icons/gnome/48x48/stock/document/stock_new-formula.png
+share/icons/gnome/48x48/stock/document/stock_new-html.png
+share/icons/gnome/48x48/stock/document/stock_new-labels.png
+share/icons/gnome/48x48/stock/document/stock_new-master-document.png
+share/icons/gnome/48x48/stock/document/stock_new-presentation.png
+share/icons/gnome/48x48/stock/document/stock_new-spreadsheet.png
+share/icons/gnome/48x48/stock/document/stock_new-template.png
+share/icons/gnome/48x48/stock/document/stock_new-text.png
+share/icons/gnome/48x48/stock/document/stock_todo.png
+share/icons/gnome/48x48/stock/generic/stock_alarm.png
+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
+share/icons/gnome/48x48/stock/generic/stock_notes.png
+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
+share/icons/gnome/48x48/stock/io/stock_print-driver.png
+share/icons/gnome/48x48/stock/io/stock_print-duplex-no-tumble.png
+share/icons/gnome/48x48/stock/io/stock_print-duplex-tumble.png
+share/icons/gnome/48x48/stock/io/stock_print-duplex.png
+share/icons/gnome/48x48/stock/io/stock_print-non-duplex.png
+share/icons/gnome/48x48/stock/io/stock_print-preview-print.png
+share/icons/gnome/48x48/stock/io/stock_print-preview.png
+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
+share/icons/gnome/48x48/stock/net/stock_exchange-connector.png
+share/icons/gnome/48x48/stock/net/stock_groupwise-connector.png
+share/icons/gnome/48x48/stock/net/stock_inbox.png
+share/icons/gnome/48x48/stock/net/stock_mail-compose.png
+share/icons/gnome/48x48/stock/net/stock_mail-druid-account.png
+share/icons/gnome/48x48/stock/net/stock_mail-druid.png
+share/icons/gnome/48x48/stock/net/stock_mail-flag-for-followup-done.png
+share/icons/gnome/48x48/stock/net/stock_mail-flag-for-followup.png
+share/icons/gnome/48x48/stock/net/stock_mail-import.png
+share/icons/gnome/48x48/stock/net/stock_mail-open.png
+share/icons/gnome/48x48/stock/net/stock_mail-receive.png
+share/icons/gnome/48x48/stock/net/stock_mail-replied.png
+share/icons/gnome/48x48/stock/net/stock_mail-send-receive.png
+share/icons/gnome/48x48/stock/net/stock_mail-send.png
+share/icons/gnome/48x48/stock/net/stock_mail.png
+share/icons/gnome/48x48/stock/net/stock_not-spam.png
+share/icons/gnome/48x48/stock/net/stock_outbox.png
+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/index.theme
+share/icons/gnome/scalable/apps/evolution.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/emblems/emblem-favorite.icon
@@ -743,2067 +2653,116 @@ 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/hicolor/16x16/apps/config-language.png
-share/icons/hicolor/16x16/apps/evolution.png
-share/icons/hicolor/16x16/apps/gnome-devel.png
-share/icons/hicolor/16x16/apps/gnome-globe.png
-share/icons/hicolor/16x16/apps/gnome-help.png
-share/icons/hicolor/16x16/apps/gnome-logout.png
-share/icons/hicolor/16x16/apps/gnome-run.png
-share/icons/hicolor/16x16/apps/gnome-settings.png
-share/icons/hicolor/16x16/apps/gnome-window-manager.png
-share/icons/hicolor/16x16/apps/im-aim.png
-share/icons/hicolor/16x16/apps/im-icq.png
-share/icons/hicolor/16x16/apps/im-jabber.png
-share/icons/hicolor/16x16/apps/im-msn.png
-share/icons/hicolor/16x16/apps/im-nov.png
-share/icons/hicolor/16x16/apps/im-yahoo.png
-share/icons/hicolor/16x16/apps/im.png
-share/icons/hicolor/16x16/apps/image-viewer.png
-share/icons/hicolor/16x16/apps/panel-notification-area.png
-share/icons/hicolor/16x16/apps/panel-window-list.png
-share/icons/hicolor/16x16/apps/panel-window-menu.png
-share/icons/hicolor/16x16/apps/text-editor.png
-share/icons/hicolor/16x16/apps/volume-knob.png
-share/icons/hicolor/16x16/filesystems/gnome-fs-locally-shared.png
-share/icons/hicolor/16x16/filesystems/gnome-fs-share-private.png
-share/icons/hicolor/16x16/stock/chart/stock_chart-autoformat.png
-share/icons/hicolor/16x16/stock/chart/stock_chart-data-in-columns.png
-share/icons/hicolor/16x16/stock/chart/stock_chart-data-in-rows.png
-share/icons/hicolor/16x16/stock/chart/stock_chart-edit-type.png
-share/icons/hicolor/16x16/stock/chart/stock_chart-reorganize.png
-share/icons/hicolor/16x16/stock/chart/stock_chart-toggle-axes-title.png
-share/icons/hicolor/16x16/stock/chart/stock_chart-toggle-axes.png
-share/icons/hicolor/16x16/stock/chart/stock_chart-toggle-hgrid.png
-share/icons/hicolor/16x16/stock/chart/stock_chart-toggle-legend.png
-share/icons/hicolor/16x16/stock/chart/stock_chart-toggle-title.png
-share/icons/hicolor/16x16/stock/chart/stock_chart-toggle-vgrid.png
-share/icons/hicolor/16x16/stock/chart/stock_glue.png
-share/icons/hicolor/16x16/stock/chart/stock_gluepoint-down.png
-share/icons/hicolor/16x16/stock/chart/stock_gluepoint-horizontal-center.png
-share/icons/hicolor/16x16/stock/chart/stock_gluepoint-horizontal-left.png
-share/icons/hicolor/16x16/stock/chart/stock_gluepoint-horizontal-right.png
-share/icons/hicolor/16x16/stock/chart/stock_gluepoint-left.png
-share/icons/hicolor/16x16/stock/chart/stock_gluepoint-relative.png
-share/icons/hicolor/16x16/stock/chart/stock_gluepoint-right.png
-share/icons/hicolor/16x16/stock/chart/stock_gluepoint-up.png
-share/icons/hicolor/16x16/stock/chart/stock_gluepoint-vertical-bottom.png
-share/icons/hicolor/16x16/stock/chart/stock_gluepoint-vertical-center.png
-share/icons/hicolor/16x16/stock/chart/stock_gluepoint-vertical-top.png
-share/icons/hicolor/16x16/stock/chart/stock_insert-chart.png
-share/icons/hicolor/16x16/stock/code/stock_compile.png
-share/icons/hicolor/16x16/stock/code/stock_error-next.png
-share/icons/hicolor/16x16/stock/code/stock_error-previous.png
-share/icons/hicolor/16x16/stock/code/stock_macro-check-brackets.png
-share/icons/hicolor/16x16/stock/code/stock_macro-insert-breakpoint.png
-share/icons/hicolor/16x16/stock/code/stock_macro-insert.png
-share/icons/hicolor/16x16/stock/code/stock_macro-jump-back.png
-share/icons/hicolor/16x16/stock/code/stock_macro-objects.png
-share/icons/hicolor/16x16/stock/code/stock_macro-organizer.png
-share/icons/hicolor/16x16/stock/code/stock_macro-stop-after-command.png
-share/icons/hicolor/16x16/stock/code/stock_macro-stop-after-procedure.png
-share/icons/hicolor/16x16/stock/code/stock_macro-stop-watching.png
-share/icons/hicolor/16x16/stock/code/stock_macro-watch-variable.png
-share/icons/hicolor/16x16/stock/code/stock_record-macro.png
-share/icons/hicolor/16x16/stock/code/stock_run-macro.png
-share/icons/hicolor/16x16/stock/code/stock_script.png
-share/icons/hicolor/16x16/stock/code/stock_tools-macro.png
-share/icons/hicolor/16x16/stock/data/stock_add-decimal-place.png
-share/icons/hicolor/16x16/stock/data/stock_advanced-filter.png
-share/icons/hicolor/16x16/stock/data/stock_autofilter.png
-share/icons/hicolor/16x16/stock/data/stock_data-delete-link.png
-share/icons/hicolor/16x16/stock/data/stock_data-delete-query.png
-share/icons/hicolor/16x16/stock/data/stock_data-delete-record.png
-share/icons/hicolor/16x16/stock/data/stock_data-delete-sql-query.png
-share/icons/hicolor/16x16/stock/data/stock_data-delete-table.png
-share/icons/hicolor/16x16/stock/data/stock_data-edit-link.png
-share/icons/hicolor/16x16/stock/data/stock_data-edit-query.png
-share/icons/hicolor/16x16/stock/data/stock_data-edit-sql-query.png
-share/icons/hicolor/16x16/stock/data/stock_data-edit-table.png
-share/icons/hicolor/16x16/stock/data/stock_data-explorer.png
-share/icons/hicolor/16x16/stock/data/stock_data-first.png
-share/icons/hicolor/16x16/stock/data/stock_data-last.png
-share/icons/hicolor/16x16/stock/data/stock_data-link.png
-share/icons/hicolor/16x16/stock/data/stock_data-linked-table.png
-share/icons/hicolor/16x16/stock/data/stock_data-links.png
-share/icons/hicolor/16x16/stock/data/stock_data-new-link.png
-share/icons/hicolor/16x16/stock/data/stock_data-new-query.png
-share/icons/hicolor/16x16/stock/data/stock_data-new-record.png
-share/icons/hicolor/16x16/stock/data/stock_data-new-sql-query.png
-share/icons/hicolor/16x16/stock/data/stock_data-new-table.png
-share/icons/hicolor/16x16/stock/data/stock_data-next.png
-share/icons/hicolor/16x16/stock/data/stock_data-previous.png
-share/icons/hicolor/16x16/stock/data/stock_data-queries.png
-share/icons/hicolor/16x16/stock/data/stock_data-query-rename.png
-share/icons/hicolor/16x16/stock/data/stock_data-query.png
-share/icons/hicolor/16x16/stock/data/stock_data-save.png
-share/icons/hicolor/16x16/stock/data/stock_data-sources-delete.png
-share/icons/hicolor/16x16/stock/data/stock_data-sources-hand.png
-share/icons/hicolor/16x16/stock/data/stock_data-sources-modified.png
-share/icons/hicolor/16x16/stock/data/stock_data-sources-new.png
-share/icons/hicolor/16x16/stock/data/stock_data-sources.png
-share/icons/hicolor/16x16/stock/data/stock_data-table.png
-share/icons/hicolor/16x16/stock/data/stock_data-tables.png
-share/icons/hicolor/16x16/stock/data/stock_data-undo.png
-share/icons/hicolor/16x16/stock/data/stock_database.png
-share/icons/hicolor/16x16/stock/data/stock_delete-autofilter.png
-share/icons/hicolor/16x16/stock/data/stock_delete-decimal-place.png
-share/icons/hicolor/16x16/stock/data/stock_filter-data-by-criteria.png
-share/icons/hicolor/16x16/stock/data/stock_filter-navigator.png
-share/icons/hicolor/16x16/stock/data/stock_filters.png
-share/icons/hicolor/16x16/stock/data/stock_format-default.png
-share/icons/hicolor/16x16/stock/data/stock_format-percent.png
-share/icons/hicolor/16x16/stock/data/stock_format-scientific.png
-share/icons/hicolor/16x16/stock/data/stock_function-autopilot.png
-share/icons/hicolor/16x16/stock/data/stock_goal-seek.png
-share/icons/hicolor/16x16/stock/data/stock_insert-fields.png
-share/icons/hicolor/16x16/stock/data/stock_lock-broken.png
-share/icons/hicolor/16x16/stock/data/stock_lock-ok.png
-share/icons/hicolor/16x16/stock/data/stock_lock-open.png
-share/icons/hicolor/16x16/stock/data/stock_lock.png
-share/icons/hicolor/16x16/stock/data/stock_record-number.png
-share/icons/hicolor/16x16/stock/data/stock_signature-bad.png
-share/icons/hicolor/16x16/stock/data/stock_signature-ok.png
-share/icons/hicolor/16x16/stock/data/stock_signature.png
-share/icons/hicolor/16x16/stock/data/stock_sort-ascending.png
-share/icons/hicolor/16x16/stock/data/stock_sort-column-ascending.png
-share/icons/hicolor/16x16/stock/data/stock_sort-criteria.png
-share/icons/hicolor/16x16/stock/data/stock_sort-descending.png
-share/icons/hicolor/16x16/stock/data/stock_sort-row-ascending.png
-share/icons/hicolor/16x16/stock/data/stock_standard-filter.png
-share/icons/hicolor/16x16/stock/data/stock_sum.png
-share/icons/hicolor/16x16/stock/data/stock_update-data.png
-share/icons/hicolor/16x16/stock/document/stock_attach.png
-share/icons/hicolor/16x16/stock/document/stock_certificate.png
-share/icons/hicolor/16x16/stock/document/stock_new-drawing.png
-share/icons/hicolor/16x16/stock/document/stock_new-formula.png
-share/icons/hicolor/16x16/stock/document/stock_new-html.png
-share/icons/hicolor/16x16/stock/document/stock_new-labels.png
-share/icons/hicolor/16x16/stock/document/stock_new-master-document.png
-share/icons/hicolor/16x16/stock/document/stock_new-presentation.png
-share/icons/hicolor/16x16/stock/document/stock_new-spreadsheet.png
-share/icons/hicolor/16x16/stock/document/stock_new-template.png
-share/icons/hicolor/16x16/stock/document/stock_new-text.png
-share/icons/hicolor/16x16/stock/document/stock_new.png
-share/icons/hicolor/16x16/stock/document/stock_preview-four-pages.png
-share/icons/hicolor/16x16/stock/document/stock_preview-two-pages.png
-share/icons/hicolor/16x16/stock/document/stock_print-layout.png
-share/icons/hicolor/16x16/stock/document/stock_print-options.png
-share/icons/hicolor/16x16/stock/document/stock_print-resolution.png
-share/icons/hicolor/16x16/stock/document/stock_script.png
-share/icons/hicolor/16x16/stock/document/stock_scripts.png
-share/icons/hicolor/16x16/stock/document/stock_task-assigned-to.png
-share/icons/hicolor/16x16/stock/document/stock_task-assigned.png
-share/icons/hicolor/16x16/stock/document/stock_task-recurring.png
-share/icons/hicolor/16x16/stock/document/stock_task.png
-share/icons/hicolor/16x16/stock/document/stock_todo.png
-share/icons/hicolor/16x16/stock/document/stock_view-html-source.png
-share/icons/hicolor/16x16/stock/form/stock_form-activation-order.png
-share/icons/hicolor/16x16/stock/form/stock_form-add-field.png
-share/icons/hicolor/16x16/stock/form/stock_form-automatic-control-focus.png
-share/icons/hicolor/16x16/stock/form/stock_form-autopilots.png
-share/icons/hicolor/16x16/stock/form/stock_form-button.png
-share/icons/hicolor/16x16/stock/form/stock_form-checkbox.png
-share/icons/hicolor/16x16/stock/form/stock_form-combobox.png
-share/icons/hicolor/16x16/stock/form/stock_form-control-properties.png
-share/icons/hicolor/16x16/stock/form/stock_form-currency-field.png
-share/icons/hicolor/16x16/stock/form/stock_form-date-field.png
-share/icons/hicolor/16x16/stock/form/stock_form-design-mode.png
-share/icons/hicolor/16x16/stock/form/stock_form-file-selection.png
-share/icons/hicolor/16x16/stock/form/stock_form-formatted-field.png
-share/icons/hicolor/16x16/stock/form/stock_form-frame.png
-share/icons/hicolor/16x16/stock/form/stock_form-image-button.png
-share/icons/hicolor/16x16/stock/form/stock_form-image-control.png
-share/icons/hicolor/16x16/stock/form/stock_form-label.png
-share/icons/hicolor/16x16/stock/form/stock_form-letter-dialog.png
-share/icons/hicolor/16x16/stock/form/stock_form-listbox.png
-share/icons/hicolor/16x16/stock/form/stock_form-navigator.png
-share/icons/hicolor/16x16/stock/form/stock_form-numerical-field.png
-share/icons/hicolor/16x16/stock/form/stock_form-open-in-design-mode.png
-share/icons/hicolor/16x16/stock/form/stock_form-pattern-field.png
-share/icons/hicolor/16x16/stock/form/stock_form-progressbar.png
-share/icons/hicolor/16x16/stock/form/stock_form-properties.png
-share/icons/hicolor/16x16/stock/form/stock_form-radio.png
-share/icons/hicolor/16x16/stock/form/stock_form-table-control.png
-share/icons/hicolor/16x16/stock/form/stock_form-text-box.png
-share/icons/hicolor/16x16/stock/form/stock_form-time-field.png
-share/icons/hicolor/16x16/stock/form/stock_insert-form.png
-share/icons/hicolor/16x16/stock/form/stock_macro-controls.png
-share/icons/hicolor/16x16/stock/form/stock_show-form-dialog.png
-share/icons/hicolor/16x16/stock/form/stock_show-hidden-controls.png
-share/icons/hicolor/16x16/stock/form/stock_view-fields.png
-share/icons/hicolor/16x16/stock/generic/stock_3d-favourites.png
-share/icons/hicolor/16x16/stock/generic/stock_about.png
-share/icons/hicolor/16x16/stock/generic/stock_active.png
-share/icons/hicolor/16x16/stock/generic/stock_allow-effects.png
-share/icons/hicolor/16x16/stock/generic/stock_anchor.png
-share/icons/hicolor/16x16/stock/generic/stock_animation.png
-share/icons/hicolor/16x16/stock/generic/stock_autocompletion.png
-share/icons/hicolor/16x16/stock/generic/stock_autopilot.png
-share/icons/hicolor/16x16/stock/generic/stock_bell.png
-share/icons/hicolor/16x16/stock/generic/stock_book_blue.png
-share/icons/hicolor/16x16/stock/generic/stock_book_green.png
-share/icons/hicolor/16x16/stock/generic/stock_book_open.png
-share/icons/hicolor/16x16/stock/generic/stock_book_red.png
-share/icons/hicolor/16x16/stock/generic/stock_book_yellow.png
-share/icons/hicolor/16x16/stock/generic/stock_briefcase.png
-share/icons/hicolor/16x16/stock/generic/stock_calc-accept.png
-share/icons/hicolor/16x16/stock/generic/stock_calc-cancel.png
-share/icons/hicolor/16x16/stock/generic/stock_calendar-and-tasks.png
-share/icons/hicolor/16x16/stock/generic/stock_calendar.png
-share/icons/hicolor/16x16/stock/generic/stock_cell-phone.png
-share/icons/hicolor/16x16/stock/generic/stock_check-filled.png
-share/icons/hicolor/16x16/stock/generic/stock_close.png
-share/icons/hicolor/16x16/stock/generic/stock_color.png
-share/icons/hicolor/16x16/stock/generic/stock_copy.png
-share/icons/hicolor/16x16/stock/generic/stock_cut.png
-share/icons/hicolor/16x16/stock/generic/stock_default-folder.png
-share/icons/hicolor/16x16/stock/generic/stock_delete.png
-share/icons/hicolor/16x16/stock/generic/stock_dialog-error.png
-share/icons/hicolor/16x16/stock/generic/stock_dialog-info.png
-share/icons/hicolor/16x16/stock/generic/stock_dialog-warning.png
-share/icons/hicolor/16x16/stock/generic/stock_drag-mode.png
-share/icons/hicolor/16x16/stock/generic/stock_edit.png
-share/icons/hicolor/16x16/stock/generic/stock_equals.png
-share/icons/hicolor/16x16/stock/generic/stock_example.png
-share/icons/hicolor/16x16/stock/generic/stock_exit.png
-share/icons/hicolor/16x16/stock/generic/stock_extended-help.png
-share/icons/hicolor/16x16/stock/generic/stock_file-properties.png
-share/icons/hicolor/16x16/stock/generic/stock_flip-horizontally.png
-share/icons/hicolor/16x16/stock/generic/stock_flip-vertically.png
-share/icons/hicolor/16x16/stock/generic/stock_folder-copy.png
-share/icons/hicolor/16x16/stock/generic/stock_folder-move.png
-share/icons/hicolor/16x16/stock/generic/stock_folder-properties.png
-share/icons/hicolor/16x16/stock/generic/stock_folder.png
-share/icons/hicolor/16x16/stock/generic/stock_format-page.png
-share/icons/hicolor/16x16/stock/generic/stock_fullscreen.png
-share/icons/hicolor/16x16/stock/generic/stock_help-add-bookmark.png
-share/icons/hicolor/16x16/stock/generic/stock_help-agent.png
-share/icons/hicolor/16x16/stock/generic/stock_help-book-open.png
-share/icons/hicolor/16x16/stock/generic/stock_help-book.png
-share/icons/hicolor/16x16/stock/generic/stock_help-chat.png
-share/icons/hicolor/16x16/stock/generic/stock_help-document.png
-share/icons/hicolor/16x16/stock/generic/stock_help-pane-off.png
-share/icons/hicolor/16x16/stock/generic/stock_help-pane-on.png
-share/icons/hicolor/16x16/stock/generic/stock_help.png
-share/icons/hicolor/16x16/stock/generic/stock_home.png
-share/icons/hicolor/16x16/stock/generic/stock_id.png
-share/icons/hicolor/16x16/stock/generic/stock_keyring.png
-share/icons/hicolor/16x16/stock/generic/stock_landline-phone.png
-share/icons/hicolor/16x16/stock/generic/stock_leave-fullscreen.png
-share/icons/hicolor/16x16/stock/generic/stock_mark.png
-share/icons/hicolor/16x16/stock/generic/stock_new-24h-appointment.png
-share/icons/hicolor/16x16/stock/generic/stock_new-appointment.png
-share/icons/hicolor/16x16/stock/generic/stock_new-dir.png
-share/icons/hicolor/16x16/stock/generic/stock_new-meeting.png
-share/icons/hicolor/16x16/stock/generic/stock_news.png
-share/icons/hicolor/16x16/stock/generic/stock_notebook.png
-share/icons/hicolor/16x16/stock/generic/stock_notes.png
-share/icons/hicolor/16x16/stock/generic/stock_openoffice.png
-share/icons/hicolor/16x16/stock/generic/stock_paste.png
-share/icons/hicolor/16x16/stock/generic/stock_people.png
-share/icons/hicolor/16x16/stock/generic/stock_person.png
-share/icons/hicolor/16x16/stock/generic/stock_presentation-box.png
-share/icons/hicolor/16x16/stock/generic/stock_presentation-styles.png
-share/icons/hicolor/16x16/stock/generic/stock_properties.png
-share/icons/hicolor/16x16/stock/generic/stock_redo.png
-share/icons/hicolor/16x16/stock/generic/stock_refresh.png
-share/icons/hicolor/16x16/stock/generic/stock_score-high.png
-share/icons/hicolor/16x16/stock/generic/stock_score-higher.png
-share/icons/hicolor/16x16/stock/generic/stock_score-highest.png
-share/icons/hicolor/16x16/stock/generic/stock_score-low.png
-share/icons/hicolor/16x16/stock/generic/stock_score-lower.png
-share/icons/hicolor/16x16/stock/generic/stock_score-lowest.png
-share/icons/hicolor/16x16/stock/generic/stock_score-normal.png
-share/icons/hicolor/16x16/stock/generic/stock_search-and-replace.png
-share/icons/hicolor/16x16/stock/generic/stock_search.png
-share/icons/hicolor/16x16/stock/generic/stock_send-fax.png
-share/icons/hicolor/16x16/stock/generic/stock_show-all.png
-share/icons/hicolor/16x16/stock/generic/stock_stop.png
-share/icons/hicolor/16x16/stock/generic/stock_styles.png
-share/icons/hicolor/16x16/stock/generic/stock_summary.png
-share/icons/hicolor/16x16/stock/generic/stock_test-mode.png
-share/icons/hicolor/16x16/stock/generic/stock_timer.png
-share/icons/hicolor/16x16/stock/generic/stock_timer_stopped.png
-share/icons/hicolor/16x16/stock/generic/stock_timezone.png
-share/icons/hicolor/16x16/stock/generic/stock_toggle-info.png
-share/icons/hicolor/16x16/stock/generic/stock_toggle-preview.png
-share/icons/hicolor/16x16/stock/generic/stock_toilet-paper.png
-share/icons/hicolor/16x16/stock/generic/stock_trash_full.png
-share/icons/hicolor/16x16/stock/generic/stock_undelete.png
-share/icons/hicolor/16x16/stock/generic/stock_undo.png
-share/icons/hicolor/16x16/stock/generic/stock_unknown.png
-share/icons/hicolor/16x16/stock/generic/stock_view-details.png
-share/icons/hicolor/16x16/stock/generic/stock_weather-cloudy.png
-share/icons/hicolor/16x16/stock/generic/stock_weather-few-clouds.png
-share/icons/hicolor/16x16/stock/generic/stock_weather-fog.png
-share/icons/hicolor/16x16/stock/generic/stock_weather-night-clear.png
-share/icons/hicolor/16x16/stock/generic/stock_weather-night-few-clouds.png
-share/icons/hicolor/16x16/stock/generic/stock_weather-showers.png
-share/icons/hicolor/16x16/stock/generic/stock_weather-snow.png
-share/icons/hicolor/16x16/stock/generic/stock_weather-storm.png
-share/icons/hicolor/16x16/stock/generic/stock_weather-sunny.png
-share/icons/hicolor/16x16/stock/generic/stock_web-calendar.png
-share/icons/hicolor/16x16/stock/generic/stock_web-support.png
-share/icons/hicolor/16x16/stock/image/stock_3d-color-picker.png
-share/icons/hicolor/16x16/stock/image/stock_3d-colors.png
-share/icons/hicolor/16x16/stock/image/stock_3d-custom-color.png
-share/icons/hicolor/16x16/stock/image/stock_3d-effects.png
-share/icons/hicolor/16x16/stock/image/stock_arrowstyle.png
-share/icons/hicolor/16x16/stock/image/stock_brightness.png
-share/icons/hicolor/16x16/stock/image/stock_bucketfill.png
-share/icons/hicolor/16x16/stock/image/stock_channel-blue.png
-share/icons/hicolor/16x16/stock/image/stock_channel-green.png
-share/icons/hicolor/16x16/stock/image/stock_channel-red.png
-share/icons/hicolor/16x16/stock/image/stock_contrast.png
-share/icons/hicolor/16x16/stock/image/stock_crop.png
-share/icons/hicolor/16x16/stock/image/stock_display-grid.png
-share/icons/hicolor/16x16/stock/image/stock_display-guides.png
-share/icons/hicolor/16x16/stock/image/stock_distort.png
-share/icons/hicolor/16x16/stock/image/stock_draw-arc.png
-share/icons/hicolor/16x16/stock/image/stock_draw-callouts.png
-share/icons/hicolor/16x16/stock/image/stock_draw-circle-arc.png
-share/icons/hicolor/16x16/stock/image/stock_draw-circle-pie-unfilled.png
-share/icons/hicolor/16x16/stock/image/stock_draw-circle-pie.png
-share/icons/hicolor/16x16/stock/image/stock_draw-circle-segment-unfilled.png
-share/icons/hicolor/16x16/stock/image/stock_draw-circle-segment.png
-share/icons/hicolor/16x16/stock/image/stock_draw-circle-unfilled.png
-share/icons/hicolor/16x16/stock/image/stock_draw-circle.png
-share/icons/hicolor/16x16/stock/image/stock_draw-cone.png
-share/icons/hicolor/16x16/stock/image/stock_draw-connector-ends-with-arrow.png
-share/icons/hicolor/16x16/stock/image/stock_draw-connector-ends-with-circle.png
-share/icons/hicolor/16x16/stock/image/stock_draw-connector-starts-with-arrow.png
-share/icons/hicolor/16x16/stock/image/stock_draw-connector-starts-with-circle.png
-share/icons/hicolor/16x16/stock/image/stock_draw-connector-with-arrows.png
-share/icons/hicolor/16x16/stock/image/stock_draw-connector-with-circles.png
-share/icons/hicolor/16x16/stock/image/stock_draw-connector.png
-share/icons/hicolor/16x16/stock/image/stock_draw-cube.png
-share/icons/hicolor/16x16/stock/image/stock_draw-curve-filled.png
-share/icons/hicolor/16x16/stock/image/stock_draw-curve.png
-share/icons/hicolor/16x16/stock/image/stock_draw-curved-connector-ends-with-arrow.png
-share/icons/hicolor/16x16/stock/image/stock_draw-curved-connector-ends-with-circle.png
-share/icons/hicolor/16x16/stock/image/stock_draw-curved-connector-starts-with-arrow.png
-share/icons/hicolor/16x16/stock/image/stock_draw-curved-connector-starts-with-circle.png
-share/icons/hicolor/16x16/stock/image/stock_draw-curved-connector-with-arrows.png
-share/icons/hicolor/16x16/stock/image/stock_draw-curved-connector-with-circles.png
-share/icons/hicolor/16x16/stock/image/stock_draw-curved-connector.png
-share/icons/hicolor/16x16/stock/image/stock_draw-cylinder.png
-share/icons/hicolor/16x16/stock/image/stock_draw-dimension-line.png
-share/icons/hicolor/16x16/stock/image/stock_draw-ellipse-pie-unfilled.png
-share/icons/hicolor/16x16/stock/image/stock_draw-ellipse-pie.png
-share/icons/hicolor/16x16/stock/image/stock_draw-ellipse-segment-unfilled.png
-share/icons/hicolor/16x16/stock/image/stock_draw-ellipse-segment.png
-share/icons/hicolor/16x16/stock/image/stock_draw-ellipse-unfilled.png
-share/icons/hicolor/16x16/stock/image/stock_draw-ellipse.png
-share/icons/hicolor/16x16/stock/image/stock_draw-freeform-line-filled.png
-share/icons/hicolor/16x16/stock/image/stock_draw-freeform-line.png
-share/icons/hicolor/16x16/stock/image/stock_draw-half-sphere.png
-share/icons/hicolor/16x16/stock/image/stock_draw-line-45.png
-share/icons/hicolor/16x16/stock/image/stock_draw-line-connector-ends-with-arrow.png
-share/icons/hicolor/16x16/stock/image/stock_draw-line-connector-ends-with-circle.png
-share/icons/hicolor/16x16/stock/image/stock_draw-line-connector-starts-with-arrow.png
-share/icons/hicolor/16x16/stock/image/stock_draw-line-connector-starts-with-circle.png
-share/icons/hicolor/16x16/stock/image/stock_draw-line-connector-with-arrows.png
-share/icons/hicolor/16x16/stock/image/stock_draw-line-connector-with-circles.png
-share/icons/hicolor/16x16/stock/image/stock_draw-line-connector.png
-share/icons/hicolor/16x16/stock/image/stock_draw-line-ends-with-arrow.png
-share/icons/hicolor/16x16/stock/image/stock_draw-line-starts-with-arrow.png
-share/icons/hicolor/16x16/stock/image/stock_draw-line-with-arrow-circle.png
-share/icons/hicolor/16x16/stock/image/stock_draw-line-with-arrow-square.png
-share/icons/hicolor/16x16/stock/image/stock_draw-line-with-arrows.png
-share/icons/hicolor/16x16/stock/image/stock_draw-line-with-circle-arrow.png
-share/icons/hicolor/16x16/stock/image/stock_draw-line-with-square-arrow.png
-share/icons/hicolor/16x16/stock/image/stock_draw-line.png
-share/icons/hicolor/16x16/stock/image/stock_draw-polygon-45-filled.png
-share/icons/hicolor/16x16/stock/image/stock_draw-polygon-45.png
-share/icons/hicolor/16x16/stock/image/stock_draw-polygon-filled.png
-share/icons/hicolor/16x16/stock/image/stock_draw-polygon.png
-share/icons/hicolor/16x16/stock/image/stock_draw-pyramid.png
-share/icons/hicolor/16x16/stock/image/stock_draw-rectangle-unfilled.png
-share/icons/hicolor/16x16/stock/image/stock_draw-rectangle.png
-share/icons/hicolor/16x16/stock/image/stock_draw-rounded-rectangle-unfilled.png
-share/icons/hicolor/16x16/stock/image/stock_draw-rounded-rectangle.png
-share/icons/hicolor/16x16/stock/image/stock_draw-rounded-square-unfilled.png
-share/icons/hicolor/16x16/stock/image/stock_draw-rounded-square.png
-share/icons/hicolor/16x16/stock/image/stock_draw-selection.png
-share/icons/hicolor/16x16/stock/image/stock_draw-shell.png
-share/icons/hicolor/16x16/stock/image/stock_draw-sphere.png
-share/icons/hicolor/16x16/stock/image/stock_draw-square-unfilled.png
-share/icons/hicolor/16x16/stock/image/stock_draw-square.png
-share/icons/hicolor/16x16/stock/image/stock_draw-straight-connector-ends-with-arrow.png
-share/icons/hicolor/16x16/stock/image/stock_draw-straight-connector-ends-with-circle.png
-share/icons/hicolor/16x16/stock/image/stock_draw-straight-connector-starts-with-arrow.png
-share/icons/hicolor/16x16/stock/image/stock_draw-straight-connector-starts-with-circle.png
-share/icons/hicolor/16x16/stock/image/stock_draw-straight-connector-with-arrows.png
-share/icons/hicolor/16x16/stock/image/stock_draw-straight-connector-with-circles.png
-share/icons/hicolor/16x16/stock/image/stock_draw-straight-connector.png
-share/icons/hicolor/16x16/stock/image/stock_draw-torus.png
-share/icons/hicolor/16x16/stock/image/stock_draw-vertical-callouts.png
-share/icons/hicolor/16x16/stock/image/stock_edit-points.png
-share/icons/hicolor/16x16/stock/image/stock_filters-aging.png
-share/icons/hicolor/16x16/stock/image/stock_filters-charcoal.png
-share/icons/hicolor/16x16/stock/image/stock_filters-invert.png
-share/icons/hicolor/16x16/stock/image/stock_filters-pixelize.png
-share/icons/hicolor/16x16/stock/image/stock_filters-pop-art.png
-share/icons/hicolor/16x16/stock/image/stock_filters-posterize.png
-share/icons/hicolor/16x16/stock/image/stock_filters-relief.png
-share/icons/hicolor/16x16/stock/image/stock_filters-remove-noise.png
-share/icons/hicolor/16x16/stock/image/stock_filters-sharpen.png
-share/icons/hicolor/16x16/stock/image/stock_filters-smooth.png
-share/icons/hicolor/16x16/stock/image/stock_filters-solarize.png
-share/icons/hicolor/16x16/stock/image/stock_flip.png
-share/icons/hicolor/16x16/stock/image/stock_gamma.png
-share/icons/hicolor/16x16/stock/image/stock_gradient.png
-share/icons/hicolor/16x16/stock/image/stock_graphic-styles.png
-share/icons/hicolor/16x16/stock/image/stock_graphics-align-bottom.png
-share/icons/hicolor/16x16/stock/image/stock_graphics-align-center.png
-share/icons/hicolor/16x16/stock/image/stock_graphics-align-centered.png
-share/icons/hicolor/16x16/stock/image/stock_graphics-align-left.png
-share/icons/hicolor/16x16/stock/image/stock_graphics-align-right.png
-share/icons/hicolor/16x16/stock/image/stock_graphics-align-top.png
-share/icons/hicolor/16x16/stock/image/stock_guides.png
-share/icons/hicolor/16x16/stock/image/stock_imagemap-editor.png
-share/icons/hicolor/16x16/stock/image/stock_insert_image.png
-share/icons/hicolor/16x16/stock/image/stock_linepen.png
-share/icons/hicolor/16x16/stock/image/stock_modify-layout.png
-share/icons/hicolor/16x16/stock/image/stock_node-add.png
-share/icons/hicolor/16x16/stock/image/stock_node-close-path.png
-share/icons/hicolor/16x16/stock/image/stock_node-convert.png
-share/icons/hicolor/16x16/stock/image/stock_node-corner-to-smooth.png
-share/icons/hicolor/16x16/stock/image/stock_node-corner.png
-share/icons/hicolor/16x16/stock/image/stock_node-curve-split.png
-share/icons/hicolor/16x16/stock/image/stock_node-delete.png
-share/icons/hicolor/16x16/stock/image/stock_node-mark-for-deletion.png
-share/icons/hicolor/16x16/stock/image/stock_node-move.png
-share/icons/hicolor/16x16/stock/image/stock_node-smooth-to-symmetrical.png
-share/icons/hicolor/16x16/stock/image/stock_placeholder-graphic.png
-share/icons/hicolor/16x16/stock/image/stock_placeholder-line-contour.png
-share/icons/hicolor/16x16/stock/image/stock_placeholder-picture.png
-share/icons/hicolor/16x16/stock/image/stock_placeholder-text.png
-share/icons/hicolor/16x16/stock/image/stock_quickmask.png
-share/icons/hicolor/16x16/stock/image/stock_rotate-3d.png
-share/icons/hicolor/16x16/stock/image/stock_rotate.png
-share/icons/hicolor/16x16/stock/image/stock_rotation-mode.png
-share/icons/hicolor/16x16/stock/image/stock_shadow.png
-share/icons/hicolor/16x16/stock/image/stock_show-draw-functions.png
-share/icons/hicolor/16x16/stock/image/stock_toggle-graphics.png
-share/icons/hicolor/16x16/stock/image/stock_transform-circle-perspective.png
-share/icons/hicolor/16x16/stock/image/stock_transform-circle-slant.png
-share/icons/hicolor/16x16/stock/image/stock_transparency.png
-share/icons/hicolor/16x16/stock/image/stock_wallpaper-center.png
-share/icons/hicolor/16x16/stock/image/stock_wallpaper-fill.png
-share/icons/hicolor/16x16/stock/image/stock_wallpaper-scale.png
-share/icons/hicolor/16x16/stock/image/stock_wallpaper-tile.png
-share/icons/hicolor/16x16/stock/io/stock_bluetooth.png
-share/icons/hicolor/16x16/stock/io/stock_export.png
-share/icons/hicolor/16x16/stock/io/stock_insert-file.png
-share/icons/hicolor/16x16/stock/io/stock_network-printer.png
-share/icons/hicolor/16x16/stock/io/stock_open-read-only.png
-share/icons/hicolor/16x16/stock/io/stock_open.png
-share/icons/hicolor/16x16/stock/io/stock_print-driver.png
-share/icons/hicolor/16x16/stock/io/stock_print-preview-print.png
-share/icons/hicolor/16x16/stock/io/stock_print-preview.png
-share/icons/hicolor/16x16/stock/io/stock_print-setup.png
-share/icons/hicolor/16x16/stock/io/stock_print.png
-share/icons/hicolor/16x16/stock/io/stock_printers.png
-share/icons/hicolor/16x16/stock/io/stock_reload.png
-share/icons/hicolor/16x16/stock/io/stock_save-as.png
-share/icons/hicolor/16x16/stock/io/stock_save-pdf.png
-share/icons/hicolor/16x16/stock/io/stock_save-template.png
-share/icons/hicolor/16x16/stock/io/stock_save.png
-share/icons/hicolor/16x16/stock/io/stock_save_as.png
-share/icons/hicolor/16x16/stock/io/stock_up-one-dir.png
-share/icons/hicolor/16x16/stock/navigation/stock_bottom.png
-share/icons/hicolor/16x16/stock/navigation/stock_down-with-subpoints.png
-share/icons/hicolor/16x16/stock/navigation/stock_down.png
-share/icons/hicolor/16x16/stock/navigation/stock_first-page.png
-share/icons/hicolor/16x16/stock/navigation/stock_first.png
-share/icons/hicolor/16x16/stock/navigation/stock_last-page.png
-share/icons/hicolor/16x16/stock/navigation/stock_last.png
-share/icons/hicolor/16x16/stock/navigation/stock_left-with-subpoints.png
-share/icons/hicolor/16x16/stock/navigation/stock_left.png
-share/icons/hicolor/16x16/stock/navigation/stock_live-mode.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigate-next.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigate-prev.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-all-or-sel-toggle.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-database-ranges.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-drag-mode.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-edit-entry.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-foonote-body-toggle.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-footer-body-toggle.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-header-body-toggle.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-headings.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-indexes.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-insert-as-copy.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-insert-as-link.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-insert-index.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-insert-linked.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-levels.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-list-box-toggle.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-master-toggle.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-next-object.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-open-toolbar.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-previous-object.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-range-names.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-references.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-reminder.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-scenarios.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-sections.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-shift-down.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-shift-left.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-shift-right.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-shift-up.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-table-formula.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-text.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-update-entry.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator-wrong-table-formula.png
-share/icons/hicolor/16x16/stock/navigation/stock_navigator.png
-share/icons/hicolor/16x16/stock/navigation/stock_new-tab.png
-share/icons/hicolor/16x16/stock/navigation/stock_next-page.png
-share/icons/hicolor/16x16/stock/navigation/stock_next.png
-share/icons/hicolor/16x16/stock/navigation/stock_previous-page.png
-share/icons/hicolor/16x16/stock/navigation/stock_previous.png
-share/icons/hicolor/16x16/stock/navigation/stock_right-with-subpoints.png
-share/icons/hicolor/16x16/stock/navigation/stock_right.png
-share/icons/hicolor/16x16/stock/navigation/stock_top.png
-share/icons/hicolor/16x16/stock/navigation/stock_undo-history.png
-share/icons/hicolor/16x16/stock/navigation/stock_up-with-subpoints.png
-share/icons/hicolor/16x16/stock/navigation/stock_up.png
-share/icons/hicolor/16x16/stock/navigation/stock_zoom-1.png
-share/icons/hicolor/16x16/stock/navigation/stock_zoom-in.png
-share/icons/hicolor/16x16/stock/navigation/stock_zoom-next.png
-share/icons/hicolor/16x16/stock/navigation/stock_zoom-object.png
-share/icons/hicolor/16x16/stock/navigation/stock_zoom-optimal.png
-share/icons/hicolor/16x16/stock/navigation/stock_zoom-out.png
-share/icons/hicolor/16x16/stock/navigation/stock_zoom-page-width.png
-share/icons/hicolor/16x16/stock/navigation/stock_zoom-page.png
-share/icons/hicolor/16x16/stock/navigation/stock_zoom-previous.png
-share/icons/hicolor/16x16/stock/navigation/stock_zoom-shift.png
-share/icons/hicolor/16x16/stock/navigation/stock_zoom.png
-share/icons/hicolor/16x16/stock/net/stock_addressbook.png
-share/icons/hicolor/16x16/stock/net/stock_appointment-reminder-excl.png
-share/icons/hicolor/16x16/stock/net/stock_appointment-reminder.png
-share/icons/hicolor/16x16/stock/net/stock_channel.png
-share/icons/hicolor/16x16/stock/net/stock_connect-to-url.png
-share/icons/hicolor/16x16/stock/net/stock_connect.png
-share/icons/hicolor/16x16/stock/net/stock_contact-list.png
-share/icons/hicolor/16x16/stock/net/stock_contact.png
-share/icons/hicolor/16x16/stock/net/stock_directory-server.png
-share/icons/hicolor/16x16/stock/net/stock_disconnect.png
-share/icons/hicolor/16x16/stock/net/stock_exchange-connector.png
-share/icons/hicolor/16x16/stock/net/stock_groupwise-connector.png
-share/icons/hicolor/16x16/stock/net/stock_hand-signed.png
-share/icons/hicolor/16x16/stock/net/stock_hyperlink-internet-search.png
-share/icons/hicolor/16x16/stock/net/stock_hyperlink-target.png
-share/icons/hicolor/16x16/stock/net/stock_hyperlink-toolbar.png
-share/icons/hicolor/16x16/stock/net/stock_hyperlink.png
-share/icons/hicolor/16x16/stock/net/stock_inbox.png
-share/icons/hicolor/16x16/stock/net/stock_insert-url.png
-share/icons/hicolor/16x16/stock/net/stock_internet.png
-share/icons/hicolor/16x16/stock/net/stock_link.png
-share/icons/hicolor/16x16/stock/net/stock_mail-accounts.png
-share/icons/hicolor/16x16/stock/net/stock_mail-compose.png
-share/icons/hicolor/16x16/stock/net/stock_mail-copy.png
-share/icons/hicolor/16x16/stock/net/stock_mail-filters-apply.png
-share/icons/hicolor/16x16/stock/net/stock_mail-flag-for-followup-done.png
-share/icons/hicolor/16x16/stock/net/stock_mail-flag-for-followup.png
-share/icons/hicolor/16x16/stock/net/stock_mail-forward.png
-share/icons/hicolor/16x16/stock/net/stock_mail-handling.png
-share/icons/hicolor/16x16/stock/net/stock_mail-hide-deleted.png
-share/icons/hicolor/16x16/stock/net/stock_mail-hide-read.png
-share/icons/hicolor/16x16/stock/net/stock_mail-hide-selected.png
-share/icons/hicolor/16x16/stock/net/stock_mail-import.png
-share/icons/hicolor/16x16/stock/net/stock_mail-merge.png
-share/icons/hicolor/16x16/stock/net/stock_mail-move.png
-share/icons/hicolor/16x16/stock/net/stock_mail-open-multiple.png
-share/icons/hicolor/16x16/stock/net/stock_mail-open.png
-share/icons/hicolor/16x16/stock/net/stock_mail-priority-high.png
-share/icons/hicolor/16x16/stock/net/stock_mail-receive.png
-share/icons/hicolor/16x16/stock/net/stock_mail-replied.png
-share/icons/hicolor/16x16/stock/net/stock_mail-reply-to-all.png
-share/icons/hicolor/16x16/stock/net/stock_mail-reply.png
-share/icons/hicolor/16x16/stock/net/stock_mail-send-receive.png
-share/icons/hicolor/16x16/stock/net/stock_mail-send.png
-share/icons/hicolor/16x16/stock/net/stock_mail-unread-multiple.png
-share/icons/hicolor/16x16/stock/net/stock_mail-unread.png
-share/icons/hicolor/16x16/stock/net/stock_mail.png
-share/icons/hicolor/16x16/stock/net/stock_message-display.png
-share/icons/hicolor/16x16/stock/net/stock_not-spam.png
-share/icons/hicolor/16x16/stock/net/stock_online-layout.png
-share/icons/hicolor/16x16/stock/net/stock_outbox.png
-share/icons/hicolor/16x16/stock/net/stock_post-message.png
-share/icons/hicolor/16x16/stock/net/stock_sent-mail.png
-share/icons/hicolor/16x16/stock/net/stock_shared-by-me.png
-share/icons/hicolor/16x16/stock/net/stock_shared-to-me.png
-share/icons/hicolor/16x16/stock/net/stock_spam.png
-share/icons/hicolor/16x16/stock/net/stock_video-conferencing.png
-share/icons/hicolor/16x16/stock/object/stock_3d-3d-attributes-only.png
-share/icons/hicolor/16x16/stock/object/stock_3d-all-attributes.png
-share/icons/hicolor/16x16/stock/object/stock_3d-geometry.png
-share/icons/hicolor/16x16/stock/object/stock_3d-light-off.png
-share/icons/hicolor/16x16/stock/object/stock_3d-light-on.png
-share/icons/hicolor/16x16/stock/object/stock_3d-light.png
-share/icons/hicolor/16x16/stock/object/stock_3d-material.png
-share/icons/hicolor/16x16/stock/object/stock_3d-normals-double-sided-closed-body.png
-share/icons/hicolor/16x16/stock/object/stock_3d-normals-double-sided.png
-share/icons/hicolor/16x16/stock/object/stock_3d-normals-flat.png
-share/icons/hicolor/16x16/stock/object/stock_3d-normals-flip-illumination.png
-share/icons/hicolor/16x16/stock/object/stock_3d-normals-object-specific.png
-share/icons/hicolor/16x16/stock/object/stock_3d-normals-spherical.png
-share/icons/hicolor/16x16/stock/object/stock_3d-perspective.png
-share/icons/hicolor/16x16/stock/object/stock_3d-shading.png
-share/icons/hicolor/16x16/stock/object/stock_3d-texture-and-shading.png
-share/icons/hicolor/16x16/stock/object/stock_3d-texture-object-specific.png
-share/icons/hicolor/16x16/stock/object/stock_3d-texture-only.png
-share/icons/hicolor/16x16/stock/object/stock_3d-texture-parallel.png
-share/icons/hicolor/16x16/stock/object/stock_3d-texture-spherical.png
-share/icons/hicolor/16x16/stock/object/stock_3d-texture.png
-share/icons/hicolor/16x16/stock/object/stock_add-bookmark.png
-share/icons/hicolor/16x16/stock/object/stock_auto-contour.png
-share/icons/hicolor/16x16/stock/object/stock_bookmark.png
-share/icons/hicolor/16x16/stock/object/stock_bring-backward.png
-share/icons/hicolor/16x16/stock/object/stock_bring-forward.png
-share/icons/hicolor/16x16/stock/object/stock_create-with-attributes.png
-share/icons/hicolor/16x16/stock/object/stock_delete-bookmark.png
-share/icons/hicolor/16x16/stock/object/stock_edit-bookmark.png
-share/icons/hicolor/16x16/stock/object/stock_effects-more-options.png
-share/icons/hicolor/16x16/stock/object/stock_effects-object-colorize.png
-share/icons/hicolor/16x16/stock/object/stock_effects-object-hide.png
-share/icons/hicolor/16x16/stock/object/stock_effects-object.png
-share/icons/hicolor/16x16/stock/object/stock_effects-play-in-full.png
-share/icons/hicolor/16x16/stock/object/stock_effects-preview.png
-share/icons/hicolor/16x16/stock/object/stock_effects.png
-share/icons/hicolor/16x16/stock/object/stock_enter-group.png
-share/icons/hicolor/16x16/stock/object/stock_exit-group.png
-share/icons/hicolor/16x16/stock/object/stock_file-with-objects.png
-share/icons/hicolor/16x16/stock/object/stock_format-object.png
-share/icons/hicolor/16x16/stock/object/stock_formula-cursor.png
-share/icons/hicolor/16x16/stock/object/stock_frame.png
-share/icons/hicolor/16x16/stock/object/stock_group.png
-share/icons/hicolor/16x16/stock/object/stock_handles-big.png
-share/icons/hicolor/16x16/stock/object/stock_handles-simple.png
-share/icons/hicolor/16x16/stock/object/stock_insert-applet.png
-share/icons/hicolor/16x16/stock/object/stock_insert-floating-frame.png
-share/icons/hicolor/16x16/stock/object/stock_insert-gluepoint.png
-share/icons/hicolor/16x16/stock/object/stock_insert-math-object.png
-share/icons/hicolor/16x16/stock/object/stock_insert-note.png
-share/icons/hicolor/16x16/stock/object/stock_insert-ole-object.png
-share/icons/hicolor/16x16/stock/object/stock_insert-plugin.png
-share/icons/hicolor/16x16/stock/object/stock_insert-rule.png
-share/icons/hicolor/16x16/stock/object/stock_insert-single-column-text-frame.png
-share/icons/hicolor/16x16/stock/object/stock_insert-slide.png
-share/icons/hicolor/16x16/stock/object/stock_insert-sound-plugin.png
-share/icons/hicolor/16x16/stock/object/stock_insert-text-frame.png
-share/icons/hicolor/16x16/stock/object/stock_insert_graphic.png
-share/icons/hicolor/16x16/stock/object/stock_insert_special_character.png
-share/icons/hicolor/16x16/stock/object/stock_interaction.png
-share/icons/hicolor/16x16/stock/object/stock_new-bcard.png
-share/icons/hicolor/16x16/stock/object/stock_new-window.png
-share/icons/hicolor/16x16/stock/object/stock_object-behind.png
-share/icons/hicolor/16x16/stock/object/stock_object-infront.png
-share/icons/hicolor/16x16/stock/object/stock_pin.png
-share/icons/hicolor/16x16/stock/object/stock_position-size.png
-share/icons/hicolor/16x16/stock/object/stock_reverse-order.png
-share/icons/hicolor/16x16/stock/object/stock_slide-design.png
-share/icons/hicolor/16x16/stock/object/stock_slide-duplicate.png
-share/icons/hicolor/16x16/stock/object/stock_slide-expand.png
-share/icons/hicolor/16x16/stock/object/stock_slide-reherse-timings.png
-share/icons/hicolor/16x16/stock/object/stock_slide-show.png
-share/icons/hicolor/16x16/stock/object/stock_slide-showhide.png
-share/icons/hicolor/16x16/stock/object/stock_snap-grid.png
-share/icons/hicolor/16x16/stock/object/stock_snap-guides.png
-share/icons/hicolor/16x16/stock/object/stock_snap-margins.png
-share/icons/hicolor/16x16/stock/object/stock_snap-object-points.png
-share/icons/hicolor/16x16/stock/object/stock_snap-object.png
-share/icons/hicolor/16x16/stock/object/stock_symbol-selection.png
-share/icons/hicolor/16x16/stock/object/stock_to-3d-rotation-object.png
-share/icons/hicolor/16x16/stock/object/stock_to-3d.png
-share/icons/hicolor/16x16/stock/object/stock_to-bottom.png
-share/icons/hicolor/16x16/stock/object/stock_to-curve.png
-share/icons/hicolor/16x16/stock/object/stock_to-polygon.png
-share/icons/hicolor/16x16/stock/object/stock_to-top.png
-share/icons/hicolor/16x16/stock/object/stock_ungroup.png
-share/icons/hicolor/16x16/stock/object/stock_unlink.png
-share/icons/hicolor/16x16/stock/object/stock_view-function-selection.png
-share/icons/hicolor/16x16/stock/table/stock_alignment-bottom.png
-share/icons/hicolor/16x16/stock/table/stock_alignment-centered-vertically.png
-share/icons/hicolor/16x16/stock/table/stock_alignment-centered.png
-share/icons/hicolor/16x16/stock/table/stock_alignment-left.png
-share/icons/hicolor/16x16/stock/table/stock_alignment-right.png
-share/icons/hicolor/16x16/stock/table/stock_alignment-top.png
-share/icons/hicolor/16x16/stock/table/stock_alignment.png
-share/icons/hicolor/16x16/stock/table/stock_cell-align-bottom.png
-share/icons/hicolor/16x16/stock/table/stock_cell-align-center.png
-share/icons/hicolor/16x16/stock/table/stock_cell-align-top.png
-share/icons/hicolor/16x16/stock/table/stock_choose-themes.png
-share/icons/hicolor/16x16/stock/table/stock_datapilot.png
-share/icons/hicolor/16x16/stock/table/stock_delete-column.png
-share/icons/hicolor/16x16/stock/table/stock_delete-row.png
-share/icons/hicolor/16x16/stock/table/stock_exchange-columns.png
-share/icons/hicolor/16x16/stock/table/stock_exchange-rows.png
-share/icons/hicolor/16x16/stock/table/stock_group-cells.png
-share/icons/hicolor/16x16/stock/table/stock_insert-cells-down.png
-share/icons/hicolor/16x16/stock/table/stock_insert-cells-right.png
-share/icons/hicolor/16x16/stock/table/stock_insert-cells.png
-share/icons/hicolor/16x16/stock/table/stock_insert-columns.png
-share/icons/hicolor/16x16/stock/table/stock_insert-names-define.png
-share/icons/hicolor/16x16/stock/table/stock_insert-rows.png
-share/icons/hicolor/16x16/stock/table/stock_insert-table.png
-share/icons/hicolor/16x16/stock/table/stock_select-cell.png
-share/icons/hicolor/16x16/stock/table/stock_select-column.png
-share/icons/hicolor/16x16/stock/table/stock_select-row.png
-share/icons/hicolor/16x16/stock/table/stock_select-table.png
-share/icons/hicolor/16x16/stock/table/stock_sort-table-column-ascending.png
-share/icons/hicolor/16x16/stock/table/stock_sort-table-row-ascending.png
-share/icons/hicolor/16x16/stock/table/stock_table-align-bottom.png
-share/icons/hicolor/16x16/stock/table/stock_table-align-center.png
-share/icons/hicolor/16x16/stock/table/stock_table-align-top.png
-share/icons/hicolor/16x16/stock/table/stock_table-borders.png
-share/icons/hicolor/16x16/stock/table/stock_table-combine.png
-share/icons/hicolor/16x16/stock/table/stock_table-fit-height.png
-share/icons/hicolor/16x16/stock/table/stock_table-fit-width.png
-share/icons/hicolor/16x16/stock/table/stock_table-fixed-proportional.png
-share/icons/hicolor/16x16/stock/table/stock_table-fixed.png
-share/icons/hicolor/16x16/stock/table/stock_table-line-color.png
-share/icons/hicolor/16x16/stock/table/stock_table-line-style.png
-share/icons/hicolor/16x16/stock/table/stock_table-optimize.png
-share/icons/hicolor/16x16/stock/table/stock_table-same-height.png
-share/icons/hicolor/16x16/stock/table/stock_table-same-width.png
-share/icons/hicolor/16x16/stock/table/stock_table-split.png
-share/icons/hicolor/16x16/stock/table/stock_table-variable.png
-share/icons/hicolor/16x16/stock/table/stock_table_borders.png
-share/icons/hicolor/16x16/stock/table/stock_table_fill.png
-share/icons/hicolor/16x16/stock/table/stock_ungroup-cells.png
-share/icons/hicolor/16x16/stock/text/stock_autoformat.png
-share/icons/hicolor/16x16/stock/text/stock_autospellcheck.png
-share/icons/hicolor/16x16/stock/text/stock_autotext.png
-share/icons/hicolor/16x16/stock/text/stock_chart-scale-text.png
-share/icons/hicolor/16x16/stock/text/stock_decrease-font.png
-share/icons/hicolor/16x16/stock/text/stock_directcursor.png
-share/icons/hicolor/16x16/stock/text/stock_draw-text-animation.png
-share/icons/hicolor/16x16/stock/text/stock_draw-text-frame.png
-share/icons/hicolor/16x16/stock/text/stock_draw-text.png
-share/icons/hicolor/16x16/stock/text/stock_draw-vertical-text-frame.png
-share/icons/hicolor/16x16/stock/text/stock_draw-vertical-text.png
-share/icons/hicolor/16x16/stock/text/stock_edit-contour.png
-share/icons/hicolor/16x16/stock/text/stock_edit-headers-and-footers.png
-share/icons/hicolor/16x16/stock/text/stock_effects-text.png
-share/icons/hicolor/16x16/stock/text/stock_euro.png
-share/icons/hicolor/16x16/stock/text/stock_font-formatting-toggle.png
-share/icons/hicolor/16x16/stock/text/stock_font-size.png
-share/icons/hicolor/16x16/stock/text/stock_font.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-2dshadow.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-3dshadow.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-adaptation-off.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-adaptation-rotate.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-adaptation-slant-h.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-adaptation-slant-v.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-adaptation-straight.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-align-fill.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-noshadow.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-preview-spline.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-reverse-text-flow.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-shadow-angle.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-shadow-length.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-shadow-x-offset.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-shadow-y-offset.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-spline-distance.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-spline-indent.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork-text-border.png
-share/icons/hicolor/16x16/stock/text/stock_fontwork.png
-share/icons/hicolor/16x16/stock/text/stock_format-character.png
-share/icons/hicolor/16x16/stock/text/stock_format-numbering-bullets.png
-share/icons/hicolor/16x16/stock/text/stock_format-paragraph.png
-share/icons/hicolor/16x16/stock/text/stock_increase-font.png
-share/icons/hicolor/16x16/stock/text/stock_insert-caption.png
-share/icons/hicolor/16x16/stock/text/stock_insert-cross-reference.png
-share/icons/hicolor/16x16/stock/text/stock_insert-fields-author.png
-share/icons/hicolor/16x16/stock/text/stock_insert-fields-subject.png
-share/icons/hicolor/16x16/stock/text/stock_insert-fields-title.png
-share/icons/hicolor/16x16/stock/text/stock_insert-footer.png
-share/icons/hicolor/16x16/stock/text/stock_insert-header.png
-share/icons/hicolor/16x16/stock/text/stock_insert_endnote.png
-share/icons/hicolor/16x16/stock/text/stock_insert_footnote.png
-share/icons/hicolor/16x16/stock/text/stock_insert_index_marker.png
-share/icons/hicolor/16x16/stock/text/stock_insert_section.png
-share/icons/hicolor/16x16/stock/text/stock_line-spacing-1.5.png
-share/icons/hicolor/16x16/stock/text/stock_line-spacing-1.png
-share/icons/hicolor/16x16/stock/text/stock_line-spacing-2.png
-share/icons/hicolor/16x16/stock/text/stock_list-insert-unnumbered.png
-share/icons/hicolor/16x16/stock/text/stock_list_bullet.png
-share/icons/hicolor/16x16/stock/text/stock_list_enum-off.png
-share/icons/hicolor/16x16/stock/text/stock_list_enum-restart.png
-share/icons/hicolor/16x16/stock/text/stock_list_enum.png
-share/icons/hicolor/16x16/stock/text/stock_nonprinting-chars.png
-share/icons/hicolor/16x16/stock/text/stock_page-number.png
-share/icons/hicolor/16x16/stock/text/stock_page-total-number.png
-share/icons/hicolor/16x16/stock/text/stock_paragraph-spacing-decrease.png
-share/icons/hicolor/16x16/stock/text/stock_paragraph-spacing-increase.png
-share/icons/hicolor/16x16/stock/text/stock_select-all.png
-share/icons/hicolor/16x16/stock/text/stock_spellcheck.png
-share/icons/hicolor/16x16/stock/text/stock_styles-character-styles.png
-share/icons/hicolor/16x16/stock/text/stock_styles-fill-format-mode.png
-share/icons/hicolor/16x16/stock/text/stock_styles-frame-styles.png
-share/icons/hicolor/16x16/stock/text/stock_styles-new-style-from-selection.png
-share/icons/hicolor/16x16/stock/text/stock_styles-numbering-styles.png
-share/icons/hicolor/16x16/stock/text/stock_styles-page-styles.png
-share/icons/hicolor/16x16/stock/text/stock_styles-paragraph-styles.png
-share/icons/hicolor/16x16/stock/text/stock_styles-update-style.png
-share/icons/hicolor/16x16/stock/text/stock_subscript.png
-share/icons/hicolor/16x16/stock/text/stock_superscript.png
-share/icons/hicolor/16x16/stock/text/stock_text-direction-ltr.png
-share/icons/hicolor/16x16/stock/text/stock_text-direction-ttb.png
-share/icons/hicolor/16x16/stock/text/stock_text-double-click-to-edit.png
-share/icons/hicolor/16x16/stock/text/stock_text-monospaced.png
-share/icons/hicolor/16x16/stock/text/stock_text-outline.png
-share/icons/hicolor/16x16/stock/text/stock_text-quickedit.png
-share/icons/hicolor/16x16/stock/text/stock_text-select-text-only.png
-share/icons/hicolor/16x16/stock/text/stock_text-shadow.png
-share/icons/hicolor/16x16/stock/text/stock_text-spacing.png
-share/icons/hicolor/16x16/stock/text/stock_text-strikethrough.png
-share/icons/hicolor/16x16/stock/text/stock_text_bold.png
-share/icons/hicolor/16x16/stock/text/stock_text_center.png
-share/icons/hicolor/16x16/stock/text/stock_text_color_background.png
-share/icons/hicolor/16x16/stock/text/stock_text_color_foreground.png
-share/icons/hicolor/16x16/stock/text/stock_text_color_hilight.png
-share/icons/hicolor/16x16/stock/text/stock_text_indent.png
-share/icons/hicolor/16x16/stock/text/stock_text_italic.png
-share/icons/hicolor/16x16/stock/text/stock_text_justify.png
-share/icons/hicolor/16x16/stock/text/stock_text_left.png
-share/icons/hicolor/16x16/stock/text/stock_text_right.png
-share/icons/hicolor/16x16/stock/text/stock_text_underlined-double.png
-share/icons/hicolor/16x16/stock/text/stock_text_underlined.png
-share/icons/hicolor/16x16/stock/text/stock_text_unindent.png
-share/icons/hicolor/16x16/stock/text/stock_thesaurus.png
-share/icons/hicolor/16x16/stock/text/stock_to-background.png
-share/icons/hicolor/16x16/stock/text/stock_to-foreground.png
-share/icons/hicolor/16x16/stock/text/stock_tools-hyphenation.png
-share/icons/hicolor/16x16/stock/text/stock_update-fields.png
-share/icons/hicolor/16x16/stock/text/stock_view-field-shadings.png
-share/icons/hicolor/16x16/stock/text/stock_wrap-around.png
-share/icons/hicolor/16x16/stock/text/stock_wrap-behind.png
-share/icons/hicolor/16x16/stock/text/stock_wrap-contour.png
-share/icons/hicolor/16x16/stock/text/stock_wrap-interrupt.png
-share/icons/hicolor/16x16/stock/text/stock_wrap-left.png
-share/icons/hicolor/16x16/stock/text/stock_wrap-optimal.png
-share/icons/hicolor/16x16/stock/text/stock_wrap-right.png
-share/icons/hicolor/192x192/apps/gnome-globe.png
-share/icons/hicolor/24x24/apps/accessibility-directory.png
-share/icons/hicolor/24x24/apps/administration.png
-share/icons/hicolor/24x24/apps/advanced-directory.png
-share/icons/hicolor/24x24/apps/apacheconf.png
-share/icons/hicolor/24x24/apps/applets-screenshooter.png
-share/icons/hicolor/24x24/apps/beep-media-player.png
-share/icons/hicolor/24x24/apps/boot.png
-share/icons/hicolor/24x24/apps/burner.png
-share/icons/hicolor/24x24/apps/character-picker.png
-share/icons/hicolor/24x24/apps/clock.png
-share/icons/hicolor/24x24/apps/config-language.png
-share/icons/hicolor/24x24/apps/config-users.png
-share/icons/hicolor/24x24/apps/display-capplet.png
-share/icons/hicolor/24x24/apps/evolution-calendar.png
-share/icons/hicolor/24x24/apps/evolution-mail.png
-share/icons/hicolor/24x24/apps/evolution-tasks.png
-share/icons/hicolor/24x24/apps/evolution.png
-share/icons/hicolor/24x24/apps/gaim.png
-share/icons/hicolor/24x24/apps/gdm.png
-share/icons/hicolor/24x24/apps/gftp.png
-share/icons/hicolor/24x24/apps/gnome-amusements.png
-share/icons/hicolor/24x24/apps/gnome-applications.png
-share/icons/hicolor/24x24/apps/gnome-audio.png
-share/icons/hicolor/24x24/apps/gnome-calculator.png
-share/icons/hicolor/24x24/apps/gnome-cdplayer-icon.png
-share/icons/hicolor/24x24/apps/gnome-control-center.png
-share/icons/hicolor/24x24/apps/gnome-cpu.png
-share/icons/hicolor/24x24/apps/gnome-desktop-config.png
-share/icons/hicolor/24x24/apps/gnome-devel.png
-share/icons/hicolor/24x24/apps/gnome-eyes.png
-share/icons/hicolor/24x24/apps/gnome-favorites.png
-share/icons/hicolor/24x24/apps/gnome-finance.png
-share/icons/hicolor/24x24/apps/gnome-globe.png
-share/icons/hicolor/24x24/apps/gnome-gnomine.png
-share/icons/hicolor/24x24/apps/gnome-graphics.png
-share/icons/hicolor/24x24/apps/gnome-gsame.png
-share/icons/hicolor/24x24/apps/gnome-help.png
-share/icons/hicolor/24x24/apps/gnome-joystick.png
-share/icons/hicolor/24x24/apps/gnome-lockscreen.png
-share/icons/hicolor/24x24/apps/gnome-logout.png
-share/icons/hicolor/24x24/apps/gnome-mini-commander.png
-share/icons/hicolor/24x24/apps/gnome-modem.png
-share/icons/hicolor/24x24/apps/gnome-money.png
-share/icons/hicolor/24x24/apps/gnome-monitor.png
-share/icons/hicolor/24x24/apps/gnome-multimedia.png
-share/icons/hicolor/24x24/apps/gnome-netstatus-disconn.png
-share/icons/hicolor/24x24/apps/gnome-netstatus-error.png
-share/icons/hicolor/24x24/apps/gnome-netstatus-idle.png
-share/icons/hicolor/24x24/apps/gnome-netstatus-rx.png
-share/icons/hicolor/24x24/apps/gnome-netstatus-tx.png
-share/icons/hicolor/24x24/apps/gnome-netstatus-txrx.png
-share/icons/hicolor/24x24/apps/gnome-networktool.png
-share/icons/hicolor/24x24/apps/gnome-nibbles.png
-share/icons/hicolor/24x24/apps/gnome-office.png
-share/icons/hicolor/24x24/apps/gnome-panel.png
-share/icons/hicolor/24x24/apps/gnome-run.png
-share/icons/hicolor/24x24/apps/gnome-searchtool.png
-share/icons/hicolor/24x24/apps/gnome-session.png
-share/icons/hicolor/24x24/apps/gnome-settings-background.png
-share/icons/hicolor/24x24/apps/gnome-settings-font.png
-share/icons/hicolor/24x24/apps/gnome-settings-keybindings.png
-share/icons/hicolor/24x24/apps/gnome-settings-sound.png
-share/icons/hicolor/24x24/apps/gnome-settings-theme.png
-share/icons/hicolor/24x24/apps/gnome-settings-ui-behavior.png
-share/icons/hicolor/24x24/apps/gnome-settings.png
-share/icons/hicolor/24x24/apps/gnome-shutdown.png
-share/icons/hicolor/24x24/apps/gnome-status.png
-share/icons/hicolor/24x24/apps/gnome-terminal.png
-share/icons/hicolor/24x24/apps/gnome-unknown.png
-share/icons/hicolor/24x24/apps/gnome-window-manager.png
-share/icons/hicolor/24x24/apps/image-viewer.png
-share/icons/hicolor/24x24/apps/ooo_calc.png
-share/icons/hicolor/24x24/apps/ooo_draw.png
-share/icons/hicolor/24x24/apps/ooo_gulls.png
-share/icons/hicolor/24x24/apps/ooo_impress.png
-share/icons/hicolor/24x24/apps/ooo_math.png
-share/icons/hicolor/24x24/apps/ooo_printeradmin.png
-share/icons/hicolor/24x24/apps/ooo_template.png
-share/icons/hicolor/24x24/apps/ooo_web.png
-share/icons/hicolor/24x24/apps/ooo_writer.png
-share/icons/hicolor/24x24/apps/panel-notification-area.png
-share/icons/hicolor/24x24/apps/panel-window-list.png
-share/icons/hicolor/24x24/apps/panel-window-menu.png
-share/icons/hicolor/24x24/apps/postscript-viewer.png
-share/icons/hicolor/24x24/apps/screensaver.png
-share/icons/hicolor/24x24/apps/shares.png
-share/icons/hicolor/24x24/apps/stock-ticker.png
-share/icons/hicolor/24x24/apps/text-editor.png
-share/icons/hicolor/24x24/apps/tsclient.png
-share/icons/hicolor/24x24/apps/volume-knob.png
-share/icons/hicolor/24x24/filesystems/gnome-fs-locally-shared.png
-share/icons/hicolor/24x24/filesystems/gnome-fs-share-private.png
-share/icons/hicolor/24x24/stock/chart/stock_chart-autoformat.png
-share/icons/hicolor/24x24/stock/chart/stock_chart-data-in-columns.png
-share/icons/hicolor/24x24/stock/chart/stock_chart-data-in-rows.png
-share/icons/hicolor/24x24/stock/chart/stock_chart-edit-type.png
-share/icons/hicolor/24x24/stock/chart/stock_chart-reorganize.png
-share/icons/hicolor/24x24/stock/chart/stock_chart-toggle-axes-title.png
-share/icons/hicolor/24x24/stock/chart/stock_chart-toggle-axes.png
-share/icons/hicolor/24x24/stock/chart/stock_chart-toggle-hgrid.png
-share/icons/hicolor/24x24/stock/chart/stock_chart-toggle-legend.png
-share/icons/hicolor/24x24/stock/chart/stock_chart-toggle-title.png
-share/icons/hicolor/24x24/stock/chart/stock_chart-toggle-vgrid.png
-share/icons/hicolor/24x24/stock/chart/stock_glue.png
-share/icons/hicolor/24x24/stock/chart/stock_gluepoint-down.png
-share/icons/hicolor/24x24/stock/chart/stock_gluepoint-horizontal-center.png
-share/icons/hicolor/24x24/stock/chart/stock_gluepoint-horizontal-left.png
-share/icons/hicolor/24x24/stock/chart/stock_gluepoint-horizontal-right.png
-share/icons/hicolor/24x24/stock/chart/stock_gluepoint-left.png
-share/icons/hicolor/24x24/stock/chart/stock_gluepoint-relative.png
-share/icons/hicolor/24x24/stock/chart/stock_gluepoint-right.png
-share/icons/hicolor/24x24/stock/chart/stock_gluepoint-up.png
-share/icons/hicolor/24x24/stock/chart/stock_gluepoint-vertical-bottom.png
-share/icons/hicolor/24x24/stock/chart/stock_gluepoint-vertical-center.png
-share/icons/hicolor/24x24/stock/chart/stock_gluepoint-vertical-top.png
-share/icons/hicolor/24x24/stock/chart/stock_insert-chart.png
-share/icons/hicolor/24x24/stock/code/stock_compile.png
-share/icons/hicolor/24x24/stock/code/stock_error-next-16.png
-share/icons/hicolor/24x24/stock/code/stock_error-previous-16.png
-share/icons/hicolor/24x24/stock/code/stock_macro-check-brackets.png
-share/icons/hicolor/24x24/stock/code/stock_macro-insert-breakpoint.png
-share/icons/hicolor/24x24/stock/code/stock_macro-insert.png
-share/icons/hicolor/24x24/stock/code/stock_macro-jump-back.png
-share/icons/hicolor/24x24/stock/code/stock_macro-objects.png
-share/icons/hicolor/24x24/stock/code/stock_macro-organizer.png
-share/icons/hicolor/24x24/stock/code/stock_macro-stop-after-command.png
-share/icons/hicolor/24x24/stock/code/stock_macro-stop-after-procedure.png
-share/icons/hicolor/24x24/stock/code/stock_macro-stop-watching.png
-share/icons/hicolor/24x24/stock/code/stock_macro-watch-variable.png
-share/icons/hicolor/24x24/stock/code/stock_record-macro.png
-share/icons/hicolor/24x24/stock/code/stock_run-macro.png
-share/icons/hicolor/24x24/stock/code/stock_script.png
-share/icons/hicolor/24x24/stock/code/stock_tools-macro.png
-share/icons/hicolor/24x24/stock/data/stock_add-decimal-place.png
-share/icons/hicolor/24x24/stock/data/stock_advanced-filter.png
-share/icons/hicolor/24x24/stock/data/stock_autofilter.png
-share/icons/hicolor/24x24/stock/data/stock_data-delete-record.png
-share/icons/hicolor/24x24/stock/data/stock_data-explorer.png
-share/icons/hicolor/24x24/stock/data/stock_data-first.png
-share/icons/hicolor/24x24/stock/data/stock_data-last.png
-share/icons/hicolor/24x24/stock/data/stock_data-linked-table.png
-share/icons/hicolor/24x24/stock/data/stock_data-new-record.png
-share/icons/hicolor/24x24/stock/data/stock_data-next.png
-share/icons/hicolor/24x24/stock/data/stock_data-previous.png
-share/icons/hicolor/24x24/stock/data/stock_data-save.png
-share/icons/hicolor/24x24/stock/data/stock_data-sources.png
-share/icons/hicolor/24x24/stock/data/stock_data-undo.png
-share/icons/hicolor/24x24/stock/data/stock_database.png
-share/icons/hicolor/24x24/stock/data/stock_delete-autofilter.png
-share/icons/hicolor/24x24/stock/data/stock_delete-decimal-place.png
-share/icons/hicolor/24x24/stock/data/stock_filter-data-by-criteria.png
-share/icons/hicolor/24x24/stock/data/stock_filter-navigator.png
-share/icons/hicolor/24x24/stock/data/stock_filters.png
-share/icons/hicolor/24x24/stock/data/stock_format-default.png
-share/icons/hicolor/24x24/stock/data/stock_format-percent.png
-share/icons/hicolor/24x24/stock/data/stock_format-scientific.png
-share/icons/hicolor/24x24/stock/data/stock_function-autopilot.png
-share/icons/hicolor/24x24/stock/data/stock_goal-seek.png
-share/icons/hicolor/24x24/stock/data/stock_insert-fields.png
-share/icons/hicolor/24x24/stock/data/stock_lock-broken.png
-share/icons/hicolor/24x24/stock/data/stock_lock-ok.png
-share/icons/hicolor/24x24/stock/data/stock_lock-open.png
-share/icons/hicolor/24x24/stock/data/stock_lock.png
-share/icons/hicolor/24x24/stock/data/stock_record-number.png
-share/icons/hicolor/24x24/stock/data/stock_signature-bad.png
-share/icons/hicolor/24x24/stock/data/stock_signature-ok.png
-share/icons/hicolor/24x24/stock/data/stock_signature.png
-share/icons/hicolor/24x24/stock/data/stock_sort-ascending.png
-share/icons/hicolor/24x24/stock/data/stock_sort-column-ascending.png
-share/icons/hicolor/24x24/stock/data/stock_sort-criteria.png
-share/icons/hicolor/24x24/stock/data/stock_sort-descending.png
-share/icons/hicolor/24x24/stock/data/stock_sort-row-ascending.png
-share/icons/hicolor/24x24/stock/data/stock_standard-filter.png
-share/icons/hicolor/24x24/stock/data/stock_sum.png
-share/icons/hicolor/24x24/stock/data/stock_update-data.png
-share/icons/hicolor/24x24/stock/document/stock_attach.png
-share/icons/hicolor/24x24/stock/document/stock_certificate.png
-share/icons/hicolor/24x24/stock/document/stock_new-drawing.png
-share/icons/hicolor/24x24/stock/document/stock_new-formula.png
-share/icons/hicolor/24x24/stock/document/stock_new-html.png
-share/icons/hicolor/24x24/stock/document/stock_new-labels.png
-share/icons/hicolor/24x24/stock/document/stock_new-master-document.png
-share/icons/hicolor/24x24/stock/document/stock_new-presentation.png
-share/icons/hicolor/24x24/stock/document/stock_new-spreadsheet.png
-share/icons/hicolor/24x24/stock/document/stock_new-template.png
-share/icons/hicolor/24x24/stock/document/stock_new-text.png
-share/icons/hicolor/24x24/stock/document/stock_new.png
-share/icons/hicolor/24x24/stock/document/stock_preview-four-pages.png
-share/icons/hicolor/24x24/stock/document/stock_preview-two-pages.png
-share/icons/hicolor/24x24/stock/document/stock_print-layout.png
-share/icons/hicolor/24x24/stock/document/stock_print-options.png
-share/icons/hicolor/24x24/stock/document/stock_print-resolution.png
-share/icons/hicolor/24x24/stock/document/stock_task-assigned-to.png
-share/icons/hicolor/24x24/stock/document/stock_task-assigned.png
-share/icons/hicolor/24x24/stock/document/stock_task-recurring.png
-share/icons/hicolor/24x24/stock/document/stock_task.png
-share/icons/hicolor/24x24/stock/document/stock_todo.png
-share/icons/hicolor/24x24/stock/document/stock_view-html-source.png
-share/icons/hicolor/24x24/stock/form/stock_form-activation-order.png
-share/icons/hicolor/24x24/stock/form/stock_form-add-field.png
-share/icons/hicolor/24x24/stock/form/stock_form-automatic-control-focus.png
-share/icons/hicolor/24x24/stock/form/stock_form-autopilots.png
-share/icons/hicolor/24x24/stock/form/stock_form-button.png
-share/icons/hicolor/24x24/stock/form/stock_form-checkbox.png
-share/icons/hicolor/24x24/stock/form/stock_form-combobox.png
-share/icons/hicolor/24x24/stock/form/stock_form-control-properties.png
-share/icons/hicolor/24x24/stock/form/stock_form-currency-field.png
-share/icons/hicolor/24x24/stock/form/stock_form-date-field.png
-share/icons/hicolor/24x24/stock/form/stock_form-design-mode.png
-share/icons/hicolor/24x24/stock/form/stock_form-file-selection.png
-share/icons/hicolor/24x24/stock/form/stock_form-formatted-field.png
-share/icons/hicolor/24x24/stock/form/stock_form-frame.png
-share/icons/hicolor/24x24/stock/form/stock_form-image-button.png
-share/icons/hicolor/24x24/stock/form/stock_form-image-control.png
-share/icons/hicolor/24x24/stock/form/stock_form-label.png
-share/icons/hicolor/24x24/stock/form/stock_form-letter-dialog.png
-share/icons/hicolor/24x24/stock/form/stock_form-line-horizontal.png
-share/icons/hicolor/24x24/stock/form/stock_form-line-vertical.png
-share/icons/hicolor/24x24/stock/form/stock_form-listbox.png
-share/icons/hicolor/24x24/stock/form/stock_form-navigator.png
-share/icons/hicolor/24x24/stock/form/stock_form-numerical-field.png
-share/icons/hicolor/24x24/stock/form/stock_form-open-in-design-mode.png
-share/icons/hicolor/24x24/stock/form/stock_form-pattern-field.png
-share/icons/hicolor/24x24/stock/form/stock_form-progressbar.png
-share/icons/hicolor/24x24/stock/form/stock_form-properties.png
-share/icons/hicolor/24x24/stock/form/stock_form-radio.png
-share/icons/hicolor/24x24/stock/form/stock_form-table-control.png
-share/icons/hicolor/24x24/stock/form/stock_form-text-box.png
-share/icons/hicolor/24x24/stock/form/stock_form-time-field.png
-share/icons/hicolor/24x24/stock/form/stock_insert-form.png
-share/icons/hicolor/24x24/stock/form/stock_macro-controls.png
-share/icons/hicolor/24x24/stock/form/stock_show-form-dialog.png
-share/icons/hicolor/24x24/stock/form/stock_show-hidden-controls.png
-share/icons/hicolor/24x24/stock/form/stock_view-fields.png
-share/icons/hicolor/24x24/stock/generic/stock_about.png
-share/icons/hicolor/24x24/stock/generic/stock_active.png
-share/icons/hicolor/24x24/stock/generic/stock_allow-effects.png
-share/icons/hicolor/24x24/stock/generic/stock_anchor.png
-share/icons/hicolor/24x24/stock/generic/stock_animation.png
-share/icons/hicolor/24x24/stock/generic/stock_autocompletion.png
-share/icons/hicolor/24x24/stock/generic/stock_autopilot-24.png
-share/icons/hicolor/24x24/stock/generic/stock_book_blue.png
-share/icons/hicolor/24x24/stock/generic/stock_book_green.png
-share/icons/hicolor/24x24/stock/generic/stock_book_open.png
-share/icons/hicolor/24x24/stock/generic/stock_book_red.png
-share/icons/hicolor/24x24/stock/generic/stock_book_yellow.png
-share/icons/hicolor/24x24/stock/generic/stock_briefcase.png
-share/icons/hicolor/24x24/stock/generic/stock_calc-accept.png
-share/icons/hicolor/24x24/stock/generic/stock_calc-cancel.png
-share/icons/hicolor/24x24/stock/generic/stock_calendar-and-tasks.png
-share/icons/hicolor/24x24/stock/generic/stock_calendar-view-day.png
-share/icons/hicolor/24x24/stock/generic/stock_calendar-view-list.png
-share/icons/hicolor/24x24/stock/generic/stock_calendar-view-month.png
-share/icons/hicolor/24x24/stock/generic/stock_calendar-view-week.png
-share/icons/hicolor/24x24/stock/generic/stock_calendar-view-work-week.png
-share/icons/hicolor/24x24/stock/generic/stock_calendar-view-year.png
-share/icons/hicolor/24x24/stock/generic/stock_calendar.png
-share/icons/hicolor/24x24/stock/generic/stock_cell-phone.png
-share/icons/hicolor/24x24/stock/generic/stock_close.png
-share/icons/hicolor/24x24/stock/generic/stock_color.png
-share/icons/hicolor/24x24/stock/generic/stock_copy.png
-share/icons/hicolor/24x24/stock/generic/stock_cut.png
-share/icons/hicolor/24x24/stock/generic/stock_delete.png
-share/icons/hicolor/24x24/stock/generic/stock_dialog-error.png
-share/icons/hicolor/24x24/stock/generic/stock_dialog-info.png
-share/icons/hicolor/24x24/stock/generic/stock_dialog-warning.png
-share/icons/hicolor/24x24/stock/generic/stock_edit.png
-share/icons/hicolor/24x24/stock/generic/stock_equals.png
-share/icons/hicolor/24x24/stock/generic/stock_example.png
-share/icons/hicolor/24x24/stock/generic/stock_exit.png
-share/icons/hicolor/24x24/stock/generic/stock_extended-help.png
-share/icons/hicolor/24x24/stock/generic/stock_file-properties.png
-share/icons/hicolor/24x24/stock/generic/stock_flip-horizontally.png
-share/icons/hicolor/24x24/stock/generic/stock_flip-vertically.png
-share/icons/hicolor/24x24/stock/generic/stock_folder-copy.png
-share/icons/hicolor/24x24/stock/generic/stock_folder-move.png
-share/icons/hicolor/24x24/stock/generic/stock_folder-properties.png
-share/icons/hicolor/24x24/stock/generic/stock_folder.png
-share/icons/hicolor/24x24/stock/generic/stock_format-page.png
-share/icons/hicolor/24x24/stock/generic/stock_fullscreen.png
-share/icons/hicolor/24x24/stock/generic/stock_help-agent.png
-share/icons/hicolor/24x24/stock/generic/stock_help-chat.png
-share/icons/hicolor/24x24/stock/generic/stock_help.png
-share/icons/hicolor/24x24/stock/generic/stock_home.png
-share/icons/hicolor/24x24/stock/generic/stock_id.png
-share/icons/hicolor/24x24/stock/generic/stock_keyring.png
-share/icons/hicolor/24x24/stock/generic/stock_landline-phone.png
-share/icons/hicolor/24x24/stock/generic/stock_leave-fullscreen.png
-share/icons/hicolor/24x24/stock/generic/stock_mark.png
-share/icons/hicolor/24x24/stock/generic/stock_new-24h-appointment.png
-share/icons/hicolor/24x24/stock/generic/stock_new-appointment.png
-share/icons/hicolor/24x24/stock/generic/stock_new-meeting.png
-share/icons/hicolor/24x24/stock/generic/stock_news.png
-share/icons/hicolor/24x24/stock/generic/stock_not.png
-share/icons/hicolor/24x24/stock/generic/stock_notebook.png
-share/icons/hicolor/24x24/stock/generic/stock_notes.png
-share/icons/hicolor/24x24/stock/generic/stock_paste.png
-share/icons/hicolor/24x24/stock/generic/stock_people.png
-share/icons/hicolor/24x24/stock/generic/stock_person.png
-share/icons/hicolor/24x24/stock/generic/stock_presentation-box.png
-share/icons/hicolor/24x24/stock/generic/stock_properties.png
-share/icons/hicolor/24x24/stock/generic/stock_redo.png
-share/icons/hicolor/24x24/stock/generic/stock_refresh.png
-share/icons/hicolor/24x24/stock/generic/stock_scores.png
-share/icons/hicolor/24x24/stock/generic/stock_search-and-replace.png
-share/icons/hicolor/24x24/stock/generic/stock_search.png
-share/icons/hicolor/24x24/stock/generic/stock_send-fax.png
-share/icons/hicolor/24x24/stock/generic/stock_show-all.png
-share/icons/hicolor/24x24/stock/generic/stock_stop.png
-share/icons/hicolor/24x24/stock/generic/stock_styles.png
-share/icons/hicolor/24x24/stock/generic/stock_summary.png
-share/icons/hicolor/24x24/stock/generic/stock_test-mode.png
-share/icons/hicolor/24x24/stock/generic/stock_timer.png
-share/icons/hicolor/24x24/stock/generic/stock_timer_stopped.png
-share/icons/hicolor/24x24/stock/generic/stock_timezone.png
-share/icons/hicolor/24x24/stock/generic/stock_toilet-paper.png
-share/icons/hicolor/24x24/stock/generic/stock_trash_full.png
-share/icons/hicolor/24x24/stock/generic/stock_undelete.png
-share/icons/hicolor/24x24/stock/generic/stock_undo.png
-share/icons/hicolor/24x24/stock/generic/stock_unknown.png
-share/icons/hicolor/24x24/stock/generic/stock_web-calendar.png
-share/icons/hicolor/24x24/stock/generic/stock_web-support.png
-share/icons/hicolor/24x24/stock/image/stock_3d-color-picker.png
-share/icons/hicolor/24x24/stock/image/stock_3d-effects.png
-share/icons/hicolor/24x24/stock/image/stock_arrowstyle.png
-share/icons/hicolor/24x24/stock/image/stock_brightness.png
-share/icons/hicolor/24x24/stock/image/stock_bucketfill.png
-share/icons/hicolor/24x24/stock/image/stock_channel-blue.png
-share/icons/hicolor/24x24/stock/image/stock_channel-green.png
-share/icons/hicolor/24x24/stock/image/stock_channel-red.png
-share/icons/hicolor/24x24/stock/image/stock_contrast.png
-share/icons/hicolor/24x24/stock/image/stock_crop.png
-share/icons/hicolor/24x24/stock/image/stock_display-grid.png
-share/icons/hicolor/24x24/stock/image/stock_distort.png
-share/icons/hicolor/24x24/stock/image/stock_draw-arc.png
-share/icons/hicolor/24x24/stock/image/stock_draw-callouts.png
-share/icons/hicolor/24x24/stock/image/stock_draw-circle-arc.png
-share/icons/hicolor/24x24/stock/image/stock_draw-circle-pie-unfilled.png
-share/icons/hicolor/24x24/stock/image/stock_draw-circle-pie.png
-share/icons/hicolor/24x24/stock/image/stock_draw-circle-segment-unfilled.png
-share/icons/hicolor/24x24/stock/image/stock_draw-circle-segment.png
-share/icons/hicolor/24x24/stock/image/stock_draw-circle-unfilled.png
-share/icons/hicolor/24x24/stock/image/stock_draw-circle.png
-share/icons/hicolor/24x24/stock/image/stock_draw-cone.png
-share/icons/hicolor/24x24/stock/image/stock_draw-connector-ends-with-arrow.png
-share/icons/hicolor/24x24/stock/image/stock_draw-connector-ends-with-circle.png
-share/icons/hicolor/24x24/stock/image/stock_draw-connector-starts-with-arrow.png
-share/icons/hicolor/24x24/stock/image/stock_draw-connector-starts-with-circle.png
-share/icons/hicolor/24x24/stock/image/stock_draw-connector-with-arrows.png
-share/icons/hicolor/24x24/stock/image/stock_draw-connector-with-circles.png
-share/icons/hicolor/24x24/stock/image/stock_draw-connector.png
-share/icons/hicolor/24x24/stock/image/stock_draw-cube.png
-share/icons/hicolor/24x24/stock/image/stock_draw-curve-filled.png
-share/icons/hicolor/24x24/stock/image/stock_draw-curve.png
-share/icons/hicolor/24x24/stock/image/stock_draw-curved-connector-ends-with-arrow.png
-share/icons/hicolor/24x24/stock/image/stock_draw-curved-connector-ends-with-circle.png
-share/icons/hicolor/24x24/stock/image/stock_draw-curved-connector-starts-with-arrow.png
-share/icons/hicolor/24x24/stock/image/stock_draw-curved-connector-starts-with-circle.png
-share/icons/hicolor/24x24/stock/image/stock_draw-curved-connector-with-arrows.png
-share/icons/hicolor/24x24/stock/image/stock_draw-curved-connector-with-circles.png
-share/icons/hicolor/24x24/stock/image/stock_draw-curved-connector.png
-share/icons/hicolor/24x24/stock/image/stock_draw-cylinder.png
-share/icons/hicolor/24x24/stock/image/stock_draw-dimension-line.png
-share/icons/hicolor/24x24/stock/image/stock_draw-ellipse-pie-unfilled.png
-share/icons/hicolor/24x24/stock/image/stock_draw-ellipse-pie.png
-share/icons/hicolor/24x24/stock/image/stock_draw-ellipse-segment-unfilled.png
-share/icons/hicolor/24x24/stock/image/stock_draw-ellipse-segment.png
-share/icons/hicolor/24x24/stock/image/stock_draw-ellipse-unfilled.png
-share/icons/hicolor/24x24/stock/image/stock_draw-ellipse.png
-share/icons/hicolor/24x24/stock/image/stock_draw-freeform-line-filled.png
-share/icons/hicolor/24x24/stock/image/stock_draw-freeform-line.png
-share/icons/hicolor/24x24/stock/image/stock_draw-half-sphere.png
-share/icons/hicolor/24x24/stock/image/stock_draw-line-45.png
-share/icons/hicolor/24x24/stock/image/stock_draw-line-connector-ends-with-arrow.png
-share/icons/hicolor/24x24/stock/image/stock_draw-line-connector-ends-with-circle.png
-share/icons/hicolor/24x24/stock/image/stock_draw-line-connector-starts-with-arrow.png
-share/icons/hicolor/24x24/stock/image/stock_draw-line-connector-starts-with-circle.png
-share/icons/hicolor/24x24/stock/image/stock_draw-line-connector-with-arrows.png
-share/icons/hicolor/24x24/stock/image/stock_draw-line-connector-with-circles.png
-share/icons/hicolor/24x24/stock/image/stock_draw-line-connector.png
-share/icons/hicolor/24x24/stock/image/stock_draw-line-ends-with-arrow.png
-share/icons/hicolor/24x24/stock/image/stock_draw-line-starts-with-arrow.png
-share/icons/hicolor/24x24/stock/image/stock_draw-line-with-arrow-circle.png
-share/icons/hicolor/24x24/stock/image/stock_draw-line-with-arrow-square.png
-share/icons/hicolor/24x24/stock/image/stock_draw-line-with-arrows.png
-share/icons/hicolor/24x24/stock/image/stock_draw-line-with-circle-arrow.png
-share/icons/hicolor/24x24/stock/image/stock_draw-line-with-square-arrow.png
-share/icons/hicolor/24x24/stock/image/stock_draw-line.png
-share/icons/hicolor/24x24/stock/image/stock_draw-polygon-45-filled.png
-share/icons/hicolor/24x24/stock/image/stock_draw-polygon-45.png
-share/icons/hicolor/24x24/stock/image/stock_draw-polygon-filled.png
-share/icons/hicolor/24x24/stock/image/stock_draw-polygon.png
-share/icons/hicolor/24x24/stock/image/stock_draw-pyramid.png
-share/icons/hicolor/24x24/stock/image/stock_draw-rectangle-unfilled.png
-share/icons/hicolor/24x24/stock/image/stock_draw-rectangle.png
-share/icons/hicolor/24x24/stock/image/stock_draw-rounded-rectangle-unfilled.png
-share/icons/hicolor/24x24/stock/image/stock_draw-rounded-rectangle.png
-share/icons/hicolor/24x24/stock/image/stock_draw-rounded-square-unfilled.png
-share/icons/hicolor/24x24/stock/image/stock_draw-rounded-square.png
-share/icons/hicolor/24x24/stock/image/stock_draw-selection.png
-share/icons/hicolor/24x24/stock/image/stock_draw-shell.png
-share/icons/hicolor/24x24/stock/image/stock_draw-sphere.png
-share/icons/hicolor/24x24/stock/image/stock_draw-square-unfilled.png
-share/icons/hicolor/24x24/stock/image/stock_draw-square.png
-share/icons/hicolor/24x24/stock/image/stock_draw-straight-connector-ends-with-arrow.png
-share/icons/hicolor/24x24/stock/image/stock_draw-straight-connector-ends-with-circle.png
-share/icons/hicolor/24x24/stock/image/stock_draw-straight-connector-starts-with-arrow.png
-share/icons/hicolor/24x24/stock/image/stock_draw-straight-connector-starts-with-circle.png
-share/icons/hicolor/24x24/stock/image/stock_draw-straight-connector-with-arrows.png
-share/icons/hicolor/24x24/stock/image/stock_draw-straight-connector-with-circles.png
-share/icons/hicolor/24x24/stock/image/stock_draw-straight-connector.png
-share/icons/hicolor/24x24/stock/image/stock_draw-torus.png
-share/icons/hicolor/24x24/stock/image/stock_draw-vertical-callouts.png
-share/icons/hicolor/24x24/stock/image/stock_edit-points.png
-share/icons/hicolor/24x24/stock/image/stock_filters-aging.png
-share/icons/hicolor/24x24/stock/image/stock_filters-charcoal.png
-share/icons/hicolor/24x24/stock/image/stock_filters-invert.png
-share/icons/hicolor/24x24/stock/image/stock_filters-pixelize.png
-share/icons/hicolor/24x24/stock/image/stock_filters-pop-art.png
-share/icons/hicolor/24x24/stock/image/stock_filters-posterize.png
-share/icons/hicolor/24x24/stock/image/stock_filters-relief.png
-share/icons/hicolor/24x24/stock/image/stock_filters-remove-noise.png
-share/icons/hicolor/24x24/stock/image/stock_filters-sharpen.png
-share/icons/hicolor/24x24/stock/image/stock_filters-smooth.png
-share/icons/hicolor/24x24/stock/image/stock_filters-solarize.png
-share/icons/hicolor/24x24/stock/image/stock_flip.png
-share/icons/hicolor/24x24/stock/image/stock_gamma.png
-share/icons/hicolor/24x24/stock/image/stock_gradient.png
-share/icons/hicolor/24x24/stock/image/stock_graphics-align-bottom.png
-share/icons/hicolor/24x24/stock/image/stock_graphics-align-center.png
-share/icons/hicolor/24x24/stock/image/stock_graphics-align-centered.png
-share/icons/hicolor/24x24/stock/image/stock_graphics-align-left.png
-share/icons/hicolor/24x24/stock/image/stock_graphics-align-right.png
-share/icons/hicolor/24x24/stock/image/stock_graphics-align-top.png
-share/icons/hicolor/24x24/stock/image/stock_guides.png
-share/icons/hicolor/24x24/stock/image/stock_imagemap-editor.png
-share/icons/hicolor/24x24/stock/image/stock_insert_image.png
-share/icons/hicolor/24x24/stock/image/stock_linepen.png
-share/icons/hicolor/24x24/stock/image/stock_modify-layout.png
-share/icons/hicolor/24x24/stock/image/stock_node-add.png
-share/icons/hicolor/24x24/stock/image/stock_node-close-path.png
-share/icons/hicolor/24x24/stock/image/stock_node-convert.png
-share/icons/hicolor/24x24/stock/image/stock_node-corner-to-smooth.png
-share/icons/hicolor/24x24/stock/image/stock_node-corner.png
-share/icons/hicolor/24x24/stock/image/stock_node-curve-split.png
-share/icons/hicolor/24x24/stock/image/stock_node-delete.png
-share/icons/hicolor/24x24/stock/image/stock_node-mark-for-deletion.png
-share/icons/hicolor/24x24/stock/image/stock_node-move.png
-share/icons/hicolor/24x24/stock/image/stock_node-smooth-to-symmetrical.png
-share/icons/hicolor/24x24/stock/image/stock_placeholder-graphic.png
-share/icons/hicolor/24x24/stock/image/stock_placeholder-line-contour.png
-share/icons/hicolor/24x24/stock/image/stock_placeholder-picture.png
-share/icons/hicolor/24x24/stock/image/stock_placeholder-text.png
-share/icons/hicolor/24x24/stock/image/stock_quickmask.png
-share/icons/hicolor/24x24/stock/image/stock_rotate-3d.png
-share/icons/hicolor/24x24/stock/image/stock_rotate.png
-share/icons/hicolor/24x24/stock/image/stock_rotation-mode.png
-share/icons/hicolor/24x24/stock/image/stock_shadow.png
-share/icons/hicolor/24x24/stock/image/stock_show-draw-functions.png
-share/icons/hicolor/24x24/stock/image/stock_toggle-graphics.png
-share/icons/hicolor/24x24/stock/io/stock_bluetooth.png
-share/icons/hicolor/24x24/stock/io/stock_export.png
-share/icons/hicolor/24x24/stock/io/stock_insert-file.png
-share/icons/hicolor/24x24/stock/io/stock_network-printer.png
-share/icons/hicolor/24x24/stock/io/stock_open.png
-share/icons/hicolor/24x24/stock/io/stock_print-driver.png
-share/icons/hicolor/24x24/stock/io/stock_print-preview-print.png
-share/icons/hicolor/24x24/stock/io/stock_print-preview.png
-share/icons/hicolor/24x24/stock/io/stock_print-setup.png
-share/icons/hicolor/24x24/stock/io/stock_print.png
-share/icons/hicolor/24x24/stock/io/stock_printers.png
-share/icons/hicolor/24x24/stock/io/stock_reload.png
-share/icons/hicolor/24x24/stock/io/stock_save-as.png
-share/icons/hicolor/24x24/stock/io/stock_save-pdf.png
-share/icons/hicolor/24x24/stock/io/stock_save-template.png
-share/icons/hicolor/24x24/stock/io/stock_save.png
-share/icons/hicolor/24x24/stock/io/stock_save_as.png
-share/icons/hicolor/24x24/stock/navigation/stock_bottom.png
-share/icons/hicolor/24x24/stock/navigation/stock_down-with-subpoints.png
-share/icons/hicolor/24x24/stock/navigation/stock_down.png
-share/icons/hicolor/24x24/stock/navigation/stock_first-page.png
-share/icons/hicolor/24x24/stock/navigation/stock_first.png
-share/icons/hicolor/24x24/stock/navigation/stock_last-page.png
-share/icons/hicolor/24x24/stock/navigation/stock_last.png
-share/icons/hicolor/24x24/stock/navigation/stock_left-with-subpoints.png
-share/icons/hicolor/24x24/stock/navigation/stock_left.png
-share/icons/hicolor/24x24/stock/navigation/stock_navigator.png
-share/icons/hicolor/24x24/stock/navigation/stock_new-tab.png
-share/icons/hicolor/24x24/stock/navigation/stock_next-page.png
-share/icons/hicolor/24x24/stock/navigation/stock_next.png
-share/icons/hicolor/24x24/stock/navigation/stock_previous-page.png
-share/icons/hicolor/24x24/stock/navigation/stock_previous.png
-share/icons/hicolor/24x24/stock/navigation/stock_right-with-subpoints.png
-share/icons/hicolor/24x24/stock/navigation/stock_right.png
-share/icons/hicolor/24x24/stock/navigation/stock_top.png
-share/icons/hicolor/24x24/stock/navigation/stock_undo-history.png
-share/icons/hicolor/24x24/stock/navigation/stock_up-with-subpoints.png
-share/icons/hicolor/24x24/stock/navigation/stock_up.png
-share/icons/hicolor/24x24/stock/navigation/stock_zoom-1.png
-share/icons/hicolor/24x24/stock/navigation/stock_zoom-in.png
-share/icons/hicolor/24x24/stock/navigation/stock_zoom-next.png
-share/icons/hicolor/24x24/stock/navigation/stock_zoom-object.png
-share/icons/hicolor/24x24/stock/navigation/stock_zoom-optimal.png
-share/icons/hicolor/24x24/stock/navigation/stock_zoom-out.png
-share/icons/hicolor/24x24/stock/navigation/stock_zoom-page-width.png
-share/icons/hicolor/24x24/stock/navigation/stock_zoom-page.png
-share/icons/hicolor/24x24/stock/navigation/stock_zoom-previous.png
-share/icons/hicolor/24x24/stock/navigation/stock_zoom-shift.png
-share/icons/hicolor/24x24/stock/navigation/stock_zoom.png
-share/icons/hicolor/24x24/stock/net/stock_addressbook.png
-share/icons/hicolor/24x24/stock/net/stock_appointment-reminder-excl.png
-share/icons/hicolor/24x24/stock/net/stock_appointment-reminder.png
-share/icons/hicolor/24x24/stock/net/stock_channel.png
-share/icons/hicolor/24x24/stock/net/stock_connect-to-url.png
-share/icons/hicolor/24x24/stock/net/stock_connect.png
-share/icons/hicolor/24x24/stock/net/stock_contact-list.png
-share/icons/hicolor/24x24/stock/net/stock_contact.png
-share/icons/hicolor/24x24/stock/net/stock_directory-server.png
-share/icons/hicolor/24x24/stock/net/stock_disconnect.png
-share/icons/hicolor/24x24/stock/net/stock_exchange-connector.png
-share/icons/hicolor/24x24/stock/net/stock_groupwise-connector.png
-share/icons/hicolor/24x24/stock/net/stock_hand-signed.png
-share/icons/hicolor/24x24/stock/net/stock_hyperlink-internet-search.png
-share/icons/hicolor/24x24/stock/net/stock_hyperlink-target.png
-share/icons/hicolor/24x24/stock/net/stock_hyperlink-toolbar.png
-share/icons/hicolor/24x24/stock/net/stock_hyperlink.png
-share/icons/hicolor/24x24/stock/net/stock_inbox.png
-share/icons/hicolor/24x24/stock/net/stock_insert-url.png
-share/icons/hicolor/24x24/stock/net/stock_internet.png
-share/icons/hicolor/24x24/stock/net/stock_link.png
-share/icons/hicolor/24x24/stock/net/stock_mail-accounts.png
-share/icons/hicolor/24x24/stock/net/stock_mail-compose.png
-share/icons/hicolor/24x24/stock/net/stock_mail-copy.png
-share/icons/hicolor/24x24/stock/net/stock_mail-filters-apply.png
-share/icons/hicolor/24x24/stock/net/stock_mail-forward.png
-share/icons/hicolor/24x24/stock/net/stock_mail-handling.png
-share/icons/hicolor/24x24/stock/net/stock_mail-import.png
-share/icons/hicolor/24x24/stock/net/stock_mail-merge.png
-share/icons/hicolor/24x24/stock/net/stock_mail-move.png
-share/icons/hicolor/24x24/stock/net/stock_mail-open-multiple.png
-share/icons/hicolor/24x24/stock/net/stock_mail-open.png
-share/icons/hicolor/24x24/stock/net/stock_mail-receive.png
-share/icons/hicolor/24x24/stock/net/stock_mail-replied.png
-share/icons/hicolor/24x24/stock/net/stock_mail-reply-to-all.png
-share/icons/hicolor/24x24/stock/net/stock_mail-reply.png
-share/icons/hicolor/24x24/stock/net/stock_mail-send-receive.png
-share/icons/hicolor/24x24/stock/net/stock_mail-send.png
-share/icons/hicolor/24x24/stock/net/stock_mail-unread-multiple.png
-share/icons/hicolor/24x24/stock/net/stock_mail-unread.png
-share/icons/hicolor/24x24/stock/net/stock_mail.png
-share/icons/hicolor/24x24/stock/net/stock_message-display.png
-share/icons/hicolor/24x24/stock/net/stock_not-spam.png
-share/icons/hicolor/24x24/stock/net/stock_online-layout.png
-share/icons/hicolor/24x24/stock/net/stock_outbox.png
-share/icons/hicolor/24x24/stock/net/stock_post-message.png
-share/icons/hicolor/24x24/stock/net/stock_sent-mail.png
-share/icons/hicolor/24x24/stock/net/stock_shared-by-me.png
-share/icons/hicolor/24x24/stock/net/stock_shared-to-me.png
-share/icons/hicolor/24x24/stock/net/stock_spam.png
-share/icons/hicolor/24x24/stock/net/stock_video-conferencing.png
-share/icons/hicolor/24x24/stock/object/stock_add-bookmark.png
-share/icons/hicolor/24x24/stock/object/stock_bookmark.png
-share/icons/hicolor/24x24/stock/object/stock_bring-backward.png
-share/icons/hicolor/24x24/stock/object/stock_bring-forward.png
-share/icons/hicolor/24x24/stock/object/stock_create-with-attributes.png
-share/icons/hicolor/24x24/stock/object/stock_delete-bookmark.png
-share/icons/hicolor/24x24/stock/object/stock_edit-bookmark.png
-share/icons/hicolor/24x24/stock/object/stock_effects-more-options.png
-share/icons/hicolor/24x24/stock/object/stock_effects-object-colorize.png
-share/icons/hicolor/24x24/stock/object/stock_effects-object-hide.png
-share/icons/hicolor/24x24/stock/object/stock_effects-object.png
-share/icons/hicolor/24x24/stock/object/stock_effects-play-in-full.png
-share/icons/hicolor/24x24/stock/object/stock_effects-preview.png
-share/icons/hicolor/24x24/stock/object/stock_effects.png
-share/icons/hicolor/24x24/stock/object/stock_enter-group.png
-share/icons/hicolor/24x24/stock/object/stock_exit-group.png
-share/icons/hicolor/24x24/stock/object/stock_file-with-objects.png
-share/icons/hicolor/24x24/stock/object/stock_format-object.png
-share/icons/hicolor/24x24/stock/object/stock_formula-cursor.png
-share/icons/hicolor/24x24/stock/object/stock_frame.png
-share/icons/hicolor/24x24/stock/object/stock_group.png
-share/icons/hicolor/24x24/stock/object/stock_handles-simple.png
-share/icons/hicolor/24x24/stock/object/stock_insert-applet.png
-share/icons/hicolor/24x24/stock/object/stock_insert-floating-frame.png
-share/icons/hicolor/24x24/stock/object/stock_insert-gluepoint.png
-share/icons/hicolor/24x24/stock/object/stock_insert-math-object.png
-share/icons/hicolor/24x24/stock/object/stock_insert-note.png
-share/icons/hicolor/24x24/stock/object/stock_insert-ole-object.png
-share/icons/hicolor/24x24/stock/object/stock_insert-plugin.png
-share/icons/hicolor/24x24/stock/object/stock_insert-rule.png
-share/icons/hicolor/24x24/stock/object/stock_insert-single-column-text-frame.png
-share/icons/hicolor/24x24/stock/object/stock_insert-slide.png
-share/icons/hicolor/24x24/stock/object/stock_insert-sound-plugin.png
-share/icons/hicolor/24x24/stock/object/stock_insert-text-frame.png
-share/icons/hicolor/24x24/stock/object/stock_insert_graphic.png
-share/icons/hicolor/24x24/stock/object/stock_insert_special_character.png
-share/icons/hicolor/24x24/stock/object/stock_interaction.png
-share/icons/hicolor/24x24/stock/object/stock_new-bcard.png
-share/icons/hicolor/24x24/stock/object/stock_new-window.png
-share/icons/hicolor/24x24/stock/object/stock_object-behind.png
-share/icons/hicolor/24x24/stock/object/stock_object-infront.png
-share/icons/hicolor/24x24/stock/object/stock_pin.png
-share/icons/hicolor/24x24/stock/object/stock_position-size.png
-share/icons/hicolor/24x24/stock/object/stock_reverse-order.png
-share/icons/hicolor/24x24/stock/object/stock_slide-design.png
-share/icons/hicolor/24x24/stock/object/stock_slide-duplicate.png
-share/icons/hicolor/24x24/stock/object/stock_slide-expand.png
-share/icons/hicolor/24x24/stock/object/stock_slide-reherse-timings.png
-share/icons/hicolor/24x24/stock/object/stock_slide-show.png
-share/icons/hicolor/24x24/stock/object/stock_slide-showhide.png
-share/icons/hicolor/24x24/stock/object/stock_snap-grid.png
-share/icons/hicolor/24x24/stock/object/stock_snap-guides.png
-share/icons/hicolor/24x24/stock/object/stock_snap-margins.png
-share/icons/hicolor/24x24/stock/object/stock_snap-object-points.png
-share/icons/hicolor/24x24/stock/object/stock_snap-object.png
-share/icons/hicolor/24x24/stock/object/stock_symbol-selection.png
-share/icons/hicolor/24x24/stock/object/stock_to-3d-rotation-object.png
-share/icons/hicolor/24x24/stock/object/stock_to-3d.png
-share/icons/hicolor/24x24/stock/object/stock_to-bottom.png
-share/icons/hicolor/24x24/stock/object/stock_to-curve.png
-share/icons/hicolor/24x24/stock/object/stock_to-polygon.png
-share/icons/hicolor/24x24/stock/object/stock_to-top.png
-share/icons/hicolor/24x24/stock/object/stock_ungroup.png
-share/icons/hicolor/24x24/stock/object/stock_unlink.png
-share/icons/hicolor/24x24/stock/object/stock_view-function-selection.png
-share/icons/hicolor/24x24/stock/table/stock_alignment-bottom.png
-share/icons/hicolor/24x24/stock/table/stock_alignment-centered-vertically.png
-share/icons/hicolor/24x24/stock/table/stock_alignment-centered.png
-share/icons/hicolor/24x24/stock/table/stock_alignment-left.png
-share/icons/hicolor/24x24/stock/table/stock_alignment-right.png
-share/icons/hicolor/24x24/stock/table/stock_alignment-top.png
-share/icons/hicolor/24x24/stock/table/stock_alignment.png
-share/icons/hicolor/24x24/stock/table/stock_cell-align-bottom.png
-share/icons/hicolor/24x24/stock/table/stock_cell-align-center.png
-share/icons/hicolor/24x24/stock/table/stock_cell-align-top.png
-share/icons/hicolor/24x24/stock/table/stock_choose-themes.png
-share/icons/hicolor/24x24/stock/table/stock_datapilot.png
-share/icons/hicolor/24x24/stock/table/stock_delete-column.png
-share/icons/hicolor/24x24/stock/table/stock_delete-row.png
-share/icons/hicolor/24x24/stock/table/stock_exchange-columns.png
-share/icons/hicolor/24x24/stock/table/stock_exchange-rows.png
-share/icons/hicolor/24x24/stock/table/stock_group-cells.png
-share/icons/hicolor/24x24/stock/table/stock_insert-cells-down.png
-share/icons/hicolor/24x24/stock/table/stock_insert-cells-right.png
-share/icons/hicolor/24x24/stock/table/stock_insert-cells.png
-share/icons/hicolor/24x24/stock/table/stock_insert-columns.png
-share/icons/hicolor/24x24/stock/table/stock_insert-names-define.png
-share/icons/hicolor/24x24/stock/table/stock_insert-rows.png
-share/icons/hicolor/24x24/stock/table/stock_insert-table.png
-share/icons/hicolor/24x24/stock/table/stock_select-cell.png
-share/icons/hicolor/24x24/stock/table/stock_select-column.png
-share/icons/hicolor/24x24/stock/table/stock_select-row.png
-share/icons/hicolor/24x24/stock/table/stock_select-table.png
-share/icons/hicolor/24x24/stock/table/stock_sort-table-column-ascending.png
-share/icons/hicolor/24x24/stock/table/stock_sort-table-row-ascending.png
-share/icons/hicolor/24x24/stock/table/stock_table-align-bottom.png
-share/icons/hicolor/24x24/stock/table/stock_table-align-center.png
-share/icons/hicolor/24x24/stock/table/stock_table-align-top.png
-share/icons/hicolor/24x24/stock/table/stock_table-borders.png
-share/icons/hicolor/24x24/stock/table/stock_table-combine.png
-share/icons/hicolor/24x24/stock/table/stock_table-fit-height.png
-share/icons/hicolor/24x24/stock/table/stock_table-fit-width.png
-share/icons/hicolor/24x24/stock/table/stock_table-fixed-proportional.png
-share/icons/hicolor/24x24/stock/table/stock_table-fixed.png
-share/icons/hicolor/24x24/stock/table/stock_table-line-color.png
-share/icons/hicolor/24x24/stock/table/stock_table-line-style.png
-share/icons/hicolor/24x24/stock/table/stock_table-optimize.png
-share/icons/hicolor/24x24/stock/table/stock_table-same-height.png
-share/icons/hicolor/24x24/stock/table/stock_table-same-width.png
-share/icons/hicolor/24x24/stock/table/stock_table-split.png
-share/icons/hicolor/24x24/stock/table/stock_table-variable.png
-share/icons/hicolor/24x24/stock/table/stock_table_borders.png
-share/icons/hicolor/24x24/stock/table/stock_table_fill.png
-share/icons/hicolor/24x24/stock/table/stock_ungroup-cells.png
-share/icons/hicolor/24x24/stock/text/stock_autoformat.png
-share/icons/hicolor/24x24/stock/text/stock_autospellcheck.png
-share/icons/hicolor/24x24/stock/text/stock_autotext.png
-share/icons/hicolor/24x24/stock/text/stock_chart-scale-text.png
-share/icons/hicolor/24x24/stock/text/stock_decrease-font.png
-share/icons/hicolor/24x24/stock/text/stock_directcursor.png
-share/icons/hicolor/24x24/stock/text/stock_draw-text-animation.png
-share/icons/hicolor/24x24/stock/text/stock_draw-text-frame.png
-share/icons/hicolor/24x24/stock/text/stock_draw-text.png
-share/icons/hicolor/24x24/stock/text/stock_draw-vertical-text-frame.png
-share/icons/hicolor/24x24/stock/text/stock_draw-vertical-text.png
-share/icons/hicolor/24x24/stock/text/stock_edit-contour.png
-share/icons/hicolor/24x24/stock/text/stock_edit-headers-and-footers.png
-share/icons/hicolor/24x24/stock/text/stock_effects-text.png
-share/icons/hicolor/24x24/stock/text/stock_euro.png
-share/icons/hicolor/24x24/stock/text/stock_font-formatting-toggle.png
-share/icons/hicolor/24x24/stock/text/stock_font-size.png
-share/icons/hicolor/24x24/stock/text/stock_font.png
-share/icons/hicolor/24x24/stock/text/stock_fontwork.png
-share/icons/hicolor/24x24/stock/text/stock_format-character.png
-share/icons/hicolor/24x24/stock/text/stock_format-numbering-bullets.png
-share/icons/hicolor/24x24/stock/text/stock_format-paragraph.png
-share/icons/hicolor/24x24/stock/text/stock_increase-font.png
-share/icons/hicolor/24x24/stock/text/stock_insert-caption.png
-share/icons/hicolor/24x24/stock/text/stock_insert-cross-reference.png
-share/icons/hicolor/24x24/stock/text/stock_insert-fields-author.png
-share/icons/hicolor/24x24/stock/text/stock_insert-fields-subject.png
-share/icons/hicolor/24x24/stock/text/stock_insert-fields-title.png
-share/icons/hicolor/24x24/stock/text/stock_insert-footer.png
-share/icons/hicolor/24x24/stock/text/stock_insert-header.png
-share/icons/hicolor/24x24/stock/text/stock_insert_endnote.png
-share/icons/hicolor/24x24/stock/text/stock_insert_footnote.png
-share/icons/hicolor/24x24/stock/text/stock_insert_index_marker.png
-share/icons/hicolor/24x24/stock/text/stock_insert_section.png
-share/icons/hicolor/24x24/stock/text/stock_line-spacing-1.5.png
-share/icons/hicolor/24x24/stock/text/stock_line-spacing-1.png
-share/icons/hicolor/24x24/stock/text/stock_line-spacing-2.png
-share/icons/hicolor/24x24/stock/text/stock_list-insert-unnumbered.png
-share/icons/hicolor/24x24/stock/text/stock_list_bullet.png
-share/icons/hicolor/24x24/stock/text/stock_list_enum-off.png
-share/icons/hicolor/24x24/stock/text/stock_list_enum-restart.png
-share/icons/hicolor/24x24/stock/text/stock_list_enum.png
-share/icons/hicolor/24x24/stock/text/stock_nonprinting-chars.png
-share/icons/hicolor/24x24/stock/text/stock_page-number.png
-share/icons/hicolor/24x24/stock/text/stock_page-total-number.png
-share/icons/hicolor/24x24/stock/text/stock_paragraph-spacing-decrease.png
-share/icons/hicolor/24x24/stock/text/stock_paragraph-spacing-increase.png
-share/icons/hicolor/24x24/stock/text/stock_select-all.png
-share/icons/hicolor/24x24/stock/text/stock_spellcheck.png
-share/icons/hicolor/24x24/stock/text/stock_styles-new-style-from-selection.png
-share/icons/hicolor/24x24/stock/text/stock_styles-update-style.png
-share/icons/hicolor/24x24/stock/text/stock_subscript.png
-share/icons/hicolor/24x24/stock/text/stock_superscript.png
-share/icons/hicolor/24x24/stock/text/stock_text-direction-ltr.png
-share/icons/hicolor/24x24/stock/text/stock_text-direction-ttb.png
-share/icons/hicolor/24x24/stock/text/stock_text-double-click-to-edit.png
-share/icons/hicolor/24x24/stock/text/stock_text-monospaced.png
-share/icons/hicolor/24x24/stock/text/stock_text-outline.png
-share/icons/hicolor/24x24/stock/text/stock_text-quickedit.png
-share/icons/hicolor/24x24/stock/text/stock_text-select-text-only.png
-share/icons/hicolor/24x24/stock/text/stock_text-shadow.png
-share/icons/hicolor/24x24/stock/text/stock_text-spacing.png
-share/icons/hicolor/24x24/stock/text/stock_text-strikethrough.png
-share/icons/hicolor/24x24/stock/text/stock_text_bold.png
-share/icons/hicolor/24x24/stock/text/stock_text_center.png
-share/icons/hicolor/24x24/stock/text/stock_text_color_background.png
-share/icons/hicolor/24x24/stock/text/stock_text_color_foreground.png
-share/icons/hicolor/24x24/stock/text/stock_text_color_hilight.png
-share/icons/hicolor/24x24/stock/text/stock_text_indent.png
-share/icons/hicolor/24x24/stock/text/stock_text_italic.png
-share/icons/hicolor/24x24/stock/text/stock_text_justify.png
-share/icons/hicolor/24x24/stock/text/stock_text_left.png
-share/icons/hicolor/24x24/stock/text/stock_text_right.png
-share/icons/hicolor/24x24/stock/text/stock_text_underlined-double.png
-share/icons/hicolor/24x24/stock/text/stock_text_underlined.png
-share/icons/hicolor/24x24/stock/text/stock_text_unindent.png
-share/icons/hicolor/24x24/stock/text/stock_thesaurus.png
-share/icons/hicolor/24x24/stock/text/stock_to-background.png
-share/icons/hicolor/24x24/stock/text/stock_to-foreground.png
-share/icons/hicolor/24x24/stock/text/stock_tools-hyphenation.png
-share/icons/hicolor/24x24/stock/text/stock_update-fields.png
-share/icons/hicolor/24x24/stock/text/stock_view-field-shadings.png
-share/icons/hicolor/24x24/stock/text/stock_wrap-around.png
-share/icons/hicolor/24x24/stock/text/stock_wrap-behind.png
-share/icons/hicolor/24x24/stock/text/stock_wrap-contour.png
-share/icons/hicolor/24x24/stock/text/stock_wrap-interrupt.png
-share/icons/hicolor/24x24/stock/text/stock_wrap-left.png
-share/icons/hicolor/24x24/stock/text/stock_wrap-optimal.png
-share/icons/hicolor/24x24/stock/text/stock_wrap-right.png
-share/icons/hicolor/32x32/apps/administration.png
-share/icons/hicolor/32x32/apps/apacheconf.png
-share/icons/hicolor/32x32/apps/applets-screenshooter.png
-share/icons/hicolor/32x32/apps/config-date.png
-share/icons/hicolor/32x32/apps/config-language.png
-share/icons/hicolor/32x32/apps/config-users.png
-share/icons/hicolor/32x32/apps/config-xfree.png
-share/icons/hicolor/32x32/apps/dia_gnome_icon.png
-share/icons/hicolor/32x32/apps/disks.png
-share/icons/hicolor/32x32/apps/file-manager.png
-share/icons/hicolor/32x32/apps/gdict.png
-share/icons/hicolor/32x32/apps/gdm.png
-share/icons/hicolor/32x32/apps/gnome-applications.png
-share/icons/hicolor/32x32/apps/gnome-calculator.png
-share/icons/hicolor/32x32/apps/gnome-cdplayer-icon.png
-share/icons/hicolor/32x32/apps/gnome-character-map.png
-share/icons/hicolor/32x32/apps/gnome-devel.png
-share/icons/hicolor/32x32/apps/gnome-finance.png
-share/icons/hicolor/32x32/apps/gnome-ftp.png
-share/icons/hicolor/32x32/apps/gnome-globe.png
-share/icons/hicolor/32x32/apps/gnome-gnomine.png
-share/icons/hicolor/32x32/apps/gnome-graphics.png
-share/icons/hicolor/32x32/apps/gnome-grecord.png
-share/icons/hicolor/32x32/apps/gnome-gsame.png
-share/icons/hicolor/32x32/apps/gnome-lockscreen.png
-share/icons/hicolor/32x32/apps/gnome-logout.png
-share/icons/hicolor/32x32/apps/gnome-media-player.png
-share/icons/hicolor/32x32/apps/gnome-multimedia.png
-share/icons/hicolor/32x32/apps/gnome-networktool.png
-share/icons/hicolor/32x32/apps/gnome-nibbles.png
-share/icons/hicolor/32x32/apps/gnome-pdf.png
-share/icons/hicolor/32x32/apps/gnome-terminal.png
-share/icons/hicolor/32x32/apps/gnome-util.png
-share/icons/hicolor/32x32/apps/gnome-window-manager.png
-share/icons/hicolor/32x32/apps/hwbrowser.png
-share/icons/hicolor/32x32/apps/iagno.png
-share/icons/hicolor/32x32/apps/keyboard.png
-share/icons/hicolor/32x32/apps/logviewer.png
-share/icons/hicolor/32x32/apps/network-config.png
-share/icons/hicolor/32x32/apps/panel-notification-area.png
-share/icons/hicolor/32x32/apps/panel-window-list.png
-share/icons/hicolor/32x32/apps/panel-window-menu.png
-share/icons/hicolor/32x32/apps/postscript-viewer.png
-share/icons/hicolor/32x32/apps/serviceconf.png
-share/icons/hicolor/32x32/apps/system-floppy.png
-share/icons/hicolor/32x32/apps/text-editor.png
-share/icons/hicolor/32x32/apps/tsclient.png
-share/icons/hicolor/32x32/apps/web-browser.png
-share/icons/hicolor/32x32/apps/xcdroast.png
-share/icons/hicolor/32x32/apps/xchat.png
-share/icons/hicolor/32x32/stock/chart/stock_chart.png
-share/icons/hicolor/32x32/stock/code/stock_script.png
-share/icons/hicolor/32x32/stock/data/stock_data-sources-hand.png
-share/icons/hicolor/32x32/stock/data/stock_data-sources.png
-share/icons/hicolor/32x32/stock/data/stock_lock-broken.png
-share/icons/hicolor/32x32/stock/data/stock_lock-ok.png
-share/icons/hicolor/32x32/stock/data/stock_lock-open.png
-share/icons/hicolor/32x32/stock/data/stock_lock.png
-share/icons/hicolor/32x32/stock/data/stock_signature-bad.png
-share/icons/hicolor/32x32/stock/data/stock_signature-ok.png
-share/icons/hicolor/32x32/stock/data/stock_signature.png
-share/icons/hicolor/32x32/stock/document/stock_new-drawing.png
-share/icons/hicolor/32x32/stock/document/stock_new-formula.png
-share/icons/hicolor/32x32/stock/document/stock_new-html.png
-share/icons/hicolor/32x32/stock/document/stock_new-labels.png
-share/icons/hicolor/32x32/stock/document/stock_new-master-document.png
-share/icons/hicolor/32x32/stock/document/stock_new-presentation.png
-share/icons/hicolor/32x32/stock/document/stock_new-spreadsheet.png
-share/icons/hicolor/32x32/stock/document/stock_new-template.png
-share/icons/hicolor/32x32/stock/document/stock_new-text.png
-share/icons/hicolor/32x32/stock/document/stock_new.png
-share/icons/hicolor/32x32/stock/document/stock_todo.png
-share/icons/hicolor/32x32/stock/generic/stock_alarm.png
-share/icons/hicolor/32x32/stock/generic/stock_autopilot.png
-share/icons/hicolor/32x32/stock/generic/stock_briefcase.png
-share/icons/hicolor/32x32/stock/generic/stock_calendar.png
-share/icons/hicolor/32x32/stock/generic/stock_cell-phone.png
-share/icons/hicolor/32x32/stock/generic/stock_dialog-info.png
-share/icons/hicolor/32x32/stock/generic/stock_dialog-question.png
-share/icons/hicolor/32x32/stock/generic/stock_dialog-warning.png
-share/icons/hicolor/32x32/stock/generic/stock_edit.png
-share/icons/hicolor/32x32/stock/generic/stock_example.png
-share/icons/hicolor/32x32/stock/generic/stock_folder.png
-share/icons/hicolor/32x32/stock/generic/stock_id.png
-share/icons/hicolor/32x32/stock/generic/stock_keyring.png
-share/icons/hicolor/32x32/stock/generic/stock_landline-phone.png
-share/icons/hicolor/32x32/stock/generic/stock_new-24h-appointment.png
-share/icons/hicolor/32x32/stock/generic/stock_new-appointment.png
-share/icons/hicolor/32x32/stock/generic/stock_new-meeting.png
-share/icons/hicolor/32x32/stock/generic/stock_news.png
-share/icons/hicolor/32x32/stock/generic/stock_notebook.png
-share/icons/hicolor/32x32/stock/generic/stock_notes.png
-share/icons/hicolor/32x32/stock/generic/stock_openoffice.png
-share/icons/hicolor/32x32/stock/generic/stock_people.png
-share/icons/hicolor/32x32/stock/generic/stock_person.png
-share/icons/hicolor/32x32/stock/generic/stock_summary.png
-share/icons/hicolor/32x32/stock/generic/stock_web-calendar.png
-share/icons/hicolor/32x32/stock/io/stock_bluetooth.png
-share/icons/hicolor/32x32/stock/io/stock_network-printer.png
-share/icons/hicolor/32x32/stock/io/stock_opensave.png
-share/icons/hicolor/32x32/stock/io/stock_print-driver.png
-share/icons/hicolor/32x32/stock/io/stock_print-preview-print.png
-share/icons/hicolor/32x32/stock/io/stock_print-preview.png
-share/icons/hicolor/32x32/stock/io/stock_print-setup.png
-share/icons/hicolor/32x32/stock/io/stock_print.png
-share/icons/hicolor/32x32/stock/io/stock_printers.png
-share/icons/hicolor/32x32/stock/net/stock_addressbook.png
-share/icons/hicolor/32x32/stock/net/stock_appointment-reminder-excl.png
-share/icons/hicolor/32x32/stock/net/stock_appointment-reminder.png
-share/icons/hicolor/32x32/stock/net/stock_channel.png
-share/icons/hicolor/32x32/stock/net/stock_contact.png
-share/icons/hicolor/32x32/stock/net/stock_directory-server.png
-share/icons/hicolor/32x32/stock/net/stock_exchange-connector.png
-share/icons/hicolor/32x32/stock/net/stock_groupwise-connector.png
-share/icons/hicolor/32x32/stock/net/stock_inbox.png
-share/icons/hicolor/32x32/stock/net/stock_internet.png
-share/icons/hicolor/32x32/stock/net/stock_mail-import.png
-share/icons/hicolor/32x32/stock/net/stock_mail-open.png
-share/icons/hicolor/32x32/stock/net/stock_mail-receive.png
-share/icons/hicolor/32x32/stock/net/stock_mail-send-receive.png
-share/icons/hicolor/32x32/stock/net/stock_mail-send.png
-share/icons/hicolor/32x32/stock/net/stock_mail.png
-share/icons/hicolor/32x32/stock/net/stock_not-spam.png
-share/icons/hicolor/32x32/stock/net/stock_outbox.png
-share/icons/hicolor/32x32/stock/net/stock_post-message.png
-share/icons/hicolor/32x32/stock/net/stock_sent-mail.png
-share/icons/hicolor/32x32/stock/net/stock_spam.png
-share/icons/hicolor/32x32/stock/object/stock_add-bookmark.png
-share/icons/hicolor/32x32/stock/object/stock_bookmark.png
-share/icons/hicolor/32x32/stock/object/stock_delete-bookmark.png
-share/icons/hicolor/32x32/stock/object/stock_edit-bookmark.png
-share/icons/hicolor/36x36/apps/gnome-spinner-rest.png
-share/icons/hicolor/36x36/apps/gnome-spinner.png
-share/icons/hicolor/36x36/stock/document/stock_my-documents.png
-share/icons/hicolor/36x36/stock/document/stock_new-drawing.png
-share/icons/hicolor/36x36/stock/document/stock_new-formula.png
-share/icons/hicolor/36x36/stock/document/stock_new-html.png
-share/icons/hicolor/36x36/stock/document/stock_new-labels.png
-share/icons/hicolor/36x36/stock/document/stock_new-master-document.png
-share/icons/hicolor/36x36/stock/document/stock_new-presentation.png
-share/icons/hicolor/36x36/stock/document/stock_new-spreadsheet.png
-share/icons/hicolor/36x36/stock/document/stock_new-template.png
-share/icons/hicolor/36x36/stock/document/stock_new-text.png
-share/icons/hicolor/36x36/stock/document/stock_samples.png
-share/icons/hicolor/36x36/stock/generic/stock_autopilot.png
-share/icons/hicolor/36x36/stock/generic/stock_new.png
-share/icons/hicolor/48x48/apps/accessibility-directory.png
-share/icons/hicolor/48x48/apps/administration.png
-share/icons/hicolor/48x48/apps/advanced-directory.png
-share/icons/hicolor/48x48/apps/apacheconf.png
-share/icons/hicolor/48x48/apps/applets-screenshooter.png
-share/icons/hicolor/48x48/apps/beast.png
-share/icons/hicolor/48x48/apps/burner.png
-share/icons/hicolor/48x48/apps/character-picker.png
-share/icons/hicolor/48x48/apps/clock.png
-share/icons/hicolor/48x48/apps/config-date.png
-share/icons/hicolor/48x48/apps/config-language.png
-share/icons/hicolor/48x48/apps/config-users.png
-share/icons/hicolor/48x48/apps/config-xfree.png
-share/icons/hicolor/48x48/apps/dia_gnome_icon.png
-share/icons/hicolor/48x48/apps/disks.png
-share/icons/hicolor/48x48/apps/drawer.png
-share/icons/hicolor/48x48/apps/eyes.png
-share/icons/hicolor/48x48/apps/file-manager.png
-share/icons/hicolor/48x48/apps/file-roller.png
-share/icons/hicolor/48x48/apps/gdict.png
-share/icons/hicolor/48x48/apps/gdm.png
-share/icons/hicolor/48x48/apps/gnome-amusements.png
-share/icons/hicolor/48x48/apps/gnome-applications.png
-share/icons/hicolor/48x48/apps/gnome-audio.png
-share/icons/hicolor/48x48/apps/gnome-calculator.png
-share/icons/hicolor/48x48/apps/gnome-cdplayer-icon.png
-share/icons/hicolor/48x48/apps/gnome-desktop-config.png
-share/icons/hicolor/48x48/apps/gnome-devel.png
-share/icons/hicolor/48x48/apps/gnome-favorites.png
-share/icons/hicolor/48x48/apps/gnome-finance.png
-share/icons/hicolor/48x48/apps/gnome-ftp.png
-share/icons/hicolor/48x48/apps/gnome-globe.png
-share/icons/hicolor/48x48/apps/gnome-gnomine.png
-share/icons/hicolor/48x48/apps/gnome-graphics.png
-share/icons/hicolor/48x48/apps/gnome-grecord.png
-share/icons/hicolor/48x48/apps/gnome-gsame.png
-share/icons/hicolor/48x48/apps/gnome-help.png
-share/icons/hicolor/48x48/apps/gnome-joystick.png
-share/icons/hicolor/48x48/apps/gnome-lockscreen.png
-share/icons/hicolor/48x48/apps/gnome-logout.png
-share/icons/hicolor/48x48/apps/gnome-media-player.png
-share/icons/hicolor/48x48/apps/gnome-monitor.png
-share/icons/hicolor/48x48/apps/gnome-multimedia.png
-share/icons/hicolor/48x48/apps/gnome-networktool.png
-share/icons/hicolor/48x48/apps/gnome-nibbles.png
-share/icons/hicolor/48x48/apps/gnome-other.png
-share/icons/hicolor/48x48/apps/gnome-panel.png
-share/icons/hicolor/48x48/apps/gnome-pdf.png
-share/icons/hicolor/48x48/apps/gnome-reboot.png
-share/icons/hicolor/48x48/apps/gnome-run.png
-share/icons/hicolor/48x48/apps/gnome-searchtool-animation-rest.png
-share/icons/hicolor/48x48/apps/gnome-searchtool-animation.png
-share/icons/hicolor/48x48/apps/gnome-searchtool.png
-share/icons/hicolor/48x48/apps/gnome-server-config.png
-share/icons/hicolor/48x48/apps/gnome-session.png
-share/icons/hicolor/48x48/apps/gnome-settings-accessibility-keyboard.png
-share/icons/hicolor/48x48/apps/gnome-settings-accessibility-technologies.png
-share/icons/hicolor/48x48/apps/gnome-settings-background.png
-share/icons/hicolor/48x48/apps/gnome-settings-default-applications.png
-share/icons/hicolor/48x48/apps/gnome-settings-font.png
-share/icons/hicolor/48x48/apps/gnome-settings-keybindings.png
-share/icons/hicolor/48x48/apps/gnome-settings-sound.png
-share/icons/hicolor/48x48/apps/gnome-settings-theme.png
-share/icons/hicolor/48x48/apps/gnome-settings-ui-behavior.png
-share/icons/hicolor/48x48/apps/gnome-settings.png
-share/icons/hicolor/48x48/apps/gnome-shutdown.png
-share/icons/hicolor/48x48/apps/gnome-starthere.png
-share/icons/hicolor/48x48/apps/gnome-system-config.png
-share/icons/hicolor/48x48/apps/gnome-system.png
-share/icons/hicolor/48x48/apps/gnome-terminal.png
-share/icons/hicolor/48x48/apps/gnome-unknown.png
-share/icons/hicolor/48x48/apps/gnome-util.png
-share/icons/hicolor/48x48/apps/gnome-window-manager.png
-share/icons/hicolor/48x48/apps/hint.png
-share/icons/hicolor/48x48/apps/hwbrowser.png
-share/icons/hicolor/48x48/apps/iagno.png
-share/icons/hicolor/48x48/apps/im-aim.png
-share/icons/hicolor/48x48/apps/im-icq.png
-share/icons/hicolor/48x48/apps/im-jabber.png
-share/icons/hicolor/48x48/apps/im-msn.png
-share/icons/hicolor/48x48/apps/im-nov.png
-share/icons/hicolor/48x48/apps/im-yahoo.png
-share/icons/hicolor/48x48/apps/im.png
-share/icons/hicolor/48x48/apps/image-viewer.png
-share/icons/hicolor/48x48/apps/keyboard.png
-share/icons/hicolor/48x48/apps/launcher-program.png
-share/icons/hicolor/48x48/apps/logviewer.png
-share/icons/hicolor/48x48/apps/modem.png
-share/icons/hicolor/48x48/apps/network-config.png
-share/icons/hicolor/48x48/apps/palm-pilot-sync.png
-share/icons/hicolor/48x48/apps/palm-pilot.png
-share/icons/hicolor/48x48/apps/panel-notification-area.png
-share/icons/hicolor/48x48/apps/panel-window-list.png
-share/icons/hicolor/48x48/apps/panel-window-menu.png
-share/icons/hicolor/48x48/apps/postscript-viewer.png
-share/icons/hicolor/48x48/apps/screensaver.png
-share/icons/hicolor/48x48/apps/serviceconf.png
-share/icons/hicolor/48x48/apps/sodipodi.png
-share/icons/hicolor/48x48/apps/stock-ticker.png
-share/icons/hicolor/48x48/apps/text-editor.png
-share/icons/hicolor/48x48/apps/tsclient.png
-share/icons/hicolor/48x48/apps/user-info.png
-share/icons/hicolor/48x48/apps/visor.png
-share/icons/hicolor/48x48/apps/wallpaper.png
-share/icons/hicolor/48x48/apps/web-browser.png
-share/icons/hicolor/48x48/apps/wine.png
-share/icons/hicolor/48x48/apps/xchat.png
-share/icons/hicolor/48x48/apps/xsane.png
-share/icons/hicolor/48x48/stock/code/stock_script.png
-share/icons/hicolor/48x48/stock/data/stock_lock-broken.png
-share/icons/hicolor/48x48/stock/data/stock_lock-ok.png
-share/icons/hicolor/48x48/stock/data/stock_lock-open.png
-share/icons/hicolor/48x48/stock/data/stock_lock.png
-share/icons/hicolor/48x48/stock/data/stock_signature-bad.png
-share/icons/hicolor/48x48/stock/data/stock_signature-ok.png
-share/icons/hicolor/48x48/stock/data/stock_signature.png
-share/icons/hicolor/48x48/stock/document/stock_certificate.png
-share/icons/hicolor/48x48/stock/document/stock_new-drawing.png
-share/icons/hicolor/48x48/stock/document/stock_new-formula.png
-share/icons/hicolor/48x48/stock/document/stock_new-html.png
-share/icons/hicolor/48x48/stock/document/stock_new-labels.png
-share/icons/hicolor/48x48/stock/document/stock_new-master-document.png
-share/icons/hicolor/48x48/stock/document/stock_new-presentation.png
-share/icons/hicolor/48x48/stock/document/stock_new-spreadsheet.png
-share/icons/hicolor/48x48/stock/document/stock_new-template.png
-share/icons/hicolor/48x48/stock/document/stock_new-text.png
-share/icons/hicolor/48x48/stock/document/stock_todo.png
-share/icons/hicolor/48x48/stock/generic/stock_alarm.png
-share/icons/hicolor/48x48/stock/generic/stock_autocompletion.png
-share/icons/hicolor/48x48/stock/generic/stock_autopilot.png
-share/icons/hicolor/48x48/stock/generic/stock_briefcase.png
-share/icons/hicolor/48x48/stock/generic/stock_calendar-and-tasks.png
-share/icons/hicolor/48x48/stock/generic/stock_calendar.png
-share/icons/hicolor/48x48/stock/generic/stock_cell-phone.png
-share/icons/hicolor/48x48/stock/generic/stock_creditcard.png
-share/icons/hicolor/48x48/stock/generic/stock_dialog-error.png
-share/icons/hicolor/48x48/stock/generic/stock_dialog-info.png
-share/icons/hicolor/48x48/stock/generic/stock_dialog-warning.png
-share/icons/hicolor/48x48/stock/generic/stock_edit.png
-share/icons/hicolor/48x48/stock/generic/stock_example.png
-share/icons/hicolor/48x48/stock/generic/stock_home.png
-share/icons/hicolor/48x48/stock/generic/stock_id.png
-share/icons/hicolor/48x48/stock/generic/stock_init.png
-share/icons/hicolor/48x48/stock/generic/stock_keyring.png
-share/icons/hicolor/48x48/stock/generic/stock_landline-phone.png
-share/icons/hicolor/48x48/stock/generic/stock_new-24h-appointment.png
-share/icons/hicolor/48x48/stock/generic/stock_new-appointment.png
-share/icons/hicolor/48x48/stock/generic/stock_new-meeting.png
-share/icons/hicolor/48x48/stock/generic/stock_news.png
-share/icons/hicolor/48x48/stock/generic/stock_notebook.png
-share/icons/hicolor/48x48/stock/generic/stock_notes.png
-share/icons/hicolor/48x48/stock/generic/stock_people.png
-share/icons/hicolor/48x48/stock/generic/stock_person.png
-share/icons/hicolor/48x48/stock/generic/stock_summary.png
-share/icons/hicolor/48x48/stock/generic/stock_timezone.png
-share/icons/hicolor/48x48/stock/generic/stock_unknown.png
-share/icons/hicolor/48x48/stock/generic/stock_weather-cloudy.png
-share/icons/hicolor/48x48/stock/generic/stock_weather-few-clouds.png
-share/icons/hicolor/48x48/stock/generic/stock_weather-fog.png
-share/icons/hicolor/48x48/stock/generic/stock_weather-night-clear.png
-share/icons/hicolor/48x48/stock/generic/stock_weather-night-few-clouds.png
-share/icons/hicolor/48x48/stock/generic/stock_weather-showers.png
-share/icons/hicolor/48x48/stock/generic/stock_weather-snow.png
-share/icons/hicolor/48x48/stock/generic/stock_weather-storm.png
-share/icons/hicolor/48x48/stock/generic/stock_weather-sunny.png
-share/icons/hicolor/48x48/stock/generic/stock_web-calendar.png
-share/icons/hicolor/48x48/stock/io/stock_bluetooth.png
-share/icons/hicolor/48x48/stock/io/stock_network-printer.png
-share/icons/hicolor/48x48/stock/io/stock_print-driver.png
-share/icons/hicolor/48x48/stock/io/stock_print-duplex-no-tumble.png
-share/icons/hicolor/48x48/stock/io/stock_print-duplex-tumble.png
-share/icons/hicolor/48x48/stock/io/stock_print-duplex.png
-share/icons/hicolor/48x48/stock/io/stock_print-non-duplex.png
-share/icons/hicolor/48x48/stock/io/stock_print-preview-print.png
-share/icons/hicolor/48x48/stock/io/stock_print-preview.png
-share/icons/hicolor/48x48/stock/io/stock_print-setup.png
-share/icons/hicolor/48x48/stock/io/stock_print.png
-share/icons/hicolor/48x48/stock/io/stock_printers.png
-share/icons/hicolor/48x48/stock/net/stock_addressbook.png
-share/icons/hicolor/48x48/stock/net/stock_appointment-reminder-excl.png
-share/icons/hicolor/48x48/stock/net/stock_appointment-reminder.png
-share/icons/hicolor/48x48/stock/net/stock_channel.png
-share/icons/hicolor/48x48/stock/net/stock_contact.png
-share/icons/hicolor/48x48/stock/net/stock_directory-server.png
-share/icons/hicolor/48x48/stock/net/stock_exchange-connector.png
-share/icons/hicolor/48x48/stock/net/stock_groupwise-connector.png
-share/icons/hicolor/48x48/stock/net/stock_inbox.png
-share/icons/hicolor/48x48/stock/net/stock_mail-compose.png
-share/icons/hicolor/48x48/stock/net/stock_mail-druid-account.png
-share/icons/hicolor/48x48/stock/net/stock_mail-druid.png
-share/icons/hicolor/48x48/stock/net/stock_mail-flag-for-followup-done.png
-share/icons/hicolor/48x48/stock/net/stock_mail-flag-for-followup.png
-share/icons/hicolor/48x48/stock/net/stock_mail-import.png
-share/icons/hicolor/48x48/stock/net/stock_mail-open.png
-share/icons/hicolor/48x48/stock/net/stock_mail-receive.png
-share/icons/hicolor/48x48/stock/net/stock_mail-replied.png
-share/icons/hicolor/48x48/stock/net/stock_mail-send-receive.png
-share/icons/hicolor/48x48/stock/net/stock_mail-send.png
-share/icons/hicolor/48x48/stock/net/stock_mail.png
-share/icons/hicolor/48x48/stock/net/stock_not-spam.png
-share/icons/hicolor/48x48/stock/net/stock_outbox.png
-share/icons/hicolor/48x48/stock/net/stock_post-message.png
-share/icons/hicolor/48x48/stock/net/stock_proxy.png
-share/icons/hicolor/48x48/stock/net/stock_sent-mail.png
-share/icons/hicolor/48x48/stock/net/stock_spam.png
-share/icons/hicolor/72x72/apps/gnome-globe.png
-share/icons/hicolor/96x96/apps/gnome-globe.png
-share/icons/hicolor/96x96/apps/gnome-starthere.png
-share/icons/hicolor/scalable/apps/evolution.svg
-share/icons/hicolor/scalable/apps/volume-knob.svg
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@unexec /bin/rmdir %D/share/icons/hicolor/96x96 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/48x48/stock/generic 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/document 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 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/generic 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/document 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 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/generic 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/document 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/24x24/stock/text 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/table 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/object 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/net 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/navigation 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/media 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/io 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/image 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/generic 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/form 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/document 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/data 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/code 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/chart 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24/filesystems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24/apps 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/24x24 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/generic 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/emoticons 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/document 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 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/scalable/mimetypes 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/scalable/filesystems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/scalable/emblems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/scalable/devices 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/scalable/apps 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/scalable 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/96x96/mimetypes 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/96x96/filesystems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/96x96/emblems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/96x96/devices 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/96x96 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/72x72/mimetypes 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/72x72/filesystems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/72x72/emblems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/72x72/devices 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/72x72 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/48x48/mimetypes 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/48x48/filesystems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/48x48/emblems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/48x48/devices 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/48x48/apps 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/48x48 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/36x36/mimetypes 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/36x36/filesystems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/36x36/emblems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/36x36/devices 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/36x36 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/32x32/stock/media 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/32x32/stock 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/32x32/mimetypes 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/32x32/filesystems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/32x32/devices 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/32x32 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/24x24/stock/media 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/24x24/stock 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/24x24/mimetypes 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/24x24/filesystems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/24x24/emblems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/24x24/devices 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/24x24 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/192x192/mimetypes 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/192x192/filesystems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/192x192/emblems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/192x192/devices 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/192x192 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/16x16/stock/media 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/16x16/stock/emoticons 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/16x16/stock 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/16x16/mimetypes 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/16x16/filesystems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/16x16/devices 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/16x16 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/12x12/mimetypes 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/12x12/filesystems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/12x12/emblems 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/12x12/devices 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome/12x12 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons/gnome 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-gnome-saved-search.svg
+share/icons/gnome/scalable/stock/generic/stock_person.svg
+@dirrmtry share/icons/gnome/scalable/stock/generic
+@dirrmtry share/icons/gnome/scalable/stock
+@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/apps
+@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/48x48/stock/net
+@dirrmtry share/icons/gnome/48x48/stock/io
+@dirrmtry share/icons/gnome/48x48/stock/generic
+@dirrmtry share/icons/gnome/48x48/stock/document
+@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/filesystems
+@dirrmtry share/icons/gnome/48x48/emblems
+@dirrmtry share/icons/gnome/48x48/devices
+@dirrmtry share/icons/gnome/48x48/apps
+@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/mimetypes
+@dirrmtry share/icons/gnome/32x32/filesystems
+@dirrmtry share/icons/gnome/32x32/devices
+@dirrmtry share/icons/gnome/32x32/apps
+@dirrmtry share/icons/gnome/32x32
+@dirrmtry share/icons/gnome/24x24/stock/text
+@dirrmtry share/icons/gnome/24x24/stock/table
+@dirrmtry share/icons/gnome/24x24/stock/object
+@dirrmtry share/icons/gnome/24x24/stock/net
+@dirrmtry share/icons/gnome/24x24/stock/navigation
+@dirrmtry share/icons/gnome/24x24/stock/media
+@dirrmtry share/icons/gnome/24x24/stock/io
+@dirrmtry share/icons/gnome/24x24/stock/image
+@dirrmtry share/icons/gnome/24x24/stock/generic
+@dirrmtry share/icons/gnome/24x24/stock/form
+@dirrmtry share/icons/gnome/24x24/stock/document
+@dirrmtry share/icons/gnome/24x24/stock/data
+@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/mimetypes
+@dirrmtry share/icons/gnome/24x24/filesystems
+@dirrmtry share/icons/gnome/24x24/emblems
+@dirrmtry share/icons/gnome/24x24/devices
+@dirrmtry share/icons/gnome/24x24/apps
+@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/16x16/stock/text
+@dirrmtry share/icons/gnome/16x16/stock/table
+@dirrmtry share/icons/gnome/16x16/stock/object
+@dirrmtry share/icons/gnome/16x16/stock/net
+@dirrmtry share/icons/gnome/16x16/stock/navigation
+@dirrmtry share/icons/gnome/16x16/stock/media
+@dirrmtry share/icons/gnome/16x16/stock/io
+@dirrmtry share/icons/gnome/16x16/stock/image
+@dirrmtry share/icons/gnome/16x16/stock/generic
+@dirrmtry share/icons/gnome/16x16/stock/form
+@dirrmtry share/icons/gnome/16x16/stock/emoticons
+@dirrmtry share/icons/gnome/16x16/stock/document
+@dirrmtry share/icons/gnome/16x16/stock/data
+@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/mimetypes
+@dirrmtry share/icons/gnome/16x16/filesystems
+@dirrmtry share/icons/gnome/16x16/devices
+@dirrmtry share/icons/gnome/16x16/apps
+@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-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index 3c5b69fe62e..6c6e620de1d 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -3,14 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/misc/gnomeuserdocs2/Makefile,v 1.25 2006/04/13 07:52:36 bland Exp $
#
PORTNAME= gnomeuserdocs2
-PORTVERSION= 2.8.1
+PORTVERSION= 2.14.2
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome2-user-docs/2.8
-DISTNAME= gnome2-user-docs-${PORTVERSION}
+MASTER_SITE_SUBDIR= sources/gnome-user-docs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DISTNAME= gnome-user-docs-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -21,9 +22,9 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
USE_BZIP2= yes
USE_X_PREFIX= yes
-INSTALLS_OMF= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier gnometarget
+INSTALLS_OMF= yes
+USE_GNOME= gnomeprefix gnomehack gnomehier gnometarget gnomedocutils
.include <bsd.port.mk>
diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo
index aacbbd2873a..dad066c4092 100644
--- a/misc/gnome-user-docs/distinfo
+++ b/misc/gnome-user-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome2-user-docs-2.8.1.tar.bz2) = 90bdd21ea3e3e794f641dd805216f275
-SHA256 (gnome2/gnome2-user-docs-2.8.1.tar.bz2) = 70383b9d88063e8d75fb6f36dc83c1df590fbd2dc3c35c40f10c677f4bd4ab2a
-SIZE (gnome2/gnome2-user-docs-2.8.1.tar.bz2) = 1054681
+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
diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist
index 434eda5fd68..6ec699b3503 100644
--- a/misc/gnome-user-docs/pkg-plist
+++ b/misc/gnome-user-docs/pkg-plist
@@ -1,27 +1,65 @@
share/gnome/help/gnome-access-guide/C/accessintro.xml
+share/gnome/help/gnome-access-guide/C/ats.xml
share/gnome/help/gnome-access-guide/C/dtconfig.xml
+share/gnome/help/gnome-access-guide/C/figures/accessx.png
+share/gnome/help/gnome-access-guide/C/figures/bouncekeys.png
share/gnome/help/gnome-access-guide/C/figures/button.png
share/gnome/help/gnome-access-guide/C/figures/check_box.png
share/gnome/help/gnome-access-guide/C/figures/dropdown_combination_box.png
share/gnome/help/gnome-access-guide/C/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/C/figures/mousekeys.png
share/gnome/help/gnome-access-guide/C/figures/move_object_arrows.png
share/gnome/help/gnome-access-guide/C/figures/move_object_before.png
share/gnome/help/gnome-access-guide/C/figures/move_object_jump.png
share/gnome/help/gnome-access-guide/C/figures/move_object_push.png
-share/gnome/help/gnome-access-guide/C/figures/naut_iconview_anno_window.png
-share/gnome/help/gnome-access-guide/C/figures/paned_window_anno.png
share/gnome/help/gnome-access-guide/C/figures/radio_button.png
share/gnome/help/gnome-access-guide/C/figures/slider.png
+share/gnome/help/gnome-access-guide/C/figures/slowkeys.png
share/gnome/help/gnome-access-guide/C/figures/spin_box.png
+share/gnome/help/gnome-access-guide/C/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/C/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/C/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/C/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/C/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/C/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/C/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/C/figures/stickywindowlock.png
share/gnome/help/gnome-access-guide/C/figures/tabbed_section.png
-share/gnome/help/gnome-access-guide/C/figures/table.png
share/gnome/help/gnome-access-guide/C/figures/text_box.png
share/gnome/help/gnome-access-guide/C/figures/tree.png
share/gnome/help/gnome-access-guide/C/gnome-access-guide.xml
share/gnome/help/gnome-access-guide/C/keynav.xml
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/it/figures/accessx.png
+share/gnome/help/gnome-access-guide/it/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/it/figures/button.png
+share/gnome/help/gnome-access-guide/it/figures/check_box.png
+share/gnome/help/gnome-access-guide/it/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/it/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/it/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/it/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/it/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/it/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/it/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/it/figures/radio_button.png
+share/gnome/help/gnome-access-guide/it/figures/slider.png
+share/gnome/help/gnome-access-guide/it/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/it/figures/spin_box.png
+share/gnome/help/gnome-access-guide/it/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/it/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/it/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/it/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/it/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/it/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/it/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/it/figures/stickywindowlock.png
+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/system-admin-guide/C/appendixa.xml
share/gnome/help/system-admin-guide/C/appendixb.xml
share/gnome/help/system-admin-guide/C/fontconfig.xml
@@ -37,23 +75,17 @@ 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/user-guide/C/figures/applet_popup.png
+share/gnome/help/system-admin-guide/it/system-admin-guide.xml
share/gnome/help/user-guide/C/figures/ask_pointer.png
-share/gnome/help/user-guide/C/figures/caution.png
-share/gnome/help/user-guide/C/figures/column_resize_pointer.png
+share/gnome/help/user-guide/C/figures/busy_pointer.png
share/gnome/help/user-guide/C/figures/com_file_manager_menu.png
share/gnome/help/user-guide/C/figures/copy_pointer.png
-share/gnome/help/user-guide/C/figures/corner_resize_pointer.png
-share/gnome/help/user-guide/C/figures/file_manager_menu.png
-share/gnome/help/user-guide/C/figures/footprint_icon.png
share/gnome/help/user-guide/C/figures/force_quit.png
share/gnome/help/user-guide/C/figures/four_hide_button.png
-share/gnome/help/user-guide/C/figures/gedit_pref_dialog.png
share/gnome/help/user-guide/C/figures/gedit_window.png
-share/gnome/help/user-guide/C/figures/gnome-logo-icon.png
share/gnome/help/user-guide/C/figures/gnome_panel.png
-share/gnome/help/user-guide/C/figures/horiz_resize_pointer.png
-share/gnome/help/user-guide/C/figures/launcher_popup.png
+share/gnome/help/user-guide/C/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/C/figures/ibeam_pointer.png
share/gnome/help/user-guide/C/figures/link_pointer.png
share/gnome/help/user-guide/C/figures/lockscreen_icon.png
share/gnome/help/user-guide/C/figures/logout_icon.png
@@ -61,94 +93,237 @@ share/gnome/help/user-guide/C/figures/menu_bar_applet.png
share/gnome/help/user-guide/C/figures/menu_panel.png
share/gnome/help/user-guide/C/figures/move_panel_object_pointer.png
share/gnome/help/user-guide/C/figures/move_pointer.png
-share/gnome/help/user-guide/C/figures/naut_audioview_window.png
-share/gnome/help/user-guide/C/figures/naut_browser_filesystem.png
-share/gnome/help/user-guide/C/figures/naut_browser_window.png
-share/gnome/help/user-guide/C/figures/naut_computer_contents.png
+share/gnome/help/user-guide/C/figures/movewindow_pointer.png
+share/gnome/help/user-guide/C/figures/naut_browser_mode.png
+share/gnome/help/user-guide/C/figures/naut_button_bar.png
share/gnome/help/user-guide/C/figures/naut_computer_launcher.png
-share/gnome/help/user-guide/C/figures/naut_home_launcher.png
-share/gnome/help/user-guide/C/figures/naut_iconview_anno_window.png
-share/gnome/help/user-guide/C/figures/naut_iconview_window.png
+share/gnome/help/user-guide/C/figures/naut_emblem.png
+share/gnome/help/user-guide/C/figures/naut_go_to_location.png
share/gnome/help/user-guide/C/figures/naut_link_emblem.png
-share/gnome/help/user-guide/C/figures/naut_listview_window.png
share/gnome/help/user-guide/C/figures/naut_noread_emblem.png
share/gnome/help/user-guide/C/figures/naut_normal_size_button.png
share/gnome/help/user-guide/C/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/C/figures/naut_refine_search.png
share/gnome/help/user-guide/C/figures/naut_sampleemblem1_icon.png
share/gnome/help/user-guide/C/figures/naut_sampleemblem2_icon.png
share/gnome/help/user-guide/C/figures/naut_sampleemblem3_icon.png
share/gnome/help/user-guide/C/figures/naut_sampleemblem_icon.png
share/gnome/help/user-guide/C/figures/naut_samplesymlink_icon.png
-share/gnome/help/user-guide/C/figures/naut_sort_arrow_icon.png
+share/gnome/help/user-guide/C/figures/naut_search_bar.png
+share/gnome/help/user-guide/C/figures/naut_search_results.png
+share/gnome/help/user-guide/C/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/C/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/C/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/C/figures/naut_spatial_view.png
share/gnome/help/user-guide/C/figures/naut_starthere_launcher.png
share/gnome/help/user-guide/C/figures/naut_trash_launcher.png
-share/gnome/help/user-guide/C/figures/naut_tree_tab.png
-share/gnome/help/user-guide/C/figures/naut_viewpane_text_window.png
share/gnome/help/user-guide/C/figures/naut_zoom_in_button.png
share/gnome/help/user-guide/C/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/C/figures/nautilus_restore_saved_search.png
share/gnome/help/user-guide/C/figures/normal_pointer.png
share/gnome/help/user-guide/C/figures/not_available_pointer.png
-share/gnome/help/user-guide/C/figures/note.png
share/gnome/help/user-guide/C/figures/notification_area_icon.png
share/gnome/help/user-guide/C/figures/open_drawer.png
-share/gnome/help/user-guide/C/figures/open_main_menu.png
share/gnome/help/user-guide/C/figures/openwindows_menu.png
share/gnome/help/user-guide/C/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/C/figures/resize_pointer.png
share/gnome/help/user-guide/C/figures/run_button.png
-share/gnome/help/user-guide/C/figures/sample_anno_panel.png
share/gnome/help/user-guide/C/figures/sample_applet.png
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/tip.png
share/gnome/help/user-guide/C/figures/titlebar_anno_window.png
-share/gnome/help/user-guide/C/figures/typical_anno_desktop.png
share/gnome/help/user-guide/C/figures/typical_menu.png
-share/gnome/help/user-guide/C/figures/vert_resize_pointer.png
-share/gnome/help/user-guide/C/figures/warning.png
share/gnome/help/user-guide/C/figures/window_list_applet.png
share/gnome/help/user-guide/C/figures/window_list_group_applet.png
-share/gnome/help/user-guide/C/figures/window_menu.png
share/gnome/help/user-guide/C/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/C/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/C/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/C/figures/yelp_preferences.png
+share/gnome/help/user-guide/C/figures/yelp_window.png
share/gnome/help/user-guide/C/glossary.xml
share/gnome/help/user-guide/C/gosbasic.xml
-share/gnome/help/user-guide/C/goscustaccess.xml
-share/gnome/help/user-guide/C/goscustdesk-remotedesktop.xml
share/gnome/help/user-guide/C/goscustdesk.xml
-share/gnome/help/user-guide/C/goscustlookandfeel.xml
-share/gnome/help/user-guide/C/gosdeskback.xml
share/gnome/help/user-guide/C/goseditmainmenu.xml
-share/gnome/help/user-guide/C/gosmetacity.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
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/part1.xml
-share/gnome/help/user-guide/C/part2.xml
-share/gnome/help/user-guide/C/plaingnomestartpreftools.xml
share/gnome/help/user-guide/C/user-guide.xml
-share/gnome/help/user-guide/C/wgosbasic.xml
-share/gnome/help/user-guide/C/wgoscustaccess.xml
-share/gnome/help/user-guide/C/wgoscustdesk.xml
-share/gnome/help/user-guide/C/wgoscustlookandfeel.xml
-share/gnome/help/user-guide/C/wgosdeskback.xml
-share/gnome/help/user-guide/C/wgoseditmainmenu.xml
-share/gnome/help/user-guide/C/wgosmetacity.xml
-share/gnome/help/user-guide/C/wgosnautilus.xml
-share/gnome/help/user-guide/C/wgosoverview.xml
-share/gnome/help/user-guide/C/wgospanel.xml
-share/gnome/help/user-guide/C/wgosstartsession.xml
-share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf
-share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf
+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
+share/gnome/help/user-guide/es/figures/copy_pointer.png
+share/gnome/help/user-guide/es/figures/force_quit.png
+share/gnome/help/user-guide/es/figures/four_hide_button.png
+share/gnome/help/user-guide/es/figures/gedit_window.png
+share/gnome/help/user-guide/es/figures/gnome_panel.png
+share/gnome/help/user-guide/es/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/es/figures/ibeam_pointer.png
+share/gnome/help/user-guide/es/figures/link_pointer.png
+share/gnome/help/user-guide/es/figures/lockscreen_icon.png
+share/gnome/help/user-guide/es/figures/logout_icon.png
+share/gnome/help/user-guide/es/figures/menu_bar_applet.png
+share/gnome/help/user-guide/es/figures/menu_panel.png
+share/gnome/help/user-guide/es/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/es/figures/move_pointer.png
+share/gnome/help/user-guide/es/figures/movewindow_pointer.png
+share/gnome/help/user-guide/es/figures/naut_browser_mode.png
+share/gnome/help/user-guide/es/figures/naut_button_bar.png
+share/gnome/help/user-guide/es/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/es/figures/naut_emblem.png
+share/gnome/help/user-guide/es/figures/naut_go_to_location.png
+share/gnome/help/user-guide/es/figures/naut_link_emblem.png
+share/gnome/help/user-guide/es/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/es/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/es/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/es/figures/naut_refine_search.png
+share/gnome/help/user-guide/es/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/es/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/es/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/es/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/es/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/es/figures/naut_search_bar.png
+share/gnome/help/user-guide/es/figures/naut_search_results.png
+share/gnome/help/user-guide/es/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/es/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/es/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/es/figures/naut_spatial_view.png
+share/gnome/help/user-guide/es/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/es/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/es/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/es/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/es/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/es/figures/normal_pointer.png
+share/gnome/help/user-guide/es/figures/not_available_pointer.png
+share/gnome/help/user-guide/es/figures/notification_area_icon.png
+share/gnome/help/user-guide/es/figures/open_drawer.png
+share/gnome/help/user-guide/es/figures/openwindows_menu.png
+share/gnome/help/user-guide/es/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/es/figures/resize_pointer.png
+share/gnome/help/user-guide/es/figures/run_button.png
+share/gnome/help/user-guide/es/figures/sample_applet.png
+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/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
+share/gnome/help/user-guide/es/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/es/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/es/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/es/figures/yelp_preferences.png
+share/gnome/help/user-guide/es/figures/yelp_window.png
+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/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/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
+share/gnome/help/user-guide/it/figures/copy_pointer.png
+share/gnome/help/user-guide/it/figures/force_quit.png
+share/gnome/help/user-guide/it/figures/four_hide_button.png
+share/gnome/help/user-guide/it/figures/gedit_window.png
+share/gnome/help/user-guide/it/figures/gnome_panel.png
+share/gnome/help/user-guide/it/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/it/figures/ibeam_pointer.png
+share/gnome/help/user-guide/it/figures/link_pointer.png
+share/gnome/help/user-guide/it/figures/lockscreen_icon.png
+share/gnome/help/user-guide/it/figures/logout_icon.png
+share/gnome/help/user-guide/it/figures/menu_bar_applet.png
+share/gnome/help/user-guide/it/figures/menu_panel.png
+share/gnome/help/user-guide/it/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/it/figures/move_pointer.png
+share/gnome/help/user-guide/it/figures/movewindow_pointer.png
+share/gnome/help/user-guide/it/figures/naut_browser_mode.png
+share/gnome/help/user-guide/it/figures/naut_button_bar.png
+share/gnome/help/user-guide/it/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/it/figures/naut_emblem.png
+share/gnome/help/user-guide/it/figures/naut_go_to_location.png
+share/gnome/help/user-guide/it/figures/naut_link_emblem.png
+share/gnome/help/user-guide/it/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/it/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/it/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/it/figures/naut_refine_search.png
+share/gnome/help/user-guide/it/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/it/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/it/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/it/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/it/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/it/figures/naut_search_bar.png
+share/gnome/help/user-guide/it/figures/naut_search_results.png
+share/gnome/help/user-guide/it/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/it/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/it/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/it/figures/naut_spatial_view.png
+share/gnome/help/user-guide/it/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/it/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/it/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/it/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/it/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/it/figures/normal_pointer.png
+share/gnome/help/user-guide/it/figures/not_available_pointer.png
+share/gnome/help/user-guide/it/figures/notification_area_icon.png
+share/gnome/help/user-guide/it/figures/open_drawer.png
+share/gnome/help/user-guide/it/figures/openwindows_menu.png
+share/gnome/help/user-guide/it/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/it/figures/resize_pointer.png
+share/gnome/help/user-guide/it/figures/run_button.png
+share/gnome/help/user-guide/it/figures/sample_applet.png
+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/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
+share/gnome/help/user-guide/it/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/it/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/it/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/it/figures/yelp_preferences.png
+share/gnome/help/user-guide/it/figures/yelp_window.png
+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/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/omf/gnome-access-guide/gnome-access-guide-C.omf
+share/gnome/omf/gnome-access-guide/gnome-access-guide-it.omf
+share/gnome/omf/system-admin-guide/system-admin-guide-C.omf
+share/gnome/omf/system-admin-guide/system-admin-guide-it.omf
share/gnome/omf/user-guide/user-guide-C.omf
+share/gnome/omf/user-guide/user-guide-es.omf
+share/gnome/omf/user-guide/user-guide-it.omf
@dirrm share/gnome/omf/user-guide
-@dirrm share/gnome/omf/gnome2-user-docs
+@dirrm share/gnome/omf/system-admin-guide
+@dirrm share/gnome/omf/gnome-access-guide
+@dirrm share/gnome/help/user-guide/it/figures
+@dirrm share/gnome/help/user-guide/it
+@dirrm share/gnome/help/user-guide/es/figures
+@dirrm share/gnome/help/user-guide/es
@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/it
@dirrm share/gnome/help/system-admin-guide/C
@dirrm share/gnome/help/system-admin-guide
+@dirrm share/gnome/help/gnome-access-guide/it/figures
+@dirrm share/gnome/help/gnome-access-guide/it
@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 f572d2c295e..a69cda06a08 100644
--- a/misc/gnomehier/Makefile
+++ b/misc/gnomehier/Makefile
@@ -3,11 +3,13 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/misc/gnomehier/Makefile,v 1.11 2006/03/14 03:05:32 marcus Exp $
#
+# !!DON'T BUMP PORTREVISION ON MTREE CHANGES ANYMORE!!
PORTNAME= gnomehier
-PORTVERSION= 2.0
-PORTREVISION= 7
+PORTVERSION= 2.1
+PORTREVISION= 2
CATEGORIES= misc gnome
MASTER_SITES= # none
DISTFILES= # none
@@ -20,11 +22,10 @@ PLIST?= ${WRKDIR}/pkg-plist
PKGINSTALL= ${WRKDIR}/pkg-install
GNOME_MTREE= BSD.gnome-x11.dist
+GNOME_MTREE_ARGS=${MTREE_ARGS:S|${MTREE_FILE}|${PREFIX}/etc/mtree/${GNOME_MTREE}|}
USE_X_PREFIX= yes
-GNOME_MTREE_ARGS=${MTREE_ARGS:S|${MTREE_FILE}|${PREFIX}/etc/mtree/${GNOME_MTREE}|}
-
do-fetch:
@${DO_NADA}
@@ -47,7 +48,6 @@ pre-install:
pre-su-install:
${CHGRP} games ${WRKSRC}/share/gnome/games
${CHMOD} g=rwXs ${WRKSRC}/share/gnome/games
- ${MTREE_CMD} ${MTREE_ARGS} ${WRKSRC}/
cd ${WRKSRC} && \
${MTREE_CMD} -U -d -n -i -c -k "uname, gname, mode" \
> ${WRKDIR}/${GNOME_MTREE}
diff --git a/misc/gnomeuserdocs2/Makefile b/misc/gnomeuserdocs2/Makefile
index 3c5b69fe62e..6c6e620de1d 100644
--- a/misc/gnomeuserdocs2/Makefile
+++ b/misc/gnomeuserdocs2/Makefile
@@ -3,14 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/misc/gnomeuserdocs2/Makefile,v 1.25 2006/04/13 07:52:36 bland Exp $
#
PORTNAME= gnomeuserdocs2
-PORTVERSION= 2.8.1
+PORTVERSION= 2.14.2
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome2-user-docs/2.8
-DISTNAME= gnome2-user-docs-${PORTVERSION}
+MASTER_SITE_SUBDIR= sources/gnome-user-docs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DISTNAME= gnome-user-docs-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -21,9 +22,9 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
USE_BZIP2= yes
USE_X_PREFIX= yes
-INSTALLS_OMF= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier gnometarget
+INSTALLS_OMF= yes
+USE_GNOME= gnomeprefix gnomehack gnomehier gnometarget gnomedocutils
.include <bsd.port.mk>
diff --git a/misc/gnomeuserdocs2/distinfo b/misc/gnomeuserdocs2/distinfo
index aacbbd2873a..dad066c4092 100644
--- a/misc/gnomeuserdocs2/distinfo
+++ b/misc/gnomeuserdocs2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome2-user-docs-2.8.1.tar.bz2) = 90bdd21ea3e3e794f641dd805216f275
-SHA256 (gnome2/gnome2-user-docs-2.8.1.tar.bz2) = 70383b9d88063e8d75fb6f36dc83c1df590fbd2dc3c35c40f10c677f4bd4ab2a
-SIZE (gnome2/gnome2-user-docs-2.8.1.tar.bz2) = 1054681
+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
diff --git a/misc/gnomeuserdocs2/pkg-plist b/misc/gnomeuserdocs2/pkg-plist
index 434eda5fd68..6ec699b3503 100644
--- a/misc/gnomeuserdocs2/pkg-plist
+++ b/misc/gnomeuserdocs2/pkg-plist
@@ -1,27 +1,65 @@
share/gnome/help/gnome-access-guide/C/accessintro.xml
+share/gnome/help/gnome-access-guide/C/ats.xml
share/gnome/help/gnome-access-guide/C/dtconfig.xml
+share/gnome/help/gnome-access-guide/C/figures/accessx.png
+share/gnome/help/gnome-access-guide/C/figures/bouncekeys.png
share/gnome/help/gnome-access-guide/C/figures/button.png
share/gnome/help/gnome-access-guide/C/figures/check_box.png
share/gnome/help/gnome-access-guide/C/figures/dropdown_combination_box.png
share/gnome/help/gnome-access-guide/C/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/C/figures/mousekeys.png
share/gnome/help/gnome-access-guide/C/figures/move_object_arrows.png
share/gnome/help/gnome-access-guide/C/figures/move_object_before.png
share/gnome/help/gnome-access-guide/C/figures/move_object_jump.png
share/gnome/help/gnome-access-guide/C/figures/move_object_push.png
-share/gnome/help/gnome-access-guide/C/figures/naut_iconview_anno_window.png
-share/gnome/help/gnome-access-guide/C/figures/paned_window_anno.png
share/gnome/help/gnome-access-guide/C/figures/radio_button.png
share/gnome/help/gnome-access-guide/C/figures/slider.png
+share/gnome/help/gnome-access-guide/C/figures/slowkeys.png
share/gnome/help/gnome-access-guide/C/figures/spin_box.png
+share/gnome/help/gnome-access-guide/C/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/C/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/C/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/C/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/C/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/C/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/C/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/C/figures/stickywindowlock.png
share/gnome/help/gnome-access-guide/C/figures/tabbed_section.png
-share/gnome/help/gnome-access-guide/C/figures/table.png
share/gnome/help/gnome-access-guide/C/figures/text_box.png
share/gnome/help/gnome-access-guide/C/figures/tree.png
share/gnome/help/gnome-access-guide/C/gnome-access-guide.xml
share/gnome/help/gnome-access-guide/C/keynav.xml
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/it/figures/accessx.png
+share/gnome/help/gnome-access-guide/it/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/it/figures/button.png
+share/gnome/help/gnome-access-guide/it/figures/check_box.png
+share/gnome/help/gnome-access-guide/it/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/it/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/it/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/it/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/it/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/it/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/it/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/it/figures/radio_button.png
+share/gnome/help/gnome-access-guide/it/figures/slider.png
+share/gnome/help/gnome-access-guide/it/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/it/figures/spin_box.png
+share/gnome/help/gnome-access-guide/it/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/it/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/it/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/it/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/it/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/it/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/it/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/it/figures/stickywindowlock.png
+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/system-admin-guide/C/appendixa.xml
share/gnome/help/system-admin-guide/C/appendixb.xml
share/gnome/help/system-admin-guide/C/fontconfig.xml
@@ -37,23 +75,17 @@ 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/user-guide/C/figures/applet_popup.png
+share/gnome/help/system-admin-guide/it/system-admin-guide.xml
share/gnome/help/user-guide/C/figures/ask_pointer.png
-share/gnome/help/user-guide/C/figures/caution.png
-share/gnome/help/user-guide/C/figures/column_resize_pointer.png
+share/gnome/help/user-guide/C/figures/busy_pointer.png
share/gnome/help/user-guide/C/figures/com_file_manager_menu.png
share/gnome/help/user-guide/C/figures/copy_pointer.png
-share/gnome/help/user-guide/C/figures/corner_resize_pointer.png
-share/gnome/help/user-guide/C/figures/file_manager_menu.png
-share/gnome/help/user-guide/C/figures/footprint_icon.png
share/gnome/help/user-guide/C/figures/force_quit.png
share/gnome/help/user-guide/C/figures/four_hide_button.png
-share/gnome/help/user-guide/C/figures/gedit_pref_dialog.png
share/gnome/help/user-guide/C/figures/gedit_window.png
-share/gnome/help/user-guide/C/figures/gnome-logo-icon.png
share/gnome/help/user-guide/C/figures/gnome_panel.png
-share/gnome/help/user-guide/C/figures/horiz_resize_pointer.png
-share/gnome/help/user-guide/C/figures/launcher_popup.png
+share/gnome/help/user-guide/C/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/C/figures/ibeam_pointer.png
share/gnome/help/user-guide/C/figures/link_pointer.png
share/gnome/help/user-guide/C/figures/lockscreen_icon.png
share/gnome/help/user-guide/C/figures/logout_icon.png
@@ -61,94 +93,237 @@ share/gnome/help/user-guide/C/figures/menu_bar_applet.png
share/gnome/help/user-guide/C/figures/menu_panel.png
share/gnome/help/user-guide/C/figures/move_panel_object_pointer.png
share/gnome/help/user-guide/C/figures/move_pointer.png
-share/gnome/help/user-guide/C/figures/naut_audioview_window.png
-share/gnome/help/user-guide/C/figures/naut_browser_filesystem.png
-share/gnome/help/user-guide/C/figures/naut_browser_window.png
-share/gnome/help/user-guide/C/figures/naut_computer_contents.png
+share/gnome/help/user-guide/C/figures/movewindow_pointer.png
+share/gnome/help/user-guide/C/figures/naut_browser_mode.png
+share/gnome/help/user-guide/C/figures/naut_button_bar.png
share/gnome/help/user-guide/C/figures/naut_computer_launcher.png
-share/gnome/help/user-guide/C/figures/naut_home_launcher.png
-share/gnome/help/user-guide/C/figures/naut_iconview_anno_window.png
-share/gnome/help/user-guide/C/figures/naut_iconview_window.png
+share/gnome/help/user-guide/C/figures/naut_emblem.png
+share/gnome/help/user-guide/C/figures/naut_go_to_location.png
share/gnome/help/user-guide/C/figures/naut_link_emblem.png
-share/gnome/help/user-guide/C/figures/naut_listview_window.png
share/gnome/help/user-guide/C/figures/naut_noread_emblem.png
share/gnome/help/user-guide/C/figures/naut_normal_size_button.png
share/gnome/help/user-guide/C/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/C/figures/naut_refine_search.png
share/gnome/help/user-guide/C/figures/naut_sampleemblem1_icon.png
share/gnome/help/user-guide/C/figures/naut_sampleemblem2_icon.png
share/gnome/help/user-guide/C/figures/naut_sampleemblem3_icon.png
share/gnome/help/user-guide/C/figures/naut_sampleemblem_icon.png
share/gnome/help/user-guide/C/figures/naut_samplesymlink_icon.png
-share/gnome/help/user-guide/C/figures/naut_sort_arrow_icon.png
+share/gnome/help/user-guide/C/figures/naut_search_bar.png
+share/gnome/help/user-guide/C/figures/naut_search_results.png
+share/gnome/help/user-guide/C/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/C/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/C/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/C/figures/naut_spatial_view.png
share/gnome/help/user-guide/C/figures/naut_starthere_launcher.png
share/gnome/help/user-guide/C/figures/naut_trash_launcher.png
-share/gnome/help/user-guide/C/figures/naut_tree_tab.png
-share/gnome/help/user-guide/C/figures/naut_viewpane_text_window.png
share/gnome/help/user-guide/C/figures/naut_zoom_in_button.png
share/gnome/help/user-guide/C/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/C/figures/nautilus_restore_saved_search.png
share/gnome/help/user-guide/C/figures/normal_pointer.png
share/gnome/help/user-guide/C/figures/not_available_pointer.png
-share/gnome/help/user-guide/C/figures/note.png
share/gnome/help/user-guide/C/figures/notification_area_icon.png
share/gnome/help/user-guide/C/figures/open_drawer.png
-share/gnome/help/user-guide/C/figures/open_main_menu.png
share/gnome/help/user-guide/C/figures/openwindows_menu.png
share/gnome/help/user-guide/C/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/C/figures/resize_pointer.png
share/gnome/help/user-guide/C/figures/run_button.png
-share/gnome/help/user-guide/C/figures/sample_anno_panel.png
share/gnome/help/user-guide/C/figures/sample_applet.png
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/tip.png
share/gnome/help/user-guide/C/figures/titlebar_anno_window.png
-share/gnome/help/user-guide/C/figures/typical_anno_desktop.png
share/gnome/help/user-guide/C/figures/typical_menu.png
-share/gnome/help/user-guide/C/figures/vert_resize_pointer.png
-share/gnome/help/user-guide/C/figures/warning.png
share/gnome/help/user-guide/C/figures/window_list_applet.png
share/gnome/help/user-guide/C/figures/window_list_group_applet.png
-share/gnome/help/user-guide/C/figures/window_menu.png
share/gnome/help/user-guide/C/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/C/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/C/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/C/figures/yelp_preferences.png
+share/gnome/help/user-guide/C/figures/yelp_window.png
share/gnome/help/user-guide/C/glossary.xml
share/gnome/help/user-guide/C/gosbasic.xml
-share/gnome/help/user-guide/C/goscustaccess.xml
-share/gnome/help/user-guide/C/goscustdesk-remotedesktop.xml
share/gnome/help/user-guide/C/goscustdesk.xml
-share/gnome/help/user-guide/C/goscustlookandfeel.xml
-share/gnome/help/user-guide/C/gosdeskback.xml
share/gnome/help/user-guide/C/goseditmainmenu.xml
-share/gnome/help/user-guide/C/gosmetacity.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
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/part1.xml
-share/gnome/help/user-guide/C/part2.xml
-share/gnome/help/user-guide/C/plaingnomestartpreftools.xml
share/gnome/help/user-guide/C/user-guide.xml
-share/gnome/help/user-guide/C/wgosbasic.xml
-share/gnome/help/user-guide/C/wgoscustaccess.xml
-share/gnome/help/user-guide/C/wgoscustdesk.xml
-share/gnome/help/user-guide/C/wgoscustlookandfeel.xml
-share/gnome/help/user-guide/C/wgosdeskback.xml
-share/gnome/help/user-guide/C/wgoseditmainmenu.xml
-share/gnome/help/user-guide/C/wgosmetacity.xml
-share/gnome/help/user-guide/C/wgosnautilus.xml
-share/gnome/help/user-guide/C/wgosoverview.xml
-share/gnome/help/user-guide/C/wgospanel.xml
-share/gnome/help/user-guide/C/wgosstartsession.xml
-share/gnome/omf/gnome2-user-docs/gnome-access-guide-C.omf
-share/gnome/omf/gnome2-user-docs/system-admin-guide-C.omf
+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
+share/gnome/help/user-guide/es/figures/copy_pointer.png
+share/gnome/help/user-guide/es/figures/force_quit.png
+share/gnome/help/user-guide/es/figures/four_hide_button.png
+share/gnome/help/user-guide/es/figures/gedit_window.png
+share/gnome/help/user-guide/es/figures/gnome_panel.png
+share/gnome/help/user-guide/es/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/es/figures/ibeam_pointer.png
+share/gnome/help/user-guide/es/figures/link_pointer.png
+share/gnome/help/user-guide/es/figures/lockscreen_icon.png
+share/gnome/help/user-guide/es/figures/logout_icon.png
+share/gnome/help/user-guide/es/figures/menu_bar_applet.png
+share/gnome/help/user-guide/es/figures/menu_panel.png
+share/gnome/help/user-guide/es/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/es/figures/move_pointer.png
+share/gnome/help/user-guide/es/figures/movewindow_pointer.png
+share/gnome/help/user-guide/es/figures/naut_browser_mode.png
+share/gnome/help/user-guide/es/figures/naut_button_bar.png
+share/gnome/help/user-guide/es/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/es/figures/naut_emblem.png
+share/gnome/help/user-guide/es/figures/naut_go_to_location.png
+share/gnome/help/user-guide/es/figures/naut_link_emblem.png
+share/gnome/help/user-guide/es/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/es/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/es/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/es/figures/naut_refine_search.png
+share/gnome/help/user-guide/es/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/es/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/es/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/es/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/es/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/es/figures/naut_search_bar.png
+share/gnome/help/user-guide/es/figures/naut_search_results.png
+share/gnome/help/user-guide/es/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/es/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/es/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/es/figures/naut_spatial_view.png
+share/gnome/help/user-guide/es/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/es/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/es/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/es/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/es/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/es/figures/normal_pointer.png
+share/gnome/help/user-guide/es/figures/not_available_pointer.png
+share/gnome/help/user-guide/es/figures/notification_area_icon.png
+share/gnome/help/user-guide/es/figures/open_drawer.png
+share/gnome/help/user-guide/es/figures/openwindows_menu.png
+share/gnome/help/user-guide/es/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/es/figures/resize_pointer.png
+share/gnome/help/user-guide/es/figures/run_button.png
+share/gnome/help/user-guide/es/figures/sample_applet.png
+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/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
+share/gnome/help/user-guide/es/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/es/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/es/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/es/figures/yelp_preferences.png
+share/gnome/help/user-guide/es/figures/yelp_window.png
+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/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/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
+share/gnome/help/user-guide/it/figures/copy_pointer.png
+share/gnome/help/user-guide/it/figures/force_quit.png
+share/gnome/help/user-guide/it/figures/four_hide_button.png
+share/gnome/help/user-guide/it/figures/gedit_window.png
+share/gnome/help/user-guide/it/figures/gnome_panel.png
+share/gnome/help/user-guide/it/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/it/figures/ibeam_pointer.png
+share/gnome/help/user-guide/it/figures/link_pointer.png
+share/gnome/help/user-guide/it/figures/lockscreen_icon.png
+share/gnome/help/user-guide/it/figures/logout_icon.png
+share/gnome/help/user-guide/it/figures/menu_bar_applet.png
+share/gnome/help/user-guide/it/figures/menu_panel.png
+share/gnome/help/user-guide/it/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/it/figures/move_pointer.png
+share/gnome/help/user-guide/it/figures/movewindow_pointer.png
+share/gnome/help/user-guide/it/figures/naut_browser_mode.png
+share/gnome/help/user-guide/it/figures/naut_button_bar.png
+share/gnome/help/user-guide/it/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/it/figures/naut_emblem.png
+share/gnome/help/user-guide/it/figures/naut_go_to_location.png
+share/gnome/help/user-guide/it/figures/naut_link_emblem.png
+share/gnome/help/user-guide/it/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/it/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/it/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/it/figures/naut_refine_search.png
+share/gnome/help/user-guide/it/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/it/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/it/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/it/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/it/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/it/figures/naut_search_bar.png
+share/gnome/help/user-guide/it/figures/naut_search_results.png
+share/gnome/help/user-guide/it/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/it/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/it/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/it/figures/naut_spatial_view.png
+share/gnome/help/user-guide/it/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/it/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/it/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/it/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/it/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/it/figures/normal_pointer.png
+share/gnome/help/user-guide/it/figures/not_available_pointer.png
+share/gnome/help/user-guide/it/figures/notification_area_icon.png
+share/gnome/help/user-guide/it/figures/open_drawer.png
+share/gnome/help/user-guide/it/figures/openwindows_menu.png
+share/gnome/help/user-guide/it/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/it/figures/resize_pointer.png
+share/gnome/help/user-guide/it/figures/run_button.png
+share/gnome/help/user-guide/it/figures/sample_applet.png
+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/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
+share/gnome/help/user-guide/it/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/it/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/it/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/it/figures/yelp_preferences.png
+share/gnome/help/user-guide/it/figures/yelp_window.png
+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/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/omf/gnome-access-guide/gnome-access-guide-C.omf
+share/gnome/omf/gnome-access-guide/gnome-access-guide-it.omf
+share/gnome/omf/system-admin-guide/system-admin-guide-C.omf
+share/gnome/omf/system-admin-guide/system-admin-guide-it.omf
share/gnome/omf/user-guide/user-guide-C.omf
+share/gnome/omf/user-guide/user-guide-es.omf
+share/gnome/omf/user-guide/user-guide-it.omf
@dirrm share/gnome/omf/user-guide
-@dirrm share/gnome/omf/gnome2-user-docs
+@dirrm share/gnome/omf/system-admin-guide
+@dirrm share/gnome/omf/gnome-access-guide
+@dirrm share/gnome/help/user-guide/it/figures
+@dirrm share/gnome/help/user-guide/it
+@dirrm share/gnome/help/user-guide/es/figures
+@dirrm share/gnome/help/user-guide/es
@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/it
@dirrm share/gnome/help/system-admin-guide/C
@dirrm share/gnome/help/system-admin-guide
+@dirrm share/gnome/help/gnome-access-guide/it/figures
+@dirrm share/gnome/help/gnome-access-guide/it
@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/net/avahi/Makefile b/net/avahi/Makefile
index 5051ee39200..fae5fae41a3 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/net/avahi/Makefile,v 1.15 2006/04/28 01:52:15 marcus Exp $
PORTNAME= avahi
PORTVERSION= 0.6.9
-PORTREVISION?= 3
-CATEGORIES= net dns
+PORTREVISION?= 4
+CATEGORIES?= net dns
MASTER_SITES= http://www.avahi.org/download/
MAINTAINER?= gnome@FreeBSD.org
@@ -21,7 +21,7 @@ LIB_DEPENDS?= expat.6:${PORTSDIR}/textproc/expat2 \
USE_GNOME?= gnomehack ltverhack glib20
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS?=--with-distro=freebsd \
--with-dbus-system-address=unix:path=/var/run/dbus/dbus.pipe \
@@ -32,13 +32,16 @@ CONFIGURE_ARGS?=--with-distro=freebsd \
--disable-monodoc \
--disable-doxygen-doc \
--disable-doxygen-dot \
- --localstatedir=/var
+ --localstatedir=/var \
+ --enable-compat-howl \
+ --enable-compat-libdns_sd
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
.if !defined(AVAHI_SLAVE)
+CONFLICTS= howl-[0-9]* mDNSResponder-[0-9]*
MAN1= avahi-browse-domains.1 avahi-browse.1 avahi-publish-address.1 \
avahi-publish-service.1 avahi-publish.1 avahi-resolve-address.1 \
diff --git a/net/avahi/files/patch-Makefile.in b/net/avahi/files/patch-Makefile.in
index 8467b3b3eca..a117a3b11b5 100644
--- a/net/avahi/files/patch-Makefile.in
+++ b/net/avahi/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig Sun Jan 29 13:36:41 2006
-+++ Makefile.in Sun Jan 29 13:37:37 2006
+--- Makefile.in.orig Mon Jan 30 13:05:47 2006
++++ Makefile.in Mon Jan 30 13:07:36 2006
@@ -1037,6 +1037,8 @@
avahi-core.pc: avahi-core.pc.in
sed -e 's,@prefix\@,$(prefix),g' \
@@ -9,3 +9,19 @@
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
@HAVE_DBUS_TRUE@avahi-client.pc: avahi-client.pc.in
+@@ -1047,11 +1049,15 @@
+ @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@avahi-compat-howl.pc: avahi-compat-howl.pc.in
+ @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@ sed -e 's,@prefix\@,$(prefix),g' \
+ @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@ -e 's,@libdir\@,$(libdir),g' \
++@ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@ -e 's,@PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
++@ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@ -e 's,@PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
+ @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@ -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' $< > $@
+
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@avahi-compat-libdns_sd.pc: avahi-compat-libdns_sd.pc.in
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ sed -e 's,@prefix\@,$(prefix),g' \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ -e 's,@libdir\@,$(libdir),g' \
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ -e 's,@PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ -e 's,@PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
+ @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
diff --git a/net/avahi/files/patch-avahi-core_socket.c b/net/avahi/files/patch-avahi-core_socket.c
index 783d41c02f3..dc19ed3795b 100644
--- a/net/avahi/files/patch-avahi-core_socket.c
+++ b/net/avahi/files/patch-avahi-core_socket.c
@@ -1,38 +1,28 @@
---- avahi-core/socket.c.orig Sun Apr 23 19:20:31 2006
-+++ avahi-core/socket.c Sun Apr 23 20:16:46 2006
+--- avahi-core/socket.c.orig Thu Feb 9 20:45:09 2006
++++ avahi-core/socket.c Mon Apr 24 17:14:18 2006
@@ -468,7 +468,7 @@ int avahi_send_dns_packet_ipv4(int fd, A
size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_pktinfo)) / sizeof(size_t)) + 1];
#elif defined(IP_SENDSRCADDR)
struct cmsghdr *cmsg;
- size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_addr)) / sizeof(size_t)) + 1];
-+ char cmsg_data[CMSG_SPACE(sizeof(struct in_addr))];
++ uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_addr))];
#endif
assert(fd >= 0);
-@@ -491,8 +491,8 @@ int avahi_send_dns_packet_ipv4(int fd, A
- msg.msg_iov = &io;
- msg.msg_iovlen = 1;
- msg.msg_flags = 0;
-- msg.msg_control = NULL;
-- msg.msg_controllen = 0;
-+ msg.msg_control = cmsg_data;
-+ msg.msg_controllen = sizeof(cmsg_data);
-
- #ifdef IP_PKTINFO
- if (interface > 0 || src_address) {
-@@ -518,18 +518,15 @@ int avahi_send_dns_packet_ipv4(int fd, A
+@@ -518,18 +518,17 @@ int avahi_send_dns_packet_ipv4(int fd, A
#elif defined(IP_SENDSRCADDR)
if (src_address) {
struct in_addr *addr;
+
++ msg.msg_control = cmsg_data;
++ msg.msg_controllen = sizeof(cmsg_data);
+ cmsg = CMSG_FIRSTHDR(&msg);
- memset(cmsg_data, 0, sizeof(cmsg_data));
- cmsg = (struct cmsghdr*) cmsg_data;
-- cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
+ cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
cmsg->cmsg_level = IPPROTO_IP;
cmsg->cmsg_type = IP_SENDSRCADDR;
-+ cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
addr = (struct in_addr *)CMSG_DATA(cmsg);
addr->s_addr = src_address->address;
@@ -42,30 +32,30 @@
}
#elif defined(IP_MULTICAST_IF)
{
-@@ -551,7 +548,7 @@ int avahi_send_dns_packet_ipv6(int fd, A
+@@ -551,7 +550,7 @@ int avahi_send_dns_packet_ipv6(int fd, A
struct msghdr msg;
struct iovec io;
struct cmsghdr *cmsg;
- size_t cmsg_data[(CMSG_SPACE(sizeof(struct in6_pktinfo))/sizeof(size_t)) + 1];
-+ char cmsg_data[CMSG_SPACE(sizeof(struct in6_pktinfo))];
++ uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in6_pktinfo))];
assert(fd >= 0);
assert(p);
-@@ -576,9 +573,11 @@ int avahi_send_dns_packet_ipv6(int fd, A
+@@ -576,9 +575,11 @@ int avahi_send_dns_packet_ipv6(int fd, A
if (interface > 0 || src_address) {
struct in6_pktinfo *pkti;
+
+ msg.msg_control = cmsg_data;
+ msg.msg_controllen = sizeof(cmsg_data);
-+ cmsg = CMSG_FIRSTHDR(&msg);
++ cmsg = CMSG_FIRSTHDR(&msg);
- memset(cmsg_data, 0, sizeof(cmsg_data));
- cmsg = (struct cmsghdr*) cmsg_data;
cmsg->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo));
cmsg->cmsg_level = IPPROTO_IPV6;
cmsg->cmsg_type = IPV6_PKTINFO;
-@@ -591,8 +590,6 @@ int avahi_send_dns_packet_ipv6(int fd, A
+@@ -591,8 +592,6 @@ int avahi_send_dns_packet_ipv6(int fd, A
if (src_address)
memcpy(&pkti->ipi6_addr, src_address->address, sizeof(src_address->address));
diff --git a/net/avahi/files/patch-avahi-sharp_Makefile.in b/net/avahi/files/patch-avahi-sharp_Makefile.in
deleted file mode 100644
index 45c44adbea7..00000000000
--- a/net/avahi/files/patch-avahi-sharp_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- avahi-sharp/Makefile.in.orig Tue Feb 7 23:04:12 2006
-+++ avahi-sharp/Makefile.in Tue Feb 7 23:25:30 2006
-@@ -573,10 +573,10 @@
- $(ASSEMBLY): $(AVAHISOURCES)
- mcs -keyfile:$(srcdir)/avahi.snk -target:library -out:$@ -debug $(AVAHISOURCES) -r:Mono.Posix
-
- $(ASSEMBLY).config: $(ASSEMBLY).config.in
-- $(srcdir)/gencfg.sh $(top_builddir)/avahi-client/libavahi-client.la \
-- $(top_builddir)/avahi-common/libavahi-common.la \
-- $(top_builddir)/avahi-glib/libavahi-glib.la < $< > $@
-+# $(srcdir)/gencfg.sh $(top_builddir)/avahi-client/libavahi-client.la \
-+# $(top_builddir)/avahi-common/libavahi-common.la \
-+# $(top_builddir)/avahi-glib/libavahi-glib.la < $< > $@
-
- @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@all: $(ASSEMBLY) $(ASSEMBLY).config
-
diff --git a/net/avahi/pkg-plist b/net/avahi/pkg-plist
index 62470d47895..52fb63b9b0e 100644
--- a/net/avahi/pkg-plist
+++ b/net/avahi/pkg-plist
@@ -32,6 +32,26 @@ include/avahi-common/strlst.h
include/avahi-common/thread-watch.h
include/avahi-common/timeval.h
include/avahi-common/watch.h
+include/avahi-compat-howl/corby/buffer.h
+include/avahi-compat-howl/corby/channel.h
+include/avahi-compat-howl/corby/corby.h
+include/avahi-compat-howl/corby/message.h
+include/avahi-compat-howl/corby/object.h
+include/avahi-compat-howl/corby/orb.h
+include/avahi-compat-howl/discovery/discovery.h
+include/avahi-compat-howl/discovery/text_record.h
+include/avahi-compat-howl/howl.h
+include/avahi-compat-howl/rendezvous/rendezvous.h
+include/avahi-compat-howl/rendezvous/text_record.h
+include/avahi-compat-howl/salt/address.h
+include/avahi-compat-howl/salt/debug.h
+include/avahi-compat-howl/salt/interface.h
+include/avahi-compat-howl/salt/platform.h
+include/avahi-compat-howl/salt/salt.h
+include/avahi-compat-howl/salt/signal.h
+include/avahi-compat-howl/salt/socket.h
+include/avahi-compat-howl/salt/time.h
+include/avahi-compat-libdns_sd/dns_sd.h
include/avahi-core/core.h
include/avahi-core/log.h
include/avahi-core/lookup.h
@@ -55,7 +75,17 @@ lib/libavahi-glib.a
lib/libavahi-glib.la
lib/libavahi-glib.so
lib/libavahi-glib.so.1
+lib/libdns_sd.a
+lib/libdns_sd.la
+lib/libdns_sd.so
+lib/libdns_sd.so.1
+lib/libhowl.a
+lib/libhowl.la
+lib/libhowl.so
+lib/libhowl.so.0
libdata/pkgconfig/avahi-client.pc
+libdata/pkgconfig/avahi-compat-howl.pc
+libdata/pkgconfig/avahi-compat-libdns_sd.pc
libdata/pkgconfig/avahi-core.pc
libdata/pkgconfig/avahi-glib.pc
sbin/avahi-daemon
@@ -77,6 +107,12 @@ sbin/avahi-dnsconfd
@dirrm %%DATADIR%%
@dirrm include/avahi-glib
@dirrm include/avahi-core
+@dirrm include/avahi-compat-libdns_sd
+@dirrm include/avahi-compat-howl/salt
+@dirrm include/avahi-compat-howl/rendezvous
+@dirrm include/avahi-compat-howl/discovery
+@dirrm include/avahi-compat-howl/corby
+@dirrm include/avahi-compat-howl
@dirrm include/avahi-common
@dirrm include/avahi-client
@dirrm etc/avahi/services
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 64bd2d9d720..ff331c15cef 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,15 +3,16 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/gnomenettool/Makefile,v 1.11 2005/10/04 03:12:16 ahze Exp $
+# $MCom: ports/net/gnomenettool/Makefile,v 1.23 2006/04/24 02:02:46 marcus Exp $
#
PORTNAME= gnomenettool
-PORTVERSION= 1.4.1
+PORTVERSION= 2.14.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-nettool/1.4
+MASTER_SITE_SUBDIR= sources/gnome-nettool/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-nettool-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -22,6 +23,7 @@ USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2
USE_GMAKE= yes
+USE_GETTEXT= 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 2062ca84df7..830c528617b 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-nettool-1.4.1.tar.bz2) = a64f7b39f24b4d3a843d545f2dbb611d
-SHA256 (gnome2/gnome-nettool-1.4.1.tar.bz2) = 8b8fc47dcfddf4194c30efba4cdbf6efc96a49b1fd69b3a87461d1af383f4a91
-SIZE (gnome2/gnome-nettool-1.4.1.tar.bz2) = 477548
+MD5 (gnome2/gnome-nettool-2.14.1.tar.bz2) = d7693bf04adfdb5d3a64dafb1c59cb3c
+SHA256 (gnome2/gnome-nettool-2.14.1.tar.bz2) = 9ec757eed3315c12e1e1ca84d3deed6f3ad7d82dc9005608e33768559be6ead7
+SIZE (gnome2/gnome-nettool-2.14.1.tar.bz2) = 490947
diff --git a/net/gnome-nettool/files/patch-src_info.c b/net/gnome-nettool/files/patch-src_info.c
index 9b895e8fd67..7faf5e433c9 100644
--- a/net/gnome-nettool/files/patch-src_info.c
+++ b/net/gnome-nettool/files/patch-src_info.c
@@ -1,15 +1,17 @@
---- src/info.c.orig Thu Jan 27 18:26:53 2005
-+++ src/info.c Sun Jul 3 17:46:31 2005
-@@ -20,6 +20,8 @@
+--- src/info.c.orig Mon Apr 3 15:41:33 2006
++++ src/info.c Sun Apr 23 21:57:39 2006
+@@ -20,6 +20,10 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glib/gprintf.h>
+#include <sys/types.h>
+#include <string.h>
++#include <errno.h>
++#include <unistd.h>
#ifdef HAVE_CONFIG_H
# include <config.h>
-@@ -38,6 +40,11 @@
+@@ -38,6 +42,11 @@
#include <sys/ioctl.h>
#include <stdlib.h>
#include <net/if.h>
@@ -21,7 +23,7 @@
#include "info.h"
#include "utils.h"
-@@ -58,6 +65,7 @@ static InfoInterfaceDescription info_ifa
+@@ -58,6 +67,7 @@ static InfoInterfaceDescription info_ifa
{ N_("Ethernet Interface"), INFO_INTERFACE_ETH, "16_ethernet.xpm", "eth", NULL },
{ N_("Wireless Interface"), INFO_INTERFACE_WLAN, "wavelan-16.png", "wlan", NULL },
{ N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "ppp", NULL },
@@ -29,7 +31,7 @@
{ N_("Parallel Line Interface"), INFO_INTERFACE_PLIP, "16_plip.xpm", "plip", NULL },
{ N_("Infrared Interface"), INFO_INTERFACE_IRLAN, "irda-16.png", "irlan", NULL },
{ N_("Loopback Interface"), INFO_INTERFACE_LO, "16_loopback.xpm", "lo", NULL },
-@@ -128,9 +136,42 @@ info_get_interface_from_dev_name (const
+@@ -128,9 +138,42 @@ info_get_interface_from_dev_name (const
{
gint i;
gchar *path;
@@ -71,10 +73,10 @@
for (i = 0; info_iface_desc[i].name; i++)
- if (strstr (dev_name, info_iface_desc[i].prefix) == dev_name) {
+ if (strstr (dev_type, info_iface_desc[i].prefix) == dev_type) {
- (*iface) = g_strdup_printf ("%s (%s)", info_iface_desc[i].name, dev_name);
+ (*iface) = g_strdup_printf ("%s (%s)", _(info_iface_desc[i].name), dev_name);
if (info_iface_desc[i].pixbuf == NULL) {
path = g_build_filename (PIXMAPS_DIR, info_iface_desc[i].icon, NULL);
-@@ -217,38 +258,87 @@ info_nic_update_stats (gpointer data)
+@@ -217,38 +260,87 @@ info_nic_update_stats (gpointer data)
gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10];
*/
gchar iface[30]; /*, flags[30]; */
@@ -168,7 +170,7 @@
if (g_ascii_strcasecmp (iface, text) == 0) {
/*
-@@ -276,7 +366,9 @@ info_nic_update_stats (gpointer data)
+@@ -276,7 +368,9 @@ info_nic_update_stats (gpointer data)
}
g_io_channel_unref (io);
@@ -179,24 +181,29 @@
return TRUE;
}
-@@ -405,8 +497,16 @@ info_get_nic_information (const gchar *n
+@@ -405,8 +499,20 @@ info_get_nic_information (const gchar *n
InfoIpAddr *ip;
gint flags;
mii_data_result data;
+#ifdef __FreeBSD__
-+ gint hwmib[6], hwlen;
++ gint hwmib[6];
++ size_t hwlen;
+ gchar *hwbuf;
+ guchar *hwptr;
+ struct if_msghdr *hwifm;
+ struct sockaddr_dl *hwsinptr;
+#endif
- getifaddrs (&ifa0);
+- getifaddrs (&ifa0);
++ if (getifaddrs (&ifa0) != 0) {
++ g_warning ("getifaddrs failed: %s", g_strerror (errno));
++ goto fail;
++ }
+ memset (&data, 0, sizeof (data));
for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) {
if (strcmp (ifr6->ifa_name, nic) != 0) {
-@@ -452,7 +552,9 @@ info_get_nic_information (const gchar *n
+@@ -452,7 +558,9 @@ info_get_nic_information (const gchar *n
ifc.ifc_req = (struct ifreq *) buf;
ioctl (sockfd, SIOCGIFCONF, &ifc);
@@ -206,7 +213,7 @@
for (ptr = buf; ptr < buf + ifc.ifc_len;) {
ifr = (struct ifreq *) ptr;
-@@ -483,6 +585,45 @@ info_get_nic_information (const gchar *n
+@@ -483,6 +591,45 @@ info_get_nic_information (const gchar *n
(int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[3],
(int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[4],
(int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[5]);
@@ -252,3 +259,12 @@
#else
g_sprintf (dst, NOT_AVAILABLE);
#endif /* SIOCGIFHWADDR */
+@@ -595,6 +742,8 @@ info_get_nic_information (const gchar *n
+ }
+
+ freeifaddrs (ifa0);
++fail:
++ ;
+ }
+
+ static gint *
diff --git a/net/gnome-nettool/files/patch-src_nettool.c b/net/gnome-nettool/files/patch-src_nettool.c
index cae4f648fdf..d8ac21225fd 100644
--- a/net/gnome-nettool/files/patch-src_nettool.c
+++ b/net/gnome-nettool/files/patch-src_nettool.c
@@ -1,14 +1,23 @@
---- src/nettool.c.orig Fri Jan 7 23:13:56 2005
-+++ src/nettool.c Mon Jan 24 21:03:48 2005
-@@ -22,6 +22,7 @@
- #include <glib/gi18n.h>
+--- src/nettool.c.orig Tue May 10 18:14:48 2005
++++ src/nettool.c Sun Apr 23 22:00:13 2006
+@@ -24,6 +24,7 @@
+ #include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
+#include <netinet/in.h>
#include <signal.h>
#include <errno.h>
#include <sys/wait.h>
-@@ -357,6 +358,10 @@
+@@ -315,7 +316,7 @@ netinfo_io_text_buffer_dialog (GIOChanne
+ GIOCondition condition, gpointer data)
+ {
+ gchar *text = NULL;
+- gint len;
++ gsize len;
+ Netinfo *netinfo = (Netinfo *) data;
+
+ g_return_val_if_fail (channel != NULL, FALSE);
+@@ -360,6 +361,10 @@ netinfo_io_text_buffer_dialog (GIOChanne
len, NULL);
}
@@ -19,7 +28,7 @@
} else if (status == G_IO_STATUS_AGAIN) {
char buf[1];
-@@ -368,12 +373,13 @@
+@@ -371,12 +376,13 @@ netinfo_io_text_buffer_dialog (GIOChanne
}
g_string_append_c (netinfo->command_output, buf[0]);
}
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index 0d3d6886cd5..531ea6a3d90 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -17,8 +17,10 @@ share/locale/bn/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
+share/locale/cy/LC_MESSAGES/gnome-nettool.mo
share/locale/da/LC_MESSAGES/gnome-nettool.mo
share/locale/de/LC_MESSAGES/gnome-nettool.mo
+share/locale/dz/LC_MESSAGES/gnome-nettool.mo
share/locale/el/LC_MESSAGES/gnome-nettool.mo
share/locale/en_CA/LC_MESSAGES/gnome-nettool.mo
share/locale/en_GB/LC_MESSAGES/gnome-nettool.mo
@@ -32,11 +34,13 @@ share/locale/ga/LC_MESSAGES/gnome-nettool.mo
share/locale/gl/LC_MESSAGES/gnome-nettool.mo
share/locale/gu/LC_MESSAGES/gnome-nettool.mo
share/locale/he/LC_MESSAGES/gnome-nettool.mo
+share/locale/hi/LC_MESSAGES/gnome-nettool.mo
share/locale/hr/LC_MESSAGES/gnome-nettool.mo
share/locale/hu/LC_MESSAGES/gnome-nettool.mo
share/locale/id/LC_MESSAGES/gnome-nettool.mo
share/locale/it/LC_MESSAGES/gnome-nettool.mo
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/mk/LC_MESSAGES/gnome-nettool.mo
@@ -68,6 +72,8 @@ 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_TW/LC_MESSAGES/gnome-nettool.mo
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrm share/gnome/gnome-nettool/pixmaps
@dirrm share/gnome/gnome-nettool/dialogs
@dirrm share/gnome/gnome-nettool
diff --git a/net/gnomenettool/Makefile b/net/gnomenettool/Makefile
index 64bd2d9d720..ff331c15cef 100644
--- a/net/gnomenettool/Makefile
+++ b/net/gnomenettool/Makefile
@@ -3,15 +3,16 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/gnomenettool/Makefile,v 1.11 2005/10/04 03:12:16 ahze Exp $
+# $MCom: ports/net/gnomenettool/Makefile,v 1.23 2006/04/24 02:02:46 marcus Exp $
#
PORTNAME= gnomenettool
-PORTVERSION= 1.4.1
+PORTVERSION= 2.14.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-nettool/1.4
+MASTER_SITE_SUBDIR= sources/gnome-nettool/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-nettool-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -22,6 +23,7 @@ USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2
USE_GMAKE= yes
+USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/gnomenettool/distinfo b/net/gnomenettool/distinfo
index 2062ca84df7..830c528617b 100644
--- a/net/gnomenettool/distinfo
+++ b/net/gnomenettool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-nettool-1.4.1.tar.bz2) = a64f7b39f24b4d3a843d545f2dbb611d
-SHA256 (gnome2/gnome-nettool-1.4.1.tar.bz2) = 8b8fc47dcfddf4194c30efba4cdbf6efc96a49b1fd69b3a87461d1af383f4a91
-SIZE (gnome2/gnome-nettool-1.4.1.tar.bz2) = 477548
+MD5 (gnome2/gnome-nettool-2.14.1.tar.bz2) = d7693bf04adfdb5d3a64dafb1c59cb3c
+SHA256 (gnome2/gnome-nettool-2.14.1.tar.bz2) = 9ec757eed3315c12e1e1ca84d3deed6f3ad7d82dc9005608e33768559be6ead7
+SIZE (gnome2/gnome-nettool-2.14.1.tar.bz2) = 490947
diff --git a/net/gnomenettool/files/patch-src_info.c b/net/gnomenettool/files/patch-src_info.c
index 9b895e8fd67..7faf5e433c9 100644
--- a/net/gnomenettool/files/patch-src_info.c
+++ b/net/gnomenettool/files/patch-src_info.c
@@ -1,15 +1,17 @@
---- src/info.c.orig Thu Jan 27 18:26:53 2005
-+++ src/info.c Sun Jul 3 17:46:31 2005
-@@ -20,6 +20,8 @@
+--- src/info.c.orig Mon Apr 3 15:41:33 2006
++++ src/info.c Sun Apr 23 21:57:39 2006
+@@ -20,6 +20,10 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glib/gprintf.h>
+#include <sys/types.h>
+#include <string.h>
++#include <errno.h>
++#include <unistd.h>
#ifdef HAVE_CONFIG_H
# include <config.h>
-@@ -38,6 +40,11 @@
+@@ -38,6 +42,11 @@
#include <sys/ioctl.h>
#include <stdlib.h>
#include <net/if.h>
@@ -21,7 +23,7 @@
#include "info.h"
#include "utils.h"
-@@ -58,6 +65,7 @@ static InfoInterfaceDescription info_ifa
+@@ -58,6 +67,7 @@ static InfoInterfaceDescription info_ifa
{ N_("Ethernet Interface"), INFO_INTERFACE_ETH, "16_ethernet.xpm", "eth", NULL },
{ N_("Wireless Interface"), INFO_INTERFACE_WLAN, "wavelan-16.png", "wlan", NULL },
{ N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "ppp", NULL },
@@ -29,7 +31,7 @@
{ N_("Parallel Line Interface"), INFO_INTERFACE_PLIP, "16_plip.xpm", "plip", NULL },
{ N_("Infrared Interface"), INFO_INTERFACE_IRLAN, "irda-16.png", "irlan", NULL },
{ N_("Loopback Interface"), INFO_INTERFACE_LO, "16_loopback.xpm", "lo", NULL },
-@@ -128,9 +136,42 @@ info_get_interface_from_dev_name (const
+@@ -128,9 +138,42 @@ info_get_interface_from_dev_name (const
{
gint i;
gchar *path;
@@ -71,10 +73,10 @@
for (i = 0; info_iface_desc[i].name; i++)
- if (strstr (dev_name, info_iface_desc[i].prefix) == dev_name) {
+ if (strstr (dev_type, info_iface_desc[i].prefix) == dev_type) {
- (*iface) = g_strdup_printf ("%s (%s)", info_iface_desc[i].name, dev_name);
+ (*iface) = g_strdup_printf ("%s (%s)", _(info_iface_desc[i].name), dev_name);
if (info_iface_desc[i].pixbuf == NULL) {
path = g_build_filename (PIXMAPS_DIR, info_iface_desc[i].icon, NULL);
-@@ -217,38 +258,87 @@ info_nic_update_stats (gpointer data)
+@@ -217,38 +260,87 @@ info_nic_update_stats (gpointer data)
gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10];
*/
gchar iface[30]; /*, flags[30]; */
@@ -168,7 +170,7 @@
if (g_ascii_strcasecmp (iface, text) == 0) {
/*
-@@ -276,7 +366,9 @@ info_nic_update_stats (gpointer data)
+@@ -276,7 +368,9 @@ info_nic_update_stats (gpointer data)
}
g_io_channel_unref (io);
@@ -179,24 +181,29 @@
return TRUE;
}
-@@ -405,8 +497,16 @@ info_get_nic_information (const gchar *n
+@@ -405,8 +499,20 @@ info_get_nic_information (const gchar *n
InfoIpAddr *ip;
gint flags;
mii_data_result data;
+#ifdef __FreeBSD__
-+ gint hwmib[6], hwlen;
++ gint hwmib[6];
++ size_t hwlen;
+ gchar *hwbuf;
+ guchar *hwptr;
+ struct if_msghdr *hwifm;
+ struct sockaddr_dl *hwsinptr;
+#endif
- getifaddrs (&ifa0);
+- getifaddrs (&ifa0);
++ if (getifaddrs (&ifa0) != 0) {
++ g_warning ("getifaddrs failed: %s", g_strerror (errno));
++ goto fail;
++ }
+ memset (&data, 0, sizeof (data));
for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) {
if (strcmp (ifr6->ifa_name, nic) != 0) {
-@@ -452,7 +552,9 @@ info_get_nic_information (const gchar *n
+@@ -452,7 +558,9 @@ info_get_nic_information (const gchar *n
ifc.ifc_req = (struct ifreq *) buf;
ioctl (sockfd, SIOCGIFCONF, &ifc);
@@ -206,7 +213,7 @@
for (ptr = buf; ptr < buf + ifc.ifc_len;) {
ifr = (struct ifreq *) ptr;
-@@ -483,6 +585,45 @@ info_get_nic_information (const gchar *n
+@@ -483,6 +591,45 @@ info_get_nic_information (const gchar *n
(int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[3],
(int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[4],
(int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[5]);
@@ -252,3 +259,12 @@
#else
g_sprintf (dst, NOT_AVAILABLE);
#endif /* SIOCGIFHWADDR */
+@@ -595,6 +742,8 @@ info_get_nic_information (const gchar *n
+ }
+
+ freeifaddrs (ifa0);
++fail:
++ ;
+ }
+
+ static gint *
diff --git a/net/gnomenettool/files/patch-src_nettool.c b/net/gnomenettool/files/patch-src_nettool.c
index cae4f648fdf..d8ac21225fd 100644
--- a/net/gnomenettool/files/patch-src_nettool.c
+++ b/net/gnomenettool/files/patch-src_nettool.c
@@ -1,14 +1,23 @@
---- src/nettool.c.orig Fri Jan 7 23:13:56 2005
-+++ src/nettool.c Mon Jan 24 21:03:48 2005
-@@ -22,6 +22,7 @@
- #include <glib/gi18n.h>
+--- src/nettool.c.orig Tue May 10 18:14:48 2005
++++ src/nettool.c Sun Apr 23 22:00:13 2006
+@@ -24,6 +24,7 @@
+ #include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
+#include <netinet/in.h>
#include <signal.h>
#include <errno.h>
#include <sys/wait.h>
-@@ -357,6 +358,10 @@
+@@ -315,7 +316,7 @@ netinfo_io_text_buffer_dialog (GIOChanne
+ GIOCondition condition, gpointer data)
+ {
+ gchar *text = NULL;
+- gint len;
++ gsize len;
+ Netinfo *netinfo = (Netinfo *) data;
+
+ g_return_val_if_fail (channel != NULL, FALSE);
+@@ -360,6 +361,10 @@ netinfo_io_text_buffer_dialog (GIOChanne
len, NULL);
}
@@ -19,7 +28,7 @@
} else if (status == G_IO_STATUS_AGAIN) {
char buf[1];
-@@ -368,12 +373,13 @@
+@@ -371,12 +376,13 @@ netinfo_io_text_buffer_dialog (GIOChanne
}
g_string_append_c (netinfo->command_output, buf[0]);
}
diff --git a/net/gnomenettool/pkg-plist b/net/gnomenettool/pkg-plist
index 0d3d6886cd5..531ea6a3d90 100644
--- a/net/gnomenettool/pkg-plist
+++ b/net/gnomenettool/pkg-plist
@@ -17,8 +17,10 @@ share/locale/bn/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
+share/locale/cy/LC_MESSAGES/gnome-nettool.mo
share/locale/da/LC_MESSAGES/gnome-nettool.mo
share/locale/de/LC_MESSAGES/gnome-nettool.mo
+share/locale/dz/LC_MESSAGES/gnome-nettool.mo
share/locale/el/LC_MESSAGES/gnome-nettool.mo
share/locale/en_CA/LC_MESSAGES/gnome-nettool.mo
share/locale/en_GB/LC_MESSAGES/gnome-nettool.mo
@@ -32,11 +34,13 @@ share/locale/ga/LC_MESSAGES/gnome-nettool.mo
share/locale/gl/LC_MESSAGES/gnome-nettool.mo
share/locale/gu/LC_MESSAGES/gnome-nettool.mo
share/locale/he/LC_MESSAGES/gnome-nettool.mo
+share/locale/hi/LC_MESSAGES/gnome-nettool.mo
share/locale/hr/LC_MESSAGES/gnome-nettool.mo
share/locale/hu/LC_MESSAGES/gnome-nettool.mo
share/locale/id/LC_MESSAGES/gnome-nettool.mo
share/locale/it/LC_MESSAGES/gnome-nettool.mo
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/mk/LC_MESSAGES/gnome-nettool.mo
@@ -68,6 +72,8 @@ 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_TW/LC_MESSAGES/gnome-nettool.mo
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrm share/gnome/gnome-nettool/pixmaps
@dirrm share/gnome/gnome-nettool/dialogs
@dirrm share/gnome/gnome-nettool
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 8dd024dcf71..9f7c2d21463 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,15 +3,14 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $MCom: ports/net/vino/Makefile,v 1.21 2005/10/08 19:41:39 marcus Exp $
+# $MCom: ports/net/vino/Makefile,v 1.28 2006/04/13 07:52:37 bland Exp $
#
PORTNAME= vino
-PORTVERSION= 2.12.0
-PORTREVISION= 2
+PORTVERSION= 2.13.5
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
MAINTAINER= gnome@FreeBSD.org
COMMENT= VNC server that allows for remote access to your GNOME desktop
@@ -19,6 +18,7 @@ COMMENT= VNC server that allows for remote access to your GNOME desktop
LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix intlhack gnomehack gnomepanel
USE_GMAKE= yes
diff --git a/net/vino/distinfo b/net/vino/distinfo
index 421a629fb60..8a52a9171be 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,3 +1,3 @@
-MD5 (vino-2.12.0.tar.bz2) = eba0962a0e1b9f21719c5688d3d0728b
-SHA256 (vino-2.12.0.tar.bz2) = 235780a5ff2b714c9a514ec64b0e7dd04a230655b094c0ad2dcd8fa0c4dea627
-SIZE (vino-2.12.0.tar.bz2) = 564627
+MD5 (vino-2.13.5.tar.bz2) = 9bc8c3f0e639fdc7b9ed023501308359
+SHA256 (vino-2.13.5.tar.bz2) = 58ee9c77070a8865cce6d25dd6b68fae02b307b64b203d78bd492e33c8e0c89f
+SIZE (vino-2.13.5.tar.bz2) = 566620
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index b0791a55805..7138e41d395 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -34,6 +34,7 @@ share/locale/id/LC_MESSAGES/vino.mo
share/locale/it/LC_MESSAGES/vino.mo
share/locale/ja/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/mk/LC_MESSAGES/vino.mo
share/locale/mn/LC_MESSAGES/vino.mo
diff --git a/palm/synce-trayicon/Makefile b/palm/synce-trayicon/Makefile
index 09cacfedf5c..eba8fcff60e 100644
--- a/palm/synce-trayicon/Makefile
+++ b/palm/synce-trayicon/Makefile
@@ -6,7 +6,7 @@
PORTNAME= synce-trayicon
PORTVERSION= 0.9.0
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= palm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= synce
@@ -16,11 +16,11 @@ COMMENT= GNOME tray icon showing battery and storage status of a WinCE device
BUILD_DEPENDS= ${X11BASE}/lib/gnome-vfs-2.0/modules/libsyncevfs.so:${PORTSDIR}/palm/synce-gnomevfs
RUN_DEPENDS= ${X11BASE}/lib/gnome-vfs-2.0/modules/libsyncevfs.so:${PORTSDIR}/palm/synce-gnomevfs
-LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2
-
-USE_GNOME= libgnomeui gnometarget
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop2
USE_GMAKE= yes
+USE_GNOME= libgnomeui gnometarget
+USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
CONFIGURE_ARGS+= --with-libsynce=${LOCALBASE} \
diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index 19454ad0b48..4f91104654a 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -3,29 +3,29 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.14 2005/09/07 14:54:53 adamw Exp $
+# $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.19 2006/04/13 07:52:37 bland Exp $
#
PORTNAME= gnomekeyringmanager
-PORTVERSION= 2.12.0
+PORTVERSION= 2.14.0
CATEGORIES= security gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-keyring-manager/2.12
+MASTER_SITE_SUBDIR= sources/gnome-keyring-manager/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-keyring-manager-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME keyring manager
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils
LIB_DEPENDS= gnome-keyring:${PORTSDIR}/security/gnomekeyring
USE_X_PREFIX= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
+USE_GETTEXT= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
-USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui
+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 518cfe03c81..f453addc776 100644
--- a/security/gnome-keyring-manager/distinfo
+++ b/security/gnome-keyring-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = 0a588c64839390e0c6e07250b509a86a
-SHA256 (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = cf0b94305fd14582a20b5bcd55f0f391caa0aefb8019a239631a455997cb54ce
-SIZE (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = 380274
+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
diff --git a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-main-ui.c b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-main-ui.c
deleted file mode 100644
index 81a4de59585..00000000000
--- a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-main-ui.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/gnome-keyring-manager-main-ui.c.orig Fri Jun 10 19:59:37 2005
-+++ src/gnome-keyring-manager-main-ui.c Fri Jun 10 19:59:45 2005
-@@ -1100,6 +1100,7 @@ gkm_main_ui_initialize_menu (GKMMainUI *
- {
- GtkWidget *menubar;
- GtkAccelGroup *accel_group;
-+ GError *error = NULL;
-
- self->priv->action_group = gtk_action_group_new ("MenuActions");
- gtk_action_group_add_actions (self->priv->action_group, entries,
-@@ -1111,7 +1112,6 @@ gkm_main_ui_initialize_menu (GKMMainUI *
- self->priv->action_group, 0);
- accel_group = gtk_ui_manager_get_accel_group (self->priv->ui_manager);
- gtk_window_add_accel_group (GTK_WINDOW (self->priv->window), accel_group);
-- GError *error = NULL;
- if (!gtk_ui_manager_add_ui_from_file (self->priv->ui_manager,
- GLADEDIR MENU_FILE,
- &error))
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
index c05c11acf6e..3291d28419e 100644
--- 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
@@ -1,23 +1,5 @@
--- 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
-@@ -304,8 +304,6 @@ gkm_about_dialog_new (GtkWindow *transie
- {
- GtkWidget *about;
-
-- g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL);
--
- const char *authors[] = {
- "Fernando Herrera <fherrera@onirica.com>",
- "Mariano Su\303\241rez-Alvarez <mariano@gnome.org>",
-@@ -317,6 +315,8 @@ gkm_about_dialog_new (GtkWindow *transie
- NULL
- };
-
-+ g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL);
-+
- gtk_about_dialog_set_email_hook ((GtkAboutDialogActivateLinkFunc) gkm_about_dialog_activate_links,
- GINT_TO_POINTER (LINK_TYPE_EMAIL), NULL);
-
@@ -354,6 +354,10 @@ gkm_get_application_path (void)
{
path = g_file_read_link ("/proc/self/exe", NULL);
diff --git a/security/gnome-keyring-manager/pkg-plist b/security/gnome-keyring-manager/pkg-plist
index 9b1c28598b1..feae65637b2 100644
--- a/security/gnome-keyring-manager/pkg-plist
+++ b/security/gnome-keyring-manager/pkg-plist
@@ -8,13 +8,16 @@ share/gnome/gnome-keyring-manager/stock_new-key.png
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/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-uk.omf
share/locale/bg/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/bn/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/el/LC_MESSAGES/gnome-keyring-manager.mo
@@ -52,10 +55,15 @@ share/locale/sv/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
+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/es
@dirrm share/gnome/help/gnome-keyring-manager/C
@dirrm share/gnome/help/gnome-keyring-manager
@dirrm share/gnome/gnome-keyring-manager
diff --git a/security/gnomekeyringmanager/Makefile b/security/gnomekeyringmanager/Makefile
index 19454ad0b48..4f91104654a 100644
--- a/security/gnomekeyringmanager/Makefile
+++ b/security/gnomekeyringmanager/Makefile
@@ -3,29 +3,29 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.14 2005/09/07 14:54:53 adamw Exp $
+# $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.19 2006/04/13 07:52:37 bland Exp $
#
PORTNAME= gnomekeyringmanager
-PORTVERSION= 2.12.0
+PORTVERSION= 2.14.0
CATEGORIES= security gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-keyring-manager/2.12
+MASTER_SITE_SUBDIR= sources/gnome-keyring-manager/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-keyring-manager-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME keyring manager
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils
LIB_DEPENDS= gnome-keyring:${PORTSDIR}/security/gnomekeyring
USE_X_PREFIX= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
+USE_GETTEXT= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
-USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui
+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/gnomekeyringmanager/distinfo b/security/gnomekeyringmanager/distinfo
index 518cfe03c81..f453addc776 100644
--- a/security/gnomekeyringmanager/distinfo
+++ b/security/gnomekeyringmanager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = 0a588c64839390e0c6e07250b509a86a
-SHA256 (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = cf0b94305fd14582a20b5bcd55f0f391caa0aefb8019a239631a455997cb54ce
-SIZE (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = 380274
+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
diff --git a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-main-ui.c b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-main-ui.c
deleted file mode 100644
index 81a4de59585..00000000000
--- a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-main-ui.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/gnome-keyring-manager-main-ui.c.orig Fri Jun 10 19:59:37 2005
-+++ src/gnome-keyring-manager-main-ui.c Fri Jun 10 19:59:45 2005
-@@ -1100,6 +1100,7 @@ gkm_main_ui_initialize_menu (GKMMainUI *
- {
- GtkWidget *menubar;
- GtkAccelGroup *accel_group;
-+ GError *error = NULL;
-
- self->priv->action_group = gtk_action_group_new ("MenuActions");
- gtk_action_group_add_actions (self->priv->action_group, entries,
-@@ -1111,7 +1112,6 @@ gkm_main_ui_initialize_menu (GKMMainUI *
- self->priv->action_group, 0);
- accel_group = gtk_ui_manager_get_accel_group (self->priv->ui_manager);
- gtk_window_add_accel_group (GTK_WINDOW (self->priv->window), accel_group);
-- GError *error = NULL;
- if (!gtk_ui_manager_add_ui_from_file (self->priv->ui_manager,
- GLADEDIR MENU_FILE,
- &error))
diff --git a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c
index c05c11acf6e..3291d28419e 100644
--- a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c
+++ b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c
@@ -1,23 +1,5 @@
--- 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
-@@ -304,8 +304,6 @@ gkm_about_dialog_new (GtkWindow *transie
- {
- GtkWidget *about;
-
-- g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL);
--
- const char *authors[] = {
- "Fernando Herrera <fherrera@onirica.com>",
- "Mariano Su\303\241rez-Alvarez <mariano@gnome.org>",
-@@ -317,6 +315,8 @@ gkm_about_dialog_new (GtkWindow *transie
- NULL
- };
-
-+ g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL);
-+
- gtk_about_dialog_set_email_hook ((GtkAboutDialogActivateLinkFunc) gkm_about_dialog_activate_links,
- GINT_TO_POINTER (LINK_TYPE_EMAIL), NULL);
-
@@ -354,6 +354,10 @@ gkm_get_application_path (void)
{
path = g_file_read_link ("/proc/self/exe", NULL);
diff --git a/security/gnomekeyringmanager/pkg-plist b/security/gnomekeyringmanager/pkg-plist
index 9b1c28598b1..feae65637b2 100644
--- a/security/gnomekeyringmanager/pkg-plist
+++ b/security/gnomekeyringmanager/pkg-plist
@@ -8,13 +8,16 @@ share/gnome/gnome-keyring-manager/stock_new-key.png
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/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-uk.omf
share/locale/bg/LC_MESSAGES/gnome-keyring-manager.mo
share/locale/bn/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/el/LC_MESSAGES/gnome-keyring-manager.mo
@@ -52,10 +55,15 @@ share/locale/sv/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
+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/es
@dirrm share/gnome/help/gnome-keyring-manager/C
@dirrm share/gnome/help/gnome-keyring-manager
@dirrm share/gnome/gnome-keyring-manager
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 75f08979ee4..7fff39609a4 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -3,12 +3,11 @@
# Whom: Dave McKay <dave@mu.org>
#
# $FreeBSD$
-# $MCom: ports/security/seahorse/Makefile,v 1.8 2005/10/14 20:39:58 adamw Exp $
+# $MCom: ports/security/seahorse/Makefile,v 1.16 2006/03/05 21:52:25 marcus Exp $
#
PORTNAME= seahorse
-PORTVERSION= 0.8
-PORTREVISION= 4
+PORTVERSION= 0.8.1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR=sources/${PORTNAME}/0.8
@@ -22,11 +21,11 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
LIB_DEPENDS= gpgme.15:${PORTSDIR}/security/gpgme
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --disable-gpg-check
@@ -35,14 +34,14 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GCONF_SCHEMAS= seahorse.schemas
-OPTIONS= GEDIT "Enable the gedit plug-in" on \
- NAUTILUS "Enable the Nautilus component" on \
+OPTIONS= NAUTILUS "Enable the Nautilus component" on \
LDAP "Enable LDAP support" on \
+ GEDIT "Enable GEdit plug-in support" on \
HKP "Enable HKP keyserver interface" on
.include <bsd.port.pre.mk>
-.if defined(WITH_GEDIT)
+.if !defined(WITHOUT_GEDIT)
BUILD_DEPENDS+= gedit:${PORTSDIR}/editors/gedit
RUN_DEPENDS+= gedit:${PORTSDIR}/editors/gedit
PLIST_SUB+= GEDIT=""
@@ -52,7 +51,7 @@ PLIST_SUB+= GEDIT="@comment "
CONFIGURE_ARGS+=--disable-gedit
.endif
-.if defined(WITH_NAUTILUS)
+.if !defined(WITHOUT_NAUTILUS)
USE_GNOME+= nautilus2
PLIST_SUB+= NAUTILUS=""
.else
@@ -72,10 +71,6 @@ LIB_DEPENDS+= soup-2.2.8:${PORTSDIR}/devel/libsoup
CONFIGURE_ARGS+=--disable-hkp
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|gedit-2.10|gedit-2.12|g' \
- ${WRKSRC}/configure
-
post-install:
-@update-desktop-database
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index c9ee38c21b9..bd26f470f11 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seahorse-0.8.tar.bz2) = b8c4878cdcbf57e9885583672934772c
-SHA256 (gnome2/seahorse-0.8.tar.bz2) = 797a3f22ca135e5def00a872ef9aed07475f753fae76dbddb401011178cd4d17
-SIZE (gnome2/seahorse-0.8.tar.bz2) = 946453
+MD5 (gnome2/seahorse-0.8.1.tar.bz2) = 5d69954ff503c625aa2618acde660496
+SHA256 (gnome2/seahorse-0.8.1.tar.bz2) = 1aba14b58f2366beaf32324d95281a03799b4888ac1701f0ec788b43b4117e90
+SIZE (gnome2/seahorse-0.8.1.tar.bz2) = 971378
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index c73da4505bf..21b6c917854 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -3,21 +3,23 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.41 2005/10/08 19:41:39 marcus Exp $
+# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.50 2006/04/24 07:23:03 marcus Exp $
#
PORTNAME= gconf-editor
-PORTVERSION= 2.12.1
+PORTVERSION= 2.14.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A gconf database editor for the GNOME 2 environment
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index b734b4b802e..1ced8c30490 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconf-editor-2.12.1.tar.bz2) = 0fa81dee78ca10f0192eb19afa6883f5
-SHA256 (gnome2/gconf-editor-2.12.1.tar.bz2) = 3f1da5b93f1182c0b750a49d7de739f835a69600e74d4147db8ae68400f6aa59
-SIZE (gnome2/gconf-editor-2.12.1.tar.bz2) = 539803
+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
diff --git a/sysutils/gconf-editor/files/patch-src_gconf-editor-window.c b/sysutils/gconf-editor/files/patch-src_gconf-editor-window.c
new file mode 100644
index 00000000000..7ff0eb54426
--- /dev/null
+++ b/sysutils/gconf-editor/files/patch-src_gconf-editor-window.c
@@ -0,0 +1,11 @@
+--- 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 de48244c72b..d3c4bd63506 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -35,6 +35,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/br/LC_MESSAGES/gconf-editor.mo
share/locale/bs/LC_MESSAGES/gconf-editor.mo
share/locale/ca/LC_MESSAGES/gconf-editor.mo
share/locale/cs/LC_MESSAGES/gconf-editor.mo
@@ -98,6 +99,7 @@ share/locale/uk/LC_MESSAGES/gconf-editor.mo
share/locale/vi/LC_MESSAGES/gconf-editor.mo
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
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@@ -105,6 +107,8 @@ share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@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
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 94b63a0febd..10adbe11977 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,15 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.85 2005/10/03 15:29:07 ahze Exp $
+# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.109 2006/04/18 02:28:56 marcus Exp $
#
PORTNAME= gnomecontrolcenter2
-PORTVERSION= 2.12.3
-PORTREVISION= 1
+PORTVERSION= 2.14.1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/control-center/2.12
+MASTER_SITE_SUBDIR= sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -21,16 +21,20 @@ COMMENT= Control center for GNOME 2 project
LIB_DEPENDS= xklavier.10:${PORTSDIR}/x11/libxklavier
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
-USE_GSTREAMER= yes
+USE_GSTREAMER= good
WANT_GNOME= yes
USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \
- gnomemenus desktopfileutils
+ gnomemenus desktopfileutils nautilus2
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
+INSTALLS_ICONS= yes
INSTALLS_SHLIB= yes
+CONFIGURE_ARGS= --enable-gstreamer=0.10 \
+ --disable-hal
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
@@ -48,10 +52,6 @@ WITH_GNOME= yes
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-BROKEN= Does not build on 4.X
-.endif
-
.if ${HAVE_GNOME:Mevolutiondataserver}!=""
USE_GNOME+= evolutiondataserver
CONFIGURE_ARGS+=--enable-aboutme
@@ -64,8 +64,6 @@ PLIST_SUB+= ABOUTME="@comment "
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
- @${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \
- ${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c
@${REINPLACE_CMD} -e 's|/bin/tar|/usr/bin/tar|g ; \
s|/bin/gzip|/usr/bin/gzip|g' \
${WRKSRC}/capplets/theme-switcher/gnome-theme-installer.c
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 7e03447ea0e..02add5cb6a2 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/control-center-2.12.3.tar.bz2) = e8f57ec1852d08d421016732b605a615
-SHA256 (gnome2/control-center-2.12.3.tar.bz2) = c25fd622f737037aa71c44dc9cdc3a1e9248408938e7fdfbbb60eba18c1192d8
-SIZE (gnome2/control-center-2.12.3.tar.bz2) = 1787009
+MD5 (gnome2/control-center-2.14.1.tar.bz2) = d673df12692ee08b9fc3d69739f8779e
+SHA256 (gnome2/control-center-2.14.1.tar.bz2) = c55cc800a6d636b8a98885a68685eff32db158fe1b638ff02ff89394ee6e6163
+SIZE (gnome2/control-center-2.14.1.tar.bz2) = 1869223
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 7ea6bb0dd35..49727c882a8 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,16 +1,25 @@
---- capplets/about-me/gnome-about-me-password.c.orig Wed Aug 10 05:45:08 2005
-+++ capplets/about-me/gnome-about-me-password.c Wed Aug 10 15:44:57 2005
-@@ -35,7 +35,13 @@
- #include <sys/wait.h>
- #include <sys/poll.h>
- #include <termios.h>
-+#include <signal.h>
+--- 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>
+ #endif
+
+#ifndef __FreeBSD__
- #include <pty.h>
-+#else
+ #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>
-+#endif
+ #include <signal.h>
+ #endif
- #include "capplet-util.h"
- #include "eel-alert-dialog.h"
diff --git a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c
deleted file mode 100644
index 0d1f85f32c7..00000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- capplets/about-me/gnome-about-me.c.orig Wed Jul 27 13:45:17 2005
-+++ capplets/about-me/gnome-about-me.c Wed Jul 27 13:47:09 2005
-@@ -258,12 +258,10 @@
- static char *
- get_user_login (void)
- {
-- char buf[LINE_MAX * 4];
-- struct passwd pwd, *err;
-+ struct passwd *pwd;
-
-- int i;
-- i = getpwuid_r(getuid(), &pwd, buf, sizeof(buf), &err);
-- return ((i == 0) && (err == &pwd)) ? g_strdup(pwd.pw_name) : NULL;
-+ pwd = getpwuid(getuid());
-+ return (pwd != NULL) ? g_strdup(pwd->pw_name) : NULL;
- }
-
- /*
-@@ -664,6 +662,7 @@
- struct passwd *pwent;
- char *user = NULL;
- gchar *str;
-+ gchar **tok;
-
- me = g_new0 (GnomeAboutMe, 1);
-
-@@ -733,7 +732,6 @@
- _("Unknown login ID, the user database might be corrupted"));
- return ;
- }
-- gchar **tok;
- tok = g_strsplit (pwent->pw_gecos, ",", 0);
-
- /************************************************/
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c
new file mode 100644
index 00000000000..3362406ddcc
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c
@@ -0,0 +1,10 @@
+--- gnome-settings-daemon/actions/acme-volume-gstreamer.c.orig Mon Apr 17 22:23:18 2006
++++ gnome-settings-daemon/actions/acme-volume-gstreamer.c Mon Apr 17 22:25:17 2006
+@@ -29,6 +29,7 @@
+
+ #ifdef HAVE_GST10
+ #include <gst/gst.h>
++#include <gst/audio/mixerutils.h>
+ #include <gst/interfaces/mixer.h>
+ #include <gst/interfaces/propertyprobe.h>
+ #else
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 99756d3136a..faafe835eab 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -129,6 +129,9 @@ share/gnome/control-center-2.0/xrdb/Xaw.ad
share/gnome/cursor-fonts/cursor-large-white.pcf
share/gnome/cursor-fonts/cursor-large.pcf
share/gnome/cursor-fonts/cursor-white.pcf
+share/gnome/desktop-directories/font-method.directory
+share/gnome/desktop-directories/theme-method.directory
+share/gnome/gnome-default-applications/gnome-default-applications.xml
share/gnome/help/control-center/C/config-accessibility-keyboard.xml
share/gnome/help/control-center/C/config-background.xml
share/gnome/help/control-center/C/config-behavior.xml
@@ -144,12 +147,12 @@ share/gnome/help/control-center/C/config-screensaver.xml
share/gnome/help/control-center/C/config-sound.xml
share/gnome/help/control-center/C/config-themes.xml
share/gnome/help/control-center/C/control-center.xml
+share/gnome/help/control-center/es/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/pixmaps/display-capplet.png
-share/gnome/vfolders/font-method.directory
-share/gnome/vfolders/theme-method.directory
share/icons/hicolor/48x48/apps/gnome-control-center.png
share/locale/af/LC_MESSAGES/control-center-2.0.mo
share/locale/am/LC_MESSAGES/control-center-2.0.mo
@@ -158,12 +161,14 @@ 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/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
share/locale/cs/LC_MESSAGES/control-center-2.0.mo
share/locale/cy/LC_MESSAGES/control-center-2.0.mo
share/locale/da/LC_MESSAGES/control-center-2.0.mo
share/locale/de/LC_MESSAGES/control-center-2.0.mo
+share/locale/dz/LC_MESSAGES/control-center-2.0.mo
share/locale/el/LC_MESSAGES/control-center-2.0.mo
share/locale/en_CA/LC_MESSAGES/control-center-2.0.mo
share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo
@@ -184,6 +189,7 @@ share/locale/id/LC_MESSAGES/control-center-2.0.mo
share/locale/is/LC_MESSAGES/control-center-2.0.mo
share/locale/it/LC_MESSAGES/control-center-2.0.mo
share/locale/ja/LC_MESSAGES/control-center-2.0.mo
+share/locale/ka/LC_MESSAGES/control-center-2.0.mo
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
@@ -220,20 +226,30 @@ share/locale/vi/LC_MESSAGES/control-center-2.0.mo
share/locale/wa/LC_MESSAGES/control-center-2.0.mo
share/locale/xh/LC_MESSAGES/control-center-2.0.mo
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/es
@dirrm share/gnome/help/control-center/C
@dirrm share/gnome/help/control-center
-@dirrmtry share/gnome/gnome-background-properties
+@dirrm share/gnome/gnome-default-applications
+@dirrm share/gnome/gnome-background-properties
+@dirrm share/gnome/desktop-directories
@dirrm share/gnome/cursor-fonts
@dirrm share/gnome/control-center-2.0/xrdb
@dirrm share/gnome/control-center-2.0/pixmaps
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 9659a14013e..e5553c13e10 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,27 +3,27 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.51 2005/10/04 03:07:41 ahze Exp $
+# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.67 2006/04/23 23:04:15 mezz Exp $
#
PORTNAME= gnomesystemmonitor
-PORTVERSION= 2.12.2
+PORTVERSION= 2.14.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.12
+MASTER_SITE_SUBDIR= sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-system-monitor-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 system monitor program
-LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop2
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
-USE_REINPLACE= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libwnck
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 9fe5221376e..c259d28b00b 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-monitor-2.12.2.tar.bz2) = 100f3599b95a375db85df521f3e2554e
-SHA256 (gnome2/gnome-system-monitor-2.12.2.tar.bz2) = c0c18d1f9e29c11c02adac83dcfffdb1f839d9c5575496d0f5beb8de09a31d1f
-SIZE (gnome2/gnome-system-monitor-2.12.2.tar.bz2) = 786092
+MD5 (gnome2/gnome-system-monitor-2.14.1.tar.bz2) = 5d9265d712665eaa1a341ad493c284b2
+SHA256 (gnome2/gnome-system-monitor-2.14.1.tar.bz2) = 21af60fd9b307d2f969e526423ba966639020d128b9f61561ab1c14e3bfb7f5a
+SIZE (gnome2/gnome-system-monitor-2.14.1.tar.bz2) = 1416460
diff --git a/sysutils/gnome-system-monitor/files/patch-configure b/sysutils/gnome-system-monitor/files/patch-configure
index 504276306bb..aed30356f7a 100644
--- a/sysutils/gnome-system-monitor/files/patch-configure
+++ b/sysutils/gnome-system-monitor/files/patch-configure
@@ -1,20 +1,11 @@
---- configure.orig Mon Nov 25 21:02:50 2002
-+++ configure Fri Nov 29 20:30:44 2002
-@@ -3731,7 +3731,7 @@
-
-
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- _ACEOF
-
-
-@@ -6630,7 +6630,7 @@
- s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
+--- configure.orig Wed Dec 14 19:11:33 2005
++++ configure Wed Dec 14 19:11:33 2005
+@@ -25028,7 +25028,7 @@
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
s,@PROCMAN_CFLAGS@,$PROCMAN_CFLAGS,;t t
-s,@PROCMAN_LIBS@,$PROCMAN_LIBS,;t t
+s,@PROCMAN_LIBS@, $PROCMAN_LIBS,;t t
s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t
s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t
- s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
+ s,@GCONF_SCHEMAS_INSTALL_TRUE@,$GCONF_SCHEMAS_INSTALL_TRUE,;t t
diff --git a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c b/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
index 1b94fbb9f49..971e718b210 100644
--- a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
+++ b/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
@@ -8,16 +8,3 @@
#include <arpa/inet.h>
#include "procman.h"
#include "openfiles.h"
-@@ -152,10 +153,10 @@
- {
- ProcInfo *info;
- GtkTreeModel *model;
-- glibtop_open_files_entry *openfiles;
-- glibtop_proc_open_files procmap;
- GHashTable *new_maps;
- gint i;
-+ glibtop_open_files_entry *openfiles;
-+ glibtop_proc_open_files procmap;
-
- info = g_object_get_data (G_OBJECT (tree), "selected_info");
- g_return_if_fail (info);
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index 419ddc09509..eec36e00660 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -15,7 +15,23 @@ share/gnome/help/gnome-system-monitor/C/figures/systemMonitor.png
share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png
share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml
share/gnome/help/gnome-system-monitor/C/legal.xml
+share/gnome/help/gnome-system-monitor/bg/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/bg/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/bg/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/bg/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/bg/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/bg/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/bg/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/bg/figures/processListing.png
+share/gnome/help/gnome-system-monitor/bg/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/bg/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/bg/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/bg/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/bg/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/bg/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/bg/legal.xml
share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf
+share/gnome/omf/gnome-system-monitor/gnome-system-monitor-bg.omf
share/locale/am/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo
share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
@@ -28,6 +44,7 @@ share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo
share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
share/locale/da/LC_MESSAGES/gnome-system-monitor.mo
share/locale/de/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/dz/LC_MESSAGES/gnome-system-monitor.mo
share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo
share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo
@@ -47,6 +64,7 @@ share/locale/hu/LC_MESSAGES/gnome-system-monitor.mo
share/locale/id/LC_MESSAGES/gnome-system-monitor.mo
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/li/LC_MESSAGES/gnome-system-monitor.mo
share/locale/lt/LC_MESSAGES/gnome-system-monitor.mo
@@ -79,10 +97,15 @@ share/locale/ug/LC_MESSAGES/gnome-system-monitor.mo
share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
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
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 7d98a8fbf20..b64ab1eff2a 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,15 +3,14 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.30 2005/09/10 05:52:02 marcus Exp $
+# $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.40 2006/04/13 07:52:38 bland Exp $
#
PORTNAME= gnomesystemtools
-PORTVERSION= 1.4.1
-PORTREVISION= 1
+PORTVERSION= 2.14.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.4
+MASTER_SITE_SUBDIR= sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-system-tools-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -23,10 +22,11 @@ RUN_DEPENDS= ${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sys
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack nautilus2
-GNU_CONFIGURE= yes
+USE_AUTOTOOLS= libtool:15
INSTALLS_OMF= yes
CONFIGURE_ARGS= --enable-services
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -37,7 +37,7 @@ GCONF_SCHEMAS= gnome-system-tools.schemas
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
-IGNORE= Uses symbols not present in 4.X
+IGNORE= uses symbols not present in 4.X
.endif
.include <bsd.port.post.mk>
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index 8a73d9d3f89..dea2f071369 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-tools-1.4.1.tar.bz2) = 9ede7bcadde796396a30cdb5fa347f49
-SHA256 (gnome2/gnome-system-tools-1.4.1.tar.bz2) = b279e6b08989772cca3a7a1038971191ea6c8b9f26e02238c2e79b5faaedf380
-SIZE (gnome2/gnome-system-tools-1.4.1.tar.bz2) = 2045146
+MD5 (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 3aded3a37f4f5b4962bf253d25cebea1
+SHA256 (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 39f37363001b1cc2f5d2f5d2d7024a7a36e7dd227862b1dd9ce8c3325157ea7c
+SIZE (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 2120911
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 9d5c574cdcd..acbf5571d27 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -73,13 +73,20 @@ share/gnome/applications/users.desktop
share/gnome/help/boot-admin/C/boot-admin.xml
share/gnome/help/boot-admin/C/figures/boot-tool.png
share/gnome/help/boot-admin/C/legal.xml
+share/gnome/help/boot-admin/es/boot-admin.xml
+share/gnome/help/boot-admin/es/figures/boot-tool.png
share/gnome/help/network-admin/C/figures/network-tool.png
share/gnome/help/network-admin/C/legal.xml
share/gnome/help/network-admin/C/network-admin.xml
+share/gnome/help/network-admin/es/figures/network-tool.png
+share/gnome/help/network-admin/es/network-admin.xml
share/gnome/help/services-admin/C/figures/service-properties.png
share/gnome/help/services-admin/C/figures/services-tool.png
share/gnome/help/services-admin/C/legal.xml
share/gnome/help/services-admin/C/services-admin.xml
+share/gnome/help/services-admin/es/figures/service-properties.png
+share/gnome/help/services-admin/es/figures/services-tool.png
+share/gnome/help/services-admin/es/services-admin.xml
share/gnome/help/services-admin/nl/figures/service-properties.png
share/gnome/help/services-admin/nl/figures/services-tool.png
share/gnome/help/services-admin/nl/legal.xml
@@ -89,6 +96,10 @@ share/gnome/help/time-admin/C/figures/time-servers.png
share/gnome/help/time-admin/C/figures/time-tool.png
share/gnome/help/time-admin/C/legal.xml
share/gnome/help/time-admin/C/time-admin.xml
+share/gnome/help/time-admin/es/figures/time-map.png
+share/gnome/help/time-admin/es/figures/time-servers.png
+share/gnome/help/time-admin/es/figures/time-tool.png
+share/gnome/help/time-admin/es/time-admin.xml
share/gnome/help/time-admin/nl/figures/time-map.png
share/gnome/help/time-admin/nl/figures/time-servers.png
share/gnome/help/time-admin/nl/figures/time-tool.png
@@ -97,13 +108,20 @@ share/gnome/help/time-admin/nl/time-admin.xml
share/gnome/help/users-admin/C/figures/users-tool.png
share/gnome/help/users-admin/C/legal.xml
share/gnome/help/users-admin/C/users-admin.xml
-share/gnome/omf/gnome-system-tools/boot-admin-C.omf
-share/gnome/omf/gnome-system-tools/network-admin-C.omf
-share/gnome/omf/gnome-system-tools/services-admin-C.omf
+share/gnome/help/users-admin/es/figures/users-tool.png
+share/gnome/help/users-admin/es/users-admin.xml
+share/gnome/omf/boot-admin/boot-admin-C.omf
+share/gnome/omf/boot-admin/boot-admin-es.omf
share/gnome/omf/gnome-system-tools/services-admin-nl.omf
-share/gnome/omf/gnome-system-tools/time-admin-C.omf
share/gnome/omf/gnome-system-tools/time-admin-nl.omf
-share/gnome/omf/gnome-system-tools/users-admin-C.omf
+share/gnome/omf/network-admin/network-admin-C.omf
+share/gnome/omf/network-admin/network-admin-es.omf
+share/gnome/omf/services-admin/services-admin-C.omf
+share/gnome/omf/services-admin/services-admin-es.omf
+share/gnome/omf/time-admin/time-admin-C.omf
+share/gnome/omf/time-admin/time-admin-es.omf
+share/gnome/omf/users-admin/users-admin-C.omf
+share/gnome/omf/users-admin/users-admin-es.omf
share/locale/am/LC_MESSAGES/gnome-system-tools.mo
share/locale/ar/LC_MESSAGES/gnome-system-tools.mo
share/locale/az/LC_MESSAGES/gnome-system-tools.mo
@@ -111,6 +129,7 @@ share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
share/locale/ca/LC_MESSAGES/gnome-system-tools.mo
share/locale/cs/LC_MESSAGES/gnome-system-tools.mo
+share/locale/cy/LC_MESSAGES/gnome-system-tools.mo
share/locale/da/LC_MESSAGES/gnome-system-tools.mo
share/locale/de/LC_MESSAGES/gnome-system-tools.mo
share/locale/el/LC_MESSAGES/gnome-system-tools.mo
@@ -164,26 +183,44 @@ share/locale/vi/LC_MESSAGES/gnome-system-tools.mo
share/locale/wa/LC_MESSAGES/gnome-system-tools.mo
share/locale/xh/LC_MESSAGES/gnome-system-tools.mo
share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-system-tools.mo
share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.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/omf/users-admin
+@dirrm share/gnome/omf/time-admin
+@dirrm share/gnome/omf/services-admin
+@dirrm share/gnome/omf/network-admin
@dirrm share/gnome/omf/gnome-system-tools
+@dirrm share/gnome/omf/boot-admin
@dirrm share/gnome/help/users-admin/C/figures
@dirrm share/gnome/help/users-admin/C
+@dirrm share/gnome/help/users-admin/es/figures
+@dirrm share/gnome/help/users-admin/es
@dirrm share/gnome/help/users-admin
@dirrm share/gnome/help/time-admin/nl/figures
@dirrm share/gnome/help/time-admin/nl
+@dirrm share/gnome/help/time-admin/es/figures
+@dirrm share/gnome/help/time-admin/es
@dirrm share/gnome/help/time-admin/C/figures
@dirrm share/gnome/help/time-admin/C
@dirrm share/gnome/help/time-admin
@dirrm share/gnome/help/services-admin/nl/figures
@dirrm share/gnome/help/services-admin/nl
+@dirrm share/gnome/help/services-admin/es/figures
+@dirrm share/gnome/help/services-admin/es
@dirrm share/gnome/help/services-admin/C/figures
@dirrm share/gnome/help/services-admin/C
@dirrm share/gnome/help/services-admin
+@dirrm share/gnome/help/network-admin/es/figures
+@dirrm share/gnome/help/network-admin/es
@dirrm share/gnome/help/network-admin/C/figures
@dirrm share/gnome/help/network-admin/C
@dirrm share/gnome/help/network-admin
+@dirrm share/gnome/help/boot-admin/es/figures
+@dirrm share/gnome/help/boot-admin/es
@dirrm share/gnome/help/boot-admin/C/figures
@dirrm share/gnome/help/boot-admin/C
@dirrm share/gnome/help/boot-admin
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 94b63a0febd..10adbe11977 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -3,15 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.85 2005/10/03 15:29:07 ahze Exp $
+# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.109 2006/04/18 02:28:56 marcus Exp $
#
PORTNAME= gnomecontrolcenter2
-PORTVERSION= 2.12.3
-PORTREVISION= 1
+PORTVERSION= 2.14.1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/control-center/2.12
+MASTER_SITE_SUBDIR= sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -21,16 +21,20 @@ COMMENT= Control center for GNOME 2 project
LIB_DEPENDS= xklavier.10:${PORTSDIR}/x11/libxklavier
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
-USE_GSTREAMER= yes
+USE_GSTREAMER= good
WANT_GNOME= yes
USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \
- gnomemenus desktopfileutils
+ gnomemenus desktopfileutils nautilus2
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
+INSTALLS_ICONS= yes
INSTALLS_SHLIB= yes
+CONFIGURE_ARGS= --enable-gstreamer=0.10 \
+ --disable-hal
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
@@ -48,10 +52,6 @@ WITH_GNOME= yes
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-BROKEN= Does not build on 4.X
-.endif
-
.if ${HAVE_GNOME:Mevolutiondataserver}!=""
USE_GNOME+= evolutiondataserver
CONFIGURE_ARGS+=--enable-aboutme
@@ -64,8 +64,6 @@ PLIST_SUB+= ABOUTME="@comment "
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
- @${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \
- ${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c
@${REINPLACE_CMD} -e 's|/bin/tar|/usr/bin/tar|g ; \
s|/bin/gzip|/usr/bin/gzip|g' \
${WRKSRC}/capplets/theme-switcher/gnome-theme-installer.c
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 7e03447ea0e..02add5cb6a2 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/control-center-2.12.3.tar.bz2) = e8f57ec1852d08d421016732b605a615
-SHA256 (gnome2/control-center-2.12.3.tar.bz2) = c25fd622f737037aa71c44dc9cdc3a1e9248408938e7fdfbbb60eba18c1192d8
-SIZE (gnome2/control-center-2.12.3.tar.bz2) = 1787009
+MD5 (gnome2/control-center-2.14.1.tar.bz2) = d673df12692ee08b9fc3d69739f8779e
+SHA256 (gnome2/control-center-2.14.1.tar.bz2) = c55cc800a6d636b8a98885a68685eff32db158fe1b638ff02ff89394ee6e6163
+SIZE (gnome2/control-center-2.14.1.tar.bz2) = 1869223
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c
index 7ea6bb0dd35..49727c882a8 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c
@@ -1,16 +1,25 @@
---- capplets/about-me/gnome-about-me-password.c.orig Wed Aug 10 05:45:08 2005
-+++ capplets/about-me/gnome-about-me-password.c Wed Aug 10 15:44:57 2005
-@@ -35,7 +35,13 @@
- #include <sys/wait.h>
- #include <sys/poll.h>
- #include <termios.h>
-+#include <signal.h>
+--- 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>
+ #endif
+
+#ifndef __FreeBSD__
- #include <pty.h>
-+#else
+ #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>
-+#endif
+ #include <signal.h>
+ #endif
- #include "capplet-util.h"
- #include "eel-alert-dialog.h"
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c
deleted file mode 100644
index 0d1f85f32c7..00000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- capplets/about-me/gnome-about-me.c.orig Wed Jul 27 13:45:17 2005
-+++ capplets/about-me/gnome-about-me.c Wed Jul 27 13:47:09 2005
-@@ -258,12 +258,10 @@
- static char *
- get_user_login (void)
- {
-- char buf[LINE_MAX * 4];
-- struct passwd pwd, *err;
-+ struct passwd *pwd;
-
-- int i;
-- i = getpwuid_r(getuid(), &pwd, buf, sizeof(buf), &err);
-- return ((i == 0) && (err == &pwd)) ? g_strdup(pwd.pw_name) : NULL;
-+ pwd = getpwuid(getuid());
-+ return (pwd != NULL) ? g_strdup(pwd->pw_name) : NULL;
- }
-
- /*
-@@ -664,6 +662,7 @@
- struct passwd *pwent;
- char *user = NULL;
- gchar *str;
-+ gchar **tok;
-
- me = g_new0 (GnomeAboutMe, 1);
-
-@@ -733,7 +732,6 @@
- _("Unknown login ID, the user database might be corrupted"));
- return ;
- }
-- gchar **tok;
- tok = g_strsplit (pwent->pw_gecos, ",", 0);
-
- /************************************************/
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c
new file mode 100644
index 00000000000..3362406ddcc
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_acme-volume-gstreamer.c
@@ -0,0 +1,10 @@
+--- gnome-settings-daemon/actions/acme-volume-gstreamer.c.orig Mon Apr 17 22:23:18 2006
++++ gnome-settings-daemon/actions/acme-volume-gstreamer.c Mon Apr 17 22:25:17 2006
+@@ -29,6 +29,7 @@
+
+ #ifdef HAVE_GST10
+ #include <gst/gst.h>
++#include <gst/audio/mixerutils.h>
+ #include <gst/interfaces/mixer.h>
+ #include <gst/interfaces/propertyprobe.h>
+ #else
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 99756d3136a..faafe835eab 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -129,6 +129,9 @@ share/gnome/control-center-2.0/xrdb/Xaw.ad
share/gnome/cursor-fonts/cursor-large-white.pcf
share/gnome/cursor-fonts/cursor-large.pcf
share/gnome/cursor-fonts/cursor-white.pcf
+share/gnome/desktop-directories/font-method.directory
+share/gnome/desktop-directories/theme-method.directory
+share/gnome/gnome-default-applications/gnome-default-applications.xml
share/gnome/help/control-center/C/config-accessibility-keyboard.xml
share/gnome/help/control-center/C/config-background.xml
share/gnome/help/control-center/C/config-behavior.xml
@@ -144,12 +147,12 @@ share/gnome/help/control-center/C/config-screensaver.xml
share/gnome/help/control-center/C/config-sound.xml
share/gnome/help/control-center/C/config-themes.xml
share/gnome/help/control-center/C/control-center.xml
+share/gnome/help/control-center/es/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/pixmaps/display-capplet.png
-share/gnome/vfolders/font-method.directory
-share/gnome/vfolders/theme-method.directory
share/icons/hicolor/48x48/apps/gnome-control-center.png
share/locale/af/LC_MESSAGES/control-center-2.0.mo
share/locale/am/LC_MESSAGES/control-center-2.0.mo
@@ -158,12 +161,14 @@ 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/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
share/locale/cs/LC_MESSAGES/control-center-2.0.mo
share/locale/cy/LC_MESSAGES/control-center-2.0.mo
share/locale/da/LC_MESSAGES/control-center-2.0.mo
share/locale/de/LC_MESSAGES/control-center-2.0.mo
+share/locale/dz/LC_MESSAGES/control-center-2.0.mo
share/locale/el/LC_MESSAGES/control-center-2.0.mo
share/locale/en_CA/LC_MESSAGES/control-center-2.0.mo
share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo
@@ -184,6 +189,7 @@ share/locale/id/LC_MESSAGES/control-center-2.0.mo
share/locale/is/LC_MESSAGES/control-center-2.0.mo
share/locale/it/LC_MESSAGES/control-center-2.0.mo
share/locale/ja/LC_MESSAGES/control-center-2.0.mo
+share/locale/ka/LC_MESSAGES/control-center-2.0.mo
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
@@ -220,20 +226,30 @@ share/locale/vi/LC_MESSAGES/control-center-2.0.mo
share/locale/wa/LC_MESSAGES/control-center-2.0.mo
share/locale/xh/LC_MESSAGES/control-center-2.0.mo
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/es
@dirrm share/gnome/help/control-center/C
@dirrm share/gnome/help/control-center
-@dirrmtry share/gnome/gnome-background-properties
+@dirrm share/gnome/gnome-default-applications
+@dirrm share/gnome/gnome-background-properties
+@dirrm share/gnome/desktop-directories
@dirrm share/gnome/cursor-fonts
@dirrm share/gnome/control-center-2.0/xrdb
@dirrm share/gnome/control-center-2.0/pixmaps
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 9659a14013e..e5553c13e10 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -3,27 +3,27 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.51 2005/10/04 03:07:41 ahze Exp $
+# $MCom: ports/sysutils/gnomesystemmonitor/Makefile,v 1.67 2006/04/23 23:04:15 mezz Exp $
#
PORTNAME= gnomesystemmonitor
-PORTVERSION= 2.12.2
+PORTVERSION= 2.14.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.12
+MASTER_SITE_SUBDIR= sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-system-monitor-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 system monitor program
-LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop2
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
-USE_REINPLACE= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libwnck
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo
index 9fe5221376e..c259d28b00b 100644
--- a/sysutils/gnomesystemmonitor/distinfo
+++ b/sysutils/gnomesystemmonitor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-monitor-2.12.2.tar.bz2) = 100f3599b95a375db85df521f3e2554e
-SHA256 (gnome2/gnome-system-monitor-2.12.2.tar.bz2) = c0c18d1f9e29c11c02adac83dcfffdb1f839d9c5575496d0f5beb8de09a31d1f
-SIZE (gnome2/gnome-system-monitor-2.12.2.tar.bz2) = 786092
+MD5 (gnome2/gnome-system-monitor-2.14.1.tar.bz2) = 5d9265d712665eaa1a341ad493c284b2
+SHA256 (gnome2/gnome-system-monitor-2.14.1.tar.bz2) = 21af60fd9b307d2f969e526423ba966639020d128b9f61561ab1c14e3bfb7f5a
+SIZE (gnome2/gnome-system-monitor-2.14.1.tar.bz2) = 1416460
diff --git a/sysutils/gnomesystemmonitor/files/patch-configure b/sysutils/gnomesystemmonitor/files/patch-configure
index 504276306bb..aed30356f7a 100644
--- a/sysutils/gnomesystemmonitor/files/patch-configure
+++ b/sysutils/gnomesystemmonitor/files/patch-configure
@@ -1,20 +1,11 @@
---- configure.orig Mon Nov 25 21:02:50 2002
-+++ configure Fri Nov 29 20:30:44 2002
-@@ -3731,7 +3731,7 @@
-
-
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- _ACEOF
-
-
-@@ -6630,7 +6630,7 @@
- s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
+--- configure.orig Wed Dec 14 19:11:33 2005
++++ configure Wed Dec 14 19:11:33 2005
+@@ -25028,7 +25028,7 @@
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
s,@PROCMAN_CFLAGS@,$PROCMAN_CFLAGS,;t t
-s,@PROCMAN_LIBS@,$PROCMAN_LIBS,;t t
+s,@PROCMAN_LIBS@, $PROCMAN_LIBS,;t t
s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t
s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t
- s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
+ s,@GCONF_SCHEMAS_INSTALL_TRUE@,$GCONF_SCHEMAS_INSTALL_TRUE,;t t
diff --git a/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c b/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c
index 1b94fbb9f49..971e718b210 100644
--- a/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c
+++ b/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c
@@ -8,16 +8,3 @@
#include <arpa/inet.h>
#include "procman.h"
#include "openfiles.h"
-@@ -152,10 +153,10 @@
- {
- ProcInfo *info;
- GtkTreeModel *model;
-- glibtop_open_files_entry *openfiles;
-- glibtop_proc_open_files procmap;
- GHashTable *new_maps;
- gint i;
-+ glibtop_open_files_entry *openfiles;
-+ glibtop_proc_open_files procmap;
-
- info = g_object_get_data (G_OBJECT (tree), "selected_info");
- g_return_if_fail (info);
diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist
index 419ddc09509..eec36e00660 100644
--- a/sysutils/gnomesystemmonitor/pkg-plist
+++ b/sysutils/gnomesystemmonitor/pkg-plist
@@ -15,7 +15,23 @@ share/gnome/help/gnome-system-monitor/C/figures/systemMonitor.png
share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png
share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml
share/gnome/help/gnome-system-monitor/C/legal.xml
+share/gnome/help/gnome-system-monitor/bg/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/bg/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/bg/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/bg/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/bg/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/bg/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/bg/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/bg/figures/processListing.png
+share/gnome/help/gnome-system-monitor/bg/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/bg/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/bg/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/bg/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/bg/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/bg/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/bg/legal.xml
share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf
+share/gnome/omf/gnome-system-monitor/gnome-system-monitor-bg.omf
share/locale/am/LC_MESSAGES/gnome-system-monitor.mo
share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo
share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
@@ -28,6 +44,7 @@ share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo
share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
share/locale/da/LC_MESSAGES/gnome-system-monitor.mo
share/locale/de/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/dz/LC_MESSAGES/gnome-system-monitor.mo
share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo
share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo
@@ -47,6 +64,7 @@ share/locale/hu/LC_MESSAGES/gnome-system-monitor.mo
share/locale/id/LC_MESSAGES/gnome-system-monitor.mo
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/li/LC_MESSAGES/gnome-system-monitor.mo
share/locale/lt/LC_MESSAGES/gnome-system-monitor.mo
@@ -79,10 +97,15 @@ share/locale/ug/LC_MESSAGES/gnome-system-monitor.mo
share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
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
diff --git a/sysutils/gnomesystemtools/Makefile b/sysutils/gnomesystemtools/Makefile
index 7d98a8fbf20..b64ab1eff2a 100644
--- a/sysutils/gnomesystemtools/Makefile
+++ b/sysutils/gnomesystemtools/Makefile
@@ -3,15 +3,14 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.30 2005/09/10 05:52:02 marcus Exp $
+# $MCom: ports/sysutils/gnomesystemtools/Makefile,v 1.40 2006/04/13 07:52:38 bland Exp $
#
PORTNAME= gnomesystemtools
-PORTVERSION= 1.4.1
-PORTREVISION= 1
+PORTVERSION= 2.14.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.4
+MASTER_SITE_SUBDIR= sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-system-tools-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -23,10 +22,11 @@ RUN_DEPENDS= ${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sys
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack nautilus2
-GNU_CONFIGURE= yes
+USE_AUTOTOOLS= libtool:15
INSTALLS_OMF= yes
CONFIGURE_ARGS= --enable-services
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -37,7 +37,7 @@ GCONF_SCHEMAS= gnome-system-tools.schemas
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
-IGNORE= Uses symbols not present in 4.X
+IGNORE= uses symbols not present in 4.X
.endif
.include <bsd.port.post.mk>
diff --git a/sysutils/gnomesystemtools/distinfo b/sysutils/gnomesystemtools/distinfo
index 8a73d9d3f89..dea2f071369 100644
--- a/sysutils/gnomesystemtools/distinfo
+++ b/sysutils/gnomesystemtools/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-tools-1.4.1.tar.bz2) = 9ede7bcadde796396a30cdb5fa347f49
-SHA256 (gnome2/gnome-system-tools-1.4.1.tar.bz2) = b279e6b08989772cca3a7a1038971191ea6c8b9f26e02238c2e79b5faaedf380
-SIZE (gnome2/gnome-system-tools-1.4.1.tar.bz2) = 2045146
+MD5 (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 3aded3a37f4f5b4962bf253d25cebea1
+SHA256 (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 39f37363001b1cc2f5d2f5d2d7024a7a36e7dd227862b1dd9ce8c3325157ea7c
+SIZE (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 2120911
diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist
index 9d5c574cdcd..acbf5571d27 100644
--- a/sysutils/gnomesystemtools/pkg-plist
+++ b/sysutils/gnomesystemtools/pkg-plist
@@ -73,13 +73,20 @@ share/gnome/applications/users.desktop
share/gnome/help/boot-admin/C/boot-admin.xml
share/gnome/help/boot-admin/C/figures/boot-tool.png
share/gnome/help/boot-admin/C/legal.xml
+share/gnome/help/boot-admin/es/boot-admin.xml
+share/gnome/help/boot-admin/es/figures/boot-tool.png
share/gnome/help/network-admin/C/figures/network-tool.png
share/gnome/help/network-admin/C/legal.xml
share/gnome/help/network-admin/C/network-admin.xml
+share/gnome/help/network-admin/es/figures/network-tool.png
+share/gnome/help/network-admin/es/network-admin.xml
share/gnome/help/services-admin/C/figures/service-properties.png
share/gnome/help/services-admin/C/figures/services-tool.png
share/gnome/help/services-admin/C/legal.xml
share/gnome/help/services-admin/C/services-admin.xml
+share/gnome/help/services-admin/es/figures/service-properties.png
+share/gnome/help/services-admin/es/figures/services-tool.png
+share/gnome/help/services-admin/es/services-admin.xml
share/gnome/help/services-admin/nl/figures/service-properties.png
share/gnome/help/services-admin/nl/figures/services-tool.png
share/gnome/help/services-admin/nl/legal.xml
@@ -89,6 +96,10 @@ share/gnome/help/time-admin/C/figures/time-servers.png
share/gnome/help/time-admin/C/figures/time-tool.png
share/gnome/help/time-admin/C/legal.xml
share/gnome/help/time-admin/C/time-admin.xml
+share/gnome/help/time-admin/es/figures/time-map.png
+share/gnome/help/time-admin/es/figures/time-servers.png
+share/gnome/help/time-admin/es/figures/time-tool.png
+share/gnome/help/time-admin/es/time-admin.xml
share/gnome/help/time-admin/nl/figures/time-map.png
share/gnome/help/time-admin/nl/figures/time-servers.png
share/gnome/help/time-admin/nl/figures/time-tool.png
@@ -97,13 +108,20 @@ share/gnome/help/time-admin/nl/time-admin.xml
share/gnome/help/users-admin/C/figures/users-tool.png
share/gnome/help/users-admin/C/legal.xml
share/gnome/help/users-admin/C/users-admin.xml
-share/gnome/omf/gnome-system-tools/boot-admin-C.omf
-share/gnome/omf/gnome-system-tools/network-admin-C.omf
-share/gnome/omf/gnome-system-tools/services-admin-C.omf
+share/gnome/help/users-admin/es/figures/users-tool.png
+share/gnome/help/users-admin/es/users-admin.xml
+share/gnome/omf/boot-admin/boot-admin-C.omf
+share/gnome/omf/boot-admin/boot-admin-es.omf
share/gnome/omf/gnome-system-tools/services-admin-nl.omf
-share/gnome/omf/gnome-system-tools/time-admin-C.omf
share/gnome/omf/gnome-system-tools/time-admin-nl.omf
-share/gnome/omf/gnome-system-tools/users-admin-C.omf
+share/gnome/omf/network-admin/network-admin-C.omf
+share/gnome/omf/network-admin/network-admin-es.omf
+share/gnome/omf/services-admin/services-admin-C.omf
+share/gnome/omf/services-admin/services-admin-es.omf
+share/gnome/omf/time-admin/time-admin-C.omf
+share/gnome/omf/time-admin/time-admin-es.omf
+share/gnome/omf/users-admin/users-admin-C.omf
+share/gnome/omf/users-admin/users-admin-es.omf
share/locale/am/LC_MESSAGES/gnome-system-tools.mo
share/locale/ar/LC_MESSAGES/gnome-system-tools.mo
share/locale/az/LC_MESSAGES/gnome-system-tools.mo
@@ -111,6 +129,7 @@ share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
share/locale/ca/LC_MESSAGES/gnome-system-tools.mo
share/locale/cs/LC_MESSAGES/gnome-system-tools.mo
+share/locale/cy/LC_MESSAGES/gnome-system-tools.mo
share/locale/da/LC_MESSAGES/gnome-system-tools.mo
share/locale/de/LC_MESSAGES/gnome-system-tools.mo
share/locale/el/LC_MESSAGES/gnome-system-tools.mo
@@ -164,26 +183,44 @@ share/locale/vi/LC_MESSAGES/gnome-system-tools.mo
share/locale/wa/LC_MESSAGES/gnome-system-tools.mo
share/locale/xh/LC_MESSAGES/gnome-system-tools.mo
share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-system-tools.mo
share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.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/omf/users-admin
+@dirrm share/gnome/omf/time-admin
+@dirrm share/gnome/omf/services-admin
+@dirrm share/gnome/omf/network-admin
@dirrm share/gnome/omf/gnome-system-tools
+@dirrm share/gnome/omf/boot-admin
@dirrm share/gnome/help/users-admin/C/figures
@dirrm share/gnome/help/users-admin/C
+@dirrm share/gnome/help/users-admin/es/figures
+@dirrm share/gnome/help/users-admin/es
@dirrm share/gnome/help/users-admin
@dirrm share/gnome/help/time-admin/nl/figures
@dirrm share/gnome/help/time-admin/nl
+@dirrm share/gnome/help/time-admin/es/figures
+@dirrm share/gnome/help/time-admin/es
@dirrm share/gnome/help/time-admin/C/figures
@dirrm share/gnome/help/time-admin/C
@dirrm share/gnome/help/time-admin
@dirrm share/gnome/help/services-admin/nl/figures
@dirrm share/gnome/help/services-admin/nl
+@dirrm share/gnome/help/services-admin/es/figures
+@dirrm share/gnome/help/services-admin/es
@dirrm share/gnome/help/services-admin/C/figures
@dirrm share/gnome/help/services-admin/C
@dirrm share/gnome/help/services-admin
+@dirrm share/gnome/help/network-admin/es/figures
+@dirrm share/gnome/help/network-admin/es
@dirrm share/gnome/help/network-admin/C/figures
@dirrm share/gnome/help/network-admin/C
@dirrm share/gnome/help/network-admin
+@dirrm share/gnome/help/boot-admin/es/figures
+@dirrm share/gnome/help/boot-admin/es
@dirrm share/gnome/help/boot-admin/C/figures
@dirrm share/gnome/help/boot-admin/C
@dirrm share/gnome/help/boot-admin
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index d8b55b38e8f..2a68be92511 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -3,28 +3,28 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.77 2005/10/03 23:36:08 marcus Exp $
+# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.96 2006/04/13 07:52:38 bland Exp $
#
PORTNAME= nautilus-cd-burner
-PORTVERSION= 2.12.3
-PORTREVISION= 1
+PORTVERSION= 2.14.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= CD burner view for Nautilus
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
-USE_REINPLACE= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack intlhack nautilus2
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
+CONFIGURE_ARGS= --disable-hal
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index b56c8d9af84..4dc063ddda3 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-cd-burner-2.12.3.tar.bz2) = 518bc18f9c2c5478fe3a473d2e57b094
-SHA256 (gnome2/nautilus-cd-burner-2.12.3.tar.bz2) = 174806266488be5b56f1ec6b89ebe0b017dd96f72c6233398670d2f12ea03786
-SIZE (gnome2/nautilus-cd-burner-2.12.3.tar.bz2) = 615109
+MD5 (gnome2/nautilus-cd-burner-2.14.1.tar.bz2) = 093b21536b6a6670742dfadafecd032c
+SHA256 (gnome2/nautilus-cd-burner-2.14.1.tar.bz2) = 573dbf7df7aa6214c596dd667567fd59105aa3b4f18b34a8c4f84f067d89af47
+SIZE (gnome2/nautilus-cd-burner-2.14.1.tar.bz2) = 672957
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index 4226cf2c680..ed60e981e09 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -2,16 +2,18 @@ bin/nautilus-cd-burner
etc/gnome-vfs-2.0/modules/mapping-modules.conf
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-recorder.h
lib/gnome-vfs-2.0/modules/libmapping.la
lib/gnome-vfs-2.0/modules/libmapping.so
lib/libnautilus-burn.la
lib/libnautilus-burn.so
-lib/libnautilus-burn.so.2
+lib/libnautilus-burn.so.3
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/nautilus-cd-burner/cdspin1.png
share/gnome/nautilus-cd-burner/cdspin2.png
@@ -53,6 +55,7 @@ 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
share/locale/ja/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ka/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo
@@ -87,8 +90,13 @@ share/locale/uk/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/vi/LC_MESSAGES/nautilus-cd-burner.mo
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
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
@dirrm share/gnome/nautilus-cd-burner
@dirrm include/libnautilus-burn
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
new file mode 100644
index 00000000000..4bb267b6f95
--- /dev/null
+++ b/sysutils/pessulus/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for: pessulus
+# Date created: 14 March 2006
+# Whom: FreeBSD GNOME Team
+#
+# $FreeBSD$
+# $MCom: ports/sysutils/pessulus/Makefile,v 1.3 2006/04/10 13:23:35 ahze Exp $
+#
+
+PORTNAME= pessulus
+PORTVERSION= 0.9.1
+CATEGORIES= sysutils gnome
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= A lockdown editor for GNOME
+
+USE_GMAKE= yes
+USE_GNOME= gnomehack gnomeprefix intlhack pygnome2
+WANT_GNOME= yes
+USE_PYTHON= yes
+USE_GETTEXT= yes
+USE_X_PREFIX= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+DOCS= AUTHORS COPYING ChangeLog HACKING \
+ MAINTAINERS NEWS README TODO
+
+.ifndef (NOPORTDOCS)
+post-install:
+ @${MKDIR} ${DOCSDIR}
+.for i in ${DOCS}
+ @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo
new file mode 100644
index 00000000000..90022b424d5
--- /dev/null
+++ b/sysutils/pessulus/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/pessulus-0.9.1.tar.gz) = d5c67fb75254d93dd28c9a73880007db
+SHA256 (gnome2/pessulus-0.9.1.tar.gz) = 55a038530650d1e8d79be37d12122b5ac0f44f6b0e70d27b8e109f53fe6c33a8
+SIZE (gnome2/pessulus-0.9.1.tar.gz) = 166001
diff --git a/sysutils/pessulus/pkg-descr b/sysutils/pessulus/pkg-descr
new file mode 100644
index 00000000000..f1105467ee2
--- /dev/null
+++ b/sysutils/pessulus/pkg-descr
@@ -0,0 +1,6 @@
+Pessulus is a lockdown editor for GNOME, written in python. It enables
+administrators to set mandatory settings in GConf. The users can not change
+these settings. Use of pessulus can be useful on computers that are open to
+use by everyone, e.g. in an internet cafe.
+
+WWW: http://www.gnome.org/~vuntz/pessulus/
diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist
new file mode 100644
index 00000000000..1cefcd83f87
--- /dev/null
+++ b/sysutils/pessulus/pkg-plist
@@ -0,0 +1,100 @@
+bin/pessulus
+%%PYTHON_SITELIBDIR%%/Pessulus/__init__.py
+%%PYTHON_SITELIBDIR%%/Pessulus/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/config.py
+%%PYTHON_SITELIBDIR%%/Pessulus/config.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/config.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/disabledapplets.py
+%%PYTHON_SITELIBDIR%%/Pessulus/disabledapplets.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/disabledapplets.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/globalvar.py
+%%PYTHON_SITELIBDIR%%/Pessulus/globalvar.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/globalvar.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/icons.py
+%%PYTHON_SITELIBDIR%%/Pessulus/icons.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/icons.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownapplier.py
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownapplier.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownapplier.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownappliergconf.py
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownappliergconf.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownappliergconf.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownbutton.py
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownbutton.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdownbutton.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdowncheckbutton.py
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdowncheckbutton.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/lockdowncheckbutton.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/main.py
+%%PYTHON_SITELIBDIR%%/Pessulus/main.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/main.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/maindialog.py
+%%PYTHON_SITELIBDIR%%/Pessulus/maindialog.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/maindialog.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/safeprotocols.py
+%%PYTHON_SITELIBDIR%%/Pessulus/safeprotocols.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/safeprotocols.pyo
+%%PYTHON_SITELIBDIR%%/Pessulus/simpleeditabletreeview.py
+%%PYTHON_SITELIBDIR%%/Pessulus/simpleeditabletreeview.pyc
+%%PYTHON_SITELIBDIR%%/Pessulus/simpleeditabletreeview.pyo
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+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/ca/LC_MESSAGES/pessulus.mo
+share/locale/cs/LC_MESSAGES/pessulus.mo
+share/locale/cy/LC_MESSAGES/pessulus.mo
+share/locale/da/LC_MESSAGES/pessulus.mo
+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/es/LC_MESSAGES/pessulus.mo
+share/locale/et/LC_MESSAGES/pessulus.mo
+share/locale/eu/LC_MESSAGES/pessulus.mo
+share/locale/fi/LC_MESSAGES/pessulus.mo
+share/locale/fr/LC_MESSAGES/pessulus.mo
+share/locale/gl/LC_MESSAGES/pessulus.mo
+share/locale/gu/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
+share/locale/it/LC_MESSAGES/pessulus.mo
+share/locale/ja/LC_MESSAGES/pessulus.mo
+share/locale/ka/LC_MESSAGES/pessulus.mo
+share/locale/ko/LC_MESSAGES/pessulus.mo
+share/locale/lt/LC_MESSAGES/pessulus.mo
+share/locale/mk/LC_MESSAGES/pessulus.mo
+share/locale/nb/LC_MESSAGES/pessulus.mo
+share/locale/nl/LC_MESSAGES/pessulus.mo
+share/locale/pa/LC_MESSAGES/pessulus.mo
+share/locale/pt/LC_MESSAGES/pessulus.mo
+share/locale/pt_BR/LC_MESSAGES/pessulus.mo
+share/locale/sk/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/th/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
diff --git a/sysutils/slmon/Makefile b/sysutils/slmon/Makefile
index 36a84cfeb50..7ecc07d1420 100644
--- a/sysutils/slmon/Makefile
+++ b/sysutils/slmon/Makefile
@@ -8,7 +8,7 @@
PORTNAME= slmon
PORTVERSION= 0.5.13
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,10 +16,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= S-Lang System Monitor
-LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop2 \
slang.1:${PORTSDIR}/devel/libslang
-USE_REINPLACE= yes
USE_GETOPT_LONG= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 13e65e5af14..4c667c7d198 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -3,14 +3,15 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/textproc/gnomedocutils/Makefile,v 1.21 2005/10/12 19:50:19 marcus Exp $
+# $MCom: ports/textproc/gnomedocutils/Makefile,v 1.32 2006/03/14 03:06:20 marcus Exp $
#
PORTNAME= gnomedocutils
-PORTVERSION= 0.4.4
+PORTVERSION= 0.6.0
+PORTREVISION= 1
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-doc-utils/0.4
+MASTER_SITE_SUBDIR= sources/gnome-doc-utils/0.6
DISTNAME= gnome-doc-utils-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
@@ -24,6 +25,7 @@ PREFIX?= ${X11BASE}
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_GNOME= gnomehier gnometarget gnomehack libxslt
USE_PYTHON= yes
INSTALLS_OMF= yes
diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo
index 916ad77c0a6..84b1fd90ac6 100644
--- a/textproc/gnome-doc-utils/distinfo
+++ b/textproc/gnome-doc-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-doc-utils-0.4.4.tar.bz2) = b89d9e9830f5b3e0ead295104637a207
-SHA256 (gnome-doc-utils-0.4.4.tar.bz2) = 7fcc814a0b4aa6567e9b478c6f5823119ceb28f77933de39d4f69e62dd9ce5b1
-SIZE (gnome-doc-utils-0.4.4.tar.bz2) = 390871
+MD5 (gnome-doc-utils-0.6.0.tar.bz2) = 1e0c26e3e1159f60551aab5187634744
+SHA256 (gnome-doc-utils-0.6.0.tar.bz2) = 1b13413919086cadd948cf886359176c23fa15c6740e6c8b4ccbff4aaf4f5681
+SIZE (gnome-doc-utils-0.6.0.tar.bz2) = 373670
diff --git a/textproc/gnome-doc-utils/files/patch-configure b/textproc/gnome-doc-utils/files/patch-configure
new file mode 100644
index 00000000000..33df31f408f
--- /dev/null
+++ b/textproc/gnome-doc-utils/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig Sat Mar 11 13:14:03 2006
++++ configure Sat Mar 11 13:14:17 2006
+@@ -7249,6 +7249,7 @@ echo "${ECHO_T}found xgettext program is
+ echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
+ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
+ NEW_LINGUAS=
++ unset LINGUAS
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist
index 6b2efcf5c9f..dbdfaec5ac3 100644
--- a/textproc/gnome-doc-utils/pkg-plist
+++ b/textproc/gnome-doc-utils/pkg-plist
@@ -14,6 +14,7 @@ share/gnome/help/gnome-doc-xslt/C/db-title.xml
share/gnome/help/gnome-doc-xslt/C/db-xref.xml
share/gnome/help/gnome-doc-xslt/C/db2html-admon.xml
share/gnome/help/gnome-doc-xslt/C/db2html-autotoc.xml
+share/gnome/help/gnome-doc-xslt/C/db2html-bibliography.xml
share/gnome/help/gnome-doc-xslt/C/db2html-block.xml
share/gnome/help/gnome-doc-xslt/C/db2html-callout.xml
share/gnome/help/gnome-doc-xslt/C/db2html-classsynopsis.xml
@@ -21,9 +22,11 @@ share/gnome/help/gnome-doc-xslt/C/db2html-cmdsynopsis.xml
share/gnome/help/gnome-doc-xslt/C/db2html-css.xml
share/gnome/help/gnome-doc-xslt/C/db2html-division.xml
share/gnome/help/gnome-doc-xslt/C/db2html-ebnf.xml
+share/gnome/help/gnome-doc-xslt/C/db2html-footnote.xml
share/gnome/help/gnome-doc-xslt/C/db2html-funcsynopsis.xml
share/gnome/help/gnome-doc-xslt/C/db2html-info.xml
share/gnome/help/gnome-doc-xslt/C/db2html-inline.xml
+share/gnome/help/gnome-doc-xslt/C/db2html-l10n.xml
share/gnome/help/gnome-doc-xslt/C/db2html-list.xml
share/gnome/help/gnome-doc-xslt/C/db2html-media.xml
share/gnome/help/gnome-doc-xslt/C/db2html-qanda.xml
@@ -36,11 +39,60 @@ share/gnome/help/gnome-doc-xslt/C/db2html.xml
share/gnome/help/gnome-doc-xslt/C/db2omf.xml
share/gnome/help/gnome-doc-xslt/C/gettext.xml
share/gnome/help/gnome-doc-xslt/C/gnome-doc-xslt.xml
+share/gnome/help/gnome-doc-xslt/C/l10n-numbers.xml
share/gnome/help/gnome-doc-xslt/C/legal.xml
share/gnome/help/gnome-doc-xslt/C/translating.xml
share/gnome/help/gnome-doc-xslt/C/xsldoc.xml
share/gnome/omf/gnome-doc-make/gnome-doc-make-C.omf
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/ca/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/cs/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/da/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/de/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/el/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/en_CA/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/en_GB/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/es/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/et/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/fi/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/fr/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/gl/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/gu/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/he/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/hi/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/hu/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/id/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/it/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/ja/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/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
+share/locale/ro/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/ru/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/rw/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/sk/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/sq/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/sr/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/sv/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/th/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/tr/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/ug/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/uk/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/vi/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/wa/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-doc-utils.mo
share/xml/gnome/xslt/docbook/common/db-chunk.xsl
share/xml/gnome/xslt/docbook/common/db-common.xsl
share/xml/gnome/xslt/docbook/common/db-label.xsl
@@ -48,6 +100,7 @@ share/xml/gnome/xslt/docbook/common/db-title.xsl
share/xml/gnome/xslt/docbook/common/db-xref.xsl
share/xml/gnome/xslt/docbook/html/db2html-admon.xsl
share/xml/gnome/xslt/docbook/html/db2html-autotoc.xsl
+share/xml/gnome/xslt/docbook/html/db2html-bibliography.xsl
share/xml/gnome/xslt/docbook/html/db2html-block.xsl
share/xml/gnome/xslt/docbook/html/db2html-callout.xsl
share/xml/gnome/xslt/docbook/html/db2html-classsynopsis.xsl
@@ -55,9 +108,11 @@ share/xml/gnome/xslt/docbook/html/db2html-cmdsynopsis.xsl
share/xml/gnome/xslt/docbook/html/db2html-css.xsl
share/xml/gnome/xslt/docbook/html/db2html-division.xsl
share/xml/gnome/xslt/docbook/html/db2html-ebnf.xsl
+share/xml/gnome/xslt/docbook/html/db2html-footnote.xsl
share/xml/gnome/xslt/docbook/html/db2html-funcsynopsis.xsl
share/xml/gnome/xslt/docbook/html/db2html-info.xsl
share/xml/gnome/xslt/docbook/html/db2html-inline.xsl
+share/xml/gnome/xslt/docbook/html/db2html-l10n.xsl
share/xml/gnome/xslt/docbook/html/db2html-list.xsl
share/xml/gnome/xslt/docbook/html/db2html-media.xsl
share/xml/gnome/xslt/docbook/html/db2html-qanda.xsl
@@ -72,6 +127,7 @@ share/xml/gnome/xslt/docbook/utils/chunks.xsl
share/xml/gnome/xslt/docbook/utils/credits.xsl
share/xml/gnome/xslt/docbook/utils/ids.xsl
share/xml/gnome/xslt/gettext/gettext.xsl
+share/xml/gnome/xslt/gettext/l10n-numbers.xsl
share/xml/gnome/xslt/gettext/l10n.xml
share/xml/gnome/xslt/xsldoc/xsldoc.xsl
share/xml2po/docbook.py
@@ -91,6 +147,12 @@ share/xml2po/gs.pyc
@dirrm share/xml/gnome/xslt
@dirrm share/xml/gnome
@dirrm share/xml
+@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/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@dirrm share/gnome/omf/gnome-doc-xslt
@dirrm share/gnome/omf/gnome-doc-make
@dirrm share/gnome/help/gnome-doc-xslt/C
diff --git a/textproc/gnomedocutils/Makefile b/textproc/gnomedocutils/Makefile
index 13e65e5af14..4c667c7d198 100644
--- a/textproc/gnomedocutils/Makefile
+++ b/textproc/gnomedocutils/Makefile
@@ -3,14 +3,15 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/textproc/gnomedocutils/Makefile,v 1.21 2005/10/12 19:50:19 marcus Exp $
+# $MCom: ports/textproc/gnomedocutils/Makefile,v 1.32 2006/03/14 03:06:20 marcus Exp $
#
PORTNAME= gnomedocutils
-PORTVERSION= 0.4.4
+PORTVERSION= 0.6.0
+PORTREVISION= 1
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-doc-utils/0.4
+MASTER_SITE_SUBDIR= sources/gnome-doc-utils/0.6
DISTNAME= gnome-doc-utils-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
@@ -24,6 +25,7 @@ PREFIX?= ${X11BASE}
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_GNOME= gnomehier gnometarget gnomehack libxslt
USE_PYTHON= yes
INSTALLS_OMF= yes
diff --git a/textproc/gnomedocutils/distinfo b/textproc/gnomedocutils/distinfo
index 916ad77c0a6..84b1fd90ac6 100644
--- a/textproc/gnomedocutils/distinfo
+++ b/textproc/gnomedocutils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-doc-utils-0.4.4.tar.bz2) = b89d9e9830f5b3e0ead295104637a207
-SHA256 (gnome-doc-utils-0.4.4.tar.bz2) = 7fcc814a0b4aa6567e9b478c6f5823119ceb28f77933de39d4f69e62dd9ce5b1
-SIZE (gnome-doc-utils-0.4.4.tar.bz2) = 390871
+MD5 (gnome-doc-utils-0.6.0.tar.bz2) = 1e0c26e3e1159f60551aab5187634744
+SHA256 (gnome-doc-utils-0.6.0.tar.bz2) = 1b13413919086cadd948cf886359176c23fa15c6740e6c8b4ccbff4aaf4f5681
+SIZE (gnome-doc-utils-0.6.0.tar.bz2) = 373670
diff --git a/textproc/gnomedocutils/files/patch-configure b/textproc/gnomedocutils/files/patch-configure
new file mode 100644
index 00000000000..33df31f408f
--- /dev/null
+++ b/textproc/gnomedocutils/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig Sat Mar 11 13:14:03 2006
++++ configure Sat Mar 11 13:14:17 2006
+@@ -7249,6 +7249,7 @@ echo "${ECHO_T}found xgettext program is
+ echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
+ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
+ NEW_LINGUAS=
++ unset LINGUAS
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
diff --git a/textproc/gnomedocutils/pkg-plist b/textproc/gnomedocutils/pkg-plist
index 6b2efcf5c9f..dbdfaec5ac3 100644
--- a/textproc/gnomedocutils/pkg-plist
+++ b/textproc/gnomedocutils/pkg-plist
@@ -14,6 +14,7 @@ share/gnome/help/gnome-doc-xslt/C/db-title.xml
share/gnome/help/gnome-doc-xslt/C/db-xref.xml
share/gnome/help/gnome-doc-xslt/C/db2html-admon.xml
share/gnome/help/gnome-doc-xslt/C/db2html-autotoc.xml
+share/gnome/help/gnome-doc-xslt/C/db2html-bibliography.xml
share/gnome/help/gnome-doc-xslt/C/db2html-block.xml
share/gnome/help/gnome-doc-xslt/C/db2html-callout.xml
share/gnome/help/gnome-doc-xslt/C/db2html-classsynopsis.xml
@@ -21,9 +22,11 @@ share/gnome/help/gnome-doc-xslt/C/db2html-cmdsynopsis.xml
share/gnome/help/gnome-doc-xslt/C/db2html-css.xml
share/gnome/help/gnome-doc-xslt/C/db2html-division.xml
share/gnome/help/gnome-doc-xslt/C/db2html-ebnf.xml
+share/gnome/help/gnome-doc-xslt/C/db2html-footnote.xml
share/gnome/help/gnome-doc-xslt/C/db2html-funcsynopsis.xml
share/gnome/help/gnome-doc-xslt/C/db2html-info.xml
share/gnome/help/gnome-doc-xslt/C/db2html-inline.xml
+share/gnome/help/gnome-doc-xslt/C/db2html-l10n.xml
share/gnome/help/gnome-doc-xslt/C/db2html-list.xml
share/gnome/help/gnome-doc-xslt/C/db2html-media.xml
share/gnome/help/gnome-doc-xslt/C/db2html-qanda.xml
@@ -36,11 +39,60 @@ share/gnome/help/gnome-doc-xslt/C/db2html.xml
share/gnome/help/gnome-doc-xslt/C/db2omf.xml
share/gnome/help/gnome-doc-xslt/C/gettext.xml
share/gnome/help/gnome-doc-xslt/C/gnome-doc-xslt.xml
+share/gnome/help/gnome-doc-xslt/C/l10n-numbers.xml
share/gnome/help/gnome-doc-xslt/C/legal.xml
share/gnome/help/gnome-doc-xslt/C/translating.xml
share/gnome/help/gnome-doc-xslt/C/xsldoc.xml
share/gnome/omf/gnome-doc-make/gnome-doc-make-C.omf
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/ca/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/cs/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/da/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/de/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/el/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/en_CA/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/en_GB/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/es/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/et/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/fi/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/fr/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/gl/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/gu/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/he/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/hi/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/hu/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/id/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/it/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/ja/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/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
+share/locale/ro/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/ru/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/rw/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/sk/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/sq/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/sr/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/sv/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/th/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/tr/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/ug/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/uk/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/vi/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/wa/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-doc-utils.mo
share/xml/gnome/xslt/docbook/common/db-chunk.xsl
share/xml/gnome/xslt/docbook/common/db-common.xsl
share/xml/gnome/xslt/docbook/common/db-label.xsl
@@ -48,6 +100,7 @@ share/xml/gnome/xslt/docbook/common/db-title.xsl
share/xml/gnome/xslt/docbook/common/db-xref.xsl
share/xml/gnome/xslt/docbook/html/db2html-admon.xsl
share/xml/gnome/xslt/docbook/html/db2html-autotoc.xsl
+share/xml/gnome/xslt/docbook/html/db2html-bibliography.xsl
share/xml/gnome/xslt/docbook/html/db2html-block.xsl
share/xml/gnome/xslt/docbook/html/db2html-callout.xsl
share/xml/gnome/xslt/docbook/html/db2html-classsynopsis.xsl
@@ -55,9 +108,11 @@ share/xml/gnome/xslt/docbook/html/db2html-cmdsynopsis.xsl
share/xml/gnome/xslt/docbook/html/db2html-css.xsl
share/xml/gnome/xslt/docbook/html/db2html-division.xsl
share/xml/gnome/xslt/docbook/html/db2html-ebnf.xsl
+share/xml/gnome/xslt/docbook/html/db2html-footnote.xsl
share/xml/gnome/xslt/docbook/html/db2html-funcsynopsis.xsl
share/xml/gnome/xslt/docbook/html/db2html-info.xsl
share/xml/gnome/xslt/docbook/html/db2html-inline.xsl
+share/xml/gnome/xslt/docbook/html/db2html-l10n.xsl
share/xml/gnome/xslt/docbook/html/db2html-list.xsl
share/xml/gnome/xslt/docbook/html/db2html-media.xsl
share/xml/gnome/xslt/docbook/html/db2html-qanda.xsl
@@ -72,6 +127,7 @@ share/xml/gnome/xslt/docbook/utils/chunks.xsl
share/xml/gnome/xslt/docbook/utils/credits.xsl
share/xml/gnome/xslt/docbook/utils/ids.xsl
share/xml/gnome/xslt/gettext/gettext.xsl
+share/xml/gnome/xslt/gettext/l10n-numbers.xsl
share/xml/gnome/xslt/gettext/l10n.xml
share/xml/gnome/xslt/xsldoc/xsldoc.xsl
share/xml2po/docbook.py
@@ -91,6 +147,12 @@ share/xml2po/gs.pyc
@dirrm share/xml/gnome/xslt
@dirrm share/xml/gnome
@dirrm share/xml
+@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/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@dirrm share/gnome/omf/gnome-doc-xslt
@dirrm share/gnome/omf/gnome-doc-make
@dirrm share/gnome/help/gnome-doc-xslt/C
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index 6e77d71582c..45740cbee09 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -4,15 +4,14 @@
# Whom: Ying-Chieh Liao <ijliao@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/textproc/libxml++26/Makefile,v 1.7 2005/10/14 20:39:58 adamw Exp $
+# $MCom: ports/textproc/libxml++26/Makefile,v 1.13 2006/04/13 07:52:38 bland Exp $
#
PORTNAME= libxml++
-PORTVERSION= 2.12.0
-PORTREVISION= 1
+PORTVERSION= 2.14.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
MAINTAINER= bland@FreeBSD.org
COMMENT= XML API for C++
@@ -26,10 +25,9 @@ USE_GMAKE= yes
USE_GCC= 3.4
USE_GNOME= gnomehack gnometarget libxml2 pkgconfig
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
+PLIST_SUB= VERSION="2.6" API_VERSION="2.6" DOC_VERSION=${PORTVERSION:R}
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
diff --git a/textproc/libxml++26/distinfo b/textproc/libxml++26/distinfo
index 97ac5eba448..0dbea2ede9a 100644
--- a/textproc/libxml++26/distinfo
+++ b/textproc/libxml++26/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxml++-2.12.0.tar.gz) = c705873dbf7374eb9857b656a3c71904
-SHA256 (libxml++-2.12.0.tar.gz) = f4aba55fab409603abefa3daccb6ff3f177339d9af31e6de30c7ba0c433e0119
-SIZE (libxml++-2.12.0.tar.gz) = 906439
+MD5 (libxml++-2.14.0.tar.gz) = 92ccfe24e23d6942441c6a1c78509dbf
+SHA256 (libxml++-2.14.0.tar.gz) = 9a3434e3f9193e4b577a4122e649ddb96bfb61d50899369e89fc64218efabf8c
+SIZE (libxml++-2.14.0.tar.gz) = 935513
diff --git a/textproc/libxml++26/pkg-plist b/textproc/libxml++26/pkg-plist
index 751e9f275d6..1529065174f 100644
--- a/textproc/libxml++26/pkg-plist
+++ b/textproc/libxml++26/pkg-plist
@@ -33,258 +33,259 @@ lib/libxml++-%%VERSION%%.so.2
libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/manual/html/ar01s02.html
%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/manual/html/index.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/annotated.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/attribute_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/cdatanode_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classbool.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classes.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Attribute-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Attribute.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Attribute__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Attribute__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Attribute__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1CdataNode-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1CdataNode.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1CdataNode__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1CdataNode__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1CdataNode__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1CommentNode-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1CommentNode.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1CommentNode__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1CommentNode__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1CommentNode__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1ContentNode-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1ContentNode.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1ContentNode__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1ContentNode__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1ContentNode__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Document-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Document.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Document__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Document__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Document__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1DomParser-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1DomParser.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1DomParser__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1DomParser__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1DomParser__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Dtd-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Dtd.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1DtdValidator-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1DtdValidator.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1DtdValidator__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1DtdValidator__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1DtdValidator__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Element-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Element.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Element__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Element__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Element__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1EntityReference-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1EntityReference.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1EntityReference__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1EntityReference__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1EntityReference__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1IStreamParserInputBuffer-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1IStreamParserInputBuffer.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1KeepBlanks-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1KeepBlanks.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Node-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Node.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Node__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Node__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Node__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1NonCopyable-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1NonCopyable.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1NonCopyable__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1NonCopyable__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1NonCopyable__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1OStreamOutputBuffer-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1OStreamOutputBuffer.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1OutputBuffer-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1OutputBuffer.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1OutputBuffer__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1OutputBuffer__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1OutputBuffer__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Parser-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Parser.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1ParserInputBuffer-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1ParserInputBuffer.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Parser__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Parser__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Parser__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1ProcessingInstructionNode-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1ProcessingInstructionNode.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1SaxParser-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1SaxParser.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1SaxParser__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1SaxParser__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1SaxParser__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1TextNode-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1TextNode.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1TextNode__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1TextNode__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1TextNode__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1TextReader-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1TextReader.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1TextReader__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1TextReader__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1TextReader__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Validator-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Validator.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Validator__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Validator__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1Validator__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1exception-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1exception.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1exception__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1exception__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1exception__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1internal__error-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1internal__error.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1internal__error__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1internal__error__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1internal__error__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1parse__error-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1parse__error.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1parse__error__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1parse__error__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1parse__error__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1validity__error-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1validity__error.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1validity__error__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1validity__error__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/classxmlpp_1_1validity__error__inherit__graph.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/commentnode_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/contentnode_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000000.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000000_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000000_dep.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000001.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000001_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000001_dep.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000002.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000002_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000002_dep.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000003.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000003_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000003_dep.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000004.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000004_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000004_dep.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000005.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000005_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dir_000005_dep.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dirs.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/document_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/domparser_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/doxygen.css
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/doxygen.png
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dtd_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/dtdvalidator_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/element_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/entityreference_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/exception_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/files.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x63.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x64.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x65.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x66.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x67.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x68.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x69.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x6b.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x6c.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x6d.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x6e.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x6f.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x70.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x72.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x73.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x74.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x76.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x77.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x78.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_0x7e.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_enum.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_eval.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_func.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_rela.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_type.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/functions_vars.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/globals.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/globals_enum.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/globals_eval.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/globals_type.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/graph_legend.dot
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/graph_legend.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/graph_legend.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/hierarchy.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/index.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__0.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__0.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__0.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__1.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__1.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__1.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__2.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__2.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__2.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__3.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__3.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__3.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__4.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__4.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__4.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__5.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__5.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__5.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__6.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__6.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherit__graph__6.md5
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/inherits.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/internal__error_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/istreamparserinputbuffer_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/keepblanks_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/libxml++_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/namespacemembers.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/namespacemembers_enum.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/namespacemembers_eval.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/namespacemembers_type.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/namespaces.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/namespacexmlpp.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/node_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/noncopyable_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/ostreamoutputbuffer_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/outputbuffer_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/parse__error_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/parser_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/parserinputbuffer_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/processinginstructionnode_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/saxparser_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/structxmlpp_1_1SaxParser_1_1Attribute-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/structxmlpp_1_1SaxParser_1_1Attribute.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/structxmlpp_1_1SaxParser_1_1AttributeHasName-members.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/structxmlpp_1_1SaxParser_1_1AttributeHasName.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/textnode_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/textreader_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/validator_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html/validity__error_8h.html
-%%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12/html
-%%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/reference/2.12
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/annotated.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/attribute_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/cdatanode_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classbool.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classes.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Attribute-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Attribute.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Attribute__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Attribute__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Attribute__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CdataNode-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CdataNode.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CdataNode__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CdataNode__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CdataNode__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CommentNode-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CommentNode.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CommentNode__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CommentNode__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CommentNode__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ContentNode-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ContentNode.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ContentNode__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ContentNode__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ContentNode__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Document-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Document.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Document__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Document__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Document__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DomParser-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DomParser.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DomParser__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DomParser__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DomParser__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Dtd-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Dtd.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DtdValidator-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DtdValidator.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DtdValidator__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DtdValidator__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DtdValidator__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Element-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Element.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Element__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Element__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Element__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1EntityReference-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1EntityReference.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1EntityReference__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1EntityReference__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1EntityReference__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1IStreamParserInputBuffer-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1IStreamParserInputBuffer.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1KeepBlanks-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1KeepBlanks.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Node-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Node.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Node__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Node__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Node__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1NonCopyable-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1NonCopyable.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1NonCopyable__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1NonCopyable__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1NonCopyable__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OStreamOutputBuffer-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OStreamOutputBuffer.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OutputBuffer-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OutputBuffer.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OutputBuffer__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OutputBuffer__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OutputBuffer__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Parser-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Parser.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ParserInputBuffer-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ParserInputBuffer.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Parser__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Parser__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Parser__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ProcessingInstructionNode-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ProcessingInstructionNode.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1SaxParser-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1SaxParser.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1SaxParser__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1SaxParser__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1SaxParser__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextNode-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextNode.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextNode__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextNode__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextNode__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextReader-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextReader.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextReader__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextReader__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextReader__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Validator-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Validator.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Validator__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Validator__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Validator__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1exception-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1exception.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1exception__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1exception__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1exception__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1internal__error-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1internal__error.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1internal__error__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1internal__error__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1internal__error__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1parse__error-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1parse__error.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1parse__error__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1parse__error__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1parse__error__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1validity__error-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1validity__error.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1validity__error__inherit__graph.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1validity__error__inherit__graph.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1validity__error__inherit__graph.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/commentnode_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/contentnode_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000000.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000000_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000000_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000001.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000001_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000001_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000002.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000002_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000002_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000003.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000003_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000003_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000004.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000004_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000004_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000005.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000005_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000005_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dirs.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/document_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/domparser_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/doxygen.css
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/doxygen.png
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dtd_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dtdvalidator_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/element_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/entityreference_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/exception_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/files.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x63.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x64.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x65.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x66.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x67.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x68.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x69.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x6b.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x6c.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x6d.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x6e.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x6f.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x70.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x72.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x73.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x74.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x76.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x77.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x78.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x7e.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_enum.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_eval.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_rela.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_type.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_vars.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/globals.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/globals_enum.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/globals_eval.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/globals_type.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/graph_legend.dot
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/graph_legend.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/graph_legend.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/hierarchy.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/index.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__0.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__0.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__0.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__1.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__1.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__1.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__2.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__2.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__2.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__3.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__3.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__3.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__4.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__4.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__4.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__5.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__5.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__5.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__6.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__6.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__6.md5
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherits.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/internal__error_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/istreamparserinputbuffer_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/keepblanks_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/libxml++_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespaceSigC.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacemembers.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacemembers_enum.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacemembers_eval.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacemembers_type.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespaces.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacexmlpp.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/node_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/noncopyable_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/ostreamoutputbuffer_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/outputbuffer_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/parse__error_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/parser_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/parserinputbuffer_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/processinginstructionnode_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/saxparser_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/structxmlpp_1_1SaxParser_1_1Attribute-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/structxmlpp_1_1SaxParser_1_1Attribute.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/structxmlpp_1_1SaxParser_1_1AttributeHasName-members.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/structxmlpp_1_1SaxParser_1_1AttributeHasName.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/textnode_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/textreader_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/validator_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/validity__error_8h.html
+%%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html
+%%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%
%%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/reference
%%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/manual/html
%%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/manual
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index abdaa5f52ff..3ba13f9b604 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,15 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany-extensions/Makefile,v 1.54 2005/10/02 23:33:10 marcus Exp $
+# $MCom: ports/www/epiphany-extensions/Makefile,v 1.72 2006/04/24 04:49:23 marcus Exp $
#
PORTNAME= epiphany
-PORTVERSION= 1.8.2
-PORTREVISION= 2
+PORTVERSION= 2.14.1
+PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/1.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMESUFFIX= -extensions
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -22,30 +22,27 @@ COMMENT= A set of add-ons for the Epiphany web browser
BUILD_DEPENDS= epiphany:${PORTSDIR}/www/epiphany
RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GECKO= firefox mozilla seamonkey
USE_GNOME= gnomeprefix gnomehack intlhack gnometarget
+INSTALLS_OMF= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS= --with-extensions="all" \
- --with-mozilla=${GECKO}
+CONFIGURE_ARGS= --with-mozilla=${GECKO}
-PLIST_SUB= VERSION="1.8" EPHY_VERSION="1.8"
+EPHY_EXTENSIONS=all
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
-.undef WITHOUT_OPENSP
-WITH_OPENSP= yes
-.endif
+PLIST_SUB= VERSION="2.14" EPHY_VERSION="2.14"
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+OPTIONS= OPENSP "Enable OpenSP SGML support" off \
+ ADBLOCK "Enable the adblock extension" on
-.if exists(${LOCALBASE}/lib/libosp.so)
-WITH_OPENSP= yes
-.endif
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
.if defined(WITH_OPENSP)
CONFIGURE_ARGS+= --enable-opensp=yes
@@ -53,6 +50,24 @@ CONFIGURE_ARGS+= --enable-opensp=yes
CONFIGURE_ARGS+= --disable-opensp
.endif
+.if !defined(WITHOUT_ADBLOCK)
+EPHY_EXTENSIONS:= ${EPHY_EXTENSIONS},adblock
+LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre-utf8
+PLIST_SUB+= ADBLOCK=""
+.else
+PLIST_SUB+= ADBLOCK="@comment "
+.endif
+
+.if exists(${LOCALBASE}/share/pygtk/2.0/defs/epiphany.defs)
+USE_PYTHON= yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+PLIST_SUB+= PYTHON=""
+.else
+PLIST_SUB+= PYTHON="@comment "
+.endif
+
+CONFIGURE_ARGS+=--with-extensions="${EPHY_EXTENSIONS}"
+
pre-everything::
@${ECHO_MSG} "Epiphany-extensions also supports the following tunable option(s):"
@${ECHO_MSG} " WITH_OPENSP=yes Enable support for OpenSP SGML validation"
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index 5403e7870e3..c9bac805d77 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-extensions-1.8.2.tar.bz2) = 318418ce023ef5688e535309012591d9
-SHA256 (gnome2/epiphany-extensions-1.8.2.tar.bz2) = 63b09f3368ab6e275b9c9ff9a3e9c360f0235b19374e7f51b10fe94cdf7c7015
-SIZE (gnome2/epiphany-extensions-1.8.2.tar.bz2) = 615141
+MD5 (gnome2/epiphany-extensions-2.14.1.tar.bz2) = 8be9c522284b0a9d7ba2797e141cf26e
+SHA256 (gnome2/epiphany-extensions-2.14.1.tar.bz2) = 6b97e1160203869741c57c6720b2d1e5d16ad104b83d0391f73169542e72305c
+SIZE (gnome2/epiphany-extensions-2.14.1.tar.bz2) = 820099
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index 9575cd5352c..f724bdaaaab 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -1,30 +1,41 @@
-lib/epiphany/%%VERSION%%/extensions/actions.xml
-lib/epiphany/%%VERSION%%/extensions/auto-scroller.xml
-lib/epiphany/%%VERSION%%/extensions/bookmarks-tray.xml
-lib/epiphany/%%VERSION%%/extensions/certificates.xml
-lib/epiphany/%%VERSION%%/extensions/dashboard.xml
-lib/epiphany/%%VERSION%%/extensions/error-viewer.xml
-lib/epiphany/%%VERSION%%/extensions/extensions-manager-ui.xml
-lib/epiphany/%%VERSION%%/extensions/gestures.xml
+lib/epiphany/%%VERSION%%/extensions/actions.ephy-extension
+%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/adblock.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/auto-reload.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/auto-scroller.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/certificates.ephy-extension
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.py
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.pyc
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/console.pyo
+lib/epiphany/%%VERSION%%/extensions/error-viewer.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/extensions-manager-ui.ephy-extension
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.ephy-extension
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.py
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.pyc
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/favicon.pyo
+lib/epiphany/%%VERSION%%/extensions/gestures.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/java-console.ephy-extension
lib/epiphany/%%VERSION%%/extensions/libactionsextension.la
lib/epiphany/%%VERSION%%/extensions/libactionsextension.so
-lib/epiphany/%%VERSION%%/extensions/libactionsextension.so.0
+%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/libadblockextension.la
+%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/libadblockextension.so
+lib/epiphany/%%VERSION%%/extensions/libautoreloadextension.la
+lib/epiphany/%%VERSION%%/extensions/libautoreloadextension.so
lib/epiphany/%%VERSION%%/extensions/libautoscrollerextension.la
lib/epiphany/%%VERSION%%/extensions/libautoscrollerextension.so
-lib/epiphany/%%VERSION%%/extensions/libbookmarkstrayextension.la
-lib/epiphany/%%VERSION%%/extensions/libbookmarkstrayextension.so
lib/epiphany/%%VERSION%%/extensions/libcertificatesextension.la
lib/epiphany/%%VERSION%%/extensions/libcertificatesextension.so
-lib/epiphany/%%VERSION%%/extensions/libdashboardextension.la
-lib/epiphany/%%VERSION%%/extensions/libdashboardextension.so
lib/epiphany/%%VERSION%%/extensions/liberrorviewerextension.la
lib/epiphany/%%VERSION%%/extensions/liberrorviewerextension.so
lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.la
lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.so
lib/epiphany/%%VERSION%%/extensions/libgesturesextension.la
lib/epiphany/%%VERSION%%/extensions/libgesturesextension.so
+lib/epiphany/%%VERSION%%/extensions/libjavaconsoleextension.la
+lib/epiphany/%%VERSION%%/extensions/libjavaconsoleextension.so
lib/epiphany/%%VERSION%%/extensions/libpageinfoextension.la
lib/epiphany/%%VERSION%%/extensions/libpageinfoextension.so
+lib/epiphany/%%VERSION%%/extensions/libpushscrollerextension.la
+lib/epiphany/%%VERSION%%/extensions/libpushscrollerextension.so
lib/epiphany/%%VERSION%%/extensions/libselectstylesheetextension.la
lib/epiphany/%%VERSION%%/extensions/libselectstylesheetextension.so
lib/epiphany/%%VERSION%%/extensions/libsidebarextension.la
@@ -35,22 +46,46 @@ lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.la
lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.so
lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.la
lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.so
-lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.so.0
-lib/epiphany/%%VERSION%%/extensions/page-info.xml
-lib/epiphany/%%VERSION%%/extensions/select-stylesheet.xml
-lib/epiphany/%%VERSION%%/extensions/sidebar.xml
-lib/epiphany/%%VERSION%%/extensions/smart-bookmarks.xml
-lib/epiphany/%%VERSION%%/extensions/tab-groups.xml
-lib/epiphany/%%VERSION%%/extensions/tab-states.xml
+lib/epiphany/%%VERSION%%/extensions/page-info.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/push-scroller.ephy-extension
+%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/python-console.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/select-stylesheet.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/sidebar.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/smart-bookmarks.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/tab-groups.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension
+%%ADBLOCK%%share/gnome/epiphany-extensions/adblock-patterns
+%%ADBLOCK%%share/gnome/epiphany-extensions/adblock-statusbar-icon.svg
share/gnome/epiphany-extensions/ephy-gestures.xml
share/gnome/epiphany-extensions/glade/action-properties.glade
share/gnome/epiphany-extensions/glade/actions-editor.glade
share/gnome/epiphany-extensions/glade/error-viewer.glade
share/gnome/epiphany-extensions/glade/extensions-manager-ui.glade
share/gnome/epiphany-extensions/glade/page-info.glade
-share/gnome/epiphany-extensions/xml/ephy-bookmarks-tray-ui.xml
share/gnome/epiphany-extensions/xml/epiphany-sidebar-ui.xml
share/gnome/epiphany-extensions/xml/page-info-context-ui.xml
+share/gnome/help/epiphany-extensions/C/epiphany-extensions.xml
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-action-create.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-adblocker.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-back.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-close-2.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-close.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-forward.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-fullscreen.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-homepage.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-new-tab.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-new-window.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-next-tab.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-prev-tab.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-reload.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-stop.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-up.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-view-source-2.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-view-source.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-sidebar.png
+share/gnome/help/epiphany-extensions/C/figures/epi-ext-tabgroups.png
+share/gnome/help/epiphany-extensions/C/legal.xml
+share/gnome/omf/epiphany-extensions/epiphany-extensions-C.omf
share/locale/bg/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ca/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/cs/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -69,6 +104,7 @@ share/locale/it/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ja/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ko/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/lt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/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
@@ -84,14 +120,20 @@ 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/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_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
+@dirrm share/gnome/help/epiphany-extensions
@dirrm share/gnome/epiphany-extensions/xml
@dirrm share/gnome/epiphany-extensions/glade
@dirrm share/gnome/epiphany-extensions
@dirrmtry lib/epiphany/%%VERSION%%/extensions
+@dirrmtry lib/epiphany/%%VERSION%%/plugins
@dirrmtry lib/epiphany/%%VERSION%%
@dirrmtry lib/epiphany
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 01bbd39f07d..86c0768bd03 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,66 +3,85 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany/Makefile,v 1.84 2005/10/02 23:28:19 marcus Exp $
+# $MCom: ports/www/epiphany/Makefile,v 1.112 2006/04/13 07:52:38 bland Exp $
#
PORTNAME= epiphany
-PORTVERSION= 1.8.5
+PORTVERSION= 2.14.1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
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
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_PYTHON= yes
GNOME_DESKTOP_VERSION=2
USE_GECKO= firefox mozilla seamonkey
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils \
libgnomeprintui
+WANT_GNOME= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_REINPLACE= yes
INSTALLS_OMF= yes
-CONFIGURE_ARGS= --with-mozilla=${GECKO} \
- --disable-python
+CONFIGURE_ARGS= --with-mozilla=${GECKO}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas
+GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas \
+ epiphany-fonts.schemas epiphany-pango.schemas
-FLASHPLAYER= ${LOCALBASE}/lib/libflashplayer.so.1
-PLIST_SUB+= EPHY_VERSION="1.8"
+PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}" \
+ EPHY_PREFIX="${PREFIX}"
MAN1= epiphany.1
+.if defined(PACKAGE_BUILDING)
+.undef WITHOUT_GNOME
+WITH_GNOME= yes
+.endif
+
.include <bsd.port.pre.mk>
.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
-.if ${OSVERSION} < 500000
-IGNORE= does not build on 4.X
-.endif
-
NO_WERROR= yes
# allow build with more warnings enabled
.if defined(NO_WERROR)
CONFIGURE_ARGS+= --enable-compile-warnings=no
.endif
+.if ${HAVE_GNOME:Mpygnome2}!=""
+USE_PYTHON= yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+USE_GNOME+= pygnome2
+CONFIGURE_ARGS+=--enable-python
+PLIST_SUB+= PYTHON=""
+.else
+CONFIGURE_ARGS+=--disable-python
+PLIST_SUB+= PYTHON="@comment "
+.endif
+
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
's|-lpthread|${PTHREAD_LIBS}|g'
@${REINPLACE_CMD} -e 's|execinfo.h|#|g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|/lib/mozilla/plugins|/lib/browser_plugins:${X11BASE}/lib/browser_linux_plugins|' \
+ @${REINPLACE_CMD} -e 's|/lib/mozilla/plugins"|/lib/browser_plugins" ":" MOZILLA_PREFIX "/lib/browser_linux_plugins"|' \
${WRKSRC}/embed/mozilla/mozilla-embed-single.cpp
+ @${REINPLACE_CMD} -e 's|[$$](datadir)/pygtk/2.0/defs|${LOCALBASE}/share/pygtk/2.0/defs|' \
+ ${WRKSRC}/src/Makefile.in
post-install:
+ ${INSTALL_DATA} ${WRKSRC}/data/epiphany-fonts.schemas \
+ ${PREFIX}/etc/gconf/schemas
@-update-desktop-database
.include <bsd.port.post.mk>
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index a325c9eeee9..a9a5409eca8 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-1.8.5.tar.bz2) = 1acd61200098f03357fb6b44ef16b9c6
-SHA256 (gnome2/epiphany-1.8.5.tar.bz2) = 342b2771ae310815a803fefac8bfb7d1b9f80f4345240e09b2d6d848276e2b41
-SIZE (gnome2/epiphany-1.8.5.tar.bz2) = 3365521
+MD5 (gnome2/epiphany-2.14.1.tar.bz2) = 69f9760646b736d953f24442e0e38f7b
+SHA256 (gnome2/epiphany-2.14.1.tar.bz2) = 4eb5f8f8dacc81f47c54e3a579af3059cca3a7fa59d6cc270ed5b50d0b6a37a2
+SIZE (gnome2/epiphany-2.14.1.tar.bz2) = 3520979
diff --git a/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c b/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c
new file mode 100644
index 00000000000..146b9e59452
--- /dev/null
+++ b/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c
@@ -0,0 +1,14 @@
+--- src/bookmarks/ephy-bookmarks.c.orig Sat Apr 15 04:11:39 2006
++++ src/bookmarks/ephy-bookmarks.c Sat Apr 15 04:13:43 2006
+@@ -92,7 +92,10 @@ static const EphyBookmarksBookmarkInfo d
+ * For instance in .nl these should be
+ * "http://www.google.nl" and "http://www.google.nl/search?q=%s"
+ */
+- { N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") }
++ { N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") },
++ { N_("The FreeBSD Project"), N_("http://www.freebsd.org/") },
++ { N_("Daemon News"), N_("http://daemonnews.org/") },
++ { N_("BSD News"), N_("http://bsdnews.com/") }
+ };
+
+ static const char *default_topics [] =
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 099bc7b45aa..0b2ebe19153 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -1,8 +1,11 @@
bin/epiphany
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-adblock-manager.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-adblock.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks-type-builtins.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-command-manager.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-cookie-manager.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-dbus.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-dialog.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-event.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-factory.h
@@ -30,53 +33,28 @@ include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-statusbar.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-tab.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-type-builtins.h
include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-window.h
-libdata/bonobo/servers/GNOME_Epiphany_Automation.server
-libdata/pkgconfig/epiphany-1.8.pc
-%%DOCSDIR%%/EphyCommandManager.html
-%%DOCSDIR%%/EphyEmbed.html
-%%DOCSDIR%%/EphyNodeDb.html
-%%DOCSDIR%%/EphyTab.html
-%%DOCSDIR%%/EphyWindow.html
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/ch02.html
-%%DOCSDIR%%/epiphany-EphyEmbedFactory.html
-%%DOCSDIR%%/epiphany-EphyEmbedPersist.html
-%%DOCSDIR%%/epiphany-EphyEmbedSingle.html
-%%DOCSDIR%%/epiphany-EphyExtensionsManager.html
-%%DOCSDIR%%/epiphany-EphyGlade.html
-%%DOCSDIR%%/epiphany-EphyPermissionManager.html
-%%DOCSDIR%%/epiphany-ephy-cookie-manager.html
-%%DOCSDIR%%/epiphany-ephy-password-manager.html
-%%DOCSDIR%%/epiphany-ephy-session.html
-%%DOCSDIR%%/epiphany-ephy-shell.html
-%%DOCSDIR%%/epiphany.devhelp
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-share/gnome/application-registry/epiphany.applications
+lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.la
+lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.so
+libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
+share/aclocal/epiphany.m4
+share/dbus-1/services/org.gnome.Epiphany.service
share/gnome/applications/bme.desktop
share/gnome/applications/epiphany.desktop
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/epiphany/art/epiphany-bookmarks.png
-share/gnome/epiphany/art/epiphany-close-tab.png
share/gnome/epiphany/art/epiphany-download.png
share/gnome/epiphany/art/epiphany-entry.png
share/gnome/epiphany/art/epiphany-history.png
share/gnome/epiphany/art/epiphany-popup-hidden.png
-share/gnome/epiphany/art/hand-open.png
share/gnome/epiphany/chrome/branding/brand.dtd
share/gnome/epiphany/chrome/branding/brand.properties
share/gnome/epiphany/chrome/epiphany.manifest
share/gnome/epiphany/chrome/global/about.xhtml
share/gnome/epiphany/default-prefs.js
+share/gnome/epiphany/ephy-xml2ini.xsl
share/gnome/epiphany/epiphany-bookmark-editor-ui.xml
share/gnome/epiphany/epiphany-bookmarks-html.xsl
share/gnome/epiphany/epiphany-bookmarksbar.xml
-share/gnome/epiphany/epiphany-extension.xsd
share/gnome/epiphany/epiphany-fs-toolbar.xml
share/gnome/epiphany/epiphany-history-window-ui.xml
share/gnome/epiphany/epiphany-toolbar.xml
@@ -93,6 +71,11 @@ share/gnome/help/epiphany/C/figures/ephy-bookmarkbar-smartbookmark-screenshot.pn
share/gnome/help/epiphany/C/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/C/figures/ephy-screenshot.png
share/gnome/help/epiphany/C/legal.xml
+share/gnome/help/epiphany/bg/epiphany.xml
+share/gnome/help/epiphany/bg/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/bg/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/bg/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/bg/figures/ephy-screenshot.png
share/gnome/help/epiphany/el/epiphany.xml
share/gnome/help/epiphany/el/figures/ephy-addressbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/el/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -129,6 +112,7 @@ share/gnome/help/epiphany/uk/figures/ephy-bookmarkbar-smartbookmark-screenshot.p
share/gnome/help/epiphany/uk/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/uk/figures/ephy-screenshot.png
share/gnome/omf/epiphany/epiphany-C.omf
+share/gnome/omf/epiphany/epiphany-bg.omf
share/gnome/omf/epiphany/epiphany-el.omf
share/gnome/omf/epiphany/epiphany-es.omf
share/gnome/omf/epiphany/epiphany-eu.omf
@@ -143,12 +127,14 @@ 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/bs/LC_MESSAGES/epiphany.mo
share/locale/ca/LC_MESSAGES/epiphany.mo
share/locale/cs/LC_MESSAGES/epiphany.mo
share/locale/cy/LC_MESSAGES/epiphany.mo
share/locale/da/LC_MESSAGES/epiphany.mo
share/locale/de/LC_MESSAGES/epiphany.mo
+share/locale/dz/LC_MESSAGES/epiphany.mo
share/locale/el/LC_MESSAGES/epiphany.mo
share/locale/en_CA/LC_MESSAGES/epiphany.mo
share/locale/en_GB/LC_MESSAGES/epiphany.mo
@@ -169,6 +155,7 @@ share/locale/id/LC_MESSAGES/epiphany.mo
share/locale/is/LC_MESSAGES/epiphany.mo
share/locale/it/LC_MESSAGES/epiphany.mo
share/locale/ja/LC_MESSAGES/epiphany.mo
+share/locale/ka/LC_MESSAGES/epiphany.mo
share/locale/ko/LC_MESSAGES/epiphany.mo
share/locale/ku/LC_MESSAGES/epiphany.mo
share/locale/li/LC_MESSAGES/epiphany.mo
@@ -209,6 +196,8 @@ 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/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrm share/gnome/omf/epiphany
@dirrm share/gnome/help/epiphany/uk/figures
@dirrm share/gnome/help/epiphany/uk
@@ -224,6 +213,8 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
@dirrm share/gnome/help/epiphany/es
@dirrm share/gnome/help/epiphany/el/figures
@dirrm share/gnome/help/epiphany/el
+@dirrm share/gnome/help/epiphany/bg/figures
+@dirrm share/gnome/help/epiphany/bg
@dirrm share/gnome/help/epiphany/C/figures
@dirrm share/gnome/help/epiphany/C
@dirrm share/gnome/help/epiphany
@@ -234,7 +225,13 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
@dirrm share/gnome/epiphany/art
@dirrm share/gnome/epiphany
@dirrm %%DOCSDIR%%
+@dirrmtry lib/epiphany/%%EPHY_VERSION%%/plugins
+@dirrmtry lib/epiphany/%%EPHY_VERSION%%
+@dirrmtry lib/epiphany
@dirrm include/epiphany/%%EPHY_VERSION%%/epiphany
@dirrm include/epiphany/%%EPHY_VERSION%%
@dirrm include/epiphany
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+%%PYTHON%%@cwd %%LOCALBASE%%
+%%PYTHON%%share/pygtk/2.0/defs/epiphany.defs
+%%PYTHON%%@cwd %%EPHY_PREFIX%%
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index 8aa2a21aa7d..70d3f39a2ca 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -3,15 +3,14 @@
# Whom: Koop Mast <kwm@rainbow-runner.nl>
#
# $FreeBSD$
-# $MCom: ports/www/evolution-webcal/Makefile,v 1.29 2005/10/04 04:35:08 marcus Exp $
+# $MCom: ports/www/evolution-webcal/Makefile,v 1.37 2006/04/15 06:53:55 marcus Exp $
#
PORTNAME= webcal
-PORTVERSION= 2.4.1
-PORTREVISION= 1
+PORTVERSION= 2.5.90
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/2.4
+MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= evolution-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
@@ -21,9 +20,9 @@ COMMENT= Webcal(endar) handler for gnome
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_PERL= yes
USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver libgnomeui
-USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo
index 92e68c1fd5d..85e7471af2b 100644
--- a/www/evolution-webcal/distinfo
+++ b/www/evolution-webcal/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-webcal-2.4.1.tar.bz2) = 1ada1b3bf18604fea9bb6dec6752148c
-SHA256 (evolution-webcal-2.4.1.tar.bz2) = b9798dcee6d13cb05023ac8e221d7ec23448e339c50c974b1cb7d0897486aac2
-SIZE (evolution-webcal-2.4.1.tar.bz2) = 155367
+MD5 (evolution-webcal-2.5.90.tar.bz2) = de482967bbb601c07ba796562dafe34a
+SHA256 (evolution-webcal-2.5.90.tar.bz2) = 0fd89744637efa976032a6ca62867b2682a7bf8c61bf98b5487ee2f4d5665b3c
+SIZE (evolution-webcal-2.5.90.tar.bz2) = 154694
diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist
index 78669fe92ae..da8f797a787 100644
--- a/www/evolution-webcal/pkg-plist
+++ b/www/evolution-webcal/pkg-plist
@@ -26,6 +26,7 @@ share/locale/id/LC_MESSAGES/evolution-webcal.mo
share/locale/it/LC_MESSAGES/evolution-webcal.mo
share/locale/ja/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/mk/LC_MESSAGES/evolution-webcal.mo
share/locale/ms/LC_MESSAGES/evolution-webcal.mo
@@ -57,3 +58,5 @@ share/locale/zh_CN/LC_MESSAGES/evolution-webcal.mo
share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 37a633286c7..ebfd79eb53f 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnome-user-share
PORTVERSION= 0.10
+PORTREVISION= 1
CATEGORIES= www deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10
@@ -15,14 +16,16 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Personal file-sharing service for the GNOME Desktop
-LIB_DEPENDS= howl:${PORTSDIR}/net/howl
+LIB_DEPENDS= avahi-client:${PORTSDIR}/net/avahi
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_APACHE= 2.0+
USE_GNOME= gnomeprefix gnomehack intlhack libglade2 gconf2
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-howl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 5afc4a82431..d7e40fc2888 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gtkhtml3/Makefile,v 1.62 2005/10/03 15:21:56 ahze Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.77 2006/04/13 07:52:39 bland Exp $
#
PORTNAME= gtkhtml3
-PORTVERSION= 3.8.2
-PORTREVISION= 1
+PORTVERSION= 3.10.1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -20,13 +19,14 @@ COMMENT= Lightweight HTML rendering/printing/editing engine
LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \
libgnomeprintui ltverhack
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 0af85a2477c..24036a9892c 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.8.2.tar.bz2) = 4455e24142cc914f00f1e8b81940df68
-SHA256 (gnome2/gtkhtml-3.8.2.tar.bz2) = d8fc9e7111773448bb07cc2619fbc3b8534a14a9b3075724465c7567cf1a94d0
-SIZE (gnome2/gtkhtml-3.8.2.tar.bz2) = 1247395
+MD5 (gnome2/gtkhtml-3.10.1.tar.bz2) = f2b7ff386dae9fcc3b01c4116564722d
+SHA256 (gnome2/gtkhtml-3.10.1.tar.bz2) = e2a1910fccc4f081f70028cf28a82406cf81bf1e8a0b4fd1d44898c2bb4b59ba
+SIZE (gnome2/gtkhtml-3.10.1.tar.bz2) = 1264910
diff --git a/www/gtkhtml3/files/patch-src_htmltext.c b/www/gtkhtml3/files/patch-src_htmltext.c
deleted file mode 100644
index f970e5b654c..00000000000
--- a/www/gtkhtml3/files/patch-src_htmltext.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/htmltext.c.orig Wed Dec 8 01:45:57 2004
-+++ src/htmltext.c Wed Dec 8 01:46:10 2004
-@@ -2433,10 +2433,11 @@
- gsize
- html_text_sanitize (const gchar **str, gint *len)
- {
-+ gchar *end;
- g_return_val_if_fail (str != NULL, 0);
- g_return_val_if_fail (len != NULL, 0);
-
-- gchar *end = offset_to_pointer_validated (*str, *len, len);
-+ end = offset_to_pointer_validated (*str, *len, len);
- if (end) {
- return end - *str;
- } else {
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index b03ec689fc5..9bb8dfce8c6 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -94,6 +94,7 @@ share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/dz/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -113,7 +114,9 @@ share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ka/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/mk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -138,12 +141,18 @@ share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/sr@Latn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/th/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/vi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrm share/gnome/gtkhtml-%%VERSION%%/icons
@dirrm share/gnome/gtkhtml-%%VERSION%%
@dirrm lib/gtkhtml
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 5afc4a82431..d7e40fc2888 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gtkhtml3/Makefile,v 1.62 2005/10/03 15:21:56 ahze Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.77 2006/04/13 07:52:39 bland Exp $
#
PORTNAME= gtkhtml3
-PORTVERSION= 3.8.2
-PORTREVISION= 1
+PORTVERSION= 3.10.1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -20,13 +19,14 @@ COMMENT= Lightweight HTML rendering/printing/editing engine
LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \
libgnomeprintui ltverhack
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
index 0af85a2477c..24036a9892c 100644
--- a/www/gtkhtml38/distinfo
+++ b/www/gtkhtml38/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.8.2.tar.bz2) = 4455e24142cc914f00f1e8b81940df68
-SHA256 (gnome2/gtkhtml-3.8.2.tar.bz2) = d8fc9e7111773448bb07cc2619fbc3b8534a14a9b3075724465c7567cf1a94d0
-SIZE (gnome2/gtkhtml-3.8.2.tar.bz2) = 1247395
+MD5 (gnome2/gtkhtml-3.10.1.tar.bz2) = f2b7ff386dae9fcc3b01c4116564722d
+SHA256 (gnome2/gtkhtml-3.10.1.tar.bz2) = e2a1910fccc4f081f70028cf28a82406cf81bf1e8a0b4fd1d44898c2bb4b59ba
+SIZE (gnome2/gtkhtml-3.10.1.tar.bz2) = 1264910
diff --git a/www/gtkhtml38/files/patch-src_htmltext.c b/www/gtkhtml38/files/patch-src_htmltext.c
deleted file mode 100644
index f970e5b654c..00000000000
--- a/www/gtkhtml38/files/patch-src_htmltext.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/htmltext.c.orig Wed Dec 8 01:45:57 2004
-+++ src/htmltext.c Wed Dec 8 01:46:10 2004
-@@ -2433,10 +2433,11 @@
- gsize
- html_text_sanitize (const gchar **str, gint *len)
- {
-+ gchar *end;
- g_return_val_if_fail (str != NULL, 0);
- g_return_val_if_fail (len != NULL, 0);
-
-- gchar *end = offset_to_pointer_validated (*str, *len, len);
-+ end = offset_to_pointer_validated (*str, *len, len);
- if (end) {
- return end - *str;
- } else {
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index b03ec689fc5..9bb8dfce8c6 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -94,6 +94,7 @@ share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/dz/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -113,7 +114,9 @@ share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ka/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/mk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -138,12 +141,18 @@ share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/sr@Latn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/th/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/vi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrm share/gnome/gtkhtml-%%VERSION%%/icons
@dirrm share/gnome/gtkhtml-%%VERSION%%
@dirrm lib/gtkhtml
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 3e6398200b0..b77b277daaa 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -3,15 +3,14 @@
# Whom: ade, archie
#
# $FreeBSD$
-# $MCom: ports/x11-fm/nautilus2/Makefile,v 1.90 2005/10/03 16:24:38 marcus Exp $
+# $MCom: ports/x11-fm/nautilus2/Makefile,v 1.105 2006/04/13 07:52:42 bland Exp $
#
PORTNAME= nautilus2
-PORTVERSION= 2.12.2
-PORTREVISION= 1
+PORTVERSION= 2.14.1
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= nautilus-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -22,13 +21,13 @@ LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop eel2 \
librsvg2 desktopfileutils
GNOME_DESKTOP_VERSION=2
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
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/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index a18bc4a0f0b..672c4c291eb 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-2.12.2.tar.bz2) = 1c1304e458eda551da11ed8c52b1faa2
-SHA256 (gnome2/nautilus-2.12.2.tar.bz2) = 9b1a11fde474d0bc0891afeef912aaa01bf8189e453bb555b2977f60f98d5455
-SIZE (gnome2/nautilus-2.12.2.tar.bz2) = 4057461
+MD5 (gnome2/nautilus-2.14.1.tar.bz2) = d8bad8b9141bc823c612abb7d460b725
+SHA256 (gnome2/nautilus-2.14.1.tar.bz2) = ace7b821176159bf70cca61ee9a38384896878ec028e1fc1014ec975c08b12db
+SIZE (gnome2/nautilus-2.14.1.tar.bz2) = 4057351
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa
index 73824998fce..25fa0ee71c8 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Mon Nov 10 22:08:05 2003
-+++ configure Mon Nov 10 22:08:05 2003
-@@ -12979,7 +12979,7 @@
+--- 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"
@@ -8,13 +8,13 @@
+CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | xargs -n1 echo -n ' -I '`"
- COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0"
-@@ -13959,7 +13959,7 @@
- s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ 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
- s,@MSGFMT@,$MSGFMT,;t t
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 148b775a88e..b8cea3254ea 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -6,6 +6,7 @@ include/nautilus/libnautilus-extension/nautilus-column.h
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-item.h
include/nautilus/libnautilus-extension/nautilus-menu-provider.h
include/nautilus/libnautilus-extension/nautilus-property-page-provider.h
@@ -14,10 +15,6 @@ lib/libnautilus-extension.a
lib/libnautilus-extension.la
lib/libnautilus-extension.so
lib/libnautilus-extension.so.1
-lib/libnautilus-private.a
-lib/libnautilus-private.la
-lib/libnautilus-private.so
-lib/libnautilus-private.so.2
libdata/bonobo/servers/Nautilus_shell.server
libdata/pkgconfig/libnautilus-extension.pc
share/gnome/applications/nautilus-computer.desktop
@@ -32,7 +29,6 @@ share/gnome/nautilus/glade/nautilus-bookmarks-window.glade
share/gnome/nautilus/glade/nautilus-file-management-properties.glade
share/gnome/nautilus/nautilus-extras.placeholder
share/gnome/nautilus/nautilus-suggested.placeholder
-share/gnome/nautilus/patterns/.striated.png
share/gnome/nautilus/patterns/blue_gray_rough.png
share/gnome/nautilus/patterns/blue_ridge.png
share/gnome/nautilus/patterns/blue_type.png
@@ -115,6 +111,8 @@ share/locale/id/LC_MESSAGES/nautilus.mo
share/locale/is/LC_MESSAGES/nautilus.mo
share/locale/it/LC_MESSAGES/nautilus.mo
share/locale/ja/LC_MESSAGES/nautilus.mo
+share/locale/ka/LC_MESSAGES/nautilus.mo
+share/locale/km/LC_MESSAGES/nautilus.mo
share/locale/ko/LC_MESSAGES/nautilus.mo
share/locale/ku/LC_MESSAGES/nautilus.mo
share/locale/li/LC_MESSAGES/nautilus.mo
@@ -156,12 +154,19 @@ share/locale/wa/LC_MESSAGES/nautilus.mo
share/locale/xh/LC_MESSAGES/nautilus.mo
share/locale/yi/LC_MESSAGES/nautilus.mo
share/locale/zh_CN/LC_MESSAGES/nautilus.mo
+share/locale/zh_HK/LC_MESSAGES/nautilus.mo
share/locale/zh_TW/LC_MESSAGES/nautilus.mo
share/locale/zu/LC_MESSAGES/nautilus.mo
+share/mime/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
@@ -170,6 +175,8 @@ share/locale/zu/LC_MESSAGES/nautilus.mo
@dirrm include/nautilus/libnautilus-extension
@dirrm include/nautilus
@exec /bin/mkdir -p %D/lib/nautilus/extensions-1.0
-@unexec /bin/rmdir %D/lib/nautilus/extensions-1.0 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/lib/nautilus 2>/dev/null || /usr/bin/true
+@dirrmtry lib/nautilus/extensions-1.0
+@dirrmtry lib/nautilus
@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
diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile
index 79e8356afeb..51d894166e4 100644
--- a/x11-themes/gnome-backgrounds/Makefile
+++ b/x11-themes/gnome-backgrounds/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.11 2005/10/03 23:56:21 ahze Exp $
+# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.20 2006/04/13 07:52:42 bland Exp $
#
PORTNAME= gnome-backgrounds
-PORTVERSION= 2.12.3.1
+PORTVERSION= 2.14.1
CATEGORIES= x11-themes graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-themes/gnome-backgrounds/distinfo b/x11-themes/gnome-backgrounds/distinfo
index 8755fd98933..5e73296ff50 100644
--- a/x11-themes/gnome-backgrounds/distinfo
+++ b/x11-themes/gnome-backgrounds/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-backgrounds-2.12.3.1.tar.bz2) = f2e583371a316cb5a9048f493f3ebe71
-SHA256 (gnome2/gnome-backgrounds-2.12.3.1.tar.bz2) = 52061b76915a1584c3dffbefa50c17e165460d93a50b9765d2e67b50b2c47e76
-SIZE (gnome2/gnome-backgrounds-2.12.3.1.tar.bz2) = 1792219
+MD5 (gnome2/gnome-backgrounds-2.14.1.tar.bz2) = efd539aec1e30c205e81481e9a57e696
+SHA256 (gnome2/gnome-backgrounds-2.14.1.tar.bz2) = 7cd07e0ec597219b3632db00749709f334238a2532b65a6a31d0e038e732bfc5
+SIZE (gnome2/gnome-backgrounds-2.14.1.tar.bz2) = 1193821
diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist
index c2f18532fd3..0d8270ebbb1 100644
--- a/x11-themes/gnome-backgrounds/pkg-plist
+++ b/x11-themes/gnome-backgrounds/pkg-plist
@@ -1,17 +1,18 @@
share/gnome/gnome-background-properties/gnome-branded.xml
+share/gnome/gnome-background-properties/gnome-nature.xml
share/gnome/gnome-background-properties/gnome-tiles.xml
share/gnome/gnome-background-properties/gnome-translucent.xml
-share/gnome/pixmaps/backgrounds/gnome/branded/GNOME-Aqua.jpg
-share/gnome/pixmaps/backgrounds/gnome/branded/GNOME-FraserIsland.jpg
-share/gnome/pixmaps/backgrounds/gnome/branded/GNOME-Redblurred.jpg
-share/gnome/pixmaps/backgrounds/gnome/branded/GNOME-Weirdcolours.jpg
-share/gnome/pixmaps/backgrounds/gnome/tiles/alien-artifact-trans.png
-share/gnome/pixmaps/backgrounds/gnome/tiles/cow-trans.png
-share/gnome/pixmaps/backgrounds/gnome/tiles/tiles-trans.png
+share/gnome/pixmaps/backgrounds/gnome/branded/GNOME-Curves.png
+share/gnome/pixmaps/backgrounds/gnome/nature/FreshFlower.jpg
+share/gnome/pixmaps/backgrounds/gnome/nature/GreenMeadow.jpg
+share/gnome/pixmaps/backgrounds/gnome/nature/OpenFlower.jpg
+share/gnome/pixmaps/backgrounds/gnome/tiles/pattern-boats.svg
+share/gnome/pixmaps/backgrounds/gnome/tiles/pattern-clouds.svg
+share/gnome/pixmaps/backgrounds/gnome/tiles/pattern-stars.svg
share/gnome/pixmaps/backgrounds/gnome/translucent/ellipsis.svg
-share/gnome/pixmaps/backgrounds/gnome/translucent/rects.svg
share/gnome/pixmaps/backgrounds/gnome/translucent/tentacles.svg
share/locale/ar/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/ca/LC_MESSAGES/gnome-backgrounds.mo
@@ -19,6 +20,7 @@ share/locale/cs/LC_MESSAGES/gnome-backgrounds.mo
share/locale/cy/LC_MESSAGES/gnome-backgrounds.mo
share/locale/da/LC_MESSAGES/gnome-backgrounds.mo
share/locale/de/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/dz/LC_MESSAGES/gnome-backgrounds.mo
share/locale/el/LC_MESSAGES/gnome-backgrounds.mo
share/locale/en_CA/LC_MESSAGES/gnome-backgrounds.mo
share/locale/en_GB/LC_MESSAGES/gnome-backgrounds.mo
@@ -30,20 +32,24 @@ share/locale/fi/LC_MESSAGES/gnome-backgrounds.mo
share/locale/fr/LC_MESSAGES/gnome-backgrounds.mo
share/locale/gl/LC_MESSAGES/gnome-backgrounds.mo
share/locale/gu/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/he/LC_MESSAGES/gnome-backgrounds.mo
share/locale/hi/LC_MESSAGES/gnome-backgrounds.mo
share/locale/hu/LC_MESSAGES/gnome-backgrounds.mo
share/locale/hy/LC_MESSAGES/gnome-backgrounds.mo
share/locale/id/LC_MESSAGES/gnome-backgrounds.mo
share/locale/it/LC_MESSAGES/gnome-backgrounds.mo
share/locale/ja/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/ka/LC_MESSAGES/gnome-backgrounds.mo
share/locale/ko/LC_MESSAGES/gnome-backgrounds.mo
share/locale/ku/LC_MESSAGES/gnome-backgrounds.mo
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/nb/LC_MESSAGES/gnome-backgrounds.mo
share/locale/ne/LC_MESSAGES/gnome-backgrounds.mo
share/locale/nl/LC_MESSAGES/gnome-backgrounds.mo
share/locale/no/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
@@ -62,7 +68,10 @@ share/locale/tr/LC_MESSAGES/gnome-backgrounds.mo
share/locale/uk/LC_MESSAGES/gnome-backgrounds.mo
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
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/rw/LC_MESSAGES
@@ -73,9 +82,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-backgrounds.mo
@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/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
-@unexec /bin/rmdir %D/share/gnome/gnome-background-properties 2>/dev/null || /usr/bin/true
+@dirrmtry share/gnome/gnome-background-properties
diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index 2cbe1390a0f..2e23d8d8f7e 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -3,14 +3,14 @@
# 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 $
#
PORTNAME= gnome-themes-extras
-PORTVERSION= 0.8.1
-PORTREVISION= 2
+PORTVERSION= 0.9.0
CATEGORIES= x11-themes gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -20,9 +20,9 @@ BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-the
RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
-USE_REINPLACE= yes
-GNU_CONFIGURE= yes
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui intlhack
INSTALLS_ICONS= yes
diff --git a/x11-themes/gnome-themes-extras/distinfo b/x11-themes/gnome-themes-extras/distinfo
index aa31b0c6909..5ca19d142df 100644
--- a/x11-themes/gnome-themes-extras/distinfo
+++ b/x11-themes/gnome-themes-extras/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-themes-extras-0.8.1.tar.bz2) = 0dce0d3411460d39cd57cb06d0f3012f
-SHA256 (gnome2/gnome-themes-extras-0.8.1.tar.bz2) = 8cbdb4a64d0b7ea506eb677ce521d84deda1d897bc27ea31a2a3c98af39c6fb4
-SIZE (gnome2/gnome-themes-extras-0.8.1.tar.bz2) = 3835234
+MD5 (gnome2/gnome-themes-extras-0.9.0.tar.bz2) = bac18c11fb9de8403e27441be64d9717
+SHA256 (gnome2/gnome-themes-extras-0.9.0.tar.bz2) = 551bce54b34214b562a806ea7b7535fab5ad1825935a4eb698d5a22680600869
+SIZE (gnome2/gnome-themes-extras-0.9.0.tar.bz2) = 5625636
diff --git a/x11-themes/gnome-themes-extras/files/patch-Gorilla::gtkrc-2.0::gtkrc b/x11-themes/gnome-themes-extras/files/patch-Gorilla::gtkrc-2.0::gtkrc
deleted file mode 100644
index 18b3d7b3d81..00000000000
--- a/x11-themes/gnome-themes-extras/files/patch-Gorilla::gtkrc-2.0::gtkrc
+++ /dev/null
@@ -1,19 +0,0 @@
---- Gorilla/gtk-2.0/gtkrc.orig Sun Sep 14 10:14:29 2003
-+++ Gorilla/gtk-2.0/gtkrc Sun Sep 14 10:14:45 2003
-@@ -1,7 +1,5 @@
- # Gorilla gtk theme
- # (c) 2002-2003 Jakub 'jimmac' Steiner <jimmac@ximian.com>
--include "iconrc"
--
- style "gorilla-default"
- {
- GtkWidget::interior_focus = 1
-@@ -48,6 +46,8 @@
- engine "industrial" {}
-
- }
-+
-+include "iconrc"
-
- style "gorilla-unrounded" = "gorilla-default"
- {
diff --git a/x11-themes/gnome-themes-extras/pkg-plist b/x11-themes/gnome-themes-extras/pkg-plist
index 522edee8116..4159d4e45fc 100644
--- a/x11-themes/gnome-themes-extras/pkg-plist
+++ b/x11-themes/gnome-themes-extras/pkg-plist
@@ -134,6 +134,7 @@ share/icons/Amaranth/scalable/apps/sambaconf.svg
share/icons/Amaranth/scalable/apps/seti.svg
share/icons/Amaranth/scalable/apps/sound-juicer.svg
share/icons/Amaranth/scalable/apps/system-floppy.svg
+share/icons/Amaranth/scalable/apps/system-search-32.svg
share/icons/Amaranth/scalable/apps/system-tools-32.svg
share/icons/Amaranth/scalable/apps/tex.svg
share/icons/Amaranth/scalable/apps/thunderbird.svg
@@ -149,6 +150,7 @@ share/icons/Amaranth/scalable/devices/gnome-dev-dvd.svg
share/icons/Amaranth/scalable/devices/gnome-dev-floppy.svg
share/icons/Amaranth/scalable/devices/gnome-dev-harddisk.svg
share/icons/Amaranth/scalable/devices/gnome-dev-network.svg
+share/icons/Amaranth/scalable/devices/gnome-dev-removable.svg
share/icons/Amaranth/scalable/devices/gnome-dev-symlink.svg
share/icons/Amaranth/scalable/emblems/emblem-camera.svg
share/icons/Amaranth/scalable/emblems/emblem-cool.svg
@@ -170,6 +172,7 @@ share/icons/Amaranth/scalable/emblems/emblem-sound.svg
share/icons/Amaranth/scalable/emblems/emblem-symbolic-link.svg
share/icons/Amaranth/scalable/emblems/emblem-web.svg
share/icons/Amaranth/scalable/filesystems/gnome-fs-blockdev.svg
+share/icons/Amaranth/scalable/filesystems/gnome-fs-client.svg
share/icons/Amaranth/scalable/filesystems/gnome-fs-directory-accept.icon
share/icons/Amaranth/scalable/filesystems/gnome-fs-directory-accept.svg
share/icons/Amaranth/scalable/filesystems/gnome-fs-directory.icon
@@ -209,6 +212,7 @@ share/icons/Amaranth/scalable/mimetypes/gnome-mime-text-x-sh.svg
share/icons/Amaranth/scalable/mimetypes/gnome-mime-text-x-yacc.svg
share/icons/Amaranth/scalable/mimetypes/gnome-mime-text.svg
share/icons/Amaranth/scalable/mimetypes/gnome-mime-video.svg
+share/icons/Amaranth/scalable/stock/applets-screenshooter.svg
share/icons/Amaranth/scalable/stock/gnome-logo.svg
share/icons/Amaranth/scalable/stock/stock_about.svg
share/icons/Amaranth/scalable/stock/stock_cdrom.svg
@@ -245,6 +249,10 @@ share/icons/Amaranth/scalable/stock/stock_screenshot.svg
share/icons/Amaranth/scalable/stock/stock_search.svg
share/icons/Amaranth/scalable/stock/stock_stop.svg
share/icons/Amaranth/scalable/stock/stock_undo.svg
+share/icons/Amaranth/scalable/stock/stock_volume-0.svg
+share/icons/Amaranth/scalable/stock/stock_volume-max.svg
+share/icons/Amaranth/scalable/stock/stock_volume-med.svg
+share/icons/Amaranth/scalable/stock/stock_volume-min.svg
share/icons/Gorilla/24x24/apps/gnome-spinner-rest.png
share/icons/Gorilla/24x24/apps/gnome-spinner.png
share/icons/Gorilla/index.theme
@@ -262,6 +270,7 @@ share/icons/Gorilla/scalable/devices/gnome-dev-floppy.svg
share/icons/Gorilla/scalable/devices/gnome-dev-harddisk.svg
share/icons/Gorilla/scalable/devices/gnome-dev-mouse.svg
share/icons/Gorilla/scalable/devices/gnome-dev-network.svg
+share/icons/Gorilla/scalable/devices/gnome-dev-removable.svg
share/icons/Gorilla/scalable/devices/gnome-dev-rw.svg
share/icons/Gorilla/scalable/devices/gnome-dev-symlink.svg
share/icons/Gorilla/scalable/emblems/emblem-camera.svg
@@ -365,92 +374,96 @@ share/icons/Gorilla/scalable/mimetypes/gnome-mime-video-quicktime.svg
share/icons/Gorilla/scalable/mimetypes/gnome-mime-video-x-ms-wmv.svg
share/icons/Gorilla/scalable/mimetypes/gnome-mime-video-x-msvideo.svg
share/icons/Gorilla/scalable/mimetypes/gnome-mime-video.svg
-share/icons/Gorilla/scalable/stock/stock_about.svg
-share/icons/Gorilla/scalable/stock/stock_add.svg
-share/icons/Gorilla/scalable/stock/stock_attach.svg
-share/icons/Gorilla/scalable/stock/stock_balance.svg
-share/icons/Gorilla/scalable/stock/stock_bold.svg
-share/icons/Gorilla/scalable/stock/stock_book-open.svg
-share/icons/Gorilla/scalable/stock/stock_book.svg
-share/icons/Gorilla/scalable/stock/stock_cancel.svg
-share/icons/Gorilla/scalable/stock/stock_cdrom.svg
-share/icons/Gorilla/scalable/stock/stock_clear.svg
-share/icons/Gorilla/scalable/stock/stock_close.svg
-share/icons/Gorilla/scalable/stock/stock_connect.svg
-share/icons/Gorilla/scalable/stock/stock_convert.svg
-share/icons/Gorilla/scalable/stock/stock_copy.svg
-share/icons/Gorilla/scalable/stock/stock_cut.svg
-share/icons/Gorilla/scalable/stock/stock_delete.svg
-share/icons/Gorilla/scalable/stock/stock_dialog_error.svg
-share/icons/Gorilla/scalable/stock/stock_dialog_info.svg
-share/icons/Gorilla/scalable/stock/stock_dialog_question.svg
-share/icons/Gorilla/scalable/stock/stock_dialog_warning.svg
-share/icons/Gorilla/scalable/stock/stock_disconnect.svg
-share/icons/Gorilla/scalable/stock/stock_dnd.svg
-share/icons/Gorilla/scalable/stock/stock_dnd_multiple.svg
-share/icons/Gorilla/scalable/stock/stock_edit.svg
-share/icons/Gorilla/scalable/stock/stock_execute.svg
-share/icons/Gorilla/scalable/stock/stock_export.svg
-share/icons/Gorilla/scalable/stock/stock_find-and-replace.svg
-share/icons/Gorilla/scalable/stock/stock_find.svg
-share/icons/Gorilla/scalable/stock/stock_floppy.svg
-share/icons/Gorilla/scalable/stock/stock_go-back.svg
-share/icons/Gorilla/scalable/stock/stock_go-down.svg
-share/icons/Gorilla/scalable/stock/stock_go-forward.svg
-share/icons/Gorilla/scalable/stock/stock_go-up.svg
-share/icons/Gorilla/scalable/stock/stock_goto-bottom.svg
-share/icons/Gorilla/scalable/stock/stock_goto-first.svg
-share/icons/Gorilla/scalable/stock/stock_goto-last.svg
-share/icons/Gorilla/scalable/stock/stock_goto-top.svg
-share/icons/Gorilla/scalable/stock/stock_help.svg
-share/icons/Gorilla/scalable/stock/stock_home.svg
-share/icons/Gorilla/scalable/stock/stock_import.svg
-share/icons/Gorilla/scalable/stock/stock_index.svg
-share/icons/Gorilla/scalable/stock/stock_insert-image.svg
-share/icons/Gorilla/scalable/stock/stock_insert-object.svg
-share/icons/Gorilla/scalable/stock/stock_insert-table.svg
-share/icons/Gorilla/scalable/stock/stock_italic.svg
-share/icons/Gorilla/scalable/stock/stock_jump-to.svg
-share/icons/Gorilla/scalable/stock/stock_justify-center.svg
-share/icons/Gorilla/scalable/stock/stock_justify-fill.svg
-share/icons/Gorilla/scalable/stock/stock_justify-left.svg
-share/icons/Gorilla/scalable/stock/stock_justify-right.svg
-share/icons/Gorilla/scalable/stock/stock_line-in.svg
-share/icons/Gorilla/scalable/stock/stock_mic.svg
-share/icons/Gorilla/scalable/stock/stock_missing-image.svg
-share/icons/Gorilla/scalable/stock/stock_new.svg
-share/icons/Gorilla/scalable/stock/stock_no.svg
-share/icons/Gorilla/scalable/stock/stock_ok.svg
-share/icons/Gorilla/scalable/stock/stock_open.svg
-share/icons/Gorilla/scalable/stock/stock_paste.svg
-share/icons/Gorilla/scalable/stock/stock_preferences.svg
-share/icons/Gorilla/scalable/stock/stock_print-preview.svg
-share/icons/Gorilla/scalable/stock/stock_print.svg
-share/icons/Gorilla/scalable/stock/stock_properties.svg
-share/icons/Gorilla/scalable/stock/stock_quit.svg
-share/icons/Gorilla/scalable/stock/stock_redo.svg
-share/icons/Gorilla/scalable/stock/stock_refresh.svg
-share/icons/Gorilla/scalable/stock/stock_remove.svg
-share/icons/Gorilla/scalable/stock/stock_reset.svg
-share/icons/Gorilla/scalable/stock/stock_revert-to-saved.svg
-share/icons/Gorilla/scalable/stock/stock_save-as.svg
-share/icons/Gorilla/scalable/stock/stock_save.svg
-share/icons/Gorilla/scalable/stock/stock_select-color.svg
-share/icons/Gorilla/scalable/stock/stock_select-font.svg
-share/icons/Gorilla/scalable/stock/stock_sort-ascending.svg
-share/icons/Gorilla/scalable/stock/stock_sort-descending.svg
-share/icons/Gorilla/scalable/stock/stock_spell-check.svg
-share/icons/Gorilla/scalable/stock/stock_stop.svg
-share/icons/Gorilla/scalable/stock/stock_strikethrough.svg
-share/icons/Gorilla/scalable/stock/stock_undelete.svg
-share/icons/Gorilla/scalable/stock/stock_underline.svg
-share/icons/Gorilla/scalable/stock/stock_undo.svg
-share/icons/Gorilla/scalable/stock/stock_volume.svg
-share/icons/Gorilla/scalable/stock/stock_yes.svg
-share/icons/Gorilla/scalable/stock/stock_zoom-100.svg
-share/icons/Gorilla/scalable/stock/stock_zoom-fit.svg
-share/icons/Gorilla/scalable/stock/stock_zoom-in.svg
-share/icons/Gorilla/scalable/stock/stock_zoom-out.svg
+share/icons/Gorilla/scalable/stock/gtk-about.svg
+share/icons/Gorilla/scalable/stock/gtk-add.svg
+share/icons/Gorilla/scalable/stock/gtk-attachment.svg
+share/icons/Gorilla/scalable/stock/gtk-balance.svg
+share/icons/Gorilla/scalable/stock/gtk-bold.svg
+share/icons/Gorilla/scalable/stock/gtk-book.svg
+share/icons/Gorilla/scalable/stock/gtk-cancel.svg
+share/icons/Gorilla/scalable/stock/gtk-cdrom.svg
+share/icons/Gorilla/scalable/stock/gtk-clear.svg
+share/icons/Gorilla/scalable/stock/gtk-close.svg
+share/icons/Gorilla/scalable/stock/gtk-connect.svg
+share/icons/Gorilla/scalable/stock/gtk-convert.svg
+share/icons/Gorilla/scalable/stock/gtk-copy.svg
+share/icons/Gorilla/scalable/stock/gtk-cut.svg
+share/icons/Gorilla/scalable/stock/gtk-delete.svg
+share/icons/Gorilla/scalable/stock/gtk-dialog-error.svg
+share/icons/Gorilla/scalable/stock/gtk-dialog-info.svg
+share/icons/Gorilla/scalable/stock/gtk-dialog-question.svg
+share/icons/Gorilla/scalable/stock/gtk-dialog-warning.svg
+share/icons/Gorilla/scalable/stock/gtk-disconnect.svg
+share/icons/Gorilla/scalable/stock/gtk-dnd-multiple.svg
+share/icons/Gorilla/scalable/stock/gtk-dnd.svg
+share/icons/Gorilla/scalable/stock/gtk-edit.svg
+share/icons/Gorilla/scalable/stock/gtk-execute.svg
+share/icons/Gorilla/scalable/stock/gtk-export.svg
+share/icons/Gorilla/scalable/stock/gtk-find-and-replace.svg
+share/icons/Gorilla/scalable/stock/gtk-find.svg
+share/icons/Gorilla/scalable/stock/gtk-floppy.svg
+share/icons/Gorilla/scalable/stock/gtk-go-back-ltr.svg
+share/icons/Gorilla/scalable/stock/gtk-go-down.svg
+share/icons/Gorilla/scalable/stock/gtk-go-forward-ltr.svg
+share/icons/Gorilla/scalable/stock/gtk-go-up.svg
+share/icons/Gorilla/scalable/stock/gtk-goto-first-ltr.svg
+share/icons/Gorilla/scalable/stock/gtk-goto-last-ltr.svg
+share/icons/Gorilla/scalable/stock/gtk-goto-top.svg
+share/icons/Gorilla/scalable/stock/gtk-help.svg
+share/icons/Gorilla/scalable/stock/gtk-home.svg
+share/icons/Gorilla/scalable/stock/gtk-import.svg
+share/icons/Gorilla/scalable/stock/gtk-index.svg
+share/icons/Gorilla/scalable/stock/gtk-insert-image.svg
+share/icons/Gorilla/scalable/stock/gtk-insert-object.svg
+share/icons/Gorilla/scalable/stock/gtk-insert-table.svg
+share/icons/Gorilla/scalable/stock/gtk-italic.svg
+share/icons/Gorilla/scalable/stock/gtk-jump-to.svg
+share/icons/Gorilla/scalable/stock/gtk-justify-center.svg
+share/icons/Gorilla/scalable/stock/gtk-justify-fill.svg
+share/icons/Gorilla/scalable/stock/gtk-justify-left.svg
+share/icons/Gorilla/scalable/stock/gtk-justify-right.svg
+share/icons/Gorilla/scalable/stock/gtk-line-in.svg
+share/icons/Gorilla/scalable/stock/gtk-mic.svg
+share/icons/Gorilla/scalable/stock/gtk-missing-image.svg
+share/icons/Gorilla/scalable/stock/gtk-new.svg
+share/icons/Gorilla/scalable/stock/gtk-no.svg
+share/icons/Gorilla/scalable/stock/gtk-ok.svg
+share/icons/Gorilla/scalable/stock/gtk-open-book.svg
+share/icons/Gorilla/scalable/stock/gtk-open.svg
+share/icons/Gorilla/scalable/stock/gtk-paste.svg
+share/icons/Gorilla/scalable/stock/gtk-preferences.svg
+share/icons/Gorilla/scalable/stock/gtk-print-preview.svg
+share/icons/Gorilla/scalable/stock/gtk-print.svg
+share/icons/Gorilla/scalable/stock/gtk-properties.svg
+share/icons/Gorilla/scalable/stock/gtk-quit.svg
+share/icons/Gorilla/scalable/stock/gtk-redo.svg
+share/icons/Gorilla/scalable/stock/gtk-refresh.svg
+share/icons/Gorilla/scalable/stock/gtk-remove.svg
+share/icons/Gorilla/scalable/stock/gtk-reset.svg
+share/icons/Gorilla/scalable/stock/gtk-revert-to-saved.svg
+share/icons/Gorilla/scalable/stock/gtk-save-as.svg
+share/icons/Gorilla/scalable/stock/gtk-save.svg
+share/icons/Gorilla/scalable/stock/gtk-select-color.svg
+share/icons/Gorilla/scalable/stock/gtk-select-font.svg
+share/icons/Gorilla/scalable/stock/gtk-sort-ascending.svg
+share/icons/Gorilla/scalable/stock/gtk-sort-descending.svg
+share/icons/Gorilla/scalable/stock/gtk-spell-check.svg
+share/icons/Gorilla/scalable/stock/gtk-stop.svg
+share/icons/Gorilla/scalable/stock/gtk-strikethrough.svg
+share/icons/Gorilla/scalable/stock/gtk-undelete.svg
+share/icons/Gorilla/scalable/stock/gtk-underline.svg
+share/icons/Gorilla/scalable/stock/gtk-undo.svg
+share/icons/Gorilla/scalable/stock/gtk-volume.svg
+share/icons/Gorilla/scalable/stock/gtk-yes.svg
+share/icons/Gorilla/scalable/stock/gtk-zoom-100.svg
+share/icons/Gorilla/scalable/stock/gtk-zoom-fit.svg
+share/icons/Gorilla/scalable/stock/gtk-zoom-in.svg
+share/icons/Gorilla/scalable/stock/gtk-zoom-out.svg
+share/icons/Gorilla/scalable/stock/stock_volume-0.svg
+share/icons/Gorilla/scalable/stock/stock_volume-max.svg
+share/icons/Gorilla/scalable/stock/stock_volume-med.svg
+share/icons/Gorilla/scalable/stock/stock_volume-min.svg
+share/icons/Gorilla/scalable/stock/stock_volume-mute.svg
share/icons/Lush/index.theme
share/icons/Lush/scalable/apps/evolution-1.4.svg
share/icons/Lush/scalable/apps/evolution.svg
@@ -593,16 +606,21 @@ share/icons/Lush/scalable/stock/up.svg
share/icons/Nuvola/index.theme
share/icons/Nuvola/scalable/apps/accessibility-directory.svg
share/icons/Nuvola/scalable/apps/accessories.svg
+share/icons/Nuvola/scalable/apps/acroread.svg
+share/icons/Nuvola/scalable/apps/button_tell_a_friend.png
share/icons/Nuvola/scalable/apps/camera.svg
+share/icons/Nuvola/scalable/apps/chess.svg
share/icons/Nuvola/scalable/apps/disks.svg
share/icons/Nuvola/scalable/apps/evolution-1.4.svg
share/icons/Nuvola/scalable/apps/evolution.svg
+share/icons/Nuvola/scalable/apps/file-manager.svg
share/icons/Nuvola/scalable/apps/firefox.svg
share/icons/Nuvola/scalable/apps/gaim.svg
share/icons/Nuvola/scalable/apps/gcalctool.svg
share/icons/Nuvola/scalable/apps/gdict.svg
share/icons/Nuvola/scalable/apps/gedit-icon.svg
share/icons/Nuvola/scalable/apps/gedit.svg
+share/icons/Nuvola/scalable/apps/gftp.svg
share/icons/Nuvola/scalable/apps/gnome-applications.svg
share/icons/Nuvola/scalable/apps/gnome-audio.svg
share/icons/Nuvola/scalable/apps/gnome-ccdesktop.svg
@@ -627,10 +645,17 @@ share/icons/Nuvola/scalable/apps/gnome-mouse.svg
share/icons/Nuvola/scalable/apps/gnome-multimedia.svg
share/icons/Nuvola/scalable/apps/gnome-palette.svg
share/icons/Nuvola/scalable/apps/gnome-searchtool.svg
+share/icons/Nuvola/scalable/apps/gnome-settings-accessibility-keyboard.svg
+share/icons/Nuvola/scalable/apps/gnome-settings-background.svg
+share/icons/Nuvola/scalable/apps/gnome-settings-keybindings.svg
+share/icons/Nuvola/scalable/apps/gnome-settings-theme.svg
+share/icons/Nuvola/scalable/apps/gnome-show-desktop.svg
share/icons/Nuvola/scalable/apps/gnome-system-config.svg
share/icons/Nuvola/scalable/apps/gnome-system.svg
share/icons/Nuvola/scalable/apps/gnome-terminal.svg
share/icons/Nuvola/scalable/apps/go.svg
+share/icons/Nuvola/scalable/apps/gswitchit-applet.svg
+share/icons/Nuvola/scalable/apps/gswitchit-properties-capplet.svg
share/icons/Nuvola/scalable/apps/hwbrowser.svg
share/icons/Nuvola/scalable/apps/inkscape.svg
share/icons/Nuvola/scalable/apps/kasteroids.svg
@@ -652,6 +677,7 @@ share/icons/Nuvola/scalable/apps/ooo_draw.svg
share/icons/Nuvola/scalable/apps/ooo_impress.svg
share/icons/Nuvola/scalable/apps/ooo_writer.svg
share/icons/Nuvola/scalable/apps/password.svg
+share/icons/Nuvola/scalable/apps/postscript-viewer.svg
share/icons/Nuvola/scalable/apps/printer.svg
share/icons/Nuvola/scalable/apps/procman.svg
share/icons/Nuvola/scalable/apps/realplayer.svg
@@ -673,22 +699,31 @@ share/icons/Nuvola/scalable/apps/redhat-system_tools.svg
share/icons/Nuvola/scalable/apps/redhat-web-browser.svg
share/icons/Nuvola/scalable/apps/redhat-word-processor.svg
share/icons/Nuvola/scalable/apps/sane.svg
+share/icons/Nuvola/scalable/apps/screensaver.svg
+share/icons/Nuvola/scalable/apps/sdm.svg
share/icons/Nuvola/scalable/apps/sodipodi.svg
+share/icons/Nuvola/scalable/apps/system-config-users.svg
share/icons/Nuvola/scalable/apps/system-floppy.svg
share/icons/Nuvola/scalable/apps/system-search-32.svg
share/icons/Nuvola/scalable/apps/thunderbird.svg
+share/icons/Nuvola/scalable/apps/tsclient.svg
+share/icons/Nuvola/scalable/apps/user_icon.svg
share/icons/Nuvola/scalable/apps/web-browser.svg
share/icons/Nuvola/scalable/apps/wilber-icon.svg
+share/icons/Nuvola/scalable/apps/xscreensaver.svg
+share/icons/Nuvola/scalable/devices/gnome-dev-camera.svg
share/icons/Nuvola/scalable/devices/gnome-dev-cdrom-audio.svg
share/icons/Nuvola/scalable/devices/gnome-dev-cdrom.svg
share/icons/Nuvola/scalable/devices/gnome-dev-cdwriter.svg
share/icons/Nuvola/scalable/devices/gnome-dev-dvd.svg
share/icons/Nuvola/scalable/devices/gnome-dev-floppy.svg
share/icons/Nuvola/scalable/devices/gnome-dev-harddisk.svg
+share/icons/Nuvola/scalable/devices/gnome-dev-ipod.svg
share/icons/Nuvola/scalable/devices/gnome-dev-mouse-optical.svg
share/icons/Nuvola/scalable/devices/gnome-dev-mouse.svg
share/icons/Nuvola/scalable/devices/gnome-dev-network.svg
share/icons/Nuvola/scalable/devices/gnome-dev-printer.svg
+share/icons/Nuvola/scalable/devices/gnome-dev-removable-usb.svg
share/icons/Nuvola/scalable/devices/gnome-dev-removable.svg
share/icons/Nuvola/scalable/devices/gnome-dev-scanner.svg
share/icons/Nuvola/scalable/devices/gnome-dev-symlink.svg
@@ -756,7 +791,7 @@ share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-backup.svg
share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-core-file.svg
share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-deb.svg
share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-dvi.svg
-share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-executable-binary.svg
+share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-executable.svg
share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-afm.svg
share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-bdf.svg
share/icons/Nuvola/scalable/mimetypes/gnome-mime-application-x-font-pcf.svg
@@ -802,57 +837,77 @@ share/icons/Nuvola/scalable/mimetypes/gnome-mime-x-readme.svg
share/icons/Nuvola/scalable/stock/applets-screenshooter.svg
share/icons/Nuvola/scalable/stock/bookmark.svg
share/icons/Nuvola/scalable/stock/bookmark_add.svg
-share/icons/Nuvola/scalable/stock/brokenimage.svg
-share/icons/Nuvola/scalable/stock/editcopy.svg
-share/icons/Nuvola/scalable/stock/editdelete.svg
-share/icons/Nuvola/scalable/stock/editpaste.svg
-share/icons/Nuvola/scalable/stock/filenew.svg
-share/icons/Nuvola/scalable/stock/fileopen.svg
-share/icons/Nuvola/scalable/stock/filesave.svg
-share/icons/Nuvola/scalable/stock/filesaveas.svg
-share/icons/Nuvola/scalable/stock/find.svg
-share/icons/Nuvola/scalable/stock/findreplace.svg
-share/icons/Nuvola/scalable/stock/folder.svg
share/icons/Nuvola/scalable/stock/folder_new.svg
share/icons/Nuvola/scalable/stock/gaim_insert-smiley-small.svg
share/icons/Nuvola/scalable/stock/gaim_send-im.svg
share/icons/Nuvola/scalable/stock/gnome-logo.svg
+share/icons/Nuvola/scalable/stock/gtk-about.svg
+share/icons/Nuvola/scalable/stock/gtk-add.svg
+share/icons/Nuvola/scalable/stock/gtk-attachment.svg
+share/icons/Nuvola/scalable/stock/gtk-bold.svg
+share/icons/Nuvola/scalable/stock/gtk-brokenimage.svg
+share/icons/Nuvola/scalable/stock/gtk-cdrom.svg
+share/icons/Nuvola/scalable/stock/gtk-copy.svg
+share/icons/Nuvola/scalable/stock/gtk-cut.svg
+share/icons/Nuvola/scalable/stock/gtk-delete.svg
+share/icons/Nuvola/scalable/stock/gtk-dialog-authentication.svg
+share/icons/Nuvola/scalable/stock/gtk-dialog-info.svg
+share/icons/Nuvola/scalable/stock/gtk-dialog-warning.svg
+share/icons/Nuvola/scalable/stock/gtk-directory.svg
+share/icons/Nuvola/scalable/stock/gtk-edit.svg
+share/icons/Nuvola/scalable/stock/gtk-execute.svg
+share/icons/Nuvola/scalable/stock/gtk-find-and-replace.svg
+share/icons/Nuvola/scalable/stock/gtk-find.svg
+share/icons/Nuvola/scalable/stock/gtk-floppy.svg
+share/icons/Nuvola/scalable/stock/gtk-go-back-ltr.svg
+share/icons/Nuvola/scalable/stock/gtk-go-down.svg
+share/icons/Nuvola/scalable/stock/gtk-go-forward-ltr.svg
+share/icons/Nuvola/scalable/stock/gtk-go-up.svg
+share/icons/Nuvola/scalable/stock/gtk-goto-first-ltr.svg
+share/icons/Nuvola/scalable/stock/gtk-goto-last-ltr.svg
+share/icons/Nuvola/scalable/stock/gtk-harddisk.svg
+share/icons/Nuvola/scalable/stock/gtk-help.svg
+share/icons/Nuvola/scalable/stock/gtk-home.svg
+share/icons/Nuvola/scalable/stock/gtk-mail-send.svg
+share/icons/Nuvola/scalable/stock/gtk-media-forward-ltr.svg
+share/icons/Nuvola/scalable/stock/gtk-media-next-ltr.svg
+share/icons/Nuvola/scalable/stock/gtk-media-play-ltr.svg
+share/icons/Nuvola/scalable/stock/gtk-media-previous-ltr.svg
+share/icons/Nuvola/scalable/stock/gtk-media-rewind-ltr.svg
+share/icons/Nuvola/scalable/stock/gtk-media-stop.svg
+share/icons/Nuvola/scalable/stock/gtk-new.svg
+share/icons/Nuvola/scalable/stock/gtk-ok.svg
+share/icons/Nuvola/scalable/stock/gtk-open.svg
+share/icons/Nuvola/scalable/stock/gtk-paste.svg
+share/icons/Nuvola/scalable/stock/gtk-print-preview.svg
+share/icons/Nuvola/scalable/stock/gtk-print.svg
+share/icons/Nuvola/scalable/stock/gtk-quit.svg
+share/icons/Nuvola/scalable/stock/gtk-redo-ltr.svg
+share/icons/Nuvola/scalable/stock/gtk-refresh.svg
+share/icons/Nuvola/scalable/stock/gtk-reload.svg
+share/icons/Nuvola/scalable/stock/gtk-revert-to-saved-ltr.svg
+share/icons/Nuvola/scalable/stock/gtk-save-as.svg
+share/icons/Nuvola/scalable/stock/gtk-save.svg
+share/icons/Nuvola/scalable/stock/gtk-stop.svg
+share/icons/Nuvola/scalable/stock/gtk-strikethrough.svg
+share/icons/Nuvola/scalable/stock/gtk-underline.svg
+share/icons/Nuvola/scalable/stock/gtk-undo-ltr.svg
+share/icons/Nuvola/scalable/stock/gtk-zoom-100.svg
+share/icons/Nuvola/scalable/stock/gtk-zoom-fit.svg
+share/icons/Nuvola/scalable/stock/gtk-zoom-in.svg
+share/icons/Nuvola/scalable/stock/gtk-zoom-out.svg
share/icons/Nuvola/scalable/stock/panel-lockscreen.svg
-share/icons/Nuvola/scalable/stock/print-preview.svg
-share/icons/Nuvola/scalable/stock/printer.svg
-share/icons/Nuvola/scalable/stock/recycled.svg
-share/icons/Nuvola/scalable/stock/stock-gtk-remove.svg
-share/icons/Nuvola/scalable/stock/stock-media-eject.svg
-share/icons/Nuvola/scalable/stock/stock-media-ffwd.svg
-share/icons/Nuvola/scalable/stock/stock-media-next.svg
-share/icons/Nuvola/scalable/stock/stock-media-pause.svg
-share/icons/Nuvola/scalable/stock/stock-media-play.svg
-share/icons/Nuvola/scalable/stock/stock-media-prev.svg
-share/icons/Nuvola/scalable/stock/stock-media-rewind.svg
-share/icons/Nuvola/scalable/stock/stock-media-stop.svg
-share/icons/Nuvola/scalable/stock/stock-revert-to-saved.svg
-share/icons/Nuvola/scalable/stock/stock-volume.svg
-share/icons/Nuvola/scalable/stock/stock_cdrom.svg
-share/icons/Nuvola/scalable/stock/stock_cut.svg
+share/icons/Nuvola/scalable/stock/searchtool.svg
+share/icons/Nuvola/scalable/stock/stock_alarm.svg
share/icons/Nuvola/scalable/stock/stock_desktop.svg
-share/icons/Nuvola/scalable/stock/stock_dialog_info.svg
-share/icons/Nuvola/scalable/stock/stock_dialog_warning.svg
-share/icons/Nuvola/scalable/stock/stock_edit.svg
-share/icons/Nuvola/scalable/stock/stock_go-back.svg
-share/icons/Nuvola/scalable/stock/stock_go-down.svg
-share/icons/Nuvola/scalable/stock/stock_go-forward.svg
-share/icons/Nuvola/scalable/stock/stock_go-up.svg
-share/icons/Nuvola/scalable/stock/stock_gtk-goto-first.svg
-share/icons/Nuvola/scalable/stock/stock_gtk-goto-last.svg
-share/icons/Nuvola/scalable/stock/stock_help.svg
-share/icons/Nuvola/scalable/stock/stock_home.svg
-share/icons/Nuvola/scalable/stock/stock_ok.svg
-share/icons/Nuvola/scalable/stock/stock_quit.svg
-share/icons/Nuvola/scalable/stock/stock_redo.svg
-share/icons/Nuvola/scalable/stock/stock_reload.svg
-share/icons/Nuvola/scalable/stock/stock_run.svg
-share/icons/Nuvola/scalable/stock/stock_stop.svg
-share/icons/Nuvola/scalable/stock/stock_undo.svg
+share/icons/Nuvola/scalable/stock/stock_keyring.svg
+share/icons/Nuvola/scalable/stock/stock_post_message.svg
+share/icons/Nuvola/scalable/stock/stock_volume-0.svg
+share/icons/Nuvola/scalable/stock/stock_volume-max.svg
+share/icons/Nuvola/scalable/stock/stock_volume-med.svg
+share/icons/Nuvola/scalable/stock/stock_volume-min.svg
+share/icons/Nuvola/scalable/stock/stock_volume-mute.svg
+share/icons/Nuvola/scalable/stock/stock_volume.svg
share/icons/Wasp/index.theme
share/icons/Wasp/scalable/apps/advanced-directory.svg
share/icons/Wasp/scalable/apps/applets-screenshooter.svg
@@ -940,6 +995,7 @@ share/icons/Wasp/scalable/devices/gnome-dev-harddisk.svg
share/icons/Wasp/scalable/devices/gnome-dev-network.svg
share/icons/Wasp/scalable/devices/gnome-dev-palm.svg
share/icons/Wasp/scalable/devices/gnome-dev-printer.svg
+share/icons/Wasp/scalable/devices/gnome-dev-removeable.svg
share/icons/Wasp/scalable/devices/gnome-dev-symlink.svg
share/icons/Wasp/scalable/devices/gnome-dev-tape.svg
share/icons/Wasp/scalable/devices/gnome-dev-tv.svg
@@ -1047,7 +1103,13 @@ share/icons/Wasp/scalable/stock/stock_lockscreen.svg
share/icons/Wasp/scalable/stock/stock_logout.svg
share/icons/Wasp/scalable/stock/stock_multimedia.svg
share/icons/Wasp/scalable/stock/stock_searchtool.svg
+share/icons/Wasp/scalable/stock/stock_volume-0.svg
+share/icons/Wasp/scalable/stock/stock_volume-max.svg
+share/icons/Wasp/scalable/stock/stock_volume-med.svg
+share/icons/Wasp/scalable/stock/stock_volume-min.svg
+share/icons/Wasp/scalable/stock/stock_volume-mute.svg
share/locale/az/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/bg/LC_MESSAGES/gnome-themes-extras.mo
share/locale/ca/LC_MESSAGES/gnome-themes-extras.mo
share/locale/cs/LC_MESSAGES/gnome-themes-extras.mo
share/locale/da/LC_MESSAGES/gnome-themes-extras.mo
@@ -1056,13 +1118,17 @@ share/locale/el/LC_MESSAGES/gnome-themes-extras.mo
share/locale/en_CA/LC_MESSAGES/gnome-themes-extras.mo
share/locale/en_GB/LC_MESSAGES/gnome-themes-extras.mo
share/locale/es/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/fi/LC_MESSAGES/gnome-themes-extras.mo
share/locale/fr/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/gl/LC_MESSAGES/gnome-themes-extras.mo
share/locale/he/LC_MESSAGES/gnome-themes-extras.mo
share/locale/hr/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/hu/LC_MESSAGES/gnome-themes-extras.mo
share/locale/it/LC_MESSAGES/gnome-themes-extras.mo
share/locale/ja/LC_MESSAGES/gnome-themes-extras.mo
share/locale/ko/LC_MESSAGES/gnome-themes-extras.mo
share/locale/lt/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/ne/LC_MESSAGES/gnome-themes-extras.mo
share/locale/nl/LC_MESSAGES/gnome-themes-extras.mo
share/locale/no/LC_MESSAGES/gnome-themes-extras.mo
share/locale/pa/LC_MESSAGES/gnome-themes-extras.mo
@@ -1070,19 +1136,20 @@ share/locale/pl/LC_MESSAGES/gnome-themes-extras.mo
share/locale/pt/LC_MESSAGES/gnome-themes-extras.mo
share/locale/pt_BR/LC_MESSAGES/gnome-themes-extras.mo
share/locale/ru/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/rw/LC_MESSAGES/gnome-themes-extras.mo
share/locale/sk/LC_MESSAGES/gnome-themes-extras.mo
share/locale/sq/LC_MESSAGES/gnome-themes-extras.mo
share/locale/sr/LC_MESSAGES/gnome-themes-extras.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-themes-extras.mo
share/locale/sv/LC_MESSAGES/gnome-themes-extras.mo
share/locale/tr/LC_MESSAGES/gnome-themes-extras.mo
+share/locale/uk/LC_MESSAGES/gnome-themes-extras.mo
share/locale/zh_CN/LC_MESSAGES/gnome-themes-extras.mo
share/locale/zh_TW/LC_MESSAGES/gnome-themes-extras.mo
share/themes/Amaranth/gtk-2.0/gtkrc
share/themes/Amaranth/gtk-2.0/iconrc
share/themes/Amaranth/index.theme
share/themes/Gorilla/gtk-2.0/gtkrc
-share/themes/Gorilla/gtk-2.0/iconrc
share/themes/Gorilla/gtk/gtkrc
share/themes/Gorilla/index.theme
share/themes/Lush/gtk-2.0/gtkrc
@@ -1090,7 +1157,6 @@ share/themes/Lush/gtk-2.0/iconrc
share/themes/Lush/index.theme
share/themes/Nuvola/gtk-1.0/gtkrc
share/themes/Nuvola/gtk-2.0/gtkrc
-share/themes/Nuvola/gtk-2.0/iconrc
share/themes/Nuvola/index.theme
share/themes/Wasp/gtk-2.0/gtkrc
share/themes/Wasp/gtk-2.0/iconrc
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 959d74b7525..f66ac8fbbc6 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.75 2005/10/08 19:41:41 marcus Exp $
+# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.85 2006/04/13 07:52:42 bland Exp $
#
PORTNAME= gnome-themes
-PORTVERSION= 2.12.3
+PORTVERSION= 2.14.0
CATEGORIES= x11-themes gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -22,9 +22,9 @@ RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-theme
CONFLICTS= clearlooks-metacity-0.*
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
-USE_REINPLACE= yes
-GNU_CONFIGURE= yes
+USE_AUTOTOOLS= libtool:15
INSTALLS_ICONS= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack metacity libgnomeui
diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo
index 2575f7f7e4f..bb46f922e29 100644
--- a/x11-themes/gnome-themes/distinfo
+++ b/x11-themes/gnome-themes/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-themes-2.12.3.tar.bz2) = d0c87819857df04c986645e027d965ed
-SHA256 (gnome2/gnome-themes-2.12.3.tar.bz2) = 02cf3838f86cd5201176ab2d481ce7ace7b5dafa9065f67b283246381ccf1115
-SIZE (gnome2/gnome-themes-2.12.3.tar.bz2) = 2573697
+MD5 (gnome2/gnome-themes-2.14.0.tar.bz2) = 329cfbfcb0add306e8bf6a09ada6f85b
+SHA256 (gnome2/gnome-themes-2.14.0.tar.bz2) = 2346730c36a7faa1c52f19f58287c76b3927cf5c14648954c35569c7275ad26f
+SIZE (gnome2/gnome-themes-2.14.0.tar.bz2) = 2542375
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index bcb370285c6..1b67da1ee79 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -961,33 +961,7 @@ share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer-applet.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-multimedia.png
share/icons/LowContrastLargePrint/48x48/apps/gnome-panel.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-run.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-screenshot.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-searchtool-animation-rest.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-searchtool-animation.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-searchtool.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-session.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-technologies.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-background.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-default-applications.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-font.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-keybindings.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-sound.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-theme.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-ui-behavior.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-settings.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-starthere.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-system.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-terminal.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-util.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-window-manager.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-windows.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-workspace.png
-share/icons/LowContrastLargePrint/48x48/apps/gucharmap.png
-share/icons/LowContrastLargePrint/48x48/apps/launcher-program.png
-share/icons/LowContrastLargePrint/48x48/apps/perfmeter.png
-share/icons/LowContrastLargePrint/48x48/apps/window-capplet.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-remote-desktop.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-cdrom-audio.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-cdrom.png
share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-dvd.png
@@ -1065,6 +1039,7 @@ share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-backu
share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-bzip.png
share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-compress.png
share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-core-file.png
+share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-core.png
share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-dc-rom.png
share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-deb.png
share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-dia-diagram.png
@@ -1244,6 +1219,8 @@ share/locale/is/LC_MESSAGES/gnome-themes.mo
share/locale/it/LC_MESSAGES/gnome-themes.mo
share/locale/ja/LC_MESSAGES/gnome-themes.mo
share/locale/ko/LC_MESSAGES/gnome-themes.mo
+share/locale/ku/LC_MESSAGES/gnome-themes.mo
+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
@@ -1943,6 +1920,10 @@ share/themes/Traditional/index.theme
@dirrm share/themes/Clearlooks
@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
@dirrm share/icons/Smokey-Red/96x96/filesystems
@dirrm share/icons/Smokey-Red/96x96
@dirrm share/icons/Smokey-Red/72x72/filesystems
@@ -2055,4 +2036,4 @@ share/themes/Traditional/index.theme
@dirrm share/gnome/themes/Glider
@dirrm share/gnome/themes/Clearlooks/metacity-1
@dirrm share/gnome/themes/Clearlooks
-@unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true
+@dirrmtry share/icons
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index 0501a95c040..91442e37822 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -3,27 +3,26 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/eel/Makefile,v 1.21 2005/10/03 15:22:10 ahze Exp $
+# $MCom: ports/x11-toolkits/eel/Makefile,v 1.35 2006/04/13 07:52:42 bland Exp $
#
PORTNAME= eel
-PORTVERSION= 2.12.2
-PORTREVISION= 1
+PORTVERSION= 2.14.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Generally useful classes and extensions to GNOME
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack gail gnomedesktop gnomemenus ltverhack
-USE_AUTOTOOLS= libtool:15
-USE_REINPLACE= yes
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo
index 86ac6e92706..d6f6e83847e 100644
--- a/x11-toolkits/eel/distinfo
+++ b/x11-toolkits/eel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eel-2.12.2.tar.bz2) = d78cd3e33c656a62b5bf1f8d0b8d271f
-SHA256 (gnome2/eel-2.12.2.tar.bz2) = df6c696f84bc9c2af12f3715f2703060ab1692a918fb221ea0403212c03e0b73
-SIZE (gnome2/eel-2.12.2.tar.bz2) = 675938
+MD5 (gnome2/eel-2.14.1.tar.bz2) = 7002f4f99317ed11da8b9db15b7e4a2b
+SHA256 (gnome2/eel-2.14.1.tar.bz2) = 93b4ef9152be93ae55bef7618c2c661e8424111d292f40e81f066f25ecd7f9cc
+SIZE (gnome2/eel-2.14.1.tar.bz2) = 639752
diff --git a/x11-toolkits/eel/files/patch-Makefile.in b/x11-toolkits/eel/files/patch-Makefile.in
index eaa3dc11727..f58c574eb5f 100644
--- a/x11-toolkits/eel/files/patch-Makefile.in
+++ b/x11-toolkits/eel/files/patch-Makefile.in
@@ -1,15 +1,11 @@
-
-$FreeBSD$
- $MCom: ports/x11-toolkits/eel/files/patch-Makefile.in,v 1.4 2005/06/28 05:40:14 adamw Exp $
-
---- Makefile.in 2002/06/13 16:05:09 1.1
-+++ Makefile.in 2002/06/13 16:05:18
-@@ -119,7 +119,7 @@
-
+--- Makefile.in.orig Mon Jan 16 12:53:35 2006
++++ Makefile.in Mon Jan 16 12:54:04 2006
+@@ -239,7 +239,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
NULL =
-
-SUBDIRS = eel test po
+SUBDIRS = eel po
-
- EXTRA_DIST = COPYING.LIB HACKING MAINTAINERS eel.spec.in $(NULL)
-
+ EXTRA_DIST = \
+ COPYING.LIB \
+ HACKING \
diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist
index bf3b8194961..f4dd36a9e0c 100644
--- a/x11-toolkits/eel/pkg-plist
+++ b/x11-toolkits/eel/pkg-plist
@@ -63,6 +63,7 @@ share/locale/cs/LC_MESSAGES/eel-2.0.mo
share/locale/cy/LC_MESSAGES/eel-2.0.mo
share/locale/da/LC_MESSAGES/eel-2.0.mo
share/locale/de/LC_MESSAGES/eel-2.0.mo
+share/locale/dz/LC_MESSAGES/eel-2.0.mo
share/locale/el/LC_MESSAGES/eel-2.0.mo
share/locale/en_CA/LC_MESSAGES/eel-2.0.mo
share/locale/en_GB/LC_MESSAGES/eel-2.0.mo
@@ -83,8 +84,11 @@ share/locale/id/LC_MESSAGES/eel-2.0.mo
share/locale/is/LC_MESSAGES/eel-2.0.mo
share/locale/it/LC_MESSAGES/eel-2.0.mo
share/locale/ja/LC_MESSAGES/eel-2.0.mo
+share/locale/ka/LC_MESSAGES/eel-2.0.mo
share/locale/kn/LC_MESSAGES/eel-2.0.mo
share/locale/ko/LC_MESSAGES/eel-2.0.mo
+share/locale/ku/LC_MESSAGES/eel-2.0.mo
+share/locale/ky/LC_MESSAGES/eel-2.0.mo
share/locale/li/LC_MESSAGES/eel-2.0.mo
share/locale/lt/LC_MESSAGES/eel-2.0.mo
share/locale/lv/LC_MESSAGES/eel-2.0.mo
@@ -121,6 +125,7 @@ share/locale/vi/LC_MESSAGES/eel-2.0.mo
share/locale/wa/LC_MESSAGES/eel-2.0.mo
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
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
@@ -128,6 +133,10 @@ share/locale/zh_TW/LC_MESSAGES/eel-2.0.mo
@dirrmtry share/locale/ug
@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/ang/LC_MESSAGES
@dirrmtry share/locale/ang
@dirrm include/eel-2/eel
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index be2f3b44b84..403eee9a8fa 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -3,24 +3,24 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.23 2005/10/03 15:24:49 ahze Exp $
+# $MCom: ports/x11-toolkits/gtksourceview/Makefile,v 1.37 2006/04/13 07:52:42 bland Exp $
#
PORTNAME= gtksourceview
-PORTVERSION= 1.4.2
-PORTREVISION= 1
+PORTVERSION= 1.6.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A text widget that adds syntax highlighting to the GtkTextView widget
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_GNOME= gnomeprefix gnomehack libgnome libgnomeprintui intlhack \
ltverhack
diff --git a/x11-toolkits/gtksourceview/distinfo b/x11-toolkits/gtksourceview/distinfo
index 954fa1628ef..3354b555806 100644
--- a/x11-toolkits/gtksourceview/distinfo
+++ b/x11-toolkits/gtksourceview/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtksourceview-1.4.2.tar.bz2) = 323a56ae9559af12f64fc5090955e68b
-SHA256 (gnome2/gtksourceview-1.4.2.tar.bz2) = 4edd368ac1141df9a0ae668ea66aacddb241f4812cd7134be249db0aabe65847
-SIZE (gnome2/gtksourceview-1.4.2.tar.bz2) = 704867
+MD5 (gnome2/gtksourceview-1.6.1.tar.bz2) = f8ca3a1a746477b2b46de7ebea276db5
+SHA256 (gnome2/gtksourceview-1.6.1.tar.bz2) = a08e0b470d3d2b49f7c2a43a20ba5ab185044835c0f427bfe45220ae0127024d
+SIZE (gnome2/gtksourceview-1.6.1.tar.bz2) = 743991
diff --git a/x11-toolkits/gtksourceview/pkg-plist b/x11-toolkits/gtksourceview/pkg-plist
index dc0462bd68a..71e28a5d925 100644
--- a/x11-toolkits/gtksourceview/pkg-plist
+++ b/x11-toolkits/gtksourceview/pkg-plist
@@ -27,6 +27,7 @@ libdata/pkgconfig/gtksourceview-1.0.pc
%%DOCSDIR%%/gtksourceview-GtkSourceTagStyle.html
%%DOCSDIR%%/gtksourceview-Searching-in-a-GtkSourceBuffer.html
%%DOCSDIR%%/gtksourceview.devhelp
+%%DOCSDIR%%/gtksourceview.devhelp2
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
@@ -38,6 +39,7 @@ 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/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
@@ -57,12 +59,14 @@ share/gnome/gtksourceview-1.0/language-specs/lua.lang
share/gnome/gtksourceview-1.0/language-specs/makefile.lang
share/gnome/gtksourceview-1.0/language-specs/msil.lang
share/gnome/gtksourceview-1.0/language-specs/nemerle.lang
+share/gnome/gtksourceview-1.0/language-specs/octave.lang
share/gnome/gtksourceview-1.0/language-specs/pascal.lang
share/gnome/gtksourceview-1.0/language-specs/perl.lang
share/gnome/gtksourceview-1.0/language-specs/php.lang
share/gnome/gtksourceview-1.0/language-specs/po.lang
share/gnome/gtksourceview-1.0/language-specs/python.lang
share/gnome/gtksourceview-1.0/language-specs/ruby.lang
+share/gnome/gtksourceview-1.0/language-specs/scheme.lang
share/gnome/gtksourceview-1.0/language-specs/sh.lang
share/gnome/gtksourceview-1.0/language-specs/sql.lang
share/gnome/gtksourceview-1.0/language-specs/tcl.lang
@@ -82,6 +86,7 @@ share/locale/cs/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/cy/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/da/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/de/LC_MESSAGES/gtksourceview-1.0.mo
+share/locale/dz/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/el/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/en_CA/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/en_GB/LC_MESSAGES/gtksourceview-1.0.mo
@@ -130,11 +135,16 @@ share/locale/uk/LC_MESSAGES/gtksourceview-1.0.mo
share/locale/vi/LC_MESSAGES/gtksourceview-1.0.mo
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
+@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/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrm share/gnome/gtksourceview-1.0/language-specs
@dirrm share/gnome/gtksourceview-1.0
@dirrm %%DOCSDIR%%
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index b9fd1fad530..774136d2fec 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -3,25 +3,26 @@
# 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 $
#
PORTNAME= libbonoboui
-PORTVERSION= 2.10.1
-PORTREVISION= 2
+PORTVERSION= 2.14.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10
-DIST_SUBDIR= gnome2
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= GUI frontend to the libbonobo component of GNOME 2
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
+GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier intlhack \
libgnomecanvas libgnome
-GNU_CONFIGURE= yes
INSTALLS_SHLIB= 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 b785d5f4e0e..4a703b65ca1 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libbonoboui-2.10.1.tar.bz2) = 74c4b633ae33524e2f6d3e6573b75f3c
-SHA256 (gnome2/libbonoboui-2.10.1.tar.bz2) = 7b1eb566f2485a97d3c3f2ab507b1b3112fce93ea588a8675e62da3ef6e17b40
-SIZE (gnome2/libbonoboui-2.10.1.tar.bz2) = 884026
+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
diff --git a/x11-toolkits/libbonoboui/files/patch-Makefile.in b/x11-toolkits/libbonoboui/files/patch-Makefile.in
index f622fe467c1..2fff214904a 100644
--- a/x11-toolkits/libbonoboui/files/patch-Makefile.in
+++ b/x11-toolkits/libbonoboui/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig Fri Aug 19 16:03:13 2005
-+++ Makefile.in Fri Aug 19 16:03:31 2005
-@@ -146,7 +146,7 @@
+--- Makefile.in.orig Mon Jan 16 19:14:25 2006
++++ Makefile.in Mon Jan 16 19:15:36 2006
+@@ -148,7 +148,7 @@
am__quote = @am__quote@
gnomelocaledir = @gnomelocaledir@
install_sh = @install_sh@
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index a6424c427d0..fa586877ffe 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -117,9 +117,11 @@ share/locale/it/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ja/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
share/locale/li/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/lt/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/lv/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/mk/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/ml/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/mn/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/mr/LC_MESSAGES/libbonoboui-2.0.mo
@@ -153,10 +155,13 @@ share/locale/wa/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/xh/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/yi/LC_MESSAGES/libbonoboui-2.0.mo
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
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 8e294ee5e46..df7a132312b 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -3,14 +3,13 @@
# Whom: Joe Marcus Clarke <marcus@FreBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.66 2005/09/07 04:43:08 marcus Exp $
+# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.79 2006/04/13 07:52:43 bland Exp $
PORTNAME= libgnomeui
-PORTVERSION= 2.12.1
-PORTREVISION= 1
+PORTVERSION= 2.14.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -21,12 +20,13 @@ LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnomekeyring \
RUN_DEPENDS= ${X11BASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_XPM= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui ltverhack
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
USE_BISON= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 8134da41b22..406ea091cd0 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeui-2.12.1.tar.bz2) = 97ee22e36d6fb8c4a57796da4110145e
-SHA256 (gnome2/libgnomeui-2.12.1.tar.bz2) = 672e4f6b756b4a7a0b79b6c310bec1ba39e81840471eac85951df9795cf7afe9
-SIZE (gnome2/libgnomeui-2.12.1.tar.bz2) = 1852044
+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
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app-helper.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app-helper.c
deleted file mode 100644
index 87c3856f1ce..00000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app-helper.c
+++ /dev/null
@@ -1,74 +0,0 @@
---- libgnomeui/gnome-app-helper.c.orig Sun Mar 20 20:46:17 2005
-+++ libgnomeui/gnome-app-helper.c Sun Mar 20 20:49:57 2005
-@@ -435,6 +435,8 @@
- new_setting = gconf_value_get_bool(value);
- }
-
-+ GDK_THREADS_ENTER();
-+
- if (new_setting && (mi->image == NULL)) {
- GtkWidget *pixmap;
- GnomeUIPixmapType pixmap_type;
-@@ -457,6 +459,8 @@
- } else if (!new_setting && (mi->image != NULL)) {
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), NULL);
- }
-+
-+ GDK_THREADS_LEAVE();
- }
-
- /* Note that this function is also used for toolbars, don't assume
-@@ -1320,6 +1324,8 @@
- if (entry->value->type != GCONF_VALUE_BOOL)
- return;
-
-+ GDK_THREADS_ENTER();
-+
- menu = GTK_WIDGET (user_data);
-
- if (gconf_value_get_bool (entry->value)) {
-@@ -1329,6 +1335,7 @@
-
- if (tearoff) {
- /* Do nothing */
-+ GDK_THREADS_LEAVE();
- return;
- }
-
-@@ -1345,6 +1352,7 @@
-
- if (!tearoff) {
- /* Do nothing */
-+ GDK_THREADS_LEAVE();
- return;
- }
-
-@@ -1352,6 +1360,8 @@
- gtk_widget_destroy (tearoff);
- g_object_set_data (G_OBJECT (menu), "gnome-app-tearoff", NULL);
- }
-+
-+ GDK_THREADS_LEAVE();
- }
-
-
-@@ -2467,7 +2477,9 @@
- }
- }
-
-+ GDK_THREADS_ENTER();
- gtk_toolbar_set_style(toolbar, style);
-+ GDK_THREADS_LEAVE();
- }
-
- static void
-@@ -2511,7 +2523,9 @@
- style = GTK_TOOLBAR_BOTH;
- }
-
-+ GDK_THREADS_ENTER();
- gtk_toolbar_set_style(toolbar, style);
-+ GDK_THREADS_LEAVE();
- }
-
- static void
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app.c
deleted file mode 100644
index aae4e39f80a..00000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-app.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgnomeui/gnome-app.c.orig Sun Mar 20 20:51:20 2005
-+++ libgnomeui/gnome-app.c Sun Mar 20 20:52:01 2005
-@@ -269,7 +269,9 @@
- detachable = gconf_value_get_bool (entry->value);
-
- /* Update */
-+ GDK_THREADS_ENTER();
- bonobo_dock_item_set_locked (item, !detachable);
-+ GDK_THREADS_LEAVE();
- }
- }
-
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-entry.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-entry.c
deleted file mode 100644
index e83891c08a3..00000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-entry.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- libgnomeui/gnome-entry.c.orig Sun Mar 20 20:54:19 2005
-+++ libgnomeui/gnome-entry.c Sun Mar 20 20:54:20 2005
-@@ -419,6 +419,8 @@
- {
- GnomeEntry *gentry;
-
-+ GDK_THREADS_ENTER();
-+
- gentry = GNOME_ENTRY (user_data);
-
- /* If we're getting a notification from saving our own
-@@ -427,10 +429,13 @@
- if (gentry->_priv->saving_history) {
- gentry->_priv->saving_history = FALSE;
-
-+ GDK_THREADS_LEAVE();
- return;
- }
-
- gnome_entry_load_history (gentry);
-+
-+ GDK_THREADS_LEAVE();
- }
-
- /* FIXME: Make this static */
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-gconf-ui.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-gconf-ui.c
deleted file mode 100644
index 5713fbd49d1..00000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-gconf-ui.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnomeui/gnome-gconf-ui.c.orig Sun Mar 20 20:38:41 2005
-+++ libgnomeui/gnome-gconf-ui.c Sun Mar 20 20:39:51 2005
-@@ -148,6 +148,8 @@
- g_return_val_if_fail(eid.client != NULL, FALSE);
- g_return_val_if_fail(pending_errors != NULL, FALSE);
-
-+ GDK_THREADS_ENTER();
-+
- if (current_dialog == NULL) {
- GtkWidget *dialog;
- gboolean have_overridden = FALSE;
-@@ -245,6 +247,8 @@
-
- gtk_window_present (GTK_WINDOW (current_dialog));
-
-+ GDK_THREADS_LEAVE();
-+
- return FALSE;
- }
-
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ice.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ice.c
deleted file mode 100644
index 160e5ad9b83..00000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ice.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnomeui/gnome-ice.c.orig Sun Mar 20 20:33:56 2005
-+++ libgnomeui/gnome-ice.c Sun Mar 20 20:34:21 2005
-@@ -54,6 +54,8 @@
- IceConn connection = (IceConn) data;
- IceProcessMessagesStatus status;
-
-+ GDK_THREADS_ENTER();
-+
- status = IceProcessMessages (connection, NULL, NULL);
-
- if (status == IceProcessMessagesIOError)
-@@ -73,6 +75,8 @@
- IceCloseConnection (connection);
- }
- }
-+
-+ GDK_THREADS_LEAVE();
-
- return TRUE;
- }
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-icon-sel.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-icon-sel.c
deleted file mode 100644
index d096e0818dc..00000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-icon-sel.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnomeui/gnome-icon-sel.c.orig Sun Mar 20 20:40:05 2005
-+++ libgnomeui/gnome-icon-sel.c Sun Mar 20 20:42:24 2005
-@@ -353,6 +353,8 @@
- return FALSE;
- }
-
-+ GDK_THREADS_ENTER();
-+
- append_an_icon (gis, list->data);
-
- g_free (list->data);
-@@ -367,6 +369,8 @@
- (double)gis->_priv->load_i / gis->_priv->load_file_count);
-
- gis->_priv->load_i ++;
-+
-+ GDK_THREADS_LEAVE();
-
- return TRUE;
- }
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-pixmap-entry.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-pixmap-entry.c
deleted file mode 100644
index 46fc0489b80..00000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-pixmap-entry.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- libgnomeui/gnome-pixmap-entry.c.orig Sun Mar 20 20:34:49 2005
-+++ libgnomeui/gnome-pixmap-entry.c Sun Mar 20 20:38:30 2005
-@@ -237,6 +237,8 @@
- {
- GSList *li,*tmp;
-
-+ GDK_THREADS_ENTER();
-+
- tmp = changed_pentries;
- changed_pentries = NULL;
- if(tmp) {
-@@ -244,9 +246,13 @@
- refresh_preview(li->data);
- }
- g_slist_free(tmp);
-+
-+ GDK_THREADS_LEAVE();
- return TRUE;
- }
- change_timeout = 0;
-+
-+ GDK_THREADS_LEAVE();
-
- return FALSE;
- }
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ui-init.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ui-init.c
deleted file mode 100644
index a38f7005215..00000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui::gnome-ui-init.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libgnomeui/gnome-ui-init.c.orig Sun Mar 20 20:56:32 2005
-+++ libgnomeui/gnome-ui-init.c Sun Mar 20 20:56:36 2005
-@@ -492,8 +492,10 @@
- gnome_gconf_get_bool ("/desktop/gnome/sound/event_sounds"));
-
- if (new_use_event_sounds && !use_event_sounds) {
-+ GDK_THREADS_ENTER();
- initialize_gtk_signal_relay ();
- initialize_gnome_signal_relay ();
-+ GDK_THREADS_LEAVE();
- }
-
- use_event_sounds = new_use_event_sounds;
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-authentication-manager.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-authentication-manager.c
deleted file mode 100644
index 99990e1b9f6..00000000000
--- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-authentication-manager.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- libgnomeui/gnome-authentication-manager.c.orig Mon Aug 1 03:34:03 2005
-+++ libgnomeui/gnome-authentication-manager.c Mon Aug 1 03:36:29 2005
-@@ -849,7 +849,11 @@
- info->response = response;
- info->response_data = response_data;
-
-+ GDK_THREADS_ENTER ();
-+
- present_question_dialog_nonblocking (info);
-+
-+ GDK_THREADS_LEAVE ();
- }
-
- static void /* GnomeVFSModuleCallback */
-@@ -870,11 +874,15 @@
- in_real = (GnomeVFSModuleCallbackQuestionIn *)in;
- out_real = (GnomeVFSModuleCallbackQuestionOut *)out;
-
-+ GDK_THREADS_ENTER ();
-+
- out_real->answer = -1; /* Set a default value */
- dialog = create_question_dialog (in_real->primary_message, in_real->secondary_message, in_real->choices);
- out_real->answer = gtk_dialog_run (GTK_DIALOG(dialog));
-
- gtk_widget_destroy (GTK_WIDGET (dialog));
-+
-+ GDK_THREADS_LEAVE ();
- }
-
-
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c
new file mode 100644
index 00000000000..c3c751eff66
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-thumbnail.c
@@ -0,0 +1,28 @@
+--- libgnomeui/gnome-thumbnail.c.orig Sat Jan 21 23:11:21 2006
++++ libgnomeui/gnome-thumbnail.c Sat Jan 21 23:10:52 2006
+@@ -994,11 +994,7 @@ gnome_thumbnail_factory_generate_thumbna
+ return NULL;
+
+ width = gdk_pixbuf_get_width (pixbuf);
+- g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-width",
+- g_strdup_printf ("%d", width), g_free);
+ height = gdk_pixbuf_get_height (pixbuf);
+- g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-height",
+- g_strdup_printf ("%d", height), g_free);
+
+ if (width > size || height > size)
+ {
+@@ -1011,6 +1007,13 @@ gnome_thumbnail_factory_generate_thumbna
+ g_object_unref (pixbuf);
+ pixbuf = scaled;
+ }
++
++ width = gdk_pixbuf_get_width (pixbuf);
++ g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-width",
++ g_strdup_printf ("%d", width), g_free);
++ height = gdk_pixbuf_get_height (pixbuf);
++ g_object_set_data_full (G_OBJECT (pixbuf), "gnome-thumbnail-height",
++ g_strdup_printf ("%d", height), g_free);
+
+ return pixbuf;
+ }
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index bc295b7fa27..100cd660f7c 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -79,6 +79,7 @@ libexec/gnome_segv2
%%DOCSDIR%%/GnomeIconEntry.html
%%DOCSDIR%%/GnomeIconList.html
%%DOCSDIR%%/GnomeIconSelection.html
+%%DOCSDIR%%/GnomeIconTextItem.html
%%DOCSDIR%%/GnomeMDI.html
%%DOCSDIR%%/GnomeMDIChild.html
%%DOCSDIR%%/GnomeMDIGenericChild.html
@@ -96,8 +97,12 @@ libexec/gnome_segv2
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libgnomeui-GnomeAuthentication.html
+%%DOCSDIR%%/libgnomeui-GnomeIce.html
%%DOCSDIR%%/libgnomeui-GnomeIconLookup.html
%%DOCSDIR%%/libgnomeui-GnomeIconTheme.html
+%%DOCSDIR%%/libgnomeui-GnomeMultiScreen.html
+%%DOCSDIR%%/libgnomeui-GnomePassword.html
%%DOCSDIR%%/libgnomeui-GnomeThemeFile.html
%%DOCSDIR%%/libgnomeui-GnomeThumbnail.html
%%DOCSDIR%%/libgnomeui-gnome-app-helper.html
@@ -110,6 +115,7 @@ libexec/gnome_segv2
%%DOCSDIR%%/libgnomeui-gnome-ui-init.html
%%DOCSDIR%%/libgnomeui-gnome-uidefs.html
%%DOCSDIR%%/libgnomeui-gnome-vfs-util.html
+%%DOCSDIR%%/libgnomeui-gnome-window-icon.html
%%DOCSDIR%%/libgnomeui-gnome-window.html
%%DOCSDIR%%/libgnomeui-gnometypebuiltins.html
%%DOCSDIR%%/libgnomeui-objects.html
@@ -169,6 +175,7 @@ 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
@@ -190,6 +197,7 @@ share/locale/id/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/is/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/it/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ja/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/ka/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/kn/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ko/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/ku/LC_MESSAGES/libgnomeui-2.0.mo
@@ -227,6 +235,7 @@ share/locale/te/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/th/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/tk/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/tr/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/tt/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/uk/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/vi/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/wa/LC_MESSAGES/libgnomeui-2.0.mo
@@ -238,11 +247,15 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrm %%DOCSDIR%%
+@dirrm lib/gtk-2.0/%%GTK_VERSION%%/filesystems
@dirrm include/libgnomeui-2.0/libgnomeui
@dirrm include/libgnomeui-2.0
-@dirrm lib/gtk-2.0/%%GTK_VERSION%%/filesystems
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index 51447e451e1..fbe2a65efa3 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -3,15 +3,14 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.5 2005/10/14 20:39:59 adamw Exp $
+# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.8 2006/04/13 07:52:43 bland Exp $
#
PORTNAME= libgnomeuimm
-PORTVERSION= 2.12.0
-PORTREVISION= 1
+PORTVERSION= 2.14.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= bland@FreeBSD.org
diff --git a/x11-toolkits/libgnomeuimm26/distinfo b/x11-toolkits/libgnomeuimm26/distinfo
index f9dc65e8816..cd6b5f61129 100644
--- a/x11-toolkits/libgnomeuimm26/distinfo
+++ b/x11-toolkits/libgnomeuimm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomeuimm-2.12.0.tar.bz2) = 50ee34ec10c4527f1dc49bb12d0e0954
-SHA256 (gnome2/libgnomeuimm-2.12.0.tar.bz2) = 2d3c1c740c767d92c7c1b7c3147e42376bea866365ed913b6dd7d96cfc45f9c0
-SIZE (gnome2/libgnomeuimm-2.12.0.tar.bz2) = 322127
+MD5 (gnome2/libgnomeuimm-2.14.0.tar.bz2) = 066edc6d3dea4f0dce317dbf5ea7c24e
+SHA256 (gnome2/libgnomeuimm-2.14.0.tar.bz2) = a0fdc784acea3b2858ffd84e84d22928c3878d5714954df9fe7443c3e5dfe2b4
+SIZE (gnome2/libgnomeuimm-2.14.0.tar.bz2) = 323164
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index dac66f2316e..65081a5a17a 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.52 2005/10/03 15:44:48 ahze Exp $
+# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.70 2006/04/13 07:52:43 bland Exp $
#
PORTNAME= libwnck
-PORTVERSION= 2.12.3
-PORTREVISION= 1
+PORTVERSION= 2.14.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -20,12 +19,13 @@ COMMENT= Library used for writing pagers and taskslists
LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack gtk20 ltverhack intlhack
+USE_GNOME= gnomehack gtk20 ltverhack
USE_BISON= yes
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index c61f0babf7b..53a638090cc 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libwnck-2.12.3.tar.bz2) = a3d7e72d8e756af0edd65380af795693
-SHA256 (gnome2/libwnck-2.12.3.tar.bz2) = 48508f68ffab806e7218113761293c0945f3fcb6a54ef711761879ffe93af3fc
-SIZE (gnome2/libwnck-2.12.3.tar.bz2) = 444009
+MD5 (gnome2/libwnck-2.14.1.tar.bz2) = 7049a33a2cb8c65433c742bd04de6407
+SHA256 (gnome2/libwnck-2.14.1.tar.bz2) = 168f17d9e29d08db1207dd5679181769306a9a1262a3835008638737f972fd85
+SIZE (gnome2/libwnck-2.14.1.tar.bz2) = 453898
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index b7ee3e730cd..a8b8c74d49d 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -95,6 +95,7 @@ share/locale/ne/LC_MESSAGES/libwnck.mo
share/locale/nl/LC_MESSAGES/libwnck.mo
share/locale/nn/LC_MESSAGES/libwnck.mo
share/locale/no/LC_MESSAGES/libwnck.mo
+share/locale/or/LC_MESSAGES/libwnck.mo
share/locale/pa/LC_MESSAGES/libwnck.mo
share/locale/pl/LC_MESSAGES/libwnck.mo
share/locale/pt/LC_MESSAGES/libwnck.mo
@@ -122,8 +123,6 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
@dirrm %%DOCSDIR%%
@dirrm include/libwnck-1.0/libwnck
@dirrm include/libwnck-1.0
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 6c5b1f2d41d..d44477ea70d 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,14 +3,14 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/x11-toolkits/pango/Makefile,v 1.5 2006/03/05 18:31:28 marcus Exp $
+# $MCom: ports/x11-toolkits/pango/Makefile,v 1.60 2006/04/27 11:12:49 ahze Exp $
#
PORTNAME= pango
-PORTVERSION= 1.10.4
+PORTVERSION= 1.12.2
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.10,} \
- ftp://ftp.gtk.org/pub/gtk/v2.7/
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.12,} \
+ ftp://ftp.gtk.org/pub/gtk/v2.10/
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -25,9 +25,8 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack glib20 ltverhack
CONFIGURE_ARGS= --with-qt=no \
--with-html-dir=${PREFIX}/share/doc \
@@ -38,7 +37,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install
# stuff, with Bad Results[tm]
#
GLIB2_CFLAGS= `pkg-config glib-2.0 --cflags`
-PLIST_SUB= VERSION="1.4.0"
+PLIST_SUB= VERSION="1.5.0"
FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir
@@ -58,10 +57,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
.endif
-post-patch:
- @${FIND} ${WRKSRC}/pango/opentype -name "*.[ch]" | ${XARGS} \
- ${REINPLACE_CMD} -e 's|internal/tterrors\.h|fterrors.h| ; \
- s|TT_Err_|FT_Err_|g'
post-install:
@${SED} -e 's|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \
> ${PKGINSTALL}
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 3431d2d0c20..439efb04cbf 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pango-1.10.4.tar.bz2) = d7eeb0f995a93534be8e7c687b465a0c
-SHA256 (gnome2/pango-1.10.4.tar.bz2) = c2e92e373e374c730a11dbe9a3d2ada01a20e6973863debfaf6f7295002e6b25
-SIZE (gnome2/pango-1.10.4.tar.bz2) = 1184862
+MD5 (gnome2/pango-1.12.2.tar.bz2) = f41488236baf881a4844216ac61abc24
+SHA256 (gnome2/pango-1.12.2.tar.bz2) = 64edfc430d7afd0787eafbd88205bcb2bd7f997b9a6b368fb0a8e73562cb6d7a
+SIZE (gnome2/pango-1.12.2.tar.bz2) = 1212512
diff --git a/x11-toolkits/pango/files/patch-ac b/x11-toolkits/pango/files/patch-ac
index 4f943b6912a..63e2e8673d1 100644
--- a/x11-toolkits/pango/files/patch-ac
+++ b/x11-toolkits/pango/files/patch-ac
@@ -1,6 +1,6 @@
$FreeBSD$
- $MCom: ports-stable/x11-toolkits/pango/files/patch-ac,v 1.3 2006/02/27 01:17:11 marcus Exp $
+ $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
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index be3aa8e84b6..6b7b96d2d32 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -1,4 +1,5 @@
bin/pango-querymodules
+bin/pango-view
etc/pango/pango.modules
etc/pango/pangox.aliases
include/pango-1.0/pango/pango-attributes.h
@@ -98,6 +99,7 @@ libdata/pkgconfig/pangoxft.pc
%%DOCSDIR%%/layout.gif
%%DOCSDIR%%/left.png
%%DOCSDIR%%/lowlevel.html
+%%DOCSDIR%%/pango-ATSUI-Fonts.html
%%DOCSDIR%%/pango-Cairo-Rendering.html
%%DOCSDIR%%/pango-Coverage-Maps.html
%%DOCSDIR%%/pango-Engines.html
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
new file mode 100644
index 00000000000..9aeb67dc21a
--- /dev/null
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -0,0 +1,56 @@
+# New ports collection makefile for: py-gnome-desktop
+# Date created: 20 January 2006
+# 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 $
+#
+
+PORTNAME= gnome
+PORTVERSION= 2.14.0
+CATEGORIES= x11-toolkits python gnome
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/..$//}
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX= -desktop
+DISTNAME= gnome-python-desktop-${PORTVERSION}
+DIST_SUBDIR= gnome2
+
+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/libgtop2 \
+ totem-plparser.2:${PORTSDIR}/multimedia/totem-gstreamer \
+ gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2
+
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_PYTHON= yes
+USE_GNOME= gnomehack libgnomeprintui gnomepanel \
+ gtksourceview libwnck nautiluscdburner pygnome2 metacity
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+EG_SRC_DIR= ${WRKSRC}/examples
+EG_DST_DIR= ${PREFIX}/share/examples/py-gnome
+.if !defined(NOPORTDOCS)
+DOCSDIR= ${PREFIX}/share/doc/py-gnome-desktop
+.else
+DOCSDIR= ${WRKSRC}/share/doc/py-gnome-desktop
+.endif
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+ @${FIND} ${WRKSRC}/docs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
+ -e 's|^HTML_DIR =.*|HTML_DIR = ${DOCSDIR}|g'
+
+.if !defined(NOPORTDOCS)
+post-install:
+ ${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
new file mode 100644
index 00000000000..85e7ee9263a
--- /dev/null
+++ b/x11-toolkits/py-gnome-desktop/distinfo
@@ -0,0 +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
diff --git a/x11-toolkits/py-gnome-extras/files/patch-gtop_gtop.c b/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c
index 05db58a4c08..05db58a4c08 100644
--- a/x11-toolkits/py-gnome-extras/files/patch-gtop_gtop.c
+++ b/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c
diff --git a/x11-toolkits/py-gnome-desktop/pkg-descr b/x11-toolkits/py-gnome-desktop/pkg-descr
new file mode 100644
index 00000000000..cbc8cc5d8dd
--- /dev/null
+++ b/x11-toolkits/py-gnome-desktop/pkg-descr
@@ -0,0 +1,2 @@
+GnomePythonDesktop provides python interfacing modules for some GNOME
+libraries part of the GNOME Desktop.
diff --git a/x11-toolkits/py-gnome-desktop/pkg-plist b/x11-toolkits/py-gnome-desktop/pkg-plist
new file mode 100644
index 00000000000..7f7cd743a32
--- /dev/null
+++ b/x11-toolkits/py-gnome-desktop/pkg-plist
@@ -0,0 +1,108 @@
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyc
+%%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/gnomeprint/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/_print.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/_print.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/ui.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/ui.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtksourceview.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtksourceview.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtop.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtop.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/mediaprofiles.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/mediaprofiles.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/metacity.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/metacity.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/plparser.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/plparser.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/wnck.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/wnck.so
+libdata/pkgconfig/gnome-python-desktop-2.0.pc
+%%DOCSDIR%%/pygnomeprint/class-gnomeprintconfig.html
+%%DOCSDIR%%/pygnomeprint/class-gnomeprintcontext.html
+%%DOCSDIR%%/pygnomeprint/class-gnomeprintfont.html
+%%DOCSDIR%%/pygnomeprint/class-gnomeprintfontface.html
+%%DOCSDIR%%/pygnomeprint/class-gnomeprintglyphlist.html
+%%DOCSDIR%%/pygnomeprint/class-gnomeprintjob.html
+%%DOCSDIR%%/pygnomeprint/gnomeprint-class-reference.html
+%%DOCSDIR%%/pygnomeprint/index.html
+%%DOCSDIR%%/pygnomeprint/index.sgml
+%%DOCSDIR%%/pygnomeprint/pygnomeprint.devhelp
+%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuidialog.html
+%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontdialog.html
+%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontpreview.html
+%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontselection.html
+%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuijobpreview.html
+%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuipaperselector.html
+%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuipreview.html
+%%DOCSDIR%%/pygnomeprintui/gnomeprintui-class-reference.html
+%%DOCSDIR%%/pygnomeprintui/index.html
+%%DOCSDIR%%/pygnomeprintui/index.sgml
+%%DOCSDIR%%/pygnomeprintui/pygnomeprintui.devhelp
+%%DOCSDIR%%/pygtksourceview/class-gtksourcebuffer.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourcelanguage.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourcelanguagesmanager.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourcemarker.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourceprintjob.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourcestylescheme.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourcetag.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourcetagstyle.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourcetagtable.html
+%%DOCSDIR%%/pygtksourceview/class-gtksourceview.html
+%%DOCSDIR%%/pygtksourceview/gtksourcesview-class-reference.html
+%%DOCSDIR%%/pygtksourceview/index.html
+%%DOCSDIR%%/pygtksourceview/index.sgml
+%%DOCSDIR%%/pygtksourceview/pygtksourceview.devhelp
+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/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/pygtk/2.0/defs/applet.defs
+share/pygtk/2.0/defs/art.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 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
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 4065d9338a9..f012c01c927 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.26 2005/11/29 16:07:33 marcus Exp $
+# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.36 2006/03/12 23:45:37 marcus Exp $
#
PORTNAME= gnome
-PORTVERSION= 2.12.1
-PORTREVISION= 2
+PORTVERSION= 2.14.0
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//}
@@ -21,19 +20,15 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A set of Python bindings for GNOME 2
LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell2 \
- gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \
- totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
gksu1.2.0:${PORTSDIR}/sysutils/libgksu \
gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui \
- gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2 \
gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
USE_GECKO= firefox mozilla seamonkey
USE_BZIP2= yes
USE_GMAKE= yes
USE_PYTHON= yes
-USE_GNOME= gnomehack libgnomeprintui libgtkhtml gnomepanel \
- gtksourceview libwnck nautiluscdburner pygnome2
+USE_GNOME= gnomehack libgtkhtml pygnome2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gtkmozembed=${GECKO}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -53,8 +48,6 @@ DOCSDIR= ${WRKSRC}/share/doc/py-gnome-extras
post-patch:
@${FIND} ${WRKSRC}/docs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
-e 's|^HTML_DIR =.*|HTML_DIR = ${DOCSDIR}|g'
- @${REINPLACE_CMD} -e 's|-DHAVE_GNOMEPRINT28||g' \
- ${WRKSRC}/configure
.if !defined(NOPORTDOCS)
post-install:
diff --git a/x11-toolkits/py-gnome-extras/distinfo b/x11-toolkits/py-gnome-extras/distinfo
index d1cab357601..aa67159b86a 100644
--- a/x11-toolkits/py-gnome-extras/distinfo
+++ b/x11-toolkits/py-gnome-extras/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-extras-2.12.1.tar.bz2) = 62a3d8bb5bd5c1696c7200c001ea34f2
-SHA256 (gnome2/gnome-python-extras-2.12.1.tar.bz2) = d1f93adf096bd739cba988d9cdea8978faa97ac928bad26352e62830e8806ab5
-SIZE (gnome2/gnome-python-extras-2.12.1.tar.bz2) = 476483
+MD5 (gnome2/gnome-python-extras-2.14.0.tar.bz2) = e9390569e18a5e71da1ed9476fa750b3
+SHA256 (gnome2/gnome-python-extras-2.14.0.tar.bz2) = 72108b6327b1894cc302b423aa18c0aad14d066c3befad403c7247148745aef3
+SIZE (gnome2/gnome-python-extras-2.14.0.tar.bz2) = 347462
diff --git a/x11-toolkits/py-gnome-extras/files/patch-Makefile.in b/x11-toolkits/py-gnome-extras/files/patch-Makefile.in
deleted file mode 100644
index 89faafbdc36..00000000000
--- a/x11-toolkits/py-gnome-extras/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig Fri Jan 28 14:22:51 2005
-+++ Makefile.in Fri Jan 28 14:23:04 2005
-@@ -43,7 +43,7 @@
- @BUILD_WNCK_TRUE@am__append_5 = wnck
- @BUILD_GTKMOZEMBED_TRUE@am__append_6 = gtkmozembed
- @BUILD_GTKSPELL_TRUE@am__append_7 = gtkspell
--@BUILD_GDL_TRUE@am__append_8 = gdl
-+@BUILD_GDL_TRUE@am__append_8 =
- @BUILD_TOTEM_PLPARSER_TRUE@am__append_9 = totem
- @BUILD_GTOP_TRUE@am__append_10 = gtop
- @BUILD_NAUTILUSBURN_TRUE@am__append_11 = nautilusburn
diff --git a/x11-toolkits/py-gnome-extras/files/patch-gda_gda.override b/x11-toolkits/py-gnome-extras/files/patch-gda_gda.override
deleted file mode 100644
index 1fa283a57d1..00000000000
--- a/x11-toolkits/py-gnome-extras/files/patch-gda_gda.override
+++ /dev/null
@@ -1,102 +0,0 @@
---- gda/gda.override.orig Wed Apr 20 16:10:31 2005
-+++ gda/gda.override Wed Apr 20 16:12:56 2005
-@@ -59,13 +59,14 @@ override gda_config_get_data_source_list
- static PyObject*
- _wrap_gda_config_get_data_source_list (PyObject* self) {
- PyObject* plist = PyList_New (0);
-+ GList *tmp, *list;
-
- if (!plist) {
- Py_INCREF (Py_None);
- return Py_None;
- }
-
-- GList *tmp, *list = gda_config_get_data_source_list();
-+ list = gda_config_get_data_source_list();
-
- for (tmp = list; tmp != NULL; tmp = tmp->next) {
- PyObject* obj = pyg_boxed_new (GDA_TYPE_DATA_SOURCE_INFO, tmp->data, FALSE, FALSE);
-@@ -81,13 +82,14 @@ override gda_config_get_provider_list kw
- static PyObject*
- _wrap_gda_config_get_provider_list (PyObject* self) {
- PyObject* plist = PyList_New (0);
-+ GList *tmp, *list;
-
- if (!plist) {
- Py_INCREF (Py_None);
- return Py_None;
- }
-
-- GList *tmp, *list = gda_config_get_provider_list();
-+ list = gda_config_get_provider_list();
-
- for (tmp = list; tmp != NULL; tmp = tmp->next) {
- PyObject* obj = pyg_boxed_new (GDA_TYPE_PROVIDER_INFO, tmp->data, FALSE, FALSE);
-@@ -174,20 +176,22 @@ static PyObject*
- _wrap_gda_config_list_keys (PyObject* self, PyObject* fargs, PyObject* kwargs) {
- static char* kwlist[] = { "path", NULL };
- gchar* path = "/";
-+ PyObject *plist;
-+ GList *tmp, *list;
-
- if (!PyArg_ParseTupleAndKeywords (fargs, kwargs, "|s:config_list_keys", kwlist, &path)) {
- Py_INCREF (Py_None);
- return Py_None;
- }
-
-- PyObject* plist = PyList_New (0);
-+ plist = PyList_New (0);
-
- if (!plist) {
- Py_INCREF (Py_None);
- return Py_None;
- }
-
-- GList *tmp, *list = gda_config_list_keys (path);
-+ list = gda_config_list_keys (path);
-
- for (tmp = list; tmp != NULL; tmp = tmp->next) {
- PyList_Append (plist, PyString_FromString (tmp->data));
-@@ -201,7 +205,8 @@ override gda_connection_execute_command
- static PyObject*
- _wrap_gda_connection_execute_command (PyGObject* self, PyObject* fargs, PyObject* kwargs) {
- static char* kwlist[] = { "cmd", "params", NULL };
-- PyGObject *cmd, *params;
-+ PyGObject *cmd, *params, *plist;
-+ GList *tmp, *list;
-
- /* TODO:
- if (!PyArg_ParseTupleAndKeywords (fargs, kwargs, "O!O!:GdaConnection.execute_command",
-@@ -211,14 +216,14 @@ _wrap_gda_connection_execute_command (Py
- }
- */
-
-- PyObject* plist = PyList_New (0);
-+ plist = PyList_New (0);
-
- if (!plist) {
- Py_INCREF (Py_None);
- return Py_None;
- }
-
-- GList *tmp, *list = gda_connection_execute_command (GDA_CONNECTION (self->obj),
-+ list = gda_connection_execute_command (GDA_CONNECTION (self->obj),
- GDA_COMMAND (cmd->obj), GDA_PARAMETER_LIST (params->obj));
-
- for (tmp = list; tmp != NULL; tmp = tmp->next) {
-@@ -235,13 +240,14 @@ override gda_connection_get_errors kwarg
- static PyObject*
- _wrap_gda_connection_get_errors (PyGObject* self) {
- PyObject* plist = PyList_New (0);
-+ GList *tmp, *list;
-
- if (!plist) {
- Py_INCREF (Py_None);
- return Py_None;
- }
-
-- GList *tmp, *list = (GList*) gda_connection_get_errors (GDA_CONNECTION (self->obj));
-+ list = (GList*) gda_connection_get_errors (GDA_CONNECTION (self->obj));
-
- for (tmp = list; tmp != NULL; tmp = tmp->next) {
- PyObject* obj = pygobject_new (G_OBJECT (tmp->data));
diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist
index 484a6bc85c0..3232c7de259 100644
--- a/x11-toolkits/py-gnome-extras/pkg-plist
+++ b/x11-toolkits/py-gnome-extras/pkg-plist
@@ -5,6 +5,8 @@
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/recent.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyo
@@ -12,145 +14,42 @@
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/_gksu.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/ui.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/ui.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyc
-%%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/gnomeprint/__init__.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/_print.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/_print.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/ui.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/ui.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkhtml2.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkhtml2.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkmozembed.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkmozembed.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtksourceview.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtksourceview.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtop.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtop.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/mediaprofiles.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/mediaprofiles.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.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
-%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/plparser.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/plparser.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/wnck.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/wnck.so
libdata/pkgconfig/gnome-python-extras-2.0.pc
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintconfig.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintcontext.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintfont.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintfontface.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintglyphlist.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintjob.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/gnomeprint-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/pygnomeprint.devhelp
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuidialog.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontdialog.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontpreview.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuifontselection.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuijobpreview.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuipaperselector.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/class-gnomeprintuipreview.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/gnomeprintui-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygnomeprintui/pygnomeprintui.devhelp
%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/class-gtkmozembed.html
%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/gtkmozembed-class-reference.html
%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.html
%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.sgml
%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/pygtkmozembed.devhelp
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcebuffer.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcelanguage.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcelanguagesmanager.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcemarker.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourceprintjob.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcestylescheme.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetag.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetagstyle.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetagtable.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourceview.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/gtksourcesview-class-reference.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/index.html
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/pygtksourceview.devhelp
%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/class-gtkspell.html
%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/gtkspell-class-reference.html
%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/index.html
%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/index.sgml
%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/pygtkspell.devhelp
-%%PORTDOCS%%share/examples/py-gnome/applet/GNOME_PythonAppletSample.server
-%%PORTDOCS%%share/examples/py-gnome/applet/README
-%%PORTDOCS%%share/examples/py-gnome/applet/applet.py
%%PORTDOCS%%share/examples/py-gnome/egg/recent/Bonobo_Sample_Hello.xml
%%PORTDOCS%%share/examples/py-gnome/egg/recent/bonobo-view.py
%%PORTDOCS%%share/examples/py-gnome/egg/recent/gtk-view.py
%%PORTDOCS%%share/examples/py-gnome/egg/recent/populate-recent.py
%%PORTDOCS%%share/examples/py-gnome/egg/trayicon.py
%%PORTDOCS%%share/examples/py-gnome/gdl/gdl_test.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/README
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_01.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_02.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_03.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_04.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_05.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_06.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_08.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_09.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_10.glade
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_10.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/example_11.py
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/sample-image.png
-%%PORTDOCS%%share/examples/py-gnome/gnomeprint/test-print.py
%%PORTDOCS%%share/examples/py-gnome/gtkhtml2/simple-browser.py
-%%PORTDOCS%%share/examples/py-gnome/gtksourceview/test-widget.py
%%PORTDOCS%%share/examples/py-gnome/gtkspell/gtkspell.py
%%PORTDOCS%%share/examples/py-gnome/gtkspell/test.py
-%%PORTDOCS%%share/examples/py-gnome/mediaprofiles/profiles.py
-%%PORTDOCS%%share/examples/py-gnome/nautilusburn/blank_disc.py
-%%PORTDOCS%%share/examples/py-gnome/nautilusburn/drive_selection.py
-%%PORTDOCS%%share/examples/py-gnome/nautilusburn/write_iso.py
-share/pygtk/2.0/defs/applet.defs
-share/pygtk/2.0/defs/art.defs
share/pygtk/2.0/defs/gtkhtml2.defs
share/pygtk/2.0/defs/gtkmozembed.defs
-share/pygtk/2.0/defs/gtksourceview.defs
-share/pygtk/2.0/defs/mediaprofiles.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/trayicon.defs
-share/pygtk/2.0/defs/wnck.defs
-%%PORTDOCS%%@dirrm share/examples/py-gnome/nautilusburn
-%%PORTDOCS%%@dirrm share/examples/py-gnome/mediaprofiles
%%PORTDOCS%%@dirrm share/examples/py-gnome/gtkspell
-%%PORTDOCS%%@dirrm share/examples/py-gnome/gtksourceview
%%PORTDOCS%%@dirrm share/examples/py-gnome/gtkhtml2
-%%PORTDOCS%%@dirrm share/examples/py-gnome/gnomeprint
%%PORTDOCS%%@dirrm share/examples/py-gnome/gdl
%%PORTDOCS%%@dirrm share/examples/py-gnome/egg/recent
%%PORTDOCS%%@dirrm share/examples/py-gnome/egg
-%%PORTDOCS%%@dirrm share/examples/py-gnome/applet
%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkspell
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtksourceview
%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkmozembed
-%%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/gksu
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/egg
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 3d4f57fc57f..1210d475bcb 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -3,15 +3,14 @@
# Whom: marc@informatik.uni-bremen.de
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.29 2005/10/09 19:52:49 marcus Exp $
+# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.38 2006/04/13 07:52:43 bland Exp $
#
PORTNAME= gtk
-PORTVERSION= 2.8.2
-PORTREVISION= 1
+PORTVERSION= 2.8.6
CATEGORIES= x11-toolkits python
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/pygtk/2.8
+MASTER_SITE_SUBDIR= sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pygtk-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -19,9 +18,11 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A set of Python bindings for GTK
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \
+ ${PYTHON_SITELIBDIR}/gtk-2.0/gobject.so:${PORTSDIR}/devel/py-gobject
RUN_DEPENDS= ${PYNUMERIC} \
- ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
+ ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \
+ ${PYTHON_SITELIBDIR}/gtk-2.0/gobject.so:${PORTSDIR}/devel/py-gobject
USE_BZIP2= yes
USE_GMAKE= yes
@@ -36,7 +37,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
EG_SRC_DIR= ${WRKSRC}/examples
EG_DST_DIR= ${PREFIX}/share/examples/py-gtk
-CONFLICTS= py*-gtk-0* py*-gobject-[0-9]*
+CONFLICTS= py*-gtk-0*
#
# Use the same way as the Python port to determine if we want
diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo
index b0496ee1088..28d9eb4c7da 100644
--- a/x11-toolkits/py-gtk2/distinfo
+++ b/x11-toolkits/py-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygtk-2.8.2.tar.bz2) = 455b50a79015e46b8bcb0664f6d1ece8
-SHA256 (gnome2/pygtk-2.8.2.tar.bz2) = eaf6caf884d35b5db384450a51a292c9c7ccf7f43366e050c1de8327d588463b
-SIZE (gnome2/pygtk-2.8.2.tar.bz2) = 748763
+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
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index 37de690b7a7..5799444a558 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -1,6 +1,5 @@
bin/pygtk-codegen-2.0
bin/pygtk-demo
-include/pygtk-2.0/pygobject.h
include/pygtk-2.0/pygtk/pygtk.h
lib/pygtk/2.0/demos/__init__.py
lib/pygtk/2.0/demos/__init__.pyc
@@ -88,11 +87,6 @@ lib/pygtk/2.0/pygtk-demo.pyc
lib/pygtk/2.0/pygtk-demo.pyo
%%PYTHON_SITELIBDIR%%/gtk-2.0/atk.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/atk.so
-%%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/gtk/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.pyo
@@ -110,11 +104,6 @@ lib/pygtk/2.0/pygtk-demo.pyo
%%PYTHON_SITELIBDIR%%/gtk-2.0/pango.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/pangocairo.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/pangocairo.so
-%%PYTHON_SITELIBDIR%%/pygtk.pth
-%%PYTHON_SITELIBDIR%%/pygtk.py
-%%PYTHON_SITELIBDIR%%/pygtk.pyc
-%%PYTHON_SITELIBDIR%%/pygtk.pyo
-libdata/pkgconfig/pygobject-2.0.pc
libdata/pkgconfig/pygtk-2.0.pc
%%PORTDOCS%%share/doc/py-gtk/MAPPING
%%PORTDOCS%%share/doc/py-gtk/THREADS
@@ -130,7 +119,10 @@ libdata/pkgconfig/pygtk-2.0.pc
%%PORTDOCS%%share/examples/py-gtk/glade/test2.glade
%%PORTDOCS%%share/examples/py-gtk/gobject/properties.py
%%PORTDOCS%%share/examples/py-gtk/gobject/signal.py
+%%PORTDOCS%%share/examples/py-gtk/gtk/bin.py
%%PORTDOCS%%share/examples/py-gtk/gtk/filechooser.py
+%%PORTDOCS%%share/examples/py-gtk/gtk/scrollable.py
+%%PORTDOCS%%share/examples/py-gtk/gtk/sizegroup.py
%%PORTDOCS%%share/examples/py-gtk/gtk/uimanager.py
%%PORTDOCS%%share/examples/py-gtk/gtk/widget.py
%%PORTDOCS%%share/examples/py-gtk/ide/README
@@ -265,10 +257,8 @@ share/pygtk/2.0/defs/pangocairo.override
%%PORTDOCS%%@dirrm share/examples/py-gtk
%%PORTDOCS%%@dirrm share/doc/py-gtk
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0
@dirrm lib/pygtk/2.0/demos/images
@dirrm lib/pygtk/2.0/demos
@dirrm lib/pygtk/2.0
@dirrm lib/pygtk
@dirrm include/pygtk-2.0/pygtk
-@dirrm include/pygtk-2.0
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 59b87fe2120..e16a5a5c080 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,13 +3,14 @@
# 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 $
#
PORTNAME= vte
-PORTVERSION= 0.11.21
+PORTVERSION= 0.12.1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -20,8 +21,9 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
-USE_GNOME= gnomeprefix gnomehack gtk20
+USE_AUTOTOOLS= libtool:15
+USE_GETTEXT= yes
+USE_GNOME= gnomeprefix gnomehack gtk20 ltverhack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index b75009a512b..cdea565e079 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vte-0.11.21.tar.bz2) = bd949ff041681021f091fa9e6f511bb4
-SHA256 (gnome2/vte-0.11.21.tar.bz2) = b107bc0c55c8cbfcd22f2e11dc2931920a9c0a0943fef4e3f9bf1387183b8b74
-SIZE (gnome2/vte-0.11.21.tar.bz2) = 952981
+MD5 (gnome2/vte-0.12.1.tar.bz2) = 15afabb3ee753441eaa26317bc97ca1f
+SHA256 (gnome2/vte-0.12.1.tar.bz2) = 5f8a9ee415e4e14344555700760d06a32a98a7ca7a78e92c611a1049cccd80a1
+SIZE (gnome2/vte-0.12.1.tar.bz2) = 973915
diff --git a/x11-toolkits/vte/pkg-descr b/x11-toolkits/vte/pkg-descr
index ef1e497b907..9c325db4ccc 100644
--- a/x11-toolkits/vte/pkg-descr
+++ b/x11-toolkits/vte/pkg-descr
@@ -1,2 +1,2 @@
-Terminal widget with improved font, internationalization and accessibility
+Terminal widget with improved font, internationalisation and accessibility
support for the GNOME 2 desktop. Designed to replace libzvt.
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index f8973fe1be5..e841915c67a 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.8
+lib/libvte.so.4
lib/vte/decset
lib/vte/interpret
lib/vte/iso8859mode
@@ -31,6 +31,7 @@ libexec/gnome-pty-helper
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
%%DOCSDIR%%/vte.devhelp
+%%DOCSDIR%%/vte.devhelp2
share/gnome/vte/termcap/xterm
share/locale/am/LC_MESSAGES/vte.mo
share/locale/ang/LC_MESSAGES/vte.mo
@@ -45,6 +46,7 @@ share/locale/cs/LC_MESSAGES/vte.mo
share/locale/cy/LC_MESSAGES/vte.mo
share/locale/da/LC_MESSAGES/vte.mo
share/locale/de/LC_MESSAGES/vte.mo
+share/locale/dz/LC_MESSAGES/vte.mo
share/locale/el/LC_MESSAGES/vte.mo
share/locale/en_CA/LC_MESSAGES/vte.mo
share/locale/en_GB/LC_MESSAGES/vte.mo
@@ -66,6 +68,7 @@ share/locale/is/LC_MESSAGES/vte.mo
share/locale/it/LC_MESSAGES/vte.mo
share/locale/ja/LC_MESSAGES/vte.mo
share/locale/ka/LC_MESSAGES/vte.mo
+share/locale/kn/LC_MESSAGES/vte.mo
share/locale/ko/LC_MESSAGES/vte.mo
share/locale/ku/LC_MESSAGES/vte.mo
share/locale/ky/LC_MESSAGES/vte.mo
@@ -115,6 +118,8 @@ share/locale/zh_TW/LC_MESSAGES/vte.mo
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrmtry share/locale/ang/LC_MESSAGES
@dirrmtry share/locale/ang
@dirrm share/gnome/vte/termcap
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 7b8c5de5c59..4416f3bb753 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -3,15 +3,14 @@
# Whom: Garrett Rooney <rooneg@electricjellyfish.net>
#
# $FreeBSD$
-# $MCom: ports/x11-wm/metacity/Makefile,v 1.59 2005/10/03 21:18:00 mezz Exp $
+# $MCom: ports/x11-wm/metacity/Makefile,v 1.78 2006/04/15 01:51:15 mezz Exp $
#
PORTNAME= metacity
-PORTVERSION= 2.12.3
-PORTREVISION= 1
+PORTVERSION= 2.14.3
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -22,6 +21,7 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
CONFLICTS= expocity-[0-9]*
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix intlhack gnomehack gconf2
@@ -33,6 +33,7 @@ MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
GCONF_SCHEMAS= metacity.schemas
-MAN1= metacity-theme-viewer.1 metacity-window-demo.1
+MAN1= metacity-theme-viewer.1 metacity-window-demo.1 \
+ metacity.1
.include <bsd.port.mk>
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index ba2369354d4..cc840ccb6a9 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/metacity-2.12.3.tar.bz2) = 15df85021a8aa1d95fe60551105129db
-SHA256 (gnome2/metacity-2.12.3.tar.bz2) = 90871a0a4e242054f5290e42d7e104ca5d9d2fc47761d3e075fbcfbd6be0ac60
-SIZE (gnome2/metacity-2.12.3.tar.bz2) = 1672493
+MD5 (gnome2/metacity-2.14.3.tar.bz2) = 57c0bc3cf4103097e126df892ecc1d58
+SHA256 (gnome2/metacity-2.14.3.tar.bz2) = 067abbfffb9a4a08aab03249c691d8d2ca65641ffe00f0af245b7a5e2d222af8
+SIZE (gnome2/metacity-2.14.3.tar.bz2) = 1833709
diff --git a/x11-wm/metacity/files/patch-src_window-props.c b/x11-wm/metacity/files/patch-src_window-props.c
new file mode 100644
index 00000000000..e32aacf7ffa
--- /dev/null
+++ b/x11-wm/metacity/files/patch-src_window-props.c
@@ -0,0 +1,18 @@
+--- src/window-props.c.orig Wed Dec 14 09:27:03 2005
++++ src/window-props.c Wed Dec 14 09:28:57 2005
+@@ -20,6 +20,7 @@
+ * 02111-1307, USA.
+ */
+
++#include <sys/param.h>
+ #include <config.h>
+ #include "window-props.h"
+ #include "xprops.h"
+@@ -194,6 +195,7 @@ reload_net_wm_user_time (MetaWindow *
+ }
+
+ #define MAX_TITLE_LENGTH 512
++#define HOST_NAME_MAX MAXHOSTNAMELEN
+
+ /**
+ * Called by set_window_title and set_icon_title to set the value of
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index a0362fafbe5..26f5c0b0af9 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -110,12 +110,14 @@ 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/bs/LC_MESSAGES/metacity.mo
share/locale/ca/LC_MESSAGES/metacity.mo
share/locale/cs/LC_MESSAGES/metacity.mo
share/locale/cy/LC_MESSAGES/metacity.mo
share/locale/da/LC_MESSAGES/metacity.mo
share/locale/de/LC_MESSAGES/metacity.mo
+share/locale/dz/LC_MESSAGES/metacity.mo
share/locale/el/LC_MESSAGES/metacity.mo
share/locale/en_CA/LC_MESSAGES/metacity.mo
share/locale/en_GB/LC_MESSAGES/metacity.mo
@@ -137,7 +139,9 @@ share/locale/id/LC_MESSAGES/metacity.mo
share/locale/is/LC_MESSAGES/metacity.mo
share/locale/it/LC_MESSAGES/metacity.mo
share/locale/ja/LC_MESSAGES/metacity.mo
+share/locale/ka/LC_MESSAGES/metacity.mo
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/mk/LC_MESSAGES/metacity.mo
@@ -173,6 +177,8 @@ share/locale/wa/LC_MESSAGES/metacity.mo
share/locale/xh/LC_MESSAGES/metacity.mo
share/locale/zh_CN/LC_MESSAGES/metacity.mo
share/locale/zh_TW/LC_MESSAGES/metacity.mo
+@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
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index d935dbf4fe3..a5066dfde61 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -3,24 +3,25 @@
# 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 $
PORTNAME= fast-user-switch-applet
-PORTVERSION= 0.2.4
+PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
-MASTER_SITES= http://ignore-your.tv/downloads/fusa/ \
- ${MASTER_SITE_LOCAL:S/%SUBDIR%/bland/}
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
-MAINTAINER= bland@FreeBSD.org
+MAINTAINER= gnome@FreeBSD.org
COMMENT= Fast user switching applet for GNOME
+USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack intlhack gnomeprefix gtk20 gnomepanel
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gdm-config=${X11BASE}/etc/gdm/gdm.conf
-USE_REINPLACE= yes
+CONFIGURE_ARGS= --with-gdm-config=${X11BASE}/etc/gdm/custom.conf \
+ --with-gdm-setup=${X11BASE}/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 01a8ddca1a3..8a83abaae87 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-0.2.4.tar.gz) = 263c12c7a0a043582ec4a0c900e84961
-SHA256 (gnome2/fast-user-switch-applet-0.2.4.tar.gz) = ff7348db5020852aca15f6034af1706b9254a87c86c2a4ec8c35a423aa79ab3e
-SIZE (gnome2/fast-user-switch-applet-0.2.4.tar.gz) = 530165
+MD5 (gnome2/fast-user-switch-applet-2.14.1.tar.bz2) = 2cca4e96a27810738ce4def15bd49c8a
+SHA256 (gnome2/fast-user-switch-applet-2.14.1.tar.bz2) = cc3373b2079a4b0358a62040eb6d82cb8292cf2bbb5f2c56167f2c415a85c3b0
+SIZE (gnome2/fast-user-switch-applet-2.14.1.tar.bz2) = 491189
diff --git a/x11/fast-user-switch-applet/pkg-plist b/x11/fast-user-switch-applet/pkg-plist
index b0a9470b7bb..f68644981ae 100644
--- a/x11/fast-user-switch-applet/pkg-plist
+++ b/x11/fast-user-switch-applet/pkg-plist
@@ -3,15 +3,46 @@ libexec/fast-user-switch-applet
share/gnome/fast-user-switch-applet/ui.glade
share/gnome/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
share/gnome/help/fast-user-switch-applet/C/fast-user-switch-applet.xml
+share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-context.png
+share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-icon.png
+share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-prefs.png
+share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-text.png
+share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet-username.png
+share/gnome/help/fast-user-switch-applet/C/figures/fast_user_switch_applet.png
share/gnome/help/fast-user-switch-applet/C/legal.xml
share/gnome/help/fast-user-switch-applet/es/fast-user-switch-applet.xml
+share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-context.png
+share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-icon.png
+share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-prefs.png
+share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-text.png
+share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet-username.png
+share/gnome/help/fast-user-switch-applet/es/figures/fast_user_switch_applet.png
+share/gnome/help/fast-user-switch-applet/pa/fast-user-switch-applet.xml
+share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-context.png
+share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-icon.png
+share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-prefs.png
+share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-text.png
+share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet-username.png
+share/gnome/help/fast-user-switch-applet/pa/figures/fast_user_switch_applet.png
share/gnome/help/fast-user-switch-applet/sr/fast-user-switch-applet.xml
+share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-context.png
+share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-icon.png
+share/gnome/help/fast-user-switch-applet/sr/figures/fast_user_switch_applet-prefs.png
+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/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
@dirrm share/gnome/omf/fast-user-switch-applet
+@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
+@dirrm share/gnome/help/fast-user-switch-applet/pa
+@dirrm share/gnome/help/fast-user-switch-applet/es/figures
@dirrm share/gnome/help/fast-user-switch-applet/es
+@dirrm share/gnome/help/fast-user-switch-applet/C/figures
@dirrm share/gnome/help/fast-user-switch-applet/C
@dirrm share/gnome/help/fast-user-switch-applet
@dirrm share/gnome/fast-user-switch-applet
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 4e26bb41059..8196ee761a8 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,30 +3,29 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/x11/gdm/Makefile,v 1.29 2006/04/26 19:40:44 marcus Exp $
#
PORTNAME= gdm
-PORTVERSION= 2.8.0.7
-PORTREVISION= 3
+PORTVERSION= 2.14.4
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 version of xdm display manager
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
INSTALLS_OMF= yes
-USE_RC_SUBR= gdm.sh
+INSTALLS_ICONS= yes
+USE_RC_SUBR= gdm
USE_GMAKE= yes
-USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2
+USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
+ gnomeprefix
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
-CONFIGURE_ARGS= --localstatedir=/var --datadir=${PREFIX}/share/gnome \
- --with-html-dir=${GNOME_HTML_DIR} \
- --disable-gtk-doc \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
GTKDOC="false"
@@ -34,9 +33,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
GDMDIR?= ${PREFIX}/etc/gdm
PKGMESSAGE= ${WRKDIR}/pkg-message
+GNOME_LOCALSTATEDIR= /var
+
MAN1= gdm.1
-OPTIONS= IPV6 "Enable IPv6 support" off
+OPTIONS= IPV6 "Enable IPv6 support" on
.include <bsd.port.pre.mk>
@@ -52,7 +53,7 @@ PLIST_SUB+= PAM_MISC=""
PLIST_SUB+= PAM_MISC="@comment "
.endif
-.if defined(WITH_IPV6)
+.if !defined(WITHOUT_IPV6)
CONFIGURE_ARGS+= --enable-ipv6
.else
CONFIGURE_ARGS+= --disable-ipv6
@@ -70,6 +71,8 @@ post-install:
.if !defined(PACKAGE_BUILDING)
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif
+ ${INSTALL_DATA} ${WRKSRC}/config/gdm.conf-custom \
+ ${PREFIX}/etc/gdm/custom.conf.default
@${MKDIR} ${PREFIX}/etc/gdm/Sessions
@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 722b409079f..c877394be63 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.8.0.7.tar.bz2) = 566a1e3d656b6b536414f287ead2db7e
-SHA256 (gnome2/gdm-2.8.0.7.tar.bz2) = bd83a23cad86de545f57a7c38cb9b7fa52aedc5bd2f8103f1cc7a35b0bfc6a10
-SIZE (gnome2/gdm-2.8.0.7.tar.bz2) = 2777760
+MD5 (gnome2/gdm-2.14.4.tar.bz2) = 04cbd92e0c264787328e3373da3ebc11
+SHA256 (gnome2/gdm-2.14.4.tar.bz2) = 0050b544e87bc09290433e477bd4043c644f8dc9b03531b135fa5f5b3b1395b6
+SIZE (gnome2/gdm-2.14.4.tar.bz2) = 3041769
diff --git a/x11/gdm/files/gdm.sh.in b/x11/gdm/files/gdm.in
index 816c2d283dd..1b9d3e640ad 100644
--- a/x11/gdm/files/gdm.sh.in
+++ b/x11/gdm/files/gdm.in
@@ -1,5 +1,6 @@
#!/bin/sh
# $FreeBSD$
+# $MCom: ports/x11/gdm/files/gdm.in,v 1.5 2006/03/06 19:02:27 marcus Exp $
# PROVIDE: gdm
# REQUIRE: LOGIN cleanvar moused
diff --git a/x11/gdm/files/patch-config_gdm.conf.in b/x11/gdm/files/patch-config_gdm.conf.in
index 60781d1af35..43e2c566c5a 100644
--- a/x11/gdm/files/patch-config_gdm.conf.in
+++ b/x11/gdm/files/patch-config_gdm.conf.in
@@ -1,35 +1,26 @@
---- config/gdm.conf.in.orig Thu Oct 6 19:25:45 2005
-+++ config/gdm.conf.in Mon Dec 5 21:56:18 2005
-@@ -76,7 +76,7 @@
- # To try to kill all clients started at greeter time or in the Init script.
- # doesn't always work, only if those clients have a window of their own
- #KillInitClients=true
--LogDir=@EXPANDED_LOGDIR@
-+LogDir=/var/log
- # You should probably never change this value unless you have a weird setup
- PidFile=/var/run/gdm.pid
- # Note that a post login script is run before a PreSession script.
-@@ -131,11 +131,11 @@
+--- config/gdm.conf.in.orig Fri Apr 7 15:47:20 2006
++++ config/gdm.conf.in Wed Apr 12 01:53:30 2006
+@@ -156,11 +156,11 @@ StandardXServer=@X_SERVER@
#FlexiReapDelayMinutes=5
- # the X nest command
+ # The X nest command.
Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONFIG_OPTIONS@
--# Automatic VT allocation. Right now only works on Linux. This way
+-# Automatic VT allocation. Right now only works on Linux. This way we force
+# Automatic VT allocation. This way
- # we force X to use specific vts. turn VTAllocation to false if this
- # is causing problems.
+ # X to use specific vts. turn VTAllocation to false if this is causing
+ # problems.
-#FirstVT=7
-#VTAllocation=true
+FirstVT=9
+VTAllocation=true
- # Should double login be treated with a warning (and possibility to change
- # vts on linux and freebsd systems for console logins)
+ # Should double login be treated with a warning (and possibility to change VT's
+ # on Linux and FreeBSD systems for console logins)
#DoubleLoginWarning=true
-@@ -250,7 +250,7 @@
- # The specific gtkrc file we use. It should be the full path to the gtkrc
- # that we need. Unless you need a specific gtkrc that doesn't correspond to
- # a specific theme, then just use the GtkTheme key
--#GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk-2.0/gtkrc
-+#GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk-2.0/gtkrc
+@@ -283,7 +283,7 @@ Enable=false
+ # The specific gtkrc file we use. It should be the full path to the gtkrc that
+ # we need. Unless you need a specific gtkrc that doesn't correspond to a
+ # specific theme, then just use the GtkTheme key.
+-#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
++#GtkRC=@datadir@/../themes/Default/gtk-2.0/gtkrc
- # The GTK+ theme to use for the gui
+ # The GTK+ theme to use for the GUI.
#GtkTheme=Default
diff --git a/x11/gdm/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias
index ca653e463ee..c983c422eb7 100644
--- a/x11/gdm/files/patch-config_locale.alias
+++ b/x11/gdm/files/patch-config_locale.alias
@@ -34,7 +34,7 @@
-English(Canada) en_CA.UTF-8,en_CA
-English(Ireland) en_IE.UTF-8,en_IE
-English(SouthAfrica) en_ZA.UTF-8,en_ZA
--Esparanto eo.UTF-8,eo
+-Esperanto eo.UTF-8,eo
-Estonian et_EE.UTF-8,et_EE
-Finnish fi_FI.UTF-8,fi_FI
-French fr_FR.UTF-8,fr_FR
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
index 72f2005ff72..ae54f1460b8 100644
--- a/x11/gdm/files/patch-configure
+++ b/x11/gdm/files/patch-configure
@@ -1,17 +1,17 @@
---- configure.orig Sat Jun 11 03:35:18 2005
-+++ configure Sat Jun 11 03:43:21 2005
-@@ -22412,6 +22412,8 @@
+--- configure.orig Wed Mar 29 13:51:40 2006
++++ configure Wed Mar 29 14:15:56 2006
+@@ -22965,6 +22965,8 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/socket.h>
$ac_includes_default
- int
- main ()
-@@ -30210,6 +30212,13 @@
- SUSPEND_COMMAND="/usr/openwin/bin/sys-suspend -n"
+ #include <$ac_header>
+ _ACEOF
+@@ -32415,6 +32417,13 @@ case "$host" in
XSESSION_SHELL=/bin/ksh
+ SOUND_PROGRAM=/usr/bin/audioplay
;;
+*freebsd*)
+ GDM_USER_PATH="/bin:/usr/bin"
diff --git a/x11/gdm/files/patch-daemon_gdmconfig.c b/x11/gdm/files/patch-daemon_gdmconfig.c
new file mode 100644
index 00000000000..9ebf10c997e
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdmconfig.c
@@ -0,0 +1,10 @@
+--- daemon/gdmconfig.c.orig Thu Jan 5 16:57:06 2006
++++ daemon/gdmconfig.c Thu Jan 5 16:57:44 2006
+@@ -39,6 +39,7 @@
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/resource.h>
+ #include <signal.h>
+ #include <pwd.h>
+ #include <grp.h>
diff --git a/x11/gdm/files/patch-daemon_server.c b/x11/gdm/files/patch-daemon_server.c
new file mode 100644
index 00000000000..57f028bfd26
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_server.c
@@ -0,0 +1,10 @@
+--- daemon/server.c.orig Thu Jan 5 16:58:37 2006
++++ daemon/server.c Thu Jan 5 16:58:46 2006
+@@ -29,6 +29,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
++#include <sys/resource.h>
+ #include <strings.h>
+ #include <signal.h>
+ #include <syslog.h>
diff --git a/x11/gdm/files/patch-gui_greeter_gdmthemetester.in b/x11/gdm/files/patch-gui_greeter_gdmthemetester.in
new file mode 100644
index 00000000000..988efc3fbd8
--- /dev/null
+++ b/x11/gdm/files/patch-gui_greeter_gdmthemetester.in
@@ -0,0 +1,112 @@
+--- gui/greeter/gdmthemetester.in.orig Wed Apr 12 01:57:25 2006
++++ gui/greeter/gdmthemetester.in Wed Apr 12 01:57:12 2006
+@@ -0,0 +1,109 @@
++#!/bin/sh
++
++gdmwhich () {
++ COMMAND="$1"
++ OUTPUT=
++ IFS=:
++ for dir in $PATH
++ do
++ if test -x "$dir/$COMMAND" ; then
++ if test "x$OUTPUT" = "x" ; then
++ OUTPUT="$dir/$COMMAND"
++ fi
++ fi
++ done
++ IFS=$OLD_IFS
++ echo "$OUTPUT"
++}
++
++echo
++echo "GDM Theme Tester"
++echo
++echo "Be sure to test all the environments:"
++echo " console, console-timed, flexi, remote-flexi, xdmcp"
++echo "Also be sure to test using caps lock"
++echo
++
++XNEST=`gdmwhich Xnest`
++GDMXNEST=`gdmwhich gdmXnest`
++GDMGREETER="@libexecdir@/gdmgreeter"
++
++if [ x$XNEST = x ]; then
++ echo "ERROR: Xnest not found"
++ echo ""
++ exit 1
++fi
++
++if [ x$GDMXNEST = x ]; then
++ echo "ERROR: gdmXnest not found"
++ echo ""
++ exit 1
++fi
++
++if [ x$GDMGREETER = x ]; then
++ echo "ERROR: gdmgreeter not found"
++ echo ""
++ exit 1
++fi
++
++USAGE="
++Usage: $0 <environment> <theme>
++<environment> is one of: console, console-timed, flexi, remote-flexi, xdmcp
++<theme> is either the path of the theme or the name of an installed theme
++
++If you set the environment variable XNESTSIZE to <width>x<height> (e.g. 800x600)
++you can test the greeter at that resolution
++"
++if [ "$#" != 2 ]; then
++ echo "$USAGE"
++ exit 1
++fi
++
++GDM_THEME="$2"
++DOING_GDM_DEVELOPMENT=yes
++GDM_PARENT_DISPLAY="$DISPLAY"
++export GDM_THEME DOING_GDM_DEVELOPMENT GDM_PARENT_DISPLAY
++
++case $1 in
++console)
++ GDM_IS_LOCAL=yes
++ export GDM_IS_LOCAL
++ ;;
++console-timed)
++ GDM_IS_LOCAL=yes
++ GDM_FAKE_TIMED=yes
++ export GDM_IS_LOCAL GDM_FAKE_TIMED
++ ;;
++flexi)
++ GDM_IS_LOCAL=yes
++ GDM_FLEXI_SERVER=yes
++ export GDM_IS_LOCAL GDM_FLEXI_SERVER
++ ;;
++remote-flexi)
++ GDM_FLEXI_SERVER=yes
++ export GDM_FLEXI_SERVER
++ ;;
++xdmcp)
++ ;;
++*)
++ echo "$USAGE"
++ exit 1
++ ;;
++esac
++
++if [ "x$XNESTSIZE" = x ] ; then
++ eval `gdmXnest -b`
++else
++ eval `gdmXnest -b -o "-geometry $XNESTSIZE"`
++fi
++export DISPLAY
++
++if [ "x$GDM_PARENT_DISPLAY" = "x$DISPLAY" ]; then
++ echo "ERROR: Can't start the Xnest server"
++ exit 1
++fi
++
++# This may not be necessary
++sleep 1
++
++@libexecdir@/gdmgreeter
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index efcba3605e3..7288ec2f5d6 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -11,9 +11,9 @@ etc/gdm/PostSession/Default
etc/gdm/PreSession/Default
etc/gdm/XKeepsCrashing
etc/gdm/Xsession
-@unexec if cmp -s %D/etc/gdm/gdm.conf %D/etc/gdm/factory-gdm.conf; then rm -f %D/etc/gdm/gdm.conf; fi
-etc/gdm/factory-gdm.conf
-@exec [ -f %B/gdm.conf ] || cp %B/%f %B/gdm.conf
+@unexec if cmp -s %D/etc/gdm/custom.conf %D/etc/gdm/custom.conf.default; then rm -f %D/etc/gdm/custom.conf; fi
+etc/gdm/custom.conf.default
+@exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf
etc/gdm/locale.alias
@unexec if cmp -s %D/etc/gdm/modules/AccessDwellMouseEvents %D/etc/gdm/modules/factory-AccessDwellMouseEvents; then rm -f %D/etc/gdm/modules/AccessDwellMouseEvents; fi
etc/gdm/modules/factory-AccessDwellMouseEvents
@@ -29,8 +29,8 @@ lib/gtk-2.0/modules/libkeymouselistener.la
lib/gtk-2.0/modules/libkeymouselistener.so
%%PAM_MISC%%libexec/gdmaskpass
libexec/gdmchooser
-libexec/gdmlogin
libexec/gdmgreeter
+libexec/gdmlogin
libexec/gdmtranslate
sbin/gdm
sbin/gdm-binary
@@ -43,6 +43,8 @@ share/gnome/applications/gdmflexiserver.desktop
share/gnome/applications/gdmphotosetup.desktop
share/gnome/applications/gdmsetup.desktop
share/gnome/gdm/BuiltInSessions/default.desktop
+share/gnome/gdm/defaults.conf
+share/gnome/gdm/factory-defaults.conf
share/gnome/gdm/gdmchooser.glade
share/gnome/gdm/gdmphotosetup.glade
share/gnome/gdm/gdmsetup.glade
@@ -55,22 +57,16 @@ share/gnome/gdm/themes/circles/options.png
share/gnome/gdm/themes/circles/screenshot.png
share/gnome/gdm/themes/happygnome-list/GdmGreeterTheme.desktop
share/gnome/gdm/themes/happygnome-list/background.svg
-share/gnome/gdm/themes/happygnome-list/disconnect.png
-share/gnome/gdm/themes/happygnome-list/gnome-logo.png
+share/gnome/gdm/themes/happygnome-list/gnome-logo.svg
share/gnome/gdm/themes/happygnome-list/happygnome.xml
share/gnome/gdm/themes/happygnome-list/options.png
share/gnome/gdm/themes/happygnome-list/screenshot.png
-share/gnome/gdm/themes/happygnome-list/session.png
-share/gnome/gdm/themes/happygnome-list/system.png
share/gnome/gdm/themes/happygnome/GdmGreeterTheme.desktop
share/gnome/gdm/themes/happygnome/background.svg
-share/gnome/gdm/themes/happygnome/disconnect.png
-share/gnome/gdm/themes/happygnome/gnome-logo.png
+share/gnome/gdm/themes/happygnome/gnome-logo.svg
share/gnome/gdm/themes/happygnome/happygnome.xml
share/gnome/gdm/themes/happygnome/options.png
share/gnome/gdm/themes/happygnome/screenshot.png
-share/gnome/gdm/themes/happygnome/session.png
-share/gnome/gdm/themes/happygnome/system.png
share/gnome/help/gdm/C/gdm.xml
share/gnome/help/gdm/C/legal.xml
share/gnome/help/gdm/de/figures/gdm_window.png
@@ -94,6 +90,8 @@ 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
share/gnome/help/gdm/zh_CN/gdm.xml
share/gnome/help/gdm/zh_CN/legal.xml
@@ -111,6 +109,7 @@ 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
share/gnome/omf/gdm/gdm-zh_TW.omf
@@ -162,6 +161,7 @@ share/locale/cs/LC_MESSAGES/gdm.mo
share/locale/cy/LC_MESSAGES/gdm.mo
share/locale/da/LC_MESSAGES/gdm.mo
share/locale/de/LC_MESSAGES/gdm.mo
+share/locale/dz/LC_MESSAGES/gdm.mo
share/locale/el/LC_MESSAGES/gdm.mo
share/locale/en_CA/LC_MESSAGES/gdm.mo
share/locale/en_GB/LC_MESSAGES/gdm.mo
@@ -182,6 +182,7 @@ share/locale/id/LC_MESSAGES/gdm.mo
share/locale/is/LC_MESSAGES/gdm.mo
share/locale/it/LC_MESSAGES/gdm.mo
share/locale/ja/LC_MESSAGES/gdm.mo
+share/locale/ka/LC_MESSAGES/gdm.mo
share/locale/ko/LC_MESSAGES/gdm.mo
share/locale/ku/LC_MESSAGES/gdm.mo
share/locale/lt/LC_MESSAGES/gdm.mo
@@ -196,7 +197,6 @@ share/locale/nb/LC_MESSAGES/gdm.mo
share/locale/ne/LC_MESSAGES/gdm.mo
share/locale/nl/LC_MESSAGES/gdm.mo
share/locale/nn/LC_MESSAGES/gdm.mo
-share/locale/no/LC_MESSAGES/gdm.mo
share/locale/nso/LC_MESSAGES/gdm.mo
share/locale/pa/LC_MESSAGES/gdm.mo
share/locale/pl/LC_MESSAGES/gdm.mo
@@ -219,11 +219,27 @@ share/locale/vi/LC_MESSAGES/gdm.mo
share/locale/wa/LC_MESSAGES/gdm.mo
share/locale/xh/LC_MESSAGES/gdm.mo
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
@dirrm share/gnome/help/gdm/zh_TW/figures
@dirrm share/gnome/help/gdm/zh_TW
@@ -231,6 +247,7 @@ share/locale/zu/LC_MESSAGES/gdm.mo
@dirrm share/gnome/help/gdm/zh_HK
@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
@@ -247,13 +264,12 @@ share/locale/zu/LC_MESSAGES/gdm.mo
@dirrm share/gnome/help/gdm/de
@dirrm share/gnome/help/gdm/C
@dirrm share/gnome/help/gdm
-@dirrm share/gnome/gdm/themes/happygnome
@dirrm share/gnome/gdm/themes/happygnome-list
+@dirrm share/gnome/gdm/themes/happygnome
@dirrm share/gnome/gdm/themes/circles
@dirrm share/gnome/gdm/themes
@dirrm share/gnome/gdm/BuiltInSessions
@dirrm share/gnome/gdm
-@dirrm share/gnome/pixmaps/faces
@dirrm etc/pam.d
@dirrm etc/gdm/modules
@dirrm etc/gdm/Sessions
@@ -262,10 +278,10 @@ share/locale/zu/LC_MESSAGES/gdm.mo
@dirrm etc/gdm/PostLogin
@dirrm etc/gdm/Init
@dirrm etc/gdm
-@unexec /bin/rmdir %D/etc/dm/Sessions 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/etc/dm 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/sbin 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/gnome/log/gdm 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/gnome/log 2>/dev/null || /usr/bin/true
+@dirrmtry etc/dm/Sessions
+@dirrmtry etc/dm
+@dirrmtry sbin
+@dirrmtry share/gnome/log/gdm
+@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
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index e2b745126db..4e6cd0755f3 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.94 2005/10/08 19:41:40 marcus Exp $
+# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.111 2006/04/13 07:52:40 bland Exp $
#
PORTNAME= gnomeapplets2
-PORTVERSION= 2.12.3
+PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-applets/2.12
+MASTER_SITE_SUBDIR= sources/gnome-applets/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-applets-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -18,28 +18,30 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Applets components for the Gnome 2 Desktop Environment
BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-system-tools.pc:${PORTSDIR}/sysutils/gnomesystemtools
-LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2 \
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop2 \
xklavier.10:${PORTSDIR}/x11/libxklavier \
gucharmap.4:${PORTSDIR}/deskutils/gucharmap
RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnomesystemtools
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
+INSTALLS_SHLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \
gail gnomedocutils
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
+CONFIGURE_ARGS= --with-gstreamer=0.10
+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 \
- mini-commander-global.schemas mini-commander.schemas \
mixer.schemas multiload.schemas \
stickynotes.schemas
@@ -47,6 +49,11 @@ FREEBSD_SYS?= /usr/src/sys
.include <bsd.port.pre.mk>
+.if exists(${LOCALBASE}/libdata/pkgconfig/libnotify.pc) || \
+ defined(WITH_LIBNOTIFY)
+LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify
+.endif
+
.if ${ARCH} != "i386" && ${ARCH} != "amd64"
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC"
PLIST_SUB= BATTERY="@comment "
@@ -62,4 +69,8 @@ PLIST_SUB+= CPUFREQ=""
GCONF_SCHEMAS+= cpufreq-applet.schemas
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
+ ${WRKSRC}/libgweather/weather-met.c
+
.include <bsd.port.post.mk>
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index b84b0032da1..6236e73545a 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.12.3.tar.bz2) = 39987d3e8726e58a6a72047ada05e25d
-SHA256 (gnome2/gnome-applets-2.12.3.tar.bz2) = a994896e9cb5b0527616ac7713cfbc3c5c24d03c18c4b4463ec8db442619f946
-SIZE (gnome2/gnome-applets-2.12.3.tar.bz2) = 5515981
+MD5 (gnome2/gnome-applets-2.14.1.tar.bz2) = 1b5e834450812a6a3e7ab00652587ef4
+SHA256 (gnome2/gnome-applets-2.14.1.tar.bz2) = d8bf2dcebbe632c13f3268e6903640561be89a95cc8a8868453ca6600e962db9
+SIZE (gnome2/gnome-applets-2.14.1.tar.bz2) = 6608312
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index 48b84e4569f..a5233ffe0e9 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Sat Jul 16 12:55:48 2005
-+++ configure Sat Jul 16 13:04:33 2005
-@@ -23272,8 +23272,7 @@
+--- configure.orig Sun Feb 12 14:11:21 2006
++++ configure Sun Feb 12 14:12:00 2006
+@@ -23361,8 +23361,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -10,44 +10,35 @@
GNOMELOCALEDIR="$ac_define_dir"
-@@ -25126,7 +25125,7 @@
+@@ -25392,7 +25391,7 @@
;;
# list of supported OS cores that do not use libapm
-- i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
-+ i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
+- i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
++ i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
if -n "${OS_SYS}" ; then
ACPIINC="-I${OS_SYS}"
else
-@@ -25406,7 +25405,7 @@
- APPLET_MIXER_FALSE=
- fi
-
--if test x"$P_MIXER" == x"mixer"; then
-+if test x"$P_MIXER" = x"mixer"; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-@@ -25983,7 +25982,7 @@
+@@ -26469,7 +26468,7 @@
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;}
+ { echo "$as_me:$LINENO: WARNING: *** modemlights applet will not be built ***" >&5
+ echo "$as_me: WARNING: *** modemlights applet will not be built ***" >&2;}
else
-@@ -26119,6 +26118,9 @@
- echo "${ECHO_T}yes" >&6
+@@ -26633,6 +26632,9 @@
+ *linux*)
build_cpufreq_applet=yes
;;
+ i386-*-freebsd*|amd64-*-freebsd*)
+ build_cpufreq_applet=yes
+ ;;
*)
- echo "warning: ${host} is not supported by cpufreq applet, not building" >&2
- build_cpufreq_applet=no
-@@ -26409,7 +26411,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 @@
ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
@@ -56,7 +47,7 @@
pixmapsdir="${datadir}/pixmaps"
-@@ -26423,8 +26425,7 @@
+@@ -27123,8 +27125,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -66,7 +57,7 @@
GNOME_ICONDIR="$ac_define_dir"
-@@ -26436,8 +26437,7 @@
+@@ -27136,8 +27137,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -76,7 +67,7 @@
GNOME_PIXMAPSDIR="$ac_define_dir"
-@@ -26449,8 +26449,7 @@
+@@ -27149,8 +27149,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -86,7 +77,7 @@
GNOME_GLADEDIR="$ac_define_dir"
-@@ -26462,8 +26461,7 @@
+@@ -27162,8 +27161,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -96,7 +87,7 @@
DATADIR="$ac_define_dir"
-@@ -26475,8 +26473,7 @@
+@@ -27175,8 +27173,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -106,7 +97,7 @@
SYSCONFDIR="$ac_define_dir"
-@@ -26488,8 +26485,7 @@
+@@ -27188,8 +27185,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -116,7 +107,7 @@
LIBDIR="$ac_define_dir"
-@@ -26501,8 +26497,7 @@
+@@ -27201,8 +27197,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-drivemount_drive-button.c b/x11/gnome-applets/files/patch-drivemount_drive-button.c
deleted file mode 100644
index f26e3121ee4..00000000000
--- a/x11/gnome-applets/files/patch-drivemount_drive-button.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- drivemount/drive-button.c.orig Tue Aug 23 05:16:27 2005
-+++ drivemount/drive-button.c Tue Aug 23 20:37:43 2005
-@@ -24,6 +24,7 @@
- # include <config.h>
- #endif
-
-+#include <string.h>
- #include "drive-button.h"
- #include <glib/gi18n.h>
- #include <gdk/gdkkeysyms.h>
-@@ -710,11 +711,13 @@ run_command (DriveButton *self, const ch
-
- GList *volumes;
- GnomeVFSVolume *volume;
-+ char *uri;
-+ char *mount_path;
-
- volumes = gnome_vfs_drive_get_mounted_volumes (self->drive);
- volume = GNOME_VFS_VOLUME (volumes->data);
-- char *uri = gnome_vfs_volume_get_activation_uri (volume);
-- char *mount_path = gnome_vfs_get_local_path_from_uri (uri);
-+ uri = gnome_vfs_volume_get_activation_uri (volume);
-+ mount_path = gnome_vfs_get_local_path_from_uri (uri);
- g_free (uri);
-
- gnome_vfs_drive_get_display_name (self->drive);
-@@ -794,6 +797,11 @@ drive_button_ensure_popup (DriveButton *
- char *display_name, *tmp, *label;
- int action;
- GtkWidget *item;
-+ GList *volumes;
-+ GnomeVFSVolume *volume = NULL;
-+ GnomeVFSDeviceType volume_type;
-+ GCallback callback;
-+ const char *action_icon = GTK_STOCK_OPEN;
-
- if (self->popup_menu) return;
-
-@@ -869,8 +877,7 @@ drive_button_ensure_popup (DriveButton *
- g_free (display_name);
- display_name = tmp;
-
-- GCallback callback = G_CALLBACK (open_drive);
-- const char *action_icon = GTK_STOCK_OPEN;
-+ callback = G_CALLBACK (open_drive);
-
- switch (device_type) {
- case GNOME_VFS_DEVICE_TYPE_VIDEO_DVD:
diff --git a/x11/gnome-applets/files/patch-gswitchit_gswitchit-applet.c b/x11/gnome-applets/files/patch-gswitchit_gswitchit-applet.c
deleted file mode 100644
index 5abf18032f0..00000000000
--- a/x11/gnome-applets/files/patch-gswitchit_gswitchit-applet.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- gswitchit/gswitchit-applet.c.orig Sun Aug 7 18:07:33 2005
-+++ gswitchit/gswitchit-applet.c Sun Aug 7 18:10:07 2005
-@@ -331,6 +331,10 @@ GSwitchItAppletPrepareDrawing (GSwitchIt
- XklConfigItem configItem;
- GtkWidget *align, *label;
- static GHashTable *shortDescrs = NULL;
-+ gpointer pcounter = NULL;
-+ char *prevLayoutName = NULL;
-+ char *labelTitle = NULL;
-+ int counter = 0;
- if (group == 0)
- shortDescrs = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free, NULL);
-@@ -363,10 +367,6 @@ GSwitchItAppletPrepareDrawing (GSwitchIt
- if (layoutName == NULL)
- layoutName = g_strdup ("?");
-
-- gpointer pcounter = NULL;
-- char *prevLayoutName = NULL;
-- char *labelTitle = NULL;
-- int counter = 0;
- if (g_hash_table_lookup_extended (shortDescrs, layoutName,
- (gpointer*)&prevLayoutName, &pcounter))
- {
-@@ -599,6 +599,13 @@ GSwitchItAppletCmdPreview (BonoboUICompo
- groupsLevels, groupsLevels + 1, groupsLevels + 2, groupsLevels + 3 };
- XklState *xklState = XklGetCurrentState ();
- gpointer p = g_hash_table_lookup (globals.previewDialogs, GINT_TO_POINTER (xklState->group));
-+#ifdef HAVE_XKB
-+ GladeXML *gladeData;
-+ GtkWidget *dialog;
-+ GtkWidget *kbdraw;
-+ XkbComponentNamesRec componentNames;
-+ XklConfigRec xklData;
-+#endif
- if (p != NULL)
- {
- /* existing window */
-@@ -606,11 +613,10 @@ GSwitchItAppletCmdPreview (BonoboUICompo
- return;
- }
- #ifdef HAVE_XKB
-- GladeXML *gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL);
-- GtkWidget *dialog =
-+ gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL);
-+ dialog =
- glade_xml_get_widget (gladeData, "gswitchit_layout_view");
-- GtkWidget *kbdraw = keyboard_drawing_new ();
-- XkbComponentNamesRec componentNames;
-+ kbdraw = keyboard_drawing_new ();
-
- if (xklState->group >= 0 &&
- xklState->group < g_slist_length (globals.groupNames))
-@@ -624,7 +630,6 @@ GSwitchItAppletCmdPreview (BonoboUICompo
-
- keyboard_drawing_set_groups_levels (KEYBOARD_DRAWING (kbdraw), pGroupsLevels);
-
-- XklConfigRec xklData;
- XklConfigRecInit (&xklData);
- if (XklConfigGetFromServer (&xklData))
- {
diff --git a/x11/gnome-applets/files/patch-gweather_weather-iwin.c b/x11/gnome-applets/files/patch-gweather_weather-iwin.c
deleted file mode 100644
index 14c0190b2ee..00000000000
--- a/x11/gnome-applets/files/patch-gweather_weather-iwin.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- gweather/weather-iwin.c.orig Tue Dec 21 18:42:38 2004
-+++ gweather/weather-iwin.c Tue Dec 21 18:42:47 2004
-@@ -1,5 +1,6 @@
- /* $Id: patch-gweather_weather-iwin.c,v 1.1 2004/12/22 00:06:21 marcus Exp $ */
-
-+#include <sys/types.h>
- #include <regex.h>
- #include <gnome.h>
- #include "weather.h"
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 964c3e8c541..42368d3b5a5 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -3,6 +3,13 @@ bin/gswitchit-plugins-capplet
%%BATTERY%%etc/sound/events/battstat_applet.soundlist
include/libgswitchit/gswitchit_config.h
include/libgswitchit/gswitchit_plugin.h
+include/libgweather/gweather-gconf.h
+include/libgweather/gweather-prefs.h
+include/libgweather/weather.h
+lib/libgweather.a
+lib/libgweather.la
+lib/libgweather.so
+lib/libgweather.so.0
libdata/bonobo/servers/GNOME_AccessxStatusApplet.server
%%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server
libdata/bonobo/servers/GNOME_CDPlayerApplet.server
@@ -23,17 +30,16 @@ libdata/bonobo/servers/GNOME_Panel_TrashApplet.server
libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server
libdata/bonobo/servers/GNOME_StickyNotesApplet.server
libdata/pkgconfig/gswitchit.pc
+libdata/pkgconfig/gweather.pc
libexec/accessx-status-applet
%%BATTERY%%libexec/battstat-applet-2
libexec/charpick_applet2
%%CPUFREQ%%libexec/cpufreq-applet
libexec/drivemount_applet2
libexec/geyes_applet2
-libexec/gnome-applets/mc-install-default-macros
libexec/gnome-keyboard-applet
libexec/gtik2_applet2
libexec/gweather-applet-2
-libexec/mini_commander_applet
libexec/mixer_applet2
libexec/modem_applet
libexec/multiload-applet-2
@@ -49,7 +55,6 @@ 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
-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
@@ -74,7 +79,6 @@ share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png
%%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade
share/gnome/gnome-applets/glade/gswitchit-plugins.glade
share/gnome/gnome-applets/glade/gswitchit.glade
-share/gnome/gnome-applets/glade/mini-commander.glade
share/gnome/gnome-applets/glade/modemlights.glade
share/gnome/gnome-applets/glade/stickynotes.glade
share/gnome/gnome-applets/glade/trashapplet.glade
@@ -93,6 +97,18 @@ share/gnome/help/accessx-status/C/figures/accessx_sticky-meta-key.png
share/gnome/help/accessx-status/C/figures/accessx_sticky-shift-key.png
share/gnome/help/accessx-status/C/figures/accessx_sticky-windows-key.png
share/gnome/help/accessx-status/C/legal.xml
+share/gnome/help/accessx-status/bg/accessx-status.xml
+share/gnome/help/accessx-status/bg/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/bg/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/bg/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/bg/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/bg/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/bg/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/bg/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/bg/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/bg/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/bg/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/bg/figures/accessx_sticky-windows-key.png
share/gnome/help/accessx-status/es/accessx-status.xml
share/gnome/help/accessx-status/es/figures/accessx-status-applet.png
share/gnome/help/accessx-status/es/figures/accessx-status-disabled.png
@@ -148,12 +164,24 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-preferences.png
%%BATTERY%%share/gnome/help/battstat/C/figures/context-menu.png
%%BATTERY%%share/gnome/help/battstat/C/legal.xml
+%%BATTERY%%share/gnome/help/battstat/bg/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/bg/figures/context-menu.png
%%BATTERY%%share/gnome/help/battstat/es/battstat.xml
%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet-expanded.png
%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet.png
%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-credits-hal.png
%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-preferences.png
%%BATTERY%%share/gnome/help/battstat/es/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/fr/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet.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/uk/battstat.xml
%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet-expanded.png
%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet.png
@@ -166,11 +194,21 @@ share/gnome/help/char-palette/C/figures/charpalette_chargroup.png
share/gnome/help/char-palette/C/figures/charpick-preferences.png
share/gnome/help/char-palette/C/figures/charpick_characters.png
share/gnome/help/char-palette/C/legal.xml
+share/gnome/help/char-palette/bg/char-palette.xml
+share/gnome/help/char-palette/bg/figures/charpalette_applet.png
+share/gnome/help/char-palette/bg/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/bg/figures/charpick-preferences.png
+share/gnome/help/char-palette/bg/figures/charpick_characters.png
share/gnome/help/char-palette/es/char-palette.xml
share/gnome/help/char-palette/es/figures/charpalette_applet.png
share/gnome/help/char-palette/es/figures/charpalette_chargroup.png
share/gnome/help/char-palette/es/figures/charpick-preferences.png
share/gnome/help/char-palette/es/figures/charpick_characters.png
+share/gnome/help/char-palette/fr/char-palette.xml
+share/gnome/help/char-palette/fr/figures/charpalette_applet.png
+share/gnome/help/char-palette/fr/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/fr/figures/charpick-preferences.png
+share/gnome/help/char-palette/fr/figures/charpick_characters.png
share/gnome/help/char-palette/it/char-palette.xml
share/gnome/help/char-palette/it/figures/charpalette_applet.png
share/gnome/help/char-palette/it/figures/charpalette_chargroup.png
@@ -191,23 +229,6 @@ share/gnome/help/char-palette/uk/figures/charpalette_applet.png
share/gnome/help/char-palette/uk/figures/charpalette_chargroup.png
share/gnome/help/char-palette/uk/figures/charpick-preferences.png
share/gnome/help/char-palette/uk/figures/charpick_characters.png
-share/gnome/help/command-line/C/command-line.xml
-share/gnome/help/command-line/C/figures/command-line.png
-share/gnome/help/command-line/C/figures/prefs-macros.png
-share/gnome/help/command-line/C/figures/prefs.png
-share/gnome/help/command-line/C/legal.xml
-share/gnome/help/command-line/es/command-line.xml
-share/gnome/help/command-line/es/figures/command-line.png
-share/gnome/help/command-line/es/figures/prefs-macros.png
-share/gnome/help/command-line/es/figures/prefs.png
-share/gnome/help/command-line/pt_BR/command-line.xml
-share/gnome/help/command-line/pt_BR/figures/command-line.png
-share/gnome/help/command-line/pt_BR/figures/prefs-macros.png
-share/gnome/help/command-line/pt_BR/figures/prefs.png
-share/gnome/help/command-line/uk/command-line.xml
-share/gnome/help/command-line/uk/figures/command-line.png
-share/gnome/help/command-line/uk/figures/prefs-macros.png
-share/gnome/help/command-line/uk/figures/prefs.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-100.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-25.png
@@ -229,6 +250,16 @@ share/gnome/help/command-line/uk/figures/prefs.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/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
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-preferences.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/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
@@ -252,6 +283,12 @@ share/gnome/help/drivemount/es/figures/drivemount-applet_example.png
share/gnome/help/drivemount/es/figures/drivemount-applet_mount.png
share/gnome/help/drivemount/es/figures/drivemount-applet_open.png
share/gnome/help/drivemount/es/figures/drivemount-applet_status.png
+share/gnome/help/drivemount/fr/drivemount.xml
+share/gnome/help/drivemount/fr/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/fr/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/fr/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/fr/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/fr/figures/drivemount-applet_status.png
share/gnome/help/drivemount/it/drivemount.xml
share/gnome/help/drivemount/it/figures/drivemount-applet_eject.png
share/gnome/help/drivemount/it/figures/drivemount-applet_example.png
@@ -273,10 +310,16 @@ share/gnome/help/drivemount/uk/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
+share/gnome/help/geyes/bg/figures/geyes_applet.png
+share/gnome/help/geyes/bg/geyes.xml
share/gnome/help/geyes/es/figures/geyes_applet.png
share/gnome/help/geyes/es/geyes.xml
+share/gnome/help/geyes/fr/figures/geyes_applet.png
+share/gnome/help/geyes/fr/geyes.xml
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/uk/figures/geyes_applet.png
share/gnome/help/geyes/uk/geyes.xml
share/gnome/help/gswitchit/C/gswitchit.xml
@@ -289,6 +332,8 @@ 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
@@ -322,6 +367,36 @@ share/gnome/help/gweather/es/figures/stock_weather-snow.png
share/gnome/help/gweather/es/figures/stock_weather-storm.png
share/gnome/help/gweather/es/figures/stock_weather-sunny.png
share/gnome/help/gweather/es/gweather.xml
+share/gnome/help/gweather/fr/figures/gweather-details.png
+share/gnome/help/gweather/fr/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/fr/figures/gweather-prefs-general.png
+share/gnome/help/gweather/fr/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/fr/figures/gweather_applet.png
+share/gnome/help/gweather/fr/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/fr/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/fr/figures/stock_weather-fog.png
+share/gnome/help/gweather/fr/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/fr/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/fr/figures/stock_weather-showers.png
+share/gnome/help/gweather/fr/figures/stock_weather-snow.png
+share/gnome/help/gweather/fr/figures/stock_weather-storm.png
+share/gnome/help/gweather/fr/figures/stock_weather-sunny.png
+share/gnome/help/gweather/fr/gweather.xml
+share/gnome/help/gweather/nl/figures/gweather-details.png
+share/gnome/help/gweather/nl/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/nl/figures/gweather-prefs-general.png
+share/gnome/help/gweather/nl/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/nl/figures/gweather_applet.png
+share/gnome/help/gweather/nl/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/nl/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/nl/figures/stock_weather-fog.png
+share/gnome/help/gweather/nl/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/nl/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/nl/figures/stock_weather-showers.png
+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/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
@@ -342,6 +417,10 @@ share/gnome/help/mixer_applet2/C/legal.xml
share/gnome/help/mixer_applet2/C/mixer_applet2.xml
share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/es/mixer_applet2.xml
+share/gnome/help/mixer_applet2/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/uk/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/uk/mixer_applet2.xml
share/gnome/help/multiload/C/figures/multiload-preferences.png
@@ -353,6 +432,10 @@ share/gnome/help/multiload/es/figures/multiload-preferences.png
share/gnome/help/multiload/es/figures/system-monitor-applet_window.png
share/gnome/help/multiload/es/figures/system_monitor.png
share/gnome/help/multiload/es/multiload.xml
+share/gnome/help/multiload/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/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
@@ -370,6 +453,12 @@ share/gnome/help/stickynotes_applet/es/figures/stickynotes-note-prefs.png
share/gnome/help/stickynotes_applet/es/figures/stickynotes-prefs.png
share/gnome/help/stickynotes_applet/es/figures/stickynotes_applet.png
share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/fr/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/fr/figures/stickynote-right-menu-new.png
+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/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
@@ -385,39 +474,49 @@ share/gnome/help/trashapplet/fr/figures/trash-applet.png
share/gnome/help/trashapplet/fr/trashapplet.xml
share/gnome/help/trashapplet/it/figures/trash-applet.png
share/gnome/help/trashapplet/it/trashapplet.xml
+share/gnome/help/trashapplet/nl/figures/trash-applet.png
+share/gnome/help/trashapplet/nl/trashapplet.xml
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/uk/figures/trash-applet.png
share/gnome/help/trashapplet/uk/trashapplet.xml
share/gnome/omf/accessx-status/accessx-status-C.omf
+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-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-uk.omf
share/gnome/omf/char-palette/char-palette-C.omf
+share/gnome/omf/char-palette/char-palette-bg.omf
share/gnome/omf/char-palette/char-palette-es.omf
+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-uk.omf
-share/gnome/omf/command-line/command-line-C.omf
-share/gnome/omf/command-line/command-line-es.omf
-share/gnome/omf/command-line/command-line-pt_BR.omf
-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-nl.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.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-uk.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-uk.omf
share/gnome/omf/gswitchit/gswitchit-C.omf
share/gnome/omf/gswitchit/gswitchit-es.omf
@@ -425,24 +524,33 @@ share/gnome/omf/gswitchit/gswitchit-fr.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-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-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-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-uk.omf
share/gnome/omf/trashapplet/trashapplet-C.omf
share/gnome/omf/trashapplet/trashapplet-es.omf
share/gnome/omf/trashapplet/trashapplet-fr.omf
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-uk.omf
share/gnome/pixmaps/accessx-status-applet/ax-applet.png
share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png
@@ -583,7 +691,6 @@ 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
-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
@@ -600,6 +707,7 @@ share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/da/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/de/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-applets-2.0.mo
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
@@ -621,7 +729,10 @@ share/locale/id/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
+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/mk/LC_MESSAGES/gnome-applets-2.0.mo
@@ -655,19 +766,28 @@ share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo
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
-@unexec /bin/rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/xh 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/te/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/te 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/hy 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 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
+@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/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrm share/gnome/pixmaps/stickynotes
%%CPUFREQ%%@dirrm share/gnome/pixmaps/cpufreq-applet
@dirrm share/gnome/pixmaps/accessx-status-applet
@@ -681,18 +801,21 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/omf/geyes
@dirrm share/gnome/omf/drivemount
%%CPUFREQ%%@dirrm share/gnome/omf/cpufreq-applet
-@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/ru/figures
+@dirrm share/gnome/help/trashapplet/ru
@dirrm share/gnome/help/trashapplet/pa/figures
@dirrm share/gnome/help/trashapplet/pa
-@dirrm share/gnome/help/trashapplet/fr/figures
-@dirrm share/gnome/help/trashapplet/fr
+@dirrm share/gnome/help/trashapplet/nl/figures
+@dirrm share/gnome/help/trashapplet/nl
@dirrm share/gnome/help/trashapplet/it/figures
@dirrm share/gnome/help/trashapplet/it
+@dirrm share/gnome/help/trashapplet/fr/figures
+@dirrm share/gnome/help/trashapplet/fr
@dirrm share/gnome/help/trashapplet/es/figures
@dirrm share/gnome/help/trashapplet/es
@dirrm share/gnome/help/trashapplet/C/figures
@@ -700,6 +823,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/fr/figures
+@dirrm share/gnome/help/stickynotes_applet/fr
@dirrm share/gnome/help/stickynotes_applet/es/figures
@dirrm share/gnome/help/stickynotes_applet/es
@dirrm share/gnome/help/stickynotes_applet/C/figures
@@ -707,6 +832,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/fr/figures
+@dirrm share/gnome/help/multiload/fr
@dirrm share/gnome/help/multiload/es/figures
@dirrm share/gnome/help/multiload/es
@dirrm share/gnome/help/multiload/C/figures
@@ -714,6 +841,10 @@ 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/it/figures
+@dirrm share/gnome/help/mixer_applet2/it
+@dirrm share/gnome/help/mixer_applet2/fr/figures
+@dirrm share/gnome/help/mixer_applet2/fr
@dirrm share/gnome/help/mixer_applet2/es/figures
@dirrm share/gnome/help/mixer_applet2/es
@dirrm share/gnome/help/mixer_applet2/C/figures
@@ -721,6 +852,10 @@ 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/nl/figures
+@dirrm share/gnome/help/gweather/nl
+@dirrm share/gnome/help/gweather/fr/figures
+@dirrm share/gnome/help/gweather/fr
@dirrm share/gnome/help/gweather/es/figures
@dirrm share/gnome/help/gweather/es
@dirrm share/gnome/help/gweather/C/figures
@@ -728,6 +863,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@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
@@ -740,10 +877,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/gswitchit
@dirrm share/gnome/help/geyes/uk/figures
@dirrm share/gnome/help/geyes/uk
+@dirrm share/gnome/help/geyes/ru/figures
+@dirrm share/gnome/help/geyes/ru
@dirrm share/gnome/help/geyes/it/figures
@dirrm share/gnome/help/geyes/it
+@dirrm share/gnome/help/geyes/fr/figures
+@dirrm share/gnome/help/geyes/fr
@dirrm share/gnome/help/geyes/es/figures
@dirrm share/gnome/help/geyes/es
+@dirrm share/gnome/help/geyes/bg/figures
+@dirrm share/gnome/help/geyes/bg
@dirrm share/gnome/help/geyes/C/figures
@dirrm share/gnome/help/geyes/C
@dirrm share/gnome/help/geyes
@@ -753,6 +896,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/drivemount/pa
@dirrm share/gnome/help/drivemount/it/figures
@dirrm share/gnome/help/drivemount/it
+@dirrm share/gnome/help/drivemount/fr/figures
+@dirrm share/gnome/help/drivemount/fr
@dirrm share/gnome/help/drivemount/es/figures
@dirrm share/gnome/help/drivemount/es
@dirrm share/gnome/help/drivemount/C/figures
@@ -760,20 +905,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/drivemount
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl
%%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
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet
-@dirrm share/gnome/help/command-line/uk/figures
-@dirrm share/gnome/help/command-line/uk
-@dirrm share/gnome/help/command-line/pt_BR/figures
-@dirrm share/gnome/help/command-line/pt_BR
-@dirrm share/gnome/help/command-line/es/figures
-@dirrm share/gnome/help/command-line/es
-@dirrm share/gnome/help/command-line/C/figures
-@dirrm share/gnome/help/command-line/C
-@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/pt_BR/figures
@@ -782,15 +920,23 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/char-palette/nl
@dirrm share/gnome/help/char-palette/it/figures
@dirrm share/gnome/help/char-palette/it
+@dirrm share/gnome/help/char-palette/fr/figures
+@dirrm share/gnome/help/char-palette/fr
@dirrm share/gnome/help/char-palette/es/figures
@dirrm share/gnome/help/char-palette/es
+@dirrm share/gnome/help/char-palette/bg/figures
+@dirrm share/gnome/help/char-palette/bg
@dirrm share/gnome/help/char-palette/C/figures
@dirrm share/gnome/help/char-palette/C
@dirrm share/gnome/help/char-palette
%%BATTERY%%@dirrm share/gnome/help/battstat/uk/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/uk
+%%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/fr
%%BATTERY%%@dirrm share/gnome/help/battstat/es/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/es
+%%BATTERY%%@dirrm share/gnome/help/battstat/bg/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/bg
%%BATTERY%%@dirrm share/gnome/help/battstat/C/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/C
%%BATTERY%%@dirrm share/gnome/help/battstat
@@ -802,6 +948,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/accessx-status/fr
@dirrm share/gnome/help/accessx-status/es/figures
@dirrm share/gnome/help/accessx-status/es
+@dirrm share/gnome/help/accessx-status/bg/figures
+@dirrm share/gnome/help/accessx-status/bg
@dirrm share/gnome/help/accessx-status/C/figures
@dirrm share/gnome/help/accessx-status/C
@dirrm share/gnome/help/accessx-status
@@ -814,5 +962,5 @@ 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
-@dirrm libexec/gnome-applets
+@dirrm include/libgweather
@dirrm include/libgswitchit
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index cc11fda744c..f35b0147eb4 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomedesktop/Makefile,v 1.74 2005/10/03 15:18:36 ahze Exp $
+# $MCom: ports/x11/gnomedesktop/Makefile,v 1.90 2006/04/13 07:52:40 bland Exp $
#
PORTNAME= gnomedesktop
-PORTVERSION= 2.12.3
-PORTREVISION= 1
+PORTVERSION= 2.14.1.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-desktop/2.12
+MASTER_SITE_SUBDIR= sources/gnome-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -21,15 +20,15 @@ COMMENT= Additional UI API for GNOME 2
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
-USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \
ltverhack
GNOME_DESKTOP_VERSION=2
+USE_GETTEXT= yes
USE_GMAKE= yes
USE_BISON= yes
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \
--with-kde-datadir=${LOCALBASE}/share
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index cf73ed69cd6..f6ae5c885bd 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-desktop-2.12.3.tar.bz2) = 387efe89249c61e512812568047be654
-SHA256 (gnome2/gnome-desktop-2.12.3.tar.bz2) = 9224155eff36fc4a3e0995adf61407c4cdf023c9efda80c6f857fbfbe27184b9
-SIZE (gnome2/gnome-desktop-2.12.3.tar.bz2) = 1036062
+MD5 (gnome2/gnome-desktop-2.14.1.1.tar.bz2) = f3ffb360681c1dc17d1856f19a59e88f
+SHA256 (gnome2/gnome-desktop-2.14.1.1.tar.bz2) = 82c9de6ca3507dceb347deda069faf3dd22a412d3bf8944618fbb57656815244
+SIZE (gnome2/gnome-desktop-2.14.1.1.tar.bz2) = 1173965
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index ca229e89c00..fd92d45b962 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -7,6 +7,20 @@ lib/libgnome-desktop-2.la
lib/libgnome-desktop-2.so
lib/libgnome-desktop-2.so.2
libdata/pkgconfig/gnome-desktop-2.0.pc
+share/doc/gnome-desktop/GnomeDItemEdit.html
+share/doc/gnome-desktop/GnomeHint.html
+share/doc/gnome-desktop/ch01.html
+share/doc/gnome-desktop/gnome-desktop-GnomeDesktopItem.html
+share/doc/gnome-desktop/gnome-desktop.devhelp
+share/doc/gnome-desktop/gnome-desktop.devhelp2
+share/doc/gnome-desktop/home.png
+share/doc/gnome-desktop/index.html
+share/doc/gnome-desktop/index.sgml
+share/doc/gnome-desktop/intro.html
+share/doc/gnome-desktop/left.png
+share/doc/gnome-desktop/right.png
+share/doc/gnome-desktop/style.css
+share/doc/gnome-desktop/up.png
share/gnome/applications/gnome-about.desktop
share/gnome/gnome-about/gnome-64.png
share/gnome/gnome-about/gnome-version.xml
@@ -21,26 +35,44 @@ share/gnome/gnome-about/headers/header-bg-snow01.png
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/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/uk/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/uk/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/uk/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-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-uk.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-uk.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-uk.omf
share/gnome/pixmaps/apple-green.png
share/gnome/pixmaps/apple-red.png
share/gnome/pixmaps/gnome-aorta.png
@@ -128,6 +160,7 @@ share/locale/cs/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/en_CA/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -150,9 +183,11 @@ share/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-desktop-2.0.mo
+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
@@ -200,24 +235,38 @@ share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
@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/uk
@dirrm share/gnome/help/lgpl/pa
+@dirrm share/gnome/help/lgpl/fr
@dirrm share/gnome/help/lgpl/es
+@dirrm share/gnome/help/gpl/uk
@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/fdl/es
+@dirrm share/gnome/help/gnome-feedback/uk
+@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/fr
+@dirrm share/gnome/help/fdl/es
@dirrm share/gnome/gnome-about/headers
+@dirrm share/doc/gnome-desktop
@dirrm include/gnome-desktop-2.0/libgnomeui
@dirrm include/gnome-desktop-2.0/libgnome
@dirrm include/gnome-desktop-2.0
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 2b04a083b71..0b3b692e9fc 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,31 +3,36 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-menus/Makefile,v 1.21 2005/09/08 18:04:51 marcus Exp $
+# $MCom: ports/x11/gnome-menus/Makefile,v 1.29 2006/04/13 13:04:49 ahze Exp $
#
PORTNAME= gnome-menus
-PORTVERSION= 2.12.0
-PORTREVISION= 2
+PORTVERSION= 2.14.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Implementation of the FreeDesktop Desktop Menu Spec
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomevfs2 ltverhack
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
USE_PYTHON= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM)
+USE_FAM= yes
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|/usr/share/gnome|${X11BASE}/share/gnome|g' \
${WRKSRC}/layout/applications.menu \
@@ -41,4 +46,4 @@ post-install:
@${MKDIR} ${PREFIX}/share/gnome/desktop-directories
@${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/desktop-directories
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index 7a00a1d9cb8..49becc35900 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-menus-2.12.0.tar.bz2) = 615392c4f729f70c03aa3aa7dbe40a95
-SHA256 (gnome2/gnome-menus-2.12.0.tar.bz2) = f77192ca0b909000f675ad3cd520c313431ee117d554102c7ea486f76f396f6b
-SIZE (gnome2/gnome-menus-2.12.0.tar.bz2) = 393280
+MD5 (gnome2/gnome-menus-2.14.0.tar.bz2) = 7aa0c08fc8b9caabb4be46e1cfb595fc
+SHA256 (gnome2/gnome-menus-2.14.0.tar.bz2) = 07985a597e825cab86e3b0a46d6bdc89f2545dd57ee4cf5ea781ab4f37cd60a3
+SIZE (gnome2/gnome-menus-2.14.0.tar.bz2) = 408473
diff --git a/x11/gnome-menus/files/patch-Makefile.in b/x11/gnome-menus/files/patch-Makefile.in
index 510f1140fb4..995bf4c2e5e 100644
--- a/x11/gnome-menus/files/patch-Makefile.in
+++ b/x11/gnome-menus/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig Thu Sep 8 13:59:53 2005
-+++ Makefile.in Thu Sep 8 14:00:08 2005
+--- Makefile.in.orig Thu Apr 13 08:59:30 2006
++++ Makefile.in Thu Apr 13 08:59:38 2006
@@ -205,7 +205,7 @@
target_alias = @target_alias@
NULL =
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index 81576978b40..b5a4b5e1700 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -31,11 +31,14 @@ share/gnome/desktop-directories/System-Settings.directory
share/gnome/desktop-directories/System-Tools.directory
share/locale/ar/LC_MESSAGES/gnome-menus.mo
share/locale/bg/LC_MESSAGES/gnome-menus.mo
+share/locale/bn/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
share/locale/cy/LC_MESSAGES/gnome-menus.mo
share/locale/da/LC_MESSAGES/gnome-menus.mo
share/locale/de/LC_MESSAGES/gnome-menus.mo
+share/locale/dz/LC_MESSAGES/gnome-menus.mo
share/locale/el/LC_MESSAGES/gnome-menus.mo
share/locale/en_CA/LC_MESSAGES/gnome-menus.mo
share/locale/en_GB/LC_MESSAGES/gnome-menus.mo
@@ -54,8 +57,13 @@ share/locale/hy/LC_MESSAGES/gnome-menus.mo
share/locale/id/LC_MESSAGES/gnome-menus.mo
share/locale/it/LC_MESSAGES/gnome-menus.mo
share/locale/ja/LC_MESSAGES/gnome-menus.mo
+share/locale/ka/LC_MESSAGES/gnome-menus.mo
share/locale/ko/LC_MESSAGES/gnome-menus.mo
+share/locale/ku/LC_MESSAGES/gnome-menus.mo
+share/locale/ky/LC_MESSAGES/gnome-menus.mo
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/mr/LC_MESSAGES/gnome-menus.mo
share/locale/ms/LC_MESSAGES/gnome-menus.mo
@@ -76,21 +84,38 @@ 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/te/LC_MESSAGES/gnome-menus.mo
share/locale/th/LC_MESSAGES/gnome-menus.mo
share/locale/tr/LC_MESSAGES/gnome-menus.mo
+share/locale/ug/LC_MESSAGES/gnome-menus.mo
share/locale/uk/LC_MESSAGES/gnome-menus.mo
share/locale/vi/LC_MESSAGES/gnome-menus.mo
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
+@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/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@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/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/desktop-directories
@dirrm include/gnome-menus
@dirrm etc/xdg/menus
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 3771e92fc1d..06d7aebc679 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomepanel/Makefile,v 1.109 2005/10/08 19:41:40 marcus Exp $
+# $MCom: ports/x11/gnomepanel/Makefile,v 1.128 2006/04/13 07:52:40 bland Exp $
#
PORTNAME= gnomepanel
-PORTVERSION= 2.12.3
-PORTREVISION= 1
+PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-panel/2.12
+MASTER_SITE_SUBDIR= sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-panel-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -20,18 +19,18 @@ COMMENT= Panel component for the GNOME 2 Desktop
RUN_DEPENDS= gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor
+USE_GETTEXT= yes
USE_BZIP2= yes
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
INSTALLS_ICONS= yes
USE_X_PREFIX= yes
-USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \
libwnck gnomemenus gnomedocutils ltverhack
WANT_GNOME= yes
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \
--with-kde-docdir=${LOCALBASE}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -59,8 +58,6 @@ CONFIGURE_ARGS+=--disable-eds
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|evolution.desktop|evolution-2.4.desktop|g' \
- ${WRKSRC}/gnome-panel/panel-default-setup.entries.in
.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 d40395919ba..b8fcfffc8c2 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.12.3.tar.bz2) = 50a27090f7c667536e4bb5b077428853
-SHA256 (gnome2/gnome-panel-2.12.3.tar.bz2) = a819b55a9616954edb4f69587be570e1d9fc1516c7c63b4f7e67d0b7a3994902
-SIZE (gnome2/gnome-panel-2.12.3.tar.bz2) = 2464381
+MD5 (gnome2/gnome-panel-2.14.1.tar.bz2) = 1f5bc59c7c49cf90a797d892ab3ea05f
+SHA256 (gnome2/gnome-panel-2.14.1.tar.bz2) = f7019f6f42ed323edcc5dc865638d7cb65e8c35a1403f67788a58cc8b3f5944e
+SIZE (gnome2/gnome-panel-2.14.1.tar.bz2) = 2539786
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c
index ccf5378b135..981e4b4f202 100644
--- a/x11/gnome-panel/files/patch-applets_clock_clock.c
+++ b/x11/gnome-panel/files/patch-applets_clock_clock.c
@@ -1,5 +1,5 @@
---- applets/clock/clock.c.orig Tue Jan 13 11:55:58 2004
-+++ applets/clock/clock.c Wed Jan 14 15:43:39 2004
+--- applets/clock/clock.c.orig Mon Oct 24 02:25:11 2005
++++ applets/clock/clock.c Tue Nov 22 02:47:05 2005
@@ -47,7 +47,9 @@
#include <dirent.h>
#include <string.h>
@@ -10,7 +10,7 @@
#include <panel-applet.h>
#include <panel-applet-gconf.h>
-@@ -539,7 +541,11 @@
+@@ -545,7 +547,11 @@ clock_locale_format (void)
{
const char *am;
diff --git a/x11/gnome-panel/files/patch-gnome-panel_egg-recent-model.c b/x11/gnome-panel/files/patch-gnome-panel_egg-recent-model.c
deleted file mode 100644
index c74812db845..00000000000
--- a/x11/gnome-panel/files/patch-gnome-panel_egg-recent-model.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- gnome-panel/egg-recent-model.c.orig Wed Dec 21 16:58:46 2005
-+++ gnome-panel/egg-recent-model.c Wed Dec 21 16:59:03 2005
-@@ -942,7 +942,7 @@
- static gboolean
- egg_recent_model_lock_file (FILE *file)
- {
--#ifdef F_TLOCK
-+#ifdef HAVE_LOCKF
- int fd;
- gint try = 5;
-
-@@ -980,7 +980,7 @@
- static gboolean
- egg_recent_model_unlock_file (FILE *file)
- {
--#ifdef F_TLOCK
-+#ifdef HAVE_LOCKF
- int fd;
-
- rewind (file);
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index c7b9f1bfac1..855d2c4a37a 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -98,10 +98,6 @@ share/gnome/help/fish-applet-2/de/figures/fish_applet.png
share/gnome/help/fish-applet-2/de/figures/fish_settings.png
share/gnome/help/fish-applet-2/de/fish-applet-2.xml
share/gnome/help/fish-applet-2/de/legal.xml
-share/gnome/help/fish-applet-2/fr/figures/fish_applet.png
-share/gnome/help/fish-applet-2/fr/figures/fish_settings.png
-share/gnome/help/fish-applet-2/fr/fish-applet-2.xml
-share/gnome/help/fish-applet-2/fr/legal.xml
share/gnome/help/fish-applet-2/ja/figures/fish_applet.png
share/gnome/help/fish-applet-2/ja/fish-applet-2.xml
share/gnome/help/fish-applet-2/ja/legal.xml
@@ -127,6 +123,9 @@ share/gnome/help/fish/C/legal.xml
share/gnome/help/fish/es/figures/fish_applet.png
share/gnome/help/fish/es/fish.xml
share/gnome/help/fish/es/legal.xml
+share/gnome/help/fish/fr/figures/fish_applet.png
+share/gnome/help/fish/fr/fish.xml
+share/gnome/help/fish/fr/legal.xml
share/gnome/help/fish/it/figures/fish_applet.png
share/gnome/help/fish/it/fish.xml
share/gnome/help/fish/it/legal.xml
@@ -147,7 +146,6 @@ share/gnome/help/window-list/es/figures/window_list_group_applet.png
share/gnome/help/window-list/es/legal.xml
share/gnome/help/window-list/es/window-list.xml
share/gnome/help/window-list/fr/figures/window_list_applet.png
-share/gnome/help/window-list/fr/figures/window_list_group.png
share/gnome/help/window-list/fr/figures/window_list_group_applet.png
share/gnome/help/window-list/fr/legal.xml
share/gnome/help/window-list/fr/window-list.xml
@@ -194,7 +192,6 @@ share/gnome/help/workspace-switcher/es/figures/workspace_switcher_applet.png
share/gnome/help/workspace-switcher/es/legal.xml
share/gnome/help/workspace-switcher/es/workspace-switcher.xml
share/gnome/help/workspace-switcher/fr/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/fr/figures/workspacelist_applet.png
share/gnome/help/workspace-switcher/fr/legal.xml
share/gnome/help/workspace-switcher/fr/workspace-switcher.xml
share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png
@@ -229,8 +226,8 @@ share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
share/gnome/omf/clock/clock-C.omf
share/gnome/omf/clock/clock-de.omf
share/gnome/omf/clock/clock-es.omf
-share/gnome/omf/clock/clock-it.omf
share/gnome/omf/clock/clock-fr.omf
+share/gnome/omf/clock/clock-it.omf
share/gnome/omf/clock/clock-ja.omf
share/gnome/omf/clock/clock-ko.omf
share/gnome/omf/clock/clock-nl.omf
@@ -242,31 +239,22 @@ share/gnome/omf/clock/clock-zh_CN.omf
share/gnome/omf/clock/clock-zh_TW.omf
share/gnome/omf/fish/fish-C.omf
share/gnome/omf/fish/fish-es.omf
+share/gnome/omf/fish/fish-fr.omf
share/gnome/omf/fish/fish-it.omf
share/gnome/omf/fish/fish-uk.omf
-share/gnome/omf/gnome-panel/clock-de.omf
-share/gnome/omf/gnome-panel/clock-fr.omf
-share/gnome/omf/gnome-panel/clock-ja.omf
-share/gnome/omf/gnome-panel/clock-ko.omf
-share/gnome/omf/gnome-panel/clock-sv.omf
-share/gnome/omf/gnome-panel/clock-zh_CN.omf
-share/gnome/omf/gnome-panel/clock-zh_TW.omf
share/gnome/omf/gnome-panel/fish-applet-2-de.omf
-share/gnome/omf/gnome-panel/fish-applet-2-fr.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-fr.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-fr.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
@@ -274,10 +262,12 @@ 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
share/gnome/omf/window-list/window-list-es.omf
+share/gnome/omf/window-list/window-list-fr.omf
share/gnome/omf/window-list/window-list-it.omf
share/gnome/omf/window-list/window-list-uk.omf
share/gnome/omf/workspace-switcher/workspace-switcher-C.omf
share/gnome/omf/workspace-switcher/workspace-switcher-es.omf
+share/gnome/omf/workspace-switcher/workspace-switcher-fr.omf
share/gnome/omf/workspace-switcher/workspace-switcher-it.omf
share/gnome/omf/workspace-switcher/workspace-switcher-nl.omf
share/gnome/omf/workspace-switcher/workspace-switcher-uk.omf
@@ -297,6 +287,7 @@ 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/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
@@ -305,11 +296,13 @@ share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/bn/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/br/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/de/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/el/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/en_CA/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo
@@ -331,8 +324,10 @@ share/locale/hy/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ky/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/li/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
@@ -378,8 +373,6 @@ 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/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/yi/LC_MESSAGES
@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@@ -394,8 +387,14 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
@dirrmtry share/locale/mr
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
+@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
@dirrm share/gnome/panel/pixmaps
@dirrm share/gnome/panel/glade
@dirrm share/gnome/omf/workspace-switcher
@@ -462,8 +461,6 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/help/fish-applet-2/ko
@dirrm share/gnome/help/fish-applet-2/ja/figures
@dirrm share/gnome/help/fish-applet-2/ja
-@dirrm share/gnome/help/fish-applet-2/fr/figures
-@dirrm share/gnome/help/fish-applet-2/fr
@dirrm share/gnome/help/fish-applet-2/de/figures
@dirrm share/gnome/help/fish-applet-2/de
@dirrm share/gnome/help/fish-applet-2
@@ -471,6 +468,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/help/fish/uk
@dirrm share/gnome/help/fish/it/figures
@dirrm share/gnome/help/fish/it
+@dirrm share/gnome/help/fish/fr/figures
+@dirrm share/gnome/help/fish/fr
@dirrm share/gnome/help/fish/es/figures
@dirrm share/gnome/help/fish/es
@dirrm share/gnome/help/fish/C/figures
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 85c84cc859d..2f16db01e62 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.23 2005/11/03 19:04:24 marcus Exp $
+# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.36 2006/04/13 07:52:40 bland Exp $
#
PORTNAME= gnome-screensaver
-PORTVERSION= 0.0.24
-PORTREVISION= 1
+PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.0
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME screen saver and locker
@@ -22,11 +21,10 @@ RUN_DEPENDS= xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_REINPLACE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomemenus
CONFIGURE_ARGS= --disable-pam \
- --with-gdm-config=${X11BASE}/etc/gdm/gdm.conf \
+ --with-gdm-config=${X11BASE}/etc/gdm/custom.conf \
--with-xscreensaverdir=${XSCREENSAVER_DIR} \
--with-xscreensaverhackdir=${X11BASE}/bin/xscreensaver-hacks
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -41,7 +39,7 @@ XSCREENSAVER_DIR= ${X11BASE}/share/xscreensaver/config
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
-BROKEN= "Does not build on 4.X"
+BROKEN= Does not build on 4.X
.endif
post-patch:
diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo
index 8cc7b9e172f..e61ff6d26ce 100644
--- a/x11/gnome-screensaver/distinfo
+++ b/x11/gnome-screensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-screensaver-0.0.24.tar.bz2) = 767ac5360e7ba1c218cad725b21f78e1
-SHA256 (gnome-screensaver-0.0.24.tar.bz2) = f846cc6a04edbe47f283c0199cfb1e36b61667f8e0698da818d69fa0e71e4b11
-SIZE (gnome-screensaver-0.0.24.tar.bz2) = 1880715
+MD5 (gnome-screensaver-2.14.1.tar.bz2) = 59181612c8a5c8be7f0a392baba5245d
+SHA256 (gnome-screensaver-2.14.1.tar.bz2) = a29fb020d036a430f5975c07fb058df32b8ed36d9709239c54ce3493941cb95d
+SIZE (gnome-screensaver-2.14.1.tar.bz2) = 1913984
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index b28466983a8..48be81fe646 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -2,6 +2,7 @@ bin/gnome-screensaver
bin/gnome-screensaver-command
bin/gnome-screensaver-preferences
etc/xdg/menus/gnome-screensavers.menu
+libdata/pkgconfig/gnome-screensaver.pc
libexec/gnome-screensaver-dialog
libexec/gnome-screensaver/floaters
libexec/gnome-screensaver/popsquares
@@ -24,26 +25,40 @@ share/gnome/pixmaps/backgrounds/cosmos/sombrero.jpg
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/ca/LC_MESSAGES/gnome-screensaver.mo
share/locale/cs/LC_MESSAGES/gnome-screensaver.mo
+share/locale/cy/LC_MESSAGES/gnome-screensaver.mo
+share/locale/da/LC_MESSAGES/gnome-screensaver.mo
share/locale/de/LC_MESSAGES/gnome-screensaver.mo
+share/locale/dz/LC_MESSAGES/gnome-screensaver.mo
+share/locale/el/LC_MESSAGES/gnome-screensaver.mo
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/fi/LC_MESSAGES/gnome-screensaver.mo
share/locale/fr/LC_MESSAGES/gnome-screensaver.mo
share/locale/gl/LC_MESSAGES/gnome-screensaver.mo
share/locale/gu/LC_MESSAGES/gnome-screensaver.mo
+share/locale/hi/LC_MESSAGES/gnome-screensaver.mo
share/locale/hu/LC_MESSAGES/gnome-screensaver.mo
share/locale/it/LC_MESSAGES/gnome-screensaver.mo
share/locale/ja/LC_MESSAGES/gnome-screensaver.mo
+share/locale/ka/LC_MESSAGES/gnome-screensaver.mo
+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/mk/LC_MESSAGES/gnome-screensaver.mo
share/locale/nb/LC_MESSAGES/gnome-screensaver.mo
share/locale/nl/LC_MESSAGES/gnome-screensaver.mo
share/locale/no/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/sk/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
@@ -51,7 +66,10 @@ share/locale/th/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 libexec/gnome-screensaver
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 13ebb139a86..fcdee9b27fe 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,17 +3,17 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomesession/Makefile,v 1.67 2005/10/31 19:46:29 adamw Exp $
+# $MCom: ports/x11/gnomesession/Makefile,v 1.83 2006/04/24 03:18:23 marcus Exp $
#
PORTNAME= gnomesession
-PORTVERSION= 2.12.0
-PORTREVISION= 1
+PORTVERSION= 2.14.1
+PORTREVISION= 2
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/gnome-session/2.12 \
+MASTER_SITE_SUBDIR= sources/gnome-session/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
adamw/:local
DISTNAME= gnome-session-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -24,9 +24,11 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Session component for the GNOME 2 desktop
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
+USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop
+GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -45,9 +47,9 @@ post-extract:
post-install:
${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \
${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png
- ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \
- ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
-.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png
+# ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \
+# ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
+.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png
${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/${splash} \
${PREFIX}/share/gnome/pixmaps/splash
.endfor
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index e4097a69186..f516a270fc4 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnome2/gnome-session-2.12.0.tar.bz2) = 835e9340d23e139430224b931ff4c597
-SHA256 (gnome2/gnome-session-2.12.0.tar.bz2) = 713d1b56339dd19707edf056e08c2a0659a1430b56b4c12f759cc25f3664bb9b
-SIZE (gnome2/gnome-session-2.12.0.tar.bz2) = 864397
+MD5 (gnome2/gnome-session-2.14.1.tar.bz2) = 0b7a0fa918f7d0565d6487d06fa4489d
+SHA256 (gnome2/gnome-session-2.14.1.tar.bz2) = 5ff345552ed7f71540abbe1753e650c2a5bfad50f1acce958f664bf3a9d7e9c2
+SIZE (gnome2/gnome-session-2.14.1.tar.bz2) = 655320
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
new file mode 100644
index 00000000000..edd18bfec91
--- /dev/null
+++ b/x11/gnome-session/files/patch-dbus
@@ -0,0 +1,429 @@
+--- 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 @@
++/* gsm-dbus.h - Handle the dbus-daemon process.
++ *
++ * Copyright (c) 2006 Julio M. Merino Vidal <jmmv@NetBSD.org>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ */
++
++#ifndef GSM_DBUS_H
++#define GSM_DBUS_H
++
++gboolean gsm_dbus_daemon_start (void);
++void gsm_dbus_daemon_stop (void);
++
++#endif /* GSM_DBUS_H */
+--- gnome-session/gsm-dbus.c.orig Sun Apr 23 23:09:40 2006
++++ gnome-session/gsm-dbus.c Sun Apr 23 23:10:21 2006
+@@ -0,0 +1,360 @@
++/* gsm-dbus.c - Handle the dbus-daemon process.
++ *
++ * Copyright (c) 2006 Julio M. Merino Vidal <jmmv@NetBSD.org>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ */
++
++#if HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include <sys/wait.h>
++
++#include <errno.h>
++#include <fcntl.h>
++#include <limits.h>
++#include <signal.h>
++#include <stdlib.h>
++#include <unistd.h>
++
++#include <glib.h>
++#include <glib/gprintf.h>
++
++#include "gsm-dbus.h"
++
++static pid_t dbus_daemon_pid = 0;
++
++static gboolean have_dbus_daemon (void);
++static gboolean have_running_instance (void);
++static int read_line (int, char *, ssize_t);
++static void start_child (int, int);
++static void start_parent (int, int, pid_t);
++
++/* ---------------------------------------------------------------------
++ * PUBLIC INTERFACE
++ * --------------------------------------------------------------------- */
++
++/*
++ * Starts the dbus-daemon if not already running and attaches it to the
++ * current environment by defining DBUS_SESSION_BUS_ADDRESS. Returns
++ * true if we launch a new dbus-daemon so that we know if we have to call
++ * gsm_dbus_daemon_stop later on or not.
++ *
++ * This function can only be called if dbus-daemon is not already running
++ * (i.e., if gnome-session is starting up or if gsm_dbus_daemon_stop was
++ * previously called).
++ */
++gboolean
++gsm_dbus_daemon_start (void)
++{
++ int address_pipe[2];
++ int pid_pipe[2];
++ pid_t tmp_pid;
++
++ g_assert (dbus_daemon_pid == 0);
++
++ if (have_running_instance ())
++ return FALSE;
++ if (! have_dbus_daemon ())
++ return FALSE;
++
++ /*
++ * At this point, dbus-daemon is not running for the current session
++ * and the binary exists. Spawn it.
++ */
++
++ if (pipe (address_pipe) == -1)
++ {
++ g_printerr ("Cannot create address pipe for dbus-daemon\n");
++ return FALSE;
++ }
++
++ if (pipe (pid_pipe) == -1)
++ {
++ close (address_pipe[0]);
++ close (address_pipe[1]);
++ g_printerr ("Cannot create pid pipe for dbus-daemon\n");
++ return FALSE;
++ }
++
++ tmp_pid = fork ();
++ if (tmp_pid == -1)
++ {
++ close (address_pipe[0]);
++ close (address_pipe[1]);
++ close (pid_pipe[0]);
++ close (pid_pipe[1]);
++ g_printerr ("Cannot create child process for dbus-daemon\n");
++ return FALSE;
++ }
++ else if (tmp_pid == 0)
++ {
++ close (address_pipe[0]);
++ close (pid_pipe[0]);
++ start_child (address_pipe[1], pid_pipe[1]);
++ /* NOTREACHED */
++ }
++ else
++ {
++ close (address_pipe[1]);
++ close (pid_pipe[1]);
++ start_parent (address_pipe[0], pid_pipe[0], tmp_pid);
++ }
++
++ g_assert (dbus_daemon_pid != 0);
++ return TRUE;
++}
++
++/*
++ * Stops the running dbus-daemon. Can only be called if we own the process;
++ * i.e., if gsm_dbus_daemon_start returned true.
++ */
++void
++gsm_dbus_daemon_stop (void)
++{
++ g_assert (dbus_daemon_pid != 0);
++
++ if (kill (dbus_daemon_pid, SIGTERM) == -1)
++ g_printerr ("Failed to kill dbus-daemon (pid %d)\n",
++ dbus_daemon_pid);
++ else
++ {
++ dbus_daemon_pid = 0;
++ g_unsetenv ("DBUS_SESSION_BUS_ADDRESS");
++ }
++}
++
++/* ---------------------------------------------------------------------
++ * PRIVATE FUNCTIONS
++ * --------------------------------------------------------------------- */
++
++/*
++ * Check whether the dbus-daemon binary is in the path and raise an
++ * appropriate error message if it is not.
++ */
++static gboolean
++have_dbus_daemon (void)
++{
++ gboolean result;
++ gchar *file_name;
++
++ file_name = g_find_program_in_path ("dbus-daemon");
++ if (file_name == NULL)
++ g_printerr ("Cannot locate dbus-daemon\n");
++ result = file_name != NULL;
++ g_free (file_name);
++
++ return result;
++}
++
++/*
++ * Check whether there is a dbus-daemon session instance currently running
++ * (not spawned by us). If there is, do nothing and return TRUE.
++ */
++static gboolean
++have_running_instance (void)
++{
++ const gchar *address_str;
++
++ g_assert (dbus_daemon_pid == 0);
++
++ address_str = g_getenv ("DBUS_SESSION_BUS_ADDRESS");
++ return address_str != NULL;
++}
++
++/*
++ * Reads a single line from the given file descriptor and stores it in the
++ * buffer pointed to by 'buf'.
++ *
++ * After finding the first new line character, the function returns. This
++ * is to avoid reading dbus' pid multiple times from its file descriptor.
++ */
++static int
++read_line (int fd, char *buf, ssize_t bufsize)
++{
++ gboolean discard, done;
++ ssize_t bytes;
++
++ bytes = 0;
++ discard = FALSE;
++ done = FALSE;
++ do
++ {
++ ssize_t i, result;
++
++ result = read (fd, &buf[bytes], bufsize - bytes);
++ if (result < 0)
++ return -1;
++ else if (result > 0 && !discard)
++ {
++ if (bytes + result < bufsize)
++ bytes += result;
++ else
++ bytes = bufsize - 1;
++ }
++ else
++ done = TRUE;
++
++ for (i = 0; !discard && i < bytes; i++)
++ if (buf[i] == '\n')
++ {
++ buf[i] = '\0';
++ discard = TRUE;
++ }
++ }
++ while (!done);
++
++ g_assert (bytes >= 0 && bytes < bufsize);
++ buf[bytes] = '\0';
++
++ return bytes;
++}
++
++/*
++ * Code run by the child process after the fork to launch dbus-demon.
++ *
++ * As the child, this execs dbus-daemon, connecting it to the appropriate
++ * file descriptors.
++ */
++static void
++start_child (int address_fd, int pid_fd)
++{
++ gchar address_str[16];
++ gchar pid_str[16];
++ int fd;
++ long open_max;
++
++ open_max = sysconf (_SC_OPEN_MAX);
++ for (fd = 0; fd < open_max; fd++)
++ {
++ if (fd != STDIN_FILENO && fd != STDOUT_FILENO && fd != STDERR_FILENO &&
++ fd != address_fd && fd != pid_fd)
++ fcntl (fd, F_SETFD, FD_CLOEXEC);
++ }
++
++ g_snprintf (address_str, sizeof (address_str), "%d", address_fd);
++ g_snprintf (pid_str, sizeof (pid_str), "%d", pid_fd);
++
++ execlp ("dbus-daemon",
++ "dbus-daemon",
++ "--fork",
++ "--print-address", address_str,
++ "--print-pid", pid_str,
++ "--session",
++ NULL);
++
++ g_printerr ("Could not launch dbus-daemon\n");
++
++ exit (EXIT_FAILURE);
++}
++
++/*
++ * Code run by the parent process after the fork to launch dbus-demon.
++ *
++ * As the parent, this waits until dbus-daemon forks itself again and
++ * fetches its address and pid to later take its ownership.
++ */
++static void
++start_parent (int address_fd, int pid_fd, pid_t child)
++{
++ char address_str[256];
++ char pid_str[256];
++ char *tmp_ep;
++ int exitstat;
++ unsigned long tmp_num;
++ ssize_t bytes;
++
++ g_assert (child > 0);
++
++ /*
++ * dbus-daemon --fork causes our child process to exit prematurely
++ * because it is not the real daemon. See if it worked correctly
++ * and clean it up to avoid a zombie.
++ *
++ * Life could be much easier if dbus-daemon had a --no-fork flag.
++ * But, as it hasn't it, we cannot assume that it will not fork,
++ * because we have no control over its configuration file.
++ */
++ if (waitpid (child, &exitstat, 0) == -1)
++ {
++ close (address_fd);
++ close (pid_fd);
++
++ g_printerr ("Failed to get dbus-daemon status\n");
++ return;
++ }
++ if (!WIFEXITED (exitstat) || WEXITSTATUS (exitstat) != EXIT_SUCCESS)
++ {
++ close (address_fd);
++ close (pid_fd);
++
++ g_printerr ("dbus-daemon exited unexpectedly\n");
++ return;
++ }
++
++ /*
++ * Fetch dbus-daemon address.
++ */
++ bytes = read_line (address_fd, address_str, sizeof (address_str));
++ if (bytes == -1 || bytes == 0)
++ {
++ close (address_fd);
++ close (pid_fd);
++
++ g_printerr ("Failed to get dbus-daemon's address\n");
++ return;
++ }
++
++ /*
++ * Fetch dbus-daemon pid.
++ */
++ bytes = read_line (pid_fd, pid_str, sizeof (pid_str));
++ if (bytes == -1 || bytes == 0)
++ {
++ close (address_fd);
++ close (pid_fd);
++
++ g_printerr ("Failed to get dbus-daemon's pid\n");
++ return;
++ }
++
++ close (address_fd);
++ close (pid_fd);
++
++ /*
++ * Convert the string printed in pid_fd to a pid value. Do the usual
++ * strtoul dance to check for a valid number.
++ */
++ errno = 0;
++ tmp_num = strtoul(pid_str, &tmp_ep, 10);
++ if (pid_str[0] == '\0' || *tmp_ep != '\0')
++ {
++ g_printerr ("dbus-daemon pid invalid (not a number)\n");
++ return;
++ }
++ if (errno == ERANGE && tmp_num == ULONG_MAX)
++ {
++ g_printerr ("dbus-daemon pid invalid (out of range)\n");
++ return;
++ }
++ dbus_daemon_pid = tmp_num;
++
++ /*
++ * All right! Tell our future children about the new born dbus-daemon.
++ */
++ g_setenv ("DBUS_SESSION_BUS_ADDRESS", address_str, TRUE);
++}
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in
index ed0b6ac5686..a80f576a42a 100644
--- a/x11/gnome-session/files/patch-gnome-session_Makefile.in
+++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in
@@ -1,11 +1,37 @@
---- gnome-session/Makefile.in.orig Tue Nov 30 14:07:39 2004
-+++ gnome-session/Makefile.in Tue Nov 30 14:07:51 2004
-@@ -209,7 +209,7 @@
+--- gnome-session/Makefile.in.orig Sun Apr 23 23:01:30 2006
++++ gnome-session/Makefile.in Sun Apr 23 23:06:41 2006
+@@ -67,7 +67,7 @@ am_gnome_session_OBJECTS = manager.$(OBJ
+ remote.$(OBJEXT) logout.$(OBJEXT) splash-widget.$(OBJEXT) \
+ gsm-xrandr.$(OBJEXT) gsm-keyring.$(OBJEXT) gsm-gsd.$(OBJEXT) \
+ gsm-protocol.$(OBJEXT) gsm-remote-desktop.$(OBJEXT) \
+- gsm-sound.$(OBJEXT) gsm-at-startup.$(OBJEXT) \
++ gsm-sound.$(OBJEXT) gsm-at-startup.$(OBJEXT) gsm-dbus.$(OBJEXT) \
+ gsm-multiscreen.$(OBJEXT) gsm-typebuiltins.$(OBJEXT) \
+ gdm-logout-action.$(OBJEXT) util.$(OBJEXT) $(am__objects_1)
+ gnome_session_OBJECTS = $(am_gnome_session_OBJECTS)
+@@ -310,7 +310,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
target_alias = @target_alias@
NULL =
-
-defaultdir = $(datadir)/gnome
+defaultdir = $(datadir)
-
INCLUDES = \
$(GNOME_SESSION_CFLAGS) \
+ $(STANDARD_PROPERTIES_CFLAGS) \
+@@ -386,6 +386,8 @@ gnome_session_SOURCES = \
+ splash-widget.h \
+ gsm-xrandr.c \
+ gsm-xrandr.h \
++ gsm-dbus.c \
++ gsm-dbus.h \
+ gsm-keyring.c \
+ gsm-keyring.h \
+ gsm-gsd.c \
+@@ -610,6 +612,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-sound.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-typebuiltins.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-xrandr.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-dbus.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ice.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logout-test.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logout.Po@am__quote@
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
new file mode 100644
index 00000000000..da4950d05c9
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_gsm-at-startup.c
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 00000000000..8eae88069c5
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_gsm-xrandr.c
@@ -0,0 +1,10 @@
+--- 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 17d898f1ee2..882701bbd50 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -34,6 +34,7 @@ share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo
share/locale/da/LC_MESSAGES/gnome-session-2.0.mo
share/locale/de/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-session-2.0.mo
share/locale/el/LC_MESSAGES/gnome-session-2.0.mo
share/locale/en_CA/LC_MESSAGES/gnome-session-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo
@@ -56,8 +57,10 @@ share/locale/id/LC_MESSAGES/gnome-session-2.0.mo
share/locale/is/LC_MESSAGES/gnome-session-2.0.mo
share/locale/it/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-session-2.0.mo
share/locale/kn/LC_MESSAGES/gnome-session-2.0.mo
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/mi/LC_MESSAGES/gnome-session-2.0.mo
@@ -94,7 +97,14 @@ share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo
share/locale/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
-@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@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
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index c1c5d6bcecd..a8578865b0f 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -3,24 +3,24 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnometerminal/Makefile,v 1.52 2005/10/14 20:39:58 adamw Exp $
+# $MCom: ports/x11/gnometerminal/Makefile,v 1.69 2006/04/13 07:52:41 bland Exp $
#
PORTNAME= gnometerminal
-PORTVERSION= 2.12.0
+PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-terminal/2.12
+MASTER_SITE_SUBDIR= sources/gnome-terminal/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-terminal-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Terminal component for the GNOME 2 Desktop
+USE_GETTEXT= yes
USE_BZIP2= yes
INSTALLS_OMF= yes
USE_X_PREFIX= yes
-USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte
GNU_CONFIGURE= yes
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 951536429cf..73abf3d6655 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-terminal-2.12.0.tar.bz2) = 483c9397dd165845e2528a80e3df6dfc
-SHA256 (gnome2/gnome-terminal-2.12.0.tar.bz2) = e515509f2d07ab1360723b70345ac18b44c5525abc31cce48f135b43fbb444cc
-SIZE (gnome2/gnome-terminal-2.12.0.tar.bz2) = 1684178
+MD5 (gnome2/gnome-terminal-2.14.1.tar.bz2) = 7abe60db5359c88392d2b4f0d5587ef5
+SHA256 (gnome2/gnome-terminal-2.14.1.tar.bz2) = c1e7674bb75343db89ad6769bc2d7ecfb115d9eda02035d374d8c4d952091647
+SIZE (gnome2/gnome-terminal-2.14.1.tar.bz2) = 1783063
diff --git a/x11/gnome-terminal/files/patch-src::terminal-screen.c b/x11/gnome-terminal/files/patch-src::terminal-screen.c
deleted file mode 100644
index 0198f748c37..00000000000
--- a/x11/gnome-terminal/files/patch-src::terminal-screen.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/terminal-screen.c.orig Fri Jul 1 20:37:58 2005
-+++ src/terminal-screen.c Tue Jul 5 13:26:21 2005
-@@ -248,16 +248,16 @@ 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);
-+ "[[:<:]](" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_AS_IS);
-
- terminal_widget_match_add (screen->priv->term,
-- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_DEFAULT_TO_HTTP);
-+ "[[:<:]]<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_DEFAULT_TO_HTTP);
-
- terminal_widget_match_add (screen->priv->term,
-- "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO);
-+ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO);
-
- terminal_widget_match_add (screen->priv->term,
-- "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS);
-+ "[[:<:]]<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS);
-
-
- terminal_screen_setup_dnd (screen);
diff --git a/x11/gnome-terminal/files/patch-src_terminal-screen.c b/x11/gnome-terminal/files/patch-src_terminal-screen.c
new file mode 100644
index 00000000000..0f5c397cbad
--- /dev/null
+++ b/x11/gnome-terminal/files/patch-src_terminal-screen.c
@@ -0,0 +1,33 @@
+--- src/terminal-screen.c.orig Sun Apr 2 18:27:36 2006
++++ src/terminal-screen.c Sun Apr 2 18:42:41 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);
++ "[[:<:]]" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+"
++ "(:[0-9]+)?(" URLPATH ")?[[:>:]]", FLAVOR_AS_IS);
+
+ terminal_widget_match_add (screen->priv->term,
+- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+"
+- "(:[0-9]+)?(" URLPATH ")?\\>",
++ "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+"
++ "(:[0-9]+)?(" URLPATH ")?[[:>:]]",
+ FLAVOR_DEFAULT_TO_HTTP);
+
+ terminal_widget_match_add (screen->priv->term,
+- "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]"
+- "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>",
++ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]"
++ "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]",
+ FLAVOR_EMAIL);
+
+ terminal_widget_match_add (screen->priv->term,
+- "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+"
+- "@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS);
++ "[[:<:]]news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+"
++ "@[" HOSTCHARS ".]+(:[0-9]+)?[[:>:]]", FLAVOR_AS_IS);
+
+ terminal_screen_setup_dnd (screen);
+
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 721f659b8cd..380a52ff47c 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -1,6 +1,5 @@
bin/gnome-terminal
libdata/bonobo/servers/gnome-terminal.server
-share/gnome/application-registry/gnome-terminal.applications
share/gnome/applications/gnome-terminal.desktop
share/gnome/gnome-terminal/glade/gnome-terminal.glade2
share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png
@@ -8,6 +7,11 @@ share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/C/figures/terminal_window.png
share/gnome/help/gnome-terminal/C/gnome-terminal.xml
share/gnome/help/gnome-terminal/C/legal.xml
+share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/bg/figures/terminal_window.png
+share/gnome/help/gnome-terminal/bg/gnome-terminal.xml
+share/gnome/help/gnome-terminal/bg/legal.xml
share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/de/figures/terminal_window.png
@@ -63,6 +67,7 @@ share/gnome/help/gnome-terminal/zh_TW/figures/terminal_window.png
share/gnome/help/gnome-terminal/zh_TW/gnome-terminal.xml
share/gnome/help/gnome-terminal/zh_TW/legal.xml
share/gnome/omf/gnome-terminal/gnome-terminal-C.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-bg.omf
share/gnome/omf/gnome-terminal/gnome-terminal-de.omf
share/gnome/omf/gnome-terminal/gnome-terminal-es.omf
share/gnome/omf/gnome-terminal/gnome-terminal-fr.omf
@@ -82,11 +87,13 @@ 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/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
share/locale/da/LC_MESSAGES/gnome-terminal.mo
share/locale/de/LC_MESSAGES/gnome-terminal.mo
+share/locale/dz/LC_MESSAGES/gnome-terminal.mo
share/locale/el/LC_MESSAGES/gnome-terminal.mo
share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo
share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo
@@ -108,6 +115,7 @@ share/locale/id/LC_MESSAGES/gnome-terminal.mo
share/locale/it/LC_MESSAGES/gnome-terminal.mo
share/locale/ja/LC_MESSAGES/gnome-terminal.mo
share/locale/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/mk/LC_MESSAGES/gnome-terminal.mo
@@ -141,6 +149,12 @@ 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_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
@@ -164,6 +178,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
@dirrm share/gnome/help/gnome-terminal/es
@dirrm share/gnome/help/gnome-terminal/de/figures
@dirrm share/gnome/help/gnome-terminal/de
+@dirrm share/gnome/help/gnome-terminal/bg/figures
+@dirrm share/gnome/help/gnome-terminal/bg
@dirrm share/gnome/help/gnome-terminal/C/figures
@dirrm share/gnome/help/gnome-terminal/C
@dirrm share/gnome/help/gnome-terminal
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index 5373d3d287f..ec6c42772c6 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.73 2005/08/26 03:21:23 marcus Exp $
+# $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.77 2006/02/03 05:53:28 marcus Exp $
#
PORTREVISION= 0
@@ -34,8 +34,7 @@ RUN_DEPENDS= pan:${PORTSDIR}/news/pan2 \
nautilus-sendto:${PORTSDIR}/deskutils/nautilus-sendto \
goobox:${PORTSDIR}/audio/goobox \
inkscape:${PORTSDIR}/graphics/inkscape \
- gpdf:${PORTSDIR}/graphics/gpdf \
- ggv:${PORTSDIR}/print/ggv
+ atomix:${PORTSDIR}/games/atomix
MASTERDIR= ${.CURDIR}/../gnome2
GNOME_SLAVE= yes
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index dab054657c5..906590c8b62 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome2-lite/Makefile,v 1.43 2005/09/25 23:58:48 marcus Exp $
+# $MCom: ports/x11/gnome2-lite/Makefile,v 1.45 2005/11/17 23:20:32 marcus Exp $
#
PORTREVISION= 0
diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile
index f9cafff37b7..313ad12b015 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.62 2005/10/06 01:26:06 marcus Exp $
+# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.69 2006/04/24 02:51:14 mezz Exp $
#
PORTREVISION= 0
@@ -12,7 +12,7 @@ PKGNAMESUFFIX= -power-tools
COMMENT= "Geektoys" for the GNOME 2 power user
-RUN_DEPENDS= ${X11BASE}/lib/epiphany/1.8/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
+RUN_DEPENDS= ${X11BASE}/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}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \
@@ -23,13 +23,11 @@ RUN_DEPENDS= ${X11BASE}/lib/epiphany/1.8/extensions/libgesturesextension.so:${PO
gnomesu:${PORTSDIR}/security/libgnomesu \
bpm:${PORTSDIR}/sysutils/bpm \
gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \
- gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor \
serpentine:${PORTSDIR}/sysutils/serpentine \
devilspie:${PORTSDIR}/x11-wm/devilspie \
${X11BASE}/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 \
- ${X11BASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \
brightside:${PORTSDIR}/x11/brightside \
evolution-gconf-filter-exchange:${PORTSDIR}/devel/evolution-gconf-tools \
${X11BASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 31394fc417a..ace0debec7d 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome2/Makefile,v 1.122 2005/10/06 01:26:06 marcus Exp $
+# $MCom: ports/x11/gnome2/Makefile,v 1.142 2006/04/23 20:10:22 marcus Exp $
#
PORTNAME= gnome2
-PORTVERSION= 2.12.3
+PORTVERSION= 2.14.1
PORTREVISION?= 0
CATEGORIES?= x11 gnome
MASTER_SITES= # empty
@@ -45,21 +45,23 @@ RUN_DEPENDS?= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2
gnopernicus:${PORTSDIR}/accessibility/gnopernicus \
${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnomenetstatus \
dasher:${PORTSDIR}/accessibility/dasher \
- evolution-2.4:${PORTSDIR}/mail/evolution \
+ evolution-2.6:${PORTSDIR}/mail/evolution \
${X11BASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \
network-admin:${PORTSDIR}/sysutils/gnomesystemtools \
gnome-nettool:${PORTSDIR}/net/gnomenettool \
vino-session:${PORTSDIR}/net/vino \
- ximian-connector-setup-2.4:${PORTSDIR}/mail/evolution-exchange \
- ${X11BASE}/lib/gstreamer-0.8/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \
- ${X11BASE}/lib/gstreamer-0.8/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \
+ 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 \
totem:${PORTSDIR}/multimedia/totem-gstreamer \
gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
${X11BASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
sound-juicer:${PORTSDIR}/audio/sound-juicer \
gnome-keyring-manager:${PORTSDIR}/security/gnomekeyringmanager \
${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \
- evince:${PORTSDIR}/graphics/evince
+ 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
NO_BUILD= yes
@@ -73,7 +75,7 @@ pre-configure:
.endif
.if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite"
-OPTIONS= GNOME_SCREENSAVER "Use gnome-screensaver as screensaver app" off
+OPTIONS= XSCREENSAVER "Use xscreensaver as screen saver app" off
.endif
do-install: # empty
@@ -84,10 +86,15 @@ do-install: # empty
.if ${ARCH} == "i386" || ${OSVERSION} > 500035
RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany
.endif
+.if ${.CURDIR:T}!="gnome2-lite"
+.if ${ARCH}!="sparc64" || ${OSVERSION} >= 700003
+RUN_DEPENDS+= ekiga:${PORTSDIR}/net/ekiga
+.endif
+.endif
.endif
.if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite"
-.if !defined(WITH_GNOME_SCREENSAVER)
+.if defined(WITH_XSCREENSAVER)
RUN_DEPENDS+= ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
.else
RUN_DEPENDS+= gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index e2b745126db..4e6cd0755f3 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -3,14 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.94 2005/10/08 19:41:40 marcus Exp $
+# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.111 2006/04/13 07:52:40 bland Exp $
#
PORTNAME= gnomeapplets2
-PORTVERSION= 2.12.3
+PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-applets/2.12
+MASTER_SITE_SUBDIR= sources/gnome-applets/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-applets-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -18,28 +18,30 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Applets components for the Gnome 2 Desktop Environment
BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-system-tools.pc:${PORTSDIR}/sysutils/gnomesystemtools
-LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2 \
+LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop2 \
xklavier.10:${PORTSDIR}/x11/libxklavier \
gucharmap.4:${PORTSDIR}/deskutils/gucharmap
RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnomesystemtools
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
+INSTALLS_SHLIB= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \
gail gnomedocutils
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
+CONFIGURE_ARGS= --with-gstreamer=0.10
+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 \
- mini-commander-global.schemas mini-commander.schemas \
mixer.schemas multiload.schemas \
stickynotes.schemas
@@ -47,6 +49,11 @@ FREEBSD_SYS?= /usr/src/sys
.include <bsd.port.pre.mk>
+.if exists(${LOCALBASE}/libdata/pkgconfig/libnotify.pc) || \
+ defined(WITH_LIBNOTIFY)
+LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify
+.endif
+
.if ${ARCH} != "i386" && ${ARCH} != "amd64"
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC"
PLIST_SUB= BATTERY="@comment "
@@ -62,4 +69,8 @@ PLIST_SUB+= CPUFREQ=""
GCONF_SCHEMAS+= cpufreq-applet.schemas
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
+ ${WRKSRC}/libgweather/weather-met.c
+
.include <bsd.port.post.mk>
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index b84b0032da1..6236e73545a 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.12.3.tar.bz2) = 39987d3e8726e58a6a72047ada05e25d
-SHA256 (gnome2/gnome-applets-2.12.3.tar.bz2) = a994896e9cb5b0527616ac7713cfbc3c5c24d03c18c4b4463ec8db442619f946
-SIZE (gnome2/gnome-applets-2.12.3.tar.bz2) = 5515981
+MD5 (gnome2/gnome-applets-2.14.1.tar.bz2) = 1b5e834450812a6a3e7ab00652587ef4
+SHA256 (gnome2/gnome-applets-2.14.1.tar.bz2) = d8bf2dcebbe632c13f3268e6903640561be89a95cc8a8868453ca6600e962db9
+SIZE (gnome2/gnome-applets-2.14.1.tar.bz2) = 6608312
diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa
index 48b84e4569f..a5233ffe0e9 100644
--- a/x11/gnomeapplets2/files/patch-aa
+++ b/x11/gnomeapplets2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Sat Jul 16 12:55:48 2005
-+++ configure Sat Jul 16 13:04:33 2005
-@@ -23272,8 +23272,7 @@
+--- configure.orig Sun Feb 12 14:11:21 2006
++++ configure Sun Feb 12 14:12:00 2006
+@@ -23361,8 +23361,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -10,44 +10,35 @@
GNOMELOCALEDIR="$ac_define_dir"
-@@ -25126,7 +25125,7 @@
+@@ -25392,7 +25391,7 @@
;;
# list of supported OS cores that do not use libapm
-- i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
-+ i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
+- i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
++ i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
if -n "${OS_SYS}" ; then
ACPIINC="-I${OS_SYS}"
else
-@@ -25406,7 +25405,7 @@
- APPLET_MIXER_FALSE=
- fi
-
--if test x"$P_MIXER" == x"mixer"; then
-+if test x"$P_MIXER" = x"mixer"; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-@@ -25983,7 +25982,7 @@
+@@ -26469,7 +26468,7 @@
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;}
+ { echo "$as_me:$LINENO: WARNING: *** modemlights applet will not be built ***" >&5
+ echo "$as_me: WARNING: *** modemlights applet will not be built ***" >&2;}
else
-@@ -26119,6 +26118,9 @@
- echo "${ECHO_T}yes" >&6
+@@ -26633,6 +26632,9 @@
+ *linux*)
build_cpufreq_applet=yes
;;
+ i386-*-freebsd*|amd64-*-freebsd*)
+ build_cpufreq_applet=yes
+ ;;
*)
- echo "warning: ${host} is not supported by cpufreq applet, not building" >&2
- build_cpufreq_applet=no
-@@ -26409,7 +26411,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 @@
ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
@@ -56,7 +47,7 @@
pixmapsdir="${datadir}/pixmaps"
-@@ -26423,8 +26425,7 @@
+@@ -27123,8 +27125,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -66,7 +57,7 @@
GNOME_ICONDIR="$ac_define_dir"
-@@ -26436,8 +26437,7 @@
+@@ -27136,8 +27137,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -76,7 +67,7 @@
GNOME_PIXMAPSDIR="$ac_define_dir"
-@@ -26449,8 +26449,7 @@
+@@ -27149,8 +27149,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -86,7 +77,7 @@
GNOME_GLADEDIR="$ac_define_dir"
-@@ -26462,8 +26461,7 @@
+@@ -27162,8 +27161,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -96,7 +87,7 @@
DATADIR="$ac_define_dir"
-@@ -26475,8 +26473,7 @@
+@@ -27175,8 +27173,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -106,7 +97,7 @@
SYSCONFDIR="$ac_define_dir"
-@@ -26488,8 +26485,7 @@
+@@ -27188,8 +27185,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -116,7 +107,7 @@
LIBDIR="$ac_define_dir"
-@@ -26501,8 +26497,7 @@
+@@ -27201,8 +27197,7 @@
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
diff --git a/x11/gnomeapplets2/files/patch-drivemount_drive-button.c b/x11/gnomeapplets2/files/patch-drivemount_drive-button.c
deleted file mode 100644
index f26e3121ee4..00000000000
--- a/x11/gnomeapplets2/files/patch-drivemount_drive-button.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- drivemount/drive-button.c.orig Tue Aug 23 05:16:27 2005
-+++ drivemount/drive-button.c Tue Aug 23 20:37:43 2005
-@@ -24,6 +24,7 @@
- # include <config.h>
- #endif
-
-+#include <string.h>
- #include "drive-button.h"
- #include <glib/gi18n.h>
- #include <gdk/gdkkeysyms.h>
-@@ -710,11 +711,13 @@ run_command (DriveButton *self, const ch
-
- GList *volumes;
- GnomeVFSVolume *volume;
-+ char *uri;
-+ char *mount_path;
-
- volumes = gnome_vfs_drive_get_mounted_volumes (self->drive);
- volume = GNOME_VFS_VOLUME (volumes->data);
-- char *uri = gnome_vfs_volume_get_activation_uri (volume);
-- char *mount_path = gnome_vfs_get_local_path_from_uri (uri);
-+ uri = gnome_vfs_volume_get_activation_uri (volume);
-+ mount_path = gnome_vfs_get_local_path_from_uri (uri);
- g_free (uri);
-
- gnome_vfs_drive_get_display_name (self->drive);
-@@ -794,6 +797,11 @@ drive_button_ensure_popup (DriveButton *
- char *display_name, *tmp, *label;
- int action;
- GtkWidget *item;
-+ GList *volumes;
-+ GnomeVFSVolume *volume = NULL;
-+ GnomeVFSDeviceType volume_type;
-+ GCallback callback;
-+ const char *action_icon = GTK_STOCK_OPEN;
-
- if (self->popup_menu) return;
-
-@@ -869,8 +877,7 @@ drive_button_ensure_popup (DriveButton *
- g_free (display_name);
- display_name = tmp;
-
-- GCallback callback = G_CALLBACK (open_drive);
-- const char *action_icon = GTK_STOCK_OPEN;
-+ callback = G_CALLBACK (open_drive);
-
- switch (device_type) {
- case GNOME_VFS_DEVICE_TYPE_VIDEO_DVD:
diff --git a/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c b/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c
deleted file mode 100644
index 5abf18032f0..00000000000
--- a/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- gswitchit/gswitchit-applet.c.orig Sun Aug 7 18:07:33 2005
-+++ gswitchit/gswitchit-applet.c Sun Aug 7 18:10:07 2005
-@@ -331,6 +331,10 @@ GSwitchItAppletPrepareDrawing (GSwitchIt
- XklConfigItem configItem;
- GtkWidget *align, *label;
- static GHashTable *shortDescrs = NULL;
-+ gpointer pcounter = NULL;
-+ char *prevLayoutName = NULL;
-+ char *labelTitle = NULL;
-+ int counter = 0;
- if (group == 0)
- shortDescrs = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free, NULL);
-@@ -363,10 +367,6 @@ GSwitchItAppletPrepareDrawing (GSwitchIt
- if (layoutName == NULL)
- layoutName = g_strdup ("?");
-
-- gpointer pcounter = NULL;
-- char *prevLayoutName = NULL;
-- char *labelTitle = NULL;
-- int counter = 0;
- if (g_hash_table_lookup_extended (shortDescrs, layoutName,
- (gpointer*)&prevLayoutName, &pcounter))
- {
-@@ -599,6 +599,13 @@ GSwitchItAppletCmdPreview (BonoboUICompo
- groupsLevels, groupsLevels + 1, groupsLevels + 2, groupsLevels + 3 };
- XklState *xklState = XklGetCurrentState ();
- gpointer p = g_hash_table_lookup (globals.previewDialogs, GINT_TO_POINTER (xklState->group));
-+#ifdef HAVE_XKB
-+ GladeXML *gladeData;
-+ GtkWidget *dialog;
-+ GtkWidget *kbdraw;
-+ XkbComponentNamesRec componentNames;
-+ XklConfigRec xklData;
-+#endif
- if (p != NULL)
- {
- /* existing window */
-@@ -606,11 +613,10 @@ GSwitchItAppletCmdPreview (BonoboUICompo
- return;
- }
- #ifdef HAVE_XKB
-- GladeXML *gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL);
-- GtkWidget *dialog =
-+ gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL);
-+ dialog =
- glade_xml_get_widget (gladeData, "gswitchit_layout_view");
-- GtkWidget *kbdraw = keyboard_drawing_new ();
-- XkbComponentNamesRec componentNames;
-+ kbdraw = keyboard_drawing_new ();
-
- if (xklState->group >= 0 &&
- xklState->group < g_slist_length (globals.groupNames))
-@@ -624,7 +630,6 @@ GSwitchItAppletCmdPreview (BonoboUICompo
-
- keyboard_drawing_set_groups_levels (KEYBOARD_DRAWING (kbdraw), pGroupsLevels);
-
-- XklConfigRec xklData;
- XklConfigRecInit (&xklData);
- if (XklConfigGetFromServer (&xklData))
- {
diff --git a/x11/gnomeapplets2/files/patch-gweather_weather-iwin.c b/x11/gnomeapplets2/files/patch-gweather_weather-iwin.c
deleted file mode 100644
index 14c0190b2ee..00000000000
--- a/x11/gnomeapplets2/files/patch-gweather_weather-iwin.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- gweather/weather-iwin.c.orig Tue Dec 21 18:42:38 2004
-+++ gweather/weather-iwin.c Tue Dec 21 18:42:47 2004
-@@ -1,5 +1,6 @@
- /* $Id: patch-gweather_weather-iwin.c,v 1.1 2004/12/22 00:06:21 marcus Exp $ */
-
-+#include <sys/types.h>
- #include <regex.h>
- #include <gnome.h>
- #include "weather.h"
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index 964c3e8c541..42368d3b5a5 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -3,6 +3,13 @@ bin/gswitchit-plugins-capplet
%%BATTERY%%etc/sound/events/battstat_applet.soundlist
include/libgswitchit/gswitchit_config.h
include/libgswitchit/gswitchit_plugin.h
+include/libgweather/gweather-gconf.h
+include/libgweather/gweather-prefs.h
+include/libgweather/weather.h
+lib/libgweather.a
+lib/libgweather.la
+lib/libgweather.so
+lib/libgweather.so.0
libdata/bonobo/servers/GNOME_AccessxStatusApplet.server
%%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server
libdata/bonobo/servers/GNOME_CDPlayerApplet.server
@@ -23,17 +30,16 @@ libdata/bonobo/servers/GNOME_Panel_TrashApplet.server
libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server
libdata/bonobo/servers/GNOME_StickyNotesApplet.server
libdata/pkgconfig/gswitchit.pc
+libdata/pkgconfig/gweather.pc
libexec/accessx-status-applet
%%BATTERY%%libexec/battstat-applet-2
libexec/charpick_applet2
%%CPUFREQ%%libexec/cpufreq-applet
libexec/drivemount_applet2
libexec/geyes_applet2
-libexec/gnome-applets/mc-install-default-macros
libexec/gnome-keyboard-applet
libexec/gtik2_applet2
libexec/gweather-applet-2
-libexec/mini_commander_applet
libexec/mixer_applet2
libexec/modem_applet
libexec/multiload-applet-2
@@ -49,7 +55,6 @@ 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
-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
@@ -74,7 +79,6 @@ share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png
%%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade
share/gnome/gnome-applets/glade/gswitchit-plugins.glade
share/gnome/gnome-applets/glade/gswitchit.glade
-share/gnome/gnome-applets/glade/mini-commander.glade
share/gnome/gnome-applets/glade/modemlights.glade
share/gnome/gnome-applets/glade/stickynotes.glade
share/gnome/gnome-applets/glade/trashapplet.glade
@@ -93,6 +97,18 @@ share/gnome/help/accessx-status/C/figures/accessx_sticky-meta-key.png
share/gnome/help/accessx-status/C/figures/accessx_sticky-shift-key.png
share/gnome/help/accessx-status/C/figures/accessx_sticky-windows-key.png
share/gnome/help/accessx-status/C/legal.xml
+share/gnome/help/accessx-status/bg/accessx-status.xml
+share/gnome/help/accessx-status/bg/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/bg/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/bg/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/bg/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/bg/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/bg/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/bg/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/bg/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/bg/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/bg/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/bg/figures/accessx_sticky-windows-key.png
share/gnome/help/accessx-status/es/accessx-status.xml
share/gnome/help/accessx-status/es/figures/accessx-status-applet.png
share/gnome/help/accessx-status/es/figures/accessx-status-disabled.png
@@ -148,12 +164,24 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-preferences.png
%%BATTERY%%share/gnome/help/battstat/C/figures/context-menu.png
%%BATTERY%%share/gnome/help/battstat/C/legal.xml
+%%BATTERY%%share/gnome/help/battstat/bg/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/bg/figures/context-menu.png
%%BATTERY%%share/gnome/help/battstat/es/battstat.xml
%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet-expanded.png
%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet.png
%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-credits-hal.png
%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-preferences.png
%%BATTERY%%share/gnome/help/battstat/es/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/fr/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet.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/uk/battstat.xml
%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet-expanded.png
%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet.png
@@ -166,11 +194,21 @@ share/gnome/help/char-palette/C/figures/charpalette_chargroup.png
share/gnome/help/char-palette/C/figures/charpick-preferences.png
share/gnome/help/char-palette/C/figures/charpick_characters.png
share/gnome/help/char-palette/C/legal.xml
+share/gnome/help/char-palette/bg/char-palette.xml
+share/gnome/help/char-palette/bg/figures/charpalette_applet.png
+share/gnome/help/char-palette/bg/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/bg/figures/charpick-preferences.png
+share/gnome/help/char-palette/bg/figures/charpick_characters.png
share/gnome/help/char-palette/es/char-palette.xml
share/gnome/help/char-palette/es/figures/charpalette_applet.png
share/gnome/help/char-palette/es/figures/charpalette_chargroup.png
share/gnome/help/char-palette/es/figures/charpick-preferences.png
share/gnome/help/char-palette/es/figures/charpick_characters.png
+share/gnome/help/char-palette/fr/char-palette.xml
+share/gnome/help/char-palette/fr/figures/charpalette_applet.png
+share/gnome/help/char-palette/fr/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/fr/figures/charpick-preferences.png
+share/gnome/help/char-palette/fr/figures/charpick_characters.png
share/gnome/help/char-palette/it/char-palette.xml
share/gnome/help/char-palette/it/figures/charpalette_applet.png
share/gnome/help/char-palette/it/figures/charpalette_chargroup.png
@@ -191,23 +229,6 @@ share/gnome/help/char-palette/uk/figures/charpalette_applet.png
share/gnome/help/char-palette/uk/figures/charpalette_chargroup.png
share/gnome/help/char-palette/uk/figures/charpick-preferences.png
share/gnome/help/char-palette/uk/figures/charpick_characters.png
-share/gnome/help/command-line/C/command-line.xml
-share/gnome/help/command-line/C/figures/command-line.png
-share/gnome/help/command-line/C/figures/prefs-macros.png
-share/gnome/help/command-line/C/figures/prefs.png
-share/gnome/help/command-line/C/legal.xml
-share/gnome/help/command-line/es/command-line.xml
-share/gnome/help/command-line/es/figures/command-line.png
-share/gnome/help/command-line/es/figures/prefs-macros.png
-share/gnome/help/command-line/es/figures/prefs.png
-share/gnome/help/command-line/pt_BR/command-line.xml
-share/gnome/help/command-line/pt_BR/figures/command-line.png
-share/gnome/help/command-line/pt_BR/figures/prefs-macros.png
-share/gnome/help/command-line/pt_BR/figures/prefs.png
-share/gnome/help/command-line/uk/command-line.xml
-share/gnome/help/command-line/uk/figures/command-line.png
-share/gnome/help/command-line/uk/figures/prefs-macros.png
-share/gnome/help/command-line/uk/figures/prefs.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-100.png
%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-25.png
@@ -229,6 +250,16 @@ share/gnome/help/command-line/uk/figures/prefs.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/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
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-preferences.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/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
@@ -252,6 +283,12 @@ share/gnome/help/drivemount/es/figures/drivemount-applet_example.png
share/gnome/help/drivemount/es/figures/drivemount-applet_mount.png
share/gnome/help/drivemount/es/figures/drivemount-applet_open.png
share/gnome/help/drivemount/es/figures/drivemount-applet_status.png
+share/gnome/help/drivemount/fr/drivemount.xml
+share/gnome/help/drivemount/fr/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/fr/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/fr/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/fr/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/fr/figures/drivemount-applet_status.png
share/gnome/help/drivemount/it/drivemount.xml
share/gnome/help/drivemount/it/figures/drivemount-applet_eject.png
share/gnome/help/drivemount/it/figures/drivemount-applet_example.png
@@ -273,10 +310,16 @@ share/gnome/help/drivemount/uk/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
+share/gnome/help/geyes/bg/figures/geyes_applet.png
+share/gnome/help/geyes/bg/geyes.xml
share/gnome/help/geyes/es/figures/geyes_applet.png
share/gnome/help/geyes/es/geyes.xml
+share/gnome/help/geyes/fr/figures/geyes_applet.png
+share/gnome/help/geyes/fr/geyes.xml
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/uk/figures/geyes_applet.png
share/gnome/help/geyes/uk/geyes.xml
share/gnome/help/gswitchit/C/gswitchit.xml
@@ -289,6 +332,8 @@ 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
@@ -322,6 +367,36 @@ share/gnome/help/gweather/es/figures/stock_weather-snow.png
share/gnome/help/gweather/es/figures/stock_weather-storm.png
share/gnome/help/gweather/es/figures/stock_weather-sunny.png
share/gnome/help/gweather/es/gweather.xml
+share/gnome/help/gweather/fr/figures/gweather-details.png
+share/gnome/help/gweather/fr/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/fr/figures/gweather-prefs-general.png
+share/gnome/help/gweather/fr/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/fr/figures/gweather_applet.png
+share/gnome/help/gweather/fr/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/fr/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/fr/figures/stock_weather-fog.png
+share/gnome/help/gweather/fr/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/fr/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/fr/figures/stock_weather-showers.png
+share/gnome/help/gweather/fr/figures/stock_weather-snow.png
+share/gnome/help/gweather/fr/figures/stock_weather-storm.png
+share/gnome/help/gweather/fr/figures/stock_weather-sunny.png
+share/gnome/help/gweather/fr/gweather.xml
+share/gnome/help/gweather/nl/figures/gweather-details.png
+share/gnome/help/gweather/nl/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/nl/figures/gweather-prefs-general.png
+share/gnome/help/gweather/nl/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/nl/figures/gweather_applet.png
+share/gnome/help/gweather/nl/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/nl/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/nl/figures/stock_weather-fog.png
+share/gnome/help/gweather/nl/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/nl/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/nl/figures/stock_weather-showers.png
+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/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
@@ -342,6 +417,10 @@ share/gnome/help/mixer_applet2/C/legal.xml
share/gnome/help/mixer_applet2/C/mixer_applet2.xml
share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/es/mixer_applet2.xml
+share/gnome/help/mixer_applet2/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/uk/figures/volumecontrol_applet.png
share/gnome/help/mixer_applet2/uk/mixer_applet2.xml
share/gnome/help/multiload/C/figures/multiload-preferences.png
@@ -353,6 +432,10 @@ share/gnome/help/multiload/es/figures/multiload-preferences.png
share/gnome/help/multiload/es/figures/system-monitor-applet_window.png
share/gnome/help/multiload/es/figures/system_monitor.png
share/gnome/help/multiload/es/multiload.xml
+share/gnome/help/multiload/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/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
@@ -370,6 +453,12 @@ share/gnome/help/stickynotes_applet/es/figures/stickynotes-note-prefs.png
share/gnome/help/stickynotes_applet/es/figures/stickynotes-prefs.png
share/gnome/help/stickynotes_applet/es/figures/stickynotes_applet.png
share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/fr/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/fr/figures/stickynote-right-menu-new.png
+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/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
@@ -385,39 +474,49 @@ share/gnome/help/trashapplet/fr/figures/trash-applet.png
share/gnome/help/trashapplet/fr/trashapplet.xml
share/gnome/help/trashapplet/it/figures/trash-applet.png
share/gnome/help/trashapplet/it/trashapplet.xml
+share/gnome/help/trashapplet/nl/figures/trash-applet.png
+share/gnome/help/trashapplet/nl/trashapplet.xml
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/uk/figures/trash-applet.png
share/gnome/help/trashapplet/uk/trashapplet.xml
share/gnome/omf/accessx-status/accessx-status-C.omf
+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-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-uk.omf
share/gnome/omf/char-palette/char-palette-C.omf
+share/gnome/omf/char-palette/char-palette-bg.omf
share/gnome/omf/char-palette/char-palette-es.omf
+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-uk.omf
-share/gnome/omf/command-line/command-line-C.omf
-share/gnome/omf/command-line/command-line-es.omf
-share/gnome/omf/command-line/command-line-pt_BR.omf
-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-nl.omf
%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.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-uk.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-uk.omf
share/gnome/omf/gswitchit/gswitchit-C.omf
share/gnome/omf/gswitchit/gswitchit-es.omf
@@ -425,24 +524,33 @@ share/gnome/omf/gswitchit/gswitchit-fr.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-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-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-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-uk.omf
share/gnome/omf/trashapplet/trashapplet-C.omf
share/gnome/omf/trashapplet/trashapplet-es.omf
share/gnome/omf/trashapplet/trashapplet-fr.omf
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-uk.omf
share/gnome/pixmaps/accessx-status-applet/ax-applet.png
share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png
@@ -583,7 +691,6 @@ 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
-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
@@ -600,6 +707,7 @@ share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/da/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/de/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-applets-2.0.mo
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
@@ -621,7 +729,10 @@ share/locale/id/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
+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/mk/LC_MESSAGES/gnome-applets-2.0.mo
@@ -655,19 +766,28 @@ share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo
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
-@unexec /bin/rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/xh 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/te/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/te 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/hy 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 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
+@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/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrm share/gnome/pixmaps/stickynotes
%%CPUFREQ%%@dirrm share/gnome/pixmaps/cpufreq-applet
@dirrm share/gnome/pixmaps/accessx-status-applet
@@ -681,18 +801,21 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/omf/geyes
@dirrm share/gnome/omf/drivemount
%%CPUFREQ%%@dirrm share/gnome/omf/cpufreq-applet
-@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/ru/figures
+@dirrm share/gnome/help/trashapplet/ru
@dirrm share/gnome/help/trashapplet/pa/figures
@dirrm share/gnome/help/trashapplet/pa
-@dirrm share/gnome/help/trashapplet/fr/figures
-@dirrm share/gnome/help/trashapplet/fr
+@dirrm share/gnome/help/trashapplet/nl/figures
+@dirrm share/gnome/help/trashapplet/nl
@dirrm share/gnome/help/trashapplet/it/figures
@dirrm share/gnome/help/trashapplet/it
+@dirrm share/gnome/help/trashapplet/fr/figures
+@dirrm share/gnome/help/trashapplet/fr
@dirrm share/gnome/help/trashapplet/es/figures
@dirrm share/gnome/help/trashapplet/es
@dirrm share/gnome/help/trashapplet/C/figures
@@ -700,6 +823,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/fr/figures
+@dirrm share/gnome/help/stickynotes_applet/fr
@dirrm share/gnome/help/stickynotes_applet/es/figures
@dirrm share/gnome/help/stickynotes_applet/es
@dirrm share/gnome/help/stickynotes_applet/C/figures
@@ -707,6 +832,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/fr/figures
+@dirrm share/gnome/help/multiload/fr
@dirrm share/gnome/help/multiload/es/figures
@dirrm share/gnome/help/multiload/es
@dirrm share/gnome/help/multiload/C/figures
@@ -714,6 +841,10 @@ 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/it/figures
+@dirrm share/gnome/help/mixer_applet2/it
+@dirrm share/gnome/help/mixer_applet2/fr/figures
+@dirrm share/gnome/help/mixer_applet2/fr
@dirrm share/gnome/help/mixer_applet2/es/figures
@dirrm share/gnome/help/mixer_applet2/es
@dirrm share/gnome/help/mixer_applet2/C/figures
@@ -721,6 +852,10 @@ 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/nl/figures
+@dirrm share/gnome/help/gweather/nl
+@dirrm share/gnome/help/gweather/fr/figures
+@dirrm share/gnome/help/gweather/fr
@dirrm share/gnome/help/gweather/es/figures
@dirrm share/gnome/help/gweather/es
@dirrm share/gnome/help/gweather/C/figures
@@ -728,6 +863,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@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
@@ -740,10 +877,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/gswitchit
@dirrm share/gnome/help/geyes/uk/figures
@dirrm share/gnome/help/geyes/uk
+@dirrm share/gnome/help/geyes/ru/figures
+@dirrm share/gnome/help/geyes/ru
@dirrm share/gnome/help/geyes/it/figures
@dirrm share/gnome/help/geyes/it
+@dirrm share/gnome/help/geyes/fr/figures
+@dirrm share/gnome/help/geyes/fr
@dirrm share/gnome/help/geyes/es/figures
@dirrm share/gnome/help/geyes/es
+@dirrm share/gnome/help/geyes/bg/figures
+@dirrm share/gnome/help/geyes/bg
@dirrm share/gnome/help/geyes/C/figures
@dirrm share/gnome/help/geyes/C
@dirrm share/gnome/help/geyes
@@ -753,6 +896,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/drivemount/pa
@dirrm share/gnome/help/drivemount/it/figures
@dirrm share/gnome/help/drivemount/it
+@dirrm share/gnome/help/drivemount/fr/figures
+@dirrm share/gnome/help/drivemount/fr
@dirrm share/gnome/help/drivemount/es/figures
@dirrm share/gnome/help/drivemount/es
@dirrm share/gnome/help/drivemount/C/figures
@@ -760,20 +905,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/drivemount
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl
%%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
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C
%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet
-@dirrm share/gnome/help/command-line/uk/figures
-@dirrm share/gnome/help/command-line/uk
-@dirrm share/gnome/help/command-line/pt_BR/figures
-@dirrm share/gnome/help/command-line/pt_BR
-@dirrm share/gnome/help/command-line/es/figures
-@dirrm share/gnome/help/command-line/es
-@dirrm share/gnome/help/command-line/C/figures
-@dirrm share/gnome/help/command-line/C
-@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/pt_BR/figures
@@ -782,15 +920,23 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/char-palette/nl
@dirrm share/gnome/help/char-palette/it/figures
@dirrm share/gnome/help/char-palette/it
+@dirrm share/gnome/help/char-palette/fr/figures
+@dirrm share/gnome/help/char-palette/fr
@dirrm share/gnome/help/char-palette/es/figures
@dirrm share/gnome/help/char-palette/es
+@dirrm share/gnome/help/char-palette/bg/figures
+@dirrm share/gnome/help/char-palette/bg
@dirrm share/gnome/help/char-palette/C/figures
@dirrm share/gnome/help/char-palette/C
@dirrm share/gnome/help/char-palette
%%BATTERY%%@dirrm share/gnome/help/battstat/uk/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/uk
+%%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/fr
%%BATTERY%%@dirrm share/gnome/help/battstat/es/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/es
+%%BATTERY%%@dirrm share/gnome/help/battstat/bg/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/bg
%%BATTERY%%@dirrm share/gnome/help/battstat/C/figures
%%BATTERY%%@dirrm share/gnome/help/battstat/C
%%BATTERY%%@dirrm share/gnome/help/battstat
@@ -802,6 +948,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/help/accessx-status/fr
@dirrm share/gnome/help/accessx-status/es/figures
@dirrm share/gnome/help/accessx-status/es
+@dirrm share/gnome/help/accessx-status/bg/figures
+@dirrm share/gnome/help/accessx-status/bg
@dirrm share/gnome/help/accessx-status/C/figures
@dirrm share/gnome/help/accessx-status/C
@dirrm share/gnome/help/accessx-status
@@ -814,5 +962,5 @@ 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
-@dirrm libexec/gnome-applets
+@dirrm include/libgweather
@dirrm include/libgswitchit
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index cc11fda744c..f35b0147eb4 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomedesktop/Makefile,v 1.74 2005/10/03 15:18:36 ahze Exp $
+# $MCom: ports/x11/gnomedesktop/Makefile,v 1.90 2006/04/13 07:52:40 bland Exp $
#
PORTNAME= gnomedesktop
-PORTVERSION= 2.12.3
-PORTREVISION= 1
+PORTVERSION= 2.14.1.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-desktop/2.12
+MASTER_SITE_SUBDIR= sources/gnome-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -21,15 +20,15 @@ COMMENT= Additional UI API for GNOME 2
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
-USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \
ltverhack
GNOME_DESKTOP_VERSION=2
+USE_GETTEXT= yes
USE_GMAKE= yes
USE_BISON= yes
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \
--with-kde-datadir=${LOCALBASE}/share
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index cf73ed69cd6..f6ae5c885bd 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-desktop-2.12.3.tar.bz2) = 387efe89249c61e512812568047be654
-SHA256 (gnome2/gnome-desktop-2.12.3.tar.bz2) = 9224155eff36fc4a3e0995adf61407c4cdf023c9efda80c6f857fbfbe27184b9
-SIZE (gnome2/gnome-desktop-2.12.3.tar.bz2) = 1036062
+MD5 (gnome2/gnome-desktop-2.14.1.1.tar.bz2) = f3ffb360681c1dc17d1856f19a59e88f
+SHA256 (gnome2/gnome-desktop-2.14.1.1.tar.bz2) = 82c9de6ca3507dceb347deda069faf3dd22a412d3bf8944618fbb57656815244
+SIZE (gnome2/gnome-desktop-2.14.1.1.tar.bz2) = 1173965
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index ca229e89c00..fd92d45b962 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -7,6 +7,20 @@ lib/libgnome-desktop-2.la
lib/libgnome-desktop-2.so
lib/libgnome-desktop-2.so.2
libdata/pkgconfig/gnome-desktop-2.0.pc
+share/doc/gnome-desktop/GnomeDItemEdit.html
+share/doc/gnome-desktop/GnomeHint.html
+share/doc/gnome-desktop/ch01.html
+share/doc/gnome-desktop/gnome-desktop-GnomeDesktopItem.html
+share/doc/gnome-desktop/gnome-desktop.devhelp
+share/doc/gnome-desktop/gnome-desktop.devhelp2
+share/doc/gnome-desktop/home.png
+share/doc/gnome-desktop/index.html
+share/doc/gnome-desktop/index.sgml
+share/doc/gnome-desktop/intro.html
+share/doc/gnome-desktop/left.png
+share/doc/gnome-desktop/right.png
+share/doc/gnome-desktop/style.css
+share/doc/gnome-desktop/up.png
share/gnome/applications/gnome-about.desktop
share/gnome/gnome-about/gnome-64.png
share/gnome/gnome-about/gnome-version.xml
@@ -21,26 +35,44 @@ share/gnome/gnome-about/headers/header-bg-snow01.png
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/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/uk/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/uk/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/uk/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-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-uk.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-uk.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-uk.omf
share/gnome/pixmaps/apple-green.png
share/gnome/pixmaps/apple-red.png
share/gnome/pixmaps/gnome-aorta.png
@@ -128,6 +160,7 @@ share/locale/cs/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/en_CA/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -150,9 +183,11 @@ share/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-desktop-2.0.mo
+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
@@ -200,24 +235,38 @@ share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
@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/uk
@dirrm share/gnome/help/lgpl/pa
+@dirrm share/gnome/help/lgpl/fr
@dirrm share/gnome/help/lgpl/es
+@dirrm share/gnome/help/gpl/uk
@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/fdl/es
+@dirrm share/gnome/help/gnome-feedback/uk
+@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/fr
+@dirrm share/gnome/help/fdl/es
@dirrm share/gnome/gnome-about/headers
+@dirrm share/doc/gnome-desktop
@dirrm include/gnome-desktop-2.0/libgnomeui
@dirrm include/gnome-desktop-2.0/libgnome
@dirrm include/gnome-desktop-2.0
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 3771e92fc1d..06d7aebc679 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -3,15 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomepanel/Makefile,v 1.109 2005/10/08 19:41:40 marcus Exp $
+# $MCom: ports/x11/gnomepanel/Makefile,v 1.128 2006/04/13 07:52:40 bland Exp $
#
PORTNAME= gnomepanel
-PORTVERSION= 2.12.3
-PORTREVISION= 1
+PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-panel/2.12
+MASTER_SITE_SUBDIR= sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-panel-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -20,18 +19,18 @@ COMMENT= Panel component for the GNOME 2 Desktop
RUN_DEPENDS= gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor
+USE_GETTEXT= yes
USE_BZIP2= yes
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
INSTALLS_ICONS= yes
USE_X_PREFIX= yes
-USE_REINPLACE= yes
USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \
libwnck gnomemenus gnomedocutils ltverhack
WANT_GNOME= yes
GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \
--with-kde-docdir=${LOCALBASE}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -59,8 +58,6 @@ CONFIGURE_ARGS+=--disable-eds
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|evolution.desktop|evolution-2.4.desktop|g' \
- ${WRKSRC}/gnome-panel/panel-default-setup.entries.in
.if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
( ${OSVERSION} < 503101 )
.for po in da.po it.po zh_CN.po zh_TW.po
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index d40395919ba..b8fcfffc8c2 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.12.3.tar.bz2) = 50a27090f7c667536e4bb5b077428853
-SHA256 (gnome2/gnome-panel-2.12.3.tar.bz2) = a819b55a9616954edb4f69587be570e1d9fc1516c7c63b4f7e67d0b7a3994902
-SIZE (gnome2/gnome-panel-2.12.3.tar.bz2) = 2464381
+MD5 (gnome2/gnome-panel-2.14.1.tar.bz2) = 1f5bc59c7c49cf90a797d892ab3ea05f
+SHA256 (gnome2/gnome-panel-2.14.1.tar.bz2) = f7019f6f42ed323edcc5dc865638d7cb65e8c35a1403f67788a58cc8b3f5944e
+SIZE (gnome2/gnome-panel-2.14.1.tar.bz2) = 2539786
diff --git a/x11/gnomepanel/files/patch-applets_clock_clock.c b/x11/gnomepanel/files/patch-applets_clock_clock.c
index ccf5378b135..981e4b4f202 100644
--- a/x11/gnomepanel/files/patch-applets_clock_clock.c
+++ b/x11/gnomepanel/files/patch-applets_clock_clock.c
@@ -1,5 +1,5 @@
---- applets/clock/clock.c.orig Tue Jan 13 11:55:58 2004
-+++ applets/clock/clock.c Wed Jan 14 15:43:39 2004
+--- applets/clock/clock.c.orig Mon Oct 24 02:25:11 2005
++++ applets/clock/clock.c Tue Nov 22 02:47:05 2005
@@ -47,7 +47,9 @@
#include <dirent.h>
#include <string.h>
@@ -10,7 +10,7 @@
#include <panel-applet.h>
#include <panel-applet-gconf.h>
-@@ -539,7 +541,11 @@
+@@ -545,7 +547,11 @@ clock_locale_format (void)
{
const char *am;
diff --git a/x11/gnomepanel/files/patch-gnome-panel_egg-recent-model.c b/x11/gnomepanel/files/patch-gnome-panel_egg-recent-model.c
deleted file mode 100644
index c74812db845..00000000000
--- a/x11/gnomepanel/files/patch-gnome-panel_egg-recent-model.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- gnome-panel/egg-recent-model.c.orig Wed Dec 21 16:58:46 2005
-+++ gnome-panel/egg-recent-model.c Wed Dec 21 16:59:03 2005
-@@ -942,7 +942,7 @@
- static gboolean
- egg_recent_model_lock_file (FILE *file)
- {
--#ifdef F_TLOCK
-+#ifdef HAVE_LOCKF
- int fd;
- gint try = 5;
-
-@@ -980,7 +980,7 @@
- static gboolean
- egg_recent_model_unlock_file (FILE *file)
- {
--#ifdef F_TLOCK
-+#ifdef HAVE_LOCKF
- int fd;
-
- rewind (file);
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index c7b9f1bfac1..855d2c4a37a 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -98,10 +98,6 @@ share/gnome/help/fish-applet-2/de/figures/fish_applet.png
share/gnome/help/fish-applet-2/de/figures/fish_settings.png
share/gnome/help/fish-applet-2/de/fish-applet-2.xml
share/gnome/help/fish-applet-2/de/legal.xml
-share/gnome/help/fish-applet-2/fr/figures/fish_applet.png
-share/gnome/help/fish-applet-2/fr/figures/fish_settings.png
-share/gnome/help/fish-applet-2/fr/fish-applet-2.xml
-share/gnome/help/fish-applet-2/fr/legal.xml
share/gnome/help/fish-applet-2/ja/figures/fish_applet.png
share/gnome/help/fish-applet-2/ja/fish-applet-2.xml
share/gnome/help/fish-applet-2/ja/legal.xml
@@ -127,6 +123,9 @@ share/gnome/help/fish/C/legal.xml
share/gnome/help/fish/es/figures/fish_applet.png
share/gnome/help/fish/es/fish.xml
share/gnome/help/fish/es/legal.xml
+share/gnome/help/fish/fr/figures/fish_applet.png
+share/gnome/help/fish/fr/fish.xml
+share/gnome/help/fish/fr/legal.xml
share/gnome/help/fish/it/figures/fish_applet.png
share/gnome/help/fish/it/fish.xml
share/gnome/help/fish/it/legal.xml
@@ -147,7 +146,6 @@ share/gnome/help/window-list/es/figures/window_list_group_applet.png
share/gnome/help/window-list/es/legal.xml
share/gnome/help/window-list/es/window-list.xml
share/gnome/help/window-list/fr/figures/window_list_applet.png
-share/gnome/help/window-list/fr/figures/window_list_group.png
share/gnome/help/window-list/fr/figures/window_list_group_applet.png
share/gnome/help/window-list/fr/legal.xml
share/gnome/help/window-list/fr/window-list.xml
@@ -194,7 +192,6 @@ share/gnome/help/workspace-switcher/es/figures/workspace_switcher_applet.png
share/gnome/help/workspace-switcher/es/legal.xml
share/gnome/help/workspace-switcher/es/workspace-switcher.xml
share/gnome/help/workspace-switcher/fr/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/fr/figures/workspacelist_applet.png
share/gnome/help/workspace-switcher/fr/legal.xml
share/gnome/help/workspace-switcher/fr/workspace-switcher.xml
share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png
@@ -229,8 +226,8 @@ share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
share/gnome/omf/clock/clock-C.omf
share/gnome/omf/clock/clock-de.omf
share/gnome/omf/clock/clock-es.omf
-share/gnome/omf/clock/clock-it.omf
share/gnome/omf/clock/clock-fr.omf
+share/gnome/omf/clock/clock-it.omf
share/gnome/omf/clock/clock-ja.omf
share/gnome/omf/clock/clock-ko.omf
share/gnome/omf/clock/clock-nl.omf
@@ -242,31 +239,22 @@ share/gnome/omf/clock/clock-zh_CN.omf
share/gnome/omf/clock/clock-zh_TW.omf
share/gnome/omf/fish/fish-C.omf
share/gnome/omf/fish/fish-es.omf
+share/gnome/omf/fish/fish-fr.omf
share/gnome/omf/fish/fish-it.omf
share/gnome/omf/fish/fish-uk.omf
-share/gnome/omf/gnome-panel/clock-de.omf
-share/gnome/omf/gnome-panel/clock-fr.omf
-share/gnome/omf/gnome-panel/clock-ja.omf
-share/gnome/omf/gnome-panel/clock-ko.omf
-share/gnome/omf/gnome-panel/clock-sv.omf
-share/gnome/omf/gnome-panel/clock-zh_CN.omf
-share/gnome/omf/gnome-panel/clock-zh_TW.omf
share/gnome/omf/gnome-panel/fish-applet-2-de.omf
-share/gnome/omf/gnome-panel/fish-applet-2-fr.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-fr.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-fr.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
@@ -274,10 +262,12 @@ 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
share/gnome/omf/window-list/window-list-es.omf
+share/gnome/omf/window-list/window-list-fr.omf
share/gnome/omf/window-list/window-list-it.omf
share/gnome/omf/window-list/window-list-uk.omf
share/gnome/omf/workspace-switcher/workspace-switcher-C.omf
share/gnome/omf/workspace-switcher/workspace-switcher-es.omf
+share/gnome/omf/workspace-switcher/workspace-switcher-fr.omf
share/gnome/omf/workspace-switcher/workspace-switcher-it.omf
share/gnome/omf/workspace-switcher/workspace-switcher-nl.omf
share/gnome/omf/workspace-switcher/workspace-switcher-uk.omf
@@ -297,6 +287,7 @@ 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/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
@@ -305,11 +296,13 @@ share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/bn/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/br/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/de/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/el/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/en_CA/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo
@@ -331,8 +324,10 @@ share/locale/hy/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ky/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/li/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
@@ -378,8 +373,6 @@ 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/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/yi/LC_MESSAGES
@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@@ -394,8 +387,14 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
@dirrmtry share/locale/mr
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
+@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
@dirrm share/gnome/panel/pixmaps
@dirrm share/gnome/panel/glade
@dirrm share/gnome/omf/workspace-switcher
@@ -462,8 +461,6 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/help/fish-applet-2/ko
@dirrm share/gnome/help/fish-applet-2/ja/figures
@dirrm share/gnome/help/fish-applet-2/ja
-@dirrm share/gnome/help/fish-applet-2/fr/figures
-@dirrm share/gnome/help/fish-applet-2/fr
@dirrm share/gnome/help/fish-applet-2/de/figures
@dirrm share/gnome/help/fish-applet-2/de
@dirrm share/gnome/help/fish-applet-2
@@ -471,6 +468,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/help/fish/uk
@dirrm share/gnome/help/fish/it/figures
@dirrm share/gnome/help/fish/it
+@dirrm share/gnome/help/fish/fr/figures
+@dirrm share/gnome/help/fish/fr
@dirrm share/gnome/help/fish/es/figures
@dirrm share/gnome/help/fish/es
@dirrm share/gnome/help/fish/C/figures
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index 13ebb139a86..fcdee9b27fe 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -3,17 +3,17 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnomesession/Makefile,v 1.67 2005/10/31 19:46:29 adamw Exp $
+# $MCom: ports/x11/gnomesession/Makefile,v 1.83 2006/04/24 03:18:23 marcus Exp $
#
PORTNAME= gnomesession
-PORTVERSION= 2.12.0
-PORTREVISION= 1
+PORTVERSION= 2.14.1
+PORTREVISION= 2
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/gnome-session/2.12 \
+MASTER_SITE_SUBDIR= sources/gnome-session/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
adamw/:local
DISTNAME= gnome-session-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -24,9 +24,11 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Session component for the GNOME 2 desktop
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui
+USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop
+GNOME_DESKTOP_VERSION=2
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -45,9 +47,9 @@ post-extract:
post-install:
${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \
${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png
- ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \
- ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
-.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png
+# ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \
+# ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
+.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png
${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/${splash} \
${PREFIX}/share/gnome/pixmaps/splash
.endfor
diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo
index e4097a69186..f516a270fc4 100644
--- a/x11/gnomesession/distinfo
+++ b/x11/gnomesession/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnome2/gnome-session-2.12.0.tar.bz2) = 835e9340d23e139430224b931ff4c597
-SHA256 (gnome2/gnome-session-2.12.0.tar.bz2) = 713d1b56339dd19707edf056e08c2a0659a1430b56b4c12f759cc25f3664bb9b
-SIZE (gnome2/gnome-session-2.12.0.tar.bz2) = 864397
+MD5 (gnome2/gnome-session-2.14.1.tar.bz2) = 0b7a0fa918f7d0565d6487d06fa4489d
+SHA256 (gnome2/gnome-session-2.14.1.tar.bz2) = 5ff345552ed7f71540abbe1753e650c2a5bfad50f1acce958f664bf3a9d7e9c2
+SIZE (gnome2/gnome-session-2.14.1.tar.bz2) = 655320
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/gnomesession/files/patch-dbus b/x11/gnomesession/files/patch-dbus
new file mode 100644
index 00000000000..edd18bfec91
--- /dev/null
+++ b/x11/gnomesession/files/patch-dbus
@@ -0,0 +1,429 @@
+--- 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 @@
++/* gsm-dbus.h - Handle the dbus-daemon process.
++ *
++ * Copyright (c) 2006 Julio M. Merino Vidal <jmmv@NetBSD.org>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ */
++
++#ifndef GSM_DBUS_H
++#define GSM_DBUS_H
++
++gboolean gsm_dbus_daemon_start (void);
++void gsm_dbus_daemon_stop (void);
++
++#endif /* GSM_DBUS_H */
+--- gnome-session/gsm-dbus.c.orig Sun Apr 23 23:09:40 2006
++++ gnome-session/gsm-dbus.c Sun Apr 23 23:10:21 2006
+@@ -0,0 +1,360 @@
++/* gsm-dbus.c - Handle the dbus-daemon process.
++ *
++ * Copyright (c) 2006 Julio M. Merino Vidal <jmmv@NetBSD.org>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ */
++
++#if HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include <sys/wait.h>
++
++#include <errno.h>
++#include <fcntl.h>
++#include <limits.h>
++#include <signal.h>
++#include <stdlib.h>
++#include <unistd.h>
++
++#include <glib.h>
++#include <glib/gprintf.h>
++
++#include "gsm-dbus.h"
++
++static pid_t dbus_daemon_pid = 0;
++
++static gboolean have_dbus_daemon (void);
++static gboolean have_running_instance (void);
++static int read_line (int, char *, ssize_t);
++static void start_child (int, int);
++static void start_parent (int, int, pid_t);
++
++/* ---------------------------------------------------------------------
++ * PUBLIC INTERFACE
++ * --------------------------------------------------------------------- */
++
++/*
++ * Starts the dbus-daemon if not already running and attaches it to the
++ * current environment by defining DBUS_SESSION_BUS_ADDRESS. Returns
++ * true if we launch a new dbus-daemon so that we know if we have to call
++ * gsm_dbus_daemon_stop later on or not.
++ *
++ * This function can only be called if dbus-daemon is not already running
++ * (i.e., if gnome-session is starting up or if gsm_dbus_daemon_stop was
++ * previously called).
++ */
++gboolean
++gsm_dbus_daemon_start (void)
++{
++ int address_pipe[2];
++ int pid_pipe[2];
++ pid_t tmp_pid;
++
++ g_assert (dbus_daemon_pid == 0);
++
++ if (have_running_instance ())
++ return FALSE;
++ if (! have_dbus_daemon ())
++ return FALSE;
++
++ /*
++ * At this point, dbus-daemon is not running for the current session
++ * and the binary exists. Spawn it.
++ */
++
++ if (pipe (address_pipe) == -1)
++ {
++ g_printerr ("Cannot create address pipe for dbus-daemon\n");
++ return FALSE;
++ }
++
++ if (pipe (pid_pipe) == -1)
++ {
++ close (address_pipe[0]);
++ close (address_pipe[1]);
++ g_printerr ("Cannot create pid pipe for dbus-daemon\n");
++ return FALSE;
++ }
++
++ tmp_pid = fork ();
++ if (tmp_pid == -1)
++ {
++ close (address_pipe[0]);
++ close (address_pipe[1]);
++ close (pid_pipe[0]);
++ close (pid_pipe[1]);
++ g_printerr ("Cannot create child process for dbus-daemon\n");
++ return FALSE;
++ }
++ else if (tmp_pid == 0)
++ {
++ close (address_pipe[0]);
++ close (pid_pipe[0]);
++ start_child (address_pipe[1], pid_pipe[1]);
++ /* NOTREACHED */
++ }
++ else
++ {
++ close (address_pipe[1]);
++ close (pid_pipe[1]);
++ start_parent (address_pipe[0], pid_pipe[0], tmp_pid);
++ }
++
++ g_assert (dbus_daemon_pid != 0);
++ return TRUE;
++}
++
++/*
++ * Stops the running dbus-daemon. Can only be called if we own the process;
++ * i.e., if gsm_dbus_daemon_start returned true.
++ */
++void
++gsm_dbus_daemon_stop (void)
++{
++ g_assert (dbus_daemon_pid != 0);
++
++ if (kill (dbus_daemon_pid, SIGTERM) == -1)
++ g_printerr ("Failed to kill dbus-daemon (pid %d)\n",
++ dbus_daemon_pid);
++ else
++ {
++ dbus_daemon_pid = 0;
++ g_unsetenv ("DBUS_SESSION_BUS_ADDRESS");
++ }
++}
++
++/* ---------------------------------------------------------------------
++ * PRIVATE FUNCTIONS
++ * --------------------------------------------------------------------- */
++
++/*
++ * Check whether the dbus-daemon binary is in the path and raise an
++ * appropriate error message if it is not.
++ */
++static gboolean
++have_dbus_daemon (void)
++{
++ gboolean result;
++ gchar *file_name;
++
++ file_name = g_find_program_in_path ("dbus-daemon");
++ if (file_name == NULL)
++ g_printerr ("Cannot locate dbus-daemon\n");
++ result = file_name != NULL;
++ g_free (file_name);
++
++ return result;
++}
++
++/*
++ * Check whether there is a dbus-daemon session instance currently running
++ * (not spawned by us). If there is, do nothing and return TRUE.
++ */
++static gboolean
++have_running_instance (void)
++{
++ const gchar *address_str;
++
++ g_assert (dbus_daemon_pid == 0);
++
++ address_str = g_getenv ("DBUS_SESSION_BUS_ADDRESS");
++ return address_str != NULL;
++}
++
++/*
++ * Reads a single line from the given file descriptor and stores it in the
++ * buffer pointed to by 'buf'.
++ *
++ * After finding the first new line character, the function returns. This
++ * is to avoid reading dbus' pid multiple times from its file descriptor.
++ */
++static int
++read_line (int fd, char *buf, ssize_t bufsize)
++{
++ gboolean discard, done;
++ ssize_t bytes;
++
++ bytes = 0;
++ discard = FALSE;
++ done = FALSE;
++ do
++ {
++ ssize_t i, result;
++
++ result = read (fd, &buf[bytes], bufsize - bytes);
++ if (result < 0)
++ return -1;
++ else if (result > 0 && !discard)
++ {
++ if (bytes + result < bufsize)
++ bytes += result;
++ else
++ bytes = bufsize - 1;
++ }
++ else
++ done = TRUE;
++
++ for (i = 0; !discard && i < bytes; i++)
++ if (buf[i] == '\n')
++ {
++ buf[i] = '\0';
++ discard = TRUE;
++ }
++ }
++ while (!done);
++
++ g_assert (bytes >= 0 && bytes < bufsize);
++ buf[bytes] = '\0';
++
++ return bytes;
++}
++
++/*
++ * Code run by the child process after the fork to launch dbus-demon.
++ *
++ * As the child, this execs dbus-daemon, connecting it to the appropriate
++ * file descriptors.
++ */
++static void
++start_child (int address_fd, int pid_fd)
++{
++ gchar address_str[16];
++ gchar pid_str[16];
++ int fd;
++ long open_max;
++
++ open_max = sysconf (_SC_OPEN_MAX);
++ for (fd = 0; fd < open_max; fd++)
++ {
++ if (fd != STDIN_FILENO && fd != STDOUT_FILENO && fd != STDERR_FILENO &&
++ fd != address_fd && fd != pid_fd)
++ fcntl (fd, F_SETFD, FD_CLOEXEC);
++ }
++
++ g_snprintf (address_str, sizeof (address_str), "%d", address_fd);
++ g_snprintf (pid_str, sizeof (pid_str), "%d", pid_fd);
++
++ execlp ("dbus-daemon",
++ "dbus-daemon",
++ "--fork",
++ "--print-address", address_str,
++ "--print-pid", pid_str,
++ "--session",
++ NULL);
++
++ g_printerr ("Could not launch dbus-daemon\n");
++
++ exit (EXIT_FAILURE);
++}
++
++/*
++ * Code run by the parent process after the fork to launch dbus-demon.
++ *
++ * As the parent, this waits until dbus-daemon forks itself again and
++ * fetches its address and pid to later take its ownership.
++ */
++static void
++start_parent (int address_fd, int pid_fd, pid_t child)
++{
++ char address_str[256];
++ char pid_str[256];
++ char *tmp_ep;
++ int exitstat;
++ unsigned long tmp_num;
++ ssize_t bytes;
++
++ g_assert (child > 0);
++
++ /*
++ * dbus-daemon --fork causes our child process to exit prematurely
++ * because it is not the real daemon. See if it worked correctly
++ * and clean it up to avoid a zombie.
++ *
++ * Life could be much easier if dbus-daemon had a --no-fork flag.
++ * But, as it hasn't it, we cannot assume that it will not fork,
++ * because we have no control over its configuration file.
++ */
++ if (waitpid (child, &exitstat, 0) == -1)
++ {
++ close (address_fd);
++ close (pid_fd);
++
++ g_printerr ("Failed to get dbus-daemon status\n");
++ return;
++ }
++ if (!WIFEXITED (exitstat) || WEXITSTATUS (exitstat) != EXIT_SUCCESS)
++ {
++ close (address_fd);
++ close (pid_fd);
++
++ g_printerr ("dbus-daemon exited unexpectedly\n");
++ return;
++ }
++
++ /*
++ * Fetch dbus-daemon address.
++ */
++ bytes = read_line (address_fd, address_str, sizeof (address_str));
++ if (bytes == -1 || bytes == 0)
++ {
++ close (address_fd);
++ close (pid_fd);
++
++ g_printerr ("Failed to get dbus-daemon's address\n");
++ return;
++ }
++
++ /*
++ * Fetch dbus-daemon pid.
++ */
++ bytes = read_line (pid_fd, pid_str, sizeof (pid_str));
++ if (bytes == -1 || bytes == 0)
++ {
++ close (address_fd);
++ close (pid_fd);
++
++ g_printerr ("Failed to get dbus-daemon's pid\n");
++ return;
++ }
++
++ close (address_fd);
++ close (pid_fd);
++
++ /*
++ * Convert the string printed in pid_fd to a pid value. Do the usual
++ * strtoul dance to check for a valid number.
++ */
++ errno = 0;
++ tmp_num = strtoul(pid_str, &tmp_ep, 10);
++ if (pid_str[0] == '\0' || *tmp_ep != '\0')
++ {
++ g_printerr ("dbus-daemon pid invalid (not a number)\n");
++ return;
++ }
++ if (errno == ERANGE && tmp_num == ULONG_MAX)
++ {
++ g_printerr ("dbus-daemon pid invalid (out of range)\n");
++ return;
++ }
++ dbus_daemon_pid = tmp_num;
++
++ /*
++ * All right! Tell our future children about the new born dbus-daemon.
++ */
++ g_setenv ("DBUS_SESSION_BUS_ADDRESS", address_str, TRUE);
++}
diff --git a/x11/gnomesession/files/patch-gnome-session_Makefile.in b/x11/gnomesession/files/patch-gnome-session_Makefile.in
index ed0b6ac5686..a80f576a42a 100644
--- a/x11/gnomesession/files/patch-gnome-session_Makefile.in
+++ b/x11/gnomesession/files/patch-gnome-session_Makefile.in
@@ -1,11 +1,37 @@
---- gnome-session/Makefile.in.orig Tue Nov 30 14:07:39 2004
-+++ gnome-session/Makefile.in Tue Nov 30 14:07:51 2004
-@@ -209,7 +209,7 @@
+--- gnome-session/Makefile.in.orig Sun Apr 23 23:01:30 2006
++++ gnome-session/Makefile.in Sun Apr 23 23:06:41 2006
+@@ -67,7 +67,7 @@ am_gnome_session_OBJECTS = manager.$(OBJ
+ remote.$(OBJEXT) logout.$(OBJEXT) splash-widget.$(OBJEXT) \
+ gsm-xrandr.$(OBJEXT) gsm-keyring.$(OBJEXT) gsm-gsd.$(OBJEXT) \
+ gsm-protocol.$(OBJEXT) gsm-remote-desktop.$(OBJEXT) \
+- gsm-sound.$(OBJEXT) gsm-at-startup.$(OBJEXT) \
++ gsm-sound.$(OBJEXT) gsm-at-startup.$(OBJEXT) gsm-dbus.$(OBJEXT) \
+ gsm-multiscreen.$(OBJEXT) gsm-typebuiltins.$(OBJEXT) \
+ gdm-logout-action.$(OBJEXT) util.$(OBJEXT) $(am__objects_1)
+ gnome_session_OBJECTS = $(am_gnome_session_OBJECTS)
+@@ -310,7 +310,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
target_alias = @target_alias@
NULL =
-
-defaultdir = $(datadir)/gnome
+defaultdir = $(datadir)
-
INCLUDES = \
$(GNOME_SESSION_CFLAGS) \
+ $(STANDARD_PROPERTIES_CFLAGS) \
+@@ -386,6 +386,8 @@ gnome_session_SOURCES = \
+ splash-widget.h \
+ gsm-xrandr.c \
+ gsm-xrandr.h \
++ gsm-dbus.c \
++ gsm-dbus.h \
+ gsm-keyring.c \
+ gsm-keyring.h \
+ gsm-gsd.c \
+@@ -610,6 +612,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-sound.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-typebuiltins.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-xrandr.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-dbus.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ice.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logout-test.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logout.Po@am__quote@
diff --git a/x11/gnomesession/files/patch-gnome-session_gsm-at-startup.c b/x11/gnomesession/files/patch-gnome-session_gsm-at-startup.c
new file mode 100644
index 00000000000..da4950d05c9
--- /dev/null
+++ b/x11/gnomesession/files/patch-gnome-session_gsm-at-startup.c
@@ -0,0 +1,10 @@
+--- 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/gnomesession/files/patch-gnome-session_gsm-xrandr.c b/x11/gnomesession/files/patch-gnome-session_gsm-xrandr.c
new file mode 100644
index 00000000000..8eae88069c5
--- /dev/null
+++ b/x11/gnomesession/files/patch-gnome-session_gsm-xrandr.c
@@ -0,0 +1,10 @@
+--- 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/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist
index 17d898f1ee2..882701bbd50 100644
--- a/x11/gnomesession/pkg-plist
+++ b/x11/gnomesession/pkg-plist
@@ -34,6 +34,7 @@ share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo
share/locale/da/LC_MESSAGES/gnome-session-2.0.mo
share/locale/de/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-session-2.0.mo
share/locale/el/LC_MESSAGES/gnome-session-2.0.mo
share/locale/en_CA/LC_MESSAGES/gnome-session-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo
@@ -56,8 +57,10 @@ share/locale/id/LC_MESSAGES/gnome-session-2.0.mo
share/locale/is/LC_MESSAGES/gnome-session-2.0.mo
share/locale/it/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-session-2.0.mo
share/locale/kn/LC_MESSAGES/gnome-session-2.0.mo
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/mi/LC_MESSAGES/gnome-session-2.0.mo
@@ -94,7 +97,14 @@ share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo
share/locale/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
-@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@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
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index c1c5d6bcecd..a8578865b0f 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -3,24 +3,24 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnometerminal/Makefile,v 1.52 2005/10/14 20:39:58 adamw Exp $
+# $MCom: ports/x11/gnometerminal/Makefile,v 1.69 2006/04/13 07:52:41 bland Exp $
#
PORTNAME= gnometerminal
-PORTVERSION= 2.12.0
+PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-terminal/2.12
+MASTER_SITE_SUBDIR= sources/gnome-terminal/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gnome-terminal-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Terminal component for the GNOME 2 Desktop
+USE_GETTEXT= yes
USE_BZIP2= yes
INSTALLS_OMF= yes
USE_X_PREFIX= yes
-USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte
GNU_CONFIGURE= yes
diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo
index 951536429cf..73abf3d6655 100644
--- a/x11/gnometerminal/distinfo
+++ b/x11/gnometerminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-terminal-2.12.0.tar.bz2) = 483c9397dd165845e2528a80e3df6dfc
-SHA256 (gnome2/gnome-terminal-2.12.0.tar.bz2) = e515509f2d07ab1360723b70345ac18b44c5525abc31cce48f135b43fbb444cc
-SIZE (gnome2/gnome-terminal-2.12.0.tar.bz2) = 1684178
+MD5 (gnome2/gnome-terminal-2.14.1.tar.bz2) = 7abe60db5359c88392d2b4f0d5587ef5
+SHA256 (gnome2/gnome-terminal-2.14.1.tar.bz2) = c1e7674bb75343db89ad6769bc2d7ecfb115d9eda02035d374d8c4d952091647
+SIZE (gnome2/gnome-terminal-2.14.1.tar.bz2) = 1783063
diff --git a/x11/gnometerminal/files/patch-src::terminal-screen.c b/x11/gnometerminal/files/patch-src::terminal-screen.c
deleted file mode 100644
index 0198f748c37..00000000000
--- a/x11/gnometerminal/files/patch-src::terminal-screen.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/terminal-screen.c.orig Fri Jul 1 20:37:58 2005
-+++ src/terminal-screen.c Tue Jul 5 13:26:21 2005
-@@ -248,16 +248,16 @@ 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);
-+ "[[:<:]](" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_AS_IS);
-
- terminal_widget_match_add (screen->priv->term,
-- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_DEFAULT_TO_HTTP);
-+ "[[:<:]]<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_DEFAULT_TO_HTTP);
-
- terminal_widget_match_add (screen->priv->term,
-- "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO);
-+ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO);
-
- terminal_widget_match_add (screen->priv->term,
-- "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS);
-+ "[[:<:]]<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS);
-
-
- terminal_screen_setup_dnd (screen);
diff --git a/x11/gnometerminal/files/patch-src_terminal-screen.c b/x11/gnometerminal/files/patch-src_terminal-screen.c
new file mode 100644
index 00000000000..0f5c397cbad
--- /dev/null
+++ b/x11/gnometerminal/files/patch-src_terminal-screen.c
@@ -0,0 +1,33 @@
+--- src/terminal-screen.c.orig Sun Apr 2 18:27:36 2006
++++ src/terminal-screen.c Sun Apr 2 18:42:41 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);
++ "[[:<:]]" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+"
++ "(:[0-9]+)?(" URLPATH ")?[[:>:]]", FLAVOR_AS_IS);
+
+ terminal_widget_match_add (screen->priv->term,
+- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+"
+- "(:[0-9]+)?(" URLPATH ")?\\>",
++ "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+"
++ "(:[0-9]+)?(" URLPATH ")?[[:>:]]",
+ FLAVOR_DEFAULT_TO_HTTP);
+
+ terminal_widget_match_add (screen->priv->term,
+- "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]"
+- "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>",
++ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]"
++ "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]",
+ FLAVOR_EMAIL);
+
+ terminal_widget_match_add (screen->priv->term,
+- "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+"
+- "@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS);
++ "[[:<:]]news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+"
++ "@[" HOSTCHARS ".]+(:[0-9]+)?[[:>:]]", FLAVOR_AS_IS);
+
+ terminal_screen_setup_dnd (screen);
+
diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist
index 721f659b8cd..380a52ff47c 100644
--- a/x11/gnometerminal/pkg-plist
+++ b/x11/gnometerminal/pkg-plist
@@ -1,6 +1,5 @@
bin/gnome-terminal
libdata/bonobo/servers/gnome-terminal.server
-share/gnome/application-registry/gnome-terminal.applications
share/gnome/applications/gnome-terminal.desktop
share/gnome/gnome-terminal/glade/gnome-terminal.glade2
share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png
@@ -8,6 +7,11 @@ share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/C/figures/terminal_window.png
share/gnome/help/gnome-terminal/C/gnome-terminal.xml
share/gnome/help/gnome-terminal/C/legal.xml
+share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/bg/figures/terminal_window.png
+share/gnome/help/gnome-terminal/bg/gnome-terminal.xml
+share/gnome/help/gnome-terminal/bg/legal.xml
share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png
share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png
share/gnome/help/gnome-terminal/de/figures/terminal_window.png
@@ -63,6 +67,7 @@ share/gnome/help/gnome-terminal/zh_TW/figures/terminal_window.png
share/gnome/help/gnome-terminal/zh_TW/gnome-terminal.xml
share/gnome/help/gnome-terminal/zh_TW/legal.xml
share/gnome/omf/gnome-terminal/gnome-terminal-C.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-bg.omf
share/gnome/omf/gnome-terminal/gnome-terminal-de.omf
share/gnome/omf/gnome-terminal/gnome-terminal-es.omf
share/gnome/omf/gnome-terminal/gnome-terminal-fr.omf
@@ -82,11 +87,13 @@ 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/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
share/locale/da/LC_MESSAGES/gnome-terminal.mo
share/locale/de/LC_MESSAGES/gnome-terminal.mo
+share/locale/dz/LC_MESSAGES/gnome-terminal.mo
share/locale/el/LC_MESSAGES/gnome-terminal.mo
share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo
share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo
@@ -108,6 +115,7 @@ share/locale/id/LC_MESSAGES/gnome-terminal.mo
share/locale/it/LC_MESSAGES/gnome-terminal.mo
share/locale/ja/LC_MESSAGES/gnome-terminal.mo
share/locale/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/mk/LC_MESSAGES/gnome-terminal.mo
@@ -141,6 +149,12 @@ 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_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
@@ -164,6 +178,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
@dirrm share/gnome/help/gnome-terminal/es
@dirrm share/gnome/help/gnome-terminal/de/figures
@dirrm share/gnome/help/gnome-terminal/de
+@dirrm share/gnome/help/gnome-terminal/bg/figures
+@dirrm share/gnome/help/gnome-terminal/bg
@dirrm share/gnome/help/gnome-terminal/C/figures
@dirrm share/gnome/help/gnome-terminal/C
@dirrm share/gnome/help/gnome-terminal
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 5804300133c..8356bc83aa4 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,15 +3,14 @@
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnome/Makefile,v 1.61 2005/09/07 16:21:36 marcus Exp $
+# $MCom: ports/x11/libgnome/Makefile,v 1.78 2006/04/13 07:52:41 bland Exp $
#
PORTNAME= libgnome
-PORTVERSION= 2.12.0.1
-PORTREVISION= 1
+PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -20,16 +19,16 @@ COMMENT= Libraries for GNOME, a GNU desktop environment
BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_REINPLACE= yes
USE_XPM= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack esound \
gnomevfs2 libxslt ltverhack
USE_BISON= yes
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -54,6 +53,7 @@ GCONF_SCHEMAS= desktop_gnome_accessibility_keyboard.schemas \
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
${WRKSRC}/libgnome/libgnome-2.0.pc.in
+ @${REINPLACE_CMD} -e '/^$$/d' ${WRKSRC}/po/POTFILES.in
.if defined(NOPORTDOCS)
@${REINPLACE_CMD} -e 's|gnome-data po doc|gnome-data po|g' \
${WRKSRC}/Makefile.in
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 3405e21e69b..42ba5385693 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnome-2.12.0.1.tar.bz2) = f239a7ab132d2ec9039bb2537cca1e92
-SHA256 (gnome2/libgnome-2.12.0.1.tar.bz2) = f4cd8f6df545328b2b969d1fa8762d5398f7f6c517c7fac730f1d2196e4cf624
-SIZE (gnome2/libgnome-2.12.0.1.tar.bz2) = 955235
+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
diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-ag
index 2caedc380d5..ceb23de357f 100644
--- a/x11/libgnome/files/patch-ag
+++ b/x11/libgnome/files/patch-ag
@@ -1,7 +1,3 @@
-
-$FreeBSD$
- $MCom: ports/x11/libgnome/files/patch-ag,v 1.18 2005/07/04 00:15:01 marcus Exp $
-
--- 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 @@
diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c
index 9dd33f9c283..70ecbfd8fce 100644
--- a/x11/libgnome/files/patch-libgnome_gnome-program.c
+++ b/x11/libgnome/files/patch-libgnome_gnome-program.c
@@ -1,6 +1,6 @@
---- libgnome/gnome-program.c.orig Mon May 31 16:37:02 2004
-+++ libgnome/gnome-program.c Mon May 31 16:37:05 2004
-@@ -895,17 +895,17 @@
+--- libgnome/gnome-program.c.orig Tue Apr 4 06:55:12 2006
++++ libgnome/gnome-program.c Mon Apr 10 21:07:02 2006
+@@ -936,17 +936,17 @@ gnome_program_locate_file (GnomeProgram
attr_rel = "";
break;
case GNOME_FILE_DOMAIN_DATADIR:
@@ -21,7 +21,7 @@
attr_name = GNOME_PARAM_GNOME_DATADIR;
attr_rel = "/pixmaps";
break;
-@@ -917,7 +917,7 @@
+@@ -958,7 +958,7 @@ gnome_program_locate_file (GnomeProgram
case GNOME_FILE_DOMAIN_HELP:
prefix_rel = "/share/gnome/help";
attr_name = GNOME_PARAM_GNOME_DATADIR;
@@ -30,7 +30,7 @@
break;
case GNOME_FILE_DOMAIN_APP_LIBDIR:
prefix_rel = "/lib";
-@@ -926,19 +926,19 @@
+@@ -967,19 +967,19 @@ gnome_program_locate_file (GnomeProgram
search_path = FALSE;
break;
case GNOME_FILE_DOMAIN_APP_DATADIR:
@@ -53,18 +53,3 @@
attr_name = GNOME_PARAM_APP_DATADIR;
attr_rel = "/pixmaps";
search_path = FALSE;
-@@ -959,12 +959,12 @@
-
- attr_name = GNOME_PARAM_APP_DATADIR;
-
-- len = strlen ("/gnome/help/") +
-+ len = strlen ("/help/") +
- strlen (program->_priv->app_id) + 1;
- attr_rel = g_alloca (len);
- if (attr_rel == NULL /* bad things */)
- return NULL;
-- g_snprintf (attr_rel, len, "/gnome/help/%s", program->_priv->app_id);
-+ g_snprintf (attr_rel, len, "/help/%s", program->_priv->app_id);
-
- search_path = FALSE;
- break;
diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in
index adb5cef3921..7377058cd83 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.2 2005/07/04 00:15:01 marcus Exp $
+# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.4 2005/11/16 00:04:58 ahze Exp $
#
# Restore gconf keys of gnomevfs2.
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 6f57b338254..0b3acb8a4c1 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -84,6 +84,7 @@ share/locale/is/LC_MESSAGES/libgnome-2.0.mo
share/locale/it/LC_MESSAGES/libgnome-2.0.mo
share/locale/ja/LC_MESSAGES/libgnome-2.0.mo
share/locale/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
share/locale/lv/LC_MESSAGES/libgnome-2.0.mo
share/locale/mk/LC_MESSAGES/libgnome-2.0.mo
@@ -95,6 +96,7 @@ 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
share/locale/pt/LC_MESSAGES/libgnome-2.0.mo
@@ -112,13 +114,19 @@ share/locale/sv/LC_MESSAGES/libgnome-2.0.mo
share/locale/ta/LC_MESSAGES/libgnome-2.0.mo
share/locale/th/LC_MESSAGES/libgnome-2.0.mo
share/locale/tr/LC_MESSAGES/libgnome-2.0.mo
+share/locale/tt/LC_MESSAGES/libgnome-2.0.mo
share/locale/uk/LC_MESSAGES/libgnome-2.0.mo
share/locale/vi/LC_MESSAGES/libgnome-2.0.mo
share/locale/wa/LC_MESSAGES/libgnome-2.0.mo
share/locale/xh/LC_MESSAGES/libgnome-2.0.mo
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
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
@dirrm include/libgnome-2.0/libgnome
@dirrm include/libgnome-2.0
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index bb5718bcde0..6b31a4b4439 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -3,15 +3,14 @@
# Whom: Alexander Nedotsukov <bland@mail.ru>
#
# $FreeBSD$
-# $MCom: ports/x11/libgnomemm26/Makefile,v 1.5 2005/10/14 20:39:59 adamw Exp $
+# $MCom: ports/x11/libgnomemm26/Makefile,v 1.8 2006/04/13 07:52:41 bland Exp $
#
PORTNAME= libgnomemm
-PORTVERSION= 2.12.1
-PORTREVISION= 1
+PORTVERSION= 2.14.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= bland@FreeBSD.org
diff --git a/x11/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo
index 36e559f05d8..b8a51c48cfa 100644
--- a/x11/libgnomemm26/distinfo
+++ b/x11/libgnomemm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomemm-2.12.1.tar.bz2) = 00882f5aba3f4c7c37c17497628d5eeb
-SHA256 (gnome2/libgnomemm-2.12.1.tar.bz2) = 398e36b0457ecdf7bec62b2d6ce86d9d55f7db03bc7dc8ed9397cfe902cc3522
-SIZE (gnome2/libgnomemm-2.12.1.tar.bz2) = 250409
+MD5 (gnome2/libgnomemm-2.14.0.tar.bz2) = 8e31905b9732fdb099381569736829fa
+SHA256 (gnome2/libgnomemm-2.14.0.tar.bz2) = 66cc9f99f074bcc9c2c014880ff14d0e8ec15067fff0a9f6fe7ca79f65f65500
+SIZE (gnome2/libgnomemm-2.14.0.tar.bz2) = 250757
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index cfdcb9e8545..dfbba72b23b 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,27 +3,27 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/yelp/Makefile,v 1.70 2005/11/28 07:30:27 ahze Exp $
+# $MCom: ports/x11/yelp/Makefile,v 1.88 2006/04/16 13:36:49 ahze Exp $
#
PORTNAME= yelp
-PORTVERSION= 2.12.2
-PORTREVISION= 2
+PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A help browser for the GNOME 2 desktop
-USE_GECKO= firefox mozilla seamonkey thunderbird
+USE_GECKO= firefox seamonkey xulrunner # mozilla
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_REINPLACE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils
+USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \
+ libgnomeprintui
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -33,22 +33,7 @@ MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
GCONF_SCHEMAS= yelp.schemas
-OPTIONS= MAN "Enable man page support" off \
- INFO "Enable GNU info support" off
-
.include <bsd.port.pre.mk>
.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
-.if ${OSVERSION} < 500000
-USE_GCC= 2.95
-.endif
-
-.if defined(WITH_MAN)
-CONFIGURE_ARGS+=--enable-man
-.endif
-
-.if defined(WITH_INFO)
-CONFIGURE_ARGS+=--enable-info
-.endif
-
.include <bsd.port.post.mk>
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index e7956303c66..fd4d68591cd 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/yelp-2.12.2.tar.bz2) = e229529aa1dacfd269024511e2c12ad2
-SHA256 (gnome2/yelp-2.12.2.tar.bz2) = ee56b279131f7d2c40da332eece9eee4a7fc4ec36425d29f201038f8a2f382c9
-SIZE (gnome2/yelp-2.12.2.tar.bz2) = 815933
+MD5 (gnome2/yelp-2.14.1.tar.bz2) = 3d569f8e9372bc88c7f9fca6a94388a9
+SHA256 (gnome2/yelp-2.14.1.tar.bz2) = db7a8c89bfdfc720a4d3f1e6883a4ac547ac039b4a32bb2b5e7546ac4d051a64
+SIZE (gnome2/yelp-2.14.1.tar.bz2) = 765371
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 6bf7535b9df..d92f49b29f3 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -14,15 +14,18 @@ share/gnome/yelp/icons/yelp-watermark-blockquote-201C.png
share/gnome/yelp/icons/yelp-watermark-blockquote-201D.png
share/gnome/yelp/icons/yelp-watermark-blockquote-201E.png
share/gnome/yelp/important_docs.xml
+share/gnome/yelp/info.xml
share/gnome/yelp/man.xml
share/gnome/yelp/scrollkeeper.xml
share/gnome/yelp/toc.xml
+share/gnome/yelp/ui/yelp-search-ui.xml
share/gnome/yelp/ui/yelp-ui.xml
share/gnome/yelp/ui/yelp.glade
share/gnome/yelp/xslt/db-title.xsl
share/gnome/yelp/xslt/db2html.xsl
share/gnome/yelp/xslt/info2html.xsl
share/gnome/yelp/xslt/man2html.xsl
+share/gnome/yelp/xslt/search2html.xsl
share/gnome/yelp/xslt/toc2html.xsl
share/gnome/yelp/xslt/yelp-common.xsl
share/gnome/yelp/yelp.js
@@ -34,12 +37,14 @@ 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/br/LC_MESSAGES/yelp.mo
share/locale/bs/LC_MESSAGES/yelp.mo
share/locale/ca/LC_MESSAGES/yelp.mo
share/locale/cs/LC_MESSAGES/yelp.mo
share/locale/cy/LC_MESSAGES/yelp.mo
share/locale/da/LC_MESSAGES/yelp.mo
share/locale/de/LC_MESSAGES/yelp.mo
+share/locale/dz/LC_MESSAGES/yelp.mo
share/locale/el/LC_MESSAGES/yelp.mo
share/locale/en_CA/LC_MESSAGES/yelp.mo
share/locale/en_GB/LC_MESSAGES/yelp.mo
@@ -65,6 +70,7 @@ share/locale/ka/LC_MESSAGES/yelp.mo
share/locale/kn/LC_MESSAGES/yelp.mo
share/locale/ko/LC_MESSAGES/yelp.mo
share/locale/ku/LC_MESSAGES/yelp.mo
+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
@@ -79,6 +85,7 @@ 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
share/locale/pl/LC_MESSAGES/yelp.mo
share/locale/pt/LC_MESSAGES/yelp.mo
@@ -102,6 +109,7 @@ share/locale/vi/LC_MESSAGES/yelp.mo
share/locale/wa/LC_MESSAGES/yelp.mo
share/locale/xh/LC_MESSAGES/yelp.mo
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
@dirrmtry share/locale/zu/LC_MESSAGES
@@ -112,8 +120,14 @@ share/locale/zu/LC_MESSAGES/yelp.mo
@dirrmtry share/locale/nso
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/br/LC_MESSAGES
+@dirrmtry share/locale/br
@dirrm share/gnome/yelp/xslt
@dirrm share/gnome/yelp/ui
@dirrm share/gnome/yelp/icons
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 8cd704bb096..54f9389aa1f 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,14 +3,14 @@
# Whom: Franz Klammer <klammer@webonaut.com>
#
# $FreeBSD$
-# $MCom: ports/x11/zenity/Makefile,v 1.46 2005/10/30 23:07:09 marcus Exp $
+# $MCom: ports/x11/zenity/Makefile,v 1.59 2006/04/13 07:52:41 bland Exp $
#
PORTNAME= zenity
-PORTVERSION= 2.12.1
+PORTVERSION= 2.14.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -24,8 +24,8 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack libgnomecanvas gconf2 gnomedocutils
USE_BZIP2= yes
+USE_GETTEXT= yes
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
INSTALLS_OMF= yes
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 f49bf113c9e..366d8490807 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/zenity-2.12.1.tar.bz2) = d8fbcf326e42b5dae70a570fad024947
-SHA256 (gnome2/zenity-2.12.1.tar.bz2) = e200d3d355b5c49c055e69033d856445fd729775eb72dc58b56b604b28775a46
-SIZE (gnome2/zenity-2.12.1.tar.bz2) = 896002
+MD5 (gnome2/zenity-2.14.1.tar.bz2) = 2445b652a93581436164cb6ad5e9c36b
+SHA256 (gnome2/zenity-2.14.1.tar.bz2) = bc10b972cb0c200134e64a90eaa0c1498aa88864a777a1ce8db5127306fa81eb
+SIZE (gnome2/zenity-2.14.1.tar.bz2) = 1066815
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index c29da161204..d7aa84178de 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -13,6 +13,18 @@ share/gnome/help/zenity/C/figures/zenity-text-screenshot.png
share/gnome/help/zenity/C/figures/zenity-warning-screenshot.png
share/gnome/help/zenity/C/legal.xml
share/gnome/help/zenity/C/zenity.xml
+share/gnome/help/zenity/bg/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/bg/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/bg/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/bg/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/bg/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/bg/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/bg/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/bg/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/bg/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/bg/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/bg/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/bg/zenity.xml
share/gnome/help/zenity/es/figures/zenity-calendar-screenshot.png
share/gnome/help/zenity/es/figures/zenity-entry-screenshot.png
share/gnome/help/zenity/es/figures/zenity-error-screenshot.png
@@ -50,6 +62,7 @@ share/gnome/help/zenity/uk/figures/zenity-text-screenshot.png
share/gnome/help/zenity/uk/figures/zenity-warning-screenshot.png
share/gnome/help/zenity/uk/zenity.xml
share/gnome/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-uk.omf
@@ -64,6 +77,7 @@ share/gnome/zenity/zenity-file.png
share/gnome/zenity/zenity-list.png
share/gnome/zenity/zenity-notification.png
share/gnome/zenity/zenity-progress.png
+share/gnome/zenity/zenity-scale.png
share/gnome/zenity/zenity-text.png
share/gnome/zenity/zenity.glade
share/gnome/zenity/zenity.png
@@ -79,6 +93,7 @@ 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
@@ -99,8 +114,10 @@ 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/mi/LC_MESSAGES/zenity-0.1.mo
share/locale/mk/LC_MESSAGES/zenity-0.1.mo
@@ -112,6 +129,7 @@ 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
@@ -136,6 +154,10 @@ share/locale/zh_CN/LC_MESSAGES/zenity-0.1.mo
share/locale/zh_TW/LC_MESSAGES/zenity-0.1.mo
@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
@dirrm share/gnome/zenity/clothes
@dirrm share/gnome/zenity
@dirrm share/gnome/omf/zenity
@@ -145,6 +167,8 @@ share/locale/zh_TW/LC_MESSAGES/zenity-0.1.mo
@dirrm share/gnome/help/zenity/fr
@dirrm share/gnome/help/zenity/es/figures
@dirrm share/gnome/help/zenity/es
+@dirrm share/gnome/help/zenity/bg/figures
+@dirrm share/gnome/help/zenity/bg
@dirrm share/gnome/help/zenity/C/figures
@dirrm share/gnome/help/zenity/C
@dirrm share/gnome/help/zenity